7525 files changed, 12411 insertions, 310901 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/0ad/PKGBUILD b/community-staging/0ad/PKGBUILD
deleted file mode 100644
index 6b2a83894..000000000
--- a/community-staging/0ad/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
-# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
-pkgname=0ad
-pkgver=a10
-_pkgver=r11863-alpha
-pkgrel=3
-pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
-arch=('i686' 'x86_64')
-url="http://wildfiregames.com/0ad"
-license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data')
-makedepends=('boost' 'cmake' 'mesa')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
-        "boost-1.50.patch")
-md5sums=('f42a2e18515cbcd48b99f0ea3796b3a4'
-         '570724341102e23730de2f70d3a1b97c')
-
-build() {
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
-
-  sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
-  sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
-  patch -d ../.. -Np1 < $srcdir/boost-1.50.patch
-
-  ./update-workspaces.sh \
-      --with-system-enet \
-      --bindir=/usr/bin \
-      --libdir=/usr/lib \
-      --datadir=/usr/share/${pkgname}/data
-
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
-  make CONFIG=Release
-}
-
-package() {
-  install -d ${pkgdir}/usr/{bin,lib}
-  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin
-  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib
-
-  install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}
diff --git a/community-staging/0ad/boost-1.50.patch b/community-staging/0ad/boost-1.50.patch
deleted file mode 100644
index 26ebd3e96..000000000
--- a/community-staging/0ad/boost-1.50.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp
---- 0ad-r11863-alpha/source/graphics/TextureManager.cpp	2012-02-19 04:30:59.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp	2012-07-10 21:00:52.753251312 +0200
-@@ -425,9 +425,9 @@
- 			CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath);
- 			if (f)
- 				files.push_back(f);
--			p = p / *it;
-+			p = p / it->wstring();
- 		}
--		return m_TextureConverter.ComputeSettings(srcPath.leaf(), files);
-+		return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files);
- 	}
- 
- 	/**
-diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h
---- 0ad-r11863-alpha/source/lib/pch/pch_boost.h	2012-02-16 19:01:10.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h	2012-07-10 19:51:38.413009623 +0200
-@@ -25,7 +25,7 @@
- 
- // the following boost libraries have been included in TR1 and are
- // thus deemed usable:
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem.hpp>
- namespace fs = boost::filesystem;
- #include <boost/shared_ptr.hpp>
-diff -ru 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp
---- 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp	2011-05-25 12:39:13.000000000 +0200
-+++ 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp	2012-07-10 20:55:52.523233843 +0200
-@@ -53,7 +53,7 @@
- 		fs::wpath components = pathname.string();
- 		fs::wpath::iterator it = components.begin();
- 		std::advance(it, 2);
--		std::wstring dirname = *it;
-+		std::wstring dirname = it->wstring();
- 
- 		CScriptValRooted ai;
- 		self->m_ScriptInterface.Eval("({})", ai);
diff --git a/community-staging/alex/PKGBUILD b/community-staging/alex/PKGBUILD
deleted file mode 100644
index eadf607c6..000000000
--- a/community-staging/alex/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 76079 2012-09-11 04:43:36Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Philip Nilsson <pnilsson@nullref.se>
-
-pkgname=alex
-pkgver=3.0.2
-pkgrel=2
-pkgdesc='a lexical analyser generator for Haskell'
-arch=('i686' 'x86_64')
-url='http://hackage.haskell.org/package/alex'
-license=('custom:BSD3')
-depends=('gmp')
-makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2')
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname
-  runghc Setup.lhs build
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs copy --destdir=$pkgdir
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3
-
-  # doc/ contains only license which already installed into proper place
-  rm -rf $pkgdir/usr/share/doc
-}
diff --git a/community-staging/arm-elf-gcc-base/PKGBUILD b/community-staging/arm-elf-gcc-base/PKGBUILD
deleted file mode 100644
index 52decb74a..000000000
--- a/community-staging/arm-elf-gcc-base/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 75069 2012-08-13 13:30:01Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=arm-elf-gcc-base
-pkgver=4.7.0
-pkgrel=2
-pkgdesc="The GNU Compiler Collection"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-url="http://gcc.gnu.org"
-depends=('arm-elf-binutils' 'libmpc' 'libelf')
-options=(!libtool !emptydirs zipman docs !strip)
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
-md5sums=('2a0f1d99fda235c29d40b561f81d9a77')
-
-build() {
-  cd $srcdir/gcc-$pkgver
-
-  export CFLAGS="-O2 -pipe"
-  export CXXFLAGS="-O2 -pipe"
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  ../configure --prefix=/usr \
-	--target=arm-elf \
-	--enable-obsolete \
-	--host=$CHOST \
-	--build=$CHOST \
-	--enable-shared --disable-nls --enable-languages=c --enable-multilib \
-	--with-local-prefix=/usr/lib/arm-elf \
-	--with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \
-	--enable-softfloat \
-	--with-float=soft \
-	--with-newlib \
-	--with-sysroot=/usr/$CHOST/arm-elf
-
-  make all-gcc all-target-libgcc
-}
-
-package() {
-  cd $srcdir/gcc-$pkgver/build
-
-  export CFLAGS="-O2 -pipe"
-  export CXXFLAGS="-O2 -pipe"
-
-  make DESTDIR=$pkgdir install-gcc install-target-libgcc
-
-  rm -f $pkgdir/usr/share/man/man7/fsf-funding.7*
-  rm -f $pkgdir/usr/share/man/man7/gfdl.7*
-  rm -f $pkgdir/usr/share/man/man7/gpl.7*
-  rm -rf $pkgdir/usr/share/info
-
-  cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/
-  rm -rf $pkgdir/usr/libexec
-
-  # strip it manually
-  strip $pkgdir/usr/bin/* 2>/dev/null || true
-  find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true
-}
diff --git a/community-staging/avr-gcc/PKGBUILD b/community-staging/avr-gcc/PKGBUILD
deleted file mode 100644
index 59f9bb536..000000000
--- a/community-staging/avr-gcc/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 75007 2012-08-11 13:56:52Z schuay $
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: danst0 <danst0@west.de>
-
-# Build order: avr-binutils -> avr-gcc -> avr-libc
-
-pkgname=avr-gcc
-_pkgname=gcc
-pkgver=4.7.1
-pkgrel=2
-pkgdesc="The GNU AVR Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'custom')
-url="http://gcc.gnu.org/"
-depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc')
-provides=("gcc-avr=$pkgver")
-replaces=('gcc-avr')
-options=('!libtool' '!emptydirs' '!libtool' '!strip')
-source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2)
-
-_basedir=${srcdir}/${_pkgname}-${pkgver}
-
-build() {
-    # default CFLAGS lead to issues later on when configure 
-    # calls avr-gcc with -march set.
-    export CFLAGS="-O2 -pipe"
-    export CXXFLAGS="-O2 -pipe"
-
-    cd ${_basedir} 
-
-    # Do not install libiberty
-    sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-    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 \
-                --enable-languages=c,c++ \
-                --disable-libssp \
-                --disable-nls \
-                --target=avr \
-                --with-as=/usr/bin/avr-as \
-                --with-ld=/usr/bin/avr-ld \
-                --with-gnu-as \
-                --with-gnu-ld
-
-    make
-}
-
-package() {
-    cd ${srcdir}/gcc-build
-
-    make -j1 DESTDIR=${pkgdir} install
-
-      # Install Runtime Library Exception
-    install -Dm644 ${_basedir}/COPYING.RUNTIME \
-        ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION
-
-    rm -rf ${pkgdir}/usr/share/man/man7
-    rm -rf ${pkgdir}/usr/share/info
-}
-
-md5sums=('933e6f15f51c031060af64a9e14149ff')
diff --git a/community-staging/avr-gdb/PKGBUILD b/community-staging/avr-gdb/PKGBUILD
deleted file mode 100644
index 2dbb56ee0..000000000
--- a/community-staging/avr-gdb/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Ivan Sichmann Freitas <ivansichfreitas at gmail dot com>
-# Contributor: Laszlo Papp <djszapi2 at gmail dot com>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Contributor: Vladimir Cerny <blackvladimir@gmail.com>
-# Contributor: 4javier <4javieregATgmailDOTcom>
-
-pkgname=avr-gdb
-_pkgname=gdb
-pkgver=7.4
-pkgrel=2
-pkgdesc="The GNU Debugger for AVR"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gdb/"
-license=('GPL3')
-depends=('python')
-options=('!libtool')
-source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('95a9a8305fed4d30a30a6dc28ff9d060')
-
-build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  unset LDFLAGS
-  export CFLAGS="-O2 -pipe"
-  export CXXFLAGS="$CFLAGS"
-    
-  ./configure --prefix=/usr \
-    --target=avr \
-    --disable-nls \
-    --enable-languages=c,c++ \
-    --infodir=/usr/share/info \
-    --libdir=/usr/lib \
-    --program-prefix=avr- \
-    --libexecdir=/usr/lib \
-    --mandir=/usr/share/man \
-    --with-system-readline
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  rm -f ${pkgdir}/usr/lib/libiberty.a
-  rm -rf ${pkgdir}/usr/share/info
-  rm -rf ${pkgdir}/usr/share/gdb
-  rm -rf ${pkgdir}/usr/include/gdb
-}
diff --git a/community-staging/bitcoin/PKGBUILD b/community-staging/bitcoin/PKGBUILD
deleted file mode 100644
index 4f7bab48f..000000000
--- a/community-staging/bitcoin/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 73543 2012-07-09 12:27:15Z tredaelli $
-# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
-# Contributor: shahid <helllamer@gmail.com>
-
-pkgbase=bitcoin
-pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.6.3
-_commit=bbe1084
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.bitcoin.org/"
-makedepends=('boost' 'automoc4' 'miniupnpc')
-conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
-replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
-license=('MIT')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver")
-sha256sums=('3f1a0df5d713c9e4f54f00a8f3f75c6828041afd826e16976b00229de0aecb70')
-
-build() {
-  cd "$srcdir/bitcoin-$pkgbase-$_commit"
-
-  # and make qt gui
-  qmake
-  make
-
-  # make bitcoind
-  make -f makefile.unix -C src  CXXFLAGS="$CXXFLAGS" USE_UPNP=1
-}
-
-
-package_bitcoin-qt() {
-  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT"
-  depends=(boost-libs qt miniupnpc)
-  install=bitcoin-qt.install
-
-  cd "$srcdir/bitcoin-$pkgbase-$_commit"
-  install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
-  install -Dm644 contrib/debian/bitcoin-qt.desktop \
-    "$pkgdir"/usr/share/applications/bitcoin.desktop
-  install -Dm644 share/pixmaps/bitcoin80.xpm \
-    "$pkgdir"/usr/share/pixmaps/bitcoin80.xpm
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-package_bitcoin-daemon() {
-  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon"
-  depends=(boost-libs miniupnpc openssl)
-
-  cd "$srcdir/bitcoin-$pkgbase-$_commit"
-  install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind
-  install -Dm644 contrib/debian/examples/bitcoin.conf \
-    "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf"
-  install -Dm644 contrib/debian/manpages/bitcoind.1 \
-    "$pkgdir"/usr/share/man/man1/bitcoind.1
-  install -Dm644 contrib/debian/manpages/bitcoin.conf.5 \
-    "$pkgdir"/usr/share/man/man5/bitcoin.conf.5
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
diff --git a/community-staging/bitcoin/bitcoin-qt.install b/community-staging/bitcoin/bitcoin-qt.install
deleted file mode 100644
index f98ba7338..000000000
--- a/community-staging/bitcoin/bitcoin-qt.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/community-staging/blueman/PKGBUILD b/community-staging/blueman/PKGBUILD
deleted file mode 100644
index 72471ce4f..000000000
--- a/community-staging/blueman/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 78012 2012-10-16 03:31:53Z allan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org
-# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
-
-pkgname=blueman
-pkgver=1.23
-pkgrel=5
-pkgdesc="GTK+ bluetooth manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://blueman-project.org"
-depends=('python2-notify' 'bluez' 'python2-dbus' 'gtk2' 'python2-gobject2' 'startup-notification'
-	 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme' 'libpulse'
-	 'notification-daemon')
-makedepends=('pyrex' 'intltool')
-optdepends=('dnsmasq: For creating PAN network'
-	    'gconf: For gconf configuration support'
-	    'pulseaudio: To use the pulseaudio plugin'
-	    'notification-daemon: for desktop notifications'
-	    'libnotify: for desktop notifications'
-	    'modemmanager: for modem management service'
-	    'gnome-icon-theme: icon theme')
-options=('!libtool')
-install=$pkgname.install
-source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f0bee59589f4c23e35bf08c2ef8acaef')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export PYTHON=python2
-  for file in apps/blueman*; do
-    sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
-  done
-  sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py
-
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/blueman \
-	--with-no-runtime-deps-check
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop
-}
diff --git a/community-staging/blueman/blueman.install b/community-staging/blueman/blueman.install
deleted file mode 100644
index 8bf021487..000000000
--- a/community-staging/blueman/blueman.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/c++-gtk-utils/PKGBUILD b/community-staging/c++-gtk-utils/PKGBUILD
deleted file mode 100644
index 3e4af82fb..000000000
--- a/community-staging/c++-gtk-utils/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 75681 2012-08-29 07:32:00Z spupykin $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=c++-gtk-utils
-pkgver=2.0.11
-pkgrel=2
-pkgdesc="Classes and functions for programming in GTK+"
-arch=('i686' 'x86_64')
-url="http://cxx-gtk-utils.sourceforge.net/"
-license=('LGPL2.1')
-depends=('gtk3')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('30e0299d677fb857bb0291e467408279')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/cclive/PKGBUILD b/community-staging/cclive/PKGBUILD
deleted file mode 100644
index 9f067cc59..000000000
--- a/community-staging/cclive/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 73463 2012-07-08 05:01:51Z tdziedzic $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: joyfulgirl@archlinux.us
-# Contributor: nathan owe ndowens04 at gmail dot com
-
-pkgname=cclive
-pkgver=0.7.9
-pkgrel=2
-pkgdesc='Commandline downloader for popular video websites.'
-arch=('i686' 'x86_64')
-url='http://cclive.sourceforge.net/'
-license=('GPL3')
-depends=('boost-libs' 'pcre' 'curl' 'libquvi')
-makedepends=('boost')
-source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2c7a3bbc2d6fdcfebb60cb3ae57944b5')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/cdfs/PKGBUILD b/community-staging/cdfs/PKGBUILD
deleted file mode 100644
index 4ac07ebdd..000000000
--- a/community-staging/cdfs/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 74197 2012-07-22 19:49:11Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
-
-pkgname=cdfs
-pkgver=2.6.27
-pkgrel=25
-pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
-arch=(i686 x86_64)
-url="http://www.elis.UGent.be/~ronsse/cdfs/"
-license=('GPL')
-makedepends=('linux-headers')
-install=cdfs.install
-source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2"
-	"cdfs-3.0.patch"
-	"cdfs-3.2.patch"
-	"cdfs-3.4.patch")
-md5sums=('ac64c014a90e3c488394832ea29605b3'
-         'aba7da94a9dcbb8a93ea423cb6958fef'
-         'e934407b3460257a301822ffc4ab3933'
-         '9215e7bdac728bd2f889fb525e543454')
-
-build() {
-  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
-  depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
-  _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-ARCH/version`
-
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/cdfs-3.0.patch
-  patch -p1 <$srcdir/cdfs-3.2.patch
-  patch -p1 <$srcdir/cdfs-3.4.patch
-  make KDIR=/usr/lib/modules/${_kernverfull}/build
-  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
-  sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install
-}
diff --git a/community-staging/cdfs/cdfs-3.0.patch b/community-staging/cdfs/cdfs-3.0.patch
deleted file mode 100644
index 20194b848..000000000
--- a/community-staging/cdfs/cdfs-3.0.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
---- cdfs-2.6.27/cddata.c	2009-12-21 17:04:03.000000000 +0300
-+++ cdfs-2.6.27.my/cddata.c	2011-07-24 21:18:44.000000000 +0400
-@@ -83,7 +83,7 @@
- #else
-   .mmap             = generic_file_readonly_mmap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
--  .sendfile         = generic_file_sendfile
-+//  .sendfile         = generic_file_sendfile
- #else
-   .splice_read      = generic_file_splice_read
- #endif
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2011-07-25 13:16:59.000000000 +0400
-@@ -32,19 +30,14 @@
-  *	Added code to transform /proc/cdfs into a sequential synthetic file.  *
-  *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- 
--
- #include <linux/seq_file.h>
--
--#ifndef OLD_KERNEL
- #include <linux/statfs.h>
--#endif
-+#include <linux/sched.h>
- 
- extern struct seq_operations cdfs_operations;
- extern struct _track_info *dummy_track_p;
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) 
- struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); 
--#endif
- /*============================================================================*
-  *  cdfs_open()                                                               *
-  *	Description:                                                          *
-@@ -115,15 +108,8 @@
- 
- /********************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
--  kdev_t dev = sb->s_dev;
--  int i, j, t;
--  struct cdrom_tochdr  hdr;
--#else
- static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
-   int i, t;
--#endif
-   struct cdrom_tocentry   entry;   
-   int no_audio=0, no_data=0;
-   cd * this_cd;
-@@ -131,24 +117,13 @@
- 
-   PRINT("cdfs_mount\n");
- 
--#ifdef OLD_KERNEL
--  MOD_INC_USE_COUNT;
--
--  set_blocksize(dev, CD_FRAMESIZE);  // voor bread met ide-cd
--#else
-   sb_set_blocksize(sb, CD_FRAMESIZE);  // voor bread met ide-cd
--#endif
- 
-   sb->s_blocksize = CD_FRAMESIZE;
-   sb->s_blocksize_bits = 11;
- 
-   if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;     
--    return NULL;
--#else
-     return -ENOMEM;
--#endif
-   }
- 
-   this_cd->mode           = MODE;
-@@ -160,13 +135,8 @@
- 
-   // Initialize cache for maximum sector size
-   if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;
--    return NULL;
--#else
-     kfree(cdfs_info(sb));
-     return -ENOMEM;
--#endif
-   }
- 
-   // Cache is still invalid
-@@ -183,23 +153,13 @@
-   if (this_cd->toc_scsi){
-     if (cdfs_toc_read_full(sb)){
-       printk("TOC read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   } else {
-     //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
-     if (cdfs_toc_read(sb)){
-       printk("cdfs_toc_read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   }
- 
-@@ -365,11 +325,7 @@
-   sb->s_flags |= MS_RDONLY;
-   sb->s_op     = &cdfs_ops;
-   /* always get inode status */
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
-   retinode=cdfs_iget(sb, 0);
--#else
--  retinode=iget(sb, 0);
--#endif
-   if ( IS_ERR(retinode) )
-     return PTR_ERR(retinode);
- 
-@@ -379,16 +335,12 @@
- 
-   cdfs_proc_cd = this_cd;
- 
--#ifdef OLD_KERNEL
--  return sb;
--#else
-   return 0;
- 
- invalid:
-   kfree(this_cd->cache);
-   kfree(cdfs_info(sb));
-   return -EINVAL;
--#endif
- }
- 
- /************************************************************************/
-@@ -410,27 +362,12 @@
-   // Remove /proc entry
-   cdfs_proc_cd = NULL; 
-   kfree(cdfs_info(sb));
--
--#ifdef OLD_KERNEL
--  MOD_DEC_USE_COUNT;
--#endif
--
- }
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
- static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
-   cd * this_cd = cdfs_info(d->d_sb);
--#else
--static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#endif
--#endif
-   PRINT("rmfs_statfs\n");
- 
-   buf->f_type    = CDFS_MAGIC;
-@@ -460,11 +397,7 @@
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
--#else
- static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
--#endif
-   struct inode * inode;
-   int i;
-   cd * this_cd = cdfs_info(dir->i_sb);
-@@ -480,15 +413,9 @@
- /* Use goto and read inode with iget()/cdfs_iget() */
- /* Thanks to David Howells for patch and Master class in his mail */
- found:
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
- inode = cdfs_iget(dir->i_sb, i);
- if (IS_ERR(inode))
-   return ERR_CAST(inode);
--#else
--  inode = iget(dir->i_sb, i);
--  if (!inode)
--    return ERR_PTR(-ENOMEM);
--#endif
- d_add(dentry, inode);
- return NULL;
- }
-@@ -529,12 +456,8 @@
-     i->i_fop   = &cdfs_dir_operations;
-   } else {                                          /* file */
-     i->i_size  = this_cd->track[i->i_ino].size;
--#ifdef OLD_KERNEL
--    i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
--#else
-     i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
-     i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
--#endif
-     i->i_mode  = this_cd->mode;
-     if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
-       i->i_fop          = &cdfs_cddata_file_operations; 
-@@ -587,33 +510,21 @@
- /******************************************************************/
- 
- static struct super_operations cdfs_ops = {
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
--  .read_inode = cdfs_read_inode,
--#endif
-   .put_super  = cdfs_umount,
-   .statfs     = cdfs_statfs
- };
- 
--#ifdef OLD_KERNEL
--static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
--static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
--#else
--static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
--#endif
--}
-+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
-+//  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
-+//}
- 
- static struct file_system_type cdfs_fs_type = {
-   .owner    = THIS_MODULE,
-   .name     = "cdfs",
--  .get_sb   = cdfs_get_sb,
-+//  .get_sb   = cdfs_get_sb,
-   .kill_sb  = kill_block_super,
-   .fs_flags = FS_REQUIRES_DEV
- };
--#endif
- 
- /******************************************************/
- 
-@@ -621,10 +532,6 @@
- MODULE_DESCRIPTION("CDfs: a CD filesystem");
- MODULE_LICENSE("GPL"); 
- 
--#ifdef OLD_KERNEL
--EXPORT_NO_SYMBOLS;
--#endif
--
- /******************************************************************/
- 
- static int __init cdfs_init(void) {
-@@ -676,11 +583,7 @@
-   
-   if (!options) return;
-   
--#ifdef OLD_KERNEL
--  for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
--#else
-   while ((this_char = strsep(&options,",")) != NULL) {
--#endif
-     
-     if (!strcmp(this_char,"single")) 
-       this_cd->single=TRUE;
diff --git a/community-staging/cdfs/cdfs-3.2.patch b/community-staging/cdfs/cdfs-3.2.patch
deleted file mode 100644
index d3300bdbc..000000000
--- a/community-staging/cdfs/cdfs-3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-01-18 11:23:03.000000000 +0400
-@@ -517,7 +517,7 @@
-   
-   i->i_uid        = this_cd->uid;
-   i->i_gid        = this_cd->gid;
--  i->i_nlink      = 1;
-+  i->__i_nlink      = 1;
-   i->i_op         = &cdfs_inode_operations;
-   i->i_fop        = NULL;
-   i->i_data.a_ops = NULL;
diff --git a/community-staging/cdfs/cdfs-3.4.patch b/community-staging/cdfs/cdfs-3.4.patch
deleted file mode 100644
index 5c2cb9b24..000000000
--- a/community-staging/cdfs/cdfs-3.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-06-15 17:09:27.000000000 +0400
-@@ -375,7 +375,7 @@
- 
-   PRINT("retinode = %ld\n", retinode->i_ino);
- 
--  sb->s_root   = d_alloc_root(retinode);
-+  sb->s_root   = d_make_root(retinode);
- 
-   cdfs_proc_cd = this_cd;
- 
diff --git a/community-staging/cdfs/cdfs.install b/community-staging/cdfs/cdfs.install
deleted file mode 100644
index 6be46f6d5..000000000
--- a/community-staging/cdfs/cdfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-staging/cegui/PKGBUILD b/community-staging/cegui/PKGBUILD
deleted file mode 100644
index 18759cd5f..000000000
--- a/community-staging/cegui/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 78692 2012-10-22 21:30:12Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org> 
-# Contributor: William Rea <sillywilly@gmail.com>, 
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-
-pkgname=cegui
-pkgver=0.7.7
-pkgrel=2
-pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
-arch=('i686' 'x86_64')
-url="http://crayzedsgui.sourceforge.net"
-#options=('!libtool')
-license=("MIT")
-depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly')
-makedepends=('python2' 'doxygen' 'ogre' 'irrlicht' 'gtk2' 'boost' 'graphviz')
-optdepends=("python2: python bindings"
-            "ogre: ogre module"
-            "irrlicht: irrlicht module")
-options=(!libtool)
-source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
-md5sums=('8b83577f86eaa1581765dd155c7c8f24')
-
-build() {
-  cd $srcdir/CEGUI-${pkgver}
-
-  ./bootstrap
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-null-renderer \
-    --with-gtk2
-
-  make
-}
-
-package() {
-  cd $srcdir/CEGUI-${pkgver}
- 
-  make DESTDIR=${pkgdir} install
-
-  cd doc/doxygen && doxygen
-  cd .. && make DESTDIR=${pkgdir} install-html
-
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/community-staging/cegui/cegui-0.7.6-python-detection.patch b/community-staging/cegui/cegui-0.7.6-python-detection.patch
deleted file mode 100644
index e14cd812e..000000000
--- a/community-staging/cegui/cegui-0.7.6-python-detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- acinclude.m4.original	2012-01-24 10:42:16.066632295 +0100
-+++ acinclude.m4	2012-01-24 10:43:15.800274030 +0100
-@@ -1411,7 +1411,7 @@
- if test x$ax_python_bin != x; then
-    AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
-    AC_CHECK_HEADER([$ax_python_bin/Python.h],
--   [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
-+   [[ax_python_header="/usr/include/$ax_python_bin"]],
-    ax_python_header=no)
-    if test x$ax_python_lib != xno; then
-      if test x$ax_python_header != xno; then
diff --git a/community-staging/chromaprint/PKGBUILD b/community-staging/chromaprint/PKGBUILD
deleted file mode 100644
index 52518f3ea..000000000
--- a/community-staging/chromaprint/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 71948 2012-06-04 01:05:16Z bisson $
-# Contributor: Wieland Hoffmann <the_mineo@web.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=chromaprint
-pkgver=0.6
-pkgrel=3
-pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
-url='http://acoustid.org/chromaprint/'
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('ffmpeg')
-makedepends=('cmake')
-source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'ffmpeg.patch')
-sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0'
-          '56057f824a29194fc6041bd73e0d07412fcc065b')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../ffmpeg.patch
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON .
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/chromaprint/ffmpeg.patch b/community-staging/chromaprint/ffmpeg.patch
deleted file mode 100644
index 7c0b86d77..000000000
--- a/community-staging/chromaprint/ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c
---- old/examples/fpcalc.c	2011-12-22 22:11:23.000000000 +1100
-+++ new/examples/fpcalc.c	2012-06-04 10:44:30.596604910 +1000
-@@ -28,7 +28,7 @@
- #endif
- 	int16_t *buffer;
- 
--	if (av_open_input_file(&format_ctx, file_name, NULL, 0, NULL) != 0) {
-+	if (avformat_open_input(&format_ctx, file_name, NULL, NULL) != 0) {
- 		fprintf(stderr, "ERROR: couldn't open the file\n");
- 		goto done;
- 	}
-@@ -71,9 +71,9 @@
- 		goto done;
- 	}
- 
--	if (codec_ctx->sample_fmt != SAMPLE_FMT_S16) {
-+	if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) {
- #ifdef HAVE_AV_AUDIO_CONVERT
--		convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, codec_ctx->channels,
-+		convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codec_ctx->channels,
- 		                                     codec_ctx->sample_fmt, codec_ctx->channels, NULL, 0);
- 		if (!convert_ctx) {
- 			fprintf(stderr, "ERROR: couldn't create sample format converter\n");
-@@ -133,7 +133,7 @@
- 			if (convert_ctx) {
- 				const void *ibuf[6] = { buffer1 };
- 				void *obuf[6] = { buffer2 };
--				int istride[6] = { av_get_bits_per_sample_format(codec_ctx->sample_fmt) / 8 };
-+				int istride[6] = { av_get_bytes_per_sample(codec_ctx->sample_fmt) };
- 				int ostride[6] = { 2 };
- 				int len = buffer_size / istride[0];
- 				if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) {
diff --git a/community-staging/converseen/PKGBUILD b/community-staging/converseen/PKGBUILD
deleted file mode 100644
index 8712b24c1..000000000
--- a/community-staging/converseen/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 78710 2012-10-23 01:14:53Z ebelanger $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: archtux <antonio.arias99999 at gmail.com>
-
-pkgname=converseen
-pkgver=0.5.1
-pkgrel=2
-pkgdesc="The batch image converter and resizer"
-arch=('i686' 'x86_64')
-url="http://converseen.sourceforge.net/"
-license=('GPL3')
-depends=('imagemagick' 'qt' 'libwmf' 'openexr')
-makedepends=('cmake')
-install=converseen.install
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('db00c0cf86977494effa971fd238c786')
-
-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/community-staging/converseen/converseen.install b/community-staging/converseen/converseen.install
deleted file mode 100644
index 9af7fa81f..000000000
--- a/community-staging/converseen/converseen.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/couchdb/PKGBUILD b/community-staging/couchdb/PKGBUILD
deleted file mode 100644
index abd01c86d..000000000
--- a/community-staging/couchdb/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 74205 2012-07-22 21:09:13Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
-# Contributor: Michael Fellinger <m.fellinger@gmail.com>
-
-pkgname=couchdb
-pkgver=1.2.0
-pkgrel=4
-pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
-arch=('i686' 'x86_64')
-url="http://couchdb.apache.org"
-license=('APACHE')
-depends=('icu' 'erlang' 'js' 'openssl' 'curl')
-install=couchdb.install
-options=('!libtool')
-backup=('etc/couchdb/local.ini'
-	'etc/conf.d/couchdb'
-	'etc/logrotate.d/couchdb')
-source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "rc-script.patch")
-md5sums=('a5cbbcaac288831b3d8a08b725657f10'
-         '890a85b22219ea113a4901a289c442f8'
-         '8a3b1a1ff98a6411827ad991db7a355b')
-
-build() {
-  cd "$srcdir/apache-$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
-  make
-  
-  patch -R etc/init/couchdb <$srcdir/rc-script.patch
-}
-
-package() {
-  cd "$srcdir/apache-$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb
-  sed -i 's|\(CONFIGURATION_FILE=/etc/\)default\(/couchdb\)|\1conf.d\2|' $pkgdir/etc/rc.d/couchdb
-  sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb
-
-  rm -rf $pkgdir/etc/default/ $pkgdir/var/run
-}
diff --git a/community-staging/couchdb/couchdb.install b/community-staging/couchdb/couchdb.install
deleted file mode 100644
index 5eff459c7..000000000
--- a/community-staging/couchdb/couchdb.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	id couchdb &>/dev/null || \
-		useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
-	mkdir -p /var/run/couchdb
-	chown -R couchdb.daemon /etc/couchdb
-	chown -R couchdb.daemon /var/{lib,log,run}/couchdb
-}
-
-pre_upgrade() {
-	id couchdb &>/dev/null || \
-		useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
-}
-
-post_upgrade() {
-	mkdir -p $pkgdir/var/run/couchdb
-	chown -R couchdb.daemon /etc/couchdb
-	chown -R couchdb.daemon /var/{lib,log,run}/couchdb
-}
-
-post_remove() {
-	userdel couchdb &>/dev/null
-}
diff --git a/community-staging/couchdb/rc-script.patch b/community-staging/couchdb/rc-script.patch
deleted file mode 100644
index 1dd723ffc..000000000
--- a/community-staging/couchdb/rc-script.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- couchdb	2011-12-27 01:21:59.000000000 +0400
-+++ couchdb.my	2011-12-27 01:21:18.000000000 +0400
-@@ -1,6 +1,4 @@
--#!/bin/bash
--. /etc/rc.conf
--. /etc/rc.d/functions
-+#!/bin/sh -e
- 
- # Licensed under the Apache License, Version 2.0 (the "License"); you may not
- # use this file except in compliance with the License. You may obtain a copy of
-@@ -31,7 +29,7 @@
- NAME=couchdb
- SCRIPT_NAME=`basename $0`
- COUCHDB=/usr/bin/couchdb
--CONFIGURATION_FILE=/etc/conf.d/couchdb
-+CONFIGURATION_FILE=/etc/default/couchdb
- RUN_DIR=/var/run/couchdb
- LSB_LIBRARY=/lib/lsb/init-functions
- 
-@@ -44,14 +42,16 @@
- fi
- 
- log_daemon_msg () {
--    stat_busy $@
-+    # Dummy function to be replaced by LSB library.
-+
-+    echo $@
- }
- 
- log_end_msg () {
-+    # Dummy function to be replaced by LSB library.
-+
-     if test "$1" != "0"; then
--      stat_fail
--    else
--      stat_done
-+      echo "Error with $DESCRIPTION: $NAME"
-     fi
-     return $1
- }
-@@ -66,7 +66,7 @@
-         command="$command $COUCHDB_OPTIONS"
-     fi
-     if test -n "$COUCHDB_USER"; then
--        if su $COUCHDB_USER -s /bin/bash -c "$command"; then
-+        if su $COUCHDB_USER -c "$command"; then
-             return $SCRIPT_OK
-         else
-             return $SCRIPT_ERROR
-@@ -84,7 +84,6 @@
-     # Start Apache CouchDB as a background process.
- 
-     mkdir -p "$RUN_DIR"
--    chown -R $COUCHDB_USER "$RUN_DIR"
-     command="$COUCHDB -b"
-     if test -n "$COUCHDB_STDOUT_FILE"; then
-         command="$command -o $COUCHDB_STDOUT_FILE"
diff --git a/community-staging/cuneiform/PKGBUILD b/community-staging/cuneiform/PKGBUILD
deleted file mode 100644
index 8e94e925b..000000000
--- a/community-staging/cuneiform/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78628 2012-10-22 10:49:00Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Maxim Vuets <maxim.vuets@gmail.com>
-
-pkgname=cuneiform
-pkgver=1.1.0
-_dpkgver=1.1
-pkgrel=4
-pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
-arch=('i686' 'x86_64')
-url="https://launchpad.net/cuneiform-linux"
-license=('BSD')
-depends=('imagemagick')
-makedepends=('cmake')
-source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2)
-md5sums=('09fd160cdfc512f26442a7e91246598d')
-
-_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}"
-
-build() {
-  cd "${_SRC_ROOT}"
-  sed -i 's#lib64#lib#' install_files.cmake
-  mkdir builddir
-  cd builddir
-
-  cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr ..
-  make
-}
-
-package() {
-  cd "${_SRC_ROOT}"/builddir
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \
-    "${pkgdir}/usr/share/licenses/cuneiform/license.txt"
-}
diff --git a/community-staging/cython/PKGBUILD b/community-staging/cython/PKGBUILD
deleted file mode 100644
index 3966cdda6..000000000
--- a/community-staging/cython/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 77132 2012-10-05 11:24:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Igor Scabini <furester @ gmail.com>
-
-pkgname=('cython' 'cython2')
-pkgbase=cython
-pkgver=0.17
-pkgrel=2
-pkgdesc="C-Extensions for Python "
-arch=(i686 x86_64)
-url="http://www.cython.org"
-license=('APACHE')
-makedepends=('python-distribute' 'python2-distribute')
-source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('d6b669956b25babf7dd86db0a98539e4')
-
-build() {
-  true
-}
-
-package_cython() {
-  depends=('python')
-
-  cd $srcdir/Cython-$pkgver
-  python setup.py install --root=$pkgdir
-
-  sed -i 's|#!.*python|#!/usr/bin/python3|' $pkgdir/usr/bin/*
-}
-
-package_cython2() {
-  depends=('python2')
-
-  cd $srcdir/Cython-$pkgver
-  python2 setup.py install --root=$pkgdir
-
-  mv $pkgdir/usr/bin/cygdb $pkgdir/usr/bin/cygdb2
-  mv $pkgdir/usr/bin/cython $pkgdir/usr/bin/cython2
-}
diff --git a/community-staging/darktable/PKGBUILD b/community-staging/darktable/PKGBUILD
deleted file mode 100644
index 3548f4fed..000000000
--- a/community-staging/darktable/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 78630 2012-10-22 10:52:27Z 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=1.0.5
-_pkgver=1.0
-pkgrel=4
-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' 'sqlite')
-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=('9ad88a1a6b9761fce28c8073d8f47941')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-#  mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt
-  sed -i 's/-Werror//' src/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/deadbeef/PKGBUILD b/community-staging/deadbeef/PKGBUILD
deleted file mode 100644
index 3f00863c4..000000000
--- a/community-staging/deadbeef/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 72825 2012-06-23 00:39:43Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.5.5
-pkgrel=1
-pkgdesc='An audio player for GNU/Linux based on GTK2.'
-arch=('i686' 'x86_64')
-url='http://deadbeef.sourceforge.net'
-license=('GPL2')
-depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
-             'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate'
-             'yasm')
-optdepends=('libsamplerate: for Resampler plugin'
-            'libvorbis: for Ogg Vorbis playback'
-            'libmad: for MP1/MP2/MP3 playback'
-            'flac: for FLAC playback'
-            'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
-            'imlib2: for artwork plugin'
-            'wavpack: for WavPack playback'
-            'libsndfile: for Wave playback'
-            'libcdio: audio cd plugin'
-            'libcddb: audio cd plugin'
-            'faad2: for AAC/MP4 support'
-            'dbus: for OSD notifications support'
-            'pulseaudio: for PulseAudio output plugin'
-            'libx11: for global hotkeys plugin'
-            'zlib: for Audio Overload plugin'
-            'libzip: for vfs_zip plugin')
-options=('!libtool')
-install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7cc10cefda0f4044eea897893e4cc1a9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --disable-ffmpeg
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
deleted file mode 100644
index db1c79638..000000000
--- a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Mon, 4 Jul 2011 16:47:25 +0400
-Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT()
-
-For ffmpeg < 0.5.  Copied from libavutil 0.5.
-
-ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc
-
-fixes build with lavc 53.
-
-ffmpeg: fix erroneous version comparisons
-
-Comparing versions this way: (x.y < x1.y1) is obviously equivalent to
-(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1).
-
-ffmpeg: use av_register_protocol2() if available
-
-fixes usage with ffmpeg-0.8
----
- plugins/ffmpeg/ffmpeg.c |   37 ++++++++++++++++++++++++++++++-------
- 1 files changed, 30 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index cd7edf4..0cb9955 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -44,6 +44,10 @@
- #define av_register_protocol register_protocol
- #endif
- 
-+#ifndef AV_VERSION_INT
-+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-+#endif
-+
- #endif
- 
- //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
-     for (i = 0; i < info->fctx->nb_streams; i++)
-     {
-         info->ctx = info->fctx->streams[i]->codec;
--        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (info->ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             info->codec = avcodec_find_decoder (info->ctx->codec_id);
-             if (info->codec != NULL) {
-@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
-             int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-             int len;
-             //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size);
--#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25)
--            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
--#else
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0)
-             len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt);
-+#else
-+            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
- #endif
-             trace ("out: out_size=%d, len=%d\n", out_size, len);
-             if (len <= 0) {
-@@ -418,7 +427,7 @@ static const char *map[] = {
- 
- static int
- ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
--#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0)
-     if (!strlen (fctx->title)) {
-         // title is empty, this call will set track title to filename without extension
-         deadbeef->pl_add_meta (it, "title", NULL);
-@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
-@@ -704,7 +718,11 @@ ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-     avcodec_init ();
-     av_register_all ();
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+    av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
-+#else
-     av_register_protocol (&vfswrapper);
-+#endif
-     return 0;
- }
- 
-@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) {
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL)
--- 
-1.7.8.4
-
diff --git a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
deleted file mode 100644
index af8c282c0..000000000
--- a/community-staging/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Thu, 7 Jul 2011 22:31:44 +0400
-Subject: [PATCH 2/2] ffmpeg: version check fix
-
----
- plugins/ffmpeg/ffmpeg.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index 0cb9955..37c7e80 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -718,7 +718,7 @@ ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-     avcodec_init ();
-     av_register_all ();
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0)
-     av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
- #else
-     av_register_protocol (&vfswrapper);
--- 
-1.7.8.4
-
diff --git a/community-staging/deadbeef/deadbeef.install b/community-staging/deadbeef/deadbeef.install
deleted file mode 100644
index fcdbf15fb..000000000
--- a/community-staging/deadbeef/deadbeef.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=deadbeef
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-
-  cat <<EOF
-==> ffmpeg support was disabled in this deadbeef release due to
-==> incompatibilities with ffmpeg 0.11. It might be re-introduced soon.
-EOF
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/dee/PKGBUILD b/community-staging/dee/PKGBUILD
deleted file mode 100644
index 00b13d216..000000000
--- a/community-staging/dee/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 77761 2012-10-14 15:22:02Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=dee
-pkgver=1.0.14
-pkgrel=2
-pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/dee"
-license=('LGPL')
-depends=('glib2' 'icu')
-makedepends=('python2' 'gobject-introspection' 'vala')
-options=('!libtool')
-source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('473b4181e26538af0fb753255da7945c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-tests \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py"
-}
diff --git a/community-staging/devil/PKGBUILD b/community-staging/devil/PKGBUILD
deleted file mode 100644
index f2ba5462d..000000000
--- a/community-staging/devil/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78557 2012-10-20 21:46:36Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: TheHoff <forums>
-
-pkgname=devil
-pkgver=1.7.8
-pkgrel=14
-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
-
-  if [[ $CARCH == x86_64 ]]; then
-    ./configure --prefix=/usr --enable-ILU
-  else
-    ./configure --prefix=/usr --enable-ILU --disable-sse3
-  fi
-
-  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/duplicity/PKGBUILD b/community-staging/duplicity/PKGBUILD
deleted file mode 100644
index 9fc900326..000000000
--- a/community-staging/duplicity/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 77932 2012-10-15 23:29:05Z allan $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Aaron Schaefer <aaron@elasticdog.com>
-
-pkgname=duplicity
-pkgver=0.6.19
-pkgrel=2
-pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
-arch=('i686' 'x86_64')
-url='http://www.nongnu.org/duplicity/'
-license=('GPL')
-depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('c88122d0b651f84f3bfa42e55591c36b'
-         'df672ed47b8eb4fd8ffa99711623b6b5')
-
-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
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  # fix broken documentation permissions until upstream does (FS#27301)
-  chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1"
-  chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1"
-  chmod 644 "$pkgdir/usr/share/doc/$pkgname-$pkgver"/*
-}
diff --git a/community-staging/duplicity/botobackend.patch b/community-staging/duplicity/botobackend.patch
deleted file mode 100644
index 302e1e2b1..000000000
--- a/community-staging/duplicity/botobackend.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file duplicity/backends/botobackend.py
---- duplicity/backends/botobackend.py	2011-11-25 17:47:57 +0000
-+++ duplicity/backends/botobackend.py	2011-12-01 16:15:25 +0000
-@@ -26,6 +26,6 @@
-     if sys.version_info[:2] < (2,6):
-         print "Sorry, S3 multiprocessing requires version 2.6 or later of python"
-         sys.exit(1)
--    import _boto_multi.py
-+    import _boto_multi
- else:
--    import _boto_single.py
-+    import _boto_single
-
diff --git a/community-staging/duplicity/duplicity-0.6.17-fix-memleak.patch b/community-staging/duplicity/duplicity-0.6.17-fix-memleak.patch
deleted file mode 100644
index 1c4c8daff..000000000
--- a/community-staging/duplicity/duplicity-0.6.17-fix-memleak.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-=== modified file 'duplicity/util.py'
---- duplicity/util.py	2011-08-23 18:14:17 +0000
-+++ duplicity/util.py	2012-01-20 21:50:01 +0000
-@@ -71,6 +71,10 @@
-         else:
-             raise
- 
-+class BlackHoleList(list):
-+    def append(self, x):
-+        pass
-+
- class FakeTarFile:
-     debug = 0
-     def __iter__(self):
-@@ -83,7 +87,12 @@
-     # yet.  So we want to ignore ReadError exceptions, which are used to signal
-     # this.
-     try:
--        return tarfile.TarFile("arbitrary", mode, fp)
-+        tf = tarfile.TarFile("arbitrary", mode, fp)
-+        # Now we cause TarFile to not cache TarInfo objects.  It would end up
-+        # consuming a lot of memory over the lifetime of our long-lasting
-+        # signature files otherwise.
-+        tf.members = BlackHoleList()
-+        return tf
-     except tarfile.ReadError:
-         return FakeTarFile()
- 
-
diff --git a/community-staging/electricsheep/PKGBUILD b/community-staging/electricsheep/PKGBUILD
deleted file mode 100644
index 3f57554a2..000000000
--- a/community-staging/electricsheep/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 72469 2012-06-15 00:54:28Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=electricsheep
-pkgver=2.7b33
-pkgrel=1
-pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
-arch=('i686' 'x86_64')
-url="http://community.electricsheep.org/"
-license=('GPL')
-depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee')
-makedepends=('boost' 'tinyxml')
-optdepends=('xscreensaver: to use electricsheep with xscreensaver')
-options=('!emptydirs')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd'
-          'fda3aae435507d03973f0c4d1ed3509067657f06')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=r125
-  _svntrunk="http://electricsheep.googlecode.com/svn/trunk/client_generic"
-  _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 {} \;
-  (cd ${pkgname}-${pkgver} ; rm -r boost Build_guides curlTest ffmpeg InstallerMSVC \
-    Launcher libpng libxml lua5.1 MacBuild RuntimeMSVC wxConfig)
-  tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
-  popd
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/wx-config/wx-config-2.9/g' configure.ac
-  sed -i '12 i\
-#include <cstdio>' Common/Singleton.h
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
-  install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png"
-}
diff --git a/community-staging/encfs/PKGBUILD b/community-staging/encfs/PKGBUILD
deleted file mode 100644
index f591fc9f3..000000000
--- a/community-staging/encfs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 73387 2012-07-07 03:05:01Z tdziedzic $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Sven Kauber, <celeon@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=encfs
-pkgver=1.7.4
-pkgrel=8
-pkgdesc='Encrypted filesystem in user-space'
-arch=('i686' 'x86_64')
-url='http://www.arg0.net/encfs'
-license=('GPL')
-depends=('rlog' 'openssl' 'fuse' 'boost-libs')
-makedepends=('boost')
-options=('!libtool')
-source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz")
-md5sums=('ac90cc10b2e9fc7e72765de88321d617')
-
-build(){
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/evas_generic_loaders-svn/PKGBUILD b/community-staging/evas_generic_loaders-svn/PKGBUILD
deleted file mode 100644
index 77382038c..000000000
--- a/community-staging/evas_generic_loaders-svn/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 72855 2012-06-24 02:55:40Z dwallace $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=evas_generic_loaders-svn
-pkgver=72171
-pkgrel=2
-pkgdesc="Additional generic loaders for Evas"
-arch=('i686' 'x86_64')
-groups=('e17-libs-svn' 'e17-svn')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina-svn')
-makedepends=('subversion')
-conflicts=('evas_generic_loaders')
-provides=('evas_generic_loaders')
-options=('!libtool' '!emptydirs')
-md5sums=()
-         
-_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas_generic_loaders"
-_svnmod="evas_generic_loaders"
-
-build() {
-   cd "$srcdir"
-
-msg "Connecting to $_svntrunk SVN server...."
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting make..."
-
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_svnmod-build"
-  make DESTDIR="$pkgdir" install
-
-# install license files
-  install -Dm644 "$srcdir/$_svnmod-build/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  rm -r "$srcdir/$_svnmod-build"
-
-}
diff --git a/community-staging/exim/PKGBUILD b/community-staging/exim/PKGBUILD
deleted file mode 100644
index 8a12bc77a..000000000
--- a/community-staging/exim/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 72191 2012-06-10 09:35:25Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=exim
-pkgver=4.80
-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
-depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
-provides=('smtp-server')
-conflicts=('smtp-server')
-options=('!makeflags')
-source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2"
-        aliases
-        exim
-        exim.logrotate
-        exim.conf.d
-        exim.Makefile
-        exim-submission@.service
-        exim.service
-        exim@.service
-        exim.socket
-        exim-submission.socket)
-sha256sums=('787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984'
-            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
-            '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
-            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
-            '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
-            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55'
-            '32def7387aaa040b994c0d399c6053dc42d9da4c8c8f0a34d33da653be27e324'
-            '99aaf3c960396fc08ec918fdca1cf73850960f6c519982d1a653f2e673754445'
-            '0436411932d6b6268db54a84e4ffc209bde0fa7567442d8e3d138557eeccbad4'
-            '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26'
-            'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cp "$srcdir/$pkgname.Makefile" Local/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
-  install -Dm0644 $srcdir/exim.conf.d "${pkgdir}/etc/conf.d/exim"
-  install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8"
-  install -Dm0755 $srcdir/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 -m0755 "$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
-
-  install -Dm0644 "$srcdir/exim-submission@.service" \
-    "${pkgdir}/usr/lib/systemd/system/exim-submission@.service"
-  install -Dm0644 "$srcdir/exim.service" "${pkgdir}/usr/lib/systemd/system/exim.service"
-  install -Dm0644 "$srcdir/exim@.service" "${pkgdir}/usr/lib/systemd/system/exim@.service"
-  install -Dm0644 "$srcdir/exim.socket" "${pkgdir}/usr/lib/systemd/system/exim.socket"
-  install -Dm0644 "$srcdir/exim-submission.socket" \
-    "${pkgdir}/usr/lib/systemd/system/exim-submission.socket"
-}
diff --git a/community-staging/exim/aliases b/community-staging/exim/aliases
deleted file mode 100644
index 5a76ff7d5..000000000
--- a/community-staging/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-staging/exim/exim b/community-staging/exim/exim
deleted file mode 100644
index 8e9640b32..000000000
--- a/community-staging/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-staging/exim/exim-submission.socket b/community-staging/exim/exim-submission.socket
deleted file mode 100644
index b9593e2ef..000000000
--- a/community-staging/exim/exim-submission.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Exim Mail Transfer Agent (message submission)
-Conflicts=exim.service
-
-[Socket]
-ListenStream=587
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/community-staging/exim/exim-submission@.service b/community-staging/exim/exim-submission@.service
deleted file mode 100644
index 8b1d056a8..000000000
--- a/community-staging/exim/exim-submission@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-# It doesn't make sense for this to be separate from exim@.service
-# However, I couldn't think of a way to have two .socket files point
-# to it ([Socket] Service= is rejected if Accept=yes is set).
-
-[Unit]
-Description=Exim Mail Daemon per-connection server (message submission)
-
-[Service]
-ExecStart=-/usr/sbin/exim -bs
-StandardInput=socket
-StandardError=syslog
diff --git a/community-staging/exim/exim.Makefile b/community-staging/exim/exim.Makefile
deleted file mode 100644
index a304ce829..000000000
--- a/community-staging/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-staging/exim/exim.conf.d b/community-staging/exim/exim.conf.d
deleted file mode 100644
index b9bec4335..000000000
--- a/community-staging/exim/exim.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-EXIM_ARGS="-bd -q15m"
diff --git a/community-staging/exim/exim.install b/community-staging/exim/exim.install
deleted file mode 100644
index 8ed329559..000000000
--- a/community-staging/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-staging/exim/exim.logrotate b/community-staging/exim/exim.logrotate
deleted file mode 100644
index 070ba4747..000000000
--- a/community-staging/exim/exim.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/exim/*log {
-   su exim exim
-   missingok
-   notifempty
-   delaycompress
-}
diff --git a/community-staging/exim/exim.service b/community-staging/exim/exim.service
deleted file mode 100644
index de52fd14f..000000000
--- a/community-staging/exim/exim.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Exim Mail Daemon
-
-[Service]
-PIDFile=/var/run/exim.pid
-ExecStart=/usr/sbin/exim -bdf -q30m
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-staging/exim/exim.socket b/community-staging/exim/exim.socket
deleted file mode 100644
index 36d28684f..000000000
--- a/community-staging/exim/exim.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Exim Mail Transfer Agent
-Conflicts=exim.service
-
-[Socket]
-ListenStream=25
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/community-staging/exim/exim@.service b/community-staging/exim/exim@.service
deleted file mode 100644
index 120485b8b..000000000
--- a/community-staging/exim/exim@.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Exim Mail Daemon per-connection server
-
-[Service]
-ExecStart=-/usr/sbin/exim -bs
-StandardInput=socket
-StandardError=syslog
diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD
deleted file mode 100644
index 195e8644a..000000000
--- a/community-staging/fatrat/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 73722 2012-07-14 15:53:10Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=fatrat
-pkgver=1.2.0_beta2
-pkgrel=1
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
-url="http://fatrat.dolezel.info/"
-license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('boost' 'cmake' 'java-environment')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz)
-md5sums=('ad823d2a81f0583316ece815b928c71b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-
-  cmake \
-    -DWITH_EVERYTHING=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    .
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/fcron/PKGBUILD b/community-staging/fcron/PKGBUILD
deleted file mode 100644
index 0785774f7..000000000
--- a/community-staging/fcron/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 72351 2012-06-12 20:43:12Z 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=7
-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 fcron.service)
-md5sums=('69ebcb41921e2a282f41ebecb3a27053'
-         'e0c3f0bdc3c98fbbe46eff19001c18f2'
-         '938722c6654ef7b07f4aa10001905ba1'
-         'bfb7daa22ebe22b9917e455c1ca4a382'
-         '5ff0cdcb9ec99778938ac6ef26800327'
-         'ab589cc6813ec32b5e96bf05c2b51c4c')
-
-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"
-
-  # Install systemd service
-  install -D -m644 "$srcdir/fcron.service" \
-    "$pkgdir/usr/lib/systemd/system/fcron.service"
-
-  # avoid conflict with filesystem>=2012.06
-  rmdir "$pkgdir/var/run"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/fcron/fcron.rc b/community-staging/fcron/fcron.rc
deleted file mode 100644
index 880439a1d..000000000
--- a/community-staging/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-staging/fcron/fcron.service b/community-staging/fcron/fcron.service
deleted file mode 100644
index a47b4f19b..000000000
--- a/community-staging/fcron/fcron.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Cron Daemon
-
-[Service]
-Type=forking
-PIDFile=/run/fcron.pid
-ExecStart=/usr/sbin/fcron
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-staging/fcron/run-cron b/community-staging/fcron/run-cron
deleted file mode 100644
index 51007a15a..000000000
--- a/community-staging/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-staging/fcron/systab b/community-staging/fcron/systab
deleted file mode 100644
index 11c7e2fd0..000000000
--- a/community-staging/fcron/systab
+++ /dev/null
diff --git a/community-staging/fcron/systab.orig b/community-staging/fcron/systab.orig
deleted file mode 100644
index 5b0045626..000000000
--- a/community-staging/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-staging/ffmpeg-compat/PKGBUILD b/community-staging/ffmpeg-compat/PKGBUILD
deleted file mode 100644
index 19336feeb..000000000
--- a/community-staging/ffmpeg-compat/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg-compat
-pkgver=20120509
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz)
-md5sums=('a35359e424608f369d380f03e4dc9966')
-
-build() {
-  cd "ffmpeg"
-
-  ./configure \
-    --prefix=/usr \
-    --incdir=/usr/include/ffmpeg-compat \
-    --libdir=/usr/lib/ffmpeg-compat \
-    --shlibdir=/usr/lib/ffmpeg-compat \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --disable-static
-
-  make
-}
-
-package() {
-  cd "ffmpeg"
-  make DESTDIR="$pkgdir" install
-  rm -rf $pkgdir/usr/{bin,share}
-}
diff --git a/community-staging/ffmpeg2theora/PKGBUILD b/community-staging/ffmpeg2theora/PKGBUILD
deleted file mode 100644
index b63fe717c..000000000
--- a/community-staging/ffmpeg2theora/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 73271 2012-07-05 06:07:34Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-pkgname=ffmpeg2theora
-pkgver=0.29
-pkgrel=1
-pkgdesc="Simple converter to create Ogg Theora files"
-arch=('x86_64' 'i686')
-url="http://www.v2v.cc/~j/ffmpeg2theora/"
-license=('GPL')
-depends=('ffmpeg')
-makedepends=('scons') # 'libkate')
-source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2")
-sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  scons
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  scons install destdir="$pkgdir" prefix="/usr" mandir="PREFIX/share/man"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/freedroidrpg/PKGBUILD b/community-staging/freedroidrpg/PKGBUILD
deleted file mode 100644
index beef911e5..000000000
--- a/community-staging/freedroidrpg/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 75546 2012-08-27 06:37:32Z 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.1
-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=('b95ea6abae46bea6ee3ace9a1902f682'
-         '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/freemat/ChangeLog b/community-staging/freemat/ChangeLog
deleted file mode 100644
index dba4cf7ec..000000000
--- a/community-staging/freemat/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community-staging/freemat/PKGBUILD b/community-staging/freemat/PKGBUILD
deleted file mode 100644
index 75d39befd..000000000
--- a/community-staging/freemat/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 74207 2012-07-22 21:10:13Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=freemat
-pkgver=4.1
-pkgrel=4
-pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
-arch=('i686' 'x86_64')
-url="http://freemat.sourceforge.net"
-license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi')
-makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2')
-install=freemat.install
-source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	build-fix.patch)
-md5sums=('929d31e2310feaff5d380fc2f7b4d1a2'
-         '2d11a28aa2a7df89c4618ed1c4be5973')
-
-build() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  rm -f CMakeCache.txt
-  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
-  find . -type f -name 'add.so' -exec rm -f {} \;
-  patch -p1 <$srcdir/build-fix.patch
-  echo >libs/libMatC/CJitFuncClang.hpp
-  echo >libs/libMatC/CJitFuncClang.cpp
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DUSE_LLVM=OFF \
-	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	.
-  make
-}
-package() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  make DESTDIR=$pkgdir install
-  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
-  rm $pkgdir/usr/bin/blas.ini
-}
diff --git a/community-staging/freemat/build-fix.patch b/community-staging/freemat/build-fix.patch
deleted file mode 100644
index c1ea63088..000000000
--- a/community-staging/freemat/build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp
---- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp	2011-11-27 04:27:43.000000000 +0400
-+++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp	2012-01-20 19:07:48.000000000 +0400
-@@ -20,6 +20,7 @@
- #include <qimage.h>
- #include <qpainter.h>
- #include <QtOpenGL>
-+#include <GL/glu.h>
- #include <math.h>
- #include "IEEEFP.hpp"
- 
diff --git a/community-staging/freemat/freemat.install b/community-staging/freemat/freemat.install
deleted file mode 100644
index 051cca866..000000000
--- a/community-staging/freemat/freemat.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
-
-post_upgrade() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
diff --git a/community-staging/freeorion/PKGBUILD b/community-staging/freeorion/PKGBUILD
deleted file mode 100644
index 3ebe1af79..000000000
--- a/community-staging/freeorion/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 73567 2012-07-09 23:46:20Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: guini <sidtrun@googlemail.com>
-# Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: fana-m <geminin@gmx.net>
-
-pkgname=freeorion
-pkgver=0.4
-_fixedrevision=4635
-pkgrel=6
-pkgdesc="Turn-based galactic conquest game inspired by Master of Orion"
-arch=('x86_64' 'i686')
-url="http://www.freeorion.org/"
-license=('GPL')
-if [ "$CARCH" == "x86_64" ]
-then
-  depends=('lib32-nvidia-cg-toolkit')
-else
-  depends=('nvidia-cg-toolkit')
-fi
-depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils')
-makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-11' 'graphviz' 'libogg'
-             'desktop-file-utils' 'setconf' 'clang' 'cmake' 'gendesk' 'subversion')
-options=('!strip' '!emptydirs')
-install=$pkgname.install
-source=("$pkgname.sh"
-        "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png")
-sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf'
-            'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f')
-
-build() {
-  cd "$srcdir"
-  gendesk -n
-
-  msg2 "Checking out svn revision $_fixedrevision..."
-  if [[ -d "$pkgname/.svn" ]]; then
-    (cd "$pkgname" && svn up -r "$_fixedrevision")
-  else
-    svn co \
-      https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/ \
-      --config-dir ./ -r "$_fixedrevision" "$pkgname"
-  fi
-
-  msg2 "Setting up build directory..."
-  rm -rf "$srcdir/$pkgname-build"
-  cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
-  cd "$srcdir/$pkgname-build"
-
-  msg2 "Generating makefiles..."
-  cmake -G "Unix Makefiles"
-  
-  msg2 "GLU fix..."
-  setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING "'-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
-
-  msg2 "Boost fix..."
-  sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp
-
-  msg2 "Compiling..."
-  make -j1
-
-  msg2 "OGRE fix..."
-  sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \
-    "$srcdir/$pkgname-build/ogre_plugins.cfg"
-}
-
-package() {
-  cd "$srcdir/$pkgname-build"
-
-  msg2 "Packaging documentation..."
-  install -Dm644 loki_setup/README.txt \
-    "$pkgdir/usr/share/doc/$pkgname/README.txt"
-
-  msg2 "Packaging binaries..."
-  install -Dm 755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/freeorion"
-  install -Dm 755 freeorion "$pkgdir/usr/bin/freeorion.elf"
-  install -Dm 755 freeorionca "$pkgdir/usr/bin/freeorionca"
-  install -Dm 755 freeoriond "$pkgdir/usr/bin/freeoriond"
-
-  msg2 "Packaging data..."
-  mkdir -p "$pkgdir/usr/share/$pkgname" "$pkgdir/usr/lib/$pkgname"
-  cp -r default "$pkgdir/usr/share/$pkgname"
-  install -Dm 644 OISInput.cfg "$pkgdir/usr/share/OISInput.cfg"
-
-  msg2 "Packaging license..."
-  install -Dm 644 default/COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  cd "$srcdir"
-
-  msg2 "Packaging icon and shortcut..."
-  install -Dm 644 "$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/freeorion.png"
-  install -Dm 644 "$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/freeorion.desktop"
-
-  msg2 "Packaging OGRE plugins configuration..."
-  install -Dm 644 "$srcdir/$pkgname-build/ogre_plugins.cfg" \
-    "$pkgdir/usr/share/freeorion/ogre_plugins.cfg"
-
-  msg2 "Cleaning up..."
-  find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/freeorion/freeorion.install b/community-staging/freeorion/freeorion.install
deleted file mode 100644
index ad97d7bab..000000000
--- a/community-staging/freeorion/freeorion.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/freeorion/freeorion.sh b/community-staging/freeorion/freeorion.sh
deleted file mode 100644
index d80623ab2..000000000
--- a/community-staging/freeorion/freeorion.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-#
-# written by Markus Sinner, http://psitronic.de
-#
-# Nightly builds on.
-# http://freeorion.psitronic.de/download/nightly/
-#
-# This is a wrapper-script for starting FreeOrion on
-# ix86 (and maybe x64) Linux Systems.
-# This script will CD into application and set some
-# enviroment variables.
-
-# ---- commandline PARAMETERS and ENVIROMENT variables -----
-# This script supports parameters, that will be evaluated
-# BEFORE freeorion binary is called and will be removed, 
-# because the binary won't support them.
-# Currently only one parameter at a time is supported!
-# Parameters other than these will be appended as command
-# line parameters to the call of the freeorion binary.
-#
-# --strace
-#   This starts freeorion using the "strace" utility. 
-#   Generates a strace logifle /tmp/freeorion.trace.
-#   Make sure it is installed on your system!
-# --gdb
-#   Runs freeorion in a gdb instance, passes the original
-#   parameters through the --args parameter of gdb
-#
-#
-# ENVIROMENT variables
-# This script supports some enviroment variables. To set them
-# either use the followin command BEFORE you execute this script.
-#    export XXXX="value"
-# This permanently set the variable in you current shell script.
-# Or you prepend the options when running this script, like this:
-#    PARAM1="hello" PARAM2="yo man" /usr/bin/freeorion.elf
-#
-# Supportet are:
-#   FO_TRACE=
-#      Use this to prepend something to calling freorion.
-#      This variables also is used internally, when --gdb or --trace
-#      appear on the command line.
-#   FO_GDB_ARGS=
-#      If you use --gbd, you should uses this env to add GDB parameters.
-#      Make sure you end this list of parameters with --args, otherwise
-#      gdb won't start. Example: FO_GDB_ARGS="-q -s fo.symbols --args"
-#   LD_LIBRARY_PATH=
-#      This is a well known env and will be honored by this script.
-#
-
-
-# ---------- STARTS HERE ---------------
-# Change into application directory
-# If this is a symlink, then we
-# need to change into the dir of symlink-target.
-if [ -h $0 ]; then
-  echo "I am Symlink. Following into my targets basedir"
-  ME=`readlink $0`
-else
-  echo "Following into my basedir"
-  ME=$0
-fi
-
-# This is important! Script won't work outside its installation dir
-ROOT=/usr/share/freeorion
-cd ${ROOT}
-echo -n "CWD: "
-pwd
-
-
-
-# Check for python. If freeorionca binary is missing it, use
-# the shipped version.
-if ldd /usr/bin/freeorionca | grep "libpython.*not found"; then
-    #echo "python2.5 missing. Using shipped version."
-    PYTHON_USE_SHIPPED=1
-else 
-    #echo "python2.5 found. Using it."
-    PYTHON_USE_SHIPPED=0
-fi
-
-# Set Python library home for loading modules
-# If no python 2.5 is detected, use shipped python 2.5
-if [ "$PYTHON_USE_SHIPPED" = "1" ]; then
-    export PYTHONHOME=/usr/lib/freeorion/python2.5
-    export PYTHONPATH=${PYTHONHOME}
-    export PYTHONDEBUG=1
-    export PYTHONVERBOSE=1
-    echo "PYTHONHOME=${PYTHONHOME}"
-    
-    export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH}
-    export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so
-fi
-
-
-# Command line Parameter --gdb forces running in gdb
-# Setting FO_TRACE to gdb results in other settings, see
-# below
-if [ "$1" = "--gdb" ]; then
-    FO_TRACE="gdb"
-
-    # Don't forget to remove the param
-    shift
-fi
-
-if [ "$1" = "--strace" ]; then
-    TRACEFILE=/tmp/freeorion.trace
-    echo
-    echo "Tracing to ${TRACEFILE}"
-    echo
-    FO_TRACE="strace -f -o ${TRACEFILE}"
-
-    # Don't forget to remove the param
-    shift
-fi
-
-
-
-# Add a parameter FO_GDB_ARGS to support gdb
-# Or warn the user, if he changed FO_GDB_ARGS and has
-# forgotten to end it with --args
-if [ "$FO_TRACE" = "gdb" ]; then
-    if [ "$FO_GDB_ARGS" = "" ]; then
-	FO_GDB_ARGS="--args"
-    else
-	echo "****************************************************"
-	echo "** NOTE         NOTE         NOTE         NOTE    **"
-	echo "Running FO in gdb"
-	echo "If you use FO_GDB_ARGS on your command line, make"
-	echo "sure that you END this variabble with --args."
-	echo "Otherwise gdb will not start."
-	echo
-	echo "Type 'start' when the gdb instance has loaded!"
-	echo	
-    fi
-fi
-
-
-# Support loading libs from application/lib
-export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH}
-
-# Call with settings-dir to avoid conflicting installations
-${FO_TRACE} ${FO_GDB_ARGS} /usr/bin/freeorion.elf  --resource-dir ./default $@
diff --git a/community-staging/freerdp/PKGBUILD b/community-staging/freerdp/PKGBUILD
deleted file mode 100644
index 3856e430d..000000000
--- a/community-staging/freerdp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 71965 2012-06-04 08:07:24Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=freerdp
-pkgver=1.0.1
-pkgrel=5
-pkgdesc="Free RDP client"
-arch=('i686' 'x86_64')
-url="http://freerdp.sourceforge.net"
-license=('GPL')
-depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
-	 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv')
-makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl')
-conflicts=('freerdp-git')
-changelog=${pkgname}.changelog
-options=('!libtool')
-source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz)
-md5sums=('c843185e0ff22ce8409954651718f338')
-
-build() {
-  cd `find ${srcdir}/ -type d -name freerdp-\*`
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
-  make
-}
-
-package() {
-  cd `find ${srcdir}/ -type d -name freerdp-\*`
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/freerdp/freerdp.changelog b/community-staging/freerdp/freerdp.changelog
deleted file mode 100644
index d47f165c3..000000000
--- a/community-staging/freerdp/freerdp.changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-0.7.1-1 to 0.7.1-2
-* Added x86_64 to supported architectures (tested by figue).
diff --git a/community-staging/freewrl/PKGBUILD b/community-staging/freewrl/PKGBUILD
deleted file mode 100644
index 3099fb0ce..000000000
--- a/community-staging/freewrl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 78632 2012-10-22 11:20:36Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=freewrl
-pkgver=1.22.13.1
-_pkgver=1.22.13
-pkgrel=3
-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' 'glu')
-makedepends=('java-environment' 'xulrunner' 'wget' 'mesa')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('27f4bf163011d8ac2088a535cb58a13d')
-
-build() {
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-  cd $srcdir/$pkgname-${_pkgver}
-  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 --enable-plugin \
-    --disable-mozilla-js --enable-xulrunner-js --disable-firefox-js \
-    --disable-seamonkey-js
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-${_pkgver}
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/gambas2/PKGBUILD b/community-staging/gambas2/PKGBUILD
deleted file mode 100644
index e1afd42b5..000000000
--- a/community-staging/gambas2/PKGBUILD
+++ /dev/null
@@ -1,923 +0,0 @@
-# $Id: PKGBUILD 78401 2012-10-17 20:54:31Z 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-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.24.0
-pkgrel=8
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net"
-makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'glu' 'gtk2' 'librsvg' 'xdg-utils'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'mesa'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
-         'libxcursor' 'libsm' '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'
-	'gambas2-script.install' 'gambas2-runtime.install'
-	'poppler-0.20.patch')
-md5sums=('b59072b6f57b681d586cc84c02333690'
-         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
-         '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b'
-         '5eb70afe712c0f8667a700df4d9a6735')
-_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"
-
-  msg "Applying patches ..."
-  # workaround to allow package splitting
-  patch -Np1 -i ../fix-gbi-gba-path.patch
-  # fix building with poppler-0.20.x (merged upstream)
-  cd gb.pdf
-  patch -Np0 -i ../../poppler-0.20.patch
-  cd ..
-
-  ./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-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"
-  provides=('gambas2-gb-gui')
-  conflicts=('gambas2-gb-gui')
-  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
-
-  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
-
-  rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la}
-  rm ${pkgdir}/usr/share/gambas2/info/gb.qt*
-  
-  ## 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-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"
-
-  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"
-
-  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
-
-  ## 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"
-
-  ## 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"
-
-  ## 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' 'gcc-libs')
-  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' 'sqlite' 'gcc-libs')
-  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-runtime')
-  pkgdesc="Gambas2 form 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
-  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"
-
-  ## 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"
-
-  ## 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-image() {
-  depends=('gambas2-runtime' 'gcc-libs')
-  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"
-
-  ## 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' 'glu')
-  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"
-
-  ## 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' 'glu')
-  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"
-
-  ## 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"
-
-  ## 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/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.20.patch b/community-staging/gambas2/poppler-0.20.patch
deleted file mode 100644
index a73d42a7f..000000000
--- a/community-staging/gambas2/poppler-0.20.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: src/CPdfDocument.cpp
-===================================================================
---- src/CPdfDocument.cpp	(révision 4732)
-+++ src/CPdfDocument.cpp	(copie de travail)
-@@ -407,7 +407,11 @@
- 	white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
- 	THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
- 		
-+	#if POPPLER_VERSION_0_20
-+	THIS->dev->startDoc(THIS->doc);
-+	#else
- 	THIS->dev->startDoc(THIS->doc->getXRef ());
-+	#endif
- 
- 	outline=THIS->doc->getOutline();
- 	if (outline) THIS->index=outline->getItems();
-@@ -833,13 +837,22 @@
- 
- 	if ( (w<0) || (h<0) ) return NULL;
- 
-+	#if POPPLER_VERSION_0_20
- 	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
- 			   rotation,
- 			   gFalse,
- 			   gTrue,
- 			   x,y,w,h,
-+			   gFalse);
-+	#else
-+	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
-+			   rotation,
- 			   gFalse,
-+			   gTrue,
-+			   x,y,w,h,
-+			   gFalse,
- 			   THIS->doc->getCatalog ());
-+	#endif
- 
- 	map=THIS->dev->getBitmap();
- 	
-@@ -929,9 +942,14 @@
- 	w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth());
- 	h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
- 
-+	#if POPPLER_VERSION_0_20
-+	dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
-+	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
-+	#else
- 	dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
- 	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \
-                                 gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
-+	#endif
- 	
- 	THIS->page->display(gfx);
- 	dev->endPage();
-@@ -960,7 +978,9 @@
- 
- void aux_fill_links(void *_object)
- {
--	#if POPPLER_VERSION_0_17
-+	#if POPPLER_VERSION_0_20
-+	THIS->links = new Links (THIS->page->getAnnots ());
-+	#elif POPPLER_VERSION_0_17
- 	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
- 	#else
- 	Object obj;
-@@ -1200,12 +1220,21 @@
- 
- 	if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
- 
-+	#if POPPLER_VERSION_0_20
-+	textdev = new TextOutputDev (NULL, true, 0, false, false);
-+	THIS->page->display (textdev, 72, 72, 0, false, false, false);
-+	#else
- 	textdev = new TextOutputDev (NULL, true, false, false);
- 	THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog());
-+	#endif
- 
- 	if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; }
- 
-+	#if POPPLER_VERSION_0_20
-+	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
-+	#else
- 	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
-+	#endif
- 	{
- 		if (!THIS->Found) {
- 			GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1);
-Index: configure.ac
-===================================================================
---- configure.ac	(révision 4732)
-+++ configure.ac	(copie de travail)
-@@ -25,6 +25,8 @@
-   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)
-+  pkg-config --atleast-version=0.20.0 poppler
-+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20)
- fi
- 
- AC_OUTPUT( \
diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD
deleted file mode 100644
index 680e2cf73..000000000
--- a/community-staging/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1344 +0,0 @@
-# $Id: PKGBUILD 78555 2012-10-20 21:33:06Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor : sebikul <sebikul@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-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' '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-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi'
-	 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-media' 'gambas3-gb-mime'
-         'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl'  'gambas3-gb-net-pop3' '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-html' 'gambas3-gb-xml-rpc'
-         'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=3.3.3
-pkgrel=3
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL2')
-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' 'sqlite' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
-         'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
-	 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm'
-	 'gmime' 'glu' 'pangox-compat')
-# pangox-compat to remove when added in gtkglext package dependency
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('18902ae2bbd0d66d165503aba7e89474'
-         'b284be39d147ec799f1116a6abc068b4'
-         '6d9e080b66443e7246387b1716d24e31')
-
-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"
-  conflicts=('gambas3-gb-gui')
-  replaces=('gambas3-gb-gui')
-  provides=("gambas3-gb-gui=${pkgver}")
-  install=gambas3-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make -j1 DESTDIR="${pkgdir}" install
-
-  cd ../gbx
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../lib/debug
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../eval
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../draw
-  make -j1 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
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" uninstall
-  ##  
-}
-
-package_gambas3-devel() {
-  depends=('gambas3-runtime')
-  pkgdesc="Development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make -j1 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 -j1 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 -j1 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-complex' 'gambas3-gb-compress' 'gambas3-gb-complex' 'gambas3-gb-crypt'
-           'gambas3-gb-data' '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-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-media' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
-           '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 -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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/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-complex() {
-  depends=('gambas3-runtime')
-  pkgdesc="Complex numbers component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{comp{r,o}*,[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compr*,[d-v]*}
-  ##
-}
-
-package_gambas3-gb-compress() {
-  depends=('gambas3-runtime' 'bzip2' 'zlib')
-  pkgdesc="Compression support component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp{o,l}*,gb.[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compl*,[d-v]*}
-  ##
-}
-
-package_gambas3-gb-crypt() {
-  depends=('gambas3-runtime')
-  pkgdesc="MD5/DES crypting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-data() {
-  depends=('gambas3-runtime')
-  pkgdesc="Data containers component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{c*,d{b,e,r}*,[e-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{c*,d{b,e}*,[e-v]*}
-  ##
-}
-
-package_gambas3-gb-db() {
-  depends=('gambas3-runtime')
-  pkgdesc="Database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{a,e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.d{a,e}*,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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make -j1 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' 'gcc-libs')
-  pkgdesc="Sqlite2 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make -j1 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' 'sqlite' 'gcc-libs')
-  pkgdesc="Sqlite3 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make -j1 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')
-  pkgdesc="Desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome
-  make DESTDIR="${pkgdir}" uninstall
-
-  ## 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-desktop-gnome() {
-  depends=('gambas3-gb-desktop' 'libgnome-keyring')
-  pkgdesc="Desktop component for Gnome"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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-runtime')
-  pkgdesc="Form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gtk-opengl() {
-  depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu' 'pangox-compat')
-# pangox-compat to remove when added in gtkglext package dependency
-  pkgdesc="GTK+ toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gsl() {
-  depends=('gambas3-runtime' 'gsl')
-  pkgdesc="The GNU Scientific Library component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-image() {
-  depends=('gambas3-runtime')
-  pkgdesc="Image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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' 'gcc-libs')
-  pkgdesc="Image effect component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
-  make -j1 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 image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-jit() {
-  depends=('gambas3-runtime' 'llvm')
-  pkgdesc="Just-in-time compiler component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-libxml() {
-  depends=('gambas3-runtime' 'libxml2')
-  pkgdesc="libxml2 component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.libxml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-media() {
-  depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base')
-  pkgdesc="Simplified interface to the GStreamer library component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.media
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-mime() {
-  depends=('gambas3-runtime' 'gmime')
-  pkgdesc="MIME message component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-ncurses() {
-  depends=('gambas3-runtime' 'ncurses')
-  pkgdesc="Ncurses component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-pop3() {
-  depends=('gambas3-gb-net' 'gambas3-gb-mime')
-  pkgdesc="POP3 component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[f-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[f-m]*,[s-w]*}
-  ##
-}
-
-package_gambas3-gb-net-smtp() {
-  depends=('gambas3-runtime' 'glib2')
-  pkgdesc="SMTP component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make -j1 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' 'glew')
-  pkgdesc="OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make -j1 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 -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make -j1 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' 'gambas3-gb-opengl')
-  pkgdesc="Qt4 toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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')
-  pkgdesc="SDL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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="POSIX Signals component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make -j1 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="Visual Basic transitional component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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' 'gcc-libs')
-  pkgdesc="XML component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  
-  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-html() {
-  depends=('gambas3-gb-xml')
-  pkgdesc="HTML generator component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net-curl')
-  pkgdesc="XML-RPC component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 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 ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]*
-  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]*
-  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]*
-  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.*
-  ##
-}
-
-package_gambas3-gb-xml-xslt() {
-  depends=('gambas3-gb-xml' 'libxslt')
-  pkgdesc="XML-XSLT component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 cfb5812fe..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-gambas3.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/gcompris/PKGBUILD b/community-staging/gcompris/PKGBUILD
deleted file mode 100644
index 0abcbc74f..000000000
--- a/community-staging/gcompris/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 77950 2012-10-16 01:06:55Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de>
-
-pkgname=gcompris
-pkgver=12.05
-pkgrel=2
-pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10"
-arch=('i686' 'x86_64')
-url="http://gcompris.net/"
-license=('GPL3')
-depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python2-pysqlite'
-         'gstreamer0.10-base-plugins')
-optdepends=('gnucap: for computer simulation within the electricity activity'
-            'tuxpaint: for the painting activity'
-            'gnuchess: for the chess activity')
-makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  depends+=('gcompris-data')
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install-exec
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gigi/PKGBUILD b/community-staging/gigi/PKGBUILD
deleted file mode 100644
index 66e4f6b09..000000000
--- a/community-staging/gigi/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 77673 2012-10-13 12:05:23Z lcarlier $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: fana-m <geminin@gmx.net>
-# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
-# Contributor: Manuel Gaul <inkaine@hotmail.com>
-
-pkgname=gigi
-pkgver=0.8.0
-pkgrel=14
-_fixedrevision=5208
-pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)"
-url="http://gigi.sourceforge.net/"
-arch=('x86_64' 'i686')
-license=('LGPL')
-depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python')
-makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa')
-
-build() {
-  cd "$srcdir"
-
-  msg2 "Fetching files..."
-  if [ -d gigi/.svn ]; then
-    (cd gigi && svn up -r "$_fixedrevision")
-  else
-    #svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \
-    svn co https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/ \
-      --config-dir ./ -r "$_fixedrevision" gigi
-  fi
-
-  rm -rf gigi-build
-  svn export gigi gigi-build
-  cd gigi-build
-
-  msg2 "Configuring..."
-  setconf cmake/GiGiOgre.pc.in prefix /usr
-  setconf cmake/GiGi.pc.in prefix /usr
-  setconf cmake/GiGiSDL.pc.in prefix /usr
-  cmake \
-    -D CMAKE_INSTALL_PREFIX="$pkgdir"/usr \
-    -D BUILD_TUTORIALS=OFF \
-    -D CPACK_GENERATOR=GiGiDevel \
-    -D CMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-    .
-
-  msg2 "Building documentation..."
-  cd doc
-  doxygen
-  cd ..
-
-  msg2 "Compiling..."
-  make -j1
-}
-
-package() {
-  cd "$srcdir/gigi-build"
-
-  msg2 "Packaging files..."
-  make install
-
-  msg2 "Fixing documentation..."
-  mkdir -p "$pkgdir/usr/share/doc"
-  mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname"
-
-  for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do
-    sed -i "s:$srcdir:/:g" "$f"
-  done
-
-  msg2 "Fixing python3 shebang..."
-  for f in `find "$pkgdir/usr" -name "*.py"`; do
-    sed -i "s:/env python:/python3:g" "$f"
-  done
-
-  msg2 "Packaging license..."
-  install -Dm 644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/glob2/PKGBUILD b/community-staging/glob2/PKGBUILD
deleted file mode 100644
index fb1ff9f9f..000000000
--- a/community-staging/glob2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 73524 2012-07-09 02:43:24Z ebelanger $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-
-pkgname=glob2
-pkgver=0.9.4.4
-pkgrel=12
-pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
-arch=('i686' 'x86_64')
-url="http://www.globulation2.org/"
-license=('GPL3')
-depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'mesa'
-         'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('scons' 'boost')
-install=glob2.install
-source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz
-	glob2-0.9.4.1-gcc44.patch)
-sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad'
-          '3e5ae81d85a727387a7049c3a0dfb3db930391b3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
-   scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share" LINKFLAGS="-lboost_system"
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  scons install
-  find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \;
-  install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png"
-}
diff --git a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch b/community-staging/glob2/glob2-0.9.4.1-gcc44.patch
deleted file mode 100644
index b425b25ec..000000000
--- a/community-staging/glob2/glob2-0.9.4.1-gcc44.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h
---- libgag/include/StreamBackend.h.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/include/StreamBackend.h	2009-06-20 14:21:10.000000000 +0200
-@@ -43,7 +43,7 @@ namespace GAGCore
- 		virtual void flush(void) = 0;
- 		virtual void read(void *data, size_t size) = 0;
- 		virtual void putc(int c) = 0;
--		virtual int getc(void) = 0;
-+		virtual int get_c(void) = 0;
- 		virtual void seekFromStart(int displacement) = 0;
- 		virtual void seekFromEnd(int displacement) = 0;
- 		virtual void seekRelative(int displacement) = 0;
-@@ -67,7 +67,7 @@ namespace GAGCore
- 		virtual void flush(void) { assert(fp); fflush(fp); }
- 		virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); }
- 		virtual void putc(int c) { assert(fp); fputc(c, fp); }
--		virtual int getc(void) { assert(fp); return fgetc(fp); }
-+		virtual int get_c(void) { assert(fp); return fgetc(fp); }
- 		virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); }
- 		virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); }
- 		virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); }
-@@ -92,7 +92,7 @@ namespace GAGCore
- 		virtual void flush(void);
- 		virtual void read(void *data, size_t size);
- 		virtual void putc(int c);
--		virtual int getc(void);
-+		virtual int get_c(void);
- 		virtual void seekFromStart(int displacement);
- 		virtual void seekFromEnd(int displacement);
- 		virtual void seekRelative(int displacement);
-@@ -117,7 +117,7 @@ namespace GAGCore
- 		virtual void flush(void) { }
- 		virtual void read(void *data, size_t size);
- 		virtual void putc(int c);
--		virtual int getc(void);
-+		virtual int get_c(void);
- 		virtual void seekFromStart(int displacement);
- 		virtual void seekFromEnd(int displacement);
- 		virtual void seekRelative(int displacement);
-diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp
---- libgag/src/StreamBackend.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/StreamBackend.cpp	2009-06-20 14:21:53.000000000 +0200
-@@ -75,9 +75,9 @@ namespace GAGCore
- 		buffer->putc(c);
- 	}
- 	
--	int ZLibStreamBackend::getc(void)
-+	int ZLibStreamBackend::get_c(void)
- 	{
--		return buffer->getc();
-+		return buffer->get_c();
- 	}
- 	
- 	void ZLibStreamBackend::seekFromStart(int displacement)
-@@ -147,7 +147,7 @@ namespace GAGCore
- 		write(&ch, 1);
- 	}
- 	
--	int MemoryStreamBackend::getc(void)
-+	int MemoryStreamBackend::get_c(void)
- 	{
- 		Uint8 ch;
- 		read(&ch, 1);
-diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp
---- libgag/src/Stream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/Stream.cpp	2009-06-20 14:21:35.000000000 +0200
-@@ -60,7 +60,7 @@ namespace GAGCore

- 		std::string s;

- 		while (1)

- 		{

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

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

- 			if(c=='\r')

- 				continue;

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

-diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp
---- libgag/src/TextStream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/TextStream.cpp	2009-06-20 14:21:22.000000000 +0200
-@@ -150,7 +150,7 @@ namespace GAGCore
- 		
- 		int nextChar(void)
- 		{
--			next = stream->getc();
-+			next = stream->get_c();
- 			if 	(next == '\n')
- 			{
- 				column = 0;
diff --git a/community-staging/glob2/glob2.install b/community-staging/glob2/glob2.install
deleted file mode 100644
index 20264b3a8..000000000
--- a/community-staging/glob2/glob2.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/community-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD
deleted file mode 100644
index 8947063e6..000000000
--- a/community-staging/glom/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 73448 2012-07-07 19:54:15Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=glom
-pkgver=1.22.0
-pkgrel=2
-pkgdesc="An easy-to-use database designer and user interface"
-arch=('i686' 'x86_64')
-url="http://www.glom.org/"
-license=('GPL')
-depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
-makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e6ce1b0c76cec8c85beba4900a80f257de3cc23a2c65908262fd8be87c2e546a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --with-postgres-utils=/usr/bin \
-    --disable-scrollkeeper \
-    --disable-update-mime-database \
-    --disable-static \
-    PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/glom/glom.install b/community-staging/glom/glom.install
deleted file mode 100644
index 2b88145e3..000000000
--- a/community-staging/glom/glom.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/gmic/PKGBUILD b/community-staging/gmic/PKGBUILD
deleted file mode 100644
index f45bf8391..000000000
--- a/community-staging/gmic/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 78634 2012-10-22 11:21:17Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: farid <farid at archlinuc-br.org>
-# Contributor: Archie <Mymaud@gmail.com>
-
-pkgbase=gmic
-pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.1.8
-pkgrel=4
-arch=("i686" "x86_64")
-url="http://gmic.sourceforge.net"
-license=("custom:CeCILL")
-makedepends=("gimp" "qt" "fftw" "openexr" "opencv")
-#options=('!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
-        "opencv-buildfix.patch")
-md5sums=('1fc38346269bdd829dd7c4864a27fbc3'
-         '8d1cf5000239099255d25c7d3dbe5728')
-
-build() {
-  cd "${srcdir}/gmic-${pkgver}"
-  patch -p1 -i "${srcdir}/opencv-buildfix.patch"
-  find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \;
-  find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \;
-  make -C src all
-}
-
-package_gmic() {
-  pkgdesc="GREYC's Magic Image Converter: image processing framework"
-  depends=("fftw" "libtiff" "libjpeg" "libpng" "openexr" "libx11")
-  replaces=("greycstoration")
-
-  cd "${srcdir}/gmic-${pkgver}"
-  make -C src install DESTDIR="$pkgdir" USR="/usr"
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  rm -rf "${pkgdir}/usr/"{bin/zart,lib/gimp,share/zart}
-}
-
-package_zart() {
-  pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam"
-  depends=("opencv" "fftw" "qt")
-
-  cd "${srcdir}/gmic-${pkgver}"
-  make -C src install DESTDIR="$pkgdir" USR="/usr"
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}}
-}
-
-package_gimp-plugin-gmic() {
-  pkgdesc="Gimp plugin for the G'MIC image processing framework"
-  depends=("gimp" "fftw")
-  replaces=("gimp-plugin-greycstoration" "gimp-plugin-gmic4gimp")
-
-  cd "${srcdir}/gmic-${pkgver}"
-  install -Dm755 src/gmic_gimp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/gmic_gimp"
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-staging/gmic/opencv-buildfix.patch b/community-staging/gmic/opencv-buildfix.patch
deleted file mode 100644
index b204cb721..000000000
--- a/community-staging/gmic/opencv-buildfix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile
---- gmic-1.5.1.7/src/Makefile	2012-07-26 12:59:34.000000000 +0400
-+++ gmic-1.5.1.7.q/src/Makefile	2012-08-03 14:03:10.000000000 +0400
-@@ -296,7 +296,7 @@
- 
- zart: lib
- ifneq ($(OS),Darwin)
--	cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
-+	cd ../zart && qmake zart.pro && $(MAKE) && strip zart
- else
- 	cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
- endif
-@@ -403,6 +403,7 @@
- 	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
- 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
- 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
-+	if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi
- 	if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
- 	if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
- 
-diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro
---- gmic-1.5.1.7/zart/zart.pro	2012-07-26 12:59:33.000000000 +0400
-+++ gmic-1.5.1.7.q/zart/zart.pro	2012-08-03 12:32:27.000000000 +0400
-@@ -34,7 +34,7 @@
- FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui
- 
- !macx {
--	LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3
-+	LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3
- } else {
- 	LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3
- }
diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD
deleted file mode 100644
index 3ef2282bb..000000000
--- a/community-staging/gnash/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 73602 2012-07-11 09:20:26Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgbase=gnash
-pkgname=(gnash-common gnash-gtk)
-pkgver=0.8.10
-pkgrel=4
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/gnash/"
-license=(GPL3)
-makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa
-             speex fontconfig
-             gstreamer0.10-base
-             gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext
-             pkgconfig boost)
-options=(!libtool !emptydirs)
-source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        nodebug.patch gnash-0.8.10-boost-1.50.patch)
-sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224'
-            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551'
-            'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c')
-
-build() {
-  cd gnash-$pkgver
-
-  # Disable very, very verbose debugging (gigabytes of logs)
-  patch -Np1 -i ../nodebug.patch
-
-  # Link to libboost_system.so
-  patch -Np1 -i ../gnash-0.8.10-boost-1.50.patch
-
-  ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-plugins-install=system \
-    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
-    --enable-gui=sdl,gtk,dump \
-    --enable-media=gst \
-    --enable-renderer=all \
-    --enable-device=x11
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_gnash-common() {
-  pkgdesc="A GNU Flash movie player"
-  depends=(curl giflib sdl agg libjpeg libpng libltdl mesa
-           speex fontconfig cairo
-           gstreamer0.10-base
-           boost-libs)
-  backup=(etc/gnashrc etc/gnashthumbnailrc)
-
-  cd gnash-$pkgver
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  # Split gnash-gtk
-  mkdir -p "$srcdir"/gtk/{etc,usr/{bin,share/man/man1}}
-  mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} \
-    "$srcdir/gtk/usr/bin/"
-  mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 \
-    "$srcdir/gtk/usr/share/man/man1/"
-  mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/usr/share/"
-  mv "$pkgdir"/etc/gnashpluginrc "$srcdir/gtk/etc/"
-}
-
-package_gnash-gtk() {
-  pkgdesc="A GNU Flash movie player"
-  depends=("gnash-common=$pkgver"
-            gtk2 libldap hicolor-icon-theme desktop-file-utils gconf gtkglext)
-  install=gnash-gtk.install
-  backup=(etc/gnashpluginrc)
-
-  mv gtk/* "$pkgdir"
-
-  cd gnash-$pkgver
-  make DESTDIR="$pkgdir" install-plugin
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \
-    "$pkgdir"/usr/share/applications/*.schemas
-  rm -f "$pkgdir"/usr/share/applications/*.schemas
-}
diff --git a/community-staging/gnash/gnash-0.8.10-boost-1.50.patch b/community-staging/gnash/gnash-0.8.10-boost-1.50.patch
deleted file mode 100644
index a422ce932..000000000
--- a/community-staging/gnash/gnash-0.8.10-boost-1.50.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r gnash-0.8.10/macros/boost.m4 gnash-0.8.10-boost1.50/macros/boost.m4
---- gnash-0.8.10/macros/boost.m4	2012-01-19 20:17:49.000000000 +0100
-+++ gnash-0.8.10-boost-1.50/macros/boost.m4	2012-07-11 10:56:11.089137186 +0200
-@@ -37,7 +37,7 @@
-   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
-   dnl this is a list of *required* libraries. If any of these are missing, this
-   dnl test will return a failure, and Gnash won't build.
--  boost_libs="thread program_options iostreams"
-+  boost_libs="thread program_options iostreams system"
- 
-   dnl this is a list of *recommended* libraries. If any of these are missing, this
-   dnl test will return a warning, and Gnash will build, but testing won't work.
diff --git a/community-staging/gnash/gnash-gtk.install b/community-staging/gnash/gnash-gtk.install
deleted file mode 100644
index 6678a7f8a..000000000
--- a/community-staging/gnash/gnash-gtk.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  gconfpkg --install gnash
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall gnash
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/gnash/nodebug.patch b/community-staging/gnash/nodebug.patch
deleted file mode 100644
index ca160b898..000000000
--- a/community-staging/gnash/nodebug.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h
---- gnash-0.8.9/libbase/log.h	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-nodebug/libbase/log.h	2012-01-18 09:39:02.004103494 +0100
-@@ -331,27 +331,27 @@
- 
- // Define to 0 to completely remove parse debugging at compile-time
- #ifndef VERBOSE_PARSE
--#define VERBOSE_PARSE 1
-+#define VERBOSE_PARSE 0
- #endif
- 
- // Define to 0 to completely remove action debugging at compile-time
- #ifndef VERBOSE_ACTION
--#define VERBOSE_ACTION 1
-+#define VERBOSE_ACTION 0
- #endif
- 
- // Define to 0 to remove ActionScript errors verbosity at compile-time
- #ifndef VERBOSE_ASCODING_ERRORS
--#define VERBOSE_ASCODING_ERRORS  1
-+#define VERBOSE_ASCODING_ERRORS  0
- #endif
- 
- // Define to 0 this to remove invalid SWF verbosity at compile-time
- #ifndef VERBOSE_MALFORMED_SWF
--#define VERBOSE_MALFORMED_SWF 1
-+#define VERBOSE_MALFORMED_SWF 0
- #endif
- 
- // Define to 0 this to remove Networking verbosity at compile-time
- #ifndef VERBOSE_NETWORKING
--#define VERBOSE_NETWORKING 1
-+#define VERBOSE_NETWORKING 0
- #endif
- 
- #if VERBOSE_PARSE
-diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp
---- gnash-0.8.9/libcore/vm/ActionExec.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp	2012-01-18 09:40:25.653458508 +0100
-@@ -46,7 +46,7 @@
- // too much information for my tastes. I really want just
- // to see how stack changes while executing actions...
- // --strk Fri Jun 30 02:28:46 CEST 2006
--# define DEBUG_STACK 1
-+//# define DEBUG_STACK 1
- 
- // Max number of stack item to dump. 0 for unlimited.
- # define STACK_DUMP_LIMIT 32
diff --git a/community-staging/gource/PKGBUILD b/community-staging/gource/PKGBUILD
deleted file mode 100644
index 05dc9af51..000000000
--- a/community-staging/gource/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 78702 2012-10-22 23:36:06Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
-# Contributor: Olivier Ramonat <olivier at ramonat dot fr>
-pkgname=gource
-pkgver=0.38
-pkgrel=5
-pkgdesc="software version control visualization"
-license=(GPL3)
-arch=(i686 x86_64)
-url=http://code.google.com/p/gource/
-depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew' 'boost-libs')
-makedepends=('boost' 'glm')
-source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('6584241879dbb6dfaecc6ae6b58ad38c')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i "s/filesystem3/filesystem/g" src/logmill.cpp
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR=$pkgdir install
-}
-# vim: ts=2:sw=2 et:
diff --git a/community-staging/gpac/PKGBUILD b/community-staging/gpac/PKGBUILD
deleted file mode 100644
index 36e5d9d58..000000000
--- a/community-staging/gpac/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 71952 2012-06-04 05:51:49Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpac
-pkgver=4065
-pkgrel=1
-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{,.sig})
-sha1sums=('9a60014c4467acf3ac070e4e4a42d13b35575da8'
-          'a015cef1fd003c57bd91a6d0959ccd58df2357d4')
-
-# 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
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-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/gpsdrive/PKGBUILD b/community-staging/gpsdrive/PKGBUILD
deleted file mode 100644
index e299cc3be..000000000
--- a/community-staging/gpsdrive/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 73599 2012-07-11 07:49:53Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=gpsdrive
-pkgver=2.11
-_pkgver=20120711
-pkgrel=13
-pkgdesc="A car (bike, ship, plane) navigation system"
-arch=("i686" "x86_64")
-url="http://www.gpsdrive.de/"
-license=('GPL2')
-depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn'
-         'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri'
-         'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer')
-makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
-install="gpsdrive.install"
-#source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz")
-source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.xz")
-md5sums=('48fe20e111c10d0826d9f05746c9cf74')
-
-build() {
-  cd "$srcdir"
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  done
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
-
-  export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export LDFLAGS="`pkg-config --libs gtk+-2.0 gmodule-2.0` -lboost_system -lboost_thread"
-
-  # see DefineOptions.cmake for a list of common options and defaults
-  # cmake -L for a more in-depth listing
-  cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DWITH_SCRIPTS=ON \
-    -DWITH_MAPNIK=ON \
-    -DWITH_POSTGIS=ON \
-    -DWITH_GDAL=ON \
-    -DWITH_BASEMAPS=ON \
-    -DWITH_FRIENDSD=ON \
-    -DWITH_KISMET=ON \
-    -DWITH_NAVIGATION=ON \
-    -DWITH_SPEECH=OFF \
-    -DWITH_DBUS=OFF \
-    -DLIBGPS_OLD=OFF \
-    "$srcdir/gpsdrive-${_pkgver}"
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/gpsdrive/gpsdrive.install b/community-staging/gpsdrive/gpsdrive.install
deleted file mode 100644
index 8ea63912e..000000000
--- a/community-staging/gpsdrive/gpsdrive.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-  echo "Don't forget to generate geoinfo.db with geoinfo.pl script"
-  echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive"
-}
diff --git a/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
deleted file mode 100644
index 1c6a7dd65..000000000
--- a/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Wed, 12 Sep 2012 03:29:46 -0700
-Subject: [PATCH] fix for ghc 7.6.1 changes
-
----
- c2hs/base/general/FileOps.hs  | 3 ++-
- c2hs/base/state/StateTrans.hs | 3 ++-
- c2hs/toplevel/C2HSConfig.hs   | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs
-index 83ac70c..4914c4b 100644
---- a/c2hs/base/general/FileOps.hs
-+++ b/c2hs/base/general/FileOps.hs
-@@ -39,6 +39,7 @@ import Control.Monad	 (liftM)
- import System.Random    (newStdGen, randomRs)
- 
- import FNameOps  (dirname, stripDirname, addPath)
-+import System.IO.Error (catchIOError)
- 
- 
- -- search for the given file in the given list of directories (EXPORTED)
-@@ -89,7 +90,7 @@ mktemp pre post =
- 			     in do
- 			       h <- openFile fname ReadWriteMode
- 			       return (h, fname)
--			     `catch` \_ -> createLoop (attempts - 1) rs'
-+			     `catchIOError` \_ -> createLoop (attempts - 1) rs'
-     --
-     sixChars :: [Int] -> ([Int], String)
-     sixChars is = 
-diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs
-index ada62f4..2ab0ad1 100644
---- a/c2hs/base/state/StateTrans.hs
-+++ b/c2hs/base/state/StateTrans.hs
-@@ -84,6 +84,7 @@ import System.IO  (fixIO)
- import Data.IORef (IORef, newIORef, readIORef, writeIORef)
- 
- import Errors (interr)
-+import System.IO.Error (catchIOError)
- 
- infixr 1 +>=, +>
- 
-@@ -337,7 +338,7 @@ fatalsHandledBy m handler  =
- 				  ioError err
- 	      Right a          -> return state
- 	    )
--	    `catch` (\err -> let
-+	    `catchIOError` (\err -> let
- 			       STB handler' = handler err
- 			     in
- 			     handler' bs gs)
-diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs
-index e8deddf..af32886 100644
---- a/c2hs/toplevel/C2HSConfig.hs
-+++ b/c2hs/toplevel/C2HSConfig.hs
-@@ -46,7 +46,7 @@ import Data.Array (Array, array)
- 
- import Foreign (Ptr, FunPtr)
- import Foreign  (Storable(sizeOf, alignment), toBool)
--import Foreign.C (CInt)
-+import Foreign.C (CInt(..))
- import System.Info (os)
- 
- -- program settings
--- 
-1.7.12
-
diff --git a/community-staging/gtk2hs-buildtools/PKGBUILD b/community-staging/gtk2hs-buildtools/PKGBUILD
deleted file mode 100644
index e0e928514..000000000
--- a/community-staging/gtk2hs-buildtools/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 76136 2012-09-12 03:36:40Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=gtk2hs-buildtools
-pkgver=0.12.3.1
-pkgrel=2
-pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
-url="http://hackage.haskell.org/package/gtk2hs-buildtools"
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3')
-depends=('gmp')
-options=('strip')
-provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz
-        '0001-fix-for-ghc-7.6.1-changes.patch')
-md5sums=('612611d831635024c953d2817b124e29'
-         'b6551d8085c97bc2c6600ab397833101')
-
-build() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-
-    patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch
-
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-}
-
-package() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/guake/PKGBUILD b/community-staging/guake/PKGBUILD
deleted file mode 100644
index dfa432504..000000000
--- a/community-staging/guake/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 77984 2012-10-16 02:10:51Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
-
-pkgname=guake
-pkgver=0.4.4
-pkgrel=2
-pkgdesc='Drop-down terminal for GNOME'
-arch=('i686' 'x86_64')
-url="http://guake.org/"
-license=('GPL')
-depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool')
-options=('!libtool')
-install=$pkgname.install
-source=(http://guake.org/files/$pkgname-$pkgver.tar.gz
-        guake-fix-notification.patch)
-md5sums=('532adada29b8f0bb79dc15904aa6b70c'
-         '0b57227e6869dd84dd4fb0794ed0d082')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in
-  sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py}
-
-  # http://guake.org/ticket/416
-  patch -Np1 -i "$srcdir/guake-fix-notification.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/guake/guake-fix-notification.patch b/community-staging/guake/guake-fix-notification.patch
deleted file mode 100644
index 847dac10e..000000000
--- a/community-staging/guake/guake-fix-notification.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/src/guake	2011-02-09 20:00:35.000000000 +0100
-+++ b/src/guake	2012-02-25 00:55:28.513075769 +0100
-@@ -46,7 +46,10 @@
-     TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \
-     ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER
- 
--pynotify.init('Guake!')
-+popup_works = True
-+if not pynotify.init('Guake!') or pynotify.get_server_info() == None :
-+    popup_works = False
-+    print "WARNING: could not use popup notification"
- 
- GNOME_FONT_PATH = '/desktop/gnome/interface/monospace_font_name'
- 
-@@ -637,7 +640,12 @@
-                   'Please use Guake Preferences dialog to choose another '
-                   'key (The trayicon was enabled)') % label, filename)
-             self.client.set_bool(KEY('/general/use_trayicon'), True)
--            notification.show()
-+            if popup_works :
-+                notification.show() 
-+            else :
-+                print _('A problem happened when binding <b>%s</b> key.\n'
-+                  'Please use Guake Preferences dialog to choose another '
-+                  'key (The trayicon was enabled)') % label
- 
-         elif self.client.get_bool(KEY('/general/use_popup')):
-             # Pop-up that shows that guake is working properly (if not
-@@ -646,7 +654,11 @@
-                 _('Guake!'),
-                 _('Guake is now running,\n'
-                   'press <b>%s</b> to use it.') % label, filename)
--            notification.show()
-+            if popup_works :
-+                notification.show()
-+            else :
-+                print _('Guake is now running,\n'
-+                  'press <b>%s</b> to use it.') % label
- 
-     def execute_command(self, command, tab=None):
-         """Execute the `command' in the `tab'. If tab is None, the
-
diff --git a/community-staging/guake/guake.install b/community-staging/guake/guake.install
deleted file mode 100644
index 8084333b1..000000000
--- a/community-staging/guake/guake.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=guake
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  xdg-icon-resource forceupdate
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate
-}
diff --git a/community-staging/gummi/PKGBUILD b/community-staging/gummi/PKGBUILD
deleted file mode 100644
index 06e283e18..000000000
--- a/community-staging/gummi/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 73884 2012-07-16 10:46:51Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sergio A. Morales <sergiomorales@archlinux.cl>
-# Contributor: soeren <nonick@posteo.de>
-
-pkgname=gummi
-pkgver=0.6.4
-pkgrel=2
-pkgdesc='Simple LaTex editor for GTK users'
-arch=('x86_64' 'i686')
-url='http://gummi.midnightcoding.org/'
-license=('MIT')
-depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file-utils')
-makedepends=('glib2' 'gtk2' 'pango' 'poppler' 'intltool')
-install=$pkgname.install
-source=("http://dev.midnightcoding.org/projects/$pkgname/latest.tar.gz")
-sha256sums=('ac5c1de476f8689040a185b01515544a5e53da45ff4e10a072b8944e9de8a6ff')
- 
-build() {
-  cd "$pkgname-$pkgver"
-
-  find . -type f -exec touch {} \;
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make prefix="$pkgdir/usr" install
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gummi/gummi.install b/community-staging/gummi/gummi.install
deleted file mode 100644
index ef816a666..000000000
--- a/community-staging/gummi/gummi.install
+++ /dev/null
@@ -1,14 +0,0 @@
-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/gwibber/PKGBUILD b/community-staging/gwibber/PKGBUILD
deleted file mode 100644
index f664c770e..000000000
--- a/community-staging/gwibber/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 78004 2012-10-16 03:01:00Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gwibber
-pkgver=3.4.2
-pkgrel=2
-pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku"
-arch=('i686' 'x86_64')
-url="http://gwibber.com/"
-license=('GPL')
-depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python2-egenix-mx-base' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'vala>=0.15.0')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('0ac544f8e626547312b9d0da0b57358e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile --disable-unity
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/gwibber/gwibber.install b/community-staging/gwibber/gwibber.install
deleted file mode 100644
index d973d53f7..000000000
--- a/community-staging/gwibber/gwibber.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
deleted file mode 100644
index 2e687db21..000000000
--- a/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 07:43:41 -0700
-Subject: [PATCH] fix incorrect types in documentation/haddock
-
----
- src/Documentation/Haddock.hs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
-index 60bb314..8fd9674 100644
---- a/src/Documentation/Haddock.hs
-+++ b/src/Documentation/Haddock.hs
-@@ -59,6 +59,7 @@ import Haddock.Types
- import Haddock.Options
- import Haddock.Utils
- import Main
-+import GHC (Ghc)
- 
- 
- -- | Create 'Interface' structures from a given list of Haddock command-line
-@@ -68,7 +69,7 @@ import Main
- createInterfaces
-   :: [Flag]         -- ^ A list of command-line flags
-   -> [String]       -- ^ File or module names
--  -> IO [Interface] -- ^ Resulting list of interfaces
-+  -> Ghc [Interface] -- ^ Resulting list of interfaces
- createInterfaces flags modules = do
-   (_, ifaces, _) <- readPackagesAndProcessModules flags modules
-   return ifaces
--- 
-1.7.12
-
diff --git a/community-staging/haddock/PKGBUILD b/community-staging/haddock/PKGBUILD
deleted file mode 100644
index 274cc7851..000000000
--- a/community-staging/haddock/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haddock
-pkgver=2.12.0
-pkgrel=1
-pkgdesc="Tool for generating documentation for Haskell libraries"
-url="http://hackage.haskell.org/package/haddock"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-makedepends=('alex=3.0.2-2' 'happy=1.18.9-6')
-depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9')
-install=$pkgname.install
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
-        '0001-fix-incorrect-types-in-documentation-haddock.patch')
-sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02'
-            'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch
-  
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-  mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haddock/haddock.install b/community-staging/haddock/haddock.install
deleted file mode 100644
index 24e27a074..000000000
--- a/community-staging/haddock/haddock.install
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=haddock
-HS_DIR=usr/share/haskell/haddock
-
-post_upgrade() {
-  ${HS_DIR}/register.sh &> /dev/null
-  post_remove
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-}
-
-post_install() {
-	post_upgrade
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/happy/PKGBUILD b/community-staging/happy/PKGBUILD
deleted file mode 100644
index 9e690c0c4..000000000
--- a/community-staging/happy/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 76542 2012-09-22 15:25:35Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
- 
-pkgname=happy
-pkgver=1.18.10
-pkgrel=1
-pkgdesc="The Parser Generator for Haskell"
-url="http://hackage.haskell.org/package/happy"
-arch=('i686' 'x86_64')
-license=("custom:BSD3")
-depends=('gmp')
-makedepends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('a1638e89434427e57f68ef311761dc30')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # try was deprecated and removed into control.exception
-  # we really want tryIOError
-  #sed 's/try/&IOError/' -i Setup.lhs
-
-  runhaskell Setup.lhs configure -O --prefix=/usr
-  runhaskell Setup.lhs build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  runhaskell Setup.lhs copy --destdir="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-staging/haskell-bytestring-show/PKGBUILD b/community-staging/haskell-bytestring-show/PKGBUILD
deleted file mode 100644
index 3b45dcd16..000000000
--- a/community-staging/haskell-bytestring-show/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 76081 2012-09-11 04:59:02Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-bytestring-show
-pkgver=0.3.5.3
-pkgrel=1
-pkgdesc="Efficient conversion of values into readable byte strings."
-url="http://hackage.haskell.org/package/bytestring-show"
-license=("BSD3")
-arch=('i686' 'x86_64')
-depends=("ghc=7.6.1-1")
-install="${pkgname}.install"
-source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('cbcc94f57fc754685f428aba003ba058')
-
-build() {
-  cd ${srcdir}/bytestring-show-${pkgver}
-
-  # update outdated dependency
-  sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-	--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-	--libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/bytestring-show-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install b/community-staging/haskell-bytestring-show/haskell-bytestring-show.install
deleted file mode 100644
index 335fc37cd..000000000
--- a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=haskell-bytestring-show
-HS_DIR=usr/share/haskell/${pkgname}
-
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-cairo/PKGBUILD b/community-staging/haskell-cairo/PKGBUILD
deleted file mode 100644
index d07e9f435..000000000
--- a/community-staging/haskell-cairo/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 76138 2012-09-12 04:01:58Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-cairo
-pkgver=0.12.3.1
-pkgrel=2
-pkgdesc="Binding to the cairo library for Gtk2Hs."
-url="http://hackage.haskell.org/package/cairo"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1')
-makedepends=("gtk2hs-buildtools")
-options=('strip')
-conflicts=('gtk2hs-cairo')
-provides=('gtk2hs-cairo')
-replaces=('gtk2hs-cairo')
-install=gtk2hs-cairo.install
-source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('9d489fbb6cadb3d109543fe25c50195e')
-
-build() {
-    cd ${srcdir}/cairo-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/cairo-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-cairo/gtk2hs-cairo.install b/community-staging/haskell-cairo/gtk2hs-cairo.install
deleted file mode 100644
index 4ec5096b6..000000000
--- a/community-staging/haskell-cairo/gtk2hs-cairo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-cairo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community-staging/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
deleted file mode 100644
index 9f544bb27..000000000
--- a/community-staging/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 05:06:59 -0700
-Subject: [PATCH] update build deps for ghc 7.6.1
-
----
- dataenc.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dataenc.cabal b/dataenc.cabal
-index 1ad42ca..3a4f5bb 100644
---- a/dataenc.cabal
-+++ b/dataenc.cabal
-@@ -21,7 +21,7 @@ flag BuildTests
- 
- library
-     hs-source-dirs: src
--    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5
-+    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6
-     exposed-modules:
-             Codec.Binary.Base16
-             Codec.Binary.Base32
--- 
-1.7.12
-
diff --git a/community-staging/haskell-dataenc/PKGBUILD b/community-staging/haskell-dataenc/PKGBUILD
deleted file mode 100644
index 7727f7dbd..000000000
--- a/community-staging/haskell-dataenc/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 76083 2012-09-11 05:12:24Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=dataenc
-pkgname=haskell-dataenc
-pkgver=0.14.0.3
-pkgrel=3
-pkgdesc="Data encoding library"
-url="http://hackage.haskell.org/package/dataenc"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
-        '0001-update-build-deps-for-ghc-7.6.1.patch')
-install=${pkgname}.install
-md5sums=('643a8c022b9c840f801faf9a661fe637'
-         '662056adcb79efe8898298c271b49600')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    # update build deps for ghc 7.6.1
-    patch -Np1 -i ${srcdir}/0001-update-build-deps-for-ghc-7.6.1.patch
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-dataenc/haskell-dataenc.install b/community-staging/haskell-dataenc/haskell-dataenc.install
deleted file mode 100644
index 9c1bbff01..000000000
--- a/community-staging/haskell-dataenc/haskell-dataenc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-dataenc
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-extensible-exceptions/PKGBUILD b/community-staging/haskell-extensible-exceptions/PKGBUILD
deleted file mode 100644
index 81760f8c5..000000000
--- a/community-staging/haskell-extensible-exceptions/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 76708 2012-09-27 13:34:06Z jelle $
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-
-_hkgname=extensible-exceptions
-pkgname=haskell-${_hkgname}
-pkgver=0.1.1.4
-pkgrel=3
-pkgdesc="extensible exceptions for both new and old versions of GHC"
-url="http://hackage.haskell.org/package/extensible-exceptions"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=$pkgname.install
-md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install
deleted file mode 100644
index 20c7dce30..000000000
--- a/community-staging/haskell-extensible-exceptions/haskell-extensible-exceptions.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-extensible-exceptions
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
diff --git a/community-staging/haskell-ghc-paths/PKGBUILD b/community-staging/haskell-ghc-paths/PKGBUILD
deleted file mode 100644
index 1e23d3c10..000000000
--- a/community-staging/haskell-ghc-paths/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer:
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-ghc-paths
-pkgver=0.1.0.8
-pkgrel=9
-pkgdesc="Knowledge of GHC's installation directories"
-url="http://hackage.haskell.org/package/ghc-paths"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.6.1-1')
-source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
-install=haskell-ghc-paths.install
-md5sums=('d2b23dc563888e380588501d2ce1d82b')
-
-build() {
-  cd "$srcdir/ghc-paths-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-     --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-     --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/ghc-paths-$pkgver"
-
-  install -Dm 744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/ghc-paths"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-ghc-paths/haskell-ghc-paths.install b/community-staging/haskell-ghc-paths/haskell-ghc-paths.install
deleted file mode 100644
index 4fd2c6c56..000000000
--- a/community-staging/haskell-ghc-paths/haskell-ghc-paths.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-ghc-paths
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
deleted file mode 100644
index 845beb2bd..000000000
--- a/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Thu, 27 Sep 2012 04:48:10 -0700
-Subject: [PATCH] compatibility with ghc 7.6.1
-
----
- System/Glib/GObject.chs  | 4 +---
- System/Glib/MainLoop.chs | 4 ++--
- 2 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs
-index 5f0fe5c..9925d2c 100644
---- a/System/Glib/GObject.chs
-+++ b/System/Glib/GObject.chs
-@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do
- 
- {#pointer GDestroyNotify as DestroyNotify#}
- 
--foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
--
- -- | This function wraps any newly created objects that derives from
- -- GInitiallyUnowned also known as objects with
- -- \"floating-references\". The object will be refSink (for glib
-@@ -225,4 +223,4 @@ isA obj gType =
- -- at this point we would normally implement the notify signal handler;
- -- I've moved this definition into the Object class of the gtk package
- -- since there's a quite a bit of machinery missing here (generated signal
---- register functions and the problem of recursive modules)
-\ No newline at end of file
-+-- register functions and the problem of recursive modules)
-diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs
-index 72fecb6..feb4c77 100644
---- a/System/Glib/MainLoop.chs
-+++ b/System/Glib/MainLoop.chs
-@@ -71,7 +71,7 @@ import System.Glib.GObject	(DestroyNotify, destroyFunPtr)
- 
- {#pointer SourceFunc#}
- 
--foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
-+foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
- 
- type HandlerId = {#type guint#}
- 
-@@ -79,7 +79,7 @@ type HandlerId = {#type guint#}
- --
- makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
- makeCallback fun = do
--  funPtr <- mkSourceFunc fun
-+  funPtr <- mkSourceFunc (const fun)
-   return (funPtr, destroyFunPtr)
- 
- -- | Sets a function to be called at regular intervals, with the default
--- 
-1.7.12.1
-
diff --git a/community-staging/haskell-glib/PKGBUILD b/community-staging/haskell-glib/PKGBUILD
deleted file mode 100644
index 09b3b870d..000000000
--- a/community-staging/haskell-glib/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 76695 2012-09-27 05:01:54Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-glib
-pkgver=0.12.3.1
-pkgrel=2
-pkgdesc="Binding to the GLIB library for Gtk2Hs."
-url="http://hackage.haskell.org/package/glib"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'glib2')
-makedepends=("gtk2hs-buildtools")
-options=('strip')
-install=gtk2hs-glib.install
-provides=('gtk2hs-glib')
-replaces=('gtk2hs-glib')
-conflicts=('gtk2hs-glib')
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
-        '0001-compatibility-with-ghc-7.6.1.patch')
-md5sums=('f2899bd2a2850fe95479ddb63490eb04'
-         'b00660b7102542942b0b9d84b59d1f3c')
-
-build() {
-    cd glib-$pkgver
-
-    patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" "glib2")
-
-    cd ${srcdir}/glib-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-glib/gtk2hs-glib.install b/community-staging/haskell-glib/gtk2hs-glib.install
deleted file mode 100644
index 24025f5d8..000000000
--- a/community-staging/haskell-glib/gtk2hs-glib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-glib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-gtk/PKGBUILD b/community-staging/haskell-gtk/PKGBUILD
deleted file mode 100644
index 2ef22e5c2..000000000
--- a/community-staging/haskell-gtk/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 76935 2012-10-02 13:34:57Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-gtk
-pkgver=0.12.3.1
-pkgrel=2
-pkgdesc="Binding to the gtk library for Gtk2Hs."
-url="http://hackage.haskell.org/package/gtk"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl')
-makedepends=("gtk2hs-buildtools")
-provides=('gtk2hs-gtk')
-replaces=('gtk2hs-gtk')
-conflicts=('gtk2hs-gtk')
-options=('strip')
-install=gtk2hs-gtk.install
-source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz
-	ghc-7.6.1.patch)
-md5sums=('b10dfe92d2e4dfe3c0c92dd349489727'
-         '5fb93f37fe3f494b30ee682a36b8f1b6')
-
-build() {
-  cd ${srcdir}/gtk-${pkgver}
-  patch -p1 <$srcdir/ghc-7.6.1.patch
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\  | cut -f1 -d-`
-  _hpangover=`pacman -Q haskell-pango | cut -f2 -d\  | cut -f1 -d-`
-  depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}")
-
-  cd ${srcdir}/gtk-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
-  install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
-  runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-gtk/ghc-7.6.1.patch b/community-staging/haskell-gtk/ghc-7.6.1.patch
deleted file mode 100644
index 5e259a38f..000000000
--- a/community-staging/haskell-gtk/ghc-7.6.1.patch
+++ /dev/null
@@ -1,574 +0,0 @@
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Abstract/Object.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -126,7 +126,8 @@
- 
- {#pointer GWeakNotify#}
- 
--foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify
-+foreign import ccall "wrapper" mkDestructor
-+  :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify
- 
- -- | Attach a callback that will be called after the
- -- destroy hooks have been called
-@@ -134,7 +135,7 @@
- objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify
- objectWeakref obj uFun = do
-   funPtrContainer <- newIORef nullFunPtr
--  uFunPtr <- mkDestructor $ do
-+  uFunPtr <- mkDestructor $ \_ _ -> do
-     uFun
-     funPtr <- readIORef funPtrContainer
-     freeHaskellFunPtr funPtr
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Entry/Entry.chs	2012-10-02 16:27:26.000000000 +0400
-@@ -78,6 +78,10 @@
-   entrySetCompletion,
-   entryGetCompletion,
- #endif
-+#if GTK_CHECK_VERSION (2,18,0)
-+  entryGetBuffer,
-+  entrySetBuffer,
-+#endif
- #if GTK_CHECK_VERSION(2,20,0)
-   entryGetIconWindow,
-   entryGetTextWindow,
-@@ -104,6 +108,9 @@
-   entryAlignment,
-   entryCompletion,
- #endif
-+#if GTK_CHECK_VERSION (2,18,0)
-+  entryBuffer,
-+#endif
- 
- -- * Signals
-   entryActivate,
-@@ -157,6 +164,9 @@
- import Graphics.UI.Gtk.Gdk.EventM	(EventM, EButton, EKey)
- import Control.Monad.Reader             ( ask )
- import Control.Monad.Trans              ( liftIO )
-+#if GTK_CHECK_VERSION (2,18,0)
-+import Graphics.UI.Gtk.Entry.EntryBuffer
-+#endif
- {#import Graphics.UI.Gtk.Types#}
- {#import Graphics.UI.Gtk.Signals#}
- 
-@@ -429,6 +439,23 @@
-     (toEntry self)
- #endif
- 
-+#if GTK_CHECK_VERSION(2,18,0)
-+-- | Get the 'EntryBuffer' object which holds the text for this widget.
-+entryGetBuffer :: EntryClass self => self
-+  -> IO EntryBuffer
-+entryGetBuffer self =
-+  makeNewGObject mkEntryBuffer $
-+  {# call gtk_entry_get_buffer #}
-+    (toEntry self)
-+
-+-- | Set the 'EntryBuffer' object which holds the text for this widget.
-+entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self
-+  -> buffer -> IO ()
-+entrySetBuffer self =
-+  {# call gtk_entry_set_buffer #}
-+    (toEntry self) . toEntryBuffer
-+#endif
-+
- #if GTK_CHECK_VERSION(2,20,0)
- -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when
- -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to
-@@ -623,6 +650,15 @@
-   entrySetCompletion
- #endif
- 
-+#if GTK_CHECK_VERSION(2,18,0)
-+entryBuffer :: (EntryClass self, EntryBufferClass buffer) =>
-+  ReadWriteAttr self EntryBuffer buffer
-+entryBuffer = newAttr
-+  entryGetBuffer
-+  entrySetBuffer
-+#endif
-+
-+
- --------------------
- -- Signals
- 
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc	2012-10-02 16:27:27.000000000 +0400
-@@ -639,14 +639,16 @@
- 
- 
- -- | Execute an event handler and assume it handled the event unless it
----   threw a pattern match exception.
-+--   threw a pattern match exception or calls mzero (e.g. via guard).
- tryEvent :: EventM any () -> EventM any Bool
- tryEvent act = do
-   ptr <- ask
-   liftIO $ (runReaderT (act >> return True) ptr)
- #if __GLASGOW_HASKELL__ >= 610
-     `catches` [ Handler (\ (PatternMatchFail _) -> return False)
--              , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e
-+              , Handler (\ e -> if isUserError e &&
-+                                   ("Pattern" `isPrefixOf` ioeGetErrorString e ||
-+                                    "mzero" == ioeGetErrorString e)
-                                 then return False
-                                 else throw e) ]
- #else
-@@ -654,6 +656,8 @@
-                IOException e
-                  | "user error (Pattern" `isPrefixOf` show e ->
-                    return False
-+                 | "user error (mzero" `isPrefixOf` show e ->
-+                   return False
-                PatternMatchFail _ -> return False
-                _ -> throw e)
- #endif
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs	2012-10-02 16:27:28.000000000 +0400
-@@ -69,6 +69,7 @@
- 
- -- * Constructors
-   pixbufNew,
-+  pixbufNewFromData,
-   pixbufNewFromFile,
- #if GTK_CHECK_VERSION(2,4,0)
-   pixbufNewFromFileAtSize,
-@@ -402,6 +403,19 @@
-       (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width)
-       (fromIntegral height)
- 
-+pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf
-+pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride
-+  = wrapNewGObject mkPixbuf $
-+     {#call pixbuf_new_from_data #}
-+       imData
-+       (fromIntegral . fromEnum $ cSpace)
-+       (fromBool hasAlpha)
-+       (fromIntegral bitsPerSample)
-+       (fromIntegral width)
-+       (fromIntegral height)
-+       (fromIntegral rowStride)
-+       nullFunPtr nullPtr
-+
- -- | Create a new image from a String.
- --
- -- * Creates a new pixbuf from a string description.
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/General/Clipboard.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -260,7 +260,7 @@
-                               -- data succeeded.
- clipboardSetWithData self targets getFunc clearFunc = do
-   gFunPtr <- mkClipboardGetFunc
--    (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
-+    (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
-   cFunPtr <- mkClipboardClearFunc
-     (\_ _ -> clearFunc)
-   res <- withTargetEntries targets $ \nTargets targets ->
-@@ -282,7 +282,7 @@
- {#pointer ClipboardClearFunc#}
- 
- foreign import ccall "wrapper" mkClipboardGetFunc ::
--  (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc
-+  (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc
- 
- foreign import ccall "wrapper" mkClipboardClearFunc ::
-   (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc
-@@ -313,7 +313,7 @@
-                               -- ignored.
- clipboardSetWithOwner self targets getFunc clearFunc owner = do
-   gFunPtr <- mkClipboardGetFunc
--    (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
-+    (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
-   cFunPtr <- mkClipboardClearFunc
-     (\_ _ -> clearFunc)
-   res <- withTargetEntries targets $ \nTargets targets ->
-@@ -404,7 +404,7 @@
- clipboardRequestContents self (Atom target) callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardReceivedFunc
--    (\_ sPtr -> do
-+    (\_ sPtr _ -> do
-       freeHaskellFunPtr =<< readIORef cbRef
-       runReaderT callback sPtr
-       return ())
-@@ -418,7 +418,7 @@
- {#pointer ClipboardReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardReceivedFunc ::
--  (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
-+  (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
- 
- -- %hash c:7bb1 d:4ef1
- -- | Requests the contents of the clipboard as text. When the text is later
-@@ -439,7 +439,7 @@
- clipboardRequestText self callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardTextReceivedFunc
--    (\_ sPtr -> do
-+    (\_ sPtr _ -> do
-       freeHaskellFunPtr =<< readIORef cbRef
-       mStr <- if sPtr==nullPtr then return Nothing else
-         liftM Just $ peekUTFString sPtr
-@@ -453,7 +453,7 @@
- {#pointer ClipboardTextReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardTextReceivedFunc ::
--  (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc
-+  (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc
- 
- 
- #if GTK_CHECK_VERSION(2,6,0)
-@@ -477,7 +477,7 @@
- clipboardRequestImage self callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardImageReceivedFunc
--    (\_ sPtr -> do
-+    (\_ sPtr _ -> do
-       freeHaskellFunPtr =<< readIORef cbRef
-       mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr)
-       callback mPixbuf)
-@@ -490,7 +490,7 @@
- {#pointer ClipboardImageReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardImageReceivedFunc ::
--  (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc
-+  (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc
- 
- #endif
- 
-@@ -513,7 +513,7 @@
- clipboardRequestTargets self callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardTargetsReceivedFunc
--    (\_ tPtr len -> do
-+    (\_ tPtr len _ -> do
-       -- We must free Haskell pointer *in* the callback to avoid segfault.
-       freeHaskellFunPtr =<< readIORef cbRef
-       mTargets <- if tPtr==nullPtr then return Nothing else
-@@ -528,7 +528,7 @@
- {#pointer ClipboardTargetsReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc ::
--  (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc
-+  (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc
- 
- #if GTK_CHECK_VERSION(2,10,0)
- -- %hash c:5601 d:d6a6
-@@ -552,10 +552,10 @@
- clipboardRequestRichText self buffer callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardRichTextReceivedFunc
--    (\_ tPtr sPtr len -> do
-+    (\_ tPtr sPtr len _ -> do
-       freeHaskellFunPtr =<< readIORef cbRef
-       mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do
--        str <- peekUTFStringLen (sPtr,fromIntegral len)
-+        str <- peekUTFStringLen (castPtr sPtr,fromIntegral len)
-         return (Atom tPtr, str)
-       callback mRes)
-   writeIORef cbRef cbPtr
-@@ -568,7 +568,7 @@
- {#pointer ClipboardRichTextReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc ::
--  (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) ->
-+  (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) ->
-   IO ClipboardRichTextReceivedFunc
- #endif
- #endif
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/General/General.chs	2012-10-02 16:27:28.000000000 +0400
-@@ -202,7 +202,7 @@
- --   their arguments from the main loop, that is, from the OS thread of Gtk,
- --   thereby ensuring that any Gtk and OS function can be called.
- --
--{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #}
-+{#fun gdk_threads_enter as threadsEnter {} -> `()' #}
- 
- -- | Release the global Gtk lock.
- --
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -493,17 +493,17 @@
-   {# call gtk_combo_box_set_row_separator_func #}
-     (toComboBox self) nullFunPtr nullPtr nullFunPtr
- comboBoxSetRowSeparatorSource self (Just (model, extract)) = do
--  funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do
-+  funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do
-         iter <- peek iterPtr
-         value <- customStoreGetRow model iter
--        return (extract value)
-+        return (fromBool $ extract value)
-   {# call gtk_combo_box_set_row_separator_func #}
-     (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr
- 
- {#pointer TreeViewRowSeparatorFunc#}
- 
- foreign import ccall "wrapper" mkRowSeparatorFunc ::
--  (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc
-+  (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc
- 
- -- %hash c:5bf8
- -- | Sets whether the popup menu should have a tearoff menu item.
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs	2012-10-02 16:27:30.000000000 +0400
-@@ -76,6 +76,12 @@
-   menuItemNewWithMnemonic,
- 
- -- * Methods
-+#if GTK_CHECK_VERSION(2,16,0)
-+  menuItemSetLabel,
-+  menuItemGetLabel,
-+  menuItemSetUseUnderline,
-+  menuItemGetUseUnderline,
-+#endif
-   menuItemSetSubmenu,
-   menuItemGetSubmenu,
-   menuItemRemoveSubmenu,
-@@ -89,6 +95,10 @@
- -- * Attributes
-   menuItemSubmenu,
-   menuItemRightJustified,
-+#if GTK_CHECK_VERSION(2,16,0)
-+  menuItemLabel,
-+  menuItemUseUnderline,
-+#endif
- 
- -- * Signals
-   menuItemActivateItem,
-@@ -163,7 +173,36 @@
- 
- --------------------
- -- Methods
-+#if GTK_CHECK_VERSION(2,16,0)
-+-- | Sets text on the MenuItem label
-+
-+menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO ()
-+menuItemSetLabel self label =
-+  withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self)
-+
-+-- | Gets text on the MenuItem label
-+menuItemGetLabel :: (MenuItemClass self) => self -> IO String
-+menuItemGetLabel self =
-+  {# call gtk_menu_item_get_label #}
-+    (toMenuItem self)
-+  >>= \strPtr -> if strPtr == nullPtr
-+                   then return ""
-+                   else peekUTFString strPtr
-+
-+-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key.
-+--
-+menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO ()
-+menuItemSetUseUnderline self =
-+  {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool
- 
-+-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key.
-+--
-+menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool
-+menuItemGetUseUnderline self =
-+  liftM toBool $ {# call gtk_menu_item_get_use_underline #}
-+    (toMenuItem self)
-+
-+#endif
- -- | Sets the item's submenu, or changes it.
- --
- menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO ()
-@@ -278,6 +317,22 @@
-   menuItemGetRightJustified
-   menuItemSetRightJustified
- 
-+#if GTK_CHECK_VERSION(2,16,0)
-+-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel'
-+--
-+menuItemLabel :: MenuItemClass self => Attr self String
-+menuItemLabel = newAttr
-+  menuItemGetLabel
-+  menuItemSetLabel
-+
-+-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and 
-+-- 'menuItemGetUseEUnderline'
-+--
-+menuItemUseUnderline :: MenuItemClass self => Attr self Bool
-+menuItemUseUnderline = newAttr
-+  menuItemGetUseUnderline
-+  menuItemSetUseUnderline
-+#endif
- --------------------
- -- Signals
- 
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs	2012-10-02 16:27:33.000000000 +0400
-@@ -239,7 +239,7 @@
-         customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource,
-         customTreeDragDestIface = fromMaybe dummyDragDest mDragDest }
-   privPtr <- newStablePtr priv
--  liftM con $ makeNewGObject (CustomStore, objectUnref) $
-+  liftM con $ wrapNewGObject (CustomStore, objectUnref) $
-     gtk2hs_store_new implPtr privPtr
- 
- foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new"
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -427,7 +427,7 @@
- {#pointer TreeModelForeachFunc#}
- 
- foreign import ccall "wrapper"  mkTreeModelForeachFunc ::
--  (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) ->
-+  (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) ->
-   IO TreeModelForeachFunc
- 
- #if GTK_CHECK_VERSION(2,2,0)
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -160,7 +160,7 @@
- {#pointer TreeModelFilterVisibleFunc #}
- 
- foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc ::
--  (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
-+  (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
-   IO TreeModelFilterVisibleFunc
- 
- -- %hash c:a56d d:b42e
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -151,7 +151,7 @@
- treeSelectionSetSelectFunction :: TreeSelectionClass self => self
-  -> TreeSelectionCB -> IO ()
- treeSelectionSetSelectFunction ts fun = do
--  fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do
-+  fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do
-     path <- peekTreePath (castPtr tp)
-     liftM fromBool $ fun path
-     )
-@@ -168,7 +168,7 @@
- {#pointer TreeSelectionFunc#}
- 
- foreign import ccall "wrapper"  mkTreeSelectionFunc ::
--  (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)->
-+  (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)->
-   IO TreeSelectionFunc
- 
- -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on.
-@@ -199,7 +199,7 @@
-  -> TreeSelectionForeachCB
-  -> IO ()
- treeSelectionSelectedForeach self fun = do
--  fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do
-+  fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do
-     -- make a deep copy of the iterator. This makes it possible to store this
-     -- iterator in Haskell land somewhere. The TreeModel parameter is not
-     -- passed to the function due to performance reasons. But since it is
-@@ -219,7 +219,7 @@
- {#pointer TreeSelectionForeachFunc#}
- 
- foreign import ccall "wrapper"  mkTreeSelectionForeachFunc ::
--  (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc
-+  (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc
- 
- #if GTK_CHECK_VERSION(2,2,0)
- -- | Creates a list of paths of all selected rows.
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -582,7 +582,7 @@
- {#pointer TreeViewColumnDropFunc#}
- 
- foreign import ccall "wrapper" mkTreeViewColumnDropFunc ::
--  (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
-+  (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
-   Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc
- 
- -- | Scroll to a coordinate.
-@@ -798,7 +798,7 @@
- {#pointer TreeViewMappingFunc#}
- 
- foreign import ccall "wrapper" mkTreeViewMappingFunc ::
--  (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
-+  (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
-   IO TreeViewMappingFunc
- 
- -- | Check if row is expanded.
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs	2012-10-02 16:27:34.000000000 +0400
-@@ -1251,16 +1251,26 @@
- 
- -- | A 'Pixbuf' is inserted into the buffer.
- --
-+-- * See note in 'bufferInsertText'.
-+--
- insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ())
- insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy)
- 
- -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. 
- -- Insertion actually occurs in the default handler.
- --
-+-- * See note in 'bufferInsertText'.
-+--
- insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ())
- insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy)
- 
---- | Some text was inserted.
-+-- | Some text is inserted. Insertion actually occurs in the default handler.
-+--
-+-- * The function connected to this handler may not modify the buffer since
-+--   this would invalidate the iterator. If this function replaces the
-+--   default handler, it needs to stop the emission of this signal in order
-+--   to prevent the default handler from running. If additional text should
-+--   be inserted, this can be done using the 'after' function to connect.
- --
- bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ())
- bufferInsertText = Signal $ \after obj handler ->
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -797,7 +797,7 @@
- {#pointer TextCharPredicate#}
- 
- foreign import ccall "wrapper" mkTextCharPredicate ::
--  ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate
-+  ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate
- 
- -- | Move 'TextIter' forward until a
- -- predicate function returns True.
-@@ -810,7 +810,7 @@
- textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
-                            IO Bool
- textIterForwardFindChar ti pred limit = do
--  fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
-+  fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
-   res <- liftM toBool $ {#call text_iter_forward_find_char#} 
-     ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
-   freeHaskellFunPtr fPtr
-@@ -827,7 +827,7 @@
- textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
-                             IO Bool
- textIterBackwardFindChar ti pred limit = do
--  fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
-+  fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
-   res <- liftM toBool $ {#call text_iter_backward_find_char#} 
-     ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
-   freeHaskellFunPtr fPtr
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -274,7 +274,7 @@
- {#pointer AssistantPageFunc#}
- 
- foreign import ccall "wrapper" mkAssistantPageFunc ::
--  ({#type glong#} -> Ptr () -> IO {#type glong#})
-+  ({#type gint#} -> Ptr () -> IO {#type gint#})
-   -> IO AssistantPageFunc
- 
- -- | Sets the page type for @page@. The page type determines the page behavior
diff --git a/community-staging/haskell-gtk/gtk-gthread.h-include.patch b/community-staging/haskell-gtk/gtk-gthread.h-include.patch
deleted file mode 100644
index fc600d6be..000000000
--- a/community-staging/haskell-gtk/gtk-gthread.h-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c
---- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~	2011-11-14 07:15:41.000000000 +0900
-+++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c	2012-01-08 14:58:45.849209318 +0900
-@@ -26,7 +26,8 @@
-  */
- 
- #include <glib.h>
--#include <glib/gthread.h>
-+/* f17 gives Error "Only <glib.h> can be included directly."
-+   #include <glib/gthread.h> */
- #include <gdk/gdk.h>
- #include "hsgthread.h"
- 
-
-Diff finished.  Sun Jan  8 14:58:54 2012
diff --git a/community-staging/haskell-gtk/gtk2hs-gtk.install b/community-staging/haskell-gtk/gtk2hs-gtk.install
deleted file mode 100644
index 7ed674b78..000000000
--- a/community-staging/haskell-gtk/gtk2hs-gtk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-gtk
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-haskeline/PKGBUILD b/community-staging/haskell-haskeline/PKGBUILD
deleted file mode 100644
index fe25fb84a..000000000
--- a/community-staging/haskell-haskeline/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 76055 2012-09-10 05:23:04Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=haskeline
-pkgname=haskell-haskeline
-pkgver=0.7.0.3
-pkgrel=1
-pkgdesc="A command-line interface for user input, written in Haskell."
-url="http://hackage.haskell.org/package/haskeline"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-utf8-string=0.3.7-3' 'haskell-mtl=2.1.2-1' 'haskell-terminfo=0.3.2.5-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('3a78043dc80b5510202e71e77c0a9923')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure \
-      -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-haskeline/haskell-haskeline.install b/community-staging/haskell-haskeline/haskell-haskeline.install
deleted file mode 100644
index 27cb4a093..000000000
--- a/community-staging/haskell-haskeline/haskell-haskeline.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskeline
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-hslogger/PKGBUILD b/community-staging/haskell-hslogger/PKGBUILD
deleted file mode 100644
index a2338816c..000000000
--- a/community-staging/haskell-hslogger/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 76057 2012-09-10 05:31:32Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-hslogger
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="Versatile logging framework"
-url="http://hackage.haskell.org/package/hslogger"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
-md5sums=('e0737887b0df75a3781989c8f6689850')
-
-build() {
-  cd ${srcdir}/hslogger-${pkgver}
-  runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
-	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
-	--enable-library-profiling
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/hslogger-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/hslogger
-  runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-hslogger/haskell-hslogger.install b/community-staging/haskell-hslogger/haskell-hslogger.install
deleted file mode 100644
index 2a0d98ae7..000000000
--- a/community-staging/haskell-hslogger/haskell-hslogger.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hslogger
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-html/PKGBUILD b/community-staging/haskell-html/PKGBUILD
deleted file mode 100644
index 8eb9fc6f4..000000000
--- a/community-staging/haskell-html/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=html
-pkgname=haskell-html
-pkgver=1.0.1.2
-pkgrel=12
-pkgdesc="HTML combinator library"
-url="http://hackage.haskell.org/package/html"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-html/haskell-html.install b/community-staging/haskell-html/haskell-html.install
deleted file mode 100644
index 768297e0a..000000000
--- a/community-staging/haskell-html/haskell-html.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-html
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-pango/PKGBUILD b/community-staging/haskell-pango/PKGBUILD
deleted file mode 100644
index 1c3b89124..000000000
--- a/community-staging/haskell-pango/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 76927 2012-10-02 10:46:31Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-pango
-pkgver=0.12.3
-pkgrel=3
-pkgdesc="Binding to the pango library for Gtk2Hs."
-url="http://hackage.haskell.org/package/pango"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo')
-makedepends=("gtk2hs-buildtools")
-provides=('gtk2hs-pango')
-replaces=('gtk2hs-pango')
-conflicts=('gtk2hs-pango')
-options=('strip')
-install=gtk2hs-pango.install
-source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
-md5sums=('1ef3132cb569703d5b1bc262c9d86fe3')
-
-build() {
-  cd ${srcdir}/pango-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/haskell-pango \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-  _hglibver=`pacman -Q haskell-glib | cut -f2 -d\  | cut -f1 -d-`
-  _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\  | cut -f1 -d-`
-  depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}")
-
-  cd ${srcdir}/pango-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh
-  install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango
-  runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-staging/haskell-pango/gtk2hs-pango.install b/community-staging/haskell-pango/gtk2hs-pango.install
deleted file mode 100644
index f2be2100f..000000000
--- a/community-staging/haskell-pango/gtk2hs-pango.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-pango
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community-staging/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
deleted file mode 100644
index a25506e67..000000000
--- a/community-staging/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 03:59:50 -0700
-Subject: [PATCH] update code to support extensible exceptions no longer being
- a part of ghc >= 7.6.1
-
----
- QuickCheck.cabal             | 6 +++++-
- Test/QuickCheck/Exception.hs | 6 ++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/QuickCheck.cabal b/QuickCheck.cabal
-index 1a9126e..5afd6fb 100644
---- a/QuickCheck.cabal
-+++ b/QuickCheck.cabal
-@@ -60,9 +60,13 @@ library
-       Build-depends: ghc
- 
-   -- We want to use extensible-exceptions even if linking against base-3.
--  if impl(ghc >= 6.9)
-+  if impl(ghc >= 6.9) && impl(ghc < 7.6)
-     Build-depends: extensible-exceptions
- 
-+  -- GHC >= 7.6.1 no longer provides extensible exceptions
-+  if impl(ghc >= 7.6)
-+    cpp-options: -DNEW_EXCEPTIONS
-+
-   -- Modules that are always built.
-   Exposed-Modules:
-     Test.QuickCheck,
-diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs
-index f895351..d463195 100644
---- a/Test/QuickCheck/Exception.hs
-+++ b/Test/QuickCheck/Exception.hs
-@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where
- 
- #if defined(OLD_EXCEPTIONS)
- import Control.Exception(evaluate, try, Exception(..), throw)
-+#elif defined(NEW_EXCEPTIONS)
-+import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
-+#if defined(GHC_INTERRUPT)
-+  , AsyncException(UserInterrupt)
-+#endif
-+  )
- #else
- import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
- #if defined(GHC_INTERRUPT)
--- 
-1.7.12
-
diff --git a/community-staging/haskell-quickcheck/PKGBUILD b/community-staging/haskell-quickcheck/PKGBUILD
deleted file mode 100644
index e96121f81..000000000
--- a/community-staging/haskell-quickcheck/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=QuickCheck
-pkgname=haskell-quickcheck
-pkgver=2.5.1.1
-pkgrel=1
-pkgdesc="Automatic testing of Haskell programs"
-url="http://hackage.haskell.org/package/QuickCheck"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'haskell-random=1.0.1.1-3' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('2631b41c8b6e297b52622d1698387f09')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-quickcheck/haskell-quickcheck.install b/community-staging/haskell-quickcheck/haskell-quickcheck.install
deleted file mode 100644
index c9e12fadc..000000000
--- a/community-staging/haskell-quickcheck/haskell-quickcheck.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-quickcheck
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-regex-base/PKGBUILD b/community-staging/haskell-regex-base/PKGBUILD
deleted file mode 100644
index d4e951cc6..000000000
--- a/community-staging/haskell-regex-base/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-base
-pkgname=haskell-regex-base
-pkgver=0.93.2
-pkgrel=7
-pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-regex-base/haskell-regex-base.install b/community-staging/haskell-regex-base/haskell-regex-base.install
deleted file mode 100644
index 3ad2fea28..000000000
--- a/community-staging/haskell-regex-base/haskell-regex-base.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-base
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-regex-compat/PKGBUILD b/community-staging/haskell-regex-compat/PKGBUILD
deleted file mode 100644
index c546442ec..000000000
--- a/community-staging/haskell-regex-compat/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-compat
-pkgname=haskell-regex-compat
-pkgver=0.95.1
-pkgrel=3
-pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7' 'haskell-regex-posix=0.95.2-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d0573ab4e2f3de5faa61380b67333320')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-regex-compat/haskell-regex-compat.install b/community-staging/haskell-regex-compat/haskell-regex-compat.install
deleted file mode 100644
index 898c0bba1..000000000
--- a/community-staging/haskell-regex-compat/haskell-regex-compat.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-compat
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-regex-posix/PKGBUILD b/community-staging/haskell-regex-posix/PKGBUILD
deleted file mode 100644
index 3c570e4d1..000000000
--- a/community-staging/haskell-regex-posix/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-posix
-pkgname=haskell-regex-posix
-pkgver=0.95.2
-pkgrel=2
-pkgdesc="The posix regex backend for regex-base"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('1df0f9494aab110c7231f36393285c7c')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-regex-posix/haskell-regex-posix.install b/community-staging/haskell-regex-posix/haskell-regex-posix.install
deleted file mode 100644
index 2b89fae7b..000000000
--- a/community-staging/haskell-regex-posix/haskell-regex-posix.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-posix
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-stm/PKGBUILD b/community-staging/haskell-stm/PKGBUILD
deleted file mode 100644
index fec52e949..000000000
--- a/community-staging/haskell-stm/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=stm
-pkgname=haskell-stm
-pkgver=2.4
-pkgrel=1
-pkgdesc="A modular composable concurrency abstraction."
-url="http://hackage.haskell.org/package/stm"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('fe8ab1a8231202f1748da53454cf55fc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-stm/haskell-stm.install b/community-staging/haskell-stm/haskell-stm.install
deleted file mode 100644
index 0283c2fc5..000000000
--- a/community-staging/haskell-stm/haskell-stm.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-stm
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-syb/PKGBUILD b/community-staging/haskell-syb/PKGBUILD
deleted file mode 100644
index a2595bf2c..000000000
--- a/community-staging/haskell-syb/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=syb
-pkgname=haskell-syb
-pkgver=0.3.7
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('fa653976a4ee43918cc7546089f94b60')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/community-staging/haskell-syb/haskell-syb.install b/community-staging/haskell-syb/haskell-syb.install
deleted file mode 100644
index 080055165..000000000
--- a/community-staging/haskell-syb/haskell-syb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-syb
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
deleted file mode 100644
index b8c2264bc..000000000
--- a/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 06:24:09 -0700
-Subject: [PATCH] update changed time code for ghc 7.6.1
-
----
- Codec/Archive/Tar/Pack.hs | 9 +++++----
- tar.cabal                 | 2 +-
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
-index 8e43091..0af6103 100644
---- a/Codec/Archive/Tar/Pack.hs
-+++ b/Codec/Archive/Tar/Pack.hs
-@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native
- import System.Directory
-          ( getDirectoryContents, doesDirectoryExist, getModificationTime
-          , Permissions(..), getPermissions )
--import System.Time
--         ( ClockTime(..) )
-+import Data.Time.Clock.POSIX
-+         ( utcTimeToPOSIXSeconds )
- import System.IO
-          ( IOMode(ReadMode), openBinaryFile, hFileSize )
- import System.IO.Unsafe (unsafeInterleaveIO)
-@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do
- 
- getModTime :: FilePath -> IO EpochTime
- getModTime path = do
--  (TOD s _) <- getModificationTime path
--  return $! fromIntegral s
-+  utcTime <- getModificationTime path
-+  let s = truncate . utcTimeToPOSIXSeconds $ utcTime
-+  return $! s
-diff --git a/tar.cabal b/tar.cabal
-index e748b07..d85b0da 100644
---- a/tar.cabal
-+++ b/tar.cabal
-@@ -25,7 +25,7 @@ source-repository head
- 
- library
-   build-depends: base >= 3 && < 5, filepath,
--                 directory, old-time, bytestring
-+                 directory, bytestring, time
- 
-   exposed-modules:
-     Codec.Archive.Tar
--- 
-1.7.12
-
diff --git a/community-staging/haskell-tar/PKGBUILD b/community-staging/haskell-tar/PKGBUILD
deleted file mode 100644
index 438145b82..000000000
--- a/community-staging/haskell-tar/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 76085 2012-09-11 06:28:53Z tdziedzic $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-tar
-pkgver=0.4.0.0
-pkgrel=3
-pkgdesc="Reading, writing and manipulating \".tar\" archive files."
-url="http://hackage.haskell.org/package/tar"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.6.1-1')
-source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz"
-        '0001-update-changed-time-code-for-ghc-7.6.1.patch')
-install=haskell-tar.install
-sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113'
-            '17b8afc519db5bed5d89807e6e659788f5d9c2f5c569150a9d1c6faac52e98e6')
-
-build() {
-  cd "$srcdir/tar-$pkgver"
-
-  # time functions have changed in ghc 7.6.1
-  patch -Np1 -i ${srcdir}/0001-update-changed-time-code-for-ghc-7.6.1.patch
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/tar-$pkgver"
-
-  install -Dm 744 register.sh \
-	  "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-	  "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-	  "$pkgdir/usr/share/doc/ghc/html/libraries/tar"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-tar/haskell-tar.install b/community-staging/haskell-tar/haskell-tar.install
deleted file mode 100644
index 7e0383621..000000000
--- a/community-staging/haskell-tar/haskell-tar.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-tar
-
-post_install() {
-  ${HS_DIR}/register.sh
-	post_remove
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	pre_upgrade
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-terminfo/PKGBUILD b/community-staging/haskell-terminfo/PKGBUILD
deleted file mode 100644
index 68ec58912..000000000
--- a/community-staging/haskell-terminfo/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 76051 2012-09-10 04:51:28Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=terminfo
-pkgname=haskell-terminfo
-pkgver=0.3.2.5
-pkgrel=1
-pkgdesc="Haskell bindings to the terminfo library."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-terminfo/haskell-terminfo.install b/community-staging/haskell-terminfo/haskell-terminfo.install
deleted file mode 100644
index 40d39f42b..000000000
--- a/community-staging/haskell-terminfo/haskell-terminfo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-terminfo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-utf8-string/PKGBUILD b/community-staging/haskell-utf8-string/PKGBUILD
deleted file mode 100644
index 0b24a3dc8..000000000
--- a/community-staging/haskell-utf8-string/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 76053 2012-09-10 04:57:10Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=utf8-string
-pkgname=haskell-utf8-string
-pkgver=0.3.7
-pkgrel=3
-pkgdesc="Support for reading and writing UTF8 Strings"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('50e5c395713e716e0e4a56da73f87ccd')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-utf8-string/haskell-utf8-string.install b/community-staging/haskell-utf8-string/haskell-utf8-string.install
deleted file mode 100644
index 0f64366b2..000000000
--- a/community-staging/haskell-utf8-string/haskell-utf8-string.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-utf8-string
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-x11-xft/PKGBUILD b/community-staging/haskell-x11-xft/PKGBUILD
deleted file mode 100644
index 356821274..000000000
--- a/community-staging/haskell-x11-xft/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 76130 2012-09-11 20:58:01Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=X11-xft
-pkgname=haskell-x11-xft
-pkgver=0.3.1
-pkgrel=5
-pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-utf8-string=0.3.7' 'libxft')
-options=('strip')
-install=haskell-x11-xft.install
-source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
-md5sums=('ad885150a59f63de328e73abe5ffc79e')
-
-build() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-x11-xft/haskell-x11-xft.install b/community-staging/haskell-x11-xft/haskell-x11-xft.install
deleted file mode 100644
index a0ff8dac8..000000000
--- a/community-staging/haskell-x11-xft/haskell-x11-xft.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=/usr/share/haskell/haskell-x11-xft
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-x11/PKGBUILD b/community-staging/haskell-x11/PKGBUILD
deleted file mode 100644
index ba44c0a70..000000000
--- a/community-staging/haskell-x11/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 76125 2012-09-11 19:44:43Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: shild <sxp@bk.ru>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-
-_hkgname=X11
-pkgname=haskell-x11
-pkgver=1.6.0.2
-pkgrel=1
-pkgdesc="A Haskell binding to the X11 graphics library."
-arch=(i686 x86_64)
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
-license=('custom:BSD3')
-options=('strip')
-depends=("ghc=7.6.1-1" "haskell-syb=0.3.7" 'libx11' 'libxinerama' 'libxrandr')
-conflicts=(haskell-x11-extras)
-install=hsmod.install
-source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('0227ba7a8788c3cfd146e952a5fafc82')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-staging/haskell-x11/hsmod.install b/community-staging/haskell-x11/hsmod.install
deleted file mode 100644
index 45c23b979..000000000
--- a/community-staging/haskell-x11/hsmod.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-x11
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/haskell-xhtml/PKGBUILD b/community-staging/haskell-xhtml/PKGBUILD
deleted file mode 100644
index 7ccfca159..000000000
--- a/community-staging/haskell-xhtml/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-
-_hkgname=xhtml
-pkgname=haskell-xhtml
-pkgver=3000.2.1
-pkgrel=2
-pkgdesc='Combinators for producing XHTML 1.0'
-url='http://hackage.haskell.org/package/xhtml'
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
-install=$pkgname.install
-sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8')
-
-build() {
-    cd "$srcdir/$_hkgname-$pkgver"
-
-    runhaskell Setup configure -O -p \
-      --enable-split-objs \
-      --enable-shared \
-      --prefix=/usr \
-      --docdir="/usr/share/doc/$pkgname" \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  
-  install -Dm744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/haskell-xhtml/haskell-xhtml.install b/community-staging/haskell-xhtml/haskell-xhtml.install
deleted file mode 100644
index d03b8a053..000000000
--- a/community-staging/haskell-xhtml/haskell-xhtml.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-xhtml
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-staging/hedgewars/PKGBUILD b/community-staging/hedgewars/PKGBUILD
deleted file mode 100644
index 13c99efd2..000000000
--- a/community-staging/hedgewars/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 76929 2012-10-02 11:08:53Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=hedgewars
-pkgver=0.9.17
-pkgrel=5
-pkgdesc="Free Worms-like turn based strategy game"
-arch=('i686' 'x86_64')
-url="http://hedgewars.org"
-license=('GPL' 'custom')
-depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
-makedepends=('fpc' 'cmake'
-	     # haskell specific
-	     'ghc'
-	     'haskell-network' 'haskell-bytestring-show'
-	     'haskell-utf8-string' 'haskell-dataenc'
-	     'haskell-hslogger')
-source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.desktop
-	hedgewars.png)
-md5sums=('77c0bc4bc664604adbba67fab606d8f1'
-         '48c66a3204d4fa0a69e9aa46f7c31e0c'
-         'eeb14d50df39063549ac5eca9dbc65d1')
-
-build() {
-  cd $pkgname-src-$pkgver
-
-#  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
-  sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATA_INSTALL_DIR=/usr/share \
-	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
-	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
-	-DWITH_SERVER=1 .
-
-  make
-}
-
-package() {
-  cd $pkgname-src-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
-  install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
-  install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
-}
diff --git a/community-staging/hedgewars/hedgewars.desktop b/community-staging/hedgewars/hedgewars.desktop
deleted file mode 100644
index 9d74ed3f1..000000000
--- a/community-staging/hedgewars/hedgewars.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hedgewars
-GenericName=Platform Game
-Comment=Worms style game
-Exec=hedgewars
-Icon=hedgewars
-Categories=Game;ArcadeGame;
\ No newline at end of file
diff --git a/community-staging/hedgewars/hedgewars.png b/community-staging/hedgewars/hedgewars.png
deleted file mode 100644
index 60ae66199..000000000
--- a/community-staging/hedgewars/hedgewars.png
+++ /dev/null
diff --git a/community-staging/homebank/PKGBUILD b/community-staging/homebank/PKGBUILD
deleted file mode 100644
index 4d86e398b..000000000
--- a/community-staging/homebank/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 74936 2012-08-10 01:45:28Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=homebank
-pkgver=4.4
-pkgrel=3
-pkgdesc="Free, easy, personal accounting for everyone"
-arch=('i686' 'x86_64')
-url="http://homebank.free.fr/"
-license=('GPL')
-depends=('desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'libofx' 'librsvg' 'perlxml' 'shared-mime-info')
-makedepends=('intltool')
-install=$pkgname.install
-source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz)
-sha256sums=('13b89373575e3ac229d2683aa7296778ad7cdae1a7a019c9124a1d5b23dce7d2')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/homebank/homebank.install b/community-staging/homebank/homebank.install
deleted file mode 100644
index 3c862f44b..000000000
--- a/community-staging/homebank/homebank.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-staging/ibus/PKGBUILD b/community-staging/ibus/PKGBUILD
deleted file mode 100644
index 177d0c901..000000000
--- a/community-staging/ibus/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 77920 2012-10-15 21:34:04Z ebelanger $
-# Contributor: Rainy <rainylau(at)gmail(dot)com>
-# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=ibus
-pkgver=1.4.2
-pkgrel=2
-pkgdesc="Next Generation Input Bus for Linux"
-arch=('i686' 'x86_64')
-url="http://ibus.googlecode.com"
-license=('LGPL')
-depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \
-         'iso-codes' 'librsvg' 'python2-notify' 'hicolor-icon-theme')
-makedepends=('intltool' 'gobject-introspection')
-optdepends=('notification-daemon')
-options=('!libtool')
-install=ibus.install
-source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('a2d11d8bb64761691df918e9e50f0b35c711760d')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  export PYTHON=python2
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus \
-    --sysconfdir=/etc \
-    --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-    --enable-gtk3
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/etc/xdg/autostart"
-  ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop"
-}
diff --git a/community-staging/ibus/ibus.install b/community-staging/ibus/ibus.install
deleted file mode 100644
index f44e3be1d..000000000
--- a/community-staging/ibus/ibus.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-
-    gconfpkg --install ibus
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    # update for gkt3
-    gtk-query-immodules-3.0 --update-cache 
-}
-
-pre_upgrade() {
-    pre_remove $1
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    gconfpkg --uninstall ibus
-}
-
-post_remove() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    # update for gkt3
-    gtk-query-immodules-3.0 --update-cache 
-}
diff --git a/community-staging/kdenlive/PKGBUILD b/community-staging/kdenlive/PKGBUILD
deleted file mode 100644
index 49ae08a17..000000000
--- a/community-staging/kdenlive/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 74222 2012-07-23 03:08:04Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Zuf <kontakt.zuf@gmail.com>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-
-pkgname=kdenlive
-pkgver=0.9.2
-pkgrel=3
-pkgdesc="A non-linear video editor for Linux"
-arch=('i686' 'x86_64')
-# http://download.kde.org/stable/kdenlive/
-url="http://www.kdenlive.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz'
-	 'libqzeitgeist')
-makedepends=('automoc4' 'cmake' 'gettext' 'mesa')
-optdepends=('recordmydesktop'
-	    'dvdauthor'
-	    'mkisolinux'
-	    'xine-ui')
-install=kdenlive.install
-options=('docs')
-source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2)
-md5sums=('40f108f26e2c2e08807a1c183d8764ec')
-
-build() {
-  export LDFLAGS="$LDFLAGS -lX11"
-  cd "${srcdir}"
-  mkdir -p build
-  cd build
-  cmake ../kdenlive-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=/usr/lib \
-    -DLINK_LIBRARIES=-lX11
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/kdenlive/kdenlive.install b/community-staging/kdenlive/kdenlive.install
deleted file mode 100644
index a3489ee9d..000000000
--- a/community-staging/kdenlive/kdenlive.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/kid3/PKGBUILD b/community-staging/kid3/PKGBUILD
deleted file mode 100644
index 896529a81..000000000
--- a/community-staging/kid3/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 72059 2012-06-07 16:38:57Z tdziedzic $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Alois Nespor <alois.nespor@gmail.com>
-
-pkgname=kid3
-pkgver=2.1
-pkgrel=4
-pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
-arch=('i686' 'x86_64')
-url="http://kid3.sourceforge.net/"
-license=('GPL')
-depends=('chromaprint' 'id3lib' 'taglib' 'kdebase-runtime')
-makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl')
-options=('!makeflags')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'ffmpeg-0.11.diff')
-sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225'
-            '76ab3c119817a0e1f26e368afb757488c3865ff634771d4d176e729492991a54')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  # fix error building with latest ffmpeg
-  # http://kid3.git.sourceforge.net/git/gitweb.cgi?p=kid3/kid3;a=commit;h=2a91bff2810281e58948f478e9396c73e5c6154a
-  patch -Np1 -i ${srcdir}/ffmpeg-0.11.diff
-
-  cd ${srcdir}
-
-  mkdir build
-  cd build
-
-  cmake \
-    ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/kid3/ffmpeg-0.11.diff b/community-staging/kid3/ffmpeg-0.11.diff
deleted file mode 100644
index 349ca4b3d..000000000
--- a/community-staging/kid3/ffmpeg-0.11.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2a91bff2810281e58948f478e9396c73e5c6154a Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date: Mon, 4 Jun 2012 15:23:36 +0200
-Subject: [PATCH 1/1] Support building with ffmpeg-0.11.
-
----
- src/core/import/fingerprintcalculator.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/import/fingerprintcalculator.cpp b/src/core/import/fingerprintcalculator.cpp
-index 05158ae..6ac632c 100644
---- a/src/core/import/fingerprintcalculator.cpp
-+++ b/src/core/import/fingerprintcalculator.cpp
-@@ -218,7 +218,7 @@ public:
-   }
- 
-   bool createForCodec(const Codec& codecCtx) {
--    m_ptr = ::av_audio_convert_alloc(SAMPLE_FMT_S16, codecCtx.channels(),
-+    m_ptr = ::av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codecCtx.channels(),
-                  codecCtx.sampleFormat(), codecCtx.channels(), 0, 0);
-     return m_ptr != 0;
-   }
-@@ -342,7 +342,7 @@ FingerprintCalculator::Result::Error FingerprintCalculator::decodeAudioFile(
-     return Result::NoCodecFound;
- 
-   Converter converter;
--  if (codec.sampleFormat() != SAMPLE_FMT_S16) {
-+  if (codec.sampleFormat() != AV_SAMPLE_FMT_S16) {
-     if (!converter.createForCodec(codec))
-       return Result::NoConverterFound;
-   }
--- 
-1.7.4.1
-
diff --git a/community-staging/kid3/kid3.changelog b/community-staging/kid3/kid3.changelog
deleted file mode 100644
index 8c440c611..000000000
--- a/community-staging/kid3/kid3.changelog
+++ /dev/null
@@ -1,29 +0,0 @@
-2012-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kid3 2.1-1
-
-2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kid3 2.0.1-1
-
-2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kid3 2.0-1
-
-2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kid3 1.6
-
-2010-09-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.5
-
-2010-03-13 Andrea Scarpino <andrea@archlinux.org>
-	* Update to major release v1.4
-	* MP4V2 enabled
-	* Cleanup dependencies
-
-2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.3
-	* MP4V2 disabled, package in [extra] needs to be updated to be used with kid3
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.2
-
-2008-10-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.1
diff --git a/community-staging/kid3/kid3.install b/community-staging/kid3/kid3.install
deleted file mode 100644
index 8ec315e7c..000000000
--- a/community-staging/kid3/kid3.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 $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-staging/kphotoalbum/PKGBUILD b/community-staging/kphotoalbum/PKGBUILD
deleted file mode 100644
index 614c32cba..000000000
--- a/community-staging/kphotoalbum/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 74610 2012-07-31 14:26:16Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
-# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com>
-# Contributor: chfoxli <lg ][ romandie ? com>
-
-pkgname=kphotoalbum
-pkgver=4.2
-pkgrel=2
-pkgdesc="KDE Photo Album, picture collection manager"
-url="http://www.kphotoalbum.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('kdebase-runtime' 'libkipi' 'libkdcraw')
-makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs')
-optdepends=('kdeedu-marble: integration with Marble'
-	'kipi-plugins: add extra functionality'
-	'kdemultimedia-mplayerthumbs: video thumbnails')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7cb484089477f3633657b67ce59b85f2')
-
-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/community-staging/kphotoalbum/fix-docbook-build.patch b/community-staging/kphotoalbum/fix-docbook-build.patch
deleted file mode 100644
index 575a4271e..000000000
--- a/community-staging/kphotoalbum/fix-docbook-build.patch
+++ /dev/null
@@ -1,236 +0,0 @@
-diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook
---- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix	2009-11-15 15:16:29.000000000 -0600
-+++ kphotoalbum-4.1.1/doc/index.docbook	2010-06-13 13:03:02.815174744 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>">
-   <!ENTITY kappname "&kphotoalbum;">
-   <!ENTITY package "kdeextragear-2">
-@@ -41,12 +41,6 @@
-     <date>2004-08-06</date>
-     <releaseinfo>2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword>KDE</keyword>
--      <keyword>kdeextragear-2</keyword>
--      <keyword>KPhotoAlbum</keyword>
--      <keyword>Image Database</keyword>
--    </keywordset>
-     <abstract><para>
-   This is the user manual for &kphotoalbum;. If you are
-   not the type who likes reading documentation, but rather just want to try
-@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto
- on long HTML document at <ulink
- url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Image Database</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:07.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:10:06.145165665 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Bilddatenbank</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist>
-@@ -102,6 +92,12 @@
- >HTML</acronym
- >-Dokument zum Herunterladen.</para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Bilddatenbank</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:20.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:11:18.860165964 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Piltide andmebaas</keyword>
--    </keywordset>
-     <abstract
- ><para
- >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: <itemizedlist>
-@@ -100,6 +90,12 @@
- >&kphotoalbum;i koduleheküljelt</ulink
- >.</para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>Piltide andmebaas</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:57.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:00.978165382 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->Banca dati immagini</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: <itemizedlist>
-@@ -100,6 +90,12 @@
- >homepage di &kphotoalbum;</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+       <keyword>KDE</keyword>
-+       <keyword>kdeextragear-2</keyword>
-+       <keyword>KPhotoAlbum</keyword>
-+       <keyword>Banca dati immagini</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:13.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:45.765165840 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->Kfotoalbum</keyword>
--      <keyword
-->Bilddatabas</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: <itemizedlist>
-@@ -100,6 +90,12 @@
- >Kfotoalbums hemsida</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>Kfotoalbum</keyword>
-+      <keyword>Bilddatabas</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
-diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
---- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:26.000000000 -0600
-+++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:13:28.217166055 -0500
-@@ -1,5 +1,5 @@
- <?xml version="1.0" ?>
--<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
-   <!ENTITY kphotoalbum "<application
- >KPhotoAlbum</application
- >">
-@@ -65,16 +65,6 @@
-     <releaseinfo
- >2.0</releaseinfo>
-     
--    <keywordset>
--      <keyword
-->KDE</keyword>
--      <keyword
-->kdeextragear-2</keyword>
--      <keyword
-->KPhotoAlbum</keyword>
--      <keyword
-->База даних зображень</keyword>
--    </keywordset>
-     <abstract
- ><para
- >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist>
-@@ -100,6 +90,12 @@
- >домашній сторінці &kphotoalbum;</ulink
- ></para>
- </abstract>
-+    <keywordset>
-+      <keyword>KDE</keyword>
-+      <keyword>kdeextragear-2</keyword>
-+      <keyword>KPhotoAlbum</keyword>
-+      <keyword>База даних зображень</keyword>
-+    </keywordset>
-   </bookinfo>
-   
-   &introduction;
diff --git a/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch
deleted file mode 100644
index 65baf235d..000000000
--- a/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- kphotoalbum-4.1.1/Exif/Info.cpp.orig	2010/08/16 08:04:32	1164187
-+++ kphotoalbum-4.1.1/Exif/Info.cpp	2011/01/09 06:50:40	1213128
-@@ -106,6 +106,28 @@
-         return res;
- 
-     QList<const Exiv2::TagInfo*> tags;
-+    std::ostringstream s;
-+
-+#if (EXIV2_TEST_VERSION(0,21,0))
-+    const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
-+    while (gi->tagList_ != 0) {
-+	    Exiv2::TagListFct tl     = gi->tagList_;
-+	    const Exiv2::TagInfo* ti = tl();
-+
-+	    while (ti->tag_ != 0xFFFF) {
-+		    tags << ti;
-+		    ++ti;
-+	    }
-+        ++gi;
-+    }
-+
-+    for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) {
-+        while ( (*it)->tag_ != 0xffff ) {
-+            res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
-+            ++(*it);
-+        }
-+    }
-+#else
-     tags <<
-         Exiv2::ExifTags::ifdTagList() <<
-         Exiv2::ExifTags::exifTagList() <<
-@@ -121,7 +143,6 @@
-     // Now the ugly part -- exiv2 doesn't have any way to get a list of
-     // MakerNote tags in a reasonable form, so we have to parse it from strings
- 
--    std::ostringstream s;
-     for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
-             kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
- #if EXIV2_TEST_VERSION(0,17,0)
-@@ -130,6 +151,7 @@
-         Exiv2::ExifTags::makerTaglist( s, kind );
- #endif
-     }
-+#endif
- 
-     // IPTC tags use yet another format...
-     Exiv2::IptcDataSets::dataSetList( s );
diff --git a/community-staging/kphotoalbum/kphotoalbum.install b/community-staging/kphotoalbum/kphotoalbum.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/community-staging/kphotoalbum/kphotoalbum.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/community-staging/krename/PKGBUILD b/community-staging/krename/PKGBUILD
deleted file mode 100644
index 0a5454aab..000000000
--- a/community-staging/krename/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 74533 2012-07-30 01:30:20Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=krename
-pkgver=4.0.9
-pkgrel=2
-pkgdesc="A very powerfull batch file renamer for KDE"
-arch=('i686' 'x86_64')
-url="http://www.krename.net"
-license=('GPL')
-depends=('kdebase-runtime' 'taglib')
-makedepends=('cmake' 'automoc4')
-options=('libtool')
-install=krename.install
-source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('03886a385a16de4c9bc285d25b9816ea97768c9e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/krename/krename.install b/community-staging/krename/krename.install
deleted file mode 100644
index 1c0de2e4f..000000000
--- a/community-staging/krename/krename.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/ktoblzcheck/PKGBUILD b/community-staging/ktoblzcheck/PKGBUILD
deleted file mode 100644
index 0b7caeec1..000000000
--- a/community-staging/ktoblzcheck/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 77312 2012-10-08 16:11:32Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
-
-pkgname=ktoblzcheck
-pkgver=1.39
-pkgrel=3
-pkgdesc="A library to check account numbers and bank codes of German banks"
-arch=(i686 x86_64)
-url="http://ktoblzcheck.sourceforge.net"
-options=('!libtool')
-license=("LGPL")
-depends=('gcc-libs' 'python')
-optdepends=('perl')
-source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz
-	ktoblzcheck-python3.patch)
-md5sums=('ef5efd6e2c31aaf6405060ec477c200c'
-         'a81a697bb3aaeffb7fac0ad7d9166e3f')
-
-build() {
-  cd "$srcdir/ktoblzcheck-$pkgver"
-  ./configure --prefix=/usr
-  patch -p1 <$srcdir/ktoblzcheck-python3.patch
-  make
-}
-
-package() {
-  cd "$srcdir/ktoblzcheck-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/ktoblzcheck/ktoblzcheck-python3.patch b/community-staging/ktoblzcheck/ktoblzcheck-python3.patch
deleted file mode 100644
index 5bfc53275..000000000
--- a/community-staging/ktoblzcheck/ktoblzcheck-python3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur ktoblzcheck-1.28/src/python/ktoblzcheck.py ktoblzcheck-1.28.my/src/python/ktoblzcheck.py
---- ktoblzcheck-1.28/src/python/ktoblzcheck.py	2008-08-12 16:48:54.000000000 +0000
-+++ ktoblzcheck-1.28.my/src/python/ktoblzcheck.py	2010-09-20 09:08:36.000000000 +0000
-@@ -197,35 +197,35 @@
- 
- def test():
-     a = AccountNumberCheck()
--    print 'Number of Banks:', a.bankCount
--    print 'find 20010020:', a.findBank('20010020')
--    print 'find 20010033:', a.findBank('20010033')
--    print 'check 20070024/9291394:', a.check('20070024','9291394')
--    print 'check 20070024/9291394:', a.check('20070024','9291394023')
--    print
-+    print('Number of Banks:', a.bankCount)
-+    print('find 20010020:', a.findBank('20010020'))
-+    print('find 20010033:', a.findBank('20010033'))
-+    print('check 20070024/9291394:', a.check('20070024','9291394'))
-+    print('check 20070024/9291394:', a.check('20070024','9291394023'))
-+    print()
-     ck = IbanCheck()
-     if not kto.IbanCheck_selftest(ck):  # not publicly defined
--	print "Self-Test failed!"
-+        print("Self-Test failed!")
- 	raise SystemExit
-     s = " iban fr14 2004 1010 0505 0001 3m02 606"
--    print "test for iban    :", s
-+    print("test for iban    :", s)
-     iban = Iban(s)
--    print "transmission form:", iban.transmissionForm()
-+    print("transmission form:", iban.transmissionForm())
-     res = ck.check(iban)
--    print "check result     :", res, "("+IbanCheck.resultText(res)+")"
--    print "printable form   :", iban.printableForm()
--    print
--    print "expect bad checksum:"
-+    print("check result     :", res, "("+IbanCheck.resultText(res)+")")
-+    print("printable form   :", iban.printableForm())
-+    print()
-+    print("expect bad checksum:")
-     s = "FR1420041010050500013X02606"
-     res = ck.check(s)
--    print s + ":", res, "("+IbanCheck.resultText(res)+")"
--    print
-+    print(s + ":", res, "("+IbanCheck.resultText(res)+")")
-+    print()
-     s = "IBAN DE66 2007 0024 0929 1394 00"
--    print s
-+    print(s)
-     s = Iban(s).transmissionForm()
-     start, end = ck.bic_position(s)
--    print "prefix, checksum, BIC, account:"
--    print ', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0')))
-+    print("prefix, checksum, BIC, account:")
-+    print(', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0'))))
- 
- 
- if __name__ == '__main__':
diff --git a/community-staging/libextractor/PKGBUILD b/community-staging/libextractor/PKGBUILD
deleted file mode 100644
index 05a44a8d0..000000000
--- a/community-staging/libextractor/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78170 2012-10-17 10:06:14Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=libextractor
-pkgver=0.6.3
-pkgrel=8
-pkgdesc="A library used to extract meta-data from files of arbitrary type"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://gnunet.org/libextractor/"
-depends=('libltdl')
-makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2')
-optdepends=('flac: flac support'
-	    'poppler: pdf support'
-	    'exiv2: metadata support'
-	    'qt: the Qt GUI interface/thumbnails'
-	    'gtk2: gtk2 GUI interface/thumbnails'
-	    'libgsf: (optional) for ODF support'
-	    'libmpeg2: mpeg support'
-	    'libvorbis: ogg/vorbis support')
-options=('!libtool' '!makeflags')
-install=libextractor.install
-source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('7004ff6be06e400050f0ad7016140981'
-         '81f95c31831dde62428a98ae32464c51')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-shared --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/share/info/dir
-}
diff --git a/community-staging/libextractor/libextractor.install b/community-staging/libextractor/libextractor.install
deleted file mode 100644
index 1cf51e095..000000000
--- a/community-staging/libextractor/libextractor.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(extractor.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/community-staging/libgexiv2/PKGBUILD b/community-staging/libgexiv2/PKGBUILD
deleted file mode 100644
index c37d9d27f..000000000
--- a/community-staging/libgexiv2/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 74535 2012-07-30 01:39:07Z ebelanger $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libgexiv2
-pkgver=0.4.1
-pkgrel=3
-pkgdesc="GObject-based wrapper around the Exiv2 library."
-arch=('i686' 'x86_64')
-url="http://redmine.yorba.org/projects/gexiv2"
-license=('GPL2')
-depends=('exiv2' 'glib2')
-options=('!libtool')
-source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/lincity-ng/PKGBUILD b/community-staging/lincity-ng/PKGBUILD
deleted file mode 100644
index fb01bb777..000000000
--- a/community-staging/lincity-ng/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 75469 2012-08-25 17:01:48Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=lincity-ng
-pkgver=2.0
-pkgrel=5
-pkgdesc="A city simulation game"
-arch=('i686' 'x86_64')
-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')
-makedepends=('ftjam' 'mesa')
-source=(http://download.berlios.de/lincity-ng/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('2961a3f60f7481b33858d7d5ef7cf9c788d01077')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  jam
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  jam -sprefix="${pkgdir}/usr" install
-  install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt"
-  install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt"
-}
diff --git a/community-staging/lorcon/PKGBUILD b/community-staging/lorcon/PKGBUILD
deleted file mode 100644
index 889a42d31..000000000
--- a/community-staging/lorcon/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 64207 2012-02-10 09:10:01Z ebelanger $
-# Maintainer:
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: fnord0 [fnord0 <AT> riseup <DOT> net]
-
-pkgname=lorcon-old-svn
-pkgver=224
-pkgrel=2
-pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames"
-url='http://802.11ninja.net'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libnl1')
-options=('!libtool')
-source=("ftp://ftp.archlinux.org/other/community/lorcon-old/lorcon-old-${pkgver}.tar.bz2")
-md5sums=('7a939cc8ec0d70d1b312b9fe9f0dfaf8')
-
-build() {
-  cd "${srcdir}/lorcon-old-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/lorcon-old-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD
deleted file mode 100644
index 9fbef1989..000000000
--- a/community-staging/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78606 2012-10-21 23:08:13Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.3.0
-pkgrel=4
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit')
-makedepends=('cmake')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2)
-sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676')
-
-build() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index c3c1f1197..000000000
--- a/community-staging/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,45 +0,0 @@
-2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.3.0-2 exiv2-0.23 rebuild
-
-2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.3.0-1
-
-2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.2.1-1
-
-2012-01-27 Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-
-2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.1.0-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.0.2-1
-
-2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* exiv2 0.20 rebuild
-
-2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.0.1
-
-2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package renamed to LuminanceHDR
-	* Update to major release 2.0.0
-
-2010-03-09 Andrea Scarpino <andrea@archlinux.org>
-	* exiv2 0.19 rebuild
-
-2009-11-02 Biru Ionut <ionut@archlinux.ro>
-	* add translation and fix segfault on old i686 procesors
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.9.3
-
-2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Minor version (v1.9.2-3) update caused by exiv2 upgrade.
-
-2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Minor version (v1.9.2-2) update caused by openexr upgrade.
-
-2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community]
diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install
deleted file mode 100644
index 279762804..000000000
--- a/community-staging/luminancehdr/luminancehdr.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/community-staging/luxrays/PKGBUILD b/community-staging/luxrays/PKGBUILD
deleted file mode 100644
index 16859c63f..000000000
--- a/community-staging/luxrays/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78588 2012-10-21 14:58:02Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=luxrays
-pkgver=1.1
-_pkgver=589aa5dac899
-pkgrel=3
-pkgdesc="Accelerate the ray intersection process by using GPUs"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('freeimage' 'freeglut' 'glew' 'libcl')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('7513d71148fa14bc1779b816816580b9')
-
-build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  install -d -m755 "$pkgdir"/usr/{bin,include,lib}
-  install -m755 bin/* "$pkgdir"/usr/bin
-  install -m644 lib/* "$pkgdir"/usr/lib
-  cp -a include/luxrays "$pkgdir"/usr/include
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/luxrender/PKGBUILD b/community-staging/luxrender/PKGBUILD
deleted file mode 100644
index a2b04e269..000000000
--- a/community-staging/luxrender/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 78592 2012-10-21 16:37:34Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Initial contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
-pkgname=luxrender
-pkgver=1.1
-_pkgver=4b4289cda943
-pkgrel=3
-pkgdesc="Rendering system for physically correct, unbiased image synthesis"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
-            'python: Python interface (pylux)'
-            'nvidia-utils: OpenCL support for nVidia GPUs' \
-            'amdstream: OpenCL support for AMD GPUs' \
-            'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'mesa' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
-md5sums=('accca65afdc4cc38db49a6e54f20e0f2')
-
-build() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-
-  # fix the installation
-  sed -i '/.*wxgui.*/ d' CMakeLists.txt
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-  make DESTDIR="$pkgdir" install
-
-  # fix library path on x86_64
-  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
-  #install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/lxdm/PKGBUILD b/community-staging/lxdm/PKGBUILD
deleted file mode 100644
index 1430d5160..000000000
--- a/community-staging/lxdm/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 77741 2012-10-14 07:48:01Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: AndyRTR <andyrtr@archlinux.org>
-# Contributor: kiefer <jorgelmadrid@gmail.com>
-
-pkgname=lxdm
-pkgver=0.4.1
-pkgrel=16
-pkgdesc='Lightweight X11 Display Manager'
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/lxdm/"
-license=('GPL')
-groups=('lxde')
-depends=('gtk2' 'xorg-server')
-makedepends=('intltool')
-install=${pkgname}.install
-backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
-        'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
-        'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
-source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-        glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
-        greeter-session.patch pam-env-vars.patch rc.d lxdm-pam service)
-md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
-         'a1e3c46a8bef691bc544028f5b6cfe22'
-         'baed9055e8825a5511712bc095197519'
-         'c50dd01b715b0a236407d48066191601'
-         'd2e4a4a22ee2aa1a986be154c647b6c6'
-         '28475239d0c8b4fd778ec49f5ec72962'
-         '4c1d43e81e9a256e8d1ea7686c24b3d3'
-         '705f394052fdd0dec22e95321d170de0'
-         '34908bc0ec15b6ae4e1074f39fce44df'
-         'e8cc66eb1a2405d2d9d184a727cbd9d8')
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-
-    patch -Np1 -i $srcdir/glib2-2.32.0.patch
-    patch -Np1 -i $srcdir/greeter-session.patch
-    patch -Np1 -i $srcdir/pam-env-vars.patch
-
-    ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
-    make
-  	
-    patch -Np0 -i $srcdir/lxdm.patch
-    patch -Np0 -i $srcdir/lxdm.conf.patch
-    patch -Np0 -i $srcdir/Xsession.patch
-}
-
-
-package() {
-    cd $srcdir/$pkgname-$pkgver
-    make DESTDIR=$pkgdir install
-
-    install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm
-    install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm
-    install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service
-    install -d $pkgdir/var/{lib,run}/lxdm
-
-    # fix the greeter location
-    sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
-
-    # avoid conflict with filesystem>=2012.06
-    rm -r $pkgdir/var/run
-}
diff --git a/community-staging/lxdm/Xsession.patch b/community-staging/lxdm/Xsession.patch
deleted file mode 100644
index 035ff0383..000000000
--- a/community-staging/lxdm/Xsession.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Xsession.orig	2011-07-29 15:42:33.000000000 +0200
-+++ data/Xsession	2011-12-03 09:09:14.592876087 +0100
-@@ -9,6 +9,8 @@
- 	LXSESSION=/usr/bin/startlxde
- fi
- 
-+[ -f /etc/profile ] && . /etc/profile
-+[ -f ~/.profile ] && . ~/.profile
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f ~/.xprofile ] && . ~/.xprofile
- 
diff --git a/community-staging/lxdm/glib2-2.32.0.patch b/community-staging/lxdm/glib2-2.32.0.patch
deleted file mode 100644
index cebfc6133..000000000
--- a/community-staging/lxdm/glib2-2.32.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
-Subject: fix event check bug caused cpu 100%
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
-
-fix event check bug caused cpu 100%
----
-
-diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..18ee12e 100644
---- a/src/lxcom.c
-+++ b/src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
- 
- static gboolean lxcom_check(GSource *source)
- {
--	return TRUE;
-+	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
- }
- 
- static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
diff --git a/community-staging/lxdm/greeter-session.patch b/community-staging/lxdm/greeter-session.patch
deleted file mode 100644
index f3b94a57a..000000000
--- a/community-staging/lxdm/greeter-session.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/greeter.c b/src/greeter.c
-index c0c150d..1f6b88e 100644
---- a/src/greeter.c
-+++ b/src/greeter.c
-@@ -114,7 +114,7 @@ static char *get_session_exec(void)
- 	GtkTreeModel* model;
- 	GtkTreeIter it;
- 	gchar *res;
--	if(!lang)
-+	if(!sessions)
- 		return g_strdup("");
- 	
- 	if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it))
diff --git a/community-staging/lxdm/lxdm-pam b/community-staging/lxdm/lxdm-pam
deleted file mode 100644
index c62f62721..000000000
--- a/community-staging/lxdm/lxdm-pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
--session optional pam_systemd.so
--session optional pam_loginuid.so
diff --git a/community-staging/lxdm/lxdm.conf.patch b/community-staging/lxdm/lxdm.conf.patch
deleted file mode 100644
index 1744e557e..000000000
--- a/community-staging/lxdm/lxdm.conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/lxdm.conf.orig	2011-11-01 17:57:59.208757577 +0100
-+++ data/lxdm.conf	2011-11-01 18:03:55.608741945 +0100
-@@ -27,7 +27,7 @@
- gtk_theme=Clearlooks
- 
- ## background of the greeter
--bg=/usr/share/backgrounds/default.png
-+# bg=/usr/share/backgrounds/default.png
- 
- ## if show bottom pane
- bottom_pane=1
diff --git a/community-staging/lxdm/lxdm.install b/community-staging/lxdm/lxdm.install
deleted file mode 100644
index 4d1285dc5..000000000
--- a/community-staging/lxdm/lxdm.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    if ! getent group lxdm > /dev/null ; then
-        groupadd --system lxdm
-        chgrp -R lxdm /var/lib/lxdm
-        chgrp lxdm /etc/lxdm/lxdm.conf
-        chmod +r /etc/lxdm/lxdm.conf
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    if ! getent group lxdm > /dev/null ; then
-        groupdel lxdm
-    fi
-}
diff --git a/community-staging/lxdm/lxdm.patch b/community-staging/lxdm/lxdm.patch
deleted file mode 100644
index a703a386d..000000000
--- a/community-staging/lxdm/lxdm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- data/lxdm.orig	2010-01-24 16:58:42.262866825 -0200
-+++ data/lxdm	2010-01-19 11:56:34.308668692 -0200
-@@ -1,21 +1,13 @@
- #!/bin/sh
-
--[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
--
--if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
--	. /etc/sysconfig/language
--	if [ -n "$RC_LANG"]; then
--		LANG=$RC_LANG
--	fi
-+if [ -r /etc/profile.d/locale.sh ]; then
-+	. /etc/profile.d/locale.sh
- fi
-
- if [ -n "$LANG" ]; then
- 	export LANG
- fi
-
--[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
--[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
--
- if [ -n "$DEFAULT_WM" ]; then
- 	PREFERRED=$DEFAULT_WM
- fi
diff --git a/community-staging/lxdm/pam-env-vars.patch b/community-staging/lxdm/pam-env-vars.patch
deleted file mode 100644
index ab8605ff1..000000000
--- a/community-staging/lxdm/pam-env-vars.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/src/lxdm.c b/src/lxdm.c
-index 369aedf..cd1d486 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name)
-         g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err));
- }
- 
--void append_pam_environ(pam_handle_t *pamh,char **env)
-+static char **append_pam_environ(pam_handle_t *pamh,char **env)
- {
--	int i,j,n;
-+	int i,j,n,a;
- 	char **penv;
--	if(!pamh) return;
-+	if(!pamh) return env;
- 	penv=pam_getenvlist(pamh);
--	if(!penv) return;
-+	if(!penv) return env;
-+	a=g_strv_length(penv);
-+	if(a==0)
-+	{
-+		free(penv);
-+		return env;
-+	}
-+	env=g_renew(char *,env,g_strv_length(env)+1+a+10);
- 	for(i=0;penv[i]!=NULL;i++)
- 	{
--		//printf("PAM %s\n",penv[i]);
-+		fprintf(stderr,"PAM %s\n",penv[i]);
- 		n=strcspn(penv[i],"=")+1;
- 		for(j=0;env[j]!=NULL;j++)
- 		{
-@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env)
- 		free(penv[i]);
- 	}
- 	free(penv);
-+	return env;
- }
- 
- #endif
-@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
- 	if(s->child==0)
- 	{
- #if HAVE_LIBPAM
--		append_pam_environ(s->pamh,env);
-+		env=append_pam_environ(s->pamh,env);
- 		pam_end(s->pamh,0);
- #endif
- 		switch_user(pw, session_exec, env);
diff --git a/community-staging/lxdm/rc.d b/community-staging/lxdm/rc.d
deleted file mode 100644
index 68eb6225d..000000000
--- a/community-staging/lxdm/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID `which lxdm-binary`)
-case "$1" in
-  start)
-    stat_busy "Starting LXDM Display Manager"
-    [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lxdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LXDM Display Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lxdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/lxdm/service b/community-staging/lxdm/service
deleted file mode 100644
index e1840476c..000000000
--- a/community-staging/lxdm/service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=LXDE Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/sbin/lxdm
-
-[Install]
-Alias=display-manager.service
diff --git a/community-staging/mapnik/PKGBUILD b/community-staging/mapnik/PKGBUILD
deleted file mode 100644
index c7af04e67..000000000
--- a/community-staging/mapnik/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 73589 2012-07-10 21:24:11Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: David Dent <thewinch@gmail.com>
-# Contributor: orbisvicis <orbisvicis@gmail.com>
-
-pkgname=mapnik
-pkgver=2.0.1
-pkgrel=1
-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' 'libltdl')
-optdepends=('libxslt:         Web Map Service'
-            'python2-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')
-install="mapnik.install"
-source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2")
-md5sums=('e3dd09991340e2568b99f46bac34b0a8')
-
-build() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  sed -i 's|lib64|lib|g' SConstruct
-  scons configure \
-    PREFIX="/usr" \
-    INPUT_PLUGINS=all \
-    DESTDIR="$pkgdir"
-  scons
-}
-
-package(){
-  cd "$srcdir/$pkgname-v$pkgver"
-  scons install
-}
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 4c51617d4..000000000
--- a/community-staging/megaglest/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 78704 2012-10-22 23:38:03Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=megaglest
-pkgver=3.6.0.3
-pkgrel=5
-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' 'glu')
-makedepends=('ftjam' 'cmake' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz"
-        lol.patch)
-md5sums=('5a4a2429435031d9f9cc5d9535a9de9d'
-         '68fd326b73ed1c75981004fbdef6b73a')
-
-build() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
-  patch -Np1 < "$srcdir/lol.patch"
-
-  [[ -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/lol.patch b/community-staging/megaglest/lol.patch
deleted file mode 100644
index 56f94c852..000000000
--- a/community-staging/megaglest/lol.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h
-index 8fcfb27..3cb7a41 100644
---- a/source/shared_lib/include/graphics/math_util.h
-+++ b/source/shared_lib/include/graphics/math_util.h
-@@ -184,10 +184,10 @@ public:
- 
- 	Rect2<T> computeBoundingRect() const{
- 		return Rect2i(
--			min(p[0].x, p[1].x), 
--			min(p[0].y, p[2].y), 
--			max(p[2].x, p[3].x), 
--			max(p[1].y, p[3].y));
-+			std::min(p[0].x, p[1].x),
-+			std::min(p[0].y, p[2].y),
-+			std::max(p[2].x, p[3].x),
-+			std::max(p[1].y, p[3].y));
- 	}
- 
- 	bool isInside(const Vec2<T> &pt) const{
-diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
-index b09c972..ddebd03 100644
---- a/source/shared_lib/sources/platform/posix/ircclient.cpp
-+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
-@@ -13,6 +13,7 @@
- #include "ircclient.h"
- #include "util.h"
- #include "platform_common.h"
-+#include "libirc_rfcnumeric.h"
- #include "libircclient.h"
- 
- #include <stdio.h>
-diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
-index 05478fc..c27aa62 100644
---- a/source/shared_lib/sources/util/util.cpp
-+++ b/source/shared_lib/sources/util/util.cpp
-@@ -19,6 +19,7 @@
- #include <stdarg.h>
- #include <time.h>
- #include <fcntl.h> // for open()
-+#include <unistd.h>
- 
- #ifdef WIN32
-   #include <io.h> // for open()
diff --git a/community-staging/mezogis/ChangeLog b/community-staging/mezogis/ChangeLog
deleted file mode 100644
index dba4cf7ec..000000000
--- a/community-staging/mezogis/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community-staging/mezogis/PKGBUILD b/community-staging/mezogis/PKGBUILD
deleted file mode 100644
index be14bb8c1..000000000
--- a/community-staging/mezogis/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 78010 2012-10-16 03:23:52Z allan $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=mezogis
-pkgver=0.1.5
-pkgrel=6
-pkgdesc="A GIS application to query and analyse spatial data"
-arch=('i686' 'x86_64')
-url="http://www.mezogis.org"
-license=('GPL')
-depends=('pygtk' 'python2-geotypes' 'postgis')
-source=("http://www.mezogis.org/files/mezogis-$pkgver.tar.gz")
-md5sums=('1f886b849109a1a1bd3e165353b82368')
-
-package() {
-  cd $srcdir/mezogis-$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
-
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community-staging/mingw32-gcc/PKGBUILD b/community-staging/mingw32-gcc/PKGBUILD
deleted file mode 100644
index 1c71d9cc6..000000000
--- a/community-staging/mingw32-gcc/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 75073 2012-08-13 13:31:36Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Ondrej Jirman <megous@megous.com>
-
-pkgname=mingw32-gcc
-pkgver=4.7.0
-pkgrel=2
-_uprel=1
-arch=(i686 x86_64)
-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')
-replaces=('mingw32-gcc-base')
-provides=('mingw32-gcc-base')
-options=(!strip)
-url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/"
-license=(GPL LGPL)
-source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma
-        gcc-1-mingw-float.patch)
-md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d'
-         '2407123c35c0aa92ee5ffc27decca9a7')
-
-build()
-{
-  [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2
-
-  patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch
-
-  mkdir -p $srcdir/build
-  cd $srcdir/build
-
-  unset CFLAGS CXXFLAGS
-
-  chmod ugo+x $srcdir/gcc-$pkgver/configure
-  chmod ugo+x $srcdir/gcc-$pkgver/move-if-change
-
-  msg "gcc"
-  [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \
-     --target=i486-mingw32 \
-     --host=$CHOST \
-     --build=$CHOST \
-     --prefix=/usr \
-     --libexecdir=/usr/lib \
-     --with-bugurl=https://bugs.archlinux.org/ \
-     --enable-languages=c,c++ \
-     --enable-shared \
-     --enable-sjlj-exceptions \
-     --enable-hash-synchronization \
-     --disable-nls \
-     --disable-libssp \
-     --enable-libgomp
-
-  make
-  make install DESTDIR=$pkgdir
-
-  msg "libgcc"
-  make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install
-
-  msg "libstdc++"
-  make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install
-
-  msg "fixes"
-  cd $pkgdir/usr/i486-mingw32/lib
-  mkdir -p $pkgdir/usr/i486-mingw32/bin/
-  for i in `ls -1 *.dll`; do
-    ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i
-  done
-
-  cd $pkgdir
-  rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \
-    usr/{include,lib/libiberty.a} \
-    usr/share/{info,man} \
-    usr/share/gcc-$pkgver/python
-
-  strip usr/bin/*
-  strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2}
-  i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a
-}
diff --git a/community-staging/mingw32-gcc/gcc-1-mingw-float.patch b/community-staging/mingw32-gcc/gcc-1-mingw-float.patch
deleted file mode 100644
index 365949ad7..000000000
--- a/community-staging/mingw32-gcc/gcc-1-mingw-float.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
-http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435
-
-diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h
---- a/gcc/ginclude/float.h      2009-04-09 17:00:19.000000000 +0200
-+++ b/gcc/ginclude/float.h      2010-06-05 12:03:41.887724045 +0200
-@@ -275,3 +275,7 @@
- #endif /* __STDC_WANT_DEC_FP__ */
-
- #endif /* _FLOAT_H___ */
-+
-+#ifdef __MINGW32__
-+#include_next<float.h>
-+#endif
diff --git a/community-staging/miredo/PKGBUILD b/community-staging/miredo/PKGBUILD
deleted file mode 100644
index 9ae82e37d..000000000
--- a/community-staging/miredo/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 72176 2012-06-09 17:04:19Z dreisner $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=miredo
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="Teredo client and server."
-arch=('i686' 'x86_64')
-url="http://www.remlab.net/miredo/"
-license=('GPL')
-depends=('judy' 'iproute2' 'libcap')
-backup=('etc/miredo/miredo.conf'
-        'etc/miredo/client-hook')
-options=('!libtool')
-source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	isatapd.rc.d
-	miredo.install
-	miredo.rc.d
-	miredo-server.rc.d
-	miredo.service)
-md5sums=('5114debbf9fcab5d292176e4548f8cd1'
-         '51ab6d091192605ee9206944869cb2ab'
-         'd1b655d7a851cdb46c91c3418ed1962f'
-         'c5a9be5c3175fecec387f1710bfd2788'
-         '319aba1ae06349b76cb25fda0dba60a9'
-         '3216d47d5aa979706b17b72d8b6e19b0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--libexecdir=/usr/lib \
-	--with-Judy
-  make
-  make DESTDIR="$pkgdir" install
-
-  install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo
-  install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server
-  install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd
-  sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook
-
-  # avoid conflict with filesystem>=2012.06
-  rmdir "$pkgdir/var/run" "$pkgdir/var"
-
-  install -Dm644 "$srcdir/miredo.service" "$pkgdir/usr/lib/systemd/system/miredo.service"
-}
diff --git a/community-staging/miredo/isatapd.rc.d b/community-staging/miredo/isatapd.rc.d
deleted file mode 100644
index fa7bbd708..000000000
--- a/community-staging/miredo/isatapd.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/isatapd`
-case "$1" in
-  start)
-    stat_busy "Starting userspace ISATAP client"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/isatapd
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon isatapd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping userspace ISATAP client"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon isatapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community-staging/miredo/miredo-server.rc.d b/community-staging/miredo/miredo-server.rc.d
deleted file mode 100644
index d05513b23..000000000
--- a/community-staging/miredo/miredo-server.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/miredo-server`
-case "$1" in
-  start)
-    stat_busy "Starting teredo protocol server"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/miredo-server
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon miredo-server
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping teredo protocol server"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon miredo-server
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community-staging/miredo/miredo.install b/community-staging/miredo/miredo.install
deleted file mode 100644
index 338459fb3..000000000
--- a/community-staging/miredo/miredo.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_remove() {
-
-  # clean up just in case
-  rm -f /var/run/miredo.pid
-  rm -f /var/run/miredo-server.pid
-  rm -f /var/run/isatapd.pid
-}
-
diff --git a/community-staging/miredo/miredo.rc.d b/community-staging/miredo/miredo.rc.d
deleted file mode 100644
index 500374b12..000000000
--- a/community-staging/miredo/miredo.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/miredo`
-case "$1" in
-  start)
-    stat_busy "Starting teredo protocol client"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/miredo
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon miredo
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping teredo protocol client"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon miredo
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community-staging/miredo/miredo.service b/community-staging/miredo/miredo.service
deleted file mode 100644
index 299a887de..000000000
--- a/community-staging/miredo/miredo.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Teredo IPv6 Tunneling Daemon
-After=network.target
-
-[Service]
-ExecStartPre=/usr/sbin/miredo-checkconf /etc/miredo/miredo.conf
-ExecStart=/usr/sbin/miredo -f
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/community-staging/mlt/PKGBUILD b/community-staging/mlt/PKGBUILD
deleted file mode 100644
index eaa90cd62..000000000
--- a/community-staging/mlt/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 72363 2012-06-13 07:10:10Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
-# Contributor: funkyou <spamopfer@nickname.berlin.de>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgbase=mlt
-pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="An open source multimedia framework"
-arch=('i686' 'x86_64')
-url="http://www.mltframework.org"
-license=('GPL')
-makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
-	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d56e0cdfba9c5b5608bf84493322615f')
-
-build() {
-  # mlt
-  cd "$srcdir/mlt-$pkgver"
-
-#  [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
-  SSE2=--disable-sse2
-
-  msg "SSE2=$SSE2"
-  ./configure --prefix=/usr --enable-gpl \
-	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \
-	--avformat-vdpau \
-	--avformat-swscale $SSE2
-  make
-
-  # mlt python bindings
-  cd "$srcdir/mlt-$pkgver/src/swig/python"
-  sed -i 's_path=`which python_path=`which python2_' build
-  sed -i 's_`python -c_`python2 -c_' build
-  sed -i 's#python-config#python2-config#' build
-  ./build
-}
-
-package_mlt() {
-  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
-  optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa")
-  conflicts=('mlt++<=0.3.8')
-
-  cd "$srcdir/mlt-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-package_mlt-python-bindings() {
-  depends=('python2' 'mlt')
-
-  cd "$srcdir/mlt-$pkgver/src/swig/python"
-  mkdir -p "$pkgdir/usr/lib/python2.7/"
-  install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
-  install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
-  install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
-}
diff --git a/community-staging/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community-staging/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
deleted file mode 100644
index 40dd48b42..000000000
--- a/community-staging/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3f6b2390102ea9d808c7075b5aaeec743b7d104e Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 10 Apr 2012 19:30:35 -0500
-Subject: [PATCH 1/2] Backport for mongodb 2.0.4 "Ignore --fork and --logpath
- when using --shutdown SERVER-5186 SERVER-5187"
-
-https://github.com/mongodb/mongo/commit/fa2e2ef95c5c934eef63fff4b98d5eb060c5653923
-
-Backported in preparation for backporting the fix for https://jira.mongodb.org/browse/SERVER-5358
----
- db/cmdline.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/db/cmdline.cpp b/db/cmdline.cpp
-index fd759a7..346a9ae 100644
---- a/db/cmdline.cpp
-+++ b/db/cmdline.cpp
-@@ -239,7 +239,7 @@ namespace mongo {
-             cmdLine.noUnixSocket = true;
-         }
- 
--        if (params.count("fork")) {
-+        if (params.count("fork") && !params.count("shutdown")) {
-             if ( ! params.count( "logpath" ) ) {
-                 cout << "--fork has to be used with --logpath" << endl;
-                 ::exit(-1);
-@@ -304,7 +304,7 @@ namespace mongo {
-         }
- 
- #endif
--        if (params.count("logpath")) {
-+        if (params.count("logpath") && !params.count("shutdown")) {
-             if ( logpath.size() == 0 )
-                 logpath = params["logpath"].as<string>();
-             uassert( 10033 ,  "logpath has to be non-zero" , logpath.size() );
--- 
-1.7.10
-
diff --git a/community-staging/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community-staging/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
deleted file mode 100644
index aff066450..000000000
--- a/community-staging/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 77f78f64c192572e6eb956b0fe28ecd975ff6461 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 10 Apr 2012 19:38:58 -0500
-Subject: [PATCH 2/2] Backport for mongodb 2.0.4 "Don't check /proc/pid/exe in
- --shutdown SERVER-5358"
-
-Backported to fix https://jira.mongodb.org/browse/SERVER-5358
-
-https://github.com/mongodb/mongo/commit/c28d97d1a14a36ffc056bfd9ba7262b0a1509b5b
----
- db/db.cpp |   16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/db/db.cpp b/db/db.cpp
-index b1d1db8..0a21f4d 100644
---- a/db/db.cpp
-+++ b/db/db.cpp
-@@ -989,22 +989,6 @@ int main(int argc, char* argv[]) {
-                     procPath = (str::stream() << "/proc/" << pid);
-                     if (!boost::filesystem::exists(procPath))
-                         failed = true;
--
--                    string exePath = procPath + "/exe";
--                    if (boost::filesystem::exists(exePath)){
--                        char buf[256];
--                        int ret = readlink(exePath.c_str(), buf, sizeof(buf)-1);
--                        buf[ret] = '\0'; // readlink doesn't terminate string
--                        if (ret == -1) {
--                            int e = errno;
--                            cerr << "Error resolving " << exePath << ": " << errnoWithDescription(e);
--                            failed = true;
--                        }
--                        else if (!endsWith(buf, "mongod")){
--                            cerr << "Process " << pid << " is running " << buf << " not mongod" << endl;
--                            ::exit(-1);
--                        }
--                    }
-                 }
-                 catch (const std::exception& e){
-                     cerr << "Error reading pid from lock file [" << name << "]: " << e.what() << endl;
--- 
-1.7.10
-
diff --git a/community-staging/mongodb/PKGBUILD b/community-staging/mongodb/PKGBUILD
deleted file mode 100644
index 455b73938..000000000
--- a/community-staging/mongodb/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 73593 2012-07-11 01:17:31Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Mathias Stearn <mathias@10gen.com>
-# Contributor: Alec Thomas
-
-pkgname=mongodb
-pkgver=2.0.6
-pkgrel=2
-pkgdesc='A high-performance, open source, schema-free document-oriented database'
-arch=('i686' 'x86_64')
-url='http://www.mongodb.org'
-license=('AGPL3')
-depends=('boost-libs')
-makedepends=('scons' 'boost')
-#checkdepends=('python2-pymongo')
-optdepends=('libpcap: needed for mongosniff')
-backup=('etc/mongodb.conf')
-install="mongodb.install"
-source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
-        'mongodb.rc'
-        'mongodb.conf'
-        'boost-1.50.patch')
-md5sums=('b3b32fecdcbe8e8068ec2989be9d2da4'
-         '9c67e00f4626ad761a8f7d4e037a54d7'
-         '4839fe1d638187ca3226e8267b947318'
-         '5d22fd2c0ae869218488cd7c0dbc3903')
-
-build() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  patch -Np1 -i ${srcdir}/boost-1.50.patch
-
-  scons \
-    all \
-    --full
-}
-
-<<COMMENT
-check() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  scons \
-    smokeAll \
-    --smokedbprefix=${srcdir}
-}
-COMMENT
-
-package() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  scons \
-    install \
-    --full \
-    --prefix=${pkgdir}/usr
-
-  install -D -m755 ${srcdir}/mongodb.rc \
-    ${pkgdir}/etc/rc.d/mongodb
-  install -D -m644 ${srcdir}/mongodb.conf \
-    ${pkgdir}/etc/mongodb.conf
-  install -d -m700 ${pkgdir}/var/lib/mongodb
-  install -d -m755 ${pkgdir}/var/log/mongodb
-
-  if [ -d ${pkgdir}/usr/lib64 ]; then
-    mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
-  fi
-}
diff --git a/community-staging/mongodb/boost-1.50.patch b/community-staging/mongodb/boost-1.50.patch
deleted file mode 100644
index 4ccb898ec..000000000
--- a/community-staging/mongodb/boost-1.50.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp
---- mongodb-src-r2.0.6/db/db.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/db.cpp	2012-07-10 22:27:16.496886220 +0200
-@@ -326,7 +326,7 @@
-         boost::filesystem::path path( dbpath );
-         for ( boost::filesystem::directory_iterator i( path );
-                 i != boost::filesystem::directory_iterator(); ++i ) {
--            string fileName = boost::filesystem::path(*i).leaf();
-+            string fileName = boost::filesystem::path(*i).leaf().string();
-             if ( boost::filesystem::is_directory( *i ) &&
-                     fileName.length() && fileName[ 0 ] == '$' )
-                 boost::filesystem::remove_all( *i );
-@@ -655,11 +655,6 @@
-     dbExecCommand = argv[0];
- 
-     srand(curTimeMicros());
--#if( BOOST_VERSION >= 104500 )
--    boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
--#else
--    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
--#endif
- 
-     {
-         unsigned x = 0x12345678;
-@@ -976,7 +971,7 @@
-         if (params.count("shutdown")){
-             bool failed = false;
- 
--            string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-+            string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
-             if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 )
-                 failed = true;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp
---- mongodb-src-r2.0.6/db/dur.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur.cpp	2012-07-10 21:56:28.866778732 +0200
-@@ -692,7 +692,7 @@
- 
-             bool samePartition = true;
-             try {
--                const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string();
-+                const string dbpathDir = boost::filesystem::path(dbpath).string();
-                 samePartition = onSamePartition(getJournalDir().string(), dbpathDir);
-             }
-             catch(...) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp
---- mongodb-src-r2.0.6/db/dur_journal.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp	2012-07-10 22:04:18.583472723 +0200
-@@ -169,7 +169,7 @@
-                 for ( boost::filesystem::directory_iterator i( getJournalDir() );
-                         i != boost::filesystem::directory_iterator();
-                         ++i ) {
--                    string fileName = boost::filesystem::path(*i).leaf();
-+                    string fileName = boost::filesystem::path(*i).leaf().string();
-                     if( str::startsWith(fileName, "j._") )
-                         return true;
-                 }
-@@ -185,7 +185,7 @@
-                 for ( boost::filesystem::directory_iterator i( getJournalDir() );
-                         i != boost::filesystem::directory_iterator();
-                         ++i ) {
--                    string fileName = boost::filesystem::path(*i).leaf();
-+                    string fileName = boost::filesystem::path(*i).leaf().string();
-                     if( str::startsWith(fileName, "j._") ) {
-                         try {
-                             removeOldJournalFile(*i);
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp
---- mongodb-src-r2.0.6/db/dur_recover.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp	2012-07-10 22:02:18.226799055 +0200
-@@ -71,7 +71,7 @@
-                     i != filesystem::directory_iterator();
-                     ++i ) {
-                 filesystem::path filepath = *i;
--                string fileName = filesystem::path(*i).leaf();
-+                string fileName = filesystem::path(*i).leaf().string();
-                 if( str::startsWith(fileName, "j._") ) {
-                     unsigned u = str::toUnsigned( str::after(fileName, '_') );
-                     if( m.count(u) ) {
-@@ -84,7 +84,7 @@
-                 if( i != m.begin() && m.count(i->first - 1) == 0 ) {
-                     uasserted(13532,
-                     str::stream() << "unexpected file in journal directory " << dir.string()
--                      << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file");
-+                      << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file");
-                 }
-                 files.push_back(i->second);
-             }
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp
---- mongodb-src-r2.0.6/db/instance.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/instance.cpp	2012-07-10 22:08:55.213488817 +0200
-@@ -645,13 +645,13 @@
-                 i != boost::filesystem::directory_iterator(); ++i ) {
-             if ( directoryperdb ) {
-                 boost::filesystem::path p = *i;
--                string dbName = p.leaf();
-+                string dbName = p.leaf().string();
-                 p /= ( dbName + ".ns" );
-                 if ( MMF::exists( p ) )
-                     names.push_back( dbName );
-             }
-             else {
--                string fileName = boost::filesystem::path(*i).leaf();
-+                string fileName = boost::filesystem::path(*i).leaf().string();
-                 if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" )
-                     names.push_back( fileName.substr( 0, fileName.length() - 3 ) );
-             }
-@@ -893,7 +893,7 @@
-     }
- 
-     void acquirePathLock(bool doingRepair) {
--        string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-+        string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
- 
-         bool oldFile = false;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp
---- mongodb-src-r2.0.6/db/pdfile.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp	2012-07-10 22:11:44.103498643 +0200
-@@ -1987,7 +1987,7 @@
-             virtual bool apply( const Path &p ) {
-                 if ( !boost::filesystem::exists( p ) )
-                     return false;
--                boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) );
-+                boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) );
-                 return true;
-             }
-             virtual const char * op() const {
-@@ -2093,7 +2093,7 @@
-             uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
-                                 "backup" : "$tmp" );
-         BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
--        string reservedPathString = reservedPath.native_directory_string();
-+        string reservedPathString = reservedPath.string();
- 
-         bool res;
-         {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp
---- mongodb-src-r2.0.6/dbtests/framework.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp	2012-07-10 22:29:20.610226773 +0200
-@@ -281,7 +281,7 @@
-                 boost::filesystem::create_directory(p);
-             }
- 
--            string dbpathString = p.native_directory_string();
-+            string dbpathString = p.string();
-             dbpath = dbpathString.c_str();
- 
-             cmdLine.prealloc = false;
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h
---- mongodb-src-r2.0.6/pch.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/pch.h	2012-07-10 21:35:57.133373738 +0200
-@@ -79,7 +79,7 @@
- //#include <boost/any.hpp>
- #include "boost/thread/once.hpp"
- //#include <boost/archive/iterators/transform_width.hpp>
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem/convenience.hpp>
- #include <boost/filesystem/exception.hpp>
- #include <boost/filesystem/operations.hpp>
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp
---- mongodb-src-r2.0.6/shell/shell_utils.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp	2012-07-10 22:38:58.443593723 +0200
-@@ -388,7 +388,7 @@
- #endif
-                 }
- 
--                argv_.push_back( programPath.native_file_string() );
-+                argv_.push_back( programPath.string() );
- 
-                 port_ = -1;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp
---- mongodb-src-r2.0.6/tools/restore.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/tools/restore.cpp	2012-07-10 22:45:00.046948094 +0200
-@@ -131,7 +131,7 @@
-         log(2) << "drillDown: " << root.string() << endl;
- 
-         // skip hidden files and directories
--        if (root.leaf()[0] == '.' && root.leaf() != ".")
-+        if (root.leaf().string()[0] == '.' && root.leaf().string() != ".")
-             return;
- 
-         if ( is_directory( root ) ) {
-@@ -210,7 +210,7 @@
-             ns += "." + _coll;
-         }
-         else {
--            string l = root.leaf();
-+            string l = root.leaf().string();
-             l = l.substr( 0 , l.find_last_of( "." ) );
-             ns += "." + l;
-         }
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp
---- mongodb-src-r2.0.6/tools/tool.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/tools/tool.cpp	2012-07-10 22:23:53.356874403 +0200
-@@ -113,12 +113,6 @@
-         // we want durability to be disabled.
-         cmdLine.dur = false;
- 
--#if( BOOST_VERSION >= 104500 )
--    boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
--#else
--    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
--#endif
--
-         _name = argv[0];
- 
-         /* using the same style as db.cpp */
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp
---- mongodb-src-r2.0.6/util/background.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/background.cpp	2012-07-10 21:47:40.420081320 +0200
-@@ -89,7 +89,7 @@
-             if ( msTimeOut ) {
-                 // add msTimeOut millisecond to current time
-                 boost::xtime xt;
--                boost::xtime_get( &xt, boost::TIME_UTC );
-+                boost::xtime_get( &xt, boost::TIME_UTC_ );
- 
-                 unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano
-                 if ( xt.nsec + ns < 1000000000 ) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h
---- mongodb-src-r2.0.6/util/concurrency/mutex.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h	2012-07-10 21:45:51.333408307 +0200
-@@ -29,7 +29,7 @@
- 
-     inline boost::xtime incxtimemillis( long long s ) {
-         boost::xtime xt;
--        boost::xtime_get(&xt, boost::TIME_UTC);
-+        boost::xtime_get(&xt, boost::TIME_UTC_);
-         xt.sec += (int)( s / 1000 );
-         xt.nsec += (int)(( s % 1000 ) * 1000000);
-         if ( xt.nsec >= 1000000000 ) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h
---- mongodb-src-r2.0.6/util/queue.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/queue.h	2012-07-10 22:14:00.243506560 +0200
-@@ -82,7 +82,7 @@
-             Timer timer;
- 
-             boost::xtime xt;
--            boost::xtime_get(&xt, boost::TIME_UTC);
-+            boost::xtime_get(&xt, boost::TIME_UTC_);
-             xt.sec += maxSecondsToWait;
- 
-             scoped_lock l( _lock );
diff --git a/community-staging/mongodb/mongodb.conf b/community-staging/mongodb/mongodb.conf
deleted file mode 100644
index c5272b7f2..000000000
--- a/community-staging/mongodb/mongodb.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
-# Run mongod --help to see a list of options
-
-bind_ip = 127.0.0.1
-quiet = true
-dbpath = /var/lib/mongodb
-logpath = /var/log/mongodb/mongod.log
-logappend = true
diff --git a/community-staging/mongodb/mongodb.install b/community-staging/mongodb/mongodb.install
deleted file mode 100644
index 2ea94553c..000000000
--- a/community-staging/mongodb/mongodb.install
+++ /dev/null
@@ -1,32 +0,0 @@
-# vim: syntax=sh
-
-post_install() {
-  useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb
-  chown -R mongodb:daemon /var/lib/mongodb
-  chown -R mongodb:daemon /var/log/mongodb
-
-  if [ "$(uname -m)" != "x86_64" ]
-  then
-    echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.'
-    echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations'
-  fi
-}
-
-post_upgrade() {
-  chown -R mongodb:daemon /var/lib/mongodb
-  chown -R mongodb:daemon /var/log/mongodb
-
-  if [ "$(vercmp $2 1.8.2-3)" -lt 0 ]
-  then
-    # have to fix my fudge up in 1.8.2-2 and 1.8.2-3
-    # added july 5th, 2011
-    usermod -s /bin/bash mongodb >& /dev/null
-    echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb'
-    echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb'
-    echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log'
-  fi
-}
-
-pre_remove() {
-  userdel mongodb
-}
diff --git a/community-staging/mongodb/mongodb.rc b/community-staging/mongodb/mongodb.rc
deleted file mode 100644
index 30f2bbf79..000000000
--- a/community-staging/mongodb/mongodb.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: syntax=sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof /usr/bin/mongod)
-case "$1" in
-  start)
-    stat_busy "Starting mongodb"
-    [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mongodb
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mongodb"
-    [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mongodb
-      while [ ! -z "$(pidof /usr/bin/mongod)" ]; do
-        sleep 1;
-      done
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/motion/PKGBUILD b/community-staging/motion/PKGBUILD
deleted file mode 100644
index 00edf7064..000000000
--- a/community-staging/motion/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 72698 2012-06-20 10:30:24Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=motion
-pkgver=3.2.12
-pkgrel=6
-pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
-backup=('etc/motion/motion.conf')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	rc.motion
-	ffmpeg-0.8.patch
-	linux-headers.patch
-	ffmpeg-compat.patch)
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '2e8c53c4980edddd420f08fdd572c9be'
-         'd36687710837d69fbce4608b1345fa34'
-         'd8c3c4fdded5cfbd729710475559a21d'
-         'e85c596292aceb425fcf17e5072e2fff')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-  patch -Np1 -i $srcdir/linux-headers.patch
-  patch -Np1 -i $srcdir/ffmpeg-compat.patch
-  autoreconf
-  ./configure --prefix=/usr \
-    --without-pgsql \
-    --without-mysql \
-    --sysconfdir=/etc/motion \
-    --with-ffmpeg
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf"
-  install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
-}
diff --git a/community-staging/motion/ffmpeg-0.8.patch b/community-staging/motion/ffmpeg-0.8.patch
deleted file mode 100644
index 5dcc6e686..000000000
--- a/community-staging/motion/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c
---- motion-3.2.12/ffmpeg.c	2010-06-01 08:48:23.000000000 +0200
-+++ motion-3.2.12.new/ffmpeg.c	2011-10-31 17:25:03.000000000 +0100
-@@ -14,7 +14,7 @@
- 
- #include "ffmpeg.h"
- #include "motion.h"
--
-+#include <libavformat/avformat.h>
- #if LIBAVCODEC_BUILD > 4680
- /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with 
-  * non-standard framerates. Previous builds contained a broken hack 
-@@ -228,10 +228,12 @@
-     mpeg1_file_protocol.url_close = file_protocol.url_close;
- 
-     /* Register the append file protocol. */
--#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8)
--    av_register_protocol(&mpeg1_file_protocol);
-+#ifdef have_av_register_protocol2
-+        av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol));
-+#elif defined have_av_register_protocol        
-+	    av_register_protocol(&mpeg1_file_protocol);
- #else
--    register_protocol(&mpeg1_file_protocol);
-+#   warning av_register_protocolXXX missing
- #endif
- }
- 
-@@ -244,7 +246,7 @@
-     const char *ext;
-     AVOutputFormat *of = NULL;
- 
--    /* Here, we use guess_format to automatically setup the codec information.
-+    /* Here, we use av_guess_format to automatically setup the codec information.
-      * If we are using msmpeg4, manually set that codec here.
-      * We also dynamically add the file extension to the filename here. This was
-      * done to support both mpeg1 and mpeg4 codecs since they have different extensions.
-@@ -258,7 +260,7 @@
-         /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would
-          * result in a muxed output file, which isn't appropriate here.
-          */
--        of = guess_format("mpeg1video", NULL, NULL);
-+        of = av_guess_format("mpeg1video", NULL, NULL);
-         if (of) {
-             /* But we want the trailer to be correctly written. */
-             of->write_trailer = mpeg1_write_trailer;
-@@ -270,24 +272,24 @@
- #endif
-     } else if (strcmp(codec, "mpeg4") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-     } else if (strcmp(codec, "msmpeg4") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-         if (of) {
-             /* Manually override the codec id. */
-             of->video_codec = CODEC_ID_MSMPEG4V2;
-         }
-     } else if (strcmp(codec, "swf") == 0) {
-         ext = ".swf";
--        of = guess_format("swf", NULL, NULL);
-+        of = av_guess_format("swf", NULL, NULL);
-     } else if (strcmp(codec, "flv") == 0) {
-         ext = ".flv";
--        of = guess_format("flv", NULL, NULL);
-+        of = av_guess_format("flv", NULL, NULL);
-         of->video_codec = CODEC_ID_FLV1;
-     } else if (strcmp(codec, "ffv1") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-         if (of) {
-             /* Use the FFMPEG Lossless Video codec (experimental!).
-                Requires strict_std_compliance to be <= -2 */
-@@ -295,7 +297,7 @@
-         }
-     } else if (strcmp(codec, "mov") == 0) {
-         ext = ".mov";
--        of = guess_format("mov", NULL, NULL);        
-+        of = av_guess_format("mov", NULL, NULL);        
-     } else {
-         motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec);
-         return NULL;
-@@ -377,7 +379,7 @@
- 
-     ffmpeg->c     = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st);
-     c->codec_id   = ffmpeg->oc->oformat->video_codec;
--    c->codec_type = CODEC_TYPE_VIDEO;
-+    c->codec_type = AVMEDIA_TYPE_VIDEO;
-     is_mpeg1      = c->codec_id == CODEC_ID_MPEG1VIDEO;
- 
-     if (strcmp(ffmpeg_video_codec, "ffv1") == 0)
-@@ -646,7 +648,7 @@
-     if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) {
-         /* raw video case. The API will change slightly in the near future for that */
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
--        pkt.flags |= PKT_FLAG_KEY;
-+        pkt.flags |= AV_PKT_FLAG_KEY;
-         pkt.data = (uint8_t *)pic;
-         pkt.size = sizeof(AVPicture);
-         ret = av_write_frame(ffmpeg->oc, &pkt);
-@@ -667,7 +669,7 @@
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
-             pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts;
-             if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) {
--                pkt.flags |= PKT_FLAG_KEY;
-+                pkt.flags |= AV_PKT_FLAG_KEY;
-             }
-             pkt.data = ffmpeg->video_outbuf;
-             pkt.size = out_size;
diff --git a/community-staging/motion/ffmpeg-compat.patch b/community-staging/motion/ffmpeg-compat.patch
deleted file mode 100644
index 278166e18..000000000
--- a/community-staging/motion/ffmpeg-compat.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -wbBur motion-3.2.12/configure.in motion-3.2.12.q/configure.in
---- motion-3.2.12/configure.in	2010-06-01 10:48:23.000000000 +0400
-+++ motion-3.2.12.q/configure.in	2012-06-20 13:51:42.000000000 +0400
-@@ -290,163 +290,11 @@
- fi
- 
- 
--#
--# Check for libavcodec and libavformat from ffmpeg
--#
--FFMPEG_DIR="yes"
--FFMPEG_OK="no_found"
--FFMPEG_OBJ=""
--AC_ARG_WITH(ffmpeg,
--[  --with-ffmpeg[=DIR]       Specify the prefix for the install path for
--                          libavcodec/libavformat (part of ffmpeg) be able to 
--                          encode mpeg movies realtime.
--                          If this is not specified motion will try to find
--                          the libraries in /usr and /usr/local.
--                          ],
--FFMPEG_DIR="$withval"
--)
--#
--# --without-ffmpeg or with-ffmpeg=no
--#
--if test "${FFMPEG_DIR}" = "no"; then
--	AC_MSG_CHECKING(for ffmpeg)
--	AC_MSG_RESULT(skipping)
--#
--# with-ffmpeg=<dir> or nothing
--#
--else if test "${FFMPEG_DIR}" = "yes"; then
--	# AUTODETECT STATIC/SHARED LIB 
--	AC_MSG_CHECKING(for ffmpeg autodetecting)
--
--	if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
--		AC_MSG_RESULT(found in /usr/lib64)
--		FFMPEG_OK="found"
--		FFMPEG_LIB="/usr/lib64"
--		FFMPEG_DIR="/usr"
--	elif test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then
--		AC_MSG_RESULT(found in /usr/lib)
--		FFMPEG_OK="found"
--		FFMPEG_LIB="/usr/lib"
--		FFMPEG_DIR="/usr"
--	elif test -f /usr/local/lib/libavcodec.a -o -f /usr/local/lib/libavcodec.so && test -f /usr/local/lib/libavformat.a -o -f /usr/local/lib/libavformat.so ; then
--		AC_MSG_RESULT(found in /usr/local/lib)
--		FFMPEG_OK="found"
--		FFMPEG_LIB="/usr/local/lib"
--		FFMPEG_DIR="/usr/local"
--	else
--		AC_MSG_RESULT(not found)
--		echo ""
--		echo "**********************************************"
--		echo "* libavcodec.a or libavcodec.so or           *"
--		echo "* libavformat.a or libavformat.so not found: *"
--		echo "*    ALL FFMPEG FEATURES DISABLED            *"
--		echo "*                                            *"
--		echo "* Please read the Motion Guide for help:     *"
--		echo "* http://motion.sourceforge.net              *"
--		echo "**********************************************"
--		echo ""		
--	fi 
--else
--	AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-)
--	if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then
--		AC_MSG_RESULT(found)
--		FFMPEG_OK="found"
--		FFMPEG_LIB="${FFMPEG_DIR}/lib"
--	elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then
--		AC_MSG_RESULT(found)
--		FFMPEG_LIB="${FFMPEG_DIR}"
--		FFMPEG_OK="found"
--	else
--		AC_MSG_RESULT(not found)
--		if test "${FFMPEG_OK}" != "found"; then
--			echo ""
--			echo "**********************************************"
--			echo "* libavcodec.a or libavcodec.so or           *"
--			echo "* libavformat.a or libavformat.so not found: *"
--			echo "*    ALL FFMPEG FEATURES DISABLED            *"
--			echo "*                                            *"
--			echo "* Please read the Motion Guide for help:     *"
--			echo "* http://motion.sourceforge.net              *"
--			echo "**********************************************"
--			echo ""
--		fi
--	fi
--fi
--
--#
--# Now check for ffmpeg headers ( avformat.h ) if ffmpeg libs were found
--#
--
--if test "${FFMPEG_OK}" = "found"; then
--	AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR})
--	
--	if test -f ${FFMPEG_DIR}/include/avformat.h; then
--		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h)
--		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
--	elif test -f ${FFMPEG_DIR}/avformat.h; then
--		AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h)
--		FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
--	elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
--		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h)
--		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
--	elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
--		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
--		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
--    elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
--        AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
--        FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" 
--	else
--		AC_MSG_RESULT(not found)
--		FFMPEG_OK="no_found"
--		echo "**********************************************"
--		echo "*       avformat.h not found:                *"
--		echo "*    ALL FFMPEG FEATURES DISABLED            *"
--		echo "*                                            *"
--		echo "* Please read the Motion Guide for help:     *"
--		echo "* http://motion.sourceforge.net              *"
--		echo "**********************************************"
--		echo ""
--	fi
--
--#
--# If ffmpeg libs and headers have been found 
--#
--
--	if  test "${FFMPEG_OK}" = "found"; then	
--		TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
--		TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
--		TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}"
--
--		FFMPEG_OBJ="ffmpeg.o"
--		AC_SUBST(FFMPEG_OBJ)
--
--		AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?])
--		saved_CFLAGS=$CFLAGS
--		saved_LIBS=$LIBS
--		CFLAGS="${FFMPEG_CFLAGS}"
--		LIBS="$TEMP_LIBS"
--		
--		AC_COMPILE_IFELSE(
--			[
--			#include <avformat.h>
--			URLProtocol test_file_protocol;
--			int main(void){
--				test_file_protocol.url_read  = file_protocol.url_read;
--				return 0;
--			}
--			],
--			[AC_MSG_RESULT(yes)],
--			[
--				AC_MSG_RESULT(no)
--				TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_NEW"
--			]
--		)
--		CFLAGS=$saved_CFLAGS
--		LIBS=$saved_LIBS	
--	fi
--fi	
--fi
--
-+TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW"
-+TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg-compat"
-+FFMPEG_OK=found
-+FFMPEG_OBJ="ffmpeg.o"
-+AC_SUBST(FFMPEG_OBJ)
- 
- #
- # Check Mysql
diff --git a/community-staging/motion/linux-headers.patch b/community-staging/motion/linux-headers.patch
deleted file mode 100644
index 795c8aec5..000000000
--- a/community-staging/motion/linux-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h
---- motion-3.2.12-OLD/motion.h	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/motion.h	2011-08-30 02:11:08.000000000 -0700
-@@ -40,7 +40,7 @@
- 
- #define _LINUX_TIME_H 1
- #if !defined(WITHOUT_V4L) && !defined(BSD)
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #endif
- 
- #include <pthread.h>
-diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c
---- motion-3.2.12-OLD/track.c	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/track.c	2011-08-30 23:05:09.000000000 -0700
-@@ -11,6 +11,7 @@
- #include "motion.h"
- 
- #ifndef WITHOUT_V4L
-+#include <linux/videodev2.h>
- #include "pwc-ioctl.h"
- #endif
- 
-diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h
---- motion-3.2.12-OLD/video.h	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/video.h	2011-08-30 02:11:12.000000000 -0700
-@@ -12,7 +12,7 @@
- 
- #define _LINUX_TIME_H 1
- #ifndef WITHOUT_V4L
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <sys/mman.h>
- #include "pwc-ioctl.h"
- #endif
diff --git a/community-staging/motion/rc.motion b/community-staging/motion/rc.motion
deleted file mode 100644
index 5b4c65500..000000000
--- a/community-staging/motion/rc.motion
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/motion`
-case "$1" in
-  start)
-    stat_busy "Starting Motion"
-    mkdir -p /var/run/motion
-    [ -z "$PID" ] && /usr/bin/motion 1>/dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon motion
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Motion"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon motion
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/mplayer2/PKGBUILD b/community-staging/mplayer2/PKGBUILD
deleted file mode 100644
index 269739c5e..000000000
--- a/community-staging/mplayer2/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 72284 2012-06-11 16:29:28Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Martin Panter <vadmium+aur@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=mplayer2
-pkgver=20120517
-pkgrel=4
-pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.mplayer2.org/"
-install=$pkgname.install
-depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
-         'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss'
-         'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau'
-         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
-makedepends=('mesa' 'unzip' 'yasm')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-provides=('mplayer')
-conflicts=('mplayer')
-options=(!emptydirs)
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('814cc9545937e13796df1d4747c3c5d0')
-
-build() {
-    cd "${srcdir}"/$pkgname-$pkgver
-    
-    sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
-
-    ./configure --prefix=/usr --confdir=/etc/mplayer \
-                --enable-translation --language=all \
-                --enable-runtime-cpudetection \
-                --enable-joystick \
-                --disable-speex \
-                --disable-openal \
-                --disable-libdv \
-                --disable-musepack \
-                --disable-mga
-    make
-}
-
-package() {
-    cd "${srcdir}"/$pkgname-$pkgver
-
-    make DESTDIR="${pkgdir}" install
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/
-    install -dm755 "${pkgdir}"/usr/share/mplayer/
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf
-
-    install -dm755 "${pkgdir}"/usr/share/applications/
-    install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/
-}
diff --git a/community-staging/mplayer2/mplayer2.install b/community-staging/mplayer2/mplayer2.install
deleted file mode 100644
index 660593cf5..000000000
--- a/community-staging/mplayer2/mplayer2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-staging/mtpaint/PKGBUILD b/community-staging/mtpaint/PKGBUILD
deleted file mode 100644
index 1e0ed4c06..000000000
--- a/community-staging/mtpaint/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 73882 2012-07-16 10:28:41Z 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=5
-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 ../libpng15.patch
-	./configure --prefix=/usr --mandir=/usr/share/man 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 ad97d7bab..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/mythtv/PKGBUILD b/community-staging/mythtv/PKGBUILD
deleted file mode 100644
index 8da742616..000000000
--- a/community-staging/mythtv/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 73066 2012-06-30 07:05:55Z jconder $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: <kleptophobiac@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=mythtv
-pkgver=0.25.1
-pkgrel=2
-epoch=1
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
-         'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa'
-	 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
-	 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
-	 'x264')
-makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm')
-optdepends=('glew: for GPU commercial flagging'
-            'libcec: for consumer electronics control capabilities'
-	    'libxml2: to read blu-ray metadata'
-	    'openssl: for AirTunes (RAOP) support'
-            'xmltv: to download tv listings')
-conflicts=('myththemes' 'mythplugins-mythvideo')
-replaces=('myththemes' 'mythplugins-mythvideo')
-backup=('etc/conf.d/mythbackend')
-install='mythtv.install'
-source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'mythbackend.rc'
-        'mythbackend.conf'
-	'mythbackend.service')
-md5sums=('4d6375cc3a820abdb2ac5300734687ac'
-         'c8f935d42fb8617e9279bd539811ca5f'
-         'ab962d83614cbd0ac11ce3fcc929829d'
-	 '813008d14a44e9c6212f364723aeaa74')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  sed -re 's@Key, &@Key, @' -i 'bindings/php/MythBase.php'
-
-  ARCH="${CARCH/_/-}"
-  ./configure --prefix=/usr \
-              --cpu="$ARCH" \
-	      --disable-altivec \
-	      --disable-audio-jack \
-	      --disable-ccache \
-	      --disable-distcc \
-	      --enable-libfftw3 \
-	      --enable-libmp3lame \
-	      --enable-libx264 \
-	      --enable-vaapi \
-	      --python=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir" install
-
-  install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
-  install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
-  install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service"
-  install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
-
-  mkdir -p "$pkgdir/usr/share/mythtv"
-  cp -R 'contrib' "$pkgdir/usr/share/mythtv"
-  mkdir -p "$pkgdir/var/log/mythtv"
-}
diff --git a/community-staging/mythtv/mythbackend.conf b/community-staging/mythtv/mythbackend.conf
deleted file mode 100644
index 49bbca877..000000000
--- a/community-staging/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-#     Michael Thomson <linux at m-thomson dot net>
-#     Stu Tomlinson <stu at nosnilmot dot com>
-#     Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-#     Jürgen Hoetzel <juergen@archinux.org>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-###############################################################################
-#
-# User who should start the mythbackend process
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can 
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_PATH='/var/log/mythtv'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community-staging/mythtv/mythbackend.rc b/community-staging/mythtv/mythbackend.rc
deleted file mode 100644
index 488b4cb8e..000000000
--- a/community-staging/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/profile
-
-###############################################################################
-# Default values to use if none are supplied in the config file.
-#
-# User who should start the mythbackend process
-MBE_USER='mythtv'
-
-# Startup options for mythbackend
-MBE_OPTS=''
-
-# Directory holding the mythbackend log file
-LOG_PATH='/var/log/mythtv'
-
-# Logging options for mythbackend
-LOG_OPTS=''
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -r "$CONFIG_FILE" ]]; then
-  . "$CONFIG_FILE"
-fi
-
-PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)"
-export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)"
-
-case "$1" in
-  start)
-    stat_busy "Starting MythTV Backend"
-
-    if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then
-      stat_fail
-      exit 0
-    fi
-
-    touch "$PIDFILE"
-    chown "$MBE_USER" "$PIDFILE" "$LOG_PATH"
-
-    MBE_CMD="/usr/bin/mythbackend --daemon \
-                                  --logpath "$LOG_PATH" $LOG_OPTS \
-                                  --pidfile "$PIDFILE" $MBE_OPTS"
-    if su "$MBE_USER" -c "$MBE_CMD"; then
-      add_daemon mythbackend
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MythTV Backend"
-    if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then
-      rm_daemon mythbackend
-      stat_done
-      rm -f "$PIDFILE"
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    "$0" stop
-    "$0" start
-    ;;
-  *)
-    echo "usage: $0 (start|stop|restart)"
-    ;;
-esac
-exit 0
diff --git a/community-staging/mythtv/mythbackend.service b/community-staging/mythtv/mythbackend.service
deleted file mode 100644
index 9d92bd644..000000000
--- a/community-staging/mythtv/mythbackend.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=MythTV Backend
-After=network.target mysqld.service
-
-[Service]
-Type=simple
-Environment=HOME=/var/lib/mythtv
-User=mythtv
-ExecStart=/usr/bin/mythbackend --daemon --logpath /var/log/mythtv
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-staging/mythtv/mythtv.install b/community-staging/mythtv/mythtv.install
deleted file mode 100644
index eed25b868..000000000
--- a/community-staging/mythtv/mythtv.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_upgrade() {
-	if ! getent passwd mythtv &>/dev/null; then
-		getent group mythtv &>/dev/null || groupadd -r mythtv >/dev/null
-		useradd -rmd /var/lib/mythtv -g mythtv -G video,audio,optical -s /bin/bash mythtv >/dev/null
-	fi
-}
-
-post_install() {
-	echo -e "For installation information, visit:\nhttps://wiki.archlinux.org/index.php/MythTV"
-
-	post_upgrade
-}
-
-post_remove() {
-	echo -e "The MythTV database was not removed. To remove it, run:\n  mysql -u root -e 'drop database mythconverg;'"
-	[ -d var/lib/mythtv ] && echo "The MythTV home directory /var/lib/mythtv can also be removed."
-
-	getent passwd mythtv &>/dev/null && userdel mythtv >/dev/null
-	getent group mythtv &>/dev/null && groupdel mythtv >/dev/null
-}
diff --git a/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch b/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch
deleted file mode 100644
index 83c8244a0..000000000
--- a/community-staging/mythtv/mythtv_0.25_gcc_4.7.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-*** a/libs/libmythbase/compat.h		2012-03-31 20:52:30.430461503 -0400
---- b/libs/libmythbase/compat.h		2012-03-31 20:59:05.935585911 -0400
-***************
-*** 44,49 ****
---- 44,51 ----
-  # include <sys/resource.h> // for setpriority
-  # include <sys/socket.h>
-  # include <sys/wait.h>     // For WIFEXITED on Mac OS X
-+ # include <stdio.h>        // for snprintf(), used by inline dlerror()
-+ # include <unistd.h>       // for usleep()
-  #endif
-  
-  #ifdef USING_MINGW
-*** a/libs/libmyth/rssparse.h		2012-03-31 20:52:30.427453729 -0400
---- b/libs/libmyth/rssparse.h		2012-03-31 21:51:11.687438044 -0400
-***************
-*** 13,18 ****
---- 13,19 ----
-  #include <QPair>
-  #include <QMap>
-  #include <QVariant>
-+ #include <sys/types.h>
-  
-  #include "mythexp.h"
-  
-*** a/libs/libmythtv/audioinput.h	2012-03-31 22:41:55.626923063 -0400
---- b/libs/libmythtv/audioinput.h	2012-03-31 22:41:22.478248297 -0400
-***************
-*** 22,27 ****
---- 22,28 ----
-  #define _AUDIOINPUT_H_
-  
-  #include <QString>
-+ #include <unistd.h>
-  
-  class AudioInput
-  {
-*** a/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c	2012-03-31 20:52:29.923150437 -0400
---- b/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c	2012-03-31 21:58:48.422270780 -0400
-***************
-*** 398,404 ****
-              "2:                         \n\t"\
-              \
-              : "+a"(src), "+c"(dst)\
-!             : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
-              : "memory"\
-          );\
-          src += 4-(h+5)*srcStride;\
---- 398,404 ----
-              "2:                         \n\t"\
-              \
-              : "+a"(src), "+c"(dst)\
-!             : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
-              : "memory"\
-          );\
-          src += 4-(h+5)*srcStride;\
-***************
-*** 446,452 ****
-              QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
-              "2:                     \n\t"\
-              : "+a"(src)\
-!             : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\
-              : "memory"\
-              );\
-          tmp += 4;\
---- 446,452 ----
-              QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\
-              "2:                     \n\t"\
-              : "+a"(src)\
-!             : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\
-              : "memory"\
-              );\
-          tmp += 4;\
-***************
-*** 823,829 ****
-          "2:                          \n\t"\
-          \
-          : "+a"(src), "+c"(dst)\
-!         : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\
-          : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
-                         "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
-            "memory"\
---- 823,829 ----
-          "2:                          \n\t"\
-          \
-          : "+a"(src), "+c"(dst)\
-!         : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\
-          : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \
-                         "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\
-            "memory"\
-***************
-*** 878,884 ****
-              QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
-              "2:                         \n\t"
-              : "+a"(src)
-!             : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)
-              : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
-                             "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
-                "memory"
---- 878,884 ----
-              QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48)
-              "2:                         \n\t"
-              : "+a"(src)
-!             : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)
-              : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
-                             "%xmm4", "%xmm5", "%xmm6", "%xmm7",)
-                "memory"
diff --git a/community-staging/neatx/PKGBUILD b/community-staging/neatx/PKGBUILD
deleted file mode 100644
index c11e76546..000000000
--- a/community-staging/neatx/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 78006 2012-10-16 03:10:35Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Nicolas Doualot <packages@slubman.info>
-
-pkgname=neatx
-pkgver=0.3.1
-pkgrel=13
-pkgdesc="A free NX server by google"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/neatx/"
-license=('GPL')
-depends=('nxserver' 'python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk')
-makedepends=('docutils')
-optdepends=('xorg-xdm: if you want to use KDE or GNOME session'
-	    'xorg-fonts-misc: to use default font'
-	    'xterm: if you want console session')
-install=neatx.install
-source=(http://neatx.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        constants.archlinux.patch)
-md5sums=('5748656738d5f04fef1af01b9fe5ef20'
-         'a5ca4aa399cc25fa8435280e8b03c5a3')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -i "$srcdir/constants.archlinux.patch" -p2
-
-  ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  chmod 777 "$pkgdir/var/lib/neatx/sessions"
-
-  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
-  echo -e '/usr/lib\n/opt/NX/lib' > ${pkgdir}/etc/ld.so.conf.d/neatx.conf
-}
diff --git a/community-staging/neatx/constants.archlinux.patch b/community-staging/neatx/constants.archlinux.patch
deleted file mode 100644
index dff5e2415..000000000
--- a/community-staging/neatx/constants.archlinux.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/neatx-0.3.1/lib/constants.py	2009-06-24 21:19:55.000000000 +0200
-+++ b/neatx-0.3.1/lib/constants.py	2009-07-08 10:50:30.000000000 +0200
-@@ -25,19 +25,19 @@
- from neatx import _autoconf
- 
- 
--NXDIR = "/usr/lib/nx"
-+NXDIR = "/opt/NX/bin"
- 
- SYSLOG_ADDRESS = "/dev/log"
- BASH = "/bin/bash"
--NETCAT = "/bin/netcat"
-+NETCAT = "/usr/bin/netcat"
- XRDB = "/usr/bin/xrdb"
- SU = "/bin/su"
- SSH = "/usr/bin/ssh"
- XAUTH = "/usr/bin/xauth"
--XSESSION = "/etc/X11/Xsession"
-+XSESSION = "/etc/X11/xdm/Xsession"
- 
- START_CONSOLE_COMMAND = "/usr/bin/xterm"
--START_KDE_COMMAND = XSESSION + " startkde"
-+START_KDE_COMMAND = " startkde"
- START_GNOME_COMMAND = XSESSION + " gnome-session"
- 
- NXUSER = "nx"
-@@ -47,12 +47,13 @@
- NXNC = _autoconf.PKGLIBDIR + "/nxnc"
- NXDIALOG = _autoconf.PKGLIBDIR + "/nxdialog"
- NXAGENT = NXDIR + "/nxagent"
--NXAGENT_PKGNAME = "nxagent"
-+#NXAGENT_PKGNAME = "nxagent"
-+NXAGENT_PKGNAME = "nxserver"
- FDCOPY = _autoconf.PKGLIBDIR + "/fdcopy"
- TTYSETUP = _autoconf.PKGLIBDIR + "/ttysetup"
- 
- # Extract nxagent version using the following command.
--NXAGENT_VERSION_COMMAND = ("dpkg-query -W --showformat='${Version}' %s" %
-+NXAGENT_VERSION_COMMAND = ("pacman -Qi %s | grep Version | awk '{print $3}'" %
-                            NXAGENT_PKGNAME)
- NXAGENT_VERSION_SEP = ".-~"
- 
diff --git a/community-staging/neatx/neatx.install b/community-staging/neatx/neatx.install
deleted file mode 100644
index 89356878c..000000000
--- a/community-staging/neatx/neatx.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  useradd -d /opt/NX/home/nx -s /usr/lib/neatx/nxserver-login-wrapper nx &> /dev/null
-  mkdir -p ~nx/.ssh
-  cp /usr/share/neatx/authorized_keys.nomachine ~nx/.ssh/authorized_keys
-  chmod 600 ~nx/.ssh/authorized_keys
-  chown -R nx ~nx
-  post_remove
-}
-
-pre_remove() {
-  userdel nx > /dev/null 2>&1
-  rm -rf ~nx
-}
-
-post_remove() {
-  sed  -e '/\/opt\/NX\/lib/d' -i etc/ld.so.conf
-  ldconfig
-}
diff --git a/community-staging/nginx/PKGBUILD b/community-staging/nginx/PKGBUILD
deleted file mode 100644
index ad83f970c..000000000
--- a/community-staging/nginx/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# $Id: PKGBUILD 72652 2012-06-18 15:34:27Z bpiotrowski $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com>
-# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
-
-pkgname=nginx
-pkgver=1.2.1
-pkgrel=6
-pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
-arch=('i686' 'x86_64')
-depends=('pcre' 'zlib' 'openssl')
-makedepends=('passenger')
-optdepends=('passenger')
-url="http://nginx.org"
-license=('custom')
-install=nginx.install
-backup=('etc/nginx/fastcgi.conf'
-        'etc/nginx/fastcgi_params'
-        'etc/nginx/koi-win'
-        'etc/nginx/koi-utf'
-        'etc/nginx/mime.types'
-        'etc/nginx/nginx.conf'
-        'etc/nginx/scgi_params'
-        'etc/nginx/uwsgi_params'
-        'etc/nginx/win-utf'
-        'etc/logrotate.d/nginx')
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-        rc.d service
-        nginx.logrotate)
-md5sums=('ceacae12d66d1f021bf3737a0269b6f4'
-         'f62c7c9b5a53471d4666a4c49ad363fb'
-         '16c6b4cbe24001a3f4f58b9d5f4e3d4c'
-         'b38744739022876554a0444d92e6603b')
-
-_cfgdir=/etc/nginx
-_tmpdir=/var/tmp/nginx
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure \
-        --prefix=$_cfgdir \
-        --conf-path=$_cfgdir/nginx.conf \
-        --sbin-path=/usr/sbin/nginx \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/lock/nginx.lock \
-        --user=http --group=http \
-        --http-log-path=/var/log/nginx/access.log \
-        --error-log-path=/var/log/nginx/error.log \
-        --http-client-body-temp-path=$_tmpdir/client-body \
-        --http-proxy-temp-path=$_tmpdir/proxy \
-        --http-fastcgi-temp-path=$_tmpdir/fastcgi \
-        --http-scgi-temp-path=$_tmpdir/scgi \
-        --http-uwsgi-temp-path=$_tmpdir/uwsgi \
-        --with-imap --with-imap_ssl_module \
-        --with-ipv6 --with-pcre-jit \
-        --with-file-aio \
-        --with-http_dav_module \
-        --with-http_gzip_static_module \
-        --with-http_realip_module \
-        --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --add-module=/usr/lib/passenger/ext/nginx \
-        #--with-http_mp4_module \
-        #--with-http_realip_module \
-        #--with-http_addition_module \
-        #--with-http_xslt_module \
-        #--with-http_image_filter_module \
-        #--with-http_geoip_module \
-        #--with-http_sub_module \
-        #--with-http_flv_module \
-        #--with-http_random_index_module \
-        #--with-http_secure_link_module \
-        #--with-http_degradation_module \
-        #--with-http_perl_module \
-
-	make
-}
-
-package() {
-	cd "$srcdir/nginx-${pkgver}"
-	make DESTDIR="$pkgdir" install
-
-	install -d "$pkgdir"/etc/logrotate.d
-    install -m644 $srcdir/nginx.logrotate $pkgdir/etc/logrotate.d/nginx
-    
-	sed -e 's|\<user\s\+\w\+;|user html;|g' \
-	    -e '44s|html|/usr/share/nginx/html|' \
-	    -e '54s|html|/usr/share/nginx/html|' \
-	    -i $pkgdir/etc/nginx/nginx.conf
-	rm $pkgdir/etc/nginx/*.default
-
-	install -dm1777 $pkgdir/var/tmp
-	install -d $pkgdir/$_tmpdir
-
-    install -d $pkgdir/usr/share/nginx
-    mv $pkgdir/etc/nginx/html/ $pkgdir/usr/share/nginx
-
-	install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/nginx
-	install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/nginx.service
-	install -D -m644 LICENSE $pkgdir/usr/share/licenses/nginx/LICENSE
-	rm -rf $pkgdir/var/run
-}
diff --git a/community-staging/nginx/nginx.install b/community-staging/nginx/nginx.install
deleted file mode 100644
index b31ee41d7..000000000
--- a/community-staging/nginx/nginx.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-    if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
-        echo " >>> Since 1.2.1-2 several changes has been made in package:"
-        echo "      - *.conf files have been moved to /etc/nginx"
-        echo "      - /etc/conf.d/nginx has been removed"
-        echo "        Main configuration file is set to /etc/nginx/nginx.conf"
-        echo "      - access.log and error.log can be found in /var/log/nginx by default" 
-        echo "      - bundled *.html files have been moved to /usr/share/nginx/html"
-        echo "      - /etc/nginx/{html,logs} symbolic links and *.default files have been removed"
-    fi
-}
diff --git a/community-staging/nginx/nginx.logrotate b/community-staging/nginx/nginx.logrotate
deleted file mode 100644
index d490d5d9b..000000000
--- a/community-staging/nginx/nginx.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/nginx/*.log {
-	missingok
-	sharedscripts
-	compress
-	postrotate
-		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
-	endscript
-}
diff --git a/community-staging/nginx/rc.d b/community-staging/nginx/rc.d
deleted file mode 100644
index eb9031e81..000000000
--- a/community-staging/nginx/rc.d
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-function check_config {
-  stat_busy "Checking nginx configuration"
-  /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf
-  if [ $? -ne 0 ]; then
-    stat_die
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    check_config
-    $0 careless_start
-    ;;
-  careless_start)
-    stat_busy "Starting nginx"
-    if [ -s /var/run/nginx.pid ]; then
-      stat_fail
-      # probably ;)
-      stat_busy "Nginx is already running"
-      stat_die
-     fi
-    /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon nginx
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nginx"
-    PID=$(cat /var/run/nginx.pid)
-    kill -QUIT $PID &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      for i in {1..10}; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    check_config
-    $0 stop
-    sleep 1
-    $0 careless_start
-    ;;
-  reload)
-    check_config
-    if [ -s /var/run/nginx.pid ]; then
-      status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid)
-    fi
-    ;;
-  check)
-    check_config
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload|check|careless_start}"
-esac
diff --git a/community-staging/nginx/service b/community-staging/nginx/service
deleted file mode 100644
index 78d0a492c..000000000
--- a/community-staging/nginx/service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=A high performance web server and a reverse proxy server
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-staging/onboard/PKGBUILD b/community-staging/onboard/PKGBUILD
deleted file mode 100644
index 236f0046b..000000000
--- a/community-staging/onboard/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 77541 2012-10-12 02:28:37Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=onboard
-pkgver=0.98.1
-pkgrel=1
-pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/onboard"
-license=('GPL')
-depends=('python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('python-distutils-extra')
-optdepends=('at-spi2-atk: auto-show when editing text'
-            'mousetweaks: hover click with mouse')
-options=('!emptydirs')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('107e031b429329b71deb67c9b90195d6')
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Do not set getpreferredencoding, because it breaks getstatusoutput() in the setup script
-  sed -i '/getpreferredencoding =/ d' setup.py
-
-  python3 setup.py install --root=$pkgdir/ --optimize=1
-}
diff --git a/community-staging/onboard/onboard.install b/community-staging/onboard/onboard.install
deleted file mode 100644
index aa4c3e059..000000000
--- a/community-staging/onboard/onboard.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  xdg-icon-resource forceupdate
-}
-
-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 7fe4972b7..000000000
--- a/community-staging/openimageio/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78698 2012-10-22 22:44:01Z ebelanger $
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-pkgname=openimageio
-pkgver=1.0.9
-pkgrel=4
-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' 'mesa')
-optdepends=('qt: iv image viewer'
-            'python2: bindings support')
-source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
-md5sums=('4b98a057515cc95fc954743c987f19ba')
-
-build() {
-  cd "$srcdir"/$_pkgname*/src
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages ..
-  make
-}
-
-package() {
-  cd "$srcdir"/$_pkgname*/src/build
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  cd ../..
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-staging/openscenegraph/PKGBUILD b/community-staging/openscenegraph/PKGBUILD
deleted file mode 100644
index 94549b12e..000000000
--- a/community-staging/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 74228 2012-07-23 03:08:50Z 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=7
-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' 'qt' 'ffmpeg-compat')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt')
-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
-  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
-  LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
-  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
-  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
-  [ $NOEXTRACT -eq 1 ] || cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \
-    -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \
-    -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \
-    -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \
-    -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so
-
-  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/oss/PKGBUILD b/community-staging/oss/PKGBUILD
deleted file mode 100644
index c99ab1737..000000000
--- a/community-staging/oss/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 72165 2012-06-09 11:25:01Z bluewind $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=oss
-pkgname=(oss libflashsupport-oss)
-pkgver=4.2_2006
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://developer.opensound.com/"
-license=('GPL2')
-makedepends=('gtk2')
-source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
-	"rm-init-scripts.patch"
-	"rc-script"
-	"soundon.patch"
-	"remove-hal.patch"
-	"oss.service"
-	)
-md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c'
-         'b9a380a0ac8896390d71ac13676f27e1'
-         'cbcbce5c03b127df5eafa8faa091492c'
-         '65f07fe241bfbf912f76d8b6d8f276b5'
-         'cd7f1dc6166bba8c94d96f3a28e948a5'
-         '8db0255b380dc6672993e627d1cd8ca6')
-_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
-
-build() {
-	cd "${srcdir}/${_dir}"
-
-	# Avoid these flags conflicting with OSS build system.
-	unset CFLAGS
-	unset LDFLAGS
-	unset OSFLAGS
-	unset LIBRARIES
-	export NO_WARNING_CHECKS=yes
-
-	# Compile libflashsupport.so only in packaging time, so we avoid
-	# conflicts with other packages and ease package management.
-	msg "Building libflashsupport.so."
-	cd oss/lib
-	gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so
-
-	msg "Preparing the build environment."
-	cd "${srcdir}"
-
-	# Create build directory and configure
-	rm -rf build
-	mkdir build && cd build
-	"${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm
-
-	msg "Building OSS."
-	make build
-
-	msg "Patching init scripts."
-	cd "${srcdir}/build/prototype"
-	rm usr/lib/oss/etc/S89oss
-	patch -p0 -i "${srcdir}/rm-init-scripts.patch"
-	patch -p0 -i "${srcdir}/soundon.patch"
-	# remove hal dependency
-	patch -p0 -i "${srcdir}/remove-hal.patch"
-	rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi
-
-	sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon
-	sed -i 's#/lib/modules/$UNAME/kernel/#/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh
-	sed -i 's#mkdir /lib/modules#mkdir -p /lib/modules#' usr/lib/oss/build/install.sh
-}
-
-package_oss() {
-	pkgdesc="Open Sound System UNIX audio architecture"
-	depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed')
-	optdepends=('gtk2: for graphical mixer (ossxmix)'
-	            'libflashsupport-oss: Adobe flash plugin support')
-	conflicts=('oss-linux' 'oss-linux-free' 'oss-testing')
-	backup=('usr/lib/oss/soundon.user')
-	install=oss.install
-
-	cd "${srcdir}/build/prototype"
-	cp -a * "${pkgdir}"
-
-	chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815)
-	find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy
-	install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss"
-	install -Dm644 "$srcdir/oss.service" "$pkgdir/usr/lib/systemd/system"
-}
-
-package_libflashsupport-oss() {
-	pkgdesc="Adobe flash plugin support lib (OSSv4)"
-	conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss')
-	depends=('oss')
-
-	cd "${srcdir}/${_dir}"
-
-	install -dm755 "$pkgdir/usr/lib"
-	ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
-}
-
diff --git a/community-staging/oss/oss.install b/community-staging/oss/oss.install
deleted file mode 100644
index 672d63644..000000000
--- a/community-staging/oss/oss.install
+++ /dev/null
@@ -1,30 +0,0 @@
-post_install() {
-	echo "Running OSS install script..."
-	sh /usr/lib/oss/build/install.sh &>/dev/null
-	echo
-	echo " Note that OSS can't currently work together with kernel"
-	echo " ALSA modules, so they were moved out by the OSS install"
-	echo " scripts. If you want the ALSA kernel modules back, you can"
-	echo " just remove this package using pacman."
-}
-
-post_upgrade() {
-	echo "Running OSS update script..."
-	sh /usr/lib/oss/build/install.sh &>/dev/null
-
-	if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then
-		echo "libflashsupport.so has been split into a seperate package."
-		echo "If you want flash to use oss, please install libflashsupport-oss"
-	fi
-}
-
-pre_remove() {
-	# Restore any replaced ALSA drivers.
-	sh /usr/lib/oss/scripts/restore_drv.sh
-}
-
-post_remove() {
-	echo " Open Sound System was now removed, and the ALSA kernel"
-	echo " modules were restored."
-}
-
diff --git a/community-staging/oss/oss.service b/community-staging/oss/oss.service
deleted file mode 100644
index 107c9bf3f..000000000
--- a/community-staging/oss/oss.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Open Sound System v4
-Before=sound.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/soundon
-ExecStop=/usr/sbin/soundoff
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-staging/oss/rc-script b/community-staging/oss/rc-script
deleted file mode 100644
index 5c930107c..000000000
--- a/community-staging/oss/rc-script
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy 'Starting Open Sound System'
-		if /usr/sbin/soundon; then
-			add_daemon oss
-			stat_done
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Open Sound System'
-		if /usr/sbin/soundoff; then
-			rm_daemon oss
-			stat_done
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-esac
diff --git a/community-staging/oss/remove-hal.patch b/community-staging/oss/remove-hal.patch
deleted file mode 100644
index 27e2ef2de..000000000
--- a/community-staging/oss/remove-hal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Date: Tue Aug  2 16:37:31 CEST 2011
-Author: Florian Pritz <bluewind@xinu.at>
-This removes all hal dependencies
-
-References:
-http://www.archlinux.org/todo/92/
-
---- usr/lib/oss/build/install_2011-08-02_162647.sh	2011-08-02 16:26:47.000000000 +0200
-+++ usr/lib/oss/build/install.sh	2011-08-02 16:27:13.000000000 +0200
-@@ -336,10 +336,4 @@
-   echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs
- fi
- 
--# Hal 0.5.0+ hotplug
--mkdir -p /usr/lib/hal/scripts
--ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/
--mkdir -p /usr/share/hal/fdi/policy/20thirdparty/
--ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/
--
- exit 0
diff --git a/community-staging/oss/rm-init-scripts.patch b/community-staging/oss/rm-init-scripts.patch
deleted file mode 100644
index 981ff605f..000000000
--- a/community-staging/oss/rm-init-scripts.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- usr/lib/oss/build/install.sh.orig	2008-09-25 11:41:47.180167692 -0300
-+++ usr/lib/oss/build/install.sh	2008-09-25 11:41:47.180167692 -0300
-@@ -290,38 +290,6 @@
-    echo 
- fi
- 
--if ! test -d /etc/init.d
--then
--  mkdir /etc/init.d
--fi
--
--rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss
--cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss
--
--chmod 744 /etc/init.d/oss
--
--if test -x /sbin/chkconfig
--then
--  /sbin/chkconfig oss on        > /dev/null 2>&1
--else
-- if test -x /usr/sbin/update-rc.d
-- then
--   /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1
-- else
--  if test -d etc/rc.d/rc3.d
--  then
--    rm -f /etc/rc.d/rc3.d/S89oss
--    ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss
--  else
--    if test -d /etc/rc3.d
--    then
--      rm -f /etc/rc3.d/S89oss
--      ln -s /etc/init.d/oss /etc/rc3.d/S89oss
--    fi
--  fi
-- fi
--fi
--
- # Install ALSA interface module (Cuckoo)
- #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1
- #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1
---- usr/lib/oss/scripts/restore_drv.sh.orig	2008-09-25 11:41:47.210168487 -0300
-+++ usr/lib/oss/scripts/restore_drv.sh	2008-09-25 11:41:47.210168487 -0300
-@@ -18,8 +18,6 @@
-   fi
- fi
- 
--rm -f /etc/init.d/oss
--
- if ! test -d /lib/modules/`uname -r`/kernel/sound
- then
-    if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2
diff --git a/community-staging/oss/soundon.patch b/community-staging/oss/soundon.patch
deleted file mode 100644
index 4702b8680..000000000
--- a/community-staging/oss/soundon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- usr/sbin/soundon.old	2009-09-04 06:35:26.000000000 +0100
-+++ usr/sbin/soundon	2009-11-15 13:59:53.000000000 +0000
-@@ -255,7 +255,10 @@
-   then
-      if test "`uname -m` " = "x86_64 "
-      then
--       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
-+       # Fix for compatibility with Arch's directory structure
-+       # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed
-+       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2
-+       #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
-        #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
-      else
-        if test -s /lib/libasound.so.2
-@@ -278,8 +281,11 @@
- then
-    if test "`uname -m` " = "x86_64 "
-    then
--     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
--     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
-+     # Fix for compatibility with Arch's directory structure
-+     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib
-+     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib
-+     #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
-+     #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
-    else
-      if test -s /lib/libasound.so.2
-      then
diff --git a/community-staging/passenger/PKGBUILD b/community-staging/passenger/PKGBUILD
deleted file mode 100644
index 0464836d8..000000000
--- a/community-staging/passenger/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 75683 2012-08-29 07:32:45Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=passenger
-pkgver=3.0.15
-pkgrel=1
-_pkgdlnr=76337
-pkgdesc="mod_rails passenger"
-arch=('i686' 'x86_64')
-url="http://www.modrails.com"
-license=('GPL')
-depends=('ruby' 'ruby-rack' 'curl')
-makedepends=('apache')
-install=passenger.install
-options=('!emptydirs')
-source=(http://rubyforge.org/frs/download.php/${_pkgdlnr}/passenger-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('532d977eabb4acd5a831b3526ddd8ac4'
-         'ee4699596dffb5357fdac4e3b2c98ee1')
-
-build(){
-  cd $srcdir/passenger-$pkgver
-  patch -p1 <$srcdir/build-fix.patch
-  ./bin/passenger-install-apache2-module -a
-  rake nginx
-
-  mkdir -p $pkgdir/usr/lib/passenger/
-  cp -R * $pkgdir/usr/lib/passenger/
-
-  mkdir -p $pkgdir/usr/lib/httpd/modules
-  ln -sf /usr/lib/passenger/ext/apache2/mod_passenger.so $pkgdir/usr/lib/httpd/modules/mod_passenger.so
-}
diff --git a/community-staging/passenger/build-fix.patch b/community-staging/passenger/build-fix.patch
deleted file mode 100644
index cdbb78e68..000000000
--- a/community-staging/passenger/build-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur passenger-3.0.15/ext/boost/thread/xtime.hpp passenger-3.0.15.my/ext/boost/thread/xtime.hpp
---- passenger-3.0.15/ext/boost/thread/xtime.hpp	2012-04-16 11:43:52.000000000 +0400
-+++ passenger-3.0.15.my/ext/boost/thread/xtime.hpp	2012-08-29 11:06:02.000000000 +0400
-@@ -18,6 +18,8 @@
- 
- namespace boost {
- 
-+#undef TIME_UTC
-+
- enum xtime_clock_types
- {
-     TIME_UTC=1
diff --git a/community-staging/passenger/passenger.install b/community-staging/passenger/passenger.install
deleted file mode 100644
index 6faaab1b6..000000000
--- a/community-staging/passenger/passenger.install
+++ /dev/null
@@ -1,32 +0,0 @@
-post_install() {
-	echo "Please edit your Apache configuration file, and add these lines:"
-	echo ""
-	echo "LoadModule passenger_module /usr/lib/httpd/modules/mod_passenger.so"
-	echo "PassengerRoot /usr/lib/passenger"
-	echo "PassengerRuby /usr/bin/ruby"
-	echo ""
-	echo "After you restart Apache, you are ready to deploy any number of Ruby on Rails"
-	echo "applications on Apache, without any further Ruby on Rails-specific"
-	echo "configuration!"
-	echo ""
-	echo ""
-	echo "Deploying a Ruby on Rails application: an example"
-	echo ""
-	echo "Suppose you have a Ruby on Rails application in /somewhere. Add a virtual host"
-	echo "to your Apache configuration file, and set its DocumentRoot to"
-	echo "/somewhere/public, like this:"
-	echo ""
-	echo "<VirtualHost *:80>"
-	echo "	ServerName www.yourhost.com"
-	echo "	DocumentRoot /somewhere/public    # <-- be sure to point to 'public'!"
-	echo "   <Directory /somewhere/public>"
-	echo "      AllowOverride all              # <-- relax Apache security settings"
-	echo "      Options -MultiViews            # <-- MultiViews must be turned off"
-	echo "   </Directory>"
-	echo "</VirtualHost>"
-	echo ""
-	echo "And that's it! You may also want to check the Users Guide for security and"
-	echo "optimization tips, troubleshooting and other useful information:"
-	echo ""
-	echo "/usr/lib/passenger/doc/Users guide Apache.html"
-}
diff --git a/community-staging/pdf2djvu/PKGBUILD b/community-staging/pdf2djvu/PKGBUILD
deleted file mode 100644
index bd4830a3c..000000000
--- a/community-staging/pdf2djvu/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78296 2012-10-17 10:37:29Z jelle $
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-
-pkgname=pdf2djvu
-pkgver=0.7.15
-pkgrel=1
-pkgdesc="Creates DjVu files from PDF files"
-arch=('i686' 'x86_64')
-url="http://pdf2djvu.googlecode.com"
-license=('GPL')
-depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick')
-makedepends=('pstreams' 'python2-nose' 'ttf-liberation')
-source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz")
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make install DESTDIR=${pkgdir}
-    install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
-}
-check() {
-
-    cd ${srcdir}/${pkgname}-${pkgver}
-    sed -i 's/nosetests/nosetests2/' tests/Makefile
-    make test
-}
-md5sums=('cd03b61636b8d58592e7f419b434581f')
diff --git a/community-staging/pdnsd/PKGBUILD b/community-staging/pdnsd/PKGBUILD
deleted file mode 100644
index 6a6526d54..000000000
--- a/community-staging/pdnsd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 72152 2012-06-09 06:03:43Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Henrik Nymann Jensen <h@henriknj.dk>
-
-pkgname=pdnsd
-pkgver=1.2.9
-pkgrel=2
-pkgdesc="Is a proxy DNS server with permanent caching"
-arch=(i686 x86_64)
-url="http://members.home.nl/p.a.rombouts/pdnsd/"
-license=('GPL')
-depends=('glibc')
-#backup=('etc/pdnsd.conf')
-source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$pkgver-par.tar.gz
-	pdnsd
-	pdnsd.service)
-md5sums=('037f79d191b98974ffc2c9649727bf66'
-         '3670bd47c9303fbb655d9216715512de'
-         'fad5e518d126b29fc947941d57a0a494')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-  make DESTDIR=$pkgdir install
-  install -Dm0755 $srcdir/pdnsd $pkgdir/etc/rc.d/pdnsd
-  install -Dm0644 $srcdir/pdnsd.service $pkgdir/usr/lib/systemd/system/pdnsd.service
-}
diff --git a/community-staging/pdnsd/pdnsd b/community-staging/pdnsd/pdnsd
deleted file mode 100644
index 34a541d18..000000000
--- a/community-staging/pdnsd/pdnsd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/pdnsd`
-case "$1" in
-  start)
-    stat_busy "Starting pdnsd Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/pdnsd -d
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdnsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping pdnsd Daemon"
-    [ ! -z "$PID" ]  && kill -TERM $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdnsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community-staging/pdnsd/pdnsd.service b/community-staging/pdnsd/pdnsd.service
deleted file mode 100644
index 5821dbcb2..000000000
--- a/community-staging/pdnsd/pdnsd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=proxy name server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/pdnsd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-staging/performous/PKGBUILD b/community-staging/performous/PKGBUILD
deleted file mode 100644
index 58774f89a..000000000
--- a/community-staging/performous/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 78559 2012-10-20 22:05:37Z lcarlier $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=performous
-pkgver=0.6.1
-pkgrel=17
-pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
-arch=('i686' 'x86_64')
-url="http://performous.org/"
-license=('GPL')
-depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50' 'mesa')
-optdepends=('performous-freesongs: free songs for performous')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
-        boost-filesystem-v3.patch
-	ffmpeg-0.11.patch
-	png15.patch
-	fix-boost-1.50-xtime.patch)
-md5sums=('451a759de77984b5a699e91107fe52e2'
-         '42a8c825d80b0de16bd5752d2a80e585'
-         '07e52e926595d053155bbfb7168e308f'
-         '89157d5e21b0efd09fcbeee299d23c7e'
-         '6b43ab7f1c3e2cacd3540242634eabb3')
-
-build() {
-  cd ${srcdir}/Performous-${pkgver}-Source
-
-  # fix to built against boost 1.46 and later, upstream (git) now support v3
-  patch -Np1 -i ../boost-filesystem-v3.patch
-  # fix with ffmpeg-0.11
-  patch -Np1 -i ../ffmpeg-0.11.patch
-  # fix for libpng 1.5
-  patch -Np1 -i ../png15.patch
-  # fix glib2.0 building
-  # #error "Only <glib.h> can be included directly."
-  sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc
-  # boost 1.50 fix
-  patch -Np1 -i ../fix-boost-1.50-xtime.patch
-
-  mkdir -p build
-  cd build
-
-  # fix config loading with libxml++
-  export LDFLAGS=${LDFLAGS/-Wl,--as-needed/}
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Performous-${pkgver}-Source/build
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/performous/boost-filesystem-v3.patch b/community-staging/performous/boost-filesystem-v3.patch
deleted file mode 100644
index 22dd07213..000000000
--- a/community-staging/performous/boost-filesystem-v3.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/game/backgrounds.cc b/game/backgrounds.cc
-index 7fd3cd0..cdedefb 100644
---- a/game/backgrounds.cc
-+++ b/game/backgrounds.cc
-@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) {
- 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
- 			fs::path p = dirIt->path();
- 			if (fs::is_directory(p)) { reload_internal(p); continue; }
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename
- 			std::string path = p.directory_string(); // Path without filename
-+#else
-+			std::string name = p.filename().string(); // File basename
-+			std::string path = p.string(); // Path without filename
-+#endif
- 			path.erase(path.size() - name.size());
- 			if (!regex_match(name.c_str(), match, expression)) continue;
- 			{
-diff --git a/game/cache.cc b/game/cache.cc
-index 69974e2..0f1edd0 100644
---- a/game/cache.cc
-+++ b/game/cache.cc
-@@ -9,7 +9,11 @@ namespace cache {
- 	fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){
- 		fs::path cache_filename;
- 		std::string const lod = (boost::format("%.2f") % factor).str();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png";
-+#else
-+		std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png";
-+#endif
- 
- 		if (isThemeResource(svgfilename)) {
- 			std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s());
-diff --git a/game/filemagic.hh b/game/filemagic.hh
-index bf87ded..29e81fe 100644
---- a/game/filemagic.hh
-+++ b/game/filemagic.hh
-@@ -71,7 +71,11 @@ namespace filemagic {
- 		// For now, just check the extension an assume it's not lying.
- 
- 		// Get file extension in lower case
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string ext = filename.extension();
-+#else
-+		std::string ext = filename.extension().string();
-+#endif
- 		// somehow this does not convert the extension to lower case:
- 		//std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower));
- 		std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower );
-diff --git a/game/fs.cc b/game/fs.cc
-index e34a784..767a7ab 100644
---- a/game/fs.cc
-+++ b/game/fs.cc
-@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) {
- 
- bool isThemeResource(fs::path filename){
- 	try {
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string themefile = getThemePath(filename.filename());
-+#else
-+		std::string themefile = getThemePath(filename.filename().string());
-+#endif
- 		return themefile == filename;
- 	} catch (...) { return false; }
- }
-diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
-index 38e163b..db15d79 100644
---- a/game/songparser-ini.cc
-+++ b/game/songparser-ini.cc
-@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() {
- 	// Search the dir for the music files
- 	for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
- 		boost::filesystem::path p = dirIt->path();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string name = p.leaf(); // File basename (notes.txt)
-+#else
-+		std::string name = p.filename().string(); // File basename (notes.txt)
-+#endif
- 		if (regex_match(name.c_str(), match, midifile)) {
- 			 s.midifilename = name;
- 		} else if (regex_match(name.c_str(), match, audiofile_background)) {
-diff --git a/game/songparser.cc b/game/songparser.cc
-index 2b7b9b4..ac9f3f6 100644
---- a/game/songparser.cc
-+++ b/game/songparser.cc
-@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s):
- 
- 		for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
- 			boost::filesystem::path p = dirIt->path();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename
-+#else
-+			std::string name = p.filename().string(); // File basename
-+#endif
- 			if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) {
- 				m_song.cover = name;
- 			} else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) {
-diff --git a/game/songs.cc b/game/songs.cc
-index 62ab26d..afab383 100644
---- a/game/songs.cc
-+++ b/game/songs.cc
-@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) {
- 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
- 			fs::path p = dirIt->path();
- 			if (fs::is_directory(p)) { reload_internal(p); continue; }
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename (notes.txt)
- 			std::string path = p.directory_string(); // Path without filename
-+#else
-+			std::string name = p.filename().string(); // File basename (notes.txt)
-+			std::string path = p.string(); // Path without filename
-+#endif
- 			path.erase(path.size() - name.size());
- 			if (!regex_match(name.c_str(), match, expression)) continue;
- 			try {
-diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh
-index 58e19dc..8895d94 100644
---- a/tools/ss_helpers.hh
-+++ b/tools/ss_helpers.hh
-@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st
- void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); }
- void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); }
- 
-+#if BOOST_FILESYSTEM_VERSION < 3
- std::string filename(boost::filesystem::path const& p) { return *--p.end(); }
-+#else
-+std::string filename(boost::filesystem::path const& p) { return p.filename().string(); }
-+#endif
- 
- /** Fix Singstar's b0rked XML **/
- std::string xmlFix(std::vector<char> const& data) {
--- 
-1.7.4.1
-
diff --git a/community-staging/performous/ffmpeg-0.11.patch b/community-staging/performous/ffmpeg-0.11.patch
deleted file mode 100644
index 2962123ed..000000000
--- a/community-staging/performous/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru Performous-0.6.1-Source/game/ffmpeg.cc Performous-0.6.1a-Source/game/ffmpeg.cc
---- Performous-0.6.1-Source/game/ffmpeg.cc	2010-10-31 16:05:43.000000000 +0000
-+++ Performous-0.6.1a-Source/game/ffmpeg.cc	2012-06-08 21:40:10.876636789 +0000
-@@ -47,11 +47,17 @@
- 	return d >= 0.0 ? d : getInf();
- }
- 
-+// FFMPEG has fluctuating API
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(64<<8)+0)
-+#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
-+#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
-+#endif
-+
- void FFmpeg::open() {
- 	boost::mutex::scoped_lock l(s_avcodec_mutex);
- 	av_register_all();
- 	av_log_set_level(AV_LOG_ERROR);
--	if (av_open_input_file(&pFormatCtx, m_filename.c_str(), NULL, 0, NULL)) throw std::runtime_error("Cannot open input file");
-+	if (avformat_open_input(&pFormatCtx, m_filename.c_str(), NULL, NULL)) throw std::runtime_error("Cannot open input file");
- 	if (av_find_stream_info(pFormatCtx) < 0) throw std::runtime_error("Cannot find stream information");
- 	pFormatCtx->flags |= AVFMT_FLAG_GENPTS;
- 	videoStream = -1;
-@@ -60,8 +66,8 @@
- 	for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) {
- 		AVCodecContext* cc = pFormatCtx->streams[i]->codec;
- 		cc->workaround_bugs = FF_BUG_AUTODETECT;
--		if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i;
--		if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i;
-+		if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i;
-+		if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i;
- 	}
- 	if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found");
- 	if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found");
-@@ -92,7 +98,7 @@
- 		pAudioCodecCtx = cc;
- #if LIBAVCODEC_VERSION_INT > ((52<<16)+(12<<8)+0)
- 		pResampleCtx = av_audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate,
--			SAMPLE_FMT_S16, SAMPLE_FMT_S16, 16, 10, 0, 0.8);
-+			AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, 16, 10, 0, 0.8);
- #else
- 		pResampleCtx = audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate);
- #endif
diff --git a/community-staging/performous/fix-boost-1.50-xtime.patch b/community-staging/performous/fix-boost-1.50-xtime.patch
deleted file mode 100644
index d13b18c26..000000000
--- a/community-staging/performous/fix-boost-1.50-xtime.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a4be6f47bcdd64e7c77db0a04415973d4c322ae8 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Alvaro=20Fernando=20Garc=C3=ADa?= <alvarofernandogarcia@gmail.com>
-Date: Sat, 7 Jul 2012 18:53:56 -0300
-Subject: [PATCH] Fixed boost xtime.hpp usage (for 1.50 version)
-
----
- game/xtime.hh |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/game/xtime.hh b/game/xtime.hh
-index 41303cb..8f5463d 100644
---- a/game/xtime.hh
-+++ b/game/xtime.hh
-@@ -1,5 +1,6 @@
- #pragma once
- 
-+#include <boost/version.hpp>
- #include <boost/thread/xtime.hpp>
- #include <cmath>
- 
-@@ -20,7 +21,11 @@ namespace {
- 	}
- 	boost::xtime now() {
- 		boost::xtime time;
-+#if (BOOST_VERSION / 100 % 1000 >= 50)
-+		boost::xtime_get(&time, boost::TIME_UTC_);
-+#else
- 		boost::xtime_get(&time, boost::TIME_UTC);
-+#endif
- 		return time;
- 	}
- 	double seconds(boost::xtime const& time) {
--- 
-1.7.4.1
-
diff --git a/community-staging/performous/png15.patch b/community-staging/performous/png15.patch
deleted file mode 100644
index b6fb8fb14..000000000
--- a/community-staging/performous/png15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake
---- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake	2010-10-31 17:05:44.000000000 +0100
-+++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake	2012-01-29 01:07:56.339648832 +0100
-@@ -10,7 +10,7 @@
- 
- include(LibFindMacros)
- 
--libfind_pkg_check_modules(Png_PKGCONF Png)
-+libfind_pkg_check_modules(Png_PKGCONF libpng)
- 
- find_path(Png_INCLUDE_DIR
-   NAMES pngconf.h
-@@ -18,7 +18,7 @@
- )
- 
- find_library(Png_LIBRARY
--  NAMES png png12 png14
-+  NAMES png png12 png14 png15
-   PATHS ${Png_PKGCONF_LIBRARY_DIRS}
- )
- 
-diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh
---- Performous-0.6.1-Source/game/image.hh	2010-10-31 17:05:43.000000000 +0100
-+++ Performous-0.6.1a-Source/game/image.hh	2012-01-29 01:44:16.050575186 +0100
-@@ -26,7 +26,7 @@
- 	}
- 	void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) {
- 		if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed");
--		png_set_read_fn(pngPtr,(voidp)&file, readPngHelper);
-+		png_set_read_fn(pngPtr, &file, readPngHelper);
- 		png_read_info(pngPtr, infoPtr);
- 		png_set_expand(pngPtr);  // Expand everything to RGB(A)
- 		png_set_strip_16(pngPtr);  // Strip everything down to 8 bit/component
diff --git a/community-staging/picard/PKGBUILD b/community-staging/picard/PKGBUILD
deleted file mode 100644
index 3e7ceb0ac..000000000
--- a/community-staging/picard/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 71926 2012-06-03 18:18:47Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: sysrq
-
-pkgname=picard
-pkgver=1.0
-pkgrel=2
-pkgdesc='Official MusicBrainz tagger'
-url='http://musicbrainz.org/doc/MusicBrainz_Picard'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
-optdepends=('libdiscid: CD lookup'
-            'chromaprint: fingerprinting')
-source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('abbd606a89b60ed8c948705d47ce1ae1a90f866a')
-
-install=install
-
-build() {
-	cd "${srcdir}/picard-${pkgver}"
-	python2 setup.py config
-}
-
-package() {
-	cd "${srcdir}/picard-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/community-staging/picard/install b/community-staging/picard/install
deleted file mode 100644
index b46fab005..000000000
--- a/community-staging/picard/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-	update-desktop-database -q &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-staging/pidgin-otr/PKGBUILD b/community-staging/pidgin-otr/PKGBUILD
deleted file mode 100644
index df801a787..000000000
--- a/community-staging/pidgin-otr/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 76188 2012-09-13 07:35:32Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Bug <Bug2000@gmail.com>
-# Contributor: Marcel Wysocki <maci@satgnu.net>
-
-pkgname=pidgin-otr
-pkgver=4.0.0
-pkgrel=1
-pkgdesc='Off-the-Record Messaging plugin for Pidgin.'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://www.cypherpunks.ca/otr/'
-depends=('libotr>=4.0.0' 'pidgin' 'perlxml')
-makedepends=('intltool')
-source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"{,.asc})
-md5sums=('eadb953376acc474e56041d4c12aa2c8'
-         '8c70a2fc6f5f0480f32178742ba96498')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/pingus/ChangeLog b/community-staging/pingus/ChangeLog
deleted file mode 100644
index c182f92eb..000000000
--- a/community-staging/pingus/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2010-03-18  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
-
-        * pingus 0.7.2-8
-        * Rebuilt against boost 1.41.0
-
-2010-02-23  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-7
-	* Rebuilt against boost 1.42.0
-
-2010-01-20  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-6
-	* Rebuilt against libpng 1.4/libjpeg 8
-
-2009-07-13  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-2
-	* Rebuilt against boost 1.39
-	* Added gcc 4.4 patch
-	* Added ChangeLog
diff --git a/community-staging/pingus/PKGBUILD b/community-staging/pingus/PKGBUILD
deleted file mode 100644
index a5f07bd62..000000000
--- a/community-staging/pingus/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 73461 2012-07-08 04:55:52Z tdziedzic $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=pingus
-pkgver=0.7.6
-pkgrel=4
-pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
-arch=('i686' 'x86_64')
-url="http://pingus.seul.org"
-license=('GPL')
-depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.49')
-makedepends=('scons' 'boost>=1.49' 'mesa')
-source=("http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2"
-        'pingus.desktop'
-        'pingus-0.7.6-gcc470-udl.patch')
-md5sums=('561798686f34d3fa4e69135d655f47ac'
-         '9eec34047bdcff49e08f41e81764e20c'
-         '3730bdad38c21c67203456a985945473')
-sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487'
-          '579a1144f161ce89e6e024cea37210149b89c0c0'
-          '143dd9969e8d100d29ed4f5b2039dde627afeb06')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  # fedora patch to fix error due to new standards
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51282
-  patch -Np0 -i ${srcdir}/pingus-0.7.6-gcc470-udl.patch
-
-  scons prefix=/usr
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make install DESTDIR="${pkgdir}" PREFIX="/usr"
-
-  install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop"
-}
diff --git a/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch b/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch
deleted file mode 100644
index 843439321..000000000
--- a/community-staging/pingus/pingus-0.7.6-gcc470-udl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/pingus/pingus_main.cpp~	2011-12-24 15:46:47.000000000 -0600
-+++ src/pingus/pingus_main.cpp	2012-01-03 13:13:03.034195720 -0600
-@@ -465,7 +465,7 @@
- void
- PingusMain::print_greeting_message()
- {
--  std::string greeting = "Welcome to Pingus "VERSION;
-+  std::string greeting = "Welcome to Pingus " VERSION;
-   greeting += "!";
-   std::cout <<  greeting << std::endl;
-   for (unsigned int i = 0; i < greeting.length(); ++i)
---- src/pingus/screens/pingus_menu.cpp~	2011-12-24 15:46:47.000000000 -0600
-+++ src/pingus/screens/pingus_menu.cpp	2012-01-03 13:30:28.967700554 -0600
-@@ -153,7 +153,7 @@
-                          gc.get_height()/2 - 280));
- 
-   gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
--                "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
-+                "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
-                 "See the file AUTHORS for a complete list of contributors.\n"
-                 "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
-                 "welcome to redistribute it under certain conditions; see the file COPYING for details.\n");
diff --git a/community-staging/pingus/pingus.desktop b/community-staging/pingus/pingus.desktop
deleted file mode 100644
index 276db36a4..000000000
--- a/community-staging/pingus/pingus.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pingus
-Comment=A free Lemmings[tm] clone
-Exec=pingus
-Terminal=false
-Type=Application
-Categories=Application;Game;LogicGame
-Icon=/usr/share/pingus/images/core/editor/actions.png
diff --git a/community-staging/pinot/PKGBUILD b/community-staging/pinot/PKGBUILD
deleted file mode 100644
index 3cae4201d..000000000
--- a/community-staging/pinot/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 74640 2012-08-01 02:56:58Z ebelanger $
-# 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=1.0
-pkgrel=2
-pkgdesc='Personal search and metasearch tool'
-arch=('i686' 'x86_64')
-url='http://code.google.com/p/pinot-search/'
-license=('GPL')
-depends=('gtkmm3' 'xapian-core' 'libtextcat' 'sqlite' 'libxml++' 'curl' 'gmime' 
-         'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 'hicolor-icon-theme' 
-         'cairo' 'exiv2' 'boost-libs')
-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')
-options=('!emptydirs')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha256sums=('d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
-  sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_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|" textcat3_conf.txt
-
-  LIBS="-lboost_system" ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/pinot/pinot.changelog b/community-staging/pinot/pinot.changelog
deleted file mode 100644
index 770a1ef0a..000000000
--- a/community-staging/pinot/pinot.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-2012-07-31  Eric Belanger  <eric@archlinux.org>
-	* pinot 1.0-2 : Rebuild against exiv2 0.23, Add boost-libs depends
-
-2012-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* pinot 1.0-1
-
-2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* pinot 0.98-1
diff --git a/community-staging/pinot/pinot.install b/community-staging/pinot/pinot.install
deleted file mode 100644
index 55ab40426..000000000
--- a/community-staging/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-staging/pion-net/PKGBUILD b/community-staging/pion-net/PKGBUILD
deleted file mode 100644
index f428f8caf..000000000
--- a/community-staging/pion-net/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 73465 2012-07-08 06:28:16Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: David Watzke <david@watzke.cz>
-pkgname=pion-net
-pkgver=4.0.12
-pkgrel=3
-pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
-url="http://www.pion.org/projects/pion-network-library"
-arch=('i686' 'x86_64')
-license=('custom:Boost')
-depends=('boost-libs' 'openssl' 'log4cpp')
-makedepends=('boost')
-source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" \
-        gcc_4.7_fix.diff boost_1.50_support.diff)
-md5sums=('baf0b6a006660dc4051c824e4660cb9d'
-         'd6c5314678709184e983b301cea11566'
-         'fcd2a7520b818354308315dc1e8053d4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # override configure bug (forces debug even when nobody asked for it)
-  sed -i "s/ -ggdb//g" configure
-  # override Makefile bug
-  sed -i "/docs:/ s/doxygen-doc//" Makefile.in
-  # fix compilation with new versions of gcc
-  patch -Np1 < "$srcdir"/gcc_4.7_fix.diff || true
-  # fix build with boost 1.50 - port to filesystem v3
-  patch -Np1 < "$srcdir"/boost_1.50_support.diff || true
-
-  ./configure --prefix=/usr --disable-doxygen-doc
-
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # install license
-  install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost"
-}
diff --git a/community-staging/pion-net/boost_1.50_support.diff b/community-staging/pion-net/boost_1.50_support.diff
deleted file mode 100644
index 7b82f34b9..000000000
--- a/community-staging/pion-net/boost_1.50_support.diff
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -rup pion-net-4.0.12/common/src/PionPlugin.cpp pion-net-4.0.12-new/common/src/PionPlugin.cpp
---- pion-net-4.0.12/common/src/PionPlugin.cpp	2011-03-22 04:35:12.000000000 +0100
-+++ pion-net-4.0.12-new/common/src/PionPlugin.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -58,7 +58,7 @@ void PionPlugin::addPluginDirectory(cons
- 	if (! boost::filesystem::exists(plugin_path) )
- 		throw DirectoryNotFoundException(dir);
- 	boost::mutex::scoped_lock plugin_lock(m_plugin_mutex);
--	m_plugin_dirs.push_back(plugin_path.directory_string());
-+	m_plugin_dirs.push_back(plugin_path.string());
- }
- 
- void PionPlugin::resetPluginDirectories(void)
-@@ -204,7 +204,7 @@ bool PionPlugin::checkForFile(std::strin
- 	try {
- 		// is_regular may throw if directory is not readable
- 		if (boost::filesystem::is_regular(test_path)) {
--			final_path = test_path.file_string();
-+			final_path = test_path.string();
- 			return true;
- 		}
- 	} catch (...) {}
-@@ -225,7 +225,7 @@ bool PionPlugin::checkForFile(std::strin
- 	try {
- 		// is_regular may throw if directory is not readable
- 		if (boost::filesystem::is_regular(test_path)) {
--			final_path = test_path.file_string();
-+			final_path = test_path.string();
- 			return true;
- 		}
- 	} catch (...) {}
-@@ -291,7 +291,7 @@ void PionPlugin::getAllPluginNames(std::
- 		for (boost::filesystem::directory_iterator it2(*it); it2 != end; ++it2) {
- 			if (boost::filesystem::is_regular(*it2)) {
- 				if (boost::filesystem::extension(it2->path()) == PionPlugin::PION_PLUGIN_EXTENSION) {
--					plugin_names.push_back(PionPlugin::getPluginName(it2->path().leaf()));
-+					plugin_names.push_back(PionPlugin::getPluginName(it2->path().filename().string()));
- 				}
- 			}
- 		}
-@@ -309,11 +309,11 @@ void *PionPlugin::loadDynamicLibrary(con
- #else
- 	// convert into a full/absolute/complete path since dlopen()
- 	// does not always search the CWD on some operating systems
--	const boost::filesystem::path full_path = boost::filesystem::complete(plugin_file);
-+	const boost::filesystem::path full_path = boost::filesystem::absolute(plugin_file);
- 	// NOTE: you must load shared libraries using RTLD_GLOBAL on Unix platforms
- 	// due to a bug in GCC (or Boost::any, depending on which crowd you want to believe).
- 	// see: http://svn.boost.org/trac/boost/ticket/754
--	return dlopen(full_path.file_string().c_str(), RTLD_LAZY | RTLD_GLOBAL);
-+	return dlopen(full_path.string().c_str(), RTLD_LAZY | RTLD_GLOBAL);
- #endif
- }
- 
-diff -rup pion-net-4.0.12/common/src/PionScheduler.cpp pion-net-4.0.12-new/common/src/PionScheduler.cpp
---- pion-net-4.0.12/common/src/PionScheduler.cpp	2008-11-08 00:41:17.000000000 +0100
-+++ pion-net-4.0.12-new/common/src/PionScheduler.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -102,7 +102,7 @@ boost::xtime PionScheduler::getWakeupTim
- 										  boost::uint32_t sleep_nsec)
- {
- 	boost::xtime wakeup_time;
--	boost::xtime_get(&wakeup_time, boost::TIME_UTC);
-+	boost::xtime_get(&wakeup_time, boost::TIME_UTC_);
- 	wakeup_time.sec += sleep_sec;
- 	wakeup_time.nsec += sleep_nsec;
- 	if (static_cast<boost::uint32_t>(wakeup_time.nsec) >= NSEC_IN_SECOND) {
-diff -rup pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp
---- pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp	2009-10-13 18:20:43.000000000 +0200
-+++ pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_SUITE_END()
- class Sandbox_F {
- public:
- 	Sandbox_F() {
--		m_cwd = boost::filesystem::current_path().directory_string();
-+		m_cwd = boost::filesystem::current_path().string();
- 		boost::filesystem::remove_all("sandbox");
- 		BOOST_REQUIRE(boost::filesystem::create_directory("sandbox"));
- 		BOOST_REQUIRE(boost::filesystem::create_directory("sandbox/dir1"));
-diff -rup pion-net-4.0.12/configure pion-net-4.0.12-new/configure
---- pion-net-4.0.12/configure	2012-03-24 08:00:10.000000000 +0100
-+++ pion-net-4.0.12-new/configure	2012-07-07 20:42:22.094660551 +0200
-@@ -22091,7 +22091,7 @@ fi
- 
- 
- # AC_MSG_NOTICE(Boost home directory: $BOOST_HOME_DIR)
--CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=2"
-+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=3"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- 
- # Check for Boost library extension
-@@ -22197,7 +22197,7 @@ LIBS="$LIBS_SAVED"
- BOOST_TRY_LIB=thread
- BOOST_TRY_LINK="boost_${BOOST_TRY_LIB}${BOOST_LIB_EXTENSION}"
- LIBS_SAVED="$LIBS"
--LIBS="$LIBS_SAVED -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}"
-+LIBS="$LIBS_SAVED -lboost_system -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}"
- echo "$as_me:$LINENO: checking for boost::${BOOST_TRY_LIB} library" >&5
- echo $ECHO_N "checking for boost::${BOOST_TRY_LIB} library... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-diff -rup pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp
---- pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp	2012-01-12 17:30:03.000000000 +0100
-+++ pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp	2012-07-07 20:43:34.530273709 +0200
-@@ -26,6 +26,7 @@
- #include <boost/array.hpp>
- #include <boost/function.hpp>
- #include <boost/function/function1.hpp>
-+#include <boost/system/system_error.hpp>
- #include <pion/PionConfig.hpp>
- #include <string>
- 
-diff -rup pion-net-4.0.12/net/services/FileService.cpp pion-net-4.0.12-new/net/services/FileService.cpp
---- pion-net-4.0.12/net/services/FileService.cpp	2009-08-06 20:58:13.000000000 +0200
-+++ pion-net-4.0.12-new/net/services/FileService.cpp	2012-07-07 20:42:22.097993836 +0200
-@@ -137,8 +137,8 @@ void FileService::operator()(HTTPRequest
- 
- 	// make sure that the requested file is within the configured directory
- 	file_path.normalize();
--	std::string file_string = file_path.file_string();
--	if (file_string.find(m_directory.directory_string()) != 0) {
-+	std::string file_string = file_path.string();
-+	if (file_string.find(m_directory.string()) != 0) {
- 		PION_LOG_WARN(m_logger, "Request for file outside of directory ("
- 					  << getResource() << "): " << relative_path);
- 		static const std::string FORBIDDEN_HTML_START =
-@@ -319,7 +319,7 @@ void FileService::operator()(HTTPRequest
- 						   << getResource() << "): " << relative_path);
- 
- 			// determine the MIME type
--			response_file.setMimeType(findMIMEType( response_file.getFilePath().leaf() ));
-+			response_file.setMimeType(findMIMEType( response_file.getFilePath().filename().string() ));
- 
- 			// get the file_size and last_modified timestamp
- 			response_file.update();
-@@ -597,7 +597,7 @@ void FileService::stop(void)
- void FileService::scanDirectory(const boost::filesystem::path& dir_path)
- {
- 	PION_LOG_DEBUG(m_logger, "Scanning directory (" << getResource() << "): "
--				   << dir_path.directory_string());
-+				   << dir_path.string());
- 
- 	// iterate through items in the directory
- 	boost::filesystem::directory_iterator end_itr;
-@@ -614,8 +614,8 @@ void FileService::scanDirectory(const bo
- 			// item is a regular file
- 
- 			// figure out relative path to the file
--			std::string file_path_string( itr->path().file_string() );
--			std::string relative_path( file_path_string.substr(m_directory.directory_string().size() + 1) );
-+			std::string file_path_string( itr->path().string() );
-+			std::string relative_path( file_path_string.substr(m_directory.string().size() + 1) );
- 
- 			// add item to cache (use placeholder if scan == 1)
- 			addCacheEntry(relative_path, *itr, m_scan_setting == 1);
-@@ -628,7 +628,7 @@ FileService::addCacheEntry(const std::st
- 						   const boost::filesystem::path& file_path,
- 						   const bool placeholder)
- {
--	DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.leaf()));
-+	DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.filename().string()));
- 	if (! placeholder) {
- 		cache_entry.update();
- 		// only read the file if its size is <= max_cache_size
-@@ -636,7 +636,7 @@ FileService::addCacheEntry(const std::st
- 			try { cache_entry.read(); }
- 			catch (std::exception&) {
- 				PION_LOG_ERROR(m_logger, "Unable to add file to cache: "
--							   << file_path.file_string());
-+							   << file_path.string());
- 				return std::make_pair(m_cache_map.end(), false);
- 			}
- 		}
-@@ -647,10 +647,10 @@ FileService::addCacheEntry(const std::st
- 
- 	if (add_entry_result.second) {
- 		PION_LOG_DEBUG(m_logger, "Added file to cache: "
--					   << file_path.file_string());
-+					   << file_path.string());
- 	} else {
- 		PION_LOG_ERROR(m_logger, "Unable to insert cache entry for file: "
--					   << file_path.file_string());
-+					   << file_path.string());
- 	}
- 
- 	return add_entry_result;
-@@ -713,7 +713,7 @@ void DiskFile::read(void)
- 
- 	// read the file into memory
- 	if (!file_stream.is_open() || !file_stream.read(m_file_content.get(), m_file_size))
--		throw FileService::FileReadException(m_file_path.file_string());
-+		throw FileService::FileReadException(m_file_path.string());
- }
- 
- bool DiskFile::checkUpdated(void)
-@@ -751,7 +751,7 @@ DiskFileSender::DiskFileSender(DiskFile&
- {
- 	PION_LOG_DEBUG(m_logger, "Preparing to send file"
- 				   << (m_disk_file.hasFileContent() ? " (cached): " : ": ")
--				   << m_disk_file.getFilePath().file_string());
-+				   << m_disk_file.getFilePath().string());
- 
- 		// set the Content-Type HTTP header using the file's MIME type
- 	m_writer->getResponse().setContentType(m_disk_file.getMimeType());
-@@ -795,7 +795,7 @@ void DiskFileSender::send(void)
- 			m_file_stream.open(m_disk_file.getFilePath(), std::ios::in | std::ios::binary);
- 			if (! m_file_stream.is_open()) {
- 				PION_LOG_ERROR(m_logger, "Unable to open file: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 				return;
- 			}
- 		}
-@@ -811,10 +811,10 @@ void DiskFileSender::send(void)
- 		if (! m_file_stream.read(m_content_buf.get(), m_file_bytes_to_send)) {
- 			if (m_file_stream.gcount() > 0) {
- 				PION_LOG_ERROR(m_logger, "File size inconsistency: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 			} else {
- 				PION_LOG_ERROR(m_logger, "Unable to read file: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 			}
- 			return;
- 		}
diff --git a/community-staging/pion-net/gcc_4.7_fix.diff b/community-staging/pion-net/gcc_4.7_fix.diff
deleted file mode 100644
index 5c2ed3cfe..000000000
--- a/community-staging/pion-net/gcc_4.7_fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup pion-net-4.0.12/common/include/pion/PluginManager.hpp pion-net-4.0.12-new/common/include/pion/PluginManager.hpp
---- pion-net-4.0.12/common/include/pion/PluginManager.hpp	2011-02-12 01:46:50.000000000 +0100
-+++ pion-net-4.0.12-new/common/include/pion/PluginManager.hpp	2012-07-07 16:54:22.470284487 +0200
-@@ -420,7 +420,7 @@ inline void PluginManager<PLUGIN_TYPE>::
- 				delete i->second.first;
- 			}
- 		}
--		erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(),
-+		this->erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(),
- 			  std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::end());
- 	}
- }
diff --git a/community-staging/pokerth/PKGBUILD b/community-staging/pokerth/PKGBUILD
deleted file mode 100644
index ad02ab999..000000000
--- a/community-staging/pokerth/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 73496 2012-07-08 17:05:06Z foutrelis $
-# Maintainer:  Mateusz Herych <heniekk@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Vasco Costa <vasco.costa@meiodigital.com>
-
-pkgname=pokerth
-_realname=PokerTH
-pkgver=0.9.5
-pkgrel=2
-pkgdesc="Poker game written in C++/QT4"
-arch=('i686' 'x86_64')
-url="http://www.pokerth.net/"
-license=('GPL' 'custom')
-depends=('curl' 'boost-libs' 'gsasl' 'gnutls'
-         'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
-makedepends=('boost')
-source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('4bdea98bfc142a825c64b77feb4667d0')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver-src"
-
-  sed -i '1 i #include <unistd.h>' src/third_party/qtsingleapplication/qtlocalpeer.cpp
-
-  sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp
-
-  # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms'
-  sed \
-    -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \
-    -i zlib_compress.pro pokerth_game.pro pokerth_server.pro
-
-  qmake $pkgname.pro
-  make
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver-src"
-
-  make INSTALL_ROOT="$pkgdir" install
-
-  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1"
-  install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
-  rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt"
-}
diff --git a/community-staging/polipo/PKGBUILD b/community-staging/polipo/PKGBUILD
deleted file mode 100644
index 558d0eacc..000000000
--- a/community-staging/polipo/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 72349 2012-06-12 20:25:00Z ttopper $
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-# Contributor: Jelle van der Waa <jelle vdwaa nl>
-# Contributor: Thomas Holmquist <thomas@vorget.com>
-# Contributor: Jan Boehringer <ja(a)bm-boehringer.de>
-# Contributor: Alex Griffin <griffin.aj(a)gmail.com>
-
-pkgname=polipo
-pkgver=1.0.4.1
-pkgrel=3
-pkgdesc="A small and fast caching web proxy."
-arch=('i686' 'x86_64')
-url="http://www.pps.jussieu.fr/~jch/software/polipo/"
-license=('GPL')
-depends=('bash')
-makedepends=('texinfo')
-install=polipo.install
-source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
-        "polipo.cron" "polipo.rc.d" "polipo.conf.d" "polipo.service")
-md5sums=('bfc5c85289519658280e093a270d6703'
-         'bac0e1a871964c931eb5f7a369b3243c'
-         '8f096b7d77a71e0772ce71a8c8b1b3e3'
-         '685aa0c6070dee11c701932d23afcc6a'
-         '109d0e8c15d669281ff14f8991ad0ed8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make 	PREFIX="$pkgdir/usr" \
-        MANDIR="$pkgdir/usr/share/man" \
-        INFODIR="$pkgdir/usr/share/info" \
-	LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
-	DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
-  install 
-
-
-  # install config files
-  install -Dm 644 config.sample $pkgdir/etc/polipo/config.sample
-  install -Dm 644 forbidden.sample $pkgdir/etc/polipo/forbidden.sample
-
-  # install license
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/polipo/LICENSE
-
-  # install daemon scripts / cron
-  install -Dm 755  $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo
-  install -Dm 755  $srcdir/polipo.cron $pkgdir/usr/share/polipo/polipo.cron
-  install -Dm 644  $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/polipo/polipo.conf.d b/community-staging/polipo/polipo.conf.d
deleted file mode 100644
index dc879d32b..000000000
--- a/community-staging/polipo/polipo.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to polipo
-#
-POLIPO_ARGS="daemonise=true logFile=\"/var/log/polipo.log\""
diff --git a/community-staging/polipo/polipo.cron b/community-staging/polipo/polipo.cron
deleted file mode 100644
index 8270d0a05..000000000
--- a/community-staging/polipo/polipo.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/etc/rc.d/polipo purge >/dev/null 2>&1
diff --git a/community-staging/polipo/polipo.install b/community-staging/polipo/polipo.install
deleted file mode 100644
index bacc46377..000000000
--- a/community-staging/polipo/polipo.install
+++ /dev/null
@@ -1,25 +0,0 @@
-infodir=/usr/share/info
-filelist=(polipo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-  install -d /var/cache/polipo 2> /dev/null
-  touch /var/log/polipo.log 2> /dev/null
-  chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/polipo/polipo.rc.d b/community-staging/polipo/polipo.rc.d
deleted file mode 100644
index 260fab050..000000000
--- a/community-staging/polipo/polipo.rc.d
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-daemon_name=polipo
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-	start)
-		stat_busy "Starting $daemon_name daemon"
-
-		PID=$(get_pid)
-		if [[ -z $PID ]]; then
-			[[ -f /run/$daemon_name.pid ]] &&
-				rm -f /run/$daemon_name.pid
-		# RUN
-		sudo -u nobody /usr/bin/$daemon_name ${POLIPO_ARGS}
-		#
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-			exit 1
-		else
-			echo $(get_pid) > /run/$daemon_name.pid
-			add_daemon $daemon_name
-			stat_done
-		fi
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-
-	stop)
-		stat_busy "Stopping $daemon_name daemon"
-		PID=$(get_pid)
-		# KILL
-		[[ -n $PID ]] && kill $PID &> /dev/null
-		#
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-			exit 1
-		else
-			rm -f /run/$daemon_name.pid &> /dev/null
-			rm_daemon $daemon_name
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 3
-		$0 start
-		;;
-
-	status)
-		stat_busy "Checking $daemon_name status";
-		ck_status $daemon_name
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/polipo/polipo.service b/community-staging/polipo/polipo.service
deleted file mode 100644
index a1bdd9aa2..000000000
--- a/community-staging/polipo/polipo.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Polipo Proxy Server
-
-[Service]
-ExecStart=/usr/bin/polipo
-User=nobody
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-staging/projectm/PKGBUILD b/community-staging/projectm/PKGBUILD
deleted file mode 100644
index 8116c5f2b..000000000
--- a/community-staging/projectm/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 78506 2012-10-20 02:05:41Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgbase=projectm
-pkgname=('projectm' 'libvisual-projectm')
-pkgver=2.1.0
-pkgrel=2
-arch=('x86_64' 'i686')
-url='http://projectm.sourceforge.net/'
-license=('LGPL')
-makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext')
-source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz")
-sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee')
-
-build() {
-  cd $srcdir/projectM-complete-$pkgver-Source/src
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \
-    -DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF
-  make
-}
-
-package_projectm() {
-  pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
-  depends=('ftgl' 'glew' 'gtkglext')
-
-  cd $srcdir/projectM-complete-$pkgver-Source/src/libprojectM
-  make DESTDIR=$pkgdir install
-  install -m644 fonts/Vera.ttf $pkgdir/usr/share/projectM/fonts/Vera.ttf
-}
-
-package_libvisual-projectm() {
-  pkgdesc='ProjectM XMMS plugin'
-  depends=("projectm>=$pkgver" 'libvisual' 'sdl')
-
-  cd $srcdir/projectM-complete-$pkgver-Source/src/projectM-libvisual
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/projectm/libprojectM-2.0.1-fix-linking.patch b/community-staging/projectm/libprojectM-2.0.1-fix-linking.patch
deleted file mode 100644
index 23d8a7b9a..000000000
--- a/community-staging/projectm/libprojectM-2.0.1-fix-linking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
-+++ b/CMakeLists.txt	2012-02-23 04:30:51.000000000 +0100
-@@ -177,10 +177,10 @@
- LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
- 
- if(BUILD_PROJECTM_STATIC)
--		TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+		TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES})
- else(BUILD_PROJECTM_STATIC)
- 
--TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} )
- 
- endif(BUILD_PROJECTM_STATIC)
- 
---- a/Renderer/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
-+++ b/Renderer/CMakeLists.txt	2012-02-23 04:31:58.000000000 +0100
-@@ -13,4 +13,4 @@
- INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
- ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
- SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)
--TARGET_LINK_LIBRARIES(Renderer m)
-+TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES})
diff --git a/community-staging/projectm/libprojectM-2.0.1-pkg-config.patch b/community-staging/projectm/libprojectM-2.0.1-pkg-config.patch
deleted file mode 100644
index b5e38205a..000000000
--- a/community-staging/projectm/libprojectM-2.0.1-pkg-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libprojectM.pc.in	2009-12-06 02:42:51.000000000 +0100
-+++ b/libprojectM.pc.in	2012-02-21 16:48:36.000000000 +0100
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_PREFIX@/lib
- includedir=@CMAKE_INSTALL_PREFIX@/include
- pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
- sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
diff --git a/community-staging/prosody/ChangeLog b/community-staging/prosody/ChangeLog
deleted file mode 100644
index 45f3a05fd..000000000
--- a/community-staging/prosody/ChangeLog
+++ /dev/null
@@ -1,398 +0,0 @@
-2009-11-23  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.6.0-1 for changeset 6c5b7e66bee4
-	[d573d1d7a403] [tip]
-
-	* .hgtags:
-	Removed tag v0.6.0-1
-	[6c5b7e66bee4] [v0.6.0-1]
-
-	* PKGBUILD:
-	Use correct package name and version
-	[1e65e6a877d3]
-
-	* .hgtags:
-	Added tag v0.6.0-1 for changeset ad52fee15148
-	[8196689dd4c4]
-
-	* PKGBUILD, prosody.cfg.lua:
-	Included mod_compression in example configuration file
-	[ad52fee15148]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[34b6046aca14]
-
-	* PKGBUILD:
-	Updated checksums
-	[3b4c28f28321]
-
-	* PKGBUILD, prosody.cfg.lua:
-	New upstream version
-	[9d201755b63d]
-
-2009-10-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.6.0rc1-1 for changeset c0a99ab935a8
-	[a0e2015435b6]
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[c0a99ab935a8] [v0.6.0rc1-1]
-
-	* PKGBUILD:
-	Removed conflicts
-	[0f0560190a81]
-
-	* PKGBUILD:
-	Removed makedepends for gcc, the base-devel group is assumed to
-	exist
-	[4160ed469fa4]
-
-	* PKGBUILD:
-	Fix typo in PKGBUILD
-	[85d988c7e4a5]
-
-2009-09-28  Dwayne Bent  <dbb.0@liqd.org>
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[3e4ffcdc887a]
-
-2009-07-29  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.5.1-1 for changeset 1be51884e580
-	[74f32914279c]
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[1be51884e580] [v0.5.1-1]
-
-2009-07-20  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Corrected tag name
-	[d9662df69ab4]
-
-	* .hgtags:
-	Added tag v0.5.0 for changeset d228983b5873
-	[a350368643eb]
-
-	* PKGBUILD:
-	New upstream version
-	[d228983b5873] [v0.5.0-1]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[111cf16bfc8b]
-
-2009-07-14  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.5.0rc2-1 for changeset 701e6c5ed639
-	[828bb0fc4e5e]
-
-	* PKGBUILD:
-	New upstream version
-	[701e6c5ed639] [v0.5.0rc2-1]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[7616eaf8b835]
-
-	* prosody.cfg.lua:
-	Enabled PEP in default configuration
-	[c8a7c4d15e38]
-
-2009-07-11  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Cleaned up and added new modules to default configuration file
-	[07fdc8fd8ff9]
-
-	* PKGBUILD:
-	Added luasec back as hard dependency
-	[9506bff48c77]
-
-	* .hgtags:
-	Added tag v0.5.0rc1-2 for changeset a252809a03a3
-	[803ace20879a]
-
-	* ChangeLog, PKGBUILD:
-	New release version
-	[a252809a03a3] [v0.5.0rc1-2]
-
-	* PKGBUILD:
-	Added make before make install
-
-	This should fix Prosody not correctly reporting version.
-	[881eca5b8e0e]
-
-	* .hgtags:
-	Added tag v0.5.0rc1-1 for changeset f1d918d4779e
-	[1fc8dbc498d5]
-
-	* ChangeLog:
-	New upstream version
-	[f1d918d4779e] [v0.5.0rc1-1]
-
-	* PKGBUILD, prosody.rcd:
-	Redid indent alignment and silenced successful output of prosodyctl
-	[de9bdd756bd8]
-
-	* PKGBUILD, prosody-datadir.diff:
-	Converted to prosody-devel package
-	[92e5e98529dd]
-
-2009-06-30  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD, prosody.cfg.lua:
-	Moved luasec from depends to optdepends
-
-	Since luasec is not strictly required for Prosody to operate it is
-	now an optional dependency.
-	[7079ec87eef5]
-
-2009-06-27  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-4 for changeset 0345a59e8495
-	[1e488e1c03eb]
-
-	* PKGBUILD:
-	New release version
-	[0345a59e8495] [v0.4.2-4]
-
-	* prosody.install:
-	Added note about ChangeLog to install script
-	[c683ef309b6a]
-
-	* PKGBUILD, prosody.rcd:
-	Use prosodyctl to start/stop daemon
-	[eaf4c26bb29f]
-
-	* PKGBUILD, prosody.rcd:
-	Refactored start, stop, reload in rc.d script
-
-	Start, stop, reload will not display a friendly error message if
-	Prosody is not running when you attempt to stop or reload, or if
-	Prosody is already running when you attempt to start. Reload also
-	now utilizes the get_pid function.
-	[9873d5256a42]
-
-	* PKGBUILD, prosody.logrotated:
-	Use explicit log filenames in logrotate script
-
-	This fixes an issue where if you do not have olddir enabled, rotated
-	logs will be rotated again.
-	[38ea11efacb9]
-
-2009-06-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD, prosody.rcd:
-	Added status command to rc.d usage
-	[1b31e88d992d]
-
-	* PKGBUILD, prosody.rcd:
-	Added reload command
-	[62e3cbdff1d5]
-
-	* prosody.install:
-	Updated leftover olddir path
-	[e91b3fc2a9ee]
-
-	* PKGBUILD, prosody.rcd:
-	Use explicit source command
-	[b790c098d519]
-
-	* prosody.install:
-	Removed tab characters
-	[870316274137]
-
-2009-06-20  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD:
-	Updated md5 sums
-	[74ce2ab8a96b]
-
-	* prosody.logrotated:
-	Changed default olddir path
-	[cef8226473c2]
-
-	* prosody.rcd:
-	Removed sleep delay in restart
-	[a94167e59091]
-
-2009-06-10  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Removed per-host certificate entry in example configuration
-
-	Until Issue #30
-	[http://code.google.com/p/lxmppd/issues/detail?id=30] is fixed per-
-	host certificates have no effect.
-	[d00e35979450]
-
-2009-06-05  Dwayne Bent  <dbb.0@liqd.org>
-
-	* ChangeLog:
-	Added ChangeLog
-	[7298c4da135a]
-
-2009-06-03  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-3 for changeset 028183ffeba8
-	[7dbfd040e908]
-
-	* PKGBUILD:
-	New release version
-	[028183ffeba8] [v0.4.2-3]
-
-	* PKGBUILD:
-	Removed superfluous make command
-	[3d96c98bac26]
-
-	* PKGBUILD:
-	More consistent use of quote marks
-	[f6bd5b595b2d]
-
-	* PKGBUILD, prosody.logrotated:
-	Correct PID file location in logrotate script
-	[cec60904c739]
-
-2009-05-30  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-2 for changeset 37268dd0d4fd
-	[a8a197635bb6]
-
-	* PKGBUILD:
-	New release version
-	[37268dd0d4fd] [v0.4.2-2]
-
-	* PKGBUILD:
-	Use install instead of mkdir in PKGBUILD
-	[8e48108bbe9a]
-
-	* PKGBUILD, prosody-datadir.diff:
-	Apply patch to fix world-readable data directory
-	[2c706dda941c]
-
-2009-05-23  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-1 for changeset 1d29ea2dc519
-	[e2d2962de3f7]
-
-	* PKGBUILD:
-	New upstream release
-	[1d29ea2dc519] [v0.4.2-1]
-
-	* prosody.cfg.lua:
-	Aesthetic changes to the configuration file
-	[d5d848a58965]
-
-2009-05-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Removed extraneous semicolon in configuration file
-	[9a002c74edc2]
-
-	* PKGBUILD:
-	Cleaned up PKGBUILD license
-	[82cb66a84de8]
-
-2009-05-21  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.install:
-	Changed formatting of leftover path messages.
-	[ac6069de93c9]
-
-	* prosody.install:
-	Moved prosody user removal to post_remove.
-	[2c60e27d0c13]
-
-	* PKGBUILD, prosody.cfg.lua:
-	Added comment about pidfile in prosody configuration file.
-	[8b9fa4da48ca]
-
-	* .hgtags:
-	Added tag v0.4.1-5 for changeset 69962178bcae
-	[01812099521b]
-
-	* PKGBUILD:
-	New release version.
-	[69962178bcae] [v0.4.1-5]
-
-	* PKGBUILD, prosody.cfg.lua, prosody.install, prosody.rcd:
-	Refactored rc.d daemon script.
-
-	Prosody now writes its own PID file to /var/run/prosody/prosody.pid.
-	rc.d script now uses '/bin/kill -0' to check for running process
-	instead of awkward combination of 'ps' and 'awk'.
-	[4f0e937c5148]
-
-	* prosody.install:
-	Added post_install message with link to Arch Wiki documentation.
-	[88d99267ad19]
-
-2009-05-19  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD:
-	Add logrotate script to backup array.
-	[d4f5445707f7]
-
-2009-05-11  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.install:
-	Fixed install script attempting to add prosody group when it already
-	exists.
-	[7d7807aa5d30]
-
-	* .hgtags:
-	Added tag v0.4.1-4 for changeset 442f62077f30
-	[389c885a35c5]
-
-	* PKGBUILD:
-	New release version.
-	[442f62077f30] [v0.4.1-4]
-
-	* PKGBUILD:
-	Generated correct checksums for source files.
-	[162859c9e287]
-
-	* .hgtags:
-	Added tag v0.4.1-3 for changeset b629392e4716
-	[f3d11fbd0b45]
-
-	* PKGBUILD:
-	New release version.
-	[b629392e4716] [v0.4.1-3]
-
-	* prosody.logrotated:
-	Fixed wrong PID file path in logrotate script.
-	[0871a4a12392]
-
-2009-05-07  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua, prosody.rcd:
-	Removed trailing whitespace.
-	[7c86c073650e]
-
-	* prosody.cfg.lua:
-	Added logging timestamps to default configuration.
-	[46f9111d47ce]
-
-	* .hgtags:
-	Added tag v0.4.1-2 for changeset 24b9dee19e65
-	[5240b39d76d7]
-
-	* PKGBUILD, prosody.cfg.lua, prosody.install, prosody.logrotated,
-	prosody.rcd:
-	Initial commit.
-	[24b9dee19e65] [v0.4.1-2]
-
diff --git a/community-staging/prosody/PKGBUILD b/community-staging/prosody/PKGBUILD
deleted file mode 100644
index 09eb15073..000000000
--- a/community-staging/prosody/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 72153 2012-06-09 06:05:00Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Dwayne Bent <dbb.0@liqd.org>
-# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
-
-pkgname=prosody
-pkgver=0.8.2
-pkgrel=4
-pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
-arch=('i686' 'x86_64')
-url="http://prosody.im/"
-license=('MIT')
-depends=('lua>=5.1' 'luasocket' 'luaexpat' 'luafilesystem' 'libidn>=0.5.18' 'openssl')
-optdepends=('luasec: TLS encryption support'
-	    'lua-zlib: compression support'
-	    'luadbi: SQL storage support')
-install=prosody.install
-backup=('etc/logrotate.d/prosody'
-	'etc/prosody/prosody.cfg.lua')
-source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz"
-	'prosody.rcd'
-	'prosody.logrotated'
-	'fix-config.patch'
-	'prosody.tmpfile.d'
-	'prosody.service')
-md5sums=('6e907bf0d0acf24f1011083020ba6ffb'
-         'd2b5f9c8e42bb31819e715eb1756ee53'
-         '26466fdbea87963a3ca6f48f76fe4a29'
-         '59a1bf2dfd0bd386cef6fa646e2a3752'
-         'e2f5a1df410b05696a30dcb058841084'
-         'e74045f27cb60908d535969906781f75')
-
-build() {
-    cd "$srcdir/prosody-$pkgver"
-    patch -p1 <$srcdir/fix-config.patch
-    ./configure --prefix=/usr --sysconfdir=/etc/prosody \
-        --datadir=/var/lib/prosody
-    make
-}
-
-package() {
-    cd "$srcdir/prosody-$pkgver"
-
-    make DESTDIR="$pkgdir" install
-
-    rm $pkgdir/etc/prosody/certs/*
-
-    install -d "$pkgdir/etc/rc.d"
-    install -d "$pkgdir/etc/logrotate.d"
-    install -d "$pkgdir/var/log/prosody"
-
-    install -o root -g root -m 755 "$srcdir/prosody.rcd" \
-        "$pkgdir/etc/rc.d/prosody"
-    install -o root -g root -m 644 "$srcdir/prosody.logrotated" \
-        "$pkgdir/etc/logrotate.d/prosody"
-
-    install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-    install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf
-    install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service
-}
diff --git a/community-staging/prosody/fix-config.patch b/community-staging/prosody/fix-config.patch
deleted file mode 100644
index 8856bfb92..000000000
--- a/community-staging/prosody/fix-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -wbBur prosody-0.8.0/prosody.cfg.lua.dist prosody-0.8.0.my/prosody.cfg.lua.dist
---- prosody-0.8.0/prosody.cfg.lua.dist	2011-04-05 13:47:06.000000000 +0000
-+++ prosody-0.8.0.my/prosody.cfg.lua.dist	2011-04-07 16:03:42.000000000 +0000
-@@ -21,6 +21,8 @@
- -- (see http://prosody.im/doc/creating_accounts for info)
- -- Example: admins = { "user1@example.com", "user2@example.net" }
- admins = { }
-+daemonize = true
-+pidfile = "/var/run/prosody/prosody.pid"
- 
- -- Enable use of libevent for better performance under high load
- -- For more information see: http://prosody.im/doc/libevent
-@@ -59,7 +61,7 @@
- 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
- 
- 	-- Other specific functionality
--		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
- 		--"httpserver"; -- Serve static files from a directory over HTTP
- 		--"groups"; -- Shared roster support
-@@ -123,8 +125,8 @@
- -- Logging configuration
- -- For advanced logging see http://prosody.im/doc/logging
- log = {
--	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
--	error = "prosody.err";
-+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-+	error = "/var/log/prosody/prosody.err";
- 	-- "*syslog"; -- Uncomment this for logging to syslog
- 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
- }
diff --git a/community-staging/prosody/prosody.install b/community-staging/prosody/prosody.install
deleted file mode 100644
index f935e3d63..000000000
--- a/community-staging/prosody/prosody.install
+++ /dev/null
@@ -1,35 +0,0 @@
-post_install() {
-    if [ -z "`grep '^prosody:' /etc/group`" ]; then
-        groupadd -g 412 prosody
-    fi
-    if [ -z "`grep '^prosody:' /etc/passwd`" ]; then
-        useradd -u 412 -d /var/lib/prosody -g prosody -s /bin/false prosody
-    fi
-
-    chown prosody:prosody var/lib/prosody
-    chown prosody:prosody var/log/prosody
-
-    echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody"
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    userdel prosody
-
-    paths=(/etc/prosody /var/lib/prosody /var/log/prosody
-           /var/log/old/prosody)
-
-    first=true
-    for path in ${paths[@]}; do
-        if [ -d $path ]; then
-            if $first; then
-                first=false
-                echo "==> Leftover Paths:"
-            fi
-            echo "==> $path"
-        fi
-    done
-}
diff --git a/community-staging/prosody/prosody.logrotated b/community-staging/prosody/prosody.logrotated
deleted file mode 100644
index 5659ba01f..000000000
--- a/community-staging/prosody/prosody.logrotated
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/prosody/prosody.log /var/log/prosody/prosody.err {
-    # olddir /var/log/old/prosody
-    create 644 prosody prosody
-    sharedscripts
-    missingok
-    postrotate
-        /bin/kill -HUP `cat /var/run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true
-    endscript
-}
diff --git a/community-staging/prosody/prosody.rcd b/community-staging/prosody/prosody.rcd
deleted file mode 100644
index afaf77903..000000000
--- a/community-staging/prosody/prosody.rcd
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-daemon_name=prosody
-pid_file=/var/run/$daemon_name/$daemon_name.pid
-
-source /etc/rc.conf
-source /etc/rc.d/functions
-
-get_pid() {
-    if [ -f $pid_file ]; then
-        /bin/kill -0 $(cat $pid_file)
-        if [ $? == 0 ]; then
-            cat $pid_file
-        fi
-    fi
-}
-
-case "$1" in
-    start)
-        stat_busy "Starting $daemon_name daemon"
-
-        [ -d /var/run/$daemon_name ] || { mkdir -p /var/run/$daemon_name ; chown prosody:prosody /var/run/prosody; }
-        PID=$(get_pid)
-        if [ -z "$PID" ]; then
-            [ -f $pid_file ] && rm -f $pid_file
-            mkdir -p `dirname $pid_file`
-            prosodyctl start 1>/dev/null 2>/dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                add_daemon $daemon_name
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is already running"
-            exit 1
-        fi
-        ;;
-
-    stop)
-        stat_busy "Stopping $daemon_name daemon"
-        PID=$(get_pid)
-        if [ ! -z "$PID" ]; then
-            prosodyctl stop 1>/dev/null 2>/dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                rm -f $pid_file &> /dev/null
-                rm_daemon $daemon_name
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is not running"
-            exit 1
-        fi
-        ;;
-
-    restart)
-        $0 stop
-        $0 start
-        ;;
-
-    reload)
-        stat_busy "Reloading $daemon_name"
-        PID=$(get_pid)
-        if [ ! -z "$PID" ]; then
-            /bin/kill -HUP $PID 2> /dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is not running"
-        fi
-        ;;
-
-    status)
-        stat_busy "Checking $daemon_name status";
-        ck_status $daemon_name
-        ;;
-
-    *)
-        echo "usage: $0 {start|stop|restart|reload|status}"
-    esac
-
-exit 0
diff --git a/community-staging/prosody/prosody.service b/community-staging/prosody/prosody.service
deleted file mode 100644
index f54159f55..000000000
--- a/community-staging/prosody/prosody.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=XMPP (Jabber) Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/prosody/prosody.pid
-ExecStart=/usr/bin/prosodyctl start
-ExecStop=/usr/bin/prosodyctl stop
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/community-staging/prosody/prosody.tmpfile.d b/community-staging/prosody/prosody.tmpfile.d
deleted file mode 100644
index 5f6de657d..000000000
--- a/community-staging/prosody/prosody.tmpfile.d
+++ /dev/null
@@ -1 +0,0 @@
-d    /run/prosody 0755 412 412
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 1f83cd005..000000000
--- a/community-staging/python-bsddb/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 77787 2012-10-14 18:15:13Z stephane $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Maintainer: 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.3.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
-        LICENSE)
-sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915'
-          'ef4e4caf618781104dbf5824279ed39d127b4713')
-
-build () {
-  cd "${srcdir}"
-
-  cp -r bsddb3-${pkgver}{,-python2}
-
-  # Build python 3 module
-  cd bsddb3-${pkgver}
-  python3 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.3')
-  cd "${srcdir}/bsddb3-${pkgver}"
-
-  python3 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-gnupginterface/PKGBUILD b/community-staging/python-gnupginterface/PKGBUILD
deleted file mode 100644
index 33446e9b3..000000000
--- a/community-staging/python-gnupginterface/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Aaron Schaefer <aaron@elasticdog.com>
-
-pkgbase=python-gnupginterface
-pkgname=python2-gnupginterface
-pkgver=0.3.2
-pkgrel=1
-pkgdesc='A Python interface to GNU Privacy Guard (GnuPG).'
-arch=('i686' 'x86_64')
-url='http://py-gnupg.sourceforge.net/'
-license=('GPL')
-depends=('gnupg' 'python2')
-conflicts=('python-gnupginterface<=0.3.2-6')
-replaces=('python-gnupginterface<=0.3.2-6')
-source=("http://downloads.sourceforge.net/sourceforge/py-gnupg/GnuPGInterface-$pkgver.tar.gz")
-md5sums=('d4627d83446f96bd8c22f8d15db3f7c2')
-
-package_python2-gnupginterface() {
-  cd "$srcdir/GnuPGInterface-$pkgver"
-  python2 setup.py install --root="$pkgdir" -O1
-}
diff --git a/community-staging/python-mpi4py/PKGBUILD b/community-staging/python-mpi4py/PKGBUILD
deleted file mode 100644
index 5352cf41c..000000000
--- a/community-staging/python-mpi4py/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 76992 2012-10-03 00:59:14Z stephane $
-# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Sebastien Binet <binet@cern.ch>
-
-pkgbase=python-mpi4py
-pkgname=('python-mpi4py' 'python2-mpi4py')
-pkgver=1.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://mpi4py.scipy.org"
-license=('BSD')
-makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'openmpi')
-source=(http://mpi4py.googlecode.com/files/mpi4py-${pkgver}.tar.gz)
-sha1sums=('282c1b9e35b242c9bd86126ebc5af6c70d8c2833')
-
-build() {
-    cd "${srcdir}"
-    cp -a mpi4py-${pkgver}{,-python2}
-
-    # Build python 3 module
-    cd mpi4py-${pkgver}
-    python3 setup.py build
-
-    # Build python 2 module
-    cd ../mpi4py-${pkgver}-python2
-    python2 setup.py build
-}
-
-package_python-mpi4py() {
-    pkgdesc="Python bindings of the Message Passing Interface (MPI)"
-    depends=('python>=3.3' 'openmpi')
-
-    cd "${srcdir}/mpi4py-${pkgver}"
-    python3 setup.py install --root "${pkgdir}" --optimize=1 --skip-build 
-}
-
-package_python2-mpi4py() {
-    pkgdesc="Python2 bindings of the Message Passing Interface (MPI)"
-    depends=('python2>=2.7' 'openmpi')
-
-    cd "${srcdir}/mpi4py-${pkgver}-python2"
-    python2 setup.py install --root "${pkgdir}" --optimize=1 --skip-build 
-}
diff --git a/community-staging/python-numarray/LICENSE b/community-staging/python-numarray/LICENSE
deleted file mode 100644
index 30ff57fc4..000000000
--- a/community-staging/python-numarray/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (C) 2005 Association of Universities for Research in Astronomy (AURA)
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-3. The name of AURA and its representatives may not be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/community-staging/python-numarray/PKGBUILD b/community-staging/python-numarray/PKGBUILD
deleted file mode 100644
index 813d2a700..000000000
--- a/community-staging/python-numarray/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 77974 2012-10-16 01:49:29Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgbase=python-numarray
-pkgname=python2-numarray
-pkgver=1.5.2
-pkgrel=6
-pkgdesc='Provides array manipulation and computational capabilities.'
-arch=('i686' 'x86_64')
-url='http://numpy.scipy.org/'
-license=('BSD')
-depends=('python2')
-conflicts=('python2-numarray<=1.5.2-6')
-replaces=('python2-numarray<=1.5.2-6')
-source=("http://downloads.sourceforge.net/sourceforge/numpy/numarray-${pkgver}.tar.gz"
-        'LICENSE')
-md5sums=('d2ecfc60fe4869c328b872540d04e0f7'
-         'e32b4466453e530d7fb0dbeee0ca1044')
-
-build() {
-  cd "${srcdir}/numarray-${pkgver}"
-
-  # python2 fix
-  sed -i 's_#! /usr/bin/env python_#! /usr/bin/env python2_' Examples/convolve/benchmark.py
-}
-
-package_python2-numarray() {
-  cd "${srcdir}/numarray-${pkgver}"
-
-  python2 setup.py install --root="${pkgdir}"
-  install -D ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-staging/python-openbabel/PKGBUILD b/community-staging/python-openbabel/PKGBUILD
deleted file mode 100644
index 1c229f553..000000000
--- a/community-staging/python-openbabel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 77768 2012-10-14 16:13:27Z ebelanger $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Michal Bozon <bozonm@vscht.cz>
-
-pkgname=python-openbabel
-pkgver=2.3.1
-pkgrel=3
-pkgdesc="Python bindings of openbabel library"
-arch=('i686' 'x86_64')
-url="http://openbabel.org/wiki/Python"
-license=('GPL')
-depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2')
-makedepends=('swig' 'cmake')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz)
-md5sums=('1f029b0add12a3b55582dc2c832b04f8')
-
-build() {
-  cd "${srcdir}/openbabel-$pkgver"
-  
-  # Create babelconfig.h
-  cmake .
-
-  # Regenerate interface with the patched swig 2.0.2
-  cd scripts
-  swig -I../include/ -python -py3 -c++  openbabel-python.i
-  mv openbabel-python_wrap.cxx python/openbabel-python.cpp
-  mv openbabel.py python/
-
-  cd python
-  sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py
-  sed -i '20i os.path.join("/usr/include/eigen2"),'        setup.py
-}
-
-package() {
-  cd "${srcdir}/openbabel-$pkgver/scripts/python"
-  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-}
diff --git a/community-staging/python-psutil/PKGBUILD b/community-staging/python-psutil/PKGBUILD
deleted file mode 100644
index 07f0cc833..000000000
--- a/community-staging/python-psutil/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 76777 2012-09-29 19:21:47Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgbase=python-psutil
-pkgname=('python-psutil' 'python2-psutil')
-pkgver=0.6.1
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://code.google.com/p/psutil/'
-license=('custom: BSD')
-makedepends=('python' 'python-distribute' 'python2' 'python2-distribute')
-source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") 
-sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86')
-
-build() {
-  cd psutil-$pkgver
-  python setup.py build --build-lib=build/python
-  python2 setup.py build --build-lib=build/python2
-  find build/python2 -type f -exec \
-    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
-}
-
-package_python-psutil() {
-  pkgdesc='A cross-platform process and system utilities module for Python'
-  depends=('glibc' 'python')
-
-  cd psutil-$pkgver
-  python setup.py build --build-lib=build/python \
-                  install --root="$pkgdir" --optimize=1
-  install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python2-psutil() {
-  pkgdesc='A cross-platform process and system utilities module for Python2'
-  depends=('glibc' 'python2')
-
-  cd psutil-$pkgver
-  python2 setup.py build --build-lib=build/python2 \
-                   install --root="$pkgdir" --optimize=1
-  install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-staging/python-psycopg1/PKGBUILD b/community-staging/python-psycopg1/PKGBUILD
deleted file mode 100644
index be5d7e8c2..000000000
--- a/community-staging/python-psycopg1/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 77980 2012-10-16 02:05:02Z allan $
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-psycopg1
-pkgname=python2-psycopg1
-pkgver=1.1.21
-pkgrel=8
-pkgdesc="A PostgreSQL database adapter for Python"
-arch=('i686' 'x86_64')
-url="http://initd.org/projects/psycopg1"
-license=('GPL')
-depends=('python2-egenix-mx-base' 'postgresql')
-conflicts=('python-psycopg1<=1.1.21-7')
-replaces=('python-psycopg1<=1.1.21-7')
-source=(http://initd.org/psycopg/tarballs/PSYCOPG-1-1/psycopg-$pkgver.tar.gz)
-md5sums=('a31f79f68d6d32898d6f24e11369a106')
-sha1sums=('02d8a8b5dd682306117896c7c63a9a1b518997b6')
-
-build() {
-  cd "$srcdir/psycopg-$pkgver"
-
-  ./configure --prefix=/usr --with-python=/usr/bin/python2 \
-              --with-mxdatetime-includes=/usr/lib/python2.7/site-packages/mx/DateTime/mxDateTime
-  sed -e 's:\(echo "  install -m 555 $$mod \)\($(PY_MOD_DIR)\)\("; \\\):\1${DESTDIR}\2/$$mod\3:' \
-		-e 's:\($(INSTALL)  -m 555 $$mod \)\($(PY_MOD_DIR)\)\(; \\\):\1${DESTDIR}\2/$$mod\3:' \
-		-i Makefile
-  make
-}
-
-package_python2-psycopg1() {
-  cd "$srcdir/psycopg-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/python-psycopg2/ChangeLog b/community-staging/python-psycopg2/ChangeLog
deleted file mode 100644
index f31be0aaa..000000000
--- a/community-staging/python-psycopg2/ChangeLog
+++ /dev/null
@@ -1,25 +0,0 @@
-
-2009-08-05  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated to: 2.0.11
-
-2009-03-24  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.0.9
-
-2009-01-11  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Rebuilt for python 2.6
-
-2008-04-25  Mateusz Herych <heniekk@gmail.com>
-
-	* Built for x86_64 - 2.0.7
-
-2008-04-23  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Built for i686 - 2.0.7
-
-2007-06-27  tardo  <tardo@nagi-fanboi.net>
-	
-	* Built for x86_64
-
diff --git a/community-staging/python-psycopg2/PKGBUILD b/community-staging/python-psycopg2/PKGBUILD
deleted file mode 100644
index 88b74f129..000000000
--- a/community-staging/python-psycopg2/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 77314 2012-10-08 16:12:05Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgbase=python-psycopg2
-pkgname=('python-psycopg2' 'python2-psycopg2')
-pkgver=2.4.5
-pkgrel=2
-pkgdesc="A PostgreSQL database adapter for the Python programming language."
-arch=('i686' 'x86_64')
-url="http://initd.org/psycopg/"
-license=('LGPL3')
-makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
-source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz)
-md5sums=('075e4df465e9a863f288d5bdf6e6887e')
-
-build() {
-  cd "$srcdir/psycopg2-$pkgver"
-  sed -i 's/,PSYCOPG_DEBUG$//' setup.cfg
-}
-
-package_python-psycopg2() {
-  depends=('python' 'postgresql-libs>=8.4.1')
-
-  cd "$srcdir/psycopg2-$pkgver"
-  python setup.py install --root="$pkgdir"
-}
-
-package_python2-psycopg2() {
-  depends=('python2' 'postgresql-libs>=8.4.1')
-
-  cd "$srcdir/psycopg2-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-}
diff --git a/community-staging/python-pymongo/PKGBUILD b/community-staging/python-pymongo/PKGBUILD
deleted file mode 100644
index 91df7cb6a..000000000
--- a/community-staging/python-pymongo/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 77784 2012-10-14 18:11:53Z jelle $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Thomas S Hatch <thatch45@gmail.com>
-
-pkgbase=python-pymongo
-pkgname=('python-pymongo' 'python2-pymongo')
-pkgver=2.3
-pkgrel=2
-pkgdesc='Python driver for MongoDB'
-arch=('x86_64' 'i686')
-license=('APACHE')
-url='http://pypi.python.org/pypi/pymongo/'
-makedepends=('python-distribute' 'python2-distribute')
-source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc')
-
-build() {
-  cd "$srcdir" 
-  cp -a "pymongo-$pkgver" "pymongo2-$pkgver"
-
-}
-
-package_python2-pymongo() {
-  depends=('python2')
-  cd "$srcdir/pymongo2-$pkgver"
-
-  python2 setup.py install --root="$pkgdir" --optimize=1
-}
-
-package_python-pymongo() {
-  depends=('python')
-
-  cd "$srcdir/pymongo-$pkgver"
-
-  python setup.py install --root="$pkgdir" --optimize=1
-}
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/python-pyproj/PKGBUILD b/community-staging/python-pyproj/PKGBUILD
deleted file mode 100644
index d52a59c80..000000000
--- a/community-staging/python-pyproj/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 76990 2012-10-03 00:51:46Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgbase=python-pyproj
-pkgname=('python-pyproj' 'python2-pyproj')
-pkgver=1.9.2
-pkgrel=1
-pkgdesc="Python interfaces to PROJ.4 library"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pyproj"
-license=('custom')
-source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz)
-makedepends=('python' 'python2')
-sha1sums=('a7a4bf95f3492e45704bccd4aeafe3bbe32fb023')
-
-build() {
-   cd "${srcdir}"
-
-   cp -a pyproj-${pkgver}{,-python2}
-
-   # Build python 3 module
-   cd pyproj-${pkgver}
-   python3 setup.py build
-
-   # Build python 2 module
-   cd ../pyproj-${pkgver}-python2
-   python2 setup.py build
-}
-
-package_python-pyproj() {
-   depends=('proj' 'python>=3.3')
-
-   cd "${srcdir}"/pyproj-${pkgver}
-   python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-   install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
-   install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python2-pyproj() {
-   depends=('proj' 'python2>=2.7')
-   replaces=('pyproj')
-
-   cd "${srcdir}"/pyproj-${pkgver}-python2
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-   install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
-   install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-staging/python-pyxattr/PKGBUILD b/community-staging/python-pyxattr/PKGBUILD
deleted file mode 100644
index b2a40177d..000000000
--- a/community-staging/python-pyxattr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 77978 2012-10-16 01:55:36Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Jon Bergli Heier <snakebite@jvnv.net>
-
-pkgname=('python2-pyxattr' 'python-pyxattr')
-pkgbase=python-pyxattr
-_pkgname=pyxattr
-pkgver=0.5.0
-pkgrel=4
-pkgdesc='A python extension module that allows you to manipulate the extended attributes.'
-arch=('i686' 'x86_64')
-url='http://pyxattr.sourceforge.net/'
-license=('GPL')
-makedepends=('python2' 'python' 'python2-distribute' 'python-distribute')
-source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('0f7ab1e185087329e40f7de218517c84')
-
-package_python2-pyxattr() {
-  depends=('python2')
-  provides=('pyxattr')
-  conflicts=('pyxattr')
-  replaces=('pyxattr')
-
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}"
-}
-
-package_python-pyxattr() {
-  depends=('python')
-
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}"
-}
diff --git a/community-staging/python-pyzmq/PKGBUILD b/community-staging/python-pyzmq/PKGBUILD
deleted file mode 100644
index e771c2ad5..000000000
--- a/community-staging/python-pyzmq/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 77143 2012-10-05 13:37:01Z kkeen $
-# Maintainer: Kyle Keen <keenerd at gmail dot com>
-pkgname=python-pyzmq
-pkgver=2.2.0.1
-pkgrel=2
-pkgdesc="Python3 bindings for zeromq, written in Cython"
-arch=(i686 x86_64)
-url="http://www.zeromq.org/bindings:python"
-license=('LGPL')
-depends=(zeromq python)
-source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
-md5sums=('f2f80709e84c8ac72d6671eee645d804')
-
-build() {
-  cd "$srcdir/pyzmq-$pkgver"
-  # py3 errors added in 2.2.0.1 
-  sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py
-  sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py
-  python3 setup.py install --root="$pkgdir" --optimize=0
-} 
diff --git a/community-staging/python-sqlalchemy/PKGBUILD b/community-staging/python-sqlalchemy/PKGBUILD
deleted file mode 100644
index c59dcf0da..000000000
--- a/community-staging/python-sqlalchemy/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 77772 2012-10-14 16:35:27Z ebelanger $ 
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgbase=python-sqlalchemy
-pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.7.9
-pkgrel=1
-arch=('i686' 'x86_64') # python2 package contain .so
-url="http://www.sqlalchemy.org/"
-license=('custom: MIT')
-makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('c4852d586d95a59fbc9358f4467875d5')
-
-build() {
-  cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
-  cd SQLAlchemy-$pkgver
-  python setup.py build
-  cd ../SQLAlchemy2-$pkgver
-  python2 setup.py build
-}
-
-package_python-sqlalchemy() {
-  pkgdesc='Python SQL toolkit and Object Relational Mapper'
-  depends=('python')
-
-  cd SQLAlchemy-${pkgver}
-  python setup.py install --root="${pkgdir}"
-  install -D -m644 LICENSE \
-	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_python2-sqlalchemy() {
-  pkgdesc='Python 2 SQL toolkit and Object Relational Mapper'
-  depends=('python2')
-
-  cd SQLAlchemy2-$pkgver
-  python2 setup.py install --root="$pkgdir"
-  install -D -m644 LICENSE \
-	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-staging/python-yaml/PKGBUILD b/community-staging/python-yaml/PKGBUILD
deleted file mode 100644
index c9457fde7..000000000
--- a/community-staging/python-yaml/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 77316 2012-10-08 16:12:37Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Michal Bozon <michal.bozon__at__gmail.com>
-
-pkgbase=python-yaml
-pkgname=(python2-yaml python-yaml)
-pkgver=3.10
-pkgrel=3
-pkgdesc="Python bindings for YAML, using fast libYAML library"
-arch=('i686' 'x86_64')
-url="http://pyyaml.org"
-license=('MIT')
-makedepends=('python' 'python2' 'libyaml')
-install='python-yaml.install'
-source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz)
-md5sums=('74c94a383886519e9e7b3dd1ee540247')
-
-build() {
-  true
-}
-
-package_python2-yaml() {
-  depends=('python2' 'libyaml')
-
-  cd $srcdir/PyYAML-$pkgver
-  python2 setup.py install --prefix=/usr --root=$pkgdir
-  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python-yaml() {
-  depends=('python' 'libyaml')
-
-  cd $srcdir/PyYAML-$pkgver
-  python setup.py install --prefix=/usr --root=$pkgdir
-  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-staging/python-yaml/python-yaml.install b/community-staging/python-yaml/python-yaml.install
deleted file mode 100644
index e2ae0674b..000000000
--- a/community-staging/python-yaml/python-yaml.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  cat << EOT
-==> Note that even though this package uses libyaml library,
-==> slower pure python implementation is used by default.
-==> See http://pyyaml.org/wiki/PyYAMLDocumentation
-EOT
-}
diff --git a/community-staging/python2-cjson/PKGBUILD b/community-staging/python2-cjson/PKGBUILD
deleted file mode 100644
index 2d95793a4..000000000
--- a/community-staging/python2-cjson/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Lincoln de Sousa <lincoln@archlinux-br.org>
-
-pkgname=python2-cjson
-pkgver=1.0.5
-pkgrel=5
-arch=('i686' 'x86_64')
-license=('LGPL')
-pkgdesc="Fast JSON encoder/decoder for Python"
-url="http://pypi.python.org/pypi/python-cjson/"
-depends=('python2')
-source=("http://pypi.python.org/packages/source/p/python-cjson/python-cjson-$pkgver.tar.gz")
-md5sums=('4d55b66ecdf0300313af9d030d9644a3')
-
-build() {
-  cd $srcdir/python-cjson-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community-staging/python2-galago/PKGBUILD b/community-staging/python2-galago/PKGBUILD
deleted file mode 100644
index 6076c3a9e..000000000
--- a/community-staging/python2-galago/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 66128 2012-02-23 01:37:06Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python2-galago
-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' 'pygtk')
-source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2)
-md5sums=('27be31fcf2886aa21823caec15dc34aa')
-
-build() {
-  cd $srcdir/galago-python-$pkgver
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/python2-gnutls/PKGBUILD b/community-staging/python2-gnutls/PKGBUILD
deleted file mode 100644
index 3a7c86a04..000000000
--- a/community-staging/python2-gnutls/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 74655 2012-08-01 13:54:20Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-# Contributor: N3RD3X <n3rd3x@linuxmail.org>
-
-pkgname=python2-gnutls
-pkgver=1.2.4
-pkgrel=2
-pkgdesc="Python wrapper for the GNUTLS library"
-arch=('i686' 'x86_64')
-url="http://cheeseshop.python.org/pypi/python-gnutls"
-depends=('python2' 'gnutls')
-license=('LGPL')
-source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz
-	gnutls3.patch)
-md5sums=('e3536c421291a791869d875a41dcb26a'
-         '24bc95d9f5e71e9f5e180706cbb09248')
-
-build() {
-  cd ${srcdir}/python-gnutls-${pkgver}
-  patch -Np0 <$srcdir/gnutls3.patch
-  python2 setup.py install --root=${pkgdir}
-}
diff --git a/community-staging/python2-gnutls/gnutls3.patch b/community-staging/python2-gnutls/gnutls3.patch
deleted file mode 100644
index 5110de2f2..000000000
--- a/community-staging/python2-gnutls/gnutls3.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
---- gnutls/library/functions.py	2011-08-19 04:48:14.000000000 +0100
-+++ gnutls.fixed/library/functions.py	2012-08-01 11:56:43.450975419 +0100
-@@ -4,7 +4,7 @@
- import sys
- from ctypes import *
- 
--from gnutls.library import libgnutls, libgnutls_extra
-+from gnutls.library import libgnutls
- from gnutls.library.types import *
- 
- 
-@@ -121,14 +121,6 @@
- gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)]
- gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t)
- 
--gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas
--gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)]
--gnutls_certificate_get_x509_cas.restype = None
--
--gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls
--gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)]
--gnutls_certificate_get_x509_crls.restype = None
--
- gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence
- gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int]
- gnutls_certificate_send_x509_rdn_sequence.restype = None
-@@ -221,10 +213,6 @@
- gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)]
- gnutls_certificate_type_set_priority.restype = c_int
- 
--gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers
--gnutls_certificate_verify_peers.argtypes = [gnutls_session_t]
--gnutls_certificate_verify_peers.restype = c_int
--
- gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2
- gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)]
- gnutls_certificate_verify_peers2.restype = c_int
-@@ -393,10 +381,6 @@
- gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)]
- gnutls_error_to_alert.restype = c_int
- 
--gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version
--gnutls_extra_check_version.argtypes = [c_char_p]
--gnutls_extra_check_version.restype = c_char_p
--
- gnutls_fingerprint = libgnutls.gnutls_fingerprint
- gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)]
- gnutls_fingerprint.restype = c_int
-@@ -409,10 +393,6 @@
- gnutls_global_init.argtypes = []
- gnutls_global_init.restype = c_int
- 
--gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra
--gnutls_global_init_extra.argtypes = []
--gnutls_global_init_extra.restype = c_int
--
- gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function
- gnutls_global_set_log_function.argtypes = [gnutls_log_func]
- gnutls_global_set_log_function.restype = None
-@@ -461,86 +441,6 @@
- gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
- gnutls_hex_encode.restype = c_int
- 
--gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials
--gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)]
--gnutls_ia_allocate_client_credentials.restype = c_int
--
--gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials
--gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)]
--gnutls_ia_allocate_server_credentials.restype = c_int
--
--gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable
--gnutls_ia_enable.argtypes = [gnutls_session_t, c_int]
--gnutls_ia_enable.restype = None
--
--gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send
--gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int]
--gnutls_ia_endphase_send.restype = c_int
--
--gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret
--gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p]
--gnutls_ia_extract_inner_secret.restype = None
--
--gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials
--gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t]
--gnutls_ia_free_client_credentials.restype = None
--
--gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials
--gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t]
--gnutls_ia_free_server_credentials.restype = None
--
--gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge
--gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p]
--gnutls_ia_generate_challenge.restype = c_int
--
--gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr
--gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t]
--gnutls_ia_get_client_avp_ptr.restype = c_void_p
--
--gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr
--gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t]
--gnutls_ia_get_server_avp_ptr.restype = c_void_p
--
--gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake
--gnutls_ia_handshake.argtypes = [gnutls_session_t]
--gnutls_ia_handshake.restype = c_int
--
--gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p
--gnutls_ia_handshake_p.argtypes = [gnutls_session_t]
--gnutls_ia_handshake_p.restype = c_int
--
--gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret
--gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p]
--gnutls_ia_permute_inner_secret.restype = c_int
--
--gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv
--gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t]
--gnutls_ia_recv.restype = ssize_t
--
--gnutls_ia_send = libgnutls_extra.gnutls_ia_send
--gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t]
--gnutls_ia_send.restype = ssize_t
--
--gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function
--gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func]
--gnutls_ia_set_client_avp_function.restype = None
--
--gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr
--gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p]
--gnutls_ia_set_client_avp_ptr.restype = None
--
--gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function
--gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func]
--gnutls_ia_set_server_avp_function.restype = None
--
--gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr
--gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p]
--gnutls_ia_set_server_avp_ptr.restype = None
--
--gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase
--gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p]
--gnutls_ia_verify_endphase.restype = c_int
--
- gnutls_init = libgnutls.gnutls_init
- gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t]
- gnutls_init.restype = c_int
-@@ -733,10 +633,6 @@
- gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t]
- gnutls_psk_free_server_credentials.restype = None
- 
--gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key
--gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)]
--gnutls_psk_netconf_derive_key.restype = c_int
--
- gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username
- gnutls_psk_server_get_username.argtypes = [gnutls_session_t]
- gnutls_psk_server_get_username.restype = c_char_p
-@@ -857,10 +753,6 @@
- gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t]
- gnutls_session_enable_compatibility_mode.restype = None
- 
--gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random
--gnutls_session_get_client_random.argtypes = [gnutls_session_t]
--gnutls_session_get_client_random.restype = c_void_p
--
- gnutls_session_get_data = libgnutls.gnutls_session_get_data
- gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
- gnutls_session_get_data.restype = c_int
-@@ -873,18 +765,10 @@
- gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
- gnutls_session_get_id.restype = c_int
- 
--gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret
--gnutls_session_get_master_secret.argtypes = [gnutls_session_t]
--gnutls_session_get_master_secret.restype = c_void_p
--
- gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr
- gnutls_session_get_ptr.argtypes = [gnutls_session_t]
- gnutls_session_get_ptr.restype = c_void_p
- 
--gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random
--gnutls_session_get_server_random.argtypes = [gnutls_session_t]
--gnutls_session_get_server_random.restype = c_void_p
--
- gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed
- gnutls_session_is_resumed.argtypes = [gnutls_session_t]
- gnutls_session_is_resumed.restype = c_int
-@@ -905,10 +789,6 @@
- gnutls_set_default_priority.argtypes = [gnutls_session_t]
- gnutls_set_default_priority.restype = c_int
- 
--gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name
--gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t]
--gnutls_sign_algorithm_get_name.restype = c_char_p
--
- gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get
- gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)]
- gnutls_sign_callback_get.restype = gnutls_sign_func
-@@ -937,14 +817,6 @@
- gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int]
- gnutls_transport_set_errno.restype = None
- 
--gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno
--gnutls_transport_set_global_errno.argtypes = [c_int]
--gnutls_transport_set_global_errno.restype = None
--
--gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat
--gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int]
--gnutls_transport_set_lowat.restype = None
--
- gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr
- gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t]
- gnutls_transport_set_ptr.restype = None
-@@ -1501,10 +1373,6 @@
- gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
- gnutls_x509_privkey_sign_hash.restype = c_int
- 
--gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data
--gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
--gnutls_x509_privkey_verify_data.restype = c_int
--
- gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get
- gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
- gnutls_x509_rdn_get.restype = c_int
-diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py
---- gnutls/library/__init__.py	2011-11-11 17:23:49.000000000 +0000
-+++ gnutls.fixed/library/__init__.py	2012-08-01 11:57:42.284290997 +0100
-@@ -53,6 +53,9 @@
-     else:
-         raise RuntimeError('cannot find lib%s on this system' % name)
- 
-+def do_nothing(*args, **kwargs):
-+    pass
-+
- 
- def initialize_gcrypt():
-     from ctypes import c_void_p
-@@ -104,7 +107,7 @@
-         libgcrypt = load_library(name='gcrypt', version=11)
-         gcry_control = libgcrypt.gcry_control
-     else:
--        gcry_control = libgnutls.gcry_control
-+        gcry_control = do_nothing
- 
-     gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
-     if system == 'cygwin':
-@@ -117,12 +120,10 @@
- 
- 
- 
--libgnutls = load_library(name='gnutls', version=26)
--libgnutls_extra = load_library(name='gnutls-extra', version=26)
-+libgnutls = load_library(name='gnutls', version=28)
- 
- initialize_gcrypt()
- libgnutls.gnutls_global_init()
--libgnutls_extra.gnutls_global_init_extra()
- 
- 
- from gnutls.library import constants
-@@ -136,9 +137,6 @@
- if functions.gnutls_check_version(__need_version__) is None:
-     version = functions.gnutls_check_version(None)
-     raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__))
--if functions.gnutls_extra_check_version(__need_version__) is None:
--    version = functions.gnutls_extra_check_version(None)
--    raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
- 
- 
- del get_system_name, library_locations, load_library, initialize_gcrypt
diff --git a/community-staging/python2-imaging/PKGBUILD b/community-staging/python2-imaging/PKGBUILD
deleted file mode 100644
index 2bb3ec9ab..000000000
--- a/community-staging/python2-imaging/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 77972 2012-10-16 01:48:17Z kkeen $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=python2-imaging
-pkgver=1.1.7
-pkgrel=5
-pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64')
-url="http://www.pythonware.com/products/pil/index.htm"
-license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2' 'lcms') 
-makedepends=('tk' 'sane')
-optdepends=('tk: for the ImageTK module'
-            'sane: for the ImageSane module')
-provides=("pil=${pkgver}" "python-imaging=${pkgver}")
-conflicts=('pil' 'python-imaging')
-replaces=('pil' 'python-imaging')
-source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
-
-build() {
-  cd "${srcdir}/Imaging-${pkgver}"
-  python2 setup.py build_ext
-  cd Sane
-  python2 setup.py build_ext
-}
-
-package() {
-  cd "${srcdir}/Imaging-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  
-  pushd Sane
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  popd
-  
-  install -dm755 "${pkgdir}/usr/include/python2.7/"
-  install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h 
-
-  # do not have files ending in .py in /usr/bin
-  for f in pildriver pilprint pilconvert pilfile pilfont; do
-    mv "${pkgdir}"/usr/bin/${f}{.py,}
-  done
-
-  # Install license
-  install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \
-                 "${pkgdir}/usr/share/licenses/${pkgname}/README"
-}
diff --git a/community-staging/python2-lcms/PKGBUILD b/community-staging/python2-lcms/PKGBUILD
deleted file mode 100644
index 3b75364ab..000000000
--- a/community-staging/python2-lcms/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 66130 2012-02-23 01:39:55Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Connor Behan <connor.behan@gmail.com>
-
-pkgname=python2-lcms
-pkgver=1.19
-_mver=1.19
-pkgrel=4
-pkgdesc="LittleCMS Python bindings"
-arch=(i686 x86_64)
-license=('CUSTOM')
-depends=('libtiff' 'python2' 'lcms')
-url="http://www.littlecms.com"
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz)
-md5sums=('8af94611baf20d9646c7c2c285859818')
-
-build() {
-  cd $srcdir/lcms-${_mver}
-  ./configure --prefix=/usr --with-python
-  make
-}
-
-package() {
-  cd $srcdir/lcms-${_mver}
-  make DESTDIR=$pkgdir install
-  install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-  rm -rf $pkgdir/usr/bin \
-	 $pkgdir/usr/include \
-	 $pkgdir/usr/lib/pkgconfig \
-	 $pkgdir/usr/lib/liblcms.* \
-	 $pkgdir/usr/share/man/man1/icc2ps.1 \
-	 $pkgdir/usr/share/man/man1/icclink.1 \
-	 $pkgdir/usr/share/man/man1/jpegicc.1 \
-	 $pkgdir/usr/share/man/man1/tifficc.1 \
-	 $pkgdir/usr/share/man/man1/wtpt.1
-}
diff --git a/community-staging/python2-m2crypto/PKGBUILD b/community-staging/python2-m2crypto/PKGBUILD
deleted file mode 100644
index a68c5a35d..000000000
--- a/community-staging/python2-m2crypto/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python2-m2crypto
-pkgver=0.21.1
-pkgrel=2
-pkgdesc="A crypto and SSL toolkit for Python"
-arch=('i686' 'x86_64')
-url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-license=('BSD')
-depends=('python2' 'openssl')
-makedepends=('swig')
-source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz")
-md5sums=('f93d8462ff7646397a9f77a2fe602d17')
-
-build() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-staging/python2-m2crypto/openssl1.patch b/community-staging/python2-m2crypto/openssl1.patch
deleted file mode 100644
index 59dba554d..000000000
--- a/community-staging/python2-m2crypto/openssl1.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-Index: tests/test_ssl.py
-===================================================================
---- tests/test_ssl.py	(revision 698)
-+++ tests/test_ssl.py	(working copy)
-@@ -405,8 +405,11 @@
-         try:
-             ctx = SSL.Context('sslv23', weak_crypto=1)
-             s = SSL.Connection(ctx)
--            s.connect(self.srv_addr)
--            self.failUnlessEqual(s.get_version(), 'SSLv2')
-+            if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
-+                s.connect(self.srv_addr)
-+                self.failUnlessEqual(s.get_version(), 'SSLv2')
-+            else:
-+                self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
-             s.close()
-         finally:
-             self.stop_server(pid)
-Index: tests/test_x509.py
-===================================================================
---- tests/test_x509.py	(revision 698)
-+++ tests/test_x509.py	(working copy)
-@@ -142,7 +142,7 @@
-         cn.set_data("Hello There!")
-         assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text()
- 
--        assert n.as_hash() == 1697185131
-+        self.assertEquals(n.as_hash(), 1697185131)
-         
-         self.assertRaises(IndexError, lambda: n[100])
-         self.assert_(n[10])
-Index: tests/test_smime.py
-===================================================================
---- tests/test_smime.py	(revision 698)
-+++ tests/test_smime.py	(working copy)
-@@ -6,7 +6,7 @@
- """
- 
- import unittest
--from M2Crypto import SMIME, BIO, Rand, X509, EVP
-+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err
- 
- class SMIMETestCase(unittest.TestCase):
-     cleartext = 'some text to manipulate'
-@@ -213,7 +213,7 @@
- 
-         self.filenameSmime = 'tests/sig.p7s'
-         f = BIO.openfile(self.filenameSmime, 'wb')
--        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
-+        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error()
-         f.close()
-         
-     def test_write_pkcs7_der(self):
-Index: SWIG/_evp.i
-===================================================================
---- SWIG/_evp.i	(revision 695)
-+++ SWIG/_evp.i	(working copy)
-@@ -180,7 +180,7 @@
- 
-     PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
-                            keylen, key);
--    ret = PyString_FromStringAndSize(key, keylen);
-+    ret = PyString_FromStringAndSize((char*)key, keylen);
-     OPENSSL_cleanse(key, keylen);
-     return ret;
- }
-@@ -339,7 +339,7 @@
-     klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
-         (unsigned char *)dbuf, dlen, iter, 
-         key, NULL); /* Since we are not returning IV no need to derive it */
--    ret = PyString_FromStringAndSize(key, klen);
-+    ret = PyString_FromStringAndSize((char*)key, klen);
-     return ret;
- }
- 
-@@ -435,7 +435,7 @@
-         PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
-         return NULL;
-     }
--    ret = PyString_FromStringAndSize(sigbuf, siglen);
-+    ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
-     OPENSSL_cleanse(sigbuf, siglen);
-     OPENSSL_free(sigbuf);
-     return ret;
-@@ -513,7 +513,7 @@
-         PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
-         return NULL; 
-     }
--    der = PyString_FromStringAndSize(pp, len);
-+    der = PyString_FromStringAndSize((char*)pp, len);
-     OPENSSL_free(pp);
-     return der;
- }
-Index: SWIG/_ssl.i
-===================================================================
---- SWIG/_ssl.i	(revision 695)
-+++ SWIG/_ssl.i	(working copy)
-@@ -17,13 +17,17 @@
- %apply Pointer NONNULL { SSL_CTX * };
- %apply Pointer NONNULL { SSL * };
- %apply Pointer NONNULL { SSL_CIPHER * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { BIO * };
- %apply Pointer NONNULL { DH * };
- %apply Pointer NONNULL { RSA * };
- %apply Pointer NONNULL { EVP_PKEY *};
- %apply Pointer NONNULL { PyObject *pyfunc };
- 
-+%rename(ssl_get_ciphers) SSL_get_ciphers;
-+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
-+
- %rename(ssl_get_version) SSL_get_version;
- extern const char *SSL_get_version(CONST SSL *);
- %rename(ssl_get_error) SSL_get_error;
-@@ -668,29 +672,25 @@
-     return SSL_CIPHER_get_bits(c, NULL);
- }
- 
--STACK *ssl_get_ciphers(SSL *ssl) {
--    return (STACK *)SSL_get_ciphers(ssl);
-+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
-+    return sk_SSL_CIPHER_num(stack);
- }
- 
--int sk_ssl_cipher_num(STACK *stack) {
--    return sk_num(stack);
-+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
-+    return sk_SSL_CIPHER_value(stack, idx);
- }
- 
--SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
--    return (SSL_CIPHER *)sk_value(stack, idx);
-+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
-+    return SSL_get_peer_cert_chain(ssl);
- }
- 
--STACK *ssl_get_peer_cert_chain(SSL *ssl) {
--    return (STACK *)SSL_get_peer_cert_chain(ssl);
-+int sk_x509_num(STACK_OF(X509) *stack) {
-+    return sk_X509_num(stack);
- }
- 
--int sk_x509_num(STACK *stack) {
--    return sk_num(stack);
-+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
-+    return sk_X509_value(stack, idx);
- }
--
--X509 *sk_x509_value(STACK *stack, int idx) {
--    return (X509 *)sk_value(stack, idx);
--}
- %}
- 
- %threadallow i2d_ssl_session;
-Index: SWIG/_x509.i
-===================================================================
---- SWIG/_x509.i	(revision 695)
-+++ SWIG/_x509.i	(working copy)
-@@ -148,8 +148,15 @@
- extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
- %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
- extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+%rename(x509_name_hash) X509_NAME_hash_old;
-+extern unsigned long X509_NAME_hash_old(X509_NAME *);
-+#else
- %rename(x509_name_hash) X509_NAME_hash;
- extern unsigned long X509_NAME_hash(X509_NAME *);
-+#endif
-+
- %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
- extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
- 
-@@ -171,7 +178,7 @@
-     if (PyString_Check($input)) {
-         Py_ssize_t len;
- 
--        $1 = PyString_AsString($input); 
-+        $1 = (unsigned char *)PyString_AsString($input); 
-         len = PyString_Size($input);
-         if (len > INT_MAX) {
-             PyErr_SetString(PyExc_ValueError, "object too large");
-@@ -184,7 +191,7 @@
-     }
- }
- %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
--extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
-+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
- %typemap(in) (CONST unsigned char *, int);
- 
- %rename(x509_req_new) X509_REQ_new;
-@@ -230,7 +237,7 @@
- %rename(x509_store_ctx_free) X509_STORE_CTX_free;
- extern void X509_STORE_CTX_free(X509_STORE_CTX *);
- %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
--extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
-+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
- 
- %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
- extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
-@@ -348,7 +355,7 @@
-         PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-     }
-     else {     
--        ret = PyString_FromStringAndSize(buf, len);
-+        ret = PyString_FromStringAndSize((char*)buf, len);
-         OPENSSL_free(buf);
-     }
-     return ret;
-@@ -435,12 +442,12 @@
- }
- 
- int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
--    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
-+    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
- }
- 
- /* x509_name_add_entry_by_txt */
- int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
--    return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
-+    return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
- }
- 
- PyObject *x509_name_get_der(X509_NAME *name)
-@@ -450,23 +457,23 @@
- }
- 
- /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
--STACK *sk_x509_new_null(void) {
--    return (STACK *)sk_X509_new_null();
-+STACK_OF(X509) *sk_x509_new_null(void) {
-+    return sk_X509_new_null();
- }
- 
- /* sk_X509_free() is a macro. */
--void sk_x509_free(STACK *stack) {
--    sk_X509_free((STACK_OF(X509) *)stack);
-+void sk_x509_free(STACK_OF(X509) *stack) {
-+    sk_X509_free(stack);
- }
- 
- /* sk_X509_push() is a macro. */
--int sk_x509_push(STACK *stack, X509 *x509) {
--    return sk_X509_push((STACK_OF(X509) *)stack, x509);
-+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
-+    return sk_X509_push(stack, x509);
- }
- 
- /* sk_X509_pop() is a macro. */
--X509 *sk_x509_pop(STACK *stack) {
--    return sk_X509_pop((STACK_OF(X509) *)stack);
-+X509 *sk_x509_pop(STACK_OF(X509) *stack) {
-+    return sk_X509_pop(stack);
- }
- 
- int x509_store_load_locations(X509_STORE *store, const char *file) {
-@@ -493,21 +500,29 @@
-     return X509_REQ_set_version(x, version);
- }
- 
--int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
--    return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
-+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
-+    return X509_REQ_add_extensions(req, exts);
- }
- 
--X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
--    return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
-+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
-+    return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
- }
- 
--LHASH * 
--x509v3_lhash(){ 
--       return lh_new(NULL,NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+LHASH_OF(CONF_VALUE) 
-+#else
-+LHASH
-+#endif
-+*x509v3_lhash() { 
-+    return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
- }
- 
- X509V3_CTX *
--x509v3_set_conf_lhash(LHASH * lhash){
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
-+#else
-+x509v3_set_conf_lhash(LHASH                * lhash) {
-+#endif
-       X509V3_CTX * ctx;
-       if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
-           PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
-@@ -517,11 +532,20 @@
-       return ctx;
- }
- 
--X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
-+X509_EXTENSION *
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#else
-+x509v3_ext_conf(LHASH                *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#endif
-       X509_EXTENSION * ext = NULL;
-       ext = X509V3_EXT_conf(conf, ctx, name, value); 
-       PyMem_Free(ctx); 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      lh_CONF_VALUE_free(conf);
-+#else
-       lh_free(conf);
-+#endif
-       return ext;
- }
- 
-@@ -543,33 +567,33 @@
- }
- 
- /* sk_X509_EXTENSION_new_null is a macro. */
--STACK *sk_x509_extension_new_null(void) {
--    return (STACK *)sk_X509_EXTENSION_new_null();
-+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
-+    return sk_X509_EXTENSION_new_null();
- }
- 
- /* sk_X509_EXTENSION_free() is a macro. */
--void sk_x509_extension_free(STACK *stack) {
--    sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
-+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
-+    sk_X509_EXTENSION_free(stack);
- }
- 
- /* sk_X509_EXTENSION_push() is a macro. */
--int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
--    return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
-+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
-+    return sk_X509_EXTENSION_push(stack, x509_ext);
- }
- 
- /* sk_X509_EXTENSION_pop() is a macro. */
--X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
--    return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
-+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
-+    return sk_X509_EXTENSION_pop(stack);
- }
- 
- /* sk_X509_EXTENSION_num() is a macro. */
--int sk_x509_extension_num(STACK *stack) {
--    return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
-+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
-+    return sk_X509_EXTENSION_num(stack);
- }
- 
- /* sk_X509_EXTENSION_value() is a macro. */
--X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
--    return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
-+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
-+    return sk_X509_EXTENSION_value(stack, i);
- }
- 
- /* X509_STORE_CTX_get_app_data is a macro. */
-@@ -590,7 +614,7 @@
- #define I2DTYPE int (*)()
- #endif   
- 
--STACK *
-+STACK_OF(X509) *
- make_stack_from_der_sequence(PyObject * pyEncodedString){
-     STACK_OF(X509) *certs;
-     Py_ssize_t encoded_string_len;
-@@ -606,7 +630,7 @@
-         return NULL;
-     }
- 
--    certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); 
-+    certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); 
-     if (!certs) {
-        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-        return NULL;
-@@ -616,13 +640,13 @@
- }
- 
- PyObject *
--get_der_encoding_stack(STACK * stack){
-+get_der_encoding_stack(STACK_OF(X509) *stack){
-     PyObject * encodedString;
-     
-     unsigned char * encoding;
-     int len; 
-     
--    encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); 
-+    encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); 
-     if (!encoding) {
-        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-        return NULL;
-Index: SWIG/_aes.i
-===================================================================
---- SWIG/_aes.i	(revision 695)
-+++ SWIG/_aes.i	(working copy)
-@@ -76,7 +76,7 @@
-         AES_encrypt((const unsigned char *)in, out, key);
-     else
-         AES_decrypt((const unsigned char *)in, out, key);
--    return PyString_FromStringAndSize(out, outlen);
-+    return PyString_FromStringAndSize((char*)out, outlen);
- }
- 
- int AES_type_check(AES_KEY *key) {
-Index: SWIG/_util.i
-===================================================================
---- SWIG/_util.i	(revision 695)
-+++ SWIG/_util.i	(working copy)
-@@ -48,7 +48,7 @@
-         PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
-         return NULL;
-     }
--    obj = PyString_FromStringAndSize(ret, len);
-+    obj = PyString_FromStringAndSize((char*)ret, len);
-     OPENSSL_free(ret);
-     return obj;
- }
-Index: SWIG/_m2crypto.i
-===================================================================
---- SWIG/_m2crypto.i	(revision 695)
-+++ SWIG/_m2crypto.i	(working copy)
-@@ -38,6 +38,19 @@
- #define CONST098
- #endif
- 
-+/* Bring in STACK_OF macro definition */
-+%include <openssl/safestack.h>
-+
-+/* Bring in LHASH_OF macro definition */
-+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
-+   XXX stdio.h etc. which we fail to include. So we have to (re)define
-+   XXX LHASH_OF here instead.
-+%include <openssl/lhash.h>
-+*/
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define LHASH_OF(type) struct lhash_st_##type
-+#endif
-+
- %include constraints.i
- %include _threads.i
- %include _lib.i
-Index: SWIG/_rand.i
-===================================================================
---- SWIG/_rand.i	(revision 695)
-+++ SWIG/_rand.i	(working copy)
-@@ -87,7 +87,7 @@
-         Py_INCREF(Py_None);
-         return Py_None;
-     } else {
--        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
-+        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
-         PyMem_Free(blob);
-         PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
-         return tuple;
-Index: SWIG/_pkcs7.i
-===================================================================
---- SWIG/_pkcs7.i	(revision 695)
-+++ SWIG/_pkcs7.i	(working copy)
-@@ -12,7 +12,7 @@
- %apply Pointer NONNULL { EVP_CIPHER * };
- %apply Pointer NONNULL { EVP_PKEY * };
- %apply Pointer NONNULL { PKCS7 * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { X509 * };
- 
- %rename(pkcs7_new) PKCS7_new;
-@@ -54,8 +54,8 @@
- 
- %threadallow pkcs7_encrypt;
- %inline %{
--PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
--    return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
-+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
-+    return PKCS7_encrypt(stack, bio, cipher, flags);
- }
- 
- PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
-@@ -96,14 +96,14 @@
- 
- %threadallow pkcs7_sign1;
- %inline %{
--PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
--    return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
-+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
-+    return PKCS7_sign(x509, pkey, stack, bio, flags);
- }
- %}
- 
- %threadallow pkcs7_verify1;
- %inline %{
--PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
-+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
-     int outlen;
-     char *outbuf;
-     BIO *bio;
-@@ -113,7 +113,7 @@
-         PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
-         return NULL;
-     }
--    if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
-+    if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
-         PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
-         BIO_free(bio);
-         return NULL;
-@@ -131,7 +131,7 @@
-     return ret;
- }
- 
--PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
-+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
-     return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
- }
- %}
-@@ -229,7 +229,7 @@
- }
- 
- /* return STACK_OF(X509)* */     
--STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {     
-+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {     
-     return PKCS7_get0_signers(p7, certs, flags);      
- }
- 
diff --git a/community-staging/python2-pybluez/PKGBUILD b/community-staging/python2-pybluez/PKGBUILD
deleted file mode 100644
index 6007614a6..000000000
--- a/community-staging/python2-pybluez/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: cs-cam - me.at.camdaniel.com
-
-pkgname=python2-pybluez
-pkgver=0.18
-pkgrel=4
-pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pybluez/"
-license=('GPL')
-provides=('pybluez')
-conflicts=('pybluez')
-replaces=('pybluez')
-depends=('python2' 'bluez')
-source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz)
-md5sums=('be8c8ce615c3189fda1aaf3d568314b2')
-
-build() {
-  cd $srcdir/PyBluez-$pkgver
-  python2 setup.py install --root=$pkgdir
-  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so
-}
diff --git a/community-staging/python2-pyopencl/LICENSE.txt b/community-staging/python2-pyopencl/LICENSE.txt
deleted file mode 100644
index 3ce400f9d..000000000
--- a/community-staging/python2-pyopencl/LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/community-staging/python2-pyopencl/PKGBUILD b/community-staging/python2-pyopencl/PKGBUILD
deleted file mode 100644
index 3007ce2a6..000000000
--- a/community-staging/python2-pyopencl/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 73358 2012-07-06 16:18:30Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=python2-pyopencl
-pkgver=2012.1
-pkgrel=2
-pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
-arch=('i686' 'x86_64')
-url="http://mathema.tician.de/software/pyopencl"
-license=('custom')
-depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa' 'boost')
-makedepends=('ctags' 'python2-distribute')
-source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
-        'LICENSE.txt')
-sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff'
-          '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7')
-
-build() {
-   cd "${srcdir}/pyopencl-${pkgver}"
-   python2 ./configure.py --cl-enable-gl --no-use-shipped-boost
-
-   python2 setup.py build
-}
-
-package() {
-   cd "${srcdir}/pyopencl-${pkgver}"
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-   install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-staging/python2-pyxmpp/PKGBUILD b/community-staging/python2-pyxmpp/PKGBUILD
deleted file mode 100644
index 49096a86f..000000000
--- a/community-staging/python2-pyxmpp/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 72078 2012-06-08 09:35:02Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python2-pyxmpp
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="A Python XMPP and Jabber implementation based on libxml2"
-arch=('i686' 'x86_64')
-url="http://pyxmpp.jajcus.net/"
-license=('LGPL')
-depends=('python2-dnspython' 'libxml2' 'python2-m2crypto')
-source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz)
-md5sums=('a38abf032aca0408b6055cd94296eb75')
-
-build() {
-  cd $srcdir/pyxmpp-$pkgver
-  python2 setup.py build
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community-staging/python2-simplejson/PKGBUILD b/community-staging/python2-simplejson/PKGBUILD
deleted file mode 100644
index c6866a23d..000000000
--- a/community-staging/python2-simplejson/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 74926 2012-08-09 22:02:03Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: David Moore <davidm@sjsoft.com>
-
-pkgname=python2-simplejson
-pkgver=2.6.1
-pkgrel=2
-pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
-license=('MIT')
-arch=('i686' 'x86_64')
-url="http://undefined.org/python/#simplejson"
-depends=('python2')
-makedepends=('python2-distribute')
-changelog=$pkgname.changelog
-source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver})
-sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31')
-
-build() {
-  cd ${srcdir}/simplejson-simplejson-*
-
-  python2 setup.py install --root=${pkgdir}
-
-# License
-  install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \
-    ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-staging/python2-simplejson/python2-simplejson.changelog b/community-staging/python2-simplejson/python2-simplejson.changelog
deleted file mode 100644
index c1e227d24..000000000
--- a/community-staging/python2-simplejson/python2-simplejson.changelog
+++ /dev/null
@@ -1,20 +0,0 @@
-2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.6.1-1
-
-2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.5.2-1
-
-2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.3.3-1
-
-2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.2.1-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.1.3-1
-
-2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.1.1
-
-2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.1.0
diff --git a/community-staging/python2-vorbissimple/PKGBUILD b/community-staging/python2-vorbissimple/PKGBUILD
deleted file mode 100644
index ba0a8be63..000000000
--- a/community-staging/python2-vorbissimple/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 66136 2012-02-23 01:43:46Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python2-vorbissimple
-pkgver=0.0.2
-pkgrel=6
-pkgdesc="Python bindings for vorbissimple"
-arch=('i686' 'x86_64')
-url="http://kamaelia.sourceforge.net"
-license=('MPL')
-depends=('python2' 'vorbissimple')
-makedepends=('pyrex')
-source=(http://downloads.sourceforge.net/kamaelia/vorbissimple-$pkgver.tar.gz)
-md5sums=('332077b25a4c9547947ab0922361ffda')
-
-build() {
-  cd $srcdir/vorbissimple-$pkgver/python
-  sed -i 's#__new__#__cinit__#' vorbissimple.pyx
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community-staging/qmmp/PKGBUILD b/community-staging/qmmp/PKGBUILD
deleted file mode 100644
index caaa6b511..000000000
--- a/community-staging/qmmp/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-#$Id: PKGBUILD 72061 2012-06-07 17:49:23Z tdziedzic $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=qmmp
-pkgver=0.5.5
-pkgrel=2
-pkgdesc="Qt4 based audio-player"
-arch=('i686' 'x86_64')
-url="http://qmmp.ylsoftware.com/"
-license=('GPL')
-depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt' 'taglib' 'xdg-utils')
-makedepends=('cmake'  'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack')
-optdepends=('flac: native FLAC support'
-            'jack: JACK sound output'
-            'libmpcdec: Musepack support'
-            'pulseaudio: PulseAudio output'
-            'libcdio: Compact Disc input and control support'
-            'libcddb: CDDB server support'
-            'libmms: MMS stream protocol support'
-            'libmodplug: MOD playing library'
-            'libsndfile: sampled sound support'
-            'ffmpeg' 'libsamplerate' 'wavpack')
-install=$pkgname.install
-source=("http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2"
-        'ffmpeg-0.11.diff')
-sha256sums=('525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6'
-            'f110e59b345fcf143e45642b1cb3e89ead6c85a927a49974620e285cb116b666')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-staging/qmmp/ffmpeg-0.11.diff b/community-staging/qmmp/ffmpeg-0.11.diff
deleted file mode 100644
index f414ffbf6..000000000
--- a/community-staging/qmmp/ffmpeg-0.11.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
-===================================================================
---- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp	(revision 2728)
-+++ src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp	(revision 2729)
-@@ -133,9 +133,6 @@
-     m_stream->seekable = !input()->isSequential();
-     m_stream->max_packet_size = INPUT_BUFFER_SIZE;
- 
--    AVFormatParameters ap;
--    memset(&ap, 0, sizeof(ap));
--
-     if(avformat_open_input(&ic, m_path.toLocal8Bit().constData(), fmt, 0) != 0)
-     {
-         qDebug("DecoderFFmpeg: av_open_input_stream() failed");
diff --git a/community-staging/qmmp/qmmp.changelog b/community-staging/qmmp/qmmp.changelog
deleted file mode 100644
index 04be7b9e8..000000000
--- a/community-staging/qmmp/qmmp.changelog
+++ /dev/null
@@ -1,57 +0,0 @@
-2012-05-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.5-1
-
-2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.4-1
-
-2011-11-12 Andrea Scarpino <andrea@archlinux.org>
-    * qmmp 0.5.2-3
-    * rebuild with qt 4.7
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.2-1
-
-2011-07-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.1-1
-
-2011-04-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.0-1
-
-2011-02-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.4.4-1
-
-2010-11-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.3
-
-2010-09-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.2
-
-2010-06-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.1
-
-2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.0
-
-2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.4
-
-2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.3
-
-2010-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.2
-
-2009-07-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.0
-
-2009-03-30 Giovanni Scafora <giovanni@archlinux.org>
-	* Fixed x86_64 build
-
-2009-03-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.4
-
-2008-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.3
-
-2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.2
diff --git a/community-staging/qmmp/qmmp.install b/community-staging/qmmp/qmmp.install
deleted file mode 100644
index 4c0972beb..000000000
--- a/community-staging/qmmp/qmmp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-staging/qtcurve-kde4/PKGBUILD b/community-staging/qtcurve-kde4/PKGBUILD
deleted file mode 100644
index 65c056cce..000000000
--- a/community-staging/qtcurve-kde4/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 74743 2012-08-03 00:41:28Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-kde4
-pkgver=1.8.13
-pkgrel=3
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"
-        'bypass-kde-config.patch'
-        'fix-kwin_decoration-macro.patch')
-md5sums=('94ba22bc487a18f585249c2967878189'
-         '3f6681147cc361bd2bfd4d7477f2a8d0'
-         '7366e45ef9f24f53a36f87a539a937d6')
-
-build() {
-	cd "${srcdir}"/QtCurve-KDE4-${pkgver}
-	# Bypass KDE prefix detection by kde4-config, see:
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-	patch -p1 -i "${srcdir}"/bypass-kde-config.patch
-	patch -p1 -i "${srcdir}"/fix-kwin_decoration-macro.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../QtCurve-KDE4-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/qtcurve-kde4/bypass-kde-config.patch b/community-staging/qtcurve-kde4/bypass-kde-config.patch
deleted file mode 100644
index d09e5ead5..000000000
--- a/community-staging/qtcurve-kde4/bypass-kde-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Pino Toscano <pino@kde.org>
-Description: Disable braindead KDE3/4 prefix detection
- The current detection of the KDE 3 and KDE 4 prefixes is done running
- kde-config and kde4-config, resp.
- This can be problematic, as these two could create files in ~/.kde,
- thus breaking when the home of the current user (eg in buildds) is read-only.
- Given the build system sets anyway "/usr" as prefix of KDE 3 and KDE 4
- if they were not detected, then just let it to.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,11 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CM
- set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
- include(CPack)
- 
-+# Comment the kde3/kde4 prefix detection as a whole as it wants to run
-+# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
-+# This cannot work on read-only homes.
-+# So, the "fallback" prefixes ("/usr" for both) will be used.
-+if (BRAINDEAD_DETECTION)
- set(OLD_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- 
- # Try to find kde4-config...
-@@ -48,6 +53,7 @@ if (KDE4_KDECONFIG_EXECUTABLE)
-                     ARGS --prefix
-                     OUTPUT_VARIABLE KDE4PREFIX)
- endif (KDE4_KDECONFIG_EXECUTABLE)
-+endif (BRAINDEAD_DETECTION)
- 
- if(NOT KDE3PREFIX)
-     if(KDE4PREFIX)
diff --git a/community-staging/qtcurve-kde4/fix-kwin_decoration-macro.patch b/community-staging/qtcurve-kde4/fix-kwin_decoration-macro.patch
deleted file mode 100644
index 6202e7b87..000000000
--- a/community-staging/qtcurve-kde4/fix-kwin_decoration-macro.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/kwin/qtcurvehandler.cpp b/kwin/qtcurvehandler.cpp
---- a/kwin/qtcurvehandler.cpp	2012-08-02 13:36:58.811347708 +0000
-+++ b/kwin/qtcurvehandler.cpp	2012-08-02 13:38:03.240996792 +0000
-@@ -489,6 +489,11 @@
- 
- extern "C"
- {
-+    KWIN_EXPORT int decoration_version()
-+    {
-+        return KWIN_DECORATION_API_VERSION;
-+    }
-+
-     KDE_EXPORT KDecorationFactory *create_factory()
-     {
-         KWinQtCurve::handler = new KWinQtCurve::QtCurveHandler();
diff --git a/community-staging/r8168-lts/PKGBUILD b/community-staging/r8168-lts/PKGBUILD
deleted file mode 100644
index 411291872..000000000
--- a/community-staging/r8168-lts/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 75227 2012-08-16 12:37:34Z mtorromeo $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-pkgname=r8168-lts
-_pkgname=r8168
-pkgver=8.031.00
-pkgrel=5
-pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
-url="http://www.realtek.com.tw"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('glibc' "linux-lts>=3.0" "linux-lts<3.1")
-makedepends=("linux-lts-headers>=3.0" "linux-lts-headers<3.1")
-source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
-install=$pkgname.install
-md5sums=('ec1654f02e2dad930bbeb0210ddab7e5')
-sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779')
-
-_extramodules=extramodules-3.0-lts
-
-build() {
-	cd "$_pkgname-$pkgver"
-	local _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
-	make -C /usr/lib/modules/$_kernver/build \
-			SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \
-			EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
-			modules
-}
-
-package() {
-	cd "$_pkgname-$pkgver"
-	install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko"
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-}
diff --git a/community-staging/r8168-lts/r8168-lts.install b/community-staging/r8168-lts/r8168-lts.install
deleted file mode 100644
index 2aab9e1e3..000000000
--- a/community-staging/r8168-lts/r8168-lts.install
+++ /dev/null
@@ -1,17 +0,0 @@
-rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-3.0-lts'
-	depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  rebuild_module_dependencies
-	echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
-	echo '>>>  `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
-}
-post_upgrade() {
-	rebuild_module_dependencies
-}
-
-post_remove() {
-	rebuild_module_dependencies
-}
diff --git a/community-staging/rawstudio/PKGBUILD b/community-staging/rawstudio/PKGBUILD
deleted file mode 100644
index 9825fa732..000000000
--- a/community-staging/rawstudio/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 74558 2012-07-30 14:08:38Z 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=7
-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
-  export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`"
-  ./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/rss-glx/PKGBUILD b/community-staging/rss-glx/PKGBUILD
deleted file mode 100644
index adf2bfcff..000000000
--- a/community-staging/rss-glx/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 78636 2012-10-22 11:22:11Z spupykin $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
-# Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au>
-
-pkgname=rss-glx
-pkgver=0.9.1
-pkgrel=12
-pkgdesc="The Really Slick Screensavers port to GLX"
-arch=('i686' 'x86_64')
-url="http://rss-glx.sourceforge.net/"
-license=('GPL')
-depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu')
-makedepends=('mesa')
-optdepends=('xscreensaver: xscreensaver integration')
-install=rss-glx.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2
-        rss-glx-desktops.tar.bz2)
-md5sums=('a772bd143cd8d141edf4d9eff9860ab3'
-         '4211215c9a4918b0dff30a7000647dd9')
-
-build() {
-  cd ${srcdir}/${pkgname}_${pkgver}
-
-  [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in)
-
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man \
-    --program-transform-name='s/plasma/plasma_rss/' \
-    --with-configdir=/usr/share/xscreensaver/config \
-    --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \
-    --enable-shared=yes --enable-static=no
-  make CFLAGS="$CFLAGS -I/usr/include/ImageMagick"
-}
-
-package() {
-  cd ${srcdir}/${pkgname}_${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # FS#18300
-  install -d ${pkgdir}/usr/lib/xscreensaver/
-  list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl)
-  for i in $list; do
-    ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/"
-  done
-
-  install -d ${pkgdir}/usr/share/applications/screensavers
-  install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers
-}
diff --git a/community-staging/rss-glx/rss-glx-desktops.tar.bz2 b/community-staging/rss-glx/rss-glx-desktops.tar.bz2
deleted file mode 100644
index 940fd5277..000000000
--- a/community-staging/rss-glx/rss-glx-desktops.tar.bz2
+++ /dev/null
diff --git a/community-staging/rss-glx/rss-glx.install b/community-staging/rss-glx/rss-glx.install
deleted file mode 100644
index 758642618..000000000
--- a/community-staging/rss-glx/rss-glx.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  cat << 'EOM'
-  --> If you want to integrate the RSS screen savers with xscreensaver
-  --> for your user, then install the xscreensaver package and launch
-  --> the command "rss-glx_install.pl"
-EOM
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/community-staging/schroot/PKGBUILD b/community-staging/schroot/PKGBUILD
deleted file mode 100644
index 0f79ad766..000000000
--- a/community-staging/schroot/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 74230 2012-07-23 03:10:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
-
-pkgname=schroot
-pkgver=1.6.0
-pkgrel=2
-pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
-url="http://packages.qa.debian.org/s/schroot.html"
-license=('GPL3')
-depends=('pam' 'lockdev' 'boost' 'e2fsprogs')
-optdepends=('btrfs-progs-unstable' 'lvm2')
-arch=('i686' 'x86_64')
-conflicts=('dchroot')
-replaces=('dchroot')
-provides=('schroot' 'sbuild' 'dchroot')
-backup=('etc/schroot/schroot.conf'
-	'etc/schroot/arch32/config'
-	'etc/schroot/arch32/copyfiles'
-	'etc/schroot/arch32/mount'
-	'etc/schroot/arch32/nssdatabases')
-options=(!libtool)
-source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz"
-	'pam.d.schroot.patch'
-	'arch32-example'
-	'arch32-config'
-	'arch32-copyfiles'
-	'arch32-mount'
-	'arch32-nssdatabases')
-md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195'
-         'a8d77cac806a0a9adef3f93cdbeb280a'
-         '1e34db5387c4e5de911e15d8a9208bdb'
-         '5a3f7b839c7e0b8933748da7c5b6385b'
-         '06db41d42f9fce5449a28feb76ded556'
-         'f0d5d5b5e34a860f6f90b5628c680f46'
-         'af1da6edd8c8c0dafeeb2c2c4e0c840b')
-
-build() {
-	cd ${pkgname}-${pkgver}
-	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-dchroot \
-		--enable-lvm-snapshot \
-		--enable-btrfs-snapshot \
-		--with-bash-completion-dir=/usr/share/bash-completion/completions/ \
-		BTRFS=/sbin/btrfs \
-		BTRFSCTL=/sbin/btrfsctl \
-		LVCREATE=/sbin/lvcreate \
-		LVREMOVE=/sbin/lvremove
-		# --enable-csbuild
-	make
-}
-
-check() {
-	cd ${pkgname}-${pkgver}
-	make -k check
-}
-
-package() {
-	cd ${pkgname}-${pkgver}
-	make DESTDIR=$pkgdir install
-	install -dm 755 ${pkgdir}/etc/schroot/arch32
-	install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32
-	rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/*
-	install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example
-	patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot
-}
diff --git a/community-staging/schroot/arch32-config b/community-staging/schroot/arch32-config
deleted file mode 100644
index 0ee72d522..000000000
--- a/community-staging/schroot/arch32-config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default settings for chroot setup and exec scripts.
-# See schroot-script-config(5) for further details.
-
-# Filesystems to mount inside the chroot.
-FSTAB="/etc/schroot/arch32/mount"
-
-# Files to copy from the host system into the chroot.
-COPYFILES="/etc/schroot/arch32/copyfiles"
-
-# System databases to copy into the chroot
-NSSDATABASES="/etc/schroot/arch32/nssdatabases"
diff --git a/community-staging/schroot/arch32-copyfiles b/community-staging/schroot/arch32-copyfiles
deleted file mode 100644
index 88f093ceb..000000000
--- a/community-staging/schroot/arch32-copyfiles
+++ /dev/null
@@ -1,7 +0,0 @@
-/etc/group
-/etc/hosts
-/etc/passwd
-/etc/resolv.conf
-/etc/rc.conf
-/etc/localtime
-/etc/locale.gen
diff --git a/community-staging/schroot/arch32-example b/community-staging/schroot/arch32-example
deleted file mode 100644
index 3f059e3c0..000000000
--- a/community-staging/schroot/arch32-example
+++ /dev/null
@@ -1,10 +0,0 @@
-[arch32]
-description=Arch32
-type=directory
-directory=/opt/arch32
-#users=username
-groups=users
-root-groups=root
-script-config=arch32/config
-personality=linux32
-#aliases=32,i686
diff --git a/community-staging/schroot/arch32-mount b/community-staging/schroot/arch32-mount
deleted file mode 100644
index 075d6e451..000000000
--- a/community-staging/schroot/arch32-mount
+++ /dev/null
@@ -1,12 +0,0 @@
-# mount.defaults: static file system information for chroots.
-# Note that the mount point will be prefixed by the chroot path
-# (CHROOT_PATH)
-#
-# <file system>	<mount point>	<type>	<options>	<dump>	<pass>
-proc		/proc		proc	defaults	0	0
-/dev		/dev		none	rw,bind		0	0
-#/dev/pts	/dev/pts	none	rw,bind		0	0
-tmpfs		/dev/shm	tmpfs	defaults	0	0
-/sys		/sys		none	rw,bind		0	0
-/tmp		/tmp		none	rw,bind		0	0
-/home		/home		none	rw,bind		0	0
diff --git a/community-staging/schroot/arch32-nssdatabases b/community-staging/schroot/arch32-nssdatabases
deleted file mode 100644
index 815ddce3f..000000000
--- a/community-staging/schroot/arch32-nssdatabases
+++ /dev/null
@@ -1,6 +0,0 @@
-# System databases to copy into the chroot from the host system.
-#
-# <database name>
-passwd
-shadow
-group
diff --git a/community-staging/schroot/pam.d.schroot.patch b/community-staging/schroot/pam.d.schroot.patch
deleted file mode 100644
index 528acb5f7..000000000
--- a/community-staging/schroot/pam.d.schroot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-@@ -23,13 +23,6 @@
- # time restrainst on schroot usage.
- # account    requisite  pam_time.so
- 
--# The standard Unix authentication modules, used with
--# NIS (man nsswitch) as well as normal /etc/passwd and
--# /etc/shadow entries.
--@include common-auth
--@include common-account
--@include common-session
--
- # Sets up user limits, please uncomment and read /etc/security/limits.conf
- # to enable this functionality.
- # session    required   pam_limits.so
-
diff --git a/community-staging/sdcc/PKGBUILD b/community-staging/sdcc/PKGBUILD
deleted file mode 100644
index fd9c0b002..000000000
--- a/community-staging/sdcc/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 77318 2012-10-08 16:13:13Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jose Negron <josenj.arch@mailnull.net>
-
-pkgname=sdcc
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('bash' 'gcc-libs' 'boost-libs')
-makedepends=('gputils' 'flex' 'bison' 'patch' 'boost')
-optdepends=('python')
-url="http://sdcc.sourceforge.net/"
-options=(!strip)
-source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
-md5sums=('0808a9b4109d2ba6046ddd7b679a0012')
-
-build() {
-  cd $srcdir/$pkgname
-  ./configure \
-	--prefix=/usr \
-	--includedir=/usr/include/sdcc \
-	--libdir=/usr/lib/sdcc
-  make
-  make install DESTDIR=$pkgdir
-
-  if [ -d $pkgdir/usr/lib/lib ]; then
-    mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/
-    rm -rf $pkgdir/usr/lib/lib
-  fi
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' $pkgdir/usr/bin/as2gbmap
-}
diff --git a/community-staging/sfml/PKGBUILD b/community-staging/sfml/PKGBUILD
deleted file mode 100644
index c59465784..000000000
--- a/community-staging/sfml/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78696 2012-10-22 22:13:12Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Ondrej Martinak <omartinak@gmail.com>
-
-pkgname=sfml
-pkgver=2.0rc1
-pkgrel=3
-pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
-arch=('i686' 'x86_64')
-url='http://www.sfml-dev.org/'
-license=('zlib')
-depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
-makedepends=('mesa' 'cmake' 'doxygen')
-install=sfml.install
-source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc")
-md5sums=('03c8e6817f4525092b94a3d44e8eada8')
-
-build() {
-  cd "$srcdir"/Laurent*
-
-  mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
-        -DBUILD_DOC=true \
-        -DBUILD_EXAMPLES=true
-  make
-  make doc
-}
-
-package() {
-  cd "$srcdir"/Laurent*/build
-
-  make DESTDIR="$pkgdir/" install
-
-  install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake"
-
-  install -Dm644 ../license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
diff --git a/community-staging/sfml/sfml.install b/community-staging/sfml/sfml.install
deleted file mode 100644
index 75f760be6..000000000
--- a/community-staging/sfml/sfml.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-    echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually"
-}
diff --git a/community-staging/sigil/PKGBUILD b/community-staging/sigil/PKGBUILD
deleted file mode 100644
index 339aee5f3..000000000
--- a/community-staging/sigil/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 75700 2012-08-29 08:34:34Z spupykin $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=sigil
-pkgver=0.5.3
-pkgrel=1
-pkgdesc="WYSIWYG ebook editor"
-arch=('i686' 'x86_64') 
-url="http://code.google.com/p/sigil/"
-license=('GPL3')
-depends=('qtwebkit' 'boost-libs')
-makedepends=('cmake' 'gendesk' 'boost')
-install=sigil.install
-source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip")
-md5sums=('83c1a5608a2ec59a83c86ccc1429b5cc')
-
-build() {
-  cd "${srcdir}"
-  gendesk -n
-
-  mkdir build
-  cd build
-  cmake -G "Unix Makefiles" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
-    -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON ..
-
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make install DESTDIR="${pkgdir}"
-
-  install -d -m 0755 "${pkgdir}"/usr/share/applications
-  install -m 0644 "${srcdir}"/${pkgname}.desktop \
-    "${pkgdir}"/usr/share/applications
-
-  for _pic in 16 32 48 128 256; do
-    install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
-      "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
-  done
-  install -Dm644 ../src/Sigil/Resource_Files/icon/app_icon_128.png \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
diff --git a/community-staging/sigil/sigil.install b/community-staging/sigil/sigil.install
deleted file mode 100644
index ec506fa93..000000000
--- a/community-staging/sigil/sigil.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/skrooge/PKGBUILD b/community-staging/skrooge/PKGBUILD
deleted file mode 100644
index 98b3c078c..000000000
--- a/community-staging/skrooge/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 74938 2012-08-10 02:26:22Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Ray Rashif <schiv@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
-
-pkgname=skrooge
-pkgver=1.3.0
-pkgrel=2
-pkgdesc="A personal finances manager for KDE"
-arch=('i686' 'x86_64')
-url="http://skrooge.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'libofx' 'qca-ossl')
-makedepends=('cmake' 'automoc4' 'docbook-xsl')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7f8ec247084a005b743bb080ded5724f6c1ee3644c135e12002c80df93fddfe9')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/skrooge/skrooge.changelog b/community-staging/skrooge/skrooge.changelog
deleted file mode 100644
index ffc491ba5..000000000
--- a/community-staging/skrooge/skrooge.changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-2012-08-09  Eric Belanger  <eric@archlinux.org>
-	* skrooge 1.3.0-2 Rebuild against libofx 0.9.5
-
-2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* skrooge 1.3.0-1
-
-2012-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* skrooge 1.2.0-1
-
-2011-11-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* skrooge 1.1.1-1
diff --git a/community-staging/skrooge/skrooge.install b/community-staging/skrooge/skrooge.install
deleted file mode 100644
index 050474c59..000000000
--- a/community-staging/skrooge/skrooge.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-  kbuildsycoca4 &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD
deleted file mode 100644
index e91975d83..000000000
--- a/community-staging/smc/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 73645 2012-07-12 13:48:41Z stativ $
-# Maintainer:
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Kritoke <typeolinux@yahoo.com>
-
-pkgname=smc
-pkgver=1.9
-pkgrel=16
-pkgdesc="Secret Maryo Chronicles"
-arch=('i686' 'x86_64')
-url="http://www.secretmaryo.org/"
-license=('GPL3')
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
-makedepends=('autoconf' 'automake' 'boost')
-source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2
-        smc-for-cegui-v0-7.diff
-        boost_filesystem3.diff
-        smc.desktop
-        smc.png)
-md5sums=('75ab7826303c49aec25b052a8b90287f'
-         '51dfea21b741ad19df14e738df52f1cf'
-         '309a5a6d4b3c0b3dc5e1b7f4de84086f'
-         '80fe208132ff41dd7677a53ee429ecdb'
-         'efca7580e28748625eb676c9d24ee122')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # to remove when smc will be compatible with cegui-0.7.x
-  patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff"
-  # fix compilation
-  export CXXFLAGS="${CXXFLAGS} -fpermissive"
-  # fix for boost >= 1.50
-  patch -Np1 -i "${srcdir}/boost_filesystem3.diff"
-
-  ./autogen.sh
-  LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make install DESTDIR="$pkgdir"
-  # install some freedesktop.org compatibility
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  rm -rf "$pkgdir/usr/share/smc/"
-}
diff --git a/community-staging/smc/boost_filesystem3.diff b/community-staging/smc/boost_filesystem3.diff
deleted file mode 100644
index 6786b98f5..000000000
--- a/community-staging/smc/boost_filesystem3.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rup smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new/src/core/filesystem/filesystem.cpp
---- smc-1.9/src/core/filesystem/filesystem.cpp	2009-07-04 12:11:18.000000000 +0200
-+++ smc-1.9.new/src/core/filesystem/filesystem.cpp	2012-07-12 15:36:31.361941069 +0200
-@@ -142,27 +142,27 @@ vector<std::string> Get_Directory_Files(
- 			if( fs::is_directory( *dir_itr ) )
- 			{
- 				// ignore hidden directories
--				if( dir_itr->path().leaf().find( "." ) == 0 )
-+				if( dir_itr->path().filename().string().find( "." ) == 0 )
- 				{
- 					continue;
- 				}
- 
- 				if( with_directories )
- 				{
--					valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+					valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 				}
- 
- 				// load all items from the sub-directory
- 				if( search_in_sub_directories )
- 				{
--					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories );
-+					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories );
- 					valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
- 				}
- 			}
- 			// valid file
--			else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos )
-+			else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos )
- 			{
--				valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+				valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 			}
- 		}
- 		catch( const std::exception &ex )
-diff -rup smc-1.9/src/overworld/world_manager.cpp smc-1.9.new/src/overworld/world_manager.cpp
---- smc-1.9/src/overworld/world_manager.cpp	2009-08-16 18:44:52.000000000 +0200
-+++ smc-1.9.new/src/overworld/world_manager.cpp	2012-07-12 15:37:13.564660591 +0200
-@@ -118,7 +118,7 @@ void cOverworld_Manager :: Load_Dir( con
- 	{

- 		try

- 		{

--			std::string current_dir = dir_itr->path().leaf();

-+			std::string current_dir = dir_itr->path().filename().string();

- 

- 			// only directories with an existing description

- 			if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )

diff --git a/community-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff
deleted file mode 100644
index a99cbce6c..000000000
--- a/community-staging/smc/smc-for-cegui-v0-7.diff
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
---- smc-1.9/configure.ac	2009-08-17 15:59:00.000000000 +0200
-+++ smc-1.9-b/configure.ac	2011-01-19 00:43:37.809884881 +0100
-@@ -53,7 +53,7 @@
- 	AC_MSG_ERROR([SDL_ttf library not found]))
- 
- # Check for the CEGUI library
--PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
-+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
- CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
- LIBS="$LIBS $CEGUI_LIBS"
- 
-diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
---- smc-1.9/src/core/editor.cpp	2009-08-13 17:11:42.000000000 +0200
-+++ smc-1.9-b/src/core/editor.cpp	2011-01-19 00:44:46.734328121 +0100
-@@ -118,16 +118,10 @@
- 	return tmp;

- }

- 

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

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

- {

- 	// draw text

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

--}

--

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

--{

--	// draw text

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

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

- }

- 

- void cEditor_Item_Object :: Draw_Image( void )

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

- 	{

- 		// Listbox dimension

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

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

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

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

- 		// Vertical ScrollBar Position

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

- 		// font height

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

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

- 

- 		// draw items

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

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

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

- 	// draw

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

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

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

- 	// draw image

- 	void Draw_Image( void );

- 

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

- 

- 	// align text

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

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

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

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

- 

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

- 

- 	// align text

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

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

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

- 

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

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

- 

- 	// set window height

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

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

- 

- 	while( draw )

- 	{

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

- 

- 		// update position

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

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

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

- 

- 		if( text_width > 800.0f )

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

- void cMouseCursor :: Render( void ) const

- {

--	if( !m_active )

--	{

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

-+

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

- 		return;

--	}

- 

--	// Render CEGUI Mouse

--	pGuiRenderer->setQueueingEnabled( 0 );

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

--	mouse->setVisible( 1 );

--	mouse->draw();

--	mouse->setVisible( 0 );

-+	mouse->setVisible( m_active );

- }

- 

- void cMouseCursor :: Update_Position( void )

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

- 	// preview window

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

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

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

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

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

- 

- 	Update_BG_Colors( CEGUI::EventArgs() );

- 

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

- 	// set default rect

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

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

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

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

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

- 

- 	if( !File_Exists( filename ) )

- 	{

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

- 	window_name->setTooltipText( tooltip );

- 	// get text width

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

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

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

- 	// all names should have the same width

- 	if( text_width > m_editor_window_name_width )

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

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

- 

--cFake_Renderer :: cFake_Renderer( void )

--{

--	d_identifierString = "Fake Renderer";

--}

-+//cFake_Renderer :: cFake_Renderer( void )

-+//{

-+//	d_identifierString = "Fake Renderer";

-+//}

- 

--cFake_Renderer :: ~cFake_Renderer( void )

--{

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

-+//{

- 

--}

-+//}

- 

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

- 

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

- #endif

- 	// create fake system and renderer

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

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

- }

- 

- void cVideo :: Delete_CEGUI_Fake( void ) const

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

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

- 

--	delete pGuiSystem;

-+	pGuiSystem->destroy();

- 	pGuiSystem = NULL;

- 	delete renderer;

- 	delete rp;

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

- 	try

- 	{

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

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

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

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

- 	}

- 

--	/* create Resource Provider

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

--	*/

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

-+	pGuiRenderer->enableExtraStateSettings(true);

-+

-+	// create Resource Provider

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

- 

- 	// set Resource Provider directories

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

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

- 	try

- 	{

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

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

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

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

- 	try

- 	{

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

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

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

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

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

- 	// force new mouse image

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

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

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

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

- 	// default tooltip

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

- 	// create default root window

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

- 

- 		// send new size to CEGUI

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

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

- 

- 		// check if CEGUI is initialized

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

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

- // CEGUI

- #include "CEGUI.h"

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

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

- 

- namespace SMC

- {

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

- };

- 

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

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

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

-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer

-+{

-+	void draw() const {}

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

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

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

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

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

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

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

-+	void reset() {}

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

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

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

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

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

-+};

- 

--class cFake_Renderer : public CEGUI::Renderer

-+class cFake_Texture : public CEGUI::Texture

-+{

-+public:

-+	cFake_Texture() :

-+	  m_size(1, 1),

-+	  m_scaling(1, 1) {}

-+

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

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

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

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

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

-+	void saveToMemory(void*) {}

-+

-+private:

-+	CEGUI::Size m_size;

-+	CEGUI::Vector2 m_scaling;

-+};

-+

-+class cFake_RenderTarget : public CEGUI::RenderTarget

- {

- public:

--	cFake_Renderer( void );

--	virtual ~cFake_Renderer( void );

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

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

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

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

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

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

-+	void activate() {}

-+	void deactivate() {}

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

-+

-+private:

-+	CEGUI::Rect m_area;

-+};

- 

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

--	virtual	void doRender(void) {};

--	virtual	void clearRenderList(void) {};

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

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

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

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

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

--	virtual void destroyAllTextures(void) {};

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

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

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

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

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

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

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

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

-+class cFake_Renderer : public CEGUI::Renderer

-+{

-+public:

-+	cFake_Renderer( void ) :

-+	  m_size(0, 0),

-+	  m_dpi(0, 0),

-+	  m_identifierString("Fake Renderer"),

-+	  m_root(m_target) {}

-+	~cFake_Renderer( void ) {}

-+

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

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

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

-+	void destroyAllGeometryBuffers() {}

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

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

-+	void destroyAllTextureTargets() {}

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

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

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

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

-+	void destroyAllTextures() {}

-+	void beginRendering() {}

-+	void endRendering() {}

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

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

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

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

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

-+

-+private:

-+	CEGUI::Size m_size;

-+	CEGUI::Vector2 m_dpi;

-+	CEGUI::String m_identifierString;

-+	cFake_GeometryBuffer m_geometry;

-+	cFake_Texture m_texture;

-+	cFake_RenderTarget m_target;

-+	CEGUI::RenderingRoot m_root;

- };

- 

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

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

-Name=Secret Maryo Chronicles

-GenericName=Arcade Game

-Exec=smc

-Icon=smc.png

-Terminal=false

-Type=Application

-Categories=Game;ArcadeGame;KidsGame;

-StartupNotify=false
\ No newline at end of file
diff --git a/community-staging/smc/smc.png b/community-staging/smc/smc.png
deleted file mode 100644
index f02af1bfc..000000000
--- a/community-staging/smc/smc.png
+++ /dev/null
diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD
deleted file mode 100644
index 9dc8d199f..000000000
--- a/community-staging/spring/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 78694 2012-10-22 21:41:06Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=0.91.0
-_pkgver=91.0
-pkgrel=3
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
-url="http://springrts.com/"
-license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
-         'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
-optdepends=('python2: python-based bots'
-            'java-runtime: java-based bots')
-install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('8849ace38f2ae20dc100b9d0a8d743e9')
-
-build() {
-  bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
-  
-  cd spring_${_pkgver}
-
-  sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h
- 
-  cmake	. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES
-  make
-}
-
-package() {
-  cd spring_${_pkgver}
-
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/etc/spring"
-  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
-}
-
-# vim sw=2:ts=2 et:
diff --git a/community-staging/spring/boost-1.50.patch b/community-staging/spring/boost-1.50.patch
deleted file mode 100644
index f8a8b5695..000000000
--- a/community-staging/spring/boost-1.50.patch
+++ /dev/null
@@ -1,2539 +0,0 @@
-diff -ru spring_89.0/rts/Game/Camera/CameraController.cpp /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp
---- spring_89.0/rts/Game/Camera/CameraController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -59,7 +59,7 @@
- bool CCameraController::GetUseDistToGroundForIcons() {
- 
- 	const float3& dir     = GetDir().UnsafeNormalize();
--	const float dot       = std::min(1.0f, std::max(0.0f, fabs(dir.dot(UpVector))));
-+	const float dot       = std::min(1.0f, std::max(0.0f, math::fabs(dir.dot(UpVector))));
- 
- 	if (dot < switchVal) {
- 		// flat angle (typical for first person camera)
-diff -ru spring_89.0/rts/Game/Camera/FPSController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp
---- spring_89.0/rts/Game/Camera/FPSController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -80,9 +80,9 @@
- 		oldHeight = pos.y - gndHeight;
- 	}
- 
--	dir.x = (float)(cos(camera->rot.x) * sin(camera->rot.y));
--	dir.z = (float)(cos(camera->rot.x) * cos(camera->rot.y));
--	dir.y = (float)(sin(camera->rot.x));
-+	dir.x = (float)(math::cos(camera->rot.x) * math::sin(camera->rot.y));
-+	dir.z = (float)(math::cos(camera->rot.x) * math::cos(camera->rot.y));
-+	dir.y = (float)(math::sin(camera->rot.x));
- 	dir.ANormalize();
- }
- 
-diff -ru spring_89.0/rts/Game/Camera/FreeController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp
---- spring_89.0/rts/Game/Camera/FreeController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -51,9 +51,9 @@
- 	dir = float3(0.0f, -2.0f, -1.0f);
- 	dir.ANormalize();
- 	if (camera) {
--		const float hDist = sqrt((dir.x * dir.x) + (dir.z * dir.z));
--		camera->rot.y = atan2(dir.x, dir.z);
--		camera->rot.x = atan2(dir.y, hDist);
-+		const float hDist = math::sqrt((dir.x * dir.x) + (dir.z * dir.z));
-+		camera->rot.y = math::atan2(dir.x, dir.z);
-+		camera->rot.x = math::atan2(dir.y, hDist);
- 	}
- 	pos -= (dir * 1000.0f);
- 
-@@ -84,14 +84,14 @@
- 
- 	// lock the view direction to the target
- 	const float3 diff(trackPos - pos);
--	const float rads = atan2(diff.x, diff.z);
-+	const float rads = math::atan2(diff.x, diff.z);
- 	camera->rot.y = rads;
- 
- 	const float len2D = diff.Length2D();
--	if (fabs(len2D) <= 0.001f) {
-+	if (math::fabs(len2D) <= 0.001f) {
- 		camera->rot.x = 0.0f;
- 	} else {
--		camera->rot.x = atan2((trackPos.y - pos.y), len2D);
-+		camera->rot.x = math::atan2((trackPos.y - pos.y), len2D);
- 	}
- 
- 	camera->UpdateForward();
-@@ -130,11 +130,11 @@
- 		if (pos.y < (gndHeight + gndOffset + 1.0f)) {
- 			float3 hDir;
- 			hDir.y = 0.0f;
--			hDir.x = (float)sin(camera->rot.y);
--			hDir.z = (float)cos(camera->rot.y);
-+			hDir.x = (float)math::sin(camera->rot.y);
-+			hDir.z = (float)math::cos(camera->rot.y);
- 			const float3 gndNormal = ground->GetSmoothNormal(pos.x, pos.z, false);
- 			const float dot = gndNormal.dot(hDir);
--			const float gndRotX = (float)acos(dot) - (PI * 0.5f);
-+			const float gndRotX = (float)math::acos(dot) - (PI * 0.5f);
- 			const float rotXdiff = (gndRotX - camera->rot.x);
- 			autoTiltVel = (autoTilt * rotXdiff);
- 		}
-@@ -214,8 +214,8 @@
- 		// convert the angular velocity into its positional change
- 		const float3 diff2 = (pos - trackPos);
- 		const float deltaRad = (avel.y * ft);
--		const float cos_val = cos(deltaRad);
--		const float sin_val = sin(deltaRad);
-+		const float cos_val = math::cos(deltaRad);
-+		const float sin_val = math::sin(deltaRad);
- 		pos.x = trackPos.x + ((cos_val * diff2.x) + (sin_val * diff2.z));
- 		pos.z = trackPos.z + ((cos_val * diff2.z) - (sin_val * diff2.x));
- 	}
-@@ -246,7 +246,7 @@
- 		if (pos.y < minHeight) {
- 			pos.y = minHeight;
- 			if (gndLock) {
--				vel.y = min(fabs(scrollSpeed), ((minHeight - prevPos.y) / ft));
-+				vel.y = min(math::fabs(scrollSpeed), ((minHeight - prevPos.y) / ft));
- 			} else {
- 				vel.y = 0.0f;
- 			}
-@@ -263,7 +263,7 @@
- 		camera->rot.x = -xRotLimit;
- 		avel.x = 0.0f;
- 	}
--	camera->rot.y = fmod(camera->rot.y, PI * 2.0f);
-+	camera->rot.y = math::fmod(camera->rot.y, PI * 2.0f);
- 
- 	// setup for the next loop
- 	prevVel  = vel;
-@@ -277,9 +277,9 @@
- float3 CFreeController::GetDir() const
- {
- 	float3 dir;
--	dir.x = (float)(sin(camera->rot.y) * cos(camera->rot.x));
--	dir.z = (float)(cos(camera->rot.y) * cos(camera->rot.x));
--	dir.y = (float)(sin(camera->rot.x));
-+	dir.x = (float)(math::sin(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.z = (float)(math::cos(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.y = (float)(math::sin(camera->rot.x));
- 	dir.ANormalize();
- 	return dir;
- }
-@@ -373,7 +373,7 @@
- 	if ((yDiff * dir.y) >= 0.0f) {
- 		pos = float3(newPos.x, h, newPos.z);
- 	} else {
--		pos = target - (dir * fabs(yDiff / dir.y));
-+		pos = target - (dir * math::fabs(yDiff / dir.y));
- 	} // FIXME
- /*
- 	const float oldPosY = pos.y;
-diff -ru spring_89.0/rts/Game/Camera/OrbitController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp
---- spring_89.0/rts/Game/Camera/OrbitController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -51,8 +51,8 @@
- 	const float3 w = (v / v.Length()); // do not normalize v in-place
- 
- 	const float d = v.Length();
--	const float e = RAD2DEG(acos(v.Length2D() / d));
--	const float r = RAD2DEG(acos(w.x));
-+	const float e = RAD2DEG(math::acos(v.Length2D() / d));
-+	const float r = RAD2DEG(math::acos(w.x));
- 
- 	distance  = cDistance = d;
- 	elevation = cElevation = e;
-@@ -251,12 +251,12 @@
- 	float tx = cx;
- 
- 	tx = cx;
--	cx = cx * cos(beta) + cy * sin(beta);
--	cy = tx * sin(beta) + cy * cos(beta);
-+	cx = cx * math::cos(beta) + cy * math::sin(beta);
-+	cy = tx * math::sin(beta) + cy * math::cos(beta);
- 
- 	tx = cx;
--	cx = cx * cos(gamma) - cz * sin(gamma);
--	cz = tx * sin(gamma) + cz * cos(gamma);
-+	cx = cx * math::cos(gamma) - cz * math::sin(gamma);
-+	cz = tx * math::sin(gamma) + cz * math::cos(gamma);
- 
- 	return float3(cx, cy, cz);
- }
-diff -ru spring_89.0/rts/Game/Camera/OverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp
---- spring_89.0/rts/Game/Camera/OverheadController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -52,7 +52,7 @@
- 		move.x = -move.x;
- 		move.y = -move.y;
- 	}
--	move *= sqrt(move.z) * 200;
-+	move *= math::sqrt(move.z) * 200;
- 
- 	pos.x += move.x * pixelSize * 2.0f * scrollSpeed;
- 	pos.z -= move.y * pixelSize * 2.0f * scrollSpeed;
-diff -ru spring_89.0/rts/Game/Camera/RotOverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp
---- spring_89.0/rts/Game/Camera/RotOverheadController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -29,7 +29,7 @@
- 
- void CRotOverheadController::KeyMove(float3 move)
- {
--	move *= sqrt(move.z) * 400;
-+	move *= math::sqrt(move.z) * 400;
- 
- 	float3 flatForward = camera->forward;
- 	if(camera->forward.y < -0.9f)
-@@ -68,9 +68,9 @@
- 
- void CRotOverheadController::UpdateVectors()
- {
--	dir.x=(float)(sin(camera->rot.y) * cos(camera->rot.x));
--	dir.y=(float)(sin(camera->rot.x));
--	dir.z=(float)(cos(camera->rot.y) * cos(camera->rot.x));
-+	dir.x=(float)(math::sin(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.y=(float)(math::sin(camera->rot.x));
-+	dir.z=(float)(math::cos(camera->rot.y) * math::cos(camera->rot.x));
- 	dir.ANormalize();
- 
- 	pos.x = Clamp(pos.x, 0.01f, gs->mapx * SQUARE_SIZE - 0.01f);
-diff -ru spring_89.0/rts/Game/Camera/SmoothController.cpp /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp
---- spring_89.0/rts/Game/Camera/SmoothController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -55,7 +55,7 @@
- 		move.y = -move.y;
- 	}
- 
--	move *= sqrt(move.z) * 200.0f;
-+	move *= math::sqrt(move.z) * 200.0f;
- 
- 	const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed);
- 
-@@ -103,7 +103,7 @@
- 		move.x = -move.x;
- 		move.y = -move.y;
- 	}
--	move *= sqrt(move.z) * 200.0f;
-+	move *= math::sqrt(move.z) * 200.0f;
- 
- 	const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed);
- 
-diff -ru spring_89.0/rts/Game/Camera/TWController.cpp /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp
---- spring_89.0/rts/Game/Camera/TWController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -35,7 +35,7 @@
- 	flatForward.y=0;
- 	flatForward.ANormalize();
- 
--	move *= sqrt(move.z) * 200;
-+	move *= math::sqrt(move.z) * 200;
- 	pos  += (camera->right * move.x + flatForward * move.y) * scrollSpeed;
- 	UpdateVectors();
- }
-@@ -79,9 +79,9 @@
- 
- 	camera->rot.x = Clamp(camera->rot.x, -PI * 0.4f, -0.1f);
- 
--	dir.x = sin(camera->rot.y) * cos(camera->rot.x);
--	dir.y = sin(camera->rot.x);
--	dir.z = cos(camera->rot.y) * cos(camera->rot.x);
-+	dir.x = math::sin(camera->rot.y) * math::cos(camera->rot.x);
-+	dir.y = math::sin(camera->rot.x);
-+	dir.z = math::cos(camera->rot.y) * math::cos(camera->rot.x);
- 	dir.ANormalize();
- }
- 
-diff -ru spring_89.0/rts/Game/Camera.cpp /home/svenstaro/src/spring/rts/Game/Camera.cpp
---- spring_89.0/rts/Game/Camera.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -89,7 +89,7 @@
- 	up.UnsafeANormalize();
- 
- 	const float aspect = globalRendering->aspectRatio;
--	const float viewx = tan(aspect * halfFov);
-+	const float viewx = math::tan(aspect * halfFov);
- 	const float viewy = tanHalfFov;
- 
- 	if (globalRendering->viewSizeY <= 0) {
-@@ -218,9 +218,9 @@
- 
- void CCamera::UpdateForward()
- {
--	forward.z = cos(rot.y) * cos(rot.x);
--	forward.x = sin(rot.y) * cos(rot.x);
--	forward.y = sin(rot.x);
-+	forward.z = math::cos(rot.y) * math::cos(rot.x);
-+	forward.x = math::sin(rot.y) * math::cos(rot.x);
-+	forward.y = math::sin(rot.x);
- 	forward.Normalize();
- }
- 
-@@ -229,7 +229,7 @@
- {
- 	fov = myfov;
- 	halfFov = (fov * 0.5f) * (PI / 180.f);
--	tanHalfFov = tan(halfFov);
-+	tanHalfFov = math::tan(halfFov);
- }
- 
- 
-@@ -330,7 +330,7 @@
- 	float3 pInt;
- 
- 	// prevent DIV0 when calculating line.dir
--	if (fabs(xdir.z) < 0.001f)
-+	if (math::fabs(xdir.z) < 0.001f)
- 		xdir.z = 0.001f;
- 
- 	if (ydir.y != 0.0f) {
-diff -ru spring_89.0/rts/Game/CameraHandler.cpp /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp
---- spring_89.0/rts/Game/CameraHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -139,7 +139,7 @@
- 		cameraTimeLeft = std::max(0.0f, (cameraTimeLeft - globalRendering->lastFrameTime));
- 		const float nextTime = cameraTimeLeft;
- 		const float exp = cameraTimeExponent;
--		const float ratio = 1.0f - (float)pow((nextTime / currTime), exp);
-+		const float ratio = 1.0f - (float)math::pow((nextTime / currTime), exp);
- 
- 		const float  deltaFOV = wantedCamFOV - camera->GetFov();
- 		const float3 deltaPos = wantedCamPos - camera->pos;
-diff -ru spring_89.0/rts/Game/GameServer.cpp /home/svenstaro/src/spring/rts/Game/GameServer.cpp
---- spring_89.0/rts/Game/GameServer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/GameServer.cpp	2012-07-13 06:34:42.936060485 +0200
-@@ -253,7 +253,7 @@
- 	// Something in CGameServer::CGameServer borks the FPU control word
- 	// maybe the threading, or something in CNet::InitServer() ??
- 	// Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- }
- 
-diff -ru spring_89.0/rts/Game/SelectedUnitsAI.cpp /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp
---- spring_89.0/rts/Game/SelectedUnitsAI.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp	2012-07-13 06:34:43.086060494 +0200
-@@ -179,7 +179,7 @@
- 		const float3 sideDir = frontdir.cross(UpVector);
- 
- 		// calculate so that the units form in an aproximate square
--		float length = 100.0f + (sqrt((float)nbrOfSelectedUnits) * 32.0f);
-+		float length = 100.0f + (math::sqrt((float)nbrOfSelectedUnits) * 32.0f);
- 
- 		// push back some extra params so it confer with a front move
- 		c.params.push_back(pos.x + (sideDir.x * length));
-diff -ru spring_89.0/rts/Game/TraceRay.cpp /home/svenstaro/src/spring/rts/Game/TraceRay.cpp
---- spring_89.0/rts/Game/TraceRay.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/TraceRay.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -75,7 +75,7 @@
- 	if (closeFlatLength > length)
- 		closeFlatLength = length;
- 
--	if (fabs(linear - quadratic * closeFlatLength) < 0.15f) {
-+	if (math::fabs(linear - quadratic * closeFlatLength) < 0.15f) {
- 		// relatively flat region -> use approximation
- 		dif.y -= (linear + quadratic * closeFlatLength) * closeFlatLength;
- 
-diff -ru spring_89.0/rts/Game/UI/EndGameBox.cpp /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp
---- spring_89.0/rts/Game/UI/EndGameBox.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -29,11 +29,11 @@
- 
- 	if (num == 0) {
- 		sprintf(c, "0");
--	} else if (fabs(num) < 10 * mul) {
-+	} else if (math::fabs(num) < 10 * mul) {
- 		sprintf(c, "%.1f",  num);
--	} else if (fabs(num) < 10000 * mul) {
-+	} else if (math::fabs(num) < 10000 * mul) {
- 		sprintf(c, "%.0f",  num);
--	} else if (fabs(num) < 10000000 * mul) {
-+	} else if (math::fabs(num) < 10000000 * mul) {
- 		sprintf(c, "%.0fk", num / 1000);
- 	} else {
- 		sprintf(c, "%.0fM", num / 1000000);
-@@ -165,7 +165,7 @@
- 	if (dispMode > 0 ) {
- 		if ((mx > (box.x1 + 0.01f)) && (mx < (box.x1 + 0.12f)) &&
- 		    (my < (box.y1 + 0.57f)) && (my > (box.y1 + 0.571f - stats.size()*0.02f))) {
--			int sel = (int) floor(-(my - box.y1 - 0.57f) * 50);
-+			int sel = (int) math::floor(-(my - box.y1 - 0.57f) * 50);
- 
- 			if (button == 1) {
- 				stat1 = sel;
-@@ -341,7 +341,7 @@
- 
- 		if ((mx > box.x1 + 0.01f) && (mx < box.x1 + 0.12f) &&
- 		    (my < box.y1 + 0.57f) && (my > box.y1 + 0.571f - (stats.size() * 0.02f))) {
--			const int sel = (int) floor(50 * -(my - box.y1 - 0.57f));
-+			const int sel = (int) math::floor(50 * -(my - box.y1 - 0.57f));
- 
- 			glColor4f(0.7f, 0.2f, 0.2f, guiAlpha);
- 			glDisable(GL_TEXTURE_2D);
-diff -ru spring_89.0/rts/Game/UI/EndGameBox.h /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h
---- spring_89.0/rts/Game/UI/EndGameBox.h	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h	2012-07-13 06:34:43.066060493 +0200
-@@ -60,8 +60,8 @@
- 			if (team >= 0 && static_cast<size_t>(team) >= values.size()) {
- 				values.resize(team + 1);
- 			}
--			if (values[team].size() > 0 && fabs(value-values[team].back()) > maxdif) {
--				maxdif = fabs(value-values[team].back());
-+			if (values[team].size() > 0 && math::fabs(value-values[team].back()) > maxdif) {
-+				maxdif = math::fabs(value-values[team].back());
- 			}
- 
- 			values[team].push_back(value);
-diff -ru spring_89.0/rts/Game/UI/MouseCursor.cpp /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp
---- spring_89.0/rts/Game/UI/MouseCursor.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -355,7 +355,7 @@
- 		return;
- 	}
- 
--	animTime = fmod(animTime + globalRendering->lastFrameTime, animPeriod);
-+	animTime = math::fmod(animTime + globalRendering->lastFrameTime, animPeriod);
- 
- 	if (animTime < frames[currentFrame].startTime) {
- 		currentFrame = 0;
-diff -ru spring_89.0/rts/Game/UI/ResourceBar.cpp /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp
---- spring_89.0/rts/Game/UI/ResourceBar.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -48,11 +48,11 @@
- 
- 	if (num == 0)
- 		sprintf(c, "0");
--	if (       fabs(num) < (10       * mul)) {
-+	if (       math::fabs(num) < (10       * mul)) {
- 		sprintf(c, "%.1f",  num);
--	} else if (fabs(num) < (10000    * mul)) {
-+	} else if (math::fabs(num) < (10000    * mul)) {
- 		sprintf(c, "%.0f",  num);
--	} else if (fabs(num) < (10000000 * mul)) {
-+	} else if (math::fabs(num) < (10000000 * mul)) {
- 		sprintf(c, "%.0fk", num / 1000);
- 	} else {
- 		sprintf(c, "%.0fM", num / 1000000);
-@@ -180,11 +180,11 @@
- 
- 	smallFont->SetTextColor(1.0f, 0.3f, 0.3f, 1.0f); // Expenses
- 	smallFont->glFormat(metalx  + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)",
--			FloatToSmallString(fabs(myTeam->prevMetalPull)).c_str(),
--			FloatToSmallString(fabs(myTeam->metalSent)).c_str());
-+			FloatToSmallString(math::fabs(myTeam->prevMetalPull)).c_str(),
-+			FloatToSmallString(math::fabs(myTeam->metalSent)).c_str());
- 	smallFont->glFormat(energyx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)",
--			FloatToSmallString(fabs(myTeam->prevEnergyPull)).c_str(),
--			FloatToSmallString(fabs(myTeam->energySent)).c_str());
-+			FloatToSmallString(math::fabs(myTeam->prevEnergyPull)).c_str(),
-+			FloatToSmallString(math::fabs(myTeam->energySent)).c_str());
- 
- 	smallFont->SetTextColor(0.4f, 1.0f, 0.4f, 0.95f); // Income
- 	smallFont->glFormat(metalx  + 0.044f, box.y2 - 2*globalRendering->pixelY, labelsFontSize, FONT_ASCENDER | fontOptions, "+%s",
-diff -ru spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp
---- spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -367,9 +367,9 @@
- 				camera->rot.x=-1;
- 
- 			float3 wantedCamDir;
--			wantedCamDir.x=(float)(sin(camera->rot.y)*cos(camera->rot.x));
--			wantedCamDir.y=(float)(sin(camera->rot.x));
--			wantedCamDir.z=(float)(cos(camera->rot.y)*cos(camera->rot.x));
-+			wantedCamDir.x=(float)(math::sin(camera->rot.y)*math::cos(camera->rot.x));
-+			wantedCamDir.y=(float)(math::sin(camera->rot.x));
-+			wantedCamDir.z=(float)(math::cos(camera->rot.y)*math::cos(camera->rot.x));
- 			wantedCamDir.ANormalize();
- 
- 			camHandler->GetCurrentController().SetPos(sel->pos - wantedCamDir*800);
-diff -ru spring_89.0/rts/Game/UI/UnitTracker.cpp /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp
---- spring_89.0/rts/Game/UI/UnitTracker.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -297,8 +297,8 @@
-   			modPlanePos.y = minHeight;
- 		}
- 
--		trackPos += (modPlanePos - trackPos) * (1 - pow(0.95f, deltaTime));
--		trackDir += (u->frontdir - trackDir) * (1 - pow(0.90f, deltaTime));
-+		trackPos += (modPlanePos - trackPos) * (1 - math::pow(0.95f, deltaTime));
-+		trackDir += (u->frontdir - trackDir) * (1 - math::pow(0.90f, deltaTime));
- 		trackDir.ANormalize();
- 
- 		camera->pos = trackPos;
-diff -ru spring_89.0/rts/lib/gml/gmlsrv.h /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h
---- spring_89.0/rts/lib/gml/gmlsrv.h	2012-07-10 00:10:09.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h	2012-07-13 06:34:43.209393834 +0200
-@@ -361,7 +361,7 @@
- 		if (gmlShareLists) {
- 			ogc[thr]->WorkerThreadPost();
- 		}
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 		while(dorun) {
- 			gmlClientSub();
- 		}
-@@ -452,7 +452,7 @@
- 		Threading::SetThreadName("sim");
- 		Watchdog::RegisterThread(WDT_SIM, true);
- 		set_threadnum(GML_SIM_THREAD_NUM);
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 		while(dorun) {
- 			gmlClientAuxSub();
- 		}
-diff -ru spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp
---- spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp	2012-07-10 00:10:09.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp	2012-07-13 06:35:00.626061514 +0200
-@@ -12,10 +12,16 @@
- extern "C" {
- #endif
- 
-+#if (BOOST_VERSION >= 105000) //boost 1.50 renamed TIME_UTC to TIME_UTC_
-+	#define SPRING_UTCTIME boost::TIME_UTC_
-+#else
-+	#define SPRING_UTCTIME boost::TIME_UTC
-+#endif
-+
- int stub_sdl_getSystemMilliSeconds() {
- 
- 	boost::xtime t;
--	boost::xtime_get(&t, boost::TIME_UTC);
-+	boost::xtime_get(&t, SPRING_UTCTIME);
- 	const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000);   
- 	return milliSeconds;
- }
-@@ -23,7 +29,7 @@
- void stub_sdl_sleepMilliSeconds(int milliSeconds) {
- 
- 	boost::xtime t;
--	boost::xtime_get(&t, boost::TIME_UTC);
-+	boost::xtime_get(&t, SPRING_UTCTIME);
- 	t.nsec += 1000000 * milliSeconds;
- 	boost::thread::sleep(t);
- }
-diff -ru spring_89.0/rts/lib/streflop/streflopC.cpp /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp
---- spring_89.0/rts/lib/streflop/streflopC.cpp	2012-07-10 00:10:10.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -9,16 +9,16 @@
- #endif
- 
- void streflop_init_Simple() {
--	streflop_init<Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void streflop_init_Double() {
--	streflop_init<Double>();
-+	streflop::streflop_init<streflop::Double>();
- }
- 
- #if defined(Extended)
- void streflop_init_Extended() {
--	streflop_init<Extended>();
-+	streflop::streflop_init<streflop::Extended>();
- }
- #endif // defined(Extended)
- 
-diff -ru spring_89.0/rts/lib/streflop/streflop_cond.h /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h
---- spring_89.0/rts/lib/streflop/streflop_cond.h	2012-07-10 00:10:10.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h	2012-07-13 06:34:42.906060483 +0200
-@@ -11,8 +11,6 @@
- 
- #if defined(STREFLOP_X87) || defined(STREFLOP_SSE) || defined(STREFLOP_SOFT)
- #include "streflop.h"
--using namespace streflop;
--
- namespace math {
- 	using namespace streflop;
- }
-@@ -20,6 +18,7 @@
- #include <cmath>
- namespace math {
- 	using std::fabs;
-+	// We are using fastmath::sqrt_sse instead!
- 	// using std::sqrt;
- 	using std::sin;
- 	using std::cos;
-diff -ru spring_89.0/rts/Map/BasicMapDamage.cpp /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp
---- spring_89.0/rts/Map/BasicMapDamage.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -33,7 +33,7 @@
- 
- 	for (int a = 0; a <= CRATER_TABLE_SIZE; ++a) {
- 		const float r = a / float(CRATER_TABLE_SIZE);
--		const float d = cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * cos(std::max(0.0f, r * 3 - 2) * PI));
-+		const float d = math::cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * math::cos(std::max(0.0f, r * 3 - 2) * PI));
- 		craterTable[a] = d;
- 	}
- 
-@@ -83,7 +83,7 @@
- 	const float* curHeightMap = readmap->GetCornerHeightMapSynced();
- 	const float* orgHeightMap = readmap->GetOriginalHeightMapSynced();
- 	const unsigned char* typeMap = readmap->GetTypeMapSynced();
--	const float baseStrength = -pow(strength, 0.6f) * 3 / mapHardness;
-+	const float baseStrength = -math::pow(strength, 0.6f) * 3 / mapHardness;
- 	const float invRadius = 1.0f / radius;
- 
- 	for (int y = e->y1; y <= e->y2; ++y) {
-@@ -111,7 +111,7 @@
- 				orgHeightMap[y * gs->mapxp1 + x];
- 
- 			if (prevDif * dif > 0.0f) {
--				dif /= fabs(prevDif) * 0.1f + 1;
-+				dif /= math::fabs(prevDif) * 0.1f + 1;
- 			}
- 
- 			e->squares.push_back(dif);
-@@ -148,7 +148,7 @@
- 						orgHeightMap[z * gs->mapxp1 + x];
- 
- 				if (prevDif * dif > 0.0f) {
--					dif /= fabs(prevDif) * 0.1f + 1;
-+					dif /= math::fabs(prevDif) * 0.1f + 1;
- 				}
- 
- 				totalDif += dif;
-diff -ru spring_89.0/rts/Map/Ground.cpp /home/svenstaro/src/spring/rts/Map/Ground.cpp
---- spring_89.0/rts/Map/Ground.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/Ground.cpp	2012-07-13 06:34:43.086060494 +0200
-@@ -433,8 +433,8 @@
- 
- float3 CGround::GetSmoothNormal(float x, float y, bool synced) const
- {
--	int sx = (int) floor(x / SQUARE_SIZE);
--	int sy = (int) floor(y / SQUARE_SIZE);
-+	int sx = (int) math::floor(x / SQUARE_SIZE);
-+	int sy = (int) math::floor(y / SQUARE_SIZE);
- 
- 	if (sy < 1)
- 		sy = 1;
-diff -ru spring_89.0/rts/Map/SM3/Plane.cpp /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp
---- spring_89.0/rts/Map/SM3/Plane.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -15,7 +15,7 @@
- 	a = ry1*rz2 - ry2*rz1;
- 	b = rz1*rx2 - rz2*rx1;
- 	c = rx1*ry2 - rx2*ry1;
--	float len = (float)sqrt(a*a + b*b + c*c);
-+	float len = (float)math::sqrt(a*a + b*b + c*c);
- 	a /= len;
- 	b /= len;
- 	c /= len;
-@@ -37,10 +37,10 @@
- bool Plane::EpsilonCompare(const Plane& pln, float epsilon)
- {
- 	Plane t;
--	t.a = fabs(a - pln.a);
--	t.b = fabs(b - pln.b);
--	t.c = fabs(c - pln.c);
--	t.d = fabs(d - pln.d);
-+	t.a = math::fabs(a - pln.a);
-+	t.b = math::fabs(b - pln.b);
-+	t.c = math::fabs(c - pln.c);
-+	t.d = math::fabs(d - pln.d);
- 	if (t.a > epsilon || t.b > epsilon || t.c > epsilon || t.d > epsilon) {
- 		return false;
- 	}
-diff -ru spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp
---- spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -197,7 +197,7 @@
- 					continue;
- 			}
- 
--			float len = sqrt(dx*dx + dy*dy);
-+			float len = math::sqrt(dx*dx + dy*dy);
- 			const float step = 5.0f;
- 			float invLength2d = step / len;
- 			dx *= invLength2d;
-diff -ru spring_89.0/rts/Map/SM3/terrain/Textures.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp
---- spring_89.0/rts/Map/SM3/terrain/Textures.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -248,7 +248,7 @@
- 				}
- 
- 				// flatness=dotproduct of surface normal with up vector
--				float slope = 1.0f - fabs(norm_y);
-+				float slope = 1.0f - math::fabs(norm_y);
- 
- 				if (slope < gi->minSlope - gi->minSlopeFuzzy) {
- 					bm->at(x,y) = 0.0f;
-@@ -307,7 +307,7 @@
- 				Vector3 n;
- 
- 				if (sx*sx + sy*sy < 32*32) {
--					const int sz = (int)sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy));
-+					const int sz = (int)math::sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy));
- 					n = Vector3(sx, sy, sz);
- 					n.ANormalize();
- 				}
-diff -ru spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp
---- spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -99,7 +99,7 @@
- 	const int minz =  bty * smfReadMap->bigTexSize;
- 	const int maxz = minz + smfReadMap->bigTexSize;
- 	const float miny = readmap->currMinHeight;
--	const float maxy = fabs(cam->pos.y);
-+	const float maxy = math::fabs(cam->pos.y);
- 
- 	const float3 mins(                   0, miny, minz);
- 	const float3 maxs(smfReadMap->mapSizeX, maxy, maxz);
-diff -ru spring_89.0/rts/Map/SMF/ROAM/Patch.cpp /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp
---- spring_89.0/rts/Map/SMF/ROAM/Patch.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -405,7 +405,7 @@
- 
- 	// Variance of this triangle is the actual height at it's hypotenuse midpoint minus the interpolated height.
- 	// Use values passed on the stack instead of re-accessing the Height Field.
--	float myVariance = fabs(centerZ - ((leftZ + rightZ) / 2));
-+	float myVariance = math::fabs(centerZ - ((leftZ + rightZ) / 2));
- 	
- 	if (leftZ*rightZ<0 || leftZ*centerZ<0 || rightZ*centerZ<0)
- 		myVariance = std::max(myVariance * 1.5f, 20.0f); //shore lines get more variance for higher accuracy
-diff -ru spring_89.0/rts/Map/SMF/SMFRenderState.cpp /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp
---- spring_89.0/rts/Map/SMF/SMFRenderState.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -385,7 +385,7 @@
- 	smfShaderCurrARB->SetUniformTarget(GL_VERTEX_PROGRAM_ARB);
- 	smfShaderCurrARB->SetUniform4f(10, 1.0f / (gs->pwr2mapx * SQUARE_SIZE), 1.0f / (gs->pwr2mapy * SQUARE_SIZE), 0, 1);
- 	smfShaderCurrARB->SetUniform4f(12, 1.0f / smfMap->bigTexSize, 1.0f / smfMap->bigTexSize, 0, 1);
--	smfShaderCurrARB->SetUniform4f(13, -floor(camera->pos.x * 0.02f), -floor(camera->pos.z * 0.02f), 0, 0);
-+	smfShaderCurrARB->SetUniform4f(13, -math::floor(camera->pos.x * 0.02f), -math::floor(camera->pos.z * 0.02f), 0, 0);
- 	smfShaderCurrARB->SetUniform4f(14, 0.02f, 0.02f, 0, 1);
- 	smfShaderCurrARB->SetUniformTarget(GL_FRAGMENT_PROGRAM_ARB);
- 	smfShaderCurrARB->SetUniform4f(10, ambientColor.x, ambientColor.y, ambientColor.z, 1);
-diff -ru spring_89.0/rts/Rendering/Env/AdvSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp
---- spring_89.0/rts/Rendering/Env/AdvSky.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -65,8 +65,8 @@
- 	memset(thicknessTransform, 0, 1024);
- 	memset(covers, 0, 4 * 32 * sizeof(float));
- 
--	domeheight = cos(PI / 16) * 1.01f;
--	domeWidth = sin(2 * PI / 32) * 400 * 1.7f;
-+	domeheight = math::cos(PI / 16) * 1.01f;
-+	domeWidth = math::sin(2 * PI / 32) * 400 * 1.7f;
- 
- 	UpdateSkyDir();
- 	InitSun();
-@@ -383,7 +383,7 @@
- 	case 0: {
- 		for(int a=0; a<CLOUD_DETAIL; a++) {
- 			float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a)));
--			fade -= floor(fade/2)*2;
-+			fade -= math::floor(fade/2)*2;
- 			if(fade>1) {
- 				fade = 2 - fade;
- 				if(!cloudDown[a]) {
-@@ -417,11 +417,11 @@
- 		int qcda=(4<<CLOUD_DETAIL)>>a;
- 		int *pkernel=kernel;
- 		for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) {
--			float ydist=fabs(1.0f+y-cs8a)/cs8a;
-+			float ydist=math::fabs(1.0f+y-cs8a)/cs8a;
- 			ydist=ydist*ydist*(3-2*ydist);
- 			int *pkrn=pkernel;
- 			for(int x=0; x<cs4a; ++x) {
--				float xdist=fabs(1.0f+x-cs8a)/cs8a;
-+				float xdist=math::fabs(1.0f+x-cs8a)/cs8a;
- 				xdist=xdist*xdist*(3-2*xdist);
- 
- 				float contrib=(1-xdist)*(1-ydist);
-@@ -533,7 +533,7 @@
- 	unsigned char *tt=thicknessTransform;
- 	for(int a=0;a<1024;++a){
- 		float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f;
--		float alpha=pow(f*2,3);
-+		float alpha=math::pow(f*2,3);
- 		if(alpha>1)
- 			alpha=1;
- 		*at=(int) (alpha*255);
-@@ -560,11 +560,11 @@
- 
- 	float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256;
- 	float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f;
--	int baseY=int(floor(fy))&CLOUD_MASK;
--	fy-=floor(fy);
-+	int baseY=int(math::floor(fy))&CLOUD_MASK;
-+	fy-=math::floor(fy);
- 	float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f;
--	int baseX=int(floor(fx))&CLOUD_MASK;
--	fx-=floor(fx);
-+	int baseX=int(math::floor(fx))&CLOUD_MASK;
-+	fx-=math::floor(fx);
- 
- 	float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3];
- 	if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){
-@@ -622,8 +622,8 @@
- 	glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- 	glBegin(GL_TRIANGLE_STRIP);
- 	for(int x=0;x<257;++x){
--		float dx = sin(x*2*PI/256.0f);
--		float dy = cos(x*2*PI/256.0f);
-+		float dx = math::sin(x*2*PI/256.0f);
-+		float dy = math::cos(x*2*PI/256.0f);
- 
- 		glTexCoord2f(x/256.0f,0.125f);
- 		glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f);
-@@ -646,7 +646,7 @@
- 			mem[(y*128+x)*4+0]=255;
- 			mem[(y*128+x)*4+1]=255;
- 			mem[(y*128+x)*4+2]=255;
--			float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
-+			float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
- 			if(dist>60)
- 				mem[(y*128+x)*4+3]=0;
- 			else
-@@ -749,7 +749,7 @@
- 
- 	for(int a=0;a<5;++a){
- 		float fade = gs->frameNum / float(30<<a);
--		fade -= floor(fade/2)*2;
-+		fade -= math::floor(fade/2)*2;
- 		int size = std::min(32,256>>a);
- 
- 		if(fade>1){
-@@ -770,7 +770,7 @@
- 
- 		}
- 		float tSize = std::max(1,8>>a);
--		float c = pow(2.0f,a)*6/255.0f;
-+		float c = math::pow(2.0f,a)*6/255.0f;
- 		CVertexArray* va = GetVertexArray();
- 		va->Initialize();
- 		va->CheckInitSize(4*VA_SIZE_T);
-@@ -867,10 +867,10 @@
- 
- 	const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z);
- 	const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle;
--	const float fy = asin(hdist / 400);
-+	const float fy = math::asin(hdist / 400);
- 
--	dir.x = hdist * cos(ang);
--	dir.z = hdist * sin(ang);
-+	dir.x = hdist * math::cos(ang);
-+	dir.z = hdist * math::sin(ang);
- 	dir.y = (fastmath::cos(fy) - domeheight) * 400;
- 
- 	dir.ANormalize();
-@@ -903,7 +903,7 @@
- 	const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f);
- 
- 	const float sunInt = skyLight->GetLightIntensity();
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50;
- 	const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 3.0f / (1 + sunDist));
- 
- 	const float green = std::min(1.0f, (0.55f + sunMod));
-@@ -918,7 +918,7 @@
- void CAdvSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) {
- 	const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f);
- 
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70;
- 	const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist);
- 
- 	const float red   = std::min(skyColor.x + sunMod * sunColor.x, 1.0f);
-diff -ru spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp
---- spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -229,7 +229,7 @@
- 			std::list<FallingTree>::iterator prev = fti++;
- 			fallingTrees.erase(prev);
- 		} else {
--			fti->speed += (sin(fti->fallPos) * 0.04f);
-+			fti->speed += (math::sin(fti->fallPos) * 0.04f);
- 			++fti;
- 		}
- 	}
-@@ -616,7 +616,7 @@
- 			if (camera->InView(pos + float3(0.0f, MAX_TREE_HEIGHT / 2, 0.0f), MAX_TREE_HEIGHT / 2.0f)) {
- 				const float ang = fti->fallPos * PI;
- 
--				const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang));
-+				const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang));
- 				const float3 zvec((yvec.cross(float3(-1.0f, 0.0f, 0.0f))).ANormalize());
- 				const float3 xvec(yvec.cross(zvec));
- 
-@@ -957,7 +957,7 @@
- 			if (camera->InView(pos + float3(0, MAX_TREE_HEIGHT / 2, 0), MAX_TREE_HEIGHT / 2)) {
- 				const float ang = fti->fallPos * PI;
- 
--				const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang));
-+				const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang));
- 				const float3 zvec((yvec.cross(float3(1.0f, 0.0f, 0.0f))).ANormalize());
- 				const float3 xvec(zvec.cross(yvec));
- 
-diff -ru spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp
---- spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -159,9 +159,9 @@
- 	int numIter=(int)max(3.0f,size*10);
- 	for(int a=0;a<=numIter;a++){
- 		float angle=a/(float)numIter*2*PI;
--		float col=0.4f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f;
--		barkva->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col));
--		barkva->AddVertexTN(end+orto1*sin(angle)*size*0.2f+orto2*cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col));
-+		float col=0.4f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f;
-+		barkva->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col));
-+		barkva->AddVertexTN(end+orto1*math::sin(angle)*size*0.2f+orto2*math::cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col));
- 	}
- 	barkva->EndStrip();
- }
-@@ -176,18 +176,18 @@
- 
- 	for (int a = 0; a < numBranch; ++a) {
- 		const float angle = baseAngle + (a * 3.88f) + fRand(0.5f);
--		float3 dir = orto1 * sin(angle) + orto2 * cos(angle);
-+		float3 dir = orto1 * math::sin(angle) + orto2 * math::cos(angle);
- 			dir.y = 0.3f + fRand(0.4f);
- 			dir.ANormalize();
- 		const float3 start(0, (a + 5) * height / (numBranch + 5), 0);
--		const float length = (height * (0.4f + fRand(0.1f))) * sqrt(float(numBranch - a) / numBranch);
-+		const float length = (height * (0.4f + fRand(0.1f))) * math::sqrt(float(numBranch - a) / numBranch);
- 
- 		TrunkIterator(start, dir, length, length * 0.05f, 1);
- 	}
- 
- 	for (int a = 0; a < 3; ++a) {
- 		const float angle = (a * 3.88f) + fRand(0.5f);
--		float3 dir = orto1*sin(angle)+orto2*cos(angle);
-+		float3 dir = orto1*math::sin(angle)+orto2*math::cos(angle);
- 			dir.y = 0.8f;
- 			dir.ANormalize();
- 		const float3 start(0, height - 0.3f, 0);
-@@ -225,7 +225,7 @@
- 		const float newLength = length * (float(numTrunks - a) / (numTrunks + 1));
- 
- 		float3 newbase = start + dir * length * (float(a + 1) / (numTrunks + 1));
--		float3 newDir = dir + orto1 * cos(angle) * dirDif + orto2 * sin(angle) * dirDif;
-+		float3 newDir = dir + orto1 * math::cos(angle) * dirDif + orto2 * math::sin(angle) * dirDif;
- 		newDir.ANormalize();
- 
- 		TrunkIterator(newbase, newDir, newLength, newLength * 0.05f, depth - 1);
-@@ -245,8 +245,8 @@
- 
- 		float3 pos = start + dir * length * (0.7f + fRand(0.3f));
- 		pos +=
--			(orto1 * sin(angle) + orto2 * cos(angle)) *
--			(sqrt((float) a + 1) * 0.6f + fRand(0.4f)) *
-+			(orto1 * math::sin(angle) + orto2 * math::cos(angle)) *
-+			(math::sqrt((float) a + 1) * 0.6f + fRand(0.4f)) *
- 			0.1f * MAX_TREE_HEIGHT;
- 
- 		if (pos.y < 0.2f * MAX_TREE_HEIGHT)
-@@ -538,12 +538,12 @@
- 	float baseAngle=fRand(2*PI);
- 	for(int a=0;a<numBranch;++a){
- 		float sh = 0.2f + fRand(0.2f);
--		float h  = height * pow(sh + float(a)/numBranch * (1-sh), (float)0.7f);
-+		float h  = height * math::pow(sh + float(a)/numBranch * (1-sh), (float)0.7f);
- 		float angle = baseAngle + (a * 0.618f + fRand(0.1f)) * 2 * PI;
--		float3 dir(orto1 * sin(angle) + orto2 * cos(angle));
-+		float3 dir(orto1 * math::sin(angle) + orto2 * math::cos(angle));
- 		dir.y = (a - numBranch) * 0.01f - (0.2f + fRand(0.2f));
- 		dir.ANormalize();
--		float size = sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT;
-+		float size = math::sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT;
- 		DrawPineBranch(float3(0,h,0),dir,size);
- 	}
- 	//create the top
-@@ -569,16 +569,16 @@
- 	for(int a=0;a<numIter;a++){
- 		float angle=a/(float)numIter*2*PI;
- 		float angle2=(a+1)/(float)numIter*2*PI;
--		float col=0.45f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f;
--		float col2=0.45f+(((orto1*sin(angle2)+orto2*cos(angle2)).dot(flatSun)))*0.3f;
-+		float col=0.45f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f;
-+		float col2=0.45f+(((orto1*math::sin(angle2)+orto2*math::cos(angle2)).dot(flatSun)))*0.3f;
- 
--		va->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,           angle/PI*0.125f*0.5f+0.5f,  0, float3(0,0,col));
--		va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
--		va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
--
--		va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
--		va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
--		va->AddVertexTN(end+orto1*sin(angle2)*size*0.1f+orto2*cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2));
-+		va->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,           angle/PI*0.125f*0.5f+0.5f,  0, float3(0,0,col));
-+		va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
-+		va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
-+
-+		va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
-+		va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
-+		va->AddVertexTN(end+orto1*math::sin(angle2)*size*0.1f+orto2*math::cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2));
- 	}
- }
- 
-diff -ru spring_89.0/rts/Rendering/Env/AdvWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp
---- spring_89.0/rts/Rendering/Env/AdvWater.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -48,7 +48,7 @@
- 	for (int y = 0; y < 64; ++y) {
- 		for (int x = 0; x < 64; ++x) {
- 			scrap[(y*64 + x)*4 + 0] = 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)(sin(y*PI*2.0f/64.0f)*128 + 128);
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)(math::sin(y*PI*2.0f/64.0f)*128 + 128);
- 			scrap[(y*64 + x)*4 + 2] = 0;
- 			scrap[(y*64 + x)*4 + 3] = 255;
- 		}
-@@ -62,8 +62,8 @@
- 		for (int x = 0; x < 64; ++x) {
- 			const float ang = 26.5f*PI/180.0f;
- 			const float pos = y*2+x;
--			scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128;
- 		}
- 	}
- 	glBindTexture(GL_TEXTURE_2D, rawBumpTexture[1]);
-@@ -75,8 +75,8 @@
- 		for (int x = 0; x < 64; ++x) {
- 			const float ang = -19*PI/180.0f;
- 			const float pos = 3*y - x;
--			scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128;
- 		}
- 	}
- 	glBindTexture(GL_TEXTURE_2D, rawBumpTexture[2]);
-@@ -192,14 +192,14 @@
- 				dir = xbase + dv;
- 				dir.ANormalize();
- 				zpos = camera->pos + dir*(camera->pos.y / -dir.y);
--				zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
-+				zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
- 				col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255);
- 				va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY - yInc, col);
- 
- 				dir = xbase;
- 				dir.ANormalize();
- 				zpos = camera->pos + dir*(camera->pos.y / -dir.y);
--				zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
-+				zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
- 				col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255);
- 				va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY, col);
- 
-diff -ru spring_89.0/rts/Rendering/Env/BasicSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp
---- spring_89.0/rts/Rendering/Env/BasicSky.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -67,8 +67,8 @@
- 	rawClouds=newmat2<int>(CLOUD_SIZE,CLOUD_SIZE);
- 	blendMatrix=newmat3<int>(CLOUD_DETAIL,32,32);
- 
--	domeheight=cos(PI/16)*1.01f;
--	domeWidth=sin(PI/16)*400*1.7f;
-+	domeheight=math::cos(PI/16)*1.01f;
-+	domeWidth=math::sin(PI/16)*400*1.7f;
- 
- 	UpdateSkyDir();
- 	InitSun();
-@@ -369,7 +369,7 @@
- 	case 0: {
- 		for(int a=0; a<CLOUD_DETAIL; a++) {
- 			float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a)));
--			fade -= floor(fade/2)*2;
-+			fade -= math::floor(fade/2)*2;
- 			if(fade>1) {
- 				fade = 2 - fade;
- 				if(!cloudDown[a]) {
-@@ -403,11 +403,11 @@
- 		int qcda=(4<<CLOUD_DETAIL)>>a;
- 		int *pkernel=kernel;
- 		for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) {
--			float ydist=fabs(1.0f+y-cs8a)/cs8a;
-+			float ydist=math::fabs(1.0f+y-cs8a)/cs8a;
- 			ydist=ydist*ydist*(3-2*ydist);
- 			int *pkrn=pkernel;
- 			for(int x=0; x<cs4a; ++x) {
--				float xdist=fabs(1.0f+x-cs8a)/cs8a;
-+				float xdist=math::fabs(1.0f+x-cs8a)/cs8a;
- 				xdist=xdist*xdist*(3-2*xdist);
- 
- 				float contrib=(1-xdist)*(1-ydist);
-@@ -506,7 +506,7 @@
- 	unsigned char *tt=thicknessTransform;
- 	for(int a=0;a<1024;++a){
- 		float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f;
--		float alpha=pow(f*2,3);
-+		float alpha=math::pow(f*2,3);
- 		if(alpha>1)
- 			alpha=1;
- 		*at=(unsigned char)(alpha*255);
-@@ -533,11 +533,11 @@
- 
- 	float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256;
- 	float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f;
--	int baseY=int(floor(fy))&CLOUD_MASK;
--	fy-=floor(fy);
-+	int baseY=int(math::floor(fy))&CLOUD_MASK;
-+	fy-=math::floor(fy);
- 	float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f;
--	int baseX=int(floor(fx))&CLOUD_MASK;
--	fx-=floor(fx);
-+	int baseX=int(math::floor(fx))&CLOUD_MASK;
-+	fx-=math::floor(fx);
- 
- 	float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3];
- 	if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){
-@@ -589,8 +589,8 @@
- 		glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- 		glBegin(GL_TRIANGLE_STRIP);
- 		for(int x=0;x<257;++x){
--			float dx=sin(x*2*PI/256.0f);
--			float dy=cos(x*2*PI/256.0f);
-+			float dx=math::sin(x*2*PI/256.0f);
-+			float dy=math::cos(x*2*PI/256.0f);
- 
- 			glTexCoord2f(x/256.0f,0.25f);
- 			glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f);
-@@ -613,7 +613,7 @@
- 			mem[(y*128+x)*4+0]=255;
- 			mem[(y*128+x)*4+1]=255;
- 			mem[(y*128+x)*4+2]=255;
--			float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
-+			float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
- 			if(dist>60)
- 				mem[(y*128+x)*4+3]=0;
- 			else
-@@ -764,10 +764,10 @@
- 
- 	const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z);
- 	const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle;
--	const float fy = asin(hdist / 400);
-+	const float fy = math::asin(hdist / 400);
- 
--	dir.x = hdist * cos(ang);
--	dir.z = hdist * sin(ang);
-+	dir.x = hdist * math::cos(ang);
-+	dir.z = hdist * math::sin(ang);
- 	dir.y = (fastmath::cos(fy) - domeheight) * 400;
- 
- 	dir.ANormalize();
-@@ -800,7 +800,7 @@
- 	const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f);
- 
- 	const float sunInt = skyLight->GetLightIntensity();
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50;
- 	const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 2.0f / sunDist);
- 
- 	const float green = std::min(1.0f, (0.55f + sunMod));
-@@ -814,7 +814,7 @@
- void CBasicSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) {
- 	const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f);
- 
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70;
- 	const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist);
- 
- 	const float red   = std::min(skyColor.x + sunMod * sunColor.x, 1.0f);
-diff -ru spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp
---- spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -269,7 +269,7 @@
- 	for (int x = 0; x < size; ++x) {
- 		const float3 dir = (cdir + (xdif * (x + 0.5f)) / size + (ydif * (y + 0.5f)) / size).Normalize();
- 		const float dot  = std::max(0.0f, dir.dot(sky->GetLight()->GetLightDir()));
--		const float spec = std::min(1.0f, pow(dot, mapInfo->light.specularExponent) + pow(dot, 3.0f) * 0.25f);
-+		const float spec = std::min(1.0f, math::pow(dot, mapInfo->light.specularExponent) + math::pow(dot, 3.0f) * 0.25f);
- 
- 		buf[x * 4 + 0] = (mapInfo->light.unitSpecularColor.x * spec * 255);
- 		buf[x * 4 + 1] = (mapInfo->light.unitSpecularColor.y * spec * 255);
-diff -ru spring_89.0/rts/Rendering/Env/DynWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp
---- spring_89.0/rts/Rendering/Env/DynWater.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -88,9 +88,9 @@
- 
- 	for (int y = 0; y < 64; ++y) {
- 		for (int x = 0; x < 64; ++x) {
--			temp[(y*64 + x)*4 + 0] = sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f;
-+			temp[(y*64 + x)*4 + 0] = math::sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f;
- 			temp[(y*64 + x)*4 + 1] = temp[(y*64 + x)*4 + 0];
--			temp[(y*64 + x)*4 + 2] = cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f;
-+			temp[(y*64 + x)*4 + 2] = math::cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f;
- 			temp[(y*64 + x)*4 + 3] = 0;
- 		}
- 	}
-@@ -197,7 +197,7 @@
- 		const float dy = y - 31.5f;
- 		for (int x = 0; x < 64; ++x) {
- 			const float dx = x-31.5f;
--			const float dist = sqrt(dx*dx + dy*dy);
-+			const float dist = math::sqrt(dx*dx + dy*dy);
- 			temp[(y*64 + x)*4 + 0] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f);
- 			temp[(y*64 + x)*4 + 1] = std::max(0.0f, 1 - dist/30.f);
- 			temp[(y*64 + x)*4 + 2] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f);
-@@ -425,8 +425,8 @@
- 
- 	oldCamPosBig = camPosBig;
- 
--	camPosBig.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
--	camPosBig.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
- 
- 	glDisable(GL_DEPTH_TEST);
- 	glDepthMask(0);
-@@ -835,8 +835,8 @@
- 	va = GetVertexArray();
- 	va->Initialize();
- 
--	camPosBig2.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
--	camPosBig2.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig2.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig2.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
- 
- 	// FIXME:
- 	//     1. DynWater::UpdateCamRestraints was never called ==> <this->left> and <this->right> were always empty
-@@ -1132,8 +1132,8 @@
- 				// hovercraft
- 				const float3& pos = unit->pos;
- 
--				if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
--					(fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+				if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
-+					(math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 				{
- 					continue;
- 				}
-@@ -1144,7 +1144,7 @@
- 				if ((pos.y > -4.0f) && (pos.y < 4.0f)) {
- 					const float3 frontAdd = unit->frontdir * unit->radius * 0.75f;
- 					const float3 sideAdd = unit->rightdir * unit->radius * 0.75f;
--					const float depth = sqrt(sqrt(unit->mass)) * 0.4f;
-+					const float depth = math::sqrt(math::sqrt(unit->mass)) * 0.4f;
- 					const float3 n(depth, 0.05f * depth, depth);
- 
- 					va2->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n);
-@@ -1156,8 +1156,8 @@
- 				// surface ship
- 				const float3& pos = unit->pos;
- 
--				if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
--					(fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+				if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
-+					(math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 				{
- 					continue;
- 				}
-@@ -1171,7 +1171,7 @@
- 
- 				const float3 frontAdd = unit->frontdir * unit->radius * 0.75f;
- 				const float3 sideAdd = unit->rightdir * unit->radius * 0.18f;
--				const float depth = sqrt(sqrt(unit->mass));
-+				const float depth = math::sqrt(math::sqrt(unit->mass));
- 				const float3 n(depth, 0.04f * unit->speed.Length2D() * depth, depth);
- 
- 				va->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n);
-@@ -1249,8 +1249,8 @@
- 	for (std::vector<Explosion>::iterator ei = explosions.begin(); ei != explosions.end(); ++ei) {
- 		Explosion& explo = *ei;
- 		float3 pos = explo.pos;
--		if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50))
--				|| (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+		if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50))
-+				|| (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 		{
- 			continue;
- 		}
-diff -ru spring_89.0/rts/Rendering/Env/GrassDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp
---- spring_89.0/rts/Rendering/Env/GrassDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -75,11 +75,11 @@
- 	}
- 
- 	// TODO: get rid of the magic constants
--	maxGrassDist = 800 + sqrt((float) detail) * 240;
-+	maxGrassDist = 800 + math::sqrt((float) detail) * 240;
- 	maxDetailedDist = 146 + detail * 24;
- 	detailedBlocks = int((maxDetailedDist - 24) / bMSsq) + 1;
- 	numTurfs = 3 + int(detail * 0.5f);
--	strawPerTurf = 50 + int(sqrt((float) detail) * 10);
-+	strawPerTurf = 50 + int(math::sqrt((float) detail) * 10);
- 
- 	blocksX = gs->mapx / grassSquareSize  /grassBlockSize;
- 	blocksY = gs->mapy / grassSquareSize / grassBlockSize;
-@@ -641,7 +641,7 @@
- 		const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize();
- 		const float3 billboardDirY = billboardDirX.cross(billboardDirZ);
- 
--		const float ang = acos(billboardDirZ.y);
-+		const float ang = math::acos(billboardDirZ.y);
- 		const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30))));
- 
- 		if (globalRendering->haveGLSL) {
-@@ -673,7 +673,7 @@
- 			const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize();
- 			const float3 billboardDirY = billboardDirX.cross(billboardDirZ);
- 
--			const float ang = acos(billboardDirZ.y);
-+			const float ang = math::acos(billboardDirZ.y);
- 			const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30))));
- 
- 			if (globalRendering->haveGLSL) {
-@@ -820,7 +820,7 @@
- 		float3 forwardVect = sideVect.cross(UpVector);
- 		sideVect *= mapInfo->grass.bladeWidth;
- 
--		const float3 cornerPos = (UpVector * cos(maxAng) + forwardVect * sin(maxAng)) * length;
-+		const float3 cornerPos = (UpVector * math::cos(maxAng) + forwardVect * math::sin(maxAng)) * length;
- 		float3 basePos(30.0f, 0.0f, 30.0f);
- 
- 		while (basePos.SqLength2D() > (turfSize * turfSize / 4)) {
-@@ -837,10 +837,10 @@
- 
- 			const float3 edgePosL =
- 				-sideVect * (1 - h) +
--				(UpVector * cos(ang) + forwardVect * sin(ang)) * length * h;
-+				(UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h;
- 			const float3 edgePosR =
- 				sideVect * (1.0f - h) +
--				(UpVector * cos(ang) + forwardVect * sin(ang)) * length * h;
-+				(UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h;
- 
- 			if (b == 0) {
- 				va->AddVertexT(basePos + (edgePosR - float3(0.0f, 0.1f, 0.0f)), xtexBase + xtexOffset, h);
-diff -ru spring_89.0/rts/Rendering/Env/SkyLight.cpp /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp
---- spring_89.0/rts/Rendering/Env/SkyLight.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -72,7 +72,7 @@
- bool DynamicSkyLight::SetLightDir(const float4& newLightDir) {
- 	if (newLightDir != lightDir) {
- 		static float4 lastUpdate = ZeroVector;
--		static const float minCosAngle = cos(1.5f * (PI/180.f));
-+		static const float minCosAngle = math::cos(1.5f * (PI/180.f));
- 
- 		if (lastUpdate.dot(newLightDir) < minCosAngle) {
- 			lastUpdate   = newLightDir;
-@@ -92,7 +92,7 @@
- 	const float angularVelocity = 2.0f * PI / sunOrbitTime;
- 
- 	const float sunAng  = startAngle - initialSunAngle - angularVelocity * gameSeconds;
--	const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * cos(sunAng), sunOrbitHeight, sunOrbitRad * sin(sunAng)));
-+	const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * math::cos(sunAng), sunOrbitHeight, sunOrbitRad * math::sin(sunAng)));
- 
- 	return sunPos;
- }
-@@ -108,18 +108,18 @@
- 	if (newLightDir.w == FLT_MAX) {
- 		// old: newLightDir is position where sun reaches highest altitude
- 		const float sunLen = newLightDir.Length2D();
--		const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : atan(newLightDir.y / sunLen);
--		const float sunHeight = tan(sunAzimuth - 0.001f);
-+		const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : math::atan(newLightDir.y / sunLen);
-+		const float sunHeight = math::tan(sunAzimuth - 0.001f);
- 
--		float3 v1(cos(initialSunAngle), sunHeight, sin(initialSunAngle));
-+		float3 v1(math::cos(initialSunAngle), sunHeight, math::sin(initialSunAngle));
- 		v1.ANormalize();
- 
- 		if (v1.y <= orbitMinSunHeight) {
- 			newLightDir = UpVector;
- 			sunOrbitHeight = v1.y;
--			sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
-+			sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
- 		} else {
--			float3 v2(cos(initialSunAngle + PI), orbitMinSunHeight, sin(initialSunAngle + PI));
-+			float3 v2(math::cos(initialSunAngle + PI), orbitMinSunHeight, math::sin(initialSunAngle + PI));
- 			v2.ANormalize();
- 			float3 v3 = v2 - v1;
- 			sunOrbitRad = v3.Length() / 2.0f;
-@@ -137,7 +137,7 @@
- 	} else {
- 		// new: newLightDir is center position of orbit, and newLightDir.w is orbit height
- 		sunOrbitHeight = std::max(-1.0f, std::min(newLightDir.w, 1.0f));
--		sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
-+		sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
- 	}
- 
- 	sunRotation.LoadIdentity();
-diff -ru spring_89.0/rts/Rendering/GL/glExtra.cpp /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp
---- spring_89.0/rts/Rendering/GL/glExtra.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -83,7 +83,7 @@
- 		float adjustment = rad/2;
- 		float ydiff = 0;
- 		int j;
--		for(j = 0; j < 50 && fabs(adjRadius - rad) + ydiff > .01*rad; j++){
-+		for(j = 0; j < 50 && math::fabs(adjRadius - rad) + ydiff > .01*rad; j++){
- 			if(adjRadius > rad) {
- 				rad += adjustment;
- 			} else {
-@@ -93,7 +93,7 @@
- 			pos.x = center.x + (sinR * rad);
- 			pos.z = center.z + (cosR * rad);
- 			float newY = ground->GetHeightAboveWater(pos.x, pos.z, false);
--			ydiff = fabs(pos.y - newY);
-+			ydiff = math::fabs(pos.y - newY);
- 			pos.y = newY;
- 			heightDiff = (pos.y - center.y);
- 			adjRadius = weapon ? weapon->GetRange2D(heightDiff*weapon->heightMod) : rad;
-diff -ru spring_89.0/rts/Rendering/GroundDecalHandler.cpp /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp
---- spring_89.0/rts/Rendering/GroundDecalHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp	2012-07-13 06:34:43.082727161 +0200
-@@ -963,7 +963,7 @@
- 		radius = damage * 0.25f;
- 
- 	if (damage > 400)
--		damage = 400 + sqrt(damage - 399);
-+		damage = 400 + math::sqrt(damage - 399);
- 
- 	pos.ClampInBounds();
- 
-diff -ru spring_89.0/rts/Rendering/InMapDrawView.cpp /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp
---- spring_89.0/rts/Rendering/InMapDrawView.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -38,7 +38,7 @@
- 	for (int y = 0; y < 64; y++) {
- 		// circular thingy
- 		for (int x = 0; x < 64; x++) {
--			float dist = sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32));
-+			float dist = math::sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32));
- 			if (dist > 31.0f) {
- 				// do nothing - leave transparent
- 			} else if (dist > 30.0f) {
-diff -ru spring_89.0/rts/Rendering/LineDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp
---- spring_89.0/rts/Rendering/LineDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -29,7 +29,7 @@
- void CLineDrawer::UpdateLineStipple()
- {
- 	stippleTimer += (globalRendering->lastFrameTime * cmdColors.StippleSpeed());
--	stippleTimer = fmod(stippleTimer, (16.0f / 20.0f));
-+	stippleTimer = math::fmod(stippleTimer, (16.0f / 20.0f));
- }
- 
- 
-diff -ru spring_89.0/rts/Rendering/Models/S3OParser.cpp /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp
---- spring_89.0/rts/Rendering/Models/S3OParser.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -319,7 +319,7 @@
- 		float3& t = tTangents[vrtIdx];
- 		int h = 1;
- 
--		if (isnan(n.x) || isnan(n.y) || isnan(n.z)) {
-+		if (math::isnan(n.x) || math::isnan(n.y) || math::isnan(n.z)) {
- 			n = float3(0.0f, 0.0f, 1.0f);
- 		}
- 		if (s == ZeroVector) { s = float3(1.0f, 0.0f, 0.0f); }
-diff -ru spring_89.0/rts/Sim/Misc/LosMap.cpp /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp
---- spring_89.0/rts/Sim/Misc/LosMap.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -182,7 +182,7 @@
- 
- 		y = (int)i;
- 		x = 1;
--		y = (int) (sqrt((float)r2 - 1) + 0.5f);
-+		y = (int) (math::sqrt((float)r2 - 1) + 0.5f);
- 		while (x < y) {
- 			if(!PaintTable[x+y*Radius]) {
- 				DrawLine(PaintTable, x, y, Radius);
-@@ -198,7 +198,7 @@
- 			}
- 
- 			x += 1;
--			y = (int) (sqrt((float)r2 - x*x) + 0.5f);
-+			y = (int) (math::sqrt((float)r2 - x*x) + 0.5f);
- 		}
- 		if (x == y) {
- 			if(!PaintTable[x+y*Radius]) {
-diff -ru spring_89.0/rts/Sim/Misc/QuadField.cpp /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp
---- spring_89.0/rts/Sim/Misc/QuadField.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -329,12 +329,12 @@
- 	float zp = start.z;
- 	const float invQuadSize = 1.0f / QUAD_SIZE;
- 
--	if ((floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) &&
--		(floor(start.z * invQuadSize) == floor(to.z * invQuadSize)))
-+	if ((math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) &&
-+		(math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)))
- 	{
- 		*endQuad = ((int(start.x * invQuadSize)) + (int(start.z * invQuadSize)) * numQuadsX);
- 		++endQuad;
--	} else if (floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) {
-+	} else if (math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) {
- 		const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX);
- 		const int last  = (int)(to.x    * invQuadSize) + ((int)(to.z    * invQuadSize) * numQuadsX);
- 
-@@ -347,7 +347,7 @@
- 				*endQuad = a; ++endQuad;
- 			}
- 		}
--	} else if (floor(start.z * invQuadSize) == floor(to.z * invQuadSize)) {
-+	} else if (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)) {
- 		const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX);
- 		const int last  = (int)(to.x    * invQuadSize) + ((int)(to.z    * invQuadSize) * numQuadsX);
- 
-@@ -369,14 +369,14 @@
- 			++endQuad;
- 
- 			if (dx > 0) {
--				xn = (floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx;
-+				xn = (math::floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx;
- 			} else {
--				xn = (floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx;
-+				xn = (math::floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx;
- 			}
- 			if (dz > 0) {
--				zn = (floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz;
-+				zn = (math::floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz;
- 			} else {
--				zn = (floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz;
-+				zn = (math::floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz;
- 			}
- 
- 			if (xn < zn) {
-@@ -388,8 +388,8 @@
- 			}
- 
- 			keepgoing =
--				(fabs(xp - start.x) < fabs(to.x - start.x)) &&
--				(fabs(zp - start.z) < fabs(to.z - start.z));
-+				(math::fabs(xp - start.x) < math::fabs(to.x - start.x)) &&
-+				(math::fabs(zp - start.z) < math::fabs(to.z - start.z));
- 		}
- 	}
- 
-diff -ru spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp	2012-07-13 06:34:43.256060504 +0200
-@@ -386,7 +386,7 @@
- 
- 	const float dif = wSpeed - currentSpeed;
- 
--	if (fabs(dif) < 0.05f) {
-+	if (math::fabs(dif) < 0.05f) {
- 		deltaSpeed = dif * 0.125f;
- 		nextDeltaSpeedUpdate = gs->frameNum + 8;
- 	} else if (dif > 0.0f) {
-@@ -529,7 +529,7 @@
- 			skidRotSpeed = 0.0f;
- 			owner->physicalState = oldPhysState;
- 			owner->moveType->useHeading = true;
--			float rp = floor(skidRotPos2 + skidRotSpeed2 + 0.5f);
-+			float rp = math::floor(skidRotPos2 + skidRotSpeed2 + 0.5f);
- 			skidRotSpeed2 = (rp - skidRotPos2) * 0.5f;
- 			ChangeHeading(owner->heading);
- 		} else {
-@@ -545,10 +545,10 @@
- 			}
- 
- 			float remTime=speedf/speedReduction-1;
--			float rp=floor(skidRotPos2+skidRotSpeed2*remTime+0.5f);
-+			float rp=math::floor(skidRotPos2+skidRotSpeed2*remTime+0.5f);
- 			skidRotSpeed2=(remTime+1 == 0 ) ? 0 : (rp-skidRotPos2)/(remTime+1);
- 
--			if(floor(skidRotPos2)!=floor(skidRotPos2+skidRotSpeed2)){
-+			if(math::floor(skidRotPos2)!=math::floor(skidRotPos2+skidRotSpeed2)){
- 				skidRotPos2=0;
- 				skidRotSpeed2=0;
- 			}
-@@ -571,7 +571,7 @@
- 				speed*=0.95f;
- 			}
- 			else {
--				speed += (normal*(fabs(speed.dot(normal)) + .1))*1.9f;
-+				speed += (normal*(math::fabs(speed.dot(normal)) + .1))*1.9f;
- 				speed*=.8;
- 			}
- 		}
-@@ -625,7 +625,7 @@
- 		float totRad = owner->radius + u->radius;
- 
- 		if (sqDist < totRad * totRad && sqDist != 0) {
--			float dist = sqrt(sqDist);
-+			float dist = math::sqrt(sqDist);
- 			float3 dif = midPos - u->midPos;
- 			dif /= std::max(dist, 1.f);
- 
-@@ -682,7 +682,7 @@
- 		float sqDist=(midPos-u->midPos).SqLength();
- 		float totRad=owner->radius+u->radius;
- 		if(sqDist<totRad*totRad && sqDist!=0){
--			float dist=sqrt(sqDist);
-+			float dist=math::sqrt(sqDist);
- 			float3 dif=midPos-u->midPos;
- 			dif/=std::max(dist, 1.f);
- 			float impactSpeed = -owner->speed.dot(dif);
-@@ -721,8 +721,8 @@
- 
- 	skidRotPos2 += skidRotSpeed2;
- 
--	float cosp = cos(skidRotPos2 * PI * 2.0f);
--	float sinp = sin(skidRotPos2 * PI * 2.0f);
-+	float cosp = math::cos(skidRotPos2 * PI * 2.0f);
-+	float sinp = math::sin(skidRotPos2 * PI * 2.0f);
- 
- 	float3 f1 = skidRotVector * skidRotVector.dot(owner->frontdir);
- 	float3 f2 = owner->frontdir - f1;
-@@ -812,7 +812,7 @@
- 						float objectDistToAvoidDirCenter = objectToUnit.dot(rightOfAvoid);
- 
- 						if (objectToUnit.dot(avoidanceDir) < radiusSum &&
--							fabs(objectDistToAvoidDirCenter) < radiusSum &&
-+							math::fabs(objectDistToAvoidDirCenter) < radiusSum &&
- 							(o->moveDef || Distance2D(owner, o) >= 0)) {
- 
- 							if (objectDistToAvoidDirCenter > 0.0f) {
-@@ -824,7 +824,7 @@
- 								rightOfAvoid = avoidanceDir.cross(float3(0.0f, 1.0f, 0.0f));
- 							} else {
- 								avoidLeft +=
--									(radiusSum - fabs(objectDistToAvoidDirCenter)) *
-+									(radiusSum - math::fabs(objectDistToAvoidDirCenter)) *
- 									AVOIDANCE_STRENGTH * fastmath::isqrt2(distanceToObjectSq);
- 								avoidanceDir -= (rightOfAvoid * avoidLeft);
- 								avoidanceDir.Normalize();
-@@ -952,7 +952,7 @@
- 	if (!decRate) {
- 		return 0.0f;
- 	}
--	return fabs(speed*speed / decRate);
-+	return math::fabs(speed*speed / decRate);
- }
- 
- float3 CClassicGroundMoveType::Here()
-@@ -1043,7 +1043,7 @@
- 			const float zmove = (owner->mapPos.y + owner->zsize / 2) * SQUARE_SIZE;
- 			const float xmove = (owner->mapPos.x + owner->xsize / 2) * SQUARE_SIZE;
- 
--			if (fabs(owner->frontdir.x) > fabs(owner->frontdir.z)) {
-+			if (math::fabs(owner->frontdir.x) > math::fabs(owner->frontdir.z)) {
- 				if (newmp.y < owner->mapPos.y) {
- 					haveCollided |= CheckColV(newmp.y, newmp.x, newmp.x + owner->xsize - 1,  zmove - 3.99f, owner->mapPos.y);
- 					newmp = owner->GetMapPos();
-@@ -1261,20 +1261,20 @@
- 			float xp = start.x;
- 			float zp = start.z;
- 
--			if (floor(start.x) == floor(to.x)) {
-+			if (math::floor(start.x) == math::floor(to.x)) {
- 				if (dz > 0.0f) {
--					for (int a = 1; a < floor(to.z); ++a)
-+					for (int a = 1; a < math::floor(to.z); ++a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				} else {
--					for (int a = -1; a > floor(to.z); --a)
-+					for (int a = -1; a > math::floor(to.z); --a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				}
--			} else if (floor(start.z) == floor(to.z)) {
-+			} else if (math::floor(start.z) == math::floor(to.z)) {
- 				if (dx > 0.0f) {
--					for (int a = 1; a < floor(to.x); ++a)
-+					for (int a = 1; a < math::floor(to.x); ++a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				} else {
--					for (int a = -1; a > floor(to.x); --a)
-+					for (int a = -1; a > math::floor(to.x); --a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				}
- 			} else {
-@@ -1283,14 +1283,14 @@
- 
- 				while (keepgoing) {
- 					if (dx > 0.0f) {
--						xn = (floor(xp) + 1.0f - xp) / dx;
-+						xn = (math::floor(xp) + 1.0f - xp) / dx;
- 					} else {
--						xn = (floor(xp)        - xp) / dx;
-+						xn = (math::floor(xp)        - xp) / dx;
- 					}
- 					if (dz > 0.0f) {
--						zn = (floor(zp) + 1.0f - zp) / dz;
-+						zn = (math::floor(zp) + 1.0f - zp) / dz;
- 					} else {
--						zn = (floor(zp)        - zp) / dz;
-+						zn = (math::floor(zp)        - zp) / dz;
- 					}
- 
- 					if (xn < zn) {
-@@ -1302,10 +1302,10 @@
- 					}
- 
- 					keepgoing =
--						fabs(xp - start.x) < fabs(to.x - start.x) &&
--						fabs(zp - start.z) < fabs(to.z - start.z);
-+						math::fabs(xp - start.x) < math::fabs(to.x - start.x) &&
-+						math::fabs(zp - start.z) < math::fabs(to.z - start.z);
- 
--					lineTable[yt][xt].push_back( int2(int(floor(xp)), int(floor(zp))) );
-+					lineTable[yt][xt].push_back( int2(int(math::floor(xp)), int(math::floor(zp))) );
- 				}
- 
- 				lineTable[yt][xt].pop_back();
-@@ -1335,7 +1335,7 @@
- 		const MoveDef& md = *(owner->unitDef->moveDef);
- 		const float cmod = movemath->GetPosSpeedMod(md, moveSquareX * 2, moveSquareY * 2);
- 
--		if (fabs(owner->frontdir.x) < fabs(owner->frontdir.z)) {
-+		if (math::fabs(owner->frontdir.x) < math::fabs(owner->frontdir.z)) {
- 			if (newMoveSquareX > moveSquareX) {
- 				const float nmod = movemath->GetPosSpeedMod(md, newMoveSquareX * 2, newMoveSquareY * 2);
- 				if (cmod > 0.01f && nmod <= 0.01f) {
-diff -ru spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp	2012-07-13 06:34:43.249393836 +0200
-@@ -1808,20 +1808,20 @@
- 			float xp = start.x;
- 			float zp = start.z;
- 
--			if (floor(start.x) == floor(to.x)) {
-+			if (math::floor(start.x) == math::floor(to.x)) {
- 				if (dz > 0.0f) {
--					for (int a = 1; a <= floor(to.z); ++a)
-+					for (int a = 1; a <= math::floor(to.z); ++a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				} else {
--					for (int a = -1; a >= floor(to.z); --a)
-+					for (int a = -1; a >= math::floor(to.z); --a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				}
--			} else if (floor(start.z) == floor(to.z)) {
-+			} else if (math::floor(start.z) == math::floor(to.z)) {
- 				if (dx > 0.0f) {
--					for (int a = 1; a <= floor(to.x); ++a)
-+					for (int a = 1; a <= math::floor(to.x); ++a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				} else {
--					for (int a = -1; a >= floor(to.x); --a)
-+					for (int a = -1; a >= math::floor(to.x); --a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				}
- 			} else {
-@@ -1830,14 +1830,14 @@
- 
- 				while (keepgoing) {
- 					if (dx > 0.0f) {
--						xn = (floor(xp) + 1.0f - xp) / dx;
-+						xn = (math::floor(xp) + 1.0f - xp) / dx;
- 					} else {
--						xn = (floor(xp)        - xp) / dx;
-+						xn = (math::floor(xp)        - xp) / dx;
- 					}
- 					if (dz > 0.0f) {
--						zn = (floor(zp) + 1.0f - zp) / dz;
-+						zn = (math::floor(zp) + 1.0f - zp) / dz;
- 					} else {
--						zn = (floor(zp)        - zp) / dz;
-+						zn = (math::floor(zp)        - zp) / dz;
- 					}
- 
- 					if (xn < zn) {
-@@ -1851,7 +1851,7 @@
- 					keepgoing =
- 						math::fabs(xp - start.x) <= math::fabs(to.x - start.x) &&
- 						math::fabs(zp - start.z) <= math::fabs(to.z - start.z);
--					int2 pt(int(floor(xp)), int(floor(zp)));
-+					int2 pt(int(math::floor(xp)), int(math::floor(zp)));
- 
- 					static const int MIN_IDX = -int(LINETABLE_SIZE / 2);
- 					static const int MAX_IDX = -MIN_IDX;
-diff -ru spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -325,7 +325,7 @@
- {
- 	#define NOZERO(x) std::max(x, 0.0001f)
- 
--	const float driftSpeed = fabs(owner->unitDef->dlHoverFactor);
-+	const float driftSpeed = math::fabs(owner->unitDef->dlHoverFactor);
- 	float3 deltaVec = goalPos - owner->pos;
- 	float3 deltaDir = float3(deltaVec.x, 0.0f, deltaVec.z);
- 	float l = NOZERO(deltaDir.Length2D());
-@@ -342,7 +342,7 @@
- 	deltaDir -= owner->speed;
- 	l = deltaDir.SqLength2D();
- 	if (l > (maxSpeed * maxSpeed)) {
--		deltaDir *= maxSpeed / NOZERO(sqrt(l));
-+		deltaDir *= maxSpeed / NOZERO(math::sqrt(l));
- 	}
- 	wantedSpeed = owner->speed + deltaDir;
- 
-diff -ru spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -412,7 +412,7 @@
- 				}
- 			}
- 
--			if (fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) {
-+			if (math::fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) {
- 				elevator = 1;
- 			}
- 			UpdateAirPhysics(0, aileron, elevator, 1, owner->frontdir);
-@@ -528,13 +528,13 @@
- 	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && frontdir.y > -0.2f && speedf > 2.0f && gs->randFloat() > 0.996f)
- 		maneuver = 1;
- 
--	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) {
-+	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && math::fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) {
- 		maneuver = 2;
- 		maneuverSubState = 0;
- 	}
- 
- 	// roll
--	if (speedf > 0.45f && pos.y + owner->speed.y * 60 * fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + fabs(rightdir.y) * 150) {
-+	if (speedf > 0.45f && pos.y + owner->speed.y * 60 * math::fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + math::fabs(rightdir.y) * 150) {
- 		const float goalBankDif = goalDotRight + rightdir.y * 0.2f;
- 		if (goalBankDif > maxAileron * speedf * 4.0f) {
- 			aileron = 1;
-@@ -706,7 +706,7 @@
- 		} else if (goalBankDif < -maxAileron * speedf * 4 && rightdir.y < maxBank) {
- 			aileron = -1;
- 		} else {
--			if (fabs(rightdir.y) < maxBank) {
-+			if (math::fabs(rightdir.y) < maxBank) {
- 				aileron = goalBankDif / (maxAileron * speedf * 4);
- 			} else {
- 				if (rightdir.y < 0.0f && goalBankDif < 0.0f) {
-@@ -762,7 +762,7 @@
- 			} else if (hdif > (maxElevator * speedf * speedf * 20) && frontdir.y < maxPitch) {
- 				elevator = 1;
- 			} else {
--				if (fabs(frontdir.y) < maxPitch)
-+				if (math::fabs(frontdir.y) < maxPitch)
- 					elevator = hdif / (maxElevator * speedf * speedf * 20);
- 			}
- 		}
-diff -ru spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp
---- spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -201,7 +201,7 @@
- 
- void CPathEstimator::CalcOffsetsAndPathCosts(int thread) {
- 	//! reset FPU state for synced computations
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	// NOTE: EstimatePathCosts() [B] is temporally dependent on CalculateBlockOffsets() [A],
- 	// A must be completely finished before B_i can be safely called. This means we cannot
-diff -ru spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp
---- spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp	2012-07-13 06:34:43.016060490 +0200
-@@ -251,7 +251,7 @@
- 
- 
- void QTPFS::PathManager::InitNodeLayersThreaded(const SRectangle& rect) {
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	char loadMsg[512] = {'\0'};
- 	const char* fmtString = "[PathManager::%s] using %u threads for %u node-layers (cached? %s)";
-@@ -310,7 +310,7 @@
- 	}
- 	#endif
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void QTPFS::PathManager::InitNodeLayersThread(
-@@ -360,7 +360,7 @@
- 
- 
- void QTPFS::PathManager::UpdateNodeLayersThreaded(const SRectangle& rect) {
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	#ifdef QTPFS_OPENMP_ENABLED
- 	{
-@@ -375,7 +375,7 @@
- 	}
- 	#endif
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void QTPFS::PathManager::UpdateNodeLayersThread(
-@@ -569,7 +569,7 @@
- 	SCOPED_TIMER("PathManager::Update");
- 
- 	#ifdef QTPFS_ENABLE_THREADED_UPDATE
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	// allow ThreadUpdate to run one iteration
- 	condThreadUpdate->notify_one();
-@@ -579,7 +579,7 @@
- 	// wait for the ThreadUpdate iteration to finish
- 	condThreadUpdated->wait(lock);
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 	#else
- 	ThreadUpdate();
- 	#endif
-diff -ru spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp
---- spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp	2012-07-13 06:34:43.082727161 +0200
-@@ -262,7 +262,7 @@
- 	damage *= gfxMod;
- 	damage = std::max(damage, 0.0f);
- 
--	const float sqrtDmg = sqrt(damage);
-+	const float sqrtDmg = math::sqrt(damage);
- 	const float camLength = camVect.Length();
- 	float moveLength = radius * 0.03f;
- 
-@@ -283,7 +283,7 @@
- 		if (airExplosion || waterExplosion) { smokeDamage *= 0.6f; }
- 
- 		if (smokeDamage > 0.01f) {
--			smokeDamageSQRT = sqrt(smokeDamage);
-+			smokeDamageSQRT = math::sqrt(smokeDamage);
- 			smokeDamageISQRT = 1.0f / (smokeDamageSQRT * 0.35f);
- 		}
- 
-@@ -507,17 +507,17 @@
- 			}
- 			case OP_SAWTOOTH: {
- 				// this translates to modulo except it works with floats
--				val -= (*(float*) code) * floor(val / (*(float*) code));
-+				val -= (*(float*) code) * math::floor(val / (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_DISCRETE: {
--				val = (*(float*) code) * floor(val / (*(float*) code));
-+				val = (*(float*) code) * math::floor(val / (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_SINE: {
--				val = (*(float*) code) * sin(val);
-+				val = (*(float*) code) * math::sin(val);
- 				code += 4;
- 				break;
- 			}
-@@ -538,12 +538,12 @@
- 				break;
- 			}
- 			case OP_POW: {
--				val = pow(val, (*(float*) code));
-+				val = math::pow(val, (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_POWBUFF: {
--				val = pow(val, buffer[(*(int*) code)]);
-+				val = math::pow(val, buffer[(*(int*) code)]);
- 				code += 4;
- 				break;
- 			}
-diff -ru spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -111,7 +111,7 @@
- 	oldSmokeDir.Normalize();
- 	const float3 camDir = (pos - camera->pos).Normalize();
- 
--	if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) {
-+	if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) {
- 		drawTrail = false;
- 	}
- 
-@@ -334,7 +334,7 @@
- 
- 			if (!drawTrail) {
- 				float3 camDir = (pos - camera->pos).Normalize();
--				if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(dir))) * 3000 > 300) {
-+				if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(dir))) * 3000 > 300) {
- 					drawTrail = true;
- 				}
- 			}
-@@ -373,7 +373,7 @@
- 				const float3 dif2 = (oldSmokePos - camera->pos).Normalize();
- 				const float3 dir2 = (dif2.cross(oldSmokeDir)).Normalize();
- 
--				float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + fabs(dif.dot(dir)));
-+				float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif.dot(dir)));
- 				float alpha = std::min(255.0f, std::max(0.f, a1));
- 				col[0] = (unsigned char) (color * alpha);
- 				col[1] = (unsigned char) (color * alpha);
-@@ -381,7 +381,7 @@
- 				col[3] = (unsigned char) (alpha);
- 
- 				unsigned char col2[4];
--				float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + fabs(dif2.dot(oldSmokeDir)));
-+				float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif2.dot(oldSmokeDir)));
- 
- 				if (age < 8)
- 					a2 = 0;
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -188,7 +188,7 @@
- 		particles[i].size = particleSize + gu->usRandFloat()*particleSizeSpread;
- 		particles[i].pos = pos;
- 
--		particles[i].speed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
-+		particles[i].speed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
- 	}
- 
- 	drawRadius = (particleSpeed + particleSpeedSpread) * (particleLife * particleLifeSpread);
-@@ -232,7 +232,7 @@
- 		const float az = gu->usRandFloat() * 2 * PI;
- 		const float ay = (emitRot + emitRotSpread*gu->usRandFloat()) * (PI / 180.0);
- 
--		float3 pspeed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
-+		float3 pspeed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
- 
- 		CGenericParticleProjectile* particle = new CGenericParticleProjectile(pos + explosionPos, pspeed, owner);
- 
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -124,7 +124,7 @@
- 		if (lastSegment) {
- 			a1 = 0;
- 		}
--		a1 *= 0.7f + fabs(dif1.dot(dir1));
-+		a1 *= 0.7f + math::fabs(dif1.dot(dir1));
- 		float alpha = std::min(255.f, std::max(0.f, a1));
- 		col[0] = (unsigned char) (color * alpha);
- 		col[1] = (unsigned char) (color * alpha);
-@@ -136,7 +136,7 @@
- 		if (firstSegment) {
- 			a2 = 0;
- 		}
--		a2 *= 0.7f + fabs(dif2.dot(dir2));
-+		a2 *= 0.7f + math::fabs(dif2.dot(dir2));
- 		alpha = std::min(255.f, std::max(0.0f, a2));
- 		col2[0] = (unsigned char) (color * alpha);
- 		col2[1] = (unsigned char) (color * alpha);
-@@ -153,7 +153,7 @@
- 
- 			unsigned char col3[4];
- 			float a2 = (1 - (float)(age + 4) / lifeTime) * 255;
--			a2 *= 0.7f + fabs(dif3.dot(middir));
-+			a2 *= 0.7f + math::fabs(dif3.dot(middir));
- 			alpha = std::min(255.0f, std::max(0.0f, a2));
- 			col3[0] = (unsigned char) (color * alpha);
- 			col3[1] = (unsigned char) (color * alpha);
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -49,7 +49,7 @@
- 		const float yp = (y + ypart) / 16.0f*PI - PI/2;
- 		for (int x = 0; x < 5; ++x) {
- 			float xp = (x + xpart) / 32.0f*2*PI;
--			vectors[y*5 + x] = float3(sin(xp)*cos(yp), sin(yp), cos(xp)*cos(yp));
-+			vectors[y*5 + x] = float3(math::sin(xp)*math::cos(yp), math::sin(yp), math::cos(xp)*math::cos(yp));
- 		}
- 	}
- 	pos = centerPos+vectors[12] * sphereSize;
-@@ -86,7 +86,7 @@
- 			float alpha =
- 				baseAlpha *
- 				(1.0f - min(1.0f, float(age + globalRendering->timeOffset) / (float) ttl)) *
--				(1.0f - fabs(y + ybase - 8.0f) / 8.0f * 1.0f);
-+				(1.0f - math::fabs(y + ybase - 8.0f) / 8.0f * 1.0f);
- 
- 			col[0] = (unsigned char) (color.x * 255.0f * alpha);
- 			col[1] = (unsigned char) (color.y * 255.0f * alpha);
-@@ -94,7 +94,7 @@
- 			col[3] = ((unsigned char) (40 * alpha)) + 1;
- 			va->AddVertexQTC(centerPos + vectors[y*5 + x]     * interSize, texx, texy, col);
- 			va->AddVertexQTC(centerPos + vectors[y*5 + x + 1] * interSize, texx, texy, col);
--			alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f);
-+			alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - math::fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f);
- 
- 			col[0] = (unsigned char) (color.x * 255.0f * alpha);
- 			col[1] = (unsigned char) (color.y * 255.0f * alpha);
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -79,7 +79,7 @@
- 	float interSize = size + sizeExpansion * globalRendering->timeOffset;
- 	float interRot = rotation + rotSpeed * globalRendering->timeOffset;
- 
--	const float3 dir1 = float3(cos(interRot), 0, sin(interRot)) * interSize;
-+	const float3 dir1 = float3(math::cos(interRot), 0, math::sin(interRot)) * interSize;
- 	const float3 dir2 = dir1.cross(UpVector);
- 
- 	#define wt projectileDrawer->waketex
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -96,7 +96,7 @@
- 	drawRadius = radius + maxSpeed * 8;
- 
- 	float3 camDir = (pos - camera->pos).ANormalize();
--	if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) < 200) {
-+	if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) < 200) {
- 		drawTrail = false;
- 	}
- 
-@@ -229,8 +229,8 @@
- 					// is too close or height difference too large)
- 					const float horDiff = (targPos - pos).Length2D() + 0.01f;
- 					const float verDiff = (targPos.y - pos.y) + 0.01f;
--					const float dirDiff = fabs(targetDir.y - dir.y);
--					const float ratio = fabs(verDiff / horDiff);
-+					const float dirDiff = math::fabs(targetDir.y - dir.y);
-+					const float ratio = math::fabs(verDiff / horDiff);
- 
- 					dir.y -= (dirDiff * ratio);
- 				} else {
-@@ -295,7 +295,7 @@
- 		if (!drawTrail) {
- 			const float3 camDir = (pos - camera->pos).ANormalize();
- 
--			if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) > 300) {
-+			if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) > 300) {
- 				drawTrail = true;
- 			}
- 		}
-@@ -343,7 +343,7 @@
- 			dir2.ANormalize();
- 
- 			float a1 = (1.0f / (SMOKE_TIME)) * 255;
--			a1 *= 0.7f + fabs(dif.dot(dir));
-+			a1 *= 0.7f + math::fabs(dif.dot(dir));
- 			const float alpha1 = std::min(255.0f, std::max(0.0f, a1));
- 			col[0] = (unsigned char) (color * alpha1);
- 			col[1] = (unsigned char) (color * alpha1);
-@@ -357,7 +357,7 @@
- 				a2 = 0;
- 			}
- 
--			a2 *= 0.7f + fabs(dif2.dot(oldDir));
-+			a2 *= 0.7f + math::fabs(dif2.dot(oldDir));
- 			const float alpha2 = std::min(255.0f, std::max(0.0f, a2));
- 			col2[0] = (unsigned char) (color * alpha2);
- 			col2[1] = (unsigned char) (color * alpha2);
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -90,13 +90,13 @@
- 		}
- 	}
- 
--	maxGoodDif = cos(tracking * 0.6f);
-+	maxGoodDif = math::cos(tracking * 0.6f);
- 	curSpeed = speed.Length();
- 	dir = speed / curSpeed;
- 	oldSmokeDir = dir;
- 
- 	const float3 camDir = (pos - camera->pos).ANormalize();
--	const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - fabs(camDir.dot(dir))) * 3000);
-+	const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - math::fabs(camDir.dot(dir))) * 3000);
- 
- 	drawTrail = (camDist >= 200.0f);
- 	drawRadius = maxSpeed * 8.0f;
-@@ -304,7 +304,7 @@
- 
- 		if (!drawTrail) {
- 			const float3 camDir = (pos - camera->pos).ANormalize();
--			const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000);
-+			const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000);
- 
- 			drawTrail = (camDist > 300.0f);
- 		}
-@@ -335,11 +335,11 @@
- 
- 			const float a1 =
- 				((1.0f - (0.0f / SMOKE_TIME)) * 255) *
--				(0.7f + fabs(dif1.dot(dir)));
-+				(0.7f + math::fabs(dif1.dot(dir)));
- 			const float a2 =
- 				(age < 8)? 0.0f:
- 				((1.0f - (age2 / SMOKE_TIME)) * 255) *
--				(0.7f + fabs(dif2.dot(oldSmokeDir)));
-+				(0.7f + math::fabs(dif2.dot(oldSmokeDir)));
- 			const int alpha1 = std::min(255, (int) std::max(0.0f, a1));
- 			const int alpha2 = std::min(255, (int) std::max(0.0f, a2));
- 
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp	2012-07-13 06:34:43.249393836 +0200
-@@ -252,8 +252,8 @@
- 				const float dot = speed.dot(normal);
- 
- 				pos -= speed;
--				speed -= (speed + normal * fabs(dot)) * (1 - weaponDef->bounceSlip);
--				speed += (normal * (fabs(dot))) * (1 + weaponDef->bounceRebound);
-+				speed -= (speed + normal * math::fabs(dot)) * (1 - weaponDef->bounceSlip);
-+				speed += (normal * (math::fabs(dot))) * (1 + weaponDef->bounceRebound);
- 				pos += speed;
- 
- 				if (weaponDef->bounceExplosionGenerator) {
-diff -ru spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp
---- spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp	2012-07-13 06:34:43.079393827 +0200
-@@ -770,7 +770,7 @@
- 			b2 = w->TryTargetRotate(orderTarget, c.GetID() == CMD_MANUALFIRE);
- 			b3 = Square(w->range - (w->relWeaponPos).Length()) > (orderTarget->pos.SqDistance(owner->pos));
- 			b4 = w->TryTargetHeading(GetHeadingFromVector(-diff.x, -diff.z), orderTarget->pos, orderTarget != NULL, orderTarget);
--			edgeFactor = fabs(w->targetBorder);
-+			edgeFactor = math::fabs(w->targetBorder);
- 		}
- 
- 		const float diffLength2D = diff.Length2D();
-diff -ru spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp
---- spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp	2012-07-13 06:34:43.079393827 +0200
-@@ -349,7 +349,7 @@
- 			if (rx <= spread)
- 				continue;
- 
--			rx = sqrt(rx);
-+			rx = math::sqrt(rx);
- 	
- 			const float minx = std::max(                               spread,  center.x - rx);
- 			const float maxx = std::min(float(gs->mapx * SQUARE_SIZE - spread), center.x + rx);
-@@ -676,7 +676,7 @@
- 				am->ForceHeading(unloadHeading);
- 				am->maxDrift = 1;
- 				if ((owner->pos.SqDistance(pos) < 64) &&
--						(owner->updir.dot(UpVector) > 0.99f) && fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) {
-+						(owner->updir.dot(UpVector) > 0.99f) && math::fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) {
- 					if (!SpotIsClearIgnoreSelf(pos, unit)) {
- 						// chosen spot is no longer clear to land, choose a new one
- 						// if a new spot cannot be found, don't unload at all
-diff -ru spring_89.0/rts/Sim/Units/UnitDef.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp
---- spring_89.0/rts/Sim/Units/UnitDef.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -399,9 +399,9 @@
- 	selfDCountdown = udTable.GetInt("selfDestructCountdown", 5);
- 
- 	speed  = udTable.GetFloat("maxVelocity", 0.0f) * GAME_SPEED;
--	speed  = fabs(speed);
-+	speed  = math::fabs(speed);
- 	rSpeed = udTable.GetFloat("maxReverseVelocity", 0.0f) * GAME_SPEED;
--	rSpeed = fabs(rSpeed);
-+	rSpeed = math::fabs(rSpeed);
- 
- 	fireState = udTable.GetInt("fireState", canFireControl? FIRESTATE_NONE: FIRESTATE_FIREATWILL);
- 	fireState = std::min(fireState, int(FIRESTATE_FIREATWILL));
-@@ -462,8 +462,8 @@
- 	useSmoothMesh  = udTable.GetBool("useSmoothMesh", true);
- 
- 
--	maxAcc = fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values
--	maxDec = fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values
-+	maxAcc = math::fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values
-+	maxDec = math::fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values
- 
- 	turnRate    = udTable.GetFloat("turnRate", 0.0f);
- 	turnInPlace = udTable.GetBool("turnInPlace", true);
-@@ -709,7 +709,7 @@
- 	seismicSignature = udTable.GetFloat("seismicSignature", -1.0f);
- 	if (seismicSignature == -1.0f) {
- 		if (!canFloat && !canHover && !canfly) {
--			seismicSignature = sqrt(mass / 100.0f);
-+			seismicSignature = math::sqrt(mass / 100.0f);
- 		} else {
- 			seismicSignature = 0.0f;
- 		}
-diff -ru spring_89.0/rts/Sim/Units/UnitHandler.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp
---- spring_89.0/rts/Sim/Units/UnitHandler.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp	2012-07-13 06:34:43.076060493 +0200
-@@ -419,8 +419,8 @@
- 		// look for a nearby geothermal feature if we need one
- 		for (std::vector<CFeature*>::const_iterator fi = features.begin(); fi != features.end(); ++fi) {
- 			if ((*fi)->def->geoThermal
--				&& fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4)
--				&& fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) {
-+				&& math::fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4)
-+				&& math::fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) {
- 				canBuild = BUILDSQUARE_OPEN;
- 				break;
- 			}
-@@ -589,7 +589,7 @@
- 				BuildInfo bi(cmd);
- 				tempF1 = pos + dir * ((bi.pos.y - pos.y) / dir.y) - bi.pos;
- 
--				if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > fabs(tempF1.z)) {
-+				if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.z)) {
- 					return cmd;
- 				}
- 			}
-diff -ru spring_89.0/rts/Sim/Weapons/BombDropper.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp
---- spring_89.0/rts/Sim/Weapons/BombDropper.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -62,7 +62,7 @@
- 			const float s = -owner->speed.y;
- 			const float sq = (s - 2*d) / -((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity));
- 			if (sq > 0) {
--				predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + sqrt(sq);
-+				predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + math::sqrt(sq);
- 			} else {
- 				predict = 0;
- 			}
-diff -ru spring_89.0/rts/Sim/Weapons/Cannon.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp
---- spring_89.0/rts/Sim/Weapons/Cannon.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -169,7 +169,7 @@
- 
- 	int ttl = 0;
- 	float sqSpeed2D = dir.SqLength2D() * projectileSpeed * projectileSpeed;
--	int predict = (int)ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity)
-+	int predict = (int)math::ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity)
- 			: math::sqrt(diff.SqLength2D() / sqSpeed2D));
- 	if(weaponDef->flighttime > 0) {
- 		ttl = weaponDef->flighttime;
-@@ -216,9 +216,9 @@
- 	// try to cache results, sacrifice some (not much too much even for a pewee) accuracy
- 	// it saves a dozen or two expensive calculations per second when 5 guardians
- 	// are shooting at several slow- and fast-moving targets
--	if (fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) &&
--		fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) &&
--		fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) {
-+	if (math::fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) &&
-+		math::fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) &&
-+		math::fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) {
- 		return lastDir;
- 	}
- 
-@@ -237,7 +237,7 @@
- 		// FIXME: temporary safeguards against FP overflow
- 		// (introduced by extreme off-map unit positions; the term
- 		// DFsq * Dsq * ... * dy should never even approach 1e38)
--		if (Dsq < 1e12f && fabs(dy) < 1e6f) {
-+		if (Dsq < 1e12f && math::fabs(dy) < 1e6f) {
- 			const float root1 = v*v*v*v + 2.0f*v*v*g*dy - g*g*DFsq;
- 
- 			if (root1 >= 0.0f) {
-diff -ru spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp
---- spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -126,9 +126,9 @@
- 
- 	// should really be tan but TA seem to cap it somehow
- 	// should also be 7fff or ffff theoretically but neither seems good
--	wd.accuracy       = sin((accuracy)       * PI / 0xafff);
--	wd.sprayAngle     = sin((sprayAngle)     * PI / 0xafff);
--	wd.movingAccuracy = sin((movingAccuracy) * PI / 0xafff);
-+	wd.accuracy       = math::sin((accuracy)       * PI / 0xafff);
-+	wd.sprayAngle     = math::sin((sprayAngle)     * PI / 0xafff);
-+	wd.movingAccuracy = math::sin((movingAccuracy) * PI / 0xafff);
- 
- 	wd.targetMoveError = wdTable.GetFloat("targetMoveError", 0.0f);
- 	wd.leadLimit = wdTable.GetFloat("leadLimit", -1.0f);
-@@ -375,7 +375,7 @@
- 
- 
- 	const float gd = max(30.0f, wd.damages[0] / 20.0f);
--	const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (sqrt(gd) * 0.7f)) * 0.5f;
-+	const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (math::sqrt(gd) * 0.7f)) * 0.5f;
- 	wd.explosionSpeed = wdTable.GetFloat("explosionSpeed", defExpSpeed);
- 
- 	// Dynamic Damage
-@@ -461,7 +461,7 @@
- 			wd.hitSound.setVolume(0, 5.0f);
- 			wd.hitSound.setVolume(1, 5.0f);
- 		} else {
--			float fireSoundVolume = sqrt(wd.damages[0] * 0.5f);
-+			float fireSoundVolume = math::sqrt(wd.damages[0] * 0.5f);
- 
- 			if (wd.type == "LaserCannon") {
- 				fireSoundVolume *= 0.5f;
-@@ -472,7 +472,7 @@
- 			if ((fireSoundVolume > 100.0f) &&
- 			    ((wd.type == "MissileLauncher") ||
- 			     (wd.type == "StarburstLauncher"))) {
--				fireSoundVolume = 10.0f * sqrt(hitSoundVolume);
-+				fireSoundVolume = 10.0f * math::sqrt(hitSoundVolume);
- 			}
- 
- 			if (wd.damageAreaOfEffect > 8.0f) {
-@@ -564,7 +564,7 @@
- 
- 	if (inverted == true) {
- 		for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) {
--			dynDamages[i] = damages[i] - (1 - pow(1 / range * travDist, exp)) * damages[i];
-+			dynDamages[i] = damages[i] - (1 - math::pow(1 / range * travDist, exp)) * damages[i];
- 
- 			if (damageMin > 0)
- 				dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]);
-@@ -577,7 +577,7 @@
- 	}
- 	else {
- 		for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) {
--			dynDamages[i] = (1 - pow(1 / range * travDist, exp)) * damages[i];
-+			dynDamages[i] = (1 - math::pow(1 / range * travDist, exp)) * damages[i];
- 
- 			if (damageMin > 0)
- 				dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]);
-diff -ru spring_89.0/rts/System/Matrix44f.cpp /home/svenstaro/src/spring/rts/System/Matrix44f.cpp
---- spring_89.0/rts/System/Matrix44f.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Matrix44f.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -72,8 +72,8 @@
- 
- 	*this=Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[4];
- 	m[4] = cr*a - sr*m[8];
-@@ -107,8 +107,8 @@
- 
- 	*this = Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[0];
- 	m[0] =  cr*a + sr*m[8];
-@@ -142,8 +142,8 @@
- 
- 	*this = Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[0];
- 	m[0] = cr*a - sr*m[4];
-@@ -165,8 +165,8 @@
- 
- void CMatrix44f::Rotate(float rad, const float3& axis)
- {
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	for(int a=0;a<3;++a){
- 		float3 v(m[a*4],m[a*4+1],m[a*4+2]);
-diff -ru spring_89.0/rts/System/myMath.cpp /home/svenstaro/src/spring/rts/System/myMath.cpp
---- spring_89.0/rts/System/myMath.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/myMath.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -44,7 +44,7 @@
- 	}
- 
- 	// Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 	streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- #endif
-@@ -58,7 +58,7 @@
- 	#pragma omp parallel
- 	{
- 		//good_fpu_control_registers("OMP-Init");
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 	#if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 		streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- 	#endif
-@@ -77,8 +77,8 @@
- 	for (int a = 0; a < NUM_HEADINGS; ++a) {
- 		float ang = (a - (NUM_HEADINGS / 2)) * 2 * PI / NUM_HEADINGS;
- 		float2 v;
--			v.x = sin(ang);
--			v.y = cos(ang);
-+			v.x = math::sin(ang);
-+			v.y = math::cos(ang);
- 		headingToVectorTable[a] = v;
- 	}
- 
-@@ -107,9 +107,9 @@
- 	float3 ret;
- 	float h = heading * TAANG2RAD;
- 	float p = pitch * TAANG2RAD;
--	ret.x = sin(h) * cos(p);
--	ret.y = sin(p);
--	ret.z = cos(h) * cos(p);
-+	ret.x = math::sin(h) * math::cos(p);
-+	ret.y = math::sin(p);
-+	ret.z = math::cos(h) * math::cos(p);
- 	return ret;
- }
- 
-@@ -138,7 +138,7 @@
- 	float3 dir(l2-l1);
- 	float3 pdir(p-l1);
- 	float length = dir.Length();
--	if (fabs(length) < 1e-4f)
-+	if (math::fabs(length) < 1e-4f)
- 		return l1;
- 	float c = dir.dot(pdir) / length;
- 	if (c < 0) c = 0;
-diff -ru spring_89.0/rts/System/Net/Socket.cpp /home/svenstaro/src/spring/rts/System/Net/Socket.cpp
---- spring_89.0/rts/System/Net/Socket.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Net/Socket.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -73,7 +73,7 @@
- 	//! (date of note: 08/05/10)
- 	//! something in from_string() is invalidating the FPU flags
- 	//! tested on win2k and linux (not happening there)
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	return addr;
-@@ -94,7 +94,7 @@
- #ifdef STREFLOP_H
- 	//! (date of note: 08/22/10)
- 	//! something in resolve() is invalidating the FPU flags
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	return resolveIt;
-diff -ru spring_89.0/rts/System/OffscreenGLContext.cpp /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp
---- spring_89.0/rts/System/OffscreenGLContext.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -259,7 +259,7 @@
- #ifdef STREFLOP_H
- 	// init streflop to make it available for synced computations, too
- 	// redundant? threads copy the FPU state of their parent.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	try {
-diff -ru spring_89.0/rts/System/Sound/SoundSource.h /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h
---- spring_89.0/rts/System/Sound/SoundSource.h	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h	2012-07-13 06:34:42.836060480 +0200
-@@ -7,7 +7,6 @@
- 
- #include <al.h>
- #include <boost/noncopyable.hpp>
--#include <boost/thread/recursive_mutex.hpp>
- 
- class IAudioChannel;
- class float3;
-diff -ru spring_89.0/rts/System/SpringApp.cpp /home/svenstaro/src/spring/rts/System/SpringApp.cpp
---- spring_89.0/rts/System/SpringApp.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/SpringApp.cpp	2012-07-13 06:34:42.982727155 +0200
-@@ -385,7 +385,7 @@
- #ifdef STREFLOP_H
- 	//! Something in SDL_SetVideoMode (OpenGL drivers?) messes with the FPU control word.
- 	//! Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	//! setup GL smoothing
-@@ -1009,7 +1009,7 @@
- 			SDL_Event event;
- 
- 			while (SDL_PollEvent(&event)) {
--				streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags
-+				streflop::streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags
- 				input.PushEvent(event);
- 			}
- 		}
-diff -ru spring_89.0/rts/System/Sync/FPUCheck.cpp /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp
---- spring_89.0/rts/System/Sync/FPUCheck.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -85,7 +85,7 @@
- 		LOG_L(L_WARNING, "[%s] Sync warning: (env.x87_mode) FPUCW 0x%04X instead of 0x%04X or 0x%04X (\"%s\")", __FUNCTION__, fenv.x87_mode, x87_a, x87_b, text);
- 
- 		// Set single precision floating point math.
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 	#if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 		streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- 	#endif
diff --git a/community-staging/spring/spring.install b/community-staging/spring/spring.install
deleted file mode 100644
index 41f09f887..000000000
--- a/community-staging/spring/spring.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 $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-staging/springlobby/PKGBUILD b/community-staging/springlobby/PKGBUILD
deleted file mode 100644
index 9e792f136..000000000
--- a/community-staging/springlobby/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 73520 2012-07-09 01:15:30Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: DuGi <dugi@irc.pl>
-
-pkgname=springlobby
-pkgver=0.147
-pkgrel=2
-pkgdesc="A free cross-platform lobby client for the Spring RTS project."
-arch=('i686' 'x86_64')
-url="http://springlobby.info/"
-license=('GPL2')
-depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs')
-optdepends=('sdl' 'sdl_sound' 'sdl_mixer') 
-makedepends=('boost' 'asio' 'cmake')
-install=springlobby.install
-source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1dd17f3f573d40b10b66bdbdc77181f0')
-
-build() {
-  cd $srcdir/${pkgname}-$pkgver
-
-  #export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt
-
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DOPTION_SOUND=false
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}-$pkgver
-
-  make DESTDIR=$pkgdir install
- # 
- # install -m755 -d $pkgdir/usr/share/applications
- # install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications
-
- # install -m755 -d -p $pkgdir/usr/share/pixmaps
- # install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-staging/springlobby/springlobby.desktop b/community-staging/springlobby/springlobby.desktop
deleted file mode 100644
index 1dce96b90..000000000
--- a/community-staging/springlobby/springlobby.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=SpringLobby
-Comment=Lobby for Spring. An open source RTS with similar gameplay to TA
-Exec=springlobby
-Icon=springlobby.png
-Terminal=false
-Type=Application
-Categories=Application;Game;StrategyGame;
diff --git a/community-staging/springlobby/springlobby.install b/community-staging/springlobby/springlobby.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community-staging/springlobby/springlobby.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-staging/springlobby/springlobby.png b/community-staging/springlobby/springlobby.png
deleted file mode 100644
index 89c7ab0ac..000000000
--- a/community-staging/springlobby/springlobby.png
+++ /dev/null
diff --git a/community-staging/supertux/PKGBUILD b/community-staging/supertux/PKGBUILD
deleted file mode 100644
index a8e7d7245..000000000
--- a/community-staging/supertux/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 78608 2012-10-22 02:52:34Z ebelanger $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Eric Bélanger <eric@archlinux.org>
-# Contributor: vande198
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=supertux
-pkgver=0.3.3
-pkgrel=7
-pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
-arch=('i686' 'x86_64')
-url="http://super-tux.sourceforge.net/"
-license=('GPL')
-depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
-        supertux2-0.3.3-squirrel-gcc47.patch)
-md5sums=('f3f803e629ee51a9de0b366a036e393d'
-         'eb06315514be4f200428f14b927beb66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
-  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
-  sed -i '/types\.h/d' src/addon/addon_manager.cpp
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-staging/synfig/PKGBUILD b/community-staging/synfig/PKGBUILD
deleted file mode 100644
index 6e6ad21fe..000000000
--- a/community-staging/synfig/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 72702 2012-06-20 11:15:26Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Franco Iacomella <yaco@gnu.org>
-
-pkgname=synfig
-pkgver=0.63.05
-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-compat' '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=('8591cf17c26405d68d2cc050a2929292'
-         'b5568b06fae1a7ee465b5380b1139b83'
-         'ebf41046097cfd778dee9a9854561dae')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
-  LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
-  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
-  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
-  [ -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/tagpy/PKGBUILD b/community-staging/tagpy/PKGBUILD
deleted file mode 100644
index 95c398585..000000000
--- a/community-staging/tagpy/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 73441 2012-07-07 18:57:56Z tdziedzic $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Scott Horowitz <stonecrest@gmail.com>
-
-pkgname=tagpy
-pkgver=0.94.8
-pkgrel=8
-pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/tagpy"
-license=('MIT')
-depends=('python2' 'taglib' 'boost-libs')
-makedepends=('python2-distribute' 'boost')
-source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('6baff63318cf90b9bc5a2497a0597802')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py') 
- 
-  ./configure.py --taglib-lib-dir=/usr/lib/ \
-  	--taglib-inc-dir=/usr/include/taglib/ \
-	--boost-inc-dir=/usr/include/boost/ \
-	--boost-lib-dir=/usr/lib/ \
-	--boost-python-libname=boost_python
-  python2 setup.py build
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-staging/tix/PKGBUILD b/community-staging/tix/PKGBUILD
deleted file mode 100644
index 8aa00c521..000000000
--- a/community-staging/tix/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 77320 2012-10-08 16:13:53Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Brice Méalier <mealier_brice@yahoo.fr>
-
-pkgname=tix
-pkgver=8.4.3
-pkgrel=4
-pkgdesc="Tk Interface eXtension, a powerful set of user interface components"
-arch=(i686 'x86_64')
-url="http://tix.sourceforge.net/"
-license=("BSD")
-depends=('tk' 'libx11')
-source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz
-	tcl-tk-path.patch)
-md5sums=('2b8bf4b10a852264678182652f477e59'
-         'd4df48da39dd51872d58706a51bab505')
-
-build() {
-  cd $srcdir/Tix$pkgver
-
-  patch -p1 <$srcdir/tcl-tk-path.patch
-
-  export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2"
-
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-  # move things around
-
-  install -m755 tools/tixindex $pkgdir/usr/bin/tixindex
-  rm -rf $pkgdir/usr/lib/Tix8.4/html
-  rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms}
-  ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so
-
-  mkdir -p $pkgdir/usr/share/man/man1
-  mkdir -p $pkgdir/usr/share/man/man3
-  cp -p man/tixwish.1 $pkgdir/usr/share/man/man1
-  cd $srcdir/Tix$pkgver/man
-  for i in *.n; do
-	  cp -p $i $pkgdir/usr/share/man/man3/${i%n}3
-  done
-
-  mkdir -p $pkgdir/usr/share/licenses/tix
-  cp $srcdir/Tix$pkgver/license.terms  $pkgdir/usr/share/licenses/tix/
-}
-
diff --git a/community-staging/tix/tcl-tk-path.patch b/community-staging/tix/tcl-tk-path.patch
deleted file mode 100644
index 2fc12671e..000000000
--- a/community-staging/tix/tcl-tk-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure
---- Tix8.4.3/configure	2008-02-28 04:35:01.000000000 +0000
-+++ Tix8.4.3.my/configure	2009-12-28 10:57:33.000000000 +0000
-@@ -6645,7 +6645,7 @@
- 	        ;;
- 	esac
-     else
--	if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
-+	if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then
- 	    { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5
- echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -6700,7 +6700,7 @@
- 	        ;;
- 	esac
-     else
--	if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then
-+	if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then
- 	    { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5
- echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;}
-    { (exit 1); exit 1; }; }
-
diff --git a/community-staging/tmw/PKGBUILD b/community-staging/tmw/PKGBUILD
deleted file mode 100644
index b37a2a9f1..000000000
--- a/community-staging/tmw/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 75685 2012-08-29 07:42:44Z spupykin $
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=tmw
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG."
-arch=('i686' 'x86_64')
-url="http://themanaworld.org"
-license=('GPL')
-depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs'
-	 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf')
-makedepends=('cmake' 'mesa')
-#source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2)
-source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver)
-md5sums=('b021e368c813fb95bea00bbf02e6d607')
-
-build() {
-    cd $srcdir/mana-mana-*
-    cmake . -DCMAKE_INSTALL_PREFIX=/usr
-    make
-}
-
-package() {
-    cd $srcdir/mana-mana-*
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/tor/PKGBUILD b/community-staging/tor/PKGBUILD
deleted file mode 100644
index 70d827ed7..000000000
--- a/community-staging/tor/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 72187 2012-06-10 08:44:32Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=tor
-pkgver=0.2.2.36
-pkgrel=2
-pkgdesc='Anonymizing overlay network.'
-arch=('i686' 'x86_64')
-url='http://www.torproject.org/'
-license=('BSD')
-depends=('openssl' 'libevent' 'tsocks' 'bash')
-makedepends=('ca-certificates')
-backup=('etc/tor/torrc'
-        'etc/tor/torrc-dist'
-        'etc/tor/tor-tsocks.conf'
-        'etc/conf.d/tor')
-install='tor.install'
-source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        'torrc'
-        'tor'
-        'tor.conf.d'
-        'tor.service')
-md5sums=('620b2110086aba01236b57f1d5aba416'
-         '0401cf01ad0bcc9aba4f9c1bb5e8e810'
-         '56c75d4e8a66f34167d31e38c43793dd'
-         'f8e6868a389877346e7eebaacd1078bb'
-         '5c7c6834064b3530c442def6079ac3aa'
-         'cf23b97a1da09670214da6229a3ecb09')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -dm0700 "${pkgdir}/var/lib/tor"
-
-  mv "${pkgdir}/etc/tor/torrc.sample" "${pkgdir}/etc/tor/torrc-dist"
-  install -Dm0644 "${srcdir}/torrc" "${pkgdir}/etc/tor/torrc"
-  install -Dm0755 "${srcdir}/tor" "${pkgdir}/etc/rc.d/tor"
-  install -Dm0644 "${srcdir}/tor.conf.d" "${pkgdir}/etc/conf.d/tor"
-
-  install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  install -Dm0644 "${srcdir}/tor.service" "${pkgdir}/usr/lib/systemd/system/tor.service"
-}
diff --git a/community-staging/tor/tor b/community-staging/tor/tor
deleted file mode 100644
index 522c498ce..000000000
--- a/community-staging/tor/tor
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/tor ] && . /etc/conf.d/tor
-
-PID=`pidof -o %PPID /usr/bin/tor`
-case "$1" in
-  start)
-    stat_busy "Starting Tor Daemon"
-    if [ -z "${TOR_MAX_FD}" ] || ulimit -n "${TOR_MAX_FD}"; then
-      [ -z "$PID" ] && /usr/bin/tor -f ${TOR_CONF} ${TOR_ARGS} &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon tor
-        stat_done
-      fi
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Tor Daemon"
-    [ ! -z "$PID" ] && kill -INT $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tor
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-# vim: ft=sh ts=2 sw=2
diff --git a/community-staging/tor/tor.conf.d b/community-staging/tor/tor.conf.d
deleted file mode 100644
index e9fa098e0..000000000
--- a/community-staging/tor/tor.conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Location of the config file.
-TOR_CONF='/etc/tor/torrc'
-
-# Custom ulimit for maximum number of open files.
-TOR_MAX_FD=
-
-# Additional arguments.
-TOR_ARGS="--quiet"
-
diff --git a/community-staging/tor/tor.install b/community-staging/tor/tor.install
deleted file mode 100644
index 2c448d28e..000000000
--- a/community-staging/tor/tor.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  echo "-> Tor has been preconfigured to run as a client only."
-  echo "-> Tor is experimental software. Do not rely on it for strong anonymity."
-  echo '-> '
-  echo '-> You can set custom file descriptor ulimits for Tor in'
-  echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.'
-  groupadd -g 43 tor &>/dev/null
-  useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null
-  chown tor:tor var/lib/tor &> /dev/null
-  chmod 700 var/lib/tor &> /dev/null
-}
-
-post_upgrade() {
-  echo '-> You can now set custom file descriptor ulimits for Tor in'
-  echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.'
-  getent group tor &>/dev/null || groupadd -g 43 tor &>/dev/null
-  getent passwd tor &>/dev/null || useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null
-  chown tor:tor var/lib/tor &> /dev/null
-}
-
-pre_remove() {
-  getent passwd tor &>/dev/null && userdel tor &> /dev/null
-  getent group tor &>/dev/null && groupdel tor &> /dev/null
-}
diff --git a/community-staging/tor/tor.service b/community-staging/tor/tor.service
deleted file mode 100644
index eb9b556b5..000000000
--- a/community-staging/tor/tor.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Anonymizing Overlay Network
-
-[Service]
-Type=forking
-GuessMainPID=yes
-EnvironmentFile=/etc/conf.d/tor
-ExecStart=/usr/bin/tor -f $TOR_CONF $TOR_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-staging/tor/torrc b/community-staging/tor/torrc
deleted file mode 100644
index 3505653ab..000000000
--- a/community-staging/tor/torrc
+++ /dev/null
@@ -1,143 +0,0 @@
-## CONFIGURED FOR ARCHLINUX
-
-## Last updated 22 July 2005 for Tor 0.1.0.13.
-## (May or may not work for older or newer versions of Tor.)
-#
-## See the man page, or http://tor.eff.org/tor-manual.html, for more
-## options you can use in this file.
-#
-# On Unix, Tor will look for this file in someplace like "~/.tor/torrc" or
-# "/etc/torrc"
-#
-# On Windows, Tor will look for the configuration file in someplace like
-# "Application Data\tor\torrc" or "Application Data\<username>\tor\torrc"
-#
-# With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
-# /Library/Tor/torrc
-
-
-## Replace this with "SocksPort 0" if you plan to run Tor only as a
-## server, and not make any local application connections yourself.
-SocksPort 9050 # what port to open for local application connections
-SocksBindAddress 127.0.0.1 # accept connections only from localhost
-#SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port too
-
-## Entry policies to allow/deny SOCKS requests based on IP address.
-## First entry that matches wins. If no SocksPolicy is set, we accept
-## all (and only) requests from SocksBindAddress.
-#SocksPolicy accept 192.168.0.1/16
-#SocksPolicy reject *
-
-## Allow no-name routers (ones that the dirserver operators don't
-## know anything about) in only these positions in your circuits.
-## Other choices (not advised) are entry,exit,introduction.
-AllowUnverifiedNodes middle,rendezvous
-
-## Logs go to stdout at level "notice" unless redirected by something
-## else, like one of the below lines. You can have as many log lines as
-## you want.
-##
-## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
-#Log notice file /var/log/tor/notices.log
-## Send only debug and info messages to /var/log/tor/debug.log
-#Log debug-info file /var/log/tor/debug.log
-## Send ONLY debug messages to /var/log/tor/debug.log
-#Log debug-debug file /var/log/tor/debug.log
-## To use the system log instead of Tor's logfiles, uncomment these lines:
-Log notice syslog
-## To send all messages to stderr:
-#Log debug stderr
-
-## Uncomment this to start the process in the background... or use
-## --runasdaemon 1 on the command line.
-RunAsDaemon 1
-User tor
-Group tor
-
-## Tor only trusts directories signed with one of these keys, and
-## uses the given addresses to connect to the trusted directory
-## servers. If no DirServer lines are specified, Tor uses the built-in
-## defaults (moria1, moria2, tor26), so you can leave this alone unless
-## you need to change it.
-#DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
-#DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
-#DirServer 86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
-
-## The directory for keeping all the keys/etc. By default, we store
-## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-DataDirectory /var/lib/tor
-
-## The port on which Tor will listen for local connections from Tor controller
-## applications, as documented in control-spec.txt.  NB: this feature is
-## currently experimental.
-#ControlPort 9051
-
-############### This section is just for location-hidden services ###
-
-## Look in .../hidden_service/hostname for the address to tell people.
-## HiddenServicePort x y:z says to redirect a port x request from the
-## client to y:z.
-
-#HiddenServiceDir /var/lib/tor/hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-
-#HiddenServiceDir /var/lib/tor/other_hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-#HiddenServicePort 22 127.0.0.1:22
-#HiddenServiceNodes moria1,moria2
-#HiddenServiceExcludeNodes bad,otherbad
-
-################ This section is just for servers #####################
-
-## NOTE: If you enable these, you should consider mailing your identity
-## key fingerprint to the tor-ops, so we can add you to the list of
-## servers that clients will trust. See
-## http://tor.eff.org/doc/tor-doc.html#server for details.
-
-## Required: A unique handle for this server
-#Nickname ididnteditheconfig
-
-## The IP or fqdn for this server. Leave commented out and Tor will guess.
-#Address noname.example.com
-
-## Contact info that will be published in the directory, so we can
-## contact you if you need to upgrade or if something goes wrong.
-## This is optional but recommended.
-#ContactInfo Random Person <nobody AT example dot com>
-## You might also include your PGP or GPG fingerprint if you have one:
-#ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com>
-
-## Required: what port to advertise for tor connections
-#ORPort 9001
-## If you want to listen on a port other than the one advertised
-## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment
-## the line below. You'll need to do ipchains or other port forwarding
-## yourself to make this work.
-#ORBindAddress 0.0.0.0:9090
-
-## Uncomment this to mirror the directory for others (please do)
-#DirPort 9030 # what port to advertise for directory connections
-## If you want to listen on a port other than the one advertised
-## in DirPort (e.g. to advertise 80 but bind 9091), uncomment the line
-## below. You'll need to do ipchains or other port forwarding yourself
-## to make this work.
-#DirBindAddress 0.0.0.0:9091
-
-## A comma-separated list of exit policies. They're considered first
-## to last, and the first match wins. If you want to *replace*
-## the default exit policy, end this with either a reject *:* or an
-## accept *:*. Otherwise, you're *augmenting* (prepending to) the
-## default exit policy. Leave commented to just use the default, which is
-## available in the man page or at http://tor.eff.org/documentation.html
-##
-## Look at http://tor.eff.org/faq-abuse.html#TypicalAbuses
-## for issues you might encounter if you use the default exit policy.
-##
-## If certain IPs and ports are blocked externally, e.g. by your firewall,
-## you should update your exit policy to reflect this -- otherwise Tor
-## users will be told that those destinations are down.
-##
-#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more
-#ExitPolicy accept *:119 # accept nntp as well as default exit policy
-#ExitPolicy reject *:* # middleman only -- no exits allowed
-
diff --git a/community-staging/ubuntuone-client/1339_1338.diff b/community-staging/ubuntuone-client/1339_1338.diff
deleted file mode 100644
index cbd966a70..000000000
--- a/community-staging/ubuntuone-client/1339_1338.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-=== modified file 'tests/platform/sync_menu/test_linux.py'
---- tests/platform/sync_menu/test_linux.py	2012-10-10 14:54:49 +0000
-+++ tests/platform/sync_menu/test_linux.py	2012-10-11 12:01:27 +0000
-@@ -124,6 +124,7 @@
-         """Check that the dummy has the proper methods required by the API."""
-         dummy = linux.DummySyncMenu('random', 'args')
-         self.assertIsInstance(dummy.update_transfers, Callable)
-+        self.assertIsInstance(dummy.sync_status_changed, Callable)
- 
- 
- class SyncMenuTestCase(TestCase):
-
-=== modified file 'ubuntuone/platform/sync_menu/linux.py'
---- ubuntuone/platform/sync_menu/linux.py	2012-10-10 17:06:14 +0000
-+++ ubuntuone/platform/sync_menu/linux.py	2012-10-11 13:00:10 +0000
-@@ -183,7 +183,7 @@
-             self.timer.addCallback(self._timeout)
- 
- 
--class TransfersMenu(Dbusmenu.Menuitem):
-+class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
-     """Menu that handles the recent and current transfers."""
- 
-     def __init__(self, status_frontend):
-@@ -227,7 +227,7 @@
-         items_added = 0
-         remove = []
-         for item in self._uploading_items:
--            if item in uploading_data:
-+            if item in uploading_data.keys():
-                 size, written = uploading_data[item]
-                 percentage = written * 100 / size
-                 upload_item = self._uploading_items[item]
-@@ -243,7 +243,7 @@
-         for item in remove:
-             self._uploading_items.pop(item)
-         if items_added < 5:
--            for item in uploading_data:
-+            for item in uploading_data.keys():
-                 if item not in self._uploading_items and items_added < 5:
-                     size, written = uploading_data[item]
-                     percentage = written * 100 / size
-@@ -270,4 +270,12 @@
-     def update_transfers(self):
-         """Do nothing."""
- 
--UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu
-+    def sync_status_changed(self):
-+        """Do nothing."""
-+
-+
-+if use_syncmenu:
-+    UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
-+else:
-+    UbuntuOneSyncMenu = DummySyncMenu
-+    TransfersMenu = None
-
diff --git a/community-staging/ubuntuone-client/PKGBUILD b/community-staging/ubuntuone-client/PKGBUILD
deleted file mode 100644
index 8829e86d9..000000000
--- a/community-staging/ubuntuone-client/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 77990 2012-10-16 02:30:37Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=ubuntuone-client
-pkgver=4.0.0
-pkgrel=2
-pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/ubuntuone-client"
-license=('GPL')
-depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'imake' 'gobject-introspection')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        1339_1338.diff
-        fix-notify-hint.patch)
-md5sums=('738039703d4dcf54518a725f8ffbc4de'
-         'e82e80c229de06692988c1f938a34fb9'
-         '54dfeb2be011f0a12ea7cfa0f0c19bec')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
-
-  # Improve TransfersMenu declaration to avoid problems
-  patch -Np0 -i "$srcdir/1339_1338.diff"
-
-  # Workaround for crash in notification-daemon
-  # https://bugzilla.gnome.org/show_bug.cgi?id=665166
-  patch -Np1 -i "$srcdir/fix-notify-hint.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # We don't have Apport in Arch Linux
-  rm -r "$pkgdir"/{etc/apport,usr/share/apport}
-}
diff --git a/community-staging/ubuntuone-client/fix-notify-hint.patch b/community-staging/ubuntuone-client/fix-notify-hint.patch
deleted file mode 100644
index f32280de9..000000000
--- a/community-staging/ubuntuone-client/fix-notify-hint.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py
---- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py	2012-06-19 15:51:01.000000000 +0200
-+++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py	2012-10-15 01:14:01.019476818 +0200
-@@ -40,7 +40,7 @@
- 
- if 'gi' in sys.modules and sys.modules['gi'] is not None:
-     try:
--        from gi.repository import Notify
-+        from gi.repository import GLib, Notify
-         Notify  # pyflakes
-         NOTIFY_MODULE = 'gi'
-     except ImportError:
-@@ -85,5 +85,6 @@
-         if append:
-             self.notification.set_hint_string('x-canonical-append', '')
- 
--        self.notification.set_hint_int32('transient', int(True))
-+        if NOTIFY_MODULE == 'gi':
-+            self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
-         self.notification.show()
diff --git a/community-staging/ubuntuone-client/ubuntuone-client.install b/community-staging/ubuntuone-client/ubuntuone-client.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community-staging/ubuntuone-client/ubuntuone-client.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-staging/uniconvertor/PKGBUILD b/community-staging/uniconvertor/PKGBUILD
deleted file mode 100644
index da1175e90..000000000
--- a/community-staging/uniconvertor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 77994 2012-10-16 02:42:54Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-
-pkgname=uniconvertor
-pkgver=1.1.5
-pkgrel=6
-pkgdesc="A universal vector graphics translator using sK1 engine."
-arch=('i686' 'x86_64')
-url="http://sk1project.org/modules.php?name=Products&product=uniconvertor"
-license=('GPL')
-depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs')
-makedepends=('gcc')
-source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz)
-md5sums=('d1272315a58304ece2ff588834e23f72')
-
-build() {
-  cd "$srcdir/uniconvertor-$pkgver"
-
-  # python2 fix
-  sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py
-
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/uniconvertor-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-}
diff --git a/community-staging/vdrift/PKGBUILD b/community-staging/vdrift/PKGBUILD
deleted file mode 100644
index 2970f7aee..000000000
--- a/community-staging/vdrift/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 75708 2012-08-29 09:52:39Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf@xs4all.nl
-
-pkgname=vdrift
-pkgver=2012.07.22
-pkgrel=1
-pkgdesc="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'
-         'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive')
-makedepends=('scons' 'boost' 'asio')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2
-        http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}c_patch.diff)
-md5sums=('fcfd6b65724d32dfe383df216d7afb74'
-         '981cd26709f97cdf85100b720290177f')
-
-build() {
-  cd VDrift
-
-  # select arch
-  if [ `uname -m` = "x86_64" ]; then
-    _sconsarch="a64"
-  else
-    _sconsarch="686"
-  fi
-
-  patch -Np0 < $srcdir/$pkgname-${pkgver//./-}c_patch.diff
-
-  # build and install
-  scons $MAKEFLAGS \
-    "destdir"="$pkgdir" \
-    "arch"=$_sconsarch \
-    "release"=1 \
-    "force_feedback"=1 \
-    "prefix"=/usr \
-    "datadir"=share/$pkgname/ \
-    "extbullet"=1
-}
-
-package() {
-  cd VDrift
-
-  scons install
-
-  # install .desktop file
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-  sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?)
-
-  # 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
-  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  rm -r "$pkgdir"/usr/share/vdrift
-}
-# vim: sw=2:ts=2 et:
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/virtkey/PKGBUILD b/community-staging/virtkey/PKGBUILD
deleted file mode 100644
index 7d350b553..000000000
--- a/community-staging/virtkey/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: codl <codl@aquageek.net>
-# Contributor: Megamixman <Megamixman@gmail.com>
-
-pkgbase=virtkey
-pkgname=('python2-virtkey' 'python-virtkey')
-pkgver=0.61.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url="https://launchpad.net/virtkey"
-license=('LGPL')
-makedepends=('python2' 'python' 'libxtst' 'gtk2')
-source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz)
-md5sums=('536d30acb2c8ddadc6b4a26fc01e8390')
-
-build() {
-  cd "$srcdir"
-
-  cp -a {,python2-}$pkgbase-$pkgver
-
-  # Build python 2 module
-  cd "$srcdir/python2-$pkgbase-$pkgver"
-  python2 setup.py build
-
-  # Build python 3 module
-  cd "$srcdir/$pkgbase-$pkgver"
-  python setup.py build
-}
-
-package_python2-virtkey() {
-  pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server"
-  depends=('python2' 'libxtst' 'gtk2')
-
-  cd "$srcdir/python2-$pkgbase-$pkgver"
-
-  python2 setup.py install --root=$pkgdir/ --optimize=1
-}
-
-package_python-virtkey() {
-  pkgdesc="Python extension for emulating keypresses and getting layout information from the X server"
-  depends=('python' 'libxtst' 'gtk2')
-
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  python3 setup.py install --root=$pkgdir/ --optimize=1
-}
diff --git a/community-staging/warmux/PKGBUILD b/community-staging/warmux/PKGBUILD
deleted file mode 100644
index 06e42cfa9..000000000
--- a/community-staging/warmux/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 75479 2012-08-25 23:45:10Z lcarlier $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: pukyxd 
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-
-pkgname=warmux
-pkgver=11.04.1
-pkgrel=5
-pkgdesc="A clone of the worms game"
-arch=('i686' 'x86_64')
-url="http://www.wormux.org/"
-license=('GPL')
-makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
-replaces=('wormux')
-source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	include-zlib.patch
-	gcc-fix.patch)
-md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
-         'c8285955e880f80e3c68312715a3061c'
-         'ab50d613d3fa3f71262b1d2fc71641b1')
-
-build() { 
-  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
-  # libpng 1.5 fix
-  patch -Np1 -i ../include-zlib.patch
-  # gcc fix
-  patch -Np1 -i ../gcc-fix.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}")
-
-  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -r ${pkgdir}/usr/share/warmux
-}
diff --git a/community-staging/warmux/gcc-fix.patch b/community-staging/warmux/gcc-fix.patch
deleted file mode 100644
index 1ac476b92..000000000
--- a/community-staging/warmux/gcc-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-## i-love-you-lordheavy.patch [diff]
-diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
---- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
-@@ -81,7 +81,7 @@
- }
- 
- // Build an action from a network packet
--Action::Action(const char *buffer, DistantComputer* _creator)
-+Action::Action(char *buffer, DistantComputer* _creator)
- {
-   m_creator = _creator;
- 
-diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
---- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
-@@ -168,7 +168,7 @@
-   Action(Action_t type, Double value1, Double value2);
- 
-   // Build an action from a network packet
--  Action(const char* buffer, DistantComputer* _creator);
-+  Action(char* buffer, DistantComputer* _creator);
- 
-   ~Action();
- 
-Description: Fix FTBFS with gcc 4.7.
-Author: Felix Geyer <debfx-pkg@fobos.de>
-
---- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
-+++ warmux-11.04.1+repack/tools/list_games/main.cpp
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <unistd.h>
- #include <WARMUX_types.h>
- #include <WARMUX_network.h>
- #include <WARMUX_index_server.h>
diff --git a/community-staging/warmux/include-zlib.patch b/community-staging/warmux/include-zlib.patch
deleted file mode 100644
index c7e77aba1..000000000
--- a/community-staging/warmux/include-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
---- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
-+++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
-@@ -25,6 +25,7 @@
- #include <SDL_image.h>
- #include <SDL_rotozoom.h>
- #include <png.h>
-+#include <zlib.h>
- 
- #include "graphic/surface.h"
- #include "tool/math_tools.h"
diff --git a/community-staging/wesnoth/PKGBUILD b/community-staging/wesnoth/PKGBUILD
deleted file mode 100644
index 33a660c7b..000000000
--- a/community-staging/wesnoth/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 73579 2012-07-10 15:22:42Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Jacobo Arvelo <unix4all@ya.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=wesnoth
-pkgver=1.10.3
-pkgrel=2
-pkgdesc="A turn-based strategy game on a fantasy world"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data" 'dbus-core' 'python2')
-makedepends=('boost' 'cmake')
-install=wesnoth.install
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        wesnoth.tmpfiles.conf
-        wesnothd.rc.d
-        boost_foreach.patch)
-md5sums=('b25354c71d58f82c2c60cc12c6f09c36'
-         'b8122f5054e3895c9c054e87460869dc'
-         '85659b47d22dfdf4e4d046556973fc3e'
-         '07e78c6ece06ed10119fc57ebc16ea9d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np0 < $srcdir/boost_foreach.patch
-
-  mkdir build && cd build
-  cmake .. \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DENABLE_OMP=ON \
-      -DENABLE_TOOLS=ON \
-      -DMANDIR=share/man \
-      -DFIFO_DIR=/var/run/wesnothd
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  rm -r $pkgdir/usr/share/applications
-  rm -r $pkgdir/usr/share/doc
-  rm -r $pkgdir/usr/share/pixmaps
-  rm -r $pkgdir/usr/share/wesnoth
-
-  install -Dm644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
-  install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd"
-}
diff --git a/community-staging/wesnoth/boost_foreach.patch b/community-staging/wesnoth/boost_foreach.patch
deleted file mode 100644
index 95b98828e..000000000
--- a/community-staging/wesnoth/boost_foreach.patch
+++ /dev/null
@@ -1,11890 +0,0 @@
-------------------------------------------------------------------------
-r54625 | loonycyborg | 2012-07-08 16:26:21 +0200 (So, 08 Jul 2012) | 5 lines
-
-Backport r54604: Use BOOST_FOREACH directly instead of #define foreach BOOST_FOREACH
-
-The define is extremely unreliable, will break compile with boost >=
-1.50 and upstream can't fix issues with it, see
-https://svn.boost.org/trac/boost/ticket/6131
-
-Index: src/foreach.hpp (deleted)
-===================================================================
-Index: src/scripting/lua.cpp
-===================================================================
---- src/scripting/lua.cpp	(revision 54624)
-+++ src/scripting/lua.cpp	(revision 54625)
-@@ -39,7 +39,6 @@
- #include "ai/manager.hpp"
- #include "attack_prediction.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gamestatus.hpp"
-@@ -77,6 +76,8 @@
- #include "scripting/debug_lua.hpp"
- #endif
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_scripting_lua("scripting/lua");
- #define LOG_LUA LOG_STREAM(info, log_scripting_lua)
- #define ERR_LUA LOG_STREAM(err, log_scripting_lua)
-@@ -87,7 +88,7 @@
- void extract_preload_scripts(config const &game_config)
- {
- 	preload_scripts.clear();
--	foreach (config const &cfg, game_config.child_range("lua")) {
-+	BOOST_FOREACH(config const &cfg, game_config.child_range("lua")) {
- 		preload_scripts.push_back(cfg);
- 	}
- 	preload_config = game_config.child("game_config");
-@@ -254,7 +255,7 @@
- 		return;
- 
- 	int k = 1;
--	foreach (const config::any_child &ch, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &ch, cfg.all_children_range())
- 	{
- 		lua_createtable(L, 2, 0);
- 		lua_pushstring(L, ch.key.c_str());
-@@ -264,7 +265,7 @@
- 		lua_rawseti(L, -2, 2);
- 		lua_rawseti(L, -2, k++);
- 	}
--	foreach (const config::attribute &attr, cfg.attribute_range())
-+	BOOST_FOREACH(const config::attribute &attr, cfg.attribute_range())
- 	{
- 		luaW_pushscalar(L, attr.second);
- 		lua_setfield(L, -2, attr.first.c_str());
-@@ -534,7 +535,7 @@
- {
- 	if (ptr) return ptr;
- 	if (side) {
--		foreach (unit &u, (*resources::teams)[side - 1].recall_list()) {
-+		BOOST_FOREACH(unit &u, (*resources::teams)[side - 1].recall_list()) {
- 			if (u.underlying_id() == uid) return &u;
- 		}
- 		return NULL;
-@@ -710,7 +711,7 @@
- 	if (shallow_literal || strcmp(m, "__shallow_parsed") == 0)
- 	{
- 		lua_newtable(L);
--		foreach (const config::attribute &a, v->get_config().attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &a, v->get_config().attribute_range()) {
- 			if (shallow_literal)
- 				luaW_pushscalar(L, a.second);
- 			else
-@@ -813,7 +814,7 @@
- 		const std::vector<std::string>& vector = accessor; \
- 		lua_createtable(L, vector.size(), 0); \
- 		int i = 1; \
--		foreach (const std::string& s, vector) { \
-+		BOOST_FOREACH(const std::string& s, vector) { \
- 			lua_pushstring(L, s.c_str()); \
- 			lua_rawseti(L, -2, i); \
- 			++i; \
-@@ -1292,9 +1293,9 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_newtable(L);
- 	int i = 1, s = 1;
--	foreach (team &t, *resources::teams)
-+	BOOST_FOREACH(team &t, *resources::teams)
- 	{
--		foreach (unit &u, t.recall_list())
-+		BOOST_FOREACH(unit &u, t.recall_list())
- 		{
- 			if (!filter.null()) {
- 				scoped_recall_unit auto_store("this_unit",
-@@ -1560,7 +1561,7 @@
- 		std::set<std::string> const &recruits = t.recruits();
- 		lua_createtable(L, recruits.size(), 0);
- 		int i = 1;
--		foreach (std::string const &r, t.recruits()) {
-+		BOOST_FOREACH(std::string const &r, t.recruits()) {
- 			lua_pushstring(L, r.c_str());
- 			lua_rawseti(L, -2, i++);
- 		}
-@@ -3130,7 +3131,7 @@
- 
- 	lua_createtable(L, res.size(), 0);
- 	int i = 1;
--	foreach (map_location const &loc, res)
-+	BOOST_FOREACH(map_location const &loc, res)
- 	{
- 		lua_createtable(L, 2, 0);
- 		lua_pushinteger(L, loc.x + 1);
-@@ -3227,7 +3228,7 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_createtable(L, sides.size(), 0);
- 	unsigned index = 1;
--	foreach(int side, sides) {
-+	BOOST_FOREACH(int side, sides) {
- 		// Create a full userdata containing a pointer to the team.
- 		team** t = static_cast<team**>(lua_newuserdata(L, sizeof(team*)));
- 		*t = &((*resources::teams)[side - 1]);
-@@ -3247,7 +3248,7 @@
- static int intf_get_traits(lua_State* L)
- {
- 	lua_newtable(L);
--	foreach(const config& trait, unit_types.traits()) {
-+	BOOST_FOREACH(const config& trait, unit_types.traits()) {
- 		const std::string& id = trait["id"];
- 		//It seems the engine does nowhere check the id field for emptyness or duplicates
- 		//(also not later on).
-@@ -3767,7 +3768,7 @@
- 			, static_cast<void *>(const_cast<char *>(&gettypeKey)));
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_newtable(L);
--	foreach (const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
- 	{
- 		lua_createtable(L, 0, 1);
- 		lua_pushstring(L, ut.first.c_str());
-@@ -3786,7 +3787,7 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	const race_map& races = unit_types.races();
- 	lua_createtable(L, 0, races.size());
--	foreach(const race_map::value_type &race, races)
-+	BOOST_FOREACH(const race_map::value_type &race, races)
- 	{
- 		lua_createtable(L, 0, 1);
- 		char const* id = race.first.c_str();
-@@ -3801,10 +3802,10 @@
- 
- 	// Execute the preload scripts.
- 	game_config::load_config(preload_config);
--	foreach (const config &cfg, preload_scripts) {
-+	BOOST_FOREACH(const config &cfg, preload_scripts) {
- 		execute(cfg["code"].str().c_str(), 0, 0);
- 	}
--	foreach (const config &cfg, level_.child_range("lua")) {
-+	BOOST_FOREACH(const config &cfg, level_.child_range("lua")) {
- 		execute(cfg["code"].str().c_str(), 0, 0);
- 	}
- 
-@@ -3822,7 +3823,7 @@
- 
- static bool is_handled_file_tag(const std::string &s)
- {
--	foreach (char const *t, handled_file_tags) {
-+	BOOST_FOREACH(char const *t, handled_file_tags) {
- 		if (s == t) return true;
- 	}
- 	return false;
-@@ -3841,7 +3842,7 @@
- 
- 	lua_newtable(L);
- 	int k = 1;
--	foreach (const config::any_child &v, level_.all_children_range())
-+	BOOST_FOREACH(const config::any_child &v, level_.all_children_range())
- 	{
- 		if (is_handled_file_tag(v.key)) continue;
- 		lua_createtable(L, 2, 0);
-@@ -3861,7 +3862,7 @@
-  */
- void LuaKernel::save_game(config &cfg)
- {
--	foreach (const config &v, level_.child_range("lua")) {
-+	BOOST_FOREACH(const config &v, level_.child_range("lua")) {
- 		cfg.add_child("lua", v);
- 	}
- 
-Index: src/dialogs.cpp
-===================================================================
---- src/dialogs.cpp	(revision 54624)
-+++ src/dialogs.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "actions.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -49,6 +48,7 @@
- #include "gui/dialogs/game_save.hpp"
- #include "gui/dialogs/transient_message.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- //#ifdef _WIN32
- //#include "locale.h"
-@@ -95,7 +95,7 @@
- 	}
- 
- 	bool always_display = false;
--	foreach (const config &mod, u->get_modification_advances())
-+	BOOST_FOREACH(const config &mod, u->get_modification_advances())
- 	{
- 		if (mod["always_display"].to_bool()) always_display = true;
- 		sample_units.push_back(::get_advanced_unit(*u, u->type_id()));
-@@ -1009,7 +1009,7 @@
- 	}
- 
- 	//FIXME: This probably must be move into a unit_type function
--	foreach (const config &tr, t->possible_traits())
-+	BOOST_FOREACH(const config &tr, t->possible_traits())
- 	{
- 		if (tr["availability"] != "musthave") continue;
- 		std::string gender_string = (!t->genders().empty() && t->genders().front()== unit_race::FEMALE) ? "female_name" : "male_name";
-@@ -1038,7 +1038,7 @@
- 	// Check if AMLA color is needed
- 	// FIXME: not sure if it's fully accurate (but not very important for unit_type)
- 	// xp_color also need a simpler function for doing this
--	foreach (const config &adv, t->modification_advancements())
-+	BOOST_FOREACH(const config &adv, t->modification_advancements())
- 	{
- 		if (!adv["strict_amla"].to_bool() || !t->can_advance()) {
- 			det.xp_color = "<170,0,255>"; // from unit::xp_color()
-Index: src/menu_events.cpp
-===================================================================
---- src/menu_events.cpp	(revision 54624)
-+++ src/menu_events.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "dialogs.hpp"
- #include "formatter.hpp"
- #include "filechooser.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -66,6 +65,7 @@
- #include "widgets/combo.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -863,7 +863,7 @@
- 
- 
- 	DBG_WB <<"menu_handler::recall: Contents of wb-modified recall list:\n";
--	foreach(const unit* unit, recall_list_team)
-+	BOOST_FOREACH(const unit* unit, recall_list_team)
- 	{
- 		DBG_WB << unit->name() << " [" << unit->id() <<"]\n";
- 	}
-@@ -896,7 +896,7 @@
- 	options.push_back(heading.str());
- 	options_to_filter.push_back(options.back());
- 
--	foreach (const unit* u, recall_list_team)
-+	BOOST_FOREACH(const unit* u, recall_list_team)
- 	{
- 		std::stringstream option, option_to_filter;
- 		std::string name = u->name();
-@@ -933,7 +933,7 @@
- 		option_to_filter << u->type_name() << " " << name << " " << u->level();
- 
- 		option << COLUMN_SEPARATOR;
--		foreach (const t_string& trait, u->trait_names()) {
-+		BOOST_FOREACH(const t_string& trait, u->trait_names()) {
- 			option << trait << '\n';
- 			option_to_filter << " " << trait;
- 		}
-@@ -1540,7 +1540,7 @@
- 								_("Type");
- 	options.push_back(heading);
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		std::stringstream row;
- 
-@@ -2047,7 +2047,7 @@
- 		std::vector<std::string> get_commands_list() const
- 		{
- 			std::vector<std::string> res;
--			foreach(typename command_map::value_type i, command_map_) {
-+			BOOST_FOREACH(typename command_map::value_type i, command_map_) {
- 				res.push_back(i.first);
- 			}
- 			return res;
-@@ -2638,7 +2638,7 @@
- 
- 			if (const config &alias_list = preferences::get_alias())
- 			{
--				foreach (const config::attribute &a, alias_list.attribute_range()) {
-+				BOOST_FOREACH(const config::attribute &a, alias_list.attribute_range()) {
- 					register_alias(a.second, a.first);
- 				}
- 			}
-@@ -3241,7 +3241,7 @@
- 	tile->rebuild_cache(tod_id, &tile_logs);
- 
- 	int order = 1;
--	foreach(const terrain_builder::tile::log_details det, tile_logs) {
-+	BOOST_FOREACH(const terrain_builder::tile::log_details det, tile_logs) {
- 		const terrain_builder::tile::rule_image_rand& ri = *det.first;
- 		const terrain_builder::rule_image_variant& variant = *det.second;
- 
-@@ -3356,7 +3356,7 @@
- void console_handler::do_choose_level() {
- 	std::vector<std::string> options;
- 	int next = 0, nb = 0;
--	foreach (const config &sc, menu_handler_.game_config_.child_range("scenario"))
-+	BOOST_FOREACH(const config &sc, menu_handler_.game_config_.child_range("scenario"))
- 	{
- 		const std::string &id = sc["id"];
- 		options.push_back(id);
-@@ -3367,7 +3367,7 @@
- 	// find scenarios of multiplayer campaigns
- 	// (assumes that scenarios are ordered properly in the game_config)
- 	std::string& scenario = menu_handler_.gamestate_.mp_settings().mp_scenario;
--	foreach (const config &mp, menu_handler_.game_config_.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &mp, menu_handler_.game_config_.child_range("multiplayer"))
- 	{
- 		if (mp["id"] == scenario)
- 		{
-@@ -3596,7 +3596,7 @@
- 	}
- }*/
- void console_handler::do_discover() {
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) {
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) {
- 		preferences::encountered_units().insert(i.second.id());
- 	}
- }
-Index: src/multiplayer_wait.cpp
-===================================================================
---- src/multiplayer_wait.cpp	(revision 54624)
-+++ src/multiplayer_wait.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -30,6 +29,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_network("network");
- #define DBG_NW LOG_STREAM(debug, log_network)
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -222,7 +223,7 @@
- 		//available side.
- 		const config *side_choice = NULL;
- 		int side_num = -1, nb_sides = 0;
--		foreach (const config &sd, level_.child_range("side"))
-+		BOOST_FOREACH(const config &sd, level_.child_range("side"))
- 		{
- 			if (sd["controller"] == "reserved" && sd["current_player"] == preferences::login())
- 			{
-@@ -275,7 +276,7 @@
- 				color = game_config::color_info(color_str).index() - 1;
- 
- 			std::vector<const config *> leader_sides;
--			foreach (const config &side, possible_sides) {
-+			BOOST_FOREACH(const config &side, possible_sides) {
- 				leader_sides.push_back(&side);
- 			}
- 
-@@ -287,7 +288,7 @@
- 			}
- 
- 			std::vector<std::string> choices;
--			foreach (const config *s, leader_sides)
-+			BOOST_FOREACH(const config *s, leader_sides)
- 			{
- 				const config &side = *s;
- 				const std::string &name = side["name"];
-@@ -442,7 +443,7 @@
- 	std::vector<std::string> details;
- 	std::vector<std::string> playerlist;
- 
--	foreach (const config &sd, level_.child_range("side"))
-+	BOOST_FOREACH(const config &sd, level_.child_range("side"))
- 	{
- 		if (!sd["allow_player"].to_bool(true)) {
- 			continue;
-@@ -458,7 +459,7 @@
- 		// Hack: if there is a unit which can recruit, use it as a
- 		// leader. Necessary to display leader information when loading
- 		// saves.
--		foreach (const config &side_unit, sd.child_range("unit"))
-+		BOOST_FOREACH(const config &side_unit, sd.child_range("unit"))
- 		{
- 			if (side_unit["canrecruit"].to_bool()) {
- 				leader_type = side_unit["type"].str();
-Index: src/serialization/schema_validator.cpp
-===================================================================
---- src/serialization/schema_validator.cpp	(revision 54624)
-+++ src/serialization/schema_validator.cpp	(revision 54625)
-@@ -17,12 +17,13 @@
- 
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "serialization/preprocessor.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace schema_validation{
- 
- static lg::log_domain log_validation("validation");
-@@ -143,14 +144,14 @@
- 	} catch(config::error&) {
- 		return false;
- 	}
--	foreach (const config &g, cfg.child_range("wml_schema")) {
--		foreach (const config &schema, g.child_range("tag")) {
-+	BOOST_FOREACH(const config &g, cfg.child_range("wml_schema")) {
-+		BOOST_FOREACH(const config &schema, g.child_range("tag")) {
- 			if (schema["name"].str() == "root"){
- 				//@NOTE Don't know, maybe merging of roots needed.
- 				root_ = class_tag (schema);
- 			}
- 		}
--		foreach (const config &type, g.child_range("type")) {
-+		BOOST_FOREACH(const config &type, g.child_range("type")) {
- 			try{
- 				types_[type["name"].str()] = boost::regex( type["value"].str());
- 			}
-Index: src/serialization/preprocessor.cpp
-===================================================================
---- src/serialization/preprocessor.cpp	(revision 54624)
-+++ src/serialization/preprocessor.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "log.hpp"
- #include "wesconfig.h"
-@@ -34,6 +33,8 @@
- #include "util.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <stdexcept>
- 
- static lg::log_domain log_config("config");
-@@ -64,7 +65,7 @@
- 	int n = 0;
- 	s >> std::hex >> n;
- 
--	foreach(const t_file_number_map::value_type& p, file_number_map){
-+	BOOST_FOREACH(const t_file_number_map::value_type& p, file_number_map){
- 		if(p.second == n)
- 			return p.first;
- 	}
-@@ -142,7 +143,7 @@
- 	writer.write_key_val("linenum", lexical_cast<std::string>(linenum));
- 	writer.write_key_val("location", get_location(location));
- 
--	foreach (const std::string &arg, arguments)
-+	BOOST_FOREACH(const std::string &arg, arguments)
- 		write_argument(writer, arg);
- 
- 	writer.close_child(key);
-@@ -160,7 +161,7 @@
- 	linenum = cfg["linenum"];
- 	location = cfg["location"].str();
- 
--	foreach (const config &arg, cfg.child_range("argument"))
-+	BOOST_FOREACH(const config &arg, cfg.child_range("argument"))
- 		read_argument(arg);
- }
- 
-@@ -1157,14 +1158,14 @@
- 		get_files_in_dir(res_name, &files, &dirs, ENTIRE_FILE_PATH, SKIP_MEDIA_DIR, DO_REORDER);
- 
- 		// subdirectories
--		foreach(const std::string& dir, dirs)
-+		BOOST_FOREACH(const std::string& dir, dirs)
- 		{
- 			LOG_PREPROC<<"processing sub-dir: "<<dir<<'\n';
- 			preprocess_resource(dir,defines_map,write_cfg,write_plain_cfg,target_directory);
- 		}
- 
- 		// files in current directory
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 		{
- 			preprocess_resource(file,defines_map,write_cfg,write_plain_cfg,target_directory);
- 		}
-Index: src/serialization/parser.cpp
-===================================================================
---- src/serialization/parser.cpp	(revision 54624)
-+++ src/serialization/parser.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "serialization/tokenizer.hpp"
- #include "serialization/string_utils.hpp"
- #include "serialization/validator.hpp"
--#include "foreach.hpp"
- 
- #include <stack>
- 
-@@ -40,6 +39,7 @@
- #include <boost/iostreams/filter/gzip.hpp>
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -343,7 +343,7 @@
- {
- 	i18n_symbols["pos"] = ::lineno_string(lineno);
- 	std::string result = _(error_string);
--	foreach(utils::string_map::value_type& var, i18n_symbols)
-+	BOOST_FOREACH(utils::string_map::value_type& var, i18n_symbols)
- 		boost::algorithm::replace_all(result, std::string("$") + var.first, std::string(var.second));
- 	return result;
- }
-@@ -503,11 +503,11 @@
- 	if (tab > max_recursion_levels)
- 		throw config::error("Too many recursion levels in config write");
- 
--	foreach (const config::attribute &i, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg.attribute_range()) {
- 		write_key_val(out, i.first, i.second, tab, textdomain);
- 	}
- 
--	foreach (const config::any_child &item, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &item, cfg.all_children_range())
- 	{
- 		write_open_child(out, item.key, tab);
- 		write_internal(item.cfg, out, textdomain, tab + 1);
-Index: src/game_controller_abstract.cpp
-===================================================================
---- src/game_controller_abstract.cpp	(revision 54624)
-+++ src/game_controller_abstract.cpp	(revision 54625)
-@@ -15,7 +15,6 @@
- 
- #include "game_controller_abstract.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "hotkeys.hpp"
-@@ -24,6 +23,8 @@
- 
- #include "preferences.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- 
- game_controller_abstract::game_controller_abstract(const commandline_options &cmdline_opts) :
-@@ -80,7 +81,7 @@
- 	language_def locale;
- 	if(cmdline_opts_.language) {
- 		std::vector<language_def> langs = get_languages();
--		foreach(const language_def & def, langs) {
-+		BOOST_FOREACH(const language_def & def, langs) {
- 			if(def.localename == *cmdline_opts_.language) {
- 				locale = def;
- 				break;
-Index: src/terrain.cpp
-===================================================================
---- src/terrain.cpp	(revision 54624)
-+++ src/terrain.cpp	(revision 54625)
-@@ -15,13 +15,14 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "terrain.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <set>
- 
- static lg::log_domain log_config("config");
-@@ -284,7 +285,7 @@
-                          t_translation::t_list& terrain_list,
-                          std::map<t_translation::t_terrain, terrain_type>& letter_to_terrain)
- {
--	foreach (const config &t, cfgs)
-+	BOOST_FOREACH(const config &t, cfgs)
- 	{
- 		terrain_type terrain(t);
- 		DBG_G << "create_terrain_maps: " << terrain.number() << " "
-@@ -301,9 +302,9 @@
- 				std::vector<std::string> eg2 = utils::split(terrain.editor_group());
- 				std::set<std::string> egs;
- 				bool clean_merge = true;
--				foreach(std::string& t, eg1)
-+				BOOST_FOREACH(std::string& t, eg1)
- 					clean_merge &= egs.insert(t).second;
--				foreach(std::string& t, eg2)
-+				BOOST_FOREACH(std::string& t, eg2)
- 					clean_merge &= egs.insert(t).second;
- 
- 				std::string joined = utils::join(egs);
-Index: src/config.cpp
-===================================================================
---- src/config.cpp	(revision 54624)
-+++ src/config.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "global.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
-@@ -31,6 +30,7 @@
- #include <cstring>
- #include <deque>
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -255,7 +255,7 @@
- {
- 	check_valid(cfg);
- 
--	foreach (const any_child &value, cfg.all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, cfg.all_children_range()) {
- 		add_child(value.key, value.cfg);
- 	}
- }
-@@ -263,7 +263,7 @@
- void config::append(const config &cfg)
- {
- 	append_children(cfg);
--	foreach (const attribute &v, cfg.values) {
-+	BOOST_FOREACH(const attribute &v, cfg.values) {
- 		values[v.first] = v.second;
- 	}
- }
-@@ -275,7 +275,7 @@
- 	if (child_count(key) < 2) return;
- 
- 	config merged_children;
--	foreach (const config &cfg, child_range(key)) {
-+	BOOST_FOREACH(const config &cfg, child_range(key)) {
- 		merged_children.append(cfg);
- 	}
- 
-@@ -291,7 +291,7 @@
- 
- 	typedef std::map<std::string, config> config_map;
- 	config_map merged_children_map;
--	foreach (const config &cfg, child_range(key)) {
-+	BOOST_FOREACH(const config &cfg, child_range(key)) {
- 		const std::string &value = cfg[attribute];
- 		config_map::iterator m = merged_children_map.find(value);
- 		if ( m!=merged_children_map.end() ) {
-@@ -302,7 +302,7 @@
- 	}
- 
- 	clear_children(key);
--	foreach (const config_map::value_type &i, merged_children_map) {
-+	BOOST_FOREACH(const config_map::value_type &i, merged_children_map) {
- 		add_child(key,i.second);
- 	}
- }
-@@ -459,7 +459,7 @@
- 	ordered_children.erase(std::remove_if(ordered_children.begin(),
- 		ordered_children.end(), remove_ordered(i)), ordered_children.end());
- 
--	foreach (config *c, i->second) {
-+	BOOST_FOREACH(config *c, i->second) {
- 		delete c;
- 	}
- 
-@@ -495,7 +495,7 @@
- 
- 	values.erase(key);
- 
--	foreach (const any_child &value, all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, all_children_range()) {
- 		const_cast<config *>(&value.cfg)->recursive_clear_value(key);
- 	}
- }
-@@ -506,7 +506,7 @@
- 	/* Find the position with the correct index and decrement all the
- 	   indices in the ordering that are above this index. */
- 	unsigned found = 0;
--	foreach (child_pos &p, ordered_children)
-+	BOOST_FOREACH(child_pos &p, ordered_children)
- 	{
- 		if (p.pos != pos) continue;
- 		if (p.index == index)
-@@ -590,7 +590,7 @@
- 	check_valid(cfg);
- 
- 	assert(this != &cfg);
--	foreach (const attribute &v, cfg.values) {
-+	BOOST_FOREACH(const attribute &v, cfg.values) {
- 		values[v.first] = v.second;
- 	}
- }
-@@ -860,21 +860,21 @@
- 	if (track) values[diff_track_attribute] = "modified";
- 
- 	if (const config &inserts = diff.child("insert")) {
--		foreach (const attribute &v, inserts.attribute_range()) {
-+		BOOST_FOREACH(const attribute &v, inserts.attribute_range()) {
- 			values[v.first] = v.second;
- 		}
- 	}
- 
- 	if (const config &deletes = diff.child("delete")) {
--		foreach (const attribute &v, deletes.attribute_range()) {
-+		BOOST_FOREACH(const attribute &v, deletes.attribute_range()) {
- 			values.erase(v.first);
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("change_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("change_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range())
-+		BOOST_FOREACH(const any_child &item, i.all_children_range())
- 		{
- 			if (item.key.empty()) {
- 				continue;
-@@ -889,19 +889,19 @@
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("insert_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("insert_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			config& inserted = add_child_at(item.key, item.cfg, index);
- 			if (track) inserted[diff_track_attribute] = "new";
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("delete_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("delete_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			if (!track) {
- 				remove_child(item.key, index);
- 			} else {
-@@ -918,18 +918,18 @@
- void config::clear_diff_track(const config& diff)
- {
- 	remove_attribute(diff_track_attribute);
--	foreach (const config &i, diff.child_range("delete_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("delete_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			remove_child(item.key, index);
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("change_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("change_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range())
-+		BOOST_FOREACH(const any_child &item, i.all_children_range())
- 		{
- 			if (item.key.empty()) {
- 				continue;
-@@ -943,7 +943,7 @@
- 			itor->second[index]->clear_diff_track(item.cfg);
- 		}
- 	}
--	foreach (const any_child &value, all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, all_children_range()) {
- 		const_cast<config *>(&value.cfg)->remove_attribute(diff_track_attribute);
- 	}
- }
-@@ -984,20 +984,20 @@
- {
- 	check_valid(filter);
- 
--	foreach (const attribute &i, filter.attribute_range())
-+	BOOST_FOREACH(const attribute &i, filter.attribute_range())
- 	{
- 		const attribute_value *v = get(i.first);
- 		if (!v || *v != i.second) return false;
- 	}
- 
--	foreach (const any_child &i, filter.all_children_range())
-+	BOOST_FOREACH(const any_child &i, filter.all_children_range())
- 	{
- 		if (i.key == "not") {
- 			if (matches(i.cfg)) return false;
- 			continue;
- 		}
- 		bool found = false;
--		foreach (const config &j, child_range(i.key)) {
-+		BOOST_FOREACH(const config &j, child_range(i.key)) {
- 			if (j.matches(i.cfg)) {
- 				found = true;
- 				break;
-@@ -1021,11 +1021,11 @@
- {
- 	static int i = 0;
- 	i++;
--	foreach (const config::attribute &val, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &val, cfg.attribute_range()) {
- 		for (int j = 0; j < i-1; j++){ outstream << char(9); }
- 		outstream << val.first << " = " << val.second << '\n';
- 	}
--	foreach (const config::any_child &child, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg.all_children_range())
- 	{
- 		for (int j = 0; j < i - 1; ++j) outstream << char(9);
- 		outstream << "[" << child.key << "]\n";
-@@ -1054,7 +1054,7 @@
- 	hash_str[hash_length] = 0;
- 
- 	i = 0;
--	foreach (const attribute &val, values)
-+	BOOST_FOREACH(const attribute &val, values)
- 	{
- 		for (c = val.first.begin(); c != val.first.end(); ++c) {
- 			hash_str[i] ^= *c;
-@@ -1067,10 +1067,10 @@
- 		}
- 	}
- 
--	foreach (const any_child &ch, all_children_range())
-+	BOOST_FOREACH(const any_child &ch, all_children_range())
- 	{
- 		std::string child_hash = ch.cfg.hash();
--		foreach (char c, child_hash) {
-+		BOOST_FOREACH(char c, child_hash) {
- 			hash_str[i] ^= c;
- 			++i;
- 			if(i == hash_length) {
-Index: src/soundsource.cpp
-===================================================================
---- src/soundsource.cpp	(revision 54624)
-+++ src/soundsource.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- 
- #include "display.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "sound.hpp"
-Index: src/sound.cpp
-===================================================================
---- src/sound.cpp	(revision 54624)
-+++ src/sound.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
-@@ -27,6 +26,8 @@
- 
- #include "SDL_mixer.h"
- 
-+#include <boost/foreach.hpp>
-+
- #include <list>
- 
- static lg::log_domain log_audio("audio");
-@@ -596,7 +597,7 @@
- 		return;
- 
- 	// If current track no longer on playlist, change it.
--	foreach (const music_track &m, current_track_list) {
-+	BOOST_FOREACH(const music_track &m, current_track_list) {
- 		if (current_track == m)
- 			return;
- 	}
-@@ -614,7 +615,7 @@
- {
- 	// First entry clears playlist, others append to it.
- 	bool append = false;
--	foreach (music_track &m, current_track_list) {
-+	BOOST_FOREACH(music_track &m, current_track_list) {
- 		m.write(snapshot, append);
- 		append = true;
- 	}
-Index: src/game_preferences.cpp
-===================================================================
---- src/game_preferences.cpp	(revision 54624)
-+++ src/game_preferences.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #define GETTEXT_DOMAIN "wesnoth-lib"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gamestatus.hpp"
-@@ -31,6 +30,8 @@
- #include "unit_map.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CFG LOG_STREAM(err , log_config)
- 
-@@ -112,9 +113,9 @@
- 				message = foobar
- 			[/line]
- */
--		foreach (const config::any_child &h, history.all_children_range())
-+		BOOST_FOREACH(const config::any_child &h, history.all_children_range())
- 		{
--			foreach (const config &l, h.cfg.child_range("line")) {
-+			BOOST_FOREACH(const config &l, h.cfg.child_range("line")) {
- 				history_map[h.key].push_back(l["message"]);
- 			}
- 		}
-@@ -142,10 +143,10 @@
- */
- 	config history;
- 	typedef std::pair<std::string, std::vector<std::string> > hack;
--	foreach(const hack& history_id, history_map) {
-+	BOOST_FOREACH(const hack& history_id, history_map) {
- 
- 		config history_id_cfg; // [history_id]
--		foreach(const std::string& line, history_id.second) {
-+		BOOST_FOREACH(const std::string& line, history_id.second) {
- 			config cfg; // [line]
- 
- 			cfg["message"] = line;
-@@ -314,7 +315,7 @@
- 		std::vector<game_config::server_info> &game_servers = game_config::server_list;
- 		VALIDATE(!game_servers.empty(), _("No server has been defined."));
- 		pref_servers.insert(pref_servers.begin(), game_servers.begin(), game_servers.end());
--		foreach (const config &server, get_prefs()->child_range("server")) {
-+		BOOST_FOREACH(const config &server, get_prefs()->child_range("server")) {
- 			game_config::server_info sinf;
- 			sinf.name = server["name"].str();
- 			sinf.address = server["address"].str();
-@@ -945,8 +946,8 @@
- }
- 
- void encounter_recallable_units(std::vector<team>& teams){
--	foreach(const team& t, teams) {
--		foreach(const unit& u, t.recall_list()) {
-+	BOOST_FOREACH(const team& t, teams) {
-+		BOOST_FOREACH(const unit& u, t.recall_list()) {
- 			encountered_units_set.insert(u.type_id());
- 		}
- 	}
-Index: src/map_label.cpp
-===================================================================
---- src/map_label.cpp	(revision 54624)
-+++ src/map_label.cpp	(revision 54625)
-@@ -16,12 +16,13 @@
- #include "global.hpp"
- 
- #include "display.hpp"
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "map_label.hpp"
- #include "resources.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- //our definition of map labels being obscured is if the tile is obscured,
- //or the tile below is obscured. This is because in the case where the tile
- //itself is visible, but the tile below is obscured, the bottom half of the
-@@ -59,7 +60,7 @@
- {
- 	clear_all();
- 
--	foreach (const config &i, cfg.child_range("label"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("label"))
- 	{
- 		const map_location loc(i, resources::state_of_game);
- 		terrain_label *label = new terrain_label(*this, i);
-@@ -222,7 +223,7 @@
- 
- void map_labels::clear_all()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
- 		clear_map(m.second, true);
- 	}
-@@ -231,9 +232,9 @@
- 
- void map_labels::recalculate_labels()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
--		foreach (label_map::value_type &l, m.second)
-+		BOOST_FOREACH(label_map::value_type &l, m.second)
- 		{
- 			l.second->recalculate();
- 		}
-@@ -249,9 +250,9 @@
- 
- void map_labels::recalculate_shroud()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
--		foreach (label_map::value_type &l, m.second)
-+		BOOST_FOREACH(label_map::value_type &l, m.second)
- 		{
- 			l.second->calculate_shroud();
- 		}
-Index: src/actions.cpp
-===================================================================
---- src/actions.cpp	(revision 54624)
-+++ src/actions.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "actions.hpp"
- 
- #include "attack_prediction.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
-@@ -206,7 +206,7 @@
- 	placements.push_back("map");
- 	placements.push_back("recall");
- 
--	foreach(std::string place, placements) {
-+	BOOST_FOREACH(std::string place, placements) {
- 		map_location loc;
- 		bool pass((place == "leader_passable") || (place == "map_passable"));
- 
-@@ -417,7 +417,7 @@
- 				leader_in_place= true;
- 			else continue;
- 
--			foreach (const unit& recall_unit, recall_list)
-+			BOOST_FOREACH(const unit& recall_unit, recall_list)
- 			{
- 				//Only units which match the leaders recall filter are valid.
- 				scoped_recall_unit this_unit("this_unit", t.save_id(), &recall_unit - &recall_list[0]);
-@@ -435,7 +435,7 @@
- 	}
- 
- 	if (!(recall_loc_is_castle && leader_in_place)) {
--		foreach (const unit &recall, recall_list)
-+		BOOST_FOREACH(const unit &recall, recall_list)
- 		{
- 			result.push_back(&recall);
- 		}
-@@ -546,7 +546,7 @@
- 
- 		bool can_recruit_unit = is_on_team_list;
- 		if (!can_recruit_unit) {
--			foreach (const std::string &recruitable, leader->recruits()) {
-+			BOOST_FOREACH(const std::string &recruitable, leader->recruits()) {
- 				if (recruitable == unit_type) {
- 					can_recruit_unit = true;
- 					break;
-@@ -1925,7 +1925,7 @@
- // Simple algorithm: no maximum number of patients per healer.
- void reset_resting(unit_map& units, int side)
- {
--	foreach (unit &u, units) {
-+	BOOST_FOREACH(unit &u, units) {
- 		if (u.side() == side)
- 			u.set_resting(true);
- 	}
-@@ -1946,7 +1946,7 @@
- 	std::list<unit_healing_struct> l;
- 
- 	// We look for all allied units, then we see if our healer is near them.
--	foreach (unit &u, units) {
-+	BOOST_FOREACH(unit &u, units) {
- 
- 		if (u.get_state("unhealable") || u.incapacitated())
- 			continue;
-@@ -2307,7 +2307,7 @@
- 		}
- 
- 		pathfind::paths p(*resources::game_map, *resources::units, loc, *resources::teams, true, false, tm, 0, false, true);
--		foreach (const pathfind::paths::step &dest, p.destinations) {
-+		BOOST_FOREACH(const pathfind::paths::step &dest, p.destinations) {
- 			clear_shroud_loc(tm, dest.curr, &cleared_locations);
- 		}
- 
-@@ -2350,7 +2350,7 @@
- 
- 	tm.refog();
- 
--	foreach (unit &u, *resources::units)
-+	BOOST_FOREACH(unit &u, *resources::units)
- 	{
- 		if (u.side() == side) {
- 			const unit_movement_resetter move_resetter(u);
-@@ -2372,7 +2372,7 @@
- 
- 	bool result = false;
- 
--	foreach (unit &u, *resources::units)
-+	BOOST_FOREACH(unit &u, *resources::units)
- 	{
- 		if (u.side() == side) {
- 			const unit_movement_resetter move_resetter(u);
-@@ -2435,7 +2435,7 @@
- 
- 	std::set<map_location> known_units;
- 	if(check_shroud) {
--		foreach (const unit &u, units) {
-+		BOOST_FOREACH(const unit &u, units) {
- 			if (!tm->fogged(u.get_location())) {
- 				known_units.insert(u.get_location());
- 				tm->see(u.side() - 1);
-@@ -2860,7 +2860,7 @@
- 	*/
- 
- 	std::set<map_location> known_units;
--	foreach (const unit &u, units) {
-+	BOOST_FOREACH(const unit &u, units) {
- 		if (!tm.fogged(u.get_location())) {
- 			known_units.insert(u.get_location());
- 		}
-Index: src/font.cpp
-===================================================================
---- src/font.cpp	(revision 54624)
-+++ src/font.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "config.hpp"
- #include "filesystem.hpp"
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "log.hpp"
- #include "marked-up_text.hpp"
-@@ -32,6 +31,8 @@
- #include "serialization/preprocessor.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <list>
- #include <set>
- #include <stack>
-@@ -355,10 +356,10 @@
- #endif
- 
- #if CAIRO_HAS_WIN32_FONT
--	foreach(const std::string& path, get_binary_paths("fonts")) {
-+	BOOST_FOREACH(const std::string& path, get_binary_paths("fonts")) {
- 		std::vector<std::string> files;
- 		get_files_in_dir(path, &files, NULL, ENTIRE_FILE_PATH);
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 			if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc")
- 				AddFontResource(file.c_str());
- 	}
-@@ -372,10 +373,10 @@
- #endif
- 
- #if CAIRO_HAS_WIN32_FONT
--	foreach(const std::string& path, get_binary_paths("fonts")) {
-+	BOOST_FOREACH(const std::string& path, get_binary_paths("fonts")) {
- 		std::vector<std::string> files;
- 		get_files_in_dir(path, &files, NULL, ENTIRE_FILE_PATH);
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 			if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc")
- 				RemoveFontResource(file.c_str());
- 	}
-@@ -425,7 +426,7 @@
- 		const subset_id subset = font_names.size();
- 		font_names.push_back(itor->name);
- 
--		foreach (const subset_descriptor::range &cp_range, itor->present_codepoints) {
-+		BOOST_FOREACH(const subset_descriptor::range &cp_range, itor->present_codepoints) {
- 			char_blocks.insert(cp_range.first, cp_range.second, subset);
- 		}
- 	}
-@@ -582,7 +583,7 @@
- 	w_ = 0;
- 	h_ = 0;
- 
--	foreach (text_chunk const &chunk, chunks_)
-+	BOOST_FOREACH(text_chunk const &chunk, chunks_)
- 	{
- 		TTF_Font* ttfont = get_font(font_id(chunk.subset, font_size_));
- 		if(ttfont == NULL)
-@@ -628,7 +629,7 @@
- 	if(width() > max_text_line_width)
- 		return surfs_;
- 
--	foreach (text_chunk const &chunk, chunks_)
-+	BOOST_FOREACH(text_chunk const &chunk, chunks_)
- 	{
- 		TTF_Font* ttfont = get_font(font_id(chunk.subset, font_size_));
- 		if (ttfont == NULL)
-@@ -1261,7 +1262,7 @@
- 		return false;
- 
- 	std::set<std::string> known_fonts;
--	foreach (const config &font, fonts_config.child_range("font")) {
-+	BOOST_FOREACH(const config &font, fonts_config.child_range("font")) {
- 		known_fonts.insert(font["name"]);
- 	}
- 
-Index: src/unit_animation.cpp
-===================================================================
---- src/unit_animation.cpp	(revision 54624)
-+++ src/unit_animation.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "unit_animation.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "halo.hpp"
- #include "map.hpp"
-@@ -26,6 +25,8 @@
- #include "resources.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <algorithm>
- 
- struct tag_name_manager {
-@@ -78,7 +79,7 @@
- 	config merge() const
- 	{
- 		config result = attributes;
--		foreach (const config::all_children_iterator &i, children)
-+		BOOST_FOREACH(const config::all_children_iterator &i, children)
- 			result.add_child(i->key, i->cfg);
- 		return result;
- 	}
-@@ -99,7 +100,7 @@
- 	animation_cursor(const config &cfg, animation_cursor *p):
- 		itors(cfg.all_children_range()), branches(p->branches), parent(p)
- 	{
--		foreach (animation_branch &ab, branches)
-+		BOOST_FOREACH(animation_branch &ab, branches)
- 			ab.attributes.merge_attributes(cfg);
- 	}
- };
-@@ -122,7 +123,7 @@
- 		if (ac.itors.first->key != "if")
- 		{
- 			// Append current config object to all the branches in scope.
--			foreach (animation_branch &ab, ac.branches) {
-+			BOOST_FOREACH(animation_branch &ab, ac.branches) {
- 				ab.children.push_back(ac.itors.first);
- 			}
- 			++ac.itors.first;
-@@ -154,7 +155,7 @@
- static animation_branches prepare_animation(const config &cfg, const std::string &animation_tag)
- {
- 	animation_branches expanded_animations;
--	foreach (const config &anim, cfg.child_range(animation_tag)) {
-+	BOOST_FOREACH(const config &anim, cfg.child_range(animation_tag)) {
- 		prepare_single_animation(anim, expanded_animations);
- 	}
- 	return expanded_animations;
-@@ -207,7 +208,7 @@
- 	overlaped_hex_()
- {
- //	if(!cfg["debug"].empty()) printf("DEBUG WML: FINAL\n%s\n\n",cfg.debug().c_str());
--	foreach (const config::any_child &fr, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &fr, cfg.all_children_range())
- 	{
- 		if (fr.key == frame_string) continue;
- 		if (fr.key.find("_frame", fr.key.size() - 6) == std::string::npos) continue;
-@@ -221,11 +222,11 @@
- 		const map_location::DIRECTION d = map_location::parse_direction(*i);
- 		directions_.push_back(d);
- 	}
--	foreach (const config &filter, cfg.child_range("filter")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter")) {
- 		unit_filter_.push_back(filter);
- 	}
- 
--	foreach (const config &filter, cfg.child_range("filter_second")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_second")) {
- 		secondary_unit_filter_.push_back(filter);
- 	}
- 
-@@ -253,10 +254,10 @@
- 	for(value2=value2_str.begin() ; value2 != value2_str.end() ; ++value2) {
- 		value2_.push_back(atoi(value2->c_str()));
- 	}
--	foreach (const config &filter, cfg.child_range("filter_attack")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_attack")) {
- 		primary_attack_filter_.push_back(filter);
- 	}
--	foreach (const config &filter, cfg.child_range("filter_second_attack")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_second_attack")) {
- 		secondary_attack_filter_.push_back(filter);
- 	}
- 	play_offscreen_ = cfg["offscreen"].to_bool(true);
-@@ -487,7 +488,7 @@
- 	display::tdrawing_layer layer = display::LAYER_UNIT_DEFAULT,
- 	bool offscreen = true)
- {
--	foreach (const animation_branch &ab, prepare_animation(cfg, tag_name))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, tag_name))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = apply_to;
-@@ -503,7 +504,7 @@
- 
- void unit_animation::add_anims( std::vector<unit_animation> & animations, const config & cfg)
- {
--	foreach (const animation_branch &ab, prepare_animation(cfg, "animation")) {
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "animation")) {
- 		animations.push_back(unit_animation(ab.merge()));
- 	}
- 
-@@ -519,7 +520,7 @@
- 	add_simple_anim(animations, cfg, "levelin_anim", "levelin");
- 	add_simple_anim(animations, cfg, "levelout_anim", "levelout");
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "default";
-@@ -528,7 +529,7 @@
- 		if (anim["offscreen"].empty()) anim["offscreen"] = false;
- 		animations.push_back(unit_animation(anim));
- 	}
--	foreach (const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "standing";
-@@ -537,7 +538,7 @@
- 		if (anim["offscreen"].empty()) anim["offscreen"] = false;
- 		animations.push_back(unit_animation(anim));
- 	}
--	foreach (const animation_branch &ab, prepare_animation(cfg, "healing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "healing";
-@@ -546,7 +547,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "healed_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healed_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "healed";
-@@ -558,7 +559,7 @@
- 		animations.back().sub_anims_["_healed_sound"].add_frame(1,frame_builder().sound("heal.wav"),true);
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "poison_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "poison_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] ="poisoned";
-@@ -572,7 +573,7 @@
- 
- 	add_simple_anim(animations, cfg, "pre_movement_anim", "pre_movement", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "movement_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "movement_anim"))
- 	{
- 		config anim = ab.merge();
- 		if (anim["offset"].empty()) {
-@@ -585,7 +586,7 @@
- 
- 	add_simple_anim(animations, cfg, "post_movement_anim", "post_movement", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "defend"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "defend"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "defend";
-@@ -607,7 +608,7 @@
- 		else
- 		{
- 			std::vector<std::string> v = utils::split(anim["hits"]);
--			foreach (const std::string &hit_type, v)
-+			BOOST_FOREACH(const std::string &hit_type, v)
- 			{
- 				config tmp = anim;
- 				tmp["hits"] = hit_type;
-@@ -625,7 +626,7 @@
- 	add_simple_anim(animations, cfg, "draw_weapon_anim", "draw_wepaon", display::LAYER_UNIT_MOVE_DEFAULT);
- 	add_simple_anim(animations, cfg, "sheath_weapon_anim", "sheath_wepaon", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "attack_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "attack_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "attack";
-@@ -646,7 +647,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "death"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "death"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "death";
-@@ -663,7 +664,7 @@
- 
- 	add_simple_anim(animations, cfg, "victory_anim", "victory");
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "extra_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "extra_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = anim["flag"];
-@@ -671,7 +672,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "teleport_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "teleport_anim"))
- 	{
- 		config anim = ab.merge();
- 		if (anim["layer"].empty()) anim["layer"] = default_layer;
-@@ -742,14 +743,14 @@
- 	config::const_child_itors range = cfg.child_range(frame_string+"frame");
- 	starting_frame_time_=INT_MAX;
- 	if(cfg[frame_string+"start_time"].empty() &&range.first != range.second) {
--		foreach (const config &frame, range) {
-+		BOOST_FOREACH(const config &frame, range) {
- 			starting_frame_time_ = std::min(starting_frame_time_, frame["begin"].to_int());
- 		}
- 	} else {
- 		starting_frame_time_ = cfg[frame_string+"start_time"];
- 	}
- 
--	foreach (const config &frame, range)
-+	BOOST_FOREACH(const config &frame, range)
- 	{
- 		unit_frame tmp_frame(frame);
- 		add_frame(tmp_frame.duration(),tmp_frame,!tmp_frame.does_not_change());
-Index: src/storyscreen/render.cpp
-===================================================================
---- src/storyscreen/render.cpp	(revision 54624)
-+++ src/storyscreen/render.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "global.hpp"
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "storyscreen/part.hpp"
- #include "storyscreen/render.hpp"
-@@ -34,6 +33,8 @@
- #include "text.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG  LOG_STREAM(err,  log_engine)
- #define WARN_NG LOG_STREAM(warn, log_engine)
-@@ -167,7 +168,7 @@
- void part_ui::prepare_floating_images()
- {
- 	// Build floating image surfaces
--	foreach(const floating_image& fi, p_.get_floating_images()) {
-+	BOOST_FOREACH(const floating_image& fi, p_.get_floating_images()) {
- 		imgs_.push_back( fi.get_render_input(scale_factor_, base_rect_) );
- 	}
- }
-@@ -190,7 +191,7 @@
- 	last_key_ = true;
- 
- 	size_t fi_n = 0;
--	foreach(floating_image::render_input& ri, imgs_) {
-+	BOOST_FOREACH(floating_image::render_input& ri, imgs_) {
- 		const floating_image& fi = p_.get_floating_images()[fi_n];
- 
- 		if(!ri.image.null()) {
-Index: src/storyscreen/interface.cpp
-===================================================================
---- src/storyscreen/interface.cpp	(revision 54624)
-+++ src/storyscreen/interface.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
-  */
- 
- #include "global.hpp"
--#include "foreach.hpp"
- #include "variable.hpp"
- 
- #include "storyscreen/interface.hpp"
-Index: src/storyscreen/controller.cpp
-===================================================================
---- src/storyscreen/controller.cpp	(revision 54624)
-+++ src/storyscreen/controller.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "storyscreen/render.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "variable.hpp"
- 
- #include "display.hpp"
-@@ -37,6 +36,8 @@
- #include "resources.hpp"
- #include "widgets/button.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -138,7 +139,7 @@
- 	// caching the scaled backgrounds can take over a decent amount of memory.
- #ifndef LOW_MEM
- 	std::vector< render_pointer_type > uis_;
--	foreach(part_pointer_type p, parts_) {
-+	BOOST_FOREACH(part_pointer_type p, parts_) {
- 		ASSERT_LOG( p != NULL, "Ouch: hit NULL storyscreen part in collection" );
- 		render_pointer_type const rpt(new part_ui(*p, disp_, next_button, back_button, play_button));
- 		uis_.push_back(rpt);
-Index: src/storyscreen/part.cpp
-===================================================================
---- src/storyscreen/part.cpp	(revision 54624)
-+++ src/storyscreen/part.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- #include "storyscreen/part.hpp"
-Index: src/game.cpp
-===================================================================
---- src/game.cpp	(revision 54624)
-+++ src/game.cpp	(revision 54625)
-@@ -40,6 +40,7 @@
- #include <fstream>
- #include <libintl.h>
- 
-+#include <boost/foreach.hpp>
- #include <boost/iostreams/copy.hpp>
- #include <boost/iostreams/filter/gzip.hpp>
- 
-@@ -218,7 +219,7 @@
- 			int read = 0;
- 
- 			// use static preproc_define::read_pair(config) to make a object
--			foreach ( const config::any_child &value, cfg.all_children_range() ) {
-+			BOOST_FOREACH( const config::any_child &value, cfg.all_children_range() ) {
- 				const preproc_map::value_type def = preproc_define::read_pair( value.cfg );
- 				input_macros[def.first] = def.second;
- 				++read;
-@@ -245,7 +246,7 @@
- 		if ( cmdline_opts.preprocess_defines ) {
- 
- 			// add the specified defines
--			foreach ( const std::string &define, *cmdline_opts.preprocess_defines ) {
-+			BOOST_FOREACH( const std::string &define, *cmdline_opts.preprocess_defines ) {
- 				if (define.empty()){
- 					std::cerr << "empty define supplied\n";
- 					continue;
-@@ -452,7 +453,7 @@
- 			const config &cfg = game->game_config().child("titlescreen_music");
- 			if (cfg) {
- 	            sound::play_music_repeatedly(game_config::title_music);
--				foreach (const config &i, cfg.child_range("music")) {
-+				BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 					sound::play_music_config(i);
- 				}
- 				sound::commit_music_changes();
-Index: src/playsingle_controller.cpp
-===================================================================
---- src/playsingle_controller.cpp	(revision 54624)
-+++ src/playsingle_controller.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "ai/game_info.hpp"
- #include "ai/testing.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -48,6 +47,8 @@
- #include "whiteboard/manager.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -324,7 +325,7 @@
- 	LOG_NG << "in playsingle_controller::play_scenario()...\n";
- 
- 	// Start music.
--	foreach (const config &m, level_.child_range("music")) {
-+	BOOST_FOREACH(const config &m, level_.child_range("music")) {
- 		sound::play_music_config(m);
- 	}
- 	sound::commit_music_changes();
-@@ -336,7 +337,7 @@
- 
- 	// Read sound sources
- 	assert(soundsources_manager_ != NULL);
--	foreach (const config &s, level_.child_range("sound_source")) {
-+	BOOST_FOREACH(const config &s, level_.child_range("sound_source")) {
- 		soundsource::sourcespec spec(s);
- 		soundsources_manager_->add(spec);
- 	}
-@@ -906,14 +907,14 @@
- 			new_side["previous_recruits"] = can_recruit_str;
- 			LOG_NG << "stored side in snapshot:\n" << new_side["save_id"] << std::endl;
- 			//add the units of the recall list
--			foreach(const unit& u, i->recall_list()) {
-+			BOOST_FOREACH(const unit& u, i->recall_list()) {
- 				config& new_unit = new_side.add_child("unit");
- 				u.write(new_unit);
- 			}
- 		}
- 	}
- 	//add any players from starting_pos that do not have a team in the current scenario
--	foreach (const config &player_cfg, gamestate_.starting_pos.child_range("player")) {
-+	BOOST_FOREACH(const config &player_cfg, gamestate_.starting_pos.child_range("player")) {
- 		if (side_ids.count(player_cfg["save_id"]) == 0) {
- 			LOG_NG << "stored inactive side in snapshot:\n" << player_cfg["save_id"] << std::endl;
- 			gamestate_.snapshot.add_child("side", player_cfg);
-@@ -938,7 +939,7 @@
- 	}
- 
- 	int persistent_teams = 0;
--	foreach (const team &t, teams_) {
-+	BOOST_FOREACH(const team &t, teams_) {
- 		if (t.persistent()) ++persistent_teams;
- 	}
- 
-@@ -953,7 +954,7 @@
- 		int turns_left = std::max<int>(0, tod_manager_.number_of_turns() - turn());
- 		int finishing_bonus = (end_level.gold_bonus && turns_left > -1) ?
- 			finishing_bonus_per_turn * turns_left : 0;
--		foreach (const team &t, teams_)
-+		BOOST_FOREACH(const team &t, teams_)
- 		{
- 			if (!t.persistent()) continue;
- 			int carryover_gold = div100rounded((t.gold() + finishing_bonus) * end_level.carryover_percentage);
-Index: src/controller_base.cpp
-===================================================================
---- src/controller_base.cpp	(revision 54624)
-+++ src/controller_base.cpp	(revision 54625)
-@@ -18,11 +18,12 @@
- 
- #include "dialogs.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
- #include "mouse_handler_base.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_display("display");
- #define ERR_DP LOG_STREAM(err, log_display)
- 
-@@ -144,7 +145,7 @@
- 	int dx = 0, dy = 0;
- 	int scroll_threshold = (preferences::mouse_scroll_enabled())
- 		? preferences::mouse_scroll_threshold() : 0;
--	foreach (const theme::menu& m, get_display().get_theme().menus()) {
-+	BOOST_FOREACH(const theme::menu& m, get_display().get_theme().menus()) {
- 		if (point_in_rect(mousex, mousey, m.get_location())) {
- 			scroll_threshold = 0;
- 		}
-Index: src/gamestatus.cpp
-===================================================================
---- src/gamestatus.cpp	(revision 54624)
-+++ src/gamestatus.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "gamestatus.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "game_preferences.hpp"
-@@ -42,6 +41,7 @@
- #include "whiteboard/side_actions.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #ifndef _MSC_VER
- #include <sys/time.h>
-@@ -178,9 +178,9 @@
- 		tags.push_back("side");
- 		tags.push_back("player"); //merge [player] tags for backwards compatibility of saves
- 
--		foreach (const std::string& side_tag, tags)
-+		BOOST_FOREACH(const std::string& side_tag, tags)
- 		{
--			foreach (config &carryover_side, source->child_range(side_tag))
-+			BOOST_FOREACH(config &carryover_side, source->child_range(side_tag))
- 			{
- 				config *scenario_side = NULL;
- 
-@@ -226,13 +226,13 @@
- 				(*scenario_side)["color"] = carryover_side["color"];
- 
- 				//add recallable units
--				foreach (const config &u, carryover_side.child_range("unit")) {
-+				BOOST_FOREACH(const config &u, carryover_side.child_range("unit")) {
- 					scenario_side->add_child("unit", u);
- 				}
- 			}
- 		}
- 	} else {
--		foreach(const config &snapshot_side, source->child_range("side")) {
-+		BOOST_FOREACH(const config &snapshot_side, source->child_range("side")) {
- 			//take all side tags and add them as players (assuming they only contain carryover information)
- 			cfg.add_child("player", snapshot_side);
- 		}
-@@ -306,7 +306,7 @@
- 		//See also playcampaign::play_game, where after finishing the scenario the replay
- 		//will be saved.
- 		if(!starting_pos.empty()) {
--			foreach (const config &p, cfg.child_range("player")) {
-+			BOOST_FOREACH(const config &p, cfg.child_range("player")) {
- 				config& cfg_player = starting_pos.add_child("player");
- 				cfg_player.merge_with(p);
- 			}
-@@ -400,7 +400,7 @@
- 	std::string leader;
- 	std::string leader_image;
- 
--	//foreach (const config &p, cfg_save.child_range("player"))
-+	//BOOST_FOREACH(const config &p, cfg_save.child_range("player"))
- 	//{
- 	//	if (utils::string_bool(p["canrecruit"], false)) {
- 	//		leader = p["save_id"];
-@@ -413,7 +413,7 @@
- 	//{
- 		if (const config &snapshot = *(has_snapshot ? &cfg_snapshot : &cfg_replay_start))
- 		{
--			foreach (const config &side, snapshot.child_range("side"))
-+			BOOST_FOREACH(const config &side, snapshot.child_range("side"))
- 			{
- 				if (side["controller"] != "human") {
- 					continue;
-@@ -430,7 +430,7 @@
- 						break;
- 				}
- 
--				foreach (const config &u, side.child_range("unit"))
-+				BOOST_FOREACH(const config &u, side.child_range("unit"))
- 				{
- 					if (u["canrecruit"].to_bool()) {
- 						leader = u["id"].str();
-@@ -794,7 +794,7 @@
- 		// can be recruited for the player, add them.
- 		if (!player_cfg_) return;
- 		if (const config::attribute_value *v = player_cfg_->get("previous_recruits")) {
--			foreach (const std::string &rec, utils::split(*v)) {
-+			BOOST_FOREACH(const std::string &rec, utils::split(*v)) {
- 				DBG_NG_TC << "adding previous recruit: " << rec << '\n';
- 				t_->add_recruit(rec);
- 			}
-@@ -857,7 +857,7 @@
- 		if (!side_cfg_["no_leader"].to_bool() && side_cfg_["controller"] != "null") {
- 			handle_leader(side_cfg_);
- 		}
--		foreach (const config &l, side_cfg_.child_range("leader")) {
-+		BOOST_FOREACH(const config &l, side_cfg_.child_range("leader")) {
- 			handle_leader(l);
- 		}
- 	}
-@@ -871,13 +871,13 @@
- 			//only relevant in start-of-scenario saves, that's why !shapshot
- 			//units that are in '[scenario][side]' are 'first'
- 			//for create-or-recall semantics to work: for each unit with non-empty id, unconditionally put OTHER, later, units with same id directly to recall list, not including them in unit_configs_
--			foreach(const config &u, (*player_cfg_).child_range("unit")) {
-+			BOOST_FOREACH(const config &u, (*player_cfg_).child_range("unit")) {
- 				handle_unit(u,"player_cfg");
- 			}
- 
- 		} else {
- 			//units in [side]
--			foreach (const config &su, side_cfg_.child_range("unit")) {
-+			BOOST_FOREACH(const config &su, side_cfg_.child_range("unit")) {
- 				handle_unit(su, "side_cfg");
- 			}
- 		}
-@@ -902,7 +902,7 @@
- 			"allow_changes", "faction_name", "user_description", "faction" };
- 
- 		log_step("place units");
--		foreach (const config *u, unit_configs_) {
-+		BOOST_FOREACH(const config *u, unit_configs_) {
- 			unit_creator uc(*t_,map_.starting_position(side_));
- 			uc
- 				.allow_add_to_recall(true)
-@@ -913,7 +913,7 @@
- 				.allow_show(false);
- 
- 			config cfg = *u;
--			foreach (const char *attr, side_attrs) {
-+			BOOST_FOREACH(const char *attr, side_attrs) {
- 				cfg.remove_attribute(attr);
- 			}
- 			uc.add_unit(cfg);
-@@ -953,7 +953,7 @@
- void game_state::set_menu_items(const config::const_child_itors &menu_items)
- {
- 	clear_wmi(wml_menu_items);
--	foreach (const config &item, menu_items)
-+	BOOST_FOREACH(const config &item, menu_items)
- 	{
- 		std::string id = item["id"];
- 		wml_menu_item*& mref = wml_menu_items[id];
-Index: src/log.cpp
-===================================================================
---- src/log.cpp	(revision 54624)
-+++ src/log.cpp	(revision 54625)
-@@ -25,8 +25,9 @@
- #include "SDL.h"
- 
- #include "log.hpp"
--#include "foreach.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- #include <sstream>
- #include <ctime>
-@@ -88,11 +89,11 @@
- {
- 	std::string::size_type s = name.size();
- 	if (name == "all") {
--		foreach (logd &l, *domains) {
-+		BOOST_FOREACH(logd &l, *domains) {
- 			l.second = severity;
- 		}
- 	} else if (s > 2 && name.compare(s - 2, 2, "/*") == 0) {
--		foreach (logd &l, *domains) {
-+		BOOST_FOREACH(logd &l, *domains) {
- 			if (l.first.compare(0, s - 1, name, 0, s - 1) == 0)
- 				l.second = severity;
- 		}
-@@ -108,7 +109,7 @@
- std::string list_logdomains(const std::string& filter)
- {
- 	std::ostringstream res;
--	foreach (logd &l, *domains) {
-+	BOOST_FOREACH(logd &l, *domains) {
- 		if(l.first.find(filter) != std::string::npos)
- 			res << l.first << "\n";
- 	}
-Index: src/replay_controller.cpp
-===================================================================
---- src/replay_controller.cpp	(revision 54624)
-+++ src/replay_controller.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
-@@ -27,6 +26,8 @@
- #include "resources.hpp"
- #include "savegame.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- 
-@@ -417,7 +418,7 @@
- 			finish_side_turn();
- 
- 			// This is necessary for replays in order to show possible movements.
--			foreach (unit &u, units_) {
-+			BOOST_FOREACH(unit &u, units_) {
- 				if (u.side() != player_number_) {
- 					u.new_turn();
- 				}
-Index: src/multiplayer_ui.cpp
-===================================================================
---- src/multiplayer_ui.cpp	(revision 54624)
-+++ src/multiplayer_ui.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "construct_dialog.hpp"
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -33,6 +32,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -163,9 +164,9 @@
- 			state.starting_pos.child_range("side");
- 		config::const_child_itors level_sides = level.child_range("side");
- 
--		foreach (config &side, saved_sides)
-+		BOOST_FOREACH(config &side, saved_sides)
- 		{
--			foreach (const config &lside, level_sides)
-+			BOOST_FOREACH(const config &lside, level_sides)
- 			{
- 				if (side["side"] == lside["side"] &&
- 						(side["current_player"] != lside["current_player"] ||
-@@ -599,7 +600,7 @@
- 		if (const config &ms = c.child("members")) {
- 			std::stringstream ss;
- 			ss << "Room " << c["room"].str() << " members: ";
--			foreach (const config& m, ms.child_range("member")) {
-+			BOOST_FOREACH(const config& m, ms.child_range("member")) {
- 				ss << m["name"] << " ";
- 			}
- 			chat_.add_message(time(NULL), "server", ss.str());
-@@ -608,7 +609,7 @@
- 		if (const config &rs = c.child("rooms")) {
- 			std::stringstream ss;
- 			ss << "Rooms: ";
--			foreach (const config& r, rs.child_range("room")) {
-+			BOOST_FOREACH(const config& r, rs.child_range("room")) {
- 				ss << r["name"].str() << "(" << r["size"].str() << ") ";
- 			}
- 			chat_.add_message(time(NULL), "server", ss.str());
-@@ -706,7 +707,7 @@
- {
- 	std::list<user_info> u_list;
- 
--	foreach (const config &user, gamelist_.child_range("user"))
-+	BOOST_FOREACH(const config &user, gamelist_.child_range("user"))
- 	{
- 		user_info u_elem;
- 		u_elem.name = user["name"].str();
-@@ -848,12 +849,12 @@
- 	}
- 
- 	int res = -1, index = 0, best_score = 0;
--	foreach (const config *faction, fl)
-+	BOOST_FOREACH(const config *faction, fl)
- 	{
- 		int faction_score = 0;
- 		std::vector<std::string> recruit = utils::split((*faction)[search_field]);
--		foreach (const std::string &search, find) {
--			foreach (const std::string &r, recruit) {
-+		BOOST_FOREACH(const std::string &search, find) {
-+			BOOST_FOREACH(const std::string &r, recruit) {
- 				if (r == search) {
- 					++faction_score;
- 					break;
-Index: src/display.cpp
-===================================================================
---- src/display.cpp	(revision 54624)
-+++ src/display.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "builder.hpp"
- #include "cursor.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "halo.hpp"
-@@ -41,6 +40,8 @@
- 
- #include "SDL_image.h"
- 
-+#include <boost/foreach.hpp>
-+
- #ifdef __SUNPRO_CC
- // GCC doesn't have hypot in cmath so include it for Sun Studio
- #include <math.h>
-@@ -629,7 +630,7 @@
- 	// now get the surfaces
- 	std::vector<surface> res;
- 
--	foreach(std::string& name, names) {
-+	BOOST_FOREACH(std::string& name, names) {
- 		const surface surf(image::get_image(name, image_type));
- 		if (surf)
- 			res.push_back(surf);
-@@ -828,8 +829,8 @@
- 	 * layergroup > location > layer > 'tblit' > surface
- 	 */
- 
--	foreach(const tblit &blit, drawing_buffer_) {
--		foreach(const surface& surf, blit.surf()) {
-+	BOOST_FOREACH(const tblit &blit, drawing_buffer_) {
-+		BOOST_FOREACH(const surface& surf, blit.surf()) {
- 			// Note that dstrect can be changed by sdl_blit
- 			// and so a new instance should be initialized
- 			// to pass to each call to sdl_blit.
-@@ -1903,7 +1904,7 @@
- 	int ticks3 = SDL_GetTicks();
- 	LOG_DP << "invalidate and draw: " << (ticks3 - ticks2) << " and " << (ticks2 - ticks1) << "\n";
- 
--	foreach (boost::function<void(display&)> f, redraw_observers_) {
-+	BOOST_FOREACH(boost::function<void(display&)> f, redraw_observers_) {
- 		f(*this);
- 	}
- 
-@@ -1992,7 +1993,7 @@
- 	SDL_Rect clip_rect = get_clip_rect();
- 	surface screen = get_screen_surface();
- 	clip_rect_setter set_clip_rect(screen, &clip_rect);
--	foreach (const map_location& loc, invalidated_) {
-+	BOOST_FOREACH(const map_location& loc, invalidated_) {
- 		int xpos = get_location_x(loc);
- 		int ypos = get_location_y(loc);
- 
-@@ -2058,7 +2059,7 @@
- 	// Paint arrows
- 	arrows_map_t::const_iterator arrows_in_hex = arrows_map_.find(loc);
- 	if(arrows_in_hex != arrows_map_.end()) {
--		foreach(arrow* const a, arrows_in_hex->second) {
-+		BOOST_FOREACH(arrow* const a, arrows_in_hex->second) {
- 			a->draw_hex(loc);
- 		}
- 	}
-@@ -2388,7 +2389,7 @@
- 	if(invalidateAll_)
- 		return false;
- 	bool ret = false;
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- #ifdef _OPENMP
- #pragma omp critical(invalidated_)
- #endif //_OPENMP
-@@ -2438,7 +2439,7 @@
- 		return false;
- 
- 	bool result = false;
--	foreach (const map_location &loc, hexes_under_rect(rect)) {
-+	BOOST_FOREACH(const map_location &loc, hexes_under_rect(rect)) {
- 		result |= invalidate(loc);
- 	}
- 	return result;
-@@ -2450,7 +2451,7 @@
- 	animate_map_ = preferences::animate_map();
- 	if (!animate_map_) return;
- 
--	foreach (const map_location &loc, get_visible_hexes())
-+	BOOST_FOREACH(const map_location &loc, get_visible_hexes())
- 	{
- 		if (shrouded(loc)) continue;
- 		if (builder_->update_animation(loc)) {
-@@ -2464,7 +2465,7 @@
- void display::add_arrow(arrow& arrow)
- {
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].push_back(&arrow);
- 	}
-@@ -2473,7 +2474,7 @@
- void display::remove_arrow(arrow& arrow)
- {
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].remove(&arrow);
- 	}
-@@ -2482,12 +2483,12 @@
- void display::update_arrow(arrow & arrow)
- {
- 	const arrow_path_t & previous_path = arrow.get_previous_path();
--	foreach (const map_location& loc, previous_path)
-+	BOOST_FOREACH(const map_location& loc, previous_path)
- 	{
- 		arrows_map_[loc].remove(&arrow);
- 	}
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].push_back(&arrow);
- 	}
-Index: src/about.cpp
-===================================================================
---- src/about.cpp	(revision 54624)
-+++ src/about.cpp	(revision 54625)
-@@ -22,10 +22,11 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "marked-up_text.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- /**
-  * @namespace about
-  * Display credits %about all contributors.
-@@ -52,7 +53,7 @@
- 	}
- 
- 	std::vector<std::string> lines = utils::split(c["text"], '\n');
--	foreach (std::string &line, lines)
-+	BOOST_FOREACH(std::string &line, lines)
- 	{
- 		if (line.size() > 1 && line[0] == '+')
- 			line = "+  " + line.substr(1);
-@@ -67,7 +68,7 @@
- 		}
- 	}
- 
--	foreach (const config &entry, c.child_range("entry")) {
-+	BOOST_FOREACH(const config &entry, c.child_range("entry")) {
- 		res.push_back("-  "+ entry["name"].str());
- 	}
- }
-@@ -80,7 +81,7 @@
- 	config::child_itors about_entries = about_list.child_range("about");
- 
- 	if (!campaign.empty()) {
--		foreach (const config &about, about_entries) {
-+		BOOST_FOREACH(const config &about, about_entries) {
- 			// just finished a particular campaign
- 			if (campaign == about["id"]) {
- 				add_lines(res, about);
-@@ -88,7 +89,7 @@
- 		}
- 	}
- 
--	foreach (const config &about, about_entries) {
-+	BOOST_FOREACH(const config &about, about_entries) {
- 		add_lines(res, about);
- 	}
- 
-@@ -101,7 +102,7 @@
- 	images.clear();
- 	images_default = "";
- 
--	foreach (const config &about, cfg.child_range("about"))
-+	BOOST_FOREACH(const config &about, cfg.child_range("about"))
- 	{
- 		about_list.add_child("about", about);
- 		const std::string &im = about["images"];
-@@ -114,7 +115,7 @@
- 		}
- 	}
- 
--	foreach (const config &campaign, cfg.child_range("campaign"))
-+	BOOST_FOREACH(const config &campaign, cfg.child_range("campaign"))
- 	{
- 		config::const_child_itors abouts = campaign.child_range("about");
- 		if (abouts.first == abouts.second) continue;
-@@ -126,7 +127,7 @@
- 		temp["id"] = id;
- 		std::string campaign_images;
- 
--		foreach (const config &about, abouts)
-+		BOOST_FOREACH(const config &about, abouts)
- 		{
- 			const std::string &subtitle = about["title"];
- 			if (!subtitle.empty())
-@@ -139,12 +140,12 @@
- 				text << '\n';
- 			}
- 
--			foreach (const std::string &line, utils::split(about["text"], '\n'))
-+			BOOST_FOREACH(const std::string &line, utils::split(about["text"], '\n'))
- 			{
- 				text << "    " << line << '\n';
- 			}
- 
--			foreach (const config &entry, about.child_range("entry"))
-+			BOOST_FOREACH(const config &entry, about.child_range("entry"))
- 			{
- 				text << "    " << entry["name"] << '\n';
- 			}
-Index: src/arrow.cpp
-===================================================================
---- src/arrow.cpp	(revision 54624)
-+++ src/arrow.cpp	(revision 54625)
-@@ -20,11 +20,12 @@
- 
- #include "arrow.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_arrows("arrows");
- #define ERR_ARR LOG_STREAM(err, log_arrows)
- #define WRN_ARR LOG_STREAM(warn, log_arrows)
-@@ -293,7 +294,7 @@
- {
- 	if(!SCREEN) return;
- 
--	foreach(map_location const& loc, path)
-+	BOOST_FOREACH(map_location const& loc, path)
- 	{
- 		SCREEN->invalidate(loc);
- 	}
-Index: src/game_display.cpp
-===================================================================
---- src/game_display.cpp	(revision 54624)
-+++ src/game_display.cpp	(revision 54625)
-@@ -34,7 +34,6 @@
- Growl_Delegate growl_obj;
- #endif
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "halo.hpp"
- #include "log.hpp"
-@@ -47,6 +46,8 @@
- #include "sound.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_display("display");
- #define ERR_DP LOG_STREAM(err, log_display)
- #define LOG_DP LOG_STREAM(info, log_display)
-@@ -297,7 +298,7 @@
- 	halo::unrender(invalidated_);
- 	display::draw_invalidated();
- 
--	foreach(unit* temp_unit, fake_units_) {
-+	BOOST_FOREACH(unit* temp_unit, fake_units_) {
- 		const map_location& loc = temp_unit->get_location();
- 		exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
- 		if (invalidated_.find(loc) != invalidated_.end()
-@@ -305,7 +306,7 @@
- 			temp_unit->redraw_unit();
- 	}
- 
--	foreach (const map_location& loc, invalidated_) {
-+	BOOST_FOREACH(const map_location& loc, invalidated_) {
- 		unit_map::iterator u_it = units_.find(loc);
- 		exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
- 		if (u_it != units_.end()
-@@ -451,7 +452,7 @@
- 
- 		// We display the unit the mouse is over if it is over a unit,
- 		// otherwise we display the unit that is selected.
--		foreach (const std::string &name, reports::report_list()) {
-+		BOOST_FOREACH(const std::string &name, reports::report_list()) {
- 			draw_report(name);
- 		}
- 		invalidateGameStatus_ = false;
-@@ -744,7 +745,7 @@
- void game_display::highlight_another_reach(const pathfind::paths &paths_list)
- {
- 	// Fold endpoints of routes into reachability map.
--	foreach (const pathfind::paths::step &dest, paths_list.destinations) {
-+	BOOST_FOREACH(const pathfind::paths::step &dest, paths_list.destinations) {
- 		reach_map_[dest.curr]++;
- 	}
- 	reach_map_changed_ = true;
-@@ -897,17 +898,17 @@
- void game_display::invalidate_animations()
- {
- 	display::invalidate_animations();
--	foreach (unit& u, units_) {
-+	BOOST_FOREACH(unit& u, units_) {
- 		u.refresh();
- 	}
--	foreach(unit* temp_unit, fake_units_) {
-+	BOOST_FOREACH(unit* temp_unit, fake_units_) {
- 		temp_unit->refresh();
- 	}
- 	std::vector<unit*> unit_list;
--	foreach (unit &u, units_) {
-+	BOOST_FOREACH(unit &u, units_) {
- 		unit_list.push_back(&u);
- 	}
--	foreach (unit *u, fake_units_) {
-+	BOOST_FOREACH(unit *u, fake_units_) {
- 		unit_list.push_back(u);
- 	}
- 	bool new_inval;
-@@ -1079,7 +1080,7 @@
- {
- 	const team& curr_team = teams_[playing_team()];
- 	const team& prev_team = teams_[playing_team()-1 < teams_.size() ? playing_team()-1 : teams_.size()-1];
--	foreach (const game_display::overlay_map::value_type i, overlays_) {
-+	BOOST_FOREACH(const game_display::overlay_map::value_type i, overlays_) {
- 		const overlay& ov = i.second;
- 		if (!ov.team_name.empty() &&
- 			((ov.team_name.find(curr_team.team_name()) + 1) != 0) !=
-@@ -1485,7 +1486,7 @@
- 		}
- 	}
- 
--	foreach (const chat_message &cm, chat_messages_) {
-+	BOOST_FOREACH(const chat_message &cm, chat_messages_) {
- 		font::move_floating_label(cm.speaker_handle, 0, - movement);
- 		font::move_floating_label(cm.handle, 0, - movement);
- 	}
-Index: src/formula_function.cpp
-===================================================================
---- src/formula_function.cpp	(revision 54624)
-+++ src/formula_function.cpp	(revision 54625)
-@@ -16,14 +16,14 @@
- #include "global.hpp"
- 
- 
--//#include "foreach.hpp"
- #include "callable_objects.hpp"
--#include "foreach.hpp"
- #include "formula_debugger.hpp"
- #include "formula_function.hpp"
- #include "game_display.hpp"
- #include "log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #ifdef HAVE_VISUAL_LEAK_DETECTOR
- #include "vld.h"
- #endif
-@@ -46,7 +46,7 @@
- 	s << get_name();
- 	s << '(';
- 	bool first_arg = true;
--	foreach(expression_ptr a , args()) {
-+	BOOST_FOREACH(expression_ptr a , args()) {
- 		if (!first_arg) {
- 			s << ',';
- 		} else {
-@@ -451,7 +451,7 @@
- 
- 				std::string result;
- 
--				foreach(expression_ptr arg, args()) {
-+				BOOST_FOREACH(expression_ptr arg, args()) {
- 						result += arg->evaluate(variables, fdb).string_cast();
- 				}
- 
-Index: src/unit_map.cpp
-===================================================================
---- src/unit_map.cpp	(revision 54624)
-+++ src/unit_map.cpp	(revision 54625)
-@@ -17,13 +17,14 @@
- /** @file */
- 
- #include "unit_id.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "unit.hpp"
- 
- #include <functional>
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define WRN_NG LOG_STREAM(warn, log_engine)
-@@ -444,7 +445,7 @@
- {
- 	assert(u);
- 
--	foreach(const unit_pod& item, ilist_) {
-+	BOOST_FOREACH(const unit_pod& item, ilist_) {
- 		if(item.unit == u) {
- 			return true;
- 		}
-Index: src/pathfind/teleport.cpp
-===================================================================
---- src/pathfind/teleport.cpp	(revision 54624)
-+++ src/pathfind/teleport.cpp	(revision 54625)
-@@ -19,7 +19,7 @@
- #include "log.hpp"
- #include "resources.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_PF LOG_STREAM(err, log_engine)
-@@ -108,16 +108,16 @@
- 	, targets_()
- {
- 
--	foreach(const teleport_group& group, groups) {
-+	BOOST_FOREACH(const teleport_group& group, groups) {
- 
- 		teleport_pair locations;
- 		group.get_teleport_pair(locations, u, ignore_units);
- 		if (!see_all && !group.always_visible() && viewing_team.is_enemy(u.side())) {
- 			teleport_pair filter_locs;
--			foreach(const map_location &loc, locations.first)
-+			BOOST_FOREACH(const map_location &loc, locations.first)
- 				if(!viewing_team.fogged(loc))
- 					filter_locs.first.insert(loc);
--			foreach(const map_location &loc, locations.second)
-+			BOOST_FOREACH(const map_location &loc, locations.second)
- 				if(!viewing_team.fogged(loc))
- 					filter_locs.second.insert(loc);
- 			locations.first.swap(filter_locs.first);
-Index: src/pathfind/astarsearch.cpp
-===================================================================
---- src/pathfind/astarsearch.cpp	(revision 54624)
-+++ src/pathfind/astarsearch.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "map.hpp"
- #include "pathfind/pathfind.hpp"
- #include "pathfind/teleport.hpp"
--#include "foreach.hpp"
- 
- #include <queue>
- #include <map>
-Index: src/pathfind/pathfind.cpp
-===================================================================
---- src/pathfind/pathfind.cpp	(revision 54624)
-+++ src/pathfind/pathfind.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "pathfind/pathfind.hpp"
- #include "pathfind/teleport.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -35,6 +34,8 @@
- #include "unit_map.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- #include <vector>
- #include <algorithm>
-@@ -59,7 +60,7 @@
- 		std::set<map_location> tiles_checking;
- 		tiles_checking.swap(pending_tiles_to_check);
- 		//Iterate over all the hexes we need to check
--		foreach (const map_location &loc, tiles_checking)
-+		BOOST_FOREACH(const map_location &loc, tiles_checking)
- 		{
- 			//If this area is not a castle but should, skip it.
- 			if (vacancy == pathfind::VACANT_CASTLE && !map.is_castle(loc)) continue;
-@@ -76,7 +77,7 @@
- 			if (units.find(loc) == units.end() && !pass_check_and_unreachable) return loc;
- 			map_location adjs[6];
- 			get_adjacent_tiles(loc,adjs);
--			foreach (const map_location &loc, adjs)
-+			BOOST_FOREACH(const map_location &loc, adjs)
- 			{
- 				if (!map.on_board(loc)) continue;
- 				// Add the tile to be checked if it hasn't already been and
-Index: src/time_of_day.cpp
-===================================================================
---- src/time_of_day.cpp	(revision 54624)
-+++ src/time_of_day.cpp	(revision 54625)
-@@ -16,9 +16,9 @@
- /** @file */
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "time_of_day.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- std::ostream &operator<<(std::ostream &s, const tod_color& c){
- 	s << c.r << "," << c.g << "," << c.b;
-@@ -62,7 +62,7 @@
- 
- void time_of_day::parse_times(const config& cfg, std::vector<time_of_day>& normal_times)
- {
--	foreach (const config &t, cfg.child_range("time")) {
-+	BOOST_FOREACH(const config &t, cfg.child_range("time")) {
- 		normal_times.push_back(time_of_day(t));
- 	}
- 
-Index: src/persist_manager.cpp
-===================================================================
---- src/persist_manager.cpp	(revision 54624)
-+++ src/persist_manager.cpp	(revision 54625)
-@@ -16,7 +16,7 @@
- #include "persist_context.hpp"
- #include "persist_manager.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- persist_context &persist_manager::get_context(const std::string &ns)
- {
-@@ -36,7 +36,7 @@
- bool persist_manager::start_transaction() {
- 	if (in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->start_transaction();
- 	}
- 	in_transaction_ = true;
-@@ -46,7 +46,7 @@
- bool persist_manager::end_transaction() {
- 	if (!in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->end_transaction();
- 	}
- 	in_transaction_ = !result;
-@@ -56,7 +56,7 @@
- bool persist_manager::cancel_transaction() {
- 	if (!in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->cancel_transaction();
- 	}
- 	in_transaction_ = false;
-Index: src/side_filter.cpp
-===================================================================
---- src/side_filter.cpp	(revision 54624)
-+++ src/side_filter.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- #include "side_filter.hpp"
-@@ -26,6 +25,8 @@
- #include "team.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine_sf("engine/side_filter");
- #define ERR_NG LOG_STREAM(err, log_engine_sf)
- 
-@@ -61,7 +62,7 @@
- {
- 	//@todo: replace with better implementation
- 	std::vector<int> result;
--	foreach (const team &t, *resources::teams) {
-+	BOOST_FOREACH(const team &t, *resources::teams) {
- 		if (match(t)) {
- 			result.push_back(t.side());
- 		}
-@@ -109,7 +110,7 @@
- 		else {
- 			const std::vector<std::string>& these_team_names = utils::split(this_team_name);
- 			bool search_futile = true;
--			foreach(const std::string& this_single_team_name, these_team_names) {
-+			BOOST_FOREACH(const std::string& this_single_team_name, these_team_names) {
- 				if(this_single_team_name == that_team_name) {
- 					search_futile = false;
- 					break;
-@@ -123,7 +124,7 @@
- 	if(cfg_.has_child("has_unit")) {
- 		const vconfig& unit_filter = cfg_.child("has_unit");
- 		bool found = false;
--		foreach (unit &u, *resources::units) {
-+		BOOST_FOREACH(unit &u, *resources::units) {
- 			if (u.side() != t.side()) {
- 				continue;
- 			}
-@@ -134,7 +135,7 @@
- 		}
- 		if(!found && unit_filter["search_recall_list"].to_bool(false)) {
- 			const std::vector<unit>& recall_list = t.recall_list();
--			foreach(const unit& u, recall_list) {
-+			BOOST_FOREACH(const unit& u, recall_list) {
- 				scoped_recall_unit this_unit("this_unit", t.save_id(), &u - &recall_list[0]);
- 				if(u.matches_filter(unit_filter, u.get_location(), flat_)) {
- 					found = true;
-@@ -152,7 +153,7 @@
- 		side_filter s_filter(enemy_of);
- 		const std::vector<int>& teams = s_filter.get_teams();
- 		if(teams.empty()) return false;
--		foreach(const int side, teams) {
-+		BOOST_FOREACH(const int side, teams) {
- 			if(!(*resources::teams)[side - 1].is_enemy(t.side()))
- 				return false;
- 		}
-@@ -163,7 +164,7 @@
- 		side_filter s_filter(allied_with);
- 		const std::vector<int>& teams = s_filter.get_teams();
- 		if(teams.empty()) return false;
--		foreach(const int side, teams) {
-+		BOOST_FOREACH(const int side, teams) {
- 			if((*resources::teams)[side - 1].is_enemy(t.side()))
- 				return false;
- 		}
-Index: src/theme.cpp
-===================================================================
---- src/theme.cpp	(revision 54624)
-+++ src/theme.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "hotkeys.hpp"
- #include "log.hpp"
-@@ -26,6 +25,7 @@
- #include "theme.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_display("display");
- #define DBG_DP LOG_STREAM(debug, log_display)
-@@ -162,7 +162,7 @@
- {
- 	std::vector<config> res_cfgs_;
- 	// resolve all the partialresolutions
--	foreach (const config &part, top_cfg.child_range("partialresolution"))
-+	BOOST_FOREACH(const config &part, top_cfg.child_range("partialresolution"))
- 	{
- 		// follow the inheritance hierarchy and push all the nodes on the stack
- 		std::vector<const config*> parent_stack(1, &part);
-@@ -182,11 +182,11 @@
- 		while (!parent_stack.empty()) {
- 			//override attributes
- 			res_cfgs_.back().merge_attributes(*parent_stack.back());
--			foreach (const config &rm, parent_stack.back()->child_range("remove")) {
-+			BOOST_FOREACH(const config &rm, parent_stack.back()->child_range("remove")) {
- 				find_ref(rm["id"], res_cfgs_.back(), true);
- 			}
- 
--			foreach (const config &chg, parent_stack.back()->child_range("change"))
-+			BOOST_FOREACH(const config &chg, parent_stack.back()->child_range("change"))
- 			{
- 				config &target = find_ref(chg["id"], res_cfgs_.back());
- 				target.merge_attributes(chg);
-@@ -195,7 +195,7 @@
- 			// cannot add [status] sub-elements, but who cares
- 			if (const config &c = parent_stack.back()->child("add"))
- 			{
--				foreach (const config::any_child &j, c.all_children_range()) {
-+				BOOST_FOREACH(const config::any_child &j, c.all_children_range()) {
- 					res_cfgs_.back().add_child(j.key, j.cfg);
- 				}
- 			}
-@@ -204,7 +204,7 @@
- 		}
- 	}
- 	// Add all the resolutions
--	foreach (const config &res, top_cfg.child_range("resolution")) {
-+	BOOST_FOREACH(const config &res, top_cfg.child_range("resolution")) {
- 		dst_cfg.add_child("resolution", res);
- 	}
- 	// Add all the resolved resolutions
-@@ -217,7 +217,7 @@
- static void do_resolve_rects(const config& cfg, config& resolved_config, config* resol_cfg = NULL) {
- 
- 		// recursively resolve children
--		foreach (const config::any_child &value, cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, cfg.all_children_range()) {
- 			config &childcfg = resolved_config.add_child(value.key);
- 			do_resolve_rects(value.cfg, childcfg,
- 				value.key == "resolution" ? &childcfg : resol_cfg);
-@@ -549,7 +549,7 @@
- 
- 	int current_rating = 1000000;
- 	const config *current = NULL;
--	foreach (const config &i, cfg_.child_range("resolution"))
-+	BOOST_FOREACH(const config &i, cfg_.child_range("resolution"))
- 	{
- 		int width = i["width"];
- 		int height = i["height"];
-@@ -611,7 +611,7 @@
- 
- 	if (const config &status_cfg = cfg.child("status"))
- 	{
--		foreach (const config::any_child &i, status_cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &i, status_cfg.all_children_range()) {
- 			status_.insert(std::pair<std::string, status_item>(i.key, status_item(i.cfg)));
- 		}
- 		if (const config &unit_image_cfg = status_cfg.child("unit_image")) {
-@@ -621,19 +621,19 @@
- 		}
- 	}
- 
--	foreach (const config &p, cfg.child_range("panel")) {
-+	BOOST_FOREACH(const config &p, cfg.child_range("panel")) {
- 		panel new_panel(p);
- 		set_object_location(new_panel, p["rect"], p["ref"]);
- 		panels_.push_back(new_panel);
- 	}
- 
--	foreach (const config &lb, cfg.child_range("label")) {
-+	BOOST_FOREACH(const config &lb, cfg.child_range("label")) {
- 		label new_label(lb);
- 		set_object_location(new_label, lb["rect"], lb["ref"]);
- 		labels_.push_back(new_label);
- 	}
- 
--	foreach (const config &m, cfg.child_range("menu"))
-+	BOOST_FOREACH(const config &m, cfg.child_range("menu"))
- 	{
- 		menu new_menu(m);
- 		DBG_DP << "adding menu: " << (new_menu.is_context() ? "is context" : "not context") << "\n";
-@@ -699,7 +699,7 @@
- 	}
- 
- 	// Change existing theme objects.
--	foreach (const config &c, cfg.child_range("change"))
-+	BOOST_FOREACH(const config &c, cfg.child_range("change"))
- 	{
- 		std::string id = c["id"];
- 		std::string ref_id = c["ref"];
-@@ -709,12 +709,12 @@
- 	}
- 
- 	// Add new theme objects.
--	foreach (const config &c, cfg.child_range("add")) {
-+	BOOST_FOREACH(const config &c, cfg.child_range("add")) {
- 		add_object(c);
- 	}
- 
- 	// Remove existent theme objects.
--	foreach (const config &c, cfg.child_range("remove")) {
-+	BOOST_FOREACH(const config &c, cfg.child_range("remove")) {
- 		remove_object(c["id"]);
- 	}
- 
-@@ -758,7 +758,7 @@
- 	if (!cfg)
- 		return;
- 
--	foreach (const config &thm, cfg->child_range("theme"))
-+	BOOST_FOREACH(const config &thm, cfg->child_range("theme"))
- 	{
- 		std::string thm_name = thm["name"];
- 		if (!thm["hidden"].to_bool(false))
-@@ -778,7 +778,7 @@
- 
- const theme::menu *theme::get_menu_item(const std::string &key) const
- {
--	foreach (const theme::menu &m, menus_) {
-+	BOOST_FOREACH(const theme::menu &m, menus_) {
- 		if (m.get_id() == key) return &m;
- 	}
- 	return NULL;
-Index: src/addon/manager.cpp
-===================================================================
---- src/addon/manager.cpp	(revision 54624)
-+++ src/addon/manager.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- #include "addon/manager.hpp"
- #include "dialogs.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -41,6 +40,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CFG LOG_STREAM(err , log_config)
- #define LOG_CFG LOG_STREAM(info, log_config)
-@@ -321,11 +322,11 @@
- 
- 	make_directory(dir);
- 
--	foreach (const config &d, cfg.child_range("dir")) {
-+	BOOST_FOREACH(const config &d, cfg.child_range("dir")) {
- 		unarchive_dir(dir, d);
- 	}
- 
--	foreach (const config &f, cfg.child_range("file")) {
-+	BOOST_FOREACH(const config &f, cfg.child_range("file")) {
- 		unarchive_file(dir, f);
- 	}
- }
-@@ -701,7 +702,7 @@
- 		std::string missing = "";
- 		size_t count_missing = 0;
- 
--		foreach(const std::string& i, dependencies) {
-+		BOOST_FOREACH(const std::string& i, dependencies) {
- 			if (std::find(installed.begin(), installed.end(), i) == installed.end()) {
- 				missing += "\n" + i;
- 				++count_missing;
-@@ -717,7 +718,7 @@
- 			std::vector< std::string > unsafe_matches;
- 			std::ostringstream unsafe_list;
- 			std::map<std::string, version_info> remote_version_map;
--			foreach (const config &remote_addon, remote_addons_list)
-+			BOOST_FOREACH(const config &remote_addon, remote_addons_list)
- 			{
- 				const std::string& name = remote_addon["name"];
- 				if (std::find(dependencies.begin(), dependencies.end(), name) != dependencies.end()) {
-@@ -837,7 +838,7 @@
- 				if(!result) {
- 					assert(failed_titles.empty() == false);
- 					std::string failed_titles_list_fmt;
--					foreach(const std::string& entry, failed_titles) {
-+					BOOST_FOREACH(const std::string& entry, failed_titles) {
- 						failed_titles_list_fmt += '\n';
- 						failed_titles_list_fmt += entry;
- 					}
-@@ -870,7 +871,7 @@
- 		std::vector<version_info> safe_local_versions;
- 		std::vector<version_info> unsafe_local_versions;
- 		std::map<std::string, version_info> remote_version_map;
--		foreach (const config &remote_addon, remote_addons_list)
-+		BOOST_FOREACH(const config &remote_addon, remote_addons_list)
- 		{
- 			const std::string& name = remote_addon["name"];
- 			const std::string& version = remote_addon["version"];
-@@ -1065,7 +1066,7 @@
- 		if(!result) {
- 			assert(failed_titles.empty() == false);
- 			std::string failed_titles_list_fmt;
--			foreach(const std::string& entry, failed_titles) {
-+			BOOST_FOREACH(const std::string& entry, failed_titles) {
- 				failed_titles_list_fmt += '\n';
- 				failed_titles_list_fmt += entry;
- 			}
-@@ -1090,7 +1091,7 @@
- 		const std::string& addon,
- 		const std::vector<std::string>& own_addons)
- 	{
--		foreach(const std::string& current_own_addon, own_addons) {
-+		BOOST_FOREACH(const std::string& current_own_addon, own_addons) {
- 			if(current_own_addon == addon) {
- 				utils::string_map symbols;
- 				symbols["addon"] = addon;
-@@ -1171,7 +1172,7 @@
- 
- 			std::vector< addon_info > infos;
- 
--			foreach(const config &c, addon_cfgs)
-+			BOOST_FOREACH(const config &c, addon_cfgs)
- 			{
- 				const std::string& name = c["name"];
- 				const std::string& downloads = c["downloads"].str();
-@@ -1254,13 +1255,13 @@
- 				infos.push_back(inf);
- 			}
- 
--			foreach(const std::string& pub, publish_options) {
-+			BOOST_FOREACH(const std::string& pub, publish_options) {
- 				static const std::string publish_icon = "icons/icon-addon-publish.png";
- 				const std::string text = _("Publish add-on: ") + get_addon_name(pub);
- 				options.push_back(IMAGE_PREFIX + publish_icon + COLUMN_SEPARATOR + font::GOOD_TEXT + text);
- 				options_to_filter.push_back(text);
- 			}
--			foreach(const std::string& del, delete_options) {
-+			BOOST_FOREACH(const std::string& del, delete_options) {
- 				static const std::string delete_icon = "icons/icon-addon-delete.png";
- 				const std::string text = _("Delete add-on: ") + get_addon_name(del);
- 				options.push_back(IMAGE_PREFIX + delete_icon + COLUMN_SEPARATOR + font::BAD_TEXT + text);
-@@ -1408,7 +1409,7 @@
- 
- 			remove_names.clear();
- 
--			foreach(const std::string& id, remove_ids) {
-+			BOOST_FOREACH(const std::string& id, remove_ids) {
- 				remove_names.push_back(get_addon_name(id));
- 			}
- 
-@@ -1425,7 +1426,7 @@
- 
- 		std::vector<std::string> failed_names, skipped_names, succeeded_names;
- 
--		foreach(const std::string& id, remove_ids) {
-+		BOOST_FOREACH(const std::string& id, remove_ids) {
- 			const std::string& name = get_addon_name(id);
- 
- 			if(have_addon_pbl_info(id) || have_addon_in_vcs_tree(id)) {
-@@ -1531,12 +1532,12 @@
- 	}
- 	static const std::string parentd = get_addon_campaigns_dir();
- 	std::vector<std::string> addon_info_files;
--	foreach(std::string const& dir, addons)
-+	BOOST_FOREACH(std::string const& dir, addons)
- 		addon_info_files.push_back(parentd+"/"+dir+"/_info.cfg");
- 
- 	size_t i = 0;
- 
--	foreach(std::string const& info_file, addon_info_files) {
-+	BOOST_FOREACH(std::string const& info_file, addon_info_files) {
- 		assert(i < addons.size());
- 
- 		std::string const& addon = addons[i];
-Index: src/addon/validation.cpp
-===================================================================
---- src/addon/validation.cpp	(revision 54624)
-+++ src/addon/validation.cpp	(revision 54625)
-@@ -17,8 +17,9 @@
- #include "global.hpp"
- #include "addon/validation.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cstring>
- 
- const unsigned short default_campaignd_port = 15002;
-@@ -44,10 +45,10 @@
- 
- bool check_names_legal(const config& dir)
- {
--	foreach (const config &path, dir.child_range("file")) {
-+	BOOST_FOREACH(const config &path, dir.child_range("file")) {
- 		if (!addon_name_legal(path["name"])) return false;
- 	}
--	foreach (const config &path, dir.child_range("dir")) {
-+	BOOST_FOREACH(const config &path, dir.child_range("dir")) {
- 		if (!addon_name_legal(path["name"])) return false;
- 		if (!check_names_legal(path)) return false;
- 	}
-Index: src/mapgen.cpp
-===================================================================
---- src/mapgen.cpp	(revision 54624)
-+++ src/mapgen.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "language.hpp"
- #include "log.hpp"
-@@ -34,6 +33,7 @@
- #include "formula_string_utils.hpp"
- #include "SDL.h"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -777,7 +777,7 @@
- 
- 	std::vector<terrain_height_mapper> height_conversion;
- 
--	foreach (const config &h, cfg.child_range("height")) {
-+	BOOST_FOREACH(const config &h, cfg.child_range("height")) {
- 		height_conversion.push_back(terrain_height_mapper(h));
- 	}
- 
-@@ -912,7 +912,7 @@
- 	LOG_NG << (SDL_GetTicks() - ticks) << "\n"; ticks = SDL_GetTicks();
- 
- 	std::vector<terrain_converter> converters;
--	foreach (const config &cv, cfg.child_range("convert")) {
-+	BOOST_FOREACH(const config &cv, cfg.child_range("convert")) {
- 		converters.push_back(terrain_converter(cv));
- 	}
- 
-Index: src/cavegen.cpp
-===================================================================
---- src/cavegen.cpp	(revision 54624)
-+++ src/cavegen.cpp	(revision 54625)
-@@ -21,13 +21,14 @@
- #include "global.hpp"
- 
- #include "cavegen.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "pathfind/pathfind.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -147,7 +148,7 @@
- 
- void cave_map_generator::generate_chambers()
- {
--	foreach (const config &ch, cfg_.child_range("chamber"))
-+	BOOST_FOREACH(const config &ch, cfg_.child_range("chamber"))
- 	{
- 		// If there is only a chance of the chamber appearing, deal with that here.
- 		if (ch.has_attribute("chance") && (rand() % 100) < ch["chance"].to_int()) {
-@@ -195,7 +196,7 @@
- 
- 		chambers_.push_back(new_chamber);
- 
--		foreach (const config &p, ch.child_range("passage"))
-+		BOOST_FOREACH(const config &p, ch.child_range("passage"))
- 		{
- 			const std::string &dst = p["destination"];
- 
-@@ -220,7 +221,7 @@
- 	if (c.items == NULL || c.locs.empty()) return;
- 
- 	size_t index = 0;
--	foreach (const config::any_child &it, c.items->all_children_range())
-+	BOOST_FOREACH(const config::any_child &it, c.items->all_children_range())
- 	{
- 		config cfg = it.cfg;
- 		config &filter = cfg.child("filter");
-Index: src/ai/lua/core.cpp
-===================================================================
---- src/ai/lua/core.cpp	(revision 54624)
-+++ src/ai/lua/core.cpp	(revision 54625)
-@@ -34,7 +34,6 @@
- #include "../../actions.hpp"
- #include "../../attack_prediction.hpp"
- #include "../../filesystem.hpp"
--#include "../../foreach.hpp"
- #include "../../game_display.hpp"
- #include "../../gamestatus.hpp"
- #include "../../log.hpp"
-Index: src/ai/default/attack.cpp
-===================================================================
---- src/ai/default/attack.cpp	(revision 54624)
-+++ src/ai/default/attack.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../manager.hpp"
- 
- #include "../../attack_prediction.hpp"
--#include "foreach.hpp"
- #include "../../game_config.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
-Index: src/ai/default/contexts.cpp
-===================================================================
---- src/ai/default/contexts.cpp	(revision 54624)
-+++ src/ai/default/contexts.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "contexts.hpp"
- 
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-Index: src/ai/default/ai.cpp
-===================================================================
---- src/ai/default/ai.cpp	(revision 54624)
-+++ src/ai/default/ai.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "../../array.hpp"
- #include "../../dialogs.hpp"
--#include "../../foreach.hpp"
- #include "../../game_end_exceptions.hpp"
- #include "../../game_events.hpp"
- #include "../../game_preferences.hpp"
-@@ -41,6 +40,8 @@
- 
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- #include <algorithm>
- #include <fstream>
-@@ -144,7 +145,7 @@
- 
- void ai_default_recruitment_stage::on_create() {
- 	stage::on_create();
--	foreach (const config &c, cfg_.child_range("limit")) {
-+	BOOST_FOREACH(const config &c, cfg_.child_range("limit")) {
- 		if (c.has_attribute("type") && c.has_attribute("max") ) {
- 			maximum_counts_.insert(std::make_pair(c["type"],lexical_cast_default<int>(c["max"],0)));
- 		}
-@@ -193,7 +194,7 @@
- 	bool found = false;
- 	// Find an available unit that can be recruited,
- 	// matches the desired usage type, and comes in under budget.
--	foreach (const std::string &name, current_team().recruits())
-+	BOOST_FOREACH(const std::string &name, current_team().recruits())
- 	{
- 		const unit_type *ut = unit_types.find(name);
- 		if (!ut) continue;
-@@ -435,7 +436,7 @@
- 
- 			team &enemy_team = (*resources::teams)[j->side() - 1];
- 			const std::set<std::string> &recruits = enemy_team.recruits();
--			foreach (const std::string &rec, recruits) {
-+			BOOST_FOREACH(const std::string &rec, recruits) {
- 				get_combat_score_vs(ut,rec,score,weighting,0,0);
- 			}
- 			continue;
-@@ -677,7 +678,7 @@
- 		        double best_combat_score_of_advancement = 0;
- 			bool best_combat_score_of_advancement_found = false;
- 			int best_cost = recall_cost;
--			foreach (const std::string &i, u.advances_to()) {
-+			BOOST_FOREACH(const std::string &i, u.advances_to()) {
- 				const unit_type *ut = unit_types.find(i);
- 				if (!ut) {
- 					continue;
-Index: src/ai/configuration.cpp
-===================================================================
---- src/ai/configuration.cpp	(revision 54624)
-+++ src/ai/configuration.cpp	(revision 54625)
-@@ -22,12 +22,13 @@
- #include "configuration.hpp"
- 
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- #include "../serialization/parser.hpp"
- #include "../serialization/preprocessor.hpp"
- #include "../team.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <vector>
- 
- namespace ai {
-@@ -93,7 +94,7 @@
- 	}
- 
- 
--	foreach (const config &ai_configuration, ais.child_range("ai")) {
-+	BOOST_FOREACH(const config &ai_configuration, ais.child_range("ai")) {
- 		const std::string &id = ai_configuration["id"];
- 		if (id.empty()){
- 
-@@ -118,7 +119,7 @@
- void configuration::add_era_ai_from_config(const config &era)
- {
- 	era_ai_configurations_.clear();
--	foreach (const config &ai_configuration, era.child_range("ai")) {
-+	BOOST_FOREACH(const config &ai_configuration, era.child_range("ai")) {
- 		const std::string &id = ai_configuration["id"];
- 		if (id.empty()){
- 
-@@ -196,7 +197,7 @@
- 	config aspect_config;
- 	aspect_config["id"] = id;
- 
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		const config &_aspect = aiparam.find_child("aspect","id",id);
- 		if (_aspect) {
- 			aspect_config.append(_aspect);
-@@ -216,7 +217,7 @@
- 		if (aspect_was_attribute) {
- 			facet_config["value"] = aiparam[id];
- 		} else {
--			foreach (const config &value, aiparam.child_range(id)) {
-+			BOOST_FOREACH(const config &value, aiparam.child_range(id)) {
- 				facet_config.add_child("value",value);
- 			}
- 		}
-@@ -242,7 +243,7 @@
- 
- 	//leave only the [ai] children
- 	cfg = config();
--	foreach (const config &aiparam, original_cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, original_cfg.child_range("ai")) {
- 		cfg.add_child("ai",aiparam);
- 	}
- 
-@@ -264,7 +265,7 @@
- 
- 	//find version
- 	int version = 10600;
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		if (const config::attribute_value *a = aiparam.get("version")){
- 			int v = a->to_int(version);
- 			if (version<v) {
-@@ -290,7 +291,7 @@
- 	config parsed_cfg = config();
- 
- 	LOG_AI_CONFIGURATION << "side "<< side <<": merging AI configurations"<< std::endl;
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		parsed_cfg.append(aiparam);
- 	}
- 
-@@ -302,7 +303,7 @@
- 	parsed_cfg.merge_children_by_attribute("aspect","id");
- 
- 	LOG_AI_CONFIGURATION << "side "<< side <<": removing duplicate [default] tags from aspects"<< std::endl;
--	foreach (config &aspect_cfg, parsed_cfg.child_range("aspect")) {
-+	BOOST_FOREACH(config &aspect_cfg, parsed_cfg.child_range("aspect")) {
- 		if (!aspect_cfg.child("default")) {
- 			WRN_AI_CONFIGURATION << "side "<< side <<": aspect with id=["<<aspect_cfg["id"]<<"] lacks default config facet!" <<std::endl;
- 			continue;
-@@ -341,7 +342,7 @@
- 	if (cfg["ai_algorithm"]=="idle_ai") {
- 		is_idle_ai = true;
- 	} else {
--		foreach (config &aiparam, cfg.child_range("ai")) {
-+		BOOST_FOREACH(config &aiparam, cfg.child_range("ai")) {
- 			if (aiparam["ai_algorithm"]=="idle_ai") {
- 				is_idle_ai = true;
- 				break;
-@@ -360,8 +361,8 @@
- 
- 	config fallback_stage_cfg_ai;
- 
--	foreach (config &aiparam, cfg.child_range("ai")) {
--		foreach (const well_known_aspect &wka, well_known_aspects) {
-+	BOOST_FOREACH(config &aiparam, cfg.child_range("ai")) {
-+		BOOST_FOREACH(const well_known_aspect &wka, well_known_aspects) {
- 			if (wka.was_an_attribute_) {
- 				aiparam.remove_attribute(wka.name_);
- 			} else {
-@@ -370,7 +371,7 @@
- 		}
- 
- 
--		foreach (const config &aitarget, aiparam.child_range("target")) {
-+		BOOST_FOREACH(const config &aitarget, aiparam.child_range("target")) {
- 			config aigoal;
- 			transfer_turns_and_time_of_day_data(aiparam,aigoal);
- 
-@@ -388,14 +389,14 @@
- 		aiparam.clear_children("target");
- 
- 
--		foreach (config &ai_protect_unit, aiparam.child_range("protect_unit")) {
-+		BOOST_FOREACH(config &ai_protect_unit, aiparam.child_range("protect_unit")) {
- 			transfer_turns_and_time_of_day_data(aiparam,ai_protect_unit);
- 			upgrade_protect_goal_config_from_1_07_02_to_1_07_03(side,ai_protect_unit,parsed_cfg,true);
- 		}
- 		aiparam.clear_children("protect_unit");
- 
- 
--		foreach (config &ai_protect_location, aiparam.child_range("protect_location")) {
-+		BOOST_FOREACH(config &ai_protect_location, aiparam.child_range("protect_location")) {
- 			transfer_turns_and_time_of_day_data(aiparam,ai_protect_location);
- 			upgrade_protect_goal_config_from_1_07_02_to_1_07_03(side,ai_protect_location,parsed_cfg,false);
- 		}
-@@ -423,19 +424,19 @@
- 	fallback_stage_cfg_ai.clear_children("aspect");
- 
- 	//move [stage]s to root of the config
--	foreach (const config &aistage, fallback_stage_cfg_ai.child_range("stage")) {
-+	BOOST_FOREACH(const config &aistage, fallback_stage_cfg_ai.child_range("stage")) {
- 		parsed_cfg.add_child("stage",aistage);
- 	}
- 	fallback_stage_cfg_ai.clear_children("stage");
- 
- 	//move [goal]s to root of the config
--	foreach (const config &aigoal, fallback_stage_cfg_ai.child_range("goal")) {
-+	BOOST_FOREACH(const config &aigoal, fallback_stage_cfg_ai.child_range("goal")) {
- 		parsed_cfg.add_child("goal",aigoal);
- 	}
- 	fallback_stage_cfg_ai.clear_children("goal");
- 
- 	//move [modify_ai]'s to root of the config
--	foreach (const config &aimodifyai, fallback_stage_cfg_ai.child_range("modify_ai")) {
-+	BOOST_FOREACH(const config &aimodifyai, fallback_stage_cfg_ai.child_range("modify_ai")) {
- 		parsed_cfg.add_child("modify_ai",aimodifyai);
- 	}
- 	fallback_stage_cfg_ai.clear_children("modify_ai");
-@@ -452,12 +453,12 @@
- {
- 	config cfg;
- 
--	foreach (const config &aiparam, ai_parameters) {
-+	BOOST_FOREACH(const config &aiparam, ai_parameters) {
- 		cfg.add_child("ai",aiparam);
- 	}
- 
- 	DBG_AI_CONFIGURATION << "side "<< side <<": upgrading aspects from syntax of 1.7.2 to 1.7.3, old-style config is:" << std::endl << cfg << std::endl;
--	foreach (const well_known_aspect &wka, well_known_aspects) {
-+	BOOST_FOREACH(const well_known_aspect &wka, well_known_aspects) {
- 		upgrade_aspect_config_from_1_07_02_to_1_07_03(side, cfg,parsed_cfg,wka.name_,wka.was_an_attribute_);
- 	}
- }
-Index: src/ai/contexts.cpp
-===================================================================
---- src/ai/contexts.cpp	(revision 54624)
-+++ src/ai/contexts.cpp	(revision 54625)
-@@ -47,6 +47,8 @@
- #include "../tod_manager.hpp"
- #include "../unit_display.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_ai("ai/general");
- #define DBG_AI LOG_STREAM(debug, log_ai)
- #define LOG_AI LOG_STREAM(info, log_ai)
-@@ -223,19 +225,19 @@
- 
- void readonly_context_impl::on_readonly_context_create() {
- 	//init the composite ai engines
--	foreach(const config &cfg_element, cfg_.child_range("engine")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("engine")){
- 		engine::parse_engine_from_config(*this,cfg_element,std::back_inserter(engines_));
- 	}
- 
- 	// init the composite ai aspects
--	foreach(const config &cfg_element, cfg_.child_range("aspect")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("aspect")){
- 		std::vector<aspect_ptr> aspects;
- 		engine::parse_aspect_from_config(*this,cfg_element,cfg_element["id"],std::back_inserter(aspects));
- 		add_aspects(aspects);
- 	}
- 
- 	// init the composite ai goals
--	foreach(const config &cfg_element, cfg_.child_range("goal")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("goal")){
- 		engine::parse_goal_from_config(*this,cfg_element,std::back_inserter(get_goals()));
- 	}
- }
-@@ -255,13 +257,13 @@
- config readonly_context_impl::to_readonly_context_config() const
- {
- 	config cfg;
--	foreach(const engine_ptr e, engines_) {
-+	BOOST_FOREACH(const engine_ptr e, engines_) {
- 		cfg.add_child("engine",e->to_config());
- 	}
--	foreach(const aspect_map::value_type a, aspects_) {
-+	BOOST_FOREACH(const aspect_map::value_type a, aspects_) {
- 		cfg.add_child("aspect",a.second->to_config());
- 	}
--	foreach(const goal_ptr g, goals_) {
-+	BOOST_FOREACH(const goal_ptr g, goals_) {
- 		cfg.add_child("goal",g->to_config());
- 	}
- 	return cfg;
-@@ -366,7 +368,7 @@
- 	}
- 
- 	for(std::map<map_location,pathfind::paths>::iterator m = res.begin(); m != res.end(); ++m) {
--		foreach (const pathfind::paths::step &dest, m->second.destinations)
-+		BOOST_FOREACH(const pathfind::paths::step &dest, m->second.destinations)
- 		{
- 			const map_location& src = m->first;
- 			const map_location& dst = dest.curr;
-@@ -406,7 +408,7 @@
- 
- void readonly_context_impl::add_aspects(std::vector< aspect_ptr > &aspects )
- {
--	foreach (aspect_ptr a, aspects) {
-+	BOOST_FOREACH(aspect_ptr a, aspects) {
- 		const std::string id = a->get_id();
- 		known_aspect_map::iterator i = known_aspects_.find(id);
- 		if (i != known_aspects_.end()) {
-@@ -1024,7 +1026,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-@@ -1112,7 +1114,7 @@
- 	map_location const* best_occupied_keep = &map_location::null_location;
- 	double move_left_at_best_occupied_keep = 0.0;
- 
--	foreach (const pathfind::paths::step &dest, leader_paths.destinations)
-+	BOOST_FOREACH(const pathfind::paths::step &dest, leader_paths.destinations)
- 	{
- 		const map_location &loc = dest.curr;
- 		if (keeps().find(loc)!=keeps().end()){
-Index: src/ai/manager.cpp
-===================================================================
---- src/ai/manager.cpp	(revision 54624)
-+++ src/ai/manager.cpp	(revision 54625)
-@@ -27,13 +27,14 @@
- #include "registry.hpp"
- #include "../game_events.hpp"
- #include "../game_preferences.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- #include "../replay.hpp"
- #include "../serialization/string_utils.hpp"
- #include "../statistics.hpp"
- #include "composite/component.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- #include <stack>
- #include <vector>
-@@ -89,7 +90,7 @@
- 
- 	if (this->ai_) {
- 		ai_->on_create();
--		foreach (config &mod_ai, cfg_.child_range("modify_ai")) {
-+		BOOST_FOREACH(config &mod_ai, cfg_.child_range("modify_ai")) {
- 			if (!mod_ai.has_attribute("side")) {
- 				mod_ai["side"] = side;
- 			}
-@@ -149,8 +150,8 @@
- 		cfg_.merge_children_by_attribute("aspect","id");
- 	} else {
- 		// else run 'add_facet' command on each [aspect][facet]
--		foreach (const config &cfg_a, cfg.child_range("aspect")) {
--			foreach (const config &cfg_f, cfg_a.child_range("facet")) {
-+		BOOST_FOREACH(const config &cfg_a, cfg.child_range("aspect")) {
-+			BOOST_FOREACH(const config &cfg_f, cfg_a.child_range("facet")) {
- 				readonly_context_->add_facet(cfg_a["id"],cfg_f);
- 			}
- 		}
-Index: src/ai/composite/component.cpp
-===================================================================
---- src/ai/composite/component.cpp	(revision 54624)
-+++ src/ai/composite/component.cpp	(revision 54625)
-@@ -23,12 +23,12 @@
- #include "property_handler.hpp"
- #include "../../config.hpp"
- #include "../../log.hpp"
--#include "../../foreach.hpp"
- 
- #include "../formula/ai.hpp"
- 
- #include <boost/lexical_cast.hpp>
- #include <boost/regex.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace pathfind {
- 
-@@ -125,7 +125,7 @@
- std::vector<std::string> component::get_children_types()
- {
- 	std::vector<std::string> types;
--	foreach (property_handler_map::value_type &ph, property_handlers_) {
-+	BOOST_FOREACH(property_handler_map::value_type &ph, property_handlers_) {
- 		types.push_back(ph.first);
- 	}
- 	return types;
-@@ -241,9 +241,9 @@
- 
- 	s << offset_str << type<<"["<<root->get_id() <<"] "<<root->get_engine()<<" "<<root->get_name()<< std::endl;
- 
--	foreach (std::string t, t_list) {
-+	BOOST_FOREACH(std::string t, t_list) {
- 		std::vector<component*> c_list = root->get_children(t);
--		foreach (component *c, c_list) {
-+		BOOST_FOREACH(component *c, c_list) {
- 			print_component(c,t,s,offset+1);
- 		}
- 	}
-Index: src/ai/composite/stage.cpp
-===================================================================
---- src/ai/composite/stage.cpp	(revision 54624)
-+++ src/ai/composite/stage.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "engine.hpp"
- #include "stage.hpp"
- #include "../contexts.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
- #include "../../tod_manager.hpp"
-Index: src/ai/composite/engine.cpp
-===================================================================
---- src/ai/composite/engine.cpp	(revision 54624)
-+++ src/ai/composite/engine.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "engine.hpp"
- #include "contexts.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/engine_default.cpp
-===================================================================
---- src/ai/composite/engine_default.cpp	(revision 54624)
-+++ src/ai/composite/engine_default.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "engine_default.hpp"
- #include "rca.hpp"
- #include "stage.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/goal.cpp
-===================================================================
---- src/ai/composite/goal.cpp	(revision 54624)
-+++ src/ai/composite/goal.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "../../log.hpp"
- #include "../lua/lua_object.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../resources.hpp"
- #include "../../scripting/lua.hpp"
- #include "../../terrain_filter.hpp"
-@@ -34,6 +33,7 @@
- #include "../../variable.hpp"
- 
- #include <boost/lexical_cast.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -128,7 +128,7 @@
- 	if (!criteria) return;
- 
- 	//find the enemy leaders and explicit targets
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.matches_filter(vconfig(criteria), u.get_location())) {
- 			LOG_AI_GOAL << "found explicit target unit at ... " << u.get_location() << " with value: " << value() << "\n";
- 			*target_list = target(u.get_location(), value(), target::EXPLICIT);
-@@ -173,7 +173,7 @@
- 
- 	std::set<map_location> items;
- 	filter_ptr_->get_locations(items);
--	foreach (const map_location &loc, items)
-+	BOOST_FOREACH(const map_location &loc, items)
- 	{
- 		LOG_AI_GOAL << "found explicit target location ... " << loc << " with value: " << value() << std::endl;
- 		*target_list = target(loc, value(), target::EXPLICIT);
-@@ -252,7 +252,7 @@
- 
- 	std::set<map_location> items;
- 	if (protect_unit_) {
--		foreach (const unit &u, units)
-+		BOOST_FOREACH(const unit &u, units)
- 		{
- 			if (protect_only_own_unit_ && u.side() != get_side()) {
- 				continue;
-@@ -268,9 +268,9 @@
- 	}
- 	DBG_AI_GOAL << "side " << get_side() << ": seaching for threats in "+goal_type+" goal" << std::endl;
- 	// Look for directions to protect a specific location or specific unit.
--	foreach (const map_location &loc, items)
-+	BOOST_FOREACH(const map_location &loc, items)
- 	{
--		foreach (const unit &u, units)
-+		BOOST_FOREACH(const unit &u, units)
- 		{
- 			int distance = distance_between(u.get_location(), loc);
- 			if (current_team().is_enemy(u.side()) && distance < radius_ &&
-@@ -325,7 +325,7 @@
- 	handler_->handle(c, true, l_obj);
- 	std::vector < target > targets = *(l_obj->get());
- 
-- 	foreach (target tg, targets)
-+ 	BOOST_FOREACH(target tg, targets)
-  	{
-  		*target_list = tg;
-  	}
-Index: src/ai/composite/engine_fai.cpp
-===================================================================
---- src/ai/composite/engine_fai.cpp	(revision 54624)
-+++ src/ai/composite/engine_fai.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../formula/candidates.hpp"
- #include "../formula/stage_side_formulas.hpp"
- #include "../formula/stage_unit_formulas.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/aspect.hpp
-===================================================================
---- src/ai/composite/aspect.hpp	(revision 54624)
-+++ src/ai/composite/aspect.hpp	(revision 54625)
-@@ -265,7 +265,7 @@
- 		, facets_()
- 		, default_()
- 	{
--		foreach (const config &cfg_element, this->cfg_.child_range("facet") ){
-+		BOOST_FOREACH(const config &cfg_element, this->cfg_.child_range("facet") ){
- 			add_facet(-1,cfg_element);
- 		}
- 
-@@ -291,7 +291,7 @@
-         {
- 		std::vector<aspect_ptr> facets_base;
- 		engine::parse_aspect_from_config(*this,cfg,this->get_id(),std::back_inserter(facets_base));
--		foreach (aspect_ptr a, facets_base ){
-+		BOOST_FOREACH(aspect_ptr a, facets_base ){
- 			typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a);
- 			facets.push_back(b);
- 		}
-@@ -301,7 +301,7 @@
- 	virtual void recalculate() const
- 	{
- 		///@todo 1.9 optimize in case of an aspect which returns variant
--		foreach (const typename aspect_type<T>::typesafe_ptr &f, make_pair(facets_.rbegin(),facets_.rend())) {
-+		BOOST_FOREACH(const typename aspect_type<T>::typesafe_ptr &f, make_pair(facets_.rbegin(),facets_.rend())) {
- 			if (f->active()) {
- 				this->value_ = boost::shared_ptr<T>(f->get_ptr());
- 				this->valid_ = true;
-@@ -316,7 +316,7 @@
- 	virtual config to_config() const
- 	{
- 		config cfg = aspect::to_config();
--		foreach (const typename aspect_type<T>::typesafe_ptr f, facets_) {
-+		BOOST_FOREACH(const typename aspect_type<T>::typesafe_ptr f, facets_) {
- 			cfg.add_child("facet",f->to_config());
- 		}
- 		if (default_) {
-@@ -334,7 +334,7 @@
- 		std::vector< aspect_ptr > facets;
- 		engine::parse_aspect_from_config(*this,cfg,this->get_id(),std::back_inserter(facets));
- 		int j=0;
--		foreach (aspect_ptr a, facets ){
-+		BOOST_FOREACH(aspect_ptr a, facets ){
- 			typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a);
- 			facets_.insert(facets_.begin()+pos+j,b);
- 			j++;
-Index: src/ai/composite/property_handler.hpp
-===================================================================
---- src/ai/composite/property_handler.hpp	(revision 54624)
-+++ src/ai/composite/property_handler.hpp	(revision 54625)
-@@ -23,9 +23,9 @@
- #define AI_COMPOSITE_PROPERTY_HANDLER_HPP_INCLUDED
- 
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "ai/composite/component.hpp"
- 
- namespace ai{
-@@ -134,7 +134,7 @@
- 	std::vector<component*> handle_get_children()
- 	{
- 		std::vector<component*> children;
--		foreach (t_ptr v, values_) {
-+		BOOST_FOREACH(t_ptr v, values_) {
- 			children.push_back(&*v);
- 		}
- 		return children;
-@@ -149,7 +149,7 @@
- 		t_ptr_vector values;
- 		factory_(values,cfg);
- 		int j=0;
--		foreach (t_ptr b, values ){
-+		BOOST_FOREACH(t_ptr b, values ){
- 			values_.insert(values_.begin()+pos+j,b);
- 			j++;
- 		}
-@@ -200,7 +200,7 @@
- 		//* is a special case - 'delete all facets'
- 		if (child.id == "*") {
- 			bool b = false;
--				foreach(typename aspect_map::value_type a, aspects_) {
-+				BOOST_FOREACH(typename aspect_map::value_type a, aspects_) {
- 				       	b |= a.second->delete_all_facets();
- 				}
- 			return b;
-@@ -212,7 +212,7 @@
- 	std::vector<component*> handle_get_children()
- 	{
- 		std::vector<component*> children;
--		foreach(typename aspect_map::value_type a, aspects_) {
-+		BOOST_FOREACH(typename aspect_map::value_type a, aspects_) {
- 			children.push_back(&*a.second);
- 		}
- 		return children;
-Index: src/ai/composite/ai.cpp
-===================================================================
---- src/ai/composite/ai.cpp	(revision 54624)
-+++ src/ai/composite/ai.cpp	(revision 54625)
-@@ -27,11 +27,11 @@
- #include "stage.hpp"
- #include "../manager.hpp"
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- #include <boost/bind.hpp>
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -60,7 +60,7 @@
- 		cfg_["id"]<<"]"<<std::endl;
- 
- 	// init the composite ai stages
--	foreach(const config &cfg_element, cfg_.child_range("stage")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("stage")){
- 		add_stage(cfg_element);
- 	}
- 
-@@ -115,7 +115,7 @@
- 	std::vector< stage_ptr > stages;
- 	create_stage(stages,cfg);
- 	int j=0;
--	foreach (stage_ptr b, stages ){
-+	BOOST_FOREACH(stage_ptr b, stages ){
- 		stages_.push_back(b);
- 		j++;
- 	}
-@@ -128,7 +128,7 @@
- 	std::vector< goal_ptr > goals;
- 	create_goal(goals,cfg);
- 	int j=0;
--	foreach (goal_ptr b, goals ){
-+	BOOST_FOREACH(goal_ptr b, goals ){
- 		get_goals().push_back(b);
- 		j++;
- 	}
-@@ -137,7 +137,7 @@
- 
- 
- void ai_composite::play_turn(){
--	foreach(stage_ptr &s, stages_){
-+	BOOST_FOREACH(stage_ptr &s, stages_){
- 		s->play_stage();
- 	}
- }
-@@ -206,7 +206,7 @@
- 	config cfg;
- 
- 	//serialize the composite ai stages
--	foreach(const stage_ptr &s, stages_){
-+	BOOST_FOREACH(const stage_ptr &s, stages_){
- 		cfg.add_child("stage",s->to_config());
- 	}
- 
-Index: src/ai/formula/candidates.cpp
-===================================================================
---- src/ai/formula/candidates.cpp	(revision 54624)
-+++ src/ai/formula/candidates.cpp	(revision 54625)
-@@ -19,10 +19,11 @@
- 
- #include "ai.hpp"
- #include "candidates.hpp"
--#include "foreach.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define ERR_AI LOG_STREAM(err, log_formula_ai)
- 
-@@ -32,7 +33,7 @@
- void candidate_action_manager::load_config(const config& cfg, ai::formula_ai* ai, function_symbol_table* function_table)
- {
- 	// register candidate actions
--	foreach (const config &rc_action, cfg.child_range("register_candidate_action"))
-+	BOOST_FOREACH(const config &rc_action, cfg.child_range("register_candidate_action"))
- 	{
- 		candidate_action_ptr new_ca = load_candidate_action_from_config(rc_action,ai,function_table);
- 
-@@ -67,7 +68,7 @@
- {
- 	evaluated_candidate_actions_.clear();
- 
--	foreach(candidate_action_ptr cm, candidate_actions_)
-+	BOOST_FOREACH(candidate_action_ptr cm, candidate_actions_)
- 	{
- 		cm->evaluate(ai, units);
- 		evaluated_candidate_actions_.insert(cm);
-@@ -116,7 +117,7 @@
- 	const config & filter_params = cfg.child("filter");
- 
- 	if( filter_params ) {
--		foreach( const config::attribute filter_param, filter_params.attribute_range() )
-+		BOOST_FOREACH( const config::attribute filter_param, filter_params.attribute_range() )
- 		{
- 			game_logic::const_formula_ptr filter_formula(
- 					new game_logic::formula(filter_param.second, function_table));
-Index: src/ai/formula/stage_side_formulas.cpp
-===================================================================
---- src/ai/formula/stage_side_formulas.cpp	(revision 54624)
-+++ src/ai/formula/stage_side_formulas.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "stage_side_formulas.hpp"
- #include "ai.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../formula.hpp"
- #include "../../formula_function.hpp"
- #include "../../log.hpp"
-Index: src/ai/formula/ai.cpp
-===================================================================
---- src/ai/formula/ai.cpp	(revision 54624)
-+++ src/ai/formula/ai.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- 
- #include "../../callable_objects.hpp"
- #include "../../game_display.hpp"
--#include "../../foreach.hpp"
- #include "../../formula_debugger.hpp"
- #include "../../log.hpp"
- #include "../../menu_events.hpp"
-@@ -42,6 +41,8 @@
- #include "../../tod_manager.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define DBG_AI LOG_STREAM(debug, log_formula_ai)
- #define LOG_AI LOG_STREAM(info, log_formula_ai)
-@@ -548,7 +549,7 @@
- variant villages_from_set(const Container& villages,
- 				          const std::set<map_location>* exclude=NULL) {
- 	std::vector<variant> vars;
--	foreach(const map_location& loc, villages) {
-+	BOOST_FOREACH(const map_location& loc, villages) {
- 		if(exclude && exclude->count(loc)) {
- 			continue;
- 		}
-@@ -617,7 +618,7 @@
- 	{
- 		const std::vector<std::string> &rp = get_recruitment_pattern();
- 		std::vector<variant> vars;
--		foreach (const std::string &i, rp) {
-+		BOOST_FOREACH(const std::string &i, rp) {
- 			vars.push_back(variant(i));
- 		}
- 		return variant(&vars);
-@@ -751,7 +752,7 @@
- 			std::vector<variant> v;
- 			tmp.push_back( v );
- 		}
--		foreach (const unit &u, units) {
-+		BOOST_FOREACH(const unit &u, units) {
- 			tmp[u.side() - 1].push_back(variant(new unit_callable(u)));
- 		}
- 		for( size_t i = 0; i<tmp.size(); ++i)
-@@ -924,7 +925,7 @@
- 	//make sure we don't run out of refcount
- 	vars_.add_ref();
- 
--	foreach (const config &func, cfg_.child_range("function"))
-+	BOOST_FOREACH(const config &func, cfg_.child_range("function"))
- 	{
- 		const t_string &name = func["name"];
- 		const t_string &inputs = func["inputs"];
-@@ -947,7 +948,7 @@
- 	if (const config &ai_vars = cfg_.child("vars"))
- 	{
- 		variant var;
--		foreach (const config::attribute &i, ai_vars.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, ai_vars.attribute_range()) {
- 			var.serialize_from_string(i.second);
- 			vars_.add(i.first, var);
- 		}
-Index: src/ai/formula/function_table.cpp
-===================================================================
---- src/ai/formula/function_table.cpp	(revision 54624)
-+++ src/ai/formula/function_table.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "../../attack_prediction.hpp"
- #include "../../filesystem.hpp"
--#include "../../foreach.hpp"
- #include "../../game_display.hpp"
- #include "../../log.hpp"
- #include "../../map_label.hpp"
-@@ -36,6 +35,7 @@
- #include "../../unit.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define LOG_AI LOG_STREAM(info, log_formula_ai)
-@@ -355,7 +355,7 @@
- 				if( scores[current_side][i] > 98 )
- 					continue;
- 
--				foreach( int side , enemies) {
-+				BOOST_FOREACH( int side , enemies) {
- 					int diff = scores[current_side][i] - scores[side][i];
- 					if ( diff > enemy_tollerancy) {
- 						valid = false;
-@@ -365,7 +365,7 @@
- 				}
- 
- 				if( valid ) {
--					foreach( int side , allies) {
-+					BOOST_FOREACH( int side , allies) {
- 						if ( scores[current_side][i] - scores[side][i] > ally_tollerancy ) {
- 							valid = false;
- 							break;
-@@ -563,7 +563,7 @@
-                     visited_locs.erase(starting_loc);
- 
-                 std::vector<variant> res;
--                foreach( const map_location& ml, visited_locs) {
-+                BOOST_FOREACH( const map_location& ml, visited_locs) {
-                     res.push_back( variant(new location_callable( ml ) ) );
-                 }
- 
-@@ -841,7 +841,7 @@
- 		ai::attack_analysis* analysis = convert_variant<ai::attack_analysis>(attack);
- 		//unit_map units_with_moves(*resources::units);
- 		//typedef std::pair<map_location, map_location> mv;
--		//foreach (const mv &m, analysis->movements) {
-+		//BOOST_FOREACH(const mv &m, analysis->movements) {
- 		//	units_with_moves.move(m.first, m.second);
- 		//}
- 
-@@ -1629,7 +1629,7 @@
- 
- 		std::vector<attack_type> attacks = attacker.attacks();
- 
--		foreach(const attack_type &attack, attacks) {
-+		BOOST_FOREACH(const attack_type &attack, attacks) {
- 			const int dmg = round_damage(attack.damage(), defender.damage_from(attack), 100) * attack.num_attacks();
- 			if (attack.range() == "melee") {
- 				highest_melee_damage = std::max(highest_melee_damage, dmg);
-Index: src/ai/testing/ca_testing_move_to_targets.cpp
-===================================================================
---- src/ai/testing/ca_testing_move_to_targets.cpp	(revision 54624)
-+++ src/ai/testing/ca_testing_move_to_targets.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "../composite/ai.hpp"
- #include "../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-Index: src/ai/testing/ca_testing_recruitment.cpp
-===================================================================
---- src/ai/testing/ca_testing_recruitment.cpp	(revision 54624)
-+++ src/ai/testing/ca_testing_recruitment.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../composite/rca.hpp"
- #include "../composite/stage.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-@@ -33,6 +32,7 @@
- #include "../../wml_exception.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <numeric>
- #include <string>
-@@ -206,7 +206,7 @@
-       int get_current_qty(const std::string &name) const
-       {
-          int counter = 0;
--         foreach(unit &un, *resources::units){
-+         BOOST_FOREACH(unit &un, *resources::units){
-             if(un.side() == side() && un.type_id() == name) // @todo: is type_id good?
-             {
-                counter++;
-@@ -345,7 +345,7 @@
-    const int hitpoints_const = 100;
-    double score = 0;
-    double total_weight = 0;
--   foreach(const unit &enemy_unit, *resources::units)
-+   BOOST_FOREACH(const unit &enemy_unit, *resources::units)
-    {
-       if(enemy_unit.can_recruit() || !t.is_enemy(enemy_unit.side()))
-       {
-@@ -358,13 +358,13 @@
- 
-       score += compare_unit_types(info, *enemy_info) * weight;
-    }
--   foreach(fake_team &enemy_team, fake_teams)
-+   BOOST_FOREACH(fake_team &enemy_team, fake_teams)
-    {
-       if(!t.is_enemy(enemy_team.side()))
-       {
-          continue;
-       }
--      foreach(const potential_recruit &enemy_unit,  enemy_team.extra_units())
-+      BOOST_FOREACH(const potential_recruit &enemy_unit,  enemy_team.extra_units())
-       {
-          const unit_type *enemy_info = enemy_unit.type();
-          VALIDATE(enemy_info, "Unknown unit type : " + enemy_unit.id() + " while updating recruit quality.");
-@@ -386,7 +386,7 @@
- 
- /*static void update_recruit_qualities(fake_team &t, std::vector<fake_team> &fake_teams)
- {
--   foreach ( potential_recruit &recruit, t.recruit_list() )
-+   BOOST_FOREACH( potential_recruit &recruit, t.recruit_list() )
-    {
-       double score = get_unit_quality(*recruit.type(),t,fake_teams);
-       recruit.set_quality(score);
-@@ -425,11 +425,11 @@
- 	}
- 
-    std::map<std::string, int> current_units;
--   foreach (const potential_recruit &i, t.extra_units())
-+   BOOST_FOREACH(const potential_recruit &i, t.extra_units())
-    {
-       current_units[(i.id())]++;
-    }
--   foreach (const unit &i, *resources::units)
-+   BOOST_FOREACH(const unit &i, *resources::units)
-    {
- 	if (i.side()==t.side())
- 	{
-@@ -440,7 +440,7 @@
-    double max_quality = recruit_list[0].quality();
-    int max_cost = recruit_list[0].cost();
-    std::vector<const potential_recruit*> sorted = std::vector<const potential_recruit*>();
--   foreach(const potential_recruit &i, recruit_list)
-+   BOOST_FOREACH(const potential_recruit &i, recruit_list)
-    {
-       if(i.cost() > max_cost)
-       {
-@@ -457,7 +457,7 @@
-    potential_recruit_sorter sorter(max_cost, max_quality, quality_factor);
-    std::sort(sorted.begin(), sorted.end(), sorter);
-    int recruited = 0;
--   foreach(const potential_recruit *i, sorted)
-+   BOOST_FOREACH(const potential_recruit *i, sorted)
-    {
-       if(recruited < max_units_to_recruit)
-       {
-@@ -488,7 +488,7 @@
- static void ai_choose_recruits(fake_team &t, int max_units_to_recruit, double quality_factor, bool counter_recruit)
- {
- 	std::vector<potential_recruit> recruits = ai_choose_best_recruits(t, max_units_to_recruit, quality_factor, counter_recruit);
--   foreach(potential_recruit &i, recruits) {
-+   BOOST_FOREACH(potential_recruit &i, recruits) {
-       t.fake_recruit(i);
-    }
- 
-@@ -554,7 +554,7 @@
-    //DBG_AI << "start of get_recruit_qualities" << std::endl;
-    typedef std::map<const unit_type*, std::vector<double> > unit_map;
-    unit_map enemies;
--   foreach(unit &un, *resources::units){
-+   BOOST_FOREACH(unit &un, *resources::units){
- 	   if(t.is_enemy(un.side()) && !un.can_recruit()){
- 		   enemies[un.type()].push_back(
- 			  static_cast<double>(un.hitpoints())
-@@ -562,10 +562,10 @@
- 	   }
-    }
-    DBG_AI << "before extra_units of fake_teams: enemies.size() = " << enemies.size() << std::endl;
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
- 	   if (t.is_enemy(tmp_t.side())) {
--		   foreach(potential_recruit &rec, tmp_t.extra_units())
-+		   BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
- 		   {
- 			   enemies[rec.type()].push_back(1.0);
- 		   }
-@@ -573,10 +573,10 @@
-    }
-    DBG_AI << "after extra_units of fake_teams: enemies.size() = " << enemies.size() << std::endl;
- 
--   foreach(potential_recruit &rec, recruit_list) {
-+   BOOST_FOREACH(potential_recruit &rec, recruit_list) {
- 	   double score = 0;
- 	   double weighting = 0;
--	   foreach(unit_map::value_type &enemy, enemies) {
-+	   BOOST_FOREACH(unit_map::value_type &enemy, enemies) {
- 		   double hitpoints_sum = std::accumulate(enemy.second.begin(),enemy.second.end(),0);
- 		   score += compare_unit_types(*rec.type(), *enemy.first) * hitpoints_sum;
- 		   weighting += hitpoints_sum;
-@@ -621,14 +621,14 @@
- {
-    std::vector<defender_pair_type*> defenders;
-    std::vector<enemy_pair_type*> enemies;
--   foreach(unit &un, *resources::units)
-+   BOOST_FOREACH(unit &un, *resources::units)
-    {
-       if(t.is_enemy(un.side()))
-       {
- //         const unit_type &enemy_type = *un.type();
-          //enemy_pair_type *pair = new enemy_pair_type(new unit_data(un.id(), un.type()));
-          enemy_pair_type *pair = new enemy_pair_type(un.type());
--         foreach(unit &defender, *resources::units)
-+         BOOST_FOREACH(unit &defender, *resources::units)
-          {
-             if(!t.is_enemy(defender.side())){
-                //int score = compare_unit_types(*defender.type(), enemy_type);
-@@ -639,9 +639,9 @@
-                //}
-             }
-          }
--         foreach(fake_team &tmp_t, fake_teams){
-+         BOOST_FOREACH(fake_team &tmp_t, fake_teams){
-             if(!t.is_enemy(tmp_t.side())){
--               foreach(potential_recruit &rec, tmp_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-          //         int score = compare_unit_types(*rec.type(), enemy_type);
-          //         if(score >= 0){
-                      //pair->add_defender(new unit_data(rec.id(), rec.type()));
-@@ -657,7 +657,7 @@
-          //const unit_type &defender_type = *un.type();
-          //defender_pair_type *pair = new defender_pair_type(new unit_data(un.id(), un.type()));
-          defender_pair_type *pair = new defender_pair_type(un.type());
--         foreach(unit &enemy, *resources::units)
-+         BOOST_FOREACH(unit &enemy, *resources::units)
-          {
-             //int score = compare_unit_types(defender_type, *enemy.type());
-             //if(score >= 0)
-@@ -666,9 +666,9 @@
-             pair->add_enemy(enemy.type());
-             //}
-          }
--         foreach(fake_team &tmp_t, fake_teams){
-+         BOOST_FOREACH(fake_team &tmp_t, fake_teams){
-             if(t.is_enemy(tmp_t.side())){
--               foreach(potential_recruit &rec, tmp_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-                   //int score = compare_unit_types(defender_type, *rec.type());
-                   //if(score >= 0){
-                      //pair->add_enemy(new unit_data(rec.id(), rec.type()));
-@@ -680,14 +680,14 @@
-          defenders.push_back(pair);
-       }
-    }
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
--      foreach(potential_recruit &rec, tmp_t.extra_units()){
-+      BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-          if(t.is_enemy(tmp_t.side())){
-             //const unit_type &enemy_type = *rec.type();
-             //enemy_pair_type *pair = new enemy_pair_type(new unit_data(rec.id(), rec.type()));
-             enemy_pair_type *pair = new enemy_pair_type(rec.type());
--            foreach(unit &defender, *resources::units){
-+            BOOST_FOREACH(unit &defender, *resources::units){
-                if(t.is_enemy(defender.side())){
-                   continue;
-                }
-@@ -698,11 +698,11 @@
-                //}
-             }
-             //HIER
--            foreach(fake_team &sub_t, fake_teams){
-+            BOOST_FOREACH(fake_team &sub_t, fake_teams){
-                if(t.is_enemy(sub_t.side())){
-                   continue;
-                }
--               foreach(potential_recruit &sub_rec, sub_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &sub_rec, sub_t.extra_units()){
-                   //int score = compare_unit_types(*sub_rec.type(), enemy_type);
-                   //if(score >= 0){
-                      //pair->add_defender(new unit_data(sub_rec.id(), sub_rec.type()));
-@@ -715,7 +715,7 @@
-             //const unit_type &defender_type = *rec.type();
-             //defender_pair_type *pair = new defender_pair_type(new unit_data(rec.id(), rec.type()));
-             defender_pair_type *pair = new defender_pair_type(rec.type());
--            foreach(unit &enemy, *resources::units)
-+            BOOST_FOREACH(unit &enemy, *resources::units)
-             {
-                if(!t.is_enemy(enemy.side())){
-                   continue;
-@@ -726,11 +726,11 @@
-                pair->add_enemy(rec.type());
-             //   }
-             }
--            foreach(fake_team &sub_t, fake_teams){
-+            BOOST_FOREACH(fake_team &sub_t, fake_teams){
-                if(!t.is_enemy(sub_t.side())){
-                   continue;
-                }
--               foreach(potential_recruit &sub_rec, sub_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &sub_rec, sub_t.extra_units()){
-                //   int score = compare_unit_types(defender_type, *sub_rec.type());
-                //   if(score >= 0){
-                      //pair->add_enemy(new unit_data(sub_rec.id(), sub_rec.type()));
-@@ -744,17 +744,17 @@
-    }
-    double min_score = 0;
-    double max_score = 0;
--   foreach(enemy_pair_type *pair, enemies)
-+   BOOST_FOREACH(enemy_pair_type *pair, enemies)
-    {
- //      if(pair->defenders.size() == 0)
- //      {
- //         pair->score = -10000;
- //      }else{
--         //foreach(unit_data *defender, pair->defenders)
--         foreach(unit_type *defender, pair->defenders)
-+         //BOOST_FOREACH(unit_data *defender, pair->defenders)
-+         BOOST_FOREACH(unit_type *defender, pair->defenders)
-          {
-             unsigned int defender_enemies = 0;
--            foreach(defender_pair_type *defender_p, defenders)
-+            BOOST_FOREACH(defender_pair_type *defender_p, defenders)
-             {
-                //if(defender->id == defender_p->defender->id){
-                if(defender->type_name()() == defender_p->defender->type_name()){
-@@ -778,7 +778,7 @@
-    }
-    double score = 0;
-    score -= max_score - min_score;
--   foreach(enemy_pair_type *pair, enemies)
-+   BOOST_FOREACH(enemy_pair_type *pair, enemies)
-    {
-       score += pair->score;
-    }
-@@ -798,16 +798,16 @@
-    typedef std::map<const unit_type*, std::vector<double> > unit_map;
-    unit_map enemies;
-    unit_map defenders;
--   foreach(unit &un, *resources::units){
-+   BOOST_FOREACH(unit &un, *resources::units){
-       if(t.is_enemy(un.side())){
-          enemies[un.type()].push_back((double)un.hitpoints() / (double)un.max_hitpoints());
-       }else{
-          defenders[un.type()].push_back(un.hitpoints() / un.max_hitpoints());
-       }
-    }
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
--      foreach(potential_recruit &rec, tmp_t.extra_units())
-+      BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
-       {
-          if(t.is_enemy(tmp_t.side())){
-             enemies[rec.type()].push_back(1.0);
-@@ -817,13 +817,13 @@
-       }
-    }
-    double result = 0;
--   foreach(unit_map::value_type &defender, defenders)
-+   BOOST_FOREACH(unit_map::value_type &defender, defenders)
-    {
-       double defenders_score = 0;
--      foreach(unit_map::value_type &enemy, enemies)
-+      BOOST_FOREACH(unit_map::value_type &enemy, enemies)
-       {
-          double hitpoints_sum = 0;
--         foreach(double i, enemy.second)
-+         BOOST_FOREACH(double i, enemy.second)
-          {
-             hitpoints_sum += i;
-          }
-@@ -831,7 +831,7 @@
- 
-       }
-       double hitpoints_sum = 0;
--      foreach(double i, defender.second)
-+      BOOST_FOREACH(double i, defender.second)
-       {
-          hitpoints_sum += i;
-       }
-@@ -842,7 +842,7 @@
-    return result;
- //   vector<defender_pair> defenders;
- //   vector<enemy_pair> enemies;
--//   //foreach(unit &un, *resources::units)
-+//   //BOOST_FOREACH(unit &un, *resources::units)
- //   //{
- //   //   if(t.is_enemy(un.side()))
- //   //   {
-@@ -851,14 +851,14 @@
- //   //      defenders.push_back(un.id());
- //   //   }
- //   //}
--//   foreach(unit &un, *resources::units)
-+//   BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
- //         const unit_type &enemy_type = un.type();
- //         enemy_pair pair;
- //         pair.enemy = new unit_data(un.id(), enemy_type);
--//         foreach(unit &defender, *resources::units)
-+//         BOOST_FOREACH(unit &defender, *resources::units)
- //         {
- //            int score = compare_unit_types(defender.type(), enemy_type);
- //            if(score >= 0)
-@@ -873,7 +873,7 @@
- //         const unit_type &defender_type = un.type();
- //         defender_pair pair;
- //         pair.defender = new unit_data(defender.id(), defender_type);
--//         foreach(unit &enemy, *resources::units)
-+//         BOOST_FOREACH(unit &enemy, *resources::units)
- //         {
- //            int score = compare_unit_types(defender_type, enemy.type());
- //            if(score >= 0)
-@@ -885,10 +885,10 @@
- //         enemies.push_back(pair);
- //      }
- //   }
--//   foreach(fake_team &tmp_t, fake_teams)
-+//   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
- //   {
- //      if(t.is_enemy(tmp_t.side())){
--//         foreach(potential_recruit &rec, tmp_t.extra_units())
-+//         BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
- //         {
- //
- //         }
-@@ -898,7 +898,7 @@
- //
- //   }
- //   //std::vector<unit> no_defense_enemies;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.defenders.size() == 0)
- //      {
-@@ -906,11 +906,11 @@
- //
- //         pair.score = 0;
- //      }else{
--//         foreach(unit_data &defender, pair.defenders)
-+//         BOOST_FOREACH(unit_data &defender, pair.defenders)
- //         {
- //            //unit_type &defender = defender_data.type;
- //            unsigned int defender_enemies = 0;
--//            foreach(defender_pair &defender_p, defenders)
-+//            BOOST_FOREACH(defender_pair &defender_p, defenders)
- //            {
- //               if(defender.id == defender_p.defender.id){
- //                  defender_enemies = defender_p.enemies.size();
-@@ -924,7 +924,7 @@
- //   }
- //   //enemy_pair *worst_pair = &enemies[0];
- //   double total_score = 0;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      total_score += pair.score;
- //   }
-@@ -936,7 +936,7 @@
- //   //unit &worst_def_unit;
- //   vector<defender_pair> defenders;
- //   vector<enemy_pair> enemies;
--//   /*foreach(unit &un, *resources::units)
-+//   /*BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
-@@ -945,14 +945,14 @@
- //         defenders.push_back(un.id());
- //      }
- //   }*/
--//   foreach(unit &un, *resources::units)
-+//   BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
- //         const unit_type &enemy_type = un.type();
- //         enemy_pair pair;
- //         pair.enemy = un;
--//         foreach(unit &defender, *resources::units)
-+//         BOOST_FOREACH(unit &defender, *resources::units)
- //         {
- //            int score = compare_unit_types(defender.type(), enemy_type);
- //            if(score >= 0)
-@@ -967,7 +967,7 @@
- //         const unit_type &defender_type = un.type();
- //         defender_pair pair;
- //         pair.defender = un;
--//         foreach(unit &enemy, *resources::units)
-+//         BOOST_FOREACH(unit &enemy, *resources::units)
- //         {
- //            int score = compare_unit_types(defender_type, enemy.type());
- //            if(score >= 0)
-@@ -980,7 +980,7 @@
- //      }
- //   }
- //   //std::vector<unit> no_defense_enemies;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.defenders.size() == 0)
- //      {
-@@ -988,10 +988,10 @@
- //         return pair.enemy;
- //         //pair.score = 0;
- //      }else{
--//         foreach(unit &defender, pair.defenders)
-+//         BOOST_FOREACH(unit &defender, pair.defenders)
- //         {
- //            unsigned int defender_enemies = 0;
--//            foreach(defender_pair &defender_p, defenders)
-+//            BOOST_FOREACH(defender_pair &defender_p, defenders)
- //            {
- //               if(defender.id() == defender_p.defender.id()){
- //                  defender_enemies = defender_p.enemies.size();
-@@ -1004,7 +1004,7 @@
- //      }
- //   }
- //   enemy_pair *worst_pair = &enemies[0];
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.score < worst_pair.score)
- //      {
-@@ -1039,16 +1039,16 @@
-    for(int recruited_amount = 0; recruited_amount < max_units_to_recruit; recruited_amount++)
-    {
- 
--      foreach(fake_team &t, fake_teams)
-+      BOOST_FOREACH(fake_team &t, fake_teams)
-       {
-          t.reset();
-       }
- 
-       std::vector<potential_recruit> ai_recruit_list = ai_t->recruit_list();
- 
--      foreach(potential_recruit &recruit_type, ai_recruit_list)
-+      BOOST_FOREACH(potential_recruit &recruit_type, ai_recruit_list)
-       {
--         foreach(fake_team &t, fake_teams)
-+         BOOST_FOREACH(fake_team &t, fake_teams)
-          {
-             t.reset();
-          }
-@@ -1063,7 +1063,7 @@
-          }
-          LOG_AI << "Pretend that we recruited: " << recruit_type.id() << std::endl;
-          ai_t->fake_recruit(recruit_type);
--         foreach(fake_team &t, fake_teams)
-+         BOOST_FOREACH(fake_team &t, fake_teams)
-          {
-             if(ai_t->side() == t.side())
-             {
-Index: src/ai/testing/ca_global_fallback.cpp
-===================================================================
---- src/ai/testing/ca_global_fallback.cpp	(revision 54624)
-+++ src/ai/testing/ca_global_fallback.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../actions.hpp"
- 
- #include "../../game_display.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../map_label.hpp"
-@@ -36,6 +35,7 @@
- #include "../../terrain_filter.hpp"
- #include "../../tod_manager.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -89,7 +89,7 @@
- 	LOG_AI << "start" << std::endl;
- 	const int ticks = SDL_GetTicks();
- 	double res_sum = 0;
--	foreach( unit &u, *resources::units)
-+	BOOST_FOREACH( unit &u, *resources::units)
- 	{
- 		if (u.side()!=get_side())
- 		{
-Index: src/ai/testing/stage_fallback.cpp
-===================================================================
---- src/ai/testing/stage_fallback.cpp	(revision 54624)
-+++ src/ai/testing/stage_fallback.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "../configuration.hpp"
- #include "../manager.hpp"
- #include "../composite/ai.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/testing/ca.cpp
-===================================================================
---- src/ai/testing/ca.cpp	(revision 54624)
-+++ src/ai/testing/ca.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../composite/rca.hpp"
- #include "../composite/stage.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-@@ -33,6 +32,7 @@
- #include "../../wml_exception.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <numeric>
- 
-@@ -306,7 +306,7 @@
- 	bool found = false;
- 	// Find an available unit that can be recruited,
- 	// matches the desired usage type, and comes in under budget.
--	foreach (const std::string &name, current_team().recruits())
-+	BOOST_FOREACH(const std::string &name, current_team().recruits())
- 	{
- 		const unit_type *ut = unit_types.find(name);
- 		if (!ut) continue;
-@@ -686,7 +686,7 @@
- 	possible_moves.insert(std::pair<map_location,pathfind::paths>(leader->get_location(), leader_paths));
- 
- 	map_location loc;
--	foreach (const map_location &l, route.steps)
-+	BOOST_FOREACH(const map_location &l, route.steps)
- 	{
- 		if (leader_paths.destinations.contains(l) &&
- 		    power_projection(l, get_enemy_dstsrc()) < leader->hitpoints() * max_risk)
-@@ -779,7 +779,7 @@
- 		// The leader can't move to his keep, try to move to the closest location
- 		// to the keep where there are no enemies in range.
- 		int current_distance = distance_between(leader->get_location(), keep);
--		foreach (const pathfind::paths::step &dest, leader_paths.destinations)
-+		BOOST_FOREACH(const pathfind::paths::step &dest, leader_paths.destinations)
- 		{
- 			if (!units_.find(dest.curr).valid()){
- 				const int new_distance = distance_between(dest.curr,keep);
-@@ -1728,12 +1728,12 @@
- 	}*/
- 	//int leader_adj_count = 0;
- 	std::vector<map_location> leaders_adj_v;
--	foreach(unit_map::const_iterator leader, leaders){
-+	BOOST_FOREACH(unit_map::const_iterator leader, leaders){
- 		map_location tmp_leader_adj[6];
- 		get_adjacent_tiles(leader->get_location(), tmp_leader_adj);
--		foreach(map_location &loc, tmp_leader_adj){
-+		BOOST_FOREACH(map_location &loc, tmp_leader_adj){
- 			bool found = false;
--			foreach(map_location &new_loc, leaders_adj_v){
-+			BOOST_FOREACH(map_location &new_loc, leaders_adj_v){
- 				if(new_loc == loc){
- 					found = true;
- 					break;
-@@ -1974,7 +1974,7 @@
- 	}
- 	std::vector<unit_map::unit_iterator> ai_leaders = resources::units->find_leaders(get_side());
- 	bool allied_leaders_available = false;
--	foreach(team &tmp_team, *resources::teams){
-+	BOOST_FOREACH(team &tmp_team, *resources::teams){
- 		if(!current_team().is_enemy(tmp_team.side())){
- 			std::vector<unit_map::unit_iterator> allied_leaders = resources::units->find_leaders(get_side());
- 			if (!allied_leaders.empty()){
-@@ -2001,7 +2001,7 @@
- 	calculate_moves(*resources::units, possible_moves, friends_srcdst, friends_dstsrc, false, true);
- 
- 	//check for each ai leader if he should move away from his keep
--	foreach(unit_map::unit_iterator &ai_leader, ai_leaders){
-+	BOOST_FOREACH(unit_map::unit_iterator &ai_leader, ai_leaders){
- 		//only if leader is on a keep
- 		if (!resources::game_map->is_keep(ai_leader->get_location())) {
- 			continue;
-@@ -2059,7 +2059,7 @@
- 		}
- 		ai_leader->remove_movement_ai();
- 	}
--	foreach(unit_map::unit_iterator &leader, ai_leaders){
-+	BOOST_FOREACH(unit_map::unit_iterator &leader, ai_leaders){
- 		leader->remove_movement_ai();
- 	}
- 	//ERR_AI_TESTING_AI_DEFAULT << get_name() << ": evaluate - not yet implemented" << std::endl;
-Index: src/ai/testing/stage_rca.cpp
-===================================================================
---- src/ai/testing/stage_rca.cpp	(revision 54624)
-+++ src/ai/testing/stage_rca.cpp	(revision 54625)
-@@ -25,10 +25,10 @@
- #include "../composite/engine.hpp"
- #include "../composite/property_handler.hpp"
- #include "../gamestate_observer.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -49,7 +49,7 @@
- void candidate_action_evaluation_loop::on_create()
- {
- 	//init the candidate actions
--	foreach(const config &cfg_element, cfg_.child_range("candidate_action")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("candidate_action")){
- 		engine::parse_candidate_action_from_config(*this,cfg_element,back_inserter(candidate_actions_));
- 	}
- 
-@@ -69,7 +69,7 @@
- config candidate_action_evaluation_loop::to_config() const
- {
- 	config cfg = stage::to_config();
--	foreach(candidate_action_ptr ca, candidate_actions_){
-+	BOOST_FOREACH(candidate_action_ptr ca, candidate_actions_){
- 		cfg.add_child("candidate_action",ca->to_config());
- 	}
- 	return cfg;
-@@ -88,7 +88,7 @@
- {
- 	LOG_AI_TESTING_RCA_DEFAULT << "Starting candidate action evaluation loop for side "<< get_side() << std::endl;
- 
--	foreach(candidate_action_ptr ca, candidate_actions_){
-+	BOOST_FOREACH(candidate_action_ptr ca, candidate_actions_){
- 		ca->enable();
- 	}
- 
-@@ -103,7 +103,7 @@
- 		candidate_action_ptr best_ptr;
- 
- 		//Evaluation
--		foreach(candidate_action_ptr ca_ptr, candidate_actions_){
-+		BOOST_FOREACH(candidate_action_ptr ca_ptr, candidate_actions_){
- 			if (!ca_ptr->is_enabled()){
- 				DBG_AI_TESTING_RCA_DEFAULT << "Skipping disabled candidate action: "<< *ca_ptr << std::endl;
- 				continue;
-Index: src/ai/testing/aspect_attacks.cpp
-===================================================================
---- src/ai/testing/aspect_attacks.cpp	(revision 54624)
-+++ src/ai/testing/aspect_attacks.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "../manager.hpp"
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../team.hpp"
-@@ -31,6 +30,8 @@
- #include "../../unit.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace ai {
- 
- namespace testing_ai_default {
-@@ -468,7 +469,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-@@ -572,7 +573,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-Index: src/play_controller.cpp
-===================================================================
---- src/play_controller.cpp	(revision 54624)
-+++ src/play_controller.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- 
- #include "play_controller.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
- #include "halo.hpp"
-@@ -46,6 +45,8 @@
- #include "whiteboard/manager.hpp"
- #include "scripting/lua.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- #define DBG_NG LOG_STREAM(debug, log_engine)
-@@ -173,7 +174,7 @@
- 		place_sides_in_preferred_locations();
- 	}
- 
--	foreach (const config &t, level_.child_range("time_area")) {
-+	BOOST_FOREACH(const config &t, level_.child_range("time_area")) {
- 		tod_manager_.add_time_area(t);
- 	}
- 
-@@ -192,7 +193,7 @@
- 	std::vector<team_builder_ptr> team_builders;
- 
- 	int team_num = 0;
--	foreach (const config &side, level_.child_range("side"))
-+	BOOST_FOREACH(const config &side, level_.child_range("side"))
- 	{
- 		std::string save_id = get_unique_saveid(side, seen_save_ids);
- 		seen_save_ids.insert(save_id);
-@@ -212,7 +213,7 @@
- 		team_builders.push_back(tb_ptr);
- 	}
- 
--	foreach (team_builder_ptr tb_ptr, team_builders)
-+	BOOST_FOREACH(team_builder_ptr tb_ptr, team_builders)
- 	{
- 		gamestate_.build_team_stage_two(tb_ptr);
- 	}
-@@ -337,7 +338,7 @@
- 	int num_pos = map_.num_valid_starting_positions();
- 
- 	int side_num = 1;
--	foreach (const config &side, level_.child_range("side"))
-+	BOOST_FOREACH(const config &side, level_.child_range("side"))
- 	{
- 		for(int p = 1; p <= num_pos; ++p) {
- 			const map_location& pos = map_.starting_position(p);
-@@ -703,7 +704,7 @@
- 	}
- 
- 	// Write terrain_graphics data in snapshot, too
--	foreach (const config &tg, level_.child_range("terrain_graphics")) {
-+	BOOST_FOREACH(const config &tg, level_.child_range("terrain_graphics")) {
- 		cfg.add_child("terrain_graphics", tg);
- 	}
- 
-@@ -914,7 +915,7 @@
- 	switch(mode) {
- 	case gui::TEXTBOX_SEARCH:
- 	{
--		foreach (const unit &u, units_){
-+		BOOST_FOREACH(const unit &u, units_){
- 			const map_location& loc = u.get_location();
- 			if(!gui_->fogged(loc) &&
- 					!(teams_[gui_->viewing_team()].is_enemy(u.side()) && u.invisible(loc)))
-@@ -931,13 +932,13 @@
- 	}
- 	case gui::TEXTBOX_MESSAGE:
- 	{
--		foreach(const team& t, teams_) {
-+		BOOST_FOREACH(const team& t, teams_) {
- 			if(!t.is_empty())
- 				dictionary.insert(t.current_player());
- 		}
- 
- 		// Add observers
--		foreach(const std::string& o, gui_->observers()){
-+		BOOST_FOREACH(const std::string& o, gui_->observers()){
- 			dictionary.insert(o);
- 		}
- 		//Exclude own nick from tab-completion.
-@@ -1341,7 +1342,7 @@
- 
- 	if (non_interactive()) {
- 		std::cout << "winner: ";
--		foreach (unsigned l, seen_leaders) {
-+		BOOST_FOREACH(unsigned l, seen_leaders) {
- 			std::string ai = ai::manager::get_active_ai_identifier_for_side(l);
- 			if (ai.empty()) ai = "default ai";
- 			std::cout << l << " (using " << ai << ") ";
-Index: src/unit_abilities.cpp
-===================================================================
---- src/unit_abilities.cpp	(revision 54624)
-+++ src/unit_abilities.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
-  *  Manage unit-abilities, like heal, cure, and weapon_specials.
-  */
- 
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "log.hpp"
- #include "resources.hpp"
-@@ -27,6 +26,8 @@
- #include "team.hpp"
- #include "unit_abilities.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- 
-@@ -124,7 +125,7 @@
- {
- 	if (const config &abilities = cfg_.child("abilities"))
- 	{
--		foreach (const config &i, abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &i, abilities.child_range(ability)) {
- 			if (ability_active(ability, i, loc) &&
- 			    ability_affects_self(ability, i, loc))
- 				return true;
-@@ -141,7 +142,7 @@
- 		const config &adj_abilities = it->cfg_.child("abilities");
- 		if (!adj_abilities)
- 			continue;
--		foreach (const config &j, adj_abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &j, adj_abilities.child_range(ability)) {
- 			if (unit_abilities::affects_side(j, teams_manager::get_teams(), side(), it->side()) &&
- 			    it->ability_active(ability, j, adjacent[i]) &&
- 			    ability_affects_adjacent(ability,  j, i, loc))
-@@ -158,7 +159,7 @@
- 
- 	if (const config &abilities = cfg_.child("abilities"))
- 	{
--		foreach (const config &i, abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &i, abilities.child_range(ability)) {
- 			if (ability_active(ability, i, loc) &&
- 			    ability_affects_self(ability, i, loc))
- 				res.cfgs.push_back(std::pair<const config *, map_location>(&i, loc));
-@@ -175,7 +176,7 @@
- 		const config &adj_abilities = it->cfg_.child("abilities");
- 		if (!adj_abilities)
- 			continue;
--		foreach (const config &j, adj_abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &j, adj_abilities.child_range(ability)) {
- 			if (unit_abilities::affects_side(j, teams_manager::get_teams(), side(), it->side()) &&
- 			    it->ability_active(ability, j, adjacent[i]) &&
- 			    ability_affects_adjacent(ability, j, i, loc))
-@@ -193,7 +194,7 @@
- 
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
--	foreach (const config::any_child &ab, abilities.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) {
- 		std::string const &id = ab.cfg["id"];
- 		if (!id.empty())
- 			res.push_back(id);
-@@ -208,7 +209,7 @@
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
- 
--	foreach (const config::any_child &ab, abilities.all_children_range())
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range())
- 	{
- 		if (force_active || ability_active(ab.key, ab.cfg, loc_))
- 		{
-@@ -265,9 +266,9 @@
- 	get_adjacent_tiles(loc,adjacent);
- 	const unit_map& units = *resources::units;
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-@@ -282,9 +283,9 @@
- 		}
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent_location"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent_location"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index = map_location::parse_direction(j);
- 			if (index == map_location::NDIRECTIONS) {
-@@ -310,7 +311,7 @@
- 
- 	assert(dir >=0 && dir <= 5);
- 	static const std::string adjacent_names[6] = {"n","ne","se","s","sw","nw"};
--	foreach (const config &i, cfg.child_range("affect_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("affect_adjacent"))
- 	{
- 		std::vector<std::string> dirs = utils::split(i["adjacent"]);
- 		if(std::find(dirs.begin(),dirs.end(),adjacent_names[dir]) != dirs.end()) {
-@@ -366,7 +367,7 @@
- 	int flat = 0;
- 	int stack = 0;
- 	typedef std::pair<const config *, map_location> pt;
--	foreach (pt const &p, cfgs)
-+	BOOST_FOREACH(pt const &p, cfgs)
- 	{
- 		int value = (*p.first)[key].to_int(def);
- 		if ((*p.first)["cumulative"].to_bool()) {
-@@ -398,7 +399,7 @@
- 	int flat = 0;
- 	int stack = 0;
- 	typedef std::pair<const config *, map_location> pt;
--	foreach (pt const &p, cfgs)
-+	BOOST_FOREACH(pt const &p, cfgs)
- 	{
- 		int value = (*p.first)[key].to_int(def);
- 		if ((*p.first)["cumulative"].to_bool()) {
-@@ -448,7 +449,7 @@
- namespace {
- 	bool get_special_children(std::vector<const config*>& result, const config& parent,
- 	                           const std::string& id, bool just_peeking=false) {
--		foreach (const config::any_child &sp, parent.all_children_range())
-+		BOOST_FOREACH(const config::any_child &sp, parent.all_children_range())
- 		{
- 			if (sp.key == id || sp.cfg["id"] == id) {
- 				if(just_peeking) {
-@@ -495,7 +496,7 @@
- 	unit_ability_list res;
- 	if (const config &specials = cfg_.child("specials"))
- 	{
--		foreach (const config &i, specials.child_range(special)) {
-+		BOOST_FOREACH(const config &i, specials.child_range(special)) {
- 			if (special_active(i, true))
- 				res.cfgs.push_back(std::pair<const config *, map_location>
- 					(&i, attacker_ ? aloc_ : dloc_));
-@@ -504,7 +505,7 @@
- 	if (!other_attack_) return res;
- 	if (const config &specials = other_attack_->cfg_.child("specials"))
- 	{
--		foreach (const config &i, specials.child_range(special)) {
-+		BOOST_FOREACH(const config &i, specials.child_range(special)) {
- 			if (other_attack_->special_active(i, false))
- 				res.cfgs.push_back(std::pair<const config *, map_location>
- 					(&i, attacker_ ? dloc_ : aloc_));
-@@ -519,7 +520,7 @@
- 	const config &specials = cfg_.child("specials");
- 	if (!specials) return res;
- 
--	foreach (const config::any_child &sp, specials.all_children_range())
-+	BOOST_FOREACH(const config::any_child &sp, specials.all_children_range())
- 	{
- 		if (force || special_active(sp.cfg, true)) {
- 			const t_string &name = sp.cfg["name"];
-@@ -544,7 +545,7 @@
- 	const config &specials = cfg_.child("specials");
- 	if (!specials) return res;
- 
--	foreach (const config::any_child &sp, specials.all_children_range())
-+	BOOST_FOREACH(const config::any_child &sp, specials.all_children_range())
- 	{
- 		char const *s = force || special_active(sp.cfg, true) ?
- 			"name" : "name_inactive";
-@@ -679,9 +680,9 @@
- 		get_adjacent_tiles(dloc_,adjacent);
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-@@ -694,9 +695,9 @@
- 		}
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent_location"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent_location"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-Index: src/video.cpp
-===================================================================
---- src/video.cpp	(revision 54624)
-+++ src/video.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "global.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "image.hpp"
- #include "log.hpp"
- #include "preferences.hpp"
-@@ -29,6 +28,8 @@
- #include "sdl_utils.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <vector>
- #include <map>
- #include <algorithm>
-@@ -105,7 +106,7 @@
- {
- 	events.clear();
- 
--	foreach (SDL_Rect const &rect, update_rects) {
-+	BOOST_FOREACH(SDL_Rect const &rect, update_rects) {
- 		events.push_back(event(rect, true));
- 		events.push_back(event(rect, false));
- 	}
-@@ -354,7 +355,7 @@
- int CVideo::bppForMode( int x, int y, int flags)
- {
- 	int test_values[3] = {getBpp(), 32, 16};
--	foreach(int &bpp, test_values) {
-+	BOOST_FOREACH(int &bpp, test_values) {
- 		if(modePossible(x, y, bpp, flags) > 0) {
- 			return bpp;
- 		}
-Index: src/tools/schema/tag.cpp
-===================================================================
---- src/tools/schema/tag.cpp	(revision 54624)
-+++ src/tools/schema/tag.cpp	(revision 54625)
-@@ -21,7 +21,9 @@
- #include "tools/schema/tag.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
-+
-+#include <boost/foreach.hpp>
-+
- namespace schema_validation{
- 
- /*WIKI
-@@ -81,15 +83,15 @@
- 		if (cfg.has_attribute("super")){
- 			super_ = cfg["super"].str();
- 		}
--		foreach (const config &child, cfg.child_range("tag")) {
-+		BOOST_FOREACH(const config &child, cfg.child_range("tag")) {
- 			class_tag child_tag (child);
- 			add_tag(child_tag);
- 		}
--		foreach (const config &child, cfg.child_range("key")) {
-+		BOOST_FOREACH(const config &child, cfg.child_range("key")) {
- 			class_key child_key (child);
- 			add_key(child_key);
- 		}
--		foreach (const config &link, cfg.child_range("link")) {
-+		BOOST_FOREACH(const config &link, cfg.child_range("link")) {
- 			std::string link_name = link["name"].str();
- 			add_link(link_name);
- 		}
-Index: src/tools/exploder_cutter.cpp
-===================================================================
---- src/tools/exploder_cutter.cpp	(revision 54624)
-+++ src/tools/exploder_cutter.cpp	(revision 54625)
-@@ -15,12 +15,13 @@
- 
- #include "exploder_cutter.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "serialization/parser.hpp"
- #include "serialization/preprocessor.hpp"
- #include "serialization/string_utils.hpp"
- #include "SDL_image.h"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- 
- cutter::cutter()
-@@ -48,7 +49,7 @@
- 
- void cutter::load_masks(const config& conf)
- {
--	foreach (const config &m, conf.child_range("mask"))
-+	BOOST_FOREACH(const config &m, conf.child_range("mask"))
- 	{
- 		const std::string name = m["name"];
- 		const std::string image = get_mask_dir() + "/" + std::string(m["image"]);
-@@ -94,7 +95,7 @@
- {
- 	surface_map res;
- 
--	foreach (const config &part, conf.child_range("part")) {
-+	BOOST_FOREACH(const config &part, conf.child_range("part")) {
- 		add_sub_image(surf, res, &part);
- 	}
- 
-Index: src/builder.cpp
-===================================================================
---- src/builder.cpp	(revision 54624)
-+++ src/builder.cpp	(revision 54625)
-@@ -20,13 +20,14 @@
- 
- #include "builder.hpp"
- 
--#include "foreach.hpp"
- #include "loadscreen.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "serialization/string_utils.hpp"
- #include "image.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define WRN_NG LOG_STREAM(warn, log_engine)
-@@ -65,12 +66,12 @@
- 		sorted_images = true;
- 	}
- 
--	foreach(const rule_image_rand& ri, images){
-+	BOOST_FOREACH(const rule_image_rand& ri, images){
- 		bool is_background = ri->is_background();
- 
- 		imagelist& img_list = is_background ? images_background : images_foreground;
- 
--		foreach(const rule_image_variant& variant, ri->variants){
-+		BOOST_FOREACH(const rule_image_variant& variant, ri->variants){
- 			if(!variant.tods.empty() && variant.tods.find(tod) == variant.tods.end())
- 				continue;
- 
-@@ -250,12 +251,12 @@
- 
- 	tile& btile = tile_map_[loc];
- 
--	foreach(animated<image::locator>& a, btile.images_background) {
-+	BOOST_FOREACH(animated<image::locator>& a, btile.images_background) {
- 		if(a.need_update())
- 			changed = true;
- 		a.update_last_draw_time();
- 	}
--	foreach(animated<image::locator>& a, btile.images_foreground) {
-+	BOOST_FOREACH(animated<image::locator>& a, btile.images_foreground) {
- 		if(a.need_update())
- 			changed = true;
- 		a.update_last_draw_time();
-@@ -326,7 +327,7 @@
- 	}
- 	std::vector<std::string> vars = utils::split(variations, ';', 0);
- 
--	foreach(const std::string& v, vars){
-+	BOOST_FOREACH(const std::string& v, vars){
- 		res.push_back(base);
- 		std::string::size_type pos = 0;
- 		while ((pos = res.back().find("@V", pos)) != std::string::npos) {
-@@ -345,21 +346,21 @@
- 
- 	// Parse images and animations data
- 	// If one is not valid, return false.
--	foreach(terrain_constraint &constraint, rule.constraints)
-+	BOOST_FOREACH(terrain_constraint &constraint, rule.constraints)
- 	{
--		foreach(rule_image& ri, constraint.images)
-+		BOOST_FOREACH(rule_image& ri, constraint.images)
- 		{
--			foreach(rule_image_variant& variant, ri.variants)
-+			BOOST_FOREACH(rule_image_variant& variant, ri.variants)
- 			{
- 
- 				std::vector<std::string> var_strings = get_variations(variant.image_string, variant.variations);
--				foreach(const std::string& var, var_strings)
-+				BOOST_FOREACH(const std::string& var, var_strings)
- 				{
- 					/** @todo improve this, 99% of terrains are not animated. */
- 					std::vector<std::string> frames = utils::parenthetical_split(var,',');
- 					animated<image::locator> res;
- 
--					foreach(const std::string& frame, frames)
-+					BOOST_FOREACH(const std::string& frame, frames)
- 					{
- 						const std::vector<std::string> items = utils::split(frame, ':');
- 						const std::string& str = items.front();
-@@ -499,7 +500,7 @@
- void terrain_builder::replace_rotate_tokens(rule_image &image, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach(rule_image_variant& variant, image.variants) {
-+	BOOST_FOREACH(rule_image_variant& variant, image.variants) {
- 		replace_rotate_tokens(variant, angle, replacement);
- 	}
- }
-@@ -507,7 +508,7 @@
- void terrain_builder::replace_rotate_tokens(rule_imagelist &list, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach (rule_image &img, list) {
-+	BOOST_FOREACH(rule_image &img, list) {
- 		replace_rotate_tokens(img, angle, replacement);
- 	}
- }
-@@ -515,16 +516,16 @@
- void terrain_builder::replace_rotate_tokens(building_rule &rule, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach (terrain_constraint &cons, rule.constraints)
-+	BOOST_FOREACH(terrain_constraint &cons, rule.constraints)
- 	{
- 		// Transforms attributes
--		foreach (std::string &flag, cons.set_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.set_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
--		foreach (std::string &flag, cons.no_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.no_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
--		foreach (std::string &flag, cons.has_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.has_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
- 		replace_rotate_tokens(cons.images, angle, replacement);
-@@ -541,7 +542,7 @@
- 		return;
- 	}
- 
--	foreach (terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(terrain_constraint &cons, ret.constraints) {
- 		rotate(cons, angle);
- 	}
- 
-@@ -549,7 +550,7 @@
- 	int minx = INT_MAX;
- 	int miny = INT_MAX;
- 
--	foreach (const terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(const terrain_constraint &cons, ret.constraints) {
- 		minx = std::min<int>(cons.loc.x, minx);
- 		miny = std::min<int>(2 * cons.loc.y + (cons.loc.x & 1), miny);
- 	}
-@@ -559,7 +560,7 @@
- 	if(!(miny & 1) && (minx & 1) && (minx > 0))
- 		miny -= 2;
- 
--	foreach (terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(terrain_constraint &cons, ret.constraints) {
- 		cons.loc.legacy_sum_assign(map_location(-minx, -((miny - 1) / 2)));
- 	}
- 
-@@ -581,7 +582,7 @@
- 
- void terrain_builder::add_images_from_config(rule_imagelist& images, const config &cfg, bool global, int dx, int dy)
- {
--	foreach (const config &img, cfg.child_range("image"))
-+	BOOST_FOREACH(const config &img, cfg.child_range("image"))
- 	{
- 		int layer = img["layer"];
- 
-@@ -606,7 +607,7 @@
- 		images.push_back(rule_image(layer, basex - dx, basey - dy, global, center_x, center_y));
- 
- 		// Adds the other variants of the image
--		foreach (const config &variant, img.child_range("variant"))
-+		BOOST_FOREACH(const config &variant, img.child_range("variant"))
- 		{
- 			const std::string &name = variant["name"];
- 			const std::string &variations = img["variations"];
-@@ -631,7 +632,7 @@
- 		const t_translation::t_match& type, const config& global_images)
- {
- 	terrain_constraint *cons = NULL;
--	foreach (terrain_constraint &c, constraints) {
-+	BOOST_FOREACH(terrain_constraint &c, constraints) {
- 		if (c.loc == loc) {
- 			cons = &c;
- 			break;
-@@ -769,7 +770,7 @@
- 	log_scope("terrain_builder::parse_config");
- 
- 	// Parses the list of building rules (BRs)
--	foreach (const config &br, cfg.child_range("terrain_graphics"))
-+	BOOST_FOREACH(const config &br, cfg.child_range("terrain_graphics"))
- 	{
- 		building_rule pbr; // Parsed Building rule
- 		pbr.local = local;
-@@ -788,7 +789,7 @@
- 		parse_mapstring(br["map"], pbr, anchors, br);
- 
- 		// Parses the terrain constraints (TCs)
--		foreach (const config &tc, br.child_range("tile"))
-+		BOOST_FOREACH(const config &tc, br.child_range("tile"))
- 		{
- 			// Adds the terrain constraint to the current built terrain's list
- 			// of terrain constraints, if it does not exist.
-@@ -831,7 +832,7 @@
- 		const std::vector<std::string> global_has_flag = utils::split(br["has_flag"]);
- 		const std::vector<std::string> global_set_no_flag = utils::split(br["set_no_flag"]);
- 
--		foreach (terrain_constraint &constraint, pbr.constraints)
-+		BOOST_FOREACH(terrain_constraint &constraint, pbr.constraints)
- 		{
- 			constraint.set_flag.insert(constraint.set_flag.end(),
- 				global_set_flag.begin(), global_set_flag.end());
-@@ -925,7 +926,7 @@
- 		}
- 	}
- 
--	foreach (const terrain_constraint &cons, rule.constraints)
-+	BOOST_FOREACH(const terrain_constraint &cons, rule.constraints)
- 	{
- 		// Translated location
- 		const map_location tloc = loc.legacy_sum(cons.loc);
-@@ -943,13 +944,13 @@
- 
- 		const std::set<std::string> &flags = tile_map_[tloc].flags;
- 
--		foreach (const std::string &s, cons.no_flag) {
-+		BOOST_FOREACH(const std::string &s, cons.no_flag) {
- 			// If a flag listed in "no_flag" is present, the rule does not match
- 			if (flags.find(s) != flags.end()) {
- 				return false;
- 			}
- 		}
--		foreach (const std::string &s, cons.has_flag) {
-+		BOOST_FOREACH(const std::string &s, cons.has_flag) {
- 			// If a flag listed in "has_flag" is not present, this rule does not match
- 			if (flags.find(s) == flags.end()) {
- 				return false;
-@@ -964,7 +965,7 @@
- {
- 	unsigned int rand_seed = get_noise(loc, rule.get_hash());
- 
--	foreach (const terrain_constraint &constraint, rule.constraints)
-+	BOOST_FOREACH(const terrain_constraint &constraint, rule.constraints)
- 	{
- 		const map_location tloc = loc.legacy_sum(constraint.loc);
- 		if(!tile_map_.on_map(tloc)) {
-@@ -973,12 +974,12 @@
- 
- 		tile& btile = tile_map_[tloc];
- 
--		foreach (const rule_image &img, constraint.images) {
-+		BOOST_FOREACH(const rule_image &img, constraint.images) {
- 			btile.images.push_back(tile::rule_image_rand(&img, rand_seed));
- 		}
- 
- 		// Sets flags
--		foreach (const std::string &flag, constraint.set_flag) {
-+		BOOST_FOREACH(const std::string &flag, constraint.set_flag) {
- 			btile.flags.insert(flag);
- 		}
- 
-@@ -1001,9 +1002,9 @@
- 	if(hash_ != DUMMY_HASH)
- 		return hash_;
- 
--	foreach(const terrain_constraint &constraint, constraints) {
--		foreach(const rule_image& ri, constraint.images) {
--			foreach(const rule_image_variant& variant, ri.variants) {
-+	BOOST_FOREACH(const terrain_constraint &constraint, constraints) {
-+		BOOST_FOREACH(const rule_image& ri, constraint.images) {
-+			BOOST_FOREACH(const rule_image_variant& variant, ri.variants) {
- 				// we will often hash the same string, but that seems fast enough
- 				hash_ += hash_str(variant.image_string);
- 			}
-@@ -1031,7 +1032,7 @@
- 		}
- 	}
- 
--	foreach (const building_rule &rule, building_rules_)
-+	BOOST_FOREACH(const building_rule &rule, building_rules_)
- 	{
- 		// Find the constraint that contains the less terrain of all terrain rules.
- 		// We will keep a track of the matching terrains of this constraint
-@@ -1040,7 +1041,7 @@
- 		t_translation::t_list min_types;
- 		const terrain_constraint *min_constraint = NULL;
- 
--		foreach (const terrain_constraint &constraint, rule.constraints)
-+		BOOST_FOREACH(const terrain_constraint &constraint, rule.constraints)
- 		{
- 			const t_translation::t_match& match = constraint.terrain_types_match;
- 			t_translation::t_list matching_types;
-Index: src/game_config.cpp
-===================================================================
---- src/game_config.cpp	(revision 54624)
-+++ src/game_config.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- 
- #include "color_range.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "util.hpp"
-@@ -29,6 +28,8 @@
- #include "revision.hpp"
- #endif /* HAVE_REVISION */
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -259,7 +260,7 @@
- 		}
- 
- 		server_list.clear();
--		foreach (const config &server, v.child_range("server"))
-+		BOOST_FOREACH(const config &server, v.child_range("server"))
- 		{
- 			server_info sinf;
- 			sinf.name = server["name"].str();
-@@ -270,7 +271,7 @@
- 
- 	void add_color_info(const config &v)
- 	{
--		foreach (const config &teamC, v.child_range("color_range"))
-+		BOOST_FOREACH(const config &teamC, v.child_range("color_range"))
- 		{
- 			const config::attribute_value *a1 = teamC.get("id"),
- 				*a2 = teamC.get("rgb");
-@@ -304,9 +305,9 @@
- 			DBG_NG << str.str() << '\n';
- 		}
- 
--		foreach (const config &cp, v.child_range("color_palette"))
-+		BOOST_FOREACH(const config &cp, v.child_range("color_palette"))
- 		{
--			foreach (const config::attribute &rgb, cp.attribute_range())
-+			BOOST_FOREACH(const config::attribute &rgb, cp.attribute_range())
- 			{
- 				std::vector<Uint32> temp;
- 				if(!string2rgb(rgb.second, temp)) {
-Index: src/whiteboard/recall.cpp
-===================================================================
---- src/whiteboard/recall.cpp	(revision 54624)
-+++ src/whiteboard/recall.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "utility.hpp"
- #include "visitor.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "menu_events.hpp"
- #include "play_controller.hpp"
-@@ -32,6 +31,8 @@
- #include "team.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -71,7 +72,7 @@
- {
- 	// Construct and validate temp_unit_
- 	size_t underlying_id = cfg["temp_unit_"];
--	foreach(unit const& recall_unit, resources::teams->at(team_index()).recall_list())
-+	BOOST_FOREACH(unit const& recall_unit, resources::teams->at(team_index()).recall_list())
- 	{
- 		if(recall_unit.underlying_id()==underlying_id)
- 		{
-Index: src/whiteboard/utility.cpp
-===================================================================
---- src/whiteboard/utility.cpp	(revision 54624)
-+++ src/whiteboard/utility.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "manager.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "map.hpp"
- #include "play_controller.hpp"
-@@ -30,6 +29,8 @@
- #include "team.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb {
- 
- size_t viewer_team()
-@@ -60,7 +61,7 @@
- {
- 	assert(leader.can_recruit());
- 	assert(resources::game_map->is_keep(leader.get_location()));
--	foreach(unit const& unit, *resources::units)
-+	BOOST_FOREACH(unit const& unit, *resources::units)
- 	{
- 		if (unit.can_recruit() &&
- 				resources::game_map->is_keep(unit.get_location()) &&
-@@ -83,7 +84,7 @@
- 	if(!map.is_castle(hex))
- 		return NULL;
- 
--	foreach(unit& u, *resources::units)
-+	BOOST_FOREACH(unit& u, *resources::units)
- 		if(u.can_recruit()
- 				&& u.side() == static_cast<int>(team_index+1)
- 				&& can_recruit_on(map,u.get_location(),hex))
-@@ -124,7 +125,7 @@
- 
- 	int result = 0;
- 	gamemap const& map = *resources::game_map;
--	foreach(map_location const& loc, std::make_pair(path.begin()+1,path.end()))
-+	BOOST_FOREACH(map_location const& loc, std::make_pair(path.begin()+1,path.end()))
- 		result += u.movement_cost(map[loc]);
- 	return result;
- }
-@@ -149,7 +150,7 @@
- 
- bool has_actions()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 		if (!t.get_side_actions()->empty())
- 			return true;
- 
-Index: src/whiteboard/visitor.hpp
-===================================================================
---- src/whiteboard/visitor.hpp	(revision 54624)
-+++ src/whiteboard/visitor.hpp	(revision 54625)
-@@ -33,11 +33,11 @@
- #include "action.hpp"
- #include "side_actions.hpp"
- 
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- 
- #include <boost/noncopyable.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace wb
- {
-@@ -81,7 +81,7 @@
- 
- 		//Determine how many turns' worth of plans there are
- 		size_t max_turns = 0;
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 			max_turns = std::max(max_turns,t.get_side_actions()->num_turns());
- 
- 		size_t const current_team = resources::controller->current_side() - 1;
-Index: src/whiteboard/side_actions.cpp
-===================================================================
---- src/whiteboard/side_actions.cpp	(revision 54624)
-+++ src/whiteboard/side_actions.cpp	(revision 54625)
-@@ -31,12 +31,13 @@
- #include "validate_visitor.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "map.hpp"
- #include "resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <set>
- #include <sstream>
- 
-@@ -48,13 +49,13 @@
- {
- 	s << "Content of side_actions:";
- 	int turn = 1;
--	foreach(action_queue const& turn_queue, side_actions.actions())
-+	BOOST_FOREACH(action_queue const& turn_queue, side_actions.actions())
- 	{
- 		s << "\n  Turn " << turn;
- 		++turn;
- 
- 		int count = 1;
--		foreach(action_ptr const& action, turn_queue)
-+		BOOST_FOREACH(action_ptr const& action, turn_queue)
- 		{
- 			s << "\n    (" << count << ") " << action;
- 			++count;
-@@ -114,7 +115,7 @@
- 					main_number = index;
- 				}
- 
--				foreach(weak_action_ptr action, highlighter->get_secondary_highlights())
-+				BOOST_FOREACH(weak_action_ptr action, highlighter->get_secondary_highlights())
- 				{
- 					if (action.lock() == *it)
- 					{
-@@ -199,7 +200,7 @@
- size_t side_actions::size() const
- {
- 	size_t result = 0;
--	foreach(action_queue const& queue, actions_)
-+	BOOST_FOREACH(action_queue const& queue, actions_)
- 		result += queue.size();
- 	return result;
- }
-@@ -234,7 +235,7 @@
- 		return;
- 	}
- 
--	foreach(action_ptr act, *this)
-+	BOOST_FOREACH(action_ptr act, *this)
- 		act->hide();
- }
- void side_actions::show()
-@@ -244,7 +245,7 @@
- 
- 	hidden_ = false;
- 
--	foreach(action_ptr act, *this)
-+	BOOST_FOREACH(action_ptr act, *this)
- 		act->show();
- }
- 
-@@ -507,7 +508,7 @@
- size_t side_actions::count_actions_of(unit const* unit)
- {
- 	size_t count = 0;
--	foreach(action_ptr action, *this)
-+	BOOST_FOREACH(action_ptr action, *this)
- 	{
- 		if (action->get_unit() == unit)
- 		{
-@@ -783,7 +784,7 @@
- 	else if(type=="refresh")
- 	{
- 		safe_clear();
--		foreach(net_cmd const& sub_cmd, cmd.child_range("net_cmd"))
-+		BOOST_FOREACH(net_cmd const& sub_cmd, cmd.child_range("net_cmd"))
- 			execute_net_cmd(sub_cmd);
- 	}
- 	else
-@@ -890,7 +891,7 @@
- 
- 	//find units who still have plans for turn 0 (i.e. were too lazy to finish their jobs)
- 	std::set<unit const*> lazy_units;
--	foreach(action_ptr const& act, iter_turn(0))
-+	BOOST_FOREACH(action_ptr const& act, iter_turn(0))
- 	{
- 		unit const* u = act->get_unit();
- 		if(u)
-@@ -913,7 +914,7 @@
- 	}
- 
- 	//push any remaining first-turn plans into the second turn
--	foreach(action_ptr act, actions_.front())
-+	BOOST_FOREACH(action_ptr act, actions_.front())
- 		actions_[1].push_front(act);
- 	actions_.front().clear();
- 
-Index: src/whiteboard/move.cpp
-===================================================================
---- src/whiteboard/move.cpp	(revision 54624)
-+++ src/whiteboard/move.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "arrow.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "mouse_events.hpp"
- #include "play_controller.hpp"
-@@ -37,6 +36,8 @@
- #include "unit_display.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb {
- 
- std::ostream& operator<<(std::ostream &s, move_ptr move)
-@@ -108,10 +109,10 @@
- 	if(!route_cfg)
- 		throw action::ctor_err("move: Invalid route_");
- 	route_->move_cost = route_cfg["move_cost"];
--	foreach(config const& loc_cfg, route_cfg.child_range("step")) {
-+	BOOST_FOREACH(config const& loc_cfg, route_cfg.child_range("step")) {
- 		route_->steps.push_back(map_location(loc_cfg["x"],loc_cfg["y"]));
- 	}
--	foreach(config const& mark_cfg, route_cfg.child_range("mark")) {
-+	BOOST_FOREACH(config const& mark_cfg, route_cfg.child_range("mark")) {
- 		route_->marks[map_location(mark_cfg["x"],mark_cfg["y"])]
- 				= pathfind::marked_route::mark(mark_cfg["turns"],mark_cfg["zoc"],mark_cfg["capture"],mark_cfg["invisible"]);
- 	}
-@@ -470,7 +471,7 @@
- 	//Serialize route_
- 	config route_cfg;
- 	route_cfg["move_cost"]=route_->move_cost;
--	foreach(map_location const& loc, route_->steps)
-+	BOOST_FOREACH(map_location const& loc, route_->steps)
- 	{
- 		config loc_cfg;
- 		loc_cfg["x"]=loc.x;
-@@ -478,7 +479,7 @@
- 		route_cfg.add_child("step",loc_cfg);
- 	}
- 	typedef std::pair<map_location,pathfind::marked_route::mark> pair_loc_mark;
--	foreach(pair_loc_mark const& item, route_->marks)
-+	BOOST_FOREACH(pair_loc_mark const& item, route_->marks)
- 	{
- 		config mark_cfg;
- 		mark_cfg["x"]=item.first.x;
-Index: src/whiteboard/validate_visitor.cpp
-===================================================================
---- src/whiteboard/validate_visitor.cpp	(revision 54624)
-+++ src/whiteboard/validate_visitor.cpp	(revision 54625)
-@@ -28,12 +28,13 @@
- #include "utility.hpp"
- 
- #include "arrow.hpp"
--#include "foreach.hpp"
- #include "pathfind/pathfind.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "team.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -60,7 +61,7 @@
- 	{
- 		int side_actions_size_before = viewer_actions_.size();
- 		LOG_WB << "Erasing " << actions_to_erase_.size() << " invalid actions.\n";
--		foreach(action_ptr action, actions_to_erase_)
-+		BOOST_FOREACH(action_ptr action, actions_to_erase_)
- 		{
- 			viewer_actions_.remove_action(viewer_actions_.get_position_of(action), false);
- 		}
-Index: src/whiteboard/manager.cpp
-===================================================================
---- src/whiteboard/manager.cpp	(revision 54624)
-+++ src/whiteboard/manager.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "actions.hpp"
- #include "arrow.hpp"
- #include "chat_events.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -47,6 +46,8 @@
- #include "unit_display.hpp"
- 
- #include <boost/lexical_cast.hpp>
-+#include <boost/foreach.hpp>
-+
- #include <sstream>
- 
- namespace wb {
-@@ -268,7 +269,7 @@
- 	}
- 
- 	//Look for planned recruits that depend on this leader
--	foreach(action_const_ptr action, *viewer_actions())
-+	BOOST_FOREACH(action_const_ptr action, *viewer_actions())
- 	{
- 		recruit_const_ptr recruit = boost::dynamic_pointer_cast<class recruit const>(action);
- 		recall_const_ptr recall = boost::dynamic_pointer_cast<class recall const>(action);
-@@ -332,7 +333,7 @@
- 
- static void hide_all_plans()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 		t.get_side_actions()->hide();
- }
- 
-@@ -344,7 +345,7 @@
- 		hide_all_plans();
- 	else //< normal circumstance
- 	{
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 		{
- 			//make sure only appropriate teams are hidden
- 			if(!t.is_network_human())
-@@ -498,7 +499,7 @@
- 	if (can_modify_game_state() && has_actions())
- 	{
- 		units_owning_moves_ = move_owners_finder().get_units_owning_moves();
--		foreach(size_t unit_id, units_owning_moves_)
-+		BOOST_FOREACH(size_t unit_id, units_owning_moves_)
- 		{
- 			unit_map::iterator unit_iter = resources::units->find(unit_id);
- 			assert(unit_iter.valid());
-@@ -509,7 +510,7 @@
- 
- void manager::post_draw()
- {
--	foreach(size_t unit_id, units_owning_moves_)
-+	BOOST_FOREACH(size_t unit_id, units_owning_moves_)
- 	{
- 		unit_map::iterator unit_iter = resources::units->find(unit_id);
- 		if (unit_iter.valid()) { 
-@@ -558,7 +559,7 @@
- 
- 		//Info about the action numbers to be displayed on screen.
- 		side_actions::numbers_t numbers;
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 		{
- 			side_actions& sa = *t.get_side_actions();
- 			if(!sa.hidden())
-@@ -571,7 +572,7 @@
- 
- void manager::on_mouseover_change(const map_location& hex)
- {
--	foreach(map_location const& hex, hidden_unit_hexes_)
-+	BOOST_FOREACH(map_location const& hex, hidden_unit_hexes_)
- 		resources::screen->remove_exclusive_draw(hex);
- 	hidden_unit_hexes_.clear();
- 
-@@ -636,7 +637,7 @@
- 		LOG_WB << "Received wb data (" << count << ").\n";
- 
- 		team& team_from = resources::teams->at(wb_cfg["side"]-1);
--		foreach(side_actions::net_cmd const& cmd, wb_cfg.child_range("net_cmd"))
-+		BOOST_FOREACH(side_actions::net_cmd const& cmd, wb_cfg.child_range("net_cmd"))
- 			team_from.get_side_actions()->execute_net_cmd(cmd);
- 	}
- }
-@@ -1138,7 +1139,7 @@
- 	options.push_back(_("HIDE ALL allies’ plans"));
- 
- 	//populate list of networked allies
--	foreach(team &t, *resources::teams)
-+	BOOST_FOREACH(team &t, *resources::teams)
- 	{
- 		//Exclude enemies, AIs, and local players
- 		if(t.is_enemy(v_side) || !t.is_network())
-@@ -1164,11 +1165,11 @@
- 	switch(selection)
- 	{
- 	case 0:
--		foreach(team* t, allies)
-+		BOOST_FOREACH(team* t, allies)
- 			team_plans_hidden_[t->side()-1]=false;
- 		break;
- 	case 1:
--		foreach(team* t, allies)
-+		BOOST_FOREACH(team* t, allies)
- 			team_plans_hidden_[t->side()-1]=true;
- 		break;
- 	default:
-Index: src/whiteboard/suppose_dead.cpp
-===================================================================
---- src/whiteboard/suppose_dead.cpp	(revision 54624)
-+++ src/whiteboard/suppose_dead.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "arrow.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "mouse_events.hpp"
-Index: src/whiteboard/mapbuilder.cpp
-===================================================================
---- src/whiteboard/mapbuilder.cpp	(revision 54624)
-+++ src/whiteboard/mapbuilder.cpp	(revision 54625)
-@@ -24,12 +24,13 @@
- #include "side_actions.hpp"
- #include "utility.hpp"
- 
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "unit.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -51,14 +52,14 @@
- 
- void mapbuilder::pre_build()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 	{
- 		//Reset spent gold to zero, it'll be recalculated during the map building
- 		t.get_side_actions()->reset_gold_spent();
- 	}
- 
- 	int current_side = resources::controller->current_side();
--	foreach(unit& u, *resources::units)
-+	BOOST_FOREACH(unit& u, *resources::units)
- 	{
- 		bool on_current_side = (u.side() == current_side);
- 
-Index: src/whiteboard/highlight_visitor.cpp
-===================================================================
---- src/whiteboard/highlight_visitor.cpp	(revision 54624)
-+++ src/whiteboard/highlight_visitor.cpp	(revision 54625)
-@@ -29,11 +29,12 @@
- #include "suppose_dead.hpp"
- 
- #include "arrow.hpp"
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -147,7 +148,7 @@
- 		{
- 			//Highlight secondary highlights
- 			mode_ = HIGHLIGHT_SECONDARY;
--			foreach(weak_action_ptr weak, secondary_highlights_)
-+			BOOST_FOREACH(weak_action_ptr weak, secondary_highlights_)
- 			{
- 				if (action_ptr action = weak.lock())
- 				{
-@@ -169,7 +170,7 @@
- 
- 	//unhighlight secondary highlights
- 	mode_ = UNHIGHLIGHT_SECONDARY;
--	foreach(weak_action_ptr weak, secondary_highlights_)
-+	BOOST_FOREACH(weak_action_ptr weak, secondary_highlights_)
- 	{
- 		if (action_ptr action = weak.lock())
- 		{
-@@ -178,7 +179,7 @@
- 	}
- 
- 	//unhide other units if needed
--	foreach(map_location hex, exclusive_display_hexes_)
-+	BOOST_FOREACH(map_location hex, exclusive_display_hexes_)
- 	{
- 		resources::screen->remove_exclusive_draw(hex);
- 	}
-Index: src/language.cpp
-===================================================================
---- src/language.cpp	(revision 54624)
-+++ src/language.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "language.hpp"
- #include "log.hpp"
-@@ -27,6 +26,7 @@
- #include <stdexcept>
- #include <clocale>
- #include <boost/scoped_array.hpp>
-+#include <boost/foreach.hpp>
- 
- #ifdef _WIN32
- #include <windows.h>
-@@ -101,7 +101,7 @@
- 	known_languages.push_back(
- 		language_def("", t_string(N_("System default language"), "wesnoth"), "ltr", "", "A"));
- 
--	foreach (const config &lang, cfg.child_range("locale"))
-+	BOOST_FOREACH(const config &lang, cfg.child_range("locale"))
- 	{
- 		known_languages.push_back(
- 			language_def(lang["locale"], lang["name"], lang["dir"],
-@@ -226,9 +226,9 @@
- 		std::cerr << "No [language] block found\n";
- 		return false;
- 	}
--	foreach (const config &lang, languages_) {
-+	BOOST_FOREACH(const config &lang, languages_) {
- 		DBG_G << "[language]\n";
--		foreach (const config::attribute &j, lang.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &j, lang.attribute_range()) {
- 			DBG_G << j.first << "=\"" << j.second << "\"\n";
- 			strings_[j.first] = j.second;
- 		}
-@@ -283,7 +283,7 @@
- 
- void init_textdomains(const config& cfg)
- {
--	foreach (const config &t, cfg.child_range("textdomain"))
-+	BOOST_FOREACH(const config &t, cfg.child_range("textdomain"))
- 	{
- 		const std::string &name = t["name"];
- 		const std::string &path = t["path"];
-@@ -307,7 +307,7 @@
- bool init_strings(const config& cfg)
- {
- 	languages_.clear();
--	foreach(const config &l, cfg.child_range("language")) {
-+	BOOST_FOREACH(const config &l, cfg.child_range("language")) {
- 		languages_.push_back(l);
- 	}
- 	return load_strings(true);
-Index: src/multiplayer_lobby.cpp
-===================================================================
---- src/multiplayer_lobby.cpp	(revision 54624)
-+++ src/multiplayer_lobby.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "global.hpp"
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "lobby_preferences.hpp"
- #include "map_exception.hpp"
-@@ -34,6 +33,8 @@
- #include "wml_exception.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
- 
-@@ -424,7 +425,7 @@
- 
- 	games_.clear();
- 
--	foreach (const config &game, cfg.child("gamelist").child_range("game"))
-+	BOOST_FOREACH(const config &game, cfg.child("gamelist").child_range("game"))
- 	{
- 		bool verified = true;
- 		games_.push_back(game_item());
-@@ -502,7 +503,7 @@
- 				if (map_hashes_ && !games_.back().reloaded) {
- 					std::string hash = game["hash"];
- 					bool hash_found = false;
--					foreach (const config::attribute &i, map_hashes_.attribute_range()) {
-+					BOOST_FOREACH(const config::attribute &i, map_hashes_.attribute_range()) {
- 						if (i.first == game["mp_scenario"] && i.second == hash) {
- 							hash_found = true;
- 							break;
-@@ -639,7 +640,7 @@
- 
-     if(preferences::fi_friends_in_game()) {
-         bool found_friend = false;
--        foreach(const config &user, cfg.child_range("user")) {
-+        BOOST_FOREACH(const config &user, cfg.child_range("user")) {
-             if(preferences::is_friend(user["name"]) && user["game_id"] == i.id) {
-                 found_friend = true;
-                 break;
-@@ -650,7 +651,7 @@
- 
-     if(!preferences::fi_text().empty()) {
-         bool found_match = true;
--        foreach(const std::string& search_string, utils::split(preferences::fi_text(), ' ', utils::STRIP_SPACES)) {
-+        BOOST_FOREACH(const std::string& search_string, utils::split(preferences::fi_text(), ' ', utils::STRIP_SPACES)) {
-             if(std::search(i.map_info.begin(), i.map_info.end(), search_string.begin(), search_string.end(), chars_equal_insensitive) == i.map_info.end() &&
-                     std::search(i.name.begin(), i.name.end(), search_string.begin(), search_string.end(), chars_equal_insensitive) == i.name.end()) {
-                 found_match = false;
-Index: src/reports.cpp
-===================================================================
---- src/reports.cpp	(revision 54624)
-+++ src/reports.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "editor/editor_controller.hpp"
- #include "editor/editor_palettes.hpp"
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -36,6 +35,7 @@
- #include "unit.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <cassert>
- #include <ctime>
-@@ -260,7 +260,7 @@
- 	if (!u) return report();
- 	config res;
- 	typedef std::pair<std::string, std::string> pair_string;
--	foreach(const pair_string &ps, u->amla_icons()) {
-+	BOOST_FOREACH(const pair_string &ps, u->amla_icons()) {
- 		add_image(res, ps.first, ps.second);
- 	}
- 	return res;
-@@ -395,7 +395,7 @@
- 
- 	bool att_def_diff = false;
- 	map_location displayed_unit_hex = resources::screen->displayed_unit_hex();
--	foreach (const utils::string_map::value_type &resist, u->get_base_resistances())
-+	BOOST_FOREACH(const utils::string_map::value_type &resist, u->get_base_resistances())
- 	{
- 		std::ostringstream line;
- 		line << gettext(resist.first.c_str()) << ": ";
-@@ -415,7 +415,7 @@
- 	if (att_def_diff)
- 		tooltip << _("(Att / Def)");
- 	tooltip << '\n';
--	foreach (const std::string &line, resistances_table) {
-+	BOOST_FOREACH(const std::string &line, resistances_table) {
- 		tooltip << line;
- 	}
- 	return text_report(str.str(), tooltip.str());
-@@ -458,7 +458,7 @@
- 	if (!u) return report();
- 	config res;
- 	typedef std::pair<std::string, std::string> pair_string;
--	foreach (const pair_string &ps, u->advancement_icons()) {
-+	BOOST_FOREACH(const pair_string &ps, u->advancement_icons()) {
- 		add_image(res, ps.first, ps.second);
- 	}
- 	return res;
-@@ -497,7 +497,7 @@
- 	bool revert = false;
- 	if (underlyings.size() != 1 || underlyings.front() != terrain)
- 	{
--		foreach (const t_translation::t_terrain &t, underlyings)
-+		BOOST_FOREACH(const t_translation::t_terrain &t, underlyings)
- 		{
- 			if (t == t_translation::MINUS) {
- 				revert = true;
-@@ -641,7 +641,7 @@
- 	std::set<std::string> seen_types;
- 	const team &unit_team = (*resources::teams)[u->side() - 1];
- 	const team &viewing_team = (*resources::teams)[resources::screen->viewing_team()];
--	foreach(const unit &enemy, *resources::units)
-+	BOOST_FOREACH(const unit &enemy, *resources::units)
- 	{
- 		if (!unit_team.is_enemy(enemy.side()))
- 			continue;
-@@ -662,7 +662,7 @@
- 	damage_multiplier += tod_bonus;
- 
- 	typedef std::pair<int, std::set<std::string> > resist_units;
--	foreach (const resist_units &resist, resistances) {
-+	BOOST_FOREACH(const resist_units &resist, resistances) {
- 		int damage = round_damage(base_damage, damage_multiplier * resist.first, damage_divisor);
- 		tooltip << "<b>" << damage << "</b>  "
- 			<< "<i>(" << utils::signed_percent(resist.first-100) << ")</i> : "
-@@ -755,7 +755,7 @@
- 		}
- 	}
- 
--	foreach(const battle_context& weapon, weapons) {
-+	BOOST_FOREACH(const battle_context& weapon, weapons) {
- 
- 		// Predict the battle outcome.
- 		combatant attacker_combatant(weapon.get_attacker_stats());
-@@ -869,7 +869,7 @@
- 	map_location displayed_unit_hex = resources::screen->displayed_unit_hex();
- 	config res;
- 
--	foreach (const attack_type &at, u->attacks())
-+	BOOST_FOREACH(const attack_type &at, u->attacks())
- 	{
- 		attack_info(at, res, u, displayed_unit_hex);
- 	}
-@@ -1023,7 +1023,7 @@
- 	str << td.villages << '/';
- 	if (viewing_team.uses_shroud()) {
- 		int unshrouded_villages = 0;
--		foreach (const map_location &loc, resources::game_map->villages()) {
-+		BOOST_FOREACH(const map_location &loc, resources::game_map->villages()) {
- 			if (!viewing_team.shrouded(loc))
- 				++unshrouded_villages;
- 		}
-@@ -1178,7 +1178,7 @@
- 
- 	std::ostringstream str;
- 	str << _("Observers:") << '\n';
--	foreach (const std::string &obs, observers) {
-+	BOOST_FOREACH(const std::string &obs, observers) {
- 		str << obs << '\n';
- 	}
- 	return image_report(game_config::images::observer, str.str());
-@@ -1250,7 +1250,7 @@
- 
- void reports::reset_generators()
- {
--	foreach (dynamic_report_generators::value_type &rg, dynamic_generators) {
-+	BOOST_FOREACH(dynamic_report_generators::value_type &rg, dynamic_generators) {
- 		delete rg.second;
- 	}
- 	dynamic_generators.clear();
-@@ -1283,10 +1283,10 @@
- const std::set<std::string> &reports::report_list()
- {
- 	if (!all_reports.empty()) return all_reports;
--	foreach (const static_report_generators::value_type &v, static_generators) {
-+	BOOST_FOREACH(const static_report_generators::value_type &v, static_generators) {
- 		all_reports.insert(v.first);
- 	}
--	foreach (const dynamic_report_generators::value_type &v, dynamic_generators) {
-+	BOOST_FOREACH(const dynamic_report_generators::value_type &v, dynamic_generators) {
- 		all_reports.insert(v.first);
- 	}
- 	return all_reports;
-Index: src/playmp_controller.cpp
-===================================================================
---- src/playmp_controller.cpp	(revision 54624)
-+++ src/playmp_controller.cpp	(revision 54625)
-@@ -17,7 +17,7 @@
- #include "playmp_controller.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
-+
- #include "game_end_exceptions.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -29,6 +29,8 @@
- #include "formula_string_utils.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -326,7 +328,7 @@
- 	// stay stuck in linger state when the *next* scenario is over.
- 	gamestate_.classification().completion = "running";
- 	// End all unit moves
--	foreach (unit &u, units_) {
-+	BOOST_FOREACH(unit &u, units_) {
- 		u.set_user_end_turn(true);
- 	}
- 	//current_team().set_countdown_time(0);
-Index: src/tests/gui/test_gui2.cpp
-===================================================================
---- src/tests/gui/test_gui2.cpp	(revision 54624)
-+++ src/tests/gui/test_gui2.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_debugger.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
-@@ -66,6 +65,7 @@
- #include "wml_exception.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <memory>
- 
-@@ -139,7 +139,7 @@
- 	template<class T>
- 	void test_resolutions(const tresolution_list& resolutions)
- 	{
--		foreach(const tresolution& resolution, resolutions) {
-+		BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 			video().make_test_fake(resolution.first, resolution.second);
- 
- 			boost::scoped_ptr<gui2::tdialog> dlg(twrapper<T>::create());
-@@ -178,7 +178,7 @@
- 	{
- 		bool interact = false;
- 		for(int i = 0; i < 2; ++i) {
--			foreach(const tresolution& resolution, resolutions) {
-+			BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 				video().make_test_fake(resolution.first, resolution.second);
- 
- 				boost::scoped_ptr<gui2::tpopup> dlg(twrapper<T>::create());
-@@ -225,7 +225,7 @@
- 	void test_tip_resolutions(const tresolution_list& resolutions
- 			, const std::string& id)
- 	{
--		foreach(const tresolution& resolution, resolutions) {
-+		BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 			video().make_test_fake(resolution.first, resolution.second);
- 
- 			std::vector<std::string>& list =
-@@ -416,7 +416,7 @@
- 
- 	// Test size() instead of empty() to get the number of offenders
- 	BOOST_CHECK_EQUAL(list.size(), 0);
--	foreach(const std::string& id, list) {
-+	BOOST_FOREACH(const std::string& id, list) {
- 		std::cerr << "Window '" << id << "' registered but not tested.\n";
- 	}
- }
-@@ -638,7 +638,7 @@
- 		BOOST_REQUIRE_MESSAGE(result, "Failed to create a dialog.");
- 
- 		std::vector<map_generator*> map_generators;
--		foreach (const config &i, main_config.child_range("multiplayer")) {
-+		BOOST_FOREACH(const config &i, main_config.child_range("multiplayer")) {
- 			if(i["map_generation"] == "default") {
- 				const config &generator_cfg = i.child("generator");
- 				if (generator_cfg) {
-@@ -694,7 +694,7 @@
- 		BOOST_REQUIRE_MESSAGE(cfg, "No editor time-of-day defined");
- 
- 		std::vector<time_of_day> tods;
--		foreach (const config &i, cfg.child_range("time")) {
-+		BOOST_FOREACH(const config &i, cfg.child_range("time")) {
- 			tods.push_back(time_of_day(i));
- 		}
- 		return new gui2::teditor_settings(NULL, tods);
-Index: src/filesystem.cpp
-===================================================================
---- src/filesystem.cpp	(revision 54624)
-+++ src/filesystem.cpp	(revision 54625)
-@@ -56,7 +56,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
-@@ -65,6 +64,8 @@
- #include "serialization/string_utils.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_filesystem("filesystem");
- #define DBG_FS LOG_STREAM(debug, log_filesystem)
- #define LOG_FS LOG_STREAM(info, log_filesystem)
-@@ -1010,7 +1011,7 @@
- 	cleanup();
- 	init_binary_paths();
- 
--	foreach (const config &bp, cfg.child_range("binary_path"))
-+	BOOST_FOREACH(const config &bp, cfg.child_range("binary_path"))
- 	{
- 		std::string path = bp["path"].str();
- 		if (path.find("..") != std::string::npos) {
-@@ -1057,7 +1058,7 @@
- 
- 	init_binary_paths();
- 
--	foreach (const std::string &path, binary_paths)
-+	BOOST_FOREACH(const std::string &path, binary_paths)
- 	{
- 		res.push_back(get_user_data_dir() + "/" + path + type + "/");
- 
-@@ -1098,7 +1099,7 @@
- 		return std::string();
- 	}
- 
--	foreach (const std::string &path, get_binary_paths(type))
-+	BOOST_FOREACH(const std::string &path, get_binary_paths(type))
- 	{
- 		const std::string file = path + filename;
- 		DBG_FS << "  checking '" << path << "'\n";
-@@ -1126,7 +1127,7 @@
- 		return std::string();
- 	}
- 
--	foreach (const std::string &path, get_binary_paths(type))
-+	BOOST_FOREACH(const std::string &path, get_binary_paths(type))
- 	{
- 		const std::string file = path + filename;
- 		DBG_FS << "  checking '" << path << "'\n";
-@@ -1291,7 +1292,7 @@
- 	p4 << drive;
- #endif
- 
--	foreach (const std::string &s, components)
-+	BOOST_FOREACH(const std::string &s, components)
- 	{
- 		p4 << '/' << s;
- 	}
-Index: src/help.cpp
-===================================================================
---- src/help.cpp	(revision 54624)
-+++ src/help.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "about.hpp"
- #include "display.hpp"
- #include "exceptions.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -40,6 +39,8 @@
- #include "wml_separators.hpp"
- #include "serialization/parser.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <queue>
- 
- static lg::log_domain log_display("display");
-@@ -793,7 +794,7 @@
- 			// opening the help browser in the default manner.
- 			config hidden_toplevel;
- 			std::stringstream ss;
--			foreach (const config &section, help_config->child_range("section"))
-+			BOOST_FOREACH(const config &section, help_config->child_range("section"))
- 			{
- 				const std::string id = section["id"];
- 				if (find_section(toplevel, id) == NULL) {
-@@ -810,7 +811,7 @@
- 			}
- 			hidden_toplevel["sections"] = ss.str();
- 			ss.str("");
--			foreach (const config &topic, help_config->child_range("topic"))
-+			BOOST_FOREACH(const config &topic, help_config->child_range("topic"))
- 			{
- 				const std::string id = topic["id"];
- 				if (find_topic(toplevel, id) == NULL) {
-@@ -861,7 +862,7 @@
- 		}
- 	}
- 
--	foreach (const config &section, cfg.child_range("section"))
-+	BOOST_FOREACH(const config &section, cfg.child_range("section"))
- 	{
- 		const std::vector<std::string> sections_refd
- 			= utils::quoted_split(section["sections"]);
-@@ -885,7 +886,7 @@
- 		}
- 	}
- 
--	foreach (const config &section, cfg.child_range("section"))
-+	BOOST_FOREACH(const config &section, cfg.child_range("section"))
- 	{
- 		const std::vector<std::string> topics_refd
- 			= utils::quoted_split(section["topics"]);
-@@ -1103,7 +1104,7 @@
- 	std::map<t_string, std::string> special_description;
- 	std::map<t_string, std::set<std::string, string_less> > special_units;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		// Only show the weapon special if we find it on a unit that
-@@ -1171,7 +1172,7 @@
- 	// should have a full description, if so, add this units abilities
- 	// for display. We do not want to show abilities that the user has
- 	// not encountered yet.
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		if (description_type(type) == FULL_DESCRIPTION) {
-@@ -1244,7 +1245,7 @@
- 	const config& era = game_cfg->child("era");
- 	if (era) {
- 		std::vector<std::string> faction_links;
--		foreach (const config &f, era.child_range("multiplayer_side")) {
-+		BOOST_FOREACH(const config &f, era.child_range("multiplayer_side")) {
- 			const std::string& id = f["id"];
- 			if (id == "Random")
- 				continue;
-@@ -1260,7 +1261,7 @@
- 			text << "<header>text='" << _("Leaders:") << "'</header>" << "\n";
- 			const std::vector<std::string> leaders =
- 					make_unit_links_list( utils::split(f["leader"]), true );
--			foreach (const std::string &link, leaders) {
-+			BOOST_FOREACH(const std::string &link, leaders) {
- 				text << link << "\n";
- 			}
- 
-@@ -1269,7 +1270,7 @@
- 			text << "<header>text='" << _("Recruits:") << "'</header>" << "\n";
- 			const std::vector<std::string> recruits =
- 					make_unit_links_list( utils::split(f["recruit"]), true );
--			foreach (const std::string &link, recruits) {
-+			BOOST_FOREACH(const std::string &link, recruits) {
- 				text << link << "\n";
- 			}
- 
-@@ -1291,7 +1292,7 @@
- 		text << "<header>text='" << _("Factions:") << "'</header>" << "\n";
- 
- 		std::sort(faction_links.begin(), faction_links.end());
--		foreach (const std::string &link, faction_links) {
-+		BOOST_FOREACH(const std::string &link, faction_links) {
- 			text << link << "\n";
- 		}
- 
-@@ -1366,7 +1367,7 @@
- 				reverse ? type_.advances_from() : type_.advances_to();
- 			bool first = true;
- 
--			foreach (const std::string &adv, adv_units)
-+			BOOST_FOREACH(const std::string &adv, adv_units)
- 			{
- 				const unit_type *type = unit_types.find(adv);
- 				if (!type || type->hide_help()) continue;
-@@ -1676,7 +1677,7 @@
- std::vector<std::string> make_unit_links_list(const std::vector<std::string>& type_id_list, bool ordered)
- {
- 	std::vector<std::string> links_list;
--	foreach (const std::string &type_id, type_id_list) {
-+	BOOST_FOREACH(const std::string &type_id, type_id_list) {
- 		std::string unit_link = make_unit_link(type_id);
- 		if (!unit_link.empty())
- 			links_list.push_back(unit_link);
-@@ -1693,7 +1694,7 @@
- 	std::set<std::string, string_less> races;
- 	std::set<std::string, string_less> visible_races;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		UNIT_DESCRIPTION_TYPE desc_type = description_type(type);
-@@ -1736,7 +1737,7 @@
- 	std::set<std::string, string_less> race_units;
- 	std::set<std::string, string_less> race_topics;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 
-@@ -1768,7 +1769,7 @@
- 		race_name = r->plural_name();
- 		race_description = r->description();
- 		// if (description.empty()) description =  _("No description Available");
--		foreach (const config &additional_topic, r->additional_topics())
-+		BOOST_FOREACH(const config &additional_topic, r->additional_topics())
- 		  {
- 		    std::string id = additional_topic["id"];
- 		    std::string title = additional_topic["title"];
-Index: src/savegame.cpp
-===================================================================
---- src/savegame.cpp	(revision 54624)
-+++ src/savegame.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- #include "savegame.hpp"
- 
- #include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,8 @@
- #include "unit_id.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_SAVE LOG_STREAM(info, log_engine)
- #define ERR_SAVE LOG_STREAM(err, log_engine)
-@@ -913,7 +914,7 @@
- 	bool shrouded = false;
- 
- 	const config& snapshot = has_snapshot ? gamestate_.snapshot : gamestate_.starting_pos;
--	foreach (const config &side, snapshot.child_range("side"))
-+	BOOST_FOREACH(const config &side, snapshot.child_range("side"))
- 	{
- 		if (side["controller"] != "human") {
- 			continue;
-@@ -922,7 +923,7 @@
- 			shrouded = true;
- 		}
- 
--		foreach (const config &u, side.child_range("unit"))
-+		BOOST_FOREACH(const config &u, side.child_range("unit"))
- 		{
- 			if (u["canrecruit"].to_bool()) {
- 				leader = u["id"].str();
-@@ -960,7 +961,7 @@
- 	// if there is no scenario information in the starting pos, add the (persistent) sides from the snapshot
- 	// else do nothing, as persistence information was already added at the end of the previous scenario
- 	if (gamestate().starting_pos["id"].empty()) {
--		foreach(const config &snapshot_side, gamestate().snapshot.child_range("side")) {
-+		BOOST_FOREACH(const config &snapshot_side, gamestate().snapshot.child_range("side")) {
- 			//add all side tags (assuming they only contain carryover information)
- 			gamestate().starting_pos.add_child("side", snapshot_side);
- 		}
-Index: src/replay.cpp
-===================================================================
---- src/replay.cpp	(revision 54624)
-+++ src/replay.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "global.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
-@@ -41,6 +40,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_replay("replay");
- #define DBG_REPLAY LOG_STREAM(debug, log_replay)
-@@ -67,7 +67,7 @@
- 			   << nunits << " according to data source. " << units.size() << " locally\n";
- 
- 		std::set<map_location> locs;
--		foreach (const config &u, cfg.child_range("unit"))
-+		BOOST_FOREACH(const config &u, cfg.child_range("unit"))
- 		{
- 			const map_location loc(u, resources::state_of_game);
- 			locs.insert(loc);
-@@ -88,7 +88,7 @@
- 		errbuf.clear();
- 	}
- 
--	foreach (const config &un, cfg.child_range("unit"))
-+	BOOST_FOREACH(const config &un, cfg.child_range("unit"))
- 	{
- 		const map_location loc(un, resources::state_of_game);
- 		const unit_map::const_iterator u = units.find(loc);
-@@ -560,7 +560,7 @@
- 		const map_location &src = steps.front();
- 		const map_location &dst = steps.back();
- 
--		foreach (const async_cmd &ac, async_cmds)
-+		BOOST_FOREACH(const async_cmd &ac, async_cmds)
- 		{
- 			if (config &async_child = ac.cfg->child("rename")) {
- 				map_location aloc(async_child, resources::state_of_game);
-@@ -576,7 +576,7 @@
- 			// A unit is being un-recruited or un-recalled.
- 			// Remove unsynced commands that would act on that unit.
- 			map_location src(*chld, resources::state_of_game);
--			foreach (const async_cmd &ac, async_cmds)
-+			BOOST_FOREACH(const async_cmd &ac, async_cmds)
- 			{
- 				if (config &async_child = ac.cfg->child("rename"))
- 				{
-@@ -680,7 +680,7 @@
- 
- void replay::add_config(const config& cfg, MARK_SENT mark)
- {
--	foreach (const config &cmd, cfg.child_range("command"))
-+	BOOST_FOREACH(const config &cmd, cfg.child_range("command"))
- 	{
- 		config &cfg = cfg_.add_child("command", cmd);
- 		if (cfg.child("speak"))
-@@ -730,7 +730,7 @@
- 	if(! game_config::mp_debug) {
- 		return;
- 	}
--	foreach (const config &ch, cfg.child_range("checksum"))
-+	BOOST_FOREACH(const config &ch, cfg.child_range("checksum"))
- 	{
- 		map_location loc(ch, resources::state_of_game);
- 		unit_map::const_iterator u = resources::units->find(loc);
-@@ -1151,7 +1151,7 @@
- 		}
- 		else if (const config &child = cfg->child("fire_event"))
- 		{
--			foreach (const config &v, child.child_range("set_variable")) {
-+			BOOST_FOREACH(const config &v, child.child_range("set_variable")) {
- 				resources::state_of_game->set_variable(v["name"], v["value"]);
- 			}
- 			const std::string &event = child["raise"];
-Index: src/game_preferences_display.cpp
-===================================================================
---- src/game_preferences_display.cpp	(revision 54624)
-+++ src/game_preferences_display.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- #include "display.hpp"
- #include "filesystem.hpp"
- #include "filechooser.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/simple_item_selector.hpp"
-@@ -30,6 +29,7 @@
- #include "widgets/slider.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace preferences {
- 
-@@ -1071,7 +1071,7 @@
- void preferences_dialog::set_advanced_menu()
- {
- 	std::vector<std::string> advanced_items;
--	foreach (const config &adv, adv_preferences_cfg_)
-+	BOOST_FOREACH(const config &adv, adv_preferences_cfg_)
- 	{
- 		std::ostringstream str;
- 		std::string field = preferences::get(adv["field"]);
-@@ -1096,7 +1096,7 @@
- {
- 	adv_preferences_cfg_.clear();
- 
--	foreach(const config& adv, game_cfg_.child_range("advanced_preference")) {
-+	BOOST_FOREACH(const config& adv, game_cfg_.child_range("advanced_preference")) {
- 		adv_preferences_cfg_.push_back(adv);
- 	}
- 
-Index: src/image.cpp
-===================================================================
---- src/image.cpp	(revision 54624)
-+++ src/image.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "color_range.hpp"
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "image.hpp"
- #include "image_modifications.hpp"
-@@ -36,6 +35,7 @@
- #include "SDL_image.h"
- 
- #include <boost/functional/hash.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <list>
- #include <set>
-@@ -376,7 +376,7 @@
- 		std::string trackpath = get_binary_file_location("", "l10n-track");
- 		std::string contents = read_file(trackpath);
- 		std::vector<std::string> lines = utils::split(contents, '\n');
--		foreach (const std::string &line, lines) {
-+		BOOST_FOREACH(const std::string &line, lines) {
- 			size_t p1 = line.find(fsep);
- 			if (p1 == std::string::npos)
- 				continue;
-@@ -423,7 +423,7 @@
- 	// add en_US with lowest priority, since the message above will
- 	// not have it when translated.
- 	langs.push_back("en_US");
--	foreach (const std::string &lang, langs) {
-+	BOOST_FOREACH(const std::string &lang, langs) {
- 		std::string loc_file = dir + "l10n" + "/" + lang + "/" + loc_base;
- 		if (file_exists(loc_file) && localized_file_uptodate(loc_file)) {
- 			return loc_file;
-Index: src/team.cpp
-===================================================================
---- src/team.cpp	(revision 54624)
-+++ src/team.cpp	(revision 54625)
-@@ -21,13 +21,14 @@
- #include "team.hpp"
- 
- #include "ai/manager.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "gamestatus.hpp"
- #include "resources.hpp"
- #include "game_preferences.hpp"
- #include "whiteboard/side_actions.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -318,7 +319,7 @@
- 	// Was it correct?
- 
- 	// Load in the villages the side controls at the start
--	foreach (const config &v, cfg.child_range("village"))
-+	BOOST_FOREACH(const config &v, cfg.child_range("village"))
- 	{
- 		map_location loc(v, resources::state_of_game);
- 		if (map.is_village(loc)) {
-@@ -397,7 +398,7 @@
- 		return info_.minimum_recruit_price;
- 	}else{
- 		int min = 20;
--		foreach(std::string recruit, info_.can_recruit){
-+		BOOST_FOREACH(std::string recruit, info_.can_recruit){
- 			const unit_type *ut = unit_types.find(recruit);
- 			if(!ut)
- 				continue;
-@@ -605,7 +606,7 @@
- 		return true;
- 	}
- 
--	foreach (const team &t, *teams) {
-+	BOOST_FOREACH(const team &t, *teams) {
- 		if (t.is_human())
- 			return false;
- 	}
-Index: src/config_cache.cpp
-===================================================================
---- src/config_cache.cpp	(revision 54624)
-+++ src/config_cache.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
- #include "game_display.hpp"
-@@ -29,6 +28,7 @@
- #include "serialization/parser.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
- #include <boost/algorithm/string/replace.hpp>
- 
- static lg::log_domain log_cache("cache");
-@@ -113,7 +113,7 @@
- 		config_writer writer(*stream, gzip, game_config::cache_compression_level);
- 
- 		// write all defines to stream
--		foreach (const preproc_map::value_type &define, defines_map) {
-+		BOOST_FOREACH(const preproc_map::value_type &define, defines_map) {
- 			define.second.write(writer, define.first);
- 		}
- 	}
-@@ -262,7 +262,7 @@
- 
- 		// use static preproc_define::read_pair(config) to make a object
- 		// and pass that object config_cache_transaction::insert_to_active method
--		foreach (const config::any_child &value, cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, cfg.all_children_range()) {
- 			config_cache_transaction::instance().insert_to_active(
- 				preproc_define::read_pair(value.cfg));
- 		}
-@@ -271,7 +271,7 @@
- 	void config_cache::read_defines_queue()
- 	{
- 		const config_cache_transaction::filenames& files = config_cache_transaction::instance().get_define_files();
--		foreach (const std::string &path, files) {
-+		BOOST_FOREACH(const std::string &path, files) {
- 			read_defines_file(path);
- 		}
- 	}
-@@ -394,7 +394,7 @@
- 					std::insert_iterator<preproc_map>(temp,temp.begin()),
- 					&compare_define);
- 
--			foreach (const preproc_map::value_type &def, temp) {
-+			BOOST_FOREACH(const preproc_map::value_type &def, temp) {
- 				insert_to_active(def);
- 			}
- 
-Index: src/game_events.cpp
-===================================================================
---- src/game_events.cpp	(revision 54624)
-+++ src/game_events.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "actions.hpp"
- #include "ai/manager.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -60,6 +59,8 @@
- #include <iomanip>
- #include <iostream>
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -341,7 +342,7 @@
- 			std::vector<std::pair<int,int> > counts = (*u).has_attribute("count")
- 				? utils::parse_ranges((*u)["count"]) : default_counts;
- 			int match_count = 0;
--			foreach (const unit &i, *resources::units)
-+			BOOST_FOREACH(const unit &i, *resources::units)
- 			{
- 				if(i.hitpoints() > 0 && unit_matches_filter(i, *u)) {
- 					++match_count;
-@@ -396,7 +397,7 @@
- 		const vconfig::child_list& variables = cond.get_children("variable");
- 		backwards_compat = backwards_compat && variables.empty();
- 
--		foreach (const vconfig &values, variables)
-+		BOOST_FOREACH(const vconfig &values, variables)
- 		{
- 			const std::string name = values["name"];
- 			config::attribute_value value = resources::state_of_game->get_variable_const(name);
-@@ -589,7 +590,7 @@
- 			const std::vector<game_events::event_handler>& handlers,
- 			const std::string& msg) {
- 
--			foreach(const game_events::event_handler& h, handlers){
-+			BOOST_FOREACH(const game_events::event_handler& h, handlers){
- 				const config& cfg = h.get_config();
- 				ss << "name=" << cfg["name"] << ", with id=" << cfg["id"] << "; ";
- 			}
-@@ -603,7 +604,7 @@
- 			std::stringstream ss;
- 			log_handler(ss, active_, "active");
- 			log_handler(ss, insert_buffer_, "insert buffered");
--			foreach(const std::string& h, remove_buffer_){
-+			BOOST_FOREACH(const std::string& h, remove_buffer_){
- 				ss << "id=" << h << "; ";
- 			}
- 			DBG_EH << "remove buffered handlers are now " << ss.str() << "\n";
-@@ -631,7 +632,7 @@
- 				const config & cfg = new_handler.get_config();
- 				std::string id = cfg["id"];
- 				if(!id.empty()) {
--					foreach( game_events::event_handler const & eh, active_) {
-+					BOOST_FOREACH( game_events::event_handler const & eh, active_) {
- 						config const & temp_config( eh.get_config());
- 						if(id == temp_config["id"]) {
- 							DBG_EH << "ignoring event handler for name=" << cfg["name"] <<
-@@ -698,12 +699,12 @@
- 				return;
- 
- 			// Commit any event removals
--			foreach(std::string const & i ,  remove_buffer_ ){
-+			BOOST_FOREACH(std::string const & i ,  remove_buffer_ ){
- 				remove_event_handler( i ); }
- 			remove_buffer_.clear();
- 
- 			// Commit any spawned events-within-events
--			foreach( game_events::event_handler const & i ,  insert_buffer_ ){
-+			BOOST_FOREACH( game_events::event_handler const & i ,  insert_buffer_ ){
- 				add_event_handler( i ); }
- 			insert_buffer_.clear();
- 
-@@ -735,7 +736,7 @@
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
- 	size_t index;
- 
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		index = side_num - 1;
- 		team &t = (*resources::teams)[index];
-@@ -744,7 +745,7 @@
- 		filter.restrict_size(game_config::max_loop);
- 		filter.get_locations(locs, true);
- 
--		foreach (map_location const &loc, locs)
-+		BOOST_FOREACH(map_location const &loc, locs)
- 		{
- 			if (remove) {
- 				t.clear_shroud(loc);
-@@ -774,7 +775,7 @@
- 	const bool remove = utils::string_bool(cfg["remove"], false);
- 	if (remove) {
- 		const std::vector<std::string> ids = utils::split(cfg["id"]);
--		foreach(const std::string &id, ids) {
-+		BOOST_FOREACH(const std::string &id, ids) {
- 			resources::tunnels->remove(id);
- 		}
- 	} else if (cfg.get_children("source").empty() ||
-@@ -941,7 +942,7 @@
- WML_HANDLER_FUNCTION(modify_ai, /*event_info*/, cfg)
- {
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		ai::manager::modify_active_ai_for_side(side_num,cfg.get_parsed_config());
- 	}
-@@ -967,7 +968,7 @@
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
- 	size_t team_index;
- 
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		team_index = side_num - 1;
- 		LOG_NG << "modifying side: " << side_num << "\n";
-@@ -1212,7 +1213,7 @@
- 
- 	size_t longest_path = 0;
- 
--	foreach(const vconfig& config, unit_cfgs) {
-+	BOOST_FOREACH(const vconfig& config, unit_cfgs) {
- 		const std::vector<std::string> xvals = utils::split(config["x"]);
- 		const std::vector<std::string> yvals = utils::split(config["y"]);
- 		int skip_steps = config["skip_steps"];
-@@ -1461,7 +1462,7 @@
- 
- 		variable_info vi(array_name, true, variable_info::TYPE_ARRAY);
- 		bool first = true;
--		foreach (const config &cfg, vi.as_array())
-+		BOOST_FOREACH(const config &cfg, vi.as_array())
- 		{
- 			std::string current_string = cfg[key_name];
- 			if (remove_empty && current_string.empty()) continue;
-@@ -1589,7 +1590,7 @@
- 				dest.vars->merge_with(data);
- 			}
- 		} else if(mode == "insert" || dest.explicit_index) {
--			foreach (const config &child, data.child_range(dest.key))
-+			BOOST_FOREACH(const config &child, data.child_range(dest.key))
- 			{
- 				dest.vars->add_child_at(dest.key, child, dest.index++);
- 			}
-@@ -1619,7 +1620,7 @@
- 			item["type"] = *ti;
- 		}
- 		unit_map::iterator itor;
--		foreach (unit &u, *resources::units) {
-+		BOOST_FOREACH(unit &u, *resources::units) {
- 			if (game_events::unit_matches_filter(u, filter)) {
- 				u.set_role(cfg["role"]);
- 				found = true;
-@@ -1632,7 +1633,7 @@
- 		std::set<std::string> player_ids;
- 		std::vector<std::string> sides = utils::split(cfg["side"]);
- 		const bool has_any_sides = !sides.empty();
--		foreach(std::string const& side_str, sides) {
-+		BOOST_FOREACH(std::string const& side_str, sides) {
- 			size_t side_num = lexical_cast_default<size_t>(side_str,0);
- 			if(side_num > 0 && side_num <= resources::teams->size()) {
- 				player_ids.insert((resources::teams->begin() + (side_num - 1))->save_id());
-@@ -1699,7 +1700,7 @@
- 	game_map->set_terrain(loc, new_t);
- 	screen_needs_rebuild = true;
- 
--	foreach (const t_translation::t_terrain &ut, game_map->underlying_union_terrain(loc)) {
-+	BOOST_FOREACH(const t_translation::t_terrain &ut, game_map->underlying_union_terrain(loc)) {
- 		preferences::encountered_terrains().insert(ut);
- 	}
- }
-@@ -1820,7 +1821,7 @@
- 				const map_location cfg_loc = cfg_to_loc(cfg);
- 
- 				//TODO fendrin: comment this monster
--				foreach (unit_map::const_unit_iterator leader, leaders) {
-+				BOOST_FOREACH(unit_map::const_unit_iterator leader, leaders) {
- 					DBG_NG << "...considering " + leader->id() + " as the recalling leader...\n";
- 					map_location loc = cfg_loc;
- 					if ( (leader_filter.null() || leader->matches_filter(leader_filter, leader->get_location())) &&
-@@ -1879,7 +1880,7 @@
- 
- 	map_location loc;
- 	if(!filter.null()) {
--		foreach (const unit &u, *resources::units) {
-+		BOOST_FOREACH(const unit &u, *resources::units) {
- 			if (game_events::unit_matches_filter(u, filter)) {
- 				loc = u.get_location();
- 				break;
-@@ -1926,7 +1927,7 @@
- 		}
- 	}
- 
--	foreach (const vconfig &cmd, cfg.get_children(command_type)) {
-+	BOOST_FOREACH(const vconfig &cmd, cfg.get_children(command_type)) {
- 		handle_event_commands(event_info, cmd);
- 	}
- }
-@@ -2029,13 +2030,13 @@
- 	std::vector<unit *> dead_men_walking;
- 	// unit_map::iterator uit(resources::units->begin()), uend(resources::units->end());
- 	// for(;uit!=uend; ++uit){
--	foreach(unit & u, *resources::units){
-+	BOOST_FOREACH(unit & u, *resources::units){
- 		if(game_events::unit_matches_filter(u, cfg)){
- 			dead_men_walking.push_back(&u);
- 		}
- 	}
- 
--	foreach(unit * un, dead_men_walking) {
-+	BOOST_FOREACH(unit * un, dead_men_walking) {
- 		map_location loc(un->get_location());
- 		bool fire_event = false;
- 		game_events::entity_location death_loc(*un);
-@@ -2429,7 +2430,7 @@
- 
- 	if (clear_shroud_bool) {
- 		side_filter filter(cfg);
--		foreach(const int side, filter.get_teams()){
-+		BOOST_FOREACH(const int side, filter.get_teams()){
- 			clear_shroud(side);
- 		}
- 		screen.recalculate_minimap();
-@@ -2466,7 +2467,7 @@
- 	const vconfig healers_filter = cfg.child("filter_second");
- 	std::vector<unit*> healers;
- 	if (!healers_filter.null()) {
--		foreach (unit& u, *units) {
-+		BOOST_FOREACH(unit& u, *units) {
- 			if (game_events::unit_matches_filter(u, healers_filter) && u.has_ability_type("heals")) {
- 				healers.push_back(&u);
- 			}
-@@ -2835,7 +2836,7 @@
- 			return;
- 		}
- 
--		foreach (const vconfig &cmd, option_events[option_chosen]) {
-+		BOOST_FOREACH(const vconfig &cmd, option_events[option_chosen]) {
- 			handle_event_commands(event_info, cmd);
- 		}
- 	}
-@@ -2858,7 +2859,7 @@
- 	if(remove) {
- 		const std::vector<std::string> id_list =
- 			utils::split(ids, ',', utils::STRIP_SPACES | utils::REMOVE_EMPTY);
--		foreach(const std::string& id, id_list) {
-+		BOOST_FOREACH(const std::string& id, id_list) {
- 			resources::tod_manager->remove_time_area(id);
- 			LOG_NG << "event WML removed time_area '" << id << "'\n";
- 		}
-@@ -2997,7 +2998,7 @@
- 			if(is_empty_command) {
- 				mref->command.add_child("allow_undo");
- 			}
--			foreach(game_events::event_handler& hand, event_handlers) {
-+			BOOST_FOREACH(game_events::event_handler& hand, event_handlers) {
- 				if(hand.is_menu_item() && hand.matches_name(mref->name)) {
- 					LOG_NG << "changing command for " << mref->name << " to:\n" << *wcc.second;
- 					hand = game_events::event_handler(mref->command, true);
-@@ -3029,14 +3030,14 @@
- 	vconfig filters(handler.get_config());
- 
- 
--	foreach (const vconfig &condition, filters.get_children("filter_condition"))
-+	BOOST_FOREACH(const vconfig &condition, filters.get_children("filter_condition"))
- 	{
- 		if (!game_events::conditional_passed(condition)) {
- 			return false;
- 		}
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter"))
- 	{
- 		if (unit1 == units->end() || !game_events::unit_matches_filter(*unit1, f)) {
- 			return false;
-@@ -3046,7 +3047,7 @@
- 		}
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter_side"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter_side"))
- 	{
- 		side_filter ssf(f);
- 		const int current_side = resources::controller->current_side();
-@@ -3055,7 +3056,7 @@
- 
- 	vconfig::child_list special_filters = filters.get_children("filter_attack");
- 	bool special_matches = special_filters.empty();
--	foreach (const vconfig &f, special_filters)
-+	BOOST_FOREACH(const vconfig &f, special_filters)
- 	{
- 		if (unit1 != units->end() && game_events::matches_special_filter(ev.data.child("first"), f)) {
- 			special_matches = true;
-@@ -3068,7 +3069,7 @@
- 		return false;
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter_second"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter_second"))
- 	{
- 		if (unit2 == units->end() || !game_events::unit_matches_filter(*unit2, f)) {
- 			return false;
-@@ -3080,7 +3081,7 @@
- 
- 	special_filters = filters.get_children("filter_second_attack");
- 	special_matches = special_filters.empty();
--	foreach (const vconfig &f, special_filters)
-+	BOOST_FOREACH(const vconfig &f, special_filters)
- 	{
- 		if (unit2 != units->end() && game_events::matches_special_filter(ev.data.child("second"), f)) {
- 			special_matches = true;
-@@ -3275,17 +3276,17 @@
- 		: variable_manager()
- 	{
- 		assert(!manager_running);
--		foreach (const config &ev, cfg.child_range("event")) {
-+		BOOST_FOREACH(const config &ev, cfg.child_range("event")) {
- 			event_handlers.add_event_handler(game_events::event_handler(ev));
- 		}
--		foreach (const std::string &id, utils::split(cfg["unit_wml_ids"])) {
-+		BOOST_FOREACH(const std::string &id, utils::split(cfg["unit_wml_ids"])) {
- 			unit_wml_ids.insert(id);
- 		}
- 
- 		resources::lua_kernel = new LuaKernel(cfg);
- 		manager_running = true;
- 
--		foreach (static_wml_action_map::value_type &action, static_wml_actions) {
-+		BOOST_FOREACH(static_wml_action_map::value_type &action, static_wml_actions) {
- 			resources::lua_kernel->set_wml_action(action.first, action.second);
- 		}
- 
-@@ -3298,7 +3299,7 @@
- 		}
- 		int wmi_count = 0;
- 		typedef std::pair<std::string, wml_menu_item *> item;
--		foreach (const item &itor, resources::state_of_game->wml_menu_items) {
-+		BOOST_FOREACH(const item &itor, resources::state_of_game->wml_menu_items) {
- 			if (!itor.second->command.empty()) {
- 				event_handlers.add_event_handler(game_events::event_handler(itor.second->command, true));
- 			}
-@@ -3312,7 +3313,7 @@
- 	void write_events(config& cfg)
- 	{
- 		assert(manager_running);
--		foreach (const game_events::event_handler &eh, event_handlers) {
-+		BOOST_FOREACH(const game_events::event_handler &eh, event_handlers) {
- 			if (eh.disabled() || eh.is_menu_item()) continue;
- 			cfg.add_child("event", eh.get_config());
- 		}
-@@ -3385,7 +3386,7 @@
- 			if(std::find(unit_wml_ids.begin(),unit_wml_ids.end(),type) != unit_wml_ids.end()) return;
- 			unit_wml_ids.insert(type);
- 		}
--		foreach (const config &new_ev, cfgs) {
-+		BOOST_FOREACH(const config &new_ev, cfgs) {
- 			if(type.empty() && new_ev["id"].empty())
- 			{
- 				WRN_NG << "attempt to add an [event] with empty id=, ignoring \n";
-@@ -3427,7 +3428,7 @@
- 
- 		if(!lg::debug.dont_log("event_handler")) {
- 			std::stringstream ss;
--			foreach(const game_events::queued_event& ev, events_queue) {
-+			BOOST_FOREACH(const game_events::queued_event& ev, events_queue) {
- 				ss << "name=" << ev.name << "; ";
- 			}
- 			DBG_EH << "processing queued events: " << ss.str() << "\n";
-@@ -3454,7 +3455,7 @@
- 
- 			bool init_event_vars = true;
- 
--			foreach(game_events::event_handler& handler, event_handlers) {
-+			BOOST_FOREACH(game_events::event_handler& handler, event_handlers) {
- 				if(!handler.matches_name(event_name))
- 					continue;
- 				// Set the variables for the event
-Index: src/formula_tokenizer.cpp
-===================================================================
---- src/formula_tokenizer.cpp	(revision 54624)
-+++ src/formula_tokenizer.cpp	(revision 54625)
-@@ -13,7 +13,6 @@
- 
- #include <sstream>
- 
--#include "foreach.hpp"
- #include "formula_tokenizer.hpp"
- 
- namespace formula_tokenizer
-Index: src/playcampaign.cpp
-===================================================================
---- src/playcampaign.cpp	(revision 54624)
-+++ src/playcampaign.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/message.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -41,6 +40,8 @@
- #include "wml_exception.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #define LOG_G LOG_STREAM(info, lg::general)
- 
- static lg::log_domain log_engine("engine");
-@@ -260,7 +261,7 @@
- 	controller_map controllers;
- 
- 	if(io_type == IO_SERVER) {
--		foreach (config &side, const_cast<config *>(scenario)->child_range("side"))
-+		BOOST_FOREACH(config &side, const_cast<config *>(scenario)->child_range("side"))
- 		{
- 			if (side["current_player"] == preferences::login()) {
- 				side["controller"] = preferences::client_type();
-@@ -280,7 +281,7 @@
- 				scenario = &starting_pos;
- 			}
- 
--			foreach (config &side, starting_pos.child_range("side"))
-+			BOOST_FOREACH(config &side, starting_pos.child_range("side"))
- 			{
- 				if (side["current_player"] == preferences::login()) {
- 					side["controller"] = preferences::client_type();
-@@ -474,7 +475,7 @@
- 
- 			if(io_type == IO_SERVER && scenario != NULL) {
- 				// Tweaks sides to adapt controllers and descriptions.
--				foreach (config &side, starting_pos.child_range("side"))
-+				BOOST_FOREACH(config &side, starting_pos.child_range("side"))
- 				{
- 					std::string id = side["save_id"];
- 					if(id.empty()) {
-@@ -547,7 +548,7 @@
- 				next_cfg.add_child("replay_start", gamestate.starting_pos);
- 				//move side information from gamestate into the config that is sent to the other clients
- 				next_cfg.clear_children("side");
--				foreach (config& side, gamestate.starting_pos.child_range("side"))
-+				BOOST_FOREACH(config& side, gamestate.starting_pos.child_range("side"))
- 					next_cfg.add_child("side", side);
- 
- 				network::send_data(cfg, 0);
-Index: src/multiplayer.cpp
-===================================================================
---- src/multiplayer.cpp	(revision 54624)
-+++ src/multiplayer.cpp	(revision 54625)
-@@ -40,6 +40,7 @@
- #include "unit_id.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -573,7 +574,7 @@
- 	while (true) {
- 		const config &cfg = game_config.child("lobby_music");
- 		if (cfg) {
--			foreach (const config &i, cfg.child_range("music")) {
-+			BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 				sound::play_music_config(i);
- 			}
- 			sound::commit_music_changes();
-Index: src/terrain_filter.cpp
-===================================================================
---- src/terrain_filter.cpp	(revision 54624)
-+++ src/terrain_filter.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "actions.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "resources.hpp"
-@@ -27,6 +26,8 @@
- #include "tod_manager.hpp"
- #include "variable.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- 
-@@ -129,7 +130,7 @@
- 				}
- 			} else {
- 				bool found = false;
--				foreach (const config &cfg, vi.as_array()) {
-+				BOOST_FOREACH(const config &cfg, vi.as_array()) {
- 					if (map_location(cfg, NULL) == loc) {
- 						found = true;
- 						break;
-@@ -358,7 +359,7 @@
- 			}
- 		} else {
- 			std::set<map_location> findin_locs;
--			foreach (const config &cfg, vi.as_array()) {
-+			BOOST_FOREACH(const config &cfg, vi.as_array()) {
- 				map_location test_loc(cfg, NULL);
- 				if (xy_set.count(test_loc)) {
- 					findin_locs.insert(test_loc);
-Index: src/playturn.cpp
-===================================================================
---- src/playturn.cpp	(revision 54624)
-+++ src/playturn.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "playturn.hpp"
- 
- #include "construct_dialog.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -31,6 +30,8 @@
- #include "formula_string_utils.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <ctime>
- 
- static lg::log_domain log_network("network");
-@@ -124,11 +125,11 @@
- 				preferences::message_bell());
- 	}
- 
--	foreach (const config &ob, cfg.child_range("observer")) {
-+	BOOST_FOREACH(const config &ob, cfg.child_range("observer")) {
- 		resources::screen->add_observer(ob["name"]);
- 	}
- 
--	foreach (const config &ob, cfg.child_range("observer_quit")) {
-+	BOOST_FOREACH(const config &ob, cfg.child_range("observer_quit")) {
- 		resources::screen->remove_observer(ob["name"]);
- 	}
- 
-@@ -147,7 +148,7 @@
- 	const config& change = cfg.child_or_empty("change_controller");
- 	const std::string& side_drop = cfg["side_drop"].str();
- 
--	foreach (const config &t, turns)
-+	BOOST_FOREACH(const config &t, turns)
- 	{
- 		handle_turn(turn_end, t, skip_replay, backlog);
- 	}
-@@ -240,7 +241,7 @@
- 			options.push_back(_("Abort game"));
- 
- 			//get all observers in as options to transfer control
--			foreach (const std::string &ob, resources::screen->observers())
-+			BOOST_FOREACH(const std::string &ob, resources::screen->observers())
- 			{
- 				t_vars["player"] = ob;
- 				options.push_back(vgettext("Replace with $player", t_vars));
-@@ -248,7 +249,7 @@
- 			}
- 
- 			//get all allies in as options to transfer control
--			foreach (team &t, *resources::teams)
-+			BOOST_FOREACH(team &t, *resources::teams)
- 			{
- 				if (!t.is_enemy(side) && !t.is_human() && !t.is_ai() && !t.is_empty()
- 					&& t.current_player() != tm.current_player())
-Index: src/tod_manager.cpp
-===================================================================
---- src/tod_manager.cpp	(revision 54624)
-+++ src/tod_manager.cpp	(revision 54625)
-@@ -12,7 +12,6 @@
-    See the COPYING file for more details.
-  */
- 
--#include "foreach.hpp"
- #include "tod_manager.hpp"
- #include "wml_exception.hpp"
- #include "gettext.hpp"
-@@ -25,6 +24,8 @@
- #include "unit.hpp"
- #include "unit_abilities.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -279,7 +280,7 @@
- void tod_manager::set_new_current_times(const int new_current_turn_number)
- {
- 	currentTime_ = calculate_current_time(times_.size(), new_current_turn_number, currentTime_);
--	foreach(area_time_of_day& area, areas_) {
-+	BOOST_FOREACH(area_time_of_day& area, areas_) {
- 		area.currentTime = calculate_current_time(
- 			area.times.size(),
- 			new_current_turn_number,
-Index: src/multiplayer_create.cpp
-===================================================================
---- src/multiplayer_create.cpp	(revision 54624)
-+++ src/multiplayer_create.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
- 
-@@ -127,7 +128,7 @@
- 
- 	// Standard maps
- 	i = 0;
--	foreach (const config &j, cfg.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &j, cfg.child_range("multiplayer"))
- 	{
- 		if (j["allow_new_game"].to_bool(true))
- 		{
-@@ -217,7 +218,7 @@
- 
- 	// The possible eras to play
- 	std::vector<std::string> eras;
--	foreach (const config &er, cfg.child_range("era")) {
-+	BOOST_FOREACH(const config &er, cfg.child_range("era")) {
- 		eras.push_back(er["name"]);
- 	}
- 	if(eras.empty()) {
-@@ -547,7 +548,7 @@
- 		}
- 
- 		int nsides = 0;
--		foreach (const config &k, parameters_.scenario_data.child_range("side")) {
-+		BOOST_FOREACH(const config &k, parameters_.scenario_data.child_range("side")) {
- 			if (k["allow_player"].to_bool(true)) ++nsides;
- 		}
- 
-Index: src/commandline_options.cpp
-===================================================================
---- src/commandline_options.cpp	(revision 54624)
-+++ src/commandline_options.cpp	(revision 54625)
-@@ -14,12 +14,12 @@
- */
- 
- #include "commandline_options.hpp"
--#include "foreach.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
- #include "lua/llimits.h"
- 
- #include <boost/version.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace po = boost::program_options;
- 
-@@ -374,7 +374,7 @@
- void commandline_options::parse_log_domains_(const std::string &domains_string, const int severity)
- {
- 	const std::vector<std::string> domains = utils::split(domains_string, ',');
--	foreach (const std::string& domain, domains)
-+	BOOST_FOREACH(const std::string& domain, domains)
- 	{
- 		if (!log)
- 			log = std::vector<boost::tuple<int, std::string> >();
-@@ -396,7 +396,7 @@
- {
- 	std::vector<boost::tuple<unsigned int,std::string> > vec;
- 	boost::tuple<unsigned int,std::string> elem;
--	foreach(const std::string &s, strings)
-+	BOOST_FOREACH(const std::string &s, strings)
- 	{
- 		const std::vector<std::string> tokens = utils::split(s, separator);
- 		if (tokens.size()!=2)
-@@ -415,7 +415,7 @@
- {
- 	std::vector<boost::tuple<unsigned int,std::string,std::string> > vec;
- 	boost::tuple<unsigned int,std::string,std::string> elem;
--	foreach(const std::string &s, strings)
-+	BOOST_FOREACH(const std::string &s, strings)
- 	{
- 		const std::vector<std::string> tokens = utils::split(s, separator);
- 		if (tokens.size()!=3)
-Index: src/gui/dialogs/editor_set_starting_position.cpp
-===================================================================
---- src/gui/dialogs/editor_set_starting_position.cpp	(revision 54624)
-+++ src/gui/dialogs/editor_set_starting_position.cpp	(revision 54625)
-@@ -17,7 +17,7 @@
- 
- #include "gui/dialogs/editor_set_starting_position.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- #include "formatter.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
-Index: src/gui/dialogs/gamestate_inspector.cpp
-===================================================================
---- src/gui/dialogs/gamestate_inspector.cpp	(revision 54624)
-+++ src/gui/dialogs/gamestate_inspector.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../gamestatus.hpp"
- #include "../../resources.hpp"
- #include "../../team.hpp"
-@@ -36,6 +35,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -189,11 +189,11 @@
- 				? resources::state_of_game->get_variables()
- 				: config();
- 
--		foreach( const config::attribute &a, vars.attribute_range()) {
-+		BOOST_FOREACH( const config::attribute &a, vars.attribute_range()) {
- 			model_.add_row_to_stuff_list(a.first,a.first);
- 		}
- 
--		foreach( const config::any_child &c, vars.all_children_range()) {
-+		BOOST_FOREACH( const config::any_child &c, vars.all_children_range()) {
- 			model_.add_row_to_stuff_list("["+c.key+"]","["+c.key+"]");
- 		}
- 
-@@ -214,7 +214,7 @@
- 				? resources::state_of_game->get_variables()
- 				: config();
- 
--		foreach( const config::attribute &a, vars.attribute_range()) {
-+		BOOST_FOREACH( const config::attribute &a, vars.attribute_range()) {
- 			if (selected==i) {
- 				model_.set_inspect_window_text(a.second);
- 				return;
-@@ -222,7 +222,7 @@
- 			i++;
- 		}
- 
--		foreach( const config::any_child &c, vars.all_children_range()) {
-+		BOOST_FOREACH( const config::any_child &c, vars.all_children_range()) {
- 			if (selected==i) {
- 				model_.set_inspect_window_text(c.cfg.debug());
- 				return;
-@@ -268,7 +268,7 @@
- 					<< '/' << i->max_experience() << " xp; "
- 					<< i->hitpoints() << '/' << i->max_hitpoints()
- 					<< " hp; ";
--				foreach (const std::string &str, i->get_traits_list()) {
-+				BOOST_FOREACH(const std::string &str, i->get_traits_list()) {
- 					s << str <<" ";
- 				}
- 
-@@ -371,9 +371,9 @@
- 					: std::vector<unit>();
- 
- 			std::stringstream s;
--			foreach (const unit &u, recall_list) {
-+			BOOST_FOREACH(const unit &u, recall_list) {
- 				s << "id=["<<u.id() << "] "<<u.type_id() << "; L"<<u.level()<<"; " << u.experience() <<"/" << u.max_experience()<< " xp "<< std::endl;
--				foreach (const std::string &str, u.get_traits_list() ) {
-+				BOOST_FOREACH(const std::string &str, u.get_traits_list() ) {
- 					s << "\t" << str<< std::endl;
- 				}
- 				s << std::endl << std::endl;
-@@ -388,7 +388,7 @@
- 					: std::vector<unit>();
- 
- 			config c;
--			foreach (const unit &u, recall_list) {
-+			BOOST_FOREACH(const unit &u, recall_list) {
- 				config c_unit;
- 				u.write(c_unit);
- 				c.add_child("unit",c_unit);
-@@ -423,7 +423,7 @@
- 						<< i->max_experience() << " xp; "
- 						<< i->hitpoints() << '/'
- 						<< i->max_hitpoints()<<" hp.\n";
--					foreach (const std::string &str, i->get_traits_list() ) {
-+					BOOST_FOREACH(const std::string &str, i->get_traits_list() ) {
- 						s << "\t" << str<< std::endl;
- 					}
- 					s << std::endl << std::endl;
-@@ -457,7 +457,7 @@
- 				boost::shared_ptr<single_mode_controller>(new variable_mode_controller("variables",model_)));
- 		sm_controllers_.push_back(
- 				boost::shared_ptr<single_mode_controller>(new unit_mode_controller("units",model_)));
--		//foreach team
-+		//BOOST_FOREACHteam
- 		int sides = resources::teams
- 				? static_cast<int>((*resources::teams).size())
- 				: 0;
-@@ -481,7 +481,7 @@
- 	void show_stuff_types_list()
- 	{
- 		model_.clear_stuff_types_list();
--		foreach (boost::shared_ptr<single_mode_controller> sm_controller, sm_controllers_ ) {
-+		BOOST_FOREACH(boost::shared_ptr<single_mode_controller> sm_controller, sm_controllers_ ) {
- 			model_.add_row_to_stuff_types_list(sm_controller->name(),sm_controller->name());
- 		}
- 	}
-Index: src/gui/dialogs/unit_attack.cpp
-===================================================================
---- src/gui/dialogs/unit_attack.cpp	(revision 54624)
-+++ src/gui/dialogs/unit_attack.cpp	(revision 54625)
-@@ -27,6 +27,8 @@
- #include "gui/widgets/window.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -106,7 +108,7 @@
- 	const config empty;
- 	attack_type no_weapon(empty);
- 
--	foreach(const battle_context& weapon, weapons) {
-+	BOOST_FOREACH(const battle_context& weapon, weapons) {
- 		const battle_context_unit_stats& attacker =
- 				weapon.get_attacker_stats();
- 
-Index: src/gui/dialogs/data_manage.cpp
-===================================================================
---- src/gui/dialogs/data_manage.cpp	(revision 54624)
-+++ src/gui/dialogs/data_manage.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/data_manage.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_config.hpp"
- #include "game_preferences.hpp"
-@@ -43,6 +42,7 @@
- 
- #include <cctype>
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -101,7 +101,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "persist_list", false);
- 	list.clear();
- 
--	foreach(const savegame::save_info game, games) {
-+	BOOST_FOREACH(const savegame::save_info game, games) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-@@ -142,7 +142,7 @@
- 				find_widget<tlabel>(*it, "filename", false);
- 
- 			bool found = false;
--			foreach (const std::string& word, words){
-+			BOOST_FOREACH(const std::string& word, words){
- 				found = std::search(filename_label.label().str().begin()
- 						, filename_label.label().str().end()
- 						, word.begin(), word.end()
-Index: src/gui/dialogs/dialog.cpp
-===================================================================
---- src/gui/dialogs/dialog.cpp	(revision 54624)
-+++ src/gui/dialogs/dialog.cpp	(revision 54625)
-@@ -17,16 +17,17 @@
- 
- #include "gui/dialogs/dialog.hpp"
- 
--#include "foreach.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/integer_selector.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- tdialog::~tdialog()
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		delete field;
- 	}
- }
-@@ -193,7 +194,7 @@
- 
- void tdialog::init_fields(twindow& window)
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		field->attach_to_window(window);
- 		field->widget_init(window);
- 	}
-@@ -207,7 +208,7 @@
- 
- void tdialog::finalize_fields(twindow& window, const bool save_fields)
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		if(save_fields) {
- 			field->widget_finalize(window);
- 		}
-Index: src/gui/dialogs/debug_clock.cpp
-===================================================================
---- src/gui/dialogs/debug_clock.cpp	(revision 54624)
-+++ src/gui/dialogs/debug_clock.cpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/widgets/progress_bar.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <ctime>
- 
-@@ -153,7 +154,7 @@
- 	}
- 
- 	if(clock_) {
--		foreach(tcanvas& canvas, clock_->canvas()) {
-+		BOOST_FOREACH(tcanvas& canvas, clock_->canvas()) {
- 			canvas.set_variable("hour", variant(hour_stamp));
- 			canvas.set_variable("minute", variant(minute_stamp));
- 			canvas.set_variable("second", variant(second_stamp));
-Index: src/gui/dialogs/wml_message.cpp
-===================================================================
---- src/gui/dialogs/wml_message.cpp	(revision 54624)
-+++ src/gui/dialogs/wml_message.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/wml_message.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/old_markup.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/label.hpp"
-Index: src/gui/dialogs/simple_item_selector.cpp
-===================================================================
---- src/gui/dialogs/simple_item_selector.cpp	(revision 54624)
-+++ src/gui/dialogs/simple_item_selector.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/simple_item_selector.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/label.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
-@@ -28,6 +27,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -79,7 +80,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "listbox", false);
- 	window.keyboard_capture(&list);
- 
--	foreach(const tsimple_item_selector::item_type& it, items_) {
-+	BOOST_FOREACH(const tsimple_item_selector::item_type& it, items_) {
- 		std::map<std::string, string_map> data;
- 		string_map column;
- 
-Index: src/gui/dialogs/game_load.cpp
-===================================================================
---- src/gui/dialogs/game_load.cpp	(revision 54624)
-+++ src/gui/dialogs/game_load.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/game_load.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
-@@ -43,6 +42,7 @@
- 
- #include <cctype>
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -151,7 +151,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "savegame_list", false);
- 	list.clear();
- 
--	foreach(const savegame::save_info game, games) {
-+	BOOST_FOREACH(const savegame::save_info game, games) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-@@ -193,7 +193,7 @@
- 				find_widget<tlabel>(*it, "filename", false);
- 
- 			bool found = false;
--			foreach (const std::string& word, words){
-+			BOOST_FOREACH(const std::string& word, words){
- 				found = std::search(filename_label.label().str().begin()
- 						, filename_label.label().str().end()
- 						, word.begin(), word.end()
-Index: src/gui/dialogs/lobby_main.cpp
-===================================================================
---- src/gui/dialogs/lobby_main.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby_main.cpp	(revision 54625)
-@@ -38,7 +38,6 @@
- #include "gui/widgets/toggle_panel.hpp"
- #include "gui/widgets/tree_view_node.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -50,6 +49,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define DBG_NW LOG_STREAM(debug, log_network)
-@@ -499,14 +499,14 @@
- void modify_grid_with_data(tgrid* grid, const std::map<std::string, string_map>& map)
- {
- 	typedef std::map<std::string, string_map> strstrmap;
--	foreach (const strstrmap::value_type v, map) {
-+	BOOST_FOREACH(const strstrmap::value_type v, map) {
- 		const std::string& key = v.first;
- 		const string_map& strmap = v.second;
- 		twidget* w = grid->find(key, false);
- 		if (w == NULL) continue;
- 		tcontrol* c = dynamic_cast<tcontrol*>(w);
- 		if (c == NULL) continue;
--		foreach (const string_map::value_type& vv, strmap) {
-+		BOOST_FOREACH(const string_map::value_type& vv, strmap) {
- 			if (vv.first == "label") {
- 				c->set_label(vv.second);
- 			} else if (vv.first == "tooltip") {
-@@ -816,7 +816,7 @@
- 	player_list_.other_games.tree->clear();
- 	player_list_.other_rooms.tree->clear();
- 
--	foreach (user_info* userptr, lobby_info_.users_sorted())
-+	BOOST_FOREACH(user_info* userptr, lobby_info_.users_sorted())
- 	{
- 		user_info& user = *userptr;
- 		tsub_player_list* target_list(NULL);
-@@ -1093,7 +1093,7 @@
- 
- tlobby_chat_window* tlobby_main::search_create_window(const std::string& name, bool whisper, bool open_new)
- {
--	foreach (tlobby_chat_window& t, open_windows_) {
-+	BOOST_FOREACH(tlobby_chat_window& t, open_windows_) {
- 		if (t.name == name && t.whisper == whisper) return &t;
- 	}
- 	if (open_new) {
-@@ -1477,7 +1477,7 @@
- 			//TODO: this should really open a nice join room dialog instead
- 			std::stringstream ss;
- 			ss << "Rooms:";
--			foreach (const config& r, rooms.child_range("room")) {
-+			BOOST_FOREACH(const config& r, rooms.child_range("room")) {
- 				ss << " " << r["name"];
- 			}
- 			add_active_window_message("server", ss.str());
-@@ -1667,7 +1667,7 @@
- 		const std::vector<user_info>& match_infos = lobby_info_.users();
- 		std::vector<std::string> matches;
- 
--		foreach(const user_info& ui, match_infos) {
-+		BOOST_FOREACH(const user_info& ui, match_infos) {
- 			if(ui.name != preferences::login()) {
- 				matches.push_back(ui.name);
- 			}
-@@ -1694,7 +1694,7 @@
- {
- 	lobby_info_.clear_game_filter();
- 
--	foreach (const std::string& s, utils::split(filter_text_->get_value(), ' ')) {
-+	BOOST_FOREACH(const std::string& s, utils::split(filter_text_->get_value(), ' ')) {
- 		lobby_info_.add_game_filter(new game_filter_general_string_part(s));
- 	}
- 	//TODO: make changing friend/ignore lists trigger a refresh
-Index: src/gui/dialogs/campaign_difficulty.cpp
-===================================================================
---- src/gui/dialogs/campaign_difficulty.cpp	(revision 54624)
-+++ src/gui/dialogs/campaign_difficulty.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/campaign_difficulty.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/old_markup.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- 	#include "gui/widgets/list.hpp"
-@@ -27,6 +26,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -65,7 +66,7 @@
- tcampaign_difficulty::tcampaign_difficulty(const std::vector<std::string>& items)
- 	: index_(-1), items_()
- {
--	foreach(const std::string& it, items) {
-+	BOOST_FOREACH(const std::string& it, items) {
- 		items_.push_back(tlegacy_menu_item(it));
- 	}
- }
-@@ -77,7 +78,7 @@
- 
- 	std::map<std::string, string_map> data;
- 
--	foreach(const tlegacy_menu_item& item, items_) {
-+	BOOST_FOREACH(const tlegacy_menu_item& item, items_) {
- 		if(item.is_default()) {
- 			index_ = list.get_item_count();
- 		}
-Index: src/gui/dialogs/unit_create.cpp
-===================================================================
---- src/gui/dialogs/unit_create.cpp	(revision 54624)
-+++ src/gui/dialogs/unit_create.cpp	(revision 54625)
-@@ -27,9 +27,10 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/window.hpp"
--#include "foreach.hpp"
- #include "unit_types.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 	static std::string last_chosen_type_id = "";
- 	static unit_race::GENDER last_gender = unit_race::MALE;
-@@ -109,7 +110,7 @@
- 
- 	std::vector< std::string > type_labels, race_labels;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		unit_types.find(i.first, unit_type::HELP_INDEX);
- 
-Index: src/gui/dialogs/formula_debugger.cpp
-===================================================================
---- src/gui/dialogs/formula_debugger.cpp	(revision 54624)
-+++ src/gui/dialogs/formula_debugger.cpp	(revision 54625)
-@@ -21,10 +21,10 @@
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
--#include "../../foreach.hpp"
- #include "../../formula_debugger.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -73,7 +73,7 @@
- 	std::stringstream stack_text;
- 	std::string indent = "  ";
- 	int c = 0;
--	foreach (const game_logic::debug_info &i, fdb_.get_call_stack()) {
-+	BOOST_FOREACH(const game_logic::debug_info &i, fdb_.get_call_stack()) {
- 		for(int d = 0; d < c; ++d) {
- 			stack_text << indent;
- 		}
-@@ -92,7 +92,7 @@
- 			&window, "execution", false, true);
- 
- 	std::stringstream execution_text;
--	foreach (const game_logic::debug_info &i, fdb_.get_execution_trace()) {
-+	BOOST_FOREACH(const game_logic::debug_info &i, fdb_.get_execution_trace()) {
- 		for(int d = 0; d < i.level(); ++d) {
- 			execution_text << indent;
- 		}
-Index: src/gui/dialogs/title_screen.cpp
-===================================================================
---- src/gui/dialogs/title_screen.cpp	(revision 54624)
-+++ src/gui/dialogs/title_screen.cpp	(revision 54625)
-@@ -35,6 +35,7 @@
- #include "preferences_display.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <algorithm>
- 
-@@ -306,7 +307,7 @@
- 		WRN_CF << "There are not tips of day available.\n";
- 	}
- 
--	foreach(const ttip& tip, tips) {
-+	BOOST_FOREACH(const ttip& tip, tips) {
- 
- 		string_map widget;
- 		std::map<std::string, string_map> page;
-Index: src/gui/dialogs/addon_list.cpp
-===================================================================
---- src/gui/dialogs/addon_list.cpp	(revision 54624)
-+++ src/gui/dialogs/addon_list.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/addon_list.hpp"
- 
--#include "foreach.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include "gui/widgets/list.hpp"
- #else
-@@ -26,6 +25,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -70,7 +71,7 @@
- 	 * @todo do we really want to keep the length limit for the various
- 	 * items?
- 	 */
--	foreach(const config &c, cfg_.child_range("campaign")) {
-+	BOOST_FOREACH(const config &c, cfg_.child_range("campaign")) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-Index: src/gui/dialogs/campaign_selection.cpp
-===================================================================
---- src/gui/dialogs/campaign_selection.cpp	(revision 54624)
-+++ src/gui/dialogs/campaign_selection.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/campaign_selection.hpp"
- 
--#include "foreach.hpp"
- #include "gui/dialogs/helper.hpp"
- #include "gui/widgets/image.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
-@@ -34,6 +33,7 @@
- #include "serialization/string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -140,7 +140,7 @@
- 				&window, "campaign_details", false);
- 
- 		unsigned id = 0;
--		foreach(const config &campaign, campaigns_) {
-+		BOOST_FOREACH(const config &campaign, campaigns_) {
- 
- 			/*** Add tree item ***/
- 			tree_group_field["label"] = campaign["icon"];
-@@ -206,7 +206,7 @@
- 		tmulti_page& multi_page = find_widget<tmulti_page>(
- 				&window, "campaign_details", false);
- 
--		foreach (const config &c, campaigns_) {
-+		BOOST_FOREACH(const config &c, campaigns_) {
- 
- 			/*** Add list item ***/
- 			string_map list_item;
-Index: src/gui/dialogs/mp_connect.cpp
-===================================================================
---- src/gui/dialogs/mp_connect.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_connect.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/mp_connect.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/button.hpp"
-@@ -30,6 +29,7 @@
- #include "video.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -90,7 +90,7 @@
- 	const std::vector<game_config::server_info>&
- 		pref_servers = preferences::server_list();
- 
--	foreach(const game_config::server_info& server, pref_servers) {
-+	BOOST_FOREACH(const game_config::server_info& server, pref_servers) {
- 
- 		std::map<std::string, string_map> data;
- 		string_map item;
-Index: src/gui/dialogs/language_selection.cpp
-===================================================================
---- src/gui/dialogs/language_selection.cpp	(revision 54624)
-+++ src/gui/dialogs/language_selection.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/language_selection.hpp"
- 
--#include "foreach.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include "gui/widgets/list.hpp"
- #else
-@@ -28,6 +27,8 @@
- #include "language.hpp"
- #include "preferences.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -65,7 +66,7 @@
- 
- 	const std::vector<language_def>& languages = get_languages();
- 	const language_def& current_language = get_language();
--	foreach(const language_def& lang, languages) {
-+	BOOST_FOREACH(const language_def& lang, languages) {
- 		string_map item;
- 		item.insert(std::make_pair("label", lang.language));
- 
-Index: src/gui/dialogs/mp_create_game.cpp
-===================================================================
---- src/gui/dialogs/mp_create_game.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_create_game.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/mp_create_game.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/field.hpp"
-@@ -35,6 +34,7 @@
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include <boost/bind.hpp>
- #endif
-+#include <boost/foreach.hpp>
- namespace gui2 {
- 
- REGISTER_DIALOG(mp_create_game)
-@@ -101,7 +101,7 @@
- 	std::vector<std::string> maps;
- 	get_files_in_dir(get_user_data_dir() + "/editor/maps", &maps, NULL, FILE_NAME_ONLY);
- 
--	foreach(const std::string& map, maps) {
-+	BOOST_FOREACH(const std::string& map, maps) {
- 		std::map<std::string, t_string> item;
- 		item.insert(std::make_pair("label", map));
- 		list->add_row(item);
-@@ -110,7 +110,7 @@
- 
- 	// Standard maps
- 	int i = 0;
--	foreach (const config &map, cfg_.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &map, cfg_.child_range("multiplayer"))
- 	{
- 		if (map["allow_new_game"].to_bool(true)) {
- 			string_map item;
-Index: src/gui/dialogs/network_transmission.cpp
-===================================================================
---- src/gui/dialogs/network_transmission.cpp	(revision 54624)
-+++ src/gui/dialogs/network_transmission.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/network_transmission.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "gui/widgets/button.hpp"
-Index: src/gui/dialogs/addon/description.cpp
-===================================================================
---- src/gui/dialogs/addon/description.cpp	(revision 54624)
-+++ src/gui/dialogs/addon/description.cpp	(revision 54625)
-@@ -17,14 +17,15 @@
- 
- #include "gui/dialogs/addon/description.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/settings.hpp"
- #include "language.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 	std::string langcode_to_string(const std::string& lcode)
- 	{
--		foreach(const language_def& ld, get_languages()) {
-+		BOOST_FOREACH(const language_def& ld, get_languages()) {
- 			if(ld.localename == lcode || ld.localename.substr(0, 2) == lcode) {
- 				return ld.language;
- 			}
-@@ -90,7 +91,7 @@
- 
- 	std::string languages;
- 
--	foreach(const std::string& lc, addon.translations) {
-+	BOOST_FOREACH(const std::string& lc, addon.translations) {
- 		const std::string& langlabel = langcode_to_string(lc);
- 		if(!langlabel.empty()) {
- 			if(!languages.empty()) {
-Index: src/gui/dialogs/addon/uninstall_list.cpp
-===================================================================
---- src/gui/dialogs/addon/uninstall_list.cpp	(revision 54624)
-+++ src/gui/dialogs/addon/uninstall_list.cpp	(revision 54625)
-@@ -15,7 +15,6 @@
- 
- #include "gui/dialogs/addon/uninstall_list.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/grid.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- 	#include "gui/widgets/list.hpp"
-@@ -26,6 +25,8 @@
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <algorithm>
- 
- namespace {
-@@ -50,7 +51,7 @@
- 	this->names_.clear();
- 	this->selections_.clear();
- 
--	foreach(const std::string& id, this->ids_) {
-+	BOOST_FOREACH(const std::string& id, this->ids_) {
- 		this->names_.push_back(make_addon_name(id));
- 		this->selections_[id] = false;
- 
-@@ -87,7 +88,7 @@
- 	std::vector<std::string> retv;
- 
- 	typedef std::map<std::string, bool> selections_map_type;
--	foreach(const selections_map_type::value_type& entry, this->selections_) {
-+	BOOST_FOREACH(const selections_map_type::value_type& entry, this->selections_) {
- 		if(entry.second) {
- 			retv.push_back(entry.first);
- 		}
-Index: src/gui/dialogs/chat_log.cpp
-===================================================================
---- src/gui/dialogs/chat_log.cpp	(revision 54624)
-+++ src/gui/dialogs/chat_log.cpp	(revision 54625)
-@@ -28,7 +28,6 @@
- #include "gui/widgets/window.hpp"
- #include "gui/widgets/slider.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../gamestatus.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
-@@ -38,6 +37,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_chat_log("chat_log");
- #define DBG_CHAT_LOG LOG_STREAM(debug, log_chat_log)
-@@ -113,7 +113,7 @@
- 		std::stringstream str;
- 		LOG_CHAT_LOG << "entering tchat_log::model::add_row_to_chat_message_list\n";
- 		if (first<last) {
--			foreach (const chat_msg &t, make_pair(chat_log_history.begin()+first,chat_log_history.begin()+last))
-+			BOOST_FOREACH(const chat_msg &t, make_pair(chat_log_history.begin()+first,chat_log_history.begin()+last))
- 			{
- 				std::string prefix("/me");
- 				bool me = false;
-Index: src/gui/dialogs/mp_change_control.cpp
-===================================================================
---- src/gui/dialogs/mp_change_control.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_change_control.cpp	(revision 54625)
-@@ -36,7 +36,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
--#include <gui/widgets/button.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_gui("gui/dialogs/mp_change_control");
- #define ERR_GUI LOG_STREAM(err, log_gui)
-@@ -184,7 +184,7 @@
- 
- 		int i = 0; // because we need to know which row contains the controlling player
- 
--		foreach (const std::string &nick, nicks)
-+		BOOST_FOREACH(const std::string &nick, nicks)
- 		{
- 			if (side_number_ <= static_cast<int>(resources::teams->size()) &&
- 				resources::teams->at(side_number_-1).current_player() == nick)
-Index: src/gui/dialogs/message.cpp
-===================================================================
---- src/gui/dialogs/message.cpp	(revision 54624)
-+++ src/gui/dialogs/message.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/message.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/image.hpp"
-@@ -26,6 +25,8 @@
- #include "gui/widgets/window.hpp"
- #include "log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- REGISTER_DIALOG(message)
-@@ -97,7 +98,7 @@
- 
- void tmessage::post_show(twindow& /*window*/)
- {
--	foreach(tbutton_status& button_status, buttons_) {
-+	BOOST_FOREACH(tbutton_status& button_status, buttons_) {
- 		button_status.button = NULL;
- 	}
- }
-Index: src/gui/dialogs/lobby/lobby_data.cpp
-===================================================================
---- src/gui/dialogs/lobby/lobby_data.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby/lobby_data.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "config.hpp"
- #include "game_preferences.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "network.hpp"
-@@ -27,6 +26,8 @@
- #include "map_exception.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- 
- static lg::log_domain log_config("config");
-@@ -89,7 +90,7 @@
- void room_info::process_room_members(const config& data)
- {
- 	members_.clear();
--	foreach (const config& m, data.child_range("member")) {
-+	BOOST_FOREACH(const config& m, data.child_range("member")) {
- 		members_.insert(m["name"]);
- 	}
- }
-@@ -254,7 +255,7 @@
- 				if (const config& hashes = game_config.child("multiplayer_hashes")) {
- 					std::string hash = game["hash"];
- 					bool hash_found = false;
--					foreach (const config::attribute &i, hashes.attribute_range()) {
-+					BOOST_FOREACH(const config::attribute &i, hashes.attribute_range()) {
- 						if (i.first == game["mp_scenario"] && i.second == hash) {
- 							hash_found = true;
- 							break;
-@@ -357,7 +358,7 @@
- 
- game_filter_stack::~game_filter_stack()
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		delete f;
- 	}
- }
-@@ -369,7 +370,7 @@
- 
- void game_filter_stack::clear()
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		delete f;
- 	}
- 	filters_.clear();
-@@ -377,7 +378,7 @@
- 
- bool game_filter_and_stack::match(const game_info &game) const
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		if (!f->match(game)) return false;
- 	}
- 	return true;
-Index: src/gui/dialogs/lobby/lobby_info.cpp
-===================================================================
---- src/gui/dialogs/lobby/lobby_info.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby/lobby_info.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "config.hpp"
- #include "game_preferences.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "network.hpp"
-@@ -27,6 +26,8 @@
- #include "map_exception.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- 
- static lg::log_domain log_config("config");
-@@ -66,7 +67,7 @@
- 
- void lobby_info::delete_games()
- {
--	foreach (const game_info_map::value_type& v, games_by_id_) {
-+	BOOST_FOREACH(const game_info_map::value_type& v, games_by_id_) {
- 		delete v.second;
- 	}
- }
-@@ -76,7 +77,7 @@
- std::string dump_games_map(const lobby_info::game_info_map& games)
- {
- 	std::stringstream ss;
--	foreach (const lobby_info::game_info_map::value_type& v, games) {
-+	BOOST_FOREACH(const lobby_info::game_info_map::value_type& v, games) {
- 		const game_info& game = *v.second;
- 		ss << "G" << game.id << "(" << game.name << ") " << game.display_status_string() << " ";
- 	}
-@@ -87,7 +88,7 @@
- std::string dump_games_config(const config& gamelist)
- {
- 	std::stringstream ss;
--	foreach (const config& c, gamelist.child_range("game")) {
-+	BOOST_FOREACH(const config& c, gamelist.child_range("game")) {
- 		ss << "g" << c["id"] << "(" << c["name"] << ") " << c[config::diff_track_attribute] << " ";
- 	}
- 	ss << "\n";
-@@ -103,7 +104,7 @@
- 	gamelist_initialized_ = true;
- 	delete_games();
- 	games_by_id_.clear();
--	foreach (const config& c, gamelist_.child("gamelist").child_range("game")) {
-+	BOOST_FOREACH(const config& c, gamelist_.child("gamelist").child_range("game")) {
- 		game_info* game = new game_info(c, game_config_);
- 		games_by_id_[game->id] = game;
- 	}
-@@ -180,10 +181,10 @@
- {
- 	SCOPE_LB;
- 	users_.clear();
--	foreach (const config& c, gamelist_.child_range("user")) {
-+	BOOST_FOREACH(const config& c, gamelist_.child_range("user")) {
- 		users_.push_back(user_info(c));
- 	}
--	foreach (user_info& ui, users_) {
-+	BOOST_FOREACH(user_info& ui, users_) {
- 		if (ui.game_id != 0) {
- 			game_info* g = get_game_by_id(ui.game_id);
- 			if (g == NULL) {
-@@ -235,7 +236,7 @@
- 
- room_info* lobby_info::get_room(const std::string &name)
- {
--	foreach (room_info& r, rooms_) {
-+	BOOST_FOREACH(room_info& r, rooms_) {
- 		if (r.name() == name) return &r;
- 	}
- 	return NULL;
-@@ -243,7 +244,7 @@
- 
- const room_info* lobby_info::get_room(const std::string &name) const
- {
--	foreach (const room_info& r, rooms_) {
-+	BOOST_FOREACH(const room_info& r, rooms_) {
- 		if (r.name() == name) return &r;
- 	}
- 	return NULL;
-@@ -301,7 +302,7 @@
- 	games_filtered_.clear();
- 	games_visibility_.clear();
- 	games_.clear();
--	foreach (const game_info_map::value_type& v, games_by_id_) {
-+	BOOST_FOREACH(const game_info_map::value_type& v, games_by_id_) {
- 		games_.push_back(v.second);
- 	}
- }
-@@ -310,7 +311,7 @@
- {
- 	games_filtered_.clear();
- 	games_visibility_.clear();
--	foreach (game_info* g, games_) {
-+	BOOST_FOREACH(game_info* g, games_) {
- 		game_info& gi = *g;
- 		bool show = game_filter_.match(gi);
- 		if (game_filter_invert_) {
-@@ -325,7 +326,7 @@
- 
- void lobby_info::update_user_statuses(int game_id, const room_info *room)
- {
--	foreach (user_info& user, users_) {
-+	BOOST_FOREACH(user_info& user, users_) {
- 		user.update_state(game_id, room);
- 	}
- }
-@@ -365,7 +366,7 @@
- void lobby_info::sort_users(bool by_name, bool by_relation)
- {
- 	users_sorted_.clear();
--	foreach (user_info& u, users_) {
-+	BOOST_FOREACH(user_info& u, users_) {
- 		users_sorted_.push_back(&u);
- 	}
- 	if (by_name) {
-Index: src/gui/dialogs/game_save.cpp
-===================================================================
---- src/gui/dialogs/game_save.cpp	(revision 54624)
-+++ src/gui/dialogs/game_save.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/game_save.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/button.hpp"
-Index: src/gui/widgets/settings.cpp
-===================================================================
---- src/gui/widgets/settings.cpp	(revision 54624)
-+++ src/gui/widgets/settings.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "asserts.hpp"
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/tips.hpp"
-@@ -35,6 +34,8 @@
- #include "serialization/schema_validator.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- bool new_widgets = false;
-@@ -283,12 +284,12 @@
- 				  , const config&
- 				  , const char *key)> > thack;
- 
--	foreach(thack& widget_type, registred_widget_type()) {
-+	BOOST_FOREACH(thack& widget_type, registred_widget_type()) {
- 		widget_type.second(*this, widget_type.first, cfg, NULL);
- 	}
- 
- 	/***** Window types *****/
--	foreach (const config &w, cfg.child_range("window")) {
-+	BOOST_FOREACH(const config &w, cfg.child_range("window")) {
- 		std::pair<std::string, twindow_builder> child;
- 		child.first = child.second.read(w);
- 		window_types.insert(child);
-@@ -423,7 +424,7 @@
- 		  const std::string& definition_type
- 		, const std::vector<tcontrol_definition_ptr>& definitions)
- {
--	foreach(const tcontrol_definition_ptr& def, definitions) {
-+	BOOST_FOREACH(const tcontrol_definition_ptr& def, definitions) {
- 
- 		// We assume all definitions are unique if not we would leak memory.
- 		assert(control_definition[definition_type].find(def->id)
-@@ -497,7 +498,7 @@
- 			ERR_GUI_P << e.message;
- 	}
- 	// Parse guis
--	foreach (const config &g, cfg.child_range("gui")) {
-+	BOOST_FOREACH(const config &g, cfg.child_range("gui")) {
- 		std::pair<std::string, tgui_definition> child;
- 		child.first = child.second.read(g);
- 		guis.insert(child);
-Index: src/gui/widgets/window.cpp
-===================================================================
---- src/gui/widgets/window.cpp	(revision 54624)
-+++ src/gui/widgets/window.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "gui/widgets/window_private.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -44,6 +43,7 @@
- #include "video.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -716,7 +716,7 @@
- 		return;
- 	}
- 
--	foreach(std::vector<twidget*>& item, dirty_list_) {
-+	BOOST_FOREACH(std::vector<twidget*>& item, dirty_list_) {
- 
- 		assert(!item.empty());
- 
-@@ -1047,12 +1047,12 @@
- {
- 	// evaluate the group sizes
- 	typedef std::pair<const std::string, tlinked_size> hack;
--	foreach(hack& linked_size, linked_size_) {
-+	BOOST_FOREACH(hack& linked_size, linked_size_) {
- 
- 		tpoint max_size(0, 0);
- 
- 		// Determine the maximum size.
--		foreach(twidget* widget, linked_size.second.widgets) {
-+		BOOST_FOREACH(twidget* widget, linked_size.second.widgets) {
- 
- 			const tpoint size = widget->get_best_size();
- 
-@@ -1065,7 +1065,7 @@
- 		}
- 
- 		// Set the maximum size.
--		foreach(twidget* widget, linked_size.second.widgets) {
-+		BOOST_FOREACH(twidget* widget, linked_size.second.widgets) {
- 
- 			tpoint size = widget->get_best_size();
- 
-Index: src/gui/widgets/stacked_widget.cpp
-===================================================================
---- src/gui/widgets/stacked_widget.cpp	(revision 54624)
-+++ src/gui/widgets/stacked_widget.cpp	(revision 54625)
-@@ -17,13 +17,13 @@
- 
- #include "gui/widgets/stacked_widget.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/widget_definition/stacked_widget.hpp"
- #include "gui/auxiliary/window_builder/stacked_widget.hpp"
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/generator.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -83,7 +83,7 @@
- {
- 	assert(generator_);
- 	string_map empty_data;
--	foreach(const tbuilder_grid_const_ptr& builder, widget_builder) {
-+	BOOST_FOREACH(const tbuilder_grid_const_ptr& builder, widget_builder) {
- 		generator_->create_item(-1, builder, empty_data, NULL);
- 	}
- 	swap_grid(NULL, &grid(), generator_, "_content_grid");
-Index: src/gui/widgets/text_box.cpp
-===================================================================
---- src/gui/widgets/text_box.cpp	(revision 54624)
-+++ src/gui/widgets/text_box.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/widgets/text_box.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/text_box.hpp"
- #include "gui/auxiliary/window_builder/text_box.hpp"
-@@ -27,6 +26,7 @@
- #include "game_preferences.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -162,7 +162,7 @@
- 	const int max_width = get_text_maximum_width();
- 	const int max_height = get_text_maximum_height();
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 
- 		tmp.set_variable("text", variant(get_value()));
- 		tmp.set_variable("text_x_offset", variant(text_x_offset_));
-@@ -260,7 +260,7 @@
- 
- 	// Since this variable doesn't change set it here instead of in
- 	// update_canvas().
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("text_font_height", variant(text_height_));
- 	}
- 
-Index: src/gui/widgets/toggle_panel.cpp
-===================================================================
---- src/gui/widgets/toggle_panel.cpp	(revision 54624)
-+++ src/gui/widgets/toggle_panel.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/toggle_panel.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/toggle_panel.hpp"
- #include "gui/auxiliary/window_builder/toggle_panel.hpp"
-@@ -26,6 +25,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -72,7 +72,7 @@
- {
- 	// typedef boost problem work around.
- 	typedef std::pair<std::string, string_map> hack ;
--	foreach(const hack& item, data) {
-+	BOOST_FOREACH(const hack& item, data) {
- 		tcontrol* control = dynamic_cast<tcontrol*>(find(item.first, false));
- 		if(control) {
- 			control->set_members(item.second);
-Index: src/gui/widgets/tree_view_node.cpp
-===================================================================
---- src/gui/widgets/tree_view_node.cpp	(revision 54624)
-+++ src/gui/widgets/tree_view_node.cpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/widgets/tree_view.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER \
- 		get_control_type() + " [" + tree_view().id() + "] " + __func__
-@@ -48,7 +49,7 @@
- 	grid_.set_parent(this);
- 	set_parent(&parent_tree_view);
- 	if(id != "root") {
--		foreach(const tnode_definition& node_definition, node_definitions_) {
-+		BOOST_FOREACH(const tnode_definition& node_definition, node_definitions_) {
- 			if(node_definition.id == id) {
- 				node_definition.builder->build(&grid_);
- 				init_grid(&grid_, data);
-@@ -217,7 +218,7 @@
- 	int height_reduction = 0;
- 
- 	if(!is_folded()) {
--		foreach(const ttree_view_node& node, children_) {
-+		BOOST_FOREACH(const ttree_view_node& node, children_) {
- 			height_reduction += node.get_current_size().y;
- 		}
- 	}
-@@ -300,7 +301,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		std::vector<twidget*> child_call_stack = call_stack;
- 		node.impl_populate_dirty_list(caller, child_call_stack);
- 	}
-@@ -455,7 +456,7 @@
- 	}
- 
- 	DBG_GUI_L << LOG_HEADER << " set children.\n";
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		origin.y += node.place(indention_step_size, origin, width);
- 	}
- 
-@@ -477,7 +478,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		node.set_visible_area(area);
- 	}
- }
-@@ -490,7 +491,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		node.impl_draw_children(frame_buffer);
- 	}
- }
-Index: src/gui/widgets/settings.hpp
-===================================================================
---- src/gui/widgets/settings.hpp	(revision 54624)
-+++ src/gui/widgets/settings.hpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/auxiliary/widget_definition/window.hpp"
- 
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <string>
- #include <vector>
-@@ -124,7 +125,7 @@
- {
- 	std::vector<tcontrol_definition_ptr> definitions;
- 
--	foreach(const config& definition
-+	BOOST_FOREACH(const config& definition
- 			, cfg.child_range(key ? key : definition_type + "_definition")) {
- 
- 		definitions.push_back(new T(definition));
-Index: src/gui/widgets/slider.cpp
-===================================================================
---- src/gui/widgets/slider.cpp	(revision 54624)
-+++ src/gui/widgets/slider.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/slider.hpp"
- 
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/slider.hpp"
-@@ -27,6 +26,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -232,7 +232,7 @@
- 	// Inherited.
- 	tscrollbar_::update_canvas();
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("text", variant(get_value_label()));
- 	}
- }
-Index: src/gui/widgets/scrollbar.cpp
-===================================================================
---- src/gui/widgets/scrollbar.cpp	(revision 54624)
-+++ src/gui/widgets/scrollbar.cpp	(revision 54625)
-@@ -17,11 +17,11 @@
- 
- #include "gui/widgets/scrollbar.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/window.hpp" // Needed for invalidate_layout()
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -132,7 +132,7 @@
- 
- void tscrollbar_::update_canvas() {
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("positioner_offset", variant(positioner_offset_));
- 		tmp.set_variable("positioner_length", variant(positioner_length_));
- 	}
-@@ -287,7 +287,7 @@
- void tscrollbar_::load_config_extra()
- {
- 	// These values won't change so set them here.
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("offset_before", variant(offset_before()));
- 		tmp.set_variable("offset_after", variant(offset_after()));
- 	}
-Index: src/gui/widgets/grid_private.hpp
-===================================================================
---- src/gui/widgets/grid_private.hpp	(revision 54624)
-+++ src/gui/widgets/grid_private.hpp	(revision 54625)
-@@ -33,7 +33,7 @@
- 
- #include "gui/widgets/grid.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -56,7 +56,7 @@
- 			const tpoint& coordinate, const bool must_be_active)
- 	{
- 		typedef typename tconst_duplicator<W, tgrid::tchild>::type hack;
--		foreach(hack& child, grid.children_) {
-+		BOOST_FOREACH(hack& child, grid.children_) {
- 
- 			W* widget = child.widget();
- 			if(!widget) {
-@@ -91,7 +91,7 @@
- 		}
- 
- 		typedef typename tconst_duplicator<W, tgrid::tchild>::type hack;
--		foreach(hack& child, grid.children_) {
-+		BOOST_FOREACH(hack& child, grid.children_) {
- 
- 			widget = child.widget();
- 			if(!widget) {
-Index: src/gui/widgets/grid.cpp
-===================================================================
---- src/gui/widgets/grid.cpp	(revision 54624)
-+++ src/gui/widgets/grid.cpp	(revision 54625)
-@@ -21,6 +21,8 @@
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/layout_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <numeric>
- 
- #define LOG_SCOPE_HEADER "tgrid [" + id() + "] " + __func__
-@@ -48,7 +50,7 @@
- {
- 	// Delete the children in this destructor since resizing a vector copies the
- 	// children and thus frees the child prematurely.
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		delete child.widget();
- 	}
- }
-@@ -99,7 +101,7 @@
- {
- 	assert(widget);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		if(child.id() != id) {
- 
- 			if(recurse) {
-@@ -145,7 +147,7 @@
- 
- void tgrid::remove_child(const std::string& id, const bool find_all)
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		if(child.id() == id) {
- 			delete child.widget();
-@@ -160,7 +162,7 @@
- 
- void tgrid::set_active(const bool active)
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		if(!widget) {
-@@ -186,7 +188,7 @@
- 	twidget::layout_init(full_initialization);
- 
- 	// Clear child caches.
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		child.layout_init(full_initialization);
- 
-@@ -426,7 +428,7 @@
- 
- bool tgrid::can_wrap() const
- {
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		if(child.can_wrap()) {
- 			return true;
- 		}
-@@ -485,7 +487,7 @@
- 
- 			if(w_size == 0) {
- 				// If all sizes are 0 reset them to 1
--				foreach(unsigned& val, col_grow_factor_) {
-+				BOOST_FOREACH(unsigned& val, col_grow_factor_) {
- 					val = 1;
- 				}
- 				w_size = cols_;
-@@ -516,7 +518,7 @@
- 
- 			if(h_size == 0) {
- 				// If all sizes are 0 reset them to 1
--				foreach(unsigned& val, row_grow_factor_) {
-+				BOOST_FOREACH(unsigned& val, row_grow_factor_) {
- 					val = 1;
- 				}
- 				h_size = rows_;
-@@ -551,7 +553,7 @@
- 	// Inherited.
- 	twidget::set_origin(origin);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-@@ -567,7 +569,7 @@
- 	// Inherited.
- 	twidget::set_visible_area(area);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-@@ -578,7 +580,7 @@
- 
- void tgrid::layout_children()
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		assert(child.widget());
- 		child.widget()->layout_children();
- 	}
-@@ -589,7 +591,7 @@
- {
- 	assert(!call_stack.empty() && call_stack.back() == this);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		assert(child.widget());
- 
-@@ -627,7 +629,7 @@
- 
- bool tgrid::has_widget(const twidget* widget) const
- {
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		if(child.widget() == widget) {
- 			return true;
- 		}
-@@ -641,7 +643,7 @@
- 		return false;
- 	}
- 
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		const twidget* widget = child.widget();
- 		assert(widget);
- 
-@@ -936,7 +938,7 @@
- 	assert(get_visible() == twidget::VISIBLE);
- 	set_dirty(false);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-Index: src/gui/widgets/toggle_button.cpp
-===================================================================
---- src/gui/widgets/toggle_button.cpp	(revision 54624)
-+++ src/gui/widgets/toggle_button.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/toggle_button.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/toggle_button.hpp"
- #include "gui/auxiliary/window_builder/toggle_button.hpp"
-@@ -26,6 +25,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -89,7 +89,7 @@
- 
- 	// set icon in canvases
- 	std::vector<tcanvas>& canvases = tcontrol::canvas();
--	foreach(tcanvas& canvas, canvases) {
-+	BOOST_FOREACH(tcanvas& canvas, canvases) {
- 		canvas.set_variable("icon", variant(icon_name_));
- 	}
- 
-Index: src/gui/widgets/control.cpp
-===================================================================
---- src/gui/widgets/control.cpp	(revision 54624)
-+++ src/gui/widgets/control.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "control.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gui/auxiliary/iterator/walker_widget.hpp"
- #include "gui/auxiliary/log.hpp"
-@@ -29,6 +28,7 @@
- #include "marked-up_text.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <iomanip>
- 
-@@ -211,7 +211,7 @@
- void tcontrol::place(const tpoint& origin, const tpoint& size)
- {
- 	// resize canvasses
--	foreach(tcanvas& canvas, canvas_) {
-+	BOOST_FOREACH(tcanvas& canvas, canvas_) {
- 		canvas.set_width(size.x);
- 		canvas.set_height(size.y);
- 	}
-@@ -297,7 +297,7 @@
- 	const int max_height = get_text_maximum_height();
- 
- 	// set label in canvases
--	foreach(tcanvas& canvas, canvas_) {
-+	BOOST_FOREACH(tcanvas& canvas, canvas_) {
- 		canvas.set_variable("text", variant(label_));
- 		canvas.set_variable("text_markup", variant(use_markup_));
- 		canvas.set_variable("text_alignment"
-Index: src/gui/widgets/scrollbar_container.cpp
-===================================================================
---- src/gui/widgets/scrollbar_container.cpp	(revision 54624)
-+++ src/gui/widgets/scrollbar_container.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/scrollbar_container_private.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/layout_exception.hpp"
- #include "gui/widgets/clickable.hpp"
-@@ -25,6 +24,7 @@
- #include "gui/widgets/window.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -692,7 +692,7 @@
- 
- 	/***** Setup the scrollbar buttons *****/
- 	typedef std::pair<std::string, tscrollbar_::tscroll> hack;
--	foreach(const hack& item, scroll_lookup()) {
-+	BOOST_FOREACH(const hack& item, scroll_lookup()) {
- 
- 		// Vertical.
- 		tclickable_* button = find_widget<tclickable_>(
-@@ -838,7 +838,7 @@
- {
- 	if(true) { /** @todo scrollbar visibility. */
- 		/***** set scroll up button status *****/
--		foreach(const std::string& name, button_up_names) {
-+		BOOST_FOREACH(const std::string& name, button_up_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					vertical_scrollbar_grid_, name, false, false);
- 
-@@ -848,7 +848,7 @@
- 		}
- 
- 		/***** set scroll down status *****/
--		foreach(const std::string& name, button_down_names) {
-+		BOOST_FOREACH(const std::string& name, button_down_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					vertical_scrollbar_grid_, name, false, false);
- 
-@@ -864,7 +864,7 @@
- 
- 	if(true) { /** @todo scrollbar visibility. */
- 		/***** Set scroll left button status *****/
--		foreach(const std::string& name, button_up_names) {
-+		BOOST_FOREACH(const std::string& name, button_up_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					horizontal_scrollbar_grid_, name, false, false);
- 
-@@ -874,7 +874,7 @@
- 		}
- 
- 		/***** Set scroll right button status *****/
--		foreach(const std::string& name, button_down_names) {
-+		BOOST_FOREACH(const std::string& name, button_down_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					horizontal_scrollbar_grid_, name, false, false);
- 
-Index: src/gui/widgets/generator_private.hpp
-===================================================================
---- src/gui/widgets/generator_private.hpp	(revision 54624)
-+++ src/gui/widgets/generator_private.hpp	(revision 54625)
-@@ -19,12 +19,13 @@
- #include "gui/widgets/generator.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "gui/widgets/grid.hpp"
- #include "gui/widgets/selectable.hpp"
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/toggle_panel.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /**
-@@ -584,7 +585,7 @@
- 	/** Inherited from tgenerator_. */
- 	void clear()
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			delete item;
- 		}
- 		selected_item_count_ = 0;
-@@ -750,7 +751,7 @@
- 	/** Inherited from tgenerator_. */
- 	void layout_init(const bool full_initialization)
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.get_visible() != twidget::INVISIBLE && item->shown) {
- 				item->grid.layout_init(full_initialization);
- 			}
-@@ -804,7 +805,7 @@
- 	{
- 		assert(this->get_visible() == twidget::VISIBLE);
- 
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.get_visible() == twidget::VISIBLE && item->shown) {
- 				item->grid.draw_children(frame_buffer);
- 			}
-@@ -815,7 +816,7 @@
- 	void child_populate_dirty_list(twindow& caller,
- 			const std::vector<twidget*>& call_stack)
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			std::vector<twidget*> child_call_stack = call_stack;
- 			item->grid.populate_dirty_list(caller, child_call_stack);
- 		}
-@@ -838,7 +839,7 @@
- 	/** Inherited from widget. */
- 	bool disable_click_dismiss() const
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.disable_click_dismiss()) {
- 				return true;
- 			}
-@@ -974,7 +975,7 @@
- 			void (*callback)(twidget*))
- 	{
- 		int i = index;
--		foreach(const T& item_data, data) {
-+		BOOST_FOREACH(const T& item_data, data) {
- 			create_item(i, list_builder, item_data, callback);
- 			if(i != -1) {
- 				++i;
-Index: src/gui/widgets/generator.cpp
-===================================================================
---- src/gui/widgets/generator.cpp	(revision 54624)
-+++ src/gui/widgets/generator.cpp	(revision 54625)
-@@ -19,6 +19,8 @@
- 
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace policy {
-@@ -678,7 +680,7 @@
- 	assert(!callback);
- 
- 	typedef std::pair<std::string, string_map> hack;
--	foreach(const hack& item, data) {
-+	BOOST_FOREACH(const hack& item, data) {
- 		if(item.first.empty()) {
- 			for(unsigned row = 0; row < grid->get_rows(); ++row) {
- 				for(unsigned col = 0; col < grid->get_cols(); ++col) {
-Index: src/gui/widgets/progress_bar.cpp
-===================================================================
---- src/gui/widgets/progress_bar.cpp	(revision 54624)
-+++ src/gui/widgets/progress_bar.cpp	(revision 54625)
-@@ -23,6 +23,7 @@
- #include "gui/widgets/settings.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -38,7 +39,7 @@
- 	if(percentage_ != percentage) {
- 		percentage_ = percentage;
- 
--		foreach(tcanvas& c, canvas()) {
-+		BOOST_FOREACH(tcanvas& c, canvas()) {
- 			c.set_variable("percentage", variant(percentage));
- 		}
- 
-Index: src/gui/auxiliary/widget_definition.hpp
-===================================================================
---- src/gui/auxiliary/widget_definition.hpp	(revision 54624)
-+++ src/gui/auxiliary/widget_definition.hpp	(revision 54625)
-@@ -17,9 +17,10 @@
- #define GUI_AUXILIARY_WIDGET_DEFINITION_HPP_INCLUDED
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/canvas.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /**
-@@ -98,7 +99,7 @@
- 	void load_resolutions(const config &cfg)
- 	{
- 		config::const_child_itors itors = cfg.child_range("resolution");
--		foreach(const config &resolution, itors) {
-+		BOOST_FOREACH(const config &resolution, itors) {
- 			resolutions.push_back(new T(resolution));
- 		}
- 	}
-Index: src/gui/auxiliary/event/dispatcher.cpp
-===================================================================
---- src/gui/auxiliary/event/dispatcher.cpp	(revision 54624)
-+++ src/gui/auxiliary/event/dispatcher.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/event/dispatcher_private.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- 
- namespace gui2 {
-Index: src/gui/auxiliary/event/handler.cpp
-===================================================================
---- src/gui/auxiliary/event/handler.cpp	(revision 54624)
-+++ src/gui/auxiliary/event/handler.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/auxiliary/event/handler.hpp"
- 
- #include "clipboard.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/event/dispatcher.hpp"
- #include "gui/auxiliary/timer.hpp"
- #include "gui/auxiliary/log.hpp"
-@@ -28,6 +27,8 @@
- #include "hotkeys.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cassert>
- 
- /**
-@@ -429,7 +430,7 @@
- 	}
- 
- 	/***** Set proper state for the other dispatchers. *****/
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dynamic_cast<twidget&>(*dispatcher).set_dirty();
- 	}
- 
-@@ -448,7 +449,7 @@
- 
- void thandler::activate()
- {
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dispatcher->fire(SDL_ACTIVATE
- 				, dynamic_cast<twidget&>(*dispatcher)
- 				, NULL);
-@@ -472,7 +473,7 @@
- 	 *
- 	 * For now we use a hack, but would be nice to rewrite it for 1.9/1.11.
- 	 */
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		if(!first) {
- 			/*
- 			 * This leaves glitches on window borders if the window beneath it
-@@ -503,7 +504,7 @@
- {
- 	DBG_GUI_E << "Firing: " << SDL_VIDEO_RESIZE << ".\n";
- 
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dispatcher->fire(SDL_VIDEO_RESIZE
- 				, dynamic_cast<twidget&>(*dispatcher)
- 				, new_size);
-Index: src/gui/auxiliary/canvas.cpp
-===================================================================
---- src/gui/auxiliary/canvas.cpp	(revision 54624)
-+++ src/gui/auxiliary/canvas.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "config.hpp"
- #include "../../image.hpp"
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/formula.hpp"
-@@ -33,6 +32,8 @@
- #include "../../text.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace {
-@@ -1455,7 +1456,7 @@
- 	log_scope2(log_gui_parse, "Canvas: parsing config.");
- 	shapes_.clear();
- 
--	foreach(const config::any_child& shape, cfg.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child& shape, cfg.all_children_range()) {
- 		const std::string &type = shape.key;
- 		const config &data = shape.cfg;
- 
-@@ -1474,7 +1475,7 @@
- 		} else if(type == "pre_commit") {
- 
- 			/* note this should get split if more preprocessing is used. */
--			foreach(const config::any_child& function,
-+			BOOST_FOREACH(const config::any_child& function,
- 					data.all_children_range()) {
- 
- 				if(function.key == "blur") {
-Index: src/gui/auxiliary/window_builder.cpp
-===================================================================
---- src/gui/auxiliary/window_builder.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/auxiliary/window_builder_private.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/window_builder/helper.hpp"
-@@ -43,6 +42,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -67,7 +67,7 @@
- 				  std::string
- 				, boost::function<tbuilder_widget_ptr(config)> >
- 			thack;
--	foreach(const thack& item, builder_widget_lookup()) {
-+	BOOST_FOREACH(const thack& item, builder_widget_lookup()) {
- 		if(item.first == "window" || item.first == "tooltip") {
- 			continue;
- 		}
-@@ -153,7 +153,7 @@
- 			, definition->helptip);
- 	assert(window);
- 
--	foreach(const twindow_builder::tresolution::tlinked_group& lg,
-+	BOOST_FOREACH(const twindow_builder::tresolution::tlinked_group& lg,
- 			definition->linked_groups) {
- 
- 		if(window->has_linked_size_group(lg.id)) {
-@@ -238,7 +238,7 @@
- 
- 	config::const_child_itors cfgs = cfg.child_range("resolution");
- 	VALIDATE(cfgs.first != cfgs.second, _("No resolution defined."));
--	foreach (const config &i, cfgs) {
-+	BOOST_FOREACH(const config &i, cfgs) {
- 		resolutions.push_back(tresolution(i));
- 	}
- 
-@@ -386,7 +386,7 @@
- 		definition = "default";
- 	}
- 
--	foreach (const config &lg, cfg.child_range("linked_group")) {
-+	BOOST_FOREACH(const config &lg, cfg.child_range("linked_group")) {
- 		tlinked_group linked_group;
- 		linked_group.id = lg["id"].str();
- 		linked_group.fixed_width = lg["fixed_width"].to_bool();
-@@ -501,13 +501,13 @@
-  */
- 	log_scope2(log_gui_parse, "Window builder: parsing a grid");
- 
--	foreach (const config &row, cfg.child_range("row"))
-+	BOOST_FOREACH(const config &row, cfg.child_range("row"))
- 	{
- 		unsigned col = 0;
- 
- 		row_grow_factor.push_back(row["grow_factor"]);
- 
--		foreach (const config &c, row.child_range("column"))
-+		BOOST_FOREACH(const config &c, row.child_range("column"))
- 		{
- 			flags.push_back(implementation::read_flags(c));
- 			border_size.push_back(c["border_size"]);
-Index: src/gui/auxiliary/tips.cpp
-===================================================================
---- src/gui/auxiliary/tips.cpp	(revision 54624)
-+++ src/gui/auxiliary/tips.cpp	(revision 54625)
-@@ -18,10 +18,11 @@
- #include "gui/auxiliary/tips.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- ttip::ttip(const t_string& text
-@@ -39,7 +40,7 @@
- {
- 	std::vector<ttip> result;
- 
--	foreach(const config &tip, cfg.child_range("tip")) {
-+	BOOST_FOREACH(const config &tip, cfg.child_range("tip")) {
- 		result.push_back(ttip(tip["text"]
- 				, tip["source"]
- 				, tip["encountered_units"]));
-@@ -54,11 +55,11 @@
- 
- 	const std::set<std::string>& units = preferences::encountered_units();
- 
--	foreach(const ttip& tip, tips) {
-+	BOOST_FOREACH(const ttip& tip, tips) {
- 		if(tip.unit_filter_.empty()) {
- 			result.push_back(tip);
- 		} else {
--			foreach(const std::string& unit, tip.unit_filter_) {
-+			BOOST_FOREACH(const std::string& unit, tip.unit_filter_) {
- 				if(units.find(unit) != units.end()) {
- 					result.push_back(tip);
- 					break;
-Index: src/gui/auxiliary/notifier.hpp
-===================================================================
---- src/gui/auxiliary/notifier.hpp	(revision 54624)
-+++ src/gui/auxiliary/notifier.hpp	(revision 54625)
-@@ -16,10 +16,10 @@
- #ifndef GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED
- #define GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED
- 
--#include "foreach.hpp"
--
- #include "gui/auxiliary/notifiee.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cassert>
- #include <map>
- 
-@@ -47,7 +47,7 @@
- 	~tnotifier()
- 	{
- 		typedef std::pair<tnotifiee<tfunctor>* const, tfunctor> thack;
--		foreach(thack& item, notifiees_) {
-+		BOOST_FOREACH(thack& item, notifiees_) {
- 			assert(item.first);
- 			assert((*item.first).notifier_ == this);
- 
-Index: src/gui/auxiliary/window_builder/helper.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/helper.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/helper.cpp	(revision 54625)
-@@ -18,11 +18,12 @@
- #include "gui/auxiliary/window_builder/helper.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/grid.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -60,7 +61,7 @@
- unsigned get_border(const std::vector<std::string>& border)
- {
- 	unsigned result = 0;
--	foreach (const std::string& s, border) {
-+	BOOST_FOREACH(const std::string& s, border) {
- 		if (s == "all") {
- 			return tgrid::BORDER_ALL;
- 		} else if (s == "top") {
-Index: src/gui/auxiliary/window_builder/stacked_widget.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/stacked_widget.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/stacked_widget.cpp	(revision 54625)
-@@ -18,13 +18,14 @@
- #include "gui/auxiliary/window_builder/stacked_widget.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/stacked_widget.hpp"
- #include "gui/widgets/stacked_widget.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -35,7 +36,7 @@
- {
- 	const config &s = cfg.child("stack");
- 	VALIDATE(s, _("No stack defined."));
--	foreach(const config &layer, s.child_range("layer")) {
-+	BOOST_FOREACH(const config &layer, s.child_range("layer")) {
- 		stack.push_back(new tbuilder_grid(layer));
- 	}
- }
-Index: src/gui/auxiliary/window_builder/slider.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/slider.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/slider.cpp	(revision 54625)
-@@ -18,12 +18,13 @@
- #include "gui/auxiliary/window_builder/slider.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/slider.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -44,7 +45,7 @@
- 		return;
- 	}
- 
--	foreach(const config& label, labels.child_range("value")) {
-+	BOOST_FOREACH(const config& label, labels.child_range("value")) {
- 		value_labels_.push_back(label["label"]);
- 	}
- }
-Index: src/gui/auxiliary/window_builder/horizontal_listbox.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/horizontal_listbox.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/horizontal_listbox.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/horizontal_listbox.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/listbox.hpp"
-@@ -29,6 +28,8 @@
- #endif
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -53,12 +54,12 @@
- 	const config &data = cfg.child("list_data");
- 	if (!data) return;
- 
--	foreach(const config &row, data.child_range("row")) {
-+	BOOST_FOREACH(const config &row, data.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config &c, row.child_range("column")) {
-+		BOOST_FOREACH(const config &c, row.child_range("column")) {
- 			list_data.push_back(string_map());
--			foreach (const config::attribute &i, c.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, c.attribute_range()) {
- 				list_data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/listbox.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/listbox.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/listbox.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/listbox.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/listbox.hpp"
-@@ -30,6 +29,8 @@
- #include "gui/widgets/settings.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -66,12 +67,12 @@
- 		return;
- 	}
- 
--	foreach(const config& row, data.child_range("row")) {
-+	BOOST_FOREACH(const config& row, data.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config& c, row.child_range("column")) {
-+		BOOST_FOREACH(const config& c, row.child_range("column")) {
- 			list_data.push_back(string_map());
--			foreach(const config::attribute& i, c.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute& i, c.attribute_range()) {
- 				list_data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/multi_page.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/multi_page.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/multi_page.cpp	(revision 54625)
-@@ -18,13 +18,14 @@
- #include "gui/auxiliary/window_builder/multi_page.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/multi_page.hpp"
- #include "gui/widgets/multi_page.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -46,12 +47,12 @@
- 		return;
- 	}
- 
--	foreach(const config &row, d.child_range("row")) {
-+	BOOST_FOREACH(const config &row, d.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config &column, row.child_range("column")) {
-+		BOOST_FOREACH(const config &column, row.child_range("column")) {
- 			data.push_back(string_map());
--			foreach(const config::attribute &i, column.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, column.attribute_range()) {
- 				data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/tree_view.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/tree_view.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/tree_view.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/tree_view.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/tree_view.hpp"
-@@ -25,6 +24,8 @@
- #include "gui/widgets/tree_view.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -39,7 +40,7 @@
- 	, nodes()
- {
- 
--	foreach(const config &node, cfg.child_range("node")) {
-+	BOOST_FOREACH(const config &node, cfg.child_range("node")) {
- 		nodes.push_back(tnode(node));
- 	}
- 
-Index: src/unit_types.cpp
-===================================================================
---- src/unit_types.cpp	(revision 54624)
-+++ src/unit_types.cpp	(revision 54625)
-@@ -22,13 +22,13 @@
- 
- #include "unit_types.hpp"
- 
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "gettext.hpp"
- #include "loadscreen.hpp"
- #include "log.hpp"
- #include "map.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -156,7 +156,7 @@
- 		if (config &specials = cfg_.child("specials"))
- 		{
- 			config new_specials;
--			foreach (const config::any_child &vp, specials.all_children_range()) {
-+			BOOST_FOREACH(const config::any_child &vp, specials.all_children_range()) {
- 				std::vector<std::string>::const_iterator found_id =
- 					std::find(dsl.begin(), dsl.end(), vp.cfg["id"]);
- 				if (found_id == dsl.end()) {
-@@ -174,7 +174,7 @@
- 			cfg_.clear_children("specials");
- 		}
- 		config &new_specials = cfg_.child_or_add("specials");
--		foreach (const config::any_child &value, set_specials.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, set_specials.all_children_range()) {
- 			new_specials.add_child(value.key, value.cfg);
- 		}
- 	}
-@@ -345,7 +345,7 @@
- 
- 	if (const config &resistance = cfg_.child("resistance"))
- 	{
--		foreach (const config::attribute &i, resistance.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, resistance.attribute_range()) {
- 			res[i.first] = i.second;
- 		}
- 	}
-@@ -666,11 +666,11 @@
- 	movementType_ = unit_movement_type(cfg);
- 	alpha_ = ftofxp(1.0);
- 
--	foreach (const config &t, traits)
-+	BOOST_FOREACH(const config &t, traits)
- 	{
- 		possibleTraits_.add_child("trait", t);
- 	}
--	foreach (config &var_cfg, cfg.child_range("variation"))
-+	BOOST_FOREACH(config &var_cfg, cfg.child_range("variation"))
- 	{
- 		if (var_cfg["inherit"].to_bool()) {
- 			config nvar_cfg(cfg);
-@@ -710,7 +710,7 @@
- 		if (cfg["ignore_race_traits"].to_bool()) {
- 			possibleTraits_.clear();
- 		} else {
--			foreach (const config &t, race_->additional_traits())
-+			BOOST_FOREACH(const config &t, race_->additional_traits())
- 			{
- 				if (alignment_ != NEUTRAL || t["id"] != "fearless")
- 					possibleTraits_.add_child("trait", t);
-@@ -722,7 +722,7 @@
- 	}
- 
- 	// Insert any traits that are just for this unit type
--	foreach (const config &trait, cfg.child_range("trait"))
-+	BOOST_FOREACH(const config &trait, cfg.child_range("trait"))
- 	{
- 		possibleTraits_.add_child("trait", trait);
- 	}
-@@ -750,7 +750,7 @@
- 	game_config::add_color_info(cfg);
- 
- 
--	foreach (const config &portrait, cfg_.child_range("portrait")) {
-+	BOOST_FOREACH(const config &portrait, cfg_.child_range("portrait")) {
- 		portraits_.push_back(tportrait(portrait));
- 	}
- 
-@@ -807,7 +807,7 @@
- 
- 	if (const config &abil_cfg = cfg.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil_cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil_cfg.all_children_range()) {
- 			const config::attribute_value &name = ab.cfg["name"];
- 			if (!name.empty()) {
- 				abilities_.push_back(name.t_str());
-@@ -816,15 +816,15 @@
- 		}
- 	}
- 
--	foreach (const config &adv, cfg.child_range("advancement"))
-+	BOOST_FOREACH(const config &adv, cfg.child_range("advancement"))
- 	{
--		foreach (const config &effect, adv.child_range("effect"))
-+		BOOST_FOREACH(const config &effect, adv.child_range("effect"))
- 		{
- 			const config &abil_cfg = effect.child("abilities");
- 			if (!abil_cfg || effect["apply_to"] != "new_ability") {
- 				continue;
- 			}
--			foreach (const config::any_child &ab, abil_cfg.all_children_range()) {
-+			BOOST_FOREACH(const config::any_child &ab, abil_cfg.all_children_range()) {
- 				const config::attribute_value &name = ab.cfg["name"];
- 				if (!name.empty()) {
- 					adv_abilities_.push_back(name.t_str());
-@@ -934,7 +934,7 @@
- std::vector<attack_type> unit_type::attacks() const
- {
- 	std::vector<attack_type> res;
--	foreach (const config &att, cfg_.child_range("attack")) {
-+	BOOST_FOREACH(const config &att, cfg_.child_range("attack")) {
- 		res.push_back(attack_type(att));
- 	}
- 
-@@ -990,7 +990,7 @@
- {
- 	if (const config &abil = cfg_.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil.all_children_range()) {
- 			if (ab.cfg["id"] == ability)
- 				return true;
- 		}
-@@ -1005,7 +1005,7 @@
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
- 
--	foreach (const config::any_child &ab, abilities.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) {
- 		const std::string &id = ab.cfg["id"];
- 		if (!id.empty())
- 			res.push_back(id);
-@@ -1077,7 +1077,7 @@
- 	if (!ut)
- 		return;
- 
--	foreach(const std::string& adv, ut->advances_to()) {
-+	BOOST_FOREACH(const std::string& adv, ut->advances_to()) {
- 		if (tree.insert(adv).second) {
- 			// insertion succeed, expand the new type
- 			advancement_tree_internal(adv, tree);
-@@ -1098,9 +1098,9 @@
- 	unit_types.build_all(unit_type::HELP_INDEX);
- 
- 	std::vector<std::string> adv_from;
--	foreach (const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
- 	{
--		foreach(const std::string& adv, ut.second.advances_to()) {
-+		BOOST_FOREACH(const std::string& adv, ut.second.advances_to()) {
- 			if (adv == id_)
- 				adv_from.push_back(ut.second.id());
- 		}
-@@ -1127,7 +1127,7 @@
-     clear();
-     set_unit_config(cfg);
- 
--	foreach (const config &mt, cfg.child_range("movetype"))
-+	BOOST_FOREACH(const config &mt, cfg.child_range("movetype"))
- 	{
- 		const unit_movement_type move_type(mt);
- 		movement_types_.insert(
-@@ -1135,14 +1135,14 @@
- 		loadscreen::increment_progress();
- 	}
- 
--	foreach (const config &r, cfg.child_range("race"))
-+	BOOST_FOREACH(const config &r, cfg.child_range("race"))
- 	{
- 		const unit_race race(r);
- 		races_.insert(std::pair<std::string,unit_race>(race.id(),race));
- 		loadscreen::increment_progress();
- 	}
- 
--	foreach (config &ut, cfg.child_range("unit_type"))
-+	BOOST_FOREACH(config &ut, cfg.child_range("unit_type"))
- 	{
- 		std::string id = ut["id"];
- 		if (const config &bu = ut.child("base_unit"))
-@@ -1195,7 +1195,7 @@
- 
- void unit_type_data::check_types(const std::vector<std::string>& types) const
- {
--	foreach(const std::string& type, types) {
-+	BOOST_FOREACH(const std::string& type, types) {
- 		if(!find(type)) throw game::game_error("unknown unit type: " + type);
- 	}
- }
-@@ -1279,7 +1279,7 @@
- 
- 	std::vector<std::string> trees = utils::split(cfg["type_adv_tree"]);
- 	hide_help_type_.back().insert(trees.begin(), trees.end());
--	foreach(const std::string& t_id, trees) {
-+	BOOST_FOREACH(const std::string& t_id, trees) {
- 		unit_type_map::iterator ut = types_.find(t_id);
- 		if (ut != types_.end()) {
- 			std::set<std::string> adv_tree = ut->second.advancement_tree();
-@@ -1310,7 +1310,7 @@
- {
-     const config& cfg = to_unit.get_cfg();
- 
--    foreach (const config &af, cfg.child_range("advancefrom"))
-+    BOOST_FOREACH(const config &af, cfg.child_range("advancefrom"))
-     {
-         const std::string &from = af["unit"];
-         int xp = af["experience"];
-@@ -1349,12 +1349,12 @@
- 	// status gets changed. In the unlikely event it gets changed
- 	// multiple times, we want to try to do it in the same order
- 	// that unit::apply_modifications does things.
--	foreach (const config &mod, possible_traits())
-+	BOOST_FOREACH(const config &mod, possible_traits())
- 	{
- 		if (mod["availability"] != "musthave")
- 			continue;
- 
--		foreach (const config &effect, mod.child_range("effect"))
-+		BOOST_FOREACH(const config &effect, mod.child_range("effect"))
- 		{
- 			// See if the effect only applies to
- 			// certain unit types But don't worry
-Index: src/game_controller.cpp
-===================================================================
---- src/game_controller.cpp	(revision 54624)
-+++ src/game_controller.cpp	(revision 54625)
-@@ -50,6 +50,8 @@
- #include "statistics.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CONFIG LOG_STREAM(err, log_config)
- #define WRN_CONFIG LOG_STREAM(warn, log_config)
-@@ -478,7 +480,7 @@
- 	}
- 
- 	int side_num = 1;
--	foreach (config &s, level.child_range("side"))
-+	BOOST_FOREACH(config &s, level.child_range("side"))
- 	{
- 		std::map<int,std::string>::const_iterator type = side_types.find(side_num),
- 		                                          controller = side_controllers.find(side_num),
-@@ -507,7 +509,7 @@
- 				faction_excepts.clear();
- 			}
- 			unsigned j = 0;
--			foreach (const config &faction, era_cfg.child_range("multiplayer_side"))
-+			BOOST_FOREACH(const config &faction, era_cfg.child_range("multiplayer_side"))
- 			{
- 				if (faction["random_faction"].to_bool()) continue;
- 				const std::string &faction_id = faction["id"];
-@@ -673,7 +675,7 @@
- 	}
- 
- 	if(state_.classification().campaign_type == "multiplayer") {
--		foreach (config &side, state_.snapshot.child_range("side"))
-+		BOOST_FOREACH(config &side, state_.snapshot.child_range("side"))
- 		{
- 			if (side["controller"] == "network")
- 				side["controller"] = "human";
-@@ -683,10 +685,10 @@
- 	}
- 
- 	if (load.cancel_orders()) {
--		foreach (config &side, state_.snapshot.child_range("side"))
-+		BOOST_FOREACH(config &side, state_.snapshot.child_range("side"))
- 		{
- 			if (side["controller"] != "human") continue;
--			foreach (config &unit, side.child_range("unit"))
-+			BOOST_FOREACH(config &unit, side.child_range("unit"))
- 			{
- 				unit["goto_x"] = -999;
- 				unit["goto_y"] = -999;
-@@ -710,7 +712,7 @@
- 
- void game_controller::mark_completed_campaigns(std::vector<config> &campaigns)
- {
--	foreach (config &campaign, campaigns) {
-+	BOOST_FOREACH(config &campaign, campaigns) {
- 		campaign["completed"] = preferences::is_campaign_completed(campaign["id"]);
- 	}
- }
-@@ -1218,7 +1220,7 @@
- 		game_config_.splice_children(core_terrain_rules, "terrain_graphics");
- 
- 		config& hashes = game_config_.add_child("multiplayer_hashes");
--		foreach (const config &ch, game_config_.child_range("multiplayer")) {
-+		BOOST_FOREACH(const config &ch, game_config_.child_range("multiplayer")) {
- 			hashes[ch["id"]] = ch.hash();
- 		}
- 
-Index: src/unit.cpp
-===================================================================
---- src/unit.cpp	(revision 54624)
-+++ src/unit.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "unit.hpp"
- 
- #include "callable_objects.hpp"
--#include "foreach.hpp"
- #include "formula.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -38,6 +37,7 @@
- #include "side_filter.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
- static lg::log_domain log_unit("unit");
- #define DBG_UT LOG_STREAM(debug, log_unit)
- #define LOG_UT LOG_STREAM(info, log_unit)
-@@ -288,7 +288,7 @@
- 			filter_recall_ = filter_recall.get_config();
- 
- 		const vconfig::child_list& events = vcfg->get_children("event");
--		foreach(const vconfig& e, events) {
-+		BOOST_FOREACH(const vconfig& e, events) {
- 			events_.add_child("event", e.get_config());
- 		}
- 	}
-@@ -296,7 +296,7 @@
- 	{
- 		filter_recall_ = cfg.child_or_empty("filter_recall");
- 
--		foreach(const config& unit_event, cfg.child_range("event")) {
-+		BOOST_FOREACH(const config& unit_event, cfg.child_range("event")) {
- 			events_.add_child("event", unit_event);
- 		}
- 	}
-@@ -375,7 +375,7 @@
- 			formula_vars_ = new game_logic::map_formula_callable;
- 
- 			variant var;
--			foreach (const config::attribute &i, ai_vars.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, ai_vars.attribute_range()) {
- 				var.serialize_from_string(i.second);
- 				formula_vars_->add(i.first, var);
- 			}
-@@ -432,7 +432,7 @@
- 
- 	if (const config &status_flags = cfg.child("status"))
- 	{
--		foreach (const config::attribute &st, status_flags.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &st, status_flags.attribute_range()) {
- 			if (st.first == "healable") {
- 				///@deprecated 1.9.2 'healable' instead of 'unhealable'
- 				ERR_UT << "Usage of 'healable' is deprecated, use 'unhealable' instead, "
-@@ -449,7 +449,7 @@
- 	}
- 
- 	// Remove animations from private cfg, they're not needed there now
--	foreach(const std::string& tag_name, unit_animation::all_tag_names()) {
-+	BOOST_FOREACH(const std::string& tag_name, unit_animation::all_tag_names()) {
- 		cfg_.clear_children(tag_name);
- 	}
- 
-@@ -518,7 +518,7 @@
- 		"canrecruit", "extra_recruit", "x", "y", "placement",
- 		// Useless attributes created when saving units to WML:
- 		"flag_rgb", "language_name" };
--	foreach (const char *attr, internalized_attrs) {
-+	BOOST_FOREACH(const char *attr, internalized_attrs) {
- 		input_cfg.remove_attribute(attr);
- 		cfg_.remove_attribute(attr);
- 	}
-@@ -526,11 +526,11 @@
- 	static char const *raw_attrs[] = { "description", "halo",
- 		"profile", "small_profile", "upkeep", "usage", "ellipse",
- 		"image", "image_icon", "random_traits", "generate_name" };
--	foreach (const char *attr, raw_attrs) {
-+	BOOST_FOREACH(const char *attr, raw_attrs) {
- 		input_cfg.remove_attribute(attr);
- 	}
- 
--	foreach (const config::attribute &attr, input_cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &attr, input_cfg.attribute_range()) {
- 		if (attr.first == "do_not_list") continue;
- 		WRN_UT << "Unknown attribute '" << attr.first << "' discarded.\n";
- 	}
-@@ -715,12 +715,12 @@
- 	config::const_child_itors current_traits = modifications_.child_range("trait");
- 	std::vector<config> candidate_traits;
- 
--	foreach (const config &t, type->possible_traits())
-+	BOOST_FOREACH(const config &t, type->possible_traits())
- 	{
- 		// Skip the trait if the unit already has it.
- 		const std::string &tid = t["id"];
- 		bool already = false;
--		foreach (const config &mod, current_traits)
-+		BOOST_FOREACH(const config &mod, current_traits)
- 		{
- 			if (mod["id"] == tid) {
- 				already = true;
-@@ -767,7 +767,7 @@
- {
- 	std::vector<std::string> res;
- 
--	foreach (const config &mod, modifications_.child_range("trait"))
-+	BOOST_FOREACH(const config &mod, modifications_.child_range("trait"))
- 	{
- 			std::string const &id = mod["id"];
- 			if (!id.empty())
-@@ -797,7 +797,7 @@
- 	config new_cfg;
- 	static char const *persistent_attrs[] = { "upkeep", "ellipse",
- 		"image", "image_icon", "usage", "random_traits", "generate_name" };
--	foreach (const char *attr, persistent_attrs) {
-+	BOOST_FOREACH(const char *attr, persistent_attrs) {
- 		if (const config::attribute_value *v = old_cfg.get(attr)) {
- 			new_cfg[attr] = *v;
- 		}
-@@ -813,7 +813,7 @@
- 	static char const *unit_type_attrs[] = { "movement", "movement_type",
- 		"die_sound", "flies", "inherit", "variation_name",
- 		"ignore_race_traits", "hide_help" };
--	foreach (const char *attr, unit_type_attrs) {
-+	BOOST_FOREACH(const char *attr, unit_type_attrs) {
- 		new_cfg.remove_attribute(attr);
- 	}
- 
-@@ -1020,7 +1020,7 @@
- const std::vector<std::string> unit::advances_to_translated() const
- {
- 	std::vector<std::string> result;
--	foreach (std::string type_id, advances_to_)
-+	BOOST_FOREACH(std::string type_id, advances_to_)
- 	{
- 		const unit_type *type = unit_types.find(type_id);
- 		if (type)
-@@ -1120,7 +1120,7 @@
- const std::map<std::string,std::string> unit::get_states() const
- {
- 	std::map<std::string, std::string> all_states;
--	foreach (std::string const &s, states_) {
-+	BOOST_FOREACH(std::string const &s, states_) {
- 		all_states[s] = "yes";
- 	}
- 	for (std::map<std::string, state_t>::const_iterator i = known_boolean_state_names_.begin(),
-@@ -1195,7 +1195,7 @@
- {
- 	if (const config &abil = cfg_.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil.all_children_range()) {
- 			if (ab.cfg["id"] == ability)
- 				return true;
- 		}
-@@ -2197,7 +2197,7 @@
- 	if (const config &resistance = cfg_.child("resistance"))
- 	{
- 		utils::string_map res;
--		foreach (const config::attribute &i, resistance.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, resistance.attribute_range()) {
- 			res[i.first] = i.second;
- 		}
- 		return res;
-@@ -2222,7 +2222,7 @@
- 	{
- 		std::ostringstream tooltip;
- 		const std::string &image = game_config::images::level;
--		foreach (const std::string &s, advances_to())
-+		BOOST_FOREACH(const std::string &s, advances_to())
- 		{
- 			if (!s.empty())
- 				tooltip << s << '\n';
-@@ -2230,7 +2230,7 @@
- 		temp[image] = tooltip.str();
- 	}
- 
--	foreach (const config &adv, get_modification_advances())
-+	BOOST_FOREACH(const config &adv, get_modification_advances())
- 	{
- 		const std::string &image = adv["image"];
- 		if (image.empty()) continue;
-@@ -2248,7 +2248,7 @@
- 	std::vector<std::pair<std::string,std::string> > temp;
- 	std::pair<std::string,std::string> icon; //<image,tooltip>
- 
--	foreach (const config &adv, get_modification_advances())
-+	BOOST_FOREACH(const config &adv, get_modification_advances())
- 	{
- 		icon.first = adv["icon"].str();
- 		icon.second = adv["description"].str();
-@@ -2265,7 +2265,7 @@
- std::vector<config> unit::get_modification_advances() const
- {
- 	std::vector<config> res;
--	foreach (const config &adv, modification_advancements())
-+	BOOST_FOREACH(const config &adv, modification_advancements())
- 	{
- 		if (adv["strict_amla"].to_bool() && !advances_to_.empty())
- 			continue;
-@@ -2283,7 +2283,7 @@
- 		std::unique_copy(temp.begin(), temp.end(), std::back_inserter(uniq));
- 
- 		bool requirements_done = true;
--		foreach (const std::string &s, uniq)
-+		BOOST_FOREACH(const std::string &s, uniq)
- 		{
- 			int required_num = std::count(temp.begin(), temp.end(), s);
- 			int mod_num = modification_count("advance", s);
-@@ -2302,7 +2302,7 @@
- size_t unit::modification_count(const std::string& type, const std::string& id) const
- {
- 	size_t res = 0;
--	foreach (const config &item, modifications_.child_range(type)) {
-+	BOOST_FOREACH(const config &item, modifications_.child_range(type)) {
- 		if (item["id"] == id) {
- 			++res;
- 		}
-@@ -2314,7 +2314,7 @@
- /** Helper function for add_modifications */
- static void mod_mdr_merge(config& dst, const config& mod, bool delta)
- {
--	foreach (const config::attribute &i, mod.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, mod.attribute_range()) {
- 		int v = 0;
- 		if (delta) v = dst[i.first];
- 		dst[i.first] = v + i.second.to_int();
-@@ -2336,7 +2336,7 @@
- 	}
- 	config last_effect;
- 	std::vector<t_string> effects_description;
--	foreach (const config &effect, mod.child_range("effect"))
-+	BOOST_FOREACH(const config &effect, mod.child_range("effect"))
- 	{
- 		// See if the effect only applies to certain unit types
- 		const std::string &type_filter = effect["unit_type"];
-@@ -2524,7 +2524,7 @@
- 					config &def = cfg_.child_or_add("defense");
- 					if (const config &ap = effect.child("defense")) {
- 						bool replace = effect["replace"].to_bool();
--						foreach (const config::attribute &i, ap.attribute_range()) {
-+						BOOST_FOREACH(const config::attribute &i, ap.attribute_range()) {
- 							int v = i.second.to_int();
- 							config::attribute_value &dst = def[i.first];
- 							if (!replace) {
-@@ -2551,7 +2551,7 @@
- 					config &ab = cfg_.child_or_add("abilities");
- 					if (const config &ab_effect = effect.child("abilities")) {
- 						config to_append;
--						foreach (const config::any_child &ab, ab_effect.all_children_range()) {
-+						BOOST_FOREACH(const config::any_child &ab, ab_effect.all_children_range()) {
- 							if(!has_ability_by_id(ab.cfg["id"])) {
- 								to_append.add_child(ab.key, ab.cfg);
- 							}
-@@ -2560,7 +2560,7 @@
- 					}
- 				} else if (apply_to == "remove_ability") {
- 					if (const config &ab_effect = effect.child("abilities")) {
--						foreach (const config::any_child &ab, ab_effect.all_children_range()) {
-+						BOOST_FOREACH(const config::any_child &ab, ab_effect.all_children_range()) {
- 							remove_ability_by_id(ab.cfg["id"]);
- 						}
- 					}
-@@ -2749,7 +2749,7 @@
- 
- 	for(size_t i = 0; i != NumModificationTypes; ++i) {
- 		const std::string& mod = ModificationTypes[i];
--		foreach (const config &m, modifications_.child_range(mod)) {
-+		BOOST_FOREACH(const config &m, modifications_.child_range(mod)) {
- 			log_scope("add mod");
- 			add_modification(ModificationTypes[i], m, true);
- 		}
-@@ -2779,7 +2779,7 @@
- 	bool is_inv = !get_state(STATE_UNCOVERED) && get_ability_bool(hides,loc);
- 	if(is_inv){
- 		const std::vector<team>& teams = *resources::teams;
--		foreach (const unit &u, *resources::units)
-+		BOOST_FOREACH(const unit &u, *resources::units)
- 		{
- 			const map_location &u_loc = u.get_location();
- 			if (teams[side_-1].is_enemy(u.side()) && tiles_adjacent(loc, u_loc)) {
-@@ -2881,7 +2881,7 @@
- int side_units(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) ++res;
- 	}
- 	return res;
-@@ -2890,7 +2890,7 @@
- int side_units_cost(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) res += u.cost();
- 	}
- 	return res;
-@@ -2899,7 +2899,7 @@
- int side_upkeep(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) res += u.upkeep();
- 	}
- 	return res;
-@@ -3029,7 +3029,7 @@
- const tportrait* unit::portrait(
- 		const unsigned size, const tportrait::tside side) const
- {
--	foreach(const tportrait& portrait, (type()->portraits())) {
-+	BOOST_FOREACH(const tportrait& portrait, (type()->portraits())) {
- 		if(portrait.size == size
- 				&& (side ==  portrait.side || portrait.side == tportrait::BOTH)) {
- 
-@@ -3107,20 +3107,20 @@
-         	"number",
- 		""};
- 
--	foreach (const config &att, unit_config.child_range("attack"))
-+	BOOST_FOREACH(const config &att, unit_config.child_range("attack"))
- 	{
- 		config& child = wcfg.add_child("attack");
- 		for (int i = 0; !attack_keys[i].empty(); ++i) {
- 			child[attack_keys[i]] = att[attack_keys[i]];
- 		}
--		foreach (const config &spec, att.child_range("specials")) {
-+		BOOST_FOREACH(const config &spec, att.child_range("specials")) {
- 			config& child_spec = child.add_child("specials", spec);
- 			child_spec.recursive_clear_value("description");
- 		}
- 
- 	}
- 
--	foreach (const config &abi, unit_config.child_range("abilities"))
-+	BOOST_FOREACH(const config &abi, unit_config.child_range("abilities"))
- 	{
- 		config& child = wcfg.add_child("abilities", abi);
- 		child.recursive_clear_value("description");
-@@ -3129,7 +3129,7 @@
- 		child.recursive_clear_value("name_inactive");
- 	}
- 
--	foreach (const config &trait, unit_config.child_range("trait"))
-+	BOOST_FOREACH(const config &trait, unit_config.child_range("trait"))
- 	{
- 		config& child = wcfg.add_child("trait", trait);
- 		child.recursive_clear_value("description");
-@@ -3142,7 +3142,7 @@
- 
- 	for (int i = 0; !child_keys[i].empty(); ++i)
- 	{
--		foreach (const config &c, unit_config.child_range(child_keys[i])) {
-+		BOOST_FOREACH(const config &c, unit_config.child_range(child_keys[i])) {
- 			wcfg.add_child(child_keys[i], c);
- 		}
- 	}
-Index: src/campaign_server/campaign_server.cpp
-===================================================================
---- src/campaign_server/campaign_server.cpp	(revision 54624)
-+++ src/campaign_server/campaign_server.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
-  */
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "network_worker.hpp"
- #include "serialization/binary_or_text.hpp"
-@@ -35,6 +34,7 @@
- 
- #include <csignal>
- 
-+#include <boost/foreach.hpp>
- #include <boost/iostreams/filter/gzip.hpp>
- 
- // the fork execute is unix specific only tested on Linux quite sure it won't
-@@ -202,7 +202,7 @@
- 
- 	void find_translations(const config& cfg, config& campaign)
- 	{
--		foreach (const config &dir, cfg.child_range("dir"))
-+		BOOST_FOREACH(const config &dir, cfg.child_range("dir"))
- 		{
- 			if (dir["name"] == "LC_MESSAGES") {
- 				config &language = campaign.add_child("translation");
-@@ -249,7 +249,7 @@
- 			LOG_CS << "Encoding all stored addons. Number of addons: "
- 				<< std::distance(camps.first, camps.second) << '\n';
- 
--			foreach (const config &cm, camps)
-+			BOOST_FOREACH(const config &cm, camps)
- 			{
- 				LOG_CS << "Encoding " << cm["name"] << '\n';
- 				std::string filename = cm["filename"], newfilename = filename + ".new";
-@@ -345,7 +345,7 @@
- 						} catch(bad_lexical_cast) {}
- 
- 						std::string name = req["name"], lang = req["language"];
--						foreach (const config &i, campaigns().child_range("campaign"))
-+						BOOST_FOREACH(const config &i, campaigns().child_range("campaign"))
- 						{
- 							if (!name.empty() && name != i["name"]) continue;
- 							std::string tm = i["timestamp"];
-@@ -353,7 +353,7 @@
- 							if (after_flag && (tm.empty() || lexical_cast_default<time_t>(tm, 0) <= after)) continue;
- 							if (!lang.empty()) {
- 								bool found = false;
--								foreach (const config &j, i.child_range("translation")) {
-+								BOOST_FOREACH(const config &j, i.child_range("translation")) {
- 									if (j["language"] == lang) {
- 										found = true;
- 										break;
-@@ -364,7 +364,7 @@
- 							campaign_list.add_child("campaign", i);
- 						}
- 
--						foreach (config &j, campaign_list.child_range("campaign")) {
-+						BOOST_FOREACH(config &j, campaign_list.child_range("campaign")) {
- 							j["passphrase"] = t_string();
- 							j["upload_ip"] = t_string();
- 							j["email"] = t_string();
-@@ -402,7 +402,7 @@
- 						std::string lc_name(name.size(), ' ');
- 						std::transform(name.begin(), name.end(), lc_name.begin(), tolower);
- 						config *campaign = NULL;
--						foreach (config &c, campaigns().child_range("campaign")) {
-+						BOOST_FOREACH(config &c, campaigns().child_range("campaign")) {
- 							if (utils::lowercase(c["name"]) == lc_name) {
- 								campaign = &c;
- 								break;
-Index: src/image_modifications.cpp
-===================================================================
---- src/image_modifications.cpp	(revision 54624)
-+++ src/image_modifications.cpp	(revision 54625)
-@@ -15,13 +15,14 @@
- 
- #include "color_range.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "image.hpp"
- #include "image_modifications.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- 
- #define GETTEXT_DOMAIN "wesnoth-lib"
-@@ -99,7 +100,7 @@
- {
- 	modification_queue mods;
- 
--	foreach(const std::string& encoded_mod,
-+	BOOST_FOREACH(const std::string& encoded_mod,
- 		utils::parenthetical_split(encoded_mods, '~')) {
- 		modification* mod = decode_modification(encoded_mod);
- 
-Index: src/statistics.cpp
-===================================================================
---- src/statistics.cpp	(revision 54624)
-+++ src/statistics.cpp	(revision 54625)
-@@ -20,12 +20,13 @@
- 
- #include "global.hpp"
- #include "statistics.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/binary_or_text.hpp"
- #include "unit.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- 
-@@ -57,7 +58,7 @@
- 	team_stats(),
- 	scenario_name(cfg["scenario"])
- {
--	foreach (const config &team, cfg.child_range("team")) {
-+	BOOST_FOREACH(const config &team, cfg.child_range("team")) {
- 		team_stats[team["save_id"]] = stats(team);
- 	}
- }
-@@ -121,7 +122,7 @@
- static stats::str_int_map read_str_int_map(const config& cfg)
- {
- 	stats::str_int_map m;
--	foreach (const config::attribute &i, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg.attribute_range()) {
- 		m[i.first] = i.second;
- 	}
- 
-@@ -159,7 +160,7 @@
- static stats::battle_result_map read_battle_result_map(const config& cfg)
- {
- 	stats::battle_result_map m;
--	foreach (const config &i, cfg.child_range("sequence"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("sequence"))
- 	{
- 		config item = i;
- 		int key = item["_num"];
-@@ -612,7 +613,7 @@
- 	fresh_stats();
- 	mid_scenario = cfg["mid_scenario"].to_bool();
- 
--	foreach (const config &s, cfg.child_range("scenario")) {
-+	BOOST_FOREACH(const config &s, cfg.child_range("scenario")) {
- 		master_stats.push_back(scenario_stats(s));
- 	}
- }
-Index: src/tooltips.cpp
-===================================================================
---- src/tooltips.cpp	(revision 54624)
-+++ src/tooltips.cpp	(revision 54625)
-@@ -17,13 +17,14 @@
- #include "tooltips.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "help.hpp"
- #include "marked-up_text.hpp"
- #include "resources.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 
- CVideo* video_ = NULL;
-@@ -172,7 +173,7 @@
- 
- bool click(int mousex, int mousey)
- {
--	foreach(tooltip tip, tips) {
-+	BOOST_FOREACH(tooltip tip, tips) {
- 		if(!tip.action.empty() && point_in_rect(mousex, mousey, tip.rect)) {
- 			display* disp = resources::screen;
- 			help::show_help(*disp, tip.action);
-Index: src/server/ban.cpp
-===================================================================
---- src/server/ban.cpp	(revision 54624)
-+++ src/server/ban.cpp	(revision 54625)
-@@ -14,7 +14,6 @@
- */
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "filesystem.hpp"
- #include "serialization/parser.hpp"
-@@ -24,7 +23,7 @@
- 
- #include "ban.hpp"
- 
--
-+#include <boost/foreach.hpp>
- #include <boost/bind.hpp>
- 
- namespace wesnothd {
-@@ -260,7 +259,7 @@
- 		scoped_istream ban_file = istream_file(filename_);
- 		read_gz(cfg, *ban_file);
- 
--		foreach (const config &b, cfg.child_range("ban"))
-+		BOOST_FOREACH(const config &b, cfg.child_range("ban"))
- 		{
- 			try {
- 				banned_ptr new_ban(new banned(b));
-@@ -276,7 +275,7 @@
- 		// load deleted too
- 		if (const config &cfg_del = cfg.child("deleted"))
- 		{
--			foreach (const config &b, cfg_del.child_range("ban"))
-+			BOOST_FOREACH(const config &b, cfg_del.child_range("ban"))
- 			{
- 				try {
- 					banned_ptr new_ban(new banned(b));
-@@ -680,7 +679,7 @@
- 	void ban_manager::load_config(const config& cfg)
- 	{
- 		ban_times_.clear();
--		foreach (const config &bt, cfg.child_range("ban_time")) {
-+		BOOST_FOREACH(const config &bt, cfg.child_range("ban_time")) {
- 			time_t duration = 0;
- 			if (parse_time(bt["time"], &duration)) {
- 				ban_times_.insert(default_ban_times::value_type(bt["name"], duration));
-Index: src/server/server.cpp
-===================================================================
---- src/server/server.cpp	(revision 54624)
-+++ src/server/server.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "../global.hpp"
- 
- #include "../config.hpp"
--#include "../foreach.hpp"
- #include "../game_config.hpp"
- #include "../log.hpp"
- #include "../map.hpp" // gamemap::MAX_PLAYERS
-@@ -54,6 +53,7 @@
- #include <boost/bind.hpp>
- #include <boost/scoped_ptr.hpp>
- #include <boost/scoped_array.hpp>
-+#include <boost/foreach.hpp>
- #include <boost/utility.hpp>
- #include <algorithm>
- #include <cassert>
-@@ -556,15 +556,15 @@
- 	}
- 
- 	redirected_versions_.clear();
--	foreach (const config &redirect, cfg_.child_range("redirect")) {
--		foreach (const std::string &version, utils::split(redirect["version"])) {
-+	BOOST_FOREACH(const config &redirect, cfg_.child_range("redirect")) {
-+		BOOST_FOREACH(const std::string &version, utils::split(redirect["version"])) {
- 			redirected_versions_[version] = redirect;
- 		}
- 	}
- 
- 	proxy_versions_.clear();
--	foreach (const config &proxy, cfg_.child_range("proxy")) {
--		foreach (const std::string &version, utils::split(proxy["version"])) {
-+	BOOST_FOREACH(const config &proxy, cfg_.child_range("proxy")) {
-+		BOOST_FOREACH(const std::string &version, utils::split(proxy["version"])) {
- 			proxy_versions_[version] = proxy;
- 		}
- 	}
-@@ -704,7 +704,7 @@
- 				simple_wml::document ping( strstr.str().c_str(),
- 							   simple_wml::INIT_COMPRESSED );
- 				simple_wml::string_span s = ping.output_compressed();
--				foreach (network::connection sock, ghost_players_) {
-+				BOOST_FOREACH(network::connection sock, ghost_players_) {
- 					if (!lg::debug.dont_log(log_server)) {
- 						wesnothd::player_map::const_iterator i = players_.find(sock);
- 						if (i != players_.end()) {
-@@ -720,7 +720,7 @@
-  				// Only a single thread should be accessing this
- 				// Erase before we copy - speeds inserts
- 				ghost_players_.clear();
--				foreach (const wesnothd::player_map::value_type v, players_) {
-+				BOOST_FOREACH(const wesnothd::player_map::value_type v, players_) {
- 					ghost_players_.insert(v.first);
- 				}
- 				last_ping_ = now;
-Index: src/server/room_manager.cpp
-===================================================================
---- src/server/room_manager.cpp	(revision 54624)
-+++ src/server/room_manager.cpp	(revision 54625)
-@@ -21,9 +21,10 @@
- #include "../serialization/string_utils.hpp"
- #include "../util.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_server_lobby("server/lobby");
- #define ERR_LOBBY LOG_STREAM(err, log_server_lobby)
- #define WRN_LOBBY LOG_STREAM(warn, log_server_lobby)
-@@ -58,7 +59,7 @@
- 	// this assumes the server is shutting down, so there's no need to
- 	// send the actual room-quit messages to clients
- 	write_rooms();
--	foreach (t_rooms_by_name_::value_type i, rooms_by_name_) {
-+	BOOST_FOREACH(t_rooms_by_name_::value_type i, rooms_by_name_) {
- 		delete i.second;
- 	}
- }
-@@ -97,7 +98,7 @@
- 			read(cfg, *file);
- 		}
- 
--		foreach (const config &c, cfg.child_range("room")) {
-+		BOOST_FOREACH(const config &c, cfg.child_range("room")) {
- 			room* r(new room(c));
- 			if (room_exists(r->name())) {
- 				ERR_LOBBY << "Duplicate room ignored in stored rooms: "
-@@ -122,7 +123,7 @@
- 	if (filename_.empty()) return;
- 	LOG_LOBBY << "Writing rooms to " << filename_ << "\n";
- 	config cfg;
--	foreach (const t_rooms_by_name_::value_type& v, rooms_by_name_) {
-+	BOOST_FOREACH(const t_rooms_by_name_::value_type& v, rooms_by_name_) {
- 		const room& r = *v.second;
- 		if (r.persistent()) {
- 			config& c = cfg.add_child("room");
-@@ -211,7 +212,7 @@
- 
- void room_manager::enter_lobby(const wesnothd::game &game)
- {
--	foreach (network::connection player, game.all_game_users()) {
-+	BOOST_FOREACH(network::connection player, game.all_game_users()) {
- 		enter_lobby(player);
- 	}
- }
-@@ -225,7 +226,7 @@
- 	store_player_rooms(player);
- 	t_rooms_by_player_::iterator i = rooms_by_player_.find(player);
- 	if (i != rooms_by_player_.end()) {
--		foreach (room* r, i->second) {
-+		BOOST_FOREACH(room* r, i->second) {
- 			r->remove_player(player);
- 		}
- 	}
-@@ -244,7 +245,7 @@
- 	lobby_->remove_player(player);
- 	t_rooms_by_player_::iterator i = rooms_by_player_.find(player);
- 	if (i != rooms_by_player_.end()) {
--		foreach (room* r, i->second) {
-+		BOOST_FOREACH(room* r, i->second) {
- 			r->remove_player(player);
- 		}
- 	}
-@@ -315,7 +316,7 @@
- 	t_player_stored_rooms_::iterator it =
- 		player_stored_rooms_.insert(std::make_pair(player, std::set<std::string>())).first;
- 	std::set<std::string>& store = it->second;
--	foreach (room* r, i->second) {
-+	BOOST_FOREACH(room* r, i->second) {
- 		store.insert(r->name());
- 	}
- }
-@@ -337,7 +338,7 @@
- 	simple_wml::document doc;
- 	simple_wml::node& join_msg = doc.root().add_child("room_join");
- 	join_msg.set_attr_dup("player", user->second.name().c_str());
--	foreach (const std::string& room_name, it->second) {
-+	BOOST_FOREACH(const std::string& room_name, it->second) {
- 		room* r = get_create_room(room_name, user->first);
- 		if (r == NULL) {
- 			LOG_LOBBY << "Player " << user->second.name() << " unable to rejoin room " << room_name << "\n";
-@@ -528,7 +529,7 @@
- void room_manager::fill_room_list(simple_wml::node& root)
- {
- 	simple_wml::node& rooms = root.add_child("rooms");
--	foreach (const t_rooms_by_name_::value_type& tr, rooms_by_name_) {
-+	BOOST_FOREACH(const t_rooms_by_name_::value_type& tr, rooms_by_name_) {
- 		const room& r = *tr.second;
- 		simple_wml::node& room = rooms.add_child("room");
- 		room.set_attr_dup("name", r.name().c_str());
-@@ -539,7 +540,7 @@
- void room_manager::fill_member_list(const room* room, simple_wml::node& root)
- {
- 	simple_wml::node& members = root.add_child("members");
--	foreach (network::connection m, room->members()) {
-+	BOOST_FOREACH(network::connection m, room->members()) {
- 		simple_wml::node& member = members.add_child("member");
- 		player_map::const_iterator mi = all_players_.find(m);
- 		if (mi != all_players_.end()) {
-Index: src/variable.cpp
-===================================================================
---- src/variable.cpp	(revision 54624)
-+++ src/variable.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "variable.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gamestatus.hpp"
- #include "log.hpp"
-@@ -34,6 +33,7 @@
- #include "team.hpp"
- 
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -233,11 +233,11 @@
- {
- 	config res;
- 
--	foreach (const config::attribute &i, cfg_->attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg_->attribute_range()) {
- 		res[i.first] = expand(i.first);
- 	}
- 
--	foreach (const config::any_child &child, cfg_->all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg_->all_children_range())
- 	{
- 		if (child.key == "insert_tag") {
- 			vconfig insert_cfg(child.cfg);
-@@ -283,7 +283,7 @@
- {
- 	vconfig::child_list res;
- 
--	foreach (const config::any_child &child, cfg_->all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg_->all_children_range())
- 	{
- 		if (child.key == key) {
- 			res.push_back(vconfig(&child.cfg, cache_key_));
-@@ -319,7 +319,7 @@
- 	if (const config &natural = cfg_->child(key)) {
- 		return vconfig(&natural, cache_key_);
- 	}
--	foreach (const config &ins, cfg_->child_range("insert_tag"))
-+	BOOST_FOREACH(const config &ins, cfg_->child_range("insert_tag"))
- 	{
- 		vconfig insert_cfg(ins);
- 		if(insert_cfg["name"] == key) {
-@@ -339,7 +339,7 @@
- 	if (cfg_->child(key)) {
- 		return true;
- 	}
--	foreach (const config &ins, cfg_->child_range("insert_tag"))
-+	BOOST_FOREACH(const config &ins, cfg_->child_range("insert_tag"))
- 	{
- 		vconfig insert_cfg(ins);
- 		if(insert_cfg["name"] == key) {
-@@ -475,7 +475,7 @@
- 
- config &scoped_wml_variable::store(const config &var_value)
- {
--	foreach (const config &i, repos->get_variables().child_range(var_name_)) {
-+	BOOST_FOREACH(const config &i, repos->get_variables().child_range(var_name_)) {
- 		previous_val_.add_child(var_name_, i);
- 	}
- 	repos->clear_variable_cfg(var_name_);
-@@ -489,7 +489,7 @@
- {
- 	if(activated_) {
- 		repos->clear_variable_cfg(var_name_);
--		foreach (const config &i, previous_val_.child_range(var_name_)) {
-+		BOOST_FOREACH(const config &i, previous_val_.child_range(var_name_)) {
- 			repos->add_variable_cfg(var_name_, i);
- 		}
- 		LOG_NG << "scoped_wml_variable: var_name \"" << var_name_ << "\" has been reverted.\n";
-Index: src/preferences_display.cpp
-===================================================================
---- src/preferences_display.cpp	(revision 54624)
-+++ src/preferences_display.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/simple_item_selector.hpp"
-@@ -35,6 +34,8 @@
- #include "marked-up_text.hpp"
- #include "wml_separators.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace preferences {
- 
- display* disp = NULL;
-@@ -82,7 +83,7 @@
- 	bpp = video.modePossible(resolution.first, resolution.second,
- 		DefaultBPP, video_flags, true);
- 
--	foreach (const res_t &res, res_list)
-+	BOOST_FOREACH(const res_t &res, res_list)
- 	{
- 		if (bpp != 0) break;
- 		std::cerr << "Video mode " << resolution.first << 'x'
-Index: src/hotkeys.cpp
-===================================================================
---- src/hotkeys.cpp	(revision 54624)
-+++ src/hotkeys.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "hotkeys.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -33,6 +32,8 @@
- #include "wesconfig.h"
- #include "wml_separators.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_G LOG_STREAM(err, lg::general)
- #define LOG_G LOG_STREAM(info, lg::general)
-@@ -609,7 +610,7 @@
- 
- void load_hotkeys(const config& cfg)
- {
--	foreach (const config &hk, cfg.child_range(hotkey_tag_name))
-+	BOOST_FOREACH(const config &hk, cfg.child_range(hotkey_tag_name))
- 	{
- 		hotkey_item& h = get_hotkey(hk["command"]);
- 		if(h.get_id() != HOTKEY_NULL) {
-Index: src/unit_display.cpp
-===================================================================
---- src/unit_display.cpp	(revision 54624)
-+++ src/unit_display.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- #include "unit_display.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "game_events.hpp"
- #include "log.hpp"
-@@ -26,6 +25,7 @@
- #include "resources.hpp"
- #include "terrain_filter.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #define LOG_DP LOG_STREAM(info, display)
- 
-@@ -472,7 +472,7 @@
- 	disp->display_unit_hex(healed_loc);
- 	unit_animator animator;
- 
--	foreach (unit *h, healers) {
-+	BOOST_FOREACH(unit *h, healers) {
- 		h->set_facing(h->get_location().get_relative_dir(healed_loc));
- 		animator.add_animation(h, "healing", h->get_location(),
- 			healed_loc, healing);
-Index: src/editor/map_fragment.cpp
-===================================================================
---- src/editor/map_fragment.cpp	(revision 54624)
-+++ src/editor/map_fragment.cpp	(revision 54625)
-@@ -16,9 +16,10 @@
- 
- #include "map_fragment.hpp"
- 
--#include "../foreach.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace editor {
- 
- map_fragment::map_fragment()
-@@ -44,7 +45,7 @@
- 
- void map_fragment::add_tiles(const gamemap& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		add_tile(map, loc);
- 	}
- }
-@@ -57,7 +58,7 @@
- std::set<map_location> map_fragment::get_offset_area(const map_location& loc) const
- {
- 	std::set<map_location> result;
--	foreach (const tile_info& i, items_) {
-+	BOOST_FOREACH(const tile_info& i, items_) {
- 		result.insert(i.offset.vector_sum(loc));
- 	}
- 	return result;
-@@ -65,14 +66,14 @@
- 
- void map_fragment::paste_into(gamemap& map, const map_location& loc) const
- {
--	foreach (const tile_info& i, items_) {
-+	BOOST_FOREACH(const tile_info& i, items_) {
- 		map.set_terrain(i.offset.vector_sum(loc), i.terrain);
- 	}
- }
- 
- void map_fragment::shift(const map_location& offset)
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.vector_sum_assign(offset);
- 	}
- }
-@@ -80,7 +81,7 @@
- map_location map_fragment::center_of_mass() const
- {
- 	map_location sum(0, 0);
--	foreach (const tile_info& ti, items_) {
-+	BOOST_FOREACH(const tile_info& ti, items_) {
- 		sum.vector_sum_assign(ti.offset);
- 	}
- 	sum.x /= static_cast<int>(items_.size());
-@@ -92,7 +93,7 @@
- {
- 	shift(center_of_mass().vector_negation());
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		area_.insert(ti.offset);
- 	}
- }
-@@ -100,7 +101,7 @@
- void map_fragment::rotate_60_cw()
- {
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		map_location l(0,0);
- 		int x = ti.offset.x;
- 		int y = ti.offset.y;
-@@ -120,7 +121,7 @@
- void map_fragment::rotate_60_ccw()
- {
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		map_location l(0,0);
- 		int x = ti.offset.x;
- 		int y = ti.offset.y;
-@@ -139,7 +140,7 @@
- 
- void map_fragment::flip_horizontal()
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.x = -ti.offset.x;
- 	}
- 	center_by_mass();
-@@ -147,7 +148,7 @@
- 
- void map_fragment::flip_vertical()
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.y = -ti.offset.y;
- 		if (ti.offset.x % 2) {
- 			ti.offset.y--;
-@@ -166,11 +167,11 @@
- {
- 	std::stringstream ss;
- 	ss << "MF: ";
--	foreach (const tile_info& ti, items_) {
-+	BOOST_FOREACH(const tile_info& ti, items_) {
- 		ss << "(" << ti.offset << ")";
- 	}
- 	ss << " -- ";
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		ss << "(" << loc << ")";
- 	}
- 	return ss.str();
-Index: src/editor/action.cpp
-===================================================================
---- src/editor/action.cpp	(revision 54624)
-+++ src/editor/action.cpp	(revision 54625)
-@@ -21,10 +21,10 @@
- 
- #include "editor/action.hpp"
- #include "editor/map_context.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
- namespace editor {
- 
- int editor_action::next_id_ = 1;
-@@ -75,25 +75,25 @@
- editor_action_chain::editor_action_chain(const editor::editor_action_chain &other)
- 	: editor_action(), actions_()
- {
--	foreach (editor_action* a, other.actions_) {
-+	BOOST_FOREACH(editor_action* a, other.actions_) {
- 		actions_.push_back(a->clone());
- 	}
- }
- editor_action_chain& editor_action_chain::operator=(const editor_action_chain& other)
- {
- 	if (this == &other) return *this;
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		delete a;
- 	}
- 	actions_.clear();
--	foreach (editor_action* a, other.actions_) {
-+	BOOST_FOREACH(editor_action* a, other.actions_) {
- 		actions_.push_back(a->clone());
- 	}
- 	return *this;
- }
- editor_action_chain::~editor_action_chain()
- {
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		delete a;
- 	}
- }
-@@ -103,7 +103,7 @@
- }
- int editor_action_chain::action_count() const {
- 	int count = 0;
--	foreach (const editor_action* a, actions_) {
-+	BOOST_FOREACH(const editor_action* a, actions_) {
- 		if (a) {
- 			count += a->action_count();
- 		}
-@@ -133,7 +133,7 @@
- }
- editor_action_chain* editor_action_chain::perform(map_context& mc) const {
- 	util::unique_ptr<editor_action_chain> undo(new editor_action_chain());
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		if (a != NULL) {
- 			undo->append_action(a->perform(mc));
- 		}
-@@ -143,7 +143,7 @@
- }
- void editor_action_chain::perform_without_undo(map_context& mc) const
- {
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		if (a != NULL) {
- 			a->perform_without_undo(mc);
- 		}
-@@ -257,7 +257,7 @@
- }
- void editor_action_select::extend(const editor_map& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		LOG_ED << "Checking " << loc << "\n";
- 		if (map.in_selection(loc)) {
- 			LOG_ED << "Extending by " << loc << "\n";
-@@ -268,7 +268,7 @@
- editor_action* editor_action_select::perform(map_context& mc) const
- {
- 	std::set<map_location> undo_locs;
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		if (!mc.get_map().in_selection(loc)) {
- 			undo_locs.insert(loc);
- 			mc.add_changed_location(loc);
-@@ -279,7 +279,7 @@
- }
- void editor_action_select::perform_without_undo(map_context& mc) const
- {
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		mc.get_map().add_to_selection(loc);
- 		mc.add_changed_location(loc);
- 	}
-@@ -291,7 +291,7 @@
- }
- void editor_action_deselect::extend(const editor_map& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		LOG_ED << "Checking " << loc << "\n";
- 		if (!map.in_selection(loc)) {
- 			LOG_ED << "Extending by " << loc << "\n";
-@@ -302,7 +302,7 @@
- editor_action* editor_action_deselect::perform(map_context& mc) const
- {
- 	std::set<map_location> undo_locs;
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		if (mc.get_map().in_selection(loc)) {
- 			undo_locs.insert(loc);
- 			mc.add_changed_location(loc);
-@@ -313,7 +313,7 @@
- }
- void editor_action_deselect::perform_without_undo(map_context& mc) const
- {
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		mc.get_map().remove_from_selection(loc);
- 		mc.add_changed_location(loc);
- 	}
-Index: src/editor/map_context.cpp
-===================================================================
---- src/editor/map_context.cpp	(revision 54624)
-+++ src/editor/map_context.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "../display.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../map_exception.hpp"
- #include "../map_label.hpp"
-@@ -28,6 +27,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/regex.hpp>
-+#include <boost/foreach.hpp>
- 
- 
- namespace editor {
-@@ -146,7 +146,7 @@
- 	if (!one_layer_only) {
- 		terrain = map_.get_terrain_info(terrain).terrain_with_default_base();
- 	}
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		draw_terrain_actual(terrain, loc, one_layer_only);
- 	}
- }
-@@ -374,7 +374,7 @@
- 
- void map_context::clear_stack(action_stack& stack)
- {
--	foreach (editor_action* a, stack) {
-+	BOOST_FOREACH(editor_action* a, stack) {
- 		delete a;
- 	}
- 	stack.clear();
-Index: src/editor/brush.cpp
-===================================================================
---- src/editor/brush.cpp	(revision 54624)
-+++ src/editor/brush.cpp	(revision 54625)
-@@ -17,9 +17,10 @@
- #include "brush.hpp"
- #include "editor_common.hpp"
- 
--#include "../foreach.hpp"
- #include "../pathutils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace editor {
- 
- /*WIKI
-@@ -74,11 +75,11 @@
- 	if (radius > 0) {
- 		std::vector<map_location> in_radius;
- 		get_tiles_in_radius(map_location(0, 0), radius, in_radius);
--		foreach (map_location& loc, in_radius) {
-+		BOOST_FOREACH(map_location& loc, in_radius) {
- 			add_relative_location(loc.x, loc.y);
- 		}
- 	}
--	foreach (const config &relative, cfg.child_range("relative"))
-+	BOOST_FOREACH(const config &relative, cfg.child_range("relative"))
- 	{
- 		int x = relative["x"];
- 		int y = relative["y"];
-@@ -97,7 +98,7 @@
- std::set<map_location> brush::project(const map_location& hotspot) const
- {
- 	std::set<map_location> result;
--	foreach (const map_location& relative, relative_tiles_) {
-+	BOOST_FOREACH(const map_location& relative, relative_tiles_) {
- 		result.insert(relative.vector_sum(hotspot));
- 	}
- 	return result;
-Index: src/editor/editor_map.cpp
-===================================================================
---- src/editor/editor_map.cpp	(revision 54624)
-+++ src/editor/editor_map.cpp	(revision 54625)
-@@ -20,12 +20,12 @@
- 
- #include "../display.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../map_exception.hpp"
- #include "../map_label.hpp"
- #include "../wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace editor {
- 
-@@ -111,7 +111,7 @@
- 			++errors;
- 		}
- 	}
--	foreach (const map_location& loc, selection_) {
-+	BOOST_FOREACH(const map_location& loc, selection_) {
- 		if (!on_board_with_border(loc)) {
- 			ERR_ED << "Off-map tile in selection: " << loc << "\n";
- 		}
-Index: src/editor/editor_palettes.cpp
-===================================================================
---- src/editor/editor_palettes.cpp	(revision 54624)
-+++ src/editor/editor_palettes.cpp	(revision 54625)
-@@ -23,13 +23,14 @@
- #include "editor_common.hpp"
- #include "editor_palettes.hpp"
- 
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../serialization/string_utils.hpp"
- #include "../sound.hpp"
- #include "../tooltips.hpp"
- #include "../marked-up_text.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- static std::string selected_terrain;
- }
-@@ -84,7 +85,7 @@
- 
- 	// Get the available groups and add them to the structure
- 	std::set<std::string> group_names;
--	foreach (const config &g, cfg.child_range("editor_group"))
-+	BOOST_FOREACH(const config &g, cfg.child_range("editor_group"))
- 	{
- 		if (group_names.find(g["id"]) == group_names.end()) {
- 			terrain_groups_.push_back(terrain_group(g, gui));
-@@ -97,14 +98,14 @@
- 		}
- 	}
- 	std::map<std::string, terrain_group*> id_to_group;
--	foreach (terrain_group& tg, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& tg, terrain_groups_) {
- 		id_to_group.insert(std::make_pair(tg.id, &tg));
- 	}
- 	// The rest of the code assumes this is a valid pointer
- 	assert(checked_group_btn_ != 0);
- 
- 	// add the groups for all terrains to the map
--	foreach (const t_translation::t_terrain& t, terrains_) {
-+	BOOST_FOREACH(const t_translation::t_terrain& t, terrains_) {
- 		const terrain_type& t_info = map().get_terrain_info(t);
- 		DBG_ED << "Palette: processing terrain " << t_info.name()
- 			<< "(editor name: '" << t_info.editor_name() << "') "
-@@ -119,7 +120,7 @@
- 		// add the terrain to the requested groups
- 		const std::vector<std::string>& keys = utils::split(t_info.editor_group());
- 		bool core = false;
--		foreach (const std::string& k, keys) {
-+		BOOST_FOREACH(const std::string& k, keys) {
- 			terrain_map_[k].push_back(t);
- 			nmax_terrains_ = std::max(nmax_terrains_, terrain_map_[k].size());
- 			std::map<std::string, terrain_group*>::iterator i = id_to_group.find(k);
-@@ -380,7 +381,7 @@
- 		scroll_down();
- 	}
- 
--	foreach (terrain_group& g, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& g, terrain_groups_) {
- 		if (g.button.pressed()) {
- 			checked_group_btn_ = &g.button;
- 			set_group(g.id);
-@@ -388,7 +389,7 @@
- 		}
- 	}
- 
--	foreach (terrain_group& g, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& g, terrain_groups_) {
- 		if (&g.button == checked_group_btn_) {
- 			g.button.set_check(true);
- 		} else {
-Index: src/editor/editor_controller.cpp
-===================================================================
---- src/editor/editor_controller.cpp	(revision 54624)
-+++ src/editor/editor_controller.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "../clipboard.hpp"
- #include "../filechooser.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../game_preferences.hpp"
- #include "../gettext.hpp"
- #include "../map_create.hpp"
-@@ -44,6 +43,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace {
- static std::vector<std::string> saved_windows_;
-@@ -135,7 +135,7 @@
- 	image::set_color_adjustment(preferences::editor::tod_r(), preferences::editor::tod_g(), preferences::editor::tod_b());
- 	theme& theme = gui().get_theme();
- 	const theme::menu* default_tool_menu = NULL;
--	foreach (const theme::menu& m, theme.menus()) {
-+	BOOST_FOREACH(const theme::menu& m, theme.menus()) {
- 		if (m.get_id() == "draw_button_editor") {
- 			default_tool_menu = &m;
- 			break;
-@@ -173,7 +173,7 @@
- 
- void editor_controller::init_brushes(const config& game_config)
- {
--	foreach (const config &i, game_config.child_range("brush")) {
-+	BOOST_FOREACH(const config &i, game_config.child_range("brush")) {
- 		brushes_.push_back(brush(i));
- 	}
- 	if (brushes_.empty()) {
-@@ -196,7 +196,7 @@
- 		new mouse_action_starting_position(key_)));
- 	mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_PASTE,
- 		new mouse_action_paste(clipboard_, key_)));
--	foreach (const theme::menu& menu, gui().get_theme().menus()) {
-+	BOOST_FOREACH(const theme::menu& menu, gui().get_theme().menus()) {
- 		if (menu.items().size() == 1) {
- 			hotkey::HOTKEY_COMMAND hk = hotkey::get_hotkey(menu.items().front()).get_id();
- 			mouse_action_map::iterator i = mouse_actions_.find(hk);
-@@ -205,7 +205,7 @@
- 			}
- 		}
- 	}
--	foreach (const config &c, game_config.child_range("editor_tool_hint")) {
-+	BOOST_FOREACH(const config &c, game_config.child_range("editor_tool_hint")) {
- 		mouse_action_map::iterator i =
- 			mouse_actions_.find(hotkey::get_hotkey(c["id"]).get_id());
- 		if (i != mouse_actions_.end()) {
-@@ -216,7 +216,7 @@
- 
- void editor_controller::init_map_generators(const config& game_config)
- {
--	foreach (const config &i, game_config.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &i, game_config.child_range("multiplayer"))
- 	{
- 		if (i["map_generation"] == "default") {
- 			const config &generator_cfg = i.child("generator");
-@@ -238,7 +238,7 @@
- 		ERR_ED << "No editor time-of-day defined\n";
- 		return;
- 	}
--	foreach (const config &i, cfg.child_range("time")) {
-+	BOOST_FOREACH(const config &i, cfg.child_range("time")) {
- 		tods_.push_back(time_of_day(i));
- 	}
- }
-@@ -250,7 +250,7 @@
- 		ERR_ED << "No editor music defined\n";
- 		return;
- 	}
--	foreach (const config &i, cfg.child_range("music")) {
-+	BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 		sound::play_music_config(i);
- 	}
- 	sound::commit_music_changes();
-@@ -265,13 +265,13 @@
- 
- editor_controller::~editor_controller()
- {
--	foreach (const mouse_action_map::value_type a, mouse_actions_) {
-+	BOOST_FOREACH(const mouse_action_map::value_type a, mouse_actions_) {
- 		delete a.second;
- 	}
--	foreach (map_generator* m, map_generators_) {
-+	BOOST_FOREACH(map_generator* m, map_generators_) {
- 		delete m;
- 	}
--	foreach (map_context* mc, map_contexts_) {
-+	BOOST_FOREACH(map_context* mc, map_contexts_) {
- 		delete mc;
- 	}
- }
-@@ -303,7 +303,7 @@
- void editor_controller::quit_confirm(EXIT_STATUS mode)
- {
- 	std::vector<std::string> modified;
--	foreach (map_context* mc, map_contexts_) {
-+	BOOST_FOREACH(map_context* mc, map_contexts_) {
- 		if (mc->modified()) {
- 			if (!mc->get_filename().empty()) {
- 				modified.push_back(mc->get_filename());
-@@ -319,7 +319,7 @@
- 		message = _("Do you really want to quit? Changes in the map since the last save will be lost.");
- 	} else {
- 		message = _("Do you really want to quit? The following maps were modified and all changes since the last save will be lost:");
--		foreach (std::string& str, modified) {
-+		BOOST_FOREACH(std::string& str, modified) {
- 			message += "\n" + str;
- 		}
- 	}
-@@ -342,7 +342,7 @@
- 		map_context* mc = new map_context(editor_map(game_config_, 44, 33, t_translation::GRASS_LAND));
- 		add_map_context(mc);
- 	} else {
--		foreach(const std::string& filename, saved_windows_) {
-+		BOOST_FOREACH(const std::string& filename, saved_windows_) {
- 			map_context* mc = new map_context(game_config_, filename);
- 			add_map_context(mc);
- 		}
-@@ -796,7 +796,7 @@
- 				get_map_context().set_needs_terrain_rebuild(false);
- 				gui().invalidate_all();
- 			} else {
--				foreach (const map_location& loc, changed_locs) {
-+				BOOST_FOREACH(const map_location& loc, changed_locs) {
- 					gui().rebuild_terrain(loc);
- 				}
- 				gui().invalidate(changed_locs);
-@@ -1290,7 +1290,7 @@
- 
- void editor_controller::redraw_toolbar()
- {
--	foreach (mouse_action_map::value_type a, mouse_actions_) {
-+	BOOST_FOREACH(mouse_action_map::value_type a, mouse_actions_) {
- 		if (a.second->toolbar_button() != NULL) {
- 			SDL_Rect r = a.second->toolbar_button()->location(gui().screen_area());
- 			SDL_Rect outline = create_rect(r.x - 2, r.y - 2, r.h + 4, r.w + 4);
-Index: src/formula.cpp
-===================================================================
---- src/formula.cpp	(revision 54624)
-+++ src/formula.cpp	(revision 54625)
-@@ -17,11 +17,12 @@
- #include <set>
- #include <sstream>
- 
--#include "foreach.hpp"
- #include "formula_callable.hpp"
- #include "formula_function.hpp"
- #include "map_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace game_logic
- {
- 
-@@ -117,7 +118,7 @@
- 		std::stringstream s;
- 		s << '[';
- 		bool first_item = true;
--		foreach(expression_ptr a , items_) {
-+		BOOST_FOREACH(expression_ptr a , items_) {
- 			if (!first_item) {
- 				s << ',';
- 			} else {
-@@ -468,7 +469,7 @@
- 		std::stringstream s;
- 		s << "{where:(";
- 		s << body_->str();
--		foreach (const expr_table::value_type &a, *clauses_) {
-+		BOOST_FOREACH(const expr_table::value_type &a, *clauses_) {
- 			s << ", [" << a.first << "] -> ["<< a.second->str()<<"]";
- 		}
- 		s << ")}";
-Index: src/mouse_events.cpp
-===================================================================
---- src/mouse_events.cpp	(revision 54624)
-+++ src/mouse_events.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "actions.hpp"
- #include "attack_prediction_display.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
-@@ -45,6 +44,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -1048,7 +1048,7 @@
- 
- 	map_location adj[6];
- 	get_adjacent_tiles(loc, adj);
--	foreach (const map_location &aloc, adj) {
-+	BOOST_FOREACH(const map_location &aloc, adj) {
- 		unit_map::const_iterator i = find_unit(aloc);
- 		if (i != units_.end() && uteam.is_enemy(i->side()))
- 			res.insert(aloc);
-@@ -1063,7 +1063,7 @@
- 
- 	map_location adj[6];
- 	get_adjacent_tiles(u->get_location(), adj);
--	foreach (const map_location &loc, adj)
-+	BOOST_FOREACH(const map_location &loc, adj)
- 	{
- 		if (!map_.on_board(loc)) continue;
- 		unit_map::const_iterator i = units_.find(loc);
-Index: src/multiplayer_connect.cpp
-===================================================================
---- src/multiplayer_connect.cpp	(revision 54624)
-+++ src/multiplayer_connect.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- 
- #include "ai/configuration.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -39,6 +38,7 @@
- #include "wml_exception.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -189,7 +189,7 @@
- 		// Hack: if there is a unit which can recruit, use it as a leader.
- 		// Necessary to display leader information when loading saves.
- 		std::string leader_type;
--		foreach (const config &side_unit, cfg.child_range("unit"))
-+		BOOST_FOREACH(const config &side_unit, cfg.child_range("unit"))
- 		{
- 			if (side_unit["canrecruit"].to_bool()) {
- 				leader_type = side_unit["type"].str();
-@@ -539,7 +539,7 @@
- 	std::vector<ai::description*> &ais_list = parent_->ai_algorithms_;
- 	std::vector<std::string> ais;
- 	int i = 0;
--	foreach (const ai::description *desc,  ais_list){
-+	BOOST_FOREACH(const ai::description *desc,  ais_list){
- 		ais.push_back(desc->text);
- 		if (desc->id==ai_algorithm_){
- 			sel = i;
-@@ -557,7 +557,7 @@
- void connect::side::update_faction_combo()
- {
- 	std::vector<std::string> factions;
--	foreach (const config *faction, parent_->era_sides_)
-+	BOOST_FOREACH(const config *faction, parent_->era_sides_)
- 	{
- 		const std::string& name = (*faction)["name"];
- 		const std::string& icon = (*faction)["image"];
-@@ -724,7 +724,7 @@
- 		static char const *attrs[] = { "side", "controller", "id",
- 			"team_name", "user_team_name", "color", "colour", "gold",
- 			"income", "allow_changes" };
--		foreach (const char *attr, attrs) {
-+		BOOST_FOREACH(const char *attr, attrs) {
- 			trimmed.remove_attribute(attr);
- 		}
- 
-@@ -827,8 +827,8 @@
- {
- 	std::map<std::string, config> children;
- 
--	foreach(const std::string& children_to_swap, get_children_to_swap())
--		foreach(const config& child, cfg_.child_range(children_to_swap))
-+	BOOST_FOREACH(const std::string& children_to_swap, get_children_to_swap())
-+		BOOST_FOREACH(const config& child, cfg_.child_range(children_to_swap))
- 			children.insert(std::pair<std::string, config>(children_to_swap, child));
- 
- 	return children;
-@@ -836,12 +836,12 @@
- 
- void connect::side::set_side_children(std::map<std::string, config> children)
- {
--	foreach(const std::string& children_to_remove, get_children_to_swap())
-+	BOOST_FOREACH(const std::string& children_to_remove, get_children_to_swap())
- 		cfg_.clear_children(children_to_remove);
- 
- 	std::pair<std::string, config> child_map;
- 
--	foreach(child_map, children)
-+	BOOST_FOREACH(child_map, children)
- 		cfg_.add_child(child_map.first, child_map.second);
- }
- 
-@@ -920,7 +920,7 @@
- 		// Builds the list of sides eligible for choice (nonrandom factions)
- 		std::vector<int> nonrandom_sides;
- 		int num = -1;
--		foreach (const config *i, parent_->era_sides_)
-+		BOOST_FOREACH(const config *i, parent_->era_sides_)
- 		{
- 			++num;
- 			if (!(*i)["random_faction"].to_bool()) {
-@@ -1524,7 +1524,7 @@
- 	player_types_.push_back(_("Computer Player"));
- 	player_types_.push_back(_("Empty"));
- 
--	foreach (const config *faction, era_sides_) {
-+	BOOST_FOREACH(const config *faction, era_sides_) {
- 		player_factions_.push_back((*faction)["name"]);
- 	}
- 
-@@ -1539,7 +1539,7 @@
- 	// Teams
- 	if(params_.use_map_settings) {
- 		int side_num = 1;
--		foreach (config &side, sides)
-+		BOOST_FOREACH(config &side, sides)
- 		{
- 			config::attribute_value &team_name = side["team_name"];
- 			config::attribute_value &user_team_name = side["user_team_name"];
-@@ -1566,7 +1566,7 @@
- 	} else {
- 		std::vector<std::string> map_team_names;
- 		int _side_num = 1;
--		foreach (config &side, sides)
-+		BOOST_FOREACH(config &side, sides)
- 		{
- 			const std::string side_num = lexical_cast<std::string>(_side_num);
- 			config::attribute_value &team_name = side["team_name"];
-@@ -1599,7 +1599,7 @@
- 
- 	// Populates "sides_" from the level configuration
- 	int index = 0;
--	foreach (const config &s, sides) {
-+	BOOST_FOREACH(const config &s, sides) {
- 		sides_.push_back(side(*this, s, index++));
- 	}
- 	int offset=0;
-@@ -1683,7 +1683,7 @@
- 	else
- 	{
- 		era_sides_.clear();
--		foreach (const config &e, era_cfg.child_range("multiplayer_side")) {
-+		BOOST_FOREACH(const config &e, era_cfg.child_range("multiplayer_side")) {
- 			era_sides_.push_back(&e);
- 		}
- 		level_.add_child("era", era_cfg);
-@@ -1789,7 +1789,7 @@
- 	 * creative in what is used in multiplayer [1] so use a simpler test now.
- 	 * [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568029
- 	 */
--	foreach(const side& s, sides_) {
-+	BOOST_FOREACH(const side& s, sides_) {
- 		if(s.get_controller() != CNTR_EMPTY) {
- 			if(s.allow_player()) {
- 				return true;
-
-------------------------------------------------------------------------
diff --git a/community-staging/wesnoth/wesnoth.install b/community-staging/wesnoth/wesnoth.install
deleted file mode 100644
index 4f1e419ae..000000000
--- a/community-staging/wesnoth/wesnoth.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-cat << EOF
-Note:
-==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma"
-==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth
-==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output.
-EOF
-}
diff --git a/community-staging/wesnoth/wesnoth.tmpfiles.conf b/community-staging/wesnoth/wesnoth.tmpfiles.conf
deleted file mode 100644
index 3ec0f6013..000000000
--- a/community-staging/wesnoth/wesnoth.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /run/wesnothd 0700 root root -
diff --git a/community-staging/wesnoth/wesnothd.rc.d b/community-staging/wesnoth/wesnothd.rc.d
deleted file mode 100755
index 95e312b7b..000000000
--- a/community-staging/wesnoth/wesnothd.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/wesnothd)
-
-case "$1" in
-  start)
-    stat_busy "Starting Wesnoth Server Daemon"
-    [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd
-    [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/wesnothd)
-      echo $PID > /var/run/wesnotd/pid
-      add_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Wesnoth Server Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/widelands/6233_6232.diff b/community-staging/widelands/6233_6232.diff
deleted file mode 100644
index f82477607..000000000
--- a/community-staging/widelands/6233_6232.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-=== modified file 'src/graphic/graphic.cc'
---- src/graphic/graphic.cc	2011-11-30 21:38:37 +0000
-+++ src/graphic/graphic.cc	2012-02-19 17:10:12 +0000
-@@ -725,6 +725,18 @@
- 	if (!png_ptr)
- 		throw wexception("Graphic::save_png: could not create png struct");
- 
-+	png_infop info_ptr = png_create_info_struct(png_ptr);
-+	if (!info_ptr) {
-+		png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0));
-+		throw wexception("Graphic::save_png: could not create png info struct");
-+	}
-+
-+	// Set jump for error
-+	if (setjmp(png_jmpbuf(png_ptr))) {
-+		png_destroy_write_struct(&png_ptr, &info_ptr);
-+		throw wexception("Graphic::save_png: Error writing PNG!");
-+	}
-+
- 	//  Set another write function. This is potentially dangerouse because the
- 	//  flush function is internally called by png_write_end(), this will crash
- 	//  on newer libpngs. See here:
-@@ -736,35 +748,14 @@
- 		 sw,
- 		 &Graphic::m_png_write_function, &Graphic::m_png_flush_function);
- 
--	png_infop info_ptr = png_create_info_struct(png_ptr);
--
--	if (!info_ptr) {
--		png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0));
--		throw wexception("Graphic::save_png: could not create png info struct");
--	}
--
--	// Set jump for error
--	if (setjmp(png_jmpbuf(png_ptr))) {
--		png_destroy_write_struct(&png_ptr, &info_ptr);
--		throw wexception("Graphic::save_png: could not set png setjmp");
--	}
--
- 	// Fill info struct
- 	png_set_IHDR
- 		(png_ptr, info_ptr, pix.get_w(), pix.get_h(),
- 		 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
- 		 PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- 
--	// png_set_strip_16(png_ptr) ;
--
- 	// Start writing
- 	png_write_info(png_ptr, info_ptr);
--
--	// Strip data down
--	png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
--
--	png_set_packing(png_ptr);
--
- 	{
- 		uint32_t surf_w = pix.get_w();
- 		uint32_t surf_h = pix.get_h();
-
diff --git a/community-staging/widelands/PKGBUILD b/community-staging/widelands/PKGBUILD
deleted file mode 100644
index 2f90c452f..000000000
--- a/community-staging/widelands/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 78563 2012-10-20 22:46:38Z lcarlier $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands
-pkgver=17
-_realver=build17
-pkgrel=5
-pkgdesc="A realtime strategy game with emphasis on economy and transport"
-arch=('i686' 'x86_64')
-url="http://widelands.org/"
-license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2')
-makedepends=('cmake' 'boost' 'mesa')
-source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2"
-        $pkgname.desktop
-        $pkgname.png
-        $pkgname.sh)
-md5sums=('bdc9bc0aa631af1aa7fb450507611a58'
-         '15820bf099fd6f16251fe70a75c534bb'
-         '3dfda7e9ca76ca00dd98d745d0ceb328'
-         '7cae50aba5ed0cd2cfeea79124637b46')
-
-build() {
-    cd $srcdir/$pkgname-$_realver-src
-
-    sed -i "1 i #include <unistd.h>" src/main.cc
-
-    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=(${depends[@]} 'widelands-data')
-    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/wt/PKGBUILD b/community-staging/wt/PKGBUILD
deleted file mode 100644
index c47450bf7..000000000
--- a/community-staging/wt/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 74391 2012-07-26 10:14:06Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Denis Martinez <deuns.martinez@gmail.com>
-
-pkgname=wt
-pkgver=3.2.2
-_pkgver=3.2.2
-pkgrel=2
-pkgdesc="a C++ library and application server for developing and deploying web applications"
-arch=('i686' 'x86_64')
-url="http://www.webtoolkit.eu/"
-license=('GPL')
-depends=('boost-libs>=1.36')
-makedepends=('boost>=1.36' 'cmake>=2.8'
-	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
-optdepends=('openssl: for SSL support in built-in webserver'
-	    'zlib: for compression in HTTP protocol'
-	    'fcgi: for FastCGI support'
-	    'postgresql-libs: for PostgreSQL Dbo support'
-	    'sqlite: for Sqlite Dbo support'
-	    'libharu: for PDF generation (WPdfImage)'
-	    'graphicsmagick: for raster image support (WRasterImage)'
-	    'pango: for advanced font rendering (WRasterImage)'
-	    'mysql++: for the hangman example'
-	    'qt: for the Wt/Qt interopability example (wtwithqt)')
-backup=('etc/wt/wt_config.xml')
-source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa')
-
-build() {
-  cd ${srcdir}/${pkgname}-${_pkgver}
-
-  mkdir -p build
-  cd build
-  cmake \
-      -DCONNECTOR_HTTP=ON \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
-      -DWEBUSER=http \
-      -DWEBGROUP=http \
-      -DUSE_SYSTEM_SQLITE3=ON \
-      -DINSTALL_EXAMPLES=ON \
-      ..
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${_pkgver}/build
-  make DESTDIR=${pkgdir} install
-
-  mkdir -p ${pkgdir}/usr/share/cmake-2.8/Modules
-  mv ${pkgdir}/usr/cmake/FindWt.cmake ${pkgdir}/usr/share/cmake-2.8/Modules/
-  rm -r ${pkgdir}/usr/cmake
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-staging/wxgtk2.9/PKGBUILD b/community-staging/wxgtk2.9/PKGBUILD
deleted file mode 100644
index 96150f277..000000000
--- a/community-staging/wxgtk2.9/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 74020 2012-07-18 03:42:17Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=wxgtk2.9
-pkgver=2.9.4
-pkgrel=1
-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/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch)
-sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1'
-          'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3')
-
-build() {
-  cd "${srcdir}/wxWidgets-${pkgver}"
-  patch -p1 -i ../wxGTK-2.9.4-collision.patch
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --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
-}
-
-package() {
-  cd "${srcdir}/wxWidgets-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-staging/wxgtk2.9/wxGTK-2.9.4-collision.patch b/community-staging/wxgtk2.9/wxGTK-2.9.4-collision.patch
deleted file mode 100644
index 4b1fb395e..000000000
--- a/community-staging/wxgtk2.9/wxGTK-2.9.4-collision.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-admin/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(DYLIB_RPATH_INSTALL)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
-@@ -14964,15 +14964,16 @@ install-wxconfig:
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
--
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
-+	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
- 	for l in $(LOCALE_LINGUAS) ; do \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
-+	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -138,7 +138,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -124,7 +124,6 @@ distclean: clean
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/community-staging/xbmc/ChangeLog b/community-staging/xbmc/ChangeLog
deleted file mode 100644
index 66ae97e3b..000000000
--- a/community-staging/xbmc/ChangeLog
+++ /dev/null
@@ -1,69 +0,0 @@
-2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
-	* 9.11-15 :
-	Made it back compliant with FHS ( thx pierre for pointing that out )
-	namcap checked and modified to fit its needs as far as it was possible
-
-2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-10 :
-	Try and fix some autoconf issues (thanks Gentoo ebuild).
-
-2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-9 :
-	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
-	installed with Arch.
-	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
-	on systems using the nvidia driver.
-	
-2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-8 :
-	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
-	undefined '::realloc' anymore.
-	Remove Mac OS X specific files.
-	
-2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-7 :
-	Moved libcdio, pmount, smbclient and unrar to optdepends.
-	Removed unneeded dependency on sdl_gfx.
-	Removed dependency on libpng as sdl_image depends on it.
-
-2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-6 :
-	Added libpng to dependency list.
-	Added gawk to dependency list.
-	Removed '--disable-mms' and '--enable-halmount' configure flags as they
-	are not mentioned as supported in the configure script.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-5 :
-	Added libmad to the dependency list.
-	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
-	and added tre instead.
-	Removed subversion from makedepends.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-4 :
-	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
-	fail any longer.
-
-2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-3 :
-	Added lirc to the optdepends array.
-	
-2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-2 :
-	Added install file which informs users that a display depth of at
-	least 24-bit is required.
-
-2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-1 :
-	Initial package, based on previous work by Zeqadious.
diff --git a/community-staging/xbmc/PKGBUILD b/community-staging/xbmc/PKGBUILD
deleted file mode 100644
index b76b374cc..000000000
--- a/community-staging/xbmc/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 78638 2012-10-22 11:38:41Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-
-_prefix=/usr
-
-pkgname=xbmc
-pkgver=11.0
-pkgrel=10
-pkgdesc="A software media player and entertainment hub for digital media"
-arch=('i686' 'x86_64')
-url="http://xbmc.org"
-license=('GPL' 'custom')
-depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
-	 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
-	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
-	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
-	 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
-	     'udisks' 'upower' 'bluez' 'mesa')
-optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
-	    'vdpau-video: accelerated video playback for nvidia cards'
-	    'xvba-video: accelerated video playback for amd cards'
-	    'pulseaudio: pulseaudio support'
-	    'lirc: remote controller support'
-	    'udisks: automount external drives'
-	    'upower: used to trigger suspend functionality'
-	    'unrar: access compressed files without unpacking them'
-	    'xorg-xinit: autostart xbmc')
-install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service")
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '395ca1afd3430ad66239bafbffde0eedf9c43409b77f65341ef387f09cd65588')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
-
-build() {
-  cd "${srcdir}/xbmc-$pkgver"
-
-  # fix lsb_release dependency
-  sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
-
-  # Bootstrapping XBMC
-  ./bootstrap
-
-  # Configuring XBMC
-  export PYTHON_VERSION=2  # external python v2
-  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
-    --disable-debug \
-    --enable-optimizations \
-    --enable-gl \
-    --enable-sdl \
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-xvba \
-    --enable-joystick \
-    --enable-xrandr \
-    --enable-rsxs \
-    --enable-projectm \
-    --enable-x11 \
-    --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-nfs \
-    --enable-afpclient \
-    --enable-airplay \
-    --enable-airtunes \
-    --enable-ffmpeg-libvorbis \
-    --enable-dvdcss \
-    --disable-hal \
-    --enable-avahi \
-    --enable-webserver \
-    --enable-optical-drive \
-    --enable-libbluray \
-    --enable-texturepacker \
-    --enable-udev \
-    --enable-libusb \
-    --enable-libcec \
-    --enable-external-libraries \
-    --disable-external-ffmpeg
-  # Now (finally) build
-  make
-}
-
-package() {
-  cd "${srcdir}/xbmc-$pkgver"
-  # Running make install
-  make DESTDIR="${pkgdir}" install
-
-  # run feh with python2
-  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
-
-  # lsb_release fix
-  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
-  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
-
-  # Tools
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
-
-  # Licenses
-  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  for licensef in LICENSE.GPL copying.txt; do
-    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  done
-
-  # systemd stuff
-  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-}
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/xbmc/xbmc.install b/community-staging/xbmc/xbmc.install
deleted file mode 100644
index a3ae3d0d8..000000000
--- a/community-staging/xbmc/xbmc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
-  groupadd xbmc
-  useradd -G xbmc -d /var/empty xbmc
-}
-
-post_upgrade() {
-  post_install $1
-  echo "You may want to add xbmc user and group to use xbmc standalone"
-}
-
-post_remove() {
-  post_install $1
-  echo "You may want to remove xbmc user and group"
-}
diff --git a/community-staging/xbmc/xbmc.service b/community-staging/xbmc/xbmc.service
deleted file mode 100644
index b66e35c80..000000000
--- a/community-staging/xbmc/xbmc.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = remote-fs.target
-
-[Service]
-User = xbmc
-Group = xbmc
-Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0
-Restart = on-failure
-
-[Install]
-WantedBy = multi-user.target
diff --git a/community-staging/xmms2/PKGBUILD b/community-staging/xmms2/PKGBUILD
deleted file mode 100644
index ace6b2087..000000000
--- a/community-staging/xmms2/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 72067 2012-06-07 20:19:25Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=xmms2
-pkgver=0.8DrO_o
-pkgrel=7
-pkgdesc="complete rewrite of the popular music player"
-arch=('i686' 'x86_64')
-url="http://xmms2.org/"
-license=('LGPL')
-backup=('etc/conf.d/xmms2d.conf')
-depends=('sqlite' 'libmad')
-makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib'
-	'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout'
-	'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex'
-	'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi')
-optdepends=('alsa-lib: ALSA audio output'
-	    'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
-	    'boost: C++ language bindings'
-	    'curl: play HTTP streams'
-	    'faad2: AAC support'
-	    'ffmpeg: WMA, avcodec & avformat support'
-	    'fftw: calculations for visualization'
-	    'flac: FLAC support'
-	    'jack: JACK audio output'
-	    'libao: liboa audio output'
-	    'libgme: game-music-emu support'
-	    'libofa: MusicDNS fingerprinting'
-	    'libmms: play MMS streams'
-	    'libmodplug: to play MOD files'
-	    'libmpcdec: Musepack support'
-	    'libsamplerate: vocoder support'
-	    'libshout: Icecast audio output'
-	    'libvorbis: Ogg Vorbis support'
-	    'libxml2: XSPF and podcast support'
-	    'mpg123: alternative MP3 plugin'
-	    'oss: OSS audio output'
-	    'perl: Perl language bindings'
-	    'pulseaudio: PulseAudio audio output'
-	    'pyrex: Python language bindings'
-	    'ruby: Ruby language bindings'
-	    'smbclient: direct CIFS/SMB access'
-	    'speex: Speex support'
-	    'wavpack: WavPack support')
-#	    'sidplay: to play a Commodore 64 music files AKA zaks'
-# we do not have sidplay 2 series in repos; also it's
-# somehow connected with resid i guess(not in repos also)
-conflicts=('xmms2-devel')
-install=xmms2.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	xmms2d.conf
-	xmms2d.rc
-    'ffmpeg-0.11.diff')
-md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
-         'af13c937bf3c86b77ae6820107aab9b8'
-         '9d8e3e1a434f271423bdd228a1e9bd7c'
-         'e176971ef96807f72fa8fc17d260c20a')
-
-build() {
-  cd xmms2-${pkgver}/src/plugins/avcodec/
-  # remove call to avcodec_init
-  # http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3211932c513338566b31d990d06957e15a644d13
-  patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff
-
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # python2 fix
-#  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf
-
-  ./waf configure --prefix=/usr \
-	--with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \
-	--with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
-	--with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'`
-  ./waf build
-  ./waf --destdir=${pkgdir} install
-
-  PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
-  ./waf build
-  ./waf --destdir=${pkgdir} install
-
-  install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d
-  install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf
-}
diff --git a/community-staging/xmms2/ffmpeg-0.11.diff b/community-staging/xmms2/ffmpeg-0.11.diff
deleted file mode 100644
index 91d3a3106..000000000
--- a/community-staging/xmms2/ffmpeg-0.11.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- avcodec.c.orig	2012-06-07 15:08:23.796225671 -0500
-+++ avcodec.c	2012-06-07 15:08:36.649489373 -0500
-@@ -134,7 +134,6 @@
- 
- 	xmms_xform_private_data_set (xform, data);
- 
--	avcodec_init ();
- 	avcodec_register_all ();
- 
- 	mimetype = xmms_xform_indata_get_str (xform,
diff --git a/community-staging/xmms2/vorbis-albumart.patch b/community-staging/xmms2/vorbis-albumart.patch
deleted file mode 100644
index de4305f6f..000000000
--- a/community-staging/xmms2/vorbis-albumart.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From f38882beb1c9b4f3e3c63ac7d65603ad5917cd9d Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <anomie@users.sourceforge.net>
-Date: Tue, 09 Mar 2010 15:41:33 +0000
-Subject: OTHER: Add support for METADATA_BLOCK_PICTURE in Vorbis plugin
-
-Bug-Debian: http://bugs.debian.org/565479
----
-diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c
-index c1f4ef9..fc4ff1b 100644
---- a/src/plugins/vorbis_common/common.c
-+++ b/src/plugins/vorbis_common/common.c
-@@ -243,6 +243,74 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc)
- 	}
- }
- 
-+static void
-+handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+{
-+	guint32 typ, mime_len, desc_len, img_len;
-+	guchar *pos, *end, *mime_data, *img_data;
-+	gchar hash[33];
-+
-+	pos = value;
-+	end = value + len;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	typ = GUINT32_FROM_BE (*(guint32 *)pos);
-+	if (typ != 0 && typ != 3) {
-+		XMMS_DBG ("Picture type %d not handled", typ);
-+		return;
-+	}
-+	pos += 4;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	mime_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	mime_data = pos;
-+	pos += mime_len;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	desc_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	pos += desc_len;
-+
-+	pos += 4; /* width */
-+	pos += 4; /* height */
-+	pos += 4; /* depth */
-+	pos += 4; /* indexed palette length */
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	img_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	img_data = pos;
-+
-+	if (img_data + img_len > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+
-+	if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+		const gchar *metakey;
-+
-+		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-+		xmms_xform_metadata_set_str (xform, metakey, hash);
-+
-+		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
-+		mime_data[mime_len] = '\0';
-+		xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+	}
-+}
-+
- /* note that "key" is NOT NUL-terminated here,
-  * but "value" is.
-  */
-@@ -253,6 +321,14 @@ handle_comment (xmms_xform_t *xform,
- {
- 	gint i;
- 
-+	if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
-+		gsize dlen;
-+		gchar *dvalue = g_base64_decode (value, &dlen);
-+		handle_image_comment (xform, dvalue, dlen);
-+		g_free (dvalue);
-+		return;
-+	}
-+
- 	for (i = 0; i < G_N_ELEMENTS (properties); i++) {
- 		if (key_len != strlen (properties[i].vname))
- 			continue;
---
-cgit v0.8.3.4
-
-
-From d8273630bd92ecea581240ae93c6795cc538d076 Mon Sep 17 00:00:00 2001
-From: Erik Massop <e.massop@hccnet.nl>
-Date: Tue, 09 Mar 2010 15:45:03 +0000
-Subject: OTHER: Add Brad Jorsch to AUTHORS, disable Vorbis albumart for glib < 2.12
-
-(Name found using e-mail address at http://sourceforge.net/users/anomie )
----
-diff --git a/AUTHORS b/AUTHORS
-index f2ef9af..7331d4b 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -146,6 +146,10 @@ N: Johannes Jordan
- E: ypnos@lanrules.de
- D: Visualization
- 
-+N: Brad Jorsch
-+E: anomie@users.sourceforge.net
-+D: Support for front picture from Vorbis.
-+
- N: Daniel Kamiński
- E: maniel.rulez@gmail.com
- D: mlib remove command in cli, Ruby fixes.
-diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c
-index fc4ff1b..ab1dc75 100644
---- a/src/plugins/vorbis_common/common.c
-+++ b/src/plugins/vorbis_common/common.c
-@@ -27,6 +27,7 @@
- #include "xmms/xmms_sample.h"
- #include "xmms/xmms_log.h"
- #include "xmms/xmms_medialib.h"
-+#include "xmms/xmms_bindata.h"
- 
- #include <glib.h>
- 
-@@ -244,12 +245,22 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc)
- }
- 
- static void
--handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+handle_image_comment (xmms_xform_t *xform, const gchar *encoded_value)
- {
-+	gsize len;
-+	guchar *value;
-+
- 	guint32 typ, mime_len, desc_len, img_len;
- 	guchar *pos, *end, *mime_data, *img_data;
- 	gchar hash[33];
- 
-+#if GLIB_CHECK_VERSION(2,12,0)
-+	value = g_base64_decode (encoded_value, &len);
-+#else
-+	/* TODO: Implement/backport base64 decoding */
-+	return;
-+#endif
-+
- 	pos = value;
- 	end = value + len;
- 
-@@ -299,7 +310,7 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
- 		return;
- 	}
- 
--	if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+	if (xmms_bindata_plugin_add (img_data, img_len, hash)) {
- 		const gchar *metakey;
- 
- 		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-@@ -307,8 +318,10 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
- 
- 		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
- 		mime_data[mime_len] = '\0';
--		xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+		xmms_xform_metadata_set_str (xform, metakey, (gchar *)mime_data);
- 	}
-+
-+	g_free (value);
- }
- 
- /* note that "key" is NOT NUL-terminated here,
-@@ -322,10 +335,7 @@ handle_comment (xmms_xform_t *xform,
- 	gint i;
- 
- 	if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
--		gsize dlen;
--		gchar *dvalue = g_base64_decode (value, &dlen);
--		handle_image_comment (xform, dvalue, dlen);
--		g_free (dvalue);
-+		handle_image_comment (xform, value);
- 		return;
- 	}
- 
---
-cgit v0.8.3.4
-
-
diff --git a/community-staging/xmms2/xmms2-helpers.patch b/community-staging/xmms2/xmms2-helpers.patch
deleted file mode 100644
index f6e6aa49e..000000000
--- a/community-staging/xmms2/xmms2-helpers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -wbBur xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h	2008-06-15 21:31:38.000000000 +0400
-+++ xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h	2008-06-18 14:22:24.000000000 +0400
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
- 
-
diff --git a/community-staging/xmms2/xmms2-ruby-1.9.patch b/community-staging/xmms2/xmms2-ruby-1.9.patch
deleted file mode 100644
index 6316ace61..000000000
--- a/community-staging/xmms2/xmms2-ruby-1.9.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c	2009-09-14 09:13:19.000000000 +0000
-@@ -241,10 +241,10 @@
- 	COLL_METHOD_HANDLER_HEADER
- 
- 	rb_ary = RARRAY (ids);
--	ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1));
-+	ary = malloc (sizeof (unsigned int *) * (RARRAYLEN(rb_ary) + 1));
- 
--	for (i = 0; i < rb_ary->len; i++)
--		ary[i] = NUM2UINT (rb_ary->ptr[i]);
-+	for (i = 0; i < RARRAYLEN(rb_ary); i++)
-+		ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]);
- 
- 	ary[i] = 0;
- 
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c	2009-09-14 09:14:51.000000000 +0000
-@@ -1421,10 +1421,10 @@
- 	if (!NIL_P (rb_check_array_type (value))) {
- 		struct RArray *ary = RARRAY (value);
- 
--		ret = malloc (sizeof (char *) * (ary->len + 1));
-+		ret = malloc (sizeof (char *) * (RARRAYLEN(ary) + 1));
- 
--		for (i = 0; i < ary->len; i++)
--			ret[i] = StringValuePtr (ary->ptr[i]);
-+		for (i = 0; i < RARRAYLEN(ary); i++)
-+			ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]);
- 
- 		ret[i] = NULL;
- 	} else {
-@@ -1451,10 +1451,10 @@
- 		struct RArray *ary = RARRAY (value);
- 		int i;
- 
--		for (i = 0; i < ary->len; i++) {
-+		for (i = 0; i < RARRAYLEN(ary); i++) {
- 			xmmsv_t *elem;
- 
--			elem = xmmsv_new_string (StringValuePtr (ary->ptr[i]));
-+			elem = xmmsv_new_string (StringValuePtr (RARRAY_PTR(ary)[i]));
- 			xmmsv_list_append (list, elem);
- 			xmmsv_unref (elem);
- 		}
-diff -wbBur xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h	2009-09-14 09:00:11.000000000 +0000
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
- 
diff --git a/community-staging/xmms2/xmms2.install b/community-staging/xmms2/xmms2.install
deleted file mode 100644
index 2205a3492..000000000
--- a/community-staging/xmms2/xmms2.install
+++ /dev/null
@@ -1,3 +0,0 @@
-pre_install() {
-  echo "-- DO NOT FORGET edit /etc/conf.d/xmms2.conf!"
-}
diff --git a/community-staging/xmms2/xmms2d.conf b/community-staging/xmms2/xmms2d.conf
deleted file mode 100644
index c8304fe1d..000000000
--- a/community-staging/xmms2/xmms2d.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# xmms2-launcher cmdline parameters
-#
-XMMS2_PARAMETERS=""
-
-#
-# xmms2 user
-# You may want to add user to run xmms or use your username
-#
-XMMS2_USER="xmms2user"
-
-#
-# If you set XMMS2_USER to a different user than the one who will be controlling
-# xmms2d using xmms2 clients, make sure that the clients are aware of the path to
-# xmms2d's IPC socket, or they might not be able to connect. On failure to connect
-# some clients will try to run xmms2d themselves. These xmms2d instances will of
-# course run as the user running the client, and not as the one configured below.
-#
-# If an IPC path is specified on the command line to xmms2d (using
-# XMMS2_PARAMETERS="-i tcp://127.0.0.1:9667"
-# for instance) that will be used. If not, xmms2d will use the path from its
-# configuration file which is typically in ~/.config/xmms2/xmms2.conf. If this
-# fails, a unix socket at /tmp/xmms-ipc-[username] will be used, where username
-# is of the user starting xmms2d.
-#
-# Clients typically try to get the ipc path from the XMMS_PATH environment variable,
-# (which might be set by adding say 'export XMMS_PATH="tcp://127.0.0.1:9667"' to
-# ~/.profile). If this fails they can check their configuration file (if they have
-# one) and finally use unix:///tmp/xmms-ipc-[username], where username is of the user
-# starting the client. Upon failing to connect some will try to start xmms2d themselves.
-#
diff --git a/community-staging/xmms2/xmms2d.rc b/community-staging/xmms2/xmms2d.rc
deleted file mode 100644
index 9d4d2b7e9..000000000
--- a/community-staging/xmms2/xmms2d.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/xmms2d.conf
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof xmms2d xmms2-et`
-case "$1" in
-  start)
-    stat_busy "Starting xmms2d"
-    [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xmms2d
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping xmms2d"
-    [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      for i in `seq 1 10`; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-staging/xmonad-contrib/PKGBUILD b/community-staging/xmonad-contrib/PKGBUILD
deleted file mode 100644
index 51f4ef608..000000000
--- a/community-staging/xmonad-contrib/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 76721 2012-09-27 18:19:41Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: orbisvicis <gmail.com>
-
-pkgname=xmonad-contrib
-pkgver=0.10
-pkgrel=5
-pkgdesc="Add-ons for xmonad"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3')
-install='xmonad-contrib.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch)
-md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81'
-         '32163aaeb3424cf73bf831640c162a8a')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Patch xmonad-contrib to support haskell-x11
-  patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch
-
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-  install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
-}
diff --git a/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
deleted file mode 100644
index 8372b4144..000000000
--- a/community-staging/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Tue Mar 20 03:53:11 FET 2012  Adam Vogt <vogt.adam@gmail.com>
-  * Bump version to 0.10.1
-  
-  Raising the X11 dependency while keeping the xmonad version the same leads to
-  problems where cabal install uses the dependency versions following hackage,
-  not what is installed.
-diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
-index 743bdc8..0fbf4ac 100644
---- a/xmonad-contrib.cabal
-+++ b/xmonad-contrib.cabal
-@@ -61,7 +61,7 @@ library
-         extensions: ForeignFunctionInterface
-         cpp-options: -DXFT
- 
--    build-depends:      mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string
-+    build-depends:      mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string
- 
-     if true
-         ghc-options:    -fwarn-tabs -Wall
-diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs
-index a485d95..5e388e2 100644
---- a/XMonad/Layout/Spiral.hs
-+++ b/XMonad/Layout/Spiral.hs
-@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral (
-                             ) where
- 
- import Data.Ratio
--import XMonad
-+import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..))
- import XMonad.StackSet ( integrate )
- 
- -- $usage
-diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs
-index 0d78653..4b7fd3b 100644
---- a/XMonad/Util/Paste.hs
-+++ b/XMonad/Util/Paste.hs
-@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage
-                            where
- 
- import XMonad (io, theRoot, withDisplay, X ())
--import Graphics.X11
-+import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode)
-+import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask)
- import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent)
- import Control.Monad.Reader (asks)
- import XMonad.Operations (withFocused)
diff --git a/community-staging/xmonad-contrib/xmonad-contrib.install b/community-staging/xmonad-contrib/xmonad-contrib.install
deleted file mode 100644
index e9208c833..000000000
--- a/community-staging/xmonad-contrib/xmonad-contrib.install
+++ /dev/null
@@ -1,17 +0,0 @@
-HS_DIR=usr/share/haskell/xmonad-contrib
-
-post_install() {
-  ${HS_DIR}/register.sh
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-staging/xmonad/PKGBUILD b/community-staging/xmonad/PKGBUILD
deleted file mode 100644
index 404021eb4..000000000
--- a/community-staging/xmonad/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 76719 2012-09-27 17:41:43Z jelle $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: shild <shildv@gmail.com>
-
-pkgname=xmonad
-pkgver=0.10
-pkgrel=5
-pkgdesc="Lightweight X11 tiled window manager written in Haskell"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions')
-makedepends=('setconf' 'gendesk')
-optdepends=('xorg-xmessage: for displaying visual error messages')
-install='xmonad.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-	xmonad.svg xmonad-0.10-x11-1.6.patch)
-
-build() {
-  cd "$srcdir"
-  ghc-pkg list
-  gendesk
-
-  cd $srcdir/$pkgname-$pkgver
-  # Patch XMonad so we support haskell 1.6
-  patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch
-
-
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-  #runhaskell util/GenerateManpage.hs
-
-  install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
-
-  install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
-}
-md5sums=('f8381e1ec15137863558a454d4466467'
-         '72bfa5e62e4e44fe7fa59b6a7593d993'
-         '22d29900d71f09a8f9fa6f0d2f3fed32')
diff --git a/community-staging/xmonad/xmonad-0.10-x11-1.6.patch b/community-staging/xmonad/xmonad-0.10-x11-1.6.patch
deleted file mode 100644
index 5b7afaf3b..000000000
--- a/community-staging/xmonad/xmonad-0.10-x11-1.6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Tue Mar 20 03:49:24 FET 2012  Adam Vogt <vogt.adam@gmail.com>
-  * Address versioning problems related to X11 1.6 release.
-  
-  Bump version to 0.10.1 since cabal uses hackage dependencies even when the
-  locally installed package differs.
-  
-  Allow X11-1.6 dependency.
-diff -rN -u old-xmonad/xmonad.cabal new-xmonad/xmonad.cabal
---- old-xmonad/xmonad.cabal	2012-05-06 12:20:26.788767220 +0300
-+++ new-xmonad/xmonad.cabal	2012-05-06 12:20:26.818766844 +0300
-@@ -46,7 +46,7 @@
-         build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions
-     else
-         build-depends: base < 3
--    build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix,
-+    build-depends: X11>=1.5 && < 1.7, mtl, unix,
-                    utf8-string >= 0.3 && < 0.4
- 
-     if true
diff --git a/community-staging/xmonad/xmonad-gnome-session.session b/community-staging/xmonad/xmonad-gnome-session.session
deleted file mode 100644
index c0bd16781..000000000
--- a/community-staging/xmonad/xmonad-gnome-session.session
+++ /dev/null
@@ -1,6 +0,0 @@
-[GNOME Session]
-Name=Xmonad session
-RequiredComponents=gnome-panel;gnome-settings-daemon;
-RequiredProviders=windowmanager;notifications;
-DefaultProvider-windowmanager=xmonad
-DefaultProvider-notifications=notification-daemon
diff --git a/community-staging/xmonad/xmonad.install b/community-staging/xmonad/xmonad.install
deleted file mode 100644
index 6659247db..000000000
--- a/community-staging/xmonad/xmonad.install
+++ /dev/null
@@ -1,22 +0,0 @@
-HS_DIR=/usr/share/haskell/xmonad
-
-post_install() {
-    ${HS_DIR}/register.sh
-    echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
-    echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
-    echo 
-    echo "If you would like to run xmonad as a window manager inside GNOME, please see"
-    echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad"
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-staging/xmonad/xmonad.svg b/community-staging/xmonad/xmonad.svg
deleted file mode 100644
index 5fc884213..000000000
--- a/community-staging/xmonad/xmonad.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2211"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   width="47"
-   height="73"
-   version="1.0"
-   sodipodi:docbase="/home/sjanssen/xmonad-web/images"
-   sodipodi:docname="logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata2216">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2214" />
-  <sodipodi:namedview
-     inkscape:window-height="778"
-     inkscape:window-width="1278"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="4"
-     inkscape:cx="23.5"
-     inkscape:cy="22.689137"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:current-layer="g3208" />
-  <g
-     id="g3208"
-     transform="translate(-44.517797,4.0967298)">
-    <g
-       id="g3212"
-       transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)">
-      <path
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462"
-         id="text2220"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path3206"
-         d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349"
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         sodipodi:nodetypes="ccccccccc" />
-    </g>
-    <path
-       style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z "
-       id="text3216"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccc" />
-  </g>
-</svg>
diff --git a/community-staging/znc/PKGBUILD b/community-staging/znc/PKGBUILD
deleted file mode 100644
index f2690b1c5..000000000
--- a/community-staging/znc/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 76775 2012-09-29 19:15:54Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: mickael9 <mickael9 at gmail dot com>
-
-pkgname=znc
-pkgver=0.206
-pkgrel=3
-pkgdesc='An IRC bouncer with modules & scripts support'
-url='http://en.znc.in/wiki/index.php/ZNC'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('c-ares' 'libsasl')
-#makedepends=('swig' 'tcl' 'python' 'perl')
-makedepends=('tcl' 'python' 'perl')
-optdepends=('tcl: modtcl module'
-            'python: modpython module'
-            'perl: modperl module'
-            'cyrus-sasl: saslauth module')
-source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz"
-        "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2"
-        "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2")
-md5sums=('b7d3f21da81abaeb553066b0e10beb53'
-         'a9c72d556d9a4ef100520433f17d71ae'
-         '19bf033c5cb9243171c215043c594f07')
-
-build() {
-  # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035
-  # use an alternate ways of building znc explain here:
-  # - http://wiki.znc.in/Modperl
-  # - http://wiki.znc.in/Modpython
-  mv -v modperl/* $pkgname-$pkgver/modules/modperl
-  mv -v modpython/* $pkgname-$pkgver/modules/modpython
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr \
-    --enable-sasl \
-    --enable-python \
-    --enable-perl \
-    --enable-tcl \
-    --disable-swig \
-    --enable-extra
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/0ad/PKGBUILD b/community-testing/0ad/PKGBUILD
deleted file mode 100644
index 6b2a83894..000000000
--- a/community-testing/0ad/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
-# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
-pkgname=0ad
-pkgver=a10
-_pkgver=r11863-alpha
-pkgrel=3
-pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
-arch=('i686' 'x86_64')
-url="http://wildfiregames.com/0ad"
-license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data')
-makedepends=('boost' 'cmake' 'mesa')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
-        "boost-1.50.patch")
-md5sums=('f42a2e18515cbcd48b99f0ea3796b3a4'
-         '570724341102e23730de2f70d3a1b97c')
-
-build() {
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
-
-  sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
-  sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua"
-  patch -d ../.. -Np1 < $srcdir/boost-1.50.patch
-
-  ./update-workspaces.sh \
-      --with-system-enet \
-      --bindir=/usr/bin \
-      --libdir=/usr/lib \
-      --datadir=/usr/share/${pkgname}/data
-
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
-  make CONFIG=Release
-}
-
-package() {
-  install -d ${pkgdir}/usr/{bin,lib}
-  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin
-  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib
-
-  install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}
diff --git a/community-testing/0ad/boost-1.50.patch b/community-testing/0ad/boost-1.50.patch
deleted file mode 100644
index 26ebd3e96..000000000
--- a/community-testing/0ad/boost-1.50.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp
---- 0ad-r11863-alpha/source/graphics/TextureManager.cpp	2012-02-19 04:30:59.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp	2012-07-10 21:00:52.753251312 +0200
-@@ -425,9 +425,9 @@
- 			CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath);
- 			if (f)
- 				files.push_back(f);
--			p = p / *it;
-+			p = p / it->wstring();
- 		}
--		return m_TextureConverter.ComputeSettings(srcPath.leaf(), files);
-+		return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files);
- 	}
- 
- 	/**
-diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h
---- 0ad-r11863-alpha/source/lib/pch/pch_boost.h	2012-02-16 19:01:10.000000000 +0100
-+++ 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h	2012-07-10 19:51:38.413009623 +0200
-@@ -25,7 +25,7 @@
- 
- // the following boost libraries have been included in TR1 and are
- // thus deemed usable:
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem.hpp>
- namespace fs = boost::filesystem;
- #include <boost/shared_ptr.hpp>
-diff -ru 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp
---- 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp	2011-05-25 12:39:13.000000000 +0200
-+++ 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp	2012-07-10 20:55:52.523233843 +0200
-@@ -53,7 +53,7 @@
- 		fs::wpath components = pathname.string();
- 		fs::wpath::iterator it = components.begin();
- 		std::advance(it, 2);
--		std::wstring dirname = *it;
-+		std::wstring dirname = it->wstring();
- 
- 		CScriptValRooted ai;
- 		self->m_ScriptInterface.Eval("({})", ai);
diff --git a/community-testing/activity-log-manager/PKGBUILD b/community-testing/activity-log-manager/PKGBUILD
deleted file mode 100644
index 0b27128a4..000000000
--- a/community-testing/activity-log-manager/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 78598 2012-10-21 19:12:44Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Ner0
-
-pkgname=activity-log-manager
-pkgver=0.9.4
-pkgrel=2
-pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/activity-log-manager"
-license=('GPL2')
-depends=('gtk3' 'libgee' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('vala' 'intltool')
-install=$pkgname.install
-source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz)
-md5sums=('cf85aecdaa6c0188a53d659709e1f8cd'
-         '6167df74ce44659aa94a89f31ff4d351')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Fix docdir location
-  sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in}
-
-  # Update language files
-  echo 'af ar ast be bg bn bs ca ca@valencia cs da de el eo es et eu fi fr gd gl he hi hr hu id it ja km ko ku lt lv mi ms my nb nl oc pl pt ro ru se si sk sl sr sv ta te ug uk uz vi zh_CN zh_HK zh_TW' >po/LINGUAS
-  rename $pkgname- '' ../po/$pkgname-*.po
-  mv -f -t po ../po/*
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # We don't have Whoopsie on Arch Linux
-  rm -r "$pkgdir/etc" "$pkgdir"/usr/share/{applications/activity-log-manager-ccpanel.desktop,dbus-1,gnome-control-center,polkit-1}
-}
diff --git a/community-testing/activity-log-manager/activity-log-manager.install b/community-testing/activity-log-manager/activity-log-manager.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community-testing/activity-log-manager/activity-log-manager.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/alex/PKGBUILD b/community-testing/alex/PKGBUILD
deleted file mode 100644
index 06e7af6ed..000000000
--- a/community-testing/alex/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 77005 2012-10-03 15:23:22Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Philip Nilsson <pnilsson@nullref.se>
-
-pkgname=alex
-pkgver=3.0.2
-pkgrel=2
-pkgdesc='a lexical analyser generator for Haskell'
-arch=('i686' 'x86_64')
-url='http://hackage.haskell.org/package/alex'
-license=('custom:BSD3')
-depends=('gmp')
-makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2')
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname
-  runghc Setup.lhs build
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  runghc Setup.lhs copy --destdir=$pkgdir
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3
-
-  # doc/ contains only license which already installed into proper place
-  rm -rf $pkgdir/usr/share/doc
-}
diff --git a/community-testing/almanah/PKGBUILD b/community-testing/almanah/PKGBUILD
deleted file mode 100644
index b2eca6369..000000000
--- a/community-testing/almanah/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 78508 2012-10-20 02:19:17Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=almanah
-pkgver=0.10.0
-pkgrel=1
-pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Almanah_Diary"
-license=('GPL')
-depends=('evolution-data-server>=3.6.0' 'gtkspell3' 'libcryptui' 'xdg-utils')
-makedepends=('intltool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fd213b53ca2a9832df868ee44ed7c446cd6b320651e2f2d10e0a0c98aa3bfced')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-testing/almanah/almanah.install b/community-testing/almanah/almanah.install
deleted file mode 100644
index 6ce7836d2..000000000
--- a/community-testing/almanah/almanah.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/arm-elf-gcc-base/PKGBUILD b/community-testing/arm-elf-gcc-base/PKGBUILD
deleted file mode 100644
index 4946b78ae..000000000
--- a/community-testing/arm-elf-gcc-base/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 75111 2012-08-14 08:27:41Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=arm-elf-gcc-base
-pkgver=4.7.0
-pkgrel=2
-pkgdesc="The GNU Compiler Collection"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-url="http://gcc.gnu.org"
-depends=('arm-elf-binutils' 'libmpc' 'libelf')
-options=(!libtool !emptydirs zipman docs !strip)
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
-md5sums=('2a0f1d99fda235c29d40b561f81d9a77')
-
-build() {
-  cd $srcdir/gcc-$pkgver
-
-  export CFLAGS="-O2 -pipe"
-  export CXXFLAGS="-O2 -pipe"
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  ../configure --prefix=/usr \
-	--target=arm-elf \
-	--enable-obsolete \
-	--host=$CHOST \
-	--build=$CHOST \
-	--enable-shared --disable-nls --enable-languages=c --enable-multilib \
-	--with-local-prefix=/usr/lib/arm-elf \
-	--with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \
-	--enable-softfloat \
-	--with-float=soft \
-	--with-newlib \
-	--with-sysroot=/usr/$CHOST/arm-elf
-
-  make all-gcc all-target-libgcc
-}
-
-package() {
-  cd $srcdir/gcc-$pkgver/build
-
-  export CFLAGS="-O2 -pipe"
-  export CXXFLAGS="-O2 -pipe"
-
-  make DESTDIR=$pkgdir install-gcc install-target-libgcc
-
-  rm -f $pkgdir/usr/share/man/man7/fsf-funding.7*
-  rm -f $pkgdir/usr/share/man/man7/gfdl.7*
-  rm -f $pkgdir/usr/share/man/man7/gpl.7*
-  rm -rf $pkgdir/usr/share/info
-
-  cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/
-  rm -rf $pkgdir/usr/libexec
-
-  # strip it manually
-  strip $pkgdir/usr/bin/* 2>/dev/null || true
-  find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true
-}
diff --git a/community-testing/assimp/PKGBUILD b/community-testing/assimp/PKGBUILD
deleted file mode 100644
index 6a5087a83..000000000
--- a/community-testing/assimp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: jepaan <jepaan at hotmail dot com>
-
-pkgname=assimp
-pkgver=3.0.1270
-pkgrel=1
-pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('libxmu' 'zlib' 'freeglut')
-makedepends=('cmake' 'boost')
-url=('http://assimp.sourceforge.net/index.html')
-source=("http://downloads.sourceforge.net/assimp/assimp--$pkgver-source-only.zip")
-md5sums=('52aa4cf4e34e6b2a9c5f6c0b3c319af1')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-    cd build
-	cmake ../${pkgname}--${pkgver}-source-only \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make 
-}
-
-package()  {
-	cd ${srcdir}/build
-
-	make DESTDIR=$pkgdir install
-	install -Dm644 ${srcdir}/${pkgname}--${pkgver}-source-only/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-testing/astromenace/PKGBUILD b/community-testing/astromenace/PKGBUILD
deleted file mode 100644
index a4f3d8663..000000000
--- a/community-testing/astromenace/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 77264 2012-10-08 13:00:46Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Ivan Bobrov <ibobrik at gmail dot com>
-# Contributor: Black_Mage <vleon1 at gmail dot com>
-
-pkgname=astromenace
-pkgver=1.2.0
-pkgrel=6
-pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities. English version"
-arch=('i686' 'x86_64')
-url="http://www.viewizard.com/astromenace/index_linux.php"
-license=('GPL3')
-depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu')
-makedepends=('cmake' 'mesa')
-source=(http://downloads.sourceforge.net/openastromenace/openamenace-src-$pkgver.tar.bz2
-        http://downloads.sourceforge.net/openastromenace/oamenace-data-$pkgver.tar.bz2
-        http://downloads.sourceforge.net/openastromenace/oamenace-lang-en-$pkgver.tar.bz2
-        astromenace.desktop
-        astromenace.png
-        astromenace.patch
-        astromenace.sh)
-md5sums=('3c8e7013aa64fcde7ba8a7750df51ab8'
-         'a8ad3495f8eac419ebcf93473008484d'
-         'f137da529da1345a0243f22fb8bf4913'
-         '1edc9367564a6c639a2b8199adf26a08'
-         '1643d876d4e21cc0c6ceddc8e7c8ceed'
-         '8d23310a2bb9c96dd150d30ab39799a1'
-         '2d4504929a620709cd058657bba335b3')
-
-build() {
-    cd $srcdir/OpenAstroMenaceSVN
-
-    # Patch build and install the engine
-    patch  -Np1 -i $srcdir/$pkgname.patch
-    cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr
-    sed -i 's/`sdl-config --libs`/-lSDL -lpthread/' CMakeFiles/AstroMenace.dir/link.txt
-    make
-}
-
-package() {
-    cd $srcdir/OpenAstroMenaceSVN
-
-    # Manually install the engine and data
-    install -Dm 755 AstroMenace $pkgdir/usr/bin/astromenace_bin
-    install -Dm 644 $srcdir/gamedata.vfs $pkgdir/usr/share/astromenace/gamedata.vfs
-    install -Dm 644 $srcdir/gamelang_en.vfs $pkgdir/usr/share/astromenace/gamelang_en.vfs
-    install -d $pkgdir/usr/share/astromenace/DATA/SCRIPT
-    install -m 644  $srcdir/DATA/SCRIPT/* $pkgdir/usr/share/astromenace/DATA/SCRIPT
-
-    # Install .desktop, icon and bin
-    install -Dm 644 $srcdir/astromenace.desktop $pkgdir/usr/share/applications/astromenace.desktop
-    install -Dm 644 $srcdir/astromenace.png $pkgdir/usr/share/pixmaps/astromenace.png
-    install -Dm 755 $srcdir/astromenace.sh $pkgdir/usr/bin/astromenace
-}
diff --git a/community-testing/astromenace/astromenace.desktop b/community-testing/astromenace/astromenace.desktop
deleted file mode 100644
index 2b8d57293..000000000
--- a/community-testing/astromenace/astromenace.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Astromenace
-Comment=Space shooter
-Exec=astromenace
-Icon=/usr/share/pixmaps/astromenace.png
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Application;Game;ArcadeGame;
diff --git a/community-testing/astromenace/astromenace.patch b/community-testing/astromenace/astromenace.patch
deleted file mode 100644
index b69efd9a4..000000000
--- a/community-testing/astromenace/astromenace.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur OpenAstroMenaceSVN.pristine/AstroMenaceSource/Core/RendererInterface/RendererInterface.h OpenAstroMenaceSVN.new/AstroMenaceSource/Core/RendererInterface/RendererInterface.h
---- OpenAstroMenaceSVN.pristine/AstroMenaceSource/Core/RendererInterface/RendererInterface.h	2010-02-14 11:39:06.721353373 +0100
-+++ OpenAstroMenaceSVN.new/AstroMenaceSource/Core/RendererInterface/RendererInterface.h	2010-02-14 11:46:47.171304764 +0100
-@@ -37,6 +37,8 @@
- #include "../Base.h"
- #include "../Math/Math.h"
- #include "../Texture/Texture.h"
-+#define PFNGLCLIENTACTIVETEXTUREPROC PFNGLACTIVETEXTUREPROC
-+
- 
- 
- 
diff --git a/community-testing/astromenace/astromenace.png b/community-testing/astromenace/astromenace.png
deleted file mode 100644
index 6093e9272..000000000
--- a/community-testing/astromenace/astromenace.png
+++ /dev/null
diff --git a/community-testing/astromenace/astromenace.sh b/community-testing/astromenace/astromenace.sh
deleted file mode 100644
index 02e8594df..000000000
--- a/community-testing/astromenace/astromenace.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-astromenace_bin --dir=/usr/share/astromenace "$@"
diff --git a/community-testing/audex/PKGBUILD b/community-testing/audex/PKGBUILD
deleted file mode 100644
index 0fbf880a4..000000000
--- a/community-testing/audex/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 74660 2012-08-01 16:22:37Z andrea $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: mightyjaym <jmambrosino@gmail.com>
-# Contributor: moostik <mooostik_at_gmail.com>
-
-pkgname=audex
-pkgver=0.74b1
-pkgrel=4
-pkgdesc="A CDDA extraction tool with a ftp upload function for KDE"
-arch=('i686' 'x86_64')
-url="http://kde-apps.org/content/show.php?content=77125"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia')
-makedepends=('cmake' 'automoc4')
-optdepends=('vorbis-tools: OGG encoder'
-	'faac: MP4/M4A/AAC encoder'
-	'flac: FLAC encoder'
-	'lame: MP3 encoder')
-install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        "google_regex.patch" 'gcc47.patch')
-md5sums=('20fdf9a0f89c08f44a151b6bdaab8782'
-         '77b33d8daead89d5f4f15b78a1cd1d55'
-         '64107bcf90e22910e57804be774822dd')
-
-build() {
-  # fix bug FS#25193
-  patch -Np0 -i "${srcdir}"/google_regex.patch
-
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/gcc47.patch
-  cd ..
-
-  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/community-testing/audex/audex.install b/community-testing/audex/audex.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/community-testing/audex/audex.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/community-testing/audex/gcc47.patch b/community-testing/audex/gcc47.patch
deleted file mode 100644
index 3d0ccf024..000000000
--- a/community-testing/audex/gcc47.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- audex-0.74b1.orig/utils/hashlist.cpp
-+++ audex-0.74b1/utils/hashlist.cpp
-@@ -15,7 +15,8 @@
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-- 
-+
-+#include <unistd.h>
- #include "hashlist.h"
- 
- Hashlist::Hashlist() {
-
diff --git a/community-testing/audex/google_regex.patch b/community-testing/audex/google_regex.patch
deleted file mode 100644
index 86917e66f..000000000
--- a/community-testing/audex/google_regex.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- audex-0.74b1/utils/coverfetcher.cpp	2011-01-15 12:06:25.000000000 +0100
-+++ audex-0.74b1/utils/coverfetcher_new.cpp	2011-07-20 18:43:37.554588883 +0200
-@@ -162,7 +162,10 @@
-   cover_tbnids.clear();
-   cover_thumbnails.clear();
- 
--  QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>");
-+  QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>");
-+  QString html = xml;
-+  html.replace( QLatin1String("&amp;"), QLatin1String("&") );
-+
-   rx.setMinimal(TRUE);
-   
-   int pos = 0; int i = 0;
diff --git a/community-testing/avr-gcc/PKGBUILD b/community-testing/avr-gcc/PKGBUILD
deleted file mode 100644
index 8e0e7cf79..000000000
--- a/community-testing/avr-gcc/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 75112 2012-08-14 08:28:11Z allan $
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: danst0 <danst0@west.de>
-
-# Build order: avr-binutils -> avr-gcc -> avr-libc
-
-pkgname=avr-gcc
-_pkgname=gcc
-pkgver=4.7.1
-pkgrel=2
-pkgdesc="The GNU AVR Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'custom')
-url="http://gcc.gnu.org/"
-depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc')
-provides=("gcc-avr=$pkgver")
-replaces=('gcc-avr')
-options=('!libtool' '!emptydirs' '!libtool' '!strip')
-source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2)
-
-_basedir=${srcdir}/${_pkgname}-${pkgver}
-
-build() {
-    # default CFLAGS lead to issues later on when configure 
-    # calls avr-gcc with -march set.
-    export CFLAGS="-O2 -pipe"
-    export CXXFLAGS="-O2 -pipe"
-
-    cd ${_basedir} 
-
-    # Do not install libiberty
-    sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
-    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 \
-                --enable-languages=c,c++ \
-                --disable-libssp \
-                --disable-nls \
-                --target=avr \
-                --with-as=/usr/bin/avr-as \
-                --with-ld=/usr/bin/avr-ld \
-                --with-gnu-as \
-                --with-gnu-ld
-
-    make
-}
-
-package() {
-    cd ${srcdir}/gcc-build
-
-    make -j1 DESTDIR=${pkgdir} install
-
-      # Install Runtime Library Exception
-    install -Dm644 ${_basedir}/COPYING.RUNTIME \
-        ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION
-
-    rm -rf ${pkgdir}/usr/share/man/man7
-    rm -rf ${pkgdir}/usr/share/info
-}
-
-md5sums=('933e6f15f51c031060af64a9e14149ff')
diff --git a/community-testing/avr-gdb/PKGBUILD b/community-testing/avr-gdb/PKGBUILD
deleted file mode 100644
index 2dbb56ee0..000000000
--- a/community-testing/avr-gdb/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Ivan Sichmann Freitas <ivansichfreitas at gmail dot com>
-# Contributor: Laszlo Papp <djszapi2 at gmail dot com>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Contributor: Vladimir Cerny <blackvladimir@gmail.com>
-# Contributor: 4javier <4javieregATgmailDOTcom>
-
-pkgname=avr-gdb
-_pkgname=gdb
-pkgver=7.4
-pkgrel=2
-pkgdesc="The GNU Debugger for AVR"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gdb/"
-license=('GPL3')
-depends=('python')
-options=('!libtool')
-source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2)
-md5sums=('95a9a8305fed4d30a30a6dc28ff9d060')
-
-build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  unset LDFLAGS
-  export CFLAGS="-O2 -pipe"
-  export CXXFLAGS="$CFLAGS"
-    
-  ./configure --prefix=/usr \
-    --target=avr \
-    --disable-nls \
-    --enable-languages=c,c++ \
-    --infodir=/usr/share/info \
-    --libdir=/usr/lib \
-    --program-prefix=avr- \
-    --libexecdir=/usr/lib \
-    --mandir=/usr/share/man \
-    --with-system-readline
-  make
-}
-
-package() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  rm -f ${pkgdir}/usr/lib/libiberty.a
-  rm -rf ${pkgdir}/usr/share/info
-  rm -rf ${pkgdir}/usr/share/gdb
-  rm -rf ${pkgdir}/usr/include/gdb
-}
diff --git a/community-testing/bitcoin/PKGBUILD b/community-testing/bitcoin/PKGBUILD
deleted file mode 100644
index beb8b14fb..000000000
--- a/community-testing/bitcoin/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 73746 2012-07-15 13:17:46Z ibiru $
-# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
-# Contributor: shahid <helllamer@gmail.com>
-
-pkgbase=bitcoin
-pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.6.3
-_commit=bbe1084
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.bitcoin.org/"
-makedepends=('boost' 'automoc4' 'miniupnpc')
-conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
-replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
-license=('MIT')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/bitcoin/$pkgbase/tarball/v$pkgver")
-sha256sums=('3f1a0df5d713c9e4f54f00a8f3f75c6828041afd826e16976b00229de0aecb70')
-
-build() {
-  cd "$srcdir/bitcoin-$pkgbase-$_commit"
-
-  # and make qt gui
-  qmake
-  make
-
-  # make bitcoind
-  make -f makefile.unix -C src  CXXFLAGS="$CXXFLAGS" USE_UPNP=1
-}
-
-
-package_bitcoin-qt() {
-  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - QT"
-  depends=(boost-libs qt miniupnpc)
-  install=bitcoin-qt.install
-
-  cd "$srcdir/bitcoin-$pkgbase-$_commit"
-  install -Dm755 bitcoin-qt "$pkgdir"/usr/bin/bitcoin-qt
-  install -Dm644 contrib/debian/bitcoin-qt.desktop \
-    "$pkgdir"/usr/share/applications/bitcoin.desktop
-  install -Dm644 share/pixmaps/bitcoin80.xpm \
-    "$pkgdir"/usr/share/pixmaps/bitcoin80.xpm
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-package_bitcoin-daemon() {
-  pkgdesc="Bitcoin is a peer-to-peer network based digital currency - daemon"
-  depends=(boost-libs miniupnpc openssl)
-
-  cd "$srcdir/bitcoin-$pkgbase-$_commit"
-  install -Dm755 src/bitcoind "$pkgdir"/usr/bin/bitcoind
-  install -Dm644 contrib/debian/examples/bitcoin.conf \
-    "$pkgdir/usr/share/doc/$pkgname/examples/bitcoin.conf"
-  install -Dm644 contrib/debian/manpages/bitcoind.1 \
-    "$pkgdir"/usr/share/man/man1/bitcoind.1
-  install -Dm644 contrib/debian/manpages/bitcoin.conf.5 \
-    "$pkgdir"/usr/share/man/man5/bitcoin.conf.5
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
diff --git a/community-testing/bitcoin/bitcoin-qt.install b/community-testing/bitcoin/bitcoin-qt.install
deleted file mode 100644
index f98ba7338..000000000
--- a/community-testing/bitcoin/bitcoin-qt.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/community-testing/blueman/PKGBUILD b/community-testing/blueman/PKGBUILD
deleted file mode 100644
index cb4ae826b..000000000
--- a/community-testing/blueman/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 78034 2012-10-16 11:49:44Z allan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org
-# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
-
-pkgname=blueman
-pkgver=1.23
-pkgrel=5
-pkgdesc="GTK+ bluetooth manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://blueman-project.org"
-depends=('python2-notify' 'bluez' 'python2-dbus' 'gtk2' 'python2-gobject2' 'startup-notification'
-	 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme' 'libpulse'
-	 'notification-daemon')
-makedepends=('pyrex' 'intltool')
-optdepends=('dnsmasq: For creating PAN network'
-	    'gconf: For gconf configuration support'
-	    'pulseaudio: To use the pulseaudio plugin'
-	    'notification-daemon: for desktop notifications'
-	    'libnotify: for desktop notifications'
-	    'modemmanager: for modem management service'
-	    'gnome-icon-theme: icon theme')
-options=('!libtool')
-install=$pkgname.install
-source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz)
-md5sums=('f0bee59589f4c23e35bf08c2ef8acaef')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export PYTHON=python2
-  for file in apps/blueman*; do
-    sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
-  done
-  sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py
-
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/blueman \
-	--with-no-runtime-deps-check
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop
-}
diff --git a/community-testing/blueman/blueman.install b/community-testing/blueman/blueman.install
deleted file mode 100644
index 8bf021487..000000000
--- a/community-testing/blueman/blueman.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/community-testing/catalyst-dkms/3.5-do_mmap.patch b/community-testing/catalyst-dkms/3.5-do_mmap.patch
deleted file mode 100644
index 04248eb7b..000000000
--- a/community-testing/catalyst-dkms/3.5-do_mmap.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
-@@ -2106,6 +2106,12 @@
-     }
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+# define NO_DO_MMAP
-+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
-+# define do_munmap(a,b,c) vm_munmap(b, c)
-+#endif
-+
- unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
-                                         KCL_IO_FILE_Handle file,
-                                         unsigned long addr,
-@@ -2117,10 +2123,13 @@
- 
-     flags = MAP_SHARED;
-     prot  = PROT_READ|PROT_WRITE;
--
-+#ifdef NO_DO_MMAP
-+    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
-+#else
-     down_write(&current->mm->mmap_sem);
-     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
-     up_write(&current->mm->mmap_sem);
-+#endif
-     if (IS_ERR(vaddr))
-        return 0;
-     else
-@@ -2131,7 +2140,9 @@
- {
-     int retcode = 0;
- 
-+#ifndef NO_DO_MMAP
-     down_write(&current->mm->mmap_sem);
-+#endif
- #ifdef FGL_LINUX_RHEL_MUNMAP_API
-     retcode = do_munmap(current->mm,
-                         addr,
-@@ -2142,7 +2153,9 @@
-                         addr,
-                         len);
- #endif                        
-+#ifndef NO_DO_MMAP
-     up_write(&current->mm->mmap_sem);
-+#endif
-     return retcode;
- }
- 
diff --git a/community-testing/catalyst-dkms/PKGBUILD b/community-testing/catalyst-dkms/PKGBUILD
deleted file mode 100644
index 05e501cda..000000000
--- a/community-testing/catalyst-dkms/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 78743 2012-10-23 22:15:52Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
-# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
-
-pkgname=catalyst-dkms
-pkgver=12.10
-pkgrel=1
-pkgdesc="AMD proprietary gpu kernel driver"
-arch=('i686' 'x86_64')
-url="http://www.amd.com"
-license=('custom')
-depends=('dkms')
-optdepends=('linux-headers: build the module against Arch kernel'
-            'linux-lts-headers: build the module against LTS Arch kernel')
-replaces=('catalyst-lts-dkms') # useless
-source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-x86.x86_64.zip
-        dkms.conf)
-md5sums=('ef6ecd984e47e80849215b33fbfa5b7f'
-         '972049dc247a74a7162f2227078abcb0')
-install=catalyst.install
-
-package() {
-  depends=(${depends[@]} "catalyst-utils=${pkgver}")
-
-  cd ${srcdir}
-  
-  if [ "${CARCH}" = "x86_64" ]; then
-    _archdir=x86_64
-  else
-    _archdir=x86
-  fi
-
-  sh ./amd-driver-installer*.run --extract fglrx-install
-
-  cd fglrx-install
-  #patch -Np1 -i ../3.5-do_mmap.patch
-
-  install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-  install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}"
-  cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
-  cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
-  cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/"
-  sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf"
-  
-  echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf"
-  
-  # license
-  install -Dm644 "common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
-}
diff --git a/community-testing/catalyst-dkms/catalyst.install b/community-testing/catalyst-dkms/catalyst.install
deleted file mode 100644
index 655468646..000000000
--- a/community-testing/catalyst-dkms/catalyst.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    dkms install -m fglrx -v $1
-}
-
-pre_upgrade() {
-    local curver=$2
-    # $2 is unset due to a bug. Query current version using pacman as fallback
-    [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}')
-    pre_remove $curver
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    dkms remove -m fglrx -v $1 --all
-}
diff --git a/community-testing/catalyst-dkms/dkms.conf b/community-testing/catalyst-dkms/dkms.conf
deleted file mode 100644
index 8d312da4f..000000000
--- a/community-testing/catalyst-dkms/dkms.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-PACKAGE_NAME="fglrx"
-PACKAGE_VERSION="@VERSION@"
-CLEAN="rm -f *.*o"
-BUILT_MODULE_NAME[0]="fglrx"
-MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck"
-DEST_MODULE_LOCATION[0]="/extramodules"
-AUTOINSTALL="yes"
diff --git a/community-testing/catalyst-utils/PKGBUILD b/community-testing/catalyst-utils/PKGBUILD
deleted file mode 100644
index 2a05774b3..000000000
--- a/community-testing/catalyst-utils/PKGBUILD
+++ /dev/null
@@ -1,128 +0,0 @@
-# $Id: PKGBUILD 76582 2012-09-23 23:07:57Z lcarlier $
-# Maintainer: idontknow
-# Contributor: to fill with a lot of people
-
-pkgbase=catalyst-utils
-pkgname=('catalyst-utils' 'opencl-catalyst')
-pkgver=12.8
-pkgrel=0.2
-pkgdesc="AMD Catalyst drivers utilities and libraries with OpenCL implementation."
-arch=('i686' 'x86_64')
-url="http://www.amd.com"
-license=('custom')
-source=("http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip"
-        atieventsd
-        atieventsd.service)
-md5sums=('41c5478322b13be6909eeb46412a3aa0'
-         'f729bf913613f49b0b9759c246058a87'
-         '14beb8cc8f59c06d5ef998e222779dae')
-
-if [ "${CARCH}" = "i686" ]; then
-  _ARCHDIR="x86"
-  _ARCHLIB=""
-  _ARCHXPIC=""
-else
-  _ARCHDIR="x86_64"
-  _ARCHLIB="64"
-  _ARCHXPIC="_64a"
-fi
-
-build() {
-  cd ${srcdir}
-  
-  sh ./amd-driver-installer*.run --extract fglrx-install
-}
-
-package_catalyst-utils() {
-  pkgdesc="AMD Catalyst drivers utilities and libraries."
-  provides=('libgl')
-  conflicts=('libgl' 'nvidia-utils')
-  depends=('xorg-server>=1.7.0' 'xorg-server<1.13.0' 'gcc-libs' 'libxinerama' \
-    'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'netkit-bsd-finger')
-  optdepends=('qt: amdcccle')
-  
-  install -dm755 "${pkgdir}"/usr/{bin,sbin}
-  install -dm755 "${pkgdir}"/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system}
-  install -dm755 "${pkgdir}"/usr/include/GL
-  install -dm755 "${pkgdir}"/etc/{ati,acpi/events,security/console.apps,rc.d}
-  install -dm755 "${pkgdir}"/usr/share/{applications,ati/amdcccle,man/man8,pixmaps}
-  
-  # binaries
-  cd ${srcdir}/fglrx-install
-  install -m755 common/usr/sbin/* "${pkgdir}/usr/sbin/"
-  install -m755 common/usr/X11R6/bin/* "${pkgdir}/usr/bin/"
-  install -m755 arch/${_ARCHDIR}/usr/sbin/* "${pkgdir}/usr/sbin/"
-  install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* "${pkgdir}/usr/bin/"
-  
-  # headers
-  install -m644 common/usr/include/GL/* "${pkgdir}/usr/include/GL/"
-  
-  # xorg/dri/gl/... drivers
-  cd ${srcdir}/fglrx-install/xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules
-  install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/"
-  install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/"
-  install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/"
-  install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/"
-  ln -s fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB}
-  install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/"
-  ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/dri/"
-  install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/"
-  install -m755 *.so* "${pkgdir}/usr/lib/"
-  install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib/"
-  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/lib${_ARCHLIB}
-  install -m755 *.so* "${pkgdir}/usr/lib/"
-  # needed symlinks
-  ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1"
-  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1"
-  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so"
-  ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1"
-  ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1"
-  
-  # various files 
-  cd ${srcdir}/fglrx-install/common
-  install -m644 usr/share/man/man8/* "${pkgdir}/usr/share/man/man8/"
-  install -m644 usr/share/applications/* "${pkgdir}/usr/share/applications/"
-  install -m644 usr/share/icons/* "${pkgdir}/usr/share/pixmaps/"
-  install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/"
-  install -m644 etc/ati/* "${pkgdir}/etc/ati/"
-  chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh"
-  install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/"
-  install -m644 usr/share/applications/*.desktop "${pkgdir}/usr/share/applications/"
-  # use ACPI example files
-  install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/"
-  install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/"
-  # systemd and rc.d scripts
-  install -m755 "${srcdir}/atieventsd" "${pkgdir}/etc/rc.d/"
-  install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/"
-
-  # provided in opencl-catalyst package
-  rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* 
-
-  # licenses
-  install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
-  install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/amdcccle/ccc_copyrights.txt" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt"
-}
-
-package_opencl-catalyst() {
-  pkgdesc="OpenCL implemention from AMD"
-  provides=('libcl')
-  conflicts=('libcl')
-  depends=('gcc-libs')
-  optdepends=('opencl-headers: headers necessary for OpenCL development')
-
-  install -dm755 "${pkgdir}"/usr/{bin,lib}
-  install -dm755 "${pkgdir}/etc/OpenCL/vendors"
-
-  cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}
-  
-  install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/"
-  install -m644 etc/OpenCL/vendors/amdocl*.icd "${pkgdir}/etc/OpenCL/vendors/"
-  install -m755 usr/lib${_ARCHLIB}/libamdocl*.so "${pkgdir}/usr/lib/"
-  install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 "${pkgdir}/usr/lib/"
-  ln -s libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so"
-  
-  # license
-  install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
-}
diff --git a/community-testing/catalyst-utils/atieventsd b/community-testing/catalyst-utils/atieventsd
deleted file mode 100644
index 16bd9a4fa..000000000
--- a/community-testing/catalyst-utils/atieventsd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd`
-
-case "$1" in
-  start)
-    rc=0
-    stat_busy "Starting ATI Events Daemon"
-    [ -z "$ATID_PID" ] && /usr/sbin/atieventsd
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon atieventsd
-      stat_done
-    fi
-    ;;
-  stop)
-    rc=0
-    stat_busy "Stopping ATI Events Daemon"
-    kill $ATID_PID &>/dev/null
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon atieventsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/catalyst-utils/atieventsd.service b/community-testing/catalyst-utils/atieventsd.service
deleted file mode 100644
index 14dd7e210..000000000
--- a/community-testing/catalyst-utils/atieventsd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Catalyst event Daemon
-
-[Service]
-ExecStart=/usr/sbin/atieventsd --nodaemon
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/community-testing/catalyst/3.5-do_mmap.patch b/community-testing/catalyst/3.5-do_mmap.patch
deleted file mode 100644
index 04248eb7b..000000000
--- a/community-testing/catalyst/3.5-do_mmap.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
-+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
-@@ -2106,6 +2106,12 @@
-     }
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
-+# define NO_DO_MMAP
-+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
-+# define do_munmap(a,b,c) vm_munmap(b, c)
-+#endif
-+
- unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
-                                         KCL_IO_FILE_Handle file,
-                                         unsigned long addr,
-@@ -2117,10 +2123,13 @@
- 
-     flags = MAP_SHARED;
-     prot  = PROT_READ|PROT_WRITE;
--
-+#ifdef NO_DO_MMAP
-+    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
-+#else
-     down_write(&current->mm->mmap_sem);
-     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
-     up_write(&current->mm->mmap_sem);
-+#endif
-     if (IS_ERR(vaddr))
-        return 0;
-     else
-@@ -2131,7 +2140,9 @@
- {
-     int retcode = 0;
- 
-+#ifndef NO_DO_MMAP
-     down_write(&current->mm->mmap_sem);
-+#endif
- #ifdef FGL_LINUX_RHEL_MUNMAP_API
-     retcode = do_munmap(current->mm,
-                         addr,
-@@ -2142,7 +2153,9 @@
-                         addr,
-                         len);
- #endif                        
-+#ifndef NO_DO_MMAP
-     up_write(&current->mm->mmap_sem);
-+#endif
-     return retcode;
- }
- 
diff --git a/community-testing/catalyst/PKGBUILD b/community-testing/catalyst/PKGBUILD
deleted file mode 100644
index 80652f726..000000000
--- a/community-testing/catalyst/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 76561 2012-09-23 08:26:49Z lcarlier $
-# Maintainer: idontknow
-# Contributor: to fill with a lot of people
-
-pkgname=catalyst
-pkgver=12.8
-pkgrel=0.1
-_extramodules=extramodules-3.5-ARCH
-pkgdesc="AMD proprietary gpu drivers"
-arch=('i686' 'x86_64')
-url="http://www.amd.com"
-license=('custom')
-depends=('linux>=3.5' 'linux<3.6')
-makedepends=('linux-headers>=3.5' 'linux-headers<3.6')
-#conflicts=('nvidia' 'xf86-video-ati' 'ati-dri')
-source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
-        3.5-do_mmap.patch)
-md5sums=('41c5478322b13be6909eeb46412a3aa0'
-         'a450e2e3db61994b09e9d99d95bee837')
-install=catalyst.install
-
-build() {
-  cd ${srcdir}
-  
-  if [ "${CARCH}" = "x86_64" ]; then
-    BUILDARCH=x86_64
-    _archdir=x86_64
-  else
-    BUILDARCH=i386
-    _archdir=x86
-  fi
-
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-  sh ./amd-driver-installer*.run --extract fglrx-install
-  
-  cd fglrx-install
-  patch -Np1 -i ../3.5-do_mmap.patch
-  
-  cd common/lib/modules/fglrx/build_mod
-  ln -s "${srcdir}/fglrx-install/arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a
-  ln -s 2.6.x/Makefile
-  
-  CFLAGS_MODULE="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=0 -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space -D__SMP__ -DMODVERSIONS"
-
-  make -C /usr/lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \
-    MODFLAGS="$CFLAGS_MODULE" CFLAGS_MODULE="$CFLAGS_MODULE" \
-    KVER=${_kernver} PAGE_ATTR_FIX=0 modules
-}
-
-package() {
-  depends=(${depends[@]} "catalyst-utils=${pkgver}")
-
-  cd ${srcdir}/fglrx-install/common/lib/modules/fglrx/build_mod
-  
-  install -Dm644 fglrx.ko "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko"
-  install -dm755 "${pkgdir}/usr/lib/modprobe.d"
-  echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf"
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/catalyst.install"
-  gzip "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko"
-  
-  # license
-  install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
-}
diff --git a/community-testing/catalyst/catalyst.install b/community-testing/catalyst/catalyst.install
deleted file mode 100644
index 22b72ea84..000000000
--- a/community-testing/catalyst/catalyst.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the catalyst module, reboot the system.'
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.5-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
diff --git a/community-testing/cclive/PKGBUILD b/community-testing/cclive/PKGBUILD
deleted file mode 100644
index c77ec5328..000000000
--- a/community-testing/cclive/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 73748 2012-07-15 13:17:58Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: joyfulgirl@archlinux.us
-# Contributor: nathan owe ndowens04 at gmail dot com
-
-pkgname=cclive
-pkgver=0.7.9
-pkgrel=2
-pkgdesc='Commandline downloader for popular video websites.'
-arch=('i686' 'x86_64')
-url='http://cclive.sourceforge.net/'
-license=('GPL3')
-depends=('boost-libs' 'pcre' 'curl' 'libquvi')
-makedepends=('boost')
-source=("http://downloads.sourceforge.net/project/${pkgname}/0.7/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2c7a3bbc2d6fdcfebb60cb3ae57944b5')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/cdemu-daemon/PKGBUILD b/community-testing/cdemu-daemon/PKGBUILD
deleted file mode 100644
index 78af6152f..000000000
--- a/community-testing/cdemu-daemon/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 72681 2012-06-19 12:54:14Z heftig $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Charles Lindsay <charles@chaoslizard.org>
-
-pkgname=cdemu-daemon
-pkgver=1.5.0
-pkgrel=6
-pkgdesc="CD/DVD-ROM device emulator daemon"
-arch=('i686' 'x86_64')
-url="http://cdemu.sourceforge.net/"
-license=('GPL')
-depends=('dbus' 'vhba-module>=20110915-5' 'libao' "libmirage=$pkgver")
-optdepends=('alsa-lib: to enable the ALSA audio driver'
-            'pulseaudio: to enable the PA audio driver')
-backup=('etc/conf.d/cdemud'
-        'etc/dbus-1/system.d/cdemud-dbus.conf')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
-        'cdemud.conf' 'cdemud.rc' 'system.patch' 'cdemu-daemon.service'
-        'cdemud-dbus.conf')
-md5sums=('5ba780caa26d855942512b5b3c22405a'
-         '6f31ad7a64d320cf4d6820432184070b'
-         'cbc0937ef4ac50db3ce5cdbbe2e17a3b'
-         '90a2516639c05737fa10a110a1cba467'
-         'be9a8f50da3f42129c0a0e3dea8cd56c'
-         'afbf24bcdec382f58d95ba5de29bff71')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # make things Arch-friendly
-  patch -Np1 -i "$srcdir/system.patch"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --libexecdir=/usr/lib/$pkgname
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # Custom dbus policy, tightening security to console and 'cdemu' group
-  install -m644 "$srcdir/cdemud-dbus.conf" \
-    "$pkgdir/etc/dbus-1/system.d/cdemud-dbus.conf"
-
-  # the init stuff
-  install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud"
-  install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud"
-  install -d "$pkgdir/usr/lib/modules-load.d"
-  echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
-
-  # for systemd
-  install -Dm644 "$srcdir/cdemu-daemon.service" \
-    "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service"
-  echo "SystemdService=cdemu-daemon.service" >> \
-    "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEMUD_Daemon.service"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/cdemu-daemon/cdemu-daemon.install b/community-testing/cdemu-daemon/cdemu-daemon.install
deleted file mode 100644
index ba34d1ea0..000000000
--- a/community-testing/cdemu-daemon/cdemu-daemon.install
+++ /dev/null
@@ -1,27 +0,0 @@
-post_install () {
-  cat <<MSG
-  > The daemon is automatically started, but can be manually
-    started via /etc/rc.d/cdemud or cdemu-daemon.service.
-  > See /etc/conf.d/cdemud for further configuration.
-
-  > Only users at the console or in the 'cdemu' group can
-    communicate with the system daemon or use a session
-    daemon.
-
-  > If you want to output CD-Audio, write AUDIO_DRIVER=pulse or
-    AUDIO_DRIVER=alsa to ~/.cdemud and use "cdemu -b session"
-    to control a session daemon.
-MSG
-
-  return 0
-}
-
-post_upgrade () {
-  # Repeat install message due to policy changes
-  # Added on 2012-06-19, remove after a grace period
-  post_install
-
-  return 0
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/cdemu-daemon/cdemu-daemon.service b/community-testing/cdemu-daemon/cdemu-daemon.service
deleted file mode 100644
index 9879a3e6f..000000000
--- a/community-testing/cdemu-daemon/cdemu-daemon.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=CDEmu Daemon
-
-[Service]
-Type=dbus
-BusName=net.sf.cdemu.CDEMUD_Daemon
-ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/cdemu-daemon/cdemud-dbus.conf b/community-testing/cdemu-daemon/cdemud-dbus.conf
deleted file mode 100644
index 3043fe251..000000000
--- a/community-testing/cdemu-daemon/cdemud-dbus.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE busconfig PUBLIC 
-    "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
-    <!-- Only root can own the CDEMUD_Daemon service on bus -->
-    <policy user="root">
-        <allow own="net.sf.cdemu.CDEMUD_Daemon"/>
-    </policy>
-    <policy group="root">
-        <allow own="net.sf.cdemu.CDEMUD_Daemon"/>
-    </policy>
-    
-    <!-- Allow users at the console to invoke methods on the interface -->
-    <policy at_console="true">
-        <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/>
-    </policy>
-
-    <!-- Allow users in the 'cdemu' group to invoke methods on the interface -->
-    <policy group="cdemu">
-        <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/>
-    </policy>
-</busconfig>
-
diff --git a/community-testing/cdemu-daemon/cdemud.conf b/community-testing/cdemu-daemon/cdemud.conf
deleted file mode 100644
index 1d8c55fe6..000000000
--- a/community-testing/cdemu-daemon/cdemud.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# how many optical drives to emulate
-NUM_DEVICES=2
-
-# audio backend (null, alsa or pulse)
-AUDIO_DRIVER=null
-
-# log file
-LOG_FILE=/var/log/cdemud.log
diff --git a/community-testing/cdemu-daemon/cdemud.rc b/community-testing/cdemu-daemon/cdemud.rc
deleted file mode 100644
index 09b9ec345..000000000
--- a/community-testing/cdemu-daemon/cdemud.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting cdemud"
-    /usr/lib/cdemu-daemon/cdemu-daemon-system.sh &
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon cdemud
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping cdemud"
-    kill `pidof cdemud` &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      rm_daemon cdemud
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community-testing/cdemu-daemon/system.patch b/community-testing/cdemu-daemon/system.patch
deleted file mode 100644
index 3c3d4b221..000000000
--- a/community-testing/cdemu-daemon/system.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -aur cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh
---- cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh	2012-03-25 16:35:40.577837996 +0800
-+++ cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh	2012-03-25 16:39:12.180024983 +0800
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *session* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from ~/.cdemu-daemon
-+# from ~/.cdemud
- 
- # Default settings
- NUM_DEVICES=2
--AUDIO_DRIVER=pulse
--LOG_FILE=~/.cdemu-daemon.log
-+AUDIO_DRIVER=null
-+LOG_FILE=~/.cdemud.log
- 
- # Read the settings
--CONFIG_FILE=~/.cdemu-daemon
-+CONFIG_FILE=~/.cdemud
- 
- if [ -f ${CONFIG_FILE} ]; then
-     . ${CONFIG_FILE};
-diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh
---- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh	2012-03-25 16:35:40.581171312 +0800
-+++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh	2012-03-25 16:36:48.810801678 +0800
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemud
- 
- # Default settings
- NUM_DEVICES=2
- AUDIO_DRIVER=null
--LOG_FILE=/tmp/cdemu-daemon.log
-+LOG_FILE=/var/log/cdemud.log
- 
- # Read the settings
--CONFIG_FILE=/etc/sysconfig/cdemu-daemon
-+CONFIG_FILE=/etc/conf.d/cdemud
- 
- if [ -f ${CONFIG_FILE} ]; then
-     . ${CONFIG_FILE};
diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD
deleted file mode 100644
index 519ab7394..000000000
--- a/community-testing/cdfs/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 74544 2012-07-30 13:38:15Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
-
-pkgname=cdfs
-pkgver=2.6.27
-pkgrel=26
-pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
-arch=(i686 x86_64)
-url="http://www.elis.UGent.be/~ronsse/cdfs/"
-license=('GPL')
-makedepends=('linux-headers')
-install=cdfs.install
-source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2"
-	"cdfs-3.0.patch"
-	"cdfs-3.2.patch"
-	"cdfs-3.4.patch")
-md5sums=('ac64c014a90e3c488394832ea29605b3'
-         'aba7da94a9dcbb8a93ea423cb6958fef'
-         'e934407b3460257a301822ffc4ab3933'
-         '9215e7bdac728bd2f889fb525e543454')
-
-build() {
-  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
-  depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
-  _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-ARCH/version`
-
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/cdfs-3.0.patch
-  patch -p1 <$srcdir/cdfs-3.2.patch
-  patch -p1 <$srcdir/cdfs-3.4.patch
-  make KDIR=/usr/lib/modules/${_kernverfull}/build
-  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
-  sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install
-}
diff --git a/community-testing/cdfs/cdfs-3.0.patch b/community-testing/cdfs/cdfs-3.0.patch
deleted file mode 100644
index 20194b848..000000000
--- a/community-testing/cdfs/cdfs-3.0.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
---- cdfs-2.6.27/cddata.c	2009-12-21 17:04:03.000000000 +0300
-+++ cdfs-2.6.27.my/cddata.c	2011-07-24 21:18:44.000000000 +0400
-@@ -83,7 +83,7 @@
- #else
-   .mmap             = generic_file_readonly_mmap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
--  .sendfile         = generic_file_sendfile
-+//  .sendfile         = generic_file_sendfile
- #else
-   .splice_read      = generic_file_splice_read
- #endif
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2011-07-25 13:16:59.000000000 +0400
-@@ -32,19 +30,14 @@
-  *	Added code to transform /proc/cdfs into a sequential synthetic file.  *
-  *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- 
--
- #include <linux/seq_file.h>
--
--#ifndef OLD_KERNEL
- #include <linux/statfs.h>
--#endif
-+#include <linux/sched.h>
- 
- extern struct seq_operations cdfs_operations;
- extern struct _track_info *dummy_track_p;
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) 
- struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); 
--#endif
- /*============================================================================*
-  *  cdfs_open()                                                               *
-  *	Description:                                                          *
-@@ -115,15 +108,8 @@
- 
- /********************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
--  kdev_t dev = sb->s_dev;
--  int i, j, t;
--  struct cdrom_tochdr  hdr;
--#else
- static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
-   int i, t;
--#endif
-   struct cdrom_tocentry   entry;   
-   int no_audio=0, no_data=0;
-   cd * this_cd;
-@@ -131,24 +117,13 @@
- 
-   PRINT("cdfs_mount\n");
- 
--#ifdef OLD_KERNEL
--  MOD_INC_USE_COUNT;
--
--  set_blocksize(dev, CD_FRAMESIZE);  // voor bread met ide-cd
--#else
-   sb_set_blocksize(sb, CD_FRAMESIZE);  // voor bread met ide-cd
--#endif
- 
-   sb->s_blocksize = CD_FRAMESIZE;
-   sb->s_blocksize_bits = 11;
- 
-   if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;     
--    return NULL;
--#else
-     return -ENOMEM;
--#endif
-   }
- 
-   this_cd->mode           = MODE;
-@@ -160,13 +135,8 @@
- 
-   // Initialize cache for maximum sector size
-   if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;
--    return NULL;
--#else
-     kfree(cdfs_info(sb));
-     return -ENOMEM;
--#endif
-   }
- 
-   // Cache is still invalid
-@@ -183,23 +153,13 @@
-   if (this_cd->toc_scsi){
-     if (cdfs_toc_read_full(sb)){
-       printk("TOC read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   } else {
-     //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
-     if (cdfs_toc_read(sb)){
-       printk("cdfs_toc_read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   }
- 
-@@ -365,11 +325,7 @@
-   sb->s_flags |= MS_RDONLY;
-   sb->s_op     = &cdfs_ops;
-   /* always get inode status */
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
-   retinode=cdfs_iget(sb, 0);
--#else
--  retinode=iget(sb, 0);
--#endif
-   if ( IS_ERR(retinode) )
-     return PTR_ERR(retinode);
- 
-@@ -379,16 +335,12 @@
- 
-   cdfs_proc_cd = this_cd;
- 
--#ifdef OLD_KERNEL
--  return sb;
--#else
-   return 0;
- 
- invalid:
-   kfree(this_cd->cache);
-   kfree(cdfs_info(sb));
-   return -EINVAL;
--#endif
- }
- 
- /************************************************************************/
-@@ -410,27 +362,12 @@
-   // Remove /proc entry
-   cdfs_proc_cd = NULL; 
-   kfree(cdfs_info(sb));
--
--#ifdef OLD_KERNEL
--  MOD_DEC_USE_COUNT;
--#endif
--
- }
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
- static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
-   cd * this_cd = cdfs_info(d->d_sb);
--#else
--static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#endif
--#endif
-   PRINT("rmfs_statfs\n");
- 
-   buf->f_type    = CDFS_MAGIC;
-@@ -460,11 +397,7 @@
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
--#else
- static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
--#endif
-   struct inode * inode;
-   int i;
-   cd * this_cd = cdfs_info(dir->i_sb);
-@@ -480,15 +413,9 @@
- /* Use goto and read inode with iget()/cdfs_iget() */
- /* Thanks to David Howells for patch and Master class in his mail */
- found:
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
- inode = cdfs_iget(dir->i_sb, i);
- if (IS_ERR(inode))
-   return ERR_CAST(inode);
--#else
--  inode = iget(dir->i_sb, i);
--  if (!inode)
--    return ERR_PTR(-ENOMEM);
--#endif
- d_add(dentry, inode);
- return NULL;
- }
-@@ -529,12 +456,8 @@
-     i->i_fop   = &cdfs_dir_operations;
-   } else {                                          /* file */
-     i->i_size  = this_cd->track[i->i_ino].size;
--#ifdef OLD_KERNEL
--    i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
--#else
-     i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
-     i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
--#endif
-     i->i_mode  = this_cd->mode;
-     if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
-       i->i_fop          = &cdfs_cddata_file_operations; 
-@@ -587,33 +510,21 @@
- /******************************************************************/
- 
- static struct super_operations cdfs_ops = {
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
--  .read_inode = cdfs_read_inode,
--#endif
-   .put_super  = cdfs_umount,
-   .statfs     = cdfs_statfs
- };
- 
--#ifdef OLD_KERNEL
--static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
--static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
--#else
--static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
--#endif
--}
-+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
-+//  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
-+//}
- 
- static struct file_system_type cdfs_fs_type = {
-   .owner    = THIS_MODULE,
-   .name     = "cdfs",
--  .get_sb   = cdfs_get_sb,
-+//  .get_sb   = cdfs_get_sb,
-   .kill_sb  = kill_block_super,
-   .fs_flags = FS_REQUIRES_DEV
- };
--#endif
- 
- /******************************************************/
- 
-@@ -621,10 +532,6 @@
- MODULE_DESCRIPTION("CDfs: a CD filesystem");
- MODULE_LICENSE("GPL"); 
- 
--#ifdef OLD_KERNEL
--EXPORT_NO_SYMBOLS;
--#endif
--
- /******************************************************************/
- 
- static int __init cdfs_init(void) {
-@@ -676,11 +583,7 @@
-   
-   if (!options) return;
-   
--#ifdef OLD_KERNEL
--  for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
--#else
-   while ((this_char = strsep(&options,",")) != NULL) {
--#endif
-     
-     if (!strcmp(this_char,"single")) 
-       this_cd->single=TRUE;
diff --git a/community-testing/cdfs/cdfs-3.2.patch b/community-testing/cdfs/cdfs-3.2.patch
deleted file mode 100644
index d3300bdbc..000000000
--- a/community-testing/cdfs/cdfs-3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-01-18 11:23:03.000000000 +0400
-@@ -517,7 +517,7 @@
-   
-   i->i_uid        = this_cd->uid;
-   i->i_gid        = this_cd->gid;
--  i->i_nlink      = 1;
-+  i->__i_nlink      = 1;
-   i->i_op         = &cdfs_inode_operations;
-   i->i_fop        = NULL;
-   i->i_data.a_ops = NULL;
diff --git a/community-testing/cdfs/cdfs-3.4.patch b/community-testing/cdfs/cdfs-3.4.patch
deleted file mode 100644
index 5c2cb9b24..000000000
--- a/community-testing/cdfs/cdfs-3.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-06-15 17:09:27.000000000 +0400
-@@ -375,7 +375,7 @@
- 
-   PRINT("retinode = %ld\n", retinode->i_ino);
- 
--  sb->s_root   = d_alloc_root(retinode);
-+  sb->s_root   = d_make_root(retinode);
- 
-   cdfs_proc_cd = this_cd;
- 
diff --git a/community-testing/cdfs/cdfs.install b/community-testing/cdfs/cdfs.install
deleted file mode 100644
index 6be46f6d5..000000000
--- a/community-testing/cdfs/cdfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/cegui/PKGBUILD b/community-testing/cegui/PKGBUILD
deleted file mode 100644
index d83aee6fd..000000000
--- a/community-testing/cegui/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 78795 2012-10-25 01:46:43Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org> 
-# Contributor: William Rea <sillywilly@gmail.com>, 
-# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
-
-pkgname=cegui
-pkgver=0.7.7
-pkgrel=2
-pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
-arch=('i686' 'x86_64')
-url="http://crayzedsgui.sourceforge.net"
-#options=('!libtool')
-license=("MIT")
-depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly')
-makedepends=('python2' 'doxygen' 'ogre' 'irrlicht' 'gtk2' 'boost' 'graphviz')
-optdepends=("python2: python bindings"
-            "ogre: ogre module"
-            "irrlicht: irrlicht module")
-options=(!libtool)
-source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz)
-md5sums=('8b83577f86eaa1581765dd155c7c8f24')
-
-build() {
-  cd $srcdir/CEGUI-${pkgver}
-
-  ./bootstrap
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-null-renderer \
-    --with-gtk2
-
-  make
-}
-
-package() {
-  cd $srcdir/CEGUI-${pkgver}
- 
-  make DESTDIR=${pkgdir} install
-
-  cd doc/doxygen && doxygen
-  cd .. && make DESTDIR=${pkgdir} install-html
-
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
-
diff --git a/community-testing/cegui/cegui-0.7.6-python-detection.patch b/community-testing/cegui/cegui-0.7.6-python-detection.patch
deleted file mode 100644
index e14cd812e..000000000
--- a/community-testing/cegui/cegui-0.7.6-python-detection.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- acinclude.m4.original	2012-01-24 10:42:16.066632295 +0100
-+++ acinclude.m4	2012-01-24 10:43:15.800274030 +0100
-@@ -1411,7 +1411,7 @@
- if test x$ax_python_bin != x; then
-    AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no)
-    AC_CHECK_HEADER([$ax_python_bin/Python.h],
--   [[ax_python_header=`locate $ax_python_bin/Python.h | sed -e s,/Python.h,,`]],
-+   [[ax_python_header="/usr/include/$ax_python_bin"]],
-    ax_python_header=no)
-    if test x$ax_python_lib != xno; then
-      if test x$ax_python_header != xno; then
diff --git a/community-testing/chromaprint/PKGBUILD b/community-testing/chromaprint/PKGBUILD
deleted file mode 100644
index b4ac256ec..000000000
--- a/community-testing/chromaprint/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 73323 2012-07-06 15:22:09Z ibiru $
-# Contributor: Wieland Hoffmann <the_mineo@web.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=chromaprint
-pkgver=0.6
-pkgrel=3
-pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
-url='http://acoustid.org/chromaprint/'
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('ffmpeg')
-makedepends=('cmake')
-source=("https://github.com/downloads/lalinsky/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'ffmpeg.patch')
-sha1sums=('e8bcc1d0d8dfec86aa648b87ba3f69b6d589eae0'
-          '56057f824a29194fc6041bd73e0d07412fcc065b')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../ffmpeg.patch
-	cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON .
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/chromaprint/ffmpeg.patch b/community-testing/chromaprint/ffmpeg.patch
deleted file mode 100644
index 7c0b86d77..000000000
--- a/community-testing/chromaprint/ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur old/examples/fpcalc.c new/examples/fpcalc.c
---- old/examples/fpcalc.c	2011-12-22 22:11:23.000000000 +1100
-+++ new/examples/fpcalc.c	2012-06-04 10:44:30.596604910 +1000
-@@ -28,7 +28,7 @@
- #endif
- 	int16_t *buffer;
- 
--	if (av_open_input_file(&format_ctx, file_name, NULL, 0, NULL) != 0) {
-+	if (avformat_open_input(&format_ctx, file_name, NULL, NULL) != 0) {
- 		fprintf(stderr, "ERROR: couldn't open the file\n");
- 		goto done;
- 	}
-@@ -71,9 +71,9 @@
- 		goto done;
- 	}
- 
--	if (codec_ctx->sample_fmt != SAMPLE_FMT_S16) {
-+	if (codec_ctx->sample_fmt != AV_SAMPLE_FMT_S16) {
- #ifdef HAVE_AV_AUDIO_CONVERT
--		convert_ctx = av_audio_convert_alloc(SAMPLE_FMT_S16, codec_ctx->channels,
-+		convert_ctx = av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codec_ctx->channels,
- 		                                     codec_ctx->sample_fmt, codec_ctx->channels, NULL, 0);
- 		if (!convert_ctx) {
- 			fprintf(stderr, "ERROR: couldn't create sample format converter\n");
-@@ -133,7 +133,7 @@
- 			if (convert_ctx) {
- 				const void *ibuf[6] = { buffer1 };
- 				void *obuf[6] = { buffer2 };
--				int istride[6] = { av_get_bits_per_sample_format(codec_ctx->sample_fmt) / 8 };
-+				int istride[6] = { av_get_bytes_per_sample(codec_ctx->sample_fmt) };
- 				int ostride[6] = { 2 };
- 				int len = buffer_size / istride[0];
- 				if (av_audio_convert(convert_ctx, obuf, ostride, ibuf, istride, len) < 0) {
diff --git a/community-testing/chromium-bsu/PKGBUILD b/community-testing/chromium-bsu/PKGBUILD
deleted file mode 100644
index 338f16747..000000000
--- a/community-testing/chromium-bsu/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 77219 2012-10-07 13:58:24Z jelle $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=chromium-bsu
-pkgver=0.9.15
-pkgrel=3
-pkgdesc="A fast paced top scrolling shooter"
-arch=('i686' 'x86_64')
-url="http://chromium-bsu.sourceforge.net/"
-license=('custom:artistic')
-depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image')
-install=chromium-bsu.install
-source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('d57137a1ac2292363b35192724c7e3be')
-
-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/chromium-bsu/LICENSE
-}
-
diff --git a/community-testing/chromium-bsu/chromium-bsu.install b/community-testing/chromium-bsu/chromium-bsu.install
deleted file mode 100644
index 6b1b64bdd..000000000
--- a/community-testing/chromium-bsu/chromium-bsu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-testing/chrony/PKGBUILD b/community-testing/chrony/PKGBUILD
deleted file mode 100644
index d066a606e..000000000
--- a/community-testing/chrony/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 72549 2012-06-16 17:08:48Z dreisner $
-# Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
-# Contributor: cdhotfire <cdhotfire@gmail.com>
-# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
-# Contributor: Elisamuel Resto <ryuji@simplysam.us>
-
-pkgname=chrony
-pkgver=1.26
-pkgrel=3
-pkgdesc='Lightweight NTP client and server'
-arch=('i686' 'x86_64')
-url="http://chrony.tuxfamily.org/"
-options=('strip')
-license=('GPL')
-depends=('readline' 'libcap')
-backup=('etc/chrony.conf')
-source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz
-        rc.d
-        service)
-md5sums=('ad6dd619ff1986e4ff780363c64e2246'
-         'd8b653c8bcc76cef00aa10fbd3eeb4f7'
-         'd78e6189c6f51a2af30a65bdedcdb2eb')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver 
-  make DESTDIR=$pkgdir install
-
-  install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf
-  install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/chrony
-  install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service
-}
diff --git a/community-testing/chrony/rc.d b/community-testing/chrony/rc.d
deleted file mode 100644
index ec042d798..000000000
--- a/community-testing/chrony/rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/chronyd`
-case "$1" in
-  start)
-    stat_busy "Starting chrony Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/chronyd $NTPD_ARGS &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon chrony
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping chrony Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon chrony
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community-testing/chrony/service b/community-testing/chrony/service
deleted file mode 100644
index 8bc8da9d2..000000000
--- a/community-testing/chrony/service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Chrony Network Time Daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/chronyd
-PIDFile=/var/run/chronyd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/connman/PKGBUILD b/community-testing/connman/PKGBUILD
deleted file mode 100644
index a52740fca..000000000
--- a/community-testing/connman/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-#$Id: PKGBUILD 78716 2012-10-23 04:26:25Z dwallace $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
-
-pkgname=connman
-pkgver=1.8
-pkgrel=2
-pkgdesc="Wireless LAN network manager"
-url="http://connman.net/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('dbus-core' 'iptables' 'glib2' 'gnutls')
-conflicts=('openresolv')
-optdepends=('bluez: Support for Bluetooth devices'
-            'wpa_supplicant: For WiFi devices')
-makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn')
-options=('!libtool')
-source=('connmand-daemon'
-        "http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'allow_group_network.diff')
-
-md5sums=('88ece7cbf1d0d289545ce4f8553fdab8'
-         '689468f92a1dcb2c0e30d7d00410ad87'
-         'a8d22ee089fb0ed725130d16ad393047')
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/allow_group_network.diff"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --with-systemdunitdir=/usr/lib/systemd/system \
-      --enable-threads \
-      --enable-openconnect \
-      --enable-openvpn \
-      --enable-polkit \
-      --enable-client
-
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  install -Dm755 "$srcdir"/connmand-daemon "$pkgdir"/etc/rc.d/connmand
-}
diff --git a/community-testing/connman/allow_group_network.diff b/community-testing/connman/allow_group_network.diff
deleted file mode 100644
index 027d933f7..000000000
--- a/community-testing/connman/allow_group_network.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/connman-polkit.conf	2010-11-05 12:09:04.285423955 -0200
-+++ b/src/connman-polkit.conf	2010-11-05 12:10:53.041423934 -0200
-@@ -5,6 +5,9 @@
-         <allow own="net.connman"/>
-         <allow send_interface="net.connman.Agent"/>
-     </policy>
-+    <policy group="network">
-+       <allow send_interface="net.connman.Agent"/>
-+    </policy>
-     <policy context="default">
-         <allow send_destination="net.connman"/>
-     </policy>
diff --git a/community-testing/connman/connmand-daemon b/community-testing/connman/connmand-daemon
deleted file mode 100755
index aff1ddeb2..000000000
--- a/community-testing/connman/connmand-daemon
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DESC="Connection Manager"
-NAME="connmand"
-ARGS=""
-DAEMON="/usr/sbin/$NAME"
-
-PID=`pidof -o %PPID ${DAEMON}`
-case "$1" in
-  start)
-    stat_busy "Starting ${DESC}"
-    if [ -z "$PID" ]; then
-       ${DAEMON} ${ARGS}
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ${NAME}
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ${DESC}"
-    [ ! -z "$PID" ]  && killall ${DAEMON} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ${NAME}
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/community-testing/conntrack-tools/01-config-file-path.patch b/community-testing/conntrack-tools/01-config-file-path.patch
deleted file mode 100644
index 9041ddbc4..000000000
--- a/community-testing/conntrack-tools/01-config-file-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/include/conntrackd.h	2012-05-26 15:29:15.630027223 +0200
-+++ b/include/conntrackd.h	2012-05-27 02:26:59.426811589 +0200
-@@ -50,7 +50,7 @@
- #define EXP_DUMP_INT_XML	47	/* dump internal cache in XML	*/
- #define EXP_DUMP_EXT_XML	48	/* dump external cache in XML	*/
- 
--#define DEFAULT_CONFIGFILE	"/etc/conntrackd/conntrackd.conf"
-+#define DEFAULT_CONFIGFILE	"/etc/conntrackd.conf"
--#define DEFAULT_LOCKFILE	"/var/lock/conntrackd.lock"
-+#define DEFAULT_LOCKFILE	"/run/lock/conntrackd.lock"
- #define DEFAULT_LOGFILE		"/var/log/conntrackd.log"
- #define DEFAULT_STATS_LOGFILE	"/var/log/conntrackd-stats.log"
diff --git a/community-testing/conntrack-tools/02-fix-compilation-of-timeout-extension.patch b/community-testing/conntrack-tools/02-fix-compilation-of-timeout-extension.patch
deleted file mode 100644
index 746934994..000000000
--- a/community-testing/conntrack-tools/02-fix-compilation-of-timeout-extension.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 18efbc802479ce042378dc0cccc7577e1c6afa41 Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Sat, 26 May 2012 20:58:16 +0200
-Subject: [PATCH] nfct: fix compilation of timeout extension
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-nfct-extensions/timeout.c: In function ‘nfct_timeout_cb’:
-nfct-extensions/timeout.c:99:2: warning: passing argument 4 of ‘nfct_timeout_snprintf’ makes integer from pointer without a cast [enabled by default]
-/usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h:114:5: note: expected ‘unsigned int’ but argument is of type ‘struct nfct_timeout *’
-
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- src/nfct-extensions/timeout.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c
-index a1a5c52..5b32023 100644
---- a/src/nfct-extensions/timeout.c
-+++ b/src/nfct-extensions/timeout.c
-@@ -96,7 +96,7 @@ static int nfct_timeout_cb(const struct nlmsghdr *nlh, void *data)
- 		goto err_free;
- 	}
- 
--	nfct_timeout_snprintf(buf, sizeof(buf), t, 0);
-+	nfct_timeout_snprintf(buf, sizeof(buf), t, NFCT_TIMEOUT_O_DEFAULT, 0);
- 	printf("%s\n", buf);
- 
- err_free:
--- 
-1.7.2.5
-
diff --git a/community-testing/conntrack-tools/PKGBUILD b/community-testing/conntrack-tools/PKGBUILD
deleted file mode 100644
index d8d986e66..000000000
--- a/community-testing/conntrack-tools/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 77397 2012-10-09 15:40:57Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Contributor: Valere Monseur <valere_monseur@hotmail.com>
-# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com>
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-
-pkgname=conntrack-tools
-pkgver=1.4.0
-pkgrel=1
-pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
-arch=('i686' 'x86_64')
-url='http://www.netfilter.org/projects/conntrack-tools'
-license=('GPL2')
-depends=('libnetfilter_conntrack'
-         'libnetfilter_cttimeout'
-         'libnetfilter_cthelper'
-         'libnetfilter_queue')
-backup=('etc/conntrackd.conf' 'etc/conf.d/conntrackd')
-options=('!libtool')
-source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2"
-        'conntrackd.rc'
-        'conntrackd.conf'
-        'conntrackd.service'
-        '01-config-file-path.patch')
-install=$pkgname.install
-md5sums=('ee737c774e01349f75e935228a2d851b'
-         '478fe76da0202fcb5249bf65968d1c26'
-         'd3e73e81b54e3e8166d357d434680684'
-         'bd135eaefb47923bb8e8d26f084d3e9d'
-         'e71ff7b8c4997b797cab3eaaccb693f4')
-
-build() {
-  cd $pkgname-$pkgver
-  for i in "$srcdir"/*.patch; do
-    patch -p1 -i "$i"
-  done
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  # install binaries
-  pushd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  popd
-  # initscripts & systemd
-  install -D -m 755 conntrackd.rc "$pkgdir/etc/rc.d/conntrackd"
-  install -D -m 644 conntrackd.conf "$pkgdir/etc/conf.d/conntrackd"
-  install -D -m 644 conntrackd.service \
-    "$pkgdir/usr/lib/systemd/system/conntrackd.service"
-  # install empty configuration files
-  install -D -m 644 /dev/null "$pkgdir/etc/conntrackd.conf"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/conntrack-tools/conntrack-tools.install b/community-testing/conntrack-tools/conntrack-tools.install
deleted file mode 100644
index d21a5f92c..000000000
--- a/community-testing/conntrack-tools/conntrack-tools.install
+++ /dev/null
@@ -1,9 +0,0 @@
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  [ $(vercmp "$2" '1.0.1-2') -gt 0 ] || cat <<EOF
-Config file have been moved from /etc/conntrackd/conntrackd.conf to /etc/conntrackd.conf.
-EOF
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/conntrack-tools/conntrackd.conf b/community-testing/conntrack-tools/conntrackd.conf
deleted file mode 100644
index 285f566d2..000000000
--- a/community-testing/conntrack-tools/conntrackd.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# vim:set ts=2 sw=2 ft=sh noet:
-
-#DAEMON_OPTIONS=''
diff --git a/community-testing/conntrack-tools/conntrackd.rc b/community-testing/conntrack-tools/conntrackd.rc
deleted file mode 100644
index 4300a7041..000000000
--- a/community-testing/conntrack-tools/conntrackd.rc
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-DAEMON=/usr/sbin/conntrackd
-PID=$(pidof -o %PPID $DAEMON)
-DAEMON_OPTIONS="-d $DAEMON_OPTIONS"
-
-case "$1" in
-  start)
-    stat_busy "Starting ${0##*/} daemon"
-    [[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  stop)
-    stat_busy "Stopping ${0##*/} daemon"
-    [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0
-    stat_fail
-  ;;
-  restart)
-    $0 stop
-    $0 start
-    exit 0
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart}" >&2
-  ;;
-esac
-
-exit 1
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/conntrack-tools/conntrackd.service b/community-testing/conntrack-tools/conntrackd.service
deleted file mode 100644
index 25a113785..000000000
--- a/community-testing/conntrack-tools/conntrackd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Conntrack Daemon
-
-[Service]
-ExecStart=/usr/sbin/conntrackd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/converseen/PKGBUILD b/community-testing/converseen/PKGBUILD
deleted file mode 100644
index 4cd41f90c..000000000
--- a/community-testing/converseen/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 78798 2012-10-25 01:47:00Z ebelanger $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: archtux <antonio.arias99999 at gmail.com>
-
-pkgname=converseen
-pkgver=0.5.1
-pkgrel=2
-pkgdesc="The batch image converter and resizer"
-arch=('i686' 'x86_64')
-url="http://converseen.sourceforge.net/"
-license=('GPL3')
-depends=('imagemagick' 'qt' 'libwmf' 'openexr')
-makedepends=('cmake')
-install=converseen.install
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('db00c0cf86977494effa971fd238c786')
-
-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/community-testing/converseen/converseen.install b/community-testing/converseen/converseen.install
deleted file mode 100644
index 9af7fa81f..000000000
--- a/community-testing/converseen/converseen.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-testing/cuneiform/PKGBUILD b/community-testing/cuneiform/PKGBUILD
deleted file mode 100644
index 521490526..000000000
--- a/community-testing/cuneiform/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78799 2012-10-25 01:47:03Z ebelanger $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Maxim Vuets <maxim.vuets@gmail.com>
-
-pkgname=cuneiform
-pkgver=1.1.0
-_dpkgver=1.1
-pkgrel=4
-pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
-arch=('i686' 'x86_64')
-url="https://launchpad.net/cuneiform-linux"
-license=('BSD')
-depends=('imagemagick')
-makedepends=('cmake')
-source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/cuneiform-linux-${pkgver}.tar.bz2)
-md5sums=('09fd160cdfc512f26442a7e91246598d')
-
-_SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}"
-
-build() {
-  cd "${_SRC_ROOT}"
-  sed -i 's#lib64#lib#' install_files.cmake
-  mkdir builddir
-  cd builddir
-
-  cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr ..
-  make
-}
-
-package() {
-  cd "${_SRC_ROOT}"/builddir
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${_SRC_ROOT}/cuneiform_src/Kern/license.txt" \
-    "${pkgdir}/usr/share/licenses/cuneiform/license.txt"
-}
diff --git a/community-testing/cython/PKGBUILD b/community-testing/cython/PKGBUILD
deleted file mode 100644
index 3e20aed0f..000000000
--- a/community-testing/cython/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78039 2012-10-16 11:50:02Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Igor Scabini <furester @ gmail.com>
-
-pkgname=('cython' 'cython2')
-pkgbase=cython
-pkgver=0.17
-pkgrel=2
-pkgdesc="C-Extensions for Python "
-arch=(i686 x86_64)
-url="http://www.cython.org"
-license=('APACHE')
-makedepends=('python-distribute' 'python2-distribute')
-source=("http://cython.org/release/Cython-$pkgver.tar.gz")
-md5sums=('d6b669956b25babf7dd86db0a98539e4')
-
-build() {
-  true
-}
-
-package_cython() {
-  depends=('python')
-
-  cd $srcdir/Cython-$pkgver
-  python setup.py install --root=$pkgdir
-
-  sed -i 's|#!.*python|#!/usr/bin/python3|' $pkgdir/usr/bin/*
-}
-
-package_cython2() {
-  depends=('python2')
-
-  cd $srcdir/Cython-$pkgver
-  python2 setup.py install --root=$pkgdir
-
-  mv $pkgdir/usr/bin/cygdb $pkgdir/usr/bin/cygdb2
-  mv $pkgdir/usr/bin/cython $pkgdir/usr/bin/cython2
-}
diff --git a/community-testing/darktable/PKGBUILD b/community-testing/darktable/PKGBUILD
deleted file mode 100644
index d974ca8f4..000000000
--- a/community-testing/darktable/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 78800 2012-10-25 01:47:08Z ebelanger $
-# 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=1.0.5
-_pkgver=1.0
-pkgrel=4
-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' 'sqlite')
-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=('9ad88a1a6b9761fce28c8073d8f47941')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-#  mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt
-  sed -i 's/-Werror//' src/CMakeLists.txt
-  mkdir -p build
-  cd build
-  cmake \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DDONT_INSTALL_GCONF_SCHEMAS=True \
-      -DBINARY_PACKAGE_BUILD=1 \
-      -DUSE_GCONF_BACKEND=Off \
-      -DBUILD_USERMANUAL=False \
-      ..
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-  make DESTDIR="$pkgdir" install
-  mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
-#  mkdir -p "${pkgdir}/usr/share/gconf/schemas/"
-#  mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/"
-}
diff --git a/community-testing/darktable/darktable.install b/community-testing/darktable/darktable.install
deleted file mode 100644
index 9fd6af293..000000000
--- a/community-testing/darktable/darktable.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=darktable
-
-post_install() {
-#  usr/sbin/gconfpkg --install ${pkgname}
-  [ -x `which update-desktop-database` ] &&  update-desktop-database -q
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-#  usr/sbin/gconfpkg --uninstall ${pkgname}
-  true
-}
-
-post_remove() {
-  [ -x `which update-desktop-database` ] &&  update-desktop-database -q
-}
diff --git a/community-testing/dcron/PKGBUILD b/community-testing/dcron/PKGBUILD
deleted file mode 100644
index 709124059..000000000
--- a/community-testing/dcron/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 72550 2012-06-16 17:08:55Z dreisner $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Paul Mattal <paul.archlinux.org>
-
-pkgname=dcron
-pkgver=4.5
-pkgrel=3
-pkgdesc="dillon's lightweight cron daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.jimpryor.net/linux/dcron.html"
-backup=('var/spool/cron/root' 'etc/conf.d/crond')
-depends=('bash')
-provides=('cron')
-conflicts=('cron')
-optdepends=('smtp-server: sending cron job output via email')
-install=$pkgname.install
-source=(http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz
-        service)
-md5sums=('078833f3281f96944fc30392b1888326'
-         '5a68a7aee883738e7f7f8549481bb297')
-
-build() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-
-	# by default, any member of group "users" can edit their own crontab
-	make \
-		PREFIX=/usr \
-		CRONTAB_GROUP=users \
-		CRONTABS=/var/spool/cron \
-		CRONSTAMPS=/var/spool/cronstamps
-}
-
-package() {
-	cd "$srcdir/${pkgname}-${pkgver}"
-	make DESTDIR="$pkgdir" install
-
-	# install standard configuration and scripts
-	install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} 
-
-	install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron"
-	install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" 
-	install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond"
-	install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond"
-	install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim"
-	sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps
-	install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps"
-    install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/dcron.service
-}
diff --git a/community-testing/dcron/dcron.install b/community-testing/dcron/dcron.install
deleted file mode 100644
index df23d0224..000000000
--- a/community-testing/dcron/dcron.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_upgrade() {
-	if [ $(vercmp $2 4.0) -lt 0 ]
-	then
-		echo "Restart crond, since you're upgrading to the dcron 4.x series."
-	fi
-}
diff --git a/community-testing/dcron/service b/community-testing/dcron/service
deleted file mode 100644
index 59fc64b80..000000000
--- a/community-testing/dcron/service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Periodic Command Scheduler
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/crond
-ExecStart=/usr/sbin/crond $CROND_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/deadbeef/PKGBUILD b/community-testing/deadbeef/PKGBUILD
deleted file mode 100644
index b38985962..000000000
--- a/community-testing/deadbeef/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 73325 2012-07-06 15:22:25Z ibiru $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
-
-pkgname=deadbeef
-pkgver=0.5.5
-pkgrel=1
-pkgdesc='An audio player for GNU/Linux based on GTK2.'
-arch=('i686' 'x86_64')
-url='http://deadbeef.sourceforge.net'
-license=('GPL2')
-depends=('gtk2' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
-             'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate'
-             'yasm')
-optdepends=('libsamplerate: for Resampler plugin'
-            'libvorbis: for Ogg Vorbis playback'
-            'libmad: for MP1/MP2/MP3 playback'
-            'flac: for FLAC playback'
-            'curl: for Last.fm scrobbler, SHOUTcast, Icecast, Podcast support'
-            'imlib2: for artwork plugin'
-            'wavpack: for WavPack playback'
-            'libsndfile: for Wave playback'
-            'libcdio: audio cd plugin'
-            'libcddb: audio cd plugin'
-            'faad2: for AAC/MP4 support'
-            'dbus: for OSD notifications support'
-            'pulseaudio: for PulseAudio output plugin'
-            'libx11: for global hotkeys plugin'
-            'zlib: for Audio Overload plugin'
-            'libzip: for vfs_zip plugin')
-options=('!libtool')
-install='deadbeef.install'
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7cc10cefda0f4044eea897893e4cc1a9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --disable-ffmpeg
-  make
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
deleted file mode 100644
index db1c79638..000000000
--- a/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Mon, 4 Jul 2011 16:47:25 +0400
-Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT()
-
-For ffmpeg < 0.5.  Copied from libavutil 0.5.
-
-ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc
-
-fixes build with lavc 53.
-
-ffmpeg: fix erroneous version comparisons
-
-Comparing versions this way: (x.y < x1.y1) is obviously equivalent to
-(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1).
-
-ffmpeg: use av_register_protocol2() if available
-
-fixes usage with ffmpeg-0.8
----
- plugins/ffmpeg/ffmpeg.c |   37 ++++++++++++++++++++++++++++++-------
- 1 files changed, 30 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index cd7edf4..0cb9955 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -44,6 +44,10 @@
- #define av_register_protocol register_protocol
- #endif
- 
-+#ifndef AV_VERSION_INT
-+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-+#endif
-+
- #endif
- 
- //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
-     for (i = 0; i < info->fctx->nb_streams; i++)
-     {
-         info->ctx = info->fctx->streams[i]->codec;
--        if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (info->ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             info->codec = avcodec_find_decoder (info->ctx->codec_id);
-             if (info->codec != NULL) {
-@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
-             int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-             int len;
-             //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size);
--#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25)
--            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
--#else
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0)
-             len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt);
-+#else
-+            len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
- #endif
-             trace ("out: out_size=%d, len=%d\n", out_size, len);
-             if (len <= 0) {
-@@ -418,7 +427,7 @@ static const char *map[] = {
- 
- static int
- ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
--#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0)
-     if (!strlen (fctx->title)) {
-         // title is empty, this call will set track title to filename without extension
-         deadbeef->pl_add_meta (it, "title", NULL);
-@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
-@@ -704,7 +718,11 @@ ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-     avcodec_init ();
-     av_register_all ();
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+    av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
-+#else
-     av_register_protocol (&vfswrapper);
-+#endif
-     return 0;
- }
- 
-@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) {
-     for (i = 0; i < fctx->nb_streams; i++)
-     {
-         ctx = fctx->streams[i]->codec;
--        if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+        if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            AVMEDIA_TYPE_AUDIO)
-+#else
-+            CODEC_TYPE_AUDIO)
-+#endif
-         {
-             codec = avcodec_find_decoder(ctx->codec_id);
-             if (codec != NULL)
--- 
-1.7.8.4
-
diff --git a/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
deleted file mode 100644
index af8c282c0..000000000
--- a/community-testing/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Thu, 7 Jul 2011 22:31:44 +0400
-Subject: [PATCH 2/2] ffmpeg: version check fix
-
----
- plugins/ffmpeg/ffmpeg.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index 0cb9955..37c7e80 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -718,7 +718,7 @@ ffmpeg_start (void) {
-     ffmpeg_init_exts ();
-     avcodec_init ();
-     av_register_all ();
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0)
-     av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
- #else
-     av_register_protocol (&vfswrapper);
--- 
-1.7.8.4
-
diff --git a/community-testing/deadbeef/deadbeef.install b/community-testing/deadbeef/deadbeef.install
deleted file mode 100644
index fcdbf15fb..000000000
--- a/community-testing/deadbeef/deadbeef.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=deadbeef
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-
-  cat <<EOF
-==> ffmpeg support was disabled in this deadbeef release due to
-==> incompatibilities with ffmpeg 0.11. It might be re-introduced soon.
-EOF
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/dee/PKGBUILD b/community-testing/dee/PKGBUILD
deleted file mode 100644
index 577c0efdb..000000000
--- a/community-testing/dee/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 78040 2012-10-16 11:50:05Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=dee
-pkgver=1.0.14
-pkgrel=2
-pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/dee"
-license=('LGPL')
-depends=('glib2' 'icu')
-makedepends=('python2' 'gobject-introspection' 'vala')
-options=('!libtool')
-source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('473b4181e26538af0fb753255da7945c')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-tests \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # Install GI overrides for python 3 as well
-  install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides"
-  ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py"
-}
diff --git a/community-testing/desmume/PKGBUILD b/community-testing/desmume/PKGBUILD
deleted file mode 100644
index 2a5d0a3bf..000000000
--- a/community-testing/desmume/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 77556 2012-10-12 07:01:24Z schuay $
-# Maintainer: Jonathan Conder <jonno dot conder at gmail dot com>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Nathan Jones <nathanj@insightbb.com>
-# Contributor: Javier "Phrodo_00" Aravena <phrodo.00 at gmail dot com>
-# Contributor: angvp <angvp at archlinux dot us>
-# Contributor: Allan <mcrae_allan at hotmail dot com>
-# Contributor: w0rm <w0rmtux at gmail dot com>
-# Contributor: vEX <vex at niechift dot com>
-# Contributor: Asher256 <achrafcherti at gmail dot com>
-
-pkgname=desmume
-pkgver=0.9.8
-pkgrel=3
-pkgdesc="Nintendo DS emulator"
-arch=('i686' 'x86_64')
-url="http://desmume.org/"
-license=('GPL')
-depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap'
-         'soundtouch' 'alsa-lib' 'zziplib' 'glu')
-makedepends=('intltool')
-install=desmume.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --enable-wifi
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
-
-md5sums=('fb7c984c924087888b9eaaad8cb1875e')
diff --git a/community-testing/desmume/desmume.install b/community-testing/desmume/desmume.install
deleted file mode 100644
index e111ef946..000000000
--- a/community-testing/desmume/desmume.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/devil/PKGBUILD b/community-testing/devil/PKGBUILD
deleted file mode 100644
index cc656a31f..000000000
--- a/community-testing/devil/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78801 2012-10-25 01:47:15Z ebelanger $
-# Maintainer: Laurent Carlier <lordheavym@gmail.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: TheHoff <forums>
-
-pkgname=devil
-pkgver=1.7.8
-pkgrel=14
-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
-
-  if [[ $CARCH == x86_64 ]]; then
-    ./configure --prefix=/usr --enable-ILU
-  else
-    ./configure --prefix=/usr --enable-ILU --disable-sse3
-  fi
-
-  make
-}
-
-package() {
-  cd ${srcdir}/devil-$pkgver
-
-  make prefix=${pkgdir}/usr install
-}
diff --git a/community-testing/devil/devil.install b/community-testing/devil/devil.install
deleted file mode 100644
index 8336ac3d1..000000000
--- a/community-testing/devil/devil.install
+++ /dev/null
@@ -1,11 +0,0 @@
-infodir=usr/share/info
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/DevIL_manual.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/community-testing/devil/libpng14.patch b/community-testing/devil/libpng14.patch
deleted file mode 100644
index b8434692b..000000000
--- a/community-testing/devil/libpng14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nur devil-1.7.8.orig/src-IL/src/il_icon.c devil-1.7.8/src-IL/src/il_icon.c
---- devil-1.7.8.orig/src-IL/src/il_icon.c	2009-03-08 09:10:09.000000000 +0200
-+++ devil-1.7.8/src-IL/src/il_icon.c	2010-01-17 00:54:09.000000000 +0200
-@@ -525,7 +525,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (ico_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(ico_png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(ico_png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
-diff -Nur devil-1.7.8.orig/src-IL/src/il_png.c devil-1.7.8/src-IL/src/il_png.c
---- devil-1.7.8.orig/src-IL/src/il_png.c	2009-03-08 09:10:09.000000000 +0200
-+++ devil-1.7.8/src-IL/src/il_png.c	2010-01-17 00:55:26.000000000 +0200
-@@ -105,7 +105,7 @@
- 	Read = iread(Signature, 1, 8);
- 	iseek(-Read, IL_SEEK_CUR);
- 
--	return png_check_sig(Signature, 8);
-+	return png_sig_cmp(Signature, 0, 8) == 0;
- }
- 
- 
-@@ -278,7 +278,7 @@
- 
- 	// Expand low-bit-depth grayscale images to 8 bits
- 	if (png_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
--		png_set_gray_1_2_4_to_8(png_ptr);
-+		png_set_expand_gray_1_2_4_to_8(png_ptr);
- 	}
- 
- 	// Expand RGB images with transparency to full alpha channels
diff --git a/community-testing/directfb/DirectFB-1.6.1-zlib-include.patch b/community-testing/directfb/DirectFB-1.6.1-zlib-include.patch
deleted file mode 100644
index e4f24a5cf..000000000
--- a/community-testing/directfb/DirectFB-1.6.1-zlib-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur DirectFB-1.6.0-orig/src/core/surface.c DirectFB-1.6.0/src/core/surface.c
---- DirectFB-1.6.0-orig/src/core/surface.c	2012-06-20 02:21:36.029994460 -0400
-+++ DirectFB-1.6.0/src/core/surface.c	2012-06-20 02:22:48.533330819 -0400
-@@ -28,6 +28,8 @@
- 
- #include <config.h>
- 
-+#include <zlib.h>
-+
- #include <direct/debug.h>
- 
- #include <core/core.h>
diff --git a/community-testing/directfb/PKGBUILD b/community-testing/directfb/PKGBUILD
deleted file mode 100644
index f67f56ce3..000000000
--- a/community-testing/directfb/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 73967 2012-07-17 18:47:33Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=directfb
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device"
-arch=('i686' 'x86_64')
-url="http://www.directfb.org"
-license=('LGPL')
-depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2')
-options=('!libtool')
-source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz \
-        DirectFB-1.6.1-zlib-include.patch)
-sha1sums=('121c7fd1e81ccb41962986126e1d69f188c2f2c2'
-          'f2309edd87c772a7894d4b648d56197d91790cad')
-
-build() {
-  cd "${srcdir}/DirectFB-${pkgver}"
-  patch -p1 -i ../DirectFB-1.6.1-zlib-include.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-static \
-    --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \
-    --enable-video4linux2 --enable-voodoo
-  make
-} 
-
-package() {
-  cd "${srcdir}/DirectFB-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/drbd/01-remove-old-sanity-check.diff b/community-testing/drbd/01-remove-old-sanity-check.diff
deleted file mode 100644
index 04edb7571..000000000
--- a/community-testing/drbd/01-remove-old-sanity-check.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Lars Ellenberg <lars.ellenberg@linbit.com>
-Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100)
-Subject: build: remove old sanity check to allow build against linux 3.1
-X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf
-
-build: remove old sanity check to allow build against linux 3.1
----
-
-diff --git a/drbd/Makefile b/drbd/Makefile
-index 0985340..7a09603 100644
---- a/drbd/Makefile
-+++ b/drbd/Makefile
-@@ -90,11 +90,6 @@ else
-     endif
-   endif
- 
--  KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
--  ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
--    $(error "won't compile with this kernel version")
--  endif
--
-   .PHONY: drbd.o default all greeting clean kbuild install dep tags
- 
-   drbd.o: greeting kbuild
diff --git a/community-testing/drbd/PKGBUILD b/community-testing/drbd/PKGBUILD
deleted file mode 100644
index 5afc6db41..000000000
--- a/community-testing/drbd/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 75398 2012-08-21 20:52:40Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgname=drbd
-pkgver=8.3.13
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Userland tools for Distributed Replicated Block Device'
-url='http://www.drbd.org'
-license=('GPL2')
-depends=('perl' 'bash')
-source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
-        "$pkgname.rc"
-        "$pkgname.service")
-backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
-md5sums=('760a25459ef6b7262a2a3572c1561c5b'
-         '8902a2f7aca6245c27e9566a1509312c'
-         'afbb345094db49b0a474c0b4e51c0acd')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --localstatedir=/var \
-    --sysconfdir=/etc \
-    --with-distro=generic \
-    --with-utils \
-    --with-bashcompletion \
-    --with-udev \
-    --without-km \
-    --without-rgmanager \
-    --without-pacemaker \
-    --without-heartbeat \
-    --without-xen \
-    --with-initdir=/etc/rc.d
-    #--with-legacy_utils \
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  # move forced /sbin binaries
-  cd "$pkgdir"
-  mv sbin/* usr/sbin
-  rmdir sbin
-  # fix hardcoded path in udev rules
-  sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules
-  # move udev files
-  mv etc/udev usr/lib
-  # move bash completion
-  install -dm 755 usr/share/bash-completion
-  mv etc/bash_completion.d usr/share/bash-completion/completions
-  # remove /var/lock
-  rmdir var/lock
-  # autoload module
-  install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf
-  echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf
-  # setup initscript (replace)
-  cd "$srcdir"
-  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
-  # install systemd stuff
-  install -Dm 644 $pkgname.service \
-    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/drbd/drbd.rc b/community-testing/drbd/drbd.rc
deleted file mode 100644
index b8b196e4b..000000000
--- a/community-testing/drbd/drbd.rc
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-# Written by Sébastien Luttringer
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DRBDADM='/usr/sbin/drbdadm'
-PROC_DRBD='/proc/drbd'
-
-check_config() {
-  # check if module is loaded
-  if [[ ! -e $PROC_DRBD ]]; then
-    echo "Missing $PROC_DRBD. Try to load drbd module!"
-    stat_fail
-    exit 1
-  fi
-  # check if config is correct
-  if ! $DRBDADM dump &>/dev/null; then
-      echo 'Invalid configuration'
-      stat_fail
-      exit 1
-  fi
-}
-
-case "$1" in
-  start)
-    stat_busy 'Starting DRBD resources'
-    # check module and config
-    check_config
-    # load config
-    $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; }
-    # user interruptible version of wait-connect all
-    $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; }
-    # become primary if configured
-    $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; }
-    add_daemon drbd
-    stat_done
-    ;;
-  stop)
-    stat_busy 'Stopping DRBD resources'
-    # check module and config
-    check_config
-    # disconnect and detach all resources
-    $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; }
-    rm_daemon drbd
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/drbd/drbd.service b/community-testing/drbd/drbd.service
deleted file mode 100644
index ddd6c62b7..000000000
--- a/community-testing/drbd/drbd.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=Distributed Replicated Block Device
-After=systemd-modules-load.service network.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-
-# load config
-ExecStart=/usr/sbin/drbdadm adjust all
-# user interruptible version of wait-connect all
-ExecStart=/usr/sbin/drbdadm wait-con-int
-# become primary if configured
-ExecStart=/usr/sbin/drbdadm sh-b-pri all
-# disconnect and detach all resources
-ExecStop=/usr/sbin/drbdadm down all
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/duplicity/PKGBUILD b/community-testing/duplicity/PKGBUILD
deleted file mode 100644
index fdfac734f..000000000
--- a/community-testing/duplicity/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78042 2012-10-16 11:50:16Z allan $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: Aaron Schaefer <aaron@elasticdog.com>
-
-pkgname=duplicity
-pkgver=0.6.19
-pkgrel=2
-pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.'
-arch=('i686' 'x86_64')
-url='http://www.nongnu.org/duplicity/'
-license=('GPL')
-depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko')
-source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('c88122d0b651f84f3bfa42e55591c36b'
-         'df672ed47b8eb4fd8ffa99711623b6b5')
-
-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
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  python2 setup.py install --root="$pkgdir" --optimize=1
-
-  # fix broken documentation permissions until upstream does (FS#27301)
-  chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1"
-  chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1"
-  chmod 644 "$pkgdir/usr/share/doc/$pkgname-$pkgver"/*
-}
diff --git a/community-testing/duplicity/botobackend.patch b/community-testing/duplicity/botobackend.patch
deleted file mode 100644
index 302e1e2b1..000000000
--- a/community-testing/duplicity/botobackend.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file duplicity/backends/botobackend.py
---- duplicity/backends/botobackend.py	2011-11-25 17:47:57 +0000
-+++ duplicity/backends/botobackend.py	2011-12-01 16:15:25 +0000
-@@ -26,6 +26,6 @@
-     if sys.version_info[:2] < (2,6):
-         print "Sorry, S3 multiprocessing requires version 2.6 or later of python"
-         sys.exit(1)
--    import _boto_multi.py
-+    import _boto_multi
- else:
--    import _boto_single.py
-+    import _boto_single
-
diff --git a/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch b/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch
deleted file mode 100644
index 1c4c8daff..000000000
--- a/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-=== modified file 'duplicity/util.py'
---- duplicity/util.py	2011-08-23 18:14:17 +0000
-+++ duplicity/util.py	2012-01-20 21:50:01 +0000
-@@ -71,6 +71,10 @@
-         else:
-             raise
- 
-+class BlackHoleList(list):
-+    def append(self, x):
-+        pass
-+
- class FakeTarFile:
-     debug = 0
-     def __iter__(self):
-@@ -83,7 +87,12 @@
-     # yet.  So we want to ignore ReadError exceptions, which are used to signal
-     # this.
-     try:
--        return tarfile.TarFile("arbitrary", mode, fp)
-+        tf = tarfile.TarFile("arbitrary", mode, fp)
-+        # Now we cause TarFile to not cache TarInfo objects.  It would end up
-+        # consuming a lot of memory over the lifetime of our long-lasting
-+        # signature files otherwise.
-+        tf.members = BlackHoleList()
-+        return tf
-     except tarfile.ReadError:
-         return FakeTarFile()
- 
-
diff --git a/community-testing/electricsheep/PKGBUILD b/community-testing/electricsheep/PKGBUILD
deleted file mode 100644
index 548a0eda1..000000000
--- a/community-testing/electricsheep/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 74024 2012-07-18 04:18:44Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=electricsheep
-pkgver=2.7b33
-pkgrel=3
-pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
-arch=('i686' 'x86_64')
-url="http://community.electricsheep.org/"
-license=('GPL')
-depends=('curl' 'flam3' 'ffmpeg' 'wxgtk2.9' 'lua' 'libgtop' 'boost-libs' 'freeglut' 'glee')
-makedepends=('boost' 'tinyxml')
-optdepends=('xscreensaver: to use electricsheep with xscreensaver')
-options=('!emptydirs')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd'
-          'fda3aae435507d03973f0c4d1ed3509067657f06')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=r125
-  _svntrunk="http://electricsheep.googlecode.com/svn/trunk/client_generic"
-  _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 {} \;
-  (cd ${pkgname}-${pkgver} ; rm -r boost Build_guides curlTest ffmpeg InstallerMSVC \
-    Launcher libpng libxml lua5.1 MacBuild RuntimeMSVC wxConfig)
-  tar -cJf ../${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/*
-  popd
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's/wx-config/wx-config-2.9/g' configure.ac
-  sed -i '12 i\
-#include <cstdio>' Common/Singleton.h
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 menu-entries/ElectricSheep.desktop.kde "${pkgdir}/usr/share/kde4/services/ScreenSavers/electricsheep.desktop"
-  install -D -m644 Runtime/logo.png "${pkgdir}/usr/share/icons/electricsheep.png"
-}
diff --git a/community-testing/encfs/PKGBUILD b/community-testing/encfs/PKGBUILD
deleted file mode 100644
index 373712a6c..000000000
--- a/community-testing/encfs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 73750 2012-07-15 13:18:06Z ibiru $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Sven Kauber, <celeon@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=encfs
-pkgver=1.7.4
-pkgrel=8
-pkgdesc='Encrypted filesystem in user-space'
-arch=('i686' 'x86_64')
-url='http://www.arg0.net/encfs'
-license=('GPL')
-depends=('rlog' 'openssl' 'fuse' 'boost-libs')
-makedepends=('boost')
-options=('!libtool')
-source=("http://encfs.googlecode.com/files/${pkgname}-${pkgver}.tgz")
-md5sums=('ac90cc10b2e9fc7e72765de88321d617')
-
-build(){
-  cd ${pkgname}-${pkgver}
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/espeakup/PKGBUILD b/community-testing/espeakup/PKGBUILD
deleted file mode 100644
index 9ee2d9962..000000000
--- a/community-testing/espeakup/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 78549 2012-10-20 19:23:23Z tomegun $
-# Contributor: Chris Brannon <chris@the-brannons.com>
-# Contributor: Kyle <kyle@gmx.ca>
-pkgname=espeakup
-pkgver=0.71
-pkgrel=5
-pkgdesc='Allows the Speakup screen review system to use the ESpeak synthesizer.'
-arch=('i686' 'x86_64')
-url="http://github.com/williamh/espeakup"
-license=('GPL3')
-source=("ftp://linux-speakup.org/pub/linux/goodies/${pkgname}-${pkgver}.tar.bz2"
-        espeakup espeakup.conf.d espeakup.service)
-depends=(speakup-utils espeak)
-backup=(etc/conf.d/espeakup)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install 
-  install -m755 -D "${srcdir}/espeakup" "${pkgdir}/etc/rc.d/espeakup"
-  install -m644 -D "${srcdir}/espeakup.conf.d" "${pkgdir}/etc/conf.d/espeakup"
-  install -m644 -D "${srcdir}/espeakup.service" "${pkgdir}/usr/lib/systemd/system/espeakup.service"
-}
-md5sums=('03daa70b3db3f4f6fbb42c2ee428eda7'
-         '7cf0abd493710ed924b7bb7c8d279fb3'
-         '0f93974845b15efa12f5e7a74cc0eecd'
-         '0c11c50b128234cda8e1357e88cf7c43')
diff --git a/community-testing/espeakup/espeakup b/community-testing/espeakup/espeakup
deleted file mode 100644
index 94a71701a..000000000
--- a/community-testing/espeakup/espeakup
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/conf.d/espeakup
-. /etc/rc.d/functions
-
-PID=`pidof espeakup`
-PIDFILE=/var/run/espeakup.pid
-case "$1" in
-  start)
-    stat_busy "Starting Espeakup"
-    if [ -z "$PID" ]; then
-      if [ -f $PIDFILE ]; then
-        rm $PIDFILE
-      fi
-      /usr/bin/espeakup $ESPEAKUP_ARGS
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon espeakup
-        stat_done
-      fi
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Espeakup"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon espeakup
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/espeakup/espeakup.conf.d b/community-testing/espeakup/espeakup.conf.d
deleted file mode 100644
index 66f7842c3..000000000
--- a/community-testing/espeakup/espeakup.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to espeakup.
-# Example:
-# ESPEAKUP_ARGS="--default-voice=fr"
-# will tell espeakup to use the French voice.
-ESPEAKUP_ARGS=""
diff --git a/community-testing/espeakup/espeakup.service b/community-testing/espeakup/espeakup.service
deleted file mode 100644
index 58d7d47fa..000000000
--- a/community-testing/espeakup/espeakup.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Software speech output for Speakup
-
-[Service]
-Type=forking
-PIDFile=/run/espeakup.pid
-ExecStart=/usr/bin/espeakup
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/evas_generic_loaders-svn/PKGBUILD b/community-testing/evas_generic_loaders-svn/PKGBUILD
deleted file mode 100644
index 2100340bf..000000000
--- a/community-testing/evas_generic_loaders-svn/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 78472 2012-10-19 13:29:25Z bluewind $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=evas_generic_loaders-svn
-pkgver=75875
-pkgrel=2
-pkgdesc="Additional generic loaders for Evas"
-arch=('i686' 'x86_64')
-groups=('e17-libs-svn' 'e17-svn')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina-svn')
-makedepends=('subversion')
-conflicts=('evas_generic_loaders')
-provides=('evas_generic_loaders')
-options=('!libtool' '!emptydirs')
-         
-_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas_generic_loaders"
-_svnmod="evas_generic_loaders"
-
-build() {
-   cd "$srcdir"
-
-msg "Connecting to $_svntrunk SVN server...."
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
-  else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-  fi
-
-  msg "SVN checkout done or server timeout"
-  msg "Starting make..."
-
-  cp -r $_svnmod $_svnmod-build
-  cd $_svnmod-build
-
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_svnmod-build"
-  make DESTDIR="$pkgdir" install
-
-# install license files
-  install -Dm644 "$srcdir/$_svnmod-build/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  rm -r "$srcdir/$_svnmod-build"
-}
diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD
deleted file mode 100644
index 3016b5224..000000000
--- a/community-testing/exim/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 72552 2012-06-16 17:09:24Z dreisner $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=exim
-pkgver=4.80
-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
-depends=('db' 'pcre' 'pam' 'openssl' 'libldap')
-provides=('smtp-server')
-conflicts=('smtp-server')
-options=('!makeflags')
-source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2"
-        aliases
-        exim
-        exim.logrotate
-        exim.conf.d
-        exim.Makefile
-        exim-submission@.service
-        exim.service
-        exim@.service
-        exim.socket
-        exim-submission.socket)
-sha256sums=('787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984'
-            '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a'
-            '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6'
-            '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b'
-            '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01'
-            '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55'
-            '32def7387aaa040b994c0d399c6053dc42d9da4c8c8f0a34d33da653be27e324'
-            '99aaf3c960396fc08ec918fdca1cf73850960f6c519982d1a653f2e673754445'
-            '0436411932d6b6268db54a84e4ffc209bde0fa7567442d8e3d138557eeccbad4'
-            '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26'
-            'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cp "$srcdir/$pkgname.Makefile" Local/Makefile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim"
-  install -Dm0644 $srcdir/exim.conf.d "${pkgdir}/etc/conf.d/exim"
-  install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8"
-  install -Dm0755 $srcdir/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 -m0755 "$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
-
-  install -Dm0644 "$srcdir/exim-submission@.service" \
-    "${pkgdir}/usr/lib/systemd/system/exim-submission@.service"
-  install -Dm0644 "$srcdir/exim.service" "${pkgdir}/usr/lib/systemd/system/exim.service"
-  install -Dm0644 "$srcdir/exim@.service" "${pkgdir}/usr/lib/systemd/system/exim@.service"
-  install -Dm0644 "$srcdir/exim.socket" "${pkgdir}/usr/lib/systemd/system/exim.socket"
-  install -Dm0644 "$srcdir/exim-submission.socket" \
-    "${pkgdir}/usr/lib/systemd/system/exim-submission.socket"
-}
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-submission.socket b/community-testing/exim/exim-submission.socket
deleted file mode 100644
index b9593e2ef..000000000
--- a/community-testing/exim/exim-submission.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Exim Mail Transfer Agent (message submission)
-Conflicts=exim.service
-
-[Socket]
-ListenStream=587
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/community-testing/exim/exim-submission@.service b/community-testing/exim/exim-submission@.service
deleted file mode 100644
index 8b1d056a8..000000000
--- a/community-testing/exim/exim-submission@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-# It doesn't make sense for this to be separate from exim@.service
-# However, I couldn't think of a way to have two .socket files point
-# to it ([Socket] Service= is rejected if Accept=yes is set).
-
-[Unit]
-Description=Exim Mail Daemon per-connection server (message submission)
-
-[Service]
-ExecStart=-/usr/sbin/exim -bs
-StandardInput=socket
-StandardError=syslog
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/exim/exim.service b/community-testing/exim/exim.service
deleted file mode 100644
index de52fd14f..000000000
--- a/community-testing/exim/exim.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Exim Mail Daemon
-
-[Service]
-PIDFile=/var/run/exim.pid
-ExecStart=/usr/sbin/exim -bdf -q30m
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/exim/exim.socket b/community-testing/exim/exim.socket
deleted file mode 100644
index 36d28684f..000000000
--- a/community-testing/exim/exim.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Exim Mail Transfer Agent
-Conflicts=exim.service
-
-[Socket]
-ListenStream=25
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/community-testing/exim/exim@.service b/community-testing/exim/exim@.service
deleted file mode 100644
index 120485b8b..000000000
--- a/community-testing/exim/exim@.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Exim Mail Daemon per-connection server
-
-[Service]
-ExecStart=-/usr/sbin/exim -bs
-StandardInput=socket
-StandardError=syslog
diff --git a/community-testing/extremetuxracer/PKGBUILD b/community-testing/extremetuxracer/PKGBUILD
deleted file mode 100644
index 9292787b9..000000000
--- a/community-testing/extremetuxracer/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 77580 2012-10-12 23:39:40Z ebelanger $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Eric Belanger <eric.archlinux.org>
-# Contributor: Fabio Scotoni <CCuleX.gmail.com>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-pkgname=extremetuxracer
-pkgver=0.4
-pkgrel=4
-pkgdesc="Downhill racing game starring Tux"
-arch=('x86_64' 'i686')
-url="http://www.extremetuxracer.com"
-license=('GPL')
-depends=('gcc-libs' 'sdl_mixer' 'tcl>=8.5.0' 'libpng>=1.4.0' 'freetype2' 'glu')
-makedepends=('mesa' 'libxi' 'libxmu')
-conflicts=('ppracer' 'etracer')
-replaces=('ppracer' 'etracer')
-source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz"
-       "$pkgname.png"
-       "$pkgname.desktop"
-       "libpng15.patch")
-sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d'
-            'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb'
-            '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8'
-            '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8')
-
-build() {
-  cd "$srcdir/extremetuxracer-$pkgver"
-
-  patch -Np1 -i "${srcdir}/libpng15.patch"
-  sed -i -e 's/libpng12/libpng15/g' configure
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/extremetuxracer-$pkgver"
-  make DESTDIR="$pkgdir" install
-
- # Install icon and desktop file
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/extremetuxracer/extremetuxracer.desktop b/community-testing/extremetuxracer/extremetuxracer.desktop
deleted file mode 100644
index 6593607b8..000000000
--- a/community-testing/extremetuxracer/extremetuxracer.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Encoding=UTF-8
-Name=Extreme Tux Racer
-Comment=Open source racing game featuring Tux the Linux Penguin. 
-Icon=/usr/share/pixmaps/extremetuxracer.png
-Exec=etracer
-Terminal=false
-StartupNotify=true
-Categories=Application;Game;ArcadeGame
-
diff --git a/community-testing/extremetuxracer/extremetuxracer.png b/community-testing/extremetuxracer/extremetuxracer.png
deleted file mode 100644
index 6c4aec00b..000000000
--- a/community-testing/extremetuxracer/extremetuxracer.png
+++ /dev/null
diff --git a/community-testing/extremetuxracer/libpng15.patch b/community-testing/extremetuxracer/libpng15.patch
deleted file mode 100644
index 5c9999857..000000000
--- a/community-testing/extremetuxracer/libpng15.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
---- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp	2007-09-01 19:38:12.000000000 +0300
-+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp	2010-01-25 03:47:21.000000000 +0200
-@@ -53,7 +53,7 @@
-     if (!info_ptr)
-     {
-         png_destroy_read_struct(&png_ptr,
--           (png_infopp)NULL, (png_infopp)NULL);
-+           NULL, NULL);
- 		fclose(fp);
-         return;
-     }
-@@ -62,7 +62,7 @@
-     if (!end_info)
-     {
-         png_destroy_read_struct(&png_ptr, &info_ptr,
--          (png_infopp)NULL);
-+          NULL);
- 		fclose(fp);
-         return;
-     }
-@@ -77,7 +77,7 @@
- 	
- 	
- 	png_get_IHDR(png_ptr, info_ptr, &width, &height,
--       &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+       &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	
- 	if(bit_depth == 16)
-         png_set_strip_16(png_ptr);
-@@ -88,7 +88,7 @@
- 		png_set_expand(png_ptr);
- 		png_read_update_info(png_ptr, info_ptr);
- 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
--			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	}
- 	
- 	if( color_type == PNG_COLOR_TYPE_GRAY ||
-@@ -96,7 +96,7 @@
- 		png_set_gray_to_rgb(png_ptr);
- 		png_read_update_info(png_ptr, info_ptr);
- 		png_get_IHDR(png_ptr, info_ptr, &width, &height,
--			   &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+			   &bit_depth, &color_type, &interlace_type, NULL, NULL);
- 	}
- 		
- 	this->width=width;
-@@ -114,7 +114,7 @@
- 	}
- 	
- 	png_read_end(png_ptr, info_ptr);
--	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- 	fclose(fp);
- }
- 
diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD
deleted file mode 100644
index 961996a6a..000000000
--- a/community-testing/fatrat/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 73751 2012-07-15 13:18:09Z ibiru $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=fatrat
-pkgver=1.2.0_beta2
-pkgrel=1
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
-url="http://fatrat.dolezel.info/"
-license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('boost' 'cmake' 'java-environment')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz)
-md5sums=('ad823d2a81f0583316ece815b928c71b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-
-  cmake \
-    -DWITH_EVERYTHING=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    .
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/fcron/PKGBUILD b/community-testing/fcron/PKGBUILD
deleted file mode 100644
index a8a579cb5..000000000
--- a/community-testing/fcron/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 72553 2012-06-16 17:09:37Z dreisner $
-# 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=7
-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 fcron.service)
-md5sums=('69ebcb41921e2a282f41ebecb3a27053'
-         'e0c3f0bdc3c98fbbe46eff19001c18f2'
-         '938722c6654ef7b07f4aa10001905ba1'
-         'bfb7daa22ebe22b9917e455c1ca4a382'
-         '5ff0cdcb9ec99778938ac6ef26800327'
-         'ab589cc6813ec32b5e96bf05c2b51c4c')
-
-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"
-
-  # Install systemd service
-  install -D -m644 "$srcdir/fcron.service" \
-    "$pkgdir/usr/lib/systemd/system/fcron.service"
-
-  # avoid conflict with filesystem>=2012.06
-  rmdir "$pkgdir/var/run"
-}
-
-# 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/fcron.service b/community-testing/fcron/fcron.service
deleted file mode 100644
index a47b4f19b..000000000
--- a/community-testing/fcron/fcron.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Cron Daemon
-
-[Service]
-Type=forking
-PIDFile=/run/fcron.pid
-ExecStart=/usr/sbin/fcron
-
-[Install]
-WantedBy=multi-user.target
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/ffmpeg-compat/PKGBUILD b/community-testing/ffmpeg-compat/PKGBUILD
deleted file mode 100644
index 19336feeb..000000000
--- a/community-testing/ffmpeg-compat/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg-compat
-pkgver=20120509
-pkgrel=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-#git clone git://git.videolan.org/ffmpeg.git
-source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-$pkgver.tar.xz)
-md5sums=('a35359e424608f369d380f03e4dc9966')
-
-build() {
-  cd "ffmpeg"
-
-  ./configure \
-    --prefix=/usr \
-    --incdir=/usr/include/ffmpeg-compat \
-    --libdir=/usr/lib/ffmpeg-compat \
-    --shlibdir=/usr/lib/ffmpeg-compat \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --disable-static
-
-  make
-}
-
-package() {
-  cd "ffmpeg"
-  make DESTDIR="$pkgdir" install
-  rm -rf $pkgdir/usr/{bin,share}
-}
diff --git a/community-testing/ffmpeg2theora/PKGBUILD b/community-testing/ffmpeg2theora/PKGBUILD
deleted file mode 100644
index b4f76b350..000000000
--- a/community-testing/ffmpeg2theora/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 73327 2012-07-06 15:22:31Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-pkgname=ffmpeg2theora
-pkgver=0.29
-pkgrel=1
-pkgdesc="Simple converter to create Ogg Theora files"
-arch=('x86_64' 'i686')
-url="http://www.v2v.cc/~j/ffmpeg2theora/"
-license=('GPL')
-depends=('ffmpeg')
-makedepends=('scons') # 'libkate')
-source=("http://www.v2v.cc/~j/$pkgname/downloads/$pkgname-$pkgver.tar.bz2")
-sha256sums=('214110e2a5afdd8ff8e0be18152e893dbff5dabc1ae1d1124e64d9f93eae946d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  scons
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  scons install destdir="$pkgdir" prefix="/usr" mandir="PREFIX/share/man"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/fish/PKGBUILD b/community-testing/fish/PKGBUILD
deleted file mode 100644
index b79fe66e6..000000000
--- a/community-testing/fish/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 74385 2012-07-26 06:57:15Z bpiotrowski $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Jan Fader <jan.fader@web.de>
-
-pkgname=fish
-pkgver=2.0b2
-pkgrel=1
-pkgdesc='Smart and user friendly shell intended mostly for interactive use'
-arch=('i686' 'x86_64')
-url='http://ridiculousfish.com/shell/'
-license=('GPL2')
-depends=('python')
-makedepends=('doxygen')
-install=fish.install
-source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz)
-md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1')
-
-build() {
-  cd "$srcdir"/fishfish
-  autoconf
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc  \
-              --without-xsel
-  make
-}
-
-package() {
-  cd "$srcdir"/fishfish
-  make DESTDIR="$pkgdir" install
-
-  # compress man pages
-  find "$pkgdir"/usr/share/fish/man/ -type f | xargs gzip -9
-}
diff --git a/community-testing/fish/fish.install b/community-testing/fish/fish.install
deleted file mode 100644
index 765006f95..000000000
--- a/community-testing/fish/fish.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  sed -i '/^\/usr\/bin\/fish/d' /etc/shells
-}
diff --git a/community-testing/flightgear/PKGBUILD b/community-testing/flightgear/PKGBUILD
deleted file mode 100644
index 3f075f553..000000000
--- a/community-testing/flightgear/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 77277 2012-10-08 14:22:31Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: William Rea <sillywilly@gmail.com>
-# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
-
-pkgname=flightgear
-pkgver=2.8.0
-pkgrel=2
-pkgdesc="An open-source, multi-platform flight simulator"
-arch=(i686 x86_64)
-depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu')
-makedepends=('boost' 'cmake')
-license=("GPL")
-url="http://www.flightgear.org"
-options=('!makeflags')
-#source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
-#source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2")
-source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2")
-md5sums=('9499194146f414323efef8cb3451b750')
-
-build() {
-  cd $srcdir/flightgear-$pkgver
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_INSTALL_LIBDIR=lib \
-	-DFG_DATA_DIR:STRING="/usr/share/flightgear/data" .
-  make
-  sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/flightgear.desktop
-}
-
-package() {
-  depends=(${depends[@]} 'flightgear-data')
-
-  cd $srcdir/flightgear-$pkgver
-  make DESTDIR=$pkgdir install
-
-  install -Dm0644 package/flightgear.desktop $pkgdir/usr/share/applications/flightgear.desktop
-  install -Dm0644 package/flightgear.ico $pkgdir/usr/share/icons/flightgear.ico
-  ln -sf flightgear $pkgdir/usr/share/FlightGear
-}
diff --git a/community-testing/fox/PKGBUILD b/community-testing/fox/PKGBUILD
deleted file mode 100644
index efce724b7..000000000
--- a/community-testing/fox/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 77273 2012-10-08 13:51:06Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=fox
-pkgver=1.6.46
-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' 'glu')
-optdepends=('perl')
-options=('!libtool')
-source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz)
-md5sums=('da2c5cf36eff32a0c49cfcd9494fe6b7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
-  ./configure   --prefix=/usr \
-                --enable-release \
-                --with-xft=yes \
-                --with-opengl=yes \
-                --with-xim \
-                --with-xshm \
-                --with-shape \
-                --with-xcursor \
-                --with-xrender \
-                --with-xrandr \
-                --with-xfixes \
-                --with-xinput
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  cd ${srcdir}/${pkgname}-${pkgver}/tests
-  make ControlPanel
-  install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/
-  install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-testing/freedroidrpg/PKGBUILD b/community-testing/freedroidrpg/PKGBUILD
deleted file mode 100644
index c4f67ddbb..000000000
--- a/community-testing/freedroidrpg/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 75738 2012-08-30 16:55:50Z heftig $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: nut543 <kfs1@online.no>
-
-#pkgbase=freedroidrpg
-#pkgname=('freedroidrpg' 'freedroidrpg-data')
-pkgname='freedroidrpg'
-pkgver=0.15.1
-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=('b95ea6abae46bea6ee3ace9a1902f682'
-         'b73d9dac44c7e83a6c80fbe4eb96ba79'
-         '9a10c2a2064439cdcff5b945dfb1c3ac')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir/ install
-  install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg
-  install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop
-}
diff --git a/community-testing/freedroidrpg/freedroidrpg.desktop b/community-testing/freedroidrpg/freedroidrpg.desktop
deleted file mode 100644
index 33ee2f5b8..000000000
--- a/community-testing/freedroidrpg/freedroidrpg.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=freedroidrpg
-Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG
-Exec=freedroidRPG
-Encoding=UTF-8
-Icon=/usr/share/icons/freedroidrpg.jpg
-Categories=Game;RolePlaying;
-Terminal=false
-StartupNotify=false
diff --git a/community-testing/freedroidrpg/freedroidrpg.jpg b/community-testing/freedroidrpg/freedroidrpg.jpg
deleted file mode 100644
index 4daa89313..000000000
--- a/community-testing/freedroidrpg/freedroidrpg.jpg
+++ /dev/null
diff --git a/community-testing/freemat/ChangeLog b/community-testing/freemat/ChangeLog
deleted file mode 100644
index dba4cf7ec..000000000
--- a/community-testing/freemat/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community-testing/freemat/PKGBUILD b/community-testing/freemat/PKGBUILD
deleted file mode 100644
index 7e5702b32..000000000
--- a/community-testing/freemat/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 77431 2012-10-10 12:16:20Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=freemat
-pkgver=4.1
-pkgrel=5
-pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
-arch=('i686' 'x86_64')
-url="http://freemat.sourceforge.net"
-license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi' 'mesa' 'glu')
-makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2')
-install=freemat.install
-source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	build-fix.patch)
-md5sums=('929d31e2310feaff5d380fc2f7b4d1a2'
-         '2d11a28aa2a7df89c4618ed1c4be5973')
-
-build() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  unset LDFLAGS
-  rm -f CMakeCache.txt
-  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
-  find . -type f -name 'add.so' -exec rm -f {} \;
-  patch -p1 <$srcdir/build-fix.patch
-  echo >libs/libMatC/CJitFuncClang.hpp
-  echo >libs/libMatC/CJitFuncClang.cpp
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DUSE_LLVM=OFF \
-	-DFORCE_BUNDLED_UMFPACK=ON \
-	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	.
-  make
-}
-package() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  make DESTDIR=$pkgdir install -j1
-  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
-  rm $pkgdir/usr/bin/blas.ini
-}
diff --git a/community-testing/freemat/build-fix.patch b/community-testing/freemat/build-fix.patch
deleted file mode 100644
index c1ea63088..000000000
--- a/community-testing/freemat/build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp
---- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp	2011-11-27 04:27:43.000000000 +0400
-+++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp	2012-01-20 19:07:48.000000000 +0400
-@@ -20,6 +20,7 @@
- #include <qimage.h>
- #include <qpainter.h>
- #include <QtOpenGL>
-+#include <GL/glu.h>
- #include <math.h>
- #include "IEEEFP.hpp"
- 
diff --git a/community-testing/freemat/freemat.install b/community-testing/freemat/freemat.install
deleted file mode 100644
index 051cca866..000000000
--- a/community-testing/freemat/freemat.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
-
-post_upgrade() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
diff --git a/community-testing/freeorion/PKGBUILD b/community-testing/freeorion/PKGBUILD
deleted file mode 100644
index a778d6807..000000000
--- a/community-testing/freeorion/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 73752 2012-07-15 13:18:16Z ibiru $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: guini <sidtrun@googlemail.com>
-# Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: fana-m <geminin@gmx.net>
-
-pkgname=freeorion
-pkgver=0.4
-_fixedrevision=4635
-pkgrel=6
-pkgdesc="Turn-based galactic conquest game inspired by Master of Orion"
-arch=('x86_64' 'i686')
-url="http://www.freeorion.org/"
-license=('GPL')
-if [ "$CARCH" == "x86_64" ]
-then
-  depends=('lib32-nvidia-cg-toolkit')
-else
-  depends=('nvidia-cg-toolkit')
-fi
-depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils')
-makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-11' 'graphviz' 'libogg'
-             'desktop-file-utils' 'setconf' 'clang' 'cmake' 'gendesk' 'subversion')
-options=('!strip' '!emptydirs')
-install=$pkgname.install
-source=("$pkgname.sh"
-        "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png")
-sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf'
-            'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f')
-
-build() {
-  cd "$srcdir"
-  gendesk -n
-
-  msg2 "Checking out svn revision $_fixedrevision..."
-  if [[ -d "$pkgname/.svn" ]]; then
-    (cd "$pkgname" && svn up -r "$_fixedrevision")
-  else
-    svn co \
-      https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/ \
-      --config-dir ./ -r "$_fixedrevision" "$pkgname"
-  fi
-
-  msg2 "Setting up build directory..."
-  rm -rf "$srcdir/$pkgname-build"
-  cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
-  cd "$srcdir/$pkgname-build"
-
-  msg2 "Generating makefiles..."
-  cmake -G "Unix Makefiles"
-  
-  msg2 "GLU fix..."
-  setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING "'-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
-
-  msg2 "Boost fix..."
-  sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp
-
-  msg2 "Compiling..."
-  make -j1
-
-  msg2 "OGRE fix..."
-  sed -i 's:PluginFolder=.:PluginFolder=/usr/lib/OGRE/:g' \
-    "$srcdir/$pkgname-build/ogre_plugins.cfg"
-}
-
-package() {
-  cd "$srcdir/$pkgname-build"
-
-  msg2 "Packaging documentation..."
-  install -Dm644 loki_setup/README.txt \
-    "$pkgdir/usr/share/doc/$pkgname/README.txt"
-
-  msg2 "Packaging binaries..."
-  install -Dm 755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/freeorion"
-  install -Dm 755 freeorion "$pkgdir/usr/bin/freeorion.elf"
-  install -Dm 755 freeorionca "$pkgdir/usr/bin/freeorionca"
-  install -Dm 755 freeoriond "$pkgdir/usr/bin/freeoriond"
-
-  msg2 "Packaging data..."
-  mkdir -p "$pkgdir/usr/share/$pkgname" "$pkgdir/usr/lib/$pkgname"
-  cp -r default "$pkgdir/usr/share/$pkgname"
-  install -Dm 644 OISInput.cfg "$pkgdir/usr/share/OISInput.cfg"
-
-  msg2 "Packaging license..."
-  install -Dm 644 default/COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  cd "$srcdir"
-
-  msg2 "Packaging icon and shortcut..."
-  install -Dm 644 "$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/freeorion.png"
-  install -Dm 644 "$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/freeorion.desktop"
-
-  msg2 "Packaging OGRE plugins configuration..."
-  install -Dm 644 "$srcdir/$pkgname-build/ogre_plugins.cfg" \
-    "$pkgdir/usr/share/freeorion/ogre_plugins.cfg"
-
-  msg2 "Cleaning up..."
-  find "$pkgdir" -name ".svn" -print0 | xargs -0 rm -rf
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/freeorion/freeorion.install b/community-testing/freeorion/freeorion.install
deleted file mode 100644
index ad97d7bab..000000000
--- a/community-testing/freeorion/freeorion.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_remove() {
-  post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/freeorion/freeorion.sh b/community-testing/freeorion/freeorion.sh
deleted file mode 100644
index d80623ab2..000000000
--- a/community-testing/freeorion/freeorion.sh
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/bin/sh
-#
-# written by Markus Sinner, http://psitronic.de
-#
-# Nightly builds on.
-# http://freeorion.psitronic.de/download/nightly/
-#
-# This is a wrapper-script for starting FreeOrion on
-# ix86 (and maybe x64) Linux Systems.
-# This script will CD into application and set some
-# enviroment variables.
-
-# ---- commandline PARAMETERS and ENVIROMENT variables -----
-# This script supports parameters, that will be evaluated
-# BEFORE freeorion binary is called and will be removed, 
-# because the binary won't support them.
-# Currently only one parameter at a time is supported!
-# Parameters other than these will be appended as command
-# line parameters to the call of the freeorion binary.
-#
-# --strace
-#   This starts freeorion using the "strace" utility. 
-#   Generates a strace logifle /tmp/freeorion.trace.
-#   Make sure it is installed on your system!
-# --gdb
-#   Runs freeorion in a gdb instance, passes the original
-#   parameters through the --args parameter of gdb
-#
-#
-# ENVIROMENT variables
-# This script supports some enviroment variables. To set them
-# either use the followin command BEFORE you execute this script.
-#    export XXXX="value"
-# This permanently set the variable in you current shell script.
-# Or you prepend the options when running this script, like this:
-#    PARAM1="hello" PARAM2="yo man" /usr/bin/freeorion.elf
-#
-# Supportet are:
-#   FO_TRACE=
-#      Use this to prepend something to calling freorion.
-#      This variables also is used internally, when --gdb or --trace
-#      appear on the command line.
-#   FO_GDB_ARGS=
-#      If you use --gbd, you should uses this env to add GDB parameters.
-#      Make sure you end this list of parameters with --args, otherwise
-#      gdb won't start. Example: FO_GDB_ARGS="-q -s fo.symbols --args"
-#   LD_LIBRARY_PATH=
-#      This is a well known env and will be honored by this script.
-#
-
-
-# ---------- STARTS HERE ---------------
-# Change into application directory
-# If this is a symlink, then we
-# need to change into the dir of symlink-target.
-if [ -h $0 ]; then
-  echo "I am Symlink. Following into my targets basedir"
-  ME=`readlink $0`
-else
-  echo "Following into my basedir"
-  ME=$0
-fi
-
-# This is important! Script won't work outside its installation dir
-ROOT=/usr/share/freeorion
-cd ${ROOT}
-echo -n "CWD: "
-pwd
-
-
-
-# Check for python. If freeorionca binary is missing it, use
-# the shipped version.
-if ldd /usr/bin/freeorionca | grep "libpython.*not found"; then
-    #echo "python2.5 missing. Using shipped version."
-    PYTHON_USE_SHIPPED=1
-else 
-    #echo "python2.5 found. Using it."
-    PYTHON_USE_SHIPPED=0
-fi
-
-# Set Python library home for loading modules
-# If no python 2.5 is detected, use shipped python 2.5
-if [ "$PYTHON_USE_SHIPPED" = "1" ]; then
-    export PYTHONHOME=/usr/lib/freeorion/python2.5
-    export PYTHONPATH=${PYTHONHOME}
-    export PYTHONDEBUG=1
-    export PYTHONVERBOSE=1
-    echo "PYTHONHOME=${PYTHONHOME}"
-    
-    export LD_LIBRARY_PATH=${PYTHONHOME}:${LD_LIBRARY_PATH}
-    export LD_PRELOAD=${PYTHONHOME}/libutil.so.1:${PYTHONHOME}/libpython2.5.so
-fi
-
-
-# Command line Parameter --gdb forces running in gdb
-# Setting FO_TRACE to gdb results in other settings, see
-# below
-if [ "$1" = "--gdb" ]; then
-    FO_TRACE="gdb"
-
-    # Don't forget to remove the param
-    shift
-fi
-
-if [ "$1" = "--strace" ]; then
-    TRACEFILE=/tmp/freeorion.trace
-    echo
-    echo "Tracing to ${TRACEFILE}"
-    echo
-    FO_TRACE="strace -f -o ${TRACEFILE}"
-
-    # Don't forget to remove the param
-    shift
-fi
-
-
-
-# Add a parameter FO_GDB_ARGS to support gdb
-# Or warn the user, if he changed FO_GDB_ARGS and has
-# forgotten to end it with --args
-if [ "$FO_TRACE" = "gdb" ]; then
-    if [ "$FO_GDB_ARGS" = "" ]; then
-	FO_GDB_ARGS="--args"
-    else
-	echo "****************************************************"
-	echo "** NOTE         NOTE         NOTE         NOTE    **"
-	echo "Running FO in gdb"
-	echo "If you use FO_GDB_ARGS on your command line, make"
-	echo "sure that you END this variabble with --args."
-	echo "Otherwise gdb will not start."
-	echo
-	echo "Type 'start' when the gdb instance has loaded!"
-	echo	
-    fi
-fi
-
-
-# Support loading libs from application/lib
-export LD_LIBRARY_PATH=./lib:${LD_LIBRARY_PATH}
-
-# Call with settings-dir to avoid conflicting installations
-${FO_TRACE} ${FO_GDB_ARGS} /usr/bin/freeorion.elf  --resource-dir ./default $@
diff --git a/community-testing/freerdp/PKGBUILD b/community-testing/freerdp/PKGBUILD
deleted file mode 100644
index ca25093c4..000000000
--- a/community-testing/freerdp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 73328 2012-07-06 15:22:36Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=freerdp
-pkgver=1.0.1
-pkgrel=5
-pkgdesc="Free RDP client"
-arch=('i686' 'x86_64')
-url="http://freerdp.sourceforge.net"
-license=('GPL')
-depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
-	 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv')
-makedepends=('krb5' 'cmake' 'damageproto' 'xmlto' 'docbook-xsl')
-conflicts=('freerdp-git')
-changelog=${pkgname}.changelog
-options=('!libtool')
-source=(https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-$pkgver.tar.gz)
-md5sums=('c843185e0ff22ce8409954651718f338')
-
-build() {
-  cd `find ${srcdir}/ -type d -name freerdp-\*`
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib .
-  make
-}
-
-package() {
-  cd `find ${srcdir}/ -type d -name freerdp-\*`
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/freerdp/freerdp.changelog b/community-testing/freerdp/freerdp.changelog
deleted file mode 100644
index d47f165c3..000000000
--- a/community-testing/freerdp/freerdp.changelog
+++ /dev/null
@@ -1,2 +0,0 @@
-0.7.1-1 to 0.7.1-2
-* Added x86_64 to supported architectures (tested by figue).
diff --git a/community-testing/freewrl/PKGBUILD b/community-testing/freewrl/PKGBUILD
deleted file mode 100644
index 497dea613..000000000
--- a/community-testing/freewrl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 78802 2012-10-25 01:47:18Z ebelanger $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=freewrl
-pkgver=1.22.13.1
-_pkgver=1.22.13
-pkgrel=3
-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' 'glu')
-makedepends=('java-environment' 'xulrunner' 'wget' 'mesa')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('27f4bf163011d8ac2088a535cb58a13d')
-
-build() {
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-  cd $srcdir/$pkgname-${_pkgver}
-  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 --enable-plugin \
-    --disable-mozilla-js --enable-xulrunner-js --disable-firefox-js \
-    --disable-seamonkey-js
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-${_pkgver}
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/fxdesktop/PKGBUILD b/community-testing/fxdesktop/PKGBUILD
deleted file mode 100644
index f03c3025a..000000000
--- a/community-testing/fxdesktop/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 77285 2012-10-08 14:36:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=fxdesktop
-pkgver=0.1.12
-pkgrel=6
-pkgdesc="Lightweight Desktop Environment"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/fxdesktop/"
-license=('GPL')
-depends=('fox>=1.6.0')
-makedepends=('glu')
-source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-md5sums=('9489e7369b5e052e0b6836a3b0670832')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Override default flags
-  export CFLAGS="-Wall -O2 -pipe"
-  export CXXFLAGS="-Wall -O2 -pipe"
-  [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64)
-  # Compile
-  ./gb --prefix=/usr
-  ./gb --package-root=$pkgdir/usr install
-}
diff --git a/community-testing/fxprocessview/PKGBUILD b/community-testing/fxprocessview/PKGBUILD
deleted file mode 100644
index 0b0bba20a..000000000
--- a/community-testing/fxprocessview/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 77289 2012-10-08 15:03:29Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=fxprocessview
-pkgver=0.5.0
-pkgrel=5
-pkgdesc="Process Viewer"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('fox>=1.4.0')
-makedepends=('glu')
-url="http://code.google.com/p/fxdesktop/"
-source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \
-	build-fix.patch)
-md5sums=('5d3cc8d7aec770997c281a743ddfda5a'
-	 '2d2c3d54dcd2404149955f12cccb21a5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Override default flags
-  export CFLAGS="-Wall -O2 -pipe"
-  export CXXFLAGS="-Wall -O2 -pipe"
-  # Compile
-  patch -Np1 <../build-fix.patch
-  ./gb
-  # gb does not return valid error code
-  [ -f src/fxprocessview ]
-  # make sure destination exists
-  mkdir -p $pkgdir/usr/bin
-  # Install
-  ./gb install --package-root=$pkgdir/usr
-}
diff --git a/community-testing/fxprocessview/build-fix.patch b/community-testing/fxprocessview/build-fix.patch
deleted file mode 100644
index 7c883454c..000000000
--- a/community-testing/fxprocessview/build-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -wbBur fxprocessview-0.5.0/src/processlist.cpp fxprocessview-0.5.0.my/src/processlist.cpp
---- fxprocessview-0.5.0/src/processlist.cpp	2005-07-15 06:39:17.000000000 +0400
-+++ fxprocessview-0.5.0.my/src/processlist.cpp	2007-03-07 19:21:34.000000000 +0300
-@@ -696,7 +696,7 @@
- 
- long FXProcessList::onCmdUserMode(FXObject* sender,FXSelector,void* ){
-   if (userfilter.empty()){
--	userfilter=FXFile::getCurrentUserName();
-+	userfilter=FXSystem::currentUserName();
- 	}
-   else {
-  	userfilter="";
-@@ -942,12 +942,17 @@
- 
- 
- 
--  FXint num_processes = FXFile::listFiles(dirlist,"/proc","[0123456789]*",LIST_MATCH_ALL|LIST_NO_FILES|LIST_NO_PARENT);
-+  FXint num_processes = FXDir::listFiles(dirlist,"/proc","[0123456789]*",FXDir::MatchAll | FXDir::NoFiles | FXDir::NoParent);
-   task_total=num_processes;
-   for (FXint i=0;i<num_processes;i++){
- 
-     /// Check the Owner
--    owner = FXFile::owner("/proc/" + dirlist[i]);
-+    FXStat stat;
-+    FXStat::statFile("/proc/" + dirlist[i], stat);
-+    owner = FXSystem::userName(stat.user());
-+
-+//    owner = FXSystem::userName(FXStat::user("/proc/" + dirlist[i]));
-+
-     if (!userfilter.empty() && (owner!=userfilter)) continue;
- 
-     /// Read in Process Stat
-@@ -1027,7 +1032,7 @@
-       }
- 
-     filename = "/proc/" + dirlist[i] + "/cmdline";
--    if (FXFile::exists(filename)) {
-+    if (FXStat::exists(filename)) {
-       fp = fopen(filename.text(),"r");
-       if (fp) {
-         if (fgets(buffer,80,fp)!=NULL){
diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD
deleted file mode 100644
index d10a71c86..000000000
--- a/community-testing/gambas2/PKGBUILD
+++ /dev/null
@@ -1,923 +0,0 @@
-# $Id: PKGBUILD 78473 2012-10-19 13:29:38Z bluewind $
-# 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-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.24.0
-pkgrel=8
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net"
-makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'glu' 'gtk2' 'librsvg' 'xdg-utils'
-         'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'mesa'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
-         'libxcursor' 'libsm' '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'
-	'gambas2-script.install' 'gambas2-runtime.install'
-	'poppler-0.20.patch')
-md5sums=('b59072b6f57b681d586cc84c02333690'
-         '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
-         '870ff5b4b33cd75aa9c290539e6fdd5d'
-         'ab5667175c4945282d2f40a35d0e9e5b'
-         '5eb70afe712c0f8667a700df4d9a6735')
-_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"
-
-  msg "Applying patches ..."
-  # workaround to allow package splitting
-  patch -Np1 -i ../fix-gbi-gba-path.patch
-  # fix building with poppler-0.20.x (merged upstream)
-  cd gb.pdf
-  patch -Np0 -i ../../poppler-0.20.patch
-  cd ..
-
-  ./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-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"
-  provides=('gambas2-gb-gui')
-  conflicts=('gambas2-gb-gui')
-  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
-
-  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
-
-  rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la}
-  rm ${pkgdir}/usr/share/gambas2/info/gb.qt*
-  
-  ## 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-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"
-
-  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"
-
-  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
-
-  ## 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"
-
-  ## 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"
-
-  ## 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' 'gcc-libs')
-  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' 'sqlite' 'gcc-libs')
-  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-runtime')
-  pkgdesc="Gambas2 form 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
-  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"
-
-  ## 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"
-
-  ## 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-image() {
-  depends=('gambas2-runtime' 'gcc-libs')
-  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"
-
-  ## 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' 'glu')
-  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"
-
-  ## 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' 'glu')
-  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"
-
-  ## 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"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  _buildgbcomp gb.web
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml() {
-  depends=('gambas2-runtime' 'libxml2')
-  pkgdesc="Gambas2 xml component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*}
-  rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml-rpc() {
-  depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl')
-  pkgdesc="Gambas2 xml-rpc component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
-
-package_gambas2-gb-xml-xslt() {
-  depends=('gambas2-gb-xml' 'libxslt')
-  pkgdesc="Gambas2 xml-xslt component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-  mkdir -p ${pkgdir}/usr/share/gambas2/info
-  ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
-  ## cleanup the workaround
-  rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
-  rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-  rm -rf ${pkgdir}/usr/bin
-  ##
-}
diff --git a/community-testing/gambas2/fix-gbi-gba-path.patch b/community-testing/gambas2/fix-gbi-gba-path.patch
deleted file mode 100644
index 9be8e921e..000000000
--- a/community-testing/gambas2/fix-gbi-gba-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- component.am	2010-03-15 20:54:43.000000000 +0100
-+++ ../component.am	2010-04-30 15:00:47.218700833 +0200
-@@ -6,17 +6,17 @@
- 	@if test -d $(COMPONENT); then \
- 		echo "Compiling the $(COMPONENT) project..."; \
- 		( \
--			$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
-+			$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
- 			cd $(COMPONENT); \
--			$(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
--			$(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
-+			$(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-+			$(GBFILES)/gba$(GAMBAS_VERSION); \
- 			rm -rf .gambas; \
- 			$(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \
- 		) \
- 	fi
- 	@echo
- 	@echo "Creating the information files for $(COMPONENT) component..."
--	@$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
-+	@$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
- 	@echo
- 
- uninstall-hook:
diff --git a/community-testing/gambas2/gambas2-runtime.install b/community-testing/gambas2/gambas2-runtime.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-testing/gambas2/gambas2-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gambas2/gambas2-script.install b/community-testing/gambas2/gambas2-script.install
deleted file mode 100644
index 86558e434..000000000
--- a/community-testing/gambas2/gambas2-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-testing/gambas2/gambas2.install b/community-testing/gambas2/gambas2.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-testing/gambas2/gambas2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
-	xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
-	xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gambas2/poppler-0.20.patch b/community-testing/gambas2/poppler-0.20.patch
deleted file mode 100644
index a73d42a7f..000000000
--- a/community-testing/gambas2/poppler-0.20.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Index: src/CPdfDocument.cpp
-===================================================================
---- src/CPdfDocument.cpp	(révision 4732)
-+++ src/CPdfDocument.cpp	(copie de travail)
-@@ -407,7 +407,11 @@
- 	white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
- 	THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
- 		
-+	#if POPPLER_VERSION_0_20
-+	THIS->dev->startDoc(THIS->doc);
-+	#else
- 	THIS->dev->startDoc(THIS->doc->getXRef ());
-+	#endif
- 
- 	outline=THIS->doc->getOutline();
- 	if (outline) THIS->index=outline->getItems();
-@@ -833,13 +837,22 @@
- 
- 	if ( (w<0) || (h<0) ) return NULL;
- 
-+	#if POPPLER_VERSION_0_20
- 	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
- 			   rotation,
- 			   gFalse,
- 			   gTrue,
- 			   x,y,w,h,
-+			   gFalse);
-+	#else
-+	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
-+			   rotation,
- 			   gFalse,
-+			   gTrue,
-+			   x,y,w,h,
-+			   gFalse,
- 			   THIS->doc->getCatalog ());
-+	#endif
- 
- 	map=THIS->dev->getBitmap();
- 	
-@@ -929,9 +942,14 @@
- 	w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth());
- 	h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
- 
-+	#if POPPLER_VERSION_0_20
-+	dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
-+	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
-+	#else
- 	dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
- 	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \
-                                 gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
-+	#endif
- 	
- 	THIS->page->display(gfx);
- 	dev->endPage();
-@@ -960,7 +978,9 @@
- 
- void aux_fill_links(void *_object)
- {
--	#if POPPLER_VERSION_0_17
-+	#if POPPLER_VERSION_0_20
-+	THIS->links = new Links (THIS->page->getAnnots ());
-+	#elif POPPLER_VERSION_0_17
- 	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
- 	#else
- 	Object obj;
-@@ -1200,12 +1220,21 @@
- 
- 	if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
- 
-+	#if POPPLER_VERSION_0_20
-+	textdev = new TextOutputDev (NULL, true, 0, false, false);
-+	THIS->page->display (textdev, 72, 72, 0, false, false, false);
-+	#else
- 	textdev = new TextOutputDev (NULL, true, false, false);
- 	THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog());
-+	#endif
- 
- 	if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; }
- 
-+	#if POPPLER_VERSION_0_20
-+	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
-+	#else
- 	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
-+	#endif
- 	{
- 		if (!THIS->Found) {
- 			GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1);
-Index: configure.ac
-===================================================================
---- configure.ac	(révision 4732)
-+++ configure.ac	(copie de travail)
-@@ -25,6 +25,8 @@
-   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)
-+  pkg-config --atleast-version=0.20.0 poppler
-+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20)
- fi
- 
- AC_OUTPUT( \
diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD
deleted file mode 100644
index 6d09fd6b4..000000000
--- a/community-testing/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1344 +0,0 @@
-# $Id: PKGBUILD 78804 2012-10-25 01:47:33Z ebelanger $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor : sebikul <sebikul@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-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' '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-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi'
-	 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image'
-         'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-media' 'gambas3-gb-mime'
-         'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl'  'gambas3-gb-net-pop3' '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-html' 'gambas3-gb-xml-rpc'
-         'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=3.3.3
-pkgrel=3
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL2')
-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' 'sqlite' 'librsvg'
-         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
-         'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
-	 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm'
-	 'gmime' 'glu' 'pangox-compat')
-# pangox-compat to remove when added in gtkglext package dependency
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
-        'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('18902ae2bbd0d66d165503aba7e89474'
-         'b284be39d147ec799f1116a6abc068b4'
-         '6d9e080b66443e7246387b1716d24e31')
-
-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"
-  conflicts=('gambas3-gb-gui')
-  replaces=('gambas3-gb-gui')
-  provides=("gambas3-gb-gui=${pkgver}")
-  install=gambas3-runtime.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make -j1 DESTDIR="${pkgdir}" install
-
-  cd ../gbx
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../lib/debug
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../eval
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ../draw
-  make -j1 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
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make DESTDIR="${pkgdir}" uninstall
-  ##  
-}
-
-package_gambas3-devel() {
-  depends=('gambas3-runtime')
-  pkgdesc="Development environment"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
-  make -j1 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 -j1 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 -j1 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-complex' 'gambas3-gb-compress' 'gambas3-gb-complex' 'gambas3-gb-crypt'
-           'gambas3-gb-data' '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-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
-           'gambas3-gb-image-io' 'gambas3-gb-media' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3'
-           '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 -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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/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-complex() {
-  depends=('gambas3-runtime')
-  pkgdesc="Complex numbers component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{comp{r,o}*,[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compr*,[d-v]*}
-  ##
-}
-
-package_gambas3-gb-compress() {
-  depends=('gambas3-runtime' 'bzip2' 'zlib')
-  pkgdesc="Compression support component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp{o,l}*,gb.[d-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compl*,[d-v]*}
-  ##
-}
-
-package_gambas3-gb-crypt() {
-  depends=('gambas3-runtime')
-  pkgdesc="MD5/DES crypting component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-data() {
-  depends=('gambas3-runtime')
-  pkgdesc="Data containers component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{c*,d{b,e,r}*,[e-v]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{c*,d{b,e}*,[e-v]*}
-  ##
-}
-
-package_gambas3-gb-db() {
-  depends=('gambas3-runtime')
-  pkgdesc="Database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  ## Workaround for splitting
-  rm -r ${pkgdir}/usr/bin
-  rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{a,e,r}*,gb.[e-z]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.d{a,e}*,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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
-  make -j1 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' 'gcc-libs')
-  pkgdesc="Sqlite2 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
-  make -j1 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' 'sqlite' 'gcc-libs')
-  pkgdesc="Sqlite3 database access component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
-  make -j1 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')
-  pkgdesc="Desktop component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
-  make -j1 DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome
-  make DESTDIR="${pkgdir}" uninstall
-
-  ## 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-desktop-gnome() {
-  depends=('gambas3-gb-desktop' 'libgnome-keyring')
-  pkgdesc="Desktop component for Gnome"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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-runtime')
-  pkgdesc="Form component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gtk-opengl() {
-  depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu' 'pangox-compat')
-# pangox-compat to remove when added in gtkglext package dependency
-  pkgdesc="GTK+ toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-gsl() {
-  depends=('gambas3-runtime' 'gsl')
-  pkgdesc="The GNU Scientific Library component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-image() {
-  depends=('gambas3-runtime')
-  pkgdesc="Image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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' 'gcc-libs')
-  pkgdesc="Image effect component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
-  make -j1 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 image component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-jit() {
-  depends=('gambas3-runtime' 'llvm')
-  pkgdesc="Just-in-time compiler component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-libxml() {
-  depends=('gambas3-runtime' 'libxml2')
-  pkgdesc="libxml2 component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.libxml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-media() {
-  depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base')
-  pkgdesc="Simplified interface to the GStreamer library component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.media
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-mime() {
-  depends=('gambas3-runtime' 'gmime')
-  pkgdesc="MIME message component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-ncurses() {
-  depends=('gambas3-runtime' 'ncurses')
-  pkgdesc="Ncurses component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-net-pop3() {
-  depends=('gambas3-gb-net' 'gambas3-gb-mime')
-  pkgdesc="POP3 component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.{[f-m]*,[s-w]*}
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[f-m]*,[s-w]*}
-  ##
-}
-
-package_gambas3-gb-net-smtp() {
-  depends=('gambas3-runtime' 'glib2')
-  pkgdesc="SMTP component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
-  make -j1 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' 'glew')
-  pkgdesc="OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
-  make -j1 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 -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
-  make -j1 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' 'gambas3-gb-opengl')
-  pkgdesc="Qt4 toolkit OpenGL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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')
-  pkgdesc="SDL component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 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="POSIX Signals component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
-  make -j1 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="Visual Basic transitional component"
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 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' 'gcc-libs')
-  pkgdesc="XML component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  
-  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-html() {
-  depends=('gambas3-gb-xml')
-  pkgdesc="HTML generator component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-  ## cleanup the workaround
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  ##
-}
-
-package_gambas3-gb-xml-rpc() {
-  depends=('gambas3-gb-xml' 'gambas3-gb-net-curl')
-  pkgdesc="XML-RPC component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
-  make -j1 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 ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]*
-  rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]*
-  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]*
-  rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.*
-  ##
-}
-
-package_gambas3-gb-xml-xslt() {
-  depends=('gambas3-gb-xml' 'libxslt')
-  pkgdesc="XML-XSLT component"
-
-  ## workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
-  make -j1 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 -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install
-  ##
-
-  cd ${srcdir}/${pkgbase}-${pkgver}/comp
-  make -j1 DESTDIR="${pkgdir}" install
-
-  ## Workaround for splitting
-  cd ${srcdir}/${pkgbase}-${pkgver}/main
-  make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
-  rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
-  rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
-  ##
-}
diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install
deleted file mode 100644
index cfb5812fe..000000000
--- a/community-testing/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambas3.png application-x-gambas3
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-testing/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
-	xdg-icon-resource install --context mimetypes --size 64 \
-	/usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
-	xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
-	xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-testing/gambas3/poppler-0-20.patch b/community-testing/gambas3/poppler-0-20.patch
deleted file mode 100644
index 3b0e4612a..000000000
--- a/community-testing/gambas3/poppler-0-20.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -ur gb.pdf/configure.ac gb.pdf.fixed/configure.ac
---- gb.pdf/configure.ac	2012-05-14 08:55:02.448921378 +0200
-+++ gb.pdf.fixed/configure.ac	2012-05-14 08:52:19.098596499 +0200
-@@ -24,6 +24,8 @@
-   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)
-+  pkg-config --atleast-version=0.20.0 poppler
-+  AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20)
- fi
- 
- AC_OUTPUT( \
-diff -ur gb.pdf/src/CPdfDocument.cpp gb.pdf.fixed/src/CPdfDocument.cpp
---- gb.pdf/src/CPdfDocument.cpp	2012-05-14 08:55:02.388922483 +0200
-+++ gb.pdf.fixed/src/CPdfDocument.cpp	2012-05-15 09:25:45.168457227 +0200
-@@ -449,9 +449,13 @@
- 
- 	white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF;
- 	THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white);
--		
--	THIS->dev->startDoc(THIS->doc->getXRef ());
- 
-+	#if POPPLER_VERSION_0_20
-+	THIS->dev->startDoc(THIS->doc);
-+	#else
-+	THIS->dev->startDoc(THIS->doc->getXRef ());
-+	#endif
-+	
- 	outline=THIS->doc->getOutline();
- 	if (outline) THIS->index=outline->getItems();
- 	
-@@ -875,6 +879,14 @@
- 
- 	if ( (w<0) || (h<0) ) return NULL;
- 
-+	#if POPPLER_VERSION_0_20
-+	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
-+			   rotation,
-+			   gFalse,
-+			   gTrue,
-+			   x,y,w,h,
-+			   gFalse);
-+	#else
- 	THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale,
- 			   rotation,
- 			   gFalse,
-@@ -882,7 +894,8 @@
- 			   x,y,w,h,
- 			   gFalse,
- 			   THIS->doc->getCatalog ());
--
-+	#endif
-+	
- 	map=THIS->dev->getBitmap();
- 	
- 	data=(uint32_t*)map->getDataPtr();
-@@ -940,9 +953,14 @@
- 	w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth());
- 	h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight());
- 
-+	#if POPPLER_VERSION_0_20
-+	dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse);
-+	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL);
-+	#else
- 	dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse);
- 	gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL);
--	
-+	#endif
-+
- 	THIS->page->display(gfx);
- 	dev->endPage();
- 
-@@ -970,7 +988,9 @@
- 
- void aux_fill_links(void *_object)
- {
--	#if POPPLER_VERSION_0_17
-+	#if POPPLER_VERSION_0_20
-+	THIS->links = new Links (THIS->page->getAnnots ());
-+	#elif POPPLER_VERSION_0_17
- 	THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
- 	#else
- 	Object obj;
-@@ -1152,13 +1172,22 @@
- 
- 	if (!MISSING(Sensitive)) sensitive=VARG(Sensitive);
- 
-+	#if POPPLER_VERSION_0_20
-+	textdev = new TextOutputDev (NULL, true, 0, false, false);
-+	THIS->page->display (textdev, 72, 72, 0, false, false, false);
-+	#else
- 	textdev = new TextOutputDev (NULL, true, false, false);
- 	THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog());
-+	#endif
- 
- 	if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; }
- 
- 	count = 0;
-+	#if POPPLER_VERSION_0_20
-+	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1))
-+	#else
- 	while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1))
-+	#endif
- 	{
- 		if (!THIS->Found)
- 			GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1);
diff --git a/community-testing/gcompris/PKGBUILD b/community-testing/gcompris/PKGBUILD
deleted file mode 100644
index ef43565a4..000000000
--- a/community-testing/gcompris/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78045 2012-10-16 11:50:27Z allan $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de>
-
-pkgname=gcompris
-pkgver=12.05
-pkgrel=2
-pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10"
-arch=('i686' 'x86_64')
-url="http://gcompris.net/"
-license=('GPL3')
-depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python2-pysqlite'
-         'gstreamer0.10-base-plugins')
-optdepends=('gnucap: for computer simulation within the electricity activity'
-            'tuxpaint: for the painting activity'
-            'gnuchess: for the chess activity')
-makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  depends+=('gcompris-data')
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install-exec
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD
deleted file mode 100644
index 44dc262a0..000000000
--- a/community-testing/gedit-plugins/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78582 2012-10-21 11:43:49Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Sergej Chodarev <sergejx@centrum.sk>
-# Contributor: zhuqin <zhuqin83@gmail.com>
-
-pkgname=gedit-plugins
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Plugins for gedit"
-arch=('x86_64' 'i686')
-license=('GPL')
-url="http://live.gnome.org/GeditPlugins"
-depends=('gedit' 'dbus-python')
-optdepends=('gucharmap: for charmap plugin'
-            'vte3: for embedded terminal')
-makedepends=('intltool' 'gnome-doc-utils' 'vte3')
-options=('!libtool' '!emptydirs')
-install=gedit-plugins.install
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz")
-sha256sums=('c5e92830e6029110bf1117bd9f31b23a9ad907210b8cb37039772f5bfcf6d174')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gedit-plugins/gedit-plugins.install b/community-testing/gedit-plugins/gedit-plugins.install
deleted file mode 100644
index d5bcc00ae..000000000
--- a/community-testing/gedit-plugins/gedit-plugins.install
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=gedit-plugins
-
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    usr/sbin/gconfpkg --uninstall ${pkgname}
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gigi/PKGBUILD b/community-testing/gigi/PKGBUILD
deleted file mode 100644
index 860c05544..000000000
--- a/community-testing/gigi/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 78047 2012-10-16 11:50:33Z allan $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: fana-m <geminin@gmx.net>
-# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
-# Contributor: Manuel Gaul <inkaine@hotmail.com>
-
-pkgname=gigi
-pkgver=0.8.0
-pkgrel=14
-_fixedrevision=5208
-pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)"
-url="http://gigi.sourceforge.net/"
-arch=('x86_64' 'i686')
-license=('LGPL')
-depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python')
-makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa')
-
-build() {
-  cd "$srcdir"
-
-  msg2 "Fetching files..."
-  if [ -d gigi/.svn ]; then
-    (cd gigi && svn up -r "$_fixedrevision")
-  else
-    #svn co https://gigi.svn.sourceforge.net/svnroot/gigi/trunk/GG/ \
-    svn co https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/ \
-      --config-dir ./ -r "$_fixedrevision" gigi
-  fi
-
-  rm -rf gigi-build
-  svn export gigi gigi-build
-  cd gigi-build
-
-  msg2 "Configuring..."
-  setconf cmake/GiGiOgre.pc.in prefix /usr
-  setconf cmake/GiGi.pc.in prefix /usr
-  setconf cmake/GiGiSDL.pc.in prefix /usr
-  cmake \
-    -D CMAKE_INSTALL_PREFIX="$pkgdir"/usr \
-    -D BUILD_TUTORIALS=OFF \
-    -D CPACK_GENERATOR=GiGiDevel \
-    -D CMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
-    .
-
-  msg2 "Building documentation..."
-  cd doc
-  doxygen
-  cd ..
-
-  msg2 "Compiling..."
-  make -j1
-}
-
-package() {
-  cd "$srcdir/gigi-build"
-
-  msg2 "Packaging files..."
-  make install
-
-  msg2 "Fixing documentation..."
-  mkdir -p "$pkgdir/usr/share/doc"
-  mv "$pkgdir/usr/doc" "$pkgdir/usr/share/doc/$pkgname"
-
-  for f in `find "$pkgdir/usr/share/doc" -name "dir_*.html"`; do
-    sed -i "s:$srcdir:/:g" "$f"
-  done
-
-  msg2 "Fixing python3 shebang..."
-  for f in `find "$pkgdir/usr" -name "*.py"`; do
-    sed -i "s:/env python:/python3:g" "$f"
-  done
-
-  msg2 "Packaging license..."
-  install -Dm 644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/girara/PKGBUILD b/community-testing/girara/PKGBUILD
deleted file mode 100644
index f9973b8c1..000000000
--- a/community-testing/girara/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# $Id: PKGBUILD 75776 2012-08-31 00:57:20Z dwallace $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: mlq <mlq@pwmt.org>
-
-pkgbase=girara
-pkgname=(girara-common girara-gtk2 girara-gtk3)
-pkgver=0.1.4
-pkgrel=1
-pkgdesc="user interface library"
-arch=('i686' 'x86_64')
-url="http://pwmt.org/projects/girara"
-license=('custom')
-makedepends=('gtk3' 'gtk2')
-source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz)
-md5sums=('f348fbe96ceda4a89142cec92de08d25')
-
-build() {
-  true
-}
-
-package_girara-common() {
-  depends=()
-  pkgdesc="user interface library - common files"
-
-  cd "$srcdir/girara-$pkgver"
-
-  make clean
-
-  # install header
-  make DESTDIR="$pkgdir/" install-headers
-
-  # install language files
-  make DESTDIR="$pkgdir/" -C po install
-
-  # remove pkgconfig files
-  rm -r $pkgdir/usr/lib/pkgconfig
-
-  # install license
-  install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_girara-gtk2() {
-  depends=('gtk2' 'girara-common')
-  provides=('girara')
-
-  cd "$srcdir/girara-$pkgver"
-
-  make clean
-  make GIRARA_GTK_VERSION=2
-
-  # install files
-  make GIRARA_GTK_VERSION=2 DESTDIR="$pkgdir/" install
-
-  # remove common files
-  rm -r "$pkgdir/usr/include"
-  rm -r "$pkgdir/usr/share"
-
-  # install license
-  install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_girara-gtk3() {
-  depends=('gtk3' 'girara-common')
-  provides=('girara')
-
-  cd "$srcdir/girara-$pkgver"
-
-  make clean
-  make GIRARA_GTK_VERSION=3
-
-  # install files
-  make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install
-
-  # remove common files
-  rm -r "$pkgdir/usr/include"
-  rm -r "$pkgdir/usr/share"
-
-  # install license
-  install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-testing/gl-117/PKGBUILD b/community-testing/gl-117/PKGBUILD
deleted file mode 100644
index 99d6e8a9c..000000000
--- a/community-testing/gl-117/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 77291 2012-10-08 15:04:07Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: andrewski
-
-pkgname=gl-117
-pkgver=1.3.2
-pkgrel=6
-pkgdesc="An action flight simulator"
-arch=('i686' 'x86_64')
-url="http://www.heptargon.de/gl-117/gl-117.html"
-license=("GPL")
-depends=('freeglut' 'sdl_mixer' 'libxmu' 'libxi' 'glu')
-source=(http://downloads.sourceforge.net/project/gl-117/gl-117/GL-117%20Source/gl-117-$pkgver-src.tar.bz2
-	gl-117.desktop
-	gl-117.png)
-md5sums=('aad53c5531943529fd769fae4efeae02'
-         'db985c5188f1706677b12dc80b797779'
-         '6975de5572084b78d3ec1a748de85164')
-
-build() {
-  cd $srcdir/gl-117-$pkgver-src
-  # This will link everything to these three libraries,
-  # but it wouldn't work otherwise.  The devs have been contacted.
-  LDFLAGS="-lX11 -lXi -lXmu" ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-  install -D -m0644 $srcdir/gl-117.desktop $pkgdir/usr/share/applications/gl-117.desktop
-  install -D -m0644 $srcdir/gl-117.png $pkgdir/usr/share/pixmaps/gl-117.png
-}
diff --git a/community-testing/gl-117/gl-117.desktop b/community-testing/gl-117/gl-117.desktop
deleted file mode 100644
index 59748fb86..000000000
--- a/community-testing/gl-117/gl-117.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=GL-117
-Exec=gl-117
-Icon=gl-117
diff --git a/community-testing/gl-117/gl-117.png b/community-testing/gl-117/gl-117.png
deleted file mode 100644
index 8bbdba58b..000000000
--- a/community-testing/gl-117/gl-117.png
+++ /dev/null
diff --git a/community-testing/glabels/PKGBUILD b/community-testing/glabels/PKGBUILD
deleted file mode 100644
index 375e33922..000000000
--- a/community-testing/glabels/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 78511 2012-10-20 03:03:20Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: yugrotavele <yugrotavele at archlinux dot us>
-# Contributor: Damir Perisa <damir@archlinux.org>
-
-pkgname=glabels
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="Creating labels and business cards the very easy way"
-arch=('i686' 'x86_64')
-url="http://glabels.org/"
-license=('GPL' 'LGPL')
-depends=('librsvg' 'evolution-data-server>=3.6.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
-makedepends=('barcode' 'intltool' 'gnome-doc-utils')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        glabels-3.0.0-new-eds.patch)
-sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2'
-            'f02ecf12e10b1d406607bad65f81e53ebd5d56fabe46035a47bd6fe1ec8bf70b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/glabels-3.0.0-new-eds.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-testing/glabels/glabels-3.0.0-new-eds.patch b/community-testing/glabels/glabels-3.0.0-new-eds.patch
deleted file mode 100644
index 9cae4c076..000000000
--- a/community-testing/glabels/glabels-3.0.0-new-eds.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c
---- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200
-+++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200
-@@ -29,7 +29,7 @@
- 
- #include "merge-evolution.h"
- 
--#include <libebook/e-book.h>
-+#include <libebook/libebook.h>
- #include <glib/gi18n.h>
- #include <stdio.h>
- #include <string.h>
-@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon
- /*--------------------------------------------------------------------------*/
- /* Open merge source.                                                       */
- /*--------------------------------------------------------------------------*/
-+static EBook *
-+gl_open_system_addressbook (GError **error)
-+{
-+   ESourceRegistry *registry;
-+   EBook *book = NULL;
-+   ESource *source;
-+
-+   registry = e_source_registry_new_sync (NULL, error);
-+   if (!registry)
-+       return NULL;
-+
-+   source = e_source_registry_ref_builtin_address_book (registry);
-+   if (!source) {
-+       g_object_unref (registry);
-+       return NULL;
-+   }
-+
-+   book = e_book_new (source, error);
-+
-+   g_object_unref (source);
-+   g_object_unref (registry);
-+
-+   return book;
-+}
-+
- static void
- gl_merge_evolution_open (glMerge *merge)
- {
-@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
-                 return;
-         }
- 
--        merge_evolution->priv->book = e_book_new_system_addressbook(&error);
-+        merge_evolution->priv->book = gl_open_system_addressbook(&error);
-         if (!merge_evolution->priv->book) {
-                 g_warning ("Couldn't open addressbook.");
-                 if (error)
-                 {
--                        g_warning ("e_book_new_system_addressbook: %s", error->message);
-+                        g_warning ("gl_open_system_addressbook: %s", error->message);
-                         g_error_free (error);
-                 }
-                 e_book_query_unref(query);
-diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c
---- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200
-+++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200
-@@ -27,7 +27,7 @@
- 
- #include "merge-vcard.h"
- 
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
diff --git a/community-testing/glabels/glabels.install b/community-testing/glabels/glabels.install
deleted file mode 100644
index 42bb5884d..000000000
--- a/community-testing/glabels/glabels.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/glob2/PKGBUILD b/community-testing/glob2/PKGBUILD
deleted file mode 100644
index 5df095eb0..000000000
--- a/community-testing/glob2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 77582 2012-10-13 01:45:16Z ebelanger $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-
-pkgname=glob2
-pkgver=0.9.4.4
-pkgrel=13
-pkgdesc="RTS game which minimizes micro-management by automatically assigning tasks to units"
-arch=('i686' 'x86_64')
-url="http://www.globulation2.org/"
-license=('GPL3')
-depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
-         'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('scons' 'boost' 'mesa')
-install=glob2.install
-source=(http://dl.sv.nongnu.org/releases/${pkgname}/0.9.4/${pkgname}-${pkgver}.tar.gz
-	glob2-0.9.4.1-gcc44.patch)
-sha1sums=('14aa8d840ef5f95a9af591789082fe2322fa8cad'
-          '3e5ae81d85a727387a7049c3a0dfb3db930391b3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np0 -i "$srcdir/glob2-0.9.4.1-gcc44.patch"
-   scons BINDIR="${pkgdir}/usr/bin" INSTALLDIR="${pkgdir}/usr/share" LINKFLAGS="-lboost_system"
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  scons install
-  find "${pkgdir}/usr/share" -type f -exec chmod 644 '{}' \;
-  install -Dm644 data/icons/glob2-icon-48x48.png "${pkgdir}/usr/share/pixmaps/glob2-icon-48x48.png"
-}
diff --git a/community-testing/glob2/glob2-0.9.4.1-gcc44.patch b/community-testing/glob2/glob2-0.9.4.1-gcc44.patch
deleted file mode 100644
index b425b25ec..000000000
--- a/community-testing/glob2/glob2-0.9.4.1-gcc44.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h
---- libgag/include/StreamBackend.h.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/include/StreamBackend.h	2009-06-20 14:21:10.000000000 +0200
-@@ -43,7 +43,7 @@ namespace GAGCore
- 		virtual void flush(void) = 0;
- 		virtual void read(void *data, size_t size) = 0;
- 		virtual void putc(int c) = 0;
--		virtual int getc(void) = 0;
-+		virtual int get_c(void) = 0;
- 		virtual void seekFromStart(int displacement) = 0;
- 		virtual void seekFromEnd(int displacement) = 0;
- 		virtual void seekRelative(int displacement) = 0;
-@@ -67,7 +67,7 @@ namespace GAGCore
- 		virtual void flush(void) { assert(fp); fflush(fp); }
- 		virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); }
- 		virtual void putc(int c) { assert(fp); fputc(c, fp); }
--		virtual int getc(void) { assert(fp); return fgetc(fp); }
-+		virtual int get_c(void) { assert(fp); return fgetc(fp); }
- 		virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); }
- 		virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); }
- 		virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); }
-@@ -92,7 +92,7 @@ namespace GAGCore
- 		virtual void flush(void);
- 		virtual void read(void *data, size_t size);
- 		virtual void putc(int c);
--		virtual int getc(void);
-+		virtual int get_c(void);
- 		virtual void seekFromStart(int displacement);
- 		virtual void seekFromEnd(int displacement);
- 		virtual void seekRelative(int displacement);
-@@ -117,7 +117,7 @@ namespace GAGCore
- 		virtual void flush(void) { }
- 		virtual void read(void *data, size_t size);
- 		virtual void putc(int c);
--		virtual int getc(void);
-+		virtual int get_c(void);
- 		virtual void seekFromStart(int displacement);
- 		virtual void seekFromEnd(int displacement);
- 		virtual void seekRelative(int displacement);
-diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp
---- libgag/src/StreamBackend.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/StreamBackend.cpp	2009-06-20 14:21:53.000000000 +0200
-@@ -75,9 +75,9 @@ namespace GAGCore
- 		buffer->putc(c);
- 	}
- 	
--	int ZLibStreamBackend::getc(void)
-+	int ZLibStreamBackend::get_c(void)
- 	{
--		return buffer->getc();
-+		return buffer->get_c();
- 	}
- 	
- 	void ZLibStreamBackend::seekFromStart(int displacement)
-@@ -147,7 +147,7 @@ namespace GAGCore
- 		write(&ch, 1);
- 	}
- 	
--	int MemoryStreamBackend::getc(void)
-+	int MemoryStreamBackend::get_c(void)
- 	{
- 		Uint8 ch;
- 		read(&ch, 1);
-diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp
---- libgag/src/Stream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/Stream.cpp	2009-06-20 14:21:35.000000000 +0200
-@@ -60,7 +60,7 @@ namespace GAGCore

- 		std::string s;

- 		while (1)

- 		{

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

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

- 			if(c=='\r')

- 				continue;

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

-diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp
---- libgag/src/TextStream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
-+++ libgag/src/TextStream.cpp	2009-06-20 14:21:22.000000000 +0200
-@@ -150,7 +150,7 @@ namespace GAGCore
- 		
- 		int nextChar(void)
- 		{
--			next = stream->getc();
-+			next = stream->get_c();
- 			if 	(next == '\n')
- 			{
- 				column = 0;
diff --git a/community-testing/glob2/glob2.install b/community-testing/glob2/glob2.install
deleted file mode 100644
index 20264b3a8..000000000
--- a/community-testing/glob2/glob2.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/community-testing/glom/PKGBUILD b/community-testing/glom/PKGBUILD
deleted file mode 100644
index 46b188c3e..000000000
--- a/community-testing/glom/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 73756 2012-07-15 13:18:39Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=glom
-pkgver=1.22.0
-pkgrel=2
-pkgdesc="An easy-to-use database designer and user interface"
-arch=('i686' 'x86_64')
-url="http://www.glom.org/"
-license=('GPL')
-depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
-makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e6ce1b0c76cec8c85beba4900a80f257de3cc23a2c65908262fd8be87c2e546a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --with-postgres-utils=/usr/bin \
-    --disable-scrollkeeper \
-    --disable-update-mime-database \
-    --disable-static \
-    PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/glom/glom.install b/community-testing/glom/glom.install
deleted file mode 100644
index 2b88145e3..000000000
--- a/community-testing/glom/glom.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/gmic/PKGBUILD b/community-testing/gmic/PKGBUILD
deleted file mode 100644
index ae42416a1..000000000
--- a/community-testing/gmic/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 78805 2012-10-25 01:47:38Z ebelanger $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: farid <farid at archlinuc-br.org>
-# Contributor: Archie <Mymaud@gmail.com>
-
-pkgbase=gmic
-pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.1.8
-pkgrel=4
-arch=("i686" "x86_64")
-url="http://gmic.sourceforge.net"
-license=("custom:CeCILL")
-makedepends=("gimp" "qt" "fftw" "openexr" "opencv")
-#options=('!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
-        "opencv-buildfix.patch")
-md5sums=('1fc38346269bdd829dd7c4864a27fbc3'
-         '8d1cf5000239099255d25c7d3dbe5728')
-
-build() {
-  cd "${srcdir}/gmic-${pkgver}"
-  patch -p1 -i "${srcdir}/opencv-buildfix.patch"
-  find "${srcdir}/gmic-${pkgver}/zart" -type f -execdir chmod 644 '{}' \;
-  find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \;
-  make -C src all
-}
-
-package_gmic() {
-  pkgdesc="GREYC's Magic Image Converter: image processing framework"
-  depends=("fftw" "libtiff" "libjpeg" "libpng" "openexr" "libx11")
-  replaces=("greycstoration")
-
-  cd "${srcdir}/gmic-${pkgver}"
-  make -C src install DESTDIR="$pkgdir" USR="/usr"
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  rm -rf "${pkgdir}/usr/"{bin/zart,lib/gimp,share/zart}
-}
-
-package_zart() {
-  pkgdesc="A GUI for G'MIC real-time manipulations on the output of a webcam"
-  depends=("opencv" "fftw" "qt")
-
-  cd "${srcdir}/gmic-${pkgver}"
-  make -C src install DESTDIR="$pkgdir" USR="/usr"
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  rm -rf "${pkgdir}/usr/"{bin/gmic,include,lib,share/{man,bash-completion}}
-}
-
-package_gimp-plugin-gmic() {
-  pkgdesc="Gimp plugin for the G'MIC image processing framework"
-  depends=("gimp" "fftw")
-  replaces=("gimp-plugin-greycstoration" "gimp-plugin-gmic4gimp")
-
-  cd "${srcdir}/gmic-${pkgver}"
-  install -Dm755 src/gmic_gimp "${pkgdir}/usr/lib/gimp/2.0/plug-ins/gmic_gimp"
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-testing/gmic/opencv-buildfix.patch b/community-testing/gmic/opencv-buildfix.patch
deleted file mode 100644
index b204cb721..000000000
--- a/community-testing/gmic/opencv-buildfix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -wbBur gmic-1.5.1.7/src/Makefile gmic-1.5.1.7.q/src/Makefile
---- gmic-1.5.1.7/src/Makefile	2012-07-26 12:59:34.000000000 +0400
-+++ gmic-1.5.1.7.q/src/Makefile	2012-08-03 14:03:10.000000000 +0400
-@@ -296,7 +296,7 @@
- 
- zart: lib
- ifneq ($(OS),Darwin)
--	cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
-+	cd ../zart && qmake zart.pro && $(MAKE) && strip zart
- else
- 	cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)"
- endif
-@@ -403,6 +403,7 @@
- 	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
- 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
- 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
-+	if test -d /usr/share/bash-completion/completions; then mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; cp -f gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; fi
- 	if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
- 	if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
- 
-diff -wbBur gmic-1.5.1.7/zart/zart.pro gmic-1.5.1.7.q/zart/zart.pro
---- gmic-1.5.1.7/zart/zart.pro	2012-07-26 12:59:33.000000000 +0400
-+++ gmic-1.5.1.7.q/zart/zart.pro	2012-08-03 12:32:27.000000000 +0400
-@@ -34,7 +34,7 @@
- FORMS = ui/MainWindow.ui ui/DialogAbout.ui ui/DialogLicence.ui
- 
- !macx {
--	LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lml -lfftw3
-+	LIBS += -lX11 ../src/libgmic.a `pkg-config --libs opencv` -lopencv_core -lopencv_ml -lopencv_highgui -lfftw3
- } else {
- 	LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3
- }
diff --git a/community-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD
deleted file mode 100644
index 86bc19f73..000000000
--- a/community-testing/gnash/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 77223 2012-10-07 17:51:25Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgbase=gnash
-pkgname=(gnash-common gnash-gtk)
-pkgver=0.8.10
-pkgrel=5
-arch=(i686 x86_64)
-url="http://www.gnu.org/software/gnash/"
-license=(GPL3)
-makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu
-             speex fontconfig
-             gstreamer0.10-base
-             gtk2 libldap xulrunner hicolor-icon-theme desktop-file-utils gconf gtkglext
-             pkgconfig boost)
-options=(!libtool !emptydirs)
-source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        nodebug.patch gnash-0.8.10-boost-1.50.patch)
-sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224'
-            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551'
-            'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c')
-
-build() {
-  cd gnash-$pkgver
-
-  # Disable very, very verbose debugging (gigabytes of logs)
-  patch -Np1 -i ../nodebug.patch
-
-  # Link to libboost_system.so
-  patch -Np1 -i ../gnash-0.8.10-boost-1.50.patch
-
-  ./autogen.sh
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-plugins-install=system \
-    --with-npapi-plugindir=/usr/lib/mozilla/plugins \
-    --enable-gui=sdl,gtk,dump \
-    --enable-media=gst \
-    --enable-renderer=all \
-    --enable-device=x11
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_gnash-common() {
-  pkgdesc="A GNU Flash movie player"
-  depends=(curl giflib sdl agg libjpeg libpng libltdl libgl glu
-           speex fontconfig cairo
-           gstreamer0.10-base
-           boost-libs)
-  backup=(etc/gnashrc etc/gnashthumbnailrc)
-
-  cd gnash-$pkgver
-
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  # Split gnash-gtk
-  mkdir -p "$srcdir"/gtk/{etc,usr/{bin,share/man/man1}}
-  mv "$pkgdir"/usr/bin/{gtk-gnash,gnash-gtk-launcher} \
-    "$srcdir/gtk/usr/bin/"
-  mv "$pkgdir"/usr/share/man/man1/{gtk-gnash,gnash-gtk-launcher}.1 \
-    "$srcdir/gtk/usr/share/man/man1/"
-  mv "$pkgdir"/usr/share/{applications,icons} "$srcdir/gtk/usr/share/"
-  mv "$pkgdir"/etc/gnashpluginrc "$srcdir/gtk/etc/"
-}
-
-package_gnash-gtk() {
-  pkgdesc="A GNU Flash movie player"
-  depends=("gnash-common=$pkgver"
-            gtk2 libldap hicolor-icon-theme desktop-file-utils gconf gtkglext)
-  install=gnash-gtk.install
-  backup=(etc/gnashpluginrc)
-
-  mv gtk/* "$pkgdir"
-
-  cd gnash-$pkgver
-  make DESTDIR="$pkgdir" install-plugin
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/gnash.schemas" --domain gnash \
-    "$pkgdir"/usr/share/applications/*.schemas
-  rm -f "$pkgdir"/usr/share/applications/*.schemas
-}
diff --git a/community-testing/gnash/gnash-0.8.10-boost-1.50.patch b/community-testing/gnash/gnash-0.8.10-boost-1.50.patch
deleted file mode 100644
index a422ce932..000000000
--- a/community-testing/gnash/gnash-0.8.10-boost-1.50.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r gnash-0.8.10/macros/boost.m4 gnash-0.8.10-boost1.50/macros/boost.m4
---- gnash-0.8.10/macros/boost.m4	2012-01-19 20:17:49.000000000 +0100
-+++ gnash-0.8.10-boost-1.50/macros/boost.m4	2012-07-11 10:56:11.089137186 +0200
-@@ -37,7 +37,7 @@
-   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
-   dnl this is a list of *required* libraries. If any of these are missing, this
-   dnl test will return a failure, and Gnash won't build.
--  boost_libs="thread program_options iostreams"
-+  boost_libs="thread program_options iostreams system"
- 
-   dnl this is a list of *recommended* libraries. If any of these are missing, this
-   dnl test will return a warning, and Gnash will build, but testing won't work.
diff --git a/community-testing/gnash/gnash-gtk.install b/community-testing/gnash/gnash-gtk.install
deleted file mode 100644
index 6678a7f8a..000000000
--- a/community-testing/gnash/gnash-gtk.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  gconfpkg --install gnash
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall gnash
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/gnash/nodebug.patch b/community-testing/gnash/nodebug.patch
deleted file mode 100644
index ca160b898..000000000
--- a/community-testing/gnash/nodebug.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u -r gnash-0.8.9/libbase/log.h gnash-0.8.9-nodebug/libbase/log.h
---- gnash-0.8.9/libbase/log.h	2011-02-26 19:11:08.000000000 +0100
-+++ gnash-0.8.9-nodebug/libbase/log.h	2012-01-18 09:39:02.004103494 +0100
-@@ -331,27 +331,27 @@
- 
- // Define to 0 to completely remove parse debugging at compile-time
- #ifndef VERBOSE_PARSE
--#define VERBOSE_PARSE 1
-+#define VERBOSE_PARSE 0
- #endif
- 
- // Define to 0 to completely remove action debugging at compile-time
- #ifndef VERBOSE_ACTION
--#define VERBOSE_ACTION 1
-+#define VERBOSE_ACTION 0
- #endif
- 
- // Define to 0 to remove ActionScript errors verbosity at compile-time
- #ifndef VERBOSE_ASCODING_ERRORS
--#define VERBOSE_ASCODING_ERRORS  1
-+#define VERBOSE_ASCODING_ERRORS  0
- #endif
- 
- // Define to 0 this to remove invalid SWF verbosity at compile-time
- #ifndef VERBOSE_MALFORMED_SWF
--#define VERBOSE_MALFORMED_SWF 1
-+#define VERBOSE_MALFORMED_SWF 0
- #endif
- 
- // Define to 0 this to remove Networking verbosity at compile-time
- #ifndef VERBOSE_NETWORKING
--#define VERBOSE_NETWORKING 1
-+#define VERBOSE_NETWORKING 0
- #endif
- 
- #if VERBOSE_PARSE
-diff -u -r gnash-0.8.9/libcore/vm/ActionExec.cpp gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp
---- gnash-0.8.9/libcore/vm/ActionExec.cpp	2011-03-13 17:47:36.000000000 +0100
-+++ gnash-0.8.9-nodebug/libcore/vm/ActionExec.cpp	2012-01-18 09:40:25.653458508 +0100
-@@ -46,7 +46,7 @@
- // too much information for my tastes. I really want just
- // to see how stack changes while executing actions...
- // --strk Fri Jun 30 02:28:46 CEST 2006
--# define DEBUG_STACK 1
-+//# define DEBUG_STACK 1
- 
- // Max number of stack item to dump. 0 for unlimited.
- # define STACK_DUMP_LIMIT 32
diff --git a/community-testing/gnome-packagekit/PKGBUILD b/community-testing/gnome-packagekit/PKGBUILD
deleted file mode 100644
index e0a5edfd4..000000000
--- a/community-testing/gnome-packagekit/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 78514 2012-10-20 07:24:57Z jconder $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-
-pkgname=gnome-packagekit
-pkgver=3.6.0
-pkgrel=1
-pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
-arch=('i686' 'x86_64')
-url='http://www.packagekit.org/'
-license=('GPL')
-depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
-         'packagekit')
-makedepends=('gconf' 'gtk-doc' 'intltool' 'itstool' 'libcanberra' 'upower')
-optdepends=('polkit-gnome: required for privileged actions'
-            'gnome-settings-daemon-updates: update and message notifications')
-options=('!emptydirs' '!libtool')
-install="$pkgname.install"
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('9f096ec72fb81a78c426d9747145405a8b99e1d8418978828796768c8532d676')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  _mime='application/x-xz-compressed-tar;application/x-servicepack;'
-  sed -i "s@MimeType=.*@MimeType=$_mime@" data/gpk-install-local-file.desktop.in
-
-  sed -i 's@python@python2@' python/enum-convertor.py
-  sed -i 's@python enum-convertor.py@python2 enum-convertor.py@' python/packagekit/Makefile.{am,in}
-
-  export PYTHON=/usr/bin/python2
-  ./configure --prefix=/usr \
-	      --sysconfdir=/etc \
-	      --disable-gtk-doc \
-	      --disable-schemas-compile \
-	      --disable-scrollkeeper
-  make -s
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make -s DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gnome-packagekit/gnome-packagekit.install b/community-testing/gnome-packagekit/gnome-packagekit.install
deleted file mode 100644
index 620670d57..000000000
--- a/community-testing/gnome-packagekit/gnome-packagekit.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.91.90) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-packagekit
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/community-testing/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
deleted file mode 100644
index 293a419df..000000000
--- a/community-testing/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+++ /dev/null
@@ -1,1473 +0,0 @@
-From 79ead5309fe21e77cfe58adc6a9340953c2d52f4 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 21 Sep 2012 11:56:53 +0100
-Subject: [PATCH] power and media-keys: Use logind for suspending and
- rebooting the system
-
-Use the new logind features to suspend and resume but making sure we opt out
-of logind handling the sleep and power keys, and also inhibiting for lid close
-auto-suspend if there is an external monitor connected.
-
-Also use a delay inihibit for logind so that we can do actions on suspend like
-blanking the screen using the screensaver and also poking the screensaver on
-resume.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680689
----
- plugins/common/Makefile.am                  |   4 +-
- plugins/common/gsd-power-helper.c           | 203 --------
- plugins/common/gsd-power-helper.h           |  35 --
- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
- plugins/power/gsd-power-manager.c           | 699 +++++++++++++++++++---------
- 5 files changed, 595 insertions(+), 502 deletions(-)
- delete mode 100644 plugins/common/gsd-power-helper.c
- delete mode 100644 plugins/common/gsd-power-helper.h
-
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 7e50db4..b0e907c 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
- 	gsd-keygrab.c		\
- 	gsd-keygrab.h		\
- 	gsd-input-helper.c	\
--	gsd-input-helper.h	\
--	gsd-power-helper.c	\
--	gsd-power-helper.h
-+	gsd-input-helper.h
- 
- libcommon_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS)
-diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
-deleted file mode 100644
-index 27d0eda..0000000
---- a/plugins/common/gsd-power-helper.c
-+++ /dev/null
-@@ -1,203 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include "gsd-power-helper.h"
--
--#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
--#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
--#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
--
--#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
--#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
--#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
--
--#ifdef HAVE_SYSTEMD
--static void
--systemd_stop (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "PowerOff",
--                                g_variant_new ("(b)", FALSE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_suspend (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Suspend",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_hibernate (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Hibernate",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--#else /* HAVE_SYSTEMD */
--
--static void
--consolekit_stop_cb (GObject *source_object,
--                    GAsyncResult *res,
--                    gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't stop using ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--consolekit_stop (void)
--{
--        GError *error = NULL;
--        GDBusProxy *proxy;
--
--        /* power down the machine in a safe way */
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                               NULL,
--                                               CONSOLEKIT_DBUS_NAME,
--                                               CONSOLEKIT_DBUS_PATH_MANAGER,
--                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
--                                               NULL, &error);
--        if (proxy == NULL) {
--                g_warning ("cannot connect to ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--        g_dbus_proxy_call (proxy,
--                           "Stop",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           consolekit_stop_cb, NULL);
--        g_object_unref (proxy);
--}
--static void
--upower_sleep_cb (GObject *source_object,
--                 GAsyncResult *res,
--                 gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't sleep using UPower: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--upower_suspend (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Suspend",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--
--static void
--upower_hibernate (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Hibernate",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--#endif /* HAVE_SYSTEMD */
--
--void
--gsd_power_suspend (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_suspend ();
--#else
--	upower_suspend (upower_proxy);
--#endif
--}
--
--void
--gsd_power_poweroff (void)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_stop ();
--#else
--	consolekit_stop ();
--#endif
--}
--
--void
--gsd_power_hibernate (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_hibernate ();
--#else
--	upower_hibernate (upower_proxy);
--#endif
--}
-diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
-deleted file mode 100644
-index e3be14f..0000000
---- a/plugins/common/gsd-power-helper.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- */
--
--#ifndef __GSD_POWER_HELPER_H
--#define __GSD_POWER_HELPER_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--#include <gio/gio.h>
--
--void gsd_power_suspend   (GDBusProxy *upower_proxy);
--void gsd_power_hibernate (GDBusProxy *upower_proxy);
--void gsd_power_poweroff  (void);
--
--G_END_DECLS
--
--#endif /* __GSD_POWER_HELPER_H */
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 9c84d7f..a2f277e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
- 
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -51,7 +52,6 @@
- #include "shortcuts-list.h"
- #include "gsd-osd-window.h"
- #include "gsd-input-helper.h"
--#include "gsd-power-helper.h"
- #include "gsd-enums.h"
- 
- #include <canberra.h>
-@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
- #define KEY_CURRENT_INPUT_SOURCE "current"
- #define KEY_INPUT_SOURCES        "sources"
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
- 
-         /* Power stuff */
-         GSettings       *power_settings;
--        GDBusProxy      *upower_proxy;
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
- 
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
- }
- 
- static void
-+power_action_suspend (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
-+power_action_hibernate (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
- do_config_power_action (GsdMediaKeysManager *manager,
-                         const gchar *config_key)
- {
-@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                                            config_key);
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                power_action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown (manager);
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                power_action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
- 
-+        g_clear_object (&priv->logind_proxy);
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                 priv->power_keyboard_proxy = NULL;
-         }
- 
--        if (priv->upower_proxy) {
--                g_object_unref (priv->upower_proxy);
--                priv->upower_proxy = NULL;
--        }
--
-         if (priv->cancellable != NULL) {
-                 g_cancellable_cancel (priv->cancellable);
-                 g_object_unref (priv->cancellable);
-@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
- }
- 
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "GNOME handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
- 
- static void
-@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
- 
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
- 
-         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
- }
-@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
- }
- 
- static void
--upower_ready_cb (GObject             *source_object,
--                 GAsyncResult        *res,
--                 GsdMediaKeysManager *manager)
--{
--        GError *error = NULL;
--
--        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
--        if (manager->priv->upower_proxy == NULL) {
--                g_warning ("Failed to get proxy for upower: %s",
--                           error->message);
--                g_error_free (error);
--        }
--}
--
--static void
- power_screen_ready_cb (GObject             *source_object,
-                        GAsyncResult        *res,
-                        GsdMediaKeysManager *manager)
-@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
-                    manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
--
--        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--                                  G_DBUS_PROXY_FLAGS_NONE,
--                                  NULL,
--                                  "org.freedesktop.UPower",
--                                  "/org/freedesktop/UPower",
--                                  "org.freedesktop.UPower",
--                                  NULL,
--                                  (GAsyncReadyCallback) upower_ready_cb,
--                                  manager);
- }
- 
- GsdMediaKeysManager *
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 070cf32..18fcedf 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
-  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -32,6 +32,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
- 
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
-@@ -43,7 +44,6 @@
- #include "gnome-settings-session.h"
- #include "gsd-enums.h"
- #include "gsd-power-manager.h"
--#include "gsd-power-helper.h"
- 
- #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
- #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
-@@ -78,6 +78,10 @@
- #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
- #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-@@ -193,14 +197,20 @@ struct GsdPowerManagerPrivate
-         ca_context              *canberra_context;
-         ca_proplist             *critical_alert_loop_props;
-         guint32                  critical_alert_timeout_id;
--        GDBusProxy              *screensaver_proxy;
-         GDBusProxy              *session_proxy;
-         GDBusProxy              *session_presence_proxy;
-         GpmIdletime             *idletime;
-         GsdPowerIdleMode         current_idle_mode;
--        guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-         guint                    xscreensaver_watchdog_timer_id;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
-+        guint                    inhibit_lid_switch_timer_id;
- };
- 
- enum {
-@@ -217,8 +227,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
- static gchar    *engine_get_summary (GsdPowerManager *manager);
- static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
- static void      do_lid_closed_action (GsdPowerManager *manager);
--static void      lock_screensaver (GsdPowerManager *manager);
--static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
-+static void      uninhibit_lid_switch (GsdPowerManager *manager);
-+static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
- 
- G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
- 
-@@ -2048,6 +2058,57 @@ gnome_session_shutdown (void)
- }
- 
- static void
-+action_poweroff (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "PowerOff",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_hibernate (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
- do_power_action_type (GsdPowerManager *manager,
-                       GsdPowerActionType action_type)
- {
-@@ -2056,19 +2117,19 @@ do_power_action_type (GsdPowerManager *manager,
- 
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 /* this is only used on critically low battery where
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
--                gsd_power_poweroff ();
-+                action_poweroff (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -2140,85 +2201,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
-         return ret;
- }
- 
--static void
--do_lid_open_action (GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* play a sound, using sounds from the naming spec */
--        ca_context_play (manager->priv->canberra_context, 0,
--                         CA_PROP_EVENT_ID, "lid-open",
--                         /* TRANSLATORS: this is the sound description */
--                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
--                         NULL);
--
--        /* ensure we turn the panel back on after lid open */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after lid open: %s",
--                           error->message);
--                g_clear_error (&error);
--        }
--
--        /* only toggle keyboard if present and already toggled off */
--        if (manager->priv->upower_kdb_proxy != NULL &&
--            manager->priv->kbd_brightness_old != -1) {
--                ret = upower_kbd_toggle (manager, &error);
--                if (!ret) {
--                        g_warning ("failed to turn the kbd backlight on: %s",
--                                   error->message);
--                        g_error_free (error);
--                }
--        }
--
--        kill_lid_close_safety_timer (manager);
--}
--
- static gboolean
--is_on (GnomeRROutput *output)
-+inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
- {
--	GnomeRRCrtc *crtc;
--
--	crtc = gnome_rr_output_get_crtc (output);
--	if (!crtc)
--		return FALSE;
--	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
--}
--
--static gboolean
--non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
--{
--        GnomeRROutput **outputs;
--        int i;
--
--        outputs = gnome_rr_screen_list_outputs (screen);
--        for (i = 0; outputs[i] != NULL; i++) {
--                if (gnome_rr_output_is_laptop (outputs[i]))
--                        continue;
--
--                if (is_on (outputs[i]))
--                        return FALSE;
-+        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
-+            g_settings_get_boolean (manager->priv->settings,
-+                                    "lid-close-suspend-with-external-monitor")) {
-+                g_debug ("no external monitors for a while; uninhibiting lid close");
-+                uninhibit_lid_switch (manager);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                return G_SOURCE_REMOVE;
-         }
- 
--        return TRUE;
--}
--
--/* Timeout callback used to check conditions when the laptop's lid is closed but
-- * the machine is not suspended yet.  We try to suspend again, so that the laptop
-- * won't overheat if placed in a backpack.
-- */
--static gboolean
--lid_close_safety_timer_cb (GsdPowerManager *manager)
--{
--        manager->priv->lid_close_safety_timer_id = 0;
--
--        g_debug ("lid has been closed for a while; trying to suspend again");
--        do_lid_closed_action (manager);
--
--        return FALSE;
-+        g_debug ("external monitor still there; trying again later");
-+        return G_SOURCE_CONTINUE;
- }
- 
- /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2226,82 +2222,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
-  * again in the timeout handler to see if we can suspend then.
-  */
- static void
--setup_lid_close_safety_timer (GsdPowerManager *manager)
-+setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0)
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("lid close safety timer already set up");
-                 return;
-+        }
-+
-+        g_debug ("setting up lid close safety timer");
- 
--        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
--                                                                          (GSourceFunc) lid_close_safety_timer_cb,
-+        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
-+                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
-                                                                           manager);
--        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
-+        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
- }
- 
- static void
--kill_lid_close_safety_timer (GsdPowerManager *manager)
-+restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0) {
--                g_source_remove (manager->priv->lid_close_safety_timer_id);
--                manager->priv->lid_close_safety_timer_id = 0;
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("restarting lid close safety timer");
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                setup_inhibit_lid_switch_timer (manager);
-         }
- }
- 
- static void
--suspend_with_lid_closed (GsdPowerManager *manager)
-+do_lid_open_action (GsdPowerManager *manager)
- {
-         gboolean ret;
-         GError *error = NULL;
--        GsdPowerActionType action_type;
- 
--        /* maybe lock the screen if the lid is closed */
--        lock_screensaver (manager);
--
--        /* we have different settings depending on AC state */
--        if (up_client_get_on_battery (manager->priv->up_client)) {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-battery-action");
--        } else {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-ac-action");
--        }
--
--        /* check we won't melt when the lid is closed */
--        if (action_type != GSD_POWER_ACTION_SUSPEND &&
--            action_type != GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
--                        g_warning ("to prevent damage, now forcing suspend");
--                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
--                        return;
--                }
--        }
-+        /* play a sound, using sounds from the naming spec */
-+        ca_context_play (manager->priv->canberra_context, 0,
-+                         CA_PROP_EVENT_ID, "lid-open",
-+                         /* TRANSLATORS: this is the sound description */
-+                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
-+                         NULL);
- 
--        /* ensure we turn the panel back on after resume */
-+        /* ensure we turn the panel back on after lid open */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_OFF,
-+                                             GNOME_RR_DPMS_ON,
-                                              &error);
-         if (!ret) {
--                g_warning ("failed to turn the panel off after lid close: %s",
-+                g_warning ("failed to turn the panel on after lid open: %s",
-                            error->message);
--                g_error_free (error);
-+                g_clear_error (&error);
-         }
- 
--        /* only toggle keyboard if present and not already toggled */
--        if (manager->priv->upower_kdb_proxy &&
--            manager->priv->kbd_brightness_old == -1) {
-+        /* only toggle keyboard if present and already toggled off */
-+        if (manager->priv->upower_kdb_proxy != NULL &&
-+            manager->priv->kbd_brightness_old != -1) {
-                 ret = upower_kbd_toggle (manager, &error);
-                 if (!ret) {
--                        g_warning ("failed to turn the kbd backlight off: %s",
-+                        g_warning ("failed to turn the kbd backlight on: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--
--        do_power_action_type (manager, action_type);
- }
- 
- static void
- do_lid_closed_action (GsdPowerManager *manager)
- {
-+        gboolean ret;
-+        GError *error = NULL;
-+
-         /* play a sound, using sounds from the naming spec */
-         ca_context_play (manager->priv->canberra_context, 0,
-                          CA_PROP_EVENT_ID, "lid-close",
-@@ -2309,21 +2296,22 @@ do_lid_closed_action (GsdPowerManager *manager)
-                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
-                          NULL);
- 
-+        /* turn the panel off if the lid is closed (mainly for Dells...) */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_OFF,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel off after lid close: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
-         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
- 
--        /* perform policy action */
--        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
--            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
--                g_debug ("lid is closed; suspending or hibernating");
--                suspend_with_lid_closed (manager);
--        } else {
--                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
--                setup_lid_close_safety_timer (manager);
--        }
-+        restart_inhibit_lid_switch_timer (manager);
- }
- 
--
- static void
- up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
- {
-@@ -2343,6 +2331,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
-         if (manager->priv->lid_is_closed == tmp)
-                 return;
-         manager->priv->lid_is_closed = tmp;
-+        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
- 
-         /* fake a keypress */
-         if (tmp)
-@@ -3294,30 +3283,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
- }
- 
- static void
--sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
--                            GAsyncResult *res,
--                            gpointer user_data)
--{
--        GError *error = NULL;
--        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
--
--        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
--        if (manager->priv->screensaver_proxy == NULL) {
--                g_warning ("Could not connect to gnome-screensaver: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Finish the upower_notify_sleep_cb() call by locking the screen */
--        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
--        g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                           "Lock",
--                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                           NULL, NULL, NULL);
--}
--
--static void
- idle_dbus_signal_cb (GDBusProxy *proxy,
-                      const gchar *sender_name,
-                      const gchar *signal_name,
-@@ -3469,75 +3434,38 @@ out:
- }
- 
- static void
--lock_screensaver (GsdPowerManager *manager)
-+lock_screensaver (GsdPowerManager *manager,
-+                  GSourceFunc      done_cb)
- {
-         gboolean do_lock;
- 
-         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
-                                           "lock-enabled");
--        if (!do_lock)
-+        if (!do_lock && done_cb) {
-+                done_cb (manager);
-                 return;
--
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_debug ("doing gnome-screensaver lock");
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "Lock",
--                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                                   NULL, NULL, NULL);
--        } else {
--                /* connect to the screensaver first */
--                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                          NULL,
--                                          GS_DBUS_NAME,
--                                          GS_DBUS_PATH,
--                                          GS_DBUS_INTERFACE,
--                                          NULL,
--                                          sleep_cb_screensaver_proxy_ready_cb,
--                                          manager);
-         }
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        GsdPowerManager *manager)
--{
--        lock_screensaver (manager);
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
--        }
--
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
- 
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "Lock",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* Wait until gnome-shell shield animation is done
-+         *
-+         * FIXME: the shell should mark the lock as active
-+         * when the shield is down, then we could wait for
-+         * that. This would also fix the problem that we wait
-+         * needlessly when the shell has already locked the
-+         * screen because it is initiating the suspend.
-+         *
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
-+         */
-+        g_timeout_add (500, done_cb, manager);
- }
- 
- static void
-@@ -3696,6 +3624,287 @@ disable_builtin_screensaver (gpointer unused)
-         return TRUE;
- }
- 
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                g_debug ("no lid-switch inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing lid switch system inhibitor");
-+        close (manager->priv->inhibit_lid_switch_fd);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_lid_switch_taken = FALSE;
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "GNOME needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+}
-+
-+static gboolean
-+randr_output_is_on (GnomeRROutput *output)
-+{
-+	GnomeRRCrtc *crtc;
-+
-+	crtc = gnome_rr_output_get_crtc (output);
-+	if (!crtc)
-+		return FALSE;
-+	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
-+}
-+
-+static gboolean
-+external_monitor_is_connected (GnomeRRScreen *screen)
-+{
-+        GnomeRROutput **outputs;
-+        guint i;
-+
-+        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
-+                return TRUE;
-+
-+        /* see if we have more than one screen plugged in */
-+        outputs = gnome_rr_screen_list_outputs (screen);
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (randr_output_is_on (outputs[i]) &&
-+                    !gnome_rr_output_is_laptop (outputs[i]))
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+on_randr_event (GnomeRRScreen *screen, gpointer user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+
-+        /* when a second monitor is plugged in, we take the
-+         * handle-lid-switch inhibitor lock of logind to prevent
-+         * it from suspending.
-+         *
-+         * Uninhibiting is done in the inhibit_lid_switch_timer,
-+         * since we want to give users a few seconds when unplugging
-+         * and replugging an external monitor, not suspend right away.
-+         */
-+        if (external_monitor_is_connected (screen) &&
-+            !g_settings_get_boolean (manager->priv->settings,
-+                                     "lid-close-suspend-with-external-monitor")) {
-+                inhibit_lid_switch (manager);
-+                setup_inhibit_lid_switch_timer (manager);
-+        }
-+        else {
-+                restart_inhibit_lid_switch_timer (manager);
-+        }
-+}
-+
-+static gboolean
-+screen_lock_done_cb (gpointer data)
-+{
-+        GsdPowerManager *manager = data;
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        lock_screensaver (manager, screen_lock_done_cb);
-+}
-+
-+static void
-+handle_resume_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3705,6 +3914,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
- 
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return FALSE;
-+        }
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-         /* track the active session */
-         manager->priv->session = gnome_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3719,10 +3947,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
-         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-         manager->priv->up_client = up_client_new ();
--        g_signal_connect (manager->priv->up_client, "notify-sleep",
--                          G_CALLBACK (upower_notify_sleep_cb), manager);
--        g_signal_connect (manager->priv->up_client, "notify-resume",
--                          G_CALLBACK (upower_notify_resume_cb), manager);
-         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-         g_signal_connect (manager->priv->up_client, "device-added",
-                           G_CALLBACK (engine_device_added_cb), manager);
-@@ -3836,6 +4060,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
-         if (manager->priv->x11_screen == NULL)
-                 return FALSE;
-+        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
-+        /* set up initial state */
-+        on_randr_event (manager->priv->x11_screen, manager);
- 
-         /* ensure the default dpms timeouts are cleared */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3865,6 +4092,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
- 
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+        }
-+
-         if (manager->priv->bus_cancellable != NULL) {
-                 g_cancellable_cancel (manager->priv->bus_cancellable);
-                 g_object_unref (manager->priv->bus_cancellable);
-@@ -3876,8 +4108,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-                 manager->priv->introspection_data = NULL;
-         }
- 
--        kill_lid_close_safety_timer (manager);
--
-         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
- 
-         g_clear_object (&manager->priv->connection);
-@@ -3885,6 +4115,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-         g_clear_object (&manager->priv->settings);
-         g_clear_object (&manager->priv->settings_screensaver);
-         g_clear_object (&manager->priv->up_client);
-+
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        g_clear_object (&manager->priv->logind_proxy);
-         g_clear_object (&manager->priv->x11_screen);
- 
-         g_ptr_array_unref (manager->priv->devices_array);
-@@ -3918,6 +4161,8 @@ static void
- gsd_power_manager_init (GsdPowerManager *manager)
- {
-         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
- 
- static void
--- 
-1.7.12.2
-
diff --git a/community-testing/gnome-settings-daemon-updates/PKGBUILD b/community-testing/gnome-settings-daemon-updates/PKGBUILD
deleted file mode 100644
index ad446e3f6..000000000
--- a/community-testing/gnome-settings-daemon-updates/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 78516 2012-10-20 07:29:43Z jconder $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-
-_pkgname=gnome-settings-daemon
-pkgname=$_pkgname-updates
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Updates plugin for the GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-packagekit' "$_pkgname")
-makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
-options=('!emptydirs' '!libtool')
-install=$_pkgname.install
-url="http://www.gnome.org"
-source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
-        'screensaver.patch'
-        '0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch'
-        'arch.patch')
-sha256sums=('1fe96e0709d7c618d90cc1bfcddc46eede3c2cdb305f5e7f4cb388d43dd5526a'
-            'd2c32fa0262e4d0e97fc07fb631ad2627b4f2ae273e2cb3028236d9725711880'
-            'f23db348593f58da755889928d7fa75817479d9ad5be67cc7a2f8cbc5db23632'
-            '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea')
-
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-
-  patch -Np1 -i "$srcdir/screensaver.patch"
-  patch -Np1 -i "$srcdir/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch"
-  patch -Np1 -i "$srcdir/arch.patch"
-
-  aclocal
-  automake
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --localstatedir=/var \
-              --libexecdir=/usr/lib/gnome-settings-daemon \
-              --disable-static \
-              --enable-systemd
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make -s
-}
-
-package() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  make -C 'plugins/updates' DESTDIR="${pkgdir}" install
-
-  _schema='org.gnome.settings-daemon.plugins.updates.gschema.xml'
-  install -D -m644 "data/$_schema" "$pkgdir/usr/share/glib-2.0/schemas/$_schema"
-}
diff --git a/community-testing/gnome-settings-daemon-updates/arch.patch b/community-testing/gnome-settings-daemon-updates/arch.patch
deleted file mode 100644
index df70cd9f8..000000000
--- a/community-testing/gnome-settings-daemon-updates/arch.patch
+++ /dev/null
@@ -1,325 +0,0 @@
-diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-index 9af2718..bb45e48 100644
---- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-+++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in
-@@ -16,7 +16,7 @@
-       <_description>Use mobile broadband connections such as GSM and CDMA to check for updates.</_description>
-     </key>
-     <key name="auto-download-updates" type="b">
--      <default>true</default>
-+      <default>false</default>
-       <_summary>Automatically download updates in the background without confirmation</_summary>
-       <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and mobile broadband if 'connection-use-mobile' is enabled.</_description>
-     </key>
-@@ -36,7 +36,7 @@
-       <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description>
-     </key>
-     <key name="frequency-get-upgrades" type="i">
--      <default>604800</default>
-+      <default>0</default>
-       <_summary>How often to check for distribution upgrades</_summary>
-       <_description>How often to check for distribution upgrades. Value is in seconds.</_description>
-     </key>
-diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am
-index 81c7179..6fd3534 100644
---- a/plugins/updates/Makefile.am
-+++ b/plugins/updates/Makefile.am
-@@ -15,7 +15,9 @@ libupdates_la_SOURCES = \
- 	gsd-updates-firmware.h \
- 	gsd-updates-firmware.c \
- 	gsd-updates-manager.h \
--	gsd-updates-manager.c
-+	gsd-updates-manager.c \
-+	gsd-updates-watch.h \
-+	gsd-updates-watch.c
- 
- libupdates_la_CPPFLAGS = \
- 	-I$(top_srcdir)/gnome-settings-daemon \
-diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
-index 95ee1c4..7b26c06 100644
---- a/plugins/updates/gsd-updates-manager.c
-+++ b/plugins/updates/gsd-updates-manager.c
-@@ -33,6 +33,7 @@
- #include "gsd-updates-manager.h"
- #include "gsd-updates-firmware.h"
- #include "gsd-updates-refresh.h"
-+#include "gsd-updates-watch.h"
- #include "gsd-updates-common.h"
- #include "gnome-settings-profile.h"
- 
-@@ -47,6 +48,7 @@ struct GsdUpdatesManagerPrivate
-         GCancellable            *cancellable;
-         GsdUpdatesRefresh       *refresh;
-         GsdUpdatesFirmware      *firmware;
-+        GsdUpdatesWatch         *watch;
-         GSettings               *settings_proxy;
-         GSettings               *settings_ftp;
-         GSettings               *settings_gsd;
-@@ -1360,6 +1362,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
-         g_signal_connect (manager->priv->refresh, "get-updates",
-                           G_CALLBACK (due_get_updates_cb), manager);
- 
-+        /* watch transaction progress */
-+        manager->priv->watch = gsd_updates_watch_new ();
-+
-         /* get proxy settings */
-         manager->priv->settings_proxy = g_settings_new ("org.gnome.system.proxy");
-         g_signal_connect (manager->priv->settings_proxy, "changed",
-@@ -1455,6 +1460,7 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager)
-         g_clear_object (&manager->priv->task);
-         g_clear_object (&manager->priv->refresh);
-         g_clear_object (&manager->priv->firmware);
-+        g_clear_object (&manager->priv->watch);
-         g_clear_object (&manager->priv->proxy_session);
-         g_clear_object (&manager->priv->volume_monitor);
-         g_clear_object (&manager->priv->cancellable);
-diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c
-new file mode 100644
-index 0000000..d3a0202
---- /dev/null
-+++ b/plugins/updates/gsd-updates-watch.c
-@@ -0,0 +1,186 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2011-2012 Jonathan Conder <jonno.conder@gmail.com>
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include "config.h"
-+
-+#include <unistd.h>
-+#include <glib/gi18n.h>
-+#include <packagekit-glib2/packagekit.h>
-+#include <libnotify/notify.h>
-+
-+#include "gsd-updates-watch.h"
-+
-+#define GSD_UPDATES_WATCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchPrivate))
-+
-+struct GsdUpdatesWatchPrivate
-+{
-+        PkTransactionList *tlist;
-+        PkClient *client;
-+};
-+
-+G_DEFINE_TYPE (GsdUpdatesWatch, gsd_updates_watch, G_TYPE_OBJECT)
-+
-+static void
-+on_notification_closed (NotifyNotification *notification, gpointer data)
-+{
-+        g_object_unref (notification);
-+}
-+
-+static void
-+gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch)
-+{
-+        NotifyNotification *notification;
-+        gchar *details = NULL;
-+        const gchar *title, *message;
-+        GError *error = NULL;
-+
-+        g_return_if_fail (PK_IS_MESSAGE (item));
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+        g_object_get (item, "details", &details, NULL);
-+        title = _("More information");
-+        message = details;
-+
-+        /* use a better title if available */
-+        if (g_str_has_prefix (details, "<b>")) {
-+                gchar *end = g_strstr_len (details, -1, "</b>\n");
-+                if (end != NULL && g_strstr_len (details, end - details, "\n") == NULL) {
-+                        title = details + 3;
-+                        *end = '\0';
-+                        message = end + 5;
-+                }
-+        }
-+
-+        /* display a notification */
-+        notification = notify_notification_new (title, message, NULL);
-+        notify_notification_set_app_name (notification, _("Software Updates"));
-+        notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
-+        notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL);
-+
-+        g_signal_connect (notification, "closed", G_CALLBACK (on_notification_closed), NULL);
-+        if (!notify_notification_show (notification, &error)) {
-+                g_warning ("error: %s", error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_free (details);
-+}
-+
-+static void
-+gsd_updates_watch_adopt_cb (PkClient *client, GAsyncResult *res, GsdUpdatesWatch *watch)
-+{
-+        PkResults *results;
-+        PkProgress *progress = NULL;
-+        guint uid;
-+        GPtrArray *array;
-+        GError *error = NULL;
-+
-+        g_return_if_fail (PK_IS_CLIENT (client));
-+        g_return_if_fail (G_IS_ASYNC_RESULT (res));
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+        results = pk_client_generic_finish (client, res, &error);
-+        if (results == NULL) {
-+                g_warning ("failed to adopt: %s", error->message);
-+                g_error_free (error);
-+                goto out;
-+        }
-+
-+        g_object_get (results, "progress", &progress, NULL);
-+        g_object_get (progress, "uid", &uid, NULL);
-+
-+        /* only display messages from the same user */
-+        if (uid != getuid ()) {
-+                g_printerr ("ignoring messages\n");
-+                goto out;
-+        }
-+
-+        array = pk_results_get_message_array (results);
-+        g_ptr_array_foreach (array, (GFunc) gsd_updates_watch_message_cb, watch);
-+        g_ptr_array_unref (array);
-+
-+out:
-+        if (progress != NULL) {
-+                g_object_unref (progress);
-+        }
-+        if (results != NULL) {
-+                g_object_unref (results);
-+        }
-+}
-+
-+static void
-+gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch)
-+{
-+        g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist));
-+        g_return_if_fail (tid != NULL);
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+        /* listen for messages */
-+        pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL,
-+                               (GAsyncReadyCallback) gsd_updates_watch_adopt_cb, watch);
-+}
-+
-+static void
-+gsd_updates_watch_init (GsdUpdatesWatch *watch)
-+{
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (watch));
-+
-+        watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch);
-+        watch->priv->tlist = pk_transaction_list_new ();
-+        watch->priv->client = pk_client_new ();
-+
-+        g_signal_connect (watch->priv->tlist, "added",
-+                          G_CALLBACK (gsd_updates_watch_tlist_added_cb), watch);
-+}
-+
-+static void
-+gsd_updates_watch_finalize (GObject *object)
-+{
-+        GsdUpdatesWatch *watch;
-+
-+        g_return_if_fail (GSD_IS_UPDATES_WATCH (object));
-+
-+        watch = GSD_UPDATES_WATCH (object);
-+        g_return_if_fail (watch->priv != NULL);
-+
-+        if (watch->priv->tlist != NULL) {
-+                g_object_unref (watch->priv->tlist);
-+        }
-+        if (watch->priv->client != NULL) {
-+                g_object_unref (watch->priv->client);
-+        }
-+
-+        G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object);
-+}
-+
-+GsdUpdatesWatch *
-+gsd_updates_watch_new (void)
-+{
-+        return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL));
-+}
-+
-+static void
-+gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass)
-+{
-+        GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+        object_class->finalize = gsd_updates_watch_finalize;
-+        g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate));
-+}
-diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h
-new file mode 100644
-index 0000000..439464f
---- /dev/null
-+++ b/plugins/updates/gsd-updates-watch.h
-@@ -0,0 +1,52 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2011-2012 Jonathan Conder <jonno.conder@gmail.com>
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __GSD_UPDATES_WATCH_H
-+#define __GSD_UPDATES_WATCH_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define GSD_TYPE_UPDATES_WATCH          (gsd_updates_watch_get_type ())
-+#define GSD_UPDATES_WATCH(o)            (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatch))
-+#define GSD_UPDATES_WATCH_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchClass))
-+#define GSD_IS_UPDATES_WATCH(o)         (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_UPDATES_WATCH))
-+
-+typedef struct GsdUpdatesWatchPrivate GsdUpdatesWatchPrivate;
-+
-+typedef struct
-+{
-+         GObject                         parent;
-+         GsdUpdatesWatchPrivate         *priv;
-+} GsdUpdatesWatch;
-+
-+typedef struct
-+{
-+        GObjectClass    parent_class;
-+} GsdUpdatesWatchClass;
-+
-+GType                    gsd_updates_watch_get_type           (void);
-+GsdUpdatesWatch         *gsd_updates_watch_new                (void);
-+
-+G_END_DECLS
-+
-+#endif /* __GSD_UPDATES_WATCH_H */
diff --git a/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/gnome-settings-daemon-updates/screensaver.patch b/community-testing/gnome-settings-daemon-updates/screensaver.patch
deleted file mode 100644
index bbcfe3430..000000000
--- a/community-testing/gnome-settings-daemon-updates/screensaver.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 17 Oct 2012 22:44:54 +0000
-Subject: power: Add a watchdog to keep X's builtin screen saver disabled
-
-X's builtin screen saver may activate DPMS. Since we want to activate
-DPMS ourselves according to our own policy we must make sure that X's
-screen saver remains disabled.
-
-This code is a copy of the original found in gs-watcher-x11.c from
-gnome-screensaver which stopped being used in GNOME 3.6.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686339
----
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 0e06495..070cf32 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <sys/wait.h>
- #include <glib/gi18n.h>
-+#include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
-@@ -80,6 +81,8 @@
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-+#define XSCREENSAVER_WATCHDOG_TIMEOUT                   120 /* seconds */
-+
- enum {
-         GSD_POWER_IDLETIME_NULL_ID,
-         GSD_POWER_IDLETIME_DIM_ID,
-@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate
-         GsdPowerIdleMode         current_idle_mode;
-         guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-+        guint                    xscreensaver_watchdog_timer_id;
- };
- 
- enum {
-@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session,
-         idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL);
- }
- 
-+/* This timer goes off every few minutes, whether the user is idle or not,
-+   to try and clean up anything that has gone wrong.
-+
-+   It calls disable_builtin_screensaver() so that if xset has been used,
-+   or some other program (like xlock) has messed with the XSetScreenSaver()
-+   settings, they will be set back to sensible values (if a server extension
-+   is in use, messing with xlock can cause the screensaver to never get a wakeup
-+   event, and could cause monitor power-saving to occur, and all manner of
-+   heinousness.)
-+
-+   This code was originally part of gnome-screensaver, see
-+   http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530
-+ */
-+static gboolean
-+disable_builtin_screensaver (gpointer unused)
-+{
-+        int current_server_timeout, current_server_interval;
-+        int current_prefer_blank,   current_allow_exp;
-+        int desired_server_timeout, desired_server_interval;
-+        int desired_prefer_blank,   desired_allow_exp;
-+
-+        XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                         &current_server_timeout,
-+                         &current_server_interval,
-+                         &current_prefer_blank,
-+                         &current_allow_exp);
-+
-+        desired_server_timeout  = current_server_timeout;
-+        desired_server_interval = current_server_interval;
-+        desired_prefer_blank    = current_prefer_blank;
-+        desired_allow_exp       = current_allow_exp;
-+
-+        desired_server_interval = 0;
-+
-+        /* I suspect (but am not sure) that DontAllowExposures might have
-+           something to do with powering off the monitor as well, at least
-+           on some systems that don't support XDPMS?  Who know... */
-+        desired_allow_exp = AllowExposures;
-+
-+        /* When we're not using an extension, set the server-side timeout to 0,
-+           so that the server never gets involved with screen blanking, and we
-+           do it all ourselves.  (However, when we *are* using an extension,
-+           we tell the server when to notify us, and rather than blanking the
-+           screen, the server will send us an X event telling us to blank.)
-+        */
-+        desired_server_timeout = 0;
-+
-+        if (desired_server_timeout     != current_server_timeout
-+            || desired_server_interval != current_server_interval
-+            || desired_prefer_blank    != current_prefer_blank
-+            || desired_allow_exp       != current_allow_exp) {
-+
-+                g_debug ("disabling server builtin screensaver:"
-+                         " (xset s %d %d; xset s %s; xset s %s)",
-+                         desired_server_timeout,
-+                         desired_server_interval,
-+                         (desired_prefer_blank ? "blank" : "noblank"),
-+                         (desired_allow_exp ? "expose" : "noexpose"));
-+
-+                XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                                 desired_server_timeout,
-+                                 desired_server_interval,
-+                                 desired_prefer_blank,
-+                                 desired_allow_exp);
-+
-+                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-+        }
-+
-+        return TRUE;
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         /* set the initial dim time that can adapt for the user */
-         refresh_idle_dim_settings (manager);
- 
-+        manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
-+                                                                               disable_builtin_screensaver,
-+                                                                               NULL);
-         gnome_settings_profile_end (NULL);
-         return TRUE;
- }
-@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- 
-         g_clear_object (&manager->priv->idletime);
-         g_clear_object (&manager->priv->status_icon);
-+
-+        if (manager->priv->xscreensaver_watchdog_timer_id > 0) {
-+                g_source_remove (manager->priv->xscreensaver_watchdog_timer_id);
-+                manager->priv->xscreensaver_watchdog_timer_id = 0;
-+        }
- }
- 
- static void
---
-cgit v0.9.0.2
diff --git a/community-testing/gnote/PKGBUILD b/community-testing/gnote/PKGBUILD
deleted file mode 100644
index 10875eac1..000000000
--- a/community-testing/gnote/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78578 2012-10-21 10:46:20Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: uastasi <uastasi@archlinux.us>
-pkgname=gnote
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A note taking application."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Gnote"
-license=('GPL3')
-depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf' 'libsecret')
-makedepends=('intltool' 'itstool' 'boost')
-options=('!libtool')
-install=gnote.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ac61c84a4fe8eeae613af76bb11cb481f2f44c8bc64ef4b7aac90b8e68e94957')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --libexecdir=/usr/lib/gnote \
-        --disable-scrollkeeper \
-        --disable-schemas-compile \
-        --disable-static
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gnote/gnote.install b/community-testing/gnote/gnote.install
deleted file mode 100644
index 0f8eb1012..000000000
--- a/community-testing/gnote/gnote.install
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=gnote
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        usr/sbin/gconfpkg --uninstall ${pkgname}
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-testing/gogglesmm/PKGBUILD b/community-testing/gogglesmm/PKGBUILD
deleted file mode 100644
index 6a70860cf..000000000
--- a/community-testing/gogglesmm/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 77293 2012-10-08 15:04:42Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=gogglesmm
-pkgver=0.12.6
-pkgrel=2
-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' 'sqlite>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt')
-makedepends=('pkgconfig' 'glproto' 'dri2proto' 'glu')
-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/gource/PKGBUILD b/community-testing/gource/PKGBUILD
deleted file mode 100644
index 18341108c..000000000
--- a/community-testing/gource/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 78806 2012-10-25 01:47:41Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
-# Contributor: Olivier Ramonat <olivier at ramonat dot fr>
-pkgname=gource
-pkgver=0.38
-pkgrel=5
-pkgdesc="software version control visualization"
-license=(GPL3)
-arch=(i686 x86_64)
-url=http://code.google.com/p/gource/
-depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew' 'boost-libs')
-makedepends=('boost' 'glm')
-source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('6584241879dbb6dfaecc6ae6b58ad38c')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i "s/filesystem3/filesystem/g" src/logmill.cpp
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-
-	make DESTDIR=$pkgdir install
-}
-# vim: ts=2:sw=2 et:
diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD
deleted file mode 100644
index 24230e603..000000000
--- a/community-testing/gpac/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 77246 2012-10-07 22:54:58Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpac
-pkgver=4065
-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' 'glu')
-makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad' 'mesa')
-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{,.sig})
-sha1sums=('9a60014c4467acf3ac070e4e4a42d13b35575da8'
-          'a015cef1fd003c57bd91a6d0959ccd58df2357d4')
-
-# 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
-  find . -depth -type d -name .svn -exec rm -rf {} \;
-  tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
-  popd
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/community-testing/gpsdrive/PKGBUILD b/community-testing/gpsdrive/PKGBUILD
deleted file mode 100644
index 655913c6e..000000000
--- a/community-testing/gpsdrive/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 73759 2012-07-15 13:18:57Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=gpsdrive
-pkgver=2.11
-_pkgver=20120711
-pkgrel=13
-pkgdesc="A car (bike, ship, plane) navigation system"
-arch=("i686" "x86_64")
-url="http://www.gpsdrive.de/"
-license=('GPL2')
-depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik' 'postgresql-libs' 'openstreetmap-map-icons-svn'
-         'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp' 'perl-www-mechanize' 'perl-libwww' 'perl-uri'
-         'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple' 'perl-xml-twig' 'perl-xml-writer')
-makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
-install="gpsdrive.install"
-#source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz")
-source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.xz")
-md5sums=('48fe20e111c10d0826d9f05746c9cf74')
-
-build() {
-  cd "$srcdir"
-
-  # python2 fix
-  for file in $(find . -name '*.py' -print); do
-    sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
-    sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
-  done
-
-  rm -rf build
-  mkdir build
-  cd build
-
-  sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
-
-  export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/
-  export LDFLAGS="`pkg-config --libs gtk+-2.0 gmodule-2.0` -lboost_system -lboost_thread"
-
-  # see DefineOptions.cmake for a list of common options and defaults
-  # cmake -L for a more in-depth listing
-  cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \
-    -DWITH_SCRIPTS=ON \
-    -DWITH_MAPNIK=ON \
-    -DWITH_POSTGIS=ON \
-    -DWITH_GDAL=ON \
-    -DWITH_BASEMAPS=ON \
-    -DWITH_FRIENDSD=ON \
-    -DWITH_KISMET=ON \
-    -DWITH_NAVIGATION=ON \
-    -DWITH_SPEECH=OFF \
-    -DWITH_DBUS=OFF \
-    -DLIBGPS_OLD=OFF \
-    "$srcdir/gpsdrive-${_pkgver}"
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gpsdrive/gpsdrive.install b/community-testing/gpsdrive/gpsdrive.install
deleted file mode 100644
index 8ea63912e..000000000
--- a/community-testing/gpsdrive/gpsdrive.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-  echo "Don't forget to generate geoinfo.db with geoinfo.pl script"
-  echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive"
-}
diff --git a/community-testing/gtk-engine-unico/PKGBUILD b/community-testing/gtk-engine-unico/PKGBUILD
deleted file mode 100644
index 998232ba9..000000000
--- a/community-testing/gtk-engine-unico/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 78483 2012-10-19 15:13:25Z bpiotrowski $
-# Maintainer:  Bartlomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Hilinus <itahilinus[at]hotmail[dot]it>
-
-pkgname=gtk-engine-unico
-pkgver=1.0.2
-pkgrel=2
-pkgdesc="Unico GTK3 theme engine"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/unico"
-license=('GPL')
-depends=("gtk3")
-options=(!libtool)
-source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz")
-md5sums=('19fb3ecc36d4d13b4a76e26a4ebd6412')
-
-
-build() {
-  cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver
-  
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
deleted file mode 100644
index 1c6a7dd65..000000000
--- a/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Wed, 12 Sep 2012 03:29:46 -0700
-Subject: [PATCH] fix for ghc 7.6.1 changes
-
----
- c2hs/base/general/FileOps.hs  | 3 ++-
- c2hs/base/state/StateTrans.hs | 3 ++-
- c2hs/toplevel/C2HSConfig.hs   | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs
-index 83ac70c..4914c4b 100644
---- a/c2hs/base/general/FileOps.hs
-+++ b/c2hs/base/general/FileOps.hs
-@@ -39,6 +39,7 @@ import Control.Monad	 (liftM)
- import System.Random    (newStdGen, randomRs)
- 
- import FNameOps  (dirname, stripDirname, addPath)
-+import System.IO.Error (catchIOError)
- 
- 
- -- search for the given file in the given list of directories (EXPORTED)
-@@ -89,7 +90,7 @@ mktemp pre post =
- 			     in do
- 			       h <- openFile fname ReadWriteMode
- 			       return (h, fname)
--			     `catch` \_ -> createLoop (attempts - 1) rs'
-+			     `catchIOError` \_ -> createLoop (attempts - 1) rs'
-     --
-     sixChars :: [Int] -> ([Int], String)
-     sixChars is = 
-diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs
-index ada62f4..2ab0ad1 100644
---- a/c2hs/base/state/StateTrans.hs
-+++ b/c2hs/base/state/StateTrans.hs
-@@ -84,6 +84,7 @@ import System.IO  (fixIO)
- import Data.IORef (IORef, newIORef, readIORef, writeIORef)
- 
- import Errors (interr)
-+import System.IO.Error (catchIOError)
- 
- infixr 1 +>=, +>
- 
-@@ -337,7 +338,7 @@ fatalsHandledBy m handler  =
- 				  ioError err
- 	      Right a          -> return state
- 	    )
--	    `catch` (\err -> let
-+	    `catchIOError` (\err -> let
- 			       STB handler' = handler err
- 			     in
- 			     handler' bs gs)
-diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs
-index e8deddf..af32886 100644
---- a/c2hs/toplevel/C2HSConfig.hs
-+++ b/c2hs/toplevel/C2HSConfig.hs
-@@ -46,7 +46,7 @@ import Data.Array (Array, array)
- 
- import Foreign (Ptr, FunPtr)
- import Foreign  (Storable(sizeOf, alignment), toBool)
--import Foreign.C (CInt)
-+import Foreign.C (CInt(..))
- import System.Info (os)
- 
- -- program settings
--- 
-1.7.12
-
diff --git a/community-testing/gtk2hs-buildtools/PKGBUILD b/community-testing/gtk2hs-buildtools/PKGBUILD
deleted file mode 100644
index ada8cb54f..000000000
--- a/community-testing/gtk2hs-buildtools/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 77006 2012-10-03 15:23:27Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=gtk2hs-buildtools
-pkgver=0.12.3.1
-pkgrel=2
-pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
-url="http://hackage.haskell.org/package/gtk2hs-buildtools"
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3')
-depends=('gmp')
-options=('strip')
-provides=('haskell-gtk2hs-buildtools')
-source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz
-        '0001-fix-for-ghc-7.6.1-changes.patch')
-md5sums=('612611d831635024c953d2817b124e29'
-         'b6551d8085c97bc2c6600ab397833101')
-
-build() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-
-    patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch
-
-    runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-}
-
-package() {
-    cd ${srcdir}/gtk2hs-buildtools-$pkgver
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/guake/PKGBUILD b/community-testing/guake/PKGBUILD
deleted file mode 100644
index eda3e0c4d..000000000
--- a/community-testing/guake/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 78050 2012-10-16 11:50:47Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org>
-
-pkgname=guake
-pkgver=0.4.4
-pkgrel=2
-pkgdesc='Drop-down terminal for GNOME'
-arch=('i686' 'x86_64')
-url="http://guake.org/"
-license=('GPL')
-depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool')
-options=('!libtool')
-install=$pkgname.install
-source=(http://guake.org/files/$pkgname-$pkgver.tar.gz
-        guake-fix-notification.patch)
-md5sums=('532adada29b8f0bb79dc15904aa6b70c'
-         '0b57227e6869dd84dd4fb0794ed0d082')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in
-  sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py}
-
-  # http://guake.org/ticket/416
-  patch -Np1 -i "$srcdir/guake-fix-notification.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-install \
-              --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/guake/guake-fix-notification.patch b/community-testing/guake/guake-fix-notification.patch
deleted file mode 100644
index 847dac10e..000000000
--- a/community-testing/guake/guake-fix-notification.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/src/guake	2011-02-09 20:00:35.000000000 +0100
-+++ b/src/guake	2012-02-25 00:55:28.513075769 +0100
-@@ -46,7 +46,10 @@
-     TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \
-     ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER
- 
--pynotify.init('Guake!')
-+popup_works = True
-+if not pynotify.init('Guake!') or pynotify.get_server_info() == None :
-+    popup_works = False
-+    print "WARNING: could not use popup notification"
- 
- GNOME_FONT_PATH = '/desktop/gnome/interface/monospace_font_name'
- 
-@@ -637,7 +640,12 @@
-                   'Please use Guake Preferences dialog to choose another '
-                   'key (The trayicon was enabled)') % label, filename)
-             self.client.set_bool(KEY('/general/use_trayicon'), True)
--            notification.show()
-+            if popup_works :
-+                notification.show() 
-+            else :
-+                print _('A problem happened when binding <b>%s</b> key.\n'
-+                  'Please use Guake Preferences dialog to choose another '
-+                  'key (The trayicon was enabled)') % label
- 
-         elif self.client.get_bool(KEY('/general/use_popup')):
-             # Pop-up that shows that guake is working properly (if not
-@@ -646,7 +654,11 @@
-                 _('Guake!'),
-                 _('Guake is now running,\n'
-                   'press <b>%s</b> to use it.') % label, filename)
--            notification.show()
-+            if popup_works :
-+                notification.show()
-+            else :
-+                print _('Guake is now running,\n'
-+                  'press <b>%s</b> to use it.') % label
- 
-     def execute_command(self, command, tab=None):
-         """Execute the `command' in the `tab'. If tab is None, the
-
diff --git a/community-testing/guake/guake.install b/community-testing/guake/guake.install
deleted file mode 100644
index 8084333b1..000000000
--- a/community-testing/guake/guake.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=guake
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  xdg-icon-resource forceupdate
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate
-}
diff --git a/community-testing/gwibber/PKGBUILD b/community-testing/gwibber/PKGBUILD
deleted file mode 100644
index d6c663411..000000000
--- a/community-testing/gwibber/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 78051 2012-10-16 11:50:52Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=gwibber
-pkgver=3.4.2
-pkgrel=2
-pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku"
-arch=('i686' 'x86_64')
-url="http://gwibber.com/"
-license=('GPL')
-depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python2-egenix-mx-base' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'vala>=0.15.0')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('0ac544f8e626547312b9d0da0b57358e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --disable-schemas-compile --disable-unity
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/gwibber/gwibber.install b/community-testing/gwibber/gwibber.install
deleted file mode 100644
index d973d53f7..000000000
--- a/community-testing/gwibber/gwibber.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
deleted file mode 100644
index 2e687db21..000000000
--- a/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 07:43:41 -0700
-Subject: [PATCH] fix incorrect types in documentation/haddock
-
----
- src/Documentation/Haddock.hs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
-index 60bb314..8fd9674 100644
---- a/src/Documentation/Haddock.hs
-+++ b/src/Documentation/Haddock.hs
-@@ -59,6 +59,7 @@ import Haddock.Types
- import Haddock.Options
- import Haddock.Utils
- import Main
-+import GHC (Ghc)
- 
- 
- -- | Create 'Interface' structures from a given list of Haddock command-line
-@@ -68,7 +69,7 @@ import Main
- createInterfaces
-   :: [Flag]         -- ^ A list of command-line flags
-   -> [String]       -- ^ File or module names
--  -> IO [Interface] -- ^ Resulting list of interfaces
-+  -> Ghc [Interface] -- ^ Resulting list of interfaces
- createInterfaces flags modules = do
-   (_, ifaces, _) <- readPackagesAndProcessModules flags modules
-   return ifaces
--- 
-1.7.12
-
diff --git a/community-testing/haddock/PKGBUILD b/community-testing/haddock/PKGBUILD
deleted file mode 100644
index 274cc7851..000000000
--- a/community-testing/haddock/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haddock
-pkgver=2.12.0
-pkgrel=1
-pkgdesc="Tool for generating documentation for Haskell libraries"
-url="http://hackage.haskell.org/package/haddock"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-makedepends=('alex=3.0.2-2' 'happy=1.18.9-6')
-depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9')
-install=$pkgname.install
-source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz"
-        '0001-fix-incorrect-types-in-documentation-haddock.patch')
-sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02'
-            'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch
-  
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
-  install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-  mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haddock/haddock.install b/community-testing/haddock/haddock.install
deleted file mode 100644
index 24e27a074..000000000
--- a/community-testing/haddock/haddock.install
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=haddock
-HS_DIR=usr/share/haskell/haddock
-
-post_upgrade() {
-  ${HS_DIR}/register.sh &> /dev/null
-  post_remove
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-}
-
-post_install() {
-	post_upgrade
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/happy/PKGBUILD b/community-testing/happy/PKGBUILD
deleted file mode 100644
index 583471724..000000000
--- a/community-testing/happy/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 77008 2012-10-03 15:23:39Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
- 
-pkgname=happy
-pkgver=1.18.10
-pkgrel=1
-pkgdesc="The Parser Generator for Haskell"
-url="http://hackage.haskell.org/package/happy"
-arch=('i686' 'x86_64')
-license=("custom:BSD3")
-depends=('gmp')
-makedepends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('a1638e89434427e57f68ef311761dc30')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # try was deprecated and removed into control.exception
-  # we really want tryIOError
-  #sed 's/try/&IOError/' -i Setup.lhs
-
-  runhaskell Setup.lhs configure -O --prefix=/usr
-  runhaskell Setup.lhs build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  runhaskell Setup.lhs copy --destdir="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-testing/haskell-binary/PKGBUILD b/community-testing/haskell-binary/PKGBUILD
deleted file mode 100644
index 3b786ccf4..000000000
--- a/community-testing/haskell-binary/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 72296 2012-06-11 17:24:49Z tdziedzic $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-binary
-pkgver=0.5.1.0
-pkgrel=2
-pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings"
-url="http://hackage.haskell.org/package/binary"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.4.2-1' sh)
-options=('strip')
-source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz")
-install=haskell-binary.install
-sha256sums=('2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3')
-
-build() {
-  cd "$srcdir/binary-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/binary-$pkgver"
-
-  install -Dm 744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/binary"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-binary/haskell-binary.install b/community-testing/haskell-binary/haskell-binary.install
deleted file mode 100644
index 844b8a67c..000000000
--- a/community-testing/haskell-binary/haskell-binary.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-binary
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  post_remove
-}
-
-post_install() {
-  post_upgrade
-}
-
-pre_remove() {
-  pre_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-bytestring-show/PKGBUILD b/community-testing/haskell-bytestring-show/PKGBUILD
deleted file mode 100644
index 27175c739..000000000
--- a/community-testing/haskell-bytestring-show/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 77009 2012-10-03 15:23:44Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-bytestring-show
-pkgver=0.3.5.3
-pkgrel=1
-pkgdesc="Efficient conversion of values into readable byte strings."
-url="http://hackage.haskell.org/package/bytestring-show"
-license=("BSD3")
-arch=('i686' 'x86_64')
-depends=("ghc=7.6.1-1")
-install="${pkgname}.install"
-source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('cbcc94f57fc754685f428aba003ba058')
-
-build() {
-  cd ${srcdir}/bytestring-show-${pkgver}
-
-  # update outdated dependency
-  sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-	--prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-	--libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/bytestring-show-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-bytestring-show/haskell-bytestring-show.install b/community-testing/haskell-bytestring-show/haskell-bytestring-show.install
deleted file mode 100644
index 335fc37cd..000000000
--- a/community-testing/haskell-bytestring-show/haskell-bytestring-show.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=haskell-bytestring-show
-HS_DIR=usr/share/haskell/${pkgname}
-
-post_install() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_upgrade() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-    ${HS_DIR}/register.sh
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-pre_remove() {
-    ${HS_DIR}/unregister.sh
-}
-
-post_remove() {
-    (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-cairo/PKGBUILD b/community-testing/haskell-cairo/PKGBUILD
deleted file mode 100644
index 8544d0018..000000000
--- a/community-testing/haskell-cairo/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 77010 2012-10-03 15:23:49Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-cairo
-pkgver=0.12.3.1
-pkgrel=2
-pkgdesc="Binding to the cairo library for Gtk2Hs."
-url="http://hackage.haskell.org/package/cairo"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1')
-makedepends=("gtk2hs-buildtools")
-options=('strip')
-conflicts=('gtk2hs-cairo')
-provides=('gtk2hs-cairo')
-replaces=('gtk2hs-cairo')
-install=gtk2hs-cairo.install
-source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('9d489fbb6cadb3d109543fe25c50195e')
-
-build() {
-    cd ${srcdir}/cairo-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/cairo-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-cairo/gtk2hs-cairo.install b/community-testing/haskell-cairo/gtk2hs-cairo.install
deleted file mode 100644
index 4ec5096b6..000000000
--- a/community-testing/haskell-cairo/gtk2hs-cairo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-cairo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
deleted file mode 100644
index 9f544bb27..000000000
--- a/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 05:06:59 -0700
-Subject: [PATCH] update build deps for ghc 7.6.1
-
----
- dataenc.cabal | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dataenc.cabal b/dataenc.cabal
-index 1ad42ca..3a4f5bb 100644
---- a/dataenc.cabal
-+++ b/dataenc.cabal
-@@ -21,7 +21,7 @@ flag BuildTests
- 
- library
-     hs-source-dirs: src
--    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5
-+    build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6
-     exposed-modules:
-             Codec.Binary.Base16
-             Codec.Binary.Base32
--- 
-1.7.12
-
diff --git a/community-testing/haskell-dataenc/PKGBUILD b/community-testing/haskell-dataenc/PKGBUILD
deleted file mode 100644
index 0b57ab46c..000000000
--- a/community-testing/haskell-dataenc/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 77011 2012-10-03 15:23:56Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=dataenc
-pkgname=haskell-dataenc
-pkgver=0.14.0.3
-pkgrel=3
-pkgdesc="Data encoding library"
-url="http://hackage.haskell.org/package/dataenc"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz
-        '0001-update-build-deps-for-ghc-7.6.1.patch')
-install=${pkgname}.install
-md5sums=('643a8c022b9c840f801faf9a661fe637'
-         '662056adcb79efe8898298c271b49600')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    # update build deps for ghc 7.6.1
-    patch -Np1 -i ${srcdir}/0001-update-build-deps-for-ghc-7.6.1.patch
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-dataenc/haskell-dataenc.install b/community-testing/haskell-dataenc/haskell-dataenc.install
deleted file mode 100644
index 9c1bbff01..000000000
--- a/community-testing/haskell-dataenc/haskell-dataenc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-dataenc
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-extensible-exceptions/PKGBUILD b/community-testing/haskell-extensible-exceptions/PKGBUILD
deleted file mode 100644
index a97e33964..000000000
--- a/community-testing/haskell-extensible-exceptions/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 77072 2012-10-04 10:49:53Z jelle $
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-
-_hkgname=extensible-exceptions
-pkgname=haskell-${_hkgname}
-pkgver=0.1.1.4
-pkgrel=3
-pkgdesc="extensible exceptions for both new and old versions of GHC"
-url="http://hackage.haskell.org/package/extensible-exceptions"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=$pkgname.install
-md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install
deleted file mode 100644
index 20c7dce30..000000000
--- a/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-extensible-exceptions
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
diff --git a/community-testing/haskell-ghc-paths/PKGBUILD b/community-testing/haskell-ghc-paths/PKGBUILD
deleted file mode 100644
index 1e23d3c10..000000000
--- a/community-testing/haskell-ghc-paths/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer:
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-ghc-paths
-pkgver=0.1.0.8
-pkgrel=9
-pkgdesc="Knowledge of GHC's installation directories"
-url="http://hackage.haskell.org/package/ghc-paths"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.6.1-1')
-source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
-install=haskell-ghc-paths.install
-md5sums=('d2b23dc563888e380588501d2ce1d82b')
-
-build() {
-  cd "$srcdir/ghc-paths-$pkgver"
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-     --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-     --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/ghc-paths-$pkgver"
-
-  install -Dm 744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/ghc-paths"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-ghc-paths/haskell-ghc-paths.install b/community-testing/haskell-ghc-paths/haskell-ghc-paths.install
deleted file mode 100644
index 4fd2c6c56..000000000
--- a/community-testing/haskell-ghc-paths/haskell-ghc-paths.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-ghc-paths
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
deleted file mode 100644
index 845beb2bd..000000000
--- a/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Thu, 27 Sep 2012 04:48:10 -0700
-Subject: [PATCH] compatibility with ghc 7.6.1
-
----
- System/Glib/GObject.chs  | 4 +---
- System/Glib/MainLoop.chs | 4 ++--
- 2 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs
-index 5f0fe5c..9925d2c 100644
---- a/System/Glib/GObject.chs
-+++ b/System/Glib/GObject.chs
-@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do
- 
- {#pointer GDestroyNotify as DestroyNotify#}
- 
--foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
--
- -- | This function wraps any newly created objects that derives from
- -- GInitiallyUnowned also known as objects with
- -- \"floating-references\". The object will be refSink (for glib
-@@ -225,4 +223,4 @@ isA obj gType =
- -- at this point we would normally implement the notify signal handler;
- -- I've moved this definition into the Object class of the gtk package
- -- since there's a quite a bit of machinery missing here (generated signal
---- register functions and the problem of recursive modules)
-\ No newline at end of file
-+-- register functions and the problem of recursive modules)
-diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs
-index 72fecb6..feb4c77 100644
---- a/System/Glib/MainLoop.chs
-+++ b/System/Glib/MainLoop.chs
-@@ -71,7 +71,7 @@ import System.Glib.GObject	(DestroyNotify, destroyFunPtr)
- 
- {#pointer SourceFunc#}
- 
--foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
-+foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
- 
- type HandlerId = {#type guint#}
- 
-@@ -79,7 +79,7 @@ type HandlerId = {#type guint#}
- --
- makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
- makeCallback fun = do
--  funPtr <- mkSourceFunc fun
-+  funPtr <- mkSourceFunc (const fun)
-   return (funPtr, destroyFunPtr)
- 
- -- | Sets a function to be called at regular intervals, with the default
--- 
-1.7.12.1
-
diff --git a/community-testing/haskell-glib/PKGBUILD b/community-testing/haskell-glib/PKGBUILD
deleted file mode 100644
index 29871ceb0..000000000
--- a/community-testing/haskell-glib/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 77013 2012-10-03 15:24:08Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-glib
-pkgver=0.12.3.1
-pkgrel=2
-pkgdesc="Binding to the GLIB library for Gtk2Hs."
-url="http://hackage.haskell.org/package/glib"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'glib2')
-makedepends=("gtk2hs-buildtools")
-options=('strip')
-install=gtk2hs-glib.install
-provides=('gtk2hs-glib')
-replaces=('gtk2hs-glib')
-conflicts=('gtk2hs-glib')
-source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz
-        '0001-compatibility-with-ghc-7.6.1.patch')
-md5sums=('f2899bd2a2850fe95479ddb63490eb04'
-         'b00660b7102542942b0b9d84b59d1f3c')
-
-build() {
-    cd glib-$pkgver
-
-    patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/haskell-glib \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-    depends=("ghc=${_ghcver}" "glib2")
-
-    cd ${srcdir}/glib-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib
-    runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-glib/gtk2hs-glib.install b/community-testing/haskell-glib/gtk2hs-glib.install
deleted file mode 100644
index 24025f5d8..000000000
--- a/community-testing/haskell-glib/gtk2hs-glib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-glib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-gtk/PKGBUILD b/community-testing/haskell-gtk/PKGBUILD
deleted file mode 100644
index ab4be6139..000000000
--- a/community-testing/haskell-gtk/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 77014 2012-10-03 15:24:17Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-gtk
-pkgver=0.12.3.1
-pkgrel=2
-pkgdesc="Binding to the gtk library for Gtk2Hs."
-url="http://hackage.haskell.org/package/gtk"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl')
-makedepends=("gtk2hs-buildtools")
-provides=('gtk2hs-gtk')
-replaces=('gtk2hs-gtk')
-conflicts=('gtk2hs-gtk')
-options=('strip')
-install=gtk2hs-gtk.install
-source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz
-	ghc-7.6.1.patch)
-md5sums=('b10dfe92d2e4dfe3c0c92dd349489727'
-         '5fb93f37fe3f494b30ee682a36b8f1b6')
-
-build() {
-  cd ${srcdir}/gtk-${pkgver}
-  patch -p1 <$srcdir/ghc-7.6.1.patch
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\  | cut -f1 -d-`
-  _hpangover=`pacman -Q haskell-pango | cut -f2 -d\  | cut -f1 -d-`
-  depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}")
-
-  cd ${srcdir}/gtk-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh
-  install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk
-  runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-gtk/ghc-7.6.1.patch b/community-testing/haskell-gtk/ghc-7.6.1.patch
deleted file mode 100644
index 5e259a38f..000000000
--- a/community-testing/haskell-gtk/ghc-7.6.1.patch
+++ /dev/null
@@ -1,574 +0,0 @@
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Abstract/Object.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -126,7 +126,8 @@
- 
- {#pointer GWeakNotify#}
- 
--foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify
-+foreign import ccall "wrapper" mkDestructor
-+  :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify
- 
- -- | Attach a callback that will be called after the
- -- destroy hooks have been called
-@@ -134,7 +135,7 @@
- objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify
- objectWeakref obj uFun = do
-   funPtrContainer <- newIORef nullFunPtr
--  uFunPtr <- mkDestructor $ do
-+  uFunPtr <- mkDestructor $ \_ _ -> do
-     uFun
-     funPtr <- readIORef funPtrContainer
-     freeHaskellFunPtr funPtr
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Entry/Entry.chs	2012-10-02 16:27:26.000000000 +0400
-@@ -78,6 +78,10 @@
-   entrySetCompletion,
-   entryGetCompletion,
- #endif
-+#if GTK_CHECK_VERSION (2,18,0)
-+  entryGetBuffer,
-+  entrySetBuffer,
-+#endif
- #if GTK_CHECK_VERSION(2,20,0)
-   entryGetIconWindow,
-   entryGetTextWindow,
-@@ -104,6 +108,9 @@
-   entryAlignment,
-   entryCompletion,
- #endif
-+#if GTK_CHECK_VERSION (2,18,0)
-+  entryBuffer,
-+#endif
- 
- -- * Signals
-   entryActivate,
-@@ -157,6 +164,9 @@
- import Graphics.UI.Gtk.Gdk.EventM	(EventM, EButton, EKey)
- import Control.Monad.Reader             ( ask )
- import Control.Monad.Trans              ( liftIO )
-+#if GTK_CHECK_VERSION (2,18,0)
-+import Graphics.UI.Gtk.Entry.EntryBuffer
-+#endif
- {#import Graphics.UI.Gtk.Types#}
- {#import Graphics.UI.Gtk.Signals#}
- 
-@@ -429,6 +439,23 @@
-     (toEntry self)
- #endif
- 
-+#if GTK_CHECK_VERSION(2,18,0)
-+-- | Get the 'EntryBuffer' object which holds the text for this widget.
-+entryGetBuffer :: EntryClass self => self
-+  -> IO EntryBuffer
-+entryGetBuffer self =
-+  makeNewGObject mkEntryBuffer $
-+  {# call gtk_entry_get_buffer #}
-+    (toEntry self)
-+
-+-- | Set the 'EntryBuffer' object which holds the text for this widget.
-+entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self
-+  -> buffer -> IO ()
-+entrySetBuffer self =
-+  {# call gtk_entry_set_buffer #}
-+    (toEntry self) . toEntryBuffer
-+#endif
-+
- #if GTK_CHECK_VERSION(2,20,0)
- -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when
- -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to
-@@ -623,6 +650,15 @@
-   entrySetCompletion
- #endif
- 
-+#if GTK_CHECK_VERSION(2,18,0)
-+entryBuffer :: (EntryClass self, EntryBufferClass buffer) =>
-+  ReadWriteAttr self EntryBuffer buffer
-+entryBuffer = newAttr
-+  entryGetBuffer
-+  entrySetBuffer
-+#endif
-+
-+
- --------------------
- -- Signals
- 
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc	2012-10-02 16:27:27.000000000 +0400
-@@ -639,14 +639,16 @@
- 
- 
- -- | Execute an event handler and assume it handled the event unless it
----   threw a pattern match exception.
-+--   threw a pattern match exception or calls mzero (e.g. via guard).
- tryEvent :: EventM any () -> EventM any Bool
- tryEvent act = do
-   ptr <- ask
-   liftIO $ (runReaderT (act >> return True) ptr)
- #if __GLASGOW_HASKELL__ >= 610
-     `catches` [ Handler (\ (PatternMatchFail _) -> return False)
--              , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e
-+              , Handler (\ e -> if isUserError e &&
-+                                   ("Pattern" `isPrefixOf` ioeGetErrorString e ||
-+                                    "mzero" == ioeGetErrorString e)
-                                 then return False
-                                 else throw e) ]
- #else
-@@ -654,6 +656,8 @@
-                IOException e
-                  | "user error (Pattern" `isPrefixOf` show e ->
-                    return False
-+                 | "user error (mzero" `isPrefixOf` show e ->
-+                   return False
-                PatternMatchFail _ -> return False
-                _ -> throw e)
- #endif
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs	2012-10-02 16:27:28.000000000 +0400
-@@ -69,6 +69,7 @@
- 
- -- * Constructors
-   pixbufNew,
-+  pixbufNewFromData,
-   pixbufNewFromFile,
- #if GTK_CHECK_VERSION(2,4,0)
-   pixbufNewFromFileAtSize,
-@@ -402,6 +403,19 @@
-       (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width)
-       (fromIntegral height)
- 
-+pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf
-+pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride
-+  = wrapNewGObject mkPixbuf $
-+     {#call pixbuf_new_from_data #}
-+       imData
-+       (fromIntegral . fromEnum $ cSpace)
-+       (fromBool hasAlpha)
-+       (fromIntegral bitsPerSample)
-+       (fromIntegral width)
-+       (fromIntegral height)
-+       (fromIntegral rowStride)
-+       nullFunPtr nullPtr
-+
- -- | Create a new image from a String.
- --
- -- * Creates a new pixbuf from a string description.
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/General/Clipboard.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -260,7 +260,7 @@
-                               -- data succeeded.
- clipboardSetWithData self targets getFunc clearFunc = do
-   gFunPtr <- mkClipboardGetFunc
--    (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
-+    (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
-   cFunPtr <- mkClipboardClearFunc
-     (\_ _ -> clearFunc)
-   res <- withTargetEntries targets $ \nTargets targets ->
-@@ -282,7 +282,7 @@
- {#pointer ClipboardClearFunc#}
- 
- foreign import ccall "wrapper" mkClipboardGetFunc ::
--  (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc
-+  (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc
- 
- foreign import ccall "wrapper" mkClipboardClearFunc ::
-   (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc
-@@ -313,7 +313,7 @@
-                               -- ignored.
- clipboardSetWithOwner self targets getFunc clearFunc owner = do
-   gFunPtr <- mkClipboardGetFunc
--    (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ())
-+    (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ())
-   cFunPtr <- mkClipboardClearFunc
-     (\_ _ -> clearFunc)
-   res <- withTargetEntries targets $ \nTargets targets ->
-@@ -404,7 +404,7 @@
- clipboardRequestContents self (Atom target) callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardReceivedFunc
--    (\_ sPtr -> do
-+    (\_ sPtr _ -> do
-       freeHaskellFunPtr =<< readIORef cbRef
-       runReaderT callback sPtr
-       return ())
-@@ -418,7 +418,7 @@
- {#pointer ClipboardReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardReceivedFunc ::
--  (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
-+  (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc
- 
- -- %hash c:7bb1 d:4ef1
- -- | Requests the contents of the clipboard as text. When the text is later
-@@ -439,7 +439,7 @@
- clipboardRequestText self callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardTextReceivedFunc
--    (\_ sPtr -> do
-+    (\_ sPtr _ -> do
-       freeHaskellFunPtr =<< readIORef cbRef
-       mStr <- if sPtr==nullPtr then return Nothing else
-         liftM Just $ peekUTFString sPtr
-@@ -453,7 +453,7 @@
- {#pointer ClipboardTextReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardTextReceivedFunc ::
--  (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc
-+  (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc
- 
- 
- #if GTK_CHECK_VERSION(2,6,0)
-@@ -477,7 +477,7 @@
- clipboardRequestImage self callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardImageReceivedFunc
--    (\_ sPtr -> do
-+    (\_ sPtr _ -> do
-       freeHaskellFunPtr =<< readIORef cbRef
-       mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr)
-       callback mPixbuf)
-@@ -490,7 +490,7 @@
- {#pointer ClipboardImageReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardImageReceivedFunc ::
--  (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc
-+  (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc
- 
- #endif
- 
-@@ -513,7 +513,7 @@
- clipboardRequestTargets self callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardTargetsReceivedFunc
--    (\_ tPtr len -> do
-+    (\_ tPtr len _ -> do
-       -- We must free Haskell pointer *in* the callback to avoid segfault.
-       freeHaskellFunPtr =<< readIORef cbRef
-       mTargets <- if tPtr==nullPtr then return Nothing else
-@@ -528,7 +528,7 @@
- {#pointer ClipboardTargetsReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc ::
--  (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc
-+  (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc
- 
- #if GTK_CHECK_VERSION(2,10,0)
- -- %hash c:5601 d:d6a6
-@@ -552,10 +552,10 @@
- clipboardRequestRichText self buffer callback = do
-   cbRef <- newIORef nullFunPtr
-   cbPtr <- mkClipboardRichTextReceivedFunc
--    (\_ tPtr sPtr len -> do
-+    (\_ tPtr sPtr len _ -> do
-       freeHaskellFunPtr =<< readIORef cbRef
-       mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do
--        str <- peekUTFStringLen (sPtr,fromIntegral len)
-+        str <- peekUTFStringLen (castPtr sPtr,fromIntegral len)
-         return (Atom tPtr, str)
-       callback mRes)
-   writeIORef cbRef cbPtr
-@@ -568,7 +568,7 @@
- {#pointer ClipboardRichTextReceivedFunc#}
- 
- foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc ::
--  (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) ->
-+  (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) ->
-   IO ClipboardRichTextReceivedFunc
- #endif
- #endif
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/General/General.chs	2012-10-02 16:27:28.000000000 +0400
-@@ -202,7 +202,7 @@
- --   their arguments from the main loop, that is, from the OS thread of Gtk,
- --   thereby ensuring that any Gtk and OS function can be called.
- --
--{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #}
-+{#fun gdk_threads_enter as threadsEnter {} -> `()' #}
- 
- -- | Release the global Gtk lock.
- --
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -493,17 +493,17 @@
-   {# call gtk_combo_box_set_row_separator_func #}
-     (toComboBox self) nullFunPtr nullPtr nullFunPtr
- comboBoxSetRowSeparatorSource self (Just (model, extract)) = do
--  funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do
-+  funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do
-         iter <- peek iterPtr
-         value <- customStoreGetRow model iter
--        return (extract value)
-+        return (fromBool $ extract value)
-   {# call gtk_combo_box_set_row_separator_func #}
-     (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr
- 
- {#pointer TreeViewRowSeparatorFunc#}
- 
- foreign import ccall "wrapper" mkRowSeparatorFunc ::
--  (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc
-+  (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc
- 
- -- %hash c:5bf8
- -- | Sets whether the popup menu should have a tearoff menu item.
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs	2012-10-02 16:27:30.000000000 +0400
-@@ -76,6 +76,12 @@
-   menuItemNewWithMnemonic,
- 
- -- * Methods
-+#if GTK_CHECK_VERSION(2,16,0)
-+  menuItemSetLabel,
-+  menuItemGetLabel,
-+  menuItemSetUseUnderline,
-+  menuItemGetUseUnderline,
-+#endif
-   menuItemSetSubmenu,
-   menuItemGetSubmenu,
-   menuItemRemoveSubmenu,
-@@ -89,6 +95,10 @@
- -- * Attributes
-   menuItemSubmenu,
-   menuItemRightJustified,
-+#if GTK_CHECK_VERSION(2,16,0)
-+  menuItemLabel,
-+  menuItemUseUnderline,
-+#endif
- 
- -- * Signals
-   menuItemActivateItem,
-@@ -163,7 +173,36 @@
- 
- --------------------
- -- Methods
-+#if GTK_CHECK_VERSION(2,16,0)
-+-- | Sets text on the MenuItem label
-+
-+menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO ()
-+menuItemSetLabel self label =
-+  withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self)
-+
-+-- | Gets text on the MenuItem label
-+menuItemGetLabel :: (MenuItemClass self) => self -> IO String
-+menuItemGetLabel self =
-+  {# call gtk_menu_item_get_label #}
-+    (toMenuItem self)
-+  >>= \strPtr -> if strPtr == nullPtr
-+                   then return ""
-+                   else peekUTFString strPtr
-+
-+-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key.
-+--
-+menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO ()
-+menuItemSetUseUnderline self =
-+  {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool
- 
-+-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key.
-+--
-+menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool
-+menuItemGetUseUnderline self =
-+  liftM toBool $ {# call gtk_menu_item_get_use_underline #}
-+    (toMenuItem self)
-+
-+#endif
- -- | Sets the item's submenu, or changes it.
- --
- menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO ()
-@@ -278,6 +317,22 @@
-   menuItemGetRightJustified
-   menuItemSetRightJustified
- 
-+#if GTK_CHECK_VERSION(2,16,0)
-+-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel'
-+--
-+menuItemLabel :: MenuItemClass self => Attr self String
-+menuItemLabel = newAttr
-+  menuItemGetLabel
-+  menuItemSetLabel
-+
-+-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and 
-+-- 'menuItemGetUseEUnderline'
-+--
-+menuItemUseUnderline :: MenuItemClass self => Attr self Bool
-+menuItemUseUnderline = newAttr
-+  menuItemGetUseUnderline
-+  menuItemSetUseUnderline
-+#endif
- --------------------
- -- Signals
- 
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs	2012-10-02 16:27:33.000000000 +0400
-@@ -239,7 +239,7 @@
-         customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource,
-         customTreeDragDestIface = fromMaybe dummyDragDest mDragDest }
-   privPtr <- newStablePtr priv
--  liftM con $ makeNewGObject (CustomStore, objectUnref) $
-+  liftM con $ wrapNewGObject (CustomStore, objectUnref) $
-     gtk2hs_store_new implPtr privPtr
- 
- foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new"
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -427,7 +427,7 @@
- {#pointer TreeModelForeachFunc#}
- 
- foreign import ccall "wrapper"  mkTreeModelForeachFunc ::
--  (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) ->
-+  (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) ->
-   IO TreeModelForeachFunc
- 
- #if GTK_CHECK_VERSION(2,2,0)
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -160,7 +160,7 @@
- {#pointer TreeModelFilterVisibleFunc #}
- 
- foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc ::
--  (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
-+  (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) ->
-   IO TreeModelFilterVisibleFunc
- 
- -- %hash c:a56d d:b42e
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -151,7 +151,7 @@
- treeSelectionSetSelectFunction :: TreeSelectionClass self => self
-  -> TreeSelectionCB -> IO ()
- treeSelectionSetSelectFunction ts fun = do
--  fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do
-+  fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do
-     path <- peekTreePath (castPtr tp)
-     liftM fromBool $ fun path
-     )
-@@ -168,7 +168,7 @@
- {#pointer TreeSelectionFunc#}
- 
- foreign import ccall "wrapper"  mkTreeSelectionFunc ::
--  (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)->
-+  (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)->
-   IO TreeSelectionFunc
- 
- -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on.
-@@ -199,7 +199,7 @@
-  -> TreeSelectionForeachCB
-  -> IO ()
- treeSelectionSelectedForeach self fun = do
--  fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do
-+  fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do
-     -- make a deep copy of the iterator. This makes it possible to store this
-     -- iterator in Haskell land somewhere. The TreeModel parameter is not
-     -- passed to the function due to performance reasons. But since it is
-@@ -219,7 +219,7 @@
- {#pointer TreeSelectionForeachFunc#}
- 
- foreign import ccall "wrapper"  mkTreeSelectionForeachFunc ::
--  (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc
-+  (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc
- 
- #if GTK_CHECK_VERSION(2,2,0)
- -- | Creates a list of paths of all selected rows.
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -582,7 +582,7 @@
- {#pointer TreeViewColumnDropFunc#}
- 
- foreign import ccall "wrapper" mkTreeViewColumnDropFunc ::
--  (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
-+  (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn ->
-   Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc
- 
- -- | Scroll to a coordinate.
-@@ -798,7 +798,7 @@
- {#pointer TreeViewMappingFunc#}
- 
- foreign import ccall "wrapper" mkTreeViewMappingFunc ::
--  (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
-+  (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) ->
-   IO TreeViewMappingFunc
- 
- -- | Check if row is expanded.
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs	2012-10-02 16:27:34.000000000 +0400
-@@ -1251,16 +1251,26 @@
- 
- -- | A 'Pixbuf' is inserted into the buffer.
- --
-+-- * See note in 'bufferInsertText'.
-+--
- insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ())
- insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy)
- 
- -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. 
- -- Insertion actually occurs in the default handler.
- --
-+-- * See note in 'bufferInsertText'.
-+--
- insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ())
- insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy)
- 
---- | Some text was inserted.
-+-- | Some text is inserted. Insertion actually occurs in the default handler.
-+--
-+-- * The function connected to this handler may not modify the buffer since
-+--   this would invalidate the iterator. If this function replaces the
-+--   default handler, it needs to stop the emission of this signal in order
-+--   to prevent the default handler from running. If additional text should
-+--   be inserted, this can be done using the 'after' function to connect.
- --
- bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ())
- bufferInsertText = Signal $ \after obj handler ->
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -797,7 +797,7 @@
- {#pointer TextCharPredicate#}
- 
- foreign import ccall "wrapper" mkTextCharPredicate ::
--  ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate
-+  ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate
- 
- -- | Move 'TextIter' forward until a
- -- predicate function returns True.
-@@ -810,7 +810,7 @@
- textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
-                            IO Bool
- textIterForwardFindChar ti pred limit = do
--  fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
-+  fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
-   res <- liftM toBool $ {#call text_iter_forward_find_char#} 
-     ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
-   freeHaskellFunPtr fPtr
-@@ -827,7 +827,7 @@
- textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter ->
-                             IO Bool
- textIterBackwardFindChar ti pred limit = do
--  fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c)))
-+  fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c)))
-   res <- liftM toBool $ {#call text_iter_backward_find_char#} 
-     ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit)
-   freeHaskellFunPtr fPtr
-diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs
---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs	2012-06-18 01:39:34.000000000 +0400
-+++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs	2012-10-02 16:30:54.000000000 +0400
-@@ -274,7 +274,7 @@
- {#pointer AssistantPageFunc#}
- 
- foreign import ccall "wrapper" mkAssistantPageFunc ::
--  ({#type glong#} -> Ptr () -> IO {#type glong#})
-+  ({#type gint#} -> Ptr () -> IO {#type gint#})
-   -> IO AssistantPageFunc
- 
- -- | Sets the page type for @page@. The page type determines the page behavior
diff --git a/community-testing/haskell-gtk/gtk-gthread.h-include.patch b/community-testing/haskell-gtk/gtk-gthread.h-include.patch
deleted file mode 100644
index fc600d6be..000000000
--- a/community-testing/haskell-gtk/gtk-gthread.h-include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c
---- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~	2011-11-14 07:15:41.000000000 +0900
-+++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c	2012-01-08 14:58:45.849209318 +0900
-@@ -26,7 +26,8 @@
-  */
- 
- #include <glib.h>
--#include <glib/gthread.h>
-+/* f17 gives Error "Only <glib.h> can be included directly."
-+   #include <glib/gthread.h> */
- #include <gdk/gdk.h>
- #include "hsgthread.h"
- 
-
-Diff finished.  Sun Jan  8 14:58:54 2012
diff --git a/community-testing/haskell-gtk/gtk2hs-gtk.install b/community-testing/haskell-gtk/gtk2hs-gtk.install
deleted file mode 100644
index 7ed674b78..000000000
--- a/community-testing/haskell-gtk/gtk2hs-gtk.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-gtk
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-haskeline/PKGBUILD b/community-testing/haskell-haskeline/PKGBUILD
deleted file mode 100644
index 35cc7dc7e..000000000
--- a/community-testing/haskell-haskeline/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 77015 2012-10-03 15:24:22Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=haskeline
-pkgname=haskell-haskeline
-pkgver=0.7.0.3
-pkgrel=1
-pkgdesc="A command-line interface for user input, written in Haskell."
-url="http://hackage.haskell.org/package/haskeline"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-utf8-string=0.3.7-3' 'haskell-mtl=2.1.2-1' 'haskell-terminfo=0.3.2.5-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('3a78043dc80b5510202e71e77c0a9923')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure \
-      -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-haskeline/haskell-haskeline.install b/community-testing/haskell-haskeline/haskell-haskeline.install
deleted file mode 100644
index 27cb4a093..000000000
--- a/community-testing/haskell-haskeline/haskell-haskeline.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-haskeline
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-hslogger/PKGBUILD b/community-testing/haskell-hslogger/PKGBUILD
deleted file mode 100644
index 49a283786..000000000
--- a/community-testing/haskell-hslogger/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 77016 2012-10-03 15:24:27Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-hslogger
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="Versatile logging framework"
-url="http://hackage.haskell.org/package/hslogger"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
-md5sums=('e0737887b0df75a3781989c8f6689850')
-
-build() {
-  cd ${srcdir}/hslogger-${pkgver}
-  runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \
-	--enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \
-	--enable-library-profiling
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/hslogger-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/hslogger
-  runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-hslogger/haskell-hslogger.install b/community-testing/haskell-hslogger/haskell-hslogger.install
deleted file mode 100644
index 2a0d98ae7..000000000
--- a/community-testing/haskell-hslogger/haskell-hslogger.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-hslogger
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-html/PKGBUILD b/community-testing/haskell-html/PKGBUILD
deleted file mode 100644
index 8eb9fc6f4..000000000
--- a/community-testing/haskell-html/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=html
-pkgname=haskell-html
-pkgver=1.0.1.2
-pkgrel=12
-pkgdesc="HTML combinator library"
-url="http://hackage.haskell.org/package/html"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('2a7de5a2af9a2f80d39825d6a95ee445')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-html/haskell-html.install b/community-testing/haskell-html/haskell-html.install
deleted file mode 100644
index 768297e0a..000000000
--- a/community-testing/haskell-html/haskell-html.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-html
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-pango/PKGBUILD b/community-testing/haskell-pango/PKGBUILD
deleted file mode 100644
index b5b3f0f39..000000000
--- a/community-testing/haskell-pango/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 77018 2012-10-03 15:24:37Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=haskell-pango
-pkgver=0.12.3
-pkgrel=3
-pkgdesc="Binding to the pango library for Gtk2Hs."
-url="http://hackage.haskell.org/package/pango"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo')
-makedepends=("gtk2hs-buildtools")
-provides=('gtk2hs-pango')
-replaces=('gtk2hs-pango')
-conflicts=('gtk2hs-pango')
-options=('strip')
-install=gtk2hs-pango.install
-source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
-md5sums=('1ef3132cb569703d5b1bc262c9d86fe3')
-
-build() {
-  cd ${srcdir}/pango-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/haskell-pango \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  _ghcver=`pacman -Q ghc | cut -f2 -d\  | cut -f1 -d-`
-  _hglibver=`pacman -Q haskell-glib | cut -f2 -d\  | cut -f1 -d-`
-  _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\  | cut -f1 -d-`
-  depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}")
-
-  cd ${srcdir}/pango-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh
-  install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango
-  runhaskell Setup copy --destdir=${pkgdir}
-}
diff --git a/community-testing/haskell-pango/gtk2hs-pango.install b/community-testing/haskell-pango/gtk2hs-pango.install
deleted file mode 100644
index f2be2100f..000000000
--- a/community-testing/haskell-pango/gtk2hs-pango.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/gtk2hs-pango
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
deleted file mode 100644
index a25506e67..000000000
--- a/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 03:59:50 -0700
-Subject: [PATCH] update code to support extensible exceptions no longer being
- a part of ghc >= 7.6.1
-
----
- QuickCheck.cabal             | 6 +++++-
- Test/QuickCheck/Exception.hs | 6 ++++++
- 2 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/QuickCheck.cabal b/QuickCheck.cabal
-index 1a9126e..5afd6fb 100644
---- a/QuickCheck.cabal
-+++ b/QuickCheck.cabal
-@@ -60,9 +60,13 @@ library
-       Build-depends: ghc
- 
-   -- We want to use extensible-exceptions even if linking against base-3.
--  if impl(ghc >= 6.9)
-+  if impl(ghc >= 6.9) && impl(ghc < 7.6)
-     Build-depends: extensible-exceptions
- 
-+  -- GHC >= 7.6.1 no longer provides extensible exceptions
-+  if impl(ghc >= 7.6)
-+    cpp-options: -DNEW_EXCEPTIONS
-+
-   -- Modules that are always built.
-   Exposed-Modules:
-     Test.QuickCheck,
-diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs
-index f895351..d463195 100644
---- a/Test/QuickCheck/Exception.hs
-+++ b/Test/QuickCheck/Exception.hs
-@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where
- 
- #if defined(OLD_EXCEPTIONS)
- import Control.Exception(evaluate, try, Exception(..), throw)
-+#elif defined(NEW_EXCEPTIONS)
-+import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
-+#if defined(GHC_INTERRUPT)
-+  , AsyncException(UserInterrupt)
-+#endif
-+  )
- #else
- import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
- #if defined(GHC_INTERRUPT)
--- 
-1.7.12
-
diff --git a/community-testing/haskell-quickcheck/PKGBUILD b/community-testing/haskell-quickcheck/PKGBUILD
deleted file mode 100644
index e96121f81..000000000
--- a/community-testing/haskell-quickcheck/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-
-_hkgname=QuickCheck
-pkgname=haskell-quickcheck
-pkgver=2.5.1.1
-pkgrel=1
-pkgdesc="Automatic testing of Haskell programs"
-url="http://hackage.haskell.org/package/QuickCheck"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'haskell-random=1.0.1.1-3' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('2631b41c8b6e297b52622d1698387f09')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-quickcheck/haskell-quickcheck.install b/community-testing/haskell-quickcheck/haskell-quickcheck.install
deleted file mode 100644
index c9e12fadc..000000000
--- a/community-testing/haskell-quickcheck/haskell-quickcheck.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-quickcheck
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-regex-base/PKGBUILD b/community-testing/haskell-regex-base/PKGBUILD
deleted file mode 100644
index d4e951cc6..000000000
--- a/community-testing/haskell-regex-base/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-base
-pkgname=haskell-regex-base
-pkgver=0.93.2
-pkgrel=7
-pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa"
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-regex-base/haskell-regex-base.install b/community-testing/haskell-regex-base/haskell-regex-base.install
deleted file mode 100644
index 3ad2fea28..000000000
--- a/community-testing/haskell-regex-base/haskell-regex-base.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-base
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-regex-compat/PKGBUILD b/community-testing/haskell-regex-compat/PKGBUILD
deleted file mode 100644
index c546442ec..000000000
--- a/community-testing/haskell-regex-compat/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-compat
-pkgname=haskell-regex-compat
-pkgver=0.95.1
-pkgrel=3
-pkgdesc="Replaces and enhances Text.Regex"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7' 'haskell-regex-posix=0.95.2-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d0573ab4e2f3de5faa61380b67333320')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-regex-compat/haskell-regex-compat.install b/community-testing/haskell-regex-compat/haskell-regex-compat.install
deleted file mode 100644
index 898c0bba1..000000000
--- a/community-testing/haskell-regex-compat/haskell-regex-compat.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-compat
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-regex-posix/PKGBUILD b/community-testing/haskell-regex-posix/PKGBUILD
deleted file mode 100644
index 3c570e4d1..000000000
--- a/community-testing/haskell-regex-posix/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=regex-posix
-pkgname=haskell-regex-posix
-pkgver=0.95.2
-pkgrel=2
-pkgdesc="The posix regex backend for regex-base"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('1df0f9494aab110c7231f36393285c7c')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-regex-posix/haskell-regex-posix.install b/community-testing/haskell-regex-posix/haskell-regex-posix.install
deleted file mode 100644
index 2b89fae7b..000000000
--- a/community-testing/haskell-regex-posix/haskell-regex-posix.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-regex-posix
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-stm/PKGBUILD b/community-testing/haskell-stm/PKGBUILD
deleted file mode 100644
index fec52e949..000000000
--- a/community-testing/haskell-stm/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.5
-_hkgname=stm
-pkgname=haskell-stm
-pkgver=2.4
-pkgrel=1
-pkgdesc="A modular composable concurrency abstraction."
-url="http://hackage.haskell.org/package/stm"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('fe8ab1a8231202f1748da53454cf55fc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-$pkgver
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-stm/haskell-stm.install b/community-testing/haskell-stm/haskell-stm.install
deleted file mode 100644
index 0283c2fc5..000000000
--- a/community-testing/haskell-stm/haskell-stm.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-stm
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-syb/PKGBUILD b/community-testing/haskell-syb/PKGBUILD
deleted file mode 100644
index a2595bf2c..000000000
--- a/community-testing/haskell-syb/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-_hkgname=syb
-pkgname=haskell-syb
-pkgver=0.3.7
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' sh)
-options=('strip')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('fa653976a4ee43918cc7546089f94b60')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname}
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/community-testing/haskell-syb/haskell-syb.install b/community-testing/haskell-syb/haskell-syb.install
deleted file mode 100644
index 080055165..000000000
--- a/community-testing/haskell-syb/haskell-syb.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-syb
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
deleted file mode 100644
index b8c2264bc..000000000
--- a/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 11 Sep 2012 06:24:09 -0700
-Subject: [PATCH] update changed time code for ghc 7.6.1
-
----
- Codec/Archive/Tar/Pack.hs | 9 +++++----
- tar.cabal                 | 2 +-
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
-index 8e43091..0af6103 100644
---- a/Codec/Archive/Tar/Pack.hs
-+++ b/Codec/Archive/Tar/Pack.hs
-@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native
- import System.Directory
-          ( getDirectoryContents, doesDirectoryExist, getModificationTime
-          , Permissions(..), getPermissions )
--import System.Time
--         ( ClockTime(..) )
-+import Data.Time.Clock.POSIX
-+         ( utcTimeToPOSIXSeconds )
- import System.IO
-          ( IOMode(ReadMode), openBinaryFile, hFileSize )
- import System.IO.Unsafe (unsafeInterleaveIO)
-@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do
- 
- getModTime :: FilePath -> IO EpochTime
- getModTime path = do
--  (TOD s _) <- getModificationTime path
--  return $! fromIntegral s
-+  utcTime <- getModificationTime path
-+  let s = truncate . utcTimeToPOSIXSeconds $ utcTime
-+  return $! s
-diff --git a/tar.cabal b/tar.cabal
-index e748b07..d85b0da 100644
---- a/tar.cabal
-+++ b/tar.cabal
-@@ -25,7 +25,7 @@ source-repository head
- 
- library
-   build-depends: base >= 3 && < 5, filepath,
--                 directory, old-time, bytestring
-+                 directory, bytestring, time
- 
-   exposed-modules:
-     Codec.Archive.Tar
--- 
-1.7.12
-
diff --git a/community-testing/haskell-tar/PKGBUILD b/community-testing/haskell-tar/PKGBUILD
deleted file mode 100644
index ab2f5f8f4..000000000
--- a/community-testing/haskell-tar/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 77025 2012-10-03 15:25:16Z tdziedzic $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=haskell-tar
-pkgver=0.4.0.0
-pkgrel=3
-pkgdesc="Reading, writing and manipulating \".tar\" archive files."
-url="http://hackage.haskell.org/package/tar"
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.6.1-1')
-source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz"
-        '0001-update-changed-time-code-for-ghc-7.6.1.patch')
-install=haskell-tar.install
-sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113'
-            '17b8afc519db5bed5d89807e6e659788f5d9c2f5c569150a9d1c6faac52e98e6')
-
-build() {
-  cd "$srcdir/tar-$pkgver"
-
-  # time functions have changed in ghc 7.6.1
-  patch -Np1 -i ${srcdir}/0001-update-changed-time-code-for-ghc-7.6.1.patch
-
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir="/usr/share/doc/$pkgname" \
-    --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/tar-$pkgver"
-
-  install -Dm 744 register.sh \
-	  "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m 744 unregister.sh \
-	  "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-	  "$pkgdir/usr/share/doc/ghc/html/libraries/tar"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-tar/haskell-tar.install b/community-testing/haskell-tar/haskell-tar.install
deleted file mode 100644
index 7e0383621..000000000
--- a/community-testing/haskell-tar/haskell-tar.install
+++ /dev/null
@@ -1,24 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-tar
-
-post_install() {
-  ${HS_DIR}/register.sh
-	post_remove
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	pre_upgrade
-}
-
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-terminfo/PKGBUILD b/community-testing/haskell-terminfo/PKGBUILD
deleted file mode 100644
index 5ae271a8c..000000000
--- a/community-testing/haskell-terminfo/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 77026 2012-10-03 15:25:21Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=terminfo
-pkgname=haskell-terminfo
-pkgver=0.3.2.5
-pkgrel=1
-pkgdesc="Haskell bindings to the terminfo library."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-terminfo/haskell-terminfo.install b/community-testing/haskell-terminfo/haskell-terminfo.install
deleted file mode 100644
index 40d39f42b..000000000
--- a/community-testing/haskell-terminfo/haskell-terminfo.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-terminfo
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-utf8-string/PKGBUILD b/community-testing/haskell-utf8-string/PKGBUILD
deleted file mode 100644
index c9bb3acfd..000000000
--- a/community-testing/haskell-utf8-string/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 77027 2012-10-03 15:25:26Z tdziedzic $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-_hkgname=utf8-string
-pkgname=haskell-utf8-string
-pkgver=0.3.7
-pkgrel=3
-pkgdesc="Support for reading and writing UTF8 Strings"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-install=${pkgname}.install
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-md5sums=('50e5c395713e716e0e4a56da73f87ccd')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-utf8-string/haskell-utf8-string.install b/community-testing/haskell-utf8-string/haskell-utf8-string.install
deleted file mode 100644
index 0f64366b2..000000000
--- a/community-testing/haskell-utf8-string/haskell-utf8-string.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-utf8-string
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-x11-xft/PKGBUILD b/community-testing/haskell-x11-xft/PKGBUILD
deleted file mode 100644
index 5f2e744e6..000000000
--- a/community-testing/haskell-x11-xft/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 77029 2012-10-03 15:25:36Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-_hkgname=X11-xft
-pkgname=haskell-x11-xft
-pkgver=0.3.1
-pkgrel=5
-pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('LGPL')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-utf8-string=0.3.7' 'libxft')
-options=('strip')
-install=haskell-x11-xft.install
-source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz)
-md5sums=('ad885150a59f63de328e73abe5ffc79e')
-
-build() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-    --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup haddock
-  runhaskell Setup register   --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd ${srcdir}/${_hkgname}-${pkgver}
-  install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-  install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-  install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-  ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-  runhaskell Setup copy --destdir=${pkgdir}
-  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-  rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-x11-xft/haskell-x11-xft.install b/community-testing/haskell-x11-xft/haskell-x11-xft.install
deleted file mode 100644
index a0ff8dac8..000000000
--- a/community-testing/haskell-x11-xft/haskell-x11-xft.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=/usr/share/haskell/haskell-x11-xft
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-x11/PKGBUILD b/community-testing/haskell-x11/PKGBUILD
deleted file mode 100644
index 209ccbe86..000000000
--- a/community-testing/haskell-x11/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 77028 2012-10-03 15:25:31Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: shild <sxp@bk.ru>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-
-_hkgname=X11
-pkgname=haskell-x11
-pkgver=1.6.0.2
-pkgrel=1
-pkgdesc="A Haskell binding to the X11 graphics library."
-arch=(i686 x86_64)
-url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11"
-license=('custom:BSD3')
-options=('strip')
-depends=("ghc=7.6.1-1" "haskell-syb=0.3.7" 'libx11' 'libxinerama' 'libxrandr')
-conflicts=(haskell-x11-extras)
-install=hsmod.install
-source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz)
-md5sums=('0227ba7a8788c3cfd146e952a5fafc82')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/community-testing/haskell-x11/hsmod.install b/community-testing/haskell-x11/hsmod.install
deleted file mode 100644
index 45c23b979..000000000
--- a/community-testing/haskell-x11/hsmod.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-x11
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/haskell-xhtml/PKGBUILD b/community-testing/haskell-xhtml/PKGBUILD
deleted file mode 100644
index 7ccfca159..000000000
--- a/community-testing/haskell-xhtml/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Contributor: Alexander Rødseth <rodseth@gmail.com>
-
-_hkgname=xhtml
-pkgname=haskell-xhtml
-pkgver=3000.2.1
-pkgrel=2
-pkgdesc='Combinators for producing XHTML 1.0'
-url='http://hackage.haskell.org/package/xhtml'
-license=('custom:BSD3')
-arch=('x86_64' 'i686')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz")
-install=$pkgname.install
-sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8')
-
-build() {
-    cd "$srcdir/$_hkgname-$pkgver"
-
-    runhaskell Setup configure -O -p \
-      --enable-split-objs \
-      --enable-shared \
-      --prefix=/usr \
-      --docdir="/usr/share/doc/$pkgname" \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd "$srcdir/$_hkgname-$pkgver"
-  
-  install -Dm744 register.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/register.sh"
-  install -m744 unregister.sh \
-    "$pkgdir/usr/share/haskell/$pkgname/unregister.sh"
-  install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries"
-  ln -s "/usr/share/doc/$pkgname/html" \
-    "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname"
-  runhaskell Setup copy --destdir="$pkgdir"
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/haskell-xhtml/haskell-xhtml.install b/community-testing/haskell-xhtml/haskell-xhtml.install
deleted file mode 100644
index d03b8a053..000000000
--- a/community-testing/haskell-xhtml/haskell-xhtml.install
+++ /dev/null
@@ -1,19 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-xhtml
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh &> /dev/null
-  exit 0
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/community-testing/hedgewars/PKGBUILD b/community-testing/hedgewars/PKGBUILD
deleted file mode 100644
index 1eeee372a..000000000
--- a/community-testing/hedgewars/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 77031 2012-10-03 15:25:48Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=hedgewars
-pkgver=0.9.17
-pkgrel=5
-pkgdesc="Free Worms-like turn based strategy game"
-arch=('i686' 'x86_64')
-url="http://hedgewars.org"
-license=('GPL' 'custom')
-depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
-makedepends=('fpc' 'cmake'
-	     # haskell specific
-	     'ghc'
-	     'haskell-network' 'haskell-bytestring-show'
-	     'haskell-utf8-string' 'haskell-dataenc'
-	     'haskell-hslogger')
-source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.desktop
-	hedgewars.png)
-md5sums=('77c0bc4bc664604adbba67fab606d8f1'
-         '48c66a3204d4fa0a69e9aa46f7c31e0c'
-         'eeb14d50df39063549ac5eca9dbc65d1')
-
-build() {
-  cd $pkgname-src-$pkgver
-
-#  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
-  sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATA_INSTALL_DIR=/usr/share \
-	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
-	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
-	-DWITH_SERVER=1 .
-
-  make
-}
-
-package() {
-  cd $pkgname-src-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
-  install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
-  install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
-}
diff --git a/community-testing/hedgewars/hedgewars.desktop b/community-testing/hedgewars/hedgewars.desktop
deleted file mode 100644
index 9d74ed3f1..000000000
--- a/community-testing/hedgewars/hedgewars.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hedgewars
-GenericName=Platform Game
-Comment=Worms style game
-Exec=hedgewars
-Icon=hedgewars
-Categories=Game;ArcadeGame;
\ No newline at end of file
diff --git a/community-testing/hedgewars/hedgewars.png b/community-testing/hedgewars/hedgewars.png
deleted file mode 100644
index 60ae66199..000000000
--- a/community-testing/hedgewars/hedgewars.png
+++ /dev/null
diff --git a/community-testing/homebank/PKGBUILD b/community-testing/homebank/PKGBUILD
deleted file mode 100644
index 3ddacc089..000000000
--- a/community-testing/homebank/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 74951 2012-08-10 05:04:47Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=homebank
-pkgver=4.4
-pkgrel=3
-pkgdesc="Free, easy, personal accounting for everyone"
-arch=('i686' 'x86_64')
-url="http://homebank.free.fr/"
-license=('GPL')
-depends=('desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'libofx' 'librsvg' 'perlxml' 'shared-mime-info')
-makedepends=('intltool')
-install=$pkgname.install
-source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz)
-sha256sums=('13b89373575e3ac229d2683aa7296778ad7cdae1a7a019c9124a1d5b23dce7d2')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/homebank/homebank.install b/community-testing/homebank/homebank.install
deleted file mode 100644
index 3c862f44b..000000000
--- a/community-testing/homebank/homebank.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/ibus/PKGBUILD b/community-testing/ibus/PKGBUILD
deleted file mode 100644
index 63dd39df2..000000000
--- a/community-testing/ibus/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 78054 2012-10-16 11:51:03Z allan $
-# Contributor: Rainy <rainylau(at)gmail(dot)com>
-# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=ibus
-pkgver=1.4.2
-pkgrel=2
-pkgdesc="Next Generation Input Bus for Linux"
-arch=('i686' 'x86_64')
-url="http://ibus.googlecode.com"
-license=('LGPL')
-depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \
-         'iso-codes' 'librsvg' 'python2-notify' 'hicolor-icon-theme')
-makedepends=('intltool' 'gobject-introspection')
-optdepends=('notification-daemon')
-options=('!libtool')
-install=ibus.install
-source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('a2d11d8bb64761691df918e9e50f0b35c711760d')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  export PYTHON=python2
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus \
-    --sysconfdir=/etc \
-    --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
-    --enable-gtk3
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  install -d "${pkgdir}/etc/xdg/autostart"
-  ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop"
-}
diff --git a/community-testing/ibus/ibus.install b/community-testing/ibus/ibus.install
deleted file mode 100644
index f44e3be1d..000000000
--- a/community-testing/ibus/ibus.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-
-    gconfpkg --install ibus
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    # update for gkt3
-    gtk-query-immodules-3.0 --update-cache 
-}
-
-pre_upgrade() {
-    pre_remove $1
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    gconfpkg --uninstall ibus
-}
-
-post_remove() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    # update for gkt3
-    gtk-query-immodules-3.0 --update-cache 
-}
diff --git a/community-testing/ifuse/PKGBUILD b/community-testing/ifuse/PKGBUILD
deleted file mode 100644
index 7dd5e5bdf..000000000
--- a/community-testing/ifuse/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 74531 2012-07-29 23:18:52Z tomegun $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=ifuse
-pkgver=1.1.2
-pkgrel=2
-pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
-url='http://libimobiledevice.org/'
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-depends=('libimobiledevice' 'fuse')
-source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4152526b2ac3c505cb41797d997be14d')
-
-build() {
-  cd "${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/jack2/40-hpet-permissions.rules b/community-testing/jack2/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9..000000000
--- a/community-testing/jack2/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/community-testing/jack2/99-audio.conf b/community-testing/jack2/99-audio.conf
deleted file mode 100644
index eb76ef920..000000000
--- a/community-testing/jack2/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/community-testing/jack2/PKGBUILD b/community-testing/jack2/PKGBUILD
deleted file mode 100644
index dd3ab36e0..000000000
--- a/community-testing/jack2/PKGBUILD
+++ /dev/null
@@ -1,135 +0,0 @@
-# $Id: PKGBUILD 76735 2012-09-28 16:17:58Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Daniele Paolella <danielepaolella@email.it>
-# Contributor: Philipp Überbacher <hollunder at gmx dot at>
-# Contributor: Thomas Bahn <thomas-bahn at gmx dot net>
-
-pkgbase=jack2
-pkgname=('jack2' 'jack2-dbus')
-#pkgname= # single build (overrides split)
-_tarname=jack
-pkgver=1.9.8
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-audio.conf)
-license=('GPL')
-makedepends=('python2' 'doxygen' 'libffado'
-             'libsamplerate' 'dbus-core' 'celt')
-source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz"
-        '99-audio.conf'
-        '40-hpet-permissions.rules'
-        'ffado_setbuffsize-jack2.patch')
-md5sums=('1dd2ff054cab79dfc11d134756f27165'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef'
-         '1502d82fe2276d6f224fff6467a0b6f9')
-
-_pyfix() {
-  sed -i 's:bin/env python:bin/env python2:' \
-    "$pkgdir/usr/bin/jack_control"
-}
-
-_wafconf() {
-  python2 waf configure --prefix=/usr \
-                        --alsa \
-                        --firewire \
-                        --doxygen $@
-}
-
-_isbuild() {
-  printf "%s\n" ${pkgname[@]} | grep -qx $1
-}
-
-build() {
-  cd "$srcdir/$_tarname-$pkgver"
-
-  # backport firewire stuff
-  #   - needed for setbuffsize feature in latest stable ffado
-  # from https://github.com/jackaudio/jack2/commit/96e0251
-  (
-  cd $_tarname-$pkgver
-  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch"
-  )
-
-  # Some optimisation bug exists for current GCC
-  # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
-  export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
-  export CXXFLAGS="$CFLAGS"
-
-  # 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; 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; then
-    cd $_tarname-dbus-$pkgver
-    msg2 "Running D-Bus-only build"
-    _wafconf --dbus
-    python2 waf build $MAKEFLAGS
-    cd ..
-  fi
-}
-
-package_jack2() {
-  ! _isbuild jack2 && return 0
-
-  pkgdesc="The next-generation JACK with SMP support"
-  depends=('libsamplerate' 'celt')
-  optdepends=('libffado: FireWire support'
-              'dbus-core: jackdbus'
-              'python2: jack_control')
-  conflicts=('jack')
-  provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
-
-  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/usr/lib/udev/rules.d/40-hpet-permissions.rules"
-}
-
-package_jack2-dbus() {
-  ! _isbuild jack2-dbus && return 0
-
-  pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
-  depends=('libsamplerate' 'celt' 'dbus-core')
-  optdepends=('libffado: FireWire support'
-              'python2: jack_control')
-  conflicts=('jack' 'jack2')
-  provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
-
-  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/usr/lib/udev/rules.d/40-hpet-permissions.rules"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/jack2/ffado_setbuffsize-jack2.patch b/community-testing/jack2/ffado_setbuffsize-jack2.patch
deleted file mode 100644
index 0c74aad24..000000000
--- a/community-testing/jack2/ffado_setbuffsize-jack2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
-Date: Sat, 17 Mar 2012 22:36:30 +0100
-Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size
-
-This is a port of Jonathan Woithe's patch from jackd1.
-With sufficiently recent versions of FFADO, it allows to change
-the buffersize at runtime.
----
- linux/firewire/JackFFADODriver.cpp |   65 ++++++++++++++++++++++++++++++++----
- linux/firewire/JackFFADODriver.h   |    6 ++++
- 2 files changed, 65 insertions(+), 6 deletions(-)
-
-diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
-index b33e1cd..085b78a 100644
---- a/linux/firewire/JackFFADODriver.cpp
-+++ b/linux/firewire/JackFFADODriver.cpp
-@@ -3,6 +3,7 @@
- Copyright (C) 2004 Grame
- Copyright (C) 2007 Pieter Palmers
- Copyright (C) 2009 Devin Anderson
-+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
- 
- 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
-@@ -48,7 +49,10 @@
- namespace Jack
- {
- 
-+// Basic functionality requires API version 8.  If version 9 or later
-+// is present the buffers can be resized at runtime.
- #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
-+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
- 
- #define jack_get_microseconds GetMicroSeconds
- 
-@@ -281,19 +285,68 @@
- int
- JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
- {
--    printError("Buffer size change requested but not supported!!!");
-+    ffado_driver_t* driver = (ffado_driver_t*)fDriver;
-+    signed int chn;
-+
-+    // The speed of this function isn't critical; we can afford the
-+    // time to check the FFADO API version.
-+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
-+		    ffado_streaming_set_period_size == NULL) {
-+	    printError("unsupported on current version of FFADO; please upgrade FFADO");
-+	    return -1;
-+    }
- 
--    /*
-     driver->period_size = nframes;
-     driver->period_usecs =
-             (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
-                                  * 1000000.0f);
--    */
-+
-+
-+    // Reallocate the null and scratch buffers.
-+    driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+    if(driver->nullbuffer == NULL) {
-+	    printError("could not allocate memory for null buffer");
-+	    return -1;
-+    }
-+    driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+    if(driver->scratchbuffer == NULL) {
-+	    printError("could not allocate memory for scratch buffer");
-+	    return -1;
-+    }
-+
-+    // MIDI buffers need reallocating
-+    for (chn = 0; chn < driver->capture_nchannels; chn++) {
-+	    if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-+		    // setup the midi buffer
-+		    if (driver->capture_channels[chn].midi_buffer != NULL)
-+			    free(driver->capture_channels[chn].midi_buffer);
-+		    driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+	    }
-+    }
-+    for (chn = 0; chn < driver->playback_nchannels; chn++) {
-+	    if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-+		    if (driver->playback_channels[chn].midi_buffer != NULL)
-+			    free(driver->playback_channels[chn].midi_buffer);
-+		    driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+	    }
-+    }
-+
-+    // Notify FFADO of the period size change
-+    if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
-+	    printError("could not alter FFADO device period size");
-+	    return -1;
-+    }
-+
-+    // This is needed to give the shadow variables a chance to
-+    // properly update to the changes.
-+    sleep(1);
- 
-     /* tell the engine to change its buffer size */
--    //driver->engine->set_buffer_size (driver->engine, nframes);
-+    JackAudioDriver::SetBufferSize(nframes);  // Generic change, never fails
- 
--    return -1; // unsupported
-+    UpdateLatencies();
-+
-+    return 0;
- }
- 
- typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-@@ -306,7 +359,7 @@
- 
-     assert(params);
- 
--    if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-         printError("Incompatible libffado version! (%s)", ffado_get_version());
-         return NULL;
-     }
-diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h
-index cb2a45d..790f4dd 100644
---- a/linux/firewire/JackFFADODriver.h
-+++ b/linux/firewire/JackFFADODriver.h
-@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
-         int Read();
-         int Write();
- 
-+        // BufferSize can be changed
-+        bool IsFixedBufferSize()
-+        {
-+            return false;
-+        }
-+
-         int SetBufferSize(jack_nframes_t nframes);
- };
- 
--- 
-1.7.10
-
diff --git a/community-testing/kaudiocreator/PKGBUILD b/community-testing/kaudiocreator/PKGBUILD
deleted file mode 100644
index 006ded8ca..000000000
--- a/community-testing/kaudiocreator/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 74662 2012-08-01 16:34:40Z andrea $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=kaudiocreator
-pkgver=1.3
-pkgrel=3
-pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk"
-arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php/KAudioCreator?content=107645"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'taglib' 'libdiscid')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://www.kde-apps.org/CONTENT/content-files/107645-${pkgname}-${pkgver}.tar.bz2")
-md5sums=('6adce848d3cdc9d80a52d35144890c86')
-
-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/community-testing/kaudiocreator/kaudiocreator.install b/community-testing/kaudiocreator/kaudiocreator.install
deleted file mode 100644
index e70c054ec..000000000
--- a/community-testing/kaudiocreator/kaudiocreator.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-testing/kdenlive/PKGBUILD b/community-testing/kdenlive/PKGBUILD
deleted file mode 100644
index 4e2c23a93..000000000
--- a/community-testing/kdenlive/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 77295 2012-10-08 15:05:15Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Zuf <kontakt.zuf@gmail.com>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-
-pkgname=kdenlive
-pkgver=0.9.2
-pkgrel=4
-pkgdesc="A non-linear video editor for Linux"
-arch=('i686' 'x86_64')
-# http://download.kde.org/stable/kdenlive/
-url="http://www.kdenlive.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz'
-	 'libqzeitgeist')
-makedepends=('automoc4' 'cmake' 'gettext' 'mesa' 'glu')
-optdepends=('recordmydesktop'
-	    'dvdauthor'
-	    'mkisolinux'
-	    'xine-ui')
-install=kdenlive.install
-options=('docs')
-source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2)
-md5sums=('40f108f26e2c2e08807a1c183d8764ec')
-
-build() {
-  export LDFLAGS="$LDFLAGS -lX11"
-  cd "${srcdir}"
-  mkdir -p build
-  cd build
-  cmake ../kdenlive-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=/usr/lib \
-    -DLINK_LIBRARIES=-lX11
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/kdenlive/kdenlive.install b/community-testing/kdenlive/kdenlive.install
deleted file mode 100644
index a3489ee9d..000000000
--- a/community-testing/kdenlive/kdenlive.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/kid3/PKGBUILD b/community-testing/kid3/PKGBUILD
deleted file mode 100644
index 4621218d0..000000000
--- a/community-testing/kid3/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 73331 2012-07-06 15:22:55Z ibiru $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Alois Nespor <alois.nespor@gmail.com>
-
-pkgname=kid3
-pkgver=2.1
-pkgrel=4
-pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
-arch=('i686' 'x86_64')
-url="http://kid3.sourceforge.net/"
-license=('GPL')
-depends=('chromaprint' 'id3lib' 'taglib' 'kdebase-runtime')
-makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl')
-options=('!makeflags')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'ffmpeg-0.11.diff')
-sha256sums=('8925bde1a773d767ee9695229e65dfd64dc13edf850294560478f2e02ecc6225'
-            '76ab3c119817a0e1f26e368afb757488c3865ff634771d4d176e729492991a54')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  # fix error building with latest ffmpeg
-  # http://kid3.git.sourceforge.net/git/gitweb.cgi?p=kid3/kid3;a=commit;h=2a91bff2810281e58948f478e9396c73e5c6154a
-  patch -Np1 -i ${srcdir}/ffmpeg-0.11.diff
-
-  cd ${srcdir}
-
-  mkdir build
-  cd build
-
-  cmake \
-    ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-
-  make
-}
-
-package() {
-  cd build
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/kid3/ffmpeg-0.11.diff b/community-testing/kid3/ffmpeg-0.11.diff
deleted file mode 100644
index 349ca4b3d..000000000
--- a/community-testing/kid3/ffmpeg-0.11.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2a91bff2810281e58948f478e9396c73e5c6154a Mon Sep 17 00:00:00 2001
-From: Urs Fleisch <ufleisch@users.sourceforge.net>
-Date: Mon, 4 Jun 2012 15:23:36 +0200
-Subject: [PATCH 1/1] Support building with ffmpeg-0.11.
-
----
- src/core/import/fingerprintcalculator.cpp |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/core/import/fingerprintcalculator.cpp b/src/core/import/fingerprintcalculator.cpp
-index 05158ae..6ac632c 100644
---- a/src/core/import/fingerprintcalculator.cpp
-+++ b/src/core/import/fingerprintcalculator.cpp
-@@ -218,7 +218,7 @@ public:
-   }
- 
-   bool createForCodec(const Codec& codecCtx) {
--    m_ptr = ::av_audio_convert_alloc(SAMPLE_FMT_S16, codecCtx.channels(),
-+    m_ptr = ::av_audio_convert_alloc(AV_SAMPLE_FMT_S16, codecCtx.channels(),
-                  codecCtx.sampleFormat(), codecCtx.channels(), 0, 0);
-     return m_ptr != 0;
-   }
-@@ -342,7 +342,7 @@ FingerprintCalculator::Result::Error FingerprintCalculator::decodeAudioFile(
-     return Result::NoCodecFound;
- 
-   Converter converter;
--  if (codec.sampleFormat() != SAMPLE_FMT_S16) {
-+  if (codec.sampleFormat() != AV_SAMPLE_FMT_S16) {
-     if (!converter.createForCodec(codec))
-       return Result::NoConverterFound;
-   }
--- 
-1.7.4.1
-
diff --git a/community-testing/kid3/kid3.changelog b/community-testing/kid3/kid3.changelog
deleted file mode 100644
index 8c440c611..000000000
--- a/community-testing/kid3/kid3.changelog
+++ /dev/null
@@ -1,29 +0,0 @@
-2012-05-12 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kid3 2.1-1
-
-2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kid3 2.0.1-1
-
-2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kid3 2.0-1
-
-2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kid3 1.6
-
-2010-09-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.5
-
-2010-03-13 Andrea Scarpino <andrea@archlinux.org>
-	* Update to major release v1.4
-	* MP4V2 enabled
-	* Cleanup dependencies
-
-2010-01-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.3
-	* MP4V2 disabled, package in [extra] needs to be updated to be used with kid3
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.2
-
-2008-10-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.1
diff --git a/community-testing/kid3/kid3.install b/community-testing/kid3/kid3.install
deleted file mode 100644
index 8ec315e7c..000000000
--- a/community-testing/kid3/kid3.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 $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/kmymoney/PKGBUILD b/community-testing/kmymoney/PKGBUILD
deleted file mode 100644
index 537bb2420..000000000
--- a/community-testing/kmymoney/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 74952 2012-08-10 05:04:54Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Vamp898 <vamp898@web.de>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Todd Maynard <arch@toddmaynard.com>
-
-pkgname=kmymoney
-pkgver=4.6.2
-pkgrel=2
-pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
-arch=('i686' 'x86_64')
-url="http://kmymoney2.sourceforge.net/"
-license=('GPL')
-depends=('kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost')
-replaces=('kmymoney2')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2
-qt4.8.patch::https://projects.kde.org/projects/extragear/office/kmymoney/repository/revisions/c736b6f08e77df72d58c5b836b7b04f6098737df/diff/libkdchart/src/KDChartBackgroundAttributes.cpp?format=diff)
-sha256sums=('add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75'
-            '7612b490400dbd4f80ff27bd328f8603a22279c81bb3004e53f48545dbd359ae')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Qt 4.8 fix - fixed upstream
-  patch -Np1 -i ../qt4.8.patch
-
-  mkdir build
-  cd build
-
-  cmake ../ \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES
-  make VERBOSE=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/kmymoney/kmymoney.changelog b/community-testing/kmymoney/kmymoney.changelog
deleted file mode 100644
index 6943a0716..000000000
--- a/community-testing/kmymoney/kmymoney.changelog
+++ /dev/null
@@ -1,29 +0,0 @@
-2012-08-09  Eric Belanger  <eric@archlinux.org>
-        * kmymoney 4.6.2-2
-	* Rebuild against libofx 0.9.5
-
-2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kmymoney 4.5.3
-
-2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kmymoney 4.5.2
-
-2010-10-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* kmymoney 4.5.1
-	* Added aqbanking dependency
-
-2010-08-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 4.5
-	* Package renamed to 'kmymoney'
-
-2010-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.0.5
-
-2010-04-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.0.4
-
-2010-04-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* FS#18974 broken OFX imported fixed in 1.0.3-2
-
-2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 1.0.3
diff --git a/community-testing/kmymoney/kmymoney.install b/community-testing/kmymoney/kmymoney.install
deleted file mode 100644
index f7f5bd0bf..000000000
--- a/community-testing/kmymoney/kmymoney.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-testing/kphotoalbum/PKGBUILD b/community-testing/kphotoalbum/PKGBUILD
deleted file mode 100644
index 52fc9551e..000000000
--- a/community-testing/kphotoalbum/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 74736 2012-08-02 15:33:12Z andrea $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
-# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com>
-# Contributor: chfoxli <lg ][ romandie ? com>
-
-pkgname=kphotoalbum
-pkgver=4.2
-pkgrel=4
-pkgdesc="KDE Photo Album, picture collection manager"
-url="http://www.kphotoalbum.org/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('kdebase-runtime' 'libkipi' 'libkdcraw')
-makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs')
-optdepends=('kdeedu-marble: integration with Marble'
-	'kipi-plugins: add extra functionality'
-	'kdemultimedia-mplayerthumbs: video thumbnails')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7cb484089477f3633657b67ce59b85f2')
-
-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/community-testing/kphotoalbum/kphotoalbum.install b/community-testing/kphotoalbum/kphotoalbum.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/community-testing/kphotoalbum/kphotoalbum.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/community-testing/krename/PKGBUILD b/community-testing/krename/PKGBUILD
deleted file mode 100644
index 50394605a..000000000
--- a/community-testing/krename/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 74730 2012-08-02 15:23:48Z andrea $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=krename
-pkgver=4.0.9
-pkgrel=2
-pkgdesc="A very powerfull batch file renamer for KDE"
-arch=('i686' 'x86_64')
-url="http://www.krename.net"
-license=('GPL')
-depends=('kdebase-runtime' 'taglib')
-makedepends=('cmake' 'automoc4')
-options=('libtool')
-install=krename.install
-source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('03886a385a16de4c9bc285d25b9816ea97768c9e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/krename/krename.install b/community-testing/krename/krename.install
deleted file mode 100644
index 1c0de2e4f..000000000
--- a/community-testing/krename/krename.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/ktoblzcheck/PKGBUILD b/community-testing/ktoblzcheck/PKGBUILD
deleted file mode 100644
index da749e7bd..000000000
--- a/community-testing/ktoblzcheck/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 78059 2012-10-16 11:51:20Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
-
-pkgname=ktoblzcheck
-pkgver=1.39
-pkgrel=3
-pkgdesc="A library to check account numbers and bank codes of German banks"
-arch=(i686 x86_64)
-url="http://ktoblzcheck.sourceforge.net"
-options=('!libtool')
-license=("LGPL")
-depends=('gcc-libs' 'python')
-optdepends=('perl')
-source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz
-	ktoblzcheck-python3.patch)
-md5sums=('ef5efd6e2c31aaf6405060ec477c200c'
-         'a81a697bb3aaeffb7fac0ad7d9166e3f')
-
-build() {
-  cd "$srcdir/ktoblzcheck-$pkgver"
-  ./configure --prefix=/usr
-  patch -p1 <$srcdir/ktoblzcheck-python3.patch
-  make
-}
-
-package() {
-  cd "$srcdir/ktoblzcheck-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/ktoblzcheck/ktoblzcheck-python3.patch b/community-testing/ktoblzcheck/ktoblzcheck-python3.patch
deleted file mode 100644
index 5bfc53275..000000000
--- a/community-testing/ktoblzcheck/ktoblzcheck-python3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -ur ktoblzcheck-1.28/src/python/ktoblzcheck.py ktoblzcheck-1.28.my/src/python/ktoblzcheck.py
---- ktoblzcheck-1.28/src/python/ktoblzcheck.py	2008-08-12 16:48:54.000000000 +0000
-+++ ktoblzcheck-1.28.my/src/python/ktoblzcheck.py	2010-09-20 09:08:36.000000000 +0000
-@@ -197,35 +197,35 @@
- 
- def test():
-     a = AccountNumberCheck()
--    print 'Number of Banks:', a.bankCount
--    print 'find 20010020:', a.findBank('20010020')
--    print 'find 20010033:', a.findBank('20010033')
--    print 'check 20070024/9291394:', a.check('20070024','9291394')
--    print 'check 20070024/9291394:', a.check('20070024','9291394023')
--    print
-+    print('Number of Banks:', a.bankCount)
-+    print('find 20010020:', a.findBank('20010020'))
-+    print('find 20010033:', a.findBank('20010033'))
-+    print('check 20070024/9291394:', a.check('20070024','9291394'))
-+    print('check 20070024/9291394:', a.check('20070024','9291394023'))
-+    print()
-     ck = IbanCheck()
-     if not kto.IbanCheck_selftest(ck):  # not publicly defined
--	print "Self-Test failed!"
-+        print("Self-Test failed!")
- 	raise SystemExit
-     s = " iban fr14 2004 1010 0505 0001 3m02 606"
--    print "test for iban    :", s
-+    print("test for iban    :", s)
-     iban = Iban(s)
--    print "transmission form:", iban.transmissionForm()
-+    print("transmission form:", iban.transmissionForm())
-     res = ck.check(iban)
--    print "check result     :", res, "("+IbanCheck.resultText(res)+")"
--    print "printable form   :", iban.printableForm()
--    print
--    print "expect bad checksum:"
-+    print("check result     :", res, "("+IbanCheck.resultText(res)+")")
-+    print("printable form   :", iban.printableForm())
-+    print()
-+    print("expect bad checksum:")
-     s = "FR1420041010050500013X02606"
-     res = ck.check(s)
--    print s + ":", res, "("+IbanCheck.resultText(res)+")"
--    print
-+    print(s + ":", res, "("+IbanCheck.resultText(res)+")")
-+    print()
-     s = "IBAN DE66 2007 0024 0929 1394 00"
--    print s
-+    print(s)
-     s = Iban(s).transmissionForm()
-     start, end = ck.bic_position(s)
--    print "prefix, checksum, BIC, account:"
--    print ', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0')))
-+    print("prefix, checksum, BIC, account:")
-+    print(', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0'))))
- 
- 
- if __name__ == '__main__':
diff --git a/community-testing/libextractor/PKGBUILD b/community-testing/libextractor/PKGBUILD
deleted file mode 100644
index 1e9d064e7..000000000
--- a/community-testing/libextractor/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78475 2012-10-19 13:29:52Z bluewind $
-# Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=libextractor
-pkgver=0.6.3
-pkgrel=8
-pkgdesc="A library used to extract meta-data from files of arbitrary type"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://gnunet.org/libextractor/"
-depends=('libltdl')
-makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2')
-optdepends=('flac: flac support'
-	    'poppler: pdf support'
-	    'exiv2: metadata support'
-	    'qt: the Qt GUI interface/thumbnails'
-	    'gtk2: gtk2 GUI interface/thumbnails'
-	    'libgsf: (optional) for ODF support'
-	    'libmpeg2: mpeg support'
-	    'libvorbis: ogg/vorbis support')
-options=('!libtool' '!makeflags')
-install=libextractor.install
-source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('7004ff6be06e400050f0ad7016140981'
-         '81f95c31831dde62428a98ae32464c51')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-shared --disable-static
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/share/info/dir
-}
diff --git a/community-testing/libextractor/libextractor.install b/community-testing/libextractor/libextractor.install
deleted file mode 100644
index 1cf51e095..000000000
--- a/community-testing/libextractor/libextractor.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(extractor.info.gz)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/community-testing/libgexiv2/PKGBUILD b/community-testing/libgexiv2/PKGBUILD
deleted file mode 100644
index 264648b17..000000000
--- a/community-testing/libgexiv2/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 74732 2012-08-02 15:23:56Z andrea $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libgexiv2
-pkgver=0.4.1
-pkgrel=3
-pkgdesc="GObject-based wrapper around the Exiv2 library."
-arch=('i686' 'x86_64')
-url="http://redmine.yorba.org/projects/gexiv2"
-license=('GPL2')
-depends=('exiv2' 'glib2')
-options=('!libtool')
-source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/libnetfilter_cthelper/PKGBUILD b/community-testing/libnetfilter_cthelper/PKGBUILD
deleted file mode 100644
index 3a051836e..000000000
--- a/community-testing/libnetfilter_cthelper/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 77374 2012-10-09 09:35:39Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgname=libnetfilter_cthelper
-pkgver=1.0.0
-pkgrel=1
-pkgdesc='Library for the connection tracking helper infrastructure'
-arch=('i686' 'x86_64')
-url='http://www.netfilter.org/projects/libnetfilter_cthelper/'
-license=('GPL2')
-depends=('libmnl')
-options=('!libtool')
-source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('b2efab1a3a198a5add448960ba011acd')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/libnetfilter_cttimeout/PKGBUILD b/community-testing/libnetfilter_cttimeout/PKGBUILD
deleted file mode 100644
index 53661d122..000000000
--- a/community-testing/libnetfilter_cttimeout/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 71339 2012-05-27 00:57:37Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgname=libnetfilter_cttimeout
-pkgver=1.0.0
-pkgrel=2
-pkgdesc='Library for the connection tracking timeout infrastructure'
-arch=('i686' 'x86_64')
-url='http://www.netfilter.org/projects/libnetfilter_cttimeout/'
-license=('GPL2')
-depends=('libmnl' 'linux>=3.4')
-options=('!libtool')
-source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('7697437fc9ebb6f6b83df56a633db7f9')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/lincity-ng/PKGBUILD b/community-testing/lincity-ng/PKGBUILD
deleted file mode 100644
index 8f6d046ef..000000000
--- a/community-testing/lincity-ng/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 75765 2012-08-30 21:20:22Z lcarlier $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=lincity-ng
-pkgver=2.0
-pkgrel=5.1
-pkgdesc="A city simulation game"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/LinCity-NG"
-license=('GPL' 'custom')
-depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'gcc-libs' 'libgl')
-makedepends=('ftjam' 'mesa')
-source=(http://sourceforge.net/projects/${pkgname}.berlios/files/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('2961a3f60f7481b33858d7d5ef7cf9c788d01077')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  jam
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  jam -sprefix="${pkgdir}/usr" install
-  install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt"
-  install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt"
-}
diff --git a/community-testing/luajit/Makefile.patch b/community-testing/luajit/Makefile.patch
deleted file mode 100644
index 69e172145..000000000
--- a/community-testing/luajit/Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	2011-12-14 15:15:00.000000000 +0100
-+++ Makefile	2012-03-04 14:53:43.137778596 +0100
-@@ -41,7 +41,7 @@
- INSTALL_MAN= $(INSTALL_SHARE)/man/man1
- INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig
- 
--INSTALL_TNAME= luajit-$(VERSION)
-+INSTALL_TNAME= $(INSTALL_TSYMNAME)
- INSTALL_TSYMNAME= luajit
- INSTALL_ANAME= libluajit-$(ABIVER).a
- INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER)
diff --git a/community-testing/luajit/PKGBUILD b/community-testing/luajit/PKGBUILD
deleted file mode 100644
index bd1906fe0..000000000
--- a/community-testing/luajit/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 67113 2012-03-04 14:27:50Z bpiotrowski $
-# Maintainer:  Chris Brannon <chris@the-brannons.com>
-# Maintainer:  Bartłomiej Piotrowski 
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Anders Bergh <anders1@gmail.com>
-
-pkgname=luajit 
-pkgver=2.0.0b9
-pkgrel=1
-pkgdesc="A Just-In-Time Compiler for Lua"
-arch=('i686' 'x86_64')
-url="http://luajit.org/"
-license=('MIT')
-depends=('gcc-libs') 
-source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz"
-        "http://luajit.org/download/beta${pkgver: -1}_hotfix1.patch"
-        'luaconf.patch'
-        'Makefile.patch')
-md5sums=('e7e03e67e2550817358bc28b44270c6d'
-         '4920f04fcef1ce486891509faf26b4f1'
-         'c8da9c6790e20a12a0e2496f438d9dc3'
-         '8997c5e5fa4f6e8e0b86cc6b888de631')
-
-build() { 
-  cd "$srcdir/LuaJIT-${pkgver/b/-beta}"
-
-  patch -Np1 -i "$srcdir/beta${pkgver: -1}_hotfix1.patch"
-  patch -Np0 -i "$srcdir/luaconf.patch"
-  patch -Np0 -i "$srcdir/Makefile.patch"
-
-  make
-}
-
-package() {
-  cd "$srcdir/LuaJIT-${pkgver/b/-beta}"
-  make install DESTDIR="$pkgdir" PREFIX=/usr
-
-  install -Dm644 "$srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT" \
-                 "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
-}
diff --git a/community-testing/luajit/luaconf.patch b/community-testing/luajit/luaconf.patch
deleted file mode 100644
index ba9373b52..000000000
--- a/community-testing/luajit/luaconf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/luaconf.h.orig	2010-08-24 15:00:00.000000000 +0200
-+++ src/luaconf.h	2010-09-06 15:52:22.043333530 +0200
-@@ -33,7 +33,7 @@
- #define LUA_CPATH_DEFAULT \
-   ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- #else
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #ifdef LUA_XROOT
diff --git a/community-testing/luajit/luajit-arch.patch b/community-testing/luajit/luajit-arch.patch
deleted file mode 100644
index 689a87d4e..000000000
--- a/community-testing/luajit/luajit-arch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN LuaJIT-1.1.4.orig/src/luaconf.h LuaJIT-1.1.3/src/luaconf.h
---- LuaJIT-1.1.4.orig/src/luaconf.h	2007-05-24 13:30:00.000000000 +0200
-+++ LuaJIT-1.1.4/src/luaconf.h	2007-11-02 06:28:59.000000000 +0100
-@@ -94,7 +94,7 @@
- 	".\\?.dll;"  LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll"
- 
- #else
--#define LUA_ROOT	"/usr/local/"
-+#define LUA_ROOT	"/usr/"
- #define LUA_LDIR	LUA_ROOT "share/lua/5.1/"
- #define LUA_CDIR	LUA_ROOT "lib/lua/5.1/"
- #define LUA_PATH_DEFAULT  \
diff --git a/community-testing/luminancehdr/PKGBUILD b/community-testing/luminancehdr/PKGBUILD
deleted file mode 100644
index 25da2b543..000000000
--- a/community-testing/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78807 2012-10-25 01:47:48Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.3.0
-pkgrel=4
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit')
-makedepends=('cmake')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2)
-sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676')
-
-build() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/luminance-hdr-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/luminancehdr/luminancehdr.changelog b/community-testing/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index c3c1f1197..000000000
--- a/community-testing/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,45 +0,0 @@
-2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.3.0-2 exiv2-0.23 rebuild
-
-2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.3.0-1
-
-2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.2.1-1
-
-2012-01-27 Eric Belanger  <eric@archlinux.org>
-	* Rebuild against libpng 1.5 and libtiff 4.0
-
-2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.1.0-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* luminancehdr 2.0.2-1
-
-2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* exiv2 0.20 rebuild
-
-2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.0.1
-
-2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package renamed to LuminanceHDR
-	* Update to major release 2.0.0
-
-2010-03-09 Andrea Scarpino <andrea@archlinux.org>
-	* exiv2 0.19 rebuild
-
-2009-11-02 Biru Ionut <ionut@archlinux.ro>
-	* add translation and fix segfault on old i686 procesors
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v1.9.3
-
-2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Minor version (v1.9.2-3) update caused by exiv2 upgrade.
-
-2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Minor version (v1.9.2-2) update caused by openexr upgrade.
-
-2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Package moved to [community]
diff --git a/community-testing/luminancehdr/luminancehdr.install b/community-testing/luminancehdr/luminancehdr.install
deleted file mode 100644
index 279762804..000000000
--- a/community-testing/luminancehdr/luminancehdr.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/community-testing/luxrays/PKGBUILD b/community-testing/luxrays/PKGBUILD
deleted file mode 100644
index 6080a68aa..000000000
--- a/community-testing/luxrays/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78808 2012-10-25 01:47:52Z ebelanger $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=luxrays
-pkgver=1.1
-_pkgver=589aa5dac899
-pkgrel=3
-pkgdesc="Accelerate the ray intersection process by using GPUs"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('freeimage' 'freeglut' 'glew' 'libcl')
-makedepends=('cmake' 'boost' 'mesa' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('7513d71148fa14bc1779b816816580b9')
-
-build() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir/luxrender-$pkgname-$_pkgver"
-
-  install -d -m755 "$pkgdir"/usr/{bin,include,lib}
-  install -m755 bin/* "$pkgdir"/usr/bin
-  install -m644 lib/* "$pkgdir"/usr/lib
-  cp -a include/luxrays "$pkgdir"/usr/include
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/luxrender/PKGBUILD b/community-testing/luxrender/PKGBUILD
deleted file mode 100644
index 6a70142c2..000000000
--- a/community-testing/luxrender/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 78809 2012-10-25 01:47:55Z ebelanger $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Initial contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
-pkgname=luxrender
-pkgver=1.1
-_pkgver=4b4289cda943
-pkgrel=3
-pkgdesc="Rendering system for physically correct, unbiased image synthesis"
-arch=('i686' 'x86_64')
-url="http://www.luxrender.net/"
-license=('GPL')
-depends=('boost-libs' 'freeimage' 'openexr' 'libcl')
-optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \
-            'python: Python interface (pylux)'
-            'nvidia-utils: OpenCL support for nVidia GPUs' \
-            'amdstream: OpenCL support for AMD GPUs' \
-            'intel-opencl-sdk: OpenCL support for Intel CPUs')
-makedepends=('cmake' 'boost' 'mesa' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers')
-source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2)
-md5sums=('accca65afdc4cc38db49a6e54f20e0f2')
-
-build() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-
-  # fix the installation
-  sed -i '/.*wxgui.*/ d' CMakeLists.txt
-
-  export CXXFLAGS="$CXXFLAGS -lpthread"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLUXRAYS_DISABLE_OPENCL=OFF \
-    -DPYTHON_CUSTOM=ON \
-    -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \
-    -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \
-    .
-  make
-}
-
-package() {
-  cd "$srcdir"/luxrender-lux-$_pkgver
-  make DESTDIR="$pkgdir" install
-
-  # fix library path on x86_64
-  [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib
-
-  #install pylux
-  install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/lxdm/PKGBUILD b/community-testing/lxdm/PKGBUILD
deleted file mode 100644
index 36a9ec902..000000000
--- a/community-testing/lxdm/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 78734 2012-10-23 20:39:03Z dwallace $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: AndyRTR <andyrtr@archlinux.org>
-# Contributor: kiefer <jorgelmadrid@gmail.com>
-
-pkgname=lxdm
-pkgver=0.4.1
-pkgrel=18
-pkgdesc='Lightweight X11 Display Manager'
-arch=('i686' 'x86_64')
-url="http://sourceforge.net/projects/lxdm/"
-license=('GPL')
-groups=('lxde')
-depends=('gtk2' 'xorg-server')
-makedepends=('intltool')
-install=${pkgname}.install
-backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
-        'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin'
-        'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
-source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
-        glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch
-        greeter-session.patch pam-env-vars.patch industrial-greeterui.patch
-        rc.d lxdm-pam service)
-
-build() {
-    cd $srcdir/$pkgname-$pkgver
-
-    patch -Np1 -i $srcdir/glib2-2.32.0.patch
-    patch -Np1 -i $srcdir/greeter-session.patch
-    patch -Np1 -i $srcdir/pam-env-vars.patch
-
-    ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm
-    make
-  	
-    patch -Np0 -i $srcdir/lxdm.patch
-    patch -Np0 -i $srcdir/lxdm.conf.patch
-    patch -Np0 -i $srcdir/Xsession.patch
-    patch -Np0 -i $srcdir/industrial-greeterui.patch
-}
-
-
-package() {
-    cd $srcdir/$pkgname-$pkgver
-    make DESTDIR=$pkgdir install
-
-    install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm
-    install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm
-    install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service
-    install -d $pkgdir/var/{lib,run}/lxdm
-
-    # fix the greeter location
-    sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf
-
-    # avoid conflict with filesystem>=2012.06
-    rm -r $pkgdir/var/run
-}
-
-md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
-         'a1e3c46a8bef691bc544028f5b6cfe22'
-         'baed9055e8825a5511712bc095197519'
-         'c50dd01b715b0a236407d48066191601'
-         'd2e4a4a22ee2aa1a986be154c647b6c6'
-         '28475239d0c8b4fd778ec49f5ec72962'
-         '4c1d43e81e9a256e8d1ea7686c24b3d3'
-         '2c4afdbe3532be4f90d8f6240d352766'
-         '705f394052fdd0dec22e95321d170de0'
-         '9cc734228696a3c6f06d91bba61b03c1'
-         'e8cc66eb1a2405d2d9d184a727cbd9d8')
-
diff --git a/community-testing/lxdm/Xsession.patch b/community-testing/lxdm/Xsession.patch
deleted file mode 100644
index 035ff0383..000000000
--- a/community-testing/lxdm/Xsession.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Xsession.orig	2011-07-29 15:42:33.000000000 +0200
-+++ data/Xsession	2011-12-03 09:09:14.592876087 +0100
-@@ -9,6 +9,8 @@
- 	LXSESSION=/usr/bin/startlxde
- fi
- 
-+[ -f /etc/profile ] && . /etc/profile
-+[ -f ~/.profile ] && . ~/.profile
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f ~/.xprofile ] && . ~/.xprofile
- 
diff --git a/community-testing/lxdm/glib2-2.32.0.patch b/community-testing/lxdm/glib2-2.32.0.patch
deleted file mode 100644
index cebfc6133..000000000
--- a/community-testing/lxdm/glib2-2.32.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: dgod <dgod.osa@gmail.com>
-Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800)
-Subject: fix event check bug caused cpu 100%
-X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1
-
-fix event check bug caused cpu 100%
----
-
-diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..18ee12e 100644
---- a/src/lxcom.c
-+++ b/src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
- 
- static gboolean lxcom_check(GSource *source)
- {
--	return TRUE;
-+	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
- }
- 
- static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
diff --git a/community-testing/lxdm/greeter-session.patch b/community-testing/lxdm/greeter-session.patch
deleted file mode 100644
index f3b94a57a..000000000
--- a/community-testing/lxdm/greeter-session.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/greeter.c b/src/greeter.c
-index c0c150d..1f6b88e 100644
---- a/src/greeter.c
-+++ b/src/greeter.c
-@@ -114,7 +114,7 @@ static char *get_session_exec(void)
- 	GtkTreeModel* model;
- 	GtkTreeIter it;
- 	gchar *res;
--	if(!lang)
-+	if(!sessions)
- 		return g_strdup("");
- 	
- 	if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it))
diff --git a/community-testing/lxdm/industrial-greeterui.patch b/community-testing/lxdm/industrial-greeterui.patch
deleted file mode 100644
index a2a366809..000000000
--- a/community-testing/lxdm/industrial-greeterui.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- data/themes/Industrial/greeter.ui.orig	2012-05-09 23:54:03.743980613 -0300
-+++ data/themes/Industrial/greeter.ui	2012-05-10 00:26:20.340687396 -0300
-@@ -201,7 +201,9 @@
-                   </packing>
-                 </child>
-                 <child>
--                  <object class="GtkComboBoxEntry" id="keyboard"/>
-+                  <object class="GtkComboBoxEntry" id="keyboard">
-+                    <property name="text_column">0</property>
-+                  </object>
-                   <packing>
-                     <property name="expand">False</property>
-                     <property name="position">3</property>
diff --git a/community-testing/lxdm/lxdm-pam b/community-testing/lxdm/lxdm-pam
deleted file mode 100644
index 57f33b221..000000000
--- a/community-testing/lxdm/lxdm-pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
--session        optional        pam_loginuid.so
--session        optional        pam_systemd.so
diff --git a/community-testing/lxdm/lxdm.conf.patch b/community-testing/lxdm/lxdm.conf.patch
deleted file mode 100644
index 1744e557e..000000000
--- a/community-testing/lxdm/lxdm.conf.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/lxdm.conf.orig	2011-11-01 17:57:59.208757577 +0100
-+++ data/lxdm.conf	2011-11-01 18:03:55.608741945 +0100
-@@ -27,7 +27,7 @@
- gtk_theme=Clearlooks
- 
- ## background of the greeter
--bg=/usr/share/backgrounds/default.png
-+# bg=/usr/share/backgrounds/default.png
- 
- ## if show bottom pane
- bottom_pane=1
diff --git a/community-testing/lxdm/lxdm.install b/community-testing/lxdm/lxdm.install
deleted file mode 100644
index 4d1285dc5..000000000
--- a/community-testing/lxdm/lxdm.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    if ! getent group lxdm > /dev/null ; then
-        groupadd --system lxdm
-        chgrp -R lxdm /var/lib/lxdm
-        chgrp lxdm /etc/lxdm/lxdm.conf
-        chmod +r /etc/lxdm/lxdm.conf
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    if ! getent group lxdm > /dev/null ; then
-        groupdel lxdm
-    fi
-}
diff --git a/community-testing/lxdm/lxdm.patch b/community-testing/lxdm/lxdm.patch
deleted file mode 100644
index a703a386d..000000000
--- a/community-testing/lxdm/lxdm.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- data/lxdm.orig	2010-01-24 16:58:42.262866825 -0200
-+++ data/lxdm	2010-01-19 11:56:34.308668692 -0200
-@@ -1,21 +1,13 @@
- #!/bin/sh
-
--[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
--
--if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
--	. /etc/sysconfig/language
--	if [ -n "$RC_LANG"]; then
--		LANG=$RC_LANG
--	fi
-+if [ -r /etc/profile.d/locale.sh ]; then
-+	. /etc/profile.d/locale.sh
- fi
-
- if [ -n "$LANG" ]; then
- 	export LANG
- fi
-
--[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
--[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
--
- if [ -n "$DEFAULT_WM" ]; then
- 	PREFERRED=$DEFAULT_WM
- fi
diff --git a/community-testing/lxdm/pam-env-vars.patch b/community-testing/lxdm/pam-env-vars.patch
deleted file mode 100644
index ab8605ff1..000000000
--- a/community-testing/lxdm/pam-env-vars.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/src/lxdm.c b/src/lxdm.c
-index 369aedf..cd1d486 100644
---- a/src/lxdm.c
-+++ b/src/lxdm.c
-@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name)
-         g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err));
- }
- 
--void append_pam_environ(pam_handle_t *pamh,char **env)
-+static char **append_pam_environ(pam_handle_t *pamh,char **env)
- {
--	int i,j,n;
-+	int i,j,n,a;
- 	char **penv;
--	if(!pamh) return;
-+	if(!pamh) return env;
- 	penv=pam_getenvlist(pamh);
--	if(!penv) return;
-+	if(!penv) return env;
-+	a=g_strv_length(penv);
-+	if(a==0)
-+	{
-+		free(penv);
-+		return env;
-+	}
-+	env=g_renew(char *,env,g_strv_length(env)+1+a+10);
- 	for(i=0;penv[i]!=NULL;i++)
- 	{
--		//printf("PAM %s\n",penv[i]);
-+		fprintf(stderr,"PAM %s\n",penv[i]);
- 		n=strcspn(penv[i],"=")+1;
- 		for(j=0;env[j]!=NULL;j++)
- 		{
-@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env)
- 		free(penv[i]);
- 	}
- 	free(penv);
-+	return env;
- }
- 
- #endif
-@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
- 	if(s->child==0)
- 	{
- #if HAVE_LIBPAM
--		append_pam_environ(s->pamh,env);
-+		env=append_pam_environ(s->pamh,env);
- 		pam_end(s->pamh,0);
- #endif
- 		switch_user(pw, session_exec, env);
diff --git a/community-testing/lxdm/rc.d b/community-testing/lxdm/rc.d
deleted file mode 100644
index 68eb6225d..000000000
--- a/community-testing/lxdm/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID `which lxdm-binary`)
-case "$1" in
-  start)
-    stat_busy "Starting LXDM Display Manager"
-    [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon lxdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping LXDM Display Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon lxdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/lxdm/service b/community-testing/lxdm/service
deleted file mode 100644
index e1840476c..000000000
--- a/community-testing/lxdm/service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=LXDE Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/sbin/lxdm
-
-[Install]
-Alias=display-manager.service
diff --git a/community-testing/mailman/PKGBUILD b/community-testing/mailman/PKGBUILD
deleted file mode 100644
index 98872285f..000000000
--- a/community-testing/mailman/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 73798 2012-07-15 16:51:10Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=mailman
-pkgver=2.1.15
-pkgrel=2
-pkgdesc='The GNU Mailing List Manager'
-arch=(i686 x86_64)
-license=('GPL')
-url='http://www.list.org/'
-depends=('glibc' 'python2' 'smtp-server')
-# we need to have the mailman user to build mailman
-makedepends=('mailman')
-# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead.
-backup=('usr/lib/mailman/Mailman/mm_cfg.py')
-install=$pkgname.install
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
-        'mailman-2.1-build.patch'
-        "$pkgname.profile.sh"
-        "$pkgname.profile.csh"
-        "$pkgname.rc"
-        "$pkgname.service")
-md5sums=('7d207489e8e9de0727cb334d46029833'
-         'ed04d062379eb21e39ce1e70e6b1ade2'
-         'a9c71ec940c56173415fbd49087d10b0'
-         '85a8c30ffc444e677b286f54df530482'
-         '3a4014c15e9923451f5f282860896057'
-         'f3ea6ef02ab135274406ce52ea8bbb7b')
-
-build() {
-  cd $pkgname-$pkgver
-  # some files in mailman doesn't use configure parameter
-  find . -type f -exec \
-    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
-  # fix directory permissions to satisfy check_perms
-  patch -p1 -i "$srcdir/mailman-2.1-build.patch"
-  # set some sane defaults before the configure script has a chance to screw them up
-  ./configure \
-    --without-permcheck \
-    --prefix=/usr/lib/mailman \
-    --with-var-prefix=/var/lib/mailman \
-    --with-mail-gid=mailman \
-    --with-username=mailman \
-    --with-groupname=mailman \
-    --with-cgi-gid=http \
-    --with-python=/usr/bin/python2 \
-    --with-mailhost=localhost \
-    --with-urlhost=localhost
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # let's follow Fedora FHS way; Gentoo does it the other way round
-
-  # Create a link so that the config file mm_cfg.py appears in config
-  # directory /etc/mailman. We don't put mm_cfg.py in the config directory
-  # because its executable code (python file) and the security policy wants
-  # to keep executable code out of /etc and inside of a lib directory instead,
-  # and because traditionally mm_cfg.py was in the Mailman subdirectory and
-  # experienced mailman admins will expect to find it there. But having it
-  # "appear" in the config directory is good practice and heading in the
-  # right direction for FHS compliance.
-  install -d -m755 "$pkgdir/etc/$pkgname"
-  ln -sv /usr/lib/mailman/Mailman/mm_cfg.py "$pkgdir/etc/$pkgname/mm_cfg.py"
-  # fix some permissions to satisfy check_perms
-  chown -R mailman:mailman "$pkgdir"/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
-  chown http:mailman "$pkgdir"/var/lib/mailman/archives/private
-  chmod 2770 "$pkgdir"/var/lib/mailman/archives/private
-  chmod 2755 "$pkgdir"/usr/lib/mailman/cgi-bin/*
-  chmod 2755 "$pkgdir"/usr/lib/mailman/mail/mailman
-  cd "$srcdir"
-  # install initscripts
-  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
-  # install systemd service
-  install -Dm 644 $pkgname.service \
-    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
-  # install profiles
-  install -Dm 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
-  install -Dm 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/mailman/mailman-2.1-build.patch b/community-testing/mailman/mailman-2.1-build.patch
deleted file mode 100644
index d00613ad7..000000000
--- a/community-testing/mailman/mailman-2.1-build.patch
+++ /dev/null
@@ -1,694 +0,0 @@
-diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in
---- mailman-2.1.12-a/bin/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/bin/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -56,7 +55,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -72,8 +71,6 @@
- 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in
---- mailman-2.1.12-a/cron/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/cron/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -68,8 +67,6 @@
- 	    $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in
---- mailman-2.1.12-a/Mailman/Archiver/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -47,7 +46,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in
---- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in
---- mailman-2.1.12-a/Mailman/Cgi/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -47,7 +46,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -63,8 +62,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \
-         done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in
---- mailman-2.1.12-a/Mailman/Commands/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Commands/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in
---- mailman-2.1.12-a/Mailman/Gui/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Gui/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in
---- mailman-2.1.12-a/Mailman/Handlers/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in
---- mailman-2.1.12-a/Mailman/Logging/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Logging/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in
---- mailman-2.1.12-a/Mailman/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -20,8 +20,6 @@
- 
- # Variables set by configure
- 
--VERSION=	@VERSION@
--
- VPATH=		@srcdir@
- srcdir= 	@srcdir@
- bindir= 	@bindir@
-@@ -30,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -48,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -79,12 +76,6 @@
- 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- 	done
- 
--finish:
--	@for d in $(SUBDIRS); \
--	do \
--	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \
--	done
--
- clean:
- 	for d in $(SUBDIRS); \
- 	do \
-diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in
---- mailman-2.1.12-a/Mailman/MTA/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/MTA/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in
---- mailman-2.1.12-a/Mailman/Queue/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Mailman/Queue/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -45,7 +44,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,8 +60,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in
---- mailman-2.1.12-a/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -61,11 +61,10 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID=	chmod g+s
- 
- DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),')
- LANGPACK = README-I18N.en templates messages
-@@ -85,14 +84,24 @@
- 
- doinstall: $(SUBDIRS)
- 	@echo "Creating architecture independent directories..."
-+	dir=$(DESTDIR)$(prefix); \
-+	if test ! -d $$dir; then \
-+		echo "Creating directory hierarchy $$dir"; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
-+	else true; \
-+	fi;
-+	dir=$(DESTDIR)$(var_prefix); \
-+	if test ! -d $$dir; then \
-+		echo "Creating directory hierarchy $$dir"; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
-+	else true; \
-+	fi;
- 	@for d in $(VAR_DIRS); \
- 	do \
- 	    dir=$(DESTDIR)$(var_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-@@ -102,9 +111,7 @@
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-@@ -114,9 +121,7 @@
- 	    dir=$(DESTDIR)$(exec_prefix)/$$d; \
- 	    if test ! -d $$dir; then \
- 		echo "Creating directory hierarchy $$dir"; \
--		$(srcdir)/mkinstalldirs $$dir; \
--		chmod $(DIRMODE) $$dir; \
--		$(DIRSETGID) $$dir; \
-+		$(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	    else true; \
- 	    fi; \
- 	done
-diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in
---- mailman-2.1.12-a/messages/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/messages/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -32,7 +32,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -43,7 +42,6 @@
- CFLAGS=		$(OPT) $(DEFS)
- PACKAGEDIR= 	$(prefix)/messages
- SHELL=		/bin/sh
--DIRSETGID=	chmod g+s
- MSGFMT= 	@PYTHON@ ../build/bin/msgfmt.py
- MSGMERGE=	msgmerge
- 
-@@ -60,7 +58,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -90,9 +88,8 @@
- 	do \
- 	    dir=$(DESTDIR)$(prefix)/$$d; \
- 	    echo "Creating language directory $$dir"; \
--	    $(srcdir)/../mkinstalldirs $$dir; \
--	    chmod $(DIRMODE) $$dir; \
--	    $(DIRSETGID) $$dir; \
-+	    $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \
-+	    $(INSTALL) -d -m $(DIRMODE) $$dir; \
- 	done
- 	@for d in $(LANGUAGES); \
- 	do \
-@@ -113,8 +110,6 @@
- 
- mofiles: $(MOFILES)
- 
--finish:
--
- clean:
- 	-rm -f */LC_MESSAGES/mailman.mo
- 
-diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in
---- mailman-2.1.12-a/misc/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/misc/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -30,7 +30,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- PYTHON=		@PYTHON@
- 
-@@ -62,7 +61,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- DATAMODE=	664
-@@ -101,8 +100,6 @@
- 	    (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in
---- mailman-2.1.12-a/scripts/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/scripts/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -49,7 +48,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -68,8 +67,6 @@
- 	$(INSTALL) -m $(FILEMODE) $(srcdir)/join    $(DESTDIR)$(SCRIPTSDIR)/subscribe
- 	$(INSTALL) -m $(FILEMODE) $(srcdir)/leave   $(DESTDIR)$(SCRIPTSDIR)/unsubscribe
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in
---- mailman-2.1.12-a/src/Makefile.in	2009-07-28 12:19:47.000000000 +0200
-+++ mailman-2.1.12-b/src/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- PYTHON=  	@PYTHON@
- 
-@@ -63,10 +62,9 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
--EXEMODE=	755
-+DIRMODE=	2775
-+EXEMODE=	2755
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
--DIRSETGID=	chmod g+s
- 
- # Fixed definitions
- 
-@@ -110,20 +108,10 @@
- 	do \
- 	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
- 	    $(INSTALL_PROGRAM) $$f $$exe; \
--	    $(DIRSETGID) $$exe; \
- 	done
- 	for f in $(MAIL_PROGS); \
- 	do \
- 	    $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \
--	    $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \
--	done
--
--finish:
--	-for f in $(SUID_CGI_PROGS); \
--	do \
--	    exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \
--	    chown $(MAILMAN_USER) $$exe; \
--	    chmod u+s $$exe; \
- 	done
- 
- clean:
-diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in
---- mailman-2.1.12-a/templates/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/templates/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- TRUE=		@TRUE@
- 
-@@ -48,7 +47,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -61,15 +60,13 @@
- install:
- 	for d in $(LANGUAGES); \
- 	do \
--	    $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \
-+	    $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \
- 	    for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \
- 	    do \
- 	    	$(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \
- 	    done; \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in
---- mailman-2.1.12-a/tests/bounces/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/bounces/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in
---- mailman-2.1.12-a/tests/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -71,8 +70,6 @@
- 	    (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
-diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in
---- mailman-2.1.12-a/tests/msgs/Makefile.in	2009-02-23 22:23:35.000000000 +0100
-+++ mailman-2.1.12-b/tests/msgs/Makefile.in	2009-07-28 12:19:48.000000000 +0200
-@@ -28,7 +28,6 @@
- DESTDIR=
- 
- CC=		@CC@
--CHMOD=  	@CHMOD@
- INSTALL=	@INSTALL@
- 
- DEFS=   	@DEFS@
-@@ -46,7 +45,7 @@
- # Modes for directories and executables created by the install
- # process.  Default to group-writable directories but
- # user-only-writable for executables.
--DIRMODE=	775
-+DIRMODE=	2775
- EXEMODE=	755
- FILEMODE=	644
- INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE)
-@@ -60,8 +59,6 @@
- 	    $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \
- 	done
- 
--finish:
--
- clean:
- 
- distclean:
diff --git a/community-testing/mailman/mailman.install b/community-testing/mailman/mailman.install
deleted file mode 100644
index 62a364e1a..000000000
--- a/community-testing/mailman/mailman.install
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-## arg 1:  the new package version
-post_install() {
-  if ! getent group mailman >/dev/null; then
-    groupadd -g 80 mailman >/dev/null
-  fi
-
-  if ! getent passwd mailman >/dev/null; then
-    useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman \
-      -u 80 -g mailman -M -r mailman >/dev/null
-  fi
-  # check file permissions
-  cd /usr/lib/mailman && bin/check_perms > /dev/null
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-## arg 1:  the old package version
-pre_remove() {
-  userdel mailman >/dev/null || true
-  groupdel mailman >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/mailman/mailman.profile.csh b/community-testing/mailman/mailman.profile.csh
deleted file mode 100644
index c0a39edee..000000000
--- a/community-testing/mailman/mailman.profile.csh
+++ /dev/null
@@ -1 +0,0 @@
-[ -d /usr/lib/mailman/bin ] && setenv PATH ${PATH}:/usr/lib/mailman/bin
diff --git a/community-testing/mailman/mailman.profile.sh b/community-testing/mailman/mailman.profile.sh
deleted file mode 100644
index 51b69ebfb..000000000
--- a/community-testing/mailman/mailman.profile.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-[ -d /usr/lib/mailman/bin ] && PATH=$PATH:/usr/lib/mailman/bin
-
-export PATH
diff --git a/community-testing/mailman/mailman.rc b/community-testing/mailman/mailman.rc
deleted file mode 100644
index 79c1cd661..000000000
--- a/community-testing/mailman/mailman.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-MAILMANCTL=/usr/lib/mailman/bin/mailmanctl
-
-case "$1" in
-  start)
-    status 'Starting GNU Mailing List Manager' $MAILMANCTL -q start &&
-      add_daemon ${0##*/} || exit 1
-  ;;
-  stop)
-    status 'Stoping GNU Mailing List Manager' $MAILMANCTL -q stop &&
-      rm_daemon ${0##*/} || exit 1
-  ;;
-  reload)
-    status 'Reloading GNU Mailing List Manager' $MAILMANCTL -q restart
-  ;;
-  restart)
-    $0 stop && $0 start
-  ;;
-  *)
-    echo "usage: ${0##*/} {start|stop|restart|reload}" >&2
-  ;;
-esac
-
-:
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/mailman/mailman.service b/community-testing/mailman/mailman.service
deleted file mode 100644
index 633412dbc..000000000
--- a/community-testing/mailman/mailman.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=GNU Mailing List Manager
-After=network.target
-
-[Service]
-ExecStart=/usr/lib/mailman/bin/mailmanctl -s start
-ExecReload=/usr/lib/mailman/bin/mailmanctl restart
-ExecStop=/usr/lib/mailman/bin/mailmanctl stop
-StandardError=syslog
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/mapnik/PKGBUILD b/community-testing/mapnik/PKGBUILD
deleted file mode 100644
index df8d5dd90..000000000
--- a/community-testing/mapnik/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 73762 2012-07-15 13:19:10Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: David Dent <thewinch@gmail.com>
-# Contributor: orbisvicis <orbisvicis@gmail.com>
-
-pkgname=mapnik
-pkgver=2.0.1
-pkgrel=1
-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' 'libltdl')
-optdepends=('libxslt:         Web Map Service'
-            'python2-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')
-install="mapnik.install"
-source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2")
-md5sums=('e3dd09991340e2568b99f46bac34b0a8')
-
-build() {
-  cd "$srcdir/$pkgname-v$pkgver"
-  sed -i 's|lib64|lib|g' SConstruct
-  scons configure \
-    PREFIX="/usr" \
-    INPUT_PLUGINS=all \
-    DESTDIR="$pkgdir"
-  scons
-}
-
-package(){
-  cd "$srcdir/$pkgname-v$pkgver"
-  scons install
-}
diff --git a/community-testing/mapnik/mapnik.install b/community-testing/mapnik/mapnik.install
deleted file mode 100644
index 46f265d5b..000000000
--- a/community-testing/mapnik/mapnik.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  /sbin/ldconfig
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/mashup/PKGBUILD b/community-testing/mashup/PKGBUILD
deleted file mode 100644
index d1d1bacd0..000000000
--- a/community-testing/mashup/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=mashup
-pkgver=3.5
-pkgrel=3
-pkgdesc="Adjusting images on a sheet of paper for printing"
-url="http://kornelix.squarespace.com/$pkgname"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('gtk3')
-replaces=('printoxx')
-source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('454b08e5589f93b3bdd4577c2578ae36')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's+xdg-deskto+#xdg-deskto+' Makefile
-  sed -i 's/--libs gtk+-3.0/--libs gtk+-3.0 gthread-2.0/' Makefile
-  make PREFIX=/usr
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -Dm644 desktop $pkgdir/usr/share/applications/$pkgname.desktop
-  make DESTDIR=$pkgdir install
-  rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop
-  rm $pkgdir/usr/share/doc/$pkgname/$pkgname.man
-}
-
diff --git a/community-testing/megaglest/PKGBUILD b/community-testing/megaglest/PKGBUILD
deleted file mode 100644
index 8f54a8ae6..000000000
--- a/community-testing/megaglest/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 78810 2012-10-25 01:48:00Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=megaglest
-pkgver=3.6.0.3
-pkgrel=5
-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' 'glu')
-makedepends=('ftjam' 'cmake' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz"
-        lol.patch)
-md5sums=('5a4a2429435031d9f9cc5d9535a9de9d'
-         '68fd326b73ed1c75981004fbdef6b73a')
-
-build() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
-  patch -Np1 < "$srcdir/lol.patch"
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-  cmake .. \
-    -DWANT_SVN_STAMP=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-  make
-}
-
-package() {
-  cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
-
-  cd build
-  make DESTDIR="$pkgdir" install
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/megaglest/lol.patch b/community-testing/megaglest/lol.patch
deleted file mode 100644
index 56f94c852..000000000
--- a/community-testing/megaglest/lol.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h
-index 8fcfb27..3cb7a41 100644
---- a/source/shared_lib/include/graphics/math_util.h
-+++ b/source/shared_lib/include/graphics/math_util.h
-@@ -184,10 +184,10 @@ public:
- 
- 	Rect2<T> computeBoundingRect() const{
- 		return Rect2i(
--			min(p[0].x, p[1].x), 
--			min(p[0].y, p[2].y), 
--			max(p[2].x, p[3].x), 
--			max(p[1].y, p[3].y));
-+			std::min(p[0].x, p[1].x),
-+			std::min(p[0].y, p[2].y),
-+			std::max(p[2].x, p[3].x),
-+			std::max(p[1].y, p[3].y));
- 	}
- 
- 	bool isInside(const Vec2<T> &pt) const{
-diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp
-index b09c972..ddebd03 100644
---- a/source/shared_lib/sources/platform/posix/ircclient.cpp
-+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp
-@@ -13,6 +13,7 @@
- #include "ircclient.h"
- #include "util.h"
- #include "platform_common.h"
-+#include "libirc_rfcnumeric.h"
- #include "libircclient.h"
- 
- #include <stdio.h>
-diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
-index 05478fc..c27aa62 100644
---- a/source/shared_lib/sources/util/util.cpp
-+++ b/source/shared_lib/sources/util/util.cpp
-@@ -19,6 +19,7 @@
- #include <stdarg.h>
- #include <time.h>
- #include <fcntl.h> // for open()
-+#include <unistd.h>
- 
- #ifdef WIN32
-   #include <io.h> // for open()
diff --git a/community-testing/mezogis/ChangeLog b/community-testing/mezogis/ChangeLog
deleted file mode 100644
index dba4cf7ec..000000000
--- a/community-testing/mezogis/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community-testing/mezogis/PKGBUILD b/community-testing/mezogis/PKGBUILD
deleted file mode 100644
index 4e0f09c6c..000000000
--- a/community-testing/mezogis/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 78132 2012-10-16 12:09:28Z allan $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=mezogis
-pkgver=0.1.5
-pkgrel=6
-pkgdesc="A GIS application to query and analyse spatial data"
-arch=('i686' 'x86_64')
-url="http://www.mezogis.org"
-license=('GPL')
-depends=('pygtk' 'python2-geotypes' 'postgis')
-source=("http://www.mezogis.org/files/mezogis-$pkgver.tar.gz")
-md5sums=('1f886b849109a1a1bd3e165353b82368')
-
-package() {
-  cd $srcdir/mezogis-$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
-
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community-testing/mingw32-gcc/PKGBUILD b/community-testing/mingw32-gcc/PKGBUILD
deleted file mode 100644
index f20bf03b5..000000000
--- a/community-testing/mingw32-gcc/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 75113 2012-08-14 08:28:16Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Ondrej Jirman <megous@megous.com>
-
-pkgname=mingw32-gcc
-pkgver=4.7.0
-pkgrel=2
-_uprel=1
-arch=(i686 x86_64)
-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')
-replaces=('mingw32-gcc-base')
-provides=('mingw32-gcc-base')
-options=(!strip)
-url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/"
-license=(GPL LGPL)
-source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma
-        gcc-1-mingw-float.patch)
-md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d'
-         '2407123c35c0aa92ee5ffc27decca9a7')
-
-build()
-{
-  [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2
-
-  patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch
-
-  mkdir -p $srcdir/build
-  cd $srcdir/build
-
-  unset CFLAGS CXXFLAGS
-
-  chmod ugo+x $srcdir/gcc-$pkgver/configure
-  chmod ugo+x $srcdir/gcc-$pkgver/move-if-change
-
-  msg "gcc"
-  [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \
-     --target=i486-mingw32 \
-     --host=$CHOST \
-     --build=$CHOST \
-     --prefix=/usr \
-     --libexecdir=/usr/lib \
-     --with-bugurl=https://bugs.archlinux.org/ \
-     --enable-languages=c,c++ \
-     --enable-shared \
-     --enable-sjlj-exceptions \
-     --enable-hash-synchronization \
-     --disable-nls \
-     --disable-libssp \
-     --enable-libgomp
-
-  make
-  make install DESTDIR=$pkgdir
-
-  msg "libgcc"
-  make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install
-
-  msg "libstdc++"
-  make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install
-
-  msg "fixes"
-  cd $pkgdir/usr/i486-mingw32/lib
-  mkdir -p $pkgdir/usr/i486-mingw32/bin/
-  for i in `ls -1 *.dll`; do
-    ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i
-  done
-
-  cd $pkgdir
-  rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \
-    usr/{include,lib/libiberty.a} \
-    usr/share/{info,man} \
-    usr/share/gcc-$pkgver/python
-
-  strip usr/bin/*
-  strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2}
-  i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a
-}
diff --git a/community-testing/mingw32-gcc/gcc-1-mingw-float.patch b/community-testing/mingw32-gcc/gcc-1-mingw-float.patch
deleted file mode 100644
index 365949ad7..000000000
--- a/community-testing/mingw32-gcc/gcc-1-mingw-float.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
-http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435
-
-diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h
---- a/gcc/ginclude/float.h      2009-04-09 17:00:19.000000000 +0200
-+++ b/gcc/ginclude/float.h      2010-06-05 12:03:41.887724045 +0200
-@@ -275,3 +275,7 @@
- #endif /* __STDC_WANT_DEC_FP__ */
-
- #endif /* _FLOAT_H___ */
-+
-+#ifdef __MINGW32__
-+#include_next<float.h>
-+#endif
diff --git a/community-testing/miredo/PKGBUILD b/community-testing/miredo/PKGBUILD
deleted file mode 100644
index 4825572df..000000000
--- a/community-testing/miredo/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 72555 2012-06-16 17:09:54Z dreisner $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=miredo
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="Teredo client and server."
-arch=('i686' 'x86_64')
-url="http://www.remlab.net/miredo/"
-license=('GPL')
-depends=('judy' 'iproute2' 'libcap')
-backup=('etc/miredo/miredo.conf'
-        'etc/miredo/client-hook')
-options=('!libtool')
-source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	isatapd.rc.d
-	miredo.install
-	miredo.rc.d
-	miredo-server.rc.d
-	miredo.service)
-md5sums=('5114debbf9fcab5d292176e4548f8cd1'
-         '51ab6d091192605ee9206944869cb2ab'
-         'd1b655d7a851cdb46c91c3418ed1962f'
-         'c5a9be5c3175fecec387f1710bfd2788'
-         '319aba1ae06349b76cb25fda0dba60a9'
-         '3216d47d5aa979706b17b72d8b6e19b0')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--libexecdir=/usr/lib \
-	--with-Judy
-  make
-  make DESTDIR="$pkgdir" install
-
-  install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo
-  install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server
-  install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd
-  sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook
-
-  # avoid conflict with filesystem>=2012.06
-  rmdir "$pkgdir/var/run" "$pkgdir/var"
-
-  install -Dm644 "$srcdir/miredo.service" "$pkgdir/usr/lib/systemd/system/miredo.service"
-}
diff --git a/community-testing/miredo/isatapd.rc.d b/community-testing/miredo/isatapd.rc.d
deleted file mode 100644
index fa7bbd708..000000000
--- a/community-testing/miredo/isatapd.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/isatapd`
-case "$1" in
-  start)
-    stat_busy "Starting userspace ISATAP client"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/isatapd
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon isatapd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping userspace ISATAP client"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon isatapd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community-testing/miredo/miredo-server.rc.d b/community-testing/miredo/miredo-server.rc.d
deleted file mode 100644
index d05513b23..000000000
--- a/community-testing/miredo/miredo-server.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/miredo-server`
-case "$1" in
-  start)
-    stat_busy "Starting teredo protocol server"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/miredo-server
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon miredo-server
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping teredo protocol server"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon miredo-server
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community-testing/miredo/miredo.install b/community-testing/miredo/miredo.install
deleted file mode 100644
index 338459fb3..000000000
--- a/community-testing/miredo/miredo.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_remove() {
-
-  # clean up just in case
-  rm -f /var/run/miredo.pid
-  rm -f /var/run/miredo-server.pid
-  rm -f /var/run/isatapd.pid
-}
-
diff --git a/community-testing/miredo/miredo.rc.d b/community-testing/miredo/miredo.rc.d
deleted file mode 100644
index 500374b12..000000000
--- a/community-testing/miredo/miredo.rc.d
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/miredo`
-case "$1" in
-  start)
-    stat_busy "Starting teredo protocol client"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/miredo
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon miredo
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping teredo protocol client"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon miredo
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community-testing/miredo/miredo.service b/community-testing/miredo/miredo.service
deleted file mode 100644
index 299a887de..000000000
--- a/community-testing/miredo/miredo.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Teredo IPv6 Tunneling Daemon
-After=network.target
-
-[Service]
-ExecStartPre=/usr/sbin/miredo-checkconf /etc/miredo/miredo.conf
-ExecStart=/usr/sbin/miredo -f
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/community-testing/mlt/PKGBUILD b/community-testing/mlt/PKGBUILD
deleted file mode 100644
index 31293f16f..000000000
--- a/community-testing/mlt/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 73333 2012-07-06 15:23:01Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
-# Contributor: funkyou <spamopfer@nickname.berlin.de>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgbase=mlt
-pkgname=('mlt' 'mlt-python-bindings')
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="An open source multimedia framework"
-arch=('i686' 'x86_64')
-url="http://www.mltframework.org"
-license=('GPL')
-makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
-	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d56e0cdfba9c5b5608bf84493322615f')
-
-build() {
-  # mlt
-  cd "$srcdir/mlt-$pkgver"
-
-#  [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
-  SSE2=--disable-sse2
-
-  msg "SSE2=$SSE2"
-  ./configure --prefix=/usr --enable-gpl \
-	--qimage-libdir=/usr/lib/ --qimage-includedir=/usr/include/Qt \
-	--avformat-vdpau \
-	--avformat-swscale $SSE2
-  make
-
-  # mlt python bindings
-  cd "$srcdir/mlt-$pkgver/src/swig/python"
-  sed -i 's_path=`which python_path=`which python2_' build
-  sed -i 's_`python -c_`python2 -c_' build
-  sed -i 's#python-config#python2-config#' build
-  ./build
-}
-
-package_mlt() {
-  depends=('sdl_image' 'libsamplerate' 'libdv' 'sox' 'libxml2' 'ffmpeg' 'frei0r-plugins')
-  optdepends=('jack' 'libexif' 'qt' 'gtk2' "ladspa")
-  conflicts=('mlt++<=0.3.8')
-
-  cd "$srcdir/mlt-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-package_mlt-python-bindings() {
-  depends=('python2' 'mlt')
-
-  cd "$srcdir/mlt-$pkgver/src/swig/python"
-  mkdir -p "$pkgdir/usr/lib/python2.7/"
-  install -m755 mlt.py "$pkgdir/usr/lib/python2.7/"
-  install -m755 _mlt.so "$pkgdir/usr/lib/python2.7/"
-  install -m755 mlt_wrap.o "$pkgdir/usr/lib/python2.7/"
-}
diff --git a/community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
deleted file mode 100644
index 40dd48b42..000000000
--- a/community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3f6b2390102ea9d808c7075b5aaeec743b7d104e Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 10 Apr 2012 19:30:35 -0500
-Subject: [PATCH 1/2] Backport for mongodb 2.0.4 "Ignore --fork and --logpath
- when using --shutdown SERVER-5186 SERVER-5187"
-
-https://github.com/mongodb/mongo/commit/fa2e2ef95c5c934eef63fff4b98d5eb060c5653923
-
-Backported in preparation for backporting the fix for https://jira.mongodb.org/browse/SERVER-5358
----
- db/cmdline.cpp |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/db/cmdline.cpp b/db/cmdline.cpp
-index fd759a7..346a9ae 100644
---- a/db/cmdline.cpp
-+++ b/db/cmdline.cpp
-@@ -239,7 +239,7 @@ namespace mongo {
-             cmdLine.noUnixSocket = true;
-         }
- 
--        if (params.count("fork")) {
-+        if (params.count("fork") && !params.count("shutdown")) {
-             if ( ! params.count( "logpath" ) ) {
-                 cout << "--fork has to be used with --logpath" << endl;
-                 ::exit(-1);
-@@ -304,7 +304,7 @@ namespace mongo {
-         }
- 
- #endif
--        if (params.count("logpath")) {
-+        if (params.count("logpath") && !params.count("shutdown")) {
-             if ( logpath.size() == 0 )
-                 logpath = params["logpath"].as<string>();
-             uassert( 10033 ,  "logpath has to be non-zero" , logpath.size() );
--- 
-1.7.10
-
diff --git a/community-testing/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community-testing/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
deleted file mode 100644
index aff066450..000000000
--- a/community-testing/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 77f78f64c192572e6eb956b0fe28ecd975ff6461 Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Tue, 10 Apr 2012 19:38:58 -0500
-Subject: [PATCH 2/2] Backport for mongodb 2.0.4 "Don't check /proc/pid/exe in
- --shutdown SERVER-5358"
-
-Backported to fix https://jira.mongodb.org/browse/SERVER-5358
-
-https://github.com/mongodb/mongo/commit/c28d97d1a14a36ffc056bfd9ba7262b0a1509b5b
----
- db/db.cpp |   16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/db/db.cpp b/db/db.cpp
-index b1d1db8..0a21f4d 100644
---- a/db/db.cpp
-+++ b/db/db.cpp
-@@ -989,22 +989,6 @@ int main(int argc, char* argv[]) {
-                     procPath = (str::stream() << "/proc/" << pid);
-                     if (!boost::filesystem::exists(procPath))
-                         failed = true;
--
--                    string exePath = procPath + "/exe";
--                    if (boost::filesystem::exists(exePath)){
--                        char buf[256];
--                        int ret = readlink(exePath.c_str(), buf, sizeof(buf)-1);
--                        buf[ret] = '\0'; // readlink doesn't terminate string
--                        if (ret == -1) {
--                            int e = errno;
--                            cerr << "Error resolving " << exePath << ": " << errnoWithDescription(e);
--                            failed = true;
--                        }
--                        else if (!endsWith(buf, "mongod")){
--                            cerr << "Process " << pid << " is running " << buf << " not mongod" << endl;
--                            ::exit(-1);
--                        }
--                    }
-                 }
-                 catch (const std::exception& e){
-                     cerr << "Error reading pid from lock file [" << name << "]: " << e.what() << endl;
--- 
-1.7.10
-
diff --git a/community-testing/mongodb/PKGBUILD b/community-testing/mongodb/PKGBUILD
deleted file mode 100644
index f62cb4beb..000000000
--- a/community-testing/mongodb/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 73763 2012-07-15 13:19:25Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Mathias Stearn <mathias@10gen.com>
-# Contributor: Alec Thomas
-
-pkgname=mongodb
-pkgver=2.0.6
-pkgrel=2
-pkgdesc='A high-performance, open source, schema-free document-oriented database'
-arch=('i686' 'x86_64')
-url='http://www.mongodb.org'
-license=('AGPL3')
-depends=('boost-libs')
-makedepends=('scons' 'boost')
-#checkdepends=('python2-pymongo')
-optdepends=('libpcap: needed for mongosniff')
-backup=('etc/mongodb.conf')
-install="mongodb.install"
-source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
-        'mongodb.rc'
-        'mongodb.conf'
-        'boost-1.50.patch')
-md5sums=('b3b32fecdcbe8e8068ec2989be9d2da4'
-         '9c67e00f4626ad761a8f7d4e037a54d7'
-         '4839fe1d638187ca3226e8267b947318'
-         '5d22fd2c0ae869218488cd7c0dbc3903')
-
-build() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  patch -Np1 -i ${srcdir}/boost-1.50.patch
-
-  scons \
-    all \
-    --full
-}
-
-<<COMMENT
-check() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  scons \
-    smokeAll \
-    --smokedbprefix=${srcdir}
-}
-COMMENT
-
-package() {
-  export SCONSFLAGS="$MAKEFLAGS"
-
-  cd mongodb-src-r${pkgver}
-
-  scons \
-    install \
-    --full \
-    --prefix=${pkgdir}/usr
-
-  install -D -m755 ${srcdir}/mongodb.rc \
-    ${pkgdir}/etc/rc.d/mongodb
-  install -D -m644 ${srcdir}/mongodb.conf \
-    ${pkgdir}/etc/mongodb.conf
-  install -d -m700 ${pkgdir}/var/lib/mongodb
-  install -d -m755 ${pkgdir}/var/log/mongodb
-
-  if [ -d ${pkgdir}/usr/lib64 ]; then
-    mv ${pkgdir}/usr/lib64 ${pkgdir}/usr/lib
-  fi
-}
diff --git a/community-testing/mongodb/boost-1.50.patch b/community-testing/mongodb/boost-1.50.patch
deleted file mode 100644
index 4ccb898ec..000000000
--- a/community-testing/mongodb/boost-1.50.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp
---- mongodb-src-r2.0.6/db/db.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/db.cpp	2012-07-10 22:27:16.496886220 +0200
-@@ -326,7 +326,7 @@
-         boost::filesystem::path path( dbpath );
-         for ( boost::filesystem::directory_iterator i( path );
-                 i != boost::filesystem::directory_iterator(); ++i ) {
--            string fileName = boost::filesystem::path(*i).leaf();
-+            string fileName = boost::filesystem::path(*i).leaf().string();
-             if ( boost::filesystem::is_directory( *i ) &&
-                     fileName.length() && fileName[ 0 ] == '$' )
-                 boost::filesystem::remove_all( *i );
-@@ -655,11 +655,6 @@
-     dbExecCommand = argv[0];
- 
-     srand(curTimeMicros());
--#if( BOOST_VERSION >= 104500 )
--    boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
--#else
--    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
--#endif
- 
-     {
-         unsigned x = 0x12345678;
-@@ -976,7 +971,7 @@
-         if (params.count("shutdown")){
-             bool failed = false;
- 
--            string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-+            string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
-             if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 )
-                 failed = true;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp
---- mongodb-src-r2.0.6/db/dur.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur.cpp	2012-07-10 21:56:28.866778732 +0200
-@@ -692,7 +692,7 @@
- 
-             bool samePartition = true;
-             try {
--                const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string();
-+                const string dbpathDir = boost::filesystem::path(dbpath).string();
-                 samePartition = onSamePartition(getJournalDir().string(), dbpathDir);
-             }
-             catch(...) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp
---- mongodb-src-r2.0.6/db/dur_journal.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp	2012-07-10 22:04:18.583472723 +0200
-@@ -169,7 +169,7 @@
-                 for ( boost::filesystem::directory_iterator i( getJournalDir() );
-                         i != boost::filesystem::directory_iterator();
-                         ++i ) {
--                    string fileName = boost::filesystem::path(*i).leaf();
-+                    string fileName = boost::filesystem::path(*i).leaf().string();
-                     if( str::startsWith(fileName, "j._") )
-                         return true;
-                 }
-@@ -185,7 +185,7 @@
-                 for ( boost::filesystem::directory_iterator i( getJournalDir() );
-                         i != boost::filesystem::directory_iterator();
-                         ++i ) {
--                    string fileName = boost::filesystem::path(*i).leaf();
-+                    string fileName = boost::filesystem::path(*i).leaf().string();
-                     if( str::startsWith(fileName, "j._") ) {
-                         try {
-                             removeOldJournalFile(*i);
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp
---- mongodb-src-r2.0.6/db/dur_recover.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp	2012-07-10 22:02:18.226799055 +0200
-@@ -71,7 +71,7 @@
-                     i != filesystem::directory_iterator();
-                     ++i ) {
-                 filesystem::path filepath = *i;
--                string fileName = filesystem::path(*i).leaf();
-+                string fileName = filesystem::path(*i).leaf().string();
-                 if( str::startsWith(fileName, "j._") ) {
-                     unsigned u = str::toUnsigned( str::after(fileName, '_') );
-                     if( m.count(u) ) {
-@@ -84,7 +84,7 @@
-                 if( i != m.begin() && m.count(i->first - 1) == 0 ) {
-                     uasserted(13532,
-                     str::stream() << "unexpected file in journal directory " << dir.string()
--                      << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file");
-+                      << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file");
-                 }
-                 files.push_back(i->second);
-             }
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp
---- mongodb-src-r2.0.6/db/instance.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/instance.cpp	2012-07-10 22:08:55.213488817 +0200
-@@ -645,13 +645,13 @@
-                 i != boost::filesystem::directory_iterator(); ++i ) {
-             if ( directoryperdb ) {
-                 boost::filesystem::path p = *i;
--                string dbName = p.leaf();
-+                string dbName = p.leaf().string();
-                 p /= ( dbName + ".ns" );
-                 if ( MMF::exists( p ) )
-                     names.push_back( dbName );
-             }
-             else {
--                string fileName = boost::filesystem::path(*i).leaf();
-+                string fileName = boost::filesystem::path(*i).leaf().string();
-                 if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" )
-                     names.push_back( fileName.substr( 0, fileName.length() - 3 ) );
-             }
-@@ -893,7 +893,7 @@
-     }
- 
-     void acquirePathLock(bool doingRepair) {
--        string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string();
-+        string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string();
- 
-         bool oldFile = false;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp
---- mongodb-src-r2.0.6/db/pdfile.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp	2012-07-10 22:11:44.103498643 +0200
-@@ -1987,7 +1987,7 @@
-             virtual bool apply( const Path &p ) {
-                 if ( !boost::filesystem::exists( p ) )
-                     return false;
--                boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) );
-+                boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) );
-                 return true;
-             }
-             virtual const char * op() const {
-@@ -2093,7 +2093,7 @@
-             uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ?
-                                 "backup" : "$tmp" );
-         BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) );
--        string reservedPathString = reservedPath.native_directory_string();
-+        string reservedPathString = reservedPath.string();
- 
-         bool res;
-         {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp
---- mongodb-src-r2.0.6/dbtests/framework.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp	2012-07-10 22:29:20.610226773 +0200
-@@ -281,7 +281,7 @@
-                 boost::filesystem::create_directory(p);
-             }
- 
--            string dbpathString = p.native_directory_string();
-+            string dbpathString = p.string();
-             dbpath = dbpathString.c_str();
- 
-             cmdLine.prealloc = false;
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h
---- mongodb-src-r2.0.6/pch.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/pch.h	2012-07-10 21:35:57.133373738 +0200
-@@ -79,7 +79,7 @@
- //#include <boost/any.hpp>
- #include "boost/thread/once.hpp"
- //#include <boost/archive/iterators/transform_width.hpp>
--#define BOOST_FILESYSTEM_VERSION 2
-+#define BOOST_FILESYSTEM_VERSION 3
- #include <boost/filesystem/convenience.hpp>
- #include <boost/filesystem/exception.hpp>
- #include <boost/filesystem/operations.hpp>
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp
---- mongodb-src-r2.0.6/shell/shell_utils.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp	2012-07-10 22:38:58.443593723 +0200
-@@ -388,7 +388,7 @@
- #endif
-                 }
- 
--                argv_.push_back( programPath.native_file_string() );
-+                argv_.push_back( programPath.string() );
- 
-                 port_ = -1;
- 
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp
---- mongodb-src-r2.0.6/tools/restore.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/tools/restore.cpp	2012-07-10 22:45:00.046948094 +0200
-@@ -131,7 +131,7 @@
-         log(2) << "drillDown: " << root.string() << endl;
- 
-         // skip hidden files and directories
--        if (root.leaf()[0] == '.' && root.leaf() != ".")
-+        if (root.leaf().string()[0] == '.' && root.leaf().string() != ".")
-             return;
- 
-         if ( is_directory( root ) ) {
-@@ -210,7 +210,7 @@
-             ns += "." + _coll;
-         }
-         else {
--            string l = root.leaf();
-+            string l = root.leaf().string();
-             l = l.substr( 0 , l.find_last_of( "." ) );
-             ns += "." + l;
-         }
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp
---- mongodb-src-r2.0.6/tools/tool.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/tools/tool.cpp	2012-07-10 22:23:53.356874403 +0200
-@@ -113,12 +113,6 @@
-         // we want durability to be disabled.
-         cmdLine.dur = false;
- 
--#if( BOOST_VERSION >= 104500 )
--    boost::filesystem::path::default_name_check( boost::filesystem2::no_check );
--#else
--    boost::filesystem::path::default_name_check( boost::filesystem::no_check );
--#endif
--
-         _name = argv[0];
- 
-         /* using the same style as db.cpp */
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp
---- mongodb-src-r2.0.6/util/background.cpp	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/background.cpp	2012-07-10 21:47:40.420081320 +0200
-@@ -89,7 +89,7 @@
-             if ( msTimeOut ) {
-                 // add msTimeOut millisecond to current time
-                 boost::xtime xt;
--                boost::xtime_get( &xt, boost::TIME_UTC );
-+                boost::xtime_get( &xt, boost::TIME_UTC_ );
- 
-                 unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano
-                 if ( xt.nsec + ns < 1000000000 ) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h
---- mongodb-src-r2.0.6/util/concurrency/mutex.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h	2012-07-10 21:45:51.333408307 +0200
-@@ -29,7 +29,7 @@
- 
-     inline boost::xtime incxtimemillis( long long s ) {
-         boost::xtime xt;
--        boost::xtime_get(&xt, boost::TIME_UTC);
-+        boost::xtime_get(&xt, boost::TIME_UTC_);
-         xt.sec += (int)( s / 1000 );
-         xt.nsec += (int)(( s % 1000 ) * 1000000);
-         if ( xt.nsec >= 1000000000 ) {
-diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h
---- mongodb-src-r2.0.6/util/queue.h	2012-06-04 15:42:54.000000000 +0200
-+++ mongodb-src-r2.0.6-patched/util/queue.h	2012-07-10 22:14:00.243506560 +0200
-@@ -82,7 +82,7 @@
-             Timer timer;
- 
-             boost::xtime xt;
--            boost::xtime_get(&xt, boost::TIME_UTC);
-+            boost::xtime_get(&xt, boost::TIME_UTC_);
-             xt.sec += maxSecondsToWait;
- 
-             scoped_lock l( _lock );
diff --git a/community-testing/mongodb/mongodb.conf b/community-testing/mongodb/mongodb.conf
deleted file mode 100644
index c5272b7f2..000000000
--- a/community-testing/mongodb/mongodb.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
-# Run mongod --help to see a list of options
-
-bind_ip = 127.0.0.1
-quiet = true
-dbpath = /var/lib/mongodb
-logpath = /var/log/mongodb/mongod.log
-logappend = true
diff --git a/community-testing/mongodb/mongodb.install b/community-testing/mongodb/mongodb.install
deleted file mode 100644
index 2ea94553c..000000000
--- a/community-testing/mongodb/mongodb.install
+++ /dev/null
@@ -1,32 +0,0 @@
-# vim: syntax=sh
-
-post_install() {
-  useradd -r -g daemon -d /var/lib/mongodb -s /bin/bash mongodb
-  chown -R mongodb:daemon /var/lib/mongodb
-  chown -R mongodb:daemon /var/log/mongodb
-
-  if [ "$(uname -m)" != "x86_64" ]
-  then
-    echo '==> Warning: the 32 bit version of MongoDB is limited to about 2GB of data.'
-    echo '==> See http://blog.mongodb.org/post/137788967/32-bit-limitations'
-  fi
-}
-
-post_upgrade() {
-  chown -R mongodb:daemon /var/lib/mongodb
-  chown -R mongodb:daemon /var/log/mongodb
-
-  if [ "$(vercmp $2 1.8.2-3)" -lt 0 ]
-  then
-    # have to fix my fudge up in 1.8.2-2 and 1.8.2-3
-    # added july 5th, 2011
-    usermod -s /bin/bash mongodb >& /dev/null
-    echo 'The dbpath has changed from /var/state/mongodb to /var/lib/mongodb'
-    echo 'Make sure you move your data files to the new dbpath before you start/restart mongodb'
-    echo 'The logpath has changed from /var/log/mongod to /var/log/mongodb/mongod.log'
-  fi
-}
-
-pre_remove() {
-  userdel mongodb
-}
diff --git a/community-testing/mongodb/mongodb.rc b/community-testing/mongodb/mongodb.rc
deleted file mode 100644
index 30f2bbf79..000000000
--- a/community-testing/mongodb/mongodb.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# vim: syntax=sh
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof /usr/bin/mongod)
-case "$1" in
-  start)
-    stat_busy "Starting mongodb"
-    [ -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --fork" > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon mongodb
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mongodb"
-    [ ! -z "$PID" ] && /bin/su mongodb -c "/usr/bin/mongod --config /etc/mongodb.conf --shutdown" &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mongodb
-      while [ ! -z "$(pidof /usr/bin/mongod)" ]; do
-        sleep 1;
-      done
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/motion/PKGBUILD b/community-testing/motion/PKGBUILD
deleted file mode 100644
index a68b65526..000000000
--- a/community-testing/motion/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 73334 2012-07-06 15:23:12Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=motion
-pkgver=3.2.12
-pkgrel=6
-pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
-depends=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
-backup=('etc/motion/motion.conf')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	rc.motion
-	ffmpeg-0.8.patch
-	linux-headers.patch
-	ffmpeg-compat.patch)
-md5sums=('1ba0065ed50509aaffb171594c689f46'
-         '2e8c53c4980edddd420f08fdd572c9be'
-         'd36687710837d69fbce4608b1345fa34'
-         'd8c3c4fdded5cfbd729710475559a21d'
-         'e85c596292aceb425fcf17e5072e2fff')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-  patch -Np1 -i $srcdir/linux-headers.patch
-  patch -Np1 -i $srcdir/ffmpeg-compat.patch
-  autoreconf
-  ./configure --prefix=/usr \
-    --without-pgsql \
-    --without-mysql \
-    --sysconfdir=/etc/motion \
-    --with-ffmpeg
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf"
-  install -Dm755 "${srcdir}/rc.motion" "${pkgdir}/etc/rc.d/motion"
-}
diff --git a/community-testing/motion/ffmpeg-0.8.patch b/community-testing/motion/ffmpeg-0.8.patch
deleted file mode 100644
index 5dcc6e686..000000000
--- a/community-testing/motion/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c
---- motion-3.2.12/ffmpeg.c	2010-06-01 08:48:23.000000000 +0200
-+++ motion-3.2.12.new/ffmpeg.c	2011-10-31 17:25:03.000000000 +0100
-@@ -14,7 +14,7 @@
- 
- #include "ffmpeg.h"
- #include "motion.h"
--
-+#include <libavformat/avformat.h>
- #if LIBAVCODEC_BUILD > 4680
- /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with 
-  * non-standard framerates. Previous builds contained a broken hack 
-@@ -228,10 +228,12 @@
-     mpeg1_file_protocol.url_close = file_protocol.url_close;
- 
-     /* Register the append file protocol. */
--#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8)
--    av_register_protocol(&mpeg1_file_protocol);
-+#ifdef have_av_register_protocol2
-+        av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol));
-+#elif defined have_av_register_protocol        
-+	    av_register_protocol(&mpeg1_file_protocol);
- #else
--    register_protocol(&mpeg1_file_protocol);
-+#   warning av_register_protocolXXX missing
- #endif
- }
- 
-@@ -244,7 +246,7 @@
-     const char *ext;
-     AVOutputFormat *of = NULL;
- 
--    /* Here, we use guess_format to automatically setup the codec information.
-+    /* Here, we use av_guess_format to automatically setup the codec information.
-      * If we are using msmpeg4, manually set that codec here.
-      * We also dynamically add the file extension to the filename here. This was
-      * done to support both mpeg1 and mpeg4 codecs since they have different extensions.
-@@ -258,7 +260,7 @@
-         /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would
-          * result in a muxed output file, which isn't appropriate here.
-          */
--        of = guess_format("mpeg1video", NULL, NULL);
-+        of = av_guess_format("mpeg1video", NULL, NULL);
-         if (of) {
-             /* But we want the trailer to be correctly written. */
-             of->write_trailer = mpeg1_write_trailer;
-@@ -270,24 +272,24 @@
- #endif
-     } else if (strcmp(codec, "mpeg4") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-     } else if (strcmp(codec, "msmpeg4") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-         if (of) {
-             /* Manually override the codec id. */
-             of->video_codec = CODEC_ID_MSMPEG4V2;
-         }
-     } else if (strcmp(codec, "swf") == 0) {
-         ext = ".swf";
--        of = guess_format("swf", NULL, NULL);
-+        of = av_guess_format("swf", NULL, NULL);
-     } else if (strcmp(codec, "flv") == 0) {
-         ext = ".flv";
--        of = guess_format("flv", NULL, NULL);
-+        of = av_guess_format("flv", NULL, NULL);
-         of->video_codec = CODEC_ID_FLV1;
-     } else if (strcmp(codec, "ffv1") == 0) {
-         ext = ".avi";
--        of = guess_format("avi", NULL, NULL);
-+        of = av_guess_format("avi", NULL, NULL);
-         if (of) {
-             /* Use the FFMPEG Lossless Video codec (experimental!).
-                Requires strict_std_compliance to be <= -2 */
-@@ -295,7 +297,7 @@
-         }
-     } else if (strcmp(codec, "mov") == 0) {
-         ext = ".mov";
--        of = guess_format("mov", NULL, NULL);        
-+        of = av_guess_format("mov", NULL, NULL);        
-     } else {
-         motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec);
-         return NULL;
-@@ -377,7 +379,7 @@
- 
-     ffmpeg->c     = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st);
-     c->codec_id   = ffmpeg->oc->oformat->video_codec;
--    c->codec_type = CODEC_TYPE_VIDEO;
-+    c->codec_type = AVMEDIA_TYPE_VIDEO;
-     is_mpeg1      = c->codec_id == CODEC_ID_MPEG1VIDEO;
- 
-     if (strcmp(ffmpeg_video_codec, "ffv1") == 0)
-@@ -646,7 +648,7 @@
-     if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) {
-         /* raw video case. The API will change slightly in the near future for that */
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
--        pkt.flags |= PKT_FLAG_KEY;
-+        pkt.flags |= AV_PKT_FLAG_KEY;
-         pkt.data = (uint8_t *)pic;
-         pkt.size = sizeof(AVPicture);
-         ret = av_write_frame(ffmpeg->oc, &pkt);
-@@ -667,7 +669,7 @@
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
-             pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts;
-             if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) {
--                pkt.flags |= PKT_FLAG_KEY;
-+                pkt.flags |= AV_PKT_FLAG_KEY;
-             }
-             pkt.data = ffmpeg->video_outbuf;
-             pkt.size = out_size;
diff --git a/community-testing/motion/ffmpeg-compat.patch b/community-testing/motion/ffmpeg-compat.patch
deleted file mode 100644
index 278166e18..000000000
--- a/community-testing/motion/ffmpeg-compat.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -wbBur motion-3.2.12/configure.in motion-3.2.12.q/configure.in
---- motion-3.2.12/configure.in	2010-06-01 10:48:23.000000000 +0400
-+++ motion-3.2.12.q/configure.in	2012-06-20 13:51:42.000000000 +0400
-@@ -290,163 +290,11 @@
- fi
- 
- 
--#
--# Check for libavcodec and libavformat from ffmpeg
--#
--FFMPEG_DIR="yes"
--FFMPEG_OK="no_found"
--FFMPEG_OBJ=""
--AC_ARG_WITH(ffmpeg,
--[  --with-ffmpeg[=DIR]       Specify the prefix for the install path for
--                          libavcodec/libavformat (part of ffmpeg) be able to 
--                          encode mpeg movies realtime.
--                          If this is not specified motion will try to find
--                          the libraries in /usr and /usr/local.
--                          ],
--FFMPEG_DIR="$withval"
--)
--#
--# --without-ffmpeg or with-ffmpeg=no
--#
--if test "${FFMPEG_DIR}" = "no"; then
--	AC_MSG_CHECKING(for ffmpeg)
--	AC_MSG_RESULT(skipping)
--#
--# with-ffmpeg=<dir> or nothing
--#
--else if test "${FFMPEG_DIR}" = "yes"; then
--	# AUTODETECT STATIC/SHARED LIB 
--	AC_MSG_CHECKING(for ffmpeg autodetecting)
--
--	if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
--		AC_MSG_RESULT(found in /usr/lib64)
--		FFMPEG_OK="found"
--		FFMPEG_LIB="/usr/lib64"
--		FFMPEG_DIR="/usr"
--	elif test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then
--		AC_MSG_RESULT(found in /usr/lib)
--		FFMPEG_OK="found"
--		FFMPEG_LIB="/usr/lib"
--		FFMPEG_DIR="/usr"
--	elif test -f /usr/local/lib/libavcodec.a -o -f /usr/local/lib/libavcodec.so && test -f /usr/local/lib/libavformat.a -o -f /usr/local/lib/libavformat.so ; then
--		AC_MSG_RESULT(found in /usr/local/lib)
--		FFMPEG_OK="found"
--		FFMPEG_LIB="/usr/local/lib"
--		FFMPEG_DIR="/usr/local"
--	else
--		AC_MSG_RESULT(not found)
--		echo ""
--		echo "**********************************************"
--		echo "* libavcodec.a or libavcodec.so or           *"
--		echo "* libavformat.a or libavformat.so not found: *"
--		echo "*    ALL FFMPEG FEATURES DISABLED            *"
--		echo "*                                            *"
--		echo "* Please read the Motion Guide for help:     *"
--		echo "* http://motion.sourceforge.net              *"
--		echo "**********************************************"
--		echo ""		
--	fi 
--else
--	AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-)
--	if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then
--		AC_MSG_RESULT(found)
--		FFMPEG_OK="found"
--		FFMPEG_LIB="${FFMPEG_DIR}/lib"
--	elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then
--		AC_MSG_RESULT(found)
--		FFMPEG_LIB="${FFMPEG_DIR}"
--		FFMPEG_OK="found"
--	else
--		AC_MSG_RESULT(not found)
--		if test "${FFMPEG_OK}" != "found"; then
--			echo ""
--			echo "**********************************************"
--			echo "* libavcodec.a or libavcodec.so or           *"
--			echo "* libavformat.a or libavformat.so not found: *"
--			echo "*    ALL FFMPEG FEATURES DISABLED            *"
--			echo "*                                            *"
--			echo "* Please read the Motion Guide for help:     *"
--			echo "* http://motion.sourceforge.net              *"
--			echo "**********************************************"
--			echo ""
--		fi
--	fi
--fi
--
--#
--# Now check for ffmpeg headers ( avformat.h ) if ffmpeg libs were found
--#
--
--if test "${FFMPEG_OK}" = "found"; then
--	AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR})
--	
--	if test -f ${FFMPEG_DIR}/include/avformat.h; then
--		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h)
--		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
--	elif test -f ${FFMPEG_DIR}/avformat.h; then
--		AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h)
--		FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
--	elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
--		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h)
--		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
--	elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
--		AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
--		FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
--    elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
--        AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
--        FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES" 
--	else
--		AC_MSG_RESULT(not found)
--		FFMPEG_OK="no_found"
--		echo "**********************************************"
--		echo "*       avformat.h not found:                *"
--		echo "*    ALL FFMPEG FEATURES DISABLED            *"
--		echo "*                                            *"
--		echo "* Please read the Motion Guide for help:     *"
--		echo "* http://motion.sourceforge.net              *"
--		echo "**********************************************"
--		echo ""
--	fi
--
--#
--# If ffmpeg libs and headers have been found 
--#
--
--	if  test "${FFMPEG_OK}" = "found"; then	
--		TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
--		TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
--		TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}"
--
--		FFMPEG_OBJ="ffmpeg.o"
--		AC_SUBST(FFMPEG_OBJ)
--
--		AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?])
--		saved_CFLAGS=$CFLAGS
--		saved_LIBS=$LIBS
--		CFLAGS="${FFMPEG_CFLAGS}"
--		LIBS="$TEMP_LIBS"
--		
--		AC_COMPILE_IFELSE(
--			[
--			#include <avformat.h>
--			URLProtocol test_file_protocol;
--			int main(void){
--				test_file_protocol.url_read  = file_protocol.url_read;
--				return 0;
--			}
--			],
--			[AC_MSG_RESULT(yes)],
--			[
--				AC_MSG_RESULT(no)
--				TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_NEW"
--			]
--		)
--		CFLAGS=$saved_CFLAGS
--		LIBS=$saved_LIBS	
--	fi
--fi	
--fi
--
-+TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW"
-+TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg-compat"
-+FFMPEG_OK=found
-+FFMPEG_OBJ="ffmpeg.o"
-+AC_SUBST(FFMPEG_OBJ)
- 
- #
- # Check Mysql
diff --git a/community-testing/motion/linux-headers.patch b/community-testing/motion/linux-headers.patch
deleted file mode 100644
index 795c8aec5..000000000
--- a/community-testing/motion/linux-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h
---- motion-3.2.12-OLD/motion.h	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/motion.h	2011-08-30 02:11:08.000000000 -0700
-@@ -40,7 +40,7 @@
- 
- #define _LINUX_TIME_H 1
- #if !defined(WITHOUT_V4L) && !defined(BSD)
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #endif
- 
- #include <pthread.h>
-diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c
---- motion-3.2.12-OLD/track.c	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/track.c	2011-08-30 23:05:09.000000000 -0700
-@@ -11,6 +11,7 @@
- #include "motion.h"
- 
- #ifndef WITHOUT_V4L
-+#include <linux/videodev2.h>
- #include "pwc-ioctl.h"
- #endif
- 
-diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h
---- motion-3.2.12-OLD/video.h	2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/video.h	2011-08-30 02:11:12.000000000 -0700
-@@ -12,7 +12,7 @@
- 
- #define _LINUX_TIME_H 1
- #ifndef WITHOUT_V4L
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <sys/mman.h>
- #include "pwc-ioctl.h"
- #endif
diff --git a/community-testing/motion/rc.motion b/community-testing/motion/rc.motion
deleted file mode 100644
index 5b4c65500..000000000
--- a/community-testing/motion/rc.motion
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/motion`
-case "$1" in
-  start)
-    stat_busy "Starting Motion"
-    mkdir -p /var/run/motion
-    [ -z "$PID" ] && /usr/bin/motion 1>/dev/null 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon motion
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Motion"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon motion
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/mplayer2/PKGBUILD b/community-testing/mplayer2/PKGBUILD
deleted file mode 100644
index e14dcf9b1..000000000
--- a/community-testing/mplayer2/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 73335 2012-07-06 15:23:17Z ibiru $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Martin Panter <vadmium+aur@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=mplayer2
-pkgver=20120517
-pkgrel=4
-pkgdesc="An advanced general-purpose media player. A fork of the original MPlayer project"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.mplayer2.org/"
-install=$pkgname.install
-depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
-         'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss'
-         'libdvdnav' 'libdvdread' 'libgl' 'libjpeg' 'libmad' 'libpulse' 'libtheora' 'libvdpau'
-         'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'lirc-utils' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
-makedepends=('mesa' 'unzip' 'yasm')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-provides=('mplayer')
-conflicts=('mplayer')
-options=(!emptydirs)
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('814cc9545937e13796df1d4747c3c5d0')
-
-build() {
-    cd "${srcdir}"/$pkgname-$pkgver
-    
-    sed 's/gmplayer/mplayer/g' -i etc/mplayer.desktop
-
-    ./configure --prefix=/usr --confdir=/etc/mplayer \
-                --enable-translation --language=all \
-                --enable-runtime-cpudetection \
-                --enable-joystick \
-                --disable-speex \
-                --disable-openal \
-                --disable-libdv \
-                --disable-musepack \
-                --disable-mga
-    make
-}
-
-package() {
-    cd "${srcdir}"/$pkgname-$pkgver
-
-    make DESTDIR="${pkgdir}" install
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/
-    install -dm755 "${pkgdir}"/usr/share/mplayer/
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf
-
-    install -dm755 "${pkgdir}"/usr/share/applications/
-    install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/
-}
diff --git a/community-testing/mplayer2/mplayer2.install b/community-testing/mplayer2/mplayer2.install
deleted file mode 100644
index 660593cf5..000000000
--- a/community-testing/mplayer2/mplayer2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-testing/mythtv/PKGBUILD b/community-testing/mythtv/PKGBUILD
deleted file mode 100644
index 65a66b19c..000000000
--- a/community-testing/mythtv/PKGBUILD
+++ /dev/null
@@ -1,73 +0,0 @@
-# $Id: PKGBUILD 73356 2012-07-06 15:47:35Z ibiru $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: <kleptophobiac@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=mythtv
-pkgver=0.25.1
-pkgrel=2
-epoch=1
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883'
-         'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa'
-	 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6'
-	 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber'
-	 'x264')
-makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm')
-optdepends=('glew: for GPU commercial flagging'
-            'libcec: for consumer electronics control capabilities'
-	    'libxml2: to read blu-ray metadata'
-	    'openssl: for AirTunes (RAOP) support'
-            'xmltv: to download tv listings')
-conflicts=('myththemes' 'mythplugins-mythvideo')
-replaces=('myththemes' 'mythplugins-mythvideo')
-backup=('etc/conf.d/mythbackend')
-install='mythtv.install'
-source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
-        'mythbackend.rc'
-        'mythbackend.conf'
-	'mythbackend.service')
-md5sums=('4d6375cc3a820abdb2ac5300734687ac'
-         'c8f935d42fb8617e9279bd539811ca5f'
-         'ab962d83614cbd0ac11ce3fcc929829d'
-	 '813008d14a44e9c6212f364723aeaa74')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
-  sed -re 's@Key, &@Key, @' -i 'bindings/php/MythBase.php'
-
-  ARCH="${CARCH/_/-}"
-  ./configure --prefix=/usr \
-              --cpu="$ARCH" \
-	      --disable-altivec \
-	      --disable-audio-jack \
-	      --disable-ccache \
-	      --disable-distcc \
-	      --enable-libfftw3 \
-	      --enable-libmp3lame \
-	      --enable-libx264 \
-	      --enable-vaapi \
-	      --python=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir" install
-
-  install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
-  install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
-  install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service"
-  install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
-
-  mkdir -p "$pkgdir/usr/share/mythtv"
-  cp -R 'contrib' "$pkgdir/usr/share/mythtv"
-  mkdir -p "$pkgdir/var/log/mythtv"
-}
diff --git a/community-testing/mythtv/mythbackend.conf b/community-testing/mythtv/mythbackend.conf
deleted file mode 100644
index 49bbca877..000000000
--- a/community-testing/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-#     Michael Thomson <linux at m-thomson dot net>
-#     Stu Tomlinson <stu at nosnilmot dot com>
-#     Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-#     Jürgen Hoetzel <juergen@archinux.org>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-###############################################################################
-#
-# User who should start the mythbackend process
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can 
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_PATH='/var/log/mythtv'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community-testing/mythtv/mythbackend.rc b/community-testing/mythtv/mythbackend.rc
deleted file mode 100644
index 488b4cb8e..000000000
--- a/community-testing/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/profile
-
-###############################################################################
-# Default values to use if none are supplied in the config file.
-#
-# User who should start the mythbackend process
-MBE_USER='mythtv'
-
-# Startup options for mythbackend
-MBE_OPTS=''
-
-# Directory holding the mythbackend log file
-LOG_PATH='/var/log/mythtv'
-
-# Logging options for mythbackend
-LOG_OPTS=''
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -r "$CONFIG_FILE" ]]; then
-  . "$CONFIG_FILE"
-fi
-
-PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)"
-export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)"
-
-case "$1" in
-  start)
-    stat_busy "Starting MythTV Backend"
-
-    if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then
-      stat_fail
-      exit 0
-    fi
-
-    touch "$PIDFILE"
-    chown "$MBE_USER" "$PIDFILE" "$LOG_PATH"
-
-    MBE_CMD="/usr/bin/mythbackend --daemon \
-                                  --logpath "$LOG_PATH" $LOG_OPTS \
-                                  --pidfile "$PIDFILE" $MBE_OPTS"
-    if su "$MBE_USER" -c "$MBE_CMD"; then
-      add_daemon mythbackend
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MythTV Backend"
-    if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then
-      rm_daemon mythbackend
-      stat_done
-      rm -f "$PIDFILE"
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    "$0" stop
-    "$0" start
-    ;;
-  *)
-    echo "usage: $0 (start|stop|restart)"
-    ;;
-esac
-exit 0
diff --git a/community-testing/mythtv/mythbackend.service b/community-testing/mythtv/mythbackend.service
deleted file mode 100644
index 9d92bd644..000000000
--- a/community-testing/mythtv/mythbackend.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=MythTV Backend
-After=network.target mysqld.service
-
-[Service]
-Type=simple
-Environment=HOME=/var/lib/mythtv
-User=mythtv
-ExecStart=/usr/bin/mythbackend --daemon --logpath /var/log/mythtv
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/mythtv/mythtv.install b/community-testing/mythtv/mythtv.install
deleted file mode 100644
index eed25b868..000000000
--- a/community-testing/mythtv/mythtv.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_upgrade() {
-	if ! getent passwd mythtv &>/dev/null; then
-		getent group mythtv &>/dev/null || groupadd -r mythtv >/dev/null
-		useradd -rmd /var/lib/mythtv -g mythtv -G video,audio,optical -s /bin/bash mythtv >/dev/null
-	fi
-}
-
-post_install() {
-	echo -e "For installation information, visit:\nhttps://wiki.archlinux.org/index.php/MythTV"
-
-	post_upgrade
-}
-
-post_remove() {
-	echo -e "The MythTV database was not removed. To remove it, run:\n  mysql -u root -e 'drop database mythconverg;'"
-	[ -d var/lib/mythtv ] && echo "The MythTV home directory /var/lib/mythtv can also be removed."
-
-	getent passwd mythtv &>/dev/null && userdel mythtv >/dev/null
-	getent group mythtv &>/dev/null && groupdel mythtv >/dev/null
-}
diff --git a/community-testing/neatx/PKGBUILD b/community-testing/neatx/PKGBUILD
deleted file mode 100644
index 3146452f5..000000000
--- a/community-testing/neatx/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 78062 2012-10-16 11:51:38Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Nicolas Doualot <packages@slubman.info>
-
-pkgname=neatx
-pkgver=0.3.1
-pkgrel=13
-pkgdesc="A free NX server by google"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/neatx/"
-license=('GPL')
-depends=('nxserver' 'python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk')
-makedepends=('docutils')
-optdepends=('xorg-xdm: if you want to use KDE or GNOME session'
-	    'xorg-fonts-misc: to use default font'
-	    'xterm: if you want console session')
-install=neatx.install
-source=(http://neatx.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        constants.archlinux.patch)
-md5sums=('5748656738d5f04fef1af01b9fe5ef20'
-         'a5ca4aa399cc25fa8435280e8b03c5a3')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -i "$srcdir/constants.archlinux.patch" -p2
-
-  ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-  chmod 777 "$pkgdir/var/lib/neatx/sessions"
-
-  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
-  echo -e '/usr/lib\n/opt/NX/lib' > ${pkgdir}/etc/ld.so.conf.d/neatx.conf
-}
diff --git a/community-testing/neatx/constants.archlinux.patch b/community-testing/neatx/constants.archlinux.patch
deleted file mode 100644
index dff5e2415..000000000
--- a/community-testing/neatx/constants.archlinux.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/neatx-0.3.1/lib/constants.py	2009-06-24 21:19:55.000000000 +0200
-+++ b/neatx-0.3.1/lib/constants.py	2009-07-08 10:50:30.000000000 +0200
-@@ -25,19 +25,19 @@
- from neatx import _autoconf
- 
- 
--NXDIR = "/usr/lib/nx"
-+NXDIR = "/opt/NX/bin"
- 
- SYSLOG_ADDRESS = "/dev/log"
- BASH = "/bin/bash"
--NETCAT = "/bin/netcat"
-+NETCAT = "/usr/bin/netcat"
- XRDB = "/usr/bin/xrdb"
- SU = "/bin/su"
- SSH = "/usr/bin/ssh"
- XAUTH = "/usr/bin/xauth"
--XSESSION = "/etc/X11/Xsession"
-+XSESSION = "/etc/X11/xdm/Xsession"
- 
- START_CONSOLE_COMMAND = "/usr/bin/xterm"
--START_KDE_COMMAND = XSESSION + " startkde"
-+START_KDE_COMMAND = " startkde"
- START_GNOME_COMMAND = XSESSION + " gnome-session"
- 
- NXUSER = "nx"
-@@ -47,12 +47,13 @@
- NXNC = _autoconf.PKGLIBDIR + "/nxnc"
- NXDIALOG = _autoconf.PKGLIBDIR + "/nxdialog"
- NXAGENT = NXDIR + "/nxagent"
--NXAGENT_PKGNAME = "nxagent"
-+#NXAGENT_PKGNAME = "nxagent"
-+NXAGENT_PKGNAME = "nxserver"
- FDCOPY = _autoconf.PKGLIBDIR + "/fdcopy"
- TTYSETUP = _autoconf.PKGLIBDIR + "/ttysetup"
- 
- # Extract nxagent version using the following command.
--NXAGENT_VERSION_COMMAND = ("dpkg-query -W --showformat='${Version}' %s" %
-+NXAGENT_VERSION_COMMAND = ("pacman -Qi %s | grep Version | awk '{print $3}'" %
-                            NXAGENT_PKGNAME)
- NXAGENT_VERSION_SEP = ".-~"
- 
diff --git a/community-testing/neatx/neatx.install b/community-testing/neatx/neatx.install
deleted file mode 100644
index 89356878c..000000000
--- a/community-testing/neatx/neatx.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  useradd -d /opt/NX/home/nx -s /usr/lib/neatx/nxserver-login-wrapper nx &> /dev/null
-  mkdir -p ~nx/.ssh
-  cp /usr/share/neatx/authorized_keys.nomachine ~nx/.ssh/authorized_keys
-  chmod 600 ~nx/.ssh/authorized_keys
-  chown -R nx ~nx
-  post_remove
-}
-
-pre_remove() {
-  userdel nx > /dev/null 2>&1
-  rm -rf ~nx
-}
-
-post_remove() {
-  sed  -e '/\/opt\/NX\/lib/d' -i etc/ld.so.conf
-  ldconfig
-}
diff --git a/community-testing/nestopia/ChangeLog b/community-testing/nestopia/ChangeLog
deleted file mode 100644
index 5077d00b2..000000000
--- a/community-testing/nestopia/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2008-12-16  Tiago Pierezan Camargo  <tcamargo@gmail.com>
-
-	* PKGBUILD: Minor corrections.
-
-2008-12-04  Tiago Pierezan Camargo  <tcamargo@gmail.com>
-
-	* PKGBUILD (source): Package adopted.
-	Variable/version cleanup.
-	Patch to remove bogus error messages on program exit.
-	New dependency: mesa.
-	Renamed executable to nestopia.
-
diff --git a/community-testing/nestopia/PKGBUILD b/community-testing/nestopia/PKGBUILD
deleted file mode 100644
index 7ef2d4b96..000000000
--- a/community-testing/nestopia/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 77297 2012-10-08 15:06:02Z 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.42
-pkgrel=3
-pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
-url='http://0ldsk00l.ca/nestopia.html'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('sdl' 'alsa-lib' 'gtk3' 'mesa' 'glu')
-makedepends=('unzip')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver"
-	"build-fix.patch")
-md5sums=('ce7ffba59f19c764f08546e015777172'
-         '49dc5a51243a023b47f25ff3d6aabd89')
-
-build() {
-  cd ${srcdir}/rdanbrook-nestopia-*
-  patch -p1 <$srcdir/build-fix.patch
-  make PREFIX=/usr -j1
-}
-
-package() {
-  cd ${srcdir}/rdanbrook-nestopia-*
-  mkdir -p $pkgdir/usr/{bin,share/nestopia}
-  make install PREFIX=$pkgdir/usr
-}
diff --git a/community-testing/nestopia/build-fix.patch b/community-testing/nestopia/build-fix.patch
deleted file mode 100644
index 7b8609f8d..000000000
--- a/community-testing/nestopia/build-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -wbBur rdanbrook-nestopia-53aa38a/Makefile rdanbrook-nestopia-53aa38a.my/Makefile
---- rdanbrook-nestopia-53aa38a/Makefile	2012-09-26 04:21:32.000000000 +0400
-+++ rdanbrook-nestopia-53aa38a.my/Makefile	2012-10-01 21:12:08.000000000 +0400
-@@ -186,12 +186,12 @@
- 	install -m 0644 NstDatabase.xml $(DATADIR)
- 	install -m 0644 source/linux/icons/*.png $(DATADIR)/icons
- 	install -m 0644 source/linux/icons/*.svg $(DATADIR)/icons
--	install -m 0644 source/linux/icons/nestopia.svg /usr/share/pixmaps
--	xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop
-+	install -Dm0644 source/linux/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg
-+	install -Dm0644 $(DATADIR)/nestopia.desktop $(PREFIX)/share/applications/nestopia.desktop
- 
- uninstall:
- 	xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop
--	rm /usr/share/pixmaps/nestopia.svg
-+	rm $(PREFIX)/share/pixmaps/nestopia.svg
- 	rm $(BINDIR)/$(EXE)
- 	rm -rf $(DATADIR)
- 
diff --git a/community-testing/nginx/PKGBUILD b/community-testing/nginx/PKGBUILD
deleted file mode 100644
index 508861959..000000000
--- a/community-testing/nginx/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# $Id: PKGBUILD 72828 2012-06-23 06:49:26Z bpiotrowski $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com>
-# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
-
-pkgname=nginx
-pkgver=1.2.1
-pkgrel=6
-pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server"
-arch=('i686' 'x86_64')
-depends=('pcre' 'zlib' 'openssl')
-makedepends=('passenger')
-optdepends=('passenger')
-url="http://nginx.org"
-license=('custom')
-install=nginx.install
-backup=('etc/nginx/fastcgi.conf'
-        'etc/nginx/fastcgi_params'
-        'etc/nginx/koi-win'
-        'etc/nginx/koi-utf'
-        'etc/nginx/mime.types'
-        'etc/nginx/nginx.conf'
-        'etc/nginx/scgi_params'
-        'etc/nginx/uwsgi_params'
-        'etc/nginx/win-utf'
-        'etc/logrotate.d/nginx')
-source=(http://nginx.org/download/nginx-$pkgver.tar.gz
-        rc.d service
-        nginx.logrotate)
-md5sums=('ceacae12d66d1f021bf3737a0269b6f4'
-         'f62c7c9b5a53471d4666a4c49ad363fb'
-         '16c6b4cbe24001a3f4f58b9d5f4e3d4c'
-         'b38744739022876554a0444d92e6603b')
-
-_cfgdir=/etc/nginx
-_tmpdir=/var/tmp/nginx
-
-build() {
-	cd "$srcdir"/$pkgname-$pkgver
-
-	./configure \
-        --prefix=$_cfgdir \
-        --conf-path=$_cfgdir/nginx.conf \
-        --sbin-path=/usr/sbin/nginx \
-        --pid-path=/var/run/nginx.pid \
-        --lock-path=/var/lock/nginx.lock \
-        --user=http --group=http \
-        --http-log-path=/var/log/nginx/access.log \
-        --error-log-path=/var/log/nginx/error.log \
-        --http-client-body-temp-path=$_tmpdir/client-body \
-        --http-proxy-temp-path=$_tmpdir/proxy \
-        --http-fastcgi-temp-path=$_tmpdir/fastcgi \
-        --http-scgi-temp-path=$_tmpdir/scgi \
-        --http-uwsgi-temp-path=$_tmpdir/uwsgi \
-        --with-imap --with-imap_ssl_module \
-        --with-ipv6 --with-pcre-jit \
-        --with-file-aio \
-        --with-http_dav_module \
-        --with-http_gzip_static_module \
-        --with-http_realip_module \
-        --with-http_ssl_module \
-        --with-http_stub_status_module \
-        --add-module=/usr/lib/passenger/ext/nginx \
-        #--with-http_mp4_module \
-        #--with-http_realip_module \
-        #--with-http_addition_module \
-        #--with-http_xslt_module \
-        #--with-http_image_filter_module \
-        #--with-http_geoip_module \
-        #--with-http_sub_module \
-        #--with-http_flv_module \
-        #--with-http_random_index_module \
-        #--with-http_secure_link_module \
-        #--with-http_degradation_module \
-        #--with-http_perl_module \
-
-	make
-}
-
-package() {
-	cd "$srcdir/nginx-${pkgver}"
-	make DESTDIR="$pkgdir" install
-
-	install -d "$pkgdir"/etc/logrotate.d
-    install -m644 $srcdir/nginx.logrotate $pkgdir/etc/logrotate.d/nginx
-    
-	sed -e 's|\<user\s\+\w\+;|user html;|g' \
-	    -e '44s|html|/usr/share/nginx/html|' \
-	    -e '54s|html|/usr/share/nginx/html|' \
-	    -i $pkgdir/etc/nginx/nginx.conf
-	rm $pkgdir/etc/nginx/*.default
-
-	install -dm1777 $pkgdir/var/tmp
-	install -d $pkgdir/$_tmpdir
-
-    install -d $pkgdir/usr/share/nginx
-    mv $pkgdir/etc/nginx/html/ $pkgdir/usr/share/nginx
-
-	install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/nginx
-	install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/nginx.service
-	install -D -m644 LICENSE $pkgdir/usr/share/licenses/nginx/LICENSE
-	rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/nginx/nginx b/community-testing/nginx/nginx
deleted file mode 100644
index eb9031e81..000000000
--- a/community-testing/nginx/nginx
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-function check_config {
-  stat_busy "Checking nginx configuration"
-  /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf
-  if [ $? -ne 0 ]; then
-    stat_die
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    check_config
-    $0 careless_start
-    ;;
-  careless_start)
-    stat_busy "Starting nginx"
-    if [ -s /var/run/nginx.pid ]; then
-      stat_fail
-      # probably ;)
-      stat_busy "Nginx is already running"
-      stat_die
-     fi
-    /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon nginx
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nginx"
-    PID=$(cat /var/run/nginx.pid)
-    kill -QUIT $PID &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      for i in {1..10}; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    check_config
-    $0 stop
-    sleep 1
-    $0 careless_start
-    ;;
-  reload)
-    check_config
-    if [ -s /var/run/nginx.pid ]; then
-      status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid)
-    fi
-    ;;
-  check)
-    check_config
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload|check|careless_start}"
-esac
diff --git a/community-testing/nginx/nginx.install b/community-testing/nginx/nginx.install
deleted file mode 100644
index b31ee41d7..000000000
--- a/community-testing/nginx/nginx.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-    if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then
-        echo " >>> Since 1.2.1-2 several changes has been made in package:"
-        echo "      - *.conf files have been moved to /etc/nginx"
-        echo "      - /etc/conf.d/nginx has been removed"
-        echo "        Main configuration file is set to /etc/nginx/nginx.conf"
-        echo "      - access.log and error.log can be found in /var/log/nginx by default" 
-        echo "      - bundled *.html files have been moved to /usr/share/nginx/html"
-        echo "      - /etc/nginx/{html,logs} symbolic links and *.default files have been removed"
-    fi
-}
diff --git a/community-testing/nginx/nginx.logrotate b/community-testing/nginx/nginx.logrotate
deleted file mode 100644
index d490d5d9b..000000000
--- a/community-testing/nginx/nginx.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/nginx/*.log {
-	missingok
-	sharedscripts
-	compress
-	postrotate
-		test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid`
-	endscript
-}
diff --git a/community-testing/nginx/rc.d b/community-testing/nginx/rc.d
deleted file mode 100644
index eb9031e81..000000000
--- a/community-testing/nginx/rc.d
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-function check_config {
-  stat_busy "Checking nginx configuration"
-  /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf
-  if [ $? -ne 0 ]; then
-    stat_die
-  else
-    stat_done
-  fi
-}
-
-case "$1" in
-  start)
-    check_config
-    $0 careless_start
-    ;;
-  careless_start)
-    stat_busy "Starting nginx"
-    if [ -s /var/run/nginx.pid ]; then
-      stat_fail
-      # probably ;)
-      stat_busy "Nginx is already running"
-      stat_die
-     fi
-    /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      add_daemon nginx
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nginx"
-    PID=$(cat /var/run/nginx.pid)
-    kill -QUIT $PID &>/dev/null
-    if [ $? -ne 0 ]; then
-      stat_fail
-    else
-      for i in {1..10}; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    check_config
-    $0 stop
-    sleep 1
-    $0 careless_start
-    ;;
-  reload)
-    check_config
-    if [ -s /var/run/nginx.pid ]; then
-      status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid)
-    fi
-    ;;
-  check)
-    check_config
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload|check|careless_start}"
-esac
diff --git a/community-testing/nginx/service b/community-testing/nginx/service
deleted file mode 100644
index 78d0a492c..000000000
--- a/community-testing/nginx/service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=A high performance web server and a reverse proxy server
-
-[Service]
-Type=forking
-PIDFile=/run/nginx.pid
-ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;'
-ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload
-ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/oidentd/PKGBUILD b/community-testing/oidentd/PKGBUILD
deleted file mode 100644
index 0de9d33c6..000000000
--- a/community-testing/oidentd/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 72556 2012-06-16 17:10:05Z dreisner $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=oidentd
-pkgver=2.0.8
-pkgrel=6
-pkgdesc='An RFC1413 compliant ident daemon'
-arch=('i686' 'x86_64')
-url="http://dev.ojnk.net/"
-license=('GPL')
-depends=('glibc' 'bash')
-source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz
-        rc.d conf.d service socket)
-md5sums=('c3d9a56255819ef8904b867284386911'
-         '93cbf742cdd0b053f67482273d715f25'
-         '603307525771724b0f55a2c34fbc3f3e'
-         'b215bee5764cdecb0939f44d5d2dccbe'
-         '651c2ef45d1d345d95056ef0787e29e6')
-
-build() {
-	cd $srcdir/$pkgname-$pkgver
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd $srcdir/$pkgname-$pkgver
-	make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install
-
-    install -D -m644 $srcdir/conf.d $pkgdir/etc/conf.d/oidentd
-	install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/oidentd
-	install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/oidentd@.service
-	install -D -m644 $srcdir/socket $pkgdir/usr/lib/systemd/system/oidentd.socket
-}
-
diff --git a/community-testing/oidentd/conf.d b/community-testing/oidentd/conf.d
deleted file mode 100644
index 5eefa80e2..000000000
--- a/community-testing/oidentd/conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-USER=nobody
-GROUP=nobody
-OPTS=""
-# You will need this, when you want oidentd listen both on IPv4 and IPv6
-# OPTS="-a ::"
diff --git a/community-testing/oidentd/rc.d b/community-testing/oidentd/rc.d
deleted file mode 100644
index 8b3c04c45..000000000
--- a/community-testing/oidentd/rc.d
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/oidentd
-
-# no daemon check needed for oidentd, and no pid nesecary.
-case "$1" in
-  start)
-    stat_busy "Starting oidentd Daemon..."
-    # oidentd is smart enough to only run one copy of
-    # itsself, no check nesecary, and no pidfile
-    /usr/sbin/oidentd -u ${USER} -g ${GROUP} ${OPTS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon oidentd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping oidentd Daemon..."
-    # kill the process by it's full name, or the init script
-    # will terminate as well, wreaking havok.
-    killall /usr/sbin/oidentd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon oidentd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/oidentd/service b/community-testing/oidentd/service
deleted file mode 100644
index 3688298c1..000000000
--- a/community-testing/oidentd/service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Ident (RFC 1413) per-connection server
-
-[Service]
-ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardError=syslog
diff --git a/community-testing/oidentd/socket b/community-testing/oidentd/socket
deleted file mode 100644
index 63df7036e..000000000
--- a/community-testing/oidentd/socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Ident (RFC 1413) socket
-Conflicts=oidentd.service
-
-[Socket]
-ListenStream=113
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/community-testing/onboard/PKGBUILD b/community-testing/onboard/PKGBUILD
deleted file mode 100644
index 0b4510956..000000000
--- a/community-testing/onboard/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 78064 2012-10-16 11:51:46Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=onboard
-pkgver=0.98.1
-pkgrel=1
-pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/onboard"
-license=('GPL')
-depends=('python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('python-distutils-extra')
-optdepends=('at-spi2-atk: auto-show when editing text'
-            'mousetweaks: hover click with mouse')
-options=('!emptydirs')
-install=$pkgname.install
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('107e031b429329b71deb67c9b90195d6')
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Do not set getpreferredencoding, because it breaks getstatusoutput() in the setup script
-  sed -i '/getpreferredencoding =/ d' setup.py
-
-  python3 setup.py install --root=$pkgdir/ --optimize=1
-}
diff --git a/community-testing/onboard/onboard.install b/community-testing/onboard/onboard.install
deleted file mode 100644
index aa4c3e059..000000000
--- a/community-testing/onboard/onboard.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/openimageio/PKGBUILD b/community-testing/openimageio/PKGBUILD
deleted file mode 100644
index 3f19c52e5..000000000
--- a/community-testing/openimageio/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78811 2012-10-25 01:48:03Z ebelanger $
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-pkgname=openimageio
-pkgver=1.0.9
-pkgrel=4
-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' 'mesa')
-optdepends=('qt: iv image viewer'
-            'python2: bindings support')
-source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
-md5sums=('4b98a057515cc95fc954743c987f19ba')
-
-build() {
-  cd "$srcdir"/$_pkgname*/src
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages ..
-  make
-}
-
-package() {
-  cd "$srcdir"/$_pkgname*/src/build
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  cd ../..
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-testing/openscenegraph/PKGBUILD b/community-testing/openscenegraph/PKGBUILD
deleted file mode 100644
index cfa40ee15..000000000
--- a/community-testing/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 73336 2012-07-06 15:23:22Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hans Janssen <janserv@gmail.com>
-# Contributor: my64 <packages@obordes.com>
-# Contributor: Colin Pitrat <colin.pitrat@gmail.com>
-
-pkgname=openscenegraph
-pkgver=3.0.1
-pkgrel=6
-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' 'qt' 'ffmpeg-compat')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib' 'qt')
-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
-  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
-  LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
-  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
-  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
-  [ $NOEXTRACT -eq 1 ] || cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DFFMPEG_LIBAVCODEC_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBAVCODEC_LIBRARIES=/usr/lib/ffmpeg-compat/libavcodec.so \
-    -DFFMPEG_LIBAVDEVICE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBAVDEVICE_LIBRARIES=/usr/lib/ffmpeg-compat/libavdevice.so \
-    -DFFMPEG_LIBAVFORMAT_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBAVFORMAT_LIBRARIES=/usr/lib/ffmpeg-compat/libavformat.so \
-    -DFFMPEG_LIBAVUTIL_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBAVUTIL_LIBRARIES=/usr/lib/ffmpeg-compat/libavutil.so \
-    -DFFMPEG_LIBSWSCALE_INCLUDE_DIRS=/usr/include/ffmpeg-compat \
-    -DFFMPEG_LIBSWSCALE_LIBRARIES=/usr/lib/ffmpeg-compat/libswscale.so
-
-  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/oss/PKGBUILD b/community-testing/oss/PKGBUILD
deleted file mode 100644
index 9ec64590e..000000000
--- a/community-testing/oss/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# $Id: PKGBUILD 73269 2012-07-04 21:23:35Z dreisner $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=oss
-pkgname=(oss libflashsupport-oss)
-pkgver=4.2_2006
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://developer.opensound.com/"
-license=('GPL2')
-makedepends=('gtk2')
-source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2"
-	"rm-init-scripts.patch"
-	"rc-script"
-	"soundon.patch"
-	"remove-hal.patch"
-	"oss.service"
-	)
-md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c'
-         'b9a380a0ac8896390d71ac13676f27e1'
-         'cbcbce5c03b127df5eafa8faa091492c'
-         '65f07fe241bfbf912f76d8b6d8f276b5'
-         'cd7f1dc6166bba8c94d96f3a28e948a5'
-         '8db0255b380dc6672993e627d1cd8ca6')
-_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl
-
-build() {
-	cd "${srcdir}/${_dir}"
-
-	# Avoid these flags conflicting with OSS build system.
-	unset CFLAGS
-	unset LDFLAGS
-	unset OSFLAGS
-	unset LIBRARIES
-	export NO_WARNING_CHECKS=yes
-
-	# Compile libflashsupport.so only in packaging time, so we avoid
-	# conflicts with other packages and ease package management.
-	msg "Building libflashsupport.so."
-	cd oss/lib
-	gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so
-
-	msg "Preparing the build environment."
-	cd "${srcdir}"
-
-	# Create build directory and configure
-	rm -rf build
-	mkdir build && cd build
-	"${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm
-
-	# ossvermagic hardcodes /lib/modules *grumble*
-	sed -i 's|/lib/modules|/usr&|' \
-			os_cmd/Linux/ossvermagic/ossvermagic.c
-
-	msg "Building OSS."
-	make build
-
-	msg "Patching init scripts."
-	cd "${srcdir}/build/prototype"
-	rm usr/lib/oss/etc/S89oss
-	patch -p0 -i "${srcdir}/rm-init-scripts.patch"
-	patch -p0 -i "${srcdir}/soundon.patch"
-	# remove hal dependency
-	patch -p0 -i "${srcdir}/remove-hal.patch"
-	rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi
-
-	# fix kernel module directories
-	sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon
-	sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh
-	sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh
-	sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh
-	sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \
-		usr/lib/oss/build/install.sh \
-		usr/lib/oss/scripts/restore_drv.sh \
-		usr/lib/oss/scripts/setup-alsa.sh \
-		usr/lib/oss/scripts/remove_drv.sh \
-		usr/lib/oss/build/Makefile.tmpl \
-		usr/lib/oss/build/Makefile.osscore \
-		usr/lib/oss/cuckoo/Makefile
-}
-
-package_oss() {
-	pkgdesc="Open Sound System UNIX audio architecture"
-	depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed')
-	optdepends=('gtk2: for graphical mixer (ossxmix)'
-	            'libflashsupport-oss: Adobe flash plugin support')
-	conflicts=('oss-linux' 'oss-linux-free' 'oss-testing')
-	backup=('usr/lib/oss/soundon.user')
-	install=oss.install
-
-	cd "${srcdir}/build/prototype"
-	cp -a * "${pkgdir}"
-
-	chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815)
-	find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy
-	install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss"
-	install -Dm644 "$srcdir/oss.service" "$pkgdir/usr/lib/systemd/system/oss.service"
-}
-
-package_libflashsupport-oss() {
-	pkgdesc="Adobe flash plugin support lib (OSSv4)"
-	conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss')
-	depends=('oss')
-
-	cd "${srcdir}/${_dir}"
-
-	install -dm755 "$pkgdir/usr/lib"
-	ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so"
-}
-
diff --git a/community-testing/oss/oss.install b/community-testing/oss/oss.install
deleted file mode 100644
index 672d63644..000000000
--- a/community-testing/oss/oss.install
+++ /dev/null
@@ -1,30 +0,0 @@
-post_install() {
-	echo "Running OSS install script..."
-	sh /usr/lib/oss/build/install.sh &>/dev/null
-	echo
-	echo " Note that OSS can't currently work together with kernel"
-	echo " ALSA modules, so they were moved out by the OSS install"
-	echo " scripts. If you want the ALSA kernel modules back, you can"
-	echo " just remove this package using pacman."
-}
-
-post_upgrade() {
-	echo "Running OSS update script..."
-	sh /usr/lib/oss/build/install.sh &>/dev/null
-
-	if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then
-		echo "libflashsupport.so has been split into a seperate package."
-		echo "If you want flash to use oss, please install libflashsupport-oss"
-	fi
-}
-
-pre_remove() {
-	# Restore any replaced ALSA drivers.
-	sh /usr/lib/oss/scripts/restore_drv.sh
-}
-
-post_remove() {
-	echo " Open Sound System was now removed, and the ALSA kernel"
-	echo " modules were restored."
-}
-
diff --git a/community-testing/oss/oss.service b/community-testing/oss/oss.service
deleted file mode 100644
index 107c9bf3f..000000000
--- a/community-testing/oss/oss.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Open Sound System v4
-Before=sound.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/usr/sbin/soundon
-ExecStop=/usr/sbin/soundoff
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/oss/rc-script b/community-testing/oss/rc-script
deleted file mode 100644
index 5c930107c..000000000
--- a/community-testing/oss/rc-script
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy 'Starting Open Sound System'
-		if /usr/sbin/soundon; then
-			add_daemon oss
-			stat_done
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Open Sound System'
-		if /usr/sbin/soundoff; then
-			rm_daemon oss
-			stat_done
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart}"
-esac
diff --git a/community-testing/oss/remove-hal.patch b/community-testing/oss/remove-hal.patch
deleted file mode 100644
index 27e2ef2de..000000000
--- a/community-testing/oss/remove-hal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Date: Tue Aug  2 16:37:31 CEST 2011
-Author: Florian Pritz <bluewind@xinu.at>
-This removes all hal dependencies
-
-References:
-http://www.archlinux.org/todo/92/
-
---- usr/lib/oss/build/install_2011-08-02_162647.sh	2011-08-02 16:26:47.000000000 +0200
-+++ usr/lib/oss/build/install.sh	2011-08-02 16:27:13.000000000 +0200
-@@ -336,10 +336,4 @@
-   echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs
- fi
- 
--# Hal 0.5.0+ hotplug
--mkdir -p /usr/lib/hal/scripts
--ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/
--mkdir -p /usr/share/hal/fdi/policy/20thirdparty/
--ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/
--
- exit 0
diff --git a/community-testing/oss/rm-init-scripts.patch b/community-testing/oss/rm-init-scripts.patch
deleted file mode 100644
index 981ff605f..000000000
--- a/community-testing/oss/rm-init-scripts.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- usr/lib/oss/build/install.sh.orig	2008-09-25 11:41:47.180167692 -0300
-+++ usr/lib/oss/build/install.sh	2008-09-25 11:41:47.180167692 -0300
-@@ -290,38 +290,6 @@
-    echo 
- fi
- 
--if ! test -d /etc/init.d
--then
--  mkdir /etc/init.d
--fi
--
--rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss
--cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss
--
--chmod 744 /etc/init.d/oss
--
--if test -x /sbin/chkconfig
--then
--  /sbin/chkconfig oss on        > /dev/null 2>&1
--else
-- if test -x /usr/sbin/update-rc.d
-- then
--   /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1
-- else
--  if test -d etc/rc.d/rc3.d
--  then
--    rm -f /etc/rc.d/rc3.d/S89oss
--    ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss
--  else
--    if test -d /etc/rc3.d
--    then
--      rm -f /etc/rc3.d/S89oss
--      ln -s /etc/init.d/oss /etc/rc3.d/S89oss
--    fi
--  fi
-- fi
--fi
--
- # Install ALSA interface module (Cuckoo)
- #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1
- #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1
---- usr/lib/oss/scripts/restore_drv.sh.orig	2008-09-25 11:41:47.210168487 -0300
-+++ usr/lib/oss/scripts/restore_drv.sh	2008-09-25 11:41:47.210168487 -0300
-@@ -18,8 +18,6 @@
-   fi
- fi
- 
--rm -f /etc/init.d/oss
--
- if ! test -d /lib/modules/`uname -r`/kernel/sound
- then
-    if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2
diff --git a/community-testing/oss/soundon.patch b/community-testing/oss/soundon.patch
deleted file mode 100644
index 4702b8680..000000000
--- a/community-testing/oss/soundon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- usr/sbin/soundon.old	2009-09-04 06:35:26.000000000 +0100
-+++ usr/sbin/soundon	2009-11-15 13:59:53.000000000 +0000
-@@ -255,7 +255,10 @@
-   then
-      if test "`uname -m` " = "x86_64 "
-      then
--       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
-+       # Fix for compatibility with Arch's directory structure
-+       # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed
-+       ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2
-+       #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2
-        #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
-      else
-        if test -s /lib/libasound.so.2
-@@ -278,8 +281,11 @@
- then
-    if test "`uname -m` " = "x86_64 "
-    then
--     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
--     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
-+     # Fix for compatibility with Arch's directory structure
-+     ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib
-+     ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib
-+     #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64
-+     #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64
-    else
-      if test -s /lib/libasound.so.2
-      then
diff --git a/community-testing/pdf2djvu/PKGBUILD b/community-testing/pdf2djvu/PKGBUILD
deleted file mode 100644
index 6c2fe6351..000000000
--- a/community-testing/pdf2djvu/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78476 2012-10-19 13:29:55Z bluewind $
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-
-pkgname=pdf2djvu
-pkgver=0.7.15
-pkgrel=1
-pkgdesc="Creates DjVu files from PDF files"
-arch=('i686' 'x86_64')
-url="http://pdf2djvu.googlecode.com"
-license=('GPL')
-depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick')
-makedepends=('pstreams' 'python2-nose' 'ttf-liberation')
-source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz")
-
-build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    ./configure --prefix=/usr
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make install DESTDIR=${pkgdir}
-    install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1
-}
-check() {
-
-    cd ${srcdir}/${pkgname}-${pkgver}
-    sed -i 's/nosetests/nosetests2/' tests/Makefile
-    make test
-}
-md5sums=('cd03b61636b8d58592e7f419b434581f')
diff --git a/community-testing/pdnsd/PKGBUILD b/community-testing/pdnsd/PKGBUILD
deleted file mode 100644
index 77ae37700..000000000
--- a/community-testing/pdnsd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 72558 2012-06-16 17:10:27Z dreisner $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Henrik Nymann Jensen <h@henriknj.dk>
-
-pkgname=pdnsd
-pkgver=1.2.9
-pkgrel=2
-pkgdesc="Is a proxy DNS server with permanent caching"
-arch=(i686 x86_64)
-url="http://members.home.nl/p.a.rombouts/pdnsd/"
-license=('GPL')
-depends=('glibc')
-#backup=('etc/pdnsd.conf')
-source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$pkgver-par.tar.gz
-	pdnsd
-	pdnsd.service)
-md5sums=('037f79d191b98974ffc2c9649727bf66'
-         '3670bd47c9303fbb655d9216715512de'
-         'fad5e518d126b29fc947941d57a0a494')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-  make DESTDIR=$pkgdir install
-  install -Dm0755 $srcdir/pdnsd $pkgdir/etc/rc.d/pdnsd
-  install -Dm0644 $srcdir/pdnsd.service $pkgdir/usr/lib/systemd/system/pdnsd.service
-}
diff --git a/community-testing/pdnsd/pdnsd b/community-testing/pdnsd/pdnsd
deleted file mode 100644
index 34a541d18..000000000
--- a/community-testing/pdnsd/pdnsd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/pdnsd`
-case "$1" in
-  start)
-    stat_busy "Starting pdnsd Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/sbin/pdnsd -d
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon pdnsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping pdnsd Daemon"
-    [ ! -z "$PID" ]  && kill -TERM $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon pdnsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/community-testing/pdnsd/pdnsd.service b/community-testing/pdnsd/pdnsd.service
deleted file mode 100644
index 5821dbcb2..000000000
--- a/community-testing/pdnsd/pdnsd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=proxy name server
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/pdnsd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD
deleted file mode 100644
index 6bcdb894f..000000000
--- a/community-testing/performous/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 78812 2012-10-25 01:48:14Z ebelanger $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=performous
-pkgver=0.6.1
-pkgrel=17
-pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
-arch=('i686' 'x86_64')
-url="http://performous.org/"
-license=('GPL')
-depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50' 'mesa')
-optdepends=('performous-freesongs: free songs for performous')
-source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
-        boost-filesystem-v3.patch
-	ffmpeg-0.11.patch
-	png15.patch
-	fix-boost-1.50-xtime.patch)
-md5sums=('451a759de77984b5a699e91107fe52e2'
-         '42a8c825d80b0de16bd5752d2a80e585'
-         '07e52e926595d053155bbfb7168e308f'
-         '89157d5e21b0efd09fcbeee299d23c7e'
-         '6b43ab7f1c3e2cacd3540242634eabb3')
-
-build() {
-  cd ${srcdir}/Performous-${pkgver}-Source
-
-  # fix to built against boost 1.46 and later, upstream (git) now support v3
-  patch -Np1 -i ../boost-filesystem-v3.patch
-  # fix with ffmpeg-0.11
-  patch -Np1 -i ../ffmpeg-0.11.patch
-  # fix for libpng 1.5
-  patch -Np1 -i ../png15.patch
-  # fix glib2.0 building
-  # #error "Only <glib.h> can be included directly."
-  sed -i -e 's#/gconvert.h#.h#g' game/unicode.cc
-  # boost 1.50 fix
-  patch -Np1 -i ../fix-boost-1.50-xtime.patch
-
-  mkdir -p build
-  cd build
-
-  # fix config loading with libxml++
-  export LDFLAGS=${LDFLAGS/-Wl,--as-needed/}
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd ${srcdir}/Performous-${pkgver}-Source/build
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/performous/boost-filesystem-v3.patch b/community-testing/performous/boost-filesystem-v3.patch
deleted file mode 100644
index 22dd07213..000000000
--- a/community-testing/performous/boost-filesystem-v3.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/game/backgrounds.cc b/game/backgrounds.cc
-index 7fd3cd0..cdedefb 100644
---- a/game/backgrounds.cc
-+++ b/game/backgrounds.cc
-@@ -55,8 +55,13 @@ void Backgrounds::reload_internal(fs::path const& parent) {
- 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
- 			fs::path p = dirIt->path();
- 			if (fs::is_directory(p)) { reload_internal(p); continue; }
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename
- 			std::string path = p.directory_string(); // Path without filename
-+#else
-+			std::string name = p.filename().string(); // File basename
-+			std::string path = p.string(); // Path without filename
-+#endif
- 			path.erase(path.size() - name.size());
- 			if (!regex_match(name.c_str(), match, expression)) continue;
- 			{
-diff --git a/game/cache.cc b/game/cache.cc
-index 69974e2..0f1edd0 100644
---- a/game/cache.cc
-+++ b/game/cache.cc
-@@ -9,7 +9,11 @@ namespace cache {
- 	fs::path constructSVGCacheFileName(fs::path const& svgfilename, double factor){
- 		fs::path cache_filename;
- 		std::string const lod = (boost::format("%.2f") % factor).str();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string const cache_basename = svgfilename.filename() + ".cache_" + lod + ".png";
-+#else
-+		std::string const cache_basename = svgfilename.filename().string() + ".cache_" + lod + ".png";
-+#endif
- 
- 		if (isThemeResource(svgfilename)) {
- 			std::string const theme_name = (config["game/theme"].s().empty() ? "default" : config["game/theme"].s());
-diff --git a/game/filemagic.hh b/game/filemagic.hh
-index bf87ded..29e81fe 100644
---- a/game/filemagic.hh
-+++ b/game/filemagic.hh
-@@ -71,7 +71,11 @@ namespace filemagic {
- 		// For now, just check the extension an assume it's not lying.
- 
- 		// Get file extension in lower case
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string ext = filename.extension();
-+#else
-+		std::string ext = filename.extension().string();
-+#endif
- 		// somehow this does not convert the extension to lower case:
- 		//std::for_each(ext.begin(), ext.end(), static_cast<int(*)(int)>(std::tolower));
- 		std::transform(ext.begin(), ext.end(), ext.begin(), ::tolower );
-diff --git a/game/fs.cc b/game/fs.cc
-index e34a784..767a7ab 100644
---- a/game/fs.cc
-+++ b/game/fs.cc
-@@ -128,7 +128,11 @@ std::string getThemePath(std::string const& filename) {
- 
- bool isThemeResource(fs::path filename){
- 	try {
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string themefile = getThemePath(filename.filename());
-+#else
-+		std::string themefile = getThemePath(filename.filename().string());
-+#endif
- 		return themefile == filename;
- 	} catch (...) { return false; }
- }
-diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
-index 38e163b..db15d79 100644
---- a/game/songparser-ini.cc
-+++ b/game/songparser-ini.cc
-@@ -104,7 +104,11 @@ void SongParser::iniParseHeader() {
- 	// Search the dir for the music files
- 	for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
- 		boost::filesystem::path p = dirIt->path();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 		std::string name = p.leaf(); // File basename (notes.txt)
-+#else
-+		std::string name = p.filename().string(); // File basename (notes.txt)
-+#endif
- 		if (regex_match(name.c_str(), match, midifile)) {
- 			 s.midifilename = name;
- 		} else if (regex_match(name.c_str(), match, audiofile_background)) {
-diff --git a/game/songparser.cc b/game/songparser.cc
-index 2b7b9b4..ac9f3f6 100644
---- a/game/songparser.cc
-+++ b/game/songparser.cc
-@@ -100,7 +100,11 @@ SongParser::SongParser(Song& s):
- 
- 		for (boost::filesystem::directory_iterator dirIt(s.path), dirEnd; dirIt != dirEnd; ++dirIt) {
- 			boost::filesystem::path p = dirIt->path();
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename
-+#else
-+			std::string name = p.filename().string(); // File basename
-+#endif
- 			if (m_song.cover.empty() && regex_match(name.c_str(), match, coverfile)) {
- 				m_song.cover = name;
- 			} else if (m_song.background.empty() && regex_match(name.c_str(), match, backgroundfile)) {
-diff --git a/game/songs.cc b/game/songs.cc
-index 62ab26d..afab383 100644
---- a/game/songs.cc
-+++ b/game/songs.cc
-@@ -67,8 +67,13 @@ void Songs::reload_internal(fs::path const& parent) {
- 		for (fs::directory_iterator dirIt(parent), dirEnd; m_loading && dirIt != dirEnd; ++dirIt) {
- 			fs::path p = dirIt->path();
- 			if (fs::is_directory(p)) { reload_internal(p); continue; }
-+#if BOOST_FILESYSTEM_VERSION < 3
- 			std::string name = p.leaf(); // File basename (notes.txt)
- 			std::string path = p.directory_string(); // Path without filename
-+#else
-+			std::string name = p.filename().string(); // File basename (notes.txt)
-+			std::string path = p.string(); // Path without filename
-+#endif
- 			path.erase(path.size() - name.size());
- 			if (!regex_match(name.c_str(), match, expression)) continue;
- 			try {
-diff --git a/tools/ss_helpers.hh b/tools/ss_helpers.hh
-index 58e19dc..8895d94 100644
---- a/tools/ss_helpers.hh
-+++ b/tools/ss_helpers.hh
-@@ -10,7 +10,11 @@ extern "C" void xmlLogger(void* logger, char const* msg, ...) { if (logger) *(st
- void enableXMLLogger(std::ostream& os = std::cerr) { xmlSetGenericErrorFunc(&os, xmlLogger); }
- void disableXMLLogger() { xmlSetGenericErrorFunc(NULL, xmlLogger); }
- 
-+#if BOOST_FILESYSTEM_VERSION < 3
- std::string filename(boost::filesystem::path const& p) { return *--p.end(); }
-+#else
-+std::string filename(boost::filesystem::path const& p) { return p.filename().string(); }
-+#endif
- 
- /** Fix Singstar's b0rked XML **/
- std::string xmlFix(std::vector<char> const& data) {
--- 
-1.7.4.1
-
diff --git a/community-testing/performous/ffmpeg-0.11.patch b/community-testing/performous/ffmpeg-0.11.patch
deleted file mode 100644
index 2962123ed..000000000
--- a/community-testing/performous/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru Performous-0.6.1-Source/game/ffmpeg.cc Performous-0.6.1a-Source/game/ffmpeg.cc
---- Performous-0.6.1-Source/game/ffmpeg.cc	2010-10-31 16:05:43.000000000 +0000
-+++ Performous-0.6.1a-Source/game/ffmpeg.cc	2012-06-08 21:40:10.876636789 +0000
-@@ -47,11 +47,17 @@
- 	return d >= 0.0 ? d : getInf();
- }
- 
-+// FFMPEG has fluctuating API
-+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(64<<8)+0)
-+#define AVMEDIA_TYPE_VIDEO CODEC_TYPE_VIDEO
-+#define AVMEDIA_TYPE_AUDIO CODEC_TYPE_AUDIO
-+#endif
-+
- void FFmpeg::open() {
- 	boost::mutex::scoped_lock l(s_avcodec_mutex);
- 	av_register_all();
- 	av_log_set_level(AV_LOG_ERROR);
--	if (av_open_input_file(&pFormatCtx, m_filename.c_str(), NULL, 0, NULL)) throw std::runtime_error("Cannot open input file");
-+	if (avformat_open_input(&pFormatCtx, m_filename.c_str(), NULL, NULL)) throw std::runtime_error("Cannot open input file");
- 	if (av_find_stream_info(pFormatCtx) < 0) throw std::runtime_error("Cannot find stream information");
- 	pFormatCtx->flags |= AVFMT_FLAG_GENPTS;
- 	videoStream = -1;
-@@ -60,8 +66,8 @@
- 	for (unsigned int i=0; i<pFormatCtx->nb_streams; i++) {
- 		AVCodecContext* cc = pFormatCtx->streams[i]->codec;
- 		cc->workaround_bugs = FF_BUG_AUTODETECT;
--		if (videoStream == -1 && cc->codec_type==CODEC_TYPE_VIDEO) videoStream = i;
--		if (audioStream == -1 && cc->codec_type==CODEC_TYPE_AUDIO) audioStream = i;
-+		if (videoStream == -1 && cc->codec_type==AVMEDIA_TYPE_VIDEO) videoStream = i;
-+		if (audioStream == -1 && cc->codec_type==AVMEDIA_TYPE_AUDIO) audioStream = i;
- 	}
- 	if (videoStream == -1 && decodeVideo) throw std::runtime_error("No video stream found");
- 	if (audioStream == -1 && decodeAudio) throw std::runtime_error("No audio stream found");
-@@ -92,7 +98,7 @@
- 		pAudioCodecCtx = cc;
- #if LIBAVCODEC_VERSION_INT > ((52<<16)+(12<<8)+0)
- 		pResampleCtx = av_audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate,
--			SAMPLE_FMT_S16, SAMPLE_FMT_S16, 16, 10, 0, 0.8);
-+			AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16, 16, 10, 0, 0.8);
- #else
- 		pResampleCtx = audio_resample_init(AUDIO_CHANNELS, cc->channels, m_rate, cc->sample_rate);
- #endif
diff --git a/community-testing/performous/fix-boost-1.50-xtime.patch b/community-testing/performous/fix-boost-1.50-xtime.patch
deleted file mode 100644
index d13b18c26..000000000
--- a/community-testing/performous/fix-boost-1.50-xtime.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a4be6f47bcdd64e7c77db0a04415973d4c322ae8 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Alvaro=20Fernando=20Garc=C3=ADa?= <alvarofernandogarcia@gmail.com>
-Date: Sat, 7 Jul 2012 18:53:56 -0300
-Subject: [PATCH] Fixed boost xtime.hpp usage (for 1.50 version)
-
----
- game/xtime.hh |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/game/xtime.hh b/game/xtime.hh
-index 41303cb..8f5463d 100644
---- a/game/xtime.hh
-+++ b/game/xtime.hh
-@@ -1,5 +1,6 @@
- #pragma once
- 
-+#include <boost/version.hpp>
- #include <boost/thread/xtime.hpp>
- #include <cmath>
- 
-@@ -20,7 +21,11 @@ namespace {
- 	}
- 	boost::xtime now() {
- 		boost::xtime time;
-+#if (BOOST_VERSION / 100 % 1000 >= 50)
-+		boost::xtime_get(&time, boost::TIME_UTC_);
-+#else
- 		boost::xtime_get(&time, boost::TIME_UTC);
-+#endif
- 		return time;
- 	}
- 	double seconds(boost::xtime const& time) {
--- 
-1.7.4.1
-
diff --git a/community-testing/performous/png15.patch b/community-testing/performous/png15.patch
deleted file mode 100644
index b6fb8fb14..000000000
--- a/community-testing/performous/png15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur Performous-0.6.1-Source/cmake/Modules/FindPng.cmake Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake
---- Performous-0.6.1-Source/cmake/Modules/FindPng.cmake	2010-10-31 17:05:44.000000000 +0100
-+++ Performous-0.6.1a-Source/cmake/Modules/FindPng.cmake	2012-01-29 01:07:56.339648832 +0100
-@@ -10,7 +10,7 @@
- 
- include(LibFindMacros)
- 
--libfind_pkg_check_modules(Png_PKGCONF Png)
-+libfind_pkg_check_modules(Png_PKGCONF libpng)
- 
- find_path(Png_INCLUDE_DIR
-   NAMES pngconf.h
-@@ -18,7 +18,7 @@
- )
- 
- find_library(Png_LIBRARY
--  NAMES png png12 png14
-+  NAMES png png12 png14 png15
-   PATHS ${Png_PKGCONF_LIBRARY_DIRS}
- )
- 
-diff -ur Performous-0.6.1-Source/game/image.hh Performous-0.6.1a-Source/game/image.hh
---- Performous-0.6.1-Source/game/image.hh	2010-10-31 17:05:43.000000000 +0100
-+++ Performous-0.6.1a-Source/game/image.hh	2012-01-29 01:44:16.050575186 +0100
-@@ -26,7 +26,7 @@
- 	}
- 	void loadPNG_internal(png_structp pngPtr, png_infop infoPtr, std::ifstream& file, std::vector<unsigned char>& image, std::vector<png_bytep>& rows, unsigned& w, unsigned& h) {
- 		if (setjmp(png_jmpbuf(pngPtr))) throw std::runtime_error("Reading PNG failed");
--		png_set_read_fn(pngPtr,(voidp)&file, readPngHelper);
-+		png_set_read_fn(pngPtr, &file, readPngHelper);
- 		png_read_info(pngPtr, infoPtr);
- 		png_set_expand(pngPtr);  // Expand everything to RGB(A)
- 		png_set_strip_16(pngPtr);  // Strip everything down to 8 bit/component
diff --git a/community-testing/picard/PKGBUILD b/community-testing/picard/PKGBUILD
deleted file mode 100644
index fbf462200..000000000
--- a/community-testing/picard/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 73378 2012-07-07 02:18:22Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor: sysrq
-
-pkgname=picard
-pkgver=1.0
-pkgrel=4
-pkgdesc='Official MusicBrainz tagger'
-url='http://musicbrainz.org/doc/MusicBrainz_Picard'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
-optdepends=('libdiscid: CD lookup'
-            'chromaprint: fingerprinting')
-source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('abbd606a89b60ed8c948705d47ce1ae1a90f866a')
-
-install=install
-
-build() {
-	cd "${srcdir}/picard-${pkgver}"
-	python2 setup.py config
-}
-
-package() {
-	cd "${srcdir}/picard-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/community-testing/picard/install b/community-testing/picard/install
deleted file mode 100644
index b46fab005..000000000
--- a/community-testing/picard/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-	update-desktop-database -q &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-testing/pingus/ChangeLog b/community-testing/pingus/ChangeLog
deleted file mode 100644
index c182f92eb..000000000
--- a/community-testing/pingus/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-2010-03-18  Jaroslav Lichtblau  <dragonlord@aur.archlinux.org>
-
-        * pingus 0.7.2-8
-        * Rebuilt against boost 1.41.0
-
-2010-02-23  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-7
-	* Rebuilt against boost 1.42.0
-
-2010-01-20  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-6
-	* Rebuilt against libpng 1.4/libjpeg 8
-
-2009-07-13  Eric Belanger  <eric@archlinux.org>
-
-	* pingus 0.7.2-2
-	* Rebuilt against boost 1.39
-	* Added gcc 4.4 patch
-	* Added ChangeLog
diff --git a/community-testing/pingus/PKGBUILD b/community-testing/pingus/PKGBUILD
deleted file mode 100644
index dc6972232..000000000
--- a/community-testing/pingus/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 74300 2012-07-23 22:33:53Z lcarlier $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=pingus
-pkgver=0.7.6
-pkgrel=5
-pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
-arch=('i686' 'x86_64')
-url="http://pingus.seul.org"
-license=('GPL')
-depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs>=1.49')
-makedepends=('scons' 'boost>=1.49' 'mesa')
-source=("http://pingus.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2"
-        'pingus.desktop'
-        'pingus-0.7.6-gcc470-udl.patch')
-md5sums=('561798686f34d3fa4e69135d655f47ac'
-         '9eec34047bdcff49e08f41e81764e20c'
-         '3730bdad38c21c67203456a985945473')
-sha1sums=('b5f5a25d71beb197c9466fb8928018a377f56487'
-          '579a1144f161ce89e6e024cea37210149b89c0c0'
-          '143dd9969e8d100d29ed4f5b2039dde627afeb06')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  # fedora patch to fix error due to new standards
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=51282
-  patch -Np0 -i ${srcdir}/pingus-0.7.6-gcc470-udl.patch
-
-  scons prefix=/usr
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make install DESTDIR="${pkgdir}" PREFIX="/usr"
-
-  install -D -m644 "${srcdir}/pingus.desktop" "${pkgdir}/usr/share/applications/pingus.desktop"
-}
diff --git a/community-testing/pingus/pingus-0.7.6-gcc470-udl.patch b/community-testing/pingus/pingus-0.7.6-gcc470-udl.patch
deleted file mode 100644
index 843439321..000000000
--- a/community-testing/pingus/pingus-0.7.6-gcc470-udl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/pingus/pingus_main.cpp~	2011-12-24 15:46:47.000000000 -0600
-+++ src/pingus/pingus_main.cpp	2012-01-03 13:13:03.034195720 -0600
-@@ -465,7 +465,7 @@
- void
- PingusMain::print_greeting_message()
- {
--  std::string greeting = "Welcome to Pingus "VERSION;
-+  std::string greeting = "Welcome to Pingus " VERSION;
-   greeting += "!";
-   std::cout <<  greeting << std::endl;
-   for (unsigned int i = 0; i < greeting.length(); ++i)
---- src/pingus/screens/pingus_menu.cpp~	2011-12-24 15:46:47.000000000 -0600
-+++ src/pingus/screens/pingus_menu.cpp	2012-01-03 13:30:28.967700554 -0600
-@@ -153,7 +153,7 @@
-                          gc.get_height()/2 - 280));
- 
-   gc.print_left(Fonts::pingus_small, Vector2i(gc.get_width()/2 - 400 + 25, gc.get_height()-140),
--                "Pingus "VERSION" - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
-+                "Pingus " VERSION " - Copyright (C) 1998-2011 Ingo Ruhnke <grumbel@gmail.com>\n"
-                 "See the file AUTHORS for a complete list of contributors.\n"
-                 "Pingus comes with ABSOLUTELY NO WARRANTY. This is free software, and you are\n"
-                 "welcome to redistribute it under certain conditions; see the file COPYING for details.\n");
diff --git a/community-testing/pingus/pingus.desktop b/community-testing/pingus/pingus.desktop
deleted file mode 100644
index 276db36a4..000000000
--- a/community-testing/pingus/pingus.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pingus
-Comment=A free Lemmings[tm] clone
-Exec=pingus
-Terminal=false
-Type=Application
-Categories=Application;Game;LogicGame
-Icon=/usr/share/pingus/images/core/editor/actions.png
diff --git a/community-testing/pinot/PKGBUILD b/community-testing/pinot/PKGBUILD
deleted file mode 100644
index 0fe321e35..000000000
--- a/community-testing/pinot/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 74733 2012-08-02 15:24:03Z andrea $
-# 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=1.0
-pkgrel=2
-pkgdesc='Personal search and metasearch tool'
-arch=('i686' 'x86_64')
-url='http://code.google.com/p/pinot-search/'
-license=('GPL')
-depends=('gtkmm3' 'xapian-core' 'libtextcat' 'sqlite' 'libxml++' 'curl' 'gmime' 
-         'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 'hicolor-icon-theme' 
-         'cairo' 'exiv2' 'boost-libs')
-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')
-options=('!emptydirs')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha256sums=('d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt
-  sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt
-  sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_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|" textcat3_conf.txt
-
-  LIBS="-lboost_system" ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/pinot/pinot.changelog b/community-testing/pinot/pinot.changelog
deleted file mode 100644
index 770a1ef0a..000000000
--- a/community-testing/pinot/pinot.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-2012-07-31  Eric Belanger  <eric@archlinux.org>
-	* pinot 1.0-2 : Rebuild against exiv2 0.23, Add boost-libs depends
-
-2012-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* pinot 1.0-1
-
-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/pion-net/PKGBUILD b/community-testing/pion-net/PKGBUILD
deleted file mode 100644
index dfc81ac9e..000000000
--- a/community-testing/pion-net/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 73768 2012-07-15 13:20:00Z ibiru $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: David Watzke <david@watzke.cz>
-pkgname=pion-net
-pkgver=4.0.12
-pkgrel=3
-pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
-url="http://www.pion.org/projects/pion-network-library"
-arch=('i686' 'x86_64')
-license=('custom:Boost')
-depends=('boost-libs' 'openssl' 'log4cpp')
-makedepends=('boost')
-source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" \
-        gcc_4.7_fix.diff boost_1.50_support.diff)
-md5sums=('baf0b6a006660dc4051c824e4660cb9d'
-         'd6c5314678709184e983b301cea11566'
-         'fcd2a7520b818354308315dc1e8053d4')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # override configure bug (forces debug even when nobody asked for it)
-  sed -i "s/ -ggdb//g" configure
-  # override Makefile bug
-  sed -i "/docs:/ s/doxygen-doc//" Makefile.in
-  # fix compilation with new versions of gcc
-  patch -Np1 < "$srcdir"/gcc_4.7_fix.diff || true
-  # fix build with boost 1.50 - port to filesystem v3
-  patch -Np1 < "$srcdir"/boost_1.50_support.diff || true
-
-  ./configure --prefix=/usr --disable-doxygen-doc
-
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # install license
-  install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost"
-}
diff --git a/community-testing/pion-net/boost_1.50_support.diff b/community-testing/pion-net/boost_1.50_support.diff
deleted file mode 100644
index 7b82f34b9..000000000
--- a/community-testing/pion-net/boost_1.50_support.diff
+++ /dev/null
@@ -1,223 +0,0 @@
-diff -rup pion-net-4.0.12/common/src/PionPlugin.cpp pion-net-4.0.12-new/common/src/PionPlugin.cpp
---- pion-net-4.0.12/common/src/PionPlugin.cpp	2011-03-22 04:35:12.000000000 +0100
-+++ pion-net-4.0.12-new/common/src/PionPlugin.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -58,7 +58,7 @@ void PionPlugin::addPluginDirectory(cons
- 	if (! boost::filesystem::exists(plugin_path) )
- 		throw DirectoryNotFoundException(dir);
- 	boost::mutex::scoped_lock plugin_lock(m_plugin_mutex);
--	m_plugin_dirs.push_back(plugin_path.directory_string());
-+	m_plugin_dirs.push_back(plugin_path.string());
- }
- 
- void PionPlugin::resetPluginDirectories(void)
-@@ -204,7 +204,7 @@ bool PionPlugin::checkForFile(std::strin
- 	try {
- 		// is_regular may throw if directory is not readable
- 		if (boost::filesystem::is_regular(test_path)) {
--			final_path = test_path.file_string();
-+			final_path = test_path.string();
- 			return true;
- 		}
- 	} catch (...) {}
-@@ -225,7 +225,7 @@ bool PionPlugin::checkForFile(std::strin
- 	try {
- 		// is_regular may throw if directory is not readable
- 		if (boost::filesystem::is_regular(test_path)) {
--			final_path = test_path.file_string();
-+			final_path = test_path.string();
- 			return true;
- 		}
- 	} catch (...) {}
-@@ -291,7 +291,7 @@ void PionPlugin::getAllPluginNames(std::
- 		for (boost::filesystem::directory_iterator it2(*it); it2 != end; ++it2) {
- 			if (boost::filesystem::is_regular(*it2)) {
- 				if (boost::filesystem::extension(it2->path()) == PionPlugin::PION_PLUGIN_EXTENSION) {
--					plugin_names.push_back(PionPlugin::getPluginName(it2->path().leaf()));
-+					plugin_names.push_back(PionPlugin::getPluginName(it2->path().filename().string()));
- 				}
- 			}
- 		}
-@@ -309,11 +309,11 @@ void *PionPlugin::loadDynamicLibrary(con
- #else
- 	// convert into a full/absolute/complete path since dlopen()
- 	// does not always search the CWD on some operating systems
--	const boost::filesystem::path full_path = boost::filesystem::complete(plugin_file);
-+	const boost::filesystem::path full_path = boost::filesystem::absolute(plugin_file);
- 	// NOTE: you must load shared libraries using RTLD_GLOBAL on Unix platforms
- 	// due to a bug in GCC (or Boost::any, depending on which crowd you want to believe).
- 	// see: http://svn.boost.org/trac/boost/ticket/754
--	return dlopen(full_path.file_string().c_str(), RTLD_LAZY | RTLD_GLOBAL);
-+	return dlopen(full_path.string().c_str(), RTLD_LAZY | RTLD_GLOBAL);
- #endif
- }
- 
-diff -rup pion-net-4.0.12/common/src/PionScheduler.cpp pion-net-4.0.12-new/common/src/PionScheduler.cpp
---- pion-net-4.0.12/common/src/PionScheduler.cpp	2008-11-08 00:41:17.000000000 +0100
-+++ pion-net-4.0.12-new/common/src/PionScheduler.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -102,7 +102,7 @@ boost::xtime PionScheduler::getWakeupTim
- 										  boost::uint32_t sleep_nsec)
- {
- 	boost::xtime wakeup_time;
--	boost::xtime_get(&wakeup_time, boost::TIME_UTC);
-+	boost::xtime_get(&wakeup_time, boost::TIME_UTC_);
- 	wakeup_time.sec += sleep_sec;
- 	wakeup_time.nsec += sleep_nsec;
- 	if (static_cast<boost::uint32_t>(wakeup_time.nsec) >= NSEC_IN_SECOND) {
-diff -rup pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp
---- pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp	2009-10-13 18:20:43.000000000 +0200
-+++ pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp	2012-07-07 20:42:22.084660696 +0200
-@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_SUITE_END()
- class Sandbox_F {
- public:
- 	Sandbox_F() {
--		m_cwd = boost::filesystem::current_path().directory_string();
-+		m_cwd = boost::filesystem::current_path().string();
- 		boost::filesystem::remove_all("sandbox");
- 		BOOST_REQUIRE(boost::filesystem::create_directory("sandbox"));
- 		BOOST_REQUIRE(boost::filesystem::create_directory("sandbox/dir1"));
-diff -rup pion-net-4.0.12/configure pion-net-4.0.12-new/configure
---- pion-net-4.0.12/configure	2012-03-24 08:00:10.000000000 +0100
-+++ pion-net-4.0.12-new/configure	2012-07-07 20:42:22.094660551 +0200
-@@ -22091,7 +22091,7 @@ fi
- 
- 
- # AC_MSG_NOTICE(Boost home directory: $BOOST_HOME_DIR)
--CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=2"
-+CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=3"
- LDFLAGS="$LDFLAGS $BOOST_LDFLAGS"
- 
- # Check for Boost library extension
-@@ -22197,7 +22197,7 @@ LIBS="$LIBS_SAVED"
- BOOST_TRY_LIB=thread
- BOOST_TRY_LINK="boost_${BOOST_TRY_LIB}${BOOST_LIB_EXTENSION}"
- LIBS_SAVED="$LIBS"
--LIBS="$LIBS_SAVED -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}"
-+LIBS="$LIBS_SAVED -lboost_system -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}"
- echo "$as_me:$LINENO: checking for boost::${BOOST_TRY_LIB} library" >&5
- echo $ECHO_N "checking for boost::${BOOST_TRY_LIB} library... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
-diff -rup pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp
---- pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp	2012-01-12 17:30:03.000000000 +0100
-+++ pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp	2012-07-07 20:43:34.530273709 +0200
-@@ -26,6 +26,7 @@
- #include <boost/array.hpp>
- #include <boost/function.hpp>
- #include <boost/function/function1.hpp>
-+#include <boost/system/system_error.hpp>
- #include <pion/PionConfig.hpp>
- #include <string>
- 
-diff -rup pion-net-4.0.12/net/services/FileService.cpp pion-net-4.0.12-new/net/services/FileService.cpp
---- pion-net-4.0.12/net/services/FileService.cpp	2009-08-06 20:58:13.000000000 +0200
-+++ pion-net-4.0.12-new/net/services/FileService.cpp	2012-07-07 20:42:22.097993836 +0200
-@@ -137,8 +137,8 @@ void FileService::operator()(HTTPRequest
- 
- 	// make sure that the requested file is within the configured directory
- 	file_path.normalize();
--	std::string file_string = file_path.file_string();
--	if (file_string.find(m_directory.directory_string()) != 0) {
-+	std::string file_string = file_path.string();
-+	if (file_string.find(m_directory.string()) != 0) {
- 		PION_LOG_WARN(m_logger, "Request for file outside of directory ("
- 					  << getResource() << "): " << relative_path);
- 		static const std::string FORBIDDEN_HTML_START =
-@@ -319,7 +319,7 @@ void FileService::operator()(HTTPRequest
- 						   << getResource() << "): " << relative_path);
- 
- 			// determine the MIME type
--			response_file.setMimeType(findMIMEType( response_file.getFilePath().leaf() ));
-+			response_file.setMimeType(findMIMEType( response_file.getFilePath().filename().string() ));
- 
- 			// get the file_size and last_modified timestamp
- 			response_file.update();
-@@ -597,7 +597,7 @@ void FileService::stop(void)
- void FileService::scanDirectory(const boost::filesystem::path& dir_path)
- {
- 	PION_LOG_DEBUG(m_logger, "Scanning directory (" << getResource() << "): "
--				   << dir_path.directory_string());
-+				   << dir_path.string());
- 
- 	// iterate through items in the directory
- 	boost::filesystem::directory_iterator end_itr;
-@@ -614,8 +614,8 @@ void FileService::scanDirectory(const bo
- 			// item is a regular file
- 
- 			// figure out relative path to the file
--			std::string file_path_string( itr->path().file_string() );
--			std::string relative_path( file_path_string.substr(m_directory.directory_string().size() + 1) );
-+			std::string file_path_string( itr->path().string() );
-+			std::string relative_path( file_path_string.substr(m_directory.string().size() + 1) );
- 
- 			// add item to cache (use placeholder if scan == 1)
- 			addCacheEntry(relative_path, *itr, m_scan_setting == 1);
-@@ -628,7 +628,7 @@ FileService::addCacheEntry(const std::st
- 						   const boost::filesystem::path& file_path,
- 						   const bool placeholder)
- {
--	DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.leaf()));
-+	DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.filename().string()));
- 	if (! placeholder) {
- 		cache_entry.update();
- 		// only read the file if its size is <= max_cache_size
-@@ -636,7 +636,7 @@ FileService::addCacheEntry(const std::st
- 			try { cache_entry.read(); }
- 			catch (std::exception&) {
- 				PION_LOG_ERROR(m_logger, "Unable to add file to cache: "
--							   << file_path.file_string());
-+							   << file_path.string());
- 				return std::make_pair(m_cache_map.end(), false);
- 			}
- 		}
-@@ -647,10 +647,10 @@ FileService::addCacheEntry(const std::st
- 
- 	if (add_entry_result.second) {
- 		PION_LOG_DEBUG(m_logger, "Added file to cache: "
--					   << file_path.file_string());
-+					   << file_path.string());
- 	} else {
- 		PION_LOG_ERROR(m_logger, "Unable to insert cache entry for file: "
--					   << file_path.file_string());
-+					   << file_path.string());
- 	}
- 
- 	return add_entry_result;
-@@ -713,7 +713,7 @@ void DiskFile::read(void)
- 
- 	// read the file into memory
- 	if (!file_stream.is_open() || !file_stream.read(m_file_content.get(), m_file_size))
--		throw FileService::FileReadException(m_file_path.file_string());
-+		throw FileService::FileReadException(m_file_path.string());
- }
- 
- bool DiskFile::checkUpdated(void)
-@@ -751,7 +751,7 @@ DiskFileSender::DiskFileSender(DiskFile&
- {
- 	PION_LOG_DEBUG(m_logger, "Preparing to send file"
- 				   << (m_disk_file.hasFileContent() ? " (cached): " : ": ")
--				   << m_disk_file.getFilePath().file_string());
-+				   << m_disk_file.getFilePath().string());
- 
- 		// set the Content-Type HTTP header using the file's MIME type
- 	m_writer->getResponse().setContentType(m_disk_file.getMimeType());
-@@ -795,7 +795,7 @@ void DiskFileSender::send(void)
- 			m_file_stream.open(m_disk_file.getFilePath(), std::ios::in | std::ios::binary);
- 			if (! m_file_stream.is_open()) {
- 				PION_LOG_ERROR(m_logger, "Unable to open file: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 				return;
- 			}
- 		}
-@@ -811,10 +811,10 @@ void DiskFileSender::send(void)
- 		if (! m_file_stream.read(m_content_buf.get(), m_file_bytes_to_send)) {
- 			if (m_file_stream.gcount() > 0) {
- 				PION_LOG_ERROR(m_logger, "File size inconsistency: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 			} else {
- 				PION_LOG_ERROR(m_logger, "Unable to read file: "
--							   << m_disk_file.getFilePath().file_string());
-+							   << m_disk_file.getFilePath().string());
- 			}
- 			return;
- 		}
diff --git a/community-testing/pion-net/gcc_4.7_fix.diff b/community-testing/pion-net/gcc_4.7_fix.diff
deleted file mode 100644
index 5c2ed3cfe..000000000
--- a/community-testing/pion-net/gcc_4.7_fix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup pion-net-4.0.12/common/include/pion/PluginManager.hpp pion-net-4.0.12-new/common/include/pion/PluginManager.hpp
---- pion-net-4.0.12/common/include/pion/PluginManager.hpp	2011-02-12 01:46:50.000000000 +0100
-+++ pion-net-4.0.12-new/common/include/pion/PluginManager.hpp	2012-07-07 16:54:22.470284487 +0200
-@@ -420,7 +420,7 @@ inline void PluginManager<PLUGIN_TYPE>::
- 				delete i->second.first;
- 			}
- 		}
--		erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(),
-+		this->erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(),
- 			  std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::end());
- 	}
- }
diff --git a/community-testing/pokerth/PKGBUILD b/community-testing/pokerth/PKGBUILD
deleted file mode 100644
index 51e24be69..000000000
--- a/community-testing/pokerth/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 73769 2012-07-15 13:20:03Z ibiru $
-# Maintainer:  Mateusz Herych <heniekk@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Vasco Costa <vasco.costa@meiodigital.com>
-
-pkgname=pokerth
-_realname=PokerTH
-pkgver=0.9.5
-pkgrel=2
-pkgdesc="Poker game written in C++/QT4"
-arch=('i686' 'x86_64')
-url="http://www.pokerth.net/"
-license=('GPL' 'custom')
-depends=('curl' 'boost-libs' 'gsasl' 'gnutls'
-         'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
-makedepends=('boost')
-source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('4bdea98bfc142a825c64b77feb4667d0')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver-src"
-
-  sed -i '1 i #include <unistd.h>' src/third_party/qtsingleapplication/qtlocalpeer.cpp
-
-  sed -i '23 i #include <libircclient/libirc_rfcnumeric.h>' src/net/common/ircthread.cpp
-
-  # fix g++: error: unrecognized option '-no_dead_strip_inits_and_terms'
-  sed \
-    -e 's/QMAKE_LFLAGS += -no_dead_strip_inits_and_terms//' \
-    -i zlib_compress.pro pokerth_game.pro pokerth_server.pro
-
-  qmake $pkgname.pro
-  make
-}
-
-package() {
-  cd "$srcdir/$_realname-$pkgver-src"
-
-  make INSTALL_ROOT="$pkgdir" install
-
-  install -D "$pkgname" "$pkgdir/usr/bin/$pkgname"
-  install -D -m644 docs/pokerth.1 "$pkgdir/usr/share/man/man1/pokerth.1"
-  install -D -m644 data/data-copyright.txt "$pkgdir/usr/share/licenses/pokerth/data-copyright.txt"
-  rm -f "$pkgdir/usr/share/pokerth/data/data-copyright.txt"
-}
diff --git a/community-testing/polipo/PKGBUILD b/community-testing/polipo/PKGBUILD
deleted file mode 100644
index c6ccd1300..000000000
--- a/community-testing/polipo/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 72559 2012-06-16 17:10:40Z dreisner $
-# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
-# Contributor: Jelle van der Waa <jelle vdwaa nl>
-# Contributor: Thomas Holmquist <thomas@vorget.com>
-# Contributor: Jan Boehringer <ja(a)bm-boehringer.de>
-# Contributor: Alex Griffin <griffin.aj(a)gmail.com>
-
-pkgname=polipo
-pkgver=1.0.4.1
-pkgrel=3
-pkgdesc="A small and fast caching web proxy."
-arch=('i686' 'x86_64')
-url="http://www.pps.jussieu.fr/~jch/software/polipo/"
-license=('GPL')
-depends=('bash')
-makedepends=('texinfo')
-install=polipo.install
-source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
-        "polipo.cron" "polipo.rc.d" "polipo.conf.d" "polipo.service")
-md5sums=('bfc5c85289519658280e093a270d6703'
-         'bac0e1a871964c931eb5f7a369b3243c'
-         '8f096b7d77a71e0772ce71a8c8b1b3e3'
-         '685aa0c6070dee11c701932d23afcc6a'
-         '109d0e8c15d669281ff14f8991ad0ed8')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make 	PREFIX="$pkgdir/usr" \
-        MANDIR="$pkgdir/usr/share/man" \
-        INFODIR="$pkgdir/usr/share/info" \
-	LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
-	DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
-  install 
-
-
-  # install config files
-  install -Dm 644 config.sample $pkgdir/etc/polipo/config.sample
-  install -Dm 644 forbidden.sample $pkgdir/etc/polipo/forbidden.sample
-
-  # install license
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/polipo/LICENSE
-
-  # install daemon scripts / cron
-  install -Dm 755  $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo
-  install -Dm 755  $srcdir/polipo.cron $pkgdir/usr/share/polipo/polipo.cron
-  install -Dm 644  $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/polipo/polipo.conf.d b/community-testing/polipo/polipo.conf.d
deleted file mode 100644
index dc879d32b..000000000
--- a/community-testing/polipo/polipo.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to polipo
-#
-POLIPO_ARGS="daemonise=true logFile=\"/var/log/polipo.log\""
diff --git a/community-testing/polipo/polipo.cron b/community-testing/polipo/polipo.cron
deleted file mode 100644
index 8270d0a05..000000000
--- a/community-testing/polipo/polipo.cron
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-/etc/rc.d/polipo purge >/dev/null 2>&1
diff --git a/community-testing/polipo/polipo.install b/community-testing/polipo/polipo.install
deleted file mode 100644
index bacc46377..000000000
--- a/community-testing/polipo/polipo.install
+++ /dev/null
@@ -1,25 +0,0 @@
-infodir=/usr/share/info
-filelist=(polipo.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-  install -d /var/cache/polipo 2> /dev/null
-  touch /var/log/polipo.log 2> /dev/null
-  chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/polipo/polipo.rc.d b/community-testing/polipo/polipo.rc.d
deleted file mode 100644
index 260fab050..000000000
--- a/community-testing/polipo/polipo.rc.d
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-
-daemon_name=polipo
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-	start)
-		stat_busy "Starting $daemon_name daemon"
-
-		PID=$(get_pid)
-		if [[ -z $PID ]]; then
-			[[ -f /run/$daemon_name.pid ]] &&
-				rm -f /run/$daemon_name.pid
-		# RUN
-		sudo -u nobody /usr/bin/$daemon_name ${POLIPO_ARGS}
-		#
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-			exit 1
-		else
-			echo $(get_pid) > /run/$daemon_name.pid
-			add_daemon $daemon_name
-			stat_done
-		fi
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-
-	stop)
-		stat_busy "Stopping $daemon_name daemon"
-		PID=$(get_pid)
-		# KILL
-		[[ -n $PID ]] && kill $PID &> /dev/null
-		#
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-			exit 1
-		else
-			rm -f /run/$daemon_name.pid &> /dev/null
-			rm_daemon $daemon_name
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 3
-		$0 start
-		;;
-
-	status)
-		stat_busy "Checking $daemon_name status";
-		ck_status $daemon_name
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/polipo/polipo.service b/community-testing/polipo/polipo.service
deleted file mode 100644
index a1bdd9aa2..000000000
--- a/community-testing/polipo/polipo.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Polipo Proxy Server
-
-[Service]
-ExecStart=/usr/bin/polipo
-User=nobody
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/prboom/PKGBUILD b/community-testing/prboom/PKGBUILD
deleted file mode 100644
index 7a6f8086d..000000000
--- a/community-testing/prboom/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 77584 2012-10-13 02:06:46Z ebelanger $
-# 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=7
-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' 'sdl_mixer' 'sdl_net' 'glu')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz"
-        'libpng-1.4.patch')
-md5sums=('a8a15f61fa2626ab98051ab2703378c4'
-         'ba53474db8e747035ca2320a445e4ae0')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 < ../libpng-1.4.patch
-
-	./configure --prefix=/usr --disable-i386-asm
-	sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile"
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
-
diff --git a/community-testing/prboom/libpng-1.4.patch b/community-testing/prboom/libpng-1.4.patch
deleted file mode 100644
index a2215e37b..000000000
--- a/community-testing/prboom/libpng-1.4.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c
---- prboom-2.5.0-orig/src/SDL/i_sshot.c	2010-01-24 23:26:03.000000000 -0500
-+++ prboom-2.5.0/src/SDL/i_sshot.c	2010-01-24 23:28:42.000000000 -0500
-@@ -231,7 +231,7 @@
-   if (fp)
-   {
-     png_struct *png_ptr = png_create_write_struct(
--        PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+        PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
- 
-     if (png_ptr)
-     {
-@@ -279,7 +279,7 @@
-             break;
-         }
-       }
--      png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
-+      png_destroy_write_struct(&png_ptr,  NULL);
-     }
-     fclose(fp);
-   }
diff --git a/community-testing/privoxy/PKGBUILD b/community-testing/privoxy/PKGBUILD
deleted file mode 100644
index 8afa9261f..000000000
--- a/community-testing/privoxy/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 75713 2012-08-29 10:09:26Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Juergen Hoetzel <juergen@hoetzel.info>
-# Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
-
-pkgname=privoxy
-pkgver=3.0.19
-pkgrel=6
-pkgdesc='A web proxy with advanced filtering capabilities.'
-arch=('i686' 'x86_64')
-url='http://www.privoxy.org'
-license=('GPL')
-depends=('pcre' 'zlib')
-makedepends=('autoconf')
-backup=('etc/conf.d/privoxy'
-        'etc/privoxy/'{config,trust,default.action,user.filter,default.filter}
-        'etc/privoxy/'{match-all,user}.action
-        'etc/logrotate.d/privoxy')
-install='privoxy.install'
-source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
-        'privoxy'
-        'privoxy.logrotate.d'
-        'privoxy.conf.d'
-        'privoxy.service')
-md5sums=('57acc79059565cc42eda67982842785d'
-         '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
-         'fc3046377137003726a151ee27b142a2'
-         '27830ef79418e277b90c1c1fa933f876'
-         '4c154a126ec17b02c623e3d451e062d9')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
-  autoheader
-  autoconf
-  ./configure --prefix=/usr --sysconfdir=/etc/privoxy
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
-  make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
-    CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install
-
-  # Don't overwrite existing log files!
-  rm "${pkgdir}/var/log/privoxy/"*
-
-  install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy"
-  install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
-  install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy"
-
-  # Fix config paths.
-  sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \
-    -e '/^user-manual/s#.*#\#user-manual /usr/share/doc/privoxy/user-manual/#' \
-    "${pkgdir}/etc/privoxy/config"
-
-  # Fix group ownership and permissions.
-  chgrp -R 42 "${pkgdir}/etc/privoxy/"
-  chgrp -R 42 "${pkgdir}/var/log/privoxy/"
-
-  find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
-  find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
-  chmod 0700 "${pkgdir}/var/log/privoxy"
-
-  # avoid conflict with filesystem>=2012.06
-  rmdir "$pkgdir/var/run"
-
-  # systemd unit file
-  install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
-}
diff --git a/community-testing/privoxy/privoxy b/community-testing/privoxy/privoxy
deleted file mode 100644
index 754453de5..000000000
--- a/community-testing/privoxy/privoxy
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
-
-# read logdir and logfile from privoxy config
-prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prld" ] || prld=/var/log/privoxy
-prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prlf" ] || prlf=logfile
-
-PID=`pidof -o %PPID /usr/sbin/privoxy`
-
-case "$1" in
-  start)
-    stat_busy "Starting Privoxy"
-    # create missing logdir and logfile
-    [ -d "$prld" ] || mkdir -p "$prld"
-    if [ ! -f "$prlf" ]; then
-      touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
-        chmod 0660 "$prld/$prlf"
-    fi
-    [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
-                                       ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon privoxy
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Privoxy"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon privoxy
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/privoxy/privoxy.conf.d b/community-testing/privoxy/privoxy.conf.d
deleted file mode 100644
index 9aa11cd67..000000000
--- a/community-testing/privoxy/privoxy.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# Location of the config file.
-PRIVOXY_CONF='/etc/privoxy/config'
-
-# User and group that privoxy will be run as.
-PRIVOXY_USER='privoxy'
-PRIVOXY_GROUP='privoxy'
-
-# Additional arguments.
-PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid"
-
diff --git a/community-testing/privoxy/privoxy.install b/community-testing/privoxy/privoxy.install
deleted file mode 100644
index c3ed75111..000000000
--- a/community-testing/privoxy/privoxy.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  groupadd -g 42 privoxy &>/dev/null
-  useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null
-  chown -R privoxy:privoxy /etc/privoxy /var/log/privoxy
-
-  if [ ! -d /var/spool/privoxy ]; then
-    install -dm0770 -o privoxy -g privoxy /var/spool/privoxy
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  userdel privoxy &>/dev/null
-  groupdel privoxy &>/dev/null
-  rm -rf var/spool/privoxy
-}
diff --git a/community-testing/privoxy/privoxy.logrotate.d b/community-testing/privoxy/privoxy.logrotate.d
deleted file mode 100644
index 8c3129024..000000000
--- a/community-testing/privoxy/privoxy.logrotate.d
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/privoxy/logfile {
-   create 660 root privoxy
-   notifempty
-   compress
-   postrotate
-     /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true
-   endscript
-}
diff --git a/community-testing/privoxy/privoxy.service b/community-testing/privoxy/privoxy.service
deleted file mode 100644
index 59a8884f9..000000000
--- a/community-testing/privoxy/privoxy.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Privoxy Web Proxy With Advanced Filtering Capabilities
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/privoxy.pid
-ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
-SuccessExitStatus=15
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/projectm/PKGBUILD b/community-testing/projectm/PKGBUILD
deleted file mode 100644
index f7ff912a0..000000000
--- a/community-testing/projectm/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 78813 2012-10-25 01:48:17Z ebelanger $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgbase=projectm
-pkgname=('projectm' 'libvisual-projectm')
-pkgver=2.1.0
-pkgrel=2
-arch=('x86_64' 'i686')
-url='http://projectm.sourceforge.net/'
-license=('LGPL')
-makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext')
-source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz")
-sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee')
-
-build() {
-  cd $srcdir/projectM-complete-$pkgver-Source/src
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \
-    -DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF
-  make
-}
-
-package_projectm() {
-  pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
-  depends=('ftgl' 'glew' 'gtkglext')
-
-  cd $srcdir/projectM-complete-$pkgver-Source/src/libprojectM
-  make DESTDIR=$pkgdir install
-  install -m644 fonts/Vera.ttf $pkgdir/usr/share/projectM/fonts/Vera.ttf
-}
-
-package_libvisual-projectm() {
-  pkgdesc='ProjectM XMMS plugin'
-  depends=("projectm>=$pkgver" 'libvisual' 'sdl')
-
-  cd $srcdir/projectM-complete-$pkgver-Source/src/projectM-libvisual
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch b/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch
deleted file mode 100644
index 23d8a7b9a..000000000
--- a/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
-+++ b/CMakeLists.txt	2012-02-23 04:30:51.000000000 +0100
-@@ -177,10 +177,10 @@
- LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR})
- 
- if(BUILD_PROJECTM_STATIC)
--		TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+		TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES})
- else(BUILD_PROJECTM_STATIC)
- 
--TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES}  ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS})
-+TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} )
- 
- endif(BUILD_PROJECTM_STATIC)
- 
---- a/Renderer/CMakeLists.txt	2009-12-06 02:42:51.000000000 +0100
-+++ b/Renderer/CMakeLists.txt	2012-02-23 04:31:58.000000000 +0100
-@@ -13,4 +13,4 @@
- INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR})
- ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES})
- SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2)
--TARGET_LINK_LIBRARIES(Renderer m)
-+TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES})
diff --git a/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch b/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch
deleted file mode 100644
index b5e38205a..000000000
--- a/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libprojectM.pc.in	2009-12-06 02:42:51.000000000 +0100
-+++ b/libprojectM.pc.in	2012-02-21 16:48:36.000000000 +0100
-@@ -1,6 +1,6 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
--libdir=@LIB_INSTALL_DIR@
-+libdir=@CMAKE_INSTALL_PREFIX@/lib
- includedir=@CMAKE_INSTALL_PREFIX@/include
- pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
- sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
diff --git a/community-testing/prosody/ChangeLog b/community-testing/prosody/ChangeLog
deleted file mode 100644
index 45f3a05fd..000000000
--- a/community-testing/prosody/ChangeLog
+++ /dev/null
@@ -1,398 +0,0 @@
-2009-11-23  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.6.0-1 for changeset 6c5b7e66bee4
-	[d573d1d7a403] [tip]
-
-	* .hgtags:
-	Removed tag v0.6.0-1
-	[6c5b7e66bee4] [v0.6.0-1]
-
-	* PKGBUILD:
-	Use correct package name and version
-	[1e65e6a877d3]
-
-	* .hgtags:
-	Added tag v0.6.0-1 for changeset ad52fee15148
-	[8196689dd4c4]
-
-	* PKGBUILD, prosody.cfg.lua:
-	Included mod_compression in example configuration file
-	[ad52fee15148]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[34b6046aca14]
-
-	* PKGBUILD:
-	Updated checksums
-	[3b4c28f28321]
-
-	* PKGBUILD, prosody.cfg.lua:
-	New upstream version
-	[9d201755b63d]
-
-2009-10-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.6.0rc1-1 for changeset c0a99ab935a8
-	[a0e2015435b6]
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[c0a99ab935a8] [v0.6.0rc1-1]
-
-	* PKGBUILD:
-	Removed conflicts
-	[0f0560190a81]
-
-	* PKGBUILD:
-	Removed makedepends for gcc, the base-devel group is assumed to
-	exist
-	[4160ed469fa4]
-
-	* PKGBUILD:
-	Fix typo in PKGBUILD
-	[85d988c7e4a5]
-
-2009-09-28  Dwayne Bent  <dbb.0@liqd.org>
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[3e4ffcdc887a]
-
-2009-07-29  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.5.1-1 for changeset 1be51884e580
-	[74f32914279c]
-
-	* ChangeLog, PKGBUILD:
-	New upstream version
-	[1be51884e580] [v0.5.1-1]
-
-2009-07-20  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Corrected tag name
-	[d9662df69ab4]
-
-	* .hgtags:
-	Added tag v0.5.0 for changeset d228983b5873
-	[a350368643eb]
-
-	* PKGBUILD:
-	New upstream version
-	[d228983b5873] [v0.5.0-1]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[111cf16bfc8b]
-
-2009-07-14  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.5.0rc2-1 for changeset 701e6c5ed639
-	[828bb0fc4e5e]
-
-	* PKGBUILD:
-	New upstream version
-	[701e6c5ed639] [v0.5.0rc2-1]
-
-	* ChangeLog:
-	Updated ChangeLog
-	[7616eaf8b835]
-
-	* prosody.cfg.lua:
-	Enabled PEP in default configuration
-	[c8a7c4d15e38]
-
-2009-07-11  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Cleaned up and added new modules to default configuration file
-	[07fdc8fd8ff9]
-
-	* PKGBUILD:
-	Added luasec back as hard dependency
-	[9506bff48c77]
-
-	* .hgtags:
-	Added tag v0.5.0rc1-2 for changeset a252809a03a3
-	[803ace20879a]
-
-	* ChangeLog, PKGBUILD:
-	New release version
-	[a252809a03a3] [v0.5.0rc1-2]
-
-	* PKGBUILD:
-	Added make before make install
-
-	This should fix Prosody not correctly reporting version.
-	[881eca5b8e0e]
-
-	* .hgtags:
-	Added tag v0.5.0rc1-1 for changeset f1d918d4779e
-	[1fc8dbc498d5]
-
-	* ChangeLog:
-	New upstream version
-	[f1d918d4779e] [v0.5.0rc1-1]
-
-	* PKGBUILD, prosody.rcd:
-	Redid indent alignment and silenced successful output of prosodyctl
-	[de9bdd756bd8]
-
-	* PKGBUILD, prosody-datadir.diff:
-	Converted to prosody-devel package
-	[92e5e98529dd]
-
-2009-06-30  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD, prosody.cfg.lua:
-	Moved luasec from depends to optdepends
-
-	Since luasec is not strictly required for Prosody to operate it is
-	now an optional dependency.
-	[7079ec87eef5]
-
-2009-06-27  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-4 for changeset 0345a59e8495
-	[1e488e1c03eb]
-
-	* PKGBUILD:
-	New release version
-	[0345a59e8495] [v0.4.2-4]
-
-	* prosody.install:
-	Added note about ChangeLog to install script
-	[c683ef309b6a]
-
-	* PKGBUILD, prosody.rcd:
-	Use prosodyctl to start/stop daemon
-	[eaf4c26bb29f]
-
-	* PKGBUILD, prosody.rcd:
-	Refactored start, stop, reload in rc.d script
-
-	Start, stop, reload will not display a friendly error message if
-	Prosody is not running when you attempt to stop or reload, or if
-	Prosody is already running when you attempt to start. Reload also
-	now utilizes the get_pid function.
-	[9873d5256a42]
-
-	* PKGBUILD, prosody.logrotated:
-	Use explicit log filenames in logrotate script
-
-	This fixes an issue where if you do not have olddir enabled, rotated
-	logs will be rotated again.
-	[38ea11efacb9]
-
-2009-06-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD, prosody.rcd:
-	Added status command to rc.d usage
-	[1b31e88d992d]
-
-	* PKGBUILD, prosody.rcd:
-	Added reload command
-	[62e3cbdff1d5]
-
-	* prosody.install:
-	Updated leftover olddir path
-	[e91b3fc2a9ee]
-
-	* PKGBUILD, prosody.rcd:
-	Use explicit source command
-	[b790c098d519]
-
-	* prosody.install:
-	Removed tab characters
-	[870316274137]
-
-2009-06-20  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD:
-	Updated md5 sums
-	[74ce2ab8a96b]
-
-	* prosody.logrotated:
-	Changed default olddir path
-	[cef8226473c2]
-
-	* prosody.rcd:
-	Removed sleep delay in restart
-	[a94167e59091]
-
-2009-06-10  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Removed per-host certificate entry in example configuration
-
-	Until Issue #30
-	[http://code.google.com/p/lxmppd/issues/detail?id=30] is fixed per-
-	host certificates have no effect.
-	[d00e35979450]
-
-2009-06-05  Dwayne Bent  <dbb.0@liqd.org>
-
-	* ChangeLog:
-	Added ChangeLog
-	[7298c4da135a]
-
-2009-06-03  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-3 for changeset 028183ffeba8
-	[7dbfd040e908]
-
-	* PKGBUILD:
-	New release version
-	[028183ffeba8] [v0.4.2-3]
-
-	* PKGBUILD:
-	Removed superfluous make command
-	[3d96c98bac26]
-
-	* PKGBUILD:
-	More consistent use of quote marks
-	[f6bd5b595b2d]
-
-	* PKGBUILD, prosody.logrotated:
-	Correct PID file location in logrotate script
-	[cec60904c739]
-
-2009-05-30  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-2 for changeset 37268dd0d4fd
-	[a8a197635bb6]
-
-	* PKGBUILD:
-	New release version
-	[37268dd0d4fd] [v0.4.2-2]
-
-	* PKGBUILD:
-	Use install instead of mkdir in PKGBUILD
-	[8e48108bbe9a]
-
-	* PKGBUILD, prosody-datadir.diff:
-	Apply patch to fix world-readable data directory
-	[2c706dda941c]
-
-2009-05-23  Dwayne Bent  <dbb.0@liqd.org>
-
-	* .hgtags:
-	Added tag v0.4.2-1 for changeset 1d29ea2dc519
-	[e2d2962de3f7]
-
-	* PKGBUILD:
-	New upstream release
-	[1d29ea2dc519] [v0.4.2-1]
-
-	* prosody.cfg.lua:
-	Aesthetic changes to the configuration file
-	[d5d848a58965]
-
-2009-05-22  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua:
-	Removed extraneous semicolon in configuration file
-	[9a002c74edc2]
-
-	* PKGBUILD:
-	Cleaned up PKGBUILD license
-	[82cb66a84de8]
-
-2009-05-21  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.install:
-	Changed formatting of leftover path messages.
-	[ac6069de93c9]
-
-	* prosody.install:
-	Moved prosody user removal to post_remove.
-	[2c60e27d0c13]
-
-	* PKGBUILD, prosody.cfg.lua:
-	Added comment about pidfile in prosody configuration file.
-	[8b9fa4da48ca]
-
-	* .hgtags:
-	Added tag v0.4.1-5 for changeset 69962178bcae
-	[01812099521b]
-
-	* PKGBUILD:
-	New release version.
-	[69962178bcae] [v0.4.1-5]
-
-	* PKGBUILD, prosody.cfg.lua, prosody.install, prosody.rcd:
-	Refactored rc.d daemon script.
-
-	Prosody now writes its own PID file to /var/run/prosody/prosody.pid.
-	rc.d script now uses '/bin/kill -0' to check for running process
-	instead of awkward combination of 'ps' and 'awk'.
-	[4f0e937c5148]
-
-	* prosody.install:
-	Added post_install message with link to Arch Wiki documentation.
-	[88d99267ad19]
-
-2009-05-19  Dwayne Bent  <dbb.0@liqd.org>
-
-	* PKGBUILD:
-	Add logrotate script to backup array.
-	[d4f5445707f7]
-
-2009-05-11  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.install:
-	Fixed install script attempting to add prosody group when it already
-	exists.
-	[7d7807aa5d30]
-
-	* .hgtags:
-	Added tag v0.4.1-4 for changeset 442f62077f30
-	[389c885a35c5]
-
-	* PKGBUILD:
-	New release version.
-	[442f62077f30] [v0.4.1-4]
-
-	* PKGBUILD:
-	Generated correct checksums for source files.
-	[162859c9e287]
-
-	* .hgtags:
-	Added tag v0.4.1-3 for changeset b629392e4716
-	[f3d11fbd0b45]
-
-	* PKGBUILD:
-	New release version.
-	[b629392e4716] [v0.4.1-3]
-
-	* prosody.logrotated:
-	Fixed wrong PID file path in logrotate script.
-	[0871a4a12392]
-
-2009-05-07  Dwayne Bent  <dbb.0@liqd.org>
-
-	* prosody.cfg.lua, prosody.rcd:
-	Removed trailing whitespace.
-	[7c86c073650e]
-
-	* prosody.cfg.lua:
-	Added logging timestamps to default configuration.
-	[46f9111d47ce]
-
-	* .hgtags:
-	Added tag v0.4.1-2 for changeset 24b9dee19e65
-	[5240b39d76d7]
-
-	* PKGBUILD, prosody.cfg.lua, prosody.install, prosody.logrotated,
-	prosody.rcd:
-	Initial commit.
-	[24b9dee19e65] [v0.4.1-2]
-
diff --git a/community-testing/prosody/PKGBUILD b/community-testing/prosody/PKGBUILD
deleted file mode 100644
index 3e4947701..000000000
--- a/community-testing/prosody/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 72560 2012-06-16 17:10:57Z dreisner $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Dwayne Bent <dbb.0@liqd.org>
-# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
-
-pkgname=prosody
-pkgver=0.8.2
-pkgrel=4
-pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua."
-arch=('i686' 'x86_64')
-url="http://prosody.im/"
-license=('MIT')
-depends=('lua>=5.1' 'luasocket' 'luaexpat' 'luafilesystem' 'libidn>=0.5.18' 'openssl')
-optdepends=('luasec: TLS encryption support'
-	    'lua-zlib: compression support'
-	    'luadbi: SQL storage support')
-install=prosody.install
-backup=('etc/logrotate.d/prosody'
-	'etc/prosody/prosody.cfg.lua')
-source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz"
-	'prosody.rcd'
-	'prosody.logrotated'
-	'fix-config.patch'
-	'prosody.tmpfile.d'
-	'prosody.service')
-md5sums=('6e907bf0d0acf24f1011083020ba6ffb'
-         'd2b5f9c8e42bb31819e715eb1756ee53'
-         '26466fdbea87963a3ca6f48f76fe4a29'
-         '59a1bf2dfd0bd386cef6fa646e2a3752'
-         'e2f5a1df410b05696a30dcb058841084'
-         'e74045f27cb60908d535969906781f75')
-
-build() {
-    cd "$srcdir/prosody-$pkgver"
-    patch -p1 <$srcdir/fix-config.patch
-    ./configure --prefix=/usr --sysconfdir=/etc/prosody \
-        --datadir=/var/lib/prosody
-    make
-}
-
-package() {
-    cd "$srcdir/prosody-$pkgver"
-
-    make DESTDIR="$pkgdir" install
-
-    rm $pkgdir/etc/prosody/certs/*
-
-    install -d "$pkgdir/etc/rc.d"
-    install -d "$pkgdir/etc/logrotate.d"
-    install -d "$pkgdir/var/log/prosody"
-
-    install -o root -g root -m 755 "$srcdir/prosody.rcd" \
-        "$pkgdir/etc/rc.d/prosody"
-    install -o root -g root -m 644 "$srcdir/prosody.logrotated" \
-        "$pkgdir/etc/logrotate.d/prosody"
-
-    install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-    install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf
-    install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service
-}
diff --git a/community-testing/prosody/fix-config.patch b/community-testing/prosody/fix-config.patch
deleted file mode 100644
index 8856bfb92..000000000
--- a/community-testing/prosody/fix-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -wbBur prosody-0.8.0/prosody.cfg.lua.dist prosody-0.8.0.my/prosody.cfg.lua.dist
---- prosody-0.8.0/prosody.cfg.lua.dist	2011-04-05 13:47:06.000000000 +0000
-+++ prosody-0.8.0.my/prosody.cfg.lua.dist	2011-04-07 16:03:42.000000000 +0000
-@@ -21,6 +21,8 @@
- -- (see http://prosody.im/doc/creating_accounts for info)
- -- Example: admins = { "user1@example.com", "user2@example.net" }
- admins = { }
-+daemonize = true
-+pidfile = "/var/run/prosody/prosody.pid"
- 
- -- Enable use of libevent for better performance under high load
- -- For more information see: http://prosody.im/doc/libevent
-@@ -59,7 +61,7 @@
- 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
- 
- 	-- Other specific functionality
--		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
-+		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- 		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
- 		--"httpserver"; -- Serve static files from a directory over HTTP
- 		--"groups"; -- Shared roster support
-@@ -123,8 +125,8 @@
- -- Logging configuration
- -- For advanced logging see http://prosody.im/doc/logging
- log = {
--	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
--	error = "prosody.err";
-+	info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
-+	error = "/var/log/prosody/prosody.err";
- 	-- "*syslog"; -- Uncomment this for logging to syslog
- 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
- }
diff --git a/community-testing/prosody/prosody.install b/community-testing/prosody/prosody.install
deleted file mode 100644
index f935e3d63..000000000
--- a/community-testing/prosody/prosody.install
+++ /dev/null
@@ -1,35 +0,0 @@
-post_install() {
-    if [ -z "`grep '^prosody:' /etc/group`" ]; then
-        groupadd -g 412 prosody
-    fi
-    if [ -z "`grep '^prosody:' /etc/passwd`" ]; then
-        useradd -u 412 -d /var/lib/prosody -g prosody -s /bin/false prosody
-    fi
-
-    chown prosody:prosody var/lib/prosody
-    chown prosody:prosody var/log/prosody
-
-    echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody"
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    userdel prosody
-
-    paths=(/etc/prosody /var/lib/prosody /var/log/prosody
-           /var/log/old/prosody)
-
-    first=true
-    for path in ${paths[@]}; do
-        if [ -d $path ]; then
-            if $first; then
-                first=false
-                echo "==> Leftover Paths:"
-            fi
-            echo "==> $path"
-        fi
-    done
-}
diff --git a/community-testing/prosody/prosody.logrotated b/community-testing/prosody/prosody.logrotated
deleted file mode 100644
index 5659ba01f..000000000
--- a/community-testing/prosody/prosody.logrotated
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/prosody/prosody.log /var/log/prosody/prosody.err {
-    # olddir /var/log/old/prosody
-    create 644 prosody prosody
-    sharedscripts
-    missingok
-    postrotate
-        /bin/kill -HUP `cat /var/run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true
-    endscript
-}
diff --git a/community-testing/prosody/prosody.rcd b/community-testing/prosody/prosody.rcd
deleted file mode 100644
index afaf77903..000000000
--- a/community-testing/prosody/prosody.rcd
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-
-daemon_name=prosody
-pid_file=/var/run/$daemon_name/$daemon_name.pid
-
-source /etc/rc.conf
-source /etc/rc.d/functions
-
-get_pid() {
-    if [ -f $pid_file ]; then
-        /bin/kill -0 $(cat $pid_file)
-        if [ $? == 0 ]; then
-            cat $pid_file
-        fi
-    fi
-}
-
-case "$1" in
-    start)
-        stat_busy "Starting $daemon_name daemon"
-
-        [ -d /var/run/$daemon_name ] || { mkdir -p /var/run/$daemon_name ; chown prosody:prosody /var/run/prosody; }
-        PID=$(get_pid)
-        if [ -z "$PID" ]; then
-            [ -f $pid_file ] && rm -f $pid_file
-            mkdir -p `dirname $pid_file`
-            prosodyctl start 1>/dev/null 2>/dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                add_daemon $daemon_name
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is already running"
-            exit 1
-        fi
-        ;;
-
-    stop)
-        stat_busy "Stopping $daemon_name daemon"
-        PID=$(get_pid)
-        if [ ! -z "$PID" ]; then
-            prosodyctl stop 1>/dev/null 2>/dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                rm -f $pid_file &> /dev/null
-                rm_daemon $daemon_name
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is not running"
-            exit 1
-        fi
-        ;;
-
-    restart)
-        $0 stop
-        $0 start
-        ;;
-
-    reload)
-        stat_busy "Reloading $daemon_name"
-        PID=$(get_pid)
-        if [ ! -z "$PID" ]; then
-            /bin/kill -HUP $PID 2> /dev/null
-            if [ $? -gt 0 ]; then
-                stat_fail
-                exit 1
-            else
-                stat_done
-            fi
-        else
-            stat_fail
-            printhl "$daemon_name is not running"
-        fi
-        ;;
-
-    status)
-        stat_busy "Checking $daemon_name status";
-        ck_status $daemon_name
-        ;;
-
-    *)
-        echo "usage: $0 {start|stop|restart|reload|status}"
-    esac
-
-exit 0
diff --git a/community-testing/prosody/prosody.service b/community-testing/prosody/prosody.service
deleted file mode 100644
index f54159f55..000000000
--- a/community-testing/prosody/prosody.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=XMPP (Jabber) Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/prosody/prosody.pid
-ExecStart=/usr/bin/prosodyctl start
-ExecStop=/usr/bin/prosodyctl stop
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/community-testing/prosody/prosody.tmpfile.d b/community-testing/prosody/prosody.tmpfile.d
deleted file mode 100644
index 5f6de657d..000000000
--- a/community-testing/prosody/prosody.tmpfile.d
+++ /dev/null
@@ -1 +0,0 @@
-d    /run/prosody 0755 412 412
diff --git a/community-testing/pyqt3/PKGBUILD b/community-testing/pyqt3/PKGBUILD
deleted file mode 100644
index 19e46af0b..000000000
--- a/community-testing/pyqt3/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 77299 2012-10-08 15:06:38Z 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=11
-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')
-makedepends=('glu')
-license=('GPL')
-source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
-
-build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  . /etc/profile.d/qt3.sh
-  echo yes | python2 configure.py -b /usr/bin \
-    -d /usr/lib/python2.7/site-packages \
-    -v /usr/share/sip
-  make
-}
-
-package() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/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 64a455419..000000000
--- a/community-testing/python-bsddb/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 78072 2012-10-16 11:52:09Z allan $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
-# Maintainer: 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.3.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
-        LICENSE)
-sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915'
-          'ef4e4caf618781104dbf5824279ed39d127b4713')
-
-build () {
-  cd "${srcdir}"
-
-  cp -r bsddb3-${pkgver}{,-python2}
-
-  # Build python 3 module
-  cd bsddb3-${pkgver}
-  python3 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.3')
-  cd "${srcdir}/bsddb3-${pkgver}"
-
-  python3 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-gnupginterface/PKGBUILD b/community-testing/python-gnupginterface/PKGBUILD
deleted file mode 100644
index 33446e9b3..000000000
--- a/community-testing/python-gnupginterface/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Aaron Schaefer <aaron@elasticdog.com>
-
-pkgbase=python-gnupginterface
-pkgname=python2-gnupginterface
-pkgver=0.3.2
-pkgrel=1
-pkgdesc='A Python interface to GNU Privacy Guard (GnuPG).'
-arch=('i686' 'x86_64')
-url='http://py-gnupg.sourceforge.net/'
-license=('GPL')
-depends=('gnupg' 'python2')
-conflicts=('python-gnupginterface<=0.3.2-6')
-replaces=('python-gnupginterface<=0.3.2-6')
-source=("http://downloads.sourceforge.net/sourceforge/py-gnupg/GnuPGInterface-$pkgver.tar.gz")
-md5sums=('d4627d83446f96bd8c22f8d15db3f7c2')
-
-package_python2-gnupginterface() {
-  cd "$srcdir/GnuPGInterface-$pkgver"
-  python2 setup.py install --root="$pkgdir" -O1
-}
diff --git a/community-testing/python-mpi4py/PKGBUILD b/community-testing/python-mpi4py/PKGBUILD
deleted file mode 100644
index 74cb41ee8..000000000
--- a/community-testing/python-mpi4py/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 78088 2012-10-16 11:52:49Z allan $
-# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Sebastien Binet <binet@cern.ch>
-
-pkgbase=python-mpi4py
-pkgname=('python-mpi4py' 'python2-mpi4py')
-pkgver=1.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://mpi4py.scipy.org"
-license=('BSD')
-makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'openmpi')
-source=(http://mpi4py.googlecode.com/files/mpi4py-${pkgver}.tar.gz)
-sha1sums=('282c1b9e35b242c9bd86126ebc5af6c70d8c2833')
-
-build() {
-    cd "${srcdir}"
-    cp -a mpi4py-${pkgver}{,-python2}
-
-    # Build python 3 module
-    cd mpi4py-${pkgver}
-    python3 setup.py build
-
-    # Build python 2 module
-    cd ../mpi4py-${pkgver}-python2
-    python2 setup.py build
-}
-
-package_python-mpi4py() {
-    pkgdesc="Python bindings of the Message Passing Interface (MPI)"
-    depends=('python>=3.3' 'openmpi')
-
-    cd "${srcdir}/mpi4py-${pkgver}"
-    python3 setup.py install --root "${pkgdir}" --optimize=1 --skip-build 
-}
-
-package_python2-mpi4py() {
-    pkgdesc="Python2 bindings of the Message Passing Interface (MPI)"
-    depends=('python2>=2.7' 'openmpi')
-
-    cd "${srcdir}/mpi4py-${pkgver}-python2"
-    python2 setup.py install --root "${pkgdir}" --optimize=1 --skip-build 
-}
diff --git a/community-testing/python-numarray/LICENSE b/community-testing/python-numarray/LICENSE
deleted file mode 100644
index 30ff57fc4..000000000
--- a/community-testing/python-numarray/LICENSE
+++ /dev/null
@@ -1,9 +0,0 @@
-Copyright (C) 2005 Association of Universities for Research in Astronomy (AURA)
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-3. The name of AURA and its representatives may not be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY AURA ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL AURA BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/community-testing/python-numarray/PKGBUILD b/community-testing/python-numarray/PKGBUILD
deleted file mode 100644
index 327b286b5..000000000
--- a/community-testing/python-numarray/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78090 2012-10-16 11:52:56Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgbase=python-numarray
-pkgname=python2-numarray
-pkgver=1.5.2
-pkgrel=6
-pkgdesc='Provides array manipulation and computational capabilities.'
-arch=('i686' 'x86_64')
-url='http://numpy.scipy.org/'
-license=('BSD')
-depends=('python2')
-conflicts=('python2-numarray<=1.5.2-6')
-replaces=('python2-numarray<=1.5.2-6')
-source=("http://downloads.sourceforge.net/sourceforge/numpy/numarray-${pkgver}.tar.gz"
-        'LICENSE')
-md5sums=('d2ecfc60fe4869c328b872540d04e0f7'
-         'e32b4466453e530d7fb0dbeee0ca1044')
-
-build() {
-  cd "${srcdir}/numarray-${pkgver}"
-
-  # python2 fix
-  sed -i 's_#! /usr/bin/env python_#! /usr/bin/env python2_' Examples/convolve/benchmark.py
-}
-
-package_python2-numarray() {
-  cd "${srcdir}/numarray-${pkgver}"
-
-  python2 setup.py install --root="${pkgdir}"
-  install -D ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-testing/python-openbabel/PKGBUILD b/community-testing/python-openbabel/PKGBUILD
deleted file mode 100644
index 130117080..000000000
--- a/community-testing/python-openbabel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78091 2012-10-16 11:53:00Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Michal Bozon <bozonm@vscht.cz>
-
-pkgname=python-openbabel
-pkgver=2.3.1
-pkgrel=3
-pkgdesc="Python bindings of openbabel library"
-arch=('i686' 'x86_64')
-url="http://openbabel.org/wiki/Python"
-license=('GPL')
-depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2')
-makedepends=('swig' 'cmake')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz)
-md5sums=('1f029b0add12a3b55582dc2c832b04f8')
-
-build() {
-  cd "${srcdir}/openbabel-$pkgver"
-  
-  # Create babelconfig.h
-  cmake .
-
-  # Regenerate interface with the patched swig 2.0.2
-  cd scripts
-  swig -I../include/ -python -py3 -c++  openbabel-python.i
-  mv openbabel-python_wrap.cxx python/openbabel-python.cpp
-  mv openbabel.py python/
-
-  cd python
-  sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py
-  sed -i '20i os.path.join("/usr/include/eigen2"),'        setup.py
-}
-
-package() {
-  cd "${srcdir}/openbabel-$pkgver/scripts/python"
-  python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-}
diff --git a/community-testing/python-psutil/PKGBUILD b/community-testing/python-psutil/PKGBUILD
deleted file mode 100644
index 2ea97fda2..000000000
--- a/community-testing/python-psutil/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 78094 2012-10-16 11:53:08Z allan $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgbase=python-psutil
-pkgname=('python-psutil' 'python2-psutil')
-pkgver=0.6.1
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://code.google.com/p/psutil/'
-license=('custom: BSD')
-makedepends=('python' 'python-distribute' 'python2' 'python2-distribute')
-source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") 
-sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86')
-
-build() {
-  cd psutil-$pkgver
-  python setup.py build --build-lib=build/python
-  python2 setup.py build --build-lib=build/python2
-  find build/python2 -type f -exec \
-    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
-}
-
-package_python-psutil() {
-  pkgdesc='A cross-platform process and system utilities module for Python'
-  depends=('glibc' 'python')
-
-  cd psutil-$pkgver
-  python setup.py build --build-lib=build/python \
-                  install --root="$pkgdir" --optimize=1
-  install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python2-psutil() {
-  pkgdesc='A cross-platform process and system utilities module for Python2'
-  depends=('glibc' 'python2')
-
-  cd psutil-$pkgver
-  python2 setup.py build --build-lib=build/python2 \
-                   install --root="$pkgdir" --optimize=1
-  install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/python-psycopg1/PKGBUILD b/community-testing/python-psycopg1/PKGBUILD
deleted file mode 100644
index b2a54c3d5..000000000
--- a/community-testing/python-psycopg1/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 78095 2012-10-16 11:53:11Z allan $
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-psycopg1
-pkgname=python2-psycopg1
-pkgver=1.1.21
-pkgrel=8
-pkgdesc="A PostgreSQL database adapter for Python"
-arch=('i686' 'x86_64')
-url="http://initd.org/projects/psycopg1"
-license=('GPL')
-depends=('python2-egenix-mx-base' 'postgresql')
-conflicts=('python-psycopg1<=1.1.21-7')
-replaces=('python-psycopg1<=1.1.21-7')
-source=(http://initd.org/psycopg/tarballs/PSYCOPG-1-1/psycopg-$pkgver.tar.gz)
-md5sums=('a31f79f68d6d32898d6f24e11369a106')
-sha1sums=('02d8a8b5dd682306117896c7c63a9a1b518997b6')
-
-build() {
-  cd "$srcdir/psycopg-$pkgver"
-
-  ./configure --prefix=/usr --with-python=/usr/bin/python2 \
-              --with-mxdatetime-includes=/usr/lib/python2.7/site-packages/mx/DateTime/mxDateTime
-  sed -e 's:\(echo "  install -m 555 $$mod \)\($(PY_MOD_DIR)\)\("; \\\):\1${DESTDIR}\2/$$mod\3:' \
-		-e 's:\($(INSTALL)  -m 555 $$mod \)\($(PY_MOD_DIR)\)\(; \\\):\1${DESTDIR}\2/$$mod\3:' \
-		-i Makefile
-  make
-}
-
-package_python2-psycopg1() {
-  cd "$srcdir/psycopg-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/python-psycopg2/ChangeLog b/community-testing/python-psycopg2/ChangeLog
deleted file mode 100644
index f31be0aaa..000000000
--- a/community-testing/python-psycopg2/ChangeLog
+++ /dev/null
@@ -1,25 +0,0 @@
-
-2009-08-05  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated to: 2.0.11
-
-2009-03-24  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 2.0.9
-
-2009-01-11  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Rebuilt for python 2.6
-
-2008-04-25  Mateusz Herych <heniekk@gmail.com>
-
-	* Built for x86_64 - 2.0.7
-
-2008-04-23  Douglas Soares de Andrade  <dsa@aur.archlinux.org>
-
-	* Built for i686 - 2.0.7
-
-2007-06-27  tardo  <tardo@nagi-fanboi.net>
-	
-	* Built for x86_64
-
diff --git a/community-testing/python-psycopg2/PKGBUILD b/community-testing/python-psycopg2/PKGBUILD
deleted file mode 100644
index 34534e06a..000000000
--- a/community-testing/python-psycopg2/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 78096 2012-10-16 11:53:16Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgbase=python-psycopg2
-pkgname=('python-psycopg2' 'python2-psycopg2')
-pkgver=2.4.5
-pkgrel=2
-pkgdesc="A PostgreSQL database adapter for the Python programming language."
-arch=('i686' 'x86_64')
-url="http://initd.org/psycopg/"
-license=('LGPL3')
-makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
-source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz)
-md5sums=('075e4df465e9a863f288d5bdf6e6887e')
-
-build() {
-  cd "$srcdir/psycopg2-$pkgver"
-  sed -i 's/,PSYCOPG_DEBUG$//' setup.cfg
-}
-
-package_python-psycopg2() {
-  depends=('python' 'postgresql-libs>=8.4.1')
-
-  cd "$srcdir/psycopg2-$pkgver"
-  python setup.py install --root="$pkgdir"
-}
-
-package_python2-psycopg2() {
-  depends=('python2' 'postgresql-libs>=8.4.1')
-
-  cd "$srcdir/psycopg2-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-}
diff --git a/community-testing/python-pymongo/PKGBUILD b/community-testing/python-pymongo/PKGBUILD
deleted file mode 100644
index 0106f3034..000000000
--- a/community-testing/python-pymongo/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 78100 2012-10-16 11:53:25Z allan $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Thomas S Hatch <thatch45@gmail.com>
-
-pkgbase=python-pymongo
-pkgname=('python-pymongo' 'python2-pymongo')
-pkgver=2.3
-pkgrel=2
-pkgdesc='Python driver for MongoDB'
-arch=('x86_64' 'i686')
-license=('APACHE')
-url='http://pypi.python.org/pypi/pymongo/'
-makedepends=('python-distribute' 'python2-distribute')
-source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc')
-
-build() {
-  cd "$srcdir" 
-  cp -a "pymongo-$pkgver" "pymongo2-$pkgver"
-
-}
-
-package_python2-pymongo() {
-  depends=('python2')
-  cd "$srcdir/pymongo2-$pkgver"
-
-  python2 setup.py install --root="$pkgdir" --optimize=1
-}
-
-package_python-pymongo() {
-  depends=('python')
-
-  cd "$srcdir/pymongo-$pkgver"
-
-  python setup.py install --root="$pkgdir" --optimize=1
-}
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/python-pyopencl/LICENSE.txt b/community-testing/python-pyopencl/LICENSE.txt
deleted file mode 100644
index 3ce400f9d..000000000
--- a/community-testing/python-pyopencl/LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/community-testing/python-pyopencl/PKGBUILD b/community-testing/python-pyopencl/PKGBUILD
deleted file mode 100644
index c3bf9ef7a..000000000
--- a/community-testing/python-pyopencl/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 78161 2012-10-16 15:46:57Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgbase=python-pyopencl
-pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers')
-pkgver=2012.1
-pkgrel=5
-pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
-arch=('i686' 'x86_64')
-url="http://mathema.tician.de/software/pyopencl"
-license=('custom')
-makedepends=('ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy')
-source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
-        'LICENSE.txt')
-sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff'
-          '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7')
-
-build() {
-   cd "$srcdir"
-
-   cp -a pyopencl-$pkgver{,-python2}
-
-   cd "${srcdir}/pyopencl-${pkgver}"
-   python3 ./configure.py --cl-enable-gl --no-use-shipped-boost
-   python3 setup.py build
-
-   cd "$srcdir/pyopencl-$pkgver-python2"
-   python2 ./configure.py --cl-enable-gl --no-use-shipped-boost
-   python2 setup.py build
-}
-
-package_python-pyopencl() {
-   depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers')
-
-   cd "${srcdir}/pyopencl-${pkgver}"
-   python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-   rm -fr "${pkgdir}"/usr/include
-
-   install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python2-pyopencl() {
-   depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers')
-
-   cd "${srcdir}/pyopencl-${pkgver}-python2"
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-   rm -fr "${pkgdir}"/usr/include
-
-   install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_pyopencl-headers() {
-   cd "${srcdir}/pyopencl-${pkgver}"
-   install -dm755 "${pkgdir}"/usr/include/pyopencl
-
-   for file in pyopencl-bessel-j.cl pyopencl-cephes.cl pyopencl-airy.cl pyopencl-ranluxcl.cl pyopencl-complex.h; do
-      install -m644 src/cl/${file} "${pkgdir}"/usr/include/pyopencl
-   done
-}
diff --git a/community-testing/python-pyproj/PKGBUILD b/community-testing/python-pyproj/PKGBUILD
deleted file mode 100644
index 5df85db9d..000000000
--- a/community-testing/python-pyproj/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 78103 2012-10-16 11:53:33Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgbase=python-pyproj
-pkgname=('python-pyproj' 'python2-pyproj')
-pkgver=1.9.2
-pkgrel=1
-pkgdesc="Python interfaces to PROJ.4 library"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pyproj"
-license=('custom')
-source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz)
-makedepends=('python' 'python2')
-sha1sums=('a7a4bf95f3492e45704bccd4aeafe3bbe32fb023')
-
-build() {
-   cd "${srcdir}"
-
-   cp -a pyproj-${pkgver}{,-python2}
-
-   # Build python 3 module
-   cd pyproj-${pkgver}
-   python3 setup.py build
-
-   # Build python 2 module
-   cd ../pyproj-${pkgver}-python2
-   python2 setup.py build
-}
-
-package_python-pyproj() {
-   depends=('proj' 'python>=3.3')
-
-   cd "${srcdir}"/pyproj-${pkgver}
-   python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-   install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
-   install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_python2-pyproj() {
-   depends=('proj' 'python2>=2.7')
-   replaces=('pyproj')
-
-   cd "${srcdir}"/pyproj-${pkgver}-python2
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-   install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname}
-   install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-testing/python-pyxattr/PKGBUILD b/community-testing/python-pyxattr/PKGBUILD
deleted file mode 100644
index a60dc386c..000000000
--- a/community-testing/python-pyxattr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78107 2012-10-16 11:53:42Z allan $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Jon Bergli Heier <snakebite@jvnv.net>
-
-pkgname=('python2-pyxattr' 'python-pyxattr')
-pkgbase=python-pyxattr
-_pkgname=pyxattr
-pkgver=0.5.0
-pkgrel=4
-pkgdesc='A python extension module that allows you to manipulate the extended attributes.'
-arch=('i686' 'x86_64')
-url='http://pyxattr.sourceforge.net/'
-license=('GPL')
-makedepends=('python2' 'python' 'python2-distribute' 'python-distribute')
-source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
-md5sums=('0f7ab1e185087329e40f7de218517c84')
-
-package_python2-pyxattr() {
-  depends=('python2')
-  provides=('pyxattr')
-  conflicts=('pyxattr')
-  replaces=('pyxattr')
-
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}"
-}
-
-package_python-pyxattr() {
-  depends=('python')
-
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  python setup.py install --root="${pkgdir}"
-}
diff --git a/community-testing/python-pyzmq/PKGBUILD b/community-testing/python-pyzmq/PKGBUILD
deleted file mode 100644
index a2951c651..000000000
--- a/community-testing/python-pyzmq/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 78108 2012-10-16 11:53:45Z allan $
-# Maintainer: Kyle Keen <keenerd at gmail dot com>
-pkgname=python-pyzmq
-pkgver=2.2.0.1
-pkgrel=2
-pkgdesc="Python3 bindings for zeromq, written in Cython"
-arch=(i686 x86_64)
-url="http://www.zeromq.org/bindings:python"
-license=('LGPL')
-depends=(zeromq python)
-source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
-md5sums=('f2f80709e84c8ac72d6671eee645d804')
-
-build() {
-  cd "$srcdir/pyzmq-$pkgver"
-  # py3 errors added in 2.2.0.1 
-  sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py
-  sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py
-  python3 setup.py install --root="$pkgdir" --optimize=0
-} 
diff --git a/community-testing/python-scipy/PKGBUILD b/community-testing/python-scipy/PKGBUILD
deleted file mode 100644
index 49f943dc5..000000000
--- a/community-testing/python-scipy/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Ray Rashif <schiv@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com>
-# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
-
-pkgname=('python-scipy' 'python2-scipy')
-pkgver=0.11.0
-pkgrel=2
-pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
-arch=('i686' 'x86_64')
-url="http://www.scipy.org/"
-license=('BSD')
-makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy')
-checkdepends=('python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz")
-md5sums=('842c81d35fd63579c41a8ca21a2419b9')
-
-build() {
-  unset LDFLAGS
-  unset FFLAGS
-
-  # Changing the arithmetic parameter (Thanks to Fabrizio Castellano)
-  sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \
-    scipy-${pkgver}/scipy/special/cephes/mconf.h
-
-  # 2 builds
-  cp -r scipy-${pkgver} scipy-${pkgver}-py2
-
-  # build for python3
-  cd scipy-${pkgver}
-  python setup.py config_fc --fcompiler=gnu95 build
-
-  # build for python2
-  cd ../scipy-${pkgver}-py2
-
-  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
-
-  python2 setup.py config_fc --fcompiler=gnu95 build
-}
-
-check() {
-  cd scipy-${pkgver}
-# figure out how to run tests in the source tree easily
-#  python -c "from scipy import test; test('full')"
-
-  cd ../scipy-${pkgver}-py2
-# figure out how to run tests in the source tree easily
-#  python2 -c "from scipy import test; test('full')"
-}
-
-package_python-scipy() {
-  depends=('python-numpy')
-  provides=('python3-scipy' 'scipy')
-
-  cd scipy-${pkgver}
-
-  python setup.py config_fc --fcompiler=gnu95 install \
-    --prefix=/usr --root=${pkgdir} --optimize=1
-
-  install -Dm644 LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/python-scipy/LICENSE"
-}
-
-package_python2-scipy() {
-  depends=('python2-numpy')
-  conflicts=('python-scipy<0.9.0')
-
-  cd scipy-${pkgver}-py2
-
-  python2 setup.py config_fc --fcompiler=gnu95 install \
-    --prefix=/usr --root=${pkgdir} --optimize=1
-
-  install -Dm644 LICENSE.txt \
-    "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/python-sqlalchemy/PKGBUILD b/community-testing/python-sqlalchemy/PKGBUILD
deleted file mode 100644
index e6a1ded02..000000000
--- a/community-testing/python-sqlalchemy/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 78113 2012-10-16 11:54:00Z allan $ 
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgbase=python-sqlalchemy
-pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.7.9
-pkgrel=1
-arch=('i686' 'x86_64') # python2 package contain .so
-url="http://www.sqlalchemy.org/"
-license=('custom: MIT')
-makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('c4852d586d95a59fbc9358f4467875d5')
-
-build() {
-  cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
-  cd SQLAlchemy-$pkgver
-  python setup.py build
-  cd ../SQLAlchemy2-$pkgver
-  python2 setup.py build
-}
-
-package_python-sqlalchemy() {
-  pkgdesc='Python SQL toolkit and Object Relational Mapper'
-  depends=('python')
-
-  cd SQLAlchemy-${pkgver}
-  python setup.py install --root="${pkgdir}"
-  install -D -m644 LICENSE \
-	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_python2-sqlalchemy() {
-  pkgdesc='Python 2 SQL toolkit and Object Relational Mapper'
-  depends=('python2')
-
-  cd SQLAlchemy2-$pkgver
-  python2 setup.py install --root="$pkgdir"
-  install -D -m644 LICENSE \
-	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/python-yaml/PKGBUILD b/community-testing/python-yaml/PKGBUILD
deleted file mode 100644
index 3d48ebc4e..000000000
--- a/community-testing/python-yaml/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 78118 2012-10-16 11:54:14Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Michal Bozon <michal.bozon__at__gmail.com>
-
-pkgbase=python-yaml
-pkgname=(python2-yaml python-yaml)
-pkgver=3.10
-pkgrel=3
-pkgdesc="Python bindings for YAML, using fast libYAML library"
-arch=('i686' 'x86_64')
-url="http://pyyaml.org"
-license=('MIT')
-makedepends=('python' 'python2' 'libyaml')
-install='python-yaml.install'
-source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz)
-md5sums=('74c94a383886519e9e7b3dd1ee540247')
-
-build() {
-  true
-}
-
-package_python2-yaml() {
-  depends=('python2' 'libyaml')
-
-  cd $srcdir/PyYAML-$pkgver
-  python2 setup.py install --prefix=/usr --root=$pkgdir
-  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python-yaml() {
-  depends=('python' 'libyaml')
-
-  cd $srcdir/PyYAML-$pkgver
-  python setup.py install --prefix=/usr --root=$pkgdir
-  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-testing/python-yaml/python-yaml.install b/community-testing/python-yaml/python-yaml.install
deleted file mode 100644
index e2ae0674b..000000000
--- a/community-testing/python-yaml/python-yaml.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  cat << EOT
-==> Note that even though this package uses libyaml library,
-==> slower pure python implementation is used by default.
-==> See http://pyyaml.org/wiki/PyYAMLDocumentation
-EOT
-}
diff --git a/community-testing/python2-cjson/PKGBUILD b/community-testing/python2-cjson/PKGBUILD
deleted file mode 100644
index 2d95793a4..000000000
--- a/community-testing/python2-cjson/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Lincoln de Sousa <lincoln@archlinux-br.org>
-
-pkgname=python2-cjson
-pkgver=1.0.5
-pkgrel=5
-arch=('i686' 'x86_64')
-license=('LGPL')
-pkgdesc="Fast JSON encoder/decoder for Python"
-url="http://pypi.python.org/pypi/python-cjson/"
-depends=('python2')
-source=("http://pypi.python.org/packages/source/p/python-cjson/python-cjson-$pkgver.tar.gz")
-md5sums=('4d55b66ecdf0300313af9d030d9644a3')
-
-build() {
-  cd $srcdir/python-cjson-$pkgver
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community-testing/python2-galago/PKGBUILD b/community-testing/python2-galago/PKGBUILD
deleted file mode 100644
index 6076c3a9e..000000000
--- a/community-testing/python2-galago/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 66128 2012-02-23 01:37:06Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python2-galago
-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' 'pygtk')
-source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2)
-md5sums=('27be31fcf2886aa21823caec15dc34aa')
-
-build() {
-  cd $srcdir/galago-python-$pkgver
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/python2-gnutls/PKGBUILD b/community-testing/python2-gnutls/PKGBUILD
deleted file mode 100644
index 3a7c86a04..000000000
--- a/community-testing/python2-gnutls/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 74655 2012-08-01 13:54:20Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-# Contributor: N3RD3X <n3rd3x@linuxmail.org>
-
-pkgname=python2-gnutls
-pkgver=1.2.4
-pkgrel=2
-pkgdesc="Python wrapper for the GNUTLS library"
-arch=('i686' 'x86_64')
-url="http://cheeseshop.python.org/pypi/python-gnutls"
-depends=('python2' 'gnutls')
-license=('LGPL')
-source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz
-	gnutls3.patch)
-md5sums=('e3536c421291a791869d875a41dcb26a'
-         '24bc95d9f5e71e9f5e180706cbb09248')
-
-build() {
-  cd ${srcdir}/python-gnutls-${pkgver}
-  patch -Np0 <$srcdir/gnutls3.patch
-  python2 setup.py install --root=${pkgdir}
-}
diff --git a/community-testing/python2-gnutls/gnutls3.patch b/community-testing/python2-gnutls/gnutls3.patch
deleted file mode 100644
index 5110de2f2..000000000
--- a/community-testing/python2-gnutls/gnutls3.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
---- gnutls/library/functions.py	2011-08-19 04:48:14.000000000 +0100
-+++ gnutls.fixed/library/functions.py	2012-08-01 11:56:43.450975419 +0100
-@@ -4,7 +4,7 @@
- import sys
- from ctypes import *
- 
--from gnutls.library import libgnutls, libgnutls_extra
-+from gnutls.library import libgnutls
- from gnutls.library.types import *
- 
- 
-@@ -121,14 +121,6 @@
- gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)]
- gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t)
- 
--gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas
--gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)]
--gnutls_certificate_get_x509_cas.restype = None
--
--gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls
--gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)]
--gnutls_certificate_get_x509_crls.restype = None
--
- gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence
- gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int]
- gnutls_certificate_send_x509_rdn_sequence.restype = None
-@@ -221,10 +213,6 @@
- gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)]
- gnutls_certificate_type_set_priority.restype = c_int
- 
--gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers
--gnutls_certificate_verify_peers.argtypes = [gnutls_session_t]
--gnutls_certificate_verify_peers.restype = c_int
--
- gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2
- gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)]
- gnutls_certificate_verify_peers2.restype = c_int
-@@ -393,10 +381,6 @@
- gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)]
- gnutls_error_to_alert.restype = c_int
- 
--gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version
--gnutls_extra_check_version.argtypes = [c_char_p]
--gnutls_extra_check_version.restype = c_char_p
--
- gnutls_fingerprint = libgnutls.gnutls_fingerprint
- gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)]
- gnutls_fingerprint.restype = c_int
-@@ -409,10 +393,6 @@
- gnutls_global_init.argtypes = []
- gnutls_global_init.restype = c_int
- 
--gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra
--gnutls_global_init_extra.argtypes = []
--gnutls_global_init_extra.restype = c_int
--
- gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function
- gnutls_global_set_log_function.argtypes = [gnutls_log_func]
- gnutls_global_set_log_function.restype = None
-@@ -461,86 +441,6 @@
- gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
- gnutls_hex_encode.restype = c_int
- 
--gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials
--gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)]
--gnutls_ia_allocate_client_credentials.restype = c_int
--
--gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials
--gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)]
--gnutls_ia_allocate_server_credentials.restype = c_int
--
--gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable
--gnutls_ia_enable.argtypes = [gnutls_session_t, c_int]
--gnutls_ia_enable.restype = None
--
--gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send
--gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int]
--gnutls_ia_endphase_send.restype = c_int
--
--gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret
--gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p]
--gnutls_ia_extract_inner_secret.restype = None
--
--gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials
--gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t]
--gnutls_ia_free_client_credentials.restype = None
--
--gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials
--gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t]
--gnutls_ia_free_server_credentials.restype = None
--
--gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge
--gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p]
--gnutls_ia_generate_challenge.restype = c_int
--
--gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr
--gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t]
--gnutls_ia_get_client_avp_ptr.restype = c_void_p
--
--gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr
--gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t]
--gnutls_ia_get_server_avp_ptr.restype = c_void_p
--
--gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake
--gnutls_ia_handshake.argtypes = [gnutls_session_t]
--gnutls_ia_handshake.restype = c_int
--
--gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p
--gnutls_ia_handshake_p.argtypes = [gnutls_session_t]
--gnutls_ia_handshake_p.restype = c_int
--
--gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret
--gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p]
--gnutls_ia_permute_inner_secret.restype = c_int
--
--gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv
--gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t]
--gnutls_ia_recv.restype = ssize_t
--
--gnutls_ia_send = libgnutls_extra.gnutls_ia_send
--gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t]
--gnutls_ia_send.restype = ssize_t
--
--gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function
--gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func]
--gnutls_ia_set_client_avp_function.restype = None
--
--gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr
--gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p]
--gnutls_ia_set_client_avp_ptr.restype = None
--
--gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function
--gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func]
--gnutls_ia_set_server_avp_function.restype = None
--
--gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr
--gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p]
--gnutls_ia_set_server_avp_ptr.restype = None
--
--gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase
--gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p]
--gnutls_ia_verify_endphase.restype = c_int
--
- gnutls_init = libgnutls.gnutls_init
- gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t]
- gnutls_init.restype = c_int
-@@ -733,10 +633,6 @@
- gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t]
- gnutls_psk_free_server_credentials.restype = None
- 
--gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key
--gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)]
--gnutls_psk_netconf_derive_key.restype = c_int
--
- gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username
- gnutls_psk_server_get_username.argtypes = [gnutls_session_t]
- gnutls_psk_server_get_username.restype = c_char_p
-@@ -857,10 +753,6 @@
- gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t]
- gnutls_session_enable_compatibility_mode.restype = None
- 
--gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random
--gnutls_session_get_client_random.argtypes = [gnutls_session_t]
--gnutls_session_get_client_random.restype = c_void_p
--
- gnutls_session_get_data = libgnutls.gnutls_session_get_data
- gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
- gnutls_session_get_data.restype = c_int
-@@ -873,18 +765,10 @@
- gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
- gnutls_session_get_id.restype = c_int
- 
--gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret
--gnutls_session_get_master_secret.argtypes = [gnutls_session_t]
--gnutls_session_get_master_secret.restype = c_void_p
--
- gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr
- gnutls_session_get_ptr.argtypes = [gnutls_session_t]
- gnutls_session_get_ptr.restype = c_void_p
- 
--gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random
--gnutls_session_get_server_random.argtypes = [gnutls_session_t]
--gnutls_session_get_server_random.restype = c_void_p
--
- gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed
- gnutls_session_is_resumed.argtypes = [gnutls_session_t]
- gnutls_session_is_resumed.restype = c_int
-@@ -905,10 +789,6 @@
- gnutls_set_default_priority.argtypes = [gnutls_session_t]
- gnutls_set_default_priority.restype = c_int
- 
--gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name
--gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t]
--gnutls_sign_algorithm_get_name.restype = c_char_p
--
- gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get
- gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)]
- gnutls_sign_callback_get.restype = gnutls_sign_func
-@@ -937,14 +817,6 @@
- gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int]
- gnutls_transport_set_errno.restype = None
- 
--gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno
--gnutls_transport_set_global_errno.argtypes = [c_int]
--gnutls_transport_set_global_errno.restype = None
--
--gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat
--gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int]
--gnutls_transport_set_lowat.restype = None
--
- gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr
- gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t]
- gnutls_transport_set_ptr.restype = None
-@@ -1501,10 +1373,6 @@
- gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
- gnutls_x509_privkey_sign_hash.restype = c_int
- 
--gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data
--gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
--gnutls_x509_privkey_verify_data.restype = c_int
--
- gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get
- gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
- gnutls_x509_rdn_get.restype = c_int
-diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py
---- gnutls/library/__init__.py	2011-11-11 17:23:49.000000000 +0000
-+++ gnutls.fixed/library/__init__.py	2012-08-01 11:57:42.284290997 +0100
-@@ -53,6 +53,9 @@
-     else:
-         raise RuntimeError('cannot find lib%s on this system' % name)
- 
-+def do_nothing(*args, **kwargs):
-+    pass
-+
- 
- def initialize_gcrypt():
-     from ctypes import c_void_p
-@@ -104,7 +107,7 @@
-         libgcrypt = load_library(name='gcrypt', version=11)
-         gcry_control = libgcrypt.gcry_control
-     else:
--        gcry_control = libgnutls.gcry_control
-+        gcry_control = do_nothing
- 
-     gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
-     if system == 'cygwin':
-@@ -117,12 +120,10 @@
- 
- 
- 
--libgnutls = load_library(name='gnutls', version=26)
--libgnutls_extra = load_library(name='gnutls-extra', version=26)
-+libgnutls = load_library(name='gnutls', version=28)
- 
- initialize_gcrypt()
- libgnutls.gnutls_global_init()
--libgnutls_extra.gnutls_global_init_extra()
- 
- 
- from gnutls.library import constants
-@@ -136,9 +137,6 @@
- if functions.gnutls_check_version(__need_version__) is None:
-     version = functions.gnutls_check_version(None)
-     raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__))
--if functions.gnutls_extra_check_version(__need_version__) is None:
--    version = functions.gnutls_extra_check_version(None)
--    raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
- 
- 
- del get_system_name, library_locations, load_library, initialize_gcrypt
diff --git a/community-testing/python2-imaging/PKGBUILD b/community-testing/python2-imaging/PKGBUILD
deleted file mode 100644
index 397dfceba..000000000
--- a/community-testing/python2-imaging/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 78139 2012-10-16 12:09:48Z allan $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=python2-imaging
-pkgver=1.1.7
-pkgrel=5
-pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64')
-url="http://www.pythonware.com/products/pil/index.htm"
-license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2' 'lcms') 
-makedepends=('tk' 'sane')
-optdepends=('tk: for the ImageTK module'
-            'sane: for the ImageSane module')
-provides=("pil=${pkgver}" "python-imaging=${pkgver}")
-conflicts=('pil' 'python-imaging')
-replaces=('pil' 'python-imaging')
-source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
-
-build() {
-  cd "${srcdir}/Imaging-${pkgver}"
-  python2 setup.py build_ext
-  cd Sane
-  python2 setup.py build_ext
-}
-
-package() {
-  cd "${srcdir}/Imaging-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  
-  pushd Sane
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  popd
-  
-  install -dm755 "${pkgdir}/usr/include/python2.7/"
-  install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h 
-
-  # do not have files ending in .py in /usr/bin
-  for f in pildriver pilprint pilconvert pilfile pilfont; do
-    mv "${pkgdir}"/usr/bin/${f}{.py,}
-  done
-
-  # Install license
-  install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \
-                 "${pkgdir}/usr/share/licenses/${pkgname}/README"
-}
diff --git a/community-testing/python2-lcms/PKGBUILD b/community-testing/python2-lcms/PKGBUILD
deleted file mode 100644
index 3b75364ab..000000000
--- a/community-testing/python2-lcms/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 66130 2012-02-23 01:39:55Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Connor Behan <connor.behan@gmail.com>
-
-pkgname=python2-lcms
-pkgver=1.19
-_mver=1.19
-pkgrel=4
-pkgdesc="LittleCMS Python bindings"
-arch=(i686 x86_64)
-license=('CUSTOM')
-depends=('libtiff' 'python2' 'lcms')
-url="http://www.littlecms.com"
-options=('!libtool')
-source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz)
-md5sums=('8af94611baf20d9646c7c2c285859818')
-
-build() {
-  cd $srcdir/lcms-${_mver}
-  ./configure --prefix=/usr --with-python
-  make
-}
-
-package() {
-  cd $srcdir/lcms-${_mver}
-  make DESTDIR=$pkgdir install
-  install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-  rm -rf $pkgdir/usr/bin \
-	 $pkgdir/usr/include \
-	 $pkgdir/usr/lib/pkgconfig \
-	 $pkgdir/usr/lib/liblcms.* \
-	 $pkgdir/usr/share/man/man1/icc2ps.1 \
-	 $pkgdir/usr/share/man/man1/icclink.1 \
-	 $pkgdir/usr/share/man/man1/jpegicc.1 \
-	 $pkgdir/usr/share/man/man1/tifficc.1 \
-	 $pkgdir/usr/share/man/man1/wtpt.1
-}
diff --git a/community-testing/python2-m2crypto/PKGBUILD b/community-testing/python2-m2crypto/PKGBUILD
deleted file mode 100644
index a68c5a35d..000000000
--- a/community-testing/python2-m2crypto/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python2-m2crypto
-pkgver=0.21.1
-pkgrel=2
-pkgdesc="A crypto and SSL toolkit for Python"
-arch=('i686' 'x86_64')
-url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-license=('BSD')
-depends=('python2' 'openssl')
-makedepends=('swig')
-source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz")
-md5sums=('f93d8462ff7646397a9f77a2fe602d17')
-
-build() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  python2 setup.py install --root="${pkgdir}/" --optimize=1
-  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-testing/python2-m2crypto/openssl1.patch b/community-testing/python2-m2crypto/openssl1.patch
deleted file mode 100644
index 59dba554d..000000000
--- a/community-testing/python2-m2crypto/openssl1.patch
+++ /dev/null
@@ -1,531 +0,0 @@
-Index: tests/test_ssl.py
-===================================================================
---- tests/test_ssl.py	(revision 698)
-+++ tests/test_ssl.py	(working copy)
-@@ -405,8 +405,11 @@
-         try:
-             ctx = SSL.Context('sslv23', weak_crypto=1)
-             s = SSL.Connection(ctx)
--            s.connect(self.srv_addr)
--            self.failUnlessEqual(s.get_version(), 'SSLv2')
-+            if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL
-+                s.connect(self.srv_addr)
-+                self.failUnlessEqual(s.get_version(), 'SSLv2')
-+            else:
-+                self.assertRaises(SSL.SSLError, s.connect, self.srv_addr)
-             s.close()
-         finally:
-             self.stop_server(pid)
-Index: tests/test_x509.py
-===================================================================
---- tests/test_x509.py	(revision 698)
-+++ tests/test_x509.py	(working copy)
-@@ -142,7 +142,7 @@
-         cn.set_data("Hello There!")
-         assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text()
- 
--        assert n.as_hash() == 1697185131
-+        self.assertEquals(n.as_hash(), 1697185131)
-         
-         self.assertRaises(IndexError, lambda: n[100])
-         self.assert_(n[10])
-Index: tests/test_smime.py
-===================================================================
---- tests/test_smime.py	(revision 698)
-+++ tests/test_smime.py	(working copy)
-@@ -6,7 +6,7 @@
- """
- 
- import unittest
--from M2Crypto import SMIME, BIO, Rand, X509, EVP
-+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err
- 
- class SMIMETestCase(unittest.TestCase):
-     cleartext = 'some text to manipulate'
-@@ -213,7 +213,7 @@
- 
-         self.filenameSmime = 'tests/sig.p7s'
-         f = BIO.openfile(self.filenameSmime, 'wb')
--        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1
-+        assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error()
-         f.close()
-         
-     def test_write_pkcs7_der(self):
-Index: SWIG/_evp.i
-===================================================================
---- SWIG/_evp.i	(revision 695)
-+++ SWIG/_evp.i	(working copy)
-@@ -180,7 +180,7 @@
- 
-     PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter,
-                            keylen, key);
--    ret = PyString_FromStringAndSize(key, keylen);
-+    ret = PyString_FromStringAndSize((char*)key, keylen);
-     OPENSSL_cleanse(key, keylen);
-     return ret;
- }
-@@ -339,7 +339,7 @@
-     klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, 
-         (unsigned char *)dbuf, dlen, iter, 
-         key, NULL); /* Since we are not returning IV no need to derive it */
--    ret = PyString_FromStringAndSize(key, klen);
-+    ret = PyString_FromStringAndSize((char*)key, klen);
-     return ret;
- }
- 
-@@ -435,7 +435,7 @@
-         PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error()));
-         return NULL;
-     }
--    ret = PyString_FromStringAndSize(sigbuf, siglen);
-+    ret = PyString_FromStringAndSize((char*)sigbuf, siglen);
-     OPENSSL_cleanse(sigbuf, siglen);
-     OPENSSL_free(sigbuf);
-     return ret;
-@@ -513,7 +513,7 @@
-         PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed");
-         return NULL; 
-     }
--    der = PyString_FromStringAndSize(pp, len);
-+    der = PyString_FromStringAndSize((char*)pp, len);
-     OPENSSL_free(pp);
-     return der;
- }
-Index: SWIG/_ssl.i
-===================================================================
---- SWIG/_ssl.i	(revision 695)
-+++ SWIG/_ssl.i	(working copy)
-@@ -17,13 +17,17 @@
- %apply Pointer NONNULL { SSL_CTX * };
- %apply Pointer NONNULL { SSL * };
- %apply Pointer NONNULL { SSL_CIPHER * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { BIO * };
- %apply Pointer NONNULL { DH * };
- %apply Pointer NONNULL { RSA * };
- %apply Pointer NONNULL { EVP_PKEY *};
- %apply Pointer NONNULL { PyObject *pyfunc };
- 
-+%rename(ssl_get_ciphers) SSL_get_ciphers;
-+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl);
-+
- %rename(ssl_get_version) SSL_get_version;
- extern const char *SSL_get_version(CONST SSL *);
- %rename(ssl_get_error) SSL_get_error;
-@@ -668,29 +672,25 @@
-     return SSL_CIPHER_get_bits(c, NULL);
- }
- 
--STACK *ssl_get_ciphers(SSL *ssl) {
--    return (STACK *)SSL_get_ciphers(ssl);
-+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) {
-+    return sk_SSL_CIPHER_num(stack);
- }
- 
--int sk_ssl_cipher_num(STACK *stack) {
--    return sk_num(stack);
-+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) {
-+    return sk_SSL_CIPHER_value(stack, idx);
- }
- 
--SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) {
--    return (SSL_CIPHER *)sk_value(stack, idx);
-+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) {
-+    return SSL_get_peer_cert_chain(ssl);
- }
- 
--STACK *ssl_get_peer_cert_chain(SSL *ssl) {
--    return (STACK *)SSL_get_peer_cert_chain(ssl);
-+int sk_x509_num(STACK_OF(X509) *stack) {
-+    return sk_X509_num(stack);
- }
- 
--int sk_x509_num(STACK *stack) {
--    return sk_num(stack);
-+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) {
-+    return sk_X509_value(stack, idx);
- }
--
--X509 *sk_x509_value(STACK *stack, int idx) {
--    return (X509 *)sk_value(stack, idx);
--}
- %}
- 
- %threadallow i2d_ssl_session;
-Index: SWIG/_x509.i
-===================================================================
---- SWIG/_x509.i	(revision 695)
-+++ SWIG/_x509.i	(working copy)
-@@ -148,8 +148,15 @@
- extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long);
- %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp;
- extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long);
-+
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+%rename(x509_name_hash) X509_NAME_hash_old;
-+extern unsigned long X509_NAME_hash_old(X509_NAME *);
-+#else
- %rename(x509_name_hash) X509_NAME_hash;
- extern unsigned long X509_NAME_hash(X509_NAME *);
-+#endif
-+
- %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID;
- extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int);
- 
-@@ -171,7 +178,7 @@
-     if (PyString_Check($input)) {
-         Py_ssize_t len;
- 
--        $1 = PyString_AsString($input); 
-+        $1 = (unsigned char *)PyString_AsString($input); 
-         len = PyString_Size($input);
-         if (len > INT_MAX) {
-             PyErr_SetString(PyExc_ValueError, "object too large");
-@@ -184,7 +191,7 @@
-     }
- }
- %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data;
--extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int);
-+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int);
- %typemap(in) (CONST unsigned char *, int);
- 
- %rename(x509_req_new) X509_REQ_new;
-@@ -230,7 +237,7 @@
- %rename(x509_store_ctx_free) X509_STORE_CTX_free;
- extern void X509_STORE_CTX_free(X509_STORE_CTX *);
- %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain;
--extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
-+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *);
- 
- %rename(x509_extension_get_critical) X509_EXTENSION_get_critical;
- extern int X509_EXTENSION_get_critical(X509_EXTENSION *);
-@@ -348,7 +355,7 @@
-         PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-     }
-     else {     
--        ret = PyString_FromStringAndSize(buf, len);
-+        ret = PyString_FromStringAndSize((char*)buf, len);
-         OPENSSL_free(buf);
-     }
-     return ret;
-@@ -435,12 +442,12 @@
- }
- 
- int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) {
--    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0);
-+    return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0);
- }
- 
- /* x509_name_add_entry_by_txt */
- int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) {
--    return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set);
-+    return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set);
- }
- 
- PyObject *x509_name_get_der(X509_NAME *name)
-@@ -450,23 +457,23 @@
- }
- 
- /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */
--STACK *sk_x509_new_null(void) {
--    return (STACK *)sk_X509_new_null();
-+STACK_OF(X509) *sk_x509_new_null(void) {
-+    return sk_X509_new_null();
- }
- 
- /* sk_X509_free() is a macro. */
--void sk_x509_free(STACK *stack) {
--    sk_X509_free((STACK_OF(X509) *)stack);
-+void sk_x509_free(STACK_OF(X509) *stack) {
-+    sk_X509_free(stack);
- }
- 
- /* sk_X509_push() is a macro. */
--int sk_x509_push(STACK *stack, X509 *x509) {
--    return sk_X509_push((STACK_OF(X509) *)stack, x509);
-+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) {
-+    return sk_X509_push(stack, x509);
- }
- 
- /* sk_X509_pop() is a macro. */
--X509 *sk_x509_pop(STACK *stack) {
--    return sk_X509_pop((STACK_OF(X509) *)stack);
-+X509 *sk_x509_pop(STACK_OF(X509) *stack) {
-+    return sk_X509_pop(stack);
- }
- 
- int x509_store_load_locations(X509_STORE *store, const char *file) {
-@@ -493,21 +500,29 @@
-     return X509_REQ_set_version(x, version);
- }
- 
--int x509_req_add_extensions(X509_REQ *req, STACK *exts) {
--    return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts);
-+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) {
-+    return X509_REQ_add_extensions(req, exts);
- }
- 
--X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
--    return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len);
-+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) {
-+    return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len);
- }
- 
--LHASH * 
--x509v3_lhash(){ 
--       return lh_new(NULL,NULL);
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+LHASH_OF(CONF_VALUE) 
-+#else
-+LHASH
-+#endif
-+*x509v3_lhash() { 
-+    return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */
- }
- 
- X509V3_CTX *
--x509v3_set_conf_lhash(LHASH * lhash){
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) {
-+#else
-+x509v3_set_conf_lhash(LHASH                * lhash) {
-+#endif
-       X509V3_CTX * ctx;
-       if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) {
-           PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash");
-@@ -517,11 +532,20 @@
-       return ctx;
- }
- 
--X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) {
-+X509_EXTENSION *
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#else
-+x509v3_ext_conf(LHASH                *conf, X509V3_CTX *ctx, char *name, char *value) {
-+#endif
-       X509_EXTENSION * ext = NULL;
-       ext = X509V3_EXT_conf(conf, ctx, name, value); 
-       PyMem_Free(ctx); 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      lh_CONF_VALUE_free(conf);
-+#else
-       lh_free(conf);
-+#endif
-       return ext;
- }
- 
-@@ -543,33 +567,33 @@
- }
- 
- /* sk_X509_EXTENSION_new_null is a macro. */
--STACK *sk_x509_extension_new_null(void) {
--    return (STACK *)sk_X509_EXTENSION_new_null();
-+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) {
-+    return sk_X509_EXTENSION_new_null();
- }
- 
- /* sk_X509_EXTENSION_free() is a macro. */
--void sk_x509_extension_free(STACK *stack) {
--    sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack);
-+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) {
-+    sk_X509_EXTENSION_free(stack);
- }
- 
- /* sk_X509_EXTENSION_push() is a macro. */
--int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) {
--    return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext);
-+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) {
-+    return sk_X509_EXTENSION_push(stack, x509_ext);
- }
- 
- /* sk_X509_EXTENSION_pop() is a macro. */
--X509_EXTENSION *sk_x509_extension_pop(STACK *stack) {
--    return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack);
-+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) {
-+    return sk_X509_EXTENSION_pop(stack);
- }
- 
- /* sk_X509_EXTENSION_num() is a macro. */
--int sk_x509_extension_num(STACK *stack) {
--    return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack);
-+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) {
-+    return sk_X509_EXTENSION_num(stack);
- }
- 
- /* sk_X509_EXTENSION_value() is a macro. */
--X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) {
--    return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i);
-+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) {
-+    return sk_X509_EXTENSION_value(stack, i);
- }
- 
- /* X509_STORE_CTX_get_app_data is a macro. */
-@@ -590,7 +614,7 @@
- #define I2DTYPE int (*)()
- #endif   
- 
--STACK *
-+STACK_OF(X509) *
- make_stack_from_der_sequence(PyObject * pyEncodedString){
-     STACK_OF(X509) *certs;
-     Py_ssize_t encoded_string_len;
-@@ -606,7 +630,7 @@
-         return NULL;
-     }
- 
--    certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); 
-+    certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); 
-     if (!certs) {
-        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-        return NULL;
-@@ -616,13 +640,13 @@
- }
- 
- PyObject *
--get_der_encoding_stack(STACK * stack){
-+get_der_encoding_stack(STACK_OF(X509) *stack){
-     PyObject * encodedString;
-     
-     unsigned char * encoding;
-     int len; 
-     
--    encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); 
-+    encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); 
-     if (!encoding) {
-        PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error()));
-        return NULL;
-Index: SWIG/_aes.i
-===================================================================
---- SWIG/_aes.i	(revision 695)
-+++ SWIG/_aes.i	(working copy)
-@@ -76,7 +76,7 @@
-         AES_encrypt((const unsigned char *)in, out, key);
-     else
-         AES_decrypt((const unsigned char *)in, out, key);
--    return PyString_FromStringAndSize(out, outlen);
-+    return PyString_FromStringAndSize((char*)out, outlen);
- }
- 
- int AES_type_check(AES_KEY *key) {
-Index: SWIG/_util.i
-===================================================================
---- SWIG/_util.i	(revision 695)
-+++ SWIG/_util.i	(working copy)
-@@ -48,7 +48,7 @@
-         PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error()));
-         return NULL;
-     }
--    obj = PyString_FromStringAndSize(ret, len);
-+    obj = PyString_FromStringAndSize((char*)ret, len);
-     OPENSSL_free(ret);
-     return obj;
- }
-Index: SWIG/_m2crypto.i
-===================================================================
---- SWIG/_m2crypto.i	(revision 695)
-+++ SWIG/_m2crypto.i	(working copy)
-@@ -38,6 +38,19 @@
- #define CONST098
- #endif
- 
-+/* Bring in STACK_OF macro definition */
-+%include <openssl/safestack.h>
-+
-+/* Bring in LHASH_OF macro definition */
-+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes
-+   XXX stdio.h etc. which we fail to include. So we have to (re)define
-+   XXX LHASH_OF here instead.
-+%include <openssl/lhash.h>
-+*/
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define LHASH_OF(type) struct lhash_st_##type
-+#endif
-+
- %include constraints.i
- %include _threads.i
- %include _lib.i
-Index: SWIG/_rand.i
-===================================================================
---- SWIG/_rand.i	(revision 695)
-+++ SWIG/_rand.i	(working copy)
-@@ -87,7 +87,7 @@
-         Py_INCREF(Py_None);
-         return Py_None;
-     } else {
--        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n));
-+        PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n));
-         PyMem_Free(blob);
-         PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret));
-         return tuple;
-Index: SWIG/_pkcs7.i
-===================================================================
---- SWIG/_pkcs7.i	(revision 695)
-+++ SWIG/_pkcs7.i	(working copy)
-@@ -12,7 +12,7 @@
- %apply Pointer NONNULL { EVP_CIPHER * };
- %apply Pointer NONNULL { EVP_PKEY * };
- %apply Pointer NONNULL { PKCS7 * };
--%apply Pointer NONNULL { STACK * };
-+%apply Pointer NONNULL { STACK_OF(X509) * };
- %apply Pointer NONNULL { X509 * };
- 
- %rename(pkcs7_new) PKCS7_new;
-@@ -54,8 +54,8 @@
- 
- %threadallow pkcs7_encrypt;
- %inline %{
--PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
--    return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags);
-+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) {
-+    return PKCS7_encrypt(stack, bio, cipher, flags);
- }
- 
- PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) {
-@@ -96,14 +96,14 @@
- 
- %threadallow pkcs7_sign1;
- %inline %{
--PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) {
--    return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags);
-+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) {
-+    return PKCS7_sign(x509, pkey, stack, bio, flags);
- }
- %}
- 
- %threadallow pkcs7_verify1;
- %inline %{
--PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) {
-+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) {
-     int outlen;
-     char *outbuf;
-     BIO *bio;
-@@ -113,7 +113,7 @@
-         PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1");
-         return NULL;
-     }
--    if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) {
-+    if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) {
-         PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error()));
-         BIO_free(bio);
-         return NULL;
-@@ -131,7 +131,7 @@
-     return ret;
- }
- 
--PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) {
-+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) {
-     return pkcs7_verify1(pkcs7, stack, store, NULL, flags);
- }
- %}
-@@ -229,7 +229,7 @@
- }
- 
- /* return STACK_OF(X509)* */     
--STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) {     
-+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) {     
-     return PKCS7_get0_signers(p7, certs, flags);      
- }
- 
diff --git a/community-testing/python2-matplotlib/PKGBUILD b/community-testing/python2-matplotlib/PKGBUILD
deleted file mode 100644
index 2f96cd33e..000000000
--- a/community-testing/python2-matplotlib/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 73023 2012-06-28 11:16:15Z 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=4
-pkgdesc="A python plotting library, making publication quality plots"
-arch=('i686' 'x86_64')
-url="http://matplotlib.sourceforge.net/"
-license=('custom')
-backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc)
-depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt')
-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'
-          'f074495fc965298e0372751b34c8edb319437c5f')
-
-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
-
-   # remove internal copy of dateutil
-   rm -r lib/dateutil
-
-   # python2 fix
-   for file in $(find . -name '*.py' -print); do
-      sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \
-             -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file}
-   done
-
-   python2 setup.py build
-}
-
-package() {
-   cd "${srcdir}/matplotlib-${pkgver}"
-   python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr
-    
-   install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}"
-   install -m 644 doc/users/license.rst "${pkgdir}/usr/share/licenses/${pkgname}"
-}
diff --git a/community-testing/python2-matplotlib/setup.cfg b/community-testing/python2-matplotlib/setup.cfg
deleted file mode 100644
index 778b04ccc..000000000
--- a/community-testing/python2-matplotlib/setup.cfg
+++ /dev/null
@@ -1,83 +0,0 @@
-# Rename this file to setup.cfg to modify matplotlib's
-# build options.
-
-[egg_info]
-tag_svn_revision = 1
-
-[directories]
-# Uncomment to override the default basedir in setupext.py.
-# This can be a single directory or a space-delimited list of directories.
-#basedirlist = /usr
-
-[status]
-# To suppress display of the dependencies and their versions
-# at the top of the build log, uncomment the following line:
-#suppress = True
-#
-# Uncomment to insert lots of diagnostic prints in extension code
-#verbose = True
-
-[provide_packages]
-# By default, matplotlib checks for a few dependencies and
-# installs them if missing. This feature can be turned off
-# by uncommenting the following lines. Acceptible values are:
-#     True: install, overwrite an existing installation
-#     False: do not install
-#     auto: install only if the package is unavailable. This
-#           is the default behavior
-#
-## Date/timezone support:
-#pytz = False
-dateutil = False
-
-[gui_support]
-# Matplotlib supports multiple GUI toolkits, including Cocoa,
-# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of
-# these toolkits requires AGG, the Anti-Grain Geometry library,
-# which is provided by matplotlib and built by default.
-#
-# Some backends are written in pure Python, and others require
-# extension code to be compiled. By default, matplotlib checks
-# for these GUI toolkits during installation and, if present,
-# compiles the required extensions to support the toolkit. GTK
-# support requires the GTK runtime environment and PyGTK. Wx
-# support requires wxWidgets and wxPython. Tk support requires
-# Tk and Tkinter. The other GUI toolkits do not require any
-# extension code, and can be used as long as the libraries are
-# installed on your system.
-#
-# You can uncomment any the following lines if you know you do
-# not want to use the GUI toolkit. Acceptible values are:
-#     True: build the extension. Exits with a warning if the
-#           required dependencies are not available
-#     False: do not build the extension
-#     auto: build if the required dependencies are available,
-#           otherwise skip silently. This is the default
-#           behavior
-#
-gtk = True
-gtkagg = True
-tkagg = True
-wxagg = True
-macosx = False
-
-[rc_options]
-# User-configurable options
-#
-# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo,
-# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg.
-#
-# The Agg, Ps, Pdf and SVG backends do not require external
-# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg
-# if you have disabled the relevent extension modules.  Agg will be used
-# by default.
-#
-backend = Qt4Agg
-#
-# The numerix module was historically used to provide
-# compatibility between the Numeric, numarray, and NumPy array
-# packages. Now that NumPy has emerge as the universal array
-# package for python, numerix is not really necessary and is
-# maintained to provide backward compatibility. Do not change
-# this unless you have a compelling reason to do so.
-numerix = numpy
diff --git a/community-testing/python2-pybluez/PKGBUILD b/community-testing/python2-pybluez/PKGBUILD
deleted file mode 100644
index 6007614a6..000000000
--- a/community-testing/python2-pybluez/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: cs-cam - me.at.camdaniel.com
-
-pkgname=python2-pybluez
-pkgver=0.18
-pkgrel=4
-pkgdesc="Python wrapper for the BlueZ Bluetooth stack"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pybluez/"
-license=('GPL')
-provides=('pybluez')
-conflicts=('pybluez')
-replaces=('pybluez')
-depends=('python2' 'bluez')
-source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz)
-md5sums=('be8c8ce615c3189fda1aaf3d568314b2')
-
-build() {
-  cd $srcdir/PyBluez-$pkgver
-  python2 setup.py install --root=$pkgdir
-  ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so
-}
diff --git a/community-testing/python2-pyopencl/LICENSE.txt b/community-testing/python2-pyopencl/LICENSE.txt
deleted file mode 100644
index 3ce400f9d..000000000
--- a/community-testing/python2-pyopencl/LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/community-testing/python2-pyopencl/PKGBUILD b/community-testing/python2-pyopencl/PKGBUILD
deleted file mode 100644
index 02a07630c..000000000
--- a/community-testing/python2-pyopencl/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 73771 2012-07-15 13:20:19Z ibiru $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=python2-pyopencl
-pkgver=2012.1
-pkgrel=2
-pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
-arch=('i686' 'x86_64')
-url="http://mathema.tician.de/software/pyopencl"
-license=('custom')
-depends=('python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'libcl' 'opencl-headers' 'mesa' 'boost')
-makedepends=('ctags' 'python2-distribute')
-source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
-        'LICENSE.txt')
-sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff'
-          '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7')
-
-build() {
-   cd "${srcdir}/pyopencl-${pkgver}"
-   python2 ./configure.py --cl-enable-gl --no-use-shipped-boost
-
-   python2 setup.py build
-}
-
-package() {
-   cd "${srcdir}/pyopencl-${pkgver}"
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-   install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community-testing/python2-pyxmpp/PKGBUILD b/community-testing/python2-pyxmpp/PKGBUILD
deleted file mode 100644
index 49096a86f..000000000
--- a/community-testing/python2-pyxmpp/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 72078 2012-06-08 09:35:02Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python2-pyxmpp
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="A Python XMPP and Jabber implementation based on libxml2"
-arch=('i686' 'x86_64')
-url="http://pyxmpp.jajcus.net/"
-license=('LGPL')
-depends=('python2-dnspython' 'libxml2' 'python2-m2crypto')
-source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz)
-md5sums=('a38abf032aca0408b6055cd94296eb75')
-
-build() {
-  cd $srcdir/pyxmpp-$pkgver
-  python2 setup.py build
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community-testing/python2-simplejson/PKGBUILD b/community-testing/python2-simplejson/PKGBUILD
deleted file mode 100644
index 1ec0a97b5..000000000
--- a/community-testing/python2-simplejson/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 74926 2012-08-09 22:02:03Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: David Moore <davidm@sjsoft.com>
-
-pkgname=python2-simplejson
-pkgver=2.6.1
-pkgrel=3
-pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
-license=('MIT')
-arch=('i686' 'x86_64')
-url="http://undefined.org/python/#simplejson"
-depends=('python2')
-makedepends=('python2-distribute')
-provides=("python-simplejson=$pkgver")
-conflicts=('python-simplejson')
-replaces=('python-simplejson')
-changelog=$pkgname.changelog
-source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver})
-sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31')
-
-build() {
-  cd ${srcdir}/simplejson-simplejson-*
-
-  python2 setup.py install --root=${pkgdir}
-
-# License
-  install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \
-    ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/community-testing/python2-simplejson/python2-simplejson.changelog b/community-testing/python2-simplejson/python2-simplejson.changelog
deleted file mode 100644
index c1e227d24..000000000
--- a/community-testing/python2-simplejson/python2-simplejson.changelog
+++ /dev/null
@@ -1,20 +0,0 @@
-2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.6.1-1
-
-2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.5.2-1
-
-2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.3.3-1
-
-2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.2.1-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* python-simplejson 2.1.3-1
-
-2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.1.1
-
-2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release 2.1.0
diff --git a/community-testing/python2-vorbissimple/PKGBUILD b/community-testing/python2-vorbissimple/PKGBUILD
deleted file mode 100644
index ba0a8be63..000000000
--- a/community-testing/python2-vorbissimple/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# $Id: PKGBUILD 66136 2012-02-23 01:43:46Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=python2-vorbissimple
-pkgver=0.0.2
-pkgrel=6
-pkgdesc="Python bindings for vorbissimple"
-arch=('i686' 'x86_64')
-url="http://kamaelia.sourceforge.net"
-license=('MPL')
-depends=('python2' 'vorbissimple')
-makedepends=('pyrex')
-source=(http://downloads.sourceforge.net/kamaelia/vorbissimple-$pkgver.tar.gz)
-md5sums=('332077b25a4c9547947ab0922361ffda')
-
-build() {
-  cd $srcdir/vorbissimple-$pkgver/python
-  sed -i 's#__new__#__cinit__#' vorbissimple.pyx
-  python2 setup.py install --root=$pkgdir
-}
diff --git a/community-testing/qcad/PKGBUILD b/community-testing/qcad/PKGBUILD
deleted file mode 100644
index 7cecac054..000000000
--- a/community-testing/qcad/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 77433 2012-10-10 12:17:59Z 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=11
-pkgdesc="A 2D CAD package based upon Qt"
-arch=('i686' 'x86_64')
-url="http://www.ribbonsoft.com/qcad.html"
-license=('GPL2')
-depends=('qt3')
-makedepends=('glu')
-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
-
-  [ "$CARCH" = "x86_64" ] && {
-    patch -p1 < ../qcad-intptr.patch;
-    sed -i '1,1i#include <stdint.h>' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp;
-  }
-  patch -p1 < ../qcad.patch
-  sed -i "s:"-pedantic"::g" mkspecs/defs.pro
-
-  cd scripts
-  ./build_qcad.sh notrans
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad
-
-  install -D -m755 qcad ${pkgdir}/usr/bin/qcad
-  install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications}
-  install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm
-  install -m644 ../../QCad.desktop \
-    ${pkgdir}/usr/share/applications/QCad.desktop
-  cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad
-  #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/
-}
diff --git a/community-testing/qcad/QCad.desktop b/community-testing/qcad/QCad.desktop
deleted file mode 100644
index a55f5940f..000000000
--- a/community-testing/qcad/QCad.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/qcad
-Icon=/usr/share/pixmaps/qcad.xpm
-Name=QCad
-StartupNotify=true
-Terminal=false
-Type=Application
-Categories=Application;Office;
diff --git a/community-testing/qcad/qcad-intptr.patch b/community-testing/qcad/qcad-intptr.patch
deleted file mode 100644
index 6d8b6acca..000000000
--- a/community-testing/qcad/qcad-intptr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp	2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp	2006-06-23 14:21:40.000000000 -0500
-@@ -849,7 +849,7 @@
-         os << " layer: NULL ";
-     } else {
-         os << " layer: " << e.layer->getName().latin1() << " ";
--        os << " layer address: " << (int)(e.layer) << " ";
-+        os << " layer address: " << (intptr_t)(e.layer) << " ";
-     }
- 
-     os << e.pen << "\n";
-diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp
---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp	2004-09-14 15:13:02.000000000 -0500
-+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp	2006-06-23 14:21:23.000000000 -0500
-@@ -57,7 +57,7 @@
-     os << " name: " << l.getName().latin1()
-     << " pen: " << l.getPen()
- 	<< " frozen: " << (int)l.isFrozen()
--	<< " address: " << (int)(&l)
-+	<< " address: " << (intptr_t)(&l)
-     << std::endl;
-     return os;
- }
diff --git a/community-testing/qcad/qcad.patch b/community-testing/qcad/qcad.patch
deleted file mode 100644
index f051f29af..000000000
--- a/community-testing/qcad/qcad.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h
---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h	2008-12-11 22:29:51.000000000 +0100
-@@ -37,6 +37,7 @@
- #endif
- 
- #include <iostream>
-+#include <cstring>
- 
- #include "dl_attributes.h"
- #include "dl_codes.h"
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp	2008-12-11 22:29:51.000000000 +0100
-@@ -23,7 +23,7 @@
- ** not clear to you.
- **
- **********************************************************************/
--
-+#include <cstdlib>
- #include "rs_actionzoompan.h"
- #include "rs_snapper.h"
- #include "rs_point.h"
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej.
-Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej.
-diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp
---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp	2008-12-11 22:30:18.000000000 +0100
-@@ -25,7 +25,7 @@
- **********************************************************************/
- 
- #include "rs_information.h"
--
-+#include <cstdlib>
- #include "rs_constructionline.h"
- 
- 
-diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh
---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh	2008-12-11 22:28:20.000000000 +0100
-+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh	2008-12-11 22:31:37.000000000 +0100
-@@ -16,9 +16,6 @@
- echo "  distcc      use distcc for distributed compilation. DISTCC_HOSTS must be set."
- echo
- 
--echo "QTDIR is: $QTDIR"
--echo "QMAKESPEC is: $QMAKESPEC"
--
- # detect system:
- if [ "x$OS" == "xWindows_NT" ]
- then
diff --git a/community-testing/qcad/qcad.xpm b/community-testing/qcad/qcad.xpm
deleted file mode 100644
index e747fa984..000000000
--- a/community-testing/qcad/qcad.xpm
+++ /dev/null
@@ -1,132 +0,0 @@
-/* XPM */
-static const char * qcad_xpm[] = {
-"32 32 97 2",
-"  	c None",
-". 	c #3F3F3F",
-"+ 	c #010180",
-"@ 	c #FFFFFF",
-"# 	c #E0E0EF",
-"$ 	c #41419F",
-"% 	c #4545A1",
-"& 	c #4949A3",
-"* 	c #4D4DA5",
-"= 	c #5151A7",
-"- 	c #5555A9",
-"; 	c #5959AB",
-"> 	c #4444A2",
-", 	c #3C3C9D",
-"' 	c #40409F",
-") 	c #4444A1",
-"! 	c #4848A3",
-"~ 	c #4C4CA5",
-"{ 	c #5050A7",
-"] 	c #5454A9",
-"^ 	c #5858AB",
-"/ 	c #5D5DAD",
-"( 	c #6161AF",
-"_ 	c #6565B1",
-": 	c #5C5CAD",
-"< 	c #6060AF",
-"[ 	c #6464B1",
-"} 	c #6868B3",
-"| 	c #6C6CB5",
-"1 	c #7070B7",
-"2 	c #7474B9",
-"3 	c #7878BB",
-"4 	c #3F3F9E",
-"5 	c #4343A0",
-"6 	c #4747A3",
-"7 	c #4B4BA5",
-"8 	c #000000",
-"9 	c #7C7CBD",
-"0 	c #8080BF",
-"a 	c #4747A2",
-"b 	c #4B4BA4",
-"c 	c #4F4FA6",
-"d 	c #7B7BBD",
-"e 	c #7F7FBF",
-"f 	c #8383C1",
-"g 	c #5353A8",
-"h 	c #8787C3",
-"i 	c #5757AA",
-"j 	c #8B8BC5",
-"k 	c #4E4EA6",
-"l 	c #5252A8",
-"m 	c #5656AA",
-"n 	c #5A5AAC",
-"o 	c #8787C2",
-"p 	c #8F8FC7",
-"q 	c #5E5EAE",
-"r 	c #8B8BC4",
-"s 	c #8F8FC6",
-"t 	c #9393C8",
-"u 	c #6262B0",
-"v 	c #8E8EC6",
-"w 	c #9292C8",
-"x 	c #9696CA",
-"y 	c #6666B2",
-"z 	c #9A9ACC",
-"A 	c #6A6AB4",
-"B 	c #9E9ECE",
-"C 	c #6565B2",
-"D 	c #6969B4",
-"E 	c #6D6DB6",
-"F 	c #7171B8",
-"G 	c #7575BA",
-"H 	c #9D9DCE",
-"I 	c #A1A1D0",
-"J 	c #7171B7",
-"K 	c #7575B9",
-"L 	c #7979BC",
-"M 	c #7D7DBE",
-"N 	c #8181C0",
-"O 	c #8585C2",
-"P 	c #8989C4",
-"Q 	c #8D8DC6",
-"R 	c #9191C8",
-"S 	c #9595CA",
-"T 	c #9999CC",
-"U 	c #A5A5D2",
-"V 	c #7979BB",
-"W 	c #7D7DBD",
-"X 	c #8181BF",
-"Y 	c #8585C1",
-"Z 	c #8989C3",
-"` 	c #A9A9D4",
-" .	c #8D8DC5",
-"..	c #9191C7",
-"+.	c #9595C9",
-"@.	c #9999CB",
-"#.	c #ADADD6",
-"                                                                ",
-"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
-"    .       .       .       .       .       .       .       .   ",
-"    .       .       .   + + + + + + +       .       .       .   ",
-"    .     @ .     @ + + # # # # # # # + + @ .     @ .     @ .   ",
-"    . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . .   ",
-"    .       .   + # , ' ) ! ~ { ] ^ / ( _ > +       .       .   ",
-"    .       . + # , ' ) ! ~ { ] ^ : < [ } | > +     .       .   ",
-"    .     @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ .     @ .   ",
-"    . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . .   ",
-"    .     + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + .       .   ",
-"    .     + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + .       .   ",
-"    .     + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + .     @ .   ",
-"    . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . .   ",
-"    .     + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + .       .   ",
-"    .     + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + .       .   ",
-"    .     + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + .     @ .   ",
-"    . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . .   ",
-"    .     + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + .       .   ",
-"    .       + > C D E . . . . . . . . . 8 z B > +   .       .   ",
-"    .     @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ .     @ .   ",
-"    . . . . . + > J K L M N O P Q R S T H I U + . . . . . . .   ",
-"    .       .   + > V W X Y Z Q R S T H I U ` > +   .       .   ",
-"    .       .     + > > Y Z  ...+.@.H > U ` #.#.> + .       .   ",
-"    .     @ .     @ + + > > > > > > > + > #.#.#.> + .     @ .   ",
-"    . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . .   ",
-"    .       .       .       .       .     + > > +   .       .   ",
-"    .       .       .       .       .       + +     .       .   ",
-"    .     @ .     @ .     @ .     @ .     @ .     @ .     @ .   ",
-"    . . . . . . . . . . . . . . . . . . . . . . . . . . . . .   ",
-"                                                                ",
-"                                                                "};
diff --git a/community-testing/qingy/PKGBUILD b/community-testing/qingy/PKGBUILD
deleted file mode 100644
index 54b88a8d9..000000000
--- a/community-testing/qingy/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 75329 2012-08-19 23:16:11Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=qingy
-pkgver=1.0.0
-pkgrel=6
-pkgdesc="A DirectFB getty replacement"
-arch=('i686' 'x86_64')
-url="http://qingy.sourceforge.net/"
-license=('GPL')
-depends=('directfb' 'openssl' 'libxss')
-makedepends=('emacs')
-backup=('etc/qingy/settings' 'etc/qingy/welcomes')
-options=('!libtool')
-install=qingy.install
-source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \
-        qingy.logrotate qingy@.service)
-sha1sums=('22ee505e935bf7ddcbd33e23f754a5a1ca082c81'
-          '21676cf0b71334c666f7b3e4f3d8b4f319266c81'
-          '55cfd0b24c1dedd8aaea42fd03f5ec39a1be5e70')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|/lib/security/||' media/pam/default/qingy
-  XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \
-    ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \
-    --disable-optimizations --enable-pam \
-    --disable-static-build --enable-gpm-lock --enable-emacs
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy"
-  install -D -m644 "${srcdir}/qingy@.service" "${pkgdir}/usr/lib/systemd/system/qingy@.service"
-}
diff --git a/community-testing/qingy/qingy.install b/community-testing/qingy/qingy.install
deleted file mode 100644
index 5cf234b72..000000000
--- a/community-testing/qingy/qingy.install
+++ /dev/null
@@ -1,18 +0,0 @@
-infodir=usr/share/info
-filelist=(qingy.info.gz)
-
-post_install() {
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
diff --git a/community-testing/qingy/qingy.logrotate b/community-testing/qingy/qingy.logrotate
deleted file mode 100644
index e16fb8d2a..000000000
--- a/community-testing/qingy/qingy.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/qingy.log {
-    compress
-    rotate 1
-    size=+1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/community-testing/qingy/qingy@.service b/community-testing/qingy/qingy@.service
deleted file mode 100644
index ce2156def..000000000
--- a/community-testing/qingy/qingy@.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=Quingy on %I
-Documentation=info:qingy
-After=systemd-user-sessions.service plymouth-quit-wait.service
-
-[Service]
-Environment=TERM=linux
-ExecStart=/sbin/qingy %I -n
-Restart=always
-RestartSec=0
-UtmpIdentifier=%I
-TTYPath=/dev/%I
-TTYReset=yes
-TTYVHangup=yes
-TTYVTDisallocate=yes
-KillMode=process
-IgnoreSIGPIPE=no
-
-[Install]
-Alias=getty.target.wants/qingy@tty1.service
diff --git a/community-testing/qlandkartegt/PKGBUILD b/community-testing/qlandkartegt/PKGBUILD
deleted file mode 100644
index dc5485029..000000000
--- a/community-testing/qlandkartegt/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 77586 2012-10-13 02:31:01Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Matthias Maennich <arch@maennich.net>
-# Contributor: <boenki@gmx.de>
-
-pkgname=qlandkartegt
-pkgver=1.5.1
-pkgrel=2
-pkgdesc="Use your GPS with Linux"
-arch=('i686' 'x86_64')
-url="http://www.qlandkarte.org/"
-license=('GPL')
-depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs'
-         'qt' 'shared-mime-info' 'qtwebkit')
-makedepends=('cmake' 'garmindev' 'mesa')
-optdepends=('garmindev: to connect garmin devices')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-        $pkgname-mimetypes.xml)
-sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd'
-            'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package(){
-  cd "${srcdir}/build"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \
-    "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml"
-}
diff --git a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml
deleted file mode 100644
index 46d3d402c..000000000
--- a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
-  <mime-type type="application/vnd.qlandkartegt.qlb">
-    <comment>QLandkarteGT File</comment>
-    <glob pattern="*.qlb"/>
-  </mime-type>
-</mime-info>
diff --git a/community-testing/qlandkartegt/qlandkartegt.changelog b/community-testing/qlandkartegt/qlandkartegt.changelog
deleted file mode 100644
index 47c05ab04..000000000
--- a/community-testing/qlandkartegt/qlandkartegt.changelog
+++ /dev/null
@@ -1,48 +0,0 @@
-2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.5.1-1
-
-2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.5.0-1
-
-2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.4.2-1
-
-2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.4.1-1
-
-2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.4.0-1
-
-2012-02-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.3.2-1
-
-2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.3.1-1
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.2.4-1
-
-2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.2.3-1
-
-2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.2.2-1
-
-2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.2.1-1
-
-2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.2.0-1
-
-2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.1.2-1
-
-2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.1.1-1
-
-2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.1.0-1
-
-2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qlandkartegt 1.0.1-2
-	* moved to [community] with 59 AUR votes
diff --git a/community-testing/qlandkartegt/qlandkartegt.install b/community-testing/qlandkartegt/qlandkartegt.install
deleted file mode 100644
index e55805570..000000000
--- a/community-testing/qlandkartegt/qlandkartegt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/qmmp/PKGBUILD b/community-testing/qmmp/PKGBUILD
deleted file mode 100644
index ab07566af..000000000
--- a/community-testing/qmmp/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-#$Id: PKGBUILD 73424 2012-07-07 13:49:25Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-
-pkgname=qmmp
-pkgver=0.6.0
-pkgrel=2
-pkgdesc="Qt4 based audio-player"
-arch=('i686' 'x86_64')
-url="http://qmmp.ylsoftware.com/"
-license=('GPL')
-depends=('alsa-lib' 'curl' 'hicolor-icon-theme' 'libmad' 'libvorbis' 'libogg'  'qt' 'taglib' 'xdg-utils')
-makedepends=('cmake'  'flac' 'jack' 'libmpcdec' 'pulseaudio' 'ffmpeg' 'libcdio' 'libcddb' 'libmms' 'libsamplerate' 'libmodplug' 'libsndfile' 'wavpack')
-optdepends=('flac: native FLAC support'
-            'jack: JACK sound output'
-            'libmpcdec: Musepack support'
-            'pulseaudio: PulseAudio output'
-            'libcdio: Compact Disc input and control support'
-            'libcddb: CDDB server support'
-            'libmms: MMS stream protocol support'
-            'libmodplug: MOD playing library'
-            'libsndfile: sampled sound support'
-            'ffmpeg' 'libsamplerate' 'wavpack')
-install=$pkgname.install
-source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/qmmp/ffmpeg-0.11.diff b/community-testing/qmmp/ffmpeg-0.11.diff
deleted file mode 100644
index f414ffbf6..000000000
--- a/community-testing/qmmp/ffmpeg-0.11.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp
-===================================================================
---- src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp	(revision 2728)
-+++ src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp	(revision 2729)
-@@ -133,9 +133,6 @@
-     m_stream->seekable = !input()->isSequential();
-     m_stream->max_packet_size = INPUT_BUFFER_SIZE;
- 
--    AVFormatParameters ap;
--    memset(&ap, 0, sizeof(ap));
--
-     if(avformat_open_input(&ic, m_path.toLocal8Bit().constData(), fmt, 0) != 0)
-     {
-         qDebug("DecoderFFmpeg: av_open_input_stream() failed");
diff --git a/community-testing/qmmp/qmmp.changelog b/community-testing/qmmp/qmmp.changelog
deleted file mode 100644
index bfd002e57..000000000
--- a/community-testing/qmmp/qmmp.changelog
+++ /dev/null
@@ -1,72 +0,0 @@
-2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.6.0-2 ffmpeg 0.11 rebuild
-
-2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.6.0-1
-
-2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.6-2 ffmpeg 0.11 rebuild
-
-2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.6-1
-
-2012-06-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.5-2 ffmpeg 0.11 rebuild
-
-2012-05-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.5-1
-
-2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.4-1
-
-2011-11-12 Andrea Scarpino <andrea@archlinux.org>
-    * qmmp 0.5.2-3
-    * rebuild with qt 4.7
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.2-1
-
-2011-07-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.1-1
-
-2011-04-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.5.0-1
-
-2011-02-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* qmmp 0.4.4-1
-
-2010-11-10 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.3
-
-2010-09-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.2
-
-2010-06-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.1
-
-2010-05-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.4.0
-
-2010-04-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.4
-
-2010-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.3
-
-2010-01-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.2
-
-2009-07-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.3.0
-
-2009-03-30 Giovanni Scafora <giovanni@archlinux.org>
-	* Fixed x86_64 build
-
-2009-03-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.4
-
-2008-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.3
-
-2008-08-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* Update to major release v0.2.2
diff --git a/community-testing/qmmp/qmmp.install b/community-testing/qmmp/qmmp.install
deleted file mode 100644
index 4c0972beb..000000000
--- a/community-testing/qmmp/qmmp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD
deleted file mode 100644
index a65aeda04..000000000
--- a/community-testing/qtcreator/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 78436 2012-10-18 11:43:26Z svenstaro $
-# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dan Vratil <progdan@progdansoft.com>
-# Contributor: thotypous <matiasΘarchlinux-br·org>
-# Contributor: delor <bartekpiech gmail com>
-
-pkgname="qtcreator"
-pkgver=2.6.0rc
-_pkgver=2.6.0-rc
-pkgrel=1
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/products/developer-tools'
-license=('LGPL')
-depends=('qt')
-makedepends=('qt-private-headers' 'git')
-options=('docs')
-optdepends=('qt-doc: for the integrated Qt documentation'
-            'gdb: for the debugger'
-            'cmake: for cmake project suppport'
-            'openssh-askpass: for ssh support'
-            'git: for git support'
-            'mercurial: for mercurial support'
-            'bzr: for bazaar support'
-            'valgrind: for analyze support')
-install=qtcreator.install
-source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
-        'qtcreator.desktop')
-md5sums=('df82e307dc9212fd69c1ee4e40501169'
-         '1bc38c4541cad4eafd83db7ac1524a42')
-
-build() {
-  cd ${srcdir}
-
-  [[ -d build ]] && rm -r build
-  mkdir build && cd build
-
-  qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-
-  make INSTALL_ROOT="${pkgdir}/usr/" install
-
-  install -Dm644 ${srcdir}/qtcreator.desktop \
-    ${pkgdir}/usr/share/applications/qtcreator.desktop
-  install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \
-    ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
-}
diff --git a/community-testing/qtcreator/fix-glsl-shit.patch b/community-testing/qtcreator/fix-glsl-shit.patch
deleted file mode 100644
index 4b5e504e1..000000000
--- a/community-testing/qtcreator/fix-glsl-shit.patch
+++ /dev/null
@@ -1,2376 +0,0 @@
-From e91045469d59c35607faa344bcfba2b2c566da51 Mon Sep 17 00:00:00 2001
-From: Christian Kamm <christian.d.kamm@nokia.com>
-Date: Mon, 6 Aug 2012 11:29:55 +0200
-Subject: [PATCH] GLSL: Fix recovery token order to avoid infinite loop.
-
-The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ...
-
-Task-number: QTCREATORBUG-7517
-Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19
-Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
----
- src/libs/glsl/glsl.g         |    4 +-
- src/libs/glsl/glslparser.cpp |  638 +++++++++++++++++++++---------------------
- src/libs/glsl/glslparser.h   |    2 +-
- 3 files changed, 322 insertions(+), 322 deletions(-)
-
-diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g
-index 67f564c..3c6ae7c 100644
---- a/src/libs/glsl/glsl.g
-+++ b/src/libs/glsl/glsl.g
-@@ -456,7 +456,7 @@ private:
- #include <iostream>
- #include <cstdio>
- #include <cassert>
--#include <QtCore/QDebug>
-+#include <QDebug>
- 
- using namespace GLSL;
- 
-@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken)
- 
-                 static int tks[] = {
-                     T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET,
--                    T_SEMICOLON, T_COMMA, T_COLON,
-+                    T_SEMICOLON, T_COLON, T_COMMA,
-                     T_NUMBER, T_TYPE_NAME, T_IDENTIFIER,
-                     T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET,
-                     T_WHILE,
-diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp
-index cf4bbe4..d82096b 100644
---- a/src/libs/glsl/glslparser.cpp
-+++ b/src/libs/glsl/glslparser.cpp
-@@ -1,5 +1,5 @@
- 
--#line 427 "./glsl.g"
-+#line 423 "./glsl.g"
- 
- /**************************************************************************
- **
-@@ -171,7 +171,7 @@ AST *Parser::parse(int startToken)
- 
-                 static int tks[] = {
-                     T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET,
--                    T_SEMICOLON, T_COMMA, T_COLON,
-+                    T_SEMICOLON, T_COLON, T_COMMA,
-                     T_NUMBER, T_TYPE_NAME, T_IDENTIFIER,
-                     T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET,
-                     T_WHILE,
-@@ -215,137 +215,137 @@ AST *Parser::parse(int startToken)
-     return 0;
- }
- 
--#line 647 "./glsl.g"
-+#line 641 "./glsl.g"
- 
- void Parser::reduce(int ruleno)
- {
- switch(ruleno) {
- 
--#line 656 "./glsl.g"
-+#line 650 "./glsl.g"
- 
- case 0: {
-     ast(1) = makeAstNode<IdentifierExpressionAST>(string(1));
- }   break;
- 
--#line 663 "./glsl.g"
-+#line 657 "./glsl.g"
- 
- case 1: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(string(1));
- }   break;
- 
--#line 670 "./glsl.g"
-+#line 664 "./glsl.g"
- 
- case 2: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4));
- }   break;
- 
--#line 677 "./glsl.g"
-+#line 671 "./glsl.g"
- 
- case 3: {
-     ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5));
- }   break;
- 
--#line 684 "./glsl.g"
-+#line 678 "./glsl.g"
- 
- case 4: {
-     // nothing to do.
- }   break;
- 
--#line 691 "./glsl.g"
-+#line 685 "./glsl.g"
- 
- case 5: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 698 "./glsl.g"
-+#line 692 "./glsl.g"
- 
- case 6: {
-     // nothing to do.
- }   break;
- 
--#line 705 "./glsl.g"
-+#line 699 "./glsl.g"
- 
- case 7: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3));
- }   break;
- 
--#line 712 "./glsl.g"
-+#line 706 "./glsl.g"
- 
- case 8: {
-     // nothing to do.
- }   break;
- 
--#line 719 "./glsl.g"
-+#line 713 "./glsl.g"
- 
- case 9: {
-     ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3));
- }   break;
- 
--#line 726 "./glsl.g"
-+#line 720 "./glsl.g"
- 
- case 10: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1));
- }   break;
- 
--#line 733 "./glsl.g"
-+#line 727 "./glsl.g"
- 
- case 11: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1));
- }   break;
- 
--#line 740 "./glsl.g"
-+#line 734 "./glsl.g"
- 
- case 12: {
-     // nothing to do.
- }   break;
- 
--#line 747 "./glsl.g"
-+#line 741 "./glsl.g"
- 
- case 13: {
-     // nothing to do.
- }   break;
- 
--#line 754 "./glsl.g"
-+#line 748 "./glsl.g"
- 
- case 14: {
-     ast(1) = makeAstNode<FunctionCallExpressionAST>
-         (sym(1).function.id, sym(1).function.arguments);
- }   break;
- 
--#line 762 "./glsl.g"
-+#line 756 "./glsl.g"
- 
- case 15: {
-     ast(1) = makeAstNode<FunctionCallExpressionAST>
-         (expression(1), sym(3).function.id, sym(3).function.arguments);
- }   break;
- 
--#line 770 "./glsl.g"
-+#line 764 "./glsl.g"
- 
- case 16: {
-     // nothing to do.
- }   break;
- 
--#line 777 "./glsl.g"
-+#line 771 "./glsl.g"
- 
- case 17: {
-     // nothing to do.
- }   break;
- 
--#line 784 "./glsl.g"
-+#line 778 "./glsl.g"
- 
- case 18: {
-     sym(1).function.id = sym(1).function_identifier;
-     sym(1).function.arguments = 0;
- }   break;
- 
--#line 792 "./glsl.g"
-+#line 786 "./glsl.g"
- 
- case 19: {
-     sym(1).function.id = sym(1).function_identifier;
-     sym(1).function.arguments = 0;
- }   break;
- 
--#line 800 "./glsl.g"
-+#line 794 "./glsl.g"
- 
- case 20: {
-     sym(1).function.id = sym(1).function_identifier;
-@@ -353,7 +353,7 @@ case 20: {
-         makeAstNode< List<ExpressionAST *> >(expression(2));
- }   break;
- 
--#line 809 "./glsl.g"
-+#line 803 "./glsl.g"
- 
- case 21: {
-     sym(1).function.arguments =
-@@ -361,379 +361,379 @@ case 21: {
-             (sym(1).function.arguments, expression(3));
- }   break;
- 
--#line 818 "./glsl.g"
-+#line 812 "./glsl.g"
- 
- case 22: {
-     // nothing to do.
- }   break;
- 
--#line 825 "./glsl.g"
-+#line 819 "./glsl.g"
- 
- case 23: {
-     ast(1) = makeAstNode<FunctionIdentifierAST>(type(1));
- }   break;
- 
--#line 832 "./glsl.g"
-+#line 826 "./glsl.g"
- 
- case 24: {
-     ast(1) = makeAstNode<FunctionIdentifierAST>(string(1));
- }   break;
- 
--#line 839 "./glsl.g"
-+#line 833 "./glsl.g"
- 
- case 25: {
-     // nothing to do.
- }   break;
- 
--#line 846 "./glsl.g"
-+#line 840 "./glsl.g"
- 
- case 26: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2));
- }   break;
- 
--#line 853 "./glsl.g"
-+#line 847 "./glsl.g"
- 
- case 27: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2));
- }   break;
- 
--#line 860 "./glsl.g"
-+#line 854 "./glsl.g"
- 
- case 28: {
-     ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2));
- }   break;
- 
--#line 867 "./glsl.g"
-+#line 861 "./glsl.g"
- 
- case 29: {
-     sym(1).kind = AST::Kind_UnaryPlus;
- }   break;
- 
--#line 874 "./glsl.g"
-+#line 868 "./glsl.g"
- 
- case 30: {
-     sym(1).kind = AST::Kind_UnaryMinus;
- }   break;
- 
--#line 881 "./glsl.g"
-+#line 875 "./glsl.g"
- 
- case 31: {
-     sym(1).kind = AST::Kind_LogicalNot;
- }   break;
- 
--#line 888 "./glsl.g"
-+#line 882 "./glsl.g"
- 
- case 32: {
-     sym(1).kind = AST::Kind_BitwiseNot;
- }   break;
- 
--#line 895 "./glsl.g"
-+#line 889 "./glsl.g"
- 
- case 33: {
-     // nothing to do.
- }   break;
- 
--#line 902 "./glsl.g"
-+#line 896 "./glsl.g"
- 
- case 34: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3));
- }   break;
- 
--#line 909 "./glsl.g"
-+#line 903 "./glsl.g"
- 
- case 35: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3));
- }   break;
- 
--#line 916 "./glsl.g"
-+#line 910 "./glsl.g"
- 
- case 36: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3));
- }   break;
- 
--#line 923 "./glsl.g"
-+#line 917 "./glsl.g"
- 
- case 37: {
-     // nothing to do.
- }   break;
- 
--#line 930 "./glsl.g"
-+#line 924 "./glsl.g"
- 
- case 38: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3));
- }   break;
- 
--#line 937 "./glsl.g"
-+#line 931 "./glsl.g"
- 
- case 39: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3));
- }   break;
- 
--#line 944 "./glsl.g"
-+#line 938 "./glsl.g"
- 
- case 40: {
-     // nothing to do.
- }   break;
- 
--#line 951 "./glsl.g"
-+#line 945 "./glsl.g"
- 
- case 41: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3));
- }   break;
- 
--#line 958 "./glsl.g"
-+#line 952 "./glsl.g"
- 
- case 42: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3));
- }   break;
- 
--#line 965 "./glsl.g"
-+#line 959 "./glsl.g"
- 
- case 43: {
-     // nothing to do.
- }   break;
- 
--#line 972 "./glsl.g"
-+#line 966 "./glsl.g"
- 
- case 44: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3));
- }   break;
- 
--#line 979 "./glsl.g"
-+#line 973 "./glsl.g"
- 
- case 45: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3));
- }   break;
- 
--#line 986 "./glsl.g"
-+#line 980 "./glsl.g"
- 
- case 46: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3));
- }   break;
- 
--#line 993 "./glsl.g"
-+#line 987 "./glsl.g"
- 
- case 47: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3));
- }   break;
- 
--#line 1000 "./glsl.g"
-+#line 994 "./glsl.g"
- 
- case 48: {
-     // nothing to do.
- }   break;
- 
--#line 1007 "./glsl.g"
-+#line 1001 "./glsl.g"
- 
- case 49: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3));
- }   break;
- 
--#line 1014 "./glsl.g"
-+#line 1008 "./glsl.g"
- 
- case 50: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3));
- }   break;
- 
--#line 1021 "./glsl.g"
-+#line 1015 "./glsl.g"
- 
- case 51: {
-     // nothing to do.
- }   break;
- 
--#line 1028 "./glsl.g"
-+#line 1022 "./glsl.g"
- 
- case 52: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3));
- }   break;
- 
--#line 1035 "./glsl.g"
-+#line 1029 "./glsl.g"
- 
- case 53: {
-     // nothing to do.
- }   break;
- 
--#line 1042 "./glsl.g"
-+#line 1036 "./glsl.g"
- 
- case 54: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3));
- }   break;
- 
--#line 1049 "./glsl.g"
-+#line 1043 "./glsl.g"
- 
- case 55: {
-     // nothing to do.
- }   break;
- 
--#line 1056 "./glsl.g"
-+#line 1050 "./glsl.g"
- 
- case 56: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3));
- }   break;
- 
--#line 1063 "./glsl.g"
-+#line 1057 "./glsl.g"
- 
- case 57: {
-     // nothing to do.
- }   break;
- 
--#line 1070 "./glsl.g"
-+#line 1064 "./glsl.g"
- 
- case 58: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3));
- }   break;
- 
--#line 1077 "./glsl.g"
-+#line 1071 "./glsl.g"
- 
- case 59: {
-     // nothing to do.
- }   break;
- 
--#line 1084 "./glsl.g"
-+#line 1078 "./glsl.g"
- 
- case 60: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3));
- }   break;
- 
--#line 1091 "./glsl.g"
-+#line 1085 "./glsl.g"
- 
- case 61: {
-     // nothing to do.
- }   break;
- 
--#line 1098 "./glsl.g"
-+#line 1092 "./glsl.g"
- 
- case 62: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3));
- }   break;
- 
--#line 1105 "./glsl.g"
-+#line 1099 "./glsl.g"
- 
- case 63: {
-     // nothing to do.
- }   break;
- 
--#line 1112 "./glsl.g"
-+#line 1106 "./glsl.g"
- 
- case 64: {
-     ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5));
- }   break;
- 
--#line 1119 "./glsl.g"
-+#line 1113 "./glsl.g"
- 
- case 65: {
-     // nothing to do.
- }   break;
- 
--#line 1126 "./glsl.g"
-+#line 1120 "./glsl.g"
- 
- case 66: {
-     ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3));
- }   break;
- 
--#line 1133 "./glsl.g"
-+#line 1127 "./glsl.g"
- 
- case 67: {
-     sym(1).kind = AST::Kind_Assign;
- }   break;
- 
--#line 1140 "./glsl.g"
-+#line 1134 "./glsl.g"
- 
- case 68: {
-     sym(1).kind = AST::Kind_AssignMultiply;
- }   break;
- 
--#line 1147 "./glsl.g"
-+#line 1141 "./glsl.g"
- 
- case 69: {
-     sym(1).kind = AST::Kind_AssignDivide;
- }   break;
- 
--#line 1154 "./glsl.g"
-+#line 1148 "./glsl.g"
- 
- case 70: {
-     sym(1).kind = AST::Kind_AssignModulus;
- }   break;
- 
--#line 1161 "./glsl.g"
-+#line 1155 "./glsl.g"
- 
- case 71: {
-     sym(1).kind = AST::Kind_AssignPlus;
- }   break;
- 
--#line 1168 "./glsl.g"
-+#line 1162 "./glsl.g"
- 
- case 72: {
-     sym(1).kind = AST::Kind_AssignMinus;
- }   break;
- 
--#line 1175 "./glsl.g"
-+#line 1169 "./glsl.g"
- 
- case 73: {
-     sym(1).kind = AST::Kind_AssignShiftLeft;
- }   break;
- 
--#line 1182 "./glsl.g"
-+#line 1176 "./glsl.g"
- 
- case 74: {
-     sym(1).kind = AST::Kind_AssignShiftRight;
- }   break;
- 
--#line 1189 "./glsl.g"
-+#line 1183 "./glsl.g"
- 
- case 75: {
-     sym(1).kind = AST::Kind_AssignAnd;
- }   break;
- 
--#line 1196 "./glsl.g"
-+#line 1190 "./glsl.g"
- 
- case 76: {
-     sym(1).kind = AST::Kind_AssignXor;
- }   break;
- 
--#line 1203 "./glsl.g"
-+#line 1197 "./glsl.g"
- 
- case 77: {
-     sym(1).kind = AST::Kind_AssignOr;
- }   break;
- 
--#line 1210 "./glsl.g"
-+#line 1204 "./glsl.g"
- 
- case 78: {
-     // nothing to do.
- }   break;
- 
--#line 1217 "./glsl.g"
-+#line 1211 "./glsl.g"
- 
- case 79: {
-     ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3));
- }   break;
- 
--#line 1224 "./glsl.g"
-+#line 1218 "./glsl.g"
- 
- case 80: {
-     // nothing to do.
- }   break;
- 
--#line 1231 "./glsl.g"
-+#line 1225 "./glsl.g"
- 
- case 81: {
-     // nothing to do.
- }   break;
- 
--#line 1238 "./glsl.g"
-+#line 1232 "./glsl.g"
- 
- case 82: {
-     ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list);
- }   break;
- 
--#line 1245 "./glsl.g"
-+#line 1239 "./glsl.g"
- 
- case 83: {
-     ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3));
- }   break;
- 
--#line 1252 "./glsl.g"
-+#line 1246 "./glsl.g"
- 
- case 84: {
-     if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) {
-@@ -743,7 +743,7 @@ case 84: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type);
- }   break;
- 
--#line 1263 "./glsl.g"
-+#line 1257 "./glsl.g"
- 
- case 85: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -761,7 +761,7 @@ case 85: {
-          makeAstNode<VariableDeclarationAST>(qualtype, string(6)));
- }   break;
- 
--#line 1282 "./glsl.g"
-+#line 1276 "./glsl.g"
- 
- case 86: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -780,7 +780,7 @@ case 86: {
-             (makeAstNode<ArrayTypeAST>(qualtype), string(6)));
- }   break;
- 
--#line 1302 "./glsl.g"
-+#line 1296 "./glsl.g"
- 
- case 87: {
-     if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) {
-@@ -799,7 +799,7 @@ case 87: {
-             (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6)));
- }   break;
- 
--#line 1322 "./glsl.g"
-+#line 1316 "./glsl.g"
- 
- case 88: {
-     TypeAST *type = makeAstNode<QualifiedTypeAST>
-@@ -808,59 +808,59 @@ case 88: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type);
- }   break;
- 
--#line 1332 "./glsl.g"
-+#line 1326 "./glsl.g"
- 
- case 89: {
-     function(1)->finishParams();
- }   break;
- 
--#line 1339 "./glsl.g"
-+#line 1333 "./glsl.g"
- 
- case 90: {
-     // nothing to do.
- }   break;
- 
--#line 1346 "./glsl.g"
-+#line 1340 "./glsl.g"
- 
- case 91: {
-     // nothing to do.
- }   break;
- 
--#line 1353 "./glsl.g"
-+#line 1347 "./glsl.g"
- 
- case 92: {
-     function(1)->params = makeAstNode< List<ParameterDeclarationAST *> >
-         (sym(2).param_declaration);
- }   break;
- 
--#line 1361 "./glsl.g"
-+#line 1355 "./glsl.g"
- 
- case 93: {
-     function(1)->params = makeAstNode< List<ParameterDeclarationAST *> >
-         (function(1)->params, sym(3).param_declaration);
- }   break;
- 
--#line 1369 "./glsl.g"
-+#line 1363 "./glsl.g"
- 
- case 94: {
-     function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2));
- }   break;
- 
--#line 1376 "./glsl.g"
-+#line 1370 "./glsl.g"
- 
- case 95: {
-     sym(1).param_declarator.type = type(1);
-     sym(1).param_declarator.name = string(2);
- }   break;
- 
--#line 1384 "./glsl.g"
-+#line 1378 "./glsl.g"
- 
- case 96: {
-     sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4));
-     sym(1).param_declarator.name = string(2);
- }   break;
- 
--#line 1392 "./glsl.g"
-+#line 1386 "./glsl.g"
- 
- case 97: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -871,7 +871,7 @@ case 97: {
-          sym(3).param_declarator.name);
- }   break;
- 
--#line 1404 "./glsl.g"
-+#line 1398 "./glsl.g"
- 
- case 98: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -880,7 +880,7 @@ case 98: {
-          sym(2).param_declarator.name);
- }   break;
- 
--#line 1414 "./glsl.g"
-+#line 1408 "./glsl.g"
- 
- case 99: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -890,7 +890,7 @@ case 99: {
-          (const QString *)0);
- }   break;
- 
--#line 1425 "./glsl.g"
-+#line 1419 "./glsl.g"
- 
- case 100: {
-     ast(1) = makeAstNode<ParameterDeclarationAST>
-@@ -898,44 +898,44 @@ case 100: {
-          (const QString *)0);
- }   break;
- 
--#line 1434 "./glsl.g"
-+#line 1428 "./glsl.g"
- 
- case 101: {
-     sym(1).qualifier = ParameterDeclarationAST::In;
- }   break;
- 
--#line 1441 "./glsl.g"
-+#line 1435 "./glsl.g"
- 
- case 102: {
-     sym(1).qualifier = ParameterDeclarationAST::In;
- }   break;
- 
--#line 1448 "./glsl.g"
-+#line 1442 "./glsl.g"
- 
- case 103: {
-     sym(1).qualifier = ParameterDeclarationAST::Out;
- }   break;
- 
--#line 1455 "./glsl.g"
-+#line 1449 "./glsl.g"
- 
- case 104: {
-     sym(1).qualifier = ParameterDeclarationAST::InOut;
- }   break;
- 
--#line 1462 "./glsl.g"
-+#line 1456 "./glsl.g"
- 
- case 105: {
-     // nothing to do.
- }   break;
- 
--#line 1469 "./glsl.g"
-+#line 1463 "./glsl.g"
- 
- case 106: {
-     sym(1).declaration_list = makeAstNode< List<DeclarationAST *> >
-         (sym(1).declaration);
- }   break;
- 
--#line 1477 "./glsl.g"
-+#line 1471 "./glsl.g"
- 
- case 107: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -944,7 +944,7 @@ case 107: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1487 "./glsl.g"
-+#line 1481 "./glsl.g"
- 
- case 108: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -954,7 +954,7 @@ case 108: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1498 "./glsl.g"
-+#line 1492 "./glsl.g"
- 
- case 109: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -964,7 +964,7 @@ case 109: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1509 "./glsl.g"
-+#line 1503 "./glsl.g"
- 
- case 110: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -975,7 +975,7 @@ case 110: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1521 "./glsl.g"
-+#line 1515 "./glsl.g"
- 
- case 111: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -986,7 +986,7 @@ case 111: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1533 "./glsl.g"
-+#line 1527 "./glsl.g"
- 
- case 112: {
-     TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list);
-@@ -996,40 +996,40 @@ case 112: {
-             (sym(1).declaration_list, decl);
- }   break;
- 
--#line 1544 "./glsl.g"
-+#line 1538 "./glsl.g"
- 
- case 113: {
-     ast(1) = makeAstNode<TypeDeclarationAST>(type(1));
- }   break;
- 
--#line 1551 "./glsl.g"
-+#line 1545 "./glsl.g"
- 
- case 114: {
-     ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2));
- }   break;
- 
--#line 1558 "./glsl.g"
-+#line 1552 "./glsl.g"
- 
- case 115: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1)), string(2));
- }   break;
- 
--#line 1566 "./glsl.g"
-+#line 1560 "./glsl.g"
- 
- case 116: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2));
- }   break;
- 
--#line 1574 "./glsl.g"
-+#line 1568 "./glsl.g"
- 
- case 117: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6));
- }   break;
- 
--#line 1582 "./glsl.g"
-+#line 1576 "./glsl.g"
- 
- case 118: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-@@ -1037,26 +1037,26 @@ case 118: {
-          string(2), expression(7));
- }   break;
- 
--#line 1591 "./glsl.g"
-+#line 1585 "./glsl.g"
- 
- case 119: {
-     ast(1) = makeAstNode<VariableDeclarationAST>
-         (type(1), string(2), expression(4));
- }   break;
- 
--#line 1599 "./glsl.g"
-+#line 1593 "./glsl.g"
- 
- case 120: {
-     ast(1) = makeAstNode<InvariantDeclarationAST>(string(2));
- }   break;
- 
--#line 1606 "./glsl.g"
-+#line 1600 "./glsl.g"
- 
- case 121: {
-     ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifierAST *> *)0);
- }   break;
- 
--#line 1613 "./glsl.g"
-+#line 1607 "./glsl.g"
- 
- case 122: {
-     ast(1) = makeAstNode<QualifiedTypeAST>
-@@ -1064,207 +1064,207 @@ case 122: {
-          sym(1).type_qualifier.layout_list);
- }   break;
- 
--#line 1622 "./glsl.g"
-+#line 1616 "./glsl.g"
- 
- case 123: {
-     sym(1).qualifier = QualifiedTypeAST::Invariant;
- }   break;
- 
--#line 1629 "./glsl.g"
-+#line 1623 "./glsl.g"
- 
- case 124: {
-     sym(1).qualifier = QualifiedTypeAST::Smooth;
- }   break;
- 
--#line 1636 "./glsl.g"
-+#line 1630 "./glsl.g"
- 
- case 125: {
-     sym(1).qualifier = QualifiedTypeAST::Flat;
- }   break;
- 
--#line 1643 "./glsl.g"
-+#line 1637 "./glsl.g"
- 
- case 126: {
-     sym(1).qualifier = QualifiedTypeAST::NoPerspective;
- }   break;
- 
--#line 1650 "./glsl.g"
-+#line 1644 "./glsl.g"
- 
- case 127: {
-     sym(1) = sym(3);
- }   break;
- 
--#line 1657 "./glsl.g"
-+#line 1651 "./glsl.g"
- 
- case 128: {
-     sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout);
- }   break;
- 
--#line 1664 "./glsl.g"
-+#line 1658 "./glsl.g"
- 
- case 129: {
-     sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout_list, sym(3).layout);
- }   break;
- 
--#line 1671 "./glsl.g"
-+#line 1665 "./glsl.g"
- 
- case 130: {
-     sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), (const QString *)0);
- }   break;
- 
--#line 1678 "./glsl.g"
-+#line 1672 "./glsl.g"
- 
- case 131: {
-     sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), string(3));
- }   break;
- 
--#line 1685 "./glsl.g"
-+#line 1679 "./glsl.g"
- 
- case 132: {
-     sym(1).qualifier = QualifiedTypeAST::Const;
- }   break;
- 
--#line 1692 "./glsl.g"
-+#line 1686 "./glsl.g"
- 
- case 133: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1700 "./glsl.g"
-+#line 1694 "./glsl.g"
- 
- case 134: {
-     sym(1).type_qualifier.layout_list = sym(1).layout_list;
-     sym(1).type_qualifier.qualifier = 0;
- }   break;
- 
--#line 1708 "./glsl.g"
-+#line 1702 "./glsl.g"
- 
- case 135: {
-     sym(1).type_qualifier.layout_list = sym(1).layout_list;
-     sym(1).type_qualifier.qualifier = sym(2).qualifier;
- }   break;
- 
--#line 1716 "./glsl.g"
-+#line 1710 "./glsl.g"
- 
- case 136: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1724 "./glsl.g"
-+#line 1718 "./glsl.g"
- 
- case 137: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1732 "./glsl.g"
-+#line 1726 "./glsl.g"
- 
- case 138: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1740 "./glsl.g"
-+#line 1734 "./glsl.g"
- 
- case 139: {
-     sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1748 "./glsl.g"
-+#line 1742 "./glsl.g"
- 
- case 140: {
-     sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant;
-     sym(1).type_qualifier.layout_list = 0;
- }   break;
- 
--#line 1756 "./glsl.g"
-+#line 1750 "./glsl.g"
- 
- case 141: {
-     sym(1).qualifier = QualifiedTypeAST::Const;
- }   break;
- 
--#line 1763 "./glsl.g"
-+#line 1757 "./glsl.g"
- 
- case 142: {
-     sym(1).qualifier = QualifiedTypeAST::Attribute;
- }   break;
- 
--#line 1770 "./glsl.g"
-+#line 1764 "./glsl.g"
- 
- case 143: {
-     sym(1).qualifier = QualifiedTypeAST::Varying;
- }   break;
- 
--#line 1777 "./glsl.g"
-+#line 1771 "./glsl.g"
- 
- case 144: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidVarying;
- }   break;
- 
--#line 1784 "./glsl.g"
-+#line 1778 "./glsl.g"
- 
- case 145: {
-     sym(1).qualifier = QualifiedTypeAST::In;
- }   break;
- 
--#line 1791 "./glsl.g"
-+#line 1785 "./glsl.g"
- 
- case 146: {
-     sym(1).qualifier = QualifiedTypeAST::Out;
- }   break;
- 
--#line 1798 "./glsl.g"
-+#line 1792 "./glsl.g"
- 
- case 147: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidIn;
- }   break;
- 
--#line 1805 "./glsl.g"
-+#line 1799 "./glsl.g"
- 
- case 148: {
-     sym(1).qualifier = QualifiedTypeAST::CentroidOut;
- }   break;
- 
--#line 1812 "./glsl.g"
-+#line 1806 "./glsl.g"
- 
- case 149: {
-     sym(1).qualifier = QualifiedTypeAST::PatchIn;
- }   break;
- 
--#line 1819 "./glsl.g"
-+#line 1813 "./glsl.g"
- 
- case 150: {
-     sym(1).qualifier = QualifiedTypeAST::PatchOut;
- }   break;
- 
--#line 1826 "./glsl.g"
-+#line 1820 "./glsl.g"
- 
- case 151: {
-     sym(1).qualifier = QualifiedTypeAST::SampleIn;
- }   break;
- 
--#line 1833 "./glsl.g"
-+#line 1827 "./glsl.g"
- 
- case 152: {
-     sym(1).qualifier = QualifiedTypeAST::SampleOut;
- }   break;
- 
--#line 1840 "./glsl.g"
-+#line 1834 "./glsl.g"
- 
- case 153: {
-     sym(1).qualifier = QualifiedTypeAST::Uniform;
- }   break;
- 
--#line 1847 "./glsl.g"
-+#line 1841 "./glsl.g"
- 
- case 154: {
-     // nothing to do.
- }   break;
- 
--#line 1854 "./glsl.g"
-+#line 1848 "./glsl.g"
- 
- case 155: {
-     if (!type(2)->setPrecision(sym(1).precision)) {
-@@ -1273,595 +1273,595 @@ case 155: {
-     ast(1) = type(2);
- }   break;
- 
--#line 1864 "./glsl.g"
-+#line 1858 "./glsl.g"
- 
- case 156: {
-     // nothing to do.
- }   break;
- 
--#line 1871 "./glsl.g"
-+#line 1865 "./glsl.g"
- 
- case 157: {
-     ast(1) = makeAstNode<ArrayTypeAST>(type(1));
- }   break;
- 
--#line 1878 "./glsl.g"
-+#line 1872 "./glsl.g"
- 
- case 158: {
-     ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3));
- }   break;
- 
--#line 1885 "./glsl.g"
-+#line 1879 "./glsl.g"
- 
- case 159: {
-     ast(1) = makeBasicType(T_VOID);
- }   break;
- 
--#line 1892 "./glsl.g"
-+#line 1886 "./glsl.g"
- 
- case 160: {
-     ast(1) = makeBasicType(T_FLOAT);
- }   break;
- 
--#line 1899 "./glsl.g"
-+#line 1893 "./glsl.g"
- 
- case 161: {
-     ast(1) = makeBasicType(T_DOUBLE);
- }   break;
- 
--#line 1906 "./glsl.g"
-+#line 1900 "./glsl.g"
- 
- case 162: {
-     ast(1) = makeBasicType(T_INT);
- }   break;
- 
--#line 1913 "./glsl.g"
-+#line 1907 "./glsl.g"
- 
- case 163: {
-     ast(1) = makeBasicType(T_UINT);
- }   break;
- 
--#line 1920 "./glsl.g"
-+#line 1914 "./glsl.g"
- 
- case 164: {
-     ast(1) = makeBasicType(T_BOOL);
- }   break;
- 
--#line 1927 "./glsl.g"
-+#line 1921 "./glsl.g"
- 
- case 165: {
-     ast(1) = makeBasicType(T_VEC2);
- }   break;
- 
--#line 1934 "./glsl.g"
-+#line 1928 "./glsl.g"
- 
- case 166: {
-     ast(1) = makeBasicType(T_VEC3);
- }   break;
- 
--#line 1941 "./glsl.g"
-+#line 1935 "./glsl.g"
- 
- case 167: {
-     ast(1) = makeBasicType(T_VEC4);
- }   break;
- 
--#line 1948 "./glsl.g"
-+#line 1942 "./glsl.g"
- 
- case 168: {
-     ast(1) = makeBasicType(T_DVEC2);
- }   break;
- 
--#line 1955 "./glsl.g"
-+#line 1949 "./glsl.g"
- 
- case 169: {
-     ast(1) = makeBasicType(T_DVEC3);
- }   break;
- 
--#line 1962 "./glsl.g"
-+#line 1956 "./glsl.g"
- 
- case 170: {
-     ast(1) = makeBasicType(T_DVEC4);
- }   break;
- 
--#line 1969 "./glsl.g"
-+#line 1963 "./glsl.g"
- 
- case 171: {
-     ast(1) = makeBasicType(T_BVEC2);
- }   break;
- 
--#line 1976 "./glsl.g"
-+#line 1970 "./glsl.g"
- 
- case 172: {
-     ast(1) = makeBasicType(T_BVEC3);
- }   break;
- 
--#line 1983 "./glsl.g"
-+#line 1977 "./glsl.g"
- 
- case 173: {
-     ast(1) = makeBasicType(T_BVEC4);
- }   break;
- 
--#line 1990 "./glsl.g"
-+#line 1984 "./glsl.g"
- 
- case 174: {
-     ast(1) = makeBasicType(T_IVEC2);
- }   break;
- 
--#line 1997 "./glsl.g"
-+#line 1991 "./glsl.g"
- 
- case 175: {
-     ast(1) = makeBasicType(T_IVEC3);
- }   break;
- 
--#line 2004 "./glsl.g"
-+#line 1998 "./glsl.g"
- 
- case 176: {
-     ast(1) = makeBasicType(T_IVEC4);
- }   break;
- 
--#line 2011 "./glsl.g"
-+#line 2005 "./glsl.g"
- 
- case 177: {
-     ast(1) = makeBasicType(T_UVEC2);
- }   break;
- 
--#line 2018 "./glsl.g"
-+#line 2012 "./glsl.g"
- 
- case 178: {
-     ast(1) = makeBasicType(T_UVEC3);
- }   break;
- 
--#line 2025 "./glsl.g"
-+#line 2019 "./glsl.g"
- 
- case 179: {
-     ast(1) = makeBasicType(T_UVEC4);
- }   break;
- 
--#line 2032 "./glsl.g"
-+#line 2026 "./glsl.g"
- 
- case 180: {
-     ast(1) = makeBasicType(T_MAT2);
- }   break;
- 
--#line 2039 "./glsl.g"
-+#line 2033 "./glsl.g"
- 
- case 181: {
-     ast(1) = makeBasicType(T_MAT3);
- }   break;
- 
--#line 2046 "./glsl.g"
-+#line 2040 "./glsl.g"
- 
- case 182: {
-     ast(1) = makeBasicType(T_MAT4);
- }   break;
- 
--#line 2053 "./glsl.g"
-+#line 2047 "./glsl.g"
- 
- case 183: {
-     ast(1) = makeBasicType(T_MAT2);
- }   break;
- 
--#line 2060 "./glsl.g"
-+#line 2054 "./glsl.g"
- 
- case 184: {
-     ast(1) = makeBasicType(T_MAT2X3);
- }   break;
- 
--#line 2067 "./glsl.g"
-+#line 2061 "./glsl.g"
- 
- case 185: {
-     ast(1) = makeBasicType(T_MAT2X4);
- }   break;
- 
--#line 2074 "./glsl.g"
-+#line 2068 "./glsl.g"
- 
- case 186: {
-     ast(1) = makeBasicType(T_MAT3X2);
- }   break;
- 
--#line 2081 "./glsl.g"
-+#line 2075 "./glsl.g"
- 
- case 187: {
-     ast(1) = makeBasicType(T_MAT3);
- }   break;
- 
--#line 2088 "./glsl.g"
-+#line 2082 "./glsl.g"
- 
- case 188: {
-     ast(1) = makeBasicType(T_MAT3X4);
- }   break;
- 
--#line 2095 "./glsl.g"
-+#line 2089 "./glsl.g"
- 
- case 189: {
-     ast(1) = makeBasicType(T_MAT4X2);
- }   break;
- 
--#line 2102 "./glsl.g"
-+#line 2096 "./glsl.g"
- 
- case 190: {
-     ast(1) = makeBasicType(T_MAT4X3);
- }   break;
- 
--#line 2109 "./glsl.g"
-+#line 2103 "./glsl.g"
- 
- case 191: {
-     ast(1) = makeBasicType(T_MAT4);
- }   break;
- 
--#line 2116 "./glsl.g"
-+#line 2110 "./glsl.g"
- 
- case 192: {
-     ast(1) = makeBasicType(T_DMAT2);
- }   break;
- 
--#line 2123 "./glsl.g"
-+#line 2117 "./glsl.g"
- 
- case 193: {
-     ast(1) = makeBasicType(T_DMAT3);
- }   break;
- 
--#line 2130 "./glsl.g"
-+#line 2124 "./glsl.g"
- 
- case 194: {
-     ast(1) = makeBasicType(T_DMAT4);
- }   break;
- 
--#line 2137 "./glsl.g"
-+#line 2131 "./glsl.g"
- 
- case 195: {
-     ast(1) = makeBasicType(T_DMAT2);
- }   break;
- 
--#line 2144 "./glsl.g"
-+#line 2138 "./glsl.g"
- 
- case 196: {
-     ast(1) = makeBasicType(T_DMAT2X3);
- }   break;
- 
--#line 2151 "./glsl.g"
-+#line 2145 "./glsl.g"
- 
- case 197: {
-     ast(1) = makeBasicType(T_DMAT2X4);
- }   break;
- 
--#line 2158 "./glsl.g"
-+#line 2152 "./glsl.g"
- 
- case 198: {
-     ast(1) = makeBasicType(T_DMAT3X2);
- }   break;
- 
--#line 2165 "./glsl.g"
-+#line 2159 "./glsl.g"
- 
- case 199: {
-     ast(1) = makeBasicType(T_DMAT3);
- }   break;
- 
--#line 2172 "./glsl.g"
-+#line 2166 "./glsl.g"
- 
- case 200: {
-     ast(1) = makeBasicType(T_DMAT3X4);
- }   break;
- 
--#line 2179 "./glsl.g"
-+#line 2173 "./glsl.g"
- 
- case 201: {
-     ast(1) = makeBasicType(T_DMAT4X2);
- }   break;
- 
--#line 2186 "./glsl.g"
-+#line 2180 "./glsl.g"
- 
- case 202: {
-     ast(1) = makeBasicType(T_DMAT4X3);
- }   break;
- 
--#line 2193 "./glsl.g"
-+#line 2187 "./glsl.g"
- 
- case 203: {
-     ast(1) = makeBasicType(T_DMAT4);
- }   break;
- 
--#line 2200 "./glsl.g"
-+#line 2194 "./glsl.g"
- 
- case 204: {
-     ast(1) = makeBasicType(T_SAMPLER1D);
- }   break;
- 
--#line 2207 "./glsl.g"
-+#line 2201 "./glsl.g"
- 
- case 205: {
-     ast(1) = makeBasicType(T_SAMPLER2D);
- }   break;
- 
--#line 2214 "./glsl.g"
-+#line 2208 "./glsl.g"
- 
- case 206: {
-     ast(1) = makeBasicType(T_SAMPLER3D);
- }   break;
- 
--#line 2221 "./glsl.g"
-+#line 2215 "./glsl.g"
- 
- case 207: {
-     ast(1) = makeBasicType(T_SAMPLERCUBE);
- }   break;
- 
--#line 2228 "./glsl.g"
-+#line 2222 "./glsl.g"
- 
- case 208: {
-     ast(1) = makeBasicType(T_SAMPLER1DSHADOW);
- }   break;
- 
--#line 2235 "./glsl.g"
-+#line 2229 "./glsl.g"
- 
- case 209: {
-     ast(1) = makeBasicType(T_SAMPLER2DSHADOW);
- }   break;
- 
--#line 2242 "./glsl.g"
-+#line 2236 "./glsl.g"
- 
- case 210: {
-     ast(1) = makeBasicType(T_SAMPLERCUBESHADOW);
- }   break;
- 
--#line 2249 "./glsl.g"
-+#line 2243 "./glsl.g"
- 
- case 211: {
-     ast(1) = makeBasicType(T_SAMPLER1DARRAY);
- }   break;
- 
--#line 2256 "./glsl.g"
-+#line 2250 "./glsl.g"
- 
- case 212: {
-     ast(1) = makeBasicType(T_SAMPLER2DARRAY);
- }   break;
- 
--#line 2263 "./glsl.g"
-+#line 2257 "./glsl.g"
- 
- case 213: {
-     ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW);
- }   break;
- 
--#line 2270 "./glsl.g"
-+#line 2264 "./glsl.g"
- 
- case 214: {
-     ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW);
- }   break;
- 
--#line 2277 "./glsl.g"
-+#line 2271 "./glsl.g"
- 
- case 215: {
-     ast(1) = makeBasicType(T_SAMPLERCUBEARRAY);
- }   break;
- 
--#line 2284 "./glsl.g"
-+#line 2278 "./glsl.g"
- 
- case 216: {
-     ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW);
- }   break;
- 
--#line 2291 "./glsl.g"
-+#line 2285 "./glsl.g"
- 
- case 217: {
-     ast(1) = makeBasicType(T_ISAMPLER1D);
- }   break;
- 
--#line 2298 "./glsl.g"
-+#line 2292 "./glsl.g"
- 
- case 218: {
-     ast(1) = makeBasicType(T_ISAMPLER2D);
- }   break;
- 
--#line 2305 "./glsl.g"
-+#line 2299 "./glsl.g"
- 
- case 219: {
-     ast(1) = makeBasicType(T_ISAMPLER3D);
- }   break;
- 
--#line 2312 "./glsl.g"
-+#line 2306 "./glsl.g"
- 
- case 220: {
-     ast(1) = makeBasicType(T_ISAMPLERCUBE);
- }   break;
- 
--#line 2319 "./glsl.g"
-+#line 2313 "./glsl.g"
- 
- case 221: {
-     ast(1) = makeBasicType(T_ISAMPLER1DARRAY);
- }   break;
- 
--#line 2326 "./glsl.g"
-+#line 2320 "./glsl.g"
- 
- case 222: {
-     ast(1) = makeBasicType(T_ISAMPLER2DARRAY);
- }   break;
- 
--#line 2333 "./glsl.g"
-+#line 2327 "./glsl.g"
- 
- case 223: {
-     ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY);
- }   break;
- 
--#line 2340 "./glsl.g"
-+#line 2334 "./glsl.g"
- 
- case 224: {
-     ast(1) = makeBasicType(T_USAMPLER1D);
- }   break;
- 
--#line 2347 "./glsl.g"
-+#line 2341 "./glsl.g"
- 
- case 225: {
-     ast(1) = makeBasicType(T_USAMPLER2D);
- }   break;
- 
--#line 2354 "./glsl.g"
-+#line 2348 "./glsl.g"
- 
- case 226: {
-     ast(1) = makeBasicType(T_USAMPLER3D);
- }   break;
- 
--#line 2361 "./glsl.g"
-+#line 2355 "./glsl.g"
- 
- case 227: {
-     ast(1) = makeBasicType(T_USAMPLERCUBE);
- }   break;
- 
--#line 2368 "./glsl.g"
-+#line 2362 "./glsl.g"
- 
- case 228: {
-     ast(1) = makeBasicType(T_USAMPLER1DARRAY);
- }   break;
- 
--#line 2375 "./glsl.g"
-+#line 2369 "./glsl.g"
- 
- case 229: {
-     ast(1) = makeBasicType(T_USAMPLER2DARRAY);
- }   break;
- 
--#line 2382 "./glsl.g"
-+#line 2376 "./glsl.g"
- 
- case 230: {
-     ast(1) = makeBasicType(T_USAMPLERCUBEARRAY);
- }   break;
- 
--#line 2389 "./glsl.g"
-+#line 2383 "./glsl.g"
- 
- case 231: {
-     ast(1) = makeBasicType(T_SAMPLER2DRECT);
- }   break;
- 
--#line 2396 "./glsl.g"
-+#line 2390 "./glsl.g"
- 
- case 232: {
-     ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW);
- }   break;
- 
--#line 2403 "./glsl.g"
-+#line 2397 "./glsl.g"
- 
- case 233: {
-     ast(1) = makeBasicType(T_ISAMPLER2DRECT);
- }   break;
- 
--#line 2410 "./glsl.g"
-+#line 2404 "./glsl.g"
- 
- case 234: {
-     ast(1) = makeBasicType(T_USAMPLER2DRECT);
- }   break;
- 
--#line 2417 "./glsl.g"
-+#line 2411 "./glsl.g"
- 
- case 235: {
-     ast(1) = makeBasicType(T_SAMPLERBUFFER);
- }   break;
- 
--#line 2424 "./glsl.g"
-+#line 2418 "./glsl.g"
- 
- case 236: {
-     ast(1) = makeBasicType(T_ISAMPLERBUFFER);
- }   break;
- 
--#line 2431 "./glsl.g"
-+#line 2425 "./glsl.g"
- 
- case 237: {
-     ast(1) = makeBasicType(T_USAMPLERBUFFER);
- }   break;
- 
--#line 2438 "./glsl.g"
-+#line 2432 "./glsl.g"
- 
- case 238: {
-     ast(1) = makeBasicType(T_SAMPLER2DMS);
- }   break;
- 
--#line 2445 "./glsl.g"
-+#line 2439 "./glsl.g"
- 
- case 239: {
-     ast(1) = makeBasicType(T_ISAMPLER2DMS);
- }   break;
- 
--#line 2452 "./glsl.g"
-+#line 2446 "./glsl.g"
- 
- case 240: {
-     ast(1) = makeBasicType(T_USAMPLER2DMS);
- }   break;
- 
--#line 2459 "./glsl.g"
-+#line 2453 "./glsl.g"
- 
- case 241: {
-     ast(1) = makeBasicType(T_SAMPLER2DMSARRAY);
- }   break;
- 
--#line 2466 "./glsl.g"
-+#line 2460 "./glsl.g"
- 
- case 242: {
-     ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY);
- }   break;
- 
--#line 2473 "./glsl.g"
-+#line 2467 "./glsl.g"
- 
- case 243: {
-     ast(1) = makeBasicType(T_USAMPLER2DMSARRAY);
- }   break;
- 
--#line 2480 "./glsl.g"
-+#line 2474 "./glsl.g"
- 
- case 244: {
-     // nothing to do.
- }   break;
- 
--#line 2487 "./glsl.g"
-+#line 2481 "./glsl.g"
- 
- case 245: {
-     ast(1) = makeAstNode<NamedTypeAST>(string(1));
- }   break;
- 
--#line 2494 "./glsl.g"
-+#line 2488 "./glsl.g"
- 
- case 246: {
-     sym(1).precision = TypeAST::Highp;
- }   break;
- 
--#line 2501 "./glsl.g"
-+#line 2495 "./glsl.g"
- 
- case 247: {
-     sym(1).precision = TypeAST::Mediump;
- }   break;
- 
--#line 2508 "./glsl.g"
-+#line 2502 "./glsl.g"
- 
- case 248: {
-     sym(1).precision = TypeAST::Lowp;
- }   break;
- 
--#line 2515 "./glsl.g"
-+#line 2509 "./glsl.g"
- 
- case 249: {
-     ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list);
- }   break;
- 
--#line 2522 "./glsl.g"
-+#line 2516 "./glsl.g"
- 
- case 250: {
-     ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list);
- }   break;
- 
--#line 2529 "./glsl.g"
-+#line 2523 "./glsl.g"
- 
- case 251: {
-     // nothing to do.
- }   break;
- 
--#line 2536 "./glsl.g"
-+#line 2530 "./glsl.g"
- 
- case 252: {
-     sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list);
- }   break;
- 
--#line 2543 "./glsl.g"
-+#line 2537 "./glsl.g"
- 
- case 253: {
-     sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list);
- }   break;
- 
--#line 2550 "./glsl.g"
-+#line 2544 "./glsl.g"
- 
- case 254: {
-     sym(1).field_list = StructTypeAST::fixInnerTypes
-@@ -1870,106 +1870,106 @@ case 254: {
-              sym(1).type_qualifier.layout_list), sym(3).field_list);
- }   break;
- 
--#line 2560 "./glsl.g"
-+#line 2554 "./glsl.g"
- 
- case 255: {
-     // nothing to do.
-     sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field);
- }   break;
- 
--#line 2568 "./glsl.g"
-+#line 2562 "./glsl.g"
- 
- case 256: {
-     sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field);
- }   break;
- 
--#line 2575 "./glsl.g"
-+#line 2569 "./glsl.g"
- 
- case 257: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>(string(1));
- }   break;
- 
--#line 2582 "./glsl.g"
-+#line 2576 "./glsl.g"
- 
- case 258: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>
-         (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0));
- }   break;
- 
--#line 2590 "./glsl.g"
-+#line 2584 "./glsl.g"
- 
- case 259: {
-     sym(1).field = makeAstNode<StructTypeAST::Field>
-         (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3)));
- }   break;
- 
--#line 2598 "./glsl.g"
-+#line 2592 "./glsl.g"
- 
- case 260: {
-     // nothing to do.
- }   break;
- 
--#line 2605 "./glsl.g"
-+#line 2599 "./glsl.g"
- 
- case 261: {
-     ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration);
- }   break;
- 
--#line 2612 "./glsl.g"
-+#line 2606 "./glsl.g"
- 
- case 262: {
-     // nothing to do.
- }   break;
- 
--#line 2619 "./glsl.g"
-+#line 2613 "./glsl.g"
- 
- case 263: {
-     // nothing to do.
- }   break;
- 
--#line 2626 "./glsl.g"
-+#line 2620 "./glsl.g"
- 
- case 264: {
-     // nothing to do.
- }   break;
- 
--#line 2633 "./glsl.g"
-+#line 2627 "./glsl.g"
- 
- case 265: {
-     // nothing to do.
- }   break;
- 
--#line 2640 "./glsl.g"
-+#line 2634 "./glsl.g"
- 
- case 266: {
-     // nothing to do.
- }   break;
- 
--#line 2647 "./glsl.g"
-+#line 2641 "./glsl.g"
- 
- case 267: {
-     // nothing to do.
- }   break;
- 
--#line 2654 "./glsl.g"
-+#line 2648 "./glsl.g"
- 
- case 268: {
-     // nothing to do.
- }   break;
- 
--#line 2661 "./glsl.g"
-+#line 2655 "./glsl.g"
- 
- case 269: {
-     // nothing to do.
- }   break;
- 
--#line 2668 "./glsl.g"
-+#line 2662 "./glsl.g"
- 
- case 270: {
-     // nothing to do.
- }   break;
- 
--#line 2675 "./glsl.g"
-+#line 2669 "./glsl.g"
- 
- case 271: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>();
-@@ -1978,7 +1978,7 @@ case 271: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2685 "./glsl.g"
-+#line 2679 "./glsl.g"
- 
- case 272: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list);
-@@ -1987,19 +1987,19 @@ case 272: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2695 "./glsl.g"
-+#line 2689 "./glsl.g"
- 
- case 273: {
-     // nothing to do.
- }   break;
- 
--#line 2702 "./glsl.g"
-+#line 2696 "./glsl.g"
- 
- case 274: {
-     // nothing to do.
- }   break;
- 
--#line 2709 "./glsl.g"
-+#line 2703 "./glsl.g"
- 
- case 275: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>();
-@@ -2008,7 +2008,7 @@ case 275: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2719 "./glsl.g"
-+#line 2713 "./glsl.g"
- 
- case 276: {
-     CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list);
-@@ -2017,186 +2017,186 @@ case 276: {
-     ast(1) = stmt;
- }   break;
- 
--#line 2729 "./glsl.g"
-+#line 2723 "./glsl.g"
- 
- case 277: {
-     sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement);
- }   break;
- 
--#line 2736 "./glsl.g"
-+#line 2730 "./glsl.g"
- 
- case 278: {
-     sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement);
- }   break;
- 
--#line 2743 "./glsl.g"
-+#line 2737 "./glsl.g"
- 
- case 279: {
-     ast(1) = makeAstNode<CompoundStatementAST>();  // Empty statement
- }   break;
- 
--#line 2750 "./glsl.g"
-+#line 2744 "./glsl.g"
- 
- case 280: {
-     ast(1) = makeAstNode<ExpressionStatementAST>(expression(1));
- }   break;
- 
--#line 2757 "./glsl.g"
-+#line 2751 "./glsl.g"
- 
- case 281: {
-     ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause);
- }   break;
- 
--#line 2764 "./glsl.g"
-+#line 2758 "./glsl.g"
- 
- case 282: {
-     sym(1).ifstmt.thenClause = statement(1);
-     sym(1).ifstmt.elseClause = statement(3);
- }   break;
- 
--#line 2772 "./glsl.g"
-+#line 2766 "./glsl.g"
- 
- case 283: {
-     sym(1).ifstmt.thenClause = statement(1);
-     sym(1).ifstmt.elseClause = 0;
- }   break;
- 
--#line 2780 "./glsl.g"
-+#line 2774 "./glsl.g"
- 
- case 284: {
-     // nothing to do.
- }   break;
- 
--#line 2787 "./glsl.g"
-+#line 2781 "./glsl.g"
- 
- case 285: {
-     ast(1) = makeAstNode<DeclarationExpressionAST>
-         (type(1), string(2), expression(4));
- }   break;
- 
--#line 2795 "./glsl.g"
-+#line 2789 "./glsl.g"
- 
- case 286: {
-     ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6));
- }   break;
- 
--#line 2802 "./glsl.g"
-+#line 2796 "./glsl.g"
- 
- case 287: {
-     ast(1) = makeAstNode<CompoundStatementAST>();
- }   break;
- 
--#line 2809 "./glsl.g"
-+#line 2803 "./glsl.g"
- 
- case 288: {
-     ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list);
- }   break;
- 
--#line 2816 "./glsl.g"
-+#line 2810 "./glsl.g"
- 
- case 289: {
-     ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2));
- }   break;
- 
--#line 2823 "./glsl.g"
-+#line 2817 "./glsl.g"
- 
- case 290: {
-     ast(1) = makeAstNode<CaseLabelStatementAST>();
- }   break;
- 
--#line 2830 "./glsl.g"
-+#line 2824 "./glsl.g"
- 
- case 291: {
-     ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5));
- }   break;
- 
--#line 2837 "./glsl.g"
-+#line 2831 "./glsl.g"
- 
- case 292: {
-     ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5));
- }   break;
- 
--#line 2844 "./glsl.g"
-+#line 2838 "./glsl.g"
- 
- case 293: {
-     ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6));
- }   break;
- 
--#line 2851 "./glsl.g"
-+#line 2845 "./glsl.g"
- 
- case 294: {
-     // nothing to do.
- }   break;
- 
--#line 2858 "./glsl.g"
-+#line 2852 "./glsl.g"
- 
- case 295: {
-     // nothing to do.
- }   break;
- 
--#line 2865 "./glsl.g"
-+#line 2859 "./glsl.g"
- 
- case 296: {
-     // nothing to do.
- }   break;
- 
--#line 2872 "./glsl.g"
-+#line 2866 "./glsl.g"
- 
- case 297: {
-     // nothing to do.
- }   break;
- 
--#line 2879 "./glsl.g"
-+#line 2873 "./glsl.g"
- 
- case 298: {
-     sym(1).forstmt.condition = expression(1);
-     sym(1).forstmt.increment = 0;
- }   break;
- 
--#line 2887 "./glsl.g"
-+#line 2881 "./glsl.g"
- 
- case 299: {
-     sym(1).forstmt.condition = expression(1);
-     sym(1).forstmt.increment = expression(3);
- }   break;
- 
--#line 2895 "./glsl.g"
-+#line 2889 "./glsl.g"
- 
- case 300: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue);
- }   break;
- 
--#line 2902 "./glsl.g"
-+#line 2896 "./glsl.g"
- 
- case 301: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break);
- }   break;
- 
--#line 2909 "./glsl.g"
-+#line 2903 "./glsl.g"
- 
- case 302: {
-     ast(1) = makeAstNode<ReturnStatementAST>();
- }   break;
- 
--#line 2916 "./glsl.g"
-+#line 2910 "./glsl.g"
- 
- case 303: {
-     ast(1) = makeAstNode<ReturnStatementAST>(expression(2));
- }   break;
- 
--#line 2923 "./glsl.g"
-+#line 2917 "./glsl.g"
- 
- case 304: {
-     ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard);
- }   break;
- 
--#line 2930 "./glsl.g"
-+#line 2924 "./glsl.g"
- 
- case 305: {
-     ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list);
- }   break;
- 
--#line 2937 "./glsl.g"
-+#line 2931 "./glsl.g"
- 
- case 306: {
-     if (sym(1).declaration) {
-@@ -2207,7 +2207,7 @@ case 306: {
-     }
- }   break;
- 
--#line 2949 "./glsl.g"
-+#line 2943 "./glsl.g"
- 
- case 307: {
-     if (sym(1).declaration_list && sym(2).declaration) {
-@@ -2223,49 +2223,49 @@ case 307: {
-     }
- }   break;
- 
--#line 2966 "./glsl.g"
-+#line 2960 "./glsl.g"
- 
- case 308: {
-     // nothing to do.
- }   break;
- 
--#line 2973 "./glsl.g"
-+#line 2967 "./glsl.g"
- 
- case 309: {
-     // nothing to do.
- }   break;
- 
--#line 2980 "./glsl.g"
-+#line 2974 "./glsl.g"
- 
- case 310: {
-     ast(1) = 0;
- }   break;
- 
--#line 2987 "./glsl.g"
-+#line 2981 "./glsl.g"
- 
- case 311: {
-     function(1)->body = statement(2);
- }   break;
- 
--#line 2994 "./glsl.g"
-+#line 2988 "./glsl.g"
- 
- case 312: {
-     ast(1) = 0;
- }   break;
- 
--#line 3002 "./glsl.g"
-+#line 2996 "./glsl.g"
- 
- case 313: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 3009 "./glsl.g"
-+#line 3003 "./glsl.g"
- 
- case 314: {
-     ast(1) = ast(2);
- }   break;
- 
--#line 3015 "./glsl.g"
-+#line 3009 "./glsl.g"
- 
- } // end switch
- } // end Parser::reduce()
-diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h
-index 7bf70e2..bab2616 100644
---- a/src/libs/glsl/glslparser.h
-+++ b/src/libs/glsl/glslparser.h
-@@ -1,5 +1,5 @@
- 
--#line 217 "./glsl.g"
-+#line 215 "./glsl.g"
- 
- /**************************************************************************
- **
--- 
-1.7.10
-
diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop
deleted file mode 100644
index fbe06b7a2..000000000
--- a/community-testing/qtcreator/qtcreator.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/qtcreator
-Name=Qt Creator
-GenericName=C++ IDE
-X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png
-Terminal=false
-Type=Application
-Categories=Qt;Development
diff --git a/community-testing/qtcreator/qtcreator.install b/community-testing/qtcreator/qtcreator.install
deleted file mode 100644
index 4d4a283db..000000000
--- a/community-testing/qtcreator/qtcreator.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community-testing/qtcurve-kde4/PKGBUILD b/community-testing/qtcurve-kde4/PKGBUILD
deleted file mode 100644
index 817439c93..000000000
--- a/community-testing/qtcurve-kde4/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 74750 2012-08-03 09:56:11Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=qtcurve-kde4
-pkgver=1.8.13
-pkgrel=3
-arch=('i686' 'x86_64')
-groups=('qtcurve')
-license=('GPL')
-pkgdesc='A configurable set of widget styles for KDE and Gtk'
-url='http://www.kde-look.org/content/show.php?content=40492'
-depends=('kdebase-workspace')
-makedepends=('cmake' 'automoc4')
-source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2"
-        'bypass-kde-config.patch'
-        'fix-kwin_decoration-macro.patch')
-md5sums=('94ba22bc487a18f585249c2967878189'
-         '3f6681147cc361bd2bfd4d7477f2a8d0'
-         '7366e45ef9f24f53a36f87a539a937d6')
-
-build() {
-	cd "${srcdir}"/QtCurve-KDE4-${pkgver}
-	# Bypass KDE prefix detection by kde4-config, see:
-	# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-	patch -p1 -i "${srcdir}"/bypass-kde-config.patch
-	patch -p1 -i "${srcdir}"/fix-kwin_decoration-macro.patch
-
-	cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../QtCurve-KDE4-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/qtcurve-kde4/bypass-kde-config.patch b/community-testing/qtcurve-kde4/bypass-kde-config.patch
deleted file mode 100644
index d09e5ead5..000000000
--- a/community-testing/qtcurve-kde4/bypass-kde-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Pino Toscano <pino@kde.org>
-Description: Disable braindead KDE3/4 prefix detection
- The current detection of the KDE 3 and KDE 4 prefixes is done running
- kde-config and kde4-config, resp.
- This can be problematic, as these two could create files in ~/.kde,
- thus breaking when the home of the current user (eg in buildds) is read-only.
- Given the build system sets anyway "/usr" as prefix of KDE 3 and KDE 4
- if they were not detected, then just let it to.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,11 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CM
- set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}")
- include(CPack)
- 
-+# Comment the kde3/kde4 prefix detection as a whole as it wants to run
-+# kde-config and kde4-config, which in turn can create stuff in ~/.kde.
-+# This cannot work on read-only homes.
-+# So, the "fallback" prefixes ("/usr" for both) will be used.
-+if (BRAINDEAD_DETECTION)
- set(OLD_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
- 
- # Try to find kde4-config...
-@@ -48,6 +53,7 @@ if (KDE4_KDECONFIG_EXECUTABLE)
-                     ARGS --prefix
-                     OUTPUT_VARIABLE KDE4PREFIX)
- endif (KDE4_KDECONFIG_EXECUTABLE)
-+endif (BRAINDEAD_DETECTION)
- 
- if(NOT KDE3PREFIX)
-     if(KDE4PREFIX)
diff --git a/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch b/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch
deleted file mode 100644
index 6202e7b87..000000000
--- a/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur a/kwin/qtcurvehandler.cpp b/kwin/qtcurvehandler.cpp
---- a/kwin/qtcurvehandler.cpp	2012-08-02 13:36:58.811347708 +0000
-+++ b/kwin/qtcurvehandler.cpp	2012-08-02 13:38:03.240996792 +0000
-@@ -489,6 +489,11 @@
- 
- extern "C"
- {
-+    KWIN_EXPORT int decoration_version()
-+    {
-+        return KWIN_DECORATION_API_VERSION;
-+    }
-+
-     KDE_EXPORT KDecorationFactory *create_factory()
-     {
-         KWinQtCurve::handler = new KWinQtCurve::QtCurveHandler();
diff --git a/community-testing/r8168-lts/PKGBUILD b/community-testing/r8168-lts/PKGBUILD
deleted file mode 100644
index 62afc9066..000000000
--- a/community-testing/r8168-lts/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 75279 2012-08-17 18:35:26Z tpowa $
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-pkgname=r8168-lts
-_pkgname=r8168
-pkgver=8.031.00
-pkgrel=5
-pkgdesc="A kernel module for Realtek 8168 network cards for linux-lts"
-url="http://www.realtek.com.tw"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('glibc' "linux-lts>=3.0" "linux-lts<3.1")
-makedepends=("linux-lts-headers>=3.0" "linux-lts-headers<3.1")
-source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
-install=$pkgname.install
-md5sums=('ec1654f02e2dad930bbeb0210ddab7e5')
-sha256sums=('5c617b3c08aca18d1eb24d33f77df40020eb64fb32c8e4008265e08b7ffe5779')
-
-_extramodules=extramodules-3.0-lts
-
-build() {
-	cd "$_pkgname-$pkgver"
-	local _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
-	make -C /usr/lib/modules/$_kernver/build \
-			SUBDIRS="$srcdir/$_pkgname-$pkgver/src" \
-			EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
-			modules
-}
-
-package() {
-	cd "$_pkgname-$pkgver"
-	install -Dm644 src/$_pkgname.ko "$pkgdir/usr/lib/modules/$_extramodules/$_pkgname.ko"
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-}
diff --git a/community-testing/r8168-lts/r8168-lts.install b/community-testing/r8168-lts/r8168-lts.install
deleted file mode 100644
index 2aab9e1e3..000000000
--- a/community-testing/r8168-lts/r8168-lts.install
+++ /dev/null
@@ -1,17 +0,0 @@
-rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-3.0-lts'
-	depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  rebuild_module_dependencies
-	echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
-	echo '>>>  `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
-}
-post_upgrade() {
-	rebuild_module_dependencies
-}
-
-post_remove() {
-	rebuild_module_dependencies
-}
diff --git a/community-testing/rawstudio/PKGBUILD b/community-testing/rawstudio/PKGBUILD
deleted file mode 100644
index 50d5d2324..000000000
--- a/community-testing/rawstudio/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 74734 2012-08-02 15:24:10Z andrea $
-# 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=7
-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
-  export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix="${pkgdir}/usr" install
-  mkdir $pkgdir/usr/lib/rawstudio
-  mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio
-  ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins
-}
diff --git a/community-testing/rawstudio/libpng15.patch b/community-testing/rawstudio/libpng15.patch
deleted file mode 100644
index 6d3b85968..000000000
--- a/community-testing/rawstudio/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp
---- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp	2011-02-24 01:35:18.000000000 +0300
-+++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp	2012-01-23 15:03:22.000000000 +0400
-@@ -102,8 +102,8 @@
- 	{
- 		*linear_guess = FALSE;
- 		RSColorSpace* profile = NULL;
--		const gchar *icc_profile_title;
--		const gchar *icc_profile;
-+		png_charp icc_profile_title;
-+		png_bytep icc_profile;
- 		guint icc_profile_size;
- 		png_structp png_ptr = png_create_read_struct(
- 				PNG_LIBPNG_VER_STRING,
-@@ -125,11 +125,11 @@
- 
- 					int compression_type;
- 					/* Extract embedded ICC profile */
--					if (info_ptr->valid & PNG_INFO_iCCP)
-+					if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP))
- 					{
- 						png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr,
--													(png_charpp) &icc_profile_title, &compression_type,
--													(png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size);
-+													&icc_profile_title, &compression_type,
-+													&icc_profile, (png_uint_32*) &icc_profile_size);
- 						if (retval != 0)
- 						{
- 							RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE);
-diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c
---- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c	2011-03-26 04:52:29.000000000 +0300
-+++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c	2012-01-23 15:04:59.000000000 +0400
-@@ -23,6 +23,7 @@
- #include <gettext.h>
- #include "config.h"
- #include <png.h>
-+#include <zlib.h>
- 
- #define RS_TYPE_PNGFILE (rs_pngfile_type)
- #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile))
diff --git a/community-testing/rawstudio/rawstudio.install b/community-testing/rawstudio/rawstudio.install
deleted file mode 100644
index 261adb7b4..000000000
--- a/community-testing/rawstudio/rawstudio.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q || true
-}
-
-post_upgrade() {
-  update-desktop-database -q || true
-}
-
-post_remove() {
-  update-desktop-database -q || true
-}
diff --git a/community-testing/rss-glx/PKGBUILD b/community-testing/rss-glx/PKGBUILD
deleted file mode 100644
index fbc83a77d..000000000
--- a/community-testing/rss-glx/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 78814 2012-10-25 01:48:24Z ebelanger $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
-# Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au>
-
-pkgname=rss-glx
-pkgver=0.9.1
-pkgrel=12
-pkgdesc="The Really Slick Screensavers port to GLX"
-arch=('i686' 'x86_64')
-url="http://rss-glx.sourceforge.net/"
-license=('GPL')
-depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu')
-makedepends=('mesa')
-optdepends=('xscreensaver: xscreensaver integration')
-install=rss-glx.install
-options=('!libtool')
-source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2
-        rss-glx-desktops.tar.bz2)
-md5sums=('a772bd143cd8d141edf4d9eff9860ab3'
-         '4211215c9a4918b0dff30a7000647dd9')
-
-build() {
-  cd ${srcdir}/${pkgname}_${pkgver}
-
-  [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in)
-
-  ./configure --prefix=/usr \
-    --mandir=/usr/share/man \
-    --program-transform-name='s/plasma/plasma_rss/' \
-    --with-configdir=/usr/share/xscreensaver/config \
-    --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \
-    --enable-shared=yes --enable-static=no
-  make CFLAGS="$CFLAGS -I/usr/include/ImageMagick"
-}
-
-package() {
-  cd ${srcdir}/${pkgname}_${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # FS#18300
-  install -d ${pkgdir}/usr/lib/xscreensaver/
-  list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl)
-  for i in $list; do
-    ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/"
-  done
-
-  install -d ${pkgdir}/usr/share/applications/screensavers
-  install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers
-}
diff --git a/community-testing/rss-glx/rss-glx-desktops.tar.bz2 b/community-testing/rss-glx/rss-glx-desktops.tar.bz2
deleted file mode 100644
index 940fd5277..000000000
--- a/community-testing/rss-glx/rss-glx-desktops.tar.bz2
+++ /dev/null
diff --git a/community-testing/rss-glx/rss-glx.install b/community-testing/rss-glx/rss-glx.install
deleted file mode 100644
index 758642618..000000000
--- a/community-testing/rss-glx/rss-glx.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  cat << 'EOM'
-  --> If you want to integrate the RSS screen savers with xscreensaver
-  --> for your user, then install the xscreensaver package and launch
-  --> the command "rss-glx_install.pl"
-EOM
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/community-testing/rsyslog/PKGBUILD b/community-testing/rsyslog/PKGBUILD
deleted file mode 100644
index aa89ef596..000000000
--- a/community-testing/rsyslog/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 73254 2012-07-04 12:54:32Z dreisner $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=rsyslog
-pkgver=6.2.2
-pkgrel=2
-pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
-url="http://www.rsyslog.com/"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('zlib' 'libestr' 'libee')
-makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
-optdepends=('postgresql-libs: PostgreSQL Database Support'
-	    'libmysqlclient: MySQL Database Support'
-	    'net-snmp'
-	    'gnutls')
-backup=('etc/rsyslog.conf'
-	'etc/logrotate.d/rsyslog'
-	'etc/conf.d/rsyslog')
-options=('strip' 'zipman' '!libtool')
-source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
-	'rsyslog'
-	'rsyslog.logrotate'
-	'rsyslog.conf.d')
-md5sums=('b797b8222d6ea4d5dfa007efe8aafa7f'
-         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
-         '8065db4bef3061a4f000ba58779f6829'
-         '1a0cd4530dd5d1439456d5ae230574d9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --enable-mysql \
-              --enable-pgsql \
-              --enable-mail \
-              --enable-imfile \
-              --enable-imtemplate \
-              --enable-snmp \
-              --enable-gnutls \
-              --enable-inet \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system
-  echo "rsyslogd_LDADD += \$(LIBESTR_LIBS) -lm" >>tools/Makefile
-  make
-}
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make install DESTDIR=${pkgdir}
-  # Install Daemons and Configuration Files
-  install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d
-  install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
-  install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
-  install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
-
-  # fix location of systemctl and remove start precondition
-  sed -i "$pkgdir/usr/lib/systemd/system/rsyslog.service" \
-    -e 's@/bin/systemctl@/usr&@' \
-    -e '/^ExecStartPre/d'
-}
diff --git a/community-testing/rsyslog/rsyslog b/community-testing/rsyslog/rsyslog
deleted file mode 100644
index ee0145418..000000000
--- a/community-testing/rsyslog/rsyslog
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rsyslog
-
-PID=`pidof -o %PPID /usr/sbin/rsyslogd`
-case "$1" in
-  start)
-    stat_busy "Starting RSyslogd"
-    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping RSyslogd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/rsyslogd.pid
-      rm -f /var/rsyslogd.persist
-      rm_daemon rsyslogd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/rsyslog/rsyslog.conf.d b/community-testing/rsyslog/rsyslog.conf.d
deleted file mode 100644
index e39f8c3b9..000000000
--- a/community-testing/rsyslog/rsyslog.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Parameters to be passed to rsyslogd
-# This should almost certainly include at least the current compatability
-# level, e.g. -c4
-#
-RSYSLOGD_ARGS="-c4"
diff --git a/community-testing/rsyslog/rsyslog.logrotate b/community-testing/rsyslog/rsyslog.logrotate
deleted file mode 100644
index 76306c560..000000000
--- a/community-testing/rsyslog/rsyslog.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
-    missingok
-    sharedscripts
-    postrotate
-	/usr/bin/killall -HUP /usr/sbin/rsyslogd
-    endscript
-}
diff --git a/community-testing/sage-mathematics/PKGBUILD b/community-testing/sage-mathematics/PKGBUILD
deleted file mode 100644
index b6483c6e0..000000000
--- a/community-testing/sage-mathematics/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# $Id: PKGBUILD 75170 2012-08-14 16:00:21Z dwallace $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
-# Contributor: 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=5.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')
-license=('GPL')
-#depends=('readline')
-makedepends=('gcc-fortran' 'desktop-file-utils')
-optdepends=('imagemagick: some plotting functionality benefits from it'
-            'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
-            'openssh: to use the notebook in secure mode'
-            'ffmpeg: to show animations'
-            'jsmath-fonts: native TeX fonts for the notebook')
-options=('!makeflags')
-install="${pkgname}.install"
-source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        'SAGE-notebook.desktop')
-
-build() {
-  cd sage-${pkgver}
-
-  # 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 -dpr --no-preserve=ownership * ${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/*.log
-  rm -rf ${pkgdir}/opt/sage/spkg/logs
-
-  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
-  rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
-  rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
-}
-
-# vim :set ts=2 sw=2 et:
-md5sums=('59f55ec8cdd1ca595c56cc72620b3576'
-         'dc391f12b7d17dd37326343ec0e99bbd')
diff --git a/community-testing/sage-mathematics/SAGE-notebook.desktop b/community-testing/sage-mathematics/SAGE-notebook.desktop
deleted file mode 100644
index 26a35d3ac..000000000
--- a/community-testing/sage-mathematics/SAGE-notebook.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=SAGE
-Comment=SAGE NOTEBOOK
-Comment[en_US]=SAGE NOTEBOOK
-Exec=/opt/sage/sage -notebook
-GenericName=
-GenericName[de]=
-Icon=/opt/sage/data/extcode/notebook/images/sageicon.png
-MimeType=
-Name[de]=SAGE
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Science;Math;
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-GenericName[en_US]=
diff --git a/community-testing/sage-mathematics/sage-mathematics.install b/community-testing/sage-mathematics/sage-mathematics.install
deleted file mode 100644
index 6caa5299e..000000000
--- a/community-testing/sage-mathematics/sage-mathematics.install
+++ /dev/null
@@ -1,56 +0,0 @@
-post_install() {
-  cd /opt/sage
-
-  # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership
-  # the files it writes to ~/.sage can be safely ignored
-  HOME=/tmp ./sage -c
-
-  # add sagemath user for the daemon
-  useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath
-
-  # Update LaTeX db to point to SageTeX
-  if [ -f /usr/bin/texhash ]; then
-    /usr/bin/texhash /usr/share/texmf
-  else
-    echo 'Warning: could not find /usr/bin/texhash'
-    echo 'SageTeX has been installed but you need to run:'
-    echo '# texhash /usr/share/texmf'
-    echo 'So that LaTeX will be able to find it.'
-  fi
-
-echo '
- ___                       
-/ (_)        o            |
-\__   _  _      __        |
-/    / |/ |  | /  \_|   | |
-\___/  |  |_/|/\__/  \_/|/o
-            /|         /|  
-            \|         \|  
- ________________________________ 
-< sage-mathematics, I mean, MOO! >
- -------------------------------- 
-        \   ^__^
-         \  (oo)\_______
-            (__)\       )\/\
-                ||----w |
-                ||     ||
-'
-
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  # Update LaTeX db to remove SageTeX entries
-  if [ -f /usr/bin/texhash ]; then
-    /usr/bin/texhash /usr/share/texmf
-  fi
-
-  # remove the sagemath daemon user
-  userdel sagemath
-
-  # clean up left overs
-  rm -rf /opt/sage
-}
diff --git a/community-testing/schroot/PKGBUILD b/community-testing/schroot/PKGBUILD
deleted file mode 100644
index 554f26fbf..000000000
--- a/community-testing/schroot/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 73773 2012-07-15 13:20:34Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
-
-pkgname=schroot
-pkgver=1.6.0
-pkgrel=1
-pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
-url="http://packages.qa.debian.org/s/schroot.html"
-license=('GPL3')
-depends=('pam' 'lockdev' 'boost' 'e2fsprogs')
-optdepends=('btrfs-progs-unstable' 'lvm2')
-arch=('i686' 'x86_64')
-conflicts=('dchroot')
-replaces=('dchroot')
-provides=('schroot' 'sbuild' 'dchroot')
-backup=('etc/schroot/schroot.conf'
-	'etc/schroot/arch32/config'
-	'etc/schroot/arch32/copyfiles'
-	'etc/schroot/arch32/mount'
-	'etc/schroot/arch32/nssdatabases')
-options=(!libtool)
-source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}.orig.tar.xz"
-	'pam.d.schroot.patch'
-	'arch32-example'
-	'arch32-config'
-	'arch32-copyfiles'
-	'arch32-mount'
-	'arch32-nssdatabases')
-md5sums=('9b0a12077dbb0e3e384b4c9af0dc3195'
-         'a8d77cac806a0a9adef3f93cdbeb280a'
-         '1e34db5387c4e5de911e15d8a9208bdb'
-         '5a3f7b839c7e0b8933748da7c5b6385b'
-         '06db41d42f9fce5449a28feb76ded556'
-         'f0d5d5b5e34a860f6f90b5628c680f46'
-         'af1da6edd8c8c0dafeeb2c2c4e0c840b')
-
-build() {
-	cd ${pkgname}-${pkgver}
-	export LDFLAGS="${LDFLAGS//-Wl,--as-needed}"
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-dchroot \
-		--enable-lvm-snapshot \
-		--enable-btrfs-snapshot \
-		--with-bash-completion-dir=/usr/share/bash-completion/completions/ \
-		BTRFS=/sbin/btrfs \
-		BTRFSCTL=/sbin/btrfsctl \
-		LVCREATE=/sbin/lvcreate \
-		LVREMOVE=/sbin/lvremove
-		# --enable-csbuild
-	make
-}
-
-check() {
-	cd ${pkgname}-${pkgver}
-	make -k check
-}
-
-package() {
-	cd ${pkgname}-${pkgver}
-	make DESTDIR=$pkgdir install
-	install -dm 755 ${pkgdir}/etc/schroot/arch32
-	install -m 644 ${srcdir}/arch32-{config,mount,copyfiles,nssdatabases} ${pkgdir}/etc/schroot/arch32
-	rename 'arch32-' '' ${pkgdir}/etc/schroot/arch32/*
-	install -m 644 ${srcdir}/arch32-example ${pkgdir}/etc/schroot/chroot.d/arch32.conf.example
-	patch -i ${srcdir}/pam.d.schroot.patch ${pkgdir}/etc/pam.d/schroot
-}
diff --git a/community-testing/schroot/arch32-config b/community-testing/schroot/arch32-config
deleted file mode 100644
index 0ee72d522..000000000
--- a/community-testing/schroot/arch32-config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Default settings for chroot setup and exec scripts.
-# See schroot-script-config(5) for further details.
-
-# Filesystems to mount inside the chroot.
-FSTAB="/etc/schroot/arch32/mount"
-
-# Files to copy from the host system into the chroot.
-COPYFILES="/etc/schroot/arch32/copyfiles"
-
-# System databases to copy into the chroot
-NSSDATABASES="/etc/schroot/arch32/nssdatabases"
diff --git a/community-testing/schroot/arch32-copyfiles b/community-testing/schroot/arch32-copyfiles
deleted file mode 100644
index 88f093ceb..000000000
--- a/community-testing/schroot/arch32-copyfiles
+++ /dev/null
@@ -1,7 +0,0 @@
-/etc/group
-/etc/hosts
-/etc/passwd
-/etc/resolv.conf
-/etc/rc.conf
-/etc/localtime
-/etc/locale.gen
diff --git a/community-testing/schroot/arch32-example b/community-testing/schroot/arch32-example
deleted file mode 100644
index 3f059e3c0..000000000
--- a/community-testing/schroot/arch32-example
+++ /dev/null
@@ -1,10 +0,0 @@
-[arch32]
-description=Arch32
-type=directory
-directory=/opt/arch32
-#users=username
-groups=users
-root-groups=root
-script-config=arch32/config
-personality=linux32
-#aliases=32,i686
diff --git a/community-testing/schroot/arch32-mount b/community-testing/schroot/arch32-mount
deleted file mode 100644
index 075d6e451..000000000
--- a/community-testing/schroot/arch32-mount
+++ /dev/null
@@ -1,12 +0,0 @@
-# mount.defaults: static file system information for chroots.
-# Note that the mount point will be prefixed by the chroot path
-# (CHROOT_PATH)
-#
-# <file system>	<mount point>	<type>	<options>	<dump>	<pass>
-proc		/proc		proc	defaults	0	0
-/dev		/dev		none	rw,bind		0	0
-#/dev/pts	/dev/pts	none	rw,bind		0	0
-tmpfs		/dev/shm	tmpfs	defaults	0	0
-/sys		/sys		none	rw,bind		0	0
-/tmp		/tmp		none	rw,bind		0	0
-/home		/home		none	rw,bind		0	0
diff --git a/community-testing/schroot/arch32-nssdatabases b/community-testing/schroot/arch32-nssdatabases
deleted file mode 100644
index 815ddce3f..000000000
--- a/community-testing/schroot/arch32-nssdatabases
+++ /dev/null
@@ -1,6 +0,0 @@
-# System databases to copy into the chroot from the host system.
-#
-# <database name>
-passwd
-shadow
-group
diff --git a/community-testing/schroot/pam.d.schroot.patch b/community-testing/schroot/pam.d.schroot.patch
deleted file mode 100644
index 528acb5f7..000000000
--- a/community-testing/schroot/pam.d.schroot.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-@@ -23,13 +23,6 @@
- # time restrainst on schroot usage.
- # account    requisite  pam_time.so
- 
--# The standard Unix authentication modules, used with
--# NIS (man nsswitch) as well as normal /etc/passwd and
--# /etc/shadow entries.
--@include common-auth
--@include common-account
--@include common-session
--
- # Sets up user limits, please uncomment and read /etc/security/limits.conf
- # to enable this functionality.
- # session    required   pam_limits.so
-
diff --git a/community-testing/scorched3d/PKGBUILD b/community-testing/scorched3d/PKGBUILD
deleted file mode 100644
index 0ae9d7dcb..000000000
--- a/community-testing/scorched3d/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Seppo Porspakka <sporspak@paju.oulu.fi>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
- 
-pkgname=scorched3d
-pkgver=43.3.d
-_pkgver=43.3d
-pkgrel=4
-pkgdesc="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' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils')
-makedepends=('gendesk' 'mesa')
-install=scorched3d.install
-source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz"
-        'scorched3d.png::http://cdn.portableapps.com/Scorched3DPortable_128.png'
-        'scorched3d-42.1-gcc43.patch'
-        'scorched3d-42.1-fixups.patch'
-        'scorched3d-libpng1.5.patch'
-        'libpng14.patch')
-md5sums=('9c3043282a9e7451468ff325bef3b04c'
-         '0f7e570f586c227873e909ebbc17c84d'
-         '053769f77a38c252eef1d967b18e93e6'
-         'dfde556559d95bca07c4a390c60790b4'
-         'ec6958191751b5a2c44aa15abfc75269'
-         'c8c03855fd3693122fd39427fa3638c1')
-
-build() {
-  cd "$srcdir/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 '1 i #include <unistd.h>' src/client/client/SecureID.cpp
-  #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 "$srcdir"
-  gendesk
-
-  cd scorched
-  make DESTDIR=${pkgdir} install
-  cd ..
-
-  install -D -m644 scorched3d.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.png"
-  install -D -m644 scorched3d.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-  install -D -m644 scorched3d.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-}
diff --git a/community-testing/scorched3d/libpng14.patch b/community-testing/scorched3d/libpng14.patch
deleted file mode 100644
index 7a5a9434c..000000000
--- a/community-testing/scorched3d/libpng14.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/common/image/ImagePng.cpp	2009-02-23 04:14:20.000000000 +0100
-+++ src/common/image/ImagePng.cpp_patched	2010-01-24 22:01:04.000000000 +0100
-@@ -189,7 +189,7 @@
- 	info_ptr = png_create_info_struct(png_ptr);

- 	if (info_ptr == NULL)

- 	{

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

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

- 	  return false;

- 	}

- 

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

- 	{

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

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

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

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

- 	  return false;

- 	}

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

- 	else

- 	{

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

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

- 

- 		Logger::log(S3D::formatStringBuffer(

- 			"Invalid PNG format.\n"

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

- 

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

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

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

- 

- 	/* that's it */

- 	return true;

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

- {

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

--	std::exit(1);

-+	exit(1);

- }

- 

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

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

- typedef unsigned char   BYTE;

- 

--typedef int 	HWND;

-+// typedef int 	HWND;

- typedef void * 	HINSTANCE;

- typedef int 	WPARAM;

- typedef int 	LPARAM;

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

- static void user_png_error(png_structp png_ptr, png_const_charp msg) 

- {

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

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

- }

- 

- static void user_png_warning(png_structp png_ptr, png_const_charp msg) 

---- ./src/client/client/LoadPNG.cpp.old	2011-09-12 12:45:49.167380419 +0200
-+++ ./src/client/client/LoadPNG.cpp	2011-09-12 14:11:14.961772024 +0200
-@@ -28,6 +28,8 @@
- 	int row, i;
- 	volatile int ckey = -1;
- 	png_color_16 *transv;
-+	png_colorp  png_palette;
-+	int         num_palette;
- 
- 	if ( !src ) {
- 		/* The error message has been set in SDL_RWFromFile */
-@@ -58,7 +60,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if ( setjmp(png_ptr->jmpbuf) ) {
-+	if ( setjmp(png_jmpbuf(png_ptr)) ) {
- 		error = "Error reading the PNG file.";
- 		goto done;
- 	}
-@@ -127,9 +129,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--		        int s = (info_ptr->channels == 4) ? 0 : 8;
-+		        int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -137,7 +139,7 @@
- 		}
- 	}
- 	surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
--			bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask);
-+			bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask);
- 	if ( surface == NULL ) {
- 		error = "Out of memory";
- 		goto done;
-@@ -185,12 +187,15 @@
- 		    palette->colors[i].g = i;
- 		    palette->colors[i].b = i;
- 		}
--	    } else if (info_ptr->num_palette > 0 ) {
--		palette->ncolors = info_ptr->num_palette; 
--		for( i=0; i<info_ptr->num_palette; ++i ) {
--		    palette->colors[i].b = info_ptr->palette[i].blue;
--		    palette->colors[i].g = info_ptr->palette[i].green;
--		    palette->colors[i].r = info_ptr->palette[i].red;
-+	    } else {
-+	    	png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette);
-+	    	if (num_palette > 0 ) {
-+			palette->ncolors = num_palette; 
-+			for( i=0; i<num_palette; ++i ) {
-+			    palette->colors[i].b = png_palette[i].blue;
-+			    palette->colors[i].g = png_palette[i].green;
-+			    palette->colors[i].r = png_palette[i].red;
-+			}
- 		}
- 	    }
- 	}
diff --git a/community-testing/scorched3d/scorched3d.install b/community-testing/scorched3d/scorched3d.install
deleted file mode 100644
index c5571196e..000000000
--- a/community-testing/scorched3d/scorched3d.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
diff --git a/community-testing/sdcc/PKGBUILD b/community-testing/sdcc/PKGBUILD
deleted file mode 100644
index 378727faa..000000000
--- a/community-testing/sdcc/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 78121 2012-10-16 11:54:21Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Jose Negron <josenj.arch@mailnull.net>
-
-pkgname=sdcc
-pkgver=3.2.0
-pkgrel=2
-pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('bash' 'gcc-libs' 'boost-libs')
-makedepends=('gputils' 'flex' 'bison' 'patch' 'boost')
-optdepends=('python')
-url="http://sdcc.sourceforge.net/"
-options=(!strip)
-source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2)
-md5sums=('0808a9b4109d2ba6046ddd7b679a0012')
-
-build() {
-  cd $srcdir/$pkgname
-  ./configure \
-	--prefix=/usr \
-	--includedir=/usr/include/sdcc \
-	--libdir=/usr/lib/sdcc
-  make
-  make install DESTDIR=$pkgdir
-
-  if [ -d $pkgdir/usr/lib/lib ]; then
-    mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/
-    rm -rf $pkgdir/usr/lib/lib
-  fi
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' $pkgdir/usr/bin/as2gbmap
-}
diff --git a/community-testing/sfml/PKGBUILD b/community-testing/sfml/PKGBUILD
deleted file mode 100644
index 175d73029..000000000
--- a/community-testing/sfml/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 78815 2012-10-25 01:48:29Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Ondrej Martinak <omartinak@gmail.com>
-
-pkgname=sfml
-pkgver=2.0rc1
-pkgrel=3
-pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
-arch=('i686' 'x86_64')
-url='http://www.sfml-dev.org/'
-license=('zlib')
-depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
-makedepends=('mesa' 'cmake' 'doxygen')
-install=sfml.install
-source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc")
-md5sums=('03c8e6817f4525092b94a3d44e8eada8')
-
-build() {
-  cd "$srcdir"/Laurent*
-
-  mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
-        -DBUILD_DOC=true \
-        -DBUILD_EXAMPLES=true
-  make
-  make doc
-}
-
-package() {
-  cd "$srcdir"/Laurent*/build
-
-  make DESTDIR="$pkgdir/" install
-
-  install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake"
-
-  install -Dm644 ../license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
diff --git a/community-testing/sfml/sfml.install b/community-testing/sfml/sfml.install
deleted file mode 100644
index 75f760be6..000000000
--- a/community-testing/sfml/sfml.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_install() {
-    echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually"
-}
diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD
deleted file mode 100644
index d8c81738d..000000000
--- a/community-testing/shotwell/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 78460 2012-10-18 22:34:19Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
-
-pkgname=shotwell
-pkgver=0.13.1
-pkgrel=1
-pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
-arch=('i686' 'x86_64')
-url="http://yorba.org/shotwell/"
-license=('LGPL2.1')
-depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest'
-	 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib')
-makedepends=('intltool' 'vala>=0.17.2')
-install=shotwell.install
-source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz")
-md5sums=('71eb1346093705ca2b37c12a21994d14')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-	--disable-schemas-compile \
-	--disable-desktop-update \
-	--disable-icon-update
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/shotwell/shotwell.install b/community-testing/shotwell/shotwell.install
deleted file mode 100644
index bab8ecd29..000000000
--- a/community-testing/shotwell/shotwell.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=shotwell
-
-post_install() {
-  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-  update-desktop-database -q
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/community-testing/skrooge/PKGBUILD b/community-testing/skrooge/PKGBUILD
deleted file mode 100644
index 6f324c2b3..000000000
--- a/community-testing/skrooge/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 74953 2012-08-10 05:05:01Z ebelanger $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Ray Rashif <schiv@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com>
-
-pkgname=skrooge
-pkgver=1.3.0
-pkgrel=2
-pkgdesc="A personal finances manager for KDE"
-arch=('i686' 'x86_64')
-url="http://skrooge.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'libofx' 'qca-ossl')
-makedepends=('cmake' 'automoc4' 'docbook-xsl')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7f8ec247084a005b743bb080ded5724f6c1ee3644c135e12002c80df93fddfe9')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
-
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/skrooge/skrooge.changelog b/community-testing/skrooge/skrooge.changelog
deleted file mode 100644
index ffc491ba5..000000000
--- a/community-testing/skrooge/skrooge.changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-2012-08-09  Eric Belanger  <eric@archlinux.org>
-	* skrooge 1.3.0-2 Rebuild against libofx 0.9.5
-
-2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* skrooge 1.3.0-1
-
-2012-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* skrooge 1.2.0-1
-
-2011-11-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-	* skrooge 1.1.1-1
diff --git a/community-testing/skrooge/skrooge.install b/community-testing/skrooge/skrooge.install
deleted file mode 100644
index 050474c59..000000000
--- a/community-testing/skrooge/skrooge.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database -q
-  kbuildsycoca4 &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/smc/PKGBUILD b/community-testing/smc/PKGBUILD
deleted file mode 100644
index c16b4ef68..000000000
--- a/community-testing/smc/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 77259 2012-10-08 12:29:17Z lcarlier $
-# Maintainer:
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Kritoke <typeolinux@yahoo.com>
-
-pkgname=smc
-pkgver=1.9
-pkgrel=17.1
-pkgdesc="Secret Maryo Chronicles"
-arch=('i686' 'x86_64')
-url="http://www.secretmaryo.org/"
-license=('GPL3')
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
-makedepends=('autoconf' 'automake' 'boost')
-source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2
-        smc-for-cegui-v0-7.diff
-        boost_filesystem3.diff
-        smc.desktop
-        smc.png)
-md5sums=('75ab7826303c49aec25b052a8b90287f'
-         '51dfea21b741ad19df14e738df52f1cf'
-         '309a5a6d4b3c0b3dc5e1b7f4de84086f'
-         '80fe208132ff41dd7677a53ee429ecdb'
-         'efca7580e28748625eb676c9d24ee122')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # to remove when smc will be compatible with cegui-0.7.x
-  patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff"
-  # fix compilation
-  export CXXFLAGS="${CXXFLAGS} -fpermissive"
-  # fix for boost >= 1.50
-  patch -Np1 -i "${srcdir}/boost_filesystem3.diff"
-
-  ./autogen.sh
-  LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make install DESTDIR="$pkgdir"
-  # install some freedesktop.org compatibility
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  rm -rf "$pkgdir/usr/share/smc/"
-}
diff --git a/community-testing/smc/boost_filesystem3.diff b/community-testing/smc/boost_filesystem3.diff
deleted file mode 100644
index 6786b98f5..000000000
--- a/community-testing/smc/boost_filesystem3.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rup smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new/src/core/filesystem/filesystem.cpp
---- smc-1.9/src/core/filesystem/filesystem.cpp	2009-07-04 12:11:18.000000000 +0200
-+++ smc-1.9.new/src/core/filesystem/filesystem.cpp	2012-07-12 15:36:31.361941069 +0200
-@@ -142,27 +142,27 @@ vector<std::string> Get_Directory_Files(
- 			if( fs::is_directory( *dir_itr ) )
- 			{
- 				// ignore hidden directories
--				if( dir_itr->path().leaf().find( "." ) == 0 )
-+				if( dir_itr->path().filename().string().find( "." ) == 0 )
- 				{
- 					continue;
- 				}
- 
- 				if( with_directories )
- 				{
--					valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+					valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 				}
- 
- 				// load all items from the sub-directory
- 				if( search_in_sub_directories )
- 				{
--					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories );
-+					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories );
- 					valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
- 				}
- 			}
- 			// valid file
--			else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos )
-+			else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos )
- 			{
--				valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+				valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 			}
- 		}
- 		catch( const std::exception &ex )
-diff -rup smc-1.9/src/overworld/world_manager.cpp smc-1.9.new/src/overworld/world_manager.cpp
---- smc-1.9/src/overworld/world_manager.cpp	2009-08-16 18:44:52.000000000 +0200
-+++ smc-1.9.new/src/overworld/world_manager.cpp	2012-07-12 15:37:13.564660591 +0200
-@@ -118,7 +118,7 @@ void cOverworld_Manager :: Load_Dir( con
- 	{

- 		try

- 		{

--			std::string current_dir = dir_itr->path().leaf();

-+			std::string current_dir = dir_itr->path().filename().string();

- 

- 			// only directories with an existing description

- 			if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )

diff --git a/community-testing/smc/smc-for-cegui-v0-7.diff b/community-testing/smc/smc-for-cegui-v0-7.diff
deleted file mode 100644
index a99cbce6c..000000000
--- a/community-testing/smc/smc-for-cegui-v0-7.diff
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
---- smc-1.9/configure.ac	2009-08-17 15:59:00.000000000 +0200
-+++ smc-1.9-b/configure.ac	2011-01-19 00:43:37.809884881 +0100
-@@ -53,7 +53,7 @@
- 	AC_MSG_ERROR([SDL_ttf library not found]))
- 
- # Check for the CEGUI library
--PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
-+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
- CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
- LIBS="$LIBS $CEGUI_LIBS"
- 
-diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
---- smc-1.9/src/core/editor.cpp	2009-08-13 17:11:42.000000000 +0200
-+++ smc-1.9-b/src/core/editor.cpp	2011-01-19 00:44:46.734328121 +0100
-@@ -118,16 +118,10 @@
- 	return tmp;

- }

- 

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

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

- {

- 	// draw text

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

--}

--

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

--{

--	// draw text

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

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

- }

- 

- void cEditor_Item_Object :: Draw_Image( void )

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

- 	{

- 		// Listbox dimension

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

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

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

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

- 		// Vertical ScrollBar Position

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

- 		// font height

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

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

- 

- 		// draw items

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

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

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

- 	// draw

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

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

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

- 	// draw image

- 	void Draw_Image( void );

- 

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

- 

- 	// align text

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

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

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

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

- 

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

- 

- 	// align text

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

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

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

- 

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

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

- 

- 	// set window height

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

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

- 

- 	while( draw )

- 	{

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

- 

- 		// update position

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

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

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

- 

- 		if( text_width > 800.0f )

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

- void cMouseCursor :: Render( void ) const

- {

--	if( !m_active )

--	{

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

-+

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

- 		return;

--	}

- 

--	// Render CEGUI Mouse

--	pGuiRenderer->setQueueingEnabled( 0 );

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

--	mouse->setVisible( 1 );

--	mouse->draw();

--	mouse->setVisible( 0 );

-+	mouse->setVisible( m_active );

- }

- 

- void cMouseCursor :: Update_Position( void )

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

- 	// preview window

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

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

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

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

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

- 

- 	Update_BG_Colors( CEGUI::EventArgs() );

- 

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

- 	// set default rect

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

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

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

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

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

- 

- 	if( !File_Exists( filename ) )

- 	{

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

- 	window_name->setTooltipText( tooltip );

- 	// get text width

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

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

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

- 	// all names should have the same width

- 	if( text_width > m_editor_window_name_width )

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

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

- 

--cFake_Renderer :: cFake_Renderer( void )

--{

--	d_identifierString = "Fake Renderer";

--}

-+//cFake_Renderer :: cFake_Renderer( void )

-+//{

-+//	d_identifierString = "Fake Renderer";

-+//}

- 

--cFake_Renderer :: ~cFake_Renderer( void )

--{

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

-+//{

- 

--}

-+//}

- 

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

- 

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

- #endif

- 	// create fake system and renderer

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

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

- }

- 

- void cVideo :: Delete_CEGUI_Fake( void ) const

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

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

- 

--	delete pGuiSystem;

-+	pGuiSystem->destroy();

- 	pGuiSystem = NULL;

- 	delete renderer;

- 	delete rp;

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

- 	try

- 	{

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

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

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

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

- 	}

- 

--	/* create Resource Provider

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

--	*/

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

-+	pGuiRenderer->enableExtraStateSettings(true);

-+

-+	// create Resource Provider

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

- 

- 	// set Resource Provider directories

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

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

- 	try

- 	{

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

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

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

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

- 	try

- 	{

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

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

- 	}

- 	// catch CEGUI Exceptions

- 	catch( CEGUI::Exception &ex )

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

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

- 	// force new mouse image

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

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

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

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

- 	// default tooltip

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

- 	// create default root window

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

- 

- 		// send new size to CEGUI

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

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

- 

- 		// check if CEGUI is initialized

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

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

- // CEGUI

- #include "CEGUI.h"

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

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

- 

- namespace SMC

- {

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

- };

- 

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

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

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

-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer

-+{

-+	void draw() const {}

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

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

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

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

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

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

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

-+	void reset() {}

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

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

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

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

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

-+};

- 

--class cFake_Renderer : public CEGUI::Renderer

-+class cFake_Texture : public CEGUI::Texture

-+{

-+public:

-+	cFake_Texture() :

-+	  m_size(1, 1),

-+	  m_scaling(1, 1) {}

-+

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

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

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

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

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

-+	void saveToMemory(void*) {}

-+

-+private:

-+	CEGUI::Size m_size;

-+	CEGUI::Vector2 m_scaling;

-+};

-+

-+class cFake_RenderTarget : public CEGUI::RenderTarget

- {

- public:

--	cFake_Renderer( void );

--	virtual ~cFake_Renderer( void );

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

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

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

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

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

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

-+	void activate() {}

-+	void deactivate() {}

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

-+

-+private:

-+	CEGUI::Rect m_area;

-+};

- 

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

--	virtual	void doRender(void) {};

--	virtual	void clearRenderList(void) {};

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

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

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

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

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

--	virtual void destroyAllTextures(void) {};

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

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

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

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

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

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

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

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

-+class cFake_Renderer : public CEGUI::Renderer

-+{

-+public:

-+	cFake_Renderer( void ) :

-+	  m_size(0, 0),

-+	  m_dpi(0, 0),

-+	  m_identifierString("Fake Renderer"),

-+	  m_root(m_target) {}

-+	~cFake_Renderer( void ) {}

-+

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

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

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

-+	void destroyAllGeometryBuffers() {}

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

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

-+	void destroyAllTextureTargets() {}

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

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

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

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

-+	void destroyAllTextures() {}

-+	void beginRendering() {}

-+	void endRendering() {}

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

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

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

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

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

-+

-+private:

-+	CEGUI::Size m_size;

-+	CEGUI::Vector2 m_dpi;

-+	CEGUI::String m_identifierString;

-+	cFake_GeometryBuffer m_geometry;

-+	cFake_Texture m_texture;

-+	cFake_RenderTarget m_target;

-+	CEGUI::RenderingRoot m_root;

- };

- 

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

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

-Name=Secret Maryo Chronicles

-GenericName=Arcade Game

-Exec=smc

-Icon=smc.png

-Terminal=false

-Type=Application

-Categories=Game;ArcadeGame;KidsGame;

-StartupNotify=false
\ No newline at end of file
diff --git a/community-testing/smc/smc.png b/community-testing/smc/smc.png
deleted file mode 100644
index f02af1bfc..000000000
--- a/community-testing/smc/smc.png
+++ /dev/null
diff --git a/community-testing/soundkonverter/PKGBUILD b/community-testing/soundkonverter/PKGBUILD
deleted file mode 100644
index 91d78cbfc..000000000
--- a/community-testing/soundkonverter/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 74664 2012-08-01 16:57:51Z andrea $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-
-pkgname=soundkonverter
-pkgver=1.6.3
-pkgrel=2
-pkgdesc="Front-end to various audio converters"
-arch=('i686' 'x86_64')
-url="http://www.kde-apps.org/content/show.php?content=29024"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib')
-makedepends=('automoc4' 'cmake')
-optdepends=('cdrkit: cdda2wav backend'
-            'faac: faac backend'
-            'faad2: faad backend'
-            'ffmpeg: ffmpeg backend'
-            'flac: flac backend'
-            'fluidsynth: flouidsynth backend'
-            'lame: lame backend'
-            'mac: mac backend'
-            'mplayer: mplayer backend'
-            'mp3gain: mp3gain backend'
-            'speex: speexenc, speexdec backends'
-            'timidity++: midi backend'
-            'twolame: twolame backend'
-            'vorbisgain: vorbisgain backend'
-            'vorbis-tools: vorbis tools backend'
-            'wavpack: wavpack backend')
-install=$pkgname.install
-source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz")
-md5sums=('f617d9b73937d4576bc21fd359f4964b')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/soundkonverter/soundkonverter.install b/community-testing/soundkonverter/soundkonverter.install
deleted file mode 100644
index 0e8feb79c..000000000
--- a/community-testing/soundkonverter/soundkonverter.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
diff --git a/community-testing/spring/PKGBUILD b/community-testing/spring/PKGBUILD
deleted file mode 100644
index da285bce3..000000000
--- a/community-testing/spring/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 78816 2012-10-25 01:48:36Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=0.91.0
-_pkgver=91.0
-pkgrel=3
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
-url="http://springrts.com/"
-license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
-         'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
-optdepends=('python2: python-based bots'
-            'java-runtime: java-based bots')
-install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('8849ace38f2ae20dc100b9d0a8d743e9')
-
-build() {
-  bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
-  
-  cd spring_${_pkgver}
-
-  sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h
- 
-  cmake	. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES
-  make
-}
-
-package() {
-  cd spring_${_pkgver}
-
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/etc/spring"
-  echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir"
-}
-
-# vim sw=2:ts=2 et:
diff --git a/community-testing/spring/boost-1.50.patch b/community-testing/spring/boost-1.50.patch
deleted file mode 100644
index f8a8b5695..000000000
--- a/community-testing/spring/boost-1.50.patch
+++ /dev/null
@@ -1,2539 +0,0 @@
-diff -ru spring_89.0/rts/Game/Camera/CameraController.cpp /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp
---- spring_89.0/rts/Game/Camera/CameraController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -59,7 +59,7 @@
- bool CCameraController::GetUseDistToGroundForIcons() {
- 
- 	const float3& dir     = GetDir().UnsafeNormalize();
--	const float dot       = std::min(1.0f, std::max(0.0f, fabs(dir.dot(UpVector))));
-+	const float dot       = std::min(1.0f, std::max(0.0f, math::fabs(dir.dot(UpVector))));
- 
- 	if (dot < switchVal) {
- 		// flat angle (typical for first person camera)
-diff -ru spring_89.0/rts/Game/Camera/FPSController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp
---- spring_89.0/rts/Game/Camera/FPSController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -80,9 +80,9 @@
- 		oldHeight = pos.y - gndHeight;
- 	}
- 
--	dir.x = (float)(cos(camera->rot.x) * sin(camera->rot.y));
--	dir.z = (float)(cos(camera->rot.x) * cos(camera->rot.y));
--	dir.y = (float)(sin(camera->rot.x));
-+	dir.x = (float)(math::cos(camera->rot.x) * math::sin(camera->rot.y));
-+	dir.z = (float)(math::cos(camera->rot.x) * math::cos(camera->rot.y));
-+	dir.y = (float)(math::sin(camera->rot.x));
- 	dir.ANormalize();
- }
- 
-diff -ru spring_89.0/rts/Game/Camera/FreeController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp
---- spring_89.0/rts/Game/Camera/FreeController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -51,9 +51,9 @@
- 	dir = float3(0.0f, -2.0f, -1.0f);
- 	dir.ANormalize();
- 	if (camera) {
--		const float hDist = sqrt((dir.x * dir.x) + (dir.z * dir.z));
--		camera->rot.y = atan2(dir.x, dir.z);
--		camera->rot.x = atan2(dir.y, hDist);
-+		const float hDist = math::sqrt((dir.x * dir.x) + (dir.z * dir.z));
-+		camera->rot.y = math::atan2(dir.x, dir.z);
-+		camera->rot.x = math::atan2(dir.y, hDist);
- 	}
- 	pos -= (dir * 1000.0f);
- 
-@@ -84,14 +84,14 @@
- 
- 	// lock the view direction to the target
- 	const float3 diff(trackPos - pos);
--	const float rads = atan2(diff.x, diff.z);
-+	const float rads = math::atan2(diff.x, diff.z);
- 	camera->rot.y = rads;
- 
- 	const float len2D = diff.Length2D();
--	if (fabs(len2D) <= 0.001f) {
-+	if (math::fabs(len2D) <= 0.001f) {
- 		camera->rot.x = 0.0f;
- 	} else {
--		camera->rot.x = atan2((trackPos.y - pos.y), len2D);
-+		camera->rot.x = math::atan2((trackPos.y - pos.y), len2D);
- 	}
- 
- 	camera->UpdateForward();
-@@ -130,11 +130,11 @@
- 		if (pos.y < (gndHeight + gndOffset + 1.0f)) {
- 			float3 hDir;
- 			hDir.y = 0.0f;
--			hDir.x = (float)sin(camera->rot.y);
--			hDir.z = (float)cos(camera->rot.y);
-+			hDir.x = (float)math::sin(camera->rot.y);
-+			hDir.z = (float)math::cos(camera->rot.y);
- 			const float3 gndNormal = ground->GetSmoothNormal(pos.x, pos.z, false);
- 			const float dot = gndNormal.dot(hDir);
--			const float gndRotX = (float)acos(dot) - (PI * 0.5f);
-+			const float gndRotX = (float)math::acos(dot) - (PI * 0.5f);
- 			const float rotXdiff = (gndRotX - camera->rot.x);
- 			autoTiltVel = (autoTilt * rotXdiff);
- 		}
-@@ -214,8 +214,8 @@
- 		// convert the angular velocity into its positional change
- 		const float3 diff2 = (pos - trackPos);
- 		const float deltaRad = (avel.y * ft);
--		const float cos_val = cos(deltaRad);
--		const float sin_val = sin(deltaRad);
-+		const float cos_val = math::cos(deltaRad);
-+		const float sin_val = math::sin(deltaRad);
- 		pos.x = trackPos.x + ((cos_val * diff2.x) + (sin_val * diff2.z));
- 		pos.z = trackPos.z + ((cos_val * diff2.z) - (sin_val * diff2.x));
- 	}
-@@ -246,7 +246,7 @@
- 		if (pos.y < minHeight) {
- 			pos.y = minHeight;
- 			if (gndLock) {
--				vel.y = min(fabs(scrollSpeed), ((minHeight - prevPos.y) / ft));
-+				vel.y = min(math::fabs(scrollSpeed), ((minHeight - prevPos.y) / ft));
- 			} else {
- 				vel.y = 0.0f;
- 			}
-@@ -263,7 +263,7 @@
- 		camera->rot.x = -xRotLimit;
- 		avel.x = 0.0f;
- 	}
--	camera->rot.y = fmod(camera->rot.y, PI * 2.0f);
-+	camera->rot.y = math::fmod(camera->rot.y, PI * 2.0f);
- 
- 	// setup for the next loop
- 	prevVel  = vel;
-@@ -277,9 +277,9 @@
- float3 CFreeController::GetDir() const
- {
- 	float3 dir;
--	dir.x = (float)(sin(camera->rot.y) * cos(camera->rot.x));
--	dir.z = (float)(cos(camera->rot.y) * cos(camera->rot.x));
--	dir.y = (float)(sin(camera->rot.x));
-+	dir.x = (float)(math::sin(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.z = (float)(math::cos(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.y = (float)(math::sin(camera->rot.x));
- 	dir.ANormalize();
- 	return dir;
- }
-@@ -373,7 +373,7 @@
- 	if ((yDiff * dir.y) >= 0.0f) {
- 		pos = float3(newPos.x, h, newPos.z);
- 	} else {
--		pos = target - (dir * fabs(yDiff / dir.y));
-+		pos = target - (dir * math::fabs(yDiff / dir.y));
- 	} // FIXME
- /*
- 	const float oldPosY = pos.y;
-diff -ru spring_89.0/rts/Game/Camera/OrbitController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp
---- spring_89.0/rts/Game/Camera/OrbitController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -51,8 +51,8 @@
- 	const float3 w = (v / v.Length()); // do not normalize v in-place
- 
- 	const float d = v.Length();
--	const float e = RAD2DEG(acos(v.Length2D() / d));
--	const float r = RAD2DEG(acos(w.x));
-+	const float e = RAD2DEG(math::acos(v.Length2D() / d));
-+	const float r = RAD2DEG(math::acos(w.x));
- 
- 	distance  = cDistance = d;
- 	elevation = cElevation = e;
-@@ -251,12 +251,12 @@
- 	float tx = cx;
- 
- 	tx = cx;
--	cx = cx * cos(beta) + cy * sin(beta);
--	cy = tx * sin(beta) + cy * cos(beta);
-+	cx = cx * math::cos(beta) + cy * math::sin(beta);
-+	cy = tx * math::sin(beta) + cy * math::cos(beta);
- 
- 	tx = cx;
--	cx = cx * cos(gamma) - cz * sin(gamma);
--	cz = tx * sin(gamma) + cz * cos(gamma);
-+	cx = cx * math::cos(gamma) - cz * math::sin(gamma);
-+	cz = tx * math::sin(gamma) + cz * math::cos(gamma);
- 
- 	return float3(cx, cy, cz);
- }
-diff -ru spring_89.0/rts/Game/Camera/OverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp
---- spring_89.0/rts/Game/Camera/OverheadController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -52,7 +52,7 @@
- 		move.x = -move.x;
- 		move.y = -move.y;
- 	}
--	move *= sqrt(move.z) * 200;
-+	move *= math::sqrt(move.z) * 200;
- 
- 	pos.x += move.x * pixelSize * 2.0f * scrollSpeed;
- 	pos.z -= move.y * pixelSize * 2.0f * scrollSpeed;
-diff -ru spring_89.0/rts/Game/Camera/RotOverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp
---- spring_89.0/rts/Game/Camera/RotOverheadController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -29,7 +29,7 @@
- 
- void CRotOverheadController::KeyMove(float3 move)
- {
--	move *= sqrt(move.z) * 400;
-+	move *= math::sqrt(move.z) * 400;
- 
- 	float3 flatForward = camera->forward;
- 	if(camera->forward.y < -0.9f)
-@@ -68,9 +68,9 @@
- 
- void CRotOverheadController::UpdateVectors()
- {
--	dir.x=(float)(sin(camera->rot.y) * cos(camera->rot.x));
--	dir.y=(float)(sin(camera->rot.x));
--	dir.z=(float)(cos(camera->rot.y) * cos(camera->rot.x));
-+	dir.x=(float)(math::sin(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.y=(float)(math::sin(camera->rot.x));
-+	dir.z=(float)(math::cos(camera->rot.y) * math::cos(camera->rot.x));
- 	dir.ANormalize();
- 
- 	pos.x = Clamp(pos.x, 0.01f, gs->mapx * SQUARE_SIZE - 0.01f);
-diff -ru spring_89.0/rts/Game/Camera/SmoothController.cpp /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp
---- spring_89.0/rts/Game/Camera/SmoothController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -55,7 +55,7 @@
- 		move.y = -move.y;
- 	}
- 
--	move *= sqrt(move.z) * 200.0f;
-+	move *= math::sqrt(move.z) * 200.0f;
- 
- 	const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed);
- 
-@@ -103,7 +103,7 @@
- 		move.x = -move.x;
- 		move.y = -move.y;
- 	}
--	move *= sqrt(move.z) * 200.0f;
-+	move *= math::sqrt(move.z) * 200.0f;
- 
- 	const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed);
- 
-diff -ru spring_89.0/rts/Game/Camera/TWController.cpp /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp
---- spring_89.0/rts/Game/Camera/TWController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -35,7 +35,7 @@
- 	flatForward.y=0;
- 	flatForward.ANormalize();
- 
--	move *= sqrt(move.z) * 200;
-+	move *= math::sqrt(move.z) * 200;
- 	pos  += (camera->right * move.x + flatForward * move.y) * scrollSpeed;
- 	UpdateVectors();
- }
-@@ -79,9 +79,9 @@
- 
- 	camera->rot.x = Clamp(camera->rot.x, -PI * 0.4f, -0.1f);
- 
--	dir.x = sin(camera->rot.y) * cos(camera->rot.x);
--	dir.y = sin(camera->rot.x);
--	dir.z = cos(camera->rot.y) * cos(camera->rot.x);
-+	dir.x = math::sin(camera->rot.y) * math::cos(camera->rot.x);
-+	dir.y = math::sin(camera->rot.x);
-+	dir.z = math::cos(camera->rot.y) * math::cos(camera->rot.x);
- 	dir.ANormalize();
- }
- 
-diff -ru spring_89.0/rts/Game/Camera.cpp /home/svenstaro/src/spring/rts/Game/Camera.cpp
---- spring_89.0/rts/Game/Camera.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -89,7 +89,7 @@
- 	up.UnsafeANormalize();
- 
- 	const float aspect = globalRendering->aspectRatio;
--	const float viewx = tan(aspect * halfFov);
-+	const float viewx = math::tan(aspect * halfFov);
- 	const float viewy = tanHalfFov;
- 
- 	if (globalRendering->viewSizeY <= 0) {
-@@ -218,9 +218,9 @@
- 
- void CCamera::UpdateForward()
- {
--	forward.z = cos(rot.y) * cos(rot.x);
--	forward.x = sin(rot.y) * cos(rot.x);
--	forward.y = sin(rot.x);
-+	forward.z = math::cos(rot.y) * math::cos(rot.x);
-+	forward.x = math::sin(rot.y) * math::cos(rot.x);
-+	forward.y = math::sin(rot.x);
- 	forward.Normalize();
- }
- 
-@@ -229,7 +229,7 @@
- {
- 	fov = myfov;
- 	halfFov = (fov * 0.5f) * (PI / 180.f);
--	tanHalfFov = tan(halfFov);
-+	tanHalfFov = math::tan(halfFov);
- }
- 
- 
-@@ -330,7 +330,7 @@
- 	float3 pInt;
- 
- 	// prevent DIV0 when calculating line.dir
--	if (fabs(xdir.z) < 0.001f)
-+	if (math::fabs(xdir.z) < 0.001f)
- 		xdir.z = 0.001f;
- 
- 	if (ydir.y != 0.0f) {
-diff -ru spring_89.0/rts/Game/CameraHandler.cpp /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp
---- spring_89.0/rts/Game/CameraHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -139,7 +139,7 @@
- 		cameraTimeLeft = std::max(0.0f, (cameraTimeLeft - globalRendering->lastFrameTime));
- 		const float nextTime = cameraTimeLeft;
- 		const float exp = cameraTimeExponent;
--		const float ratio = 1.0f - (float)pow((nextTime / currTime), exp);
-+		const float ratio = 1.0f - (float)math::pow((nextTime / currTime), exp);
- 
- 		const float  deltaFOV = wantedCamFOV - camera->GetFov();
- 		const float3 deltaPos = wantedCamPos - camera->pos;
-diff -ru spring_89.0/rts/Game/GameServer.cpp /home/svenstaro/src/spring/rts/Game/GameServer.cpp
---- spring_89.0/rts/Game/GameServer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/GameServer.cpp	2012-07-13 06:34:42.936060485 +0200
-@@ -253,7 +253,7 @@
- 	// Something in CGameServer::CGameServer borks the FPU control word
- 	// maybe the threading, or something in CNet::InitServer() ??
- 	// Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- }
- 
-diff -ru spring_89.0/rts/Game/SelectedUnitsAI.cpp /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp
---- spring_89.0/rts/Game/SelectedUnitsAI.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp	2012-07-13 06:34:43.086060494 +0200
-@@ -179,7 +179,7 @@
- 		const float3 sideDir = frontdir.cross(UpVector);
- 
- 		// calculate so that the units form in an aproximate square
--		float length = 100.0f + (sqrt((float)nbrOfSelectedUnits) * 32.0f);
-+		float length = 100.0f + (math::sqrt((float)nbrOfSelectedUnits) * 32.0f);
- 
- 		// push back some extra params so it confer with a front move
- 		c.params.push_back(pos.x + (sideDir.x * length));
-diff -ru spring_89.0/rts/Game/TraceRay.cpp /home/svenstaro/src/spring/rts/Game/TraceRay.cpp
---- spring_89.0/rts/Game/TraceRay.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/TraceRay.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -75,7 +75,7 @@
- 	if (closeFlatLength > length)
- 		closeFlatLength = length;
- 
--	if (fabs(linear - quadratic * closeFlatLength) < 0.15f) {
-+	if (math::fabs(linear - quadratic * closeFlatLength) < 0.15f) {
- 		// relatively flat region -> use approximation
- 		dif.y -= (linear + quadratic * closeFlatLength) * closeFlatLength;
- 
-diff -ru spring_89.0/rts/Game/UI/EndGameBox.cpp /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp
---- spring_89.0/rts/Game/UI/EndGameBox.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -29,11 +29,11 @@
- 
- 	if (num == 0) {
- 		sprintf(c, "0");
--	} else if (fabs(num) < 10 * mul) {
-+	} else if (math::fabs(num) < 10 * mul) {
- 		sprintf(c, "%.1f",  num);
--	} else if (fabs(num) < 10000 * mul) {
-+	} else if (math::fabs(num) < 10000 * mul) {
- 		sprintf(c, "%.0f",  num);
--	} else if (fabs(num) < 10000000 * mul) {
-+	} else if (math::fabs(num) < 10000000 * mul) {
- 		sprintf(c, "%.0fk", num / 1000);
- 	} else {
- 		sprintf(c, "%.0fM", num / 1000000);
-@@ -165,7 +165,7 @@
- 	if (dispMode > 0 ) {
- 		if ((mx > (box.x1 + 0.01f)) && (mx < (box.x1 + 0.12f)) &&
- 		    (my < (box.y1 + 0.57f)) && (my > (box.y1 + 0.571f - stats.size()*0.02f))) {
--			int sel = (int) floor(-(my - box.y1 - 0.57f) * 50);
-+			int sel = (int) math::floor(-(my - box.y1 - 0.57f) * 50);
- 
- 			if (button == 1) {
- 				stat1 = sel;
-@@ -341,7 +341,7 @@
- 
- 		if ((mx > box.x1 + 0.01f) && (mx < box.x1 + 0.12f) &&
- 		    (my < box.y1 + 0.57f) && (my > box.y1 + 0.571f - (stats.size() * 0.02f))) {
--			const int sel = (int) floor(50 * -(my - box.y1 - 0.57f));
-+			const int sel = (int) math::floor(50 * -(my - box.y1 - 0.57f));
- 
- 			glColor4f(0.7f, 0.2f, 0.2f, guiAlpha);
- 			glDisable(GL_TEXTURE_2D);
-diff -ru spring_89.0/rts/Game/UI/EndGameBox.h /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h
---- spring_89.0/rts/Game/UI/EndGameBox.h	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h	2012-07-13 06:34:43.066060493 +0200
-@@ -60,8 +60,8 @@
- 			if (team >= 0 && static_cast<size_t>(team) >= values.size()) {
- 				values.resize(team + 1);
- 			}
--			if (values[team].size() > 0 && fabs(value-values[team].back()) > maxdif) {
--				maxdif = fabs(value-values[team].back());
-+			if (values[team].size() > 0 && math::fabs(value-values[team].back()) > maxdif) {
-+				maxdif = math::fabs(value-values[team].back());
- 			}
- 
- 			values[team].push_back(value);
-diff -ru spring_89.0/rts/Game/UI/MouseCursor.cpp /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp
---- spring_89.0/rts/Game/UI/MouseCursor.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -355,7 +355,7 @@
- 		return;
- 	}
- 
--	animTime = fmod(animTime + globalRendering->lastFrameTime, animPeriod);
-+	animTime = math::fmod(animTime + globalRendering->lastFrameTime, animPeriod);
- 
- 	if (animTime < frames[currentFrame].startTime) {
- 		currentFrame = 0;
-diff -ru spring_89.0/rts/Game/UI/ResourceBar.cpp /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp
---- spring_89.0/rts/Game/UI/ResourceBar.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -48,11 +48,11 @@
- 
- 	if (num == 0)
- 		sprintf(c, "0");
--	if (       fabs(num) < (10       * mul)) {
-+	if (       math::fabs(num) < (10       * mul)) {
- 		sprintf(c, "%.1f",  num);
--	} else if (fabs(num) < (10000    * mul)) {
-+	} else if (math::fabs(num) < (10000    * mul)) {
- 		sprintf(c, "%.0f",  num);
--	} else if (fabs(num) < (10000000 * mul)) {
-+	} else if (math::fabs(num) < (10000000 * mul)) {
- 		sprintf(c, "%.0fk", num / 1000);
- 	} else {
- 		sprintf(c, "%.0fM", num / 1000000);
-@@ -180,11 +180,11 @@
- 
- 	smallFont->SetTextColor(1.0f, 0.3f, 0.3f, 1.0f); // Expenses
- 	smallFont->glFormat(metalx  + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)",
--			FloatToSmallString(fabs(myTeam->prevMetalPull)).c_str(),
--			FloatToSmallString(fabs(myTeam->metalSent)).c_str());
-+			FloatToSmallString(math::fabs(myTeam->prevMetalPull)).c_str(),
-+			FloatToSmallString(math::fabs(myTeam->metalSent)).c_str());
- 	smallFont->glFormat(energyx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)",
--			FloatToSmallString(fabs(myTeam->prevEnergyPull)).c_str(),
--			FloatToSmallString(fabs(myTeam->energySent)).c_str());
-+			FloatToSmallString(math::fabs(myTeam->prevEnergyPull)).c_str(),
-+			FloatToSmallString(math::fabs(myTeam->energySent)).c_str());
- 
- 	smallFont->SetTextColor(0.4f, 1.0f, 0.4f, 0.95f); // Income
- 	smallFont->glFormat(metalx  + 0.044f, box.y2 - 2*globalRendering->pixelY, labelsFontSize, FONT_ASCENDER | fontOptions, "+%s",
-diff -ru spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp
---- spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -367,9 +367,9 @@
- 				camera->rot.x=-1;
- 
- 			float3 wantedCamDir;
--			wantedCamDir.x=(float)(sin(camera->rot.y)*cos(camera->rot.x));
--			wantedCamDir.y=(float)(sin(camera->rot.x));
--			wantedCamDir.z=(float)(cos(camera->rot.y)*cos(camera->rot.x));
-+			wantedCamDir.x=(float)(math::sin(camera->rot.y)*math::cos(camera->rot.x));
-+			wantedCamDir.y=(float)(math::sin(camera->rot.x));
-+			wantedCamDir.z=(float)(math::cos(camera->rot.y)*math::cos(camera->rot.x));
- 			wantedCamDir.ANormalize();
- 
- 			camHandler->GetCurrentController().SetPos(sel->pos - wantedCamDir*800);
-diff -ru spring_89.0/rts/Game/UI/UnitTracker.cpp /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp
---- spring_89.0/rts/Game/UI/UnitTracker.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -297,8 +297,8 @@
-   			modPlanePos.y = minHeight;
- 		}
- 
--		trackPos += (modPlanePos - trackPos) * (1 - pow(0.95f, deltaTime));
--		trackDir += (u->frontdir - trackDir) * (1 - pow(0.90f, deltaTime));
-+		trackPos += (modPlanePos - trackPos) * (1 - math::pow(0.95f, deltaTime));
-+		trackDir += (u->frontdir - trackDir) * (1 - math::pow(0.90f, deltaTime));
- 		trackDir.ANormalize();
- 
- 		camera->pos = trackPos;
-diff -ru spring_89.0/rts/lib/gml/gmlsrv.h /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h
---- spring_89.0/rts/lib/gml/gmlsrv.h	2012-07-10 00:10:09.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h	2012-07-13 06:34:43.209393834 +0200
-@@ -361,7 +361,7 @@
- 		if (gmlShareLists) {
- 			ogc[thr]->WorkerThreadPost();
- 		}
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 		while(dorun) {
- 			gmlClientSub();
- 		}
-@@ -452,7 +452,7 @@
- 		Threading::SetThreadName("sim");
- 		Watchdog::RegisterThread(WDT_SIM, true);
- 		set_threadnum(GML_SIM_THREAD_NUM);
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 		while(dorun) {
- 			gmlClientAuxSub();
- 		}
-diff -ru spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp
---- spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp	2012-07-10 00:10:09.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp	2012-07-13 06:35:00.626061514 +0200
-@@ -12,10 +12,16 @@
- extern "C" {
- #endif
- 
-+#if (BOOST_VERSION >= 105000) //boost 1.50 renamed TIME_UTC to TIME_UTC_
-+	#define SPRING_UTCTIME boost::TIME_UTC_
-+#else
-+	#define SPRING_UTCTIME boost::TIME_UTC
-+#endif
-+
- int stub_sdl_getSystemMilliSeconds() {
- 
- 	boost::xtime t;
--	boost::xtime_get(&t, boost::TIME_UTC);
-+	boost::xtime_get(&t, SPRING_UTCTIME);
- 	const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000);   
- 	return milliSeconds;
- }
-@@ -23,7 +29,7 @@
- void stub_sdl_sleepMilliSeconds(int milliSeconds) {
- 
- 	boost::xtime t;
--	boost::xtime_get(&t, boost::TIME_UTC);
-+	boost::xtime_get(&t, SPRING_UTCTIME);
- 	t.nsec += 1000000 * milliSeconds;
- 	boost::thread::sleep(t);
- }
-diff -ru spring_89.0/rts/lib/streflop/streflopC.cpp /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp
---- spring_89.0/rts/lib/streflop/streflopC.cpp	2012-07-10 00:10:10.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -9,16 +9,16 @@
- #endif
- 
- void streflop_init_Simple() {
--	streflop_init<Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void streflop_init_Double() {
--	streflop_init<Double>();
-+	streflop::streflop_init<streflop::Double>();
- }
- 
- #if defined(Extended)
- void streflop_init_Extended() {
--	streflop_init<Extended>();
-+	streflop::streflop_init<streflop::Extended>();
- }
- #endif // defined(Extended)
- 
-diff -ru spring_89.0/rts/lib/streflop/streflop_cond.h /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h
---- spring_89.0/rts/lib/streflop/streflop_cond.h	2012-07-10 00:10:10.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h	2012-07-13 06:34:42.906060483 +0200
-@@ -11,8 +11,6 @@
- 
- #if defined(STREFLOP_X87) || defined(STREFLOP_SSE) || defined(STREFLOP_SOFT)
- #include "streflop.h"
--using namespace streflop;
--
- namespace math {
- 	using namespace streflop;
- }
-@@ -20,6 +18,7 @@
- #include <cmath>
- namespace math {
- 	using std::fabs;
-+	// We are using fastmath::sqrt_sse instead!
- 	// using std::sqrt;
- 	using std::sin;
- 	using std::cos;
-diff -ru spring_89.0/rts/Map/BasicMapDamage.cpp /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp
---- spring_89.0/rts/Map/BasicMapDamage.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -33,7 +33,7 @@
- 
- 	for (int a = 0; a <= CRATER_TABLE_SIZE; ++a) {
- 		const float r = a / float(CRATER_TABLE_SIZE);
--		const float d = cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * cos(std::max(0.0f, r * 3 - 2) * PI));
-+		const float d = math::cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * math::cos(std::max(0.0f, r * 3 - 2) * PI));
- 		craterTable[a] = d;
- 	}
- 
-@@ -83,7 +83,7 @@
- 	const float* curHeightMap = readmap->GetCornerHeightMapSynced();
- 	const float* orgHeightMap = readmap->GetOriginalHeightMapSynced();
- 	const unsigned char* typeMap = readmap->GetTypeMapSynced();
--	const float baseStrength = -pow(strength, 0.6f) * 3 / mapHardness;
-+	const float baseStrength = -math::pow(strength, 0.6f) * 3 / mapHardness;
- 	const float invRadius = 1.0f / radius;
- 
- 	for (int y = e->y1; y <= e->y2; ++y) {
-@@ -111,7 +111,7 @@
- 				orgHeightMap[y * gs->mapxp1 + x];
- 
- 			if (prevDif * dif > 0.0f) {
--				dif /= fabs(prevDif) * 0.1f + 1;
-+				dif /= math::fabs(prevDif) * 0.1f + 1;
- 			}
- 
- 			e->squares.push_back(dif);
-@@ -148,7 +148,7 @@
- 						orgHeightMap[z * gs->mapxp1 + x];
- 
- 				if (prevDif * dif > 0.0f) {
--					dif /= fabs(prevDif) * 0.1f + 1;
-+					dif /= math::fabs(prevDif) * 0.1f + 1;
- 				}
- 
- 				totalDif += dif;
-diff -ru spring_89.0/rts/Map/Ground.cpp /home/svenstaro/src/spring/rts/Map/Ground.cpp
---- spring_89.0/rts/Map/Ground.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/Ground.cpp	2012-07-13 06:34:43.086060494 +0200
-@@ -433,8 +433,8 @@
- 
- float3 CGround::GetSmoothNormal(float x, float y, bool synced) const
- {
--	int sx = (int) floor(x / SQUARE_SIZE);
--	int sy = (int) floor(y / SQUARE_SIZE);
-+	int sx = (int) math::floor(x / SQUARE_SIZE);
-+	int sy = (int) math::floor(y / SQUARE_SIZE);
- 
- 	if (sy < 1)
- 		sy = 1;
-diff -ru spring_89.0/rts/Map/SM3/Plane.cpp /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp
---- spring_89.0/rts/Map/SM3/Plane.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -15,7 +15,7 @@
- 	a = ry1*rz2 - ry2*rz1;
- 	b = rz1*rx2 - rz2*rx1;
- 	c = rx1*ry2 - rx2*ry1;
--	float len = (float)sqrt(a*a + b*b + c*c);
-+	float len = (float)math::sqrt(a*a + b*b + c*c);
- 	a /= len;
- 	b /= len;
- 	c /= len;
-@@ -37,10 +37,10 @@
- bool Plane::EpsilonCompare(const Plane& pln, float epsilon)
- {
- 	Plane t;
--	t.a = fabs(a - pln.a);
--	t.b = fabs(b - pln.b);
--	t.c = fabs(c - pln.c);
--	t.d = fabs(d - pln.d);
-+	t.a = math::fabs(a - pln.a);
-+	t.b = math::fabs(b - pln.b);
-+	t.c = math::fabs(c - pln.c);
-+	t.d = math::fabs(d - pln.d);
- 	if (t.a > epsilon || t.b > epsilon || t.c > epsilon || t.d > epsilon) {
- 		return false;
- 	}
-diff -ru spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp
---- spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -197,7 +197,7 @@
- 					continue;
- 			}
- 
--			float len = sqrt(dx*dx + dy*dy);
-+			float len = math::sqrt(dx*dx + dy*dy);
- 			const float step = 5.0f;
- 			float invLength2d = step / len;
- 			dx *= invLength2d;
-diff -ru spring_89.0/rts/Map/SM3/terrain/Textures.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp
---- spring_89.0/rts/Map/SM3/terrain/Textures.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -248,7 +248,7 @@
- 				}
- 
- 				// flatness=dotproduct of surface normal with up vector
--				float slope = 1.0f - fabs(norm_y);
-+				float slope = 1.0f - math::fabs(norm_y);
- 
- 				if (slope < gi->minSlope - gi->minSlopeFuzzy) {
- 					bm->at(x,y) = 0.0f;
-@@ -307,7 +307,7 @@
- 				Vector3 n;
- 
- 				if (sx*sx + sy*sy < 32*32) {
--					const int sz = (int)sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy));
-+					const int sz = (int)math::sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy));
- 					n = Vector3(sx, sy, sz);
- 					n.ANormalize();
- 				}
-diff -ru spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp
---- spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -99,7 +99,7 @@
- 	const int minz =  bty * smfReadMap->bigTexSize;
- 	const int maxz = minz + smfReadMap->bigTexSize;
- 	const float miny = readmap->currMinHeight;
--	const float maxy = fabs(cam->pos.y);
-+	const float maxy = math::fabs(cam->pos.y);
- 
- 	const float3 mins(                   0, miny, minz);
- 	const float3 maxs(smfReadMap->mapSizeX, maxy, maxz);
-diff -ru spring_89.0/rts/Map/SMF/ROAM/Patch.cpp /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp
---- spring_89.0/rts/Map/SMF/ROAM/Patch.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -405,7 +405,7 @@
- 
- 	// Variance of this triangle is the actual height at it's hypotenuse midpoint minus the interpolated height.
- 	// Use values passed on the stack instead of re-accessing the Height Field.
--	float myVariance = fabs(centerZ - ((leftZ + rightZ) / 2));
-+	float myVariance = math::fabs(centerZ - ((leftZ + rightZ) / 2));
- 	
- 	if (leftZ*rightZ<0 || leftZ*centerZ<0 || rightZ*centerZ<0)
- 		myVariance = std::max(myVariance * 1.5f, 20.0f); //shore lines get more variance for higher accuracy
-diff -ru spring_89.0/rts/Map/SMF/SMFRenderState.cpp /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp
---- spring_89.0/rts/Map/SMF/SMFRenderState.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -385,7 +385,7 @@
- 	smfShaderCurrARB->SetUniformTarget(GL_VERTEX_PROGRAM_ARB);
- 	smfShaderCurrARB->SetUniform4f(10, 1.0f / (gs->pwr2mapx * SQUARE_SIZE), 1.0f / (gs->pwr2mapy * SQUARE_SIZE), 0, 1);
- 	smfShaderCurrARB->SetUniform4f(12, 1.0f / smfMap->bigTexSize, 1.0f / smfMap->bigTexSize, 0, 1);
--	smfShaderCurrARB->SetUniform4f(13, -floor(camera->pos.x * 0.02f), -floor(camera->pos.z * 0.02f), 0, 0);
-+	smfShaderCurrARB->SetUniform4f(13, -math::floor(camera->pos.x * 0.02f), -math::floor(camera->pos.z * 0.02f), 0, 0);
- 	smfShaderCurrARB->SetUniform4f(14, 0.02f, 0.02f, 0, 1);
- 	smfShaderCurrARB->SetUniformTarget(GL_FRAGMENT_PROGRAM_ARB);
- 	smfShaderCurrARB->SetUniform4f(10, ambientColor.x, ambientColor.y, ambientColor.z, 1);
-diff -ru spring_89.0/rts/Rendering/Env/AdvSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp
---- spring_89.0/rts/Rendering/Env/AdvSky.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -65,8 +65,8 @@
- 	memset(thicknessTransform, 0, 1024);
- 	memset(covers, 0, 4 * 32 * sizeof(float));
- 
--	domeheight = cos(PI / 16) * 1.01f;
--	domeWidth = sin(2 * PI / 32) * 400 * 1.7f;
-+	domeheight = math::cos(PI / 16) * 1.01f;
-+	domeWidth = math::sin(2 * PI / 32) * 400 * 1.7f;
- 
- 	UpdateSkyDir();
- 	InitSun();
-@@ -383,7 +383,7 @@
- 	case 0: {
- 		for(int a=0; a<CLOUD_DETAIL; a++) {
- 			float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a)));
--			fade -= floor(fade/2)*2;
-+			fade -= math::floor(fade/2)*2;
- 			if(fade>1) {
- 				fade = 2 - fade;
- 				if(!cloudDown[a]) {
-@@ -417,11 +417,11 @@
- 		int qcda=(4<<CLOUD_DETAIL)>>a;
- 		int *pkernel=kernel;
- 		for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) {
--			float ydist=fabs(1.0f+y-cs8a)/cs8a;
-+			float ydist=math::fabs(1.0f+y-cs8a)/cs8a;
- 			ydist=ydist*ydist*(3-2*ydist);
- 			int *pkrn=pkernel;
- 			for(int x=0; x<cs4a; ++x) {
--				float xdist=fabs(1.0f+x-cs8a)/cs8a;
-+				float xdist=math::fabs(1.0f+x-cs8a)/cs8a;
- 				xdist=xdist*xdist*(3-2*xdist);
- 
- 				float contrib=(1-xdist)*(1-ydist);
-@@ -533,7 +533,7 @@
- 	unsigned char *tt=thicknessTransform;
- 	for(int a=0;a<1024;++a){
- 		float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f;
--		float alpha=pow(f*2,3);
-+		float alpha=math::pow(f*2,3);
- 		if(alpha>1)
- 			alpha=1;
- 		*at=(int) (alpha*255);
-@@ -560,11 +560,11 @@
- 
- 	float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256;
- 	float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f;
--	int baseY=int(floor(fy))&CLOUD_MASK;
--	fy-=floor(fy);
-+	int baseY=int(math::floor(fy))&CLOUD_MASK;
-+	fy-=math::floor(fy);
- 	float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f;
--	int baseX=int(floor(fx))&CLOUD_MASK;
--	fx-=floor(fx);
-+	int baseX=int(math::floor(fx))&CLOUD_MASK;
-+	fx-=math::floor(fx);
- 
- 	float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3];
- 	if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){
-@@ -622,8 +622,8 @@
- 	glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- 	glBegin(GL_TRIANGLE_STRIP);
- 	for(int x=0;x<257;++x){
--		float dx = sin(x*2*PI/256.0f);
--		float dy = cos(x*2*PI/256.0f);
-+		float dx = math::sin(x*2*PI/256.0f);
-+		float dy = math::cos(x*2*PI/256.0f);
- 
- 		glTexCoord2f(x/256.0f,0.125f);
- 		glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f);
-@@ -646,7 +646,7 @@
- 			mem[(y*128+x)*4+0]=255;
- 			mem[(y*128+x)*4+1]=255;
- 			mem[(y*128+x)*4+2]=255;
--			float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
-+			float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
- 			if(dist>60)
- 				mem[(y*128+x)*4+3]=0;
- 			else
-@@ -749,7 +749,7 @@
- 
- 	for(int a=0;a<5;++a){
- 		float fade = gs->frameNum / float(30<<a);
--		fade -= floor(fade/2)*2;
-+		fade -= math::floor(fade/2)*2;
- 		int size = std::min(32,256>>a);
- 
- 		if(fade>1){
-@@ -770,7 +770,7 @@
- 
- 		}
- 		float tSize = std::max(1,8>>a);
--		float c = pow(2.0f,a)*6/255.0f;
-+		float c = math::pow(2.0f,a)*6/255.0f;
- 		CVertexArray* va = GetVertexArray();
- 		va->Initialize();
- 		va->CheckInitSize(4*VA_SIZE_T);
-@@ -867,10 +867,10 @@
- 
- 	const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z);
- 	const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle;
--	const float fy = asin(hdist / 400);
-+	const float fy = math::asin(hdist / 400);
- 
--	dir.x = hdist * cos(ang);
--	dir.z = hdist * sin(ang);
-+	dir.x = hdist * math::cos(ang);
-+	dir.z = hdist * math::sin(ang);
- 	dir.y = (fastmath::cos(fy) - domeheight) * 400;
- 
- 	dir.ANormalize();
-@@ -903,7 +903,7 @@
- 	const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f);
- 
- 	const float sunInt = skyLight->GetLightIntensity();
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50;
- 	const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 3.0f / (1 + sunDist));
- 
- 	const float green = std::min(1.0f, (0.55f + sunMod));
-@@ -918,7 +918,7 @@
- void CAdvSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) {
- 	const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f);
- 
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70;
- 	const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist);
- 
- 	const float red   = std::min(skyColor.x + sunMod * sunColor.x, 1.0f);
-diff -ru spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp
---- spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -229,7 +229,7 @@
- 			std::list<FallingTree>::iterator prev = fti++;
- 			fallingTrees.erase(prev);
- 		} else {
--			fti->speed += (sin(fti->fallPos) * 0.04f);
-+			fti->speed += (math::sin(fti->fallPos) * 0.04f);
- 			++fti;
- 		}
- 	}
-@@ -616,7 +616,7 @@
- 			if (camera->InView(pos + float3(0.0f, MAX_TREE_HEIGHT / 2, 0.0f), MAX_TREE_HEIGHT / 2.0f)) {
- 				const float ang = fti->fallPos * PI;
- 
--				const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang));
-+				const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang));
- 				const float3 zvec((yvec.cross(float3(-1.0f, 0.0f, 0.0f))).ANormalize());
- 				const float3 xvec(yvec.cross(zvec));
- 
-@@ -957,7 +957,7 @@
- 			if (camera->InView(pos + float3(0, MAX_TREE_HEIGHT / 2, 0), MAX_TREE_HEIGHT / 2)) {
- 				const float ang = fti->fallPos * PI;
- 
--				const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang));
-+				const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang));
- 				const float3 zvec((yvec.cross(float3(1.0f, 0.0f, 0.0f))).ANormalize());
- 				const float3 xvec(zvec.cross(yvec));
- 
-diff -ru spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp
---- spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -159,9 +159,9 @@
- 	int numIter=(int)max(3.0f,size*10);
- 	for(int a=0;a<=numIter;a++){
- 		float angle=a/(float)numIter*2*PI;
--		float col=0.4f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f;
--		barkva->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col));
--		barkva->AddVertexTN(end+orto1*sin(angle)*size*0.2f+orto2*cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col));
-+		float col=0.4f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f;
-+		barkva->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col));
-+		barkva->AddVertexTN(end+orto1*math::sin(angle)*size*0.2f+orto2*math::cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col));
- 	}
- 	barkva->EndStrip();
- }
-@@ -176,18 +176,18 @@
- 
- 	for (int a = 0; a < numBranch; ++a) {
- 		const float angle = baseAngle + (a * 3.88f) + fRand(0.5f);
--		float3 dir = orto1 * sin(angle) + orto2 * cos(angle);
-+		float3 dir = orto1 * math::sin(angle) + orto2 * math::cos(angle);
- 			dir.y = 0.3f + fRand(0.4f);
- 			dir.ANormalize();
- 		const float3 start(0, (a + 5) * height / (numBranch + 5), 0);
--		const float length = (height * (0.4f + fRand(0.1f))) * sqrt(float(numBranch - a) / numBranch);
-+		const float length = (height * (0.4f + fRand(0.1f))) * math::sqrt(float(numBranch - a) / numBranch);
- 
- 		TrunkIterator(start, dir, length, length * 0.05f, 1);
- 	}
- 
- 	for (int a = 0; a < 3; ++a) {
- 		const float angle = (a * 3.88f) + fRand(0.5f);
--		float3 dir = orto1*sin(angle)+orto2*cos(angle);
-+		float3 dir = orto1*math::sin(angle)+orto2*math::cos(angle);
- 			dir.y = 0.8f;
- 			dir.ANormalize();
- 		const float3 start(0, height - 0.3f, 0);
-@@ -225,7 +225,7 @@
- 		const float newLength = length * (float(numTrunks - a) / (numTrunks + 1));
- 
- 		float3 newbase = start + dir * length * (float(a + 1) / (numTrunks + 1));
--		float3 newDir = dir + orto1 * cos(angle) * dirDif + orto2 * sin(angle) * dirDif;
-+		float3 newDir = dir + orto1 * math::cos(angle) * dirDif + orto2 * math::sin(angle) * dirDif;
- 		newDir.ANormalize();
- 
- 		TrunkIterator(newbase, newDir, newLength, newLength * 0.05f, depth - 1);
-@@ -245,8 +245,8 @@
- 
- 		float3 pos = start + dir * length * (0.7f + fRand(0.3f));
- 		pos +=
--			(orto1 * sin(angle) + orto2 * cos(angle)) *
--			(sqrt((float) a + 1) * 0.6f + fRand(0.4f)) *
-+			(orto1 * math::sin(angle) + orto2 * math::cos(angle)) *
-+			(math::sqrt((float) a + 1) * 0.6f + fRand(0.4f)) *
- 			0.1f * MAX_TREE_HEIGHT;
- 
- 		if (pos.y < 0.2f * MAX_TREE_HEIGHT)
-@@ -538,12 +538,12 @@
- 	float baseAngle=fRand(2*PI);
- 	for(int a=0;a<numBranch;++a){
- 		float sh = 0.2f + fRand(0.2f);
--		float h  = height * pow(sh + float(a)/numBranch * (1-sh), (float)0.7f);
-+		float h  = height * math::pow(sh + float(a)/numBranch * (1-sh), (float)0.7f);
- 		float angle = baseAngle + (a * 0.618f + fRand(0.1f)) * 2 * PI;
--		float3 dir(orto1 * sin(angle) + orto2 * cos(angle));
-+		float3 dir(orto1 * math::sin(angle) + orto2 * math::cos(angle));
- 		dir.y = (a - numBranch) * 0.01f - (0.2f + fRand(0.2f));
- 		dir.ANormalize();
--		float size = sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT;
-+		float size = math::sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT;
- 		DrawPineBranch(float3(0,h,0),dir,size);
- 	}
- 	//create the top
-@@ -569,16 +569,16 @@
- 	for(int a=0;a<numIter;a++){
- 		float angle=a/(float)numIter*2*PI;
- 		float angle2=(a+1)/(float)numIter*2*PI;
--		float col=0.45f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f;
--		float col2=0.45f+(((orto1*sin(angle2)+orto2*cos(angle2)).dot(flatSun)))*0.3f;
-+		float col=0.45f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f;
-+		float col2=0.45f+(((orto1*math::sin(angle2)+orto2*math::cos(angle2)).dot(flatSun)))*0.3f;
- 
--		va->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,           angle/PI*0.125f*0.5f+0.5f,  0, float3(0,0,col));
--		va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
--		va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
--
--		va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
--		va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
--		va->AddVertexTN(end+orto1*sin(angle2)*size*0.1f+orto2*cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2));
-+		va->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,           angle/PI*0.125f*0.5f+0.5f,  0, float3(0,0,col));
-+		va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
-+		va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
-+
-+		va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
-+		va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
-+		va->AddVertexTN(end+orto1*math::sin(angle2)*size*0.1f+orto2*math::cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2));
- 	}
- }
- 
-diff -ru spring_89.0/rts/Rendering/Env/AdvWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp
---- spring_89.0/rts/Rendering/Env/AdvWater.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -48,7 +48,7 @@
- 	for (int y = 0; y < 64; ++y) {
- 		for (int x = 0; x < 64; ++x) {
- 			scrap[(y*64 + x)*4 + 0] = 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)(sin(y*PI*2.0f/64.0f)*128 + 128);
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)(math::sin(y*PI*2.0f/64.0f)*128 + 128);
- 			scrap[(y*64 + x)*4 + 2] = 0;
- 			scrap[(y*64 + x)*4 + 3] = 255;
- 		}
-@@ -62,8 +62,8 @@
- 		for (int x = 0; x < 64; ++x) {
- 			const float ang = 26.5f*PI/180.0f;
- 			const float pos = y*2+x;
--			scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128;
- 		}
- 	}
- 	glBindTexture(GL_TEXTURE_2D, rawBumpTexture[1]);
-@@ -75,8 +75,8 @@
- 		for (int x = 0; x < 64; ++x) {
- 			const float ang = -19*PI/180.0f;
- 			const float pos = 3*y - x;
--			scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128;
- 		}
- 	}
- 	glBindTexture(GL_TEXTURE_2D, rawBumpTexture[2]);
-@@ -192,14 +192,14 @@
- 				dir = xbase + dv;
- 				dir.ANormalize();
- 				zpos = camera->pos + dir*(camera->pos.y / -dir.y);
--				zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
-+				zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
- 				col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255);
- 				va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY - yInc, col);
- 
- 				dir = xbase;
- 				dir.ANormalize();
- 				zpos = camera->pos + dir*(camera->pos.y / -dir.y);
--				zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
-+				zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
- 				col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255);
- 				va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY, col);
- 
-diff -ru spring_89.0/rts/Rendering/Env/BasicSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp
---- spring_89.0/rts/Rendering/Env/BasicSky.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -67,8 +67,8 @@
- 	rawClouds=newmat2<int>(CLOUD_SIZE,CLOUD_SIZE);
- 	blendMatrix=newmat3<int>(CLOUD_DETAIL,32,32);
- 
--	domeheight=cos(PI/16)*1.01f;
--	domeWidth=sin(PI/16)*400*1.7f;
-+	domeheight=math::cos(PI/16)*1.01f;
-+	domeWidth=math::sin(PI/16)*400*1.7f;
- 
- 	UpdateSkyDir();
- 	InitSun();
-@@ -369,7 +369,7 @@
- 	case 0: {
- 		for(int a=0; a<CLOUD_DETAIL; a++) {
- 			float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a)));
--			fade -= floor(fade/2)*2;
-+			fade -= math::floor(fade/2)*2;
- 			if(fade>1) {
- 				fade = 2 - fade;
- 				if(!cloudDown[a]) {
-@@ -403,11 +403,11 @@
- 		int qcda=(4<<CLOUD_DETAIL)>>a;
- 		int *pkernel=kernel;
- 		for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) {
--			float ydist=fabs(1.0f+y-cs8a)/cs8a;
-+			float ydist=math::fabs(1.0f+y-cs8a)/cs8a;
- 			ydist=ydist*ydist*(3-2*ydist);
- 			int *pkrn=pkernel;
- 			for(int x=0; x<cs4a; ++x) {
--				float xdist=fabs(1.0f+x-cs8a)/cs8a;
-+				float xdist=math::fabs(1.0f+x-cs8a)/cs8a;
- 				xdist=xdist*xdist*(3-2*xdist);
- 
- 				float contrib=(1-xdist)*(1-ydist);
-@@ -506,7 +506,7 @@
- 	unsigned char *tt=thicknessTransform;
- 	for(int a=0;a<1024;++a){
- 		float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f;
--		float alpha=pow(f*2,3);
-+		float alpha=math::pow(f*2,3);
- 		if(alpha>1)
- 			alpha=1;
- 		*at=(unsigned char)(alpha*255);
-@@ -533,11 +533,11 @@
- 
- 	float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256;
- 	float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f;
--	int baseY=int(floor(fy))&CLOUD_MASK;
--	fy-=floor(fy);
-+	int baseY=int(math::floor(fy))&CLOUD_MASK;
-+	fy-=math::floor(fy);
- 	float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f;
--	int baseX=int(floor(fx))&CLOUD_MASK;
--	fx-=floor(fx);
-+	int baseX=int(math::floor(fx))&CLOUD_MASK;
-+	fx-=math::floor(fx);
- 
- 	float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3];
- 	if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){
-@@ -589,8 +589,8 @@
- 		glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- 		glBegin(GL_TRIANGLE_STRIP);
- 		for(int x=0;x<257;++x){
--			float dx=sin(x*2*PI/256.0f);
--			float dy=cos(x*2*PI/256.0f);
-+			float dx=math::sin(x*2*PI/256.0f);
-+			float dy=math::cos(x*2*PI/256.0f);
- 
- 			glTexCoord2f(x/256.0f,0.25f);
- 			glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f);
-@@ -613,7 +613,7 @@
- 			mem[(y*128+x)*4+0]=255;
- 			mem[(y*128+x)*4+1]=255;
- 			mem[(y*128+x)*4+2]=255;
--			float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
-+			float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
- 			if(dist>60)
- 				mem[(y*128+x)*4+3]=0;
- 			else
-@@ -764,10 +764,10 @@
- 
- 	const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z);
- 	const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle;
--	const float fy = asin(hdist / 400);
-+	const float fy = math::asin(hdist / 400);
- 
--	dir.x = hdist * cos(ang);
--	dir.z = hdist * sin(ang);
-+	dir.x = hdist * math::cos(ang);
-+	dir.z = hdist * math::sin(ang);
- 	dir.y = (fastmath::cos(fy) - domeheight) * 400;
- 
- 	dir.ANormalize();
-@@ -800,7 +800,7 @@
- 	const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f);
- 
- 	const float sunInt = skyLight->GetLightIntensity();
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50;
- 	const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 2.0f / sunDist);
- 
- 	const float green = std::min(1.0f, (0.55f + sunMod));
-@@ -814,7 +814,7 @@
- void CBasicSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) {
- 	const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f);
- 
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70;
- 	const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist);
- 
- 	const float red   = std::min(skyColor.x + sunMod * sunColor.x, 1.0f);
-diff -ru spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp
---- spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -269,7 +269,7 @@
- 	for (int x = 0; x < size; ++x) {
- 		const float3 dir = (cdir + (xdif * (x + 0.5f)) / size + (ydif * (y + 0.5f)) / size).Normalize();
- 		const float dot  = std::max(0.0f, dir.dot(sky->GetLight()->GetLightDir()));
--		const float spec = std::min(1.0f, pow(dot, mapInfo->light.specularExponent) + pow(dot, 3.0f) * 0.25f);
-+		const float spec = std::min(1.0f, math::pow(dot, mapInfo->light.specularExponent) + math::pow(dot, 3.0f) * 0.25f);
- 
- 		buf[x * 4 + 0] = (mapInfo->light.unitSpecularColor.x * spec * 255);
- 		buf[x * 4 + 1] = (mapInfo->light.unitSpecularColor.y * spec * 255);
-diff -ru spring_89.0/rts/Rendering/Env/DynWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp
---- spring_89.0/rts/Rendering/Env/DynWater.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -88,9 +88,9 @@
- 
- 	for (int y = 0; y < 64; ++y) {
- 		for (int x = 0; x < 64; ++x) {
--			temp[(y*64 + x)*4 + 0] = sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f;
-+			temp[(y*64 + x)*4 + 0] = math::sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f;
- 			temp[(y*64 + x)*4 + 1] = temp[(y*64 + x)*4 + 0];
--			temp[(y*64 + x)*4 + 2] = cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f;
-+			temp[(y*64 + x)*4 + 2] = math::cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f;
- 			temp[(y*64 + x)*4 + 3] = 0;
- 		}
- 	}
-@@ -197,7 +197,7 @@
- 		const float dy = y - 31.5f;
- 		for (int x = 0; x < 64; ++x) {
- 			const float dx = x-31.5f;
--			const float dist = sqrt(dx*dx + dy*dy);
-+			const float dist = math::sqrt(dx*dx + dy*dy);
- 			temp[(y*64 + x)*4 + 0] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f);
- 			temp[(y*64 + x)*4 + 1] = std::max(0.0f, 1 - dist/30.f);
- 			temp[(y*64 + x)*4 + 2] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f);
-@@ -425,8 +425,8 @@
- 
- 	oldCamPosBig = camPosBig;
- 
--	camPosBig.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
--	camPosBig.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
- 
- 	glDisable(GL_DEPTH_TEST);
- 	glDepthMask(0);
-@@ -835,8 +835,8 @@
- 	va = GetVertexArray();
- 	va->Initialize();
- 
--	camPosBig2.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
--	camPosBig2.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig2.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig2.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
- 
- 	// FIXME:
- 	//     1. DynWater::UpdateCamRestraints was never called ==> <this->left> and <this->right> were always empty
-@@ -1132,8 +1132,8 @@
- 				// hovercraft
- 				const float3& pos = unit->pos;
- 
--				if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
--					(fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+				if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
-+					(math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 				{
- 					continue;
- 				}
-@@ -1144,7 +1144,7 @@
- 				if ((pos.y > -4.0f) && (pos.y < 4.0f)) {
- 					const float3 frontAdd = unit->frontdir * unit->radius * 0.75f;
- 					const float3 sideAdd = unit->rightdir * unit->radius * 0.75f;
--					const float depth = sqrt(sqrt(unit->mass)) * 0.4f;
-+					const float depth = math::sqrt(math::sqrt(unit->mass)) * 0.4f;
- 					const float3 n(depth, 0.05f * depth, depth);
- 
- 					va2->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n);
-@@ -1156,8 +1156,8 @@
- 				// surface ship
- 				const float3& pos = unit->pos;
- 
--				if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
--					(fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+				if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
-+					(math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 				{
- 					continue;
- 				}
-@@ -1171,7 +1171,7 @@
- 
- 				const float3 frontAdd = unit->frontdir * unit->radius * 0.75f;
- 				const float3 sideAdd = unit->rightdir * unit->radius * 0.18f;
--				const float depth = sqrt(sqrt(unit->mass));
-+				const float depth = math::sqrt(math::sqrt(unit->mass));
- 				const float3 n(depth, 0.04f * unit->speed.Length2D() * depth, depth);
- 
- 				va->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n);
-@@ -1249,8 +1249,8 @@
- 	for (std::vector<Explosion>::iterator ei = explosions.begin(); ei != explosions.end(); ++ei) {
- 		Explosion& explo = *ei;
- 		float3 pos = explo.pos;
--		if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50))
--				|| (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+		if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50))
-+				|| (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 		{
- 			continue;
- 		}
-diff -ru spring_89.0/rts/Rendering/Env/GrassDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp
---- spring_89.0/rts/Rendering/Env/GrassDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -75,11 +75,11 @@
- 	}
- 
- 	// TODO: get rid of the magic constants
--	maxGrassDist = 800 + sqrt((float) detail) * 240;
-+	maxGrassDist = 800 + math::sqrt((float) detail) * 240;
- 	maxDetailedDist = 146 + detail * 24;
- 	detailedBlocks = int((maxDetailedDist - 24) / bMSsq) + 1;
- 	numTurfs = 3 + int(detail * 0.5f);
--	strawPerTurf = 50 + int(sqrt((float) detail) * 10);
-+	strawPerTurf = 50 + int(math::sqrt((float) detail) * 10);
- 
- 	blocksX = gs->mapx / grassSquareSize  /grassBlockSize;
- 	blocksY = gs->mapy / grassSquareSize / grassBlockSize;
-@@ -641,7 +641,7 @@
- 		const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize();
- 		const float3 billboardDirY = billboardDirX.cross(billboardDirZ);
- 
--		const float ang = acos(billboardDirZ.y);
-+		const float ang = math::acos(billboardDirZ.y);
- 		const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30))));
- 
- 		if (globalRendering->haveGLSL) {
-@@ -673,7 +673,7 @@
- 			const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize();
- 			const float3 billboardDirY = billboardDirX.cross(billboardDirZ);
- 
--			const float ang = acos(billboardDirZ.y);
-+			const float ang = math::acos(billboardDirZ.y);
- 			const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30))));
- 
- 			if (globalRendering->haveGLSL) {
-@@ -820,7 +820,7 @@
- 		float3 forwardVect = sideVect.cross(UpVector);
- 		sideVect *= mapInfo->grass.bladeWidth;
- 
--		const float3 cornerPos = (UpVector * cos(maxAng) + forwardVect * sin(maxAng)) * length;
-+		const float3 cornerPos = (UpVector * math::cos(maxAng) + forwardVect * math::sin(maxAng)) * length;
- 		float3 basePos(30.0f, 0.0f, 30.0f);
- 
- 		while (basePos.SqLength2D() > (turfSize * turfSize / 4)) {
-@@ -837,10 +837,10 @@
- 
- 			const float3 edgePosL =
- 				-sideVect * (1 - h) +
--				(UpVector * cos(ang) + forwardVect * sin(ang)) * length * h;
-+				(UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h;
- 			const float3 edgePosR =
- 				sideVect * (1.0f - h) +
--				(UpVector * cos(ang) + forwardVect * sin(ang)) * length * h;
-+				(UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h;
- 
- 			if (b == 0) {
- 				va->AddVertexT(basePos + (edgePosR - float3(0.0f, 0.1f, 0.0f)), xtexBase + xtexOffset, h);
-diff -ru spring_89.0/rts/Rendering/Env/SkyLight.cpp /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp
---- spring_89.0/rts/Rendering/Env/SkyLight.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -72,7 +72,7 @@
- bool DynamicSkyLight::SetLightDir(const float4& newLightDir) {
- 	if (newLightDir != lightDir) {
- 		static float4 lastUpdate = ZeroVector;
--		static const float minCosAngle = cos(1.5f * (PI/180.f));
-+		static const float minCosAngle = math::cos(1.5f * (PI/180.f));
- 
- 		if (lastUpdate.dot(newLightDir) < minCosAngle) {
- 			lastUpdate   = newLightDir;
-@@ -92,7 +92,7 @@
- 	const float angularVelocity = 2.0f * PI / sunOrbitTime;
- 
- 	const float sunAng  = startAngle - initialSunAngle - angularVelocity * gameSeconds;
--	const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * cos(sunAng), sunOrbitHeight, sunOrbitRad * sin(sunAng)));
-+	const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * math::cos(sunAng), sunOrbitHeight, sunOrbitRad * math::sin(sunAng)));
- 
- 	return sunPos;
- }
-@@ -108,18 +108,18 @@
- 	if (newLightDir.w == FLT_MAX) {
- 		// old: newLightDir is position where sun reaches highest altitude
- 		const float sunLen = newLightDir.Length2D();
--		const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : atan(newLightDir.y / sunLen);
--		const float sunHeight = tan(sunAzimuth - 0.001f);
-+		const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : math::atan(newLightDir.y / sunLen);
-+		const float sunHeight = math::tan(sunAzimuth - 0.001f);
- 
--		float3 v1(cos(initialSunAngle), sunHeight, sin(initialSunAngle));
-+		float3 v1(math::cos(initialSunAngle), sunHeight, math::sin(initialSunAngle));
- 		v1.ANormalize();
- 
- 		if (v1.y <= orbitMinSunHeight) {
- 			newLightDir = UpVector;
- 			sunOrbitHeight = v1.y;
--			sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
-+			sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
- 		} else {
--			float3 v2(cos(initialSunAngle + PI), orbitMinSunHeight, sin(initialSunAngle + PI));
-+			float3 v2(math::cos(initialSunAngle + PI), orbitMinSunHeight, math::sin(initialSunAngle + PI));
- 			v2.ANormalize();
- 			float3 v3 = v2 - v1;
- 			sunOrbitRad = v3.Length() / 2.0f;
-@@ -137,7 +137,7 @@
- 	} else {
- 		// new: newLightDir is center position of orbit, and newLightDir.w is orbit height
- 		sunOrbitHeight = std::max(-1.0f, std::min(newLightDir.w, 1.0f));
--		sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
-+		sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
- 	}
- 
- 	sunRotation.LoadIdentity();
-diff -ru spring_89.0/rts/Rendering/GL/glExtra.cpp /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp
---- spring_89.0/rts/Rendering/GL/glExtra.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -83,7 +83,7 @@
- 		float adjustment = rad/2;
- 		float ydiff = 0;
- 		int j;
--		for(j = 0; j < 50 && fabs(adjRadius - rad) + ydiff > .01*rad; j++){
-+		for(j = 0; j < 50 && math::fabs(adjRadius - rad) + ydiff > .01*rad; j++){
- 			if(adjRadius > rad) {
- 				rad += adjustment;
- 			} else {
-@@ -93,7 +93,7 @@
- 			pos.x = center.x + (sinR * rad);
- 			pos.z = center.z + (cosR * rad);
- 			float newY = ground->GetHeightAboveWater(pos.x, pos.z, false);
--			ydiff = fabs(pos.y - newY);
-+			ydiff = math::fabs(pos.y - newY);
- 			pos.y = newY;
- 			heightDiff = (pos.y - center.y);
- 			adjRadius = weapon ? weapon->GetRange2D(heightDiff*weapon->heightMod) : rad;
-diff -ru spring_89.0/rts/Rendering/GroundDecalHandler.cpp /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp
---- spring_89.0/rts/Rendering/GroundDecalHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp	2012-07-13 06:34:43.082727161 +0200
-@@ -963,7 +963,7 @@
- 		radius = damage * 0.25f;
- 
- 	if (damage > 400)
--		damage = 400 + sqrt(damage - 399);
-+		damage = 400 + math::sqrt(damage - 399);
- 
- 	pos.ClampInBounds();
- 
-diff -ru spring_89.0/rts/Rendering/InMapDrawView.cpp /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp
---- spring_89.0/rts/Rendering/InMapDrawView.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -38,7 +38,7 @@
- 	for (int y = 0; y < 64; y++) {
- 		// circular thingy
- 		for (int x = 0; x < 64; x++) {
--			float dist = sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32));
-+			float dist = math::sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32));
- 			if (dist > 31.0f) {
- 				// do nothing - leave transparent
- 			} else if (dist > 30.0f) {
-diff -ru spring_89.0/rts/Rendering/LineDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp
---- spring_89.0/rts/Rendering/LineDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -29,7 +29,7 @@
- void CLineDrawer::UpdateLineStipple()
- {
- 	stippleTimer += (globalRendering->lastFrameTime * cmdColors.StippleSpeed());
--	stippleTimer = fmod(stippleTimer, (16.0f / 20.0f));
-+	stippleTimer = math::fmod(stippleTimer, (16.0f / 20.0f));
- }
- 
- 
-diff -ru spring_89.0/rts/Rendering/Models/S3OParser.cpp /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp
---- spring_89.0/rts/Rendering/Models/S3OParser.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -319,7 +319,7 @@
- 		float3& t = tTangents[vrtIdx];
- 		int h = 1;
- 
--		if (isnan(n.x) || isnan(n.y) || isnan(n.z)) {
-+		if (math::isnan(n.x) || math::isnan(n.y) || math::isnan(n.z)) {
- 			n = float3(0.0f, 0.0f, 1.0f);
- 		}
- 		if (s == ZeroVector) { s = float3(1.0f, 0.0f, 0.0f); }
-diff -ru spring_89.0/rts/Sim/Misc/LosMap.cpp /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp
---- spring_89.0/rts/Sim/Misc/LosMap.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -182,7 +182,7 @@
- 
- 		y = (int)i;
- 		x = 1;
--		y = (int) (sqrt((float)r2 - 1) + 0.5f);
-+		y = (int) (math::sqrt((float)r2 - 1) + 0.5f);
- 		while (x < y) {
- 			if(!PaintTable[x+y*Radius]) {
- 				DrawLine(PaintTable, x, y, Radius);
-@@ -198,7 +198,7 @@
- 			}
- 
- 			x += 1;
--			y = (int) (sqrt((float)r2 - x*x) + 0.5f);
-+			y = (int) (math::sqrt((float)r2 - x*x) + 0.5f);
- 		}
- 		if (x == y) {
- 			if(!PaintTable[x+y*Radius]) {
-diff -ru spring_89.0/rts/Sim/Misc/QuadField.cpp /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp
---- spring_89.0/rts/Sim/Misc/QuadField.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -329,12 +329,12 @@
- 	float zp = start.z;
- 	const float invQuadSize = 1.0f / QUAD_SIZE;
- 
--	if ((floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) &&
--		(floor(start.z * invQuadSize) == floor(to.z * invQuadSize)))
-+	if ((math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) &&
-+		(math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)))
- 	{
- 		*endQuad = ((int(start.x * invQuadSize)) + (int(start.z * invQuadSize)) * numQuadsX);
- 		++endQuad;
--	} else if (floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) {
-+	} else if (math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) {
- 		const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX);
- 		const int last  = (int)(to.x    * invQuadSize) + ((int)(to.z    * invQuadSize) * numQuadsX);
- 
-@@ -347,7 +347,7 @@
- 				*endQuad = a; ++endQuad;
- 			}
- 		}
--	} else if (floor(start.z * invQuadSize) == floor(to.z * invQuadSize)) {
-+	} else if (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)) {
- 		const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX);
- 		const int last  = (int)(to.x    * invQuadSize) + ((int)(to.z    * invQuadSize) * numQuadsX);
- 
-@@ -369,14 +369,14 @@
- 			++endQuad;
- 
- 			if (dx > 0) {
--				xn = (floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx;
-+				xn = (math::floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx;
- 			} else {
--				xn = (floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx;
-+				xn = (math::floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx;
- 			}
- 			if (dz > 0) {
--				zn = (floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz;
-+				zn = (math::floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz;
- 			} else {
--				zn = (floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz;
-+				zn = (math::floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz;
- 			}
- 
- 			if (xn < zn) {
-@@ -388,8 +388,8 @@
- 			}
- 
- 			keepgoing =
--				(fabs(xp - start.x) < fabs(to.x - start.x)) &&
--				(fabs(zp - start.z) < fabs(to.z - start.z));
-+				(math::fabs(xp - start.x) < math::fabs(to.x - start.x)) &&
-+				(math::fabs(zp - start.z) < math::fabs(to.z - start.z));
- 		}
- 	}
- 
-diff -ru spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp	2012-07-13 06:34:43.256060504 +0200
-@@ -386,7 +386,7 @@
- 
- 	const float dif = wSpeed - currentSpeed;
- 
--	if (fabs(dif) < 0.05f) {
-+	if (math::fabs(dif) < 0.05f) {
- 		deltaSpeed = dif * 0.125f;
- 		nextDeltaSpeedUpdate = gs->frameNum + 8;
- 	} else if (dif > 0.0f) {
-@@ -529,7 +529,7 @@
- 			skidRotSpeed = 0.0f;
- 			owner->physicalState = oldPhysState;
- 			owner->moveType->useHeading = true;
--			float rp = floor(skidRotPos2 + skidRotSpeed2 + 0.5f);
-+			float rp = math::floor(skidRotPos2 + skidRotSpeed2 + 0.5f);
- 			skidRotSpeed2 = (rp - skidRotPos2) * 0.5f;
- 			ChangeHeading(owner->heading);
- 		} else {
-@@ -545,10 +545,10 @@
- 			}
- 
- 			float remTime=speedf/speedReduction-1;
--			float rp=floor(skidRotPos2+skidRotSpeed2*remTime+0.5f);
-+			float rp=math::floor(skidRotPos2+skidRotSpeed2*remTime+0.5f);
- 			skidRotSpeed2=(remTime+1 == 0 ) ? 0 : (rp-skidRotPos2)/(remTime+1);
- 
--			if(floor(skidRotPos2)!=floor(skidRotPos2+skidRotSpeed2)){
-+			if(math::floor(skidRotPos2)!=math::floor(skidRotPos2+skidRotSpeed2)){
- 				skidRotPos2=0;
- 				skidRotSpeed2=0;
- 			}
-@@ -571,7 +571,7 @@
- 				speed*=0.95f;
- 			}
- 			else {
--				speed += (normal*(fabs(speed.dot(normal)) + .1))*1.9f;
-+				speed += (normal*(math::fabs(speed.dot(normal)) + .1))*1.9f;
- 				speed*=.8;
- 			}
- 		}
-@@ -625,7 +625,7 @@
- 		float totRad = owner->radius + u->radius;
- 
- 		if (sqDist < totRad * totRad && sqDist != 0) {
--			float dist = sqrt(sqDist);
-+			float dist = math::sqrt(sqDist);
- 			float3 dif = midPos - u->midPos;
- 			dif /= std::max(dist, 1.f);
- 
-@@ -682,7 +682,7 @@
- 		float sqDist=(midPos-u->midPos).SqLength();
- 		float totRad=owner->radius+u->radius;
- 		if(sqDist<totRad*totRad && sqDist!=0){
--			float dist=sqrt(sqDist);
-+			float dist=math::sqrt(sqDist);
- 			float3 dif=midPos-u->midPos;
- 			dif/=std::max(dist, 1.f);
- 			float impactSpeed = -owner->speed.dot(dif);
-@@ -721,8 +721,8 @@
- 
- 	skidRotPos2 += skidRotSpeed2;
- 
--	float cosp = cos(skidRotPos2 * PI * 2.0f);
--	float sinp = sin(skidRotPos2 * PI * 2.0f);
-+	float cosp = math::cos(skidRotPos2 * PI * 2.0f);
-+	float sinp = math::sin(skidRotPos2 * PI * 2.0f);
- 
- 	float3 f1 = skidRotVector * skidRotVector.dot(owner->frontdir);
- 	float3 f2 = owner->frontdir - f1;
-@@ -812,7 +812,7 @@
- 						float objectDistToAvoidDirCenter = objectToUnit.dot(rightOfAvoid);
- 
- 						if (objectToUnit.dot(avoidanceDir) < radiusSum &&
--							fabs(objectDistToAvoidDirCenter) < radiusSum &&
-+							math::fabs(objectDistToAvoidDirCenter) < radiusSum &&
- 							(o->moveDef || Distance2D(owner, o) >= 0)) {
- 
- 							if (objectDistToAvoidDirCenter > 0.0f) {
-@@ -824,7 +824,7 @@
- 								rightOfAvoid = avoidanceDir.cross(float3(0.0f, 1.0f, 0.0f));
- 							} else {
- 								avoidLeft +=
--									(radiusSum - fabs(objectDistToAvoidDirCenter)) *
-+									(radiusSum - math::fabs(objectDistToAvoidDirCenter)) *
- 									AVOIDANCE_STRENGTH * fastmath::isqrt2(distanceToObjectSq);
- 								avoidanceDir -= (rightOfAvoid * avoidLeft);
- 								avoidanceDir.Normalize();
-@@ -952,7 +952,7 @@
- 	if (!decRate) {
- 		return 0.0f;
- 	}
--	return fabs(speed*speed / decRate);
-+	return math::fabs(speed*speed / decRate);
- }
- 
- float3 CClassicGroundMoveType::Here()
-@@ -1043,7 +1043,7 @@
- 			const float zmove = (owner->mapPos.y + owner->zsize / 2) * SQUARE_SIZE;
- 			const float xmove = (owner->mapPos.x + owner->xsize / 2) * SQUARE_SIZE;
- 
--			if (fabs(owner->frontdir.x) > fabs(owner->frontdir.z)) {
-+			if (math::fabs(owner->frontdir.x) > math::fabs(owner->frontdir.z)) {
- 				if (newmp.y < owner->mapPos.y) {
- 					haveCollided |= CheckColV(newmp.y, newmp.x, newmp.x + owner->xsize - 1,  zmove - 3.99f, owner->mapPos.y);
- 					newmp = owner->GetMapPos();
-@@ -1261,20 +1261,20 @@
- 			float xp = start.x;
- 			float zp = start.z;
- 
--			if (floor(start.x) == floor(to.x)) {
-+			if (math::floor(start.x) == math::floor(to.x)) {
- 				if (dz > 0.0f) {
--					for (int a = 1; a < floor(to.z); ++a)
-+					for (int a = 1; a < math::floor(to.z); ++a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				} else {
--					for (int a = -1; a > floor(to.z); --a)
-+					for (int a = -1; a > math::floor(to.z); --a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				}
--			} else if (floor(start.z) == floor(to.z)) {
-+			} else if (math::floor(start.z) == math::floor(to.z)) {
- 				if (dx > 0.0f) {
--					for (int a = 1; a < floor(to.x); ++a)
-+					for (int a = 1; a < math::floor(to.x); ++a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				} else {
--					for (int a = -1; a > floor(to.x); --a)
-+					for (int a = -1; a > math::floor(to.x); --a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				}
- 			} else {
-@@ -1283,14 +1283,14 @@
- 
- 				while (keepgoing) {
- 					if (dx > 0.0f) {
--						xn = (floor(xp) + 1.0f - xp) / dx;
-+						xn = (math::floor(xp) + 1.0f - xp) / dx;
- 					} else {
--						xn = (floor(xp)        - xp) / dx;
-+						xn = (math::floor(xp)        - xp) / dx;
- 					}
- 					if (dz > 0.0f) {
--						zn = (floor(zp) + 1.0f - zp) / dz;
-+						zn = (math::floor(zp) + 1.0f - zp) / dz;
- 					} else {
--						zn = (floor(zp)        - zp) / dz;
-+						zn = (math::floor(zp)        - zp) / dz;
- 					}
- 
- 					if (xn < zn) {
-@@ -1302,10 +1302,10 @@
- 					}
- 
- 					keepgoing =
--						fabs(xp - start.x) < fabs(to.x - start.x) &&
--						fabs(zp - start.z) < fabs(to.z - start.z);
-+						math::fabs(xp - start.x) < math::fabs(to.x - start.x) &&
-+						math::fabs(zp - start.z) < math::fabs(to.z - start.z);
- 
--					lineTable[yt][xt].push_back( int2(int(floor(xp)), int(floor(zp))) );
-+					lineTable[yt][xt].push_back( int2(int(math::floor(xp)), int(math::floor(zp))) );
- 				}
- 
- 				lineTable[yt][xt].pop_back();
-@@ -1335,7 +1335,7 @@
- 		const MoveDef& md = *(owner->unitDef->moveDef);
- 		const float cmod = movemath->GetPosSpeedMod(md, moveSquareX * 2, moveSquareY * 2);
- 
--		if (fabs(owner->frontdir.x) < fabs(owner->frontdir.z)) {
-+		if (math::fabs(owner->frontdir.x) < math::fabs(owner->frontdir.z)) {
- 			if (newMoveSquareX > moveSquareX) {
- 				const float nmod = movemath->GetPosSpeedMod(md, newMoveSquareX * 2, newMoveSquareY * 2);
- 				if (cmod > 0.01f && nmod <= 0.01f) {
-diff -ru spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp	2012-07-13 06:34:43.249393836 +0200
-@@ -1808,20 +1808,20 @@
- 			float xp = start.x;
- 			float zp = start.z;
- 
--			if (floor(start.x) == floor(to.x)) {
-+			if (math::floor(start.x) == math::floor(to.x)) {
- 				if (dz > 0.0f) {
--					for (int a = 1; a <= floor(to.z); ++a)
-+					for (int a = 1; a <= math::floor(to.z); ++a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				} else {
--					for (int a = -1; a >= floor(to.z); --a)
-+					for (int a = -1; a >= math::floor(to.z); --a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				}
--			} else if (floor(start.z) == floor(to.z)) {
-+			} else if (math::floor(start.z) == math::floor(to.z)) {
- 				if (dx > 0.0f) {
--					for (int a = 1; a <= floor(to.x); ++a)
-+					for (int a = 1; a <= math::floor(to.x); ++a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				} else {
--					for (int a = -1; a >= floor(to.x); --a)
-+					for (int a = -1; a >= math::floor(to.x); --a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				}
- 			} else {
-@@ -1830,14 +1830,14 @@
- 
- 				while (keepgoing) {
- 					if (dx > 0.0f) {
--						xn = (floor(xp) + 1.0f - xp) / dx;
-+						xn = (math::floor(xp) + 1.0f - xp) / dx;
- 					} else {
--						xn = (floor(xp)        - xp) / dx;
-+						xn = (math::floor(xp)        - xp) / dx;
- 					}
- 					if (dz > 0.0f) {
--						zn = (floor(zp) + 1.0f - zp) / dz;
-+						zn = (math::floor(zp) + 1.0f - zp) / dz;
- 					} else {
--						zn = (floor(zp)        - zp) / dz;
-+						zn = (math::floor(zp)        - zp) / dz;
- 					}
- 
- 					if (xn < zn) {
-@@ -1851,7 +1851,7 @@
- 					keepgoing =
- 						math::fabs(xp - start.x) <= math::fabs(to.x - start.x) &&
- 						math::fabs(zp - start.z) <= math::fabs(to.z - start.z);
--					int2 pt(int(floor(xp)), int(floor(zp)));
-+					int2 pt(int(math::floor(xp)), int(math::floor(zp)));
- 
- 					static const int MIN_IDX = -int(LINETABLE_SIZE / 2);
- 					static const int MAX_IDX = -MIN_IDX;
-diff -ru spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -325,7 +325,7 @@
- {
- 	#define NOZERO(x) std::max(x, 0.0001f)
- 
--	const float driftSpeed = fabs(owner->unitDef->dlHoverFactor);
-+	const float driftSpeed = math::fabs(owner->unitDef->dlHoverFactor);
- 	float3 deltaVec = goalPos - owner->pos;
- 	float3 deltaDir = float3(deltaVec.x, 0.0f, deltaVec.z);
- 	float l = NOZERO(deltaDir.Length2D());
-@@ -342,7 +342,7 @@
- 	deltaDir -= owner->speed;
- 	l = deltaDir.SqLength2D();
- 	if (l > (maxSpeed * maxSpeed)) {
--		deltaDir *= maxSpeed / NOZERO(sqrt(l));
-+		deltaDir *= maxSpeed / NOZERO(math::sqrt(l));
- 	}
- 	wantedSpeed = owner->speed + deltaDir;
- 
-diff -ru spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -412,7 +412,7 @@
- 				}
- 			}
- 
--			if (fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) {
-+			if (math::fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) {
- 				elevator = 1;
- 			}
- 			UpdateAirPhysics(0, aileron, elevator, 1, owner->frontdir);
-@@ -528,13 +528,13 @@
- 	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && frontdir.y > -0.2f && speedf > 2.0f && gs->randFloat() > 0.996f)
- 		maneuver = 1;
- 
--	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) {
-+	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && math::fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) {
- 		maneuver = 2;
- 		maneuverSubState = 0;
- 	}
- 
- 	// roll
--	if (speedf > 0.45f && pos.y + owner->speed.y * 60 * fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + fabs(rightdir.y) * 150) {
-+	if (speedf > 0.45f && pos.y + owner->speed.y * 60 * math::fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + math::fabs(rightdir.y) * 150) {
- 		const float goalBankDif = goalDotRight + rightdir.y * 0.2f;
- 		if (goalBankDif > maxAileron * speedf * 4.0f) {
- 			aileron = 1;
-@@ -706,7 +706,7 @@
- 		} else if (goalBankDif < -maxAileron * speedf * 4 && rightdir.y < maxBank) {
- 			aileron = -1;
- 		} else {
--			if (fabs(rightdir.y) < maxBank) {
-+			if (math::fabs(rightdir.y) < maxBank) {
- 				aileron = goalBankDif / (maxAileron * speedf * 4);
- 			} else {
- 				if (rightdir.y < 0.0f && goalBankDif < 0.0f) {
-@@ -762,7 +762,7 @@
- 			} else if (hdif > (maxElevator * speedf * speedf * 20) && frontdir.y < maxPitch) {
- 				elevator = 1;
- 			} else {
--				if (fabs(frontdir.y) < maxPitch)
-+				if (math::fabs(frontdir.y) < maxPitch)
- 					elevator = hdif / (maxElevator * speedf * speedf * 20);
- 			}
- 		}
-diff -ru spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp
---- spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -201,7 +201,7 @@
- 
- void CPathEstimator::CalcOffsetsAndPathCosts(int thread) {
- 	//! reset FPU state for synced computations
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	// NOTE: EstimatePathCosts() [B] is temporally dependent on CalculateBlockOffsets() [A],
- 	// A must be completely finished before B_i can be safely called. This means we cannot
-diff -ru spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp
---- spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp	2012-07-13 06:34:43.016060490 +0200
-@@ -251,7 +251,7 @@
- 
- 
- void QTPFS::PathManager::InitNodeLayersThreaded(const SRectangle& rect) {
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	char loadMsg[512] = {'\0'};
- 	const char* fmtString = "[PathManager::%s] using %u threads for %u node-layers (cached? %s)";
-@@ -310,7 +310,7 @@
- 	}
- 	#endif
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void QTPFS::PathManager::InitNodeLayersThread(
-@@ -360,7 +360,7 @@
- 
- 
- void QTPFS::PathManager::UpdateNodeLayersThreaded(const SRectangle& rect) {
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	#ifdef QTPFS_OPENMP_ENABLED
- 	{
-@@ -375,7 +375,7 @@
- 	}
- 	#endif
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void QTPFS::PathManager::UpdateNodeLayersThread(
-@@ -569,7 +569,7 @@
- 	SCOPED_TIMER("PathManager::Update");
- 
- 	#ifdef QTPFS_ENABLE_THREADED_UPDATE
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	// allow ThreadUpdate to run one iteration
- 	condThreadUpdate->notify_one();
-@@ -579,7 +579,7 @@
- 	// wait for the ThreadUpdate iteration to finish
- 	condThreadUpdated->wait(lock);
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 	#else
- 	ThreadUpdate();
- 	#endif
-diff -ru spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp
---- spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp	2012-07-13 06:34:43.082727161 +0200
-@@ -262,7 +262,7 @@
- 	damage *= gfxMod;
- 	damage = std::max(damage, 0.0f);
- 
--	const float sqrtDmg = sqrt(damage);
-+	const float sqrtDmg = math::sqrt(damage);
- 	const float camLength = camVect.Length();
- 	float moveLength = radius * 0.03f;
- 
-@@ -283,7 +283,7 @@
- 		if (airExplosion || waterExplosion) { smokeDamage *= 0.6f; }
- 
- 		if (smokeDamage > 0.01f) {
--			smokeDamageSQRT = sqrt(smokeDamage);
-+			smokeDamageSQRT = math::sqrt(smokeDamage);
- 			smokeDamageISQRT = 1.0f / (smokeDamageSQRT * 0.35f);
- 		}
- 
-@@ -507,17 +507,17 @@
- 			}
- 			case OP_SAWTOOTH: {
- 				// this translates to modulo except it works with floats
--				val -= (*(float*) code) * floor(val / (*(float*) code));
-+				val -= (*(float*) code) * math::floor(val / (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_DISCRETE: {
--				val = (*(float*) code) * floor(val / (*(float*) code));
-+				val = (*(float*) code) * math::floor(val / (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_SINE: {
--				val = (*(float*) code) * sin(val);
-+				val = (*(float*) code) * math::sin(val);
- 				code += 4;
- 				break;
- 			}
-@@ -538,12 +538,12 @@
- 				break;
- 			}
- 			case OP_POW: {
--				val = pow(val, (*(float*) code));
-+				val = math::pow(val, (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_POWBUFF: {
--				val = pow(val, buffer[(*(int*) code)]);
-+				val = math::pow(val, buffer[(*(int*) code)]);
- 				code += 4;
- 				break;
- 			}
-diff -ru spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -111,7 +111,7 @@
- 	oldSmokeDir.Normalize();
- 	const float3 camDir = (pos - camera->pos).Normalize();
- 
--	if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) {
-+	if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) {
- 		drawTrail = false;
- 	}
- 
-@@ -334,7 +334,7 @@
- 
- 			if (!drawTrail) {
- 				float3 camDir = (pos - camera->pos).Normalize();
--				if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(dir))) * 3000 > 300) {
-+				if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(dir))) * 3000 > 300) {
- 					drawTrail = true;
- 				}
- 			}
-@@ -373,7 +373,7 @@
- 				const float3 dif2 = (oldSmokePos - camera->pos).Normalize();
- 				const float3 dir2 = (dif2.cross(oldSmokeDir)).Normalize();
- 
--				float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + fabs(dif.dot(dir)));
-+				float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif.dot(dir)));
- 				float alpha = std::min(255.0f, std::max(0.f, a1));
- 				col[0] = (unsigned char) (color * alpha);
- 				col[1] = (unsigned char) (color * alpha);
-@@ -381,7 +381,7 @@
- 				col[3] = (unsigned char) (alpha);
- 
- 				unsigned char col2[4];
--				float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + fabs(dif2.dot(oldSmokeDir)));
-+				float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif2.dot(oldSmokeDir)));
- 
- 				if (age < 8)
- 					a2 = 0;
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -188,7 +188,7 @@
- 		particles[i].size = particleSize + gu->usRandFloat()*particleSizeSpread;
- 		particles[i].pos = pos;
- 
--		particles[i].speed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
-+		particles[i].speed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
- 	}
- 
- 	drawRadius = (particleSpeed + particleSpeedSpread) * (particleLife * particleLifeSpread);
-@@ -232,7 +232,7 @@
- 		const float az = gu->usRandFloat() * 2 * PI;
- 		const float ay = (emitRot + emitRotSpread*gu->usRandFloat()) * (PI / 180.0);
- 
--		float3 pspeed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
-+		float3 pspeed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
- 
- 		CGenericParticleProjectile* particle = new CGenericParticleProjectile(pos + explosionPos, pspeed, owner);
- 
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -124,7 +124,7 @@
- 		if (lastSegment) {
- 			a1 = 0;
- 		}
--		a1 *= 0.7f + fabs(dif1.dot(dir1));
-+		a1 *= 0.7f + math::fabs(dif1.dot(dir1));
- 		float alpha = std::min(255.f, std::max(0.f, a1));
- 		col[0] = (unsigned char) (color * alpha);
- 		col[1] = (unsigned char) (color * alpha);
-@@ -136,7 +136,7 @@
- 		if (firstSegment) {
- 			a2 = 0;
- 		}
--		a2 *= 0.7f + fabs(dif2.dot(dir2));
-+		a2 *= 0.7f + math::fabs(dif2.dot(dir2));
- 		alpha = std::min(255.f, std::max(0.0f, a2));
- 		col2[0] = (unsigned char) (color * alpha);
- 		col2[1] = (unsigned char) (color * alpha);
-@@ -153,7 +153,7 @@
- 
- 			unsigned char col3[4];
- 			float a2 = (1 - (float)(age + 4) / lifeTime) * 255;
--			a2 *= 0.7f + fabs(dif3.dot(middir));
-+			a2 *= 0.7f + math::fabs(dif3.dot(middir));
- 			alpha = std::min(255.0f, std::max(0.0f, a2));
- 			col3[0] = (unsigned char) (color * alpha);
- 			col3[1] = (unsigned char) (color * alpha);
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -49,7 +49,7 @@
- 		const float yp = (y + ypart) / 16.0f*PI - PI/2;
- 		for (int x = 0; x < 5; ++x) {
- 			float xp = (x + xpart) / 32.0f*2*PI;
--			vectors[y*5 + x] = float3(sin(xp)*cos(yp), sin(yp), cos(xp)*cos(yp));
-+			vectors[y*5 + x] = float3(math::sin(xp)*math::cos(yp), math::sin(yp), math::cos(xp)*math::cos(yp));
- 		}
- 	}
- 	pos = centerPos+vectors[12] * sphereSize;
-@@ -86,7 +86,7 @@
- 			float alpha =
- 				baseAlpha *
- 				(1.0f - min(1.0f, float(age + globalRendering->timeOffset) / (float) ttl)) *
--				(1.0f - fabs(y + ybase - 8.0f) / 8.0f * 1.0f);
-+				(1.0f - math::fabs(y + ybase - 8.0f) / 8.0f * 1.0f);
- 
- 			col[0] = (unsigned char) (color.x * 255.0f * alpha);
- 			col[1] = (unsigned char) (color.y * 255.0f * alpha);
-@@ -94,7 +94,7 @@
- 			col[3] = ((unsigned char) (40 * alpha)) + 1;
- 			va->AddVertexQTC(centerPos + vectors[y*5 + x]     * interSize, texx, texy, col);
- 			va->AddVertexQTC(centerPos + vectors[y*5 + x + 1] * interSize, texx, texy, col);
--			alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f);
-+			alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - math::fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f);
- 
- 			col[0] = (unsigned char) (color.x * 255.0f * alpha);
- 			col[1] = (unsigned char) (color.y * 255.0f * alpha);
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -79,7 +79,7 @@
- 	float interSize = size + sizeExpansion * globalRendering->timeOffset;
- 	float interRot = rotation + rotSpeed * globalRendering->timeOffset;
- 
--	const float3 dir1 = float3(cos(interRot), 0, sin(interRot)) * interSize;
-+	const float3 dir1 = float3(math::cos(interRot), 0, math::sin(interRot)) * interSize;
- 	const float3 dir2 = dir1.cross(UpVector);
- 
- 	#define wt projectileDrawer->waketex
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -96,7 +96,7 @@
- 	drawRadius = radius + maxSpeed * 8;
- 
- 	float3 camDir = (pos - camera->pos).ANormalize();
--	if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) < 200) {
-+	if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) < 200) {
- 		drawTrail = false;
- 	}
- 
-@@ -229,8 +229,8 @@
- 					// is too close or height difference too large)
- 					const float horDiff = (targPos - pos).Length2D() + 0.01f;
- 					const float verDiff = (targPos.y - pos.y) + 0.01f;
--					const float dirDiff = fabs(targetDir.y - dir.y);
--					const float ratio = fabs(verDiff / horDiff);
-+					const float dirDiff = math::fabs(targetDir.y - dir.y);
-+					const float ratio = math::fabs(verDiff / horDiff);
- 
- 					dir.y -= (dirDiff * ratio);
- 				} else {
-@@ -295,7 +295,7 @@
- 		if (!drawTrail) {
- 			const float3 camDir = (pos - camera->pos).ANormalize();
- 
--			if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) > 300) {
-+			if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) > 300) {
- 				drawTrail = true;
- 			}
- 		}
-@@ -343,7 +343,7 @@
- 			dir2.ANormalize();
- 
- 			float a1 = (1.0f / (SMOKE_TIME)) * 255;
--			a1 *= 0.7f + fabs(dif.dot(dir));
-+			a1 *= 0.7f + math::fabs(dif.dot(dir));
- 			const float alpha1 = std::min(255.0f, std::max(0.0f, a1));
- 			col[0] = (unsigned char) (color * alpha1);
- 			col[1] = (unsigned char) (color * alpha1);
-@@ -357,7 +357,7 @@
- 				a2 = 0;
- 			}
- 
--			a2 *= 0.7f + fabs(dif2.dot(oldDir));
-+			a2 *= 0.7f + math::fabs(dif2.dot(oldDir));
- 			const float alpha2 = std::min(255.0f, std::max(0.0f, a2));
- 			col2[0] = (unsigned char) (color * alpha2);
- 			col2[1] = (unsigned char) (color * alpha2);
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -90,13 +90,13 @@
- 		}
- 	}
- 
--	maxGoodDif = cos(tracking * 0.6f);
-+	maxGoodDif = math::cos(tracking * 0.6f);
- 	curSpeed = speed.Length();
- 	dir = speed / curSpeed;
- 	oldSmokeDir = dir;
- 
- 	const float3 camDir = (pos - camera->pos).ANormalize();
--	const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - fabs(camDir.dot(dir))) * 3000);
-+	const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - math::fabs(camDir.dot(dir))) * 3000);
- 
- 	drawTrail = (camDist >= 200.0f);
- 	drawRadius = maxSpeed * 8.0f;
-@@ -304,7 +304,7 @@
- 
- 		if (!drawTrail) {
- 			const float3 camDir = (pos - camera->pos).ANormalize();
--			const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000);
-+			const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000);
- 
- 			drawTrail = (camDist > 300.0f);
- 		}
-@@ -335,11 +335,11 @@
- 
- 			const float a1 =
- 				((1.0f - (0.0f / SMOKE_TIME)) * 255) *
--				(0.7f + fabs(dif1.dot(dir)));
-+				(0.7f + math::fabs(dif1.dot(dir)));
- 			const float a2 =
- 				(age < 8)? 0.0f:
- 				((1.0f - (age2 / SMOKE_TIME)) * 255) *
--				(0.7f + fabs(dif2.dot(oldSmokeDir)));
-+				(0.7f + math::fabs(dif2.dot(oldSmokeDir)));
- 			const int alpha1 = std::min(255, (int) std::max(0.0f, a1));
- 			const int alpha2 = std::min(255, (int) std::max(0.0f, a2));
- 
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp	2012-07-13 06:34:43.249393836 +0200
-@@ -252,8 +252,8 @@
- 				const float dot = speed.dot(normal);
- 
- 				pos -= speed;
--				speed -= (speed + normal * fabs(dot)) * (1 - weaponDef->bounceSlip);
--				speed += (normal * (fabs(dot))) * (1 + weaponDef->bounceRebound);
-+				speed -= (speed + normal * math::fabs(dot)) * (1 - weaponDef->bounceSlip);
-+				speed += (normal * (math::fabs(dot))) * (1 + weaponDef->bounceRebound);
- 				pos += speed;
- 
- 				if (weaponDef->bounceExplosionGenerator) {
-diff -ru spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp
---- spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp	2012-07-13 06:34:43.079393827 +0200
-@@ -770,7 +770,7 @@
- 			b2 = w->TryTargetRotate(orderTarget, c.GetID() == CMD_MANUALFIRE);
- 			b3 = Square(w->range - (w->relWeaponPos).Length()) > (orderTarget->pos.SqDistance(owner->pos));
- 			b4 = w->TryTargetHeading(GetHeadingFromVector(-diff.x, -diff.z), orderTarget->pos, orderTarget != NULL, orderTarget);
--			edgeFactor = fabs(w->targetBorder);
-+			edgeFactor = math::fabs(w->targetBorder);
- 		}
- 
- 		const float diffLength2D = diff.Length2D();
-diff -ru spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp
---- spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp	2012-07-13 06:34:43.079393827 +0200
-@@ -349,7 +349,7 @@
- 			if (rx <= spread)
- 				continue;
- 
--			rx = sqrt(rx);
-+			rx = math::sqrt(rx);
- 	
- 			const float minx = std::max(                               spread,  center.x - rx);
- 			const float maxx = std::min(float(gs->mapx * SQUARE_SIZE - spread), center.x + rx);
-@@ -676,7 +676,7 @@
- 				am->ForceHeading(unloadHeading);
- 				am->maxDrift = 1;
- 				if ((owner->pos.SqDistance(pos) < 64) &&
--						(owner->updir.dot(UpVector) > 0.99f) && fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) {
-+						(owner->updir.dot(UpVector) > 0.99f) && math::fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) {
- 					if (!SpotIsClearIgnoreSelf(pos, unit)) {
- 						// chosen spot is no longer clear to land, choose a new one
- 						// if a new spot cannot be found, don't unload at all
-diff -ru spring_89.0/rts/Sim/Units/UnitDef.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp
---- spring_89.0/rts/Sim/Units/UnitDef.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -399,9 +399,9 @@
- 	selfDCountdown = udTable.GetInt("selfDestructCountdown", 5);
- 
- 	speed  = udTable.GetFloat("maxVelocity", 0.0f) * GAME_SPEED;
--	speed  = fabs(speed);
-+	speed  = math::fabs(speed);
- 	rSpeed = udTable.GetFloat("maxReverseVelocity", 0.0f) * GAME_SPEED;
--	rSpeed = fabs(rSpeed);
-+	rSpeed = math::fabs(rSpeed);
- 
- 	fireState = udTable.GetInt("fireState", canFireControl? FIRESTATE_NONE: FIRESTATE_FIREATWILL);
- 	fireState = std::min(fireState, int(FIRESTATE_FIREATWILL));
-@@ -462,8 +462,8 @@
- 	useSmoothMesh  = udTable.GetBool("useSmoothMesh", true);
- 
- 
--	maxAcc = fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values
--	maxDec = fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values
-+	maxAcc = math::fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values
-+	maxDec = math::fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values
- 
- 	turnRate    = udTable.GetFloat("turnRate", 0.0f);
- 	turnInPlace = udTable.GetBool("turnInPlace", true);
-@@ -709,7 +709,7 @@
- 	seismicSignature = udTable.GetFloat("seismicSignature", -1.0f);
- 	if (seismicSignature == -1.0f) {
- 		if (!canFloat && !canHover && !canfly) {
--			seismicSignature = sqrt(mass / 100.0f);
-+			seismicSignature = math::sqrt(mass / 100.0f);
- 		} else {
- 			seismicSignature = 0.0f;
- 		}
-diff -ru spring_89.0/rts/Sim/Units/UnitHandler.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp
---- spring_89.0/rts/Sim/Units/UnitHandler.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp	2012-07-13 06:34:43.076060493 +0200
-@@ -419,8 +419,8 @@
- 		// look for a nearby geothermal feature if we need one
- 		for (std::vector<CFeature*>::const_iterator fi = features.begin(); fi != features.end(); ++fi) {
- 			if ((*fi)->def->geoThermal
--				&& fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4)
--				&& fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) {
-+				&& math::fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4)
-+				&& math::fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) {
- 				canBuild = BUILDSQUARE_OPEN;
- 				break;
- 			}
-@@ -589,7 +589,7 @@
- 				BuildInfo bi(cmd);
- 				tempF1 = pos + dir * ((bi.pos.y - pos.y) / dir.y) - bi.pos;
- 
--				if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > fabs(tempF1.z)) {
-+				if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.z)) {
- 					return cmd;
- 				}
- 			}
-diff -ru spring_89.0/rts/Sim/Weapons/BombDropper.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp
---- spring_89.0/rts/Sim/Weapons/BombDropper.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -62,7 +62,7 @@
- 			const float s = -owner->speed.y;
- 			const float sq = (s - 2*d) / -((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity));
- 			if (sq > 0) {
--				predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + sqrt(sq);
-+				predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + math::sqrt(sq);
- 			} else {
- 				predict = 0;
- 			}
-diff -ru spring_89.0/rts/Sim/Weapons/Cannon.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp
---- spring_89.0/rts/Sim/Weapons/Cannon.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -169,7 +169,7 @@
- 
- 	int ttl = 0;
- 	float sqSpeed2D = dir.SqLength2D() * projectileSpeed * projectileSpeed;
--	int predict = (int)ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity)
-+	int predict = (int)math::ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity)
- 			: math::sqrt(diff.SqLength2D() / sqSpeed2D));
- 	if(weaponDef->flighttime > 0) {
- 		ttl = weaponDef->flighttime;
-@@ -216,9 +216,9 @@
- 	// try to cache results, sacrifice some (not much too much even for a pewee) accuracy
- 	// it saves a dozen or two expensive calculations per second when 5 guardians
- 	// are shooting at several slow- and fast-moving targets
--	if (fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) &&
--		fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) &&
--		fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) {
-+	if (math::fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) &&
-+		math::fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) &&
-+		math::fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) {
- 		return lastDir;
- 	}
- 
-@@ -237,7 +237,7 @@
- 		// FIXME: temporary safeguards against FP overflow
- 		// (introduced by extreme off-map unit positions; the term
- 		// DFsq * Dsq * ... * dy should never even approach 1e38)
--		if (Dsq < 1e12f && fabs(dy) < 1e6f) {
-+		if (Dsq < 1e12f && math::fabs(dy) < 1e6f) {
- 			const float root1 = v*v*v*v + 2.0f*v*v*g*dy - g*g*DFsq;
- 
- 			if (root1 >= 0.0f) {
-diff -ru spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp
---- spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -126,9 +126,9 @@
- 
- 	// should really be tan but TA seem to cap it somehow
- 	// should also be 7fff or ffff theoretically but neither seems good
--	wd.accuracy       = sin((accuracy)       * PI / 0xafff);
--	wd.sprayAngle     = sin((sprayAngle)     * PI / 0xafff);
--	wd.movingAccuracy = sin((movingAccuracy) * PI / 0xafff);
-+	wd.accuracy       = math::sin((accuracy)       * PI / 0xafff);
-+	wd.sprayAngle     = math::sin((sprayAngle)     * PI / 0xafff);
-+	wd.movingAccuracy = math::sin((movingAccuracy) * PI / 0xafff);
- 
- 	wd.targetMoveError = wdTable.GetFloat("targetMoveError", 0.0f);
- 	wd.leadLimit = wdTable.GetFloat("leadLimit", -1.0f);
-@@ -375,7 +375,7 @@
- 
- 
- 	const float gd = max(30.0f, wd.damages[0] / 20.0f);
--	const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (sqrt(gd) * 0.7f)) * 0.5f;
-+	const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (math::sqrt(gd) * 0.7f)) * 0.5f;
- 	wd.explosionSpeed = wdTable.GetFloat("explosionSpeed", defExpSpeed);
- 
- 	// Dynamic Damage
-@@ -461,7 +461,7 @@
- 			wd.hitSound.setVolume(0, 5.0f);
- 			wd.hitSound.setVolume(1, 5.0f);
- 		} else {
--			float fireSoundVolume = sqrt(wd.damages[0] * 0.5f);
-+			float fireSoundVolume = math::sqrt(wd.damages[0] * 0.5f);
- 
- 			if (wd.type == "LaserCannon") {
- 				fireSoundVolume *= 0.5f;
-@@ -472,7 +472,7 @@
- 			if ((fireSoundVolume > 100.0f) &&
- 			    ((wd.type == "MissileLauncher") ||
- 			     (wd.type == "StarburstLauncher"))) {
--				fireSoundVolume = 10.0f * sqrt(hitSoundVolume);
-+				fireSoundVolume = 10.0f * math::sqrt(hitSoundVolume);
- 			}
- 
- 			if (wd.damageAreaOfEffect > 8.0f) {
-@@ -564,7 +564,7 @@
- 
- 	if (inverted == true) {
- 		for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) {
--			dynDamages[i] = damages[i] - (1 - pow(1 / range * travDist, exp)) * damages[i];
-+			dynDamages[i] = damages[i] - (1 - math::pow(1 / range * travDist, exp)) * damages[i];
- 
- 			if (damageMin > 0)
- 				dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]);
-@@ -577,7 +577,7 @@
- 	}
- 	else {
- 		for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) {
--			dynDamages[i] = (1 - pow(1 / range * travDist, exp)) * damages[i];
-+			dynDamages[i] = (1 - math::pow(1 / range * travDist, exp)) * damages[i];
- 
- 			if (damageMin > 0)
- 				dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]);
-diff -ru spring_89.0/rts/System/Matrix44f.cpp /home/svenstaro/src/spring/rts/System/Matrix44f.cpp
---- spring_89.0/rts/System/Matrix44f.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Matrix44f.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -72,8 +72,8 @@
- 
- 	*this=Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[4];
- 	m[4] = cr*a - sr*m[8];
-@@ -107,8 +107,8 @@
- 
- 	*this = Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[0];
- 	m[0] =  cr*a + sr*m[8];
-@@ -142,8 +142,8 @@
- 
- 	*this = Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[0];
- 	m[0] = cr*a - sr*m[4];
-@@ -165,8 +165,8 @@
- 
- void CMatrix44f::Rotate(float rad, const float3& axis)
- {
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	for(int a=0;a<3;++a){
- 		float3 v(m[a*4],m[a*4+1],m[a*4+2]);
-diff -ru spring_89.0/rts/System/myMath.cpp /home/svenstaro/src/spring/rts/System/myMath.cpp
---- spring_89.0/rts/System/myMath.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/myMath.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -44,7 +44,7 @@
- 	}
- 
- 	// Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 	streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- #endif
-@@ -58,7 +58,7 @@
- 	#pragma omp parallel
- 	{
- 		//good_fpu_control_registers("OMP-Init");
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 	#if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 		streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- 	#endif
-@@ -77,8 +77,8 @@
- 	for (int a = 0; a < NUM_HEADINGS; ++a) {
- 		float ang = (a - (NUM_HEADINGS / 2)) * 2 * PI / NUM_HEADINGS;
- 		float2 v;
--			v.x = sin(ang);
--			v.y = cos(ang);
-+			v.x = math::sin(ang);
-+			v.y = math::cos(ang);
- 		headingToVectorTable[a] = v;
- 	}
- 
-@@ -107,9 +107,9 @@
- 	float3 ret;
- 	float h = heading * TAANG2RAD;
- 	float p = pitch * TAANG2RAD;
--	ret.x = sin(h) * cos(p);
--	ret.y = sin(p);
--	ret.z = cos(h) * cos(p);
-+	ret.x = math::sin(h) * math::cos(p);
-+	ret.y = math::sin(p);
-+	ret.z = math::cos(h) * math::cos(p);
- 	return ret;
- }
- 
-@@ -138,7 +138,7 @@
- 	float3 dir(l2-l1);
- 	float3 pdir(p-l1);
- 	float length = dir.Length();
--	if (fabs(length) < 1e-4f)
-+	if (math::fabs(length) < 1e-4f)
- 		return l1;
- 	float c = dir.dot(pdir) / length;
- 	if (c < 0) c = 0;
-diff -ru spring_89.0/rts/System/Net/Socket.cpp /home/svenstaro/src/spring/rts/System/Net/Socket.cpp
---- spring_89.0/rts/System/Net/Socket.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Net/Socket.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -73,7 +73,7 @@
- 	//! (date of note: 08/05/10)
- 	//! something in from_string() is invalidating the FPU flags
- 	//! tested on win2k and linux (not happening there)
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	return addr;
-@@ -94,7 +94,7 @@
- #ifdef STREFLOP_H
- 	//! (date of note: 08/22/10)
- 	//! something in resolve() is invalidating the FPU flags
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	return resolveIt;
-diff -ru spring_89.0/rts/System/OffscreenGLContext.cpp /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp
---- spring_89.0/rts/System/OffscreenGLContext.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -259,7 +259,7 @@
- #ifdef STREFLOP_H
- 	// init streflop to make it available for synced computations, too
- 	// redundant? threads copy the FPU state of their parent.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	try {
-diff -ru spring_89.0/rts/System/Sound/SoundSource.h /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h
---- spring_89.0/rts/System/Sound/SoundSource.h	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h	2012-07-13 06:34:42.836060480 +0200
-@@ -7,7 +7,6 @@
- 
- #include <al.h>
- #include <boost/noncopyable.hpp>
--#include <boost/thread/recursive_mutex.hpp>
- 
- class IAudioChannel;
- class float3;
-diff -ru spring_89.0/rts/System/SpringApp.cpp /home/svenstaro/src/spring/rts/System/SpringApp.cpp
---- spring_89.0/rts/System/SpringApp.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/SpringApp.cpp	2012-07-13 06:34:42.982727155 +0200
-@@ -385,7 +385,7 @@
- #ifdef STREFLOP_H
- 	//! Something in SDL_SetVideoMode (OpenGL drivers?) messes with the FPU control word.
- 	//! Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	//! setup GL smoothing
-@@ -1009,7 +1009,7 @@
- 			SDL_Event event;
- 
- 			while (SDL_PollEvent(&event)) {
--				streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags
-+				streflop::streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags
- 				input.PushEvent(event);
- 			}
- 		}
-diff -ru spring_89.0/rts/System/Sync/FPUCheck.cpp /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp
---- spring_89.0/rts/System/Sync/FPUCheck.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -85,7 +85,7 @@
- 		LOG_L(L_WARNING, "[%s] Sync warning: (env.x87_mode) FPUCW 0x%04X instead of 0x%04X or 0x%04X (\"%s\")", __FUNCTION__, fenv.x87_mode, x87_a, x87_b, text);
- 
- 		// Set single precision floating point math.
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 	#if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 		streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- 	#endif
diff --git a/community-testing/spring/spring.install b/community-testing/spring/spring.install
deleted file mode 100644
index 41f09f887..000000000
--- a/community-testing/spring/spring.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 $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/springlobby/PKGBUILD b/community-testing/springlobby/PKGBUILD
deleted file mode 100644
index 697e4d62e..000000000
--- a/community-testing/springlobby/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 73776 2012-07-15 13:20:59Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: DuGi <dugi@irc.pl>
-
-pkgname=springlobby
-pkgver=0.147
-pkgrel=2
-pkgdesc="A free cross-platform lobby client for the Spring RTS project."
-arch=('i686' 'x86_64')
-url="http://springlobby.info/"
-license=('GPL2')
-depends=('hicolor-icon-theme' 'wxgtk' 'curl' 'libtorrent-rasterbar' 'boost-libs')
-optdepends=('sdl' 'sdl_sound' 'sdl_mixer') 
-makedepends=('boost' 'asio' 'cmake')
-install=springlobby.install
-source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1dd17f3f573d40b10b66bdbdc77181f0')
-
-build() {
-  cd $srcdir/${pkgname}-$pkgver
-
-  #export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2"
-
-  sed -i 's/boost_system-mt/boost_system/g' $srcdir/$pkgname-$pkgver/CMakeLists.txt
-
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DOPTION_SOUND=false
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}-$pkgver
-
-  make DESTDIR=$pkgdir install
- # 
- # install -m755 -d $pkgdir/usr/share/applications
- # install -m644 $srcdir/springlobby.desktop $pkgdir/usr/share/applications
-
- # install -m755 -d -p $pkgdir/usr/share/pixmaps
- # install -m644 $srcdir/springlobby.png $pkgdir/usr/share/pixmaps
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/community-testing/springlobby/springlobby.desktop b/community-testing/springlobby/springlobby.desktop
deleted file mode 100644
index 1dce96b90..000000000
--- a/community-testing/springlobby/springlobby.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=SpringLobby
-Comment=Lobby for Spring. An open source RTS with similar gameplay to TA
-Exec=springlobby
-Icon=springlobby.png
-Terminal=false
-Type=Application
-Categories=Application;Game;StrategyGame;
diff --git a/community-testing/springlobby/springlobby.install b/community-testing/springlobby/springlobby.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/community-testing/springlobby/springlobby.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/springlobby/springlobby.png b/community-testing/springlobby/springlobby.png
deleted file mode 100644
index 89c7ab0ac..000000000
--- a/community-testing/springlobby/springlobby.png
+++ /dev/null
diff --git a/community-testing/stone-soup/PKGBUILD b/community-testing/stone-soup/PKGBUILD
deleted file mode 100644
index 17177714b..000000000
--- a/community-testing/stone-soup/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
-
-pkgname=stone-soup
-pkgver=0.11.0
-pkgrel=2
-pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
-arch=('i686' 'x86_64')
-url='http://crawl.develz.org/'
-depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'glu' 'freetype2' 'ttf-dejavu')
-makedepends=('bison' 'flex' 'gendesk')
-conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git')
-license=('custom')
-install=stone-soup.install
-source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.xz")
-
-# used by gendesk to create .desktop file
-_exec=('crawl-tiles')
-_name=('Dungeon Crawl Stone Soup')
-
-build() {
-    cd "$srcdir"
-    gendesk -n
-
-    cd "stone_soup-${pkgver}/source"
-
-    # adjust makefile to use /usr/bin, owner root:root,
-    # disable setgid on executable
-
-    sed -i 's|bin_prefix    := bin|bin_prefix    := usr/bin|' Makefile
-    sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' Makefile
-    sed -i 's|MCHMOD := 2755|MCHMOD := 755|' Makefile
-
-    # first build and install tiles version
-
-    make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.crawl/" \
-         DATADIR="/usr/share/${pkgname}/data" \
-         USE_UNICODE=y \
-         TILES=y \
-         install
-
-    # rename tiles executable to avoid clashing with console crawl
-
-    mv "${pkgdir}/usr/bin/crawl" "${pkgdir}/usr/bin/crawl-tiles"
-
-    # then build and install console version
-
-    make DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.crawl/" \
-         DATADIR="/usr/share/${pkgname}/data" \
-         USE_UNICODE=y \
-         install
-
-    # install crawl license
-
-    install -D -m644 ../licence.txt \
-        "${pkgdir}/usr/share/licenses/${pkgname}/license.txt"
-
-    # install icon and .desktop file
-
-    install -D -m644 dat/tiles/stone_soup_icon-32x32.png \
-        "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -D -m644 "${srcdir}/${pkgname}.desktop" \
-        "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-
-}
-
-md5sums=('715d800410a7251499bf8efcc8675ca6')
diff --git a/community-testing/stone-soup/stone-soup.install b/community-testing/stone-soup/stone-soup.install
deleted file mode 100644
index 2320123e2..000000000
--- a/community-testing/stone-soup/stone-soup.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_upgrade() {
-
-    # return if old pkgver >= 0.9.0-2
-    [[ $(vercmp $2 0.9.0-2) -ge 0 ]] && return
-
-    echo "---------------------------------------------------------------------
-    stone-soup saves have moved to ~/.crawl.
-    If you want to keep your old saves, move ~/.stone-soup to
-    ~/.crawl.
----------------------------------------------------------------------"
-}
diff --git a/community-testing/supertux/PKGBUILD b/community-testing/supertux/PKGBUILD
deleted file mode 100644
index 8c395dd96..000000000
--- a/community-testing/supertux/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 78817 2012-10-25 01:48:41Z ebelanger $
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Eric Bélanger <eric@archlinux.org>
-# Contributor: vande198
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=supertux
-pkgver=0.3.3
-pkgrel=7
-pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
-arch=('i686' 'x86_64')
-url="http://super-tux.sourceforge.net/"
-license=('GPL')
-depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 
-        supertux2-0.3.3-squirrel-gcc47.patch)
-md5sums=('f3f803e629ee51a9de0b366a036e393d'
-         'eb06315514be4f200428f14b927beb66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch"
-  sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
-  sed -i '/types\.h/d' src/addon/addon_manager.cpp
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin .
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch
deleted file mode 100644
index 16781b610..000000000
--- a/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h	1970-01-01 01:00:00.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h	2012-05-01 11:59:37.000000000 +0200
-@@ -0,0 +1,8 @@
-+/*	see copyright notice in squirrel.h */
-+#ifndef _SQMEM_H_
-+#define _SQMEM_H_
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-+void sq_vm_free(void *p,SQUnsignedInteger size);
-+#endif //_SQMEM_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h	2012-05-01 11:59:37.000000000 +0200
-@@ -136,8 +136,4 @@
- extern SQObjectPtr _minusone_;
- 
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
--
--void *sq_vm_malloc(SQUnsignedInteger size);
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
--void sq_vm_free(void *p,SQUnsignedInteger size);
- #endif //_SQSTATE_H_
-diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h
---- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h	2010-03-01 13:40:58.000000000 +0100
-+++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h	2012-05-01 11:59:37.000000000 +0200
-@@ -2,6 +2,8 @@
- #ifndef _SQUTILS_H_
- #define _SQUTILS_H_
- 
-+#include "sqmem.h"
-+
- #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
- #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
- #define SQ_MALLOC(__size) sq_vm_malloc((__size));
diff --git a/community-testing/synfig/PKGBUILD b/community-testing/synfig/PKGBUILD
deleted file mode 100644
index 90ad0b07c..000000000
--- a/community-testing/synfig/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 73340 2012-07-06 15:23:53Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Franco Iacomella <yaco@gnu.org>
-
-pkgname=synfig
-pkgver=0.63.05
-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-compat' '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=('8591cf17c26405d68d2cc050a2929292'
-         'b5568b06fae1a7ee465b5380b1139b83'
-         'ebf41046097cfd778dee9a9854561dae')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
-  LDFLAGS="$LDFLAGS -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat"
-  CFLAGS="$CFLAGS -D__STDC_CONSTANT_MACROS"
-  CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
-  [ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
-  [ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
-  patch -p1 -i $srcdir/build-fix.patch
-  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/synfig/build-fix.patch b/community-testing/synfig/build-fix.patch
deleted file mode 100644
index be45fdc68..000000000
--- a/community-testing/synfig/build-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -wbBur synfig-core/src/modules/mod_libavcodec/trgt_av.cpp synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-core/src/modules/mod_libavcodec/trgt_av.cpp	2011-06-05 13:04:07.000000000 +0400
-+++ synfig-core.my/src/modules/mod_libavcodec/trgt_av.cpp	2011-06-14 14:32:49.000000000 +0400
-@@ -31,6 +31,10 @@
- #	include <config.h>
- #endif
- 
-+#include <libavcodec/avcodec.h>
-+#include <libavformat/avformat.h>
-+#include <libswscale/swscale.h>
-+
- #include "trgt_av.h"
- 
- extern "C"
-@@ -116,14 +120,14 @@
-     picture = avcodec_alloc_frame();
-     if (!picture)
-         return NULL;
--    size = avpicture_get_size(pix_fmt, width, height);
-+    size = avpicture_get_size((enum ::PixelFormat)pix_fmt, width, height);
-     picture_buf = (uint8_t *)malloc(size);
-     if (!picture_buf) {
-         av_free(picture);
-         return NULL;
-     }
-     avpicture_fill((AVPicture *)picture, picture_buf,
--                   pix_fmt, width, height);
-+                   (enum ::PixelFormat)pix_fmt, width, height);
-     return picture;
- }
- 
diff --git a/community-testing/synfig/ffmpeg-0.8.patch b/community-testing/synfig/ffmpeg-0.8.patch
deleted file mode 100644
index 4ba40fff2..000000000
--- a/community-testing/synfig/ffmpeg-0.8.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -aur synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp
---- synfig-0.63.02/src/modules/mod_libavcodec/trgt_av.cpp	2011-09-29 10:51:41.000000000 +0200
-+++ synfig-0.63.02.new/src/modules/mod_libavcodec/trgt_av.cpp	2011-10-31 16:39:03.000000000 +0100
-@@ -441,7 +441,7 @@
- 		if( context->coded_frame )
- 			pkt.pts = context->coded_frame->pts;
- 		if( context->coded_frame && context->coded_frame->key_frame)
--			pkt.flags |= PKT_FLAG_KEY;
-+			pkt.flags |= AV_PKT_FLAG_KEY;
- 
- 		//kluge for raw picture format (they said they'd fix)
- 		if (formatc->oformat->flags & AVFMT_RAWPICTURE)
-@@ -463,7 +463,7 @@
- 				if( context->coded_frame )
- 					pkt.pts = context->coded_frame->pts;
- 				if( context->coded_frame && context->coded_frame->key_frame)
--					pkt.flags |= PKT_FLAG_KEY;
-+					pkt.flags |= AV_PKT_FLAG_KEY;
- 
- 				ret = av_write_frame(formatc, &pkt);
- 
-@@ -567,17 +567,17 @@
- 		if (typestring)
- 		{
- 			//formatptr guess_format(type, filename, MIME type)
--			format = guess_format(typestring,NULL,NULL);
-+			format = av_guess_format(typestring,NULL,NULL);
- 		}
- 		else
- 		{
--			format = guess_format(NULL, filename, NULL);
-+			format = av_guess_format(NULL, filename, NULL);
- 		}
- 
- 		if(!format)
- 		{
- 			synfig::warning("Unable to Guess the output, defaulting to mpeg");
--			format = guess_format("mpeg", NULL, NULL);
-+			format = av_guess_format("mpeg", NULL, NULL);
- 		}
- 
- 		if(!format)
-@@ -753,7 +753,7 @@
- 
- 		context = st->codec;
- 		context->codec_id = (CodecID)codec_id;
--		context->codec_type = CODEC_TYPE_VIDEO;
-+		context->codec_type = AVMEDIA_TYPE_VIDEO;
- 
- 		//PARAMETERS MUST BE PASSED IN SOMEHOW (ANOTHER FUNCTION PARAMETER???)
- 
-@@ -800,7 +800,7 @@
- 
- 		context = stream->codec;
- 		context->codec_id = (CodecID)codec_id;
--		context->codec_type = CODEC_TYPE_AUDIO;
-+		context->codec_type = AVMEDIA_TYPE_AUDIO;
- 
- 		/* put sample parameters */
- 		context->bit_rate = 64000;
diff --git a/community-testing/tagpy/PKGBUILD b/community-testing/tagpy/PKGBUILD
deleted file mode 100644
index 0a7ae1a26..000000000
--- a/community-testing/tagpy/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 74159 2012-07-22 13:24:09Z jelle $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Scott Horowitz <stonecrest@gmail.com>
-
-pkgname=tagpy
-pkgver=0.94.8
-pkgrel=9
-pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/tagpy"
-license=('MIT')
-depends=('python2' 'taglib' 'boost-libs')
-makedepends=('python2-distribute' 'boost')
-source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('6baff63318cf90b9bc5a2497a0597802')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py') 
- 
-  ./configure.py --taglib-lib-dir=/usr/lib/ \
-  	--taglib-inc-dir=/usr/include/taglib/ \
-	--boost-inc-dir=/usr/include/boost/ \
-	--boost-lib-dir=/usr/lib/ \
-	--boost-python-libname=boost_python
-  python2 setup.py build
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
-
-check(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  python2 setup.py test
-}
diff --git a/community-testing/tdfsb/PKGBUILD b/community-testing/tdfsb/PKGBUILD
deleted file mode 100644
index a219a2d99..000000000
--- a/community-testing/tdfsb/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 77588 2012-10-13 02:40:19Z ebelanger $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=tdfsb
-pkgver=0.0.10
-pkgrel=6
-pkgdesc="SDL based graphical file browser"
-arch=('i686' 'x86_64')
-url="http://www.determinate.net/webdata/seg/tdfsb.html"
-license=('GPL')
-depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu' 'glu')
-source=("http://www.determinate.net/webdata/data/${pkgname}-${pkgver}.tar.gz"
-        'tdfsb.desktop'
-        'tdfsb.png')
-md5sums=('8162994a7e882dc7074a5f628d2ac076'
-         '4070a7de1153c00df875384a1817e43b'
-         'ecabb39597a3c17f9541300869873e50')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:g" compile.sh
-  ./compile.sh
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -D -m755 tdfsb "${pkgdir}/usr/bin/tdfsb"
-
-  # Install desktop file
-  install -D -m755 "${srcdir}/tdfsb.desktop" "${pkgdir}/usr/share/applications/tdfsb.desktop"
-  # Install icon
-  install -D -m644 "${srcdir}/tdfsb.png" "${pkgdir}/usr/share/pixmaps/tdfsb.png"
-}
diff --git a/community-testing/tdfsb/tdfsb.desktop b/community-testing/tdfsb/tdfsb.desktop
deleted file mode 100644
index 7167e022a..000000000
--- a/community-testing/tdfsb/tdfsb.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Tdfsb
-Comment=SDL based graphical file browser
-Icon=/usr/share/pixmaps/tdfsb.png
-Exec=tdfsb
-Terminal=false
-Type=Application
-Categories=System;Application;
-StartupNotify=true
diff --git a/community-testing/tdfsb/tdfsb.png b/community-testing/tdfsb/tdfsb.png
deleted file mode 100644
index 5ac3a5fe4..000000000
--- a/community-testing/tdfsb/tdfsb.png
+++ /dev/null
diff --git a/community-testing/teeworlds/PKGBUILD b/community-testing/teeworlds/PKGBUILD
deleted file mode 100644
index 51ee46ff9..000000000
--- a/community-testing/teeworlds/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Armin 'IsSuE' Praher [issue.at.gmx.dot.at]
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-
-pkgname=teeworlds
-pkgver=0.6.1
-pkgrel=3
-pkgdesc="A multiplayer 2D shooter"
-arch=('i686' 'x86_64')
-url="http://teeworlds.com"
-license=('custom')
-depends=('alsa-lib' 'glu' 'sdl' 'freetype2')
-makedepends=('python2' 'bam' 'mesa')
-replaces=('teewars')
-source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz
-        teeworlds.desktop
-		teeworlds.png)
-md5sums=('00de7195ecd1f23596dc3237341af512'
-         '3944aaf7a8c19a83510b2b39c4cddf5f'
-         '44f39e398409232a0e0a431ed46d8cc8')
-
-build() {
-	# Build teeworlds
-	cd ${srcdir}/${pkgname}-*-source
-
-	# Use Python 2
-	sed -i 's/python /python2 /' bam.lua
-
-	bam server_release client_release
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-*-source
-
-	# Install data files
-	mkdir -p ${pkgdir}/usr/share/${pkgname}/data
-	cp -r data/* ${pkgdir}/usr/share/${pkgname}/data
-
-	install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname}
-	install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv
-
-	install -Dm644 ${srcdir}/${pkgname}.desktop \
-		${pkgdir}/usr/share/applications/${pkgname}.desktop
-	install -Dm644 ${srcdir}/${pkgname}.png \
-		${pkgdir}/usr/share/pixmaps/${pkgname}.png
-
-	install -Dm644 license.txt \
-		${pkgdir}/usr/share/licenses/${pkgname}/license.txt
-}
diff --git a/community-testing/teeworlds/teeworlds.desktop b/community-testing/teeworlds/teeworlds.desktop
deleted file mode 100644
index ddfb8994d..000000000
--- a/community-testing/teeworlds/teeworlds.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Icon=teeworlds
-Exec=teeworlds
-Terminal=false
-StartupNotify=false
-
-Name=TeeWorlds
-GenericName=Arcade Game
-Comment=is a multiplayer 2D FPS shooter
-Comment[pl_PL]=wieloosobowa strzelanka FTP w 2D
-
-Categories=Game;ArcadeGame;
diff --git a/community-testing/teeworlds/teeworlds.png b/community-testing/teeworlds/teeworlds.png
deleted file mode 100644
index 890baaff3..000000000
--- a/community-testing/teeworlds/teeworlds.png
+++ /dev/null
diff --git a/community-testing/tellico/PKGBUILD b/community-testing/tellico/PKGBUILD
deleted file mode 100644
index b60a29ac7..000000000
--- a/community-testing/tellico/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 74668 2012-08-01 17:04:35Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Ray Rashif <schiv@archlinux.org
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgname=tellico
-pkgver=2.3.6
-pkgrel=2
-pkgdesc="A collection manager for KDE"
-arch=('i686' 'x86_64')
-url="http://tellico-project.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'libkcddb' 'poppler-qt' 'qjson')
-makedepends=('automoc4' 'cmake')
-install=$pkgname.install
-source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('62bafaea733ce3b108322623e866b8659ab2644cc80ee06f0fc7fe974ec5d1c3')
-
-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
-
-# fix python 2.7 path
-  find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/community-testing/tellico/tellico.install b/community-testing/tellico/tellico.install
deleted file mode 100644
index 3b3aff7d9..000000000
--- a/community-testing/tellico/tellico.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/community-testing/tix/PKGBUILD b/community-testing/tix/PKGBUILD
deleted file mode 100644
index e5a35e2b2..000000000
--- a/community-testing/tix/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 78122 2012-10-16 11:54:26Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Brice Méalier <mealier_brice@yahoo.fr>
-
-pkgname=tix
-pkgver=8.4.3
-pkgrel=4
-pkgdesc="Tk Interface eXtension, a powerful set of user interface components"
-arch=(i686 'x86_64')
-url="http://tix.sourceforge.net/"
-license=("BSD")
-depends=('tk' 'libx11')
-source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz
-	tcl-tk-path.patch)
-md5sums=('2b8bf4b10a852264678182652f477e59'
-         'd4df48da39dd51872d58706a51bab505')
-
-build() {
-  cd $srcdir/Tix$pkgver
-
-  patch -p1 <$srcdir/tcl-tk-path.patch
-
-  export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2"
-
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$pkgdir install
-  # move things around
-
-  install -m755 tools/tixindex $pkgdir/usr/bin/tixindex
-  rm -rf $pkgdir/usr/lib/Tix8.4/html
-  rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms}
-  ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so
-
-  mkdir -p $pkgdir/usr/share/man/man1
-  mkdir -p $pkgdir/usr/share/man/man3
-  cp -p man/tixwish.1 $pkgdir/usr/share/man/man1
-  cd $srcdir/Tix$pkgver/man
-  for i in *.n; do
-	  cp -p $i $pkgdir/usr/share/man/man3/${i%n}3
-  done
-
-  mkdir -p $pkgdir/usr/share/licenses/tix
-  cp $srcdir/Tix$pkgver/license.terms  $pkgdir/usr/share/licenses/tix/
-}
-
diff --git a/community-testing/tix/tcl-tk-path.patch b/community-testing/tix/tcl-tk-path.patch
deleted file mode 100644
index 2fc12671e..000000000
--- a/community-testing/tix/tcl-tk-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure
---- Tix8.4.3/configure	2008-02-28 04:35:01.000000000 +0000
-+++ Tix8.4.3.my/configure	2009-12-28 10:57:33.000000000 +0000
-@@ -6645,7 +6645,7 @@
- 	        ;;
- 	esac
-     else
--	if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
-+	if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then
- 	    { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5
- echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -6700,7 +6700,7 @@
- 	        ;;
- 	esac
-     else
--	if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then
-+	if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then
- 	    { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5
- echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;}
-    { (exit 1); exit 1; }; }
-
diff --git a/community-testing/tmw/PKGBUILD b/community-testing/tmw/PKGBUILD
deleted file mode 100644
index 09fe4712c..000000000
--- a/community-testing/tmw/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 75740 2012-08-30 16:55:56Z heftig $
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-
-pkgname=tmw
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG."
-arch=('i686' 'x86_64')
-url="http://themanaworld.org"
-license=('GPL')
-depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs'
-	 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf')
-makedepends=('cmake' 'mesa')
-#source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2)
-source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver)
-md5sums=('b021e368c813fb95bea00bbf02e6d607')
-
-build() {
-    cd $srcdir/mana-mana-*
-    cmake . -DCMAKE_INSTALL_PREFIX=/usr
-    make
-}
-
-package() {
-    cd $srcdir/mana-mana-*
-    make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/tor/PKGBUILD b/community-testing/tor/PKGBUILD
deleted file mode 100644
index 91d4f0112..000000000
--- a/community-testing/tor/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 72700 2012-06-20 10:57:00Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=tor
-pkgver=0.2.2.37
-pkgrel=1
-pkgdesc='Anonymizing overlay network.'
-arch=('i686' 'x86_64')
-url='http://www.torproject.org/'
-license=('BSD')
-depends=('openssl' 'libevent' 'tsocks' 'bash')
-makedepends=('ca-certificates')
-backup=('etc/tor/torrc'
-        'etc/tor/torrc-dist'
-        'etc/tor/tor-tsocks.conf'
-        'etc/conf.d/tor')
-install='tor.install'
-source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
-        'torrc'
-        'tor'
-        'tor.conf.d'
-        'tor.service')
-md5sums=('5aafdca4fb6af6e12b503d32b03f14a7'
-         '8d3adf70109d16e860dbf414f9d70eac'
-         '56c75d4e8a66f34167d31e38c43793dd'
-         'f8e6868a389877346e7eebaacd1078bb'
-         '5c7c6834064b3530c442def6079ac3aa'
-         'cf23b97a1da09670214da6229a3ecb09')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -dm0700 "${pkgdir}/var/lib/tor"
-
-  mv "${pkgdir}/etc/tor/torrc.sample" "${pkgdir}/etc/tor/torrc-dist"
-  install -Dm0644 "${srcdir}/torrc" "${pkgdir}/etc/tor/torrc"
-  install -Dm0755 "${srcdir}/tor" "${pkgdir}/etc/rc.d/tor"
-  install -Dm0644 "${srcdir}/tor.conf.d" "${pkgdir}/etc/conf.d/tor"
-
-  install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  install -Dm0644 "${srcdir}/tor.service" "${pkgdir}/usr/lib/systemd/system/tor.service"
-}
diff --git a/community-testing/tor/tor b/community-testing/tor/tor
deleted file mode 100644
index 522c498ce..000000000
--- a/community-testing/tor/tor
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/tor ] && . /etc/conf.d/tor
-
-PID=`pidof -o %PPID /usr/bin/tor`
-case "$1" in
-  start)
-    stat_busy "Starting Tor Daemon"
-    if [ -z "${TOR_MAX_FD}" ] || ulimit -n "${TOR_MAX_FD}"; then
-      [ -z "$PID" ] && /usr/bin/tor -f ${TOR_CONF} ${TOR_ARGS} &>/dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon tor
-        stat_done
-      fi
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Tor Daemon"
-    [ ! -z "$PID" ] && kill -INT $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon tor
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-# vim: ft=sh ts=2 sw=2
diff --git a/community-testing/tor/tor.conf.d b/community-testing/tor/tor.conf.d
deleted file mode 100644
index e9fa098e0..000000000
--- a/community-testing/tor/tor.conf.d
+++ /dev/null
@@ -1,9 +0,0 @@
-# Location of the config file.
-TOR_CONF='/etc/tor/torrc'
-
-# Custom ulimit for maximum number of open files.
-TOR_MAX_FD=
-
-# Additional arguments.
-TOR_ARGS="--quiet"
-
diff --git a/community-testing/tor/tor.install b/community-testing/tor/tor.install
deleted file mode 100644
index 2c448d28e..000000000
--- a/community-testing/tor/tor.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  echo "-> Tor has been preconfigured to run as a client only."
-  echo "-> Tor is experimental software. Do not rely on it for strong anonymity."
-  echo '-> '
-  echo '-> You can set custom file descriptor ulimits for Tor in'
-  echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.'
-  groupadd -g 43 tor &>/dev/null
-  useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null
-  chown tor:tor var/lib/tor &> /dev/null
-  chmod 700 var/lib/tor &> /dev/null
-}
-
-post_upgrade() {
-  echo '-> You can now set custom file descriptor ulimits for Tor in'
-  echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.'
-  getent group tor &>/dev/null || groupadd -g 43 tor &>/dev/null
-  getent passwd tor &>/dev/null || useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null
-  chown tor:tor var/lib/tor &> /dev/null
-}
-
-pre_remove() {
-  getent passwd tor &>/dev/null && userdel tor &> /dev/null
-  getent group tor &>/dev/null && groupdel tor &> /dev/null
-}
diff --git a/community-testing/tor/tor.service b/community-testing/tor/tor.service
deleted file mode 100644
index eb9b556b5..000000000
--- a/community-testing/tor/tor.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Anonymizing Overlay Network
-
-[Service]
-Type=forking
-GuessMainPID=yes
-EnvironmentFile=/etc/conf.d/tor
-ExecStart=/usr/bin/tor -f $TOR_CONF $TOR_ARGS
-ExecReload=/bin/kill -HUP $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/tor/torrc b/community-testing/tor/torrc
deleted file mode 100644
index 3505653ab..000000000
--- a/community-testing/tor/torrc
+++ /dev/null
@@ -1,143 +0,0 @@
-## CONFIGURED FOR ARCHLINUX
-
-## Last updated 22 July 2005 for Tor 0.1.0.13.
-## (May or may not work for older or newer versions of Tor.)
-#
-## See the man page, or http://tor.eff.org/tor-manual.html, for more
-## options you can use in this file.
-#
-# On Unix, Tor will look for this file in someplace like "~/.tor/torrc" or
-# "/etc/torrc"
-#
-# On Windows, Tor will look for the configuration file in someplace like
-# "Application Data\tor\torrc" or "Application Data\<username>\tor\torrc"
-#
-# With the default Mac OS X installer, Tor will look in ~/.tor/torrc or
-# /Library/Tor/torrc
-
-
-## Replace this with "SocksPort 0" if you plan to run Tor only as a
-## server, and not make any local application connections yourself.
-SocksPort 9050 # what port to open for local application connections
-SocksBindAddress 127.0.0.1 # accept connections only from localhost
-#SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port too
-
-## Entry policies to allow/deny SOCKS requests based on IP address.
-## First entry that matches wins. If no SocksPolicy is set, we accept
-## all (and only) requests from SocksBindAddress.
-#SocksPolicy accept 192.168.0.1/16
-#SocksPolicy reject *
-
-## Allow no-name routers (ones that the dirserver operators don't
-## know anything about) in only these positions in your circuits.
-## Other choices (not advised) are entry,exit,introduction.
-AllowUnverifiedNodes middle,rendezvous
-
-## Logs go to stdout at level "notice" unless redirected by something
-## else, like one of the below lines. You can have as many log lines as
-## you want.
-##
-## Send all messages of level 'notice' or higher to /var/log/tor/notices.log
-#Log notice file /var/log/tor/notices.log
-## Send only debug and info messages to /var/log/tor/debug.log
-#Log debug-info file /var/log/tor/debug.log
-## Send ONLY debug messages to /var/log/tor/debug.log
-#Log debug-debug file /var/log/tor/debug.log
-## To use the system log instead of Tor's logfiles, uncomment these lines:
-Log notice syslog
-## To send all messages to stderr:
-#Log debug stderr
-
-## Uncomment this to start the process in the background... or use
-## --runasdaemon 1 on the command line.
-RunAsDaemon 1
-User tor
-Group tor
-
-## Tor only trusts directories signed with one of these keys, and
-## uses the given addresses to connect to the trusted directory
-## servers. If no DirServer lines are specified, Tor uses the built-in
-## defaults (moria1, moria2, tor26), so you can leave this alone unless
-## you need to change it.
-#DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
-#DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
-#DirServer 86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
-
-## The directory for keeping all the keys/etc. By default, we store
-## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
-DataDirectory /var/lib/tor
-
-## The port on which Tor will listen for local connections from Tor controller
-## applications, as documented in control-spec.txt.  NB: this feature is
-## currently experimental.
-#ControlPort 9051
-
-############### This section is just for location-hidden services ###
-
-## Look in .../hidden_service/hostname for the address to tell people.
-## HiddenServicePort x y:z says to redirect a port x request from the
-## client to y:z.
-
-#HiddenServiceDir /var/lib/tor/hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-
-#HiddenServiceDir /var/lib/tor/other_hidden_service/
-#HiddenServicePort 80 127.0.0.1:80
-#HiddenServicePort 22 127.0.0.1:22
-#HiddenServiceNodes moria1,moria2
-#HiddenServiceExcludeNodes bad,otherbad
-
-################ This section is just for servers #####################
-
-## NOTE: If you enable these, you should consider mailing your identity
-## key fingerprint to the tor-ops, so we can add you to the list of
-## servers that clients will trust. See
-## http://tor.eff.org/doc/tor-doc.html#server for details.
-
-## Required: A unique handle for this server
-#Nickname ididnteditheconfig
-
-## The IP or fqdn for this server. Leave commented out and Tor will guess.
-#Address noname.example.com
-
-## Contact info that will be published in the directory, so we can
-## contact you if you need to upgrade or if something goes wrong.
-## This is optional but recommended.
-#ContactInfo Random Person <nobody AT example dot com>
-## You might also include your PGP or GPG fingerprint if you have one:
-#ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com>
-
-## Required: what port to advertise for tor connections
-#ORPort 9001
-## If you want to listen on a port other than the one advertised
-## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment
-## the line below. You'll need to do ipchains or other port forwarding
-## yourself to make this work.
-#ORBindAddress 0.0.0.0:9090
-
-## Uncomment this to mirror the directory for others (please do)
-#DirPort 9030 # what port to advertise for directory connections
-## If you want to listen on a port other than the one advertised
-## in DirPort (e.g. to advertise 80 but bind 9091), uncomment the line
-## below. You'll need to do ipchains or other port forwarding yourself
-## to make this work.
-#DirBindAddress 0.0.0.0:9091
-
-## A comma-separated list of exit policies. They're considered first
-## to last, and the first match wins. If you want to *replace*
-## the default exit policy, end this with either a reject *:* or an
-## accept *:*. Otherwise, you're *augmenting* (prepending to) the
-## default exit policy. Leave commented to just use the default, which is
-## available in the man page or at http://tor.eff.org/documentation.html
-##
-## Look at http://tor.eff.org/faq-abuse.html#TypicalAbuses
-## for issues you might encounter if you use the default exit policy.
-##
-## If certain IPs and ports are blocked externally, e.g. by your firewall,
-## you should update your exit policy to reflect this -- otherwise Tor
-## users will be told that those destinations are down.
-##
-#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more
-#ExitPolicy accept *:119 # accept nntp as well as default exit policy
-#ExitPolicy reject *:* # middleman only -- no exits allowed
-
diff --git a/community-testing/torcs/PKGBUILD b/community-testing/torcs/PKGBUILD
deleted file mode 100644
index e81cc5d25..000000000
--- a/community-testing/torcs/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 77306 2012-10-08 15:41:06Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Shahar Weiss <sweiss4@gmx.net>
-
-pkgname=torcs
-pkgver=1.3.3
-pkgrel=2
-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' 'glu')
-makedepends=('plib')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2
-        torcs.desktop
-        torcs-gcc.patch)
-md5sums=('0319c996dac4480f1182c03d2331b14a'
-         '328e419e9f985c3e7b69924fe299330d'
-         '5ae7e903df37300d3b8744328c756bff')
-
-build() {
-  cd $srcdir/$pkgname-${pkgver/_/-}
-  unset LDFLAGS
-  ./configure --prefix=/usr --x-includes=/usr/include --x-libraries=/usr/lib
-  make
-}
-
-package() {
-  depends=(${depends[@]} "torcs-data=$pkgver")
-  cd $srcdir/$pkgname-${pkgver/_/-}
-  make DESTDIR=${pkgdir} install
-  install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png
-  install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop
-  find ${pkgdir} -type d -exec chmod 755 {} \;
-}
diff --git a/community-testing/torcs/torcs-gcc.patch b/community-testing/torcs/torcs-gcc.patch
deleted file mode 100644
index fcc5604e7..000000000
--- a/community-testing/torcs/torcs-gcc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp
---- src.old/drivers/olethros/Trajectory.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/drivers/olethros/Trajectory.cpp	2008-04-06 22:28:52.000000000 +0200
-@@ -10,8 +10,10 @@
-  ***************************************************************************/
- #include <cstdio>
- #include <cstdlib>
-+#include <cstring>
- #include <cmath>
- #include <cassert>
-+#include <ctime>
- #include <list>
- #include <vector>
- #include "Trajectory.h"
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp	2008-04-06 22:22:57.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- 
- #include <algorithm>
--#include <new.h>
-+#include <new>
- 
- class BBoxCompAxis {
- public:
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp	2008-04-06 22:23:11.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Transform.h"
- #include "BBoxTree.h"
- 
--#include <new.h>
-+#include <new>
- 
- BBoxInternal *free_node;
- 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp	2008-04-06 22:22:29.000000000 +0200
-@@ -32,7 +32,7 @@
- #include "Object.h"
- #include "Encounter.h"
- 
--#include <new.h>
-+#include <new>
- 
- void addPair(ObjectPtr object1, ObjectPtr object2);
- void removePair(ObjectPtr object1, ObjectPtr object2);
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp	2008-04-06 22:22:40.000000000 +0200
-@@ -33,7 +33,7 @@
- #include "Convex.h" 
- #include "Complex.h" 
- 
--#include <new.h>
-+#include <new>
- 
- Object::Object(DtObjectRef obj, ShapePtr shape) : 
-   ref(obj), 
-diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp
---- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:21:31.000000000 +0200
-+++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp	2008-04-06 22:22:12.000000000 +0200
-@@ -37,7 +37,7 @@
- }
- 
- #include <vector>
--#include <new.h>  
-+#include <new>  
- 
- typedef vector<unsigned int> IndexBuf;
- 
diff --git a/community-testing/torcs/torcs.desktop b/community-testing/torcs/torcs.desktop
deleted file mode 100644
index 03d1ba010..000000000
--- a/community-testing/torcs/torcs.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=TORCS
-Comment=The Open Racing Car Simulator
-Exec=torcs
-Icon=torcs.png
-Terminal=false
-Type=Application
-Encoding=UTF-8
-Categories=Application;Game;
diff --git a/community-testing/torcs/torcs.sh b/community-testing/torcs/torcs.sh
deleted file mode 100644
index 0f1b4fe8d..000000000
--- a/community-testing/torcs/torcs.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-export PATH=$PATH:/opt/torcs/bin
diff --git a/community-testing/tp_smapi/PKGBUILD b/community-testing/tp_smapi/PKGBUILD
deleted file mode 100644
index e80492955..000000000
--- a/community-testing/tp_smapi/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: xduugu
-# Contributor: nh2
-# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
-# Contributor: Nick B <Shirakawasuna ð gmail đ com>
-# Contributor: Christof Musik <christof ð senfdax đ de>
-# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
-# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-
-pkgname=tp_smapi
-pkgver=0.41
-pkgrel=5
-pkgdesc="Modules for ThinkPad's SMAPI functionality"
-arch=('i686' 'x86_64')
-url='https://github.com/evgeni/tp_smapi'
-license=('GPL')
-depends=('linux>=3.5' 'linux<3.6')
-makedepends=('linux-headers>=3.5' 'linux-headers<3.6')
-install="${pkgname}.install"
-source=("https://github.com/downloads/evgeni/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('63c683415c764568f6bf17c7eabe4752')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  _kernver=${_kernver:-$(uname -r)}
-  _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true)
-  _kernver=$(< "${_extramodules}/version")
-
-  sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \
-	  -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile
-
-  make HDAPS=1
-}
-
-package() {
-  _kernver=${_kernver:-$(uname -r)}
-  _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true)
-  _kernver=$(< "${_extramodules}/version")
-
-  make -C "${_extramodules%/*}/${_kernver}/build" \
-    INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \
-    M="${srcdir}/${pkgname}-${pkgver}" modules_install
-
-  cd "${pkgdir}/${_extramodules%/*}"
-  mv "${_kernver}/extra" "${_extramodules##*/}"
-  rmdir "${_kernver}"
-
-  # compress kernel modules
-  find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
-
-  # load module on startup
-  echo tp_smapi > "${srcdir}/${pkgname}.conf"
-  install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
-
-  # update kernel version in install file
-  sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install"
-}
diff --git a/community-testing/tp_smapi/tp_smapi.install b/community-testing/tp_smapi/tp_smapi.install
deleted file mode 100644
index 5fe1bab90..000000000
--- a/community-testing/tp_smapi/tp_smapi.install
+++ /dev/null
@@ -1,13 +0,0 @@
-extramodules=/usr/lib/modules/extramodules-3.5-ARCH
-
-post_install() {
-  depmod -v $(< "$extramodules/version") &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community-testing/ubuntuone-client/1339_1338.diff b/community-testing/ubuntuone-client/1339_1338.diff
deleted file mode 100644
index cbd966a70..000000000
--- a/community-testing/ubuntuone-client/1339_1338.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-=== modified file 'tests/platform/sync_menu/test_linux.py'
---- tests/platform/sync_menu/test_linux.py	2012-10-10 14:54:49 +0000
-+++ tests/platform/sync_menu/test_linux.py	2012-10-11 12:01:27 +0000
-@@ -124,6 +124,7 @@
-         """Check that the dummy has the proper methods required by the API."""
-         dummy = linux.DummySyncMenu('random', 'args')
-         self.assertIsInstance(dummy.update_transfers, Callable)
-+        self.assertIsInstance(dummy.sync_status_changed, Callable)
- 
- 
- class SyncMenuTestCase(TestCase):
-
-=== modified file 'ubuntuone/platform/sync_menu/linux.py'
---- ubuntuone/platform/sync_menu/linux.py	2012-10-10 17:06:14 +0000
-+++ ubuntuone/platform/sync_menu/linux.py	2012-10-11 13:00:10 +0000
-@@ -183,7 +183,7 @@
-             self.timer.addCallback(self._timeout)
- 
- 
--class TransfersMenu(Dbusmenu.Menuitem):
-+class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object):
-     """Menu that handles the recent and current transfers."""
- 
-     def __init__(self, status_frontend):
-@@ -227,7 +227,7 @@
-         items_added = 0
-         remove = []
-         for item in self._uploading_items:
--            if item in uploading_data:
-+            if item in uploading_data.keys():
-                 size, written = uploading_data[item]
-                 percentage = written * 100 / size
-                 upload_item = self._uploading_items[item]
-@@ -243,7 +243,7 @@
-         for item in remove:
-             self._uploading_items.pop(item)
-         if items_added < 5:
--            for item in uploading_data:
-+            for item in uploading_data.keys():
-                 if item not in self._uploading_items and items_added < 5:
-                     size, written = uploading_data[item]
-                     percentage = written * 100 / size
-@@ -270,4 +270,12 @@
-     def update_transfers(self):
-         """Do nothing."""
- 
--UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu
-+    def sync_status_changed(self):
-+        """Do nothing."""
-+
-+
-+if use_syncmenu:
-+    UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux
-+else:
-+    UbuntuOneSyncMenu = DummySyncMenu
-+    TransfersMenu = None
-
diff --git a/community-testing/ubuntuone-client/PKGBUILD b/community-testing/ubuntuone-client/PKGBUILD
deleted file mode 100644
index e2f8b8b43..000000000
--- a/community-testing/ubuntuone-client/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 78124 2012-10-16 11:54:37Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=ubuntuone-client
-pkgver=4.0.0
-pkgrel=2
-pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/ubuntuone-client"
-license=('GPL')
-depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'imake' 'gobject-introspection')
-options=('!libtool')
-install=$pkgname.install
-source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz
-        1339_1338.diff
-        fix-notify-hint.patch)
-md5sums=('738039703d4dcf54518a725f8ffbc4de'
-         'e82e80c229de06692988c1f938a34fb9'
-         '54dfeb2be011f0a12ea7cfa0f0c19bec')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
-
-  # Improve TransfersMenu declaration to avoid problems
-  patch -Np0 -i "$srcdir/1339_1338.diff"
-
-  # Workaround for crash in notification-daemon
-  # https://bugzilla.gnome.org/show_bug.cgi?id=665166
-  patch -Np1 -i "$srcdir/fix-notify-hint.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
-              --disable-static \
-              PYTHON=python2
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # We don't have Apport in Arch Linux
-  rm -r "$pkgdir"/{etc/apport,usr/share/apport}
-}
diff --git a/community-testing/ubuntuone-client/fix-notify-hint.patch b/community-testing/ubuntuone-client/fix-notify-hint.patch
deleted file mode 100644
index f32280de9..000000000
--- a/community-testing/ubuntuone-client/fix-notify-hint.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py
---- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py	2012-06-19 15:51:01.000000000 +0200
-+++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py	2012-10-15 01:14:01.019476818 +0200
-@@ -40,7 +40,7 @@
- 
- if 'gi' in sys.modules and sys.modules['gi'] is not None:
-     try:
--        from gi.repository import Notify
-+        from gi.repository import GLib, Notify
-         Notify  # pyflakes
-         NOTIFY_MODULE = 'gi'
-     except ImportError:
-@@ -85,5 +85,6 @@
-         if append:
-             self.notification.set_hint_string('x-canonical-append', '')
- 
--        self.notification.set_hint_int32('transient', int(True))
-+        if NOTIFY_MODULE == 'gi':
-+            self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
-         self.notification.show()
diff --git a/community-testing/ubuntuone-client/ubuntuone-client.install b/community-testing/ubuntuone-client/ubuntuone-client.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community-testing/ubuntuone-client/ubuntuone-client.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/community-testing/unbound/PKGBUILD b/community-testing/unbound/PKGBUILD
deleted file mode 100644
index cefb077c0..000000000
--- a/community-testing/unbound/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 78747 2012-10-23 22:58:34Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
-# Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
-
-pkgname=unbound
-pkgver=1.4.18
-pkgrel=2
-pkgdesc='Validating, recursive, and caching DNS resolver'
-url='http://unbound.net/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-options=('!libtool')
-depends=('openssl' 'ldns')
-makedepends=('expat')
-optdepends=('expat: unbound-anchor')
-backup=('etc/unbound/unbound.conf')
-source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
-        'unbound.service'
-        'unbound.conf'
-        'rc.d')
-sha1sums=('b64b4c9f7981df4e7589ebb770a31352a09db3fb'
-          '5bc313cd978e4d6efe8c13600e838c70629be477'
-          '5d473ec2943fd85367cdb653fcd58e186f07383f'
-          'dc96e772f467b32555df21d16fdb15e98194c228')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--disable-rpath \
-		--with-conf-file=/etc/unbound/unbound.conf \
-		--with-pidfile=/run/unbound.pid \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 ../unbound.conf "${pkgdir}/etc/unbound/unbound.conf"
-	install -D -m644 doc/example.conf.in "${pkgdir}/etc/unbound/unbound.conf.example"
-	install -D -m644 ../unbound.service "${pkgdir}/usr/lib/systemd/system/unbound.service"
-}
diff --git a/community-testing/unbound/install b/community-testing/unbound/install
deleted file mode 100644
index 964792592..000000000
--- a/community-testing/unbound/install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-	getent group unbound &>/dev/null || groupadd -r unbound >/dev/null
-	getent passwd unbound &>/dev/null || useradd -r -g unbound -d /etc/unbound -s /bin/false -c unbound unbound >/dev/null
-}
-
-post_remove() {
-	getent passwd unbound &>/dev/null && userdel unbound >/dev/null
-	getent group unbound &>/dev/null && groupdel unbound >/dev/null
-	return 0
-}
diff --git a/community-testing/unbound/rc.d b/community-testing/unbound/rc.d
deleted file mode 100644
index b5b6466de..000000000
--- a/community-testing/unbound/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=unbound
-prog="/usr/sbin/unbound"
-
-PID=$(pidof -o %PPID $prog)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && eval $prog &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -SIGHUP $PID &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 2
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	exit 1
-	;;
-esac
diff --git a/community-testing/unbound/unbound.conf b/community-testing/unbound/unbound.conf
deleted file mode 100644
index 445bceff1..000000000
--- a/community-testing/unbound/unbound.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-server:
-  username: "unbound"
-  directory: "/etc/unbound"
-  use-syslog: yes
diff --git a/community-testing/unbound/unbound.service b/community-testing/unbound/unbound.service
deleted file mode 100644
index 8b3c9576b..000000000
--- a/community-testing/unbound/unbound.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Unbound DNS Resolver
-
-[Service]
-PIDFile=/run/unbound.pid
-ExecStart=/usr/sbin/unbound -d
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/uniconvertor/PKGBUILD b/community-testing/uniconvertor/PKGBUILD
deleted file mode 100644
index 6c15816af..000000000
--- a/community-testing/uniconvertor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 78126 2012-10-16 11:54:43Z allan $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-
-pkgname=uniconvertor
-pkgver=1.1.5
-pkgrel=6
-pkgdesc="A universal vector graphics translator using sK1 engine."
-arch=('i686' 'x86_64')
-url="http://sk1project.org/modules.php?name=Products&product=uniconvertor"
-license=('GPL')
-depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs')
-makedepends=('gcc')
-source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz)
-md5sums=('d1272315a58304ece2ff588834e23f72')
-
-build() {
-  cd "$srcdir/uniconvertor-$pkgver"
-
-  # python2 fix
-  sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py
-
-  python2 setup.py build
-}
-
-package() {
-  cd "$srcdir/uniconvertor-$pkgver"
-  python2 setup.py install --root="$pkgdir"
-}
diff --git a/community-testing/uptimed/PKGBUILD b/community-testing/uptimed/PKGBUILD
deleted file mode 100644
index a1b63299e..000000000
--- a/community-testing/uptimed/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 72563 2012-06-16 17:11:23Z dreisner $
-# Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Tom Killian <tomk@runbox.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=uptimed
-pkgver=0.3.17
-pkgrel=2
-pkgdesc="A system uptime record daemon"
-arch=(i686 x86_64)
-url="http://podgorny.cz/uptimed/"
-license=('GPL')
-depends=('glibc' 'bash')
-backup=(etc/uptimed.conf)
-options=('!libtool')
-install=$pkgname.install
-source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2
-        rc.d
-        service)
-md5sums=('528b62c33454b33537c3bf2366977bdb'
-         '4ae90bee9fc78014a889a5072effb735'
-         '657102b06613ddb9811427bee1973c6b')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  # Change log path to Arch standard
-  for M in `ls M*`; do
-    sed -i "s|/var/spool/uptimed|$pkgdir/var/log/uptimed|" $M
-  done
-  sed -i 's|spool|log|' libuptimed/urec.h
-
-  autoreconf
-  libtoolize --force
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install
-
-  mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf
-  install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/uptimed
-  install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/uptimed.service
-}
diff --git a/community-testing/uptimed/rc.d b/community-testing/uptimed/rc.d
deleted file mode 100644
index 6fe9ec3e3..000000000
--- a/community-testing/uptimed/rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/uptimed`
-case "$1" in
-  start)
-    stat_busy "Starting Uptimed Daemon"
-    [ -z "$PID" ] && /usr/sbin/uptimed -b    # create the boot record
-    if [ $? -gt 0 ] ; then
-      stat_fail
-    else
-      add_daemon uptimed                     # create the 'state' dir
-      /usr/sbin/uptimed                      # fire up the daemon
-	if [ $? -gt 0 ]; then
-	  stat_fail
-	fi
-      stat_done 
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Uptimed Daemon"
-    [ "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon uptimed                      # remove the 'state' dir
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/uptimed/service b/community-testing/uptimed/service
deleted file mode 100644
index 2fd785318..000000000
--- a/community-testing/uptimed/service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=System uptime record daemon
-
-[Service]
-Type=forking
-PIDFile=/var/run/uptimed
-ExecStartPre=/usr/sbin/uptimed -b
-ExecStart=/usr/sbin/uptimed
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/uptimed/uptimed.install b/community-testing/uptimed/uptimed.install
deleted file mode 100644
index 178061706..000000000
--- a/community-testing/uptimed/uptimed.install
+++ /dev/null
@@ -1,7 +0,0 @@
-# arg 1: the old package version
-pre_remove() {
-	# clean up after ourselves
-	#
-	/bin/rm -rf /var/log/uptimed
-}
-
diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD
deleted file mode 100644
index d869dfaa5..000000000
--- a/community-testing/vdrift/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 75741 2012-08-30 16:56:01Z heftig $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: Lone_Wolf lonewolf@xs4all.nl
-
-pkgname=vdrift
-pkgver=2012.07.22
-pkgrel=1
-pkgdesc="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'
-         'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive')
-makedepends=('scons' 'boost' 'asio')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2
-        http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}c_patch.diff)
-md5sums=('fcfd6b65724d32dfe383df216d7afb74'
-         '981cd26709f97cdf85100b720290177f')
-
-build() {
-  cd VDrift
-
-  # select arch
-  if [ `uname -m` = "x86_64" ]; then
-    _sconsarch="a64"
-  else
-    _sconsarch="686"
-  fi
-
-  patch -Np0 < $srcdir/$pkgname-${pkgver//./-}c_patch.diff
-
-  # build and install
-  scons $MAKEFLAGS \
-    "destdir"="$pkgdir" \
-    "arch"=$_sconsarch \
-    "release"=1 \
-    "force_feedback"=1 \
-    "prefix"=/usr \
-    "datadir"=share/$pkgname/ \
-    "extbullet"=1
-}
-
-package() {
-  cd VDrift
-
-  scons install
-
-  # install .desktop file
-  install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop
-  sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?)
-
-  # 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
-  install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  rm -r "$pkgdir"/usr/share/vdrift
-}
-# vim: sw=2:ts=2 et:
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/vhba-module/60-vhba.rules b/community-testing/vhba-module/60-vhba.rules
deleted file mode 100644
index e4de1dca7..000000000
--- a/community-testing/vhba-module/60-vhba.rules
+++ /dev/null
@@ -1,13 +0,0 @@
-ACTION=="remove", GOTO="vhba_end"
-KERNEL!="vhba_ctl", GOTO="vhba_end"
-
-NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu"
-
-TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess"
-TAG+="udev-acl"
-GOTO="vhba_end"
-
-LABEL="vhba_uaccess"
-TAG+="uaccess"
-
-LABEL="vhba_end"
diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD
deleted file mode 100644
index fbe5b31a7..000000000
--- a/community-testing/vhba-module/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 74539 2012-07-30 09:22:20Z heftig $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Charles Lindsay <charles@chaoslizard.org>
-
-pkgname=vhba-module
-pkgver=20120422
-_extramodules=extramodules-3.5-ARCH
-pkgrel=6
-pkgdesc="Kernel module that emulates SCSI devices"
-arch=('i686' 'x86_64')
-url="http://cdemu.sourceforge.net/"
-license=('GPL')
-depends=('linux>=3.5' 'linux<3.6')
-makedepends=('linux-headers')
-options=(!makeflags)
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
-        '60-vhba.rules')
-md5sums=('d97372da1d270d1605742b2995fb6678'
-         'b5e82d0160e7a181219b67c1794d5c27')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
-
-  make KDIR=/usr/lib/modules/$_kernver/build
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  install -Dm644 vhba.ko \
-    "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko"
-
-  sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \
-    "$startdir/vhba-module.install"
-
-  install -Dm644 "$srcdir/60-vhba.rules" \
-	  "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install
deleted file mode 100644
index 3704282a7..000000000
--- a/community-testing/vhba-module/vhba-module.install
+++ /dev/null
@@ -1,21 +0,0 @@
-_updatemod() {
-  echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.5-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  post_upgrade
-}
-
-post_upgrade() {
-  getent group cdemu &>/dev/null || groupadd cdemu
-  _updatemod
-}
-
-post_remove() {
-  _updatemod
-  groupdel cdemu
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/virtkey/PKGBUILD b/community-testing/virtkey/PKGBUILD
deleted file mode 100644
index 7d350b553..000000000
--- a/community-testing/virtkey/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: codl <codl@aquageek.net>
-# Contributor: Megamixman <Megamixman@gmail.com>
-
-pkgbase=virtkey
-pkgname=('python2-virtkey' 'python-virtkey')
-pkgver=0.61.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url="https://launchpad.net/virtkey"
-license=('LGPL')
-makedepends=('python2' 'python' 'libxtst' 'gtk2')
-source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz)
-md5sums=('536d30acb2c8ddadc6b4a26fc01e8390')
-
-build() {
-  cd "$srcdir"
-
-  cp -a {,python2-}$pkgbase-$pkgver
-
-  # Build python 2 module
-  cd "$srcdir/python2-$pkgbase-$pkgver"
-  python2 setup.py build
-
-  # Build python 3 module
-  cd "$srcdir/$pkgbase-$pkgver"
-  python setup.py build
-}
-
-package_python2-virtkey() {
-  pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server"
-  depends=('python2' 'libxtst' 'gtk2')
-
-  cd "$srcdir/python2-$pkgbase-$pkgver"
-
-  python2 setup.py install --root=$pkgdir/ --optimize=1
-}
-
-package_python-virtkey() {
-  pkgdesc="Python extension for emulating keypresses and getting layout information from the X server"
-  depends=('python' 'libxtst' 'gtk2')
-
-  cd "$srcdir/$pkgbase-$pkgver"
-
-  python3 setup.py install --root=$pkgdir/ --optimize=1
-}
diff --git a/community-testing/virtualbox-modules-lts/PKGBUILD b/community-testing/virtualbox-modules-lts/PKGBUILD
deleted file mode 100644
index 493f7cc3a..000000000
--- a/community-testing/virtualbox-modules-lts/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 77089 2012-10-04 16:56:39Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgbase=virtualbox-modules-lts
-pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('linux-lts-headers'
-             "virtualbox-host-source>=$pkgver"
-             "virtualbox-guest-source>=$pkgver"
-             'expac')
-
-build() {
-  # current kernel version
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  # dkms need modification to be run as user
-  cp -r /var/lib/dkms .
-  echo "dkms_tree='$srcdir/dkms'" > dkms.conf
-  # build host modules
-  msg2 'Host modules'
-  dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
-  # build guest modules
-  msg2 'Guest modules'
-  dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
-}
-
-package_virtualbox-host-modules-lts(){
-  pkgdesc='Host kernel modules for VirtualBox'
-  depends=('linux-lts>=3.0' 'linux-lts<3.1')
-  replaces=('virtualbox-modules-lts')
-  conflicts=('virtualbox-modules-lts')
-  provides=("virtualbox-host-modules=$pkgver")
-  install=virtualbox-host-modules-lts.install
-
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  _extraver=extramodules-${_kernver%.*}-lts
-
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
-  cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules-lts.install"
-}
-
-package_virtualbox-guest-modules-lts(){
-  pkgdesc='Guest kernel modules for VirtualBox'
-  license=('GPL')
-  depends=('linux-lts>=3.0' 'linux-lts<3.1')
-  replaces=('virtualbox-archlinux-modules-lts')
-  conflicts=('virtualbox-archlinux-modules-lts')
-  provides=("virtualbox-host-modules=$pkgver")
-  install=virtualbox-guest-modules-lts.install
-
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  _extraver=extramodules-${_kernver%.*}-lts
-
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
-  cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules-lts.install"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/virtualbox-modules-lts/build.sh b/community-testing/virtualbox-modules-lts/build.sh
deleted file mode 100755
index 828448cab..000000000
--- a/community-testing/virtualbox-modules-lts/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if (( $# != 1 )); then
-  echo "usage: $0 extra"
-  echo "       $0 testing"
-  exit 1
-fi
-
-$1-i686-build
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
-
-$1-x86_64-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -r /var/lib/archbuild/$1-x86_64
-
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
deleted file mode 100644
index d2984a743..000000000
--- a/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRAMODULES='extramodules-3.0-lts'
-
-post_install() {
-cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install
deleted file mode 100644
index 07ecf7311..000000000
--- a/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install
+++ /dev/null
@@ -1,18 +0,0 @@
-EXTRAMODULES='extramodules-3.0-lts'
-
-post_install() {
-cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD
deleted file mode 100644
index 5cb7fc64d..000000000
--- a/community-testing/virtualbox-modules/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 78656 2012-10-22 13:29:39Z tpowa $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.2
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('linux-headers'
-             "virtualbox-host-source>=$pkgver"
-             "virtualbox-guest-source>=$pkgver"
-             'expac')
-
-build() {
-  # current kernel version
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
-  #_kernver=3.6.0-1-ARCH
-  # dkms need modification to be run as user
-  cp -r /var/lib/dkms .
-  echo "dkms_tree='$srcdir/dkms'" > dkms.conf
-  # build host modules
-  msg2 'Host modules'
-  dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
-  # build guest modules
-  msg2 'Guest modules'
-  dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
-}
-
-package_virtualbox-host-modules(){
-  pkgdesc='Host kernel modules for VirtualBox'
-  depends=('linux>=3.6' 'linux<3.7')
-  replaces=('virtualbox-modules')
-  conflicts=('virtualbox-modules')
-  install=virtualbox-host-modules.install
-
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
-  # _kernver=3.6.0-1-ARCH
-  _extraver=extramodules-${_kernver%.*}-ARCH
-
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
-  cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install"
-}
-
-package_virtualbox-guest-modules(){
-  pkgdesc='Guest kernel modules for VirtualBox'
-  license=('GPL')
-  depends=('linux>=3.6' 'linux<3.7')
-  replaces=('virtualbox-archlinux-modules')
-  conflicts=('virtualbox-archlinux-modules')
-  install=virtualbox-guest-modules.install
-
-  _kernver=$(expac -Q '%v' linux-headers)-ARCH
-  #_kernver=3.6.0-1-ARCH
-  _extraver=extramodules-${_kernver%.*}-ARCH
-
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
-  cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/virtualbox-modules/build.sh b/community-testing/virtualbox-modules/build.sh
deleted file mode 100755
index 828448cab..000000000
--- a/community-testing/virtualbox-modules/build.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if (( $# != 1 )); then
-  echo "usage: $0 extra"
-  echo "       $0 testing"
-  exit 1
-fi
-
-$1-i686-build
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
-
-$1-x86_64-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -r /var/lib/archbuild/$1-x86_64
-
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community-testing/virtualbox-modules/virtualbox-guest-modules.install b/community-testing/virtualbox-modules/virtualbox-guest-modules.install
deleted file mode 100644
index e5d1038af..000000000
--- a/community-testing/virtualbox-modules/virtualbox-guest-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.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/virtualbox-modules/virtualbox-host-modules.install b/community-testing/virtualbox-modules/virtualbox-host-modules.install
deleted file mode 100644
index 3f2ed4a10..000000000
--- a/community-testing/virtualbox-modules/virtualbox-host-modules.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-    EXTRAMODULES='extramodules-3.6-ARCH'
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-testing/vnstat/PKGBUILD b/community-testing/vnstat/PKGBUILD
deleted file mode 100644
index 773763a24..000000000
--- a/community-testing/vnstat/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 72564 2012-06-16 17:11:28Z dreisner $
-# Maintainer:  Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de>
-
-pkgname=vnstat
-pkgver=1.11
-pkgrel=3
-pkgdesc="A console-based network traffic monitor"
-arch=('i686' 'x86_64')
-url="http://humdi.net/vnstat/"
-license=('GPL')
-depends=('bash')
-makedepends=('gd')
-optdepends=('gd: image output')
-backup=(etc/vnstat.conf)
-source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz
-        http://humdi.net/vnstat/init.d/arch/vnstat
-        service)
-md5sums=('a5a113f9176cd61fb954f2ba297f5fdb'
-         'e89a566dd7514ff0d2d3fc77b2d4ca7e'
-         'fcc189e3dee616ff414dac72637c1a19')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  make all
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver 
-  make DESTDIR=$pkgdir install
-
-  install -D -m0755 $srcdir/vnstat $pkgdir/etc/rc.d/vnstat
-  install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/vnstat.service
-
-  install -D -m0644 examples/vnstat.cron $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron
-  install -D -m0755 examples/vnstat.cgi $pkgdir/usr/share/doc/vnstat/examples/vnstat.cgi
-  sed -i 's#root##' $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron
-}
diff --git a/community-testing/vnstat/service b/community-testing/vnstat/service
deleted file mode 100644
index f312351ea..000000000
--- a/community-testing/vnstat/service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Network traffic monitor
-
-[Service]
-ExecStart=/usr/sbin/vnstatd -n
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/vsftpd/PKGBUILD b/community-testing/vsftpd/PKGBUILD
deleted file mode 100644
index c4208743b..000000000
--- a/community-testing/vsftpd/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 72565 2012-06-16 17:11:45Z dreisner $
-# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=vsftpd
-pkgver=3.0.0
-pkgrel=3
-pkgdesc="Very Secure FTP daemon"
-arch=('i686' 'x86_64')
-url="https://security.appspot.com/vsftpd.html"
-license=('GPL2')
-depends=('openssl')
-backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd')
-install=vsftpd.install
-source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc}
-        vsftpd.xinetd vsftpd.d  vsftpd-ssl.socket  vsftpd.socket
-        vsftpd.service  vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service)
-sha1sums=('436da30cefa33e22a0266077ab95397e9432e297'
-          '2142ac8a84f18ecc1ebac21b9ac07858c35ae6af'
-          'c87b4ce56dac15223694a6e86c01ea813b877596'
-          '24f268956c24e78be0c234c6d31f41487922eafe'
-          'f81dab50243f7e82dc9722ca79b2b24de0882eb2'
-          '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba'
-          'f1fa8cfaab1541c1ce3bb4dab4f4b302e5c44b03'
-          '3a040a18893a5103a1d4a22e631ee247bde8c8d3'
-          '08b2938dc81ee200b6d733a32f5565b9dbe170a3'
-          'e5bd183664008bb0cc0353d4efb2e8e92a365798')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # build-time config
-  sed \
-    -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \
-    -i builddefs.h
-
-  CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  install -D -m755 vsftpd $pkgdir/usr/sbin/vsftpd
-  install -D -m644 vsftpd.conf $pkgdir/etc/vsftpd.conf
-  install -D -m644 vsftpd.8 $pkgdir/usr/share/man/man8/vsftpd.8
-  install -D -m644 vsftpd.conf.5 $pkgdir/usr/share/man/man5/vsftpd.conf.5
-  install -D -m644 $srcdir/vsftpd.xinetd $pkgdir/etc/xinetd.d/vsftpd
-  install -D -m755 $srcdir/vsftpd.d $pkgdir/etc/rc.d/vsftpd
-
-  install -D -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service
-  install -D -m644 $srcdir/vsftpd@.service $pkgdir/usr/lib/systemd/system/vsftpd@.service 
-  install -D -m644 $srcdir/vsftpd-ssl.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl.service
-  install -D -m644 $srcdir/vsftpd-ssl@.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl@.service
-  install -D -m644 $srcdir/vsftpd.socket $pkgdir/usr/lib/systemd/system/vsftpd.socket
-  install -D -m644 $srcdir/vsftpd-ssl.socket $pkgdir/usr/lib/systemd/system/vsftpd-ssl.socket
-
-  install -d -m755 $pkgdir/usr/share/empty
-}
diff --git a/community-testing/vsftpd/vsftpd-ssl.service b/community-testing/vsftpd/vsftpd-ssl.service
deleted file mode 100644
index f46b05fcd..000000000
--- a/community-testing/vsftpd/vsftpd-ssl.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=vsftpd daemon (legacy implicit SSL)
-
-[Service]
-ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes -oimplicit_ssl=yes
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/vsftpd/vsftpd-ssl.socket b/community-testing/vsftpd/vsftpd-ssl.socket
deleted file mode 100644
index b18b639c1..000000000
--- a/community-testing/vsftpd/vsftpd-ssl.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=vsftpd.service
-
-[Socket]
-ListenStream=990
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/community-testing/vsftpd/vsftpd-ssl@.service b/community-testing/vsftpd/vsftpd-ssl@.service
deleted file mode 100644
index e53fad324..000000000
--- a/community-testing/vsftpd/vsftpd-ssl@.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=vsftpd per-connection server (legacy implicit SSL)
-
-[Service]
-ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardOutput=socket
-StandardError=syslog
diff --git a/community-testing/vsftpd/vsftpd.d b/community-testing/vsftpd/vsftpd.d
deleted file mode 100644
index 27310855c..000000000
--- a/community-testing/vsftpd/vsftpd.d
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-daemon_name=vsftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name &
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/community-testing/vsftpd/vsftpd.install b/community-testing/vsftpd/vsftpd.install
deleted file mode 100644
index 48f134e24..000000000
--- a/community-testing/vsftpd/vsftpd.install
+++ /dev/null
@@ -1,17 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then
-    echo ">>> It appears that your current kernel has linux security"
-    echo ">>> capabilities built as a module.  vsftpd requires this"
-    echo ">>> functionality to operate."
-    echo ">>>"
-    echo ">>> To activate the module, please load it now (modprobe capability)."
-    echo ">>> Also, you should add it to your MODULES array in rc.conf, so"
-    echo ">>> it will be activated automatically at boot-up."
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
diff --git a/community-testing/vsftpd/vsftpd.service b/community-testing/vsftpd/vsftpd.service
deleted file mode 100644
index d4f7251ba..000000000
--- a/community-testing/vsftpd/vsftpd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=vsftpd daemon
-
-[Service]
-ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community-testing/vsftpd/vsftpd.socket b/community-testing/vsftpd/vsftpd.socket
deleted file mode 100644
index cdc0d337e..000000000
--- a/community-testing/vsftpd/vsftpd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Conflicts=vsftpd.service
-
-[Socket]
-ListenStream=21
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/community-testing/vsftpd/vsftpd.xinetd b/community-testing/vsftpd/vsftpd.xinetd
deleted file mode 100644
index eff2eb3db..000000000
--- a/community-testing/vsftpd/vsftpd.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service ftp
-{
-        socket_type             = stream
-        wait                    = no
-        user                    = root
-        server                  = /usr/sbin/vsftpd
-        log_on_success  += HOST DURATION
-        log_on_failure  += HOST
-        disable                 = yes
-}
diff --git a/community-testing/vsftpd/vsftpd@.service b/community-testing/vsftpd/vsftpd@.service
deleted file mode 100644
index 353f95f82..000000000
--- a/community-testing/vsftpd/vsftpd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=vsftpd per-connection server
-
-[Service]
-ExecStart=-/usr/sbin/vsftpd
-ExecReload=/bin/kill -HUP $MAINPID
-StandardInput=socket
-StandardError=syslog
diff --git a/community-testing/warmux/PKGBUILD b/community-testing/warmux/PKGBUILD
deleted file mode 100644
index 901d43506..000000000
--- a/community-testing/warmux/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 75742 2012-08-30 16:56:08Z heftig $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: pukyxd 
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-
-pkgname=warmux
-pkgver=11.04.1
-pkgrel=5
-pkgdesc="A clone of the worms game"
-arch=('i686' 'x86_64')
-url="http://www.wormux.org/"
-license=('GPL')
-makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
-replaces=('wormux')
-source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	include-zlib.patch
-	gcc-fix.patch)
-md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
-         'c8285955e880f80e3c68312715a3061c'
-         'ab50d613d3fa3f71262b1d2fc71641b1')
-
-build() { 
-  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
-  # libpng 1.5 fix
-  patch -Np1 -i ../include-zlib.patch
-  # gcc fix
-  patch -Np1 -i ../gcc-fix.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}")
-
-  cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
-  make DESTDIR="${pkgdir}" install
-  rm -r ${pkgdir}/usr/share/warmux
-}
diff --git a/community-testing/warmux/gcc-fix.patch b/community-testing/warmux/gcc-fix.patch
deleted file mode 100644
index 1ac476b92..000000000
--- a/community-testing/warmux/gcc-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-## i-love-you-lordheavy.patch [diff]
-diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
---- warmux-11.04/lib/warmux/action/action.cpp	2011-04-28 21:03:14.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/action/action.cpp	2012-01-29 09:51:16.680251815 +0100
-@@ -81,7 +81,7 @@
- }
- 
- // Build an action from a network packet
--Action::Action(const char *buffer, DistantComputer* _creator)
-+Action::Action(char *buffer, DistantComputer* _creator)
- {
-   m_creator = _creator;
- 
-diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
---- warmux-11.04/lib/warmux/include/WARMUX_action.h	2011-04-28 21:03:13.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h	2012-01-29 09:52:14.246921833 +0100
-@@ -168,7 +168,7 @@
-   Action(Action_t type, Double value1, Double value2);
- 
-   // Build an action from a network packet
--  Action(const char* buffer, DistantComputer* _creator);
-+  Action(char* buffer, DistantComputer* _creator);
- 
-   ~Action();
- 
-Description: Fix FTBFS with gcc 4.7.
-Author: Felix Geyer <debfx-pkg@fobos.de>
-
---- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
-+++ warmux-11.04.1+repack/tools/list_games/main.cpp
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <unistd.h>
- #include <WARMUX_types.h>
- #include <WARMUX_network.h>
- #include <WARMUX_index_server.h>
diff --git a/community-testing/warmux/include-zlib.patch b/community-testing/warmux/include-zlib.patch
deleted file mode 100644
index c7e77aba1..000000000
--- a/community-testing/warmux/include-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
---- warmux-11.04.orig/src/graphic/surface.cpp	2011-09-19 09:26:52.392650465 +0200
-+++ warmux-11.04/src/graphic/surface.cpp	2011-09-19 09:26:19.417648189 +0200
-@@ -25,6 +25,7 @@
- #include <SDL_image.h>
- #include <SDL_rotozoom.h>
- #include <png.h>
-+#include <zlib.h>
- 
- #include "graphic/surface.h"
- #include "tool/math_tools.h"
diff --git a/community-testing/warzone2100/PKGBUILD b/community-testing/warzone2100/PKGBUILD
deleted file mode 100644
index 0fbaa7e37..000000000
--- a/community-testing/warzone2100/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 77388 2012-10-09 14:04:20Z lcarlier $
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
-
-pkgname=warzone2100
-pkgver=2.3.9
-pkgrel=3
-pkgdesc="3D realtime strategy game on a future Earth"
-url="http://wz2100.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('sdl' 'openal' 'libpng' 'libvorbis' 'libtheora' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu')
-makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'asciidoc')
-source=(#"http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        "http://downloads.sourceforge.net/project/warzone2100/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7185090a089c9c0e0eca7535a8f25dca')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --with-distributor="Arch linux"
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/community-testing/wesnoth/PKGBUILD b/community-testing/wesnoth/PKGBUILD
deleted file mode 100644
index 7dd4f3584..000000000
--- a/community-testing/wesnoth/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 73779 2012-07-15 13:21:13Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Jacobo Arvelo <unix4all@ya.com>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=wesnoth
-pkgver=1.10.3
-pkgrel=2
-pkgdesc="A turn-based strategy game on a fantasy world"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.wesnoth.org/"
-depends=('sdl_ttf' 'sdl_net' 'sdl_mixer' 'sdl_image' 'fribidi' 'boost-libs' 'pango' 'lua' "wesnoth-data" 'dbus-core' 'python2')
-makedepends=('boost' 'cmake')
-install=wesnoth.install
-options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
-        wesnoth.tmpfiles.conf
-        wesnothd.rc.d
-        boost_foreach.patch)
-md5sums=('b25354c71d58f82c2c60cc12c6f09c36'
-         'b8122f5054e3895c9c054e87460869dc'
-         '85659b47d22dfdf4e4d046556973fc3e'
-         '07e78c6ece06ed10119fc57ebc16ea9d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  patch -Np0 < $srcdir/boost_foreach.patch
-
-  mkdir build && cd build
-  cmake .. \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DENABLE_OMP=ON \
-      -DENABLE_TOOLS=ON \
-      -DMANDIR=share/man \
-      -DFIFO_DIR=/var/run/wesnothd
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cd build
-  make DESTDIR="$pkgdir" install
-
-  rm -r $pkgdir/usr/share/applications
-  rm -r $pkgdir/usr/share/doc
-  rm -r $pkgdir/usr/share/pixmaps
-  rm -r $pkgdir/usr/share/wesnoth
-
-  install -Dm644 "$srcdir/wesnoth.tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/wesnoth.conf"
-  install -Dm755 "$srcdir/wesnothd.rc.d" "$pkgdir/etc/rc.d/wesnothd"
-}
diff --git a/community-testing/wesnoth/boost_foreach.patch b/community-testing/wesnoth/boost_foreach.patch
deleted file mode 100644
index 95b98828e..000000000
--- a/community-testing/wesnoth/boost_foreach.patch
+++ /dev/null
@@ -1,11890 +0,0 @@
-------------------------------------------------------------------------
-r54625 | loonycyborg | 2012-07-08 16:26:21 +0200 (So, 08 Jul 2012) | 5 lines
-
-Backport r54604: Use BOOST_FOREACH directly instead of #define foreach BOOST_FOREACH
-
-The define is extremely unreliable, will break compile with boost >=
-1.50 and upstream can't fix issues with it, see
-https://svn.boost.org/trac/boost/ticket/6131
-
-Index: src/foreach.hpp (deleted)
-===================================================================
-Index: src/scripting/lua.cpp
-===================================================================
---- src/scripting/lua.cpp	(revision 54624)
-+++ src/scripting/lua.cpp	(revision 54625)
-@@ -39,7 +39,6 @@
- #include "ai/manager.hpp"
- #include "attack_prediction.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gamestatus.hpp"
-@@ -77,6 +76,8 @@
- #include "scripting/debug_lua.hpp"
- #endif
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_scripting_lua("scripting/lua");
- #define LOG_LUA LOG_STREAM(info, log_scripting_lua)
- #define ERR_LUA LOG_STREAM(err, log_scripting_lua)
-@@ -87,7 +88,7 @@
- void extract_preload_scripts(config const &game_config)
- {
- 	preload_scripts.clear();
--	foreach (config const &cfg, game_config.child_range("lua")) {
-+	BOOST_FOREACH(config const &cfg, game_config.child_range("lua")) {
- 		preload_scripts.push_back(cfg);
- 	}
- 	preload_config = game_config.child("game_config");
-@@ -254,7 +255,7 @@
- 		return;
- 
- 	int k = 1;
--	foreach (const config::any_child &ch, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &ch, cfg.all_children_range())
- 	{
- 		lua_createtable(L, 2, 0);
- 		lua_pushstring(L, ch.key.c_str());
-@@ -264,7 +265,7 @@
- 		lua_rawseti(L, -2, 2);
- 		lua_rawseti(L, -2, k++);
- 	}
--	foreach (const config::attribute &attr, cfg.attribute_range())
-+	BOOST_FOREACH(const config::attribute &attr, cfg.attribute_range())
- 	{
- 		luaW_pushscalar(L, attr.second);
- 		lua_setfield(L, -2, attr.first.c_str());
-@@ -534,7 +535,7 @@
- {
- 	if (ptr) return ptr;
- 	if (side) {
--		foreach (unit &u, (*resources::teams)[side - 1].recall_list()) {
-+		BOOST_FOREACH(unit &u, (*resources::teams)[side - 1].recall_list()) {
- 			if (u.underlying_id() == uid) return &u;
- 		}
- 		return NULL;
-@@ -710,7 +711,7 @@
- 	if (shallow_literal || strcmp(m, "__shallow_parsed") == 0)
- 	{
- 		lua_newtable(L);
--		foreach (const config::attribute &a, v->get_config().attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &a, v->get_config().attribute_range()) {
- 			if (shallow_literal)
- 				luaW_pushscalar(L, a.second);
- 			else
-@@ -813,7 +814,7 @@
- 		const std::vector<std::string>& vector = accessor; \
- 		lua_createtable(L, vector.size(), 0); \
- 		int i = 1; \
--		foreach (const std::string& s, vector) { \
-+		BOOST_FOREACH(const std::string& s, vector) { \
- 			lua_pushstring(L, s.c_str()); \
- 			lua_rawseti(L, -2, i); \
- 			++i; \
-@@ -1292,9 +1293,9 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_newtable(L);
- 	int i = 1, s = 1;
--	foreach (team &t, *resources::teams)
-+	BOOST_FOREACH(team &t, *resources::teams)
- 	{
--		foreach (unit &u, t.recall_list())
-+		BOOST_FOREACH(unit &u, t.recall_list())
- 		{
- 			if (!filter.null()) {
- 				scoped_recall_unit auto_store("this_unit",
-@@ -1560,7 +1561,7 @@
- 		std::set<std::string> const &recruits = t.recruits();
- 		lua_createtable(L, recruits.size(), 0);
- 		int i = 1;
--		foreach (std::string const &r, t.recruits()) {
-+		BOOST_FOREACH(std::string const &r, t.recruits()) {
- 			lua_pushstring(L, r.c_str());
- 			lua_rawseti(L, -2, i++);
- 		}
-@@ -3130,7 +3131,7 @@
- 
- 	lua_createtable(L, res.size(), 0);
- 	int i = 1;
--	foreach (map_location const &loc, res)
-+	BOOST_FOREACH(map_location const &loc, res)
- 	{
- 		lua_createtable(L, 2, 0);
- 		lua_pushinteger(L, loc.x + 1);
-@@ -3227,7 +3228,7 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_createtable(L, sides.size(), 0);
- 	unsigned index = 1;
--	foreach(int side, sides) {
-+	BOOST_FOREACH(int side, sides) {
- 		// Create a full userdata containing a pointer to the team.
- 		team** t = static_cast<team**>(lua_newuserdata(L, sizeof(team*)));
- 		*t = &((*resources::teams)[side - 1]);
-@@ -3247,7 +3248,7 @@
- static int intf_get_traits(lua_State* L)
- {
- 	lua_newtable(L);
--	foreach(const config& trait, unit_types.traits()) {
-+	BOOST_FOREACH(const config& trait, unit_types.traits()) {
- 		const std::string& id = trait["id"];
- 		//It seems the engine does nowhere check the id field for emptyness or duplicates
- 		//(also not later on).
-@@ -3767,7 +3768,7 @@
- 			, static_cast<void *>(const_cast<char *>(&gettypeKey)));
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	lua_newtable(L);
--	foreach (const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
- 	{
- 		lua_createtable(L, 0, 1);
- 		lua_pushstring(L, ut.first.c_str());
-@@ -3786,7 +3787,7 @@
- 	lua_rawget(L, LUA_REGISTRYINDEX);
- 	const race_map& races = unit_types.races();
- 	lua_createtable(L, 0, races.size());
--	foreach(const race_map::value_type &race, races)
-+	BOOST_FOREACH(const race_map::value_type &race, races)
- 	{
- 		lua_createtable(L, 0, 1);
- 		char const* id = race.first.c_str();
-@@ -3801,10 +3802,10 @@
- 
- 	// Execute the preload scripts.
- 	game_config::load_config(preload_config);
--	foreach (const config &cfg, preload_scripts) {
-+	BOOST_FOREACH(const config &cfg, preload_scripts) {
- 		execute(cfg["code"].str().c_str(), 0, 0);
- 	}
--	foreach (const config &cfg, level_.child_range("lua")) {
-+	BOOST_FOREACH(const config &cfg, level_.child_range("lua")) {
- 		execute(cfg["code"].str().c_str(), 0, 0);
- 	}
- 
-@@ -3822,7 +3823,7 @@
- 
- static bool is_handled_file_tag(const std::string &s)
- {
--	foreach (char const *t, handled_file_tags) {
-+	BOOST_FOREACH(char const *t, handled_file_tags) {
- 		if (s == t) return true;
- 	}
- 	return false;
-@@ -3841,7 +3842,7 @@
- 
- 	lua_newtable(L);
- 	int k = 1;
--	foreach (const config::any_child &v, level_.all_children_range())
-+	BOOST_FOREACH(const config::any_child &v, level_.all_children_range())
- 	{
- 		if (is_handled_file_tag(v.key)) continue;
- 		lua_createtable(L, 2, 0);
-@@ -3861,7 +3862,7 @@
-  */
- void LuaKernel::save_game(config &cfg)
- {
--	foreach (const config &v, level_.child_range("lua")) {
-+	BOOST_FOREACH(const config &v, level_.child_range("lua")) {
- 		cfg.add_child("lua", v);
- 	}
- 
-Index: src/dialogs.cpp
-===================================================================
---- src/dialogs.cpp	(revision 54624)
-+++ src/dialogs.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "actions.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -49,6 +48,7 @@
- #include "gui/dialogs/game_save.hpp"
- #include "gui/dialogs/transient_message.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- //#ifdef _WIN32
- //#include "locale.h"
-@@ -95,7 +95,7 @@
- 	}
- 
- 	bool always_display = false;
--	foreach (const config &mod, u->get_modification_advances())
-+	BOOST_FOREACH(const config &mod, u->get_modification_advances())
- 	{
- 		if (mod["always_display"].to_bool()) always_display = true;
- 		sample_units.push_back(::get_advanced_unit(*u, u->type_id()));
-@@ -1009,7 +1009,7 @@
- 	}
- 
- 	//FIXME: This probably must be move into a unit_type function
--	foreach (const config &tr, t->possible_traits())
-+	BOOST_FOREACH(const config &tr, t->possible_traits())
- 	{
- 		if (tr["availability"] != "musthave") continue;
- 		std::string gender_string = (!t->genders().empty() && t->genders().front()== unit_race::FEMALE) ? "female_name" : "male_name";
-@@ -1038,7 +1038,7 @@
- 	// Check if AMLA color is needed
- 	// FIXME: not sure if it's fully accurate (but not very important for unit_type)
- 	// xp_color also need a simpler function for doing this
--	foreach (const config &adv, t->modification_advancements())
-+	BOOST_FOREACH(const config &adv, t->modification_advancements())
- 	{
- 		if (!adv["strict_amla"].to_bool() || !t->can_advance()) {
- 			det.xp_color = "<170,0,255>"; // from unit::xp_color()
-Index: src/menu_events.cpp
-===================================================================
---- src/menu_events.cpp	(revision 54624)
-+++ src/menu_events.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "dialogs.hpp"
- #include "formatter.hpp"
- #include "filechooser.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -66,6 +65,7 @@
- #include "widgets/combo.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -863,7 +863,7 @@
- 
- 
- 	DBG_WB <<"menu_handler::recall: Contents of wb-modified recall list:\n";
--	foreach(const unit* unit, recall_list_team)
-+	BOOST_FOREACH(const unit* unit, recall_list_team)
- 	{
- 		DBG_WB << unit->name() << " [" << unit->id() <<"]\n";
- 	}
-@@ -896,7 +896,7 @@
- 	options.push_back(heading.str());
- 	options_to_filter.push_back(options.back());
- 
--	foreach (const unit* u, recall_list_team)
-+	BOOST_FOREACH(const unit* u, recall_list_team)
- 	{
- 		std::stringstream option, option_to_filter;
- 		std::string name = u->name();
-@@ -933,7 +933,7 @@
- 		option_to_filter << u->type_name() << " " << name << " " << u->level();
- 
- 		option << COLUMN_SEPARATOR;
--		foreach (const t_string& trait, u->trait_names()) {
-+		BOOST_FOREACH(const t_string& trait, u->trait_names()) {
- 			option << trait << '\n';
- 			option_to_filter << " " << trait;
- 		}
-@@ -1540,7 +1540,7 @@
- 								_("Type");
- 	options.push_back(heading);
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		std::stringstream row;
- 
-@@ -2047,7 +2047,7 @@
- 		std::vector<std::string> get_commands_list() const
- 		{
- 			std::vector<std::string> res;
--			foreach(typename command_map::value_type i, command_map_) {
-+			BOOST_FOREACH(typename command_map::value_type i, command_map_) {
- 				res.push_back(i.first);
- 			}
- 			return res;
-@@ -2638,7 +2638,7 @@
- 
- 			if (const config &alias_list = preferences::get_alias())
- 			{
--				foreach (const config::attribute &a, alias_list.attribute_range()) {
-+				BOOST_FOREACH(const config::attribute &a, alias_list.attribute_range()) {
- 					register_alias(a.second, a.first);
- 				}
- 			}
-@@ -3241,7 +3241,7 @@
- 	tile->rebuild_cache(tod_id, &tile_logs);
- 
- 	int order = 1;
--	foreach(const terrain_builder::tile::log_details det, tile_logs) {
-+	BOOST_FOREACH(const terrain_builder::tile::log_details det, tile_logs) {
- 		const terrain_builder::tile::rule_image_rand& ri = *det.first;
- 		const terrain_builder::rule_image_variant& variant = *det.second;
- 
-@@ -3356,7 +3356,7 @@
- void console_handler::do_choose_level() {
- 	std::vector<std::string> options;
- 	int next = 0, nb = 0;
--	foreach (const config &sc, menu_handler_.game_config_.child_range("scenario"))
-+	BOOST_FOREACH(const config &sc, menu_handler_.game_config_.child_range("scenario"))
- 	{
- 		const std::string &id = sc["id"];
- 		options.push_back(id);
-@@ -3367,7 +3367,7 @@
- 	// find scenarios of multiplayer campaigns
- 	// (assumes that scenarios are ordered properly in the game_config)
- 	std::string& scenario = menu_handler_.gamestate_.mp_settings().mp_scenario;
--	foreach (const config &mp, menu_handler_.game_config_.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &mp, menu_handler_.game_config_.child_range("multiplayer"))
- 	{
- 		if (mp["id"] == scenario)
- 		{
-@@ -3596,7 +3596,7 @@
- 	}
- }*/
- void console_handler::do_discover() {
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types()) {
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types()) {
- 		preferences::encountered_units().insert(i.second.id());
- 	}
- }
-Index: src/multiplayer_wait.cpp
-===================================================================
---- src/multiplayer_wait.cpp	(revision 54624)
-+++ src/multiplayer_wait.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -30,6 +29,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_network("network");
- #define DBG_NW LOG_STREAM(debug, log_network)
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -222,7 +223,7 @@
- 		//available side.
- 		const config *side_choice = NULL;
- 		int side_num = -1, nb_sides = 0;
--		foreach (const config &sd, level_.child_range("side"))
-+		BOOST_FOREACH(const config &sd, level_.child_range("side"))
- 		{
- 			if (sd["controller"] == "reserved" && sd["current_player"] == preferences::login())
- 			{
-@@ -275,7 +276,7 @@
- 				color = game_config::color_info(color_str).index() - 1;
- 
- 			std::vector<const config *> leader_sides;
--			foreach (const config &side, possible_sides) {
-+			BOOST_FOREACH(const config &side, possible_sides) {
- 				leader_sides.push_back(&side);
- 			}
- 
-@@ -287,7 +288,7 @@
- 			}
- 
- 			std::vector<std::string> choices;
--			foreach (const config *s, leader_sides)
-+			BOOST_FOREACH(const config *s, leader_sides)
- 			{
- 				const config &side = *s;
- 				const std::string &name = side["name"];
-@@ -442,7 +443,7 @@
- 	std::vector<std::string> details;
- 	std::vector<std::string> playerlist;
- 
--	foreach (const config &sd, level_.child_range("side"))
-+	BOOST_FOREACH(const config &sd, level_.child_range("side"))
- 	{
- 		if (!sd["allow_player"].to_bool(true)) {
- 			continue;
-@@ -458,7 +459,7 @@
- 		// Hack: if there is a unit which can recruit, use it as a
- 		// leader. Necessary to display leader information when loading
- 		// saves.
--		foreach (const config &side_unit, sd.child_range("unit"))
-+		BOOST_FOREACH(const config &side_unit, sd.child_range("unit"))
- 		{
- 			if (side_unit["canrecruit"].to_bool()) {
- 				leader_type = side_unit["type"].str();
-Index: src/serialization/schema_validator.cpp
-===================================================================
---- src/serialization/schema_validator.cpp	(revision 54624)
-+++ src/serialization/schema_validator.cpp	(revision 54625)
-@@ -17,12 +17,13 @@
- 
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "serialization/preprocessor.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace schema_validation{
- 
- static lg::log_domain log_validation("validation");
-@@ -143,14 +144,14 @@
- 	} catch(config::error&) {
- 		return false;
- 	}
--	foreach (const config &g, cfg.child_range("wml_schema")) {
--		foreach (const config &schema, g.child_range("tag")) {
-+	BOOST_FOREACH(const config &g, cfg.child_range("wml_schema")) {
-+		BOOST_FOREACH(const config &schema, g.child_range("tag")) {
- 			if (schema["name"].str() == "root"){
- 				//@NOTE Don't know, maybe merging of roots needed.
- 				root_ = class_tag (schema);
- 			}
- 		}
--		foreach (const config &type, g.child_range("type")) {
-+		BOOST_FOREACH(const config &type, g.child_range("type")) {
- 			try{
- 				types_[type["name"].str()] = boost::regex( type["value"].str());
- 			}
-Index: src/serialization/preprocessor.cpp
-===================================================================
---- src/serialization/preprocessor.cpp	(revision 54624)
-+++ src/serialization/preprocessor.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "log.hpp"
- #include "wesconfig.h"
-@@ -34,6 +33,8 @@
- #include "util.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <stdexcept>
- 
- static lg::log_domain log_config("config");
-@@ -64,7 +65,7 @@
- 	int n = 0;
- 	s >> std::hex >> n;
- 
--	foreach(const t_file_number_map::value_type& p, file_number_map){
-+	BOOST_FOREACH(const t_file_number_map::value_type& p, file_number_map){
- 		if(p.second == n)
- 			return p.first;
- 	}
-@@ -142,7 +143,7 @@
- 	writer.write_key_val("linenum", lexical_cast<std::string>(linenum));
- 	writer.write_key_val("location", get_location(location));
- 
--	foreach (const std::string &arg, arguments)
-+	BOOST_FOREACH(const std::string &arg, arguments)
- 		write_argument(writer, arg);
- 
- 	writer.close_child(key);
-@@ -160,7 +161,7 @@
- 	linenum = cfg["linenum"];
- 	location = cfg["location"].str();
- 
--	foreach (const config &arg, cfg.child_range("argument"))
-+	BOOST_FOREACH(const config &arg, cfg.child_range("argument"))
- 		read_argument(arg);
- }
- 
-@@ -1157,14 +1158,14 @@
- 		get_files_in_dir(res_name, &files, &dirs, ENTIRE_FILE_PATH, SKIP_MEDIA_DIR, DO_REORDER);
- 
- 		// subdirectories
--		foreach(const std::string& dir, dirs)
-+		BOOST_FOREACH(const std::string& dir, dirs)
- 		{
- 			LOG_PREPROC<<"processing sub-dir: "<<dir<<'\n';
- 			preprocess_resource(dir,defines_map,write_cfg,write_plain_cfg,target_directory);
- 		}
- 
- 		// files in current directory
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 		{
- 			preprocess_resource(file,defines_map,write_cfg,write_plain_cfg,target_directory);
- 		}
-Index: src/serialization/parser.cpp
-===================================================================
---- src/serialization/parser.cpp	(revision 54624)
-+++ src/serialization/parser.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "serialization/tokenizer.hpp"
- #include "serialization/string_utils.hpp"
- #include "serialization/validator.hpp"
--#include "foreach.hpp"
- 
- #include <stack>
- 
-@@ -40,6 +39,7 @@
- #include <boost/iostreams/filter/gzip.hpp>
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -343,7 +343,7 @@
- {
- 	i18n_symbols["pos"] = ::lineno_string(lineno);
- 	std::string result = _(error_string);
--	foreach(utils::string_map::value_type& var, i18n_symbols)
-+	BOOST_FOREACH(utils::string_map::value_type& var, i18n_symbols)
- 		boost::algorithm::replace_all(result, std::string("$") + var.first, std::string(var.second));
- 	return result;
- }
-@@ -503,11 +503,11 @@
- 	if (tab > max_recursion_levels)
- 		throw config::error("Too many recursion levels in config write");
- 
--	foreach (const config::attribute &i, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg.attribute_range()) {
- 		write_key_val(out, i.first, i.second, tab, textdomain);
- 	}
- 
--	foreach (const config::any_child &item, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &item, cfg.all_children_range())
- 	{
- 		write_open_child(out, item.key, tab);
- 		write_internal(item.cfg, out, textdomain, tab + 1);
-Index: src/game_controller_abstract.cpp
-===================================================================
---- src/game_controller_abstract.cpp	(revision 54624)
-+++ src/game_controller_abstract.cpp	(revision 54625)
-@@ -15,7 +15,6 @@
- 
- #include "game_controller_abstract.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "hotkeys.hpp"
-@@ -24,6 +23,8 @@
- 
- #include "preferences.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- 
- game_controller_abstract::game_controller_abstract(const commandline_options &cmdline_opts) :
-@@ -80,7 +81,7 @@
- 	language_def locale;
- 	if(cmdline_opts_.language) {
- 		std::vector<language_def> langs = get_languages();
--		foreach(const language_def & def, langs) {
-+		BOOST_FOREACH(const language_def & def, langs) {
- 			if(def.localename == *cmdline_opts_.language) {
- 				locale = def;
- 				break;
-Index: src/terrain.cpp
-===================================================================
---- src/terrain.cpp	(revision 54624)
-+++ src/terrain.cpp	(revision 54625)
-@@ -15,13 +15,14 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "terrain.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <set>
- 
- static lg::log_domain log_config("config");
-@@ -284,7 +285,7 @@
-                          t_translation::t_list& terrain_list,
-                          std::map<t_translation::t_terrain, terrain_type>& letter_to_terrain)
- {
--	foreach (const config &t, cfgs)
-+	BOOST_FOREACH(const config &t, cfgs)
- 	{
- 		terrain_type terrain(t);
- 		DBG_G << "create_terrain_maps: " << terrain.number() << " "
-@@ -301,9 +302,9 @@
- 				std::vector<std::string> eg2 = utils::split(terrain.editor_group());
- 				std::set<std::string> egs;
- 				bool clean_merge = true;
--				foreach(std::string& t, eg1)
-+				BOOST_FOREACH(std::string& t, eg1)
- 					clean_merge &= egs.insert(t).second;
--				foreach(std::string& t, eg2)
-+				BOOST_FOREACH(std::string& t, eg2)
- 					clean_merge &= egs.insert(t).second;
- 
- 				std::string joined = utils::join(egs);
-Index: src/config.cpp
-===================================================================
---- src/config.cpp	(revision 54624)
-+++ src/config.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "global.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
-@@ -31,6 +30,7 @@
- #include <cstring>
- #include <deque>
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -255,7 +255,7 @@
- {
- 	check_valid(cfg);
- 
--	foreach (const any_child &value, cfg.all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, cfg.all_children_range()) {
- 		add_child(value.key, value.cfg);
- 	}
- }
-@@ -263,7 +263,7 @@
- void config::append(const config &cfg)
- {
- 	append_children(cfg);
--	foreach (const attribute &v, cfg.values) {
-+	BOOST_FOREACH(const attribute &v, cfg.values) {
- 		values[v.first] = v.second;
- 	}
- }
-@@ -275,7 +275,7 @@
- 	if (child_count(key) < 2) return;
- 
- 	config merged_children;
--	foreach (const config &cfg, child_range(key)) {
-+	BOOST_FOREACH(const config &cfg, child_range(key)) {
- 		merged_children.append(cfg);
- 	}
- 
-@@ -291,7 +291,7 @@
- 
- 	typedef std::map<std::string, config> config_map;
- 	config_map merged_children_map;
--	foreach (const config &cfg, child_range(key)) {
-+	BOOST_FOREACH(const config &cfg, child_range(key)) {
- 		const std::string &value = cfg[attribute];
- 		config_map::iterator m = merged_children_map.find(value);
- 		if ( m!=merged_children_map.end() ) {
-@@ -302,7 +302,7 @@
- 	}
- 
- 	clear_children(key);
--	foreach (const config_map::value_type &i, merged_children_map) {
-+	BOOST_FOREACH(const config_map::value_type &i, merged_children_map) {
- 		add_child(key,i.second);
- 	}
- }
-@@ -459,7 +459,7 @@
- 	ordered_children.erase(std::remove_if(ordered_children.begin(),
- 		ordered_children.end(), remove_ordered(i)), ordered_children.end());
- 
--	foreach (config *c, i->second) {
-+	BOOST_FOREACH(config *c, i->second) {
- 		delete c;
- 	}
- 
-@@ -495,7 +495,7 @@
- 
- 	values.erase(key);
- 
--	foreach (const any_child &value, all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, all_children_range()) {
- 		const_cast<config *>(&value.cfg)->recursive_clear_value(key);
- 	}
- }
-@@ -506,7 +506,7 @@
- 	/* Find the position with the correct index and decrement all the
- 	   indices in the ordering that are above this index. */
- 	unsigned found = 0;
--	foreach (child_pos &p, ordered_children)
-+	BOOST_FOREACH(child_pos &p, ordered_children)
- 	{
- 		if (p.pos != pos) continue;
- 		if (p.index == index)
-@@ -590,7 +590,7 @@
- 	check_valid(cfg);
- 
- 	assert(this != &cfg);
--	foreach (const attribute &v, cfg.values) {
-+	BOOST_FOREACH(const attribute &v, cfg.values) {
- 		values[v.first] = v.second;
- 	}
- }
-@@ -860,21 +860,21 @@
- 	if (track) values[diff_track_attribute] = "modified";
- 
- 	if (const config &inserts = diff.child("insert")) {
--		foreach (const attribute &v, inserts.attribute_range()) {
-+		BOOST_FOREACH(const attribute &v, inserts.attribute_range()) {
- 			values[v.first] = v.second;
- 		}
- 	}
- 
- 	if (const config &deletes = diff.child("delete")) {
--		foreach (const attribute &v, deletes.attribute_range()) {
-+		BOOST_FOREACH(const attribute &v, deletes.attribute_range()) {
- 			values.erase(v.first);
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("change_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("change_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range())
-+		BOOST_FOREACH(const any_child &item, i.all_children_range())
- 		{
- 			if (item.key.empty()) {
- 				continue;
-@@ -889,19 +889,19 @@
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("insert_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("insert_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			config& inserted = add_child_at(item.key, item.cfg, index);
- 			if (track) inserted[diff_track_attribute] = "new";
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("delete_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("delete_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			if (!track) {
- 				remove_child(item.key, index);
- 			} else {
-@@ -918,18 +918,18 @@
- void config::clear_diff_track(const config& diff)
- {
- 	remove_attribute(diff_track_attribute);
--	foreach (const config &i, diff.child_range("delete_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("delete_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range()) {
-+		BOOST_FOREACH(const any_child &item, i.all_children_range()) {
- 			remove_child(item.key, index);
- 		}
- 	}
- 
--	foreach (const config &i, diff.child_range("change_child"))
-+	BOOST_FOREACH(const config &i, diff.child_range("change_child"))
- 	{
- 		const size_t index = lexical_cast<size_t>(i["index"].str());
--		foreach (const any_child &item, i.all_children_range())
-+		BOOST_FOREACH(const any_child &item, i.all_children_range())
- 		{
- 			if (item.key.empty()) {
- 				continue;
-@@ -943,7 +943,7 @@
- 			itor->second[index]->clear_diff_track(item.cfg);
- 		}
- 	}
--	foreach (const any_child &value, all_children_range()) {
-+	BOOST_FOREACH(const any_child &value, all_children_range()) {
- 		const_cast<config *>(&value.cfg)->remove_attribute(diff_track_attribute);
- 	}
- }
-@@ -984,20 +984,20 @@
- {
- 	check_valid(filter);
- 
--	foreach (const attribute &i, filter.attribute_range())
-+	BOOST_FOREACH(const attribute &i, filter.attribute_range())
- 	{
- 		const attribute_value *v = get(i.first);
- 		if (!v || *v != i.second) return false;
- 	}
- 
--	foreach (const any_child &i, filter.all_children_range())
-+	BOOST_FOREACH(const any_child &i, filter.all_children_range())
- 	{
- 		if (i.key == "not") {
- 			if (matches(i.cfg)) return false;
- 			continue;
- 		}
- 		bool found = false;
--		foreach (const config &j, child_range(i.key)) {
-+		BOOST_FOREACH(const config &j, child_range(i.key)) {
- 			if (j.matches(i.cfg)) {
- 				found = true;
- 				break;
-@@ -1021,11 +1021,11 @@
- {
- 	static int i = 0;
- 	i++;
--	foreach (const config::attribute &val, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &val, cfg.attribute_range()) {
- 		for (int j = 0; j < i-1; j++){ outstream << char(9); }
- 		outstream << val.first << " = " << val.second << '\n';
- 	}
--	foreach (const config::any_child &child, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg.all_children_range())
- 	{
- 		for (int j = 0; j < i - 1; ++j) outstream << char(9);
- 		outstream << "[" << child.key << "]\n";
-@@ -1054,7 +1054,7 @@
- 	hash_str[hash_length] = 0;
- 
- 	i = 0;
--	foreach (const attribute &val, values)
-+	BOOST_FOREACH(const attribute &val, values)
- 	{
- 		for (c = val.first.begin(); c != val.first.end(); ++c) {
- 			hash_str[i] ^= *c;
-@@ -1067,10 +1067,10 @@
- 		}
- 	}
- 
--	foreach (const any_child &ch, all_children_range())
-+	BOOST_FOREACH(const any_child &ch, all_children_range())
- 	{
- 		std::string child_hash = ch.cfg.hash();
--		foreach (char c, child_hash) {
-+		BOOST_FOREACH(char c, child_hash) {
- 			hash_str[i] ^= c;
- 			++i;
- 			if(i == hash_length) {
-Index: src/soundsource.cpp
-===================================================================
---- src/soundsource.cpp	(revision 54624)
-+++ src/soundsource.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- 
- #include "display.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- #include "sound.hpp"
-Index: src/sound.cpp
-===================================================================
---- src/sound.cpp	(revision 54624)
-+++ src/sound.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
-@@ -27,6 +26,8 @@
- 
- #include "SDL_mixer.h"
- 
-+#include <boost/foreach.hpp>
-+
- #include <list>
- 
- static lg::log_domain log_audio("audio");
-@@ -596,7 +597,7 @@
- 		return;
- 
- 	// If current track no longer on playlist, change it.
--	foreach (const music_track &m, current_track_list) {
-+	BOOST_FOREACH(const music_track &m, current_track_list) {
- 		if (current_track == m)
- 			return;
- 	}
-@@ -614,7 +615,7 @@
- {
- 	// First entry clears playlist, others append to it.
- 	bool append = false;
--	foreach (music_track &m, current_track_list) {
-+	BOOST_FOREACH(music_track &m, current_track_list) {
- 		m.write(snapshot, append);
- 		append = true;
- 	}
-Index: src/game_preferences.cpp
-===================================================================
---- src/game_preferences.cpp	(revision 54624)
-+++ src/game_preferences.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #define GETTEXT_DOMAIN "wesnoth-lib"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gamestatus.hpp"
-@@ -31,6 +30,8 @@
- #include "unit_map.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CFG LOG_STREAM(err , log_config)
- 
-@@ -112,9 +113,9 @@
- 				message = foobar
- 			[/line]
- */
--		foreach (const config::any_child &h, history.all_children_range())
-+		BOOST_FOREACH(const config::any_child &h, history.all_children_range())
- 		{
--			foreach (const config &l, h.cfg.child_range("line")) {
-+			BOOST_FOREACH(const config &l, h.cfg.child_range("line")) {
- 				history_map[h.key].push_back(l["message"]);
- 			}
- 		}
-@@ -142,10 +143,10 @@
- */
- 	config history;
- 	typedef std::pair<std::string, std::vector<std::string> > hack;
--	foreach(const hack& history_id, history_map) {
-+	BOOST_FOREACH(const hack& history_id, history_map) {
- 
- 		config history_id_cfg; // [history_id]
--		foreach(const std::string& line, history_id.second) {
-+		BOOST_FOREACH(const std::string& line, history_id.second) {
- 			config cfg; // [line]
- 
- 			cfg["message"] = line;
-@@ -314,7 +315,7 @@
- 		std::vector<game_config::server_info> &game_servers = game_config::server_list;
- 		VALIDATE(!game_servers.empty(), _("No server has been defined."));
- 		pref_servers.insert(pref_servers.begin(), game_servers.begin(), game_servers.end());
--		foreach (const config &server, get_prefs()->child_range("server")) {
-+		BOOST_FOREACH(const config &server, get_prefs()->child_range("server")) {
- 			game_config::server_info sinf;
- 			sinf.name = server["name"].str();
- 			sinf.address = server["address"].str();
-@@ -945,8 +946,8 @@
- }
- 
- void encounter_recallable_units(std::vector<team>& teams){
--	foreach(const team& t, teams) {
--		foreach(const unit& u, t.recall_list()) {
-+	BOOST_FOREACH(const team& t, teams) {
-+		BOOST_FOREACH(const unit& u, t.recall_list()) {
- 			encountered_units_set.insert(u.type_id());
- 		}
- 	}
-Index: src/map_label.cpp
-===================================================================
---- src/map_label.cpp	(revision 54624)
-+++ src/map_label.cpp	(revision 54625)
-@@ -16,12 +16,13 @@
- #include "global.hpp"
- 
- #include "display.hpp"
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "map_label.hpp"
- #include "resources.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- //our definition of map labels being obscured is if the tile is obscured,
- //or the tile below is obscured. This is because in the case where the tile
- //itself is visible, but the tile below is obscured, the bottom half of the
-@@ -59,7 +60,7 @@
- {
- 	clear_all();
- 
--	foreach (const config &i, cfg.child_range("label"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("label"))
- 	{
- 		const map_location loc(i, resources::state_of_game);
- 		terrain_label *label = new terrain_label(*this, i);
-@@ -222,7 +223,7 @@
- 
- void map_labels::clear_all()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
- 		clear_map(m.second, true);
- 	}
-@@ -231,9 +232,9 @@
- 
- void map_labels::recalculate_labels()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
--		foreach (label_map::value_type &l, m.second)
-+		BOOST_FOREACH(label_map::value_type &l, m.second)
- 		{
- 			l.second->recalculate();
- 		}
-@@ -249,9 +250,9 @@
- 
- void map_labels::recalculate_shroud()
- {
--	foreach (team_label_map::value_type &m, labels_)
-+	BOOST_FOREACH(team_label_map::value_type &m, labels_)
- 	{
--		foreach (label_map::value_type &l, m.second)
-+		BOOST_FOREACH(label_map::value_type &l, m.second)
- 		{
- 			l.second->calculate_shroud();
- 		}
-Index: src/actions.cpp
-===================================================================
---- src/actions.cpp	(revision 54624)
-+++ src/actions.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "actions.hpp"
- 
- #include "attack_prediction.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
-@@ -206,7 +206,7 @@
- 	placements.push_back("map");
- 	placements.push_back("recall");
- 
--	foreach(std::string place, placements) {
-+	BOOST_FOREACH(std::string place, placements) {
- 		map_location loc;
- 		bool pass((place == "leader_passable") || (place == "map_passable"));
- 
-@@ -417,7 +417,7 @@
- 				leader_in_place= true;
- 			else continue;
- 
--			foreach (const unit& recall_unit, recall_list)
-+			BOOST_FOREACH(const unit& recall_unit, recall_list)
- 			{
- 				//Only units which match the leaders recall filter are valid.
- 				scoped_recall_unit this_unit("this_unit", t.save_id(), &recall_unit - &recall_list[0]);
-@@ -435,7 +435,7 @@
- 	}
- 
- 	if (!(recall_loc_is_castle && leader_in_place)) {
--		foreach (const unit &recall, recall_list)
-+		BOOST_FOREACH(const unit &recall, recall_list)
- 		{
- 			result.push_back(&recall);
- 		}
-@@ -546,7 +546,7 @@
- 
- 		bool can_recruit_unit = is_on_team_list;
- 		if (!can_recruit_unit) {
--			foreach (const std::string &recruitable, leader->recruits()) {
-+			BOOST_FOREACH(const std::string &recruitable, leader->recruits()) {
- 				if (recruitable == unit_type) {
- 					can_recruit_unit = true;
- 					break;
-@@ -1925,7 +1925,7 @@
- // Simple algorithm: no maximum number of patients per healer.
- void reset_resting(unit_map& units, int side)
- {
--	foreach (unit &u, units) {
-+	BOOST_FOREACH(unit &u, units) {
- 		if (u.side() == side)
- 			u.set_resting(true);
- 	}
-@@ -1946,7 +1946,7 @@
- 	std::list<unit_healing_struct> l;
- 
- 	// We look for all allied units, then we see if our healer is near them.
--	foreach (unit &u, units) {
-+	BOOST_FOREACH(unit &u, units) {
- 
- 		if (u.get_state("unhealable") || u.incapacitated())
- 			continue;
-@@ -2307,7 +2307,7 @@
- 		}
- 
- 		pathfind::paths p(*resources::game_map, *resources::units, loc, *resources::teams, true, false, tm, 0, false, true);
--		foreach (const pathfind::paths::step &dest, p.destinations) {
-+		BOOST_FOREACH(const pathfind::paths::step &dest, p.destinations) {
- 			clear_shroud_loc(tm, dest.curr, &cleared_locations);
- 		}
- 
-@@ -2350,7 +2350,7 @@
- 
- 	tm.refog();
- 
--	foreach (unit &u, *resources::units)
-+	BOOST_FOREACH(unit &u, *resources::units)
- 	{
- 		if (u.side() == side) {
- 			const unit_movement_resetter move_resetter(u);
-@@ -2372,7 +2372,7 @@
- 
- 	bool result = false;
- 
--	foreach (unit &u, *resources::units)
-+	BOOST_FOREACH(unit &u, *resources::units)
- 	{
- 		if (u.side() == side) {
- 			const unit_movement_resetter move_resetter(u);
-@@ -2435,7 +2435,7 @@
- 
- 	std::set<map_location> known_units;
- 	if(check_shroud) {
--		foreach (const unit &u, units) {
-+		BOOST_FOREACH(const unit &u, units) {
- 			if (!tm->fogged(u.get_location())) {
- 				known_units.insert(u.get_location());
- 				tm->see(u.side() - 1);
-@@ -2860,7 +2860,7 @@
- 	*/
- 
- 	std::set<map_location> known_units;
--	foreach (const unit &u, units) {
-+	BOOST_FOREACH(const unit &u, units) {
- 		if (!tm.fogged(u.get_location())) {
- 			known_units.insert(u.get_location());
- 		}
-Index: src/font.cpp
-===================================================================
---- src/font.cpp	(revision 54624)
-+++ src/font.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "config.hpp"
- #include "filesystem.hpp"
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "log.hpp"
- #include "marked-up_text.hpp"
-@@ -32,6 +31,8 @@
- #include "serialization/preprocessor.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <list>
- #include <set>
- #include <stack>
-@@ -355,10 +356,10 @@
- #endif
- 
- #if CAIRO_HAS_WIN32_FONT
--	foreach(const std::string& path, get_binary_paths("fonts")) {
-+	BOOST_FOREACH(const std::string& path, get_binary_paths("fonts")) {
- 		std::vector<std::string> files;
- 		get_files_in_dir(path, &files, NULL, ENTIRE_FILE_PATH);
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 			if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc")
- 				AddFontResource(file.c_str());
- 	}
-@@ -372,10 +373,10 @@
- #endif
- 
- #if CAIRO_HAS_WIN32_FONT
--	foreach(const std::string& path, get_binary_paths("fonts")) {
-+	BOOST_FOREACH(const std::string& path, get_binary_paths("fonts")) {
- 		std::vector<std::string> files;
- 		get_files_in_dir(path, &files, NULL, ENTIRE_FILE_PATH);
--		foreach(const std::string& file, files)
-+		BOOST_FOREACH(const std::string& file, files)
- 			if(file.substr(file.length() - 4) == ".ttf" || file.substr(file.length() - 4) == ".ttc")
- 				RemoveFontResource(file.c_str());
- 	}
-@@ -425,7 +426,7 @@
- 		const subset_id subset = font_names.size();
- 		font_names.push_back(itor->name);
- 
--		foreach (const subset_descriptor::range &cp_range, itor->present_codepoints) {
-+		BOOST_FOREACH(const subset_descriptor::range &cp_range, itor->present_codepoints) {
- 			char_blocks.insert(cp_range.first, cp_range.second, subset);
- 		}
- 	}
-@@ -582,7 +583,7 @@
- 	w_ = 0;
- 	h_ = 0;
- 
--	foreach (text_chunk const &chunk, chunks_)
-+	BOOST_FOREACH(text_chunk const &chunk, chunks_)
- 	{
- 		TTF_Font* ttfont = get_font(font_id(chunk.subset, font_size_));
- 		if(ttfont == NULL)
-@@ -628,7 +629,7 @@
- 	if(width() > max_text_line_width)
- 		return surfs_;
- 
--	foreach (text_chunk const &chunk, chunks_)
-+	BOOST_FOREACH(text_chunk const &chunk, chunks_)
- 	{
- 		TTF_Font* ttfont = get_font(font_id(chunk.subset, font_size_));
- 		if (ttfont == NULL)
-@@ -1261,7 +1262,7 @@
- 		return false;
- 
- 	std::set<std::string> known_fonts;
--	foreach (const config &font, fonts_config.child_range("font")) {
-+	BOOST_FOREACH(const config &font, fonts_config.child_range("font")) {
- 		known_fonts.insert(font["name"]);
- 	}
- 
-Index: src/unit_animation.cpp
-===================================================================
---- src/unit_animation.cpp	(revision 54624)
-+++ src/unit_animation.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "unit_animation.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "halo.hpp"
- #include "map.hpp"
-@@ -26,6 +25,8 @@
- #include "resources.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <algorithm>
- 
- struct tag_name_manager {
-@@ -78,7 +79,7 @@
- 	config merge() const
- 	{
- 		config result = attributes;
--		foreach (const config::all_children_iterator &i, children)
-+		BOOST_FOREACH(const config::all_children_iterator &i, children)
- 			result.add_child(i->key, i->cfg);
- 		return result;
- 	}
-@@ -99,7 +100,7 @@
- 	animation_cursor(const config &cfg, animation_cursor *p):
- 		itors(cfg.all_children_range()), branches(p->branches), parent(p)
- 	{
--		foreach (animation_branch &ab, branches)
-+		BOOST_FOREACH(animation_branch &ab, branches)
- 			ab.attributes.merge_attributes(cfg);
- 	}
- };
-@@ -122,7 +123,7 @@
- 		if (ac.itors.first->key != "if")
- 		{
- 			// Append current config object to all the branches in scope.
--			foreach (animation_branch &ab, ac.branches) {
-+			BOOST_FOREACH(animation_branch &ab, ac.branches) {
- 				ab.children.push_back(ac.itors.first);
- 			}
- 			++ac.itors.first;
-@@ -154,7 +155,7 @@
- static animation_branches prepare_animation(const config &cfg, const std::string &animation_tag)
- {
- 	animation_branches expanded_animations;
--	foreach (const config &anim, cfg.child_range(animation_tag)) {
-+	BOOST_FOREACH(const config &anim, cfg.child_range(animation_tag)) {
- 		prepare_single_animation(anim, expanded_animations);
- 	}
- 	return expanded_animations;
-@@ -207,7 +208,7 @@
- 	overlaped_hex_()
- {
- //	if(!cfg["debug"].empty()) printf("DEBUG WML: FINAL\n%s\n\n",cfg.debug().c_str());
--	foreach (const config::any_child &fr, cfg.all_children_range())
-+	BOOST_FOREACH(const config::any_child &fr, cfg.all_children_range())
- 	{
- 		if (fr.key == frame_string) continue;
- 		if (fr.key.find("_frame", fr.key.size() - 6) == std::string::npos) continue;
-@@ -221,11 +222,11 @@
- 		const map_location::DIRECTION d = map_location::parse_direction(*i);
- 		directions_.push_back(d);
- 	}
--	foreach (const config &filter, cfg.child_range("filter")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter")) {
- 		unit_filter_.push_back(filter);
- 	}
- 
--	foreach (const config &filter, cfg.child_range("filter_second")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_second")) {
- 		secondary_unit_filter_.push_back(filter);
- 	}
- 
-@@ -253,10 +254,10 @@
- 	for(value2=value2_str.begin() ; value2 != value2_str.end() ; ++value2) {
- 		value2_.push_back(atoi(value2->c_str()));
- 	}
--	foreach (const config &filter, cfg.child_range("filter_attack")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_attack")) {
- 		primary_attack_filter_.push_back(filter);
- 	}
--	foreach (const config &filter, cfg.child_range("filter_second_attack")) {
-+	BOOST_FOREACH(const config &filter, cfg.child_range("filter_second_attack")) {
- 		secondary_attack_filter_.push_back(filter);
- 	}
- 	play_offscreen_ = cfg["offscreen"].to_bool(true);
-@@ -487,7 +488,7 @@
- 	display::tdrawing_layer layer = display::LAYER_UNIT_DEFAULT,
- 	bool offscreen = true)
- {
--	foreach (const animation_branch &ab, prepare_animation(cfg, tag_name))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, tag_name))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = apply_to;
-@@ -503,7 +504,7 @@
- 
- void unit_animation::add_anims( std::vector<unit_animation> & animations, const config & cfg)
- {
--	foreach (const animation_branch &ab, prepare_animation(cfg, "animation")) {
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "animation")) {
- 		animations.push_back(unit_animation(ab.merge()));
- 	}
- 
-@@ -519,7 +520,7 @@
- 	add_simple_anim(animations, cfg, "levelin_anim", "levelin");
- 	add_simple_anim(animations, cfg, "levelout_anim", "levelout");
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "default";
-@@ -528,7 +529,7 @@
- 		if (anim["offscreen"].empty()) anim["offscreen"] = false;
- 		animations.push_back(unit_animation(anim));
- 	}
--	foreach (const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "standing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "standing";
-@@ -537,7 +538,7 @@
- 		if (anim["offscreen"].empty()) anim["offscreen"] = false;
- 		animations.push_back(unit_animation(anim));
- 	}
--	foreach (const animation_branch &ab, prepare_animation(cfg, "healing_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healing_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "healing";
-@@ -546,7 +547,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "healed_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "healed_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "healed";
-@@ -558,7 +559,7 @@
- 		animations.back().sub_anims_["_healed_sound"].add_frame(1,frame_builder().sound("heal.wav"),true);
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "poison_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "poison_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] ="poisoned";
-@@ -572,7 +573,7 @@
- 
- 	add_simple_anim(animations, cfg, "pre_movement_anim", "pre_movement", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "movement_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "movement_anim"))
- 	{
- 		config anim = ab.merge();
- 		if (anim["offset"].empty()) {
-@@ -585,7 +586,7 @@
- 
- 	add_simple_anim(animations, cfg, "post_movement_anim", "post_movement", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "defend"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "defend"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "defend";
-@@ -607,7 +608,7 @@
- 		else
- 		{
- 			std::vector<std::string> v = utils::split(anim["hits"]);
--			foreach (const std::string &hit_type, v)
-+			BOOST_FOREACH(const std::string &hit_type, v)
- 			{
- 				config tmp = anim;
- 				tmp["hits"] = hit_type;
-@@ -625,7 +626,7 @@
- 	add_simple_anim(animations, cfg, "draw_weapon_anim", "draw_wepaon", display::LAYER_UNIT_MOVE_DEFAULT);
- 	add_simple_anim(animations, cfg, "sheath_weapon_anim", "sheath_wepaon", display::LAYER_UNIT_MOVE_DEFAULT);
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "attack_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "attack_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "attack";
-@@ -646,7 +647,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "death"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "death"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = "death";
-@@ -663,7 +664,7 @@
- 
- 	add_simple_anim(animations, cfg, "victory_anim", "victory");
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "extra_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "extra_anim"))
- 	{
- 		config anim = ab.merge();
- 		anim["apply_to"] = anim["flag"];
-@@ -671,7 +672,7 @@
- 		animations.push_back(unit_animation(anim));
- 	}
- 
--	foreach (const animation_branch &ab, prepare_animation(cfg, "teleport_anim"))
-+	BOOST_FOREACH(const animation_branch &ab, prepare_animation(cfg, "teleport_anim"))
- 	{
- 		config anim = ab.merge();
- 		if (anim["layer"].empty()) anim["layer"] = default_layer;
-@@ -742,14 +743,14 @@
- 	config::const_child_itors range = cfg.child_range(frame_string+"frame");
- 	starting_frame_time_=INT_MAX;
- 	if(cfg[frame_string+"start_time"].empty() &&range.first != range.second) {
--		foreach (const config &frame, range) {
-+		BOOST_FOREACH(const config &frame, range) {
- 			starting_frame_time_ = std::min(starting_frame_time_, frame["begin"].to_int());
- 		}
- 	} else {
- 		starting_frame_time_ = cfg[frame_string+"start_time"];
- 	}
- 
--	foreach (const config &frame, range)
-+	BOOST_FOREACH(const config &frame, range)
- 	{
- 		unit_frame tmp_frame(frame);
- 		add_frame(tmp_frame.duration(),tmp_frame,!tmp_frame.does_not_change());
-Index: src/storyscreen/render.cpp
-===================================================================
---- src/storyscreen/render.cpp	(revision 54624)
-+++ src/storyscreen/render.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "global.hpp"
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "storyscreen/part.hpp"
- #include "storyscreen/render.hpp"
-@@ -34,6 +33,8 @@
- #include "text.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG  LOG_STREAM(err,  log_engine)
- #define WARN_NG LOG_STREAM(warn, log_engine)
-@@ -167,7 +168,7 @@
- void part_ui::prepare_floating_images()
- {
- 	// Build floating image surfaces
--	foreach(const floating_image& fi, p_.get_floating_images()) {
-+	BOOST_FOREACH(const floating_image& fi, p_.get_floating_images()) {
- 		imgs_.push_back( fi.get_render_input(scale_factor_, base_rect_) );
- 	}
- }
-@@ -190,7 +191,7 @@
- 	last_key_ = true;
- 
- 	size_t fi_n = 0;
--	foreach(floating_image::render_input& ri, imgs_) {
-+	BOOST_FOREACH(floating_image::render_input& ri, imgs_) {
- 		const floating_image& fi = p_.get_floating_images()[fi_n];
- 
- 		if(!ri.image.null()) {
-Index: src/storyscreen/interface.cpp
-===================================================================
---- src/storyscreen/interface.cpp	(revision 54624)
-+++ src/storyscreen/interface.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
-  */
- 
- #include "global.hpp"
--#include "foreach.hpp"
- #include "variable.hpp"
- 
- #include "storyscreen/interface.hpp"
-Index: src/storyscreen/controller.cpp
-===================================================================
---- src/storyscreen/controller.cpp	(revision 54624)
-+++ src/storyscreen/controller.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "storyscreen/render.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "variable.hpp"
- 
- #include "display.hpp"
-@@ -37,6 +36,8 @@
- #include "resources.hpp"
- #include "widgets/button.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -138,7 +139,7 @@
- 	// caching the scaled backgrounds can take over a decent amount of memory.
- #ifndef LOW_MEM
- 	std::vector< render_pointer_type > uis_;
--	foreach(part_pointer_type p, parts_) {
-+	BOOST_FOREACH(part_pointer_type p, parts_) {
- 		ASSERT_LOG( p != NULL, "Ouch: hit NULL storyscreen part in collection" );
- 		render_pointer_type const rpt(new part_ui(*p, disp_, next_button, back_button, play_button));
- 		uis_.push_back(rpt);
-Index: src/storyscreen/part.cpp
-===================================================================
---- src/storyscreen/part.cpp	(revision 54624)
-+++ src/storyscreen/part.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- #include "storyscreen/part.hpp"
-Index: src/game.cpp
-===================================================================
---- src/game.cpp	(revision 54624)
-+++ src/game.cpp	(revision 54625)
-@@ -40,6 +40,7 @@
- #include <fstream>
- #include <libintl.h>
- 
-+#include <boost/foreach.hpp>
- #include <boost/iostreams/copy.hpp>
- #include <boost/iostreams/filter/gzip.hpp>
- 
-@@ -218,7 +219,7 @@
- 			int read = 0;
- 
- 			// use static preproc_define::read_pair(config) to make a object
--			foreach ( const config::any_child &value, cfg.all_children_range() ) {
-+			BOOST_FOREACH( const config::any_child &value, cfg.all_children_range() ) {
- 				const preproc_map::value_type def = preproc_define::read_pair( value.cfg );
- 				input_macros[def.first] = def.second;
- 				++read;
-@@ -245,7 +246,7 @@
- 		if ( cmdline_opts.preprocess_defines ) {
- 
- 			// add the specified defines
--			foreach ( const std::string &define, *cmdline_opts.preprocess_defines ) {
-+			BOOST_FOREACH( const std::string &define, *cmdline_opts.preprocess_defines ) {
- 				if (define.empty()){
- 					std::cerr << "empty define supplied\n";
- 					continue;
-@@ -452,7 +453,7 @@
- 			const config &cfg = game->game_config().child("titlescreen_music");
- 			if (cfg) {
- 	            sound::play_music_repeatedly(game_config::title_music);
--				foreach (const config &i, cfg.child_range("music")) {
-+				BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 					sound::play_music_config(i);
- 				}
- 				sound::commit_music_changes();
-Index: src/playsingle_controller.cpp
-===================================================================
---- src/playsingle_controller.cpp	(revision 54624)
-+++ src/playsingle_controller.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "ai/game_info.hpp"
- #include "ai/testing.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -48,6 +47,8 @@
- #include "whiteboard/manager.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -324,7 +325,7 @@
- 	LOG_NG << "in playsingle_controller::play_scenario()...\n";
- 
- 	// Start music.
--	foreach (const config &m, level_.child_range("music")) {
-+	BOOST_FOREACH(const config &m, level_.child_range("music")) {
- 		sound::play_music_config(m);
- 	}
- 	sound::commit_music_changes();
-@@ -336,7 +337,7 @@
- 
- 	// Read sound sources
- 	assert(soundsources_manager_ != NULL);
--	foreach (const config &s, level_.child_range("sound_source")) {
-+	BOOST_FOREACH(const config &s, level_.child_range("sound_source")) {
- 		soundsource::sourcespec spec(s);
- 		soundsources_manager_->add(spec);
- 	}
-@@ -906,14 +907,14 @@
- 			new_side["previous_recruits"] = can_recruit_str;
- 			LOG_NG << "stored side in snapshot:\n" << new_side["save_id"] << std::endl;
- 			//add the units of the recall list
--			foreach(const unit& u, i->recall_list()) {
-+			BOOST_FOREACH(const unit& u, i->recall_list()) {
- 				config& new_unit = new_side.add_child("unit");
- 				u.write(new_unit);
- 			}
- 		}
- 	}
- 	//add any players from starting_pos that do not have a team in the current scenario
--	foreach (const config &player_cfg, gamestate_.starting_pos.child_range("player")) {
-+	BOOST_FOREACH(const config &player_cfg, gamestate_.starting_pos.child_range("player")) {
- 		if (side_ids.count(player_cfg["save_id"]) == 0) {
- 			LOG_NG << "stored inactive side in snapshot:\n" << player_cfg["save_id"] << std::endl;
- 			gamestate_.snapshot.add_child("side", player_cfg);
-@@ -938,7 +939,7 @@
- 	}
- 
- 	int persistent_teams = 0;
--	foreach (const team &t, teams_) {
-+	BOOST_FOREACH(const team &t, teams_) {
- 		if (t.persistent()) ++persistent_teams;
- 	}
- 
-@@ -953,7 +954,7 @@
- 		int turns_left = std::max<int>(0, tod_manager_.number_of_turns() - turn());
- 		int finishing_bonus = (end_level.gold_bonus && turns_left > -1) ?
- 			finishing_bonus_per_turn * turns_left : 0;
--		foreach (const team &t, teams_)
-+		BOOST_FOREACH(const team &t, teams_)
- 		{
- 			if (!t.persistent()) continue;
- 			int carryover_gold = div100rounded((t.gold() + finishing_bonus) * end_level.carryover_percentage);
-Index: src/controller_base.cpp
-===================================================================
---- src/controller_base.cpp	(revision 54624)
-+++ src/controller_base.cpp	(revision 54625)
-@@ -18,11 +18,12 @@
- 
- #include "dialogs.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
- #include "mouse_handler_base.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_display("display");
- #define ERR_DP LOG_STREAM(err, log_display)
- 
-@@ -144,7 +145,7 @@
- 	int dx = 0, dy = 0;
- 	int scroll_threshold = (preferences::mouse_scroll_enabled())
- 		? preferences::mouse_scroll_threshold() : 0;
--	foreach (const theme::menu& m, get_display().get_theme().menus()) {
-+	BOOST_FOREACH(const theme::menu& m, get_display().get_theme().menus()) {
- 		if (point_in_rect(mousex, mousey, m.get_location())) {
- 			scroll_threshold = 0;
- 		}
-Index: src/gamestatus.cpp
-===================================================================
---- src/gamestatus.cpp	(revision 54624)
-+++ src/gamestatus.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "gamestatus.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "game_preferences.hpp"
-@@ -42,6 +41,7 @@
- #include "whiteboard/side_actions.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #ifndef _MSC_VER
- #include <sys/time.h>
-@@ -178,9 +178,9 @@
- 		tags.push_back("side");
- 		tags.push_back("player"); //merge [player] tags for backwards compatibility of saves
- 
--		foreach (const std::string& side_tag, tags)
-+		BOOST_FOREACH(const std::string& side_tag, tags)
- 		{
--			foreach (config &carryover_side, source->child_range(side_tag))
-+			BOOST_FOREACH(config &carryover_side, source->child_range(side_tag))
- 			{
- 				config *scenario_side = NULL;
- 
-@@ -226,13 +226,13 @@
- 				(*scenario_side)["color"] = carryover_side["color"];
- 
- 				//add recallable units
--				foreach (const config &u, carryover_side.child_range("unit")) {
-+				BOOST_FOREACH(const config &u, carryover_side.child_range("unit")) {
- 					scenario_side->add_child("unit", u);
- 				}
- 			}
- 		}
- 	} else {
--		foreach(const config &snapshot_side, source->child_range("side")) {
-+		BOOST_FOREACH(const config &snapshot_side, source->child_range("side")) {
- 			//take all side tags and add them as players (assuming they only contain carryover information)
- 			cfg.add_child("player", snapshot_side);
- 		}
-@@ -306,7 +306,7 @@
- 		//See also playcampaign::play_game, where after finishing the scenario the replay
- 		//will be saved.
- 		if(!starting_pos.empty()) {
--			foreach (const config &p, cfg.child_range("player")) {
-+			BOOST_FOREACH(const config &p, cfg.child_range("player")) {
- 				config& cfg_player = starting_pos.add_child("player");
- 				cfg_player.merge_with(p);
- 			}
-@@ -400,7 +400,7 @@
- 	std::string leader;
- 	std::string leader_image;
- 
--	//foreach (const config &p, cfg_save.child_range("player"))
-+	//BOOST_FOREACH(const config &p, cfg_save.child_range("player"))
- 	//{
- 	//	if (utils::string_bool(p["canrecruit"], false)) {
- 	//		leader = p["save_id"];
-@@ -413,7 +413,7 @@
- 	//{
- 		if (const config &snapshot = *(has_snapshot ? &cfg_snapshot : &cfg_replay_start))
- 		{
--			foreach (const config &side, snapshot.child_range("side"))
-+			BOOST_FOREACH(const config &side, snapshot.child_range("side"))
- 			{
- 				if (side["controller"] != "human") {
- 					continue;
-@@ -430,7 +430,7 @@
- 						break;
- 				}
- 
--				foreach (const config &u, side.child_range("unit"))
-+				BOOST_FOREACH(const config &u, side.child_range("unit"))
- 				{
- 					if (u["canrecruit"].to_bool()) {
- 						leader = u["id"].str();
-@@ -794,7 +794,7 @@
- 		// can be recruited for the player, add them.
- 		if (!player_cfg_) return;
- 		if (const config::attribute_value *v = player_cfg_->get("previous_recruits")) {
--			foreach (const std::string &rec, utils::split(*v)) {
-+			BOOST_FOREACH(const std::string &rec, utils::split(*v)) {
- 				DBG_NG_TC << "adding previous recruit: " << rec << '\n';
- 				t_->add_recruit(rec);
- 			}
-@@ -857,7 +857,7 @@
- 		if (!side_cfg_["no_leader"].to_bool() && side_cfg_["controller"] != "null") {
- 			handle_leader(side_cfg_);
- 		}
--		foreach (const config &l, side_cfg_.child_range("leader")) {
-+		BOOST_FOREACH(const config &l, side_cfg_.child_range("leader")) {
- 			handle_leader(l);
- 		}
- 	}
-@@ -871,13 +871,13 @@
- 			//only relevant in start-of-scenario saves, that's why !shapshot
- 			//units that are in '[scenario][side]' are 'first'
- 			//for create-or-recall semantics to work: for each unit with non-empty id, unconditionally put OTHER, later, units with same id directly to recall list, not including them in unit_configs_
--			foreach(const config &u, (*player_cfg_).child_range("unit")) {
-+			BOOST_FOREACH(const config &u, (*player_cfg_).child_range("unit")) {
- 				handle_unit(u,"player_cfg");
- 			}
- 
- 		} else {
- 			//units in [side]
--			foreach (const config &su, side_cfg_.child_range("unit")) {
-+			BOOST_FOREACH(const config &su, side_cfg_.child_range("unit")) {
- 				handle_unit(su, "side_cfg");
- 			}
- 		}
-@@ -902,7 +902,7 @@
- 			"allow_changes", "faction_name", "user_description", "faction" };
- 
- 		log_step("place units");
--		foreach (const config *u, unit_configs_) {
-+		BOOST_FOREACH(const config *u, unit_configs_) {
- 			unit_creator uc(*t_,map_.starting_position(side_));
- 			uc
- 				.allow_add_to_recall(true)
-@@ -913,7 +913,7 @@
- 				.allow_show(false);
- 
- 			config cfg = *u;
--			foreach (const char *attr, side_attrs) {
-+			BOOST_FOREACH(const char *attr, side_attrs) {
- 				cfg.remove_attribute(attr);
- 			}
- 			uc.add_unit(cfg);
-@@ -953,7 +953,7 @@
- void game_state::set_menu_items(const config::const_child_itors &menu_items)
- {
- 	clear_wmi(wml_menu_items);
--	foreach (const config &item, menu_items)
-+	BOOST_FOREACH(const config &item, menu_items)
- 	{
- 		std::string id = item["id"];
- 		wml_menu_item*& mref = wml_menu_items[id];
-Index: src/log.cpp
-===================================================================
---- src/log.cpp	(revision 54624)
-+++ src/log.cpp	(revision 54625)
-@@ -25,8 +25,9 @@
- #include "SDL.h"
- 
- #include "log.hpp"
--#include "foreach.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- #include <sstream>
- #include <ctime>
-@@ -88,11 +89,11 @@
- {
- 	std::string::size_type s = name.size();
- 	if (name == "all") {
--		foreach (logd &l, *domains) {
-+		BOOST_FOREACH(logd &l, *domains) {
- 			l.second = severity;
- 		}
- 	} else if (s > 2 && name.compare(s - 2, 2, "/*") == 0) {
--		foreach (logd &l, *domains) {
-+		BOOST_FOREACH(logd &l, *domains) {
- 			if (l.first.compare(0, s - 1, name, 0, s - 1) == 0)
- 				l.second = severity;
- 		}
-@@ -108,7 +109,7 @@
- std::string list_logdomains(const std::string& filter)
- {
- 	std::ostringstream res;
--	foreach (logd &l, *domains) {
-+	BOOST_FOREACH(logd &l, *domains) {
- 		if(l.first.find(filter) != std::string::npos)
- 			res << l.first << "\n";
- 	}
-Index: src/replay_controller.cpp
-===================================================================
---- src/replay_controller.cpp	(revision 54624)
-+++ src/replay_controller.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
-@@ -27,6 +26,8 @@
- #include "resources.hpp"
- #include "savegame.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- 
-@@ -417,7 +418,7 @@
- 			finish_side_turn();
- 
- 			// This is necessary for replays in order to show possible movements.
--			foreach (unit &u, units_) {
-+			BOOST_FOREACH(unit &u, units_) {
- 				if (u.side() != player_number_) {
- 					u.new_turn();
- 				}
-Index: src/multiplayer_ui.cpp
-===================================================================
---- src/multiplayer_ui.cpp	(revision 54624)
-+++ src/multiplayer_ui.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "construct_dialog.hpp"
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -33,6 +32,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -163,9 +164,9 @@
- 			state.starting_pos.child_range("side");
- 		config::const_child_itors level_sides = level.child_range("side");
- 
--		foreach (config &side, saved_sides)
-+		BOOST_FOREACH(config &side, saved_sides)
- 		{
--			foreach (const config &lside, level_sides)
-+			BOOST_FOREACH(const config &lside, level_sides)
- 			{
- 				if (side["side"] == lside["side"] &&
- 						(side["current_player"] != lside["current_player"] ||
-@@ -599,7 +600,7 @@
- 		if (const config &ms = c.child("members")) {
- 			std::stringstream ss;
- 			ss << "Room " << c["room"].str() << " members: ";
--			foreach (const config& m, ms.child_range("member")) {
-+			BOOST_FOREACH(const config& m, ms.child_range("member")) {
- 				ss << m["name"] << " ";
- 			}
- 			chat_.add_message(time(NULL), "server", ss.str());
-@@ -608,7 +609,7 @@
- 		if (const config &rs = c.child("rooms")) {
- 			std::stringstream ss;
- 			ss << "Rooms: ";
--			foreach (const config& r, rs.child_range("room")) {
-+			BOOST_FOREACH(const config& r, rs.child_range("room")) {
- 				ss << r["name"].str() << "(" << r["size"].str() << ") ";
- 			}
- 			chat_.add_message(time(NULL), "server", ss.str());
-@@ -706,7 +707,7 @@
- {
- 	std::list<user_info> u_list;
- 
--	foreach (const config &user, gamelist_.child_range("user"))
-+	BOOST_FOREACH(const config &user, gamelist_.child_range("user"))
- 	{
- 		user_info u_elem;
- 		u_elem.name = user["name"].str();
-@@ -848,12 +849,12 @@
- 	}
- 
- 	int res = -1, index = 0, best_score = 0;
--	foreach (const config *faction, fl)
-+	BOOST_FOREACH(const config *faction, fl)
- 	{
- 		int faction_score = 0;
- 		std::vector<std::string> recruit = utils::split((*faction)[search_field]);
--		foreach (const std::string &search, find) {
--			foreach (const std::string &r, recruit) {
-+		BOOST_FOREACH(const std::string &search, find) {
-+			BOOST_FOREACH(const std::string &r, recruit) {
- 				if (r == search) {
- 					++faction_score;
- 					break;
-Index: src/display.cpp
-===================================================================
---- src/display.cpp	(revision 54624)
-+++ src/display.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "builder.hpp"
- #include "cursor.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "halo.hpp"
-@@ -41,6 +40,8 @@
- 
- #include "SDL_image.h"
- 
-+#include <boost/foreach.hpp>
-+
- #ifdef __SUNPRO_CC
- // GCC doesn't have hypot in cmath so include it for Sun Studio
- #include <math.h>
-@@ -629,7 +630,7 @@
- 	// now get the surfaces
- 	std::vector<surface> res;
- 
--	foreach(std::string& name, names) {
-+	BOOST_FOREACH(std::string& name, names) {
- 		const surface surf(image::get_image(name, image_type));
- 		if (surf)
- 			res.push_back(surf);
-@@ -828,8 +829,8 @@
- 	 * layergroup > location > layer > 'tblit' > surface
- 	 */
- 
--	foreach(const tblit &blit, drawing_buffer_) {
--		foreach(const surface& surf, blit.surf()) {
-+	BOOST_FOREACH(const tblit &blit, drawing_buffer_) {
-+		BOOST_FOREACH(const surface& surf, blit.surf()) {
- 			// Note that dstrect can be changed by sdl_blit
- 			// and so a new instance should be initialized
- 			// to pass to each call to sdl_blit.
-@@ -1903,7 +1904,7 @@
- 	int ticks3 = SDL_GetTicks();
- 	LOG_DP << "invalidate and draw: " << (ticks3 - ticks2) << " and " << (ticks2 - ticks1) << "\n";
- 
--	foreach (boost::function<void(display&)> f, redraw_observers_) {
-+	BOOST_FOREACH(boost::function<void(display&)> f, redraw_observers_) {
- 		f(*this);
- 	}
- 
-@@ -1992,7 +1993,7 @@
- 	SDL_Rect clip_rect = get_clip_rect();
- 	surface screen = get_screen_surface();
- 	clip_rect_setter set_clip_rect(screen, &clip_rect);
--	foreach (const map_location& loc, invalidated_) {
-+	BOOST_FOREACH(const map_location& loc, invalidated_) {
- 		int xpos = get_location_x(loc);
- 		int ypos = get_location_y(loc);
- 
-@@ -2058,7 +2059,7 @@
- 	// Paint arrows
- 	arrows_map_t::const_iterator arrows_in_hex = arrows_map_.find(loc);
- 	if(arrows_in_hex != arrows_map_.end()) {
--		foreach(arrow* const a, arrows_in_hex->second) {
-+		BOOST_FOREACH(arrow* const a, arrows_in_hex->second) {
- 			a->draw_hex(loc);
- 		}
- 	}
-@@ -2388,7 +2389,7 @@
- 	if(invalidateAll_)
- 		return false;
- 	bool ret = false;
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- #ifdef _OPENMP
- #pragma omp critical(invalidated_)
- #endif //_OPENMP
-@@ -2438,7 +2439,7 @@
- 		return false;
- 
- 	bool result = false;
--	foreach (const map_location &loc, hexes_under_rect(rect)) {
-+	BOOST_FOREACH(const map_location &loc, hexes_under_rect(rect)) {
- 		result |= invalidate(loc);
- 	}
- 	return result;
-@@ -2450,7 +2451,7 @@
- 	animate_map_ = preferences::animate_map();
- 	if (!animate_map_) return;
- 
--	foreach (const map_location &loc, get_visible_hexes())
-+	BOOST_FOREACH(const map_location &loc, get_visible_hexes())
- 	{
- 		if (shrouded(loc)) continue;
- 		if (builder_->update_animation(loc)) {
-@@ -2464,7 +2465,7 @@
- void display::add_arrow(arrow& arrow)
- {
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].push_back(&arrow);
- 	}
-@@ -2473,7 +2474,7 @@
- void display::remove_arrow(arrow& arrow)
- {
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].remove(&arrow);
- 	}
-@@ -2482,12 +2483,12 @@
- void display::update_arrow(arrow & arrow)
- {
- 	const arrow_path_t & previous_path = arrow.get_previous_path();
--	foreach (const map_location& loc, previous_path)
-+	BOOST_FOREACH(const map_location& loc, previous_path)
- 	{
- 		arrows_map_[loc].remove(&arrow);
- 	}
- 	const arrow_path_t & arrow_path = arrow.get_path();
--	foreach (const map_location& loc, arrow_path)
-+	BOOST_FOREACH(const map_location& loc, arrow_path)
- 	{
- 		arrows_map_[loc].push_back(&arrow);
- 	}
-Index: src/about.cpp
-===================================================================
---- src/about.cpp	(revision 54624)
-+++ src/about.cpp	(revision 54625)
-@@ -22,10 +22,11 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "marked-up_text.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- /**
-  * @namespace about
-  * Display credits %about all contributors.
-@@ -52,7 +53,7 @@
- 	}
- 
- 	std::vector<std::string> lines = utils::split(c["text"], '\n');
--	foreach (std::string &line, lines)
-+	BOOST_FOREACH(std::string &line, lines)
- 	{
- 		if (line.size() > 1 && line[0] == '+')
- 			line = "+  " + line.substr(1);
-@@ -67,7 +68,7 @@
- 		}
- 	}
- 
--	foreach (const config &entry, c.child_range("entry")) {
-+	BOOST_FOREACH(const config &entry, c.child_range("entry")) {
- 		res.push_back("-  "+ entry["name"].str());
- 	}
- }
-@@ -80,7 +81,7 @@
- 	config::child_itors about_entries = about_list.child_range("about");
- 
- 	if (!campaign.empty()) {
--		foreach (const config &about, about_entries) {
-+		BOOST_FOREACH(const config &about, about_entries) {
- 			// just finished a particular campaign
- 			if (campaign == about["id"]) {
- 				add_lines(res, about);
-@@ -88,7 +89,7 @@
- 		}
- 	}
- 
--	foreach (const config &about, about_entries) {
-+	BOOST_FOREACH(const config &about, about_entries) {
- 		add_lines(res, about);
- 	}
- 
-@@ -101,7 +102,7 @@
- 	images.clear();
- 	images_default = "";
- 
--	foreach (const config &about, cfg.child_range("about"))
-+	BOOST_FOREACH(const config &about, cfg.child_range("about"))
- 	{
- 		about_list.add_child("about", about);
- 		const std::string &im = about["images"];
-@@ -114,7 +115,7 @@
- 		}
- 	}
- 
--	foreach (const config &campaign, cfg.child_range("campaign"))
-+	BOOST_FOREACH(const config &campaign, cfg.child_range("campaign"))
- 	{
- 		config::const_child_itors abouts = campaign.child_range("about");
- 		if (abouts.first == abouts.second) continue;
-@@ -126,7 +127,7 @@
- 		temp["id"] = id;
- 		std::string campaign_images;
- 
--		foreach (const config &about, abouts)
-+		BOOST_FOREACH(const config &about, abouts)
- 		{
- 			const std::string &subtitle = about["title"];
- 			if (!subtitle.empty())
-@@ -139,12 +140,12 @@
- 				text << '\n';
- 			}
- 
--			foreach (const std::string &line, utils::split(about["text"], '\n'))
-+			BOOST_FOREACH(const std::string &line, utils::split(about["text"], '\n'))
- 			{
- 				text << "    " << line << '\n';
- 			}
- 
--			foreach (const config &entry, about.child_range("entry"))
-+			BOOST_FOREACH(const config &entry, about.child_range("entry"))
- 			{
- 				text << "    " << entry["name"] << '\n';
- 			}
-Index: src/arrow.cpp
-===================================================================
---- src/arrow.cpp	(revision 54624)
-+++ src/arrow.cpp	(revision 54625)
-@@ -20,11 +20,12 @@
- 
- #include "arrow.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_arrows("arrows");
- #define ERR_ARR LOG_STREAM(err, log_arrows)
- #define WRN_ARR LOG_STREAM(warn, log_arrows)
-@@ -293,7 +294,7 @@
- {
- 	if(!SCREEN) return;
- 
--	foreach(map_location const& loc, path)
-+	BOOST_FOREACH(map_location const& loc, path)
- 	{
- 		SCREEN->invalidate(loc);
- 	}
-Index: src/game_display.cpp
-===================================================================
---- src/game_display.cpp	(revision 54624)
-+++ src/game_display.cpp	(revision 54625)
-@@ -34,7 +34,6 @@
- Growl_Delegate growl_obj;
- #endif
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "halo.hpp"
- #include "log.hpp"
-@@ -47,6 +46,8 @@
- #include "sound.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_display("display");
- #define ERR_DP LOG_STREAM(err, log_display)
- #define LOG_DP LOG_STREAM(info, log_display)
-@@ -297,7 +298,7 @@
- 	halo::unrender(invalidated_);
- 	display::draw_invalidated();
- 
--	foreach(unit* temp_unit, fake_units_) {
-+	BOOST_FOREACH(unit* temp_unit, fake_units_) {
- 		const map_location& loc = temp_unit->get_location();
- 		exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
- 		if (invalidated_.find(loc) != invalidated_.end()
-@@ -305,7 +306,7 @@
- 			temp_unit->redraw_unit();
- 	}
- 
--	foreach (const map_location& loc, invalidated_) {
-+	BOOST_FOREACH(const map_location& loc, invalidated_) {
- 		unit_map::iterator u_it = units_.find(loc);
- 		exclusive_unit_draw_requests_t::iterator request = exclusive_unit_draw_requests_.find(loc);
- 		if (u_it != units_.end()
-@@ -451,7 +452,7 @@
- 
- 		// We display the unit the mouse is over if it is over a unit,
- 		// otherwise we display the unit that is selected.
--		foreach (const std::string &name, reports::report_list()) {
-+		BOOST_FOREACH(const std::string &name, reports::report_list()) {
- 			draw_report(name);
- 		}
- 		invalidateGameStatus_ = false;
-@@ -744,7 +745,7 @@
- void game_display::highlight_another_reach(const pathfind::paths &paths_list)
- {
- 	// Fold endpoints of routes into reachability map.
--	foreach (const pathfind::paths::step &dest, paths_list.destinations) {
-+	BOOST_FOREACH(const pathfind::paths::step &dest, paths_list.destinations) {
- 		reach_map_[dest.curr]++;
- 	}
- 	reach_map_changed_ = true;
-@@ -897,17 +898,17 @@
- void game_display::invalidate_animations()
- {
- 	display::invalidate_animations();
--	foreach (unit& u, units_) {
-+	BOOST_FOREACH(unit& u, units_) {
- 		u.refresh();
- 	}
--	foreach(unit* temp_unit, fake_units_) {
-+	BOOST_FOREACH(unit* temp_unit, fake_units_) {
- 		temp_unit->refresh();
- 	}
- 	std::vector<unit*> unit_list;
--	foreach (unit &u, units_) {
-+	BOOST_FOREACH(unit &u, units_) {
- 		unit_list.push_back(&u);
- 	}
--	foreach (unit *u, fake_units_) {
-+	BOOST_FOREACH(unit *u, fake_units_) {
- 		unit_list.push_back(u);
- 	}
- 	bool new_inval;
-@@ -1079,7 +1080,7 @@
- {
- 	const team& curr_team = teams_[playing_team()];
- 	const team& prev_team = teams_[playing_team()-1 < teams_.size() ? playing_team()-1 : teams_.size()-1];
--	foreach (const game_display::overlay_map::value_type i, overlays_) {
-+	BOOST_FOREACH(const game_display::overlay_map::value_type i, overlays_) {
- 		const overlay& ov = i.second;
- 		if (!ov.team_name.empty() &&
- 			((ov.team_name.find(curr_team.team_name()) + 1) != 0) !=
-@@ -1485,7 +1486,7 @@
- 		}
- 	}
- 
--	foreach (const chat_message &cm, chat_messages_) {
-+	BOOST_FOREACH(const chat_message &cm, chat_messages_) {
- 		font::move_floating_label(cm.speaker_handle, 0, - movement);
- 		font::move_floating_label(cm.handle, 0, - movement);
- 	}
-Index: src/formula_function.cpp
-===================================================================
---- src/formula_function.cpp	(revision 54624)
-+++ src/formula_function.cpp	(revision 54625)
-@@ -16,14 +16,14 @@
- #include "global.hpp"
- 
- 
--//#include "foreach.hpp"
- #include "callable_objects.hpp"
--#include "foreach.hpp"
- #include "formula_debugger.hpp"
- #include "formula_function.hpp"
- #include "game_display.hpp"
- #include "log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #ifdef HAVE_VISUAL_LEAK_DETECTOR
- #include "vld.h"
- #endif
-@@ -46,7 +46,7 @@
- 	s << get_name();
- 	s << '(';
- 	bool first_arg = true;
--	foreach(expression_ptr a , args()) {
-+	BOOST_FOREACH(expression_ptr a , args()) {
- 		if (!first_arg) {
- 			s << ',';
- 		} else {
-@@ -451,7 +451,7 @@
- 
- 				std::string result;
- 
--				foreach(expression_ptr arg, args()) {
-+				BOOST_FOREACH(expression_ptr arg, args()) {
- 						result += arg->evaluate(variables, fdb).string_cast();
- 				}
- 
-Index: src/unit_map.cpp
-===================================================================
---- src/unit_map.cpp	(revision 54624)
-+++ src/unit_map.cpp	(revision 54625)
-@@ -17,13 +17,14 @@
- /** @file */
- 
- #include "unit_id.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "unit.hpp"
- 
- #include <functional>
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define WRN_NG LOG_STREAM(warn, log_engine)
-@@ -444,7 +445,7 @@
- {
- 	assert(u);
- 
--	foreach(const unit_pod& item, ilist_) {
-+	BOOST_FOREACH(const unit_pod& item, ilist_) {
- 		if(item.unit == u) {
- 			return true;
- 		}
-Index: src/pathfind/teleport.cpp
-===================================================================
---- src/pathfind/teleport.cpp	(revision 54624)
-+++ src/pathfind/teleport.cpp	(revision 54625)
-@@ -19,7 +19,7 @@
- #include "log.hpp"
- #include "resources.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_PF LOG_STREAM(err, log_engine)
-@@ -108,16 +108,16 @@
- 	, targets_()
- {
- 
--	foreach(const teleport_group& group, groups) {
-+	BOOST_FOREACH(const teleport_group& group, groups) {
- 
- 		teleport_pair locations;
- 		group.get_teleport_pair(locations, u, ignore_units);
- 		if (!see_all && !group.always_visible() && viewing_team.is_enemy(u.side())) {
- 			teleport_pair filter_locs;
--			foreach(const map_location &loc, locations.first)
-+			BOOST_FOREACH(const map_location &loc, locations.first)
- 				if(!viewing_team.fogged(loc))
- 					filter_locs.first.insert(loc);
--			foreach(const map_location &loc, locations.second)
-+			BOOST_FOREACH(const map_location &loc, locations.second)
- 				if(!viewing_team.fogged(loc))
- 					filter_locs.second.insert(loc);
- 			locations.first.swap(filter_locs.first);
-Index: src/pathfind/astarsearch.cpp
-===================================================================
---- src/pathfind/astarsearch.cpp	(revision 54624)
-+++ src/pathfind/astarsearch.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "map.hpp"
- #include "pathfind/pathfind.hpp"
- #include "pathfind/teleport.hpp"
--#include "foreach.hpp"
- 
- #include <queue>
- #include <map>
-Index: src/pathfind/pathfind.cpp
-===================================================================
---- src/pathfind/pathfind.cpp	(revision 54624)
-+++ src/pathfind/pathfind.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "pathfind/pathfind.hpp"
- #include "pathfind/teleport.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -35,6 +34,8 @@
- #include "unit_map.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- #include <vector>
- #include <algorithm>
-@@ -59,7 +60,7 @@
- 		std::set<map_location> tiles_checking;
- 		tiles_checking.swap(pending_tiles_to_check);
- 		//Iterate over all the hexes we need to check
--		foreach (const map_location &loc, tiles_checking)
-+		BOOST_FOREACH(const map_location &loc, tiles_checking)
- 		{
- 			//If this area is not a castle but should, skip it.
- 			if (vacancy == pathfind::VACANT_CASTLE && !map.is_castle(loc)) continue;
-@@ -76,7 +77,7 @@
- 			if (units.find(loc) == units.end() && !pass_check_and_unreachable) return loc;
- 			map_location adjs[6];
- 			get_adjacent_tiles(loc,adjs);
--			foreach (const map_location &loc, adjs)
-+			BOOST_FOREACH(const map_location &loc, adjs)
- 			{
- 				if (!map.on_board(loc)) continue;
- 				// Add the tile to be checked if it hasn't already been and
-Index: src/time_of_day.cpp
-===================================================================
---- src/time_of_day.cpp	(revision 54624)
-+++ src/time_of_day.cpp	(revision 54625)
-@@ -16,9 +16,9 @@
- /** @file */
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "time_of_day.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- std::ostream &operator<<(std::ostream &s, const tod_color& c){
- 	s << c.r << "," << c.g << "," << c.b;
-@@ -62,7 +62,7 @@
- 
- void time_of_day::parse_times(const config& cfg, std::vector<time_of_day>& normal_times)
- {
--	foreach (const config &t, cfg.child_range("time")) {
-+	BOOST_FOREACH(const config &t, cfg.child_range("time")) {
- 		normal_times.push_back(time_of_day(t));
- 	}
- 
-Index: src/persist_manager.cpp
-===================================================================
---- src/persist_manager.cpp	(revision 54624)
-+++ src/persist_manager.cpp	(revision 54625)
-@@ -16,7 +16,7 @@
- #include "persist_context.hpp"
- #include "persist_manager.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- persist_context &persist_manager::get_context(const std::string &ns)
- {
-@@ -36,7 +36,7 @@
- bool persist_manager::start_transaction() {
- 	if (in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->start_transaction();
- 	}
- 	in_transaction_ = true;
-@@ -46,7 +46,7 @@
- bool persist_manager::end_transaction() {
- 	if (!in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->end_transaction();
- 	}
- 	in_transaction_ = !result;
-@@ -56,7 +56,7 @@
- bool persist_manager::cancel_transaction() {
- 	if (!in_transaction_) return false;
- 	bool result = true;
--	foreach (context_map::reference ctx, contexts_){
-+	BOOST_FOREACH(context_map::reference ctx, contexts_){
- 		result &= ctx.second->cancel_transaction();
- 	}
- 	in_transaction_ = false;
-Index: src/side_filter.cpp
-===================================================================
---- src/side_filter.cpp	(revision 54624)
-+++ src/side_filter.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "resources.hpp"
- #include "side_filter.hpp"
-@@ -26,6 +25,8 @@
- #include "team.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine_sf("engine/side_filter");
- #define ERR_NG LOG_STREAM(err, log_engine_sf)
- 
-@@ -61,7 +62,7 @@
- {
- 	//@todo: replace with better implementation
- 	std::vector<int> result;
--	foreach (const team &t, *resources::teams) {
-+	BOOST_FOREACH(const team &t, *resources::teams) {
- 		if (match(t)) {
- 			result.push_back(t.side());
- 		}
-@@ -109,7 +110,7 @@
- 		else {
- 			const std::vector<std::string>& these_team_names = utils::split(this_team_name);
- 			bool search_futile = true;
--			foreach(const std::string& this_single_team_name, these_team_names) {
-+			BOOST_FOREACH(const std::string& this_single_team_name, these_team_names) {
- 				if(this_single_team_name == that_team_name) {
- 					search_futile = false;
- 					break;
-@@ -123,7 +124,7 @@
- 	if(cfg_.has_child("has_unit")) {
- 		const vconfig& unit_filter = cfg_.child("has_unit");
- 		bool found = false;
--		foreach (unit &u, *resources::units) {
-+		BOOST_FOREACH(unit &u, *resources::units) {
- 			if (u.side() != t.side()) {
- 				continue;
- 			}
-@@ -134,7 +135,7 @@
- 		}
- 		if(!found && unit_filter["search_recall_list"].to_bool(false)) {
- 			const std::vector<unit>& recall_list = t.recall_list();
--			foreach(const unit& u, recall_list) {
-+			BOOST_FOREACH(const unit& u, recall_list) {
- 				scoped_recall_unit this_unit("this_unit", t.save_id(), &u - &recall_list[0]);
- 				if(u.matches_filter(unit_filter, u.get_location(), flat_)) {
- 					found = true;
-@@ -152,7 +153,7 @@
- 		side_filter s_filter(enemy_of);
- 		const std::vector<int>& teams = s_filter.get_teams();
- 		if(teams.empty()) return false;
--		foreach(const int side, teams) {
-+		BOOST_FOREACH(const int side, teams) {
- 			if(!(*resources::teams)[side - 1].is_enemy(t.side()))
- 				return false;
- 		}
-@@ -163,7 +164,7 @@
- 		side_filter s_filter(allied_with);
- 		const std::vector<int>& teams = s_filter.get_teams();
- 		if(teams.empty()) return false;
--		foreach(const int side, teams) {
-+		BOOST_FOREACH(const int side, teams) {
- 			if((*resources::teams)[side - 1].is_enemy(t.side()))
- 				return false;
- 		}
-Index: src/theme.cpp
-===================================================================
---- src/theme.cpp	(revision 54624)
-+++ src/theme.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "hotkeys.hpp"
- #include "log.hpp"
-@@ -26,6 +25,7 @@
- #include "theme.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_display("display");
- #define DBG_DP LOG_STREAM(debug, log_display)
-@@ -162,7 +162,7 @@
- {
- 	std::vector<config> res_cfgs_;
- 	// resolve all the partialresolutions
--	foreach (const config &part, top_cfg.child_range("partialresolution"))
-+	BOOST_FOREACH(const config &part, top_cfg.child_range("partialresolution"))
- 	{
- 		// follow the inheritance hierarchy and push all the nodes on the stack
- 		std::vector<const config*> parent_stack(1, &part);
-@@ -182,11 +182,11 @@
- 		while (!parent_stack.empty()) {
- 			//override attributes
- 			res_cfgs_.back().merge_attributes(*parent_stack.back());
--			foreach (const config &rm, parent_stack.back()->child_range("remove")) {
-+			BOOST_FOREACH(const config &rm, parent_stack.back()->child_range("remove")) {
- 				find_ref(rm["id"], res_cfgs_.back(), true);
- 			}
- 
--			foreach (const config &chg, parent_stack.back()->child_range("change"))
-+			BOOST_FOREACH(const config &chg, parent_stack.back()->child_range("change"))
- 			{
- 				config &target = find_ref(chg["id"], res_cfgs_.back());
- 				target.merge_attributes(chg);
-@@ -195,7 +195,7 @@
- 			// cannot add [status] sub-elements, but who cares
- 			if (const config &c = parent_stack.back()->child("add"))
- 			{
--				foreach (const config::any_child &j, c.all_children_range()) {
-+				BOOST_FOREACH(const config::any_child &j, c.all_children_range()) {
- 					res_cfgs_.back().add_child(j.key, j.cfg);
- 				}
- 			}
-@@ -204,7 +204,7 @@
- 		}
- 	}
- 	// Add all the resolutions
--	foreach (const config &res, top_cfg.child_range("resolution")) {
-+	BOOST_FOREACH(const config &res, top_cfg.child_range("resolution")) {
- 		dst_cfg.add_child("resolution", res);
- 	}
- 	// Add all the resolved resolutions
-@@ -217,7 +217,7 @@
- static void do_resolve_rects(const config& cfg, config& resolved_config, config* resol_cfg = NULL) {
- 
- 		// recursively resolve children
--		foreach (const config::any_child &value, cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, cfg.all_children_range()) {
- 			config &childcfg = resolved_config.add_child(value.key);
- 			do_resolve_rects(value.cfg, childcfg,
- 				value.key == "resolution" ? &childcfg : resol_cfg);
-@@ -549,7 +549,7 @@
- 
- 	int current_rating = 1000000;
- 	const config *current = NULL;
--	foreach (const config &i, cfg_.child_range("resolution"))
-+	BOOST_FOREACH(const config &i, cfg_.child_range("resolution"))
- 	{
- 		int width = i["width"];
- 		int height = i["height"];
-@@ -611,7 +611,7 @@
- 
- 	if (const config &status_cfg = cfg.child("status"))
- 	{
--		foreach (const config::any_child &i, status_cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &i, status_cfg.all_children_range()) {
- 			status_.insert(std::pair<std::string, status_item>(i.key, status_item(i.cfg)));
- 		}
- 		if (const config &unit_image_cfg = status_cfg.child("unit_image")) {
-@@ -621,19 +621,19 @@
- 		}
- 	}
- 
--	foreach (const config &p, cfg.child_range("panel")) {
-+	BOOST_FOREACH(const config &p, cfg.child_range("panel")) {
- 		panel new_panel(p);
- 		set_object_location(new_panel, p["rect"], p["ref"]);
- 		panels_.push_back(new_panel);
- 	}
- 
--	foreach (const config &lb, cfg.child_range("label")) {
-+	BOOST_FOREACH(const config &lb, cfg.child_range("label")) {
- 		label new_label(lb);
- 		set_object_location(new_label, lb["rect"], lb["ref"]);
- 		labels_.push_back(new_label);
- 	}
- 
--	foreach (const config &m, cfg.child_range("menu"))
-+	BOOST_FOREACH(const config &m, cfg.child_range("menu"))
- 	{
- 		menu new_menu(m);
- 		DBG_DP << "adding menu: " << (new_menu.is_context() ? "is context" : "not context") << "\n";
-@@ -699,7 +699,7 @@
- 	}
- 
- 	// Change existing theme objects.
--	foreach (const config &c, cfg.child_range("change"))
-+	BOOST_FOREACH(const config &c, cfg.child_range("change"))
- 	{
- 		std::string id = c["id"];
- 		std::string ref_id = c["ref"];
-@@ -709,12 +709,12 @@
- 	}
- 
- 	// Add new theme objects.
--	foreach (const config &c, cfg.child_range("add")) {
-+	BOOST_FOREACH(const config &c, cfg.child_range("add")) {
- 		add_object(c);
- 	}
- 
- 	// Remove existent theme objects.
--	foreach (const config &c, cfg.child_range("remove")) {
-+	BOOST_FOREACH(const config &c, cfg.child_range("remove")) {
- 		remove_object(c["id"]);
- 	}
- 
-@@ -758,7 +758,7 @@
- 	if (!cfg)
- 		return;
- 
--	foreach (const config &thm, cfg->child_range("theme"))
-+	BOOST_FOREACH(const config &thm, cfg->child_range("theme"))
- 	{
- 		std::string thm_name = thm["name"];
- 		if (!thm["hidden"].to_bool(false))
-@@ -778,7 +778,7 @@
- 
- const theme::menu *theme::get_menu_item(const std::string &key) const
- {
--	foreach (const theme::menu &m, menus_) {
-+	BOOST_FOREACH(const theme::menu &m, menus_) {
- 		if (m.get_id() == key) return &m;
- 	}
- 	return NULL;
-Index: src/addon/manager.cpp
-===================================================================
---- src/addon/manager.cpp	(revision 54624)
-+++ src/addon/manager.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- #include "addon/manager.hpp"
- #include "dialogs.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -41,6 +40,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CFG LOG_STREAM(err , log_config)
- #define LOG_CFG LOG_STREAM(info, log_config)
-@@ -321,11 +322,11 @@
- 
- 	make_directory(dir);
- 
--	foreach (const config &d, cfg.child_range("dir")) {
-+	BOOST_FOREACH(const config &d, cfg.child_range("dir")) {
- 		unarchive_dir(dir, d);
- 	}
- 
--	foreach (const config &f, cfg.child_range("file")) {
-+	BOOST_FOREACH(const config &f, cfg.child_range("file")) {
- 		unarchive_file(dir, f);
- 	}
- }
-@@ -701,7 +702,7 @@
- 		std::string missing = "";
- 		size_t count_missing = 0;
- 
--		foreach(const std::string& i, dependencies) {
-+		BOOST_FOREACH(const std::string& i, dependencies) {
- 			if (std::find(installed.begin(), installed.end(), i) == installed.end()) {
- 				missing += "\n" + i;
- 				++count_missing;
-@@ -717,7 +718,7 @@
- 			std::vector< std::string > unsafe_matches;
- 			std::ostringstream unsafe_list;
- 			std::map<std::string, version_info> remote_version_map;
--			foreach (const config &remote_addon, remote_addons_list)
-+			BOOST_FOREACH(const config &remote_addon, remote_addons_list)
- 			{
- 				const std::string& name = remote_addon["name"];
- 				if (std::find(dependencies.begin(), dependencies.end(), name) != dependencies.end()) {
-@@ -837,7 +838,7 @@
- 				if(!result) {
- 					assert(failed_titles.empty() == false);
- 					std::string failed_titles_list_fmt;
--					foreach(const std::string& entry, failed_titles) {
-+					BOOST_FOREACH(const std::string& entry, failed_titles) {
- 						failed_titles_list_fmt += '\n';
- 						failed_titles_list_fmt += entry;
- 					}
-@@ -870,7 +871,7 @@
- 		std::vector<version_info> safe_local_versions;
- 		std::vector<version_info> unsafe_local_versions;
- 		std::map<std::string, version_info> remote_version_map;
--		foreach (const config &remote_addon, remote_addons_list)
-+		BOOST_FOREACH(const config &remote_addon, remote_addons_list)
- 		{
- 			const std::string& name = remote_addon["name"];
- 			const std::string& version = remote_addon["version"];
-@@ -1065,7 +1066,7 @@
- 		if(!result) {
- 			assert(failed_titles.empty() == false);
- 			std::string failed_titles_list_fmt;
--			foreach(const std::string& entry, failed_titles) {
-+			BOOST_FOREACH(const std::string& entry, failed_titles) {
- 				failed_titles_list_fmt += '\n';
- 				failed_titles_list_fmt += entry;
- 			}
-@@ -1090,7 +1091,7 @@
- 		const std::string& addon,
- 		const std::vector<std::string>& own_addons)
- 	{
--		foreach(const std::string& current_own_addon, own_addons) {
-+		BOOST_FOREACH(const std::string& current_own_addon, own_addons) {
- 			if(current_own_addon == addon) {
- 				utils::string_map symbols;
- 				symbols["addon"] = addon;
-@@ -1171,7 +1172,7 @@
- 
- 			std::vector< addon_info > infos;
- 
--			foreach(const config &c, addon_cfgs)
-+			BOOST_FOREACH(const config &c, addon_cfgs)
- 			{
- 				const std::string& name = c["name"];
- 				const std::string& downloads = c["downloads"].str();
-@@ -1254,13 +1255,13 @@
- 				infos.push_back(inf);
- 			}
- 
--			foreach(const std::string& pub, publish_options) {
-+			BOOST_FOREACH(const std::string& pub, publish_options) {
- 				static const std::string publish_icon = "icons/icon-addon-publish.png";
- 				const std::string text = _("Publish add-on: ") + get_addon_name(pub);
- 				options.push_back(IMAGE_PREFIX + publish_icon + COLUMN_SEPARATOR + font::GOOD_TEXT + text);
- 				options_to_filter.push_back(text);
- 			}
--			foreach(const std::string& del, delete_options) {
-+			BOOST_FOREACH(const std::string& del, delete_options) {
- 				static const std::string delete_icon = "icons/icon-addon-delete.png";
- 				const std::string text = _("Delete add-on: ") + get_addon_name(del);
- 				options.push_back(IMAGE_PREFIX + delete_icon + COLUMN_SEPARATOR + font::BAD_TEXT + text);
-@@ -1408,7 +1409,7 @@
- 
- 			remove_names.clear();
- 
--			foreach(const std::string& id, remove_ids) {
-+			BOOST_FOREACH(const std::string& id, remove_ids) {
- 				remove_names.push_back(get_addon_name(id));
- 			}
- 
-@@ -1425,7 +1426,7 @@
- 
- 		std::vector<std::string> failed_names, skipped_names, succeeded_names;
- 
--		foreach(const std::string& id, remove_ids) {
-+		BOOST_FOREACH(const std::string& id, remove_ids) {
- 			const std::string& name = get_addon_name(id);
- 
- 			if(have_addon_pbl_info(id) || have_addon_in_vcs_tree(id)) {
-@@ -1531,12 +1532,12 @@
- 	}
- 	static const std::string parentd = get_addon_campaigns_dir();
- 	std::vector<std::string> addon_info_files;
--	foreach(std::string const& dir, addons)
-+	BOOST_FOREACH(std::string const& dir, addons)
- 		addon_info_files.push_back(parentd+"/"+dir+"/_info.cfg");
- 
- 	size_t i = 0;
- 
--	foreach(std::string const& info_file, addon_info_files) {
-+	BOOST_FOREACH(std::string const& info_file, addon_info_files) {
- 		assert(i < addons.size());
- 
- 		std::string const& addon = addons[i];
-Index: src/addon/validation.cpp
-===================================================================
---- src/addon/validation.cpp	(revision 54624)
-+++ src/addon/validation.cpp	(revision 54625)
-@@ -17,8 +17,9 @@
- #include "global.hpp"
- #include "addon/validation.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cstring>
- 
- const unsigned short default_campaignd_port = 15002;
-@@ -44,10 +45,10 @@
- 
- bool check_names_legal(const config& dir)
- {
--	foreach (const config &path, dir.child_range("file")) {
-+	BOOST_FOREACH(const config &path, dir.child_range("file")) {
- 		if (!addon_name_legal(path["name"])) return false;
- 	}
--	foreach (const config &path, dir.child_range("dir")) {
-+	BOOST_FOREACH(const config &path, dir.child_range("dir")) {
- 		if (!addon_name_legal(path["name"])) return false;
- 		if (!check_names_legal(path)) return false;
- 	}
-Index: src/mapgen.cpp
-===================================================================
---- src/mapgen.cpp	(revision 54624)
-+++ src/mapgen.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "language.hpp"
- #include "log.hpp"
-@@ -34,6 +33,7 @@
- #include "formula_string_utils.hpp"
- #include "SDL.h"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -777,7 +777,7 @@
- 
- 	std::vector<terrain_height_mapper> height_conversion;
- 
--	foreach (const config &h, cfg.child_range("height")) {
-+	BOOST_FOREACH(const config &h, cfg.child_range("height")) {
- 		height_conversion.push_back(terrain_height_mapper(h));
- 	}
- 
-@@ -912,7 +912,7 @@
- 	LOG_NG << (SDL_GetTicks() - ticks) << "\n"; ticks = SDL_GetTicks();
- 
- 	std::vector<terrain_converter> converters;
--	foreach (const config &cv, cfg.child_range("convert")) {
-+	BOOST_FOREACH(const config &cv, cfg.child_range("convert")) {
- 		converters.push_back(terrain_converter(cv));
- 	}
- 
-Index: src/cavegen.cpp
-===================================================================
---- src/cavegen.cpp	(revision 54624)
-+++ src/cavegen.cpp	(revision 54625)
-@@ -21,13 +21,14 @@
- #include "global.hpp"
- 
- #include "cavegen.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "pathfind/pathfind.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -147,7 +148,7 @@
- 
- void cave_map_generator::generate_chambers()
- {
--	foreach (const config &ch, cfg_.child_range("chamber"))
-+	BOOST_FOREACH(const config &ch, cfg_.child_range("chamber"))
- 	{
- 		// If there is only a chance of the chamber appearing, deal with that here.
- 		if (ch.has_attribute("chance") && (rand() % 100) < ch["chance"].to_int()) {
-@@ -195,7 +196,7 @@
- 
- 		chambers_.push_back(new_chamber);
- 
--		foreach (const config &p, ch.child_range("passage"))
-+		BOOST_FOREACH(const config &p, ch.child_range("passage"))
- 		{
- 			const std::string &dst = p["destination"];
- 
-@@ -220,7 +221,7 @@
- 	if (c.items == NULL || c.locs.empty()) return;
- 
- 	size_t index = 0;
--	foreach (const config::any_child &it, c.items->all_children_range())
-+	BOOST_FOREACH(const config::any_child &it, c.items->all_children_range())
- 	{
- 		config cfg = it.cfg;
- 		config &filter = cfg.child("filter");
-Index: src/ai/lua/core.cpp
-===================================================================
---- src/ai/lua/core.cpp	(revision 54624)
-+++ src/ai/lua/core.cpp	(revision 54625)
-@@ -34,7 +34,6 @@
- #include "../../actions.hpp"
- #include "../../attack_prediction.hpp"
- #include "../../filesystem.hpp"
--#include "../../foreach.hpp"
- #include "../../game_display.hpp"
- #include "../../gamestatus.hpp"
- #include "../../log.hpp"
-Index: src/ai/default/attack.cpp
-===================================================================
---- src/ai/default/attack.cpp	(revision 54624)
-+++ src/ai/default/attack.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../manager.hpp"
- 
- #include "../../attack_prediction.hpp"
--#include "foreach.hpp"
- #include "../../game_config.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
-Index: src/ai/default/contexts.cpp
-===================================================================
---- src/ai/default/contexts.cpp	(revision 54624)
-+++ src/ai/default/contexts.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "contexts.hpp"
- 
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-Index: src/ai/default/ai.cpp
-===================================================================
---- src/ai/default/ai.cpp	(revision 54624)
-+++ src/ai/default/ai.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "../../array.hpp"
- #include "../../dialogs.hpp"
--#include "../../foreach.hpp"
- #include "../../game_end_exceptions.hpp"
- #include "../../game_events.hpp"
- #include "../../game_preferences.hpp"
-@@ -41,6 +40,8 @@
- 
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- #include <algorithm>
- #include <fstream>
-@@ -144,7 +145,7 @@
- 
- void ai_default_recruitment_stage::on_create() {
- 	stage::on_create();
--	foreach (const config &c, cfg_.child_range("limit")) {
-+	BOOST_FOREACH(const config &c, cfg_.child_range("limit")) {
- 		if (c.has_attribute("type") && c.has_attribute("max") ) {
- 			maximum_counts_.insert(std::make_pair(c["type"],lexical_cast_default<int>(c["max"],0)));
- 		}
-@@ -193,7 +194,7 @@
- 	bool found = false;
- 	// Find an available unit that can be recruited,
- 	// matches the desired usage type, and comes in under budget.
--	foreach (const std::string &name, current_team().recruits())
-+	BOOST_FOREACH(const std::string &name, current_team().recruits())
- 	{
- 		const unit_type *ut = unit_types.find(name);
- 		if (!ut) continue;
-@@ -435,7 +436,7 @@
- 
- 			team &enemy_team = (*resources::teams)[j->side() - 1];
- 			const std::set<std::string> &recruits = enemy_team.recruits();
--			foreach (const std::string &rec, recruits) {
-+			BOOST_FOREACH(const std::string &rec, recruits) {
- 				get_combat_score_vs(ut,rec,score,weighting,0,0);
- 			}
- 			continue;
-@@ -677,7 +678,7 @@
- 		        double best_combat_score_of_advancement = 0;
- 			bool best_combat_score_of_advancement_found = false;
- 			int best_cost = recall_cost;
--			foreach (const std::string &i, u.advances_to()) {
-+			BOOST_FOREACH(const std::string &i, u.advances_to()) {
- 				const unit_type *ut = unit_types.find(i);
- 				if (!ut) {
- 					continue;
-Index: src/ai/configuration.cpp
-===================================================================
---- src/ai/configuration.cpp	(revision 54624)
-+++ src/ai/configuration.cpp	(revision 54625)
-@@ -22,12 +22,13 @@
- #include "configuration.hpp"
- 
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- #include "../serialization/parser.hpp"
- #include "../serialization/preprocessor.hpp"
- #include "../team.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <vector>
- 
- namespace ai {
-@@ -93,7 +94,7 @@
- 	}
- 
- 
--	foreach (const config &ai_configuration, ais.child_range("ai")) {
-+	BOOST_FOREACH(const config &ai_configuration, ais.child_range("ai")) {
- 		const std::string &id = ai_configuration["id"];
- 		if (id.empty()){
- 
-@@ -118,7 +119,7 @@
- void configuration::add_era_ai_from_config(const config &era)
- {
- 	era_ai_configurations_.clear();
--	foreach (const config &ai_configuration, era.child_range("ai")) {
-+	BOOST_FOREACH(const config &ai_configuration, era.child_range("ai")) {
- 		const std::string &id = ai_configuration["id"];
- 		if (id.empty()){
- 
-@@ -196,7 +197,7 @@
- 	config aspect_config;
- 	aspect_config["id"] = id;
- 
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		const config &_aspect = aiparam.find_child("aspect","id",id);
- 		if (_aspect) {
- 			aspect_config.append(_aspect);
-@@ -216,7 +217,7 @@
- 		if (aspect_was_attribute) {
- 			facet_config["value"] = aiparam[id];
- 		} else {
--			foreach (const config &value, aiparam.child_range(id)) {
-+			BOOST_FOREACH(const config &value, aiparam.child_range(id)) {
- 				facet_config.add_child("value",value);
- 			}
- 		}
-@@ -242,7 +243,7 @@
- 
- 	//leave only the [ai] children
- 	cfg = config();
--	foreach (const config &aiparam, original_cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, original_cfg.child_range("ai")) {
- 		cfg.add_child("ai",aiparam);
- 	}
- 
-@@ -264,7 +265,7 @@
- 
- 	//find version
- 	int version = 10600;
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		if (const config::attribute_value *a = aiparam.get("version")){
- 			int v = a->to_int(version);
- 			if (version<v) {
-@@ -290,7 +291,7 @@
- 	config parsed_cfg = config();
- 
- 	LOG_AI_CONFIGURATION << "side "<< side <<": merging AI configurations"<< std::endl;
--	foreach (const config &aiparam, cfg.child_range("ai")) {
-+	BOOST_FOREACH(const config &aiparam, cfg.child_range("ai")) {
- 		parsed_cfg.append(aiparam);
- 	}
- 
-@@ -302,7 +303,7 @@
- 	parsed_cfg.merge_children_by_attribute("aspect","id");
- 
- 	LOG_AI_CONFIGURATION << "side "<< side <<": removing duplicate [default] tags from aspects"<< std::endl;
--	foreach (config &aspect_cfg, parsed_cfg.child_range("aspect")) {
-+	BOOST_FOREACH(config &aspect_cfg, parsed_cfg.child_range("aspect")) {
- 		if (!aspect_cfg.child("default")) {
- 			WRN_AI_CONFIGURATION << "side "<< side <<": aspect with id=["<<aspect_cfg["id"]<<"] lacks default config facet!" <<std::endl;
- 			continue;
-@@ -341,7 +342,7 @@
- 	if (cfg["ai_algorithm"]=="idle_ai") {
- 		is_idle_ai = true;
- 	} else {
--		foreach (config &aiparam, cfg.child_range("ai")) {
-+		BOOST_FOREACH(config &aiparam, cfg.child_range("ai")) {
- 			if (aiparam["ai_algorithm"]=="idle_ai") {
- 				is_idle_ai = true;
- 				break;
-@@ -360,8 +361,8 @@
- 
- 	config fallback_stage_cfg_ai;
- 
--	foreach (config &aiparam, cfg.child_range("ai")) {
--		foreach (const well_known_aspect &wka, well_known_aspects) {
-+	BOOST_FOREACH(config &aiparam, cfg.child_range("ai")) {
-+		BOOST_FOREACH(const well_known_aspect &wka, well_known_aspects) {
- 			if (wka.was_an_attribute_) {
- 				aiparam.remove_attribute(wka.name_);
- 			} else {
-@@ -370,7 +371,7 @@
- 		}
- 
- 
--		foreach (const config &aitarget, aiparam.child_range("target")) {
-+		BOOST_FOREACH(const config &aitarget, aiparam.child_range("target")) {
- 			config aigoal;
- 			transfer_turns_and_time_of_day_data(aiparam,aigoal);
- 
-@@ -388,14 +389,14 @@
- 		aiparam.clear_children("target");
- 
- 
--		foreach (config &ai_protect_unit, aiparam.child_range("protect_unit")) {
-+		BOOST_FOREACH(config &ai_protect_unit, aiparam.child_range("protect_unit")) {
- 			transfer_turns_and_time_of_day_data(aiparam,ai_protect_unit);
- 			upgrade_protect_goal_config_from_1_07_02_to_1_07_03(side,ai_protect_unit,parsed_cfg,true);
- 		}
- 		aiparam.clear_children("protect_unit");
- 
- 
--		foreach (config &ai_protect_location, aiparam.child_range("protect_location")) {
-+		BOOST_FOREACH(config &ai_protect_location, aiparam.child_range("protect_location")) {
- 			transfer_turns_and_time_of_day_data(aiparam,ai_protect_location);
- 			upgrade_protect_goal_config_from_1_07_02_to_1_07_03(side,ai_protect_location,parsed_cfg,false);
- 		}
-@@ -423,19 +424,19 @@
- 	fallback_stage_cfg_ai.clear_children("aspect");
- 
- 	//move [stage]s to root of the config
--	foreach (const config &aistage, fallback_stage_cfg_ai.child_range("stage")) {
-+	BOOST_FOREACH(const config &aistage, fallback_stage_cfg_ai.child_range("stage")) {
- 		parsed_cfg.add_child("stage",aistage);
- 	}
- 	fallback_stage_cfg_ai.clear_children("stage");
- 
- 	//move [goal]s to root of the config
--	foreach (const config &aigoal, fallback_stage_cfg_ai.child_range("goal")) {
-+	BOOST_FOREACH(const config &aigoal, fallback_stage_cfg_ai.child_range("goal")) {
- 		parsed_cfg.add_child("goal",aigoal);
- 	}
- 	fallback_stage_cfg_ai.clear_children("goal");
- 
- 	//move [modify_ai]'s to root of the config
--	foreach (const config &aimodifyai, fallback_stage_cfg_ai.child_range("modify_ai")) {
-+	BOOST_FOREACH(const config &aimodifyai, fallback_stage_cfg_ai.child_range("modify_ai")) {
- 		parsed_cfg.add_child("modify_ai",aimodifyai);
- 	}
- 	fallback_stage_cfg_ai.clear_children("modify_ai");
-@@ -452,12 +453,12 @@
- {
- 	config cfg;
- 
--	foreach (const config &aiparam, ai_parameters) {
-+	BOOST_FOREACH(const config &aiparam, ai_parameters) {
- 		cfg.add_child("ai",aiparam);
- 	}
- 
- 	DBG_AI_CONFIGURATION << "side "<< side <<": upgrading aspects from syntax of 1.7.2 to 1.7.3, old-style config is:" << std::endl << cfg << std::endl;
--	foreach (const well_known_aspect &wka, well_known_aspects) {
-+	BOOST_FOREACH(const well_known_aspect &wka, well_known_aspects) {
- 		upgrade_aspect_config_from_1_07_02_to_1_07_03(side, cfg,parsed_cfg,wka.name_,wka.was_an_attribute_);
- 	}
- }
-Index: src/ai/contexts.cpp
-===================================================================
---- src/ai/contexts.cpp	(revision 54624)
-+++ src/ai/contexts.cpp	(revision 54625)
-@@ -47,6 +47,8 @@
- #include "../tod_manager.hpp"
- #include "../unit_display.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_ai("ai/general");
- #define DBG_AI LOG_STREAM(debug, log_ai)
- #define LOG_AI LOG_STREAM(info, log_ai)
-@@ -223,19 +225,19 @@
- 
- void readonly_context_impl::on_readonly_context_create() {
- 	//init the composite ai engines
--	foreach(const config &cfg_element, cfg_.child_range("engine")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("engine")){
- 		engine::parse_engine_from_config(*this,cfg_element,std::back_inserter(engines_));
- 	}
- 
- 	// init the composite ai aspects
--	foreach(const config &cfg_element, cfg_.child_range("aspect")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("aspect")){
- 		std::vector<aspect_ptr> aspects;
- 		engine::parse_aspect_from_config(*this,cfg_element,cfg_element["id"],std::back_inserter(aspects));
- 		add_aspects(aspects);
- 	}
- 
- 	// init the composite ai goals
--	foreach(const config &cfg_element, cfg_.child_range("goal")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("goal")){
- 		engine::parse_goal_from_config(*this,cfg_element,std::back_inserter(get_goals()));
- 	}
- }
-@@ -255,13 +257,13 @@
- config readonly_context_impl::to_readonly_context_config() const
- {
- 	config cfg;
--	foreach(const engine_ptr e, engines_) {
-+	BOOST_FOREACH(const engine_ptr e, engines_) {
- 		cfg.add_child("engine",e->to_config());
- 	}
--	foreach(const aspect_map::value_type a, aspects_) {
-+	BOOST_FOREACH(const aspect_map::value_type a, aspects_) {
- 		cfg.add_child("aspect",a.second->to_config());
- 	}
--	foreach(const goal_ptr g, goals_) {
-+	BOOST_FOREACH(const goal_ptr g, goals_) {
- 		cfg.add_child("goal",g->to_config());
- 	}
- 	return cfg;
-@@ -366,7 +368,7 @@
- 	}
- 
- 	for(std::map<map_location,pathfind::paths>::iterator m = res.begin(); m != res.end(); ++m) {
--		foreach (const pathfind::paths::step &dest, m->second.destinations)
-+		BOOST_FOREACH(const pathfind::paths::step &dest, m->second.destinations)
- 		{
- 			const map_location& src = m->first;
- 			const map_location& dst = dest.curr;
-@@ -406,7 +408,7 @@
- 
- void readonly_context_impl::add_aspects(std::vector< aspect_ptr > &aspects )
- {
--	foreach (aspect_ptr a, aspects) {
-+	BOOST_FOREACH(aspect_ptr a, aspects) {
- 		const std::string id = a->get_id();
- 		known_aspect_map::iterator i = known_aspects_.find(id);
- 		if (i != known_aspects_.end()) {
-@@ -1024,7 +1026,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-@@ -1112,7 +1114,7 @@
- 	map_location const* best_occupied_keep = &map_location::null_location;
- 	double move_left_at_best_occupied_keep = 0.0;
- 
--	foreach (const pathfind::paths::step &dest, leader_paths.destinations)
-+	BOOST_FOREACH(const pathfind::paths::step &dest, leader_paths.destinations)
- 	{
- 		const map_location &loc = dest.curr;
- 		if (keeps().find(loc)!=keeps().end()){
-Index: src/ai/manager.cpp
-===================================================================
---- src/ai/manager.cpp	(revision 54624)
-+++ src/ai/manager.cpp	(revision 54625)
-@@ -27,13 +27,14 @@
- #include "registry.hpp"
- #include "../game_events.hpp"
- #include "../game_preferences.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- #include "../replay.hpp"
- #include "../serialization/string_utils.hpp"
- #include "../statistics.hpp"
- #include "composite/component.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- #include <stack>
- #include <vector>
-@@ -89,7 +90,7 @@
- 
- 	if (this->ai_) {
- 		ai_->on_create();
--		foreach (config &mod_ai, cfg_.child_range("modify_ai")) {
-+		BOOST_FOREACH(config &mod_ai, cfg_.child_range("modify_ai")) {
- 			if (!mod_ai.has_attribute("side")) {
- 				mod_ai["side"] = side;
- 			}
-@@ -149,8 +150,8 @@
- 		cfg_.merge_children_by_attribute("aspect","id");
- 	} else {
- 		// else run 'add_facet' command on each [aspect][facet]
--		foreach (const config &cfg_a, cfg.child_range("aspect")) {
--			foreach (const config &cfg_f, cfg_a.child_range("facet")) {
-+		BOOST_FOREACH(const config &cfg_a, cfg.child_range("aspect")) {
-+			BOOST_FOREACH(const config &cfg_f, cfg_a.child_range("facet")) {
- 				readonly_context_->add_facet(cfg_a["id"],cfg_f);
- 			}
- 		}
-Index: src/ai/composite/component.cpp
-===================================================================
---- src/ai/composite/component.cpp	(revision 54624)
-+++ src/ai/composite/component.cpp	(revision 54625)
-@@ -23,12 +23,12 @@
- #include "property_handler.hpp"
- #include "../../config.hpp"
- #include "../../log.hpp"
--#include "../../foreach.hpp"
- 
- #include "../formula/ai.hpp"
- 
- #include <boost/lexical_cast.hpp>
- #include <boost/regex.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace pathfind {
- 
-@@ -125,7 +125,7 @@
- std::vector<std::string> component::get_children_types()
- {
- 	std::vector<std::string> types;
--	foreach (property_handler_map::value_type &ph, property_handlers_) {
-+	BOOST_FOREACH(property_handler_map::value_type &ph, property_handlers_) {
- 		types.push_back(ph.first);
- 	}
- 	return types;
-@@ -241,9 +241,9 @@
- 
- 	s << offset_str << type<<"["<<root->get_id() <<"] "<<root->get_engine()<<" "<<root->get_name()<< std::endl;
- 
--	foreach (std::string t, t_list) {
-+	BOOST_FOREACH(std::string t, t_list) {
- 		std::vector<component*> c_list = root->get_children(t);
--		foreach (component *c, c_list) {
-+		BOOST_FOREACH(component *c, c_list) {
- 			print_component(c,t,s,offset+1);
- 		}
- 	}
-Index: src/ai/composite/stage.cpp
-===================================================================
---- src/ai/composite/stage.cpp	(revision 54624)
-+++ src/ai/composite/stage.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "engine.hpp"
- #include "stage.hpp"
- #include "../contexts.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
- #include "../../tod_manager.hpp"
-Index: src/ai/composite/engine.cpp
-===================================================================
---- src/ai/composite/engine.cpp	(revision 54624)
-+++ src/ai/composite/engine.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "engine.hpp"
- #include "contexts.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/engine_default.cpp
-===================================================================
---- src/ai/composite/engine_default.cpp	(revision 54624)
-+++ src/ai/composite/engine_default.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "engine_default.hpp"
- #include "rca.hpp"
- #include "stage.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/goal.cpp
-===================================================================
---- src/ai/composite/goal.cpp	(revision 54624)
-+++ src/ai/composite/goal.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "../../log.hpp"
- #include "../lua/lua_object.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../resources.hpp"
- #include "../../scripting/lua.hpp"
- #include "../../terrain_filter.hpp"
-@@ -34,6 +33,7 @@
- #include "../../variable.hpp"
- 
- #include <boost/lexical_cast.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -128,7 +128,7 @@
- 	if (!criteria) return;
- 
- 	//find the enemy leaders and explicit targets
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.matches_filter(vconfig(criteria), u.get_location())) {
- 			LOG_AI_GOAL << "found explicit target unit at ... " << u.get_location() << " with value: " << value() << "\n";
- 			*target_list = target(u.get_location(), value(), target::EXPLICIT);
-@@ -173,7 +173,7 @@
- 
- 	std::set<map_location> items;
- 	filter_ptr_->get_locations(items);
--	foreach (const map_location &loc, items)
-+	BOOST_FOREACH(const map_location &loc, items)
- 	{
- 		LOG_AI_GOAL << "found explicit target location ... " << loc << " with value: " << value() << std::endl;
- 		*target_list = target(loc, value(), target::EXPLICIT);
-@@ -252,7 +252,7 @@
- 
- 	std::set<map_location> items;
- 	if (protect_unit_) {
--		foreach (const unit &u, units)
-+		BOOST_FOREACH(const unit &u, units)
- 		{
- 			if (protect_only_own_unit_ && u.side() != get_side()) {
- 				continue;
-@@ -268,9 +268,9 @@
- 	}
- 	DBG_AI_GOAL << "side " << get_side() << ": seaching for threats in "+goal_type+" goal" << std::endl;
- 	// Look for directions to protect a specific location or specific unit.
--	foreach (const map_location &loc, items)
-+	BOOST_FOREACH(const map_location &loc, items)
- 	{
--		foreach (const unit &u, units)
-+		BOOST_FOREACH(const unit &u, units)
- 		{
- 			int distance = distance_between(u.get_location(), loc);
- 			if (current_team().is_enemy(u.side()) && distance < radius_ &&
-@@ -325,7 +325,7 @@
- 	handler_->handle(c, true, l_obj);
- 	std::vector < target > targets = *(l_obj->get());
- 
-- 	foreach (target tg, targets)
-+ 	BOOST_FOREACH(target tg, targets)
-  	{
-  		*target_list = tg;
-  	}
-Index: src/ai/composite/engine_fai.cpp
-===================================================================
---- src/ai/composite/engine_fai.cpp	(revision 54624)
-+++ src/ai/composite/engine_fai.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../formula/candidates.hpp"
- #include "../formula/stage_side_formulas.hpp"
- #include "../formula/stage_unit_formulas.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/composite/aspect.hpp
-===================================================================
---- src/ai/composite/aspect.hpp	(revision 54624)
-+++ src/ai/composite/aspect.hpp	(revision 54625)
-@@ -265,7 +265,7 @@
- 		, facets_()
- 		, default_()
- 	{
--		foreach (const config &cfg_element, this->cfg_.child_range("facet") ){
-+		BOOST_FOREACH(const config &cfg_element, this->cfg_.child_range("facet") ){
- 			add_facet(-1,cfg_element);
- 		}
- 
-@@ -291,7 +291,7 @@
-         {
- 		std::vector<aspect_ptr> facets_base;
- 		engine::parse_aspect_from_config(*this,cfg,this->get_id(),std::back_inserter(facets_base));
--		foreach (aspect_ptr a, facets_base ){
-+		BOOST_FOREACH(aspect_ptr a, facets_base ){
- 			typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a);
- 			facets.push_back(b);
- 		}
-@@ -301,7 +301,7 @@
- 	virtual void recalculate() const
- 	{
- 		///@todo 1.9 optimize in case of an aspect which returns variant
--		foreach (const typename aspect_type<T>::typesafe_ptr &f, make_pair(facets_.rbegin(),facets_.rend())) {
-+		BOOST_FOREACH(const typename aspect_type<T>::typesafe_ptr &f, make_pair(facets_.rbegin(),facets_.rend())) {
- 			if (f->active()) {
- 				this->value_ = boost::shared_ptr<T>(f->get_ptr());
- 				this->valid_ = true;
-@@ -316,7 +316,7 @@
- 	virtual config to_config() const
- 	{
- 		config cfg = aspect::to_config();
--		foreach (const typename aspect_type<T>::typesafe_ptr f, facets_) {
-+		BOOST_FOREACH(const typename aspect_type<T>::typesafe_ptr f, facets_) {
- 			cfg.add_child("facet",f->to_config());
- 		}
- 		if (default_) {
-@@ -334,7 +334,7 @@
- 		std::vector< aspect_ptr > facets;
- 		engine::parse_aspect_from_config(*this,cfg,this->get_id(),std::back_inserter(facets));
- 		int j=0;
--		foreach (aspect_ptr a, facets ){
-+		BOOST_FOREACH(aspect_ptr a, facets ){
- 			typename aspect_type<T>::typesafe_ptr b = boost::dynamic_pointer_cast< typesafe_aspect<T> > (a);
- 			facets_.insert(facets_.begin()+pos+j,b);
- 			j++;
-Index: src/ai/composite/property_handler.hpp
-===================================================================
---- src/ai/composite/property_handler.hpp	(revision 54624)
-+++ src/ai/composite/property_handler.hpp	(revision 54625)
-@@ -23,9 +23,9 @@
- #define AI_COMPOSITE_PROPERTY_HANDLER_HPP_INCLUDED
- 
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "ai/composite/component.hpp"
- 
- namespace ai{
-@@ -134,7 +134,7 @@
- 	std::vector<component*> handle_get_children()
- 	{
- 		std::vector<component*> children;
--		foreach (t_ptr v, values_) {
-+		BOOST_FOREACH(t_ptr v, values_) {
- 			children.push_back(&*v);
- 		}
- 		return children;
-@@ -149,7 +149,7 @@
- 		t_ptr_vector values;
- 		factory_(values,cfg);
- 		int j=0;
--		foreach (t_ptr b, values ){
-+		BOOST_FOREACH(t_ptr b, values ){
- 			values_.insert(values_.begin()+pos+j,b);
- 			j++;
- 		}
-@@ -200,7 +200,7 @@
- 		//* is a special case - 'delete all facets'
- 		if (child.id == "*") {
- 			bool b = false;
--				foreach(typename aspect_map::value_type a, aspects_) {
-+				BOOST_FOREACH(typename aspect_map::value_type a, aspects_) {
- 				       	b |= a.second->delete_all_facets();
- 				}
- 			return b;
-@@ -212,7 +212,7 @@
- 	std::vector<component*> handle_get_children()
- 	{
- 		std::vector<component*> children;
--		foreach(typename aspect_map::value_type a, aspects_) {
-+		BOOST_FOREACH(typename aspect_map::value_type a, aspects_) {
- 			children.push_back(&*a.second);
- 		}
- 		return children;
-Index: src/ai/composite/ai.cpp
-===================================================================
---- src/ai/composite/ai.cpp	(revision 54624)
-+++ src/ai/composite/ai.cpp	(revision 54625)
-@@ -27,11 +27,11 @@
- #include "stage.hpp"
- #include "../manager.hpp"
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- #include <boost/bind.hpp>
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -60,7 +60,7 @@
- 		cfg_["id"]<<"]"<<std::endl;
- 
- 	// init the composite ai stages
--	foreach(const config &cfg_element, cfg_.child_range("stage")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("stage")){
- 		add_stage(cfg_element);
- 	}
- 
-@@ -115,7 +115,7 @@
- 	std::vector< stage_ptr > stages;
- 	create_stage(stages,cfg);
- 	int j=0;
--	foreach (stage_ptr b, stages ){
-+	BOOST_FOREACH(stage_ptr b, stages ){
- 		stages_.push_back(b);
- 		j++;
- 	}
-@@ -128,7 +128,7 @@
- 	std::vector< goal_ptr > goals;
- 	create_goal(goals,cfg);
- 	int j=0;
--	foreach (goal_ptr b, goals ){
-+	BOOST_FOREACH(goal_ptr b, goals ){
- 		get_goals().push_back(b);
- 		j++;
- 	}
-@@ -137,7 +137,7 @@
- 
- 
- void ai_composite::play_turn(){
--	foreach(stage_ptr &s, stages_){
-+	BOOST_FOREACH(stage_ptr &s, stages_){
- 		s->play_stage();
- 	}
- }
-@@ -206,7 +206,7 @@
- 	config cfg;
- 
- 	//serialize the composite ai stages
--	foreach(const stage_ptr &s, stages_){
-+	BOOST_FOREACH(const stage_ptr &s, stages_){
- 		cfg.add_child("stage",s->to_config());
- 	}
- 
-Index: src/ai/formula/candidates.cpp
-===================================================================
---- src/ai/formula/candidates.cpp	(revision 54624)
-+++ src/ai/formula/candidates.cpp	(revision 54625)
-@@ -19,10 +19,11 @@
- 
- #include "ai.hpp"
- #include "candidates.hpp"
--#include "foreach.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define ERR_AI LOG_STREAM(err, log_formula_ai)
- 
-@@ -32,7 +33,7 @@
- void candidate_action_manager::load_config(const config& cfg, ai::formula_ai* ai, function_symbol_table* function_table)
- {
- 	// register candidate actions
--	foreach (const config &rc_action, cfg.child_range("register_candidate_action"))
-+	BOOST_FOREACH(const config &rc_action, cfg.child_range("register_candidate_action"))
- 	{
- 		candidate_action_ptr new_ca = load_candidate_action_from_config(rc_action,ai,function_table);
- 
-@@ -67,7 +68,7 @@
- {
- 	evaluated_candidate_actions_.clear();
- 
--	foreach(candidate_action_ptr cm, candidate_actions_)
-+	BOOST_FOREACH(candidate_action_ptr cm, candidate_actions_)
- 	{
- 		cm->evaluate(ai, units);
- 		evaluated_candidate_actions_.insert(cm);
-@@ -116,7 +117,7 @@
- 	const config & filter_params = cfg.child("filter");
- 
- 	if( filter_params ) {
--		foreach( const config::attribute filter_param, filter_params.attribute_range() )
-+		BOOST_FOREACH( const config::attribute filter_param, filter_params.attribute_range() )
- 		{
- 			game_logic::const_formula_ptr filter_formula(
- 					new game_logic::formula(filter_param.second, function_table));
-Index: src/ai/formula/stage_side_formulas.cpp
-===================================================================
---- src/ai/formula/stage_side_formulas.cpp	(revision 54624)
-+++ src/ai/formula/stage_side_formulas.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "stage_side_formulas.hpp"
- #include "ai.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../formula.hpp"
- #include "../../formula_function.hpp"
- #include "../../log.hpp"
-Index: src/ai/formula/ai.cpp
-===================================================================
---- src/ai/formula/ai.cpp	(revision 54624)
-+++ src/ai/formula/ai.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- 
- #include "../../callable_objects.hpp"
- #include "../../game_display.hpp"
--#include "../../foreach.hpp"
- #include "../../formula_debugger.hpp"
- #include "../../log.hpp"
- #include "../../menu_events.hpp"
-@@ -42,6 +41,8 @@
- #include "../../tod_manager.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define DBG_AI LOG_STREAM(debug, log_formula_ai)
- #define LOG_AI LOG_STREAM(info, log_formula_ai)
-@@ -548,7 +549,7 @@
- variant villages_from_set(const Container& villages,
- 				          const std::set<map_location>* exclude=NULL) {
- 	std::vector<variant> vars;
--	foreach(const map_location& loc, villages) {
-+	BOOST_FOREACH(const map_location& loc, villages) {
- 		if(exclude && exclude->count(loc)) {
- 			continue;
- 		}
-@@ -617,7 +618,7 @@
- 	{
- 		const std::vector<std::string> &rp = get_recruitment_pattern();
- 		std::vector<variant> vars;
--		foreach (const std::string &i, rp) {
-+		BOOST_FOREACH(const std::string &i, rp) {
- 			vars.push_back(variant(i));
- 		}
- 		return variant(&vars);
-@@ -751,7 +752,7 @@
- 			std::vector<variant> v;
- 			tmp.push_back( v );
- 		}
--		foreach (const unit &u, units) {
-+		BOOST_FOREACH(const unit &u, units) {
- 			tmp[u.side() - 1].push_back(variant(new unit_callable(u)));
- 		}
- 		for( size_t i = 0; i<tmp.size(); ++i)
-@@ -924,7 +925,7 @@
- 	//make sure we don't run out of refcount
- 	vars_.add_ref();
- 
--	foreach (const config &func, cfg_.child_range("function"))
-+	BOOST_FOREACH(const config &func, cfg_.child_range("function"))
- 	{
- 		const t_string &name = func["name"];
- 		const t_string &inputs = func["inputs"];
-@@ -947,7 +948,7 @@
- 	if (const config &ai_vars = cfg_.child("vars"))
- 	{
- 		variant var;
--		foreach (const config::attribute &i, ai_vars.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, ai_vars.attribute_range()) {
- 			var.serialize_from_string(i.second);
- 			vars_.add(i.first, var);
- 		}
-Index: src/ai/formula/function_table.cpp
-===================================================================
---- src/ai/formula/function_table.cpp	(revision 54624)
-+++ src/ai/formula/function_table.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "../../attack_prediction.hpp"
- #include "../../filesystem.hpp"
--#include "../../foreach.hpp"
- #include "../../game_display.hpp"
- #include "../../log.hpp"
- #include "../../map_label.hpp"
-@@ -36,6 +35,7 @@
- #include "../../unit.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_formula_ai("ai/engine/fai");
- #define LOG_AI LOG_STREAM(info, log_formula_ai)
-@@ -355,7 +355,7 @@
- 				if( scores[current_side][i] > 98 )
- 					continue;
- 
--				foreach( int side , enemies) {
-+				BOOST_FOREACH( int side , enemies) {
- 					int diff = scores[current_side][i] - scores[side][i];
- 					if ( diff > enemy_tollerancy) {
- 						valid = false;
-@@ -365,7 +365,7 @@
- 				}
- 
- 				if( valid ) {
--					foreach( int side , allies) {
-+					BOOST_FOREACH( int side , allies) {
- 						if ( scores[current_side][i] - scores[side][i] > ally_tollerancy ) {
- 							valid = false;
- 							break;
-@@ -563,7 +563,7 @@
-                     visited_locs.erase(starting_loc);
- 
-                 std::vector<variant> res;
--                foreach( const map_location& ml, visited_locs) {
-+                BOOST_FOREACH( const map_location& ml, visited_locs) {
-                     res.push_back( variant(new location_callable( ml ) ) );
-                 }
- 
-@@ -841,7 +841,7 @@
- 		ai::attack_analysis* analysis = convert_variant<ai::attack_analysis>(attack);
- 		//unit_map units_with_moves(*resources::units);
- 		//typedef std::pair<map_location, map_location> mv;
--		//foreach (const mv &m, analysis->movements) {
-+		//BOOST_FOREACH(const mv &m, analysis->movements) {
- 		//	units_with_moves.move(m.first, m.second);
- 		//}
- 
-@@ -1629,7 +1629,7 @@
- 
- 		std::vector<attack_type> attacks = attacker.attacks();
- 
--		foreach(const attack_type &attack, attacks) {
-+		BOOST_FOREACH(const attack_type &attack, attacks) {
- 			const int dmg = round_damage(attack.damage(), defender.damage_from(attack), 100) * attack.num_attacks();
- 			if (attack.range() == "melee") {
- 				highest_melee_damage = std::max(highest_melee_damage, dmg);
-Index: src/ai/testing/ca_testing_move_to_targets.cpp
-===================================================================
---- src/ai/testing/ca_testing_move_to_targets.cpp	(revision 54624)
-+++ src/ai/testing/ca_testing_move_to_targets.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "../composite/ai.hpp"
- #include "../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-Index: src/ai/testing/ca_testing_recruitment.cpp
-===================================================================
---- src/ai/testing/ca_testing_recruitment.cpp	(revision 54624)
-+++ src/ai/testing/ca_testing_recruitment.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../composite/rca.hpp"
- #include "../composite/stage.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-@@ -33,6 +32,7 @@
- #include "../../wml_exception.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <numeric>
- #include <string>
-@@ -206,7 +206,7 @@
-       int get_current_qty(const std::string &name) const
-       {
-          int counter = 0;
--         foreach(unit &un, *resources::units){
-+         BOOST_FOREACH(unit &un, *resources::units){
-             if(un.side() == side() && un.type_id() == name) // @todo: is type_id good?
-             {
-                counter++;
-@@ -345,7 +345,7 @@
-    const int hitpoints_const = 100;
-    double score = 0;
-    double total_weight = 0;
--   foreach(const unit &enemy_unit, *resources::units)
-+   BOOST_FOREACH(const unit &enemy_unit, *resources::units)
-    {
-       if(enemy_unit.can_recruit() || !t.is_enemy(enemy_unit.side()))
-       {
-@@ -358,13 +358,13 @@
- 
-       score += compare_unit_types(info, *enemy_info) * weight;
-    }
--   foreach(fake_team &enemy_team, fake_teams)
-+   BOOST_FOREACH(fake_team &enemy_team, fake_teams)
-    {
-       if(!t.is_enemy(enemy_team.side()))
-       {
-          continue;
-       }
--      foreach(const potential_recruit &enemy_unit,  enemy_team.extra_units())
-+      BOOST_FOREACH(const potential_recruit &enemy_unit,  enemy_team.extra_units())
-       {
-          const unit_type *enemy_info = enemy_unit.type();
-          VALIDATE(enemy_info, "Unknown unit type : " + enemy_unit.id() + " while updating recruit quality.");
-@@ -386,7 +386,7 @@
- 
- /*static void update_recruit_qualities(fake_team &t, std::vector<fake_team> &fake_teams)
- {
--   foreach ( potential_recruit &recruit, t.recruit_list() )
-+   BOOST_FOREACH( potential_recruit &recruit, t.recruit_list() )
-    {
-       double score = get_unit_quality(*recruit.type(),t,fake_teams);
-       recruit.set_quality(score);
-@@ -425,11 +425,11 @@
- 	}
- 
-    std::map<std::string, int> current_units;
--   foreach (const potential_recruit &i, t.extra_units())
-+   BOOST_FOREACH(const potential_recruit &i, t.extra_units())
-    {
-       current_units[(i.id())]++;
-    }
--   foreach (const unit &i, *resources::units)
-+   BOOST_FOREACH(const unit &i, *resources::units)
-    {
- 	if (i.side()==t.side())
- 	{
-@@ -440,7 +440,7 @@
-    double max_quality = recruit_list[0].quality();
-    int max_cost = recruit_list[0].cost();
-    std::vector<const potential_recruit*> sorted = std::vector<const potential_recruit*>();
--   foreach(const potential_recruit &i, recruit_list)
-+   BOOST_FOREACH(const potential_recruit &i, recruit_list)
-    {
-       if(i.cost() > max_cost)
-       {
-@@ -457,7 +457,7 @@
-    potential_recruit_sorter sorter(max_cost, max_quality, quality_factor);
-    std::sort(sorted.begin(), sorted.end(), sorter);
-    int recruited = 0;
--   foreach(const potential_recruit *i, sorted)
-+   BOOST_FOREACH(const potential_recruit *i, sorted)
-    {
-       if(recruited < max_units_to_recruit)
-       {
-@@ -488,7 +488,7 @@
- static void ai_choose_recruits(fake_team &t, int max_units_to_recruit, double quality_factor, bool counter_recruit)
- {
- 	std::vector<potential_recruit> recruits = ai_choose_best_recruits(t, max_units_to_recruit, quality_factor, counter_recruit);
--   foreach(potential_recruit &i, recruits) {
-+   BOOST_FOREACH(potential_recruit &i, recruits) {
-       t.fake_recruit(i);
-    }
- 
-@@ -554,7 +554,7 @@
-    //DBG_AI << "start of get_recruit_qualities" << std::endl;
-    typedef std::map<const unit_type*, std::vector<double> > unit_map;
-    unit_map enemies;
--   foreach(unit &un, *resources::units){
-+   BOOST_FOREACH(unit &un, *resources::units){
- 	   if(t.is_enemy(un.side()) && !un.can_recruit()){
- 		   enemies[un.type()].push_back(
- 			  static_cast<double>(un.hitpoints())
-@@ -562,10 +562,10 @@
- 	   }
-    }
-    DBG_AI << "before extra_units of fake_teams: enemies.size() = " << enemies.size() << std::endl;
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
- 	   if (t.is_enemy(tmp_t.side())) {
--		   foreach(potential_recruit &rec, tmp_t.extra_units())
-+		   BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
- 		   {
- 			   enemies[rec.type()].push_back(1.0);
- 		   }
-@@ -573,10 +573,10 @@
-    }
-    DBG_AI << "after extra_units of fake_teams: enemies.size() = " << enemies.size() << std::endl;
- 
--   foreach(potential_recruit &rec, recruit_list) {
-+   BOOST_FOREACH(potential_recruit &rec, recruit_list) {
- 	   double score = 0;
- 	   double weighting = 0;
--	   foreach(unit_map::value_type &enemy, enemies) {
-+	   BOOST_FOREACH(unit_map::value_type &enemy, enemies) {
- 		   double hitpoints_sum = std::accumulate(enemy.second.begin(),enemy.second.end(),0);
- 		   score += compare_unit_types(*rec.type(), *enemy.first) * hitpoints_sum;
- 		   weighting += hitpoints_sum;
-@@ -621,14 +621,14 @@
- {
-    std::vector<defender_pair_type*> defenders;
-    std::vector<enemy_pair_type*> enemies;
--   foreach(unit &un, *resources::units)
-+   BOOST_FOREACH(unit &un, *resources::units)
-    {
-       if(t.is_enemy(un.side()))
-       {
- //         const unit_type &enemy_type = *un.type();
-          //enemy_pair_type *pair = new enemy_pair_type(new unit_data(un.id(), un.type()));
-          enemy_pair_type *pair = new enemy_pair_type(un.type());
--         foreach(unit &defender, *resources::units)
-+         BOOST_FOREACH(unit &defender, *resources::units)
-          {
-             if(!t.is_enemy(defender.side())){
-                //int score = compare_unit_types(*defender.type(), enemy_type);
-@@ -639,9 +639,9 @@
-                //}
-             }
-          }
--         foreach(fake_team &tmp_t, fake_teams){
-+         BOOST_FOREACH(fake_team &tmp_t, fake_teams){
-             if(!t.is_enemy(tmp_t.side())){
--               foreach(potential_recruit &rec, tmp_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-          //         int score = compare_unit_types(*rec.type(), enemy_type);
-          //         if(score >= 0){
-                      //pair->add_defender(new unit_data(rec.id(), rec.type()));
-@@ -657,7 +657,7 @@
-          //const unit_type &defender_type = *un.type();
-          //defender_pair_type *pair = new defender_pair_type(new unit_data(un.id(), un.type()));
-          defender_pair_type *pair = new defender_pair_type(un.type());
--         foreach(unit &enemy, *resources::units)
-+         BOOST_FOREACH(unit &enemy, *resources::units)
-          {
-             //int score = compare_unit_types(defender_type, *enemy.type());
-             //if(score >= 0)
-@@ -666,9 +666,9 @@
-             pair->add_enemy(enemy.type());
-             //}
-          }
--         foreach(fake_team &tmp_t, fake_teams){
-+         BOOST_FOREACH(fake_team &tmp_t, fake_teams){
-             if(t.is_enemy(tmp_t.side())){
--               foreach(potential_recruit &rec, tmp_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-                   //int score = compare_unit_types(defender_type, *rec.type());
-                   //if(score >= 0){
-                      //pair->add_enemy(new unit_data(rec.id(), rec.type()));
-@@ -680,14 +680,14 @@
-          defenders.push_back(pair);
-       }
-    }
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
--      foreach(potential_recruit &rec, tmp_t.extra_units()){
-+      BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units()){
-          if(t.is_enemy(tmp_t.side())){
-             //const unit_type &enemy_type = *rec.type();
-             //enemy_pair_type *pair = new enemy_pair_type(new unit_data(rec.id(), rec.type()));
-             enemy_pair_type *pair = new enemy_pair_type(rec.type());
--            foreach(unit &defender, *resources::units){
-+            BOOST_FOREACH(unit &defender, *resources::units){
-                if(t.is_enemy(defender.side())){
-                   continue;
-                }
-@@ -698,11 +698,11 @@
-                //}
-             }
-             //HIER
--            foreach(fake_team &sub_t, fake_teams){
-+            BOOST_FOREACH(fake_team &sub_t, fake_teams){
-                if(t.is_enemy(sub_t.side())){
-                   continue;
-                }
--               foreach(potential_recruit &sub_rec, sub_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &sub_rec, sub_t.extra_units()){
-                   //int score = compare_unit_types(*sub_rec.type(), enemy_type);
-                   //if(score >= 0){
-                      //pair->add_defender(new unit_data(sub_rec.id(), sub_rec.type()));
-@@ -715,7 +715,7 @@
-             //const unit_type &defender_type = *rec.type();
-             //defender_pair_type *pair = new defender_pair_type(new unit_data(rec.id(), rec.type()));
-             defender_pair_type *pair = new defender_pair_type(rec.type());
--            foreach(unit &enemy, *resources::units)
-+            BOOST_FOREACH(unit &enemy, *resources::units)
-             {
-                if(!t.is_enemy(enemy.side())){
-                   continue;
-@@ -726,11 +726,11 @@
-                pair->add_enemy(rec.type());
-             //   }
-             }
--            foreach(fake_team &sub_t, fake_teams){
-+            BOOST_FOREACH(fake_team &sub_t, fake_teams){
-                if(!t.is_enemy(sub_t.side())){
-                   continue;
-                }
--               foreach(potential_recruit &sub_rec, sub_t.extra_units()){
-+               BOOST_FOREACH(potential_recruit &sub_rec, sub_t.extra_units()){
-                //   int score = compare_unit_types(defender_type, *sub_rec.type());
-                //   if(score >= 0){
-                      //pair->add_enemy(new unit_data(sub_rec.id(), sub_rec.type()));
-@@ -744,17 +744,17 @@
-    }
-    double min_score = 0;
-    double max_score = 0;
--   foreach(enemy_pair_type *pair, enemies)
-+   BOOST_FOREACH(enemy_pair_type *pair, enemies)
-    {
- //      if(pair->defenders.size() == 0)
- //      {
- //         pair->score = -10000;
- //      }else{
--         //foreach(unit_data *defender, pair->defenders)
--         foreach(unit_type *defender, pair->defenders)
-+         //BOOST_FOREACH(unit_data *defender, pair->defenders)
-+         BOOST_FOREACH(unit_type *defender, pair->defenders)
-          {
-             unsigned int defender_enemies = 0;
--            foreach(defender_pair_type *defender_p, defenders)
-+            BOOST_FOREACH(defender_pair_type *defender_p, defenders)
-             {
-                //if(defender->id == defender_p->defender->id){
-                if(defender->type_name()() == defender_p->defender->type_name()){
-@@ -778,7 +778,7 @@
-    }
-    double score = 0;
-    score -= max_score - min_score;
--   foreach(enemy_pair_type *pair, enemies)
-+   BOOST_FOREACH(enemy_pair_type *pair, enemies)
-    {
-       score += pair->score;
-    }
-@@ -798,16 +798,16 @@
-    typedef std::map<const unit_type*, std::vector<double> > unit_map;
-    unit_map enemies;
-    unit_map defenders;
--   foreach(unit &un, *resources::units){
-+   BOOST_FOREACH(unit &un, *resources::units){
-       if(t.is_enemy(un.side())){
-          enemies[un.type()].push_back((double)un.hitpoints() / (double)un.max_hitpoints());
-       }else{
-          defenders[un.type()].push_back(un.hitpoints() / un.max_hitpoints());
-       }
-    }
--   foreach(fake_team &tmp_t, fake_teams)
-+   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
-    {
--      foreach(potential_recruit &rec, tmp_t.extra_units())
-+      BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
-       {
-          if(t.is_enemy(tmp_t.side())){
-             enemies[rec.type()].push_back(1.0);
-@@ -817,13 +817,13 @@
-       }
-    }
-    double result = 0;
--   foreach(unit_map::value_type &defender, defenders)
-+   BOOST_FOREACH(unit_map::value_type &defender, defenders)
-    {
-       double defenders_score = 0;
--      foreach(unit_map::value_type &enemy, enemies)
-+      BOOST_FOREACH(unit_map::value_type &enemy, enemies)
-       {
-          double hitpoints_sum = 0;
--         foreach(double i, enemy.second)
-+         BOOST_FOREACH(double i, enemy.second)
-          {
-             hitpoints_sum += i;
-          }
-@@ -831,7 +831,7 @@
- 
-       }
-       double hitpoints_sum = 0;
--      foreach(double i, defender.second)
-+      BOOST_FOREACH(double i, defender.second)
-       {
-          hitpoints_sum += i;
-       }
-@@ -842,7 +842,7 @@
-    return result;
- //   vector<defender_pair> defenders;
- //   vector<enemy_pair> enemies;
--//   //foreach(unit &un, *resources::units)
-+//   //BOOST_FOREACH(unit &un, *resources::units)
- //   //{
- //   //   if(t.is_enemy(un.side()))
- //   //   {
-@@ -851,14 +851,14 @@
- //   //      defenders.push_back(un.id());
- //   //   }
- //   //}
--//   foreach(unit &un, *resources::units)
-+//   BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
- //         const unit_type &enemy_type = un.type();
- //         enemy_pair pair;
- //         pair.enemy = new unit_data(un.id(), enemy_type);
--//         foreach(unit &defender, *resources::units)
-+//         BOOST_FOREACH(unit &defender, *resources::units)
- //         {
- //            int score = compare_unit_types(defender.type(), enemy_type);
- //            if(score >= 0)
-@@ -873,7 +873,7 @@
- //         const unit_type &defender_type = un.type();
- //         defender_pair pair;
- //         pair.defender = new unit_data(defender.id(), defender_type);
--//         foreach(unit &enemy, *resources::units)
-+//         BOOST_FOREACH(unit &enemy, *resources::units)
- //         {
- //            int score = compare_unit_types(defender_type, enemy.type());
- //            if(score >= 0)
-@@ -885,10 +885,10 @@
- //         enemies.push_back(pair);
- //      }
- //   }
--//   foreach(fake_team &tmp_t, fake_teams)
-+//   BOOST_FOREACH(fake_team &tmp_t, fake_teams)
- //   {
- //      if(t.is_enemy(tmp_t.side())){
--//         foreach(potential_recruit &rec, tmp_t.extra_units())
-+//         BOOST_FOREACH(potential_recruit &rec, tmp_t.extra_units())
- //         {
- //
- //         }
-@@ -898,7 +898,7 @@
- //
- //   }
- //   //std::vector<unit> no_defense_enemies;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.defenders.size() == 0)
- //      {
-@@ -906,11 +906,11 @@
- //
- //         pair.score = 0;
- //      }else{
--//         foreach(unit_data &defender, pair.defenders)
-+//         BOOST_FOREACH(unit_data &defender, pair.defenders)
- //         {
- //            //unit_type &defender = defender_data.type;
- //            unsigned int defender_enemies = 0;
--//            foreach(defender_pair &defender_p, defenders)
-+//            BOOST_FOREACH(defender_pair &defender_p, defenders)
- //            {
- //               if(defender.id == defender_p.defender.id){
- //                  defender_enemies = defender_p.enemies.size();
-@@ -924,7 +924,7 @@
- //   }
- //   //enemy_pair *worst_pair = &enemies[0];
- //   double total_score = 0;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      total_score += pair.score;
- //   }
-@@ -936,7 +936,7 @@
- //   //unit &worst_def_unit;
- //   vector<defender_pair> defenders;
- //   vector<enemy_pair> enemies;
--//   /*foreach(unit &un, *resources::units)
-+//   /*BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
-@@ -945,14 +945,14 @@
- //         defenders.push_back(un.id());
- //      }
- //   }*/
--//   foreach(unit &un, *resources::units)
-+//   BOOST_FOREACH(unit &un, *resources::units)
- //   {
- //      if(t.is_enemy(un.side()))
- //      {
- //         const unit_type &enemy_type = un.type();
- //         enemy_pair pair;
- //         pair.enemy = un;
--//         foreach(unit &defender, *resources::units)
-+//         BOOST_FOREACH(unit &defender, *resources::units)
- //         {
- //            int score = compare_unit_types(defender.type(), enemy_type);
- //            if(score >= 0)
-@@ -967,7 +967,7 @@
- //         const unit_type &defender_type = un.type();
- //         defender_pair pair;
- //         pair.defender = un;
--//         foreach(unit &enemy, *resources::units)
-+//         BOOST_FOREACH(unit &enemy, *resources::units)
- //         {
- //            int score = compare_unit_types(defender_type, enemy.type());
- //            if(score >= 0)
-@@ -980,7 +980,7 @@
- //      }
- //   }
- //   //std::vector<unit> no_defense_enemies;
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.defenders.size() == 0)
- //      {
-@@ -988,10 +988,10 @@
- //         return pair.enemy;
- //         //pair.score = 0;
- //      }else{
--//         foreach(unit &defender, pair.defenders)
-+//         BOOST_FOREACH(unit &defender, pair.defenders)
- //         {
- //            unsigned int defender_enemies = 0;
--//            foreach(defender_pair &defender_p, defenders)
-+//            BOOST_FOREACH(defender_pair &defender_p, defenders)
- //            {
- //               if(defender.id() == defender_p.defender.id()){
- //                  defender_enemies = defender_p.enemies.size();
-@@ -1004,7 +1004,7 @@
- //      }
- //   }
- //   enemy_pair *worst_pair = &enemies[0];
--//   foreach(enemy_pair &pair, enemies)
-+//   BOOST_FOREACH(enemy_pair &pair, enemies)
- //   {
- //      if(pair.score < worst_pair.score)
- //      {
-@@ -1039,16 +1039,16 @@
-    for(int recruited_amount = 0; recruited_amount < max_units_to_recruit; recruited_amount++)
-    {
- 
--      foreach(fake_team &t, fake_teams)
-+      BOOST_FOREACH(fake_team &t, fake_teams)
-       {
-          t.reset();
-       }
- 
-       std::vector<potential_recruit> ai_recruit_list = ai_t->recruit_list();
- 
--      foreach(potential_recruit &recruit_type, ai_recruit_list)
-+      BOOST_FOREACH(potential_recruit &recruit_type, ai_recruit_list)
-       {
--         foreach(fake_team &t, fake_teams)
-+         BOOST_FOREACH(fake_team &t, fake_teams)
-          {
-             t.reset();
-          }
-@@ -1063,7 +1063,7 @@
-          }
-          LOG_AI << "Pretend that we recruited: " << recruit_type.id() << std::endl;
-          ai_t->fake_recruit(recruit_type);
--         foreach(fake_team &t, fake_teams)
-+         BOOST_FOREACH(fake_team &t, fake_teams)
-          {
-             if(ai_t->side() == t.side())
-             {
-Index: src/ai/testing/ca_global_fallback.cpp
-===================================================================
---- src/ai/testing/ca_global_fallback.cpp	(revision 54624)
-+++ src/ai/testing/ca_global_fallback.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../actions.hpp"
- 
- #include "../../game_display.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../map_label.hpp"
-@@ -36,6 +35,7 @@
- #include "../../terrain_filter.hpp"
- #include "../../tod_manager.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -89,7 +89,7 @@
- 	LOG_AI << "start" << std::endl;
- 	const int ticks = SDL_GetTicks();
- 	double res_sum = 0;
--	foreach( unit &u, *resources::units)
-+	BOOST_FOREACH( unit &u, *resources::units)
- 	{
- 		if (u.side()!=get_side())
- 		{
-Index: src/ai/testing/stage_fallback.cpp
-===================================================================
---- src/ai/testing/stage_fallback.cpp	(revision 54624)
-+++ src/ai/testing/stage_fallback.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "../configuration.hpp"
- #include "../manager.hpp"
- #include "../composite/ai.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- namespace ai {
-Index: src/ai/testing/ca.cpp
-===================================================================
---- src/ai/testing/ca.cpp	(revision 54624)
-+++ src/ai/testing/ca.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "../composite/rca.hpp"
- #include "../composite/stage.hpp"
- #include "../../gamestatus.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../resources.hpp"
-@@ -33,6 +32,7 @@
- #include "../../wml_exception.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <numeric>
- 
-@@ -306,7 +306,7 @@
- 	bool found = false;
- 	// Find an available unit that can be recruited,
- 	// matches the desired usage type, and comes in under budget.
--	foreach (const std::string &name, current_team().recruits())
-+	BOOST_FOREACH(const std::string &name, current_team().recruits())
- 	{
- 		const unit_type *ut = unit_types.find(name);
- 		if (!ut) continue;
-@@ -686,7 +686,7 @@
- 	possible_moves.insert(std::pair<map_location,pathfind::paths>(leader->get_location(), leader_paths));
- 
- 	map_location loc;
--	foreach (const map_location &l, route.steps)
-+	BOOST_FOREACH(const map_location &l, route.steps)
- 	{
- 		if (leader_paths.destinations.contains(l) &&
- 		    power_projection(l, get_enemy_dstsrc()) < leader->hitpoints() * max_risk)
-@@ -779,7 +779,7 @@
- 		// The leader can't move to his keep, try to move to the closest location
- 		// to the keep where there are no enemies in range.
- 		int current_distance = distance_between(leader->get_location(), keep);
--		foreach (const pathfind::paths::step &dest, leader_paths.destinations)
-+		BOOST_FOREACH(const pathfind::paths::step &dest, leader_paths.destinations)
- 		{
- 			if (!units_.find(dest.curr).valid()){
- 				const int new_distance = distance_between(dest.curr,keep);
-@@ -1728,12 +1728,12 @@
- 	}*/
- 	//int leader_adj_count = 0;
- 	std::vector<map_location> leaders_adj_v;
--	foreach(unit_map::const_iterator leader, leaders){
-+	BOOST_FOREACH(unit_map::const_iterator leader, leaders){
- 		map_location tmp_leader_adj[6];
- 		get_adjacent_tiles(leader->get_location(), tmp_leader_adj);
--		foreach(map_location &loc, tmp_leader_adj){
-+		BOOST_FOREACH(map_location &loc, tmp_leader_adj){
- 			bool found = false;
--			foreach(map_location &new_loc, leaders_adj_v){
-+			BOOST_FOREACH(map_location &new_loc, leaders_adj_v){
- 				if(new_loc == loc){
- 					found = true;
- 					break;
-@@ -1974,7 +1974,7 @@
- 	}
- 	std::vector<unit_map::unit_iterator> ai_leaders = resources::units->find_leaders(get_side());
- 	bool allied_leaders_available = false;
--	foreach(team &tmp_team, *resources::teams){
-+	BOOST_FOREACH(team &tmp_team, *resources::teams){
- 		if(!current_team().is_enemy(tmp_team.side())){
- 			std::vector<unit_map::unit_iterator> allied_leaders = resources::units->find_leaders(get_side());
- 			if (!allied_leaders.empty()){
-@@ -2001,7 +2001,7 @@
- 	calculate_moves(*resources::units, possible_moves, friends_srcdst, friends_dstsrc, false, true);
- 
- 	//check for each ai leader if he should move away from his keep
--	foreach(unit_map::unit_iterator &ai_leader, ai_leaders){
-+	BOOST_FOREACH(unit_map::unit_iterator &ai_leader, ai_leaders){
- 		//only if leader is on a keep
- 		if (!resources::game_map->is_keep(ai_leader->get_location())) {
- 			continue;
-@@ -2059,7 +2059,7 @@
- 		}
- 		ai_leader->remove_movement_ai();
- 	}
--	foreach(unit_map::unit_iterator &leader, ai_leaders){
-+	BOOST_FOREACH(unit_map::unit_iterator &leader, ai_leaders){
- 		leader->remove_movement_ai();
- 	}
- 	//ERR_AI_TESTING_AI_DEFAULT << get_name() << ": evaluate - not yet implemented" << std::endl;
-Index: src/ai/testing/stage_rca.cpp
-===================================================================
---- src/ai/testing/stage_rca.cpp	(revision 54624)
-+++ src/ai/testing/stage_rca.cpp	(revision 54625)
-@@ -25,10 +25,10 @@
- #include "../composite/engine.hpp"
- #include "../composite/property_handler.hpp"
- #include "../gamestate_observer.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace ai {
- 
-@@ -49,7 +49,7 @@
- void candidate_action_evaluation_loop::on_create()
- {
- 	//init the candidate actions
--	foreach(const config &cfg_element, cfg_.child_range("candidate_action")){
-+	BOOST_FOREACH(const config &cfg_element, cfg_.child_range("candidate_action")){
- 		engine::parse_candidate_action_from_config(*this,cfg_element,back_inserter(candidate_actions_));
- 	}
- 
-@@ -69,7 +69,7 @@
- config candidate_action_evaluation_loop::to_config() const
- {
- 	config cfg = stage::to_config();
--	foreach(candidate_action_ptr ca, candidate_actions_){
-+	BOOST_FOREACH(candidate_action_ptr ca, candidate_actions_){
- 		cfg.add_child("candidate_action",ca->to_config());
- 	}
- 	return cfg;
-@@ -88,7 +88,7 @@
- {
- 	LOG_AI_TESTING_RCA_DEFAULT << "Starting candidate action evaluation loop for side "<< get_side() << std::endl;
- 
--	foreach(candidate_action_ptr ca, candidate_actions_){
-+	BOOST_FOREACH(candidate_action_ptr ca, candidate_actions_){
- 		ca->enable();
- 	}
- 
-@@ -103,7 +103,7 @@
- 		candidate_action_ptr best_ptr;
- 
- 		//Evaluation
--		foreach(candidate_action_ptr ca_ptr, candidate_actions_){
-+		BOOST_FOREACH(candidate_action_ptr ca_ptr, candidate_actions_){
- 			if (!ca_ptr->is_enabled()){
- 				DBG_AI_TESTING_RCA_DEFAULT << "Skipping disabled candidate action: "<< *ca_ptr << std::endl;
- 				continue;
-Index: src/ai/testing/aspect_attacks.cpp
-===================================================================
---- src/ai/testing/aspect_attacks.cpp	(revision 54624)
-+++ src/ai/testing/aspect_attacks.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- 
- #include "../manager.hpp"
- #include "../../actions.hpp"
--#include "../../foreach.hpp"
- #include "../../log.hpp"
- #include "../../map.hpp"
- #include "../../team.hpp"
-@@ -31,6 +30,8 @@
- #include "../../unit.hpp"
- #include "../../pathfind/pathfind.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace ai {
- 
- namespace testing_ai_default {
-@@ -468,7 +469,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-@@ -572,7 +573,7 @@
- 			// The 0.5 power avoids underestimating too much the damage of a wounded unit.
- 			int hp = int(sqrt(double(un.hitpoints()) / un.max_hitpoints()) * 1000);
- 			int most_damage = 0;
--			foreach (const attack_type &att, un.attacks())
-+			BOOST_FOREACH(const attack_type &att, un.attacks())
- 			{
- 				int damage = att.damage() * att.num_attacks() * (100 + tod_modifier);
- 				if (damage > most_damage) {
-Index: src/play_controller.cpp
-===================================================================
---- src/play_controller.cpp	(revision 54624)
-+++ src/play_controller.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- 
- #include "play_controller.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
- #include "halo.hpp"
-@@ -46,6 +45,8 @@
- #include "whiteboard/manager.hpp"
- #include "scripting/lua.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- #define DBG_NG LOG_STREAM(debug, log_engine)
-@@ -173,7 +174,7 @@
- 		place_sides_in_preferred_locations();
- 	}
- 
--	foreach (const config &t, level_.child_range("time_area")) {
-+	BOOST_FOREACH(const config &t, level_.child_range("time_area")) {
- 		tod_manager_.add_time_area(t);
- 	}
- 
-@@ -192,7 +193,7 @@
- 	std::vector<team_builder_ptr> team_builders;
- 
- 	int team_num = 0;
--	foreach (const config &side, level_.child_range("side"))
-+	BOOST_FOREACH(const config &side, level_.child_range("side"))
- 	{
- 		std::string save_id = get_unique_saveid(side, seen_save_ids);
- 		seen_save_ids.insert(save_id);
-@@ -212,7 +213,7 @@
- 		team_builders.push_back(tb_ptr);
- 	}
- 
--	foreach (team_builder_ptr tb_ptr, team_builders)
-+	BOOST_FOREACH(team_builder_ptr tb_ptr, team_builders)
- 	{
- 		gamestate_.build_team_stage_two(tb_ptr);
- 	}
-@@ -337,7 +338,7 @@
- 	int num_pos = map_.num_valid_starting_positions();
- 
- 	int side_num = 1;
--	foreach (const config &side, level_.child_range("side"))
-+	BOOST_FOREACH(const config &side, level_.child_range("side"))
- 	{
- 		for(int p = 1; p <= num_pos; ++p) {
- 			const map_location& pos = map_.starting_position(p);
-@@ -703,7 +704,7 @@
- 	}
- 
- 	// Write terrain_graphics data in snapshot, too
--	foreach (const config &tg, level_.child_range("terrain_graphics")) {
-+	BOOST_FOREACH(const config &tg, level_.child_range("terrain_graphics")) {
- 		cfg.add_child("terrain_graphics", tg);
- 	}
- 
-@@ -914,7 +915,7 @@
- 	switch(mode) {
- 	case gui::TEXTBOX_SEARCH:
- 	{
--		foreach (const unit &u, units_){
-+		BOOST_FOREACH(const unit &u, units_){
- 			const map_location& loc = u.get_location();
- 			if(!gui_->fogged(loc) &&
- 					!(teams_[gui_->viewing_team()].is_enemy(u.side()) && u.invisible(loc)))
-@@ -931,13 +932,13 @@
- 	}
- 	case gui::TEXTBOX_MESSAGE:
- 	{
--		foreach(const team& t, teams_) {
-+		BOOST_FOREACH(const team& t, teams_) {
- 			if(!t.is_empty())
- 				dictionary.insert(t.current_player());
- 		}
- 
- 		// Add observers
--		foreach(const std::string& o, gui_->observers()){
-+		BOOST_FOREACH(const std::string& o, gui_->observers()){
- 			dictionary.insert(o);
- 		}
- 		//Exclude own nick from tab-completion.
-@@ -1341,7 +1342,7 @@
- 
- 	if (non_interactive()) {
- 		std::cout << "winner: ";
--		foreach (unsigned l, seen_leaders) {
-+		BOOST_FOREACH(unsigned l, seen_leaders) {
- 			std::string ai = ai::manager::get_active_ai_identifier_for_side(l);
- 			if (ai.empty()) ai = "default ai";
- 			std::cout << l << " (using " << ai << ") ";
-Index: src/unit_abilities.cpp
-===================================================================
---- src/unit_abilities.cpp	(revision 54624)
-+++ src/unit_abilities.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
-  *  Manage unit-abilities, like heal, cure, and weapon_specials.
-  */
- 
--#include "foreach.hpp"
- #include "gamestatus.hpp"
- #include "log.hpp"
- #include "resources.hpp"
-@@ -27,6 +26,8 @@
- #include "team.hpp"
- #include "unit_abilities.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- 
-@@ -124,7 +125,7 @@
- {
- 	if (const config &abilities = cfg_.child("abilities"))
- 	{
--		foreach (const config &i, abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &i, abilities.child_range(ability)) {
- 			if (ability_active(ability, i, loc) &&
- 			    ability_affects_self(ability, i, loc))
- 				return true;
-@@ -141,7 +142,7 @@
- 		const config &adj_abilities = it->cfg_.child("abilities");
- 		if (!adj_abilities)
- 			continue;
--		foreach (const config &j, adj_abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &j, adj_abilities.child_range(ability)) {
- 			if (unit_abilities::affects_side(j, teams_manager::get_teams(), side(), it->side()) &&
- 			    it->ability_active(ability, j, adjacent[i]) &&
- 			    ability_affects_adjacent(ability,  j, i, loc))
-@@ -158,7 +159,7 @@
- 
- 	if (const config &abilities = cfg_.child("abilities"))
- 	{
--		foreach (const config &i, abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &i, abilities.child_range(ability)) {
- 			if (ability_active(ability, i, loc) &&
- 			    ability_affects_self(ability, i, loc))
- 				res.cfgs.push_back(std::pair<const config *, map_location>(&i, loc));
-@@ -175,7 +176,7 @@
- 		const config &adj_abilities = it->cfg_.child("abilities");
- 		if (!adj_abilities)
- 			continue;
--		foreach (const config &j, adj_abilities.child_range(ability)) {
-+		BOOST_FOREACH(const config &j, adj_abilities.child_range(ability)) {
- 			if (unit_abilities::affects_side(j, teams_manager::get_teams(), side(), it->side()) &&
- 			    it->ability_active(ability, j, adjacent[i]) &&
- 			    ability_affects_adjacent(ability, j, i, loc))
-@@ -193,7 +194,7 @@
- 
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
--	foreach (const config::any_child &ab, abilities.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) {
- 		std::string const &id = ab.cfg["id"];
- 		if (!id.empty())
- 			res.push_back(id);
-@@ -208,7 +209,7 @@
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
- 
--	foreach (const config::any_child &ab, abilities.all_children_range())
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range())
- 	{
- 		if (force_active || ability_active(ab.key, ab.cfg, loc_))
- 		{
-@@ -265,9 +266,9 @@
- 	get_adjacent_tiles(loc,adjacent);
- 	const unit_map& units = *resources::units;
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-@@ -282,9 +283,9 @@
- 		}
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent_location"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent_location"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index = map_location::parse_direction(j);
- 			if (index == map_location::NDIRECTIONS) {
-@@ -310,7 +311,7 @@
- 
- 	assert(dir >=0 && dir <= 5);
- 	static const std::string adjacent_names[6] = {"n","ne","se","s","sw","nw"};
--	foreach (const config &i, cfg.child_range("affect_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("affect_adjacent"))
- 	{
- 		std::vector<std::string> dirs = utils::split(i["adjacent"]);
- 		if(std::find(dirs.begin(),dirs.end(),adjacent_names[dir]) != dirs.end()) {
-@@ -366,7 +367,7 @@
- 	int flat = 0;
- 	int stack = 0;
- 	typedef std::pair<const config *, map_location> pt;
--	foreach (pt const &p, cfgs)
-+	BOOST_FOREACH(pt const &p, cfgs)
- 	{
- 		int value = (*p.first)[key].to_int(def);
- 		if ((*p.first)["cumulative"].to_bool()) {
-@@ -398,7 +399,7 @@
- 	int flat = 0;
- 	int stack = 0;
- 	typedef std::pair<const config *, map_location> pt;
--	foreach (pt const &p, cfgs)
-+	BOOST_FOREACH(pt const &p, cfgs)
- 	{
- 		int value = (*p.first)[key].to_int(def);
- 		if ((*p.first)["cumulative"].to_bool()) {
-@@ -448,7 +449,7 @@
- namespace {
- 	bool get_special_children(std::vector<const config*>& result, const config& parent,
- 	                           const std::string& id, bool just_peeking=false) {
--		foreach (const config::any_child &sp, parent.all_children_range())
-+		BOOST_FOREACH(const config::any_child &sp, parent.all_children_range())
- 		{
- 			if (sp.key == id || sp.cfg["id"] == id) {
- 				if(just_peeking) {
-@@ -495,7 +496,7 @@
- 	unit_ability_list res;
- 	if (const config &specials = cfg_.child("specials"))
- 	{
--		foreach (const config &i, specials.child_range(special)) {
-+		BOOST_FOREACH(const config &i, specials.child_range(special)) {
- 			if (special_active(i, true))
- 				res.cfgs.push_back(std::pair<const config *, map_location>
- 					(&i, attacker_ ? aloc_ : dloc_));
-@@ -504,7 +505,7 @@
- 	if (!other_attack_) return res;
- 	if (const config &specials = other_attack_->cfg_.child("specials"))
- 	{
--		foreach (const config &i, specials.child_range(special)) {
-+		BOOST_FOREACH(const config &i, specials.child_range(special)) {
- 			if (other_attack_->special_active(i, false))
- 				res.cfgs.push_back(std::pair<const config *, map_location>
- 					(&i, attacker_ ? dloc_ : aloc_));
-@@ -519,7 +520,7 @@
- 	const config &specials = cfg_.child("specials");
- 	if (!specials) return res;
- 
--	foreach (const config::any_child &sp, specials.all_children_range())
-+	BOOST_FOREACH(const config::any_child &sp, specials.all_children_range())
- 	{
- 		if (force || special_active(sp.cfg, true)) {
- 			const t_string &name = sp.cfg["name"];
-@@ -544,7 +545,7 @@
- 	const config &specials = cfg_.child("specials");
- 	if (!specials) return res;
- 
--	foreach (const config::any_child &sp, specials.all_children_range())
-+	BOOST_FOREACH(const config::any_child &sp, specials.all_children_range())
- 	{
- 		char const *s = force || special_active(sp.cfg, true) ?
- 			"name" : "name_inactive";
-@@ -679,9 +680,9 @@
- 		get_adjacent_tiles(dloc_,adjacent);
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-@@ -694,9 +695,9 @@
- 		}
- 	}
- 
--	foreach (const config &i, cfg.child_range("filter_adjacent_location"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("filter_adjacent_location"))
- 	{
--		foreach (const std::string &j, utils::split(i["adjacent"]))
-+		BOOST_FOREACH(const std::string &j, utils::split(i["adjacent"]))
- 		{
- 			map_location::DIRECTION index =
- 				map_location::parse_direction(j);
-Index: src/video.cpp
-===================================================================
---- src/video.cpp	(revision 54624)
-+++ src/video.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "global.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "image.hpp"
- #include "log.hpp"
- #include "preferences.hpp"
-@@ -29,6 +28,8 @@
- #include "sdl_utils.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <vector>
- #include <map>
- #include <algorithm>
-@@ -105,7 +106,7 @@
- {
- 	events.clear();
- 
--	foreach (SDL_Rect const &rect, update_rects) {
-+	BOOST_FOREACH(SDL_Rect const &rect, update_rects) {
- 		events.push_back(event(rect, true));
- 		events.push_back(event(rect, false));
- 	}
-@@ -354,7 +355,7 @@
- int CVideo::bppForMode( int x, int y, int flags)
- {
- 	int test_values[3] = {getBpp(), 32, 16};
--	foreach(int &bpp, test_values) {
-+	BOOST_FOREACH(int &bpp, test_values) {
- 		if(modePossible(x, y, bpp, flags) > 0) {
- 			return bpp;
- 		}
-Index: src/tools/schema/tag.cpp
-===================================================================
---- src/tools/schema/tag.cpp	(revision 54624)
-+++ src/tools/schema/tag.cpp	(revision 54625)
-@@ -21,7 +21,9 @@
- #include "tools/schema/tag.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
-+
-+#include <boost/foreach.hpp>
-+
- namespace schema_validation{
- 
- /*WIKI
-@@ -81,15 +83,15 @@
- 		if (cfg.has_attribute("super")){
- 			super_ = cfg["super"].str();
- 		}
--		foreach (const config &child, cfg.child_range("tag")) {
-+		BOOST_FOREACH(const config &child, cfg.child_range("tag")) {
- 			class_tag child_tag (child);
- 			add_tag(child_tag);
- 		}
--		foreach (const config &child, cfg.child_range("key")) {
-+		BOOST_FOREACH(const config &child, cfg.child_range("key")) {
- 			class_key child_key (child);
- 			add_key(child_key);
- 		}
--		foreach (const config &link, cfg.child_range("link")) {
-+		BOOST_FOREACH(const config &link, cfg.child_range("link")) {
- 			std::string link_name = link["name"].str();
- 			add_link(link_name);
- 		}
-Index: src/tools/exploder_cutter.cpp
-===================================================================
---- src/tools/exploder_cutter.cpp	(revision 54624)
-+++ src/tools/exploder_cutter.cpp	(revision 54625)
-@@ -15,12 +15,13 @@
- 
- #include "exploder_cutter.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "serialization/parser.hpp"
- #include "serialization/preprocessor.hpp"
- #include "serialization/string_utils.hpp"
- #include "SDL_image.h"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iostream>
- 
- cutter::cutter()
-@@ -48,7 +49,7 @@
- 
- void cutter::load_masks(const config& conf)
- {
--	foreach (const config &m, conf.child_range("mask"))
-+	BOOST_FOREACH(const config &m, conf.child_range("mask"))
- 	{
- 		const std::string name = m["name"];
- 		const std::string image = get_mask_dir() + "/" + std::string(m["image"]);
-@@ -94,7 +95,7 @@
- {
- 	surface_map res;
- 
--	foreach (const config &part, conf.child_range("part")) {
-+	BOOST_FOREACH(const config &part, conf.child_range("part")) {
- 		add_sub_image(surf, res, &part);
- 	}
- 
-Index: src/builder.cpp
-===================================================================
---- src/builder.cpp	(revision 54624)
-+++ src/builder.cpp	(revision 54625)
-@@ -20,13 +20,14 @@
- 
- #include "builder.hpp"
- 
--#include "foreach.hpp"
- #include "loadscreen.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "serialization/string_utils.hpp"
- #include "image.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- #define WRN_NG LOG_STREAM(warn, log_engine)
-@@ -65,12 +66,12 @@
- 		sorted_images = true;
- 	}
- 
--	foreach(const rule_image_rand& ri, images){
-+	BOOST_FOREACH(const rule_image_rand& ri, images){
- 		bool is_background = ri->is_background();
- 
- 		imagelist& img_list = is_background ? images_background : images_foreground;
- 
--		foreach(const rule_image_variant& variant, ri->variants){
-+		BOOST_FOREACH(const rule_image_variant& variant, ri->variants){
- 			if(!variant.tods.empty() && variant.tods.find(tod) == variant.tods.end())
- 				continue;
- 
-@@ -250,12 +251,12 @@
- 
- 	tile& btile = tile_map_[loc];
- 
--	foreach(animated<image::locator>& a, btile.images_background) {
-+	BOOST_FOREACH(animated<image::locator>& a, btile.images_background) {
- 		if(a.need_update())
- 			changed = true;
- 		a.update_last_draw_time();
- 	}
--	foreach(animated<image::locator>& a, btile.images_foreground) {
-+	BOOST_FOREACH(animated<image::locator>& a, btile.images_foreground) {
- 		if(a.need_update())
- 			changed = true;
- 		a.update_last_draw_time();
-@@ -326,7 +327,7 @@
- 	}
- 	std::vector<std::string> vars = utils::split(variations, ';', 0);
- 
--	foreach(const std::string& v, vars){
-+	BOOST_FOREACH(const std::string& v, vars){
- 		res.push_back(base);
- 		std::string::size_type pos = 0;
- 		while ((pos = res.back().find("@V", pos)) != std::string::npos) {
-@@ -345,21 +346,21 @@
- 
- 	// Parse images and animations data
- 	// If one is not valid, return false.
--	foreach(terrain_constraint &constraint, rule.constraints)
-+	BOOST_FOREACH(terrain_constraint &constraint, rule.constraints)
- 	{
--		foreach(rule_image& ri, constraint.images)
-+		BOOST_FOREACH(rule_image& ri, constraint.images)
- 		{
--			foreach(rule_image_variant& variant, ri.variants)
-+			BOOST_FOREACH(rule_image_variant& variant, ri.variants)
- 			{
- 
- 				std::vector<std::string> var_strings = get_variations(variant.image_string, variant.variations);
--				foreach(const std::string& var, var_strings)
-+				BOOST_FOREACH(const std::string& var, var_strings)
- 				{
- 					/** @todo improve this, 99% of terrains are not animated. */
- 					std::vector<std::string> frames = utils::parenthetical_split(var,',');
- 					animated<image::locator> res;
- 
--					foreach(const std::string& frame, frames)
-+					BOOST_FOREACH(const std::string& frame, frames)
- 					{
- 						const std::vector<std::string> items = utils::split(frame, ':');
- 						const std::string& str = items.front();
-@@ -499,7 +500,7 @@
- void terrain_builder::replace_rotate_tokens(rule_image &image, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach(rule_image_variant& variant, image.variants) {
-+	BOOST_FOREACH(rule_image_variant& variant, image.variants) {
- 		replace_rotate_tokens(variant, angle, replacement);
- 	}
- }
-@@ -507,7 +508,7 @@
- void terrain_builder::replace_rotate_tokens(rule_imagelist &list, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach (rule_image &img, list) {
-+	BOOST_FOREACH(rule_image &img, list) {
- 		replace_rotate_tokens(img, angle, replacement);
- 	}
- }
-@@ -515,16 +516,16 @@
- void terrain_builder::replace_rotate_tokens(building_rule &rule, int angle,
- 	const std::vector<std::string> &replacement)
- {
--	foreach (terrain_constraint &cons, rule.constraints)
-+	BOOST_FOREACH(terrain_constraint &cons, rule.constraints)
- 	{
- 		// Transforms attributes
--		foreach (std::string &flag, cons.set_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.set_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
--		foreach (std::string &flag, cons.no_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.no_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
--		foreach (std::string &flag, cons.has_flag) {
-+		BOOST_FOREACH(std::string &flag, cons.has_flag) {
- 			replace_rotate_tokens(flag, angle, replacement);
- 		}
- 		replace_rotate_tokens(cons.images, angle, replacement);
-@@ -541,7 +542,7 @@
- 		return;
- 	}
- 
--	foreach (terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(terrain_constraint &cons, ret.constraints) {
- 		rotate(cons, angle);
- 	}
- 
-@@ -549,7 +550,7 @@
- 	int minx = INT_MAX;
- 	int miny = INT_MAX;
- 
--	foreach (const terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(const terrain_constraint &cons, ret.constraints) {
- 		minx = std::min<int>(cons.loc.x, minx);
- 		miny = std::min<int>(2 * cons.loc.y + (cons.loc.x & 1), miny);
- 	}
-@@ -559,7 +560,7 @@
- 	if(!(miny & 1) && (minx & 1) && (minx > 0))
- 		miny -= 2;
- 
--	foreach (terrain_constraint &cons, ret.constraints) {
-+	BOOST_FOREACH(terrain_constraint &cons, ret.constraints) {
- 		cons.loc.legacy_sum_assign(map_location(-minx, -((miny - 1) / 2)));
- 	}
- 
-@@ -581,7 +582,7 @@
- 
- void terrain_builder::add_images_from_config(rule_imagelist& images, const config &cfg, bool global, int dx, int dy)
- {
--	foreach (const config &img, cfg.child_range("image"))
-+	BOOST_FOREACH(const config &img, cfg.child_range("image"))
- 	{
- 		int layer = img["layer"];
- 
-@@ -606,7 +607,7 @@
- 		images.push_back(rule_image(layer, basex - dx, basey - dy, global, center_x, center_y));
- 
- 		// Adds the other variants of the image
--		foreach (const config &variant, img.child_range("variant"))
-+		BOOST_FOREACH(const config &variant, img.child_range("variant"))
- 		{
- 			const std::string &name = variant["name"];
- 			const std::string &variations = img["variations"];
-@@ -631,7 +632,7 @@
- 		const t_translation::t_match& type, const config& global_images)
- {
- 	terrain_constraint *cons = NULL;
--	foreach (terrain_constraint &c, constraints) {
-+	BOOST_FOREACH(terrain_constraint &c, constraints) {
- 		if (c.loc == loc) {
- 			cons = &c;
- 			break;
-@@ -769,7 +770,7 @@
- 	log_scope("terrain_builder::parse_config");
- 
- 	// Parses the list of building rules (BRs)
--	foreach (const config &br, cfg.child_range("terrain_graphics"))
-+	BOOST_FOREACH(const config &br, cfg.child_range("terrain_graphics"))
- 	{
- 		building_rule pbr; // Parsed Building rule
- 		pbr.local = local;
-@@ -788,7 +789,7 @@
- 		parse_mapstring(br["map"], pbr, anchors, br);
- 
- 		// Parses the terrain constraints (TCs)
--		foreach (const config &tc, br.child_range("tile"))
-+		BOOST_FOREACH(const config &tc, br.child_range("tile"))
- 		{
- 			// Adds the terrain constraint to the current built terrain's list
- 			// of terrain constraints, if it does not exist.
-@@ -831,7 +832,7 @@
- 		const std::vector<std::string> global_has_flag = utils::split(br["has_flag"]);
- 		const std::vector<std::string> global_set_no_flag = utils::split(br["set_no_flag"]);
- 
--		foreach (terrain_constraint &constraint, pbr.constraints)
-+		BOOST_FOREACH(terrain_constraint &constraint, pbr.constraints)
- 		{
- 			constraint.set_flag.insert(constraint.set_flag.end(),
- 				global_set_flag.begin(), global_set_flag.end());
-@@ -925,7 +926,7 @@
- 		}
- 	}
- 
--	foreach (const terrain_constraint &cons, rule.constraints)
-+	BOOST_FOREACH(const terrain_constraint &cons, rule.constraints)
- 	{
- 		// Translated location
- 		const map_location tloc = loc.legacy_sum(cons.loc);
-@@ -943,13 +944,13 @@
- 
- 		const std::set<std::string> &flags = tile_map_[tloc].flags;
- 
--		foreach (const std::string &s, cons.no_flag) {
-+		BOOST_FOREACH(const std::string &s, cons.no_flag) {
- 			// If a flag listed in "no_flag" is present, the rule does not match
- 			if (flags.find(s) != flags.end()) {
- 				return false;
- 			}
- 		}
--		foreach (const std::string &s, cons.has_flag) {
-+		BOOST_FOREACH(const std::string &s, cons.has_flag) {
- 			// If a flag listed in "has_flag" is not present, this rule does not match
- 			if (flags.find(s) == flags.end()) {
- 				return false;
-@@ -964,7 +965,7 @@
- {
- 	unsigned int rand_seed = get_noise(loc, rule.get_hash());
- 
--	foreach (const terrain_constraint &constraint, rule.constraints)
-+	BOOST_FOREACH(const terrain_constraint &constraint, rule.constraints)
- 	{
- 		const map_location tloc = loc.legacy_sum(constraint.loc);
- 		if(!tile_map_.on_map(tloc)) {
-@@ -973,12 +974,12 @@
- 
- 		tile& btile = tile_map_[tloc];
- 
--		foreach (const rule_image &img, constraint.images) {
-+		BOOST_FOREACH(const rule_image &img, constraint.images) {
- 			btile.images.push_back(tile::rule_image_rand(&img, rand_seed));
- 		}
- 
- 		// Sets flags
--		foreach (const std::string &flag, constraint.set_flag) {
-+		BOOST_FOREACH(const std::string &flag, constraint.set_flag) {
- 			btile.flags.insert(flag);
- 		}
- 
-@@ -1001,9 +1002,9 @@
- 	if(hash_ != DUMMY_HASH)
- 		return hash_;
- 
--	foreach(const terrain_constraint &constraint, constraints) {
--		foreach(const rule_image& ri, constraint.images) {
--			foreach(const rule_image_variant& variant, ri.variants) {
-+	BOOST_FOREACH(const terrain_constraint &constraint, constraints) {
-+		BOOST_FOREACH(const rule_image& ri, constraint.images) {
-+			BOOST_FOREACH(const rule_image_variant& variant, ri.variants) {
- 				// we will often hash the same string, but that seems fast enough
- 				hash_ += hash_str(variant.image_string);
- 			}
-@@ -1031,7 +1032,7 @@
- 		}
- 	}
- 
--	foreach (const building_rule &rule, building_rules_)
-+	BOOST_FOREACH(const building_rule &rule, building_rules_)
- 	{
- 		// Find the constraint that contains the less terrain of all terrain rules.
- 		// We will keep a track of the matching terrains of this constraint
-@@ -1040,7 +1041,7 @@
- 		t_translation::t_list min_types;
- 		const terrain_constraint *min_constraint = NULL;
- 
--		foreach (const terrain_constraint &constraint, rule.constraints)
-+		BOOST_FOREACH(const terrain_constraint &constraint, rule.constraints)
- 		{
- 			const t_translation::t_match& match = constraint.terrain_types_match;
- 			t_translation::t_list matching_types;
-Index: src/game_config.cpp
-===================================================================
---- src/game_config.cpp	(revision 54624)
-+++ src/game_config.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- 
- #include "color_range.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
- #include "util.hpp"
-@@ -29,6 +28,8 @@
- #include "revision.hpp"
- #endif /* HAVE_REVISION */
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -259,7 +260,7 @@
- 		}
- 
- 		server_list.clear();
--		foreach (const config &server, v.child_range("server"))
-+		BOOST_FOREACH(const config &server, v.child_range("server"))
- 		{
- 			server_info sinf;
- 			sinf.name = server["name"].str();
-@@ -270,7 +271,7 @@
- 
- 	void add_color_info(const config &v)
- 	{
--		foreach (const config &teamC, v.child_range("color_range"))
-+		BOOST_FOREACH(const config &teamC, v.child_range("color_range"))
- 		{
- 			const config::attribute_value *a1 = teamC.get("id"),
- 				*a2 = teamC.get("rgb");
-@@ -304,9 +305,9 @@
- 			DBG_NG << str.str() << '\n';
- 		}
- 
--		foreach (const config &cp, v.child_range("color_palette"))
-+		BOOST_FOREACH(const config &cp, v.child_range("color_palette"))
- 		{
--			foreach (const config::attribute &rgb, cp.attribute_range())
-+			BOOST_FOREACH(const config::attribute &rgb, cp.attribute_range())
- 			{
- 				std::vector<Uint32> temp;
- 				if(!string2rgb(rgb.second, temp)) {
-Index: src/whiteboard/recall.cpp
-===================================================================
---- src/whiteboard/recall.cpp	(revision 54624)
-+++ src/whiteboard/recall.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- #include "utility.hpp"
- #include "visitor.hpp"
- 
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "menu_events.hpp"
- #include "play_controller.hpp"
-@@ -32,6 +31,8 @@
- #include "team.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -71,7 +72,7 @@
- {
- 	// Construct and validate temp_unit_
- 	size_t underlying_id = cfg["temp_unit_"];
--	foreach(unit const& recall_unit, resources::teams->at(team_index()).recall_list())
-+	BOOST_FOREACH(unit const& recall_unit, resources::teams->at(team_index()).recall_list())
- 	{
- 		if(recall_unit.underlying_id()==underlying_id)
- 		{
-Index: src/whiteboard/utility.cpp
-===================================================================
---- src/whiteboard/utility.cpp	(revision 54624)
-+++ src/whiteboard/utility.cpp	(revision 54625)
-@@ -22,7 +22,6 @@
- #include "manager.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "map.hpp"
- #include "play_controller.hpp"
-@@ -30,6 +29,8 @@
- #include "team.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb {
- 
- size_t viewer_team()
-@@ -60,7 +61,7 @@
- {
- 	assert(leader.can_recruit());
- 	assert(resources::game_map->is_keep(leader.get_location()));
--	foreach(unit const& unit, *resources::units)
-+	BOOST_FOREACH(unit const& unit, *resources::units)
- 	{
- 		if (unit.can_recruit() &&
- 				resources::game_map->is_keep(unit.get_location()) &&
-@@ -83,7 +84,7 @@
- 	if(!map.is_castle(hex))
- 		return NULL;
- 
--	foreach(unit& u, *resources::units)
-+	BOOST_FOREACH(unit& u, *resources::units)
- 		if(u.can_recruit()
- 				&& u.side() == static_cast<int>(team_index+1)
- 				&& can_recruit_on(map,u.get_location(),hex))
-@@ -124,7 +125,7 @@
- 
- 	int result = 0;
- 	gamemap const& map = *resources::game_map;
--	foreach(map_location const& loc, std::make_pair(path.begin()+1,path.end()))
-+	BOOST_FOREACH(map_location const& loc, std::make_pair(path.begin()+1,path.end()))
- 		result += u.movement_cost(map[loc]);
- 	return result;
- }
-@@ -149,7 +150,7 @@
- 
- bool has_actions()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 		if (!t.get_side_actions()->empty())
- 			return true;
- 
-Index: src/whiteboard/visitor.hpp
-===================================================================
---- src/whiteboard/visitor.hpp	(revision 54624)
-+++ src/whiteboard/visitor.hpp	(revision 54625)
-@@ -33,11 +33,11 @@
- #include "action.hpp"
- #include "side_actions.hpp"
- 
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- 
- #include <boost/noncopyable.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace wb
- {
-@@ -81,7 +81,7 @@
- 
- 		//Determine how many turns' worth of plans there are
- 		size_t max_turns = 0;
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 			max_turns = std::max(max_turns,t.get_side_actions()->num_turns());
- 
- 		size_t const current_team = resources::controller->current_side() - 1;
-Index: src/whiteboard/side_actions.cpp
-===================================================================
---- src/whiteboard/side_actions.cpp	(revision 54624)
-+++ src/whiteboard/side_actions.cpp	(revision 54625)
-@@ -31,12 +31,13 @@
- #include "validate_visitor.hpp"
- 
- #include "actions.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "map.hpp"
- #include "resources.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <set>
- #include <sstream>
- 
-@@ -48,13 +49,13 @@
- {
- 	s << "Content of side_actions:";
- 	int turn = 1;
--	foreach(action_queue const& turn_queue, side_actions.actions())
-+	BOOST_FOREACH(action_queue const& turn_queue, side_actions.actions())
- 	{
- 		s << "\n  Turn " << turn;
- 		++turn;
- 
- 		int count = 1;
--		foreach(action_ptr const& action, turn_queue)
-+		BOOST_FOREACH(action_ptr const& action, turn_queue)
- 		{
- 			s << "\n    (" << count << ") " << action;
- 			++count;
-@@ -114,7 +115,7 @@
- 					main_number = index;
- 				}
- 
--				foreach(weak_action_ptr action, highlighter->get_secondary_highlights())
-+				BOOST_FOREACH(weak_action_ptr action, highlighter->get_secondary_highlights())
- 				{
- 					if (action.lock() == *it)
- 					{
-@@ -199,7 +200,7 @@
- size_t side_actions::size() const
- {
- 	size_t result = 0;
--	foreach(action_queue const& queue, actions_)
-+	BOOST_FOREACH(action_queue const& queue, actions_)
- 		result += queue.size();
- 	return result;
- }
-@@ -234,7 +235,7 @@
- 		return;
- 	}
- 
--	foreach(action_ptr act, *this)
-+	BOOST_FOREACH(action_ptr act, *this)
- 		act->hide();
- }
- void side_actions::show()
-@@ -244,7 +245,7 @@
- 
- 	hidden_ = false;
- 
--	foreach(action_ptr act, *this)
-+	BOOST_FOREACH(action_ptr act, *this)
- 		act->show();
- }
- 
-@@ -507,7 +508,7 @@
- size_t side_actions::count_actions_of(unit const* unit)
- {
- 	size_t count = 0;
--	foreach(action_ptr action, *this)
-+	BOOST_FOREACH(action_ptr action, *this)
- 	{
- 		if (action->get_unit() == unit)
- 		{
-@@ -783,7 +784,7 @@
- 	else if(type=="refresh")
- 	{
- 		safe_clear();
--		foreach(net_cmd const& sub_cmd, cmd.child_range("net_cmd"))
-+		BOOST_FOREACH(net_cmd const& sub_cmd, cmd.child_range("net_cmd"))
- 			execute_net_cmd(sub_cmd);
- 	}
- 	else
-@@ -890,7 +891,7 @@
- 
- 	//find units who still have plans for turn 0 (i.e. were too lazy to finish their jobs)
- 	std::set<unit const*> lazy_units;
--	foreach(action_ptr const& act, iter_turn(0))
-+	BOOST_FOREACH(action_ptr const& act, iter_turn(0))
- 	{
- 		unit const* u = act->get_unit();
- 		if(u)
-@@ -913,7 +914,7 @@
- 	}
- 
- 	//push any remaining first-turn plans into the second turn
--	foreach(action_ptr act, actions_.front())
-+	BOOST_FOREACH(action_ptr act, actions_.front())
- 		actions_[1].push_front(act);
- 	actions_.front().clear();
- 
-Index: src/whiteboard/move.cpp
-===================================================================
---- src/whiteboard/move.cpp	(revision 54624)
-+++ src/whiteboard/move.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "arrow.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "mouse_events.hpp"
- #include "play_controller.hpp"
-@@ -37,6 +36,8 @@
- #include "unit_display.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb {
- 
- std::ostream& operator<<(std::ostream &s, move_ptr move)
-@@ -108,10 +109,10 @@
- 	if(!route_cfg)
- 		throw action::ctor_err("move: Invalid route_");
- 	route_->move_cost = route_cfg["move_cost"];
--	foreach(config const& loc_cfg, route_cfg.child_range("step")) {
-+	BOOST_FOREACH(config const& loc_cfg, route_cfg.child_range("step")) {
- 		route_->steps.push_back(map_location(loc_cfg["x"],loc_cfg["y"]));
- 	}
--	foreach(config const& mark_cfg, route_cfg.child_range("mark")) {
-+	BOOST_FOREACH(config const& mark_cfg, route_cfg.child_range("mark")) {
- 		route_->marks[map_location(mark_cfg["x"],mark_cfg["y"])]
- 				= pathfind::marked_route::mark(mark_cfg["turns"],mark_cfg["zoc"],mark_cfg["capture"],mark_cfg["invisible"]);
- 	}
-@@ -470,7 +471,7 @@
- 	//Serialize route_
- 	config route_cfg;
- 	route_cfg["move_cost"]=route_->move_cost;
--	foreach(map_location const& loc, route_->steps)
-+	BOOST_FOREACH(map_location const& loc, route_->steps)
- 	{
- 		config loc_cfg;
- 		loc_cfg["x"]=loc.x;
-@@ -478,7 +479,7 @@
- 		route_cfg.add_child("step",loc_cfg);
- 	}
- 	typedef std::pair<map_location,pathfind::marked_route::mark> pair_loc_mark;
--	foreach(pair_loc_mark const& item, route_->marks)
-+	BOOST_FOREACH(pair_loc_mark const& item, route_->marks)
- 	{
- 		config mark_cfg;
- 		mark_cfg["x"]=item.first.x;
-Index: src/whiteboard/validate_visitor.cpp
-===================================================================
---- src/whiteboard/validate_visitor.cpp	(revision 54624)
-+++ src/whiteboard/validate_visitor.cpp	(revision 54625)
-@@ -28,12 +28,13 @@
- #include "utility.hpp"
- 
- #include "arrow.hpp"
--#include "foreach.hpp"
- #include "pathfind/pathfind.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "team.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -60,7 +61,7 @@
- 	{
- 		int side_actions_size_before = viewer_actions_.size();
- 		LOG_WB << "Erasing " << actions_to_erase_.size() << " invalid actions.\n";
--		foreach(action_ptr action, actions_to_erase_)
-+		BOOST_FOREACH(action_ptr action, actions_to_erase_)
- 		{
- 			viewer_actions_.remove_action(viewer_actions_.get_position_of(action), false);
- 		}
-Index: src/whiteboard/manager.cpp
-===================================================================
---- src/whiteboard/manager.cpp	(revision 54624)
-+++ src/whiteboard/manager.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "actions.hpp"
- #include "arrow.hpp"
- #include "chat_events.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -47,6 +46,8 @@
- #include "unit_display.hpp"
- 
- #include <boost/lexical_cast.hpp>
-+#include <boost/foreach.hpp>
-+
- #include <sstream>
- 
- namespace wb {
-@@ -268,7 +269,7 @@
- 	}
- 
- 	//Look for planned recruits that depend on this leader
--	foreach(action_const_ptr action, *viewer_actions())
-+	BOOST_FOREACH(action_const_ptr action, *viewer_actions())
- 	{
- 		recruit_const_ptr recruit = boost::dynamic_pointer_cast<class recruit const>(action);
- 		recall_const_ptr recall = boost::dynamic_pointer_cast<class recall const>(action);
-@@ -332,7 +333,7 @@
- 
- static void hide_all_plans()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 		t.get_side_actions()->hide();
- }
- 
-@@ -344,7 +345,7 @@
- 		hide_all_plans();
- 	else //< normal circumstance
- 	{
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 		{
- 			//make sure only appropriate teams are hidden
- 			if(!t.is_network_human())
-@@ -498,7 +499,7 @@
- 	if (can_modify_game_state() && has_actions())
- 	{
- 		units_owning_moves_ = move_owners_finder().get_units_owning_moves();
--		foreach(size_t unit_id, units_owning_moves_)
-+		BOOST_FOREACH(size_t unit_id, units_owning_moves_)
- 		{
- 			unit_map::iterator unit_iter = resources::units->find(unit_id);
- 			assert(unit_iter.valid());
-@@ -509,7 +510,7 @@
- 
- void manager::post_draw()
- {
--	foreach(size_t unit_id, units_owning_moves_)
-+	BOOST_FOREACH(size_t unit_id, units_owning_moves_)
- 	{
- 		unit_map::iterator unit_iter = resources::units->find(unit_id);
- 		if (unit_iter.valid()) { 
-@@ -558,7 +559,7 @@
- 
- 		//Info about the action numbers to be displayed on screen.
- 		side_actions::numbers_t numbers;
--		foreach(team& t, *resources::teams)
-+		BOOST_FOREACH(team& t, *resources::teams)
- 		{
- 			side_actions& sa = *t.get_side_actions();
- 			if(!sa.hidden())
-@@ -571,7 +572,7 @@
- 
- void manager::on_mouseover_change(const map_location& hex)
- {
--	foreach(map_location const& hex, hidden_unit_hexes_)
-+	BOOST_FOREACH(map_location const& hex, hidden_unit_hexes_)
- 		resources::screen->remove_exclusive_draw(hex);
- 	hidden_unit_hexes_.clear();
- 
-@@ -636,7 +637,7 @@
- 		LOG_WB << "Received wb data (" << count << ").\n";
- 
- 		team& team_from = resources::teams->at(wb_cfg["side"]-1);
--		foreach(side_actions::net_cmd const& cmd, wb_cfg.child_range("net_cmd"))
-+		BOOST_FOREACH(side_actions::net_cmd const& cmd, wb_cfg.child_range("net_cmd"))
- 			team_from.get_side_actions()->execute_net_cmd(cmd);
- 	}
- }
-@@ -1138,7 +1139,7 @@
- 	options.push_back(_("HIDE ALL allies’ plans"));
- 
- 	//populate list of networked allies
--	foreach(team &t, *resources::teams)
-+	BOOST_FOREACH(team &t, *resources::teams)
- 	{
- 		//Exclude enemies, AIs, and local players
- 		if(t.is_enemy(v_side) || !t.is_network())
-@@ -1164,11 +1165,11 @@
- 	switch(selection)
- 	{
- 	case 0:
--		foreach(team* t, allies)
-+		BOOST_FOREACH(team* t, allies)
- 			team_plans_hidden_[t->side()-1]=false;
- 		break;
- 	case 1:
--		foreach(team* t, allies)
-+		BOOST_FOREACH(team* t, allies)
- 			team_plans_hidden_[t->side()-1]=true;
- 		break;
- 	default:
-Index: src/whiteboard/suppose_dead.cpp
-===================================================================
---- src/whiteboard/suppose_dead.cpp	(revision 54624)
-+++ src/whiteboard/suppose_dead.cpp	(revision 54625)
-@@ -26,7 +26,6 @@
- 
- #include "arrow.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "mouse_events.hpp"
-Index: src/whiteboard/mapbuilder.cpp
-===================================================================
---- src/whiteboard/mapbuilder.cpp	(revision 54624)
-+++ src/whiteboard/mapbuilder.cpp	(revision 54625)
-@@ -24,12 +24,13 @@
- #include "side_actions.hpp"
- #include "utility.hpp"
- 
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "unit.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -51,14 +52,14 @@
- 
- void mapbuilder::pre_build()
- {
--	foreach(team& t, *resources::teams)
-+	BOOST_FOREACH(team& t, *resources::teams)
- 	{
- 		//Reset spent gold to zero, it'll be recalculated during the map building
- 		t.get_side_actions()->reset_gold_spent();
- 	}
- 
- 	int current_side = resources::controller->current_side();
--	foreach(unit& u, *resources::units)
-+	BOOST_FOREACH(unit& u, *resources::units)
- 	{
- 		bool on_current_side = (u.side() == current_side);
- 
-Index: src/whiteboard/highlight_visitor.cpp
-===================================================================
---- src/whiteboard/highlight_visitor.cpp	(revision 54624)
-+++ src/whiteboard/highlight_visitor.cpp	(revision 54625)
-@@ -29,11 +29,12 @@
- #include "suppose_dead.hpp"
- 
- #include "arrow.hpp"
--#include "foreach.hpp"
- #include "play_controller.hpp"
- #include "resources.hpp"
- #include "unit_map.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace wb
- {
- 
-@@ -147,7 +148,7 @@
- 		{
- 			//Highlight secondary highlights
- 			mode_ = HIGHLIGHT_SECONDARY;
--			foreach(weak_action_ptr weak, secondary_highlights_)
-+			BOOST_FOREACH(weak_action_ptr weak, secondary_highlights_)
- 			{
- 				if (action_ptr action = weak.lock())
- 				{
-@@ -169,7 +170,7 @@
- 
- 	//unhighlight secondary highlights
- 	mode_ = UNHIGHLIGHT_SECONDARY;
--	foreach(weak_action_ptr weak, secondary_highlights_)
-+	BOOST_FOREACH(weak_action_ptr weak, secondary_highlights_)
- 	{
- 		if (action_ptr action = weak.lock())
- 		{
-@@ -178,7 +179,7 @@
- 	}
- 
- 	//unhide other units if needed
--	foreach(map_location hex, exclusive_display_hexes_)
-+	BOOST_FOREACH(map_location hex, exclusive_display_hexes_)
- 	{
- 		resources::screen->remove_exclusive_draw(hex);
- 	}
-Index: src/language.cpp
-===================================================================
---- src/language.cpp	(revision 54624)
-+++ src/language.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "global.hpp"
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "language.hpp"
- #include "log.hpp"
-@@ -27,6 +26,7 @@
- #include <stdexcept>
- #include <clocale>
- #include <boost/scoped_array.hpp>
-+#include <boost/foreach.hpp>
- 
- #ifdef _WIN32
- #include <windows.h>
-@@ -101,7 +101,7 @@
- 	known_languages.push_back(
- 		language_def("", t_string(N_("System default language"), "wesnoth"), "ltr", "", "A"));
- 
--	foreach (const config &lang, cfg.child_range("locale"))
-+	BOOST_FOREACH(const config &lang, cfg.child_range("locale"))
- 	{
- 		known_languages.push_back(
- 			language_def(lang["locale"], lang["name"], lang["dir"],
-@@ -226,9 +226,9 @@
- 		std::cerr << "No [language] block found\n";
- 		return false;
- 	}
--	foreach (const config &lang, languages_) {
-+	BOOST_FOREACH(const config &lang, languages_) {
- 		DBG_G << "[language]\n";
--		foreach (const config::attribute &j, lang.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &j, lang.attribute_range()) {
- 			DBG_G << j.first << "=\"" << j.second << "\"\n";
- 			strings_[j.first] = j.second;
- 		}
-@@ -283,7 +283,7 @@
- 
- void init_textdomains(const config& cfg)
- {
--	foreach (const config &t, cfg.child_range("textdomain"))
-+	BOOST_FOREACH(const config &t, cfg.child_range("textdomain"))
- 	{
- 		const std::string &name = t["name"];
- 		const std::string &path = t["path"];
-@@ -307,7 +307,7 @@
- bool init_strings(const config& cfg)
- {
- 	languages_.clear();
--	foreach(const config &l, cfg.child_range("language")) {
-+	BOOST_FOREACH(const config &l, cfg.child_range("language")) {
- 		languages_.push_back(l);
- 	}
- 	return load_strings(true);
-Index: src/multiplayer_lobby.cpp
-===================================================================
---- src/multiplayer_lobby.cpp	(revision 54624)
-+++ src/multiplayer_lobby.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "global.hpp"
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "lobby_preferences.hpp"
- #include "map_exception.hpp"
-@@ -34,6 +33,8 @@
- #include "wml_exception.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
- 
-@@ -424,7 +425,7 @@
- 
- 	games_.clear();
- 
--	foreach (const config &game, cfg.child("gamelist").child_range("game"))
-+	BOOST_FOREACH(const config &game, cfg.child("gamelist").child_range("game"))
- 	{
- 		bool verified = true;
- 		games_.push_back(game_item());
-@@ -502,7 +503,7 @@
- 				if (map_hashes_ && !games_.back().reloaded) {
- 					std::string hash = game["hash"];
- 					bool hash_found = false;
--					foreach (const config::attribute &i, map_hashes_.attribute_range()) {
-+					BOOST_FOREACH(const config::attribute &i, map_hashes_.attribute_range()) {
- 						if (i.first == game["mp_scenario"] && i.second == hash) {
- 							hash_found = true;
- 							break;
-@@ -639,7 +640,7 @@
- 
-     if(preferences::fi_friends_in_game()) {
-         bool found_friend = false;
--        foreach(const config &user, cfg.child_range("user")) {
-+        BOOST_FOREACH(const config &user, cfg.child_range("user")) {
-             if(preferences::is_friend(user["name"]) && user["game_id"] == i.id) {
-                 found_friend = true;
-                 break;
-@@ -650,7 +651,7 @@
- 
-     if(!preferences::fi_text().empty()) {
-         bool found_match = true;
--        foreach(const std::string& search_string, utils::split(preferences::fi_text(), ' ', utils::STRIP_SPACES)) {
-+        BOOST_FOREACH(const std::string& search_string, utils::split(preferences::fi_text(), ' ', utils::STRIP_SPACES)) {
-             if(std::search(i.map_info.begin(), i.map_info.end(), search_string.begin(), search_string.end(), chars_equal_insensitive) == i.map_info.end() &&
-                     std::search(i.name.begin(), i.name.end(), search_string.begin(), search_string.end(), chars_equal_insensitive) == i.name.end()) {
-                 found_match = false;
-Index: src/reports.cpp
-===================================================================
---- src/reports.cpp	(revision 54624)
-+++ src/reports.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- #include "editor/editor_controller.hpp"
- #include "editor/editor_palettes.hpp"
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -36,6 +35,7 @@
- #include "unit.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #include <cassert>
- #include <ctime>
-@@ -260,7 +260,7 @@
- 	if (!u) return report();
- 	config res;
- 	typedef std::pair<std::string, std::string> pair_string;
--	foreach(const pair_string &ps, u->amla_icons()) {
-+	BOOST_FOREACH(const pair_string &ps, u->amla_icons()) {
- 		add_image(res, ps.first, ps.second);
- 	}
- 	return res;
-@@ -395,7 +395,7 @@
- 
- 	bool att_def_diff = false;
- 	map_location displayed_unit_hex = resources::screen->displayed_unit_hex();
--	foreach (const utils::string_map::value_type &resist, u->get_base_resistances())
-+	BOOST_FOREACH(const utils::string_map::value_type &resist, u->get_base_resistances())
- 	{
- 		std::ostringstream line;
- 		line << gettext(resist.first.c_str()) << ": ";
-@@ -415,7 +415,7 @@
- 	if (att_def_diff)
- 		tooltip << _("(Att / Def)");
- 	tooltip << '\n';
--	foreach (const std::string &line, resistances_table) {
-+	BOOST_FOREACH(const std::string &line, resistances_table) {
- 		tooltip << line;
- 	}
- 	return text_report(str.str(), tooltip.str());
-@@ -458,7 +458,7 @@
- 	if (!u) return report();
- 	config res;
- 	typedef std::pair<std::string, std::string> pair_string;
--	foreach (const pair_string &ps, u->advancement_icons()) {
-+	BOOST_FOREACH(const pair_string &ps, u->advancement_icons()) {
- 		add_image(res, ps.first, ps.second);
- 	}
- 	return res;
-@@ -497,7 +497,7 @@
- 	bool revert = false;
- 	if (underlyings.size() != 1 || underlyings.front() != terrain)
- 	{
--		foreach (const t_translation::t_terrain &t, underlyings)
-+		BOOST_FOREACH(const t_translation::t_terrain &t, underlyings)
- 		{
- 			if (t == t_translation::MINUS) {
- 				revert = true;
-@@ -641,7 +641,7 @@
- 	std::set<std::string> seen_types;
- 	const team &unit_team = (*resources::teams)[u->side() - 1];
- 	const team &viewing_team = (*resources::teams)[resources::screen->viewing_team()];
--	foreach(const unit &enemy, *resources::units)
-+	BOOST_FOREACH(const unit &enemy, *resources::units)
- 	{
- 		if (!unit_team.is_enemy(enemy.side()))
- 			continue;
-@@ -662,7 +662,7 @@
- 	damage_multiplier += tod_bonus;
- 
- 	typedef std::pair<int, std::set<std::string> > resist_units;
--	foreach (const resist_units &resist, resistances) {
-+	BOOST_FOREACH(const resist_units &resist, resistances) {
- 		int damage = round_damage(base_damage, damage_multiplier * resist.first, damage_divisor);
- 		tooltip << "<b>" << damage << "</b>  "
- 			<< "<i>(" << utils::signed_percent(resist.first-100) << ")</i> : "
-@@ -755,7 +755,7 @@
- 		}
- 	}
- 
--	foreach(const battle_context& weapon, weapons) {
-+	BOOST_FOREACH(const battle_context& weapon, weapons) {
- 
- 		// Predict the battle outcome.
- 		combatant attacker_combatant(weapon.get_attacker_stats());
-@@ -869,7 +869,7 @@
- 	map_location displayed_unit_hex = resources::screen->displayed_unit_hex();
- 	config res;
- 
--	foreach (const attack_type &at, u->attacks())
-+	BOOST_FOREACH(const attack_type &at, u->attacks())
- 	{
- 		attack_info(at, res, u, displayed_unit_hex);
- 	}
-@@ -1023,7 +1023,7 @@
- 	str << td.villages << '/';
- 	if (viewing_team.uses_shroud()) {
- 		int unshrouded_villages = 0;
--		foreach (const map_location &loc, resources::game_map->villages()) {
-+		BOOST_FOREACH(const map_location &loc, resources::game_map->villages()) {
- 			if (!viewing_team.shrouded(loc))
- 				++unshrouded_villages;
- 		}
-@@ -1178,7 +1178,7 @@
- 
- 	std::ostringstream str;
- 	str << _("Observers:") << '\n';
--	foreach (const std::string &obs, observers) {
-+	BOOST_FOREACH(const std::string &obs, observers) {
- 		str << obs << '\n';
- 	}
- 	return image_report(game_config::images::observer, str.str());
-@@ -1250,7 +1250,7 @@
- 
- void reports::reset_generators()
- {
--	foreach (dynamic_report_generators::value_type &rg, dynamic_generators) {
-+	BOOST_FOREACH(dynamic_report_generators::value_type &rg, dynamic_generators) {
- 		delete rg.second;
- 	}
- 	dynamic_generators.clear();
-@@ -1283,10 +1283,10 @@
- const std::set<std::string> &reports::report_list()
- {
- 	if (!all_reports.empty()) return all_reports;
--	foreach (const static_report_generators::value_type &v, static_generators) {
-+	BOOST_FOREACH(const static_report_generators::value_type &v, static_generators) {
- 		all_reports.insert(v.first);
- 	}
--	foreach (const dynamic_report_generators::value_type &v, dynamic_generators) {
-+	BOOST_FOREACH(const dynamic_report_generators::value_type &v, dynamic_generators) {
- 		all_reports.insert(v.first);
- 	}
- 	return all_reports;
-Index: src/playmp_controller.cpp
-===================================================================
---- src/playmp_controller.cpp	(revision 54624)
-+++ src/playmp_controller.cpp	(revision 54625)
-@@ -17,7 +17,7 @@
- #include "playmp_controller.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
-+
- #include "game_end_exceptions.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -29,6 +29,8 @@
- #include "formula_string_utils.hpp"
- #include "whiteboard/manager.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -326,7 +328,7 @@
- 	// stay stuck in linger state when the *next* scenario is over.
- 	gamestate_.classification().completion = "running";
- 	// End all unit moves
--	foreach (unit &u, units_) {
-+	BOOST_FOREACH(unit &u, units_) {
- 		u.set_user_end_turn(true);
- 	}
- 	//current_team().set_countdown_time(0);
-Index: src/tests/gui/test_gui2.cpp
-===================================================================
---- src/tests/gui/test_gui2.cpp	(revision 54624)
-+++ src/tests/gui/test_gui2.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_debugger.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
-@@ -66,6 +65,7 @@
- #include "wml_exception.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <memory>
- 
-@@ -139,7 +139,7 @@
- 	template<class T>
- 	void test_resolutions(const tresolution_list& resolutions)
- 	{
--		foreach(const tresolution& resolution, resolutions) {
-+		BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 			video().make_test_fake(resolution.first, resolution.second);
- 
- 			boost::scoped_ptr<gui2::tdialog> dlg(twrapper<T>::create());
-@@ -178,7 +178,7 @@
- 	{
- 		bool interact = false;
- 		for(int i = 0; i < 2; ++i) {
--			foreach(const tresolution& resolution, resolutions) {
-+			BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 				video().make_test_fake(resolution.first, resolution.second);
- 
- 				boost::scoped_ptr<gui2::tpopup> dlg(twrapper<T>::create());
-@@ -225,7 +225,7 @@
- 	void test_tip_resolutions(const tresolution_list& resolutions
- 			, const std::string& id)
- 	{
--		foreach(const tresolution& resolution, resolutions) {
-+		BOOST_FOREACH(const tresolution& resolution, resolutions) {
- 			video().make_test_fake(resolution.first, resolution.second);
- 
- 			std::vector<std::string>& list =
-@@ -416,7 +416,7 @@
- 
- 	// Test size() instead of empty() to get the number of offenders
- 	BOOST_CHECK_EQUAL(list.size(), 0);
--	foreach(const std::string& id, list) {
-+	BOOST_FOREACH(const std::string& id, list) {
- 		std::cerr << "Window '" << id << "' registered but not tested.\n";
- 	}
- }
-@@ -638,7 +638,7 @@
- 		BOOST_REQUIRE_MESSAGE(result, "Failed to create a dialog.");
- 
- 		std::vector<map_generator*> map_generators;
--		foreach (const config &i, main_config.child_range("multiplayer")) {
-+		BOOST_FOREACH(const config &i, main_config.child_range("multiplayer")) {
- 			if(i["map_generation"] == "default") {
- 				const config &generator_cfg = i.child("generator");
- 				if (generator_cfg) {
-@@ -694,7 +694,7 @@
- 		BOOST_REQUIRE_MESSAGE(cfg, "No editor time-of-day defined");
- 
- 		std::vector<time_of_day> tods;
--		foreach (const config &i, cfg.child_range("time")) {
-+		BOOST_FOREACH(const config &i, cfg.child_range("time")) {
- 			tods.push_back(time_of_day(i));
- 		}
- 		return new gui2::teditor_settings(NULL, tods);
-Index: src/filesystem.cpp
-===================================================================
---- src/filesystem.cpp	(revision 54624)
-+++ src/filesystem.cpp	(revision 54625)
-@@ -56,7 +56,6 @@
- 
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "game_preferences.hpp"
- #include "log.hpp"
-@@ -65,6 +64,8 @@
- #include "serialization/string_utils.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_filesystem("filesystem");
- #define DBG_FS LOG_STREAM(debug, log_filesystem)
- #define LOG_FS LOG_STREAM(info, log_filesystem)
-@@ -1010,7 +1011,7 @@
- 	cleanup();
- 	init_binary_paths();
- 
--	foreach (const config &bp, cfg.child_range("binary_path"))
-+	BOOST_FOREACH(const config &bp, cfg.child_range("binary_path"))
- 	{
- 		std::string path = bp["path"].str();
- 		if (path.find("..") != std::string::npos) {
-@@ -1057,7 +1058,7 @@
- 
- 	init_binary_paths();
- 
--	foreach (const std::string &path, binary_paths)
-+	BOOST_FOREACH(const std::string &path, binary_paths)
- 	{
- 		res.push_back(get_user_data_dir() + "/" + path + type + "/");
- 
-@@ -1098,7 +1099,7 @@
- 		return std::string();
- 	}
- 
--	foreach (const std::string &path, get_binary_paths(type))
-+	BOOST_FOREACH(const std::string &path, get_binary_paths(type))
- 	{
- 		const std::string file = path + filename;
- 		DBG_FS << "  checking '" << path << "'\n";
-@@ -1126,7 +1127,7 @@
- 		return std::string();
- 	}
- 
--	foreach (const std::string &path, get_binary_paths(type))
-+	BOOST_FOREACH(const std::string &path, get_binary_paths(type))
- 	{
- 		const std::string file = path + filename;
- 		DBG_FS << "  checking '" << path << "'\n";
-@@ -1291,7 +1292,7 @@
- 	p4 << drive;
- #endif
- 
--	foreach (const std::string &s, components)
-+	BOOST_FOREACH(const std::string &s, components)
- 	{
- 		p4 << '/' << s;
- 	}
-Index: src/help.cpp
-===================================================================
---- src/help.cpp	(revision 54624)
-+++ src/help.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "about.hpp"
- #include "display.hpp"
- #include "exceptions.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -40,6 +39,8 @@
- #include "wml_separators.hpp"
- #include "serialization/parser.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <queue>
- 
- static lg::log_domain log_display("display");
-@@ -793,7 +794,7 @@
- 			// opening the help browser in the default manner.
- 			config hidden_toplevel;
- 			std::stringstream ss;
--			foreach (const config &section, help_config->child_range("section"))
-+			BOOST_FOREACH(const config &section, help_config->child_range("section"))
- 			{
- 				const std::string id = section["id"];
- 				if (find_section(toplevel, id) == NULL) {
-@@ -810,7 +811,7 @@
- 			}
- 			hidden_toplevel["sections"] = ss.str();
- 			ss.str("");
--			foreach (const config &topic, help_config->child_range("topic"))
-+			BOOST_FOREACH(const config &topic, help_config->child_range("topic"))
- 			{
- 				const std::string id = topic["id"];
- 				if (find_topic(toplevel, id) == NULL) {
-@@ -861,7 +862,7 @@
- 		}
- 	}
- 
--	foreach (const config &section, cfg.child_range("section"))
-+	BOOST_FOREACH(const config &section, cfg.child_range("section"))
- 	{
- 		const std::vector<std::string> sections_refd
- 			= utils::quoted_split(section["sections"]);
-@@ -885,7 +886,7 @@
- 		}
- 	}
- 
--	foreach (const config &section, cfg.child_range("section"))
-+	BOOST_FOREACH(const config &section, cfg.child_range("section"))
- 	{
- 		const std::vector<std::string> topics_refd
- 			= utils::quoted_split(section["topics"]);
-@@ -1103,7 +1104,7 @@
- 	std::map<t_string, std::string> special_description;
- 	std::map<t_string, std::set<std::string, string_less> > special_units;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		// Only show the weapon special if we find it on a unit that
-@@ -1171,7 +1172,7 @@
- 	// should have a full description, if so, add this units abilities
- 	// for display. We do not want to show abilities that the user has
- 	// not encountered yet.
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		if (description_type(type) == FULL_DESCRIPTION) {
-@@ -1244,7 +1245,7 @@
- 	const config& era = game_cfg->child("era");
- 	if (era) {
- 		std::vector<std::string> faction_links;
--		foreach (const config &f, era.child_range("multiplayer_side")) {
-+		BOOST_FOREACH(const config &f, era.child_range("multiplayer_side")) {
- 			const std::string& id = f["id"];
- 			if (id == "Random")
- 				continue;
-@@ -1260,7 +1261,7 @@
- 			text << "<header>text='" << _("Leaders:") << "'</header>" << "\n";
- 			const std::vector<std::string> leaders =
- 					make_unit_links_list( utils::split(f["leader"]), true );
--			foreach (const std::string &link, leaders) {
-+			BOOST_FOREACH(const std::string &link, leaders) {
- 				text << link << "\n";
- 			}
- 
-@@ -1269,7 +1270,7 @@
- 			text << "<header>text='" << _("Recruits:") << "'</header>" << "\n";
- 			const std::vector<std::string> recruits =
- 					make_unit_links_list( utils::split(f["recruit"]), true );
--			foreach (const std::string &link, recruits) {
-+			BOOST_FOREACH(const std::string &link, recruits) {
- 				text << link << "\n";
- 			}
- 
-@@ -1291,7 +1292,7 @@
- 		text << "<header>text='" << _("Factions:") << "'</header>" << "\n";
- 
- 		std::sort(faction_links.begin(), faction_links.end());
--		foreach (const std::string &link, faction_links) {
-+		BOOST_FOREACH(const std::string &link, faction_links) {
- 			text << link << "\n";
- 		}
- 
-@@ -1366,7 +1367,7 @@
- 				reverse ? type_.advances_from() : type_.advances_to();
- 			bool first = true;
- 
--			foreach (const std::string &adv, adv_units)
-+			BOOST_FOREACH(const std::string &adv, adv_units)
- 			{
- 				const unit_type *type = unit_types.find(adv);
- 				if (!type || type->hide_help()) continue;
-@@ -1676,7 +1677,7 @@
- std::vector<std::string> make_unit_links_list(const std::vector<std::string>& type_id_list, bool ordered)
- {
- 	std::vector<std::string> links_list;
--	foreach (const std::string &type_id, type_id_list) {
-+	BOOST_FOREACH(const std::string &type_id, type_id_list) {
- 		std::string unit_link = make_unit_link(type_id);
- 		if (!unit_link.empty())
- 			links_list.push_back(unit_link);
-@@ -1693,7 +1694,7 @@
- 	std::set<std::string, string_less> races;
- 	std::set<std::string, string_less> visible_races;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 		UNIT_DESCRIPTION_TYPE desc_type = description_type(type);
-@@ -1736,7 +1737,7 @@
- 	std::set<std::string, string_less> race_units;
- 	std::set<std::string, string_less> race_topics;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		const unit_type &type = i.second;
- 
-@@ -1768,7 +1769,7 @@
- 		race_name = r->plural_name();
- 		race_description = r->description();
- 		// if (description.empty()) description =  _("No description Available");
--		foreach (const config &additional_topic, r->additional_topics())
-+		BOOST_FOREACH(const config &additional_topic, r->additional_topics())
- 		  {
- 		    std::string id = additional_topic["id"];
- 		    std::string title = additional_topic["title"];
-Index: src/savegame.cpp
-===================================================================
---- src/savegame.cpp	(revision 54624)
-+++ src/savegame.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- #include "savegame.hpp"
- 
- #include "dialogs.hpp" //FIXME: get rid of this as soon as the two remaining dialogs are moved to gui2
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,8 @@
- #include "unit_id.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_SAVE LOG_STREAM(info, log_engine)
- #define ERR_SAVE LOG_STREAM(err, log_engine)
-@@ -913,7 +914,7 @@
- 	bool shrouded = false;
- 
- 	const config& snapshot = has_snapshot ? gamestate_.snapshot : gamestate_.starting_pos;
--	foreach (const config &side, snapshot.child_range("side"))
-+	BOOST_FOREACH(const config &side, snapshot.child_range("side"))
- 	{
- 		if (side["controller"] != "human") {
- 			continue;
-@@ -922,7 +923,7 @@
- 			shrouded = true;
- 		}
- 
--		foreach (const config &u, side.child_range("unit"))
-+		BOOST_FOREACH(const config &u, side.child_range("unit"))
- 		{
- 			if (u["canrecruit"].to_bool()) {
- 				leader = u["id"].str();
-@@ -960,7 +961,7 @@
- 	// if there is no scenario information in the starting pos, add the (persistent) sides from the snapshot
- 	// else do nothing, as persistence information was already added at the end of the previous scenario
- 	if (gamestate().starting_pos["id"].empty()) {
--		foreach(const config &snapshot_side, gamestate().snapshot.child_range("side")) {
-+		BOOST_FOREACH(const config &snapshot_side, gamestate().snapshot.child_range("side")) {
- 			//add all side tags (assuming they only contain carryover information)
- 			gamestate().starting_pos.add_child("side", snapshot_side);
- 		}
-Index: src/replay.cpp
-===================================================================
---- src/replay.cpp	(revision 54624)
-+++ src/replay.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "global.hpp"
- 
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
-@@ -41,6 +40,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_replay("replay");
- #define DBG_REPLAY LOG_STREAM(debug, log_replay)
-@@ -67,7 +67,7 @@
- 			   << nunits << " according to data source. " << units.size() << " locally\n";
- 
- 		std::set<map_location> locs;
--		foreach (const config &u, cfg.child_range("unit"))
-+		BOOST_FOREACH(const config &u, cfg.child_range("unit"))
- 		{
- 			const map_location loc(u, resources::state_of_game);
- 			locs.insert(loc);
-@@ -88,7 +88,7 @@
- 		errbuf.clear();
- 	}
- 
--	foreach (const config &un, cfg.child_range("unit"))
-+	BOOST_FOREACH(const config &un, cfg.child_range("unit"))
- 	{
- 		const map_location loc(un, resources::state_of_game);
- 		const unit_map::const_iterator u = units.find(loc);
-@@ -560,7 +560,7 @@
- 		const map_location &src = steps.front();
- 		const map_location &dst = steps.back();
- 
--		foreach (const async_cmd &ac, async_cmds)
-+		BOOST_FOREACH(const async_cmd &ac, async_cmds)
- 		{
- 			if (config &async_child = ac.cfg->child("rename")) {
- 				map_location aloc(async_child, resources::state_of_game);
-@@ -576,7 +576,7 @@
- 			// A unit is being un-recruited or un-recalled.
- 			// Remove unsynced commands that would act on that unit.
- 			map_location src(*chld, resources::state_of_game);
--			foreach (const async_cmd &ac, async_cmds)
-+			BOOST_FOREACH(const async_cmd &ac, async_cmds)
- 			{
- 				if (config &async_child = ac.cfg->child("rename"))
- 				{
-@@ -680,7 +680,7 @@
- 
- void replay::add_config(const config& cfg, MARK_SENT mark)
- {
--	foreach (const config &cmd, cfg.child_range("command"))
-+	BOOST_FOREACH(const config &cmd, cfg.child_range("command"))
- 	{
- 		config &cfg = cfg_.add_child("command", cmd);
- 		if (cfg.child("speak"))
-@@ -730,7 +730,7 @@
- 	if(! game_config::mp_debug) {
- 		return;
- 	}
--	foreach (const config &ch, cfg.child_range("checksum"))
-+	BOOST_FOREACH(const config &ch, cfg.child_range("checksum"))
- 	{
- 		map_location loc(ch, resources::state_of_game);
- 		unit_map::const_iterator u = resources::units->find(loc);
-@@ -1151,7 +1151,7 @@
- 		}
- 		else if (const config &child = cfg->child("fire_event"))
- 		{
--			foreach (const config &v, child.child_range("set_variable")) {
-+			BOOST_FOREACH(const config &v, child.child_range("set_variable")) {
- 				resources::state_of_game->set_variable(v["name"], v["value"]);
- 			}
- 			const std::string &event = child["raise"];
-Index: src/game_preferences_display.cpp
-===================================================================
---- src/game_preferences_display.cpp	(revision 54624)
-+++ src/game_preferences_display.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- #include "display.hpp"
- #include "filesystem.hpp"
- #include "filechooser.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/simple_item_selector.hpp"
-@@ -30,6 +29,7 @@
- #include "widgets/slider.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace preferences {
- 
-@@ -1071,7 +1071,7 @@
- void preferences_dialog::set_advanced_menu()
- {
- 	std::vector<std::string> advanced_items;
--	foreach (const config &adv, adv_preferences_cfg_)
-+	BOOST_FOREACH(const config &adv, adv_preferences_cfg_)
- 	{
- 		std::ostringstream str;
- 		std::string field = preferences::get(adv["field"]);
-@@ -1096,7 +1096,7 @@
- {
- 	adv_preferences_cfg_.clear();
- 
--	foreach(const config& adv, game_cfg_.child_range("advanced_preference")) {
-+	BOOST_FOREACH(const config& adv, game_cfg_.child_range("advanced_preference")) {
- 		adv_preferences_cfg_.push_back(adv);
- 	}
- 
-Index: src/image.cpp
-===================================================================
---- src/image.cpp	(revision 54624)
-+++ src/image.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "color_range.hpp"
- #include "config.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "image.hpp"
- #include "image_modifications.hpp"
-@@ -36,6 +35,7 @@
- #include "SDL_image.h"
- 
- #include <boost/functional/hash.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <list>
- #include <set>
-@@ -376,7 +376,7 @@
- 		std::string trackpath = get_binary_file_location("", "l10n-track");
- 		std::string contents = read_file(trackpath);
- 		std::vector<std::string> lines = utils::split(contents, '\n');
--		foreach (const std::string &line, lines) {
-+		BOOST_FOREACH(const std::string &line, lines) {
- 			size_t p1 = line.find(fsep);
- 			if (p1 == std::string::npos)
- 				continue;
-@@ -423,7 +423,7 @@
- 	// add en_US with lowest priority, since the message above will
- 	// not have it when translated.
- 	langs.push_back("en_US");
--	foreach (const std::string &lang, langs) {
-+	BOOST_FOREACH(const std::string &lang, langs) {
- 		std::string loc_file = dir + "l10n" + "/" + lang + "/" + loc_base;
- 		if (file_exists(loc_file) && localized_file_uptodate(loc_file)) {
- 			return loc_file;
-Index: src/team.cpp
-===================================================================
---- src/team.cpp	(revision 54624)
-+++ src/team.cpp	(revision 54625)
-@@ -21,13 +21,14 @@
- #include "team.hpp"
- 
- #include "ai/manager.hpp"
--#include "foreach.hpp"
- #include "game_events.hpp"
- #include "gamestatus.hpp"
- #include "resources.hpp"
- #include "game_preferences.hpp"
- #include "whiteboard/side_actions.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -318,7 +319,7 @@
- 	// Was it correct?
- 
- 	// Load in the villages the side controls at the start
--	foreach (const config &v, cfg.child_range("village"))
-+	BOOST_FOREACH(const config &v, cfg.child_range("village"))
- 	{
- 		map_location loc(v, resources::state_of_game);
- 		if (map.is_village(loc)) {
-@@ -397,7 +398,7 @@
- 		return info_.minimum_recruit_price;
- 	}else{
- 		int min = 20;
--		foreach(std::string recruit, info_.can_recruit){
-+		BOOST_FOREACH(std::string recruit, info_.can_recruit){
- 			const unit_type *ut = unit_types.find(recruit);
- 			if(!ut)
- 				continue;
-@@ -605,7 +606,7 @@
- 		return true;
- 	}
- 
--	foreach (const team &t, *teams) {
-+	BOOST_FOREACH(const team &t, *teams) {
- 		if (t.is_human())
- 			return false;
- 	}
-Index: src/config_cache.cpp
-===================================================================
---- src/config_cache.cpp	(revision 54624)
-+++ src/config_cache.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
- #include "game_display.hpp"
-@@ -29,6 +28,7 @@
- #include "serialization/parser.hpp"
- #include "version.hpp"
- 
-+#include <boost/foreach.hpp>
- #include <boost/algorithm/string/replace.hpp>
- 
- static lg::log_domain log_cache("cache");
-@@ -113,7 +113,7 @@
- 		config_writer writer(*stream, gzip, game_config::cache_compression_level);
- 
- 		// write all defines to stream
--		foreach (const preproc_map::value_type &define, defines_map) {
-+		BOOST_FOREACH(const preproc_map::value_type &define, defines_map) {
- 			define.second.write(writer, define.first);
- 		}
- 	}
-@@ -262,7 +262,7 @@
- 
- 		// use static preproc_define::read_pair(config) to make a object
- 		// and pass that object config_cache_transaction::insert_to_active method
--		foreach (const config::any_child &value, cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, cfg.all_children_range()) {
- 			config_cache_transaction::instance().insert_to_active(
- 				preproc_define::read_pair(value.cfg));
- 		}
-@@ -271,7 +271,7 @@
- 	void config_cache::read_defines_queue()
- 	{
- 		const config_cache_transaction::filenames& files = config_cache_transaction::instance().get_define_files();
--		foreach (const std::string &path, files) {
-+		BOOST_FOREACH(const std::string &path, files) {
- 			read_defines_file(path);
- 		}
- 	}
-@@ -394,7 +394,7 @@
- 					std::insert_iterator<preproc_map>(temp,temp.begin()),
- 					&compare_define);
- 
--			foreach (const preproc_map::value_type &def, temp) {
-+			BOOST_FOREACH(const preproc_map::value_type &def, temp) {
- 				insert_to_active(def);
- 			}
- 
-Index: src/game_events.cpp
-===================================================================
---- src/game_events.cpp	(revision 54624)
-+++ src/game_events.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "actions.hpp"
- #include "ai/manager.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_events.hpp"
- #include "game_preferences.hpp"
-@@ -60,6 +59,8 @@
- #include <iomanip>
- #include <iostream>
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -341,7 +342,7 @@
- 			std::vector<std::pair<int,int> > counts = (*u).has_attribute("count")
- 				? utils::parse_ranges((*u)["count"]) : default_counts;
- 			int match_count = 0;
--			foreach (const unit &i, *resources::units)
-+			BOOST_FOREACH(const unit &i, *resources::units)
- 			{
- 				if(i.hitpoints() > 0 && unit_matches_filter(i, *u)) {
- 					++match_count;
-@@ -396,7 +397,7 @@
- 		const vconfig::child_list& variables = cond.get_children("variable");
- 		backwards_compat = backwards_compat && variables.empty();
- 
--		foreach (const vconfig &values, variables)
-+		BOOST_FOREACH(const vconfig &values, variables)
- 		{
- 			const std::string name = values["name"];
- 			config::attribute_value value = resources::state_of_game->get_variable_const(name);
-@@ -589,7 +590,7 @@
- 			const std::vector<game_events::event_handler>& handlers,
- 			const std::string& msg) {
- 
--			foreach(const game_events::event_handler& h, handlers){
-+			BOOST_FOREACH(const game_events::event_handler& h, handlers){
- 				const config& cfg = h.get_config();
- 				ss << "name=" << cfg["name"] << ", with id=" << cfg["id"] << "; ";
- 			}
-@@ -603,7 +604,7 @@
- 			std::stringstream ss;
- 			log_handler(ss, active_, "active");
- 			log_handler(ss, insert_buffer_, "insert buffered");
--			foreach(const std::string& h, remove_buffer_){
-+			BOOST_FOREACH(const std::string& h, remove_buffer_){
- 				ss << "id=" << h << "; ";
- 			}
- 			DBG_EH << "remove buffered handlers are now " << ss.str() << "\n";
-@@ -631,7 +632,7 @@
- 				const config & cfg = new_handler.get_config();
- 				std::string id = cfg["id"];
- 				if(!id.empty()) {
--					foreach( game_events::event_handler const & eh, active_) {
-+					BOOST_FOREACH( game_events::event_handler const & eh, active_) {
- 						config const & temp_config( eh.get_config());
- 						if(id == temp_config["id"]) {
- 							DBG_EH << "ignoring event handler for name=" << cfg["name"] <<
-@@ -698,12 +699,12 @@
- 				return;
- 
- 			// Commit any event removals
--			foreach(std::string const & i ,  remove_buffer_ ){
-+			BOOST_FOREACH(std::string const & i ,  remove_buffer_ ){
- 				remove_event_handler( i ); }
- 			remove_buffer_.clear();
- 
- 			// Commit any spawned events-within-events
--			foreach( game_events::event_handler const & i ,  insert_buffer_ ){
-+			BOOST_FOREACH( game_events::event_handler const & i ,  insert_buffer_ ){
- 				add_event_handler( i ); }
- 			insert_buffer_.clear();
- 
-@@ -735,7 +736,7 @@
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
- 	size_t index;
- 
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		index = side_num - 1;
- 		team &t = (*resources::teams)[index];
-@@ -744,7 +745,7 @@
- 		filter.restrict_size(game_config::max_loop);
- 		filter.get_locations(locs, true);
- 
--		foreach (map_location const &loc, locs)
-+		BOOST_FOREACH(map_location const &loc, locs)
- 		{
- 			if (remove) {
- 				t.clear_shroud(loc);
-@@ -774,7 +775,7 @@
- 	const bool remove = utils::string_bool(cfg["remove"], false);
- 	if (remove) {
- 		const std::vector<std::string> ids = utils::split(cfg["id"]);
--		foreach(const std::string &id, ids) {
-+		BOOST_FOREACH(const std::string &id, ids) {
- 			resources::tunnels->remove(id);
- 		}
- 	} else if (cfg.get_children("source").empty() ||
-@@ -941,7 +942,7 @@
- WML_HANDLER_FUNCTION(modify_ai, /*event_info*/, cfg)
- {
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		ai::manager::modify_active_ai_for_side(side_num,cfg.get_parsed_config());
- 	}
-@@ -967,7 +968,7 @@
- 	std::vector<int> sides = game_events::get_sides_vector(cfg);
- 	size_t team_index;
- 
--	foreach (const int &side_num, sides)
-+	BOOST_FOREACH(const int &side_num, sides)
- 	{
- 		team_index = side_num - 1;
- 		LOG_NG << "modifying side: " << side_num << "\n";
-@@ -1212,7 +1213,7 @@
- 
- 	size_t longest_path = 0;
- 
--	foreach(const vconfig& config, unit_cfgs) {
-+	BOOST_FOREACH(const vconfig& config, unit_cfgs) {
- 		const std::vector<std::string> xvals = utils::split(config["x"]);
- 		const std::vector<std::string> yvals = utils::split(config["y"]);
- 		int skip_steps = config["skip_steps"];
-@@ -1461,7 +1462,7 @@
- 
- 		variable_info vi(array_name, true, variable_info::TYPE_ARRAY);
- 		bool first = true;
--		foreach (const config &cfg, vi.as_array())
-+		BOOST_FOREACH(const config &cfg, vi.as_array())
- 		{
- 			std::string current_string = cfg[key_name];
- 			if (remove_empty && current_string.empty()) continue;
-@@ -1589,7 +1590,7 @@
- 				dest.vars->merge_with(data);
- 			}
- 		} else if(mode == "insert" || dest.explicit_index) {
--			foreach (const config &child, data.child_range(dest.key))
-+			BOOST_FOREACH(const config &child, data.child_range(dest.key))
- 			{
- 				dest.vars->add_child_at(dest.key, child, dest.index++);
- 			}
-@@ -1619,7 +1620,7 @@
- 			item["type"] = *ti;
- 		}
- 		unit_map::iterator itor;
--		foreach (unit &u, *resources::units) {
-+		BOOST_FOREACH(unit &u, *resources::units) {
- 			if (game_events::unit_matches_filter(u, filter)) {
- 				u.set_role(cfg["role"]);
- 				found = true;
-@@ -1632,7 +1633,7 @@
- 		std::set<std::string> player_ids;
- 		std::vector<std::string> sides = utils::split(cfg["side"]);
- 		const bool has_any_sides = !sides.empty();
--		foreach(std::string const& side_str, sides) {
-+		BOOST_FOREACH(std::string const& side_str, sides) {
- 			size_t side_num = lexical_cast_default<size_t>(side_str,0);
- 			if(side_num > 0 && side_num <= resources::teams->size()) {
- 				player_ids.insert((resources::teams->begin() + (side_num - 1))->save_id());
-@@ -1699,7 +1700,7 @@
- 	game_map->set_terrain(loc, new_t);
- 	screen_needs_rebuild = true;
- 
--	foreach (const t_translation::t_terrain &ut, game_map->underlying_union_terrain(loc)) {
-+	BOOST_FOREACH(const t_translation::t_terrain &ut, game_map->underlying_union_terrain(loc)) {
- 		preferences::encountered_terrains().insert(ut);
- 	}
- }
-@@ -1820,7 +1821,7 @@
- 				const map_location cfg_loc = cfg_to_loc(cfg);
- 
- 				//TODO fendrin: comment this monster
--				foreach (unit_map::const_unit_iterator leader, leaders) {
-+				BOOST_FOREACH(unit_map::const_unit_iterator leader, leaders) {
- 					DBG_NG << "...considering " + leader->id() + " as the recalling leader...\n";
- 					map_location loc = cfg_loc;
- 					if ( (leader_filter.null() || leader->matches_filter(leader_filter, leader->get_location())) &&
-@@ -1879,7 +1880,7 @@
- 
- 	map_location loc;
- 	if(!filter.null()) {
--		foreach (const unit &u, *resources::units) {
-+		BOOST_FOREACH(const unit &u, *resources::units) {
- 			if (game_events::unit_matches_filter(u, filter)) {
- 				loc = u.get_location();
- 				break;
-@@ -1926,7 +1927,7 @@
- 		}
- 	}
- 
--	foreach (const vconfig &cmd, cfg.get_children(command_type)) {
-+	BOOST_FOREACH(const vconfig &cmd, cfg.get_children(command_type)) {
- 		handle_event_commands(event_info, cmd);
- 	}
- }
-@@ -2029,13 +2030,13 @@
- 	std::vector<unit *> dead_men_walking;
- 	// unit_map::iterator uit(resources::units->begin()), uend(resources::units->end());
- 	// for(;uit!=uend; ++uit){
--	foreach(unit & u, *resources::units){
-+	BOOST_FOREACH(unit & u, *resources::units){
- 		if(game_events::unit_matches_filter(u, cfg)){
- 			dead_men_walking.push_back(&u);
- 		}
- 	}
- 
--	foreach(unit * un, dead_men_walking) {
-+	BOOST_FOREACH(unit * un, dead_men_walking) {
- 		map_location loc(un->get_location());
- 		bool fire_event = false;
- 		game_events::entity_location death_loc(*un);
-@@ -2429,7 +2430,7 @@
- 
- 	if (clear_shroud_bool) {
- 		side_filter filter(cfg);
--		foreach(const int side, filter.get_teams()){
-+		BOOST_FOREACH(const int side, filter.get_teams()){
- 			clear_shroud(side);
- 		}
- 		screen.recalculate_minimap();
-@@ -2466,7 +2467,7 @@
- 	const vconfig healers_filter = cfg.child("filter_second");
- 	std::vector<unit*> healers;
- 	if (!healers_filter.null()) {
--		foreach (unit& u, *units) {
-+		BOOST_FOREACH(unit& u, *units) {
- 			if (game_events::unit_matches_filter(u, healers_filter) && u.has_ability_type("heals")) {
- 				healers.push_back(&u);
- 			}
-@@ -2835,7 +2836,7 @@
- 			return;
- 		}
- 
--		foreach (const vconfig &cmd, option_events[option_chosen]) {
-+		BOOST_FOREACH(const vconfig &cmd, option_events[option_chosen]) {
- 			handle_event_commands(event_info, cmd);
- 		}
- 	}
-@@ -2858,7 +2859,7 @@
- 	if(remove) {
- 		const std::vector<std::string> id_list =
- 			utils::split(ids, ',', utils::STRIP_SPACES | utils::REMOVE_EMPTY);
--		foreach(const std::string& id, id_list) {
-+		BOOST_FOREACH(const std::string& id, id_list) {
- 			resources::tod_manager->remove_time_area(id);
- 			LOG_NG << "event WML removed time_area '" << id << "'\n";
- 		}
-@@ -2997,7 +2998,7 @@
- 			if(is_empty_command) {
- 				mref->command.add_child("allow_undo");
- 			}
--			foreach(game_events::event_handler& hand, event_handlers) {
-+			BOOST_FOREACH(game_events::event_handler& hand, event_handlers) {
- 				if(hand.is_menu_item() && hand.matches_name(mref->name)) {
- 					LOG_NG << "changing command for " << mref->name << " to:\n" << *wcc.second;
- 					hand = game_events::event_handler(mref->command, true);
-@@ -3029,14 +3030,14 @@
- 	vconfig filters(handler.get_config());
- 
- 
--	foreach (const vconfig &condition, filters.get_children("filter_condition"))
-+	BOOST_FOREACH(const vconfig &condition, filters.get_children("filter_condition"))
- 	{
- 		if (!game_events::conditional_passed(condition)) {
- 			return false;
- 		}
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter"))
- 	{
- 		if (unit1 == units->end() || !game_events::unit_matches_filter(*unit1, f)) {
- 			return false;
-@@ -3046,7 +3047,7 @@
- 		}
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter_side"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter_side"))
- 	{
- 		side_filter ssf(f);
- 		const int current_side = resources::controller->current_side();
-@@ -3055,7 +3056,7 @@
- 
- 	vconfig::child_list special_filters = filters.get_children("filter_attack");
- 	bool special_matches = special_filters.empty();
--	foreach (const vconfig &f, special_filters)
-+	BOOST_FOREACH(const vconfig &f, special_filters)
- 	{
- 		if (unit1 != units->end() && game_events::matches_special_filter(ev.data.child("first"), f)) {
- 			special_matches = true;
-@@ -3068,7 +3069,7 @@
- 		return false;
- 	}
- 
--	foreach (const vconfig &f, filters.get_children("filter_second"))
-+	BOOST_FOREACH(const vconfig &f, filters.get_children("filter_second"))
- 	{
- 		if (unit2 == units->end() || !game_events::unit_matches_filter(*unit2, f)) {
- 			return false;
-@@ -3080,7 +3081,7 @@
- 
- 	special_filters = filters.get_children("filter_second_attack");
- 	special_matches = special_filters.empty();
--	foreach (const vconfig &f, special_filters)
-+	BOOST_FOREACH(const vconfig &f, special_filters)
- 	{
- 		if (unit2 != units->end() && game_events::matches_special_filter(ev.data.child("second"), f)) {
- 			special_matches = true;
-@@ -3275,17 +3276,17 @@
- 		: variable_manager()
- 	{
- 		assert(!manager_running);
--		foreach (const config &ev, cfg.child_range("event")) {
-+		BOOST_FOREACH(const config &ev, cfg.child_range("event")) {
- 			event_handlers.add_event_handler(game_events::event_handler(ev));
- 		}
--		foreach (const std::string &id, utils::split(cfg["unit_wml_ids"])) {
-+		BOOST_FOREACH(const std::string &id, utils::split(cfg["unit_wml_ids"])) {
- 			unit_wml_ids.insert(id);
- 		}
- 
- 		resources::lua_kernel = new LuaKernel(cfg);
- 		manager_running = true;
- 
--		foreach (static_wml_action_map::value_type &action, static_wml_actions) {
-+		BOOST_FOREACH(static_wml_action_map::value_type &action, static_wml_actions) {
- 			resources::lua_kernel->set_wml_action(action.first, action.second);
- 		}
- 
-@@ -3298,7 +3299,7 @@
- 		}
- 		int wmi_count = 0;
- 		typedef std::pair<std::string, wml_menu_item *> item;
--		foreach (const item &itor, resources::state_of_game->wml_menu_items) {
-+		BOOST_FOREACH(const item &itor, resources::state_of_game->wml_menu_items) {
- 			if (!itor.second->command.empty()) {
- 				event_handlers.add_event_handler(game_events::event_handler(itor.second->command, true));
- 			}
-@@ -3312,7 +3313,7 @@
- 	void write_events(config& cfg)
- 	{
- 		assert(manager_running);
--		foreach (const game_events::event_handler &eh, event_handlers) {
-+		BOOST_FOREACH(const game_events::event_handler &eh, event_handlers) {
- 			if (eh.disabled() || eh.is_menu_item()) continue;
- 			cfg.add_child("event", eh.get_config());
- 		}
-@@ -3385,7 +3386,7 @@
- 			if(std::find(unit_wml_ids.begin(),unit_wml_ids.end(),type) != unit_wml_ids.end()) return;
- 			unit_wml_ids.insert(type);
- 		}
--		foreach (const config &new_ev, cfgs) {
-+		BOOST_FOREACH(const config &new_ev, cfgs) {
- 			if(type.empty() && new_ev["id"].empty())
- 			{
- 				WRN_NG << "attempt to add an [event] with empty id=, ignoring \n";
-@@ -3427,7 +3428,7 @@
- 
- 		if(!lg::debug.dont_log("event_handler")) {
- 			std::stringstream ss;
--			foreach(const game_events::queued_event& ev, events_queue) {
-+			BOOST_FOREACH(const game_events::queued_event& ev, events_queue) {
- 				ss << "name=" << ev.name << "; ";
- 			}
- 			DBG_EH << "processing queued events: " << ss.str() << "\n";
-@@ -3454,7 +3455,7 @@
- 
- 			bool init_event_vars = true;
- 
--			foreach(game_events::event_handler& handler, event_handlers) {
-+			BOOST_FOREACH(game_events::event_handler& handler, event_handlers) {
- 				if(!handler.matches_name(event_name))
- 					continue;
- 				// Set the variables for the event
-Index: src/formula_tokenizer.cpp
-===================================================================
---- src/formula_tokenizer.cpp	(revision 54624)
-+++ src/formula_tokenizer.cpp	(revision 54625)
-@@ -13,7 +13,6 @@
- 
- #include <sstream>
- 
--#include "foreach.hpp"
- #include "formula_tokenizer.hpp"
- 
- namespace formula_tokenizer
-Index: src/playcampaign.cpp
-===================================================================
---- src/playcampaign.cpp	(revision 54624)
-+++ src/playcampaign.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/message.hpp"
- #include "gui/dialogs/transient_message.hpp"
-@@ -41,6 +40,8 @@
- #include "wml_exception.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #define LOG_G LOG_STREAM(info, lg::general)
- 
- static lg::log_domain log_engine("engine");
-@@ -260,7 +261,7 @@
- 	controller_map controllers;
- 
- 	if(io_type == IO_SERVER) {
--		foreach (config &side, const_cast<config *>(scenario)->child_range("side"))
-+		BOOST_FOREACH(config &side, const_cast<config *>(scenario)->child_range("side"))
- 		{
- 			if (side["current_player"] == preferences::login()) {
- 				side["controller"] = preferences::client_type();
-@@ -280,7 +281,7 @@
- 				scenario = &starting_pos;
- 			}
- 
--			foreach (config &side, starting_pos.child_range("side"))
-+			BOOST_FOREACH(config &side, starting_pos.child_range("side"))
- 			{
- 				if (side["current_player"] == preferences::login()) {
- 					side["controller"] = preferences::client_type();
-@@ -474,7 +475,7 @@
- 
- 			if(io_type == IO_SERVER && scenario != NULL) {
- 				// Tweaks sides to adapt controllers and descriptions.
--				foreach (config &side, starting_pos.child_range("side"))
-+				BOOST_FOREACH(config &side, starting_pos.child_range("side"))
- 				{
- 					std::string id = side["save_id"];
- 					if(id.empty()) {
-@@ -547,7 +548,7 @@
- 				next_cfg.add_child("replay_start", gamestate.starting_pos);
- 				//move side information from gamestate into the config that is sent to the other clients
- 				next_cfg.clear_children("side");
--				foreach (config& side, gamestate.starting_pos.child_range("side"))
-+				BOOST_FOREACH(config& side, gamestate.starting_pos.child_range("side"))
- 					next_cfg.add_child("side", side);
- 
- 				network::send_data(cfg, 0);
-Index: src/multiplayer.cpp
-===================================================================
---- src/multiplayer.cpp	(revision 54624)
-+++ src/multiplayer.cpp	(revision 54625)
-@@ -40,6 +40,7 @@
- #include "unit_id.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -573,7 +574,7 @@
- 	while (true) {
- 		const config &cfg = game_config.child("lobby_music");
- 		if (cfg) {
--			foreach (const config &i, cfg.child_range("music")) {
-+			BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 				sound::play_music_config(i);
- 			}
- 			sound::commit_music_changes();
-Index: src/terrain_filter.cpp
-===================================================================
---- src/terrain_filter.cpp	(revision 54624)
-+++ src/terrain_filter.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "actions.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "map.hpp"
- #include "resources.hpp"
-@@ -27,6 +26,8 @@
- #include "tod_manager.hpp"
- #include "variable.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
- 
-@@ -129,7 +130,7 @@
- 				}
- 			} else {
- 				bool found = false;
--				foreach (const config &cfg, vi.as_array()) {
-+				BOOST_FOREACH(const config &cfg, vi.as_array()) {
- 					if (map_location(cfg, NULL) == loc) {
- 						found = true;
- 						break;
-@@ -358,7 +359,7 @@
- 			}
- 		} else {
- 			std::set<map_location> findin_locs;
--			foreach (const config &cfg, vi.as_array()) {
-+			BOOST_FOREACH(const config &cfg, vi.as_array()) {
- 				map_location test_loc(cfg, NULL);
- 				if (xy_set.count(test_loc)) {
- 					findin_locs.insert(test_loc);
-Index: src/playturn.cpp
-===================================================================
---- src/playturn.cpp	(revision 54624)
-+++ src/playturn.cpp	(revision 54625)
-@@ -16,7 +16,6 @@
- #include "playturn.hpp"
- 
- #include "construct_dialog.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -31,6 +30,8 @@
- #include "formula_string_utils.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <ctime>
- 
- static lg::log_domain log_network("network");
-@@ -124,11 +125,11 @@
- 				preferences::message_bell());
- 	}
- 
--	foreach (const config &ob, cfg.child_range("observer")) {
-+	BOOST_FOREACH(const config &ob, cfg.child_range("observer")) {
- 		resources::screen->add_observer(ob["name"]);
- 	}
- 
--	foreach (const config &ob, cfg.child_range("observer_quit")) {
-+	BOOST_FOREACH(const config &ob, cfg.child_range("observer_quit")) {
- 		resources::screen->remove_observer(ob["name"]);
- 	}
- 
-@@ -147,7 +148,7 @@
- 	const config& change = cfg.child_or_empty("change_controller");
- 	const std::string& side_drop = cfg["side_drop"].str();
- 
--	foreach (const config &t, turns)
-+	BOOST_FOREACH(const config &t, turns)
- 	{
- 		handle_turn(turn_end, t, skip_replay, backlog);
- 	}
-@@ -240,7 +241,7 @@
- 			options.push_back(_("Abort game"));
- 
- 			//get all observers in as options to transfer control
--			foreach (const std::string &ob, resources::screen->observers())
-+			BOOST_FOREACH(const std::string &ob, resources::screen->observers())
- 			{
- 				t_vars["player"] = ob;
- 				options.push_back(vgettext("Replace with $player", t_vars));
-@@ -248,7 +249,7 @@
- 			}
- 
- 			//get all allies in as options to transfer control
--			foreach (team &t, *resources::teams)
-+			BOOST_FOREACH(team &t, *resources::teams)
- 			{
- 				if (!t.is_enemy(side) && !t.is_human() && !t.is_ai() && !t.is_empty()
- 					&& t.current_player() != tm.current_player())
-Index: src/tod_manager.cpp
-===================================================================
---- src/tod_manager.cpp	(revision 54624)
-+++ src/tod_manager.cpp	(revision 54625)
-@@ -12,7 +12,6 @@
-    See the COPYING file for more details.
-  */
- 
--#include "foreach.hpp"
- #include "tod_manager.hpp"
- #include "wml_exception.hpp"
- #include "gettext.hpp"
-@@ -25,6 +24,8 @@
- #include "unit.hpp"
- #include "unit_abilities.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
- 
-@@ -279,7 +280,7 @@
- void tod_manager::set_new_current_times(const int new_current_turn_number)
- {
- 	currentTime_ = calculate_current_time(times_.size(), new_current_turn_number, currentTime_);
--	foreach(area_time_of_day& area, areas_) {
-+	BOOST_FOREACH(area_time_of_day& area, areas_) {
- 		area.currentTime = calculate_current_time(
- 			area.times.size(),
- 			new_current_turn_number,
-Index: src/multiplayer_create.cpp
-===================================================================
---- src/multiplayer_create.cpp	(revision 54624)
-+++ src/multiplayer_create.cpp	(revision 54625)
-@@ -20,7 +20,6 @@
- 
- #include "global.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -40,6 +39,8 @@
- #include "wml_separators.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
- 
-@@ -127,7 +128,7 @@
- 
- 	// Standard maps
- 	i = 0;
--	foreach (const config &j, cfg.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &j, cfg.child_range("multiplayer"))
- 	{
- 		if (j["allow_new_game"].to_bool(true))
- 		{
-@@ -217,7 +218,7 @@
- 
- 	// The possible eras to play
- 	std::vector<std::string> eras;
--	foreach (const config &er, cfg.child_range("era")) {
-+	BOOST_FOREACH(const config &er, cfg.child_range("era")) {
- 		eras.push_back(er["name"]);
- 	}
- 	if(eras.empty()) {
-@@ -547,7 +548,7 @@
- 		}
- 
- 		int nsides = 0;
--		foreach (const config &k, parameters_.scenario_data.child_range("side")) {
-+		BOOST_FOREACH(const config &k, parameters_.scenario_data.child_range("side")) {
- 			if (k["allow_player"].to_bool(true)) ++nsides;
- 		}
- 
-Index: src/commandline_options.cpp
-===================================================================
---- src/commandline_options.cpp	(revision 54624)
-+++ src/commandline_options.cpp	(revision 54625)
-@@ -14,12 +14,12 @@
- */
- 
- #include "commandline_options.hpp"
--#include "foreach.hpp"
- #include "serialization/string_utils.hpp"
- #include "util.hpp"
- #include "lua/llimits.h"
- 
- #include <boost/version.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace po = boost::program_options;
- 
-@@ -374,7 +374,7 @@
- void commandline_options::parse_log_domains_(const std::string &domains_string, const int severity)
- {
- 	const std::vector<std::string> domains = utils::split(domains_string, ',');
--	foreach (const std::string& domain, domains)
-+	BOOST_FOREACH(const std::string& domain, domains)
- 	{
- 		if (!log)
- 			log = std::vector<boost::tuple<int, std::string> >();
-@@ -396,7 +396,7 @@
- {
- 	std::vector<boost::tuple<unsigned int,std::string> > vec;
- 	boost::tuple<unsigned int,std::string> elem;
--	foreach(const std::string &s, strings)
-+	BOOST_FOREACH(const std::string &s, strings)
- 	{
- 		const std::vector<std::string> tokens = utils::split(s, separator);
- 		if (tokens.size()!=2)
-@@ -415,7 +415,7 @@
- {
- 	std::vector<boost::tuple<unsigned int,std::string,std::string> > vec;
- 	boost::tuple<unsigned int,std::string,std::string> elem;
--	foreach(const std::string &s, strings)
-+	BOOST_FOREACH(const std::string &s, strings)
- 	{
- 		const std::vector<std::string> tokens = utils::split(s, separator);
- 		if (tokens.size()!=3)
-Index: src/gui/dialogs/editor_set_starting_position.cpp
-===================================================================
---- src/gui/dialogs/editor_set_starting_position.cpp	(revision 54624)
-+++ src/gui/dialogs/editor_set_starting_position.cpp	(revision 54625)
-@@ -17,7 +17,7 @@
- 
- #include "gui/dialogs/editor_set_starting_position.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- #include "formatter.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
-Index: src/gui/dialogs/gamestate_inspector.cpp
-===================================================================
---- src/gui/dialogs/gamestate_inspector.cpp	(revision 54624)
-+++ src/gui/dialogs/gamestate_inspector.cpp	(revision 54625)
-@@ -27,7 +27,6 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../gamestatus.hpp"
- #include "../../resources.hpp"
- #include "../../team.hpp"
-@@ -36,6 +35,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -189,11 +189,11 @@
- 				? resources::state_of_game->get_variables()
- 				: config();
- 
--		foreach( const config::attribute &a, vars.attribute_range()) {
-+		BOOST_FOREACH( const config::attribute &a, vars.attribute_range()) {
- 			model_.add_row_to_stuff_list(a.first,a.first);
- 		}
- 
--		foreach( const config::any_child &c, vars.all_children_range()) {
-+		BOOST_FOREACH( const config::any_child &c, vars.all_children_range()) {
- 			model_.add_row_to_stuff_list("["+c.key+"]","["+c.key+"]");
- 		}
- 
-@@ -214,7 +214,7 @@
- 				? resources::state_of_game->get_variables()
- 				: config();
- 
--		foreach( const config::attribute &a, vars.attribute_range()) {
-+		BOOST_FOREACH( const config::attribute &a, vars.attribute_range()) {
- 			if (selected==i) {
- 				model_.set_inspect_window_text(a.second);
- 				return;
-@@ -222,7 +222,7 @@
- 			i++;
- 		}
- 
--		foreach( const config::any_child &c, vars.all_children_range()) {
-+		BOOST_FOREACH( const config::any_child &c, vars.all_children_range()) {
- 			if (selected==i) {
- 				model_.set_inspect_window_text(c.cfg.debug());
- 				return;
-@@ -268,7 +268,7 @@
- 					<< '/' << i->max_experience() << " xp; "
- 					<< i->hitpoints() << '/' << i->max_hitpoints()
- 					<< " hp; ";
--				foreach (const std::string &str, i->get_traits_list()) {
-+				BOOST_FOREACH(const std::string &str, i->get_traits_list()) {
- 					s << str <<" ";
- 				}
- 
-@@ -371,9 +371,9 @@
- 					: std::vector<unit>();
- 
- 			std::stringstream s;
--			foreach (const unit &u, recall_list) {
-+			BOOST_FOREACH(const unit &u, recall_list) {
- 				s << "id=["<<u.id() << "] "<<u.type_id() << "; L"<<u.level()<<"; " << u.experience() <<"/" << u.max_experience()<< " xp "<< std::endl;
--				foreach (const std::string &str, u.get_traits_list() ) {
-+				BOOST_FOREACH(const std::string &str, u.get_traits_list() ) {
- 					s << "\t" << str<< std::endl;
- 				}
- 				s << std::endl << std::endl;
-@@ -388,7 +388,7 @@
- 					: std::vector<unit>();
- 
- 			config c;
--			foreach (const unit &u, recall_list) {
-+			BOOST_FOREACH(const unit &u, recall_list) {
- 				config c_unit;
- 				u.write(c_unit);
- 				c.add_child("unit",c_unit);
-@@ -423,7 +423,7 @@
- 						<< i->max_experience() << " xp; "
- 						<< i->hitpoints() << '/'
- 						<< i->max_hitpoints()<<" hp.\n";
--					foreach (const std::string &str, i->get_traits_list() ) {
-+					BOOST_FOREACH(const std::string &str, i->get_traits_list() ) {
- 						s << "\t" << str<< std::endl;
- 					}
- 					s << std::endl << std::endl;
-@@ -457,7 +457,7 @@
- 				boost::shared_ptr<single_mode_controller>(new variable_mode_controller("variables",model_)));
- 		sm_controllers_.push_back(
- 				boost::shared_ptr<single_mode_controller>(new unit_mode_controller("units",model_)));
--		//foreach team
-+		//BOOST_FOREACHteam
- 		int sides = resources::teams
- 				? static_cast<int>((*resources::teams).size())
- 				: 0;
-@@ -481,7 +481,7 @@
- 	void show_stuff_types_list()
- 	{
- 		model_.clear_stuff_types_list();
--		foreach (boost::shared_ptr<single_mode_controller> sm_controller, sm_controllers_ ) {
-+		BOOST_FOREACH(boost::shared_ptr<single_mode_controller> sm_controller, sm_controllers_ ) {
- 			model_.add_row_to_stuff_types_list(sm_controller->name(),sm_controller->name());
- 		}
- 	}
-Index: src/gui/dialogs/unit_attack.cpp
-===================================================================
---- src/gui/dialogs/unit_attack.cpp	(revision 54624)
-+++ src/gui/dialogs/unit_attack.cpp	(revision 54625)
-@@ -27,6 +27,8 @@
- #include "gui/widgets/window.hpp"
- #include "unit.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -106,7 +108,7 @@
- 	const config empty;
- 	attack_type no_weapon(empty);
- 
--	foreach(const battle_context& weapon, weapons) {
-+	BOOST_FOREACH(const battle_context& weapon, weapons) {
- 		const battle_context_unit_stats& attacker =
- 				weapon.get_attacker_stats();
- 
-Index: src/gui/dialogs/data_manage.cpp
-===================================================================
---- src/gui/dialogs/data_manage.cpp	(revision 54624)
-+++ src/gui/dialogs/data_manage.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/data_manage.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_config.hpp"
- #include "game_preferences.hpp"
-@@ -43,6 +42,7 @@
- 
- #include <cctype>
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -101,7 +101,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "persist_list", false);
- 	list.clear();
- 
--	foreach(const savegame::save_info game, games) {
-+	BOOST_FOREACH(const savegame::save_info game, games) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-@@ -142,7 +142,7 @@
- 				find_widget<tlabel>(*it, "filename", false);
- 
- 			bool found = false;
--			foreach (const std::string& word, words){
-+			BOOST_FOREACH(const std::string& word, words){
- 				found = std::search(filename_label.label().str().begin()
- 						, filename_label.label().str().end()
- 						, word.begin(), word.end()
-Index: src/gui/dialogs/dialog.cpp
-===================================================================
---- src/gui/dialogs/dialog.cpp	(revision 54624)
-+++ src/gui/dialogs/dialog.cpp	(revision 54625)
-@@ -17,16 +17,17 @@
- 
- #include "gui/dialogs/dialog.hpp"
- 
--#include "foreach.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/integer_selector.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- tdialog::~tdialog()
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		delete field;
- 	}
- }
-@@ -193,7 +194,7 @@
- 
- void tdialog::init_fields(twindow& window)
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		field->attach_to_window(window);
- 		field->widget_init(window);
- 	}
-@@ -207,7 +208,7 @@
- 
- void tdialog::finalize_fields(twindow& window, const bool save_fields)
- {
--	foreach(tfield_* field, fields_) {
-+	BOOST_FOREACH(tfield_* field, fields_) {
- 		if(save_fields) {
- 			field->widget_finalize(window);
- 		}
-Index: src/gui/dialogs/debug_clock.cpp
-===================================================================
---- src/gui/dialogs/debug_clock.cpp	(revision 54624)
-+++ src/gui/dialogs/debug_clock.cpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/widgets/progress_bar.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <ctime>
- 
-@@ -153,7 +154,7 @@
- 	}
- 
- 	if(clock_) {
--		foreach(tcanvas& canvas, clock_->canvas()) {
-+		BOOST_FOREACH(tcanvas& canvas, clock_->canvas()) {
- 			canvas.set_variable("hour", variant(hour_stamp));
- 			canvas.set_variable("minute", variant(minute_stamp));
- 			canvas.set_variable("second", variant(second_stamp));
-Index: src/gui/dialogs/wml_message.cpp
-===================================================================
---- src/gui/dialogs/wml_message.cpp	(revision 54624)
-+++ src/gui/dialogs/wml_message.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/wml_message.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/old_markup.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/label.hpp"
-Index: src/gui/dialogs/simple_item_selector.cpp
-===================================================================
---- src/gui/dialogs/simple_item_selector.cpp	(revision 54624)
-+++ src/gui/dialogs/simple_item_selector.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/simple_item_selector.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/label.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
-@@ -28,6 +27,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -79,7 +80,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "listbox", false);
- 	window.keyboard_capture(&list);
- 
--	foreach(const tsimple_item_selector::item_type& it, items_) {
-+	BOOST_FOREACH(const tsimple_item_selector::item_type& it, items_) {
- 		std::map<std::string, string_map> data;
- 		string_map column;
- 
-Index: src/gui/dialogs/game_load.cpp
-===================================================================
---- src/gui/dialogs/game_load.cpp	(revision 54624)
-+++ src/gui/dialogs/game_load.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/game_load.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "game_config.hpp"
-@@ -43,6 +42,7 @@
- 
- #include <cctype>
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -151,7 +151,7 @@
- 	tlistbox& list = find_widget<tlistbox>(&window, "savegame_list", false);
- 	list.clear();
- 
--	foreach(const savegame::save_info game, games) {
-+	BOOST_FOREACH(const savegame::save_info game, games) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-@@ -193,7 +193,7 @@
- 				find_widget<tlabel>(*it, "filename", false);
- 
- 			bool found = false;
--			foreach (const std::string& word, words){
-+			BOOST_FOREACH(const std::string& word, words){
- 				found = std::search(filename_label.label().str().begin()
- 						, filename_label.label().str().end()
- 						, word.begin(), word.end()
-Index: src/gui/dialogs/lobby_main.cpp
-===================================================================
---- src/gui/dialogs/lobby_main.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby_main.cpp	(revision 54625)
-@@ -38,7 +38,6 @@
- #include "gui/widgets/toggle_panel.hpp"
- #include "gui/widgets/tree_view_node.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -50,6 +49,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define DBG_NW LOG_STREAM(debug, log_network)
-@@ -499,14 +499,14 @@
- void modify_grid_with_data(tgrid* grid, const std::map<std::string, string_map>& map)
- {
- 	typedef std::map<std::string, string_map> strstrmap;
--	foreach (const strstrmap::value_type v, map) {
-+	BOOST_FOREACH(const strstrmap::value_type v, map) {
- 		const std::string& key = v.first;
- 		const string_map& strmap = v.second;
- 		twidget* w = grid->find(key, false);
- 		if (w == NULL) continue;
- 		tcontrol* c = dynamic_cast<tcontrol*>(w);
- 		if (c == NULL) continue;
--		foreach (const string_map::value_type& vv, strmap) {
-+		BOOST_FOREACH(const string_map::value_type& vv, strmap) {
- 			if (vv.first == "label") {
- 				c->set_label(vv.second);
- 			} else if (vv.first == "tooltip") {
-@@ -816,7 +816,7 @@
- 	player_list_.other_games.tree->clear();
- 	player_list_.other_rooms.tree->clear();
- 
--	foreach (user_info* userptr, lobby_info_.users_sorted())
-+	BOOST_FOREACH(user_info* userptr, lobby_info_.users_sorted())
- 	{
- 		user_info& user = *userptr;
- 		tsub_player_list* target_list(NULL);
-@@ -1093,7 +1093,7 @@
- 
- tlobby_chat_window* tlobby_main::search_create_window(const std::string& name, bool whisper, bool open_new)
- {
--	foreach (tlobby_chat_window& t, open_windows_) {
-+	BOOST_FOREACH(tlobby_chat_window& t, open_windows_) {
- 		if (t.name == name && t.whisper == whisper) return &t;
- 	}
- 	if (open_new) {
-@@ -1477,7 +1477,7 @@
- 			//TODO: this should really open a nice join room dialog instead
- 			std::stringstream ss;
- 			ss << "Rooms:";
--			foreach (const config& r, rooms.child_range("room")) {
-+			BOOST_FOREACH(const config& r, rooms.child_range("room")) {
- 				ss << " " << r["name"];
- 			}
- 			add_active_window_message("server", ss.str());
-@@ -1667,7 +1667,7 @@
- 		const std::vector<user_info>& match_infos = lobby_info_.users();
- 		std::vector<std::string> matches;
- 
--		foreach(const user_info& ui, match_infos) {
-+		BOOST_FOREACH(const user_info& ui, match_infos) {
- 			if(ui.name != preferences::login()) {
- 				matches.push_back(ui.name);
- 			}
-@@ -1694,7 +1694,7 @@
- {
- 	lobby_info_.clear_game_filter();
- 
--	foreach (const std::string& s, utils::split(filter_text_->get_value(), ' ')) {
-+	BOOST_FOREACH(const std::string& s, utils::split(filter_text_->get_value(), ' ')) {
- 		lobby_info_.add_game_filter(new game_filter_general_string_part(s));
- 	}
- 	//TODO: make changing friend/ignore lists trigger a refresh
-Index: src/gui/dialogs/campaign_difficulty.cpp
-===================================================================
---- src/gui/dialogs/campaign_difficulty.cpp	(revision 54624)
-+++ src/gui/dialogs/campaign_difficulty.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/campaign_difficulty.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/old_markup.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- 	#include "gui/widgets/list.hpp"
-@@ -27,6 +26,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -65,7 +66,7 @@
- tcampaign_difficulty::tcampaign_difficulty(const std::vector<std::string>& items)
- 	: index_(-1), items_()
- {
--	foreach(const std::string& it, items) {
-+	BOOST_FOREACH(const std::string& it, items) {
- 		items_.push_back(tlegacy_menu_item(it));
- 	}
- }
-@@ -77,7 +78,7 @@
- 
- 	std::map<std::string, string_map> data;
- 
--	foreach(const tlegacy_menu_item& item, items_) {
-+	BOOST_FOREACH(const tlegacy_menu_item& item, items_) {
- 		if(item.is_default()) {
- 			index_ = list.get_item_count();
- 		}
-Index: src/gui/dialogs/unit_create.cpp
-===================================================================
---- src/gui/dialogs/unit_create.cpp	(revision 54624)
-+++ src/gui/dialogs/unit_create.cpp	(revision 54625)
-@@ -27,9 +27,10 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/window.hpp"
--#include "foreach.hpp"
- #include "unit_types.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 	static std::string last_chosen_type_id = "";
- 	static unit_race::GENDER last_gender = unit_race::MALE;
-@@ -109,7 +110,7 @@
- 
- 	std::vector< std::string > type_labels, race_labels;
- 
--	foreach (const unit_type_data::unit_type_map::value_type &i, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &i, unit_types.types())
- 	{
- 		unit_types.find(i.first, unit_type::HELP_INDEX);
- 
-Index: src/gui/dialogs/formula_debugger.cpp
-===================================================================
---- src/gui/dialogs/formula_debugger.cpp	(revision 54624)
-+++ src/gui/dialogs/formula_debugger.cpp	(revision 54625)
-@@ -21,10 +21,10 @@
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
--#include "../../foreach.hpp"
- #include "../../formula_debugger.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -73,7 +73,7 @@
- 	std::stringstream stack_text;
- 	std::string indent = "  ";
- 	int c = 0;
--	foreach (const game_logic::debug_info &i, fdb_.get_call_stack()) {
-+	BOOST_FOREACH(const game_logic::debug_info &i, fdb_.get_call_stack()) {
- 		for(int d = 0; d < c; ++d) {
- 			stack_text << indent;
- 		}
-@@ -92,7 +92,7 @@
- 			&window, "execution", false, true);
- 
- 	std::stringstream execution_text;
--	foreach (const game_logic::debug_info &i, fdb_.get_execution_trace()) {
-+	BOOST_FOREACH(const game_logic::debug_info &i, fdb_.get_execution_trace()) {
- 		for(int d = 0; d < i.level(); ++d) {
- 			execution_text << indent;
- 		}
-Index: src/gui/dialogs/title_screen.cpp
-===================================================================
---- src/gui/dialogs/title_screen.cpp	(revision 54624)
-+++ src/gui/dialogs/title_screen.cpp	(revision 54625)
-@@ -35,6 +35,7 @@
- #include "preferences_display.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <algorithm>
- 
-@@ -306,7 +307,7 @@
- 		WRN_CF << "There are not tips of day available.\n";
- 	}
- 
--	foreach(const ttip& tip, tips) {
-+	BOOST_FOREACH(const ttip& tip, tips) {
- 
- 		string_map widget;
- 		std::map<std::string, string_map> page;
-Index: src/gui/dialogs/addon_list.cpp
-===================================================================
---- src/gui/dialogs/addon_list.cpp	(revision 54624)
-+++ src/gui/dialogs/addon_list.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/addon_list.hpp"
- 
--#include "foreach.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include "gui/widgets/list.hpp"
- #else
-@@ -26,6 +25,8 @@
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -70,7 +71,7 @@
- 	 * @todo do we really want to keep the length limit for the various
- 	 * items?
- 	 */
--	foreach(const config &c, cfg_.child_range("campaign")) {
-+	BOOST_FOREACH(const config &c, cfg_.child_range("campaign")) {
- 		std::map<std::string, string_map> data;
- 		string_map item;
- 
-Index: src/gui/dialogs/campaign_selection.cpp
-===================================================================
---- src/gui/dialogs/campaign_selection.cpp	(revision 54624)
-+++ src/gui/dialogs/campaign_selection.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/campaign_selection.hpp"
- 
--#include "foreach.hpp"
- #include "gui/dialogs/helper.hpp"
- #include "gui/widgets/image.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
-@@ -34,6 +33,7 @@
- #include "serialization/string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -140,7 +140,7 @@
- 				&window, "campaign_details", false);
- 
- 		unsigned id = 0;
--		foreach(const config &campaign, campaigns_) {
-+		BOOST_FOREACH(const config &campaign, campaigns_) {
- 
- 			/*** Add tree item ***/
- 			tree_group_field["label"] = campaign["icon"];
-@@ -206,7 +206,7 @@
- 		tmulti_page& multi_page = find_widget<tmulti_page>(
- 				&window, "campaign_details", false);
- 
--		foreach (const config &c, campaigns_) {
-+		BOOST_FOREACH(const config &c, campaigns_) {
- 
- 			/*** Add list item ***/
- 			string_map list_item;
-Index: src/gui/dialogs/mp_connect.cpp
-===================================================================
---- src/gui/dialogs/mp_connect.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_connect.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/mp_connect.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/button.hpp"
-@@ -30,6 +29,7 @@
- #include "video.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -90,7 +90,7 @@
- 	const std::vector<game_config::server_info>&
- 		pref_servers = preferences::server_list();
- 
--	foreach(const game_config::server_info& server, pref_servers) {
-+	BOOST_FOREACH(const game_config::server_info& server, pref_servers) {
- 
- 		std::map<std::string, string_map> data;
- 		string_map item;
-Index: src/gui/dialogs/language_selection.cpp
-===================================================================
---- src/gui/dialogs/language_selection.cpp	(revision 54624)
-+++ src/gui/dialogs/language_selection.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/language_selection.hpp"
- 
--#include "foreach.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include "gui/widgets/list.hpp"
- #else
-@@ -28,6 +27,8 @@
- #include "language.hpp"
- #include "preferences.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /*WIKI
-@@ -65,7 +66,7 @@
- 
- 	const std::vector<language_def>& languages = get_languages();
- 	const language_def& current_language = get_language();
--	foreach(const language_def& lang, languages) {
-+	BOOST_FOREACH(const language_def& lang, languages) {
- 		string_map item;
- 		item.insert(std::make_pair("label", lang.language));
- 
-Index: src/gui/dialogs/mp_create_game.cpp
-===================================================================
---- src/gui/dialogs/mp_create_game.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_create_game.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/mp_create_game.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/field.hpp"
-@@ -35,6 +34,7 @@
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- #include <boost/bind.hpp>
- #endif
-+#include <boost/foreach.hpp>
- namespace gui2 {
- 
- REGISTER_DIALOG(mp_create_game)
-@@ -101,7 +101,7 @@
- 	std::vector<std::string> maps;
- 	get_files_in_dir(get_user_data_dir() + "/editor/maps", &maps, NULL, FILE_NAME_ONLY);
- 
--	foreach(const std::string& map, maps) {
-+	BOOST_FOREACH(const std::string& map, maps) {
- 		std::map<std::string, t_string> item;
- 		item.insert(std::make_pair("label", map));
- 		list->add_row(item);
-@@ -110,7 +110,7 @@
- 
- 	// Standard maps
- 	int i = 0;
--	foreach (const config &map, cfg_.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &map, cfg_.child_range("multiplayer"))
- 	{
- 		if (map["allow_new_game"].to_bool(true)) {
- 			string_map item;
-Index: src/gui/dialogs/network_transmission.cpp
-===================================================================
---- src/gui/dialogs/network_transmission.cpp	(revision 54624)
-+++ src/gui/dialogs/network_transmission.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/network_transmission.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "gui/widgets/button.hpp"
-Index: src/gui/dialogs/addon/description.cpp
-===================================================================
---- src/gui/dialogs/addon/description.cpp	(revision 54624)
-+++ src/gui/dialogs/addon/description.cpp	(revision 54625)
-@@ -17,14 +17,15 @@
- 
- #include "gui/dialogs/addon/description.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/settings.hpp"
- #include "language.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 	std::string langcode_to_string(const std::string& lcode)
- 	{
--		foreach(const language_def& ld, get_languages()) {
-+		BOOST_FOREACH(const language_def& ld, get_languages()) {
- 			if(ld.localename == lcode || ld.localename.substr(0, 2) == lcode) {
- 				return ld.language;
- 			}
-@@ -90,7 +91,7 @@
- 
- 	std::string languages;
- 
--	foreach(const std::string& lc, addon.translations) {
-+	BOOST_FOREACH(const std::string& lc, addon.translations) {
- 		const std::string& langlabel = langcode_to_string(lc);
- 		if(!langlabel.empty()) {
- 			if(!languages.empty()) {
-Index: src/gui/dialogs/addon/uninstall_list.cpp
-===================================================================
---- src/gui/dialogs/addon/uninstall_list.cpp	(revision 54624)
-+++ src/gui/dialogs/addon/uninstall_list.cpp	(revision 54625)
-@@ -15,7 +15,6 @@
- 
- #include "gui/dialogs/addon/uninstall_list.hpp"
- 
--#include "foreach.hpp"
- #include "gui/widgets/grid.hpp"
- #ifdef GUI2_EXPERIMENTAL_LISTBOX
- 	#include "gui/widgets/list.hpp"
-@@ -26,6 +25,8 @@
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <algorithm>
- 
- namespace {
-@@ -50,7 +51,7 @@
- 	this->names_.clear();
- 	this->selections_.clear();
- 
--	foreach(const std::string& id, this->ids_) {
-+	BOOST_FOREACH(const std::string& id, this->ids_) {
- 		this->names_.push_back(make_addon_name(id));
- 		this->selections_[id] = false;
- 
-@@ -87,7 +88,7 @@
- 	std::vector<std::string> retv;
- 
- 	typedef std::map<std::string, bool> selections_map_type;
--	foreach(const selections_map_type::value_type& entry, this->selections_) {
-+	BOOST_FOREACH(const selections_map_type::value_type& entry, this->selections_) {
- 		if(entry.second) {
- 			retv.push_back(entry.first);
- 		}
-Index: src/gui/dialogs/chat_log.cpp
-===================================================================
---- src/gui/dialogs/chat_log.cpp	(revision 54624)
-+++ src/gui/dialogs/chat_log.cpp	(revision 54625)
-@@ -28,7 +28,6 @@
- #include "gui/widgets/window.hpp"
- #include "gui/widgets/slider.hpp"
- 
--#include "../../foreach.hpp"
- #include "../../gamestatus.hpp"
- #include "../../log.hpp"
- #include "../../resources.hpp"
-@@ -38,6 +37,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_chat_log("chat_log");
- #define DBG_CHAT_LOG LOG_STREAM(debug, log_chat_log)
-@@ -113,7 +113,7 @@
- 		std::stringstream str;
- 		LOG_CHAT_LOG << "entering tchat_log::model::add_row_to_chat_message_list\n";
- 		if (first<last) {
--			foreach (const chat_msg &t, make_pair(chat_log_history.begin()+first,chat_log_history.begin()+last))
-+			BOOST_FOREACH(const chat_msg &t, make_pair(chat_log_history.begin()+first,chat_log_history.begin()+last))
- 			{
- 				std::string prefix("/me");
- 				bool me = false;
-Index: src/gui/dialogs/mp_change_control.cpp
-===================================================================
---- src/gui/dialogs/mp_change_control.cpp	(revision 54624)
-+++ src/gui/dialogs/mp_change_control.cpp	(revision 54625)
-@@ -36,7 +36,7 @@
- #include <vector>
- #include <boost/bind.hpp>
- #include <boost/shared_ptr.hpp>
--#include <gui/widgets/button.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_gui("gui/dialogs/mp_change_control");
- #define ERR_GUI LOG_STREAM(err, log_gui)
-@@ -184,7 +184,7 @@
- 
- 		int i = 0; // because we need to know which row contains the controlling player
- 
--		foreach (const std::string &nick, nicks)
-+		BOOST_FOREACH(const std::string &nick, nicks)
- 		{
- 			if (side_number_ <= static_cast<int>(resources::teams->size()) &&
- 				resources::teams->at(side_number_-1).current_player() == nick)
-Index: src/gui/dialogs/message.cpp
-===================================================================
---- src/gui/dialogs/message.cpp	(revision 54624)
-+++ src/gui/dialogs/message.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/message.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/widgets/button.hpp"
- #include "gui/widgets/image.hpp"
-@@ -26,6 +25,8 @@
- #include "gui/widgets/window.hpp"
- #include "log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- REGISTER_DIALOG(message)
-@@ -97,7 +98,7 @@
- 
- void tmessage::post_show(twindow& /*window*/)
- {
--	foreach(tbutton_status& button_status, buttons_) {
-+	BOOST_FOREACH(tbutton_status& button_status, buttons_) {
- 		button_status.button = NULL;
- 	}
- }
-Index: src/gui/dialogs/lobby/lobby_data.cpp
-===================================================================
---- src/gui/dialogs/lobby/lobby_data.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby/lobby_data.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "config.hpp"
- #include "game_preferences.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "network.hpp"
-@@ -27,6 +26,8 @@
- #include "map_exception.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- 
- static lg::log_domain log_config("config");
-@@ -89,7 +90,7 @@
- void room_info::process_room_members(const config& data)
- {
- 	members_.clear();
--	foreach (const config& m, data.child_range("member")) {
-+	BOOST_FOREACH(const config& m, data.child_range("member")) {
- 		members_.insert(m["name"]);
- 	}
- }
-@@ -254,7 +255,7 @@
- 				if (const config& hashes = game_config.child("multiplayer_hashes")) {
- 					std::string hash = game["hash"];
- 					bool hash_found = false;
--					foreach (const config::attribute &i, hashes.attribute_range()) {
-+					BOOST_FOREACH(const config::attribute &i, hashes.attribute_range()) {
- 						if (i.first == game["mp_scenario"] && i.second == hash) {
- 							hash_found = true;
- 							break;
-@@ -357,7 +358,7 @@
- 
- game_filter_stack::~game_filter_stack()
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		delete f;
- 	}
- }
-@@ -369,7 +370,7 @@
- 
- void game_filter_stack::clear()
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		delete f;
- 	}
- 	filters_.clear();
-@@ -377,7 +378,7 @@
- 
- bool game_filter_and_stack::match(const game_info &game) const
- {
--	foreach (game_filter_base* f, filters_) {
-+	BOOST_FOREACH(game_filter_base* f, filters_) {
- 		if (!f->match(game)) return false;
- 	}
- 	return true;
-Index: src/gui/dialogs/lobby/lobby_info.cpp
-===================================================================
---- src/gui/dialogs/lobby/lobby_info.cpp	(revision 54624)
-+++ src/gui/dialogs/lobby/lobby_info.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "config.hpp"
- #include "game_preferences.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gettext.hpp"
- #include "network.hpp"
-@@ -27,6 +26,8 @@
- #include "map_exception.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <iterator>
- 
- static lg::log_domain log_config("config");
-@@ -66,7 +67,7 @@
- 
- void lobby_info::delete_games()
- {
--	foreach (const game_info_map::value_type& v, games_by_id_) {
-+	BOOST_FOREACH(const game_info_map::value_type& v, games_by_id_) {
- 		delete v.second;
- 	}
- }
-@@ -76,7 +77,7 @@
- std::string dump_games_map(const lobby_info::game_info_map& games)
- {
- 	std::stringstream ss;
--	foreach (const lobby_info::game_info_map::value_type& v, games) {
-+	BOOST_FOREACH(const lobby_info::game_info_map::value_type& v, games) {
- 		const game_info& game = *v.second;
- 		ss << "G" << game.id << "(" << game.name << ") " << game.display_status_string() << " ";
- 	}
-@@ -87,7 +88,7 @@
- std::string dump_games_config(const config& gamelist)
- {
- 	std::stringstream ss;
--	foreach (const config& c, gamelist.child_range("game")) {
-+	BOOST_FOREACH(const config& c, gamelist.child_range("game")) {
- 		ss << "g" << c["id"] << "(" << c["name"] << ") " << c[config::diff_track_attribute] << " ";
- 	}
- 	ss << "\n";
-@@ -103,7 +104,7 @@
- 	gamelist_initialized_ = true;
- 	delete_games();
- 	games_by_id_.clear();
--	foreach (const config& c, gamelist_.child("gamelist").child_range("game")) {
-+	BOOST_FOREACH(const config& c, gamelist_.child("gamelist").child_range("game")) {
- 		game_info* game = new game_info(c, game_config_);
- 		games_by_id_[game->id] = game;
- 	}
-@@ -180,10 +181,10 @@
- {
- 	SCOPE_LB;
- 	users_.clear();
--	foreach (const config& c, gamelist_.child_range("user")) {
-+	BOOST_FOREACH(const config& c, gamelist_.child_range("user")) {
- 		users_.push_back(user_info(c));
- 	}
--	foreach (user_info& ui, users_) {
-+	BOOST_FOREACH(user_info& ui, users_) {
- 		if (ui.game_id != 0) {
- 			game_info* g = get_game_by_id(ui.game_id);
- 			if (g == NULL) {
-@@ -235,7 +236,7 @@
- 
- room_info* lobby_info::get_room(const std::string &name)
- {
--	foreach (room_info& r, rooms_) {
-+	BOOST_FOREACH(room_info& r, rooms_) {
- 		if (r.name() == name) return &r;
- 	}
- 	return NULL;
-@@ -243,7 +244,7 @@
- 
- const room_info* lobby_info::get_room(const std::string &name) const
- {
--	foreach (const room_info& r, rooms_) {
-+	BOOST_FOREACH(const room_info& r, rooms_) {
- 		if (r.name() == name) return &r;
- 	}
- 	return NULL;
-@@ -301,7 +302,7 @@
- 	games_filtered_.clear();
- 	games_visibility_.clear();
- 	games_.clear();
--	foreach (const game_info_map::value_type& v, games_by_id_) {
-+	BOOST_FOREACH(const game_info_map::value_type& v, games_by_id_) {
- 		games_.push_back(v.second);
- 	}
- }
-@@ -310,7 +311,7 @@
- {
- 	games_filtered_.clear();
- 	games_visibility_.clear();
--	foreach (game_info* g, games_) {
-+	BOOST_FOREACH(game_info* g, games_) {
- 		game_info& gi = *g;
- 		bool show = game_filter_.match(gi);
- 		if (game_filter_invert_) {
-@@ -325,7 +326,7 @@
- 
- void lobby_info::update_user_statuses(int game_id, const room_info *room)
- {
--	foreach (user_info& user, users_) {
-+	BOOST_FOREACH(user_info& user, users_) {
- 		user.update_state(game_id, room);
- 	}
- }
-@@ -365,7 +366,7 @@
- void lobby_info::sort_users(bool by_name, bool by_relation)
- {
- 	users_sorted_.clear();
--	foreach (user_info& u, users_) {
-+	BOOST_FOREACH(user_info& u, users_) {
- 		users_sorted_.push_back(&u);
- 	}
- 	if (by_name) {
-Index: src/gui/dialogs/game_save.cpp
-===================================================================
---- src/gui/dialogs/game_save.cpp	(revision 54624)
-+++ src/gui/dialogs/game_save.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/dialogs/game_save.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/field.hpp"
- #include "gui/widgets/button.hpp"
-Index: src/gui/widgets/settings.cpp
-===================================================================
---- src/gui/widgets/settings.cpp	(revision 54624)
-+++ src/gui/widgets/settings.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- #include "asserts.hpp"
- #include "config_cache.hpp"
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/tips.hpp"
-@@ -35,6 +34,8 @@
- #include "serialization/schema_validator.hpp"
- #include "formula_string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- bool new_widgets = false;
-@@ -283,12 +284,12 @@
- 				  , const config&
- 				  , const char *key)> > thack;
- 
--	foreach(thack& widget_type, registred_widget_type()) {
-+	BOOST_FOREACH(thack& widget_type, registred_widget_type()) {
- 		widget_type.second(*this, widget_type.first, cfg, NULL);
- 	}
- 
- 	/***** Window types *****/
--	foreach (const config &w, cfg.child_range("window")) {
-+	BOOST_FOREACH(const config &w, cfg.child_range("window")) {
- 		std::pair<std::string, twindow_builder> child;
- 		child.first = child.second.read(w);
- 		window_types.insert(child);
-@@ -423,7 +424,7 @@
- 		  const std::string& definition_type
- 		, const std::vector<tcontrol_definition_ptr>& definitions)
- {
--	foreach(const tcontrol_definition_ptr& def, definitions) {
-+	BOOST_FOREACH(const tcontrol_definition_ptr& def, definitions) {
- 
- 		// We assume all definitions are unique if not we would leak memory.
- 		assert(control_definition[definition_type].find(def->id)
-@@ -497,7 +498,7 @@
- 			ERR_GUI_P << e.message;
- 	}
- 	// Parse guis
--	foreach (const config &g, cfg.child_range("gui")) {
-+	BOOST_FOREACH(const config &g, cfg.child_range("gui")) {
- 		std::pair<std::string, tgui_definition> child;
- 		child.first = child.second.read(g);
- 		guis.insert(child);
-Index: src/gui/widgets/window.cpp
-===================================================================
---- src/gui/widgets/window.cpp	(revision 54624)
-+++ src/gui/widgets/window.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "gui/widgets/window_private.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "gettext.hpp"
- #include "log.hpp"
-@@ -44,6 +43,7 @@
- #include "video.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -716,7 +716,7 @@
- 		return;
- 	}
- 
--	foreach(std::vector<twidget*>& item, dirty_list_) {
-+	BOOST_FOREACH(std::vector<twidget*>& item, dirty_list_) {
- 
- 		assert(!item.empty());
- 
-@@ -1047,12 +1047,12 @@
- {
- 	// evaluate the group sizes
- 	typedef std::pair<const std::string, tlinked_size> hack;
--	foreach(hack& linked_size, linked_size_) {
-+	BOOST_FOREACH(hack& linked_size, linked_size_) {
- 
- 		tpoint max_size(0, 0);
- 
- 		// Determine the maximum size.
--		foreach(twidget* widget, linked_size.second.widgets) {
-+		BOOST_FOREACH(twidget* widget, linked_size.second.widgets) {
- 
- 			const tpoint size = widget->get_best_size();
- 
-@@ -1065,7 +1065,7 @@
- 		}
- 
- 		// Set the maximum size.
--		foreach(twidget* widget, linked_size.second.widgets) {
-+		BOOST_FOREACH(twidget* widget, linked_size.second.widgets) {
- 
- 			tpoint size = widget->get_best_size();
- 
-Index: src/gui/widgets/stacked_widget.cpp
-===================================================================
---- src/gui/widgets/stacked_widget.cpp	(revision 54624)
-+++ src/gui/widgets/stacked_widget.cpp	(revision 54625)
-@@ -17,13 +17,13 @@
- 
- #include "gui/widgets/stacked_widget.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/widget_definition/stacked_widget.hpp"
- #include "gui/auxiliary/window_builder/stacked_widget.hpp"
- #include "gui/widgets/settings.hpp"
- #include "gui/widgets/generator.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -83,7 +83,7 @@
- {
- 	assert(generator_);
- 	string_map empty_data;
--	foreach(const tbuilder_grid_const_ptr& builder, widget_builder) {
-+	BOOST_FOREACH(const tbuilder_grid_const_ptr& builder, widget_builder) {
- 		generator_->create_item(-1, builder, empty_data, NULL);
- 	}
- 	swap_grid(NULL, &grid(), generator_, "_content_grid");
-Index: src/gui/widgets/text_box.cpp
-===================================================================
---- src/gui/widgets/text_box.cpp	(revision 54624)
-+++ src/gui/widgets/text_box.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/widgets/text_box.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/text_box.hpp"
- #include "gui/auxiliary/window_builder/text_box.hpp"
-@@ -27,6 +26,7 @@
- #include "game_preferences.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -162,7 +162,7 @@
- 	const int max_width = get_text_maximum_width();
- 	const int max_height = get_text_maximum_height();
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 
- 		tmp.set_variable("text", variant(get_value()));
- 		tmp.set_variable("text_x_offset", variant(text_x_offset_));
-@@ -260,7 +260,7 @@
- 
- 	// Since this variable doesn't change set it here instead of in
- 	// update_canvas().
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("text_font_height", variant(text_height_));
- 	}
- 
-Index: src/gui/widgets/toggle_panel.cpp
-===================================================================
---- src/gui/widgets/toggle_panel.cpp	(revision 54624)
-+++ src/gui/widgets/toggle_panel.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/toggle_panel.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/toggle_panel.hpp"
- #include "gui/auxiliary/window_builder/toggle_panel.hpp"
-@@ -26,6 +25,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -72,7 +72,7 @@
- {
- 	// typedef boost problem work around.
- 	typedef std::pair<std::string, string_map> hack ;
--	foreach(const hack& item, data) {
-+	BOOST_FOREACH(const hack& item, data) {
- 		tcontrol* control = dynamic_cast<tcontrol*>(find(item.first, false));
- 		if(control) {
- 			control->set_members(item.second);
-Index: src/gui/widgets/tree_view_node.cpp
-===================================================================
---- src/gui/widgets/tree_view_node.cpp	(revision 54624)
-+++ src/gui/widgets/tree_view_node.cpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/widgets/tree_view.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER \
- 		get_control_type() + " [" + tree_view().id() + "] " + __func__
-@@ -48,7 +49,7 @@
- 	grid_.set_parent(this);
- 	set_parent(&parent_tree_view);
- 	if(id != "root") {
--		foreach(const tnode_definition& node_definition, node_definitions_) {
-+		BOOST_FOREACH(const tnode_definition& node_definition, node_definitions_) {
- 			if(node_definition.id == id) {
- 				node_definition.builder->build(&grid_);
- 				init_grid(&grid_, data);
-@@ -217,7 +218,7 @@
- 	int height_reduction = 0;
- 
- 	if(!is_folded()) {
--		foreach(const ttree_view_node& node, children_) {
-+		BOOST_FOREACH(const ttree_view_node& node, children_) {
- 			height_reduction += node.get_current_size().y;
- 		}
- 	}
-@@ -300,7 +301,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		std::vector<twidget*> child_call_stack = call_stack;
- 		node.impl_populate_dirty_list(caller, child_call_stack);
- 	}
-@@ -455,7 +456,7 @@
- 	}
- 
- 	DBG_GUI_L << LOG_HEADER << " set children.\n";
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		origin.y += node.place(indention_step_size, origin, width);
- 	}
- 
-@@ -477,7 +478,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		node.set_visible_area(area);
- 	}
- }
-@@ -490,7 +491,7 @@
- 		return;
- 	}
- 
--	foreach(ttree_view_node& node, children_) {
-+	BOOST_FOREACH(ttree_view_node& node, children_) {
- 		node.impl_draw_children(frame_buffer);
- 	}
- }
-Index: src/gui/widgets/settings.hpp
-===================================================================
---- src/gui/widgets/settings.hpp	(revision 54624)
-+++ src/gui/widgets/settings.hpp	(revision 54625)
-@@ -24,6 +24,7 @@
- #include "gui/auxiliary/widget_definition/window.hpp"
- 
- #include <boost/function.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <string>
- #include <vector>
-@@ -124,7 +125,7 @@
- {
- 	std::vector<tcontrol_definition_ptr> definitions;
- 
--	foreach(const config& definition
-+	BOOST_FOREACH(const config& definition
- 			, cfg.child_range(key ? key : definition_type + "_definition")) {
- 
- 		definitions.push_back(new T(definition));
-Index: src/gui/widgets/slider.cpp
-===================================================================
---- src/gui/widgets/slider.cpp	(revision 54624)
-+++ src/gui/widgets/slider.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/slider.hpp"
- 
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/slider.hpp"
-@@ -27,6 +26,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -232,7 +232,7 @@
- 	// Inherited.
- 	tscrollbar_::update_canvas();
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("text", variant(get_value_label()));
- 	}
- }
-Index: src/gui/widgets/scrollbar.cpp
-===================================================================
---- src/gui/widgets/scrollbar.cpp	(revision 54624)
-+++ src/gui/widgets/scrollbar.cpp	(revision 54625)
-@@ -17,11 +17,11 @@
- 
- #include "gui/widgets/scrollbar.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/window.hpp" // Needed for invalidate_layout()
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -132,7 +132,7 @@
- 
- void tscrollbar_::update_canvas() {
- 
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("positioner_offset", variant(positioner_offset_));
- 		tmp.set_variable("positioner_length", variant(positioner_length_));
- 	}
-@@ -287,7 +287,7 @@
- void tscrollbar_::load_config_extra()
- {
- 	// These values won't change so set them here.
--	foreach(tcanvas& tmp, canvas()) {
-+	BOOST_FOREACH(tcanvas& tmp, canvas()) {
- 		tmp.set_variable("offset_before", variant(offset_before()));
- 		tmp.set_variable("offset_after", variant(offset_after()));
- 	}
-Index: src/gui/widgets/grid_private.hpp
-===================================================================
---- src/gui/widgets/grid_private.hpp	(revision 54624)
-+++ src/gui/widgets/grid_private.hpp	(revision 54625)
-@@ -33,7 +33,7 @@
- 
- #include "gui/widgets/grid.hpp"
- 
--#include "foreach.hpp"
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -56,7 +56,7 @@
- 			const tpoint& coordinate, const bool must_be_active)
- 	{
- 		typedef typename tconst_duplicator<W, tgrid::tchild>::type hack;
--		foreach(hack& child, grid.children_) {
-+		BOOST_FOREACH(hack& child, grid.children_) {
- 
- 			W* widget = child.widget();
- 			if(!widget) {
-@@ -91,7 +91,7 @@
- 		}
- 
- 		typedef typename tconst_duplicator<W, tgrid::tchild>::type hack;
--		foreach(hack& child, grid.children_) {
-+		BOOST_FOREACH(hack& child, grid.children_) {
- 
- 			widget = child.widget();
- 			if(!widget) {
-Index: src/gui/widgets/grid.cpp
-===================================================================
---- src/gui/widgets/grid.cpp	(revision 54624)
-+++ src/gui/widgets/grid.cpp	(revision 54625)
-@@ -21,6 +21,8 @@
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/layout_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <numeric>
- 
- #define LOG_SCOPE_HEADER "tgrid [" + id() + "] " + __func__
-@@ -48,7 +50,7 @@
- {
- 	// Delete the children in this destructor since resizing a vector copies the
- 	// children and thus frees the child prematurely.
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		delete child.widget();
- 	}
- }
-@@ -99,7 +101,7 @@
- {
- 	assert(widget);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		if(child.id() != id) {
- 
- 			if(recurse) {
-@@ -145,7 +147,7 @@
- 
- void tgrid::remove_child(const std::string& id, const bool find_all)
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		if(child.id() == id) {
- 			delete child.widget();
-@@ -160,7 +162,7 @@
- 
- void tgrid::set_active(const bool active)
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		if(!widget) {
-@@ -186,7 +188,7 @@
- 	twidget::layout_init(full_initialization);
- 
- 	// Clear child caches.
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		child.layout_init(full_initialization);
- 
-@@ -426,7 +428,7 @@
- 
- bool tgrid::can_wrap() const
- {
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		if(child.can_wrap()) {
- 			return true;
- 		}
-@@ -485,7 +487,7 @@
- 
- 			if(w_size == 0) {
- 				// If all sizes are 0 reset them to 1
--				foreach(unsigned& val, col_grow_factor_) {
-+				BOOST_FOREACH(unsigned& val, col_grow_factor_) {
- 					val = 1;
- 				}
- 				w_size = cols_;
-@@ -516,7 +518,7 @@
- 
- 			if(h_size == 0) {
- 				// If all sizes are 0 reset them to 1
--				foreach(unsigned& val, row_grow_factor_) {
-+				BOOST_FOREACH(unsigned& val, row_grow_factor_) {
- 					val = 1;
- 				}
- 				h_size = rows_;
-@@ -551,7 +553,7 @@
- 	// Inherited.
- 	twidget::set_origin(origin);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-@@ -567,7 +569,7 @@
- 	// Inherited.
- 	twidget::set_visible_area(area);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-@@ -578,7 +580,7 @@
- 
- void tgrid::layout_children()
- {
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 		assert(child.widget());
- 		child.widget()->layout_children();
- 	}
-@@ -589,7 +591,7 @@
- {
- 	assert(!call_stack.empty() && call_stack.back() == this);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		assert(child.widget());
- 
-@@ -627,7 +629,7 @@
- 
- bool tgrid::has_widget(const twidget* widget) const
- {
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		if(child.widget() == widget) {
- 			return true;
- 		}
-@@ -641,7 +643,7 @@
- 		return false;
- 	}
- 
--	foreach(const tchild& child, children_) {
-+	BOOST_FOREACH(const tchild& child, children_) {
- 		const twidget* widget = child.widget();
- 		assert(widget);
- 
-@@ -936,7 +938,7 @@
- 	assert(get_visible() == twidget::VISIBLE);
- 	set_dirty(false);
- 
--	foreach(tchild& child, children_) {
-+	BOOST_FOREACH(tchild& child, children_) {
- 
- 		twidget* widget = child.widget();
- 		assert(widget);
-Index: src/gui/widgets/toggle_button.cpp
-===================================================================
---- src/gui/widgets/toggle_button.cpp	(revision 54624)
-+++ src/gui/widgets/toggle_button.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/toggle_button.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/toggle_button.hpp"
- #include "gui/auxiliary/window_builder/toggle_button.hpp"
-@@ -26,6 +25,7 @@
- #include "sound.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -89,7 +89,7 @@
- 
- 	// set icon in canvases
- 	std::vector<tcanvas>& canvases = tcontrol::canvas();
--	foreach(tcanvas& canvas, canvases) {
-+	BOOST_FOREACH(tcanvas& canvas, canvases) {
- 		canvas.set_variable("icon", variant(icon_name_));
- 	}
- 
-Index: src/gui/widgets/control.cpp
-===================================================================
---- src/gui/widgets/control.cpp	(revision 54624)
-+++ src/gui/widgets/control.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "control.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gui/auxiliary/iterator/walker_widget.hpp"
- #include "gui/auxiliary/log.hpp"
-@@ -29,6 +28,7 @@
- #include "marked-up_text.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #include <iomanip>
- 
-@@ -211,7 +211,7 @@
- void tcontrol::place(const tpoint& origin, const tpoint& size)
- {
- 	// resize canvasses
--	foreach(tcanvas& canvas, canvas_) {
-+	BOOST_FOREACH(tcanvas& canvas, canvas_) {
- 		canvas.set_width(size.x);
- 		canvas.set_height(size.y);
- 	}
-@@ -297,7 +297,7 @@
- 	const int max_height = get_text_maximum_height();
- 
- 	// set label in canvases
--	foreach(tcanvas& canvas, canvas_) {
-+	BOOST_FOREACH(tcanvas& canvas, canvas_) {
- 		canvas.set_variable("text", variant(label_));
- 		canvas.set_variable("text_markup", variant(use_markup_));
- 		canvas.set_variable("text_alignment"
-Index: src/gui/widgets/scrollbar_container.cpp
-===================================================================
---- src/gui/widgets/scrollbar_container.cpp	(revision 54624)
-+++ src/gui/widgets/scrollbar_container.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/widgets/scrollbar_container_private.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/layout_exception.hpp"
- #include "gui/widgets/clickable.hpp"
-@@ -25,6 +24,7 @@
- #include "gui/widgets/window.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -692,7 +692,7 @@
- 
- 	/***** Setup the scrollbar buttons *****/
- 	typedef std::pair<std::string, tscrollbar_::tscroll> hack;
--	foreach(const hack& item, scroll_lookup()) {
-+	BOOST_FOREACH(const hack& item, scroll_lookup()) {
- 
- 		// Vertical.
- 		tclickable_* button = find_widget<tclickable_>(
-@@ -838,7 +838,7 @@
- {
- 	if(true) { /** @todo scrollbar visibility. */
- 		/***** set scroll up button status *****/
--		foreach(const std::string& name, button_up_names) {
-+		BOOST_FOREACH(const std::string& name, button_up_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					vertical_scrollbar_grid_, name, false, false);
- 
-@@ -848,7 +848,7 @@
- 		}
- 
- 		/***** set scroll down status *****/
--		foreach(const std::string& name, button_down_names) {
-+		BOOST_FOREACH(const std::string& name, button_down_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					vertical_scrollbar_grid_, name, false, false);
- 
-@@ -864,7 +864,7 @@
- 
- 	if(true) { /** @todo scrollbar visibility. */
- 		/***** Set scroll left button status *****/
--		foreach(const std::string& name, button_up_names) {
-+		BOOST_FOREACH(const std::string& name, button_up_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					horizontal_scrollbar_grid_, name, false, false);
- 
-@@ -874,7 +874,7 @@
- 		}
- 
- 		/***** Set scroll right button status *****/
--		foreach(const std::string& name, button_down_names) {
-+		BOOST_FOREACH(const std::string& name, button_down_names) {
- 			tcontrol* button = find_widget<tcontrol>(
- 					horizontal_scrollbar_grid_, name, false, false);
- 
-Index: src/gui/widgets/generator_private.hpp
-===================================================================
---- src/gui/widgets/generator_private.hpp	(revision 54624)
-+++ src/gui/widgets/generator_private.hpp	(revision 54625)
-@@ -19,12 +19,13 @@
- #include "gui/widgets/generator.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "gui/widgets/grid.hpp"
- #include "gui/widgets/selectable.hpp"
- #include "gui/widgets/toggle_button.hpp"
- #include "gui/widgets/toggle_panel.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /**
-@@ -584,7 +585,7 @@
- 	/** Inherited from tgenerator_. */
- 	void clear()
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			delete item;
- 		}
- 		selected_item_count_ = 0;
-@@ -750,7 +751,7 @@
- 	/** Inherited from tgenerator_. */
- 	void layout_init(const bool full_initialization)
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.get_visible() != twidget::INVISIBLE && item->shown) {
- 				item->grid.layout_init(full_initialization);
- 			}
-@@ -804,7 +805,7 @@
- 	{
- 		assert(this->get_visible() == twidget::VISIBLE);
- 
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.get_visible() == twidget::VISIBLE && item->shown) {
- 				item->grid.draw_children(frame_buffer);
- 			}
-@@ -815,7 +816,7 @@
- 	void child_populate_dirty_list(twindow& caller,
- 			const std::vector<twidget*>& call_stack)
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			std::vector<twidget*> child_call_stack = call_stack;
- 			item->grid.populate_dirty_list(caller, child_call_stack);
- 		}
-@@ -838,7 +839,7 @@
- 	/** Inherited from widget. */
- 	bool disable_click_dismiss() const
- 	{
--		foreach(titem* item, items_) {
-+		BOOST_FOREACH(titem* item, items_) {
- 			if(item->grid.disable_click_dismiss()) {
- 				return true;
- 			}
-@@ -974,7 +975,7 @@
- 			void (*callback)(twidget*))
- 	{
- 		int i = index;
--		foreach(const T& item_data, data) {
-+		BOOST_FOREACH(const T& item_data, data) {
- 			create_item(i, list_builder, item_data, callback);
- 			if(i != -1) {
- 				++i;
-Index: src/gui/widgets/generator.cpp
-===================================================================
---- src/gui/widgets/generator.cpp	(revision 54624)
-+++ src/gui/widgets/generator.cpp	(revision 54625)
-@@ -19,6 +19,8 @@
- 
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace policy {
-@@ -678,7 +680,7 @@
- 	assert(!callback);
- 
- 	typedef std::pair<std::string, string_map> hack;
--	foreach(const hack& item, data) {
-+	BOOST_FOREACH(const hack& item, data) {
- 		if(item.first.empty()) {
- 			for(unsigned row = 0; row < grid->get_rows(); ++row) {
- 				for(unsigned col = 0; col < grid->get_cols(); ++col) {
-Index: src/gui/widgets/progress_bar.cpp
-===================================================================
---- src/gui/widgets/progress_bar.cpp	(revision 54624)
-+++ src/gui/widgets/progress_bar.cpp	(revision 54625)
-@@ -23,6 +23,7 @@
- #include "gui/widgets/settings.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- #define LOG_SCOPE_HEADER get_control_type() + " [" + id() + "] " + __func__
- #define LOG_HEADER LOG_SCOPE_HEADER + ':'
-@@ -38,7 +39,7 @@
- 	if(percentage_ != percentage) {
- 		percentage_ = percentage;
- 
--		foreach(tcanvas& c, canvas()) {
-+		BOOST_FOREACH(tcanvas& c, canvas()) {
- 			c.set_variable("percentage", variant(percentage));
- 		}
- 
-Index: src/gui/auxiliary/widget_definition.hpp
-===================================================================
---- src/gui/auxiliary/widget_definition.hpp	(revision 54624)
-+++ src/gui/auxiliary/widget_definition.hpp	(revision 54625)
-@@ -17,9 +17,10 @@
- #define GUI_AUXILIARY_WIDGET_DEFINITION_HPP_INCLUDED
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/canvas.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- /**
-@@ -98,7 +99,7 @@
- 	void load_resolutions(const config &cfg)
- 	{
- 		config::const_child_itors itors = cfg.child_range("resolution");
--		foreach(const config &resolution, itors) {
-+		BOOST_FOREACH(const config &resolution, itors) {
- 			resolutions.push_back(new T(resolution));
- 		}
- 	}
-Index: src/gui/auxiliary/event/dispatcher.cpp
-===================================================================
---- src/gui/auxiliary/event/dispatcher.cpp	(revision 54624)
-+++ src/gui/auxiliary/event/dispatcher.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/event/dispatcher_private.hpp"
- 
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- 
- namespace gui2 {
-Index: src/gui/auxiliary/event/handler.cpp
-===================================================================
---- src/gui/auxiliary/event/handler.cpp	(revision 54624)
-+++ src/gui/auxiliary/event/handler.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/auxiliary/event/handler.hpp"
- 
- #include "clipboard.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/event/dispatcher.hpp"
- #include "gui/auxiliary/timer.hpp"
- #include "gui/auxiliary/log.hpp"
-@@ -28,6 +27,8 @@
- #include "hotkeys.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cassert>
- 
- /**
-@@ -429,7 +430,7 @@
- 	}
- 
- 	/***** Set proper state for the other dispatchers. *****/
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dynamic_cast<twidget&>(*dispatcher).set_dirty();
- 	}
- 
-@@ -448,7 +449,7 @@
- 
- void thandler::activate()
- {
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dispatcher->fire(SDL_ACTIVATE
- 				, dynamic_cast<twidget&>(*dispatcher)
- 				, NULL);
-@@ -472,7 +473,7 @@
- 	 *
- 	 * For now we use a hack, but would be nice to rewrite it for 1.9/1.11.
- 	 */
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		if(!first) {
- 			/*
- 			 * This leaves glitches on window borders if the window beneath it
-@@ -503,7 +504,7 @@
- {
- 	DBG_GUI_E << "Firing: " << SDL_VIDEO_RESIZE << ".\n";
- 
--	foreach(tdispatcher* dispatcher, dispatchers_) {
-+	BOOST_FOREACH(tdispatcher* dispatcher, dispatchers_) {
- 		dispatcher->fire(SDL_VIDEO_RESIZE
- 				, dynamic_cast<twidget&>(*dispatcher)
- 				, new_size);
-Index: src/gui/auxiliary/canvas.cpp
-===================================================================
---- src/gui/auxiliary/canvas.cpp	(revision 54624)
-+++ src/gui/auxiliary/canvas.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "config.hpp"
- #include "../../image.hpp"
--#include "foreach.hpp"
- #include "formatter.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/formula.hpp"
-@@ -33,6 +32,8 @@
- #include "../../text.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace {
-@@ -1455,7 +1456,7 @@
- 	log_scope2(log_gui_parse, "Canvas: parsing config.");
- 	shapes_.clear();
- 
--	foreach(const config::any_child& shape, cfg.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child& shape, cfg.all_children_range()) {
- 		const std::string &type = shape.key;
- 		const config &data = shape.cfg;
- 
-@@ -1474,7 +1475,7 @@
- 		} else if(type == "pre_commit") {
- 
- 			/* note this should get split if more preprocessing is used. */
--			foreach(const config::any_child& function,
-+			BOOST_FOREACH(const config::any_child& function,
- 					data.all_children_range()) {
- 
- 				if(function.key == "blur") {
-Index: src/gui/auxiliary/window_builder.cpp
-===================================================================
---- src/gui/auxiliary/window_builder.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "gui/auxiliary/window_builder_private.hpp"
- 
- #include "asserts.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/window_builder/helper.hpp"
-@@ -43,6 +42,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace gui2 {
- 
-@@ -67,7 +67,7 @@
- 				  std::string
- 				, boost::function<tbuilder_widget_ptr(config)> >
- 			thack;
--	foreach(const thack& item, builder_widget_lookup()) {
-+	BOOST_FOREACH(const thack& item, builder_widget_lookup()) {
- 		if(item.first == "window" || item.first == "tooltip") {
- 			continue;
- 		}
-@@ -153,7 +153,7 @@
- 			, definition->helptip);
- 	assert(window);
- 
--	foreach(const twindow_builder::tresolution::tlinked_group& lg,
-+	BOOST_FOREACH(const twindow_builder::tresolution::tlinked_group& lg,
- 			definition->linked_groups) {
- 
- 		if(window->has_linked_size_group(lg.id)) {
-@@ -238,7 +238,7 @@
- 
- 	config::const_child_itors cfgs = cfg.child_range("resolution");
- 	VALIDATE(cfgs.first != cfgs.second, _("No resolution defined."));
--	foreach (const config &i, cfgs) {
-+	BOOST_FOREACH(const config &i, cfgs) {
- 		resolutions.push_back(tresolution(i));
- 	}
- 
-@@ -386,7 +386,7 @@
- 		definition = "default";
- 	}
- 
--	foreach (const config &lg, cfg.child_range("linked_group")) {
-+	BOOST_FOREACH(const config &lg, cfg.child_range("linked_group")) {
- 		tlinked_group linked_group;
- 		linked_group.id = lg["id"].str();
- 		linked_group.fixed_width = lg["fixed_width"].to_bool();
-@@ -501,13 +501,13 @@
-  */
- 	log_scope2(log_gui_parse, "Window builder: parsing a grid");
- 
--	foreach (const config &row, cfg.child_range("row"))
-+	BOOST_FOREACH(const config &row, cfg.child_range("row"))
- 	{
- 		unsigned col = 0;
- 
- 		row_grow_factor.push_back(row["grow_factor"]);
- 
--		foreach (const config &c, row.child_range("column"))
-+		BOOST_FOREACH(const config &c, row.child_range("column"))
- 		{
- 			flags.push_back(implementation::read_flags(c));
- 			border_size.push_back(c["border_size"]);
-Index: src/gui/auxiliary/tips.cpp
-===================================================================
---- src/gui/auxiliary/tips.cpp	(revision 54624)
-+++ src/gui/auxiliary/tips.cpp	(revision 54625)
-@@ -18,10 +18,11 @@
- #include "gui/auxiliary/tips.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- ttip::ttip(const t_string& text
-@@ -39,7 +40,7 @@
- {
- 	std::vector<ttip> result;
- 
--	foreach(const config &tip, cfg.child_range("tip")) {
-+	BOOST_FOREACH(const config &tip, cfg.child_range("tip")) {
- 		result.push_back(ttip(tip["text"]
- 				, tip["source"]
- 				, tip["encountered_units"]));
-@@ -54,11 +55,11 @@
- 
- 	const std::set<std::string>& units = preferences::encountered_units();
- 
--	foreach(const ttip& tip, tips) {
-+	BOOST_FOREACH(const ttip& tip, tips) {
- 		if(tip.unit_filter_.empty()) {
- 			result.push_back(tip);
- 		} else {
--			foreach(const std::string& unit, tip.unit_filter_) {
-+			BOOST_FOREACH(const std::string& unit, tip.unit_filter_) {
- 				if(units.find(unit) != units.end()) {
- 					result.push_back(tip);
- 					break;
-Index: src/gui/auxiliary/notifier.hpp
-===================================================================
---- src/gui/auxiliary/notifier.hpp	(revision 54624)
-+++ src/gui/auxiliary/notifier.hpp	(revision 54625)
-@@ -16,10 +16,10 @@
- #ifndef GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED
- #define GUI_WIDGETS_AUXILIARY_NOTIFIER_HPP_INCLUDED
- 
--#include "foreach.hpp"
--
- #include "gui/auxiliary/notifiee.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <cassert>
- #include <map>
- 
-@@ -47,7 +47,7 @@
- 	~tnotifier()
- 	{
- 		typedef std::pair<tnotifiee<tfunctor>* const, tfunctor> thack;
--		foreach(thack& item, notifiees_) {
-+		BOOST_FOREACH(thack& item, notifiees_) {
- 			assert(item.first);
- 			assert((*item.first).notifier_ == this);
- 
-Index: src/gui/auxiliary/window_builder/helper.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/helper.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/helper.cpp	(revision 54625)
-@@ -18,11 +18,12 @@
- #include "gui/auxiliary/window_builder/helper.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/grid.hpp"
- #include "gui/widgets/window.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -60,7 +61,7 @@
- unsigned get_border(const std::vector<std::string>& border)
- {
- 	unsigned result = 0;
--	foreach (const std::string& s, border) {
-+	BOOST_FOREACH(const std::string& s, border) {
- 		if (s == "all") {
- 			return tgrid::BORDER_ALL;
- 		} else if (s == "top") {
-Index: src/gui/auxiliary/window_builder/stacked_widget.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/stacked_widget.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/stacked_widget.cpp	(revision 54625)
-@@ -18,13 +18,14 @@
- #include "gui/auxiliary/window_builder/stacked_widget.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/stacked_widget.hpp"
- #include "gui/widgets/stacked_widget.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -35,7 +36,7 @@
- {
- 	const config &s = cfg.child("stack");
- 	VALIDATE(s, _("No stack defined."));
--	foreach(const config &layer, s.child_range("layer")) {
-+	BOOST_FOREACH(const config &layer, s.child_range("layer")) {
- 		stack.push_back(new tbuilder_grid(layer));
- 	}
- }
-Index: src/gui/auxiliary/window_builder/slider.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/slider.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/slider.cpp	(revision 54625)
-@@ -18,12 +18,13 @@
- #include "gui/auxiliary/window_builder/slider.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/widgets/slider.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -44,7 +45,7 @@
- 		return;
- 	}
- 
--	foreach(const config& label, labels.child_range("value")) {
-+	BOOST_FOREACH(const config& label, labels.child_range("value")) {
- 		value_labels_.push_back(label["label"]);
- 	}
- }
-Index: src/gui/auxiliary/window_builder/horizontal_listbox.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/horizontal_listbox.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/horizontal_listbox.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/horizontal_listbox.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/listbox.hpp"
-@@ -29,6 +28,8 @@
- #endif
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -53,12 +54,12 @@
- 	const config &data = cfg.child("list_data");
- 	if (!data) return;
- 
--	foreach(const config &row, data.child_range("row")) {
-+	BOOST_FOREACH(const config &row, data.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config &c, row.child_range("column")) {
-+		BOOST_FOREACH(const config &c, row.child_range("column")) {
- 			list_data.push_back(string_map());
--			foreach (const config::attribute &i, c.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, c.attribute_range()) {
- 				list_data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/listbox.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/listbox.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/listbox.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/listbox.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/listbox.hpp"
-@@ -30,6 +29,8 @@
- #include "gui/widgets/settings.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -66,12 +67,12 @@
- 		return;
- 	}
- 
--	foreach(const config& row, data.child_range("row")) {
-+	BOOST_FOREACH(const config& row, data.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config& c, row.child_range("column")) {
-+		BOOST_FOREACH(const config& c, row.child_range("column")) {
- 			list_data.push_back(string_map());
--			foreach(const config::attribute& i, c.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute& i, c.attribute_range()) {
- 				list_data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/multi_page.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/multi_page.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/multi_page.cpp	(revision 54625)
-@@ -18,13 +18,14 @@
- #include "gui/auxiliary/window_builder/multi_page.hpp"
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/multi_page.hpp"
- #include "gui/widgets/multi_page.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -46,12 +47,12 @@
- 		return;
- 	}
- 
--	foreach(const config &row, d.child_range("row")) {
-+	BOOST_FOREACH(const config &row, d.child_range("row")) {
- 		unsigned col = 0;
- 
--		foreach(const config &column, row.child_range("column")) {
-+		BOOST_FOREACH(const config &column, row.child_range("column")) {
- 			data.push_back(string_map());
--			foreach(const config::attribute &i, column.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, column.attribute_range()) {
- 				data.back()[i.first] = i.second;
- 			}
- 			++col;
-Index: src/gui/auxiliary/window_builder/tree_view.cpp
-===================================================================
---- src/gui/auxiliary/window_builder/tree_view.cpp	(revision 54624)
-+++ src/gui/auxiliary/window_builder/tree_view.cpp	(revision 54625)
-@@ -17,7 +17,6 @@
- 
- #include "gui/auxiliary/window_builder/tree_view.hpp"
- 
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "gui/auxiliary/log.hpp"
- #include "gui/auxiliary/widget_definition/tree_view.hpp"
-@@ -25,6 +24,8 @@
- #include "gui/widgets/tree_view.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace gui2 {
- 
- namespace implementation {
-@@ -39,7 +40,7 @@
- 	, nodes()
- {
- 
--	foreach(const config &node, cfg.child_range("node")) {
-+	BOOST_FOREACH(const config &node, cfg.child_range("node")) {
- 		nodes.push_back(tnode(node));
- 	}
- 
-Index: src/unit_types.cpp
-===================================================================
---- src/unit_types.cpp	(revision 54624)
-+++ src/unit_types.cpp	(revision 54625)
-@@ -22,13 +22,13 @@
- 
- #include "unit_types.hpp"
- 
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "gettext.hpp"
- #include "loadscreen.hpp"
- #include "log.hpp"
- #include "map.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_config("config");
- #define ERR_CF LOG_STREAM(err, log_config)
-@@ -156,7 +156,7 @@
- 		if (config &specials = cfg_.child("specials"))
- 		{
- 			config new_specials;
--			foreach (const config::any_child &vp, specials.all_children_range()) {
-+			BOOST_FOREACH(const config::any_child &vp, specials.all_children_range()) {
- 				std::vector<std::string>::const_iterator found_id =
- 					std::find(dsl.begin(), dsl.end(), vp.cfg["id"]);
- 				if (found_id == dsl.end()) {
-@@ -174,7 +174,7 @@
- 			cfg_.clear_children("specials");
- 		}
- 		config &new_specials = cfg_.child_or_add("specials");
--		foreach (const config::any_child &value, set_specials.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &value, set_specials.all_children_range()) {
- 			new_specials.add_child(value.key, value.cfg);
- 		}
- 	}
-@@ -345,7 +345,7 @@
- 
- 	if (const config &resistance = cfg_.child("resistance"))
- 	{
--		foreach (const config::attribute &i, resistance.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, resistance.attribute_range()) {
- 			res[i.first] = i.second;
- 		}
- 	}
-@@ -666,11 +666,11 @@
- 	movementType_ = unit_movement_type(cfg);
- 	alpha_ = ftofxp(1.0);
- 
--	foreach (const config &t, traits)
-+	BOOST_FOREACH(const config &t, traits)
- 	{
- 		possibleTraits_.add_child("trait", t);
- 	}
--	foreach (config &var_cfg, cfg.child_range("variation"))
-+	BOOST_FOREACH(config &var_cfg, cfg.child_range("variation"))
- 	{
- 		if (var_cfg["inherit"].to_bool()) {
- 			config nvar_cfg(cfg);
-@@ -710,7 +710,7 @@
- 		if (cfg["ignore_race_traits"].to_bool()) {
- 			possibleTraits_.clear();
- 		} else {
--			foreach (const config &t, race_->additional_traits())
-+			BOOST_FOREACH(const config &t, race_->additional_traits())
- 			{
- 				if (alignment_ != NEUTRAL || t["id"] != "fearless")
- 					possibleTraits_.add_child("trait", t);
-@@ -722,7 +722,7 @@
- 	}
- 
- 	// Insert any traits that are just for this unit type
--	foreach (const config &trait, cfg.child_range("trait"))
-+	BOOST_FOREACH(const config &trait, cfg.child_range("trait"))
- 	{
- 		possibleTraits_.add_child("trait", trait);
- 	}
-@@ -750,7 +750,7 @@
- 	game_config::add_color_info(cfg);
- 
- 
--	foreach (const config &portrait, cfg_.child_range("portrait")) {
-+	BOOST_FOREACH(const config &portrait, cfg_.child_range("portrait")) {
- 		portraits_.push_back(tportrait(portrait));
- 	}
- 
-@@ -807,7 +807,7 @@
- 
- 	if (const config &abil_cfg = cfg.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil_cfg.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil_cfg.all_children_range()) {
- 			const config::attribute_value &name = ab.cfg["name"];
- 			if (!name.empty()) {
- 				abilities_.push_back(name.t_str());
-@@ -816,15 +816,15 @@
- 		}
- 	}
- 
--	foreach (const config &adv, cfg.child_range("advancement"))
-+	BOOST_FOREACH(const config &adv, cfg.child_range("advancement"))
- 	{
--		foreach (const config &effect, adv.child_range("effect"))
-+		BOOST_FOREACH(const config &effect, adv.child_range("effect"))
- 		{
- 			const config &abil_cfg = effect.child("abilities");
- 			if (!abil_cfg || effect["apply_to"] != "new_ability") {
- 				continue;
- 			}
--			foreach (const config::any_child &ab, abil_cfg.all_children_range()) {
-+			BOOST_FOREACH(const config::any_child &ab, abil_cfg.all_children_range()) {
- 				const config::attribute_value &name = ab.cfg["name"];
- 				if (!name.empty()) {
- 					adv_abilities_.push_back(name.t_str());
-@@ -934,7 +934,7 @@
- std::vector<attack_type> unit_type::attacks() const
- {
- 	std::vector<attack_type> res;
--	foreach (const config &att, cfg_.child_range("attack")) {
-+	BOOST_FOREACH(const config &att, cfg_.child_range("attack")) {
- 		res.push_back(attack_type(att));
- 	}
- 
-@@ -990,7 +990,7 @@
- {
- 	if (const config &abil = cfg_.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil.all_children_range()) {
- 			if (ab.cfg["id"] == ability)
- 				return true;
- 		}
-@@ -1005,7 +1005,7 @@
- 	const config &abilities = cfg_.child("abilities");
- 	if (!abilities) return res;
- 
--	foreach (const config::any_child &ab, abilities.all_children_range()) {
-+	BOOST_FOREACH(const config::any_child &ab, abilities.all_children_range()) {
- 		const std::string &id = ab.cfg["id"];
- 		if (!id.empty())
- 			res.push_back(id);
-@@ -1077,7 +1077,7 @@
- 	if (!ut)
- 		return;
- 
--	foreach(const std::string& adv, ut->advances_to()) {
-+	BOOST_FOREACH(const std::string& adv, ut->advances_to()) {
- 		if (tree.insert(adv).second) {
- 			// insertion succeed, expand the new type
- 			advancement_tree_internal(adv, tree);
-@@ -1098,9 +1098,9 @@
- 	unit_types.build_all(unit_type::HELP_INDEX);
- 
- 	std::vector<std::string> adv_from;
--	foreach (const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
-+	BOOST_FOREACH(const unit_type_data::unit_type_map::value_type &ut, unit_types.types())
- 	{
--		foreach(const std::string& adv, ut.second.advances_to()) {
-+		BOOST_FOREACH(const std::string& adv, ut.second.advances_to()) {
- 			if (adv == id_)
- 				adv_from.push_back(ut.second.id());
- 		}
-@@ -1127,7 +1127,7 @@
-     clear();
-     set_unit_config(cfg);
- 
--	foreach (const config &mt, cfg.child_range("movetype"))
-+	BOOST_FOREACH(const config &mt, cfg.child_range("movetype"))
- 	{
- 		const unit_movement_type move_type(mt);
- 		movement_types_.insert(
-@@ -1135,14 +1135,14 @@
- 		loadscreen::increment_progress();
- 	}
- 
--	foreach (const config &r, cfg.child_range("race"))
-+	BOOST_FOREACH(const config &r, cfg.child_range("race"))
- 	{
- 		const unit_race race(r);
- 		races_.insert(std::pair<std::string,unit_race>(race.id(),race));
- 		loadscreen::increment_progress();
- 	}
- 
--	foreach (config &ut, cfg.child_range("unit_type"))
-+	BOOST_FOREACH(config &ut, cfg.child_range("unit_type"))
- 	{
- 		std::string id = ut["id"];
- 		if (const config &bu = ut.child("base_unit"))
-@@ -1195,7 +1195,7 @@
- 
- void unit_type_data::check_types(const std::vector<std::string>& types) const
- {
--	foreach(const std::string& type, types) {
-+	BOOST_FOREACH(const std::string& type, types) {
- 		if(!find(type)) throw game::game_error("unknown unit type: " + type);
- 	}
- }
-@@ -1279,7 +1279,7 @@
- 
- 	std::vector<std::string> trees = utils::split(cfg["type_adv_tree"]);
- 	hide_help_type_.back().insert(trees.begin(), trees.end());
--	foreach(const std::string& t_id, trees) {
-+	BOOST_FOREACH(const std::string& t_id, trees) {
- 		unit_type_map::iterator ut = types_.find(t_id);
- 		if (ut != types_.end()) {
- 			std::set<std::string> adv_tree = ut->second.advancement_tree();
-@@ -1310,7 +1310,7 @@
- {
-     const config& cfg = to_unit.get_cfg();
- 
--    foreach (const config &af, cfg.child_range("advancefrom"))
-+    BOOST_FOREACH(const config &af, cfg.child_range("advancefrom"))
-     {
-         const std::string &from = af["unit"];
-         int xp = af["experience"];
-@@ -1349,12 +1349,12 @@
- 	// status gets changed. In the unlikely event it gets changed
- 	// multiple times, we want to try to do it in the same order
- 	// that unit::apply_modifications does things.
--	foreach (const config &mod, possible_traits())
-+	BOOST_FOREACH(const config &mod, possible_traits())
- 	{
- 		if (mod["availability"] != "musthave")
- 			continue;
- 
--		foreach (const config &effect, mod.child_range("effect"))
-+		BOOST_FOREACH(const config &effect, mod.child_range("effect"))
- 		{
- 			// See if the effect only applies to
- 			// certain unit types But don't worry
-Index: src/game_controller.cpp
-===================================================================
---- src/game_controller.cpp	(revision 54624)
-+++ src/game_controller.cpp	(revision 54625)
-@@ -50,6 +50,8 @@
- #include "statistics.hpp"
- #include "wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_CONFIG LOG_STREAM(err, log_config)
- #define WRN_CONFIG LOG_STREAM(warn, log_config)
-@@ -478,7 +480,7 @@
- 	}
- 
- 	int side_num = 1;
--	foreach (config &s, level.child_range("side"))
-+	BOOST_FOREACH(config &s, level.child_range("side"))
- 	{
- 		std::map<int,std::string>::const_iterator type = side_types.find(side_num),
- 		                                          controller = side_controllers.find(side_num),
-@@ -507,7 +509,7 @@
- 				faction_excepts.clear();
- 			}
- 			unsigned j = 0;
--			foreach (const config &faction, era_cfg.child_range("multiplayer_side"))
-+			BOOST_FOREACH(const config &faction, era_cfg.child_range("multiplayer_side"))
- 			{
- 				if (faction["random_faction"].to_bool()) continue;
- 				const std::string &faction_id = faction["id"];
-@@ -673,7 +675,7 @@
- 	}
- 
- 	if(state_.classification().campaign_type == "multiplayer") {
--		foreach (config &side, state_.snapshot.child_range("side"))
-+		BOOST_FOREACH(config &side, state_.snapshot.child_range("side"))
- 		{
- 			if (side["controller"] == "network")
- 				side["controller"] = "human";
-@@ -683,10 +685,10 @@
- 	}
- 
- 	if (load.cancel_orders()) {
--		foreach (config &side, state_.snapshot.child_range("side"))
-+		BOOST_FOREACH(config &side, state_.snapshot.child_range("side"))
- 		{
- 			if (side["controller"] != "human") continue;
--			foreach (config &unit, side.child_range("unit"))
-+			BOOST_FOREACH(config &unit, side.child_range("unit"))
- 			{
- 				unit["goto_x"] = -999;
- 				unit["goto_y"] = -999;
-@@ -710,7 +712,7 @@
- 
- void game_controller::mark_completed_campaigns(std::vector<config> &campaigns)
- {
--	foreach (config &campaign, campaigns) {
-+	BOOST_FOREACH(config &campaign, campaigns) {
- 		campaign["completed"] = preferences::is_campaign_completed(campaign["id"]);
- 	}
- }
-@@ -1218,7 +1220,7 @@
- 		game_config_.splice_children(core_terrain_rules, "terrain_graphics");
- 
- 		config& hashes = game_config_.add_child("multiplayer_hashes");
--		foreach (const config &ch, game_config_.child_range("multiplayer")) {
-+		BOOST_FOREACH(const config &ch, game_config_.child_range("multiplayer")) {
- 			hashes[ch["id"]] = ch.hash();
- 		}
- 
-Index: src/unit.cpp
-===================================================================
---- src/unit.cpp	(revision 54624)
-+++ src/unit.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "unit.hpp"
- 
- #include "callable_objects.hpp"
--#include "foreach.hpp"
- #include "formula.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
-@@ -38,6 +37,7 @@
- #include "side_filter.hpp"
- #include "play_controller.hpp"
- 
-+#include <boost/foreach.hpp>
- static lg::log_domain log_unit("unit");
- #define DBG_UT LOG_STREAM(debug, log_unit)
- #define LOG_UT LOG_STREAM(info, log_unit)
-@@ -288,7 +288,7 @@
- 			filter_recall_ = filter_recall.get_config();
- 
- 		const vconfig::child_list& events = vcfg->get_children("event");
--		foreach(const vconfig& e, events) {
-+		BOOST_FOREACH(const vconfig& e, events) {
- 			events_.add_child("event", e.get_config());
- 		}
- 	}
-@@ -296,7 +296,7 @@
- 	{
- 		filter_recall_ = cfg.child_or_empty("filter_recall");
- 
--		foreach(const config& unit_event, cfg.child_range("event")) {
-+		BOOST_FOREACH(const config& unit_event, cfg.child_range("event")) {
- 			events_.add_child("event", unit_event);
- 		}
- 	}
-@@ -375,7 +375,7 @@
- 			formula_vars_ = new game_logic::map_formula_callable;
- 
- 			variant var;
--			foreach (const config::attribute &i, ai_vars.attribute_range()) {
-+			BOOST_FOREACH(const config::attribute &i, ai_vars.attribute_range()) {
- 				var.serialize_from_string(i.second);
- 				formula_vars_->add(i.first, var);
- 			}
-@@ -432,7 +432,7 @@
- 
- 	if (const config &status_flags = cfg.child("status"))
- 	{
--		foreach (const config::attribute &st, status_flags.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &st, status_flags.attribute_range()) {
- 			if (st.first == "healable") {
- 				///@deprecated 1.9.2 'healable' instead of 'unhealable'
- 				ERR_UT << "Usage of 'healable' is deprecated, use 'unhealable' instead, "
-@@ -449,7 +449,7 @@
- 	}
- 
- 	// Remove animations from private cfg, they're not needed there now
--	foreach(const std::string& tag_name, unit_animation::all_tag_names()) {
-+	BOOST_FOREACH(const std::string& tag_name, unit_animation::all_tag_names()) {
- 		cfg_.clear_children(tag_name);
- 	}
- 
-@@ -518,7 +518,7 @@
- 		"canrecruit", "extra_recruit", "x", "y", "placement",
- 		// Useless attributes created when saving units to WML:
- 		"flag_rgb", "language_name" };
--	foreach (const char *attr, internalized_attrs) {
-+	BOOST_FOREACH(const char *attr, internalized_attrs) {
- 		input_cfg.remove_attribute(attr);
- 		cfg_.remove_attribute(attr);
- 	}
-@@ -526,11 +526,11 @@
- 	static char const *raw_attrs[] = { "description", "halo",
- 		"profile", "small_profile", "upkeep", "usage", "ellipse",
- 		"image", "image_icon", "random_traits", "generate_name" };
--	foreach (const char *attr, raw_attrs) {
-+	BOOST_FOREACH(const char *attr, raw_attrs) {
- 		input_cfg.remove_attribute(attr);
- 	}
- 
--	foreach (const config::attribute &attr, input_cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &attr, input_cfg.attribute_range()) {
- 		if (attr.first == "do_not_list") continue;
- 		WRN_UT << "Unknown attribute '" << attr.first << "' discarded.\n";
- 	}
-@@ -715,12 +715,12 @@
- 	config::const_child_itors current_traits = modifications_.child_range("trait");
- 	std::vector<config> candidate_traits;
- 
--	foreach (const config &t, type->possible_traits())
-+	BOOST_FOREACH(const config &t, type->possible_traits())
- 	{
- 		// Skip the trait if the unit already has it.
- 		const std::string &tid = t["id"];
- 		bool already = false;
--		foreach (const config &mod, current_traits)
-+		BOOST_FOREACH(const config &mod, current_traits)
- 		{
- 			if (mod["id"] == tid) {
- 				already = true;
-@@ -767,7 +767,7 @@
- {
- 	std::vector<std::string> res;
- 
--	foreach (const config &mod, modifications_.child_range("trait"))
-+	BOOST_FOREACH(const config &mod, modifications_.child_range("trait"))
- 	{
- 			std::string const &id = mod["id"];
- 			if (!id.empty())
-@@ -797,7 +797,7 @@
- 	config new_cfg;
- 	static char const *persistent_attrs[] = { "upkeep", "ellipse",
- 		"image", "image_icon", "usage", "random_traits", "generate_name" };
--	foreach (const char *attr, persistent_attrs) {
-+	BOOST_FOREACH(const char *attr, persistent_attrs) {
- 		if (const config::attribute_value *v = old_cfg.get(attr)) {
- 			new_cfg[attr] = *v;
- 		}
-@@ -813,7 +813,7 @@
- 	static char const *unit_type_attrs[] = { "movement", "movement_type",
- 		"die_sound", "flies", "inherit", "variation_name",
- 		"ignore_race_traits", "hide_help" };
--	foreach (const char *attr, unit_type_attrs) {
-+	BOOST_FOREACH(const char *attr, unit_type_attrs) {
- 		new_cfg.remove_attribute(attr);
- 	}
- 
-@@ -1020,7 +1020,7 @@
- const std::vector<std::string> unit::advances_to_translated() const
- {
- 	std::vector<std::string> result;
--	foreach (std::string type_id, advances_to_)
-+	BOOST_FOREACH(std::string type_id, advances_to_)
- 	{
- 		const unit_type *type = unit_types.find(type_id);
- 		if (type)
-@@ -1120,7 +1120,7 @@
- const std::map<std::string,std::string> unit::get_states() const
- {
- 	std::map<std::string, std::string> all_states;
--	foreach (std::string const &s, states_) {
-+	BOOST_FOREACH(std::string const &s, states_) {
- 		all_states[s] = "yes";
- 	}
- 	for (std::map<std::string, state_t>::const_iterator i = known_boolean_state_names_.begin(),
-@@ -1195,7 +1195,7 @@
- {
- 	if (const config &abil = cfg_.child("abilities"))
- 	{
--		foreach (const config::any_child &ab, abil.all_children_range()) {
-+		BOOST_FOREACH(const config::any_child &ab, abil.all_children_range()) {
- 			if (ab.cfg["id"] == ability)
- 				return true;
- 		}
-@@ -2197,7 +2197,7 @@
- 	if (const config &resistance = cfg_.child("resistance"))
- 	{
- 		utils::string_map res;
--		foreach (const config::attribute &i, resistance.attribute_range()) {
-+		BOOST_FOREACH(const config::attribute &i, resistance.attribute_range()) {
- 			res[i.first] = i.second;
- 		}
- 		return res;
-@@ -2222,7 +2222,7 @@
- 	{
- 		std::ostringstream tooltip;
- 		const std::string &image = game_config::images::level;
--		foreach (const std::string &s, advances_to())
-+		BOOST_FOREACH(const std::string &s, advances_to())
- 		{
- 			if (!s.empty())
- 				tooltip << s << '\n';
-@@ -2230,7 +2230,7 @@
- 		temp[image] = tooltip.str();
- 	}
- 
--	foreach (const config &adv, get_modification_advances())
-+	BOOST_FOREACH(const config &adv, get_modification_advances())
- 	{
- 		const std::string &image = adv["image"];
- 		if (image.empty()) continue;
-@@ -2248,7 +2248,7 @@
- 	std::vector<std::pair<std::string,std::string> > temp;
- 	std::pair<std::string,std::string> icon; //<image,tooltip>
- 
--	foreach (const config &adv, get_modification_advances())
-+	BOOST_FOREACH(const config &adv, get_modification_advances())
- 	{
- 		icon.first = adv["icon"].str();
- 		icon.second = adv["description"].str();
-@@ -2265,7 +2265,7 @@
- std::vector<config> unit::get_modification_advances() const
- {
- 	std::vector<config> res;
--	foreach (const config &adv, modification_advancements())
-+	BOOST_FOREACH(const config &adv, modification_advancements())
- 	{
- 		if (adv["strict_amla"].to_bool() && !advances_to_.empty())
- 			continue;
-@@ -2283,7 +2283,7 @@
- 		std::unique_copy(temp.begin(), temp.end(), std::back_inserter(uniq));
- 
- 		bool requirements_done = true;
--		foreach (const std::string &s, uniq)
-+		BOOST_FOREACH(const std::string &s, uniq)
- 		{
- 			int required_num = std::count(temp.begin(), temp.end(), s);
- 			int mod_num = modification_count("advance", s);
-@@ -2302,7 +2302,7 @@
- size_t unit::modification_count(const std::string& type, const std::string& id) const
- {
- 	size_t res = 0;
--	foreach (const config &item, modifications_.child_range(type)) {
-+	BOOST_FOREACH(const config &item, modifications_.child_range(type)) {
- 		if (item["id"] == id) {
- 			++res;
- 		}
-@@ -2314,7 +2314,7 @@
- /** Helper function for add_modifications */
- static void mod_mdr_merge(config& dst, const config& mod, bool delta)
- {
--	foreach (const config::attribute &i, mod.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, mod.attribute_range()) {
- 		int v = 0;
- 		if (delta) v = dst[i.first];
- 		dst[i.first] = v + i.second.to_int();
-@@ -2336,7 +2336,7 @@
- 	}
- 	config last_effect;
- 	std::vector<t_string> effects_description;
--	foreach (const config &effect, mod.child_range("effect"))
-+	BOOST_FOREACH(const config &effect, mod.child_range("effect"))
- 	{
- 		// See if the effect only applies to certain unit types
- 		const std::string &type_filter = effect["unit_type"];
-@@ -2524,7 +2524,7 @@
- 					config &def = cfg_.child_or_add("defense");
- 					if (const config &ap = effect.child("defense")) {
- 						bool replace = effect["replace"].to_bool();
--						foreach (const config::attribute &i, ap.attribute_range()) {
-+						BOOST_FOREACH(const config::attribute &i, ap.attribute_range()) {
- 							int v = i.second.to_int();
- 							config::attribute_value &dst = def[i.first];
- 							if (!replace) {
-@@ -2551,7 +2551,7 @@
- 					config &ab = cfg_.child_or_add("abilities");
- 					if (const config &ab_effect = effect.child("abilities")) {
- 						config to_append;
--						foreach (const config::any_child &ab, ab_effect.all_children_range()) {
-+						BOOST_FOREACH(const config::any_child &ab, ab_effect.all_children_range()) {
- 							if(!has_ability_by_id(ab.cfg["id"])) {
- 								to_append.add_child(ab.key, ab.cfg);
- 							}
-@@ -2560,7 +2560,7 @@
- 					}
- 				} else if (apply_to == "remove_ability") {
- 					if (const config &ab_effect = effect.child("abilities")) {
--						foreach (const config::any_child &ab, ab_effect.all_children_range()) {
-+						BOOST_FOREACH(const config::any_child &ab, ab_effect.all_children_range()) {
- 							remove_ability_by_id(ab.cfg["id"]);
- 						}
- 					}
-@@ -2749,7 +2749,7 @@
- 
- 	for(size_t i = 0; i != NumModificationTypes; ++i) {
- 		const std::string& mod = ModificationTypes[i];
--		foreach (const config &m, modifications_.child_range(mod)) {
-+		BOOST_FOREACH(const config &m, modifications_.child_range(mod)) {
- 			log_scope("add mod");
- 			add_modification(ModificationTypes[i], m, true);
- 		}
-@@ -2779,7 +2779,7 @@
- 	bool is_inv = !get_state(STATE_UNCOVERED) && get_ability_bool(hides,loc);
- 	if(is_inv){
- 		const std::vector<team>& teams = *resources::teams;
--		foreach (const unit &u, *resources::units)
-+		BOOST_FOREACH(const unit &u, *resources::units)
- 		{
- 			const map_location &u_loc = u.get_location();
- 			if (teams[side_-1].is_enemy(u.side()) && tiles_adjacent(loc, u_loc)) {
-@@ -2881,7 +2881,7 @@
- int side_units(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) ++res;
- 	}
- 	return res;
-@@ -2890,7 +2890,7 @@
- int side_units_cost(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) res += u.cost();
- 	}
- 	return res;
-@@ -2899,7 +2899,7 @@
- int side_upkeep(int side)
- {
- 	int res = 0;
--	foreach (const unit &u, *resources::units) {
-+	BOOST_FOREACH(const unit &u, *resources::units) {
- 		if (u.side() == side) res += u.upkeep();
- 	}
- 	return res;
-@@ -3029,7 +3029,7 @@
- const tportrait* unit::portrait(
- 		const unsigned size, const tportrait::tside side) const
- {
--	foreach(const tportrait& portrait, (type()->portraits())) {
-+	BOOST_FOREACH(const tportrait& portrait, (type()->portraits())) {
- 		if(portrait.size == size
- 				&& (side ==  portrait.side || portrait.side == tportrait::BOTH)) {
- 
-@@ -3107,20 +3107,20 @@
-         	"number",
- 		""};
- 
--	foreach (const config &att, unit_config.child_range("attack"))
-+	BOOST_FOREACH(const config &att, unit_config.child_range("attack"))
- 	{
- 		config& child = wcfg.add_child("attack");
- 		for (int i = 0; !attack_keys[i].empty(); ++i) {
- 			child[attack_keys[i]] = att[attack_keys[i]];
- 		}
--		foreach (const config &spec, att.child_range("specials")) {
-+		BOOST_FOREACH(const config &spec, att.child_range("specials")) {
- 			config& child_spec = child.add_child("specials", spec);
- 			child_spec.recursive_clear_value("description");
- 		}
- 
- 	}
- 
--	foreach (const config &abi, unit_config.child_range("abilities"))
-+	BOOST_FOREACH(const config &abi, unit_config.child_range("abilities"))
- 	{
- 		config& child = wcfg.add_child("abilities", abi);
- 		child.recursive_clear_value("description");
-@@ -3129,7 +3129,7 @@
- 		child.recursive_clear_value("name_inactive");
- 	}
- 
--	foreach (const config &trait, unit_config.child_range("trait"))
-+	BOOST_FOREACH(const config &trait, unit_config.child_range("trait"))
- 	{
- 		config& child = wcfg.add_child("trait", trait);
- 		child.recursive_clear_value("description");
-@@ -3142,7 +3142,7 @@
- 
- 	for (int i = 0; !child_keys[i].empty(); ++i)
- 	{
--		foreach (const config &c, unit_config.child_range(child_keys[i])) {
-+		BOOST_FOREACH(const config &c, unit_config.child_range(child_keys[i])) {
- 			wcfg.add_child(child_keys[i], c);
- 		}
- 	}
-Index: src/campaign_server/campaign_server.cpp
-===================================================================
---- src/campaign_server/campaign_server.cpp	(revision 54624)
-+++ src/campaign_server/campaign_server.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
-  */
- 
- #include "filesystem.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "network_worker.hpp"
- #include "serialization/binary_or_text.hpp"
-@@ -35,6 +34,7 @@
- 
- #include <csignal>
- 
-+#include <boost/foreach.hpp>
- #include <boost/iostreams/filter/gzip.hpp>
- 
- // the fork execute is unix specific only tested on Linux quite sure it won't
-@@ -202,7 +202,7 @@
- 
- 	void find_translations(const config& cfg, config& campaign)
- 	{
--		foreach (const config &dir, cfg.child_range("dir"))
-+		BOOST_FOREACH(const config &dir, cfg.child_range("dir"))
- 		{
- 			if (dir["name"] == "LC_MESSAGES") {
- 				config &language = campaign.add_child("translation");
-@@ -249,7 +249,7 @@
- 			LOG_CS << "Encoding all stored addons. Number of addons: "
- 				<< std::distance(camps.first, camps.second) << '\n';
- 
--			foreach (const config &cm, camps)
-+			BOOST_FOREACH(const config &cm, camps)
- 			{
- 				LOG_CS << "Encoding " << cm["name"] << '\n';
- 				std::string filename = cm["filename"], newfilename = filename + ".new";
-@@ -345,7 +345,7 @@
- 						} catch(bad_lexical_cast) {}
- 
- 						std::string name = req["name"], lang = req["language"];
--						foreach (const config &i, campaigns().child_range("campaign"))
-+						BOOST_FOREACH(const config &i, campaigns().child_range("campaign"))
- 						{
- 							if (!name.empty() && name != i["name"]) continue;
- 							std::string tm = i["timestamp"];
-@@ -353,7 +353,7 @@
- 							if (after_flag && (tm.empty() || lexical_cast_default<time_t>(tm, 0) <= after)) continue;
- 							if (!lang.empty()) {
- 								bool found = false;
--								foreach (const config &j, i.child_range("translation")) {
-+								BOOST_FOREACH(const config &j, i.child_range("translation")) {
- 									if (j["language"] == lang) {
- 										found = true;
- 										break;
-@@ -364,7 +364,7 @@
- 							campaign_list.add_child("campaign", i);
- 						}
- 
--						foreach (config &j, campaign_list.child_range("campaign")) {
-+						BOOST_FOREACH(config &j, campaign_list.child_range("campaign")) {
- 							j["passphrase"] = t_string();
- 							j["upload_ip"] = t_string();
- 							j["email"] = t_string();
-@@ -402,7 +402,7 @@
- 						std::string lc_name(name.size(), ' ');
- 						std::transform(name.begin(), name.end(), lc_name.begin(), tolower);
- 						config *campaign = NULL;
--						foreach (config &c, campaigns().child_range("campaign")) {
-+						BOOST_FOREACH(config &c, campaigns().child_range("campaign")) {
- 							if (utils::lowercase(c["name"]) == lc_name) {
- 								campaign = &c;
- 								break;
-Index: src/image_modifications.cpp
-===================================================================
---- src/image_modifications.cpp	(revision 54624)
-+++ src/image_modifications.cpp	(revision 54625)
-@@ -15,13 +15,14 @@
- 
- #include "color_range.hpp"
- #include "config.hpp"
--#include "foreach.hpp"
- #include "game_config.hpp"
- #include "image.hpp"
- #include "image_modifications.hpp"
- #include "log.hpp"
- #include "serialization/string_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- #include <map>
- 
- #define GETTEXT_DOMAIN "wesnoth-lib"
-@@ -99,7 +100,7 @@
- {
- 	modification_queue mods;
- 
--	foreach(const std::string& encoded_mod,
-+	BOOST_FOREACH(const std::string& encoded_mod,
- 		utils::parenthetical_split(encoded_mods, '~')) {
- 		modification* mod = decode_modification(encoded_mod);
- 
-Index: src/statistics.cpp
-===================================================================
---- src/statistics.cpp	(revision 54624)
-+++ src/statistics.cpp	(revision 54625)
-@@ -20,12 +20,13 @@
- 
- #include "global.hpp"
- #include "statistics.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "serialization/binary_or_text.hpp"
- #include "unit.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_engine("engine");
- #define DBG_NG LOG_STREAM(debug, log_engine)
- 
-@@ -57,7 +58,7 @@
- 	team_stats(),
- 	scenario_name(cfg["scenario"])
- {
--	foreach (const config &team, cfg.child_range("team")) {
-+	BOOST_FOREACH(const config &team, cfg.child_range("team")) {
- 		team_stats[team["save_id"]] = stats(team);
- 	}
- }
-@@ -121,7 +122,7 @@
- static stats::str_int_map read_str_int_map(const config& cfg)
- {
- 	stats::str_int_map m;
--	foreach (const config::attribute &i, cfg.attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg.attribute_range()) {
- 		m[i.first] = i.second;
- 	}
- 
-@@ -159,7 +160,7 @@
- static stats::battle_result_map read_battle_result_map(const config& cfg)
- {
- 	stats::battle_result_map m;
--	foreach (const config &i, cfg.child_range("sequence"))
-+	BOOST_FOREACH(const config &i, cfg.child_range("sequence"))
- 	{
- 		config item = i;
- 		int key = item["_num"];
-@@ -612,7 +613,7 @@
- 	fresh_stats();
- 	mid_scenario = cfg["mid_scenario"].to_bool();
- 
--	foreach (const config &s, cfg.child_range("scenario")) {
-+	BOOST_FOREACH(const config &s, cfg.child_range("scenario")) {
- 		master_stats.push_back(scenario_stats(s));
- 	}
- }
-Index: src/tooltips.cpp
-===================================================================
---- src/tooltips.cpp	(revision 54624)
-+++ src/tooltips.cpp	(revision 54625)
-@@ -17,13 +17,14 @@
- #include "tooltips.hpp"
- 
- #include "font.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "help.hpp"
- #include "marked-up_text.hpp"
- #include "resources.hpp"
- #include "video.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- 
- CVideo* video_ = NULL;
-@@ -172,7 +173,7 @@
- 
- bool click(int mousex, int mousey)
- {
--	foreach(tooltip tip, tips) {
-+	BOOST_FOREACH(tooltip tip, tips) {
- 		if(!tip.action.empty() && point_in_rect(mousex, mousey, tip.rect)) {
- 			display* disp = resources::screen;
- 			help::show_help(*disp, tip.action);
-Index: src/server/ban.cpp
-===================================================================
---- src/server/ban.cpp	(revision 54624)
-+++ src/server/ban.cpp	(revision 54625)
-@@ -14,7 +14,6 @@
- */
- 
- #include "config.hpp"
--#include "foreach.hpp"
- #include "log.hpp"
- #include "filesystem.hpp"
- #include "serialization/parser.hpp"
-@@ -24,7 +23,7 @@
- 
- #include "ban.hpp"
- 
--
-+#include <boost/foreach.hpp>
- #include <boost/bind.hpp>
- 
- namespace wesnothd {
-@@ -260,7 +259,7 @@
- 		scoped_istream ban_file = istream_file(filename_);
- 		read_gz(cfg, *ban_file);
- 
--		foreach (const config &b, cfg.child_range("ban"))
-+		BOOST_FOREACH(const config &b, cfg.child_range("ban"))
- 		{
- 			try {
- 				banned_ptr new_ban(new banned(b));
-@@ -276,7 +275,7 @@
- 		// load deleted too
- 		if (const config &cfg_del = cfg.child("deleted"))
- 		{
--			foreach (const config &b, cfg_del.child_range("ban"))
-+			BOOST_FOREACH(const config &b, cfg_del.child_range("ban"))
- 			{
- 				try {
- 					banned_ptr new_ban(new banned(b));
-@@ -680,7 +679,7 @@
- 	void ban_manager::load_config(const config& cfg)
- 	{
- 		ban_times_.clear();
--		foreach (const config &bt, cfg.child_range("ban_time")) {
-+		BOOST_FOREACH(const config &bt, cfg.child_range("ban_time")) {
- 			time_t duration = 0;
- 			if (parse_time(bt["time"], &duration)) {
- 				ban_times_.insert(default_ban_times::value_type(bt["name"], duration));
-Index: src/server/server.cpp
-===================================================================
---- src/server/server.cpp	(revision 54624)
-+++ src/server/server.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- #include "../global.hpp"
- 
- #include "../config.hpp"
--#include "../foreach.hpp"
- #include "../game_config.hpp"
- #include "../log.hpp"
- #include "../map.hpp" // gamemap::MAX_PLAYERS
-@@ -54,6 +53,7 @@
- #include <boost/bind.hpp>
- #include <boost/scoped_ptr.hpp>
- #include <boost/scoped_array.hpp>
-+#include <boost/foreach.hpp>
- #include <boost/utility.hpp>
- #include <algorithm>
- #include <cassert>
-@@ -556,15 +556,15 @@
- 	}
- 
- 	redirected_versions_.clear();
--	foreach (const config &redirect, cfg_.child_range("redirect")) {
--		foreach (const std::string &version, utils::split(redirect["version"])) {
-+	BOOST_FOREACH(const config &redirect, cfg_.child_range("redirect")) {
-+		BOOST_FOREACH(const std::string &version, utils::split(redirect["version"])) {
- 			redirected_versions_[version] = redirect;
- 		}
- 	}
- 
- 	proxy_versions_.clear();
--	foreach (const config &proxy, cfg_.child_range("proxy")) {
--		foreach (const std::string &version, utils::split(proxy["version"])) {
-+	BOOST_FOREACH(const config &proxy, cfg_.child_range("proxy")) {
-+		BOOST_FOREACH(const std::string &version, utils::split(proxy["version"])) {
- 			proxy_versions_[version] = proxy;
- 		}
- 	}
-@@ -704,7 +704,7 @@
- 				simple_wml::document ping( strstr.str().c_str(),
- 							   simple_wml::INIT_COMPRESSED );
- 				simple_wml::string_span s = ping.output_compressed();
--				foreach (network::connection sock, ghost_players_) {
-+				BOOST_FOREACH(network::connection sock, ghost_players_) {
- 					if (!lg::debug.dont_log(log_server)) {
- 						wesnothd::player_map::const_iterator i = players_.find(sock);
- 						if (i != players_.end()) {
-@@ -720,7 +720,7 @@
-  				// Only a single thread should be accessing this
- 				// Erase before we copy - speeds inserts
- 				ghost_players_.clear();
--				foreach (const wesnothd::player_map::value_type v, players_) {
-+				BOOST_FOREACH(const wesnothd::player_map::value_type v, players_) {
- 					ghost_players_.insert(v.first);
- 				}
- 				last_ping_ = now;
-Index: src/server/room_manager.cpp
-===================================================================
---- src/server/room_manager.cpp	(revision 54624)
-+++ src/server/room_manager.cpp	(revision 54625)
-@@ -21,9 +21,10 @@
- #include "../serialization/string_utils.hpp"
- #include "../util.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../log.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_server_lobby("server/lobby");
- #define ERR_LOBBY LOG_STREAM(err, log_server_lobby)
- #define WRN_LOBBY LOG_STREAM(warn, log_server_lobby)
-@@ -58,7 +59,7 @@
- 	// this assumes the server is shutting down, so there's no need to
- 	// send the actual room-quit messages to clients
- 	write_rooms();
--	foreach (t_rooms_by_name_::value_type i, rooms_by_name_) {
-+	BOOST_FOREACH(t_rooms_by_name_::value_type i, rooms_by_name_) {
- 		delete i.second;
- 	}
- }
-@@ -97,7 +98,7 @@
- 			read(cfg, *file);
- 		}
- 
--		foreach (const config &c, cfg.child_range("room")) {
-+		BOOST_FOREACH(const config &c, cfg.child_range("room")) {
- 			room* r(new room(c));
- 			if (room_exists(r->name())) {
- 				ERR_LOBBY << "Duplicate room ignored in stored rooms: "
-@@ -122,7 +123,7 @@
- 	if (filename_.empty()) return;
- 	LOG_LOBBY << "Writing rooms to " << filename_ << "\n";
- 	config cfg;
--	foreach (const t_rooms_by_name_::value_type& v, rooms_by_name_) {
-+	BOOST_FOREACH(const t_rooms_by_name_::value_type& v, rooms_by_name_) {
- 		const room& r = *v.second;
- 		if (r.persistent()) {
- 			config& c = cfg.add_child("room");
-@@ -211,7 +212,7 @@
- 
- void room_manager::enter_lobby(const wesnothd::game &game)
- {
--	foreach (network::connection player, game.all_game_users()) {
-+	BOOST_FOREACH(network::connection player, game.all_game_users()) {
- 		enter_lobby(player);
- 	}
- }
-@@ -225,7 +226,7 @@
- 	store_player_rooms(player);
- 	t_rooms_by_player_::iterator i = rooms_by_player_.find(player);
- 	if (i != rooms_by_player_.end()) {
--		foreach (room* r, i->second) {
-+		BOOST_FOREACH(room* r, i->second) {
- 			r->remove_player(player);
- 		}
- 	}
-@@ -244,7 +245,7 @@
- 	lobby_->remove_player(player);
- 	t_rooms_by_player_::iterator i = rooms_by_player_.find(player);
- 	if (i != rooms_by_player_.end()) {
--		foreach (room* r, i->second) {
-+		BOOST_FOREACH(room* r, i->second) {
- 			r->remove_player(player);
- 		}
- 	}
-@@ -315,7 +316,7 @@
- 	t_player_stored_rooms_::iterator it =
- 		player_stored_rooms_.insert(std::make_pair(player, std::set<std::string>())).first;
- 	std::set<std::string>& store = it->second;
--	foreach (room* r, i->second) {
-+	BOOST_FOREACH(room* r, i->second) {
- 		store.insert(r->name());
- 	}
- }
-@@ -337,7 +338,7 @@
- 	simple_wml::document doc;
- 	simple_wml::node& join_msg = doc.root().add_child("room_join");
- 	join_msg.set_attr_dup("player", user->second.name().c_str());
--	foreach (const std::string& room_name, it->second) {
-+	BOOST_FOREACH(const std::string& room_name, it->second) {
- 		room* r = get_create_room(room_name, user->first);
- 		if (r == NULL) {
- 			LOG_LOBBY << "Player " << user->second.name() << " unable to rejoin room " << room_name << "\n";
-@@ -528,7 +529,7 @@
- void room_manager::fill_room_list(simple_wml::node& root)
- {
- 	simple_wml::node& rooms = root.add_child("rooms");
--	foreach (const t_rooms_by_name_::value_type& tr, rooms_by_name_) {
-+	BOOST_FOREACH(const t_rooms_by_name_::value_type& tr, rooms_by_name_) {
- 		const room& r = *tr.second;
- 		simple_wml::node& room = rooms.add_child("room");
- 		room.set_attr_dup("name", r.name().c_str());
-@@ -539,7 +540,7 @@
- void room_manager::fill_member_list(const room* room, simple_wml::node& root)
- {
- 	simple_wml::node& members = root.add_child("members");
--	foreach (network::connection m, room->members()) {
-+	BOOST_FOREACH(network::connection m, room->members()) {
- 		simple_wml::node& member = members.add_child("member");
- 		player_map::const_iterator mi = all_players_.find(m);
- 		if (mi != all_players_.end()) {
-Index: src/variable.cpp
-===================================================================
---- src/variable.cpp	(revision 54624)
-+++ src/variable.cpp	(revision 54625)
-@@ -24,7 +24,6 @@
- 
- #include "variable.hpp"
- 
--#include "foreach.hpp"
- #include "formula_string_utils.hpp"
- #include "gamestatus.hpp"
- #include "log.hpp"
-@@ -34,6 +33,7 @@
- #include "team.hpp"
- 
- #include <boost/variant.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define LOG_NG LOG_STREAM(info, log_engine)
-@@ -233,11 +233,11 @@
- {
- 	config res;
- 
--	foreach (const config::attribute &i, cfg_->attribute_range()) {
-+	BOOST_FOREACH(const config::attribute &i, cfg_->attribute_range()) {
- 		res[i.first] = expand(i.first);
- 	}
- 
--	foreach (const config::any_child &child, cfg_->all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg_->all_children_range())
- 	{
- 		if (child.key == "insert_tag") {
- 			vconfig insert_cfg(child.cfg);
-@@ -283,7 +283,7 @@
- {
- 	vconfig::child_list res;
- 
--	foreach (const config::any_child &child, cfg_->all_children_range())
-+	BOOST_FOREACH(const config::any_child &child, cfg_->all_children_range())
- 	{
- 		if (child.key == key) {
- 			res.push_back(vconfig(&child.cfg, cache_key_));
-@@ -319,7 +319,7 @@
- 	if (const config &natural = cfg_->child(key)) {
- 		return vconfig(&natural, cache_key_);
- 	}
--	foreach (const config &ins, cfg_->child_range("insert_tag"))
-+	BOOST_FOREACH(const config &ins, cfg_->child_range("insert_tag"))
- 	{
- 		vconfig insert_cfg(ins);
- 		if(insert_cfg["name"] == key) {
-@@ -339,7 +339,7 @@
- 	if (cfg_->child(key)) {
- 		return true;
- 	}
--	foreach (const config &ins, cfg_->child_range("insert_tag"))
-+	BOOST_FOREACH(const config &ins, cfg_->child_range("insert_tag"))
- 	{
- 		vconfig insert_cfg(ins);
- 		if(insert_cfg["name"] == key) {
-@@ -475,7 +475,7 @@
- 
- config &scoped_wml_variable::store(const config &var_value)
- {
--	foreach (const config &i, repos->get_variables().child_range(var_name_)) {
-+	BOOST_FOREACH(const config &i, repos->get_variables().child_range(var_name_)) {
- 		previous_val_.add_child(var_name_, i);
- 	}
- 	repos->clear_variable_cfg(var_name_);
-@@ -489,7 +489,7 @@
- {
- 	if(activated_) {
- 		repos->clear_variable_cfg(var_name_);
--		foreach (const config &i, previous_val_.child_range(var_name_)) {
-+		BOOST_FOREACH(const config &i, previous_val_.child_range(var_name_)) {
- 			repos->add_variable_cfg(var_name_, i);
- 		}
- 		LOG_NG << "scoped_wml_variable: var_name \"" << var_name_ << "\" has been reverted.\n";
-Index: src/preferences_display.cpp
-===================================================================
---- src/preferences_display.cpp	(revision 54624)
-+++ src/preferences_display.cpp	(revision 54625)
-@@ -25,7 +25,6 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
- #include "gui/dialogs/simple_item_selector.hpp"
-@@ -35,6 +34,8 @@
- #include "marked-up_text.hpp"
- #include "wml_separators.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace preferences {
- 
- display* disp = NULL;
-@@ -82,7 +83,7 @@
- 	bpp = video.modePossible(resolution.first, resolution.second,
- 		DefaultBPP, video_flags, true);
- 
--	foreach (const res_t &res, res_list)
-+	BOOST_FOREACH(const res_t &res, res_list)
- 	{
- 		if (bpp != 0) break;
- 		std::cerr << "Video mode " << resolution.first << 'x'
-Index: src/hotkeys.cpp
-===================================================================
---- src/hotkeys.cpp	(revision 54624)
-+++ src/hotkeys.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "construct_dialog.hpp"
- #include "display.hpp"
--#include "foreach.hpp"
- #include "hotkeys.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_preferences.hpp"
-@@ -33,6 +32,8 @@
- #include "wesconfig.h"
- #include "wml_separators.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- static lg::log_domain log_config("config");
- #define ERR_G LOG_STREAM(err, lg::general)
- #define LOG_G LOG_STREAM(info, lg::general)
-@@ -609,7 +610,7 @@
- 
- void load_hotkeys(const config& cfg)
- {
--	foreach (const config &hk, cfg.child_range(hotkey_tag_name))
-+	BOOST_FOREACH(const config &hk, cfg.child_range(hotkey_tag_name))
- 	{
- 		hotkey_item& h = get_hotkey(hk["command"]);
- 		if(h.get_id() != HOTKEY_NULL) {
-Index: src/unit_display.cpp
-===================================================================
---- src/unit_display.cpp	(revision 54624)
-+++ src/unit_display.cpp	(revision 54625)
-@@ -18,7 +18,6 @@
- #include "global.hpp"
- #include "unit_display.hpp"
- 
--#include "foreach.hpp"
- #include "game_preferences.hpp"
- #include "game_events.hpp"
- #include "log.hpp"
-@@ -26,6 +25,7 @@
- #include "resources.hpp"
- #include "terrain_filter.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- #define LOG_DP LOG_STREAM(info, display)
- 
-@@ -472,7 +472,7 @@
- 	disp->display_unit_hex(healed_loc);
- 	unit_animator animator;
- 
--	foreach (unit *h, healers) {
-+	BOOST_FOREACH(unit *h, healers) {
- 		h->set_facing(h->get_location().get_relative_dir(healed_loc));
- 		animator.add_animation(h, "healing", h->get_location(),
- 			healed_loc, healing);
-Index: src/editor/map_fragment.cpp
-===================================================================
---- src/editor/map_fragment.cpp	(revision 54624)
-+++ src/editor/map_fragment.cpp	(revision 54625)
-@@ -16,9 +16,10 @@
- 
- #include "map_fragment.hpp"
- 
--#include "../foreach.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace editor {
- 
- map_fragment::map_fragment()
-@@ -44,7 +45,7 @@
- 
- void map_fragment::add_tiles(const gamemap& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		add_tile(map, loc);
- 	}
- }
-@@ -57,7 +58,7 @@
- std::set<map_location> map_fragment::get_offset_area(const map_location& loc) const
- {
- 	std::set<map_location> result;
--	foreach (const tile_info& i, items_) {
-+	BOOST_FOREACH(const tile_info& i, items_) {
- 		result.insert(i.offset.vector_sum(loc));
- 	}
- 	return result;
-@@ -65,14 +66,14 @@
- 
- void map_fragment::paste_into(gamemap& map, const map_location& loc) const
- {
--	foreach (const tile_info& i, items_) {
-+	BOOST_FOREACH(const tile_info& i, items_) {
- 		map.set_terrain(i.offset.vector_sum(loc), i.terrain);
- 	}
- }
- 
- void map_fragment::shift(const map_location& offset)
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.vector_sum_assign(offset);
- 	}
- }
-@@ -80,7 +81,7 @@
- map_location map_fragment::center_of_mass() const
- {
- 	map_location sum(0, 0);
--	foreach (const tile_info& ti, items_) {
-+	BOOST_FOREACH(const tile_info& ti, items_) {
- 		sum.vector_sum_assign(ti.offset);
- 	}
- 	sum.x /= static_cast<int>(items_.size());
-@@ -92,7 +93,7 @@
- {
- 	shift(center_of_mass().vector_negation());
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		area_.insert(ti.offset);
- 	}
- }
-@@ -100,7 +101,7 @@
- void map_fragment::rotate_60_cw()
- {
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		map_location l(0,0);
- 		int x = ti.offset.x;
- 		int y = ti.offset.y;
-@@ -120,7 +121,7 @@
- void map_fragment::rotate_60_ccw()
- {
- 	area_.clear();
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		map_location l(0,0);
- 		int x = ti.offset.x;
- 		int y = ti.offset.y;
-@@ -139,7 +140,7 @@
- 
- void map_fragment::flip_horizontal()
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.x = -ti.offset.x;
- 	}
- 	center_by_mass();
-@@ -147,7 +148,7 @@
- 
- void map_fragment::flip_vertical()
- {
--	foreach (tile_info& ti, items_) {
-+	BOOST_FOREACH(tile_info& ti, items_) {
- 		ti.offset.y = -ti.offset.y;
- 		if (ti.offset.x % 2) {
- 			ti.offset.y--;
-@@ -166,11 +167,11 @@
- {
- 	std::stringstream ss;
- 	ss << "MF: ";
--	foreach (const tile_info& ti, items_) {
-+	BOOST_FOREACH(const tile_info& ti, items_) {
- 		ss << "(" << ti.offset << ")";
- 	}
- 	ss << " -- ";
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		ss << "(" << loc << ")";
- 	}
- 	return ss.str();
-Index: src/editor/action.cpp
-===================================================================
---- src/editor/action.cpp	(revision 54624)
-+++ src/editor/action.cpp	(revision 54625)
-@@ -21,10 +21,10 @@
- 
- #include "editor/action.hpp"
- #include "editor/map_context.hpp"
--#include "foreach.hpp"
- #include "gettext.hpp"
- #include "util.hpp"
- 
-+#include <boost/foreach.hpp>
- namespace editor {
- 
- int editor_action::next_id_ = 1;
-@@ -75,25 +75,25 @@
- editor_action_chain::editor_action_chain(const editor::editor_action_chain &other)
- 	: editor_action(), actions_()
- {
--	foreach (editor_action* a, other.actions_) {
-+	BOOST_FOREACH(editor_action* a, other.actions_) {
- 		actions_.push_back(a->clone());
- 	}
- }
- editor_action_chain& editor_action_chain::operator=(const editor_action_chain& other)
- {
- 	if (this == &other) return *this;
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		delete a;
- 	}
- 	actions_.clear();
--	foreach (editor_action* a, other.actions_) {
-+	BOOST_FOREACH(editor_action* a, other.actions_) {
- 		actions_.push_back(a->clone());
- 	}
- 	return *this;
- }
- editor_action_chain::~editor_action_chain()
- {
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		delete a;
- 	}
- }
-@@ -103,7 +103,7 @@
- }
- int editor_action_chain::action_count() const {
- 	int count = 0;
--	foreach (const editor_action* a, actions_) {
-+	BOOST_FOREACH(const editor_action* a, actions_) {
- 		if (a) {
- 			count += a->action_count();
- 		}
-@@ -133,7 +133,7 @@
- }
- editor_action_chain* editor_action_chain::perform(map_context& mc) const {
- 	util::unique_ptr<editor_action_chain> undo(new editor_action_chain());
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		if (a != NULL) {
- 			undo->append_action(a->perform(mc));
- 		}
-@@ -143,7 +143,7 @@
- }
- void editor_action_chain::perform_without_undo(map_context& mc) const
- {
--	foreach (editor_action* a, actions_) {
-+	BOOST_FOREACH(editor_action* a, actions_) {
- 		if (a != NULL) {
- 			a->perform_without_undo(mc);
- 		}
-@@ -257,7 +257,7 @@
- }
- void editor_action_select::extend(const editor_map& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		LOG_ED << "Checking " << loc << "\n";
- 		if (map.in_selection(loc)) {
- 			LOG_ED << "Extending by " << loc << "\n";
-@@ -268,7 +268,7 @@
- editor_action* editor_action_select::perform(map_context& mc) const
- {
- 	std::set<map_location> undo_locs;
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		if (!mc.get_map().in_selection(loc)) {
- 			undo_locs.insert(loc);
- 			mc.add_changed_location(loc);
-@@ -279,7 +279,7 @@
- }
- void editor_action_select::perform_without_undo(map_context& mc) const
- {
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		mc.get_map().add_to_selection(loc);
- 		mc.add_changed_location(loc);
- 	}
-@@ -291,7 +291,7 @@
- }
- void editor_action_deselect::extend(const editor_map& map, const std::set<map_location>& locs)
- {
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		LOG_ED << "Checking " << loc << "\n";
- 		if (!map.in_selection(loc)) {
- 			LOG_ED << "Extending by " << loc << "\n";
-@@ -302,7 +302,7 @@
- editor_action* editor_action_deselect::perform(map_context& mc) const
- {
- 	std::set<map_location> undo_locs;
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		if (mc.get_map().in_selection(loc)) {
- 			undo_locs.insert(loc);
- 			mc.add_changed_location(loc);
-@@ -313,7 +313,7 @@
- }
- void editor_action_deselect::perform_without_undo(map_context& mc) const
- {
--	foreach (const map_location& loc, area_) {
-+	BOOST_FOREACH(const map_location& loc, area_) {
- 		mc.get_map().remove_from_selection(loc);
- 		mc.add_changed_location(loc);
- 	}
-Index: src/editor/map_context.cpp
-===================================================================
---- src/editor/map_context.cpp	(revision 54624)
-+++ src/editor/map_context.cpp	(revision 54625)
-@@ -19,7 +19,6 @@
- 
- #include "../display.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../map_exception.hpp"
- #include "../map_label.hpp"
-@@ -28,6 +27,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/regex.hpp>
-+#include <boost/foreach.hpp>
- 
- 
- namespace editor {
-@@ -146,7 +146,7 @@
- 	if (!one_layer_only) {
- 		terrain = map_.get_terrain_info(terrain).terrain_with_default_base();
- 	}
--	foreach (const map_location& loc, locs) {
-+	BOOST_FOREACH(const map_location& loc, locs) {
- 		draw_terrain_actual(terrain, loc, one_layer_only);
- 	}
- }
-@@ -374,7 +374,7 @@
- 
- void map_context::clear_stack(action_stack& stack)
- {
--	foreach (editor_action* a, stack) {
-+	BOOST_FOREACH(editor_action* a, stack) {
- 		delete a;
- 	}
- 	stack.clear();
-Index: src/editor/brush.cpp
-===================================================================
---- src/editor/brush.cpp	(revision 54624)
-+++ src/editor/brush.cpp	(revision 54625)
-@@ -17,9 +17,10 @@
- #include "brush.hpp"
- #include "editor_common.hpp"
- 
--#include "../foreach.hpp"
- #include "../pathutils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace editor {
- 
- /*WIKI
-@@ -74,11 +75,11 @@
- 	if (radius > 0) {
- 		std::vector<map_location> in_radius;
- 		get_tiles_in_radius(map_location(0, 0), radius, in_radius);
--		foreach (map_location& loc, in_radius) {
-+		BOOST_FOREACH(map_location& loc, in_radius) {
- 			add_relative_location(loc.x, loc.y);
- 		}
- 	}
--	foreach (const config &relative, cfg.child_range("relative"))
-+	BOOST_FOREACH(const config &relative, cfg.child_range("relative"))
- 	{
- 		int x = relative["x"];
- 		int y = relative["y"];
-@@ -97,7 +98,7 @@
- std::set<map_location> brush::project(const map_location& hotspot) const
- {
- 	std::set<map_location> result;
--	foreach (const map_location& relative, relative_tiles_) {
-+	BOOST_FOREACH(const map_location& relative, relative_tiles_) {
- 		result.insert(relative.vector_sum(hotspot));
- 	}
- 	return result;
-Index: src/editor/editor_map.cpp
-===================================================================
---- src/editor/editor_map.cpp	(revision 54624)
-+++ src/editor/editor_map.cpp	(revision 54625)
-@@ -20,12 +20,12 @@
- 
- #include "../display.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../map_exception.hpp"
- #include "../map_label.hpp"
- #include "../wml_exception.hpp"
- 
-+#include <boost/foreach.hpp>
- 
- namespace editor {
- 
-@@ -111,7 +111,7 @@
- 			++errors;
- 		}
- 	}
--	foreach (const map_location& loc, selection_) {
-+	BOOST_FOREACH(const map_location& loc, selection_) {
- 		if (!on_board_with_border(loc)) {
- 			ERR_ED << "Off-map tile in selection: " << loc << "\n";
- 		}
-Index: src/editor/editor_palettes.cpp
-===================================================================
---- src/editor/editor_palettes.cpp	(revision 54624)
-+++ src/editor/editor_palettes.cpp	(revision 54625)
-@@ -23,13 +23,14 @@
- #include "editor_common.hpp"
- #include "editor_palettes.hpp"
- 
--#include "../foreach.hpp"
- #include "../gettext.hpp"
- #include "../serialization/string_utils.hpp"
- #include "../sound.hpp"
- #include "../tooltips.hpp"
- #include "../marked-up_text.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace {
- static std::string selected_terrain;
- }
-@@ -84,7 +85,7 @@
- 
- 	// Get the available groups and add them to the structure
- 	std::set<std::string> group_names;
--	foreach (const config &g, cfg.child_range("editor_group"))
-+	BOOST_FOREACH(const config &g, cfg.child_range("editor_group"))
- 	{
- 		if (group_names.find(g["id"]) == group_names.end()) {
- 			terrain_groups_.push_back(terrain_group(g, gui));
-@@ -97,14 +98,14 @@
- 		}
- 	}
- 	std::map<std::string, terrain_group*> id_to_group;
--	foreach (terrain_group& tg, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& tg, terrain_groups_) {
- 		id_to_group.insert(std::make_pair(tg.id, &tg));
- 	}
- 	// The rest of the code assumes this is a valid pointer
- 	assert(checked_group_btn_ != 0);
- 
- 	// add the groups for all terrains to the map
--	foreach (const t_translation::t_terrain& t, terrains_) {
-+	BOOST_FOREACH(const t_translation::t_terrain& t, terrains_) {
- 		const terrain_type& t_info = map().get_terrain_info(t);
- 		DBG_ED << "Palette: processing terrain " << t_info.name()
- 			<< "(editor name: '" << t_info.editor_name() << "') "
-@@ -119,7 +120,7 @@
- 		// add the terrain to the requested groups
- 		const std::vector<std::string>& keys = utils::split(t_info.editor_group());
- 		bool core = false;
--		foreach (const std::string& k, keys) {
-+		BOOST_FOREACH(const std::string& k, keys) {
- 			terrain_map_[k].push_back(t);
- 			nmax_terrains_ = std::max(nmax_terrains_, terrain_map_[k].size());
- 			std::map<std::string, terrain_group*>::iterator i = id_to_group.find(k);
-@@ -380,7 +381,7 @@
- 		scroll_down();
- 	}
- 
--	foreach (terrain_group& g, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& g, terrain_groups_) {
- 		if (g.button.pressed()) {
- 			checked_group_btn_ = &g.button;
- 			set_group(g.id);
-@@ -388,7 +389,7 @@
- 		}
- 	}
- 
--	foreach (terrain_group& g, terrain_groups_) {
-+	BOOST_FOREACH(terrain_group& g, terrain_groups_) {
- 		if (&g.button == checked_group_btn_) {
- 			g.button.set_check(true);
- 		} else {
-Index: src/editor/editor_controller.cpp
-===================================================================
---- src/editor/editor_controller.cpp	(revision 54624)
-+++ src/editor/editor_controller.cpp	(revision 54625)
-@@ -32,7 +32,6 @@
- #include "../clipboard.hpp"
- #include "../filechooser.hpp"
- #include "../filesystem.hpp"
--#include "../foreach.hpp"
- #include "../game_preferences.hpp"
- #include "../gettext.hpp"
- #include "../map_create.hpp"
-@@ -44,6 +43,7 @@
- #include "formula_string_utils.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- namespace {
- static std::vector<std::string> saved_windows_;
-@@ -135,7 +135,7 @@
- 	image::set_color_adjustment(preferences::editor::tod_r(), preferences::editor::tod_g(), preferences::editor::tod_b());
- 	theme& theme = gui().get_theme();
- 	const theme::menu* default_tool_menu = NULL;
--	foreach (const theme::menu& m, theme.menus()) {
-+	BOOST_FOREACH(const theme::menu& m, theme.menus()) {
- 		if (m.get_id() == "draw_button_editor") {
- 			default_tool_menu = &m;
- 			break;
-@@ -173,7 +173,7 @@
- 
- void editor_controller::init_brushes(const config& game_config)
- {
--	foreach (const config &i, game_config.child_range("brush")) {
-+	BOOST_FOREACH(const config &i, game_config.child_range("brush")) {
- 		brushes_.push_back(brush(i));
- 	}
- 	if (brushes_.empty()) {
-@@ -196,7 +196,7 @@
- 		new mouse_action_starting_position(key_)));
- 	mouse_actions_.insert(std::make_pair(hotkey::HOTKEY_EDITOR_PASTE,
- 		new mouse_action_paste(clipboard_, key_)));
--	foreach (const theme::menu& menu, gui().get_theme().menus()) {
-+	BOOST_FOREACH(const theme::menu& menu, gui().get_theme().menus()) {
- 		if (menu.items().size() == 1) {
- 			hotkey::HOTKEY_COMMAND hk = hotkey::get_hotkey(menu.items().front()).get_id();
- 			mouse_action_map::iterator i = mouse_actions_.find(hk);
-@@ -205,7 +205,7 @@
- 			}
- 		}
- 	}
--	foreach (const config &c, game_config.child_range("editor_tool_hint")) {
-+	BOOST_FOREACH(const config &c, game_config.child_range("editor_tool_hint")) {
- 		mouse_action_map::iterator i =
- 			mouse_actions_.find(hotkey::get_hotkey(c["id"]).get_id());
- 		if (i != mouse_actions_.end()) {
-@@ -216,7 +216,7 @@
- 
- void editor_controller::init_map_generators(const config& game_config)
- {
--	foreach (const config &i, game_config.child_range("multiplayer"))
-+	BOOST_FOREACH(const config &i, game_config.child_range("multiplayer"))
- 	{
- 		if (i["map_generation"] == "default") {
- 			const config &generator_cfg = i.child("generator");
-@@ -238,7 +238,7 @@
- 		ERR_ED << "No editor time-of-day defined\n";
- 		return;
- 	}
--	foreach (const config &i, cfg.child_range("time")) {
-+	BOOST_FOREACH(const config &i, cfg.child_range("time")) {
- 		tods_.push_back(time_of_day(i));
- 	}
- }
-@@ -250,7 +250,7 @@
- 		ERR_ED << "No editor music defined\n";
- 		return;
- 	}
--	foreach (const config &i, cfg.child_range("music")) {
-+	BOOST_FOREACH(const config &i, cfg.child_range("music")) {
- 		sound::play_music_config(i);
- 	}
- 	sound::commit_music_changes();
-@@ -265,13 +265,13 @@
- 
- editor_controller::~editor_controller()
- {
--	foreach (const mouse_action_map::value_type a, mouse_actions_) {
-+	BOOST_FOREACH(const mouse_action_map::value_type a, mouse_actions_) {
- 		delete a.second;
- 	}
--	foreach (map_generator* m, map_generators_) {
-+	BOOST_FOREACH(map_generator* m, map_generators_) {
- 		delete m;
- 	}
--	foreach (map_context* mc, map_contexts_) {
-+	BOOST_FOREACH(map_context* mc, map_contexts_) {
- 		delete mc;
- 	}
- }
-@@ -303,7 +303,7 @@
- void editor_controller::quit_confirm(EXIT_STATUS mode)
- {
- 	std::vector<std::string> modified;
--	foreach (map_context* mc, map_contexts_) {
-+	BOOST_FOREACH(map_context* mc, map_contexts_) {
- 		if (mc->modified()) {
- 			if (!mc->get_filename().empty()) {
- 				modified.push_back(mc->get_filename());
-@@ -319,7 +319,7 @@
- 		message = _("Do you really want to quit? Changes in the map since the last save will be lost.");
- 	} else {
- 		message = _("Do you really want to quit? The following maps were modified and all changes since the last save will be lost:");
--		foreach (std::string& str, modified) {
-+		BOOST_FOREACH(std::string& str, modified) {
- 			message += "\n" + str;
- 		}
- 	}
-@@ -342,7 +342,7 @@
- 		map_context* mc = new map_context(editor_map(game_config_, 44, 33, t_translation::GRASS_LAND));
- 		add_map_context(mc);
- 	} else {
--		foreach(const std::string& filename, saved_windows_) {
-+		BOOST_FOREACH(const std::string& filename, saved_windows_) {
- 			map_context* mc = new map_context(game_config_, filename);
- 			add_map_context(mc);
- 		}
-@@ -796,7 +796,7 @@
- 				get_map_context().set_needs_terrain_rebuild(false);
- 				gui().invalidate_all();
- 			} else {
--				foreach (const map_location& loc, changed_locs) {
-+				BOOST_FOREACH(const map_location& loc, changed_locs) {
- 					gui().rebuild_terrain(loc);
- 				}
- 				gui().invalidate(changed_locs);
-@@ -1290,7 +1290,7 @@
- 
- void editor_controller::redraw_toolbar()
- {
--	foreach (mouse_action_map::value_type a, mouse_actions_) {
-+	BOOST_FOREACH(mouse_action_map::value_type a, mouse_actions_) {
- 		if (a.second->toolbar_button() != NULL) {
- 			SDL_Rect r = a.second->toolbar_button()->location(gui().screen_area());
- 			SDL_Rect outline = create_rect(r.x - 2, r.y - 2, r.h + 4, r.w + 4);
-Index: src/formula.cpp
-===================================================================
---- src/formula.cpp	(revision 54624)
-+++ src/formula.cpp	(revision 54625)
-@@ -17,11 +17,12 @@
- #include <set>
- #include <sstream>
- 
--#include "foreach.hpp"
- #include "formula_callable.hpp"
- #include "formula_function.hpp"
- #include "map_utils.hpp"
- 
-+#include <boost/foreach.hpp>
-+
- namespace game_logic
- {
- 
-@@ -117,7 +118,7 @@
- 		std::stringstream s;
- 		s << '[';
- 		bool first_item = true;
--		foreach(expression_ptr a , items_) {
-+		BOOST_FOREACH(expression_ptr a , items_) {
- 			if (!first_item) {
- 				s << ',';
- 			} else {
-@@ -468,7 +469,7 @@
- 		std::stringstream s;
- 		s << "{where:(";
- 		s << body_->str();
--		foreach (const expr_table::value_type &a, *clauses_) {
-+		BOOST_FOREACH(const expr_table::value_type &a, *clauses_) {
- 			s << ", [" << a.first << "] -> ["<< a.second->str()<<"]";
- 		}
- 		s << ")}";
-Index: src/mouse_events.cpp
-===================================================================
---- src/mouse_events.cpp	(revision 54624)
-+++ src/mouse_events.cpp	(revision 54625)
-@@ -21,7 +21,6 @@
- #include "actions.hpp"
- #include "attack_prediction_display.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_end_exceptions.hpp"
- #include "game_events.hpp"
- #include "gettext.hpp"
-@@ -45,6 +44,7 @@
- #include "whiteboard/manager.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_engine("engine");
- #define ERR_NG LOG_STREAM(err, log_engine)
-@@ -1048,7 +1048,7 @@
- 
- 	map_location adj[6];
- 	get_adjacent_tiles(loc, adj);
--	foreach (const map_location &aloc, adj) {
-+	BOOST_FOREACH(const map_location &aloc, adj) {
- 		unit_map::const_iterator i = find_unit(aloc);
- 		if (i != units_.end() && uteam.is_enemy(i->side()))
- 			res.insert(aloc);
-@@ -1063,7 +1063,7 @@
- 
- 	map_location adj[6];
- 	get_adjacent_tiles(u->get_location(), adj);
--	foreach (const map_location &loc, adj)
-+	BOOST_FOREACH(const map_location &loc, adj)
- 	{
- 		if (!map_.on_board(loc)) continue;
- 		unit_map::const_iterator i = units_.find(loc);
-Index: src/multiplayer_connect.cpp
-===================================================================
---- src/multiplayer_connect.cpp	(revision 54624)
-+++ src/multiplayer_connect.cpp	(revision 54625)
-@@ -23,7 +23,6 @@
- 
- #include "ai/configuration.hpp"
- #include "dialogs.hpp"
--#include "foreach.hpp"
- #include "game_display.hpp"
- #include "game_preferences.hpp"
- #include "gettext.hpp"
-@@ -39,6 +38,7 @@
- #include "wml_exception.hpp"
- 
- #include <boost/bind.hpp>
-+#include <boost/foreach.hpp>
- 
- static lg::log_domain log_network("network");
- #define LOG_NW LOG_STREAM(info, log_network)
-@@ -189,7 +189,7 @@
- 		// Hack: if there is a unit which can recruit, use it as a leader.
- 		// Necessary to display leader information when loading saves.
- 		std::string leader_type;
--		foreach (const config &side_unit, cfg.child_range("unit"))
-+		BOOST_FOREACH(const config &side_unit, cfg.child_range("unit"))
- 		{
- 			if (side_unit["canrecruit"].to_bool()) {
- 				leader_type = side_unit["type"].str();
-@@ -539,7 +539,7 @@
- 	std::vector<ai::description*> &ais_list = parent_->ai_algorithms_;
- 	std::vector<std::string> ais;
- 	int i = 0;
--	foreach (const ai::description *desc,  ais_list){
-+	BOOST_FOREACH(const ai::description *desc,  ais_list){
- 		ais.push_back(desc->text);
- 		if (desc->id==ai_algorithm_){
- 			sel = i;
-@@ -557,7 +557,7 @@
- void connect::side::update_faction_combo()
- {
- 	std::vector<std::string> factions;
--	foreach (const config *faction, parent_->era_sides_)
-+	BOOST_FOREACH(const config *faction, parent_->era_sides_)
- 	{
- 		const std::string& name = (*faction)["name"];
- 		const std::string& icon = (*faction)["image"];
-@@ -724,7 +724,7 @@
- 		static char const *attrs[] = { "side", "controller", "id",
- 			"team_name", "user_team_name", "color", "colour", "gold",
- 			"income", "allow_changes" };
--		foreach (const char *attr, attrs) {
-+		BOOST_FOREACH(const char *attr, attrs) {
- 			trimmed.remove_attribute(attr);
- 		}
- 
-@@ -827,8 +827,8 @@
- {
- 	std::map<std::string, config> children;
- 
--	foreach(const std::string& children_to_swap, get_children_to_swap())
--		foreach(const config& child, cfg_.child_range(children_to_swap))
-+	BOOST_FOREACH(const std::string& children_to_swap, get_children_to_swap())
-+		BOOST_FOREACH(const config& child, cfg_.child_range(children_to_swap))
- 			children.insert(std::pair<std::string, config>(children_to_swap, child));
- 
- 	return children;
-@@ -836,12 +836,12 @@
- 
- void connect::side::set_side_children(std::map<std::string, config> children)
- {
--	foreach(const std::string& children_to_remove, get_children_to_swap())
-+	BOOST_FOREACH(const std::string& children_to_remove, get_children_to_swap())
- 		cfg_.clear_children(children_to_remove);
- 
- 	std::pair<std::string, config> child_map;
- 
--	foreach(child_map, children)
-+	BOOST_FOREACH(child_map, children)
- 		cfg_.add_child(child_map.first, child_map.second);
- }
- 
-@@ -920,7 +920,7 @@
- 		// Builds the list of sides eligible for choice (nonrandom factions)
- 		std::vector<int> nonrandom_sides;
- 		int num = -1;
--		foreach (const config *i, parent_->era_sides_)
-+		BOOST_FOREACH(const config *i, parent_->era_sides_)
- 		{
- 			++num;
- 			if (!(*i)["random_faction"].to_bool()) {
-@@ -1524,7 +1524,7 @@
- 	player_types_.push_back(_("Computer Player"));
- 	player_types_.push_back(_("Empty"));
- 
--	foreach (const config *faction, era_sides_) {
-+	BOOST_FOREACH(const config *faction, era_sides_) {
- 		player_factions_.push_back((*faction)["name"]);
- 	}
- 
-@@ -1539,7 +1539,7 @@
- 	// Teams
- 	if(params_.use_map_settings) {
- 		int side_num = 1;
--		foreach (config &side, sides)
-+		BOOST_FOREACH(config &side, sides)
- 		{
- 			config::attribute_value &team_name = side["team_name"];
- 			config::attribute_value &user_team_name = side["user_team_name"];
-@@ -1566,7 +1566,7 @@
- 	} else {
- 		std::vector<std::string> map_team_names;
- 		int _side_num = 1;
--		foreach (config &side, sides)
-+		BOOST_FOREACH(config &side, sides)
- 		{
- 			const std::string side_num = lexical_cast<std::string>(_side_num);
- 			config::attribute_value &team_name = side["team_name"];
-@@ -1599,7 +1599,7 @@
- 
- 	// Populates "sides_" from the level configuration
- 	int index = 0;
--	foreach (const config &s, sides) {
-+	BOOST_FOREACH(const config &s, sides) {
- 		sides_.push_back(side(*this, s, index++));
- 	}
- 	int offset=0;
-@@ -1683,7 +1683,7 @@
- 	else
- 	{
- 		era_sides_.clear();
--		foreach (const config &e, era_cfg.child_range("multiplayer_side")) {
-+		BOOST_FOREACH(const config &e, era_cfg.child_range("multiplayer_side")) {
- 			era_sides_.push_back(&e);
- 		}
- 		level_.add_child("era", era_cfg);
-@@ -1789,7 +1789,7 @@
- 	 * creative in what is used in multiplayer [1] so use a simpler test now.
- 	 * [1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=568029
- 	 */
--	foreach(const side& s, sides_) {
-+	BOOST_FOREACH(const side& s, sides_) {
- 		if(s.get_controller() != CNTR_EMPTY) {
- 			if(s.allow_player()) {
- 				return true;
-
-------------------------------------------------------------------------
diff --git a/community-testing/wesnoth/wesnoth.install b/community-testing/wesnoth/wesnoth.install
deleted file mode 100644
index 4f1e419ae..000000000
--- a/community-testing/wesnoth/wesnoth.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-cat << EOF
-Note:
-==> If you experience sound problems try setting your SDL_AUDIODRIVER environment variable to "dma"
-==> eg. export SDL_AUDIODRIVER="dma" ; wesnoth
-==> If "dma" doesn't work,other options are: dsp,alsa,artsc,esd,nas try to find the right output.
-EOF
-}
diff --git a/community-testing/wesnoth/wesnoth.tmpfiles.conf b/community-testing/wesnoth/wesnoth.tmpfiles.conf
deleted file mode 100644
index 3ec0f6013..000000000
--- a/community-testing/wesnoth/wesnoth.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-D /run/wesnothd 0700 root root -
diff --git a/community-testing/wesnoth/wesnothd.rc.d b/community-testing/wesnoth/wesnothd.rc.d
deleted file mode 100755
index 95e312b7b..000000000
--- a/community-testing/wesnoth/wesnothd.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/wesnothd)
-
-case "$1" in
-  start)
-    stat_busy "Starting Wesnoth Server Daemon"
-    [[ -d /var/run/wesnothd ]] || mkdir /var/run/wesnothd
-    [ -z "$PID" ] && /usr/bin/wesnothd -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=$(pidof -o %PPID /usr/bin/wesnothd)
-      echo $PID > /var/run/wesnotd/pid
-      add_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Wesnoth Server Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon wesnothd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/widelands/6233_6232.diff b/community-testing/widelands/6233_6232.diff
deleted file mode 100644
index f82477607..000000000
--- a/community-testing/widelands/6233_6232.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-=== modified file 'src/graphic/graphic.cc'
---- src/graphic/graphic.cc	2011-11-30 21:38:37 +0000
-+++ src/graphic/graphic.cc	2012-02-19 17:10:12 +0000
-@@ -725,6 +725,18 @@
- 	if (!png_ptr)
- 		throw wexception("Graphic::save_png: could not create png struct");
- 
-+	png_infop info_ptr = png_create_info_struct(png_ptr);
-+	if (!info_ptr) {
-+		png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0));
-+		throw wexception("Graphic::save_png: could not create png info struct");
-+	}
-+
-+	// Set jump for error
-+	if (setjmp(png_jmpbuf(png_ptr))) {
-+		png_destroy_write_struct(&png_ptr, &info_ptr);
-+		throw wexception("Graphic::save_png: Error writing PNG!");
-+	}
-+
- 	//  Set another write function. This is potentially dangerouse because the
- 	//  flush function is internally called by png_write_end(), this will crash
- 	//  on newer libpngs. See here:
-@@ -736,35 +748,14 @@
- 		 sw,
- 		 &Graphic::m_png_write_function, &Graphic::m_png_flush_function);
- 
--	png_infop info_ptr = png_create_info_struct(png_ptr);
--
--	if (!info_ptr) {
--		png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0));
--		throw wexception("Graphic::save_png: could not create png info struct");
--	}
--
--	// Set jump for error
--	if (setjmp(png_jmpbuf(png_ptr))) {
--		png_destroy_write_struct(&png_ptr, &info_ptr);
--		throw wexception("Graphic::save_png: could not set png setjmp");
--	}
--
- 	// Fill info struct
- 	png_set_IHDR
- 		(png_ptr, info_ptr, pix.get_w(), pix.get_h(),
- 		 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
- 		 PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
- 
--	// png_set_strip_16(png_ptr) ;
--
- 	// Start writing
- 	png_write_info(png_ptr, info_ptr);
--
--	// Strip data down
--	png_set_filler(png_ptr, 0, PNG_FILLER_AFTER);
--
--	png_set_packing(png_ptr);
--
- 	{
- 		uint32_t surf_w = pix.get_w();
- 		uint32_t surf_h = pix.get_h();
-
diff --git a/community-testing/widelands/PKGBUILD b/community-testing/widelands/PKGBUILD
deleted file mode 100644
index 81e399102..000000000
--- a/community-testing/widelands/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 78818 2012-10-25 01:48:56Z ebelanger $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <rabyte*gmail>
-
-pkgname=widelands
-pkgver=17
-_realver=build17
-pkgrel=5
-pkgdesc="A realtime strategy game with emphasis on economy and transport"
-arch=('i686' 'x86_64')
-url="http://widelands.org/"
-license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2')
-makedepends=('cmake' 'boost' 'mesa')
-source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2"
-        $pkgname.desktop
-        $pkgname.png
-        $pkgname.sh)
-md5sums=('bdc9bc0aa631af1aa7fb450507611a58'
-         '15820bf099fd6f16251fe70a75c534bb'
-         '3dfda7e9ca76ca00dd98d745d0ceb328'
-         '7cae50aba5ed0cd2cfeea79124637b46')
-
-build() {
-    cd $srcdir/$pkgname-$_realver-src
-
-    sed -i "1 i #include <unistd.h>" src/main.cc
-
-    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=(${depends[@]} 'widelands-data')
-    cd $srcdir/$pkgname-$_realver-src/build/compile
-
-    make DESTDIR="$pkgdir" install
-
-    rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds}
-
-    # Install bin, icon and desktop file
-    #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname
-    #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname
-    install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
-    install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
-}
diff --git a/community-testing/widelands/widelands-0.16-libpng15.patch b/community-testing/widelands/widelands-0.16-libpng15.patch
deleted file mode 100644
index 9f733e7b9..000000000
--- a/community-testing/widelands/widelands-0.16-libpng15.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- src/graphic/SDL_mng.cc
-+++ src/graphic/SDL_mng.cc
-@@ -276,7 +276,7 @@
- 	 * the normal method of doing things with libpng).  REQUIRED unless you
- 	 * set up your own error handlers in png_create_read_struct() earlier.
- 	 */
--	if (setjmp(png_ptr->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 		SDL_SetError("Error reading the PNG file.");
- 		goto done;
- 	}
-@@ -356,9 +356,9 @@
- 			Rmask = 0x000000FF;
- 			Gmask = 0x0000FF00;
- 			Bmask = 0x00FF0000;
--			Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0;
-+			Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0;
- 		} else {
--			int const s = (info_ptr->channels == 4) ? 0 : 8;
-+			int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8;
- 			Rmask = 0xFF000000 >> s;
- 			Gmask = 0x00FF0000 >> s;
- 			Bmask = 0x0000FF00 >> s;
-@@ -369,7 +369,7 @@
- 		SDL_AllocSurface
- 			(SDL_SWSURFACE,
- 			 width, height,
--			 bit_depth * info_ptr->channels,
-+			 bit_depth * png_get_channels(png_ptr, info_ptr),
- 			 Rmask, Gmask, Bmask, Amask);
- 	if (not surface) {
- 		SDL_SetError("Out of memory");
-@@ -407,6 +407,9 @@
- 	/* read rest of file, get additional chunks in info_ptr - REQUIRED */
- 	png_read_end(png_ptr, info_ptr);
- 
-+	png_colorp png_palette;
-+	int png_num_palette;
-+
- 	/* Load the palette, if any */
- 	if ((palette = surface->format->palette)) {
- 		if (color_type == PNG_COLOR_TYPE_GRAY) {
-@@ -416,12 +419,12 @@
- 				palette->colors[i].g = i;
- 				palette->colors[i].b = i;
- 			}
--		} else if (info_ptr->num_palette > 0) {
--			palette->ncolors = info_ptr->num_palette;
--			for (uint32_t i = 0; i < info_ptr->num_palette; ++i) {
--				palette->colors[i].b = info_ptr->palette[i].blue;
--				palette->colors[i].g = info_ptr->palette[i].green;
--				palette->colors[i].r = info_ptr->palette[i].red;
-+		} else if (png_num_palette > 0) {
-+			palette->ncolors = png_num_palette;
-+			for (uint32_t i = 0; i < png_num_palette; ++i) {
-+				palette->colors[i].b = png_palette[i].blue;
-+				palette->colors[i].g = png_palette[i].green;
-+				palette->colors[i].r = png_palette[i].red;
- 			}
- 		}
- 	}
diff --git a/community-testing/widelands/widelands-build15-gcc-4.5-patch b/community-testing/widelands/widelands-build15-gcc-4.5-patch
deleted file mode 100644
index 6ba313358..000000000
--- a/community-testing/widelands/widelands-build15-gcc-4.5-patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc
---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc	2010-04-16 15:41:22.000000000 +0000
-+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc	2010-07-01 21:15:56.000000000 +0000
-@@ -113,7 +113,7 @@
- 		 posx, posy, width, height,
- 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- 		 &Main_Menu_New_Map::button_clicked, *this, 4,
--		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 	posy += height + spacing + spacing + spacing;
- 
-@@ -142,7 +142,7 @@
- 		if (m_currentworld == m_worlds.size())
- 			m_currentworld = 0;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name
- 			 	());
- 		break;
- 	}
-diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc
---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc	2010-04-16 15:41:22.000000000 +0000
-+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc	2010-07-01 21:17:39.000000000 +0000
-@@ -272,7 +272,7 @@
- 		 posx, posy, width, height,
- 		 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
- 		 &Main_Menu_New_Random_Map::button_clicked, *this, 8,
--		 Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+		 Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 	posy += height + spacing + spacing + spacing;
- 
-@@ -343,7 +343,7 @@
- 		if (m_currentworld == m_worlds.size())
- 			m_currentworld = 0;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 		break;
- 	case 9:
- 		break;
-@@ -476,7 +476,7 @@
- 			(strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
- 			++m_currentworld;
- 		m_world->set_title
--			(Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
-+			(Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
- 
- 		button_clicked(-1);  // Update other values in UI as well
- 
diff --git a/community-testing/widelands/widelands.desktop b/community-testing/widelands/widelands.desktop
deleted file mode 100644
index 9715d816c..000000000
--- a/community-testing/widelands/widelands.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Widelands
-GenericName=Widelands
-Comment=Realtime strategy game
-Icon=widelands
-Exec=widelands
-Type=Application
-Categories=Game;StrategyGame;
diff --git a/community-testing/widelands/widelands.png b/community-testing/widelands/widelands.png
deleted file mode 100644
index c329cf667..000000000
--- a/community-testing/widelands/widelands.png
+++ /dev/null
diff --git a/community-testing/widelands/widelands.sh b/community-testing/widelands/widelands.sh
deleted file mode 100644
index 0b21a1694..000000000
--- a/community-testing/widelands/widelands.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/widelands
-./widelands $*
diff --git a/community-testing/wt/PKGBUILD b/community-testing/wt/PKGBUILD
deleted file mode 100644
index 237931b50..000000000
--- a/community-testing/wt/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 73780 2012-07-15 13:21:16Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Denis Martinez <deuns.martinez@gmail.com>
-
-pkgname=wt
-pkgver=3.2.2rc1
-_pkgver=3.2.2-rc1
-pkgrel=1
-pkgdesc="a C++ library and application server for developing and deploying web applications"
-arch=('i686' 'x86_64')
-url="http://www.webtoolkit.eu/"
-license=('GPL')
-depends=('boost-libs>=1.36')
-makedepends=('boost>=1.36' 'cmake>=2.8'
-	     'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'libharu' 'graphicsmagick' 'pango' 'mysql++' 'qt')
-optdepends=('openssl: for SSL support in built-in webserver'
-	    'zlib: for compression in HTTP protocol'
-	    'fcgi: for FastCGI support'
-	    'postgresql-libs: for PostgreSQL Dbo support'
-	    'sqlite: for Sqlite Dbo support'
-	    'libharu: for PDF generation (WPdfImage)'
-	    'graphicsmagick: for raster image support (WRasterImage)'
-	    'pango: for advanced font rendering (WRasterImage)'
-	    'mysql++: for the hangman example'
-	    'qt: for the Wt/Qt interopability example (wtwithqt)')
-backup=('etc/wt/wt_config.xml')
-source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('4709f48c65eceb862da693f122ccca59')
-
-build() {
-  cd ${srcdir}/${pkgname}-${_pkgver}
-  sed -i "s/<< s /<< *s /g" src/Wt/Ext/DataStore.C
-
-  mkdir -p build
-  cd build
-  cmake \
-      -DCONNECTOR_HTTP=ON \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DCMAKE_EXE_LINKER_FLAGS="-lboost_random" \
-      -DWEBUSER=http \
-      -DWEBGROUP=http \
-      -DUSE_SYSTEM_SQLITE3=ON \
-      -DINSTALL_EXAMPLES=ON \
-      ..
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${_pkgver}/build
-  make DESTDIR=${pkgdir} install
-
-  mkdir -p ${pkgdir}/usr/share/cmake-2.8/Modules
-  mv ${pkgdir}/usr/cmake/FindWt.cmake ${pkgdir}/usr/share/cmake-2.8/Modules/
-  rm -r ${pkgdir}/usr/cmake
-  rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/wxgtk2.9/PKGBUILD b/community-testing/wxgtk2.9/PKGBUILD
deleted file mode 100644
index fe95f3850..000000000
--- a/community-testing/wxgtk2.9/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 74023 2012-07-18 04:18:41Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=wxgtk2.9
-pkgver=2.9.4
-pkgrel=1
-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/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch)
-sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1'
-          'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3')
-
-build() {
-  cd "${srcdir}/wxWidgets-${pkgver}"
-  patch -p1 -i ../wxGTK-2.9.4-collision.patch
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --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
-}
-
-package() {
-  cd "${srcdir}/wxWidgets-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-testing/wxgtk2.9/wxGTK-2.9.4-collision.patch b/community-testing/wxgtk2.9/wxGTK-2.9.4-collision.patch
deleted file mode 100644
index 4b1fb395e..000000000
--- a/community-testing/wxgtk2.9/wxGTK-2.9.4-collision.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-admin/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(DYLIB_RPATH_INSTALL)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
-@@ -14964,15 +14964,16 @@ install-wxconfig:
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
--
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
-+	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
- 	for l in $(LOCALE_LINGUAS) ; do \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
-+	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -138,7 +138,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -124,7 +124,6 @@ distclean: clean
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/community-testing/xbmc/ChangeLog b/community-testing/xbmc/ChangeLog
deleted file mode 100644
index 66ae97e3b..000000000
--- a/community-testing/xbmc/ChangeLog
+++ /dev/null
@@ -1,69 +0,0 @@
-2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com>
-	* 9.11-15 :
-	Made it back compliant with FHS ( thx pierre for pointing that out )
-	namcap checked and modified to fit its needs as far as it was possible
-
-2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-10 :
-	Try and fix some autoconf issues (thanks Gentoo ebuild).
-
-2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-9 :
-	Replace some libtool 'ltmain.sh' scripts with the one from libtool 
-	installed with Arch.
-	Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault
-	on systems using the nvidia driver.
-	
-2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-8 :
-	Fix some include's so that gcc 4.3.x is happy, shouldn't complain about
-	undefined '::realloc' anymore.
-	Remove Mac OS X specific files.
-	
-2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-7 :
-	Moved libcdio, pmount, smbclient and unrar to optdepends.
-	Removed unneeded dependency on sdl_gfx.
-	Removed dependency on libpng as sdl_image depends on it.
-
-2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-6 :
-	Added libpng to dependency list.
-	Added gawk to dependency list.
-	Removed '--disable-mms' and '--enable-halmount' configure flags as they
-	are not mentioned as supported in the configure script.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-5 :
-	Added libmad to the dependency list.
-	Streamripper 1.64.0+ does not include tre anymore, removed streamripper
-	and added tre instead.
-	Removed subversion from makedepends.
-	
-2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-4 :
-	Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not
-	fail any longer.
-
-2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-3 :
-	Added lirc to the optdepends array.
-	
-2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-2 :
-	Added install file which informs users that a display depth of at
-	least 24-bit is required.
-
-2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com>
-
-	* 8.10-1 :
-	Initial package, based on previous work by Zeqadious.
diff --git a/community-testing/xbmc/PKGBUILD b/community-testing/xbmc/PKGBUILD
deleted file mode 100644
index df296ecfe..000000000
--- a/community-testing/xbmc/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 78819 2012-10-25 01:49:05Z ebelanger $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-
-_prefix=/usr
-
-pkgname=xbmc
-pkgver=11.0
-pkgrel=10
-pkgdesc="A software media player and entertainment hub for digital media"
-arch=('i686' 'x86_64')
-url="http://xbmc.org"
-license=('GPL' 'custom')
-depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
-	 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate'
-	 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
-	 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
-	 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
-	     'udisks' 'upower' 'bluez' 'mesa')
-optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
-	    'vdpau-video: accelerated video playback for nvidia cards'
-	    'xvba-video: accelerated video playback for amd cards'
-	    'pulseaudio: pulseaudio support'
-	    'lirc: remote controller support'
-	    'udisks: automount external drives'
-	    'upower: used to trigger suspend functionality'
-	    'unrar: access compressed files without unpacking them'
-	    'xorg-xinit: autostart xbmc')
-install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service")
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '395ca1afd3430ad66239bafbffde0eedf9c43409b77f65341ef387f09cd65588')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
-            '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
-
-build() {
-  cd "${srcdir}/xbmc-$pkgver"
-
-  # fix lsb_release dependency
-  sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
-
-  # Bootstrapping XBMC
-  ./bootstrap
-
-  # Configuring XBMC
-  export PYTHON_VERSION=2  # external python v2
-  ./configure --prefix=$_prefix --exec-prefix=$_prefix \
-    --disable-debug \
-    --enable-optimizations \
-    --enable-gl \
-    --enable-sdl \
-    --enable-vaapi \
-    --enable-vdpau \
-    --enable-xvba \
-    --enable-joystick \
-    --enable-xrandr \
-    --enable-rsxs \
-    --enable-projectm \
-    --enable-x11 \
-    --enable-pulse \
-    --enable-rtmp \
-    --enable-samba \
-    --enable-nfs \
-    --enable-afpclient \
-    --enable-airplay \
-    --enable-airtunes \
-    --enable-ffmpeg-libvorbis \
-    --enable-dvdcss \
-    --disable-hal \
-    --enable-avahi \
-    --enable-webserver \
-    --enable-optical-drive \
-    --enable-libbluray \
-    --enable-texturepacker \
-    --enable-udev \
-    --enable-libusb \
-    --enable-libcec \
-    --enable-external-libraries \
-    --disable-external-ffmpeg
-  # Now (finally) build
-  make
-}
-
-package() {
-  cd "${srcdir}/xbmc-$pkgver"
-  # Running make install
-  make DESTDIR="${pkgdir}" install
-
-  # run feh with python2
-  sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc
-
-  # lsb_release fix
-  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
-  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
-
-  # Tools
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
-
-  # Licenses
-  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  for licensef in LICENSE.GPL copying.txt; do
-    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  done
-
-  # systemd stuff
-  install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-}
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/xbmc/xbmc.install b/community-testing/xbmc/xbmc.install
deleted file mode 100644
index a3ae3d0d8..000000000
--- a/community-testing/xbmc/xbmc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
-  groupadd xbmc
-  useradd -G xbmc -d /var/empty xbmc
-}
-
-post_upgrade() {
-  post_install $1
-  echo "You may want to add xbmc user and group to use xbmc standalone"
-}
-
-post_remove() {
-  post_install $1
-  echo "You may want to remove xbmc user and group"
-}
diff --git a/community-testing/xbmc/xbmc.service b/community-testing/xbmc/xbmc.service
deleted file mode 100644
index b66e35c80..000000000
--- a/community-testing/xbmc/xbmc.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description = Starts instance of XBMC using xinit
-After = remote-fs.target
-
-[Service]
-User = xbmc
-Group = xbmc
-Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0
-Restart = on-failure
-
-[Install]
-WantedBy = multi-user.target
diff --git a/community-testing/xlockmore/LICENSE b/community-testing/xlockmore/LICENSE
deleted file mode 100644
index f0b9aa9c6..000000000
--- a/community-testing/xlockmore/LICENSE
+++ /dev/null
@@ -1,18 +0,0 @@
-/*-
- * xscreensaver compatibility layer for xlockmore modules.
- * xscreensaver, Copyright (c) 1997, 1998 Jamie Zawinski <jwz@jwz.org>
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation.  No representations are made about the suitability of this
- * software for any purpose.  It is provided "as is" without express or
- * implied warranty.
- *
- * This file, along with xlockmore.h, make it possible to compile an xlockmore
- * module into a standalone program, and thus use it with xscreensaver.
- * By Jamie Zawinski <jwz@jwz.org> on 10-May-97; based on the ideas
- * in the older xlock.h by Charles Hannum <mycroft@ai.mit.edu>.  (I had
- * to redo it, since xlockmore has diverged so far from xlock...)
- */
diff --git a/community-testing/xlockmore/PKGBUILD b/community-testing/xlockmore/PKGBUILD
deleted file mode 100644
index fc3d8b336..000000000
--- a/community-testing/xlockmore/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 77304 2012-10-08 15:13:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: dorphell <dorphell@archlinux.org>
-
-pkgname=xlockmore
-pkgver=5.40
-pkgrel=2
-pkgdesc="screen saver / locker for the X Window System"
-arch=(i686 x86_64)
-license=('BSD')
-depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu glu)
-url="http://www.tux.org/~bagleyd/xlockmore.html"
-options=('!makeflags')
-source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2
-	LICENSE)
-md5sums=('47a8e16c485da7b0ebfa3f3e43300189'
-         'a64afab4283f53972a6702c2e59850d7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-setuid \
-	      --enable-appdefaultdir=/usr/share/X11/app-defaults \
-	      --enable-pam --with-gtk2 --without-esound --without-ftgl
-  make
-  make xapploaddir=$pkgdir/usr/share/X11/app-defaults \
-       mandir=$pkgdir/usr/man/man1 \
-       prefix=$pkgdir/usr install
-  install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  mv $pkgdir/usr/man $pkgdir/usr/share/
-}
diff --git a/community-testing/xmms2/PKGBUILD b/community-testing/xmms2/PKGBUILD
deleted file mode 100644
index 3e8493bbf..000000000
--- a/community-testing/xmms2/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 73341 2012-07-06 15:24:10Z ibiru $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=xmms2
-pkgver=0.8DrO_o
-pkgrel=7
-pkgdesc="complete rewrite of the popular music player"
-arch=('i686' 'x86_64')
-url="http://xmms2.org/"
-license=('LGPL')
-backup=('etc/conf.d/xmms2d.conf')
-depends=('sqlite' 'libmad')
-makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib'
-	'jack' 'libao' 'libmms' 'libmpcdec' 'libofa' 'libsamplerate' 'libshout'
-	'libvorbis' 'libxml2' 'mpg123' 'oss' 'perl' 'pulseaudio' 'pyrex'
-	'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi')
-optdepends=('alsa-lib: ALSA audio output'
-	    'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
-	    'boost: C++ language bindings'
-	    'curl: play HTTP streams'
-	    'faad2: AAC support'
-	    'ffmpeg: WMA, avcodec & avformat support'
-	    'fftw: calculations for visualization'
-	    'flac: FLAC support'
-	    'jack: JACK audio output'
-	    'libao: liboa audio output'
-	    'libgme: game-music-emu support'
-	    'libofa: MusicDNS fingerprinting'
-	    'libmms: play MMS streams'
-	    'libmodplug: to play MOD files'
-	    'libmpcdec: Musepack support'
-	    'libsamplerate: vocoder support'
-	    'libshout: Icecast audio output'
-	    'libvorbis: Ogg Vorbis support'
-	    'libxml2: XSPF and podcast support'
-	    'mpg123: alternative MP3 plugin'
-	    'oss: OSS audio output'
-	    'perl: Perl language bindings'
-	    'pulseaudio: PulseAudio audio output'
-	    'pyrex: Python language bindings'
-	    'ruby: Ruby language bindings'
-	    'smbclient: direct CIFS/SMB access'
-	    'speex: Speex support'
-	    'wavpack: WavPack support')
-#	    'sidplay: to play a Commodore 64 music files AKA zaks'
-# we do not have sidplay 2 series in repos; also it's
-# somehow connected with resid i guess(not in repos also)
-conflicts=('xmms2-devel')
-install=xmms2.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-	xmms2d.conf
-	xmms2d.rc
-    'ffmpeg-0.11.diff')
-md5sums=('84d5c05a70bfd31ed392a4e3f701eaa3'
-         'af13c937bf3c86b77ae6820107aab9b8'
-         '9d8e3e1a434f271423bdd228a1e9bd7c'
-         'e176971ef96807f72fa8fc17d260c20a')
-
-build() {
-  cd xmms2-${pkgver}/src/plugins/avcodec/
-  # remove call to avcodec_init
-  # http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=3211932c513338566b31d990d06957e15a644d13
-  patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff
-
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # python2 fix
-#  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' waf
-
-  ./waf configure --prefix=/usr \
-	--with-optionals=python,launcher,xmmsclient++,xmmsclient++-glib,perl,ruby,nycli,pixmaps,et,mdns,medialib-updater \
-	--with-ruby-archdir=`ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]'` \
-	--with-ruby-libdir=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'`
-  ./waf build
-  ./waf --destdir=${pkgdir} install
-
-  PYTHON=/usr/bin/python2 ./waf configure --prefix=/usr --with-optionals=python --without-xmms2d
-  ./waf build
-  ./waf --destdir=${pkgdir} install
-
-  install -D -m 0755 ../xmms2d.rc ${pkgdir}/etc/rc.d/xmms2d
-  install -D -m 0644 ../xmms2d.conf ${pkgdir}/etc/conf.d/xmms2d.conf
-}
diff --git a/community-testing/xmms2/ffmpeg-0.11.diff b/community-testing/xmms2/ffmpeg-0.11.diff
deleted file mode 100644
index 91d3a3106..000000000
--- a/community-testing/xmms2/ffmpeg-0.11.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- avcodec.c.orig	2012-06-07 15:08:23.796225671 -0500
-+++ avcodec.c	2012-06-07 15:08:36.649489373 -0500
-@@ -134,7 +134,6 @@
- 
- 	xmms_xform_private_data_set (xform, data);
- 
--	avcodec_init ();
- 	avcodec_register_all ();
- 
- 	mimetype = xmms_xform_indata_get_str (xform,
diff --git a/community-testing/xmms2/vorbis-albumart.patch b/community-testing/xmms2/vorbis-albumart.patch
deleted file mode 100644
index de4305f6f..000000000
--- a/community-testing/xmms2/vorbis-albumart.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From f38882beb1c9b4f3e3c63ac7d65603ad5917cd9d Mon Sep 17 00:00:00 2001
-From: Brad Jorsch <anomie@users.sourceforge.net>
-Date: Tue, 09 Mar 2010 15:41:33 +0000
-Subject: OTHER: Add support for METADATA_BLOCK_PICTURE in Vorbis plugin
-
-Bug-Debian: http://bugs.debian.org/565479
----
-diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c
-index c1f4ef9..fc4ff1b 100644
---- a/src/plugins/vorbis_common/common.c
-+++ b/src/plugins/vorbis_common/common.c
-@@ -243,6 +243,74 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc)
- 	}
- }
- 
-+static void
-+handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+{
-+	guint32 typ, mime_len, desc_len, img_len;
-+	guchar *pos, *end, *mime_data, *img_data;
-+	gchar hash[33];
-+
-+	pos = value;
-+	end = value + len;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	typ = GUINT32_FROM_BE (*(guint32 *)pos);
-+	if (typ != 0 && typ != 3) {
-+		XMMS_DBG ("Picture type %d not handled", typ);
-+		return;
-+	}
-+	pos += 4;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	mime_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	mime_data = pos;
-+	pos += mime_len;
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	desc_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	pos += desc_len;
-+
-+	pos += 4; /* width */
-+	pos += 4; /* height */
-+	pos += 4; /* depth */
-+	pos += 4; /* indexed palette length */
-+
-+	if (pos + 4 > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+	img_len = GUINT32_FROM_BE (*(guint32 *)pos);
-+	pos += 4;
-+	img_data = pos;
-+
-+	if (img_data + img_len > end) {
-+		XMMS_DBG ("Malformed picture comment");
-+		return;
-+	}
-+
-+	if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+		const gchar *metakey;
-+
-+		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-+		xmms_xform_metadata_set_str (xform, metakey, hash);
-+
-+		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
-+		mime_data[mime_len] = '\0';
-+		xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+	}
-+}
-+
- /* note that "key" is NOT NUL-terminated here,
-  * but "value" is.
-  */
-@@ -253,6 +321,14 @@ handle_comment (xmms_xform_t *xform,
- {
- 	gint i;
- 
-+	if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
-+		gsize dlen;
-+		gchar *dvalue = g_base64_decode (value, &dlen);
-+		handle_image_comment (xform, dvalue, dlen);
-+		g_free (dvalue);
-+		return;
-+	}
-+
- 	for (i = 0; i < G_N_ELEMENTS (properties); i++) {
- 		if (key_len != strlen (properties[i].vname))
- 			continue;
---
-cgit v0.8.3.4
-
-
-From d8273630bd92ecea581240ae93c6795cc538d076 Mon Sep 17 00:00:00 2001
-From: Erik Massop <e.massop@hccnet.nl>
-Date: Tue, 09 Mar 2010 15:45:03 +0000
-Subject: OTHER: Add Brad Jorsch to AUTHORS, disable Vorbis albumart for glib < 2.12
-
-(Name found using e-mail address at http://sourceforge.net/users/anomie )
----
-diff --git a/AUTHORS b/AUTHORS
-index f2ef9af..7331d4b 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -146,6 +146,10 @@ N: Johannes Jordan
- E: ypnos@lanrules.de
- D: Visualization
- 
-+N: Brad Jorsch
-+E: anomie@users.sourceforge.net
-+D: Support for front picture from Vorbis.
-+
- N: Daniel Kamiński
- E: maniel.rulez@gmail.com
- D: mlib remove command in cli, Ruby fixes.
-diff --git a/src/plugins/vorbis_common/common.c b/src/plugins/vorbis_common/common.c
-index fc4ff1b..ab1dc75 100644
---- a/src/plugins/vorbis_common/common.c
-+++ b/src/plugins/vorbis_common/common.c
-@@ -27,6 +27,7 @@
- #include "xmms/xmms_sample.h"
- #include "xmms/xmms_log.h"
- #include "xmms/xmms_medialib.h"
-+#include "xmms/xmms_bindata.h"
- 
- #include <glib.h>
- 
-@@ -244,12 +245,22 @@ get_replaygain (xmms_xform_t *xform, vorbis_comment *vc)
- }
- 
- static void
--handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
-+handle_image_comment (xmms_xform_t *xform, const gchar *encoded_value)
- {
-+	gsize len;
-+	guchar *value;
-+
- 	guint32 typ, mime_len, desc_len, img_len;
- 	guchar *pos, *end, *mime_data, *img_data;
- 	gchar hash[33];
- 
-+#if GLIB_CHECK_VERSION(2,12,0)
-+	value = g_base64_decode (encoded_value, &len);
-+#else
-+	/* TODO: Implement/backport base64 decoding */
-+	return;
-+#endif
-+
- 	pos = value;
- 	end = value + len;
- 
-@@ -299,7 +310,7 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
- 		return;
- 	}
- 
--	if (xmms_bindata_plugin_add ((const guchar *)img_data, img_len, hash)) {
-+	if (xmms_bindata_plugin_add (img_data, img_len, hash)) {
- 		const gchar *metakey;
- 
- 		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT;
-@@ -307,8 +318,10 @@ handle_image_comment (xmms_xform_t *xform, const gchar *value, gsize len)
- 
- 		metakey = XMMS_MEDIALIB_ENTRY_PROPERTY_PICTURE_FRONT_MIME;
- 		mime_data[mime_len] = '\0';
--		xmms_xform_metadata_set_str (xform, metakey, mime_data);
-+		xmms_xform_metadata_set_str (xform, metakey, (gchar *)mime_data);
- 	}
-+
-+	g_free (value);
- }
- 
- /* note that "key" is NOT NUL-terminated here,
-@@ -322,10 +335,7 @@ handle_comment (xmms_xform_t *xform,
- 	gint i;
- 
- 	if (!g_ascii_strncasecmp (key, "METADATA_BLOCK_PICTURE", key_len)) {
--		gsize dlen;
--		gchar *dvalue = g_base64_decode (value, &dlen);
--		handle_image_comment (xform, dvalue, dlen);
--		g_free (dvalue);
-+		handle_image_comment (xform, value);
- 		return;
- 	}
- 
---
-cgit v0.8.3.4
-
-
diff --git a/community-testing/xmms2/xmms2-helpers.patch b/community-testing/xmms2/xmms2-helpers.patch
deleted file mode 100644
index f6e6aa49e..000000000
--- a/community-testing/xmms2/xmms2-helpers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -wbBur xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.5DrLecter/src/include/xmmsclient/xmmsclient++/helpers.h	2008-06-15 21:31:38.000000000 +0400
-+++ xmms2-0.5DrLecter.my/src/include/xmmsclient/xmmsclient++/helpers.h	2008-06-18 14:22:24.000000000 +0400
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
- 
-
diff --git a/community-testing/xmms2/xmms2-ruby-1.9.patch b/community-testing/xmms2/xmms2-ruby-1.9.patch
deleted file mode 100644
index 6316ace61..000000000
--- a/community-testing/xmms2/xmms2-ruby-1.9.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c	2009-09-14 09:13:19.000000000 +0000
-@@ -241,10 +241,10 @@
- 	COLL_METHOD_HANDLER_HEADER
- 
- 	rb_ary = RARRAY (ids);
--	ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1));
-+	ary = malloc (sizeof (unsigned int *) * (RARRAYLEN(rb_ary) + 1));
- 
--	for (i = 0; i < rb_ary->len; i++)
--		ary[i] = NUM2UINT (rb_ary->ptr[i]);
-+	for (i = 0; i < RARRAYLEN(rb_ary); i++)
-+		ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]);
- 
- 	ary[i] = 0;
- 
-diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c	2009-09-14 09:14:51.000000000 +0000
-@@ -1421,10 +1421,10 @@
- 	if (!NIL_P (rb_check_array_type (value))) {
- 		struct RArray *ary = RARRAY (value);
- 
--		ret = malloc (sizeof (char *) * (ary->len + 1));
-+		ret = malloc (sizeof (char *) * (RARRAYLEN(ary) + 1));
- 
--		for (i = 0; i < ary->len; i++)
--			ret[i] = StringValuePtr (ary->ptr[i]);
-+		for (i = 0; i < RARRAYLEN(ary); i++)
-+			ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]);
- 
- 		ret[i] = NULL;
- 	} else {
-@@ -1451,10 +1451,10 @@
- 		struct RArray *ary = RARRAY (value);
- 		int i;
- 
--		for (i = 0; i < ary->len; i++) {
-+		for (i = 0; i < RARRAYLEN(ary); i++) {
- 			xmmsv_t *elem;
- 
--			elem = xmmsv_new_string (StringValuePtr (ary->ptr[i]));
-+			elem = xmmsv_new_string (StringValuePtr (RARRAY_PTR(ary)[i]));
- 			xmmsv_list_append (list, elem);
- 			xmmsv_unref (elem);
- 		}
-diff -wbBur xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h
---- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h	2009-04-21 17:51:11.000000000 +0000
-+++ xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h	2009-09-14 09:00:11.000000000 +0000
-@@ -33,6 +33,8 @@
- #include <list>
- #include <vector>
- 
-+#include <linux/limits.h>
-+
- namespace Xmms
- {
- 
diff --git a/community-testing/xmms2/xmms2.install b/community-testing/xmms2/xmms2.install
deleted file mode 100644
index 2205a3492..000000000
--- a/community-testing/xmms2/xmms2.install
+++ /dev/null
@@ -1,3 +0,0 @@
-pre_install() {
-  echo "-- DO NOT FORGET edit /etc/conf.d/xmms2.conf!"
-}
diff --git a/community-testing/xmms2/xmms2d.conf b/community-testing/xmms2/xmms2d.conf
deleted file mode 100644
index c8304fe1d..000000000
--- a/community-testing/xmms2/xmms2d.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# xmms2-launcher cmdline parameters
-#
-XMMS2_PARAMETERS=""
-
-#
-# xmms2 user
-# You may want to add user to run xmms or use your username
-#
-XMMS2_USER="xmms2user"
-
-#
-# If you set XMMS2_USER to a different user than the one who will be controlling
-# xmms2d using xmms2 clients, make sure that the clients are aware of the path to
-# xmms2d's IPC socket, or they might not be able to connect. On failure to connect
-# some clients will try to run xmms2d themselves. These xmms2d instances will of
-# course run as the user running the client, and not as the one configured below.
-#
-# If an IPC path is specified on the command line to xmms2d (using
-# XMMS2_PARAMETERS="-i tcp://127.0.0.1:9667"
-# for instance) that will be used. If not, xmms2d will use the path from its
-# configuration file which is typically in ~/.config/xmms2/xmms2.conf. If this
-# fails, a unix socket at /tmp/xmms-ipc-[username] will be used, where username
-# is of the user starting xmms2d.
-#
-# Clients typically try to get the ipc path from the XMMS_PATH environment variable,
-# (which might be set by adding say 'export XMMS_PATH="tcp://127.0.0.1:9667"' to
-# ~/.profile). If this fails they can check their configuration file (if they have
-# one) and finally use unix:///tmp/xmms-ipc-[username], where username is of the user
-# starting the client. Upon failing to connect some will try to start xmms2d themselves.
-#
diff --git a/community-testing/xmms2/xmms2d.rc b/community-testing/xmms2/xmms2d.rc
deleted file mode 100644
index 9d4d2b7e9..000000000
--- a/community-testing/xmms2/xmms2d.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/conf.d/xmms2d.conf
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof xmms2d xmms2-et`
-case "$1" in
-  start)
-    stat_busy "Starting xmms2d"
-    [ -z "$PID" ] && su -c '/usr/bin/xmms2-launcher $XMMS2_PARAMETERS 1>/dev/null 2>/dev/null' - $XMMS2_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xmms2d
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping xmms2d"
-    [ ! -z "$PID" ] && su -c '/usr/bin/xmms2 quit &>/dev/null' - $XMMS2_USER
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      for i in `seq 1 10`; do
-        [ -d /proc/$PID ] || { stat_done; rm_daemon xmms2d; exit 0; }
-        sleep 1
-      done
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
deleted file mode 100644
index d4508c916..000000000
--- a/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001
-From: Thomas Dziedzic <gostrc@gmail.com>
-Date: Wed, 3 Oct 2012 06:51:21 -0700
-Subject: [PATCH] Update usage of catch to catchIOError since catch has been
- removed from System.IO.Error in ghc 7.6.1
-
----
- src/Plugins/Monitors/Bright.hs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs
-index 499e5bc..b5ec4c0 100644
---- a/src/Plugins/Monitors/Bright.hs
-+++ b/src/Plugins/Monitors/Bright.hs
-@@ -20,6 +20,7 @@ import Data.Char
- import System.FilePath ((</>))
- import System.Posix.Files (fileExist)
- import System.Console.GetOpt
-+import System.IO.Error (catchIOError)
- 
- data BrightOpts = BrightOpts
- 	{ subDir :: String
-@@ -101,7 +102,7 @@ readBright files =
- 		maxVal <- grab $ (fMax files)
- 		return $ (currVal / maxVal) 
- 	where
--		grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
-+		grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
- 
- 
- showHorizontalBar :: Float -> Monitor String
--- 
-1.7.12.2
-
diff --git a/community-testing/xmobar/PKGBUILD b/community-testing/xmobar/PKGBUILD
deleted file mode 100644
index 25e6e53e1..000000000
--- a/community-testing/xmobar/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 77032 2012-10-03 15:25:55Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=xmobar
-pkgver=0.16
-pkgrel=1
-pkgdesc="A Minimalistic Text Based Status Bar"
-url="http://hackage.haskell.org/package/xmobar"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
-makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string'
-	     'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2')
-options=('strip')
-#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz  xmobar-0.15-builddep.patch)
-# Use Git snapshot for Ghc 7.6.1 rebuild
-source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz 
-0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch)
-
-build() {
-    cd ${srcdir}/xmobar
-    patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
-
-    runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib"
-    runhaskell Setup build
-}
-
-package() {
-    cd ${srcdir}/xmobar
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
-
-md5sums=('b470f8253f8d2b014f59e9d657cc7ddd'
-         'ffd6079c879f3b6ff7208a846d6ee241'
-         '149583c19ac3d0ad829f3138342bb9db')
diff --git a/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch b/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch
deleted file mode 100644
index bee3dc354..000000000
--- a/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur xmobar-0.15.old/xmobar.cabal xmobar-0.15/xmobar.cabal
---- xmobar-0.15.old/xmobar.cabal	2012-06-11 17:04:21.422444926 +0000
-+++ xmobar-0.15/xmobar.cabal	2012-06-11 17:05:16.772001865 +0000
-@@ -112,7 +112,7 @@
-       time,
-       filepath,
-       X11 == 1.6.*,
--      mtl == 2.0.*,
-+      mtl >= 2.0 && <2.2,
-       parsec == 3.1.*,
-       stm == 2.3.*
- 
diff --git a/community-testing/xmonad-contrib/PKGBUILD b/community-testing/xmonad-contrib/PKGBUILD
deleted file mode 100644
index 71a84cdfe..000000000
--- a/community-testing/xmonad-contrib/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 77034 2012-10-03 15:26:13Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: orbisvicis <gmail.com>
-
-pkgname=xmonad-contrib
-pkgver=0.10
-pkgrel=5
-pkgdesc="Add-ons for xmonad"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3')
-install='xmonad-contrib.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch)
-md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81'
-         '32163aaeb3424cf73bf831640c162a8a')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Patch xmonad-contrib to support haskell-x11
-  patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch
-
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-  install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE
-}
diff --git a/community-testing/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community-testing/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
deleted file mode 100644
index 8372b4144..000000000
--- a/community-testing/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Tue Mar 20 03:53:11 FET 2012  Adam Vogt <vogt.adam@gmail.com>
-  * Bump version to 0.10.1
-  
-  Raising the X11 dependency while keeping the xmonad version the same leads to
-  problems where cabal install uses the dependency versions following hackage,
-  not what is installed.
-diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
-index 743bdc8..0fbf4ac 100644
---- a/xmonad-contrib.cabal
-+++ b/xmonad-contrib.cabal
-@@ -61,7 +61,7 @@ library
-         extensions: ForeignFunctionInterface
-         cpp-options: -DXFT
- 
--    build-depends:      mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string
-+    build-depends:      mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string
- 
-     if true
-         ghc-options:    -fwarn-tabs -Wall
-diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs
-index a485d95..5e388e2 100644
---- a/XMonad/Layout/Spiral.hs
-+++ b/XMonad/Layout/Spiral.hs
-@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral (
-                             ) where
- 
- import Data.Ratio
--import XMonad
-+import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..))
- import XMonad.StackSet ( integrate )
- 
- -- $usage
-diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs
-index 0d78653..4b7fd3b 100644
---- a/XMonad/Util/Paste.hs
-+++ b/XMonad/Util/Paste.hs
-@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage
-                            where
- 
- import XMonad (io, theRoot, withDisplay, X ())
--import Graphics.X11
-+import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode)
-+import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask)
- import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent)
- import Control.Monad.Reader (asks)
- import XMonad.Operations (withFocused)
diff --git a/community-testing/xmonad-contrib/xmonad-contrib.install b/community-testing/xmonad-contrib/xmonad-contrib.install
deleted file mode 100644
index e9208c833..000000000
--- a/community-testing/xmonad-contrib/xmonad-contrib.install
+++ /dev/null
@@ -1,17 +0,0 @@
-HS_DIR=usr/share/haskell/xmonad-contrib
-
-post_install() {
-  ${HS_DIR}/register.sh
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-testing/xmonad/PKGBUILD b/community-testing/xmonad/PKGBUILD
deleted file mode 100644
index 2ed9c2a9f..000000000
--- a/community-testing/xmonad/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 77033 2012-10-03 15:26:06Z tdziedzic $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
-# Contributor: shild <shildv@gmail.com>
-
-pkgname=xmonad
-pkgver=0.10
-pkgrel=5
-pkgdesc="Lightweight X11 tiled window manager written in Haskell"
-arch=('i686' 'x86_64')
-url="http://xmonad.org/"
-license=('BSD')
-depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions')
-makedepends=('setconf' 'gendesk')
-optdepends=('xorg-xmessage: for displaying visual error messages')
-install='xmonad.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-	xmonad.svg xmonad-0.10-x11-1.6.patch)
-
-build() {
-  cd "$srcdir"
-  ghc-pkg list
-  gendesk
-
-  cd $srcdir/$pkgname-$pkgver
-  # Patch XMonad so we support haskell 1.6
-  patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch
-
-
-  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
-             --libsubdir=\$compiler/site-local/\$pkgid
-  runhaskell Setup build
-  runhaskell Setup register --gen-script
-  runhaskell Setup unregister --gen-script
-  sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh
-  install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh
-  runhaskell Setup.lhs copy --destdir=$pkgdir
-  #runhaskell util/GenerateManpage.hs
-
-  install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
-
-  install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg
-}
-md5sums=('f8381e1ec15137863558a454d4466467'
-         '72bfa5e62e4e44fe7fa59b6a7593d993'
-         '22d29900d71f09a8f9fa6f0d2f3fed32')
diff --git a/community-testing/xmonad/xmonad-0.10-x11-1.6.patch b/community-testing/xmonad/xmonad-0.10-x11-1.6.patch
deleted file mode 100644
index 5b7afaf3b..000000000
--- a/community-testing/xmonad/xmonad-0.10-x11-1.6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Tue Mar 20 03:49:24 FET 2012  Adam Vogt <vogt.adam@gmail.com>
-  * Address versioning problems related to X11 1.6 release.
-  
-  Bump version to 0.10.1 since cabal uses hackage dependencies even when the
-  locally installed package differs.
-  
-  Allow X11-1.6 dependency.
-diff -rN -u old-xmonad/xmonad.cabal new-xmonad/xmonad.cabal
---- old-xmonad/xmonad.cabal	2012-05-06 12:20:26.788767220 +0300
-+++ new-xmonad/xmonad.cabal	2012-05-06 12:20:26.818766844 +0300
-@@ -46,7 +46,7 @@
-         build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions
-     else
-         build-depends: base < 3
--    build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix,
-+    build-depends: X11>=1.5 && < 1.7, mtl, unix,
-                    utf8-string >= 0.3 && < 0.4
- 
-     if true
diff --git a/community-testing/xmonad/xmonad-gnome-session.session b/community-testing/xmonad/xmonad-gnome-session.session
deleted file mode 100644
index c0bd16781..000000000
--- a/community-testing/xmonad/xmonad-gnome-session.session
+++ /dev/null
@@ -1,6 +0,0 @@
-[GNOME Session]
-Name=Xmonad session
-RequiredComponents=gnome-panel;gnome-settings-daemon;
-RequiredProviders=windowmanager;notifications;
-DefaultProvider-windowmanager=xmonad
-DefaultProvider-notifications=notification-daemon
diff --git a/community-testing/xmonad/xmonad.install b/community-testing/xmonad/xmonad.install
deleted file mode 100644
index 6659247db..000000000
--- a/community-testing/xmonad/xmonad.install
+++ /dev/null
@@ -1,22 +0,0 @@
-HS_DIR=/usr/share/haskell/xmonad
-
-post_install() {
-    ${HS_DIR}/register.sh
-    echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs"
-    echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples"
-    echo 
-    echo "If you would like to run xmonad as a window manager inside GNOME, please see"
-    echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad"
-}
-
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-
-post_upgrade() {
-  ${HS_DIR}/register.sh
-}
-
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
diff --git a/community-testing/xmonad/xmonad.svg b/community-testing/xmonad/xmonad.svg
deleted file mode 100644
index 5fc884213..000000000
--- a/community-testing/xmonad/xmonad.svg
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2211"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   width="47"
-   height="73"
-   version="1.0"
-   sodipodi:docbase="/home/sjanssen/xmonad-web/images"
-   sodipodi:docname="logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata2216">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2214" />
-  <sodipodi:namedview
-     inkscape:window-height="778"
-     inkscape:window-width="1278"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="1"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="4"
-     inkscape:cx="23.5"
-     inkscape:cy="22.689137"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:current-layer="g3208" />
-  <g
-     id="g3208"
-     transform="translate(-44.517797,4.0967298)">
-    <g
-       id="g3212"
-       transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)">
-      <path
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462"
-         id="text2220"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         id="path3206"
-         d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349"
-         style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         sodipodi:nodetypes="ccccccccc" />
-    </g>
-    <path
-       style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono"
-       d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z "
-       id="text3216"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccc" />
-  </g>
-</svg>
diff --git a/community-testing/xmoto/PKGBUILD b/community-testing/xmoto/PKGBUILD
deleted file mode 100644
index 6cfbb2db3..000000000
--- a/community-testing/xmoto/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 77535 2012-10-11 21:34:16Z lcarlier $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Travis Willard <travisw@wmpub.ca> 
-# Contributor: Denis (dtonator@gmail.com)
-
-pkgname=xmoto
-pkgver=0.5.10
-pkgrel=2
-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=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' 
-	 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'glu'
-         'libxdg-basedir' 'libxml++')
-makedepends=('mesa')
-install=xmoto.install
-source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz"
-        'xmoto-0.5.10-libpng15.patch'
-        'system.cpp.patch')
-sha1sums=('692d50a9c91791cd06ee84846632651b44544fcc'
-          '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d'
-          'e741f769d1fc5779a6688970ee97e2a61a50c7ae')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch"
-  patch -Np1 -i "${srcdir}/system.cpp.patch"
-
-  # build and install 
-  ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install
-
-  # install desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \
-        ${pkgdir}/usr/share/applications/xmoto.desktop
-
-  # install icon for desktop file
-  install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \
-        ${pkgdir}/usr/share/pixmaps/xmoto.xpm
-}
diff --git a/community-testing/xmoto/system.cpp.patch b/community-testing/xmoto/system.cpp.patch
deleted file mode 100644
index df42e3a7c..000000000
--- a/community-testing/xmoto/system.cpp.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
-+++ b/src/helpers/System.cpp	2012-07-21 21:28:40.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "Log.h"
- #include "VExcept.h"
- #include <sstream>
-+#include <unistd.h>
- 
- std::vector<std::string>* System::getDisplayModes(int windowed) {
-     std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/community-testing/xmoto/xmoto-0.5.10-libpng15.patch b/community-testing/xmoto/xmoto-0.5.10-libpng15.patch
deleted file mode 100644
index aed175c7c..000000000
--- a/community-testing/xmoto/xmoto-0.5.10-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/image/tim_png.cpp	2011-12-29 22:13:37.000000000 +0100
-+++ b/src/image/tim_png.cpp	2012-07-21 21:36:34.000000000 +0200
-@@ -24,6 +24,7 @@
-  */
- #include <stdio.h>
- #include <string.h>
-+#include <zlib.h>
- #include "tim.h"
- #include <png.h>
- #include <zlib.h>
diff --git a/community-testing/xmoto/xmoto.install b/community-testing/xmoto/xmoto.install
deleted file mode 100644
index e111ef946..000000000
--- a/community-testing/xmoto/xmoto.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/zathura-djvu/PKGBUILD b/community-testing/zathura-djvu/PKGBUILD
deleted file mode 100644
index be797feb3..000000000
--- a/community-testing/zathura-djvu/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 75779 2012-08-31 00:57:33Z dwallace $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: karnath <karnathtorjian@gmail.com>
-
-pkgname=zathura-djvu
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="Adds DjVu support to zathura by using the djvulibre library"
-arch=('i686' 'x86_64')
-url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/"
-license=('custom')
-depends=('djvulibre' 'zathura')
-source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz")
-md5sums=('c3525b43b74bb0777a2b3561f7dcde06')
-
-build(){
-  cd "${srcdir}/$pkgname-$pkgver"
-  make
-}
-package(){
-  cd "${srcdir}/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
diff --git a/community-testing/zathura-pdf-poppler/PKGBUILD b/community-testing/zathura-pdf-poppler/PKGBUILD
deleted file mode 100644
index b1320b1cb..000000000
--- a/community-testing/zathura-pdf-poppler/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 67819 2012-03-14 16:22:14Z spupykin $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: karnath <karnathtorjian@gmail.com>
-
-pkgname=zathura-pdf-poppler
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="Adds pdf support to zathura by using the poppler engine"
-arch=('i686' 'x86_64')
-url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/"
-license=('custom')
-depends=('poppler-glib' 'zathura')
-source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('6f36fe141f8e5e9e8d71eb143eaaa1c1')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  make
-}
-package(){
-  cd "${srcdir}/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/community-testing/zathura/PKGBUILD b/community-testing/zathura/PKGBUILD
deleted file mode 100644
index cd7da39a5..000000000
--- a/community-testing/zathura/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 75777 2012-08-31 00:57:27Z dwallace $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: ML <neldoreth>
-
-pkgname=zathura
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="a document viewer"
-arch=('i686' 'x86_64')
-url="http://pwmt.org/projects/zathura/"
-license=('custom')
-depends=('girara-gtk2' 'cairo' 'sqlite')
-makedepends=('python2-docutils')
-optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps')
-install=zathura.install
-source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz
-	    bash-completion)
-md5sums=('2b606a5db61c80b0f1208e9f1df468c2'
-         'cac20c37f0e77ba62a8138788f4ccabb')
-
-build() {
-  cd $srcdir/zathura-$pkgver
-  make ZATHURA_GTK_VERSION=2
-}
-
-package() {
-  cd $srcdir/zathura-$pkgver
-  make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2
-  install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura
-}
diff --git a/community-testing/zathura/bash-completion b/community-testing/zathura/bash-completion
deleted file mode 100644
index 41c3825b6..000000000
--- a/community-testing/zathura/bash-completion
+++ /dev/null
@@ -1,29 +0,0 @@
-_zathura() {
-  _init_completion || return
-
-  EXTENTIONS=''
-  for PLUGIN in /usr/lib/zathura/*.so; do
-    case ${PLUGIN##*/} in
-      pdf.so)
-        EXTENTIONS="$EXTENTIONS|pdf"
-        ;;
-      ps.so)
-        EXTENTIONS="$EXTENTIONS|ps|eps|epsi|epsf"
-        ;;
-      djvu.so)
-        EXTENTIONS="$EXTENTIONS|djvu|djv"
-        ;;
-      epub.so)
-        EXTENTIONS="$EXTENTIONS|epub"
-        ;;
-      cb.so)
-        EXTENTIONS="$EXTENTIONS|cb7|cbr|cbz|cbt|rar|zip|7z|tar"
-        ;;
-      *)
-        ;;
-      esac
-  done
-
-  _filedir "${EXTENTIONS#|}"
-} &&
-complete -F _zathura zathura
diff --git a/community-testing/zathura/zathura.install b/community-testing/zathura/zathura.install
deleted file mode 100644
index f450cf9b8..000000000
--- a/community-testing/zathura/zathura.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  which gtk-update-icon-cache >/dev/null && \
-	[ -d usr/share/icons/hicolor ] && \
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/community-testing/zeitgeist-datahub/PKGBUILD b/community-testing/zeitgeist-datahub/PKGBUILD
deleted file mode 100644
index 35bb0fa68..000000000
--- a/community-testing/zeitgeist-datahub/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 78600 2012-10-21 20:21:55Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Leontius Adhika Pradhana <leon@leapon.net>
-# Contributor: Ner0
-
-pkgname=zeitgeist-datahub
-pkgver=0.9.5
-pkgrel=2
-pkgdesc="Provides passive plugins which insert events into Zeitgeist"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/zeitgeist-datahub"
-license=('GPL3')
-depends=('libzeitgeist' 'json-glib' 'gtk2' 'telepathy-glib' 'zeitgeist')
-makedepends=('intltool' 'vala')
-source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('b2b76b82b67363c45e5fe4f39a172775')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/community-testing/znc/PKGBUILD b/community-testing/znc/PKGBUILD
deleted file mode 100644
index 7222f1953..000000000
--- a/community-testing/znc/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 78129 2012-10-16 11:54:52Z allan $
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Contributor: Kaiting Chen <kaitocracy@gmail.com>
-# Contributor: mickael9 <mickael9 at gmail dot com>
-
-pkgname=znc
-pkgver=0.206
-pkgrel=3
-pkgdesc='An IRC bouncer with modules & scripts support'
-url='http://en.znc.in/wiki/index.php/ZNC'
-license=('GPL2')
-arch=('i686' 'x86_64')
-depends=('c-ares' 'libsasl')
-#makedepends=('swig' 'tcl' 'python' 'perl')
-makedepends=('tcl' 'python' 'perl')
-optdepends=('tcl: modtcl module'
-            'python: modpython module'
-            'perl: modperl module'
-            'cyrus-sasl: saslauth module')
-source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz"
-        "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2"
-        "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2")
-md5sums=('b7d3f21da81abaeb553066b0e10beb53'
-         'a9c72d556d9a4ef100520433f17d71ae'
-         '19bf033c5cb9243171c215043c594f07')
-
-build() {
-  # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035
-  # use an alternate ways of building znc explain here:
-  # - http://wiki.znc.in/Modperl
-  # - http://wiki.znc.in/Modpython
-  mv -v modperl/* $pkgname-$pkgver/modules/modperl
-  mv -v modpython/* $pkgname-$pkgver/modules/modpython
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr \
-    --enable-sasl \
-    --enable-python \
-    --enable-perl \
-    --enable-tcl \
-    --disable-swig \
-    --enable-extra
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/6tunnel/PKGBUILD b/community/6tunnel/PKGBUILD
index c619ab778..f9dcd9a03 100644
--- a/community/6tunnel/PKGBUILD
+++ b/community/6tunnel/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgname=6tunnel
 pkgver=0.11rc2
-pkgrel=5
+pkgrel=5.1
 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=()
 source=(http://toxygen.net/6tunnel/$pkgname-$pkgver.tar.gz)
 md5sums=('74e02d4f0704b3083a01feda66033449')
diff --git a/community/9base/PKGBUILD b/community/9base/PKGBUILD
index 92bcce809..1ebb46e0e 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/acpi/PKGBUILD b/community/acpi/PKGBUILD
index 564505917..035cfaa00 100644
--- a/community/acpi/PKGBUILD
+++ b/community/acpi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=acpi
 pkgver=1.7
 pkgrel=1
 pkgdesc='Client for battery, power, and thermal readings'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/acpiclient/'
 license=('GPL2')
 depends=('glibc')
diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD
index d0334dd68..cd0bef8a8 100644
--- a/community/activity-log-manager/PKGBUILD
+++ b/community/activity-log-manager/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=activity-log-manager
 pkgver=0.9.7
 pkgrel=1
 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/activity-log-manager"
 license=('GPL2')
 depends=('gtk3' 'libgee06' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/community/adns-python/PKGBUILD b/community/adns-python/PKGBUILD
index 9c1fc0cc7..caa373969 100644
--- a/community/adns-python/PKGBUILD
+++ b/community/adns-python/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=adns-python
 pkgver=1.2.1
 pkgrel=5
 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 0187cc81e..b8bb1ffcb 100644
--- a/community/adns/PKGBUILD
+++ b/community/adns/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=adns
 pkgver=1.4
 pkgrel=4
 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/aegisub/PKGBUILD b/community/aegisub/PKGBUILD
index 9b69c4633..8787dd667 100755
--- a/community/aegisub/PKGBUILD
+++ b/community/aegisub/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aegisub
 pkgver=3.1.2
 pkgrel=1
 pkgdesc="A general-purpose subtitle editor with ASS/SSA support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aegisub.org"
 license=('GPL' 'BSD')
 depends=('boost-libs' 'desktop-file-utils' 'ffms2' 'fftw' 'hunspell' 'lua51' 'wxgtk')
diff --git a/community/afpfs-ng/PKGBUILD b/community/afpfs-ng/PKGBUILD
index 6020eaddb..1811a1df7 100644
--- a/community/afpfs-ng/PKGBUILD
+++ b/community/afpfs-ng/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="A client for the Apple Filing Protocol (AFP)"
 url="http://alexthepuffin.googlepages.com/"
 license=('GPL')
 depends=('gmp' 'fuse' 'libgcrypt')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(
 	"http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
 	'fix_afpfs-ng_includes.patch'
diff --git a/community/agave/PKGBUILD b/community/agave/PKGBUILD
index 458e721c6..1c89f5c9b 100644
--- a/community/agave/PKGBUILD
+++ b/community/agave/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=agave
 pkgver=0.4.7
 pkgrel=4
 pkgdesc="Colorscheme designer tool for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://home.gna.org/colorscheme/"
 license=('GPL')
 depends=('libglademm' 'gconfmm' 'hicolor-icon-theme' 'xdg-utils')
@@ -17,18 +17,20 @@ install=$pkgname.install
 source=("http://download.gna.org/colorscheme/releases/$pkgname-$pkgver.tar.bz2"
         agave-0.4.7-mdv-fix-str-fmt.patch
         schemebox.patch
-        drop-libgnome.patch)
+        drop-libgnome.patch
+	agave-0.4.7-mips.patch)
 md5sums=('93097881f28dcae1eca2800a763f77c3'
          'd96ddfe751d8fd4d13a443b94fafb0b6'
          'c41adfd52ecbf837f4338e67693640fc'
-         '7419d23329f847dcde12baa467b52135')
+         '7419d23329f847dcde12baa467b52135'
+         'a08f637b9aa3ba08275aba94f72b1684')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i "$srcdir/agave-0.4.7-mdv-fix-str-fmt.patch" # Fedora patch
   patch -Np1 -i "$srcdir/schemebox.patch" # gcs-schemebox patch
   patch -Np1 -i "$srcdir/drop-libgnome.patch"
-
+  patch -Np1 -i "$srcdir/agave-0.4.7-mips.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
               --disable-scrollkeeper --disable-gnome --disable-schemas-install \
               --with-gconf-schema-file-dir=/usr/share/gconf/schemas
diff --git a/community/agave/agave-0.4.7-mips.patch b/community/agave/agave-0.4.7-mips.patch
new file mode 100644
index 000000000..5b24c2cbc
--- /dev/null
+++ b/community/agave/agave-0.4.7-mips.patch
@@ -0,0 +1,11 @@
+--- agave.orig/src/core/compat-round.cc	2006-09-30 16:55:58.000000000 -0500
++++ agave/src/core/compat-round.cc	2012-10-16 11:49:05.823741281 -0500
+@@ -133,7 +133,7 @@
+     } bits;
+ };
+ #define	compat_mask_nbit_l(u)	((u).bits.manh &= 0x7fffffff)
+-#elif __ia64__
++#elif __mips__
+ union compat_IEEEl2bits {
+     long double	e;
+     struct {
diff --git a/community/agg/PKGBUILD b/community/agg/PKGBUILD
index fe60133a4..d0e088f88 100644
--- a/community/agg/PKGBUILD
+++ b/community/agg/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=agg
 pkgver=2.5
-pkgrel=4
+pkgrel=4.1
 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')
@@ -23,6 +23,7 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/agg-2.4-depends.patch"
   patch -Np1 -i "${srcdir}/agg-2.5-pkgconfig.patch"
+  sed -i '/^AM_C_PROTOTYPES/d' configure.in
   sh ./autogen.sh
   ./configure --prefix=/usr --disable-static
   make
diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD
index 989bd574f..f77804e81 100644
--- a/community/aiccu/PKGBUILD
+++ b/community/aiccu/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=aiccu
 pkgver=20070115
 pkgrel=4
 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.sixxs.net/tools/aiccu/'
 license=('custom')
 depends=('gnutls' 'iproute2')
diff --git a/community/aide/PKGBUILD b/community/aide/PKGBUILD
index 684526ddc..7c7e425d7 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')
@@ -20,15 +20,19 @@ md5sums=('d0b72535ff68b93a648e4d08b0ed7f07'
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
+	if [ "$CARCH" != "mips64el" ]; then
+	  confflags="--with-posix-acl"
+	else
+	  confflags=""
+	fi
 	./configure \
         --prefix=/usr \
         --sysconfdir=/etc \
         --with-mhash \
-        --with-posix-acl \
         --with-prelink \
         --with-xattr \
         --with-zlib \
-        --with-e2fsattrs
+        --with-e2fsattrs ${confflags}
 	make
 }
 
diff --git a/community/aircrack-ng/PKGBUILD b/community/aircrack-ng/PKGBUILD
index 93bc2fe7b..bfac471f6 100644
--- a/community/aircrack-ng/PKGBUILD
+++ b/community/aircrack-ng/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=aircrack-ng
 pkgver=1.1
 pkgrel=10
 pkgdesc="A key cracker for the 802.11 WEP and WPA-PSK protocols"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.aircrack-ng.org"
 license=('GPL2')
 depends=('openssl' 'sqlite' 'iw' 'net-tools' 'wireless_tools')
diff --git a/community/algol68g/PKGBUILD b/community/algol68g/PKGBUILD
index 3905543e5..71b9a973f 100644
--- a/community/algol68g/PKGBUILD
+++ b/community/algol68g/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=algol68g
 pkgver=2.8
 pkgrel=1
 pkgdesc='Algol 68 Genie, an Algol 68 compiler-interpreter'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.xs4all.nl/~jmvdveer/algol.html'
 license=('GPL')
 depends=('gsl' 'plotutils')
diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD
index b432c47e3..0288798e5 100644
--- a/community/allegro/PKGBUILD
+++ b/community/allegro/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=allegro
 pkgver=5.0.10
 pkgrel=1
 pkgdesc='Portable library mainly aimed at video game and multimedia programming'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://alleg.sourceforge.net/'
 license=('custom')
 makedepends=('cmake' 'mesa-libgl' 'glu')
diff --git a/community/alltray/PKGBUILD b/community/alltray/PKGBUILD
index ed4a3780b..1354390dd 100644
--- a/community/alltray/PKGBUILD
+++ b/community/alltray/PKGBUILD
@@ -5,10 +5,10 @@
 
 pkgname=alltray
 pkgver=0.7.5.1dev
-pkgrel=1
+pkgrel=1.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')
 source=(https://code.launchpad.net/alltray/trunk/${pkgver}/+download/alltray-${pkgver}.tar.gz)
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD
index b9b33446a..b1c9aa742 100644
--- a/community/almanah/PKGBUILD
+++ b/community/almanah/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=almanah
 pkgver=0.11.0
 pkgrel=1
 pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://wiki.gnome.org/Apps/Almanah_Diary"
 license=('GPL')
 depends=('evolution-data-server' 'gtkspell3' 'libcryptui' 'xdg-utils')
diff --git a/community/alure/PKGBUILD b/community/alure/PKGBUILD
index 009fb566b..ad3937dc3 100644
--- a/community/alure/PKGBUILD
+++ b/community/alure/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=alure
 pkgver=1.2
 pkgrel=3
 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')
@@ -17,13 +17,18 @@ optdepends=('libsndfile: for uncompressed audio support'
             'dumb: for IT, XM, S3M and MOD support'
             'fluidsynth: for SoundFont 2 support')
 source=("http://kcat.strangesoft.net/alure-releases/${pkgname}-${pkgver}.tar.bz2"
+        'unistd.patch'
         build.patch)
 md5sums=('3088aba074ad02d95ea51e705053b9f5'
+         '17d3f8b4dc423cac64772e5694739fce'
          '6a8dfd62ccae920d393b4202736aba46')
 
 prepare() {
   cd $pkgname-$pkgver
   patch -p1 -i ../build.patch
+
+  test "$CARCH" = "mips64el" &&
+  patch -Np0 -i "$srcdir/unistd.patch"
 }
 
 build() {
diff --git a/community/alure/unistd.patch b/community/alure/unistd.patch
new file mode 100644
index 000000000..6a145efee
--- /dev/null
+++ b/community/alure/unistd.patch
@@ -0,0 +1,19 @@
+*** src/codec_fluidsynth.cpp	2011-07-29 10:37:48.000000000 +0200
+--- src/codec_fluidsynth2.cpp	2012-06-03 16:18:35.326640398 +0200
+***************
+*** 34,40 ****
+  #include <istream>
+  
+  #include <fluidsynth.h>
+! 
+  
+  #ifdef DYNLOAD
+  static void *fsynth_handle;
+--- 34,40 ----
+  #include <istream>
+  
+  #include <fluidsynth.h>
+! #include <unistd.h>
+  
+  #ifdef DYNLOAD
+  static void *fsynth_handle;
diff --git a/community/amidi-plug/PKGBUILD b/community/amidi-plug/PKGBUILD
index 53f6f8810..9e7d39e67 100644
--- a/community/amidi-plug/PKGBUILD
+++ b/community/amidi-plug/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=amidi-plug
 pkgver=0.7
 pkgrel=6
 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 4cc2b5ef5..fce3bae19 100644
--- a/community/amsn/PKGBUILD
+++ b/community/amsn/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=amsn
 pkgver=0.98.9
 pkgrel=3
 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')
@@ -24,7 +24,7 @@ sha256sums=('1fd2620489cc3627a841773a79cf28a7c9c438979c76d37f231a773a79e7f23e'
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
-
+  rm -f plugins/amsnplus/snapshot
   # patch for linux kernel header changes
   patch -Np0 -i ${srcdir}/$pkgname-$pkgver-v4l2.patch
   # build patch
diff --git a/community/antiword/PKGBUILD b/community/antiword/PKGBUILD
index 3d5c45644..7ff6bda40 100644
--- a/community/antiword/PKGBUILD
+++ b/community/antiword/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=antiword
 pkgver=0.37
-pkgrel=3
+pkgrel=3.1
 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 884b329db..b0f86516c 100644
--- a/community/anyfs-tools/PKGBUILD
+++ b/community/anyfs-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=anyfs-tools
 pkgver=0.85.1c
 pkgrel=5
 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 672f094ec..8c01c1fcd 100644
--- a/community/apcupsd/PKGBUILD
+++ b/community/apcupsd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=apcupsd
 pkgver=3.14.10
 pkgrel=7
 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')
@@ -26,7 +26,7 @@ sha256sums=('0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032'
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr  --libexecdir=/usr/lib/$pkgname \
+	./configure --prefix=/usr --build=$CHOST  --libexecdir=/usr/lib/$pkgname \
 		--sbindir=/usr/bin \
 		--enable-cgi --enable-usb --enable-net \
 		--with-upstype=usb --with-upscable=usb \
diff --git a/community/apg/PKGBUILD b/community/apg/PKGBUILD
index e5a6a2f4e..67221698e 100644
--- a/community/apg/PKGBUILD
+++ b/community/apg/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=apg
 pkgver=2.2.3
-pkgrel=3
+pkgrel=3.1
 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/apitrace/PKGBUILD b/community/apitrace/PKGBUILD
index 43622bdca..4eab13710 100644
--- a/community/apitrace/PKGBUILD
+++ b/community/apitrace/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=apitrace
 pkgver=4.0
 pkgrel=1
 pkgdesc="Graphics API Tracing"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/apitrace/apitrace"
 license=('custom')
 makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit' 'qjson')
diff --git a/community/apper/PKGBUILD b/community/apper/PKGBUILD
index 1dc3a6397..9740ac8aa 100644
--- a/community/apper/PKGBUILD
+++ b/community/apper/PKGBUILD
@@ -8,7 +8,7 @@ _pkgmainver=0.7
 pkgver=0.7.2
 pkgrel=5
 pkgdesc="KDE tools for PackageKit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Apper?content=84745"
 license=('GPL')
 depends=('kdebase-workspace' 'packagekit-qt2>=0.6.17')
diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD
index 065bf30fa..14323233c 100644
--- a/community/apvlv/PKGBUILD
+++ b/community/apvlv/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=apvlv
 pkgver=0.1.4.20121023
 pkgrel=3
 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' 'desktop-file-utils')
diff --git a/community/aqbanking/PKGBUILD b/community/aqbanking/PKGBUILD
index 4c5f2451c..40a7f9afe 100644
--- a/community/aqbanking/PKGBUILD
+++ b/community/aqbanking/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.0.25
 _dnrel=95
 pkgrel=2
 pkgdesc="A library for online banking and financial applications"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.aquamaniac.de/aqbanking"
 license=('GPL')
 depends=('gwenhywfar' 'ktoblzcheck' 'libofx')
diff --git a/community/arch/PKGBUILD b/community/arch/PKGBUILD
index a39bf7740..6b2b8c96d 100644
--- a/community/arch/PKGBUILD
+++ b/community/arch/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=arch
 pkgver=1.3.5
-pkgrel=9
+pkgrel=9.1
 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 cce37eba5..e2f24a7d1 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=aria2
 pkgver=1.18.3
 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' 'sqlite' 'c-ares' 'ca-certificates')
diff --git a/community/ario/PKGBUILD b/community/ario/PKGBUILD
index f5be70809..55f748ee9 100644
--- a/community/ario/PKGBUILD
+++ b/community/ario/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ario
 pkgver=1.5.1
 pkgrel=3
 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')
@@ -24,7 +24,6 @@ prepare() {
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
-
   ./configure --prefix=/usr --sysconfdir=/etc
   make
  }
diff --git a/community/ario/ario-1.5.1-glib.patch b/community/ario/ario-1.5.1-glib.patch
new file mode 100644
index 000000000..d183c9511
--- /dev/null
+++ b/community/ario/ario-1.5.1-glib.patch
@@ -0,0 +1,33 @@
+--- ario-1.5.1.orig/src/ario-util.h	2011-02-27 10:07:31.000000000 -0500
++++ ario-1.5.1/src/ario-util.h	2013-02-10 20:07:13.587768553 -0500
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include "servers/ario-server.h"
+-#include "glib/gslist.h"
++#include "glib.h"
+ #include "gdk/gdkpixbuf.h"
+ 
+ /* Number of covers used to generate the drag & drop image */
+--- ario-1.5.1.orig/src/ario-profiles.h	2011-05-17 12:54:49.000000000 -0500
++++ ario-1.5.1/src/ario-profiles.h	2013-02-10 20:20:12.934814452 -0500
+@@ -20,7 +20,7 @@
+ #ifndef __ARIO_PROFILES_H
+ #define __ARIO_PROFILES_H
+ 
+-#include <glib/gslist.h>
++#include <glib.h>
+ #include "servers/ario-server.h"
+ 
+ G_BEGIN_DECLS
+--- ario-1.5.1.orig/src/plugins/ario-plugin-info.c	2011-02-27 10:07:28.000000000 -0500
++++ ario-1.5.1/src/plugins/ario-plugin-info.c	2013-02-10 20:32:41.847900389 -0500
+@@ -27,7 +27,7 @@
+ 
+ #include <string.h>
+ #include <glib/gi18n.h>
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ 
+ #include "plugins/ario-plugin-info-priv.h"
+ #include "ario-debug.h"
diff --git a/community/arj/PKGBUILD b/community/arj/PKGBUILD
index b7d14445e..23ea9e5e4 100644
--- a/community/arj/PKGBUILD
+++ b/community/arj/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.10.22
 pkgrel=8
 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')
 depends=('glibc')
 options=('!makeflags')
diff --git a/community/armagetronad/PKGBUILD b/community/armagetronad/PKGBUILD
index dc36a979b..b624e966a 100644
--- a/community/armagetronad/PKGBUILD
+++ b/community/armagetronad/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=armagetronad
 pkgver=0.2.8.3.2
 pkgrel=4
 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' 'ftgl')
@@ -24,6 +24,7 @@ build() {
      sed -i 's|FTGL.h|ftgl.h|g' configure
      sed -i 's|png_check_sig|png_sig_cmp|g' configure
      ./configure --prefix=/usr \
+        --build=$CHOST \
         --sysconfdir=/etc \
         --mandir=/usr/share/man \
         --disable-games \
diff --git a/community/arp-scan/PKGBUILD b/community/arp-scan/PKGBUILD
index 93566d506..c9db4118a 100644
--- a/community/arp-scan/PKGBUILD
+++ b/community/arp-scan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=arp-scan
 pkgver=1.9
 pkgrel=1
 pkgdesc="A tool that uses ARP to discover and fingerprint IP hosts on the local network"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' '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 6655c1ce5..3ef96376d 100644
--- a/community/arpack/PKGBUILD
+++ b/community/arpack/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=arpack
 pkgver=3.1.2
 pkgrel=2
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 pkgdesc='Fortran77 subroutines designed to solve large scale eigenvalue problems'
 url='http://forge.scilab.org/index.php/p/arpack-ng/'
 license=('BSD')
diff --git a/community/arptables/PKGBUILD b/community/arptables/PKGBUILD
index edc4066e8..bcd5a98c7 100644
--- a/community/arptables/PKGBUILD
+++ b/community/arptables/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=arptables
 pkgver=0.0.4
 pkgrel=2
 pkgdesc='ARP filtering utility'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ebtables.sourceforge.net/'
 depends=('glibc' 'perl' 'bash')
 license=('GPL')
diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD
index 9187b0b50..de54db83f 100644
--- a/community/arpwatch/PKGBUILD
+++ b/community/arpwatch/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=arpwatch
 pkgver=2.1a15
 pkgrel=13
 pkgdesc='Ethernet/FDDI station activity monitor'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='ftp://ftp.ee.lbl.gov/'
 license=('BSD')
 depends=('libpcap' 'smtp-forwarder')
diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD
index e9bd0f92c..c0b82490c 100644
--- a/community/ascii/PKGBUILD
+++ b/community/ascii/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ascii
 pkgver=3.14
 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')
 depends=('glibc')
diff --git a/community/aspell-ca/PKGBUILD b/community/aspell-ca/PKGBUILD
index 4b3d2ebe1..bc4e820a6 100644
--- a/community/aspell-ca/PKGBUILD
+++ b/community/aspell-ca/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=aspell-ca
 pkgver=2.3.0
 pkgrel=1
 pkgdesc="Catalan dictionary for aspell"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aspell.net/"
 license=('GPL2')
 depends=('aspell')
diff --git a/community/aspell-cs/PKGBUILD b/community/aspell-cs/PKGBUILD
index 1e409e7bc..bc0d7600d 100644
--- a/community/aspell-cs/PKGBUILD
+++ b/community/aspell-cs/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=aspell-cs
 pkgver=20040614
-pkgrel=6
+pkgrel=6.1
 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-it/PKGBUILD b/community/aspell-it/PKGBUILD
index 8fe648455..03cf6e144 100644
--- a/community/aspell-it/PKGBUILD
+++ b/community/aspell-it/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=aspell-it
 pkgver=2.2_20050523
-pkgrel=4
+pkgrel=4.1
 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/community/aspell-pl/PKGBUILD b/community/aspell-pl/PKGBUILD
index fb512bfd4..6802622df 100644
--- a/community/aspell-pl/PKGBUILD
+++ b/community/aspell-pl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-pl
 pkgver=20130705
 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..9c05505e4 100644
--- a/community/aspell-uk/PKGBUILD
+++ b/community/aspell-uk/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=aspell-uk
 pkgver=1.6.5
 _ftpver=1.4.0
-pkgrel=3
+pkgrel=3.1
 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/assimp/PKGBUILD b/community/assimp/PKGBUILD
index 6a5087a83..041cefb49 100644
--- a/community/assimp/PKGBUILD
+++ b/community/assimp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=assimp
 pkgver=3.0.1270
 pkgrel=1
 pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('libxmu' 'zlib' 'freeglut')
 makedepends=('cmake' 'boost')
diff --git a/community/astromenace/PKGBUILD b/community/astromenace/PKGBUILD
index 403ebf339..0937e7713 100644
--- a/community/astromenace/PKGBUILD
+++ b/community/astromenace/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=astromenace
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities"
-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' 'glu' 'freetype2' 'libxinerama')
diff --git a/community/astyle/PKGBUILD b/community/astyle/PKGBUILD
index a0b384431..c778b1588 100644
--- a/community/astyle/PKGBUILD
+++ b/community/astyle/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=astyle
 pkgver=2.04
 pkgrel=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/at/PKGBUILD b/community/at/PKGBUILD
index da3a905ac..119ac60f8 100644
--- a/community/at/PKGBUILD
+++ b/community/at/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=at
 pkgver=3.1.13
 pkgrel=3
 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/community/atanks/PKGBUILD b/community/atanks/PKGBUILD
index 7cf9b9c64..6c459831d 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 2d1f99a9a..b2d1cd8be 100644
--- a/community/atop/PKGBUILD
+++ b/community/atop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=atop
 pkgver=2.0.2
 pkgrel=1
 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/audit/PKGBUILD b/community/audit/PKGBUILD
index e733366c5..3e9f2fc67 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.3.2
 pkgrel=3
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url="http://people.redhat.com/sgrubb/audit"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=(krb5 libcap-ng)
 makedepends=(libldap swig linux-headers python2)
 license=(GPL)
diff --git a/community/augeas/PKGBUILD b/community/augeas/PKGBUILD
index c73aea724..8b53ffec1 100644
--- a/community/augeas/PKGBUILD
+++ b/community/augeas/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=augeas
 pkgver=1.2.0
 pkgrel=1
 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/augeas/augeas-0.10.0-gets.patch b/community/augeas/augeas-0.10.0-gets.patch
new file mode 100644
index 000000000..d66a46935
--- /dev/null
+++ b/community/augeas/augeas-0.10.0-gets.patch
@@ -0,0 +1,10 @@
+--- augeas-0.10.0.orig/gnulib/lib/stdio.in.h	2011-03-03 20:07:59.000000000 -0500
++++ augeas-0.10.0/gnulib/lib/stdio.in.h	2012-12-23 07:26:24.774463902 -0500
+@@ -162,7 +162,6 @@
+    so any use of gets warrants an unconditional warning.  Assume it is
+    always declared, since it is required by C89.  */
+ #undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ 
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
diff --git a/community/aumix/PKGBUILD b/community/aumix/PKGBUILD
index 299af8fac..dd84c1756 100644
--- a/community/aumix/PKGBUILD
+++ b/community/aumix/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=aumix
 pkgver=2.9.1
 pkgrel=4
 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 4c0e71eef..d1ad343ee 100644
--- a/community/autocutsel/PKGBUILD
+++ b/community/autocutsel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=autocutsel
 pkgver=0.9.1
 pkgrel=1
 pkgdesc="synchronizes the two copy/paste buffers mainly used by X applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw')
 source=(https://github.com/sigmike/autocutsel/releases/download/$pkgver/autocutsel-$pkgver.tar.gz)
 url="http://www.nongnu.org/autocutsel/"
diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD
index 8c949954e..d1be9b8cd 100644
--- a/community/autofs/PKGBUILD
+++ b/community/autofs/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=autofs
 pkgver=5.0.8
 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=('libxml2')
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/avfs/PKGBUILD b/community/avfs/PKGBUILD
index f9cdb2670..66f181e4c 100644
--- a/community/avfs/PKGBUILD
+++ b/community/avfs/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=avfs
 pkgver=1.0.1
-pkgrel=1
+pkgrel=1.2
 pkgdesc="A virtual filesystem that allows browsing of compressed files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://avf.sourceforge.net/"
 depends=('fuse' 'xz' 'perl')
diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD
index 07d7531f2..8f5aecd1b 100644
--- a/community/avifile/PKGBUILD
+++ b/community/avifile/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=avifile
 pkgver=0.7.45
 pkgrel=9
 pkgdesc="A library that allows you to read and write compressed AVI files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qt3' 'sdl' 'freetype2' 'libpng' 'libjpeg'
          'libvorbis' 'xvidcore' 'libxxf86dga' 'libxi' 'libxv')
 makedepends=('lame' 'v4l-utils' 'chrpath')
diff --git a/community/avr-binutils/PKGBUILD b/community/avr-binutils/PKGBUILD
index 382161404..4a82e982a 100644
--- a/community/avr-binutils/PKGBUILD
+++ b/community/avr-binutils/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=avr-binutils
 pkgver=2.23.2
 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.17' 'zlib' 'binutils')
diff --git a/community/avr-gdb/PKGBUILD b/community/avr-gdb/PKGBUILD
index 996a8f934..d4ab21009 100644
--- a/community/avr-gdb/PKGBUILD
+++ b/community/avr-gdb/PKGBUILD
@@ -10,7 +10,7 @@ _pkgname=gdb
 pkgver=7.6.1
 pkgrel=1
 pkgdesc="The GNU Debugger for AVR"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gdb/"
 license=('GPL3')
 depends=('python2')
diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD
index 72757ecf2..57ab41554 100644
--- a/community/avrdude/PKGBUILD
+++ b/community/avrdude/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=avrdude
 pkgver=6.0.1
 pkgrel=3
 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=('readline' 'libftdi' 'libusb-compat')
diff --git a/community/awesome/PKGBUILD b/community/awesome/PKGBUILD
index 6e14be9e2..1641d5235 100644
--- a/community/awesome/PKGBUILD
+++ b/community/awesome/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=awesome
 pkgver=3.5.2
 pkgrel=1
 pkgdesc='Highly configurable framework window manager'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://awesome.naquadah.org/'
 license=('GPL2')
 depends=(
diff --git a/community/axel/PKGBUILD b/community/axel/PKGBUILD
index 710a76841..00fad4b80 100644
--- a/community/axel/PKGBUILD
+++ b/community/axel/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=axel
 pkgver=2.4
-pkgrel=3
+pkgrel=3.1
 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/balsa/PKGBUILD b/community/balsa/PKGBUILD
index 5c38126d2..3dae21e26 100644
--- a/community/balsa/PKGBUILD
+++ b/community/balsa/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=balsa
 pkgver=2.5.1
 pkgrel=1
 pkgdesc="An e-mail client for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pawsa.fedorapeople.org/balsa/'
 license=('GPL')
 depends=('gmime' 'webkitgtk3' 'libesmtp' 'libnotify' 'gpgme' 'gtksourceview3' 'gtkspell3' 'gnome-icon-theme' 'desktop-file-utils')
diff --git a/community/bam/PKGBUILD b/community/bam/PKGBUILD
index fb6384301..849bd6271 100644
--- a/community/bam/PKGBUILD
+++ b/community/bam/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=bam
 pkgver=0.4.0
 pkgrel=1
 pkgdesc="A fast and flexible build system using Lua"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url=http://github.com/matricks/bam
 license=('ZLIB')
 source=("https://github.com/downloads/matricks/bam/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/barcode/PKGBUILD b/community/barcode/PKGBUILD
index 4748943b9..64580063d 100644
--- a/community/barcode/PKGBUILD
+++ b/community/barcode/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=barcode
 pkgver=0.99
 pkgrel=1
 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/community/barrage/PKGBUILD b/community/barrage/PKGBUILD
index 69ab19226..2daf716e6 100644
--- a/community/barrage/PKGBUILD
+++ b/community/barrage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=barrage
 pkgver=1.0.4
 pkgrel=2
 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 43380e701..69b459b6b 100644
--- a/community/bbpager/PKGBUILD
+++ b/community/bbpager/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bbpager
 pkgver=0.4.7
 pkgrel=4
 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 807d3b561..b13e35c2e 100644
--- a/community/bbrun/PKGBUILD
+++ b/community/bbrun/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=bbrun
 pkgver=1.6
-pkgrel=4
+pkgrel=4.1
 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/bcg729/PKGBUILD b/community/bcg729/PKGBUILD
index c3dec679a..4555956d5 100644
--- a/community/bcg729/PKGBUILD
+++ b/community/bcg729/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bcg729
 pkgver=1.0.0
 pkgrel=4
 pkgdesc="g729 codec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linphone.org/eng/documentation/dev/bcg729.html"
 license=('GPL')
 depends=('mediastreamer')
diff --git a/community/bchunk/PKGBUILD b/community/bchunk/PKGBUILD
index f8f56451e..95f327702 100644
--- a/community/bchunk/PKGBUILD
+++ b/community/bchunk/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.2.0
 pkgrel=4
 pkgdesc="A Tool to Convert *.raw *.bin files to an ISO file"
 url="http://he.fi/bchunk/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
 source=(http://he.fi/$pkgname/$pkgname-$pkgver.tar.gz)
diff --git a/community/beaver/PKGBUILD b/community/beaver/PKGBUILD
index e62591b96..91539d985 100644
--- a/community/beaver/PKGBUILD
+++ b/community/beaver/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=beaver
 pkgver=0.4.1
 pkgrel=2
 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' 'hicolor-icon-theme')
diff --git a/community/beye/PKGBUILD b/community/beye/PKGBUILD
index 2d4de199d..9b3800b68 100644
--- a/community/beye/PKGBUILD
+++ b/community/beye/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=6.1.0
 _lver=610
 pkgrel=4
 pkgdesc="A portable viewer of binary files, hexadecimal and disassembler modes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('slang' 'gpm')
 makedepends=('libx11')
diff --git a/community/bin2iso/PKGBUILD b/community/bin2iso/PKGBUILD
index cfd4f7098..1574dfa58 100644
--- a/community/bin2iso/PKGBUILD
+++ b/community/bin2iso/PKGBUILD
@@ -8,9 +8,9 @@
 pkgname=bin2iso
 pkgver=1.9b
 _dlver=${pkgver/./}
-pkgrel=3
+pkgrel=3.1
 pkgdesc="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/PKGBUILD b/community/bind/PKGBUILD
index 210fbc029..c677e53cb 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!makeflags')
 depends=('openssl' 'krb5' 'libxml2')
 provides=('dns-server')
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index 2d41ca639..f8bcf2a45 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=bird
 pkgname=('bird' 'bird6')
 pkgver=1.4.0
 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/blobby2/PKGBUILD b/community/blobby2/PKGBUILD
index 38aee509f..a93ba23a1 100644
--- a/community/blobby2/PKGBUILD
+++ b/community/blobby2/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=blobby2
 pkgver=1.0rc4
-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/blobwars/PKGBUILD b/community/blobwars/PKGBUILD
index dd180f51c..06e581659 100644
--- a/community/blobwars/PKGBUILD
+++ b/community/blobwars/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=blobwars
 pkgver=1.19
 pkgrel=4
 pkgdesc="Platform action game featuring a blob wih lot of weapons"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/blobwars"
 license=('GPL')
 makedepends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'sdl_net')
diff --git a/community/bochs/PKGBUILD b/community/bochs/PKGBUILD
index 0a26bfc4f..ffb45cc3d 100644
--- a/community/bochs/PKGBUILD
+++ b/community/bochs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bochs
 pkgver=2.6.2
 pkgrel=1
 pkgdesc="A portable x86 PC emulation software package"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bochs.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs' 'libxrandr')
diff --git a/community/bomberclone/PKGBUILD b/community/bomberclone/PKGBUILD
index 1a48ea385..61b60d0c3 100644
--- a/community/bomberclone/PKGBUILD
+++ b/community/bomberclone/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=bomberclone
 pkgver=0.11.9
 pkgrel=3
 pkgdesc='Clone of the game AtomicBomberMan'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bomberclone.de/"
 license=('GPL')
 depends=('sdl_mixer' 'sdl_image')
@@ -27,7 +27,7 @@ build() {
 
   # add build fix extracted from upstream CVS (fixes FS#26942)
   patch -p0 -i ../bomberclone-0.11.9-build-fix.patch
-
+  sed -i 's/-Werror//' configure
   ./configure --prefix=/usr
   make CFLAGS="-lm -O2 `pkg-config sdl --cflags` $CFLAGS"
 }
diff --git a/community/bonnie++/PKGBUILD b/community/bonnie++/PKGBUILD
index cfafec7c9..cf9e5e577 100644
--- a/community/bonnie++/PKGBUILD
+++ b/community/bonnie++/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bonnie++
 pkgver=1.97
 pkgrel=1
 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/botan/PKGBUILD b/community/botan/PKGBUILD
index cba820be1..a8e63da39 100644
--- a/community/botan/PKGBUILD
+++ b/community/botan/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.10.7
 pkgrel=1
 pkgdesc='Crypto library written in C++'
 license=('BSD')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://botan.randombit.net/'
 depends=('gcc-libs' 'sh')
 makedepends=('python2')
@@ -19,6 +19,8 @@ sha256sums=('19f79ae670cb2ea7c290244ff6ff564ce74b45d8845af52787a30c646e16324d')
 build() {
   cd "Botan-$pkgver"
 
+  sed -i 's:env python:env python2:' configure.py
+  sed -i 's/mabi=64/mabi=n32/g' src/build-data/cc/gcc.txt
   python2 configure.py --prefix=/usr
   make 
 }
diff --git a/community/box2d/PKGBUILD b/community/box2d/PKGBUILD
index 15030c6c3..76cfe3ee8 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' 'doxygen')
 optdepends=()
diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD
index 1b4ac12da..d95896ebd 100644
--- a/community/bsd-games/PKGBUILD
+++ b/community/bsd-games/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.17
 pkgrel=14
 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/Makefile.patch b/community/bsdiff/Makefile.patch
index b2a3ffa82..e5f1aa4ee 100644
--- a/community/bsdiff/Makefile.patch
+++ b/community/bsdiff/Makefile.patch
@@ -6,7 +6,7 @@
  PREFIX		?=	/usr/local
 -INSTALL_PROGRAM	?=	${INSTALL} -c -s -m 555
 -INSTALL_MAN	?=	${INSTALL} -c -m 444
-+INSTALL		=	/bin/install
++INSTALL		=	/usr/bin/install
 +INSTALL_PROGRAM	?=	${INSTALL} -D -m755
 +INSTALL_MAN	?=	${INSTALL} -D -m644
  
diff --git a/community/bsdiff/PKGBUILD b/community/bsdiff/PKGBUILD
index 57c4abb4b..3ceb6be34 100644
--- a/community/bsdiff/PKGBUILD
+++ b/community/bsdiff/PKGBUILD
@@ -7,12 +7,12 @@ pkgrel=8
 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)
 md5sums=('e6d812394f0e0ecc8d5df255aa1db22a'
-         '87ec6120b2e2d38da5a67821af6ac356')
+         '3610499f8d8f406738bd3a0fbe0c4da9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/btanks/PKGBUILD b/community/btanks/PKGBUILD
index 838429b61..cc03d2bb4 100644
--- a/community/btanks/PKGBUILD
+++ b/community/btanks/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=btanks
 pkgver=0.9.8083
 pkgrel=4
 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/btanks/btanks-0.9.8083-gcc47.patch b/community/btanks/btanks-0.9.8083-gcc47.patch
new file mode 100644
index 000000000..6fd93df35
--- /dev/null
+++ b/community/btanks/btanks-0.9.8083-gcc47.patch
@@ -0,0 +1,111 @@
+--- btanks.orig/mrt/base_file.h	2009-04-04 15:28:59.000000000 -0500
++++ btanks/mrt/base_file.h	2012-10-11 00:24:20.257335332 -0500
+@@ -20,6 +20,7 @@
+ */
+ 
+ #include <string>
++#include <unistd.h>
+ #include "export_mrt.h"
+ 
+ namespace mrt {
+--- btanks.orig/math/range_list.h	2008-10-24 09:15:55.000000000 -0500
++++ btanks/math/range_list.h	2012-10-11 00:26:24.732432981 -0500
+@@ -53,14 +53,14 @@
+ 			return;
+ 		}
+ 	
+-		typename parent_type::iterator i = lower_bound(value);
++		typename parent_type::iterator i = this->lower_bound(value);
+ 		if (i != parent_type::end()) {
+ 			if (i->first == value)
+ 				return;
+ 
+ 			if (value + 1 == i->first) {
+ 				T e = i->second;
+-				erase(i);
++				this->erase(i);
+ 				i = parent_type::insert(typename parent_type::value_type(value, e)).first; //expand beginning
+ 				i = pack_left(i);
+ 			}
+--- btanks.orig/engine/sl08/sl08.h	2008-08-13 04:10:45.000000000 -0500
++++ btanks/engine/sl08/sl08.h	2012-10-11 01:49:09.226329460 -0500
+@@ -22,6 +22,7 @@
+ /* DO NOT MODIFY THIS FILE: IT'S AUTOGENERATED */ 
+ 
+ #include <list>
++#include <cstddef>
+ 
+ #ifndef NULL
+ #define NULL            ((void*) 0)
+@@ -271,7 +272,7 @@
+ 			inline slot1(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1) const { 
+ 				return (object->*func) (a1) ;
+@@ -292,7 +293,7 @@
+ 			inline slot1 () : object(NULL), func(NULL) {}
+ 			inline slot1 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1) const { 
+ 				(object->*func) (a1); 
+@@ -446,7 +447,7 @@
+ 			inline slot2(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2) const { 
+ 				return (object->*func) (a1, a2) ;
+@@ -467,7 +468,7 @@
+ 			inline slot2 () : object(NULL), func(NULL) {}
+ 			inline slot2 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2) const { 
+ 				(object->*func) (a1, a2); 
+@@ -642,7 +643,7 @@
+ 			inline slot3 () : object(NULL), func(NULL) {}
+ 			inline slot3 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3) const { 
+ 				(object->*func) (a1, a2, a3); 
+@@ -796,7 +797,7 @@
+ 			inline slot4(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { 
+ 				return (object->*func) (a1, a2, a3, a4) ;
+@@ -817,7 +818,7 @@
+ 			inline slot4 () : object(NULL), func(NULL) {}
+ 			inline slot4 (object_type *object, func_t func) : object(object), func(func) {}
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline void operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4) const { 
+ 				(object->*func) (a1, a2, a3, a4); 
+@@ -971,7 +972,7 @@
+ 			inline slot5(object_type *object, func_t func, signal_type * signal = NULL) : object(object), func(func) {}
+ 
+ 			inline void assign(object_type *o, func_t f) { object = o; func = f; }
+-			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; connect(signal_ref); }
++			inline void assign(object_type *o, func_t f, signal_type &signal_ref = NULL) { object = o; func = f; this->connect(signal_ref); }
+ 	
+ 			inline return_type operator() (arg1_type a1, arg2_type a2, arg3_type a3, arg4_type a4, arg5_type a5) const { 
+ 				return (object->*func) (a1, a2, a3, a4, a5) ;
diff --git a/community/bti/PKGBUILD b/community/bti/PKGBUILD
index 7366f9ae5..c629c7a3f 100644
--- a/community/bti/PKGBUILD
+++ b/community/bti/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=bti
 pkgver=034
 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' 'json-c')
diff --git a/community/buoh/PKGBUILD b/community/buoh/PKGBUILD
index 0d0ba0118..4691dd908 100644
--- a/community/buoh/PKGBUILD
+++ b/community/buoh/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=buoh
 pkgver=0.8.2
 pkgrel=6
 pkgdesc="Reader for online strips comics"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://buoh.steve-o.org/"
 license=('GPL')
 depends=('gtk2' 'libsoup>=2.4.0' 'gconf' 'hicolor-icon-theme')
diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD
index fd2ab4bd3..fcb5c00c0 100644
--- a/community/busybox/PKGBUILD
+++ b/community/busybox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=busybox
 pkgver=1.22.1
 pkgrel=1
 pkgdesc="Utilities for rescue and embedded systems"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://www.busybox.net"
 license=('GPL')
 makedepends=("make" "gcc" "sed" "ncurses")
diff --git a/community/bwbar/PKGBUILD b/community/bwbar/PKGBUILD
index 724c6b576..8d082652e 100644
--- a/community/bwbar/PKGBUILD
+++ b/community/bwbar/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=bwbar
 pkgver=1.2.3
 pkgrel=4
-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 b4043f01d..54128c25e 100644
--- a/community/bwm-ng/PKGBUILD
+++ b/community/bwm-ng/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=bwm-ng
 pkgver=0.6
-pkgrel=4
+pkgrel=4.1
 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/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index 159655bd5..30cc37e56 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=c++-gtk-utils
 pkgver=2.0.22
 pkgrel=1
 pkgdesc="Classes and functions for programming in GTK+"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cxx-gtk-utils.sourceforge.net/"
 license=('LGPL2.1')
 depends=('gtk3')
diff --git a/community/cabextract/PKGBUILD b/community/cabextract/PKGBUILD
index 07dca6cef..bcf66a01e 100644
--- a/community/cabextract/PKGBUILD
+++ b/community/cabextract/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=cabextract
 pkgver=1.4
-pkgrel=2
+pkgrel=2.1
 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 da3c12e11..36e7d52ad 100644
--- a/community/cadaver/PKGBUILD
+++ b/community/cadaver/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cadaver
 pkgver=0.23.3
 pkgrel=3
 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 e646d62e1..8d0ef44e9 100644
--- a/community/cairo-clock/PKGBUILD
+++ b/community/cairo-clock/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cairo-clock
 pkgver=0.3.4
 pkgrel=2
 pkgdesc='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-dock/PKGBUILD b/community/cairo-dock/PKGBUILD
index b5f27561c..32b494016 100755
--- a/community/cairo-dock/PKGBUILD
+++ b/community/cairo-dock/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cairo-dock
 pkgver=3.3.2
 pkgrel=2
 pkgdesc='Light eye-candy fully themable animated dock'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/${pkgname}-core"
 license=('GPL')
 depends=('curl' 'dbus-glib' 'glu' 'gtk3' 'librsvg')
diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD
index bb1f8fd79..6c5e3ee9f 100644
--- a/community/calc/PKGBUILD
+++ b/community/calc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=calc
 pkgver=2.12.4.13
 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=('readline')
diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD
index bcbc3276a..022164a96 100644
--- a/community/calcurse/PKGBUILD
+++ b/community/calcurse/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=calcurse
 pkgver=3.1.4
 pkgrel=2
 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/calf/PKGBUILD b/community/calf/PKGBUILD
index 694a00f9f..ea3390615 100644
--- a/community/calf/PKGBUILD
+++ b/community/calf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=calf
 pkgver=0.0.19
 pkgrel=3
 pkgdesc='LV2/DSSI/LADSPA plug-ins suite and standalone JACK host'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://calf.sf.net/'
 license=('LGPL')
 depends=('libglade' 'fftw' 'lash' 'dssi' 'fluidsynth' 'hicolor-icon-theme' 'desktop-file-utils')
@@ -16,8 +16,13 @@ install=calf.install
 sha256sums=('1106e7e27bcd18d47fc58c952a4dbf6c7a763272e13b2b94cee6f1b2fb922cec')
 
 build() {
+  if [ "$CARCH" != "mips64el" ]; then
+    confflags="--enable-sse"
+  else
+    confflags=""
+  fi
   cd $srcdir/$pkgname-$pkgver
-  ./configure	--prefix=/usr --enable-experimental --enable-sse
+  ./configure	--prefix=/usr --enable-experimental ${confflags}
   make
 }
 
diff --git a/community/canorus/0006-Add-lz-and-lpthread-to-linker-flags.patch b/community/canorus/0006-Add-lz-and-lpthread-to-linker-flags.patch
new file mode 100644
index 000000000..05317541d
--- /dev/null
+++ b/community/canorus/0006-Add-lz-and-lpthread-to-linker-flags.patch
@@ -0,0 +1,11 @@
+--- canorus-0.7.R1002.orig/src/CMakeLists.txt	2009-03-27 05:25:52.000000000 -0500
++++ canorus-0.7.R1002/src/CMakeLists.txt	2012-11-15 06:26:41.884594717 -0500
+@@ -600,7 +600,7 @@
+ # command. Never remove that line :-)
+ # Add ${QT_QTTEST_LIBRARY} below to add the Qt Test library as well
+ # Add ${POPPLERQT4_LIBRARY} ${POPPLER_LIBRARY} to reactivate poppler libraries
+-TARGET_LINK_LIBRARIES(canorus ${QT_LIBRARIES} ${RUBY_LIBRARY} ${PYTHON_LIBRARY} )
++TARGET_LINK_LIBRARIES(canorus ${QT_LIBRARIES} ${RUBY_LIBRARY} ${PYTHON_LIBRARY} -lz -lpthread)
+ 
+ ############################
+ # RtMIDI Library additions #
diff --git a/community/canorus/PKGBUILD b/community/canorus/PKGBUILD
index 9ea89a79a..4767b9030 100644
--- a/community/canorus/PKGBUILD
+++ b/community/canorus/PKGBUILD
@@ -8,14 +8,16 @@ pkgname=canorus
 pkgver=0.7.R1002
 pkgrel=5
 pkgdesc="A free music score editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.canorus.org/"
 license=('GPL')
 depends=('qt4' 'alsa-lib' 'python2' 'swig' 'zlib')
 makedepends=('cmake')
 options=('strip')
-source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2)
-md5sums=('5575b7c54633056a463177579a390318')
+source=(http://download.berlios.de/$pkgname/$pkgname\_$pkgver\_source.tar.bz2
+	0006-Add-lz-and-lpthread-to-linker-flags.patch)
+md5sums=('5575b7c54633056a463177579a390318'
+	 '99e545a1da44006bc5e436728edfda15')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
index c7b699bc6..70a109677 100644
--- a/community/cantata/PKGBUILD
+++ b/community/cantata/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cantata
 pkgver=1.2.2
 pkgdesc="A KDE client for the music player daemon (MPD)"
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Cantata?content=147733"
 license=('GPL')
 depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'qjson' 'taglib-extras')
diff --git a/community/caph/PKGBUILD b/community/caph/PKGBUILD
index 503c87bcb..6887119cb 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=4
 pkgdesc='Sandbox game based on physics which uses doodles as a primary gameplay element'
diff --git a/community/castget/PKGBUILD b/community/castget/PKGBUILD
index 1821a8be2..11e6df955 100644
--- a/community/castget/PKGBUILD
+++ b/community/castget/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=castget
 pkgver=1.1.0
 pkgrel=2
 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/catdoc/PKGBUILD b/community/catdoc/PKGBUILD
index 549cddb7d..a513735b8 100644
--- a/community/catdoc/PKGBUILD
+++ b/community/catdoc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=catdoc
 pkgver=0.94.4
 pkgrel=1
 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/community/catdvi/PKGBUILD b/community/catdvi/PKGBUILD
index cb8321332..834beee22 100644
--- a/community/catdvi/PKGBUILD
+++ b/community/catdvi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=catdvi
 pkgver=0.14
 pkgrel=5
 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/ccache/PKGBUILD b/community/ccache/PKGBUILD
index 9266b18eb..4b242c6f8 100644
--- a/community/ccache/PKGBUILD
+++ b/community/ccache/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ccache
 pkgver=3.1.9
 pkgrel=1
 pkgdesc="A compiler cache"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ccache.samba.org/"
 license=('GPL3')
 depends=('zlib')
diff --git a/community/ccd2iso/PKGBUILD b/community/ccd2iso/PKGBUILD
index c3a56f762..353d4e2ae 100644
--- a/community/ccd2iso/PKGBUILD
+++ b/community/ccd2iso/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=ccd2iso
 pkgver=0.3
-pkgrel=7
+pkgrel=7.1
 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 1001d3729..0b5fec4d5 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ccid
 pkgver=1.4.15
 pkgrel=1
 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' 'libusbx' 'flex')
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index 3b586a9cb..0becf46f2 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cclive
 pkgver=0.9.3
 pkgrel=3
 pkgdesc='Commandline downloader for popular video websites.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://cclive.sourceforge.net/'
 license=('AGPL3')
 depends=('boost-libs' 'pcre' 'curl' 'libquvi' 'glibmm')
diff --git a/community/ccmalloc/PKGBUILD b/community/ccmalloc/PKGBUILD
index bbb271bf8..62becbedc 100644
--- a/community/ccmalloc/PKGBUILD
+++ b/community/ccmalloc/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=ccmalloc
 pkgver=0.4.0
-pkgrel=2
+pkgrel=2.1
 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/ccrypt/PKGBUILD b/community/ccrypt/PKGBUILD
index 453f40c3a..74c9de428 100644
--- a/community/ccrypt/PKGBUILD
+++ b/community/ccrypt/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ccrypt
 pkgver=1.10
 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 36b524e47..f114d083f 100644
--- a/community/ccze/PKGBUILD
+++ b/community/ccze/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=ccze
 pkgver=0.2.1
-pkgrel=6
+pkgrel=6.2
 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/cdargs/PKGBUILD b/community/cdargs/PKGBUILD
index fdddf911b..92a9ca38f 100644
--- a/community/cdargs/PKGBUILD
+++ b/community/cdargs/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=cdargs
 pkgver=1.35
-pkgrel=3
+pkgrel=3.2
 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/community/cdbxx/PKGBUILD b/community/cdbxx/PKGBUILD
index 0d8075a0c..917f102fe 100644
--- a/community/cdbxx/PKGBUILD
+++ b/community/cdbxx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cdbxx
 pkgver=0.0.1rc2
 pkgrel=4
 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 784863a2c..da091ad55 100644
--- a/community/cdcd/PKGBUILD
+++ b/community/cdcd/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=cdcd
 pkgver=0.6.6
-pkgrel=6
+pkgrel=6.1
 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/cdcover/PKGBUILD b/community/cdcover/PKGBUILD
index 4862b1508..ef473b525 100644
--- a/community/cdcover/PKGBUILD
+++ b/community/cdcover/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=cdcover
 pkgver=0.7.4
-pkgrel=5
+pkgrel=5.1
 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 6d2359f9f..1767fc689 100644
--- a/community/cddb-py/PKGBUILD
+++ b/community/cddb-py/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cddb-py
 pkgver=1.4
 pkgrel=6
 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-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD
index a353a5fcd..97ae477b2 100644
--- a/community/cdemu-daemon/PKGBUILD
+++ b/community/cdemu-daemon/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cdemu-daemon
 pkgver=2.1.1
 pkgrel=1
 pkgdesc="CD/DVD-ROM device emulator daemon"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=(GPL)
 depends=(dbus "vhba-module>=20130607" libao "libmirage>=2.1.0")
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index 636e22b38..d3f435475 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cegui
 pkgver=0.8.3
 pkgrel=2
 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"
 license=("MIT")
 depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly' 'glfw')
diff --git a/community/cellwriter/PKGBUILD b/community/cellwriter/PKGBUILD
index 90f06cc78..5b2016a03 100644
--- a/community/cellwriter/PKGBUILD
+++ b/community/cellwriter/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cellwriter
 pkgver=1.3.5
 pkgrel=1
 pkgdesc='A grid-entry natural handwriting input panel.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://v1.risujin.org/cellwriter/'
 depends=('gtk2' 'libxtst' 'libgnome' 'hicolor-icon-theme')
diff --git a/community/centerim/PKGBUILD b/community/centerim/PKGBUILD
index 5450d1345..32c0de8d1 100644
--- a/community/centerim/PKGBUILD
+++ b/community/centerim/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=centerim
 pkgver=4.22.10
 pkgrel=2
 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 f7912b40d..92131c0ad 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=cgit
 pkgver=0.10
 pkgrel=1
 pkgdesc="A web interface for git written in plain C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://git.zx2c4.com/cgit/"
 license=('GPL2')
 depends=('openssl' 'luajit')
diff --git a/community/cgoban/PKGBUILD b/community/cgoban/PKGBUILD
index 0c16f3877..f621e4340 100644
--- a/community/cgoban/PKGBUILD
+++ b/community/cgoban/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.9.14
 pkgrel=2
 pkgdesc='SGF editor and client for connection to IGS'
 url='http://sourceforge.net/projects/cgoban1/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('libxt')
 source=("http://downloads.sourceforge.net/project/cgoban1/cgoban1/${pkgver}/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/checkinstall/PKGBUILD b/community/checkinstall/PKGBUILD
index 31f879e1c..6cf08ad70 100644
--- a/community/checkinstall/PKGBUILD
+++ b/community/checkinstall/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=checkinstall
 pkgver=1.6.2
 pkgrel=3
 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/chicken/PKGBUILD b/community/chicken/PKGBUILD
index 7c2421a11..f691cc8ea 100644
--- a/community/chicken/PKGBUILD
+++ b/community/chicken/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=chicken
 pkgver=4.8.0.5
 pkgrel=2
 pkgdesc='Compiler for R5RS scheme, featuring handy extensions'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://call-cc.org/'
 license=('BSD')
 depends=('gcc')
diff --git a/community/chntpw/PKGBUILD b/community/chntpw/PKGBUILD
index 20d09257b..1801df6bd 100644
--- a/community/chntpw/PKGBUILD
+++ b/community/chntpw/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=chntpw
 pkgver=140201
 pkgrel=1
 pkgdesc='Offline NT Password Editor - reset passwords in a Windows NT SAM user database 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 5eacdc12e..dca30042c 100644
--- a/community/choqok/PKGBUILD
+++ b/community/choqok/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 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/chromium-bsu/PKGBUILD b/community/chromium-bsu/PKGBUILD
index a81061c19..81b8728c0 100644
--- a/community/chromium-bsu/PKGBUILD
+++ b/community/chromium-bsu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=chromium-bsu
 pkgver=0.9.15.1
 pkgrel=1
 pkgdesc="A fast paced top scrolling shooter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://chromium-bsu.sourceforge.net/"
 license=('custom:artistic')
 depends=('freeglut' 'glu' 'sdl_image' 'openal' 'freealut' 'ftgl' 'fontconfig')
diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD
index 926638dc2..3446c4752 100644
--- a/community/chrony/PKGBUILD
+++ b/community/chrony/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=chrony
 pkgver=1.29.1
 pkgrel=1
 pkgdesc='Lightweight NTP client and server'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://chrony.tuxfamily.org/"
 options=(strip emptydirs)
 license=('GPL')
diff --git a/community/chrootuid/PKGBUILD b/community/chrootuid/PKGBUILD
index 9b6f9a7ee..70049c9c8 100644
--- a/community/chrootuid/PKGBUILD
+++ b/community/chrootuid/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=chrootuid
 pkgver=1.3
 pkgrel=6
-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..e608fc320 100644
--- a/community/chrpath/PKGBUILD
+++ b/community/chrpath/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=chrpath
 pkgver=0.13
-pkgrel=3
+pkgrel=3.2
 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/chuck/PKGBUILD b/community/chuck/PKGBUILD
index 3bd620b5e..509102e12 100644
--- a/community/chuck/PKGBUILD
+++ b/community/chuck/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=chuck
 pkgver=1.3.2.0
 pkgrel=2
 pkgdesc='Concurrent, on-the-fly audio programming language'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://chuck.cs.princeton.edu/'
 license=('GPL')
   depends=('gcc-libs' 'libsndfile' 'jack')
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index 6820abb1d..3d90821e7 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cinnamon-control-center
 pkgver=2.0.9
 pkgrel=1
 pkgdesc="The Control Center for Cinnamon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('cinnamon-settings-daemon' 'cinnamon-translations' 'gnome-menus' 'libgnomekbd' 'network-manager-applet')
 optdepends=('gnome-color-manager: for color management tasks')
 makedepends=('intltool' 'gnome-common' 'docbook-xsl')
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
index a7f25a2ea..e80d28a27 100644
--- a/community/cinnamon-desktop/PKGBUILD
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cinnamon-desktop
 pkgver=2.0.4
 pkgrel=1
 pkgdesc="Library with common API for various Cinnamon modules"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL LGPL)
 depends=(gtk3 libxkbfile)
 makedepends=(intltool gobject-introspection gnome-common)
diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD
index a58fa0bfe..8a7c3ae18 100644
--- a/community/cinnamon-screensaver/PKGBUILD
+++ b/community/cinnamon-screensaver/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cinnamon-screensaver
 pkgver=2.0.3
 pkgrel=3
 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="https://github.com/linuxmint/cinnamon-screensaver"
 backup=(etc/pam.d/cinnamon-screensaver)
diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD
index 60944dee0..7cb41dd16 100644
--- a/community/cinnamon-session/PKGBUILD
+++ b/community/cinnamon-session/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cinnamon-session
 pkgver=2.0.6
 pkgrel=1
 pkgdesc="The Cinnamon Session Handler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL LGPL)
 depends=(cinnamon-desktop upower)
 makedepends=(intltool mesa json-glib xtrans gnome-common)
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
index 7674e7e73..42ee3ef43 100644
--- a/community/cinnamon-settings-daemon/PKGBUILD
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cinnamon-settings-daemon
 pkgver=2.0.8
 pkgrel=2
 pkgdesc="The Cinnamon Settings daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('cinnamon-desktop' 'libibus' 'libcanberra-pulse' 'librsvg' 'nss' 'pulseaudio-alsa' 'upower' 'libnotify')
 makedepends=('intltool' 'docbook-xsl' 'gnome-common')
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index edfc21200..77c9902bd 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cinnamon
 pkgver=2.0.14
 pkgrel=2
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
 depends=('accountsservice' 'caribou' 'cinnamon-settings-daemon' 'cinnamon-session'
diff --git a/community/cjs/PKGBUILD b/community/cjs/PKGBUILD
index eb3b5b709..5202cbbc1 100644
--- a/community/cjs/PKGBUILD
+++ b/community/cjs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cjs
 pkgver=2.0.0
 pkgrel=1
 pkgdesc="Javascript Bindings for Cinnamon"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="https://github.com/linuxmint/cjs"
 license=(GPL)
 depends=(cairo gobject-introspection js185 dbus-glib)
diff --git a/community/cksfv/PKGBUILD b/community/cksfv/PKGBUILD
index 3eed8b975..90f7bf4e7 100644
--- a/community/cksfv/PKGBUILD
+++ b/community/cksfv/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=cksfv
 pkgver=1.3.14
-pkgrel=2
+pkgrel=2.1
 pkgdesc="SFV (Simple File Verification) Checker"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zakalwe.fi/~shd/foss/cksfv"
 license=('GPL')
 depends=('glibc')
diff --git a/community/clamz/PKGBUILD b/community/clamz/PKGBUILD
index 088f9f940..8c3e452d3 100644
--- a/community/clamz/PKGBUILD
+++ b/community/clamz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=clamz
 pkgver=0.5
 pkgrel=2
 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 cc3611ace..f853bab21 100644
--- a/community/clanlib/PKGBUILD
+++ b/community/clanlib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=clanlib
 pkgver=3.0.1
 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' 'sdl_gfx' 'freetype2' 'pcre' 'sqlite' 'libgl')
diff --git a/community/classpath/PKGBUILD b/community/classpath/PKGBUILD
index e5efdd5b7..2b157829b 100644
--- a/community/classpath/PKGBUILD
+++ b/community/classpath/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=classpath
 pkgver=0.98
 pkgrel=6
 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 84a849fe2..270acf835 100644
--- a/community/clearsilver/PKGBUILD
+++ b/community/clearsilver/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=clearsilver
 pkgver=0.10.5
 pkgrel=13
 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/clewn/PKGBUILD b/community/clewn/PKGBUILD
index f557aa50b..318c9764d 100644
--- a/community/clewn/PKGBUILD
+++ b/community/clewn/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=clewn
 pkgver=1.15
-pkgrel=5
+pkgrel=5.1
 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/clipit/PKGBUILD b/community/clipit/PKGBUILD
index bd39684a2..c81f2d53f 100644
--- a/community/clipit/PKGBUILD
+++ b/community/clipit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=clipit
 pkgver=1.4.2
 pkgrel=4
 pkgdesc="Lightweight GTK+ clipboard manager (fork of Parcellite)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkclipit.sourceforge.net/"
 license=('GPL3')
 depends=('gtk2' 'gtk-update-icon-cache' 'hicolor-icon-theme' 'librsvg')
diff --git a/community/cmatrix/PKGBUILD b/community/cmatrix/PKGBUILD
index 2506b8326..3f356a518 100644
--- a/community/cmatrix/PKGBUILD
+++ b/community/cmatrix/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=cmatrix
 pkgver=1.2a
-pkgrel=6
+pkgrel=6.1
 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/community/cmus/PKGBUILD b/community/cmus/PKGBUILD
index cd113b131..6a17da8dc 100644
--- a/community/cmus/PKGBUILD
+++ b/community/cmus/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=cmus
 pkgver=2.5.0
 pkgrel=5
 pkgdesc='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/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index 08e586013..f945efbd2 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=codeblocks
 pkgver=13.12
 pkgrel=2
 pkgdesc='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=('boost-libs' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache'
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD
index 7731c49a5..133830cd5 100644
--- a/community/collectd/PKGBUILD
+++ b/community/collectd/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.4.0
 pkgrel=2
 pkgdesc='Daemon which collects system performance statistics periodically'
 url='http://collectd.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 
 optdepends=('curl: apache, ascent, curl, nginx, and write_http plugins'
diff --git a/community/commoncpp2/PKGBUILD b/community/commoncpp2/PKGBUILD
index 8c34b44ce..5d9204490 100644
--- a/community/commoncpp2/PKGBUILD
+++ b/community/commoncpp2/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=commoncpp2
 pkgver=1.8.1
 pkgrel=4
 pkgdesc="GNU Common C++ 2"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.gnu.org/software/commoncpp/'
 license=('GPL' 'custom')
 depends=('gcc-libs' 'zlib' 'sh')
diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD
index 848134302..b5952d2b5 100644
--- a/community/confuse/PKGBUILD
+++ b/community/confuse/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=confuse
 pkgver=2.7
 pkgrel=3
 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/connman/PKGBUILD b/community/connman/PKGBUILD
index 6f6b5d29f..1edfee031 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.21
 pkgrel=1
 pkgdesc="Wireless LAN network manager"
 url="http://connman.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('dbus-core' 'iptables' 'gnutls' 'glib2')
 conflicts=('openresolv')
diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD
index 006a0fe3a..923eaf1b6 100644
--- a/community/conntrack-tools/PKGBUILD
+++ b/community/conntrack-tools/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=conntrack-tools
 pkgver=1.4.2
 pkgrel=1
 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/conntrack-tools'
 license=('GPL2')
 depends=('libnetfilter_conntrack'
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index f4bbe250e..a653f603c 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=converseen
 pkgver=0.6.7
 pkgrel=1
 pkgdesc="The batch image converter and resizer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://converseen.sourceforge.net/"
 license=('GPL3')
 depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp')
diff --git a/community/corkscrew/PKGBUILD b/community/corkscrew/PKGBUILD
index 0ca69f387..c080c9bd3 100644
--- a/community/corkscrew/PKGBUILD
+++ b/community/corkscrew/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=corkscrew
 pkgver=2.0
 pkgrel=5
 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 e8e8298d0..7d47045fc 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=couchdb
 pkgver=1.5.0
 pkgrel=1
 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-nox' 'js185' 'openssl' 'curl')
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 86f0b2110..4f834922d 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cppcheck
 pkgver=1.63.1
 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=('qt5-base')
diff --git a/community/cpuburn/PKGBUILD b/community/cpuburn/PKGBUILD
index b64b7debd..c7f8e37d9 100644
--- a/community/cpuburn/PKGBUILD
+++ b/community/cpuburn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cpuburn
 pkgver=1.4a
 pkgrel=3
 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 a8973bb03..2dc83fac1 100644
--- a/community/cpulimit/PKGBUILD
+++ b/community/cpulimit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cpulimit
 pkgver=20120918
 pkgrel=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=()
diff --git a/community/critter/PKGBUILD b/community/critter/PKGBUILD
index 713e6c628..31ed675b5 100644
--- a/community/critter/PKGBUILD
+++ b/community/critter/PKGBUILD
@@ -8,7 +8,7 @@ _origname=CriticalMass
 pkgver=1.0.2
 pkgrel=8
 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' 'libgl')
diff --git a/community/cromfs/PKGBUILD b/community/cromfs/PKGBUILD
index 2d3b2454a..ae2a2b9dd 100644
--- a/community/cromfs/PKGBUILD
+++ b/community/cromfs/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=cromfs
 pkgver=1.5.10.1
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Compressed read-only filesystem based on FUSE'
 url='http://bisqwit.iki.fi/source/cromfs.html'
 license=('GPL')
diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD
index 71da6c847..b07e48861 100644
--- a/community/csfml/PKGBUILD
+++ b/community/csfml/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=csfml
 pkgver=2.1
 pkgrel=2
 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 b60f5bea2..1531ff67a 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 c320597fc..09cb60a01 100644
--- a/community/cuetools/PKGBUILD
+++ b/community/cuetools/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cuetools
 pkgver=1.4.0
 pkgrel=2
 pkgdesc="Cue and toc file parsers and utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/svend/cuetools"
 #url="http://developer.berlios.de/projects/cuetools/"
 license=('GPL')
diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD
index 25f153351..a2193f3d4 100644
--- a/community/cuneiform/PKGBUILD
+++ b/community/cuneiform/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.0
 _dpkgver=1.1
 pkgrel=10
 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/curlftpfs/PKGBUILD b/community/curlftpfs/PKGBUILD
index 7f2fe2bd3..aea11bda9 100644
--- a/community/curlftpfs/PKGBUILD
+++ b/community/curlftpfs/PKGBUILD
@@ -11,7 +11,7 @@ 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 80c13857f..5735de8e3 100644
--- a/community/cutter/PKGBUILD
+++ b/community/cutter/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cutter
 pkgver=1.03
 pkgrel=5
 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)
diff --git a/community/cuyo/PKGBUILD b/community/cuyo/PKGBUILD
index dfcd2ffc3..994e167d0 100644
--- a/community/cuyo/PKGBUILD
+++ b/community/cuyo/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.0.0
 pkgrel=1
 epoch=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 ae777b4f8..90aaf9dc2 100644
--- a/community/cwiid/PKGBUILD
+++ b/community/cwiid/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=cwiid
 pkgver=0.6.00+svn201
 pkgrel=1
 pkgdesc="Linux Nintendo Wiimote interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://abstrakraft.org/cwiid"
 depends=('bluez-libs' 'gtk2' 'python2')
 license=('GPL')
diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD
index 2212745bb..3171442d3 100644
--- a/community/cython/PKGBUILD
+++ b/community/cython/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=cython
 pkgver=0.20.1
 pkgrel=1
 pkgdesc="C-Extensions for Python "
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.cython.org"
 license=('APACHE')
 makedepends=('python-setuptools' 'python2-setuptools')
diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD
index 3a6bc1db9..744e10132 100644
--- a/community/dante/PKGBUILD
+++ b/community/dante/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.4.0
 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/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD
index f83370aae..d9bc86e41 100644
--- a/community/darkhttpd/PKGBUILD
+++ b/community/darkhttpd/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=darkhttpd
 pkgver=1.9
 pkgrel=4
 pkgdesc="A small and secure 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 822187924..e31faa832 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=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' 'gcc-libs')
 backup=('etc/conf.d/darkstat.conf')
 source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2
@@ -17,6 +17,7 @@ install=darkstat.install
 md5sums=('1fb31ac01d4689493c917fa622a002e7'
          'e28c56657502ce3e62c1fc6bf5ce59f7'
          'aa9a9effd1e8f08860afcd6439fc94c5')
+options=(!makeflags !distcc)
 
 build() {
   cd $srcdir/darkstat-$pkgver
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 89c6f85c7..143fdfcb7 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.4.1
 _pkgver=1.4
 pkgrel=1
 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 23688f4d4..b44c1be73 100644
--- a/community/datemath/PKGBUILD
+++ b/community/datemath/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=datemath
 pkgver=2.0.10
 pkgrel=4
 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')
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index c4879af58..3cb1ecfb0 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dbmail
 pkgver=3.1.10
 pkgrel=3
 pkgdesc="Fast and scalable sql based mail services"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gmime' 'libzdb' 'mhash' 'libevent')
 makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8.4.1'
 	     'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git')
diff --git a/community/dcfldd/PKGBUILD b/community/dcfldd/PKGBUILD
index c28ded29f..c2dc0e67c 100644
--- a/community/dcfldd/PKGBUILD
+++ b/community/dcfldd/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=dcfldd
 pkgver=1.3.4.1
-pkgrel=3
+pkgrel=3.2
 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/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index cba454fb2..bf8e3e027 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -6,13 +6,14 @@ pkgname=deadbeef
 pkgver=0.6.1
 pkgrel=1
 pkgdesc='A GTK+ audio player for GNU/Linux.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://deadbeef.sourceforge.net'
 license=('GPL2')
 depends=('gtk3' 'alsa-lib' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('libvorbis' 'libmad' 'flac' 'curl' 'imlib2' 'wavpack' 'libsndfile' 'libcdio' 'libcddb'
              'libx11' 'faad2' 'zlib' 'intltool' 'pkgconfig' 'libpulse' 'libzip' 'libsamplerate'
-             'yasm' 'ffmpeg')
+             'ffmpeg')
+[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
 optdepends=('libsamplerate: for Resampler plugin'
             'libvorbis: for Ogg Vorbis playback'
             'libmad: for MP1/MP2/MP3 playback'
diff --git a/community/deja-dup/PKGBUILD b/community/deja-dup/PKGBUILD
index cf7956e0a..678dec6f0 100644
--- a/community/deja-dup/PKGBUILD
+++ b/community/deja-dup/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=deja-dup
 pkgver=28.0
 pkgrel=1
 pkgdesc="Simple backup tool, that hides the complexity of backing up the Right Way and uses duplicity as the backend"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/deja-dup"
 license=('GPL')
 depends=('duplicity' 'libpeas' 'libnotify' 'python2-gobject' 'gvfs' 'xdg-utils')
diff --git a/community/delegate/PKGBUILD b/community/delegate/PKGBUILD
index e9b4f9a87..ef8cb910c 100644
--- a/community/delegate/PKGBUILD
+++ b/community/delegate/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=delegate
 pkgver=9.9.7
 pkgrel=3
 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 fbc3cd89d..d61e565dc 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=denemo
 pkgver=1.1.0
 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' 'gtk3' 'libxml2' 'guile' 'fftw'
diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD
index cfc22754a..f39c822f9 100644
--- a/community/desmume/PKGBUILD
+++ b/community/desmume/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=desmume
 pkgver=0.9.10
 pkgrel=2
 pkgdesc="Nintendo DS emulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://desmume.org/"
 license=('GPL')
 depends=('desktop-file-utils' 'libpcap' 'soundtouch' 'alsa-lib' 'glu' 'sdl' 'gtk2' 'zziplib')
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index d515db1cb..a461cfc56 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=devil
 pkgver=1.7.8
 pkgrel=18
 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/devilspie/PKGBUILD b/community/devilspie/PKGBUILD
index 579bdc74c..451337b27 100644
--- a/community/devilspie/PKGBUILD
+++ b/community/devilspie/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=devilspie
 pkgver=0.22
-pkgrel=5
+pkgrel=5.2
 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')
@@ -18,6 +18,8 @@ md5sums=('4190e12f99ab92c0427e457d9fbfe231')
 build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in
+  sed -i 's|AM_PROG_CC_STDC|AC_PROG_CC|g' configure.in
   export LIBS="-lX11"
   ./autogen.sh
 
diff --git a/community/dfm/PKGBUILD b/community/dfm/PKGBUILD
index dde39f3b9..cc841c627 100644
--- a/community/dfm/PKGBUILD
+++ b/community/dfm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dfm
 pkgver=0.99.9
 pkgrel=3
 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/dgen-sdl/PKGBUILD b/community/dgen-sdl/PKGBUILD
index 67e8015bc..edad3936a 100644
--- a/community/dgen-sdl/PKGBUILD
+++ b/community/dgen-sdl/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dgen-sdl
 pkgver=1.32
 pkgrel=2
 pkgdesc="An emulator for Sega Genesis/Mega Drive systems ported to SDL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dgen.sourceforge.net"
 license=('BSD')
 depends=('sdl' 'libgl' 'libarchive')
diff --git a/community/dhex/PKGBUILD b/community/dhex/PKGBUILD
index d9c0213a3..757c7b7cd 100644
--- a/community/dhex/PKGBUILD
+++ b/community/dhex/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dhex
 pkgver=0.68
 pkgrel=1
 pkgdesc="An ncurses-based hexeditor with a diff mode"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dettus.net/dhex/"
 license=('GPL')
 depends=('ncurses')
diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD
index 57a9906d8..6600500ae 100644
--- a/community/dia/PKGBUILD
+++ b/community/dia/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dia
 pkgver=0.97.2
 pkgrel=5
 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
@@ -23,7 +23,6 @@ md5sums=('1e1180a513fb567709b09bc19f12105e'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
   export PYTHON=/usr/bin/python2
   for file in `find -type f -name '*.py'`; do
       sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file"
diff --git a/community/dia/dia-0.97.2-glib.patch b/community/dia/dia-0.97.2-glib.patch
new file mode 100644
index 000000000..dcda07392
--- /dev/null
+++ b/community/dia/dia-0.97.2-glib.patch
@@ -0,0 +1,40 @@
+--- dia-0.97.2.orig/objects/custom/shape_typeinfo.c	2009-11-07 09:28:34.000000000 -0500
++++ dia-0.97.2/objects/custom/shape_typeinfo.c	2012-12-19 13:59:45.985417287 -0500
+@@ -27,8 +27,7 @@
+ #include "custom_util.h"
+ #include <string.h>
+ #include <stdarg.h>
+-#include <glib/gstrfuncs.h>
+-#include <glib/gstdio.h>
++#include <glib.h>
+ #include <libxml/parser.h>
+ 
+ /*
+--- dia-0.97.2.orig/tests/test-boundingbox.c	2009-11-07 09:28:35.000000000 -0500
++++ dia-0.97.2/tests/test-boundingbox.c	2012-12-19 14:01:03.115674866 -0500
+@@ -26,11 +26,6 @@
+ #define G_LOG_DOMAIN "Dia"
+ 
+ #include <glib.h>
+-#include <glib-object.h>
+-
+-#if GLIB_CHECK_VERSION(2,16,0)
+-#include <glib/gtestutils.h>
+-#endif
+ #include "dialib.h"
+ 
+ /*
+--- dia-0.97.2.orig/tests/test-objects.c	2009-11-07 09:28:35.000000000 -0500
++++ dia-0.97.2/tests/test-objects.c	2012-12-19 14:01:43.978961390 -0500
+@@ -26,11 +26,6 @@
+ #define G_LOG_DOMAIN "Dia"
+ 
+ #include <glib.h>
+-#include <glib-object.h>
+-
+-#if GLIB_CHECK_VERSION(2,16,0)
+-#include <glib/gtestutils.h>
+-#endif
+ 
+ #include "object.h"
+ #include "plug-ins.h"
diff --git a/community/dictd/PKGBUILD b/community/dictd/PKGBUILD
index cd5509161..6b68492d5 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 d52295e95..55bedd6e1 100644
--- a/community/dietlibc/PKGBUILD
+++ b/community/dietlibc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dietlibc
 pkgver=0.33
 pkgrel=3
 pkgdesc="a libc optimized for small size"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fefe.de/dietlibc/"
 license=("GPL")
 options=('staticlibs')
diff --git a/community/diffstat/PKGBUILD b/community/diffstat/PKGBUILD
index 3daf97939..701b9c9d5 100644
--- a/community/diffstat/PKGBUILD
+++ b/community/diffstat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=diffstat
 pkgver=1.58
 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/community/dillo/PKGBUILD b/community/dillo/PKGBUILD
index b79a61416..788495885 100644
--- a/community/dillo/PKGBUILD
+++ b/community/dillo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dillo
 pkgver=3.0.3
 pkgrel=2
 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 20a0f1143..fbba3d610 100644
--- a/community/directfb/PKGBUILD
+++ b/community/directfb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=directfb
 pkgver=1.7.1
 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')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.directfb.org"
 license=('LGPL')
 depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2' 'libdrm' 'libgl' 'mesa')
diff --git a/community/discid/PKGBUILD b/community/discid/PKGBUILD
index a40ba2e98..ddea4d450 100644
--- a/community/discid/PKGBUILD
+++ b/community/discid/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=discid
 pkgver=0.1.3
 pkgrel=5
 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 3363a6c51..3b6d117ea 100644
--- a/community/distcc/PKGBUILD
+++ b/community/distcc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=distcc
 pkgver=3.1
 pkgrel=12
 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' 'dbus')
diff --git a/community/djview4/PKGBUILD b/community/djview4/PKGBUILD
index 0125231f5..2a9d9c6f1 100644
--- a/community/djview4/PKGBUILD
+++ b/community/djview4/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=2
 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=('qt4' 'djvulibre')
 source=("http://downloads.sourceforge.net/djvu/djview-${pkgver}.tar.gz")
 sha1sums=('07f97e32919bfb34ff2d59b928c47ffbc96dcfc5')
diff --git a/community/dmenu/PKGBUILD b/community/dmenu/PKGBUILD
index 9a45dd17f..b0a913cee 100644
--- a/community/dmenu/PKGBUILD
+++ b/community/dmenu/PKGBUILD
@@ -7,10 +7,10 @@
 
 pkgname=dmenu
 pkgver=4.5
-pkgrel=3
+pkgrel=3.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)
diff --git a/community/dnstracer/PKGBUILD b/community/dnstracer/PKGBUILD
index be84c8a92..90e1721a2 100644
--- a/community/dnstracer/PKGBUILD
+++ b/community/dnstracer/PKGBUILD
@@ -3,11 +3,11 @@
 
 pkgname=dnstracer
 pkgver=1.9
-pkgrel=4
+pkgrel=4.1
 pkgdesc='Determines where a given DNS server gets its information from, and follows the chain of DNS servers'
 url='http://www.mavetju.org/unix/dnstracer.php'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.mavetju.org/download/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('b8c60b281c0eb309acd1b1551c51cccb951685c7')
 
diff --git a/community/docbook2x/PKGBUILD b/community/docbook2x/PKGBUILD
index 3ca66b2b0..ac94e850a 100644
--- a/community/docbook2x/PKGBUILD
+++ b/community/docbook2x/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=docbook2x
 pkgver=0.8.8
 pkgrel=11
 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' 'jade')
diff --git a/community/dopewars/PKGBUILD b/community/dopewars/PKGBUILD
index a240c3a0a..ddf79d584 100644
--- a/community/dopewars/PKGBUILD
+++ b/community/dopewars/PKGBUILD
@@ -6,11 +6,11 @@
 
 pkgname=dopewars
 pkgver=1.5.12
-pkgrel=6
+pkgrel=6.2
 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/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index a5c9ff60d..ee7ee3070 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dos2unix
 pkgver=6.0.4
 pkgrel=1
 pkgdesc='Text file format converter'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://waterlan.home.xs4all.nl/dos2unix.html'
 license=('BSD')
 depends=('glibc')
diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD
index 37fe74478..69da7343c 100644
--- a/community/dosbox/PKGBUILD
+++ b/community/dosbox/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dosbox
 pkgver=0.74
 pkgrel=6
 pkgdesc='Emulator with builtin DOS for running DOS Games'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://dosbox.sourceforge.net/'
 license=('GPL')
 depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'glu')
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index f8505196c..c0b476d33 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=drbd
 pkgver=8.4.3
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Userland tools for Distributed Replicated Block Device'
 url='http://www.drbd.org'
 license=('GPL2')
diff --git a/community/drivel/PKGBUILD b/community/drivel/PKGBUILD
index 716462db6..9f4b6f9bc 100644
--- a/community/drivel/PKGBUILD
+++ b/community/drivel/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.0.5
 pkgrel=1
 pkgdesc="GTK client for working with online journals (blogs)"
 url="http://drivel.sourceforge.net/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gnome-vfs' 'gtksourceview2' 'gtkspell' 'libsoup' 'desktop-file-utils')
 makedepends=('intltool' 'gnome-doc-utils')
diff --git a/community/dsniff/PKGBUILD b/community/dsniff/PKGBUILD
index d93df5e98..e0a357243 100644
--- a/community/dsniff/PKGBUILD
+++ b/community/dsniff/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.4b1
 pkgrel=22
 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 fc5cc2114..18dfb80fc 100644
--- a/community/dspam/PKGBUILD
+++ b/community/dspam/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dspam
 pkgver=3.10.2
 pkgrel=8
 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 48d425556..56a24394b 100644
--- a/community/dtach/PKGBUILD
+++ b/community/dtach/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dtach
 pkgver=0.8
 pkgrel=6
 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 c30d667a1..b499d9579 100644
--- a/community/dumb/PKGBUILD
+++ b/community/dumb/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dumb
 pkgver=0.9.3
 pkgrel=7
 pkgdesc='IT, XM, S3M and MOD player library'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('custom:dumb' 'GPL')
 url='http://dumb.sourceforge.net/'
 makedepends=('setconf')
@@ -45,6 +45,8 @@ ALL_TARGETS := core core-examples core-headers
 ALL_TARGETS += allegro allegro-examples allegro-headers
 PREFIX := /usr
 EOF
+  # For some reason -lm is not linked for Allegro examples.
+  sed -ri 's/^(LINK_ALLEGRO := .+)$/\1 -lm/' make/unix.inc
 
   # Use OFLAGS to be able to set CFLAGS without replacing the -I directives
   make -j1 OFLAGS="${CFLAGS}"
diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD
index 468590807..be3a98ef4 100644
--- a/community/dunst/PKGBUILD
+++ b/community/dunst/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dunst
 pkgver=1.0.0
 pkgrel=2
 pkgdesc="Customizable and lightweight notification-daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.knopwob.org/dunst/"
 license=(BSD)
 depends=(libxinerama libxss libxdg-basedir pango)
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD
index 76777625f..d756f7ab1 100644
--- a/community/duplicity/PKGBUILD
+++ b/community/duplicity/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=duplicity
 pkgver=0.6.23
 pkgrel=3
 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=('gnupg' 'librsync' 'ncftp' 'python2-paramiko' 'python2-lockfile')
diff --git a/community/dvdbackup/PKGBUILD b/community/dvdbackup/PKGBUILD
index de1493b26..75eb4771c 100644
--- a/community/dvdbackup/PKGBUILD
+++ b/community/dvdbackup/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dvdbackup
 pkgver=0.4.2
 pkgrel=2
 pkgdesc="A tool to rip video DVDs from the command line"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dvdbackup.sourceforge.net"
 license=('GPL')
 depends=('libdvdread')
diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD
index e7dc16189..1deef5779 100644
--- a/community/dvdisaster/PKGBUILD
+++ b/community/dvdisaster/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dvdisaster
 pkgver=0.72.5
 pkgrel=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/dvgrab/PKGBUILD b/community/dvgrab/PKGBUILD
index c39f319f7..8010ba139 100644
--- a/community/dvgrab/PKGBUILD
+++ b/community/dvgrab/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=dvgrab
 pkgver=3.5
-pkgrel=4
+pkgrel=4.2
 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/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD
index 96c1e20b6..56c5f9122 100644
--- a/community/dvtm/PKGBUILD
+++ b/community/dvtm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dvtm
 pkgver=0.10
 pkgrel=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/dwb/PKGBUILD b/community/dwb/PKGBUILD
index 9c7fb1a8a..a21b588d5 100644
--- a/community/dwb/PKGBUILD
+++ b/community/dwb/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2013.03.30
 pkgrel=2
 pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot" 
 url="http://portix.bitbucket.org/dwb/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 install=dwb.install
 license=('GPL')
 depends=('libwebkit' 'desktop-file-utils')
diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD
index 701edc468..2272dff16 100644
--- a/community/dwdiff/PKGBUILD
+++ b/community/dwdiff/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dwdiff
 pkgver=2.0.9
 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..b598b41ab 100644
--- a/community/dwm/PKGBUILD
+++ b/community/dwm/PKGBUILD
@@ -5,10 +5,10 @@
 
 pkgname=dwm
 pkgver=6.0
-pkgrel=1
+pkgrel=1.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 692b1ceba..03a6f1456 100644
--- a/community/dxpc/PKGBUILD
+++ b/community/dxpc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dxpc
 pkgver=3.9.2
 pkgrel=4
 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 23c38e6f6..820a5449a 100644
--- a/community/dynamite/PKGBUILD
+++ b/community/dynamite/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dynamite
 pkgver=0.1.1
 pkgrel=4
 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 c3e8b3a85..377c961a5 100644
--- a/community/dzen2/PKGBUILD
+++ b/community/dzen2/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=dzen2
 pkgver=0.9.5git
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="X notification utility"
 url="https://github.com/robm/dzen"
 license=("MIT")
@@ -22,7 +22,6 @@ build()
   LIBS=" -L/usr/lib -lc -lXft -lXpm -lXinerama -lX11"
 
   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/easystroke/PKGBUILD b/community/easystroke/PKGBUILD
index cf296f3f3..d56928730 100644
--- a/community/easystroke/PKGBUILD
+++ b/community/easystroke/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=easystroke
 pkgver=0.6.0
 pkgrel=4
 pkgdesc='Use mouse gestures to initiate commands and hotkeys.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://easystroke.sourceforge.net/'
 license=('custom:ISC')
 depends=('gtkmm3' 'boost-libs' 'libxtst' 'dbus-glib' 'xorg-server')
diff --git a/community/ebtables/PKGBUILD b/community/ebtables/PKGBUILD
index 4bc2b44ba..139126aea 100644
--- a/community/ebtables/PKGBUILD
+++ b/community/ebtables/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ebtables
 pkgver=2.0.10_4
 pkgrel=4
 pkgdesc='Ethernet bridge filtering utilities'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ebtables.sourceforge.net/'
 depends=('perl' 'bash')
 license=('GPL2')
diff --git a/community/echat/PKGBUILD b/community/echat/PKGBUILD
index 38544e955..1d10f3c86 100644
--- a/community/echat/PKGBUILD
+++ b/community/echat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=echat
 pkgver=0.04beta1
 pkgrel=3
 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 $srcdir/$pkgname-${pkgver}
+  sed -ri -e 's/^CFLAGS=.*/CFLAGS='"${CFLAGS}"'/' \
+    -e 's/@\$\(CC\) -o \$@ /@$(CC) '"${LDFLAGS}"' -o $@ /' Makefile
   make
   install -D -m 0755 echat $pkgdir/usr/bin/echat
   install -D -m 0644 doc/echat.1 $pkgdir/usr/share/man/man1/echat.1
diff --git a/community/ecryptfs-utils/PKGBUILD b/community/ecryptfs-utils/PKGBUILD
index 07a107384..09a7350f6 100644
--- a/community/ecryptfs-utils/PKGBUILD
+++ b/community/ecryptfs-utils/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=ecryptfs-utils
 pkgver=103
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Enterprise-class stacked cryptographic filesystem for Linux"
 url="https://launchpad.net/ecryptfs"
 license=('GPL')
diff --git a/community/efax-gtk/PKGBUILD b/community/efax-gtk/PKGBUILD
index ef2d279e0..28cc80b15 100644
--- a/community/efax-gtk/PKGBUILD
+++ b/community/efax-gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=efax-gtk
 pkgver=3.2.12
 pkgrel=1
 pkgdesc="A GUI front end for the 'efax' fax program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://efax-gtk.sourceforge.net/"
 license=('GPL')
 depends=('dbus-glib' 'ghostscript' 'c++-gtk-utils')
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index c73e726d7..17260bbb5 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ejabberd
 pkgver=13.12
 pkgrel=1
 pkgdesc="Jabber server written in Erlang"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://www.ejabberd.im/"
 license=("GPL")
 depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 776295bd7..0f20c23a3 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=electricsheep
 pkgver=2.7b33
 pkgrel=15
 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' 'wxgtk' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee')
diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD
index d2f08274f..a32b2d338 100644
--- a/community/elinks/PKGBUILD
+++ b/community/elinks/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=0.13
 _commit="a3751107033599b835eaafa61177c8d4dda4b7ef"
 pkgrel=15
 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' 'lua51' 'libidn' 'js185'
diff --git a/community/emacs-nox/PKGBUILD b/community/emacs-nox/PKGBUILD
index 75cb2ecb3..0e2e9b214 100644
--- a/community/emacs-nox/PKGBUILD
+++ b/community/emacs-nox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=emacs-nox
 pkgver=24.3
 pkgrel=1
 pkgdesc="The extensible, customizable, self-documenting real-time display editor, without X11 support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/emacs/emacs.html"
 license=('GPL3')
 depends=('dbus-core' 'ncurses' 'perl')
diff --git a/community/emelfm2/PKGBUILD b/community/emelfm2/PKGBUILD
index 15788b386..cbacf0464 100644
--- a/community/emelfm2/PKGBUILD
+++ b/community/emelfm2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=emelfm2
 pkgver=0.9.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=('GPL3')
diff --git a/community/emerillon/PKGBUILD b/community/emerillon/PKGBUILD
index 979a501a5..6de25493c 100644
--- a/community/emerillon/PKGBUILD
+++ b/community/emerillon/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=emerillon
 pkgver=0.1.90
 pkgrel=5
 pkgdesc="Map viewer for OpenStreetMap"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/emerillon/"
 license=('GPL')
 depends=('libchamplain' 'geoclue' 'libpeas' 'rest')
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index e3172326e..cd36df66e 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=encfs
 pkgver=1.7.4
 pkgrel=12
 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 b404f25b8..7f518f162 100644
--- a/community/enet/PKGBUILD
+++ b/community/enet/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=enet
 pkgver=1.3.11
 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..e33389d06 100644
--- a/community/enter/PKGBUILD
+++ b/community/enter/PKGBUILD
@@ -6,15 +6,18 @@ 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')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('47a77ae57e667f887f856c0a126d667a')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+	enter-0.0.9-X11_Xext.patch)
+md5sums=('47a77ae57e667f887f856c0a126d667a'
+	 '7e7dee216860d11833706b70b17b6905')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/enter-0.0.9-X11_Xext.patch
   sed -i 's|\[xft-config\]|\[pkg-config\]|' configure.ac
   autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc CFLAGS="$CFLAGS -lcrypt"
diff --git a/community/enter/enter-0.0.9-X11_Xext.patch b/community/enter/enter-0.0.9-X11_Xext.patch
new file mode 100644
index 000000000..bf0459c30
--- /dev/null
+++ b/community/enter/enter-0.0.9-X11_Xext.patch
@@ -0,0 +1,13 @@
+--- enter-0.0.9.orig/configure.ac	2007-03-26 18:35:54.000000000 -0500
++++ enter-0.0.9/configure.ac	2012-11-07 02:41:16.137947211 -0500
+@@ -52,6 +52,10 @@
+ AC_CHECK_LIB([Imlib2], [imlib_context_new],,
+ 			AC_MSG_ERROR([You need to have Imlib2.]))
+ 
++AC_CHECK_LIB(X11, XClearWindow)
++
++AC_CHECK_LIB(Xext, XdbeQueryExtension)
++
+ # Checks for header files.
+ AC_SUBST([X_CFLAGS])
+ AC_SUBST([X_LIBS])
diff --git a/community/epic4/PKGBUILD b/community/epic4/PKGBUILD
index 2de7e5d3d..9e691eef6 100644
--- a/community/epic4/PKGBUILD
+++ b/community/epic4/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=epic4
 pkgver=2.10.2
 pkgrel=1
 pkgdesc="It's 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/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD
index 5ab68f661..4482f52ef 100644
--- a/community/erlang-sdl/PKGBUILD
+++ b/community/erlang-sdl/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=erlang-sdl
 pkgver=1.2
 pkgrel=7
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 pkgdesc='SDL and OpenGL bindings for Erlang'
 url='http://esdl.sourceforge.net/'
 license=('custom')
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 3f2dcb7d6..09df10d21 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -10,7 +10,7 @@ pkgbase=erlang
 pkgname=('erlang' 'erlang-unixodbc')
 pkgver=R16B03_1
 pkgrel=1
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.erlang.org/'
 license=('custom')
 makedepends=('perl' 'mesa' 'lksctp-tools' 'unixodbc' 'wxgtk' 'glu')
diff --git a/community/erlang/PKGBUILD.mips64el b/community/erlang/PKGBUILD.mips64el
new file mode 100644
index 000000000..aa5b12792
--- /dev/null
+++ b/community/erlang/PKGBUILD.mips64el
@@ -0,0 +1,71 @@
+# $Id: PKGBUILD 67366 2012-03-10 17:20:02Z tdziedzic $
+# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
+# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
+# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
+
+pkgname=erlang
+pkgver=R14B04
+pkgrel=2
+pkgdesc="A small concurrent functional programming language developed by Ericsson."
+arch=(i686 x86_64 'mips64el')
+url="http://www.erlang.org/index.html"
+license=('custom')
+depends=('ncurses' 'glibc')
+makedepends=('perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
+optdepends=('wxgtk: for wx support' 'unixodbc: database')
+
+options=('!makeflags')
+source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
+	http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
+md5sums=('4b469729f103f52702bfb1fb24529dc0'
+         'f31e72518daae4007f595c0b224dd59f')
+
+# please check these deps reported by namcap when you do the next build:
+#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar)
+#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so'])
+
+
+build() {
+  cd "$srcdir/otp_src_${pkgver/./-}"
+  export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
+  export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
+
+  sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
+
+  CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
+  make
+}
+
+package() {
+  cd "$srcdir/otp_src_${pkgver/./-}"
+  make INSTALL_PREFIX="$pkgdir" install
+
+# fix prefix
+  cd "$pkgdir"
+  for i in usr/lib/erlang/bin/erl \
+      usr/lib/erlang/bin/start \
+      usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \
+      usr/lib/erlang/erts-${ERTSVERSION}/bin/start \
+      usr/lib/erlang/releases/RELEASES ;do
+    sed -i "s#$pkgdir##" $i
+  done
+
+# fix symlinks
+  cd "$pkgdir/usr/lib/erlang/bin"
+  ln -sf ../erts-${ERTSVERSION}/bin/epmd
+
+  cd "$pkgdir/usr/bin"
+  for file in *; do
+    ln -sfv ../lib/erlang/bin/$file
+  done
+
+  ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call"
+
+# install documentation
+  install -d "$pkgdir/usr/share/doc/erlang"
+  install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
+  cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
+
+  install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
+
+}
diff --git a/community/esmtp/PKGBUILD b/community/esmtp/PKGBUILD
index bc2f55d47..55a5f5584 100644
--- a/community/esmtp/PKGBUILD
+++ b/community/esmtp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=esmtp
 pkgver=1.2
 pkgrel=6
 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 23df11aaf..37b66824b 100644
--- a/community/espeak/PKGBUILD
+++ b/community/espeak/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=espeak
 pkgver=1.47.11
 pkgrel=1
 pkgdesc='Text to Speech engine for English, with support for other languages'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://espeak.sourceforge.net/'
 license=('GPL')
 depends=('portaudio' 'libpulse')
diff --git a/community/espeakup/PKGBUILD b/community/espeakup/PKGBUILD
index b7ca9b086..1f434f458 100644
--- a/community/espeakup/PKGBUILD
+++ b/community/espeakup/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=espeakup
 pkgver=0.71
 pkgrel=8
 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=(http://the-brannons.com/espeakup-0.71.tar.bz2
diff --git a/community/etherape/PKGBUILD b/community/etherape/PKGBUILD
index c56998921..ee8c6f4c3 100644
--- a/community/etherape/PKGBUILD
+++ b/community/etherape/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=etherape
 pkgver=0.9.13
 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/ettercap/PKGBUILD b/community/ettercap/PKGBUILD
index 5c891ee70..adaf8d9e0 100644
--- a/community/ettercap/PKGBUILD
+++ b/community/ettercap/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=ettercap
 pkgname=('ettercap' 'ettercap-gtk')
 pkgver=0.8.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ettercap.github.com/ettercap/"
 license=('GPL')
 depends=('openssl' 'libpcap' 'pcre' 'libltdl' 'libnet')
diff --git a/community/exfat-utils/PKGBUILD b/community/exfat-utils/PKGBUILD
index 011d78ed2..50dde47cd 100644
--- a/community/exfat-utils/PKGBUILD
+++ b/community/exfat-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=exfat-utils
 pkgver=1.0.1
 pkgrel=1
 pkgdesc="Utilities for exFAT file system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/exfat/"
 license=('GPL3')
 depends=('glibc')
diff --git a/community/exim/PKGBUILD b/community/exim/PKGBUILD
index 403671761..d2a20dd93 100644
--- a/community/exim/PKGBUILD
+++ b/community/exim/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=exim
 pkgver=4.82
 pkgrel=1
 pkgdesc="Message Transfer Agent"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.exim.org/'
 license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim)
diff --git a/community/ext3grep/PKGBUILD b/community/ext3grep/PKGBUILD
index f3ac6d1cd..69758612c 100644
--- a/community/ext3grep/PKGBUILD
+++ b/community/ext3grep/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=ext3grep
 pkgver=0.10.2
-pkgrel=2
+pkgrel=2.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')
 makedepends=('e2fsprogs' 'patch')
diff --git a/community/ext4magic/PKGBUILD b/community/ext4magic/PKGBUILD
index 539d58039..c156a0e4b 100644
--- a/community/ext4magic/PKGBUILD
+++ b/community/ext4magic/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ext4magic
 pkgver=0.3.1
 pkgrel=2
 pkgdesc='Recover deleted or overwritten files on ext3 and ext4 filesystems'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://developer.berlios.de/projects/ext4magic/'
 license=('GPL2')
 depends=('bzip2' 'file' 'util-linux' 'e2fsprogs')
@@ -14,7 +14,7 @@ md5sums=('59c194b71e33aa6bd098b91f802e67d5')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sbindir=/usr/bin
+  ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST
   make
 }
 
diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD
index e0fb1722c..1f5382f1e 100644
--- a/community/extremetuxracer/PKGBUILD
+++ b/community/extremetuxracer/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=extremetuxracer
 pkgver=0.6.0
 pkgrel=1
 pkgdesc="Downhill racing game starring Tux"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/extremetuxracer/"
 license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'glu' 'freetype2')
diff --git a/community/extundelete/PKGBUILD b/community/extundelete/PKGBUILD
index 2cef4387f..70591c45d 100644
--- a/community/extundelete/PKGBUILD
+++ b/community/extundelete/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=extundelete
 pkgver=0.2.4
 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 ac52bc6ae..e6ac0ec5d 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=fatrat
 pkgver=1.2.0_beta2
 pkgrel=11
 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' 'libtorrent-rasterbar' 'pion' 'qtwebkit' 'curl')
diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD
index 7879f7c88..eaf7915c1 100644
--- a/community/fb-client/PKGBUILD
+++ b/community/fb-client/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=fb-client
 pkgver=1.3.2
 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' 'bash')
diff --git a/community/fbdump/PKGBUILD b/community/fbdump/PKGBUILD
index 631bdd188..ed68de1cf 100644
--- a/community/fbdump/PKGBUILD
+++ b/community/fbdump/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fbdump
 pkgver=0.4.2
 pkgrel=3
 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=()
diff --git a/community/fbgetty/PKGBUILD b/community/fbgetty/PKGBUILD
index 77cc00f8e..b202cd172 100644
--- a/community/fbgetty/PKGBUILD
+++ b/community/fbgetty/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.1.698
 pkgrel=5
 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')
@@ -15,7 +15,7 @@ build()
 {
   cd $srcdir/$pkgname-$pkgver
 
-  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbindir=/usr/bin --build=$CHOST
 
   patch src/options.c <<EOF
 33a34
diff --git a/community/fbgrab/PKGBUILD b/community/fbgrab/PKGBUILD
index 9190eda5c..9621fa39e 100644
--- a/community/fbgrab/PKGBUILD
+++ b/community/fbgrab/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fbgrab
 pkgver=1.0
 pkgrel=7
 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 aa75c9216..a1b8f1620 100644
--- a/community/fbpanel/PKGBUILD
+++ b/community/fbpanel/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=fbpanel
 pkgver=6.1
 pkgrel=6
 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 a3a333ecc..3303b96b9 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fbreader
 pkgver=0.99.4
 pkgrel=4
 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' 'qt4' 'libunibreak' 'sqlite')
diff --git a/community/fbterm/PKGBUILD b/community/fbterm/PKGBUILD
index d2ebdb0d7..e0244aa84 100644
--- a/community/fbterm/PKGBUILD
+++ b/community/fbterm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fbterm
 pkgver=1.7.0
 pkgrel=5
 pkgdesc="A fast terminal emulator for linux with frame buffer device or VESA video card"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fbterm/"
 license=('GPL2')
 depends=('gcc-libs' 'fontconfig')
diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD
index aef9871e8..62d65d3be 100644
--- a/community/fbv/PKGBUILD
+++ b/community/fbv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fbv
 pkgver=1.0b
 pkgrel=8
 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' 'giflib' 'libjpeg')
diff --git a/community/fceux/PKGBUILD b/community/fceux/PKGBUILD
index 185825bd5..b9f2718f1 100644
--- a/community/fceux/PKGBUILD
+++ b/community/fceux/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.2.2
 pkgrel=1
 url='http://www.fceux.com/'
 pkgdesc='Fast and ultra-compatible NES/Famicom emulator'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
 depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua51' 'libgl' 'shared-mime-info')
 makedepends=('scons' 'mesa-libgl' 'glu')
diff --git a/community/fceux/fceux-2.1.5-gcc46.patch b/community/fceux/fceux-2.1.5-gcc46.patch
new file mode 100644
index 000000000..540382278
--- /dev/null
+++ b/community/fceux/fceux-2.1.5-gcc46.patch
@@ -0,0 +1,11 @@
+--- fceu2.1.5.orig/src/file.cpp	2010-09-18 19:05:09.000000000 -0500
++++ fceu2.1.5/src/file.cpp	2012-12-19 10:47:44.065106719 -0500
+@@ -310,7 +310,7 @@
+ 				if(magic==0x088b1f) {

+ 					 // maybe gzip... 

+ 

+-					void* gzfile = gzopen(fileToOpen.c_str(),"rb");

++					gzFile gzfile = gzopen(fileToOpen.c_str(),"rb");

+ 					if(gzfile) {

+ 						delete fp;

+ 

diff --git a/community/fceux/fceux-2.1.5-gcc47.patch b/community/fceux/fceux-2.1.5-gcc47.patch
new file mode 100644
index 000000000..8d6891dfa
--- /dev/null
+++ b/community/fceux/fceux-2.1.5-gcc47.patch
@@ -0,0 +1,22 @@
+--- fceu2.1.5.orig/src/utils/endian.h	2010-11-07 18:33:11.000000000 -0500
++++ fceu2.1.5/src/utils/endian.h	2012-12-19 10:36:45.076124554 -0500
+@@ -93,19 +93,5 @@
+ 	}

+ }

+ 

+-template<typename T>

+-int writele(T *Bufo, EMUFILE*os)

+-{

+-	CTASSERT(sizeof(T)==1||sizeof(T)==2||sizeof(T)==4||sizeof(T)==8);

+-	switch(sizeof(T)) {

+-		case 1: return write8le((uint8*)Bufo,os);

+-		case 2: return write16le((uint16*)Bufo,os);

+-		case 4: return write32le((uint32*)Bufo,os);

+-		case 8: return write64le((uint64*)Bufo,os);

+-		default:

+-			return 0;

+-	}

+-}

+-

+ #endif //__FCEU_ENDIAN

+ 

diff --git a/community/fceux/fceux-2.1.5-underlink.patch b/community/fceux/fceux-2.1.5-underlink.patch
new file mode 100644
index 000000000..c08137a51
--- /dev/null
+++ b/community/fceux/fceux-2.1.5-underlink.patch
@@ -0,0 +1,13 @@
+--- fceu2.1.5.orig/SConstruct	2011-06-07 21:33:28.876609681 +0200
++++ fceu2.1.5/SConstruct	2011-06-07 21:34:11.420368249 +0200
+@@ -70,6 +70,10 @@
+     env.ParseConfig('pkg-config --cflags --libs gtk+-3.0')
+     env.Append(CPPDEFINES=["_GTK3"])
+     env.Append(CCFLAGS = ["-D_GTK"])
++  env.Append(LIBS =["-lz"])
++  env.Append(LIBS =["-ldl"])
++  env.Append(LIBS =["-lX11"])
++
+   ### Lua platform defines
+   ### Applies to all files even though only lua needs it, but should be ok
+   if env['LUA']:
diff --git a/community/fcgiwrap/PKGBUILD b/community/fcgiwrap/PKGBUILD
index 068d81a63..0e862671f 100644
--- a/community/fcgiwrap/PKGBUILD
+++ b/community/fcgiwrap/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fcgiwrap
 pkgver=1.1.0
 pkgrel=3
 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' 'systemd')
diff --git a/community/fcitx-anthy/PKGBUILD b/community/fcitx-anthy/PKGBUILD
index 4bb6d088f..7992b1dac 100644
--- a/community/fcitx-anthy/PKGBUILD
+++ b/community/fcitx-anthy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fcitx-anthy
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Fcitx Wrapper for anthy."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.5' 'anthy')
diff --git a/community/fcitx-chewing/PKGBUILD b/community/fcitx-chewing/PKGBUILD
index f2dc14eaa..2105b8930 100644
--- a/community/fcitx-chewing/PKGBUILD
+++ b/community/fcitx-chewing/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcitx-chewing
 pkgver=0.2.1
 pkgrel=1
 pkgdesc='Fcitx Wrapper for chewing'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/fcitx-chewing"
 license=('GPL')
 depends=('libchewing' 'fcitx>=4.2.7')
diff --git a/community/fcitx-cloudpinyin/PKGBUILD b/community/fcitx-cloudpinyin/PKGBUILD
index 479126f45..36c0996b4 100644
--- a/community/fcitx-cloudpinyin/PKGBUILD
+++ b/community/fcitx-cloudpinyin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fcitx-cloudpinyin
 pkgver=0.3.3
 pkgrel=1
 pkgdesc='Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/fcitx-cloudpinyin"
 license=('GPL')
 depends=('curl' 'fcitx')
diff --git a/community/fcitx-configtool/PKGBUILD b/community/fcitx-configtool/PKGBUILD
index 5743a51cc..2a0a88269 100644
--- a/community/fcitx-configtool/PKGBUILD
+++ b/community/fcitx-configtool/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcitx-configtool
 pkgver=0.4.8
 pkgrel=1
 pkgdesc="GTK based config tool for Fcitx"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fcitx.googlecode.com/"
 license=('GPL2')
 depends=("fcitx>=4.2.7" "gtk3" "iso-codes")
diff --git a/community/fcitx-fbterm/PKGBUILD b/community/fcitx-fbterm/PKGBUILD
index 127ac3897..67fa435c5 100644
--- a/community/fcitx-fbterm/PKGBUILD
+++ b/community/fcitx-fbterm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fcitx-fbterm
 pkgver=0.2.0
 pkgrel=2
 pkgdesc="Fbterm support for Fcitx."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL2')
 depends=('fcitx>=4.1.0' 'fbterm')
diff --git a/community/fcitx-googlepinyin/PKGBUILD b/community/fcitx-googlepinyin/PKGBUILD
index f10ec9238..05e1f1783 100644
--- a/community/fcitx-googlepinyin/PKGBUILD
+++ b/community/fcitx-googlepinyin/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcitx-googlepinyin
 pkgver=0.1.6
 pkgrel=3
 pkgdesc="Fcitx Wrapper for googlepinyin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.0' 'libgooglepinyin>=0.1.2')
diff --git a/community/fcitx-hangul/PKGBUILD b/community/fcitx-hangul/PKGBUILD
index 02d3bdf5a..9ba04b596 100644
--- a/community/fcitx-hangul/PKGBUILD
+++ b/community/fcitx-hangul/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcitx-hangul
 pkgver=0.3.0
 pkgrel=1
 pkgdesc="Hangul (Korean) support for fcitx"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx/"
 license=('GPL2')
 depends=('fcitx>=4.2.7' 'libhangul')
diff --git a/community/fcitx-kkc/PKGBUILD b/community/fcitx-kkc/PKGBUILD
index ede7a106b..23a4081e4 100644
--- a/community/fcitx-kkc/PKGBUILD
+++ b/community/fcitx-kkc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcitx-kkc
 pkgver=0.1.0
 pkgrel=1
 pkgdesc="Fcitx Wrapper for libkkc"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.8' 'libkkc>=0.2.3' 'libkkc-data' 'skk-jisyo' 'fcitx-qt4')
diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD
index cb7ec4e01..4eb6a5462 100644
--- a/community/fcitx-libpinyin/PKGBUILD
+++ b/community/fcitx-libpinyin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fcitx-libpinyin
 pkgver=0.3.1
 pkgrel=1
 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/fcitx-libpinyin"
 license=('GPL')
 depends=('fcitx' 'libpinyin' 'fcitx-qt4' 'qtwebkit')
diff --git a/community/fcitx-m17n/PKGBUILD b/community/fcitx-m17n/PKGBUILD
index 1c3a9b140..dde8ff0a7 100644
--- a/community/fcitx-m17n/PKGBUILD
+++ b/community/fcitx-m17n/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcitx-m17n
 pkgver=0.2.2
 pkgrel=1
 pkgdesc="Fcitx Wrapper for m17n."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.7' 'm17n-lib')
diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index 1dff5a8aa..d519edf26 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -16,7 +16,7 @@ pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac a
 pkgver=1.13.1651.102
 _patchver=${pkgver}.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/mozc/"
 license=('custom')
 depends=('qt4' 'fcitx' 'zinnia')
diff --git a/community/fcitx-rime/PKGBUILD b/community/fcitx-rime/PKGBUILD
index c9bd7b8e7..b72135fb0 100644
--- a/community/fcitx-rime/PKGBUILD
+++ b/community/fcitx-rime/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fcitx-rime
 pkgver=0.3.0
 pkgrel=2
 pkgdesc='Fcitx Wrapper for librime'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx' "librime" "brise")
diff --git a/community/fcitx-sayura/PKGBUILD b/community/fcitx-sayura/PKGBUILD
index 318877548..82c6c585b 100644
--- a/community/fcitx-sayura/PKGBUILD
+++ b/community/fcitx-sayura/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=fcitx-sayura
 pkgver=0.1.1
 pkgrel=1
 pkgdesc="Sinhala Transe IME engine for fcitx."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/fcitx-sayura"
 license=('GPL')
 depends=('fcitx>=4.2.8')
diff --git a/community/fcitx-sunpinyin/PKGBUILD b/community/fcitx-sunpinyin/PKGBUILD
index d6b1e690c..5a6413427 100644
--- a/community/fcitx-sunpinyin/PKGBUILD
+++ b/community/fcitx-sunpinyin/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcitx-sunpinyin
 pkgver=0.4.1
 pkgrel=1
 pkgdesc="Fcitx Wrapper for sunpinyin, Statistical Language Model based pinyin IME by Sun"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 install=fcitx-sunpinyin.install
diff --git a/community/fcitx-ui-light/PKGBUILD b/community/fcitx-ui-light/PKGBUILD
index 6ffa8a1d5..88a45c1a4 100644
--- a/community/fcitx-ui-light/PKGBUILD
+++ b/community/fcitx-ui-light/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fcitx-ui-light
 pkgver=0.1.3
 pkgrel=2
 pkgdesc="Light weight xlib and xft based ui for fcitx."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL2')
 depends=('fcitx>=4.1.0' 'libxpm')
diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD
index c2c3599ff..db7e705b2 100644
--- a/community/fcitx-unikey/PKGBUILD
+++ b/community/fcitx-unikey/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fcitx-unikey
 pkgver=0.2.3
 pkgrel=1
 pkgdesc="Fcitx Wrapper for unikey"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.8')
diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD
index b02e94367..e878a396b 100644
--- a/community/fcitx/PKGBUILD
+++ b/community/fcitx/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4')
 pkgver=4.2.8.3
 pkgrel=2
 groups=('fcitx-im')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fcitx-im.org"
 license=('GPL')
 makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \
diff --git a/community/fcrackzip/PKGBUILD b/community/fcrackzip/PKGBUILD
index efc742847..4cd7f756a 100644
--- a/community/fcrackzip/PKGBUILD
+++ b/community/fcrackzip/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fcrackzip
 pkgver=1.0
 pkgrel=4
 pkgdesc='Zip file password cracker'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oldhome.schmorp.de/marc/$pkgname.html"
 license=('GPL')
 depends=('glibc')
diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index f43d56671..a7fe33a33 100644
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=fcron
 pkgver=3.1.2
 pkgrel=8
 pkgdesc='Feature-rich cron implementation'
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url='http://fcron.free.fr'
 license=('GPL')
 depends=('pam' 'run-parts')
diff --git a/community/fdm/PKGBUILD b/community/fdm/PKGBUILD
index 9cf7f7696..c02b55953 100644
--- a/community/fdm/PKGBUILD
+++ b/community/fdm/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=fdm
 pkgver=1.7
 pkgrel=1
 pkgdesc='Program to fetch and deliver mail'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://fdm.sourceforge.net/'
 license=('BSD')
 depends=('openssl' 'tdb' 'zlib')
diff --git a/community/fdupes/PKGBUILD b/community/fdupes/PKGBUILD
index 3b9c2b0d1..86e64c544 100644
--- a/community/fdupes/PKGBUILD
+++ b/community/fdupes/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fdupes
 pkgver=1.51
 pkgrel=2
 pkgdesc="a program for identifying or deleting duplicate files residing within specified directories"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/fdupes/"
 license=('MIT')
 depends=(glibc)
diff --git a/community/ffmpeg2theora/PKGBUILD b/community/ffmpeg2theora/PKGBUILD
index db3c97bc3..6f65f9375 100644
--- a/community/ffmpeg2theora/PKGBUILD
+++ b/community/ffmpeg2theora/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ffmpeg2theora
 pkgver=0.29
 pkgrel=4
 pkgdesc="Simple converter to create Ogg Theora files"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://www.v2v.cc/~j/ffmpeg2theora/"
 license=('GPL')
 depends=('ffmpeg')
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index 6e92ae8d9..8e23f62bb 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=filezilla
 pkgver=3.7.4.1
 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' 'wxgtk2.8' 'libidn' 'hicolor-icon-theme' 'sqlite' 'gnutls')
diff --git a/community/fillets-ng/PKGBUILD b/community/fillets-ng/PKGBUILD
index a7a468d29..fbf9df50f 100644
--- a/community/fillets-ng/PKGBUILD
+++ b/community/fillets-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.0.1
 pkgrel=4
 pkgdesc="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' 'lua51' 'fribidi' 'gcc-libs' 'libx11' 'sdl_mixer' 'sdl_ttf' 'sdl_image' 'desktop-file-utils')
 makedepends=('gendesk')
diff --git a/community/fish/PKGBUILD b/community/fish/PKGBUILD
index 570885d15..ddd26bb8c 100644
--- a/community/fish/PKGBUILD
+++ b/community/fish/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=fish
 pkgver=2.1.0
 pkgrel=1
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://fishshell.com/'
 license=('GPL2')
 depends=('python2' 'inetutils')
diff --git a/community/flac123/PKGBUILD b/community/flac123/PKGBUILD
index e101e6f20..cb88cdcab 100644
--- a/community/flac123/PKGBUILD
+++ b/community/flac123/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=flac123
 pkgver=0.0.12
 pkgrel=1
-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 9a6d063a6..ee4aee2b5 100644
--- a/community/flam3/PKGBUILD
+++ b/community/flam3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=flam3
 pkgver=3.0.1
 pkgrel=4
 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 925430b13..9cc1bb68c 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -9,10 +9,10 @@ pkgver=0.9.7
 pkgrel=2
 pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips"
 url="http://www.flashrom.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libftdi-compat' 'pciutils')
-optdepends=('dmidecode: for SMBIOS/DMI table decoder support')
+[ "$CARCH" != "mips64el" ] && optdepends=('dmidecode: for SMBIOS/DMI table decoder support')
 source=("http://download.flashrom.org/releases/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('d239bafa1b46619d851f70f84a5b122a')
 
diff --git a/community/fldiff/PKGBUILD b/community/fldiff/PKGBUILD
index e528e4221..aa55b12b6 100644
--- a/community/fldiff/PKGBUILD
+++ b/community/fldiff/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fldiff
 pkgver=1.1
 pkgrel=7
 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 25b1ae489..a0e19b885 100644
--- a/community/flickcurl/PKGBUILD
+++ b/community/flickcurl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=flickcurl
 pkgver=1.25
 pkgrel=1
 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/flobopuyo/PKGBUILD b/community/flobopuyo/PKGBUILD
index 4531d93f9..aa55e4cf4 100644
--- a/community/flobopuyo/PKGBUILD
+++ b/community/flobopuyo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=flobopuyo
 pkgver=0.20
 pkgrel=6
 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 a327a73b0..f11c67143 100644
--- a/community/flowcanvas/PKGBUILD
+++ b/community/flowcanvas/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=flowcanvas
 pkgver=0.7.1
 pkgrel=4
 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>=2.34')
 makedepends=('boost' 'python2')
diff --git a/community/floyd/PKGBUILD b/community/floyd/PKGBUILD
index bf88c40de..58a4df2e5 100644
--- a/community/floyd/PKGBUILD
+++ b/community/floyd/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=floyd
 pkgver=2.0.1
-pkgrel=4
+pkgrel=4.1
 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/flumotion/PKGBUILD b/community/flumotion/PKGBUILD
index 3a097acb2..1a0e26dd9 100644
--- a/community/flumotion/PKGBUILD
+++ b/community/flumotion/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=flumotion
 pkgver=0.10.1
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A streaming media server"
 url="http://www.flumotion.net"
 license=('GPL')
diff --git a/community/fonteditfs/PKGBUILD b/community/fonteditfs/PKGBUILD
index 3e4cb610c..2a7ce6ba1 100644
--- a/community/fonteditfs/PKGBUILD
+++ b/community/fonteditfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fonteditfs
 pkgver=1.2
 pkgrel=3
 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/fortune-mod/PKGBUILD b/community/fortune-mod/PKGBUILD
index 3fbbe9f80..5d3cbc654 100644
--- a/community/fortune-mod/PKGBUILD
+++ b/community/fortune-mod/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fortune-mod
 pkgver=1.99.1
 pkgrel=6
 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/community/fox/PKGBUILD b/community/fox/PKGBUILD
index 55481bec4..069e6b2a5 100644
--- a/community/fox/PKGBUILD
+++ b/community/fox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fox
 pkgver=1.6.49
 pkgrel=4
 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' 'libxi' 'libpng' 'libtiff' 'glu')
diff --git a/community/fpc/PKGBUILD b/community/fpc/PKGBUILD
index f5235a6df..cdb0b6857 100644
--- a/community/fpc/PKGBUILD
+++ b/community/fpc/PKGBUILD
@@ -12,7 +12,7 @@ pkgver=2.6.2
 _gdbver=7.5.1
 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/freedroid/PKGBUILD b/community/freedroid/PKGBUILD
index ee93c4c3c..1714504ac 100644
--- a/community/freedroid/PKGBUILD
+++ b/community/freedroid/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=freedroid
 pkgver=1.0.2
 pkgrel=8
 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 5eec6ac9a..930326c60 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname='freedroidrpg'
 pkgver=0.15.1
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'glu')
 makedepends=('mesa')
 optdepends=('python2' 'espeak')
diff --git a/community/freehdl/PKGBUILD b/community/freehdl/PKGBUILD
index 83c2711e2..3ed6bb03a 100644
--- a/community/freehdl/PKGBUILD
+++ b/community/freehdl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=freehdl
 pkgver=0.0.8
 pkgrel=6
 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=('perl')
diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD
index 3d9a9d58e..1a3a5837e 100644
--- a/community/freeimage/PKGBUILD
+++ b/community/freeimage/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=freeimage
 pkgver=3.15.4
 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')
@@ -17,6 +17,13 @@ source=("http://downloads.sourceforge.net/project/freeimage/Source%20Distributio
 md5sums=('9f9a3b2c3c1b4fd24fe479e8aaee86b1')
 
 build() {
+  if [ "$CARCH" != "i686" ] ; then
+    # The Makefile incorrectly assumes that only x86_64 shared
+    # libraries need PIC.
+    export CFLAGS="$CFLAGS -fPIC"
+    export CXXFLAGS="$CXXFLAGS -fPIC"
+  fi
+
   cp -r FreeImage FreeImagefip
 
   export CFLAGS="$CFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS"
diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 81b406d2c..7f7684b4c 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freemat
 pkgver=4.2
 pkgrel=3
 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=('arpack' 'fftw' 'glu' 'portaudio' 'qtwebkit')
diff --git a/community/freeradius-client/PKGBUILD b/community/freeradius-client/PKGBUILD
index bc9c795de..12ca14227 100644
--- a/community/freeradius-client/PKGBUILD
+++ b/community/freeradius-client/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freeradius-client
 pkgver=1.1.6
 pkgrel=6
 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 0b3911119..ec6ba018b 100644
--- a/community/freeradius/PKGBUILD
+++ b/community/freeradius/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freeradius
 pkgver=3.0.1
 pkgrel=1
 pkgdesc="The premier open source RADIUS server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freeradius.org/"
 license=('GPL')
 depends=('krb5' 'pth' 'net-snmp' 'postgresql-libs' 'libmariadbclient' 'talloc')
diff --git a/community/freerdp/PKGBUILD b/community/freerdp/PKGBUILD
index c442c9e4b..9d857d685 100644
--- a/community/freerdp/PKGBUILD
+++ b/community/freerdp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freerdp
 pkgver=1.0.2
 pkgrel=4
 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' 'libxext' 'libxdamage'
diff --git a/community/freetalk/PKGBUILD b/community/freetalk/PKGBUILD
index 3eadd052b..824785677 100644
--- a/community/freetalk/PKGBUILD
+++ b/community/freetalk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freetalk
 pkgver=3.2
 pkgrel=6
 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' 'guile1.8')
diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD
index c79e1af46..dbfdad83f 100644
--- a/community/freewrl/PKGBUILD
+++ b/community/freewrl/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.22.13.1
 _pkgver=1.22.13
 pkgrel=6
 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 82f907907..2b4c27802 100644
--- a/community/frei0r-plugins/PKGBUILD
+++ b/community/frei0r-plugins/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=frei0r-plugins
 pkgver=1.4
 pkgrel=1
 pkgdesc="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>=2.4.3')
diff --git a/community/fswebcam/PKGBUILD b/community/fswebcam/PKGBUILD
index 28ecbc567..4ea8fd0a9 100644
--- a/community/fswebcam/PKGBUILD
+++ b/community/fswebcam/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fswebcam
 pkgver=20140113
 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/fuse-exfat/PKGBUILD b/community/fuse-exfat/PKGBUILD
index 49a2cede9..f607bf08d 100644
--- a/community/fuse-exfat/PKGBUILD
+++ b/community/fuse-exfat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fuse-exfat
 pkgver=1.0.1
 pkgrel=1
 pkgdesc="Free exFAT file system implementation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/exfat/"
 license=('GPL3')
 depends=('fuse')
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/fwbuilder/PKGBUILD b/community/fwbuilder/PKGBUILD
index cf0fc5819..cb4d7a718 100644
--- a/community/fwbuilder/PKGBUILD
+++ b/community/fwbuilder/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=5.1.0.3599
 pkgrel=4
 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' 'qt4')
 conflicts=('libfwbuilder')
diff --git a/community/fxprocessview/PKGBUILD b/community/fxprocessview/PKGBUILD
index b9a25211b..e16a2c997 100644
--- a/community/fxprocessview/PKGBUILD
+++ b/community/fxprocessview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fxprocessview
 pkgver=0.5.0
 pkgrel=6
 pkgdesc="Process Viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('fox>=1.4.0')
 makedepends=('glu')
diff --git a/community/g2sc/PKGBUILD b/community/g2sc/PKGBUILD
index a12fa1702..4ffa33cdf 100644
--- a/community/g2sc/PKGBUILD
+++ b/community/g2sc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=g2sc
 pkgver=0.2
 pkgrel=4
 pkgdesc="Samba gtk2 client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/g2sc"
 license=('GPL')
 depends=('smbclient' 'gtk2')
diff --git a/community/galculator/PKGBUILD b/community/galculator/PKGBUILD
index 3efb0ea56..c1e5219fc 100644
--- a/community/galculator/PKGBUILD
+++ b/community/galculator/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=(galculator galculator-gtk2)
 pkgver=2.1.2
 pkgrel=2
 pkgdesc='GTK+ based scientific calculator'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://galculator.sourceforge.net/'
 license=('GPL')
 depends=('gtk3' 'gtk2')
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 6e9574272..347487bad 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -18,7 +18,7 @@ pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gamb
 pkgver=3.5.2
 pkgrel=1
 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=('GPL2')
 groups=('gambas3')
diff --git a/community/gammu/PKGBUILD b/community/gammu/PKGBUILD
index 87dc285f4..1ac8fd287 100644
--- a/community/gammu/PKGBUILD
+++ b/community/gammu/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gammu
 pkgver=1.33.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=('glib2' 'bluez-libs' 'curl' 'libmariadbclient' 'postgresql-libs' 'libusb')
diff --git a/community/garmindev/PKGBUILD b/community/garmindev/PKGBUILD
index f740aa005..b5acba513 100644
--- a/community/garmindev/PKGBUILD
+++ b/community/garmindev/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=garmindev
 pkgver=0.3.4
 pkgrel=7
 pkgdesc="Garmin Device Drivers for QlandkarteGT"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.qlandkarte.org/"
 license=('GPL')
 depends=('libusb-compat')
diff --git a/community/gavl/PKGBUILD b/community/gavl/PKGBUILD
index 1cc9c109c..c28cd59d1 100644
--- a/community/gavl/PKGBUILD
+++ b/community/gavl/PKGBUILD
@@ -7,16 +7,18 @@ pkgname=gavl
 pkgver=1.4.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')
-source=("http://downloads.sourceforge.net/sourceforge/gmerlin/$pkgname-$pkgver.tar.gz")
-md5sums=('2752013a817fbc43ddf13552215ec2c0')
+source=("http://downloads.sourceforge.net/sourceforge/gmerlin/$pkgname-$pkgver.tar.gz"
+	"gavl-autoconf.patch")
+md5sums=('2752013a817fbc43ddf13552215ec2c0'
+	 '8825521b3658b447855cf84c637e5fe3')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
+  patch -Np1 -i ${srcdir}/gavl-autoconf.patch
   ./configure --prefix=/usr --without-doxygen --with-cpuflags=none
   make
 }
diff --git a/community/gavl/gavl-autoconf.patch b/community/gavl/gavl-autoconf.patch
new file mode 100644
index 000000000..5853abd8f
--- /dev/null
+++ b/community/gavl/gavl-autoconf.patch
@@ -0,0 +1,61 @@
+Index: gavl-1.4.0/acinclude.m4
+===================================================================
+--- gavl-1.4.0.orig/acinclude.m4
++++ gavl-1.4.0/acinclude.m4
+@@ -46,7 +46,9 @@ AC_DEFUN([AC_C99_FUNC_LRINT],
+   ac_cv_c99_lrint,
+ [
+ lrint_save_CFLAGS=$CFLAGS
+-CFLAGS="-O2 -lm"
++lrint_save_LIBS=$LIBS
++CFLAGS="$CFLAGS -O2"
++LIBS="$LIBS -lm"
+ AC_TRY_LINK([
+ #define                _ISOC9X_SOURCE  1
+ #define        _ISOC99_SOURCE  1
+@@ -57,6 +59,7 @@ AC_TRY_LINK([
+ ], if (!lrint(3.14159)) lrint(2.7183);, ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no)
+ 
+ CFLAGS=$lrint_save_CFLAGS
++LIBS=$lrint_save_LIBS
+ 
+ ])
+ 
+Index: gavl-1.4.0/configure.ac
+===================================================================
+--- gavl-1.4.0.orig/configure.ac
++++ gavl-1.4.0/configure.ac
+@@ -129,6 +129,7 @@ fi
+ dnl
+ dnl Check for library functions
+ dnl 
++AC_CHECK_FUNC(m,sinf)
+ 
+ AC_CHECK_FUNCS([memalign])
+ AC_CHECK_FUNCS([sched_setaffinity])
+Index: gavl-1.4.0/src/Makefile.am
+===================================================================
+--- gavl-1.4.0.orig/src/Makefile.am
++++ gavl-1.4.0/src/Makefile.am
+@@ -30,7 +30,7 @@ benchmark_LDADD = ../gavl/libgavl.la @RT
+ 
+ 
+ volume_test_SOURCES = volume_test.c
+-volume_test_LDADD = ../gavl/libgavl.la
++volume_test_LDADD = ../gavl/libgavl.la -lm
+ 
+ dump_frame_table_SOURCES = dump_frame_table.c
+ dump_frame_table_LDADD = ../gavl/libgavl.la
+Index: gavl-1.4.0/src/Makefile.in
+===================================================================
+--- gavl-1.4.0.orig/src/Makefile.in
++++ gavl-1.4.0/src/Makefile.in
+@@ -282,7 +282,7 @@ pixelformat_penalty_LDADD = ../gavl/libg
+ benchmark_SOURCES = benchmark.c
+ benchmark_LDADD = ../gavl/libgavl.la @RT_LIBS@
+ volume_test_SOURCES = volume_test.c
+-volume_test_LDADD = ../gavl/libgavl.la
++volume_test_LDADD = ../gavl/libgavl.la -lm
+ dump_frame_table_SOURCES = dump_frame_table.c
+ dump_frame_table_LDADD = ../gavl/libgavl.la
+ colorspace_test_SOURCES = colorspace_test.c
\ No newline at end of file
diff --git a/community/gcolor2/PKGBUILD b/community/gcolor2/PKGBUILD
index 83556076a..71c285b75 100644
--- a/community/gcolor2/PKGBUILD
+++ b/community/gcolor2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gcolor2
 pkgver=0.4
 pkgrel=7
 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'
          '1bbc11865df2a0529757cdbdf806b079')
 
 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 15d7eb819..fc8972627 100644
--- a/community/gcompris/PKGBUILD
+++ b/community/gcompris/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gcompris
 pkgver=13.11
 pkgrel=2
 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' 'librsvg' 'gstreamer0.10-base-plugins')
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 74f1b5992..3ced59a59 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gdal
 pkgver=1.10.1
 pkgrel=2
 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' 'libspatialite' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
diff --git a/community/gdesklets/PKGBUILD b/community/gdesklets/PKGBUILD
index 2fd0369e3..345bcee26 100644
--- a/community/gdesklets/PKGBUILD
+++ b/community/gdesklets/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gdesklets
 pkgver=0.36.3
 pkgrel=4
 pkgdesc="System for bringing mini programs (desklets) onto your desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gdesklets.de/"
 license=('GPL') 
 depends=('libgtop' 'librsvg' 'pygtk' 'desktop-file-utils' 'gnome-icon-theme' 'xdg-utils')
diff --git a/community/gdk-pixbuf/PKGBUILD b/community/gdk-pixbuf/PKGBUILD
index 448d1b28f..3849e4dd9 100644
--- a/community/gdk-pixbuf/PKGBUILD
+++ b/community/gdk-pixbuf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gdk-pixbuf
 pkgver=0.22.0
 pkgrel=11
 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/gdlmm/PKGBUILD b/community/gdlmm/PKGBUILD
index 4422b8008..eb42db1c7 100644
--- a/community/gdlmm/PKGBUILD
+++ b/community/gdlmm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gdlmm
 pkgver=3.7.3
 pkgrel=1
 pkgdesc='C++ bindings for the gdl library'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://git.gnome.org/browse/gdlmm/'
 depends=('gdl' 'gtkmm3')
 options=('!emptydirs')
diff --git a/community/gdmap/PKGBUILD b/community/gdmap/PKGBUILD
index ea5be993f..0e1d79f34 100644
--- a/community/gdmap/PKGBUILD
+++ b/community/gdmap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gdmap
 pkgver=0.8.1
 pkgrel=3
 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 4fef542dd..6026cbcce 100644
--- a/community/geany-plugins/PKGBUILD
+++ b/community/geany-plugins/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=geany-plugins
 pkgver=1.23
 pkgrel=3
 pkgdesc='Plugins for Geany'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://plugins.geany.org/'
 license=('GPL')
 depends=("geany>=$pkgver" 'gtkspell' 'webkitgtk2' 'ctpl' 'gpgme' 'vte'
diff --git a/community/geany/PKGBUILD b/community/geany/PKGBUILD
index 22827bbb9..5b5b55008 100644
--- a/community/geany/PKGBUILD
+++ b/community/geany/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=geany
 pkgver=1.23.1
 pkgrel=1
 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')
diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD
index ee33978a9..400936f8a 100755
--- a/community/geary/PKGBUILD
+++ b/community/geary/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=geary
 pkgver=0.5.1
 pkgrel=2
 pkgdesc='A lightweight email client for the GNOME desktop'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.yorba.org/projects/geary/'
 license=('GPL3')
 depends=('gmime' 'gnome-keyring' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk')
diff --git a/community/gebabbel/PKGBUILD b/community/gebabbel/PKGBUILD
index 960143f3e..8eb8d9c89 100644
--- a/community/gebabbel/PKGBUILD
+++ b/community/gebabbel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gebabbel
 pkgver=0.4
 pkgrel=6
 pkgdesc="GUI for gpsbabel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gebabbel.sourceforge.net/"
 license=('GPL2')
 depends=('qt4' 'gpsbabel')
diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD
index aed59c6e8..f80ecebe9 100644
--- a/community/gecko-mediaplayer/PKGBUILD
+++ b/community/gecko-mediaplayer/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gecko-mediaplayer
 pkgver=1.0.8
 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' 'curl')
diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD
index 67f67f916..938f113f6 100644
--- a/community/geda-gaf/PKGBUILD
+++ b/community/geda-gaf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=geda-gaf
 pkgver=1.8.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://geda-project.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 06a061e4e..22e8db5e6 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=gedit-plugins
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Plugins for gedit"
-arch=(x86_64 i686)
+arch=('x86_64' 'i686' 'mips64el')
 license=(GPL)
 url="http://live.gnome.org/GeditPlugins"
 depends=(gedit python-dbus)
diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD
index bd3faabde..c3885c459 100644
--- a/community/gemrb/PKGBUILD
+++ b/community/gemrb/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gemrb
 pkgver=0.8.0.1
 pkgrel=1
 pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gemrb.org/"
 license=('GPL')
 depends=('python2' 'openal' 'libpng' 'sdl_mixer')
diff --git a/community/gen2shp/PKGBUILD b/community/gen2shp/PKGBUILD
index 2c18205d6..e6796db56 100644
--- a/community/gen2shp/PKGBUILD
+++ b/community/gen2shp/PKGBUILD
@@ -6,18 +6,22 @@ pkgname=gen2shp
 pkgver=0.3.1
 pkgrel=8
 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=('glibc' 'shapelib')
-source=("http://web.archive.org/web/20110716144136/http://intevation.de/~jan/gen2shp/$pkgname-$pkgver.tar.gz")
-md5sums=('1cf9f1c2097825ef96290f7e9a7eb195')
+source=("http://web.archive.org/web/20110716144136/http://intevation.de/~jan/gen2shp/$pkgname-$pkgver.tar.gz"
+	"link.patch")
+md5sums=('1cf9f1c2097825ef96290f7e9a7eb195'
+         'cc9ad41a7577c0cbfebb637d3a83c2aa')
 
 build() {
   cd "$pkgname-$pkgver"
 
   # fix conflicting function names
   sed -i 's/getline/get_line/' gen2shp.c utils.c utils.h
+  # Fix linking.
+  patch -p1 -i "$srcdir/link.patch"
 
   make
 }
diff --git a/community/gen2shp/link.patch b/community/gen2shp/link.patch
new file mode 100644
index 000000000..71e40de1b
--- /dev/null
+++ b/community/gen2shp/link.patch
@@ -0,0 +1,11 @@
+--- gen2shp-0.3.1/Makefile.orig	2013-03-18 12:20:49.925820131 +0100
++++ gen2shp-0.3.1/Makefile	2013-03-18 12:20:57.757895932 +0100
+@@ -10,7 +10,7 @@
+ 	$(CC) -c utils.c
+ 
+ gen2shp: gen2shp.c utils.o
+-	$(CC) $(CFLAGS) -o $@ -lshp gen2shp.c utils.o
++	$(CC) $(CFLAGS) -o $@ gen2shp.c utils.o -lshp
+ 
+ test: gen2shp
+ 	rm -f pnttest.dbf pnttest.shp pnttest.shx
diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD
index ed6b89f9e..44d2377a5 100644
--- a/community/geos/PKGBUILD
+++ b/community/geos/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=geos
 pkgver=3.4.2
 pkgrel=2
 pkgdesc="C++ port of the Java Topology Suite"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/geos/"
 license=('LGPL')
 depends=('gcc-libs' 'bash')
diff --git a/community/gerbv/PKGBUILD b/community/gerbv/PKGBUILD
index 9c8af3255..bcdb91942 100644
--- a/community/gerbv/PKGBUILD
+++ b/community/gerbv/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="An open source Gerber file (RS-274X only) viewer"
 #url="http://gerbv.gpleda.org/"
 url="http://gerbv.geda-project.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')
 makedepends=('cvs' 'gettext')
diff --git a/community/gftp/PKGBUILD b/community/gftp/PKGBUILD
index ecf7042e2..42f79fc7d 100644
--- a/community/gftp/PKGBUILD
+++ b/community/gftp/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gftp
 pkgver=2.0.19
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A multithreaded ftp client for X Windows"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gftp.org/"
 license=('GPL2')
 depends=('gtk2' 'openssl' 'readline')
diff --git a/community/gif2png/PKGBUILD b/community/gif2png/PKGBUILD
index 2f22833c9..da690beda 100644
--- a/community/gif2png/PKGBUILD
+++ b/community/gif2png/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gif2png
 pkgver=2.5.8
 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/community/giggle/PKGBUILD b/community/giggle/PKGBUILD
index d93b7439f..c1b3e415c 100644
--- a/community/giggle/PKGBUILD
+++ b/community/giggle/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=giggle
 pkgver=0.7
 pkgrel=2
 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 desktop-file-utils hicolor-icon-theme)
diff --git a/community/gimmage/PKGBUILD b/community/gimmage/PKGBUILD
index 36b32322a..521b13153 100644
--- a/community/gimmage/PKGBUILD
+++ b/community/gimmage/PKGBUILD
@@ -7,17 +7,20 @@ 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')
 makedepends=('pkgconfig')
 changelog=ChangeLog
-source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('f51cca53b3d33415e75a91cf81b6ac39')
+source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
+	gimmage-0.2.3-gcc47.patch)
+md5sums=('f51cca53b3d33415e75a91cf81b6ac39'
+	 '23969d3aaaaf4285dc45bd59f4fb11c3')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/gimmage-0.2.3-gcc47.patch
   rm gimmage.desktop
   sed -i 's|Exec=@prefix@/bin/gimmage|Exec=@prefix@/bin/gimmage %U|' gimmage.desktop.in
   ./configure --prefix=/usr
diff --git a/community/gimmage/gimmage-0.2.3-gcc47.patch b/community/gimmage/gimmage-0.2.3-gcc47.patch
new file mode 100644
index 000000000..72f53396f
--- /dev/null
+++ b/community/gimmage/gimmage-0.2.3-gcc47.patch
@@ -0,0 +1,11 @@
+--- gimmage-0.2.3.orig/src/FileManager.cpp	2007-06-26 15:51:15.000000000 +0200
++++ gimmage-0.2.3/src/FileManager.cpp	2008-02-16 13:58:34.000000000 +0100
+@@ -21,6 +21,8 @@
+ 
+ // we make extensive use of get_current_dir_name() from Glib
+ 
++#include <unistd.h>
++
+ #include "FileManager.h"
+ #include "defines.h"
+
diff --git a/community/gimp-dbp/PKGBUILD b/community/gimp-dbp/PKGBUILD
index d41ad9b66..fca196cbc 100644
--- a/community/gimp-dbp/PKGBUILD
+++ b/community/gimp-dbp/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gimp-dbp
 pkgver=1.1.9
-pkgrel=3
+pkgrel=3.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/community/gimp-plugin-fblur/PKGBUILD b/community/gimp-plugin-fblur/PKGBUILD
index 4d995bf23..f967827fc 100644
--- a/community/gimp-plugin-fblur/PKGBUILD
+++ b/community/gimp-plugin-fblur/PKGBUILD
@@ -4,16 +4,19 @@ pkgname=gimp-plugin-fblur
 pkgver=3.2.6
 pkgrel=3
 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')
 makedepends=('intltool')
-source=(http://registry.gimp.org/files/focusblur-$pkgver.tar.bz2)
-md5sums=('6196c88aeee8733bacc3c6e9ac3c6cf8')
+source=(http://registry.gimp.org/files/focusblur-$pkgver.tar.bz2
+	focusblur-3.2.6-correct_glib_include.patch)
+md5sums=('6196c88aeee8733bacc3c6e9ac3c6cf8'
+	 '45aec2ee18ef542c849b1085db351b4a')
 
 build() {
   cd "$srcdir"/focusblur-$pkgver
+  patch -Np1 -i ${srcdir}/focusblur-3.2.6-correct_glib_include.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gimp-plugin-fblur/focusblur-3.2.6-correct_glib_include.patch b/community/gimp-plugin-fblur/focusblur-3.2.6-correct_glib_include.patch
new file mode 100644
index 000000000..65bd9e96d
--- /dev/null
+++ b/community/gimp-plugin-fblur/focusblur-3.2.6-correct_glib_include.patch
@@ -0,0 +1,184 @@
+--- focusblur-3.2.6.orig/src/aaa.h	2008-10-13 10:13:10.000000000 -0500
++++ focusblur-3.2.6/src/aaa.h	2012-11-23 22:18:41.915247700 -0500
+@@ -19,8 +19,7 @@
+ #ifndef __AAA_H__
+ #define __AAA_H__
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ 
+ G_BEGIN_DECLS
+
+--- focusblur-3.2.6.orig/src/brush.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/brush.h	2012-11-23 22:25:19.740130640 -0500
+@@ -22,7 +22,7 @@
+ #ifndef __FOCUSBLUR_BRUSH_H__
+ #define __FOCUSBLUR_BRUSH_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include "focusblurtypes.h"
+ 
+ G_BEGIN_DECLS
+
+--- focusblur-3.2.6.orig/src/focusblurtypes.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/focusblurtypes.h	2012-11-23 22:30:15.870054441 -0500
+@@ -22,7 +22,7 @@
+ #ifndef __FOCUSBLUR_TYPES_H__
+ #define __FOCUSBLUR_TYPES_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ 
+ G_BEGIN_DECLS
+
+--- focusblur-3.2.6.orig/src/focusblur.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/focusblur.h	2012-11-23 22:29:39.760186387 -0500
+@@ -22,7 +22,7 @@
+ #ifndef __FOCUSBLUR_H__
+ #define __FOCUSBLUR_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+
+--- focusblur-3.2.6.orig/src/focusblurparam.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/focusblurparam.h	2012-11-23 22:37:30.876340890 -0500
+@@ -22,8 +22,7 @@
+ #ifndef __FOCUSBLUR_PARAM_H__
+ #define __FOCUSBLUR_PARAM_H__
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtkstyle.h>
+ #include <libgimp/gimptypes.h>
+ 
+
+--- focusblur-3.2.6.orig/src/depthmap.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/depthmap.h	2012-11-23 22:39:16.736583825 -0500
+@@ -22,7 +22,7 @@
+ #ifndef __FOCUSBLUR_DEPTHMAP_H__
+ #define __FOCUSBLUR_DEPTHMAP_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "focusblurtypes.h"
+ #include "focusblurenums.h"
+
+--- focusblur-3.2.6.orig/src/fftblurbuffer.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/fftblurbuffer.h	2012-11-23 22:40:27.340963518 -0500
+@@ -28,8 +28,7 @@
+ #endif
+ #include <fftw3.h>
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtkstyle.h>
+ #include <libgimp/gimptypes.h>
+ #include <libgimpwidgets/gimpwidgetstypes.h>
+
+--- focusblur-3.2.6.orig/src/diffusion.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/diffusion.h	2012-11-23 22:44:00.322319293 -0500
+@@ -23,7 +23,7 @@
+ #define __FOCUSBLUR_DIFFUSION_H__
+ 
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "focusblur.h"
+ #include "focusblurtypes.h"
+
+--- focusblur-3.2.6.orig/src/source.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/source.h	2012-11-23 22:46:56.086021371 -0500
+@@ -24,7 +24,7 @@
+ 
+ #include "config.h"
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <libgimp/gimptypes.h>
+ 
+ #include "focusblurtypes.h"
+
+--- focusblur-3.2.6.orig/src/shine.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/shine.h	2012-11-23 22:47:54.089813718 -0500
+@@ -22,7 +22,7 @@
+ #ifndef __FOCUSBLUR_SHINE_H__
+ #define __FOCUSBLUR_SHINE_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <libgimp/gimptypes.h>
+ 
+ #include "focusblurtypes.h"
+
+--- focusblur-3.2.6.orig/src/interface.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/interface.h	2012-11-23 22:49:01.946878171 -0500
+@@ -22,7 +22,7 @@
+ #ifndef __FOCUSBLUR_INTERFACE_H__
+ #define __FOCUSBLUR_INTERFACE_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "focusblurtypes.h"
+ 
+
+--- focusblur-3.2.6.orig/src/render.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/render.h	2012-11-23 22:49:47.253403346 -0500
+@@ -24,7 +24,7 @@
+ 
+ #include "config.h"
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ //#include <libgimp/gimp.h>
+ #include <libgimp/gimpui.h>
+ 
+
+--- focusblur-3.2.6.orig/src/focusblurstock.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/focusblurstock.h	2012-11-23 22:52:41.220475079 -0500
+@@ -22,7 +22,7 @@
+ #ifndef __FOCUSBLUR_STOCK_H__
+ #define __FOCUSBLUR_STOCK_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+
+--- focusblur-3.2.6.orig/src/fftblur.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/fftblur.h	2012-11-23 22:55:44.182789690 -0500
+@@ -23,8 +23,7 @@
+ #define __FOCUSBLUR_FFTBLUR_H__
+ 
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <libgimpwidgets/gimpwidgetstypes.h>
+ 
+ #include "focusblurparam.h"
+
+--- focusblur-3.2.6.orig/src/fftblurproc.h	2009-01-23 08:06:54.000000000 -0500
++++ focusblur-3.2.6/src/fftblurproc.h	2012-11-23 22:59:13.909271157 -0500
+@@ -23,8 +23,7 @@
+ #define __FOCUSBLUR_FFTBLUR_PROC_H__
+ 
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ #include "focusblurtypes.h"
+ 
diff --git a/community/gimp-plugin-lqr/PKGBUILD b/community/gimp-plugin-lqr/PKGBUILD
index 2a6362b4b..ac7785773 100644
--- a/community/gimp-plugin-lqr/PKGBUILD
+++ b/community/gimp-plugin-lqr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gimp-plugin-lqr
 pkgver=0.7.2
 pkgrel=1
 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')
diff --git a/community/gimp-plugin-mathmap/PKGBUILD b/community/gimp-plugin-mathmap/PKGBUILD
index d99fc7806..2e6aa3961 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=4
 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 02c20524d..f6c3d9595 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=2
 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 9e17c8bfe..d58f9edd2 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=2
 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/gimp-refocus/PKGBUILD b/community/gimp-refocus/PKGBUILD
index 28a68328a..a356f1953 100644
--- a/community/gimp-refocus/PKGBUILD
+++ b/community/gimp-refocus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gimp-refocus
 pkgver=0.9.0
 pkgrel=4
 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/community/gimp-refocus/refocus-gimp-2.0.patch b/community/gimp-refocus/refocus-gimp-2.0.patch
index 454b8d999..56193a3c8 100644
--- a/community/gimp-refocus/refocus-gimp-2.0.patch
+++ b/community/gimp-refocus/refocus-gimp-2.0.patch
@@ -35,11 +35,14 @@ diff -u -u -r1.1.1.1 configure.in
  AM_PATH_GTK_2_0(2.0.0)
  AM_PATH_GLIB_2_0(2.0.0)
  
-@@ -106,5 +106,6 @@
+@@ -106,5 +106,9 @@
  #Check if erf is defined in the mathlibrary
  AC_CHECK_LIB(m, erf, AC_DEFINE(HAVE_ERF))
  
 -AC_OUTPUT([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ])
++#Check if ceil is defined in the mathlibrary
++AC_CHECK_LIB(m, ceil)
++
 +AC_CONFIG_FILES([Makefile src/Makefile lib/Makefile doc/Makefile gtk-doc/Makefile ])
 +AC_OUTPUT
  
diff --git a/community/ginac/PKGBUILD b/community/ginac/PKGBUILD
index 669b8b06d..325cb37d5 100644
--- a/community/ginac/PKGBUILD
+++ b/community/ginac/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ginac
 pkgver=1.6.2
 pkgrel=3
 pkgdesc="C++ library for symbolic calculations"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ginac.de/'
 license=('GPL')
 depends=('cln')
diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD
index 8c7f0e340..0e90bc09f 100644
--- a/community/girara/PKGBUILD
+++ b/community/girara/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=(girara-common girara-gtk3)
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="user interface library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pwmt.org/projects/girara"
 license=('custom')
 makedepends=('gtk3' 'gtk2')
diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD
index ab5e6a1c4..b9d44055e 100644
--- a/community/gitg/PKGBUILD
+++ b/community/gitg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gitg
 pkgver=0.2.7
 pkgrel=2
 pkgdesc='A GIT repository viewer based on GTK+'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://git.gnome.org/browse/gitg/'
 license=('GPL')
 depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas')
diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD
index 2bc7bd561..cc9acf0cc 100644
--- a/community/gkrellm/PKGBUILD
+++ b/community/gkrellm/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=gkrellm
 pkgver=2.3.5
 pkgrel=5
 pkgdesc="System monitor package for GTK2"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html"
 license=('GPL3')
 depends=('gtk2' 'libsm' 'lm_sensors')
diff --git a/community/gl-117/PKGBUILD b/community/gl-117/PKGBUILD
index 6dd2488b9..03d7820c6 100644
--- a/community/gl-117/PKGBUILD
+++ b/community/gl-117/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gl-117
 pkgver=1.3.2
 pkgrel=6
 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' 'glu')
diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD
index 5250f1e6a..d59115a86 100644
--- a/community/glabels/PKGBUILD
+++ b/community/glabels/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=glabels
 pkgver=3.2.0
 pkgrel=1
 pkgdesc="Creating labels and business cards the very easy way"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://glabels.org/"
 license=('GPL' 'LGPL')
 depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
diff --git a/community/glee/PKGBUILD b/community/glee/PKGBUILD
index 4f89ad918..3ad4e3649 100644
--- a/community/glee/PKGBUILD
+++ b/community/glee/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glee
 pkgver=5.4.0
 pkgrel=1
 pkgdesc="Free cross-platform extension loading library for OpenGL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://elf-stone.com/glee.php"
 license=('custom:BSD')
 depends=('gcc-libs' 'libgl')
@@ -28,4 +28,4 @@ package() {
   make DESTDIR="$pkgdir/" install
 }
 
-# vim:set ts=2 sw=2 et:
\ No newline at end of file
+# vim:set ts=2 sw=2 et:
diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD
index db5bda30f..75cddd629 100644
--- a/community/glfw/PKGBUILD
+++ b/community/glfw/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=glfw
 pkgver=3.0.4
 pkgrel=1
 pkgdesc="A free, open source, portable framework for OpenGL application development"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.glfw.org/"
 license=('custom:ZLIB')
 depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput')
diff --git a/community/glitz/PKGBUILD b/community/glitz/PKGBUILD
index 0072c0231..65f44ec7f 100644
--- a/community/glitz/PKGBUILD
+++ b/community/glitz/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glitz
 pkgver=0.5.6
 pkgrel=4
 pkgdesc='OpenGL image compositing library'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://cairographics.org/'
 license=('BSD')
 depends=('libgl' 'glibc')
diff --git a/community/gliv/PKGBUILD b/community/gliv/PKGBUILD
index 97e8129db..be89c14c2 100644
--- a/community/gliv/PKGBUILD
+++ b/community/gliv/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gliv
 pkgver=1.9.7
 pkgrel=3
 pkgdesc='OpenGL image viewer'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://guichaz.free.fr/gliv/'
 license=('GPL')
 depends=('gtkglext')
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index 13b5ca01a..24f740c59 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=glob2
 pkgver=0.9.4.4
 pkgrel=21
 pkgdesc='RTS game which minimizes micro-management'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.globulation2.org/'
 license=('GPL3')
 depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 55b3d7da8..aad6f49cd 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=glom
 pkgver=1.24.2
 pkgrel=2
 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 58cd17dca..38e01c866 100644
--- a/community/gloox/PKGBUILD
+++ b/community/gloox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gloox
 pkgver=1.0.9
 pkgrel=3
 pkgdesc="C++ libraries for development of Jabber client/component/server"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://camaya.net/gloox"
 license=("GPL")
 depends=('libidn' 'gnutls')
diff --git a/community/gluon/PKGBUILD b/community/gluon/PKGBUILD
index 3401f6081..274fd2f6d 100644
--- a/community/gluon/PKGBUILD
+++ b/community/gluon/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.71.0
 _pkgver=0.71
 pkgrel=5
 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=('kdelibs' 'libsndfile' 'alure')
diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD
index bd9fb167c..c7d4a4f36 100644
--- a/community/glusterfs/PKGBUILD
+++ b/community/glusterfs/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=3.4.2
 _basever=`echo $pkgver | cut -f1-2 -d.`
 pkgrel=1
 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url='http://www.gluster.org/'
 license=(GPL2 LGPL3)
 depends=(fuse python2 libxml2)
diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index 2c5fcf534..c36348ce4 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gmerlin
 pkgver=1.2.0
 pkgrel=5
 pkgdesc="Multimedia architecture for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
 depends=('gavl' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libquicktime' 'jack')
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index ccc81c138..e0339fde1 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=gmic
 pkgname=("gmic" "gimp-plugin-gmic" "zart")
 pkgver=1.5.8.3
 pkgrel=1
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 url="http://gmic.sourceforge.net"
 license=("custom:CeCILL")
 makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
diff --git a/community/gmpc/PKGBUILD b/community/gmpc/PKGBUILD
index 6b2f911a9..954a1f596 100644
--- a/community/gmpc/PKGBUILD
+++ b/community/gmpc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gmpc
 pkgver=11.8.16
 pkgrel=2
 pkgdesc='MPD client (Gtk2)'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://gmpclient.org/home'
 license=('GPL')
 depends=('libunique' 'libmpd' 'libsoup' 'sqlite' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/community/gmrun/PKGBUILD b/community/gmrun/PKGBUILD
index ea5fd9c70..c752bdf7b 100644
--- a/community/gmrun/PKGBUILD
+++ b/community/gmrun/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gmrun
 pkgver=0.9.2
-pkgrel=4
+pkgrel=4.1
 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/gmtk/PKGBUILD b/community/gmtk/PKGBUILD
index 687bcbe87..4e60a0096 100644
--- a/community/gmtk/PKGBUILD
+++ b/community/gmtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gmtk
 pkgver=1.0.8
 pkgrel=2
 pkgdesc='Common functions for gnome-mplayer and gecko-mediaplayer.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://gmtk.googlecode.com/'
 license=('GPL')
 depends=('glib2' 'gtk3' 'dconf')
diff --git a/community/gnac/PKGBUILD b/community/gnac/PKGBUILD
index 42cb76b7f..9b70a49ff 100644
--- a/community/gnac/PKGBUILD
+++ b/community/gnac/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnac
 pkgver=0.2.4.1
 pkgrel=1
 pkgdesc="Audio converter for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnac.sourceforge.net/"
 license=('GPL')
 depends=('libnotify' 'libunique3' 'gstreamer0.10-base-plugins' 'dconf' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index a29530d85..567b21e2f 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.10
 pkgrel=11
-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 mesa glu
diff --git a/community/gnokii/PKGBUILD b/community/gnokii/PKGBUILD
index 73555ff65..af1b017c9 100644
--- a/community/gnokii/PKGBUILD
+++ b/community/gnokii/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gnokii
 pkgver=0.6.31
 pkgrel=6
 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-libs' 'libical' 'sqlite')
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index 677dc72c7..06eb7ecb3 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -9,15 +9,23 @@ pkgname=gnome-commander
 pkgver=1.2.8.17
 pkgrel=1
 pkgdesc='Graphical two-pane filemanager for Gnome'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://gcmd.github.io/'
 license=('GPL')
 depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm')
 makedepends=('perl-xml-parser' 'gnome-doc-utils' 'intltool')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('135033ad2073c9d6fee51a52f1e7a56358b8e3a6fa46d64188dc3feebfe00606')
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz
+	      gnome-commander-1.2.8.15-build.patch)
+sha256sums=('135033ad2073c9d6fee51a52f1e7a56358b8e3a6fa46d64188dc3feebfe00606'
+	          '856e9c1a17acbb97772ed93d01d81746098e03f5c06375cc976fc784a0011088')
+
+# mips64el patch
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -Np1 -i ${srcdir}/gnome-commander-1.2.8.15-build.patch
+}
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/community/gnome-commander/gnome-commander-1.2.8.15-build.patch b/community/gnome-commander/gnome-commander-1.2.8.15-build.patch
new file mode 100644
index 000000000..f78eea9d3
--- /dev/null
+++ b/community/gnome-commander/gnome-commander-1.2.8.15-build.patch
@@ -0,0 +1,25 @@
+--- gnome-commander-1.2.8.15.orig/src/gnome-cmd-pixmap.h	2011-12-06 14:10:28.000000000 -0500
++++ gnome-commander-1.2.8.15/src/gnome-cmd-pixmap.h	2012-11-29 15:57:52.389904563 -0500
+@@ -44,7 +44,7 @@
+     g_return_if_fail (pixmap->pixmap != NULL);
+     g_return_if_fail (pixmap->mask != NULL);
+ 
+-    gdk_pixbuf_unref (pixmap->pixbuf);
++    g_object_unref (pixmap->pixbuf);
+     gdk_pixmap_unref (pixmap->pixmap);
+     gdk_bitmap_unref (pixmap->mask);
+ 
+
+--- gnome-commander-1.2.8.15.orig/src/dict.h	2011-11-07 18:26:25.000000000 -0500
++++ gnome-commander-1.2.8.15/src/dict.h	2012-11-29 16:22:17.341129719 -0500
+@@ -55,8 +55,8 @@
+ template <typename KEY, typename VAL>
+ inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v)
+ {
+-    std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL));
+-    std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL));
++    std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(std::make_pair(k,(const VAL *) NULL));
++    std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(std::make_pair(v,(const KEY *) NULL));
+ 
+     if (k_pos.second)
+         k_pos.first->second = &v_pos.first->first;
diff --git a/community/gnome-hearts/PKGBUILD b/community/gnome-hearts/PKGBUILD
index 07984fbb4..37cc83f83 100644
--- a/community/gnome-hearts/PKGBUILD
+++ b/community/gnome-hearts/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-hearts
 pkgver=0.3.1
 pkgrel=1
 pkgdesc="A card game for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jejik.com/gnome-hearts/"
 license=('GPL')
 depends=('python2' 'libgnomeui' 'libglade' 'desktop-file-utils')
diff --git a/community/gnome-media/PKGBUILD b/community/gnome-media/PKGBUILD
index 2b60a714d..f211ad6e4 100644
--- a/community/gnome-media/PKGBUILD
+++ b/community/gnome-media/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-media
 pkgver=3.4.0
 pkgrel=2
 pkgdesc="Sound recorder and GStreamer 0.10 configuration tool for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libgnome-media-profiles' 'gstreamer0.10-good-plugins' 'hicolor-icon-theme')
 makedepends=('intltool' 'gnome-doc-utils')
diff --git a/community/gnome-mplayer/PKGBUILD b/community/gnome-mplayer/PKGBUILD
index 6709ef456..d6522c2db 100644
--- a/community/gnome-mplayer/PKGBUILD
+++ b/community/gnome-mplayer/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnome-mplayer
 pkgver=1.0.8
 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' 'gnome-icon-theme' 'hicolor-icon-theme' 'dconf' 'gmtk')
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index f4a24191e..f17f8dd90 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-packagekit
 pkgver=3.10.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=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD
index 3154a9254..a3acc46a0 100644
--- a/community/gnome-phone-manager/PKGBUILD
+++ b/community/gnome-phone-manager/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-phone-manager
 pkgver=0.69
 pkgrel=3
 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' 'gconf' 'gnokii' 'gnome-bluetooth' 'libcanberra' 'telepathy-glib')
diff --git a/community/gnome-ppp/PKGBUILD b/community/gnome-ppp/PKGBUILD
index 27a6fbf9b..b30fd2467 100644
--- a/community/gnome-ppp/PKGBUILD
+++ b/community/gnome-ppp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-ppp
 pkgver=0.3.23
 pkgrel=8
 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-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD
index ac2578542..75e3b7a29 100644
--- a/community/gnome-screensaver/PKGBUILD
+++ b/community/gnome-screensaver/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnome-screensaver
 pkgver=3.6.1
 pkgrel=7
 pkgdesc="Legacy GNOME screensaver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="https://wiki.gnome.org/Projects/GnomeScreensaver"
 backup=(etc/pam.d/gnome-screensaver)
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index 2f42c8398..e05c0fe58 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=$_pkgname-updates
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Updates plugin for the GNOME Settings daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gnome-packagekit' "$_pkgname")
 makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom')
@@ -24,11 +24,11 @@ prepare() {
   cd "$srcdir/$_pkgname-$pkgver"
   patch -RNp1 -i "$srcdir/packagekit-0.8.patch"
   patch -Np1 -i "$srcdir/arch.patch"
+  autoreconf -fi
 }
 
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
-  autoreconf -fi
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
               --localstatedir=/var \
diff --git a/community/gnome-web-photo/PKGBUILD b/community/gnome-web-photo/PKGBUILD
index ee29c7b08..42cd5b9f2 100644
--- a/community/gnome-web-photo/PKGBUILD
+++ b/community/gnome-web-photo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnome-web-photo
 pkgver=0.10.6
 pkgrel=1
 pkgdesc="Generate full-size image files and thumbnails from HTML files and web pages"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://git.gnome.org/browse/gnome-web-photo/"
 license=('LGPL')
 depends=('libwebkit3')
diff --git a/community/gnonlin/PKGBUILD b/community/gnonlin/PKGBUILD
index 43c8e8108..62753d6c4 100644
--- a/community/gnonlin/PKGBUILD
+++ b/community/gnonlin/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gnonlin
 pkgver=1.1.90
 pkgrel=1
 pkgdesc='Library for creating non-linear video editors'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://gnonlin.sourceforge.net/'
 depends=('gstreamer')
 makedepends=('python' 'gst-plugins-base' 'pkgconfig')
diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD
index 95a640912..67cb1e140 100644
--- a/community/gnote/PKGBUILD
+++ b/community/gnote/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnote
 pkgver=3.10.1
 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' 'libsecret')
diff --git a/community/gnubiff-gtk/PKGBUILD b/community/gnubiff-gtk/PKGBUILD
index 5bf35b283..1b092cd5c 100644
--- a/community/gnubiff-gtk/PKGBUILD
+++ b/community/gnubiff-gtk/PKGBUILD
@@ -7,17 +7,20 @@ pkgname=gnubiff-gtk
 pkgver=2.2.15
 pkgrel=1
 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' 'gtk3' 'openssl' 'popt')
 makedepends=('intltool')
 conflicts=('gnubiff')
-source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443')
+source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz
+	gnubiff-2.2.15-glib.patch)
+md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443'
+	 '31bce3b8b43decf0a1df9492cd807024')
 
 build() {
   cd $srcdir/gnubiff-$pkgver
+  patch -Np1 -i ${srcdir}/gnubiff-2.2.15-glib.patch
   export LDFLAGS=-lX11
   ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271"
   make
diff --git a/community/gnubiff-gtk/gnubiff-2.2.15-glib.patch b/community/gnubiff-gtk/gnubiff-2.2.15-glib.patch
new file mode 100644
index 000000000..ed4b0cc5b
--- /dev/null
+++ b/community/gnubiff-gtk/gnubiff-2.2.15-glib.patch
@@ -0,0 +1,12 @@
+--- gnubiff-2.2.15.orig/src/gnubiff.cc	2012-01-08 15:55:47.000000000 -0500
++++ gnubiff-2.2.15/src/gnubiff.cc	2012-12-05 06:43:35.161272119 -0500
+@@ -60,7 +60,9 @@
+ #endif
+ 
+ 	// Thread initialization
++        #if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++        #endif
+ 	gdk_threads_init ();
+ 
+ 	//
diff --git a/community/gnubiff/PKGBUILD b/community/gnubiff/PKGBUILD
index 814259c8a..91fd3b38a 100644
--- a/community/gnubiff/PKGBUILD
+++ b/community/gnubiff/PKGBUILD
@@ -7,19 +7,21 @@ pkgname=gnubiff
 pkgver=2.2.15
 pkgrel=1
 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' 'gtk3' 'popt')
 makedepends=('perlxml' 'intltool')
 conflicts=(gnubiff-gtk)
-source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
-md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443')
+source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz
+	gnubiff-2.2.15-glib.patch)
+md5sums=('c705e1135b0bd4c8d8f7ce72ca7b5443'
+	 '31bce3b8b43decf0a1df9492cd807024')
 
 build() {
   [ "$GNOMEDIR" = "" ] && GNOMEDIR=/usr
   cd $srcdir/gnubiff-$pkgver
-
+  patch -Np1 -i ${srcdir}/gnubiff-2.2.15-glib.patch
   ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \
 	--disable-fam --disable-gnome
   make
diff --git a/community/gnubiff/gnubiff-2.2.15-glib.patch b/community/gnubiff/gnubiff-2.2.15-glib.patch
new file mode 100644
index 000000000..ed4b0cc5b
--- /dev/null
+++ b/community/gnubiff/gnubiff-2.2.15-glib.patch
@@ -0,0 +1,12 @@
+--- gnubiff-2.2.15.orig/src/gnubiff.cc	2012-01-08 15:55:47.000000000 -0500
++++ gnubiff-2.2.15/src/gnubiff.cc	2012-12-05 06:43:35.161272119 -0500
+@@ -60,7 +60,9 @@
+ #endif
+ 
+ 	// Thread initialization
++        #if !GLIB_CHECK_VERSION(2,31,0)
+ 	g_thread_init (NULL);
++        #endif
+ 	gdk_threads_init ();
+ 
+ 	//
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/gnuchess/PKGBUILD b/community/gnuchess/PKGBUILD
index 706455305..968d29dd4 100644
--- a/community/gnuchess/PKGBUILD
+++ b/community/gnuchess/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnuchess
 pkgver=6.1.1
 pkgrel=1
 pkgdesc="Play chess against the computer on a terminal and an engine for graphical chess frontends"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/chess/chess.html"
 license=('GPL3')
 depends=('bash')
diff --git a/community/gnujump/PKGBUILD b/community/gnujump/PKGBUILD
index 0da4248af..961115c5d 100644
--- a/community/gnujump/PKGBUILD
+++ b/community/gnujump/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnujump
 pkgver=1.0.8
 pkgrel=3
 pkgdesc="A clone of the simple yet addictive game Xjump"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnujump.es.gnu.org"
 license=('GPL3')
 depends=('libgl' 'sdl_image' 'sdl_mixer')
diff --git a/community/gnunet-gtk/PKGBUILD b/community/gnunet-gtk/PKGBUILD
index f3029b7c2..c69f64577 100644
--- a/community/gnunet-gtk/PKGBUILD
+++ b/community/gnunet-gtk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnunet-gtk
 pkgver=0.10.0
 pkgrel=1
 pkgdesc="A frontend for GNUnet"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gnunet.org"
 license=('GPL')
 depends=('gnunet' 'glade' 'adns')
diff --git a/community/gnunet/PKGBUILD b/community/gnunet/PKGBUILD
index 6c5501197..924c6b61d 100644
--- a/community/gnunet/PKGBUILD
+++ b/community/gnunet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnunet
 pkgver=0.10.0
 pkgrel=2
 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' 'sqlite' 'gnurl'
diff --git a/community/gnustep-back/PKGBUILD b/community/gnustep-back/PKGBUILD
index 65df8e8eb..f10250f97 100644
--- a/community/gnustep-back/PKGBUILD
+++ b/community/gnustep-back/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnustep-back
 pkgver=0.23.0
 pkgrel=2
 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 cairo)
diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD
index 904a7a411..192957150 100644
--- a/community/gnustep-base/PKGBUILD
+++ b/community/gnustep-base/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnustep-base
 pkgver=1.24.5
 pkgrel=5
 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 icu)
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index 9b6234a1f..d855785a3 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnustep-gui
 pkgver=0.23.1
 pkgrel=5
 pkgdesc="The GNUstep GUI class library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
 license=('LGPL')
 depends=('gnustep-back' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao')
diff --git a/community/gnustep-make/PKGBUILD b/community/gnustep-make/PKGBUILD
index 75241dab0..c33c4a79f 100644
--- a/community/gnustep-make/PKGBUILD
+++ b/community/gnustep-make/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnustep-make
 pkgver=2.6.5
 pkgrel=2
 pkgdesc="The GNUstep make package"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnustep.org/"
 license=('GPL')
 depends=()
@@ -24,6 +24,12 @@ build() {
 package() {
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
+
+  if [ "$CARCH" = "mips64el" ]; then
+    sed -i 's|GNUSTEP_HOST_CPU=.*|GNUSTEP_HOST_CPU=mips64el|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh
+    sed -i 's|GNUSTEP_HOST=.*|GNUSTEP_HOST=mips64el-unknown-linux-gnu|' $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh
+  fi
+
   install -D -m755 \
     $pkgdir/usr/share/GNUstep/Makefiles/GNUstep.sh \
     $pkgdir/etc/profile.d/GNUstep.sh
diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
index 85ff8eb44..578f85e1a 100644
--- a/community/goaccess/PKGBUILD
+++ b/community/goaccess/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=goaccess
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="An open source real-time web log analyzer and interactive viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goaccess.prosoftcorp.com"
 license=('GPL')
 depends=('ncurses' 'geoip' 'glib2')
diff --git a/community/gobby/PKGBUILD b/community/gobby/PKGBUILD
index f2020893c..cc54c437a 100644
--- a/community/gobby/PKGBUILD
+++ b/community/gobby/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=gobby
 pkgver=0.4.13
-pkgrel=1
+pkgrel=1.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 3813bebea..6d553379c 100644
--- a/community/gocr/PKGBUILD
+++ b/community/gocr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gocr
 pkgver=0.50
 pkgrel=2
 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 1cb59f293..3f0bc2b55 100644
--- a/community/gogglesmm/PKGBUILD
+++ b/community/gogglesmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gogglesmm
 pkgver=0.12.7
 pkgrel=3
 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 d9b7bbd5b..75788ba61 100644
--- a/community/goldendict/PKGBUILD
+++ b/community/goldendict/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=goldendict
 pkgver=1.0.1
 pkgrel=7
 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' 'qtwebkit' 'phonon')
diff --git a/community/goldendict/goldendict-1.0.1-gcc-4.7.patch b/community/goldendict/goldendict-1.0.1-gcc-4.7.patch
new file mode 100644
index 000000000..24995a221
--- /dev/null
+++ b/community/goldendict/goldendict-1.0.1-gcc-4.7.patch
@@ -0,0 +1,40 @@
+From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 20 Jul 2012 03:27:38 +1000
+Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes.
+
+---
+ processwrapper.cc                       | 4 ++++
+ qtsingleapplication/src/qtlocalpeer.cpp | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/processwrapper.cc b/processwrapper.cc
+index f7f3f19..86b985d 100644
+--- a/processwrapper.cc
++++ b/processwrapper.cc
+@@ -2,6 +2,10 @@
+ 

+ #include <QtCore>

+ 

++#if defined(Q_OS_UNIX)

++#include <unistd.h>

++#endif

++

+ #ifdef Q_OS_WIN32

+ 

+ #include <windows.h>

+diff --git a/qtsingleapplication/src/qtlocalpeer.cpp b/qtsingleapplication/src/qtlocalpeer.cpp
+index 382d182..506c142 100644
+--- a/qtsingleapplication/src/qtlocalpeer.cpp
++++ b/qtsingleapplication/src/qtlocalpeer.cpp
+@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {
+-- 
+1.7.11.1
+
diff --git a/community/goobox/PKGBUILD b/community/goobox/PKGBUILD
index 41024fa62..8cc59a4ab 100644
--- a/community/goobox/PKGBUILD
+++ b/community/goobox/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=goobox
 pkgver=3.2.1
 pkgrel=1
 pkgdesc="CD player and ripper for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://people.gnome.org/~paobac/goobox/"
 license=('GPL')
 depends=('gst-plugins-base' 'brasero' 'libmusicbrainz5' 'libdiscid' 'libcoverart' 'libnotify' 'xdg-utils')
diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD
index 224e88f95..cb591bd08 100644
--- a/community/goocanvas/PKGBUILD
+++ b/community/goocanvas/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=goocanvas
 pkgver=2.0.2
 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=('docs')
 license=("LGPL")
diff --git a/community/goocanvas1/PKGBUILD b/community/goocanvas1/PKGBUILD
index 5d30e61ba..052fb04a6 100644
--- a/community/goocanvas1/PKGBUILD
+++ b/community/goocanvas1/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=goocanvas1
 pkgver=1.0.0
 pkgrel=2
 pkgdesc="A cairo canvas widget for GTK+"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://live.gnome.org/GooCanvas"
 options=('docs')
 license=("LGPL")
diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD
index dc7b9b189..09aa5b316 100644
--- a/community/goocanvasmm/PKGBUILD
+++ b/community/goocanvasmm/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=goocanvasmm
 pkgver=1.90.9
 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-glog/PKGBUILD b/community/google-glog/PKGBUILD
index 14c7a9030..5822ca07c 100644
--- a/community/google-glog/PKGBUILD
+++ b/community/google-glog/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=google-glog
 pkgver=0.3.3
 pkgrel=2
 pkgdesc="Logging library for C++"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:BSD3')
 url="http://code.google.com/p/google-glog/"
 depends=('gcc-libs')
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index dd6510a37..701199e19 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.40
 pkgrel=4
 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' 'boost-libs')
 makedepends=('boost' 'glm' 'mesa')
diff --git a/community/gpac/PKGBUILD b/community/gpac/PKGBUILD
index c5815e61a..2b5b0c2bb 100644
--- a/community/gpac/PKGBUILD
+++ b/community/gpac/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gpac
 pkgver=4288
 pkgrel=3
 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' 'glu' 'libxv')
diff --git a/community/gpg-crypter/PKGBUILD b/community/gpg-crypter/PKGBUILD
index 182a33e79..60a196bb1 100644
--- a/community/gpg-crypter/PKGBUILD
+++ b/community/gpg-crypter/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpg-crypter
 pkgver=0.4.1
 pkgrel=1
 pkgdesc="A graphical front-end to GnuPG(GPG) using the GTK3 toolkit and libgpgme"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gpg-crypter.sourceforge.net/"
 license=('GPL2')
 depends=('gtk3' 'gpgme')
diff --git a/community/gphpedit/PKGBUILD b/community/gphpedit/PKGBUILD
index 589ee4afe..8fdf88e6b 100644
--- a/community/gphpedit/PKGBUILD
+++ b/community/gphpedit/PKGBUILD
@@ -7,15 +7,17 @@ pkgname=gphpedit
 pkgver=0.9.98RC1
 pkgrel=4
 pkgdesc="a scintilla/gnome based editor specialized on php-files"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gconf' 'webkitgtk2' 'desktop-file-utils' 'hicolor-icon-theme')
 makedepends=('intltool')
 url="http://www.gphpedit.org/"
 options=('!makeflags')
 install=gphpedit.install
-source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz)
-md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525')
+source=(http://www.gphpedit.org/sites/default/files/gphpedit-$pkgver.tar.gz
+	gphpedit-0.9.98RC1-gmodule.patch)
+md5sums=('cc3c5f50704fa0ed3ef3d4ac983db525'
+	 '4eecf974dedbb3d29c64576d2642cd6f')
 
 build() {
   cd ${srcdir}/*$pkgname*
diff --git a/community/gphpedit/gphpedit-0.9.98RC1-gmodule.patch b/community/gphpedit/gphpedit-0.9.98RC1-gmodule.patch
new file mode 100644
index 000000000..ecc4db5d7
--- /dev/null
+++ b/community/gphpedit/gphpedit-0.9.98RC1-gmodule.patch
@@ -0,0 +1,20 @@
+--- anoopjohn-gphpedit-fe8a12c.orig/configure.ac	2010-05-21 15:25:58.000000000 -0500
++++ anoopjohn-gphpedit-fe8a12c/configure.ac	2012-12-04 02:55:25.519819812 -0500
+@@ -80,6 +80,7 @@
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(WEBKIT,[webkit-1.0])
++PKG_CHECK_MODULES(GMODULE,[gmodule-2.0])
+ 
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+--- anoopjohn-gphpedit-fe8a12c.orig/src/Makefile.am	2010-05-21 15:25:58.000000000 -0500
++++ anoopjohn-gphpedit-fe8a12c/src/Makefile.am	2012-12-04 03:36:55.239679234 -0500
+@@ -92,6 +92,6 @@
+ 	cd gtkscintilla2 && $(MAKE) libgtkscintilla2.a && cd ..
+ 
+ gphpedit_LDADD = \
+-	$(WEBKIT_LIBS) $(GTK_LIBS) $(GCONF_LIBS)\
++	$(WEBKIT_LIBS) $(GTK_LIBS) $(GCONF_LIBS) $(GMODULE_LIBS)\
+ 	gtkscintilla2/libgtkscintilla2.a\
+ 	gtkscintilla2/scintilla/bin/scintilla.a
diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD
index 9c52edf9e..79e692e2b 100644
--- a/community/gpicview/PKGBUILD
+++ b/community/gpicview/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpicview
 pkgver=0.2.4
 pkgrel=1
 pkgdesc='Lightweight image viewer'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://lxde.org/'
 groups=('lxde')
@@ -26,7 +26,8 @@ prepare() {
 }
 
 build() {
-	cd $pkgname-$pkgver
+	cd "$srcdir/$pkgname-$pkgver"
+        sed -ri 's/^(gpicview_LDADD = .+)/\1 -lm/' src/Makefile.in
 	./configure --sysconfdir=/etc --prefix=/usr
 	make
 }
diff --git a/community/gpointing-device-settings/PKGBUILD b/community/gpointing-device-settings/PKGBUILD
index ed53e7497..4e1ccb46b 100644
--- a/community/gpointing-device-settings/PKGBUILD
+++ b/community/gpointing-device-settings/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gpointing-device-settings
 pkgver=1.5.1
 pkgrel=5
 pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="https://wiki.gnome.org/Attic/GPointingDeviceSettings"
 depends=('gtk2' 'gconf')
diff --git a/community/gpsbabel/PKGBUILD b/community/gpsbabel/PKGBUILD
index 58865408f..2717468ee 100644
--- a/community/gpsbabel/PKGBUILD
+++ b/community/gpsbabel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpsbabel
 pkgver=1.4.4
 pkgrel=2
 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 5d9ecf85b..61d0ba5eb 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.11
 _pkgver=20120928
 pkgrel=20
 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 20d18b23a..9c884a477 100644
--- a/community/gpsim/PKGBUILD
+++ b/community/gpsim/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gpsim
 pkgver=0.27.0
 pkgrel=2
 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')
@@ -16,6 +16,7 @@ md5sums=('b3ded17f1c8c6134f2381d6e6925b231')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/gpsim-0.26.1-glib.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gpsim/gpsim-0.26.1-glib.patch b/community/gpsim/gpsim-0.26.1-glib.patch
new file mode 100644
index 000000000..0088ca836
--- /dev/null
+++ b/community/gpsim/gpsim-0.26.1-glib.patch
@@ -0,0 +1,24 @@
+--- gpsim-0.26.1.orig/src/bitlog.h	2010-06-05 01:46:30.000000000 -0500
++++ gpsim-0.26.1/src/bitlog.h	2012-12-04 08:32:03.327155186 -0500
+@@ -25,7 +25,7 @@
+ 
+ // include the absolute minimum portion of GLIB to get the definitions
+ // for guint64, etc.
+-#include <glibconfig.h>
++#include <glib.h>
+ 
+ /**********************************************************************
+  * boolean event logging
+
+--- gpsim-0.26.1.orig/src/os_dependent.cc	2010-06-05 01:46:30.000000000 -0500
++++ gpsim-0.26.1/src/os_dependent.cc	2012-12-04 08:50:22.684064974 -0500
+@@ -39,8 +39,7 @@
+ #ifdef _WIN32
+ #define G_PLATFORM_WIN32
+ #define G_OS_WIN32
+-#include <glib/gmem.h>
+-#include <glib/gwin32.h>
++#include <glib.h>
+ #include <direct.h>
+ #include <windows.h>
+ 
diff --git a/community/gpsmanshp/PKGBUILD b/community/gpsmanshp/PKGBUILD
index 89cfa99af..d700d7b35 100644
--- a/community/gpsmanshp/PKGBUILD
+++ b/community/gpsmanshp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gpsmanshp
 pkgver=1.2.1
 pkgrel=3
 pkgdesc="A Tcl package to read and write shapefiles"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gpsmanshp.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'shapelib' 'tcl')
@@ -17,6 +17,7 @@ build() {
 
   mv Makefile8.5 Makefile
   sed -i -e "s:shapefil.h:libshp/shapefil.h:g" gpsmanshp.c
+  sed -i -e 's:$(LINKOPT) gpsmanshp.o:gpsmanshp.o $(LINKOPT):' Makefile
 
   install -d "$srcdir/${pkgname}_$pkgver/usr/lib/"
 
diff --git a/community/gputils/PKGBUILD b/community/gputils/PKGBUILD
index fbf0f94a5..a9ff743a8 100644
--- a/community/gputils/PKGBUILD
+++ b/community/gputils/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gputils
 pkgver=1.2.0
 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 efcb9e858..9f0f7a8d0 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
 	glib-headers-fix.patch)
diff --git a/community/gq/glib-includes.patch b/community/gq/glib-includes.patch
new file mode 100644
index 000000000..f47418cf0
--- /dev/null
+++ b/community/gq/glib-includes.patch
@@ -0,0 +1,112 @@
+diff -ru gq-1.3.4.orig/src/glib-helpers.c gq-1.3.4/src/glib-helpers.c
+--- gq-1.3.4.orig/src/glib-helpers.c	2012-08-28 16:44:00.844858395 +0200
++++ gq-1.3.4/src/glib-helpers.c	2012-08-28 16:45:32.832447086 +0200
+@@ -23,8 +23,7 @@
+ 
+ #include "glib-helpers.h"
+ 
+-#include <glib/gmessages.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ GList*
+ g_list_copy_reversed(GList* list) {
+diff -ru gq-1.3.4.orig/src/glib-helpers.h gq-1.3.4/src/glib-helpers.h
+--- gq-1.3.4.orig/src/glib-helpers.h	2012-08-28 16:44:00.816659875 +0200
++++ gq-1.3.4/src/glib-helpers.h	2012-08-28 16:45:32.796191846 +0200
+@@ -24,7 +24,7 @@
+ #ifndef GLIB_HELPERS_H
+ #define GLIB_HELPERS_H
+ 
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -ru gq-1.3.4.orig/src/gq-hash.h gq-1.3.4/src/gq-hash.h
+--- gq-1.3.4.orig/src/gq-hash.h	2012-08-28 16:44:00.784432994 +0200
++++ gq-1.3.4/src/gq-hash.h	2012-08-28 16:45:32.699511206 +0200
+@@ -24,7 +24,7 @@
+ #ifndef GQ_ENCRYPTION_H
+ #define GQ_ENCRYPTION_H
+ 
+-#include <glib/garray.h>
++#include <glib.h>
+ #include "gq-utilities.h"
+ 
+ G_BEGIN_DECLS
+diff -ru gq-1.3.4.orig/src/gq-main-loop.h gq-1.3.4/src/gq-main-loop.h
+--- gq-1.3.4.orig/src/gq-main-loop.h	2012-08-28 16:44:00.812631515 +0200
++++ gq-1.3.4/src/gq-main-loop.h	2012-08-28 16:45:32.788135126 +0200
+@@ -24,7 +24,7 @@
+ #ifndef GQ_MAIN_LOOP_H
+ #define GQ_MAIN_LOOP_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -ru gq-1.3.4.orig/src/gq-stack.c gq-1.3.4/src/gq-stack.c
+--- gq-1.3.4.orig/src/gq-stack.c	2012-08-28 16:44:00.824716595 +0200
++++ gq-1.3.4/src/gq-stack.c	2012-08-28 16:45:32.808276926 +0200
+@@ -23,9 +23,7 @@
+ 
+ #include "gq-stack.h"
+ 
+-#include <glib/gmem.h>
+-#include <glib/gmessages.h>
+-#include <glib/glist.h>
++#include <glib.h>
+ 
+ #undef DEBUG_STACK
+ 
+diff -ru gq-1.3.4.orig/src/gq-stack.h gq-1.3.4/src/gq-stack.h
+--- gq-1.3.4.orig/src/gq-stack.h	2012-08-28 16:44:00.832773315 +0200
++++ gq-1.3.4/src/gq-stack.h	2012-08-28 16:45:32.816333646 +0200
+@@ -24,7 +24,7 @@
+ #ifndef GQ_STACK_H
+ #define GQ_STACK_H
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -ru gq-1.3.4.orig/src/gq-tab.h gq-1.3.4/src/gq-tab.h
+--- gq-1.3.4.orig/src/gq-tab.h	2012-08-28 16:44:00.844858395 +0200
++++ gq-1.3.4/src/gq-tab.h	2012-08-28 16:45:32.828418726 +0200
+@@ -24,7 +24,7 @@
+ #ifndef GQ_TAB_H
+ #define GQ_TAB_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+diff -ru gq-1.3.4.orig/src/state.c gq-1.3.4/src/state.c
+--- gq-1.3.4.orig/src/state.c	2012-08-28 16:44:00.804574794 +0200
++++ gq-1.3.4/src/state.c	2012-08-28 16:45:32.780078406 +0200
+@@ -35,8 +35,8 @@
+ #include <fcntl.h>
+ #include <errno.h>
+ 
+ #include <glib/gi18n.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include "configfile.h"
+diff -ru gq-1.3.4.orig/src/syntax.h gq-1.3.4/src/syntax.h
+--- gq-1.3.4.orig/src/syntax.h	2012-08-28 16:44:00.877085275 +0200
++++ gq-1.3.4/src/syntax.h	2012-08-28 16:45:32.840503807 +0200
+@@ -27,7 +27,7 @@
+ #ifndef GQ_SYNTAX_H_INCLUDED
+ #define GQ_SYNTAX_H_INCLUDED
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/community/grace/PKGBUILD b/community/grace/PKGBUILD
index 5c2c89896..141d2b9a0 100644
--- a/community/grace/PKGBUILD
+++ b/community/grace/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=grace
 pkgver=5.1.23
 pkgrel=3
 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/grafx2/PKGBUILD b/community/grafx2/PKGBUILD
index 8e7cbb10b..cecd67df4 100644
--- a/community/grafx2/PKGBUILD
+++ b/community/grafx2/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.4
 pkgrel=3
 _pkgrev=2035
 pkgdesc='Pixelart-oriented painting program'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://code.google.com/p/grafx2/'
 license=('GPL2')
 install=grafx2.install
diff --git a/community/grsync/PKGBUILD b/community/grsync/PKGBUILD
index c5fb910f0..5a62230bd 100644
--- a/community/grsync/PKGBUILD
+++ b/community/grsync/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=grsync
 pkgver=1.2.4
 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/gshutdown/PKGBUILD b/community/gshutdown/PKGBUILD
index 665e1a034..36a1fc53a 100644
--- a/community/gshutdown/PKGBUILD
+++ b/community/gshutdown/PKGBUILD
@@ -6,17 +6,19 @@ pkgname=gshutdown
 pkgver=0.2
 pkgrel=4
 pkgdesc="An advanced shutdown utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gshutdown.tuxfamily.org"
 license=('GPL')
 depends=('libglade' 'libnotify')
 makedepends=('pkg-config')
-source=(http://gshutdown.tuxfamily.org/release/$pkgname-$pkgver.tar.gz)
-md5sums=('c0662f6b74fa1be10e4d34bfc5731d9b')
-sha1sums=('ab73b1d6c36831df82d231ffa333cdf394fd5b3e')
+source=(http://gshutdown.tuxfamily.org/release/$pkgname-$pkgver.tar.gz
+	gshutdown-0.2-glib.patch)
+md5sums=('c0662f6b74fa1be10e4d34bfc5731d9b'
+	 '8d624b2651240d5dffd5fd208a5354ff')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  patch -Np1 -i ${srcdir}/gshutdown-0.2-glib.patch
   sed -i 's/notify_notification_new("GShutdown", message, NULL, GTK_WIDGET(widget));/notify_notification_new("GShutdown", message, GTK_WIDGET(widget));/' src/gui.c
   LDFLAGS="-lX11 -lXau" ./configure --prefix=/usr --mandir=/usr/share
   make
diff --git a/community/gshutdown/gshutdown-0.2-glib.patch b/community/gshutdown/gshutdown-0.2-glib.patch
new file mode 100644
index 000000000..1bf1d52db
--- /dev/null
+++ b/community/gshutdown/gshutdown-0.2-glib.patch
@@ -0,0 +1,100 @@
+--- gshutdown-0.2.orig/src/timer.h	2007-04-14 17:33:39.000000000 -0500
++++ gshutdown-0.2/src/timer.h	2012-12-06 05:12:38.525897810 -0500
+@@ -21,7 +21,7 @@
+ #ifndef __GSHUTDOWN_TIMER__
+ #define __GSHUTDOWN_TIMER__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ guint time_left();
+ gboolean timer_notify();
+
+--- gshutdown-0.2.orig/src/misc.h	2007-04-14 17:33:39.000000000 -0500
++++ gshutdown-0.2/src/misc.h	2012-12-06 05:13:01.306051982 -0500
+@@ -20,7 +20,7 @@
+ #ifndef __GSHUTDOWN_MISC__
+ #define __GSHUTDOWN_MISC__
+ 
+-#include <glib/gtypes.h>      /* gchar */
++#include <glib.h>      /* gchar */
+ 
+ /* Return a data file path. e.g: gshutdown.glade */
+ gchar *data_path(gchar *filename);
+
+--- gshutdown-0.2.orig/src/values.h	2007-05-19 06:42:54.000000000 -0500
++++ gshutdown-0.2/src/values.h	2012-12-06 05:24:45.017440329 -0500
+@@ -21,7 +21,7 @@
+ #ifndef __GSHUTDOWN_VALUES__
+ #define __GSHUTDOWN_VALUES__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include "action.h"
+ 
+ typedef enum {
+
+--- gshutdown-0.2.orig/src/values.c	2007-04-14 17:33:40.000000000 -0500
++++ gshutdown-0.2/src/values.c	2012-12-06 05:30:03.170195207 -0500
+@@ -20,8 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
+-#include <glib/gkeyfile.h>
+-#include <glib/gfileutils.h> /* g_build_path */
++#include <glib.h>
+ #include "values.h"
+ #include "gui.h"
+ #include "detectwm.h"
+
+--- gshutdown-0.2.orig/src/detectwm.h	2007-04-14 17:33:39.000000000 -0500
++++ gshutdown-0.2/src/detectwm.h	2012-12-06 05:35:18.027783235 -0500
+@@ -21,7 +21,7 @@
+ #ifndef __GSHUTDOWN_WMDETECT__
+ #define __GSHUTDOWN_WMDETECT__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ gchar *detect_window_manager();
+ 
+--- gshutdown-0.2.orig/src/misc.c	2007-04-14 17:33:39.000000000 -0500
++++ gshutdown-0.2/src/misc.c	2012-12-06 05:38:44.229476612 -0500
+@@ -20,12 +20,7 @@
+ 
+ #include <unistd.h> /* X_OK */
+ #include <stdlib.h>
+-#include <glib/gstdio.h> 
+-#include <glib/gstrfuncs.h>   /* g_strdup_printf */
+-#include <glib/gmem.h>        /* g_free */
+-#include <glib/gutils.h>      /* g_getenv */
+-#include <glib/gfileutils.h>  /* g_file_test() */
+-#include <glib/gshell.h>      /* g_shell_parse_argv */
++#include <glib.h> 
+ #include "config.h"
+ #include "misc.h"
+ #include "main.h"
+
+--- gshutdown-0.2.orig/src/timer.c	2007-05-19 06:30:38.000000000 -0500
++++ gshutdown-0.2/src/timer.c	2012-12-06 05:42:37.654561395 -0500
+@@ -18,7 +18,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include "timer.h"
+ #include "values.h"
+ #include "gui.h"
+
+--- gshutdown-0.2.orig/src/main.c	2007-06-24 08:03:38.000000000 -0500
++++ gshutdown-0.2/src/main.c	2012-12-06 05:46:46.729676922 -0500
+@@ -21,7 +21,7 @@
+ #include <stdlib.h>
+ #include <signal.h>
+ #include <sys/wait.h>
+-#include <glib/gutils.h> /* g_atexit() */
++#include <glib.h> /* g_atexit() */
+ #include "main.h"
+ #include "gui.h"
+ #include "misc.h"
diff --git a/community/gsimplecal/PKGBUILD b/community/gsimplecal/PKGBUILD
index 54932d156..8f1688ad4 100644
--- a/community/gsimplecal/PKGBUILD
+++ b/community/gsimplecal/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gsimplecal
 pkgver=2.0
 pkgrel=1
 pkgdesc="Simple and lightweight GTK calendar"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dmedvinsky.github.com/$pkgname"
 license=('BSD')
 depends=('gtk3')
diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD
index fe03013e1..895dfbe84 100644
--- a/community/gsmartcontrol/PKGBUILD
+++ b/community/gsmartcontrol/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=gsmartcontrol
 pkgver=0.8.7
 pkgrel=4
 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' 'gtkmm' 'xorg-xmessage' 'hicolor-icon-theme')
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index 2d9811977..8e8018c24 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.8.17
 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 8a44da38d..65667cc89 100644
--- a/community/gsql/PKGBUILD
+++ b/community/gsql/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=6
 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' 'libglade' 'gconf'
 	 'desktop-file-utils' 'libnotify' 'hicolor-icon-theme')
 makedepends=('vte' 'libmariadbclient' 'postgresql-libs' 'libssh')
diff --git a/community/gstreamermm/PKGBUILD b/community/gstreamermm/PKGBUILD
index 1284c0c1e..f6af444cc 100644
--- a/community/gstreamermm/PKGBUILD
+++ b/community/gstreamermm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gstreamermm
 pkgver=0.10.11
 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/gtest/PKGBUILD b/community/gtest/PKGBUILD
index 9d1005c32..8d9dc3592 100644
--- a/community/gtest/PKGBUILD
+++ b/community/gtest/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gtest
 pkgver=1.7.0
 pkgrel=1
 pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/googletest/"
 license=('custom:BSD3')
 depends=('gcc-libs' 'sh')
diff --git a/community/gtk-aurora-engine/PKGBUILD b/community/gtk-aurora-engine/PKGBUILD
index 94a5ff70a..06a4409fa 100644
--- a/community/gtk-aurora-engine/PKGBUILD
+++ b/community/gtk-aurora-engine/PKGBUILD
@@ -5,20 +5,23 @@
 
 pkgname=gtk-aurora-engine
 pkgver=1.5.1
-pkgrel=3
+pkgrel=3.1
 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')
 makedepends=('pkgconfig')
-source=(http://www.gnome-look.org/CONTENT/content-files/56438-aurora-${pkgver}.tar.bz2)
-md5sums=('5eeea57c5938306ad7ccfc7cd71d009d')
+source=(http://www.gnome-look.org/CONTENT/content-files/56438-aurora-${pkgver}.tar.bz2
+	gtk-aurora-engine-1.5.1-glib.patch)
+md5sums=('5eeea57c5938306ad7ccfc7cd71d009d'
+	 '2ca6931d6e0bd5d84efdaa21ec482716')
 
 build() {
 	cd ${srcdir}
 	tar xzf aurora-gtk-engine-1.5.tar.gz -C ${srcdir}
 	cd ${srcdir}/aurora-1.5
+	patch -Np1 -i ${srcdir}/gtk-aurora-engine-1.5.1-glib.patch
 	./configure --prefix=/usr --enable-animation
 	make
 }
diff --git a/community/gtk-aurora-engine/gtk-aurora-engine-1.5.1-glib.patch b/community/gtk-aurora-engine/gtk-aurora-engine-1.5.1-glib.patch
new file mode 100644
index 000000000..4c4d29677
--- /dev/null
+++ b/community/gtk-aurora-engine/gtk-aurora-engine-1.5.1-glib.patch
@@ -0,0 +1,11 @@
+--- aurora-1.5.orig/src/animation.c	2008-05-04 14:59:36.000000000 -0500
++++ aurora-1.5/src/animation.c	2013-02-10 18:57:26.648315428 -0500
+@@ -7,7 +7,7 @@
+ #include "animation.h"
+ 
+ #ifdef HAVE_ANIMATION
+-#include <glib/gtimer.h>
++#include <glib.h>
+ 
+ struct _AnimationInfo {
+ 	GTimer *timer;
diff --git a/community/gtk-chtheme/PKGBUILD b/community/gtk-chtheme/PKGBUILD
index fbce248ad..51bd47548 100644
--- a/community/gtk-chtheme/PKGBUILD
+++ b/community/gtk-chtheme/PKGBUILD
@@ -6,7 +6,7 @@ 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')
+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 000af25cb..6f595a875 100644
--- a/community/gtk-engine-murrine/PKGBUILD
+++ b/community/gtk-engine-murrine/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=gtk-engine-murrine
 pkgver=0.98.2
 pkgrel=1
 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-engine-unico/PKGBUILD b/community/gtk-engine-unico/PKGBUILD
index 01d81d54c..4b42c84d9 100644
--- a/community/gtk-engine-unico/PKGBUILD
+++ b/community/gtk-engine-unico/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk-engine-unico
 pkgver=1.0.2
 pkgrel=3
 pkgdesc='Unico GTK3 theme engine'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://launchpad.net/unico'
 license=('GPL')
 depends=('gtk3')
diff --git a/community/gtk-theme-switch2/PKGBUILD b/community/gtk-theme-switch2/PKGBUILD
index 78087c508..604c6241e 100644
--- a/community/gtk-theme-switch2/PKGBUILD
+++ b/community/gtk-theme-switch2/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.1.0
 pkgrel=2
 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 76d79f00f..b58bb8abb 100644
--- a/community/gtk2+extra/PKGBUILD
+++ b/community/gtk2+extra/PKGBUILD
@@ -6,18 +6,21 @@ pkgname=gtk2+extra
 pkgver=2.1.2
 pkgrel=3
 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')
 source=(http://downloads.sourceforge.net/project/gtkextra/$pkgver/gtk%2Bextra-$pkgver.tar.gz
-	build-fix.patch)
+	build-fix.patch
+	gtk2+extra-2.1.2-glib.patch)
 md5sums=('10779394f39d39115fa3fd0f3dea4436'
-         '114c10e7dc14dc78fc38189ee82fa225')
+         '114c10e7dc14dc78fc38189ee82fa225'
+	 'b05e0caeaf9d05f2167c46a89406f686')
 
 build() {
   cd $srcdir/gtk+extra-$pkgver
   patch -p1 <$srcdir/build-fix.patch
+  patch -Np1 -i ${srcdir}/gtk2+extra-2.1.2-glib.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/community/gtk2+extra/gtk2+extra-2.1.2-glib.patch b/community/gtk2+extra/gtk2+extra-2.1.2-glib.patch
new file mode 100644
index 000000000..19f170606
--- /dev/null
+++ b/community/gtk2+extra/gtk2+extra-2.1.2-glib.patch
@@ -0,0 +1,11 @@
+--- gtk+extra-2.1.2.orig/gtkextra/gtkcharsel.c	2004-08-27 16:46:14.000000000 -0500
++++ gtk+extra-2.1.2/gtkextra/gtkcharsel.c	2012-12-04 06:13:06.926662933 -0500
+@@ -18,7 +18,7 @@
+  */
+ 
+ #include <gtk/gtk.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+ 
+ #include <string.h>
+ #include "gtkcharsel.h"
diff --git a/community/gtk2_prefs/PKGBUILD b/community/gtk2_prefs/PKGBUILD
index 88d0b4b64..de71164e4 100644
--- a/community/gtk2_prefs/PKGBUILD
+++ b/community/gtk2_prefs/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtk2_prefs
 pkgver=0.4.1
 pkgrel=3
 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 9a7cc8870..2f9ae73e6 100644
--- a/community/gtk2fontsel/PKGBUILD
+++ b/community/gtk2fontsel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk2fontsel
 pkgver=0.1
 pkgrel=5
 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 86fc34f32..ab7a8e97f 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' 'haskell-random')
 depends=('gmp')
 options=('strip')
diff --git a/community/gtkballs/PKGBUILD b/community/gtkballs/PKGBUILD
index 530a1e782..f745ac0ec 100644
--- a/community/gtkballs/PKGBUILD
+++ b/community/gtkballs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkballs
 pkgver=3.1.5
 pkgrel=5
 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 e331cebb9..d2cd27f1f 100644
--- a/community/gtkdatabox/PKGBUILD
+++ b/community/gtkdatabox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkdatabox
 pkgver=0.9.2.0
 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://sourceforge.net/projects/gtkdatabox/"
 license=("LGPL")
 depends=('gtk2' 'libglade')
diff --git a/community/gtkdialog/PKGBUILD b/community/gtkdialog/PKGBUILD
index 98398f1cf..ce56d1f19 100644
--- a/community/gtkdialog/PKGBUILD
+++ b/community/gtkdialog/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkdialog
 pkgver=0.8.3
 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/gtkglextmm/PKGBUILD b/community/gtkglextmm/PKGBUILD
index f90b68c1b..04ddf09c7 100644
--- a/community/gtkglextmm/PKGBUILD
+++ b/community/gtkglextmm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtkglextmm
 pkgver=1.2.0
 pkgrel=9
 pkgdesc="Cpp C++ bindings for gtkglext"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkglext.sourceforge.net/"
 depends=('gtkmm' 'gtkglext')
 makedepends=('mesa')
diff --git a/community/gtkhotkey/PKGBUILD b/community/gtkhotkey/PKGBUILD
index adb2ae4a0..f8c76bece 100644
--- a/community/gtkhotkey/PKGBUILD
+++ b/community/gtkhotkey/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=gtkhotkey
 pkgver=0.2.1
 pkgrel=8
 pkgdesc="Platform independent hotkey handling for Gtk+ applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/gtkhotkey"
 license=('LGPL3')
 depends=('gtk2')
diff --git a/community/gtkimageview/PKGBUILD b/community/gtkimageview/PKGBUILD
index fe6627033..5ccaf30a9 100644
--- a/community/gtkimageview/PKGBUILD
+++ b/community/gtkimageview/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtkimageview
 pkgver=1.6.4
 pkgrel=4
 pkgdesc="Simple image viewer widget for GTK2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/GNOME/gtkimageview"
 license=('LGPL2.1')
 depends=('gtk2')
diff --git a/community/gtkperf/PKGBUILD b/community/gtkperf/PKGBUILD
index 144e03df5..f71c5c92a 100644
--- a/community/gtkperf/PKGBUILD
+++ b/community/gtkperf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtkperf
 pkgver=0.40
 pkgrel=4
 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/gtkpod/PKGBUILD b/community/gtkpod/PKGBUILD
index b02292408..f48b07514 100644
--- a/community/gtkpod/PKGBUILD
+++ b/community/gtkpod/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtkpod
 pkgver=2.1.4
 pkgrel=1
 pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkpod.sourceforge.net"
 license=('GPL')
 depends=('libanjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk' 'hicolor-icon-theme' 'webkitgtk')
diff --git a/community/gtksourceviewmm/PKGBUILD b/community/gtksourceviewmm/PKGBUILD
index 69e9356aa..dbb58d752 100644
--- a/community/gtksourceviewmm/PKGBUILD
+++ b/community/gtksourceviewmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtksourceviewmm
 pkgver=3.2.0
 pkgrel=4
 pkgdesc='C++ bindings for the gtksourceview library'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://projects.gnome.org/gtksourceviewmm/'
 license=('LGPL2.1')
 depends=('gtkmm3' 'gtksourceview3')
diff --git a/community/gtkspell3/PKGBUILD b/community/gtkspell3/PKGBUILD
index 3b26b546a..096903245 100644
--- a/community/gtkspell3/PKGBUILD
+++ b/community/gtkspell3/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.0.4
 pkgrel=1
 url="http://gtkspell.sourceforge.net/"
 pkgdesc="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=('gtk3' 'enchant')
 makedepends=('intltool' 'gobject-introspection' 'vala')
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index ec91fe41b..68112a3b9 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtkwave
 pkgver=3.3.52
 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 2734db32d..31dc1f275 100644
--- a/community/gtranslator/PKGBUILD
+++ b/community/gtranslator/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gtranslator
 pkgver=2.91.6
 pkgrel=4
 pkgdesc='Enhanced gettext po file editor for the GNOME'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://projects.gnome.org/gtranslator/'
 license=('GPL')
 depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf')
diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD
index bb6294870..167beb14b 100644
--- a/community/gtypist/PKGBUILD
+++ b/community/gtypist/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gtypist
 pkgver=2.9.4
 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')
@@ -21,6 +21,8 @@ md5sums=('1b6acd602996b86f8967ab7693b06ec8'
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/ncurses.patch
+  aclocal
+  automake --add-missing
   autoreconf
 }
 
diff --git a/community/guake/PKGBUILD b/community/guake/PKGBUILD
index b9efd89fa..3d8f8711a 100644
--- a/community/guake/PKGBUILD
+++ b/community/guake/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=guake
 pkgver=0.4.4
 pkgrel=2
 pkgdesc='Drop-down terminal for GNOME'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://guake.org/"
 license=('GPL')
 depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/community/guayadeque/PKGBUILD b/community/guayadeque/PKGBUILD
index cb9cad2a9..7ef2cdb4d 100755
--- a/community/guayadeque/PKGBUILD
+++ b/community/guayadeque/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=guayadeque
 pkgver=0.3.5
 pkgrel=6
 pkgdesc="Lightweight music player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://guayadeque.org/"
 license=('GPL3')
 depends=('curl' 'desktop-file-utils' 'flac' 'libgpod' 'taglib' 'wxgtk2.8')
diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD
index e6eae876c..0464b30d1 100644
--- a/community/guichan/PKGBUILD
+++ b/community/guichan/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=guichan
 pkgver=0.8.2
 pkgrel=4
 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' 'allegro4' 'libgl' 'glut')
diff --git a/community/guifications/PKGBUILD b/community/guifications/PKGBUILD
index 2b0a1ec7e..13600adb7 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 69a8ac95c..ed9b420d0 100644
--- a/community/gummi/PKGBUILD
+++ b/community/gummi/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gummi
 pkgver=0.6.5
 pkgrel=1
 pkgdesc='Simple LaTex editor for GTK users'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://gummi.midnightcoding.org/'
 license=('MIT')
 depends=('texlive-core' 'gtkspell' 'gtksourceview2' 'poppler-glib' 'desktop-file-utils')
diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD
index 174bc39e1..a50905dd6 100644
--- a/community/guvcview/PKGBUILD
+++ b/community/guvcview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=guvcview
 pkgver=1.7.3
 pkgrel=1
 pkgdesc="A video viewer and capturer for the linux uvc driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://guvcview.sourceforge.net/"
 license=('GPL')
 depends=('portaudio' 'ffmpeg' 'gtk3')
diff --git a/community/gwenhywfar/PKGBUILD b/community/gwenhywfar/PKGBUILD
index 831978469..953ef85a2 100644
--- a/community/gwenhywfar/PKGBUILD
+++ b/community/gwenhywfar/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=4.3.3
 _dnrel=67
 pkgrel=4
 pkgdesc="OS abstraction functions for various projects"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.aquamaniac.de"
 license=("LGPL")
 depends=('openssl' 'gnutls' 'libgcrypt')
diff --git a/community/gwget/PKGBUILD b/community/gwget/PKGBUILD
index 68d4d72f5..4f9cadfd7 100644
--- a/community/gwget/PKGBUILD
+++ b/community/gwget/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=gwget
 pkgver=1.0.4
 pkgrel=7
 pkgdesc="Download manager for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/gwget/"
 license=('GPL')
 depends=('gtk2' 'gconf' 'libnotify')
diff --git a/community/gxmessage/PKGBUILD b/community/gxmessage/PKGBUILD
index c11e4e8fd..3787e99c0 100644
--- a/community/gxmessage/PKGBUILD
+++ b/community/gxmessage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gxmessage
 pkgver=2.20.0
 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/haddock/PKGBUILD b/community/haddock/PKGBUILD
index 5c82eff82..e0d57ca63 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Tool for generating documentation for Haskell libraries'
 url='http://hackage.haskell.org/package/haddock/'
 license=('custom:BSD3')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 makedepends=('alex' 'happy')
 depends=('ghc' 'haskell-xhtml' 'haskell-ghc-paths')
 install="$pkgname.install"
diff --git a/community/hardlink/PKGBUILD b/community/hardlink/PKGBUILD
index edf5d6973..018471415 100644
--- a/community/hardlink/PKGBUILD
+++ b/community/hardlink/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hardlink
 pkgver=0.2.0
 pkgrel=1
 pkgdesc='Replace file copies using hardlinks'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://jak-linux.org/projects/hardlink/'
 license=('custom: MIT')
 depends=('glibc' 'pcre')
diff --git a/community/hashcash/PKGBUILD b/community/hashcash/PKGBUILD
index d171ada31..431c03627 100644
--- a/community/hashcash/PKGBUILD
+++ b/community/hashcash/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hashcash
 pkgver=1.22
 pkgrel=3
 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' )
@@ -15,10 +15,10 @@ md5sums=('31fae207061841dffc7b90ee18e3d0fa')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  if [ "${CARCH}" = "x86_64" ]; then
-    make generic-openssl
-  else
+  if [ "${CARCH}" = "i686" ]; then
     make x86-openssl
+  else
+    make generic-openssl
   fi
   install -Dm755 hashcash ${pkgdir}/usr/bin/hashcash
   install -Dm755 sha1 ${pkgdir}/usr/bin/sha1
diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD
index cab7251c1..c20665eff 100644
--- a/community/haskell-ghc-paths/PKGBUILD
+++ b/community/haskell-ghc-paths/PKGBUILD
@@ -8,6 +8,7 @@ pkgrel=3
 pkgdesc="Knowledge of GHC's installation directories"
 url='http://hackage.haskell.org/package/ghc-paths'
 license=('custom:BSD3')
+arch=('i686' 'x86_64' 'mips64el')
 arch=('x86_64' 'i686')
 depends=('ghc=7.6.3-1')
 source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz")
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index 6bde5b545..852677c11 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -8,7 +8,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' 'haskell-network')
 options=('staticlibs')
 install=${pkgname}.install
diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD
index 5e93dc6b1..9410e92d5 100644
--- a/community/haskell-x11/PKGBUILD
+++ b/community/haskell-x11/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=haskell-x11
 pkgver=1.6.1.1
 pkgrel=3
 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 3eb1385fd..21d505b7e 100644
--- a/community/hatari/PKGBUILD
+++ b/community/hatari/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hatari
 pkgver=1.7.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/haveged/cleanexit.patch b/community/haveged/cleanexit.patch
new file mode 100644
index 000000000..01f8c7f94
--- /dev/null
+++ b/community/haveged/cleanexit.patch
@@ -0,0 +1,21 @@
+diff -u -r haveged-1.7c/src/haveged.c haveged-1.7c-cleanexit/src/haveged.c
+--- haveged-1.7c/src/haveged.c	2013-01-12 19:20:04.000000000 +0100
++++ haveged-1.7c-cleanexit/src/haveged.c	2013-11-05 22:40:22.202935493 +0100
+@@ -642,7 +642,16 @@
+ static void tidy_exit(           /* OUT: nothing      */
+    int signum)                   /* IN: signal number */
+ {
+-   error_exit("Stopping due to signal %d\n", signum);
++#ifndef NO_DAEMON
++   if (params->detached!=0) {
++      unlink(params->pid_file);
++      syslog(LOG_INFO, "%s Stopping due to signal %d", params->daemon, signum);
++      }
++   else
++#endif
++      fprintf(stderr, "%s Stopping due to signal %d\n", params->daemon, signum);
++   havege_destroy(handle);
++   exit(0);
+ }
+ /**
+  * send usage display to stderr
diff --git a/community/hawknl/PKGBUILD b/community/hawknl/PKGBUILD
index f10df654a..7c140f823 100644
--- a/community/hawknl/PKGBUILD
+++ b/community/hawknl/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=hawknl
 pkgver=1.68
 pkgrel=3
 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/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD
index 1fd252d76..a652ec90d 100644
--- a/community/hdapsd/PKGBUILD
+++ b/community/hdapsd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hdapsd
 pkgver=20090401
 pkgrel=8
 pkgdesc='HDAPS userspace hard drive protection daemon'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/hdaps/'
 license=('GPL')
 depends=('glibc' 'bash')
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index be213374b..a1ccfe497 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="turn based strategy, artillery, action and comedy game, featuring the
  antics of pink hedgehogs with attitude as they battle from the depths of hell
  to the depths of space."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hedgewars.org"
 license=('GPL' 'custom')
 depends=('qt4' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua51' 'ffmpeg' 'glut')
diff --git a/community/hercules/PKGBUILD b/community/hercules/PKGBUILD
index 9a1396446..7e2d83fa6 100644
--- a/community/hercules/PKGBUILD
+++ b/community/hercules/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=hercules
 pkgver=3.08
 pkgrel=1
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 pkgdesc='Software implementation of System/370 and ESA/390'
 url='http://www.hercules-390.eu/'
 source=("http://downloads.hercules-390.eu/$pkgname-$pkgver.tar.gz")
diff --git a/community/herqq/PKGBUILD b/community/herqq/PKGBUILD
index 9728f46c3..c7ff73ea4 100644
--- a/community/herqq/PKGBUILD
+++ b/community/herqq/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=herqq
 pkgver=1.0.0
 pkgrel=2
 pkgdesc='Software library for building UPnP devices (HUPnP)'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.herqq.org/'
 license=('GPL')
 depends=('qt4')
diff --git a/community/hevea/PKGBUILD b/community/hevea/PKGBUILD
index 6a2b3397c..9fcc51e37 100644
--- a/community/hevea/PKGBUILD
+++ b/community/hevea/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=hevea
 pkgver=2.02
 pkgrel=1
 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/"
@@ -18,6 +18,7 @@ md5sums=('b0331fdf123c21ce02f15c890d268306')
 build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i 's:usr/local:usr:' Makefile
+  [ "$CARCH" = "mips64el" ] && (sed -i 's:TARGET=opt:TARGET=byte:' Makefile)
   make
 }
 
diff --git a/community/hex-a-hop/PKGBUILD b/community/hex-a-hop/PKGBUILD
index 4a1715e85..c4e4a0fe2 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=3
 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/hexedit/PKGBUILD b/community/hexedit/PKGBUILD
index 5ae5bc508..f761e9907 100644
--- a/community/hexedit/PKGBUILD
+++ b/community/hexedit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hexedit
 pkgver=1.2.13
 pkgrel=1
 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/community/highlight/PKGBUILD b/community/highlight/PKGBUILD
index a3d703e20..2ef68e82a 100644
--- a/community/highlight/PKGBUILD
+++ b/community/highlight/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.17
 pkgrel=1
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=(qt4 lua boost)
 source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc})
 md5sums=('52babb37da6a69867dc295e31d8a721e'
diff --git a/community/hitori/PKGBUILD b/community/hitori/PKGBUILD
index 51417c1bb..45a7e4e25 100644
--- a/community/hitori/PKGBUILD
+++ b/community/hitori/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hitori
 pkgver=0.4.2
 pkgrel=1
 pkgdesc="GTK+ application to generate and let you play games of Hitori"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://wiki.gnome.org/Apps/Hitori"
 license=('GPL')
 depends=('gtk3' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD
index aa61d89c7..de28490b3 100644
--- a/community/homebank/PKGBUILD
+++ b/community/homebank/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=homebank
 pkgver=4.5.5
 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' 'perl-xml-parser' 'shared-mime-info')
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index 828a36e47..01bc9eab5 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hostapd
 pkgver=2.1
 pkgrel=2
 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://w1.fi/hostapd/"
 license=('custom')
 depends=('openssl' 'libnl')
diff --git a/community/hping/PKGBUILD b/community/hping/PKGBUILD
index 41c30b6a4..d75938dec 100644
--- a/community/hping/PKGBUILD
+++ b/community/hping/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hping
 pkgver=3.0.0
 pkgrel=3
 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 e72d0eee6..947c64859 100644
--- a/community/hsolink/PKGBUILD
+++ b/community/hsolink/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hsolink
 pkgver=1.0.118
 pkgrel=8
 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 3b642dadf..c46f91c22 100644
--- a/community/ht/PKGBUILD
+++ b/community/ht/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ht
 pkgver=2.0.22
 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 03bc15359..c74801236 100644
--- a/community/html2text/PKGBUILD
+++ b/community/html2text/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=html2text
 pkgver=1.3.2a
 pkgrel=10
 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/httperf/PKGBUILD b/community/httperf/PKGBUILD
index c9b072988..99320a4df 100644
--- a/community/httperf/PKGBUILD
+++ b/community/httperf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=httperf
 pkgver=0.9.0
 pkgrel=5
 pkgdesc='A tool for measuring web server performance.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://code.google.com/p/httperf'
 depends=('openssl')
diff --git a/community/httptunnel/PKGBUILD b/community/httptunnel/PKGBUILD
index dad2e7b9a..de0930cad 100644
--- a/community/httptunnel/PKGBUILD
+++ b/community/httptunnel/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=httptunnel
 pkgver=3.3
-pkgrel=3
+pkgrel=3.1
 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/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD
index 0b790dbae..ab29b5369 100644
--- a/community/hwinfo/PKGBUILD
+++ b/community/hwinfo/PKGBUILD
@@ -12,7 +12,7 @@ pkgver=21.0
 _subver=1.2
 pkgrel=1
 pkgdesc='Hardware detection tool from openSUSE'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://download.opensuse.org/source/factory/repo/oss/suse/src/'
 license=('GPL2')
 depends=('perl' 'libx86emu')
diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD
index 448c7452c..858749946 100644
--- a/community/i2c-tools/PKGBUILD
+++ b/community/i2c-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=i2c-tools
 pkgver=3.1.0
 pkgrel=5
 pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lm-sensors.org/wiki/I2CTools"
 license=('GPL')
 depends=('python2')
diff --git a/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index 17fb5a034..61e1fb220 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -6,7 +6,7 @@ _pkgsourcename=i3
 pkgver=4.7.2
 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 ed56a3f02..dd2e5e335 100644
--- a/community/i3lock/PKGBUILD
+++ b/community/i3lock/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=i3lock
 pkgver=2.5
 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 7342a29c4..33030d657 100644
--- a/community/i3status/PKGBUILD
+++ b/community/i3status/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=i3status
 pkgver=2.8
 pkgrel=2
 pkgdesc='Generates status bar to use with i3bar, 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 474085f09..5c74912c1 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=iasl
 pkgver=20140114
 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 f4288d5dc..4af9dc3ec 100644
--- a/community/ibam/PKGBUILD
+++ b/community/ibam/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibam
 pkgver=0.5.2
 pkgrel=7
 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 bb2b28caa..d60d1ab20 100644
--- a/community/ibus-anthy/PKGBUILD
+++ b/community/ibus-anthy/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ibus-anthy
 pkgver=1.5.4
 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' 'pygtk' 'gtk-update-icon-cache')
diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD
index 3e6ca0984..ba855670e 100644
--- a/community/ibus-chewing/PKGBUILD
+++ b/community/ibus-chewing/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=ibus-chewing
 pkgver=1.4.7
 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' 'gconf')
diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD
index 2d24f29df..01f3e680f 100644
--- a/community/ibus-hangul/PKGBUILD
+++ b/community/ibus-hangul/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibus-hangul
 pkgver=1.4.2
 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' 'iso-codes' 'pygtk' 'gtk-update-icon-cache')
diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD
index d67df2eab..b160e9d2c 100644
--- a/community/ibus-kkc/PKGBUILD
+++ b/community/ibus-kkc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ibus-kkc
 pkgver=1.5.19
 pkgrel=1
 pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://bitbucket.org/libkkc"
 license=('GPL')
 depends=('ibus' 'libkkc' 'libkkc-data' 'skk-jisyo')
diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD
index eddecbb2d..1597f0ebd 100644
--- a/community/ibus-libpinyin/PKGBUILD
+++ b/community/ibus-libpinyin/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=ibus-libpinyin
 pkgver=1.6.91
 pkgrel=2
 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="https://github.com/libpinyin/ibus-libpinyin"
 depends=('ibus' 'libpinyin' 'python2-xdg')
diff --git a/community/ibus-m17n/PKGBUILD b/community/ibus-m17n/PKGBUILD
index 37a284df9..735bb9b84 100644
--- a/community/ibus-m17n/PKGBUILD
+++ b/community/ibus-m17n/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ibus-m17n
 pkgver=1.3.4
 pkgrel=3
 pkgdesc='M17N engine for IBus'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/ibus/'
 license=('LGPL')
 depends=('python2-pyenchant' 'ibus' 'm17n-db' 'm17n-lib')
diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD
index 25146a8e3..e08eacb28 100644
--- a/community/ibus-pinyin/PKGBUILD
+++ b/community/ibus-pinyin/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=ibus-pinyin
 pkgver=1.5.0
 pkgrel=2
 pkgdesc='Pinyin (Chinese) input method for the IBus framework'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://ibus.googlecode.com'
 depends=('ibus' 'pyzy' 'lua51')
diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD
index f7ec9ad04..ba304ca07 100644
--- a/community/ibus-qt/PKGBUILD
+++ b/community/ibus-qt/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ibus-qt
 pkgver=1.3.2
 pkgrel=2
 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=('qt4' 'ibus' 'icu')
diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD
index 2f4e56338..9ed0c5bc1 100644
--- a/community/ibus-rime/PKGBUILD
+++ b/community/ibus-rime/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ibus-rime
 pkgver=1.1
 pkgrel=1
 pkgdesc="Rime input method engine for ibus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rimeime/"
 license=('GPL3')
 depends=('ibus' 'libnotify' 'librime>=1.1' 'brise')
diff --git a/community/ibus-sunpinyin/PKGBUILD b/community/ibus-sunpinyin/PKGBUILD
index c41529cec..1f40688fe 100644
--- a/community/ibus-sunpinyin/PKGBUILD
+++ b/community/ibus-sunpinyin/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.0.3.20130307
 _commit=64e26d9ed1f617e59ff37c2efc0be97727c799a1
 pkgrel=1
 pkgdesc="IBus Wrapper for sunpinyin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sunpinyin.googlecode.com"
 license=('LGPL')
 depends=('sunpinyin>2.0.3' 'sunpinyin-data' 'ibus')
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-unikey/PKGBUILD b/community/ibus-unikey/PKGBUILD
index f1e78b64e..fb0f50524 100644
--- a/community/ibus-unikey/PKGBUILD
+++ b/community/ibus-unikey/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ibus-unikey
 pkgver=0.6.1
 pkgrel=2
 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/icecast/PKGBUILD b/community/icecast/PKGBUILD
index aad4ca008..f4a06dff8 100644
--- a/community/icecast/PKGBUILD
+++ b/community/icecast/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=icecast
 pkgver=2.3.3
 pkgrel=4
 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/ico2xpm/PKGBUILD b/community/ico2xpm/PKGBUILD
index ac06c0ef4..2c006dc97 100644
--- a/community/ico2xpm/PKGBUILD
+++ b/community/ico2xpm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ico2xpm
 pkgver=1.3
 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/$pkgver/ico2xpm-${pkgver/./_}-src.tar.gz)
diff --git a/community/icoutils/PKGBUILD b/community/icoutils/PKGBUILD
index b24c5c601..db000c6bf 100644
--- a/community/icoutils/PKGBUILD
+++ b/community/icoutils/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=icoutils
 pkgver=0.30.0
 pkgrel=2
 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/id3/PKGBUILD b/community/id3/PKGBUILD
index 1093b942f..9a4d71b73 100644
--- a/community/id3/PKGBUILD
+++ b/community/id3/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=id3
 pkgver=0.78
-pkgrel=3
+pkgrel=3.1
 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/community/idesk/PKGBUILD b/community/idesk/PKGBUILD
index 027925bcc..abbb694e7 100644
--- a/community/idesk/PKGBUILD
+++ b/community/idesk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=idesk
 pkgver=0.7.5
 pkgrel=4
 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/iec16022/PKGBUILD b/community/iec16022/PKGBUILD
index 7240bcec4..cc47bcf7b 100644
--- a/community/iec16022/PKGBUILD
+++ b/community/iec16022/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=iec16022
 pkgver=0.2.4
 pkgrel=1
 pkgdesc="Produce 2D barcodes often also referenced as DataMatrix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://datenfreihafen.org/projects/iec16022.html"
 license=('GPL')
 depends=('popt' 'zlib')
diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD
index 05a44e9cf..5eb35b0d8 100644
--- a/community/iftop/PKGBUILD
+++ b/community/iftop/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=iftop
 pkgver=1.0pre4
 pkgrel=1
 pkgdesc="Display bandwidth usage on an interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.ex-parrot.com/~pdw/iftop/"
 license=('GPL')
 depends=('libpcap' 'ncurses')
@@ -18,7 +18,7 @@ source=("http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz
 build() {
   cd $pkgname-$pkgver
 
-  ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man
+  ./configure --prefix=/usr --sbindir=/usr/bin --mandir=/usr/share/man --build=$CHOST
   make
 }
 
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index b6075319b..eac8cba7e 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.1.2
 pkgrel=5
 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/igmpproxy/PKGBUILD b/community/igmpproxy/PKGBUILD
index 5255e1648..00e4855c3 100644
--- a/community/igmpproxy/PKGBUILD
+++ b/community/igmpproxy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=igmpproxy
 pkgver=0.1
 pkgrel=3
 pkgdesc="a simple multicast router for Linux only using the IGMP protocol"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://sourceforge.net/projects/igmpproxy"
 license=('GPL')
 depends=()
diff --git a/community/imdbpy/PKGBUILD b/community/imdbpy/PKGBUILD
index 2980e6df1..a06ee7734 100644
--- a/community/imdbpy/PKGBUILD
+++ b/community/imdbpy/PKGBUILD
@@ -7,10 +7,10 @@
 pkgname=imdbpy
 _realname=IMDbPY
 pkgver=4.9
-pkgrel=1
+pkgrel=1.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 7417beb4a..a24c78732 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=incron
 pkgver=0.5.10
 pkgrel=6
 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/inn/PKGBUILD b/community/inn/PKGBUILD
index 6608611da..7e55110be 100644
--- a/community/inn/PKGBUILD
+++ b/community/inn/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.5.3
 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')
 makedepends=('make' 'bison' 'python2' 'gcc' 'smtp-forwarder' 'libsasl')
diff --git a/community/inotify-tools/PKGBUILD b/community/inotify-tools/PKGBUILD
index 2fe769dca..bec9004cd 100644
--- a/community/inotify-tools/PKGBUILD
+++ b/community/inotify-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=inotify-tools
 pkgver=3.14
 pkgrel=3
 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/instead-launcher/PKGBUILD b/community/instead-launcher/PKGBUILD
index bbb190068..7ec18e89c 100644
--- a/community/instead-launcher/PKGBUILD
+++ b/community/instead-launcher/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=instead-launcher
 pkgver=0.6.1
 pkgrel=3
 pkgdesc="launcher and games downloader for INSTEAD quest interpreter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://instead-launcher.googlecode.com/"
 license=('GPL')
 makedepends=('sed' 'qt4')
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index 04b247bda..268ae3c53 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=instead
 pkgver=2.0.2
 pkgrel=1
 pkgdesc="a quest interpreter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/instead/"
 license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua')
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index cd5fc1252..a0b3660fb 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=13.0.2
 _pkgver=133.696
 pkgrel=1
 pkgdesc="Architecture dependent 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/ioping/PKGBUILD b/community/ioping/PKGBUILD
index 94790d61a..e556c71aa 100644
--- a/community/ioping/PKGBUILD
+++ b/community/ioping/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ioping
 pkgver=0.8
 pkgrel=1
 pkgdesc='Simple disk I/0 latency measuring tool'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url='http://ioping.googlecode.com'
 depends=('glibc')
diff --git a/community/iperf/PKGBUILD b/community/iperf/PKGBUILD
index fb4539a72..7c98b4f7a 100644
--- a/community/iperf/PKGBUILD
+++ b/community/iperf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=iperf
 pkgver=2.0.5
 pkgrel=7
 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/community/ipguard/PKGBUILD b/community/ipguard/PKGBUILD
index 691be3d32..b9bc5b333 100644
--- a/community/ipguard/PKGBUILD
+++ b/community/ipguard/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ipguard
 pkgver=1.04
 pkgrel=3
 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/ipset/PKGBUILD b/community/ipset/PKGBUILD
index 08d9c9c39..2abcb9856 100644
--- a/community/ipset/PKGBUILD
+++ b/community/ipset/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ipset
 pkgver=6.20.1
 pkgrel=2
 pkgdesc='Administration tool for IP sets'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ipset.netfilter.org'
 license=('GPL2')
 depends=('libmnl')
diff --git a/community/iptstate/PKGBUILD b/community/iptstate/PKGBUILD
index 458bc3ad1..117243f2c 100644
--- a/community/iptstate/PKGBUILD
+++ b/community/iptstate/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=iptstate
 pkgver=2.2.5
 pkgrel=2
 pkgdesc='top-like interface to netfilter connection-tracking table'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.phildev.net/iptstate/'
 license=('custom')
 depends=('gcc-libs' 'ncurses' 'libnetfilter_conntrack')
diff --git a/community/ipvsadm/PKGBUILD b/community/ipvsadm/PKGBUILD
index df129e8de..f3a016dbc 100644
--- a/community/ipvsadm/PKGBUILD
+++ b/community/ipvsadm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ipvsadm
 pkgver=1.27
 pkgrel=1
 pkgdesc='The IP Virtual Server administration utility'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxvirtualserver.org/software/ipvs.html'
 license=('GPL2')
 depends=('libnl1' 'popt' 'bash')
diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD
index ae8af24b7..34258a9cc 100644
--- a/community/irrlicht/PKGBUILD
+++ b/community/irrlicht/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('irrlicht' 'irrlicht-docs')
 pkgver=1.8.1
 pkgrel=2
 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/jack2/PKGBUILD b/community/jack2/PKGBUILD
index 20da91cc8..e59542bb9 100644
--- a/community/jack2/PKGBUILD
+++ b/community/jack2/PKGBUILD
@@ -10,11 +10,12 @@ pkgname=('jack2' 'jack2-dbus')
 _tarname=jack
 pkgver=1.9.9.5
 pkgrel=4
-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-dbus' 'libffado' 'celt' 'opus' 'libsamplerate')
+makedepends=('python2-dbus' 'celt' 'opus' 'libsamplerate')
+[ "$CARCH" != "mips64el" ] && makedepends+=('libffado')
 source=("https://dl.dropbox.com/u/28869550/jack-1.9.9.5.tar.bz2"
         '99-audio.conf'
         '40-hpet-permissions.rules')
@@ -32,9 +33,14 @@ _pyfix() {
 }
 
 _wafconf() {
+  if [ "$CARCH" = "mips64el" ]; then
+    firewire=""
+  else
+    firewire=--firewire
+  fi
   python2 waf configure --prefix=/usr \
                         --alsa \
-                        --firewire $@
+                        $firewire $@
 
   # not building with doxygen
   # see https://github.com/jackaudio/jack2/issues/22
@@ -84,6 +90,7 @@ package_jack2() {
   pkgdesc="The next-generation JACK with SMP support"
   depends=('libsamplerate' 'celt' 'opus' 'libffado')
   optdepends=('python2-dbus: jack_control')
+  [ "$CARCH" != "mips64el" ] && depends+=('libffado')
   conflicts=('jack')
   provides=('jack' 'jackmp' 'jackdmp' 'jackdbus')
 
@@ -107,7 +114,8 @@ package_jack2-dbus() {
   ! _isbuild jack2-dbus && return 0
 
   pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)"
-  depends=('libsamplerate' 'celt' 'opus' 'libffado')
+  depends=('libsamplerate' 'celt' 'opus')
+  [ "$CARCH" != "mips64el" ] && depends+=('libffado')
   optdepends=('python2-dbus: jack_control')
   conflicts=('jack' 'jack2')
   provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus')
diff --git a/community/jad/PKGBUILD b/community/jad/PKGBUILD
index 5383ef577..9d4421016 100644
--- a/community/jad/PKGBUILD
+++ b/community/jad/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.5.8e
 pkgrel=5
 pkgdesc='Java decompiler'
 license=('custom')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.varaneckas.com/jad'
 optdepends=('vim-jad: open class files directly in vim and see the decompiled source code')
 makedepends=('links')
diff --git a/community/jansson/PKGBUILD b/community/jansson/PKGBUILD
index b93245670..cf79fd9f1 100644
--- a/community/jansson/PKGBUILD
+++ b/community/jansson/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jansson
 pkgver=2.5
 pkgrel=2
 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/'
 depends=('glibc')
 license=('MIT')
diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD
index 996fc58b0..aa99dea4f 100644
--- a/community/javasqlite/PKGBUILD
+++ b/community/javasqlite/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=javasqlite
 pkgver=20131124
 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=('custom:BSD-style')
 depends=('java-runtime' 'sqlite')
diff --git a/community/jbig2dec/PKGBUILD b/community/jbig2dec/PKGBUILD
index f2b86bfe8..3ec4977a6 100644
--- a/community/jbig2dec/PKGBUILD
+++ b/community/jbig2dec/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jbig2dec
 pkgver=0.11
 pkgrel=7
 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')
 depends=('glibc' 'libpng')
diff --git a/community/jbigkit/PKGBUILD b/community/jbigkit/PKGBUILD
index 5754c044b..0e60b8068 100644
--- a/community/jbigkit/PKGBUILD
+++ b/community/jbigkit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=jbigkit
 pkgver=2.0
 pkgrel=5
 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/jemalloc/PKGBUILD b/community/jemalloc/PKGBUILD
index 8ed1666a7..9aab7741c 100644
--- a/community/jemalloc/PKGBUILD
+++ b/community/jemalloc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jemalloc
 pkgver=3.5.0
 pkgrel=1
 pkgdesc="General-purpose scalable concurrent malloc implementation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://www.canonware.com/jemalloc/"
 depends=('glibc')
diff --git a/community/jhead/PKGBUILD b/community/jhead/PKGBUILD
index 4a2f0ccf3..3dc0e1518 100644
--- a/community/jhead/PKGBUILD
+++ b/community/jhead/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.97
 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/community/john/PKGBUILD b/community/john/PKGBUILD
index 20e0a3d7c..89cc68c17 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,10 +6,10 @@
 
 pkgname=john
 pkgver=1.7.9
-pkgrel=7
+pkgrel=7.1
 _jumbover=7
 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')
@@ -39,6 +39,9 @@ build() {
 	    sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=x86-64 -DJOHN_SYSTEMWIDE=1|' Makefile
 	    sed -i 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' Makefile
 	    sed -i -e 's|-m486||g' Makefile
+	  elif [ "$CARCH" == "mips64el" ]; then
+	    sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=mips3 -mtune=loongson2f -DJOHN_SYSTEMWIDE=1|' Makefile
+	    #sed -i 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' Makefile
 	  else sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=i686 -DJOHN_SYSTEMWIDE=1|' Makefile
 	fi
 	sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' Makefile
@@ -51,6 +54,8 @@ build() {
 	# build john
 	if [ "$CARCH" == "x86_64" ]; then
 	    make linux-x86-64
+	  elif [ "$CARCH" == "mips64el" ]; then
+	    make generic
 	  else make linux-x86-mmx
 	fi
 }
diff --git a/community/js185/PKGBUILD b/community/js185/PKGBUILD
index 3da079149..b20cbf9f8 100644
--- a/community/js185/PKGBUILD
+++ b/community/js185/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=js185
 pkgver=1.0.0
 pkgrel=2
 pkgdesc="JavaScript interpreter and libraries (legacy)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5"
 license=(MPL)
 depends=(nspr gcc-libs)
@@ -17,11 +17,19 @@ md5sums=('a4574365938222adca0a6bd33329cb32')
 build() {
   cd js-1.8.5/js/src
 
+  if [ "$CARCH" = "mips64el" ]; then
+     #Force disabling JIT.
+     sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
+         assembler/wtf/Platform.h
+     sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' Makefile.{in,ref}
+     extraconf="--disable-methodjit --disable-tracejit"
+  fi
+
   # _FORTIFY_SOURCE causes configure error
   unset CPPFLAGS
 
   ./configure --prefix=/usr --with-system-nspr \
-     --enable-threadsafe
+     --enable-threadsafe $extraconf
   make
 }
 
diff --git a/community/jshon/PKGBUILD b/community/jshon/PKGBUILD
index 7180fbea8..dcd6d6554 100644
--- a/community/jshon/PKGBUILD
+++ b/community/jshon/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=jshon
 pkgver=20131105
 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 7b7fd4281..c48a78700 100644
--- a/community/judy/PKGBUILD
+++ b/community/judy/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=judy
 pkgver=1.0.5
 pkgrel=4
-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 030d85ad2..4763b652a 100644
--- a/community/jwm/PKGBUILD
+++ b/community/jwm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=jwm
 pkgver=2.2.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 89c535bc2..596acfc0a 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 ed9acf40f..e6f0e6b62 100644
--- a/community/kaa-imlib2/PKGBUILD
+++ b/community/kaa-imlib2/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=kaa-imlib2
 pkgver=0.2.3
-pkgrel=5
+pkgrel=5.1
 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 29be1626d..2b127ab53 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 c34fcdf61..52b2303f9 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kadu
 pkgver=0.12.3
 pkgrel=3
 pkgdesc='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' 'enchant' 'phonon' 'qca-ossl'
diff --git a/community/kakasi/PKGBUILD b/community/kakasi/PKGBUILD
index 91fd59064..0e75362c1 100644
--- a/community/kakasi/PKGBUILD
+++ b/community/kakasi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kakasi
 pkgver=2.3.4
 pkgrel=4
 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")
@@ -15,7 +15,7 @@ md5sums=(4eff51aafbd56c9635791a20c03efa8f)
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --host=$CHOST --build=$CHOST
   make
 }
 
diff --git a/community/kaudiocreator/PKGBUILD b/community/kaudiocreator/PKGBUILD
index 730b924da..617b749cf 100644
--- a/community/kaudiocreator/PKGBUILD
+++ b/community/kaudiocreator/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kaudiocreator
 pkgver=1.3
 pkgrel=3
 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=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'taglib' 'libdiscid')
diff --git a/community/kbibtex/PKGBUILD b/community/kbibtex/PKGBUILD
index 0520ba976..c92ab49f8 100644
--- a/community/kbibtex/PKGBUILD
+++ b/community/kbibtex/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.5
 _branch=0.5
 pkgrel=1
 pkgdesc="A BibTeX editor for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://home.gna.org/kbibtex/'
 license=('GPL')
 depends=('kdebase-runtime')
diff --git a/community/kcheckers/PKGBUILD b/community/kcheckers/PKGBUILD
index 87f3a5ad8..817533abb 100644
--- a/community/kcheckers/PKGBUILD
+++ b/community/kcheckers/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kcheckers
 pkgver=0.8.1
 pkgrel=8
 pkgdesc="Qt4-based checkers boardgame"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qcheckers.sourceforge.net/"
 license=('GPL')
 depends=('qt4')
diff --git a/community/kchmviewer/PKGBUILD b/community/kchmviewer/PKGBUILD
index 3a41d670c..435fb15bb 100644
--- a/community/kchmviewer/PKGBUILD
+++ b/community/kchmviewer/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kchmviewer
 pkgver=6.0
 pkgrel=3
 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' 'xdg-utils')
diff --git a/community/kcm-fcitx/PKGBUILD b/community/kcm-fcitx/PKGBUILD
index 6b24e756e..b6b8c2d3e 100644
--- a/community/kcm-fcitx/PKGBUILD
+++ b/community/kcm-fcitx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kcm-fcitx
 pkgver=0.4.3
 pkgrel=1
 pkgdesc="KDE Config Module for Fcitx"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/kcm-fcitx"
 license=('GPL')
 depends=('fcitx>=4.2.7' 'kdebase-runtime' 'fcitx-qt4')
diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD
index 6efaf1505..1d4061459 100644
--- a/community/kdbg/PKGBUILD
+++ b/community/kdbg/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=kdbg
 pkgver=2.5.4
 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/kde-gtk-config/PKGBUILD b/community/kde-gtk-config/PKGBUILD
index 88840a813..44e8fbd74 100644
--- a/community/kde-gtk-config/PKGBUILD
+++ b/community/kde-gtk-config/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kde-gtk-config
 pkgver=2.2.1
 pkgrel=1
 pkgdesc="GTK2 and GTK3 Configurator for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://projects.kde.org/kde-gtk-config"
 license=('GPL3')
 depends=('kdelibs')
diff --git a/community/kde4-kio-rapip/PKGBUILD b/community/kde4-kio-rapip/PKGBUILD
index 2b95f4b69..0830cee55 100644
--- a/community/kde4-kio-rapip/PKGBUILD
+++ b/community/kde4-kio-rapip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kde4-kio-rapip
 pkgver=0.4
 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-core')
diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD
index 87705015f..bafc532c1 100644
--- a/community/kdenlive/PKGBUILD
+++ b/community/kdenlive/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kdenlive
 pkgver=0.9.6
 pkgrel=2
 pkgdesc="A non-linear video editor for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 # http://download.kde.org/stable/kdenlive/
 url="http://www.kdenlive.org/"
 license=('GPL')
diff --git a/community/kdesvn/PKGBUILD b/community/kdesvn/PKGBUILD
index 96d0a7028..7852abc20 100644
--- a/community/kdesvn/PKGBUILD
+++ b/community/kdesvn/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdesvn
 pkgver=1.6.0
 pkgrel=1
 pkgdesc="A pure C++ SVN-client for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kdesvn.alwins-world.de/"
 license=('GPL')
 depends=('kdebase-runtime' 'subversion')
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index 275f53fc9..b8d37909f 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=keepalived
 pkgver=1.2.12
 pkgrel=1
 pkgdesc='Failover and monitoring daemon for LVS clusters'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keepalived.org/'
 license=('GPL2')
 backup=('etc/keepalived/keepalived.conf')
diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD
index 1bc5acafe..3383462e8 100644
--- a/community/keepassx/PKGBUILD
+++ b/community/keepassx/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=keepassx
 pkgver=0.4.3
 pkgrel=6
 pkgdesc='Password manager'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keepassx.org'
 license=('GPL2')
 depends=('libxtst' 'qt4' 'shared-mime-info')
diff --git a/community/keybinder2/PKGBUILD b/community/keybinder2/PKGBUILD
index 8bfb560be..0398adbc7 100644
--- a/community/keybinder2/PKGBUILD
+++ b/community/keybinder2/PKGBUILD
@@ -5,7 +5,7 @@ _offname=keybinder
 pkgver=0.3.0
 pkgrel=1
 pkgdesc='Library for registering global keyboard shortcuts'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://kaizer.se/wiki/keybinder/'
 license=('GPL')
 makedepends=('pygtk')
diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD
index 200f90133..2d1b3ea43 100644
--- a/community/kicad/PKGBUILD
+++ b/community/kicad/PKGBUILD
@@ -8,7 +8,7 @@ _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
 _pkgbzr=4017
 pkgrel=3
 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://iut-tice.ujf-grenoble.fr/kicad/"
 license=('GPL')
 depends=('glu' 'wxgtk2.8' 'hicolor-icon-theme' 'desktop-file-utils' 'libsm')
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index 8e4efa056..a38702116 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=kid3
 pkgname=('kid3' 'kid3-qt')
 pkgver=3.0.2
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kid3.sourceforge.net/"
 license=('GPL')
 makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl' 'phonon-qt4' 'chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'kdebase-runtime')
diff --git a/community/kio-mtp/PKGBUILD b/community/kio-mtp/PKGBUILD
index 010938ead..0706d1899 100644
--- a/community/kio-mtp/PKGBUILD
+++ b/community/kio-mtp/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=kio-mtp
 pkgver=0.75
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Provides KIO Access to MTP devices using the mtp:/// protocol"
 url='https://projects.kde.org/projects/playground/base/kio-mtp'
 license=('GPL')
diff --git a/community/kiwi/PKGBUILD b/community/kiwi/PKGBUILD
index e9e3a493d..c051870d9 100644
--- a/community/kiwi/PKGBUILD
+++ b/community/kiwi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kiwi
 pkgver=1.9.29
 pkgrel=3
 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=('python2' 'python' 'pygtk' 'gtk')
diff --git a/community/klavaro/PKGBUILD b/community/klavaro/PKGBUILD
index 8d0a81d8a..17ff9bd8e 100644
--- a/community/klavaro/PKGBUILD
+++ b/community/klavaro/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=klavaro
 pkgver=3.00
 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' 'gtk3' 'hicolor-icon-theme')
diff --git a/community/kmess/PKGBUILD b/community/kmess/PKGBUILD
index d200ca743..05ccc5c1a 100644
--- a/community/kmess/PKGBUILD
+++ b/community/kmess/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kmess
 pkgver=2.0.6.2
 pkgrel=5
 pkgdesc="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 b27f25bff..09b1f406e 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=kmymoney
 pkgver=4.6.4
 pkgrel=2
 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 50cab6ec1..7838449ca 100644
--- a/community/knemo/PKGBUILD
+++ b/community/knemo/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=knemo
 pkgver=0.7.6
 pkgrel=4
 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' 'libnl' 'gtk-update-icon-cache')
diff --git a/community/kpartsplugin/PKGBUILD b/community/kpartsplugin/PKGBUILD
index 8e9d6f0aa..20b315a19 100644
--- a/community/kpartsplugin/PKGBUILD
+++ b/community/kpartsplugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kpartsplugin
 pkgver=20120723
 pkgrel=1
 pkgdesc="This plugin uses KDE's KParts to embed file viewers into non-KDE browsers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.unix-ag.uni-kl.de/~fischer/kpartsplugin/"
 license=('GPL3' 'BSD')
 depends=('kdelibs')
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index e08348936..1c12378c8 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=4.4
 pkgrel=4
 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' 'libkdcraw')
 makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs')
diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD
index a60ccc44f..67e9af6fe 100644
--- a/community/krecipes/PKGBUILD
+++ b/community/krecipes/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.0beta2
 _pkgver=2.0-beta2
 pkgrel=4
 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 02b9d0f3f..2ef6e1696 100644
--- a/community/krename/PKGBUILD
+++ b/community/krename/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=krename
 pkgver=4.0.9
 pkgrel=3
 pkgdesc="A very powerful 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/kshutdown/PKGBUILD b/community/kshutdown/PKGBUILD
index 01108ab54..f6a643e62 100644
--- a/community/kshutdown/PKGBUILD
+++ b/community/kshutdown/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kshutdown
 pkgver=3.0
 pkgrel=1
 pkgdesc='Shutdown Utility for KDE'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://kshutdown.sourceforge.net/'
 license=('GPL')
 depends=('kdebase-workspace')
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/ktikz/PKGBUILD b/community/ktikz/PKGBUILD
index d20dfbdcb..b28b2e0ec 100644
--- a/community/ktikz/PKGBUILD
+++ b/community/ktikz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ktikz
 pkgver=0.10
 pkgrel=4
 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 376febf7e..2cc5109b7 100644
--- a/community/ktoblzcheck/PKGBUILD
+++ b/community/ktoblzcheck/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ktoblzcheck
 pkgver=1.43
 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"
 license=("LGPL")
 depends=('gcc-libs' 'python')
diff --git a/community/kuickshow/PKGBUILD b/community/kuickshow/PKGBUILD
index 49c309a51..92c3fbcb8 100644
--- a/community/kuickshow/PKGBUILD
+++ b/community/kuickshow/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.9.1
 pkgrel=4
 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=('kdebase-runtime' 'imlib')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'docbook-xsl')
diff --git a/community/kvirc/PKGBUILD b/community/kvirc/PKGBUILD
index 33f851d6f..828af8709 100644
--- a/community/kvirc/PKGBUILD
+++ b/community/kvirc/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=3
 pkgdesc="Qt-based IRC client"
 url="http://www.kvirc.net"
 depends=('python2' 'libxss' 'qtwebkit')
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 makedepends=('cmake')
 license=('GPL')
 install=kvirc.install
diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD
index 0d6453ca9..18a9a0e63 100644
--- a/community/kvpnc/PKGBUILD
+++ b/community/kvpnc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kvpnc
 pkgver=0.9.6a
 pkgrel=5
 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/kvpnc/kvpnc-0.9.6a-gcc47.patch b/community/kvpnc/kvpnc-0.9.6a-gcc47.patch
new file mode 100644
index 000000000..db59b5baa
--- /dev/null
+++ b/community/kvpnc/kvpnc-0.9.6a-gcc47.patch
@@ -0,0 +1,11 @@
+diff -ruN kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp kvpnc-0.9.6a-kde4/src/kvpnc.cpp
+--- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp	2012-06-25 22:16:25.395420711 +0200
++++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp	2012-06-25 22:17:41.598424971 +0200
+@@ -75,6 +75,7 @@
+ #include <cstdlib>
+ #include <ctime>
+ #include <iomanip>
++#include <unistd.h>
+ 
+ #include "ui_mainviewbase4.h"
+ #include "ciscocertificateenrollment.h"
diff --git a/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch b/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch
new file mode 100644
index 000000000..4e8b4d6d9
--- /dev/null
+++ b/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch
@@ -0,0 +1,15 @@
+diff -ruN kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp kvpnc-0.9.6a-kde4/src/kvpnc.cpp
+--- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp	2010-03-08 11:26:33.000000000 +0100
++++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp	2012-06-25 22:12:51.454408816 +0200
+@@ -6030,7 +6030,10 @@
+                     }
+ 
+ 
+-					if (GlobalConfig->OpenvpnNeedSecurityParameter || (OpenvpnMajor == 2 && OpenvpnMinor == 1 && OpenvpnExtraVer > 8 && OpenvpnExtra == "rc")||  ( OpenvpnMajor == 2 && OpenvpnMinor == 1 ) || (OpenvpnMajor > 2 && OpenvpnMinor >= 2)) {
++			if (GlobalConfig->OpenvpnNeedSecurityParameter || 
++                            (OpenvpnMajor == 2 && OpenvpnMinor == 1 && OpenvpnExtraVer > 8 && OpenvpnExtra == "rc")||
++                            (OpenvpnMajor == 2 && OpenvpnMinor >= 1 ) || 
++			    (OpenvpnMajor > 2)) {
+                         if (GlobalConfig->KvpncDebugLevel > 3)
+                             GlobalConfig->appendLogEntry(i18n("OpenVPN >= 2.1-rc9 detected, adding script security parameter to config."), KVpncEnum::info);
+ 
diff --git a/community/kwalletcli/PKGBUILD b/community/kwalletcli/PKGBUILD
index 803b85750..252337319 100644
--- a/community/kwalletcli/PKGBUILD
+++ b/community/kwalletcli/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Command-Line Interface for the KDE Wallet"
 url="http://www.mirbsd.org/kwalletcli.htm"
 license=('custom:MirOS' 'LGPL3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('kdebase-runtime' 'mksh')
 optdepends=('gnupg2' 'openssh' 'pinentry')
 source=("http://www.mirbsd.org/MirOS/dist/hosted/${pkgname}/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/kyotocabinet/PKGBUILD b/community/kyotocabinet/PKGBUILD
index b7eb075d0..241470c2f 100644
--- a/community/kyotocabinet/PKGBUILD
+++ b/community/kyotocabinet/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=kyotocabinet
 pkgver=1.2.76
 pkgrel=4
 pkgdesc="a modern implementation of DBM in C++"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://fallabs.com/kyotocabinet"
 license=('LGPL3')
 depends=('zlib' 'gcc-libs')
diff --git a/community/lal/PKGBUILD b/community/lal/PKGBUILD
index 69cec8e11..85d2d0190 100644
--- a/community/lal/PKGBUILD
+++ b/community/lal/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lal
 pkgver=1.1
 pkgrel=2
 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/lash/PKGBUILD b/community/lash/PKGBUILD
index 2f3f9d28c..fbb357dfd 100644
--- a/community/lash/PKGBUILD
+++ b/community/lash/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.6.0~rc2
 _relver=0.6.0.594
 pkgrel=7
 pkgdesc="A session management system for JACK and ALSA"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 #url="http://lash-audio.org"
 url="http://lash.nongnu.org/"
 license=('GPL')
diff --git a/community/launchy/PKGBUILD b/community/launchy/PKGBUILD
index 33ae2d4f1..731d2e9c5 100644
--- a/community/launchy/PKGBUILD
+++ b/community/launchy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=launchy
 pkgver=2.5
 pkgrel=3
 pkgdesc="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=('qt4' 'xdg-utils')
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index df2f9eaf1..ff7d70bb0 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -10,7 +10,7 @@ _pkgsubver=0
 pkgrel=1
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:modifiedLGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz"
diff --git a/community/lbreakout2/PKGBUILD b/community/lbreakout2/PKGBUILD
index 8b3a71a21..9019ed6cc 100644
--- a/community/lbreakout2/PKGBUILD
+++ b/community/lbreakout2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lbreakout2
 pkgver=2.6.4
 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/community/lcab/PKGBUILD b/community/lcab/PKGBUILD
index 5ede6fc96..85a5a2391 100644
--- a/community/lcab/PKGBUILD
+++ b/community/lcab/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=lcab
 pkgver=1.0b12
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A program to make Microsoft cabinet files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://ohnopub.net/~ohnobinki/lcab/"
 depends=('glibc')
diff --git a/community/lcdproc/PKGBUILD b/community/lcdproc/PKGBUILD
index 3106af2ad..dd4ec25fe 100644
--- a/community/lcdproc/PKGBUILD
+++ b/community/lcdproc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lcdproc
 pkgver=0.5.6
 pkgrel=4
 pkgdesc="Utility to drive one or more LCD (and LCD-like) devices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lcdproc.omnipotent.net/"
 license=('GPL')
 depends=('libftdi-compat')
diff --git a/community/leafnode/PKGBUILD b/community/leafnode/PKGBUILD
index c6cf6e9c9..58a1a1858 100644
--- a/community/leafnode/PKGBUILD
+++ b/community/leafnode/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=leafnode
 pkgver=1.11.8
 pkgrel=6
 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/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index a403a5b8a..e69b7ecff 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=leptonica
 pkgver=1.69
 pkgrel=10
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.leptonica.com/"
 license=('custom')
 depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp')
diff --git a/community/lgi/PKGBUILD b/community/lgi/PKGBUILD
index 4eb8fb661..3d25972c2 100644
--- a/community/lgi/PKGBUILD
+++ b/community/lgi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(lua-lgi)
 pkgver=0.7.2
 pkgrel=1
 pkgdesc='Lua bindings for gnome/gobject using gobject-introspection library'
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url='https://github.com/pavouk/lgi'
 license=('custom:MIT')
 depends=('glibc' 'glib2' 'libffi' 'lua' 'gobject-introspection')
diff --git a/community/libacpi/PKGBUILD b/community/libacpi/PKGBUILD
index 9b638f10e..24fc27577 100644
--- a/community/libacpi/PKGBUILD
+++ b/community/libacpi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libacpi
 pkgver=0.2
 pkgrel=4
 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/libalkimia/PKGBUILD b/community/libalkimia/PKGBUILD
index 004c8d6fa..107e048ee 100644
--- a/community/libalkimia/PKGBUILD
+++ b/community/libalkimia/PKGBUILD
@@ -4,13 +4,13 @@
 
 pkgname=libalkimia
 pkgver=4.3.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A library with common classes and functionality used by finance applications for the KDE SC."
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4' 'doxygen')
 url=('http://kde-apps.org/content/show.php/libalkimia?content=137323')
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://kde-apps.org/CONTENT/content-files/137323-libalkimia-$pkgver.tar.bz2")
 md5sums=('8d7b529c7be5f72ae1cbb02e818e9b79')
 
diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD
index 09810d7fe..679ed3922 100644
--- a/community/libcec/PKGBUILD
+++ b/community/libcec/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libcec
 pkgver=2.1.4
 pkgrel=1
 pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libcec.pulse-eight.com/"
 license=('GPL')
 depends=('udev' 'lockdev')
diff --git a/community/libclastfm/PKGBUILD b/community/libclastfm/PKGBUILD
index cc0af7731..8c6b8cea8 100644
--- a/community/libclastfm/PKGBUILD
+++ b/community/libclastfm/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libclastfm
 pkgver=0.5
 pkgrel=2
 pkgdesc="An unofficial C-API for the Last.fm web service"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 url="http://liblastfm.sourceforge.net/"
 license=('GPL')
 depends=("curl")
diff --git a/community/libcoverart/PKGBUILD b/community/libcoverart/PKGBUILD
index f0f4e2012..1a2a6cfc4 100644
--- a/community/libcoverart/PKGBUILD
+++ b/community/libcoverart/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libcoverart
 pkgver=1.0.0
 pkgrel=1
 pkgdesc="C/C++ library for accessing the MusicBrainz Cover Art Archive"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://musicbrainz.org/doc/libcoverart"
 license=('LGPL')
 depends=('neon' 'jansson')
diff --git a/community/libcss/PKGBUILD b/community/libcss/PKGBUILD
index d3d8d808d..e3ff2505f 100644
--- a/community/libcss/PKGBUILD
+++ b/community/libcss/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libcss
 pkgver=0.2.0
 pkgrel=2
 pkgdesc='CSS parser and selection engine'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libcss/'
 license=('MIT')
 depends=('libparserutils>=0.1.2' 'libwapcaplet>=0.2.0')
diff --git a/community/libcuefile/PKGBUILD b/community/libcuefile/PKGBUILD
index 9545dcee1..7725fafed 100644
--- a/community/libcuefile/PKGBUILD
+++ b/community/libcuefile/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcuefile
 pkgver=475
 pkgrel=2
 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 49d03e949..3cddc17de 100644
--- a/community/libdaq/PKGBUILD
+++ b/community/libdaq/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdaq
 pkgver=2.0.1
 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 637f8b535..db89222d8 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' 'libmariadbclient' 'sqlite2' 'sqlite')
 optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql "
diff --git a/community/libdbi/PKGBUILD b/community/libdbi/PKGBUILD
index 1368f7858..c42addb7b 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')
 install=libdbi.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD
index 85b5507fc..78cfd31d6 100644
--- a/community/libdlna/PKGBUILD
+++ b/community/libdlna/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=13
 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=('!makeflags')  # not parallel safe, error find -ldlna  
 #makedepends=('ctags')
 depends=('glibc' 'ffmpeg')
diff --git a/community/libdnet/PKGBUILD b/community/libdnet/PKGBUILD
index fb37692c9..28ab014d9 100644
--- a/community/libdnet/PKGBUILD
+++ b/community/libdnet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libdnet
 pkgver=1.12
 pkgrel=8
 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")
@@ -16,7 +16,7 @@ md5sums=('9253ef6de1b5e28e9c9a62b882e44cc9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-
+  sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.in
   autoreconf -I config --force --install
   ./configure --prefix=/usr --sbindir=/usr/bin
   make
diff --git a/community/libdom/PKGBUILD b/community/libdom/PKGBUILD
index 04af2ae72..d04fd65aa 100644
--- a/community/libdom/PKGBUILD
+++ b/community/libdom/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdom
 pkgver=0.0.1
 pkgrel=2
 pkgdesc='Implementation of the W3C DOM'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libdom/'
 license=('MIT')
 depends=('libhubbub>=0.2.0' 'libwapcaplet>=0.2.0' 'expat')
diff --git a/community/libee/PKGBUILD b/community/libee/PKGBUILD
index ef72a58e3..fb76b4faa 100644
--- a/community/libee/PKGBUILD
+++ b/community/libee/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.4.1
 pkgrel=3
 pkgdesc="event expression library inspired by CEE"
 url="http://www.libee.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 depends=('libestr' 'glibc')
 makedepends=()
diff --git a/community/libesmtp/PKGBUILD b/community/libesmtp/PKGBUILD
index f46db177e..f6f402dcc 100644
--- a/community/libesmtp/PKGBUILD
+++ b/community/libesmtp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libesmtp
 pkgver=1.0.6
 pkgrel=3
 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/libestr/PKGBUILD b/community/libestr/PKGBUILD
index 703f269ef..b2c3876f0 100644
--- a/community/libestr/PKGBUILD
+++ b/community/libestr/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.1.9
 pkgrel=1
 pkgdesc="essentials for string handling (and a bit more)"
 url="http://libestr.adiscon.com/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 depends=()
 source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz")
diff --git a/community/libev/PKGBUILD b/community/libev/PKGBUILD
index 6563418bc..286ae1f22 100644
--- a/community/libev/PKGBUILD
+++ b/community/libev/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libev
 pkgver=4.15
 pkgrel=2
 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 ca1be07a1..f69d7b728 100644
--- a/community/libexosip2/PKGBUILD
+++ b/community/libexosip2/PKGBUILD
@@ -7,7 +7,7 @@ epoch=1
 pkgver=4.0.0
 pkgrel=2
 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>=4.0.0' 'openssl')
diff --git a/community/libextractor/PKGBUILD b/community/libextractor/PKGBUILD
index ffe1ea6d3..92e1d1d25 100644
--- a/community/libextractor/PKGBUILD
+++ b/community/libextractor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libextractor
 pkgver=1.0.1
 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=('libltdl')
diff --git a/community/libfakekey/PKGBUILD b/community/libfakekey/PKGBUILD
index 9ec77b55b..8c4b4de50 100644
--- a/community/libfakekey/PKGBUILD
+++ b/community/libfakekey/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libfakekey
 pkgver=0.1
-pkgrel=5
+pkgrel=5.1
 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 1224207e3..c5e306d70 100644
--- a/community/libfaketime/PKGBUILD
+++ b/community/libfaketime/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libfaketime
 pkgver=0.9.5
 pkgrel=2
 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/libfm/PKGBUILD b/community/libfm/PKGBUILD
index 8e7fff94f..e530ba921 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.2.0
 pkgrel=3
 pkgdesc='Library for file management'
 url='http://pcmanfm.sourceforge.net/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 groups=('lxde')
 depends=('gtk2' 'menu-cache' 'udisks' 'desktop-file-utils' 'libexif')
diff --git a/community/libftdi/PKGBUILD b/community/libftdi/PKGBUILD
index b96b62549..02c91cfba 100644
--- a/community/libftdi/PKGBUILD
+++ b/community/libftdi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libftdi
 pkgver=1.1
 pkgrel=3
 pkgdesc="A library to talk to FTDI chips, optional python bindings."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.intra2net.com/en/developer/libftdi/download.php"
 license=('GPL2' 'LGPL2.1')
 depends=('libusbx')
diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD
index 537768215..2b71688f2 100644
--- a/community/libgdamm/PKGBUILD
+++ b/community/libgdamm/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=libgdamm
 pkgname=(libgdamm libgdamm-docs)
 pkgver=4.99.7
 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 b0164270f..0f8da267c 100644
--- a/community/libgeotiff/PKGBUILD
+++ b/community/libgeotiff/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libgeotiff
 pkgver=1.4.0
 pkgrel=2
 pkgdesc="A TIFF based interchange format for georeferenced raster imagery"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remotesensing.org/geotiff"
 license=('custom')
 depends=('libtiff' 'proj' 'libjpeg>=7')
diff --git a/community/libgexiv2/PKGBUILD b/community/libgexiv2/PKGBUILD
index e3dd5ee21..760c679f0 100644
--- a/community/libgexiv2/PKGBUILD
+++ b/community/libgexiv2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgexiv2
 pkgver=0.7.0
 pkgrel=2
 pkgdesc='GObject-based wrapper around the Exiv2 library'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 # http://yorba.org/download/gexiv2/
 url='http://redmine.yorba.org/projects/gexiv2/roadmap'
 license=('GPL2')
diff --git a/community/libgig/PKGBUILD b/community/libgig/PKGBUILD
index 52817d69d..9858312bd 100644
--- a/community/libgig/PKGBUILD
+++ b/community/libgig/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libgig
 pkgver=3.3.0
 pkgrel=3
 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=('util-linux' 'libsndfile')
diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD
index 7d1f23fd8..4c7c48313 100644
--- a/community/libgit2/PKGBUILD
+++ b/community/libgit2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libgit2
 pkgver=0.20.0
 pkgrel=1
 pkgdesc="A linkable library for Git"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libgit2.github.com/"
 depends=(zlib openssl libssh2)
 makedepends=(cmake python)
diff --git a/community/libgnome-media-profiles/PKGBUILD b/community/libgnome-media-profiles/PKGBUILD
index 3357288bf..f001ff5e4 100644
--- a/community/libgnome-media-profiles/PKGBUILD
+++ b/community/libgnome-media-profiles/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgnome-media-profiles
 pkgver=3.0.0
 pkgrel=4
 pkgdesc="Library for management of audio recording profiles"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://git.gnome.org/browse/libgnome-media-profiles"
 license=('GPL2')
 depends=('gconf' 'gtk3' 'gstreamer0.10-base-plugins')
diff --git a/community/libgooglepinyin/PKGBUILD b/community/libgooglepinyin/PKGBUILD
index bac38b86c..7602313ba 100644
--- a/community/libgooglepinyin/PKGBUILD
+++ b/community/libgooglepinyin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgooglepinyin
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="A fork from google pinyin on android"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/libgooglepinyin"
 license=('APACHE')
 depends=('gcc-libs')
diff --git a/community/libgoom2/PKGBUILD b/community/libgoom2/PKGBUILD
index 1d85f8558..c5e5ae06c 100644
--- a/community/libgoom2/PKGBUILD
+++ b/community/libgoom2/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libgoom2
 pkgver=2k4
-pkgrel=2
+pkgrel=2.2
 pkgdesc="Shared library part of the Goom visualization plugin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.fovea.cc/?page=details_produits&id=goom"
 license=('LGPL')
 depends=('glibc')
diff --git a/community/libgringotts/PKGBUILD b/community/libgringotts/PKGBUILD
index e7f5c9b84..c986c5f9e 100644
--- a/community/libgringotts/PKGBUILD
+++ b/community/libgringotts/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgringotts
 pkgver=1.2.1
 pkgrel=11
 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' 'mhash' 'zlib')
@@ -17,7 +17,7 @@ build() {
   cd "${srcdir}"/$pkgname-$pkgver
 
   autoconf
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST
   make
 }
 
diff --git a/community/libgtksourceviewmm2/PKGBUILD b/community/libgtksourceviewmm2/PKGBUILD
index 0720ade6d..36657aa47 100644
--- a/community/libgtksourceviewmm2/PKGBUILD
+++ b/community/libgtksourceviewmm2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgtksourceviewmm2
 pkgver=2.10.3
 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')
@@ -17,7 +17,6 @@ sha256sums=('0000df1b582d7be2e412020c5d748f21c0e6e5074c6b2ca8529985e70479375b')
 
 build() {
   cd gtksourceviewmm-${pkgver}
-
   ./configure \
     --prefix=/usr
 
diff --git a/community/libgtksourceviewmm2/libgtksourceviewmm2-2.10.1-glib.patch b/community/libgtksourceviewmm2/libgtksourceviewmm2-2.10.1-glib.patch
new file mode 100644
index 000000000..db25650e4
--- /dev/null
+++ b/community/libgtksourceviewmm2/libgtksourceviewmm2-2.10.1-glib.patch
@@ -0,0 +1,33 @@
+--- gtksourceviewmm-2.10.1.orig/gtksourceview/src/sourceiter.ccg	2010-07-13 14:52:51.499267000 -0500
++++ gtksourceviewmm-2.10.1/gtksourceview/src/sourceiter.ccg	2013-02-06 07:33:07.313232421 -0500
+@@ -21,7 +21,7 @@
+  */
+ 
+ #include "sourceiter.h"
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtksourceview/gtksourceview-typebuiltins.h>
+ namespace gtksourceview
+ {
+--- gtksourceviewmm-2.10.1.orig/gtksourceview/gtksourceviewmm/sourceiter.cc	2010-07-19 16:06:16.570569000 -0500
++++ gtksourceviewmm-2.10.1/gtksourceview/gtksourceviewmm/sourceiter.cc	2013-02-06 07:32:02.876220702 -0500
+@@ -28,7 +28,7 @@
+  */
+ 
+ #include "sourceiter.h"
+-#include <glib/gmessages.h>
++#include <glib.h>
+ #include <gtksourceview/gtksourceview-typebuiltins.h>
+ namespace gtksourceview
+ {
+--- gtksourceviewmm-2.10.1.orig/tests/search/main.cc	2010-07-13 14:52:51.502267000 -0500
++++ gtksourceviewmm-2.10.1/tests/search/main.cc	2013-02-06 07:33:42.464355467 -0500
+@@ -6,7 +6,7 @@
+ #include <cstring>
+ #include <gtkmm.h>
+ #include <gtksourceviewmm.h>
+-#include <glib/gmessages.h>
++#include <glib.h>
+ 
+ using namespace std ;
+ using namespace Gtk;
diff --git a/community/libharu/PKGBUILD b/community/libharu/PKGBUILD
index d30269628..e03cea793 100644
--- a/community/libharu/PKGBUILD
+++ b/community/libharu/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.2.1
 pkgrel=5
 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')
 source=("http://libharu.org/files/$pkgname-$pkgver.tar.gz"
diff --git a/community/libhubbub/PKGBUILD b/community/libhubbub/PKGBUILD
index d0cbfa9a1..eb5badc32 100644
--- a/community/libhubbub/PKGBUILD
+++ b/community/libhubbub/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libhubbub
 pkgver=0.2.0
 pkgrel=3
 pkgdesc='HTML5 compliant parsing library'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/hubbub/'
 license=('MIT')
 provides=('hubbub')
diff --git a/community/libhx/PKGBUILD b/community/libhx/PKGBUILD
index 12ded5a70..a5ca96a87 100644
--- a/community/libhx/PKGBUILD
+++ b/community/libhx/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='libhx'
 pkgver=3.15
 pkgrel=1
 pkgdesc='A library providing queue, tree, I/O and utility functions'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url=('http://libhx.sourceforge.net/')
 license=('GPL')
 depends=()
diff --git a/community/libident/PKGBUILD b/community/libident/PKGBUILD
index 8197ac233..62b274ff8 100644
--- a/community/libident/PKGBUILD
+++ b/community/libident/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libident
 pkgver=0.32
 pkgrel=5
 pkgdesc='Library for querying IDENT servers'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.remlab.net/libident/'
 license=('custom')
 depends=('glibc')
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index de8e0afdd..c5aa21815 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libinfinity
 pkgver=0.5.5
 pkgrel=1
 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 0c4b4e4c1..3a876c3a8 100644
--- a/community/libiptcdata/PKGBUILD
+++ b/community/libiptcdata/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=libiptcdata
 pkgver=1.0.4
 pkgrel=2
 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/libircclient/PKGBUILD b/community/libircclient/PKGBUILD
index cba8f34e7..8f1d1a2ad 100644
--- a/community/libircclient/PKGBUILD
+++ b/community/libircclient/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libircclient
 pkgver=1.7
 pkgrel=1
 pkgdesc='Small but powerful library, which implements client-server IRC protocol'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ulduzsoft.com/libircclient/'
 depends=('glibc')
 makedepends=('python2-sphinx' 'python2-rst2pdf') 
@@ -19,8 +19,8 @@ md5sums=('968370276f7cf21302f504f9bce1fc99')
 build() {
   cd $pkgname-$pkgver
 
-  # add fPIC flag for x86_64
-  [[ "$CARCH" = "x86_64" ]] && export CFLAGS="$CFLAGS -fPIC"
+  # add fPIC flag for x86_64 and mips64el
+  [ "$CARCH" != "i686" ] && export CFLAGS="$CFLAGS -fPIC"
 
   sed -e "/install/s/lib/all/" \
       -e "/DESTDIR/s/\.a/\.so/g" \
diff --git a/community/liblockfile/PKGBUILD b/community/liblockfile/PKGBUILD
index 0e84eb38a..391f3a811 100644
--- a/community/liblockfile/PKGBUILD
+++ b/community/liblockfile/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.08_4
 _basever=1.08
 pkgrel=4
 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 d75148122..746cb652e 100644
--- a/community/libmaa/PKGBUILD
+++ b/community/libmaa/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 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')
 source=("http://downloads.sourceforge.net/dict/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/libmatchbox/PKGBUILD b/community/libmatchbox/PKGBUILD
index 6bffe43f9..df26bbd52 100644
--- a/community/libmatchbox/PKGBUILD
+++ b/community/libmatchbox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmatchbox
 pkgver=1.10
 pkgrel=3
 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')
 url="http://matchbox-project.org/"
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD
index 39be1d8a8..a35cde454 100644
--- a/community/libmediainfo/PKGBUILD
+++ b/community/libmediainfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmediainfo
 pkgver=0.7.67
 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' 'libzen')
diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD
index 929d2fc03..7ad459d62 100644
--- a/community/libmemcached/PKGBUILD
+++ b/community/libmemcached/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmemcached
 pkgver=1.0.17
 pkgrel=2
 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' 'libevent')
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 244202ec5..4e5579e26 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=libmicrohttpd
 pkgver=0.9.33
 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')
 depends=('gnutls' 'libgcrypt')
diff --git a/community/libmilter/PKGBUILD b/community/libmilter/PKGBUILD
index b498a8221..e08478350 100644
--- a/community/libmilter/PKGBUILD
+++ b/community/libmilter/PKGBUILD
@@ -6,12 +6,13 @@ pkgname=libmilter
 pkgver=8.14.8
 pkgrel=1
 pkgdesc="libmilter"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.postfix.org/MILTER_README.html"
 options=('staticlibs')
 license=('custom:Sendmail open source license')
 source="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${pkgver}.tar.gz"
 md5sums=('73bfc621c75dbdd3d719e54685d92577')
+options=(staticlibs)
 
 build(){
   cd "${srcdir}/sendmail-${pkgver}"
@@ -28,7 +29,7 @@ dnl Enable IPv6
 APPENDDEF(\`conf_libmilter_ENVDEF',\`-DNETINET6=1')
 dnl
 dnl Include our CFLAGS
-APPENDDEF(\`conf_libmilter_ENVDEF',\`${CFLAGS}')
+APPENDDEF(\`conf_libmilter_ENVDEF',\`${CFLAGS/-Wa,-mfix-loongson2f-nop/}')
 dnl
 dnl Add -fPIC
 APPENDDEF(\`conf_libmilter_ENVDEF',\`-fPIC')
diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD
index 0d0faa344..aa5b9e24f 100644
--- a/community/libmirage/PKGBUILD
+++ b/community/libmirage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libmirage
 pkgver=2.1.1
 pkgrel=1
 pkgdesc="CD-ROM image (B6T/C2D/CCD/CDI/CIF/CUE/ISO/MDS/MDX/NRG/TOC) access library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
 license=(GPL)
 depends=(glib2 libsndfile libsamplerate zlib bzip2 xz shared-mime-info)
diff --git a/community/libmnl/PKGBUILD b/community/libmnl/PKGBUILD
index 95eae54a5..6d4201da0 100644
--- a/community/libmnl/PKGBUILD
+++ b/community/libmnl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmnl
 pkgver=1.0.3
 pkgrel=1
 pkgdesc='Minimalistic user-space library oriented to Netlink developers.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libmnl/'
 license=('LGPL2.1')
 depends=('glibc')
diff --git a/community/libmusicbrainz4/PKGBUILD b/community/libmusicbrainz4/PKGBUILD
index 5369830fe..56469a900 100644
--- a/community/libmusicbrainz4/PKGBUILD
+++ b/community/libmusicbrainz4/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=libmusicbrainz4
 pkgver=4.0.3
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Library That Provides Access to the MusicBrainz Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://musicbrainz.org/"
 license=('LGPL2.1')
 depends=('neon')
diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD
index 461bc9801..7c22f8fb9 100644
--- a/community/libnetfilter_acct/PKGBUILD
+++ b/community/libnetfilter_acct/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libnetfilter_acct
 pkgver=1.0.2
 pkgrel=1
 pkgdesc='Library providing interface to extended accounting infrastructure'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.netfilter.org/projects/libnetfilter_acct/index.html"
 license=('GPL')
 depends=('libnfnetlink' 'libmnl')
diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD
index b9fd92625..b7b1204fc 100644
--- a/community/libnetfilter_conntrack/PKGBUILD
+++ b/community/libnetfilter_conntrack/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libnetfilter_conntrack
 pkgver=1.0.4
 pkgrel=1
 pkgdesc='Library providing an API to the in-kernel connection tracking state table'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libnfnetlink' 'libmnl')
 url='http://www.netfilter.org/projects/libnetfilter_conntrack/'
 license=('GPL')
diff --git a/community/libnetfilter_cthelper/PKGBUILD b/community/libnetfilter_cthelper/PKGBUILD
index f6f549232..9adab5d8e 100644
--- a/community/libnetfilter_cthelper/PKGBUILD
+++ b/community/libnetfilter_cthelper/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libnetfilter_cthelper
 pkgver=1.0.0
 pkgrel=1
 pkgdesc='Library for the connection tracking helper infrastructure'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libnetfilter_cthelper/'
 license=('GPL2')
 depends=('libmnl')
diff --git a/community/libnetfilter_cttimeout/PKGBUILD b/community/libnetfilter_cttimeout/PKGBUILD
index 80f201b82..767015f89 100644
--- a/community/libnetfilter_cttimeout/PKGBUILD
+++ b/community/libnetfilter_cttimeout/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libnetfilter_cttimeout
 pkgver=1.0.0
 pkgrel=3
 pkgdesc='Library for the connection tracking timeout infrastructure'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libnetfilter_cttimeout/'
 license=('GPL2')
 depends=('libmnl')
diff --git a/community/libnetfilter_log/PKGBUILD b/community/libnetfilter_log/PKGBUILD
index 60d571674..2a683ad59 100644
--- a/community/libnetfilter_log/PKGBUILD
+++ b/community/libnetfilter_log/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libnetfilter_log
 pkgver=1.0.1
 pkgrel=2
 pkgdesc='Library providing API to packets that have been logged by netfilter'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/libnetfilter_log/'
 license=('GPL')
 depends=('libnfnetlink')
diff --git a/community/libnetfilter_queue/PKGBUILD b/community/libnetfilter_queue/PKGBUILD
index 949017247..b053c487e 100644
--- a/community/libnetfilter_queue/PKGBUILD
+++ b/community/libnetfilter_queue/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libnetfilter_queue
 pkgver=1.0.2
 pkgrel=1
 pkgdesc='Userspace 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/'
 license=('GPL')
 depends=('libnfnetlink' 'libmnl')
diff --git a/community/libnewt/PKGBUILD b/community/libnewt/PKGBUILD
index 8a0805b7e..7fc7caeb9 100644
--- a/community/libnewt/PKGBUILD
+++ b/community/libnewt/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.52.16
 pkgrel=2
 _tclver=8.6
 pkgdesc="Not Erik's Windowing Toolkit - text mode windowing with slang"
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://fedorahosted.org/newt/'
 license=('GPL')
 depends=('slang' 'popt' 'gpm')
diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD
index 13ded88e3..cb6ae288e 100644
--- a/community/libnfnetlink/PKGBUILD
+++ b/community/libnfnetlink/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libnfnetlink
 pkgver=1.0.1
 pkgrel=1
 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/'
 license=('GPL')
 depends=('glibc')
diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD
index 0324d43e3..f83af59e4 100644
--- a/community/libnfs/PKGBUILD
+++ b/community/libnfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libnfs
 pkgver=1.9.2
 pkgrel=1
 pkgdesc="client library for accessing NFS shares"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/sahlberg/libnfs"
 license=('GPL')
 depends=('glibc')
diff --git a/community/libnids/PKGBUILD b/community/libnids/PKGBUILD
index 7b6e19092..6b2fada30 100644
--- a/community/libnids/PKGBUILD
+++ b/community/libnids/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libnids
 pkgver=1.24
 pkgrel=3
 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 6c863acf9..0d4ecbcf1 100644
--- a/community/libnoise/PKGBUILD
+++ b/community/libnoise/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libnoise
 pkgver=1.0.0
 pkgrel=2
 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 f89c09a63..c90f8c954 100644
--- a/community/libnsbmp/PKGBUILD
+++ b/community/libnsbmp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libnsbmp
 pkgver=0.1.0
 pkgrel=2
 pkgdesc='Decoding library for BMP and ICO image file formats'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libnsbmp/'
 license=('MIT')
 depends=('glibc')
diff --git a/community/libnsgif/PKGBUILD b/community/libnsgif/PKGBUILD
index eace8b781..8016b6b16 100644
--- a/community/libnsgif/PKGBUILD
+++ b/community/libnsgif/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libnsgif
 pkgver=0.1.0
 pkgrel=2
 pkgdesc='Decoding library for the GIF image file format'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libnsgif/'
 license=('MIT')
 depends=('glibc')
diff --git a/community/liboggz/PKGBUILD b/community/liboggz/PKGBUILD
index 0c97ddc85..6e2ea2734 100644
--- a/community/liboggz/PKGBUILD
+++ b/community/liboggz/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=liboggz
 pkgver=1.1.1
 pkgrel=3
 pkgdesc="A simple programming interface for reading and writing Ogg files and streams"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/oggz/"
 license=('custom:BSD')
 depends=('libogg' 'sh')
diff --git a/community/libopenraw/PKGBUILD b/community/libopenraw/PKGBUILD
index 23016043b..9838b0545 100644
--- a/community/libopenraw/PKGBUILD
+++ b/community/libopenraw/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libopenraw
 pkgver=0.0.9
 pkgrel=3
 pkgdesc='Library for decoding RAW files'
-arch=('x86_64' 'i686')
+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 57530da8a..390d4f26b 100644
--- a/community/libopensync/PKGBUILD
+++ b/community/libopensync/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=4
 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')
 source=(http://www.opensync.org/download/releases/$pkgver/$pkgname-$pkgver.tar.bz2)
diff --git a/community/liboping/PKGBUILD b/community/liboping/PKGBUILD
index d11fffe63..9249ca7b5 100644
--- a/community/liboping/PKGBUILD
+++ b/community/liboping/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=liboping
 pkgver=1.6.2
-pkgrel=1
+pkgrel=1.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')
 depends=('libcap')
 makedepends=('ncurses')
diff --git a/community/libosip2/PKGBUILD b/community/libosip2/PKGBUILD
index b2be945ed..74f714e53 100644
--- a/community/libosip2/PKGBUILD
+++ b/community/libosip2/PKGBUILD
@@ -7,7 +7,7 @@ epoch=1
 pkgver=4.0.0
 pkgrel=2
 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/libpar2/PKGBUILD b/community/libpar2/PKGBUILD
index 9411ef847..0417aa174 100644
--- a/community/libpar2/PKGBUILD
+++ b/community/libpar2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libpar2
 pkgver=0.2
 pkgrel=7
 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 67fdc77d6..461322824 100644
--- a/community/libparserutils/PKGBUILD
+++ b/community/libparserutils/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libparserutils
 pkgver=0.1.2
 pkgrel=2
 pkgdesc='Library for building efficient parsers'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libparserutils'
 license=('MIT')
 depends=('glibc')
diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD
index 50f7044c8..b0860c659 100644
--- a/community/libpinyin/PKGBUILD
+++ b/community/libpinyin/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.0.0
 _modelver=7
 pkgrel=1
 pkgdesc="Library to deal with pinyin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/libpinyin/libpinyin"
 license=('GPL')
 depends=('db' 'glib2')
diff --git a/community/libpng12/PKGBUILD b/community/libpng12/PKGBUILD
index 65f24c3d4..d114db206 100644
--- a/community/libpng12/PKGBUILD
+++ b/community/libpng12/PKGBUILD
@@ -10,7 +10,7 @@ _realname=libpng
 pkgver=1.2.50
 pkgrel=4
 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')
diff --git a/community/libpqxx/PKGBUILD b/community/libpqxx/PKGBUILD
index c855098e1..98246dd75 100644
--- a/community/libpqxx/PKGBUILD
+++ b/community/libpqxx/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpqxx
 pkgver=4.0.1
 pkgrel=2
 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/librcc/PKGBUILD b/community/librcc/PKGBUILD
index e8a720e05..8d3411e31 100644
--- a/community/librcc/PKGBUILD
+++ b/community/librcc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=librcc
 pkgver=0.2.10
 pkgrel=3
 pkgdesc="Charset Conversion Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://rusxmms.sourceforge.net/"
 license=('GPL')
 depends=('aspell' 'enca' 'libxml2' 'librcd')
diff --git a/community/librcc/librcc-0.2.6-glib.patch b/community/librcc/librcc-0.2.6-glib.patch
new file mode 100644
index 000000000..3b593f144
--- /dev/null
+++ b/community/librcc/librcc-0.2.6-glib.patch
@@ -0,0 +1,11 @@
+--- librcc-0.2.6.orig/external/rccexternal.c	2007-04-05 06:35:50.000000000 -0500
++++ librcc-0.2.6/external/rccexternal.c	2012-12-10 14:49:30.069404313 -0500
+@@ -33,7 +33,7 @@
+ # include <signal.h>
+ #endif /* HAVE_SIGNAL_H */
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ 
+ #include "../src/rcchome.h"
+ #include "../src/rccexternal.h"
diff --git a/community/librcd/PKGBUILD b/community/librcd/PKGBUILD
index 54e819e4a..a8bc99b1c 100644
--- a/community/librcd/PKGBUILD
+++ b/community/librcd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=librcd
 pkgver=0.1.11
 pkgrel=4
 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/libreplaygain/PKGBUILD b/community/libreplaygain/PKGBUILD
index d5e524c33..3682e2953 100644
--- a/community/libreplaygain/PKGBUILD
+++ b/community/libreplaygain/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libreplaygain
 pkgver=475
 pkgrel=2
 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/librime/PKGBUILD b/community/librime/PKGBUILD
index 87ab8a4ba..635b5353b 100644
--- a/community/librime/PKGBUILD
+++ b/community/librime/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=librime
 pkgver=1.1
 pkgrel=1
 pkgdesc="Rime input method engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rimeime/"
 license=('GPL3')
 depends=('boost-libs' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp>=0.5')
diff --git a/community/librsync/PKGBUILD b/community/librsync/PKGBUILD
index 1e6ab33e8..2eb2650cb 100644
--- a/community/librsync/PKGBUILD
+++ b/community/librsync/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=librsync
 pkgver=0.9.7
 pkgrel=7
 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 bcccba8a6..59199c9f4 100644
--- a/community/librtfcomp/PKGBUILD
+++ b/community/librtfcomp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=librtfcomp
 pkgver=1.3
 pkgrel=2
 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/libshairport/PKGBUILD b/community/libshairport/PKGBUILD
index ec3a9d498..dd3ee5f66 100644
--- a/community/libshairport/PKGBUILD
+++ b/community/libshairport/PKGBUILD
@@ -8,7 +8,7 @@ _commithash='16395d8'
 pkgver=${_version}
 pkgrel=3
 pkgdesc="emulates an AirPort Express"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/amejia1/libshairport'
 license=('GPL')
 depends=('openssl' 'libao')
diff --git a/community/libsieve/PKGBUILD b/community/libsieve/PKGBUILD
index 5e3e329d9..e895bfcf9 100644
--- a/community/libsieve/PKGBUILD
+++ b/community/libsieve/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsieve
 pkgver=2.3.1
 pkgrel=3
 pkgdesc="sieve interpretator lib"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://libsieve.sourceforge.net/"
 license=('GPL')
 source=("https://github.com/downloads/sodabrew/libsieve/libsieve-$pkgver.tar.gz"
diff --git a/community/libsmf/PKGBUILD b/community/libsmf/PKGBUILD
index 689e63516..114e23732 100644
--- a/community/libsmf/PKGBUILD
+++ b/community/libsmf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libsmf
 pkgver=1.3
 pkgrel=3
 pkgdesc='A BSD-licensed C library for handling SMF ("*.mid") files.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/libsmf/"
 license=('BSD')
 depends=('glib2' 'readline')
diff --git a/community/libstatgrab/PKGBUILD b/community/libstatgrab/PKGBUILD
index 7bfa565e1..66a3e63c0 100644
--- a/community/libstatgrab/PKGBUILD
+++ b/community/libstatgrab/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libstatgrab
 pkgver=0.17
 pkgrel=4
 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/libstrl/PKGBUILD b/community/libstrl/PKGBUILD
index 0a25f255a..0b4013607 100644
--- a/community/libstrl/PKGBUILD
+++ b/community/libstrl/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Implementations of certain GNU-only or BSD-only string-related libc functions, such as strlcpy() and getdelim(), for compat purposes"
 url="http://ohnopub.net/~ohnobinki/libstrl"
 license=('LGPL3')
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=()
 makedepends=(doxygen libtool pkg-config)
 options=(!libtool)
diff --git a/community/libsynaptics/PKGBUILD b/community/libsynaptics/PKGBUILD
index aff6ce1fa..0185453a6 100644
--- a/community/libsynaptics/PKGBUILD
+++ b/community/libsynaptics/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libsynaptics
 pkgver=0.14.6c
 pkgrel=6
 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/libtaginfo/PKGBUILD b/community/libtaginfo/PKGBUILD
index e9fdc1b46..1eddbfc5c 100644
--- a/community/libtaginfo/PKGBUILD
+++ b/community/libtaginfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libtaginfo
 pkgver=0.2.0
 pkgrel=1
 pkgdesc="Library for reading media metadata"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://bitbucket.org/shuerhaaken/libtaginfo"
 depends=('taglib' 'gcc-libs')
 license=('GPL2')
diff --git a/community/libtommath/PKGBUILD b/community/libtommath/PKGBUILD
index 33c60ba42..0fc15778e 100644
--- a/community/libtommath/PKGBUILD
+++ b/community/libtommath/PKGBUILD
@@ -5,11 +5,11 @@
 
 pkgname=libtommath
 pkgver=0.42.0
-pkgrel=2
+pkgrel=2.1
 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 c55b3e5c1..f70f88b61 100644
--- a/community/libtorrent/PKGBUILD
+++ b/community/libtorrent/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.13.3
 pkgrel=2
 pkgdesc='BitTorrent library with a focus on high performance and good code'
 url='http://libtorrent.rakshasa.no/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('openssl')
 source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/libunwind/PKGBUILD b/community/libunwind/PKGBUILD
index 84ee163ec..ede7689ee 100644
--- a/community/libunwind/PKGBUILD
+++ b/community/libunwind/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libunwind
 pkgver=1.1
 pkgrel=2
 pkgdesc='Portable and efficient C programming interface (API) to determine the call-chain of a program'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/libunwind/'
 license=('GPL')
 depends=('glibc' 'xz')
diff --git a/community/libuser/PKGBUILD b/community/libuser/PKGBUILD
index 32a9758dc..77ea33225 100644
--- a/community/libuser/PKGBUILD
+++ b/community/libuser/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libuser
 pkgver=0.59
 pkgrel=2
 pkgdesc='A standardized interface for manipulating and administering user and group accounts.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url='https://fedorahosted.org/libuser/'
 depends=('python2' 'glib2' 'popt')
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 4c3579023..eb275f3f0 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libvirt
 pkgver=1.2.1
 pkgrel=4
 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'
@@ -19,9 +19,9 @@ optdepends=('bridge-utils: for briged networking (default)'
 	    'openbsd-netcat: for remote management over ssh'
 	    'qemu'
 	    'radvd'
-	    'dmidecode'
 	    'ebtables'
 	    'pm-utils: host power management')
+[ "$CARCH" != "mips64el" ] && optdepends+=('dmidecode')
 options=('emptydirs')
 backup=('etc/conf.d/libvirt-guests'
 	'etc/conf.d/libvirtd'
diff --git a/community/libwapcaplet/PKGBUILD b/community/libwapcaplet/PKGBUILD
index 7f4477159..ffd971658 100644
--- a/community/libwapcaplet/PKGBUILD
+++ b/community/libwapcaplet/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libwapcaplet
 pkgver=0.2.0
 pkgrel=2
 pkgdesc='String internment library with rapid string comparison'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/projects/libwapcaplet/'
 license=('MIT')
 depends=('glibc')
diff --git a/community/libwww/PKGBUILD b/community/libwww/PKGBUILD
index e9095de15..4c2349a38 100644
--- a/community/libwww/PKGBUILD
+++ b/community/libwww/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libwww
 pkgver=5.4.0
 pkgrel=6
 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=('openssl')
@@ -23,7 +23,7 @@ build() {
   cd "$srcdir/w3c-$pkgname-$pkgver"
   unset LDFLAGS
   [ -f Makefile ] || ./configure --prefix=/usr \
-    --with-md5 --with-zlib --with-expat --with-regex --with-ssl
+  	--with-md5 --with-zlib --with-expat --with-regex --with-ssl --host=$CHOST
   make
 }
 
diff --git a/community/libx86/PKGBUILD b/community/libx86/PKGBUILD
index 44baf6331..a945dfa61 100644
--- a/community/libx86/PKGBUILD
+++ b/community/libx86/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libx86
 pkgver=1.1
 pkgrel=4
 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 63ac2ba2b..e9cd2338b 100644
--- a/community/libx86emu/PKGBUILD
+++ b/community/libx86emu/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.1
 _pkgver=$pkgver-21.4
 pkgrel=30
 pkgdesc='x86 emulation library'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://download.opensuse.org/source/factory/repo/oss/suse/src/'
 license=('BSD')
 depends=('glibc')
diff --git a/community/libxdg-basedir/PKGBUILD b/community/libxdg-basedir/PKGBUILD
index 98667df64..3d8d94c98 100644
--- a/community/libxdg-basedir/PKGBUILD
+++ b/community/libxdg-basedir/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxdg-basedir
 pkgver=1.2.0
 pkgrel=2
 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 12df160ed..39e2f5acc 100644
--- a/community/libyaml/PKGBUILD
+++ b/community/libyaml/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libyaml
 pkgver=0.1.5
 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/libzdb/PKGBUILD b/community/libzdb/PKGBUILD
index 8467cab1b..a6fca9af3 100644
--- a/community/libzdb/PKGBUILD
+++ b/community/libzdb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libzdb
 pkgver=3.0
 pkgrel=1
 pkgdesc="Zild Database Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tildeslash.com/libzdb/"
 license=('GPL')
 depends=('postgresql-libs' 'sqlite' 'libmariadbclient')
diff --git a/community/libzen/PKGBUILD b/community/libzen/PKGBUILD
index 3ac1ea821..11fb32935 100644
--- a/community/libzen/PKGBUILD
+++ b/community/libzen/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libzen
 pkgver=0.4.29
 pkgrel=2
 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/lightdm-gtk2-greeter/PKGBUILD b/community/lightdm-gtk2-greeter/PKGBUILD
index 0e0111c0f..6da2c7bf9 100755
--- a/community/lightdm-gtk2-greeter/PKGBUILD
+++ b/community/lightdm-gtk2-greeter/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.8.1
 pkgrel=1
 epoch=1
 pkgdesc='GTK+ greeter for LightDM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://launchpad.net/lightdm-gtk-greeter'
 license=('GPL3' 'LGPL3')
 depends=('gtk2' 'lightdm')
diff --git a/community/lightdm-gtk3-greeter/PKGBUILD b/community/lightdm-gtk3-greeter/PKGBUILD
index c084d4695..7c406fdf3 100755
--- a/community/lightdm-gtk3-greeter/PKGBUILD
+++ b/community/lightdm-gtk3-greeter/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.8.1
 pkgrel=1
 epoch=1
 pkgdesc='GTK+ greeter for LightDM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://launchpad.net/lightdm-gtk-greeter'
 license=('GPL3' 'LGPL3')
 depends=('gtk3' 'lightdm')
diff --git a/community/lightdm-kde-greeter/PKGBUILD b/community/lightdm-kde-greeter/PKGBUILD
index 61b5a141a..ffd609c31 100755
--- a/community/lightdm-kde-greeter/PKGBUILD
+++ b/community/lightdm-kde-greeter/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lightdm-kde-greeter
 pkgver=0.3.2.1
 pkgrel=3
 pkgdesc="KDE greeter for LightDM"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://projects.kde.org/projects/playground/base/lightdm"
 license=('GPL')
 depends=('kdebase-runtime' 'liblightdm-qt4')
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index a50c7166f..a3de04e5e 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.8.7
 pkgrel=1
 epoch=1
 pkgdesc='A lightweight display manager'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://launchpad.net/lightdm'
 license=('GPL3' 'LGPL3')
 makedepends=('gobject-introspection' 'gtk-doc' 'intltool' 'itstool' 'libxklavier' 'polkit' 'qt4' 'qt5-base')
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index 473c7e418..65b84c033 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lilypond
 pkgver=2.18.0
 pkgrel=1
 pkgdesc="An automated music engraving system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lilypond.org"
 license=('GPL')
 depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
diff --git a/community/lilyterm/PKGBUILD b/community/lilyterm/PKGBUILD
index 74ab19fa5..82939929c 100644
--- a/community/lilyterm/PKGBUILD
+++ b/community/lilyterm/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lilyterm
 pkgver=0.9.9.2
 pkgrel=2
 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"
 _watch="http://lilyterm.luna.com.tw/html/download.html"
 license=('GPL3')
diff --git a/community/lincity-ng/PKGBUILD b/community/lincity-ng/PKGBUILD
index ba0eac0e0..0165aaa48 100644
--- a/community/lincity-ng/PKGBUILD
+++ b/community/lincity-ng/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lincity-ng
 pkgver=2.0
 pkgrel=6
 pkgdesc="A city simulation game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lincity-ng.berlios/"
 license=('GPL' 'custom')
 depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'libgl')
diff --git a/community/linphone/PKGBUILD b/community/linphone/PKGBUILD
index 8e8c66589..fb14de962 100644
--- a/community/linphone/PKGBUILD
+++ b/community/linphone/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=linphone
 pkgver=3.6.1
 pkgrel=1
 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/linux-tools/cpupower.default b/community/linux-tools/cpupower.default
deleted file mode 100644
index b5c522ea1..000000000
--- a/community/linux-tools/cpupower.default
+++ /dev/null
@@ -1,29 +0,0 @@
-# Define CPUs governor
-# valid governors: ondemand, performance, powersave, conservative, userspace.
-#governor='ondemand'
-
-# Limit frequency range
-# Valid suffixes: Hz, kHz (default), MHz, GHz, THz
-#min_freq="2.25GHz"
-#max_freq="3GHz"
-
-# Specific frequency to be set.
-# Requires userspace governor to be available.
-# Do not set governor field if you use this one.
-#freq=
-
-# Utilizes cores in one processor package/socket first before processes are 
-# scheduled to other processor packages/sockets.
-# See man (1) CPUPOWER-SET for additional details.
-#mc_scheduler=
-
-# Utilizes thread siblings of one processor core first before processes are
-# scheduled to other cores. See man (1) CPUPOWER-SET for additional details.
-#smp_scheduler=
-
-#  Sets a register on supported Intel processore which allows software to convey
-# its policy for the relative importance of performance versus energy savings to
-# the  processor. See man (1) CPUPOWER-SET for additional details.
-#perf_bias=
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/linux-tools/cpupower.install b/community/linux-tools/cpupower.install
deleted file mode 100644
index 10e07ae52..000000000
--- a/community/linux-tools/cpupower.install
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 3.7-4)" -le 0 ]; then
-    cat << EOF
-===> cpupower startup config file moved to /etc/default/cpupower
-EOF
-    fi
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/linux-tools/cpupower.service b/community/linux-tools/cpupower.service
deleted file mode 100644
index aaeba2b08..000000000
--- a/community/linux-tools/cpupower.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Apply cpupower configuration
-
-[Service]
-Type=oneshot
-ExecStart=/usr/lib/systemd/scripts/cpupower
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/linux-tools/cpupower.systemd b/community/linux-tools/cpupower.systemd
deleted file mode 100644
index 51c645415..000000000
--- a/community/linux-tools/cpupower.systemd
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-. /etc/default/cpupower
-
-declare -i fail=0
-
-# parse frequency options
-declare -a params=()
-params+=(${governor:+-g $governor})
-params+=(${min_freq:+-d $min_freq})
-params+=(${max_freq:+-u $max_freq})
-params+=(${freq:+-f $freq})
-
-# apply frequency options
-if ((${#params[@]} > 0)); then
-  cpupower frequency-set "${params[@]}" >/dev/null || fail=1
-fi
-
-# parse cpu options
-declare -a params=()
-params+=(${mc_scheduler:+-m $mc_scheduler})
-params+=(${smp_scheduler:+-s $smp_scheduler})
-params+=(${perf_bias:+-b $perf_bias})
-
-# apply cpu options
-if ((${#params[@]} > 0)); then
-  cpupower set "${params[@]}" >/dev/null || fail=1
-fi
-
-exit $fail
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/linux-tools/usbipd.service b/community/linux-tools/usbipd.service
deleted file mode 100644
index 1807e94b1..000000000
--- a/community/linux-tools/usbipd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=USB/IP server
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/usbipd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/linuxdcpp/PKGBUILD b/community/linuxdcpp/PKGBUILD
index 28f0261c0..e73638ca2 100644
--- a/community/linuxdcpp/PKGBUILD
+++ b/community/linuxdcpp/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=3
 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/linuxdoc-tools/PKGBUILD b/community/linuxdoc-tools/PKGBUILD
index 0803976eb..39774fadd 100644
--- a/community/linuxdoc-tools/PKGBUILD
+++ b/community/linuxdoc-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=linuxdoc-tools
 pkgver=0.9.69
 pkgrel=1
 pkgdesc="Convert LinuxDoc SGML source into other formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.debian.org/sid/linuxdoc-tools"
 license=('GPL')
 depends=('jade')
diff --git a/community/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD
index b3c49f876..e846220e8 100644
--- a/community/linuxtv-dvb-apps/PKGBUILD
+++ b/community/linuxtv-dvb-apps/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1504
 pkgrel=1
 _hgrev=d40083fff895
 pkgdesc='Linux DVB API applications and utilities'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.linuxtv.org/'
 license=('GPL')
 depends=('glibc')
diff --git a/community/lksctp-tools/PKGBUILD b/community/lksctp-tools/PKGBUILD
index 78655c8ae..70bdf9a7b 100644
--- a/community/lksctp-tools/PKGBUILD
+++ b/community/lksctp-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lksctp-tools
 pkgver=1.0.16
 pkgrel=1
 pkgdesc='An implementation of the SCTP protocol'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://lksctp.sourceforge.net/'
 license=('GPL2' 'LGPL2.1')
 depends=('bash')
diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD
index 1f41a6d99..4db7c0102 100644
--- a/community/lmms/PKGBUILD
+++ b/community/lmms/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lmms
 pkgver=0.4.15
 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' 'qt4' 'sdl_sound'
diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD
index 99f620f92..a44f22db5 100644
--- a/community/lockdev/PKGBUILD
+++ b/community/lockdev/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=4
 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')
 depends=('glibc')
 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"
diff --git a/community/lockfile-progs/PKGBUILD b/community/lockfile-progs/PKGBUILD
index f41542171..b307e95b2 100644
--- a/community/lockfile-progs/PKGBUILD
+++ b/community/lockfile-progs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lockfile-progs
 pkgver=0.1.17
 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/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD
index 7db5c9930..58707b4f7 100644
--- a/community/log4cpp/PKGBUILD
+++ b/community/log4cpp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=log4cpp
 pkgver=1.1.1
 pkgrel=1
 pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://log4cpp.sourceforge.net/"
 license=('LGPL')
 depends=('gcc-libs')
@@ -16,7 +16,8 @@ md5sums=('1e173df8ee97205f412ff84aa93b8fbe')
 build() {
 	cd "$srcdir/$pkgname"
   export CXXFLAGS="$CXXFLAGS -lpthread"
-  ./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa
+  ./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa \
+	--build=$CHOST
 	make
 }
 
diff --git a/community/lomoco/PKGBUILD b/community/lomoco/PKGBUILD
index fb90d988c..fea043e12 100644
--- a/community/lomoco/PKGBUILD
+++ b/community/lomoco/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="Logitech USB mouse configuration program"
 license=('GPL')
 depends=('libusb-compat')
 replaces=('lmctl')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 backup=(etc/udev/lomoco_mouse.conf)
 source=(http://www.lomoco.org/${pkgname}-${pkgver}.tar.gz
 	"lomoco_mx518.patch::https://bugs.archlinux.org/task/28180?getfile=8163"
diff --git a/community/lorcon/PKGBUILD b/community/lorcon/PKGBUILD
index 30bac1745..fdff25510 100644
--- a/community/lorcon/PKGBUILD
+++ b/community/lorcon/PKGBUILD
@@ -12,7 +12,7 @@ epoch=1
 pkgdesc='Generic library for injecting 802.11 frames'
 url='http://802.11ninja.net/'
 license=('GPL')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 depends=('libpcap')
 makedepends=('git')
 source=('git+https://code.google.com/p/lorcon/')
diff --git a/community/lout/PKGBUILD b/community/lout/PKGBUILD
index df2dcfc35..90f7b3b0d 100644
--- a/community/lout/PKGBUILD
+++ b/community/lout/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lout
 pkgver=3.40
 pkgrel=1
 pkgdesc="A lightweight document formatting system."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lout.wiki.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/love/PKGBUILD b/community/love/PKGBUILD
index 30429d74f..6eb29bf4e 100644
--- a/community/love/PKGBUILD
+++ b/community/love/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=love
 pkgver=0.9.0
 pkgrel=2
 pkgdesc="An open-source 2D game engine which uses the versatile Lua scripting language to create dynamic gaming experiences"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://love2d.org/"
 license=('zlib')
 depends=('luajit' 'physfs' 'freetype2' 'devil' 'mpg123' 'openal' 'libvorbis' 'libmodplug' 'sdl2' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD
index 5d8c306b0..ed199df0a 100644
--- a/community/lrzip/PKGBUILD
+++ b/community/lrzip/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms'
 url='http://lrzip.kolivas.org/'
 license=('GPL')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 depends=('lzo2' 'bzip2' 'zlib' 'bash' 'gcc-libs')
 if [ "$CARCH" != "x86_64" ]
 then
diff --git a/community/lrzsz/PKGBUILD b/community/lrzsz/PKGBUILD
index cb1874f18..48d636366 100644
--- a/community/lrzsz/PKGBUILD
+++ b/community/lrzsz/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=4
 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/lsdvd/PKGBUILD b/community/lsdvd/PKGBUILD
index 69fca75c9..68fba6d7f 100644
--- a/community/lsdvd/PKGBUILD
+++ b/community/lsdvd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lsdvd
 pkgver=0.16
 pkgrel=6
 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/community/lshw/PKGBUILD b/community/lshw/PKGBUILD
index 5ef5ecc34..eb24dbe65 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' 'hwids')
 optdepends=('gtk2')
 makedepends=('gcc' 'gtk2' 'sqlite')
diff --git a/community/lsscsi/PKGBUILD b/community/lsscsi/PKGBUILD
index 5a09e2f00..b6f628715 100644
--- a/community/lsscsi/PKGBUILD
+++ b/community/lsscsi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lsscsi
 pkgver=0.27
 pkgrel=1
 pkgdesc='A tool that lists devices connected via SCSI and its transports'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sg.danny.cz/scsi/lsscsi.html"
 license=('GPL')
 depends=('sysfsutils')
diff --git a/community/ltris/PKGBUILD b/community/ltris/PKGBUILD
index a35b71eda..da6924068 100644
--- a/community/ltris/PKGBUILD
+++ b/community/ltris/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ltris
 pkgver=1.0.19
 pkgrel=2
 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 17a34d721..22e490738 100644
--- a/community/lua-zlib/PKGBUILD
+++ b/community/lua-zlib/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=20130702
 pkgrel=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')
 makedepends=('cmake' 'lua' 'lua51' 'zlib' 'git')
 conflicts=('lua-lzlib')
diff --git a/community/luabitop/PKGBUILD b/community/luabitop/PKGBUILD
index 7dacdad3e..74b724175 100644
--- a/community/luabitop/PKGBUILD
+++ b/community/luabitop/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(lua-bitop lua51-bitop)
 pkgver=1.0.2
 pkgrel=2
 pkgdesc='C extension adding bitwise operations on numbers'
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url='http://bitop.luajit.org/index.html'
 makedepends=('lua' 'lua51')
 source=("http://bitop.luajit.org/download/LuaBitOp-$pkgver.tar.gz")
diff --git a/community/luaexpat/PKGBUILD b/community/luaexpat/PKGBUILD
index 9ae182732..8492a8b80 100644
--- a/community/luaexpat/PKGBUILD
+++ b/community/luaexpat/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(lua-expat lua51-expat)
 pkgver=1.2.0
 pkgrel=4
 pkgdesc='SAX XML parser based on the Expat library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://matthewwild.co.uk/projects/luaexpat/'
 license=('MIT')
 makedepends=('gcc' 'lua' 'lua51' 'expat')
diff --git a/community/luafilesystem/PKGBUILD b/community/luafilesystem/PKGBUILD
index 29c11845b..bba8b6e1e 100644
--- a/community/luafilesystem/PKGBUILD
+++ b/community/luafilesystem/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=(lua-filesystem lua51-filesystem)
 pkgver=1.6.2
 pkgrel=3
 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')
 makedepends=(lua lua51)
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index a073f48fb..0db24b3ed 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=luajit
 pkgver=2.0.2
 pkgrel=2
 pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://luajit.org/'
 license=('MIT')
 depends=('gcc-libs') 
@@ -17,6 +17,7 @@ sha256sums=('c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38')
 
 build() { 
   cd LuaJIT-$pkgver
+  [ "$CARCH" = "mips64el" ] && extra="XCFLAGS=-DLUAJIT_DISABLE_JIT"
   make amalg PREFIX=/usr
 }
 
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index 82d2ea2d7..0f8b6248e 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2012.09.13.r1
 _pkgver=2012.09.13-r1
 pkgrel=7
 pkgdesc='Fast, small, Webkit based browser framework extensible by Lua'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://mason-larobina.github.com/luakit/'
 license=('GPL3')
 depends=('webkitgtk2' 'lua51-filesystem' 'libunique' 'desktop-file-utils' 'luajit')
diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD
index 1e78e9372..c888f5ae1 100644
--- a/community/luaposix/PKGBUILD
+++ b/community/luaposix/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('lua-posix' 'lua51-posix')
 pkgver=31
 pkgrel=1
 pkgdesc='A POSIX library for Lua programming language'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/luaposix/luaposix'
 license=('GPL' 'LGPL')
 makedepends=('lua' 'lua51' 'lua51-bitop' 'git' 'help2man')
diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD
index 6e5a16e32..28dc95608 100644
--- a/community/luasec/PKGBUILD
+++ b/community/luasec/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.5
 pkgrel=1
 epoch=1
 pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/brunoos/luasec/wiki'
 license=('MIT')
 makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket')
diff --git a/community/luasocket/PKGBUILD b/community/luasocket/PKGBUILD
index f77bfaab3..3974075a8 100644
--- a/community/luasocket/PKGBUILD
+++ b/community/luasocket/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(lua-socket lua51-socket)
 pkgver=3.0rc1
 pkgrel=3
 pkgdesc='Networking support library for the Lua language'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/diegonehab/luasocket'
 license=('MIT')
 makedepends=('lua' 'lua51')
diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD
index 1969e2304..cab6c3e84 100644
--- a/community/luasql/PKGBUILD
+++ b/community/luasql/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=luasql
 pkgname=('lua-sql-mysql' 'lua-sql-postgres' 'lua-sql-sqlite')
 pkgver=2.2.0
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.keplerproject.org/luasql/'
 license=('MIT')
 makedepends=('lua' 'libmariadbclient' 'postgresql-libs' 'sqlite')
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index 99a1d8218..ba47bbb0e 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=luminancehdr
 pkgver=2.4.0
 pkgrel=1
 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' 'lcms2' 'libraw' 'openexr' 'qt5-webkit' 'ccfits')
@@ -22,6 +22,8 @@ sha256sums=('14014eadab099944f051dd99447f6f47d455ffb0e4e0272d93a8e71fd96ad401')
 build() {
   cd "${srcdir}"/luminance-hdr-${pkgver}
 
+  # x86-specific options.
+  sed -i '/ADD_DEFINITIONS(-ffast-math -msse2 -msse)/d' cmake/CompilerSettings.cmake
   cmake -DCMAKE_INSTALL_PREFIX=/usr
   make
 }
diff --git a/community/lwm/PKGBUILD b/community/lwm/PKGBUILD
index 61fed43ce..dd40dcf2b 100644
--- a/community/lwm/PKGBUILD
+++ b/community/lwm/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lwm
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="A very light weight window manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jfc.org.uk/software/lwm.html"
 license=('GPL')
 depends=('xorg-server' 'libxext' 'libsm')
diff --git a/community/lwp/PKGBUILD b/community/lwp/PKGBUILD
index 1a6959698..7aebd5175 100644
--- a/community/lwp/PKGBUILD
+++ b/community/lwp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lwp
 pkgver=2.6
 pkgrel=3
 pkgdesc="Light weight process library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.coda.cs.cmu.edu"
 license=("LGPL")
 depends=(glibc)
diff --git a/community/lxappearance-obconf/PKGBUILD b/community/lxappearance-obconf/PKGBUILD
index a9dbde3dd..42bd6bdd0 100644
--- a/community/lxappearance-obconf/PKGBUILD
+++ b/community/lxappearance-obconf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lxappearance-obconf
 pkgver=0.2.1
 pkgrel=1
 pkgdesc='Plugin for LXAppearance to configure Openbox'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://lxde.org/'
 groups=('lxde')
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 2d4a6aab9..0589e5989 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lxappearance
 pkgver=0.5.5
 pkgrel=1
 pkgdesc='Feature-rich GTK+ theme switcher 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/lxc/PKGBUILD b/community/lxc/PKGBUILD
index e53241c57..cfd9ee539 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=1.0.0
 epoch=1
 pkgrel=1
 pkgdesc="Linux Containers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxcontainers.org"
 depends=('bash' 'perl' 'libseccomp' 'libcap')
 makedepends=('docbook2x')
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index 5b5edba39..1655db580 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lxdm
 pkgver=0.4.1
 pkgrel=29
 pkgdesc='Lightweight X11 Display Manager'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lxdm/"
 license=('GPL')
 groups=('lxde')
diff --git a/community/lxinput/PKGBUILD b/community/lxinput/PKGBUILD
index 7ed91636f..145d298d7 100644
--- a/community/lxinput/PKGBUILD
+++ b/community/lxinput/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxinput
 pkgver=0.3.2
 pkgrel=2
 pkgdesc="A small program to configure keyboard and mouse for LXDE."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lxde.org/"
 license=('GPL')
 groups=('lxde')
diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD
index 5c33b9b94..9625a66d5 100644
--- a/community/lxlauncher/PKGBUILD
+++ b/community/lxlauncher/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lxlauncher
 pkgver=0.2.2
 pkgrel=5
 pkgdesc='Open source clone of the Asus launcher for EeePC'
-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..8819f6ad0 100644
--- a/community/lxmenu-data/PKGBUILD
+++ b/community/lxmenu-data/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=lxmenu-data
 pkgver=0.1.2
-pkgrel=1
+pkgrel=1.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/lxmusic/PKGBUILD b/community/lxmusic/PKGBUILD
index 72bcd4fdb..846ac848c 100644
--- a/community/lxmusic/PKGBUILD
+++ b/community/lxmusic/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lxmusic
 pkgver=0.4.5
 pkgrel=2
 pkgdesc='Lightweight XMMS2 client'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lxde.org/"
 license=('GPL')
 groups=('lxde')
diff --git a/community/lxnm/PKGBUILD b/community/lxnm/PKGBUILD
index d44a06750..4375e6249 100644
--- a/community/lxnm/PKGBUILD
+++ b/community/lxnm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxnm
 pkgver=0.2.2
 pkgrel=4
 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 adf8ae827..7383a4eaf 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lxpanel
 pkgver=0.6.1
 pkgrel=2
 pkgdesc='Lightweight X11 desktop panel for LXDE'
-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 2cd922a11..06ef73b84 100644
--- a/community/lxrandr/PKGBUILD
+++ b/community/lxrandr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxrandr
 pkgver=0.1.2
 pkgrel=3
 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 6f6cb73c3..f403a9c52 100644
--- a/community/lxsession/PKGBUILD
+++ b/community/lxsession/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.4.6.1
 pkgrel=2
 epoch=1
 pkgdesc='Lightweight X11 session manager'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lxde.org/"
 license=('GPL2')
 groups=('lxde')
diff --git a/community/lxsplit/PKGBUILD b/community/lxsplit/PKGBUILD
index 28326d8cc..a420b85a1 100644
--- a/community/lxsplit/PKGBUILD
+++ b/community/lxsplit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lxsplit
 pkgver=0.2.4
 pkgrel=3
 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/community/lxtask/PKGBUILD b/community/lxtask/PKGBUILD
index c1c6bf5e4..0c2b318ce 100644
--- a/community/lxtask/PKGBUILD
+++ b/community/lxtask/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lxtask
 pkgver=0.1.4
 pkgrel=4
 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 9751bc21a..232c15d26 100644
--- a/community/lxterminal/PKGBUILD
+++ b/community/lxterminal/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=lxterminal
 pkgver=0.1.11
-pkgrel=2
+pkgrel=2.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 b2d4e9bc5..fbcdea6ab 100644
--- a/community/macchanger/PKGBUILD
+++ b/community/macchanger/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=macchanger
 pkgver=1.6.0
 pkgrel=2
 pkgdesc="A small utility to change your NIC's MAC address"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ftp.gnu.org/gnu/macchanger"
 license=('GPL')
 depends=('glibc')
diff --git a/community/madman/PKGBUILD b/community/madman/PKGBUILD
index 821b7c1e1..1eb7e5b86 100644
--- a/community/madman/PKGBUILD
+++ b/community/madman/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=madman
 pkgver=0.94beta1.20080906
 pkgrel=1
 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/mahjong/PKGBUILD b/community/mahjong/PKGBUILD
index 465a41e07..5ca99343a 100644
--- a/community/mahjong/PKGBUILD
+++ b/community/mahjong/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=mahjong
 pkgver=1.12.1
-pkgrel=1
+pkgrel=1.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/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD
index 9d4b34c11..4521cf19c 100644
--- a/community/mailutils/PKGBUILD
+++ b/community/mailutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mailutils
 pkgver=2.2
 pkgrel=10
 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')
diff --git a/community/mairix/PKGBUILD b/community/mairix/PKGBUILD
index 5cd6acd7f..d9ddd727a 100644
--- a/community/mairix/PKGBUILD
+++ b/community/mairix/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mairix
 pkgver=0.23
 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/makedev/PKGBUILD b/community/makedev/PKGBUILD
index 85285e4ab..03d6bff3d 100644
--- a/community/makedev/PKGBUILD
+++ b/community/makedev/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=makedev
 pkgver=3.23_1
 pkgrel=2
 pkgdesc='The ubiquitous script to create static device nodes'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://people.redhat.com/nalin/MAKEDEV/'
 source=("http://people.redhat.com/nalin/MAKEDEV/MAKEDEV-${pkgver//_/-}.tar.gz")
@@ -15,6 +15,7 @@ md5sums=('554faf6cbc9a84e4bd58ccfa32d74e2f')
 
 build() {
   cd ${pkgname^^*}-${pkgver/_*}
+  sed -ri 's/^OPTFLAGS.*/& '"$CFLAGS"'/' Makefile
   make
 }
 
diff --git a/community/manedit/PKGBUILD b/community/manedit/PKGBUILD
index 2631d4730..849a5477b 100644
--- a/community/manedit/PKGBUILD
+++ b/community/manedit/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=manedit
 pkgver=1.2.1
-pkgrel=4
+pkgrel=4.2
 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/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index 6f0eb0f6f..c720ff4c4 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mapnik
 pkgver=2.2.0
 pkgrel=5
 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/marisa/PKGBUILD b/community/marisa/PKGBUILD
index 85b813490..6bfc6f8bf 100644
--- a/community/marisa/PKGBUILD
+++ b/community/marisa/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=marisa
 pkgname=('marisa' 'perl-marisa' 'python2-marisa' 'ruby-marisa')
 pkgver=0.2.4
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://code.google.com/p/marisa-trie/"
 license=('BSD' 'LGPL')
 makedepends=('python2' 'ruby' 'perl')
diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD
index c17c47e0a..1ec596fbc 100644
--- a/community/mashup/PKGBUILD
+++ b/community/mashup/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.7.1
 pkgrel=1
 pkgdesc="Adjusting images on a sheet of paper for printing"
 url="http://kornelix.com/$pkgname"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('gtk3')
 replaces=('printoxx')
diff --git a/community/matchbox-desktop/PKGBUILD b/community/matchbox-desktop/PKGBUILD
index 3b17034c0..9a191644d 100644
--- a/community/matchbox-desktop/PKGBUILD
+++ b/community/matchbox-desktop/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=matchbox-desktop
 pkgver=2.0
-pkgrel=3
+pkgrel=3.1
 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 a2a6e34cf..f701991ba 100644
--- a/community/matchbox-keyboard/PKGBUILD
+++ b/community/matchbox-keyboard/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=matchbox-keyboard
 pkgver=0.1
-pkgrel=4
+pkgrel=4.1
 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 81d0eb80d..f8375a492 100644
--- a/community/matchbox-panel/PKGBUILD
+++ b/community/matchbox-panel/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=matchbox-panel
 pkgver=0.9.3
-pkgrel=5
+pkgrel=5.1
 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 d9a3c002b..94e30982f 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=4
 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 d3067ade0..7707de2df 100644
--- a/community/mathomatic/PKGBUILD
+++ b/community/mathomatic/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mathomatic
 pkgver=16.0.5
 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/mcabber/PKGBUILD b/community/mcabber/PKGBUILD
index adb1067cd..1e820fe12 100644
--- a/community/mcabber/PKGBUILD
+++ b/community/mcabber/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mcabber
 pkgver=0.10.2
 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' 'libotr3' 'aspell')
diff --git a/community/mcdp/PKGBUILD b/community/mcdp/PKGBUILD
index a59874434..ad7e2b15f 100644
--- a/community/mcdp/PKGBUILD
+++ b/community/mcdp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mcdp
 pkgver=0.4b
 pkgrel=2
 pkgdesc="Small console cd player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mcmilk.de/projects/mcdp/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 2fd31c1c6..0af28a473 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('git')
 options=('docs')
 backup=('etc/mcelog/mcelog.conf')
diff --git a/community/mdf2iso/PKGBUILD b/community/mdf2iso/PKGBUILD
index b58c51413..26762014a 100644
--- a/community/mdf2iso/PKGBUILD
+++ b/community/mdf2iso/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mdf2iso
 pkgver=0.3.0
 pkgrel=5
 pkgdesc="Converts Alcohol 120% .mdf files to .iso files"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://mdf2iso.berlios.de/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index 221b9be17..d879eabbb 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mediainfo-gui
 pkgver=0.7.67
 pkgrel=1
 pkgdesc="GUI for mediainfo"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mediainfo.sourceforge.net"
 license=('GPL')
 depends=('libmediainfo' 'wxgtk' 'libsm' 'desktop-file-utils')
diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD
index ead0872f2..b9918cf24 100644
--- a/community/mediainfo/PKGBUILD
+++ b/community/mediainfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mediainfo
 pkgver=0.7.67
 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')
diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD
index 940e7b69f..773e3890c 100644
--- a/community/mediaproxy/PKGBUILD
+++ b/community/mediaproxy/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.5.2
 pkgrel=5
 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'
 	 'python2-application' 'python2-cjson' 'python2-gnutls')
diff --git a/community/medit/PKGBUILD b/community/medit/PKGBUILD
index 640c95682..89a9d4dd9 100644
--- a/community/medit/PKGBUILD
+++ b/community/medit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=medit
 pkgver=1.1.1
 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/mednafen/PKGBUILD b/community/mednafen/PKGBUILD
index 60b8b1000..e7284e3c4 100644
--- a/community/mednafen/PKGBUILD
+++ b/community/mednafen/PKGBUILD
@@ -13,7 +13,7 @@ pkgrel=2
 pkgdesc="A command-line multi-system gaming emulator"
 url="http://mednafen.sourceforge.net"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libcdio' 'libsamplerate' 'sdl_net' 'zlib')
 makedepends=('mesa' 'glu')
 replaces=('mednafen-wip')
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index 2ff399ad9..851acdae4 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=megaglest
 pkgver=3.9.2
 pkgrel=2
 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' 'lua51' 'icu' 'ftgl' 'glew'
diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD
index 63551eb48..08da98d0c 100644
--- a/community/menu-cache/PKGBUILD
+++ b/community/menu-cache/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=menu-cache
 pkgver=0.5.1
 pkgrel=1
 pkgdesc='Caching mechanism for freedesktop.org compliant menus'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url='http://lxde.org/'
 groups=('lxde')
diff --git a/community/metacity/PKGBUILD b/community/metacity/PKGBUILD
index ea91e4d5e..423463db6 100644
--- a/community/metacity/PKGBUILD
+++ b/community/metacity/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=metacity
 pkgver=2.34.13
 pkgrel=5
 pkgdesc="Legacy GNOME window manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('dconf' 'libcanberra' 'libgtop' 'gsettings-desktop-schemas' 'gtk2' 'startup-notification' 'zenity')
 makedepends=('intltool' 'itstool')
diff --git a/community/metakit/PKGBUILD b/community/metakit/PKGBUILD
index 2a8115db8..cd78b4af1 100644
--- a/community/metakit/PKGBUILD
+++ b/community/metakit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=metakit
 pkgver=2.4.9.7
 pkgrel=5
 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/metapixel/PKGBUILD b/community/metapixel/PKGBUILD
index 64d451ab4..6d9b9239f 100644
--- a/community/metapixel/PKGBUILD
+++ b/community/metapixel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=metapixel
 pkgver=1.0.2
 pkgrel=5
 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=('giflib' 'libjpeg' 'libpng' 'perl')
diff --git a/community/mezogis/PKGBUILD b/community/mezogis/PKGBUILD
index ec459f9fd..f9c1e3759 100644
--- a/community/mezogis/PKGBUILD
+++ b/community/mezogis/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mezogis
 pkgver=0.1.5
 pkgrel=6
 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' 'python2-geotypes' 'postgis')
diff --git a/community/mfs/PKGBUILD b/community/mfs/PKGBUILD
index 6963d5078..fd190cc51 100644
--- a/community/mfs/PKGBUILD
+++ b/community/mfs/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.6.27_1
 pkgrel=1
 pkgdesc='MooseFS, fault tolerant, network distributed file system'
 url='http://www.moosefs.com/'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('GPL3')
 depends=('zlib' 'fuse' 'python2' 'bash' 'xfsprogs')
 install="$pkgbase.install"
diff --git a/community/mftrace/PKGBUILD b/community/mftrace/PKGBUILD
index 8d8d7ba9c..7a17a5166 100644
--- a/community/mftrace/PKGBUILD
+++ b/community/mftrace/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mftrace
 pkgver=1.2.18
 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 176278440..89f11c138 100644
--- a/community/mg/PKGBUILD
+++ b/community/mg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mg
 pkgver=20130922
 pkgrel=2
 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' 'libbsd')
 makedepends=('bmake' 'libclens')
@@ -19,6 +19,10 @@ md5sums=('35bd196ab32bae3531d6bc48be8779d0'
 prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -p1 <$srcdir/cleanup.patch
+
+  # The scripts building this package won't see and fix the warnings,
+  # even if they make the build fail.
+  sed -ri '/^CFLAGS\+=/d' Makefile*
 }
 
 build() {
diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD
index bad14900d..6cb66d3ca 100644
--- a/community/milkytracker/PKGBUILD
+++ b/community/milkytracker/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=milkytracker
 pkgver=0.90.86
 pkgrel=1
 pkgdesc='Fast Tracker II inspired music tracker'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://www.milkytracker.org/"
 license=('GPL3')
 depends=('sdl' 'alsa-lib' 'zlib' 'gcc-libs')
diff --git a/community/mimetex/PKGBUILD b/community/mimetex/PKGBUILD
index 234f2e4c4..52aedb0a3 100644
--- a/community/mimetex/PKGBUILD
+++ b/community/mimetex/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mimetex
 pkgver=1.70
 pkgrel=3
 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 2b10f3b3b..dddb711e0 100644
--- a/community/minbif/PKGBUILD
+++ b/community/minbif/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=minbif
 pkgver=1.0.5
 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/ming/PKGBUILD b/community/ming/PKGBUILD
index f9ee37a12..326ce0cb8 100644
--- a/community/ming/PKGBUILD
+++ b/community/ming/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ming
 pkgver=0.4.5
 pkgrel=2
 pkgdesc="SWF output library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.libming.net/"
 license=('GPL' 'LGPL')
 depends=('freetype2' 'libpng' 'flex')
diff --git a/community/minicom/PKGBUILD b/community/minicom/PKGBUILD
index 420cf919b..ff398e1ab 100644
--- a/community/minicom/PKGBUILD
+++ b/community/minicom/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=minicom
 pkgver=2.7
 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')
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index 8716ee72d..e6a3f32fe 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=minidlna
 pkgver=1.1.1
 pkgrel=2
 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' 'sqlite')
diff --git a/community/minitube/PKGBUILD b/community/minitube/PKGBUILD
index eb670c93c..1f52a12d7 100644
--- a/community/minitube/PKGBUILD
+++ b/community/minitube/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=minitube
 pkgver=2.1.6
 pkgrel=1
 pkgdesc="A native YouTube client in Qt. Watch YouTube videos without Flash Player"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://flavio.tordini.org/minitube'
 license=('GPL3')
 depends=('phonon-qt4')
diff --git a/community/miniupnpc/PKGBUILD b/community/miniupnpc/PKGBUILD
index ce97cf76b..3210b2b51 100644
--- a/community/miniupnpc/PKGBUILD
+++ b/community/miniupnpc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=miniupnpc
 pkgver=1.9
 pkgrel=1
 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/minizip/PKGBUILD b/community/minizip/PKGBUILD
index 82085759c..61a392d66 100644
--- a/community/minizip/PKGBUILD
+++ b/community/minizip/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='ZIP file extraction library'
 url='http://www.winimage.com/zLibDll/minizip.html'
 license=('ZLIB' 'custom')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 depends=('zlib')
 source=("http://zlib.net/current/zlib-${pkgver}.tar.gz"
         'LICENSE')
diff --git a/community/miredo/PKGBUILD b/community/miredo/PKGBUILD
index 3f169ccef..cf65e393e 100644
--- a/community/miredo/PKGBUILD
+++ b/community/miredo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=miredo
 pkgver=1.2.6
 pkgrel=2
 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' 'libcap')
diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD
index e53fb324b..60051646e 100644
--- a/community/mixxx/PKGBUILD
+++ b/community/mixxx/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mixxx
 pkgver=1.11.0
 pkgrel=2
 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/mksh/PKGBUILD b/community/mksh/PKGBUILD
index 6dfdf611d..1be8c6ef8 100644
--- a/community/mksh/PKGBUILD
+++ b/community/mksh/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh'
 url='https://www.mirbsd.org/mksh.htm'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs')
 install=mksh.install
 source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$_pkgver.tgz"
diff --git a/community/mktorrent/PKGBUILD b/community/mktorrent/PKGBUILD
index 495ea2b59..6aa2180bb 100644
--- a/community/mktorrent/PKGBUILD
+++ b/community/mktorrent/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=mktorrent
 pkgver=1.0
-pkgrel=3
+pkgrel=3.1
 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/mlt/PKGBUILD b/community/mlt/PKGBUILD
index e0c5b8f9e..83f8b024c 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.9.0
 pkgrel=5
 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' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
diff --git a/community/mmsrip/PKGBUILD b/community/mmsrip/PKGBUILD
index 2d0314986..54b85cfb8 100644
--- a/community/mmsrip/PKGBUILD
+++ b/community/mmsrip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mmsrip
 pkgver=0.7.0
 pkgrel=4
 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')
 depends=('glibc')
diff --git a/community/mod_wsgi/PKGBUILD b/community/mod_wsgi/PKGBUILD
index 36f968fb8..c527fbd1e 100644
--- a/community/mod_wsgi/PKGBUILD
+++ b/community/mod_wsgi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mod_wsgi
 pkgver=3.4
 pkgrel=3
 pkgdesc='Python WSGI adapter module for Apache'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.modwsgi.org/'
 license=('APACHE')
 depends=('apache' 'python')
diff --git a/community/mod_wsgi2/PKGBUILD b/community/mod_wsgi2/PKGBUILD
index 6cdf187df..b55021736 100644
--- a/community/mod_wsgi2/PKGBUILD
+++ b/community/mod_wsgi2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mod_wsgi2
 pkgver=3.4
 pkgrel=4
 pkgdesc='Python2 WSGI adapter module for Apache'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.modwsgi.org/'
 license=('APACHE')
 depends=('apache' 'python2')
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 1d6ecb8c5..ef0b90c05 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=mongodb
 pkgver=2.4.9
 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' 'pcre' 'snappy' 'openssl' 'gperftools')
diff --git a/community/monica/PKGBUILD b/community/monica/PKGBUILD
index 77d620962..11c9c0d3d 100644
--- a/community/monica/PKGBUILD
+++ b/community/monica/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=monica
 pkgver=3.7
 pkgrel=3
 pkgdesc='Monitor calibration tool'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://www.pcbypaul.com/software/monica.html"
 license=('BSD')
 depends=('fltk' 'xorg-xgamma')
diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD
index 763238050..0b7bbe9a7 100644
--- a/community/monit/PKGBUILD
+++ b/community/monit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=monit
 pkgver=5.6
 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 d548da25a..397482493 100644
--- a/community/moreutils/PKGBUILD
+++ b/community/moreutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=moreutils
 pkgver=0.49
 pkgrel=1
 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://joeyh.name/code/moreutils/"
 license=('GPL')
 makedepends=('docbook2x' 'docbook-xml' 'perl-xml-sax')
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
index a2fc499b6..c99089c94 100644
--- a/community/mosh/PKGBUILD
+++ b/community/mosh/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mosh
 pkgver=1.2.4
 pkgrel=2
 pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://mosh.mit.edu/'
 license=('GPL3')
 depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty' 'libutempter')
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD
index d9db1fdb2..511c9e03a 100644
--- a/community/motion/PKGBUILD
+++ b/community/motion/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=motion
 pkgver=3.2.12
 pkgrel=11
 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=('libjpeg' 'v4l-utils' 'ffmpeg-compat')
diff --git a/community/mp3gain/PKGBUILD b/community/mp3gain/PKGBUILD
index d3ec615a4..5912047ea 100644
--- a/community/mp3gain/PKGBUILD
+++ b/community/mp3gain/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mp3gain
 pkgver=1.5.2
 pkgrel=2
 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 e661e929c..2a929de11 100644
--- a/community/mp3info/PKGBUILD
+++ b/community/mp3info/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mp3info
 pkgver=0.8.5a
 pkgrel=4
 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' )
@@ -17,7 +17,7 @@ build() {
   cd ${srcdir}/$pkgname-$pkgver
 
   sed -i "s:-O2:${CFLAGS}:" Makefile
-  sed -i "s:/usr/bin/install:/bin/install:" Makefile
+  #sed -i "s:/usr/bin/install:/bin/install:" Makefile
 
   make
 
diff --git a/community/mp3splt-gtk/PKGBUILD b/community/mp3splt-gtk/PKGBUILD
index 2ef87f81a..ac7fd8b8d 100644
--- a/community/mp3splt-gtk/PKGBUILD
+++ b/community/mp3splt-gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mp3splt-gtk
 pkgver=0.9
 pkgrel=1
 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' 'gtk3' 'libmp3splt')
diff --git a/community/mp3unicode/PKGBUILD b/community/mp3unicode/PKGBUILD
index 5a76772f3..8f4c29006 100644
--- a/community/mp3unicode/PKGBUILD
+++ b/community/mp3unicode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mp3unicode
 pkgver=1.2.1
 pkgrel=1
 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/mpck/PKGBUILD b/community/mpck/PKGBUILD
index a1b381592..dde60051f 100644
--- a/community/mpck/PKGBUILD
+++ b/community/mpck/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=mpck
 pkgver=0.19
-pkgrel=2
+pkgrel=2.1
 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/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/mrtg/PKGBUILD b/community/mrtg/PKGBUILD
index 344ea6af2..d7c5677d4 100644
--- a/community/mrtg/PKGBUILD
+++ b/community/mrtg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mrtg
 pkgver=2.17.4
 pkgrel=2
 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/community/mtasc/PKGBUILD b/community/mtasc/PKGBUILD
index 31875d2d4..54800c79a 100644
--- a/community/mtasc/PKGBUILD
+++ b/community/mtasc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mtasc
 pkgver=20091229
 pkgrel=4
 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 c8e766304..3e4f4886b 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mtpaint
 pkgver=3.40
 pkgrel=13
 pkgdesc='Simple 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' 'libjpeg' 'openjpeg' 'desktop-file-utils' 'lcms2'
diff --git a/community/mtpfs/PKGBUILD b/community/mtpfs/PKGBUILD
index 7f2731b40..9401f7e19 100644
--- a/community/mtpfs/PKGBUILD
+++ b/community/mtpfs/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=mtpfs
 pkgver=1.1
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A FUSE filesystem that supports reading and writing from any MTP device"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.adebenham.com/mtpfs/"
 license=('GPL3')
 depends=('libmtp' 'glib2' 'libid3tag' 'fuse' 'libmad')
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index 93b0d294e..c8dbe0926 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=muffin
 pkgver=2.0.5
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/linuxmint/muffin"
 license=('GPL')
 depends=('clutter' 'gobject-introspection' 'cinnamon-desktop' 'libcanberra'
diff --git a/community/multitail/PKGBUILD b/community/multitail/PKGBUILD
index 0398ee986..62549d928 100644
--- a/community/multitail/PKGBUILD
+++ b/community/multitail/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=multitail
 pkgver=6.2.1
 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/community/mumble/PKGBUILD b/community/mumble/PKGBUILD
index 952dc6e6b..91a551b6c 100644
--- a/community/mumble/PKGBUILD
+++ b/community/mumble/PKGBUILD
@@ -10,7 +10,7 @@
 pkgname=mumble
 pkgver=1.2.5
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="A voice chat application similar to TeamSpeak"
 license=('BSD')
 depends=('qt4' 'speex' 'lsb-release' 'libxi' 'avahi' 'libsndfile' 'protobuf' 'libpulse' 'opus')
diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD
index 6f736631e..6788ab8ab 100644
--- a/community/mupdf/PKGBUILD
+++ b/community/mupdf/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=mupdf
 pkgver=1.3
 pkgrel=8
 pkgdesc='Lightweight PDF and XPS viewer'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://mupdf.com'
 license=('GPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
diff --git a/community/murmur/PKGBUILD b/community/murmur/PKGBUILD
index cd0875d2e..c138c9e0c 100644
--- a/community/murmur/PKGBUILD
+++ b/community/murmur/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=murmur
 pkgver=1.2.5
 pkgrel=1
 pkgdesc="The voice chat application server for Mumble"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mumble.sourceforge.net"
 license=('BSD')
 depends=('avahi' 'lsb-release' 'protobuf' 'qt4' 'icu')
diff --git a/community/mxml/PKGBUILD b/community/mxml/PKGBUILD
index cc53987db..bafb7bfe0 100644
--- a/community/mxml/PKGBUILD
+++ b/community/mxml/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mxml
 pkgver=2.8
 pkgrel=1
 pkgdesc="A small XML parsing library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.minixml.org/"
 license=('LGPL')
 source=("http://www.msweet.org/files/project3/$pkgname-$pkgver.tar.gz")
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index e5331abf4..1645dc773 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('mygui' 'mygui-docs')
 pkgver=3.2.0
 pkgrel=9
 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 f7a501498..c53db1f37 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=myodbc
 pkgver=5.2.6
 pkgrel=2
 pkgdesc="ODBC driver/connector for mariadb"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://dev.mysql.com/downloads/connector/odbc/"
 depends=('unixodbc' 'libmariadbclient')
 makedepends=('cmake')
diff --git a/community/mypaint/PKGBUILD b/community/mypaint/PKGBUILD
index 6c1df0d3f..b936e54bc 100644
--- a/community/mypaint/PKGBUILD
+++ b/community/mypaint/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mypaint
 pkgver=1.1.0
 pkgrel=3
 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' 'json-c' 'lcms2')
diff --git a/community/mysql++/PKGBUILD b/community/mysql++/PKGBUILD
index 6b5364edf..398d1056e 100644
--- a/community/mysql++/PKGBUILD
+++ b/community/mysql++/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mysql++
 pkgver=3.2.0
 pkgrel=1
 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=("libmariadbclient")
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 536e2bc34..0756f17cd 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=('mythplugins-mytharchive'
 pkgver=0.27
 pkgrel=5
 epoch=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
 license=('GPL')
 makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD
index 2c5f407b2..843da2902 100644
--- a/community/naev/PKGBUILD
+++ b/community/naev/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=naev
 pkgver=0.5.3
 pkgrel=2
 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=('glu' 'openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data')
diff --git a/community/namazu/PKGBUILD b/community/namazu/PKGBUILD
index 0678839d7..ee9524f20 100644
--- a/community/namazu/PKGBUILD
+++ b/community/namazu/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 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)
 source=(http://namazu.org/stable/$pkgname-$pkgver.tar.gz)
 md5sums=('8865d912a3de9c94f5ce01d0de5ccad9')
diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD
index 5fc5bb0cc..e0420b556 100644
--- a/community/nautilus-actions/PKGBUILD
+++ b/community/nautilus-actions/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=nautilus-actions
 pkgver=3.2.3
 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://www.nautilus-actions.org/"
 license=('GPL')
 depends=('nautilus' 'libunique3' 'libgtop' 'gconf')
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index be216947b..b93f3ccb4 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=nbd
 pkgver=3.7
 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.xz
diff --git a/community/nbtscan/PKGBUILD b/community/nbtscan/PKGBUILD
index 03c637932..18e5e9b5f 100644
--- a/community/nbtscan/PKGBUILD
+++ b/community/nbtscan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nbtscan
 pkgver=1.5.1
 pkgrel=5
 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"
@@ -17,7 +17,7 @@ md5sums=('85bb085077c380b82a6ff73e0de0c154'
 
 build() {
     cd $srcdir/$pkgname-${pkgver}a
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr --build=$CHOST
     make
 
     # Copy the binary
diff --git a/community/ncdu/PKGBUILD b/community/ncdu/PKGBUILD
index 209caf267..251e231fc 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=('cf3b5fbb5b69cbae5425bfff2660ac3d8224a605')
 
diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD
index 99efaa71d..0f1f3b8bc 100644
--- a/community/ncmpcpp/PKGBUILD
+++ b/community/ncmpcpp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ncmpcpp
 pkgver=0.5.10
 pkgrel=5
 pkgdesc='Almost exact clone of ncmpc with some new features'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ncmpcpp.rybczak.net/'
 license=('GPL')
 depends=('curl' 'libmpdclient' 'taglib' 'ncurses' 'fftw')
diff --git a/community/ncrack/PKGBUILD b/community/ncrack/PKGBUILD
index 09e369a4d..4b3977436 100644
--- a/community/ncrack/PKGBUILD
+++ b/community/ncrack/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.4a
 _realver=0.4ALPHA
 pkgrel=2
 pkgdesc='A high-speed network authentication cracking tool'
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url='http://nmap.org/ncrack/'
 license=(GPL)
 depends=(openssl)
diff --git a/community/ndisc6/PKGBUILD b/community/ndisc6/PKGBUILD
index 99bbe8325..74420d0a1 100644
--- a/community/ndisc6/PKGBUILD
+++ b/community/ndisc6/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ndisc6
 pkgver=1.0.2
 pkgrel=7
 pkgdesc='Collection of IPv6 networking utilities'
-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 0a9b65abb..e1c91f5dd 100644
--- a/community/neatx/PKGBUILD
+++ b/community/neatx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=neatx
 pkgver=0.3.1
 pkgrel=14
 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=('python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk')
diff --git a/community/nemesis/PKGBUILD b/community/nemesis/PKGBUILD
index dec296f55..ca844974a 100644
--- a/community/nemesis/PKGBUILD
+++ b/community/nemesis/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nemesis
 pkgver=1.4
 pkgrel=5
 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=()
@@ -34,7 +34,7 @@ build() {
   patch -Np1 <$srcdir/nemesis-proto_tcp.c.diff
   [ -f Makefile ] || ./configure --prefix=/usr --mandir=/usr/share/man \
 	    --with-libnet-includes=$srcdir/libnet/include \
-	    --with-libnet-libraries=$srcdir/libnet/lib
+	    --with-libnet-libraries=$srcdir/libnet/lib --build=$CHOST
   make
   make DESTDIR=$pkgdir install
   install -D -m0644 LICENSE $pkgdir/usr/share/licenses/nemesis/LICENSE
diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD
index 40834a6ed..f3088ab79 100644
--- a/community/nemiver/PKGBUILD
+++ b/community/nemiver/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nemiver
 pkgver=0.9.5
 pkgrel=1
 pkgdesc='C/C++ debugger for GNOME'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
 url='http://www.gnome.org/projects/nemiver/'
 install="$pkgname.install"
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index 29e7553b3..e748b77b3 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nemo
 pkgver=2.0.8
 pkgrel=1
 pkgdesc="Cinnamon file manager (Nautilus fork)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/linuxmint/nemo"
 license=('GPL')
 depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2'
diff --git a/community/nestopia/PKGBUILD b/community/nestopia/PKGBUILD
index 4c4146735..c499709c7 100644
--- a/community/nestopia/PKGBUILD
+++ b/community/nestopia/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.'
 url='http://0ldsk00l.ca/nestopia.html'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('sdl' 'alsa-lib' 'gtk3' 'glu' 'libarchive')
 makedepends=('unzip' 'mesa')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver"
diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD
index aa55406bd..b4e8db5d6 100644
--- a/community/net6/PKGBUILD
+++ b/community/net6/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=net6
 pkgver=1.3.14
 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 3eb1bf9cd..aef0599df 100644
--- a/community/netbrake/PKGBUILD
+++ b/community/netbrake/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netbrake
 pkgver=0.2
 pkgrel=4
 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/netcf/PKGBUILD b/community/netcf/PKGBUILD
index b40b53c1e..45c436094 100644
--- a/community/netcf/PKGBUILD
+++ b/community/netcf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netcf
 pkgver=0.2.3
 pkgrel=3
 pkgdesc="A library for configuring network interfaces"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="https://fedorahosted.org/netcf/"
 depends=('augeas>=0.7.4' 'netctl' 'libxslt' 'libxml2' 'libnl')
diff --git a/community/nethack/PKGBUILD b/community/nethack/PKGBUILD
index ccb4a8c60..1caa7b70f 100644
--- a/community/nethack/PKGBUILD
+++ b/community/nethack/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=nethack
 pkgver=3.4.3
 pkgrel=7
 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 3bf9ec080..7f7f3a66a 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/netselect/PKGBUILD b/community/netselect/PKGBUILD
index 14aab1bbe..5ca09e1fd 100644
--- a/community/netselect/PKGBUILD
+++ b/community/netselect/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=netselect
 pkgver=0.3
 pkgrel=2
 pkgdesc="An ultrafast intelligent parallelizing binary-search implementation of ping"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://alumnit.ca/~apenwarr/netselect/index.html"
 license=('custom')
 depends=('glibc')
diff --git a/community/netstat-nat/PKGBUILD b/community/netstat-nat/PKGBUILD
index a6b7b85ae..143de83f5 100644
--- a/community/netstat-nat/PKGBUILD
+++ b/community/netstat-nat/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=2
 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-buildsystem/PKGBUILD b/community/netsurf-buildsystem/PKGBUILD
index 3787946b4..5ef63065d 100644
--- a/community/netsurf-buildsystem/PKGBUILD
+++ b/community/netsurf-buildsystem/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=netsurf-buildsystem
 pkgver=1.0
 pkgrel=1
 pkgdesc='The Netsurf buildsystem'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
 license=('MIT')
 source=("http://download.netsurf-browser.org/libs/releases/buildsystem-$pkgver.tar.gz")
diff --git a/community/netwatch/PKGBUILD b/community/netwatch/PKGBUILD
index 4bbe25890..368a4e2ba 100644
--- a/community/netwatch/PKGBUILD
+++ b/community/netwatch/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=netwatch
 pkgver=1.3.0
 pkgrel=3
 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 a89a6a097..3d8bbbed6 100644
--- a/community/newsbeuter/PKGBUILD
+++ b/community/newsbeuter/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=newsbeuter
 pkgver=2.8
 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' 'json-c' 'libxml2' 'sqlite' 'stfl')
diff --git a/community/newsbeuter/newsbeuter-2.5-gcc47.patch b/community/newsbeuter/newsbeuter-2.5-gcc47.patch
new file mode 100644
index 000000000..48ed1682a
--- /dev/null
+++ b/community/newsbeuter/newsbeuter-2.5-gcc47.patch
@@ -0,0 +1,61 @@
+--- newsbeuter-2.5/src/controller.cpp
++++ newsbeuter-2.5/src/controller.cpp
+@@ -30,6 +30,7 @@
+ #include <ctime>
+ #include <cassert>
+ #include <signal.h>
++#include <unistd.h>
+ #include <sys/utsname.h>
+ #include <langinfo.h>
+ #include <libgen.h>
+--- newsbeuter-2.5/src/google_api.cpp
++++ newsbeuter-2.5/src/google_api.cpp
+@@ -7,6 +7,8 @@
+ #include <config.h>
+ #include <utils.h>
+ 
++#include <unistd.h>
++
+ #include <curl/curl.h>
+ 
+ #define GREADER_LOGIN					"https://www.google.com/accounts/ClientLogin"
+--- newsbeuter-2.5/src/pb_controller.cpp
++++ newsbeuter-2.5/src/pb_controller.cpp
+@@ -12,6 +12,7 @@
+ #include <pwd.h>
+ #include <cstdlib>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #include <keymap.h>
+ #include <configcontainer.h>
+--- newsbeuter-2.5/src/queueloader.cpp
++++ newsbeuter-2.5/src/queueloader.cpp
+@@ -8,6 +8,8 @@
+ #include <config.h>
+ #include <libgen.h>
+ 
++#include <unistd.h>
++
+ using namespace newsbeuter;
+ 
+ namespace podbeuter {
+--- newsbeuter-2.5/src/reloadthread.cpp
++++ newsbeuter-2.5/src/reloadthread.cpp
+@@ -1,5 +1,6 @@
+ #include <reloadthread.h>
+ #include <logger.h>
++#include <unistd.h>
+ 
+ namespace newsbeuter {
+ 
+--- newsbeuter-2.5/src/utils.cpp
++++ newsbeuter-2.5/src/utils.cpp
+@@ -11,6 +11,7 @@
+ #include <libgen.h>
+ #include <sys/utsname.h>
+ 
++#include <unistd.h>
+ #include <sstream>
+ #include <locale>
+ #include <cwchar>
diff --git a/community/nfacct/PKGBUILD b/community/nfacct/PKGBUILD
index 5cdc87038..aba2b9572 100644
--- a/community/nfacct/PKGBUILD
+++ b/community/nfacct/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nfacct
 pkgver=1.0.1
 pkgrel=2
 pkgdesc='Command line tool to create/retrieve/delete accounting objects'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/nfacct/'
 license=('GPL2')
 depends=('libnetfilter_acct')
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index 7fea2b53b..ac0c3aa6b 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=nginx
 pkgver=1.4.5
 pkgrel=1
 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://nginx.org'
 license=('custom')
 depends=('pcre' 'zlib' 'openssl')
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index 360daaeb1..6b3a21db8 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ngircd
 pkgver=21
 pkgrel=1
 pkgdesc="Next Generation IRC Daemon"
-arch=('x86_64' 'i686')
+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 2bc220a0e..16cd1ab75 100644
--- a/community/ngrep/PKGBUILD
+++ b/community/ngrep/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=ngrep
 pkgver=1.45
-pkgrel=9
+pkgrel=9.1
 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' 'pcre')
diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD
index 9d7b836cd..83426b31f 100644
--- a/community/ngspice/PKGBUILD
+++ b/community/ngspice/PKGBUILD
@@ -10,7 +10,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' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-$pkgver.tar.gz"
         "http://downloads.sourceforge.net/project/$pkgname/ng-spice-rework/$pkgver/$pkgname-doc-$pkgver.tar.gz")
diff --git a/community/nickle/PKGBUILD b/community/nickle/PKGBUILD
index 44f3e05ca..6f860bc9d 100644
--- a/community/nickle/PKGBUILD
+++ b/community/nickle/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nickle
 pkgver=2.70
 pkgrel=2
 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 f8cd1d0b6..e40319451 100644
--- a/community/nload/PKGBUILD
+++ b/community/nload/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=nload
 pkgver=0.7.4
-pkgrel=1
+pkgrel=1.1
 pkgdesc='Monitors network traffic and bandwidth usage'
 url='http://www.roland-riegel.de/nload'
 license=('GPL2')
 depends=('ncurses')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("$url/$pkgname-$pkgver.tar.gz")
 md5sums=('3c733c528f244ca5a4f76bf185729c39')
 
diff --git a/community/nmon/PKGBUILD b/community/nmon/PKGBUILD
index 8c938cf04..f4ccff67a 100644
--- a/community/nmon/PKGBUILD
+++ b/community/nmon/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nmon
 pkgver=14i
 pkgrel=1
 pkgdesc="AIX & Linux Performance Monitoring tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://nmon.sourceforge.net"
 license=('GPL')
 depends=('ncurses')
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 078aecdc0..ca12d118a 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=nodejs
 pkgver=0.10.26
 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=('openssl')
diff --git a/community/noip/PKGBUILD b/community/noip/PKGBUILD
index 86d19b280..75c40a7eb 100644
--- a/community/noip/PKGBUILD
+++ b/community/noip/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=noip
 pkgver=2.1.9
 pkgrel=5
 pkgdesc='Dynamic DNS Client Updater for no-ip.com services'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.no-ip.com/downloads.php?page=linux'
 license=('GPL')
 install="$pkgname.install"
diff --git a/community/normalize/PKGBUILD b/community/normalize/PKGBUILD
index 62f0a5766..4a0018ba8 100644
--- a/community/normalize/PKGBUILD
+++ b/community/normalize/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=normalize
 pkgver=0.7.7
-pkgrel=6
+pkgrel=6.1
 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/community/notification-daemon/PKGBUILD b/community/notification-daemon/PKGBUILD
index 44139288a..cc820ae4a 100644
--- a/community/notification-daemon/PKGBUILD
+++ b/community/notification-daemon/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=notification-daemon
 pkgver=0.7.6
-pkgrel=2
+pkgrel=2.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/community/notify-osd/PKGBUILD b/community/notify-osd/PKGBUILD
index 431581ae0..616750522 100644
--- a/community/notify-osd/PKGBUILD
+++ b/community/notify-osd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=notify-osd
 pkgver=0.9.34
 pkgrel=1
 pkgdesc="Canonical's on-screen-display notification agent, implementing the freedesktop.org Desktop Notifications Specification with semi-transparent click-through bubbles"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/notify-osd"
 license=('GPL')
 depends=('libwnck3' 'dbus-glib' 'dconf' 'gsettings-desktop-schemas')
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index 87ab1d721..341454437 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=20140213
 pkgrel=1
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
 url="http://sourceforge.net/projects/notion/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:LGPL')
 depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm')
 optdepends=('libxinerama' 'libxrandr')
diff --git a/community/notmuch/PKGBUILD b/community/notmuch/PKGBUILD
index 3ea81f29b..d5550afcc 100644
--- a/community/notmuch/PKGBUILD
+++ b/community/notmuch/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=notmuch
 pkgname=('notmuch' 'notmuch-vim' 'notmuch-mutt' 'notmuch-runtime')
 pkgver=0.17
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://notmuchmail.org/"
 license=('GPL3')
 makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig' 'xapian-core' 'gmime' 'talloc')
diff --git a/community/nrg2iso/PKGBUILD b/community/nrg2iso/PKGBUILD
index e9e155f50..f703bb7fc 100644
--- a/community/nrg2iso/PKGBUILD
+++ b/community/nrg2iso/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=nrg2iso
 pkgver=0.4
 pkgrel=8
 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 999e160f1..bd1542c70 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'libevent')
 makedepends=('flex')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD
index 8a32d9c79..cab27a3d3 100644
--- a/community/nss-pam-ldapd/PKGBUILD
+++ b/community/nss-pam-ldapd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nss-pam-ldapd
 pkgver=0.8.13
 pkgrel=5
 pkgdesc='LDAP module for NSS and PAM'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://arthurdejong.org/$pkgname/"
 license=('LGPL2.1')
 depends=('krb5')
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index 02cf48dfd..0435fddb8 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ntop
 pkgver=5.0.1
 pkgrel=5
 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' 'glibc' 'libxml2' 'openssl' 'rrdtool' 'pcre' 'geoip' 'lua' 'python2')
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/nzbget/PKGBUILD b/community/nzbget/PKGBUILD
index ca6c1cafc..70279e09b 100644
--- a/community/nzbget/PKGBUILD
+++ b/community/nzbget/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nzbget
 pkgver=12.0
 pkgrel=1
 pkgdesc="Download from Usenet using .nzb files"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://nzbget.sourceforge.net/"
 license=('GPL')
 depends=('gnutls' 'libpar2' 'libsigc++' 'libxml2' 'python')
diff --git a/community/oath-toolkit/PKGBUILD b/community/oath-toolkit/PKGBUILD
index e2c206f85..72cc41e1f 100644
--- a/community/oath-toolkit/PKGBUILD
+++ b/community/oath-toolkit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=oath-toolkit
 pkgver=2.4.1
 pkgrel=1
 pkgdesc='OATH one-time password toolkit'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nongnu.org/oath-toolkit/'
 license=('GPL3')
 depends=('glibc' 'pam' 'xmlsec')
diff --git a/community/obby/PKGBUILD b/community/obby/PKGBUILD
index 74279b679..fcfe8fba4 100644
--- a/community/obby/PKGBUILD
+++ b/community/obby/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc="A library which provides synced document buffers"
 url="http://gobby.0x539.de"
 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=('5d4cd4e77f87b092e5ed21b104d8ad33')
diff --git a/community/obconf/PKGBUILD b/community/obconf/PKGBUILD
index 5be2ab8d6..3d7ba626c 100644
--- a/community/obconf/PKGBUILD
+++ b/community/obconf/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=obconf
 pkgver=2.0.4
 pkgrel=1
 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 c3472e487..d97488ca2 100644
--- a/community/obexfs/PKGBUILD
+++ b/community/obexfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=obexfs
 pkgver=0.12
 pkgrel=3
 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/obexftp/PKGBUILD b/community/obexftp/PKGBUILD
index c8f4847f0..9d4a4e4ee 100644
--- a/community/obexftp/PKGBUILD
+++ b/community/obexftp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=obexftp
 pkgver=0.24
 pkgrel=2
 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')
diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD
index 1b5280d34..c5ff14548 100644
--- a/community/ocaml-findlib/PKGBUILD
+++ b/community/ocaml-findlib/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ocaml-findlib
 pkgver=1.4
 pkgrel=1
 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')
@@ -20,7 +20,11 @@ build() {
   cd "$srcdir/findlib-$pkgver"
 
   ./configure -config /etc/findlib.conf -sitelib /usr/lib/ocaml -mandir /usr/share/man
-  make all opt
+  if [ "${CARCH}" = "mips64el" ]; then
+    make all
+  else
+    make all opt
+  fi
 }
 
 package () {
@@ -32,6 +36,6 @@ package () {
   sed -i 's/path=\"\/usr\/lib\/ocaml\"/path="\/usr\/lib\/ocaml:\/usr\/lib\/ocaml\/site-lib"/' \
     "${pkgdir}/etc/findlib.conf"
 
-  install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/"
+  [ $CARCH != 'mips64el' ] && (install -m755 src/findlib/ocamlfind_opt "$pkgdir/usr/bin/")
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/ocrad/PKGBUILD b/community/ocrad/PKGBUILD
index bf3ebf7b3..7e3967877 100644
--- a/community/ocrad/PKGBUILD
+++ b/community/ocrad/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ocrad
 pkgver=0.22
 pkgrel=1
 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/community/ode/PKGBUILD b/community/ode/PKGBUILD
index 49d2ad72a..e390045cb 100644
--- a/community/ode/PKGBUILD
+++ b/community/ode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ode
 pkgver=0.13
 pkgrel=1
 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/community/odt2txt/PKGBUILD b/community/odt2txt/PKGBUILD
index 8ff16fba4..c0d4af2f4 100644
--- a/community/odt2txt/PKGBUILD
+++ b/community/odt2txt/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="extracts the text out of OpenDocument Texts"
 url="http://stosberg.net/odt2txt/"
 license=("GPL2")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
 source=(http://stosberg.net/odt2txt/$pkgname-$pkgver.tar.gz)
 md5sums=('6fe3bd261ce2dde2810244bbe969bbc5')
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/ogle/PKGBUILD b/community/ogle/PKGBUILD
index e168226be..1b4ae91c6 100644
--- a/community/ogle/PKGBUILD
+++ b/community/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/community/ogmtools/PKGBUILD b/community/ogmtools/PKGBUILD
index 8bd1c7f9b..443144259 100644
--- a/community/ogmtools/PKGBUILD
+++ b/community/ogmtools/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=ogmtools
 pkgver=1.5
-pkgrel=4
+pkgrel=4.1
 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/community/oidentd/PKGBUILD b/community/oidentd/PKGBUILD
index b93d89d74..65670d32b 100644
--- a/community/oidentd/PKGBUILD
+++ b/community/oidentd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=oidentd
 pkgver=2.0.8
 pkgrel=8
 pkgdesc='An RFC1413 compliant ident daemon'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://dev.ojnk.net/"
 license=('GPL')
 depends=('glibc' 'bash')
diff --git a/community/ois/PKGBUILD b/community/ois/PKGBUILD
index f7de157c3..484a72e92 100644
--- a/community/ois/PKGBUILD
+++ b/community/ois/PKGBUILD
@@ -6,15 +6,18 @@ pkgver=1.3
 _oisver=${pkgver/./-}
 pkgrel=2
 pkgdesc="Object Oriented Input System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/wgois"
 license=('custom:zlib/libpng')
 makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'libxaw')
-source=("http://downloads.sourceforge.net/project/wgois/Source%20Release/${pkgver}/ois_v${_oisver}.tar.gz")
-md5sums=('9697fead17eac6025151cd2e1fca1518')
+source=("http://downloads.sourceforge.net/project/wgois/Source%20Release/${pkgver}/ois_v${_oisver}.tar.gz"
+	"ois-1.3-gcc47.patch")
+md5sums=('9697fead17eac6025151cd2e1fca1518'
+	 'e5cb7a504cf30a382d0b0420aedaa953')
 
 build() {
   cd ${srcdir}/${pkgname}-v${_oisver}
+  patch -Np1 -i ${srcdir}/ois-1.3-gcc47.patch
   chmod +x bootstrap
   ./bootstrap
   ./configure --prefix=/usr
diff --git a/community/ois/ois-1.3-gcc47.patch b/community/ois/ois-1.3-gcc47.patch
new file mode 100644
index 000000000..f77c741c7
--- /dev/null
+++ b/community/ois/ois-1.3-gcc47.patch
@@ -0,0 +1,49 @@
+--- ois-v1-3.orig/demos/FFConsoleDemo.cpp	2010-03-31 22:38:04.000000000 -0500
++++ ois-v1-3/demos/FFConsoleDemo.cpp	2012-12-24 00:33:49.240616817 -0500
+@@ -7,6 +7,7 @@
+ #include <ios>

+ #include <sstream>

+ #include <vector>

++#include <unistd.h>

+ 

+ using namespace std;

+ 

+--- ois-v1-3.orig/demos/OISConsole.cpp	2010-08-15 17:51:34.000000000 -0500
++++ ois-v1-3/demos/OISConsole.cpp	2012-12-24 00:44:27.697240229 -0500
+@@ -12,6 +12,7 @@
+ #include <iostream>

+ #include <vector>

+ #include <sstream>

++#include <unistd.h>

+ 

+ ////////////////////////////////////Needed Windows Headers////////////

+ #if defined OIS_WIN32_PLATFORM

+@@ -77,7 +78,7 @@
+ 	}

+ 	bool keyReleased( const KeyEvent &arg ) {

+ 		if( arg.key == KC_ESCAPE || arg.key == KC_Q )

+-			appRunning = false;
++			appRunning = false;

+ 		std::cout << "KeyReleased {" << ((Keyboard*)(arg.device))->getAsString(arg.key) << "}\n";

+ 		return true;

+ 	}

+--- ois-v1-3.orig/src/linux/LinuxJoyStickEvents.cpp	2010-07-25 20:28:41.000000000 -0500
++++ ois-v1-3/src/linux/LinuxJoyStickEvents.cpp	2012-12-24 00:36:18.360998563 -0500
+@@ -33,6 +33,7 @@
+ #include <fcntl.h>        //Needed to Open a file descriptor

+ #include <cassert>	

+ #include <linux/input.h>

++#include <unistd.h>

+ 

+ 

+ #include <sstream>

+--- ois-v1-3.orig/src/linux/LinuxForceFeedback.cpp	2010-03-31 22:06:55.000000000 -0500
++++ ois-v1-3/src/linux/LinuxForceFeedback.cpp	2012-12-24 00:36:54.023723000 -0500
+@@ -26,6 +26,7 @@
+ #include <cstdlib>

+ #include <errno.h>

+ #include <memory.h>

++#include <unistd.h>

+ 

+ using namespace OIS;

+ 

diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD
index 1b1973259..43e1b87d7 100644
--- a/community/onboard/PKGBUILD
+++ b/community/onboard/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=onboard
 pkgver=0.99.0
 pkgrel=1
 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/onboard"
 license=('GPL')
 depends=('libxkbfile' 'libcanberra' 'hunspell' 'python-dbus' 'python-gobject' 'gtk3' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/community/oolite/PKGBUILD b/community/oolite/PKGBUILD
index 89dd0894a..61fee0ad7 100644
--- a/community/oolite/PKGBUILD
+++ b/community/oolite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=oolite
 pkgver=1.77.1
 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' 'glu' 'espeak' 'nspr' 'python2' 'icu' 'gnustep-base')
diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index afd72b4e7..244ce68ad 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=openbox
 pkgver=3.5.2
 pkgrel=6
 pkgdesc='Highly configurable and lightweight X11 window manager'
-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 ffc02fc9b..d3c2524c5 100644
--- a/community/openbsd-netcat/PKGBUILD
+++ b/community/openbsd-netcat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="openbsd-netcat"
 pkgver=1.105_7
 pkgrel=6
 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=('libbsd')
diff --git a/community/opencc/PKGBUILD b/community/opencc/PKGBUILD
index 3a88ab6b4..76630140b 100644
--- a/community/opencc/PKGBUILD
+++ b/community/opencc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(opencc opencc-doc)
 pkgver=0.4.3
 pkgrel=2
 url="http://code.google.com/p/opencc/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('Apache')
 makedepends=('cmake' 'doxygen')
 source=("http://opencc.googlecode.com/files/${pkgbase}-${pkgver}.tar.gz")
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index 8c0210b17..1843931af 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=opendkim
 pkgver=2.9.0
 pkgrel=2
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.opendkim.org/"
 license=('BSD' 'custom:Sendmail')
 depends=("db" "openssl" "libbsd")
diff --git a/community/openlierox/PKGBUILD b/community/openlierox/PKGBUILD
index d358dc718..2f588811b 100644
--- a/community/openlierox/PKGBUILD
+++ b/community/openlierox/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=openlierox
 pkgver=0.58_rc3
 pkgrel=5
 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 162b52823..5e435a054 100644
--- a/community/openmotif/PKGBUILD
+++ b/community/openmotif/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=openmotif
 pkgver=2.3.4
 pkgrel=3
 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/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 32b37c9a1..ea76814a7 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=3.9p1
 pkgrel=24
 pkgdesc='Free, easy to use implementation of the Network Time Protocol.'
 url='http://www.openntpd.org/'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('BSD')
 depends=('openssl')
 conflicts=('ntp')
diff --git a/community/openobex/PKGBUILD b/community/openobex/PKGBUILD
index ba821ed39..99225edcf 100644
--- a/community/openobex/PKGBUILD
+++ b/community/openobex/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.7.1
 pkgrel=1
 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=('libusbx' 'bluez-libs')
 makedepends=('cmake' 'libxslt')
diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD
index 18803f55d..7ac80b987 100644
--- a/community/openocd/PKGBUILD
+++ b/community/openocd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=openocd
 pkgver=0.7.0
 pkgrel=3
 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://openocd.berlios.de'
 license=('GPL')
 depends=('libftdi' 'libusb-compat')
diff --git a/community/opensc/PKGBUILD b/community/opensc/PKGBUILD
index d8832845e..5f07606f5 100644
--- a/community/opensc/PKGBUILD
+++ b/community/opensc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=opensc
 pkgver=0.13.0
 pkgrel=4
 pkgdesc='Tools and libraries for smart cards'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='https://github.com/OpenSC/OpenSC/wiki'
 license=('LGPL')
 backup=('etc/opensc.conf')
diff --git a/community/opensips/PKGBUILD b/community/opensips/PKGBUILD
index bb7205168..c96dee0ec 100644
--- a/community/opensips/PKGBUILD
+++ b/community/opensips/PKGBUILD
@@ -19,7 +19,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/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD
index 0e452fb82..8106378cf 100644
--- a/community/opensmtpd/PKGBUILD
+++ b/community/opensmtpd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=opensmtpd
 pkgver=5.4.1p1
 pkgrel=2
 pkgdesc='Free implementation of the server-side SMTP protocol'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opensmtpd.org/'
 license=('custom')
 depends=('libevent' 'openssl')
diff --git a/community/openssh-askpass/PKGBUILD b/community/openssh-askpass/PKGBUILD
index 2a6124ade..aaa29cdaf 100644
--- a/community/openssh-askpass/PKGBUILD
+++ b/community/openssh-askpass/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=openssh-askpass
 pkgver=2.0.1
 pkgrel=1
 pkgdesc='A plasma-like passphrase dialog for ssh'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://hugo.pereira.free.fr/software/index.php?page=package&package_list=software_list_qt4&package=openssh-askpass&full=0'
 license=('GPL')
 depends=('openssh' 'qt4')
diff --git a/community/openthreads/PKGBUILD b/community/openthreads/PKGBUILD
index ff94915c2..ab5bf7bf7 100644
--- a/community/openthreads/PKGBUILD
+++ b/community/openthreads/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=openthreads
 pkgver=2.3.0
 pkgrel=2
 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 bcfb893a7..fe1f4db28 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=openttd
 pkgver=1.3.3
 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' 'xz')
diff --git a/community/ophcrack/PKGBUILD b/community/ophcrack/PKGBUILD
index 64ae92553..bd4ac8134 100644
--- a/community/ophcrack/PKGBUILD
+++ b/community/ophcrack/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ophcrack
 pkgver=3.6.0
 pkgrel=1
 pkgdesc="A free Windows password cracker based on rainbow tables"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ophcrack.sourceforge.net"
 license=('GPL')
 depends=('qt4')
diff --git a/community/oprofile/PKGBUILD b/community/oprofile/PKGBUILD
index 87b37605f..4b60d5830 100644
--- a/community/oprofile/PKGBUILD
+++ b/community/oprofile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=oprofile
 pkgver=0.9.9
 pkgrel=1
 pkgdesc='System-wide profiler for Linux systems'
-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/community/optipng/PKGBUILD b/community/optipng/PKGBUILD
index 59583d22b..815575c27 100644
--- a/community/optipng/PKGBUILD
+++ b/community/optipng/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=optipng
 pkgver=0.7.4
 pkgrel=1
 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/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD
index be421d277..48292908d 100644
--- a/community/opus-tools/PKGBUILD
+++ b/community/opus-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=opus-tools
 pkgver=0.1.8
 pkgrel=1
 pkgdesc='Collection of tools for Opus audio codec'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://wiki.xiph.org/Opus-tools'
 license=('BSD')
 depends=('flac' 'libogg' 'opus')
diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD
index 59c65dd42..8b8459283 100644
--- a/community/opusfile/PKGBUILD
+++ b/community/opusfile/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=opusfile
 pkgver=0.5
 pkgrel=1
 pkgdesc='Library for opening, seeking, and decoding .opus files'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.opus-codec.org/'
 license=('BSD')
 depends=('libogg' 'openssl' 'opus')
diff --git a/community/orange/PKGBUILD b/community/orange/PKGBUILD
index 6491c3d88..3e1a993da 100644
--- a/community/orange/PKGBUILD
+++ b/community/orange/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=orange
 pkgver=0.4
 pkgrel=6
 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/os-prober/PKGBUILD b/community/os-prober/PKGBUILD
index e3af2e380..5491a6166 100644
--- a/community/os-prober/PKGBUILD
+++ b/community/os-prober/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.58
 pkgrel=1
 pkgdesc="Utility to detect other OSes on a set of drives"
 url="http://joey.kitenet.net/code/os-prober/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('sh')
 source=(ftp://ftp.debian.org/debian/pool/main/o/${pkgname}/${pkgname}_${pkgver}.tar.gz)
diff --git a/community/osdbattery/PKGBUILD b/community/osdbattery/PKGBUILD
index 1d2da5715..6782acfce 100644
--- a/community/osdbattery/PKGBUILD
+++ b/community/osdbattery/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=osdbattery
 pkgver=1.4
 pkgrel=5
 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/osdlyrics/PKGBUILD b/community/osdlyrics/PKGBUILD
index 10e36f4c7..d1bb7e13f 100644
--- a/community/osdlyrics/PKGBUILD
+++ b/community/osdlyrics/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=osdlyrics
 pkgver=0.4.3
 pkgrel=2
 pkgdesc="A lyric show compatible with various media players"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/osd-lyrics/"
 license=('GPL3')
 depends=('gtk2' 'dbus-glib' 'curl' 'libnotify' 'libmpd' 'xmms2'
diff --git a/community/osec/PKGBUILD b/community/osec/PKGBUILD
index a7c83c131..44be29209 100644
--- a/community/osec/PKGBUILD
+++ b/community/osec/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=osec
 pkgver=1.2.3
 pkgrel=2
 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 163ed50ab..6345b3475 100644
--- a/community/osiris/PKGBUILD
+++ b/community/osiris/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=osiris
 pkgver=4.2.3
 pkgrel=7
 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')
@@ -24,7 +24,7 @@ build() {
 
   sed -i "s|/sbin|/bin|g" src/install/install.sh.in
 
-  ./configure --prefix=/usr --sbindir=/usr/bin \
+  ./configure --prefix=/usr --sbindir=/usr/bin --build=$CHOST \
     --enable-fancy-cli --with-md-root-dir=/usr/share/$pkgname
   make all
 
diff --git a/community/osmo/PKGBUILD b/community/osmo/PKGBUILD
index 426f30598..f0cd673b5 100644
--- a/community/osmo/PKGBUILD
+++ b/community/osmo/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.2.12
 pkgrel=1
 pkgdesc="A handy personal organizer"
 _svnver=937
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clayo.org/osmo/"
 license=('GPL')
 depends=('gtkspell' 'hicolor-icon-theme' 'libical' 'libnotify' 'webkitgtk2' 'libgringotts>=1.2.1' 'libxml2')
diff --git a/community/ozerocdoff/PKGBUILD b/community/ozerocdoff/PKGBUILD
index aa5cb4031..cd38e3956 100644
--- a/community/ozerocdoff/PKGBUILD
+++ b/community/ozerocdoff/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ozerocdoff
 pkgver=2
 pkgrel=8
 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 0bd6432b0..87548c0cb 100644
--- a/community/p2c/PKGBUILD
+++ b/community/p2c/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=p2c
 pkgver=1.21alpha2
 pkgrel=11
 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 1e0ca81cf..266dca0de 100644
--- a/community/p3scan/PKGBUILD
+++ b/community/p3scan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=p3scan
 pkgver=2.3.2
 pkgrel=10
 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 bc9104bfe..c826d008f 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
 pkgver=0.7.6
 pkgrel=11
 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/packeth/PKGBUILD b/community/packeth/PKGBUILD
index 7fec455f2..8b0573b2c 100644
--- a/community/packeth/PKGBUILD
+++ b/community/packeth/PKGBUILD
@@ -10,7 +10,7 @@ depends=(gtk2)
 source=("http://downloads.sourceforge.net/packeth/packETH-$pkgver.tar.bz2")
 url="http://packeth.sourceforge.net/"
 md5sums=('dab613ab413e959cb5c1ef6fd385a041')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 
 build() {
diff --git a/community/paco/PKGBUILD b/community/paco/PKGBUILD
index 374ca79a3..c00c185b5 100644
--- a/community/paco/PKGBUILD
+++ b/community/paco/PKGBUILD
@@ -6,17 +6,20 @@ pkgname=paco
 pkgver=2.0.9
 pkgrel=3
 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
 depends=(gtk2 gtkmm)
 backup=(etc/pacorc)
-source=(http://downloads.sourceforge.net/sourceforge/paco/$pkgname-$pkgver.tar.bz2)
-md5sums=('d2debbea1b11156470f7fd849bb93c80')
+source=(http://downloads.sourceforge.net/sourceforge/paco/$pkgname-$pkgver.tar.bz2
+	paco-2.0.9-glib.patch)
+md5sums=('d2debbea1b11156470f7fd849bb93c80'
+	 '734d0170691cd6b500bfa99fdd09771a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i ${srcdir}/paco-2.0.9-glib.patch
   ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
diff --git a/community/paco/paco-2.0.9-glib.patch b/community/paco/paco-2.0.9-glib.patch
new file mode 100644
index 000000000..fba19d3a7
--- /dev/null
+++ b/community/paco/paco-2.0.9-glib.patch
@@ -0,0 +1,11 @@
+--- paco-2.0.9.orig/gpaco/gconfig.h	2010-06-25 14:51:00.000000000 -0500
++++ paco-2.0.9/gpaco/gconfig.h	2012-12-25 02:51:26.449929758 -0500
+@@ -11,7 +11,7 @@
+ 
+ #include "paco/baseconfig.h"
+ #include <glibmm/ustring.h>
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ #include <vector>
+ 
+ 
diff --git a/community/pam_mount/PKGBUILD b/community/pam_mount/PKGBUILD
index 3f7f36cdb..17926b40c 100644
--- a/community/pam_mount/PKGBUILD
+++ b/community/pam_mount/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pam_mount
 pkgver=2.14
 pkgrel=1
 pkgdesc="A PAM module that can mount volumes for a user session"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pam-mount.sourceforge.net/"
 license=('GPL')
 depends=('util-linux' 'libhx>=3.12.1' 'libxml2>=2.6' 'openssl>0.9.7' 'cryptsetup>=1.1.2')
diff --git a/community/pam_mysql/PKGBUILD b/community/pam_mysql/PKGBUILD
index 5493e6b7e..305786f7b 100644
--- a/community/pam_mysql/PKGBUILD
+++ b/community/pam_mysql/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pam_mysql
 pkgver=0.7RC1
 pkgrel=7
 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' 'mariadb' 'openssl')
diff --git a/community/paps/PKGBUILD b/community/paps/PKGBUILD
index 73a14bb19..2538bf134 100644
--- a/community/paps/PKGBUILD
+++ b/community/paps/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc='UTF-8 to PostScript converter via Pango'
 url='http://paps.sourceforge.net/'
 license=('LGPL')
 depends=('pango')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/paps/paps-${pkgver}.tar.gz")
 sha1sums=('83646b0de89deb8321f260c2c5a665bc7c8f5928')
 
diff --git a/community/par2cmdline/PKGBUILD b/community/par2cmdline/PKGBUILD
index 112da7347..148faba04 100644
--- a/community/par2cmdline/PKGBUILD
+++ b/community/par2cmdline/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='A PAR 2.0 compatible file verification and repair tool'
 url='https://github.com/BlackIkeEagle/par2cmdline'
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/BlackIkeEagle/$pkgname/archive/v$pkgver.tar.gz")
 sha256sums=('431da50fdd794881bad7e1b0dee234e8102d7065f53abd7ce1e86be758810116')
 
diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD
index ab156dbab..30174e6a8 100644
--- a/community/parcellite/PKGBUILD
+++ b/community/parcellite/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=parcellite
 pkgver=1.1.7
 pkgrel=2
 pkgdesc="Lightweight GTK+ clipboard manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://parcellite.sourceforge.net/"
 license=('GPL3')
 depends=('gtk2')
@@ -30,4 +30,5 @@ build() {
 package() {
   cd "$srcdir/parcellite-$pkgver"
   make DESTDIR="$pkgdir" install
+  make distclean
 }
diff --git a/community/parcellite/parcellite-1.0.2rc5-glib.patch b/community/parcellite/parcellite-1.0.2rc5-glib.patch
new file mode 100644
index 000000000..d4e1312e2
--- /dev/null
+++ b/community/parcellite/parcellite-1.0.2rc5-glib.patch
@@ -0,0 +1,11 @@
+--- parcellite-1.0.2rc5.orig/src/keybinder.h	2011-09-09 18:02:32.000000000 -0500
++++ parcellite-1.0.2rc5/src/keybinder.h	2012-12-26 09:30:05.145148674 -0500
+@@ -20,7 +20,7 @@
+ #ifndef __KEY_BINDER_H__
+ #define __KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD
index 80510ab06..2433d00bd 100644
--- a/community/pari/PKGBUILD
+++ b/community/pari/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc='Computer algebra system designed for fast computations in number theory'
 url='http://pari.math.u-bordeaux.fr/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gmp' 'readline' 'libx11')
 makedepends=('perl' 'texlive-core')
 optdepends=('perl: gphelp, tex2mail')
diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD
index 8262860d4..aa0221289 100644
--- a/community/parole/PKGBUILD
+++ b/community/parole/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=parole
 pkgver=0.5.4
 pkgrel=1
 pkgdesc="A modern media player based on the GStreamer framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/parole/"
 license=('GPL')
 depends=('gstreamer' 'gst-plugins-base-libs' 'hicolor-icon-theme' 'libnotify>=0.4.1'
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index 27851a3f0..5f1a4027b 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -8,7 +8,7 @@ _rel=stable
 #_rel=devel
 pkgrel=1
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://www.parrotcode.org/"
 license=('GPL')
 depends=('icu' 'openssl' 'libffi')
diff --git a/community/partclone/PKGBUILD b/community/partclone/PKGBUILD
index 71d0920f8..8ce5e34a2 100644
--- a/community/partclone/PKGBUILD
+++ b/community/partclone/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=partclone
 pkgver=0.2.69
 pkgrel=1
 pkgdesc="Utilities to save and restore used blocks on a partition"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://partclone.org"
 license=('GPL')
 depends=('progsreiserfs' 'ntfs-3g')
@@ -18,6 +18,7 @@ md5sums=('2cc3b4e49819da32adcf63ef9246dca0')
 
 build() {
   cd "$srcdir"/$pkgname-$pkgver
+  [ "$CARCH" = "mips64el" ] && sed -i "s| fail-mbr||" Makefile.in
 
   ./configure --prefix=/usr --enable-extfs --enable-reiserfs --enable-fat \
     --enable-hfsp --enable-btrfs --enable-ncursesw --enable-ntfs --sbindir=/usr/bin
diff --git a/community/partimage/PKGBUILD b/community/partimage/PKGBUILD
index f3cecc40a..679a5bebe 100644
--- a/community/partimage/PKGBUILD
+++ b/community/partimage/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=partimage
 pkgver=0.6.9
 pkgrel=4
 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 c82736da4..2412f2a16 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=passenger
 pkgver=4.0.37
 pkgrel=1
 pkgdesc="mod_rails passenger"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.modrails.com"
 #http://rubyforge.org/frs/?group_id=5873
 license=('GPL')
diff --git a/community/patchage/PKGBUILD b/community/patchage/PKGBUILD
index 0a9e2b4c3..9b53ef5e1 100644
--- a/community/patchage/PKGBUILD
+++ b/community/patchage/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=patchage
 pkgver=0.5.0
 pkgrel=3
 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 e08c8eeef..af555da4d 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.xz)
 md5sums=('b640b6b8af6183f83eacf7bd6d2460cb')
 
diff --git a/community/pawm/PKGBUILD b/community/pawm/PKGBUILD
index 7f134b52e..dae4106da 100644
--- a/community/pawm/PKGBUILD
+++ b/community/pawm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pawm
 pkgver=2.3.0
 pkgrel=2
 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/"
 url="https://sites.google.com/site/pleyadestest/david/projects/pawm"
 license=("GPL")
diff --git a/community/pax-utils/PKGBUILD b/community/pax-utils/PKGBUILD
index 6298b812a..5b1e447da 100644
--- a/community/pax-utils/PKGBUILD
+++ b/community/pax-utils/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.7
 pkgrel=1
 pkgdesc='ELF related utils for ELF 32/64 binaries that can check files for security relevant properties'
 url='http://hardened.gentoo.org/pax-utils.xml'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('bash' 'libcap')
 checkdepends=('python')
diff --git a/community/pbzip2/PKGBUILD b/community/pbzip2/PKGBUILD
index 24dff6a50..cdc84da95 100644
--- a/community/pbzip2/PKGBUILD
+++ b/community/pbzip2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pbzip2
 pkgver=1.1.8
 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 b9377e19f..2548f0931 100644
--- a/community/pcmanfm/PKGBUILD
+++ b/community/pcmanfm/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pcmanfm
 pkgver=1.2.0
 pkgrel=1
 pkgdesc='Extremely fast and lightweight file manager'
-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 c7c9dbca1..28de1def2 100644
--- a/community/pcsc-perl/PKGBUILD
+++ b/community/pcsc-perl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pcsc-perl
 pkgver=1.4.13
 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 518a47e14..1289ae086 100644
--- a/community/pcsc-tools/PKGBUILD
+++ b/community/pcsc-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pcsc-tools
 pkgver=1.4.22
 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 78f98e255..016fa2ac6 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pcsclite
 pkgver=1.8.11
 pkgrel=1
 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=('python2' 'systemd')
diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD
index 4ff3b7606..8a12e214f 100644
--- a/community/pd/PKGBUILD
+++ b/community/pd/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.45.3
 _ver=${pkgver%.*}-${pkgver##*.}
 pkgrel=1
 pkgdesc="The Pure Data real-time music and multimedia environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://crca.ucsd.edu/~msp/software.html"
 license=('custom:BSD')
 depends=('jack' 'fftw' 'tk')
diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index eb00ccd78..07ad794cd 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pdf2djvu
 pkgver=0.7.17
 pkgrel=2
 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' 'graphicsmagick')
diff --git a/community/pdf2svg/PKGBUILD b/community/pdf2svg/PKGBUILD
index ab177cc6c..fa9279dd0 100644
--- a/community/pdf2svg/PKGBUILD
+++ b/community/pdf2svg/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pdf2svg
 pkgver=0.2.2
 pkgrel=1
 pkgdesc="A pdf to svg converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cityinthesky.co.uk/opensource/pdf2svg/"
 license=('GPL')
 depends=('poppler-glib' 'gtk2' 'glib2')
diff --git a/community/pdflib-lite/PKGBUILD b/community/pdflib-lite/PKGBUILD
index 73e4a997c..83bec57cd 100644
--- a/community/pdflib-lite/PKGBUILD
+++ b/community/pdflib-lite/PKGBUILD
@@ -8,7 +8,7 @@ _basepkgver=${pkgver/p*/}
 pkgrel=3
 pkgdesc="PDF manipulation library."
 url="http://www.pdflib.com"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=('glibc')
 provides=('pdflib')
 source=(http://www.pdflib.com/binaries/PDFlib/${_basepkgver//./}/${_pkgnamecaps}-${pkgver}.tar.gz http://www.pdflib.com/fileadmin/pdflib/pdf/license/PDFlib-Lite-license.pdf)
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 d8fe5189d..62579bfaf 100644
--- a/community/pdnsd/PKGBUILD
+++ b/community/pdnsd/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2.9.a
 _pkgver=${pkgver/.a/a}
 pkgrel=4
 pkgdesc="Proxy DNS server with permanent caching"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://members.home.nl/p.a.rombouts/pdnsd/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD
index 8d3316ba4..6b8e4058b 100644
--- a/community/pekwm/PKGBUILD
+++ b/community/pekwm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pekwm
 pkgver=0.1.17
 pkgrel=2
 pkgdesc='Small, fast, functional, and flexible window manager'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
 url='https://www.pekwm.org/projects/pekwm'
 depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr')
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index b5130e6c2..5b7ff6d40 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=percona-server
 pkgver=5.6.15_rel63.0
 pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 
 depends=('mariadb-clients' 'libaio' 'systemd-tools')
 conflicts=('mysql')
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index 301048099..e7c0df26a 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=performous
 pkgver=0.7.0
 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' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'librsvg' 'ffmpeg') # opencv
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index 7a5ce812a..ce18978bd 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-berkeleydb
 pkgver=0.54
 pkgrel=1
 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 e610fc815..5724a1ec4 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=5
 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-methodmaker/PKGBUILD b/community/perl-class-methodmaker/PKGBUILD
index 0f119f852..a9170e3bc 100644
--- a/community/perl-class-methodmaker/PKGBUILD
+++ b/community/perl-class-methodmaker/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-class-methodmaker
 pkgver=2.20
 pkgrel=1
 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 177783e2d..b368c94d9 100644
--- a/community/perl-clone/PKGBUILD
+++ b/community/perl-clone/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-clone
 pkgver=0.36
 pkgrel=1
 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 80b24bbc7..c7788978f 100644
--- a/community/perl-crypt-blowfish/PKGBUILD
+++ b/community/perl-crypt-blowfish/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-crypt-blowfish
 pkgver=2.14
 pkgrel=1
 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 ae78df34d..0b6cbb498 100644
--- a/community/perl-crypt-des/PKGBUILD
+++ b/community/perl-crypt-des/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-crypt-des
 pkgver=2.07
 pkgrel=1
 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-curses/PKGBUILD b/community/perl-curses/PKGBUILD
index 458498978..aed65a17d 100644
--- a/community/perl-curses/PKGBUILD
+++ b/community/perl-curses/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-curses
 pkgver=1.28
 pkgrel=6
 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-dumper/PKGBUILD b/community/perl-data-dumper/PKGBUILD
index 2f96b2588..22c3a81d8 100644
--- a/community/perl-data-dumper/PKGBUILD
+++ b/community/perl-data-dumper/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=perl-data-dumper
 pkgver=2.145
 pkgrel=2
 pkgdesc="stringified perl data structures, suitable for both printing and eval"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/Data-Dumper/"
 depends=('perl')
diff --git a/community/perl-data-structure-util/PKGBUILD b/community/perl-data-structure-util/PKGBUILD
index 00d73ae7e..d34c8ab22 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=7
 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 d924762bc..bea356279 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.8100
 pkgrel=1
 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 cb5bacb73..f03909ce7 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=8
 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 c6179c4ca..3820d3735 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-datetime
 pkgver=1.07
 pkgrel=1
 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 a27d34dc4..3d9b695e2 100644
--- a/community/perl-dbd-odbc/PKGBUILD
+++ b/community/perl-dbd-odbc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-dbd-odbc
 pkgver=1.45
 pkgrel=1
 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 0f10252ab..54c85f245 100644
--- a/community/perl-dbd-pg/PKGBUILD
+++ b/community/perl-dbd-pg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-dbd-pg
 pkgver=3.0.0
 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 2f8a19579..5331e6fe4 100644
--- a/community/perl-dbd-sqlite2/PKGBUILD
+++ b/community/perl-dbd-sqlite2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-dbd-sqlite2
 pkgver=0.36
 pkgrel=2
 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 e0962a6e3..dca40f850 100644
--- a/community/perl-dbd-sybase/PKGBUILD
+++ b/community/perl-dbd-sybase/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-dbd-sybase
 pkgver=1.15
 pkgrel=2
 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 3305d0af1..ea915dfaf 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=5
 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-file-rsyncp/PKGBUILD b/community/perl-file-rsyncp/PKGBUILD
index a6f54cef5..45f512a49 100644
--- a/community/perl-file-rsyncp/PKGBUILD
+++ b/community/perl-file-rsyncp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-file-rsyncp
 pkgver=0.70
 pkgrel=3
 pkgdesc='Perl interface to rsync file list encoding and decoding'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
 options=('!emptydirs' '!makeflags')
 url='http://search.cpan.org/dist/File-RsyncP'
diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD
index 7cf769802..0718db88a 100644
--- a/community/perl-fuse/PKGBUILD
+++ b/community/perl-fuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-fuse
 pkgver=0.16.1
 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 9e5049524..6be053a96 100644
--- a/community/perl-gd/PKGBUILD
+++ b/community/perl-gd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gd
 pkgver=2.51
 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 064c8167e..beac8756e 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=8
 pkgdesc="Perl interface to the Window Navigator Construction Kit"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("GPL" "PerlArtistic")
 url="http://search.cpan.org/dist/Gnome2-Wnck"
 depends=('gtk2-perl' 'libwnck')
diff --git a/community/perl-gssapi/PKGBUILD b/community/perl-gssapi/PKGBUILD
index c6a965a3e..0a50fbdb8 100644
--- a/community/perl-gssapi/PKGBUILD
+++ b/community/perl-gssapi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gssapi
 pkgver=0.28
 pkgrel=7
 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 41e300029..01dd3220b 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=6
 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 215b84d7e..97385d294 100644
--- a/community/perl-gstreamer/PKGBUILD
+++ b/community/perl-gstreamer/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-gstreamer
 pkgver=0.19
 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 7ad769b37..939abd262 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=8
 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 4ee678a9e..6cac850f1 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=10
 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 7dcd5f7d3..a1a9b800c 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=4
 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 4cc4e0970..66907cd50 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=9
 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 500b8d3c7..40d874ee6 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=5
 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-dirent/PKGBUILD b/community/perl-io-dirent/PKGBUILD
index 9a2de7e7f..5ebf46b34 100644
--- a/community/perl-io-dirent/PKGBUILD
+++ b/community/perl-io-dirent/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-io-dirent
 pkgver=0.05
 pkgrel=3
 pkgdesc='Perl IO::Dirent module - Access to dirent structs returned by readdir'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'PerlArtistic')
 url='http://search.cpan.org/~scottw/IO-Dirent/'
 options=('!emptydirs')
diff --git a/community/perl-io-string/PKGBUILD b/community/perl-io-string/PKGBUILD
index 9f922b882..7aaa52442 100644
--- a/community/perl-io-string/PKGBUILD
+++ b/community/perl-io-string/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-io-string
 pkgver=1.08
 pkgrel=8
 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 54100cf32..3899cd93f 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=3
 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 fb628567f..2a84a3280 100644
--- a/community/perl-json-xs/PKGBUILD
+++ b/community/perl-json-xs/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 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' 'perl-types-serialiser')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/JSON-XS-$pkgver.tar.gz)
diff --git a/community/perl-lchown/PKGBUILD b/community/perl-lchown/PKGBUILD
index cd1f89437..c8ba16422 100644
--- a/community/perl-lchown/PKGBUILD
+++ b/community/perl-lchown/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=perl-lchown
 pkgver=1.01
 pkgrel=2
 pkgdesc="use the lchown(2) system call from Perl"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(PerlArtistic GPL)
 options=(!emptydirs)
 depends=('perl')
diff --git a/community/perl-libapreq2/PKGBUILD b/community/perl-libapreq2/PKGBUILD
index 0c9b8821b..1bddbecd9 100644
--- a/community/perl-libapreq2/PKGBUILD
+++ b/community/perl-libapreq2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-libapreq2
 pkgver=2.13
 pkgrel=5
 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 586aaf72e..17808ec64 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='3'
 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 637543d3e..fc961b411 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.007
 pkgrel=1
 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 f3ed0f502..8cb763a47 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=9
 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 6b0163fe9..1e2c3bbe7 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=3
 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 d3669234d..a35d9245f 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=7
 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-package-stash-xs/PKGBUILD b/community/perl-package-stash-xs/PKGBUILD
index 8ff0c7d31..f8a39a069 100644
--- a/community/perl-package-stash-xs/PKGBUILD
+++ b/community/perl-package-stash-xs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-package-stash-xs
 pkgver=0.28
 pkgrel=1
 pkgdesc="Faster and more correct implementation of the Package::Stash API"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 mips64el)
 url="http://search.cpan.org/dist/Package-Stash-XS"
 license=('PerlArtistic' 'GPL')
 depends=('perl')
diff --git a/community/perl-params-classify/PKGBUILD b/community/perl-params-classify/PKGBUILD
index dd2a74a64..b349b490c 100644
--- a/community/perl-params-classify/PKGBUILD
+++ b/community/perl-params-classify/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-params-classify
 pkgver=0.013
 pkgrel=3
 pkgdesc="argument type classification"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/~zefram/Params-Classify"
 options=(!emptydirs)
diff --git a/community/perl-params-util/PKGBUILD b/community/perl-params-util/PKGBUILD
index 6b0fc9784..d7a3cab2d 100644
--- a/community/perl-params-util/PKGBUILD
+++ b/community/perl-params-util/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-params-util
 pkgver=1.07
 pkgrel=2
 pkgdesc='Simple, compact and correct param-checking functions'
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 mips64el)
 url="https://metacpan.org/release/Params-Util"
 license=('PerlArtistic' 'GPL')
 depends=('perl')
diff --git a/community/perl-params-validate/PKGBUILD b/community/perl-params-validate/PKGBUILD
index 33881b8f7..1367ad42a 100644
--- a/community/perl-params-validate/PKGBUILD
+++ b/community/perl-params-validate/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-params-validate
 pkgver=1.08
 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' 'perl-module-implementation')
diff --git a/community/perl-string-crc32/PKGBUILD b/community/perl-string-crc32/PKGBUILD
index 876881935..4c3e9349e 100644
--- a/community/perl-string-crc32/PKGBUILD
+++ b/community/perl-string-crc32/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-string-crc32
 pkgver=1.5
 pkgrel=1
 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-term-readline-gnu/PKGBUILD b/community/perl-term-readline-gnu/PKGBUILD
index 898aee284..579c2929b 100644
--- a/community/perl-term-readline-gnu/PKGBUILD
+++ b/community/perl-term-readline-gnu/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=perl-term-readline-gnu
 pkgver=1.20
 pkgrel=6
 pkgdesc="GNU Readline XS library wrapper"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
 depends=('perl>=5.7')
diff --git a/community/perl-text-charwidth/PKGBUILD b/community/perl-text-charwidth/PKGBUILD
index a2dafad6e..30e54d76c 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=9
 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 e9b1eeb1e..5f43e4479 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=10
 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 67a21ae28..746ad3c50 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=9
 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 89e3a1181..509a84f54 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=10
 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 37a44c0d4..d6d030cbd 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=4
 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-fast/PKGBUILD b/community/perl-xml-fast/PKGBUILD
index 79df32a7a..9388cb5b2 100644
--- a/community/perl-xml-fast/PKGBUILD
+++ b/community/perl-xml-fast/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-xml-fast
 pkgver=0.11
 pkgrel=4
 pkgdesc="Simple and very fast XML to hash conversion."
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://search.cpan.org/dist/XML-Fast/"
 license=('GPL' 'PerlArtistic')
 depends=('perl')
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index 7c639a69d..513c5857f 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-xml-libxml
 pkgver=2.0110
 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' 'perl-xml-namespacesupport')
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index 333ca4f20..8c0b47f60 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-xml-libxslt
 pkgver=1.87
 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 d747b0561..1c2acdfd0 100644
--- a/community/perl-xmms/PKGBUILD
+++ b/community/perl-xmms/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-xmms
 pkgver=0.12
 pkgrel=9
 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 24eb2e296..73a521e71 100644
--- a/community/pgadmin3/PKGBUILD
+++ b/community/pgadmin3/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pgadmin3
 pkgver=1.18.1
 pkgrel=8
 pkgdesc="Comprehensive design and management interface for PostgreSQL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pgadmin.org"
 license=('custom')
 depends=('wxgtk2.8' 'postgresql-libs' 'libxslt')
diff --git a/community/php-geoip/PKGBUILD b/community/php-geoip/PKGBUILD
index e87e7931b..9745f3377 100644
--- a/community/php-geoip/PKGBUILD
+++ b/community/php-geoip/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=php-geoip
 pkgver=1.0.8
 pkgrel=3
 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 cebef6877..aad0c6838 100644
--- a/community/php-memcache/PKGBUILD
+++ b/community/php-memcache/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=php-memcache
 pkgver=3.0.8
 pkgrel=2
 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 8fe9a012a..002e53581 100644
--- a/community/php-memcached/PKGBUILD
+++ b/community/php-memcached/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=php-memcached
 pkgver=2.1.0
 pkgrel=2
 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/pianobar/PKGBUILD b/community/pianobar/PKGBUILD
index bc1108a58..dcdfc8f05 100644
--- a/community/pianobar/PKGBUILD
+++ b/community/pianobar/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2013.09.15
 pkgrel=2
 pkgdesc="console-based frontend for Pandora"
 url="http://6xq.net/0017"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 depends=('libao' 'faad2' 'libmad' 'gnutls' 'json-c' 'libgcrypt')
 source=(http://6xq.net/projects/pianobar/$pkgname-$pkgver.tar.bz2)
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index b15337c72..8e5035ba6 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 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')
 optdepends=('libdiscid: CD lookup'
             'chromaprint: fingerprinting')
diff --git a/community/picocom/PKGBUILD b/community/picocom/PKGBUILD
index 17684fe0b..0e5f1137e 100644
--- a/community/picocom/PKGBUILD
+++ b/community/picocom/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc='Minimal dumb-terminal emulation program, very much like minicom'
 url='http://code.google.com/p/picocom/'
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 install=$pkgname.install
 source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz")
diff --git a/community/pidgin-encryption/PKGBUILD b/community/pidgin-encryption/PKGBUILD
index ae2cb0f96..5e0e1a7c3 100644
--- a/community/pidgin-encryption/PKGBUILD
+++ b/community/pidgin-encryption/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=pidgin-encryption
 pkgver=3.1
-pkgrel=2
+pkgrel=2.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/community/pidgin-gfire/PKGBUILD b/community/pidgin-gfire/PKGBUILD
index ee13bab11..eccb41d29 100644
--- a/community/pidgin-gfire/PKGBUILD
+++ b/community/pidgin-gfire/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pidgin-gfire
 pkgver=0.9.4
 pkgrel=4
 pkgdesc="Gfire is an Plugin for the Pidgin IM client which allows you to connect the Xfire network."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gfireproject.org/"
 license=('GPL')
 depends=('glib2' 'pidgin' 'libnotify' 'gtk2')
diff --git a/community/pidgin-hotkeys/PKGBUILD b/community/pidgin-hotkeys/PKGBUILD
index 98a10a1c5..19440dd17 100644
--- a/community/pidgin-hotkeys/PKGBUILD
+++ b/community/pidgin-hotkeys/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pidgin-hotkeys
 pkgver=0.2.4
 pkgrel=3
 pkgdesc="A Pidgin plugin that allows you to define global hotkeys."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pidgin-hotkeys.sourceforge.net"
 license=('GPL')
 depends=('pidgin')
diff --git a/community/pidgin-kwallet/PKGBUILD b/community/pidgin-kwallet/PKGBUILD
index 255f92481..a1c79ea3b 100644
--- a/community/pidgin-kwallet/PKGBUILD
+++ b/community/pidgin-kwallet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pidgin-kwallet
 pkgver=1.1.0
 pkgrel=2
 pkgdesc="KWallet plugin for Pidgin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/Pidgin+KWallet+Plugin?content=127136"
 license=('GPL')
 depends=('pidgin' 'kdelibs')
diff --git a/community/pidgin-libnotify/PKGBUILD b/community/pidgin-libnotify/PKGBUILD
index 33e67e692..f44a5eec0 100644
--- a/community/pidgin-libnotify/PKGBUILD
+++ b/community/pidgin-libnotify/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=pidgin-libnotify
 pkgver=0.14
 pkgrel=8
-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-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index bb0c1f8fe..6d1e74387 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.2c.20140221
 _gitver='commit=c8482238c5d484c33c1444ad4ef9d967ce970596'
 pkgrel=1
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/xiehuc/pidgin-lwqq"
 license=('GPL3')
 depends=('libpurple' 'curl' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'libev' 'js')
diff --git a/community/pidgin-otr/PKGBUILD b/community/pidgin-otr/PKGBUILD
index d46420838..bc1cd9ced 100644
--- a/community/pidgin-otr/PKGBUILD
+++ b/community/pidgin-otr/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=pidgin-otr
 pkgver=4.0.0
 pkgrel=2
 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>=4.0.0' 'pidgin' 'perlxml')
diff --git a/community/pidgin-toobars/PKGBUILD b/community/pidgin-toobars/PKGBUILD
index fd9825abe..1ed3d8c8e 100644
--- a/community/pidgin-toobars/PKGBUILD
+++ b/community/pidgin-toobars/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pidgin-toobars
 pkgver=1.14
 pkgrel=2
 pkgdesc='Pidgin plugin that adds a toolbar and status bar to the buddy list'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://vayurik.ru/wordpress/en/toobars/'
 license=('GPL')
 depends=('pidgin')
diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD
index c3fb03ff6..261ffbea5 100644
--- a/community/pigz/PKGBUILD
+++ b/community/pigz/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pigz
 pkgver=2.3.1
 pkgrel=1
 pkgdesc='Parallel implementation of the gzip file compressor'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zlib.net/pigz/'
 license=('custom')
 depends=('zlib')
diff --git a/community/pinfo/PKGBUILD b/community/pinfo/PKGBUILD
index d5ac06d0e..94c87895a 100644
--- a/community/pinfo/PKGBUILD
+++ b/community/pinfo/PKGBUILD
@@ -6,10 +6,11 @@ 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')
+makedepends=('git')
 source=(https://alioth.debian.org/frs/download.php/3351/$pkgname-$pkgver.tar.bz2)
 md5sums=('fe3d3da50371b1773dfe29bf870dbc5b')
 
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index e5990b35d..4046afb3a 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pingus
 pkgver=0.7.6
 pkgrel=11
 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.49')
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index d713e14de..8fe0e0c7e 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=pinot
 pkgver=1.06
 pkgrel=3
 pkgdesc='Personal search and metasearch tool'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/pinot-search/'
 license=('GPL')
 depends=('gtkmm3' 'xapian-core' 'libtextcat' 'sqlite' 'libxml++' 'curl' 'gmime' 
diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD
index 8aa2a3910..d5d102575 100644
--- a/community/pion/PKGBUILD
+++ b/community/pion/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=5.0.5
 pkgrel=1
 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
 url="https://github.com/cloudmeter/pion"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:Boost')
 depends=('boost-libs' 'openssl' 'log4cpp')
 makedepends=('boost')
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 4aa216d58..561fa5ca9 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=plan9port
 pkgver=20131024
 pkgrel=4
 pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://swtch.com/plan9port/'
 license=('custom')
 depends=('xorg-server' 'libxt' 'libxext' 'fuse')
diff --git a/community/plib/PKGBUILD b/community/plib/PKGBUILD
index 74d871b29..b612a359a 100644
--- a/community/plib/PKGBUILD
+++ b/community/plib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=plib
 pkgver=1.8.5
 pkgrel=4
 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/png2ico/PKGBUILD b/community/png2ico/PKGBUILD
index 7f43bcae4..b5e1f0df6 100644
--- a/community/png2ico/PKGBUILD
+++ b/community/png2ico/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=png2ico
 pkgver=20021208
 pkgrel=6
-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 f2b04d945..081da95f2 100644
--- a/community/podofo/PKGBUILD
+++ b/community/podofo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=podofo
 pkgver=0.9.2
 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=('openssl' 'libidn' 'lua51' 'fontconfig' 'libpng' 'libtiff')
diff --git a/community/poedit/PKGBUILD b/community/poedit/PKGBUILD
index a9673d1aa..fe8e29d3a 100644
--- a/community/poedit/PKGBUILD
+++ b/community/poedit/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=poedit
 pkgver=1.6.4
 pkgrel=2
 pkgdesc="Cross-platform gettext catalogs (.po files) editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.poedit.net/"
 license=('MIT')
 depends=('wxgtk' 'desktop-file-utils' 'lucene++' 'gtkspell')
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index afd1d9749..d6fe96e8e 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -10,7 +10,7 @@ _realname=PokerTH
 pkgver=1.1.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' 'gsasl' 'gnutls' 'protobuf'
diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD
index 144e4fe19..c4934c525 100644
--- a/community/polipo/PKGBUILD
+++ b/community/polipo/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=polipo
 pkgver=1.0.4.1
 pkgrel=10
 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=('bash')
diff --git a/community/polkit-gnome/PKGBUILD b/community/polkit-gnome/PKGBUILD
index 30bdf02f4..d5e4b2abc 100644
--- a/community/polkit-gnome/PKGBUILD
+++ b/community/polkit-gnome/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=polkit-gnome
 pkgver=0.105
 pkgrel=2
 pkgdesc="Legacy polkit authentication agent for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/polkit/"
 license=('LGPL')
 depends=('polkit' 'gtk3')
diff --git a/community/pork/PKGBUILD b/community/pork/PKGBUILD
index 44fa8776c..87c643a98 100644
--- a/community/pork/PKGBUILD
+++ b/community/pork/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pork
 pkgver=0.99.8.1
 pkgrel=7
 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 c8743a6f5..057403fcf 100644
--- a/community/portaudio/PKGBUILD
+++ b/community/portaudio/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=portaudio
 pkgver=19_20140130
 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=('gcc-libs' 'jack')
diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD
index 5f868c1fc..f3b5a4098 100644
--- a/community/postgis/PKGBUILD
+++ b/community/postgis/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=postgis
 pkgver=2.1.1
 pkgrel=1
 pkgdesc="Adds support for geographic objects to PostgreSQL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://postgis.net/"
 license=('GPL')
 depends=('postgresql' 'gdal' 'json-c')
diff --git a/community/pound/PKGBUILD b/community/pound/PKGBUILD
index 2f66f0892..717203c27 100644
--- a/community/pound/PKGBUILD
+++ b/community/pound/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pound
 pkgver=2.6
 pkgrel=6
 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/powerdns-recursor/PKGBUILD b/community/powerdns-recursor/PKGBUILD
index d8ee40a25..34f6d8b28 100644
--- a/community/powerdns-recursor/PKGBUILD
+++ b/community/powerdns-recursor/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='Resolving DNS server'
 url='https://www.powerdns.com/'
 license=('GPL')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 depends=('gcc-libs' 'lua51')
 makedepends=('boost')
 replaces=('pdns-recursor')
diff --git a/community/powerdns/PKGBUILD b/community/powerdns/PKGBUILD
index c64c34976..842decd4c 100644
--- a/community/powerdns/PKGBUILD
+++ b/community/powerdns/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=powerdns
 pkgver=3.3.1
 pkgrel=1
 pkgdesc='Authoritative DNS server'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.powerdns.com/'
 license=('GPL')
 depends=('boost-libs' 'gcc-libs' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua')
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index fe3b066ca..89cd26a3d 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=powertop
 pkgver=2.5
 pkgrel=1
 pkgdesc='A tool to diagnose issues with power consumption and power management'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://01.org/powertop/'
 license=('GPL2')
 depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils')
diff --git a/community/pppd-ldap-simple/PKGBUILD b/community/pppd-ldap-simple/PKGBUILD
index 8475f5810..bfb9451fb 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=6
 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 8a3a1bd05..db5d84eea 100644
--- a/community/pptpd/PKGBUILD
+++ b/community/pptpd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pptpd
 pkgver=1.3.4
 pkgrel=13
 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 3d97b9212..1e8f49b76 100644
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pragha
 pkgver=1.1.2.2
 pkgrel=2
 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-paranoia' 'gst-plugins-base'
@@ -47,4 +47,3 @@ package() {
 }
 
 # vim:ts=2:sw=2:expandtab
-
diff --git a/community/prelink/PKGBUILD b/community/prelink/PKGBUILD
index f50b40811..33b84d17c 100644
--- a/community/prelink/PKGBUILD
+++ b/community/prelink/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=prelink
 pkgver=20130503
 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')
@@ -19,7 +19,7 @@ sha1sums=('eff86cb26f0cc174486769527286cc388d5216b0'
 
 build() {
   cd ${pkgname}
-  ./configure --prefix=/usr --mandir=/usr/share/man --sbin=/usr/bin
+  ./configure --prefix=/usr --mandir=/usr/share/man --sbin=/usr/bin --build=$CHOST
   make
 }
 
diff --git a/community/premake/PKGBUILD b/community/premake/PKGBUILD
index 20b85f40e..7aef66f4b 100644
--- a/community/premake/PKGBUILD
+++ b/community/premake/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=premake
 pkgver=4.3
 pkgrel=3
 pkgdesc="A simple build configuration and project generation tool using lua"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://industriousone.com/premake"
 license=('BSD')
 provides=("premake4")
diff --git a/community/premake3/PKGBUILD b/community/premake3/PKGBUILD
index 12820716c..846091eed 100644
--- a/community/premake3/PKGBUILD
+++ b/community/premake3/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=premake3
 pkgver=3.7
 pkgrel=2
 pkgdesc="A simple build configuration and project generation tool using lua"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://premake.sourceforge.net"
 license=('GPL')
 makedepends=()
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index a016a0e67..da2bb0532 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=privoxy
 pkgver=3.0.21
 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 d72ce0b15..846b045f8 100644
--- a/community/procstatd/PKGBUILD
+++ b/community/procstatd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=procstatd
 pkgver=1.4.2
 pkgrel=8
 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 eefbc6b4d..b6ef035a8 100644
--- a/community/proj/PKGBUILD
+++ b/community/proj/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=proj
 pkgver=4.8.0
 pkgrel=3
 pkgdesc='Cartographic Projections library.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://trac.osgeo.org/proj/"
 license=('MIT')
 changelog=$pkgname.changelog
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index f1535a072..9440ce0f6 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=projectm
 pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-jack' 'projectm-qt' 'projectm-test')
 pkgver=2.1.0
 pkgrel=8
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
 makedepends=('mesa-libgl' 'qt4' 'cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext' 'pulseaudio' 'jack')
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index c1f4a60ff..359b55a6b 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=prosody
 pkgver=0.9.3
 pkgrel=2
 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=('lua51' 'lua51-socket' 'lua51-expat' 'lua51-filesystem' 'libidn'
diff --git a/community/protobuf/PKGBUILD b/community/protobuf/PKGBUILD
index 202d4439d..70f6977d9 100644
--- a/community/protobuf/PKGBUILD
+++ b/community/protobuf/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('protobuf' 'python2-protobuf')
 pkgver=2.5.0
 pkgrel=3
 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 5898ac43b..19eed56f3 100644
--- a/community/proxytunnel/PKGBUILD
+++ b/community/proxytunnel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=proxytunnel
 pkgver=1.9.0
 pkgrel=3
 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 df2457f63..df7698516 100644
--- a/community/psimedia/PKGBUILD
+++ b/community/psimedia/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=psimedia
 pkgver=1.0.3
 pkgrel=9
 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' 'qt4' 'gstreamer0.10-good-plugins'
diff --git a/community/psimedia/psimedia-1.0.3-glib.patch b/community/psimedia/psimedia-1.0.3-glib.patch
new file mode 100644
index 000000000..4d02058e2
--- /dev/null
+++ b/community/psimedia/psimedia-1.0.3-glib.patch
@@ -0,0 +1,44 @@
+--- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h	2009-01-16 16:59:25.000000000 -0500
++++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h	2012-12-27 04:13:38.548921262 -0500
+@@ -21,7 +21,7 @@
+ #ifndef PSI_GSTELEMENTS_H
+ #define PSI_GSTELEMENTS_H
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+--- psimedia-1.0.3.orig/gstprovider/gstthread.h	2008-11-24 22:56:15.000000000 -0500
++++ psimedia-1.0.3/gstprovider/gstthread.h	2012-12-27 04:15:19.216656784 -0500
+@@ -22,7 +22,7 @@
+ #define PSI_GSTTHREAD_H
+ 
+ #include <QThread>
+-#include <glib/gmain.h>
++#include <glib.h>
+ 
+ namespace PsiMedia {
+ 
+--- psimedia-1.0.3.orig/gstprovider/rwcontrol.h	2009-02-16 19:20:50.000000000 -0500
++++ psimedia-1.0.3/gstprovider/rwcontrol.h	2012-12-27 04:15:50.818833887 -0500
+@@ -28,7 +28,7 @@
+ #include <QMutex>
+ #include <QWaitCondition>
+ #include <QTimer>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include "psimediaprovider.h"
+ #include "rtpworker.h"
+ 
+--- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h	2009-01-16 13:09:25.000000000 -0500
++++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h	2012-12-27 04:16:49.326164945 -0500
+@@ -21,7 +21,7 @@
+ #ifndef GSTCUSTOMELEMENTS_H
+ #define GSTCUSTOMELEMENTS_H
+ 
+-#include <glib/gthread.h>
++#include <glib.h>
+ #include <gst/gst.h>
+ #include <gst/base/gstpushsrc.h>
+ #include <gst/video/video.h>
diff --git a/community/pspshrink/PKGBUILD b/community/pspshrink/PKGBUILD
index af5b54a16..655f4f8b8 100644
--- a/community/pspshrink/PKGBUILD
+++ b/community/pspshrink/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pspshrink
 pkgver=1.1.2
 pkgrel=3
 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 f95be3ecb..7aaef730d 100644
--- a/community/psqlodbc/PKGBUILD
+++ b/community/psqlodbc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=psqlodbc
 pkgver=09.02.0100
 pkgrel=1
 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/pstotext/PKGBUILD b/community/pstotext/PKGBUILD
index 7b9f890b8..5750f2301 100644
--- a/community/pstotext/PKGBUILD
+++ b/community/pstotext/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pstotext
 pkgver=1.9
 pkgrel=2
 pkgdesc="Converts Postscript to text"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cs.wisc.edu/~ghost/doc/pstotext.htm"
 license=('GPL')
 depends=('ghostscript')
diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index a46526035..b893946bd 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=puzzles
 pkgver=10098
 pkgrel=1
 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' 'subversion')
diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD
index 6a0082f15..2ef614ef3 100644
--- a/community/pv/PKGBUILD
+++ b/community/pv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pv
 pkgver=1.5.1
 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/pwgen/PKGBUILD b/community/pwgen/PKGBUILD
index 813ca7317..4587955d6 100644
--- a/community/pwgen/PKGBUILD
+++ b/community/pwgen/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pwgen
 pkgver=2.06
 pkgrel=4
 pkgdesc='Password generator for creating easily memorable passwords'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://sourceforge.net/projects/pwgen/'
 license=('GPL')
 depends=('glibc')
diff --git a/community/pwsafe/PKGBUILD b/community/pwsafe/PKGBUILD
index 2a4535a27..74fbd3a1e 100644
--- a/community/pwsafe/PKGBUILD
+++ b/community/pwsafe/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pwsafe
 pkgver=0.2.0
 pkgrel=8
 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')
@@ -21,7 +21,7 @@ build() {
   # Patch from fedora, fixes FS#28339
   patch -Np0 -i ../pwsafe-XChangeProperty.patch
 
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST
   make
 }
 
diff --git a/community/pygoocanvas/PKGBUILD b/community/pygoocanvas/PKGBUILD
index 71aefc8b2..831658afd 100644
--- a/community/pygoocanvas/PKGBUILD
+++ b/community/pygoocanvas/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pygoocanvas
 pkgver=0.14.1
 pkgrel=5
 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 c0a541b66..d8725b9d3 100644
--- a/community/pyid3lib/PKGBUILD
+++ b/community/pyid3lib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pyid3lib
 pkgver=0.5.1
 pkgrel=7
 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 85dd5173c..8bc98b85d 100644
--- a/community/pylibacl/PKGBUILD
+++ b/community/pylibacl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pylibacl
 pkgver=0.5.1
 pkgrel=1
 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.k1024.org/'
 license=('GPL')
 depends=('python2')
diff --git a/community/pymad/PKGBUILD b/community/pymad/PKGBUILD
index ace77f357..9ab61d3f2 100644
--- a/community/pymad/PKGBUILD
+++ b/community/pymad/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pymad
 pkgver=0.6
 pkgrel=4
 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/community/pympd/PKGBUILD b/community/pympd/PKGBUILD
index d83139b8c..b03b5b8e5 100644
--- a/community/pympd/PKGBUILD
+++ b/community/pympd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pympd
 pkgver=0.08.1
 pkgrel=3
 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')
diff --git a/community/pyogg/PKGBUILD b/community/pyogg/PKGBUILD
index 50eebb60e..b881ea888 100644
--- a/community/pyogg/PKGBUILD
+++ b/community/pyogg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pyogg
 pkgver=1.3
 pkgrel=7
 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 06e97709e..713b99f7b 100644
--- a/community/pypanel/PKGBUILD
+++ b/community/pypanel/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pypanel
 pkgver=2.4
 pkgrel=8
 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' 'python2-xlib' 'imlib2' 'libxft')
diff --git a/community/pysol-sound-server/PKGBUILD b/community/pysol-sound-server/PKGBUILD
index 05a3faafa..03e8170fe 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=8
 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 9176acf68..dddd0d129 100644
--- a/community/pystatgrab/PKGBUILD
+++ b/community/pystatgrab/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pystatgrab
 pkgver=0.5
 pkgrel=6
 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-basemap/PKGBUILD b/community/python-basemap/PKGBUILD
index 37fb61e06..9087f00ea 100644
--- a/community/python-basemap/PKGBUILD
+++ b/community/python-basemap/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=python-basemap
 pkgname=('python-basemap' 'python2-basemap' 'python-basemap-common')
 pkgver=1.0.7
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://matplotlib.org/basemap/"
 license=('custom')
 makedepends=('python2-numpy' 'python-numpy' 'geos' 'shapelib')
diff --git a/community/python-bsddb/PKGBUILD b/community/python-bsddb/PKGBUILD
index cd8409a94..6b20b88cf 100644
--- a/community/python-bsddb/PKGBUILD
+++ b/community/python-bsddb/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=6.0.0
 pkgrel=2
 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-setuptools' 'python-setuptools')
 source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz
diff --git a/community/python-cchardet/PKGBUILD b/community/python-cchardet/PKGBUILD
index 9c9267c91..6fc5a9444 100644
--- a/community/python-cchardet/PKGBUILD
+++ b/community/python-cchardet/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="Universal encoding detector faster than chardet."
 url="http://pypi.python.org/pypi/cchardet/"
 makedepends=('cython' 'cython2' 'python-setuptools' 'python2-setuptools')
 license=('MIT')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://pypi.python.org/packages/source/c/cchardet/cchardet-$pkgver.tar.gz)
 sha256sums=('51094c573d248a4908a968e75edd05bab136f10fcc8a70b87c8243b6d45731f8')
 
diff --git a/community/python-cx_freeze/PKGBUILD b/community/python-cx_freeze/PKGBUILD
index a2fe30c1f..a7ec30bf1 100644
--- a/community/python-cx_freeze/PKGBUILD
+++ b/community/python-cx_freeze/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('python-cx_freeze' 'python2-cx_freeze')
 pkgver=4.3.2
 pkgrel=1
 pkgdesc='Set of utilities for freezing Python scripts into executables'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://cx-freeze.sourceforge.net/'
 license=('PSF')
 makedepends=('python' 'python2')
diff --git a/community/python-gnupginterface/PKGBUILD b/community/python-gnupginterface/PKGBUILD
index 33446e9b3..76c705d4b 100644
--- a/community/python-gnupginterface/PKGBUILD
+++ b/community/python-gnupginterface/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-gnupginterface
 pkgver=0.3.2
 pkgrel=1
 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-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD
index fa82979c0..9a3ebeb83 100644
--- a/community/python-matplotlib/PKGBUILD
+++ b/community/python-matplotlib/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('python2-matplotlib' 'python-matplotlib')
 pkgver=1.3.1
 pkgrel=2
 pkgdesc="A python plotting library, making publication quality plots"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://matplotlib.org'
 license=('custom')
 makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt4' 'python-pytz' 'python-numpy'
diff --git a/community/python-numarray/PKGBUILD b/community/python-numarray/PKGBUILD
index 788f59063..9d0a41205 100644
--- a/community/python-numarray/PKGBUILD
+++ b/community/python-numarray/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python2-numarray
 pkgver=1.5.2
 pkgrel=6
 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-numexpr/PKGBUILD b/community/python-numexpr/PKGBUILD
index c8d884ee8..8c4c74de0 100644
--- a/community/python-numexpr/PKGBUILD
+++ b/community/python-numexpr/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.3
 pkgrel=1
 pkgdesc="Fast numerical array expression evaluator for Python, NumPy, PyTables, pandas"
 url="https://github.com/pydata/numexpr"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 makedepends=('python2-setuptools' 'python-setuptools' 'python-numpy' 'python2-numpy')
 source=(https://github.com/pydata/numexpr/archive/$pkgver.tar.gz)
diff --git a/community/python-openbabel/PKGBUILD b/community/python-openbabel/PKGBUILD
index a3a44b3a9..53b156bac 100644
--- a/community/python-openbabel/PKGBUILD
+++ b/community/python-openbabel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('python-openbabel' 'python2-openbabel')
 pkgver=2.3.2
 pkgrel=2
 pkgdesc='Python bindings for the openbabel library'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://openbabel.org/wiki/Python'
 license=('GPL')
 depends=('gcc-libs' "openbabel=${pkgver}" 'eigen2')
diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD
index e698d6a20..756956683 100644
--- a/community/python-pillow/PKGBUILD
+++ b/community/python-pillow/PKGBUILD
@@ -10,7 +10,7 @@ _appname=Pillow
 _py2basever=2.7
 _py3basever=3.3m
 pkgdesc="Python Imaging Library (PIL) fork. Python3 version."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://python-imaging.github.io/"
 license=('BSD')
 makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane')
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index 498ef4296..5fd1f3ef5 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=python-psutil
 pkgname=('python-psutil' 'python2-psutil')
 pkgver=1.2.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/psutil/'
 license=('custom: BSD')
 makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
diff --git a/community/python-psycopg1/PKGBUILD b/community/python-psycopg1/PKGBUILD
index 143034103..0267a6a14 100644
--- a/community/python-psycopg1/PKGBUILD
+++ b/community/python-psycopg1/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-psycopg1
 pkgver=1.1.21
 pkgrel=8
 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=('python2-egenix-mx-base' 'postgresql')
diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD
index 35181419b..f215da072 100644
--- a/community/python-psycopg2/PKGBUILD
+++ b/community/python-psycopg2/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('python-psycopg2' 'python2-psycopg2')
 pkgver=2.5.2
 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-pybox2d/PKGBUILD b/community/python-pybox2d/PKGBUILD
index e82a9703e..193f1b1e1 100644
--- a/community/python-pybox2d/PKGBUILD
+++ b/community/python-pybox2d/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=python-pybox2d
 pkgname=('python2-pybox2d')
 pkgver=370
 pkgrel=1
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/pybox2d'
 license=('GPL')
 makedepends=('subversion' 'python2' 'swig')
diff --git a/community/python-pygit2/PKGBUILD b/community/python-pygit2/PKGBUILD
index 13968cc59..35f81c8cc 100644
--- a/community/python-pygit2/PKGBUILD
+++ b/community/python-pygit2/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc='Python bindings for libgit2'
 url="https://github.com/libgit2/pygit2"
 depends=(libgit2)
 makedepends=(python python2)
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL2')
 source=(https://github.com/libgit2/pygit2/archive/v${pkgver}.tar.gz)
 md5sums=('3b8cba0ad69bcb2e1aa73d325dcdf53b')
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index cc7ccaece..d22d0a3df 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('python-pymongo' 'python2-pymongo')
 pkgver=2.6.3
 pkgrel=2
 pkgdesc='Python module for using MongoDB'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('APACHE')
 url='http://pypi.python.org/pypi/pymongo/'
 makedepends=('python-setuptools' 'python2-setuptools')
diff --git a/community/python-pyproj/PKGBUILD b/community/python-pyproj/PKGBUILD
index d0308d8a3..ed0fba2c4 100644
--- a/community/python-pyproj/PKGBUILD
+++ b/community/python-pyproj/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('python-pyproj' 'python2-pyproj')
 pkgver=1.9.3
 pkgrel=2
 pkgdesc="Python interfaces to PROJ.4 library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/pyproj"
 license=('custom')
 source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz)
diff --git a/community/python-pytables/PKGBUILD b/community/python-pytables/PKGBUILD
index abe919c77..fc5876a12 100644
--- a/community/python-pytables/PKGBUILD
+++ b/community/python-pytables/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=python-pytables
 pkgname=('python2-pytables' 'python-pytables')
 pkgver=3.1.0
 pkgrel=1
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 pkgdesc="A package for managing hierarchical datasets and designed to efficiently and easily cope with extremely large amounts of data"
 url="http://www.pytables.org"
 license=("BSD")
diff --git a/community/python-pyxattr/PKGBUILD b/community/python-pyxattr/PKGBUILD
index afad28f49..2ca0d6529 100644
--- a/community/python-pyxattr/PKGBUILD
+++ b/community/python-pyxattr/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=pyxattr
 pkgver=0.5.2
 pkgrel=1
 pkgdesc='A python extension module that allows you to manipulate the extended attributes.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://pyxattr.k1024.org/'
 license=('GPL')
 makedepends=('python2' 'python' 'python2-distribute' 'python-distribute')
diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD
index 0a466281d..f4c6385bb 100644
--- a/community/python-pyzmq/PKGBUILD
+++ b/community/python-pyzmq/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=(python2-pyzmq python-pyzmq)
 pkgver=14.0.1
 pkgrel=1
 pkgdesc="Python bindings for zeromq, written in Cython"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.zeromq.org/bindings:python"
 license=('LGPL')
 depends=(zeromq python)
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index e6ab4fe59..260ef4096 100644
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('python-scipy' 'python2-scipy')
 pkgver=0.13.3
 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' 'python-setuptools' 'python2-setuptools')
diff --git a/community/python-sfml/PKGBUILD b/community/python-sfml/PKGBUILD
index d334ded2e..8f99b14db 100644
--- a/community/python-sfml/PKGBUILD
+++ b/community/python-sfml/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=python-sfml
 pkgver=1.3
 pkgrel=2
 pkgdesc="The unofficial Python binding for SFML"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://python-sfml.org"
 license=('LGPL')
 depends=('sfml' 'python')
diff --git a/community/python-simplejson/PKGBUILD b/community/python-simplejson/PKGBUILD
index 5ec9486f2..ce91e686d 100644
--- a/community/python-simplejson/PKGBUILD
+++ b/community/python-simplejson/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=3.3.2
 pkgrel=1
 pkgdesc='Simple, fast, extensible JSON encoder/decoder for Python'
 license=('MIT')
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://undefined.org/python/#simplejson'
 makedepends=('python-setuptools' 'python2-setuptools')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}")
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index c94e0936f..32e2c6fa7 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=python-sqlalchemy
 pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
 pkgver=0.9.2
 pkgrel=1
-arch=('i686' 'x86_64') # python2 package contain .so
+arch=('i686' 'x86_64' 'mips64el') # python2 package contain .so
 url="http://www.sqlalchemy.org/"
 license=('custom: MIT')
 makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose')
diff --git a/community/python-yaml/PKGBUILD b/community/python-yaml/PKGBUILD
index c71d9e086..b6eb58be4 100644
--- a/community/python-yaml/PKGBUILD
+++ b/community/python-yaml/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(python2-yaml python-yaml)
 pkgver=3.10
 pkgrel=3
 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-cheetah/PKGBUILD b/community/python2-cheetah/PKGBUILD
index 1a9fb9000..2d7bfa92a 100644
--- a/community/python2-cheetah/PKGBUILD
+++ b/community/python2-cheetah/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-cheetah
 pkgver=2.4.4
 pkgrel=5
 pkgdesc="A Python-powered template engine and code generator"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.cheetahtemplate.org"
 license=(custom)
 depends=(python2 python2-markdown)
diff --git a/community/python2-cjson/PKGBUILD b/community/python2-cjson/PKGBUILD
index 2d95793a4..dc386069e 100644
--- a/community/python2-cjson/PKGBUILD
+++ b/community/python2-cjson/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=python2-cjson
 pkgver=1.0.5
 pkgrel=5
-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/python2-fonttools/PKGBUILD b/community/python2-fonttools/PKGBUILD
index 0f8910cbd..bfdcc4a71 100644
--- a/community/python2-fonttools/PKGBUILD
+++ b/community/python2-fonttools/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Converts OpenType and TrueType fonts to and from XML"
 url="http://sourceforge.net/projects/fonttools/"
 license=("BSD")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=("python2-numpy")
 makedepends=("python2-setuptools")
 provides=('fonttools') # temporary compatibility because of rename
diff --git a/community/python2-fuse/PKGBUILD b/community/python2-fuse/PKGBUILD
index ef79aceef..a94045b45 100644
--- a/community/python2-fuse/PKGBUILD
+++ b/community/python2-fuse/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=python2-fuse
 pkgver=0.2.1
 pkgrel=4
-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/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD
index 0d3e97324..fdc763e87 100644
--- a/community/python2-gnutls/PKGBUILD
+++ b/community/python2-gnutls/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python2-gnutls
 pkgver=1.2.5
 pkgrel=4
 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' 'libgcrypt')
 license=('LGPL')
diff --git a/community/python2-lcms/PKGBUILD b/community/python2-lcms/PKGBUILD
index 6a19b5cba..f8c320775 100644
--- a/community/python2-lcms/PKGBUILD
+++ b/community/python2-lcms/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.19
 _mver=1.19
 pkgrel=5
 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/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD
index b3e9a8209..e2801f4a7 100644
--- a/community/python2-ldap/PKGBUILD
+++ b/community/python2-ldap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-ldap
 pkgver=2.4.14
 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-m2crypto/PKGBUILD b/community/python2-m2crypto/PKGBUILD
index e3d68981f..183e4ebfb 100644
--- a/community/python2-m2crypto/PKGBUILD
+++ b/community/python2-m2crypto/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python2-m2crypto
 pkgver=0.22.3
 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/community/python2-nautilus/PKGBUILD b/community/python2-nautilus/PKGBUILD
index 931ff9040..61cd1be28 100644
--- a/community/python2-nautilus/PKGBUILD
+++ b/community/python2-nautilus/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=nautilus-python
 pkgver=1.1
 pkgrel=4
 pkgdesc="Python bindings for the Nautilus Extension API"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.gnome.org/nautilus-python/"
 license=('GPL')
 depends=('nautilus' 'python2-gobject')
diff --git a/community/python2-netifaces/PKGBUILD b/community/python2-netifaces/PKGBUILD
index daad6408f..fa8d1cf78 100644
--- a/community/python2-netifaces/PKGBUILD
+++ b/community/python2-netifaces/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python2-netifaces
 pkgver=0.8
 pkgrel=2
 pkgdesc="Portable module to access network interface information in Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://alastairs-place.net/netifaces/"
 license=('MIT')
 depends=('python2')
diff --git a/community/python2-poppler/PKGBUILD b/community/python2-poppler/PKGBUILD
index a660496d6..b262c2381 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-pycdio/PKGBUILD b/community/python2-pycdio/PKGBUILD
index 08a2f83e0..821cbb5cb 100644
--- a/community/python2-pycdio/PKGBUILD
+++ b/community/python2-pycdio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-pycdio
 pkgver=0.20
 pkgrel=2
 pkgdesc="Python OO interface to libcdio (CD Input and Control library)"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 url="http://pypi.python.org/pypi/pycdio/"
 license=('GPL')
 depends=('python2' 'libcdio')
diff --git a/community/python2-pychm/PKGBUILD b/community/python2-pychm/PKGBUILD
index 3b53d9005..c7c4b06ba 100644
--- a/community/python2-pychm/PKGBUILD
+++ b/community/python2-pychm/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=python2-pychm
 pkgver=0.8.4
 pkgrel=1
 pkgdesc="Python bindings for chmlib"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://gnochm.sourceforge.net/"
 license=('GPL')
 depends=('chmlib' 'python2')
diff --git a/community/python2-pysqlite-legacy/PKGBUILD b/community/python2-pysqlite-legacy/PKGBUILD
index 9c5ed703d..8c23cc599 100644
--- a/community/python2-pysqlite-legacy/PKGBUILD
+++ b/community/python2-pysqlite-legacy/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python2-pysqlite-legacy
 pkgver=1.0.1
 pkgrel=2
 pkgdesc='Python DB-API 2.0 interface for the legacy SQLite 2'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://initd.org/tracker/pysqlite'
 replaces=('python-pysqlite-legacy')
 license=('custom')
diff --git a/community/python2-pyxmpp/PKGBUILD b/community/python2-pyxmpp/PKGBUILD
index e1aa144d0..4f7cafa79 100644
--- a/community/python2-pyxmpp/PKGBUILD
+++ b/community/python2-pyxmpp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-pyxmpp
 pkgver=1.1.2
 pkgrel=3
 pkgdesc='Python XMPP and Jabber implementation based on libxml2'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://pyxmpp.jajcus.net/'
 license=('LGPL')
 depends=('python2-dnspython' 'libxml2' 'python2-m2crypto')
diff --git a/community/python2-tagpy/PKGBUILD b/community/python2-tagpy/PKGBUILD
index ff892dc15..52301e348 100644
--- a/community/python2-tagpy/PKGBUILD
+++ b/community/python2-tagpy/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=python2-tagpy
 pkgver=2013.1
 pkgrel=1
 pkgdesc='Python bindings for TagLib'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://pypi.python.org/pypi/tagpy'
 license=('MIT')
 depends=('python2' 'taglib' 'boost-libs')
diff --git a/community/python2-traits/PKGBUILD b/community/python2-traits/PKGBUILD
index b29d31cf1..9cf16a528 100644
--- a/community/python2-traits/PKGBUILD
+++ b/community/python2-traits/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=python2-traits
 pkgver=4.4.0
 pkgrel=1
 pkgdesc="Explicitly typed attributes for Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/enthought/traits"
 license=('BSD')
 depends=('python2-numpy')
diff --git a/community/python2-vorbissimple/PKGBUILD b/community/python2-vorbissimple/PKGBUILD
index ba0a8be63..8af21e504 100644
--- a/community/python2-vorbissimple/PKGBUILD
+++ b/community/python2-vorbissimple/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-vorbissimple
 pkgver=0.0.2
 pkgrel=6
 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/python2-xapian/PKGBUILD b/community/python2-xapian/PKGBUILD
index 2b3a0b85d..00542c856 100644
--- a/community/python2-xapian/PKGBUILD
+++ b/community/python2-xapian/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.2.17
 epoch=1
 pkgrel=1
 pkgdesc="Python bindings for Xapian"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://xapian.org/docs/bindings/python/"
 license=('GPL')
 depends=('python2' "xapian-core=$epoch:$pkgver")
diff --git a/community/pyvorbis/PKGBUILD b/community/pyvorbis/PKGBUILD
index 6e5de6442..44d6edd11 100644
--- a/community/pyvorbis/PKGBUILD
+++ b/community/pyvorbis/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.4
 pkgrel=6
 pkgdesc="Python vorbis wrapper library"
 url="http://ekyo.nerim.net/software/pyogg/index.html" 
-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/pyzy/PKGBUILD b/community/pyzy/PKGBUILD
index 164366810..090fc75fb 100644
--- a/community/pyzy/PKGBUILD
+++ b/community/pyzy/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.0
 _commit="d7747466562cb8b4bc2934708e29b7643c7bedbc"
 pkgrel=1
 pkgdesc='The Chinese PinYin and Bopomofo conversion library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/pyzy/pyzy'
 license=('LGPL')
 depends=('glib2' 'sqlite' 'util-linux')
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 0ffb49aa0..9c924cdcb 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=qcad
 pkgver=3.4.6.0
 pkgrel=1
 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=('GPL3')
 depends=('qtwebkit')
diff --git a/community/qconf/PKGBUILD b/community/qconf/PKGBUILD
index 2b21bc710..27388dbf7 100644
--- a/community/qconf/PKGBUILD
+++ b/community/qconf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qconf
 pkgver=1.4
 pkgrel=3
 pkgdesc="QConf allows you to have a nice configure script for your qmake-based project."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://delta.affinix.com/qconf/"
 license=('GPL')
 depends=('qt4')
diff --git a/community/qgit/PKGBUILD b/community/qgit/PKGBUILD
index 461f220d0..b7d170b3d 100644
--- a/community/qgit/PKGBUILD
+++ b/community/qgit/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.5
 pkgrel=1
 pkgdesc="A GIT GUI viewer built on Qt/C++"
 url='http://libre.tibirna.org/projects/qgit/wiki/QGit'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('qt4' 'git')
 source=("http://libre.tibirna.org/attachments/download/9/${pkgname}-${pkgver}.tar.gz"
diff --git a/community/qgo/PKGBUILD b/community/qgo/PKGBUILD
index f58924985..e642d9589 100644
--- a/community/qgo/PKGBUILD
+++ b/community/qgo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qgo
 pkgver=2.0.0.dda95c9
 pkgrel=1
 pkgdesc='Go client and full featured SGF editor'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://qgo.sourceforge.net/"
 license=('GPL')
 depends=('qt5-multimedia' 'qt5-tools' 'libsm' 'desktop-file-utils'
diff --git a/community/qiv/PKGBUILD b/community/qiv/PKGBUILD
index 80772b1db..114544c59 100644
--- a/community/qiv/PKGBUILD
+++ b/community/qiv/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qiv
 pkgver=2.3.1
 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' 'libexif' 'lcms2' 'desktop-file-utils')
diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD
index 1cacf37df..e04cc3a2c 100644
--- a/community/qlandkartegt/PKGBUILD
+++ b/community/qlandkartegt/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qlandkartegt
 pkgver=1.7.6
 pkgrel=1
 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' 'libmariadbclient' 'glu' 'postgresql-libs'
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 85632d717..66f70dc5b 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qmmp
 pkgver=0.7.5
 pkgrel=1
 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'  'qt4' 'taglib' 'xdg-utils')
diff --git a/community/qmpdclient/PKGBUILD b/community/qmpdclient/PKGBUILD
index f5b4eb9b7..4cbf5dfd4 100644
--- a/community/qmpdclient/PKGBUILD
+++ b/community/qmpdclient/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qmpdclient
 pkgver=1.2.2
 pkgrel=3
 pkgdesc="A Qt4 client for MPD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bitcheese.net/wiki/QMPDClient"
 license=('GPL')
 depends=('qt4')
diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD
index 7a634e977..d6da32d5b 100644
--- a/community/qps/PKGBUILD
+++ b/community/qps/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'."
 url="http://qps.kldp.net/projects/qps"
 depends=('qt4')
-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 a3d0b2f9f..7a34262ed 100644
--- a/community/qpxtool/PKGBUILD
+++ b/community/qpxtool/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qpxtool
 pkgver=0.7.2
 pkgrel=4
 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=('qt4')
diff --git a/community/qstardict/PKGBUILD b/community/qstardict/PKGBUILD
index 79fce59b2..93f725f35 100644
--- a/community/qstardict/PKGBUILD
+++ b/community/qstardict/PKGBUILD
@@ -8,12 +8,14 @@ pkgver=1.0.1
 pkgrel=3
 depends=('qt4')
 makedepends=('cmake' 'automoc4' 'kdelibs')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qstardict.ylsoftware.com/index.php"
 license=('GPL2')
 changelog=$pkgname.changelog
-source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b778ace65a22e5b9724d687ad90c77ec98feb2671774f73cd51725ec7b59e62f')
+source=(http://qstardict.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2
+	qstardict-1.0.1-glib.patch)
+sha256sums=('b778ace65a22e5b9724d687ad90c77ec98feb2671774f73cd51725ec7b59e62f'
+	    '30878282698dc90bf615ca383f4c01357ce49dfcdddd12c2e0b113ee51822c57')
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
diff --git a/community/qstardict/qstardict-1.0.1-glib.patch b/community/qstardict/qstardict-1.0.1-glib.patch
new file mode 100644
index 000000000..9b163a025
--- /dev/null
+++ b/community/qstardict/qstardict-1.0.1-glib.patch
@@ -0,0 +1,12 @@
+--- qstardict-1.0.1.orig/plugins/stardict/stardict.cpp	2011-12-05 07:40:49.000000000 -0500
++++ qstardict-1.0.1/plugins/stardict/stardict.cpp	2012-12-28 18:52:39.636340322 -0500
+@@ -28,8 +28,7 @@
+ #include <QFile>
+ #include <QSettings>
+ #include <QStack>
+-#include <glib/gmem.h>
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "lib.h"
+ #include "file.hpp"
+ #include "settingsdialog.h"
diff --git a/community/qsvn/PKGBUILD b/community/qsvn/PKGBUILD
index 54fb45af7..b9afa3fac 100644
--- a/community/qsvn/PKGBUILD
+++ b/community/qsvn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qsvn
 pkgver=0.8.3
 pkgrel=4
 pkgdesc="Qt4 GUI for Subversion."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.anrichter.net/projects/qsvn/"
 license=('GPL')
 depends=('qt4' 'subversion')
diff --git a/community/qsynergy/PKGBUILD b/community/qsynergy/PKGBUILD
index 0c187bdd6..1e6262bb0 100644
--- a/community/qsynergy/PKGBUILD
+++ b/community/qsynergy/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="Qt gui for Synergy which lets you remotely control other computers."
 url="http://www.volker-lanz.de/en/software/qsynergy/"
 license=(GPL)
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qt4' 'synergy')
 source=("http://sourceforge.net/projects/$pkgname/files/$pkgver/$pkgname-$pkgver.tar.gz")
 md5sums=('17d8989668016185b859332aacf9e7df')
diff --git a/community/qt-recordmydesktop/PKGBUILD b/community/qt-recordmydesktop/PKGBUILD
index b6d14a579..821b9cb4a 100644
--- a/community/qt-recordmydesktop/PKGBUILD
+++ b/community/qt-recordmydesktop/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=qt-recordmydesktop
 pkgver=0.3.8
 pkgrel=7
 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-pyqt' 'xorg-xwininfo')
diff --git a/community/qt4pas/PKGBUILD b/community/qt4pas/PKGBUILD
index 809ff86e9..788af3ce2 100644
--- a/community/qt4pas/PKGBUILD
+++ b/community/qt4pas/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qt4pas
 pkgver=2.5
 pkgrel=3
 pkgdesc="Free Pascal Qt4 Binding Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://users.telenet.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html"
 license=('LGPL')
 depends=('qtwebkit')
diff --git a/community/qtemu/PKGBUILD b/community/qtemu/PKGBUILD
index 75e6fd54e..4c6d6e44f 100644
--- a/community/qtemu/PKGBUILD
+++ b/community/qtemu/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=8
 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' 'qt4')
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
diff --git a/community/qtfm/PKGBUILD b/community/qtfm/PKGBUILD
index 2b43d1c7e..75c0e3368 100644
--- a/community/qtfm/PKGBUILD
+++ b/community/qtfm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=qtfm
 pkgver=5.9
 pkgrel=1
 pkgdesc="A lightweight file manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qt-apps.org/content/show.php/QtFM?content=158787"
 license=('GPL')
 depends=('file' 'qt5-base' 'desktop-file-utils')
diff --git a/community/qtmpc/PKGBUILD b/community/qtmpc/PKGBUILD
index 4755f681e..b83e73cb3 100644
--- a/community/qtmpc/PKGBUILD
+++ b/community/qtmpc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qtmpc
 pkgver=0.6.1
 pkgrel=3
 pkgdesc="Qt4-based front-end for MPD"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qtmpc.lowblog.nl/"
 license=('GPL')
 depends=('kdebase-runtime')
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index 3d4452d35..4e78d67ec 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qtractor
 pkgver=0.5.12
 pkgrel=2
 pkgdesc="Audio/MIDI multitrack sequencer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qtractor.sourceforge.net/"
 license=('GPL')
 depends=('qt4' 'suil' 'lilv' 'libmad' 'liblo>=0.28'
diff --git a/community/qtscrobbler/PKGBUILD b/community/qtscrobbler/PKGBUILD
index 804a797ea..efe63438f 100644
--- a/community/qtscrobbler/PKGBUILD
+++ b/community/qtscrobbler/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qtscrobbler
 pkgver=0.11
 pkgrel=4
 pkgdesc="Submit .scrobbler.log from portable players to Last.fm and Libre.fm"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qtscrob.sourceforge.net/"
 license=('GPL')
 depends=('libmtp' 'qt4')
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index e887e56ce..a110b8b7e 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=quagga
 pkgver=0.99.22.4
 pkgrel=3
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.quagga.net'
 license=('GPL2')
 depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD
index 7833c5f1d..290a3aa11 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('quassel-client' 'quassel-core')
 pkgver=0.9.1
 pkgrel=3
 pkgdesc="QT4 irc client with a separated core"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://quassel-irc.org/"
 license=('GPL')
 makedepends=('cmake' 'automoc4' 'qt4' 'icu' 'kdelibs')
diff --git a/community/qucs/PKGBUILD b/community/qucs/PKGBUILD
index e1f56cdc1..d43c09d04 100644
--- a/community/qucs/PKGBUILD
+++ b/community/qucs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qucs
 pkgver=0.0.17
 pkgrel=2
 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=('gcc-libs' 'qt4')
diff --git a/community/quesoglc/PKGBUILD b/community/quesoglc/PKGBUILD
index 79511d801..bd149df59 100644
--- a/community/quesoglc/PKGBUILD
+++ b/community/quesoglc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=quesoglc
 pkgver=0.7.2
 pkgrel=3
 pkgdesc="A free implementation of the OpenGL Character Renderer (GLC)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://quesoglc.sourceforge.net/"
 license=('LGPL2.1')
 depends=('fontconfig' 'freeglut' 'fribidi' 'glew')
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index 5c399cd97..b0f7c2f39 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=quvi
 pkgver=0.9.5
 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=('AGPL3')
 depends=('libquvi' 'libxml2' 'json-glib')
diff --git a/community/radeontool/PKGBUILD b/community/radeontool/PKGBUILD
index 974ffc8fc..4842a5ea7 100644
--- a/community/radeontool/PKGBUILD
+++ b/community/radeontool/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.6.3
 pkgrel=1
 pkgdesc="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 408f7dae9..7a9e95b0e 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc='IPv6 Router Advertisement Daemon'
 url='http://www.litech.org/radvd/'
 license=('custom')
 depends=('glibc' 'libdaemon')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 backup=('etc/radvd.conf')
 source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.xz"{,.asc}
         "$pkgname.service")
diff --git a/community/ragel/PKGBUILD b/community/ragel/PKGBUILD
index 3d40c9ec9..12bfb4ef3 100644
--- a/community/ragel/PKGBUILD
+++ b/community/ragel/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=ragel
 pkgver=6.8
 pkgrel=1
 pkgdesc="Compiles finite state machines from regular languages into executable C, C++, Objective-C, or D code."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.complang.org/ragel/"
 license=('GPL')
 depends=('gcc-libs')
@@ -19,7 +19,6 @@ md5sums=('1bb39745ac23da449019f9f2cb4b0d01')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
   ./configure --prefix=/usr
   make
 }
diff --git a/community/ragel/ragel-6.7-gcc-4.7.patch b/community/ragel/ragel-6.7-gcc-4.7.patch
new file mode 100644
index 000000000..6837280d8
--- /dev/null
+++ b/community/ragel/ragel-6.7-gcc-4.7.patch
@@ -0,0 +1,143 @@
+--- ragel-6.7.orig/aapl/avlcommon.h	2011-02-10 23:14:44.000000000 -0500
++++ ragel-6.7/aapl/avlcommon.h	2012-12-30 00:53:33.879074778 -0500
+@@ -881,9 +881,9 @@
+ 		}
+ 
+ #ifdef AVL_BASIC
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ #else
+-		keyRelation = compare( element->BASEKEY(getKey()), 
++		keyRelation = this->compare( element->BASEKEY(getKey()), 
+ 				curEl->BASEKEY(getKey()) );
+ #endif
+ 
+@@ -920,7 +920,7 @@
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( *element, *curEl );
++		keyRelation = this->compare( *element, *curEl );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+@@ -969,7 +969,7 @@
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1023,7 +1023,7 @@
+ 			return element;
+ 		}
+ 
+-		keyRelation = compare(key, curEl->getKey());
++		keyRelation = this->compare(key, curEl->getKey());
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 ) {
+@@ -1058,7 +1058,7 @@
+ 	long keyRelation;
+ 
+ 	while (curEl) {
+-		keyRelation = compare( key, curEl->BASEKEY(getKey()) );
++		keyRelation = this->compare( key, curEl->BASEKEY(getKey()) );
+ 
+ 		/* Do we go left? */
+ 		if ( keyRelation < 0 )
+--- ragel-6.7.orig/aapl/bstcommon.h	2011-02-10 23:14:44.000000000 -0500
++++ ragel-6.7/aapl/bstcommon.h	2012-12-30 00:56:22.903385157 -0500
+@@ -361,7 +361,7 @@
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -373,12 +373,12 @@
+ 
+ 			lower = mid - 1;
+ 			while ( lower != lowEnd && 
+-					compare(key, GET_KEY(*lower)) == 0 )
++					this->compare(key, GET_KEY(*lower)) == 0 )
+ 				lower--;
+ 
+ 			upper = mid + 1;
+ 			while ( upper != highEnd && 
+-					compare(key, GET_KEY(*upper)) == 0 )
++					this->compare(key, GET_KEY(*upper)) == 0 )
+ 				upper++;
+ 			
+ 			low = (Element*)lower + 1;
+@@ -419,7 +419,7 @@
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -457,7 +457,7 @@
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -508,7 +508,7 @@
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(key, GET_KEY(*mid));
++		keyRelation = this->compare(key, GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -603,7 +603,7 @@
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+@@ -662,7 +662,7 @@
+ 		}
+ 
+ 		mid = lower + ((upper-lower)>>1);
+-		keyRelation = compare(GET_KEY(el), GET_KEY(*mid));
++		keyRelation = this->compare(GET_KEY(el), GET_KEY(*mid));
+ 
+ 		if ( keyRelation < 0 )
+ 			upper = mid - 1;
+--- ragel-6.7.orig/aapl/mergesort.h	2011-02-10 23:14:44.000000000 -0500
++++ ragel-6.7/aapl/mergesort.h	2012-12-30 00:57:00.423165601 -0500
+@@ -110,7 +110,7 @@
+ 		}
+ 		else {
+ 			/* Both upper and lower left. */
+-			if ( compare(*lower, *upper) <= 0 )
++			if ( this->compare(*lower, *upper) <= 0 )
+ 				memcpy( dest++, lower++, sizeof(T) );
+ 			else
+ 				memcpy( dest++, upper++, sizeof(T) );
+--- ragel-6.7.orig/aapl/bubblesort.h	2011-02-10 23:14:44.000000000 -0500
++++ ragel-6.7/aapl/bubblesort.h	2012-12-30 00:58:36.667806744 -0500
+@@ -72,7 +72,7 @@
+ 		changed = false;
+ 		for ( long i = 0; i < len-pass; i++ ) {
+ 			/* Do we swap pos with the next one? */
+-			if ( compare( data[i], data[i+1] ) > 0 ) {
++			if ( this->compare( data[i], data[i+1] ) > 0 ) {
+ 				char tmp[sizeof(T)];
+ 
+ 				/* Swap the two items. */
diff --git a/community/rapidsvn/PKGBUILD b/community/rapidsvn/PKGBUILD
index 22bcb0eb5..055f617a0 100644
--- a/community/rapidsvn/PKGBUILD
+++ b/community/rapidsvn/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.12.1
 pkgrel=6
 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')
 depends=('subversion' 'wxgtk2.8')
 makedepends=('python2' 'automake' 'libtool')
diff --git a/community/ratpoison/PKGBUILD b/community/ratpoison/PKGBUILD
index 77de302ee..ad4de8c21 100644
--- a/community/ratpoison/PKGBUILD
+++ b/community/ratpoison/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ratpoison
 pkgver=1.4.6
 pkgrel=2
 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/community/raul/PKGBUILD b/community/raul/PKGBUILD
index ad603272e..7f015fc87 100644
--- a/community/raul/PKGBUILD
+++ b/community/raul/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=raul
 pkgver=0.8.0
 pkgrel=3
 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 f39902b93..b256019d4 100644
--- a/community/rawstudio/PKGBUILD
+++ b/community/rawstudio/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=rawstudio
 pkgver=2.0
 pkgrel=11
 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=('gconf' 'lcms' 'exiv2' 'fftw' 'lensfun' 'flickcurl' 'sqlite'
diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD
index affb09d7e..2c39d7c01 100644
--- a/community/rawtherapee/PKGBUILD
+++ b/community/rawtherapee/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=4.0.12
 pkgrel=1
 epoch=1
 pkgdesc="RAW photo editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rawtherapee.com/"
 license=('GPL3')
 depends=('fftw' 'gtkmm' 'libcanberra' 'libiptcdata' 'lcms2' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/community/rblcheck/PKGBUILD b/community/rblcheck/PKGBUILD
index d879b6c23..da4c32b3f 100644
--- a/community/rblcheck/PKGBUILD
+++ b/community/rblcheck/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rblcheck
 pkgver=1.5
 pkgrel=1
 pkgdesc='Tool to Query RBL Servers'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://rblcheck.sourceforge.net/'
 license=('GPL2')
 depends=('glibc' 'bash')
diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD
index 83cd61e2d..c6bf0ea4a 100755
--- a/community/rbutil/PKGBUILD
+++ b/community/rbutil/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rbutil
 pkgver=1.4.0
 pkgrel=1
 pkgdesc="Rockbox Utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility"
 license=("GPL")
 depends=('qt5-base' 'libusbx')
diff --git a/community/rdiff-backup/PKGBUILD b/community/rdiff-backup/PKGBUILD
index 3a25addab..03b1ed6f8 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 42d8fe7af..181b61d75 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=recoll
 pkgver=1.19.11_p1
 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' 'qt4' 'openssl' 'hicolor-icon-theme' 'qtwebkit')
diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD
index d22a145d8..f9bc87caf 100644
--- a/community/recorditnow/PKGBUILD
+++ b/community/recorditnow/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=recorditnow
 pkgver=0.8.1
 pkgrel=7
 pkgdesc="A plugin based desktop recorder for KDE SC 4"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kde-apps.org/content/show.php/RecordItNow?content=114610"
 license=('GPL')
 depends=('kdebase-runtime' 'ffmpeg' 'xdg-utils')
diff --git a/community/recordmydesktop/PKGBUILD b/community/recordmydesktop/PKGBUILD
index 67defa2f8..a12e006bc 100644
--- a/community/recordmydesktop/PKGBUILD
+++ b/community/recordmydesktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=recordmydesktop
 pkgver=0.3.8.1
 pkgrel=6
 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 adedc4f9b..b4ea70aac 100644
--- a/community/recoverdm/PKGBUILD
+++ b/community/recoverdm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=recoverdm
 pkgver=0.20
 pkgrel=3
 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 91b4112fc..67c403c8a 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=redis
 pkgver=2.8.6
 pkgrel=1
 pkgdesc="Advanced key-value store"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://redis.io/"
 license=('BSD')
 depends=('bash')
diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD
index d75a6c2c2..d108ac275 100644
--- a/community/redshift/PKGBUILD
+++ b/community/redshift/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=redshift
 pkgver=1.8
 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' 'geoclue' 'libxxf86vm')
diff --git a/community/regexxer/PKGBUILD b/community/regexxer/PKGBUILD
index c570f654d..9beef2635 100644
--- a/community/regexxer/PKGBUILD
+++ b/community/regexxer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=regexxer
 pkgver=0.10
 pkgrel=3
 pkgdesc="Interactive search and replace tool for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://regexxer.sourceforge.net/"
 license=('GPL')
 depends=('gtksourceviewmm' 'dconf' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index 03f7a2cdb..962c1c5b8 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rekonq
 pkgver=2.4.2
 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' 'qoauth')
diff --git a/community/remind/PKGBUILD b/community/remind/PKGBUILD
index f9e115477..67eac4915 100644
--- a/community/remind/PKGBUILD
+++ b/community/remind/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=remind
 pkgver=3.01.13
 pkgrel=2
 pkgdesc='A sophisticated calendar and alarm program.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.roaringpenguin.com/penguin/open_source_remind.php'
 license=('GPL')
 optdepends=('tk: for tkremind'
diff --git a/community/remmina/PKGBUILD b/community/remmina/PKGBUILD
index 534505c15..17b881c1a 100644
--- a/community/remmina/PKGBUILD
+++ b/community/remmina/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=remmina
 pkgver=1.0.0
 pkgrel=11
 pkgdesc="remote desktop client written in GTK+"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://remmina.sourceforge.net/"
 license=('GPL')
 depends=('gtk3' 'zlib' 'libjpeg' 'libssh' 'libunique' 'avahi' 'vte3' 'libgcrypt' 'libxdmcp')
diff --git a/community/renameutils/PKGBUILD b/community/renameutils/PKGBUILD
index 143afa37b..38e6b1c3a 100644
--- a/community/renameutils/PKGBUILD
+++ b/community/renameutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=renameutils
 pkgver=0.12.0
 pkgrel=2
 pkgdesc="A set of programs designed to make renaming of files faster and less cumbersome"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nongnu.org/renameutils/"
 license=('GPL')
 depends=('readline')
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 522ad146b..896d1f8ac 100644
--- a/community/ripperx/PKGBUILD
+++ b/community/ripperx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ripperx
 pkgver=2.7.3
 pkgrel=5
 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/ristretto/PKGBUILD b/community/ristretto/PKGBUILD
index 4dfed59fa..891dc948b 100644
--- a/community/ristretto/PKGBUILD
+++ b/community/ristretto/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ristretto
 pkgver=0.6.3
 pkgrel=3
 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' 'desktop-file-utils')
diff --git a/community/rlog/PKGBUILD b/community/rlog/PKGBUILD
index 95e7e58ad..259168a6f 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 3cef5ba91..a9318c5b3 100644
--- a/community/rlwrap/PKGBUILD
+++ b/community/rlwrap/PKGBUILD
@@ -7,9 +7,9 @@
 
 pkgname=rlwrap
 pkgver=0.37
-pkgrel=2
+pkgrel=2.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=('perl')
diff --git a/community/rng-tools/PKGBUILD b/community/rng-tools/PKGBUILD
index a149da819..2b5d8b91e 100644
--- a/community/rng-tools/PKGBUILD
+++ b/community/rng-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rng-tools
 pkgver=4
 pkgrel=2
 pkgdesc="Random number generator related utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/gkernel/"
 license=('GPL')
 depends=('glibc')
diff --git a/community/rocksndiamonds/PKGBUILD b/community/rocksndiamonds/PKGBUILD
index ab4ed1842..09d815b44 100644
--- a/community/rocksndiamonds/PKGBUILD
+++ b/community/rocksndiamonds/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rocksndiamonds
 pkgver=3.3.1.1
 pkgrel=2
 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')
diff --git a/community/rogue/PKGBUILD b/community/rogue/PKGBUILD
index 76ce5bb6a..453bed75b 100644
--- a/community/rogue/PKGBUILD
+++ b/community/rogue/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=rogue
 pkgver=5.4.4
 pkgrel=3
 pkgdesc="The original dungeon crawl game."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://rogue.rogueforge.net/rogue-5-4/"
 license=('custom')
 depends=('ncurses')
diff --git a/community/rote/PKGBUILD b/community/rote/PKGBUILD
index f824f1152..d08bc70a4 100644
--- a/community/rote/PKGBUILD
+++ b/community/rote/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rote
 pkgver=0.2.8
 pkgrel=3
 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/rox/PKGBUILD b/community/rox/PKGBUILD
index 2c30f6257..84ec1c785 100644
--- a/community/rox/PKGBUILD
+++ b/community/rox/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=rox
 pkgver=2.11
-pkgrel=1
+pkgrel=1.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/community/roxterm/PKGBUILD b/community/roxterm/PKGBUILD
index a9caa0df2..63e0eaabf 100644
--- a/community/roxterm/PKGBUILD
+++ b/community/roxterm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=roxterm
 pkgver=2.8.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 a119319de..c595e6c81 100644
--- a/community/rpc2/PKGBUILD
+++ b/community/rpc2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rpc2
 pkgver=2.10
 pkgrel=4
 pkgdesc="Remote procedure call package for IP/UDP"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.coda.cs.cmu.edu"
 license=("LGPL")
 depends=('lwp' 'readline')
diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD
index c77f278dc..d5a9fb56c 100644
--- a/community/rss-glx/PKGBUILD
+++ b/community/rss-glx/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rss-glx
 pkgver=0.9.1
 pkgrel=17
 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' 'glu')
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 9e0fe100c..cea367ff1 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=7.6.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' 'json-c' 'systemd' 'liblogging')
 makedepends=('postgresql-libs>=8.4.1' 'libmariadbclient' 'net-snmp' 'gnutls'
diff --git a/community/rtorrent/PKGBUILD b/community/rtorrent/PKGBUILD
index 010020527..a9c30ac5c 100644
--- a/community/rtorrent/PKGBUILD
+++ b/community/rtorrent/PKGBUILD
@@ -9,7 +9,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.13.3' 'curl' 'xmlrpc-c' 'libsigc++')
 source=("http://libtorrent.rakshasa.no/downloads/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('89ec5683a46f000dc23c9bf8a8808985759220e4')
diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD
index 4687d69cb..56ae7e010 100644
--- a/community/ruby-cairo/PKGBUILD
+++ b/community/ruby-cairo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ruby-cairo
 pkgver=1.12.8
 pkgrel=1
 pkgdesc='Ruby bindings for cairo'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://cairographics.org/rcairo/'
 license=('GPL')
 depends=('ruby' 'cairo')
diff --git a/community/ruby-gtk2/PKGBUILD b/community/ruby-gtk2/PKGBUILD
index 4476268c9..854f049ac 100644
--- a/community/ruby-gtk2/PKGBUILD
+++ b/community/ruby-gtk2/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('ruby-atk' 'ruby-gdkpixbuf2' 'ruby-gio2' 'ruby-glib2' 'ruby-gtk2'
          'ruby-pango')
 pkgver=2.1.0
 pkgrel=2
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk2' 'glib2')
@@ -29,7 +29,8 @@ prepare() {
     "$pkgdir/ruby-atk/usr/lib/ruby/vendor_ruby/2.0.0/i686-linux" \
     "$pkgdir/ruby-pango/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \
     "$pkgdir/ruby-glib2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \
-    "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux"
+    "$pkgdir/ruby-gio2/usr/lib/ruby/vendor_ruby/2.0.0/x86_64-linux" \
+    "$pkgdir/ruby-gdkpixbuf2/usr/lib/ruby/vendor_ruby/2.0.0/mips64el-linux"
 }
 
 build() {
diff --git a/community/ruby-gtk3/PKGBUILD b/community/ruby-gtk3/PKGBUILD
index 4051be99e..a09544879 100644
--- a/community/ruby-gtk3/PKGBUILD
+++ b/community/ruby-gtk3/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=2.1.0
 pkgrel=2
 pkgname=('ruby-gtk3' 'ruby-gdk3')
 depends=("ruby-atk=$pkgver" "ruby-gdkpixbuf2=$pkgver" "ruby-glib2=$pkgver" "ruby-pango=$pkgver")
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://ruby-gnome2.sourceforge.jp/'
 license=('LGPL')
 makedepends=('ruby-pkgconfig' 'ruby-cairo' 'gtk3')
diff --git a/community/ruby-iconv/PKGBUILD b/community/ruby-iconv/PKGBUILD
index 6d5b0c9b8..87d751791 100755
--- a/community/ruby-iconv/PKGBUILD
+++ b/community/ruby-iconv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ruby-iconv
 pkgver=1.0.4
 pkgrel=2
 pkgdesc='Wrapper library for iconv'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/nurse/iconv'
 license=('BSD')
 depends=('ruby')
diff --git a/community/ruby-ncurses/PKGBUILD b/community/ruby-ncurses/PKGBUILD
index 1feadffdb..25ee81890 100644
--- a/community/ruby-ncurses/PKGBUILD
+++ b/community/ruby-ncurses/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ruby-ncurses
 pkgver=1.3.1
 pkgrel=6
 pkgdesc='Module for interactive text console applications (ncurses)'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://ncurses-ruby.berlios.de/'
 license=('GPL')
 depends=('ruby' 'ncurses')
diff --git a/community/rxvt-unicode/PKGBUILD b/community/rxvt-unicode/PKGBUILD
index 227014973..0e46d17ca 100644
--- a/community/rxvt-unicode/PKGBUILD
+++ b/community/rxvt-unicode/PKGBUILD
@@ -8,7 +8,7 @@ pkgbase=rxvt-unicode
 pkgname=('rxvt-unicode' 'rxvt-unicode-terminfo')
 pkgver=9.19
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://software.schmorp.de/pkg/rxvt-unicode.html'
 license=('GPL')
 makedepends=('libxft' 'perl' 'startup-notification')
diff --git a/community/rxvt/PKGBUILD b/community/rxvt/PKGBUILD
index 8ca75017c..212aac06d 100644
--- a/community/rxvt/PKGBUILD
+++ b/community/rxvt/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=rxvt
 pkgver=2.7.10
 pkgrel=6
 pkgdesc='A colour vt102 terminal emulator'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://rxvt.sourceforge.net/'
 license=('GPL')
 depends=('libx11')
@@ -21,6 +21,7 @@ md5sums=('302c5c455e64047b02d1ef19ff749141')
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
+    --build=$CHOST \
     --with-terminfo=/usr/share/terminfo \
     --enable-mousewheel \
     --enable-256-color \
diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD
index a3bee6ec8..c38d4ba84 100644
--- a/community/sakura/PKGBUILD
+++ b/community/sakura/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sakura
 pkgver=3.1.3
 pkgrel=1
 pkgdesc="A terminal emulator based on GTK and VTE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/sakura"
 license=('GPL')
 depends=('vte3' 'libxft' 'desktop-file-utils')
diff --git a/community/sarg/PKGBUILD b/community/sarg/PKGBUILD
index 2ee80b3c6..d8434fdcc 100644
--- a/community/sarg/PKGBUILD
+++ b/community/sarg/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sarg
 pkgver=2.3.6
 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/sbxkb/PKGBUILD b/community/sbxkb/PKGBUILD
index 0b261587a..63f25e8bd 100644
--- a/community/sbxkb/PKGBUILD
+++ b/community/sbxkb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sbxkb
 pkgver=0.7.6
 pkgrel=1
 pkgdesc="Simple tray XKB indicator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://downloads.sourceforge.net/project/staybox"
 depends=('gtk2')
diff --git a/community/scantailor/PKGBUILD b/community/scantailor/PKGBUILD
index e4b988358..95a7a0f85 100644
--- a/community/scantailor/PKGBUILD
+++ b/community/scantailor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scantailor
 pkgver=0.9.11.1
 pkgrel=3
 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=('qt4')
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index e1bf8e9eb..7df6c2a24 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 f7b786d42..f5f7bd4f9 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=scite
 pkgver=3.3.9
 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 8bee147b4..d46fd2201 100644
--- a/community/scorched3d/PKGBUILD
+++ b/community/scorched3d/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=43.3.d
 _pkgver=43.3d
 pkgrel=6
 pkgdesc="3D artillery combat game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.scorched3d.co.uk/"
 license=('GPL')
 depends=('sdl_net' 'wxgtk2.8' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils')
diff --git a/community/scponly/PKGBUILD b/community/scponly/PKGBUILD
index e95d7fee6..a2e3164f9 100644
--- a/community/scponly/PKGBUILD
+++ b/community/scponly/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scponly
 pkgver=4.8
 pkgrel=9
 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')
@@ -19,7 +19,7 @@ md5sums=('139ac9abd7f3b8dbc5c5520745318f8a'
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc \
+  [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --build=$CHOST --sysconfdir=/etc \
 	--enable-scp-compat --enable-winscp-compat --enable-chrooted-binary \
 	--sbindir=/usr/bin
   sed -i 's|^#elif|#else|' helper.c
diff --git a/community/scribus/PKGBUILD b/community/scribus/PKGBUILD
index ebe75b8ab..66ea57706 100644
--- a/community/scribus/PKGBUILD
+++ b/community/scribus/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=2
 pkgdesc='Desktop publishing software'
 url='http://www.scribus.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('cmake' 'boost' 'mesa')
 depends=('qt4' 'cairo' 'lcms2' 'libcups' 'libxml2' 'hyphen'
          'ghostscript' 'python2' 'podofo' 'boost-libs'
diff --git a/community/scrot/PKGBUILD b/community/scrot/PKGBUILD
index 7282f7869..4938b3729 100644
--- a/community/scrot/PKGBUILD
+++ b/community/scrot/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scrot
 pkgver=0.8
 pkgrel=6
 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/community/scrypt/PKGBUILD b/community/scrypt/PKGBUILD
index ebec0b4f3..64ffb6495 100644
--- a/community/scrypt/PKGBUILD
+++ b/community/scrypt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scrypt
 pkgver=1.1.6
 pkgrel=3
 pkgdesc="key derivation function and encryption utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=(openssl)
 url="http://www.tarsnap.com/scrypt/"
 license=('BSD')
diff --git a/community/scummvm-tools/PKGBUILD b/community/scummvm-tools/PKGBUILD
index d609cafa6..845d12c7b 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' 'wxgtk2.8' 'flac' 'libvorbis')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=(http://downloads.sourceforge.net/sourceforge/scummvm/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('9a5c74a49707c513e8853004e3a699e4')
 
diff --git a/community/scummvm/PKGBUILD b/community/scummvm/PKGBUILD
index d09467180..203051775 100644
--- a/community/scummvm/PKGBUILD
+++ b/community/scummvm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=scummvm
 pkgver=1.6.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=('libpng' 'libtheora' 'libmad' 'sdl' 'fluidsynth' 'flac' 'faad2' 'libvorbis' 'libmad' 'freetype2'
diff --git a/community/sdcc/PKGBUILD b/community/sdcc/PKGBUILD
index 5efa9daa1..b39c09740 100644
--- a/community/sdcc/PKGBUILD
+++ b/community/sdcc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sdcc
 pkgver=3.3.0
 pkgrel=2
 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/sdcv/PKGBUILD b/community/sdcv/PKGBUILD
index dd1d87971..72f54e6c0 100644
--- a/community/sdcv/PKGBUILD
+++ b/community/sdcv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sdcv
 pkgver=0.4.2
 pkgrel=6
 pkgdesc="StarDict Console Version"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sdcv.sourceforge.net/"
 license=('GPL')
 depends=('glib2' 'readline' 'zlib')
diff --git a/community/sdd/PKGBUILD b/community/sdd/PKGBUILD
index d49f44605..061c1ac47 100644
--- a/community/sdd/PKGBUILD
+++ b/community/sdd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sdd
 pkgver=1.52
 pkgrel=7
 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 a8100ef32..917763d9c 100644
--- a/community/ser2net/PKGBUILD
+++ b/community/ser2net/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ser2net
 pkgver=2.8rc3
 pkgrel=3
 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/setserial/PKGBUILD b/community/setserial/PKGBUILD
index 450bc064c..631c3c4a2 100644
--- a/community/setserial/PKGBUILD
+++ b/community/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/community/sfk/PKGBUILD b/community/sfk/PKGBUILD
index c5ca26769..c75baf697 100644
--- a/community/sfk/PKGBUILD
+++ b/community/sfk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sfk
 pkgver=1.7.0
 pkgrel=1
 pkgdesc='Swiss File Knife - A Command Line Tools Collection'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://stahlforce.com/dev/?tool=sfk'
 license=('custom: BSD')
 depends=('gcc-libs')
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index f9539a454..453caa1d8 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -7,7 +7,7 @@ _commit=4a300547f3
 pkgver=2.1.0.$_commit
 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 55336da5f..4ecc5dd47 100644
--- a/community/shake/PKGBUILD
+++ b/community/shake/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=shake
 pkgver=0.999
 pkgrel=2
 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 596fb3880..7a714c5fa 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=shapelib
 pkgver=1.3.0
 pkgrel=5
 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=('staticlibs')
diff --git a/community/shfs-utils/PKGBUILD b/community/shfs-utils/PKGBUILD
index f5e7e4045..cfdeded85 100644
--- a/community/shfs-utils/PKGBUILD
+++ b/community/shfs-utils/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=5
 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 4ebf7067a..2fa364c1d 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=shotwell
 pkgver=0.15.1
 pkgrel=2
 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=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
diff --git a/community/shuffle/PKGBUILD b/community/shuffle/PKGBUILD
index 7f25c1272..9c8fdb774 100644
--- a/community/shuffle/PKGBUILD
+++ b/community/shuffle/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=shuffle
 pkgver=1.5
 pkgrel=4
 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 42908b55d..153621645 100644
--- a/community/siege/PKGBUILD
+++ b/community/siege/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=siege
 pkgver=3.0.5
 pkgrel=1
-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 f5807dc7e..03de4ce7c 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sigil
 pkgver=0.7.4
 pkgrel=2
 pkgdesc="WYSIWYG ebook editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64') 
 url="http://code.google.com/p/sigil/"
 license=('GPL3')
 depends=('qt5-webkit' 'boost-libs')
diff --git a/community/silly/PKGBUILD b/community/silly/PKGBUILD
index d50c37c56..70a4406ef 100644
--- a/community/silly/PKGBUILD
+++ b/community/silly/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=silly
 pkgver=0.1.0
 pkgrel=6
 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/simh/PKGBUILD b/community/simh/PKGBUILD
index 27fcdf2fa..2c2018374 100644
--- a/community/simh/PKGBUILD
+++ b/community/simh/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.9.0
 _pkgver=39-0
 pkgrel=1
 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")
diff --git a/community/simple-scan/PKGBUILD b/community/simple-scan/PKGBUILD
index 7e9afd38c..9f5c42a87 100644
--- a/community/simple-scan/PKGBUILD
+++ b/community/simple-scan/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=simple-scan
 pkgver=3.10.0
 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 916997e99..cc4f7dc2d 100644
--- a/community/sisctrl/PKGBUILD
+++ b/community/sisctrl/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=sisctrl
 pkgver=0.0.20051202
 pkgrel=6
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 pkgdesc="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 d6002833d..7aee64b74 100644
--- a/community/sk1/PKGBUILD
+++ b/community/sk1/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sk1
 pkgver=0.9.1
 pkgrel=13
 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' 'tk' 'python2-lcms' 'python2-pillow' 'zenity' 'sk1libs' 'sk1sdk')
 license=('GPL' 'LGPL')
diff --git a/community/sk1libs/PKGBUILD b/community/sk1libs/PKGBUILD
index 91b43ef21..f539e254e 100644
--- a/community/sk1libs/PKGBUILD
+++ b/community/sk1libs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sk1libs
 pkgver=0.9.2
 pkgrel=1
 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 adcf025a7..e9a83d99b 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=skrooge
 pkgver=1.8.0
 pkgrel=3
 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' 'qjson')
diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD
index 6c72d530f..4b058df5b 100644
--- a/community/sleuthkit/PKGBUILD
+++ b/community/sleuthkit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sleuthkit
 pkgver=4.1.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 695f6eb3f..4cc1cb6bb 100644
--- a/community/slimevolley/PKGBUILD
+++ b/community/slimevolley/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=slimevolley
 pkgver=2.4.2
 pkgrel=2
 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 0961f63bc..ee50e7253 100644
--- a/community/sloccount/PKGBUILD
+++ b/community/sloccount/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc='Tools for counting physical source lines of code'
 url='http://www.dwheeler.com/sloccount/'
 license=('GPL')
 depends=('perl')
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.dwheeler.com/$pkgname/$pkgname-$pkgver.tar.gz")
 sha256sums=('fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b')
 
diff --git a/community/slock/PKGBUILD b/community/slock/PKGBUILD
index b6fbb2ebe..a28fa9961 100644
--- a/community/slock/PKGBUILD
+++ b/community/slock/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=slock
 pkgver=1.1
 pkgrel=1
 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 598c62561..cb243eb12 100644
--- a/community/slrn/PKGBUILD
+++ b/community/slrn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=slrn
 pkgver=1.0.1
 pkgrel=1
 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 2339ff704..3a838ca95 100644
--- a/community/smalltalk/PKGBUILD
+++ b/community/smalltalk/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=2
 pkgdesc='Implementation of Smalltalk-80'
 url='http://smalltalk.gnu.org/'
 license=('GPL' 'LGPL')
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!emptydirs' 'staticlibs')
 depends=('gmp' 'libffi' 'libsigsegv' 'readline' 'libltdl')
 makedepends=('gdbm' 'gtk2' 'sqlite' 'tk' 'zip')
diff --git a/community/smbnetfs/PKGBUILD b/community/smbnetfs/PKGBUILD
index 31d8830cf..4fa7a5201 100644
--- a/community/smbnetfs/PKGBUILD
+++ b/community/smbnetfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=smbnetfs
 pkgver=0.5.3b
 pkgrel=1
 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/smem/PKGBUILD b/community/smem/PKGBUILD
index ed89c55d9..7f8253657 100644
--- a/community/smem/PKGBUILD
+++ b/community/smem/PKGBUILD
@@ -12,7 +12,7 @@ url="http://www.selenic.com/smem/"
 license=("GPL")
 depends=('python2')
 optdepends=('python2-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=('dd849102610aadb9f64379db09e73d41')
 
diff --git a/community/sniffit/PKGBUILD b/community/sniffit/PKGBUILD
index a117f5848..069b81e8a 100644
--- a/community/sniffit/PKGBUILD
+++ b/community/sniffit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sniffit
 pkgver=0.3.7.beta
 pkgrel=14
 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/snownews/PKGBUILD b/community/snownews/PKGBUILD
index ff4cdfc9f..a2fa070d2 100644
--- a/community/snownews/PKGBUILD
+++ b/community/snownews/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=snownews
 pkgver=1.5.12
 pkgrel=5
 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/solfege/PKGBUILD b/community/solfege/PKGBUILD
index 966e485b4..7ba744b5f 100644
--- a/community/solfege/PKGBUILD
+++ b/community/solfege/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=solfege
 pkgver=3.22.2
 pkgrel=2
 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' 'librsvg')
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 897000c29..878c28a76 100644
--- a/community/speed-dreams/PKGBUILD
+++ b/community/speed-dreams/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.0.0
 _pkgver=2.0.0-r4687
 pkgrel=3
 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' 'glu')
diff --git a/community/splint/PKGBUILD b/community/splint/PKGBUILD
index f6559ab07..acade57ec 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')
@@ -18,7 +18,7 @@ options=('!makeflags')
 
 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/splix/PKGBUILD b/community/splix/PKGBUILD
index c809681cd..95404addc 100644
--- a/community/splix/PKGBUILD
+++ b/community/splix/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=splix
 pkgver=2.0.0
 pkgrel=12
 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 78fdfe6b3..e776d4e27 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.96.0
 _pkgver=96.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 02fda8147..63b6091ed 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=springlobby
 pkgver=0.180
 pkgrel=3
 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/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD
index 5f968fda9..7a571f3ec 100755
--- a/community/sqlheavy/PKGBUILD
+++ b/community/sqlheavy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sqlheavy
 pkgver=0.2.0.7ae6112
 pkgrel=1
 pkgdesc="GObject SQLite wrapper"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://code.google.com/p/sqlheavy/"
 license=('LGPL')
 depends=('gtk2' 'sqlite3')
diff --git a/community/sqlite2/PKGBUILD b/community/sqlite2/PKGBUILD
index 00dadaa52..e6ee41f75 100644
--- a/community/sqlite2/PKGBUILD
+++ b/community/sqlite2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sqlite2
 pkgver=2.8.17
 pkgrel=6
 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" 
diff --git a/community/sqlitebrowser/PKGBUILD b/community/sqlitebrowser/PKGBUILD
index a5e60dd48..cb9016c33 100644
--- a/community/sqlitebrowser/PKGBUILD
+++ b/community/sqlitebrowser/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.0b1
 _pkgrealver=200_b1
 pkgrel=4
 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=('qt4' 'sqlite')
diff --git a/community/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD
index 5e1b1b669..253b19a67 100644
--- a/community/sqliteman/PKGBUILD
+++ b/community/sqliteman/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=sqliteman
 pkgver=1.2.2
 pkgrel=7
 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.com/"
 license=('GPL')
 depends=('qscintilla')
diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
index 091687396..ffefbc54e 100644
--- a/community/squashfs-tools/PKGBUILD
+++ b/community/squashfs-tools/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=4
 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/squid/PKGBUILD b/community/squid/PKGBUILD
index 710934ed7..2e76912a3 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=squid
 pkgver=3.4.3
 pkgrel=1
 pkgdesc='Full-featured Web proxy cache server'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.squid-cache.org'
 depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
 makedepends=('libcap' 'krb5')
diff --git a/community/srm/PKGBUILD b/community/srm/PKGBUILD
index 27dd11989..1c08c8c9b 100644
--- a/community/srm/PKGBUILD
+++ b/community/srm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=srm
 pkgver=1.2.12
 pkgrel=1
 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/community/sshfs/PKGBUILD b/community/sshfs/PKGBUILD
index 30ad20f67..7ef1a502b 100644
--- a/community/sshfs/PKGBUILD
+++ b/community/sshfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sshfs
 pkgver=2.5
 pkgrel=1
 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/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index 4a616e681..63c7ba59b 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sshguard
 pkgver=1.5
 pkgrel=16
 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://www.sshguard.net/"
 license=('GPL')
 depends=('iptables')
diff --git a/community/sshpass/PKGBUILD b/community/sshpass/PKGBUILD
index 3f18e8e76..ad071a7b6 100644
--- a/community/sshpass/PKGBUILD
+++ b/community/sshpass/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sshpass
 pkgver=1.05
 pkgrel=1
 pkgdesc='Fool ssh into accepting an interactive password non-interactively'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/sshpass/'
 license=('GPL')
 depends=('openssh')
diff --git a/community/sslh/PKGBUILD b/community/sslh/PKGBUILD
index 8af57a0ad..d2a1be7d4 100644
--- a/community/sslh/PKGBUILD
+++ b/community/sslh/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sslh
 pkgver=1.16
 pkgrel=1
 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')
 depends=('libconfig')
diff --git a/community/stalonetray/PKGBUILD b/community/stalonetray/PKGBUILD
index d369763c1..2f5b5719c 100644
--- a/community/stalonetray/PKGBUILD
+++ b/community/stalonetray/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=stalonetray
 pkgver=0.8.1
 pkgrel=2
 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/stardict/PKGBUILD b/community/stardict/PKGBUILD
index 03d6b3999..845dca043 100644
--- a/community/stardict/PKGBUILD
+++ b/community/stardict/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=stardict
 pkgname=(stardict stardict-lite)
 pkgver=3.0.4
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.stardict.org/'
 license=('GPL')
 makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmariadbclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome')
diff --git a/community/steghide/PKGBUILD b/community/steghide/PKGBUILD
index b186a6cfd..b3865ae0b 100644
--- a/community/steghide/PKGBUILD
+++ b/community/steghide/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=steghide
 pkgver=0.5.1
 pkgrel=6
 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' 'gcc-libs' 'mhash' 'libjpeg' 'zlib')
diff --git a/community/stfl/PKGBUILD b/community/stfl/PKGBUILD
index b418b97c0..69f29d6d1 100644
--- a/community/stfl/PKGBUILD
+++ b/community/stfl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=stfl
 pkgver=0.22
 pkgrel=2
 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 2a97d360c..b7f8f2441 100644
--- a/community/stk/PKGBUILD
+++ b/community/stk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=stk
 pkgver=4.4.4
 pkgrel=1
 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')
@@ -32,7 +32,7 @@ build() {
   sed -i 's:\.\./\.\.:/usr/lib/stk:' projects/demo/demo.cpp
 
   # run actual build
-  ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ --prefix=/usr --with-alsa --with-jack
+  ./configure RAWWAVE_PATH=/usr/lib/stk/rawwaves/ --prefix=/usr --with-alsa --with-jack --build=$CHOST
   make
 
   # fix executable scripts
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index 49cd9695b..79e1eb31b 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=stone-soup
 pkgver=0.13.1
 pkgrel=1
 pkgdesc='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=('lua51' 'ncurses' 'sdl_image' 'sqlite' 'glu' 'freetype2' 'ttf-dejavu')
 makedepends=('bison' 'flex' 'gendesk' 'mesa')
diff --git a/community/stress/PKGBUILD b/community/stress/PKGBUILD
index 2f320e0ab..801f60ad5 100644
--- a/community/stress/PKGBUILD
+++ b/community/stress/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=stress
 pkgver=1.0.4
 pkgrel=3
 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 988e5c2e8..55c65cd38 100644
--- a/community/stunnel/PKGBUILD
+++ b/community/stunnel/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=stunnel
 pkgver=4.56
 pkgrel=4
 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 4073de1e1..2a2e1154d 100644
--- a/community/subtitleeditor/PKGBUILD
+++ b/community/subtitleeditor/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=subtitleeditor
 pkgver=0.41.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=('desktop-file-utils' 'enchant' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 
@@ -20,7 +20,6 @@ sha256sums=('30e7fc29e8a6e714f6b0eedf80b2b387099957b9d70093fa0032fd5528b14e62')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
-
   ./configure --prefix=/usr
   make
 }
diff --git a/community/subtitleeditor/subtitleeditor-0.40.0-glib.patch b/community/subtitleeditor/subtitleeditor-0.40.0-glib.patch
new file mode 100644
index 000000000..1215a7112
--- /dev/null
+++ b/community/subtitleeditor/subtitleeditor-0.40.0-glib.patch
@@ -0,0 +1,11 @@
+--- subtitleeditor-0.40.0.orig/plugins/actions/findandreplace/findandreplace.cc	2012-02-22 14:02:05.000000000 -0500
++++ subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc	2013-01-05 20:24:07.887899963 -0500
+@@ -26,7 +26,7 @@
+ #include <gui/dialogutility.h>
+ #include <gtkmm_utility.h>
+ #include <widget_config_utility.h>
+-#include <glib/gregex.h>
++#include <glib.h>
+ 
+ /*
+  * FIXME:
diff --git a/community/sunpinyin/PKGBUILD b/community/sunpinyin/PKGBUILD
index 1aa1a4606..3f20cbf21 100644
--- a/community/sunpinyin/PKGBUILD
+++ b/community/sunpinyin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sunpinyin
 pkgver=2.0.3.20130307
 _commit=64e26d9ed1f617e59ff37c2efc0be97727c799a1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Statistical Language Model based pinyin IME by Sun"
 license=('LGPL')
 url="http://sunpinyin.googlecode.com"
diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD
index 39454fa29..01e7e94be 100644
--- a/community/supertux/PKGBUILD
+++ b/community/supertux/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=supertux
 pkgver=0.3.4
 pkgrel=1
 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' 'glew')
diff --git a/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community/supertux/squirrel.patch
index 16781b610..16781b610 100644
--- a/community-staging/supertux/supertux2-0.3.3-squirrel-gcc47.patch
+++ b/community/supertux/squirrel.patch
diff --git a/community/surf/PKGBUILD b/community/surf/PKGBUILD
index 17bd37ad6..1bc84789e 100644
--- a/community/surf/PKGBUILD
+++ b/community/surf/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=surf
 pkgver=0.6
 pkgrel=2
 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 452a0aba8..2f56facc1 100644
--- a/community/swarp/PKGBUILD
+++ b/community/swarp/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.1
 pkgrel=3
 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 727b3c02d..c9173c2a0 100644
--- a/community/swftools/PKGBUILD
+++ b/community/swftools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=swftools
 pkgver=0.9.2
 pkgrel=3
 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=('giflib' 'freeglut' 'lame' 't1lib' 'libjpeg' 'fontconfig')
diff --git a/community/sxiv/PKGBUILD b/community/sxiv/PKGBUILD
index 0d3439b71..93103cc2f 100644
--- a/community/sxiv/PKGBUILD
+++ b/community/sxiv/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=sxiv
 pkgver=1.1.1
 pkgrel=2
 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/sylpheed/PKGBUILD b/community/sylpheed/PKGBUILD
index 69e7a4972..3bd364a1a 100644
--- a/community/sylpheed/PKGBUILD
+++ b/community/sylpheed/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sylpheed
 pkgver=3.3.0
 pkgrel=1
 pkgdesc="Lightweight and user-friendly e-mail client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sylpheed.sraoss.jp/en/"
 license=('GPL')
 depends=('gpgme' 'gtkspell' 'desktop-file-utils')
diff --git a/community/synapse/PKGBUILD b/community/synapse/PKGBUILD
index c6a3accf1..4829400a7 100644
--- a/community/synapse/PKGBUILD
+++ b/community/synapse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synapse
 pkgver=0.2.10
 pkgrel=5
 pkgdesc="A semantic file launcher"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/synapse-project"
 license=('GPL3')
 depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee06' 'libnotify' \
diff --git a/community/synce-libmimedir/PKGBUILD b/community/synce-libmimedir/PKGBUILD
index baf6ea356..d6efb8930 100644
--- a/community/synce-libmimedir/PKGBUILD
+++ b/community/synce-libmimedir/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synce-libmimedir
 pkgver=0.4
 pkgrel=5
 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-rra/PKGBUILD b/community/synce-rra/PKGBUILD
index bae4cf6af..da128a03b 100644
--- a/community/synce-rra/PKGBUILD
+++ b/community/synce-rra/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synce-rra
 pkgver=0.17
 pkgrel=2
 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-core' 'synce-libmimedir')
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index f3ec7583b..c53c4466a 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.4.15
 pkgrel=3
 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' 'crypto++')
 makedepends=('libxt' 'cmake' 'qt4' 'unzip')
 optdepends=('qt4: gui support')
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index f2b749142..0ccabda99 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synfig
 pkgver=0.64.1
 pkgrel=3
 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-compat' 'fontconfig' 'libpng'
diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD
index 6e0b3f1db..eedffc824 100644
--- a/community/synfigstudio/PKGBUILD
+++ b/community/synfigstudio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=synfigstudio
 pkgver=0.64.1
 pkgrel=1
 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 9b0e55fb0..22e9ab701 100644
--- a/community/sysprof/PKGBUILD
+++ b/community/sysprof/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=sysprof
 pkgver=1.2.0
 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 ecea41d09..f7e4d9d8b 100644
--- a/community/sysstat/PKGBUILD
+++ b/community/sysstat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sysstat
 pkgver=10.2.1
 pkgrel=1
 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/sysvbanner/PKGBUILD b/community/sysvbanner/PKGBUILD
index 44304f42a..dbaaa5543 100644
--- a/community/sysvbanner/PKGBUILD
+++ b/community/sysvbanner/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=sysvbanner
 pkgver=1.0.15
 pkgrel=1
 pkgdesc='System-V banner clone'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://packages.qa.debian.org/s/sysvbanner.html'
 conflicts=('bsd-games')
 license=('custom')
diff --git a/community/t1utils/PKGBUILD b/community/t1utils/PKGBUILD
index 9833a57c8..3426c0c6e 100644
--- a/community/t1utils/PKGBUILD
+++ b/community/t1utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=t1utils
 pkgver=1.37
 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 cca785d9a..9c22c0851 100644
--- a/community/tabbed/PKGBUILD
+++ b/community/tabbed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tabbed
 pkgver=0.6
 pkgrel=1
 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/talkfilters/PKGBUILD b/community/talkfilters/PKGBUILD
index 0ff31aa59..13cc127b4 100644
--- a/community/talkfilters/PKGBUILD
+++ b/community/talkfilters/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=talkfilters
 pkgver=2.3.8
 pkgrel=3
 pkgdesc='Filters to translate text into dialects that GNU finds funny'
-arch=('x86_64' 'i686')
+arch=(i686 x86_64 mips64el)
 url='http://www.hyperrealm.com/main.php?s=talkfilters'
 depends=('glibc')
 license=('GPL2')
diff --git a/community/task/PKGBUILD b/community/task/PKGBUILD
index 663b1cde2..6ae449aee 100644
--- a/community/task/PKGBUILD
+++ b/community/task/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=task
 pkgver=2.3.0
 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=('MIT')
 depends=('util-linux' 'gnutls')
diff --git a/community/tcpflow/PKGBUILD b/community/tcpflow/PKGBUILD
index 582004c4e..cc18cef85 100644
--- a/community/tcpflow/PKGBUILD
+++ b/community/tcpflow/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tcpflow
 pkgver=1.3.0
 pkgrel=1
 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://afflib.org/software/tcpflow"
 license=('GPL')
 depends=('gcc-libs' 'libpcap' 'zlib')
diff --git a/community/tcpreplay/PKGBUILD b/community/tcpreplay/PKGBUILD
index 054c87d7e..d9bd7742e 100644
--- a/community/tcpreplay/PKGBUILD
+++ b/community/tcpreplay/PKGBUILD
@@ -4,10 +4,10 @@
 # Contributor: Dawid Wrobel <cromo@klej.net>
 pkgname=tcpreplay
 pkgver=3.4.4
-pkgrel=3
+pkgrel=3.1
 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 386245467..74754de30 100644
--- a/community/tcsh/PKGBUILD
+++ b/community/tcsh/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tcsh
 pkgver=6.18.01
 pkgrel=2
 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 c2df49a2c..a3629b293 100644
--- a/community/tdfsb/PKGBUILD
+++ b/community/tdfsb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tdfsb
 pkgver=0.0.10
 pkgrel=6
 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' 'glu')
diff --git a/community/tdl/PKGBUILD b/community/tdl/PKGBUILD
index fbcd02fdc..96fa1fae0 100644
--- a/community/tdl/PKGBUILD
+++ b/community/tdl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tdl
 pkgver=1.5.2
 pkgrel=5
 pkgdesc="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 809285062..632d88604 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=tea
 pkgver=37.1.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://semiletov.org/tea/"
 license=('GPL')
 depends=('qt4' 'aspell' 'hunspell')
diff --git a/community/teeworlds/PKGBUILD b/community/teeworlds/PKGBUILD
index 61388b1d9..81a7d376c 100644
--- a/community/teeworlds/PKGBUILD
+++ b/community/teeworlds/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=teeworlds
 pkgver=0.6.2
 pkgrel=2
 pkgdesc='Multiplayer 2D shooter'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://www.teeworlds.com'
 license=('custom')
 depends=('alsa-lib' 'glu' 'sdl' 'freetype2')
diff --git a/community/tellico/PKGBUILD b/community/tellico/PKGBUILD
index 2fad295bf..f0ef4d5cc 100644
--- a/community/tellico/PKGBUILD
+++ b/community/tellico/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=tellico
 pkgver=2.3.8
 pkgrel=2
 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' 'libkcddb' 'poppler-qt' 'kdemultimedia-audiocd-kio')
diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD
index ae4415ceb..58352ffc6 100644
--- a/community/tesseract/PKGBUILD
+++ b/community/tesseract/PKGBUILD
@@ -14,7 +14,7 @@ pkgver=3.02.02
 _pkgver=3.02
 pkgrel=3
 pkgdesc="An OCR programm"
-arch=(i686 x86_64)
+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/texvc/PKGBUILD b/community/texvc/PKGBUILD
index 804a2db52..4bb95640a 100644
--- a/community/texvc/PKGBUILD
+++ b/community/texvc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=texvc
 pkgver=1.22
 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')
@@ -28,5 +28,5 @@ build() {
 package() {
   cd $srcdir/mediawiki-math-$pkgver/math
   install -d -m 0755 $pkgdir/usr/bin
-  install -m 0755 texvc $pkgdir/usr/bin
+  install -m 0755 texvc.bc $pkgdir/usr/bin
 }
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index 7789510de..21bec9994 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc='Code searching tool similar to Ack, but faster'
 url='https://github.com/ggreer/the_silver_searcher'
 license=('Apache')
 depends=('pcre' 'zlib' 'xz')
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
 sha256sums=('e2de31b8b4745b4614d3a6fa4cd61130474b0e861e80b3784daee7ce0eeca300')
 
diff --git a/community/thttpd/PKGBUILD b/community/thttpd/PKGBUILD
index 95862d06f..15467219e 100644
--- a/community/thttpd/PKGBUILD
+++ b/community/thttpd/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=11
 pkgdesc='Simple, small, portable, fast, and secure HTTP server'
 url='http://www.acme.com/software/thttpd/'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 backup=('etc/thttpd.conf')
 source=("http://www.acme.com/software/thttpd/${pkgname}-${pkgver}.tar.gz"
         'forwarded-for.patch'
diff --git a/community/tig/PKGBUILD b/community/tig/PKGBUILD
index c0c03326c..1b5714899 100644
--- a/community/tig/PKGBUILD
+++ b/community/tig/PKGBUILD
@@ -11,7 +11,7 @@ depends=('git' 'ncurses')
 makedepends=('asciidoc' 'xmlto')
 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=('9dec2966d3d51f7d8b5b8d4a4b8d93eb')
 
diff --git a/community/tilda/PKGBUILD b/community/tilda/PKGBUILD
index efde54921..ca01441ab 100644
--- a/community/tilda/PKGBUILD
+++ b/community/tilda/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tilda
 pkgver=1.1.10
 pkgrel=1
 pkgdesc="A Gtk based drop down terminal for Linux and Unix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/lanoxx/tilda"
 license=('GPL')
 depends=('vte3' 'confuse')
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index ce0e94829..10c7312f6 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=tinc
 pkgver=1.0.23
 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 2571b8dee..80cb4575b 100644
--- a/community/tint2/PKGBUILD
+++ b/community/tint2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tint2
 pkgver=0.11
 pkgrel=6
 pkgdesc='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/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD
index c2adfa0b2..af06dc7ef 100644
--- a/community/tinyproxy/PKGBUILD
+++ b/community/tinyproxy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tinyproxy
 pkgver=1.8.3
 pkgrel=7
 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/tinyxml/PKGBUILD b/community/tinyxml/PKGBUILD
index a8f263f30..fb3924309 100644
--- a/community/tinyxml/PKGBUILD
+++ b/community/tinyxml/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.6.2
 pkgrel=3
 pkgdesc='Simple, small, C++ XML parser that can be easily integrated into other programs'
 url="http://www.grinninglizard.com/tinyxml/"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('zlib')
 depends=('gcc-libs')
 makedepends=('setconf')
diff --git a/community/tipp10/PKGBUILD b/community/tipp10/PKGBUILD
index 725ccb9e2..827296a07 100644
--- a/community/tipp10/PKGBUILD
+++ b/community/tipp10/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tipp10
 pkgver=2.1.0
 pkgrel=5
 pkgdesc="intelligent typing tutor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tipp10.com/"
 license=('GPL2')
 depends=('qt4')
diff --git a/community/tix/PKGBUILD b/community/tix/PKGBUILD
index a81b64c5c..09f40e5cc 100644
--- a/community/tix/PKGBUILD
+++ b/community/tix/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tix
 pkgver=8.4.3
 pkgrel=5
 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' 'libx11')
diff --git a/community/tksystray/PKGBUILD b/community/tksystray/PKGBUILD
index e3fff8ef4..501e1087f 100644
--- a/community/tksystray/PKGBUILD
+++ b/community/tksystray/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tksystray
 pkgver=0.1
 pkgrel=6
 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 869dfe6ee..dad5be087 100644
--- a/community/tktheme/PKGBUILD
+++ b/community/tktheme/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tktheme
 pkgver=0.23
 pkgrel=8
 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 d0bca3de1..a8e3d231f 100644
--- a/community/tmux/PKGBUILD
+++ b/community/tmux/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.9
 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 8effb6c13..b298cac3e 100644
--- a/community/tmw/PKGBUILD
+++ b/community/tmw/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tmw
 pkgver=0.6.1
 pkgrel=3
 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=('glu' 'curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs'
diff --git a/community/tnef/PKGBUILD b/community/tnef/PKGBUILD
index af56e5d39..781f88de4 100644
--- a/community/tnef/PKGBUILD
+++ b/community/tnef/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=tnef
 pkgver=1.4.9
 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 cbf5d0f09..e5f46f557 100644
--- a/community/tnftp/PKGBUILD
+++ b/community/tnftp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tnftp
 pkgver=20130505
 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' 'openssl')
diff --git a/community/toolame/PKGBUILD b/community/toolame/PKGBUILD
index 48e2f25fc..01c9c6e9b 100644
--- a/community/toolame/PKGBUILD
+++ b/community/toolame/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=toolame
 pkgver=02l
-pkgrel=9
+pkgrel=9.1
 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')
@@ -20,6 +20,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   patch -p0 < ../toolame-02l.patch
   [ "$CARCH" = "x86_64" ] && sed -i "s|-march=i686|-march=x86-64|g" Makefile
+  [ "$CARCH" = "mips64el" ] && sed -i "s|-march=i686|-march=mips3 -mtune=loongson2f|g" Makefile
   make
   install -D -m755 toolame $pkgdir/usr/bin/toolame
 }
diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD
index cbc8fdc64..9aa3e2d94 100644
--- a/community/tor/PKGBUILD
+++ b/community/tor/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tor
 pkgver=0.2.4.20
 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' 'bash')
diff --git a/community/torch/PKGBUILD b/community/torch/PKGBUILD
index 7bda8ea70..88f9c11f8 100644
--- a/community/torch/PKGBUILD
+++ b/community/torch/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=torch
 pkgver=3.1
 pkgrel=4
 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 bb0d02f18..b47c84b26 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' 'libvorbis' 'glu')
 makedepends=('plib' 'mesa')
 options=('!makeflags')
diff --git a/community/torsocks/PKGBUILD b/community/torsocks/PKGBUILD
index 28391def3..2d27d3504 100644
--- a/community/torsocks/PKGBUILD
+++ b/community/torsocks/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=torsocks
 pkgver=1.3
 pkgrel=5
 pkgdesc='Wrapper to safely torify applications'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://code.google.com/p/torsocks'
 license=('GPL2')
 depends=('tor')
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 f09722bfc..e3576f50d 100644
--- a/community/trayion/PKGBUILD
+++ b/community/trayion/PKGBUILD
@@ -6,7 +6,7 @@ pkgver="0.1.2"
 pkgrel=2
 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')
@@ -16,6 +16,7 @@ md5sums=('6e1123121ed83bd7f9759a71d4ef9307')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+  sed -i "s:/bin/install:/usr/bin/install:" Makefile
   make
   make prefix="$pkgdir/usr" install
 }
diff --git a/community/tre/PKGBUILD b/community/tre/PKGBUILD
index 101515357..225eeb163 100644
--- a/community/tre/PKGBUILD
+++ b/community/tre/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=tre
 pkgver=0.8.0
 pkgrel=3
-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/trickle/PKGBUILD b/community/trickle/PKGBUILD
index 949e210d6..7dcd4dece 100644
--- a/community/trickle/PKGBUILD
+++ b/community/trickle/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=trickle
 pkgver=1.07
 pkgrel=8
 pkgdesc="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/tuxcards/PKGBUILD b/community/tuxcards/PKGBUILD
index a1b93dd03..4c2e4928f 100644
--- a/community/tuxcards/PKGBUILD
+++ b/community/tuxcards/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tuxcards
 pkgver=2.2.1
 pkgrel=3
 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=('qt4')
diff --git a/community/tuxcmd-modules/PKGBUILD b/community/tuxcmd-modules/PKGBUILD
index 39a8b5dd2..fe0240868 100644
--- a/community/tuxcmd-modules/PKGBUILD
+++ b/community/tuxcmd-modules/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tuxcmd-modules
 pkgver=0.6.70
 pkgrel=2
 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 5eefb36b3..140f31bc1 100644
--- a/community/tuxcmd/PKGBUILD
+++ b/community/tuxcmd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tuxcmd
 pkgver=0.6.70
 pkgrel=4
 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' 'hicolor-icon-theme')
diff --git a/community/tuxguitar/PKGBUILD b/community/tuxguitar/PKGBUILD
index bbd3a8def..580811307 100644
--- a/community/tuxguitar/PKGBUILD
+++ b/community/tuxguitar/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2
 pkgrel=6
 _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-config/PKGBUILD b/community/tuxpaint-config/PKGBUILD
index 26c9ae9c8..d3830b958 100644
--- a/community/tuxpaint-config/PKGBUILD
+++ b/community/tuxpaint-config/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tuxpaint-config
 pkgver=0.0.12
 pkgrel=2
 pkgdesc='Tux Paint configuration tool'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.tuxpaint.org'
 license='GPL'
 depends=('tuxpaint' 'fltk' 'libxft' 'libxext')
diff --git a/community/tuxpaint/PKGBUILD b/community/tuxpaint/PKGBUILD
index f83770517..fb55d868d 100644
--- a/community/tuxpaint/PKGBUILD
+++ b/community/tuxpaint/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=tuxpaint
 pkgver=0.9.21
 pkgrel=9
 pkgdesc='Drawing program designed for young children'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://www.tuxpaint.org/'
 license=('GPL')
 backup=('etc/tuxpaint/tuxpaint.conf')
diff --git a/community/tvision/PKGBUILD b/community/tvision/PKGBUILD
index 5885e7d93..f56d78bef 100644
--- a/community/tvision/PKGBUILD
+++ b/community/tvision/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tvision
 pkgver=2.2.1_r1
 pkgrel=3
 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 eae900c86..8286ddf67 100644
--- a/community/tvtime/PKGBUILD
+++ b/community/tvtime/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tvtime
 pkgver=1.0.2
 pkgrel=5
 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 b5c5c1476..81201adbf 100644
--- a/community/twin/PKGBUILD
+++ b/community/twin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=twin
 pkgver=0.6.2
 pkgrel=5
 pkgdesc="A text-mode window environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/twin/'
 license=('GPL2' 'LGPL2.1')
 depends=('gpm' 'zlib' 'libxpm')
diff --git a/community/twolame/PKGBUILD b/community/twolame/PKGBUILD
index 9bb7dbc5e..c01af7c09 100644
--- a/community/twolame/PKGBUILD
+++ b/community/twolame/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=twolame
 pkgver=0.3.13
-pkgrel=6
+pkgrel=6.2
 pkgdesc="An optimized MPEG Audio Layer 2 (MP2) encoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.twolame.org/"
 license=('LGPL')
 depends=('libsndfile')
diff --git a/community/typespeed/PKGBUILD b/community/typespeed/PKGBUILD
index a899715a1..0be3db773 100644
--- a/community/typespeed/PKGBUILD
+++ b/community/typespeed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=typespeed
 pkgver=0.6.5
 pkgrel=4
 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/ucarp/PKGBUILD b/community/ucarp/PKGBUILD
index 467613303..84bdb16b1 100644
--- a/community/ucarp/PKGBUILD
+++ b/community/ucarp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ucarp
 pkgver=1.5.2
 pkgrel=5
 pkgdesc='Userspace implementation of the CARP protocol'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ucarp.org/project/ucarp'
 license=('GPL2')
 depends=('libpcap')
diff --git a/community/ucl/PKGBUILD b/community/ucl/PKGBUILD
index 885c5b2fc..107f1fad5 100644
--- a/community/ucl/PKGBUILD
+++ b/community/ucl/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ucl
 pkgver=1.03
 pkgrel=5
 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/"
 source=("http://www.oberhumer.com/opensource/$pkgname/download/$pkgname-$pkgver.tar.gz")
diff --git a/community/ude/PKGBUILD b/community/ude/PKGBUILD
index f65998d88..28d73b219 100644
--- a/community/ude/PKGBUILD
+++ b/community/ude/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ude
 pkgver=0.2.11
 pkgrel=2
 pkgdesc="The ultimate window manager for UDE"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686' 'mips64el')
 license=('GPL')
 depends=('libjpeg' 'libxmu' 'libxpm' 'bash')
 makedepends=('gendesk')
diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD
index 4fecdcba1..19c3b32db 100644
--- a/community/udevil/PKGBUILD
+++ b/community/udevil/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=udevil
 pkgver=0.4.3
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Mount and unmount without password'
 url='http://ignorantguru.github.com/udevil/'
 license=('GPL3')
diff --git a/community/uget/PKGBUILD b/community/uget/PKGBUILD
index 14bec946f..32fb678a3 100644
--- a/community/uget/PKGBUILD
+++ b/community/uget/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=uget
 pkgver=1.10.4
 pkgrel=1
 pkgdesc="GTK+ download manager featuring download classification and HTML import"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ugetdm.com/"
 license=('LGPL')
 depends=('libnotify' 'gtk3' 'gstreamer' 'curl' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 45277b142..24a05f9d8 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ulogd
 pkgver=2.0.3
 pkgrel=1
 pkgdesc='Userspace Packet Logging for netfilter'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.netfilter.org/projects/ulogd/index.html'
 license=('GPL2')
 depends=('libmnl'
diff --git a/community/ultimate-ircd/PKGBUILD b/community/ultimate-ircd/PKGBUILD
index 4a3f0c2da..dcbdf5b73 100644
--- a/community/ultimate-ircd/PKGBUILD
+++ b/community/ultimate-ircd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ultimate-ircd
 pkgver=3.0.2
 pkgrel=7
 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/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 20766114a..49e1010b4 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('expat')
 optdepends=('expat: unbound-anchor')
 depends=('openssl' 'ldns' 'libevent')
diff --git a/community/unclutter/PKGBUILD b/community/unclutter/PKGBUILD
index b9514cd2f..335712607 100644
--- a/community/unclutter/PKGBUILD
+++ b/community/unclutter/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=8
 pkgrel=10
 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/unhide/PKGBUILD b/community/unhide/PKGBUILD
index 04f43703e..18f16e8f4 100644
--- a/community/unhide/PKGBUILD
+++ b/community/unhide/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=unhide
 pkgver=20130526
 pkgrel=1
 pkgdesc='A forensic tool to find processes hidden by rootkits, LKMs or by other techniques.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://sourceforge.net/projects/unhide/'
 license=('GPL3')
 depends=('iproute2' 'lsof' 'psmisc' 'net-tools' 'procps-ng')
diff --git a/community/uniconvertor/PKGBUILD b/community/uniconvertor/PKGBUILD
index c8efbd281..d8804685f 100644
--- a/community/uniconvertor/PKGBUILD
+++ b/community/uniconvertor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=uniconvertor
 pkgver=1.1.5
 pkgrel=7
 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' 'python2-pillow' 'python2-reportlab' 'sk1libs')
diff --git a/community/unifdef/PKGBUILD b/community/unifdef/PKGBUILD
index fd8b122d0..eeaae0545 100644
--- a/community/unifdef/PKGBUILD
+++ b/community/unifdef/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=unifdef
 pkgver=2.8
 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/unionfs-fuse/PKGBUILD b/community/unionfs-fuse/PKGBUILD
index 22db49cff..972acc31a 100644
--- a/community/unionfs-fuse/PKGBUILD
+++ b/community/unionfs-fuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=unionfs-fuse
 pkgver=0.26
 pkgrel=2
 pkgdesc="A user space unionfs implementation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://podgorny.cz/moin/UnionFsFuse"
 license=('BSD')
 depends=('fuse')
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index c9be463ad..cf6b7fc64 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=units
 pkgver=2.01
 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 23a3378ff..026f780ad 100644
--- a/community/unpaper/PKGBUILD
+++ b/community/unpaper/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=unpaper
 pkgver=5.1
 pkgrel=1
 pkgdesc="post-processing tool for scanned sheets of paper"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 #url="http://$pkgname.berlios.de/"
 url="https://github.com/Flameeyes/unpaper"
 license="GPL"
diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD
index 0d4b45bee..10b2cbf8c 100644
--- a/community/unrealircd/PKGBUILD
+++ b/community/unrealircd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=unrealircd
 pkgver=3.2.10.2
 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 9a748207f..539d94c37 100644
--- a/community/unrtf/PKGBUILD
+++ b/community/unrtf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=unrtf
 pkgver=0.21.5
 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 e1f794569..3ce64c958 100644
--- a/community/unshield/PKGBUILD
+++ b/community/unshield/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=unshield
 pkgver=0.6
 pkgrel=4
 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 64d07551e..5ade5d63d 100644
--- a/community/uptimed/PKGBUILD
+++ b/community/uptimed/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=uptimed
 pkgver=0.3.17
 pkgrel=5
 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 712920faf..a976435de 100644
--- a/community/upx/PKGBUILD
+++ b/community/upx/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=upx
 pkgver=3.91
 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 5baacac5e..4e1f2f037 100644
--- a/community/uqm/PKGBUILD
+++ b/community/uqm/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=uqm
 pkgver=0.7.0
 pkgrel=3
 pkgdesc="The Ur-Quan Masters, 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' 'glu')
diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD
index 9dabf550b..6b7b41641 100644
--- a/community/uriparser/PKGBUILD
+++ b/community/uriparser/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uripars
 url="http://sourceforge.net/projects/uriparser/"
 depends=()
 makedepends=(doxygen graphviz)
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("custom")
 source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2)
 md5sums=('77601f52ab91c0e100fc5d783d9c1ee5')
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 638e35dda..846bcfa8a 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.1.0
 pkgrel=1
 _pkgdata=20140129
 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' 'tcl')
diff --git a/community/usbredir/PKGBUILD b/community/usbredir/PKGBUILD
index 24fcf979a..c6501f4a4 100644
--- a/community/usbredir/PKGBUILD
+++ b/community/usbredir/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=usbredir
 pkgver=0.6
 pkgrel=4
 pkgdesc="USB traffic redirection protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://spice-space.org/page/UsbRedir"
 license=('GPL2' 'LGPL2.1')
 depends=('libusb')
diff --git a/community/usbview/PKGBUILD b/community/usbview/PKGBUILD
index 8a0a59b05..9f5974388 100644
--- a/community/usbview/PKGBUILD
+++ b/community/usbview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=usbview
 pkgver=2.0
 pkgrel=2
 pkgdesc="Display the topology of devices on the USB bus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kroah.com/linux/usb/"
 license=('GPL')
 depends=('gtk3' 'desktop-file-utils')
diff --git a/community/ushare/PKGBUILD b/community/ushare/PKGBUILD
index 09a8ffa37..f2f2a48ca 100644
--- a/community/ushare/PKGBUILD
+++ b/community/ushare/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=19
 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 1c4fc9c5d..c0a6e4e1f 100644
--- a/community/ussp-push/PKGBUILD
+++ b/community/ussp-push/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ussp-push
 pkgver=0.11
 pkgrel=6
 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 89002c907..761b8b945 100644
--- a/community/ustr/PKGBUILD
+++ b/community/ustr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ustr
 pkgver=1.0.4
 pkgrel=4
 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 1b0fc3394..d8cf4e153 100644
--- a/community/uucp/PKGBUILD
+++ b/community/uucp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=uucp
 pkgver=1.07
 pkgrel=4
 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 939835c23..4ae65cd56 100644
--- a/community/uudeview/PKGBUILD
+++ b/community/uudeview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=uudeview
 pkgver=0.5.20
 pkgrel=11
 pkgdesc="UUDeview helps transmitting & receiving 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 9ac9af3be..ff6b9fd39 100644
--- a/community/uzbl/PKGBUILD
+++ b/community/uzbl/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=uzbl
 pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed')
 pkgver=2012.05.14
 pkgrel=2
-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/vamps/PKGBUILD b/community/vamps/PKGBUILD
index a949e9e95..c6480b17c 100644
--- a/community/vamps/PKGBUILD
+++ b/community/vamps/PKGBUILD
@@ -7,11 +7,11 @@ pkgname=vamps
 pkgver=0.99.2
 pkgrel=10
 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')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/Vamps/${pkgname}-${pkgver}.tar.gz")
 md5sums=('7d438185a2ae95ebb245472d9fa47d06')
 
 build() {
diff --git a/community/vbetool/PKGBUILD b/community/vbetool/PKGBUILD
index de312a4f7..a6e2058eb 100644
--- a/community/vbetool/PKGBUILD
+++ b/community/vbetool/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=3
 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 e352faf92..a28d7489a 100644
--- a/community/vbindiff/PKGBUILD
+++ b/community/vbindiff/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vbindiff
 pkgver=3.0_beta4
 pkgrel=3
 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/vidalia/PKGBUILD b/community/vidalia/PKGBUILD
index cafab9059..5689cd102 100644
--- a/community/vidalia/PKGBUILD
+++ b/community/vidalia/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.2.21
 pkgrel=2
 pkgdesc="Controller GUI for Tor"
 url="https://www.torproject.org/vidalia"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('geoip' 'qt4' 'tor')
 makedepends=('cmake')
diff --git a/community/viewnior/PKGBUILD b/community/viewnior/PKGBUILD
index 159d1a5c1..98e30b3db 100644
--- a/community/viewnior/PKGBUILD
+++ b/community/viewnior/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=viewnior
 pkgver=1.4
 pkgrel=2
 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' 'exiv2')
diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD
index 550c690f2..f55175ced 100644
--- a/community/vifm/PKGBUILD
+++ b/community/vifm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=vifm
 pkgver=0.7.6
 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')
diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD
index c056082a6..1877deec9 100644
--- a/community/viking/PKGBUILD
+++ b/community/viking/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=viking
 pkgver=1.5
 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' 'libexif' 'gpsbabel')
diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD
index 3d40ed441..9f53f2e00 100644
--- a/community/vile/PKGBUILD
+++ b/community/vile/PKGBUILD
@@ -4,9 +4,9 @@
 pkgname=vile
 pkgver=9.8_k
 _basever=9.8
-pkgrel=1
+pkgrel=1.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/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD
index e4e750f51..7ec063ca8 100644
--- a/community/virtualgl/PKGBUILD
+++ b/community/virtualgl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=virtualgl
 pkgver=2.3.3
 pkgrel=1
 pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://virtualgl.org"
 license=('LGPL')
 depends=('libxv' 'glu' 'libjpeg-turbo')
diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD
index 1f98bf015..92df47f8b 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' 'spice-gtk3' 'desktop-file-utils')
 makedepends=('intltool' 'spice-protocol')
 url="http://virt-manager.et.redhat.com"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 install=virtviewer.install
 source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz")
diff --git a/community/visitors/PKGBUILD b/community/visitors/PKGBUILD
index b9ad7302f..8cd4ef970 100644
--- a/community/visitors/PKGBUILD
+++ b/community/visitors/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=visitors
 pkgver=0.7
-pkgrel=3
+pkgrel=3.1
 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/vlan/PKGBUILD b/community/vlan/PKGBUILD
index 01915a0b0..beca1440c 100644
--- a/community/vlan/PKGBUILD
+++ b/community/vlan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vlan
 pkgver=1.9
 pkgrel=3
 pkgdesc='Virtual LAN configuration utility'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.candelatech.com/~greear/vlan.html'
 license=('GPL')
 source=("http://www.candelatech.com/~greear/vlan/vlan.${pkgver}.tar.gz")
diff --git a/community/vmoviedb/PKGBUILD b/community/vmoviedb/PKGBUILD
index 1e14b8adf..6591b4fb4 100644
--- a/community/vmoviedb/PKGBUILD
+++ b/community/vmoviedb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vmoviedb
 pkgver=0.1.5
 pkgrel=6
 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/vmpk/PKGBUILD b/community/vmpk/PKGBUILD
index 5ce3556ad..42c6a0df8 100644
--- a/community/vmpk/PKGBUILD
+++ b/community/vmpk/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=vmpk
 pkgver=0.5.1
 pkgrel=1
 pkgdesc="Virtual MIDI Piano Keyboard"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://vmpk.sourceforge.net/"
 license=('GPL3')
 depends=('qt4' 'jack')
diff --git a/community/vnstat/PKGBUILD b/community/vnstat/PKGBUILD
index 7cc05f52d..b77f5be2b 100644
--- a/community/vnstat/PKGBUILD
+++ b/community/vnstat/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vnstat
 pkgver=1.11
 pkgrel=7
 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/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD
index d9fa8f85a..eb536308d 100644
--- a/community/volumeicon/PKGBUILD
+++ b/community/volumeicon/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=volumeicon
 pkgver=0.5.0
 pkgrel=1
 pkgdesc='Volume control for your system tray'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://softwarebakery.com/maato/volumeicon.html'
 license=('GPL3')
 depends=('gtk3' 'alsa-lib' 'libnotify')
diff --git a/community/vor/PKGBUILD b/community/vor/PKGBUILD
index 16f0651f0..71a095544 100644
--- a/community/vor/PKGBUILD
+++ b/community/vor/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vor
 pkgver=0.5.5
 pkgrel=2
 pkgdesc='Classic spaceship versus asteroid field arcade game'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://jasonwoof.org/vor'
 license=('GPL')
 depends=('sdl_image' 'sdl_mixer')
diff --git a/community/vorbisgain/PKGBUILD b/community/vorbisgain/PKGBUILD
index 6853e7379..58b5aee84 100644
--- a/community/vorbisgain/PKGBUILD
+++ b/community/vorbisgain/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=vorbisgain
 pkgver=0.37
 pkgrel=3
 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 15612bf27..edc211242 100644
--- a/community/vorbissimple/PKGBUILD
+++ b/community/vorbissimple/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vorbissimple
 pkgver=0.0.2
 pkgrel=4
 pkgdesc="A Vorbis decoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kamaelia.sourceforge.net"
 license=('GPL')
 depends=('libvorbis')
diff --git a/community/vsftpd/PKGBUILD b/community/vsftpd/PKGBUILD
index 5c6bc3b11..59e3f6a1e 100644
--- a/community/vsftpd/PKGBUILD
+++ b/community/vsftpd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vsftpd
 pkgver=3.0.2
 pkgrel=2
 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/community/vym/PKGBUILD b/community/vym/PKGBUILD
index 3b37abb6b..7e9d8b387 100644
--- a/community/vym/PKGBUILD
+++ b/community/vym/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vym
 pkgver=2.2.4
 pkgrel=3
 pkgdesc="A mindmapping tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.insilmaril.de/vym/"
 license=('GPL')
 depends=('qt4' 'unzip' 'zip')
diff --git a/community/vyqchat/PKGBUILD b/community/vyqchat/PKGBUILD
index 135ff8e63..1f353b46c 100644
--- a/community/vyqchat/PKGBUILD
+++ b/community/vyqchat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vyqchat
 pkgver=0.2.8
 pkgrel=4
 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 7d448d758..b1d710260 100644
--- a/community/w3cam/PKGBUILD
+++ b/community/w3cam/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=w3cam
 pkgver=0.7.2
 pkgrel=11
 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 9d94d0609..2b3ae1747 100644
--- a/community/warmux/PKGBUILD
+++ b/community/warmux/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=warmux
 pkgver=11.04.1
 pkgrel=7
 pkgdesc="A clone of the worms game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gna.org/projects/warmux/"
 license=('GPL')
 makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD
index ee3858b98..4ee2ac417 100644
--- a/community/warzone2100/PKGBUILD
+++ b/community/warzone2100/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.1.1
 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' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4')
 makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa')
diff --git a/community/wavegain/PKGBUILD b/community/wavegain/PKGBUILD
index 183516e86..cc7ee70fb 100644
--- a/community/wavegain/PKGBUILD
+++ b/community/wavegain/PKGBUILD
@@ -7,7 +7,7 @@ _realname=WaveGain
 pkgver=1.3.1
 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 3d20bcbd6..65bc5a498 100644
--- a/community/wbar/PKGBUILD
+++ b/community/wbar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wbar
 pkgver=2.3.4
 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/webfs/PKGBUILD b/community/webfs/PKGBUILD
index 580b9053d..b96a2a0f7 100644
--- a/community/webfs/PKGBUILD
+++ b/community/webfs/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=webfs
 pkgver=1.21
 pkgrel=10
 pkgdesc="Simple and instant 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=('mime-types' 'openssl')
diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD
index 700cd7ec0..53e252866 100644
--- a/community/weston/PKGBUILD
+++ b/community/weston/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=weston
 pkgver=1.4.0
 pkgrel=2
 pkgdesc='Reference implementation of a Wayland compositor'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://wayland.freedesktop.org'
 license=('MIT')
 depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord')
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index b24052d85..aa5a38bcd 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=17
 _realver=build17
 pkgrel=11
 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')
 depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua51' 'glew' 'python2' 'boost-libs')
diff --git a/community/windowlab/PKGBUILD b/community/windowlab/PKGBUILD
index 873e52767..febeb0aca 100644
--- a/community/windowlab/PKGBUILD
+++ b/community/windowlab/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=windowlab
 pkgver=1.40
 pkgrel=4
 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' 'libxext')
diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD
index 38b3e09cf..70b2c2544 100644
--- a/community/wireshark/PKGBUILD
+++ b/community/wireshark/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
 pkgver=1.10.5
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
              'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
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..0824dcc66 100644
--- a/community/wmctrl/PKGBUILD
+++ b/community/wmctrl/PKGBUILD
@@ -5,10 +5,10 @@
 
 pkgname=wmctrl
 pkgver=1.07
-pkgrel=3
+pkgrel=3.1
 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 84407f57c..76d8a85a0 100644
--- a/community/wmii/PKGBUILD
+++ b/community/wmii/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wmii
 pkgver=3.9.2
 pkgrel=3
 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 599d35733..778e1f94a 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://tools.suckless.org/wmname"
 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 8640272ea..045da6133 100644
--- a/community/workrave/PKGBUILD
+++ b/community/workrave/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=workrave
 pkgver=1.10.1
 pkgrel=1
 pkgdesc="a tool to help RSI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://workrave.org"
 depends=('libxtst' 'gtkmm3' 'gconf' 'gdome2' 'gstreamer0.10' 'libsm' 'libice'
diff --git a/community/wput/PKGBUILD b/community/wput/PKGBUILD
index dfcfdba7d..1d747bbfc 100644
--- a/community/wput/PKGBUILD
+++ b/community/wput/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=wput
 pkgver=0.6.2
-pkgrel=2
+pkgrel=2.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 5a13a578f..409a3804b 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.3.1
 _pkgver=3.3.1
 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' 'libharu')
diff --git a/community/wvdial/PKGBUILD b/community/wvdial/PKGBUILD
index eedb8df9f..421201e1d 100644
--- a/community/wvdial/PKGBUILD
+++ b/community/wvdial/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.61
 pkgrel=4
 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 f54213524..e114812c4 100644
--- a/community/wvstreams/PKGBUILD
+++ b/community/wvstreams/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=wvstreams
 pkgver=4.6.1
 pkgrel=7
 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/wxcam/PKGBUILD b/community/wxcam/PKGBUILD
index 5e2877ed8..ea750b50c 100644
--- a/community/wxcam/PKGBUILD
+++ b/community/wxcam/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=wxcam
 pkgver=1.1
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 pkgdesc="Webcam application for linux"
 # version of CImg library needed to compile wxcam -
diff --git a/community/wyrd/PKGBUILD b/community/wyrd/PKGBUILD
index b5944718a..a81260f41 100644
--- a/community/wyrd/PKGBUILD
+++ b/community/wyrd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wyrd
 pkgver=1.4.6
 pkgrel=1
 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 88ba457e2..1011eb2df 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -9,7 +9,7 @@ epoch=1
 pkgver=1.2.17
 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 9ab05243c..52b0e878d 100644
--- a/community/xautolock/PKGBUILD
+++ b/community/xautolock/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xautolock
 pkgver=2.2
 pkgrel=3
 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/xautomation/PKGBUILD b/community/xautomation/PKGBUILD
index 57287a14e..ed5f38416 100644
--- a/community/xautomation/PKGBUILD
+++ b/community/xautomation/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.05
 pkgrel=3
 pkgdesc='Controls X from the command line and does "visual scraping".'
 url='http://hoopajoo.net/projects/xautomation.html'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libpng' 'libxtst')
 source=("http://hoopajoo.net/static/projects/${pkgname}-${pkgver}.tar.gz"
diff --git a/community/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD
index d0798d280..b71dd164d 100644
--- a/community/xbindkeys/PKGBUILD
+++ b/community/xbindkeys/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xbindkeys
 pkgver=1.8.6
 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')
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index 9f6c46776..a2c71d3ea 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xboard
 pkgver=4.7.3
 pkgrel=1
 pkgdesc="Graphical user interfaces for chess"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/xboard/"
 license=('GPL3')
 depends=('texinfo' 'xdg-utils' 'gtk2' 'cairo' 'librsvg')
diff --git a/community/xchm/PKGBUILD b/community/xchm/PKGBUILD
index 78949a3f8..2e443ca4e 100644
--- a/community/xchm/PKGBUILD
+++ b/community/xchm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xchm
 pkgver=1.23
 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' 'wxgtk2.8' 'desktop-file-utils')
@@ -22,7 +22,9 @@ build() {
 
   export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
   #export WX_CONFIG_PATH=/usr/bin/wx-config-2.8
-  ./configure --prefix=/usr --with-wx-config=wx-config-2.8
+  ./configure --prefix=/usr --with-wx-config=wx-config-2.8 \
+              --build=$CHOST \
+              --host=$CHOST
   make
 }
 
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index c734e1865..e1fe4f387 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xcircuit
 pkgver=3.7.55
 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')
@@ -17,7 +17,7 @@ md5sums=('938bccd7f8309f897ef6c2e742f5dbac')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --with-tcl=/usr/lib --with-tk=/usr/lib --mandir=/usr/share/man
+  ./configure --prefix=/usr --build=$CHOST --with-tcl=/usr/lib --with-tk=/usr/lib --mandir=/usr/share/man
   make
 }
 
diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD
index 7aa15c063..6fc939759 100644
--- a/community/xdebug/PKGBUILD
+++ b/community/xdebug/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xdebug
 pkgver=2.2.3
 pkgrel=3
 pkgdesc="PHP debugging extension"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xdebug.org"
 license=('GPL')
 depends=('php')
@@ -25,7 +25,7 @@ build() {
   make
 
   cd debugclient
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST
   make
 }
 
diff --git a/community/xdelta3/PKGBUILD b/community/xdelta3/PKGBUILD
index 7ef0fbcc1..d629379ea 100644
--- a/community/xdelta3/PKGBUILD
+++ b/community/xdelta3/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xdelta3
 pkgver=3.0.8
 pkgrel=1
 pkgdesc='Diff utility which works with binary files'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://xdelta.org/'
 license=('GPL')
 depends=('xz')
diff --git a/community/xdialog/PKGBUILD b/community/xdialog/PKGBUILD
index ddc3a1601..d79e98a6f 100644
--- a/community/xdialog/PKGBUILD
+++ b/community/xdialog/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.3.1
 pkgrel=6
 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 71491ef78..e1d5683a1 100644
--- a/community/xdiskusage/PKGBUILD
+++ b/community/xdiskusage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xdiskusage
 pkgver=1.48
 pkgrel=7
 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 79b024cc1..62ee633e5 100644
--- a/community/xdotool/PKGBUILD
+++ b/community/xdotool/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xdotool
 pkgver=2.20110530.1
 pkgrel=3
 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 a2823dea6..df31f4696 100644
--- a/community/xemacs/PKGBUILD
+++ b/community/xemacs/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xemacs
 pkgver=21.5.33
 pkgrel=5
 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=('libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD
index c22a95295..c4420367b 100644
--- a/community/xfe/PKGBUILD
+++ b/community/xfe/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfe
 pkgver=1.37
 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/xkbsel/PKGBUILD b/community/xkbsel/PKGBUILD
index 0fcdd1956..2c6a7e6eb 100644
--- a/community/xkbsel/PKGBUILD
+++ b/community/xkbsel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xkbsel
 pkgver=0.13
 pkgrel=7
 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 ef7c188bf..6922d467d 100644
--- a/community/xkeycaps/PKGBUILD
+++ b/community/xkeycaps/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=xkeycaps
 pkgver=2.46
 pkgrel=6
-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 71b6364b3..2c6b9618b 100644
--- a/community/xl2tpd/PKGBUILD
+++ b/community/xl2tpd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xl2tpd
 pkgver=1.3.6
 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/services/software/xl2tpd/"
 license=('GPL')
 depends=('ppp')
diff --git a/community/xloadimage/PKGBUILD b/community/xloadimage/PKGBUILD
index 3a4fa3b8f..3d0602889 100644
--- a/community/xloadimage/PKGBUILD
+++ b/community/xloadimage/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xloadimage
 pkgver=4.1
 pkgrel=13
 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 c501bafcb..99157a4d0 100644
--- a/community/xlockmore/PKGBUILD
+++ b/community/xlockmore/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xlockmore
 pkgver=5.43
 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 libxmu glu)
 optdepends=('fortune-mod')
diff --git a/community/xml2/PKGBUILD b/community/xml2/PKGBUILD
index 75cc5d49d..87457b8ee 100644
--- a/community/xml2/PKGBUILD
+++ b/community/xml2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xml2
 pkgver=0.5
 pkgrel=1
 pkgdesc="XML/Unix Processing Tools to convert XML and HTML to and from a line-oriented format more amenable to processing by classic Unix pipeline processing tools"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 url="http://www.ofb.net/~egnor/xml2/"
 license=("GPL")
 depends=("libxml2")
diff --git a/community/xmldiff/PKGBUILD b/community/xmldiff/PKGBUILD
index a041c92fa..a2a86362a 100644
--- a/community/xmldiff/PKGBUILD
+++ b/community/xmldiff/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=xmldiff
 pkgver=0.6.10
-pkgrel=2
+pkgrel=2.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 453ba6c11..f0fd475e4 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.36.00
 pkgrel=1
 epoch=1
 pkgdesc='XML-RPC for C and C++'
-arch=('x86_64' 'i686')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://xmlrpc-c.sourceforge.net/'
 license=('custom')
 depends=('curl' 'libxml2')
diff --git a/community/xmlstarlet/PKGBUILD b/community/xmlstarlet/PKGBUILD
index 3e6c18d11..4a0ffad20 100644
--- a/community/xmlstarlet/PKGBUILD
+++ b/community/xmlstarlet/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xmlstarlet
 pkgver=1.5.0
 pkgrel=1
 pkgdesc="A set of tools to transform, query, validate, and edit XML documents"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xmlstar.sourceforge.net/"
 license=('MIT')
 depends=('libxslt')
diff --git a/community/xmms-imms/PKGBUILD b/community/xmms-imms/PKGBUILD
index fd6a5cb94..f23436741 100644
--- a/community/xmms-imms/PKGBUILD
+++ b/community/xmms-imms/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmms-imms
 pkgver=3.1.0_rc10
 pkgrel=1
 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' 'sqlite' 'taglib' 'glib2' 'sox' 'torch' 'libxss' 'fftw')
diff --git a/community/xmms-pulse/PKGBUILD b/community/xmms-pulse/PKGBUILD
index f7e7ec69b..039f55122 100644
--- a/community/xmms-pulse/PKGBUILD
+++ b/community/xmms-pulse/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xmms-pulse
 pkgver=0.9.4
 pkgrel=4
 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 98d91696a..75aa3a075 100644
--- a/community/xmms-volnorm/PKGBUILD
+++ b/community/xmms-volnorm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xmms-volnorm
 pkgver=0.8.3
 pkgrel=5
 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')
 depends=('xmms')
diff --git a/community/xmms2/PKGBUILD b/community/xmms2/PKGBUILD
index 571ed19af..1a5740fcb 100644
--- a/community/xmms2/PKGBUILD
+++ b/community/xmms2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xmms2
 pkgver=0.8DrO_o
 pkgrel=23
 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')
@@ -15,6 +15,7 @@ makedepends=('alsa-lib' 'boost' 'curl' 'faad2' 'ffmpeg' 'fftw' 'flac' 'glib'
 	'libdiscid' 'libcdio-paranoia'
 	'libvorbis' 'libxml2' 'mpg123' 'perl' 'pulseaudio' 'pyrex'
 	'ruby' 'smbclient' 'speex' 'wavpack' 'libmodplug' 'python' 'python2' 'libgme' 'avahi')
+[ "$CARCH" = "mips64el" ] || makedepends+=('oss')
 optdepends=('alsa-lib: ALSA audio output'
 	    'avahi: announce xmms2d via bonjour/mDNS/zeroconf'
 	    'boost: C++ language bindings'
@@ -36,6 +37,7 @@ optdepends=('alsa-lib: ALSA audio output'
 	    'libshout: Icecast audio output'
 	    'libvorbis: Ogg Vorbis support'
 	    'libxml2: XSPF and podcast support'
+      'perl: Perl language bindings'
 	    'mpg123: alternative MP3 plugin'
 	    'perl: Perl language bindings'
 	    'pulseaudio: PulseAudio audio output'
@@ -44,6 +46,7 @@ optdepends=('alsa-lib: ALSA audio output'
 	    'smbclient: direct CIFS/SMB access'
 	    'speex: Speex support'
 	    'wavpack: WavPack support')
+[ "$CARCH" = "mips64el" ] || optdepends+=('oss: OSS audio output')
 #	    'sidplay: to play a Commodore 64 music files AKA zaks'
 # we do not have sidplay 2 series in repos; also it's
 # somehow connected with resid i guess(not in repos also)
diff --git a/community/xmmsctrl/PKGBUILD b/community/xmmsctrl/PKGBUILD
index 10e4566d6..95839d1b1 100644
--- a/community/xmmsctrl/PKGBUILD
+++ b/community/xmmsctrl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xmmsctrl
 pkgver=1.9
 pkgrel=3
 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 75c330b62..20e14ca5a 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 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.6.3-1' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5'
 	     'haskell-stm=2.4.2-2' 'haskell-parsec=3.1.3-3' 'haskell-mtl=2.1.2-3' 'haskell-regex-base' 'haskell-regex-compat')
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 44f7ee06a..898a7b6da 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmonad-contrib
 pkgver=0.11.2
 pkgrel=2
 pkgdesc="Add-ons for xmonad"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xmonad.org/"
 license=('BSD')
 depends=('ghc=7.6.3-1' 'xmonad=0.11-7' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5')
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index 9e473de44..12b88e26f 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmonad
 pkgver=0.11
 pkgrel=7
 pkgdesc="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.6.3-1' 'gmp' 'haskell-x11=1.6.1.1-3' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-utf8-string=0.3.7-5' 'haskell-extensible-exceptions=0.1.1.4-5')
diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD
index 4e0136457..60c2f03f0 100644
--- a/community/xmoto/PKGBUILD
+++ b/community/xmoto/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xmoto
 pkgver=0.5.10
 pkgrel=4
 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=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' 
diff --git a/community/xmoto/unistd.patch b/community/xmoto/unistd.patch
new file mode 100644
index 000000000..5cc765449
--- /dev/null
+++ b/community/xmoto/unistd.patch
@@ -0,0 +1,12 @@
+*** src/helpers/System.cpp	2011-10-11 22:18:14.000000000 +0200
+--- src/helpers/System2.cpp	2012-06-10 12:13:10.899345562 +0200
+***************
+*** 24,29 ****
+--- 24,30 ----
+  #include "Log.h"
+  #include "VExcept.h"
+  #include <sstream>
++ #include <unistd.h>
+  
+  std::vector<std::string>* System::getDisplayModes(int windowed) {
+      std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/community/xmove/PKGBUILD b/community/xmove/PKGBUILD
index e1ac2aba5..e24d2b3d3 100644
--- a/community/xmove/PKGBUILD
+++ b/community/xmove/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xmove
 pkgver=2.0beta2
 pkgrel=5
 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 0f3d3e5b7..d0c50f8a5 100644
--- a/community/xnc/PKGBUILD
+++ b/community/xnc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xnc
 pkgver=5.0.4
 pkgrel=7
 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')
@@ -23,7 +23,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p1 <$srcdir/xnc-gcc44.patch
   patch -p1 <$srcdir/libpng15.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  ./configure --prefix=/usr --mandir=/usr/share/man --build=$CHOST
   make
 }
 
diff --git a/community/xnee/PKGBUILD b/community/xnee/PKGBUILD
index 33808659a..fb5c09419 100644
--- a/community/xnee/PKGBUILD
+++ b/community/xnee/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xnee
 pkgver=3.17
 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://xnee.wordpress.com/"
 license=('GPL3')
 depends=('gtk2' 'libxtst')
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
index 729ad49e5..cf8ea5f10 100755
--- a/community/xnoise/PKGBUILD
+++ b/community/xnoise/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xnoise
 pkgver=0.2.20
 pkgrel=1
 pkgdesc="Media player with a slick GUI, great speed and lots of features."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xnoise-media-player.com/"
 license=('GPL2')
 depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo>=0.2' 'librsvg')
diff --git a/community/xosd/PKGBUILD b/community/xosd/PKGBUILD
index 257e5215b..c154bde89 100644
--- a/community/xosd/PKGBUILD
+++ b/community/xosd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xosd
 pkgver=2.2.14
 pkgrel=7
 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 532db840d..b537a2b74 100644
--- a/community/xpacman/PKGBUILD
+++ b/community/xpacman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xpacman
 pkgver=0.11
 pkgrel=6
 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 15ab053ba..17d28aa69 100644
--- a/community/xpacman2/PKGBUILD
+++ b/community/xpacman2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xpacman2
 pkgver=1.002
 pkgrel=4
 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 d1200009e..ae0459e64 100644
--- a/community/xpad/PKGBUILD
+++ b/community/xpad/PKGBUILD
@@ -7,19 +7,23 @@ pkgname=xpad
 pkgver=4.2
 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/"
 license=('GPL')
 install=xpad.install
 source=(http://launchpad.net/xpad/trunk/$pkgver/+download/xpad-$pkgver.tar.bz2
-	xpad-gtk-2.20.patch)
+	xpad-gtk-2.20.patch
+	xpad-4.1-glib.patch)
 md5sums=('85583f8f68ad61ec282ea1332fe76480'
-         '6a3d2952b469d65ec333714991ba8284')
+         '6a3d2952b469d65ec333714991ba8284'
+         '69a2792b9cf4791aa733d1034a28c84b')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+#  patch -p1 <$srcdir/xpad-gtk-2.20.patch
+  patch -Np1 -i ${srcdir}/xpad-4.1-glib.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/community/xpad/xpad-4.1-glib.patch b/community/xpad/xpad-4.1-glib.patch
new file mode 100644
index 000000000..c90f961c3
--- /dev/null
+++ b/community/xpad/xpad-4.1-glib.patch
@@ -0,0 +1,10 @@
+--- xpad-4.1.orig/src/xpad-undo.c	2011-11-15 12:17:05.000000000 -0500
++++ xpad-4.1/src/xpad-undo.c	2013-01-03 02:30:45.683705231 -0500
+@@ -23,7 +23,6 @@
+ #include "../config.h"
+ #include <stdlib.h>
+ #include <glib.h>
+-#include <glib/glist.h>
+ #include "xpad-undo.h"
+ #include "xpad-text-buffer.h"
+ 
diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD
index 8da9880f9..598bd38ff 100644
--- a/community/xplanet/PKGBUILD
+++ b/community/xplanet/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xplanet
 pkgver=1.3.0
 pkgrel=4
 pkgdesc="An Xearth wannabe"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xplanet.sourceforge.net/"
 license=('GPL')
 depends=('pango' 'giflib' 'libtiff' 'libxss')
diff --git a/community/xplc/PKGBUILD b/community/xplc/PKGBUILD
index d7f452021..7d1c364e7 100644
--- a/community/xplc/PKGBUILD
+++ b/community/xplc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xplc
 pkgver=0.3.13
 pkgrel=5
 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 3ecb58312..df1f20755 100644
--- a/community/xrestop/PKGBUILD
+++ b/community/xrestop/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xrestop
 pkgver=0.4
-pkgrel=4
+pkgrel=4.1
 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 4a4e361ee..ca1976da9 100644
--- a/community/xsel/PKGBUILD
+++ b/community/xsel/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xsel
 pkgver=1.2.0
-pkgrel=5
+pkgrel=5.1
 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 33b613a55..aa973e745 100644
--- a/community/xsensors/PKGBUILD
+++ b/community/xsensors/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xsensors
 pkgver=0.70
 pkgrel=5
 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 1f35b5cea..7ebec39e2 100644
--- a/community/xsettings-client/PKGBUILD
+++ b/community/xsettings-client/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xsettings-client
 pkgver=0.10
 pkgrel=7
 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 c1d0c5a70..e69bf849c 100644
--- a/community/xtmsplit/PKGBUILD
+++ b/community/xtmsplit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xtmsplit
 pkgver=0.2
 pkgrel=3
 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/xvkbd/PKGBUILD b/community/xvkbd/PKGBUILD
index 2b27dc638..633ed59d8 100644
--- a/community/xvkbd/PKGBUILD
+++ b/community/xvkbd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xvkbd
 pkgver=3.5
 pkgrel=1
 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' 'libxpm')
diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD
index c6ce32769..5bae4061f 100644
--- a/community/xwax/PKGBUILD
+++ b/community/xwax/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xwax
 pkgver=1.5
 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..44511d671 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')
@@ -22,7 +22,7 @@ md5sums=('c2e5c7f3285033f0e26b358ef95a7c89'
 build() {
   cd "${srcdir}"/${pkgname}
   xmkmf
-  make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm'
+  make PROJECTROOT=/usr PIXMAPDIR=/usr/share/$pkgname LOCAL_LIBRARIES='-lXext -lXt -lXpm -lX11'
 }
 
 package() {
diff --git a/community/yabause-gtk/PKGBUILD b/community/yabause-gtk/PKGBUILD
index 55d4c6681..cc5be771b 100755
--- a/community/yabause-gtk/PKGBUILD
+++ b/community/yabause-gtk/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=yabause-gtk
 pkgver=0.9.13
 pkgrel=1
 pkgdesc='A Sega Saturn emulator'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://yabause.org/"
 license=('GPL')
 depends=('freeglut' 'gtkglext' 'openal' 'sdl')
diff --git a/community/yabause-qt/PKGBUILD b/community/yabause-qt/PKGBUILD
index 881f959e2..76aa07d0e 100755
--- a/community/yabause-qt/PKGBUILD
+++ b/community/yabause-qt/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=yabause-qt
 pkgver=0.9.13
 pkgrel=1
 pkgdesc='A Sega Saturn emulator'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://yabause.org/"
 license=('GPL')
 depends=('freeglut' 'mesa' 'openal' 'qt4' 'sdl')
diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD
index 369ee25a1..35887c297 100644
--- a/community/yagf/PKGBUILD
+++ b/community/yagf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=yagf
 pkgver=0.9.3
 pkgrel=1
 pkgdesc="Qt4-based GUI for Cuneiform and Tesseract OCRs"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://symmetrica.net/cuneiform-linux/yagf-en.html"
 license=('GPL')
 depends=('qt4' 'aspell')
diff --git a/community/yamdi/PKGBUILD b/community/yamdi/PKGBUILD
index 1aa9f795d..d4ef6f03f 100644
--- a/community/yamdi/PKGBUILD
+++ b/community/yamdi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=yamdi
 pkgver=1.9
 pkgrel=1
 pkgdesc="A metadata injector for FLV files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://yamdi.sourceforge.net/"
 license=('custom:BSD')
 depends=('glibc')
diff --git a/community/yaml-cpp/PKGBUILD b/community/yaml-cpp/PKGBUILD
index c2fc7add7..47a77d7db 100644
--- a/community/yaml-cpp/PKGBUILD
+++ b/community/yaml-cpp/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.5.1
 pkgrel=1
 pkgdesc="YAML parser and emitter in C++, written around the YAML 1.2 spec"
 url="http://code.google.com/p/yaml-cpp/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 makedepends=('cmake' 'boost')
 source=(http://yaml-cpp.googlecode.com/files/$pkgname-$pkgver.tar.gz)
diff --git a/community/yaws/PKGBUILD b/community/yaws/PKGBUILD
index 128837dd1..ce581444f 100644
--- a/community/yaws/PKGBUILD
+++ b/community/yaws/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=yaws
 pkgver=1.97
 pkgrel=1
 pkgdesc='Pure Erlang HTTP web server/framework'
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url='http://yaws.hyber.org/'
 license=('BSD')
 depends=('pam' 'erlang-nox')
diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD
index 5c8caf484..34cf9ec12 100644
--- a/community/yaz/PKGBUILD
+++ b/community/yaz/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=yaz
 pkgver=5.0.12
 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')
 url="http://www.indexdata.dk/yaz"
 license=('BSD')
 depends=('openssl' 'libxslt' 'icu')
diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD
index 87380a769..9e1722961 100644
--- a/community/zathura-djvu/PKGBUILD
+++ b/community/zathura-djvu/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zathura-djvu
 pkgver=0.2.3
 pkgrel=2
 pkgdesc="Adds DjVu support to zathura by using the djvulibre library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/"
 license=('custom')
 depends=('djvulibre' 'zathura')
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index 5ddffef37..c9d75602e 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zathura-pdf-mupdf
 pkgver=0.2.6
 pkgrel=1
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
 license=('custom')
 depends=('mupdf>=1.3' 'zathura'
diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD
index 69ce6a14f..2b289b347 100644
--- a/community/zathura-pdf-poppler/PKGBUILD
+++ b/community/zathura-pdf-poppler/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zathura-pdf-poppler
 pkgver=0.2.4
 pkgrel=1
 pkgdesc="Adds pdf support to zathura by using the poppler engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/"
 license=('custom')
 depends=('poppler-glib' 'zathura')
diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD
index af3bd36f0..bf556d54e 100644
--- a/community/zathura-ps/PKGBUILD
+++ b/community/zathura-ps/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=zathura-ps
 pkgver=0.2.2
 pkgrel=2
 pkgdesc="Adds ps support to zathura by using the libspectre library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://pwmt.org/projects/zathura/plugins/zathura-ps/"
 license=('custom')
 depends=('libspectre' 'zathura')
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index 21b7d1ebb..f646f0fd7 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zathura
 pkgver=0.2.7
 pkgrel=1
 pkgdesc="a document viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pwmt.org/projects/zathura/"
 license=('custom')
 depends=('girara-gtk3' 'sqlite' 'desktop-file-utils' 'file')
diff --git a/community/zaz/PKGBUILD b/community/zaz/PKGBUILD
index 7a4684d6d..c3ce418d0 100644
--- a/community/zaz/PKGBUILD
+++ b/community/zaz/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zaz
 pkgver=1.0.0
 pkgrel=3
 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' 'desktop-file-utils')
diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD
index 6c3f2b7ba..85cca0e15 100644
--- a/community/zeromq/PKGBUILD
+++ b/community/zeromq/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=zeromq
 pkgver=4.0.3
 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' 'libsodium')
diff --git a/community/zh-autoconvert/PKGBUILD b/community/zh-autoconvert/PKGBUILD
index 66c87cd94..1206f8c8c 100644
--- a/community/zh-autoconvert/PKGBUILD
+++ b/community/zh-autoconvert/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc="An intelligent Chinese Encoding converter"
 url="http://libhz.googlecode.com/"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc')
 source=(${url}/files/${pkgname}-${pkgver}.tar.gz
 	autoconvert.patch)
diff --git a/community/zile/PKGBUILD b/community/zile/PKGBUILD
index 4ed801004..34665a8fb 100644
--- a/community/zile/PKGBUILD
+++ b/community/zile/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=zile
 pkgver=2.4.9
 pkgrel=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/"
 license=('GPL3')
 depends=('acl' 'gc' 'ncurses')
diff --git a/community/zinnia/PKGBUILD b/community/zinnia/PKGBUILD
index 2551cbf5f..0ed9f82b1 100644
--- a/community/zinnia/PKGBUILD
+++ b/community/zinnia/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=zinnia
 pkgver=0.06
 pkgrel=3
 pkgdesc="Simple, customizable and portable online hand recognition system based on Support Vector Machines"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zinnia.sourceforge.net/"
 license=('BSD')
 depends=('gcc-libs')
diff --git a/community/znc/PKGBUILD b/community/znc/PKGBUILD
index f75a0d819..559b1d1ac 100644
--- a/community/znc/PKGBUILD
+++ b/community/znc/PKGBUILD
@@ -9,7 +9,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=('libsasl')
 makedepends=('tcl' 'python' 'perl')
 optdepends=('tcl: modtcl module'
diff --git a/community/zynaddsubfx/PKGBUILD b/community/zynaddsubfx/PKGBUILD
index 9f5dcdcfb..f36efad23 100644
--- a/community/zynaddsubfx/PKGBUILD
+++ b/community/zynaddsubfx/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=zynaddsubfx
 pkgver=2.4.3
 pkgrel=2
 pkgdesc="Opensource software synthesizer capable of making a countless number of instruments."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://zynaddsubfx.sourceforge.net"
 license=('GPL')
 depends=('fltk' 'libgl' 'fftw' 'lash' 'mxml')
diff --git a/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch b/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch
new file mode 100644
index 000000000..8eb295689
--- /dev/null
+++ b/community/zynaddsubfx/zynaddsubfx-2.4.3-no_sse_generic.patch
@@ -0,0 +1,21 @@
+--- ZynAddSubFX-2.4.3.orig/src/CMakeLists.txt	2012-06-15 23:22:35.000000000 -0500
++++ ZynAddSubFX-2.4.3/src/CMakeLists.txt	2013-06-15 10:53:13.109741210 -0500
+@@ -116,8 +116,8 @@
+ )
+ 
+ set (BuildOptionsBasic
+-    "-O3 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer"
+-    CACHE STRING "basic X86 complier options"
++    "-O3 -ffast-math -fomit-frame-pointer"
++    CACHE STRING "basic complier options"
+ )
+ 
+ set (BuildOptionsDebug
+@@ -173,7 +173,6 @@
+ include_directories(${ZLIB_INCLUDE_DIRS} ${MXML_INCLUDE_DIRS})
+ 
+ add_definitions(
+-	 -DASM_F2I_YES
+ 	 -g #TODO #todo put in a better location
+ 	 -Wall
+ 	 -Wextra
diff --git a/core/acl/PKGBUILD b/core/acl/PKGBUILD
index 9a5deba1a..f3b4c1d5b 100644
--- a/core/acl/PKGBUILD
+++ b/core/acl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=acl
 pkgver=2.2.52
 pkgrel=2
 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 18ec3a3e6..16065788d 100644
--- a/core/attr/PKGBUILD
+++ b/core/attr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=attr
 pkgver=2.4.47
 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') 
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index c6f692ac4..5825ee0eb 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -8,7 +8,7 @@ _patchlevel=045 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=5
 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 d58baa3f7..edd433c64 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=binutils
 pkgver=2.24
 pkgrel=2
 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')
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index 7c0fbdf1d..bd75dd2e3 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bison
 pkgver=3.0.2
 pkgrel=1
 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 07742e381..b6f98d122 100644
--- a/core/bridge-utils/PKGBUILD
+++ b/core/bridge-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bridge-utils
 pkgver=1.5
 pkgrel=2
 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/PKGBUILD b/core/btrfs-progs/PKGBUILD
index 0c7b57c62..458eb992a 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=btrfs-progs
 pkgver=3.12
 pkgrel=1
 pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=('glibc' 'e2fsprogs' 'lzo2')
 makedepends=('git')
 url="http://btrfs.wiki.kernel.org/"
diff --git a/core/bzip2/PKGBUILD b/core/bzip2/PKGBUILD
index ca426611d..8601505b5 100644
--- a/core/bzip2/PKGBUILD
+++ b/core/bzip2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bzip2
 pkgver=1.0.6
 pkgrel=5
 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 4b3b730a9..780e8e0d4 100644
--- a/core/cloog/PKGBUILD
+++ b/core/cloog/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cloog
 pkgver=0.18.1
 pkgrel=2
 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')
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index 018624ada..afa05d286 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=coreutils
 pkgver=8.22
 pkgrel=2
 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 2dee4446e..fe94b5378 100644
--- a/core/cracklib/PKGBUILD
+++ b/core/cracklib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cracklib
 pkgver=2.9.0
 pkgrel=2
 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 358600e04..97541e8dd 100644
--- a/core/crda/PKGBUILD
+++ b/core/crda/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=crda
 pkgver=1.1.3
 pkgrel=3
 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' 'systemd' 'iw')
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index a1e00c55d..67e54b5cf 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -8,7 +8,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=('pm-utils: defer anacron on battery power'
             'smtp-server: send job output via email'
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 279a4ee3a..3ca0ff89d 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cryptsetup
 pkgver=1.6.3
 pkgrel=2
 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 78801016e..a12afcd78 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=curl
 pkgver=7.35.0
 pkgrel=1
 pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://curl.haxx.se"
 license=('MIT')
 depends=('ca-certificates' 'krb5' 'libssh2' 'openssl' 'zlib')
diff --git a/core/dash/PKGBUILD b/core/dash/PKGBUILD
index eb288f561..b7ac42bd7 100644
--- a/core/dash/PKGBUILD
+++ b/core/dash/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dash
 pkgver=0.5.7
 pkgrel=4
 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 706eb4f5c..f29e0eefc 100644
--- a/core/db/PKGBUILD
+++ b/core/db/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=db
 pkgver=5.3.28
 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/PKGBUILD b/core/dbus/PKGBUILD
index 7afab2a65..3ce1871f0 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.8.0
 pkgrel=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')
 makedepends=('libx11' 'systemd' 'xmlto' 'docbook-xsl')
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index ff0c3c431..412bbfaf9 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=6.2.1
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/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 0a011b2c8..a0982a78b 100644
--- a/core/dialog/PKGBUILD
+++ b/core/dialog/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.2_20140219
 pkgrel=1
 epoch=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=('sh' 'ncurses')
diff --git a/core/diffutils/PKGBUILD b/core/diffutils/PKGBUILD
index 0ed2f9049..4e860468c 100644
--- a/core/diffutils/PKGBUILD
+++ b/core/diffutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=diffutils
 pkgver=3.3
 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/diffutils/gnulib-no-gets.patch b/core/diffutils/gnulib-no-gets.patch
new file mode 100644
index 000000000..435c3bfb9
--- /dev/null
+++ b/core/diffutils/gnulib-no-gets.patch
@@ -0,0 +1,44 @@
+diff --git a/lib/stdio.in.h b/lib/stdio.in.h
+index aa7b599..c377b6e 100644
+--- a/lib/stdio.in.h
++++ b/lib/stdio.in.h
+@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   so any use of gets warrants an unconditional warning; besides, C11
++   removed it.  */
++#undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
+ # endif
+ #endif
+ 
+-/* Some people would argue that sprintf should be handled like gets
+-   (for example, OpenBSD issues a link warning for both functions),
+-   since both can cause security holes due to buffer overruns.
++/* Some people would argue that all sprintf uses should be warned about
++   (for example, OpenBSD issues a link warning for it),
++   since it can cause security holes due to buffer overruns.
+    However, we believe that sprintf can be used safely, and is more
+    efficient than snprintf in those safe cases; and as proof of our
+    belief, we use sprintf in several gnulib modules.  So this header
diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD
index f9f76c2ed..5159752ed 100644
--- a/core/dirmngr/PKGBUILD
+++ b/core/dirmngr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dirmngr
 pkgver=1.1.1
 pkgrel=2
 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/core/dmraid/PKGBUILD b/core/dmraid/PKGBUILD
index 572ca79cc..0747ebc40 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/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD
index cff6d5dd8..5f0137718 100644
--- a/core/dosfstools/PKGBUILD
+++ b/core/dosfstools/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dosfstools
 pkgver=3.0.25
 pkgrel=1
 pkgdesc="DOS filesystem utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('glibc')
 source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
 url="http://www.daniel-baumann.ch/software/dosfstools/"
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index 561e3e1c4..23b8784a2 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=e2fsprogs
 pkgver=1.42.9
 pkgrel=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 96ba7fe0e..8067b6faa 100644
--- a/core/ed/PKGBUILD
+++ b/core/ed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ed
 pkgver=1.9
 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/efibootmgr/PKGBUILD b/core/efibootmgr/PKGBUILD
deleted file mode 100755
index 2a6515a72..000000000
--- a/core/efibootmgr/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 197808 2013-10-30 11:03:08Z allan $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Murtuza Akhtari <inxsible at gmail dot com>
-# Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-
-pkgname="efibootmgr"
-
-_gitroot="git://github.com/vathpela/efibootmgr.git"
-_gitname="${pkgname}-pjones"
-_gitbranch="libefivars"
-
-pkgver=0.6.0.138.1132342
-pkgrel=1
-pkgdesc="Tool to modify UEFI Firmware Boot Manager Variables"
-arch=('x86_64' 'i686')
-url="https://github.com/vathpela/efibootmgr"
-license=('GPL2')
-makedepends=('git')
-depends=('pciutils' 'efivar' 'zlib')
-options=('strip' 'zipman' '!emptydirs')
-
-source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
-sha1sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${_gitname}/"
-	
-	_RELEASE_MAJOR="$(grep 'RELEASE_MAJOR' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_MAJOR := ||g')"
-	_RELEASE_MINOR="$(grep 'RELEASE_MINOR' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_MINOR := ||g')"
-	_RELEASE_SUBLEVEL="$(grep 'RELEASE_SUBLEVEL' "${srcdir}/${_gitname}/Makefile" | head -1 | sed -e 's|RELEASE_SUBLEVEL := ||g')"
-	
-	_ACTUAL_VER="$(echo ${_RELEASE_MAJOR}.${_RELEASE_MINOR}.${_RELEASE_SUBLEVEL} | sed 's| ||g')"
-	
-	echo "${_ACTUAL_VER}.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
-}
-
-build() {
-	
-	rm -rf "${srcdir}/${_gitname}_build/" || true
-	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
-	
-	cd "${srcdir}/${_gitname}_build/"
-	
-	make EXTRA_CFLAGS="-Os"
-	echo
-	
-}
-
-package() {
-	
-	cd "${srcdir}/${_gitname}_build/"
-	
-	install -d "${pkgdir}/usr/bin/"
-	install -D -m0755 "${srcdir}/${_gitname}_build/src/efibootmgr/efibootmgr" "${pkgdir}/usr/bin/efibootmgr"
-	
-	install -d "${pkgdir}/usr/share/man/man8/"
-	install -D -m0644 "${srcdir}/${_gitname}_build/src/man/man8/efibootmgr.8" "${pkgdir}/usr/share/man/man8/efibootmgr.8"
-	
-}
diff --git a/core/efibootmgr/efibootmgr-tilt_slashes-func.patch b/core/efibootmgr/efibootmgr-tilt_slashes-func.patch
deleted file mode 100644
index ce857bb3c..000000000
--- a/core/efibootmgr/efibootmgr-tilt_slashes-func.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/efibootmgr/efibootmgr.c b/src/efibootmgr/efibootmgr.c
-index 236365a..9883961 100644
---- a/src/efibootmgr/efibootmgr.c
-+++ b/src/efibootmgr/efibootmgr.c
-@@ -803,6 +803,7 @@ usage()
- 	printf("\t-V | --version          return version and exit\n");
- 	printf("\t-w | --write-signature  write unique sig to MBR if needed\n");
- 	printf("\t-@ | --append-binary-args file  append extra args from file (use \"-\" for stdin)\n");
-+	printf("\t   | --help             show help/usage\n");
- }
- 
- static void
-@@ -863,6 +864,7 @@ parse_opts(int argc, char **argv)
- 			{"version",                no_argument, 0, 'V'},
- 			{"write-signature",        no_argument, 0, 'w'},
- 			{"append-binary-args", required_argument, 0, '@'},
-+			{"help",                   no_argument, 0,   2},
- 			{0, 0, 0, 0}
- 		};
- 
-@@ -1014,6 +1016,10 @@ parse_opts(int argc, char **argv)
- 			opts.write_signature = 1;
- 			break;
- 
-+		case 2:
-+			usage();
-+			exit(1);
-+
- 		default:
- 			usage();
- 			exit(1);
-diff --git a/src/lib/efi.c b/src/lib/efi.c
-index a4ce5cf..8ef8be8 100644
---- a/src/lib/efi.c
-+++ b/src/lib/efi.c
-@@ -70,6 +70,16 @@ efi_guid_unparse(efi_guid_t *guid, char *out)
-         return out;
- }
- 
-+char *
-+tilt_slashes(char *s)
-+{
-+	char *p;
-+	for (p = s; *p; p++)
-+		if (*p == '/')
-+			*p = '\\';
-+	return s;
-+}
-+
- void
- set_fs_kernel_calls()
- {
-@@ -535,7 +545,7 @@ char *make_disk_load_option(char *p, char *disk)
- 				     signature,
- 				     mbr_type, signature_type);
- 
--    efichar_from_char(os_loader_path, opts.loader, sizeof(os_loader_path));
-+    efichar_from_char(os_loader_path, tilt_slashes(opts.loader), sizeof(os_loader_path));
-     p += make_file_path_device_path (p, os_loader_path);
-     p += make_end_device_path       (p);
- 
diff --git a/core/efivar/PKGBUILD b/core/efivar/PKGBUILD
deleted file mode 100644
index e8d8995d1..000000000
--- a/core/efivar/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 199468 2013-11-13 11:07:43Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-
-_gitroot="git://github.com/vathpela/efivar.git"
-_gitname="efivar"
-_gitbranch="master"
-
-_pkgname="efivar"
-pkgname="${_pkgname}"
-
-pkgdesc="Library to manipulate EFI variables"
-pkgver=0.7
-pkgrel=1
-arch=('x86_64' 'i686')
-url="https://github.com/vathpela/efivar"
-license=('LGPL2.1')
-makedepends=('git')
-depends=('popt')
-conflicts=('libefivar')
-provides=('libefivar')
-options=('zipman' 'docs' '!makeflags')
-
-source=("${_gitname}::git+${_gitroot}#tag=${pkgver}")
-sha1sums=('SKIP')
-
-pkgver() {
-	cd "${srcdir}/${_gitname}/"
-        echo "$(git describe --tags)" | sed 's|-|\.|g'
-}
-
-build() {
-	
-	rm -rf "${srcdir}/${_gitname}_build/" || true
-	cp -r "${srcdir}/${_gitname}" "${srcdir}/${_gitname}_build"
-	
-	cd "${srcdir}/${_gitname}_build/"
-	
-	git clean -x -d -f
-	echo
-	
-	unset CFLAGS
-	unset CPPFLAGS
-	unset CXXFLAGS
-	unset LDFLAGS
-	unset MAKEFLAGS
-	
-	sed 's|-rpath=$(TOPDIR)/src/|-rpath=$(libdir)|g' -i "${srcdir}/${_gitname}_build/src/test/Makefile" || true
-	
-	make libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" V=1 -j1
-	echo
-	
-}
-
-package() {
-	
-	cd "${srcdir}/${_gitname}_build/"
-	
-	make -j1 V=1 DESTDIR="${pkgdir}/" libdir="/usr/lib/" bindir="/usr/bin/" mandir="/usr/share/man/" includedir="/usr/include/" install
-	echo
-	
-	install -d "${pkgdir}/usr/bin"
-	install -D -m0755 "${srcdir}/${_gitname}_build/src/test/tester" "${pkgdir}/usr/bin/efivar-tester"
-	
-}
diff --git a/core/expat/PKGBUILD b/core/expat/PKGBUILD
index da8e1e5a8..18db4d2c3 100644
--- a/core/expat/PKGBUILD
+++ b/core/expat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=expat
 pkgver=2.1.0
 pkgrel=3
 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 5df368d40..19330d06b 100644
--- a/core/fakeroot/PKGBUILD
+++ b/core/fakeroot/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fakeroot
 pkgver=1.20
 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 818a8f0f2..32337b30f 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=file
 pkgver=5.17
 pkgrel=1
 pkgdesc="File type identification utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 groups=('base' 'base-devel')
 url="http://www.darwinsys.com/file/"
diff --git a/core/findutils/PKGBUILD b/core/findutils/PKGBUILD
index bdbd83548..9a598efb0 100644
--- a/core/findutils/PKGBUILD
+++ b/core/findutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=findutils
 pkgver=4.4.2
 pkgrel=5
 pkgdesc="GNU utilities to locate files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 groups=('base' 'base-devel')
 depends=('glibc' 'sh')
diff --git a/core/flex/PKGBUILD b/core/flex/PKGBUILD
index 8f52d3fc6..51dccdc63 100644
--- a/core/flex/PKGBUILD
+++ b/core/flex/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=flex
 pkgver=2.5.38
 pkgrel=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 d8ae62387..f7e45cfd8 100644
--- a/core/gawk/PKGBUILD
+++ b/core/gawk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gawk
 pkgver=4.1.0
 pkgrel=2
 pkgdesc="GNU version of awk"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gawk/"
 license=('GPL')
 groups=('base' 'base-devel')
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index ffb33ea06..d4909f66d 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -4,16 +4,27 @@
 # 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')
+# with libretools/dagpkg you can do
+# export I=gcc
+# run dagpkg over binutils
+# unset I
+# run dagpkg over gcc
+
+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.8.2
 _pkgver=4.8
 pkgrel=8
 _snapshot=4.8-20140206
 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.24' 'libmpc' 'cloog' 'gcc-ada' 'doxygen')
+makedepends=('binutils>=2.24' 'libmpc' 'cloog' 'doxygen')
+[[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada')
 checkdepends=('dejagnu' 'inetutils')
 options=('!emptydirs')
 source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
@@ -40,6 +51,7 @@ prepare() {
 
   # Arch Linux installs x86_64 libraries /lib
   [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64
+  [[ $CARCH == "mips64el" ]] && sed -i 's/lib32/lib/' gcc/config/mips/t-linux64
 
   echo ${pkgver} > gcc/BASE-VER
 
@@ -67,11 +79,29 @@ build() {
   CFLAGS=${CFLAGS/-pipe/}
   CXXFLAGS=${CXXFLAGS/-pipe/}
 
+  # Use our CFLAGS, CXXFLAGS and LDFLAGS for the binaries built.
+  export BOOT_CFLAGS="$CFLAGS"
+  export CFLAGS_FOR_BUILD="$CFLAGS"
+  export CFLAGS_FOR_TARGET="$CFLAGS"
+  export CXXFLAGS_FOR_BUILD="$CXXFLAGS"
+  export CXXFLAGS_FOR_TARGET="$CXXFLAGS"
+  export BOOT_LDFLAGS="$LDFLAGS"
+  export LDFLAGS_FOR_BUILD="$LDFLAGS"
+  export LDFLAGS_FOR_TARGET="$LDFLAGS"
+
+  if [[ "${CARCH}" != "mips64el" ]]; then
+      languages=c,c++,ada,fortran,go,lto,objc,obj-c++
+# ancient mips abi doesn't support gnu.hash yet
+      extra="--with-linker-hash-style=gnu"
+  else
+      languages=c,c++,fortran,lto,objc,obj-c++
+  fi
+
   ${srcdir}/${_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://labs.parabola.nu/ \
+      --enable-languages=$languages \
       --enable-shared --enable-threads=posix \
       --with-system-zlib --enable-__cxa_atexit \
       --disable-libunwind-exceptions --enable-clocale=gnu \
@@ -79,7 +109,7 @@ build() {
       --enable-gnu-unique-object --enable-linker-build-id \
       --enable-cloog-backend=isl --disable-cloog-version-check \
       --enable-lto --enable-plugin --enable-install-libiberty \
-      --with-linker-hash-style=gnu \
+      $extra \
       --disable-multilib --disable-werror \
       --enable-checking=release
   make
@@ -89,6 +119,8 @@ build() {
 }
 
 check() {
+  # Takes days and no one here uses it.
+  if [ "$CARCH" != "mips64el" ] ; then
   cd ${srcdir}/gcc-build
 
   # increase stack size to prevent test failures
@@ -98,6 +130,7 @@ check() {
   # do not abort on error as some are "expected"
   make -k check || true
   ${srcdir}/${_basedir}/contrib/test_summary
+  fi
 }
 
 package_gcc-libs()
@@ -111,7 +144,7 @@ package_gcc-libs()
   cd ${srcdir}/gcc-build
   
   make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  rm ${pkgdir}/${_libdir}/libgcc_eh.a
+  rm -f ${pkgdir}/${_libdir}/libgcc_eh.a
   
   for lib in libmudflap \
              libgomp \
@@ -121,6 +154,10 @@ package_gcc-libs()
              libquadmath \
              libgfortran \
              libsanitizer/asan; do
+    # Skip libitm and asan on mips64el
+    test "$CARCH" = "mips64el" &&
+    echo "libitm libsanitizer/asan" | grep -q "$lib" &&
+    continue
     make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
   done
 
@@ -134,12 +171,17 @@ package_gcc-libs()
   for lib in libgomp \
              libitm \
              libquadmath; do
+    # Skip libitm in mips64el
+    test "$CARCH" = "mips64el" && test "$lib" = "libitm" && continue
     make -C $CHOST/$lib DESTDIR=${pkgdir} install-info
   done
 
   # Install Runtime Library Exception
   install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
     ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
+
+  # for some reason this end up both in gcc and gcc-libs
+  rm -f ${pkgdir}/usr/lib/libstdc++.{l,}a
 }
 
 package_gcc()
@@ -159,7 +201,7 @@ package_gcc()
   install -m755 -t $pkgdir/${_libdir}/ gcc/{cc1,cc1plus,collect2,lto1}
 
   make -C $CHOST/libgcc DESTDIR=${pkgdir} install
-  rm ${pkgdir}/usr/lib/libgcc_s.so*
+  rm -f ${pkgdir}/usr/lib/libgcc_s.so*
   
   make -C $CHOST/libstdc++-v3/src DESTDIR=${pkgdir} install
   make -C $CHOST/libstdc++-v3/include DESTDIR=${pkgdir} install
@@ -169,7 +211,7 @@ package_gcc()
   install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
   mv $pkgdir/usr/lib/libstdc++.so.6.*-gdb.py \
     $pkgdir/usr/share/gdb/auto-load/usr/lib/
-  rm ${pkgdir}/usr/lib/libstdc++.so*
+  rm -f ${pkgdir}/usr/lib/libstdc++.so*
 
   make DESTDIR=${pkgdir} install-fixincludes
   make -C gcc DESTDIR=${pkgdir} install-mkheaders
@@ -177,16 +219,20 @@ package_gcc()
 
   make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
     install-nodist_libsubincludeHEADERS
+# itm not available in mips
+  test "$CARCH" != "mips64el" &&
   make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
   make -C $CHOST/libmudflap DESTDIR=${pkgdir} install-nobase_libsubincludeHEADERS
   make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
+# asan not available in mips
+  test "$CARCH" != "mips64el" &&
   make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
 
   make -C libiberty DESTDIR=${pkgdir} install
 
   make -C gcc DESTDIR=${pkgdir} install-man install-info
-  rm ${pkgdir}/usr/share/man/man1/{gccgo,gfortran}.1
-  rm ${pkgdir}/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
+  rm -f ${pkgdir}/usr/share/man/man1/{gccgo,gfortran}.1
+  rm -f ${pkgdir}/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
 
   make -C libcpp DESTDIR=${pkgdir} install
   make -C gcc DESTDIR=${pkgdir} install-po
@@ -302,7 +348,7 @@ package_gcc-go()
   make -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
   install -Dm755 gcc/go1 $pkgdir/${_libdir}/go1
 
-  rm $pkgdir/usr/lib/libgo.a
+  rm -f $pkgdir/usr/lib/libgo.a
 
   # Install Runtime Library Exception
   install -d ${pkgdir}/usr/share/licenses/gcc-go/
diff --git a/core/gcc/gcc-libs.install b/core/gcc/gcc-libs.install
index 23553b8f0..a6ac198f2 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 || true
   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 || true
   done
 }
diff --git a/core/gdbm/PKGBUILD b/core/gdbm/PKGBUILD
index 9ae79e6cb..59b0722a4 100644
--- a/core/gdbm/PKGBUILD
+++ b/core/gdbm/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="GNU database library"
 url="http://www.gnu.org/software/gdbm/gdbm.html"
 license=('GPL3')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glibc' 'sh')
 source=(ftp://ftp.gnu.org/gnu/gdbm/${pkgname}-${pkgver}.tar.gz{,.sig}
         gdbm-1.10-zeroheaders.patch)
diff --git a/core/gettext/PKGBUILD b/core/gettext/PKGBUILD
index fc1d8973c..ad2995152 100644
--- a/core/gettext/PKGBUILD
+++ b/core/gettext/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gettext
 pkgver=0.18.3.2
 pkgrel=1
 pkgdesc="GNU internationalization library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gettext/"
 license=('GPL')
 groups=('base' 'base-devel')
diff --git a/core/gettext/gnulib-no-gets.patch b/core/gettext/gnulib-no-gets.patch
new file mode 100644
index 000000000..b3cb56479
--- /dev/null
+++ b/core/gettext/gnulib-no-gets.patch
@@ -0,0 +1,48 @@
+diff -ru gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h
+--- gettext-0.18.1.1.orig/gettext-runtime/gnulib-lib/stdio.in.h	2012-10-21 22:31:11.290124705 +0200
++++ gettext-0.18.1.1/gettext-runtime/gnulib-lib/stdio.in.h	2012-10-21 22:31:32.060385194 +0200
+@@ -137,12 +137,6 @@
+                  "use gnulib module fflush for portable POSIX compliance");
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+diff -ru gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h
+--- gettext-0.18.1.1.orig/gettext-tools/gnulib-lib/stdio.in.h	2012-10-21 22:31:09.340394990 +0200
++++ gettext-0.18.1.1/gettext-tools/gnulib-lib/stdio.in.h	2012-10-21 22:31:43.654025009 +0200
+@@ -137,12 +137,6 @@
+                  "use gnulib module fflush for portable POSIX compliance");
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+diff -ru gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h
+--- gettext-0.18.1.1.orig/gettext-tools/libgettextpo/stdio.in.h	2012-10-21 22:31:11.040365944 +0200
++++ gettext-0.18.1.1/gettext-tools/libgettextpo/stdio.in.h	2012-10-21 22:31:38.086822069 +0200
+@@ -137,12 +137,6 @@
+                  "use gnulib module fflush for portable POSIX compliance");
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index 2918b59ab..af8bb022d 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.38.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)
 makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils')
 source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
         revert-warn-glib-compile-schemas.patch)
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 92dc67073..302b4d6bc 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=glibc
 pkgver=2.19
 pkgrel=2
 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')
@@ -43,10 +43,18 @@ prepare() {
 build() {
   cd ${srcdir}/glibc-build
 
+  # on mips64el it fails with
+  # configure: error: --enable-multi-arch support requires assembler and linker support
+  extra=" --enable-multi-arch"
+
   if [[ ${CARCH} = "i686" ]]; then
     # Hack to fix NPTL issues with Xen, only required on 32bit platforms
     # TODO: make separate glibc-xen package for i686
     export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
+  elif [[ ${CARCH} = "mips64el" ]]; then
+    # mips64el is only supported in ports.
+    extra_addons=",ports"
+    unset extra
   fi
 
   echo "slibdir=/usr/lib" >> configparms
@@ -58,16 +66,16 @@ build() {
   CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
 
   ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
+      --host=${CHOST} --build=${CHOST} \
       --libdir=/usr/lib --libexecdir=/usr/lib \
       --with-headers=/usr/include \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-add-ons=nptl,libidn \
+      --with-bugurl=https://labs.parabola.nu/ \
+      --enable-add-ons=nptl,libidn$extra_addons \
       --enable-obsolete-rpc \
       --enable-kernel=2.6.32 \
       --enable-bind-now --disable-profile \
       --enable-stackguard-randomization \
-      --enable-lock-elision \
-      --enable-multi-arch
+      --enable-lock-elision $extra
 
   # build libraries with hardening disabled
   echo "build-programs=no" >> configparms
@@ -84,11 +92,14 @@ build() {
 }
 
 check() {
+  # Known to fail on mips64el.
+  if [ "$CARCH" != "mips64el" ]; then
   # the linker commands need to be reordered - fixed in 2.19
   LDFLAGS=${LDFLAGS/--as-needed,/}
 
   cd ${srcdir}/glibc-build
   make check
+  fi
 }
 
 package() {
diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD
index 353ef4e40..f19fa68be 100644
--- a/core/gmp/PKGBUILD
+++ b/core/gmp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gmp
 pkgver=5.1.3
 pkgrel=2
 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')
@@ -17,6 +17,8 @@ md5sums=('e5fe367801ff067b923d1e6a126448aa'
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  [ "${CARCH}" = "mips64el" ] && export ABI="n32"
 
   ./configure --build=${CHOST} \
     --prefix=/usr --enable-cxx
diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD
index c045ebc26..084e34af6 100644
--- a/core/gnupg/PKGBUILD
+++ b/core/gnupg/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=2
 pkgdesc='Complete and free implementation of the OpenPGP standard'
 url='http://www.gnupg.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 optdepends=('curl: gpg2keys_curl'
             'libldap: gpg2keys_ldap'
             'libusb-compat: scdaemon')
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index d0fed9901..00d418785 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpgme
 pkgver=1.4.3
 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>=2')
diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD
index cb2cd9bc6..0bc6550b2 100644
--- a/core/gpm/PKGBUILD
+++ b/core/gpm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gpm
 pkgver=1.20.7
 pkgrel=4
 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=('bash')
diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD
index 1823febb6..902c0d0fa 100644
--- a/core/grep/PKGBUILD
+++ b/core/grep/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=grep
 pkgver=2.16
 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' 'base-devel')
diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD
index 58a66327f..52a9ac4b3 100644
--- a/core/groff/PKGBUILD
+++ b/core/groff/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=groff
 pkgver=1.22.2
 pkgrel=5
 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')
 groups=('base-devel')
diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD
index 4f394dc9e..3002f5222 100644
--- a/core/gzip/PKGBUILD
+++ b/core/gzip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gzip
 pkgver=1.6
 pkgrel=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' 'base-devel')
diff --git a/core/hdparm/PKGBUILD b/core/hdparm/PKGBUILD
index 095ba8c8c..980f98214 100644
--- a/core/hdparm/PKGBUILD
+++ b/core/hdparm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=hdparm
 pkgver=9.43
 pkgrel=2
 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/ifenslave/PKGBUILD b/core/ifenslave/PKGBUILD
index 32caed5b0..e998eb2ef 100644
--- a/core/ifenslave/PKGBUILD
+++ b/core/ifenslave/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.0
 pkgrel=8
 pkgdesc='Utility for bonding ethernet interfaces'
 url='http://www.linuxfoundation.org/en/Net:Bonding'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('linux-api-headers')
 source=(ifenslave.c::'http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/networking/ifenslave.c;h=450faacc')
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index a7046166a..58f2a2f56 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=inetutils
 pkgver=1.9.2
 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 18d1c94c6..845d5aade 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=iproute2
 pkgver=3.12.0
 pkgrel=1
 pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
 depends=('glibc' 'iptables')
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 6f7334042..c61d2d72d 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=iptables
 pkgver=1.4.21
 pkgrel=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 9e017fab5..059d69140 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -7,13 +7,13 @@ pkgname=iputils
 pkgver=20121221
 pkgrel=3
 pkgdesc="Network monitoring tools, including ping"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.skbuff.net/iputils/"
 groups=('base')
 depends=('openssl' 'sysfsutils' 'libcap')
 optdepends=('xinetd: for tftpd')
-makedepends=('docbook2x' 'opensp')
+makedepends=('docbook2x' 'opensp' 'perl-xml-libxml')
 conflicts=('netkit-base' 'arping' 'netkit-tftpd')
 replaces=('netkit-base')
 backup=(etc/xinetd.d/tftp)
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index 098205c04..3b3d1e11e 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=isl
 pkgver=0.12.2
 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://freecode.com/projects/isl"
 depends=('gmp')
 license=('MIT')
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index 6e5700409..9eff5e362 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=iw
 pkgver=3.13
 pkgrel=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")
diff --git a/core/jfsutils/PKGBUILD b/core/jfsutils/PKGBUILD
index dc7ed30a6..7c5f74615 100644
--- a/core/jfsutils/PKGBUILD
+++ b/core/jfsutils/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.15
 pkgrel=4
 pkgdesc='JFS filesystem utilities'
 url='http://jfs.sourceforge.net'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('util-linux')
 source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index f854388b9..d2becf808 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kbd
 pkgver=2.0.1
 pkgrel=1
 pkgdesc="Keytable files and keyboard utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kbd-project.org"
 license=('GPL')
 depends=('glibc' 'pam')
diff --git a/core/keyutils/PKGBUILD b/core/keyutils/PKGBUILD
index 6eca1430f..37ae8968e 100644
--- a/core/keyutils/PKGBUILD
+++ b/core/keyutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=keyutils
 pkgver=1.5.8
 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/kmod/PKGBUILD b/core/kmod/PKGBUILD
index 9856163cc..e6aa9ed2b 100644
--- a/core/kmod/PKGBUILD
+++ b/core/kmod/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kmod
 pkgver=16
 pkgrel=1
 pkgdesc="Linux kernel module handling"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
 license=('GPL2')
 depends=('glibc' 'zlib')
@@ -31,7 +31,8 @@ build() {
 }
 
 check() {
-  make -C "$pkgname-$pkgver" check
+  # Ignore results: some tests are arch-specific, some require writable /sys.
+  make -C "$pkgname-$pkgver" check || return 0
 }
 
 package() {
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index eb7fc0f73..25a0ff30a 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=krb5
 pkgver=1.12.1
 pkgrel=1
 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/ldns/PKGBUILD b/core/ldns/PKGBUILD
index 33b281866..62b22876f 100644
--- a/core/ldns/PKGBUILD
+++ b/core/ldns/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Fast DNS library supporting recent RFCs'
 url='http://www.nlnetlabs.nl/projects/ldns/'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl' 'dnssec-anchors')
 optdepends=('libpcap: ldns-dpa tool')
 makedepends=('libpcap')
diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD
index 5a9b09245..c0f8284d5 100644
--- a/core/less/PKGBUILD
+++ b/core/less/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=458
 pkgrel=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 3fd599d24..2c9e59200 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libarchive
 pkgver=3.1.2
 pkgrel=4
 pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libarchive.org/"
 license=('BSD')
 depends=('acl' 'attr' 'bzip2' 'expat' 'lzo2' 'openssl' 'xz' 'zlib')
diff --git a/core/libassuan/PKGBUILD b/core/libassuan/PKGBUILD
index 9072f16d6..a3c8709d6 100644
--- a/core/libassuan/PKGBUILD
+++ b/core/libassuan/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libassuan
 pkgver=2.1.1
 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/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index 0ea9b736d..9c3a0fa0d 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcap
 pkgver=2.24
 pkgrel=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')
@@ -23,7 +23,7 @@ prepare() {
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make
+  make lib=lib
 }
 
 package() {
diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD
index 4dd8a01f5..fa676f1a8 100644
--- a/core/libedit/PKGBUILD
+++ b/core/libedit/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=20130601_3.1
 pkgrel=1
 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
 url='http://www.thrysoee.dk/editline/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('ncurses')
 source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
diff --git a/core/libevent/PKGBUILD b/core/libevent/PKGBUILD
index 077d01eeb..4b4119908 100644
--- a/core/libevent/PKGBUILD
+++ b/core/libevent/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libevent
 pkgver=2.0.21
 pkgrel=3
 pkgdesc="An event notification library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.monkey.org/~provos/libevent/"
 license=('BSD')
 depends=('openssl')
diff --git a/core/libffi/PKGBUILD b/core/libffi/PKGBUILD
index cd5019c4e..ea0981e35 100644
--- a/core/libffi/PKGBUILD
+++ b/core/libffi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libffi
 pkgver=3.0.13
 pkgrel=4
 pkgdesc="Portable, high level programming interface to various calling conventions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/libffi/"
 license=('MIT')
 depends=('glibc')
diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD
index 4ebc86309..4a0072ae3 100644
--- a/core/libgcrypt/PKGBUILD
+++ b/core/libgcrypt/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=libgcrypt
 pkgver=1.6.1
 pkgrel=1
 pkgdesc="General purpose cryptographic library based on the code from GnuPG"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.gnupg.org"
 license=('LGPL')
 depends=('libgpg-error>=1.10-2')
diff --git a/core/libgpg-error/PKGBUILD b/core/libgpg-error/PKGBUILD
index 5f3d0bbdb..a0f491857 100644
--- a/core/libgpg-error/PKGBUILD
+++ b/core/libgpg-error/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgpg-error
 pkgver=1.12
 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 e773db5fb..c7277e32e 100644
--- a/core/libgssglue/PKGBUILD
+++ b/core/libgssglue/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgssglue
 pkgver=0.4
 pkgrel=2
 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/libksba/PKGBUILD b/core/libksba/PKGBUILD
index 613363be5..ef9a6d03f 100644
--- a/core/libksba/PKGBUILD
+++ b/core/libksba/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libksba
 pkgver=1.3.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/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD
index fb76c9283..ac7cbf8e0 100644
--- a/core/libmpc/PKGBUILD
+++ b/core/libmpc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmpc
 pkgver=1.0.2
 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')
diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD
index 54273dbe9..f7daefedd 100644
--- a/core/libnl/PKGBUILD
+++ b/core/libnl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libnl
 pkgver=3.2.23
 pkgrel=1
 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 257d66c15..dfc6b9248 100644
--- a/core/libpcap/PKGBUILD
+++ b/core/libpcap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpcap
 pkgver=1.5.3
 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' 'libusbx')
diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD
index 0cb892648..619c6d19f 100644
--- a/core/libpipeline/PKGBUILD
+++ b/core/libpipeline/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpipeline
 pkgver=1.2.6
 pkgrel=1
 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 2117e3c65..86ba947a2 100644
--- a/core/librpcsecgss/PKGBUILD
+++ b/core/librpcsecgss/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=librpcsecgss
 pkgver=0.19
 pkgrel=8
 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 beb08d3c7..ae2f71f57 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=libsasl
 pkgver=2.1.26
 pkgrel=7
 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')
@@ -82,6 +82,8 @@ build() {
   popd
 
   ./configure --prefix=/usr \
+      --host=$CHOST \
+      --build=$CHOST \
       --sbin=/usr/bin \
       --mandir=/usr/share/man \
       --infodir=/usr/share/info \
diff --git a/core/libssh2/PKGBUILD b/core/libssh2/PKGBUILD
index a723e0ba6..6b90eecb7 100644
--- a/core/libssh2/PKGBUILD
+++ b/core/libssh2/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=1.4.3
 pkgrel=2
 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 0092a7be9..b88305735 100644
--- a/core/libtirpc/PKGBUILD
+++ b/core/libtirpc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libtirpc
 pkgver=0.2.3
 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 38bdfeb22..5f916f86d 100644
--- a/core/libtool/PKGBUILD
+++ b/core/libtool/PKGBUILD
@@ -9,16 +9,22 @@ pkgver=2.4.2
 _gccver=4.8.2
 pkgrel=12
 pkgdesc="A generic library support script"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/libtool"
 license=('GPL')
 makedepends=("gcc=${_gccver}")
-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}
+
+  # fix test failure on mips64el (from Debian)
+  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/PKGBUILD b/core/libusb/PKGBUILD
index 2dabc1e4b..b5ec8c9a4 100644
--- a/core/libusb/PKGBUILD
+++ b/core/libusb/PKGBUILD
@@ -5,7 +5,7 @@ pkgver=1.0.18
 pkgrel=1
 depends=('glibc' 'systemd')
 pkgdesc="Library that provides generic access to USB device"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://libusbx.org"
 license=('LGPL')
 source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD
index a06c6f297..a15d98962 100644
--- a/core/links/PKGBUILD
+++ b/core/links/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=links
 pkgver=2.8
 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' 'xz' 'openssl' 'gpm')
diff --git a/core/linux-atm/PKGBUILD b/core/linux-atm/PKGBUILD
index ec50fb4b0..7d171ef97 100644
--- a/core/linux-atm/PKGBUILD
+++ b/core/linux-atm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=linux-atm
 pkgver=2.5.2
 pkgrel=4
 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 a6cdd75d3..49702e089 100644
--- a/core/logrotate/PKGBUILD
+++ b/core/logrotate/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=logrotate
 pkgver=3.8.7
 pkgrel=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 6aba96ed0..c8f4987d0 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
 pkgver=2.02.105
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
 makedepends=('systemd' 'thin-provisioning-tools')
diff --git a/core/lzo2/PKGBUILD b/core/lzo2/PKGBUILD
index 69da4de16..a4d341ce3 100644
--- a/core/lzo2/PKGBUILD
+++ b/core/lzo2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lzo2
 pkgver=2.06
 pkgrel=3
 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 57d7ddd24..bd0d599a2 100644
--- a/core/m4/PKGBUILD
+++ b/core/m4/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=m4
 pkgver=1.4.17
 pkgrel=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 16f303685..00d0d72d3 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=make
 pkgver=4.0
 pkgrel=2
 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 89ee632db..aeb5a7523 100644
--- a/core/man-db/PKGBUILD
+++ b/core/man-db/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=man-db
 pkgver=2.6.6
 pkgrel=1
 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 323154a5d..7322d42d5 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mdadm
 pkgver=3.3
 pkgrel=2
 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 47e8ef991..f2ff77bab 100644
--- a/core/mkinitcpio-busybox/PKGBUILD
+++ b/core/mkinitcpio-busybox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mkinitcpio-busybox
 pkgver=1.21.1
 pkgrel=2
 pkgdesc="base initramfs tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.busybox.net/"
 license=('GPL')
 depends=('glibc')
@@ -21,7 +21,12 @@ sha256sums=('cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303'
 prepare() {
   cd "busybox-$pkgver"
 
-  local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
+  case $CARCH in
+  mips64el)
+    local safeflags='-march=mips3 -mtune=loongson2f -O2 -mabi=n32 -mplt -Wa,-mfix-loongson2f-nop -Os -pipe -fno-strict-aliasing' ;;
+  *)
+    local safeflags="-march=${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" ;;
+  esac
 
   sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="'"$safeflags"'"|' "$srcdir/config" >.config
 
diff --git a/core/mkinitcpio-nfs-utils/PKGBUILD b/core/mkinitcpio-nfs-utils/PKGBUILD
index b2132b07d..b2a57c6f9 100644
--- a/core/mkinitcpio-nfs-utils/PKGBUILD
+++ b/core/mkinitcpio-nfs-utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mkinitcpio-nfs-utils
 pkgver=0.3
 pkgrel=4
 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/mlocate/PKGBUILD b/core/mlocate/PKGBUILD
index c8d979f9a..9ebf0261c 100644
--- a/core/mlocate/PKGBUILD
+++ b/core/mlocate/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.26
 pkgrel=1
 pkgdesc='Merging locate/updatedb implementation'
 url='https://fedorahosted.org/mlocate/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 backup=('etc/updatedb.conf'
         'etc/cron.daily/updatedb')
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index 3e086c971..f89d5ec2e 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=${_pkgver}.${_patchlevel}
 #pkgver=${_pkgver}
 pkgrel=1
 pkgdesc="Multiple-precision floating-point library"
-arch=('i686' 'x86_64')
+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..18762569e 100644
--- a/core/nano/PKGBUILD
+++ b/core/nano/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=nano
 pkgver=2.2.6
-pkgrel=2
+pkgrel=2.2
 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 711beb8b8..163d72062 100644
--- a/core/ncurses/PKGBUILD
+++ b/core/ncurses/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ncurses
 pkgver=5.9
 pkgrel=6
 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 dc1a16197..819fc88ea 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=net-tools
 pkgver=1.60.20130531git
 pkgrel=1
 pkgdesc="Configuration tools for Linux networking"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://net-tools.sourceforge.net/"
 depends=('glibc')
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 2aeaf23f8..5ab139634 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=nfs-utils
 pkgver=1.2.9
 pkgrel=5
 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,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
diff --git a/core/nfsidmap/PKGBUILD b/core/nfsidmap/PKGBUILD
index 285865fd5..90c961ae0 100644
--- a/core/nfsidmap/PKGBUILD
+++ b/core/nfsidmap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nfsidmap
 pkgver=0.25
 pkgrel=2
 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 60140fc5a..122d2c5ce 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nilfs-utils
 pkgver=2.1.6
 pkgrel=1
 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 5969a8fea..e87362833 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -5,11 +5,10 @@ pkgbase=openldap
 pkgname=('libldap' 'openldap')
 pkgver=2.4.39
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openldap.org/"
 license=('custom')
 makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
-options=('!makeflags')
 source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
         slapd.service slapd.tmpfiles openldap-ntlm.patch)
 sha1sums=('2b8e8401214867c361f7212e7058f95118b5bd6c'
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 56f49da61..f3ca270fd 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='Free version of the SSH connectivity tools'
 url='http://www.openssh.org/portable.html'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('linux-headers')
 depends=('krb5' 'openssl' 'libedit' 'ldns')
 optdepends=('xorg-xauth: X11 forwarding'
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 341731bfb..5a16e550f 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
 #pkgver=$_ver
 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')
@@ -40,13 +40,15 @@ prepare() {
 build() {
 	cd $srcdir/$pkgname-$_ver
 
-	if [ "${CARCH}" == 'x86_64' ]; then
+  case "${CARCH}" in
+	'x86_64')
 		openssltarget='linux-x86_64'
-		optflags='enable-ec_nistp_64_gcc_128'
-	elif [ "${CARCH}" == 'i686' ]; then
-		openssltarget='linux-elf'
-		optflags=''
-	fi
+        optflags='enable-ec_nistp_64_gcc_128' ;;
+	'i686')
+		openssltarget='linux-elf' ;;
+	'mips64el')
+		openssltarget='linux-generic32' ;;
+	esac
 
 	# mark stack as non-executable: http://bugs.archlinux.org/task/12434
 	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib \
diff --git a/core/openssl/gnu-linux-mips64el-gcc.patch b/core/openssl/gnu-linux-mips64el-gcc.patch
new file mode 100644
index 000000000..412ea873f
--- /dev/null
+++ b/core/openssl/gnu-linux-mips64el-gcc.patch
@@ -0,0 +1,10 @@
+--- Configure.orig	2011-09-23 10:49:56.725704188 -0300
++++ Configure	2011-09-23 11:01:00.377697297 -0300
+@@ -337,6 +337,7 @@
+ # *-generic* is endian-neutral target, but ./config is free to
+ # throw in -D[BL]_ENDIAN, whichever appropriate...
+ "linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"gnu-linux-mips64el-gcc","gcc:-mabi=n32 -O3 -DTERMIO -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips3_asm}:dlfcn:linux-shared:-fPIC::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32",
+ "linux-ppc",	"gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ # It's believed that majority of ARM toolchains predefine appropriate -march.
+ # If you compiler does not, do complement config command line with one!
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index cce0d84ec..cd7564297 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=openvpn
 pkgver=2.3.2
 pkgrel=2
 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')
 makedepends=('systemd')
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index 9f4968505..af3ca9f0c 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pam
 pkgver=1.1.8
 pkgrel=3
 pkgdesc="PAM (Pluggable Authentication Modules) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://linux-pam.org"
 depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
diff --git a/core/patch/PKGBUILD b/core/patch/PKGBUILD
index 5d7b9f06a..8174e80eb 100644
--- a/core/patch/PKGBUILD
+++ b/core/patch/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=patch
 pkgver=2.7.1
 pkgrel=2
 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 cfbaa2c2a..de9313aeb 100644
--- a/core/pciutils/PKGBUILD
+++ b/core/pciutils/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pciutils
 pkgver=3.2.1
 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/sw/pciutils/"
diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD
deleted file mode 100644
index b83d8cc50..000000000
--- a/core/pcmciautils/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 185562 2013-05-15 07:34:58Z tpowa $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pcmciautils
-pkgver=018
-pkgrel=7
-pkgdesc="Utilities for inserting and removing PCMCIA cards"
-arch=('i686' 'x86_64')
-url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
-license=('GPL')
-groups=('base')
-depends=('systemd')
-conflicts=('pcmcia-cs')
-# source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
-        initcpio-install-pcmcia)
-options=(!makeflags)
-
-build() {
-  cd "$pkgname-$pkgver"
-  sed -i -e 's,/lib/udev,/usr/lib/udev,g' Makefile
-  sed -i -e 's,/sbin,/usr/bin,g' Makefile
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  # install the mkinitpcio hook
-  install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia"
-}
-md5sums=('2e9469c44dcb790d2b497723c2fa0566'
-         '041af04025daee5b3b05812ac3896c8f')
diff --git a/core/pcmciautils/initcpio-install-pcmcia b/core/pcmciautils/initcpio-install-pcmcia
deleted file mode 100644
index af89c4c9c..000000000
--- a/core/pcmciautils/initcpio-install-pcmcia
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-build() {
-    if add_checked_modules -f 'sound|net' '/drivers/pcmcia/'; then
-        add_module 'sd_mod?'
-    fi
-
-    add_binary "/usr/lib/udev/pcmcia-socket-startup"
-    add_binary "/usr/lib/udev/pcmcia-check-broken-cis"
-    add_file "/usr/lib/udev/rules.d/60-pcmcia.rules"
-    add_file "/etc/pcmcia/config.opts"
-}
-
-help() {
-    cat <<HELPEOF
-This hook loads the necessary modules for a pcmcia root device.  Detection will
-take place at runtime. To minimize the modules in the image, add the autodetect
-hook too.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD
index e726405f9..199aec60b 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pcre
 pkgver=8.34
 pkgrel=2
 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=('readline' 'zlib' 'bzip2')
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 2b51192a4..7623417fb 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=perl
 pkgver=5.18.2
 pkgrel=2
 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')
@@ -36,7 +36,7 @@ prepare() {
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  if [ "${CARCH}" = "x86_64" ]; then
+  if [ "${CARCH}" != "i686" ]; then
     # for x86_64
     arch_opts="-Dcccdlflags='-fPIC'"
   else
diff --git a/core/pinentry/PKGBUILD b/core/pinentry/PKGBUILD
index 396749417..02a59f6e3 100644
--- a/core/pinentry/PKGBUILD
+++ b/core/pinentry/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pinentry
 pkgver=0.8.3
 pkgrel=1
 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/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD
index a244d10f3..a803d7e6a 100644
--- a/core/pkg-config/PKGBUILD
+++ b/core/pkg-config/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pkg-config
 pkgver=0.28
 pkgrel=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 fe929caa9..b2e9a8883 100644
--- a/core/popt/PKGBUILD
+++ b/core/popt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=popt
 pkgver=1.16
 pkgrel=7
 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/ppp/PKGBUILD b/core/ppp/PKGBUILD
index 75c85e092..1994cd8db 100644
--- a/core/ppp/PKGBUILD
+++ b/core/ppp/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=ppp
 pkgver=2.4.5
 pkgrel=8
 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')
 depends=('glibc' 'libpcap>=1.0.0')
diff --git a/core/pptpclient/PKGBUILD b/core/pptpclient/PKGBUILD
index d4e2d3e0e..c1b0441ea 100644
--- a/core/pptpclient/PKGBUILD
+++ b/core/pptpclient/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pptpclient
 pkgver=1.7.2
 pkgrel=5
 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..5ab52f563 100644
--- a/core/procinfo-ng/PKGBUILD
+++ b/core/procinfo-ng/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=procinfo-ng
 pkgver=2.0.304
-pkgrel=3
+pkgrel=3.2
 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-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index 8e11e303d..6c1b0f86b 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc='Utilities for monitoring your system and its processes'
 url='http://sourceforge.net/projects/procps-ng/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ncurses')
 source=("http://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('088c77631745fc75ee41fc29c254a4069be4869a')
diff --git a/core/psmisc/PKGBUILD b/core/psmisc/PKGBUILD
index 97b1a5d3b..27c46d490 100644
--- a/core/psmisc/PKGBUILD
+++ b/core/psmisc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=psmisc
 pkgver=22.20
 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/pth/PKGBUILD b/core/pth/PKGBUILD
index 5ca69241e..4cb127aa3 100644
--- a/core/pth/PKGBUILD
+++ b/core/pth/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pth
 pkgver=2.0.7
 pkgrel=5
 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/core/readline/PKGBUILD b/core/readline/PKGBUILD
index 76d7968a9..4b62a61e6 100644
--- a/core/readline/PKGBUILD
+++ b/core/readline/PKGBUILD
@@ -8,7 +8,7 @@ _patchlevel=004 #prepare for some patches
 pkgver=$_basever.$_patchlevel
 pkgrel=2
 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 f5ec824b3..f5649a84d 100644
--- a/core/reiserfsprogs/PKGBUILD
+++ b/core/reiserfsprogs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=reiserfsprogs
 pkgver=3.6.24
 pkgrel=1
 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 b58c7fec7..32e24b430 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Tool for enabling and disabling wireless devices'
 url='http://wireless.kernel.org/en/users/Documentation/rfkill'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'service.unblock'
         'service.block'
diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD
index d50b2bf4c..e37b8c843 100644
--- a/core/rpcbind/PKGBUILD
+++ b/core/rpcbind/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rpcbind
 pkgver=0.2.1
 pkgrel=2
 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 166f00229..ff1637356 100644
--- a/core/run-parts/PKGBUILD
+++ b/core/run-parts/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=run-parts
 pkgver=4.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/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index 2e8e82cca..a51680193 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=4
 pkgdesc='Mail processing system with a command syntax reminiscent of ed'
 url='http://sdaoden.users.sourceforge.net/code.html#s-nail'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl')
 optdepends=('smtp-forwarder: for sending mail')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.xz"
diff --git a/core/sdparm/PKGBUILD b/core/sdparm/PKGBUILD
index 1d2dafd40..8e9cb469c 100644
--- a/core/sdparm/PKGBUILD
+++ b/core/sdparm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdparm
 pkgver=1.08
 pkgrel=1
 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' 'bash')
diff --git a/core/sed/PKGBUILD b/core/sed/PKGBUILD
index 1fa6ca913..39288c7a0 100644
--- a/core/sed/PKGBUILD
+++ b/core/sed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sed
 pkgver=4.2.2
 pkgrel=3
 pkgdesc="GNU stream editor"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/sed"
 license=('GPL3')
 groups=('base' 'base-devel')
diff --git a/core/shadow/PKGBUILD b/core/shadow/PKGBUILD
index 0ca6f5433..816678c68 100644
--- a/core/shadow/PKGBUILD
+++ b/core/shadow/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=shadow
 pkgver=4.1.5.1
 pkgrel=7
 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/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 451604289..8b986a145 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -8,7 +8,7 @@ _sudover=1.8.9p5
 pkgver=${_sudover/p/.p}
 pkgrel=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')
 groups=('base-devel')
diff --git a/core/sysfsutils/PKGBUILD b/core/sysfsutils/PKGBUILD
index 291438227..e12494892 100644
--- a/core/sysfsutils/PKGBUILD
+++ b/core/sysfsutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sysfsutils
 pkgver=2.1.0
 pkgrel=8
 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/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 6943b7e56..57d98d7c5 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=systemd
 pkgname=('systemd' 'systemd-sysvcompat')
 pkgver=208
 pkgrel=11
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
 makedepends=('acl' 'cryptsetup' 'libdbus' 'docbook-xsl' 'gobject-introspection' 'gperf'
              'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt'  'libmicrohttpd' 'libxslt'
@@ -92,6 +92,8 @@ prepare() {
 build() {
   cd "$pkgname-$pkgver"
 
+  [ "$CARCH" = "mips64el" ] && CFLAGS+=" -mno-plt"
+
   ./configure \
       --libexecdir=/usr/lib \
       --localstatedir=/var \
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index 67f548c5a..31fa4bda8 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tar
 pkgver=1.27.1
 pkgrel=1
 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/tar/gnulib-no-gets.patch b/core/tar/gnulib-no-gets.patch
new file mode 100644
index 000000000..b26e3c0bb
--- /dev/null
+++ b/core/tar/gnulib-no-gets.patch
@@ -0,0 +1,16 @@
+diff -ru tar-1.26.orig/gnu/stdio.in.h tar-1.26/gnu/stdio.in.h
+--- tar-1.26.orig/gnu/stdio.in.h	2012-10-21 22:03:53.410910902 +0200
++++ tar-1.26/gnu/stdio.in.h	2012-10-21 22:04:07.945278072 +0200
+@@ -160,12 +160,6 @@
+                  "use gnulib module fflush for portable POSIX compliance");
+ #endif
+ 
+-/* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
+-#undef gets
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+-
+ #if @GNULIB_FOPEN@
+ # if @REPLACE_FOPEN@
+ #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD
index 24bacfcd4..1f1182dba 100644
--- a/core/texinfo/PKGBUILD
+++ b/core/texinfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=texinfo
 pkgver=5.2
 pkgrel=2
 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' 'base-devel')
diff --git a/core/traceroute/PKGBUILD b/core/traceroute/PKGBUILD
index aeaae4b74..478435c44 100644
--- a/core/traceroute/PKGBUILD
+++ b/core/traceroute/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=traceroute
 pkgver=2.0.19
 pkgrel=2
 pkgdesc="Tracks the route taken by packets over an IP network"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://traceroute.sourceforge.net/"
 license=('GPL2')
 depends=('glibc')
diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD
index 15e78e46f..c5cd7eb57 100644
--- a/core/usbutils/PKGBUILD
+++ b/core/usbutils/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=usbutils
 pkgver=007
 pkgrel=1
 pkgdesc="USB Device Utilities"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 groups=('base')
 depends=('libusb' 'hwids')
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index a004fee54..8578fd9f4 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.24.1
 pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('base' 'base-devel')
 depends=('pam' 'shadow' 'coreutils' 'glibc')
 optdepends=('python: python bindings to libmount')
diff --git a/core/vi/PKGBUILD b/core/vi/PKGBUILD
index ae8573497..61eef6950 100644
--- a/core/vi/PKGBUILD
+++ b/core/vi/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=050325
 pkgrel=3
 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/which/PKGBUILD b/core/which/PKGBUILD
index 481f51316..ffa451e89 100644
--- a/core/which/PKGBUILD
+++ b/core/which/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=which
 pkgver=2.20
 pkgrel=6
 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' 'base-devel')
diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD
index e8cbf1cc7..8373ceafd 100644
--- a/core/wireless_tools/PKGBUILD
+++ b/core/wireless_tools/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc='Tools allowing to manipulate the Wireless Extensions'
 url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz")
 sha1sums=('41db5ced9ed3d8d3cc104ce43c19af1d72f07eec')
 
diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD
index f233fd586..e7141a7a4 100644
--- a/core/wpa_actiond/PKGBUILD
+++ b/core/wpa_actiond/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=wpa_actiond
 pkgver=1.4
 pkgrel=2
 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 e99d67561..cc71f99c5 100644
--- a/core/wpa_supplicant/PKGBUILD
+++ b/core/wpa_supplicant/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.0
 pkgrel=4
 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' 'readline' 'libnl')
 optdepends=('wpa_supplicant_gui: wpa_gui program')
 license=('GPL')
diff --git a/core/xfsprogs/PKGBUILD b/core/xfsprogs/PKGBUILD
index cefbffbf9..ae080fc7e 100644
--- a/core/xfsprogs/PKGBUILD
+++ b/core/xfsprogs/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=xfsprogs
 pkgver=3.1.11
 pkgrel=2
 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=('de9f1f45026c2f4e0776058d429ff4b6')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   export OPTIMIZER="-march=${CARCH/_/-} -O1"
+  [ "$CARCH" = "mips64el" ] && export OPTIMIZER="-mabi=n32 -march=mips3 -mtune=loongson2f -O1"
   export DEBUG=-DNDEBUG
   ./configure --prefix=/usr --sbindir=/usr/bin
   make
diff --git a/core/xinetd/PKGBUILD b/core/xinetd/PKGBUILD
index 53d5b93ec..d16106d9c 100644
--- a/core/xinetd/PKGBUILD
+++ b/core/xinetd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xinetd
 pkgver=2.3.15
 pkgrel=4
 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')
@@ -34,7 +34,8 @@ prepare() {
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap
+  ./configure --prefix=/usr --sbindir=/usr/bin --without-libwrap \
+              --build=${CHOST} --host=${CHOST}
   make
 }
 
diff --git a/core/xz/PKGBUILD b/core/xz/PKGBUILD
index b519bb5a2..831dc7847 100644
--- a/core/xz/PKGBUILD
+++ b/core/xz/PKGBUILD
@@ -4,11 +4,13 @@
 
 pkgname=xz
 pkgver=5.0.5
-pkgrel=2
+pkgrel=2.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')
+# pacman complains about missing liblzma.la files 
+options=(libtool)
 depends=('sh')
 source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD
index 4ff394226..19e2cf8ba 100644
--- a/core/zlib/PKGBUILD
+++ b/core/zlib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=zlib
 pkgver=1.2.8
 pkgrel=3
 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/extra/a2ps/PKGBUILD b/extra/a2ps/PKGBUILD
index f82f5b6b4..94117b127 100644
--- a/extra/a2ps/PKGBUILD
+++ b/extra/a2ps/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=a2ps
 pkgver=4.14
 pkgrel=6
 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=('psutils' 'imagemagick')
diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD
index 83c9d446c..665e2192c 100644
--- a/extra/a52dec/PKGBUILD
+++ b/extra/a52dec/PKGBUILD
@@ -8,13 +8,15 @@ pkgver=0.7.4
 pkgrel=8
 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')
 source=("http://liba52.sourceforge.net/files/${pkgname}-${pkgver}.tar.gz"
-        'a52dec-0.7.4-build.patch')
+        'a52dec-0.7.4-build.patch'
+	'configure.patch')
 md5sums=('caa9f5bc44232dc8aeea773fea56be80'
-         'fa16f224a7dceb7613824380abef0052')
+         'fa16f224a7dceb7613824380abef0052'
+         'ccaa978e70cc74b364486bd72fd38d1d')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
@@ -26,7 +28,8 @@ prepare() {
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --enable-shared
+  ./configure --prefix=/usr --enable-shared \
+              --build=${CARCH} --host=${CARCH}
   make
 }
 
diff --git a/extra/a52dec/configure.patch b/extra/a52dec/configure.patch
new file mode 100644
index 000000000..6f109d824
--- /dev/null
+++ b/extra/a52dec/configure.patch
@@ -0,0 +1,18 @@
+--- configure.in	2002-07-28 05:50:20.000000000 +0200
++++ configure.ac	2013-02-20 10:38:15.263223716 +0100
+@@ -1,12 +1,12 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_PREREQ(2.52)
+-AC_INIT
++AC_INIT([a52dec],[0.7.4])
+ AC_CONFIG_SRCDIR([src/a52dec.c])
+ AC_CONFIG_AUX_DIR(autotools)
+ AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
+     doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
+-AM_INIT_AUTOMAKE([a52dec],[0.7.4])
+-AM_CONFIG_HEADER(include/config.h)
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS(include/config.h)
+ AM_MAINTAINER_MODE
+ AC_CANONICAL_HOST
+ 
diff --git a/extra/aalib/PKGBUILD b/extra/aalib/PKGBUILD
index df326f65a..5380a10d7 100644
--- a/extra/aalib/PKGBUILD
+++ b/extra/aalib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=aalib
 pkgver=1.4rc5
 pkgrel=10
 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=('gpm' 'libx11')
@@ -23,7 +23,7 @@ prepare() {
 
 build() {
   cd ${pkgname}-1.4.0
-  ./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/abook/PKGBUILD b/extra/abook/PKGBUILD
index c0b150d57..5bb411e97 100644
--- a/extra/abook/PKGBUILD
+++ b/extra/abook/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.6.0pre2.20131110
 pkgrel=1
 pkgdesc='Text-based addressbook designed for use with Mutt'
 url='http://abook.sourceforge.net/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('git')
 depends=('readline')
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index ca65f4be1..4161dfb34 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=accountsservice
 pkgver=0.6.35
 pkgrel=2
 pkgdesc="D-Bus interface for user account query and manipulation"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/software/accountsservice/"
 license=('GPL3')
 depends=('glib2' 'polkit' 'systemd')
diff --git a/extra/aiksaurus/PKGBUILD b/extra/aiksaurus/PKGBUILD
index a9533c059..b6f1d0f6a 100644
--- a/extra/aiksaurus/PKGBUILD
+++ b/extra/aiksaurus/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgname=aiksaurus
 pkgver=1.2.1
-pkgrel=3
+pkgrel=3.1
 pkgdesc="A cross-platform, open-source thesaurus"
 url="http://aiksaurus.sourceforge.net/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk2')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'aiksaurus-gcc44.patch')
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index d75885570..749d47705 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=aisleriot
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="A collection of patience games written in guile scheme"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL)
 url="http://www.gnome.org"
 groups=('gnome-extra')
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index ad168096c..1bc6e7934 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=akonadi
 pkgver=1.11.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://community.kde.org/KDE_PIM/Akonadi'
 license=('LGPL')
 depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano')
@@ -22,6 +22,7 @@ prepare() {
 
 build() {
   cd build
+  CXX="g++" \
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD
index e15282e73..4d5cd1da9 100644
--- a/extra/allegro4/PKGBUILD
+++ b/extra/allegro4/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=allegro4
 pkgver=4.4.2
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Portable library mainly aimed at video game and multimedia programming (legacy version)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://alleg.sourceforge.net/"
 license=('custom')
-depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor')
+depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'glu')
 makedepends=('cmake' 'libpng' 'mesa')
 options=('staticlibs')
 source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz
diff --git a/extra/alsa-lib/PKGBUILD b/extra/alsa-lib/PKGBUILD
index 072433d39..da6c0b24b 100644
--- a/extra/alsa-lib/PKGBUILD
+++ b/extra/alsa-lib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=alsa-lib
 pkgver=1.0.27.2
 pkgrel=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 53a99528b..d9ad5ce62 100644
--- a/extra/alsa-oss/PKGBUILD
+++ b/extra/alsa-oss/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=alsa-oss
 pkgver=1.0.25
 pkgrel=2
 pkgdesc="OSS compatibility library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.alsa-project.org"
 depends=('alsa-lib')
diff --git a/extra/alsa-plugins/PKGBUILD b/extra/alsa-plugins/PKGBUILD
index 36947c877..7d8f78c7d 100644
--- a/extra/alsa-plugins/PKGBUILD
+++ b/extra/alsa-plugins/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=alsa-plugins
 pkgver=1.0.27
 pkgrel=2
 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-plugins/gcc-4.7.patch b/extra/alsa-plugins/gcc-4.7.patch
new file mode 100644
index 000000000..1518b2afb
--- /dev/null
+++ b/extra/alsa-plugins/gcc-4.7.patch
@@ -0,0 +1,13 @@
+diff -ru alsa-plugins-1.0.25.orig/usb_stream/pcm_usb_stream.c alsa-plugins-1.0.25/usb_stream/pcm_usb_stream.c
+--- alsa-plugins-1.0.25.orig/usb_stream/pcm_usb_stream.c	2012-08-05 11:24:22.652219959 +0200
++++ alsa-plugins-1.0.25/usb_stream/pcm_usb_stream.c	2012-08-05 11:25:08.599688184 +0200
+@@ -18,8 +18,8 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+  */
+ 
+-#include <byteswap.h>
+ #define _GNU_SOURCE
++#include <byteswap.h>
+ #include <sys/mman.h>
+ #include <sys/shm.h>
+ #include <sys/ioctl.h>
diff --git a/extra/alsa-tools/PKGBUILD b/extra/alsa-tools/PKGBUILD
index 99bb2feb4..90f1c18f6 100644
--- a/extra/alsa-tools/PKGBUILD
+++ b/extra/alsa-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=alsa-tools
 pkgver=1.0.27
 pkgrel=5
 pkgdesc="Advanced tools for certain sound cards"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://alsa-project.org/"
 license=('GPL')
 depends=('gcc-libs' 'alsa-lib')
@@ -17,8 +17,10 @@ optdepends=('fltk: hdspconf, hdspmixer'
             'gtk3: hdajackretask'
             'bash: couple of tools')
 provides=("$pkgname-emu10k1" "$pkgname-ice1712")
-source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2")
-md5sums=('1ea381d00a6069a98613aa7effa4cb51')
+source=("ftp://ftp.alsa-project.org/pub/tools/$pkgname-$pkgver.tar.bz2"
+        "alsa-tools-1.0.27-mips.patch")
+md5sums=('1ea381d00a6069a98613aa7effa4cb51'
+         'b34bbbe42216354c4cafae6cd504bdc5')
 
 _tools=("as10k1" "echomixer" "envy24control" "hdajackretask" "hda-verb"
         "hdspconf" "hdsploader" "hdspmixer" "ld10k1" "mixartloader"
@@ -27,7 +29,7 @@ _tools=("as10k1" "echomixer" "envy24control" "hdajackretask" "hda-verb"
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
-
+  patch -Np1 -i ${srcdir}/alsa-tools-1.0.27-mips.patch
   # qlo10k1 cannot be built; it depends on ld10k1
   sed -i 's:ld10k1 qlo10k1 \\:ld10k1 \\:' Makefile
 
diff --git a/extra/alsa-tools/alsa-tools-1.0.27-mips.patch b/extra/alsa-tools/alsa-tools-1.0.27-mips.patch
new file mode 100644
index 000000000..849d94d94
--- /dev/null
+++ b/extra/alsa-tools/alsa-tools-1.0.27-mips.patch
@@ -0,0 +1,13 @@
+--- alsa-tools-1.0.27.orig/hda-verb/hda-verb.c	2013-04-11 06:43:07.000000000 -0500
++++ alsa-tools-1.0.27/hda-verb/hda-verb.c	2013-08-04 22:50:09.688476561 -0500
+@@ -14,8 +14,10 @@
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #ifndef __PPC__
++#ifndef __mips__
+ #include <sys/io.h>
+ #endif
++#endif
+ #include <sys/types.h>
+ #include <sys/fcntl.h>
+ 
diff --git a/extra/alsa-utils/PKGBUILD b/extra/alsa-utils/PKGBUILD
index 0ee6995a3..fdcd42531 100644
--- a/extra/alsa-utils/PKGBUILD
+++ b/extra/alsa-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=alsa-utils
 pkgver=1.0.27.2
 pkgrel=1
 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' 'libsamplerate')
diff --git a/extra/alsaplayer/PKGBUILD b/extra/alsaplayer/PKGBUILD
index bbb02da9e..77893813e 100644
--- a/extra/alsaplayer/PKGBUILD
+++ b/extra/alsaplayer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=alsaplayer
 pkgver=0.99.81
 pkgrel=6
 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://alsaplayer.sourceforge.net/"
 license=('GPL')
 depends=('gcc-libs' 'desktop-file-utils')
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index 8699b85b7..cbda2744e 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=amarok
 pkgver=2.8.0
 pkgrel=2
 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' 'mariadb' 'qtscriptgenerator' 'taglib-extras'
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 08fdd4da4..766aa68f5 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=amule
 pkgver=10834
 pkgrel=2
 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' 'wxgtk2.8' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD
index 7cf6bf380..de85a49db 100644
--- a/extra/anjuta-extras/PKGBUILD
+++ b/extra/anjuta-extras/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=anjuta-extras
 pkgver=3.10.0
 pkgrel=1
 pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('anjuta')
 makedepends=('intltool' 'itstool')
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index a72967aa5..28d02990c 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('libanjuta' 'anjuta')
 pkgver=3.10.2
 pkgrel=2
 pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-theme vala dconf
              gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs
diff --git a/extra/anthy/PKGBUILD b/extra/anthy/PKGBUILD
index 5f41b74e2..c01289905 100644
--- a/extra/anthy/PKGBUILD
+++ b/extra/anthy/PKGBUILD
@@ -6,9 +6,9 @@
 pkgname=anthy
 pkgver=9100h
 _filecode=37536
-pkgrel=3
+pkgrel=3.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')
 source=("http://dl.sourceforge.jp/anthy/${_filecode}/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 6370959a4..7c45e0c65 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=apache
 pkgver=2.2.26
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.apache.org/dist/httpd'
 license=('APACHE')
 backup=(etc/httpd/conf/httpd.conf
diff --git a/extra/appmenu-qt/PKGBUILD b/extra/appmenu-qt/PKGBUILD
index 1b566bacd..bd09f5d3f 100644
--- a/extra/appmenu-qt/PKGBUILD
+++ b/extra/appmenu-qt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=appmenu-qt
 pkgver=0.2.6
 pkgrel=4
 pkgdesc="Allows Qt applications to export menus over DBus to a menu applet"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://launchpad.net/appmenu-qt'
 license=('GPL')
 depends=('libdbusmenu-qt')
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 9a9e76bb9..232631aa1 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=apr-util
 pkgver=1.5.3
 pkgrel=2
 pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
 depends=('apr' 'gdbm' 'expat' 'libldap' 'unixodbc')
 license=('APACHE')
diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD
index ebc63b695..41504af09 100644
--- a/extra/apr/PKGBUILD
+++ b/extra/apr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=apr
 pkgver=1.5.0
 pkgrel=1
 pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://apr.apache.org/"
 depends=('util-linux')
 license=('APACHE')
diff --git a/extra/apricots/PKGBUILD b/extra/apricots/PKGBUILD
index 3fbe423f6..5611ce76d 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')
@@ -18,7 +18,7 @@ md5sums=('910828d717e46d8cbd9c24f702d09fbc'
 build() {
   cd $srcdir/$pkgname-$pkgver
   patch -p0 -i $srcdir/apricots-0.2.6-freealut.patch
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST
   make LIBTOOL='/usr/bin/libtool'
 }
 
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index e82cc4ad8..5959fca9f 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=Ardour3
 pkgver=3.5.308
 pkgrel=2
 pkgdesc="Professional-grade digital audio workstation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ardour.org/"
 license=('GPL')
 depends=('liblrdf' 'liblo>=0.28' 'libsmf' 'lilv'
@@ -31,9 +31,12 @@ prepare() {
 build() {
   cd "$srcdir/$_pkgname-$pkgver"
 
+  # SSE code is used by default on all arches.
+  [ "$CARCH" == "mips64el" ] && extra=--no-fpu-optimization
+
   python2 waf configure --prefix=/usr \
                         --configdir=/etc \
-                        --docs
+                        --docs $extra
 
   python2 waf build $MAKEFLAGS
 }
diff --git a/extra/asio/PKGBUILD b/extra/asio/PKGBUILD
index 7f292ded6..1cff00689 100644
--- a/extra/asio/PKGBUILD
+++ b/extra/asio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=asio
 pkgver=1.10.1
 pkgrel=1
 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 02c54f790..219cc90aa 100644
--- a/extra/aspell-de/PKGBUILD
+++ b/extra/aspell-de/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aspell-de
 pkgver=20131206
 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 aceb777bc..de2783b93 100644
--- a/extra/aspell-en/PKGBUILD
+++ b/extra/aspell-en/PKGBUILD
@@ -2,9 +2,9 @@
 
 pkgname=aspell-en
 pkgver=7.1
-pkgrel=2
+pkgrel=2.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 3b9df0a33..6357dc184 100644
--- a/extra/aspell-es/PKGBUILD
+++ b/extra/aspell-es/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=aspell-es
 pkgver=1.11
-pkgrel=5
+pkgrel=5.1
 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 ddaf5c77d..a73e2db62 100644
--- a/extra/aspell-fr/PKGBUILD
+++ b/extra/aspell-fr/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=aspell-fr
 pkgver=0.50.3
-pkgrel=6
+pkgrel=6.1
 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 fce7c7f36..00b634498 100644
--- a/extra/aspell-hu/PKGBUILD
+++ b/extra/aspell-hu/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=aspell-hu
 pkgver=0.99.4.2
-pkgrel=3
+pkgrel=3.1
 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-nl/PKGBUILD b/extra/aspell-nl/PKGBUILD
index 28439b454..bf35f509d 100644
--- a/extra/aspell-nl/PKGBUILD
+++ b/extra/aspell-nl/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=aspell-nl
 pkgver=0.50.2
-pkgrel=2
+pkgrel=2.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 d8a443be6..8d4d68058 100644
--- a/extra/aspell-pt/PKGBUILD
+++ b/extra/aspell-pt/PKGBUILD
@@ -7,7 +7,7 @@ _pkgverBR=20090702
 pkgver=$_pkgverPT
 pkgrel=1
 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 7195479b4..cbbb2b7d2 100644
--- a/extra/aspell-ru/PKGBUILD
+++ b/extra/aspell-ru/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=aspell-ru
 pkgver=0.99f7
-pkgrel=5
+pkgrel=5.1
 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 e62de7316..595029c79 100644
--- a/extra/aspell/PKGBUILD
+++ b/extra/aspell/PKGBUILD
@@ -7,10 +7,10 @@
 pkgname=aspell
 pkgver=0.60.6.1
 _pkgmajorver=0.60
-pkgrel=1
+pkgrel=1.2
 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 6b289393c..21f4330c5 100644
--- a/extra/asymptote/PKGBUILD
+++ b/extra/asymptote/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=asymptote
 pkgver=2.24
 pkgrel=2
 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' 'glu' 'gsl' 'fftw' 'libsigsegv')
diff --git a/extra/at-spi/PKGBUILD b/extra/at-spi/PKGBUILD
index a4f346b6c..b2f00520e 100644
--- a/extra/at-spi/PKGBUILD
+++ b/extra/at-spi/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=at-spi
 pkgver=1.32.0
-pkgrel=5
+pkgrel=5.1
 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 22d7f39ad..62555b918 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=at-spi2-atk
 pkgver=2.10.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')
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index f6c4a748d..fe91a4f5a 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=at-spi2-core
 pkgver=2.10.2
 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' 'glib2' 'libxtst')
diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD
index 49d1a8c99..87c7b8038 100644
--- a/extra/atk/PKGBUILD
+++ b/extra/atk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=atk
 pkgver=2.10.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 d387e7a54..95365b23f 100644
--- a/extra/atkmm/PKGBUILD
+++ b/extra/atkmm/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=atkmm
 pkgname=(atkmm atkmm-docs)
 pkgver=2.22.7
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++')
 license=('LGPL')
 options=('!emptydirs')
diff --git a/extra/attica/PKGBUILD b/extra/attica/PKGBUILD
index e407cd70e..792a1ecfe 100644
--- a/extra/attica/PKGBUILD
+++ b/extra/attica/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=attica
 pkgver=0.4.2
 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=('qt4')
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index 69a66510a..2cfbbb06d 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=aubio
 pkgver=0.4.0
 pkgrel=1
 pkgdesc="A tool for extracting annotations from audio signals"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://aubio.org/"
 license=('GPL')
 depends=('fftw' 'jack' 'ffmpeg')
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 3beb3b40f..fa5232d0d 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=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' '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=('1d348f8ef5238de7cd6669189ecca690452e96c4')
 
diff --git a/extra/audacity/PKGBUILD b/extra/audacity/PKGBUILD
index 8c541c759..74ab5c7c7 100644
--- a/extra/audacity/PKGBUILD
+++ b/extra/audacity/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=audacity
 pkgver=2.0.5
 pkgrel=2
 pkgdesc="A program that lets you manipulate digital audio waveforms"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://audacity.sourceforge.net/"
 license=('GPL')
 depends=('libmad' 'libid3tag' 'wxgtk2.8' 'lame' 'hicolor-icon-theme'
@@ -18,8 +18,9 @@ sha1sums=('f63cafb81f29e7f3813dc9f80fb1dfdbcfe46b33')
 
 build() {
   cd ${pkgname}-src-${pkgver}
+  [ "$CARCH" = "mips64el" ] && sse="--disable-sse"
   WX_CONFIG=/usr/bin/wx-config-2.8 PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
-    ./configure --prefix=/usr
+    ./configure --prefix=/usr $sse
   make
 }
 
diff --git a/extra/audiofile/PKGBUILD b/extra/audiofile/PKGBUILD
index 8d6c5849f..a0edcd21d 100644
--- a/extra/audiofile/PKGBUILD
+++ b/extra/audiofile/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=audiofile
 pkgver=0.3.6
 pkgrel=2
 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' 'flac')
diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD
index a2af53f76..db740190b 100644
--- a/extra/autogen/PKGBUILD
+++ b/extra/autogen/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=autogen
 pkgver=5.18.2
 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 903090736..fbb047771 100644
--- a/extra/automoc4/PKGBUILD
+++ b/extra/automoc4/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=automoc4
 pkgver=0.9.88
 pkgrel=4
 pkgdesc="Automatic moc for Qt4"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org/'
 license=('custom')
 depends=('qt4')
diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index ed8eac791..7c560097b 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -8,20 +8,21 @@ pkgrel=11
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!emptydirs')
 depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm' 'dbus')
 optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings'
-            'qt3: qt3 bindings'
             'qt4: qt4 bindings'
             'pygtk: avahi-bookmarks, avahi-discover'
-            'twisted: avahi-bookmarks'
-            'mono: mono bindings'
-            'python2-dbus: avahi-discover'
+            'twisted: avahi-bookmarks')
+[ "$CARCH" != "mips64el" ] && optdepends+=('mono: mono bindings'
+                                           'qt3: qt3 bindings')
+optdepends+=('dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt3' 'qt4' 'pygtk' 'mono' 'intltool' 'python2-dbus'
-             'gtk-sharp-2' 'gobject-introspection' 'gtk3' 'xmltoman')
+makedepends=('qt4' 'pygtk' 'intltool' 'python2-dbus'
+             'gobject-introspection' 'gtk3' 'xmltoman')
+[ "$CARCH" != "mips64el" ] && makedepends+=('mono' 'gtk-sharp-2' 'qt3')
 backup=('etc/avahi/hosts'
         'etc/avahi/avahi-daemon.conf'
         'etc/avahi/services/ssh.service'
@@ -49,6 +50,7 @@ build() {
 	export MOC_QT3=/usr/bin/moc-qt3
 	export MOC_QT4=/usr/bin/moc-qt4
 	export PYTHON=/usr/bin/python2
+	[ "$CARCH" = "mips64el" ] && extra="--disable-mono --disable-qt3"
 
 	./configure \
 		--prefix=/usr \
@@ -63,6 +65,7 @@ build() {
 		--with-autoipd-user=avahi \
 		--with-autoipd-group=avahi \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system \
+		$extra
 
 	make
 }
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index b2307f90c..aadc83cc2 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -5,12 +5,13 @@ pkgbase=avidemux
 pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
 pkgver=2.5.6
 pkgrel=8
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://fixounet.free.fr/avidemux/"
 makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
              'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
+             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
+[ "$CARCH" != "mips64el" ] && makedepends+=('libva')
 options=('!makeflags' '!emptydirs')
 source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
 sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
@@ -40,7 +41,8 @@ build() {
 
 package_avidemux-cli() {
   pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
+  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx')
+  [ "$CARCH" != "mips64el" ] && depends+=('libva')
   optdepends=('lame: for the corresponding audio encoder plugin'
               'faac: for the corresponding audio encoder plugin'
               'faad2: for the corresponding audio decoder plugin'
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index da6afa824..93b28e071 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=avogadro
 pkgver=1.1.1
 pkgrel=2
 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=('openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
diff --git a/extra/avogadro/avogadro-1.1.0-textrel.patch b/extra/avogadro/avogadro-1.1.0-textrel.patch
new file mode 100644
index 000000000..4d6dab738
--- /dev/null
+++ b/extra/avogadro/avogadro-1.1.0-textrel.patch
@@ -0,0 +1,21 @@
+--- avogadro-1.1.0.orig/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt	2012-09-03 12:07:00.000000000 -0500
++++ avogadro-1.1.0/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt	2013-01-20 02:12:35.688146754 -0500
+@@ -20,6 +20,6 @@
+ set_target_properties(spglib PROPERTIES COMPILE_FLAGS "-w")
+ 
+ # Set -fPIC on x86_64
+-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
++if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(x86_64|mips64)$")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
+ endif()
+--- avogadro-1.1.0.orig/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt	2012-09-03 12:07:00.000000000 -0500
++++ avogadro-1.1.0/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt	2013-01-20 12:46:27.869815690 -0500
+@@ -19,7 +19,7 @@
+ set_target_properties(tubegen PROPERTIES COMPILE_FLAGS "-w")
+ 
+ # Set -fPIC on x86_64
+-if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
++if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(x86_64|mips64)$")
+   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC"  )
+ endif()
diff --git a/extra/babl/PKGBUILD b/extra/babl/PKGBUILD
index a88d9bb19..51729539d 100644
--- a/extra/babl/PKGBUILD
+++ b/extra/babl/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=babl
 pkgver=0.1.10
-pkgrel=1
+pkgrel=1.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/baobab/PKGBUILD b/extra/baobab/PKGBUILD
index 1065bf503..d8709b6f4 100644
--- a/extra/baobab/PKGBUILD
+++ b/extra/baobab/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=baobab
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
diff --git a/extra/basket/PKGBUILD b/extra/basket/PKGBUILD
index fd46016ed..9b580c7e3 100644
--- a/extra/basket/PKGBUILD
+++ b/extra/basket/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=basket
 pkgver=1.81
-pkgrel=3
+pkgrel=3.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' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/bc/PKGBUILD b/extra/bc/PKGBUILD
index f323eab0f..4172c6c74 100644
--- a/extra/bc/PKGBUILD
+++ b/extra/bc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bc
 pkgver=1.06.95
 pkgrel=1
 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 be85621ee..1034b881b 100644
--- a/extra/beep/PKGBUILD
+++ b/extra/beep/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=beep
 pkgver=1.3
-pkgrel=2
+pkgrel=2.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 053e08e13..10608b3fa 100644
--- a/extra/bftpd/PKGBUILD
+++ b/extra/bftpd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bftpd
 pkgver=4.2
 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 1270f515a..2aa3d01e4 100644
--- a/extra/bigloo/PKGBUILD
+++ b/extra/bigloo/PKGBUILD
@@ -8,7 +8,7 @@ _pkgver=4.0b
 pkgver=${_pkgver/-/_}
 pkgrel=2
 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=()
diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD
index 79d0608f1..859c6c462 100644
--- a/extra/bijiben/PKGBUILD
+++ b/extra/bijiben/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bijiben
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Write out notes, every detail matters"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="https://live.gnome.org/Bijiben"
 license=(GPL)
 depends=(tracker clutter-gtk zeitgeist webkitgtk hicolor-icon-theme desktop-file-utils gnome-online-accounts)
diff --git a/extra/bin86/PKGBUILD b/extra/bin86/PKGBUILD
index a398fd4df..839cfcfbe 100644
--- a/extra/bin86/PKGBUILD
+++ b/extra/bin86/PKGBUILD
@@ -6,14 +6,16 @@ pkgname=bin86
 pkgver=0.16.19
 pkgrel=1
 pkgdesc="A complete 8086 assembler and loader"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.debath.co.uk/"
 depends=('glibc')
 source=("http://www.debath.co.uk/dev86/$pkgname-$pkgver.tar.gz"
-        bin86-0.16.17-x86_64-1.patch)
+        bin86-0.16.17-x86_64-1.patch
+	bin86-0.16.19-inttypes.patch)
 md5sums=('0a20d79765a6855ce7c8c2d02b23a0f0'
-         '92bdce7b0655cd2e9f83c83fc56d128e')
+         '92bdce7b0655cd2e9f83c83fc56d128e'
+	 '98854f331f03d1f938c3b53eee31aaf8')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -21,6 +23,9 @@ build() {
   if [[ $CARCH = x86_64 ]]; then
      patch -Np1 < "$srcdir/bin86-0.16.17-x86_64-1.patch"
   fi
+  if [[ $CARCH = mips64el ]]; then
+     patch -Np1 < "$srcdir/bin86-0.16.19-inttypes.patch"
+  fi
 
   make PREFIX=/usr
 }
diff --git a/extra/bin86/bin86-0.16.19-inttypes.patch b/extra/bin86/bin86-0.16.19-inttypes.patch
new file mode 100644
index 000000000..0ab0bb97e
--- /dev/null
+++ b/extra/bin86/bin86-0.16.19-inttypes.patch
@@ -0,0 +1,13 @@
+--- bin86-0.16.19.orig/ld/x86_aout.h	2012-07-30 03:17:06.000000000 -0500
++++ bin86-0.16.19/ld/x86_aout.h	2013-05-01 18:18:59.553588866 -0500
+@@ -19,7 +19,9 @@
+ typedef int32_t Long;
+ #define __OUT_OK 1
+ #else
+-typedef char Long[4];
++#define __OUT_OK 1
++#include <inttypes.h>
++typedef int32_t Long;
+ #endif
+ #endif
+ 
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index 3a7acc9cc..1371e5f1b 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -7,7 +7,7 @@ _pkgver=2.0-rc1
 pkgrel=1
 epoch=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')
diff --git a/extra/bluefish/PKGBUILD b/extra/bluefish/PKGBUILD
index f8095da0f..7ca29834f 100644
--- a/extra/bluefish/PKGBUILD
+++ b/extra/bluefish/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=bluefish
 pkgver=2.2.5
 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' 'python2' 'desktop-file-utils')
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 14509b07d..972682fc9 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-
 pkgver=5.15
 pkgrel=1
 url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 makedepends=('dbus' 'libical' 'systemd')
 source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 29494d00d..29255aec2 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -12,7 +12,7 @@ pkgver=1.55.0
 _boostver=${pkgver//./_}
 pkgrel=4
 url="http://www.boost.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 makedepends=('icu>=52.1' '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 -dm755 "${_stagedir}"/bin
    install tools/build/v2/engine/${_bindir}/b2 "${_stagedir}"/bin/b2
@@ -58,6 +59,9 @@ build() {
    install -dm755 "${_stagedir}"/share/boostbook
    cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/
 
+   # Disable context on mips64el, it needs N32-specific assembly.
+   [ "$CARCH" = "mips64el" ] && extra="--without-context --without-coroutine"
+
    # default "minimal" install: "release link=shared,static
    # runtime-link=shared threading=single,multi"
    # --layout=tagged will add the "-mt" suffix for multithreaded libraries
@@ -75,6 +79,7 @@ build() {
       cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" \
       --layout=system \
       --prefix="${_stagedir}" \
+      $extra \
       ${JOBS} \
       install
 }
diff --git a/extra/bootchart/PKGBUILD b/extra/bootchart/PKGBUILD
index 501f9ea56..1768ce0de 100644
--- a/extra/bootchart/PKGBUILD
+++ b/extra/bootchart/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A 'startup' graphing tool"
 url="https://github.com/sofar/bootchart"
 license=('GPL2')
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=('glibc')
 source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index 447699199..12dfa88c4 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=brasero
 pkgver=3.10.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=('!emptydirs')
diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD
index e3e101a2e..f86a8f6c4 100644
--- a/extra/brltty/PKGBUILD
+++ b/extra/brltty/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=brltty
 pkgver=4.5
 pkgrel=6
 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 gpm icu tcl cython)
diff --git a/extra/bullet/PKGBUILD b/extra/bullet/PKGBUILD
index 3212dc582..5e8a66da2 100644
--- a/extra/bullet/PKGBUILD
+++ b/extra/bullet/PKGBUILD
@@ -8,7 +8,7 @@ _rev=2704
 pkgver=2.82
 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=()
diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD
index 90c8cf227..59d0b6883 100644
--- a/extra/burp/PKGBUILD
+++ b/extra/burp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=burp
 pkgver=3
 pkgrel=1
 pkgdesc="A simple AUR uploader"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/falconindy/burp"
 license=('GPL')
 depends=('glibc' 'curl')
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index faade41f1..2cc3e6832 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=4
 pkgdesc='Multiplayer 3D tank battle game'
 url='http://bzflag.org/'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'glew' 'glu' 'sdl')
 source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
 sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD
index dce1e73c0..2b8e2d478 100644
--- a/extra/bzr/PKGBUILD
+++ b/extra/bzr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=bzr
 pkgver=2.6.0
 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 5765100fe..85fc32064 100644
--- a/extra/c-ares/PKGBUILD
+++ b/extra/c-ares/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=c-ares
 pkgver=1.10.0
 pkgrel=2
 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/cairo-perl/PKGBUILD b/extra/cairo-perl/PKGBUILD
index ac554e614..85904a68a 100644
--- a/extra/cairo-perl/PKGBUILD
+++ b/extra/cairo-perl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cairo-perl
 pkgver=1.104
 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 63717626d..9d3b39a49 100644
--- a/extra/cairo/PKGBUILD
+++ b/extra/cairo/PKGBUILD
@@ -6,14 +6,15 @@ pkgname=cairo
 pkgver=1.12.16
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
 depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa' 'libgl' 'sh' 'lzo2')
-makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' 'valgrind'
+makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc'
              # for the test suite:
              'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm')
 #optdepends=('xcb-util: for XCB backend') # really needed?
+[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 provides=('cairo-xcb')
 replaces=('cairo-xcb')
 source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz)
diff --git a/extra/cairomm/PKGBUILD b/extra/cairomm/PKGBUILD
index 7ccd513ce..abd82bff1 100644
--- a/extra/cairomm/PKGBUILD
+++ b/extra/cairomm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cairomm
 pkgver=1.10.0
 pkgrel=3
 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/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index e134a8c38..738778942 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -19,14 +19,14 @@ pkgname=('calligra-braindump'
          'calligra-words')
 pkgver=2.7.5
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
              'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio')
-             # libpqxx is in community, move it to extra?
+             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio')
+[ "$CARCH" != "mips64el" ] && makedepends+=('vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
 md5sums=('05d1d0bac970d6dc68ffabc12fca2eb7')
diff --git a/extra/capi4hylafax/PKGBUILD b/extra/capi4hylafax/PKGBUILD
index 23396fe7b..2eb3af3eb 100644
--- a/extra/capi4hylafax/PKGBUILD
+++ b/extra/capi4hylafax/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=capi4hylafax
 pkgver=010300
 pkgrel=9
 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' 'isdn4k-utils' 'hylafax' 'gcc-libs' 'libtiff' 'dialog')
diff --git a/extra/capseo/PKGBUILD b/extra/capseo/PKGBUILD
index b1eb3f76b..627533c92 100644
--- a/extra/capseo/PKGBUILD
+++ b/extra/capseo/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=capseo
 pkgver=0.3
-pkgrel=2
+pkgrel=2.1
 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/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index 30b8e67f5..3e98f6ebd 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=caribou
 pkgver=0.4.13
 pkgrel=1
 pkgdesc="A text entry and UI navigation application (on-screen keyboard)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Caribou"
 license=(LGPL)
 depends=(at-spi2-atk python2-atspi python2-gobject gtk3 libxklavier libgee clutter dconf)
diff --git a/extra/ccrtp/PKGBUILD b/extra/ccrtp/PKGBUILD
index 6b1294c38..444367280 100644
--- a/extra/ccrtp/PKGBUILD
+++ b/extra/ccrtp/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=ccrtp
 pkgver=2.0.6
 pkgrel=2
 pkgdesc="An implementation of RTP, the real-time transport protocol from the IETF"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/ccrtp/"
 license=('GPL' 'custom')
 depends=('ucommon' 'libgcrypt')
diff --git a/extra/cd-discid/PKGBUILD b/extra/cd-discid/PKGBUILD
index 19e11be60..5dc3c5ec4 100644
--- a/extra/cd-discid/PKGBUILD
+++ b/extra/cd-discid/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cd-discid
 pkgver=1.4
 pkgrel=1
 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://linukz.org/cd-discid.shtml"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD
index 9bb7c92f7..db49c0848 100644
--- a/extra/cdparanoia/PKGBUILD
+++ b/extra/cdparanoia/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cdparanoia
 pkgver=10.2
 pkgrel=5
 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..dbde8ce9c 100644
--- a/extra/cdrdao/PKGBUILD
+++ b/extra/cdrdao/PKGBUILD
@@ -6,8 +6,8 @@
 pkgbase=('cdrdao')
 pkgname=('cdrdao' 'gcdmaster')
 pkgver=1.2.3
-pkgrel=6
-arch=('i686' 'x86_64')
+pkgrel=6.1
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://cdrdao.sourceforge.net/"
 makedepends=('gcc-libs' 'lame' 'libmad' 'libvorbis' 'libao' 'libgnomeuimm')
@@ -28,6 +28,7 @@ build() {
 	patch -Np1 -i "${srcdir}/cdrdao-1.2.3-stat.patch"
 
 	./configure --prefix=/usr \
+        --build=$CHOST --host=$CHOST \
 		--mandir=/usr/share/man \
 		--sysconfdir=/etc \
 		--with-xdao --with-lame \
diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD
index 0c9fa0549..589080733 100644
--- a/extra/celestia/PKGBUILD
+++ b/extra/celestia/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=celestia
 pkgver=1.6.1
 pkgrel=5
 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' 'lua51' 'gtkglext' 'glut' 'libxmu' 'glu' 'libjpeg' 'mesa')
diff --git a/extra/celt/PKGBUILD b/extra/celt/PKGBUILD
index e8fcf500c..686dc5b58 100644
--- a/extra/celt/PKGBUILD
+++ b/extra/celt/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=celt
 pkgver=0.11.3
 pkgrel=2
 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/extra/celt0.5.1/PKGBUILD b/extra/celt0.5.1/PKGBUILD
index b26e26fcc..6ee610cd6 100644
--- a/extra/celt0.5.1/PKGBUILD
+++ b/extra/celt0.5.1/PKGBUILD
@@ -7,7 +7,7 @@ _basename=celt
 pkgver=0.5.1.3
 pkgrel=3
 pkgdesc="Low-latency audio communication codec - SPICE version"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.celt-codec.org"
 license=('BSD')
 depends=('libogg')
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index c96f405d3..5658ded32 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=cfitsio
 pkgver=3.360
 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/fitsio/"
 license=('custom')
 depends=('glibc')
diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD
index f05cffea2..cc783c7a6 100644
--- a/extra/check/PKGBUILD
+++ b/extra/check/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=check
 pkgver=0.9.11
 pkgrel=1
 pkgdesc="A unit testing framework for C"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://check.sourceforge.net/"
 license=('LGPL')
 install=$pkgname.install
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index 3e955a71e..d96c3c460 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cheese
 pkgver=3.10.2
 pkgrel=2
 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=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'gnome-video-effects' 'librsvg' 'gnome-desktop')
 makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala')
diff --git a/extra/chemtool/PKGBUILD b/extra/chemtool/PKGBUILD
index 9771f5573..70caf7906 100644
--- a/extra/chemtool/PKGBUILD
+++ b/extra/chemtool/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=chemtool
 pkgver=1.6.14
 pkgrel=1
 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' 'desktop-file-utils')
diff --git a/extra/chmlib/PKGBUILD b/extra/chmlib/PKGBUILD
index 245fa59c5..17cb584c5 100644
--- a/extra/chmlib/PKGBUILD
+++ b/extra/chmlib/PKGBUILD
@@ -7,16 +7,22 @@ pkgname=chmlib
 pkgver=0.40
 pkgrel=4
 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/"
 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/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD
index c416b6211..96e7b021b 100644
--- a/extra/chromaprint/PKGBUILD
+++ b/extra/chromaprint/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1
 pkgrel=1
 pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
 url='http://acoustid.org/chromaprint/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('ffmpeg')
 makedepends=('cmake')
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index fb2db2701..4fc654e83 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cifs-utils
 pkgver=6.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' 'libwbclient')
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 8d83fc457..0f8f2760a 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('bzip2' 'libltdl' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"{,.sig}
         'logrotate'
diff --git a/extra/clisp/PKGBUILD b/extra/clisp/PKGBUILD
index f27d387c6..edecd7e52 100644
--- a/extra/clisp/PKGBUILD
+++ b/extra/clisp/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=clisp
 pkgver=2.49
 pkgrel=4
 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')
@@ -19,6 +19,8 @@ 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
   sed -i 's,http://www.lisp.org/HyperSpec/,http://www.lispworks.com/reference/HyperSpec/,g' config.lisp
   make
diff --git a/extra/cln/PKGBUILD b/extra/cln/PKGBUILD
index 6ef726a4d..7e6c63cc7 100644
--- a/extra/cln/PKGBUILD
+++ b/extra/cln/PKGBUILD
@@ -5,27 +5,34 @@ pkgname=cln
 pkgver=1.3.3
 pkgrel=2
 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')
 install=cln.install
 source=(http://www.ginac.de/CLN/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('11c56780eb83ed54f2ad1ecef7f0dc0f609c426d')
 
 build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make all html pdf
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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
 }
 
 check() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make check
 }
 
 package() {
   cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install install-html install-pdf
+  make DESTDIR="${pkgdir}" install install-html
 }
diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD
index 7adc779d0..fad9998cd 100644
--- a/extra/clucene/PKGBUILD
+++ b/extra/clucene/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=clucene
 pkgver=2.3.3.4
 pkgrel=8
 pkgdesc="C++ port of the high-performance text search engine Lucene"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://clucene.sourceforge.net/"
 license=('APACHE' 'LGPL')
 depends=('gcc-libs>=4.7.1-5' 'zlib' 'boost-libs')
diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD
index e9c29232e..aedef4955 100644
--- a/extra/clutter-gst/PKGBUILD
+++ b/extra/clutter-gst/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=clutter-gst
 pkgver=2.0.10
 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 gst-plugins-base-libs libxdamage gst-plugins-bad)
diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD
index a281cfc9c..b58da6b09 100644
--- a/extra/clutter-gtk/PKGBUILD
+++ b/extra/clutter-gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=clutter-gtk
 pkgver=1.4.4
 pkgrel=4
 pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 license=('LGPL')
 depends=('clutter' 'gtk3')
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index 7642bc7a2..4db8e7a84 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=clutter
 pkgver=1.16.4
 pkgrel=1
 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/"
 license=('LGPL')
 depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev')
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index a378864ec..53ed76bef 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cmake
 pkgver=2.8.12.2
 pkgrel=1
 pkgdesc="A cross-platform open-source make system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cmake.org/"
 license=('custom')
 depends=('curl' 'libarchive' 'shared-mime-info')
diff --git a/extra/cmt/PKGBUILD b/extra/cmt/PKGBUILD
index df73556ce..205ec45e9 100644
--- a/extra/cmt/PKGBUILD
+++ b/extra/cmt/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=cmt
 pkgver=1.16
-pkgrel=3
+pkgrel=3.2
 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/cogl/PKGBUILD b/extra/cogl/PKGBUILD
index 2c3cd9c7f..43a20322e 100644
--- a/extra/cogl/PKGBUILD
+++ b/extra/cogl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=cogl
 pkgver=1.16.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=('mesa' 'libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango' 'libxrandr')
diff --git a/extra/colord-gtk/PKGBUILD b/extra/colord-gtk/PKGBUILD
index 80f0b7937..eb9cff85b 100644
--- a/extra/colord-gtk/PKGBUILD
+++ b/extra/colord-gtk/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=colord-gtk
 pkgver=0.1.25
 pkgrel=1
 pkgdesc="GTK integration for libcolord"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/software/colord"
 license=('GPL2')
 depends=('lcms2' 'gtk3' 'colord')
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 9feda6e6b..12470c923 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=colord
 pkgver=1.0.6
 pkgrel=1
 pkgdesc="System daemon for managing color devices"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/software/colord"
 license=(GPL2)
 depends=(lcms2 libgusb polkit shared-color-profiles sqlite systemd dconf dbus)
diff --git a/extra/compface/PKGBUILD b/extra/compface/PKGBUILD
index d7b325185..25683c856 100644
--- a/extra/compface/PKGBUILD
+++ b/extra/compface/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=compface
 pkgver=1.5.2
 pkgrel=6
 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 a77caff88..77a2b3632 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=4
 pkgdesc='Lightweight system monitor for X'
 url='http://conky.sourceforge.net/'
 license=('BSD' 'GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('docbook2x')
 depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 'imlib2')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
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 52275465c..d635193cc 100644
--- a/extra/cpio/PKGBUILD
+++ b/extra/cpio/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cpio
 pkgver=2.11
 pkgrel=4
 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 e1d317dac..661cb84c1 100644
--- a/extra/cppunit/PKGBUILD
+++ b/extra/cppunit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cppunit
 pkgver=1.13.2
 pkgrel=1
 pkgdesc="A C++ unit testing framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/cppunit"
 license=('LGPL')
 depends=('sh' 'gcc-libs')
diff --git a/extra/crypto++/GNUmakefile.parabola b/extra/crypto++/GNUmakefile.parabola
new file mode 100644
index 000000000..22a724961
--- /dev/null
+++ b/extra/crypto++/GNUmakefile.parabola
@@ -0,0 +1,94 @@
+# -*- makefile -*-
+
+CXXFLAGS += -DNDEBUG -fPIC
+# the following options reduce code size, but breaks link or makes link very slow on some systems
+CXXFLAGS += -ffunction-sections -fdata-sections
+LDFLAGS += -Wl,--gc-sections
+ARFLAGS = -cr	# ar needs the dash on OpenBSD
+RANLIB = ranlib
+CP = cp
+MKDIR = mkdir
+EGREP = egrep
+
+# Default prefix for make install
+PREFIX ?= /usr
+
+LDFLAGS += -pthread
+
+SRCS = $(wildcard *.cpp)
+ifeq ($(SRCS),)				# workaround wildcard function bug in GNU Make 3.77
+SRCS = $(shell echo *.cpp)
+endif
+
+OBJS = $(SRCS:.cpp=.o)
+# test.o needs to be after bench.o for cygwin 1.1.4 (possible ld bug?)
+TESTOBJS = bench.o bench2.o test.o validat1.o validat2.o validat3.o adhoc.o datatest.o regtest.o fipsalgt.o dlltest.o
+LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS))
+
+DLLSRCS = algebra.cpp algparam.cpp asn.cpp basecode.cpp cbcmac.cpp channels.cpp cryptlib.cpp des.cpp dessp.cpp dh.cpp dll.cpp dsa.cpp ec2n.cpp eccrypto.cpp ecp.cpp eprecomp.cpp files.cpp filters.cpp fips140.cpp fipstest.cpp gf2n.cpp gfpcrypt.cpp hex.cpp hmac.cpp integer.cpp iterhash.cpp misc.cpp modes.cpp modexppc.cpp mqueue.cpp nbtheory.cpp oaep.cpp osrng.cpp pch.cpp pkcspad.cpp pubkey.cpp queue.cpp randpool.cpp rdtables.cpp rijndael.cpp rng.cpp rsa.cpp sha.cpp simple.cpp skipjack.cpp strciphr.cpp trdlocal.cpp
+DLLOBJS = $(DLLSRCS:.cpp=.export.o)
+LIBIMPORTOBJS = $(LIBOBJS:.o=.import.o)
+TESTIMPORTOBJS = $(TESTOBJS:.o=.import.o)
+DLLTESTOBJS = dlltest.dllonly.o
+
+all: cryptest.exe
+
+test: cryptest.exe
+	./cryptest.exe v
+
+clean:
+	$(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS) cryptopp.dll libcryptopp.dll.a libcryptopp.import.a cryptest.import.exe dlltest.exe $(DLLOBJS) $(LIBIMPORTOBJS) $(TESTIMPORTOBJS) $(DLLTESTOBJS)
+
+install:
+	$(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin
+	$(CP) *.h $(PREFIX)/include/cryptopp
+	$(CP) *.a $(PREFIX)/lib
+	$(CP) *.so $(PREFIX)/lib
+	$(CP) *.exe $(PREFIX)/bin
+
+libcryptopp.a: $(LIBOBJS)
+	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+	$(RANLIB) $@
+
+libcryptopp.so: $(LIBOBJS)
+	$(CXX) -shared -o $@ $(LIBOBJS)
+
+cryptest.exe: libcryptopp.a $(TESTOBJS)
+	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
+
+nolib: $(OBJS)		# makes it faster to test changes
+	$(CXX) -o ct $(CXXFLAGS) $(OBJS) $(LDFLAGS) $(LDLIBS)
+
+dll: cryptest.import.exe dlltest.exe
+
+cryptopp.dll: $(DLLOBJS)
+	$(CXX) -shared -o $@ $(CXXFLAGS) $(DLLOBJS) $(LDFLAGS) $(LDLIBS) -Wl,--out-implib=libcryptopp.dll.a
+
+libcryptopp.import.a: $(LIBIMPORTOBJS)
+	$(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS)
+	$(RANLIB) $@
+
+cryptest.import.exe: cryptopp.dll libcryptopp.import.a $(TESTIMPORTOBJS)
+	$(CXX) -o $@ $(CXXFLAGS) $(TESTIMPORTOBJS) -L. -lcryptopp.dll -lcryptopp.import $(LDFLAGS) $(LDLIBS)
+
+dlltest.exe: cryptopp.dll $(DLLTESTOBJS)
+	$(CXX) -o $@ $(CXXFLAGS) $(DLLTESTOBJS) -L. -lcryptopp.dll $(LDFLAGS) $(LDLIBS)
+
+adhoc.cpp: adhoc.cpp.proto
+ifeq ($(wildcard adhoc.cpp),)
+	cp adhoc.cpp.proto adhoc.cpp
+else
+	touch adhoc.cpp
+endif
+
+%.dllonly.o : %.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@
+
+%.import.o : %.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_IMPORTS -c $< -o $@
+
+%.export.o : %.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@
+
+%.o : %.cpp
+	$(CXX) $(CXXFLAGS) -c $<
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index cdc6f311d..d838dbbc5 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -10,17 +10,24 @@ pkgver=5.6.2
 _srcver=562
 pkgrel=2
 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')
 makedepends=('unzip')
 source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
-        'libcrypto++.pc')
+        'libcrypto++.pc'
+        'GNUmakefile.parabola')
 md5sums=('7ed022585698df48e65ce9218f6c6a67'
-         '46de3847c59ad16456fa863eb33e73b2')
+         '46de3847c59ad16456fa863eb33e73b2'
+         'c95b2134a8c0a35b173ede32001870d2')
 
 build() {
+  cd ${srcdir}
+
+  # The upstream build system expects this file to be modified
+  # to e.g. use system CFLAGS or use features of modern linkers.
+  cp "${srcdir}/GNUmakefile.parabola" GNUmakefile
   sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
   export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
   make -f GNUmakefile  
diff --git a/extra/cscope/PKGBUILD b/extra/cscope/PKGBUILD
index f79705a32..8fac89cd3 100644
--- a/extra/cscope/PKGBUILD
+++ b/extra/cscope/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=15.8.a
 _realver=15.8a
 pkgrel=2
 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..b3d9f982d 100644
--- a/extra/ctags/PKGBUILD
+++ b/extra/ctags/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=ctags
 pkgver=5.8
-pkgrel=3
+pkgrel=3.1
 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 be5ee2e8b..93f458729 100644
--- a/extra/cups-pdf/PKGBUILD
+++ b/extra/cups-pdf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cups-pdf
 pkgver=2.6.1
 pkgrel=2
 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 48f853f19..a59561d22 100644
--- a/extra/cups-pk-helper/PKGBUILD
+++ b/extra/cups-pk-helper/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=cups-pk-helper
 pkgver=0.2.5
 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=(polkit libcups)
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 854c84593..92e111d3f 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.7.1
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
 makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'openssl'
diff --git a/extra/cvs/PKGBUILD b/extra/cvs/PKGBUILD
index 7572540da..52db75700 100644
--- a/extra/cvs/PKGBUILD
+++ b/extra/cvs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=cvs
 pkgver=1.11.23
 pkgrel=9
 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 c50638922..7ca266cd8 100644
--- a/extra/cvsps/PKGBUILD
+++ b/extra/cvsps/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="Generating 'patchset' information from a CVS repository"
 url="http://www.catb.org/esr/cvsps/"
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
 makedepends=('asciidoc')
 source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz")
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 293fb9a9c..121c4d3f4 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 pkgver=2.1.26
 pkgrel=7
 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')
@@ -82,6 +82,8 @@ build() {
   popd
 
   ./configure --prefix=/usr \
+       --host=$CHOST \
+       --build=$CHOST \
       --sbin=/usr/bin \
       --mandir=/usr/share/man \
       --infodir=/usr/share/info \
diff --git a/extra/dasher/PKGBUILD b/extra/dasher/PKGBUILD
index 8343ad53d..cca246e30 100644
--- a/extra/dasher/PKGBUILD
+++ b/extra/dasher/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dasher
 pkgver=4.11
 pkgrel=1
 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' 'gnome-speech' 'hicolor-icon-theme')
 makedepends=('intltool' 'gnome-doc-utils' 'libgnomeui')
diff --git a/extra/datefudge/PKGBUILD b/extra/datefudge/PKGBUILD
index 1cf348382..37cc1644a 100644
--- a/extra/datefudge/PKGBUILD
+++ b/extra/datefudge/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=datefudge
 pkgver=1.17
 pkgrel=1
 pkgdesc="A program (and preload library) to fake system date"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://packages.qa.debian.org/d/datefudge.html"
 license=('GPL2')
 depends=('sh')
diff --git a/extra/davfs2/PKGBUILD b/extra/davfs2/PKGBUILD
index 4be38d1f1..51394f622 100644
--- a/extra/davfs2/PKGBUILD
+++ b/extra/davfs2/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=davfs2
 pkgver=1.4.7
 pkgrel=3
 pkgdesc="File system driver that allows you to mount a WebDAV folder"
-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-c++/PKGBUILD b/extra/dbus-c++/PKGBUILD
index 40ee64d05..ab849d69c 100644
--- a/extra/dbus-c++/PKGBUILD
+++ b/extra/dbus-c++/PKGBUILD
@@ -5,10 +5,10 @@
 pkgname=dbus-c++
 _pkgname=lib$pkgname
 pkgver=0.9.0
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A C++ API for D-BUS"
 url="http://sourceforge.net/projects/dbus-cplusplus/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('dbus>=1.2.0' 'glib2')
 makedepends=('autoconf' 'automake' 'libtool')
diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD
index 18e286cae..c08308f79 100644
--- a/extra/dbus-glib/PKGBUILD
+++ b/extra/dbus-glib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dbus-glib
 pkgver=0.102
 pkgrel=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 98fc6a508..a37f00dbe 100644
--- a/extra/dbus-python/PKGBUILD
+++ b/extra/dbus-python/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
 pkgver=1.2.0
 pkgrel=2
 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"
 makedepends=('docutils' 'dbus-glib' 'python' 'python2')
diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD
index 639671156..0dccaad2b 100644
--- a/extra/dconf/PKGBUILD
+++ b/extra/dconf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dconf
 pkgver=0.18.0
 pkgrel=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 0414cffd3..e50a4fc32 100644
--- a/extra/dcraw/PKGBUILD
+++ b/extra/dcraw/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=9.19
 pkgrel=1
 pkgdesc='Decodes any raw image from any digital camera'
 url='http://www.cybercom.net/~dcoffin/dcraw/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('lcms' 'jasper')
 source=("http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/ddd/PKGBUILD b/extra/ddd/PKGBUILD
index 6e7b8447e..2b7d22276 100644
--- a/extra/ddd/PKGBUILD
+++ b/extra/ddd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ddd
 pkgver=3.3.12
 pkgrel=3
 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' 'lesstif' 'libxaw')
diff --git a/extra/ddrescue/PKGBUILD b/extra/ddrescue/PKGBUILD
index 3deeb3bd5..dd82c9c0b 100644
--- a/extra/ddrescue/PKGBUILD
+++ b/extra/ddrescue/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ddrescue
 pkgver=1.17
 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 84d05594d..89c67e814 100644
--- a/extra/desktop-file-utils/PKGBUILD
+++ b/extra/desktop-file-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=desktop-file-utils
 pkgver=0.22
 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 8ecc5fbbb..0e8d89453 100644
--- a/extra/devhelp/PKGBUILD
+++ b/extra/devhelp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=devhelp
 pkgver=3.10.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=(webkitgtk hicolor-icon-theme)
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index acd817025..cd40f8804 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('dhcp' 'dhclient')
 pkgver=4.2.5.p1
 _pkgver=4.2.5-P1
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
 makedepends=('bash' 'iproute2')
diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD
index 63c21450a..39cd06a00 100644
--- a/extra/di/PKGBUILD
+++ b/extra/di/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=di
 pkgver=4.35
 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/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index ac9417605..13a5fbb5d 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libme
 pkgver=3.5.0
 pkgrel=3
 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/djvulibre/PKGBUILD b/extra/djvulibre/PKGBUILD
index eb44cb111..c08cc767c 100644
--- a/extra/djvulibre/PKGBUILD
+++ b/extra/djvulibre/PKGBUILD
@@ -6,10 +6,10 @@
 pkgname=djvulibre
 pkgver=3.5.25.3
 _major=3.5.25
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Suite to create, manipulate and view DjVu ('déjà vu') documents"
 url='http://djvu.sourceforge.net/'
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 license=('GPL2')
 makedepends=('librsvg')
 depends=('libtiff' 'hicolor-icon-theme')
diff --git a/extra/dmapi/PKGBUILD b/extra/dmapi/PKGBUILD
index 6267ad276..482ff364a 100644
--- a/extra/dmapi/PKGBUILD
+++ b/extra/dmapi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=dmapi
 pkgver=2.2.12
 pkgrel=2
 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 d36f8c5e7..4bd9ee2e4 100644
--- a/extra/dmidecode/PKGBUILD
+++ b/extra/dmidecode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=dmidecode
 pkgver=2.12
 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 8a5619890..0d1a7a26d 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.68
 pkgrel=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')
 install=$pkgname.install
diff --git a/extra/dnsutils/PKGBUILD b/extra/dnsutils/PKGBUILD
index e1b3a1cd0..1c392a354 100644
--- a/extra/dnsutils/PKGBUILD
+++ b/extra/dnsutils/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=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' 'dnssec-anchors')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
diff --git a/extra/docker-tray/PKGBUILD b/extra/docker-tray/PKGBUILD
index 68309c6fc..f8a111d80 100644
--- a/extra/docker-tray/PKGBUILD
+++ b/extra/docker-tray/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=docker-tray
 pkgver=1.5
 pkgrel=1
 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/dotconf/PKGBUILD b/extra/dotconf/PKGBUILD
index 81cb17413..276907d41 100644
--- a/extra/dotconf/PKGBUILD
+++ b/extra/dotconf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dotconf
 pkgver=1.3
 pkgrel=4
 pkgdesc='A C library for parsing configuration files'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/williamh/dotconf"
 license=('LGPL2.1')
 depends=('glibc')
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index fac1cc4b8..0fc89b22d 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -11,7 +11,7 @@ pkgname=dovecot
 pkgver=2.2.11
 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' 'sqlite' 'libmariadbclient'
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 4a3acbcd5..00fb2ae53 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('doxygen' 'doxygen-docs')
 pkgver=1.8.6
 pkgrel=1
 license=('GPL')
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
              'texlive-latexextra' 'graphviz' 'python2')
@@ -39,5 +39,11 @@ package_doxygen-docs() {
   pkgdesc="Developer documentation for doxygen"
 
   cd "${srcdir}/${pkgbase}-${pkgver}"
+
+  # Needs fonts removed from our TeXLive.
+  sed -i -e 's;$(MAKE) -C latex;:;' \
+      -e 's;$(INSTTOOL) -m 644 latex/doxygen_manual.pdf $(DESTDIR)/$(DOCDIR);:;' \
+      Makefile
+
   make INSTALL="${pkgdir}"/usr MAN1DIR=share/man/man1 install_docs
 }
diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD
index 516f2e481..60f6dcd52 100644
--- a/extra/dssi/PKGBUILD
+++ b/extra/dssi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=dssi
 pkgver=1.1.1
 pkgrel=7
 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>=0.28' 'jack')
diff --git a/extra/dvd+rw-tools/PKGBUILD b/extra/dvd+rw-tools/PKGBUILD
index 27c8c9122..37d949931 100644
--- a/extra/dvd+rw-tools/PKGBUILD
+++ b/extra/dvd+rw-tools/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=dvd+rw-tools
 pkgver=7.1
-pkgrel=4
+pkgrel=4.2
 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 cd48b8c6a..a07bd4a50 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=dvdauthor
 pkgver=0.7.1
 pkgrel=7
 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/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD
index ff1c158b1..3c1d615fc 100644
--- a/extra/e_dbus/PKGBUILD
+++ b/extra/e_dbus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=e_dbus
 pkgver=1.7.9
 pkgrel=2
 pkgdesc="D-Bus integration with Ecore"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('efl' 'dbus-core')
diff --git a/extra/easytag/PKGBUILD b/extra/easytag/PKGBUILD
index fe517e1ba..2ace2569e 100644
--- a/extra/easytag/PKGBUILD
+++ b/extra/easytag/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=easytag
 pkgver=2.1.10
 pkgrel=1
 pkgdesc='Utility for viewing and editing tags for most audio formats'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://easytag.sourceforge.net/'
 makedepends=('intltool' 'itstool')
diff --git a/extra/ebook-tools/PKGBUILD b/extra/ebook-tools/PKGBUILD
index 439163598..8522b5316 100644
--- a/extra/ebook-tools/PKGBUILD
+++ b/extra/ebook-tools/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ebook-tools
 pkgver=0.2.2
 pkgrel=1
 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/ecl/PKGBUILD b/extra/ecl/PKGBUILD
index 86c7b5a67..3a5f96811 100644
--- a/extra/ecl/PKGBUILD
+++ b/extra/ecl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ecl
 pkgver=13.5.1
 pkgrel=2
 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 0a17572cc..97b79178d 100644
--- a/extra/eclipse/PKGBUILD
+++ b/extra/eclipse/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=4.3.1
 pkgrel=2
 _date=201309111000
 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' 'webkitgtk2' 'libxtst')
 install=${pkgname}.install
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 5adbe63de..468e32b4f 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=8
 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')
 optdepends=('evolution-data-server: Evolution integration')
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index 449229d37..837f084c5 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('elementary' 'elementary-docs')
 pkgver=1.8.4
 pkgrel=1
 pkgdesc="Enlightenment's widget set"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('BSD')
 depends=('efl' 'evas_generic_loaders')
diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD
index 78061031b..d284e571b 100644
--- a/extra/elfutils/PKGBUILD
+++ b/extra/elfutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=elfutils
 pkgver=0.158
 pkgrel=1
 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://fedorahosted.org/elfutils/"
 license=('LGPL3' 'GPL' 'GPL3')
 depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
@@ -36,7 +36,7 @@ build() {
 
 check() {
   cd ${pkgname}-${pkgver}
-
+  [ "$CARCH" = "mips64el" ] && return 0  # Known to fail, no benefit from running.
   make check
 }
 
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index b2149a2f1..79a022d5f 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=emacs
 pkgver=24.3
 pkgrel=6
 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' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick' 'gnutls')
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 9664cb10c..e5cfc5b26 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=empathy
 pkgver=3.10.3
 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=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2 geocode-glib cheese libchamplain)
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index 1cbd45a8f..3fda0cbbd 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=enblend-enfuse
 pkgver=4.1.1
 pkgrel=5
 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' 'freeglut' 'lcms2' 'boost-libs' 'vigra' 'gsl')
diff --git a/extra/enca/PKGBUILD b/extra/enca/PKGBUILD
index 47d4776c4..7445eab26 100644
--- a/extra/enca/PKGBUILD
+++ b/extra/enca/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=enca
 pkgver=1.15
 pkgrel=1
 pkgdesc="Charset analyser and converter"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cihar.com/software/enca/"
 license=('GPL')
 depends=('recode')
diff --git a/extra/enchant/PKGBUILD b/extra/enchant/PKGBUILD
index b27d1ab89..113890c6a 100644
--- a/extra/enchant/PKGBUILD
+++ b/extra/enchant/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=enchant
 pkgver=1.6.0
-pkgrel=4
+pkgrel=4.1
 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/enlightenment16/PKGBUILD b/extra/enlightenment16/PKGBUILD
index 2e20fd922..aa52eb9d8 100644
--- a/extra/enlightenment16/PKGBUILD
+++ b/extra/enlightenment16/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.0.13
 _themever=1.0.1
 pkgrel=4
 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/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD
index d11f3fcf8..6b94f92ca 100644
--- a/extra/eog-plugins/PKGBUILD
+++ b/extra/eog-plugins/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=eog-plugins
 pkgver=3.10.1
 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 9f67fd748..7b48be4dc 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=eog
 pkgver=3.10.2
 pkgrel=2
 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 itstool)
diff --git a/extra/epplet-base/PKGBUILD b/extra/epplet-base/PKGBUILD
index 4379b3344..083a8fa44 100644
--- a/extra/epplet-base/PKGBUILD
+++ b/extra/epplet-base/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=epplet-base
 pkgver=0.14
 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/ethstatus/PKGBUILD b/extra/ethstatus/PKGBUILD
index 9333a6adf..6bcdc9911 100644
--- a/extra/ethstatus/PKGBUILD
+++ b/extra/ethstatus/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=ethstatus
 pkgver=0.4.3
-pkgrel=2
+pkgrel=2.1
 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 edda6f0ab..c91c11a96 100644
--- a/extra/ethtool/PKGBUILD
+++ b/extra/ethtool/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=3.13
 pkgrel=1
 epoch=1
 pkgdesc="Utility for controlling network drivers and hardware"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://www.kernel.org/pub/software/network/ethtool/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index a0e0f6e16..1d5374b4a 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=evas_generic_loaders
 pkgver=1.8.1
 pkgrel=3
 pkgdesc="Additional generic loaders for Evas"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
 license=('GPL2')
 depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'efl')
diff --git a/extra/eventlog/PKGBUILD b/extra/eventlog/PKGBUILD
index 262d2e216..951679a98 100644
--- a/extra/eventlog/PKGBUILD
+++ b/extra/eventlog/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=eventlog
 pkgver=0.2.12
 pkgrel=4
 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/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 1dfd9967b..052ac6710 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.10.3
 pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://projects.gnome.org/evince/"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL)
 depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas)
 makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python)
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 3619b5b5b..34a8f8613 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=evolution-data-server
 pkgver=3.10.4
 pkgrel=1
 pkgdesc="Centralized access to appointments and contacts"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 depends=(gnome-online-accounts nss krb5 libgweather libical db libgdata)
 makedepends=(intltool gperf gobject-introspection vala python2)
 install=$pkgname.install
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index 260161556..9ecd95ad9 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=evolution-ews
 pkgver=3.10.4
 pkgrel=1
 pkgdesc="MS Exchange integration through Exchange Web Services"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 url="http://www.gnome.org"
 depends=('evolution-data-server' 'gtkhtml4' 'libmspack')
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 1ed07197d..8ab2df0d9 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=evolution
 pkgver=3.10.4
 pkgrel=1
 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 libpst libytnef psmisc
          desktop-file-utils hicolor-icon-theme dconf)
diff --git a/extra/exempi/PKGBUILD b/extra/exempi/PKGBUILD
index 936213c33..d0623d04b 100644
--- a/extra/exempi/PKGBUILD
+++ b/extra/exempi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=exempi
 pkgver=2.2.1
 pkgrel=2
 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' 'expat' 'zlib')
diff --git a/extra/exiv2/PKGBUILD b/extra/exiv2/PKGBUILD
index efa65e38b..60cdf8182 100644
--- a/extra/exiv2/PKGBUILD
+++ b/extra/exiv2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=exiv2
 pkgver=0.24
 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=('GPL2')
 depends=('gcc-libs' 'zlib' 'expat')
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index 5414bfba8..c80813eea 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=exo
 pkgver=0.10.2
 pkgrel=2
 pkgdesc="Extensions to Xfce by os-cillation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2' 'LGPL')
 groups=('xfce4')
diff --git a/extra/expac/PKGBUILD b/extra/expac/PKGBUILD
index f3f8be884..2942ccec3 100644
--- a/extra/expac/PKGBUILD
+++ b/extra/expac/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=expac
 pkgver=3
 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/extra/expect/PKGBUILD b/extra/expect/PKGBUILD
index 5af97256a..a9771cc16 100644
--- a/extra/expect/PKGBUILD
+++ b/extra/expect/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=expect
 pkgver=5.45
 pkgrel=3
 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')
diff --git a/extra/f2fs-tools/PKGBUILD b/extra/f2fs-tools/PKGBUILD
index 21541369a..e837e89e4 100644
--- a/extra/f2fs-tools/PKGBUILD
+++ b/extra/f2fs-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=f2fs-tools
 pkgver=1.3.0
 pkgrel=1
 pkgdesc="Tools for Flash-Friendly File System (F2FS)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/f2fs-tools/"
 depends=('util-linux')
 license=('GPL')
diff --git a/extra/faad2/PKGBUILD b/extra/faad2/PKGBUILD
index 3804ed5a8..08c5cdf06 100644
--- a/extra/faad2/PKGBUILD
+++ b/extra/faad2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=faad2
 pkgver=2.7
 pkgrel=4
 pkgdesc="ISO AAC audio decoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.audiocoding.com/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/facile/PKGBUILD b/extra/facile/PKGBUILD
index c5164c562..6bfc3812e 100644
--- a/extra/facile/PKGBUILD
+++ b/extra/facile/PKGBUILD
@@ -5,20 +5,25 @@ pkgname=facile
 pkgver=1.1
 pkgrel=16
 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')
 depends=()
 source=(http://www.recherche.enac.fr/opti/facile/distrib/$pkgname-$pkgver.tar.gz
-        ocaml-facile-ocaml-4.patch)
+        ocaml-facile-ocaml-4.patch
+        facile-1.1-ocaml.patch)
 md5sums=('ab673e1fc0859a42bcb639a02c2d7e9e'
-         '1ffc2f08c9f1db8ef0d444ec06f82b79')
+         '1ffc2f08c9f1db8ef0d444ec06f82b79'
+         '0c07248878354f8bcfc101df70bf55e5')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   # fix ocaml4
   patch -Np1 -i ../ocaml-facile-ocaml-4.patch
+  if [ "$CARCH" == "mips64el" ]; then
+    patch -Np1 -i "${srcdir}/facile-1.1-ocaml.patch"
+  fi
   ./configure
   make
 }
@@ -26,5 +31,6 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver/src"
   install -d "$pkgdir/usr/lib/ocaml/facile"
-  install -D -m 644 facile.cmxa facile.cmi facile.cma facile.a "$pkgdir/usr/lib/ocaml/facile"
+  [ "$CARCH" != "mips64el" ] && extra=facile.cmxa facile.a
+  install -D -m 644 facile.cmi facile.cma $extra "$pkgdir/usr/lib/ocaml/facile"
 }
diff --git a/extra/facile/facile-1.1-ocaml.patch b/extra/facile/facile-1.1-ocaml.patch
new file mode 100644
index 000000000..19f73adaa
--- /dev/null
+++ b/extra/facile/facile-1.1-ocaml.patch
@@ -0,0 +1,66 @@
+--- facile-1.1.orig/Makefile	2004-09-08 04:51:02.000000000 -0500
++++ facile-1.1/Makefile	2013-08-01 21:31:24.289306640 -0500
+@@ -7,11 +7,9 @@
+ 
+ install:
+ 	if test -d $(FACILEDIR); then : ; else mkdir $(FACILEDIR); fi
+-	cp src/facile.cmi src/facile.cma src/facile.cmxa src/facile.a $(FACILEDIR)
++	cp src/facile.cmi src/facile.cma $(FACILEDIR)
+ 	chmod a+r $(FACILEDIR)/facile.cmi
+ 	chmod a+r $(FACILEDIR)/facile.cma
+-	chmod a+r $(FACILEDIR)/facile.cmxa
+-	chmod a+r $(FACILEDIR)/facile.a
+ 
+ clean:
+ 	cd src; make clean
+@@ -20,4 +18,4 @@
+ 	rm -fr $(FACILEDIR)
+ 
+ check:
+-	cd examples; make FACILEDIR=../src queens.opt; ./queens.opt 8
++	cd examples; make FACILEDIR=../src queens.out; ./queens.out 8
+--- facile-1.1.orig/src/Makefile	2004-09-08 04:51:02.000000000 -0500
++++ facile-1.1/src/Makefile	2013-08-01 21:35:35.261718749 -0500
+@@ -1,7 +1,7 @@
+ # $Id: Makefile,v 1.73 2004/09/01 12:33:49 barnier Exp $
+ 
+-OCAMLC = ocamlc.opt -g
+-OCAMLMLI = ocamlc.opt
++OCAMLC = ocamlc -g
++OCAMLMLI = ocamlc
+ OCAMLOPT = ocamlopt -unsafe -noassert -inline 10
+ OCAMLDEP = ocamldep
+ INCLUDES =
+@@ -16,7 +16,7 @@
+ CSTRCMX = $(CSTR:.ml=.cmx)
+ 
+ # Default target: libraries and toplevel
+-all : facile.cma facile.cmxa facile
++all : facile.cma facile
+ 
+ # Libraries
+ facile.cma : $(CSTRCMO)
+@@ -28,9 +28,9 @@
+ # Version of the library to be linked with the -p (profiler) option
+ facile.p.cmxa : $(CSTR)
+ 	rm -fr $(CSTRCMX)
+-	make facile.cmxa OPTOPT=-p
++	make OPTOPT=-p
+ 	rm -fr $(CSTRCMX)
+-	mv facile.cmxa $@
++	mv $@
+ 	mv facile.a facile.p.a
+ 
+ # Toplevel (to be run with the "-I +facile" option)
+@@ -42,9 +42,9 @@
+ facile.exp.cmxa : $(CSTR)
+ 	rm -fr $(CSTRCMX)
+ 	make fcl_stak.cmx fcl_cstr.cmx fcl_inv.cmx fcl_reify.cmx fcl_arith.cmx fcl_goals.cmx fcl_fdArray.cmx fcl_gcc.cmx fcl_alldiff.cmx fcl_sorting.cmx fcl_interval.cmx facile.cmx
+-	make facile.cmxa OPTOPT="-pp inline_functors"
++	make OPTOPT="-pp inline_functors"
+ 	rm -fr $(CSTRCMX)
+-	mv facile.cmxa $@
++	mv $@
+ 	mv facile.a facile.exp.a
+ 
+ .SUFFIXES:
diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD
index a0695b442..c92d09aac 100644
--- a/extra/fakechroot/PKGBUILD
+++ b/extra/fakechroot/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fakechroot
 pkgver=2.17.2
 pkgrel=1
 pkgdesc="Gives a fake chroot environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/dex4er/fakechroot/wiki"
 license=('LGPL')
 install=fakechroot.install
diff --git a/extra/farstream-0.1/PKGBUILD b/extra/farstream-0.1/PKGBUILD
index 4a33f5b39..f078a8d59 100644
--- a/extra/farstream-0.1/PKGBUILD
+++ b/extra/farstream-0.1/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=farstream
 pkgver=0.1.2
 pkgrel=3
 pkgdesc="Audio/Video Communications Framework (legacy version)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/Farstream"
 license=('LGPL2.1')
 depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins'
@@ -31,8 +31,8 @@ build() {
   NOCONFIGURE=1 ./autogen.sh
   ./configure \
     --prefix=/usr \
-    --with-package-name='Arch Linux Farstream 0.1 Package' \
-    --with-package-origin='httpw://www.archlinux.org/' \
+    --with-package-name='Parabola Farstream 0.1 Package' \
+    --with-package-origin='https://parabolagnulinux.org/' \
     --enable-gtk-doc --disable-static
   make -j1
 }
diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD
index 1a62c4964..68c067bec 100644
--- a/extra/farstream/PKGBUILD
+++ b/extra/farstream/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=farstream
 pkgver=0.2.3
 pkgrel=1
 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/Farstream"
 license=('LGPL')
 depends=('gst-plugins-base-libs' 'libnice')
@@ -20,8 +20,8 @@ md5sums=('a8971167068b69a6933d3eaaeb9ab448'
 build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr \
-    --with-package-name='Arch Linux farstream package' \
-    --with-package-origin='http://archlinux.org' \
+    --with-package-name='Parabola GNU/Linux-libre farstream package' \
+    --with-package-origin='https://parabolagnulinux.org/' \
     --disable-static
   make
 }
diff --git a/extra/fastjar/PKGBUILD b/extra/fastjar/PKGBUILD
index d34ff0a77..f2d0567b3 100644
--- a/extra/fastjar/PKGBUILD
+++ b/extra/fastjar/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=fastjar
 pkgver=0.98
-pkgrel=2
+pkgrel=2.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 560de96b1..55a959c19 100644
--- a/extra/fbida/PKGBUILD
+++ b/extra/fbida/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fbida
 pkgver=2.09
 pkgrel=3
 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' 'curl' 'desktop-file-utils')
diff --git a/extra/fbset/PKGBUILD b/extra/fbset/PKGBUILD
index 3e1ac8ab3..b991dfd92 100644
--- a/extra/fbset/PKGBUILD
+++ b/extra/fbset/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fbset
 pkgver=2.1
 pkgrel=5
 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 e87a059a2..73ebbfe42 100644
--- a/extra/fcgi/PKGBUILD
+++ b/extra/fcgi/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.4.0
 pkgrel=9
 depends=('gcc-libs')
 pkgdesc="FASTCgi (fcgi) is a language independent, high performant extension to CGI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 options=('!makeflags')
 url="http://www.fastcgi.com"
@@ -28,7 +28,7 @@ prepare() {
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST
   make
 }
 
diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD
index de86e00d3..35a95f28d 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=('custom:MIT')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('giblib' 'curl' 'libxinerama' 'libexif')
 optdepends=('perl: feh-cam, webcam wrapper for feh'
             'imagemagick: support more file formats')
diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD
index 53a7bde44..ad2b34306 100644
--- a/extra/festival/PKGBUILD
+++ b/extra/festival/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=festival
 pkgver=2.1
 pkgrel=4
 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/speech_tools-2.1-build.patch b/extra/festival/speech_tools-2.1-build.patch
new file mode 100644
index 000000000..f465e6cb6
--- /dev/null
+++ b/extra/festival/speech_tools-2.1-build.patch
@@ -0,0 +1,81 @@
+--- speech_tools.orig/include/EST_TIterator.h	2004-05-03 19:00:16.000000000 -0500
++++ speech_tools/include/EST_TIterator.h	2013-07-21 23:38:24.643554686 -0500
+@@ -209,7 +209,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TStructIterator(const Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   const Entry *operator ->() const
+     {return &this->current();}
+@@ -289,7 +289,7 @@
+ 
+   /// Create an iterator ready to run over the given container.
+   EST_TRwStructIterator(Container &over)
+-    { begin(over); }
++    { this->begin(over); }
+ 
+   Entry *operator ->() const
+     {return &this->current();}
+--- speech_tools.orig/include/EST_TNamedEnum.h	2004-09-30 07:53:36.000000000 -0500
++++ speech_tools/include/EST_TNamedEnum.h	2013-07-21 23:55:47.072143553 -0500
+@@ -130,7 +130,7 @@
+ 	{this->initialise((const void *)defs); };
+   EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *))
+ 	{this->initialise((const void *)defs, conv); };
+-  const char *name(ENUM tok, int n=0) const {return value(tok,n); };
++  const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
+ 
+ };
+ 
+--- speech_tools.orig/base_class/EST_TSimpleMatrix.cc	2009-02-18 07:56:24.000000000 -0500
++++ speech_tools/base_class/EST_TSimpleMatrix.cc	2013-07-22 01:23:50.302856444 -0500
+@@ -42,6 +42,7 @@
+ 
+ #include "EST_TSimpleMatrix.h"
+ #include "EST_TVector.h"
++#include <cstring>
+ #include <fstream>
+ #include <iostream>
+ #include "EST_cutils.h"
+@@ -98,7 +99,7 @@
+ 	{
+ 	  int copy_r = Lof(this->num_rows(), new_rows);
+ 
+-	  just_resize(new_rows, new_cols, &old_vals);
++	  this->just_resize(new_rows, new_cols, &old_vals);
+ 
+           for (q=0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */
+               ((char *)this->p_memory)[q] = ((char *)old_vals)[q];
+@@ -127,9 +128,9 @@
+ 	  int copy_r = Lof(this->num_rows(), new_rows);
+ 	  int copy_c = Lof(this->num_columns(), new_cols);
+ 	  
+-	  just_resize(new_rows, new_cols, &old_vals);
++	  this->just_resize(new_rows, new_cols, &old_vals);
+ 
+-	  set_values(old_vals,
++	  this->set_values(old_vals,
+ 		     old_row_step, old_column_step,
+ 		     0, copy_r,
+ 		     0, copy_c);
+--- speech_tools.orig/base_class/EST_TSimpleVector.cc	2009-02-18 07:52:55.000000000 -0500
++++ speech_tools/base_class/EST_TSimpleVector.cc	2013-07-22 01:43:44.981811522 -0500
+@@ -42,6 +42,7 @@
+ 
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
++#include <cstring>
+ #include <fstream>
+ #include "EST_cutils.h"
+ 
+@@ -70,7 +71,7 @@
+   int old_offset = this->p_offset;
+   unsigned int q;
+ 
+-  just_resize(newn, &old_vals);
++  this->just_resize(newn, &old_vals);
+ 
+   if (set && old_vals)
+     {
diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index b45c77d8d..26dbd1109 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=fetchmail
 pkgver=6.3.26
 pkgrel=1
 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 147e47af2..a328a6e77 100644
--- a/extra/ffcall/PKGBUILD
+++ b/extra/ffcall/PKGBUILD
@@ -6,17 +6,25 @@ pkgname=ffcall
 pkgver=1.10
 pkgrel=6
 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=('!makeflags' 'staticlibs')
-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-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD
index 1fb5e77f8..744310a4c 100644
--- a/extra/ffmpeg-compat/PKGBUILD
+++ b/extra/ffmpeg-compat/PKGBUILD
@@ -10,16 +10,19 @@ pkgver=0.10.11
 pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ffmpeg.org/'
 license=('GPL')
 depends=(
       'alsa-lib' 'bzip2' 'gsm' 'lame' 'libass'
-      'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx'
+      'libmodplug' 'libpulse' 'libtheora' 'libvorbis' 'libvpx'
       'opencore-amr' 'openjpeg' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
       'v4l-utils' 'x264' 'xvidcore' 'zlib'
       )
-makedepends=('libvdpau' 'yasm')
+if [ "$CARCH" != "mips64el" ]; then
+  depends+=(libva)
+  makedepends=('libvdpau' 'yasm')
+fi
 source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2
         ffmpeg-0.10.10-freetype2.patch)
 sha256sums=('99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0'
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 34f78179e..098929b0c 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -9,22 +9,39 @@ pkgver=2.1.3
 pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ffmpeg.org/'
 license=('GPL')
 depends=(
       'alsa-lib' 'bzip2' 'fontconfig' 'gnutls' 'gsm' 'lame' 'libass'
-      'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libva' 'libvorbis' 'libvpx'
+      'libbluray' 'libmodplug' 'libpulse' 'libtheora' 'libvorbis' 'libvpx'
       'opencore-amr' 'openjpeg' 'opus' 'rtmpdump' 'schroedinger' 'sdl' 'speex'
-      'v4l-utils' 'x264' 'xvidcore' 'zlib'
+      'v4l-utils' 'x264' 'xvidcore' 'zlib' 'libxfixes'
       )
-makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('711b795bbc7b527c0f4a1828f324fd5a')
+if [ "${CARCH}" != "mips64el" ]; then
+    depends+=('libva')
+    makedepends=('yasm' 'libvdpau')
+fi
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
+        ffmpeg-2.1.1-freetype2.patch)
+md5sums=('711b795bbc7b527c0f4a1828f324fd5a'
+         '4b5dd079a40f44f4e0d00cdbc9d52ec3')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -p1 -i ../ffmpeg-2.1.1-freetype2.patch
+}
 
 build() {
   cd $pkgname-$pkgver
 
+  if [ "$CARCH" = "mips64el" ] ; then
+      # Disable runtime CPU detection, video acceleration APIs our hardware doesn't support and ISAs our CPUs don't support.
+      extraconf="--disable-runtime-cpudetect --disable-vdpau --disable-vaapi --disable-mips32r2 --disable-mipsdspr1 --disable-mipsdspr2"
+  else
+      extraconf=""
+  fi
+
   ./configure \
     --prefix=/usr \
     --disable-debug \
@@ -61,7 +78,8 @@ build() {
     --enable-swresample \
     --enable-vdpau \
     --enable-version3 \
-    --enable-x11grab
+    --enable-x11grab \
+    $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 2ba6beb75..3042e89bf 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=5
 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 08943a759..c6d7cd64e 100644
--- a/extra/fftw/PKGBUILD
+++ b/extra/fftw/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fftw
 pkgver=3.3.3
 pkgrel=2
 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')
@@ -29,15 +29,25 @@ build() {
   mv ${pkgname}-${pkgver} ${pkgname}-${pkgver}-single
   
 
+  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 double precision
   cd ${srcdir}/${pkgname}-${pkgver}-double
-  $CONFIGURE --enable-sse2
+  $CONFIGURE $sse2
   make
 
   # build & install long double precission
@@ -47,7 +57,7 @@ build() {
 
   # build & install single precision
   cd ${srcdir}/${pkgname}-${pkgver}-single
-  $CONFIGURE --enable-float --enable-sse
+  $CONFIGURE --enable-float $sse
   make
 }
 
diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD
index 1504474c9..55bbf780b 100644
--- a/extra/five-or-more/PKGBUILD
+++ b/extra/five-or-more/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=five-or-more
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Remove colored balls from the board by forming lines"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/flac/PKGBUILD b/extra/flac/PKGBUILD
index adb756f2b..be8f995bc 100644
--- a/extra/flac/PKGBUILD
+++ b/extra/flac/PKGBUILD
@@ -5,11 +5,12 @@ pkgbase=flac
 pkgname=('flac' 'flac-doc')
 pkgver=1.3.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://flac.sourceforge.net/"
 license=('BSD' 'GPL')
 depends=('libogg')
-makedepends=('nasm' 'xmms' 'doxygen')
+makedepends=('doxygen')
+[ "$CARCH" = "mips64el" ] || makedepends+=('nasm' 'xmms')
 options=('!makeflags')
 source=(http://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz)
 sha1sums=('a136e5748f8fb1e6c524c75000a765fc63bb7b1b')
@@ -27,7 +28,7 @@ check() {
 
 package_flac() {
   pkgdesc="Free Lossless Audio Codec"
-  optdepends=('xmms: for using the xmms plugin')
+  [ "$CARCH" = "mips64el" ] || optdepends=('xmms: for using the xmms plugin')
   options=('!docs')
 
   cd ${pkgbase}-${pkgver}
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 6c81007d7..e176ca9b6 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
 pkgver=1.3.2
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
 makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \
diff --git a/extra/fluidsynth/PKGBUILD b/extra/fluidsynth/PKGBUILD
index a1e133765..07b790a4d 100644
--- a/extra/fluidsynth/PKGBUILD
+++ b/extra/fluidsynth/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fluidsynth
 pkgver=1.1.6
 pkgrel=2
 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' 'libpulse')
 makedepends=('cmake' 'ladspa' 'doxygen')
diff --git a/extra/fluxbox/PKGBUILD b/extra/fluxbox/PKGBUILD
index 3618a80f7..78f3354e9 100644
--- a/extra/fluxbox/PKGBUILD
+++ b/extra/fluxbox/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fluxbox
 pkgver=1.3.5
 pkgrel=2
 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 247449633..f8fd53cfc 100644
--- a/extra/fluxter/PKGBUILD
+++ b/extra/fluxter/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fluxter
 pkgver=0.1.0
 pkgrel=6
 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 01e84ef14..2ce34ed32 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=folks
 pkgver=0.9.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 zeitgeist libtracker-sparql)
diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD
index 9d6cd0028..fccc475e1 100644
--- a/extra/fontconfig/PKGBUILD
+++ b/extra/fontconfig/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fontconfig
 pkgver=2.11.0
 pkgrel=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' 'freetype2')
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index 6090afa89..3f6e61206 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=${_pkgver##*.}
 pkgrel=1
 pkgdesc='Outline and bitmap font editor'
 url='http://fontforge.sourceforge.net/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro'
          'libltdl' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
diff --git a/extra/foobillard++/PKGBUILD b/extra/foobillard++/PKGBUILD
index d68c20d2b..428421fe0 100644
--- a/extra/foobillard++/PKGBUILD
+++ b/extra/foobillard++/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=foobillard++
 pkgver=3.42beta
 pkgrel=5
 pkgdesc="An OpenGL billiard game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://foobillardplus.sourceforge.net/"
 license=('GPL2')
 depends=('freetype2' 'libpng' 'glu' 'sdl_net' 'sdl_mixer')
diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD
new file mode 100644
index 000000000..1f4b316ac
--- /dev/null
+++ b/extra/foomatic/PKGBUILD
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+ 
+pkgbase="foomatic"
+pkgname=('foomatic-db' 'foomatic-db-engine')
+arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
+_snapdate=20120712
+_filtersver=4.0.17
+_enginever=4.0.8
+pkgver=${_filtersver}_${_snapdate}
+pkgrel=1
+epoch=1
+makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
+_url1=http://www.openprinting.org/download/foomatic/
+_url2=ftp://ftp.archlinux.org/other/foomatic/
+source=(${_url1}/$pkgbase-db-engine-${_enginever}.tar.gz
+        ${_url2}/$pkgbase-db-4.0-${_snapdate}.tar.gz)				# switch after build url1 -> url2
+url="http://www.linuxprinting.org/foomatic.html"
+options=('!emptydirs')
+md5sums=('5283cd5125a96dc0b35d896326512b1a'
+         '7ea8ed6c34495e237d8071ab5821e871')
+
+package_foomatic-db() {
+
+ pkgdesc="Foomatic - The collected knowledge about printers, drivers, and driver options in XML files, used by foomatic-db-engine to generate PPD files."
+# arch=('any')
+ license=('GPL' 'custom')
+ depends=('perl' 'libxml2')
+ replaces=('foomatic-db-ppd' 'foomatic-db-hpijs')
+ conflicts=('foomatic-db-ppd' 'foomatic-db-hpijs')
+ provides=('foomatic-db-hpijs')
+
+   cd ${srcdir}/${pkgname}-${_snapdate}
+   ./configure --prefix=/usr
+   make DESTDIR=${pkgdir} install
+   install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
+
+package_foomatic-db-engine() {
+
+ pkgdesc="Foomatic - Foomatic's database engine generates PPD files from the data in Foomatic's XML database. It also contains scripts to directly generate print queues and handle jobs."
+# arch=(i686 x86_64)
+ license=('GPL')
+ depends=('perl' 'libxml2' 'foomatic-filters' 'bash')
+
+   cd ${srcdir}/foomatic-db-engine-${_enginever}
+    ./configure --prefix=/usr
+   make
+   eval `perl -V:archname`
+   make DESTDIR=${pkgdir} \
+        INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \
+        INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \
+        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install
+   /usr/bin/find ${pkgdir} -name '.packlist' -delete
+   # fix permissions
+   chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
+}
diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD
index 3c9a03e96..691e2544d 100644
--- a/extra/four-in-a-row/PKGBUILD
+++ b/extra/four-in-a-row/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=four-in-a-row
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Make lines of the same color to win"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 8a12a6a28..460a932e3 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fping
 pkgver=3.8
 pkgrel=2
 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/fprintd/PKGBUILD b/extra/fprintd/PKGBUILD
index 7c5ec6d6b..41643bd3d 100644
--- a/extra/fprintd/PKGBUILD
+++ b/extra/fprintd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fprintd
 pkgver=0.5.1
 pkgrel=1
 pkgdesc="D-Bus service to access fingerprint readers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/fprint/fprintd"
 license=(GPL)
 depends=(libfprint dbus-glib polkit)
diff --git a/extra/freealut/PKGBUILD b/extra/freealut/PKGBUILD
index 8b2ee5823..342ce65a7 100644
--- a/extra/freealut/PKGBUILD
+++ b/extra/freealut/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freealut
 pkgver=1.1.0
 pkgrel=5
 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 09850381d..5a4520eaa 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=freeciv
 pkgver=2.4.2
 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' 'lua51' 'sqlite' 'curl' 'libltdl')
diff --git a/extra/freeglut/PKGBUILD b/extra/freeglut/PKGBUILD
index 05e569561..76bba89a5 100644
--- a/extra/freeglut/PKGBUILD
+++ b/extra/freeglut/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=freeglut
 pkgver=2.8.1
 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=('libxi' 'libxrandr' 'libgl')
diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD
index 0fb991713..454f9c584 100644
--- a/extra/freetds/PKGBUILD
+++ b/extra/freetds/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.91
 pkgrel=4
 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=('openssl' 'unixodbc')
 backup=('etc/freetds/freetds.conf'
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index de96c4ac7..f7816eeaa 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=freetype2
 pkgver=2.5.2
 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' 'libpng')
diff --git a/extra/fribidi/PKGBUILD b/extra/fribidi/PKGBUILD
index c44b32106..dab0e5bb6 100644
--- a/extra/fribidi/PKGBUILD
+++ b/extra/fribidi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=fribidi
 pkgver=0.19.6
 pkgrel=1
 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=('glib2')
diff --git a/extra/frozen-bubble/PKGBUILD b/extra/frozen-bubble/PKGBUILD
index b59505dbf..5381824f0 100644
--- a/extra/frozen-bubble/PKGBUILD
+++ b/extra/frozen-bubble/PKGBUILD
@@ -8,7 +8,7 @@ _pkgver=2.2.1-beta1
 pkgver=${_pkgver/-/}
 pkgrel=5
 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 117f5f8c7..e01f2c01b 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fsarchiver
 pkgver=0.6.18
 pkgrel=1
 pkgdesc='Safe and flexible file-system backup and deployment tool'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.fsarchiver.org/'
 license=('GPL2')
 depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt')
diff --git a/extra/ftgl/PKGBUILD b/extra/ftgl/PKGBUILD
index 494b9cd42..7044d5c11 100644
--- a/extra/ftgl/PKGBUILD
+++ b/extra/ftgl/PKGBUILD
@@ -6,9 +6,9 @@
 pkgname=ftgl
 _pkgver=2.1.3-rc5
 pkgver=${_pkgver/-/}
-pkgrel=5
+pkgrel=5.1
 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' 'glu')
diff --git a/extra/ftjam/PKGBUILD b/extra/ftjam/PKGBUILD
index 42726f3cb..f267920a9 100644
--- a/extra/ftjam/PKGBUILD
+++ b/extra/ftjam/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=ftjam
 pkgver=2.5.3rc2
-pkgrel=3
+pkgrel=3.1
 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 fcfb387ea..c7968d633 100644
--- a/extra/fuse/PKGBUILD
+++ b/extra/fuse/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=fuse
 pkgver=2.9.3
 pkgrel=2
 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 37a0291a9..53877eb72 100644
--- a/extra/fvwm/PKGBUILD
+++ b/extra/fvwm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fvwm
 pkgver=2.6.5
 pkgrel=3
 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/fyre/PKGBUILD b/extra/fyre/PKGBUILD
index b0df14cb0..8505ad5c8 100644
--- a/extra/fyre/PKGBUILD
+++ b/extra/fyre/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=fyre
 pkgver=1.0.1
 pkgrel=7
 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 b5d56d70b..d7e4e96a4 100644
--- a/extra/gamin/PKGBUILD
+++ b/extra/gamin/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=8
 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')
 optdepends=('python2: for the python module')
diff --git a/extra/garcon/PKGBUILD b/extra/garcon/PKGBUILD
index ea3de85eb..e241bccf7 100644
--- a/extra/garcon/PKGBUILD
+++ b/extra/garcon/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=garcon
 pkgver=0.2.1
 pkgrel=1
 pkgdesc="Implementation of the freedesktop.org menu specification"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('LGPL')
 groups=('xfce4')
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index a6ff99a15..ff2c9b5c5 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gc
 pkgver=7.4.0
 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")
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 6a827b46e..cce616b56 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=('qt4' 'gtk3' 'anthy' 'libchewing')
 optdepends=('qt4: support for qt4 input method'
diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD
index 69a925079..a40c41f15 100644
--- a/extra/gconf-editor/PKGBUILD
+++ b/extra/gconf-editor/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gconf-editor
 pkgver=3.0.1
 pkgrel=3
 pkgdesc="Graphical gconf registry editor"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('gconf' 'hicolor-icon-theme' 'gtk3')
 makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils')
diff --git a/extra/gconf-perl/PKGBUILD b/extra/gconf-perl/PKGBUILD
index e3adf41a7..8b3ee55a9 100644
--- a/extra/gconf-perl/PKGBUILD
+++ b/extra/gconf-perl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gconf-perl
 pkgver=1.044
 pkgrel=8
 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 d7fc7e68e..6c77fbf2d 100644
--- a/extra/gconf/PKGBUILD
+++ b/extra/gconf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gconf
 pkgver=3.2.6
 pkgrel=3
 pkgdesc="A configuration database system"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libxml2' 'polkit' 'libldap' 'dbus-glib')
 makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
diff --git a/extra/gconfmm/PKGBUILD b/extra/gconfmm/PKGBUILD
index 23ba76100..9b5dd3801 100644
--- a/extra/gconfmm/PKGBUILD
+++ b/extra/gconfmm/PKGBUILD
@@ -5,8 +5,8 @@
 pkgbase=gconfmm
 pkgname=('gconfmm' 'gconfmm-docs')
 pkgver=2.28.3
-pkgrel=1
-arch=('i686' 'x86_64')
+pkgrel=1.1
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkmm.sourceforge.net/"
 license=('LGPL')
 makedepends=('pkgconfig' 'gtkmm' 'glibmm-docs' 'gconf' 'glibmm')
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index cb3989c18..d2b1d3fd3 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gcr
 pkgver=3.10.1
 pkgrel=2
 pkgdesc="A library for bits of crypto UI and parsing"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
 depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
diff --git a/extra/gd/PKGBUILD b/extra/gd/PKGBUILD
index c9ddffff5..31e399f19 100644
--- a/extra/gd/PKGBUILD
+++ b/extra/gd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gd
 pkgver=2.1.0
 pkgrel=2
 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=('libpng' 'fontconfig' 'libjpeg')
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index 0a921518b..1feb93763 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gdb
 pkgver=7.7
 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 df893a4f6..c6baf6ff4 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gdk-pixbuf2
 pkgver=2.30.5
 pkgrel=1
 pkgdesc="An image loading library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gtk.org/"
 license=('LGPL2.1')
 depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper')
diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD
index d20a4afac..4dc6a359e 100644
--- a/extra/gdl/PKGBUILD
+++ b/extra/gdl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gdl
 pkgver=3.10.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 28d2617b3..f9c3e4927 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(gdm libgdm)
 pkgver=3.10.0.1
 pkgrel=2
 pkgdesc="Gnome Display Manager"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 url="http://www.gnome.org"
 depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server xorg-xhost)
diff --git a/extra/gdome2/PKGBUILD b/extra/gdome2/PKGBUILD
index 9522ae97d..d710cfbeb 100644
--- a/extra/gdome2/PKGBUILD
+++ b/extra/gdome2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gdome2
 pkgver=0.8.1
 pkgrel=5
 pkgdesc="Gnome DOM Engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gdome2.cs.unibo.it/"
 license=('LGPL')
 depends=('libxml2' 'glib2')
@@ -22,11 +22,22 @@ prepare() {
 
 
 build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  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 ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index 742ccf644..9c4f332a6 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gedit
 pkgver=3.10.4
 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 python-gobject dconf)
 makedepends=(yelp-tools intltool zeitgeist)
diff --git a/extra/geeqie/PKGBUILD b/extra/geeqie/PKGBUILD
index 8b1d21b94..9d378d4aa 100644
--- a/extra/geeqie/PKGBUILD
+++ b/extra/geeqie/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=geeqie
 pkgver=1.1
 pkgrel=3
 pkgdesc="A lightweight image browser and viewer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://geeqie.sourceforge.net/"
 license=('GPL2')
 depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index fe3133c1d..a970ac006 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gegl
 pkgver=0.2.0
 pkgrel=10
 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' 'libspiro')
diff --git a/extra/genius/PKGBUILD b/extra/genius/PKGBUILD
index 697e124a4..a77810362 100644
--- a/extra/genius/PKGBUILD
+++ b/extra/genius/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=genius
 pkgver=1.0.17
 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' 'gtksourceview2' 'mpfr' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/extra/geoclue/PKGBUILD b/extra/geoclue/PKGBUILD
index 8fc6a8386..d5af8518d 100644
--- a/extra/geoclue/PKGBUILD
+++ b/extra/geoclue/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=geoclue
 pkgver=0.12.99
 pkgrel=1
 pkgdesc="Modular geoinformation service built on the D-Bus messaging system."
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://geoclue.freedesktop.org/"
 license=(LGPL)
 depends=(dbus-glib libxml2 dconf)
diff --git a/extra/geoip/PKGBUILD b/extra/geoip/PKGBUILD
index c100284f9..6e2f7d317 100644
--- a/extra/geoip/PKGBUILD
+++ b/extra/geoip/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=geoip
 pkgver=1.5.1
 pkgrel=2
 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' 'geoip-database')
diff --git a/extra/ghc/PKGBUILD b/extra/ghc/PKGBUILD
index b36efb967..20a0bca01 100644
--- a/extra/ghc/PKGBUILD
+++ b/extra/ghc/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=ghc
 pkgver=7.6.3
 pkgrel=1
 pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.haskell.org/ghc/'
 license=('custom')
 # libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496
diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD
index facec4fce..ade65980e 100644
--- a/extra/ghex/PKGBUILD
+++ b/extra/ghex/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ghex
 pkgver=3.10.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 4facbf71e..36d8da2a6 100644
--- a/extra/giblib/PKGBUILD
+++ b/extra/giblib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=giblib
 pkgver=1.2.4
 pkgrel=6
 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/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index f87ef97e6..939a5939d 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=5.0.5
 pkgrel=1
 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=('glibc')
 makedepends=('xmlto' 'docbook-xml' 'docbook-xsl')
diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD
index a5a981764..1585b695e 100644
--- a/extra/gifsicle/PKGBUILD
+++ b/extra/gifsicle/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gifsicle
 pkgver=1.78
 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/PKGBUILD b/extra/gimp/PKGBUILD
index eee078622..dd3f32de4 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gimp
 pkgver=2.8.10
 pkgrel=1
 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 6a59d1425..935849041 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=git
 pkgver=1.9.0
 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')
@@ -44,10 +44,14 @@ build() {
 check() {
   export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
-  local jobs
-  jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*')
-  # build failures with multiple jobs in check, not ideal...
-  jobs='-j1'
+
+  # fails on mips
+  if [ "$CARCH" != "mips64el" ]; then
+    local jobs
+    jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*')
+    # build failures with multiple jobs in check, not ideal...
+    jobs='-j1'
+  fi
   mkdir -p /dev/shm/git-test
   # We used to use this, but silly git regressions:
   #GIT_TEST_OPTS="--root=/dev/shm/" \
diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD
index e9f93624e..5243a8144 100644
--- a/extra/gjs/PKGBUILD
+++ b/extra/gjs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gjs
 pkgver=1.38.1
 pkgrel=1
 pkgdesc="Javascript Bindings for GNOME"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://live.gnome.org/Gjs"
 license=(GPL)
 depends=(cairo gobject-introspection 'js>=17.0.0')
diff --git a/extra/gksu/PKGBUILD b/extra/gksu/PKGBUILD
index ac1953ef1..e0d7b16ea 100644
--- a/extra/gksu/PKGBUILD
+++ b/extra/gksu/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gksu
 pkgver=2.0.2
-pkgrel=4
+pkgrel=4.1
 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 a69c7589d..f1047ceea 100644
--- a/extra/glade-perl/PKGBUILD
+++ b/extra/glade-perl/PKGBUILD
@@ -6,7 +6,7 @@ _realname=Gtk2-GladeXML
 pkgver=1.007
 pkgrel=7
 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 1d2d1d1d4..773707294 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glade
 pkgver=3.16.1
 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' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD
index c89e98710..a46ee9b84 100644
--- a/extra/glew/PKGBUILD
+++ b/extra/glew/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=glew
 pkgver=1.10.0
 pkgrel=2
 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' 'glu')
diff --git a/extra/glhack/PKGBUILD b/extra/glhack/PKGBUILD
index d1242f2c6..3e6d2a5c6 100644
--- a/extra/glhack/PKGBUILD
+++ b/extra/glhack/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glhack
 pkgver=1.2
 pkgrel=7
 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 4879028a5..2fe6c5725 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glib-networking
 pkgver=2.38.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 ca-certificates gsettings-desktop-schemas)
diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD
index f2fd3d328..9d79c14e2 100644
--- a/extra/glib-perl/PKGBUILD
+++ b/extra/glib-perl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=glib-perl
 pkgver=1.304
 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 d4f9b62fb..a364a8c81 100644
--- a/extra/glib/PKGBUILD
+++ b/extra/glib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=glib
 pkgver=1.2.10
 pkgrel=11
 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' 'sh')
@@ -31,6 +31,8 @@ build() {
     CONFIGFLAG='--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu'
   elif [[ $CARCH = "x86_64" ]]; then
     CONFIGFLAG='--host=x86_64-unknown-linux-gnu --target=x86_64-unknown-linux-gnu'
+  else
+    CONFIGFLAG="--host=$CHOST --target=$CHOST"
   fi
 
   autoreconf --force --install
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index 04346298d..a7668223b 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=glibmm
 pkgname=('glibmm' 'glibmm-docs')
 pkgver=2.38.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 730111e79..b050d41b0 100644
--- a/extra/glpk/PKGBUILD
+++ b/extra/glpk/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=glpk
 pkgver=4.52
 pkgrel=2
 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')
@@ -19,7 +19,7 @@ build() {
 
   ./configure --prefix=/usr
 
-  if [ "$CARCH" == "x86_64" ]; then
+  if [ "$CARCH" != "i686" ]; then
     make CFLAGS="$CFLAGS -fPIC"  
   else
     make
diff --git a/extra/glu/PKGBUILD b/extra/glu/PKGBUILD
index 1e0702bea..1ccfe9b74 100644
--- a/extra/glu/PKGBUILD
+++ b/extra/glu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=glu
 pkgver=9.0.0
 pkgrel=2
 pkgdesc="Mesa OpenGL Utility library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cgit.freedesktop.org/mesa/glu/"
 license=('LGPL')
 depends=('libgl')
diff --git a/extra/gmetadom/PKGBUILD b/extra/gmetadom/PKGBUILD
index f8185e918..0d0da48a2 100644
--- a/extra/gmetadom/PKGBUILD
+++ b/extra/gmetadom/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gmetadom
 pkgver=0.2.6
 pkgrel=4
 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 06832b61b..5a53f6556 100644
--- a/extra/gmime/PKGBUILD
+++ b/extra/gmime/PKGBUILD
@@ -6,11 +6,11 @@ pkgname=gmime
 pkgver=2.6.18
 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')
+[ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
 sha256sums=('783fc14190459c568a31c2fd6dba1e8afa0431e2931aa46f652aa486ad881ae6')
 
diff --git a/extra/gnet/PKGBUILD b/extra/gnet/PKGBUILD
index 1310530e8..8fce6824d 100644
--- a/extra/gnet/PKGBUILD
+++ b/extra/gnet/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnet
 pkgver=2.0.8
 pkgrel=4
 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/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD
index 677260758..5afe3f74b 100644
--- a/extra/gnome-alsamixer/PKGBUILD
+++ b/extra/gnome-alsamixer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-alsamixer
 pkgver=0.9.7
 pkgrel=1
 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-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 511b0a176..158fde19f 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-bluetooth
 pkgver=3.10.0
 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 libnotify bluez)
diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index 404b1c5ed..5761e86b0 100644
--- a/extra/gnome-calculator/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-calculator
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="GNOME Scientific calculator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gtk3' 'dconf')
 makedepends=('intltool' 'yelp-tools' 'vala')
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
index fd6be0868..4cc8ade12 100644
--- a/extra/gnome-chess/PKGBUILD
+++ b/extra/gnome-chess/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-chess
 pkgver=3.10.3
 pkgrel=1
 pkgdesc="Play the classic two-player boardgame of chess"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'glu')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD
index 20792a355..bc1762c43 100644
--- a/extra/gnome-clocks/PKGBUILD
+++ b/extra/gnome-clocks/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-clocks
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Clocks applications for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="https://www.gnome.org/"
 license=(GPL)
 depends=(gtk3 libcanberra libgweather gnome-desktop libnotify
diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD
index eed428b6d..9c69f4129 100644
--- a/extra/gnome-color-manager/PKGBUILD
+++ b/extra/gnome-color-manager/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-color-manager
 pkgver=3.10.1
 pkgrel=2
 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
diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD
index 1ded72823..ede10f321 100644
--- a/extra/gnome-contacts/PKGBUILD
+++ b/extra/gnome-contacts/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-contacts
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Contacts Manager for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
 groups=(gnome)
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index d034ed17c..46becefb4 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.10.2
 pkgrel=2
 pkgdesc="The Control Center for GNOME"
 license=(GPL)
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus
          gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3
          libgtop network-manager-applet sound-theme-freedesktop upower libpwquality
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index 5ddd9cdb5..42d12f436 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.10.2
 pkgrel=1
 epoch=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 gtk3 libxkbfile xkeyboard-config iso-codes)
 makedepends=(intltool gobject-introspection itstool)
@@ -28,7 +28,7 @@ build() {
   cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --libexecdir=/usr/lib/$pkgname --disable-static \
-    --with-gnome-distributor="Arch Linux"
+    --with-gnome-distributor="Parabola GNU/Linux-libre"
   make
 }
 
diff --git a/extra/gnome-desktop2/PKGBUILD b/extra/gnome-desktop2/PKGBUILD
index dcf69381f..39f3f4fff 100644
--- a/extra/gnome-desktop2/PKGBUILD
+++ b/extra/gnome-desktop2/PKGBUILD
@@ -5,9 +5,9 @@
 _pkgname=gnome-desktop
 pkgname=${_pkgname}2
 pkgver=2.32.1
-pkgrel=2
+pkgrel=2.2
 pkgdesc="Library with common API for various GNOME modules (legacy version)"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL LGPL)
 depends=(gconf gtk2 startup-notification)
 makedepends=(gnome-doc-utils intltool)
@@ -20,7 +20,7 @@ build() {
   cd "$srcdir/$_pkgname-$pkgver"
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
-      --with-gnome-distributor="Archlinux" \
+      --with-gnome-distributor="Parabola GNU/Linux-libre" \
       --disable-scrollkeeper \
       --disable-gnome-about --disable-desktop-docs
 
diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD
index a6f46538b..653509952 100644
--- a/extra/gnome-dictionary/PKGBUILD
+++ b/extra/gnome-dictionary/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-dictionary
 pkgver=3.10.0
 pkgrel=1
 pkgdesc="Look up words in dictionary sources"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3')
diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD
index 19d8ab4f8..c4d622438 100644
--- a/extra/gnome-disk-utility/PKGBUILD
+++ b/extra/gnome-disk-utility/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-disk-utility
 pkgver=3.10.0
 pkgrel=1
 pkgdesc="Disk Management Utility for GNOME"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 url="http://www.gnome.org"
 groups=(gnome)
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index a89aff401..78ee858fc 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-documents
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Documents Manager for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=(GPL)
 groups=(gnome-extra)
diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD
index 6346b27c5..85d27ff84 100644
--- a/extra/gnome-font-viewer/PKGBUILD
+++ b/extra/gnome-font-viewer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-font-viewer
 pkgver=3.10.0
 pkgrel=1
 pkgdesc="GNOME font viewer and thumbnailer"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 depends=('gtk3' 'desktop-file-utils' 'gnome-desktop')
 makedepends=('intltool')
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index b9794a8e4..ec5a18dd6 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-keyring
 pkgver=3.10.1
 pkgrel=2
 pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('gtk3' 'gcr' 'libcap-ng')
 makedepends=('intltool' 'gtk-doc')
diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD
index 819eabe3e..3cdef0384 100644
--- a/extra/gnome-klotski/PKGBUILD
+++ b/extra/gnome-klotski/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-klotski
 pkgver=3.10.0
 pkgrel=1
 pkgdesc="Slide blocks to solve the puzzle"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD
index e86dd3676..a1f8ab086 100644
--- a/extra/gnome-mahjongg/PKGBUILD
+++ b/extra/gnome-mahjongg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-mahjongg
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Disassemble a pile of tiles by removing matching pairs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD
index 0e85b69e6..e940e78a3 100644
--- a/extra/gnome-menus/PKGBUILD
+++ b/extra/gnome-menus/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-menus
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2')
 makedepends=('intltool' 'gobject-introspection')
 license=('GPL' 'LGPL')
diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD
index de78fbf93..cdc9cb1fe 100644
--- a/extra/gnome-mines/PKGBUILD
+++ b/extra/gnome-mines/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-mines
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Clear hidden mines from a minefield"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD
index 447ee5733..e57680e55 100644
--- a/extra/gnome-nettool/PKGBUILD
+++ b/extra/gnome-nettool/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnome-nettool
 pkgver=3.8.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 iputils dconf whois hicolor-icon-theme)
 makedepends=(yelp-tools intltool nmap net-tools)
diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD
index fb7de09bf..69b9e5af9 100644
--- a/extra/gnome-nibbles/PKGBUILD
+++ b/extra/gnome-nibbles/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-nibbles
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Guide a worm around a maze"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index b32419469..7f8017ced 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-online-accounts
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="GNOME service to access online accounts"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL')
 depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret'
diff --git a/extra/gnome-perl/PKGBUILD b/extra/gnome-perl/PKGBUILD
index a1a8de1c0..567bf9003 100644
--- a/extra/gnome-perl/PKGBUILD
+++ b/extra/gnome-perl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-perl
 pkgver=1.045
 pkgrel=1
 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-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD
index ca1ce7474..bdcb67ba1 100644
--- a/extra/gnome-photos/PKGBUILD
+++ b/extra/gnome-photos/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-photos
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Access, organize, and share your photos on GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="https://www.gnome.org/"
 license=(GPL)
 depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme grilo)
diff --git a/extra/gnome-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD
index 9e272cde5..5ae3c6c03 100644
--- a/extra/gnome-power-manager/PKGBUILD
+++ b/extra/gnome-power-manager/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-power-manager
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="System power information and statistics"
-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 67109ebef..137090b63 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' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
 pkgver=2.32.0
 pkgrel=14
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'librsvg' 'libwnck')
 url="http://www.gnome.org"
diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD
index 209d2779e..d7dcdb311 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-gtkspell')
 pkgver=2.25.3
 pkgrel=13
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.daa.com.au/~james/pygtk/"
 license=('GPL' 'LGPL')
 makedepends=('gtkspell' 'libgnomeui' 'python2' 'pygtk' 'gnome-python')
diff --git a/extra/gnome-python/PKGBUILD b/extra/gnome-python/PKGBUILD
index 6c5e587b2..351cff327 100644
--- a/extra/gnome-python/PKGBUILD
+++ b/extra/gnome-python/PKGBUILD
@@ -5,8 +5,8 @@
 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)
+pkgrel=8.1
+arch=(i686 x86_64 mips64el)
 license=('LGPL')
 makedepends=('pygtk' 'pyorbit' 'libgnomeui')
 url="http://www.pygtk.org/"
diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD
index ff69e7b70..cc704006e 100644
--- a/extra/gnome-robots/PKGBUILD
+++ b/extra/gnome-robots/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-robots
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Avoid the robots and make them crash into each other"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD
index efb222af7..99411f621 100644
--- a/extra/gnome-screenshot/PKGBUILD
+++ b/extra/gnome-screenshot/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-screenshot
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Take pictures of your screen"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3' 'libcanberra')
diff --git a/extra/gnome-search-tool/PKGBUILD b/extra/gnome-search-tool/PKGBUILD
index d8278d917..30f780663 100644
--- a/extra/gnome-search-tool/PKGBUILD
+++ b/extra/gnome-search-tool/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-search-tool
 pkgver=3.6.0
 pkgrel=2
 pkgdesc="Utility to search for files"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
 depends=('nautilus' 'libsm')
diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD
index 7b4748870..1507a5a05 100644
--- a/extra/gnome-session/PKGBUILD
+++ b/extra/gnome-session/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-session
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(GPL LGPL)
 depends=(systemd dconf gsettings-desktop-schemas gtk3 gnome-desktop
          hicolor-icon-theme json-glib libgl libsm libxtst upower)
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index bbf3eabbb..17918d2fe 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-settings-daemon
 pkgver=3.10.2
 pkgrel=3
 pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
          'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'libibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2'
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 02af2218e..a646a2847 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-shell
 pkgver=3.10.4
 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=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus
diff --git a/extra/gnome-speech/PKGBUILD b/extra/gnome-speech/PKGBUILD
index 587ea9c6f..a7cdc3102 100644
--- a/extra/gnome-speech/PKGBUILD
+++ b/extra/gnome-speech/PKGBUILD
@@ -5,14 +5,15 @@ 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')
-makedepends=('intltool' 'pkgconfig' 'espeak' 'java-access-bridge' 'openjdk6')
+makedepends=('intltool' 'pkgconfig' 'espeak')
+[ "$CARCH" != "mips64el" ] && makedepends+=('java-access-bridge' 'openjdk6')
 optdepends=('espeak: Text to speech engine'
-            'festival: Text to speech engine'
-            'java-access-bridge: Speech support for java')
+            'festival: Text to speech engine')
+[ "$CARCH" != "mips64el" ] && optdepends+=('java-access-bridge: Speech support for java')
 source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('89cbc23fc131c33396c0346085759f63')
 
diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD
index 4ee48eff7..ef076f48f 100644
--- a/extra/gnome-system-log/PKGBUILD
+++ b/extra/gnome-system-log/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-system-log
 pkgver=3.9.90
 pkgrel=1
 pkgdesc="View your system logs"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://gnome.org"
 license=('GPL2')
 depends=('dconf' 'gtk3')
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index 24328c63f..e43b613e8 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-system-monitor
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL')
 depends=('libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'systemd')
 makedepends=('itstool' 'docbook-xsl' 'intltool')
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index f6ab8b220..3e6b4978f 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-terminal
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="The GNOME Terminal Emulator"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 depends=(vte3 gsettings-desktop-schemas dconf)
 makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils gconf libnautilus-extension)
diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD
index 801b62419..7ec148214 100644
--- a/extra/gnome-tetravex/PKGBUILD
+++ b/extra/gnome-tetravex/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnome-tetravex
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Complete the puzzle by matching numbered tiles"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD
index 65b3b5855..4f8496a58 100644
--- a/extra/gnome-themes-standard/PKGBUILD
+++ b/extra/gnome-themes-standard/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-themes-standard
 pkgver=3.10.0
 pkgrel=1
 pkgdesc="Default themes for the GNOME desktop"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=(GPL2)
 depends=(cantarell-fonts ttf-dejavu librsvg)
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index bac83b9b4..b43659c1b 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-user-share
 pkgver=3.10.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' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
diff --git a/extra/gnome-vfs-perl/PKGBUILD b/extra/gnome-vfs-perl/PKGBUILD
index c58991ab6..24a848e8b 100644
--- a/extra/gnome-vfs-perl/PKGBUILD
+++ b/extra/gnome-vfs-perl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-vfs-perl
 pkgver=1.082
 pkgrel=1
 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 f125c7ba1..ffe729e10 100644
--- a/extra/gnome-vfs/PKGBUILD
+++ b/extra/gnome-vfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-vfs
 pkgver=2.24.4
 pkgrel=8
 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 94c08f4e1..8fabcea98 100644
--- a/extra/gnome-vfsmm/PKGBUILD
+++ b/extra/gnome-vfsmm/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gnome-vfsmm
 pkgver=2.26.0
-pkgrel=2
+pkgrel=2.1
 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/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD
index b18f8682c..8da9ebd56 100644
--- a/extra/gnome-weather/PKGBUILD
+++ b/extra/gnome-weather/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gnome-weather
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Access current weather conditions and forecasts"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="https://www.gnome.org/"
 license=(GPL)
 depends=(gtk3 gjs libgweather)
diff --git a/extra/gnomecanvas-perl/PKGBUILD b/extra/gnomecanvas-perl/PKGBUILD
index 677e38726..5a6cd5a5d 100644
--- a/extra/gnomecanvas-perl/PKGBUILD
+++ b/extra/gnomecanvas-perl/PKGBUILD
@@ -6,7 +6,7 @@ _realname=Gnome2-Canvas
 pkgver=1.002
 pkgrel=11
 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..7c610c9ca 100644
--- a/extra/gnu-netcat/PKGBUILD
+++ b/extra/gnu-netcat/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=gnu-netcat
 pkgver=0.7.1
-pkgrel=4
+pkgrel=4.1
 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 360db097e..1ccc59f03 100644
--- a/extra/gnucash/PKGBUILD
+++ b/extra/gnucash/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnucash
 pkgver=2.6.0
 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=('slib' 'goffice0.8' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils' 'webkitgtk2')
diff --git a/extra/gnugo/PKGBUILD b/extra/gnugo/PKGBUILD
index db803a1b9..93053049c 100644
--- a/extra/gnugo/PKGBUILD
+++ b/extra/gnugo/PKGBUILD
@@ -6,11 +6,11 @@
 
 pkgname=gnugo
 pkgver=3.8
-pkgrel=3
+pkgrel=3.2
 pkgdesc='Program that plays the game of Go'
 url='http://www.gnu.org/software/gnugo/'
 license=('GPL3' 'custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('ncurses')
 source=("http://ftp.gnu.org/gnu/gnugo/${pkgname}-${pkgver}.tar.gz"
         'LICENSE')
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index c4257fe7d..9c6661bbf 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnumeric
 pkgver=1.12.11
 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' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 0d93f34ad..eadbc5287 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gnuplot
 pkgver=4.6.4
 pkgrel=5
 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' 'wxgtk2.8' 'cairo' 'libjpeg' 'lua' 'qt4' 'gnutls') 
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index d37832b99..0ad273581 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gnutls
 pkgver=3.2.11
 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' 'LGPL2.1')
 url="http://www.gnutls.org/"
 install=gnutls.install
diff --git a/extra/gob2/PKGBUILD b/extra/gob2/PKGBUILD
index 6a33f8036..498653f9d 100644
--- a/extra/gob2/PKGBUILD
+++ b/extra/gob2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gob2
 pkgver=2.0.20
 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 42848832a..4795673fe 100644
--- a/extra/gobject-introspection/PKGBUILD
+++ b/extra/gobject-introspection/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.38.0
 pkgrel=1
 pkgdesc="Introspection system for GObject-based libraries"
 url="https://live.gnome.org/GObjectIntrospection"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 license=('LGPL' 'GPL')
 depends=('glib2' 'python2' 'python2-mako')
 makedepends=('cairo')
diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD
index 834726b65..4da3eede8 100644
--- a/extra/goffice/PKGBUILD
+++ b/extra/goffice/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=goffice
 pkgver=0.10.11
 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')
 makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection')
diff --git a/extra/goffice0.8/PKGBUILD b/extra/goffice0.8/PKGBUILD
index 6565fd44f..966fd20ed 100644
--- a/extra/goffice0.8/PKGBUILD
+++ b/extra/goffice0.8/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=goffice0.8
 pkgver=0.8.17
 pkgrel=2
 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')
 depends=('gtk2' 'gconf' 'libgsf')
diff --git a/extra/gpart/PKGBUILD b/extra/gpart/PKGBUILD
index 26c81ea6d..76ee92b5f 100644
--- a/extra/gpart/PKGBUILD
+++ b/extra/gpart/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gpart
 pkgver=0.2.1
 pkgrel=1
 pkgdesc="Partition table rescue/guessing tool"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/baruch/gpart"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index ad95742d3..080ae424b 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gparted
 pkgver=0.18.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')
diff --git a/extra/gperf/PKGBUILD b/extra/gperf/PKGBUILD
index 7c3ec52bc..5e8c02319 100644
--- a/extra/gperf/PKGBUILD
+++ b/extra/gperf/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gperf
 pkgver=3.0.4
-pkgrel=4
+pkgrel=4.3
 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/gphoto2/PKGBUILD b/extra/gphoto2/PKGBUILD
index b326354fc..16e4acae6 100644
--- a/extra/gphoto2/PKGBUILD
+++ b/extra/gphoto2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gphoto2
 pkgver=2.5.3
 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' 'popt' 'readline')
diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD
index 662c7e0bb..f0f11325c 100644
--- a/extra/gpsd/PKGBUILD
+++ b/extra/gpsd/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gpsd
 pkgver=3.9
 pkgrel=4
 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-libs' 'desktop-file-utils')
diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD
index 9db6b6dcf..6e10796dc 100644
--- a/extra/gptfdisk/PKGBUILD
+++ b/extra/gptfdisk/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gptfdisk
 pkgver=0.8.9
 pkgrel=1
 pkgdesc="A text-mode partitioning tool that works on 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')
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index d320cba83..451ea8d21 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=grantlee
 pkgver=0.4.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=('qt4')
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index ab01cf9e2..079db6eb1 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.3.19
 pkgrel=2
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('MIT')
 optdepends=('jasper: jp2 module'
             'libpng: png module'
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index 89aceacfa..92ec2f872 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=graphite
 pkgver=1.2.4
 pkgrel=1
 epoch=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://projects.palaso.org/projects/graphitedev"
 pkgdesc='reimplementation of the SIL Graphite text processing engine'
 license=('LGPL' 'GPL' 'custom')
diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD
index a2e97e5cf..89e42554d 100644
--- a/extra/graphviz/PKGBUILD
+++ b/extra/graphviz/PKGBUILD
@@ -9,20 +9,24 @@ pkgrel=2
 pkgdesc='Graph visualization software'
 url='http://www.graphviz.org/'
 license=('CPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts')
-makedepends=('swig' 'mono' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'r' 'tk' 'qt4' 'gtk2')
-optdepends=('mono: sharp bindings'
-            'guile: guile bindings'
+makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'tk' 'qt4' 'gtk2')
+optdepends=('guile: guile bindings'
             'lua51: lua bindings'
             'ocaml: ocaml bindings'
             'perl: perl bindings'
             'php: php bindings'
             'python2: python bindings'
-            'r: r bindings'
+            'ruby: ruby bindings'
             'tcl: tcl bindings'
             'qt4: gvedit'
             'gtk2: gtk output plugin')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=('mono' 'r')
+  optdepends+=('mono: sharp bindings'
+               'r: r bindings')
+fi
 source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('a41e9f1cbcc9a24651e14dd15a4cda3d912d7d19')
 
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index 68848e89d..c7ccc8d50 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.2.11
 pkgrel=1
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(LGPL)
 depends=(grilo sqlite libgcrypt)
 makedepends=(gupnp-av libgdata gmime libtracker-sparql libdmapsharing
diff --git a/extra/grilo/PKGBUILD b/extra/grilo/PKGBUILD
index 616141c8d..d09472df5 100644
--- a/extra/grilo/PKGBUILD
+++ b/extra/grilo/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.2.9
 pkgrel=1
 pkgdesc="Framework that provides access to various sources of multimedia content"
 url="http://www.gnome.org"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('gtk3' 'libxml2' 'libsoup' 'liboauth' 'totem-plparser')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala' 'intltool')
diff --git a/extra/grip/PKGBUILD b/extra/grip/PKGBUILD
index b4eab62a0..22a145221 100644
--- a/extra/grip/PKGBUILD
+++ b/extra/grip/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=grip
 pkgver=3.3.1
 pkgrel=10
 pkgdesc="A cd-player and ripper for the Gnome desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://sourceforge.net/projects/grip/"
 depends=('vte' 'curl' 'libgnomeui' 'id3lib' 'cdparanoia')
@@ -23,7 +23,7 @@ prepare() {
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var  --build=$CHOST --host=$CHOST
   make
 }
 
diff --git a/extra/gsasl/PKGBUILD b/extra/gsasl/PKGBUILD
index e1d499276..9aff2bee3 100644
--- a/extra/gsasl/PKGBUILD
+++ b/extra/gsasl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gsasl
 pkgver=1.8.0
 pkgrel=4
 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/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD
index 9a8b623fa..edb884817 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.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')
 sha1sums=('210af9366485f149140973700d90dc93a4b6213e')
 
diff --git a/extra/gsm/PKGBUILD b/extra/gsm/PKGBUILD
index b31a794ac..0f12c47a2 100644
--- a/extra/gsm/PKGBUILD
+++ b/extra/gsm/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=gsm
 pkgver=1.0.13
-pkgrel=7
+pkgrel=7.1
 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 8d07f616b..da11e96f9 100644
--- a/extra/gssdp/PKGBUILD
+++ b/extra/gssdp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gssdp
 pkgver=0.14.7
 pkgrel=1
 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
 license=(LGPL)
 depends=(libsoup)
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index 37d258c15..8ffeed5ec 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gst-libav
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="Gstreamer libav Plugin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'bzip2')
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index 385d34e5a..daa2f7d6f 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Base Plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
 options=(!emptydirs)
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index 494ea252b..d6aa7c7f5 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gst-plugins-good
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Good Plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo')
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index 976397684..4378fdf54 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gst-plugins-ugly
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
 depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index 1ba7096a5..6cc0088da 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gstreamer
 pkgver=1.2.3
 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')
@@ -17,8 +17,8 @@ sha256sums=('0f9a9817a384b3448c368c23345e5122435caef9c00f1c40d7b1953827b0d8eb')
 build() {
   cd "${srcdir}/gstreamer-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-    --with-package-name="GStreamer (Arch Linux)" \
-    --with-package-origin="http://www.archlinux.org/" \
+    --with-package-name="GStreamer (Parabola)" \
+    --with-package-origin="https://parabolagnulinux.org/" \
     --enable-gtk-doc --disable-static
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD
index 0dd6ed919..d61da1d98 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.36
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10>=0.10.36' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection' 'git' 'gtk-doc')
 options=(!emptydirs)
@@ -41,8 +41,8 @@ build() {
   NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --disable-gnome_vfs --enable-gtk-doc \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
+    --with-package-name="GStreamer Base Plugins (Parabola)" \
+    --with-package-origin="https://parabolagnulinux.org/"
   make
   sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
 }
diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD
index c65a46aa8..0f3da5702 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=2
 pkgdesc="Gstreamer FFMpeg Plugin"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gstreamer0.10-base' 'bzip2')
 makedepends=('pkgconfig' 'yasm' 'sdl' 'git' 'gtk-doc')
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index d016c212e..4721a06b2 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.31
 pkgrel=4
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'gtk-doc' 'git' 'cairo')
 url="http://gstreamer.freedesktop.org/"
@@ -31,8 +31,8 @@ build() {
     --disable-hal \
     --disable-esd \
     --enable-gtk-doc \
-    --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 eca0f53e3..d1f5d324e 100644
--- a/extra/gstreamer0.10-python/PKGBUILD
+++ b/extra/gstreamer0.10-python/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=gstreamer0.10-python
 pkgver=0.10.22
-pkgrel=1
+pkgrel=1.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 c471673b9..914e62cca 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.19
 pkgrel=9
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr' 'gtk-doc' 'git')
 url="http://gstreamer.freedesktop.org/"
@@ -28,8 +28,8 @@ build() {
   NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental --enable-gtk-doc \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
+    --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \
+    --with-package-origin="https://parabolagnulinux.org/"
   make
   sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
 }
diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD
index 0c1223bf5..acaebc2fa 100644
--- a/extra/gstreamer0.10/PKGBUILD
+++ b/extra/gstreamer0.10/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gstreamer0.10
 pkgver=0.10.36
 pkgrel=3
 pkgdesc="GStreamer Multimedia Framework"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://gstreamer.com"
 depends=('libxml2' 'glib2')
@@ -28,8 +28,8 @@ build() {
   cd gstreamer
   NOCONFIGURE=1 ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-    --with-package-name="GStreamer (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
+    --with-package-name="GStreamer (Parabola)" \
+    --with-package-origin="https://parabolagnulinux.org/" \
     --enable-gtk-doc --disable-static
   make
 }
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index 8e287bede..129e725c5 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gthumb
 pkgver=3.2.6
 pkgrel=3
 pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL)
 url="http://live.gnome.org/gthumb"
 depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
diff --git a/extra/gtk-engines/PKGBUILD b/extra/gtk-engines/PKGBUILD
index 45667d758..a1b834520 100644
--- a/extra/gtk-engines/PKGBUILD
+++ b/extra/gtk-engines/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=gtk-engines
 pkgver=2.21.0
-pkgrel=1
+pkgrel=1.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=('pkg-config' 'intltool')
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index 479693369..46cc3b3b7 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=gtk-vnc
 pkgver=0.5.3
 pkgrel=3
 pkgdesc="A VNC viewer widget for GTK"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://wiki.gnome.org/Projects/gtk-vnc"
 license=('LGPL')
 depends=('libgcrypt' 'gtk3' 'gnutls')
@@ -34,6 +34,6 @@ build() {
 }
 
 package() {
-  make -C gtk2-build DESTDIR="${pkgdir}" install
-  make -C gtk3-build DESTDIR="${pkgdir}" install
+  make -j1 -C gtk2-build DESTDIR="${pkgdir}" install
+  make -j1 -C gtk3-build DESTDIR="${pkgdir}" install
 }
diff --git a/extra/gtk-xfce-engine/PKGBUILD b/extra/gtk-xfce-engine/PKGBUILD
index 346b15ba1..33e970617 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=3.0.1
 pkgrel=1
-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 24b355d64..b38894662 100644
--- a/extra/gtk/PKGBUILD
+++ b/extra/gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gtk
 pkgver=1.2.10
 pkgrel=13
 pkgdesc="GTK+ is a multi-platform toolkit (v1)"
-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 27cf9837b..2496586f0 100644
--- a/extra/gtk2-perl/PKGBUILD
+++ b/extra/gtk2-perl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk2-perl
 pkgver=1.249
 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 7beeb22ae..2ae904e9e 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
 pkgver=2.24.22
 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 9bfe06764..e120f1607 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtk3
 pkgver=3.10.7
 pkgrel=1
 pkgdesc="GObject-based multi-platform GUI 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
diff --git a/extra/gtkglext/PKGBUILD b/extra/gtkglext/PKGBUILD
index 500e2bdf5..7b6448c5f 100644
--- a/extra/gtkglext/PKGBUILD
+++ b/extra/gtkglext/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=gtkglext
 pkgver=1.2.0
-pkgrel=9
+pkgrel=9.1
 pkgdesc="opengl extensions for gtk2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gtkglext.sourceforge.net/"
 license=('LGPL')
 depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
@@ -20,9 +20,7 @@ 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
diff --git a/extra/gtkhtml/PKGBUILD b/extra/gtkhtml/PKGBUILD
index bde1e60ef..fb04f4c46 100644
--- a/extra/gtkhtml/PKGBUILD
+++ b/extra/gtkhtml/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=gtkhtml
 pkgver=3.32.2
-pkgrel=3
+pkgrel=3.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')
@@ -18,7 +18,7 @@ build() {
   ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/gtkhtml \
       --localstatedir=/var --disable-static \
-      --disable-deprecated-warning-flags
+      --disable-deprecated-warning-flags LDFLAGS="$LDFLAGS -lgthread-2.0"
   make
 }
 
diff --git a/extra/gtkhtml4/PKGBUILD b/extra/gtkhtml4/PKGBUILD
index 03c02e7d7..1666f222d 100644
--- a/extra/gtkhtml4/PKGBUILD
+++ b/extra/gtkhtml4/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=gtkhtml
 pkgver=4.6.6
 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/gtkmathview/0005-gcc-4.7-build-fixes.patch b/extra/gtkmathview/0005-gcc-4.7-build-fixes.patch
new file mode 100644
index 000000000..bae680af3
--- /dev/null
+++ b/extra/gtkmathview/0005-gcc-4.7-build-fixes.patch
@@ -0,0 +1,57 @@
+Index: b/src/frontend/common/TemplateBuilder.hh
+===================================================================
+--- a/src/frontend/common/TemplateBuilder.hh
++++ b/src/frontend/common/TemplateBuilder.hh
+@@ -47,12 +47,12 @@
+   SmartPtr<typename ElementBuilder::type>
+   getElement(const typename Model::Element& el) const
+   {
+-    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++    if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+       return elem;
+     else
+       {
+-	SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+-	linkerAdd(el, elem);
++	elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++	this->linkerAdd(el, elem);
+ 	return elem;
+       }
+   }
+Index: b/src/frontend/common/TemplateElementIterator.hh
+===================================================================
+--- a/src/frontend/common/TemplateElementIterator.hh
++++ b/src/frontend/common/TemplateElementIterator.hh
+@@ -43,7 +43,7 @@
+   findValidNodeForward(const typename Model::Node& p0) const
+   {
+     for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+-      if (valid(p)) return Model::asElement(p);
++      if (this->valid(p)) return Model::asElement(p);
+     return typename Model::Element();
+   }
+     
+Index: b/mathmlsvg/main.cc
+===================================================================
+--- a/mathmlsvg/main.cc
++++ b/mathmlsvg/main.cc
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <unistd.h>
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
+Index: b/mathmlps/main.cc
+===================================================================
+--- a/mathmlps/main.cc
++++ b/mathmlps/main.cc
+@@ -18,6 +18,7 @@
+ 
+ #include <config.h>
+ 
++#include <unistd.h>
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD
index d5e123ef6..420b1c92c 100644
--- a/extra/gtkmathview/PKGBUILD
+++ b/extra/gtkmathview/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gtkmathview
 pkgver=0.8.0
 pkgrel=4
 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=('LGPL3')
 depends=('popt' 'gtk2' 't1lib' 'gmetadom' 'pangox-compat')
diff --git a/extra/gtkmathview/missingLib.diff b/extra/gtkmathview/missingLib.diff
new file mode 100644
index 000000000..4423ef6f7
--- /dev/null
+++ b/extra/gtkmathview/missingLib.diff
@@ -0,0 +1,925 @@
+Index: gtkmathview-0.8.0/mathmlps/Makefile.am
+===================================================================
+--- gtkmathview-0.8.0.orig/mathmlps/Makefile.am	2007-08-17 10:02:46.000000000 +0000
++++ gtkmathview-0.8.0/mathmlps/Makefile.am	2012-05-04 05:51:15.523662212 +0000
+@@ -17,6 +17,7 @@
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(top_builddir)/src/libmathview.la \
+   $(NULL)
+ 
+ INCLUDES = \
+Index: gtkmathview-0.8.0/mathmlps/Makefile.in
+===================================================================
+--- gtkmathview-0.8.0.orig/mathmlps/Makefile.in	2007-10-15 07:06:03.000000000 +0000
++++ gtkmathview-0.8.0/mathmlps/Makefile.in	2012-05-04 05:51:15.523662212 +0000
+@@ -59,7 +59,7 @@
+ mathmlps_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
+ 	$(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+-	$(am__DEPENDENCIES_1)
++	$(top_builddir)/src/libmathview.la $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -188,6 +188,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGOX_CFLAGS = @PANGOX_CFLAGS@
+ PANGOX_LIBS = @PANGOX_LIBS@
+@@ -268,6 +269,7 @@
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(top_builddir)/src/libmathview.la \
+   $(NULL)
+ 
+ INCLUDES = \
+@@ -300,9 +302,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  mathmlps/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mathmlps/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  mathmlps/Makefile
++	  $(AUTOMAKE) --gnu  mathmlps/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+Index: gtkmathview-0.8.0/mathmlsvg/Makefile.am
+===================================================================
+--- gtkmathview-0.8.0.orig/mathmlsvg/Makefile.am	2007-08-17 10:02:46.000000000 +0000
++++ gtkmathview-0.8.0/mathmlsvg/Makefile.am	2012-05-04 05:51:15.523662212 +0000
+@@ -30,6 +30,8 @@
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(top_builddir)/src/libmathview.la \
++  -lxml2 \
+   $(NULL)
+ 
+ INCLUDES = \
+Index: gtkmathview-0.8.0/mathmlsvg/Makefile.in
+===================================================================
+--- gtkmathview-0.8.0.orig/mathmlsvg/Makefile.in	2007-10-15 07:06:04.000000000 +0000
++++ gtkmathview-0.8.0/mathmlsvg/Makefile.in	2012-05-04 05:51:15.523662212 +0000
+@@ -63,7 +63,7 @@
+ mathmlsvg_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
+ 	$(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+-	$(am__DEPENDENCIES_1)
++	$(top_builddir)/src/libmathview.la $(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -192,6 +192,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGOX_CFLAGS = @PANGOX_CFLAGS@
+ PANGOX_LIBS = @PANGOX_LIBS@
+@@ -285,6 +286,8 @@
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(top_builddir)/src/libmathview.la \
++  -lxml2 \
+   $(NULL)
+ 
+ INCLUDES = \
+@@ -318,9 +321,9 @@
+ 	      exit 1;; \
+ 	  esac; \
+ 	done; \
+-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  mathmlsvg/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  mathmlsvg/Makefile'; \
+ 	cd $(top_srcdir) && \
+-	  $(AUTOMAKE) --foreign  mathmlsvg/Makefile
++	  $(AUTOMAKE) --gnu  mathmlsvg/Makefile
+ .PRECIOUS: Makefile
+ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ 	@case '$?' in \
+Index: gtkmathview-0.8.0/viewer/Makefile.in
+===================================================================
+--- gtkmathview-0.8.0.orig/viewer/Makefile.in	2007-10-15 07:06:25.000000000 +0000
++++ gtkmathview-0.8.0/viewer/Makefile.in	2012-05-04 05:51:15.523662212 +0000
+@@ -81,6 +81,7 @@
+ mathmlviewer_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++	$(top_builddir)/src/engine/boxml/libboxml.la \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ am_test_building_OBJECTS = test_building.$(OBJEXT)
+@@ -117,6 +118,7 @@
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++	$(top_builddir)/src/libmathview.la \
+ 	$(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -254,6 +256,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PANGOX_CFLAGS = @PANGOX_CFLAGS@
+ PANGOX_LIBS = @PANGOX_LIBS@
+@@ -388,6 +391,767 @@
+   $(T1_LIBS_X) \
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++  $(top_builddir)/src/libmathview.la \
++  $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++  $(NULL)
++
++test_loading_reader_SOURCES = test_loading_reader.c
++test_loading_reader_LDFLASG = -no-install -static
++test_loading_reader_LDADD = \
++  -lstdc++ \
++  $(XML_LIBS) \
++  $(GTK_LIBS) \
++  $(T1_LIBS) \
++  $(T1_LIBS_X) \
++  $(top_builddir)/src/widget/libgtkmathview_libxml2_reader.la \
++  $(NULL)
++
++INCLUDES = \
++  -I$(top_builddir)/auto/ \
++  -I$(top_srcdir)/src/common/ \
++  -I$(top_srcdir)/src/common/mathvariants \
++  -I$(top_srcdir)/src/frontend/gmetadom/ \
++  -I$(top_srcdir)/src/engine/common \
++  -I$(top_srcdir)/src/engine/mathml \
++  -I$(top_srcdir)/src/engine/boxml \
++  -I$(top_srcdir)/src/widget \
++  -I$(top_srcdir)/src/view \
++  -I$(top_srcdir)/src/backend/common/ \
++  -I$(top_srcdir)/src/backend/gtk/ \
++  $(POPT_CFLAGS) \
++  $(GTK_CFLAGS) \
++  $(XML_CFLAGS) \
++  $(DOM_CFLAGS) \
++  $(XML_CFLAGS) \
++  $(NULL)
++
++all: all-am
++
++.SUFFIXES:
++.SUFFIXES: .c .cc .lo .o .obj
++$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  viewer/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  viewer/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure:  $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++install-binPROGRAMS: $(bin_PROGRAMS)
++	@$(NORMAL_INSTALL)
++	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  if test -f $$p \
++	     || test -f $$p1 \
++	  ; then \
++	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
++	  else :; fi; \
++	done
++
++uninstall-binPROGRAMS:
++	@$(NORMAL_UNINSTALL)
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
++	done
++
++clean-binPROGRAMS:
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
++
++clean-noinstPROGRAMS:
++	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
++mathmlviewer$(EXEEXT): $(mathmlviewer_OBJECTS) $(mathmlviewer_DEPENDENCIES) 
++	@rm -f mathmlviewer$(EXEEXT)
++	$(CXXLINK) $(mathmlviewer_LDFLAGS) $(mathmlviewer_OBJECTS) $(mathmlviewer_LDADD) $(LIBS)
++mathmlviewer.static$(EXEEXT): $(mathmlviewer_static_OBJECTS) $(mathmlviewer_static_DEPENDENCIES) 
++	@rm -f mathmlviewer.static$(EXEEXT)
++	$(CXXLINK) $(mathmlviewer_static_LDFLAGS) $(mathmlviewer_static_OBJECTS) $(mathmlviewer_static_LDADD) $(LIBS)
++test_building$(EXEEXT): $(test_building_OBJECTS) $(test_building_DEPENDENCIES) 
++	@rm -f test_building$(EXEEXT)
++	$(CXXLINK) $(test_building_LDFLAGS) $(test_building_OBJECTS) $(test_building_LDADD) $(LIBS)
++test_embedding$(EXEEXT): $(test_embedding_OBJECTS) $(test_embedding_DEPENDENCIES) 
++	@rm -f test_embedding$(EXEEXT)
++	$(CXXLINK) $(test_embedding_LDFLAGS) $(test_embedding_OBJECTS) $(test_embedding_LDADD) $(LIBS)
++test_loading$(EXEEXT): $(test_loading_OBJECTS) $(test_loading_DEPENDENCIES) 
++	@rm -f test_loading$(EXEEXT)
++	$(CXXLINK) $(test_loading_LDFLAGS) $(test_loading_OBJECTS) $(test_loading_LDADD) $(LIBS)
++test_loading_reader$(EXEEXT): $(test_loading_reader_OBJECTS) $(test_loading_reader_DEPENDENCIES) 
++	@rm -f test_loading_reader$(EXEEXT)
++	$(LINK) $(test_loading_reader_LDFLAGS) $(test_loading_reader_OBJECTS) $(test_loading_reader_LDADD) $(LIBS)
++test_rendering$(EXEEXT): $(test_rendering_OBJECTS) $(test_rendering_DEPENDENCIES) 
++	@rm -f test_rendering$(EXEEXT)
++	$(CXXLINK) $(test_rendering_LDFLAGS) $(test_rendering_OBJECTS) $(test_rendering_LDADD) $(LIBS)
++
++mostlyclean-compile:
++	-rm -f *.$(OBJEXT)
++
++distclean-compile:
++	-rm -f *.tab.c
++
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/aux.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummy.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/guiGTK.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_building.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_embedding.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_loading.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_loading_reader.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_rendering.Po@am__quote@
++
++.c.o:
++@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(COMPILE) -c $<
++
++.c.obj:
++@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++
++.c.lo:
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
++
++.cc.o:
++@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
++
++.cc.obj:
++@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.cc.lo:
++@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
++
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
++
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	mkid -fID $$unique
++tags: TAGS
++
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
++
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
++
++distclean-tags:
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
++
++distdir: $(DISTFILES)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
++	  if test -d $$d/$$file; then \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++	  else \
++	    test -f $(distdir)/$$file \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
++	  fi; \
++	done
++check-am: all-am
++check: check-am
++all-am: Makefile $(PROGRAMS) $(HEADERS)
++installdirs:
++	for dir in "$(DESTDIR)$(bindir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-binPROGRAMS clean-generic clean-libtool \
++	clean-noinstPROGRAMS mostlyclean-am
++
++distclean: distclean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am: install-binPROGRAMS
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
++	distclean distclean-compile distclean-generic \
++	distclean-libtool distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-binPROGRAMS \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-binPROGRAMS \
++	uninstall-info-am
++
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++build_triplet = @build@
++host_triplet = @host@
++bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
++@COND_GMETADOM_TRUE@am__append_1 = mathmlviewer
++noinst_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_3) $(am__EXEEXT_4) \
++	$(am__EXEEXT_5)
++@COND_GMETADOM_TRUE@@COND_PROFILE_TRUE@am__append_2 = mathmlviewer.static
++@COND_LIBXML2_TRUE@am__append_3 = test_embedding test_loading \
++@COND_LIBXML2_TRUE@	test_building test_rendering
++@COND_LIBXML2_READER_TRUE@am__append_4 = test_loading_reader
++subdir = viewer
++DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
++	$(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.ac
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/config.h
++CONFIG_CLEAN_FILES =
++am__EXEEXT_1 =
++@COND_GMETADOM_TRUE@am__EXEEXT_2 = mathmlviewer$(EXEEXT)
++am__installdirs = "$(DESTDIR)$(bindir)"
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++@COND_GMETADOM_TRUE@@COND_PROFILE_TRUE@am__EXEEXT_3 = mathmlviewer.static$(EXEEXT)
++@COND_LIBXML2_TRUE@am__EXEEXT_4 = test_embedding$(EXEEXT) \
++@COND_LIBXML2_TRUE@	test_loading$(EXEEXT) \
++@COND_LIBXML2_TRUE@	test_building$(EXEEXT) \
++@COND_LIBXML2_TRUE@	test_rendering$(EXEEXT)
++@COND_LIBXML2_READER_TRUE@am__EXEEXT_5 = test_loading_reader$(EXEEXT)
++PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
++am_mathmlviewer_OBJECTS = main.$(OBJEXT) aux.$(OBJEXT) \
++	guiGTK.$(OBJEXT)
++mathmlviewer_OBJECTS = $(am_mathmlviewer_OBJECTS)
++am__DEPENDENCIES_1 =
++mathmlviewer_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++	$(am__DEPENDENCIES_1)
++am_mathmlviewer_static_OBJECTS = main.$(OBJEXT) aux.$(OBJEXT) \
++	guiGTK.$(OBJEXT)
++mathmlviewer_static_OBJECTS = $(am_mathmlviewer_static_OBJECTS)
++mathmlviewer_static_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
++am_test_building_OBJECTS = test_building.$(OBJEXT)
++test_building_OBJECTS = $(am_test_building_OBJECTS)
++test_building_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) \
++	$(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++	$(am__DEPENDENCIES_1)
++am_test_embedding_OBJECTS = test_embedding.$(OBJEXT) dummy.$(OBJEXT)
++test_embedding_OBJECTS = $(am_test_embedding_OBJECTS)
++test_embedding_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) \
++	$(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
++am_test_loading_OBJECTS = test_loading.$(OBJEXT) dummy.$(OBJEXT)
++test_loading_OBJECTS = $(am_test_loading_OBJECTS)
++test_loading_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) \
++	$(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++	$(am__DEPENDENCIES_1)
++am_test_loading_reader_OBJECTS = test_loading_reader.$(OBJEXT)
++test_loading_reader_OBJECTS = $(am_test_loading_reader_OBJECTS)
++test_loading_reader_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) \
++	$(top_builddir)/src/widget/libgtkmathview_libxml2_reader.la \
++	$(am__DEPENDENCIES_1)
++am_test_rendering_OBJECTS = test_rendering.$(OBJEXT)
++test_rendering_OBJECTS = $(am_test_rendering_OBJECTS)
++test_rendering_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++	$(top_builddir)/src/libmathview.la \
++	$(top_builddir)/src/engine/boxml/libboxml.la \
++	$(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++	$(am__DEPENDENCIES_1)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++depcomp = $(SHELL) $(top_srcdir)/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(mathmlviewer_SOURCES) $(mathmlviewer_static_SOURCES) \
++	$(test_building_SOURCES) $(test_embedding_SOURCES) \
++	$(test_loading_SOURCES) $(test_loading_reader_SOURCES) \
++	$(test_rendering_SOURCES)
++DIST_SOURCES = $(mathmlviewer_SOURCES) $(mathmlviewer_static_SOURCES) \
++	$(test_building_SOURCES) $(test_embedding_SOURCES) \
++	$(test_loading_SOURCES) $(test_loading_reader_SOURCES) \
++	$(test_rendering_SOURCES)
++HEADERS = $(noinst_HEADERS)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
++AREAMODEL_VERSION_INFO = @AREAMODEL_VERSION_INFO@
++AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CHAR_UNSIGNED = @CHAR_UNSIGNED@
++COND_BOXML_FALSE = @COND_BOXML_FALSE@
++COND_BOXML_TRUE = @COND_BOXML_TRUE@
++COND_CUSTOM_READER_FALSE = @COND_CUSTOM_READER_FALSE@
++COND_CUSTOM_READER_TRUE = @COND_CUSTOM_READER_TRUE@
++COND_GMETADOM_FALSE = @COND_GMETADOM_FALSE@
++COND_GMETADOM_TRUE = @COND_GMETADOM_TRUE@
++COND_GTK_FALSE = @COND_GTK_FALSE@
++COND_GTK_TRUE = @COND_GTK_TRUE@
++COND_HAVE_POPT_FALSE = @COND_HAVE_POPT_FALSE@
++COND_HAVE_POPT_TRUE = @COND_HAVE_POPT_TRUE@
++COND_LIBXML2_FALSE = @COND_LIBXML2_FALSE@
++COND_LIBXML2_READER_FALSE = @COND_LIBXML2_READER_FALSE@
++COND_LIBXML2_READER_TRUE = @COND_LIBXML2_READER_TRUE@
++COND_LIBXML2_TRUE = @COND_LIBXML2_TRUE@
++COND_PROFILE_FALSE = @COND_PROFILE_FALSE@
++COND_PROFILE_TRUE = @COND_PROFILE_TRUE@
++COND_PS_FALSE = @COND_PS_FALSE@
++COND_PS_TRUE = @COND_PS_TRUE@
++COND_SVG_FALSE = @COND_SVG_FALSE@
++COND_SVG_TRUE = @COND_SVG_TRUE@
++COND_T1LIB_FALSE = @COND_T1LIB_FALSE@
++COND_T1LIB_TRUE = @COND_T1LIB_TRUE@
++COND_TFM_FALSE = @COND_TFM_FALSE@
++COND_TFM_LEVEL_1_FALSE = @COND_TFM_LEVEL_1_FALSE@
++COND_TFM_LEVEL_1_TRUE = @COND_TFM_LEVEL_1_TRUE@
++COND_TFM_LEVEL_2_FALSE = @COND_TFM_LEVEL_2_FALSE@
++COND_TFM_LEVEL_2_TRUE = @COND_TFM_LEVEL_2_TRUE@
++COND_TFM_LEVEL_3_FALSE = @COND_TFM_LEVEL_3_FALSE@
++COND_TFM_LEVEL_3_TRUE = @COND_TFM_LEVEL_3_TRUE@
++COND_TFM_TRUE = @COND_TFM_TRUE@
++COND_XSLTPROC_FALSE = @COND_XSLTPROC_FALSE@
++COND_XSLTPROC_TRUE = @COND_XSLTPROC_TRUE@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DLLTOOL = @DLLTOOL@
++DOM_CFLAGS = @DOM_CFLAGS@
++DOM_LIBS = @DOM_LIBS@
++ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
++EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++GLIB_CFLAGS = @GLIB_CFLAGS@
++GLIB_LIBS = @GLIB_LIBS@
++GMV_ENABLE_BOXML_CFLAGS = @GMV_ENABLE_BOXML_CFLAGS@
++GMV_HAVE_EXT_HASH_MAP_CFLAGS = @GMV_HAVE_EXT_HASH_MAP_CFLAGS@
++GMV_HAVE_HASH_MAP_CFLAGS = @GMV_HAVE_HASH_MAP_CFLAGS@
++GREP = @GREP@
++GTKMATHVIEW_SIZEOF_CHAR = @GTKMATHVIEW_SIZEOF_CHAR@
++GTKMATHVIEW_SIZEOF_INT = @GTKMATHVIEW_SIZEOF_INT@
++GTKMATHVIEW_SIZEOF_LONG = @GTKMATHVIEW_SIZEOF_LONG@
++GTKMATHVIEW_SIZEOF_LONG_LONG = @GTKMATHVIEW_SIZEOF_LONG_LONG@
++GTKMATHVIEW_SIZEOF_SHORT = @GTKMATHVIEW_SIZEOF_SHORT@
++GTKMATHVIEW_SIZEOF_WCHAR_T = @GTKMATHVIEW_SIZEOF_WCHAR_T@
++GTK_CFLAGS = @GTK_CFLAGS@
++GTK_LIBS = @GTK_LIBS@
++HAVE_XSLTPROC = @HAVE_XSLTPROC@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LIBTOOL = @LIBTOOL@
++LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
++MAJOR_VERSION = @MAJOR_VERSION@
++MAKEINFO = @MAKEINFO@
++MATHVIEW_VERSION = @MATHVIEW_VERSION@
++MATHVIEW_VERSION_INFO = @MATHVIEW_VERSION_INFO@
++MINOR_VERSION = @MINOR_VERSION@
++OBJDUMP = @OBJDUMP@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PANGOX_CFLAGS = @PANGOX_CFLAGS@
++PANGOX_LIBS = @PANGOX_LIBS@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++POPT_CFLAGS = @POPT_CFLAGS@
++POPT_LIBS = @POPT_LIBS@
++RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++T1_CFLAGS = @T1_CFLAGS@
++T1_LIBS = @T1_LIBS@
++T1_LIBS_X = @T1_LIBS_X@
++USE_GCC_PCH_FALSE = @USE_GCC_PCH_FALSE@
++USE_GCC_PCH_TRUE = @USE_GCC_PCH_TRUE@
++VERSION = @VERSION@
++WITH_BINRELOC_FALSE = @WITH_BINRELOC_FALSE@
++WITH_BINRELOC_TRUE = @WITH_BINRELOC_TRUE@
++XML_CFLAGS = @XML_CFLAGS@
++XML_LIBS = @XML_LIBS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++NULL = 
++noinst_HEADERS = guiGTK.h
++mathmlviewer_static_SOURCES = main.cc aux.cc guiGTK.c
++mathmlviewer_static_LDFLAGS = -no-install -static
++mathmlviewer_static_LDADD = \
++  $(POPT_LIBS) \
++  $(DOM_LIBS) \
++  $(GTK_LIBS) \
++  $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++  $(top_builddir)/src/engine/boxml/libboxml.la \
++  $(T1_LIBS) \
++  $(T1_LIBS_X) \
++  $(NULL)
++
++mathmlviewer_SOURCES = main.cc aux.cc guiGTK.c
++mathmlviewer_LDADD = \
++  $(POPT_LIBS) \
++  $(DOM_LIBS) \
++  $(GTK_LIBS) \
++  $(T1_LIBS) \
++  $(T1_LIBS_X) \
++  $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++  $(NULL)
++
++test_embedding_SOURCES = test_embedding.c dummy.cc
++test_embedding_LDFLAGS = -no-install -static
++test_embedding_LDADD = \
++  -lstdc++ \
++  $(XML_LIBS) \
++  $(GTK_LIBS) \
++  $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++  $(T1_LIBS) \
++  $(T1_LIBS_X) \
++  $(NULL)
++
++test_loading_SOURCES = test_loading.c dummy.cc
++test_loading_LDFLASG = -no-install -static
++test_loading_LDADD = \
++  -lstdc++ \
++  $(XML_LIBS) \
++  $(GTK_LIBS) \
++  $(T1_LIBS) \
++  $(T1_LIBS_X) \
++  $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++  $(NULL)
++
++test_building_SOURCES = test_building.cc
++test_building_LDFLASG = -no-install -static
++test_building_LDADD = \
++  -lstdc++ \
++  $(XML_LIBS) \
++  $(GTK_LIBS) \
++  $(T1_LIBS) \
++  $(T1_LIBS_X) \
++  $(top_builddir)/src/widget/libgtkmathview_libxml2.la \
++  $(NULL)
++
++test_rendering_SOURCES = test_rendering.cc
++test_rendering_LDFLASG = -no-install -static
++test_rendering_LDADD = \
++  -lstdc++ \
++  $(XML_LIBS) \
++  $(GTK_LIBS) \
++  $(T1_LIBS) \
++  $(T1_LIBS_X) \
++  $(GLIB_LIBS) \
++  $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++  $(top_builddir)/src/libmathview.la \
++  $(top_builddir)/src/engine/boxml/libboxml.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+   $(NULL)
+ 
+Index: gtkmathview-0.8.0/viewer/Makefile.am
+===================================================================
+--- gtkmathview-0.8.0.orig/viewer/Makefile.am	2007-08-17 10:02:45.000000000 +0000
++++ gtkmathview-0.8.0/viewer/Makefile.am	2012-05-04 05:51:15.523662212 +0000
+@@ -31,6 +31,7 @@
+   $(DOM_LIBS) \
+   $(GTK_LIBS) \
+   $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++  $(top_builddir)/src/engine/boxml/libboxml.la \
+   $(T1_LIBS) \
+   $(T1_LIBS_X) \
+   $(NULL)
+@@ -88,6 +89,8 @@
+   $(T1_LIBS_X) \
+   $(GLIB_LIBS) \
+   $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++  $(top_builddir)/src/libmathview.la \
++  $(top_builddir)/src/engine/boxml/libboxml.la \
+   $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+   $(NULL)
+ 
diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD
index 67a65f22b..eac071f9f 100644
--- a/extra/gtkmm/PKGBUILD
+++ b/extra/gtkmm/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=gtkmm
 pkgname=('gtkmm' 'gtkmm-docs')
 pkgver=2.24.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs')
 license=('LGPL')
 options=('!emptydirs')
diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD
index 1d9594d1d..b3b18d7dd 100644
--- a/extra/gtkmm3/PKGBUILD
+++ b/extra/gtkmm3/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=gtkmm
 pkgname=('gtkmm3' 'gtkmm3-docs')
 pkgver=3.10.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
 license=('LGPL')
 options=('!emptydirs')
diff --git a/extra/gtksourceview2/PKGBUILD b/extra/gtksourceview2/PKGBUILD
index 3ce3fb411..1841c4011 100644
--- a/extra/gtksourceview2/PKGBUILD
+++ b/extra/gtksourceview2/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=gtksourceview2
 pkgver=2.10.5
-pkgrel=2
+pkgrel=2.2
 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' 'pkg-config')
diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD
index 929ef11e7..fd3b1c11d 100644
--- a/extra/gtksourceview3/PKGBUILD
+++ b/extra/gtksourceview3/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=gtksourceview
 pkgver=3.10.2
 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=('gtk3' 'libxml2')
 makedepends=('intltool' 'gobject-introspection' 'glade')
diff --git a/extra/gtkspell/PKGBUILD b/extra/gtkspell/PKGBUILD
index a01b94de8..cdfb37a34 100644
--- a/extra/gtkspell/PKGBUILD
+++ b/extra/gtkspell/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.0.16
 pkgrel=3
 url="http://gtkspell.sourceforge.net/"
 pkgdesc="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' 'enchant')
 makedepends=('intltool' 'gtk-doc')
diff --git a/extra/gts/PKGBUILD b/extra/gts/PKGBUILD
index d4176f9f0..f505f5342 100644
--- a/extra/gts/PKGBUILD
+++ b/extra/gts/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=3
 pkgdesc='Provides useful functions to deal with 3D surfaces meshed with interconnected triangles'
 url='http://gts.sourceforge.net/'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('glib2')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('000720bebecf0b153eb28260bd30fbd979dcc040')
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 7958d9fb9..8918560d1 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gucharmap
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org"
 depends=('dconf' 'gtk3' 'hicolor-icon-theme')
diff --git a/extra/guile/PKGBUILD b/extra/guile/PKGBUILD
index 22c96e612..b5b6ff73f 100644
--- a/extra/guile/PKGBUILD
+++ b/extra/guile/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.0.9
 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' 'libltdl' 'ncurses>=5.7' 'texinfo' 'libunistring' 'gc' 'libffi')
 install=guile.install
diff --git a/extra/guile1.8/PKGBUILD b/extra/guile1.8/PKGBUILD
index 999d0e43d..e69ce6463 100644
--- a/extra/guile1.8/PKGBUILD
+++ b/extra/guile1.8/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.8.8
 pkgrel=3
 pkgdesc='Portable, embeddable Scheme implementation written in C. Legacy branch.'
 url="http://www.gnu.org/software/guile/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gmp' 'libltdl' 'ncurses>=5.7' 'texinfo')
 source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-$pkgver.tar.gz)
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index 9b1a687e2..1033470fd 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=gupnp-av
 pkgver=0.12.5
 pkgrel=1
 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
 license=(LGPL)
 depends=(gupnp)
diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD
index ba3c651db..0b30c8d8a 100644
--- a/extra/gupnp-dlna/PKGBUILD
+++ b/extra/gupnp-dlna/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gupnp-dlna
 pkgver=0.10.2
 pkgrel=1
 pkgdesc="Library to ease DLNA-related bits for applications using gupnp"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
 license=(LGPL)
 depends=(gst-plugins-base-libs)
diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD
index 9658f1f09..e0f8150e5 100644
--- a/extra/gupnp-igd/PKGBUILD
+++ b/extra/gupnp-igd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gupnp-igd
 pkgver=0.2.2
 pkgrel=2
 pkgdesc="A library to handle UPnP IGD port mapping"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gupnp.org"
 license=('LGPL')
 depends=('gupnp' 'python2-gobject2')
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 4672d7c4a..39d9fe018 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=gupnp
 pkgver=0.20.10
 pkgrel=1
 pkgdesc="An object-oriented UPNP framework"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://gupnp.org/"
 license=(LGPL)
 depends=(gssdp util-linux)
diff --git a/extra/gutenprint/PKGBUILD b/extra/gutenprint/PKGBUILD
index 205d638f0..c570248bd 100644
--- a/extra/gutenprint/PKGBUILD
+++ b/extra/gutenprint/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gutenprint
 pkgver=5.2.9
 pkgrel=2
 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') # 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 ab381a8f3..6dc26d148 100644
--- a/extra/gv/PKGBUILD
+++ b/extra/gv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=gv
 pkgver=3.7.4
 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=('GPL3')
 depends=('xaw3d' 'ghostscript' 'desktop-file-utils')
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index aff4549bf..9005c3be8 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-goa' 'gvfs-mtp')
 pkgver=1.18.3
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('avahi' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
 url="http://www.gnome.org"
diff --git a/extra/gweled/PKGBUILD b/extra/gweled/PKGBUILD
index 7059a3e37..7ad07bf6e 100644
--- a/extra/gweled/PKGBUILD
+++ b/extra/gweled/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=gweled
 pkgver=0.9.1
-pkgrel=2
+pkgrel=2.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..793c6ea34 100644
--- a/extra/habak/PKGBUILD
+++ b/extra/habak/PKGBUILD
@@ -4,19 +4,19 @@
 
 pkgname=habak
 pkgver=0.2.5
-pkgrel=4
+pkgrel=4.1
 pkgdesc="A background changing app"
 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')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  export LDFLAGS=${LDFLAGS/,--sort-common,--as-needed//}
+  export LDFLAGS="${LDFLAGS/,--sort-common,--as-needed//} -lX11"
   make
 }
 
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 3496f4052..4b67286ec 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(harfbuzz harfbuzz-icu)
 pkgver=0.9.26
 pkgrel=1
 pkgdesc="OpenType text shaping engine"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
 license=(MIT)
 makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
diff --git a/extra/haveged/PKGBUILD b/extra/haveged/PKGBUILD
index be9c9dea8..dc8ce427e 100644
--- a/extra/haveged/PKGBUILD
+++ b/extra/haveged/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.8
 _pkgver=${pkgver/.c/c}
 pkgrel=1
 pkgdesc='Entropy harvesting daemon using CPU timings'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.issihosts.com/haveged'
 license=('GPL')
 depends=('glibc')
diff --git a/extra/hddtemp/PKGBUILD b/extra/hddtemp/PKGBUILD
index dcf2b6bc7..7859d3039 100644
--- a/extra/hddtemp/PKGBUILD
+++ b/extra/hddtemp/PKGBUILD
@@ -13,7 +13,7 @@ pkgrel=2
 pkgdesc="Gives you the temperature of your hard drive by reading S.M.A.R.T. information"
 url='https://savannah.nongnu.org/projects/hddtemp/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${_origver}.tar.bz2"
         "http://ftp.debian.org/debian/pool/main/h/${pkgname}/${pkgname}_${_patchver}.diff.gz"
         'service')
diff --git a/extra/hdf5-cpp-fortran/PKGBUILD b/extra/hdf5-cpp-fortran/PKGBUILD
index 0d467a5b4..28e152c52 100644
--- a/extra/hdf5-cpp-fortran/PKGBUILD
+++ b/extra/hdf5-cpp-fortran/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=hdf5-cpp-fortran
 _pkgname=hdf5
 pkgver=1.8.12
 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/hdf5-openmpi/PKGBUILD b/extra/hdf5-openmpi/PKGBUILD
index d9aa832d6..3ce838040 100644
--- a/extra/hdf5-openmpi/PKGBUILD
+++ b/extra/hdf5-openmpi/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=hdf5-openmpi
 _pkgname=hdf5
 pkgver=1.8.12
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="General purpose library and file format for storing scientific data (OpenMPI version)"
 url="http://www.hdfgroup.org/HDF5/"
 license=('custom')
diff --git a/extra/hdf5/PKGBUILD b/extra/hdf5/PKGBUILD
index 3ef74f71e..13b4e6e2d 100644
--- a/extra/hdf5/PKGBUILD
+++ b/extra/hdf5/PKGBUILD
@@ -7,7 +7,7 @@
 pkgname=hdf5
 pkgver=1.8.12
 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/hefur/PKGBUILD b/extra/hefur/PKGBUILD
index 0dd07b1b0..78f33fc80 100644
--- a/extra/hefur/PKGBUILD
+++ b/extra/hefur/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hefur
 pkgver=0.4
 pkgrel=2
 pkgdesc='A standalone and lightweight BitTorrent tracker'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://github.com/abique/hefur'
 license=('MIT')
 makedepends=('cmake')
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 7e934ad2a..cce4682dc 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=help2man
 pkgver=1.44.1
 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/hspell/PKGBUILD b/extra/hspell/PKGBUILD
index d5412b494..43f22ba55 100644
--- a/extra/hspell/PKGBUILD
+++ b/extra/hspell/PKGBUILD
@@ -4,8 +4,8 @@
 pkgbase=hspell
 pkgname=('hspell' 'hunspell-he')
 pkgver=1.2
-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 0511a9769..5ae7a6d14 100644
--- a/extra/htdig/PKGBUILD
+++ b/extra/htdig/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.2.0b6
 pkgrel=9
 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')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
diff --git a/extra/htop/PKGBUILD b/extra/htop/PKGBUILD
index 509980f30..3f5cf8e52 100644
--- a/extra/htop/PKGBUILD
+++ b/extra/htop/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=htop
 pkgver=1.0.2
-pkgrel=2
+pkgrel=2.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 86abb8607..e9734cf21 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=6
 pkgdesc='Panorama photo stitcher'
 url='http://hugin.sourceforge.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 optdepends=('python2: bindings and plugins')
 makedepends=('cmake' 'boost' 'tclap' 'mesa' 'python2' 'swig')
 depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'libpano13'
diff --git a/extra/hunspell/PKGBUILD b/extra/hunspell/PKGBUILD
index 7967c69f4..4800c6f1b 100644
--- a/extra/hunspell/PKGBUILD
+++ b/extra/hunspell/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=hunspell
 pkgver=1.3.2
 pkgrel=3
 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 61427a39c..cbb1b7822 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=hwloc
 pkgver=1.8
 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' 'cairo' 'libxml2')
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 7210764cd..984cf0134 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=hylafax
 pkgver=6.0.6
 pkgrel=4
 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 946ce0fd2..78e206ffa 100644
--- a/extra/hyphen/PKGBUILD
+++ b/extra/hyphen/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=hyphen
 pkgname=('hyphen' 'hyphen-en')
 pkgver=2.8.6
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hunspell.sf.net"
 license=('GPL' 'LGPL' 'MPL')
 makedepends=('glibc' 'perl')
diff --git a/extra/i8kutils/PKGBUILD b/extra/i8kutils/PKGBUILD
index e50f59444..4c1c49962 100644
--- a/extra/i8kutils/PKGBUILD
+++ b/extra/i8kutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=i8kutils
 pkgver=1.40
 pkgrel=4
 pkgdesc="Dell Inspiron/Latitude kernel driver and utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/i8kutils"
 license=('GPL')
 depends=('bash' 'acpi')
diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD
index b52c24a1d..f6d9c784c 100644
--- a/extra/iagno/PKGBUILD
+++ b/extra/iagno/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=iagno
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Dominate the board in a classic version of Reversi"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD
index bdb9624d6..5869f8f6f 100644
--- a/extra/ibus/PKGBUILD
+++ b/extra/ibus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(ibus libibus)
 pkgver=1.5.5
 pkgrel=1
 pkgdesc="Next Generation Input Bus for Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ibus.googlecode.com"
 license=('LGPL')
 depends=('dconf' 'gtk2' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'pygtk' 'python2-dbus' 'python2-gobject' 'iso-codes')
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index 3573fb570..4f8b7adc2 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=icewm
 pkgver=1.3.8
 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')
@@ -25,6 +25,7 @@ prepare() {
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
+    --build=$CHOST \
     --enable-shaped-decorations --enable-gradients
   make
 }
diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD
index 3e7b1699c..ef62e2712 100644
--- a/extra/icu/PKGBUILD
+++ b/extra/icu/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=icu
 pkgver=52.1
 pkgrel=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>=4.7.1-5' 'sh')
diff --git a/extra/id3lib/PKGBUILD b/extra/id3lib/PKGBUILD
index ff885aecd..3efe66402 100644
--- a/extra/id3lib/PKGBUILD
+++ b/extra/id3lib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=id3lib
 pkgver=3.8.3
 pkgrel=15
 pkgdesc='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 42ab5b3f7..53e433706 100644
--- a/extra/id3v2/PKGBUILD
+++ b/extra/id3v2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=id3v2
 pkgver=0.1.12
 pkgrel=2
 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/idnkit/PKGBUILD b/extra/idnkit/PKGBUILD
index 4346fe847..359bb37f4 100644
--- a/extra/idnkit/PKGBUILD
+++ b/extra/idnkit/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 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')
 backup=('etc/idnalias.conf' 'etc/idn.conf')
 options=('!makeflags')
@@ -23,6 +23,8 @@ prepare() {
 build() {
 	cd idnkit-${pkgver}-src
 	./configure \
+    --host=$CHOST \
+    --build=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
diff --git a/extra/ifplugd/PKGBUILD b/extra/ifplugd/PKGBUILD
index 49b8c616a..9c90f3bc5 100644
--- a/extra/ifplugd/PKGBUILD
+++ b/extra/ifplugd/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ifplugd
 pkgver=0.28
 pkgrel=14
 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"
 install=ifplugd.install
 license=('GPL2')
diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD
index 20032447a..e872ea323 100644
--- a/extra/ilmbase/PKGBUILD
+++ b/extra/ilmbase/PKGBUILD
@@ -6,13 +6,15 @@ pkgver=2.0.1
 pkgrel=2
 depends=('gcc-libs')
 pkgdesc="Base libraries from ILM for OpenEXR"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.openexr.com"
 license=('custom')
-source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz) 
+source=(http://download.savannah.nongnu.org/releases/openexr/$pkgname-$pkgver.tar.gz
+	ilmbase-IexMath.patch) 
 
 build() {
   cd "${srcdir}/$pkgname-$pkgver"
+  patch -Np1 -i ${srcdir}/ilmbase-IexMath.patch
   ./configure --prefix=/usr
   make
 }
@@ -28,4 +30,5 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
-md5sums=('74c0d0d2873960bd0dc1993f8e03f0ae')
+md5sums=('74c0d0d2873960bd0dc1993f8e03f0ae'
+	 '65f1ec028c9f6fbf3a0abd6a687e9745')
diff --git a/extra/ilmbase/ilmbase-IexMath.patch b/extra/ilmbase/ilmbase-IexMath.patch
index 546034966..c3bd58719 100644
--- a/extra/ilmbase/ilmbase-IexMath.patch
+++ b/extra/ilmbase/ilmbase-IexMath.patch
@@ -1,6 +1,6 @@
---- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
-+++ IexMath/IexMathFpu.cpp	2012-10-04 15:30:47.000000000 +0200
-@@ -27,8 +27,7 @@
+--- ilmbase-2.0.0.orig/IexMath/IexMathFpu.cpp	2013-03-06 18:18:50.000000000 -0500
++++ ilmbase-2.0.0/IexMath/IexMathFpu.cpp	2013-04-23 13:17:40.273193358 -0500
+@@ -53,8 +53,7 @@
  #endif
  
  
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index ce17ba92e..3b7bdaae6 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -5,12 +5,13 @@ pkgbase=imagemagick
 pkgname=('imagemagick' 'imagemagick-doc')
 pkgver=6.8.8.7
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.imagemagick.org/"
 license=('custom')
 makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
              'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr'
-             'opencl-headers' 'libcl' 'libwebp')
+             'libwebp')
+[ "$CARCH" != "mips64el" ] && makedepends+=('opencl-headers' 'libcl')
 #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
 source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc}
         perlmagick.rpath.patch)
@@ -29,6 +30,7 @@ build() {
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
   [[ $CARCH = "i686" ]] && EXTRAOPTS="--with-gcc-arch=i686"
   [[ $CARCH = "x86_64" ]] && EXTRAOPTS="--with-gcc-arch=x86-64"
+  [ "$CARCH" != "mips64el" ] && EXTRAOPTS="--enable-opencl"
 
   ./configure --prefix=/usr --sysconfdir=/etc --with-modules \
     --enable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 \
@@ -69,6 +71,7 @@ package_imagemagick() {
           "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml"
           "etc/ImageMagick-${pkgver%%.*}/type-windows.xml")
   options=('!docs' 'libtool' '!emptydirs')
+  [ "$CARCH" != "mips64el" ] && depends+=('libcl')
 
   cd ImageMagick-${pkgver%.*}-${pkgver##*.}
   make -j1 DESTDIR="${pkgdir}" install
diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD
index a0b5d0bd0..110f34ffd 100644
--- a/extra/imake/PKGBUILD
+++ b/extra/imake/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=imake
 pkgver=1.0.6
 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 8be9b7e81..2ad5306e4 100644
--- a/extra/imap/PKGBUILD
+++ b/extra/imap/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=imap
 pkgver=2007f
 pkgrel=4
 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')
@@ -31,7 +31,7 @@ build() {
   cd $srcdir/$pkgname-$pkgver
   # NOTE: if you wish to enforce SSL, use SSLTYPE=unix.nopwd
 
-  if [ "$CARCH" == "x86_64" ]; then
+  if [ "$CARCH" != "i686" ]; then
          yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix EXTRACFLAGS="${CFLAGS} -fPIC"
     else yes "y" | make lnp SPECIALAUTHENTICATORS=ssl SSLTYPE=unix
   fi
diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD
index af3f9f544..ef3c493d7 100644
--- a/extra/imlib/PKGBUILD
+++ b/extra/imlib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=imlib
 pkgver=1.9.15
 pkgrel=13
 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' 'libtiff')
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 635ace90e..c998561bd 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.4.6
 pkgrel=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')
 source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
diff --git a/extra/indent/PKGBUILD b/extra/indent/PKGBUILD
index 35f85acd8..637dd82ba 100644
--- a/extra/indent/PKGBUILD
+++ b/extra/indent/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=indent
 pkgver=2.2.11
 pkgrel=3
 pkgdesc="C language source code formatting program"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://www.gnu.org/software/indent/"
 license=('GPL3')
 depends=('glibc')
diff --git a/extra/iniparser/PKGBUILD b/extra/iniparser/PKGBUILD
index 546ba77a7..2dc020765 100644
--- a/extra/iniparser/PKGBUILD
+++ b/extra/iniparser/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=iniparser
 pkgver=3.1
 pkgrel=4
 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=('glibc')
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 571c7f9fe..2d19ecc16 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=13
 pkgdesc='Vector graphics editor using the SVG file format'
 url='http://inkscape.sourceforge.net/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('boost' 'intltool')
 depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.24.4' 'popt'
          'python2' 'desktop-file-utils' 'hicolor-icon-theme')
diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD
index 150e10673..bbb1a2c89 100644
--- a/extra/intel-tbb/PKGBUILD
+++ b/extra/intel-tbb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=intel-tbb
 pkgver=4.2_20131118
 pkgrel=1
 pkgdesc='High level abstract threading library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.threadingbuildingblocks.org/'
 license=('GPL')
 depends=('gcc-libs')
diff --git a/extra/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch b/extra/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
new file mode 100644
index 000000000..ed3c620e6
--- /dev/null
+++ b/extra/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
@@ -0,0 +1,127 @@
+From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001
+From: Nikola Pajkovsky <npajkovs@redhat.com>
+Date: Wed, 23 May 2012 16:32:27 +0200
+Subject: [PATCH] token-ring: kernel v3.5 kill off token-ring support
+
+Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com>
+---
+ src/hostmon.c          | 10 ----------
+ src/iptraf-ng-compat.h |  1 -
+ src/othptab.c          |  6 ------
+ src/packet.c           | 27 ---------------------------
+ src/tcptable.c         |  4 ----
+ 5 files changed, 48 deletions(-)
+
+diff --git a/src/hostmon.c b/src/hostmon.c
+index 40a2b95..72b91f8 100644
+--- a/src/hostmon.c
++++ b/src/hostmon.c
+@@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr,
+ 				       FDDI_K_ALEN);
+ 				list = flist;
+ 				break; }
+-			case ARPHRD_IEEE802:
+-			case ARPHRD_IEEE802_TR: {
+-				struct trh_hdr *hdr_trh =
+-					(struct trh_hdr *)pkt.pkt_buf;
+-				memcpy(scratch_saddr, hdr_trh->saddr,
+-				       TR_ALEN);
+-				memcpy(scratch_daddr, hdr_trh->daddr,
+-				       TR_ALEN);
+-				list = flist;
+-				break; }
+ 			default:
+ 				/* unknown link protocol */
+ 				continue;
+diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h
+index d5aee4a..2d9da96 100644
+--- a/src/iptraf-ng-compat.h
++++ b/src/iptraf-ng-compat.h
+@@ -39,7 +39,6 @@
+ #include <linux/if_ether.h>
+ #include <linux/if_packet.h>
+ #include <linux/if_fddi.h>
+-#include <linux/if_tr.h>
+ #include <linux/types.h>
+ #include <linux/isdn.h>
+ 
+diff --git a/src/othptab.c b/src/othptab.c
+index d12cdfd..1181eb1 100644
+--- a/src/othptab.c
++++ b/src/othptab.c
+@@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt,
+ 					      saddr), new_entry->smacaddr);
+ 			convmacaddr((char *) (((struct fddihdr *) packet)->
+ 					      daddr), new_entry->dmacaddr);
+-		} else if ((pkt->pkt_hatype == ARPHRD_IEEE802)
+-			   || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) {
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      saddr), new_entry->smacaddr);
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      daddr), new_entry->dmacaddr);
+ 		}
+ 	}
+ 
+diff --git a/src/packet.c b/src/packet.c
+index a43a27a..f3e4304 100644
+--- a/src/packet.c
++++ b/src/packet.c
+@@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len)
+ 	return (u_short) (~sum);
+ }
+ 
+-static unsigned int get_tr_ip_offset(char *pkt)
+-{
+-	struct trh_hdr *trh;
+-	unsigned int riflen = 0;
+-
+-	trh = (struct trh_hdr *) pkt;
+-
+-	/*
+-	 * Check if this packet has TR routing information and get
+-	 * its length.
+-	 */
+-	if (trh->saddr[0] & TR_RII)
+-		riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8;
+-
+-	return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen +
+-	    sizeof(struct trllc);
+-}
+-
+ static int packet_adjust(struct pkt_hdr *pkt)
+ {
+ 	int retval = 0;
+@@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt)
+ 		pkt->pkt_payload += sizeof(struct fddihdr);
+ 		pkt->pkt_len -= sizeof(struct fddihdr);
+ 		break;
+-	case ARPHRD_IEEE802_TR:
+-	case ARPHRD_IEEE802:
+-		pkt->pkt_payload = pkt->pkt_buf;
+-		/* Token Ring patch supplied by Tomas Dvorak */
+-		/* Get the start of the IP packet from the Token Ring frame. */
+-		unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload);
+-		pkt->pkt_payload += dataoffset;
+-		pkt->pkt_len -= dataoffset;
+-		break;
+ 	default:
+ 		/* return a NULL packet to signal an unrecognized link */
+ 		/* protocol to the caller.  Hopefully, this switch statement */
+diff --git a/src/tcptable.c b/src/tcptable.c
+index 56c4780..b0e5ccc 100644
+--- a/src/tcptable.c
++++ b/src/tcptable.c
+@@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry,
+ 		} else if (linkproto == ARPHRD_FDDI) {
+ 			convmacaddr((char *) (((struct fddihdr *) packet)->
+ 					      saddr), newmacaddr);
+-		} else if ((linkproto == ARPHRD_IEEE802)
+-			   || (linkproto == ARPHRD_IEEE802_TR)) {
+-			convmacaddr((char *) (((struct trh_hdr *) packet)->
+-					      saddr), newmacaddr);
+ 		}
+ 
+ 		if (tableentry->smacaddr[0] != '\0') {
+-- 
+1.8.1.4
+
diff --git a/extra/iptraf-ng/PKGBUILD b/extra/iptraf-ng/PKGBUILD
index 3f9d47ad3..763ce965b 100644
--- a/extra/iptraf-ng/PKGBUILD
+++ b/extra/iptraf-ng/PKGBUILD
@@ -7,12 +7,22 @@ pkgver=1.1.4
 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')
-source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('de27cfeeede96e2acfb0edc8439b034a')
+source=(https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz
+        0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
+        iptraf-ng-linux-3.5-compat.patch)
+md5sums=('de27cfeeede96e2acfb0edc8439b034a'
+         'd5eab1e094b93f0e3a256cf9ccfaa9c3'
+         'd2ddee5f9ff485155235f7cb4671d8fb')
+
+prepare() {
+  cd "$pkgname-$pkgver"
+  patch -p1 -i ${srcdir}/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch
+  patch -p1 -i ${srcdir}/iptraf-ng-linux-3.5-compat.patch
+}
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/irqbalance/PKGBUILD b/extra/irqbalance/PKGBUILD
index e9e869dde..2371a50db 100644
--- a/extra/irqbalance/PKGBUILD
+++ b/extra/irqbalance/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=irqbalance
 pkgver=1.0.7
 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 b500bd61c..069d5941c 100644
--- a/extra/irssi/PKGBUILD
+++ b/extra/irssi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=irssi
 pkgver=0.8.15
 pkgrel=8
 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')
diff --git a/extra/ispell/PKGBUILD b/extra/ispell/PKGBUILD
index 490878ee5..cc860e594 100644
--- a/extra/ispell/PKGBUILD
+++ b/extra/ispell/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=ispell
 pkgver=3.3.02
-pkgrel=5
+pkgrel=5.1
 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/jack/PKGBUILD b/extra/jack/PKGBUILD
index 230cd1315..da6923aed 100644
--- a/extra/jack/PKGBUILD
+++ b/extra/jack/PKGBUILD
@@ -8,12 +8,16 @@ _longname=jack-audio-connection-kit
 pkgver=0.124.1
 pkgrel=1
 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)
 provides=("$_longname=$pkgver")
diff --git a/extra/jade/PKGBUILD b/extra/jade/PKGBUILD
index 78719af83..f5cdb38b7 100644
--- a/extra/jade/PKGBUILD
+++ b/extra/jade/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=9
 _debpatch=47.3
 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 010494430..fca5d5f1b 100644
--- a/extra/jasper/PKGBUILD
+++ b/extra/jasper/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=jasper
 pkgver=1.900.1
 pkgrel=10
 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')
diff --git a/extra/java-access-bridge/PKGBUILD b/extra/java-access-bridge/PKGBUILD
index 2267ac474..34a6aa91d 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 d7176c22c..fda87ac94 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.15
 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/js/PKGBUILD b/extra/js/PKGBUILD
index 98c2e71ed..08b23ec77 100644
--- a/extra/js/PKGBUILD
+++ b/extra/js/PKGBUILD
@@ -17,6 +17,7 @@ md5sums=('20b6f8f1140ef6e47daa3b16965c9202')
 build() {
   unset CPPFLAGS
   cd mozjs$pkgver/js/src
+
   ./configure --prefix=/usr --with-system-nspr --with-system-ffi \
      --enable-readline --enable-threadsafe
   make
diff --git a/extra/json-c/PKGBUILD b/extra/json-c/PKGBUILD
index 7c6a8139d..a8b67c6ea 100644
--- a/extra/json-c/PKGBUILD
+++ b/extra/json-c/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="A JSON implementation in C"
 url="https://github.com/json-c/json-c/wiki"
 license=(MIT)
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 depends=(glibc)
 options=(!makeflags)
 source=(https://s3.amazonaws.com/${pkgname}_releases/releases/$pkgname-${pkgver}.tar.gz)
diff --git a/extra/json-glib/PKGBUILD b/extra/json-glib/PKGBUILD
index 7872a855a..2758ab0d4 100644
--- a/extra/json-glib/PKGBUILD
+++ b/extra/json-glib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=json-glib
 pkgver=0.16.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/jsoncpp/PKGBUILD b/extra/jsoncpp/PKGBUILD
index 94a3aae2b..9f4411c43 100644
--- a/extra/jsoncpp/PKGBUILD
+++ b/extra/jsoncpp/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=4
 pkgdesc="A JSON C++ library"
 url='http://jsoncpp.sourceforge.net/'
 license=('custom:Public_Domain')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('gcc-libs')
 makedepends=('scons')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-src-${pkgver}.tar.gz")
diff --git a/extra/k3b/PKGBUILD b/extra/k3b/PKGBUILD
index 65e55798a..c59768f18 100644
--- a/extra/k3b/PKGBUILD
+++ b/extra/k3b/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=k3b
 pkgver=2.0.2
 pkgrel=9
 pkgdesc="Feature-rich and easy to handle CD burning application"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 url="http://sourceforge.net/projects/k3b/"
 license=('GPL')
 depends=('kdebase-runtime' 'libkcddb' 'libsamplerate' 'libmad'
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index 409d7de1c..4af2167a4 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kactivities
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='API for using and interacting with the Activity Manager'
 url='https://projects.kde.org/projects/kde/kdelibs/kactivities'
 license=('GPL' 'FDL')
diff --git a/extra/kaffeine/PKGBUILD b/extra/kaffeine/PKGBUILD
index 5bad851f1..0d44e0aa3 100644
--- a/extra/kaffeine/PKGBUILD
+++ b/extra/kaffeine/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2.2
 pkgrel=3
 pkgdesc='KDE media player'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kaffeine.kde.org"
 depends=('kdebase-runtime' 'xine-lib')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index 855300dde..d57cb268d 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kdeaccessibility-jovie
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A text to speech application'
 url='http://kde.org/applications/utilities/jovie/'
 license=('GPL' 'FDL')
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index 0715a6d79..781731a4f 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kdeaccessibility-kaccessible
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Provides accessibility services like focus tracking and a screenreader'
 url='https://projects.kde.org/projects/kde/kdeaccessibility/kaccessible'
 license=('GPL' 'FDL')
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index 82723c4c4..257b47d0c 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kdeaccessibility-kmag
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Screen Magnifier'
 url='http://kde.org/applications/utilities/kmag/'
 license=('GPL' 'FDL')
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index 698db48ce..0438dede8 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kdeaccessibility-kmousetool
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
 url='http://kde.org/applications/utilities/kmousetool/'
 license=('GPL' 'FDL')
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index 813ad122c..1a8eeb1ea 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kdeaccessibility-kmouth
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='Speech Synthesizer Frontend'
 url='http://kde.org/applications/utilities/kmouth/'
 license=('GPL' 'FDL')
diff --git a/extra/kdeadmin-kcron/PKGBUILD b/extra/kdeadmin-kcron/PKGBUILD
index 96c01824d..6d939997b 100644
--- a/extra/kdeadmin-kcron/PKGBUILD
+++ b/extra/kdeadmin-kcron/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Configure and schedule tasks'
 url='http://userbase.kde.org/KCron'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
 depends=('kdebase-runtime')
diff --git a/extra/kdeadmin-ksystemlog/PKGBUILD b/extra/kdeadmin-ksystemlog/PKGBUILD
index 15477a837..693231fde 100644
--- a/extra/kdeadmin-ksystemlog/PKGBUILD
+++ b/extra/kdeadmin-ksystemlog/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='System log viewer tool'
 url='http://kde.org/applications/system/ksystemlog/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
 depends=('kdebase-runtime')
diff --git a/extra/kdeadmin-kuser/PKGBUILD b/extra/kdeadmin-kuser/PKGBUILD
index 0e1dc09d6..038bf4fd3 100644
--- a/extra/kdeadmin-kuser/PKGBUILD
+++ b/extra/kdeadmin-kuser/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='User Manager'
 url='http://kde.org/applications/system/kuser/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeadmin')
 depends=('kdebase-runtime' 'kdepimlibs')
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 8d8fdcb78..68aeae974 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('kdeartwork-colorschemes'
          'kdeartwork-weatherwallpapers')
 pkgver=4.12.2
 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 fd0d0b6f3..d9e45cd74 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=kdebase-konsole
 pkgver=4.12.2
 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-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 90b77805d..195f3dab1 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=4.11.6
 _pkgver=4.12.2
 pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kde-workspace'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index ec309044d..f5302008f 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -9,12 +9,11 @@ pkgname=('kdebase-dolphin'
          'kdebase-keditbookmarks'
          'kdebase-kfind'
          'kdebase-konq-plugins'
-         'kdebase-konqueror'
          'kdebase-lib'
          'kdebase-plasma')
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdebase')
@@ -97,20 +96,6 @@ package_kdebase-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=()
diff --git a/extra/kdebase/kdebase-konqueror.install b/extra/kdebase/kdebase-konqueror.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/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/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index 3d5c4428e..07488a8e0 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Ruby bindings for libraries created by the KDE community"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
-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 c5b270890..6af2d96a3 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('kdebindings-kross-python'
 pkgver=4.12.2
 pkgrel=1
 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index c51fd619c..83c64cf95 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Perl bindings for the KDE libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
-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 82db995f2..cdf1f1f91 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Perl bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
-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 ad275c63a..93428c6db 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('kdebindings-python'
 pkgver=4.12.2
 pkgrel=1
 url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4'
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 9ec1e9c85..afd425200 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Ruby bindings for the Qt libraries"
 url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokeqt' 'ruby')
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index fc34c7cc6..d1ddd89bc 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A general purpose C++ parser with a plugin infrastructure"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
-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 ceb6ca721..3a106292f 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Language independent library for KDE bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
-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 16fd72929..f47f8327d 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Language independent library for Qt bindings"
 url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kdebindings')
 depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index 5e7e5b7ed..d9fa90ef9 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A library to add mathematical features to your program"
 url="https://projects.kde.org/projects/kde/kdeedu/analitza"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
 depends=('kdebase-runtime' 'glu')
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index 08e9eb893..ab1879f8d 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 b66d30212..9022b7480 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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' 'kdeedu-analitza' 'libqalculate')
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index f92f6a0b1..621eeb1f5 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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' 'kdeedu-analitza')
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index acb63e668..0fa973f1b 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data')
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 2e029c515..962d34185 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 f7023baba..db62fc136 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 3d6ee92b3..d080ef44f 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 6e6bcb11d..41505e342 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 06f55cf73..8b8c22b1b 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 36e8773c1..a22a65b2d 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 0fe2c6de7..dbe4f203c 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 afe4c931c..04f4b6031 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 bb05b5d07..133c912da 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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' 'wcslib' 'libindi')
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index 393babd06..45c3f5a2f 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 605163cc7..c5c82532b 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 b7dd05c3c..c8c4ed3be 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 fabe6be8b..6302d3311 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD
index 992ec8c0b..1c9227e39 100644
--- a/extra/kdeedu-pairs/PKGBUILD
+++ b/extra/kdeedu-pairs/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A memory and pairs game for KDE"
 url="https://projects.kde.org/projects/kde/kdeedu/pairs"
-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 fefe8bda7..2b0d2437f 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 318c98f42..4ca1767b1 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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')
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index 1f0a147c5..5ca525d9c 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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')
diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD
index 3fa194164..c8412476e 100644
--- a/extra/kdegames-bomber/PKGBUILD
+++ b/extra/kdegames-bomber/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A single player arcade game"
 url="http://kde.org/applications/games/bomber/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD
index f6fbc3a1d..bb0b78aea 100644
--- a/extra/kdegames-bovo/PKGBUILD
+++ b/extra/kdegames-bovo/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A Gomoku like game for two players"
 url="http://kde.org/applications/games/bovo/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD
index dceb8b6aa..fb63b89ea 100644
--- a/extra/kdegames-granatier/PKGBUILD
+++ b/extra/kdegames-granatier/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A clone of the classic Bomberman game"
 url="http://kde.org/applications/games/granatier/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD
index 9a4b618af..90169ff33 100644
--- a/extra/kdegames-kapman/PKGBUILD
+++ b/extra/kdegames-kapman/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A clone of the well known game Pac-Man"
 url="http://kde.org/applications/games/kapman/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD
index 294649941..989f0ab61 100644
--- a/extra/kdegames-katomic/PKGBUILD
+++ b/extra/kdegames-katomic/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A fun and educational game built around molecular geometry"
 url="http://kde.org/applications/games/katomic/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD
index 18155fa7c..f94ebd035 100644
--- a/extra/kdegames-kblackbox/PKGBUILD
+++ b/extra/kdegames-kblackbox/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A game of hide and seek played on a grid of boxes"
 url="http://kde.org/applications/games/kblackbox/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD
index 805341473..fbdc92b92 100644
--- a/extra/kdegames-kblocks/PKGBUILD
+++ b/extra/kdegames-kblocks/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="The classic falling blocks game"
 url="http://kde.org/applications/games/kblocks/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD
index d704bf64f..91bf3a667 100644
--- a/extra/kdegames-kbounce/PKGBUILD
+++ b/extra/kdegames-kbounce/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A single player arcade game with the elements of puzzle"
 url="http://kde.org/applications/games/kbounce/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD
index 7de55fae5..169191c03 100644
--- a/extra/kdegames-kbreakout/PKGBUILD
+++ b/extra/kdegames-kbreakout/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A Breakout-like game"
 url="http://kde.org/applications/games/kbreakout/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD
index 4ebfab934..544a2c04b 100644
--- a/extra/kdegames-kdiamond/PKGBUILD
+++ b/extra/kdegames-kdiamond/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A single player puzzle game"
 url="http://kde.org/applications/games/kdiamond/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD
index bab49c22d..b0dfab436 100644
--- a/extra/kdegames-kfourinline/PKGBUILD
+++ b/extra/kdegames-kfourinline/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A four-in-a-row game"
 url="http://kde.org/applications/games/kfourinline/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD
index ba10ad887..b49810ab8 100644
--- a/extra/kdegames-kgoldrunner/PKGBUILD
+++ b/extra/kdegames-kgoldrunner/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A game of action and puzzle solving"
 url="http://kde.org/applications/games/kgoldrunner/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD
index 12bcf8ec2..00e8c3a3d 100644
--- a/extra/kdegames-kigo/PKGBUILD
+++ b/extra/kdegames-kigo/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="An open-source implementation of the popular Go game"
 url="http://kde.org/applications/games/kigo/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames' 'gnugo')
diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD
index 53c65db7a..82c944f19 100644
--- a/extra/kdegames-killbots/PKGBUILD
+++ b/extra/kdegames-killbots/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A simple game of evading killer robots"
 url="http://kde.org/applications/games/killbots/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD
index 36881e8a3..18937b3cc 100644
--- a/extra/kdegames-kiriki/PKGBUILD
+++ b/extra/kdegames-kiriki/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="An addictive and fun dice game"
 url="http://kde.org/applications/games/kiriki/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD
index dc504038a..dd3913285 100644
--- a/extra/kdegames-kjumpingcube/PKGBUILD
+++ b/extra/kdegames-kjumpingcube/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A simple tactical game"
 url="http://kde.org/applications/games/kjumpingcube/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD
index b58a2da5b..0c902a521 100644
--- a/extra/kdegames-klickety/PKGBUILD
+++ b/extra/kdegames-klickety/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="An adaptation of the Clickomania game"
 url="http://kde.org/applications/games/klickety/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD
index bf14b097e..7643ee911 100644
--- a/extra/kdegames-klines/PKGBUILD
+++ b/extra/kdegames-klines/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A simple but highly addictive, one player game"
 url="http://kde.org/applications/games/klines/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD
index 5c9ce9e08..3f62a6c92 100644
--- a/extra/kdegames-kmahjongg/PKGBUILD
+++ b/extra/kdegames-kmahjongg/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A tile matching game for one or two players"
 url="http://kde.org/applications/games/kmahjongg/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames')
diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD
index 58782c950..b70f8568b 100644
--- a/extra/kdegames-kmines/PKGBUILD
+++ b/extra/kdegames-kmines/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="The classic Minesweeper game"
 url="http://kde.org/applications/games/kmines/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD
index e2291a45a..f3b991d83 100644
--- a/extra/kdegames-knavalbattle/PKGBUILD
+++ b/extra/kdegames-knavalbattle/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A ship sinking game"
 url="http://kde.org/applications/games/knavalbattle/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD
index cb5f5cb83..80cd4ac47 100644
--- a/extra/kdegames-knetwalk/PKGBUILD
+++ b/extra/kdegames-knetwalk/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Connect all the terminals to the server, in as few turns as possible"
 url="http://kde.org/applications/games/knetwalk/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD
index 2116e766d..2caa82787 100644
--- a/extra/kdegames-kolf/PKGBUILD
+++ b/extra/kdegames-kolf/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A miniature golf game with 2d top-down view"
 url="http://kde.org/applications/games/kolf/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD
index 809a08997..dc7ded5d5 100644
--- a/extra/kdegames-kollision/PKGBUILD
+++ b/extra/kdegames-kollision/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A simple ball dodging game"
 url="http://kde.org/applications/games/kollision/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD
index 4706e1663..ccd06d27b 100644
--- a/extra/kdegames-konquest/PKGBUILD
+++ b/extra/kdegames-konquest/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="The KDE version of Gnu-Lactic"
 url="http://kde.org/applications/games/konquest/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD
index d900e24e5..de4a92050 100644
--- a/extra/kdegames-kpatience/PKGBUILD
+++ b/extra/kdegames-kpatience/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Offers a selection of solitaire card games"
 url="http://kde.org/applications/games/kpat/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD
index 29680c195..85220b894 100644
--- a/extra/kdegames-kreversi/PKGBUILD
+++ b/extra/kdegames-kreversi/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A simple one player strategy game played against the computer"
 url="http://kde.org/applications/games/kreversi/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD
index 0582459f0..308293170 100644
--- a/extra/kdegames-kshisen/PKGBUILD
+++ b/extra/kdegames-kshisen/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles"
 url="http://kde.org/applications/games/kshisen/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg')
diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD
index 8309fb283..62882ec31 100644
--- a/extra/kdegames-ksirk/PKGBUILD
+++ b/extra/kdegames-ksirk/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A computerized version of a well known strategy game"
 url="http://kde.org/applications/games/ksirk/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD
index 5f658d97f..2b0a058e3 100644
--- a/extra/kdegames-ksnakeduel/PKGBUILD
+++ b/extra/kdegames-ksnakeduel/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A simple snake duel game"
 url="http://kde.org/applications/games/ksnakeduel/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD
index 76b3bdb22..fc92ba08b 100644
--- a/extra/kdegames-kspaceduel/PKGBUILD
+++ b/extra/kdegames-kspaceduel/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun"
 url="http://kde.org/applications/games/kspaceduel/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD
index a0306e9c1..b20e5b850 100644
--- a/extra/kdegames-ksquares/PKGBUILD
+++ b/extra/kdegames-ksquares/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes"
 url="http://kde.org/applications/games/ksquares/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD
index 41809b66e..5bb602cf8 100644
--- a/extra/kdegames-ksudoku/PKGBUILD
+++ b/extra/kdegames-ksudoku/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A logic-based symbol placement puzzle"
 url="http://kde.org/applications/games/ksudoku/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames' 'glu')
diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD
index 46763a649..d4c874e51 100644
--- a/extra/kdegames-ktuberling/PKGBUILD
+++ b/extra/kdegames-ktuberling/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A simple constructor game suitable for children and adults alike"
 url="http://kde.org/applications/games/ktuberling/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD
index d4cec5781..e7b168975 100644
--- a/extra/kdegames-kubrick/PKGBUILD
+++ b/extra/kdegames-kubrick/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Based on the famous Rubik's Cube"
 url="http://kde.org/applications/games/kubrick/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames' 'glu')
diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD
index dbe33477a..428a8e456 100644
--- a/extra/kdegames-lskat/PKGBUILD
+++ b/extra/kdegames-lskat/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Lieutenant Skat is a fun and engaging card game for two players"
 url="http://kde.org/applications/games/lskat/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD
index 2a84ccff8..926234175 100644
--- a/extra/kdegames-palapeli/PKGBUILD
+++ b/extra/kdegames-palapeli/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A single-player jigsaw puzzle game"
 url="http://kde.org/applications/games/palapeli/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames' 'qhull')
diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD
index 36e57cd06..5526c6c44 100644
--- a/extra/kdegames-picmi/PKGBUILD
+++ b/extra/kdegames-picmi/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A nonogram logic game for KDE"
 url="http://kde.org/applications/games/picmi/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdegames')
 depends=('kdebase-runtime' 'libkdegames')
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index 5137cf575..bb842d5df 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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' 'kdebase-runtime' 'libkipi' 'lcms2')
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 5f70b50ab..a6bcddd6d 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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' 'libgphoto2')
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index 0e4ce20bb..c9c56ec47 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 f1b30eb55..3e91df2a8 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 dab3247e8..498abeb03 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 f1275442f..0309223a3 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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 c97ed05f2..2a31394c7 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A scan plugin that implements the scanning"
 url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
-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 28853f406..43ee158cc 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 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=('kdebase-runtime' 'libkipi')
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index a4e988ea0..60ac46392 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
-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 4d3e4a529..3e382b7af 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdegraphics-okular
 pkgver=4.12.2
 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 281c3c11b..ec62f8323 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Strigi analyzers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
-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 92d04c575..7f7efb5d7 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A KPart for viewing SVGs"
 url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
-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 e8197dfbf..a13a3cca9 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Thumbnailers for various graphics file formats"
 url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('libkexiv2' 'libkdcraw')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD
index 7bec962c6..b73239227 100644
--- a/extra/kdemultimedia-audiocd-kio/PKGBUILD
+++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Kioslave for accessing audio CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('libkcddb' 'libkcompactdisc' 'lame' 'cdparanoia')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD
index 02416aa9c..ce87339eb 100644
--- a/extra/kdemultimedia-dragonplayer/PKGBUILD
+++ b/extra/kdemultimedia-dragonplayer/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="A multimedia player where the focus is on simplicity, instead of
 features"
 url='http://kde.org/applications/multimedia/dragonplayer/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 depends=('kdebase-runtime')
diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
index 68e8609ef..8127d5cc2 100644
--- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='FFmpeg-based thumbnail creator for video files'
 url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 depends=('kdelibs' 'ffmpeg')
diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD
index 2b59efaa7..40f017a56 100644
--- a/extra/kdemultimedia-juk/PKGBUILD
+++ b/extra/kdemultimedia-juk/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='A jukebox, tagger and music collection manager'
 url='http://kde.org/applications/multimedia/juk/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 depends=('kdebase-runtime' 'taglib')
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index 626e32c53..f738d6759 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="KDE volume control program"
 url='http://kde.org/applications/multimedia/kmix/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 depends=('kdebase-runtime')
diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD
index f20de66fb..f9123ffc9 100644
--- a/extra/kdemultimedia-kscd/PKGBUILD
+++ b/extra/kdemultimedia-kscd/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="KDE CD player"
 url='http://kde.org/applications/multimedia/kscd/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 depends=('kdebase-runtime' 'libmusicbrainz3')
diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
index aaaa403a9..e3c6361c3 100644
--- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD
+++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="MPlayer based thumbnail generator for video files"
 url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 groups=('kde' 'kdemultimedia')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'mplayer')
diff --git a/extra/kdenetwork-filesharing/PKGBUILD b/extra/kdenetwork-filesharing/PKGBUILD
index b6f0923f2..b7ad8815f 100644
--- a/extra/kdenetwork-filesharing/PKGBUILD
+++ b/extra/kdenetwork-filesharing/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Properties dialog plugin to share a directory with the local network'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-filesharing'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime' 'smbclient')
diff --git a/extra/kdenetwork-kdnssd/PKGBUILD b/extra/kdenetwork-kdnssd/PKGBUILD
index e1f041647..637b0e9f7 100644
--- a/extra/kdenetwork-kdnssd/PKGBUILD
+++ b/extra/kdenetwork-kdnssd/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Monitors the network for DNS-SD services'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdnssd'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime')
diff --git a/extra/kdenetwork-kget/PKGBUILD b/extra/kdenetwork-kget/PKGBUILD
index 5de90753d..465882824 100644
--- a/extra/kdenetwork-kget/PKGBUILD
+++ b/extra/kdenetwork-kget/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Download Manager'
 url='http://kde.org/applications/internet/kget/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms' 'gpgme' 'nepomuk-widgets')
diff --git a/extra/kdenetwork-kppp/PKGBUILD b/extra/kdenetwork-kppp/PKGBUILD
index 1f33da6a3..1fa1888e0 100644
--- a/extra/kdenetwork-kppp/PKGBUILD
+++ b/extra/kdenetwork-kppp/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Internet Dial-Up Tool'
 url='http://kde.org/applications/internet/kppp/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime' 'ppp')
diff --git a/extra/kdenetwork-krdc/PKGBUILD b/extra/kdenetwork-krdc/PKGBUILD
index ae44ff079..e968e8d53 100644
--- a/extra/kdenetwork-krdc/PKGBUILD
+++ b/extra/kdenetwork-krdc/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Remote Desktop Client'
 url='http://kde.org/applications/internet/krdc/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime' 'telepathy-qt')
diff --git a/extra/kdenetwork-krfb/PKGBUILD b/extra/kdenetwork-krfb/PKGBUILD
index f5409ad02..24a968a80 100644
--- a/extra/kdenetwork-krfb/PKGBUILD
+++ b/extra/kdenetwork-krfb/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Desktop Sharing'
 url='http://www.kde.org/applications/system/krfb'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 # note on libxdamage:
diff --git a/extra/kdenetwork-strigi-analyzers/PKGBUILD b/extra/kdenetwork-strigi-analyzers/PKGBUILD
index bbc7b9845..32d8b19e3 100644
--- a/extra/kdenetwork-strigi-analyzers/PKGBUILD
+++ b/extra/kdenetwork-strigi-analyzers/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Strigi analyzers for various network protocols'
 url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-strigi-analyzers'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdenetwork')
 depends=('kdebase-runtime')
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 0c201c27b..41965278c 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kdepim-runtime
 pkgver=4.12.2
 pkgrel=1
 pkgdesc='Extends the functionality of kdepim'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdepim-runtime'
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'libkgapi' 'libkolab' 'libkfbapi')
diff --git a/extra/kdepim/kdepim-akregator.install b/extra/kdepim/kdepim-akregator.install
deleted file mode 100644
index 5787df72f..000000000
--- a/extra/kdepim/kdepim-akregator.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdepim/kdepim-kleopatra.install b/extra/kdepim/kdepim-kleopatra.install
deleted file mode 100644
index 5787df72f..000000000
--- a/extra/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/extra/kdepim/kdepim-kmail.install b/extra/kdepim/kdepim-kmail.install
deleted file mode 100644
index 5787df72f..000000000
--- a/extra/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/extra/kdepim/kdepim-knode.install b/extra/kdepim/kdepim-knode.install
deleted file mode 100644
index 5787df72f..000000000
--- a/extra/kdepim/kdepim-knode.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdepim/kdepim-korganizer.install b/extra/kdepim/kdepim-korganizer.install
deleted file mode 100644
index 5787df72f..000000000
--- a/extra/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/extra/kdepim/kdepim-ktnef.install b/extra/kdepim/kdepim-ktnef.install
deleted file mode 100644
index 5787df72f..000000000
--- a/extra/kdepim/kdepim-ktnef.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdepim/kdepim.install b/extra/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/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/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index 7aa135427..106e1e4ed 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kdepimlibs
 pkgver=4.12.2
 pkgrel=1
 pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdepimlibs'
 license=('GPL' 'LGPL')
 depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson')
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index bac0b64e6..92e030af8 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -79,7 +79,7 @@ pkgname=('kdeplasma-addons-applets-bball'
          'kdeplasma-addons-wallpapers-weather')
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdeplasma-addons'
 license=('GPL' 'LGPL')
 groups=('kde' 'kdeplasma-addons')
diff --git a/extra/kdesdk-cervisia/PKGBUILD b/extra/kdesdk-cervisia/PKGBUILD
index 5204163f1..fff2cdb0b 100644
--- a/extra/kdesdk-cervisia/PKGBUILD
+++ b/extra/kdesdk-cervisia/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='CVS Frontend'
 url='http://kde.org/applications/development/cervisia/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
diff --git a/extra/kdesdk-dev-scripts/PKGBUILD b/extra/kdesdk-dev-scripts/PKGBUILD
index 2560a9d44..25ee72201 100644
--- a/extra/kdesdk-dev-scripts/PKGBUILD
+++ b/extra/kdesdk-dev-scripts/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Scripts and setting files useful during development of KDE software'
 url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'python2')
diff --git a/extra/kdesdk-dev-utils/PKGBUILD b/extra/kdesdk-dev-utils/PKGBUILD
index 80894231c..735f6c7cd 100644
--- a/extra/kdesdk-dev-utils/PKGBUILD
+++ b/extra/kdesdk-dev-utils/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks'
 url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
diff --git a/extra/kdesdk-dolphin-plugins/PKGBUILD b/extra/kdesdk-dolphin-plugins/PKGBUILD
index 79b78d4de..b9c9d75c1 100644
--- a/extra/kdesdk-dolphin-plugins/PKGBUILD
+++ b/extra/kdesdk-dolphin-plugins/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Extra Dolphin plugins'
 url='https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'kdebase-lib')
diff --git a/extra/kdesdk-kapptemplate/PKGBUILD b/extra/kdesdk-kapptemplate/PKGBUILD
index 0893cff07..8b398e6b0 100644
--- a/extra/kdesdk-kapptemplate/PKGBUILD
+++ b/extra/kdesdk-kapptemplate/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='KDE Template Generator'
 url='http://kde.org/applications/development/kapptemplate/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 7f11f0907..4e23493da 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('kdebase-katepart'
          'kdesdk-kate')
 pkgver=4.12.2
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
 source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
diff --git a/extra/kdesdk-kcachegrind/PKGBUILD b/extra/kdesdk-kcachegrind/PKGBUILD
index fa3971594..5d89e3f6d 100644
--- a/extra/kdesdk-kcachegrind/PKGBUILD
+++ b/extra/kdesdk-kcachegrind/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Visualization of Performance Profiling Data'
 url='http://kde.org/applications/development/kcachegrind/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'python2')
diff --git a/extra/kdesdk-kioslaves/PKGBUILD b/extra/kdesdk-kioslaves/PKGBUILD
index d0a48f867..71a247cb3 100644
--- a/extra/kdesdk-kioslaves/PKGBUILD
+++ b/extra/kdesdk-kioslaves/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='KIO-Slaves'
 url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'subversion')
diff --git a/extra/kdesdk-kompare/PKGBUILD b/extra/kdesdk-kompare/PKGBUILD
index 8840f11de..23583580b 100644
--- a/extra/kdesdk-kompare/PKGBUILD
+++ b/extra/kdesdk-kompare/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Diff/Patch Frontend'
 url='http://kde.org/applications/development/kompare/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'libkomparediff2')
diff --git a/extra/kdesdk-lokalize/PKGBUILD b/extra/kdesdk-lokalize/PKGBUILD
index bdb9545d5..6e5cb1219 100644
--- a/extra/kdesdk-lokalize/PKGBUILD
+++ b/extra/kdesdk-lokalize/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Computer-Aided Translation System'
 url='http://kde.org/applications/development/lokalize/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzers')
diff --git a/extra/kdesdk-okteta/PKGBUILD b/extra/kdesdk-okteta/PKGBUILD
index e703736ba..3867a1b8c 100644
--- a/extra/kdesdk-okteta/PKGBUILD
+++ b/extra/kdesdk-okteta/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Hex Editor'
 url='http://kde.org/applications/utilities/okteta/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD
index c5d60168d..084842073 100644
--- a/extra/kdesdk-poxml/PKGBUILD
+++ b/extra/kdesdk-poxml/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Translates DocBook XML files using gettext po files'
 url='https://projects.kde.org/projects/kde/kdesdk/poxml'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdelibs')
diff --git a/extra/kdesdk-strigi-analyzers/PKGBUILD b/extra/kdesdk-strigi-analyzers/PKGBUILD
index 5bbef4e8f..efee7facc 100644
--- a/extra/kdesdk-strigi-analyzers/PKGBUILD
+++ b/extra/kdesdk-strigi-analyzers/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Analyzer plugins for strigi'
 url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
diff --git a/extra/kdesdk-thumbnailers/PKGBUILD b/extra/kdesdk-thumbnailers/PKGBUILD
index 2ab70a594..5d39f96b9 100644
--- a/extra/kdesdk-thumbnailers/PKGBUILD
+++ b/extra/kdesdk-thumbnailers/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Plugins for the thumbnailing system'
 url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-thumbnailers'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
diff --git a/extra/kdesdk-umbrello/PKGBUILD b/extra/kdesdk-umbrello/PKGBUILD
index c2cdb0edd..e1b6f3a77 100644
--- a/extra/kdesdk-umbrello/PKGBUILD
+++ b/extra/kdesdk-umbrello/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='UML Modeller'
 url='http://kde.org/applications/development/umbrello/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdesdk')
 depends=('kdebase-runtime')
diff --git a/extra/kdetoys-amor/PKGBUILD b/extra/kdetoys-amor/PKGBUILD
index b865f7a90..96fecf3b7 100644
--- a/extra/kdetoys-amor/PKGBUILD
+++ b/extra/kdetoys-amor/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='On-Screen Creature'
 url='https://projects.kde.org/projects/kde/kdetoys/amor'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 depends=('kdebase-runtime')
diff --git a/extra/kdetoys-kteatime/PKGBUILD b/extra/kdetoys-kteatime/PKGBUILD
index b8b434fd6..21ba81918 100644
--- a/extra/kdetoys-kteatime/PKGBUILD
+++ b/extra/kdetoys-kteatime/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Tea Cooker'
 url='http://kde.org/applications/games/kteatime/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 depends=('kdebase-runtime')
diff --git a/extra/kdetoys-ktux/PKGBUILD b/extra/kdetoys-ktux/PKGBUILD
index 280de1876..76ae7a33b 100644
--- a/extra/kdetoys-ktux/PKGBUILD
+++ b/extra/kdetoys-ktux/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='A Tux-in-a-spaceship screen saver'
 url='https://projects.kde.org/projects/kde/kdetoys/ktux'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdetoys')
 depends=('kdebase-workspace')
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index 4957962d4..f51b297d0 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='View disk usage information'
 url='http://kde.org/applications/utilities/filelight'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index 5bad273b9..06050b674 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Scientific Calculator'
 url='http://kde.org/applications/utilities/kcalc/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index eaeea89c9..525f89769 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Character Selector'
 url="http://kde.org/applications/utilities/kcharselect/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index e108e1535..53a5a4ecc 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdeutils-kdf
 pkgver=4.12.2
 pkgrel=1
 url="http://kde.org/applications/system/kdiskfree/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='View Disk Usage'
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index 3c3f20e14..0b369756a 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Floppy Formatter'
 url='http://kde.org/applications/utilities/kfloppy/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index 969d5af07..ba6fe8d32 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='A GnuPG frontend'
 url='http://kde.org/applications/utilities/kgpg/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent')
 makedepends=('cmake' 'automoc4' 'boost')
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index 45d05f76b..6c1d213a2 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Configure your remote controls for use with applications'
 url='http://kde.org/applications/utilities/kremotecontrol/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index 455743503..08006a8b5 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Countdown Launcher'
 url='http://kde.org/applications/utilities/ktimer/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index 2304d0c4d..58ced5d23 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='Wallet Management Tool'
 url='http://kde.org/applications/system/kwalletmanager/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD
index f25fe1d5a..769b784c3 100644
--- a/extra/kdeutils-print-manager/PKGBUILD
+++ b/extra/kdeutils-print-manager/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdeutils-print-manager
 pkgver=4.12.2
 pkgrel=1
 pkgdesc="A tool for managing print jobs and printers"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kde/kdeutils/print-manager'
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-workspace' 'libcups')
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index 6923ce35e..894c7b16f 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='An engine for cool desktop eyecandy'
 url='http://kde.org/applications/utilities/superkaramba/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime' 'qimageblitz')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index 452815ae9..ca8c71325 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc='System Cleaner'
 url='http://kde.org/applications/utilities/sweeper'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/kdevelop-pg-qt/PKGBUILD b/extra/kdevelop-pg-qt/PKGBUILD
index 0a65a0113..0f4f472d3 100644
--- a/extra/kdevelop-pg-qt/PKGBUILD
+++ b/extra/kdevelop-pg-qt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdevelop-pg-qt
 pkgver=1.0.0
 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=('kdelibs')
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index 6cb261a09..3654d030a 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.6.0
 _pkgver=4.6.0
 pkgrel=1
 pkgdesc="PHP language and documentation plugin for KDevelop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
 depends=('kdevelop')
diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD
index 64e694333..fc48657db 100644
--- a/extra/kdevelop-python/PKGBUILD
+++ b/extra/kdevelop-python/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.6.0
 _pkgver=4.6.0
 pkgrel=1
 pkgdesc="Python language and documentation plugin for KDevelop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kdevelop.org/"
 license=('GPL')
 depends=('kdevelop')
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index cd7a59987..93d1c0e74 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kdevelop
 pkgver=4.6.0
 pkgrel=1
 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' 'kdebase-katepart')
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index 4c8fcfddb..75a08932f 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.6.0
 _pkgver=4.6.0
 pkgrel=1
 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 a518ac0ed..1cadca38a 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('kdewebdev-kfilereplace'
          'kdewebdev-kommander')
 pkgver=4.12.2
 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 8f6f601c0..1c5bd164e 100644
--- a/extra/kdiff3/PKGBUILD
+++ b/extra/kdiff3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kdiff3
 pkgver=0.9.97
 pkgrel=2
 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 740569631..da57ba6e0 100644
--- a/extra/kexec-tools/PKGBUILD
+++ b/extra/kexec-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kexec-tools
 pkgver=2.0.4
 pkgrel=2
 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=("ftp://ftp.archlinux.org/other/kexec-tools/kexec-tools-${pkgver}.tar.bz2"
         # upstream tarballs broken with bsdtar!
diff --git a/extra/kismet/PKGBUILD b/extra/kismet/PKGBUILD
index 71d7c62c8..b06e04747 100644
--- a/extra/kismet/PKGBUILD
+++ b/extra/kismet/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2013_03_R1b
 _realver="${pkgver//_/-}"
 pkgrel=2
 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=('libpcap' 'pcre' 'bluez-libs' 'libcap')
@@ -32,7 +32,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 ab6d8db27..b8be491ce 100644
--- a/extra/kobodeluxe/PKGBUILD
+++ b/extra/kobodeluxe/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=kobodeluxe
 pkgver=0.5.1
 pkgrel=4
 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=('sdl_image' 'hicolor-icon-theme' 'gtk-update-icon-cache')
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index 0bffe4ab7..479ccf42d 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=konversation
 pkgver=1.5
 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')
 makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml' 'optipng')
diff --git a/extra/kscreen/PKGBUILD b/extra/kscreen/PKGBUILD
index 38b1af7e8..8da9942fb 100644
--- a/extra/kscreen/PKGBUILD
+++ b/extra/kscreen/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=kscreen
 pkgver=1.0.2.1
 pkgrel=1
 pkgdesc="KDE's screen management software"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/kscreen'
 license=('GPL' 'LGPL')
 depends=('kdebase-runtime' 'libkscreen')
diff --git a/extra/ktorrent/PKGBUILD b/extra/ktorrent/PKGBUILD
index ab0e6ba2d..9c937510e 100644
--- a/extra/ktorrent/PKGBUILD
+++ b/extra/ktorrent/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ktorrent
 pkgver=4.3.1
 pkgrel=2
 pkgdesc="A powerful BitTorrent client for KDE"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://ktorrent.pwsp.net/'
 license=('GPL2')
 depends=('libktorrent' 'kdebase-runtime' 'taglib')
diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD
index aeae8d6c2..9369118e6 100644
--- a/extra/kwebkitpart/PKGBUILD
+++ b/extra/kwebkitpart/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.3.3
 pkgrel=2
 pkgdesc="A WebKit browser component for KDE"
 url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/lablgtk2/PKGBUILD b/extra/lablgtk2/PKGBUILD
index 2c7f732e4..54680c0ee 100644
--- a/extra/lablgtk2/PKGBUILD
+++ b/extra/lablgtk2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lablgtk2
 pkgver=2.16.0
 pkgrel=5
 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 4885aaa34..596c6104e 100644
--- a/extra/ladspa/PKGBUILD
+++ b/extra/ladspa/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=ladspa
 pkgver=1.13
-pkgrel=4
+pkgrel=4.1
 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/lame/PKGBUILD b/extra/lame/PKGBUILD
index 6f5ffde79..9d034a627 100644
--- a/extra/lame/PKGBUILD
+++ b/extra/lame/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lame
 pkgver=3.99.5
 pkgrel=2
 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://lame.sourceforge.net/"
 depends=('ncurses')
 makedepends=('nasm')
diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD
index c2bb7e82a..3d8e7ffe9 100644
--- a/extra/lapack/PKGBUILD
+++ b/extra/lapack/PKGBUILD
@@ -12,7 +12,7 @@ url="http://www.netlib.org/lapack"
 pkgdesc="Linear Algebra PACKage"
 makedepends=('gcc-fortran' 'cmake')
 depends=('gcc-libs')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=("custom")
 source=(http://www.netlib.org/${pkgbase}/${pkgbase}-${pkgver}.tgz
         LICENSE.blas)
diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD
index 2e3ca4de9..36e03da89 100644
--- a/extra/latex2rtf/PKGBUILD
+++ b/extra/latex2rtf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=latex2rtf
 pkgver=2.3.3
 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/lcms/PKGBUILD b/extra/lcms/PKGBUILD
index 3a6e6b248..2017ee8b5 100644
--- a/extra/lcms/PKGBUILD
+++ b/extra/lcms/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lcms
 pkgver=1.19
 pkgrel=5
 pkgdesc="Lightweight color management development library/engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('libtiff')
 url="http://www.littlecms.com"
diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD
index 187a1dab6..1cace6db4 100644
--- a/extra/lcms2/PKGBUILD
+++ b/extra/lcms2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lcms2
 pkgver=2.5
 pkgrel=2
 pkgdesc="Small-footprint color management engine, version 2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.littlecms.com"
 license=('MIT')
 depends=('libtiff')
diff --git a/extra/ldb/PKGBUILD b/extra/ldb/PKGBUILD
index e7791be97..bf9471682 100644
--- a/extra/ldb/PKGBUILD
+++ b/extra/ldb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ldb
 pkgver=1.1.16
 pkgrel=1
 pkgdesc="A schema-less, ldap like, API and database"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ldb.samba.org/"
 source=(http://samba.org/ftp/${pkgname}/${pkgname}-${pkgver}.tar.gz)
 license=('GPL3')
diff --git a/extra/leafpad/PKGBUILD b/extra/leafpad/PKGBUILD
index a54bcc40f..334890bfe 100644
--- a/extra/leafpad/PKGBUILD
+++ b/extra/leafpad/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=leafpad
 pkgver=0.8.18.1
-pkgrel=3
+pkgrel=3.1
 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 0db15eecf..f2c082d5c 100644
--- a/extra/lensfun/PKGBUILD
+++ b/extra/lensfun/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lensfun
 pkgver=0.2.8
 pkgrel=1
 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')
@@ -15,6 +15,11 @@ source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
 
 prepare() {
     cd "${srcdir}/${pkgname}-${pkgver}"
+    if [ "$CARCH" = "mips64el" ]; then
+      confflags="--vectorization="
+    else
+      confflags=""
+    fi
     sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure
     # fix configure script for make 4.0
     patch -Np0 -i "${srcdir}/lensfun-0.2.8-make-4.0.patch"
@@ -24,7 +29,7 @@ build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
    ./configure \
         --prefix=/usr \
-        --libdir=/usr/lib
+        --libdir=/usr/lib ${confflags}
     make all
 }
 
diff --git a/extra/lesstif/PKGBUILD b/extra/lesstif/PKGBUILD
index 2ec414b6b..26bd0627a 100644
--- a/extra/lesstif/PKGBUILD
+++ b/extra/lesstif/PKGBUILD
@@ -5,11 +5,12 @@ pkgname=lesstif
 pkgver=0.95.2
 pkgrel=6
 pkgdesc="LGPL'd re-implementation of Motif"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/lesstif/"
 license=('LGPL' 'MIT')
 depends=('freetype2' 'libxt' 'libxp')
-options=('!makeflags' '!buildflags')
+[ "$CARCH" = "mips64el" ] && options=('!makeflags')
+[ "$CARCH" = "mips64el" ] || options=('!makeflags' '!buildflags')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE'
         '040_fedora_XxxxProperty-64bit.diff')
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 98bf838ea..b82bc415d 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lftp
 pkgver=4.4.15
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 depends=('gcc-libs' 'readline' 'gnutls' 'expat' 'sh')
 optdepends=('perl: needed for convert-netscape-cookies and verify-file')
diff --git a/extra/libaccounts-glib/PKGBUILD b/extra/libaccounts-glib/PKGBUILD
index 4fa64cb08..d432c0326 100644
--- a/extra/libaccounts-glib/PKGBUILD
+++ b/extra/libaccounts-glib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libaccounts-glib
 pkgver=1.15
 pkgrel=1
 pkgdesc="Glib-based client library for accessing the online accounts database"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
 depends=('dbus-glib' 'libxml2' 'sqlite')
diff --git a/extra/libaccounts-qt/PKGBUILD b/extra/libaccounts-qt/PKGBUILD
index 80d87533f..eb0bfb56b 100644
--- a/extra/libaccounts-qt/PKGBUILD
+++ b/extra/libaccounts-qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=libaccounts-qt
 pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
 pkgver=1.10
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
 makedepends=('qt4' 'libaccounts-glib' 'doxygen')
diff --git a/extra/libaio/PKGBUILD b/extra/libaio/PKGBUILD
index 500097b37..0e9212586 100644
--- a/extra/libaio/PKGBUILD
+++ b/extra/libaio/PKGBUILD
@@ -4,16 +4,21 @@
 
 pkgname=libaio
 pkgver=0.3.109
+_patchver=${pkgver}-3
 pkgrel=7
 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=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz)
-md5sums=('435a5b16ca6198eaf01155263d855756')
+source=(http://ftp.de.debian.org/debian/pool/main/liba/$pkgname/${pkgname}_${pkgver}.orig.tar.gz
+http://ftp.de.debian.org/debian/pool/main/liba/${pkgname}/${pkgname}_${_patchver}.debian.tar.gz)
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+
+  # Debian patches for extra arches
+  patch -Np1 -i ../debian/patches/00_arches.patch
+
   make
 }
 
@@ -22,3 +27,7 @@ package() {
   make prefix="$pkgdir/usr" install
 }
 
+md5sums=('435a5b16ca6198eaf01155263d855756'
+         'f942fe72127b612b93636387de47001b')
+md5sums=('435a5b16ca6198eaf01155263d855756'
+         '5b0b35888aeaef7f3f69f05813bd69c9')
diff --git a/extra/libao/PKGBUILD b/extra/libao/PKGBUILD
index b90178b57..e32a1f9c0 100644
--- a/extra/libao/PKGBUILD
+++ b/extra/libao/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2.0
 pkgrel=1
 pkgdesc='Cross-platform audio output library and plugins'
 url='http://xiph.org/ao/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('alsa-lib')
 makedepends=('libpulse')
diff --git a/extra/libart-lgpl/PKGBUILD b/extra/libart-lgpl/PKGBUILD
index c6f7c4f17..f375d7904 100644
--- a/extra/libart-lgpl/PKGBUILD
+++ b/extra/libart-lgpl/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.3.21
 pkgrel=3
 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')
 source=(http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${pkgver}.tar.bz2)
 sha256sums=('fdc11e74c10fc9ffe4188537e2b370c0abacca7d89021d4d303afdf7fd7476fa')
diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD
index ee2903698..dda2297e0 100644
--- a/extra/libass/PKGBUILD
+++ b/extra/libass/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libass
 pkgver=0.11.1
 pkgrel=1
 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=('fribidi' 'fontconfig' 'enca' 'harfbuzz')
diff --git a/extra/libasyncns/PKGBUILD b/extra/libasyncns/PKGBUILD
index b4f1ce64a..2604dde50 100644
--- a/extra/libasyncns/PKGBUILD
+++ b/extra/libasyncns/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=libasyncns
 pkgver=0.8
 pkgrel=5
 pkgdesc="A C library for executing name service queries asynchronously"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://0pointer.de/lennart/projects/libasyncns"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/libatasmart/PKGBUILD b/extra/libatasmart/PKGBUILD
index 1c400b8f9..920ad0382 100644
--- a/extra/libatasmart/PKGBUILD
+++ b/extra/libatasmart/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libatasmart
 pkgver=0.19
 pkgrel=2
 pkgdesc="ATA S.M.A.R.T. Reading and Parsing Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('udev')
 url="http://0pointer.de/blog/projects/being-smart.html"
diff --git a/extra/libatomic_ops/PKGBUILD b/extra/libatomic_ops/PKGBUILD
index 58f780beb..4dd4b11c8 100644
--- a/extra/libatomic_ops/PKGBUILD
+++ b/extra/libatomic_ops/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libatomic_ops
 pkgver=7.2.e
 pkgrel=1
 pkgdesc="Provides semi-portable access to hardware provided atomic memory operations"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/ivmai/libatomic_ops"
 depends=('glibc')
 license=('GPL2' 'MIT')
diff --git a/extra/libavc1394/PKGBUILD b/extra/libavc1394/PKGBUILD
index 206ddf25f..8a45812dc 100644
--- a/extra/libavc1394/PKGBUILD
+++ b/extra/libavc1394/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libavc1394
 pkgver=0.5.4
 pkgrel=2
 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 bed209227..defa33a5c 100644
--- a/extra/libbluedevil/PKGBUILD
+++ b/extra/libbluedevil/PKGBUILD
@@ -8,7 +8,7 @@ _pkgver=2.0-rc1
 pkgrel=2
 epoch=1
 pkgdesc='A Qt4 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=('qt4' 'bluez')
diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD
index 434b041cf..4dc7e13ac 100644
--- a/extra/libbluray/PKGBUILD
+++ b/extra/libbluray/PKGBUILD
@@ -7,11 +7,11 @@ pkgname=libbluray
 pkgver=0.5.0
 pkgrel=1
 pkgdesc='Library to access Blu-Ray disks for video playback'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.videolan.org/developers/libbluray.html'
 license=('LGPL2.1')
 depends=('libxml2' 'freetype2')
-source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
+source=(http://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
 md5sums=('04cf15d0f3581a955d3a2ccb9dc06e9e')
 
 build() {
diff --git a/extra/libbonobo/PKGBUILD b/extra/libbonobo/PKGBUILD
index 153464c76..600bac7e2 100644
--- a/extra/libbonobo/PKGBUILD
+++ b/extra/libbonobo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libbonobo
 pkgver=2.32.1
 pkgrel=4
 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' 'popt')
 makedepends=('intltool' 'pkgconfig')
diff --git a/extra/libbonoboui/PKGBUILD b/extra/libbonoboui/PKGBUILD
index acf60a46e..bbd8bc2f0 100644
--- a/extra/libbonoboui/PKGBUILD
+++ b/extra/libbonoboui/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libbonoboui
 pkgver=2.24.5
-pkgrel=2
+pkgrel=2.1
 pkgdesc="User Interface library for Bonobo"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 depends=('libgnomecanvas' 'libgnome')
 makedepends=('intltool' 'pkg-config')
diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD
index cc7b99336..a01c8ad13 100644
--- a/extra/libbsd/PKGBUILD
+++ b/extra/libbsd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libbsd
 pkgver=0.6.0
 pkgrel=2
 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libbsd.freedesktop.org"
 license=('custom')
 depends=('glibc')
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index ff94cfee9..daa26832e 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libburn
 pkgver=1.3.4 # .pl01
 pkgrel=1
 pkgdesc="Library for reading, mastering and writing optical discs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://libburnia-project.org"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/libcaca/PKGBUILD b/extra/libcaca/PKGBUILD
index 6e078f5e2..4e0e37f70 100644
--- a/extra/libcaca/PKGBUILD
+++ b/extra/libcaca/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libcaca
 pkgver=0.99.beta18
 pkgrel=2
 pkgdesc="Color AsCii Art library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:WTFPL')
 url="http://caca.zoy.org/wiki/libcaca"
 depends=('imlib2' 'ncurses')
diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index adfe05c8e..3b5e6e174 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
 pkgrel=4
 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 libltdl alsa-lib tdb sound-theme-freedesktop)
 makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3 git)
diff --git a/extra/libcap-ng/PKGBUILD b/extra/libcap-ng/PKGBUILD
index 8ed9da266..154d7396d 100644
--- a/extra/libcap-ng/PKGBUILD
+++ b/extra/libcap-ng/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcap-ng
 pkgver=0.7.3
 pkgrel=1
 pkgdesc="A library making programming with POSIX capabilities easier than traditional libcap"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' '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 09b8d1ad7..c1e4a03b1 100644
--- a/extra/libcdaudio/PKGBUILD
+++ b/extra/libcdaudio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcdaudio
 pkgver=0.99.12
 pkgrel=7
 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 3f209e824..22abc1cd0 100644
--- a/extra/libcddb/PKGBUILD
+++ b/extra/libcddb/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libcddb
 pkgver=1.3.2
 pkgrel=4
-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-paranoia/PKGBUILD b/extra/libcdio-paranoia/PKGBUILD
index 152b38a90..8f1e86af8 100644
--- a/extra/libcdio-paranoia/PKGBUILD
+++ b/extra/libcdio-paranoia/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcdio-paranoia
 pkgver=10.2+0.90+1
 pkgrel=2
 pkgdesc="CD paranoia libraries from libcdio"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL')
 url="http://www.gnu.org/software/libcdio/"
 depends=('libcdio')
diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD
index cdd9dafc7..c9158ddbe 100644
--- a/extra/libcdio/PKGBUILD
+++ b/extra/libcdio/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcdio
 pkgver=0.92
 pkgrel=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=('libcddb' 'ncurses' 'gcc-libs')
diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD
index 2a194feaa..ff3960e44 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')
 depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite')
 makedepends=('gobject-introspection' 'gtk-doc' 'vala')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/libchewing/PKGBUILD b/extra/libchewing/PKGBUILD
index e78344048..56af292e3 100644
--- a/extra/libchewing/PKGBUILD
+++ b/extra/libchewing/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.3.5
 pkgrel=1
 pkgdesc='Intelligent Chinese phonetic input method'
 url='http://chewing.im/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
 sha1sums=('5ee3941f0f62fa14fbda53e1032970b04a7a88b7')
diff --git a/extra/libconfig/PKGBUILD b/extra/libconfig/PKGBUILD
index f9c53516c..6f20da5e1 100644
--- a/extra/libconfig/PKGBUILD
+++ b/extra/libconfig/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libconfig
 pkgver=1.4.9
 pkgrel=2
 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')
@@ -19,7 +19,7 @@ md5sums=('b6ee0ce2b3ef844bad7cac2803a90634')
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST --host=$CHOST
   make
 }
 
diff --git a/extra/libcroco/PKGBUILD b/extra/libcroco/PKGBUILD
index 1b9ed25f2..04eeacbf3 100644
--- a/extra/libcroco/PKGBUILD
+++ b/extra/libcroco/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libcroco
 pkgver=0.6.8
-pkgrel=1
+pkgrel=1.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/libcryptui/PKGBUILD b/extra/libcryptui/PKGBUILD
index e070560c4..700cff9a1 100644
--- a/extra/libcryptui/PKGBUILD
+++ b/extra/libcryptui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libcryptui
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Library for OpenPGP prompts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://git.gnome.org/browse/libcryptui/"
 license=('GPL')
 depends=('gtk3' 'gpgme' 'dbus-glib' 'libnotify' 'libgnome-keyring' 'dconf')
diff --git a/extra/libcue/PKGBUILD b/extra/libcue/PKGBUILD
index 9a1049ba0..ce757c039 100644
--- a/extra/libcue/PKGBUILD
+++ b/extra/libcue/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.4.0
 pkgrel=3
 pkgdesc='Parses so-called cue sheets and handles the parsed data'
 url='http://sourceforge.net/projects/libcue/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/libcue/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/libdaemon/PKGBUILD b/extra/libdaemon/PKGBUILD
index 12e15fe02..a6b8dcb40 100644
--- a/extra/libdaemon/PKGBUILD
+++ b/extra/libdaemon/PKGBUILD
@@ -6,11 +6,11 @@
 
 pkgname=libdaemon
 pkgver=0.14
-pkgrel=2
+pkgrel=2.1
 pkgdesc='Lightweight C library that eases the writing of UNIX daemons'
 url='http://0pointer.de/lennart/projects/libdaemon/'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://0pointer.de/lennart/projects/libdaemon/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('78a4db58cf3a7a8906c35592434e37680ca83b8f')
 
diff --git a/extra/libdatrie/PKGBUILD b/extra/libdatrie/PKGBUILD
index 7a160ed4f..170e1b070 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=('!emptydirs')
 source=(http://linux.thai.net/pub/thailinux/software/libthai/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/libdbusmenu-qt/PKGBUILD b/extra/libdbusmenu-qt/PKGBUILD
index 4f3c0fa15..3192cf128 100644
--- a/extra/libdbusmenu-qt/PKGBUILD
+++ b/extra/libdbusmenu-qt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdbusmenu-qt
 pkgver=0.9.2
 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=('qt4')
diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD
index c4c65ca20..331aeed15 100644
--- a/extra/libdc1394/PKGBUILD
+++ b/extra/libdc1394/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdc1394
 pkgver=2.2.1
 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' 'libusbx')
diff --git a/extra/libdca/PKGBUILD b/extra/libdca/PKGBUILD
index 664822b48..cfac10ae8 100644
--- a/extra/libdca/PKGBUILD
+++ b/extra/libdca/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdca
 pkgver=0.0.5
 pkgrel=4
 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 fe380c773..7bc700b27 100644
--- a/extra/libdiscid/PKGBUILD
+++ b/extra/libdiscid/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libdiscid
 pkgver=0.6.1
 pkgrel=2
 pkgdesc="A Library for creating MusicBrainz DiscIDs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://musicbrainz.org/doc/libdiscid"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/libdmapsharing/PKGBUILD b/extra/libdmapsharing/PKGBUILD
index 628854228..f60c2059c 100644
--- a/extra/libdmapsharing/PKGBUILD
+++ b/extra/libdmapsharing/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libdmapsharing
 pkgver=2.9.23
 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' 'gst-plugins-base-libs' 'gdk-pixbuf2')
diff --git a/extra/libdmtx/PKGBUILD b/extra/libdmtx/PKGBUILD
index 96a06f643..54b5311c9 100644
--- a/extra/libdmtx/PKGBUILD
+++ b/extra/libdmtx/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.7.4
 pkgrel=5
 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')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/libdmx/PKGBUILD b/extra/libdmx/PKGBUILD
index e3fea94c9..16301513b 100644
--- a/extra/libdmx/PKGBUILD
+++ b/extra/libdmx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libdmx
 pkgver=1.1.3
 pkgrel=1
 pkgdesc="X11 Distributed Multihead extension library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('dmxproto' 'libxext')
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 84713ea18..075298538 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -5,10 +5,10 @@ pkgname=libdrm
 pkgver=2.4.52
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('glibc' 'libpciaccess')
-makedepends=('valgrind')
+[ "$CARCH" != "mips64el" ] && makedepends=('valgrind')
 checkdepends=('cairo')
 replaces=('libdrm-new' 'libdrm-nouveau')
 url="http://dri.freedesktop.org/"
diff --git a/extra/libdv/PKGBUILD b/extra/libdv/PKGBUILD
index 770097ca6..10324f642 100644
--- a/extra/libdv/PKGBUILD
+++ b/extra/libdv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libdv
 pkgver=1.0.0
 pkgrel=5
 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 f467646ae..7f7e39917 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.1.2
 pkgrel=1
 epoch=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=('LGPL2.1')
 depends=('glibc')
 replaces=('libdvbpsi4' 'libdvbpsi5')
diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD
index d14311bd5..ac7e003f7 100644
--- a/extra/libdvdcss/PKGBUILD
+++ b/extra/libdvdcss/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.2.13
 pkgrel=3
 pkgdesc="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=('!docs' '!emptydirs')
diff --git a/extra/libdvdnav/PKGBUILD b/extra/libdvdnav/PKGBUILD
index e5f148827..6dbaee48b 100644
--- a/extra/libdvdnav/PKGBUILD
+++ b/extra/libdvdnav/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libdvdnav
 pkgver=4.2.1
 pkgrel=1
 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 e28b1e3c8..3eb0fd901 100644
--- a/extra/libdvdread/PKGBUILD
+++ b/extra/libdvdread/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libdvdread
 pkgver=4.2.1
 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 66bb5bc6e..c9e2aad45 100644
--- a/extra/libebml/PKGBUILD
+++ b/extra/libebml/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libebml
 pkgver=1.3.0
 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 6f8e7a789..84d590cb0 100644
--- a/extra/libepc/PKGBUILD
+++ b/extra/libepc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libepc
 pkgver=0.4.4
 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 3c4e298ce..671ad3713 100644
--- a/extra/libetpan/PKGBUILD
+++ b/extra/libetpan/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libetpan
 pkgver=1.2
 pkgrel=1
 pkgdesc="A portable middleware for email access"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.etpan.org/libetpan.html"
 license=("custom:etpan")
 depends=('libsasl' 'curl' 'expat')
diff --git a/extra/libevdev/PKGBUILD b/extra/libevdev/PKGBUILD
index 8f669ce1a..c3997e6f7 100644
--- a/extra/libevdev/PKGBUILD
+++ b/extra/libevdev/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libevdev
 pkgver=0.6
 pkgrel=1
 pkgdesc="Wrapper library for evdev devices"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/libevdev/"
 license=(custom:X11)
 depends=('glibc')
diff --git a/extra/libexif/PKGBUILD b/extra/libexif/PKGBUILD
index b8518e72f..bf66b8731 100644
--- a/extra/libexif/PKGBUILD
+++ b/extra/libexif/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libexif
 pkgver=0.6.21
 pkgrel=2
 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 9510acf06..37e9f3b75 100644
--- a/extra/libffado/PKGBUILD
+++ b/extra/libffado/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libffado
 pkgver=2.1.0
 pkgrel=4
 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' 'dbus-c++'
@@ -48,6 +48,8 @@ build() {
 
   if [ "$CARCH" = 'x86_64' ]; then
     _scons-conf ENABLE_OPTIMIZATIONS=True
+  elif [ "$CARCH" = "mips64el" ]; then
+    sed -i "s/-mn32/-mn32 $CFLAGS/g" SConstruct
   else
     _scons-conf
   fi
diff --git a/extra/libfontenc/PKGBUILD b/extra/libfontenc/PKGBUILD
index 06d400a59..05b02923c 100644
--- a/extra/libfontenc/PKGBUILD
+++ b/extra/libfontenc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libfontenc
 pkgver=1.1.2
 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/libfprint/PKGBUILD b/extra/libfprint/PKGBUILD
index 168f2ed35..c898cdb14 100644
--- a/extra/libfprint/PKGBUILD
+++ b/extra/libfprint/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libfprint
 pkgver=0.5.1
 pkgrel=1
 pkgdesc="Library for fingerprint readers"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/fprint/libfprint"
 license=(LGPL)
 depends=(libusb nss gdk-pixbuf2)
diff --git a/extra/libfs/PKGBUILD b/extra/libfs/PKGBUILD
index 104082d0b..95ace5f52 100644
--- a/extra/libfs/PKGBUILD
+++ b/extra/libfs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libfs
 pkgver=1.0.5
 pkgrel=2
 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/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index b6ac3e224..d157caa6f 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libgadu
 pkgver=1.11.3
 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://libgadu.net/"
 license=('LGPL2.1')
 depends=('openssl' 'zlib')
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index b5c559b9f..699c60f49 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libgda
 pkgver=5.2.1
 pkgrel=2
 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'
          'libmariadbclient' 'postgresql-libs' 'python2' 'libsecret'
diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD
index 39a551db6..d450ec29a 100644
--- a/extra/libgdata/PKGBUILD
+++ b/extra/libgdata/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgdata
 pkgver=0.14.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' 'liboauth' 'gcr' 'gnome-online-accounts')
 makedepends=('intltool' 'gobject-introspection' 'vala')
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index 98cf8da38..f3410e472 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgdiplus
 pkgver=2.10.9
 pkgrel=3
 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' 'cairo' 'giflib' 'glib2' 'libexif')
diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD
index 4d7cef887..28bf4bd6a 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 vala)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
diff --git a/extra/libgee06/PKGBUILD b/extra/libgee06/PKGBUILD
index 449f3a02a..2b92e61df 100644
--- a/extra/libgee06/PKGBUILD
+++ b/extra/libgee06/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 pkgdesc="GObject collection library (legacy)"
 url="http://live.gnome.org/Libgee"
 license=(LGPL2.1)
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=(glib2)
 makedepends=(gobject-introspection)
 source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz)
diff --git a/extra/libgksu/PKGBUILD b/extra/libgksu/PKGBUILD
index 5ce2b8ddf..8ee4d6b39 100644
--- a/extra/libgksu/PKGBUILD
+++ b/extra/libgksu/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libgksu
 pkgver=2.0.12
-pkgrel=5
+pkgrel=5.1
 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')
@@ -41,6 +41,8 @@ build() {
 
   touch NEWS README
 
+  sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+
   intltoolize --force --copy --automake
   autoreconf -fi
   ./configure --prefix=/usr --sysconfdir=/etc \
diff --git a/extra/libglade/PKGBUILD b/extra/libglade/PKGBUILD
index aaf925e09..d997a18dc 100644
--- a/extra/libglade/PKGBUILD
+++ b/extra/libglade/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libglade
 pkgver=2.6.4
 pkgrel=5
 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 961f83a46..deb3a2385 100644
--- a/extra/libglademm/PKGBUILD
+++ b/extra/libglademm/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libglademm
 pkgver=2.6.7
-pkgrel=2
+pkgrel=2.1
 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 f7604c3f8..b3eba7e68 100644
--- a/extra/libgme/PKGBUILD
+++ b/extra/libgme/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgname=libgme
 pkgver=0.6.0
-pkgrel=2
+pkgrel=2.2
 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 56dce8290..abecc226f 100644
--- a/extra/libgnome-keyring/PKGBUILD
+++ b/extra/libgnome-keyring/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgnome-keyring
 pkgver=3.10.1
 pkgrel=2
 pkgdesc="GNOME keyring client library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('GPL' 'LGPL')
 depends=('dbus-core' 'glib2' 'libgcrypt')
 makedepends=('intltool' 'gobject-introspection' 'vala')
diff --git a/extra/libgnome/PKGBUILD b/extra/libgnome/PKGBUILD
index df53fd348..4b856115d 100644
--- a/extra/libgnome/PKGBUILD
+++ b/extra/libgnome/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=libgnome
 pkgname=('libgnome' 'libgnome-data')
 pkgver=2.32.1
 pkgrel=4
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 makedepends=('intltool' 'gnome-vfs' 'libbonobo' 'gconf' 'gvfs' 'libcanberra')
 options=('!emptydirs')
diff --git a/extra/libgnomecanvas/PKGBUILD b/extra/libgnomecanvas/PKGBUILD
index 42ab3bf9e..fae1b4c71 100644
--- a/extra/libgnomecanvas/PKGBUILD
+++ b/extra/libgnomecanvas/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libgnomecanvas
 pkgver=2.30.3
-pkgrel=2
+pkgrel=2.2
 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=('pkg-config' 'intltool')
diff --git a/extra/libgnomecanvasmm/PKGBUILD b/extra/libgnomecanvasmm/PKGBUILD
index d6af8c475..686540cdb 100644
--- a/extra/libgnomecanvasmm/PKGBUILD
+++ b/extra/libgnomecanvasmm/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libgnomecanvasmm
 pkgver=2.26.0
-pkgrel=2
+pkgrel=2.1
 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 c9ebca38d..54e853604 100644
--- a/extra/libgnomekbd/PKGBUILD
+++ b/extra/libgnomekbd/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.6.0
 pkgrel=2
 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 d9062ffc3..6568dffaf 100644
--- a/extra/libgnomemm/PKGBUILD
+++ b/extra/libgnomemm/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libgnomemm
 pkgver=2.30.0
-pkgrel=2
+pkgrel=2.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 4bf1c44c0..f9bee4449 100644
--- a/extra/libgnomeui/PKGBUILD
+++ b/extra/libgnomeui/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libgnomeui
 pkgver=2.24.5
-pkgrel=1
+pkgrel=1.2
 pkgdesc="User Interface library for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libbonoboui' 'libgnome-keyring' 'libsm')
 makedepends=('intltool' 'pkg-config')
diff --git a/extra/libgnomeuimm/PKGBUILD b/extra/libgnomeuimm/PKGBUILD
index 70d5ee584..d7f484252 100644
--- a/extra/libgnomeuimm/PKGBUILD
+++ b/extra/libgnomeuimm/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libgnomeuimm
 pkgver=2.28.0
-pkgrel=2
+pkgrel=2.1
 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 a7449d95a..f8117f8f2 100644
--- a/extra/libgphoto2/PKGBUILD
+++ b/extra/libgphoto2/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libgphoto2
 pkgver=2.5.3.1
 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' 'gd' 'libltdl' 'libusb')
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index a34881073..1f2d038de 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -6,12 +6,15 @@ pkgname=libgpod
 pkgver=0.8.3
 pkgrel=1
 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' 'libplist')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings'
-            'python2-gobject2: python bindings')
+makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel')
+optdepends=('python2-gobject2: python bindings')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=('gtk-sharp-2')
+  optdepends+=('gtk-sharp-2: Mono bindings')
+fi
 url="http://www.gtkpod.org/libgpod/"
 source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
 options=('!emptydirs')
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index c9c25b02c..905b3eff8 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libgsf
 pkgver=1.14.28
 pkgrel=1
-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/libgtop/PKGBUILD b/extra/libgtop/PKGBUILD
index d95e1bd57..794f10d45 100644
--- a/extra/libgtop/PKGBUILD
+++ b/extra/libgtop/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgtop
 pkgver=2.28.5
 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 8f128dece..91c3b873a 100644
--- a/extra/libguess/PKGBUILD
+++ b/extra/libguess/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=libguess
 pkgver=1.1
-pkgrel=2
+pkgrel=2.1
 pkgdesc='High-speed character set detection library'
 url='http://atheme.org/project/libguess'
 license=('custom')
 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 4c38e8185..f5d2c4a65 100644
--- a/extra/libgusb/PKGBUILD
+++ b/extra/libgusb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgusb
 pkgver=0.1.6
 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' 'libusbx')
diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD
index 6f073777d..56cbfe3bb 100644
--- a/extra/libgweather/PKGBUILD
+++ b/extra/libgweather/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgweather
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libsoup' 'gnome-icon-theme' 'gtk3')
 makedepends=('intltool' 'gobject-introspection' 'vala')
diff --git a/extra/libgxps/PKGBUILD b/extra/libgxps/PKGBUILD
index 94d80574a..173e9107e 100644
--- a/extra/libgxps/PKGBUILD
+++ b/extra/libgxps/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libgxps
 pkgver=0.2.2
 pkgrel=3
 pkgdesc="XPS Documents library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="https://live.gnome.org/libgxps"
 license=('GPL2')
 depends=('cairo' 'libarchive' 'libjpeg-turbo' 'libtiff' 'lcms2')
diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD
index a47b2c419..e38f6c328 100644
--- a/extra/libhangul/PKGBUILD
+++ b/extra/libhangul/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc='Input method library for Korean'
 url='http://code.google.com/p/libhangul/'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77')
 
diff --git a/extra/libical/PKGBUILD b/extra/libical/PKGBUILD
index 6808b42b0..ca392591a 100644
--- a/extra/libical/PKGBUILD
+++ b/extra/libical/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libical
 pkgver=1.0
 pkgrel=3
 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 63fd40816..00ae95446 100644
--- a/extra/libice/PKGBUILD
+++ b/extra/libice/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libice
 pkgver=1.0.8
 pkgrel=2
 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=('xtrans>=1.2.5')
diff --git a/extra/libid3tag/PKGBUILD b/extra/libid3tag/PKGBUILD
index 207a51611..3ce9de19a 100644
--- a/extra/libid3tag/PKGBUILD
+++ b/extra/libid3tag/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libid3tag
 pkgver=0.15.1b
 pkgrel=8
 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 1b279642a..6ed52c03f 100644
--- a/extra/libidl2/PKGBUILD
+++ b/extra/libidl2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libidl2
 pkgver=0.8.14
 pkgrel=3
 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' 'texinfo')
 makedepends=('pkg-config')
diff --git a/extra/libidn/PKGBUILD b/extra/libidn/PKGBUILD
index fa6cbe0b6..45c6b40fd 100644
--- a/extra/libidn/PKGBUILD
+++ b/extra/libidn/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.28
 pkgrel=2
 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 285244b3e..e71d39c4b 100644
--- a/extra/libiec61883/PKGBUILD
+++ b/extra/libiec61883/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libiec61883
 pkgver=1.2.0
 pkgrel=4
 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 d098af445..c0867657b 100644
--- a/extra/libieee1284/PKGBUILD
+++ b/extra/libieee1284/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libieee1284
 pkgver=0.2.11
 pkgrel=5
 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')
diff --git a/extra/libifp/PKGBUILD b/extra/libifp/PKGBUILD
index 072bb2975..e931f5398 100644
--- a/extra/libifp/PKGBUILD
+++ b/extra/libifp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libifp
 pkgver=1.0.0.2
 pkgrel=5
 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 9c701c2c9..656d81e52 100644
--- a/extra/libimobiledevice/PKGBUILD
+++ b/extra/libimobiledevice/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.1.5
 pkgrel=2
 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=('usbmuxd' 'gnutls' 'libgcrypt')
 source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index 424ad5050..722c0f072 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' 'libusb-compat')
 makedepends=('cmake' 'boost')
 options=('staticlibs') # libindiclient builds as static only
diff --git a/extra/libiodbc/PKGBUILD b/extra/libiodbc/PKGBUILD
index 4b18dcff3..01abdabeb 100644
--- a/extra/libiodbc/PKGBUILD
+++ b/extra/libiodbc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libiodbc
 pkgver=3.52.8
 pkgrel=2
 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=('sh')
diff --git a/extra/libirman/PKGBUILD b/extra/libirman/PKGBUILD
index e1975b433..29787fa07 100644
--- a/extra/libirman/PKGBUILD
+++ b/extra/libirman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libirman
 pkgver=0.4.5
 pkgrel=3
 pkgdesc="Irman driver lcd library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org"
 license=('LGPL')
 backup=('etc/irman.conf')
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index dfa45a63f..3f171a9f3 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.3.4
 pkgrel=1
 pkgdesc="frontend for libraries libburn and libisofs"
 url="http://libburnia-project.org"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('libburn>=1.3.4' 'libisofs>=1.3.4' 'readline')
 optdepends=('tk:      for xorriso-tcltk frontend'
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index da5ace494..5147d5a57 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libisofs
 pkgver=1.3.4
 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-project.org"
 license=('GPL')
 depends=('acl' 'zlib')
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 75dbd544a..75c606a81 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=4
 pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
 url='http://libjpeg-turbo.virtualgl.org/'
 license=('GPL' 'custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('nasm')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
         'cve-2013-6629.patch')
diff --git a/extra/libkate/PKGBUILD b/extra/libkate/PKGBUILD
index 57bc4c8db..b61f04b98 100644
--- a/extra/libkate/PKGBUILD
+++ b/extra/libkate/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=4
 pkgdesc="A karaoke and text codec for embedding in ogg"
 url="http://libkate.googlecode.com/"
 license=('BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libpng' 'libogg' 'python2')
 makedepends=('pkg-config')
 optdepends=('wxpython: for KateDJ'
diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD
index 129f605a0..70b415f0d 100644
--- a/extra/libkcddb/PKGBUILD
+++ b/extra/libkcddb/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="KDE CDDB library"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'libmusicbrainz5')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD
index 824c51d62..eb1a99780 100644
--- a/extra/libkcompactdisc/PKGBUILD
+++ b/extra/libkcompactdisc/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A library for interfacing with CDs"
 url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index 8528e27a7..2744acb61 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A C++ interface used to decode RAW picture"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'libraw')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index 369f2b6c6..abe502b8c 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Libraries used by KDE Education applications"
 url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD
index b74e361dc..49cc73010 100644
--- a/extra/libkdegames/PKGBUILD
+++ b/extra/libkdegames/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Common code and data for many KDE games"
 url="https://projects.kde.org/projects/kde/kdegames/libkdegames"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'openal')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index 41ff76586..6dcf94ee3 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkeybinder3/PKGBUILD b/extra/libkeybinder3/PKGBUILD
index 501c66c61..fd2f7fb9b 100644
--- a/extra/libkeybinder3/PKGBUILD
+++ b/extra/libkeybinder3/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libkeybinder3
 pkgver=0.3.0
 pkgrel=3
 pkgdesc="A library for registering global keyboard shortcuts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://kaizer.se/wiki/keybinder/"
 license=('MIT')
 depends=('gtk3')
diff --git a/extra/libkfbapi/PKGBUILD b/extra/libkfbapi/PKGBUILD
index 6182653fd..456674716 100644
--- a/extra/libkfbapi/PKGBUILD
+++ b/extra/libkfbapi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libkfbapi
 pkgver=1.0
 pkgrel=1
 pkgdesc="KDE library for accessing Facebook services"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/libkfbapi'
 license=('GPL')
 depends=('kdepimlibs')
diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD
index 3d4f7606b..c190312bb 100644
--- a/extra/libkgapi/PKGBUILD
+++ b/extra/libkgapi/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.0.2
 pkgrel=1
 pkgdesc="A KDE-based library for accessing various Google services via their public API"
 url='https://projects.kde.org/projects/extragear/libs/libkgapi'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdepimlibs')
 makedepends=('cmake' 'automoc4' 'boost')
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index 414085940..e3ea3bf12 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="An interface to use kipi-plugins from a KDE application"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD
index c4a3ca37e..43bba4551 100644
--- a/extra/libkmahjongg/PKGBUILD
+++ b/extra/libkmahjongg/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles"
 url="https://projects.kde.org/projects/kde/kdegames/libmahjongg"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('libkdegames')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkolab/PKGBUILD b/extra/libkolab/PKGBUILD
index 94c4d9378..fddc5e5db 100644
--- a/extra/libkolab/PKGBUILD
+++ b/extra/libkolab/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.4.2
 pkgrel=1
 pkgdesc="Advanced Kolab Object Handling Library"
 url='http://git.kolab.org/libkolab/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libkolabxml' 'kdepimlibs')
 makedepends=('cmake' 'automoc4' 'boost')
diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD
index 343db4922..c2ab05da6 100644
--- a/extra/libkolabxml/PKGBUILD
+++ b/extra/libkolabxml/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.8.4
 pkgrel=3
 pkgdesc="Kolab XML Format Schema Definitions Library"
 url='http://git.kolab.org/libkolabxml/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('xerces-c' 'boost-libs')
 makedepends=('cmake' 'boost' 'xsd' 'qt4' 'swig')
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index 6bf228fcc..74b6befc6 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="An image scanning library"
 url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'sane')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD
index a60163757..9ee91db84 100644
--- a/extra/libkscreen/PKGBUILD
+++ b/extra/libkscreen/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libkscreen
 pkgver=1.0.2
 pkgrel=1
 pkgdesc="KDE's screen management library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/libkscreen'
 license=('GPL')
 depends=('kdelibs' 'qjson')
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index 578bb2f6d..92e8c6e41 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libktorrent
 pkgver=1.3.1
 pkgrel=2
 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 fc4e68b66..b2fcc3171 100644
--- a/extra/liblastfm/PKGBUILD
+++ b/extra/liblastfm/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=liblastfm
 pkgver=1.0.7
 pkgrel=1
 pkgdesc="A Qt4 C++ library for the Last.fm webservices"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/lastfm/liblastfm/'
 license=('GPL3')
 depends=('qt4' 'fftw' 'libsamplerate')
diff --git a/extra/liblo/PKGBUILD b/extra/liblo/PKGBUILD
index ca93adc29..87bed1cfc 100644
--- a/extra/liblo/PKGBUILD
+++ b/extra/liblo/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.28
 pkgrel=1
 epoch=1
 pkgdesc="A lightweight OSC (Open Sound Control) implementation"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://liblo.sourceforge.net/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/liblouis/PKGBUILD b/extra/liblouis/PKGBUILD
index 355ecbd36..ac470d207 100644
--- a/extra/liblouis/PKGBUILD
+++ b/extra/liblouis/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liblouis
 pkgver=2.5.2
 pkgrel=2
 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 f4f87e84d..4abc0f0cd 100644
--- a/extra/liblqr/PKGBUILD
+++ b/extra/liblqr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liblqr
 pkgver=0.4.2
 pkgrel=1
 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 c1ef2a9dd..48068e01f 100644
--- a/extra/liblrdf/PKGBUILD
+++ b/extra/liblrdf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liblrdf
 pkgver=0.5.0
 pkgrel=2
 pkgdesc="A library for the manipulation of RDF file in LADSPA plugins"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/swh/LRDF"
 depends=('raptor' 'ladspa')
 license=('GPL')
diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD
index a896c159a..5822c0230 100644
--- a/extra/libmad/PKGBUILD
+++ b/extra/libmad/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmad
 pkgver=0.15.1b
 pkgrel=7
 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')
@@ -30,7 +30,7 @@ build() {
   cd ${pkgname}-${pkgver}
   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 ccb8f2352..046883ed8 100644
--- a/extra/libmatroska/PKGBUILD
+++ b/extra/libmatroska/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmatroska
 pkgver=1.4.1
 pkgrel=1
 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/libmbim/PKGBUILD b/extra/libmbim/PKGBUILD
index 11c05cbf0..148ae9119 100644
--- a/extra/libmbim/PKGBUILD
+++ b/extra/libmbim/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmbim
 pkgver=1.6.0
 pkgrel=1
 pkgdesc="MBIM modem protocol helper library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/libmbim/"
 license=(GPL2)
 depends=(glib2 bash systemd)
diff --git a/extra/libmcrypt/PKGBUILD b/extra/libmcrypt/PKGBUILD
index 967cafd9a..0fbdac604 100644
--- a/extra/libmcrypt/PKGBUILD
+++ b/extra/libmcrypt/PKGBUILD
@@ -5,10 +5,10 @@
 
 pkgname=libmcrypt
 pkgver=2.5.8
-pkgrel=3
+pkgrel=3.1
 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=('!emptydirs')
diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD
index 526bad1d2..beec448b8 100644
--- a/extra/libmikmod/PKGBUILD
+++ b/extra/libmikmod/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=1
 pkgdesc="A portable sound library"
 license=(GPL LGPL)
 url="http://mikmod.sourceforge.net"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 depends=(libpulse sh)
 makedepends=(alsa-lib)
 install=$pkgname.install
diff --git a/extra/libmms/PKGBUILD b/extra/libmms/PKGBUILD
index f0e6de4ea..495367939 100644
--- a/extra/libmms/PKGBUILD
+++ b/extra/libmms/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libmms
 pkgver=0.6.2
-pkgrel=1
+pkgrel=1.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 7f3bfdd1b..c4092c07d 100644
--- a/extra/libmng/PKGBUILD
+++ b/extra/libmng/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmng
 pkgver=2.0.2
 pkgrel=3
 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=('lcms2')
diff --git a/extra/libmodplug/PKGBUILD b/extra/libmodplug/PKGBUILD
index f45c8d68f..023922281 100644
--- a/extra/libmodplug/PKGBUILD
+++ b/extra/libmodplug/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmodplug
 pkgver=0.8.8.4
 pkgrel=2
 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 607a074d2..60b63a0b1 100644
--- a/extra/libmowgli/PKGBUILD
+++ b/extra/libmowgli/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='Performance and usability-oriented extensions to C'
 url='http://www.atheme.org/project/mowgli'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('openssl')
 makedepends=('git')
 source=("${pkgname}-${pkgver}::git+https://github.com/atheme/libmowgli-2.git#tag=${pkgname}-${pkgver}")
diff --git a/extra/libmp3splt/PKGBUILD b/extra/libmp3splt/PKGBUILD
index 2b7716de8..75d46755a 100644
--- a/extra/libmp3splt/PKGBUILD
+++ b/extra/libmp3splt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmp3splt
 pkgver=0.9.0
 pkgrel=2
 pkgdesc="Library for splitting mp3 and ogg files without decoding"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://mp3splt.sourceforge.net"
 license=('GPL')
 depends=('flac' 'libmad' 'libvorbis' 'libid3tag' 'pcre' 'libltdl')
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index 351a885e7..dc1aaa20d 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libmp4v2
 pkgver=2.0.0
 pkgrel=3
 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 fd8771611..39f9cfe2b 100644
--- a/extra/libmpcdec/PKGBUILD
+++ b/extra/libmpcdec/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libmpcdec
 pkgver=1.2.6
-pkgrel=3
+pkgrel=3.2
 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 cfa4b4e4e..7892d0992 100644
--- a/extra/libmpd/PKGBUILD
+++ b/extra/libmpd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmpd
 pkgver=11.8.17
 pkgrel=2
 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 cfb809c21..a429287a5 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://www.musicpd.org/libs/libmpdclient/'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('1a3557d4d1f78085db6285a8c8cb9085c300d9d3')
 
diff --git a/extra/libmpeg2/PKGBUILD b/extra/libmpeg2/PKGBUILD
index 6c3404946..960dc5f18 100644
--- a/extra/libmpeg2/PKGBUILD
+++ b/extra/libmpeg2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmpeg2
 pkgver=0.5.1
 pkgrel=4
 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..e64b58dee 100644
--- a/extra/libmsn/PKGBUILD
+++ b/extra/libmsn/PKGBUILD
@@ -5,18 +5,22 @@
 
 pkgname=libmsn
 pkgver=4.2.1
-pkgrel=1
+pkgrel=1.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')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('38e46e589720eefd71f92b6b76993bf0')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2"
+	"gcc47.patch")
+md5sums=('38e46e589720eefd71f92b6b76993bf0'
+         '23bbcfa0170aa1df8387ff6419057d7c')
 
 build() {
-  cd "${srcdir}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/gcc47.patch"
+  cd ..
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/libmsn/gcc47.patch b/extra/libmsn/gcc47.patch
new file mode 100644
index 000000000..d8e128913
--- /dev/null
+++ b/extra/libmsn/gcc47.patch
@@ -0,0 +1,11 @@
+diff -ru libmsn-4.2.1.orig/msn/util.cpp libmsn-4.2.1/msn/util.cpp
+--- libmsn-4.2.1.orig/msn/util.cpp	2012-04-18 19:02:12.447876971 +0200
++++ libmsn-4.2.1/msn/util.cpp	2012-04-18 19:02:36.460762835 +0200
+@@ -30,6 +30,7 @@
+ #include <openssl/rand.h>
+ #include <cstring>
+ #include <sys/timeb.h>
++#include <unistd.h>
+ #include "md5.h"
+ #include "libsiren/siren7.h"
+ 
diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD
index acc337dce..dc735d64a 100644
--- a/extra/libmspack/PKGBUILD
+++ b/extra/libmspack/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmspack
 pkgver=0.4alpha
 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 a3a4f87bd..bc024a290 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libmtp
 pkgver=1.1.6
 pkgrel=6
 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' 'libgcrypt')
diff --git a/extra/libmusicbrainz3/PKGBUILD b/extra/libmusicbrainz3/PKGBUILD
index 62e039b28..9f14c9dc4 100644
--- a/extra/libmusicbrainz3/PKGBUILD
+++ b/extra/libmusicbrainz3/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.0.3
 pkgrel=2
 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/libmusicbrainz5/PKGBUILD b/extra/libmusicbrainz5/PKGBUILD
index 9cccbd2b3..70cd0695c 100644
--- a/extra/libmusicbrainz5/PKGBUILD
+++ b/extra/libmusicbrainz5/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libmusicbrainz5
 pkgver=5.0.1
 pkgrel=1
 pkgdesc="Library That Provides Access to the MusicBrainz Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://musicbrainz.org/"
 license=('LGPL2.1')
 depends=('neon')
diff --git a/extra/libmygpo-qt/PKGBUILD b/extra/libmygpo-qt/PKGBUILD
index 36a144f1b..50f62378d 100644
--- a/extra/libmygpo-qt/PKGBUILD
+++ b/extra/libmygpo-qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libmygpo-qt
 pkgver=1.0.7
 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 0efb1cbad..7f9fa7348 100644
--- a/extra/libmythes/PKGBUILD
+++ b/extra/libmythes/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.2.3
 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 bc4477391..d86db5bc6 100644
--- a/extra/libnet/PKGBUILD
+++ b/extra/libnet/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnet
 pkgver=1.1.6
 pkgrel=2
 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 48f644685..ea2d29c04 100644
--- a/extra/libnice/PKGBUILD
+++ b/extra/libnice/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnice
 pkgver=0.1.4
 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=('glib2')
diff --git a/extra/libnl1/PKGBUILD b/extra/libnl1/PKGBUILD
index 8f17590ca..6d45c6c37 100644
--- a/extra/libnl1/PKGBUILD
+++ b/extra/libnl1/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libnl1
 pkgver=1.1.4
 pkgrel=1
 pkgdesc="Library for applications dealing with netlink sockets (Legacy version)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.infradead.org/~tgr/libnl/"
 license=('GPL')
 depends=('glibc')
diff --git a/extra/libnotify/PKGBUILD b/extra/libnotify/PKGBUILD
index aa4b6d337..043222891 100644
--- a/extra/libnotify/PKGBUILD
+++ b/extra/libnotify/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libnotify
 pkgver=0.7.6
 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 f9c207da5..f0ac20ffa 100644
--- a/extra/libnova/PKGBUILD
+++ b/extra/libnova/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc="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')
 source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz)
 sha1sums=('4b8d04cfca0be8d49c1ef7c3607d405a7a8b167d')
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
index b920cab0b..b3af99263 100644
--- a/extra/liboauth/PKGBUILD
+++ b/extra/liboauth/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=liboauth
 pkgver=1.0.1
 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 76f3bd7aa..86aff404a 100644
--- a/extra/libofa/PKGBUILD
+++ b/extra/libofa/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libofa
 pkgver=0.9.3
 pkgrel=5
 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')
diff --git a/extra/libofa/gcc47.patch b/extra/libofa/gcc47.patch
new file mode 100644
index 000000000..eb4b4ca20
--- /dev/null
+++ b/extra/libofa/gcc47.patch
@@ -0,0 +1,22 @@
+diff -ru libofa-0.9.3.orig/examples/uselame.cpp libofa-0.9.3/examples/uselame.cpp
+--- libofa-0.9.3.orig/examples/uselame.cpp	2012-04-18 19:32:44.176037357 +0200
++++ libofa-0.9.3/examples/uselame.cpp	2012-04-18 19:33:03.052805199 +0200
+@@ -12,6 +12,7 @@
+ #else
+ #include <sys/wait.h>
+ #endif
++#include <unistd.h>
+ 
+ AudioData *loadWaveFile(char *file);
+ 
+diff -ru libofa-0.9.3.orig/examples/wavefile.cpp libofa-0.9.3/examples/wavefile.cpp
+--- libofa-0.9.3.orig/examples/wavefile.cpp	2012-04-18 19:32:44.176037357 +0200
++++ libofa-0.9.3/examples/wavefile.cpp	2012-04-18 19:37:38.123467239 +0200
+@@ -11,6 +11,7 @@
+ #include "io.h"
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ static bool readBytes(int fd, unsigned char *buf, int size) {
+     int ct = 0;
diff --git a/extra/libofx/PKGBUILD b/extra/libofx/PKGBUILD
index c77a6ea40..2e30a7041 100644
--- a/extra/libofx/PKGBUILD
+++ b/extra/libofx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('libofx' 'libofx-doc')
 pkgver=0.9.9
 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 8c76f2129..11af89a4a 100644
--- a/extra/libogg/PKGBUILD
+++ b/extra/libogg/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libogg
 pkgver=1.3.1
 pkgrel=2
 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 88913e0aa..acff18b74 100644
--- a/extra/liboil/PKGBUILD
+++ b/extra/liboil/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=liboil
 pkgver=0.3.17
 pkgrel=3
 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 2307d279b..73c2fa1a6 100644
--- a/extra/liborigin2/PKGBUILD
+++ b/extra/liborigin2/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=liborigin2
 pkgname=('liborigin2' 'liborigin2-docs')
 pkgver=20110829
 pkgrel=3
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://soft.proindependent.com/liborigin2/"
 license=('GPL3')
 makedepends=('doxygen' 'qt4' 'boost')
diff --git a/extra/libotf/PKGBUILD b/extra/libotf/PKGBUILD
index aa03243cb..9b4c978ce 100644
--- a/extra/libotf/PKGBUILD
+++ b/extra/libotf/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='OpenType Font library'
 url='http://www.nongnu.org/m17n/'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw' 'freetype2')
 source=("http://download.savannah.gnu.org/releases/m17n//${pkgname}-${pkgver}.tar.gz")
 sha1sums=('66bb81958f5f07ee1f8917d3cb7e359ae559d873')
diff --git a/extra/libotr/PKGBUILD b/extra/libotr/PKGBUILD
index ac0c23284..9cb8abc54 100644
--- a/extra/libotr/PKGBUILD
+++ b/extra/libotr/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=5
 pkgdesc='Off-the-Record Messaging Library and Toolkit'
 url='http://www.cypherpunks.ca/otr/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libgcrypt')
 source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz"
         'kopete.patch')
diff --git a/extra/libotr3/PKGBUILD b/extra/libotr3/PKGBUILD
index 51d2316c0..84f86e3f2 100644
--- a/extra/libotr3/PKGBUILD
+++ b/extra/libotr3/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='Off-the-Record Messaging Library and Toolkit (version 3.X)'
 url='http://www.cypherpunks.ca/otr/'
 license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libgcrypt')
 source=("http://www.cypherpunks.ca/otr/libotr-${pkgver}.tar.gz" "libotr3-soname.patch")
 sha1sums=('898bf00d019f49ca34cd0116dd2e22685c67c394'
diff --git a/extra/libots/PKGBUILD b/extra/libots/PKGBUILD
index 74267b655..785f6a42f 100644
--- a/extra/libots/PKGBUILD
+++ b/extra/libots/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=libots
 pkgver=0.5.0
-pkgrel=3
+pkgrel=3.2
 pkgdesc='Open Text Summarizer'
 url='http://libots.sourceforge.net/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libxml2' 'glib2')
 options=('!makeflags')
@@ -19,6 +19,7 @@ build() {
 	cd "${srcdir}/ots-${pkgver}"
 	touch gtk-doc.make
 	sed -i -e 's/en.xml$//' dic/Makefile.am
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
 	libtoolize --force
 	aclocal
 	automake --add-missing --force
diff --git a/extra/libpano13/PKGBUILD b/extra/libpano13/PKGBUILD
index 46f9e2d23..469d5e3bf 100644
--- a/extra/libpano13/PKGBUILD
+++ b/extra/libpano13/PKGBUILD
@@ -7,17 +7,18 @@ pkgver=2.9.18
 pkgrel=3
 pkgdesc='Basic library to calculate panoramical pictures - core functions of the panotools'
 url='http://panotools.sourceforge.net/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('libpng' 'libtiff')
-makedepends=('jdk7-openjdk')
+[ "$CARCH" != "mips64el" ] && makedepends=('jdk7-openjdk')
 source=("http://downloads.sourceforge.net/sourceforge/panotools/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('23849bdbdfc9176a2b53d157e58bd24aa0e7276e')
 
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --mandir=/usr/share/man --with-java=${JAVA_HOME}
+	[ "$CARCH" != "mips64el" ] && extra=--with-java=${JAVA_HOME}
+	./configure --prefix=/usr --mandir=/usr/share/man $extra
 	make
 }
 
diff --git a/extra/libpciaccess/PKGBUILD b/extra/libpciaccess/PKGBUILD
index 45838f2f1..67ddf8971 100644
--- a/extra/libpciaccess/PKGBUILD
+++ b/extra/libpciaccess/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libpciaccess
 pkgver=0.13.2
 pkgrel=2
 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 935ac05d1..48746ad8f 100644
--- a/extra/libpeas/PKGBUILD
+++ b/extra/libpeas/PKGBUILD
@@ -5,13 +5,16 @@ pkgname=libpeas
 pkgver=1.9.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)
-makedepends=(gtk-doc intltool python-gobject python2-gobject gjs seed glade)
-optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
-            'seed: gobject-based plugin engine - seed runtime loader')
+makedepends=(gtk-doc intltool python-gobject python2-gobject seed glade)
+optdepends=('seed: gobject-based plugin engine - seed runtime loader')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=(gjs)
+  optdepends+=('gjs: gobject-based plugin engine - gjs runtime loader')
+fi
 install=libpeas.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
 sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d')
@@ -19,7 +22,8 @@ sha256sums=('008747ccdf954dc7b8e3207fffede527a589363541873f906c8e0166f6f7df8d')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc --localstatedir=/var --enable-compile-warnings=no
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/extra/libplist/PKGBUILD b/extra/libplist/PKGBUILD
index 542980296..92283fb24 100644
--- a/extra/libplist/PKGBUILD
+++ b/extra/libplist/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.10
 pkgrel=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 3cb1abe6f..7bac13705 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.6.9
 _apngver=1.6.9
 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 6ee628dfc..c46f13a9b 100644
--- a/extra/libproxy/PKGBUILD
+++ b/extra/libproxy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libproxy
 pkgver=0.4.11
 pkgrel=2
 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() {
 
   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 37679f9ad..a7cc29abb 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=libpst
 pkgname=('libpst' 'libpst-docs')
 pkgver=0.6.63
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.five-ten-sg.com/libpst/"
 license=('GPL')
 makedepends=('python2' 'boost' 'libgsf')
diff --git a/extra/libpwquality/PKGBUILD b/extra/libpwquality/PKGBUILD
index 4cc106cb7..6875a11f7 100644
--- a/extra/libpwquality/PKGBUILD
+++ b/extra/libpwquality/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libpwquality
 pkgver=1.2.3
 pkgrel=1
 pkgdesc="Library for password quality checking and generating random passwords"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://fedorahosted.org/libpwquality/"
 license=('GPL')
 depends=('cracklib')
diff --git a/extra/libqalculate/PKGBUILD b/extra/libqalculate/PKGBUILD
index a888f1923..68de1dab8 100644
--- a/extra/libqalculate/PKGBUILD
+++ b/extra/libqalculate/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libqalculate
 pkgver=0.9.7
 pkgrel=4
 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')
diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD
index ebd5b5f84..58bf84b2f 100644
--- a/extra/libqmi/PKGBUILD
+++ b/extra/libqmi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libqmi
 pkgver=1.8.0
 pkgrel=1
 pkgdesc="QMI modem protocol helper library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/libqmi/"
 license=(GPL2)
 depends=(glib2 bash)
diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD
index 75dd0422d..4da89ad8b 100644
--- a/extra/libquvi/PKGBUILD
+++ b/extra/libquvi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libquvi
 pkgver=0.9.4
 pkgrel=2
 pkgdesc='Library for parsing video download links.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://quvi.sourceforge.net/'
 license=('AGPL3')
 depends=('libquvi-scripts' 'curl' 'lua' 'libproxy' 'libgcrypt' 'glib2')
diff --git a/extra/libqzeitgeist/PKGBUILD b/extra/libqzeitgeist/PKGBUILD
index ee930d067..b8defc8e1 100644
--- a/extra/libqzeitgeist/PKGBUILD
+++ b/extra/libqzeitgeist/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=0.8.0
 pkgrel=3
 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=('qt4')
 makedepends=('cmake' 'automoc4' 'python2' 'zeitgeist')
diff --git a/extra/libraw/PKGBUILD b/extra/libraw/PKGBUILD
index 70e1c9964..9a16b195d 100644
--- a/extra/libraw/PKGBUILD
+++ b/extra/libraw/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=libraw
 pkgver=0.16.0
 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=('lcms2' 'jasper')
diff --git a/extra/libraw1394/PKGBUILD b/extra/libraw1394/PKGBUILD
index 45236bde5..4ad0af84f 100644
--- a/extra/libraw1394/PKGBUILD
+++ b/extra/libraw1394/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libraw1394
 pkgver=2.1.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
 depends=('glibc')
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 35829b988..54d1c49d3 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.40.1
 pkgrel=3
 epoch=1
 pkgdesc="A SVG viewing library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('gdk-pixbuf2' 'pango' 'libcroco')
 makedepends=('intltool' 'gtk3' 'gobject-introspection' 'vala')
diff --git a/extra/libsamplerate/PKGBUILD b/extra/libsamplerate/PKGBUILD
index 3e09896a9..c10947e42 100644
--- a/extra/libsamplerate/PKGBUILD
+++ b/extra/libsamplerate/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsamplerate
 pkgver=0.1.8
 pkgrel=3
 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/libseccomp/PKGBUILD b/extra/libseccomp/PKGBUILD
index fa8af7a77..a8c4d5488 100644
--- a/extra/libseccomp/PKGBUILD
+++ b/extra/libseccomp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libseccomp
 pkgver=2.1.1
 pkgrel=1
 pkgdesc='Enhanced seccomp library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1')
 url="http://sourceforge.net/projects/libseccomp/"
 depends=('glibc')
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index ba373e249..f8ce8ab29 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsecret
 pkgver=0.16
 pkgrel=2
 pkgdesc='Library for storing and retrieving passwords and other secrets.'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="https://live.gnome.org/Libsecret"
 depends=('glib2' 'libgcrypt')
diff --git a/extra/libsexy/PKGBUILD b/extra/libsexy/PKGBUILD
index ee9087d57..89f89fc7b 100644
--- a/extra/libsexy/PKGBUILD
+++ b/extra/libsexy/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libsexy
 pkgver=0.1.11
-pkgrel=4
+pkgrel=4.1
 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 79a00eeb6..4022f7d0a 100644
--- a/extra/libshout/PKGBUILD
+++ b/extra/libshout/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.3.1
 pkgrel=2
 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=('!emptydirs')
diff --git a/extra/libsidplay/PKGBUILD b/extra/libsidplay/PKGBUILD
index 521e1d69b..8c9e4a9a7 100644
--- a/extra/libsidplay/PKGBUILD
+++ b/extra/libsidplay/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libsidplay
 pkgver=1.36.59
 pkgrel=6
 pkgdesc="A library for playing SID music files."
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://critical.ch/distfiles/"
 license=('GPL')
 source=(http://critical.ch/distfiles/${pkgname}-${pkgver}.tgz libsidplay-1.36.59-gcc43.patch)
diff --git a/extra/libsidplayfp/PKGBUILD b/extra/libsidplayfp/PKGBUILD
index 2d48654fe..6dcfc5370 100644
--- a/extra/libsidplayfp/PKGBUILD
+++ b/extra/libsidplayfp/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.2.0
 pkgrel=1
 pkgdesc='Library to play Commodore 64 music derived from libsidplay2'
 url='http://sourceforge.net/projects/sidplay-residfp/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('gcc-libs')
 makedepends=('vice')
diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD
index bddaff76f..e276328d6 100644
--- a/extra/libsigc++/PKGBUILD
+++ b/extra/libsigc++/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=libsigc++
 pkgname=('libsigc++' 'libsigc++-docs')
 pkgver=2.3.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://libsigc.sourceforge.net/"
 makedepends=('gcc-libs')
diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD
index 0b689db6e..6cfba18b3 100644
--- a/extra/libsigsegv/PKGBUILD
+++ b/extra/libsigsegv/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libsigsegv
 pkgver=2.10
 pkgrel=2
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 pkgdesc="Page fault detection library"
 url="http://www.gnu.org/software/libsigsegv/"
 license=('GPL2')
diff --git a/extra/libsm/PKGBUILD b/extra/libsm/PKGBUILD
index cb1b92e57..1731fa5c0 100644
--- a/extra/libsm/PKGBUILD
+++ b/extra/libsm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsm
 pkgver=1.2.2
 pkgrel=2
 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')
diff --git a/extra/libsmbios/PKGBUILD b/extra/libsmbios/PKGBUILD
index ce8be4c47..be9f2197d 100644
--- a/extra/libsmbios/PKGBUILD
+++ b/extra/libsmbios/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libsmbios
 pkgver=2.2.28
 pkgrel=2
 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 d72103a98..ab28ddd1f 100644
--- a/extra/libsndfile/PKGBUILD
+++ b/extra/libsndfile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsndfile
 pkgver=1.0.25
 pkgrel=3
 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 ebdae1b98..11ef9a21b 100644
--- a/extra/libsocialweb/PKGBUILD
+++ b/extra/libsocialweb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsocialweb
 pkgver=0.25.21
 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>=2.24.0' rest dbus-glib libgnome-keyring
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 39e6c6166..2afe38f43 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libsoup
 pkgver=2.44.2
 pkgrel=1
 pkgdesc="GNOME HTTP Library"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(LGPL)
 url="http://www.gnome.org"
 depends=(glib2 libxml2 glib-networking sqlite)
diff --git a/extra/libspectre/PKGBUILD b/extra/libspectre/PKGBUILD
index 308e87530..37bee0358 100644
--- a/extra/libspectre/PKGBUILD
+++ b/extra/libspectre/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libspectre
 pkgver=0.2.7
-pkgrel=1
+pkgrel=1.2
 pkgdesc="Small library for rendering Postscript documents"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.freedesktop.org/wiki/Software/libspectre"
 depends=('ghostscript>=9.00')
diff --git a/extra/libspiro/PKGBUILD b/extra/libspiro/PKGBUILD
index dc4d37a1a..391ec2576 100644
--- a/extra/libspiro/PKGBUILD
+++ b/extra/libspiro/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=3
 pkgdesc='Simplifies the drawing of beautiful curves'
 url='http://libspiro.sourceforge.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2")
 sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382')
 
diff --git a/extra/libsrtp/PKGBUILD b/extra/libsrtp/PKGBUILD
index b43a3783a..0e51a3eb8 100644
--- a/extra/libsrtp/PKGBUILD
+++ b/extra/libsrtp/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=15.1c9bd90
 pkgrel=3
 pkgdesc="Open-source implementation of the Secure Real-time Transport Protocol (SRTP)"
 url="http://srtp.sourceforge.net/srtp.html"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 depends=('glibc')
 makedepends=('git')
diff --git a/extra/libssh/PKGBUILD b/extra/libssh/PKGBUILD
index 936b6403d..dd27a8349 100644
--- a/extra/libssh/PKGBUILD
+++ b/extra/libssh/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=2
 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=('zlib' 'openssl')
 makedepends=('cmake' 'doxygen')
 source=(https://red.libssh.org/attachments/download/51/${pkgname}-${pkgver}.tar.gz
diff --git a/extra/libstdc++5/PKGBUILD b/extra/libstdc++5/PKGBUILD
index fdb604f4f..4ee89346a 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 8f2697ba2..0bf57cf3f 100644
--- a/extra/libstroke/PKGBUILD
+++ b/extra/libstroke/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libstroke
 pkgver=0.5.1
 pkgrel=6
 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/libtar/PKGBUILD b/extra/libtar/PKGBUILD
index 3ca0c6d34..27f35fd4c 100644
--- a/extra/libtar/PKGBUILD
+++ b/extra/libtar/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libtar
 pkgver=1.2.20
 pkgrel=1
 pkgdesc="C library for manipulating POSIX tar files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://repo.or.cz/w/libtar.git/"
 license=('BSD')
 depends=('zlib')
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index fa33dbae2..8e1eff3fc 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libtasn1
 pkgver=3.4
 pkgrel=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 5298d0a0a..083b477b6 100644
--- a/extra/libtextcat/PKGBUILD
+++ b/extra/libtextcat/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libtextcat
 pkgver=2.2
 pkgrel=9
 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 ae9b32ad4..4f7cb0d58 100644
--- a/extra/libthai/PKGBUILD
+++ b/extra/libthai/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.1.19
 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 5a7e2e32e..d4e806edf 100644
--- a/extra/libtheora/PKGBUILD
+++ b/extra/libtheora/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libtheora
 pkgver=1.1.1
 pkgrel=3
 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')
@@ -25,7 +25,7 @@ prepare() {
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-shared --disable-static
+  ./configure --prefix=/usr --enable-shared --disable-static --build=$CHOST --host=$CHOST
   make
 }
 
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index 87dfa3e20..cb0e11cd4 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libtiff
 pkgver=4.0.3
 pkgrel=4
 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=('gcc-libs' 'libjpeg' 'zlib' 'xz')
diff --git a/extra/libtiger/PKGBUILD b/extra/libtiger/PKGBUILD
index 6bc26bc01..c218bc8ea 100644
--- a/extra/libtiger/PKGBUILD
+++ b/extra/libtiger/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgname=libtiger
 pkgver=0.3.4
-pkgrel=3
+pkgrel=3.2
 pkgdesc="A rendering library for Kate streams using Pango and Cairo"
 url="http://libtiger.googlecode.com/"
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('pango' 'libkate')
 makedepends=('pkg-config')
 source=("http://libtiger.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 81f2b8ea7..627e0b739 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 epoch=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=('BSD')
 depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
diff --git a/extra/libtxc_dxtn/PKGBUILD b/extra/libtxc_dxtn/PKGBUILD
index b408d6f31..c476bbac3 100644
--- a/extra/libtxc_dxtn/PKGBUILD
+++ b/extra/libtxc_dxtn/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=libtxc_dxtn
 pkgver=1.0.1
 pkgrel=5
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 pkgdesc="S3 Texture Compression (S3TC) library for Mesa"
 url="http://dri.freedesktop.org/wiki/S3TC"
 license=(custom:BSD)
diff --git a/extra/libunique/PKGBUILD b/extra/libunique/PKGBUILD
index a981256f8..63c228135 100644
--- a/extra/libunique/PKGBUILD
+++ b/extra/libunique/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 pkgname=libunique
 pkgver=1.1.6
-pkgrel=5
+pkgrel=5.1
 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 cff7cbfb7..83f4128c0 100644
--- a/extra/libunique3/PKGBUILD
+++ b/extra/libunique3/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 pkgname=libunique3
 pkgver=3.0.2
-pkgrel=2
+pkgrel=2.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/libunistring/PKGBUILD b/extra/libunistring/PKGBUILD
index 645bcc152..03cd4d3ca 100644
--- a/extra/libunistring/PKGBUILD
+++ b/extra/libunistring/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.9.3
 pkgrel=6
 pkgdesc="Library for manipulating Unicode strings and C strings."
 url="http://www.gnu.org/software/libunistring/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('glibc')
 install=${pkgname}.install
diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD
index 75531af6e..ebf8ff252 100644
--- a/extra/libupnp/PKGBUILD
+++ b/extra/libupnp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libupnp
 pkgver=1.6.19
 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/libusb-compat/PKGBUILD b/extra/libusb-compat/PKGBUILD
index 791f023e5..dd49fdf9b 100644
--- a/extra/libusb-compat/PKGBUILD
+++ b/extra/libusb-compat/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libusb-compat
 pkgver=0.1.5
 pkgrel=1
 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')
 depends=('libusb' 'sh')
diff --git a/extra/libutempter/PKGBUILD b/extra/libutempter/PKGBUILD
index bbc27d9b1..216e8cf46 100644
--- a/extra/libutempter/PKGBUILD
+++ b/extra/libutempter/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libutempter
 pkgver=1.1.6
 pkgrel=2
 pkgdesc="Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="ftp://ftp.altlinux.org/pub/people/ldv/utempter"
 license=('LGPL')
 depends=('glibc')
diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD
index 5b8878025..d2ddc2141 100644
--- a/extra/libva/PKGBUILD
+++ b/extra/libva/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libva
 pkgver=1.2.1
 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=('libegl' 'libgl' 'libdrm' 'libxfixes')
diff --git a/extra/libva/libva-1.1.0-wayland1.patch b/extra/libva/libva-1.1.0-wayland1.patch
new file mode 100644
index 000000000..020981276
--- /dev/null
+++ b/extra/libva/libva-1.1.0-wayland1.patch
@@ -0,0 +1,336 @@
+--- libva-1.1.0.orig/configure.ac	2012-10-04 08:30:51.000000000 -0500
++++ libva-1.1.0/configure.ac	2013-03-05 14:20:21.109767813 -0500
+@@ -78,7 +78,7 @@
+ m4_define([libdrm_version], [2.4])
+ 
+ # Wayland minimum version number
+-m4_define([wayland_api_version], [0.95.0])
++m4_define([wayland_api_version], [1.0.0])
+ 
+ AC_PREREQ(2.57)
+ AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva)
+--- libva-1.1.0.orig/test/common/va_display_wayland.c	2012-09-28 09:04:28.000000000 -0500
++++ libva-1.1.0/test/common/va_display_wayland.c	2013-03-05 15:06:59.082134052 -0500
+@@ -33,42 +33,39 @@
+ 
+ struct display {
+     struct wl_display          *display;
++    struct wl_registry         *registry;
+     struct wl_compositor       *compositor;
+     struct wl_shell            *shell;
+     struct wl_shell_surface    *shell_surface;
+     struct wl_surface          *surface;
+     unsigned int                ref_count;
+     int                         event_fd;
+-    unsigned int                event_mask;
+ };
+ 
+ static struct display *g_display;
+ 
+ static void
+-display_handle_global(
+-    struct wl_display *display,
+-    uint32_t           id,
+-    const char        *interface,
+-    uint32_t           version,
+-    void              *data
++registry_handle_global(
++    void               *data,
++    struct wl_registry *registry,
++    uint32_t            id,
++    const char         *interface,
++    uint32_t            version
+ )
+ {
+     struct display * const d = data;
+ 
+     if (strcmp(interface, "wl_compositor") == 0)
+-        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
++        d->compositor =
++            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
+     else if (strcmp(interface, "wl_shell") == 0)
+-        d->shell = wl_display_bind(display, id, &wl_shell_interface);
++        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
+ }
+ 
+-static int
+-event_mask_update(uint32_t mask, void *data)
+-{
+-    struct display * const d = data;
+-
+-    d->event_mask = mask;
+-    return 0;
+-}
++static const struct wl_registry_listener registry_listener = {
++    registry_handle_global,
++    NULL,
++};
+ 
+ static VADisplay
+ va_open_display_wayland(void)
+@@ -91,9 +88,10 @@
+             return NULL;
+         }
+         wl_display_set_user_data(d->display, d);
+-        wl_display_add_global_listener(d->display, display_handle_global, d);
+-        d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
+-        wl_display_iterate(d->display, d->event_mask);
++        d->registry = wl_display_get_registry(d->display);
++        wl_registry_add_listener(d->registry, &registry_listener, d);
++        d->event_fd = wl_display_get_fd(d->display);
++        wl_display_dispatch(d->display);
+ 
+         d->ref_count = 1;
+         g_display = d;
+@@ -182,6 +180,7 @@
+          dst_rect->x, dst_rect->y, dst_rect->width, dst_rect->height
+      );
+ 
++    wl_surface_commit(d->surface);
+     wl_display_flush(d->display);
+     return VA_STATUS_SUCCESS;
+ }
+--- libva-1.1.0.orig/test/putsurface/putsurface_wayland.c	2012-09-28 09:04:28.000000000 -0500
++++ libva-1.1.0/test/putsurface/putsurface_wayland.c	2013-03-05 14:45:49.783865254 -0500
+@@ -102,7 +102,7 @@
+     struct wl_display  *display;
+     struct wl_compositor *compositor;
+     struct wl_shell    *shell;
+-    uint32_t            mask;
++    struct wl_registry *registry;
+     int                 event_fd;
+ };
+ 
+@@ -153,7 +153,7 @@
+     if (wl_drawable->redraw_pending) {
+         wl_display_flush(d->display);
+         while (wl_drawable->redraw_pending)
+-            wl_display_iterate(wl_drawable->display, WL_DISPLAY_READABLE);
++            wl_display_dispatch(wl_drawable->display);
+     }
+ 
+     va_status = vaGetSurfaceBufferWl(va_dpy, va_surface, VA_FRAME_PICTURE, &buffer);
+@@ -169,35 +169,33 @@
+     wl_display_flush(d->display);
+     wl_drawable->redraw_pending = 1;
+     callback = wl_surface_frame(wl_drawable->surface);
++    wl_surface_commit(wl_drawable->surface);
+     wl_callback_add_listener(callback, &frame_callback_listener, wl_drawable);
+     return VA_STATUS_SUCCESS;
+ }
+ 
+ static void
+-display_handle_global(
+-    struct wl_display *display,
+-    uint32_t           id,
+-    const char        *interface,
+-    uint32_t           version,
+-    void              *data
++registry_handle_global(
++    void               *data,
++    struct wl_registry *registry,
++    uint32_t            id,
++    const char         *interface,
++    uint32_t            version
+ )
+ {
+     struct display * const d = data;
+ 
+     if (strcmp(interface, "wl_compositor") == 0)
+-        d->compositor = wl_display_bind(display, id, &wl_compositor_interface);
++        d->compositor =
++            wl_registry_bind(registry, id, &wl_compositor_interface, 1);
+     else if (strcmp(interface, "wl_shell") == 0)
+-        d->shell = wl_display_bind(display, id, &wl_shell_interface);
++        d->shell = wl_registry_bind(registry, id, &wl_shell_interface, 1);
+ }
+ 
+-static int
+-event_mask_update(uint32_t mask, void *data)
+-{
+-    struct display * const d = data;
+-
+-    d->mask = mask;
+-    return 0;
+-}
++static const struct wl_registry_listener registry_listener = {
++    registry_handle_global,
++    NULL,
++};
+ 
+ static void *
+ open_display(void)
+@@ -213,9 +211,10 @@
+         return NULL;
+ 
+     wl_display_set_user_data(d->display, d);
+-    wl_display_add_global_listener(d->display, display_handle_global, d);
+-    d->event_fd = wl_display_get_fd(d->display, event_mask_update, d);
+-    wl_display_iterate(d->display, d->mask);
++    d->registry = wl_display_get_registry(d->display);
++    wl_registry_add_listener(d->registry, &registry_listener, d);
++    d->event_fd = wl_display_get_fd(d->display);
++    wl_display_dispatch(d->display);
+     return d->display;
+ }
+ 
+@@ -298,9 +297,6 @@
+     if (check_event == 0)
+         return 0;
+ 
+-    if (!(d->mask & WL_DISPLAY_READABLE))
+-        return 0;
+-
+     tv.tv_sec  = 0;
+     tv.tv_usec = 0;
+     do {
+@@ -313,7 +309,7 @@
+             break;
+         }
+         if (retval == 1)
+-            wl_display_iterate(d->display, WL_DISPLAY_READABLE);
++            wl_display_dispatch(d->display);
+     } while (retval > 0);
+ 
+ #if 0
+--- libva-1.1.0.orig/va/wayland/va_wayland_drm.c	2012-09-28 09:04:28.000000000 -0500
++++ libva-1.1.0/va/wayland/va_wayland_drm.c	2013-03-05 14:52:34.952330711 -0500
+@@ -44,6 +44,7 @@
+     struct va_wayland_context   base;
+     void                       *handle;
+     struct wl_drm              *drm;
++    struct wl_registry         *registry;
+     void                       *drm_interface;
+     unsigned int                is_authenticated        : 1;
+ } VADisplayContextWaylandDRM;
+@@ -142,6 +143,28 @@
+     }
+ }
+ 
++static void
++registry_handle_global(
++    void               *data,
++    struct wl_registry *registry,
++    uint32_t            id,
++    const char         *interface,
++    uint32_t            version
++)
++{
++    struct va_wayland_drm_context *wl_drm_ctx = data;
++
++    if (strcmp(interface, "wl_drm") == 0) {
++        wl_drm_ctx->drm =
++            wl_registry_bind(wl_drm_ctx->registry, id, wl_drm_ctx->drm_interface, 1);
++    }
++}
++
++static const struct wl_registry_listener registry_listener = {
++    registry_handle_global,
++    NULL,
++};
++
+ bool
+ va_wayland_drm_create(VADisplayContextP pDisplayContext)
+ {
+@@ -168,14 +191,6 @@
+     drm_state->auth_type = 0;
+     ctx->drm_state       = drm_state;
+ 
+-    id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
+-    if (!id) {
+-        wl_display_roundtrip(ctx->native_dpy);
+-        id = wl_display_get_global(ctx->native_dpy, "wl_drm", 1);
+-        if (!id)
+-            return false;
+-    }
+-
+     wl_drm_ctx->handle = dlopen(LIBWAYLAND_DRM_NAME, RTLD_LAZY|RTLD_LOCAL);
+     if (!wl_drm_ctx->handle)
+         return false;
+@@ -185,8 +200,14 @@
+     if (!wl_drm_ctx->drm_interface)
+         return false;
+ 
+-    wl_drm_ctx->drm =
+-        wl_display_bind(ctx->native_dpy, id, wl_drm_ctx->drm_interface);
++    wl_drm_ctx->registry = wl_display_get_registry(ctx->native_dpy);
++    wl_registry_add_listener(wl_drm_ctx->registry, &registry_listener, wl_drm_ctx);
++    wl_display_roundtrip(ctx->native_dpy);
++
++    /* registry_handle_global should have been called by the
++     * wl_display_roundtrip above
++     */
++
+     if (!wl_drm_ctx->drm)
+         return false;
+ 
+--- libva-1.1.0.orig/va/wayland/va_wayland_emgd.c	2012-09-28 09:04:28.000000000 -0500
++++ libva-1.1.0/va/wayland/va_wayland_emgd.c	2013-03-05 14:55:57.359895989 -0500
+@@ -40,6 +40,7 @@
+     struct wl_emgd             *emgd;
+     void                       *emgd_interface;
+     unsigned int                is_created      : 1;
++    struct wl_registry         *registry;
+ } VADisplayContextWaylandEMGD;
+ 
+ static inline void
+@@ -86,6 +87,28 @@
+     }
+ }
+ 
++static void
++registry_handle_global(
++    void               *data,
++    struct wl_registry *registry,
++    uint32_t            id,
++    const char         *interface,
++    uint32_t            version
++)
++{
++    VADisplayContextWaylandEMGD *wl_emgd_ctx = data;
++
++    if (strcmp(interface, "wl_emgd") == 0) {
++        wl_emgd_ctx->emgd =
++            wl_registry_bind(registry, id, wl_emgd_ctx->emgd_interface, 1);
++    }
++}
++
++static const struct wl_registry_listener registry_listener = {
++    registry_handle_global,
++    NULL,
++};
++
+ bool
+ va_wayland_emgd_create(VADisplayContextP pDisplayContext)
+ {
+@@ -112,14 +135,6 @@
+     drm_state->auth_type = 0;
+     ctx->drm_state       = drm_state;
+ 
+-    id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
+-    if (!id) {
+-        wl_display_roundtrip(ctx->native_dpy);
+-        id = wl_display_get_global(ctx->native_dpy, "wl_emgd", 1);
+-        if (!id)
+-            return false;
+-    }
+-
+     wl_emgd_ctx->handle = dlopen(LIBWAYLAND_EMGD_NAME, RTLD_LAZY|RTLD_LOCAL);
+     if (!wl_emgd_ctx->handle)
+         return false;
+@@ -129,8 +144,13 @@
+     if (!wl_emgd_ctx->emgd_interface)
+         return false;
+ 
+-    wl_emgd_ctx->emgd =
+-        wl_display_bind(ctx->native_dpy, id, wl_emgd_ctx->emgd_interface);
++    wl_emgd_ctx->registry = wl_display_get_registry(ctx->native_dpy);
++    wl_registry_add_listener(wl_emgd_ctx->registry, &registry_listener, wl_emgd_ctx);
++    wl_display_roundtrip(ctx->native_dpy);
++
++    /* registry_handle_global should have been called by the
++     * wl_display_roundtrip above
++     */
+     if (!wl_emgd_ctx->emgd)
+         return false;
+     return true;
diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD
index 0eb59fb60..0f6c528cc 100644
--- a/extra/libvdpau/PKGBUILD
+++ b/extra/libvdpau/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libvdpau
 pkgver=0.7
 pkgrel=1
 pkgdesc="Nvidia VDPAU library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url='http://cgit.freedesktop.org/~aplattner/libvdpau'
 depends=('gcc-libs' 'libxext')
 conflicts=('nvidia-utils<190.42-2')
diff --git a/extra/libvisual-plugins/PKGBUILD b/extra/libvisual-plugins/PKGBUILD
index bd80ebaad..68940a137 100644
--- a/extra/libvisual-plugins/PKGBUILD
+++ b/extra/libvisual-plugins/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libvisual-plugins
 pkgver=0.4.0
 pkgrel=7
 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' 'glu' 'alsa-lib' 'jack')
diff --git a/extra/libvisual/PKGBUILD b/extra/libvisual/PKGBUILD
index e34d65996..f276f9be1 100644
--- a/extra/libvisual/PKGBUILD
+++ b/extra/libvisual/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libvisual
 pkgver=0.4.0
-pkgrel=4
+pkgrel=4.2
 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')
 source=("http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-${pkgver}.tar.gz")
diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD
index 722a5b4a6..5b85ac999 100644
--- a/extra/libvncserver/PKGBUILD
+++ b/extra/libvncserver/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libvncserver
 pkgver=0.9.9
 pkgrel=3
 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 027e60707..7ece55f2b 100644
--- a/extra/libvorbis/PKGBUILD
+++ b/extra/libvorbis/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libvorbis
 pkgver=1.3.4
 pkgrel=1
 pkgdesc="Vorbis codec library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xiph.org/vorbis/"
 license=('BSD')
 depends=('libogg')
diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index 76de4aba0..5d19baf3c 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -5,15 +5,29 @@ pkgname=libvpx
 pkgver=1.3.0
 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' 'git')
-source=($pkgname::git+http://code.google.com/p/webm.libvpx#tag=v$pkgver)
-md5sums=('SKIP')
+makedepends=('git')
+[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
+source=($pkgname::git+http://code.google.com/p/webm.libvpx#tag=v$pkgver
+        mips64el.patch)
+md5sums=('SKIP'
+         '78ea367dc417f64ad3ce8e33fda210e56a083f4b')
+
+prepare() {
+    if [ "$CARCH" = "mips64el" ]; then
+      cd ${pkgname}
+      patch -Np1 -i ${srcdir}/mips64el.patch
+    fi
+}
 
 build() {
+    if [ "$CARCH" = "mips64el" ]; then
+      extra="--target=mips64el-linux-gcc"
+    fi
+
     cd $pkgname
     ./configure --prefix=/usr \
         --enable-vp8 \
@@ -23,7 +37,7 @@ build() {
         --enable-postproc \
         --enable-pic \
         --disable-install-docs \
-        --disable-install-srcs
+        --disable-install-srcs $extra
     make
 }
 
@@ -32,3 +46,9 @@ package() {
     make DIST_DIR="$pkgdir/usr" install
     install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+md5sums=('SKIP'
+         'e75a41ccf5a79aab57aaecbadb48fec1')
+md5sums=('SKIP'
+         'a4066b2f97a63b64274725ddc9d29338')
+md5sums=('SKIP'
+         'eac9aec1596387f2530eca92065edb9c')
diff --git a/extra/libvpx/mips64el.patch b/extra/libvpx/mips64el.patch
new file mode 100644
index 000000000..1e99bd074
--- /dev/null
+++ b/extra/libvpx/mips64el.patch
@@ -0,0 +1,18 @@
+--- a/configure	2014-01-10 10:13:08.513968273 -0300
++++ b/configure	2014-01-10 10:16:10.126761242 -0300
+@@ -102,6 +102,7 @@
+ all_platforms="${all_platforms} armv7-win32-vs11"
+ all_platforms="${all_platforms} armv7-win32-vs12"
+ all_platforms="${all_platforms} mips32-linux-gcc"
++all_platforms="${all_platforms} mips64el-linux-gcc"
+ all_platforms="${all_platforms} ppc32-darwin8-gcc"
+ all_platforms="${all_platforms} ppc32-darwin9-gcc"
+ all_platforms="${all_platforms} ppc32-linux-gcc"
+@@ -229,6 +230,7 @@
+     neon
+ 
+     mips32
++    mips64
+     dspr2
+ 
+     mmx
diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD
index 627165883..af8f10312 100644
--- a/extra/libwacom/PKGBUILD
+++ b/extra/libwacom/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libwacom
 pkgver=0.8
 pkgrel=1
 pkgdesc="Library to identify Wacom tablets and their features"
-arch=('x86_64' 'i686')
+arch=('x86_64' 'i686' 'mips64el')
 url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
 license=('MIT')
 depends=('glib2' 'systemd')
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index 64efd9b1d..ab4b5cb01 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libwebp
 pkgver=0.4.0
 pkgrel=1
 pkgdesc="WebP library and conversion tools"
-arch=(x86_64 i686)
+arch=('x86_64' 'i686' 'mips64el')
 url="https://developers.google.com/speed/webp/"
 license=(BSD)
 depends=(libpng libjpeg libtiff giflib)
diff --git a/extra/libwmf/PKGBUILD b/extra/libwmf/PKGBUILD
index da462db95..3f78dbae9 100644
--- a/extra/libwmf/PKGBUILD
+++ b/extra/libwmf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libwmf
 pkgver=0.2.8.4
 pkgrel=12
 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=('libx11' 'libjpeg' 'gsfonts')
diff --git a/extra/libwnck/PKGBUILD b/extra/libwnck/PKGBUILD
index 7665c5da7..4ca3efba5 100644
--- a/extra/libwnck/PKGBUILD
+++ b/extra/libwnck/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Jan de Groot  <jgc@archlinux.org>
 pkgname=libwnck
 pkgver=2.30.7
-pkgrel=1
+pkgrel=1.2
 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 a3ce77bc3..4bb234bad 100644
--- a/extra/libwnck3/PKGBUILD
+++ b/extra/libwnck3/PKGBUILD
@@ -6,7 +6,7 @@ _pkgbasename=libwnck
 pkgver=3.4.7
 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 f9ea447f6..42e145e17 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libwpd
 pkgver=0.9.9
 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' 'zlib')
diff --git a/extra/libwpg/PKGBUILD b/extra/libwpg/PKGBUILD
index 5916e389b..76091c95f 100644
--- a/extra/libwpg/PKGBUILD
+++ b/extra/libwpg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libwpg
 pkgver=0.2.2
 pkgrel=2
 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' 'perl')
diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD
index 0d814405b..c99aeab4c 100644
--- a/extra/libwps/PKGBUILD
+++ b/extra/libwps/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libwps
 pkgver=0.2.9
 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.6')
diff --git a/extra/libx11/PKGBUILD b/extra/libx11/PKGBUILD
index 478b842e9..ac29f65be 100644
--- a/extra/libx11/PKGBUILD
+++ b/extra/libx11/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libx11
 pkgver=1.6.2
 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 42feec139..3f337d9fb 100644
--- a/extra/libxau/PKGBUILD
+++ b/extra/libxau/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libxau
 pkgver=1.0.8
 pkgrel=2
 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 3d2c342b7..f2e1c675e 100644
--- a/extra/libxaw/PKGBUILD
+++ b/extra/libxaw/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxaw
 pkgver=1.0.12
 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 523084ba5..9d0e216c1 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libxcb
 pkgver=1.10
 pkgrel=1
 pkgdesc="X11 client-side library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xcb.freedesktop.org/"
 depends=('xcb-proto>=1.10' 'libxdmcp' 'libxau')
 makedepends=('pkgconfig' 'libxslt' 'python')
diff --git a/extra/libxcomposite/PKGBUILD b/extra/libxcomposite/PKGBUILD
index 606215f39..fe5f29293 100644
--- a/extra/libxcomposite/PKGBUILD
+++ b/extra/libxcomposite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxcomposite
 pkgver=0.4.4
 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 51bdbcf02..9b7c11c27 100644
--- a/extra/libxcursor/PKGBUILD
+++ b/extra/libxcursor/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libxcursor
 pkgver=1.1.14
 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 7fab57a24..ccb2f7753 100644
--- a/extra/libxdamage/PKGBUILD
+++ b/extra/libxdamage/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxdamage
 pkgver=1.1.4
 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 e4169c81b..c77a1de73 100644
--- a/extra/libxdmcp/PKGBUILD
+++ b/extra/libxdmcp/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libxdmcp
 pkgver=1.1.1
-pkgrel=1
+pkgrel=1.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 895c1b4db..39b313d80 100644
--- a/extra/libxevie/PKGBUILD
+++ b/extra/libxevie/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxevie
 pkgver=1.0.3
 pkgrel=2
 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 34c0f853c..0d35f36d7 100644
--- a/extra/libxext/PKGBUILD
+++ b/extra/libxext/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxext
 pkgver=1.3.2
 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/libxfce4ui/PKGBUILD b/extra/libxfce4ui/PKGBUILD
index 6904bc23c..8ee41d41b 100644
--- a/extra/libxfce4ui/PKGBUILD
+++ b/extra/libxfce4ui/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxfce4ui
 pkgver=4.10.0
 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 eb1e9fe1e..e5cfc50ff 100644
--- a/extra/libxfce4util/PKGBUILD
+++ b/extra/libxfce4util/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxfce4util
 pkgver=4.10.1
 pkgrel=2
 pkgdesc="Basic utility non-GUI functions for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 depends=('glib2')
diff --git a/extra/libxfcegui4/PKGBUILD b/extra/libxfcegui4/PKGBUILD
index 1a5e44191..20cdae023 100644
--- a/extra/libxfcegui4/PKGBUILD
+++ b/extra/libxfcegui4/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=libxfcegui4
 pkgver=4.10.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Various Gtk widgets for Xfce"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 depends=('startup-notification' 'xfconf' 'libglade' 'libsm'
diff --git a/extra/libxfixes/PKGBUILD b/extra/libxfixes/PKGBUILD
index 240f6894e..6d1394651 100644
--- a/extra/libxfixes/PKGBUILD
+++ b/extra/libxfixes/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxfixes
 pkgver=5.0.1
 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 1e862ba18..331d525ea 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxfont
 pkgver=1.4.7
 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 6bec9aa3d..4322484f0 100644
--- a/extra/libxft/PKGBUILD
+++ b/extra/libxft/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxft
 pkgver=2.3.1
 pkgrel=2
 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 37ea037b6..0085e86b8 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxi
 pkgver=1.7.2
 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' 'libxfixes' 'automake')
diff --git a/extra/libxinerama/PKGBUILD b/extra/libxinerama/PKGBUILD
index cf6b3cd5a..443695c66 100644
--- a/extra/libxinerama/PKGBUILD
+++ b/extra/libxinerama/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libxinerama
 pkgver=1.1.3
 pkgrel=2
 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/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
index 2ee318e8c..9ec2205e2 100644
--- a/extra/libxkbcommon/PKGBUILD
+++ b/extra/libxkbcommon/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=(libxkbcommon libxkbcommon-x11)
 pkgver=0.4.0
 pkgrel=1
 pkgdesc="Keyboard handling library using XKB data"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://xkbcommon.org/"
 license=(custom)
 depends=(xkeyboard-config glibc)
diff --git a/extra/libxkbfile/PKGBUILD b/extra/libxkbfile/PKGBUILD
index 1e612efa6..219e7e573 100644
--- a/extra/libxkbfile/PKGBUILD
+++ b/extra/libxkbfile/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=libxkbfile
 pkgver=1.0.8
-pkgrel=1
+pkgrel=1.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 752f16bba..eac86cf42 100644
--- a/extra/libxkbui/PKGBUILD
+++ b/extra/libxkbui/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxkbui
 pkgver=1.0.2
 pkgrel=5
 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 b223a951e..c8c833eb9 100644
--- a/extra/libxklavier/PKGBUILD
+++ b/extra/libxklavier/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxklavier
 pkgver=5.3
 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=('gobject-introspection')
diff --git a/extra/libxmi/PKGBUILD b/extra/libxmi/PKGBUILD
index 64ab91e1f..a1f0a01a2 100644
--- a/extra/libxmi/PKGBUILD
+++ b/extra/libxmi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxmi
 pkgver=1.2
 pkgrel=6
 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')
@@ -16,7 +16,6 @@ md5sums=('4e6935484f0ad71b531920bf4c546b47')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  autoreconf --force --install
   ./configure --prefix=/usr --infodir=/usr/share/info
   make
 }
diff --git a/extra/libxml++/PKGBUILD b/extra/libxml++/PKGBUILD
index c2652fea4..caa4ecf9b 100644
--- a/extra/libxml++/PKGBUILD
+++ b/extra/libxml++/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=libxml++
 pkgname=('libxml++' 'libxml++-docs')
 pkgver=2.36.0
 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 f57bfee15..059a422bb 100644
--- a/extra/libxml2/PKGBUILD
+++ b/extra/libxml2/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libxml2
 pkgver=2.9.1
 pkgrel=5
 pkgdesc="XML parsing library, version 2"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('MIT')
 depends=('zlib' 'readline' 'ncurses' 'xz')
 makedepends=('python2')
diff --git a/extra/libxmu/PKGBUILD b/extra/libxmu/PKGBUILD
index a4396c94d..f511bd58c 100644
--- a/extra/libxmu/PKGBUILD
+++ b/extra/libxmu/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxmu
 pkgver=1.1.2
 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 c579096db..a35dd42e7 100644
--- a/extra/libxp/PKGBUILD
+++ b/extra/libxp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxp
 pkgver=1.0.2
 pkgrel=1
 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 877bf051d..6541a1bc9 100644
--- a/extra/libxpm/PKGBUILD
+++ b/extra/libxpm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxpm
 pkgver=3.5.11
 pkgrel=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 2556e81ca..c8df0528f 100644
--- a/extra/libxrandr/PKGBUILD
+++ b/extra/libxrandr/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libxrandr
 pkgver=1.4.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>=1.4.0')
diff --git a/extra/libxrender/PKGBUILD b/extra/libxrender/PKGBUILD
index e5ba22ec5..563675c59 100644
--- a/extra/libxrender/PKGBUILD
+++ b/extra/libxrender/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxrender
 pkgver=0.9.8
 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 9ee972b4a..9f97d882c 100644
--- a/extra/libxres/PKGBUILD
+++ b/extra/libxres/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxres
 pkgver=1.0.7
 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/libxshmfence/PKGBUILD b/extra/libxshmfence/PKGBUILD
index f12f9e2f0..eab90c326 100644
--- a/extra/libxshmfence/PKGBUILD
+++ b/extra/libxshmfence/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxshmfence
 pkgver=1.1
 pkgrel=1
 pkgdesc="a library that exposes a event API on top of Linux futexes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('GPL')
 #groups=()
diff --git a/extra/libxslt/PKGBUILD b/extra/libxslt/PKGBUILD
index a106b67a1..55aa3596f 100644
--- a/extra/libxslt/PKGBUILD
+++ b/extra/libxslt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxslt
 pkgver=1.1.28
 pkgrel=3
 pkgdesc="XML stylesheet transformation library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xmlsoft.org/XSLT/"
 license=('custom')
 depends=('libxml2' 'libgcrypt')
diff --git a/extra/libxss/PKGBUILD b/extra/libxss/PKGBUILD
index 0e8959f49..fca9b7bbc 100644
--- a/extra/libxss/PKGBUILD
+++ b/extra/libxss/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxss
 pkgver=1.2.2
 pkgrel=2
 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 7a8094b25..f072fd09d 100644
--- a/extra/libxt/PKGBUILD
+++ b/extra/libxt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxt
 pkgver=1.1.4
 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 699b9ea50..a3fb67387 100644
--- a/extra/libxtst/PKGBUILD
+++ b/extra/libxtst/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxtst
 pkgver=1.2.2
 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' 'libxfixes')
diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD
index bc234f6d3..b0b64f8c6 100644
--- a/extra/libxv/PKGBUILD
+++ b/extra/libxv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxv
 pkgver=1.0.10
 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 912945dc7..27b396f6d 100644
--- a/extra/libxvmc/PKGBUILD
+++ b/extra/libxvmc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libxvmc
 pkgver=1.0.8
 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')
diff --git a/extra/libxxf86dga/PKGBUILD b/extra/libxxf86dga/PKGBUILD
index 20753d80b..5ad319336 100644
--- a/extra/libxxf86dga/PKGBUILD
+++ b/extra/libxxf86dga/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libxxf86dga
 pkgver=1.1.4
 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 bdd38e3f9..e1f130caf 100644
--- a/extra/libxxf86vm/PKGBUILD
+++ b/extra/libxxf86vm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=libxxf86vm
 pkgver=1.1.3
 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 74ef081a3..ca35e0a20 100644
--- a/extra/libytnef/PKGBUILD
+++ b/extra/libytnef/PKGBUILD
@@ -8,14 +8,14 @@ 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')
 depends=('glibc')
 source=("http://downloads.sourceforge.net/ytnef/${pkgname}-${pkgver}.tar.gz")
 md5sums=('6c44b955f33cf714c75a7bbe895cc352')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr --disable-static --build=$CHOST --host=$CHOST
   make
 }
 
diff --git a/extra/libzapojit/PKGBUILD b/extra/libzapojit/PKGBUILD
index cddbdfd84..b32425df0 100644
--- a/extra/libzapojit/PKGBUILD
+++ b/extra/libzapojit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=libzapojit
 pkgver=0.0.3
 pkgrel=1
 pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libsoup' 'gnome-online-accounts')
 makedepends=('intltool' 'gobject-introspection')
diff --git a/extra/libzeitgeist/PKGBUILD b/extra/libzeitgeist/PKGBUILD
index 5c2606960..c16701d43 100644
--- a/extra/libzeitgeist/PKGBUILD
+++ b/extra/libzeitgeist/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=libzeitgeist
 pkgver=0.3.18
 pkgrel=4
 pkgdesc="Zeitgeist client library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://launchpad.net/libzeitgeist"
 license=('LGPL2.1')
 depends=('glib2')
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD
index 399dea368..33f43b7dd 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=('BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('zlib')
 source=("http://www.nih.at/${pkgname}/${pkgname}-${pkgver}.tar.xz")
 md5sums=('44c99b67dca34707b5728e5f8434fe91')
diff --git a/extra/libzrtpcpp/PKGBUILD b/extra/libzrtpcpp/PKGBUILD
index 376d7bcff..47eebf2d0 100644
--- a/extra/libzrtpcpp/PKGBUILD
+++ b/extra/libzrtpcpp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=libzrtpcpp
 pkgver=2.3.4
 pkgrel=1
 pkgdesc="A C++ implementation of Phil Zimmermann's ZRTP specification"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.gnutelephony.org/index.php/GNU_ZRTP'
 license=('GPL3')
 depends=('ccrtp')
diff --git a/extra/libzvt/PKGBUILD b/extra/libzvt/PKGBUILD
index 613d14db8..4043a6370 100644
--- a/extra/libzvt/PKGBUILD
+++ b/extra/libzvt/PKGBUILD
@@ -6,20 +6,23 @@ pkgname=libzvt
 pkgver=2.0.1
 pkgrel=7
 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' 'libart-lgpl')
 makedepends=('pkgconfig')
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/libzvt/2.0/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4bbea49495a341650fa1f89908e6554e')
+source=(ftp://ftp.gnome.org/pub/GNOME/sources/libzvt/2.0/${pkgname}-${pkgver}.tar.bz2
+	libzvt-2.0.1-correct_glib_include.patch)
+md5sums=('4bbea49495a341650fa1f89908e6554e'
+	 '2e30c7aafd5fc8dc1de0971ca562fee0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/libzvt-2.0.1-correct_glib_include.patch
   sed -i -e 's/-DGTK_DISABLE_DEPRECATED//g' libzvt/Makefile.*
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib
+      --libexecdir=/usr/lib --build=$CHOST
   make
 }
 
diff --git a/extra/libzvt/libzvt-2.0.1-correct_glib_include.patch b/extra/libzvt/libzvt-2.0.1-correct_glib_include.patch
new file mode 100644
index 000000000..e94c49135
--- /dev/null
+++ b/extra/libzvt/libzvt-2.0.1-correct_glib_include.patch
@@ -0,0 +1,11 @@
+--- libzvt-2.0.1.orig/libzvt/gnome-pty-helper.c	2002-06-05 01:07:33.000000000 -0500
++++ libzvt-2.0.1/libzvt/gnome-pty-helper.c	2012-11-29 20:07:50.505466139 -0500
+@@ -52,7 +52,7 @@
+ #include <stdio.h>
+ #include <utmp.h>
+ #include <grp.h>
+-#include <glib/galloca.h>
++#include <glib.h>
+ #include "gnome-pty.h"
+ #include "gnome-login-support.h"
+ 
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index 4bf7f1dc6..252244505 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=licq
 pkgver=1.7.1
 pkgrel=6
 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=('boost-libs' 'gpgme' 'libxss' 'qt4')
diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD
index 0a1724a31..a6c474b5b 100644
--- a/extra/lightsoff/PKGBUILD
+++ b/extra/lightsoff/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lightsoff
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Turn off all the lights"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index eb453ae40..41606ec98 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=1.4.34
 pkgrel=1
 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' 'systemd')
 makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
diff --git a/extra/lilv/PKGBUILD b/extra/lilv/PKGBUILD
index 55f55ca29..afacf9f9f 100644
--- a/extra/lilv/PKGBUILD
+++ b/extra/lilv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lilv
 pkgver=0.18.0
 pkgrel=1
 pkgdesc="A C library interface to the LV2 plug-in standard"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/lilv/"
 license=('custom:ISC')
 depends=('python2-numpy' 'sratom>=0.4.4' 'jack')
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index fc3b52ba6..134debaa0 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=link-grammar
 pkgver=4.8.6
 pkgrel=1
 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=('aspell')
diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD
index e25f0ea94..6a6a9a640 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')
@@ -21,6 +21,7 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   patch -p0 -i "$srcdir/liquidwar-5.6.4-ovflfix.patch"
   sed -i 's/python/python2/' doc/Makefile.in
+  sed -ri 's/(EXTERN_LIBS .+)$/\1 -lm/' src/Makefile.in
   [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm"
   LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS
   make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 3e8e9f3f6..8d379f34b 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=live-media
 pkgver=2014.02.13
 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')
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index b28c023cd..1e80a5810 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer'
          'clang-tools-extra')
 pkgver=3.4
 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' 'python-sphinx')
diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD
index fe8795f58..fe6d8eb12 100644
--- a/extra/lm_sensors/PKGBUILD
+++ b/extra/lm_sensors/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=lm_sensors
 pkgver=3.3.5
 pkgrel=1
 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 f242e0bb9..1f2897d7f 100644
--- a/extra/loudmouth/PKGBUILD
+++ b/extra/loudmouth/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=loudmouth
 pkgver=1.4.3
 pkgrel=4
 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 db2c1502f..838cddee1 100644
--- a/extra/lpsolve/PKGBUILD
+++ b/extra/lpsolve/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=5.5.2.0
 _mainver=5.5
 pkgrel=2
 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/lsof/PKGBUILD b/extra/lsof/PKGBUILD
index 4cfc24fef..1ac9d3db7 100644
--- a/extra/lsof/PKGBUILD
+++ b/extra/lsof/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=lsof
 pkgver=4.87
 pkgrel=2
 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 ffb8981c3..0ca77b8fe 100644
--- a/extra/ltrace/PKGBUILD
+++ b/extra/ltrace/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ltrace
 pkgver=0.7.3
 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 ec990366b..2255b35b1 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lua
 pkgver=5.2.3
 pkgrel=1
 pkgdesc='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')
diff --git a/extra/lua51/PKGBUILD b/extra/lua51/PKGBUILD
index 61daa8594..d62683e70 100644
--- a/extra/lua51/PKGBUILD
+++ b/extra/lua51/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=lua51
 pkgver=5.1.5
 pkgrel=4
 pkgdesc='Powerful lightweight programming language designed for extending applications'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.lua.org/'
 depends=('readline')
 license=('MIT')
@@ -29,6 +29,7 @@ build() {
   cd lua-$pkgver
 
   [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
+  [[ $CARCH == mips64el ]] && export CFLAGS="$CFLAGS -fPIC"
   sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
   sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' \
     -i src/Makefile
diff --git a/extra/lv2/PKGBUILD b/extra/lv2/PKGBUILD
index 2c88c1bf1..a6ab5d8bf 100644
--- a/extra/lv2/PKGBUILD
+++ b/extra/lv2/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="Successor to the LADSPA audio plug-in standard"
 url="http://lv2plug.in/"
 license=('LGPL' 'custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libsndfile' 'gtk2')
 optdepends=('libsndfile: Example sampler'
             'gtk2: Example sampler'
diff --git a/extra/lynx/PKGBUILD b/extra/lynx/PKGBUILD
index c934ebab3..b6a01d92c 100644
--- a/extra/lynx/PKGBUILD
+++ b/extra/lynx/PKGBUILD
@@ -9,7 +9,7 @@ _relver=${pkgver}rel.1
 pkgrel=1
 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=('openssl')
 backup=('etc/lynx.cfg')
@@ -25,7 +25,8 @@ build() {
     --with-ssl=/usr \
     --enable-nls \
     --enable-ipv6 \
-    --mandir=/usr/share/man
+    --mandir=/usr/share/man \
+    CFLAGS="$CFLAGS -DUSE_OPENSSL_INCL"
   make
 }
 
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 944d22bb9..46963064d 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lyx
 pkgver=2.0.7
 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=('qt4' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
 makedepends=('boost')
diff --git a/extra/lzo/PKGBUILD b/extra/lzo/PKGBUILD
index 115baed03..8eb151a27 100644
--- a/extra/lzo/PKGBUILD
+++ b/extra/lzo/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=lzo
 pkgver=1.08
 pkgrel=8
 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')
@@ -26,7 +26,7 @@ prepare() {
 build() {
   cd ${pkgname}-${pkgver}
   autoconf
-  ./configure --prefix=/usr --enable-shared
+	./configure --prefix=/usr --enable-shared --build=$CHOST
   make
 }
 
diff --git a/extra/lzop/PKGBUILD b/extra/lzop/PKGBUILD
index b507594a4..2a12dff60 100644
--- a/extra/lzop/PKGBUILD
+++ b/extra/lzop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=lzop
 pkgver=1.03
 pkgrel=2
 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 7e929189e..5f15d7d50 100644
--- a/extra/m17n-lib/PKGBUILD
+++ b/extra/m17n-lib/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.6.4
 pkgrel=2
 pkgdesc='Multilingual text processing library (runtimes)'
 url='http://www.nongnu.org/m17n/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf')
 optdepends=('anthy: to use the anthy input method')
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index f14483d18..734ac09b7 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=5.5.35
 _pkgver=${pkgver/.a/a}
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url='http://mariadb.org/'
 makedepends=('cmake' 'openssl' 'zlib' 'libaio')
@@ -58,7 +58,8 @@ build() {
     -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
     -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
     -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}"
+    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+    -DBISON_USABLE=0
 
 
   make
diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD
index 240f4849c..8ad7fdbb2 100644
--- a/extra/mash/PKGBUILD
+++ b/extra/mash/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mash
 pkgver=0.2.0
 pkgrel=3
 pkgdesc="A small library for using 3D models within a Clutter scene"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://clutter-project.org/"
 license=('LGPL')
 depends=('clutter')
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 28a98b68e..51a6873d9 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -6,10 +6,14 @@ pkgname=maxima
 pkgver=5.32.1
 pkgrel=2
 pkgdesc="A sophisticated computer algebra system"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.1.15' 'texinfo' 'sh')
+if [ "${CARCH}" == "mips64el" ] ; then
+    depends=('clisp' 'texinfo' 'sh')
+else
+    depends=('sbcl=1.1.15' '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
 
   # help avoid (re)running makeinfo/tex
   touch doc/info/maxima.info
diff --git a/extra/mcpp/PKGBUILD b/extra/mcpp/PKGBUILD
index e86f05374..62c8e011d 100644
--- a/extra/mcpp/PKGBUILD
+++ b/extra/mcpp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mcpp
 pkgver=2.7.2
 pkgrel=4
 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/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD
index fe89a1055..90def1a60 100644
--- a/extra/mediastreamer/PKGBUILD
+++ b/extra/mediastreamer/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=mediastreamer
 pkgver=2.9.0
 pkgrel=4
 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' 'ffmpeg' 'libxv' 'libupnp')
diff --git a/extra/memcached/PKGBUILD b/extra/memcached/PKGBUILD
index d743e3091..90408b3ab 100644
--- a/extra/memcached/PKGBUILD
+++ b/extra/memcached/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=memcached
 pkgver=1.4.17
 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 8c9d82e51..c244b0955 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mercurial
 pkgver=2.9
 pkgrel=2
 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 ac0faa5f2..ac42a2a63 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -3,12 +3,16 @@
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
+pkgname=('mesa' 'mesa-libgl')
 pkgver=10.0.3
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
-             'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
+             'wayland' 'elfutils' 'llvm' 'systemd')
+if [ "$CARCH" != "mips64el" ]; then
+  pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri')
+  makedepends+=('libvdpau' 'llvm-amdgpu-snapshot')
+fi
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
@@ -19,7 +23,13 @@ md5sums=('5f9f463ef08129f6762106b434910adb'
 build() {
   cd ${srcdir}/?esa-*
 
-  autoreconf -vfi # our automake is far too new for their build system :)
+   if [ "$CARCH" = "mips64el" ]; then
+     extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast --disable-gallium-llvm --disable-vdpau"
+   else
+     extraconf=""
+   fi
+
+    autoreconf -vfi # our automake is far too new for their build system :)
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
@@ -42,6 +52,7 @@ build() {
     --enable-texture-float \
     --enable-xa \
     --enable-vdpau \
+    $extraconf
     # --help
 
   make
@@ -113,11 +124,12 @@ package_svga-dri() {
 
 package_mesa() {
   pkgdesc="an open-source implementation of the OpenGL specification"
-  depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs')
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs')
   optdepends=('opengl-man-pages: for the OpenGL API man pages')
   provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
   conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
   replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+  [ "$CARCH" != "mips64el" ] && depends+=('libvdpau')
 
   mv -v ${srcdir}/fakeinstall/* ${pkgdir}
   # rename libgl.so to not conflict with blobs - may break gl.pc ?
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/metalog/PKGBUILD b/extra/metalog/PKGBUILD
index 1be0e239e..efdeaf7fc 100644
--- a/extra/metalog/PKGBUILD
+++ b/extra/metalog/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc="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')
diff --git a/extra/mhash/PKGBUILD b/extra/mhash/PKGBUILD
index 8227d8250..732f2d0c7 100644
--- a/extra/mhash/PKGBUILD
+++ b/extra/mhash/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mhash
 pkgver=0.9.9.9
 pkgrel=3
 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/mirage/PKGBUILD b/extra/mirage/PKGBUILD
index c63d6eddc..8051f73a2 100644
--- a/extra/mirage/PKGBUILD
+++ b/extra/mirage/PKGBUILD
@@ -4,12 +4,12 @@
 # Contributor: Scott Horowitz <stonecrest@gmail.com>
 pkgname=mirage
 pkgver=0.9.5.2
-pkgrel=1
+pkgrel=1.1
 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 c84b505c4..6fe805c8a 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=miro
 pkgver=6.0
 pkgrel=1
 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=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index bc042e9fd..762555038 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mjpegtools
 pkgver=2.0.0
 pkgrel=4
 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')
@@ -30,7 +30,7 @@ prepare() {
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --enable-largefile
+  ./configure --prefix=/usr --enable-largefile CXXFLAGS="$CXXFLAGS -fpermissive"
   make
 }
 
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index e7338e4e0..211bbb0a6 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
 pkgver=6.7.0
 pkgrel=2
-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 059249cb8..8b15eb1a6 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.5.0beta2
 pkgrel=1
 epoch=1
 pkgdesc="An ncurses console audio player designed to be powerful and easy to use"
-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..ecb9d3b28 100644
--- a/extra/mod_dnssd/PKGBUILD
+++ b/extra/mod_dnssd/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=mod_dnssd
 pkgver=0.6
-pkgrel=4
+pkgrel=4.1
 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 6000ddab9..6ed3fbc7b 100644
--- a/extra/mod_fcgid/PKGBUILD
+++ b/extra/mod_fcgid/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.3.9
 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://www.apache.org/dist/httpd/mod_fcgid/mod_fcgid-$pkgver.tar.bz2{,.asc})
diff --git a/extra/mod_perl/PKGBUILD b/extra/mod_perl/PKGBUILD
index 98635216b..65437b6f4 100644
--- a/extra/mod_perl/PKGBUILD
+++ b/extra/mod_perl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mod_perl
 pkgver=2.0.8
 pkgrel=1
 pkgdesc="Apache module that embeds the Perl interpreter within the server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://perl.apache.org/"
 license=('APACHE')
 depends=('perl' 'apache' 'db' 'apr-util' 'perl-linux-pid')
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 7519c974e..549f23bb2 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=(modemmanager libmm-glib)
 pkgver=1.2.0
 pkgrel=2
 pkgdesc="Mobile broadband modem management service"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/ModemManager/"
 license=(GPL2 LGPL2.1)
 depends=(systemd polkit ppp libqmi libmbim)
diff --git a/extra/most/PKGBUILD b/extra/most/PKGBUILD
index d716d4234..6ef97c5e2 100644
--- a/extra/most/PKGBUILD
+++ b/extra/most/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=most
 pkgver=5.0.0a
 pkgrel=6
 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/mousepad/PKGBUILD b/extra/mousepad/PKGBUILD
index b9d704429..9757bf83b 100644
--- a/extra/mousepad/PKGBUILD
+++ b/extra/mousepad/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mousepad
 pkgver=0.3.0
 pkgrel=2
 pkgdesc="Simple Text Editor for Xfce4 (based on Gedit)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url=('http://www.xfce.org/')
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD
index 4f24f5319..ca56bd002 100644
--- a/extra/mousetweaks/PKGBUILD
+++ b/extra/mousetweaks/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mousetweaks
 pkgver=3.10.0
 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 8cd23495f..93aa0bec0 100644
--- a/extra/mp3splt/PKGBUILD
+++ b/extra/mp3splt/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=mp3splt
 pkgver=2.6
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="Commandline 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..124868004 100644
--- a/extra/mp3wrap/PKGBUILD
+++ b/extra/mp3wrap/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=mp3wrap
 pkgver=0.5
-pkgrel=3
+pkgrel=3.1
 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 7cae118ac..489f8a4fc 100644
--- a/extra/mpc/PKGBUILD
+++ b/extra/mpc/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 pkgdesc='Minimalist command line interface to MPD'
 url='http://www.musicpd.org/clients/mpc/'
 license=('GPL2')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libmpdclient')
 source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
 sha1sums=('c649cd19e4195749ca7da309c10acd53ac139b49' 'SKIP')
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 80b0943fd..09d446c0a 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -11,7 +11,7 @@ pkgrel=1
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://www.musicpd.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
          'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient')
 makedepends=('doxygen')
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index 7e457c5f6..254dfb151 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=mpg123
 pkgver=1.18.1
 pkgrel=1
 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=('LGPL2.1')
 depends=('libltdl' 'alsa-lib')
diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD
index 3f4ed181a..073d40f87 100644
--- a/extra/msmtp/PKGBUILD
+++ b/extra/msmtp/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=msmtp
 pkgname=('msmtp' 'msmtp-mta')
 pkgver=1.4.31
 pkgrel=5
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3')
 url="http://msmtp.sourceforge.net"
 makedepends=('texlive-plainextra' 'gsasl' 'libgnome-keyring')
diff --git a/extra/mtdev/PKGBUILD b/extra/mtdev/PKGBUILD
index ef5b96abc..17370aca9 100644
--- a/extra/mtdev/PKGBUILD
+++ b/extra/mtdev/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mtdev
 pkgver=1.1.4
 pkgrel=1
 pkgdesc="A stand-alone library which transforms all variants of kernel MT events to the slotted type B protocol"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://bitmath.org/code/mtdev/"
 license=('custom:MIT')
 depends=('glibc')
diff --git a/extra/mtools/PKGBUILD b/extra/mtools/PKGBUILD
index 0349e3124..4e1d80f8d 100644
--- a/extra/mtools/PKGBUILD
+++ b/extra/mtools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mtools
 pkgver=4.0.18
 pkgrel=1
 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 cd6970bfe..11f434603 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=mtr
 pkgname=(mtr mtr-gtk)
 pkgver=0.85
 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/muparser/PKGBUILD b/extra/muparser/PKGBUILD
index fa5ef53dc..43d2aa26f 100644
--- a/extra/muparser/PKGBUILD
+++ b/extra/muparser/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=muparser
 pkgver=2.2.3
 pkgrel=1
 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 3e817d8f9..a8c740023 100644
--- a/extra/musicbrainz/PKGBUILD
+++ b/extra/musicbrainz/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=musicbrainz
 pkgver=2.1.5
 pkgrel=6
 pkgdesc="The second generation incarnation of the CD Index"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.musicbrainz.org"
 license=('LGPL')
 depends=('expat>=2.0' 'gcc-libs')
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index fc944975f..6ceef05d2 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 a6aa4f384..990f3ba39 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=mutter
 pkgver=3.10.4
 pkgrel=1
 pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm' 'gnome-desktop' 'upower')
 makedepends=('intltool' 'gnome-doc-utils')
diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD
index 977f22f10..7c4f921b3 100644
--- a/extra/mysql-python/PKGBUILD
+++ b/extra/mysql-python/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=mysql-python
 pkgver=1.2.5
 pkgrel=1
 pkgdesc="MySQL support for Python"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" 'mips64el')
 url="http://mysql-python.sourceforge.net/"
 license=('GPL2')
 depends=('python2' 'libmariadbclient')
diff --git a/extra/naim/PKGBUILD b/extra/naim/PKGBUILD
index d09e33ed7..c0ca74303 100644
--- a/extra/naim/PKGBUILD
+++ b/extra/naim/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=naim
 pkgver=0.11.8.3.2
-pkgrel=2
+pkgrel=2.1
 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 768338423..7219b0124 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nasm
 pkgver=2.11.01
 pkgrel=1
 pkgdesc="An 80x86 assembler designed for portability and modularity"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nasm.us"
 license=('BSD')
 depends=('glibc')
diff --git a/extra/nautilus-open-terminal/PKGBUILD b/extra/nautilus-open-terminal/PKGBUILD
index 917e75100..603a05c35 100644
--- a/extra/nautilus-open-terminal/PKGBUILD
+++ b/extra/nautilus-open-terminal/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nautilus-open-terminal
 pkgver=0.20
 pkgrel=1
 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 30a118fb0..eba6067de 100644
--- a/extra/nautilus-sendto/PKGBUILD
+++ b/extra/nautilus-sendto/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=nautilus-sendto
 pkgver=3.8.1
 pkgrel=1
 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)
 depends=(glib2)
diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD
index 2073e625e..ee035d389 100644
--- a/extra/nautilus/PKGBUILD
+++ b/extra/nautilus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(nautilus libnautilus-extension)
 pkgver=3.10.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 nautilus-sendto)
diff --git a/extra/nawk/PKGBUILD b/extra/nawk/PKGBUILD
index cafb30750..a3b760125 100644
--- a/extra/nawk/PKGBUILD
+++ b/extra/nawk/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc="The one, true implementation of AWK"
 url="http://cm.bell-labs.com/who/bwk/"
 license=('MIT')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!makeflags')
 depends=('glibc')
 source=("$pkgname-$pkgver.tar.gz::http://www.cs.princeton.edu/~bwk/btl.mirror/awk.tar.gz"
diff --git a/extra/ncftp/PKGBUILD b/extra/ncftp/PKGBUILD
index 2b1189ee0..6dc6f19a4 100644
--- a/extra/ncftp/PKGBUILD
+++ b/extra/ncftp/PKGBUILD
@@ -6,10 +6,10 @@
 
 pkgname=ncftp
 pkgver=3.2.5
-pkgrel=2
+pkgrel=2.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 6759227fa..842ca76de 100644
--- a/extra/ncmpc/PKGBUILD
+++ b/extra/ncmpc/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=0.21
 pkgrel=1
 pkgdesc='Fully featured MPD client using ncurses'
 url='http://www.musicpd.org/clients/ncmpc/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('ncurses' 'glib2' 'libmpdclient')
 optdepends=('python2: to enable lyrics plugin'
diff --git a/extra/nedit/PKGBUILD b/extra/nedit/PKGBUILD
index 90e40764f..2dffb2fb8 100644
--- a/extra/nedit/PKGBUILD
+++ b/extra/nedit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nedit
 pkgver=5.5
 pkgrel=7
 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 d34c081e9..765feccaa 100644
--- a/extra/neon/PKGBUILD
+++ b/extra/neon/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=neon
 pkgver=0.30.0
 pkgrel=1
 pkgdesc="HTTP and WebDAV client library with a C interface"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.webdav.org/neon/"
 license=('GPL' 'LGPL')
 depends=('krb5' 'expat' 'ca-certificates')
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index 3019ec95d..de7dfaa65 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools' 'kdegraphics-mobipocket')
 makedepends=('cmake' 'automoc4' 'doxygen')
diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD
index b5267e037..9c95a4678 100644
--- a/extra/nepomuk-widgets/PKGBUILD
+++ b/extra/nepomuk-widgets/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.12.2
 pkgrel=1
 pkgdesc="The Library containing the Nepomuk Widgets"
 url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL' 'LGPL' 'FDL')
 depends=('nepomuk-core')
 makedepends=('cmake' 'automoc4')
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 4e003ed5a..c7e20e779 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=net-snmp
 pkgver=5.7.2
 pkgrel=8
 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-cxx/PKGBUILD b/extra/netcdf-cxx/PKGBUILD
index 6e78b50d4..e98d925b6 100644
--- a/extra/netcdf-cxx/PKGBUILD
+++ b/extra/netcdf-cxx/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netcdf-cxx
 pkgver=4.2
 pkgrel=2
 pkgdesc="NetCDF c++ bindings"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-cxx/index.jsp"
 depends=('gcc-libs' 'netcdf' 'curl')
 options=('!makeflags')
diff --git a/extra/netcdf-fortran/PKGBUILD b/extra/netcdf-fortran/PKGBUILD
index 0d969cd73..ac405d877 100644
--- a/extra/netcdf-fortran/PKGBUILD
+++ b/extra/netcdf-fortran/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netcdf-fortran
 pkgver=4.2
 pkgrel=1
 pkgdesc="NetCDF fortran bindings"
-arch=("i686" "x86_64")
+arch=("i686" "x86_64" "mips64el")
 url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-fortran/index.jsp"
 depends=('gcc-libs' 'netcdf' 'curl' 'gcc-fortran')
 options=('!makeflags')
diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD
index acc1b642c..bc935104c 100644
--- a/extra/netcdf/PKGBUILD
+++ b/extra/netcdf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=netcdf
 pkgver=4.3.0
 pkgrel=2
 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' 'curl')
 optdepends=('netcdf-fortran: fortran bindings' 'netcdf-cxx: c++ bindings')
diff --git a/extra/netkit-bsd-finger/PKGBUILD b/extra/netkit-bsd-finger/PKGBUILD
index 767e8b77d..ae56aeda5 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=8
 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 39675625b..d2804b774 100644
--- a/extra/netpbm/PKGBUILD
+++ b/extra/netpbm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=netpbm
 pkgver=10.61.02
 pkgrel=3
 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' 'libpng' 'libtiff' 'libxml2')
@@ -43,7 +43,7 @@ prepare() {
   sed -i 's|@python|@python2|' buildtools/manpage.mk
 
   cp config.mk.in  config.mk
-  [ "${CARCH}" = 'x86_64' ] && echo 'CFLAGS_SHLIB = -fPIC' >> config.mk
+  [ "${CARCH}" != 'i686' ] && 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 cdeec201d..f8fad946a 100644
--- a/extra/nettle/PKGBUILD
+++ b/extra/nettle/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nettle
 pkgver=2.7.1
 pkgrel=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 177bb6546..2308ea051 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=network-manager-applet
 pkgver=0.9.8.8
 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>=${pkgver%.*}" libsecret gtk3 libnotify
diff --git a/extra/networkmanager-openconnect/PKGBUILD b/extra/networkmanager-openconnect/PKGBUILD
index 2e6348c5e..8f2e74594 100644
--- a/extra/networkmanager-openconnect/PKGBUILD
+++ b/extra/networkmanager-openconnect/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=networkmanager-openconnect
 pkgver=0.9.8.4
 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::5}" 'openconnect' 'libgnome-keyring' 'gtk3')
diff --git a/extra/networkmanager-openvpn/PKGBUILD b/extra/networkmanager-openvpn/PKGBUILD
index c8f8ac463..7e5053f4c 100644
--- a/extra/networkmanager-openvpn/PKGBUILD
+++ b/extra/networkmanager-openvpn/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=networkmanager-openvpn
 pkgver=0.9.8.4
 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')
@@ -20,7 +20,7 @@ build() {
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
+	--disable-static --disable-more-warnings
   make
 }
 
diff --git a/extra/networkmanager-pptp/PKGBUILD b/extra/networkmanager-pptp/PKGBUILD
index c8d0013f4..b470408fd 100644
--- a/extra/networkmanager-pptp/PKGBUILD
+++ b/extra/networkmanager-pptp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=networkmanager-pptp
 pkgver=0.9.8.4
 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 4f619af60..73cf23210 100644
--- a/extra/networkmanager-vpnc/PKGBUILD
+++ b/extra/networkmanager-vpnc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=networkmanager-vpnc
 pkgver=0.9.8.6
 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')
@@ -20,7 +20,7 @@ build() {
   ./configure --prefix=/usr \
   	--sysconfdir=/etc \
 	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
+	--disable-static --disable-more-warnings
   make
 }
 
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 7e7cd7825..4265462e1 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -11,7 +11,7 @@ _pkgname=NetworkManager
 pkgver=0.9.8.8
 pkgrel=1
 pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.gnome.org/projects/$_pkgname/"
 depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client
diff --git a/extra/neverball/PKGBUILD b/extra/neverball/PKGBUILD
index f0ad79476..9c0612f0f 100644
--- a/extra/neverball/PKGBUILD
+++ b/extra/neverball/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=neverball
 pkgver=1.5.4
 pkgrel=6
 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/nitrogen/PKGBUILD b/extra/nitrogen/PKGBUILD
index 3a3ddac95..ae6a2f81b 100644
--- a/extra/nitrogen/PKGBUILD
+++ b/extra/nitrogen/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=nitrogen
 pkgver=1.5.2
-pkgrel=1
+pkgrel=1.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')
@@ -18,7 +18,7 @@ md5sums=('dd779a252a222eb9d329d74b809cfe73')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
-  make
+  make LDADD="-lX11"
 }
 
 package() {
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index 2b785b28f..cf32cab3d 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=6.40
 pkgrel=1
 pkgdesc='Utility for network discovery and security auditing'
 url='http://nmap.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 makedepends=('pygtk')
 optdepends=('pygtk: zenmap'
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 3bd171c72..b7e608880 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nspr
 pkgver=4.10.3
 pkgrel=1
 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 6747d103a..7fd2ed400 100644
--- a/extra/nss-mdns/PKGBUILD
+++ b/extra/nss-mdns/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=nss-mdns
 pkgver=0.10
-pkgrel=5
+pkgrel=5.1
 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 73004fee8..4429bfa01 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=nss
 pkgver=3.15.4
 pkgrel=1
 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.10.2
diff --git a/extra/nss_ldap/PKGBUILD b/extra/nss_ldap/PKGBUILD
index e702b98e8..28ad9366f 100644
--- a/extra/nss_ldap/PKGBUILD
+++ b/extra/nss_ldap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=nss_ldap
 pkgver=265
 pkgrel=4
 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' 'krb5')
@@ -17,6 +17,7 @@ md5sums=('c1cb02d1a85538cf16bca6f6a562abe4')
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure \
+       --build=$CHOST --host=$CHOST \
        --prefix=/usr \
        --with-ldap-conf-file=/etc/nss_ldap.conf \
        --with-ldap=openldap \
diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD
index d329507db..143450341 100644
--- a/extra/ntfs-3g_ntfsprogs/PKGBUILD
+++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ntfs-3g
 pkgver=2013.1.13
 pkgrel=4
 pkgdesc="NTFS filesystem utilities"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tuxera.com/community/ntfs-3g-download/"
 license=('GPL2')
 depends=('util-linux' 'fuse')
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 34997d0cb..962ee6771 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=18
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('perl-html-parser')
 depends=('openssl' 'libcap' 'libedit')
 backup=('etc/ntp.conf')
diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD
index 532e145ba..68560df5c 100644
--- a/extra/numactl/PKGBUILD
+++ b/extra/numactl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=numactl
 pkgver=2.0.9
 pkgrel=2
 pkgdesc="Simple NUMA policy support"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://oss.sgi.com/projects/libnuma/"
 license=('LGPL2.1' 'GPL2')
 depends=('perl')
diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD
index 63ae8e01f..1381da1ca 100644
--- a/extra/nx/PKGBUILD
+++ b/extra/nx/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers')
 pkgver=3.5.0.22
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://wiki.x2go.org/"
 license=('GPL')
 #options=('!makeflags') # '!strip')
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index d097464e6..a4cd361d0 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -2,23 +2,31 @@
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase='ocaml'
-pkgname=('ocaml' 'ocaml-compiler-libs')
+pkgname=('ocaml')
+# Needs optimized build.
+[ "$CARCH" = "mips64el" ] || pkgname+=('ocaml-compiler-libs')
 pkgver=4.01.0
 pkgrel=3
 pkgdesc="A functional language with OO extensions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL2.1' 'custom: QPL-1.0')
 url="http://caml.inria.fr/"
 depends=('gdbm')
 makedepends=('tk>=8.6.0' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
-source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz)
+source=(http://caml.inria.fr/distrib/ocaml-4.01/${pkgname}-${pkgver}.tar.gz
+        fix-caml_int64_float_of_bits-n32.patch)
 options=('!makeflags' '!emptydirs' 'staticlibs')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-caml_int64_float_of_bits-n32.patch"
   ./configure -prefix /usr -x11include /usr/include 
-  make world.opt
+  if [ "${CARCH}" == "mips64el" ] ; then
+      make world
+  else
+      make world.opt
+  fi
 }
 
 package_ocaml() {
@@ -54,4 +62,5 @@ optdepends=()
   install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
   install -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
-md5sums=('04dfdd7da189462a4f10ec6530359cef')
+md5sums=('04dfdd7da189462a4f10ec6530359cef'
+         'e2c8bc316efe40532c5b9d7f9a1d8d62')
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/octave/PKGBUILD b/extra/octave/PKGBUILD
index e759630ab..95751d3f9 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=octave
 pkgver=3.8.0
 pkgrel=2
 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' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu') 
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index cfc2ccb1e..49d97bb11 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=opal
 pkgver=3.10.11
 pkgrel=2
 pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.opalvoip.org"
 license=(GPL)
 depends=(ptlib libtheora x264 speex gsm celt)
diff --git a/extra/openal/PKGBUILD b/extra/openal/PKGBUILD
index 5df7b91f9..fd465c6ee 100644
--- a/extra/openal/PKGBUILD
+++ b/extra/openal/PKGBUILD
@@ -5,18 +5,23 @@
 
 pkgname=openal
 pkgver=1.15.1
-pkgrel=1
+pkgrel=1.1
 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)
 makedepends=(alsa-lib sdl pkgconfig cmake libpulse)
-source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2)
-md5sums=('ea83dec3b9655a27d28e7bc7cae9cd71')
+source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2
+	fpu.patch)
+md5sums=('ea83dec3b9655a27d28e7bc7cae9cd71'
+	 '902d3f0e6cb16584f2b21d65235c3168')
 
 build() {
-  cd $pkgname-soft-$pkgver/build
+  # patch coming from Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666963
+  cd $srcdir/$pkgname-soft-$pkgver
+  patch -Np1 -i "$srcdir/fpu.patch"
+  cd $srcdir/$pkgname-soft-$pkgver/build
   cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release ..
   make
 }
diff --git a/extra/openal/fpu.patch b/extra/openal/fpu.patch
new file mode 100644
index 000000000..9579e30ab
--- /dev/null
+++ b/extra/openal/fpu.patch
@@ -0,0 +1,57 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ openal-soft (1:1.14-1.1) unstable; urgency=low
+ .
+   * Non-maintainer upload.
+Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+
+---
+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>
+
+--- openal-soft-1.14.orig/OpenAL32/Include/alu.h
++++ openal-soft-1.14/OpenAL32/Include/alu.h
+@@ -224,6 +224,29 @@ static __inline ALfloat cubic(ALfloat va
+     return a0*mu*mu2 + a1*mu2 + a2*mu + a3;
+ }
+ 
++#if defined(_FPU_GETCW) && defined(_FPU_SETCW)
++ #ifndef _FPU_EXTENDED
++  #define _FPU_EXTENDED	0
++ #endif
++ #ifndef _FPU_DOUBLE
++  #define _FPU_DOUBLE	0
++ #endif
++ #ifndef _FPU_SINGLE
++  #define _FPU_SINGLE	0
++ #endif
++ #ifndef _FPU_RC_NEAREST
++  #define _FPU_RC_NEAREST	0
++ #endif
++ #ifndef _FPU_RC_DOWN
++  #define _FPU_RC_DOWN	0
++ #endif
++ #ifndef _FPU_RC_UP
++  #define _FPU_RC_UP	0
++ #endif
++ #ifndef _FPU_RC_ZERO
++  #define _FPU_RC_ZERO	0
++ #endif
++#endif
+ 
+ static __inline int SetMixerFPUMode(void)
+ {
diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD
index 155a0867b..639ee3597 100644
--- a/extra/openbabel/PKGBUILD
+++ b/extra/openbabel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=openbabel
 pkgver=2.3.2
 pkgrel=3
 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' 'libsm')
diff --git a/extra/openconnect/PKGBUILD b/extra/openconnect/PKGBUILD
index 4e684ade9..f4c108fe7 100644
--- a/extra/openconnect/PKGBUILD
+++ b/extra/openconnect/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=5.01
 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' 'gnutls' 'libproxy' 'vpnc')
diff --git a/extra/opencore-amr/PKGBUILD b/extra/opencore-amr/PKGBUILD
index 0b29120e1..ca124748a 100644
--- a/extra/opencore-amr/PKGBUILD
+++ b/extra/opencore-amr/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=opencore-amr
 pkgver=0.1.3
-pkgrel=1
+pkgrel=1.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/"
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index a90d5b73d..eacece98d 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -8,7 +8,7 @@ _realname=OpenCV
 pkgver=2.4.8
 pkgrel=1
 pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 url="http://opencv.org/"
 depends=('gstreamer0.10-base' 'intel-tbb' 'openexr'
@@ -18,6 +18,10 @@ optdepends=('opencv-samples'
             'eigen2'
             'libcl: For coding with OpenCL'
             'python2-numpy: Python 2.x interface')
+if [ "$CARCH" != "mips64el" ]; then
+  depends+=('intel-tbb' 'libcl')
+  makedepends+=('opencl-headers')
+fi
 source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.zip"
         'pkgconfig.patch'
         'fsh.patch')
@@ -25,9 +29,14 @@ md5sums=('50cc1433b3654074206f5b3dbfd49848'
          'c7cea48ed7d4f729ebdb9673bac41bd3'
          'c597598d142dd34d0eb4af7d6e9779d8')
 
-_cmakeopts=('-D WITH_OPENCL=ON'
+if [ "$CARCH" != "mips64el" ]; then
+  _cmakeopts=('-D WITH_OPENCL=ON'
+              '-D WITH_TBB=ON')
+else
+  _cmakeopts=()
+fi
+_cmakeopts+=(
             '-D WITH_OPENGL=ON'
-            '-D WITH_TBB=ON'
             '-D WITH_XINE=ON'
             '-D BUILD_WITH_DEBUG_INFO=OFF'
             '-D BUILD_TESTS=OFF'
diff --git a/extra/openjpeg/PKGBUILD b/extra/openjpeg/PKGBUILD
index 65e9f357b..e3e625c5a 100644
--- a/extra/openjpeg/PKGBUILD
+++ b/extra/openjpeg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=openjpeg
 pkgver=1.5.1
 pkgrel=2
 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 5c4ba5d9d..bcb38238a 100644
--- a/extra/openmpi/PKGBUILD
+++ b/extra/openmpi/PKGBUILD
@@ -4,10 +4,11 @@ pkgname=openmpi
 pkgver=1.6.5
 pkgrel=1
 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-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
+depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc')
+[ "$CARCH" = "mips64el" ] || depends+=('valgrind')
 makedepends=('inetutils')
 options=('staticlibs')
 source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
@@ -16,6 +17,11 @@ sha1sums=('93859d515b33dd9a0ee6081db285a2d1dffe21ce')
 build() {
    cd ${pkgname}-${pkgver}
 
+   if [ "$CARCH" = "mips64el" ]; then
+     valgrind="--without-valgrind --disable-memchecker"
+   else
+     valgrind="--with-valgrind --enable-memchecker"
+   fi
    # Make sure we use the system ltdl library rather than the ones in the tarball
    rm -r opal/libltdl
 
@@ -25,8 +31,7 @@ build() {
                --libdir=/usr/lib/${pkgname} \
                --with-threads=posix \
                --enable-smp-locks \
-               --with-valgrind \
-               --enable-memchecker \
+               $valgrind \
                --enable-debug \
                --enable-pretty-print-stacktrace \
                --without-slurm \
diff --git a/extra/openslp/PKGBUILD b/extra/openslp/PKGBUILD
index d1008b8a3..07c8390b7 100644
--- a/extra/openslp/PKGBUILD
+++ b/extra/openslp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=openslp
 pkgver=1.2.1
 pkgrel=7
 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=('bash' 'openssl')
diff --git a/extra/opensp/PKGBUILD b/extra/opensp/PKGBUILD
index 473455242..8fe6e0c53 100644
--- a/extra/opensp/PKGBUILD
+++ b/extra/opensp/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=opensp
 pkgver=1.5.2
 pkgrel=4
 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/opus/PKGBUILD b/extra/opus/PKGBUILD
index 0a04c3a2b..91068b1ad 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=opus
 pkgver=1.1
 pkgrel=1
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.opus-codec.org/"
 license=(BSD)
 depends=(glibc)
diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD
index 4407eae0a..f62ad6189 100644
--- a/extra/orage/PKGBUILD
+++ b/extra/orage/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=orage
 pkgver=4.10.0
 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/"
 groups=('xfce4-goodies')
diff --git a/extra/orbit2/PKGBUILD b/extra/orbit2/PKGBUILD
index 6fc2245a3..5836a6901 100644
--- a/extra/orbit2/PKGBUILD
+++ b/extra/orbit2/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=orbit2
 pkgver=2.14.19
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Thin/fast CORBA ORB"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'GPL')
 depends=('libidl2')
 options=('!makeflags' 'staticlibs')
diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD
index 710e9179c..1f081ab65 100644
--- a/extra/orc/PKGBUILD
+++ b/extra/orc/PKGBUILD
@@ -4,11 +4,11 @@ pkgname=orc
 pkgver=0.4.18
 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')
-makedepends=('valgrind')
+test "$CARCH" = "mips64el" || makedepends=('valgrind')
 source=(http://gstreamer.freedesktop.org/src/orc/${pkgname}-${pkgver}.tar.gz)
 
 build () {
diff --git a/extra/ortp/PKGBUILD b/extra/ortp/PKGBUILD
index 276573f8f..693895662 100644
--- a/extra/ortp/PKGBUILD
+++ b/extra/ortp/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ortp
 pkgver=0.22.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=('GPL3')
 depends=('libzrtpcpp' 'libsrtp')
diff --git a/extra/ossp/PKGBUILD b/extra/ossp/PKGBUILD
index 57922863a..db2a26652 100644
--- a/extra/ossp/PKGBUILD
+++ b/extra/ossp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=ossp
 pkgver=1.3.2
 pkgrel=15
 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/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index 47b958936..e43ddb0ba 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=oxygen-gtk2
 pkgver=1.4.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
 license=('LGPL')
 depends=('gtk2')
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 4f8d2bd60..b5f173553 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=oxygen-gtk3
 pkgver=1.3.3
 pkgrel=1
 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/'
 license=('LGPL')
 depends=('gtk3')
diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD
index f40e7f6fb..3b3a5cf3b 100644
--- a/extra/p11-kit/PKGBUILD
+++ b/extra/p11-kit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=p11-kit
 pkgver=0.20.2
 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' 'libtasn1' 'libffi')
diff --git a/extra/pam_ldap/PKGBUILD b/extra/pam_ldap/PKGBUILD
index 620ed04e8..bff718b46 100644
--- a/extra/pam_ldap/PKGBUILD
+++ b/extra/pam_ldap/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pam_ldap
 pkgver=186
 pkgrel=4
 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' 'pam')
@@ -19,7 +19,8 @@ build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --libdir=/usr/lib \
       --with-ldap-conf-file=/etc/pam_ldap.conf \
-      --mandir=/usr/share/man
+      --mandir=/usr/share/man \
+      --build=$CHOST --host=$CHOST
   PATH="${PATH}:${srcdir}/${pkgname}-${pkgver}" make
 }
 
diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD
index ac5e67192..ec1c2a87b 100644
--- a/extra/pango-perl/PKGBUILD
+++ b/extra/pango-perl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pango-perl
 pkgver=1.225
 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 d73ad4c59..0eb1779d5 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pango
 pkgver=1.36.2
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('libthai' 'cairo' 'libxft' 'harfbuzz')
 makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection')
diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD
index be517fcbd..b4432fc50 100644
--- a/extra/pangomm/PKGBUILD
+++ b/extra/pangomm/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=pangomm
 pkgname=('pangomm' 'pangomm-docs')
 pkgver=2.34.0
 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}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/pangox-compat/PKGBUILD b/extra/pangox-compat/PKGBUILD
index c0e0076d5..b039746ab 100644
--- a/extra/pangox-compat/PKGBUILD
+++ b/extra/pangox-compat/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=pangox-compat
 pkgver=0.0.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="X Window System font support for Pango"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 depends=('pango')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
diff --git a/extra/paprefs/PKGBUILD b/extra/paprefs/PKGBUILD
index 6be68601b..82e033459 100644
--- a/extra/paprefs/PKGBUILD
+++ b/extra/paprefs/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgname=paprefs
 pkgver=0.9.10
-pkgrel=2
+pkgrel=2.1
 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 20b127d33..9827d6612 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=parted
 pkgver=3.1
 pkgrel=3
 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 96d506b20..41bade6fd 100644
--- a/extra/pathological/PKGBUILD
+++ b/extra/pathological/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pathological
 pkgver=1.1.3
 pkgrel=8
 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=('python2-pygame')
diff --git a/extra/pavucontrol/PKGBUILD b/extra/pavucontrol/PKGBUILD
index 126b2a28f..74b061e52 100644
--- a/extra/pavucontrol/PKGBUILD
+++ b/extra/pavucontrol/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=pavucontrol
 pkgdesc="A GTK volume control for PulseAudio"
 pkgver=2.0
 pkgrel=2
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://freedesktop.org/software/pulseaudio/pavucontrol/"
 license=(GPL)
 depends=(gnome-icon-theme libcanberra-pulse gtkmm3 libsigc++)
diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD
index 712653e42..c7ebe8309 100644
--- a/extra/perl-alien-sdl/PKGBUILD
+++ b/extra/perl-alien-sdl/PKGBUILD
@@ -11,7 +11,7 @@ _realname=Alien-SDL
 pkgver=1.440
 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-async-interrupt/PKGBUILD b/extra/perl-async-interrupt/PKGBUILD
index 45f6be82d..d3d154910 100644
--- a/extra/perl-async-interrupt/PKGBUILD
+++ b/extra/perl-async-interrupt/PKGBUILD
@@ -6,7 +6,7 @@ _ver=1.1
 pkgver=1.10
 pkgrel=3
 pkgdesc='allow C/XS libraries to interrupt perl asynchronously'
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(PerlArtistic GPL)
 options=(!emptydirs)
 depends=(perl-common-sense)
diff --git a/extra/perl-bit-vector/PKGBUILD b/extra/perl-bit-vector/PKGBUILD
index 2f8158d84..08f175bfb 100644
--- a/extra/perl-bit-vector/PKGBUILD
+++ b/extra/perl-bit-vector/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-bit-vector
 pkgver=7.3
 pkgrel=1
 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/Bit-Vector/"
 depends=('perl-carp-clan' 'perl')
diff --git a/extra/perl-compress-bzip2/PKGBUILD b/extra/perl-compress-bzip2/PKGBUILD
index d55131804..f22b167f2 100644
--- a/extra/perl-compress-bzip2/PKGBUILD
+++ b/extra/perl-compress-bzip2/PKGBUILD
@@ -6,7 +6,7 @@ _realname=Compress-Bzip2
 pkgver=2.17
 pkgrel=1
 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/Compress-Bzip2"
diff --git a/extra/perl-crypt-openssl-bignum/PKGBUILD b/extra/perl-crypt-openssl-bignum/PKGBUILD
index 15c3bb1b6..08a00553e 100644
--- a/extra/perl-crypt-openssl-bignum/PKGBUILD
+++ b/extra/perl-crypt-openssl-bignum/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-crypt-openssl-bignum
 pkgver=0.04
 pkgrel=9
 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/extra/perl-crypt-openssl-random/PKGBUILD b/extra/perl-crypt-openssl-random/PKGBUILD
index db3ed64e4..cc0e07a6f 100644
--- a/extra/perl-crypt-openssl-random/PKGBUILD
+++ b/extra/perl-crypt-openssl-random/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-crypt-openssl-random
 pkgver=0.06
 pkgrel=1
 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/extra/perl-crypt-openssl-rsa/PKGBUILD b/extra/perl-crypt-openssl-rsa/PKGBUILD
index afe76a7c5..f1c0e7f21 100644
--- a/extra/perl-crypt-openssl-rsa/PKGBUILD
+++ b/extra/perl-crypt-openssl-rsa/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-crypt-openssl-rsa
 pkgver=0.28
 pkgrel=4
 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/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD
index bf1e57bb6..e14a7078a 100644
--- a/extra/perl-crypt-ssleay/PKGBUILD
+++ b/extra/perl-crypt-ssleay/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-crypt-ssleay
 pkgver=0.64
 pkgrel=2
 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=('perl-lwp-protocol-https' 'perl-try-tiny')
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index c39d6e340..4bc979f01 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -8,7 +8,7 @@ _realname=DBD-mysql
 pkgver=4.026
 pkgrel=1
 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=('libmariadbclient' 'perl-dbi')
diff --git a/extra/perl-dbd-sqlite/PKGBUILD b/extra/perl-dbd-sqlite/PKGBUILD
index 70f9ee742..7c2ffa75b 100644
--- a/extra/perl-dbd-sqlite/PKGBUILD
+++ b/extra/perl-dbd-sqlite/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-dbd-sqlite
 pkgver=1.40
 pkgrel=1
 pkgdesc="Self-contained RDBMS in a DBI driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBD-SQLite"
 license=('GPL' 'PerlArtistic')
 depends=('perl-dbi' 'sqlite')
diff --git a/extra/perl-dbi/PKGBUILD b/extra/perl-dbi/PKGBUILD
index 5b09afbff..2ea835e9a 100644
--- a/extra/perl-dbi/PKGBUILD
+++ b/extra/perl-dbi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-dbi
 pkgver=1.631
 pkgrel=1
 pkgdesc="Database independent interface for Perl"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DBI/"
 license=('GPL' 'PerlArtistic')
 depends=('perl')
diff --git a/extra/perl-digest-nilsimsa/PKGBUILD b/extra/perl-digest-nilsimsa/PKGBUILD
index 62097190f..9cf565b89 100644
--- a/extra/perl-digest-nilsimsa/PKGBUILD
+++ b/extra/perl-digest-nilsimsa/PKGBUILD
@@ -8,7 +8,7 @@ _realname=Digest-Nilsimsa
 pkgver=0.06
 pkgrel=9
 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')
diff --git a/extra/perl-digest-sha1/PKGBUILD b/extra/perl-digest-sha1/PKGBUILD
index ecd6141ac..558c61a5a 100644
--- a/extra/perl-digest-sha1/PKGBUILD
+++ b/extra/perl-digest-sha1/PKGBUILD
@@ -8,7 +8,7 @@ _realname=Digest-SHA1
 pkgver=2.13
 pkgrel=4
 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')
diff --git a/extra/perl-ev/PKGBUILD b/extra/perl-ev/PKGBUILD
index 1f6075bde..b92bc726c 100644
--- a/extra/perl-ev/PKGBUILD
+++ b/extra/perl-ev/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=perl-ev
 pkgver=4.15
 pkgrel=2
 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-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD
index a77fdf42a..59b50fd0e 100644
--- a/extra/perl-fcgi/PKGBUILD
+++ b/extra/perl-fcgi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-fcgi
 pkgver=0.74
 pkgrel=4
 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-guard/PKGBUILD b/extra/perl-guard/PKGBUILD
index 63e5e7488..2f37e901d 100644
--- a/extra/perl-guard/PKGBUILD
+++ b/extra/perl-guard/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-guard
 pkgver=1.022
 pkgrel=3
 pkgdesc="safe cleanup blocks"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="https://metacpan.org/release/Guard"
 license=('GPL' 'PerlArtistic')
 depends=('perl')
diff --git a/extra/perl-html-parser/PKGBUILD b/extra/perl-html-parser/PKGBUILD
index a3b4d2874..5e27b6c91 100644
--- a/extra/perl-html-parser/PKGBUILD
+++ b/extra/perl-html-parser/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-html-parser
 pkgver=3.71
 pkgrel=2
 pkgdesc="Perl HTML parser class"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('PerlArtistic')
 url="http://search.cpan.org/dist/HTML-Parser/"
 depends=('perl-html-tagset' 'perl')
diff --git a/extra/perl-libintl-perl/PKGBUILD b/extra/perl-libintl-perl/PKGBUILD
index 76e6a5e68..b70a97e93 100644
--- a/extra/perl-libintl-perl/PKGBUILD
+++ b/extra/perl-libintl-perl/PKGBUILD
@@ -8,7 +8,7 @@ _realname=libintl-perl
 pkgver=1.23
 pkgrel=2
 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')
diff --git a/extra/perl-list-moreutils/PKGBUILD b/extra/perl-list-moreutils/PKGBUILD
index 1541e0d28..e905a45c0 100644
--- a/extra/perl-list-moreutils/PKGBUILD
+++ b/extra/perl-list-moreutils/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=perl-list-moreutils
 pkgver=0.33
 pkgrel=4
 pkgdesc="Provide the stuff missing in List::Util"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=(PerlArtistic GPL)
 options=(!emptydirs)
 depends=('perl')
diff --git a/extra/perl-locale-gettext/PKGBUILD b/extra/perl-locale-gettext/PKGBUILD
index 89e65b7d6..af9dcf2ac 100644
--- a/extra/perl-locale-gettext/PKGBUILD
+++ b/extra/perl-locale-gettext/PKGBUILD
@@ -8,7 +8,7 @@ _realname=gettext
 pkgver=1.05
 pkgrel=10
 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 7cf976226..526b68068 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-net-dns
 pkgver=0.74
 pkgrel=1
 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/Net-DNS/"
 depends=('perl-digest-hmac' 'perl-net-ip' 'perl')
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index a6ab0f3be..d877e3f0a 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -7,7 +7,7 @@ _cpanname=Net-SSLeay
 pkgver=1.58
 pkgrel=1
 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=('openssl')
diff --git a/extra/perl-net-upnp/PKGBUILD b/extra/perl-net-upnp/PKGBUILD
index 88a29c7d5..f4a74c9a3 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=5
 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 b1a1798cc..b3d06f037 100644
--- a/extra/perl-netaddr-ip/PKGBUILD
+++ b/extra/perl-netaddr-ip/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-netaddr-ip
 pkgver=4.072
 pkgrel=1
 pkgdesc="Perl module to manage IP addresses and subnets"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://search.cpan.org/dist/NetAddr-IP/"
 license=('PerlArtistic' 'GPL')
 depends=('perl')
diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD
index 6dd8bb91c..310c7fa1d 100644
--- a/extra/perl-sdl/PKGBUILD
+++ b/extra/perl-sdl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=perl-sdl
 pkgver=2.540
 pkgrel=5
 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-socket6/PKGBUILD b/extra/perl-socket6/PKGBUILD
index 12fd57c58..9eaef772d 100644
--- a/extra/perl-socket6/PKGBUILD
+++ b/extra/perl-socket6/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-socket6
 pkgver=0.25
 pkgrel=1
 pkgdesc="A getaddrinfo/getnameinfo support module"
-arch=('i686' 'x86_64')
+pkgdesc="A getaddrinfo/getnameinfo support module"
 url='http://search.cpan.org/dist/Socket6'
 license=('PerlArtistic' 'GPL')
 depends=('perl')
diff --git a/extra/perl-template-toolkit/PKGBUILD b/extra/perl-template-toolkit/PKGBUILD
index de6e6f8cb..dcec9fa06 100644
--- a/extra/perl-template-toolkit/PKGBUILD
+++ b/extra/perl-template-toolkit/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=perl-template-toolkit
 pkgver=2.25
 pkgrel=1
 pkgdesc="Perl template processing system"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 'mips64el')
 url="http://search.cpan.org/dist/Template-Toolkit/"
 license=('PerlArtistic')
 depends=('perl-appconfig' 'perl')
diff --git a/extra/perl-term-readkey/PKGBUILD b/extra/perl-term-readkey/PKGBUILD
index e3c98ae6b..1de6a2f95 100644
--- a/extra/perl-term-readkey/PKGBUILD
+++ b/extra/perl-term-readkey/PKGBUILD
@@ -9,7 +9,7 @@ _realname=TermReadKey
 pkgver=2.30.02
 pkgrel=3
 pkgdesc="Provides simple control over terminal driver modes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('perl' 'glibc')
 url="http://search.cpan.org/~stsi/${_realname}/"
diff --git a/extra/perl-text-iconv/PKGBUILD b/extra/perl-text-iconv/PKGBUILD
index b8609c4fd..02af30a9e 100644
--- a/extra/perl-text-iconv/PKGBUILD
+++ b/extra/perl-text-iconv/PKGBUILD
@@ -7,7 +7,7 @@ _realname=Text-Iconv
 pkgver=1.7
 pkgrel=8
 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')
diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD
index 40078aa2d..dbb0ae977 100644
--- a/extra/perl-tk/PKGBUILD
+++ b/extra/perl-tk/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=perl-tk
 pkgver=804.032
 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/Tk"
 license=('PerlArtistic' 'GPL' 'custom')
 depends=('libpng' 'libjpeg' 'tk' 'perl')
diff --git a/extra/perl-xml-parser/PKGBUILD b/extra/perl-xml-parser/PKGBUILD
index ba9146c1d..6f55b09ef 100644
--- a/extra/perl-xml-parser/PKGBUILD
+++ b/extra/perl-xml-parser/PKGBUILD
@@ -9,7 +9,7 @@ _realname=XML-Parser
 pkgver=2.41
 pkgrel=4
 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 9e2abe7d4..fe8f71b77 100644
--- a/extra/perl-yaml-syck/PKGBUILD
+++ b/extra/perl-yaml-syck/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=perl-yaml-syck
 pkgver=1.27
 pkgrel=1
 pkgdesc="Fast, lightweight YAML loader and dumper"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/YAML-Syck/"
 license=('BSD' 'custom')
 depends=('perl')
diff --git a/extra/pgbouncer/PKGBUILD b/extra/pgbouncer/PKGBUILD
index e03c9c9c1..89a26d777 100644
--- a/extra/pgbouncer/PKGBUILD
+++ b/extra/pgbouncer/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pgbouncer
 pkgver=1.5.4
 pkgrel=5
 pkgdesc="A lightweight connection pooler for PostgreSQL"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pgfoundry.org/projects/pgbouncer"
 license=('BSD')
 depends=('libevent>=2.0' 'postgresql')
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index a0a904ccc..61259bbb6 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=phonon-gstreamer
 pkgver=4.7.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 043b7cfe4..06f5807ce 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=phonon-vlc
 pkgver=0.7.1
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
 pkgdesc="Phonon VLC backend"
 license=('LGPL')
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
index 22393296e..454c3a5d2 100644
--- a/extra/php-xcache/PKGBUILD
+++ b/extra/php-xcache/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=php-xcache
 pkgver=3.1.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 pkgdesc='A PHP opcode cacher'
 url='http://xcache.lighttpd.net/'
 depends=('php')
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 1daebb0da..64b0c2977 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -23,7 +23,7 @@ pkgname=('php'
          'php-xsl')
 pkgver=5.5.9
 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' 'libvpx'
diff --git a/extra/physfs/PKGBUILD b/extra/physfs/PKGBUILD
index c51501e6b..98cd0e142 100644
--- a/extra/physfs/PKGBUILD
+++ b/extra/physfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=physfs
 pkgver=2.0.3
 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/PKGBUILD b/extra/pidgin/PKGBUILD
index d32728fc7..38b792dc0 100644
--- a/extra/pidgin/PKGBUILD
+++ b/extra/pidgin/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=('pidgin' 'libpurple' 'finch')
 pkgver=2.10.9
 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/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index f53743521..5707e92f8 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -14,7 +14,7 @@ pkgname=pigeonhole
 pkgver=0.4.2
 pkgrel=6
 pkgdesc="Sieve implementation for Dovecot"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://pigeonhole.dovecot.org/"
 license=('LGPL')
 depends=('dovecot='$_dcpkgver)
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index d37c4b105..73eb5758f 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pixman
 pkgver=0.32.4
 pkgrel=1
 pkgdesc="The pixel-manipulation library for X and cairo"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org"
 license=('custom')
 depends=('glibc')
diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD
index bdfeef3cf..439a85d1e 100644
--- a/extra/pkgfile/PKGBUILD
+++ b/extra/pkgfile/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=pkgfile
 pkgver=12
 pkgrel=1
 pkgdesc="a pacman .files metadata explorer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/falconindy/pkgfile"
 license=('MIT')
 depends=('libarchive' 'curl' 'pcre' 'pacman')
diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD
index 9aadab9b9..f80754a11 100644
--- a/extra/plotutils/PKGBUILD
+++ b/extra/plotutils/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=plotutils
 pkgver=2.6
 pkgrel=6
-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 d6e079c5c..fcb190d32 100644
--- a/extra/pm-utils/PKGBUILD
+++ b/extra/pm-utils/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pm-utils
 pkgver=1.4.1
 pkgrel=6
 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/polkit-kde/PKGBUILD b/extra/polkit-kde/PKGBUILD
index 0a576e888..2fb0931e7 100644
--- a/extra/polkit-kde/PKGBUILD
+++ b/extra/polkit-kde/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=polkit-kde
 pkgver=0.99.0
-pkgrel=2
+pkgrel=2.1
 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 d77ee8182..938c360ee 100644
--- a/extra/polkit-qt/PKGBUILD
+++ b/extra/polkit-qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=polkit-qt
 pkgver=0.103.0
 pkgrel=2
 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' 'qt4')
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index d49715949..d4cde4a51 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -3,9 +3,10 @@
 
 pkgname=polkit
 pkgver=0.112
+pkgver=0.110 # holding version, it now depends on non-portable 'js'
 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/polkit"
 depends=(glib2 pam expat libsystemd js)
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 1c711adc0..c6196b02c 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=poppler
 pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
 pkgver=0.24.5
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt4' 'pkgconfig' 'lcms2' 'gobject-introspection' 'icu' 'qt5-base')
 options=('!emptydirs')
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index bf3d0a64e..4c425891e 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.11.0
 pkgrel=2
 url='http://www.postfix.org/'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 _postfix_depends=('pcre' 'libsasl' 'libldap' 'db'
 		 'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
 _postfix_tools_depends=('openssl')
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
index 7bb0583dd..e743bf0ce 100644
--- a/extra/postgresql-old-upgrade/PKGBUILD
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=9.2.7
 _majorver=${pkgver%.*}
 pkgrel=1
 pkgdesc="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 16e347939..23be11374 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.3.3
 _majorver=${pkgver%.*}
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
 makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0')
diff --git a/extra/potrace/PKGBUILD b/extra/potrace/PKGBUILD
index 5269bbb7a..8e10065c6 100644
--- a/extra/potrace/PKGBUILD
+++ b/extra/potrace/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.11
 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')
 source=("http://potrace.sourceforge.net/download/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('7296baf27bf35298263cb3ed3df34a38fed0b441')
diff --git a/extra/prison/PKGBUILD b/extra/prison/PKGBUILD
index 7552fa8dc..b1f1c3d5c 100644
--- a/extra/prison/PKGBUILD
+++ b/extra/prison/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=prison
 pkgver=1.0
 pkgrel=2
 pkgdesc="A barcode API to produce QRCode barcodes and DataMatrix barcodes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/kdesupport/prison'
 license=('GPL')
 depends=('qt4' 'libdmtx' 'qrencode')
diff --git a/extra/procmail/PKGBUILD b/extra/procmail/PKGBUILD
index 07b1e67cd..48a13a4a5 100644
--- a/extra/procmail/PKGBUILD
+++ b/extra/procmail/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=procmail
 pkgver=3.22
 pkgrel=6
 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/progsreiserfs/PKGBUILD b/extra/progsreiserfs/PKGBUILD
index 873c5ec0c..5858fde40 100644
--- a/extra/progsreiserfs/PKGBUILD
+++ b/extra/progsreiserfs/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=progsreiserfs
 pkgver=0.3.0.5
 pkgrel=8
 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/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD
index c9117af09..55ae6c90f 100644
--- a/extra/psiconv/PKGBUILD
+++ b/extra/psiconv/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=psiconv
 pkgver=0.9.8
 pkgrel=15
 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 1b1d5956c..dd5d0683e 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pstoedit
 pkgver=3.62
 pkgrel=4
 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/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index 88b024278..2ff6b231e 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ptlib
 pkgver=2.10.11
 pkgrel=1
 pkgdesc="Portable Windows Library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.opalvoip.org"
 license=('GPL')
 depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD
index 7bb41eae2..b00479618 100644
--- a/extra/pulseaudio/PKGBUILD
+++ b/extra/pulseaudio/PKGBUILD
@@ -9,13 +9,14 @@ pkgname=(pulseaudio libpulse)
 pkgdesc="A featureful, general-purpose sound server"
 pkgver=4.0
 pkgrel=6
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/PulseAudio"
 license=(LGPL AGPL3)
 makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
              speex tdb systemd dbus avahi bluez bluez-libs gconf intltool jack sbc
-             lirc-utils openssl fftw orc json-c gtk3 webrtc-audio-processing
+             openssl fftw orc json-c gtk3 webrtc-audio-processing
              check git)
+[ "$CARCH" != "mips64el" ] && makedepends+=(lirc-utils)
 options=(!emptydirs)
 #source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
 source=($pkgbase-$pkgver::git://anongit.freedesktop.org/pulseaudio/pulseaudio#commit=09e88de
@@ -56,9 +57,9 @@ package_pulseaudio() {
               'bluez-libs: bluetooth support'
               'gconf: configuration through gconf (paprefs)'
               'jack: jack support'
-              'lirc-utils: infra-red support'
               'openssl: RAOP support'
               'python-pyqt: Equalizer GUI (qpaeq)')
+[ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: infra-red support')
   backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
   install=pulseaudio.install
 
diff --git a/extra/purple-plugin-pack/PKGBUILD b/extra/purple-plugin-pack/PKGBUILD
index d2a17efdc..06abe93f9 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=2
 pkgdesc="Compilation of plugins for the libpurple family of IM clients"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://bitbucket.org/rekkanoryo/purple-plugin-pack"
 license=('GPL')
 depends=('libpurple')
diff --git a/extra/putty/PKGBUILD b/extra/putty/PKGBUILD
index 2dd0523aa..b3b357b24 100644
--- a/extra/putty/PKGBUILD
+++ b/extra/putty/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=putty
 pkgver=0.63
 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')
@@ -16,6 +16,7 @@ sha1sums=('195c0603ef61082b91276faa8d4246ea472bba3b'
 
 build() {
   cd ${pkgname}-${pkgver}/unix
+  sed -i 's/-Werror//' configure
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/pyalpm/PKGBUILD b/extra/pyalpm/PKGBUILD
index 1771f8f07..558a42cdd 100644
--- a/extra/pyalpm/PKGBUILD
+++ b/extra/pyalpm/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=pyalpm
 pkgver=0.6.2
 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.1')
diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD
index b40ad2fbe..0bb6ad0d1 100644
--- a/extra/pycrypto/PKGBUILD
+++ b/extra/pycrypto/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=pycrypto
 pkgname=('python2-crypto' 'python-crypto')
 pkgver=2.6.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2' 'python')
 url="http://www.dlitz.net/software/pycrypto/"
 license=('custom')
diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD
index 6af67b143..9d66b4f2b 100644
--- a/extra/pycups/PKGBUILD
+++ b/extra/pycups/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pycups
 pkgver=1.9.66
 pkgrel=1
 pkgdesc="Python CUPS Bindings"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://cyberelk.net/tim/software/pycups/"
 license=('GPL')
 depends=('libcups' 'python2')
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 9ea8ae2bd..f27a8031f 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=pygobject
 pkgname=(python-gobject python2-gobject pygobject-devel)
 pkgver=3.10.2
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="https://live.gnome.org/PyGObject"
 license=(LGPL)
 makedepends=(python python2 python-cairo python2-cairo gobject-introspection)
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 9fbbb1e9a..f53c8bc8e 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=9
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygtk.org/"
 license=(LGPL)
 makedepends=(python python2 git)
diff --git a/extra/pygtk/PKGBUILD b/extra/pygtk/PKGBUILD
index cfc6cae1b..b7b76783e 100644
--- a/extra/pygtk/PKGBUILD
+++ b/extra/pygtk/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=pygtk
 pkgver=2.24.0
-pkgrel=3
+pkgrel=3.1
 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 a10cdd4d3..48a72736c 100644
--- a/extra/pygtksourceview2/PKGBUILD
+++ b/extra/pygtksourceview2/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=pygtksourceview2
 pkgver=2.10.1
-pkgrel=4
+pkgrel=4.1
 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' 'pkg-config')
diff --git a/extra/pyopenssl/PKGBUILD b/extra/pyopenssl/PKGBUILD
index 005655c42..3ebba02b1 100644
--- a/extra/pyopenssl/PKGBUILD
+++ b/extra/pyopenssl/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=pyopenssl
 pkgname=('python-pyopenssl' 'python2-pyopenssl')
 pkgver=0.13.1
 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 370fe8a93..92744b7c3 100644
--- a/extra/pyorbit/PKGBUILD
+++ b/extra/pyorbit/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=pyorbit
 pkgver=2.24.0
-pkgrel=4
+pkgrel=4.1
 pkgdesc="Python bindings for ORBit2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://www.pygtk.org"
 depends=('python2' 'orbit2')
diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD
index 440015b85..de6ee8423 100644
--- a/extra/pyqt4/PKGBUILD
+++ b/extra/pyqt4/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=pyqt4
 pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4')
 pkgver=4.10.3
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.riverbankcomputing.com/software/pyqt/intro'
 license=('GPL')
 makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
diff --git a/extra/pysmbc/PKGBUILD b/extra/pysmbc/PKGBUILD
index 429111579..a815bf29b 100644
--- a/extra/pysmbc/PKGBUILD
+++ b/extra/pysmbc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=pysmbc
 pkgver=1.0.13
 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 2ecb2b88f..42392e8cc 100644
--- a/extra/python-cairo/PKGBUILD
+++ b/extra/python-cairo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python-cairo
 pkgver=1.10.0
 pkgrel=3
 pkgdesc="Python bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cairographics.org/pycairo"
 license=('LGPL3')
 depends=('python' 'cairo')
diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD
index 52fcc5aed..b0f59d673 100644
--- a/extra/python-egenix-mx-base/PKGBUILD
+++ b/extra/python-egenix-mx-base/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('python2-egenix-mx-base')
 pkgver=3.2.6
 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/"
 makedepends=('python2')
diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD
index 0b269bbb2..e0f6721b0 100644
--- a/extra/python-geoip/PKGBUILD
+++ b/extra/python-geoip/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=python-geoip
 pkgver=1.2.9
 pkgrel=1
 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://pypi.python.org/pypi/GeoIP/"
 license=('LGPL')
 depends=('python2' 'geoip')
diff --git a/extra/python-iwscan/PKGBUILD b/extra/python-iwscan/PKGBUILD
index 2636d914b..d609bbd15 100644
--- a/extra/python-iwscan/PKGBUILD
+++ b/extra/python-iwscan/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-iwscan
 pkgver=20090609
 pkgrel=5
 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 5f867ca5d..70aa98137 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=python-lxml
 pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs')
 pkgver=3.3.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD' 'custom')
 url="http://lxml.de/"
 makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect')
diff --git a/extra/python-markupsafe/PKGBUILD b/extra/python-markupsafe/PKGBUILD
index fd1757779..0da520e6a 100644
--- a/extra/python-markupsafe/PKGBUILD
+++ b/extra/python-markupsafe/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=('python-markupsafe' 'python2-markupsafe')
 pkgver=0.18
 pkgrel=2
 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-setuptools' 'python2-setuptools')
diff --git a/extra/python-notify/PKGBUILD b/extra/python-notify/PKGBUILD
index f5f2294a4..b2a3c1366 100644
--- a/extra/python-notify/PKGBUILD
+++ b/extra/python-notify/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-notify
 pkgver=0.1.1
 pkgrel=12
 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 a9d6dd708..6f097a251 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('python2-numpy' 'python-numpy')
 pkgver=1.8.0
 pkgrel=2
 pkgdesc="Scientific tools for Python"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://www.numpy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose' 'python2-nose')
diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD
index c791a8308..14edd3999 100644
--- a/extra/python-pygame/PKGBUILD
+++ b/extra/python-pygame/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-pygame
 pkgver=1.9.1
 pkgrel=8
 pkgdesc="Python game library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.pygame.org/"
 license=('LGPL')
 depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
diff --git a/extra/python-pyspi/PKGBUILD b/extra/python-pyspi/PKGBUILD
index 41ebf4be2..f995971a1 100644
--- a/extra/python-pyspi/PKGBUILD
+++ b/extra/python-pyspi/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=python2-pyspi
 pkgver=0.6.1
 pkgrel=1
 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')
diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD
index 0e308434b..c7f2acb08 100644
--- a/extra/python-pysqlite/PKGBUILD
+++ b/extra/python-pysqlite/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=2.6.3
 pkgrel=3
 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' 'sqlite')
 conflicts=('python-pysqlite<=2.6.3-2')
diff --git a/extra/python-telepathy/PKGBUILD b/extra/python-telepathy/PKGBUILD
index 515a5b590..74d1da3e5 100644
--- a/extra/python-telepathy/PKGBUILD
+++ b/extra/python-telepathy/PKGBUILD
@@ -6,19 +6,23 @@ pkgname=('python2-telepathy')
 pkgver=0.15.19
 pkgrel=3
 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')
 makedepends=('libxslt')
 conflicts=('python-telepathy')
 replaces=('python-telepathy')
-source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${pkgver}.tar.gz{,.asc})
+source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${pkgver}.tar.gz{,.asc}
+        telepathy-python-generated-errors.patch)
 md5sums=('f7ca25ab3c88874015b7e9728f7f3017'
-         '3f0e1af0452d62a0c0aab916e045579c')
+         '3f0e1af0452d62a0c0aab916e045579c'
+         '2dfa69cd0548661dbbb5ae53b1c19e0f')
 
 build() {
     cd "${srcdir}/telepathy-python-${pkgver}"
+    patch -Np1 -i "$srcdir/telepathy-python-generated-errors.patch"
+    autoreconf
     ./configure --prefix=/usr
     make
 }
diff --git a/extra/python-telepathy/telepathy-python-generated-errors.patch b/extra/python-telepathy/telepathy-python-generated-errors.patch
new file mode 100644
index 000000000..d52861d89
--- /dev/null
+++ b/extra/python-telepathy/telepathy-python-generated-errors.patch
@@ -0,0 +1,18 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 135f2f0..ede1fc3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -13,10 +13,12 @@ telepathy_PYTHON = \
+ spec_dir = $(top_srcdir)/spec
+ spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml))
+ 
++# We leave _generated/errors.py out of here because there exists a
++# spec/errors.xml file, so that means there'll be a
++# _generated/errors.py in $(spec_files). See fd.o#32526
+ BUILT_SOURCES = \
+ 	_generated/interfaces.py \
+ 	_generated/constants.py \
+-	_generated/errors.py \
+ 	_generated/__init__.py \
+ 	$(spec_files)
+ 
diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD
index ed81cf84e..a3c68875c 100644
--- a/extra/python-urwid/PKGBUILD
+++ b/extra/python-urwid/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.1.1
 pkgrel=1
 pkgdesc="Urwid is a curses-based user interface library."
 license=('LGPL')
-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 a669bbde0..49b4d0221 100644
--- a/extra/python-wpactrl/PKGBUILD
+++ b/extra/python-wpactrl/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=python2-wpactrl
 pkgver=20090609
 pkgrel=4
 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 5654b4db8..268e8f22d 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -9,11 +9,12 @@ pkgver=3.3.4
 pkgrel=1
 _pybasever=3.3
 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>=8.6.0' 'sqlite' 'valgrind' 'bluez-libs')
+makedepends=('tk>=8.6.0' 'sqlite' 'bluez-libs')
+[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 optdepends=('tk: for tkinter' 'sqlite')
 options=('!makeflags')
 provides=('python3')
@@ -32,21 +33,26 @@ prepare() {
   rm -r Modules/expat
   rm -r Modules/zlib
   rm -r Modules/_ctypes/{darwin,libffi}*
-
 }
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
 
+  if [ "$CARCH" != "mips64el" ]; then
+    extraconf=--with-valgrind
+  else
+    extraconf=""
+  fi
+
   ./configure --prefix=/usr \
               --enable-shared \
               --with-threads \
               --with-computed-gotos \
               --enable-ipv6 \
-              --with-valgrind \
               --with-system-expat \
               --with-dbmliborder=gdbm:ndbm \
-              --with-system-ffi
+              --with-system-ffi \
+              $extraconf
 
   make
 }
diff --git a/extra/python2-cairo/PKGBUILD b/extra/python2-cairo/PKGBUILD
index a061900c1..4232ae832 100644
--- a/extra/python2-cairo/PKGBUILD
+++ b/extra/python2-cairo/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=python2-cairo
 pkgver=1.10.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="Python2 bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL' 'MPL')
 depends=('python2' 'cairo')
 provides=("pycairo=${pkgver}")
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 39ce339d2..685b37638 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=2.7.6
 pkgrel=2
 _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' 'sqlite' 'libffi')
diff --git a/extra/pywebkitgtk/PKGBUILD b/extra/pywebkitgtk/PKGBUILD
index daebf9ec7..c83587394 100644
--- a/extra/pywebkitgtk/PKGBUILD
+++ b/extra/pywebkitgtk/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=pywebkitgtk
 pkgver=1.1.8
 pkgrel=3
 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=('webkitgtk2' 'pygtk')
diff --git a/extra/qalculate-gtk/PKGBUILD b/extra/qalculate-gtk/PKGBUILD
index 5c7d40e06..59b0a7d03 100644
--- a/extra/qalculate-gtk/PKGBUILD
+++ b/extra/qalculate-gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qalculate-gtk
 pkgver=0.9.7
 pkgrel=3
 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/qca-gnupg/PKGBUILD b/extra/qca-gnupg/PKGBUILD
index 99eeee362..385f5f934 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=5
 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 e79c5dda5..1270b7f1b 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=7
 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 e37bf7c4f..e3682b678 100644
--- a/extra/qca/PKGBUILD
+++ b/extra/qca/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qca
 pkgver=2.0.3
 pkgrel=4
 pkgdesc="Qt Cryptographic Architecture"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://delta.affinix.com/qca/"
 license=('LGPL')
 depends=('qt4' 'ca-certificates')
diff --git a/extra/qhull/PKGBUILD b/extra/qhull/PKGBUILD
index f4bc77890..d516be5f8 100644
--- a/extra/qhull/PKGBUILD
+++ b/extra/qhull/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=qhull
 pkgver=2012.1
 pkgrel=2
 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=('gcc-libs')
@@ -20,7 +20,7 @@ md5sums=('d0f978c0d8dfb2e919caefa56ea2953c')
 build() {
   cd $pkgname-$pkgver
 
-  if [ "${CARCH}" = "x86_64" ]; then
+  if [ "${CARCH}" != "i686" ]; then
     EXTRAOPTS="-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
   fi
 
diff --git a/extra/qimageblitz/PKGBUILD b/extra/qimageblitz/PKGBUILD
index 193a92be8..6a8e88eef 100644
--- a/extra/qimageblitz/PKGBUILD
+++ b/extra/qimageblitz/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qimageblitz
 pkgver=0.0.6
 pkgrel=3
 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=('qt4')
@@ -19,6 +19,7 @@ build() {
 
   mkdir build
   cd build
+  CXX="g++" \
   cmake ../${pkgname}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr 
diff --git a/extra/qjackctl/PKGBUILD b/extra/qjackctl/PKGBUILD
index fc5d69ad1..599efecb3 100644
--- a/extra/qjackctl/PKGBUILD
+++ b/extra/qjackctl/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.3.11
 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' 'qt4') # qjackctl may soon support qt5
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
diff --git a/extra/qjson/PKGBUILD b/extra/qjson/PKGBUILD
index ab298d47f..94f52affe 100644
--- a/extra/qjson/PKGBUILD
+++ b/extra/qjson/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qjson
 pkgver=0.8.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=('qt4')
diff --git a/extra/qoauth/PKGBUILD b/extra/qoauth/PKGBUILD
index de947b29e..78fb9e2fa 100644
--- a/extra/qoauth/PKGBUILD
+++ b/extra/qoauth/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=4
 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/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD
index b13fcc1a1..346fa0d6d 100644
--- a/extra/qpdf/PKGBUILD
+++ b/extra/qpdf/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=qpdf
 pkgver=5.1.1
 pkgrel=1
 pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qpdf.sourceforge.net/"
 license=('custom:Artistic-2.0')
 depends=('pcre' 'perl')
diff --git a/extra/qrencode/PKGBUILD b/extra/qrencode/PKGBUILD
index 70771cd57..b98c8594d 100644
--- a/extra/qrencode/PKGBUILD
+++ b/extra/qrencode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qrencode
 pkgver=3.4.3
 pkgrel=1
 pkgdesc="C library for encoding data in a QR Code symbol."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 depends=('libpng')
 makedepends=(sdl)
 url="http://megaui.net/fukuchi/works/qrencode/index.en.html"
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 1f4d2db82..30703ad59 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
 pkgver=2.8
 pkgrel=1
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
 makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
 source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
diff --git a/extra/qsynth/PKGBUILD b/extra/qsynth/PKGBUILD
index 29d6a989b..465422b4b 100644
--- a/extra/qsynth/PKGBUILD
+++ b/extra/qsynth/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qsynth
 pkgver=0.3.8
 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' 'qt4')
diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD
index a189b314b..bddad5c91 100644
--- a/extra/qt-assistant-compat/PKGBUILD
+++ b/extra/qt-assistant-compat/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.6.3
 pkgrel=4
 pkgdesc="compat version of Qt Assistant"
 url="http://qt-project.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
 depends=('qt4')
 source=('ftp://ftp.qt.nokia.com/qt/source/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz'
diff --git a/extra/qt-gstreamer/PKGBUILD b/extra/qt-gstreamer/PKGBUILD
index a7ccc9d5c..213ddc4c7 100644
--- a/extra/qt-gstreamer/PKGBUILD
+++ b/extra/qt-gstreamer/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qt-gstreamer
 pkgver=0.10.2
 pkgrel=3
 pkgdesc="Qt4 bindings for GStreamer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://gstreamer.freedesktop.org/modules/qt-gstreamer.html'
 license=('LGPL2.1')
 depends=('qt4' 'gstreamer0.10-base' 'libgles')
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index dead707dd..eca193b93 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.3.8b
 pkgrel=7
 epoch=1
 pkgdesc="A cross-platform application and UI framework"
-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' 'glu' 'libxft'
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index 2b52cfb95..6d2c8ed65 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -5,24 +5,27 @@
 pkgname=qt4
 pkgver=4.8.5
 pkgrel=7
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 pkgdesc='A cross-platform application and UI framework'
 depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus'
         'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
         'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng')
-makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
+makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2'
              'mesa')
 optdepends=('qtchooser: set the default Qt toolkit'
             'postgresql-libs: PostgreSQL driver'
             'libmariadbclient: MariaDB driver'
             'unixodbc: ODBC driver'
-            'libfbclient: Firebird/iBase driver'
             'libxinerama: Xinerama support'
             'libxcursor: Xcursor support'
             'libxfixes: Xfixes support'
             'icu: Unicode support')
+if [ "$CARCH" != "mips64el" ]; then
+  makedepends+=('libfbclient')
+  optdepends+=('libfbclient: Firebird/iBase driver')
+fi
 install="${pkgname}.install"
 replaces=('qt<=4.8.4')
 conflicts=('qt')
@@ -32,6 +35,7 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk
         'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop'
         'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
         'improve-cups-support.patch'
+	      'declarative-fix-sigbus.patch'
         'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch'
         'libmng2.patch' 'CVE-2013-4549.patch')
 md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
@@ -41,6 +45,7 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
          '0e384663d3dd32abe35f5331c4147569'
          'b859c5673e5098c39f72b2252947049e'
          'c439c7731c25387352d8453ca7574971'
+         'aac963d05a9d5733e2bfce9e26607f51'
          '6ed8d26a8e4a9bba1f6c08fb99cc8357'
          'bb0e0fa6ba953fa590d81ac612374e11'
          'db343dcae522bc90d802ad1e83b7f5dd'
@@ -53,6 +58,9 @@ prepare() {
   # (FS#28381) (KDEBUG#180051)
   patch -p1 -i "${srcdir}"/improve-cups-support.patch
 
+  # MIPS N32-specific fix, shouldn't affect correctness on other platforms.
+  patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch"
+
   # (FS#36028) (QTBUG#31579)
   patch -p1 -i "${srcdir}"/qtbug-31579.patch
   # (FS#36394) (QTBUG#32534)
@@ -78,6 +86,10 @@ build() {
   export QT4DIR="${srcdir}"/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
+  if [ "${CARCH}" = "mips64el" ]; then
+    export CXXFLAGS="${CXXFLAGS} -fpermissive"
+  fi
+  
   cd ${_pkgfqn}
 
   ./configure -confirm-license -opensource \
@@ -92,7 +104,7 @@ build() {
     -sysconfdir /etc/xdg \
     -examplesdir /usr/share/doc/qt4/examples \
     -demosdir /usr/share/doc/qt4/demos \
-    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+    -plugin-sql-{psql,mysql,sqlite,odbc} \
     -system-sqlite \
     -no-phonon \
     -no-phonon-backend \
diff --git a/extra/qt4/declarative-fix-sigbus.patch b/extra/qt4/declarative-fix-sigbus.patch
new file mode 100644
index 000000000..0d446fce5
--- /dev/null
+++ b/extra/qt4/declarative-fix-sigbus.patch
@@ -0,0 +1,33 @@
+--- qt-everywhere-opensource-src-4.8.0.orig/src/declarative/qml/qdeclarativevmemetaobject.cpp	2012-02-04 21:23:56.573395948 +0100
++++ qt-everywhere-opensource-src-4.8.0/src/declarative/qml/qdeclarativevmemetaobject.cpp	2012-02-04 23:32:44.900073230 +0100
+@@ -39,6 +39,7 @@
+ **
+ ****************************************************************************/
+ 
++#include <cstring>
+ #include "private/qdeclarativevmemetaobject_p.h"
+ 
+ #include "qdeclarative.h"
+@@ -191,10 +192,12 @@
+ 
+ double QDeclarativeVMEVariant::asDouble() 
+ {
++    double result;
+     if (type != QMetaType::Double)
+         setValue(double(0));
+ 
+-    return *(double *)(dataPtr());
++    std::memcpy(&result, (double *)(dataPtr()), sizeof(result));
++    return result;
+ }
+ 
+ const QString &QDeclarativeVMEVariant::asQString() 
+@@ -298,7 +301,7 @@
+         cleanup();
+         type = QMetaType::Double;
+     }
+-    *(double *)(dataPtr()) = v;
++    std::memcpy((double *)(dataPtr()), &v, sizeof(v));
+ }
+ 
+ void QDeclarativeVMEVariant::setValue(const QString &v)
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 293ac8cb5..46e220147 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -3,7 +3,6 @@
 
 pkgbase=qt5
 pkgname=('qt5-base'
-         'qt5-connectivity'
          'qt5-declarative'
          'qt5-doc'
          'qt5-graphicaleffects'
@@ -18,31 +17,34 @@ pkgname=('qt5-base'
          'qt5-svg'
          'qt5-tools'
          'qt5-translations'
-         'qt5-webkit'
          'qt5-x11extras'
          'qt5-xmlpatterns')
+[[ "$CARCH" != "mips64el" ]] &&
+pkgname+=('qt5-webkit' 'qt5-connectivity')
 pkgver=5.2.1
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL' 'FDL' 'custom')
 makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
             'mesa' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' 'libmng'
             'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
-            'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient'
+            'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
             'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
             'openal' 'gtk2' 'libxkbcommon' 'python')
+[ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient')
 groups=('qt' 'qt5')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz"
         'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
-        'use-python2.patch')
+        'use-python2.patch' 'qatomic-before-mips32.patch')
 md5sums=('0c8d2aa45f38be9c3f7c9325eb059d9d'
          'b2897dd6a2967bccf8f10e397aafee55'
          '9638a78e502719ef8fe5f8d10d0361a9'
          '188da8f4c87316e730ebf1c6217bf5a0'
          '322b419b16c75d4de0ee7ad0a246caa1'
-         'a378deccf363bd6079da459c89aff7b9')
+         'a378deccf363bd6079da459c89aff7b9'
+         '84d7fcc2b5f270f482d5522ae01c29e2')
 
 prepare() {
   cd ${_pkgfqn}
@@ -56,6 +58,9 @@ prepare() {
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
+
+  # Fix build without -march=mips32, mips64 or its superset.
+  patch -p1 -i "$srcdir/qatomic-before-mips32.patch"
 }
 
 build() {
@@ -65,6 +70,9 @@ build() {
   export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}"
   export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins
 
+# disable firebird on mips64el
+  [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase"
+
   PYTHON=/usr/bin/python2 ./configure -confirm-license -opensource \
     -prefix /usr \
     -bindir /usr/lib/qt/bin \
@@ -74,17 +82,21 @@ build() {
     -datadir /usr/share/qt \
     -sysconfdir /etc/xdg \
     -examplesdir /usr/share/doc/qt/examples \
-    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
+    -plugin-sql-{psql,mysql,sqlite,odbc} \
     -system-sqlite \
     -openssl-linked \
     -nomake examples \
     -no-rpath \
     -optimized-qmake \
     -dbus-linked \
-    -reduce-relocations
+    -reduce-relocations \
+    $extra
+
+  [ "$CARCH" = "mips64el" ] && modules="module-qtbase module-qtimageformats module-qtscript module-qtsvg module-qtxmlpatterns"
 
-  make
+  make $modules
 
+if [ "$CARCH" != "mips64el" ]; then
   # Fix paths
   find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
   find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} +
@@ -93,6 +105,7 @@ build() {
   sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" qtwebkit/Source/Makefile.api
 
   make docs
+fi
 }
 
 package_qt5-base() {
@@ -102,8 +115,8 @@ package_qt5-base() {
            'qtchooser' 'libxkbcommon')
   optdepends=('postgresql-libs: PostgreSQL driver'
               'libmariadbclient: MariaDB driver'
-              'unixodbc: ODBC driver'
-              'libfbclient: Firebird/iBase driver')
+              'unixodbc: ODBC driver')
+  [ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver')
   conflicts=('qt')
   options=('staticlibs') #libQt5PlatformSupport builds static only
 
diff --git a/extra/qt5/qatomic-before-mips32.patch b/extra/qt5/qatomic-before-mips32.patch
new file mode 100644
index 000000000..47d550f93
--- /dev/null
+++ b/extra/qt5/qatomic-before-mips32.patch
@@ -0,0 +1,34 @@
+ISAs before MIPS32 do not support the argument of sync, so build fails
+with -march=mips3 (or -march=loongson2f).
+
+Since the default argument of 0 does all work of other values, not
+specifying it should keep the code correct on older ISAs.
+
+A proper patch would detect if "sync 0x11" is accepted by the
+assembler and choose the appropriate code.
+
+--- qt-everywhere-opensource-src-5.0.1.orig/qtbase/src/corelib/arch/qatomic_mips.h	2013-03-03 18:52:14.370775913 +0100
++++ qt-everywhere-opensource-src-5.0.1/qtbase/src/corelib/arch/qatomic_mips.h	2013-03-03 19:30:16.209001188 +0100
+@@ -122,19 +122,19 @@
+ template <int size> template <typename T> inline
+ void QBasicAtomicOps<size>::acquireMemoryFence(const T &) Q_DECL_NOTHROW
+ {
+-    asm volatile ("sync 0x11" ::: "memory");
++    asm volatile ("sync" ::: "memory");
+ }
+ 
+ template <int size> template <typename T> inline
+ void QBasicAtomicOps<size>::releaseMemoryFence(const T &) Q_DECL_NOTHROW
+ {
+-    asm volatile ("sync 0x12" ::: "memory");
++    asm volatile ("sync" ::: "memory");
+ }
+ 
+ template <int size> template <typename T> inline
+ void QBasicAtomicOps<size>::orderedMemoryFence(const T &) Q_DECL_NOTHROW
+ {
+-    asm volatile ("sync 0" ::: "memory");
++    asm volatile ("sync" ::: "memory");
+ }
+ 
+ template<> template<typename T> inline
diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD
index 7f8a0e02a..e3b8090bc 100644
--- a/extra/qtchooser/PKGBUILD
+++ b/extra/qtchooser/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qtchooser
 pkgver=39
 pkgrel=1
 pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://qt.gitorious.org/qt/qtchooser'
 license=('GPL')
 backup=('etc/xdg/qtchooser/default.conf')
diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD
index 3c2ee56d2..6bb1b7e90 100644
--- a/extra/qtiplot/PKGBUILD
+++ b/extra/qtiplot/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=qtiplot
 pkgver=0.9.8.9
 pkgrel=5
-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-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
diff --git a/extra/qtscriptgenerator/PKGBUILD b/extra/qtscriptgenerator/PKGBUILD
index e7c66350a..32c57bb16 100644
--- a/extra/qtscriptgenerator/PKGBUILD
+++ b/extra/qtscriptgenerator/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qtscriptgenerator
 pkgver=0.2.0
 pkgrel=2
 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=('qtwebkit')
diff --git a/extra/qtwebkit/LLIntCLoop32BigEndian.patch b/extra/qtwebkit/LLIntCLoop32BigEndian.patch
new file mode 100644
index 000000000..4331e0ea8
--- /dev/null
+++ b/extra/qtwebkit/LLIntCLoop32BigEndian.patch
@@ -0,0 +1,72 @@
+Index: Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+===================================================================
+--- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	(revision 139916)
++++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm	(working copy)
+@@ -1728,7 +1728,7 @@ _llint_op_next_pname:
+     loadi 20[PC], t2
+     loadi PayloadOffset[cfr, t2, 8], t2
+     loadp JSPropertyNameIterator::m_jsStrings[t2], t3
+-    loadi [t3, t0, 8], t3
++    loadi PayloadOffset[t3, t0, 8], t3
+     addi 1, t0
+     storei t0, PayloadOffset[cfr, t1, 8]
+     loadi 4[PC], t1
+Index: Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+===================================================================
+--- Source/JavaScriptCore/llint/LowLevelInterpreter.asm	(revision 139916)
++++ Source/JavaScriptCore/llint/LowLevelInterpreter.asm	(working copy)
+@@ -263,13 +263,13 @@ macro assertNotConstant(index)
+ end
+ 
+ macro functionForCallCodeBlockGetter(targetRegister)
+-    loadp Callee[cfr], targetRegister
++    loadp Callee + PayloadOffset[cfr], targetRegister
+     loadp JSFunction::m_executable[targetRegister], targetRegister
+     loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
+ end
+ 
+ macro functionForConstructCodeBlockGetter(targetRegister)
+-    loadp Callee[cfr], targetRegister
++    loadp Callee + PayloadOffset[cfr], targetRegister
+     loadp JSFunction::m_executable[targetRegister], targetRegister
+     loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
+ end
+@@ -841,7 +841,7 @@ macro interpretResolveWithBase(opcodeLen
+     getResolveOperation(4, t0, t1)
+     btpz t0, .slowPath
+ 
+-    loadp ScopeChain[cfr], t3
++    loadp ScopeChain + PayloadOffset[cfr], t3
+     # Get the base
+     loadis ResolveOperation::m_operation[t0], t2
+ 
+Index: Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+===================================================================
+--- Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	(revision 139916)
++++ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp	(working copy)
+@@ -33,6 +33,7 @@
+ 
+ #if ENABLE(LLINT_C_LOOP)
+ #include "CodeBlock.h"
++#include "JSValueInlines.h"
+ #include "LLIntCLoop.h"
+ #include "LLIntSlowPaths.h"
+ #include "VMInspector.h"
+@@ -116,6 +117,17 @@ static double Ints2Double(uint32_t lo, u
+     u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
+     return u.dval;
+ }
++
++static void Double2Ints(double input, intptr_t& lo, intptr_t& hi)
++{
++    union {
++        double dval;
++        uint64_t ival64;
++    } u;
++    u.dval = input;
++    hi = static_cast<intptr_t>(u.ival64 >> 32);
++    lo = static_cast<intptr_t>(u.ival64);
++}
+ #endif // USE(JSVALUE32_64)
+ 
+ } // namespace LLint
diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD
index 62154e81a..069e436a0 100644
--- a/extra/qtwebkit/PKGBUILD
+++ b/extra/qtwebkit/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=qtwebkit
 pkgver=2.3.3
 pkgrel=1
-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')
@@ -16,12 +16,14 @@ source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.
         "http://download.qt-project.org/official_releases/qt/4.8/4.8.5/qt-everywhere-opensource-src-${_qtver}.tar.gz"
         'use-python2.patch'
         'bison3.patch'
-        'qwebview.patch')
+        'qwebview.patch'
+	'LLIntCLoop32BigEndian.patch')
 sha1sums=('64f3ab7f8e53b5b971a3a6577fc61db0cc2ea31f'
           '745f9ebf091696c0d5403ce691dc28c039d77b9e'
           '315b6ff603f35e5492a036f7082f6aa075dfb607'
           'd2c6182512e4bcbdf30a9e9d513c52fe4b16d9f2'
-          '88ed73e6bd7ea9c6d227ceaed0ff2f1cf0200667')
+          '88ed73e6bd7ea9c6d227ceaed0ff2f1cf0200667'
+          'af830ae24e2ae5113754c9ae524d27ec0a28a9d6')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -30,11 +32,23 @@ prepare() {
   
   cd ../qt-everywhere-opensource-src-${_qtver}
   patch -p1 -i "${srcdir}"/qwebview.patch
+
+  if [ "$CARCH" = "mips64el" ]; then
+     # Fix MIPS N32 support.
+      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
+          Source/WTF/wtf/Platform.h
+     # Don't enable JIT even if configure finds that it's not supported.
+      sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
+          Source/WTF/wtf/Platform.h
+  fi
 }
 
 build() {
   cd ${pkgname}-${pkgver}
 
+  # Fix https://bugs.webkit.org/show_bug.cgi?id=103128, original patch with ChangeLog stripped.
+  patch -p0 -i "${srcdir}/LLIntCLoop32BigEndian.patch"
+
   OPTS="--no-webkit2"
   if [ "${CARCH}" = "i686" ]; then
       # FS#33418
diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD
index f77d91ff8..bcbe599f7 100644
--- a/extra/quadrapassel/PKGBUILD
+++ b/extra/quadrapassel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=quadrapassel
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/quota-tools/PKGBUILD b/extra/quota-tools/PKGBUILD
index d58311b23..5305f02fe 100644
--- a/extra/quota-tools/PKGBUILD
+++ b/extra/quota-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.01
 pkgrel=2
 epoch=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 e5b45f1a5..38ffedc13 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=qwt
 pkgver=6.1.0
 pkgrel=1
 pkgdesc="Qt Widgets for Technical Applications"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://qwt.sourceforge.net/"
 depends=('qt4')
 license=("custom:$pkgname")
diff --git a/extra/qwtplot3d/PKGBUILD b/extra/qwtplot3d/PKGBUILD
index 6cf4ca5c3..2d261f9c0 100644
--- a/extra/qwtplot3d/PKGBUILD
+++ b/extra/qwtplot3d/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=qwtplot3d
 pkgver=0.2.7
 pkgrel=6
 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=('qt4' 'qwt')
diff --git a/extra/r/PKGBUILD b/extra/r/PKGBUILD
index e02efc3e4..fd4adb7ef 100644
--- a/extra/r/PKGBUILD
+++ b/extra/r/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=r
 pkgver=3.0.2
 pkgrel=2
 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 e609ff018..32d3ab2f6 100644
--- a/extra/racket/PKGBUILD
+++ b/extra/racket/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=racket
 pkgver=5.93
 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=('GPL3' 'LGPL3' 'custom')
 depends=('gtk2' 'desktop-file-utils')
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 9ab604021..be7400cdf 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=raptor
 pkgver=2.0.12
 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' 'libxslt' 'icu')
 license=('LGPL')
diff --git a/extra/rarian/PKGBUILD b/extra/rarian/PKGBUILD
index f930a0ff1..e180bae22 100644
--- a/extra/rarian/PKGBUILD
+++ b/extra/rarian/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rarian
 pkgver=0.8.1
 pkgrel=3
 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 a332699dc..89b3de4a3 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=4
 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' 'mpfr' 'util-linux')
 source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
 md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b')
diff --git a/extra/razor/PKGBUILD b/extra/razor/PKGBUILD
index 30b699697..13e2dc00b 100644
--- a/extra/razor/PKGBUILD
+++ b/extra/razor/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=razor
 pkgver=2.85
 pkgrel=2
 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')
diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD
index f8b43fa0e..363c3677d 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')
 depends=('ed')
 source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
 sha1sums=('cb053f6ba87ab6ea03306d6241e1cde67182100b' 'SKIP')
diff --git a/extra/re-alpine/PKGBUILD b/extra/re-alpine/PKGBUILD
index bb3ce25ef..71f7737e0 100644
--- a/extra/re-alpine/PKGBUILD
+++ b/extra/re-alpine/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=re-alpine
 pkgver=2.03
 pkgrel=1
 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 70720e6cf..c1191ee62 100644
--- a/extra/re2c/PKGBUILD
+++ b/extra/re2c/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgname=re2c
 pkgver=0.13.5
-pkgrel=3
-arch=('i686' 'x86_64')
+pkgrel=3.1
+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 87d149f89..3474d153d 100644
--- a/extra/recode/PKGBUILD
+++ b/extra/recode/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=recode
 pkgver=3.6
 pkgrel=8
 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')
@@ -32,6 +32,9 @@ prepare() {
 build() {
   cd pinard-Recode-2127b34
   rm -f acinclude.m4
+  # "automatic de-ANSI-fication support has been removed"
+  sed -i '/AM_C_PROTOTYPES/d' configure.in
+  sed -i 's/ ansi2knr//' src/Makefile.am
   autoreconf -fi
   libtoolize
   ./configure --prefix=/usr --mandir=/usr/share/man \
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index 0d44296a0..4e150bc62 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -11,7 +11,7 @@ pkgver=1.0.17
 pkgrel=2
 url="http://librdf.org/"
 license=("GPL")
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('rasqal' 'raptor' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
 source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
         rpath.diff)
diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD
index 409ce6a86..0558d97ad 100644
--- a/extra/rest/PKGBUILD
+++ b/extra/rest/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rest
 pkgver=0.7.90
 pkgrel=2
 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>=2.42.0')
diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD
index e333c52c4..2a0705f95 100644
--- a/extra/rhythmbox/PKGBUILD
+++ b/extra/rhythmbox/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rhythmbox
 pkgver=3.0.1
 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=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkitgtk3 python-gobject gnome-icon-theme)
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index bb8dcf6bd..fd9008353 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=rosegarden
 pkgver=13.10
 pkgrel=2
 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/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD
index 648e8a9f5..20956b778 100644
--- a/extra/rrdtool/PKGBUILD
+++ b/extra/rrdtool/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=rrdtool
 pkgver=1.4.8
 pkgrel=3
 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')
diff --git a/extra/rsync/PKGBUILD b/extra/rsync/PKGBUILD
index 4744ab5b8..1543daf7a 100644
--- a/extra/rsync/PKGBUILD
+++ b/extra/rsync/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=rsync
 pkgver=3.1.0
 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=('perl' 'popt')
diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD
index 13b4ee2df..d81cbd75b 100644
--- a/extra/rtkit/PKGBUILD
+++ b/extra/rtkit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rtkit
 pkgver=0.11
 pkgrel=4
 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 systemd)
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index 615219801..44306886d 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=rtmpdump
 pkgver=20131205
 pkgrel=1
 pkgdesc='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 a41a0f0b6..61d6516d2 100644
--- a/extra/rubberband/PKGBUILD
+++ b/extra/rubberband/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rubberband
 pkgver=1.8.1
 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 aa7ded71a..d816b082f 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=('ruby' 'ruby-docs')
 pkgver=2.1.0
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.ruby-lang.org/en/'
 license=('BSD' 'custom')
 # disable ruby tk since 1.9.3 it has caused a segfault on require 'tk'
diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD
index 0375b483d..cda87a7c5 100644
--- a/extra/rygel/PKGBUILD
+++ b/extra/rygel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=rygel
 pkgver=0.20.3
 pkgrel=1
 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 url="http://live.gnome.org/Rygel"
 license=(LGPL)
 depends=(gupnp-av gupnp-dlna libgee gtk3 libunistring libtracker-sparql hicolor-icon-theme xdg-utils)
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index fb105df68..4b7fadec1 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -16,7 +16,7 @@ pkgver=4.1.4
 # misconstrues as alpha, beta, etc.  Bad samba!
 _realver=4.1.4
 pkgrel=1
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
 license=('GPL3')
 makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 
diff --git a/extra/sane-frontends/PKGBUILD b/extra/sane-frontends/PKGBUILD
index fffa95d0a..99d7a9ee5 100644
--- a/extra/sane-frontends/PKGBUILD
+++ b/extra/sane-frontends/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sane-frontends
 pkgver=1.0.14
 pkgrel=6
 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 f33ec148e..ce4939430 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=1.0.24
 pkgrel=3
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('libtiff>=4.0.0' 'libgphoto2' 'libjpeg>=8' 'libusbx' 'libcups' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
 makedepends=('texlive-latexextra')
diff --git a/extra/sbc/PKGBUILD b/extra/sbc/PKGBUILD
index b807161b4..686e614b2 100644
--- a/extra/sbc/PKGBUILD
+++ b/extra/sbc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sbc
 pkgver=1.2
 pkgrel=1
 pkgdesc="Bluetooth Subband Codec (SBC) library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.bluez.org/"
 license=('GPL' 'LGPL')
 depends=('glibc')
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 2c86feaaf..05c8aec19 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -9,11 +9,13 @@ pkgver=1.1.15
 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' 'zlib')
 provides=('common-lisp' 'cl-asdf')
 makedepends=('sbcl')
+[ "$CARCH" = "mips64el" ] && \
+makedepends=('clisp')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
   "arch-fixes.lisp")
@@ -42,7 +44,11 @@ build() {
   (disable :largefile)))
 EOF
 
-  sh make.sh sbcl --prefix=/usr
+  if [ "$CARCH" = "mips64el" ]; then
+    sh make.sh clisp --prefix=/usr
+  else
+    sh make.sh sbcl --prefix=/usr
+  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 2987ec6ca..de61c6efe 100644
--- a/extra/schedtool/PKGBUILD
+++ b/extra/schedtool/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=schedtool
 pkgver=1.3.0
 pkgrel=2
 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')
 source=(http://freequaos.host.sk/schedtool/$pkgname-$pkgver.tar.bz2)
diff --git a/extra/schroedinger/PKGBUILD b/extra/schroedinger/PKGBUILD
index 4d902034c..b7a053dfb 100644
--- a/extra/schroedinger/PKGBUILD
+++ b/extra/schroedinger/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=schroedinger
 pkgver=1.0.11
 pkgrel=2
 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.1' 'MPL' 'MIT')
 depends=('orc' 'gcc-libs')
diff --git a/extra/scim-anthy/PKGBUILD b/extra/scim-anthy/PKGBUILD
index d400acacf..5d23b05d7 100644
--- a/extra/scim-anthy/PKGBUILD
+++ b/extra/scim-anthy/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=4
 _filecode=37309
 pkgdesc='Japanese input method module for SCIM'
 url='http://sourceforge.jp/projects/scim-imengine/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('scim' 'anthy')
 source=("http://osdn.dl.sourceforge.jp/scim-imengine/${_filecode}/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/scim-chewing/PKGBUILD b/extra/scim-chewing/PKGBUILD
index e8d072aec..5069f2eaa 100644
--- a/extra/scim-chewing/PKGBUILD
+++ b/extra/scim-chewing/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=2
 pkgdesc='Traditional Chinese input method module for SCIM'
 url='http://chewing.csie.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('intltool')
 depends=('scim' 'libchewing')
 source=("http://chewing.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD
index efe06e6db..55c85d91b 100644
--- a/extra/scim-hangul/PKGBUILD
+++ b/extra/scim-hangul/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc='Korean input method module for SCIM'
 url='http://www.scim-im.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libhangul' 'scim')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
         '2012.patch')
diff --git a/extra/scim-hangul/unistd.patch b/extra/scim-hangul/unistd.patch
new file mode 100644
index 000000000..44ee7331c
--- /dev/null
+++ b/extra/scim-hangul/unistd.patch
@@ -0,0 +1,11 @@
+diff -ru scim-hangul-0.3.2.orig/src/scim_hangul_imengine.cpp scim-hangul-0.3.2/src/scim_hangul_imengine.cpp
+--- scim-hangul-0.3.2.orig/src/scim_hangul_imengine.cpp	2012-08-05 17:49:59.369710152 +0200
++++ scim-hangul-0.3.2/src/scim_hangul_imengine.cpp	2012-08-05 17:50:16.401614147 +0200
+@@ -34,6 +34,7 @@
+ #endif
+ 
+ #include <cstring>
++#include <unistd.h>
+ #include <scim.h>
+ #include "scim_hangul_imengine.h"
+ 
diff --git a/extra/scim-m17n/PKGBUILD b/extra/scim-m17n/PKGBUILD
index 85138a2c8..414ac7c1a 100644
--- a/extra/scim-m17n/PKGBUILD
+++ b/extra/scim-m17n/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=5
 pkgdesc='Multilingual input method module for SCIM'
 url='http://www.scim-im.org/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('scim' 'm17n-lib')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('96172846eaa211d2bde0f76184990d13e5ecdaea')
diff --git a/extra/scim-pinyin/PKGBUILD b/extra/scim-pinyin/PKGBUILD
index 065c877ee..6fcca98c0 100644
--- a/extra/scim-pinyin/PKGBUILD
+++ b/extra/scim-pinyin/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.5.92
 pkgrel=2
 pkgdesc='Chinese pinyin input for SCIM'
 url='http://www.scim-im.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('scim')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.xz")
diff --git a/extra/scim-tables/PKGBUILD b/extra/scim-tables/PKGBUILD
index e9a01a57a..cba955efe 100644
--- a/extra/scim-tables/PKGBUILD
+++ b/extra/scim-tables/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.5.13
 pkgrel=1
 pkgdesc='Generic table input method module for SCIM'
 url='http://www.scim-im.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('scim')
 makedepends=('intltool')
diff --git a/extra/scim-uim/PKGBUILD b/extra/scim-uim/PKGBUILD
index 89338e1a0..481102180 100644
--- a/extra/scim-uim/PKGBUILD
+++ b/extra/scim-uim/PKGBUILD
@@ -9,7 +9,7 @@ pkgdesc='UIM bridging input engine for SCIM'
 url='http://www.scim-im.org/'
 license=('GPL')
 depends=('scim' 'uim')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/sourceforge/scim/${pkgname}-${pkgver}.tar.gz"
         'fix-gcc43-build.patch'
         'uim-1.5.5-header.patch')
diff --git a/extra/scim/PKGBUILD b/extra/scim/PKGBUILD
index 028c23d15..3d78e0397 100644
--- a/extra/scim/PKGBUILD
+++ b/extra/scim/PKGBUILD
@@ -9,7 +9,7 @@ pkgrel=5
 pkgdesc='Input method user interface and development platform'
 url='http://www.scim-im.org/projects/scim'
 license=('LGPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libltdl' 'gtk2')
 optdepends=('qt4: qt4 immodule'
             'gtk3: gtk3 immodule')
diff --git a/extra/screen/PKGBUILD b/extra/screen/PKGBUILD
index efeddd0c7..b84d7c8a2 100644
--- a/extra/screen/PKGBUILD
+++ b/extra/screen/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=screen
 pkgver=4.0.3
-pkgrel=15
+pkgrel=15.1
 _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/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD
index d407c460e..977657e01 100644
--- a/extra/sdl_gfx/PKGBUILD
+++ b/extra/sdl_gfx/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdl_gfx
 pkgver=2.0.25
 pkgrel=1
 pkgdesc="SDL Graphic Primitives"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx"
 source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz)
@@ -17,7 +17,7 @@ md5sums=('ea24ed4b82ff1304809c363494fa8e16')
 build() {
   cd SDL_gfx-${pkgver}
 
-  if [ "${CARCH}" == "x86_64" ]; then
+  if [ "${CARCH}" != "i686" ]; then
     ./configure --prefix=/usr --disable-mmx
   else
     ./configure --prefix=/usr
diff --git a/extra/sdl_image/PKGBUILD b/extra/sdl_image/PKGBUILD
index 72b484de6..5a2f1e061 100644
--- a/extra/sdl_image/PKGBUILD
+++ b/extra/sdl_image/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdl_image
 pkgver=1.2.12
 pkgrel=3
 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')
 url="http://www.libsdl.org/projects/SDL_image/"
diff --git a/extra/sdl_mixer/PKGBUILD b/extra/sdl_mixer/PKGBUILD
index 83e603ecd..354512c33 100644
--- a/extra/sdl_mixer/PKGBUILD
+++ b/extra/sdl_mixer/PKGBUILD
@@ -6,9 +6,9 @@
 
 pkgname=sdl_mixer
 pkgver=1.2.12
-pkgrel=3
+pkgrel=3.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 939347155..c7f0947e0 100644
--- a/extra/sdl_net/PKGBUILD
+++ b/extra/sdl_net/PKGBUILD
@@ -5,9 +5,9 @@
 
 pkgname=sdl_net
 pkgver=1.2.8
-pkgrel=1
+pkgrel=1.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 58387f9c8..7d9852a5f 100644
--- a/extra/sdl_pango/PKGBUILD
+++ b/extra/sdl_pango/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdl_pango
 pkgver=0.1.2
 pkgrel=5
 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 5986efaf6..70e492c00 100644
--- a/extra/sdl_sound/PKGBUILD
+++ b/extra/sdl_sound/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=sdl_sound
 pkgver=1.0.3
-pkgrel=4
+pkgrel=4.1
 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 bb945bb8e..bd0ae7ab2 100644
--- a/extra/sdl_ttf/PKGBUILD
+++ b/extra/sdl_ttf/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sdl_ttf
 pkgver=2.0.11
 pkgrel=2
 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-nautilus/PKGBUILD b/extra/seahorse-nautilus/PKGBUILD
index 05b1a0d87..5df94a34c 100644
--- a/extra/seahorse-nautilus/PKGBUILD
+++ b/extra/seahorse-nautilus/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=seahorse-nautilus
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="PGP encryption and signing for nautilus"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://git.gnome.org/browse/seahorse-nautilus/"
 license=('GPL')
 depends=('libcryptui' 'gcr' 'nautilus')
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 924f58be1..35c91110d 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=seahorse
 pkgver=3.10.2
 pkgrel=1
 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 gcr libsecret libsoup gpgme desktop-file-utils hicolor-icon-theme dconf)
@@ -24,6 +24,7 @@ sha256sums=('89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16'
 
 build() {
   cd "$pkgname-$pkgver"
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static \
       --enable-ldap --enable-hkp \
diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD
index cd35b0df8..2dde53069 100644
--- a/extra/seed/PKGBUILD
+++ b/extra/seed/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=seed
 pkgver=3.8.1
 pkgrel=2
 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')
 depends=('webkitgtk3' 'gobject-introspection' 'gnome-js-common' 'mpfr')
diff --git a/extra/serd/PKGBUILD b/extra/serd/PKGBUILD
index f191b5125..c80194539 100644
--- a/extra/serd/PKGBUILD
+++ b/extra/serd/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=serd
 pkgver=0.18.2
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A lightweight C library for RDF syntax which supports reading and writing Turtle and NTriples."
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://drobilla.net/software/$pkgname/"
 license=('custom:ISC')
 depends=('glibc')
diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD
index fff40fb74..36f7856c7 100644
--- a/extra/serf/PKGBUILD
+++ b/extra/serf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=serf
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="High-performance asynchronous HTTP client library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/serf/"
 license=('Apache')
 depends=('apr-util')
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index b57efbda4..f73fa2c16 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sg3_utils
 pkgver=1.37
 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 a68b03c25..2a345813d 100644
--- a/extra/shared-mime-info/PKGBUILD
+++ b/extra/shared-mime-info/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=shared-mime-info
 pkgver=1.2
 pkgrel=2
 pkgdesc="Freedesktop.org Shared MIME Info"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 depends=('libxml2' 'glib2')
 makedepends=('intltool' 'pkgconfig')
diff --git a/extra/sharutils/PKGBUILD b/extra/sharutils/PKGBUILD
index 5ada4dc19..1e646b89c 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.xz")
 sha1sums=('5d2d76caa6ee816202fb78395415bd863043d81b')
diff --git a/extra/signon/PKGBUILD b/extra/signon/PKGBUILD
index 7ba049cc4..cf6eaf4f5 100644
--- a/extra/signon/PKGBUILD
+++ b/extra/signon/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=signon
 pkgname=('signon' 'signon-doc')
 pkgver=8.55
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/accounts-sso/"
 license=('LGPL')
 makedepends=('qt4' 'libproxy' 'doxygen' 'graphviz' 'ttf-font')
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index e4f5727dc..6851a4b9c 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
 pkgver=4.15.4
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.riverbankcomputing.com/software/sip/intro'
 license=('custom:"sip"')
 makedepends=('python' 'python2')
diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD
index d2e18936f..c07fce792 100644
--- a/extra/slang/PKGBUILD
+++ b/extra/slang/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=slang
 pkgver=2.2.4
 pkgrel=3
 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=('pcre' 'zlib')
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index a638ad442..0610cba7d 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=slim
 pkgver=1.3.6
 pkgrel=3
 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' 'libxrandr' 'xorg-xauth')
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index 9c210c306..3f29ad702 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=1
 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' 'bash')
 optdepends=('heirloom-mailx: to get mail alerts to work')
 backup=('etc/smartd.conf'
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index 84c40b675..6155f5c2f 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=smb4k
 pkgver=1.1.0
 pkgrel=1
 pkgdesc="A KDE program that browses samba shares"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://smb4k.sourceforge.net/"
 license=('GPL')
 depends=('kdebase-runtime')
diff --git a/extra/smpeg/PKGBUILD b/extra/smpeg/PKGBUILD
index b1ee4d558..bf502c9af 100644
--- a/extra/smpeg/PKGBUILD
+++ b/extra/smpeg/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=smpeg
 pkgver=0.4.4
-pkgrel=7
+pkgrel=7.1
 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/PKGBUILD b/extra/smplayer/PKGBUILD
index 941293f12..9cac6cdc8 100644
--- a/extra/smplayer/PKGBUILD
+++ b/extra/smplayer/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=smplayer
 pkgver=0.8.6
 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=('qt4' 'mplayer')
diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD
index 9ab44a916..b94dd1c44 100644
--- a/extra/snappy/PKGBUILD
+++ b/extra/snappy/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=snappy
 pkgver=1.1.1
 pkgrel=1
 pkgdesc='A fast compressor/decompressor library'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/snappy/"
 license=('BSD')
 depends=('glibc' 'gcc-libs')
diff --git a/extra/snarf/PKGBUILD b/extra/snarf/PKGBUILD
index 40c5a2294..cad336293 100644
--- a/extra/snarf/PKGBUILD
+++ b/extra/snarf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=snarf
 pkgver=7.0
 pkgrel=5
 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')
 source=(http://www.xach.com/snarf/download/source/${pkgname}-${pkgver}.tar.gz)
diff --git a/extra/socat/PKGBUILD b/extra/socat/PKGBUILD
index 55dd2c338..dcec60021 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=('580c56b6aadab6b71562e1c5a963c22e8ace6e32')
diff --git a/extra/sofia-sip/PKGBUILD b/extra/sofia-sip/PKGBUILD
index 08178864f..e8ee92732 100644
--- a/extra/sofia-sip/PKGBUILD
+++ b/extra/sofia-sip/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sofia-sip
 pkgver=1.12.11
 pkgrel=2
 pkgdesc="An open-source SIP User-Agent library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://sofia-sip.sourceforge.net"
 options=('zipman')
 license=('LGPL')
diff --git a/extra/sonata/PKGBUILD b/extra/sonata/PKGBUILD
index 90702e0e3..fcb0c2f4c 100644
--- a/extra/sonata/PKGBUILD
+++ b/extra/sonata/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sonata
 pkgver=1.6.2.1
 pkgrel=11
 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' 'python2-mpd')
diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD
index 05be0a0eb..f4aa76497 100644
--- a/extra/soprano/PKGBUILD
+++ b/extra/soprano/PKGBUILD
@@ -6,11 +6,12 @@ pkgname=soprano
 pkgver=2.9.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=('qt4' 'libiodbc' 'virtuoso-base' 'redland')
-makedepends=('cmake' 'java-environment' 'doxygen')
+makedepends=('cmake' 'doxygen')
+[ "$CARCH" != "mips64el" ] && makedepends+=('java-environment')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 md5sums=('91413e5783efeee0beb747ea4c5c9ef0')
 
diff --git a/extra/sord/PKGBUILD b/extra/sord/PKGBUILD
index f9895597d..0f47e40d5 100644
--- a/extra/sord/PKGBUILD
+++ b/extra/sord/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sord
 pkgver=0.12.0
 pkgrel=1
 pkgdesc="A lightweight C library for storing RDF data in memory"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/sord/"
 license=('custom:ISC')
 depends=('serd' 'pcre')
diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD
index 33230d96f..4b7584362 100644
--- a/extra/sound-juicer/PKGBUILD
+++ b/extra/sound-juicer/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=sound-juicer
 pkgver=3.5.0
 pkgrel=2
 pkgdesc="A cd ripper application"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL)
 depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero hicolor-icon-theme gconf)
 makedepends=(intltool gnome-doc-utils gnome-common)
diff --git a/extra/soundtouch/PKGBUILD b/extra/soundtouch/PKGBUILD
index 3a08c2944..b494e33c1 100644
--- a/extra/soundtouch/PKGBUILD
+++ b/extra/soundtouch/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=soundtouch
 pkgver=1.7.1
 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')
@@ -14,10 +14,16 @@ sha1sums=('8b1a461754853f9c7328571449b7f9b8bd578a89')
 
 build() {
   cd "${srcdir}/${pkgname}"
-  [ "${CARCH}" = "x86_64" ] && CONFIGFLAG="--with-pic"
   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
   ./bootstrap
-  ./configure --prefix=/usr --enable-shared ${CONFIGFLAG}
+  case $CARCH in
+    i686)
+      ./configure --prefix=/usr --enable-shared
+      ;;
+    *)
+      ./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..11987059c
--- /dev/null
+++ b/extra/soundtouch/disable-mmx.patch
@@ -0,0 +1,115 @@
+diff -ru soundtouch.orig/source/SoundStretch/Makefile.am soundtouch/source/SoundStretch/Makefile.am
+--- soundtouch.orig/source/SoundStretch/Makefile.am	2012-02-22 20:51:33.240941439 +0100
++++ soundtouch/source/SoundStretch/Makefile.am	2012-02-22 20:52:25.936309597 +0100
+@@ -43,11 +43,5 @@
+ ## linker. 

+ soundstretch_LDADD=../SoundTouch/libSoundTouch.la -lm

+ 

+-## linker flags

+-soundstretch_LDFLAGS=-s

+-

+-## additional compiler flags

+-soundstretch_CXXFLAGS=-O3

+-

+ #clean-local: 

+ #	-rm -f additional-files-to-remove-on-make-clean

+diff -ru soundtouch.orig/source/SoundTouch/FIRFilter.cpp soundtouch/source/SoundTouch/FIRFilter.cpp
+--- soundtouch.orig/source/SoundTouch/FIRFilter.cpp	2012-02-22 20:51:33.277196949 +0100
++++ soundtouch/source/SoundTouch/FIRFilter.cpp	2012-02-22 21:00:18.591437748 +0100
+@@ -229,32 +229,6 @@
+ 

+ FIRFilter * FIRFilter::newInstance()

+ {

+-    uint uExtensions;

+-

+-    uExtensions = detectCPUextensions();

+-

+-    // Check if MMX/SSE instruction set extensions supported by CPU

+-

+-#ifdef SOUNDTOUCH_ALLOW_MMX

+-    // MMX routines available only with integer sample types

+-    if (uExtensions & SUPPORT_MMX)

+-    {

+-        return ::new FIRFilterMMX;

+-    }

+-    else

+-#endif // SOUNDTOUCH_ALLOW_MMX

+-

+-#ifdef SOUNDTOUCH_ALLOW_SSE

+-    if (uExtensions & SUPPORT_SSE)

+-    {

+-        // SSE support

+-        return ::new FIRFilterSSE;

+-    }

+-    else

+-#endif // SOUNDTOUCH_ALLOW_SSE

+-

+-    {

+-        // ISA optimizations not supported, use plain C version

+-        return ::new FIRFilter;

+-    }

++    // ISA optimizations not supported, use plain C version

++    return ::new FIRFilter;

+ }

+diff -ru soundtouch.orig/source/SoundTouch/Makefile.am soundtouch/source/SoundTouch/Makefile.am
+--- soundtouch.orig/source/SoundTouch/Makefile.am	2012-02-22 20:51:33.269140169 +0100
++++ soundtouch/source/SoundTouch/Makefile.am	2012-02-22 20:53:39.136212215 +0100
+@@ -30,16 +30,13 @@
+ 

+ 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 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

+-

+ 

+ # other linking flags to add

+ # noinst_LTLIBRARIES = libSoundTouchOpt.la

+diff -ru soundtouch.orig/source/SoundTouch/TDStretch.cpp soundtouch/source/SoundTouch/TDStretch.cpp
+--- soundtouch.orig/source/SoundTouch/TDStretch.cpp	2012-02-22 20:51:33.269140169 +0100
++++ soundtouch/source/SoundTouch/TDStretch.cpp	2012-02-22 20:59:57.756604035 +0100
+@@ -738,35 +738,8 @@
+ 

+ TDStretch * TDStretch::newInstance()

+ {

+-    uint uExtensions;

+-

+-    uExtensions = detectCPUextensions();

+-

+-    // Check if MMX/SSE instruction set extensions supported by CPU

+-

+-#ifdef SOUNDTOUCH_ALLOW_MMX

+-    // MMX routines available only with integer sample types

+-    if (uExtensions & SUPPORT_MMX)

+-    {

+-        return ::new TDStretchMMX;

+-    }

+-    else

+-#endif // SOUNDTOUCH_ALLOW_MMX

+-

+-

+-#ifdef SOUNDTOUCH_ALLOW_SSE

+-    if (uExtensions & SUPPORT_SSE)

+-    {

+-        // SSE support

+-        return ::new TDStretchSSE;

+-    }

+-    else

+-#endif // SOUNDTOUCH_ALLOW_SSE

+-

+-    {

+-        // ISA optimizations not supported, use plain C version

+-        return ::new TDStretch;

+-    }

++    // ISA optimizations not supported, use plain C version

++    return ::new TDStretch;

+ }

+ 

+ 

diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index ff8700707..c223c4fef 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=source-highlight
 pkgver=3.1.7
 pkgrel=9
 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=('bash' 'boost-libs')
diff --git a/extra/sox/PKGBUILD b/extra/sox/PKGBUILD
index 8480e03fe..3db270472 100644
--- a/extra/sox/PKGBUILD
+++ b/extra/sox/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sox
 pkgver=14.4.1
 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' 'gsm')
@@ -27,7 +27,7 @@ prepare() {
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-dyn-default --with-distro="Arch Linux"
+    --with-dyn-default --with-distro="Parabola"
   make
 }
 
diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD
index 1b527bd5c..6409bde25 100644
--- a/extra/spamassassin/PKGBUILD
+++ b/extra/spamassassin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=spamassassin
 pkgver=3.4.0
 pkgrel=1
 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/spandsp/PKGBUILD b/extra/spandsp/PKGBUILD
index f8f6501a8..cb0f64879 100644
--- a/extra/spandsp/PKGBUILD
+++ b/extra/spandsp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=spandsp
 pkgver=0.0.6pre21
 pkgrel=2
 pkgdesc="A DSP library for telephony"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 url="http://www.soft-switch.org/"
 depends=('libtiff')
diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index 36eb479a4..7a2541d27 100644
--- a/extra/speech-dispatcher/PKGBUILD
+++ b/extra/speech-dispatcher/PKGBUILD
@@ -9,7 +9,7 @@
 pkgname=speech-dispatcher
 pkgver=0.8
 pkgrel=2
-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 4e69ffb66..f3716a7ff 100644
--- a/extra/speex/PKGBUILD
+++ b/extra/speex/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=speex
 pkgver=1.2rc1
 pkgrel=4
 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/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index cf32d4c43..7c405f31b 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -3,24 +3,22 @@
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
-pkgname=('sqlite' 'sqlite-tcl' 'sqlite-doc') 
+pkgname=('sqlite' 'sqlite-tcl') 
 _amalgamationver=3080301
 _docver=${_amalgamationver}
 #_docver=3080001
 pkgver=3.8.3.1
 pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom:Public Domain')
 url="http://www.sqlite.org/"
 makedepends=('tcl' 'readline')
 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/2014/sqlite-autoconf-$_amalgamationver.tar.gz
-	http://www.sqlite.org/2014/sqlite-doc-${_docver}.zip
 	license.txt)
 options=('!emptydirs')
 sha1sums=('a9b0a3d66fb5c2ae51ad2d8a512ca827adc7d59c'
-          '0fe468bbbd4d768b6bfa250739a79badb49f7235'
           'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
@@ -69,28 +67,3 @@ package_sqlite-tcl() {
   install -m755 -d ${pkgdir}/usr/share/licenses
   ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
 }
-
-package_sqlite-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
- provides=("sqlite3-doc=$pkgver")
- replaces=("sqlite3-doc")
- 
-  #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/sqlite-doc/usr/share/doc/sqlite/images/fileformat/.~lock.indexpage.odg#
-  find ${pkgdir} -type d -name '.~*' -exec ls -lha {} \;
-  find ${pkgdir} -name '.~*' -exec rm -f {} \;
-}
diff --git a/extra/sratom/PKGBUILD b/extra/sratom/PKGBUILD
index ad84a194d..63302c5fd 100644
--- a/extra/sratom/PKGBUILD
+++ b/extra/sratom/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=sratom
 pkgver=0.4.4
 pkgrel=1
 pkgdesc="An LV2 Atom RDF serialisation library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/sratom/"
 license=('custom:ISC')
 depends=('lv2' 'sord>=0.12.0')
diff --git a/extra/ssmtp/PKGBUILD b/extra/ssmtp/PKGBUILD
index 77820cd8f..ac9cbcf75 100644
--- a/extra/ssmtp/PKGBUILD
+++ b/extra/ssmtp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ssmtp
 pkgver=2.64
 pkgrel=5
 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' 'inetutils')
diff --git a/extra/startup-notification/PKGBUILD b/extra/startup-notification/PKGBUILD
index 3ff1f896b..e313e51b3 100644
--- a/extra/startup-notification/PKGBUILD
+++ b/extra/startup-notification/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=startup-notification
 pkgver=0.12
 pkgrel=4
 pkgdesc="Monitor and display application startup"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 license=('LGPL')
 depends=('libx11' 'xcb-util>=0.3.9')
 url="http://www.freedesktop.org"
diff --git a/extra/stellarium/PKGBUILD b/extra/stellarium/PKGBUILD
index a8b080bad..7186133f0 100644
--- a/extra/stellarium/PKGBUILD
+++ b/extra/stellarium/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=stellarium
 pkgver=0.12.4
 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' 'glu' 'libgl' 'freetype2' 'qt4' 'openssl' 'desktop-file-utils' 
diff --git a/extra/strace/PKGBUILD b/extra/strace/PKGBUILD
index 487446796..3cb8d7ddf 100644
--- a/extra/strace/PKGBUILD
+++ b/extra/strace/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=strace
 pkgver=4.8
 pkgrel=1
 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 534334022..6f7315850 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')
@@ -15,7 +15,7 @@ sha1sums=('bc8a8d3ad045e0772ca691d2063c39efcc0dca45')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --build=$CHOST
   make
 }
 
diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index b397457f1..ec158ea17 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=strigi
 pkgver=0.7.8
 pkgrel=5
 pkgdesc="Fast crawling desktop search engine with Qt GUI"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://strigi.sourceforge.net/'
 license=('GPL2')
 depends=('dbus' 'exiv2' 'libxml2' 'bzip2')
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index 781554d9a..0249a4e6b 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -8,12 +8,13 @@ pkgname=subversion
 pkgver=1.8.5
 pkgrel=3
 pkgdesc="A Modern Concurrent Version Control System"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://subversion.apache.org/"
 license=('APACHE')
 depends=('sqlite' 'file' 'serf' 'systemd')
-makedepends=('apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
+makedepends=('apache' 'python2' 'perl' 'swig'
              'libgnome-keyring' 'kdelibs' 'ruby')
+[ "$CARCH" != "mips64el" ] && makedepends+=('java-runtime' 'java-environment')
 optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials'
             'kdeutils-kwallet: for KWallet for auth credentials'
             'bash-completion: for svn bash completion'
@@ -47,17 +48,20 @@ prepare() {
 build() {
    cd ${pkgname}-${pkgver}
    export PYTHON=/usr/bin/python2
+   [ "$CARCH" = "mips64el" ] && extraconf="--disable-javahl"
    ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
                --with-zlib=/usr --with-serf=/usr --with-apxs \
                --with-sqlite=/usr \
                --enable-javahl --with-gnome-keyring --with-kwallet \
                --with-apache-libexecdir=/usr/lib/httpd/modules \
                --with-ruby-sitedir=/usr/lib/ruby/vendor_ruby \
-               --disable-static
+               --disable-static $extraconf
 
    make LT_LDFLAGS="-L$Fdestdir/usr/lib"
    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
+     swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl swig-rb
+   
+   [ "$CARCH" = "mips64el" ] || make javahl 
 }
 
 #check() {
@@ -73,7 +77,9 @@ package() {
    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 install-swig-py install-swig-pl install-swig-rb
+
+   [ "$CARCH" = "mips64el" ] || make install-javahl 
 
    install -dm755 "${pkgdir}"/usr/share/subversion
    cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
index f27c46375..b1ca020b0 100644
--- a/extra/suil/PKGBUILD
+++ b/extra/suil/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=suil
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/suil/"
 license=('custom:ISC')
 depends=('lv2>=1.8.0')
diff --git a/extra/suitesparse/PKGBUILD b/extra/suitesparse/PKGBUILD
index effdc281f..399dd7c78 100644
--- a/extra/suitesparse/PKGBUILD
+++ b/extra/suitesparse/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=4.2.1
 pkgrel=1
 pkgdesc="A collection of sparse matrix libraries"
 url="http://www.cise.ufl.edu/research/sparse/SuiteSparse/"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 conflicts=('umfpack')
 provides=('umfpack')
 replaces=('umfpack')
diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD
index ea3b761fc..ed805f0d9 100644
--- a/extra/sushi/PKGBUILD
+++ b/extra/sushi/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=sushi
 pkgver=3.10.0
 pkgrel=1
 pkgdesc="A quick previewer for Nautilus"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.gnome.org"
 license=('GPL2')
 groups=(gnome)
diff --git a/extra/sweep/PKGBUILD b/extra/sweep/PKGBUILD
index 0cc3698c7..3c0647115 100644
--- a/extra/sweep/PKGBUILD
+++ b/extra/sweep/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=sweep
 pkgver=0.9.3
-pkgrel=2
+pkgrel=2.1
 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/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD
index c0d94e611..0c252a135 100644
--- a/extra/swell-foop/PKGBUILD
+++ b/extra/swell-foop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=swell-foop
 pkgver=3.10.1
 pkgrel=1
 pkgdesc="Clear the screen by removing groups of colored and shaped tiles"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/swh-plugins/PKGBUILD b/extra/swh-plugins/PKGBUILD
index 50685f19a..5e3314f4d 100644
--- a/extra/swh-plugins/PKGBUILD
+++ b/extra/swh-plugins/PKGBUILD
@@ -7,11 +7,11 @@ pkgname=swh-plugins
 pkgver=0.4.15
 pkgrel=5
 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')
-makedepends=('libxml2')
+makedepends=('libxml2' 'perl-xml-parser')
 groups=('ladspa-plugins')
 source=("http://plugin.org.uk/releases/$pkgver/$pkgname-$pkgver.tar.gz"
         'mbeq_crash_fix.patch')
@@ -23,9 +23,9 @@ build() {
 
   # Arch64 fix;
   # -fPIC seems to be the only option
-  if [ "$CARCH" = 'x86_64' ]; then
+  if [ "$CARCH" != 'i686' ]; then
     export CFLAGS="$CFLAGS -fPIC"
-    export CXXFLAGS="$CFLAGS"
+    export CXXFLAGS="$CXXFLAGS -fPIC"
   fi
 
   # fix Firefox crash on x64 when
diff --git a/extra/swig/PKGBUILD b/extra/swig/PKGBUILD
index eab1a98ce..7a97dc8a4 100644
--- a/extra/swig/PKGBUILD
+++ b/extra/swig/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=swig
 pkgver=2.0.12
 pkgrel=1
 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=('pcre' 'gcc-libs')
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 75a9f6bd0..d7864141f 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.4.3
 pkgrel=2
 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')
 depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib'
          'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3')
diff --git a/extra/t1lib/PKGBUILD b/extra/t1lib/PKGBUILD
index 62849e831..1fa675aba 100644
--- a/extra/t1lib/PKGBUILD
+++ b/extra/t1lib/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=t1lib
 pkgver=5.1.2
 pkgrel=5
 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/PKGBUILD b/extra/taglib/PKGBUILD
index c1f52e425..dcfb6d191 100644
--- a/extra/taglib/PKGBUILD
+++ b/extra/taglib/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=taglib
 pkgver=1.9.1
 pkgrel=1
 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=('LGPL' 'MPL')
 depends=('sh' 'zlib' 'gcc-libs')
diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD
index 09af8d2ad..d5994380d 100644
--- a/extra/tali/PKGBUILD
+++ b/extra/tali/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tali
 pkgver=3.10.2
 pkgrel=1
 pkgdesc="Beat the odds in a poker-style dice game"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg')
 makedepends=('intltool' 'itstool' 'gobject-introspection')
diff --git a/extra/talloc/PKGBUILD b/extra/talloc/PKGBUILD
index 90e4faa7d..fff399c50 100644
--- a/extra/talloc/PKGBUILD
+++ b/extra/talloc/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=talloc
 pkgver=2.0.8
 pkgrel=2
 pkgdesc="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 4a3936146..5153853ee 100644
--- a/extra/tamu-anova/PKGBUILD
+++ b/extra/tamu-anova/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tamu-anova
 pkgver=0.2.1
 pkgrel=2
 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 0b73c22fe..70dd07dfc 100644
--- a/extra/tcl/PKGBUILD
+++ b/extra/tcl/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tcl
 pkgver=8.6.1
 pkgrel=1
 pkgdesc="The Tcl scripting language"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://tcl.sourceforge.net/"
 license=('custom')
 depends=('zlib')
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index c4a3c712c..9811fa83e 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=tcpdump
 pkgver=4.5.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 bfc8dfd2d..23e93d60a 100644
--- a/extra/tdb/PKGBUILD
+++ b/extra/tdb/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tdb
 pkgver=1.2.12
 pkgrel=1
 pkgdesc="A Trivial 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-farstream/PKGBUILD b/extra/telepathy-farstream/PKGBUILD
index 5b5777368..7f258a543 100644
--- a/extra/telepathy-farstream/PKGBUILD
+++ b/extra/telepathy-farstream/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-farstream
 pkgver=0.6.0
 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=('LGPL2.1')
 depends=('telepathy-glib' 'farstream')
diff --git a/extra/telepathy-gabble/PKGBUILD b/extra/telepathy-gabble/PKGBUILD
index 96eb4705b..b5ed216dd 100644
--- a/extra/telepathy-gabble/PKGBUILD
+++ b/extra/telepathy-gabble/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-gabble
 pkgver=0.18.1
 pkgrel=2
 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 dea1911a4..4320149c4 100644
--- a/extra/telepathy-glib/PKGBUILD
+++ b/extra/telepathy-glib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=telepathy-glib
 pkgver=0.22.0
 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=('!emptydirs')
diff --git a/extra/telepathy-haze/PKGBUILD b/extra/telepathy-haze/PKGBUILD
index 84767e9ed..92172f940 100644
--- a/extra/telepathy-haze/PKGBUILD
+++ b/extra/telepathy-haze/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-haze
 pkgver=0.8.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 f5aa963d2..47ca43df5 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=telepathy-idle
 pkgver=0.2.0
 pkgrel=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 690addd67..68ef04fe4 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=ktp-accounts-kcm
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index dfb2c5aa2..dcd0b6e0c 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=ktp-approver
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index ad8f0ff12..adf6acd2e 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=ktp-auth-handler
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl' 'libaccounts-qt' 'signon')
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index 4ce14957a..5954e740f 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=ktp-common-internals
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('libkpeople' 'telepathy-logger-qt' 'telepathy-mission-control')
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index 27e3d6b93..8babfa20c 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=ktp-contact-list
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="Telepathy contact list application"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals' 'kdebase-runtime')
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index 95f1f2bf2..4c1041cf8 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=ktp-contact-runner
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals')
diff --git a/extra/telepathy-kde-desktop-applets/PKGBUILD b/extra/telepathy-kde-desktop-applets/PKGBUILD
index 5feb0f2f5..bf3e9c97d 100644
--- a/extra/telepathy-kde-desktop-applets/PKGBUILD
+++ b/extra/telepathy-kde-desktop-applets/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=ktp-desktop-applets
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="The KDE-Telepathy Plasma desktop applets"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals' 'kdebase-workspace')
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index de9b6e530..200aaff08 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=ktp-filetransfer-handler
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals')
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index 6d7049358..1c2cfc724 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=ktp-kded-integration-module
 pkgver=0.7.1
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-common-internals')
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index f62a38122..07e64b29a 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=ktp-send-file
 pkgver=0.7.1
 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://community.kde.org/Real-Time_Communication_and_Collaboration"
 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 4ab0119a7..7cbba2e32 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -7,7 +7,7 @@ _pkgname=ktp-text-ui
 pkgver=0.7.1
 pkgrel=2
 pkgdesc="Telepathy handler for Text Chats"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
 depends=('telepathy-kde-contact-list' 'qjson')
diff --git a/extra/telepathy-logger-qt/PKGBUILD b/extra/telepathy-logger-qt/PKGBUILD
index afe4ebc98..031a5f0fd 100644
--- a/extra/telepathy-logger-qt/PKGBUILD
+++ b/extra/telepathy-logger-qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-logger-qt
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="Qt bindings for telepathy logger"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt'
 license=('GPL')
 depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer')
diff --git a/extra/telepathy-logger/PKGBUILD b/extra/telepathy-logger/PKGBUILD
index c7e6a69d4..a44ddb98a 100644
--- a/extra/telepathy-logger/PKGBUILD
+++ b/extra/telepathy-logger/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=telepathy-logger
 pkgver=0.8.0
 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' 'sqlite' 'libxml2' 'dconf')
diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD
index 63d050690..73c4e93c8 100644
--- a/extra/telepathy-mission-control/PKGBUILD
+++ b/extra/telepathy-mission-control/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=telepathy-mission-control
 pkgver=5.16.0
 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' 'dconf' 'upower' 'networkmanager')
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index 3182d9e2d..671efdab3 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-qt
 pkgver=0.9.3
 pkgrel=7
 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')
 depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base')
diff --git a/extra/telepathy-rakia/PKGBUILD b/extra/telepathy-rakia/PKGBUILD
index 4dd4bf5bc..35f14853e 100644
--- a/extra/telepathy-rakia/PKGBUILD
+++ b/extra/telepathy-rakia/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=telepathy-rakia
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="SIP connection manager for Telepathy"
-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/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD
index e031f7da4..d52a2e1d3 100644
--- a/extra/telepathy-salut/PKGBUILD
+++ b/extra/telepathy-salut/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=telepathy-salut
 pkgver=0.8.1
 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/testdisk/PKGBUILD b/extra/testdisk/PKGBUILD
index 6f21c9d27..b3ee6b030 100644
--- a/extra/testdisk/PKGBUILD
+++ b/extra/testdisk/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=testdisk
 pkgver=6.14
 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' 'openssl' 'progsreiserfs' 'ntfsprogs')
diff --git a/extra/tevent/PKGBUILD b/extra/tevent/PKGBUILD
index 53bf10f56..6ecf5e917 100644
--- a/extra/tevent/PKGBUILD
+++ b/extra/tevent/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=tevent
 pkgver=0.9.19
 pkgrel=1
 pkgdesc="An event system based on the talloc memory management library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://tevent.samba.org/"
 source=("http://samba.org/ftp/tevent/${pkgname}-${pkgver}.tar.gz")
 license=('GPL3')
diff --git a/extra/texmacs/PKGBUILD b/extra/texmacs/PKGBUILD
index 61597344f..48a68671f 100644
--- a/extra/texmacs/PKGBUILD
+++ b/extra/texmacs/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=texmacs
 pkgver=1.0.7.21
 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' 'guile1.8' 'texlive-core' 'python2' 'libxext' 'freetype2' 'shared-mime-info'
@@ -37,6 +37,9 @@ build() {
   sed -i '/gtk-update-icon-cache/d' Makefile.in
   sed -i '\/icons\/gnome 2>\/dev\/null/d' Makefile.in
 
+  # Unused i386 binary making strip fail.
+  test "$CARCH" = "mips64el" && rm plugins/maxima/bin/maxima_filter
+  
   export QMAKE=qmake-qt4
   export MOC=moc-qt4
   export UIC=uic-qt4
diff --git a/extra/tftp-hpa/PKGBUILD b/extra/tftp-hpa/PKGBUILD
index 9d2733395..ca202c1bc 100644
--- a/extra/tftp-hpa/PKGBUILD
+++ b/extra/tftp-hpa/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tftp-hpa
 pkgver=5.2
 pkgrel=4
 pkgdesc="Official tftp server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kernel.org/pub/software/network/tftp/tftp-hpa/"
 license=('BSD')
 depends=('readline>=6.0.00')
diff --git a/extra/thin-provisioning-tools/PKGBUILD b/extra/thin-provisioning-tools/PKGBUILD
index a57b84756..55f8fbcb5 100644
--- a/extra/thin-provisioning-tools/PKGBUILD
+++ b/extra/thin-provisioning-tools/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=thin-provisioning-tools
 pkgver=0.2.7
 pkgrel=1
 pkgdesc="A suite of tools for manipulating the metadata of the dm-thin device-mapper target"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/jthornber/thin-provisioning-tools"
 license=('GPL3')
 depends=('expat' 'gcc-libs')
diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD
index d8ed71fee..7760f310b 100644
--- a/extra/thinkfinger/PKGBUILD
+++ b/extra/thinkfinger/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.3
 pkgrel=8
 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')
 options=('emptydirs')
diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD
index 7b21e0ec2..d2b7defc2 100644
--- a/extra/thunar-archive-plugin/PKGBUILD
+++ b/extra/thunar-archive-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=thunar-archive-plugin
 pkgver=0.3.1
 pkgrel=2
 pkgdesc="Create and extract archives in Thunar"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/thunar-media-tags-plugin/PKGBUILD b/extra/thunar-media-tags-plugin/PKGBUILD
index 3dab7835f..70a890bab 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.1
 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 f9a3a5fe5..e775d244d 100644
--- a/extra/thunar-volman/PKGBUILD
+++ b/extra/thunar-volman/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=thunar-volman
 pkgver=0.8.0
 pkgrel=1
 pkgdesc="Automatic management of removeable devices in Thunar"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://foo-projects.org/~benny/projects/thunar-volman"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/thunar/PKGBUILD b/extra/thunar/PKGBUILD
index 21a794363..ad4c50162 100644
--- a/extra/thunar/PKGBUILD
+++ b/extra/thunar/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=thunar
 pkgver=1.6.3
 pkgrel=1
 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 958210b0a..22b02a1e0 100644
--- a/extra/tidyhtml/PKGBUILD
+++ b/extra/tidyhtml/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=tidyhtml
 pkgver=1.46
 pkgrel=3
 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/time/PKGBUILD b/extra/time/PKGBUILD
index bfb999c58..09d9d15c2 100644
--- a/extra/time/PKGBUILD
+++ b/extra/time/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=time
 pkgver=1.7
 pkgrel=7
 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 a948629e6..151d036f4 100644
--- a/extra/timidity++/PKGBUILD
+++ b/extra/timidity++/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=timidity++
 pkgver=2.14.0
 pkgrel=5
 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' 'jack')
diff --git a/extra/tinycdb/PKGBUILD b/extra/tinycdb/PKGBUILD
index 2e803febd..5467ce5ff 100644
--- a/extra/tinycdb/PKGBUILD
+++ b/extra/tinycdb/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='Very fast and simple package for creating and reading constant data bases'
 url='http://www.corpit.ru/mjt/tinycdb.html'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.corpit.ru/mjt/tinycdb/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('ade42ee1e7c56f66a63cb933206c089b9983adba')
 
diff --git a/extra/tk/PKGBUILD b/extra/tk/PKGBUILD
index c8dc7bf0c..bd5f87744 100644
--- a/extra/tk/PKGBUILD
+++ b/extra/tk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tk
 pkgver=8.6.1
 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/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index c5befcdba..f1116384c 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 url="http://www.gnome.org"
 pkgdesc="Totem playlist parser library"
 license=('LGPL')
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 depends=('gmime' 'libsoup' 'libarchive')
 makedepends=('intltool' 'gobject-introspection' 'libquvi')
 optdepends=('libquvi: video site handling (Youtube etc.)')
diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD
index 0a8c7df14..284578699 100644
--- a/extra/totem/PKGBUILD
+++ b/extra/totem/PKGBUILD
@@ -8,13 +8,14 @@ pkgver=3.10.1
 pkgrel=1
 pkgdesc="GNOME3 movie player based on GStreamer"
 url="http://www.gnome.org"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(GPL2 custom)
 depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
          hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst
          clutter-gtk python-gobject python-xdg gst-plugins-bad)
 makedepends=(intltool libnautilus-extension lirc-utils vala grilo dbus-glib zeitgeist
              itstool docbook-xsl python-pylint)
+[ "$CARCH" != "mips64el" ] && makedepends+=('lirc-utils')
 options=('!emptydirs')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
         browser-plugins.ini bugreport.patch)
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 93ff851eb..fb4e6ede9 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -9,7 +9,7 @@ pkgver=0.16.4
 _tver=${pkgver%.*}
 pkgrel=1
 pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=(GPL)
 makedepends=(libgee libsecret upower libexif exempi
              poppler-glib libgsf icu enca networkmanager gtk3
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index 515db2db4..0ab9b7622 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -8,7 +8,7 @@ _sripver=0.3-4
 pkgver=1.1.7
 pkgrel=13
 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 bd73bf55b..fb25f29d8 100644
--- a/extra/transfig/PKGBUILD
+++ b/extra/transfig/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=transfig
 pkgver=3.2.5e
 pkgrel=1
 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' 'bc')
diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD
index af7b4e93f..836b49468 100644
--- a/extra/transmission/PKGBUILD
+++ b/extra/transmission/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=transmission
 pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
 pkgver=2.82
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.transmissionbt.com/"
 license=('MIT')
 makedepends=('gtk3' 'intltool' 'curl' 'qt5-base' 'libevent')
diff --git a/extra/trayer/PKGBUILD b/extra/trayer/PKGBUILD
index 3e3a6aaf4..d9a8e1259 100644
--- a/extra/trayer/PKGBUILD
+++ b/extra/trayer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=trayer
 pkgver=1.0
 pkgrel=7
 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..c17f97b38 100644
--- a/extra/tree/PKGBUILD
+++ b/extra/tree/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=tree
 pkgver=1.6.0
-pkgrel=2
+pkgrel=2.1
 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/tsocks/PKGBUILD b/extra/tsocks/PKGBUILD
index 6b5aec3f2..19bfbfbfd 100644
--- a/extra/tsocks/PKGBUILD
+++ b/extra/tsocks/PKGBUILD
@@ -7,13 +7,14 @@ pkgrel=6
 pkgdesc='Transparent SOCKS proxying library'
 url='http://tsocks.sourceforge.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('489f88c5df999ba21b27cdaa7836d9426d062aec')
 
 build() {
 	cd "${srcdir}/${pkgname}-1.8"
-	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib
+	./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man --libdir=/usr/lib \
+		--build=$CHOST --host=$CHOST
 	make
 }
 
diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD
index 72e26070c..af38e2b03 100644
--- a/extra/tumbler/PKGBUILD
+++ b/extra/tumbler/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=tumbler
 pkgver=0.1.29
 pkgrel=1
 pkgdesc="D-Bus service for applications to request thumbnails"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2' 'LGPL')
 groups=('xfce4')
diff --git a/extra/tuxpuck/PKGBUILD b/extra/tuxpuck/PKGBUILD
index 20791a80c..edbcbe3b4 100644
--- a/extra/tuxpuck/PKGBUILD
+++ b/extra/tuxpuck/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=tuxpuck
 pkgver=0.8.2
 pkgrel=6
 pkgdesc="Airhockey with tux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://home.no.net/munsuun/tuxpuck/"
 license=('GPL2')
 depends=('libjpeg' 'sdl' 'libpng' 'libvorbis')
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index 5765c8786..e5fd06a78 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=twisted
 pkgver=13.2.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-crypto' 'python2-zope-interface')
diff --git a/extra/ucommon/PKGBUILD b/extra/ucommon/PKGBUILD
index f88f7cc21..1902c97d9 100644
--- a/extra/ucommon/PKGBUILD
+++ b/extra/ucommon/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=ucommon
 pkgver=6.0.7
 pkgrel=2
 pkgdesc="A light-weight C++ library to facilitate using C++ design patterns"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnutelephony.org/index.php/GNU_uCommon_C++"
 license=('GPL3' 'LGPL3')
 depends=('openssl')
diff --git a/extra/udisks/PKGBUILD b/extra/udisks/PKGBUILD
index 08ab09073..7b5ddcf2b 100644
--- a/extra/udisks/PKGBUILD
+++ b/extra/udisks/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=udisks
 pkgver=1.0.4
 pkgrel=8
 pkgdesc="Disk Management Service"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL')
 depends=('systemd' 'util-linux' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof')
diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD
index 03dbb40dd..aea1db9b6 100644
--- a/extra/udisks2/PKGBUILD
+++ b/extra/udisks2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=udisks2
 pkgver=2.1.2
 pkgrel=1
 pkgdesc="Disk Management Service, version 2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/udisks"
 license=('GPL2')
 depends=('glib2' 'systemd' 'polkit' 'libatasmart' 'util-linux')
diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD
index 386667bf5..f111a1b8e 100644
--- a/extra/uim/PKGBUILD
+++ b/extra/uim/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=2
 pkgdesc='Multilingual input method library'
 url='http://code.google.com/p/uim/'
 license=('custom:BSD')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libxft' 'libedit' 'anthy' 'm17n-lib')
 makedepends=('intltool' 'gettext' 'qt4' 'gtk2' 'gtk3')
 optdepends=('qt4: immodule and helper applications'
@@ -34,7 +34,7 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+	make -j1 DESTDIR="${pkgdir}" install
 	rm "${pkgdir}"/usr/lib/libgcroots.a
 	install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/extra/unison/PKGBUILD b/extra/unison/PKGBUILD
index c92284689..f5d0bf067 100644
--- a/extra/unison/PKGBUILD
+++ b/extra/unison/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=unison
 pkgver=2.40.102
 pkgrel=1
 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 9f1ab59c8..da109776e 100644
--- a/extra/unixodbc/PKGBUILD
+++ b/extra/unixodbc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=unixodbc
 pkgver=2.3.2
 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 891dacb42..15586e6ad 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=upower
 pkgver=0.9.23
 pkgrel=2
 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=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'dbus-glib' 'libimobiledevice')
diff --git a/extra/usbmuxd/PKGBUILD b/extra/usbmuxd/PKGBUILD
index beb49de32..92176aa3b 100644
--- a/extra/usbmuxd/PKGBUILD
+++ b/extra/usbmuxd/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.0.8
 pkgrel=2
 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' 'libplist')
 makedepends=('cmake')
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 1e6f146ea..3af353bf0 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=v4l-utils
 pkgver=1.0.1
 pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://linuxtv.org/"
 provides=("libv4l=$pkgver")
 replaces=('libv4l')
diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD
index 96304c84d..e336788a2 100644
--- a/extra/v86d/PKGBUILD
+++ b/extra/v86d/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=v86d
 pkgver=0.1.10
 pkgrel=5
 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment"
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64" 'mips64el')
 url="https://github.com/mjanusz/v86d"
 license=('GPL2')
 depends=('glibc')
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index bbfc5e880..5625554de 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vala
 pkgver=0.22.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/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index 94cf691de..e0cc501ea 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=2.5
 _dir=690
 pkgrel=2
 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 32567111c..49bb04f81 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=varnish
 pkgver=3.0.5
 pkgrel=1
 pkgdesc="High-performance HTTP accelerator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.varnish-cache.org/"
 license=('BSD')
 depends=('gcc' 'libedit' 'pcre')
diff --git a/extra/vcdimager/PKGBUILD b/extra/vcdimager/PKGBUILD
index 736589e62..b406c2834 100644
--- a/extra/vcdimager/PKGBUILD
+++ b/extra/vcdimager/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vcdimager
 pkgver=0.7.24
 pkgrel=5
 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' 'libxml2' 'popt')
diff --git a/extra/vde2/PKGBUILD b/extra/vde2/PKGBUILD
index 403ad5e34..e109ccd4d 100644
--- a/extra/vde2/PKGBUILD
+++ b/extra/vde2/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=5
 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')
 makedepends=('python')
 source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 7068e569c..7e24b4ab6 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vice
 pkgver=2.4
 pkgrel=5
 pkgdesc="The Versatile Commodore 8-bit Emulator"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://vice-emu.sourceforge.net/"
 depends=('alsa-lib' 'giflib' 'libxxf86vm' 'vte' 'libnet' 'libpcap')
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 98fbdfe50..eacbd4ab4 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=vigra
 pkgname=('vigra' 'vigra-doc')
 pkgver=1.10.0
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hci.iwr.uni-heidelberg.de/vigra/"
 license=('custom:MIT')
 makedepends=(# runtime deps
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index a6537198b..a29e6644e 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=vinagre
 pkgver=3.10.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 a13a139f1..c2dca6ce6 100644
--- a/extra/vino/PKGBUILD
+++ b/extra/vino/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=vino
 pkgver=3.10.1
 pkgrel=2
 pkgdesc="a VNC server for the GNOME desktop"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'mips64el')
 license=(GPL)
 depends=(libnotify libxtst libsm telepathy-glib gtk3 libsecret avahi desktop-file-utils)
 makedepends=(intltool networkmanager gnome-common)
diff --git a/extra/virtuoso/PKGBUILD b/extra/virtuoso/PKGBUILD
index b098d36e5..0f4f4e2f7 100644
--- a/extra/virtuoso/PKGBUILD
+++ b/extra/virtuoso/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=('virtuoso' 'virtuoso-base')
 epoch=1
 pkgver=6.1.7
 pkgrel=2
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://virtuoso.openlinksw.com/wiki/main/Main/'
 license=('GPL')
 makedepends=('libldap' 'bison' 'flex' 'gperf' 'net-tools' 'libxml2' 'optipng')
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 633d468ec..b4124b5e4 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=vlc
 pkgver=2.1.4
 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=('LGPL2.1' 'GPL2')
 depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy' 
@@ -16,26 +16,28 @@ depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
          'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar' 
          'libxinerama')
 makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'libdc1394' 'libavc1394' 'lirc-utils' 'libcaca' 
-             'librsvg' 'portaudio' 'libgme' 'xosd' 'projectm' 
+             'libdc1394' 'libavc1394' 'libcaca' 
+             'librsvg' 'portaudio' 'libgme' 'xosd'
              'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs' 
              'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
+[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'projectm')
 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'
+            'libdvdcss: for decoding encrypted DVDs')
+[ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: for lirc plugin')
+optdepends+=('libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
-            'kdelibs: KDE Solid hardware integration'
-            'libva-vdpau-driver: vdpau back-end for nvidia'
-            'libva-intel-driver: back-end for intel cards'
-            'libbluray: for Blu-Ray support'
-            'flac: for Free Lossless Audio Codec plugin'
-            'portaudio: for portaudio support'
-            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'projectm: for ProjectM visualisation plugin'
-            'libcaca: for colored ASCII art video output'
+            'kdelibs: KDE Solid hardware integration')
+[ "$CARCH" = "mips64el" ] || optdepends+=('libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards')
+optdepends+=('libbluray: for Blu-Ray support'
+            'flac: for Free Lossless Audio Codec plugin')
+[ "$CARCH" = "mips64el" ] || optdepends+=('oss: for OSS audio support')
+optdepends+=('portaudio: for portaudio support'
+            'twolame: for TwoLAME mpeg2 encoder plugin')
+[ "$CARCH" = "mips64el" ] || optdepends+=('projectm: for ProjectM visualisation plugin')
+optdepends+=('libcaca: for colored ASCII art video output'
             'libgme: for libgme plugin'
             'librsvg: for SVG plugin'
             'gnome-vfs: for GNOME Virtual File System support'
@@ -73,6 +75,7 @@ prepare() {
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
+  [ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc"
   CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
@@ -87,6 +90,7 @@ build() {
               --enable-upnp \
               --enable-opus \
               --enable-sftp \
+              $extraconf \
               LUAC=/usr/bin/luac  LUA_LIBS="`pkg-config --libs lua`" \
               RCC=/usr/bin/rcc-qt4
 
diff --git a/extra/vorbis-tools/PKGBUILD b/extra/vorbis-tools/PKGBUILD
index 7b54e44d6..7c9b87fcb 100644
--- a/extra/vorbis-tools/PKGBUILD
+++ b/extra/vorbis-tools/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=vorbis-tools
 pkgver=1.4.0
-pkgrel=3
+pkgrel=3.1
 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 935e0a914..c3a4aba3c 100644
--- a/extra/vpnc/PKGBUILD
+++ b/extra/vpnc/PKGBUILD
@@ -12,7 +12,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"
         "http://git.infradead.org/users/dwmw2/vpnc-scripts.git/blob_plain/$_git:/vpnc-script"
         'vpnc.conf')
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index 95324bdf3..da983b0b3 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=vte
 pkgver=0.28.2
-pkgrel=3
+pkgrel=3.2
 pkgdesc="Virtual Terminal Emulator widget for use with GTK2"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 options=('!emptydirs')
 depends=('gtk2' 'vte-common')
diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD
index 0732cf476..8bff41b9d 100644
--- a/extra/vte3/PKGBUILD
+++ b/extra/vte3/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=(vte3 vte-common)
 pkgver=0.34.9
 pkgrel=1
 pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
 options=('!emptydirs')
 makedepends=('intltool' 'gobject-introspection' 'gtk3')
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 18106f2bd..68462be22 100644
--- a/extra/w3m/PKGBUILD
+++ b/extra/w3m/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=5
 pkgdesc='Text-based Web browser, as well as pager'
 url='http://w3m.sourceforge.net/'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 makedepends=('imlib2')
 optdepends=('imlib2: for graphics support') 
 depends=('openssl' 'gc' 'ncurses')
@@ -37,8 +37,7 @@ build() {
 		--with-imagelib=imlib2 \
 		--with-termlib=ncurses \
 		--disable-w3mmailer \
-		--disable-mouse \
-
+		--disable-mouse
 	make
 }
 
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index 802d06d87..560eb2945 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=watchdog
 pkgver=5.13
 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 37f4b5764..7f7cfbaf2 100644
--- a/extra/wavpack/PKGBUILD
+++ b/extra/wavpack/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wavpack
 pkgver=4.70.0
 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=('BSD')
 depends=('glibc')
@@ -14,7 +14,8 @@ sha1sums=('7bf2022c988c19067196ee1fdadc919baacf46d1')
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --libdir=/usr/lib --enable-mmx
+  [ "$CARCH" = "mips64el" ] || extra=--enable-mmx
+    ./configure --prefix=/usr --libdir=/usr/lib --enable-mmx $extra
   make
 }
 
diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD
index 5defd4e30..2791d52e9 100644
--- a/extra/wayland/PKGBUILD
+++ b/extra/wayland/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=wayland
 pkgver=1.4.0
 pkgrel=1
 pkgdesc='A computer display server protocol'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://wayland.freedesktop.org'
 license=('MIT')
 depends=('libffi' 'expat')
diff --git a/extra/wcslib/PKGBUILD b/extra/wcslib/PKGBUILD
index d810fb47b..dce642c4c 100644
--- a/extra/wcslib/PKGBUILD
+++ b/extra/wcslib/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wcslib
 pkgver=4.20
 pkgrel=1
 pkgdesc="A C library that implements the 'World Coordinate System' (WCS) standard in FITS"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.atnf.csiro.au/people/Mark.Calabretta/WCS/"
 license=('GPL3')
 depends=('cfitsio')
diff --git a/extra/webkitgtk/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch b/extra/webkitgtk/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch
new file mode 100644
index 000000000..49eb83223
--- /dev/null
+++ b/extra/webkitgtk/0001-https-bugs.webkit.org-show_bug.cgi-id-112141.patch
@@ -0,0 +1,64 @@
+Without ChangeLog change.
+
+From 7ba6eb5405cb66c97398f8cdb6d5f9e919ba6131 Mon Sep 17 00:00:00 2001
+From: "rgabor@webkit.org"
+ <rgabor@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
+Date: Tue, 12 Mar 2013 15:28:10 +0000
+Subject: [PATCH] https://bugs.webkit.org/show_bug.cgi?id=112141 LLInt CLoop
+ backend misses Double2Ints() on 32bit architectures
+
+Reviewed by Filip Pizlo.
+
+Implement Double2Ints() in CLoop backend of LLInt on 32bit architectures.
+
+* llint/LowLevelInterpreter.cpp:
+(LLInt):
+(JSC::LLInt::Double2Ints):
+* offlineasm/cloop.rb:
+
+
+git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145551 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+---
+ Source/JavaScriptCore/ChangeLog                     | 14 ++++++++++++++
+ Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 11 +++++++++++
+ Source/JavaScriptCore/offlineasm/cloop.rb           |  2 +-
+ 3 files changed, 26 insertions(+), 1 deletion(-)
+
+diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+index d3c73b0..186c659 100644
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
+@@ -117,6 +117,17 @@ static double Ints2Double(uint32_t lo, uint32_t hi)
+     u.ival64 = (static_cast<uint64_t>(hi) << 32) | lo;
+     return u.dval;
+ }
++
++static void Double2Ints(double val, uint32_t& lo, uint32_t& hi)
++{
++    union {
++        double dval;
++        uint64_t ival64;
++    } u;
++    u.dval = val;
++    hi = static_cast<uint32_t>(u.ival64 >> 32);
++    lo = static_cast<uint32_t>(u.ival64);
++}
+ #endif // USE(JSVALUE32_64)
+ 
+ } // namespace LLint
+diff --git a/Source/JavaScriptCore/offlineasm/cloop.rb b/Source/JavaScriptCore/offlineasm/cloop.rb
+index 14cacb9..f6bd552 100644
+--- a/Source/JavaScriptCore/offlineasm/cloop.rb
++++ b/Source/JavaScriptCore/offlineasm/cloop.rb
+@@ -1025,7 +1025,7 @@ class Instruction
+         # 32-bit instruction: f2dii dblOp int32LoOp int32HiOp (based on ARMv7)
+         # Encode a 64-bit double into 2 32-bit ints (low and high).
+         when "fd2ii"
+-            $asm.putc "Double2Ints(#{operands[0].clValue(:double)}, #{operands[1].clValue}, #{operands[2].clValue});"
++            $asm.putc "Double2Ints(#{operands[0].clValue(:double)}, #{operands[1].clValue(:uint32)}, #{operands[2].clValue(:uint32)});"
+ 
+         # 64-bit instruction: fq2d int64Op dblOp (based on X64)
+         # Copy a bit-encoded double in a 64-bit int register to a double register.
+-- 
+1.8.2.1
+
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index 64290b1fd..88fa24493 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=webkitgtk
 pkgver=2.2.5
 pkgrel=1
 pkgdesc="GTK+ Web content engine library"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://webkitgtk.org/"
 license=(custom)
 depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk3 gst-plugins-base-libs
@@ -19,11 +19,39 @@ options=(!emptydirs)
 source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz)
 sha256sums=('c710994a1ed0ec78f746a05ae7dc65369ed56d7475f0de576ca7a73ad9c6e670')
 
+prepare() {
+  cd $pkgbase-$pkgver
+
+  if [ "$CARCH" = "mips64el" ]; then
+     # Fix MIPS N32 support.
+      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
+          Source/WTF/wtf/Platform.h
+     # Don't enable JIT even if configure finds that it's not supported.
+      sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
+          Source/WTF/wtf/Platform.h
+  fi
+
+  # Won't be made before files there.
+  mkdir -p Programs/resources
+}
+
 build() {
   cd $pkgname-$pkgver
+
+  if [ "$CARCH" = "mips64el" ]; then
+      # Optimizations make it segfault when running; without
+      # -mlong-calls R_MIPS_26 relocations will be used and truncated.
+      # Disable unneeded arch-specific warnings.
+      export CPPFLAGS="${CPPFLAGS/-D_FORTIFY_SOURCE=[0-9]} -Wno-cast-align"
+      export CFLAGS="${CFLAGS/-O[0-9]} -mlong-calls"
+      export CXXFLAGS="${CXXFLAGS/-O[0-9]} -mlong-calls"
+      extra="--disable-fast-malloc --disable-optimizations"
+  fi
+
   ./configure --prefix=/usr \
     --libexecdir=/usr/lib/$pkgname \
-    --enable-introspection
+    --enable-introspection \
+    ${extra}
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD
index 7ac1d56aa..e2e8aa1b6 100644
--- a/extra/webkitgtk2/PKGBUILD
+++ b/extra/webkitgtk2/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=webkitgtk2
 pkgver=1.10.2
 pkgrel=8
 pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://webkitgtk.org/"
 license=(custom)
 depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk2 gstreamer0.10-base
@@ -32,12 +32,27 @@ build() {
   # Suppress a *lot* of gcc 4.8 warnings
   CPPFLAGS+=" -Wno-unused-local-typedefs"
 
+  if [ "$CARCH" = "mips64el" ]; then
+     # Fix MIPS N32 support.
+      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
+          Source/WTF/wtf/Platform.h
+     # Don't enable JIT even if configure finds that it's not supported.
+      sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \
+          Source/WTF/wtf/Platform.h
+
+# --disable-optimizations will add -O0
+      export CFLAGS="${CFLAGS/-O[0-9]}"
+
+      extra="--disable-fast-malloc --disable-optimizations"
+  fi
+
   PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
     --libexecdir=/usr/lib/$pkgname \
     --enable-introspection \
     --disable-webkit2 \
     --with-gstreamer=0.10 \
-    --with-gtk=2.0
+    --with-gtk=2.0 \
+    $extra
 
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
diff --git a/extra/webrtc-audio-processing/0001-Don-t-error-or-set-options-for-unknown-architectures.patch b/extra/webrtc-audio-processing/0001-Don-t-error-or-set-options-for-unknown-architectures.patch
new file mode 100644
index 000000000..93a3d098a
--- /dev/null
+++ b/extra/webrtc-audio-processing/0001-Don-t-error-or-set-options-for-unknown-architectures.patch
@@ -0,0 +1,24 @@
+From 6480b6b44e376cbec2d8e4499692573a3861e003 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd@luon.net>
+Date: Sat, 19 May 2012 21:52:09 +0200
+Subject: [PATCH] Don't error or set options for unknown architectures
+
+---
+ src/typedefs.h |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/typedefs.h b/src/typedefs.h
+index 6620550..774905b 100644
+--- a/src/typedefs.h
++++ b/src/typedefs.h
+@@ -77,7 +77,6 @@
+ #define WEBRTC_ARCH_32_BITS
+ #define WEBRTC_ARCH_LITTLE_ENDIAN
+ #else
+-#error Please add support for your architecture in typedefs.h
+ #endif
+ 
+ #if defined(__SSE2__) || defined(_MSC_VER)
+-- 
+1.7.10
+
diff --git a/extra/webrtc-audio-processing/PKGBUILD b/extra/webrtc-audio-processing/PKGBUILD
index 299adac16..58bdf6e9c 100644
--- a/extra/webrtc-audio-processing/PKGBUILD
+++ b/extra/webrtc-audio-processing/PKGBUILD
@@ -3,18 +3,24 @@
 
 pkgname=webrtc-audio-processing
 pkgver=0.1
-pkgrel=1
+pkgrel=1.1
 _gitrev=9413986
 pkgdesc="AudioProcessing library based on Google's implementation of WebRTC"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://freedesktop.org/software/pulseaudio/webrtc-audio-processing"
 license=(custom)
 depends=(gcc-libs)
-source=("$url/$pkgname-$pkgver.tar.xz")
-sha256sums=('ed4b52f9c2688b97628035a5565377d74704d7c04de4254a768df3342c7afedc')
+source=("$url/$pkgname-$pkgver.tar.xz"
+        0001-Don-t-error-or-set-options-for-unknown-architectures.patch)
+sha256sums=('ed4b52f9c2688b97628035a5565377d74704d7c04de4254a768df3342c7afedc'
+            '0f423b24565d0c50be4937b6f50a43cfd683c1a76c25ef80fca5f731e283fe1c')
 
 build() {
   cd $pkgname-$pkgver
+
+# Patch from Debian
+  patch -Np1 -i ${srcdir}/0001-Don-t-error-or-set-options-for-unknown-architectures.patch
+
   ./configure --prefix=/usr --disable-static
   make
 }
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index 3d3d52d89..421b6de6d 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=weechat
 pkgver=0.4.3
 pkgrel=1
 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' 'curl' 'libgcrypt')
diff --git a/extra/wget/PKGBUILD b/extra/wget/PKGBUILD
index de846802f..4a0476677 100644
--- a/extra/wget/PKGBUILD
+++ b/extra/wget/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wget
 pkgver=1.15
 pkgrel=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')
 depends=('openssl' 'libidn' 'util-linux')
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 425c5c379..8d2b5f25e 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=whois
 pkgver=5.1.1
 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/wildmidi/PKGBUILD b/extra/wildmidi/PKGBUILD
index 62324cf9d..45347b8f3 100644
--- a/extra/wildmidi/PKGBUILD
+++ b/extra/wildmidi/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=wildmidi
 pkgver=0.3.2
 pkgrel=1
 pkgdesc='Open Source MIDI Synthesizer'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mindwerks.net/projects/wildmidi/"
 license=('LGPL3')
 depends=('alsa-lib')
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index 08a557b18..5cad5a884 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=windowmaker
 pkgver=0.95.5
 pkgrel=3
 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..c471c03cb 100644
--- a/extra/wipe/PKGBUILD
+++ b/extra/wipe/PKGBUILD
@@ -6,18 +6,19 @@
 
 pkgname=wipe
 pkgver=2.3.1
-pkgrel=2
+pkgrel=2.1
 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/wpa_supplicant_gui/PKGBUILD b/extra/wpa_supplicant_gui/PKGBUILD
index c90e36cc5..5ed7de404 100644
--- a/extra/wpa_supplicant_gui/PKGBUILD
+++ b/extra/wpa_supplicant_gui/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=2.0
 pkgrel=3
 pkgdesc="A Qt frontend to wpa_supplicant"
 url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('qt4' "wpa_supplicant")
 license=('GPL')
 source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz")
diff --git a/extra/wv/PKGBUILD b/extra/wv/PKGBUILD
index 6d8d27205..da58e0a96 100644
--- a/extra/wv/PKGBUILD
+++ b/extra/wv/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wv
 pkgver=1.2.9
 pkgrel=3
 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 libpng sh)
diff --git a/extra/wxgtk/PKGBUILD b/extra/wxgtk/PKGBUILD
index 4c539c847..269510413 100644
--- a/extra/wxgtk/PKGBUILD
+++ b/extra/wxgtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=wxgtk
 pkgver=3.0.0
 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')
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index 3c4a112ce..08bba3dc6 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=wxmaxima
 pkgver=13.04.2
 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' 'wxgtk2.8' 'shared-mime-info' 'desktop-file-utils')
diff --git a/extra/wxpython/PKGBUILD b/extra/wxpython/PKGBUILD
index 941a4feab..b57bbf4e9 100644
--- a/extra/wxpython/PKGBUILD
+++ b/extra/wxpython/PKGBUILD
@@ -6,7 +6,7 @@ pkgver=3.0.0.0
 _editraver=0.7.20
 pkgrel=2
 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/x11-ssh-askpass/PKGBUILD b/extra/x11-ssh-askpass/PKGBUILD
index 18d23681f..9e88da1da 100644
--- a/extra/x11-ssh-askpass/PKGBUILD
+++ b/extra/x11-ssh-askpass/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=4
 pkgdesc='Lightweight passphrase dialog for SSH'
 url='http://www.jmknoble.net/software/x11-ssh-askpass/'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libxt')
 makedepends=('imake')
 #source=("${url}${pkgname}-${pkgver}.tar.gz" # httpd only sends half the bits
diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD
index 292a45cdb..5a723ce00 100644
--- a/extra/x11vnc/PKGBUILD
+++ b/extra/x11vnc/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=0.9.13
 pkgrel=5
 pkgdesc='VNC server for real X displays'
 url='http://www.karlrunge.com/x11vnc/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 optdepends=('tk: for GUI support'
             'net-tools: for -auth guess')
diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index 6f6b9ff5c..f630a3891 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=x264
 pkgver=20131030
 pkgrel=2
 pkgdesc='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')
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index 74b542881..b0e720542 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=x2goclient
 pkgver=4.0.1.3
 pkgrel=1
 pkgdesc="x2go qt4 client"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 url="http://www.x2go.org"
 depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index 4eee1ce66..47165a29a 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=x2goserver
 pkgver=4.0.1.13
 pkgrel=1
 pkgdesc="Open source terminal server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.x2go.org/"
 license=('GPL2')
 # see x2goserver.spec
diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD
index a44b368fe..81638c8cf 100644
--- a/extra/xaos/PKGBUILD
+++ b/extra/xaos/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xaos
 pkgver=3.6
 pkgrel=1
 pkgdesc="A fast portable real-time interactive fractal zoomer"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://matek.hu/xaos/"
 license=('GPL')
 depends=('gsl' 'libpng' 'aalib')
diff --git a/extra/xaw3d/PKGBUILD b/extra/xaw3d/PKGBUILD
index 981fbd1ef..d4bdc36a8 100644
--- a/extra/xaw3d/PKGBUILD
+++ b/extra/xaw3d/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xaw3d
 pkgver=1.6.2
-pkgrel=1
+pkgrel=1.1
 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')
diff --git a/extra/xawtv/PKGBUILD b/extra/xawtv/PKGBUILD
index 233bf3bde..d7a039cc0 100644
--- a/extra/xawtv/PKGBUILD
+++ b/extra/xawtv/PKGBUILD
@@ -7,10 +7,11 @@ pkgname=xawtv
 pkgver=3.103
 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' 'libxxf86vm')
+depends=('aalib' 'v4l-utils' 'libxv' 'libxxf86dga' 'libxrandr' 'libgl' 'libdv' 'zvbi' 'libxinerama' 'libxft' 'libxaw' 'xorg-fonts-misc' 'libxxf86vm')
+[ "$CARCH" != "mips64el" ] && depends+=('lirc-utils')
 makedepends=('mesa')
 source=(http://linuxtv.org/downloads/xawtv/xawtv-${pkgver}.tar.bz2)
 md5sums=('18822bb3660540fa9ea8b643a5b30d6b')
diff --git a/extra/xbase/PKGBUILD b/extra/xbase/PKGBUILD
index ed992e937..b0410ec8a 100644
--- a/extra/xbase/PKGBUILD
+++ b/extra/xbase/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xbase
 pkgver=2.0.0
 pkgrel=2
 pkgdesc="An XBase compatible C++ class library"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://linux.techass.com/projects/xdb/'
 license=('LGPL')
 depends=('bash' 'gcc-libs')
diff --git a/extra/xbill/PKGBUILD b/extra/xbill/PKGBUILD
index 6e696a388..f18b89794 100644
--- a/extra/xbill/PKGBUILD
+++ b/extra/xbill/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xbill
 pkgver=2.1
-pkgrel=8
+pkgrel=8.1
 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>=1.6')
diff --git a/extra/xcb-util-image/PKGBUILD b/extra/xcb-util-image/PKGBUILD
index 9c1372155..7c9b4091f 100644
--- a/extra/xcb-util-image/PKGBUILD
+++ b/extra/xcb-util-image/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xcb-util-image
 pkgver=0.3.9
 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.9')
diff --git a/extra/xcb-util-keysyms/PKGBUILD b/extra/xcb-util-keysyms/PKGBUILD
index 9aa85f7c3..02c057083 100644
--- a/extra/xcb-util-keysyms/PKGBUILD
+++ b/extra/xcb-util-keysyms/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xcb-util-keysyms
 pkgver=0.3.9
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - Standard X key constants and conversion to/from keycodes"
-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 b6efdc470..70b9e40f7 100644
--- a/extra/xcb-util-renderutil/PKGBUILD
+++ b/extra/xcb-util-renderutil/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xcb-util-renderutil
 pkgver=0.3.8
-pkgrel=1
+pkgrel=1.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 58a5a5189..9ea7393df 100644
--- a/extra/xcb-util-wm/PKGBUILD
+++ b/extra/xcb-util-wm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xcb-util-wm
 pkgver=0.4.1
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - client and window-manager helpers for ICCCM"
-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 56c0e82d8..637aae039 100644
--- a/extra/xcb-util/PKGBUILD
+++ b/extra/xcb-util/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xcb-util
 pkgver=0.3.9
 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/xclip/PKGBUILD b/extra/xclip/PKGBUILD
index 0e5d405e5..2b8387bdf 100644
--- a/extra/xclip/PKGBUILD
+++ b/extra/xclip/PKGBUILD
@@ -5,12 +5,12 @@
 
 pkgname=xclip
 pkgver=0.12
-pkgrel=3
+pkgrel=3.1
 pkgdesc='Command line interface to the X11 clipboard'
 url='http://sourceforge.net/projects/xclip'
 license=('GPL')
 depends=('libxmu')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 source=("http://downloads.sourceforge.net/sourceforge/xclip/${pkgname}-${pkgver}.tar.gz")
 sha1sums=('aed2cff18b9aecfe3377ad064c6a67518bbec211')
 
diff --git a/extra/xcompmgr/PKGBUILD b/extra/xcompmgr/PKGBUILD
index cab1793ed..821e36277 100644
--- a/extra/xcompmgr/PKGBUILD
+++ b/extra/xcompmgr/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xcompmgr
 pkgver=1.1.6
-pkgrel=2
+pkgrel=2.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' 'libxext')
diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD
index 29f89c034..ff309b0bf 100644
--- a/extra/xdg-user-dirs-gtk/PKGBUILD
+++ b/extra/xdg-user-dirs-gtk/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xdg-user-dirs-gtk
 pkgver=0.10
 pkgrel=1
 pkgdesc="Creates user dirs and asks to relocalize them"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 license=('GPL')
 depends=('gtk3' 'xdg-user-dirs')
 makedepends=('intltool')
diff --git a/extra/xdg-user-dirs/PKGBUILD b/extra/xdg-user-dirs/PKGBUILD
index 88e7897a9..9a2b73d29 100644
--- a/extra/xdg-user-dirs/PKGBUILD
+++ b/extra/xdg-user-dirs/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xdg-user-dirs
 pkgver=0.15
 pkgrel=1
 pkgdesc="Manage user directories like ~/Desktop and ~/Music"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 license=(GPL)
 depends=(sh)
diff --git a/extra/xerces-c/PKGBUILD b/extra/xerces-c/PKGBUILD
index 09ee547fe..2d287ab47 100644
--- a/extra/xerces-c/PKGBUILD
+++ b/extra/xerces-c/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xerces-c
 pkgver=3.1.1
 pkgrel=5
 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/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD
index 5637cabb0..c21929af2 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=7
 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 123135bbb..b9404d7a1 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=7
 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 b83c28e72..5b7ee2e2b 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xf86-input-evdev
 pkgver=2.8.2
 pkgrel=2
 pkgdesc="X.org evdev input driver"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'systemd-tools' 'mtdev')
diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD
index 664cd9d4d..e6f2b87de 100644
--- a/extra/xf86-input-joystick/PKGBUILD
+++ b/extra/xf86-input-joystick/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-input-joystick
 pkgver=1.6.2
 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-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index f57bad555..fba8bfb65 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xf86-input-synaptics
 pkgver=1.7.3
 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' 'mtdev')
diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD
index 6bfb4d091..c3f876e41 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=6
 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 6d8c05d4c..d3c65a7a1 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xf86-input-wacom
 pkgver=0.23.0
 pkgrel=2
 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-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD
index 94ae47312..44662fa56 100644
--- a/extra/xf86-video-dummy/PKGBUILD
+++ b/extra/xf86-video-dummy/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-dummy
 pkgver=0.3.7
 pkgrel=2
 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 48bfa6932..25836e10b 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-fbdev
 pkgver=0.4.4
 pkgrel=2
 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-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD
index eb45b8e1e..9448cc13e 100644
--- a/extra/xf86-video-modesetting/PKGBUILD
+++ b/extra/xf86-video-modesetting/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xf86-video-modesetting
 pkgver=0.8.1
 pkgrel=2
 pkgdesc="X.org generic modesetting video driver"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm>=2.4.37' 'systemd')
diff --git a/extra/xf86-video-siliconmotion/98_sm712_CRT_enable.diff b/extra/xf86-video-siliconmotion/98_sm712_CRT_enable.diff
new file mode 100644
index 000000000..9ff473aff
--- /dev/null
+++ b/extra/xf86-video-siliconmotion/98_sm712_CRT_enable.diff
@@ -0,0 +1,14 @@
+--- ../xx/xserver-xorg-video-siliconmotion-1.7.3/src/smi_driver.c	2010-03-09 23:39:23.451798382 +0800
++++ xserver-xorg-video-siliconmotion-1.7.3/src/smi_driver.c	2010-03-10 10:36:58.835798871 +0800
+@@ -1805,6 +1797,11 @@
+     pScreen->SaveScreen = SMI_SaveScreen;
+     pSmi->CloseScreen = pScreen->CloseScreen;
+     pScreen->CloseScreen = SMI_CloseScreen;
++        /* Added by Belcon to enable LCD Panel Control Select */
++        if (pSmi->Chipset == SMI_LYNXEMplus)
++        {
++                VGAOUT8_INDEX (pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x22, 2);
++        }
+ 
+     if ((IS_MSOC(pSmi) &&
+ 	 !xf86DPMSInit(pScreen, SMI501_DisplayPowerManagementSet, 0)) ||
diff --git a/extra/xf86-video-siliconmotion/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff b/extra/xf86-video-siliconmotion/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff
new file mode 100644
index 000000000..4be6d6469
--- /dev/null
+++ b/extra/xf86-video-siliconmotion/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff
@@ -0,0 +1,160 @@
+rixed@happyleptic.org
+ 发送至 loongson-dev
+	
+A patch for siliconmotion 1.7.3 is available in the bug trackers
+at freedesktop.org, but a better one will be available monday.
+Still, it lacks the most interresting part : the MMX pack function,
+which should not be implemented there but probably either directly
+in Xv or in pixman (and make Xv use pixman).
+
+So for now the simpliest is to fix these manually.
+For the impatient I attach a patch against SM 1.7.3
+With it, 16bpp and AccelMethod = "XAA" works quite well.
+
+Just an ugly hack really.
+diff -ur orig/src/smi_video.c mod/src/smi_video.c
+--- orig/src/smi_video.c	2010-02-05 13:11:18.000000000 +0100
++++ mod/src/smi_video.c	2010-02-05 13:20:36.000000000 +0100
+@@ -276,6 +276,7 @@
+     XVIMAGE_YUY2,
+     XVIMAGE_YV12,
+     XVIMAGE_I420,
++    XVIMAGE_UYVY,
+     {
+ 	FOURCC_RV15,			/* id				*/
+ 	XvRGB,				/* type				*/
+@@ -1462,6 +1463,117 @@
+     LEAVE();
+ }
+ 
++static void myXVCopyYUV12ToPacked(const unsigned char *srcy, const unsigned char *srcv, const unsigned char *srcu,
++		unsigned char *dst, int srcPitchy, int srcPitchuv, int dstPitch, int h, int w)
++{
++	int i, j;
++	unsigned char const *y, *u, *v;
++	int dstinc, yinc, uinc, vinc;
++
++	y = srcy;
++	u = srcu;
++	v = srcv;
++
++	dstinc = dstPitch - 2*w;
++	yinc = srcPitchy - w;
++	uinc = srcPitchuv - w/2;
++	vinc = srcPitchuv - w/2;
++
++	for (i = 0; i < h; i++) {
++		asm (
++//			".set arch=loongson2f\n\t"
++			".set noreorder\n\t"
++			"move $8, %8 \n\t"
++			"1: \n\t"
++			"beqz $8, 2f \n\t"
++			"xor $f0, $f0, $f0 \n\t"
++			"ldc1 $f4, (%0) \n\t"
++			"punpcklbh $f2, $f4, $f0 \n\t"
++			"punpckhbh $f4, $f4, $f0 \n\t"
++			"ldc1 $f16, 8(%0) \n\t"
++			"punpcklbh $f14, $f16, $f0 \n\t"
++			"punpckhbh $f16, $f16, $f0 \n\t"
++			
++			"lwc1 $f8, (%1) \n\t"
++			"lwc1 $f12, (%2) \n\t"
++			"punpcklbh $f8, $f8, $f12 \n\t"
++			"punpcklbh $f6, $f0, $f8 \n\t"
++			"punpckhbh $f8, $f0, $f8 \n\t"
++			"lwc1 $f18, 4(%1) \n\t"
++			"lwc1 $f12, 4(%2) \n\t"
++			"punpcklbh $f18, $f18, $f12 \n\t"
++			"punpcklbh $f10, $f0, $f18 \n\t"
++			"punpckhbh $f12, $f0, $f18 \n\t"
++
++			"or $f2, $f2, $f6 \n\t"
++			"or $f4, $f4, $f8 \n\t"
++			"or $f14, $f14, $f10 \n\t"
++			"or $f16, $f16, $f12 \n\t"
++
++			"sdc1 $f2, (%3) \n\t"
++			"sdc1 $f4, 8(%3) \n\t"
++			"add %0, 16 \n\t"
++			"add %1, 8 \n\t"
++			"add %2, 8 \n\t"
++			"sdc1 $f14, 0x10(%3) \n\t"
++			"sdc1 $f16, 0x18(%3) \n\t"
++			"add $8, -1 \n\t"
++			"b 1b \n\t"
++			"add %3, 32 \n\t"
++			"2: \n\t"
++			".set reorder\n\t"
++			: "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
++			: "0" (y), "1" (u), "2" (v), "3" (dst), "r" (w>>4)
++			: "memory","$8"
++		);
++
++		asm (
++//			".set arch=loongson2f\n\t"
++			".set noreorder\n\t"
++			"move $8, %8 \n\t"
++			"1: \n\t"
++			"beqz $8, 2f \n\t"
++			"xor $f0, $f0, $f0 \n\t"
++			"ldc1 $f4, (%0) \n\t"
++			"punpcklbh $f2, $f4, $f0 \n\t"
++			"punpckhbh $f4, $f4, $f0 \n\t"
++			
++			"lwc1 $f8, (%1) \n\t"
++			"lwc1 $f12, (%2) \n\t"
++			"punpcklbh $f8, $f8, $f12 \n\t"
++			"punpcklbh $f6, $f0, $f8 \n\t"
++			"punpckhbh $f8, $f0, $f8 \n\t"
++
++			"or $f2, $f2, $f6 \n\t"
++			"or $f4, $f4, $f8 \n\t"
++
++			"sdc1 $f2, (%3) \n\t"
++			"sdc1 $f4, 8(%3) \n\t"
++			"add %0, 8 \n\t"
++			"add %1, 4 \n\t"
++			"add %2, 4 \n\t"
++			"add $8, -1 \n\t"
++			"b 1b \n\t"
++			"add %3, 16 \n\t"
++			"2:\n\t"
++			".set reorder\n\t"
++			: "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
++			: "0" (y), "1" (u), "2" (v), "3" (dst), "r" ((w&0xf)/8)
++			: "memory","$8"
++		);
++
++		for (j = (w&7)/2; j; j--) {
++			*dst++ = *y++;
++			*dst++ = *u++;
++			*dst++ = *y++;
++			*dst++ = *v++;
++		}
++		y += yinc;
++		u = (i%2) ? (u + uinc): (u - w/2);
++		v = (i%2) ? (v + vinc): (v - w/2);
++		dst += dstinc;
++	}
++}
+ 
+ static int
+ SMI_PutImage(
+@@ -1593,7 +1705,7 @@
+ 		offset3 = tmp;
+ 	    }
+ 	    nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
+-	    xf86XVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), 
++	    myXVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), 
+ 				    buf + offset2, buf + offset3, dstStart,
+ 				    srcPitch, srcPitch2, dstPitch, nLines,
+ 				    nPixels);
+@@ -1793,6 +1905,7 @@
+     WRITE_VPR(pSmi, 0x1C, offset >> 3);
+     WRITE_VPR(pSmi, 0x20, (pitch >> 3) | ((pitch >> 3) << 16));
+     WRITE_VPR(pSmi, 0x24, (hstretch & 0xff00) | ((vstretch & 0xff00) >> 8));
++    WRITE_VPR(pSmi, 0x68, ((hstretch & 0xff) << 8) | (vstretch & 0xff));
+     if (pSmi->Chipset == SMI_LYNXEMplus) {	/* This one can store additional precision */
+ 	WRITE_VPR(pSmi, 0x68, ((hstretch & 0xff) << 8) | (vstretch & 0xff));
+     }
diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD
index f7b4aa231..20411a3f0 100644
--- a/extra/xf86-video-siliconmotion/PKGBUILD
+++ b/extra/xf86-video-siliconmotion/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xf86-video-siliconmotion
 pkgver=1.7.7
 pkgrel=4
 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,12 +14,15 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=15')
 conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+	      98_sm712_CRT_enable.diff
         0001-Remove-miInitializeBackingStore.patch)
 sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa'
+            'd24016e40ee07a0cc1bedc1b9d3832c692b8a78453ac5a84bafab6ace4ff5da3'
             '257cc6ccf2ed565daaacaf87cb2f1195b4c2f6bb95fefe5e89766f88393e6647')
 
 build() {
   cd ${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/98_sm712_CRT_enable.diff
   patch -Np1 -i ${srcdir}/0001-Remove-miInitializeBackingStore.patch
   ./configure --prefix=/usr
   make
diff --git a/extra/xf86-video-siliconmotion/medanr04.diff b/extra/xf86-video-siliconmotion/medanr04.diff
new file mode 100644
index 000000000..85a15f393
--- /dev/null
+++ b/extra/xf86-video-siliconmotion/medanr04.diff
@@ -0,0 +1,81 @@
+--- orig/src/smi_video.c	2009-07-27 09:42:44.000000000 +0600
++++ new/src/smi_video.c	2011-04-02 19:21:53.545665717 +0600
+@@ -223,7 +223,7 @@
+ 
+ /**************************************************************************/
+ /* number of (generated) XV_ENCODING vaulues */
+-#define N_ENCODINGS ((N_VIDEO_NORMS) * (N_COMPOSITE_CHANNELS + N_SVIDEO_CHANNELS))
++#define N_ENCODINGS (((N_VIDEO_NORMS) * (N_COMPOSITE_CHANNELS + N_SVIDEO_CHANNELS)) +1)
+ 
+ 
+ /**************************************************************************/
+@@ -288,7 +288,7 @@
+ 	XvPacked,			/* format			*/
+ 	1,				/* num_planes			*/
+ 	15,				/* depth			*/
+-	0x001F, 0x03E0, 0x7C00,		/* red_mask, green, blue	*/
++	0x7C00, 0x03E0, 0x001F,			/* red_mask, green, blue	*/
+ 	0, 0, 0,			/* y_sample_bits, u, v		*/
+ 	0, 0, 0,			/* horz_y_period, u, v		*/
+ 	0, 0, 0,			/* vert_y_period, u, v		*/
+@@ -307,7 +307,7 @@
+ 	XvPacked,			/* format			*/
+ 	1,				/* num_planes			*/
+ 	16,				/* depth			*/
+-	0x001F, 0x07E0, 0xF800,		/* red_mask, green, blue	*/
++	0xF800, 0x07E0, 0x001F,			/* red_mask, green, blue	*/
+ 	0, 0, 0,			/* y_sample_bits, u, v		*/
+ 	0, 0, 0,			/* horz_y_period, u, v		*/
+ 	0, 0, 0,			/* vert_y_period, u, v		*/
+@@ -326,7 +326,7 @@
+ 	XvPacked,			/* format			*/
+ 	1,				/* num_planes			*/
+ 	24,				/* depth			*/
+-	0x0000FF, 0x00FF00, 0xFF0000,	/* red_mask, green, blue	*/
++	0xFF0000, 0x00FF00, 0x0000FF,	/* red_mask, green, blue	*/
+ 	0, 0, 0,			/* y_sample_bits, u, v		*/
+ 	0, 0, 0,			/* horz_y_period, u, v		*/
+ 	0, 0, 0,			/* vert_y_period, u, v		*/
+@@ -345,7 +345,7 @@
+ 	XvPacked,			/* format			*/
+ 	1,				/* num_planes			*/
+ 	24,				/* depth			*/
+-	0x0000FF, 0x00FF00, 0xFF0000,	/* red_mask, green, blue	*/
++	0xFF0000, 0x00FF00, 0x0000FF,	/* red_mask, green, blue	*/
+ 	0, 0, 0,			/* y_sample_bits, u, v		*/
+ 	0, 0, 0,			/* horz_y_period, u, v		*/
+ 	0, 0, 0,			/* vert_y_period, u, v		*/
+@@ -372,7 +372,7 @@
+      XvPacked,			/* format                                       */
+      1,				/* num_planes                           */
+      16,			/* depth                                        */
+-     0x001F, 0x07E0, 0xF800,	/* red_mask, green, blue        */
++     0xF800, 0x07E0, 0x001F,			/* red_mask, green, blue	*/
+      0, 0, 0,			/* y_sample_bits, u, v          */
+      0, 0, 0,			/* horz_y_period, u, v          */
+      0, 0, 0,			/* vert_y_period, u, v          */
+@@ -391,7 +391,7 @@
+      XvPacked,			/* format                                       */
+      1,				/* num_planes                           */
+      24,			/* depth                                        */
+-     0x0000FF, 0x00FF00, 0xFF0000,	/* red_mask, green, blue        */
++     0xFF0000, 0x00FF00, 0x0000FF,	/* red_mask, green, blue	*/
+      0, 0, 0,			/* y_sample_bits, u, v          */
+      0, 0, 0,			/* horz_y_period, u, v          */
+      0, 0, 0,			/* vert_y_period, u, v          */
+@@ -569,6 +569,15 @@
+ 
+     /* fill arrays */
+     p->nenc = 0;
++   	/* force XV_IMAGE at 0 */
++	  p->enc[0].width  = 2048;
++	  p->enc[0].height = 2048;
++	  p->enc[0].rate.numerator   = 1;
++	  p->enc[0].rate.denominator = 1;
++	  p->enc[0].name   = xalloc(strlen("XV_IMAGE")+1);
++	  sprintf(p->enc[0].name, "% s", "XV_IMAGE");
++
++	  p->nenc = 1;
+     for (ch = 0; ch < N_COMPOSITE_CHANNELS; ch++) {
+ 	for (n = 0; n < N_VIDEO_NORMS; n++) {
+ 	    SMI_AddEncoding(p->enc, p->nenc, n, VID_COMPOSITE, ch);
diff --git a/extra/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5-loongson-video-accl.patch b/extra/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5-loongson-video-accl.patch
new file mode 100644
index 000000000..e31044473
--- /dev/null
+++ b/extra/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5-loongson-video-accl.patch
@@ -0,0 +1,139 @@
+diff --git a/src/smi_video.c b/src/smi_video.c
+index c2e8868..3e128fa 100644
+--- a/src/smi_video.c
++++ b/src/smi_video.c
+@@ -276,6 +276,7 @@ static XF86ImageRec SMI_VideoImages[] =
+     XVIMAGE_YUY2,
+     XVIMAGE_YV12,
+     XVIMAGE_I420,
++    XVIMAGE_UYVY,
+     {
+ 	FOURCC_RV15,			/* id				*/
+ 	XvRGB,				/* type				*/
+@@ -1464,6 +1465,117 @@ SMI_QueryBestSize(
+     LEAVE();
+ }
+ 
++static void myXVCopyYUV12ToPacked(const unsigned char *srcy, const unsigned char *srcv, const unsigned char *srcu,
++		unsigned char *dst, int srcPitchy, int srcPitchuv, int dstPitch, int h, int w)
++{
++	int i, j;
++	unsigned char const *y, *u, *v;
++	int dstinc, yinc, uinc, vinc;
++
++	y = srcy;
++	u = srcu;
++	v = srcv;
++
++	dstinc = dstPitch - 2*w;
++	yinc = srcPitchy - w;
++	uinc = srcPitchuv - w/2;
++	vinc = srcPitchuv - w/2;
++
++	for (i = 0; i < h; i++) {
++		asm (
++//			".set arch=loongson2f\n\t"
++			".set noreorder\n\t"
++			"move $8, %8 \n\t"
++			"1: \n\t"
++			"beqz $8, 2f \n\t"
++			"xor $f0, $f0, $f0 \n\t"
++			"ldc1 $f4, (%0) \n\t"
++			"punpcklbh $f2, $f4, $f0 \n\t"
++			"punpckhbh $f4, $f4, $f0 \n\t"
++			"ldc1 $f16, 8(%0) \n\t"
++			"punpcklbh $f14, $f16, $f0 \n\t"
++			"punpckhbh $f16, $f16, $f0 \n\t"
++
++			"lwc1 $f8, (%1) \n\t"
++			"lwc1 $f12, (%2) \n\t"
++			"punpcklbh $f8, $f8, $f12 \n\t"
++			"punpcklbh $f6, $f0, $f8 \n\t"
++			"punpckhbh $f8, $f0, $f8 \n\t"
++			"lwc1 $f18, 4(%1) \n\t"
++			"lwc1 $f12, 4(%2) \n\t"
++			"punpcklbh $f18, $f18, $f12 \n\t"
++			"punpcklbh $f10, $f0, $f18 \n\t"
++			"punpckhbh $f12, $f0, $f18 \n\t"
++
++			"or $f2, $f2, $f6 \n\t"
++			"or $f4, $f4, $f8 \n\t"
++			"or $f14, $f14, $f10 \n\t"
++			"or $f16, $f16, $f12 \n\t"
++
++			"sdc1 $f2, (%3) \n\t"
++			"sdc1 $f4, 8(%3) \n\t"
++			"add %0, 16 \n\t"
++			"add %1, 8 \n\t"
++			"add %2, 8 \n\t"
++			"sdc1 $f14, 0x10(%3) \n\t"
++			"sdc1 $f16, 0x18(%3) \n\t"
++			"add $8, -1 \n\t"
++			"b 1b \n\t"
++			"add %3, 32 \n\t"
++			"2: \n\t"
++			".set reorder\n\t"
++			: "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
++			: "0" (y), "1" (u), "2" (v), "3" (dst), "r" (w>>4)
++			: "memory","$8"
++		);
++
++		asm (
++//			".set arch=loongson2f\n\t"
++			".set noreorder\n\t"
++			"move $8, %8 \n\t"
++			"1: \n\t"
++			"beqz $8, 2f \n\t"
++			"xor $f0, $f0, $f0 \n\t"
++			"ldc1 $f4, (%0) \n\t"
++			"punpcklbh $f2, $f4, $f0 \n\t"
++			"punpckhbh $f4, $f4, $f0 \n\t"
++
++			"lwc1 $f8, (%1) \n\t"
++			"lwc1 $f12, (%2) \n\t"
++			"punpcklbh $f8, $f8, $f12 \n\t"
++			"punpcklbh $f6, $f0, $f8 \n\t"
++			"punpckhbh $f8, $f0, $f8 \n\t"
++
++			"or $f2, $f2, $f6 \n\t"
++			"or $f4, $f4, $f8 \n\t"
++
++			"sdc1 $f2, (%3) \n\t"
++			"sdc1 $f4, 8(%3) \n\t"
++			"add %0, 8 \n\t"
++			"add %1, 4 \n\t"
++			"add %2, 4 \n\t"
++			"add $8, -1 \n\t"
++			"b 1b \n\t"
++			"add %3, 16 \n\t"
++			"2:\n\t"
++			".set reorder\n\t"
++			: "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
++			: "0" (y), "1" (u), "2" (v), "3" (dst), "r" ((w&0xf)/8)
++			: "memory","$8"
++		);
++
++		for (j = (w&7)/2; j; j--) {
++			*dst++ = *y++;
++			*dst++ = *u++;
++			*dst++ = *y++;
++			*dst++ = *v++;
++		}
++		y += yinc;
++		u = (i%2) ? (u + uinc): (u - w/2);
++		v = (i%2) ? (v + vinc): (v - w/2);
++		dst += dstinc;
++	}
++}
+ 
+ static int
+ SMI_PutImage(
+@@ -1592,7 +1704,7 @@ SMI_PutImage(
+ 		offset3 = tmp;
+ 	    }
+ 	    nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
+-	    xf86XVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), 
++	    myXVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1),
+ 				    buf + offset2, buf + offset3, dstStart,
+ 				    srcPitch, srcPitch2, dstPitch, nLines,
+ 				    nPixels);
diff --git a/extra/xf86-video-siliconmotion/xserver-xorg-video-siliconmotion-2.2.8-medan.r04.patch b/extra/xf86-video-siliconmotion/xserver-xorg-video-siliconmotion-2.2.8-medan.r04.patch
new file mode 100644
index 000000000..acb9716be
--- /dev/null
+++ b/extra/xf86-video-siliconmotion/xserver-xorg-video-siliconmotion-2.2.8-medan.r04.patch
@@ -0,0 +1,104 @@
+diff -Naur xserver-xorg-video-siliconmotion-2.2.8/debian/changelog xserver-xorg-video-siliconmotion-2.2.8-new/debian/changelog
+--- xserver-xorg-video-siliconmotion-2.2.8/debian/changelog	2009-02-22 02:19:30.000000000 +0800
++++ xserver-xorg-video-siliconmotion-2.2.8-new/debian/changelog	2009-02-21 07:36:10.000000000 +0800
+@@ -1,3 +1,18 @@
++xserver-xorg-video-siliconmotion (2:2.2.8-medan.r04) unstable; urgency=low
++
++  * Fixed Xv not reporting any imaging modes. Caused all SDL overlays to
++    be software scaled and drawn in xshm.
++
++ -- Derrick Sobodash <derrick@cinnamonpirate.com>  Sat, 21 Feb 2009 06:49:11 +0000
++
++xserver-xorg-video-siliconmotion (2:2.2.8-medan.r03) unstable; urgency=low
++
++  * Hacked Xv to fix driver reporting RGB colorspaces as BGR.
++  * Forked from 2:2.2.8-lemote.r02. Next revision writes Loongson opcodes,
++    which GCC is not supporting. How do you compile it!?
++
++ -- Derrick Sobodash <derrick@cinnamonpirate.com>  Sat, 14 Feb 2009 06:49:11 +0000
++
+ xserver-xorg-video-siliconmotion (2:2.2.8-lemote.r02) unstable; urgency=low
+ 
+   * Add fast Xv packed ouput for YeeLoong notebook without lost of quality.
+diff -Naur xserver-xorg-video-siliconmotion-2.2.8/src/smi_video.c xserver-xorg-video-siliconmotion-2.2.8-new/src/smi_video.c
+--- xserver-xorg-video-siliconmotion-2.2.8/src/smi_video.c	2009-02-22 02:19:30.000000000 +0800
++++ xserver-xorg-video-siliconmotion-2.2.8-new/src/smi_video.c	2009-02-22 02:23:55.000000000 +0800
+@@ -245,7 +245,7 @@
+ 
+ /**************************************************************************/
+ /* number of (generated) XV_ENCODING vaulues */
+-#define N_ENCODINGS ((N_VIDEO_NORMS) * (N_COMPOSITE_CHANNELS + N_SVIDEO_CHANNELS))
++#define N_ENCODINGS (((N_VIDEO_NORMS) * (N_COMPOSITE_CHANNELS + N_SVIDEO_CHANNELS)) +1)
+ 
+ 
+ /**************************************************************************/
+@@ -310,7 +310,7 @@
+ 		XvPacked,						/* format					*/
+ 		1,								/* num_planes				*/
+ 		15,								/* depth					*/
+-		0x001F, 0x03E0, 0x7C00,			/* red_mask, green, blue	*/
++		0x7C00, 0x03E0, 0x001F,			/* red_mask, green, blue	*/
+ 		0, 0, 0,						/* y_sample_bits, u, v		*/
+ 		0, 0, 0,						/* horz_y_period, u, v		*/
+ 		0, 0, 0,						/* vert_y_period, u, v		*/
+@@ -329,7 +329,7 @@
+ 		XvPacked,						/* format					*/
+ 		1,								/* num_planes				*/
+ 		16,								/* depth					*/
+-		0x001F, 0x07E0, 0xF800,			/* red_mask, green, blue	*/
++		0xF800, 0x07E0, 0x001F,			/* red_mask, green, blue	*/
+ 		0, 0, 0,						/* y_sample_bits, u, v		*/
+ 		0, 0, 0,						/* horz_y_period, u, v		*/
+ 		0, 0, 0,						/* vert_y_period, u, v		*/
+@@ -348,7 +348,7 @@
+ 		XvPacked,						/* format					*/
+ 		1,								/* num_planes				*/
+ 		24,								/* depth					*/
+-		0x0000FF, 0x00FF00, 0xFF0000,	/* red_mask, green, blue	*/
++		0xFF0000, 0x00FF00, 0x0000FF,	/* red_mask, green, blue	*/
+ 		0, 0, 0,						/* y_sample_bits, u, v		*/
+ 		0, 0, 0,						/* horz_y_period, u, v		*/
+ 		0, 0, 0,						/* vert_y_period, u, v		*/
+@@ -367,7 +367,7 @@
+ 		XvPacked,						/* format					*/
+ 		1,								/* num_planes				*/
+ 		24,								/* depth					*/
+-		0x0000FF, 0x00FF00, 0xFF0000,	/* red_mask, green, blue	*/
++		0xFF0000, 0x00FF00, 0x0000FF,	/* red_mask, green, blue	*/
+ 		0, 0, 0,						/* y_sample_bits, u, v		*/
+ 		0, 0, 0,						/* horz_y_period, u, v		*/
+ 		0, 0, 0,						/* vert_y_period, u, v		*/
+@@ -394,7 +394,7 @@
+ 		XvPacked,						/* format					*/
+ 		1,								/* num_planes				*/
+ 		16,								/* depth					*/
+-		0x001F, 0x07E0, 0xF800,			/* red_mask, green, blue	*/
++		0xF800, 0x07E0, 0x001F,			/* red_mask, green, blue	*/
+ 		0, 0, 0,						/* y_sample_bits, u, v		*/
+ 		0, 0, 0,						/* horz_y_period, u, v		*/
+ 		0, 0, 0,						/* vert_y_period, u, v		*/
+@@ -413,7 +413,7 @@
+ 		XvPacked,						/* format					*/
+ 		1,								/* num_planes				*/
+ 		24,								/* depth					*/
+-		0x0000FF, 0x00FF00, 0xFF0000,	/* red_mask, green, blue	*/
++		0xFF0000, 0x00FF00, 0x0000FF,	/* red_mask, green, blue	*/
+ 		0, 0, 0,						/* y_sample_bits, u, v		*/
+ 		0, 0, 0,						/* horz_y_period, u, v		*/
+ 		0, 0, 0,						/* vert_y_period, u, v		*/
+@@ -589,6 +589,15 @@
+ 
+ 	/* fill arrays */
+ 	p->nenc = 0;
++	/* force XV_IMAGE at 0 */
++	p->enc[0].width  = 2048;
++	p->enc[0].height = 2048;
++	p->enc[0].rate.numerator   = 1;
++	p->enc[0].rate.denominator = 1;
++	p->enc[0].name   = xalloc(strlen("XV_IMAGE")+1);
++	sprintf(p->enc[0].name, "% s", "XV_IMAGE");
++
++	p->nenc = 1;
+ 	for (ch = 0; ch < N_COMPOSITE_CHANNELS; ch++) {
+ 		for (n = 0; n < N_VIDEO_NORMS; n++) {
+ 			SMI_AddEncoding(p->enc, p->nenc, n, VID_COMPOSITE, ch);
diff --git a/extra/xf86-video-siliconmotion/xserver-xorg-video-siliconmotion_1.7.5-1loongson2.diff b/extra/xf86-video-siliconmotion/xserver-xorg-video-siliconmotion_1.7.5-1loongson2.diff
new file mode 100644
index 000000000..8b9f49395
--- /dev/null
+++ b/extra/xf86-video-siliconmotion/xserver-xorg-video-siliconmotion_1.7.5-1loongson2.diff
@@ -0,0 +1,707 @@
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/autogen.sh
++++ xserver-xorg-video-siliconmotion-1.7.5/autogen.sh
+@@ -0,0 +1,12 @@
++#! /bin/sh
++
++srcdir=`dirname $0`
++test -z "$srcdir" && srcdir=.
++
++ORIGDIR=`pwd`
++cd $srcdir
++
++autoreconf -v --install || exit 1
++cd $ORIGDIR || exit $?
++
++$srcdir/configure --enable-maintainer-mode "$@"
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/README.source
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/README.source
+@@ -0,0 +1,49 @@
++------------------------------------------------------
++Quick Guide To Patching This Package For The Impatient
++------------------------------------------------------
++
++1. Make sure you have quilt installed
++2. Unpack the package as usual with "dpkg-source -x"
++3. Run the "patch" target in debian/rules
++4. Create a new patch with "quilt new" (see quilt(1))
++5. Edit all the files you want to include in the patch with "quilt edit" 
++   (see quilt(1)).
++6. Write the patch with "quilt refresh" (see quilt(1))
++7. Run the "clean" target in debian/rules
++
++Alternatively, instead of using quilt directly, you can drop the patch in to 
++debian/patches and add the name of the patch to debian/patches/series.
++
++------------------------------------
++Guide To The X Strike Force Packages
++------------------------------------
++
++The X Strike Force team maintains X packages in git repositories on
++git.debian.org in the pkg-xorg subdirectory. Most upstream packages
++are actually maintained in git repositories as well, so they often
++just need to be pulled into git.debian.org in a "upstream-*" branch.
++Otherwise, the upstream sources are manually installed in the Debian
++git repository.
++
++The .orig.tar.gz upstream source file could be generated using this
++"upstream-*" branch in the Debian git repository but it is actually
++copied from upstream tarballs directly.
++
++Due to X.org being highly modular, packaging all X.org applications
++as their own independent packages would have created too many Debian
++packages. For this reason, some X.org applications have been grouped
++into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
++x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
++Most packages, including the X.org server itself and all libraries
++and drivers are, however maintained independently.
++
++The Debian packaging is added by creating the "debian-*" git branch
++which contains the aforementioned "upstream-*" branch plus the debian/
++repository files.
++When a patch has to be applied to the Debian package, two solutions
++are involved:
++* If the patch is available in one of the upstream branches, it
++  may be git'cherry-picked into the Debian repository. In this
++  case, it appears directly in the .diff.gz.
++* Otherwise, the patch is added to debian/patches/ which is managed
++  with quilt as documented in /usr/share/doc/quilt/README.source.
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/changelog
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/changelog
+@@ -0,0 +1,287 @@
++xserver-xorg-video-siliconmotion (1:1.7.5-1loongson2) unstable; urgency=low
++
++  * Non-maintainer upload.
++  * enable CRT output, 
++  * loongson2f
++
++ -- liu shiwei <liushiwei@gmail.com>  Sun, 15 May 2011 21:35:08 +0800
++
++xserver-xorg-video-siliconmotion (1:1.7.5-1) unstable; urgency=low
++
++  * New upstream release.
++  * Bump xutils-dev build-dep for new macros.
++  * Update debian/copyright from upstream COPYING.
++
++ -- Cyril Brulebois <kibi@debian.org>  Wed, 09 Mar 2011 00:31:34 +0100
++
++xserver-xorg-video-siliconmotion (1:1.7.4-3) unstable; urgency=low
++
++  * Switch to dh:
++    - Use debhelper 8.
++    - Use dh-autoreconf.
++    - Bump xserver-xorg-dev build-dep for dh_xsf_substvars and xsf
++      debhelper sequence.
++  * Remove xsfbs accordingly.
++  * Update Uploaders list. Thanks, David & Brice!
++  * Remove long obsolete Replaces/Conflicts.
++  * Wrap Depends/Provides.
++  * Bump Standards-Version to 3.9.1 (no changes needed).
++
++ -- Cyril Brulebois <kibi@debian.org>  Sat, 05 Feb 2011 14:55:28 +0100
++
++xserver-xorg-video-siliconmotion (1:1.7.4-2) experimental; urgency=low
++
++  [ Julien Cristau ]
++  * Drop 01_siliconmotion_rotate_option_disables_randr.diff, it was disabled
++    since 1.7.0 and most likely obsoleted by randr 1.2 support in that
++    release.
++
++  [ Cyril Brulebois ]
++  * Build against Xserver 1.9.1 rc1.
++
++ -- Cyril Brulebois <kibi@debian.org>  Sat, 16 Oct 2010 21:03:39 +0200
++
++xserver-xorg-video-siliconmotion (1:1.7.4-1) experimental; urgency=low
++
++  [ Christopher James Halse Rogers ]
++  * New upstream release
++    - Fixes FTBFS against Xserver 1.8
++
++ -- Julien Cristau <jcristau@debian.org>  Thu, 10 Jun 2010 11:32:50 +0200
++
++xserver-xorg-video-siliconmotion (1:1.7.3-2) unstable; urgency=low
++
++  [ Julien Cristau ]
++  * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
++    good reason.  Thanks, Colin Watson!
++  * Remove myself from Uploaders
++
++  [ Cyril Brulebois ]
++  * Update to new xsfbs, replace deprecated ${xserver:Depends} with
++    ${xviddriver:Depends} in Depends, and bump B-D on xserver-xorg-dev
++    accordingly.
++  * Add myself to Uploaders.
++  * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
++
++ -- Cyril Brulebois <kibi@debian.org>  Tue, 04 May 2010 00:19:15 +0200
++
++xserver-xorg-video-siliconmotion (1:1.7.3-1) experimental; urgency=low
++
++  [ Timo Aaltonen ]
++  * New upstream release.
++  * Bump Standards-Version to 3.8.3.
++  * Build against Xserver 1.7.
++
++  [ Cyril Brulebois ]
++  * Upload to experimental.
++
++ -- Cyril Brulebois <kibi@debian.org>  Sun, 06 Dec 2009 01:50:22 +0100
++
++xserver-xorg-video-siliconmotion (1:1.7.2-1) unstable; urgency=low
++
++  * New upstream release.
++  * Bump Standards-Version to 3.8.2.
++  * Remove 01_gen_pci_ids.diff. The X server now uses an internal table to
++    choose a driver during autoconfiguration.
++
++ -- Brice Goglin <bgoglin@debian.org>  Mon, 20 Jul 2009 00:13:38 +0200
++
++xserver-xorg-video-siliconmotion (1:1.7.1-1) unstable; urgency=low
++
++  * New upstream release.
++
++ -- Brice Goglin <bgoglin@debian.org>  Wed, 29 Apr 2009 18:33:55 +0200
++
++xserver-xorg-video-siliconmotion (1:1.7.0-2) unstable; urgency=low
++
++  * Upload to unstable.
++
++ -- Julien Cristau <jcristau@debian.org>  Thu, 09 Apr 2009 11:38:48 +0100
++
++xserver-xorg-video-siliconmotion (1:1.7.0-1) experimental; urgency=low
++
++  * New upstream release.
++    + Add support for EXA, RandR 1.2 and some smi 50x chipsets.
++    + Disable 01_siliconmotion_rotate_option_disables_randr.diff.
++  * Build against xserver 1.6 rc1.
++  * Allow parallel builds.
++  * Run autoreconf on build; add build-deps on automake, libtool and
++    xutils-dev.
++  * Add myself to Uploaders.
++
++ -- Brice Goglin <bgoglin@debian.org>  Sun, 01 Feb 2009 16:15:46 +0100
++
++xserver-xorg-video-siliconmotion (1:1.6.0-2) experimental; urgency=low
++
++  * Build against xserver 1.5.
++
++ -- Julien Cristau <jcristau@debian.org>  Mon, 08 Sep 2008 19:37:00 +0100
++
++xserver-xorg-video-siliconmotion (1:1.6.0-1) unstable; urgency=low
++
++  [ Brice Goglin ]
++  * Add upstream URL to debian/copyright.
++
++  [ Julien Cristau ]
++  * New upstream release.
++  * Refresh patches.
++  * Remove Branden from Uploaders with his permission, and add myself.
++  * Bump Standards-Version to 3.7.3.
++  * Drop the XS- prefix from Vcs-* control fields.
++  * Run dpkg-shlibdeps with --warnings=6.  Drivers reference symbols from
++    /usr/bin/Xorg and other modules, and that's not a bug, so we want
++    dpkg-shlibdeps to shut up about symbols it can't find.  Build-depend on
++    dpkg-dev >= 1.14.17.
++
++ -- Julien Cristau <jcristau@debian.org>  Fri, 06 Jun 2008 12:19:48 +0200
++
++xserver-xorg-video-siliconmotion (1:1.5.1-3) unstable; urgency=low
++
++  * Upload to unstable
++
++ -- David Nusinow <dnusinow@debian.org>  Sun, 16 Sep 2007 15:43:48 -0400
++
++xserver-xorg-video-siliconmotion (1:1.5.1-2) experimental; urgency=low
++
++  * Build against xserver 1.4 and build-dep on it
++  * Add 02_gen_pci_ids.diff. This patch provides a set of pci id's supported
++    by this driver so that it can be automatically loaded by the server.
++
++ -- David Nusinow <dnusinow@debian.org>  Thu, 13 Sep 2007 20:20:40 -0400
++
++xserver-xorg-video-siliconmotion (1:1.5.1-1) unstable; urgency=low
++
++  [ Julien Cristau ]
++  * Add link to xserver-xorg-core bug script, so that bugreports contain
++    the user's config and log files.
++  * Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
++    versions don't have the bug script.
++
++  [ Timo Aaltonen ]
++  * Replaces/Conflicts: xserver-xorg-driver-siliconmotion.
++
++  [ Brice Goglin ]
++  * New upstream version
++    + Pull more upstream fixes up-to 1a803a8f91a931c00106f9d3d41cfa5d74c19f55
++    + Refresh 01_siliconmotion_rotate_option_disables_randr.diff
++  * Install the upstream changelog.
++  * Bump Build-Depends: xserver-xorg-dev to >= 2:1.2.99.902
++    (needed to let xsfbs get access to serverminver).
++  * Add XS-Vcs-*.
++  * Add a link to www.X.org and a reference to the xf86-video-siliconmotion
++    module in the long description.
++  * Remove Fabio from uploaders with his permission. He's always welcome back.
++
++ -- Julien Cristau <jcristau@debian.org>  Wed, 02 May 2007 15:08:45 +0200
++
++xserver-xorg-video-siliconmotion (1:1.4.2-1) experimental; urgency=low
++
++  * New upstream version
++  * Generate server dependencies automatically from the ABI
++
++ -- David Nusinow <dnusinow@debian.org>  Wed, 21 Feb 2007 22:54:34 -0500
++
++xserver-xorg-video-siliconmotion (1:1.4.1-4) unstable; urgency=low
++
++  * Add quilt to build-depends. Thanks lamont. closes: #388641
++  * Bump standards version to 3.7.2.0. No changes needed.
++
++ -- David Nusinow <dnusinow@debian.org>  Thu, 21 Sep 2006 22:20:51 -0400
++
++xserver-xorg-video-siliconmotion (1:1.4.1-3) unstable; urgency=low
++
++  [ Steve Langasek ]
++  * Upload to unstable
++
++ -- David Nusinow <dnusinow@debian.org>  Mon, 18 Sep 2006 19:57:51 -0400
++
++xserver-xorg-video-siliconmotion (1:1.4.1-2) experimental; urgency=low
++
++  [ Drew Parsons ]
++  *  Provides: xserver-xorg-video-1.0 not xserver-xorg-video.
++
++  [ David Nusinow ]
++  * Bump xserver (build-)depends epochs to 2: to deal with botched
++    server upload
++
++ -- David Nusinow <dnusinow@debian.org>  Tue, 22 Aug 2006 23:46:40 +0000
++
++xserver-xorg-video-siliconmotion (1:1.4.1-1) experimental; urgency=low
++
++  [ Andres Salomon ]
++  * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
++    idempotency fix.
++  * Run dh_install w/ --list-missing.
++
++  [ David Nusinow ]
++  * New upstream release
++  * Add dependency on xserver-xorg-core to >= 1:1.1.1. Bump version for
++    the build-dep on xserver-xorg-dev.
++  * Bump debhelper compat to 5
++
++ -- David Nusinow <dnusinow@debian.org>  Tue, 15 Aug 2006 23:45:05 +0000
++
++xserver-xorg-video-siliconmotion (1:1.3.1.5-3) unstable; urgency=low
++
++  * Upload to modular
++
++ -- David Nusinow <dnusinow@debian.org>  Sun, 26 Mar 2006 20:25:54 -0500
++
++xserver-xorg-video-siliconmotion (1:1.3.1.5-2) experimental; urgency=low
++
++  * Port patches from trunk:
++    + general/083_siliconmotion_rotate_option_disables_randr.diff
++
++ -- David Nusinow <dnusinow@debian.org>  Sun, 26 Feb 2006 17:53:12 -0500
++
++xserver-xorg-video-siliconmotion (1:1.3.1.5-1) experimental; urgency=low
++
++  * First upload to Debian
++  * Change source package, package, and provides names to denote the
++    type of driver and that they are for xserver-xorg
++
++ -- David Nusinow <dnusinow@debian.org>  Fri, 13 Jan 2006 00:40:05 -0500
++
++xserver-xorg-driver-siliconmotion (1:1.3.1.5-0ubuntu1) dapper; urgency=low
++
++  * New upstream release.
++  * Add provides on xserver-xorg-driver.
++
++ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  4 Jan 2006 20:02:33 +1100
++
++xserver-xorg-driver-siliconmotion (1:1.3.1.4-0ubuntu1) dapper; urgency=low
++
++  * New upstream release.
++
++ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 19 Dec 2005 09:11:22 +1100
++
++xserver-xorg-driver-siliconmotion (1:1.3.1.3-0ubuntu1) dapper; urgency=low
++
++  * New upstream release.
++
++ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon, 12 Dec 2005 13:07:11 +1100
++
++xserver-xorg-driver-siliconmotion (1:1.3.1.2-0ubuntu2) dapper; urgency=low
++
++  * Add missing Build-Depends (x11proto-core-dev, x11proto-fonts-dev,
++    x11proto-randr-dev, x11proto-render-dev).
++
++ -- Daniel Stone <daniel.stone@ubuntu.com>  Mon,  5 Dec 2005 12:57:32 +1100
++
++xserver-xorg-driver-siliconmotion (1:1.3.1.2-0ubuntu1) dapper; urgency=low
++
++  * New upstream release.
++
++ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 22 Nov 2005 13:36:09 +1100
++
++xserver-xorg-driver-siliconmotion (1:1.3.1.1-1) dapper; urgency=low
++
++  * New upstream release.
++
++ -- Daniel Stone <daniel.stone@ubuntu.com>  Tue, 25 Oct 2005 17:10:12 +1000
++
++xserver-xorg-driver-siliconmotion (1:1.3.1-1) breezy; urgency=low
++
++  * First xserver-xorg-driver-siliconmotion release.
++
++ -- Daniel Stone <daniel.stone@ubuntu.com>  Wed,  6 Jul 2005 15:48:17 +1000
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/xserver-xorg-video-siliconmotion.install
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/xserver-xorg-video-siliconmotion.install
+@@ -0,0 +1,2 @@
++usr/lib/xorg/modules/drivers/*.so
++usr/share/man/man4/*
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/copyright
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/copyright
+@@ -0,0 +1,75 @@
++This package was downloaded from
++http://xorg.freedesktop.org/releases/individual/driver/
++
++Copyright (C) 1994-2000 The XFree86 Project, Inc.  All Rights Reserved.
++Copyright (C) 2000,2008 Silicon Motion, Inc.  All Rights Reserved.
++Copyright (C) 2001 Corvin Zahn.  All Rights Reserved.
++Copyright (C) 2008 Francisco Jerez. All Rights Reserved.
++Copyright (C) 2008 Mandriva Linux.  All Rights Reserved.
++
++Permission is hereby granted, free of charge, to any person obtaining a copy of
++this software and associated documentation files (the "Software"), to deal in
++the Software without restriction, including without limitation the rights to
++use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
++of the Software, and to permit persons to whom the Software is furnished to do
++so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all
++copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
++NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the names of The XFree86 Project and
++Silicon Motion shall not be used in advertising or otherwise to promote the
++sale, use or other dealings in this Software without prior written
++authorization from The XFree86 Project or Silicon Motion.
++
++******************************************************************************
++
++Copyright 2007 George Sapountzis
++
++Permission is hereby granted, free of charge, to any person obtaining a
++copy of this software and associated documentation files (the "Software"),
++to deal in the Software without restriction, including without limitation
++the rights to use, copy, modify, merge, publish, distribute, sublicense,
++and/or sell copies of the Software, and to permit persons to whom the
++Software is furnished to do so, subject to the following conditions:
++
++The above copyright notice and this permission notice (including the next
++paragraph) shall be included in all copies or substantial portions of the
++Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
++THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++SOFTWARE.
++
++******************************************************************************
++
++Copyright (C) 2006 Dennis De Winter  All Rights Reserved.
++Copyright (C) 2007 Alex Deucher  All Rights Reserved.
++
++Permission is hereby granted, free of charge, to any person obtaining a copy of
++this software and associated documentation files (the "Software"), to deal in
++the Software without restriction, including without limitation the rights to
++use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
++of the Software, and to permit persons to whom the Software is furnished to do
++so, subject to the following conditions:
++
++The above copyright notice and this permission notice shall be included in all
++copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
++NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/watch
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/watch
+@@ -0,0 +1,3 @@
++#git=git://anongit.freedesktop.org/xorg/driver/xf86-video-siliconmotion
++version=3
++http://xorg.freedesktop.org/releases/individual/driver/ xf86-video-siliconmotion-(.*)\.tar\.gz
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/gbp.conf
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/gbp.conf
+@@ -0,0 +1,4 @@
++[DEFAULT]
++upstream-branch=upstream-experimental
++debian-branch=debian-experimental
++pristine-tar = True
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/rules
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/rules
+@@ -0,0 +1,17 @@
++#!/usr/bin/make -f
++
++# Install in debian/tmp to retain control through dh_install:
++override_dh_auto_install:
++	dh_auto_install --destdir=debian/tmp
++
++# Kill *.la files, and forget no-one:
++override_dh_install:
++	find debian/tmp -name '*.la' -delete
++	dh_install --fail-missing
++
++# That's a plugin, use appropriate warning level:
++override_dh_shlibdeps:
++	dh_shlibdeps -- --warnings=6
++
++%:
++	dh $@ --with quilt,autoreconf,xsf --builddirectory=build/
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/control
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/control
+@@ -0,0 +1,38 @@
++Source: xserver-xorg-video-siliconmotion
++Section: x11
++Priority: optional
++Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
++Uploaders: Cyril Brulebois <kibi@debian.org>
++Build-Depends:
++ debhelper (>= 8),
++ dh-autoreconf,
++ pkg-config,
++ xserver-xorg-dev (>= 2:1.9.4),
++ x11proto-video-dev,
++ x11proto-xext-dev,
++ x11proto-core-dev,
++ x11proto-fonts-dev,
++ x11proto-randr-dev (>= 1.2),
++ x11proto-render-dev,
++ quilt,
++ xutils-dev (>= 1:7.5+4),
++Standards-Version: 3.9.1
++Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-video-siliconmotion
++Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-video-siliconmotion.git
++
++Package: xserver-xorg-video-siliconmotion
++Architecture: any
++Depends:
++ ${shlibs:Depends},
++ ${misc:Depends},
++ ${xviddriver:Depends},
++Provides:
++ ${xviddriver:Provides}
++Description: X.Org X server -- SiliconMotion display driver
++ This package provides the driver for the SiliconMotion Lynx and Cougar family
++ of chipsets, commonly found in laptops.
++ .
++ More information about X.Org can be found at:
++ <URL:http://www.X.org>
++ .
++ This package is built from the X.org xf86-video-siliconmotion driver module.
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/xserver-xorg-video-siliconmotion.links
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/xserver-xorg-video-siliconmotion.links
+@@ -0,0 +1 @@
++usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-video-siliconmotion/script
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/compat
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/compat
+@@ -0,0 +1 @@
++8
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/patches/98_sm712_CRT_enable.diff
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/patches/98_sm712_CRT_enable.diff
+@@ -0,0 +1,14 @@
++--- ../xx/xserver-xorg-video-siliconmotion-1.7.3/src/smi_driver.c	2010-03-09 23:39:23.451798382 +0800
+++++ xserver-xorg-video-siliconmotion-1.7.3/src/smi_driver.c	2010-03-10 10:36:58.835798871 +0800
++@@ -1805,6 +1797,11 @@
++     pScreen->SaveScreen = SMI_SaveScreen;
++     pSmi->CloseScreen = pScreen->CloseScreen;
++     pScreen->CloseScreen = SMI_CloseScreen;
+++        /* Added by Belcon to enable LCD Panel Control Select */
+++        if (pSmi->Chipset == SMI_LYNXEMplus)
+++        {
+++                VGAOUT8_INDEX (pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x22, 2);
+++        }
++ 
++     if ((IS_MSOC(pSmi) &&
++ 	 !xf86DPMSInit(pScreen, SMI501_DisplayPowerManagementSet, 0)) ||
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/patches/series
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/patches/series
+@@ -0,0 +1,2 @@
++98_sm712_CRT_enable.diff
++99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff
+--- xserver-xorg-video-siliconmotion-1.7.5.orig/debian/patches/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff
++++ xserver-xorg-video-siliconmotion-1.7.5/debian/patches/99_xf86-video-siliconmotion-1.7.3-fix-loongson.diff
+@@ -0,0 +1,160 @@
++rixed@happyleptic.org
++ 发送至 loongson-dev
++	
++A patch for siliconmotion 1.7.3 is available in the bug trackers
++at freedesktop.org, but a better one will be available monday.
++Still, it lacks the most interresting part : the MMX pack function,
++which should not be implemented there but probably either directly
++in Xv or in pixman (and make Xv use pixman).
++
++So for now the simpliest is to fix these manually.
++For the impatient I attach a patch against SM 1.7.3
++With it, 16bpp and AccelMethod = "XAA" works quite well.
++
++Just an ugly hack really.
++diff -ur orig/src/smi_video.c mod/src/smi_video.c
++--- orig/src/smi_video.c	2010-02-05 13:11:18.000000000 +0100
+++++ mod/src/smi_video.c	2010-02-05 13:20:36.000000000 +0100
++@@ -276,6 +276,7 @@
++     XVIMAGE_YUY2,
++     XVIMAGE_YV12,
++     XVIMAGE_I420,
+++    XVIMAGE_UYVY,
++     {
++ 	FOURCC_RV15,			/* id				*/
++ 	XvRGB,				/* type				*/
++@@ -1462,6 +1463,117 @@
++     LEAVE();
++ }
++ 
+++static void myXVCopyYUV12ToPacked(const unsigned char *srcy, const unsigned char *srcv, const unsigned char *srcu,
+++		unsigned char *dst, int srcPitchy, int srcPitchuv, int dstPitch, int h, int w)
+++{
+++	int i, j;
+++	unsigned char const *y, *u, *v;
+++	int dstinc, yinc, uinc, vinc;
+++
+++	y = srcy;
+++	u = srcu;
+++	v = srcv;
+++
+++	dstinc = dstPitch - 2*w;
+++	yinc = srcPitchy - w;
+++	uinc = srcPitchuv - w/2;
+++	vinc = srcPitchuv - w/2;
+++
+++	for (i = 0; i < h; i++) {
+++		asm (
+++//			".set arch=loongson2f\n\t"
+++			".set noreorder\n\t"
+++			"move $8, %8 \n\t"
+++			"1: \n\t"
+++			"beqz $8, 2f \n\t"
+++			"xor $f0, $f0, $f0 \n\t"
+++			"ldc1 $f4, (%0) \n\t"
+++			"punpcklbh $f2, $f4, $f0 \n\t"
+++			"punpckhbh $f4, $f4, $f0 \n\t"
+++			"ldc1 $f16, 8(%0) \n\t"
+++			"punpcklbh $f14, $f16, $f0 \n\t"
+++			"punpckhbh $f16, $f16, $f0 \n\t"
+++			
+++			"lwc1 $f8, (%1) \n\t"
+++			"lwc1 $f12, (%2) \n\t"
+++			"punpcklbh $f8, $f8, $f12 \n\t"
+++			"punpcklbh $f6, $f0, $f8 \n\t"
+++			"punpckhbh $f8, $f0, $f8 \n\t"
+++			"lwc1 $f18, 4(%1) \n\t"
+++			"lwc1 $f12, 4(%2) \n\t"
+++			"punpcklbh $f18, $f18, $f12 \n\t"
+++			"punpcklbh $f10, $f0, $f18 \n\t"
+++			"punpckhbh $f12, $f0, $f18 \n\t"
+++
+++			"or $f2, $f2, $f6 \n\t"
+++			"or $f4, $f4, $f8 \n\t"
+++			"or $f14, $f14, $f10 \n\t"
+++			"or $f16, $f16, $f12 \n\t"
+++
+++			"sdc1 $f2, (%3) \n\t"
+++			"sdc1 $f4, 8(%3) \n\t"
+++			"add %0, 16 \n\t"
+++			"add %1, 8 \n\t"
+++			"add %2, 8 \n\t"
+++			"sdc1 $f14, 0x10(%3) \n\t"
+++			"sdc1 $f16, 0x18(%3) \n\t"
+++			"add $8, -1 \n\t"
+++			"b 1b \n\t"
+++			"add %3, 32 \n\t"
+++			"2: \n\t"
+++			".set reorder\n\t"
+++			: "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
+++			: "0" (y), "1" (u), "2" (v), "3" (dst), "r" (w>>4)
+++			: "memory","$8"
+++		);
+++
+++		asm (
+++//			".set arch=loongson2f\n\t"
+++			".set noreorder\n\t"
+++			"move $8, %8 \n\t"
+++			"1: \n\t"
+++			"beqz $8, 2f \n\t"
+++			"xor $f0, $f0, $f0 \n\t"
+++			"ldc1 $f4, (%0) \n\t"
+++			"punpcklbh $f2, $f4, $f0 \n\t"
+++			"punpckhbh $f4, $f4, $f0 \n\t"
+++			
+++			"lwc1 $f8, (%1) \n\t"
+++			"lwc1 $f12, (%2) \n\t"
+++			"punpcklbh $f8, $f8, $f12 \n\t"
+++			"punpcklbh $f6, $f0, $f8 \n\t"
+++			"punpckhbh $f8, $f0, $f8 \n\t"
+++
+++			"or $f2, $f2, $f6 \n\t"
+++			"or $f4, $f4, $f8 \n\t"
+++
+++			"sdc1 $f2, (%3) \n\t"
+++			"sdc1 $f4, 8(%3) \n\t"
+++			"add %0, 8 \n\t"
+++			"add %1, 4 \n\t"
+++			"add %2, 4 \n\t"
+++			"add $8, -1 \n\t"
+++			"b 1b \n\t"
+++			"add %3, 16 \n\t"
+++			"2:\n\t"
+++			".set reorder\n\t"
+++			: "=r" (y), "=r" (u), "=r" (v), "=r" (dst)
+++			: "0" (y), "1" (u), "2" (v), "3" (dst), "r" ((w&0xf)/8)
+++			: "memory","$8"
+++		);
+++
+++		for (j = (w&7)/2; j; j--) {
+++			*dst++ = *y++;
+++			*dst++ = *u++;
+++			*dst++ = *y++;
+++			*dst++ = *v++;
+++		}
+++		y += yinc;
+++		u = (i%2) ? (u + uinc): (u - w/2);
+++		v = (i%2) ? (v + vinc): (v - w/2);
+++		dst += dstinc;
+++	}
+++}
++ 
++ static int
++ SMI_PutImage(
++@@ -1593,7 +1705,7 @@
++ 		offset3 = tmp;
++ 	    }
++ 	    nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
++-	    xf86XVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), 
+++	    myXVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), 
++ 				    buf + offset2, buf + offset3, dstStart,
++ 				    srcPitch, srcPitch2, dstPitch, nLines,
++ 				    nPixels);
++@@ -1793,6 +1905,7 @@
++     WRITE_VPR(pSmi, 0x1C, offset >> 3);
++     WRITE_VPR(pSmi, 0x20, (pitch >> 3) | ((pitch >> 3) << 16));
++     WRITE_VPR(pSmi, 0x24, (hstretch & 0xff00) | ((vstretch & 0xff00) >> 8));
+++    WRITE_VPR(pSmi, 0x68, ((hstretch & 0xff) << 8) | (vstretch & 0xff));
++     if (pSmi->Chipset == SMI_LYNXEMplus) {	/* This one can store additional precision */
++ 	WRITE_VPR(pSmi, 0x68, ((hstretch & 0xff) << 8) | (vstretch & 0xff));
++     }
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD
index a4a462692..09e85c862 100644
--- a/extra/xf86-video-sis/PKGBUILD
+++ b/extra/xf86-video-sis/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xf86-video-sis
 pkgver=0.10.7
 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')
diff --git a/extra/xfburn/PKGBUILD b/extra/xfburn/PKGBUILD
index b7ae00193..a21214cd7 100755
--- a/extra/xfburn/PKGBUILD
+++ b/extra/xfburn/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfburn
 pkgver=0.5.0
 pkgrel=1
 pkgdesc="A simple CD/DVD burning tool based on libburnia libraries"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/xfburn"
 license=('GPL')
 depends=('libburn' 'libisofs' 'exo' 'gstreamer0.10-base' 'desktop-file-utils')
diff --git a/extra/xfce4-appfinder/PKGBUILD b/extra/xfce4-appfinder/PKGBUILD
index 6e279dbdd..997245e6a 100644
--- a/extra/xfce4-appfinder/PKGBUILD
+++ b/extra/xfce4-appfinder/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-appfinder
 pkgver=4.10.1
 pkgrel=1
 pkgdesc="An application finder 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-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD
index b9e3c3e01..e3cbca473 100644
--- a/extra/xfce4-battery-plugin/PKGBUILD
+++ b/extra/xfce4-battery-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-battery-plugin
 pkgver=1.0.5
 pkgrel=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 605fe0e48..e7232ebec 100644
--- a/extra/xfce4-clipman-plugin/PKGBUILD
+++ b/extra/xfce4-clipman-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-clipman-plugin
 pkgver=1.2.4
 pkgrel=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 4ebb07cc2..1c1e8eff1 100644
--- a/extra/xfce4-cpufreq-plugin/PKGBUILD
+++ b/extra/xfce4-cpufreq-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-cpufreq-plugin
 pkgver=1.1.0
 pkgrel=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 3166f6dfb..6a67b57ac 100644
--- a/extra/xfce4-cpugraph-plugin/PKGBUILD
+++ b/extra/xfce4-cpugraph-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-cpugraph-plugin
 pkgver=1.0.5
 pkgrel=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 c19b2ad37..bd17435d4 100644
--- a/extra/xfce4-datetime-plugin/PKGBUILD
+++ b/extra/xfce4-datetime-plugin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-datetime-plugin
 pkgver=0.6.2
 pkgrel=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')
@@ -22,7 +22,6 @@ build() {
 	--sysconfdir=/etc \
 	--libexecdir=/usr/lib \
 	--localstatedir=/var \
-	--disable-static \
 	--disable-static
   make
 }
diff --git a/extra/xfce4-dev-tools/PKGBUILD b/extra/xfce4-dev-tools/PKGBUILD
index 5fc04de6a..8408d9bbd 100644
--- a/extra/xfce4-dev-tools/PKGBUILD
+++ b/extra/xfce4-dev-tools/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-dev-tools
 pkgver=4.10.0
 pkgrel=2
 pkgdesc="Xfce developer tools"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 depends=('gtk-doc' 'automake' 'make' 'intltool' 'pkg-config')
diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD
index fc9b00f5e..b2e800264 100644
--- a/extra/xfce4-dict/PKGBUILD
+++ b/extra/xfce4-dict/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-dict
 pkgver=0.7.0
 pkgrel=1
 pkgdesc="A dictionary plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/xfce4-dict"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD
index 78ae0c0ba..ab2a70e3d 100644
--- a/extra/xfce4-diskperf-plugin/PKGBUILD
+++ b/extra/xfce4-diskperf-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-diskperf-plugin
 pkgver=2.5.4
 pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('BSD')
 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 1f60e474f..b9847e98f 100644
--- a/extra/xfce4-eyes-plugin/PKGBUILD
+++ b/extra/xfce4-eyes-plugin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-eyes-plugin
 pkgver=4.4.2
 pkgrel=1
 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-fsguard-plugin/PKGBUILD b/extra/xfce4-fsguard-plugin/PKGBUILD
index cb060f9a3..f3ed1f12b 100644
--- a/extra/xfce4-fsguard-plugin/PKGBUILD
+++ b/extra/xfce4-fsguard-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-fsguard-plugin
 pkgver=1.0.1
 pkgrel=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 6686eb5f3..249baa0b6 100644
--- a/extra/xfce4-genmon-plugin/PKGBUILD
+++ b/extra/xfce4-genmon-plugin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-genmon-plugin
 pkgver=3.4.0
 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')
diff --git a/extra/xfce4-mailwatch-plugin/PKGBUILD b/extra/xfce4-mailwatch-plugin/PKGBUILD
index f22ca3864..5f945bb20 100644
--- a/extra/xfce4-mailwatch-plugin/PKGBUILD
+++ b/extra/xfce4-mailwatch-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-mailwatch-plugin
 pkgver=1.2.0
 pkgrel=2
 pkgdesc="A mailbox watch/check plugin for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD
index d8ed644b8..48dd4b3f8 100644
--- a/extra/xfce4-mixer/PKGBUILD
+++ b/extra/xfce4-mixer/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xfce4-mixer
 pkgver=4.10.0
 pkgrel=2
 pkgdesc="The volume control plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD
index b509250c0..661998909 100644
--- a/extra/xfce4-mount-plugin/PKGBUILD
+++ b/extra/xfce4-mount-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-mount-plugin
 pkgver=0.6.4
 pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel to mount and unmount volumes"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xfce-goodies.berlios.de/"
 license=('GPL')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD
index d4ea1caef..66408b2f2 100644
--- a/extra/xfce4-mpc-plugin/PKGBUILD
+++ b/extra/xfce4-mpc-plugin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-mpc-plugin
 pkgver=0.4.4
 pkgrel=1
 pkgdesc="A plugin to control the music player daemon from the xfce4-panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
 license=('BSD')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-netload-plugin/PKGBUILD b/extra/xfce4-netload-plugin/PKGBUILD
index e660ad85b..818bd8692 100644
--- a/extra/xfce4-netload-plugin/PKGBUILD
+++ b/extra/xfce4-netload-plugin/PKGBUILD
@@ -4,9 +4,9 @@
 
 pkgname=xfce4-netload-plugin
 pkgver=1.2.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="A netload plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xfce-goodies.berlios.de/"
 license=('GPL')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-notes-plugin/PKGBUILD b/extra/xfce4-notes-plugin/PKGBUILD
index 6ce2f413b..5f9c5216f 100644
--- a/extra/xfce4-notes-plugin/PKGBUILD
+++ b/extra/xfce4-notes-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-notes-plugin
 pkgver=1.7.7
 pkgrel=4
 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 403bffaa2..aff533b1b 100644
--- a/extra/xfce4-notifyd/PKGBUILD
+++ b/extra/xfce4-notifyd/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-notifyd
 pkgver=0.2.4
 pkgrel=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 bdce30a68..f0e9babd1 100644
--- a/extra/xfce4-panel/PKGBUILD
+++ b/extra/xfce4-panel/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-panel
 pkgver=4.10.1
 pkgrel=1
 pkgdesc="Panel for the Xfce desktop environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD
index 265b6f284..bbb6e306e 100644
--- a/extra/xfce4-power-manager/PKGBUILD
+++ b/extra/xfce4-power-manager/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-power-manager
 pkgver=1.2.0
 pkgrel=6
 pkgdesc="Power manager for Xfce desktop"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/xfce4-quicklauncher-plugin/PKGBUILD b/extra/xfce4-quicklauncher-plugin/PKGBUILD
index e43e9d64e..e98881e47 100644
--- a/extra/xfce4-quicklauncher-plugin/PKGBUILD
+++ b/extra/xfce4-quicklauncher-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-quicklauncher-plugin
 pkgver=1.9.4
 pkgrel=7
 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 05df96a97..474ab6961 100644
--- a/extra/xfce4-screenshooter/PKGBUILD
+++ b/extra/xfce4-screenshooter/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-screenshooter
 pkgver=1.8.1
 pkgrel=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 0ecb2dec6..a518b18a2 100644
--- a/extra/xfce4-sensors-plugin/PKGBUILD
+++ b/extra/xfce4-sensors-plugin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-sensors-plugin
 pkgver=1.2.5
 pkgrel=1
 pkgdesc="A lm_sensors plugin for the Xfce panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD
index 41287ad2a..4349f993e 100644
--- a/extra/xfce4-session/PKGBUILD
+++ b/extra/xfce4-session/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-session
 pkgver=4.10.1
 pkgrel=3
 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 d3ff38d8b..c83a4a3d6 100644
--- a/extra/xfce4-settings/PKGBUILD
+++ b/extra/xfce4-settings/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-settings
 pkgver=4.10.1
 pkgrel=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 29beab70f..dac718bf9 100644
--- a/extra/xfce4-smartbookmark-plugin/PKGBUILD
+++ b/extra/xfce4-smartbookmark-plugin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-smartbookmark-plugin
 pkgver=0.4.5
 pkgrel=1
 pkgdesc="Plugin for the Xfce4 panel that lets you quicksearch from selected websites"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-smartbookmark-plugin"
 license=('GPL2')
 groups=('xfce4-goodies')
diff --git a/extra/xfce4-systemload-plugin/PKGBUILD b/extra/xfce4-systemload-plugin/PKGBUILD
index 53c3d0dde..dd2d680f4 100644
--- a/extra/xfce4-systemload-plugin/PKGBUILD
+++ b/extra/xfce4-systemload-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-systemload-plugin
 pkgver=1.1.1
 pkgrel=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 dc7dc7ee6..e469d2ef2 100644
--- a/extra/xfce4-taskmanager/PKGBUILD
+++ b/extra/xfce4-taskmanager/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xfce4-taskmanager
 pkgver=1.0.1
 pkgrel=1
 pkgdesc="Easy to use task manager"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/xfce4-taskmanager"
 license=('GPL2')
 depends=('libwnck')
diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD
index 675ec14e4..fbde79f9f 100644
--- a/extra/xfce4-terminal/PKGBUILD
+++ b/extra/xfce4-terminal/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-terminal
 pkgver=0.6.3
 pkgrel=1
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xfce.org/"
 license=('GPL2')
 groups=('xfce4')
diff --git a/extra/xfce4-time-out-plugin/PKGBUILD b/extra/xfce4-time-out-plugin/PKGBUILD
index b6374ee81..9e8333f10 100755
--- a/extra/xfce4-time-out-plugin/PKGBUILD
+++ b/extra/xfce4-time-out-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-time-out-plugin
 pkgver=1.0.1
 pkgrel=2
 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 1f89e65c6..35f7f1de1 100644
--- a/extra/xfce4-timer-plugin/PKGBUILD
+++ b/extra/xfce4-timer-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-timer-plugin
 pkgver=1.0.0
 pkgrel=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 1087fa358..622c9cbeb 100644
--- a/extra/xfce4-verve-plugin/PKGBUILD
+++ b/extra/xfce4-verve-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-verve-plugin
 pkgver=1.0.0
 pkgrel=3
 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 06efded79..4d66341e8 100644
--- a/extra/xfce4-wavelan-plugin/PKGBUILD
+++ b/extra/xfce4-wavelan-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-wavelan-plugin
 pkgver=0.5.11
 pkgrel=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 348e739ea..68588600b 100644
--- a/extra/xfce4-weather-plugin/PKGBUILD
+++ b/extra/xfce4-weather-plugin/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfce4-weather-plugin
 pkgver=0.8.3
 pkgrel=3
 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 dc420ccce..cdea7988f 100644
--- a/extra/xfce4-xkb-plugin/PKGBUILD
+++ b/extra/xfce4-xkb-plugin/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=xfce4-xkb-plugin
 pkgver=0.5.6
 pkgrel=1
 pkgdesc="Plugin to switch keyboard layouts for the Xfce4 panel"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
 license=('custom')
 groups=('xfce4-goodies')
diff --git a/extra/xfconf/PKGBUILD b/extra/xfconf/PKGBUILD
index 94eae5a2e..49a73f2ad 100644
--- a/extra/xfconf/PKGBUILD
+++ b/extra/xfconf/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfconf
 pkgver=4.10.0
 pkgrel=3
 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 230d5bbf7..56edc76ab 100644
--- a/extra/xfdesktop/PKGBUILD
+++ b/extra/xfdesktop/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfdesktop
 pkgver=4.10.2
 pkgrel=1
 pkgdesc="A desktop 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/xfig/PKGBUILD b/extra/xfig/PKGBUILD
index 0bb6f5d7d..c6a91bc2d 100644
--- a/extra/xfig/PKGBUILD
+++ b/extra/xfig/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xfig
 pkgver=3.2.5c
 pkgrel=2
 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' 'libxaw' 'libxi' 'desktop-file-utils' 'gsfonts')
diff --git a/extra/xfwm4/PKGBUILD b/extra/xfwm4/PKGBUILD
index 3930ebd0b..7ea8529b1 100644
--- a/extra/xfwm4/PKGBUILD
+++ b/extra/xfwm4/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xfwm4
 pkgver=4.10.1
 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 34aab40e5..da5d6f7af 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -5,18 +5,19 @@ pkgname=xine-lib
 pkgver=1.2.4
 pkgrel=3
 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')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
+makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'libmodplug'
              'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad'
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu' 'gdk-pixbuf2')
+             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'gdk-pixbuf2')
+[ "$CARCH" = "mips64el" ] || makedepends+=('glu' 'libvdpau')
 optdepends=('imagemagick: for using the imagemagick plugin' \
             'jack: for using the jack plugin' \
-            'vcdimager: for using the vcd plugin' \
-            'glu: for using the opengl plugin' \
-            'wavpack: for using the wavpack plugin' \
+            'vcdimager: for using the vcd plugin')
+[ "$CARCH" = "mips64el" ] || optdepends+=('glu: for using the opengl plugin')
+optdepends+=('wavpack: for using the wavpack plugin' \
             'faad2: for using the faad plugin' \
             'libmng: for using the mng plugin' \
             'aalib: for using the aalib plugin' \
@@ -27,16 +28,17 @@ optdepends=('imagemagick: for using the imagemagick plugin' \
             'libmpcdec: for using the musepack plugin' \
             'libcaca: for using the caca plugin' \
             'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin' \
-            'libvdpau: for using the VDPAU plugin' \
-            'smbclient: for using the samba plugin' \
+            'gnome-vfs: for using the gnome-vfs plugin'
+            'smbclient: for using the samba plugin'
             'gdk-pixbuf2: for using the gdk-pixbuf plugin')
+[ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
 sha1sums=('32267c5fcaa1439a5fbf7606d27dc4fafba9e504')
 
 build() {
   cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations
+  [ "$CARCH" = "mips64el" ] || extraconf=--enable-vdpau
+  ./configure --prefix=/usr --with-wavpack --disable-optimizations $extraconf
   make
 }
 
diff --git a/extra/xmahjongg/PKGBUILD b/extra/xmahjongg/PKGBUILD
index 56df4a23f..63e383811 100644
--- a/extra/xmahjongg/PKGBUILD
+++ b/extra/xmahjongg/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xmahjongg
 pkgver=3.7
-pkgrel=4
+pkgrel=4.1
 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 c19a44b4b..58c6ef22d 100644
--- a/extra/xmlsec/PKGBUILD
+++ b/extra/xmlsec/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=1.2.19
 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' 'openssl' 'gnutls' 'nss' 'libltdl')
 source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz)
diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD
index b5e476228..88d6c62b8 100644
--- a/extra/xmlto/PKGBUILD
+++ b/extra/xmlto/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=xmlto
 pkgver=0.0.25
 pkgrel=5
 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')
diff --git a/extra/xmms/PKGBUILD b/extra/xmms/PKGBUILD
index 592ae820e..e5ba1f51f 100644
--- a/extra/xmms/PKGBUILD
+++ b/extra/xmms/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xmms
 pkgver=1.2.11
 pkgrel=7
 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' 'zlib' 'desktop-file-utils')
@@ -45,7 +45,7 @@ prepare() {
 # Several patches from Mandriva
   patch -p1 < ../xmms-1.2.11-fix-http-title-mpg123.patch
   patch -p0 < ../xmms-1.2.10-recode-id3.patch
-  patch -p1 < ../xmms-1.2.11-3dse.patch
+  [ "$CARCH" != "mips64el" ] && patch -p1 < ../xmms-1.2.11-3dse.patch
   patch -p1 < ../xmms-1.2.10-fonts.patch
   patch -p1 < ../xmms-1.2.11-CVE-2007-0653.0654.patch
   patch -p1 < ../xmms-1.2.11-fix-mikmod-driver.patch
diff --git a/extra/xorg-appres/PKGBUILD b/extra/xorg-appres/PKGBUILD
index 27bbbd6a7..6f566cd17 100644
--- a/extra/xorg-appres/PKGBUILD
+++ b/extra/xorg-appres/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-appres
 pkgver=1.0.4
 pkgrel=1
 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 8bef25d11..188b0e283 100644
--- a/extra/xorg-bdftopcf/PKGBUILD
+++ b/extra/xorg-bdftopcf/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-bdftopcf
 pkgver=1.0.4
 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 2589f10e6..b0f88c1a5 100644
--- a/extra/xorg-font-util/PKGBUILD
+++ b/extra/xorg-font-util/PKGBUILD
@@ -4,10 +4,10 @@
 
 pkgname=xorg-font-util
 pkgver=1.3.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc='X.Org font utilities'
 url='http://xorg.freedesktop.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 makedepends=('xorg-util-macros')
 source=("${url}/releases/individual/font/font-util-${pkgver}.tar.bz2")
diff --git a/extra/xorg-iceauth/PKGBUILD b/extra/xorg-iceauth/PKGBUILD
index 6a851a494..4860a675c 100644
--- a/extra/xorg-iceauth/PKGBUILD
+++ b/extra/xorg-iceauth/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-iceauth
 pkgver=1.0.6
 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 6e6878e1f..a60f4dc4c 100644
--- a/extra/xorg-luit/PKGBUILD
+++ b/extra/xorg-luit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-luit
 pkgver=1.1.1
 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 0da167e34..964796cf6 100644
--- a/extra/xorg-mkfontscale/PKGBUILD
+++ b/extra/xorg-mkfontscale/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-mkfontscale
 pkgver=1.1.1
 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 76c42e775..ec79fd84a 100644
--- a/extra/xorg-oclock/PKGBUILD
+++ b/extra/xorg-oclock/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-oclock
 pkgver=1.0.3
-pkgrel=1
+pkgrel=1.2
 pkgdesc="Round X clock"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libx11' 'libxmu' 'libxext' 'libxkbfile')
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 5bc67ab42..b7a2318bf 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -6,7 +6,7 @@ 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.15.0
 pkgrel=5 # build first with 0.1 and then rebuild it after xf86-input-evdev rebuild
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
 makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 
@@ -21,6 +21,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf
+        loongson.patch
         CVE-2013-6424.diff)
 sha256sums=('613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
@@ -28,6 +29,7 @@ sha256sums=('613b2f2e7ee2a06d2f8e862c836dc70d319c52f1537749e027398f40086aabb8'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
+            'c1081681093cd56003f77e1bf4febc3e6bb84a1bde95292fbe19e8c461a7d207'
             '89948993afd4d9aec6a0bdbaf62f494e9956bb77a0386307d497f340a818ff61')
 
 prepare() {
@@ -38,6 +40,9 @@ prepare() {
   # Use unofficial imedia SiS driver for supported SiS devices
   patch -Np0 -i ../autoconfig-sis.patch
 
+  # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html
+  patch -Np1 -i "${srcdir}/loongson.patch"
+
   # Fix CVE-2013-6424 (FS#38401)
   patch -Np1 -i ../CVE-2013-6424.diff
 }
diff --git a/extra/xorg-server/loongson.patch b/extra/xorg-server/loongson.patch
new file mode 100644
index 000000000..632753873
--- /dev/null
+++ b/extra/xorg-server/loongson.patch
@@ -0,0 +1,56 @@
+diff -ru xorg-server-1.14.0.orig/hw/xfree86/dri/sarea.h xorg-server-1.14.0/hw/xfree86/dri/sarea.h
+--- xorg-server-1.14.0.orig/hw/xfree86/dri/sarea.h	2013-03-19 13:50:10.838242935 +0100
++++ xorg-server-1.14.0/hw/xfree86/dri/sarea.h	2013-03-19 13:50:39.129859642 +0100
+@@ -41,6 +41,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.14.0.orig/hw/xfree86/os-support/linux/lnx_video.c xorg-server-1.14.0/hw/xfree86/os-support/linux/lnx_video.c
+--- xorg-server-1.14.0.orig/hw/xfree86/os-support/linux/lnx_video.c	2013-03-19 13:50:10.869508709 +0100
++++ xorg-server-1.14.0/hw/xfree86/os-support/linux/lnx_video.c	2013-03-19 14:02:26.536090562 +0100
+@@ -503,6 +503,40 @@
+     ioBase = NULL;
+ }
+ 
++#elif defined(__mips__)
++
++extern unsigned int IOPortBase;
++
++static Bool
++hwEnableIO(void)
++{
++    int fd;
++
++    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);
++
++    return IOPortBase != MAP_FAILED;
++}
++
++static void
++hwDisableIO(void)
++{
++    munmap(IOPortBase, 0x20000);
++    IOPortBase = NULL;
++}
++
+ #elif defined(__i386__) || defined(__x86_64__) || defined(__ia64__) || \
+       defined(__alpha__)
+ 
diff --git a/extra/xorg-sessreg/PKGBUILD b/extra/xorg-sessreg/PKGBUILD
index 2bc48e061..7096159ea 100644
--- a/extra/xorg-sessreg/PKGBUILD
+++ b/extra/xorg-sessreg/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-sessreg
 pkgver=1.0.8
 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 f48a852d9..24df12a09 100644
--- a/extra/xorg-setxkbmap/PKGBUILD
+++ b/extra/xorg-setxkbmap/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='Set the keyboard using the X Keyboard Extension'
 url='http://xorg.freedesktop.org/'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libxkbfile')
 makedepends=('xorg-util-macros')
 source=("${url}/releases/individual/app/setxkbmap-${pkgver}.tar.bz2")
diff --git a/extra/xorg-smproxy/PKGBUILD b/extra/xorg-smproxy/PKGBUILD
index d8c25e0a4..bbfd531ad 100644
--- a/extra/xorg-smproxy/PKGBUILD
+++ b/extra/xorg-smproxy/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-smproxy
 pkgver=1.0.5
-pkgrel=1
+pkgrel=1.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 472672da3..210a1ee7e 100644
--- a/extra/xorg-twm/PKGBUILD
+++ b/extra/xorg-twm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-twm
 pkgver=1.0.8
 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..a46972d16 100644
--- a/extra/xorg-x11perf/PKGBUILD
+++ b/extra/xorg-x11perf/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-x11perf
 pkgver=1.5.4
-pkgrel=1
+pkgrel=1.2
 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 558a17b99..6edbc76f4 100644
--- a/extra/xorg-xauth/PKGBUILD
+++ b/extra/xorg-xauth/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xauth
 pkgver=1.0.8
 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 412b91056..c14213649 100644
--- a/extra/xorg-xbacklight/PKGBUILD
+++ b/extra/xorg-xbacklight/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-xbacklight
 pkgver=1.2.0
-pkgrel=1
+pkgrel=1.1
 pkgdesc="RandR-based backlight control application"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('xcb-util')
diff --git a/extra/xorg-xbiff/PKGBUILD b/extra/xorg-xbiff/PKGBUILD
index d30551e11..938a15d9f 100644
--- a/extra/xorg-xbiff/PKGBUILD
+++ b/extra/xorg-xbiff/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-xbiff
 pkgver=1.0.3
-pkgrel=2
+pkgrel=2.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 7d949a313..71a746d92 100644
--- a/extra/xorg-xcalc/PKGBUILD
+++ b/extra/xorg-xcalc/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xcalc
 pkgver=1.0.5
 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 835cb897f..1cfa339ed 100644
--- a/extra/xorg-xclipboard/PKGBUILD
+++ b/extra/xorg-xclipboard/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xclipboard
 pkgver=1.1.3
 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 77d1098bd..1b9eda13b 100644
--- a/extra/xorg-xclock/PKGBUILD
+++ b/extra/xorg-xclock/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xclock
 pkgver=1.0.7
 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 37346f97a..fbb387949 100644
--- a/extra/xorg-xcmsdb/PKGBUILD
+++ b/extra/xorg-xcmsdb/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-xcmsdb
 pkgver=1.0.4
-pkgrel=1
+pkgrel=1.1
 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 bc3ca28f5..cd09847f6 100644
--- a/extra/xorg-xconsole/PKGBUILD
+++ b/extra/xorg-xconsole/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xconsole
 pkgver=1.0.6
 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 73b44508d..b08bd5fc5 100644
--- a/extra/xorg-xcursorgen/PKGBUILD
+++ b/extra/xorg-xcursorgen/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xcursorgen
 pkgver=1.0.5
 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 c1d8eb0e3..686d749f2 100644
--- a/extra/xorg-xdm/PKGBUILD
+++ b/extra/xorg-xdm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xdm
 pkgver=1.1.11
 pkgrel=4
 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' 'systemd')
diff --git a/extra/xorg-xdpyinfo/PKGBUILD b/extra/xorg-xdpyinfo/PKGBUILD
index 6072f73e0..dc1b608d5 100644
--- a/extra/xorg-xdpyinfo/PKGBUILD
+++ b/extra/xorg-xdpyinfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xdpyinfo
 pkgver=1.3.1
 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 e2fb4a36d..322b029b6 100644
--- a/extra/xorg-xdriinfo/PKGBUILD
+++ b/extra/xorg-xdriinfo/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-xdriinfo
 pkgver=1.0.4
-pkgrel=3
+pkgrel=3.1
 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 5fcec8b7d..0246a8ce3 100644
--- a/extra/xorg-xedit/PKGBUILD
+++ b/extra/xorg-xedit/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xedit
 pkgver=1.2.1
 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 3d0eebc3b..f817360e1 100644
--- a/extra/xorg-xev/PKGBUILD
+++ b/extra/xorg-xev/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.2.1
 pkgrel=1
 pkgdesc='Print contents of X events'
 url='http://xorg.freedesktop.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('libx11' 'libxrandr')
 makedepends=('xorg-util-macros' 'xproto')
diff --git a/extra/xorg-xeyes/PKGBUILD b/extra/xorg-xeyes/PKGBUILD
index 717d7a7b7..4efe1ce00 100644
--- a/extra/xorg-xeyes/PKGBUILD
+++ b/extra/xorg-xeyes/PKGBUILD
@@ -3,9 +3,9 @@
 
 pkgname=xorg-xeyes
 pkgver=1.1.1
-pkgrel=2
+pkgrel=2.2
 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 6ea8b8d64..6892d54de 100644
--- a/extra/xorg-xfd/PKGBUILD
+++ b/extra/xorg-xfd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xfd
 pkgver=1.1.2
 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 533c1a102..ba9194ebf 100644
--- a/extra/xorg-xfontsel/PKGBUILD
+++ b/extra/xorg-xfontsel/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=1.0.5
 pkgrel=1
 pkgdesc='Point and click selection of X11 font names'
 url='http://xorg.freedesktop.org/'
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 makedepends=('xorg-util-macros')
 depends=('libxaw' 'libxmu' 'libxt' 'libx11')
diff --git a/extra/xorg-xgamma/PKGBUILD b/extra/xorg-xgamma/PKGBUILD
index e77997d4f..e36cf6083 100644
--- a/extra/xorg-xgamma/PKGBUILD
+++ b/extra/xorg-xgamma/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xgamma
 pkgver=1.0.5
 pkgrel=1
 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 8599de6a6..0b546f80e 100644
--- a/extra/xorg-xhost/PKGBUILD
+++ b/extra/xorg-xhost/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xhost
 pkgver=1.0.6
 pkgrel=1
 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 c313e7b51..ac6ae855a 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xinit
 pkgver=1.3.3
 pkgrel=3
 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 0f2007c94..fc8e6d320 100644
--- a/extra/xorg-xinput/PKGBUILD
+++ b/extra/xorg-xinput/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xinput
 pkgver=1.6.1
 pkgrel=1
 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>=1.5.99.2' 'xorg-xrandr' 'libxinerama')
diff --git a/extra/xorg-xkbcomp/PKGBUILD b/extra/xorg-xkbcomp/PKGBUILD
index 35dce4fce..ae3d9a204 100644
--- a/extra/xorg-xkbcomp/PKGBUILD
+++ b/extra/xorg-xkbcomp/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbcomp
 pkgver=1.2.4
 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 0f523d902..c28d91a6e 100644
--- a/extra/xorg-xkbevd/PKGBUILD
+++ b/extra/xorg-xkbevd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbevd
 pkgver=1.1.3
 pkgrel=1
 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 5203a4fbb..22ceec025 100644
--- a/extra/xorg-xkbutils/PKGBUILD
+++ b/extra/xorg-xkbutils/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkbutils
 pkgver=1.0.4
 pkgrel=1
 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 6fe9bda86..3b5541f10 100644
--- a/extra/xorg-xkill/PKGBUILD
+++ b/extra/xorg-xkill/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xkill
 pkgver=1.0.4
 pkgrel=1
 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 961cb2d26..b4b78d3c8 100644
--- a/extra/xorg-xload/PKGBUILD
+++ b/extra/xorg-xload/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xload
 pkgver=1.1.2
 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 8a3713b97..42cf8c3db 100644
--- a/extra/xorg-xlogo/PKGBUILD
+++ b/extra/xorg-xlogo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlogo
 pkgver=1.0.4
 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 eef31393d..4e36c7e9d 100644
--- a/extra/xorg-xlsatoms/PKGBUILD
+++ b/extra/xorg-xlsatoms/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlsatoms
 pkgver=1.1.1
 pkgrel=1
 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 c23d1aaa6..5701a8336 100644
--- a/extra/xorg-xlsclients/PKGBUILD
+++ b/extra/xorg-xlsclients/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xlsclients
 pkgver=1.1.3
 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-xlsfonts/PKGBUILD b/extra/xorg-xlsfonts/PKGBUILD
index a2a623685..a0e22a221 100644
--- a/extra/xorg-xlsfonts/PKGBUILD
+++ b/extra/xorg-xlsfonts/PKGBUILD
@@ -8,7 +8,7 @@ pkgrel=1
 pkgdesc='List available X fonts'
 url='http://xorg.freedesktop.org/'
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libx11')
 makedepends=('xorg-util-macros')
 source=("http://xorg.freedesktop.org/archive/individual/app/xlsfonts-${pkgver}.tar.bz2")
diff --git a/extra/xorg-xmag/PKGBUILD b/extra/xorg-xmag/PKGBUILD
index cdce17e7c..501d5e12f 100644
--- a/extra/xorg-xmag/PKGBUILD
+++ b/extra/xorg-xmag/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmag
 pkgver=1.0.5
 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 1b6bd6aa8..6eef4f51c 100644
--- a/extra/xorg-xman/PKGBUILD
+++ b/extra/xorg-xman/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xman
 pkgver=1.1.3
 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 8c6ddd5f4..de79d4648 100644
--- a/extra/xorg-xmessage/PKGBUILD
+++ b/extra/xorg-xmessage/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmessage
 pkgver=1.0.4
 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 f15e1b895..85a3f3aef 100644
--- a/extra/xorg-xmodmap/PKGBUILD
+++ b/extra/xorg-xmodmap/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xmodmap
 pkgver=1.0.8
 pkgrel=1
 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 11ba4bad5..0eb9d1dd4 100644
--- a/extra/xorg-xpr/PKGBUILD
+++ b/extra/xorg-xpr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xpr
 pkgver=1.0.4
 pkgrel=1
 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' 'sh')
diff --git a/extra/xorg-xprop/PKGBUILD b/extra/xorg-xprop/PKGBUILD
index 57c671c62..66c31787a 100644
--- a/extra/xorg-xprop/PKGBUILD
+++ b/extra/xorg-xprop/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xprop
 pkgver=1.2.2
 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 e98fe02c7..43fe711f3 100644
--- a/extra/xorg-xrandr/PKGBUILD
+++ b/extra/xorg-xrandr/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xrandr
 pkgver=1.4.1
 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 4555a3f80..d3f422b92 100644
--- a/extra/xorg-xrdb/PKGBUILD
+++ b/extra/xorg-xrdb/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xrdb
 pkgver=1.1.0
 pkgrel=1
 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')
diff --git a/extra/xorg-xrefresh/PKGBUILD b/extra/xorg-xrefresh/PKGBUILD
index a0d5abce1..66bf9a086 100644
--- a/extra/xorg-xrefresh/PKGBUILD
+++ b/extra/xorg-xrefresh/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xrefresh
 pkgver=1.0.5
 pkgrel=1
 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 ab4573148..fe4fa833e 100644
--- a/extra/xorg-xset/PKGBUILD
+++ b/extra/xorg-xset/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xset
 pkgver=1.2.3
 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 ab156de7d..545c33bc4 100644
--- a/extra/xorg-xsetroot/PKGBUILD
+++ b/extra/xorg-xsetroot/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xsetroot
 pkgver=1.1.1
 pkgrel=1
 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 5cf0c2b81..16efa8c97 100644
--- a/extra/xorg-xvidtune/PKGBUILD
+++ b/extra/xorg-xvidtune/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xvidtune
 pkgver=1.0.3
 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 f3ef41f7d..6d8d13b74 100644
--- a/extra/xorg-xvinfo/PKGBUILD
+++ b/extra/xorg-xvinfo/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xvinfo
 pkgver=1.1.2
 pkgrel=1
 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 b66cac88b..a1efcae8c 100644
--- a/extra/xorg-xwd/PKGBUILD
+++ b/extra/xorg-xwd/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xwd
 pkgver=1.0.6
 pkgrel=1
 pkgdesc="X Window System image dumping utility"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libxkbfile')
diff --git a/extra/xorg-xwininfo/PKGBUILD b/extra/xorg-xwininfo/PKGBUILD
index f4f678935..6e0f703a5 100644
--- a/extra/xorg-xwininfo/PKGBUILD
+++ b/extra/xorg-xwininfo/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xorg-xwininfo
 pkgver=1.1.3
 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 b2a30dc07..de10341d3 100644
--- a/extra/xorg-xwud/PKGBUILD
+++ b/extra/xorg-xwud/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=xorg-xwud
 pkgver=1.0.4
 pkgrel=1
 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 240f15da7..ba03596fd 100644
--- a/extra/xournal/PKGBUILD
+++ b/extra/xournal/PKGBUILD
@@ -7,7 +7,7 @@ pkgrel=1
 pkgdesc='Notetaking and sketching application'
 url='http://xournal.sourceforge.net/'
 license=('GPL')
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme')
 optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
diff --git a/extra/xsane/PKGBUILD b/extra/xsane/PKGBUILD
index ae751665e..eee9d0a0e 100644
--- a/extra/xsane/PKGBUILD
+++ b/extra/xsane/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=xsane
 pkgname=('xsane' 'xsane-gimp')
 pkgver=0.999
 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/xsd/PKGBUILD b/extra/xsd/PKGBUILD
index c0f61a29e..59484aca6 100644
--- a/extra/xsd/PKGBUILD
+++ b/extra/xsd/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=3.3.0
 _pkgver=3.3.0-2+dep
 pkgrel=10
 pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.codesynthesis.com/products/xsd"
 license=('GPL2')
 depends=('boost-libs' 'xerces-c')
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 67602c919..ca8e7f32a 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xterm
 pkgver=301
 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' 'libutempter')
diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD
index 5ef4629a6..ab93903d9 100644
--- a/extra/xvidcore/PKGBUILD
+++ b/extra/xvidcore/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xvidcore
 pkgver=1.3.2
 pkgrel=3
 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/yajl/PKGBUILD b/extra/yajl/PKGBUILD
index 3f1850713..317f51f61 100644
--- a/extra/yajl/PKGBUILD
+++ b/extra/yajl/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=yajl
 pkgver=2.0.4
 pkgrel=2
 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/extra/yakuake/PKGBUILD b/extra/yakuake/PKGBUILD
index 1642a8bd4..6a7fe7479 100644
--- a/extra/yakuake/PKGBUILD
+++ b/extra/yakuake/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=yakuake
 pkgver=2.9.9
 pkgrel=1
 pkgdesc="A drop-down terminal emulator based on KDE konsole technology"
-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 6c0be5bb6..7293c27b4 100644
--- a/extra/yasm/PKGBUILD
+++ b/extra/yasm/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=yasm
 pkgver=1.2.0
 pkgrel=4
 pkgdesc="A rewrite of NASM to allow for multiple syntax supported (NASM, TASM, GAS, etc.)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.tortall.net/projects/yasm/"
 license=('BSD' 'GPL2' 'LGPL2.1' 'PerlArtistic')
 depends=('glibc')
diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD
index 0baa72111..9bb4fe396 100644
--- a/extra/yelp/PKGBUILD
+++ b/extra/yelp/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=yelp
 pkgver=3.10.1
 pkgrel=2
 pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 depends=('webkitgtk' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
          'desktop-file-utils' 'dconf')
 makedepends=('intltool' 'gtk-doc' 'itstool')
diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD
index 2b2edf481..4d0c167c0 100644
--- a/extra/yp-tools/PKGBUILD
+++ b/extra/yp-tools/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=yp-tools
 pkgver=2.14
 pkgrel=3
 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 c2bbc1c08..c1fedbfc3 100644
--- a/extra/ypbind-mt/PKGBUILD
+++ b/extra/ypbind-mt/PKGBUILD
@@ -10,7 +10,7 @@ pkgrel=5
 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' 'yp-tools' 'systemd')
 backup=('etc/yp.conf')
@@ -22,6 +22,7 @@ build() {
 
 	./configure \
 		--prefix=/usr \
+		--build=$CHOST \
 		--sbindir=/usr/bin
 
 	make
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 98420b735..1b84a81ac 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=ypserv
 pkgver=2.31
 pkgrel=2
 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' 'yp-tools')
diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD
index 951dc0f79..81b6b13cf 100644
--- a/extra/zeitgeist/PKGBUILD
+++ b/extra/zeitgeist/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zeitgeist
 pkgver=0.9.14
 pkgrel=1
 pkgdesc="Service logging user activities and events"
-arch=(i686 x86_64)
+arch=(i686 x86_64 mips64el)
 url="http://zeitgeist-project.com/"
 license=(GPL2 LGPL2.1)
 depends=(json-glib telepathy-glib gtk3)
diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD
index 6827a00ae..7c0c12406 100644
--- a/extra/zenity/PKGBUILD
+++ b/extra/zenity/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=zenity
 pkgver=3.10.2
 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 itstool docbook-xsl git gnome-common yelp-tools)
diff --git a/extra/zip/PKGBUILD b/extra/zip/PKGBUILD
index dca110344..48769e74f 100644
--- a/extra/zip/PKGBUILD
+++ b/extra/zip/PKGBUILD
@@ -5,9 +5,9 @@
 pkgname=zip
 pkgver=3.0
 _pkgver=30
-pkgrel=3
+pkgrel=3.1
 pkgdesc="Creates PKZIP-compatible .zip files"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.info-zip.org/Zip.html"
 license=('BSD')
 depends=('bzip2')
diff --git a/extra/zsh/PKGBUILD b/extra/zsh/PKGBUILD
index c7fcc330b..e4ceb0069 100644
--- a/extra/zsh/PKGBUILD
+++ b/extra/zsh/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=zsh
 pkgname=('zsh' 'zsh-doc')
 pkgver=5.0.5
 pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url='http://www.zsh.org/'
 license=('custom')
 makedepends=('pcre' 'libcap' 'gdbm')
diff --git a/extra/zvbi/PKGBUILD b/extra/zvbi/PKGBUILD
index e7819a46b..447b93a97 100644
--- a/extra/zvbi/PKGBUILD
+++ b/extra/zvbi/PKGBUILD
@@ -8,7 +8,7 @@ pkgver=0.2.33
 pkgrel=6
 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')
 source=("http://downloads.sourceforge.net/sourceforge/zapping/${pkgname}-${pkgver}.tar.bz2"
diff --git a/extra/zziplib/PKGBUILD b/extra/zziplib/PKGBUILD
index 0e4077123..f5376730e 100644
--- a/extra/zziplib/PKGBUILD
+++ b/extra/zziplib/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=zziplib
 pkgver=0.13.62
 pkgrel=2
 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/gnome-unstable/anjuta-extras/PKGBUILD b/gnome-unstable/anjuta-extras/PKGBUILD
deleted file mode 100644
index 4ddfa9f55..000000000
--- a/gnome-unstable/anjuta-extras/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 167364 2012-10-01 14:56:44Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=anjuta-extras
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('anjuta')
-makedepends=('intltool' 'gnome-doc-utils')
-install=anjuta-extras.install
-url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('69df64e6e13a6e0683ebaee5a26ee9b9368eda9ed157607d1e6935b52d7f0b9c')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/anjuta-extras/anjuta-extras.install b/gnome-unstable/anjuta-extras/anjuta-extras.install
deleted file mode 100644
index a96048c1d..000000000
--- a/gnome-unstable/anjuta-extras/anjuta-extras.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/anjuta/PKGBUILD b/gnome-unstable/anjuta/PKGBUILD
deleted file mode 100644
index 320888b6e..000000000
--- a/gnome-unstable/anjuta/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 167359 2012-10-01 14:54:15Z heftig $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Harley Laue <losinggeneration@yahoo.com>
-
-pkgbase=anjuta
-pkgname=('libanjuta' 'anjuta')
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
-url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('e810213e2f2847b71e05eb21cdaff6b946e9511cef2105158b428eee47be787a')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package_libanjuta(){
-  pkgdesc="Anjuta runtime library"
-  depends=('gdl')
-  conflicts=('anjuta<3.4.4')
-
-  cd "$pkgbase-$pkgver/libanjuta"
-
-  # j1: Race during linking
-  make -j1 DESTDIR="$pkgdir" install
-}
-
-package_anjuta(){
-  pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
-
-  install=anjuta.install
-
-  cd "$pkgbase-$pkgver"
-  make -j1 DESTDIR="$pkgdir" install
-
-  cd libanjuta
-  make -j1 DESTDIR="$pkgdir" uninstall
-  
-  sed -i "1s|#!/usr/bin/python$|&2|" \
-    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
-}
diff --git a/gnome-unstable/anjuta/anjuta.install b/gnome-unstable/anjuta/anjuta.install
deleted file mode 100644
index 5608d35be..000000000
--- a/gnome-unstable/anjuta/anjuta.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD
deleted file mode 100644
index 68c1e7761..000000000
--- a/gnome-unstable/at-spi2-atk/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168964 2012-10-16 23:00:59Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-atk
-pkgver=2.6.1
-pkgrel=1
-pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
-makedepends=('intltool')
-install=at-spi2-atk.install
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0a796c3635b23d094d488ac3aeee1bd785debfde433640687d4b17dfeaeb3398')
-
-build() {
-  cd $pkgname-$pkgver
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/at-spi2-atk/at-spi2-atk.install b/gnome-unstable/at-spi2-atk/at-spi2-atk.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/gnome-unstable/at-spi2-atk/at-spi2-atk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD
deleted file mode 100644
index 50c633529..000000000
--- a/gnome-unstable/at-spi2-core/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168963 2012-10-16 22:59:59Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-core
-pkgver=2.6.1
-pkgrel=1
-pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dbus-core' 'glib2' 'libxtst')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cb087f0a9191422bc3f44c562a0dbfdf1c2266e45c267070aeb63b874e00f867')
-
-build() {
-  cd $pkgname-$pkgver
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/at-spi2-core --disable-xevie
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/atk/PKGBUILD b/gnome-unstable/atk/PKGBUILD
deleted file mode 100644
index 6a5e8523d..000000000
--- a/gnome-unstable/atk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 167012 2012-09-24 18:34:01Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=atk
-pkgver=2.6.0
-pkgrel=1
-pkgdesc="A library providing a set of interfaces for accessibility"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-url='http://www.gtk.org/'
-sha256sums=('eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/banshee/PKGBUILD b/gnome-unstable/banshee/PKGBUILD
deleted file mode 100644
index 0cce416cd..000000000
--- a/gnome-unstable/banshee/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=banshee
-pkgver=2.6.0
-pkgrel=1
-pkgdesc="Music management and playback for GNOME"
-arch=('i686' 'x86_64')
-url="http://banshee.fm/"
-license=('MIT')
-depends=(libxxf86vm gst-plugins-base mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info gst-plugins-bad mono-upnp)
-makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common')
-optdepends=('gst-plugins-good: Extra media codecs'
-            'gst-plugins-ugly: Extra media codecs'
-            'gst-libav: Extra media codecs'
-            'brasero: CD burning')
-options=('!libtool')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz
-        gst-1.0.patch)
-sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a'
-            'eddf696b0be91331fae8d63c23277a355e94539a3436a8619dab2d732b30234e')
-
-build() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  #https://bugzilla.gnome.org/show_bug.cgi?id=679433
-  patch -Np1 -i "${srcdir}/gst-1.0.patch"
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-docs \
-              --disable-static \
-              --disable-scrollkeeper \
-              --disable-schemas-install \
-              --with-vendor-build-id=ArchLinux
-  make
-}
-
-package() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/gnome-unstable/banshee/banshee-recent-gpod.patch b/gnome-unstable/banshee/banshee-recent-gpod.patch
deleted file mode 100644
index afb3a0fd1..000000000
--- a/gnome-unstable/banshee/banshee-recent-gpod.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d4cd959c4a48ffc9da8fe0983bd31c4647669bf4 Mon Sep 17 00:00:00 2001
-From: William Witt <william@witt-family.net>
-Date: Sat, 30 Jul 2011 21:54:41 -0500
-Subject: [PATCH] - Changed typecast on FileSize to uint in AppleDeviceTrackInfo to comply with libgpod-sharp
-
----
- .../AppleDeviceTrackInfo.cs                        |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-index 178266d..b8549f7 100644
---- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice
-             track.CDs = DiscCount;
-             track.CDNumber = DiscNumber;
-             track.TrackLength = (int) Duration.TotalMilliseconds;
--            track.Size = (int)FileSize;
-+            track.Size = (uint)FileSize;
-             track.Grouping = Grouping;
-             try {
-                 track.TimePlayed = LastPlayed;
--- 
-1.7.3.4
diff --git a/gnome-unstable/banshee/banshee.install b/gnome-unstable/banshee/banshee.install
deleted file mode 100644
index 1d0fd332b..000000000
--- a/gnome-unstable/banshee/banshee.install
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgname=banshee
-
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/banshee/gst-1.0.patch b/gnome-unstable/banshee/gst-1.0.patch
deleted file mode 100644
index f8fa7a7c2..000000000
--- a/gnome-unstable/banshee/gst-1.0.patch
+++ /dev/null
@@ -1,1025 +0,0 @@
-From ec14625f10c26ae3646f382ffd804ee28c3d7334 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Wed, 19 Sep 2012 11:34:06 +0200
-Subject: [PATCH] Initial port to GStreamer 1.0
-
----
- build/m4/banshee/gstreamer.m4                |   19 +++---
- data/audio-profiles/wav.xml.in               |    5 +-
- libbanshee/banshee-bpmdetector.c             |   11 ++--
- libbanshee/banshee-gst.h                     |    4 +-
- libbanshee/banshee-player-cdda.c             |    5 +-
- libbanshee/banshee-player-dvd.c              |    4 +-
- libbanshee/banshee-player-equalizer.c        |    4 +-
- libbanshee/banshee-player-missing-elements.c |    2 +-
- libbanshee/banshee-player-pipeline.c         |   37 ++++++-----
- libbanshee/banshee-player-private.h          |   13 ++--
- libbanshee/banshee-player-replaygain.c       |   29 ++++-----
- libbanshee/banshee-player-video.c            |   89 +++++++++++++-------------
- libbanshee/banshee-player-vis.c              |   88 ++++++++-----------------
- libbanshee/banshee-player.c                  |   11 ++--
- libbanshee/banshee-ripper.c                  |   16 ++---
- libbanshee/banshee-tagger.c                  |    2 +-
- libbanshee/banshee-transcoder.c              |   19 +++---
- 17 files changed, 156 insertions(+), 202 deletions(-)
-
-diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
-index 6267cce..917cf58 100644
---- a/build/m4/banshee/gstreamer.m4
-+++ b/build/m4/banshee/gstreamer.m4
-@@ -1,17 +1,18 @@
- AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
- [
--	GSTREAMER_REQUIRED_VERSION=0.10.26
-+	GSTREAMER_REQUIRED_VERSION=0.11.99
- 	AC_SUBST(GSTREAMER_REQUIRED_VERSION)
- 
- 	PKG_CHECK_MODULES(GST,
--		gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
--
--	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
-+		gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION)
- 
- 	AC_SUBST(GST_CFLAGS)
- 	AC_SUBST(GST_LIBS)
-diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in
-index 35cd1d2..6dc1bab 100644
---- a/data/audio-profiles/wav.xml.in
-+++ b/data/audio-profiles/wav.xml.in
-@@ -14,10 +14,7 @@
-                 "audioresample"
-                 "audioconvert" 
-                 (+ "audio/x-raw-int, "
--                   "endianness=(int)1234, "
--                   "width=(int)16, "
--                   "depth=(int)16, "
--                   "signed=(boolean)true, "
-+                   "format=(string)S16LE, "
-                    "rate=(int)44100, "
-                    "channels=(int)2" )
-                 "wavenc")
-diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c
-index c06ffcb..68b0419 100644
---- a/libbanshee/banshee-bpmdetector.c
-+++ b/libbanshee/banshee-bpmdetector.c
-@@ -30,6 +30,7 @@
- #  include "config.h"
- #endif
- 
-+#include <stdio.h>
- #include <string.h>
- #include <glib/gi18n.h>
- 
-@@ -50,7 +51,7 @@ struct BansheeBpmDetector {
- 
-     /*
-      * You can run this pipeline on the cmd line with:
--     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \
-+     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \
-      *    audioconvert ! bpmdetect ! fakesink
-      */
- 
-@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad,
- 
-     g_return_if_fail(detector != NULL);
- 
--    audiopad = gst_element_get_pad(detector->audioconvert, "sink");
-+    audiopad = gst_element_get_static_pad(detector->audioconvert, "sink");
-     
-     if(GST_PAD_IS_LINKED(audiopad)) {
-         g_object_unref(audiopad);
-         return;
-     }
- 
--    caps = gst_pad_get_caps(pad);
-+    caps = gst_pad_query_caps(pad, NULL);
-     str = gst_caps_get_structure(caps, 0);
-     
-     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
-@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector)
-         return FALSE;
-     }
-   
--    detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2");
-+    detector->decodebin = gst_element_factory_make ("decodebin", "decodebin");
-     if (detector->decodebin == NULL) {
--        bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL);
-+        bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL);
-         return FALSE;
-     }
- 
-diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h
-index 85662cf..332f356 100644
---- a/libbanshee/banshee-gst.h
-+++ b/libbanshee/banshee-gst.h
-@@ -41,9 +41,11 @@
- #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \
-     gboolean iter##_done = FALSE; \
-     while (!iter##_done) { \
-+        GValue child_value = {0, }; \
-         child_type child_name; \
--        switch (gst_iterator_next (iter, (gpointer)&child_name)) { \
-+        switch (gst_iterator_next (iter, &child_value)) { \
-             case GST_ITERATOR_OK: { \
-+                child_name = (child_type) g_value_get_object(&child_value); \
-                 { block; } \
-                 break; \
-             } \
-diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c
-index 8be2bdd..401edf0 100644
---- a/libbanshee/banshee-player-cdda.c
-+++ b/libbanshee/banshee-player-cdda.c
-@@ -28,7 +28,8 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
--#include <gst/cdda/gstcddabasesrc.h>
-+#include <stdlib.h>
-+#include <gst/audio/gstaudiocdsrc.h>
- #include "banshee-player-cdda.h"
- 
- // ---------------------------------------------------------------------------
-@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin)
-     
-     g_object_get (playbin, "source", &source, NULL);
-     
--    if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) {
-+    if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) {
-         if (source != NULL) {
-             g_object_unref (source);
-         }
-diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c
-index 55d499c..991b506 100644
---- a/libbanshee/banshee-player-dvd.c
-+++ b/libbanshee/banshee-player-dvd.c
-@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player)
- {
-     gint64 index;
-     GstFormat format = gst_format_get_by_nick ("chapter");
--    gst_element_query_position (player->playbin, &format, &index);
-+    gst_element_query_position (player->playbin, format, &index);
-     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
-         GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0);
- }
-@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player)
- {
-     gint64 index;
-     GstFormat format = gst_format_get_by_nick ("chapter");
--    gst_element_query_position (player->playbin, &format, &index);
-+    gst_element_query_position (player->playbin, format, &index);
-     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
-         GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0);
- }
-diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c
-index a496ada..0cbb3b7 100644
---- a/libbanshee/banshee-player-equalizer.c
-+++ b/libbanshee/banshee-player-equalizer.c
-@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain)
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     
-     if (player->equalizer != NULL) {
--        GstObject *band;
-+        GObject *band;
- 
-         g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)));
- 
-@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq)
-     count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer));
-     
-     for (i = 0; i < count; i++) {
--        GstObject *band;
-+        GObject *band;
-         
-         band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i);
-         g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL);
-diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
-index 20804c4..30118c5 100644
---- a/libbanshee/banshee-player-missing-elements.c
-+++ b/libbanshee/banshee-player-missing-elements.c
-@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
-     }
-     #endif
-     
--    install_return = gst_install_plugins_async (details, player->install_plugins_context, 
-+    install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, 
-         bp_missing_elements_handle_install_result, player);
-     
-     if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) {
-diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index ed845f3..6c2af35 100644
---- a/libbanshee/banshee-player-pipeline.c
-+++ b/libbanshee/banshee-player-pipeline.c
-@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player)
-     GstMessage *msg;
- 
-     // We're being called from the streaming thread, so don't do anything here
--    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL));
-+    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed"));
-     gst_element_post_message (player->playbin, msg);
- }
- 
-@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
-             break;
-         }
- 
-+        case GST_MESSAGE_STREAM_START: {
-+            bp_next_track_starting (player);
-+            break;
-+        }
-+
-         case GST_MESSAGE_APPLICATION: {
-             const gchar * name;
-             const GstStructure * s = gst_message_get_structure (message);
-@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player)
-     
-     // Playbin is the core element that handles autoplugging (finding the right
-     // source and decoder elements) based on source URI and stream content
--    player->playbin = gst_element_factory_make ("playbin2", "playbin");
-+    player->playbin = gst_element_factory_make ("playbin", "playbin");
- 
- #ifdef ENABLE_GAPLESS
-     // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback.
--    // This can be removed once playbin2 generates its own next-track signal.
-+    // This can be removed once playbin generates its own next-track signal.
-     // bgo#584987 - this is included in >= 0.10.26
-     g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player);
- #endif //ENABLE_GAPLESS
-@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player)
-     g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player);
-     g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player);
- 
--    // Try to find an audio sink, prefer gconf, which typically is set to auto these days,
--    // fall back on auto, which should work on windows, and as a last ditch, try alsa
--    audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink");
--    if (audiosink == NULL) {
--        audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
--        if (audiosink != NULL) {
--            g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
--        } else {
--            audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
--            if (audiosink == NULL) {
--                audiosink = gst_element_factory_make ("alsasink", "audiosink");
--            }
-+    audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
-+    if (audiosink != NULL) {
-+        g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
-+    } else {
-+        audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
-+        if (audiosink == NULL) {
-+            audiosink = gst_element_factory_make ("alsasink", "audiosink");
-         }
-     }
-     
-@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player)
-         GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink));
-         BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, {
-             player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL;
--            gst_object_unref (element);
-         });
-     }
-     bp_debug ("Audiosink has volume: %s",
-@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player)
-     }
-    
-     // Ghost pad the audio bin so audio is passed from the bin into the tee
--    teepad = gst_element_get_pad (player->audiotee, "sink");
-+    teepad = gst_element_get_static_pad (player->audiotee, "sink");
-     gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad));
-     gst_object_unref (teepad);
- 
-@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player)
-     gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
- 
-     // Link the first tee pad to the primary audio sink queue
--    GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink");
--    pad = gst_element_get_request_pad (player->audiotee, "src%d");
-+    GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink");
-+    pad = gst_element_get_request_pad (player->audiotee, "src_%u");
-     g_object_set(player->audiotee, "alloc-pad", pad, NULL);
-     gst_pad_link (pad, sinkpad);
-     gst_object_unref (GST_OBJECT (pad));
-diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h
-index 9fed356..9346911 100644
---- a/libbanshee/banshee-player-private.h
-+++ b/libbanshee/banshee-player-private.h
-@@ -42,14 +42,14 @@
- #include <gst/fft/gstfftf32.h>
- #include <gst/pbutils/pbutils.h>
- #include <gst/tag/tag.h>
--#include <gst/interfaces/navigation.h>
-+#include <gst/video/navigation.h>
- 
- #if defined(GDK_WINDOWING_X11)
- #  include <gdk/gdkx.h>
--#  include <gst/interfaces/xoverlay.h>
-+#  include <gst/video/videooverlay.h>
- #elif defined(GDK_WINDOWING_WIN32)
- #  include <gdk/gdkwin32.h>
--#  include <gst/interfaces/xoverlay.h>
-+#  include <gst/video/videooverlay.h>
- #endif
- 
- #include "banshee-gst.h"
-@@ -155,11 +155,11 @@ struct BansheePlayer {
-     // Video State
-     BpVideoDisplayContextType video_display_context_type;
-     #if defined(GDK_WINDOWING_X11)
--    GstXOverlay *xoverlay;
-+    GstVideoOverlay *video_overlay;
-     GdkWindow *video_window;
-     XID video_window_xid;
-     #elif defined(GDK_WINDOWING_WIN32)
--    GstXOverlay *xoverlay;
-+    GstVideoOverlay *video_overlay;
-     GdkWindow *video_window;
-     HWND video_window_xid;
-     #endif
-@@ -179,6 +179,8 @@ struct BansheePlayer {
-     GstFFTF32 *vis_fft;
-     GstFFTF32Complex *vis_fft_buffer;
-     gfloat *vis_fft_sample_buffer;
-+    GstPad *vis_event_probe_pad;
-+    gulong vis_event_probe_id;
-     
-     // Plugin Installer State
-     GdkWindow *window;
-@@ -197,6 +199,7 @@ struct BansheePlayer {
-     // http://replaygain.hydrogenaudio.org/player_scale.html
-     gdouble rg_gain_history[10];
-     gint history_size;
-+    gulong rg_pad_block_id;
- 
-     //dvd navigation
-     GstNavigation *navigation;
-diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c
-index a479d4a..e42b197 100644
---- a/libbanshee/banshee-player-replaygain.c
-+++ b/libbanshee/banshee-player-replaygain.c
-@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban
-     _bp_rgvolume_print_volume (player);
- }
- 
--static void
--pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-+static GstPadProbeReturn
-+pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data)
- {
-     BansheePlayer* player;
- 
--    if (!blocked) {
--        return;
--    }
--
-     player = (BansheePlayer*) user_data;
--    g_return_if_fail (IS_BANSHEE_PLAYER (player));
-+    g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK);
- 
-     // The pad_block_cb can get triggered multiple times, on different threads.
-     // Lock around the link/unlink code, so we don't end up going through here
-@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-     if ((player->replaygain_enabled && player->rgvolume_in_pipeline) ||
-         (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) {
-         // The pipeline is already in the correct state.  Unblock the pad, and return.
-+        player->rg_pad_block_id = 0;
-         g_mutex_unlock (player->replaygain_mutex);
--        if (gst_pad_is_blocked (srcPad)) {
--            gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
--        }
--        return;
-+        return GST_PAD_PROBE_REMOVE;
-     }
- 
-     if (player->rgvolume_in_pipeline) {
-@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-     }
- 
-     // Our state is now consistent
-+    player->rg_pad_block_id = 0;
-     g_mutex_unlock (player->replaygain_mutex);
- 
--    if (gst_pad_is_blocked (srcPad)) {
--        gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
--    }
--
-     _bp_rgvolume_print_volume (player);
-+
-+    return GST_PAD_PROBE_REMOVE;
- }
- 
- // ---------------------------------------------------------------------------
-@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player)
-     srcPad = gst_element_get_static_pad (player->before_rgvolume, "src");
- 
-     if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) {
--        gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player);
--    } else if (srcPad->block_callback == NULL) {
--        pad_block_cb (srcPad, TRUE, player);
-+        player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL);
-+    } else if (!player->rg_pad_block_id) {
-+        pad_block_cb (srcPad, NULL, player);
-     }
- }
- 
-diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c
-index b901354..eb95c3f 100644
---- a/libbanshee/banshee-player-video.c
-+++ b/libbanshee/banshee-player-video.c
-@@ -37,54 +37,54 @@
- #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
- 
- static gboolean
--bp_video_find_xoverlay (BansheePlayer *player)
-+bp_video_find_video_overlay (BansheePlayer *player)
- {
-     GstElement *video_sink = NULL;
--    GstElement *xoverlay;
--    GstXOverlay *previous_xoverlay;
--    gboolean    found_xoverlay;
-+    GstElement *video_overlay;
-+    GstVideoOverlay *previous_video_overlay;
-+    gboolean    found_video_overlay;
- 
-     g_object_get (player->playbin, "video-sink", &video_sink, NULL);
- 
-     g_mutex_lock (player->video_mutex);
--    previous_xoverlay = player->xoverlay;
-+    previous_video_overlay = player->video_overlay;
- 
-     if (video_sink == NULL) {
--        player->xoverlay = NULL;
--        if (previous_xoverlay != NULL) {
--            gst_object_unref (previous_xoverlay);
-+        player->video_overlay = NULL;
-+        if (previous_video_overlay != NULL) {
-+            gst_object_unref (previous_video_overlay);
-         }
-         g_mutex_unlock (player->video_mutex);
-         return FALSE;
-     }
-    
--    xoverlay = GST_IS_BIN (video_sink)
--        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY)
-+    video_overlay = GST_IS_BIN (video_sink)
-+        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY)
-         : video_sink;
-     
--    player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL;
-+    player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL;
-     
--    if (previous_xoverlay != NULL) {
--        gst_object_unref (previous_xoverlay);
-+    if (previous_video_overlay != NULL) {
-+        gst_object_unref (previous_video_overlay);
-     }
-         
- #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink
--    if (player->xoverlay != NULL && g_object_class_find_property (
--        G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) {
--        g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL);
-+    if (player->video_overlay != NULL && g_object_class_find_property (
-+        G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) {
-+        g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL);
-     }
- #endif
-     
--    if (player->xoverlay != NULL && g_object_class_find_property (
--        G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) {
--        g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL);
-+    if (player->video_overlay != NULL && g_object_class_find_property (
-+        G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) {
-+        g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL);
-     }
- 
-     gst_object_unref (video_sink);
--    found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE;
-+    found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE;
- 
-     g_mutex_unlock (player->video_mutex);
--    return found_xoverlay;
-+    return found_video_overlay;
- }
- 
- #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */
-@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
- 
-     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
--    bp_video_find_xoverlay (player);
-+    bp_video_find_video_overlay (player);
-     #endif
- }
- 
- static void
- bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player)
- {
--    gboolean found_xoverlay;
-+    gboolean found_video_overlay;
-     
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
- 
-     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
- 
--    if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) {
-+    if (!gst_is_video_overlay_prepare_window_handle_message (message)) {
-         return;
-     }
- 
--    found_xoverlay = bp_video_find_xoverlay (player);
-+    found_video_overlay = bp_video_find_video_overlay (player);
- 
--    if (found_xoverlay) {
--        gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
-+    if (found_video_overlay) {
-+        gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
-     }
- 
-     #endif
-@@ -164,7 +164,7 @@ static void
- cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p)
- {
-     GstStructure * s = NULL;
--    GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj));
-+    GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj));
- 
-     if (G_UNLIKELY (!caps)) {
-         return;
-@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player)
-     }
- 
-     if (G_LIKELY (vpad)) {
--        GstCaps *caps = gst_pad_get_negotiated_caps (vpad);
-+        GstCaps *caps = gst_pad_get_current_caps (vpad);
-         if (G_LIKELY (caps)) {
-             cb_caps_set (G_OBJECT (vpad), NULL, player);
-             gst_caps_unref (caps);
-@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus)
- 
-     player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW;
-     
--    videosink = gst_element_factory_make ("gconfvideosink", "videosink");
-+    videosink = gst_element_factory_make ("autovideosink", "videosink");
-     if (videosink == NULL) {
--        videosink = gst_element_factory_make ("autovideosink", "videosink");
--        if (videosink == NULL) {
--            player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
--            videosink = gst_element_factory_make ("fakesink", "videosink");
--            if (videosink != NULL) {
--                g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
--            }
-+        player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
-+        videosink = gst_element_factory_make ("fakesink", "videosink");
-+        if (videosink != NULL) {
-+            g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
-         }
-     }
-     
-     g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL);
-     
--    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player);
-+    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL);
-     g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player);
-         
-     if (GST_IS_BIN (videosink)) {
-@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc
- {
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     
--    if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) {
--        gst_x_overlay_expose (player->xoverlay);
-+    if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) {
-+        gst_video_overlay_expose (player->video_overlay);
-         return;
-     }
- 
--    if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) {
-+    if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) {
-         return;
-     }
-     
--    gst_object_ref (player->xoverlay);
-+    gst_object_ref (player->video_overlay);
- 
--    gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
--    gst_x_overlay_expose (player->xoverlay);
-+    gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
-+    gst_video_overlay_expose (player->video_overlay);
- 
--    gst_object_unref (player->xoverlay);
-+    gst_object_unref (player->video_overlay);
- }
- 
- // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing.
-@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window)
- //    //Explicitly create the native window.  GDK_WINDOW_XWINDOW will call this
- //    //function anyway, but this way we can raise a more useful message should it fail.
- //    if (!gdk_window_ensure_native (window)) {
--//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!");
-+//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!");
- //    }
- //#endif
- 
-diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c
-index 5787c87..7e7dc78 100644
---- a/libbanshee/banshee-player-vis.c
-+++ b/libbanshee/banshee-player-vis.c
-@@ -27,17 +27,17 @@
- //
- 
- #include <math.h>
-+#include <gst/audio/audio.h>
- 
- #include "banshee-player-vis.h"
- 
- #define SLICE_SIZE 735
- 
- static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS (
--    "audio/x-raw-float, "
-+    "audio/x-raw, "
-+    "format = (string) " GST_AUDIO_NE(F32) ", "
-     "rate = (int) 44100, "
--    "channels = (int) 2, "
--    "endianness = (int) BYTE_ORDER, "
--    "width = (int) 32"
-+    "channels = (int) 2"
- );
- 
- // ---------------------------------------------------------------------------
-@@ -48,6 +48,7 @@ static void
- bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata)
- {
-     BansheePlayer *player = (BansheePlayer*)userdata;
-+    GstCaps *caps;
-     GstStructure *structure;
-     gint channels, wanted_size;
-     gfloat *data;
-@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
-         player->vis_thawing = FALSE;
-     }
-     
--    structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0);
-+    caps = gst_pad_get_current_caps (pad);
-+    structure = gst_caps_get_structure (caps, 0);
-     gst_structure_get_int (structure, "channels", &channels);
-+    gst_caps_unref (caps);
-     
-     wanted_size = channels * SLICE_SIZE * sizeof (gfloat);
- 
--    gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer));
-+    gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer));
-     
--    while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) {
-+    while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) {
-         gfloat *deinterlaced = g_malloc (wanted_size);
-         gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2);
- 
-@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
-         g_free (deinterlaced);
-         g_free (specbuf);
- 
-+        gst_adapter_unmap (player->vis_buffer);
-         gst_adapter_flush (player->vis_buffer, wanted_size);
-     }
- }
-@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
- // Internal Functions
- // ---------------------------------------------------------------------------
- 
--static void
--_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data)
-+static GstPadProbeReturn
-+_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data)
- {
-     BansheePlayer *player = (BansheePlayer *) data;
-+    GstEvent *event;
- 
--    if (!blocked) {
--        // Set thawing mode (discards buffers that are too old from the queue).
--        player->vis_thawing = TRUE;
--    }
--}
--
--static void
--_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked)
--{
--    GstPad *queue_sink;
--
--    if (player->vis_resampler == NULL)
--        return;
--
--    queue_sink = gst_element_get_static_pad (player->vis_resampler, "src");
--
--    gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player);
--
--    gst_object_unref (GST_OBJECT (queue_sink));
--}
--
--static gboolean
--_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data)
--{
--    BansheePlayer *player = (BansheePlayer *) data;
-+    if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0)
-+        return GST_PAD_PROBE_PASS;
- 
-+    event = GST_EVENT (info->data);
-     switch (GST_EVENT_TYPE (event)) {
-         case GST_EVENT_FLUSH_START:
-         case GST_EVENT_FLUSH_STOP:
-         case GST_EVENT_SEEK:
--        case GST_EVENT_NEWSEGMENT:
-+        case GST_EVENT_SEGMENT:
-         case GST_EVENT_CUSTOM_DOWNSTREAM:
-             player->vis_thawing = TRUE;
- 
-         default: break;
-     }
- 
--    if (player->vis_enabled)
--        return TRUE;
--
--    switch (GST_EVENT_TYPE (event)) {
--    case GST_EVENT_EOS:
--    case GST_EVENT_CUSTOM_DOWNSTREAM_OOB:
--        _bp_vis_pipeline_set_blocked (player, FALSE);
--        break;
--    case GST_EVENT_CUSTOM_DOWNSTREAM:
--    case GST_EVENT_NEWSEGMENT:
--        _bp_vis_pipeline_set_blocked (player, TRUE);
--        break;
--
--    default: break;
--    }
--
--    return TRUE;
-+    return GST_PAD_PROBE_PASS;
- }
- 
- void
-@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     // Core elements, if something fails here, it's the end of the world
-     audiosinkqueue = gst_element_factory_make ("queue", "vis-queue");
- 
--    pad = gst_element_get_static_pad (audiosinkqueue, "sink");
--    gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player);
--    gst_object_unref (GST_OBJECT (pad));
-+    player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink");
-+    player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL);
- 
-     resampler = gst_element_factory_make ("audioresample", "vis-resample");
-     converter = gst_element_factory_make ("audioconvert", "vis-convert");
-@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-                       converter, fakesink, NULL);
-     
-     pad = gst_element_get_static_pad (audiosinkqueue, "sink");
--    teepad = gst_element_get_request_pad (player->audiotee, "src%d");
-+    teepad = gst_element_get_request_pad (player->audiotee, "src_%u");
-     gst_pad_link (teepad, pad);
-     gst_object_unref (GST_OBJECT (teepad));
-     gst_object_unref (GST_OBJECT (pad));
-@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     player->vis_resampler = resampler;
-     player->vis_thawing = FALSE;
-     player->vis_enabled = FALSE;
--
--    // Disable the pipeline till we hear otherwise from managed land.
--    _bp_vis_pipeline_set_blocked (player, TRUE);
- }
- 
- void
- _bp_vis_pipeline_destroy (BansheePlayer *player)
- {
-+    if (player->vis_event_probe_pad) {
-+        gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id);
-+        gst_object_unref (GST_OBJECT (player->vis_event_probe_pad));
-+        player->vis_event_probe_pad = NULL;
-+    }
-+
-     if (player->vis_buffer != NULL) {
-         gst_object_unref (player->vis_buffer);
-         player->vis_buffer = NULL;
-@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb
- 
-     player->vis_data_cb = cb;
- 
--    _bp_vis_pipeline_set_blocked (player, cb == NULL);
-     player->vis_enabled = cb != NULL;
- }
-diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
-index c655a72..b8f98b8 100644
---- a/libbanshee/banshee-player.c
-+++ b/libbanshee/banshee-player.c
-@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms)
- P_INVOKE guint64
- bp_get_position (BansheePlayer *player)
- {
--    static GstFormat format = GST_FORMAT_TIME;
-     gint64 position;
- 
-     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
- 
--    if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) {
-+    if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) {
-         return position / GST_MSECOND;
-     }
-     
-@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player)
- P_INVOKE guint64
- bp_get_duration (BansheePlayer *player)
- {
--    static GstFormat format = GST_FORMAT_TIME;
-     gint64 duration;
- 
-     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
- 
--    if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) {
-+    if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) {
-         return duration / GST_MSECOND;
-     }
-     
-@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     gint64 pos = -1;
-     GstState state;
--    GstFormat format = GST_FORMAT_BYTES;
-     gboolean paused = FALSE;
- 
-     // Gstreamer playbin do not support to set suburi during playback
-@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     gst_element_get_state (player->playbin, &state, NULL, 0);
-     paused = (state == GST_STATE_PAUSED);
-     if (state >= GST_STATE_PAUSED) {
--        gst_element_query_position (player->playbin, &format, &pos);
-+        gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos);
-         gst_element_set_state (player->playbin, GST_STATE_READY);
-         // Force to wait asynch operation
-         gst_element_get_state (player->playbin, &state, NULL, -1);
-@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     gst_element_get_state (player->playbin, &state, NULL, -1);
- 
-     if (pos != -1) {
--        gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
-+        gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
-     }
- }
- 
-diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c
-index e0e8c85..b3f8fed 100644
---- a/libbanshee/banshee-ripper.c
-+++ b/libbanshee/banshee-ripper.c
-@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug)
- static gboolean
- br_iterate_timeout (BansheeRipper *ripper)
- {
--    GstFormat format = GST_FORMAT_TIME;
-     GstState state;
-     gint64 position;
-     
-@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper)
-         return TRUE;
-     }
- 
--    if (!gst_element_query_position (ripper->cddasrc, &format, &position)) {
-+    if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) {
-         return TRUE;
-     }
-     
-@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin)
-         GstIterator *pad_iter = gst_element_iterate_src_pads (element);
-         
-         BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, {
--            GstStructure *str = GST_PAD_CAPS (pad) != NULL
--                ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0)
-+            GstCaps *caps = gst_pad_get_current_caps (pad);
-+            GstStructure *str = caps != NULL
-+                ? gst_caps_get_structure (caps, 0)
-                 : NULL;
- 
-             if (str != NULL) {
-@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin)
-                     preferred_mimetype = mimetype;    
-                 }
-             }
--            
--            gst_object_unref (pad);
-+            gst_caps_unref (caps);
-         });
--        
--        gst_object_unref (element);
-     });
- 
-     return preferred_mimetype;
-@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper)
-         return FALSE;
-     }
- 
--    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc");
-+    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL);
-     if (ripper->cddasrc == NULL) {
-         br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL);
-         return FALSE;
-@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path,
-             
-             // We'll warn the user in the UI if we can't tag the encoded audio files
-             *tagging_supported = TRUE;
--            gst_object_unref (element);
-         }
-     });
-     
-diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c
-index ca15e8f..762dfa9 100644
---- a/libbanshee/banshee-tagger.c
-+++ b/libbanshee/banshee-tagger.c
-@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata
- GstTagList *
- bt_tag_list_new ()
- {
--    return gst_tag_list_new ();
-+    return gst_tag_list_new_empty ();
- }
- 
- void
-diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
-index 10fc35c..0e241f0 100644
---- a/libbanshee/banshee-transcoder.c
-+++ b/libbanshee/banshee-transcoder.c
-@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const
- static gboolean
- gst_transcoder_iterate_timeout(GstTranscoder *transcoder)
- {
--    GstFormat format = GST_FORMAT_TIME;
-     gint64 position;
-     gint64 duration;
- 
-     g_return_val_if_fail(transcoder != NULL, FALSE);
- 
--    if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) ||
--        !gst_element_query_position(transcoder->sink_bin, &format, &position)) {
-+    if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) ||
-+        !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) {
-         return TRUE;
-     }
- 
-@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad,
- 
-     g_return_if_fail(transcoder != NULL);
- 
--    audiopad = gst_element_get_pad(transcoder->sink_bin, "sink");
-+    audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink");
-     
-     if(GST_PAD_IS_LINKED(audiopad)) {
-         g_object_unref(audiopad);
-         return;
-     }
- 
--    caps = gst_pad_get_caps(pad);
-+    caps = gst_pad_query_caps(pad, NULL);
-     str = gst_caps_get_structure(caps, 0);
-     
-     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
-@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
-     
-     transcoder->pipeline = gst_pipeline_new("pipeline");
- 
--    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source");
-+    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL);
-     if(source_elem == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL);
-         return FALSE;
-     }
- 
--    decoder_elem = gst_element_factory_make("decodebin2", "decodebin2");
-+    decoder_elem = gst_element_factory_make("decodebin", "decodebin");
-     if(decoder_elem == NULL) {
--        gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL);
-+        gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL);
-         return FALSE;
-     }
-     
--    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink");
-+    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL);
-     if(sink_elem == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL);
-         return FALSE;
-@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
-          return FALSE;
-     }
- 
--    encoder_pad = gst_element_get_pad(conv_elem, "sink");
-+    encoder_pad = gst_element_get_static_pad(conv_elem, "sink");
-     if(encoder_pad == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL);
-         return FALSE;
--- 
-1.7.10.4
\ No newline at end of file
diff --git a/gnome-unstable/baobab/PKGBUILD b/gnome-unstable/baobab/PKGBUILD
deleted file mode 100644
index 07dc54250..000000000
--- a/gnome-unstable/baobab/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168956 2012-10-16 22:50:28Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=baobab
-pkgver=3.6.2
-pkgrel=1
-pkgdesc="A graphical directory tree analyzer"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8ffef397f11fb1e7105d1429be828e88b9ceb5746984f0bb978e66e87faf047a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/baobab/baobab.install b/gnome-unstable/baobab/baobab.install
deleted file mode 100644
index 5a3c24041..000000000
--- a/gnome-unstable/baobab/baobab.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/brasero/PKGBUILD b/gnome-unstable/brasero/PKGBUILD
deleted file mode 100644
index 13831b8d1..000000000
--- a/gnome-unstable/brasero/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 167336 2012-10-01 12:07:27Z jgc $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=brasero
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A disc burning application for Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/projects/brasero"
-license=('GPL')
-options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gst-plugins-base' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
-optdepends=('libburn: alternative back-end'
-            'libisofs: libburn back-end'
-            'dvdauthor: video project'
-            'gstreamer0.10-bad-plugins: video project'
-            'vcdimager: video project')
-replaces=('nautilus-cd-burner')
-install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1eb16f85c5663f3f38ee60516759c0980024b893af9ec7875d31208a53c12b3b')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-caches \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/gnome-unstable/brasero/brasero.install b/gnome-unstable/brasero/brasero.install
deleted file mode 100644
index 9248062f7..000000000
--- a/gnome-unstable/brasero/brasero.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/cheese/PKGBUILD b/gnome-unstable/cheese/PKGBUILD
deleted file mode 100644
index 7dfb23c44..000000000
--- a/gnome-unstable/cheese/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168959 2012-10-16 22:57:07Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cheese
-pkgver=3.6.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)
-license=('GPL')
-depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto')
-optdepends=('nautilus-sendto: Send snapshots'
-            'frei0r-plugins: More camera effects')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/projects/cheese/"
-install=cheese.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2db101cd16ce41764eb2f676c1bed94e58e4a89141785b95ff088b60bcf6abef')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/cheese/cheese.install b/gnome-unstable/cheese/cheese.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/gnome-unstable/cheese/cheese.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/clutter-gst/PKGBUILD b/gnome-unstable/clutter-gst/PKGBUILD
deleted file mode 100644
index ce2d5b634..000000000
--- a/gnome-unstable/clutter-gst/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167163 2012-09-26 17:32:54Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=clutter-gst
-pkgver=1.9.92
-pkgrel=1
-pkgdesc="GStreamer bindings for clutter"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org/"
-license=('LGPL')
-depends=('clutter' 'gst-plugins-base-libs' 'libxdamage')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5c09dce218f711a44bd4d741e2dd10ffc47e7fcd7b0cf514ca0e92b825c76c45')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/clutter-gtk/PKGBUILD b/gnome-unstable/clutter-gtk/PKGBUILD
deleted file mode 100644
index fd840b7f3..000000000
--- a/gnome-unstable/clutter-gtk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169095 2012-10-17 22:31:18Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=clutter-gtk
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk3')
-makedepends=('gobject-introspection')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d51c4bb6a6ad0a337976766383f97a1c905a37bd77b3dbf484a7314130d97b6e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD
deleted file mode 100644
index ab4db9331..000000000
--- a/gnome-unstable/clutter/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 168983 2012-10-17 09:16:01Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=clutter
-pkgver=1.12.2
-pkgrel=1
-pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi')
-makedepends=('gobject-introspection' 'mesa')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-introspection
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/colord-gtk/PKGBUILD b/gnome-unstable/colord-gtk/PKGBUILD
deleted file mode 100644
index 35de482ba..000000000
--- a/gnome-unstable/colord-gtk/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167097 2012-09-25 11:36:27Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=colord-gtk
-pkgver=0.1.23
-pkgrel=1
-pkgdesc="GTK integration for libcolord"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'gtk3' 'colord')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha1sums=('71fd56b34ba91ddf76c1ac394c2a31fa5e24770c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/colord/PKGBUILD b/gnome-unstable/colord/PKGBUILD
deleted file mode 100644
index d51085cf5..000000000
--- a/gnome-unstable/colord/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 167094 2012-09-25 11:25:42Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=colord
-pkgver=0.1.23
-pkgrel=1
-pkgdesc="Color daemon"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha1sums=('08019c86f89b1675e4e155772cc555ed748f319e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  
-  # put udev files in /usr/lib
-  sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-  
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install \
-    bashcompletiondir=/usr/share/bash-completion/completions
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/dconf/PKGBUILD b/gnome-unstable/dconf/PKGBUILD
deleted file mode 100644
index 4538f2a5e..000000000
--- a/gnome-unstable/dconf/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167916 2012-10-03 20:02:18Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=dconf
-pkgver=0.14.0
-pkgrel=1
-pkgdesc="A low-level configuration system."
-arch=(i686 x86_64)
-url="http://live.gnome.org/dconf"
-license=('LGPL2.1')
-depends=('glib2' 'gtk-update-icon-cache')
-makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl')
-optdepends=('gtk3: for dconf-editor')
-install=dconf.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9ae848bf25c3de0fb8c0157679630ddf39be1c10ed2f3beb2b8f0165d768da33')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/dconf
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/dconf/dconf.install b/gnome-unstable/dconf/dconf.install
deleted file mode 100644
index 75d713d64..000000000
--- a/gnome-unstable/dconf/dconf.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    gio-querymodules /usr/lib/gio/modules
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade(){
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/devhelp/PKGBUILD b/gnome-unstable/devhelp/PKGBUILD
deleted file mode 100644
index c6aaf552f..000000000
--- a/gnome-unstable/devhelp/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 167107 2012-09-25 11:54:01Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=devhelp
-pkgver=3.6.0
-pkgrel=2
-pkgdesc="API documentation browser for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'webkitgtk3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'python2')
-options=('!libtool' '!emptydirs')
-install=devhelp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bf0576d5d70496367ccb22be53be620bbfe341bd491c1d725cfb59d566769fe1')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-webkit2
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/devhelp/devhelp.install b/gnome-unstable/devhelp/devhelp.install
deleted file mode 100644
index 4db5f6e5c..000000000
--- a/gnome-unstable/devhelp/devhelp.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=devhelp
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/gnome-unstable/empathy/PKGBUILD b/gnome-unstable/empathy/PKGBUILD
deleted file mode 100644
index f193fd00c..000000000
--- a/gnome-unstable/empathy/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 168311 2012-10-08 12:42:52Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=empathy
-pkgver=3.6.0.2
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-rakia: SIP support'
-            'telepathy-haze: libpurple support'
-            'nautilus-sendto: Send files from nautilus')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3c27db67236249e60ee0439d6a1098729939731ce597b724a058c8ce2eb659f9')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-schemas-compile \
-      --enable-gst-1.0=yes
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/empathy/empathy.install b/gnome-unstable/empathy/empathy.install
deleted file mode 100644
index f8d2dfb1f..000000000
--- a/gnome-unstable/empathy/empathy.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_remove() {
-    post_upgrade
-}
diff --git a/gnome-unstable/eog-plugins/PKGBUILD b/gnome-unstable/eog-plugins/PKGBUILD
deleted file mode 100644
index fb0e2b4cd..000000000
--- a/gnome-unstable/eog-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168987 2012-10-17 09:54:32Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=eog-plugins
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Plugins for Eye of Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/"
-license=('GPL2')
-depends=('eog' 'libchamplain' 'libgdata')
-makedepends=('intltool')
-install=eog-plugins.install
-options=('!libtool')
-groups=(gnome-extra)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/eog-plugins/eog-plugins.install b/gnome-unstable/eog-plugins/eog-plugins.install
deleted file mode 100644
index 24072f316..000000000
--- a/gnome-unstable/eog-plugins/eog-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/eog/PKGBUILD b/gnome-unstable/eog/PKGBUILD
deleted file mode 100644
index c9bce2cb6..000000000
--- a/gnome-unstable/eog/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168989 2012-10-17 10:04:08Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=eog
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool' 'itstool')
-install=eog.install
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4442ec61b0c5092c686ccd13038359eb50e48ee49176a588b8ea04072c19bd57')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # remove it from Xfce menu that ships its own thingy
-  echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop
-}
diff --git a/gnome-unstable/eog/eog.install b/gnome-unstable/eog/eog.install
deleted file mode 100644
index 1571179ca..000000000
--- a/gnome-unstable/eog/eog.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/epiphany-extensions/PKGBUILD b/gnome-unstable/epiphany-extensions/PKGBUILD
deleted file mode 100644
index 4fac3a868..000000000
--- a/gnome-unstable/epiphany-extensions/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 168276 2012-10-07 15:06:59Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany-extensions
-pkgver=3.6.0
-pkgrel=1
-url="http://www.gnome.org/projects/epiphany/"
-pkgdesc="Various extentions for the Epiphany web browser"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('epiphany' 'opensp' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=epiphany-extensions.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a1cc21b44a7b00cfe055b87c23f20f16c9fbd2b5a30380338885a5ae0847f7a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/epiphany-extensions/epiphany-extensions.install b/gnome-unstable/epiphany-extensions/epiphany-extensions.install
deleted file mode 100644
index c0ed9a0d7..000000000
--- a/gnome-unstable/epiphany-extensions/epiphany-extensions.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/epiphany/PKGBUILD b/gnome-unstable/epiphany/PKGBUILD
deleted file mode 100644
index 040a42e5f..000000000
--- a/gnome-unstable/epiphany/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168819 2012-10-16 09:37:58Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany
-pkgver=3.6.1
-pkgrel=1
-install=epiphany.install
-pkgdesc="A GNOME web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme' 'gcr' 'gnome-desktop')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
-options=('!libtool' '!emptydirs')
-groups=('gnome')
-url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/epiphany/epiphany.install b/gnome-unstable/epiphany/epiphany.install
deleted file mode 100644
index 8b17fa3d4..000000000
--- a/gnome-unstable/epiphany/epiphany.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/evince/PKGBUILD b/gnome-unstable/evince/PKGBUILD
deleted file mode 100644
index 69115bd42..000000000
--- a/gnome-unstable/evince/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 167083 2012-09-25 10:11:40Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl')
-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=('8dfa7b9c2f0b910d06b1612ff445d3f3050c44d25f2e78718966374d30ab83f2')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr   --sysconfdir=/etc \
-      --localstatedir=/var    --libexecdir=/usr/lib/evince \
-      --disable-static        --enable-nautilus \
-      --enable-pdf            --enable-tiff \
-      --enable-djvu           --enable-dvi \
-      --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile \
-      --enable-introspection
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/evince/evince.install b/gnome-unstable/evince/evince.install
deleted file mode 100644
index 1571179ca..000000000
--- a/gnome-unstable/evince/evince.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/evolution-data-server/PKGBUILD b/gnome-unstable/evolution-data-server/PKGBUILD
deleted file mode 100644
index bf8ad478b..000000000
--- a/gnome-unstable/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169048 2012-10-17 10:49:12Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
-options=('!libtool')
-install=$pkgname.install
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('637fcb6a83601af2968ca0b600958da8b0f25444224edc5fae41dea995924150')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-openldap=yes \
-      --libexecdir=/usr/lib/evolution-data-server \
-      --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/evolution-data-server/evolution-data-server.install b/gnome-unstable/evolution-data-server/evolution-data-server.install
deleted file mode 100644
index 29a359805..000000000
--- a/gnome-unstable/evolution-data-server/evolution-data-server.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove () {
-    post_install
-}
diff --git a/gnome-unstable/evolution-ews/PKGBUILD b/gnome-unstable/evolution-ews/PKGBUILD
deleted file mode 100644
index 004aeb10b..000000000
--- a/gnome-unstable/evolution-ews/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 167902 2012-10-03 17:04:25Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=evolution-ews
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="MS Exchange integration through Exchange Web Services"
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-url="http://www.gnome.org"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a1d40971f47bfd947349f48a86f8a5ec7252db41b9b0d19204b4e28f2408a96a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/evolution/PKGBUILD b/gnome-unstable/evolution/PKGBUILD
deleted file mode 100644
index 26faf8f35..000000000
--- a/gnome-unstable/evolution/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 167092 2012-09-25 11:22:48Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Manage your email, contacts and schedule"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'gstreamer0.10' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager')
-optdepends=('bogofilter: possible junk filter plugin'
-            'spamassassin: possible junk filter plugin')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=evolution.install
-url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6163ef56a22ca7c605a89d774851c9988d7840a4dc5c73c546308e5380cfe7b4')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --enable-nss=yes \
-      --with-openldap=yes \
-      --enable-smime=yes \
-      --with-krb5=/usr \
-      --disable-schemas-compile
-  
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/evolution/evolution.install b/gnome-unstable/evolution/evolution.install
deleted file mode 100644
index 67eca41f0..000000000
--- a/gnome-unstable/evolution/evolution.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then
-    gconfpkg --uninstall evolution
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/farstream/PKGBUILD b/gnome-unstable/farstream/PKGBUILD
deleted file mode 100644
index 2c9bf363c..000000000
--- a/gnome-unstable/farstream/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168361 2012-10-09 07:21:08Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=farstream
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/Farstream"
-license=('LGPL2.1')
-depends=('gst-plugins-base-libs' 'libnice')
-makedepends=('gobject-introspection')
-optdepends=('gst-plugins-good' 'gst-plugins-bad')
-conflicts=('farsight2')
-replaces=('farsight2')
-options=(!libtool)
-source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('479c42adf5cc606abcb47d58ed542414')
-
-build() {
-  cd  "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --with-package-name='Arch Linux farstream package' \
-    --with-package-origin='http://archlinux.org' \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/folks/PKGBUILD b/gnome-unstable/folks/PKGBUILD
deleted file mode 100644
index 5faef136e..000000000
--- a/gnome-unstable/folks/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167966 2012-10-04 13:03:04Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=folks
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="Library to aggregates people into metacontacts"
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/Folks"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb' 'libzeitgeist')
-makedepends=('gobject-introspection' 'intltool')
-install=folks.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/folks/folks.install b/gnome-unstable/folks/folks.install
deleted file mode 100644
index c19349f72..000000000
--- a/gnome-unstable/folks/folks.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gcalctool/PKGBUILD b/gnome-unstable/gcalctool/PKGBUILD
deleted file mode 100644
index 0fa8e119e..000000000
--- a/gnome-unstable/gcalctool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167268 2012-09-29 15:00:51Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gcalctool
-pkgver=6.6.0
-pkgrel=1
-pkgdesc="GNOME Scientific calculator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'dconf')
-makedepends=('intltool' 'yelp-tools')
-groups=('gnome-extra')
-options=(!emptydirs)
-url="http://www.gnome.org"
-install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('0d2e0729be42e3ee06ea7d02fa6a00446df6e4de601745bcbbef53a027f9542e')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gcalctool/gcalctool.install b/gnome-unstable/gcalctool/gcalctool.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/gnome-unstable/gcalctool/gcalctool.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/gcr/PKGBUILD b/gnome-unstable/gcr/PKGBUILD
deleted file mode 100644
index c45233a37..000000000
--- a/gnome-unstable/gcr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168985 2012-10-17 09:35:06Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gcr
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A library for bits of crypto UI and parsing"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-install=gcr.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d95f8b70bdcc371c2712ba166e124114bd99bbde1173c0cbe7a8462f146a9927')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --libexec=/usr/lib/gcr \
-    --disable-static \
-    --disable-update-mime \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gcr/gcr.install b/gnome-unstable/gcr/gcr.install
deleted file mode 100644
index 8677671c4..000000000
--- a/gnome-unstable/gcr/gcr.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-mime-database /usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gdk-pixbuf2/PKGBUILD b/gnome-unstable/gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index 514681b1e..000000000
--- a/gnome-unstable/gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167531 2012-10-02 10:18:16Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gdk-pixbuf2
-pkgver=2.26.4
-pkgrel=1
-pkgdesc="An image loading library"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be')
-
-build() {
-  cd gdk-pixbuf-$pkgver
-
-  ./configure --prefix=/usr \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd gdk-pixbuf-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install b/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index f04c0967a..000000000
--- a/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-   gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/gnome-unstable/gdl/PKGBUILD b/gnome-unstable/gdl/PKGBUILD
deleted file mode 100644
index 5a7581c18..000000000
--- a/gnome-unstable/gdl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 167319 2012-09-30 23:30:44Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdl
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME Docking Library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.gnome.org/"
-depends=('gtk3')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('32a04fc96667e2f7ca1e3c853b996da3e62f4811b2a90d62cb2081f68aeecac3')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gdm/PKGBUILD b/gnome-unstable/gdm/PKGBUILD
deleted file mode 100644
index 71f77d096..000000000
--- a/gnome-unstable/gdm/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 168821 2012-10-16 09:51:39Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdm
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Gnome Display Manager"
-arch=(i686 x86_64)
-license=(GPL)
-url="http://www.gnome.org"
-backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
-        etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf)
-groups=(gnome)
-options=('!libtool')
-depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
-         xorg-xrdb nss polkit-gnome)
-makedepends=(itstool intltool gnome-doc-utils xorg-server gobject-introspection)
-optdepends=('gnome-shell: new login interface'
-            'fprintd: fingerprint authentication')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix_external_program_directories.patch)
-sha256sums=('aff69dde55e11b540145002c95cf966cd16376910283b385520431ced10c5031'
-            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
-
-build() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/gdm \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-schemas-compile \
-    --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
-    --with-check-accelerated-directory=/usr/lib/gnome-session \
-    --with-authentication-agent-directory=/usr/lib/polkit-gnome \
-    --without-tcp-wrappers \
-    --without-console-kit \
-    --with-systemd \
-    --with-default-pam-config=exherbo
-
-  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 -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  chmod 1770 "$pkgdir/var/log/gdm"
-  chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
-  rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
-}
diff --git a/gnome-unstable/gdm/fix_external_program_directories.patch b/gnome-unstable/gdm/fix_external_program_directories.patch
deleted file mode 100644
index 5e51a776f..000000000
--- a/gnome-unstable/gdm/fix_external_program_directories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:05.304823391 +0000
-+++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:17.004732251 +0000
-@@ -131,7 +131,7 @@
-         ret = FALSE;
- 
-         error = NULL;
--        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+        g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error);
-         if (error != NULL) {
-                 g_warning ("Error starting settings daemon: %s", error->message);
-                 g_error_free (error);
diff --git a/gnome-unstable/gdm/gdm.install b/gnome-unstable/gdm/gdm.install
deleted file mode 100644
index c48faf4ae..000000000
--- a/gnome-unstable/gdm/gdm.install
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=gdm
-
-post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm > /dev/null
-
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  dconf update
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    gconfpkg --uninstall ${pkgname}
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  dconf update
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  getent passwd gdm >/dev/null 2>&1 && userdel gdm
-  getent group gdm >/dev/null 2>&1 && groupdel gdm
-}
diff --git a/gnome-unstable/gedit/PKGBUILD b/gnome-unstable/gedit/PKGBUILD
deleted file mode 100644
index a39a2d421..000000000
--- a/gnome-unstable/gedit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168973 2012-10-17 07:09:38Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gedit
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('75fb18e32a7571900dda8cbd3a71212bded1ef714d3aa9f9513296eea02779a4')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \
-      --enable-python
-  make
-}
-
-package(){
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gedit/gedit.install b/gnome-unstable/gedit/gedit.install
deleted file mode 100644
index 606920688..000000000
--- a/gnome-unstable/gedit/gedit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then
-        gconfpkg --uninstall gedit
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/ghex/PKGBUILD b/gnome-unstable/ghex/PKGBUILD
deleted file mode 100644
index ebad92cf0..000000000
--- a/gnome-unstable/ghex/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168936 2012-10-16 15:56:20Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=ghex
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A simple binary editor for the Gnome desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/Ghex"
-depends=('gtk3' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=ghex.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/ghex/ghex.install b/gnome-unstable/ghex/ghex.install
deleted file mode 100644
index 084bc82ee..000000000
--- a/gnome-unstable/ghex/ghex.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=ghex
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/gjs/PKGBUILD b/gnome-unstable/gjs/PKGBUILD
deleted file mode 100644
index cb6cc5a6f..000000000
--- a/gnome-unstable/gjs/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 167020 2012-09-24 19:03:33Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gjs
-pkgver=1.34.0
-pkgrel=1
-pkgdesc="Javascript Bindings for GNOME"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Gjs"
-license=('GPL')
-depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|python|python2|' scripts/make-tests
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/glade/PKGBUILD b/gnome-unstable/glade/PKGBUILD
deleted file mode 100644
index cf8779f39..000000000
--- a/gnome-unstable/glade/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167894 2012-10-03 15:58:19Z jgc $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=glade
-pkgver=3.14.0
-pkgrel=1
-pkgdesc="User interface builder for GTK+ and GNOME."
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
-optdepends=('python2: Python widgets support')
-options=('!libtool')
-url="http://glade.gnome.org/"
-install=glade.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8848d0ae3548e32a8ec385f50c15eb34ed7f13d7f451760d974a0858dbfe93b2')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/glade/glade.install b/gnome-unstable/glade/glade.install
deleted file mode 100644
index bce670aff..000000000
--- a/gnome-unstable/glade/glade.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/glib-networking/PKGBUILD b/gnome-unstable/glib-networking/PKGBUILD
deleted file mode 100644
index 8880fd510..000000000
--- a/gnome-unstable/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167003 2012-09-24 17:47:48Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=glib-networking
-pkgver=2.34.0
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c56eb4161671bff9568f3a92a88531ca01217eb7ee8514bb6255730400f877f1')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/glib-networking/glib-networking.install b/gnome-unstable/glib-networking/glib-networking.install
deleted file mode 100644
index 8214e1968..000000000
--- a/gnome-unstable/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/glib2/PKGBUILD b/gnome-unstable/glib2/PKGBUILD
deleted file mode 100644
index 175636d2d..000000000
--- a/gnome-unstable/glib2/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 168817 2012-10-16 09:14:36Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.34.1
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre' 'libffi')
-makedepends=('pkg-config' 'python2')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-        revert-warn-glib-compile-schemas.patch)
-sha256sums=('6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
-
-build() {
-  cd glib-$pkgver
-  patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-package() {
-  cd glib-$pkgver
-  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
-
-  for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
-      chmod -x "$_i"
-  done
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
-}
diff --git a/gnome-unstable/glib2/glib2.csh b/gnome-unstable/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2ffa..000000000
--- a/gnome-unstable/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/gnome-unstable/glib2/glib2.sh b/gnome-unstable/glib2/glib2.sh
deleted file mode 100644
index 96a056e1e..000000000
--- a/gnome-unstable/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
diff --git a/gnome-unstable/glib2/revert-warn-glib-compile-schemas.patch b/gnome-unstable/glib2/revert-warn-glib-compile-schemas.patch
deleted file mode 100644
index 75b05103c..000000000
--- a/gnome-unstable/glib2/revert-warn-glib-compile-schemas.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Thu, 12 Apr 2012 23:55:34 +0000
-Subject: glib-compile-schemas: warn about bad dconf paths
-
-For quite some time the recommended usage of GSettings and dconf has
-been to use paths like /org/gnome/example/.  Use of /apps/ has spilled
-over from GConf and is continuing to make its way into a number of
-applications as they port.
-
-glib-compile-schemas will now warn about these types of paths being
-used.  This generates a lot of noise, but hopefully it will reduce the
-number of ported applications making this mistake.
----
-diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
-index cf02389..27d0181 100644
---- a/gio/glib-compile-schemas.c
-+++ b/gio/glib-compile-schemas.c
-@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState  *state,
-       return;
-     }
- 
-+  if (path && (g_str_has_prefix (path, "/apps/") ||
-+               g_str_has_prefix (path, "/desktop/") ||
-+               g_str_has_prefix (path, "/system/")))
-+    g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
-+                "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
-+
-   state->schema_state = schema_state_new (path, gettext_domain,
-                                           extends, extends_name, list_of);
- 
---
-cgit v0.9.0.2
diff --git a/gnome-unstable/glibmm/PKGBUILD b/gnome-unstable/glibmm/PKGBUILD
deleted file mode 100644
index b8e265ad3..000000000
--- a/gnome-unstable/glibmm/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 167318 2012-09-30 23:29:44Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=glibmm
-pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.33.13
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-url="http://www.gtkmm.org/"
-sha256sums=('f66f62ddd63a1c10561ce73c5883c1c71499efafb363574dac94ac699804d699')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package_glibmm() {
-  pkgdesc="Glib-- (glibmm) is a C++ interface for glib"
-  depends=('glib2' 'libsigc++2.0')
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-  make DESTDIR="$pkgdir" install
-}
-
-package_glibmm-docs() {
-  pkgdesc="Developer documentation for glibmm"
-  cd "$pkgbase-$pkgver/docs"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
deleted file mode 100644
index d7d9650dc..000000000
--- a/gnome-unstable/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Simplified by Kay Sievers
-# https://bugzilla.redhat.com/show_bug.cgi?id=733326
-
-KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD
deleted file mode 100644
index 2061d3231..000000000
--- a/gnome-unstable/gnome-bluetooth/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 167914 2012-10-03 19:43:31Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-bluetooth
-pkgver=3.6.0
-pkgrel=2
-pkgdesc="The GNOME Bluetooth Subsystem"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeBluetooth"
-license=('GPL' 'LGPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify')
-makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
-install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        61-gnome-bluetooth-rfkill.rules)
-sha256sums=('021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306'
-            '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-desktop-update \
-    --disable-icon-update \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 -D ../61-gnome-bluetooth-rfkill.rules \
-      "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
-}
diff --git a/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install b/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install
deleted file mode 100644
index 8c991877f..000000000
--- a/gnome-unstable/gnome-bluetooth/gnome-bluetooth.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/gnome-color-manager/PKGBUILD b/gnome-unstable/gnome-color-manager/PKGBUILD
deleted file mode 100644
index b8b7089ac..000000000
--- a/gnome-unstable/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 167683 2012-10-03 00:26:49Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/gnome-color-manager/"
-license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk'
-         'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk')
-makedepends=('intltool' 'yelp-tools')
-install=gnome-color-manager.install
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9')
-
-build(){
-  cd $pkgname-$pkgver
-
-  # man pages need docbook-sgml, which we don't have
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-color-manager/gnome-color-manager.install b/gnome-unstable/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/gnome-unstable/gnome-color-manager/gnome-color-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-color-manager
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-contacts/PKGBUILD b/gnome-unstable/gnome-contacts/PKGBUILD
deleted file mode 100644
index 4c3ac48c8..000000000
--- a/gnome-unstable/gnome-contacts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167540 2012-10-02 11:23:59Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-contacts
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Contacts Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
-makedepends=('intltool' 'vala')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('203ed52fbdad3412fa88ae011c0d1cf94e8fe15c13dc192e8be554a1268614a5')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/gnome-contacts
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-contacts/gnome-contacts.install b/gnome-unstable/gnome-contacts/gnome-contacts.install
deleted file mode 100644
index c19349f72..000000000
--- a/gnome-unstable/gnome-contacts/gnome-contacts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD
deleted file mode 100644
index 64b2f93cf..000000000
--- a/gnome-unstable/gnome-control-center/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 168329 2012-10-08 22:05:31Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
-         'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
-         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6e9530deac15408fee43c9c7a21200456bebf947e677856cd7345a79e2923d5')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb \
-      --without-cheese
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-control-center/gnome-control-center.install b/gnome-unstable/gnome-control-center/gnome-control-center.install
deleted file mode 100644
index 079e0fa34..000000000
--- a/gnome-unstable/gnome-control-center/gnome-control-center.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/gnome-control-center/systemd-fallback.patch b/gnome-unstable/gnome-control-center/systemd-fallback.patch
deleted file mode 100644
index 709e54019..000000000
--- a/gnome-unstable/gnome-control-center/systemd-fallback.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit 9873a7536844f5c38c2a123be58175c2774e5dcc
-Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-Date:   Mon Mar 12 01:12:11 2012 +0100
-
-    Fallback to CK if systemd is not available
-    
-    Be nice to distributions where systemd is optional. This will select
-    the code path at runtime depending on whether the system was booted
-    using systemd.
-
-diff --git a/configure.ac b/configure.ac
-index aee97ac..867f061 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,7 +56,7 @@ AC_ARG_ENABLE([systemd],
-               [with_systemd=$enableval],
-               [with_systemd=no])
- if test "$with_systemd" = "yes" ; then
--  SYSTEMD=libsystemd-login
-+  SYSTEMD="libsystemd-login libsystemd-daemon"
-   AC_DEFINE(HAVE_SYSTEMD, 1, [Define to 1 if systemd is available])
- else
-   SYSTEMD=
-diff --git a/panels/user-accounts/um-user.c b/panels/user-accounts/um-user.c
-index f027754..5ebbe29 100644
---- a/panels/user-accounts/um-user.c
-+++ b/panels/user-accounts/um-user.c
-@@ -37,6 +37,11 @@
- 
- #include <gio/gunixoutputstream.h>
- 
-+#ifdef HAVE_SYSTEMD
-+#  include <systemd/sd-login.h>
-+#  include <systemd/sd-daemon.h>
-+#endif
-+
- #include "um-user.h"
- #include "um-account-type.h"
- #include "um-utils.h"
-@@ -1003,25 +1008,18 @@ um_user_set_password (UmUser      *user,
-         }
- }
- 
--#ifdef HAVE_SYSTEMD
--
--#include <systemd/sd-login.h>
--
- gboolean
- um_user_is_logged_in (UmUser *user)
- {
--  int n_sessions;
--
--  n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL) > 0;
--
--  return n_sessions > 0;
--}
-+#ifdef HAVE_SYSTEMD
-+        if (sd_booted () > 0) {
-+                int n_sessions;
- 
--#else
-+                n_sessions = sd_uid_get_sessions (um_user_get_uid (user), 0, NULL);
- 
--gboolean
--um_user_is_logged_in (UmUser *user)
--{
-+                return n_sessions > 0;
-+        }
-+#endif
-         GVariant *result;
-         GVariantIter *iter;
-         gint n_sessions;
-@@ -1052,8 +1050,6 @@ um_user_is_logged_in (UmUser *user)
-         return n_sessions > 0;
- }
- 
--#endif
--
- void
- um_user_set_automatic_login (UmUser   *user,
-                              gboolean  enabled)
diff --git a/gnome-unstable/gnome-desktop/PKGBUILD b/gnome-unstable/gnome-desktop/PKGBUILD
deleted file mode 100644
index 8640bbd9d..000000000
--- a/gnome-unstable/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169061 2012-10-17 16:11:40Z heftig $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.6.1
-pkgrel=1
-epoch=1
-pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1c4954d143d696263888ea2061b2854f8c4094d33dfe51a39fb41f0a8051a174')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-desktop \
-      --with-gnome-distributor="Arch Linux"
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-dictionary/PKGBUILD b/gnome-unstable/gnome-dictionary/PKGBUILD
deleted file mode 100644
index 0e231bf4a..000000000
--- a/gnome-unstable/gnome-dictionary/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167175 2012-09-26 18:55:05Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gnome-dictionary
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Look up words in dictionary sources"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3')
-makedepends=('intltool' 'itstool' 'docbook-xsl')
-install=$pkgname.install
-options=(!libtool)
-groups=('gnome-extra')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-dictionary/gnome-dictionary.install b/gnome-unstable/gnome-dictionary/gnome-dictionary.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/gnome-unstable/gnome-dictionary/gnome-dictionary.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-disk-utility/PKGBUILD b/gnome-unstable/gnome-disk-utility/PKGBUILD
deleted file mode 100644
index a6021f1f3..000000000
--- a/gnome-unstable/gnome-disk-utility/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167922 2012-10-03 20:26:57Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Silvio Knizek (killermoehre)
-
-pkgname=gnome-disk-utility
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Disk Management Utility for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils')
-makedepends=('intltool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
-install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install b/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install
deleted file mode 100644
index 8b17fa3d4..000000000
--- a/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD
deleted file mode 100644
index 7cb5fb873..000000000
--- a/gnome-unstable/gnome-documents/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 167688 2012-10-03 00:43:15Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-documents
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Documents Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata'
-         'tracker' 'libzapojit')
-makedepends=('intltool')
-optdepends=('unoconv: Support for Libreoffice document types')
-options=('!libtool')
-install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a4a5c525cba047a6c8f712f8a0d73fc26dc0445d4c8278c10ecbeac4efd342e2')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/gnome-documents
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-documents/gnome-documents.install b/gnome-unstable/gnome-documents/gnome-documents.install
deleted file mode 100644
index 1571179ca..000000000
--- a/gnome-unstable/gnome-documents/gnome-documents.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-font-viewer/PKGBUILD b/gnome-unstable/gnome-font-viewer/PKGBUILD
deleted file mode 100644
index 186904af7..000000000
--- a/gnome-unstable/gnome-font-viewer/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#  $Id: PKGBUILD 167040 2012-09-24 20:36:55Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-font-viewer
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME font viewer and thumbnailer"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'desktop-file-utils' 'gnome-desktop')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-font-viewer.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3625c9f70ef227cd6cdaa1fea4990d87ba12ba3681e105cf5db731edec208e74')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install b/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install
deleted file mode 100644
index e111ef946..000000000
--- a/gnome-unstable/gnome-font-viewer/gnome-font-viewer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-games/PKGBUILD b/gnome-unstable/gnome-games/PKGBUILD
deleted file mode 100644
index 4c0a60276..000000000
--- a/gnome-unstable/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 168946 2012-10-16 17:04:37Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
-options=('!emptydirs' '!libtool')
-install=gnome-games.install
-url="http://www.gnome.org"
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static --disable-schemas-compile \
-      --with-scores-user=root --with-scores-group=games \
-      --enable-introspection=yes
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Remove all scores, we generate them from postinstall
-  rm -rf "$pkgdir/var"
-
-  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
-}
diff --git a/gnome-unstable/gnome-games/gnome-games.install b/gnome-unstable/gnome-games/gnome-games.install
deleted file mode 100644
index 2fad5db0b..000000000
--- a/gnome-unstable/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,122 +0,0 @@
-_scores=(glines.Small.scores
-	glines.Medium.scores
-	glines.Large.scores
-	gnibbles.4.0.scores
-	gnibbles.3.0.scores
-	gnibbles.2.0.scores
-	gnibbles.1.0.scores
-	gnibbles.4.1.scores
-	gnibbles.3.1.scores
-	gnibbles.2.1.scores
-	gnibbles.1.1.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnomine.Small.scores
-	gnomine.Medium.scores
-	gnomine.Large.scores
-	gnomine.Custom.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gnotski.1.scores
-	gnotski.2.scores
-	gnotski.3.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.scores
-	gnotski.10.scores
-	gnotski.11.scores
-	gnotski.12.scores
-	gnotski.13.scores
-	gnotski.14.scores
-	gnotski.15.scores
-	gnotski.16.scores
-	gnotski.17.scores
-	gnotski.18.scores
-	gnotski.19.scores
-	gnotski.20.scores
-	gnotski.21.scores
-	gnotski.22.scores
-	gnotski.23.scores
-	gnotski.24.scores
-	gnotski.25.scores
-	gnotski.26.scores
-	gnotski.27.scores
-	gnotski.28.scores
-	gnotski.29.scores
-	gnotski.30.scores
-	gnotski.31.scores
-	gnotski.32.scores
-	gnotski.33.scores
-	gnotski.34.scores
-	gnotski.35.scores
-	gnotski.36.scores
-	gnotski.37.scores
-	gtali.Regular.scores
-	gtali.Colors.scores
-	gnome-mahjongg.easy.scores
-	gnome-mahjongg.difficult.scores
-	gnome-mahjongg.confounding.scores
-	gnome-mahjongg.pyramid.scores
-	gnome-mahjongg.tictactoe.scores
-	gnome-mahjongg.cloud.scores
-	gnome-mahjongg.dragon.scores
-	gnome-mahjongg.bridges.scores
-	gnome-mahjongg.ziggurat.scores
-	quadrapassel.scores
-	swell-foop.small.scores
-	swell-foop.normal.scores
-	swell-foop.large.scores)
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    if [ -e "var/games/$score" ]; then
-      continue
-    fi
-
-    touch "var/games/$score"
-    chown root:games "var/games/$score"
-    chmod 664 "var/games/$score"
-  done
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    rm -f "var/games/$score"
-  done
-}
diff --git a/gnome-unstable/gnome-keyring/PKGBUILD b/gnome-unstable/gnome-keyring/PKGBUILD
deleted file mode 100644
index 84d0255f7..000000000
--- a/gnome-unstable/gnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#$Id: PKGBUILD 168981 2012-10-17 09:11:33Z jgc $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'gcr' 'libcap-ng')
-makedepends=('intltool')
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0c3a2ccc1744ce681fa7eb8d5e3e94d1712e932068a36ce7076222eb82b25aa5')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring \
-      --with-pam-dir=/usr/lib/security --with-root-certs=/etc/ssl/certs \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-keyring/gnome-keyring.install b/gnome-unstable/gnome-keyring/gnome-keyring.install
deleted file mode 100644
index c351377a2..000000000
--- a/gnome-unstable/gnome-keyring/gnome-keyring.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/gnome-menus/PKGBUILD b/gnome-unstable/gnome-menus/PKGBUILD
deleted file mode 100644
index 95a3a8f6b..000000000
--- a/gnome-unstable/gnome-menus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 167714 2012-10-03 10:12:02Z jgc $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
-depends=('glib2' 'python2-gobject')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        menus.patch)
-sha256sums=('523ac10729e28f9acde4785e61dcb895828fd89e39b38b68f6c14ec815805a0b'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
-      --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package(){
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
-}
diff --git a/gnome-unstable/gnome-menus/menus.patch b/gnome-unstable/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/gnome-unstable/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/gnome-unstable/gnome-nettool/PKGBUILD b/gnome-unstable/gnome-nettool/PKGBUILD
deleted file mode 100644
index 1ab02baea..000000000
--- a/gnome-unstable/gnome-nettool/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167877 2012-10-03 15:12:25Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@nospam.gmail.com>
-
-pkgname=gnome-nettool
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A Collection of GNOME3 Networking Tools."
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
-optdepends=('nmap: Port scanning'
-            'net-tools: Network statistics')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-nettool/gnome-nettool.install b/gnome-unstable/gnome-nettool/gnome-nettool.install
deleted file mode 100644
index e5dfaf4a5..000000000
--- a/gnome-unstable/gnome-nettool/gnome-nettool.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-online-accounts/PKGBUILD b/gnome-unstable/gnome-online-accounts/PKGBUILD
deleted file mode 100644
index 8f0bc61f9..000000000
--- a/gnome-unstable/gnome-online-accounts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167051 2012-09-24 20:58:52Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-online-accounts
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME service to access online accounts"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
-makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-options=(!libtool)
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2a88772873935b1c23e8e6b7a2333d8cfb225755aba22e0977129f13351028f7')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install b/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install
deleted file mode 100644
index 525ecff63..000000000
--- a/gnome-unstable/gnome-online-accounts/gnome-online-accounts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-panel/PKGBUILD b/gnome-unstable/gnome-panel/PKGBUILD
deleted file mode 100644
index c03259efa..000000000
--- a/gnome-unstable/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 167752 2012-10-03 14:30:00Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.6.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf'
-         'gconf' 'telepathy-glib')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6a8058df6263af35b0e430514f7e16d1b4df095365242d39e170cfc451a328b6')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-panel \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/gnome-panel/gnome-panel.install b/gnome-unstable/gnome-panel/gnome-panel.install
deleted file mode 100644
index 0f9324937..000000000
--- a/gnome-unstable/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
-  gconfpkg --install $pkgname
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/gnome-unstable/gnome-power-manager/PKGBUILD b/gnome-unstable/gnome-power-manager/PKGBUILD
deleted file mode 100644
index 7e39538f6..000000000
--- a/gnome-unstable/gnome-power-manager/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167704 2012-10-03 09:51:18Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-power-manager
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Power management tools."
-arch=(i686 x86_64)
-url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=(!emptydirs)
-install=gnome-power-manager.install
-groups=(gnome-extra)
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-power-manager \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-power-manager/gnome-power-manager.install b/gnome-unstable/gnome-power-manager/gnome-power-manager.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/gnome-unstable/gnome-power-manager/gnome-power-manager.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-screensaver/PKGBUILD b/gnome-unstable/gnome-screensaver/PKGBUILD
deleted file mode 100644
index 15127eccf..000000000
--- a/gnome-unstable/gnome-screensaver/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 168823 2012-10-16 10:00:41Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd')
-makedepends=('pkgconfig' 'intltool' 'libxss')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-       gnome-screensaver.pam)
-sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
-            'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext --with-systemd
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
-}
diff --git a/gnome-unstable/gnome-screensaver/gnome-screensaver.install b/gnome-unstable/gnome-screensaver/gnome-screensaver.install
deleted file mode 100644
index d1a42c6ce..000000000
--- a/gnome-unstable/gnome-screensaver/gnome-screensaver.install
+++ /dev/null
@@ -1,7 +0,0 @@
-pkgname=gnome-screensaver
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        gconfpkg --uninstall ${pkgname}
-    fi
-}
diff --git a/gnome-unstable/gnome-screensaver/gnome-screensaver.pam b/gnome-unstable/gnome-screensaver/gnome-screensaver.pam
deleted file mode 100644
index 453dae646..000000000
--- a/gnome-unstable/gnome-screensaver/gnome-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so nullok
-auth        optional     pam_gnome_keyring.so
diff --git a/gnome-unstable/gnome-screenshot/PKGBUILD b/gnome-unstable/gnome-screenshot/PKGBUILD
deleted file mode 100644
index 4f78d4fa7..000000000
--- a/gnome-unstable/gnome-screenshot/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167044 2012-09-24 20:43:36Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-screenshot
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Take pictures of your screen"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3' 'libcanberra')
-makedepends=('intltool')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('96626b86d0ebaacf420b68ddd846d5185dc90a58e5d86843799c2071255b7636')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-screenshot/gnome-screenshot.install b/gnome-unstable/gnome-screenshot/gnome-screenshot.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/gnome-unstable/gnome-screenshot/gnome-screenshot.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-search-tool/PKGBUILD b/gnome-unstable/gnome-search-tool/PKGBUILD
deleted file mode 100644
index 76258f361..000000000
--- a/gnome-unstable/gnome-search-tool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167757 2012-10-03 14:37:08Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-search-tool
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Utility to search for files"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('gtk3' 'libsm')
-makedepends=('intltool' 'yelp-tools')
-install=$pkgname.install
-options=('!emptydirs')
-groups=('gnome-extra')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-search-tool/gnome-search-tool.install b/gnome-unstable/gnome-search-tool/gnome-search-tool.install
deleted file mode 100644
index b631b6a89..000000000
--- a/gnome-unstable/gnome-search-tool/gnome-search-tool.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.6.0) < 0 )) && gconfpkg --uninstall gnome-search-tool
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-session/PKGBUILD b/gnome-unstable/gnome-session/PKGBUILD
deleted file mode 100644
index 41d664051..000000000
--- a/gnome-unstable/gnome-session/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 168827 2012-10-16 10:10:30Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-session
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
-         'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome'
-         'upower')
-makedepends=('intltool' 'mesa' 'xtrans')
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gnome-session-3.3.1-llvmpipe.patch timeout.patch)
-sha256sums=('759c26230d8ac3f2d51344f5eaadce166819c4394acb733987e6d23fd42bddfb'
-            '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
-            '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Allow software rendering
-  patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch
-
-  # Increase timeout, for slow machines
-  patch -Np1 -i ../timeout.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile --enable-systemd
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch
deleted file mode 100644
index 40da1c9b7..000000000
--- a/gnome-unstable/gnome-session/gnome-session-3.3.1-llvmpipe.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility
---- gnome-session-3.3.1/data/hardware-compatibility.jx	2011-10-21 10:35:39.000000000 -0400
-+++ gnome-session-3.3.1/data/hardware-compatibility	2011-11-03 17:53:17.156407217 -0400
-@@ -20,4 +20,4 @@
- 
- # Gallium has softpipe and llvmpipe
- -softpipe
---llvmpipe
-+#llvmpipe
diff --git a/gnome-unstable/gnome-session/gnome-session.install b/gnome-unstable/gnome-session/gnome-session.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/gnome-unstable/gnome-session/gnome-session.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-session/timeout.patch b/gnome-unstable/gnome-session/timeout.patch
deleted file mode 100644
index a26b0dcf5..000000000
--- a/gnome-unstable/gnome-session/timeout.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r gnome-session-3.4.2/gnome-session/gsm-session-fill.c gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c
---- gnome-session-3.4.2/gnome-session/gsm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
-+++ gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
-@@ -36,7 +36,7 @@
- #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
- 
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
--#define GSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
-+#define GSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
- 
- typedef void (*GsmFillHandleProvider) (const char *provides,
-                                        const char *default_provider,
-diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c
---- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
-@@ -30,7 +30,7 @@
- #include <X11/Xatom.h>
- 
- /* Wait up to this long for a running check to finish */
--#define PROPERTY_CHANGE_TIMEOUT 5000
-+#define PROPERTY_CHANGE_TIMEOUT 12000
- 
- /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
- #define NO_ACCEL            0
diff --git a/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
deleted file mode 100644
index d744eff56..000000000
--- a/gnome-unstable/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+++ /dev/null
@@ -1,1472 +0,0 @@
-From a26f7c5190ebc82f9f17e0446159311377b20d3f Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 21 Sep 2012 11:56:53 +0100
-Subject: [PATCH] power and media-keys: Use logind for suspending and
- rebooting the system
-
-Use the new logind features to suspend and resume but making sure we opt out
-of logind handling the sleep and power keys, and also inhibiting for lid close
-auto-suspend if there is an external monitor connected.
-
-Also use a delay inihibit for logind so that we can do actions on suspend like
-blanking the screen using the screensaver and also poking the screensaver on
-resume.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680689
----
- plugins/common/Makefile.am                  |   4 +-
- plugins/common/gsd-power-helper.c           | 203 --------
- plugins/common/gsd-power-helper.h           |  35 --
- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
- plugins/power/gsd-power-manager.c           | 699 +++++++++++++++++++---------
- 5 files changed, 595 insertions(+), 502 deletions(-)
- delete mode 100644 plugins/common/gsd-power-helper.c
- delete mode 100644 plugins/common/gsd-power-helper.h
-
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 7e50db4..b0e907c 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
- 	gsd-keygrab.c		\
- 	gsd-keygrab.h		\
- 	gsd-input-helper.c	\
--	gsd-input-helper.h	\
--	gsd-power-helper.c	\
--	gsd-power-helper.h
-+	gsd-input-helper.h
- 
- libcommon_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS)
-diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
-deleted file mode 100644
-index 27d0eda..0000000
---- a/plugins/common/gsd-power-helper.c
-+++ /dev/null
-@@ -1,203 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include "gsd-power-helper.h"
--
--#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
--#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
--#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
--
--#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
--#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
--#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
--
--#ifdef HAVE_SYSTEMD
--static void
--systemd_stop (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "PowerOff",
--                                g_variant_new ("(b)", FALSE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_suspend (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Suspend",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_hibernate (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Hibernate",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--#else /* HAVE_SYSTEMD */
--
--static void
--consolekit_stop_cb (GObject *source_object,
--                    GAsyncResult *res,
--                    gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't stop using ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--consolekit_stop (void)
--{
--        GError *error = NULL;
--        GDBusProxy *proxy;
--
--        /* power down the machine in a safe way */
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                               NULL,
--                                               CONSOLEKIT_DBUS_NAME,
--                                               CONSOLEKIT_DBUS_PATH_MANAGER,
--                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
--                                               NULL, &error);
--        if (proxy == NULL) {
--                g_warning ("cannot connect to ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--        g_dbus_proxy_call (proxy,
--                           "Stop",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           consolekit_stop_cb, NULL);
--        g_object_unref (proxy);
--}
--static void
--upower_sleep_cb (GObject *source_object,
--                 GAsyncResult *res,
--                 gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't sleep using UPower: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--upower_suspend (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Suspend",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--
--static void
--upower_hibernate (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Hibernate",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--#endif /* HAVE_SYSTEMD */
--
--void
--gsd_power_suspend (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_suspend ();
--#else
--	upower_suspend (upower_proxy);
--#endif
--}
--
--void
--gsd_power_poweroff (void)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_stop ();
--#else
--	consolekit_stop ();
--#endif
--}
--
--void
--gsd_power_hibernate (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_hibernate ();
--#else
--	upower_hibernate (upower_proxy);
--#endif
--}
-diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
-deleted file mode 100644
-index e3be14f..0000000
---- a/plugins/common/gsd-power-helper.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- */
--
--#ifndef __GSD_POWER_HELPER_H
--#define __GSD_POWER_HELPER_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--#include <gio/gio.h>
--
--void gsd_power_suspend   (GDBusProxy *upower_proxy);
--void gsd_power_hibernate (GDBusProxy *upower_proxy);
--void gsd_power_poweroff  (void);
--
--G_END_DECLS
--
--#endif /* __GSD_POWER_HELPER_H */
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 9c84d7f..a2f277e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
- 
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -51,7 +52,6 @@
- #include "shortcuts-list.h"
- #include "gsd-osd-window.h"
- #include "gsd-input-helper.h"
--#include "gsd-power-helper.h"
- #include "gsd-enums.h"
- 
- #include <canberra.h>
-@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
- #define KEY_CURRENT_INPUT_SOURCE "current"
- #define KEY_INPUT_SOURCES        "sources"
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
- 
-         /* Power stuff */
-         GSettings       *power_settings;
--        GDBusProxy      *upower_proxy;
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
- 
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
- }
- 
- static void
-+power_action_suspend (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
-+power_action_hibernate (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
- do_config_power_action (GsdMediaKeysManager *manager,
-                         const gchar *config_key)
- {
-@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                                            config_key);
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                power_action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown (manager);
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                power_action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
- 
-+        g_clear_object (&priv->logind_proxy);
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                 priv->power_keyboard_proxy = NULL;
-         }
- 
--        if (priv->upower_proxy) {
--                g_object_unref (priv->upower_proxy);
--                priv->upower_proxy = NULL;
--        }
--
-         if (priv->cancellable != NULL) {
-                 g_cancellable_cancel (priv->cancellable);
-                 g_object_unref (priv->cancellable);
-@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
- }
- 
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "GNOME handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
- 
- static void
-@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
- 
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
- 
-         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
- }
-@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
- }
- 
- static void
--upower_ready_cb (GObject             *source_object,
--                 GAsyncResult        *res,
--                 GsdMediaKeysManager *manager)
--{
--        GError *error = NULL;
--
--        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
--        if (manager->priv->upower_proxy == NULL) {
--                g_warning ("Failed to get proxy for upower: %s",
--                           error->message);
--                g_error_free (error);
--        }
--}
--
--static void
- power_screen_ready_cb (GObject             *source_object,
-                        GAsyncResult        *res,
-                        GsdMediaKeysManager *manager)
-@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
-                    manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
--
--        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--                                  G_DBUS_PROXY_FLAGS_NONE,
--                                  NULL,
--                                  "org.freedesktop.UPower",
--                                  "/org/freedesktop/UPower",
--                                  "org.freedesktop.UPower",
--                                  NULL,
--                                  (GAsyncReadyCallback) upower_ready_cb,
--                                  manager);
- }
- 
- GsdMediaKeysManager *
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 0e06495..7c120c4 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
-  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -31,6 +31,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
- 
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
-@@ -42,7 +43,6 @@
- #include "gnome-settings-session.h"
- #include "gsd-enums.h"
- #include "gsd-power-manager.h"
--#include "gsd-power-helper.h"
- 
- #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
- #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
-@@ -77,6 +77,10 @@
- #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
- #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-@@ -190,13 +194,19 @@ struct GsdPowerManagerPrivate
-         ca_context              *canberra_context;
-         ca_proplist             *critical_alert_loop_props;
-         guint32                  critical_alert_timeout_id;
--        GDBusProxy              *screensaver_proxy;
-         GDBusProxy              *session_proxy;
-         GDBusProxy              *session_presence_proxy;
-         GpmIdletime             *idletime;
-         GsdPowerIdleMode         current_idle_mode;
--        guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
-+        guint                    inhibit_lid_switch_timer_id;
- };
- 
- enum {
-@@ -213,8 +223,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
- static gchar    *engine_get_summary (GsdPowerManager *manager);
- static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
- static void      do_lid_closed_action (GsdPowerManager *manager);
--static void      lock_screensaver (GsdPowerManager *manager);
--static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
-+static void      uninhibit_lid_switch (GsdPowerManager *manager);
-+static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
- 
- G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
- 
-@@ -2044,6 +2054,57 @@ gnome_session_shutdown (void)
- }
- 
- static void
-+action_poweroff (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "PowerOff",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_hibernate (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
- do_power_action_type (GsdPowerManager *manager,
-                       GsdPowerActionType action_type)
- {
-@@ -2052,19 +2113,19 @@ do_power_action_type (GsdPowerManager *manager,
- 
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 /* this is only used on critically low battery where
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
--                gsd_power_poweroff ();
-+                action_poweroff (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -2136,85 +2197,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
-         return ret;
- }
- 
--static void
--do_lid_open_action (GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* play a sound, using sounds from the naming spec */
--        ca_context_play (manager->priv->canberra_context, 0,
--                         CA_PROP_EVENT_ID, "lid-open",
--                         /* TRANSLATORS: this is the sound description */
--                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
--                         NULL);
--
--        /* ensure we turn the panel back on after lid open */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after lid open: %s",
--                           error->message);
--                g_clear_error (&error);
--        }
--
--        /* only toggle keyboard if present and already toggled off */
--        if (manager->priv->upower_kdb_proxy != NULL &&
--            manager->priv->kbd_brightness_old != -1) {
--                ret = upower_kbd_toggle (manager, &error);
--                if (!ret) {
--                        g_warning ("failed to turn the kbd backlight on: %s",
--                                   error->message);
--                        g_error_free (error);
--                }
--        }
--
--        kill_lid_close_safety_timer (manager);
--}
--
- static gboolean
--is_on (GnomeRROutput *output)
-+inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
- {
--	GnomeRRCrtc *crtc;
--
--	crtc = gnome_rr_output_get_crtc (output);
--	if (!crtc)
--		return FALSE;
--	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
--}
--
--static gboolean
--non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
--{
--        GnomeRROutput **outputs;
--        int i;
--
--        outputs = gnome_rr_screen_list_outputs (screen);
--        for (i = 0; outputs[i] != NULL; i++) {
--                if (gnome_rr_output_is_laptop (outputs[i]))
--                        continue;
--
--                if (is_on (outputs[i]))
--                        return FALSE;
-+        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
-+            g_settings_get_boolean (manager->priv->settings,
-+                                    "lid-close-suspend-with-external-monitor")) {
-+                g_debug ("no external monitors for a while; uninhibiting lid close");
-+                uninhibit_lid_switch (manager);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                return G_SOURCE_REMOVE;
-         }
- 
--        return TRUE;
--}
--
--/* Timeout callback used to check conditions when the laptop's lid is closed but
-- * the machine is not suspended yet.  We try to suspend again, so that the laptop
-- * won't overheat if placed in a backpack.
-- */
--static gboolean
--lid_close_safety_timer_cb (GsdPowerManager *manager)
--{
--        manager->priv->lid_close_safety_timer_id = 0;
--
--        g_debug ("lid has been closed for a while; trying to suspend again");
--        do_lid_closed_action (manager);
--
--        return FALSE;
-+        g_debug ("external monitor still there; trying again later");
-+        return G_SOURCE_CONTINUE;
- }
- 
- /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2222,82 +2218,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
-  * again in the timeout handler to see if we can suspend then.
-  */
- static void
--setup_lid_close_safety_timer (GsdPowerManager *manager)
-+setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0)
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("lid close safety timer already set up");
-                 return;
-+        }
-+
-+        g_debug ("setting up lid close safety timer");
- 
--        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
--                                                                          (GSourceFunc) lid_close_safety_timer_cb,
-+        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
-+                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
-                                                                           manager);
--        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
-+        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
- }
- 
- static void
--kill_lid_close_safety_timer (GsdPowerManager *manager)
-+restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0) {
--                g_source_remove (manager->priv->lid_close_safety_timer_id);
--                manager->priv->lid_close_safety_timer_id = 0;
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("restarting lid close safety timer");
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                setup_inhibit_lid_switch_timer (manager);
-         }
- }
- 
- static void
--suspend_with_lid_closed (GsdPowerManager *manager)
-+do_lid_open_action (GsdPowerManager *manager)
- {
-         gboolean ret;
-         GError *error = NULL;
--        GsdPowerActionType action_type;
- 
--        /* maybe lock the screen if the lid is closed */
--        lock_screensaver (manager);
--
--        /* we have different settings depending on AC state */
--        if (up_client_get_on_battery (manager->priv->up_client)) {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-battery-action");
--        } else {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-ac-action");
--        }
--
--        /* check we won't melt when the lid is closed */
--        if (action_type != GSD_POWER_ACTION_SUSPEND &&
--            action_type != GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
--                        g_warning ("to prevent damage, now forcing suspend");
--                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
--                        return;
--                }
--        }
-+        /* play a sound, using sounds from the naming spec */
-+        ca_context_play (manager->priv->canberra_context, 0,
-+                         CA_PROP_EVENT_ID, "lid-open",
-+                         /* TRANSLATORS: this is the sound description */
-+                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
-+                         NULL);
- 
--        /* ensure we turn the panel back on after resume */
-+        /* ensure we turn the panel back on after lid open */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_OFF,
-+                                             GNOME_RR_DPMS_ON,
-                                              &error);
-         if (!ret) {
--                g_warning ("failed to turn the panel off after lid close: %s",
-+                g_warning ("failed to turn the panel on after lid open: %s",
-                            error->message);
--                g_error_free (error);
-+                g_clear_error (&error);
-         }
- 
--        /* only toggle keyboard if present and not already toggled */
--        if (manager->priv->upower_kdb_proxy &&
--            manager->priv->kbd_brightness_old == -1) {
-+        /* only toggle keyboard if present and already toggled off */
-+        if (manager->priv->upower_kdb_proxy != NULL &&
-+            manager->priv->kbd_brightness_old != -1) {
-                 ret = upower_kbd_toggle (manager, &error);
-                 if (!ret) {
--                        g_warning ("failed to turn the kbd backlight off: %s",
-+                        g_warning ("failed to turn the kbd backlight on: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--
--        do_power_action_type (manager, action_type);
- }
- 
- static void
- do_lid_closed_action (GsdPowerManager *manager)
- {
-+        gboolean ret;
-+        GError *error = NULL;
-+
-         /* play a sound, using sounds from the naming spec */
-         ca_context_play (manager->priv->canberra_context, 0,
-                          CA_PROP_EVENT_ID, "lid-close",
-@@ -2305,21 +2292,22 @@ do_lid_closed_action (GsdPowerManager *manager)
-                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
-                          NULL);
- 
-+        /* turn the panel off if the lid is closed (mainly for Dells...) */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_OFF,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel off after lid close: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
-         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
- 
--        /* perform policy action */
--        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
--            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
--                g_debug ("lid is closed; suspending or hibernating");
--                suspend_with_lid_closed (manager);
--        } else {
--                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
--                setup_lid_close_safety_timer (manager);
--        }
-+        restart_inhibit_lid_switch_timer (manager);
- }
- 
--
- static void
- up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
- {
-@@ -2339,6 +2327,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
-         if (manager->priv->lid_is_closed == tmp)
-                 return;
-         manager->priv->lid_is_closed = tmp;
-+        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
- 
-         /* fake a keypress */
-         if (tmp)
-@@ -3290,30 +3279,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
- }
- 
- static void
--sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
--                            GAsyncResult *res,
--                            gpointer user_data)
--{
--        GError *error = NULL;
--        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
--
--        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
--        if (manager->priv->screensaver_proxy == NULL) {
--                g_warning ("Could not connect to gnome-screensaver: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Finish the upower_notify_sleep_cb() call by locking the screen */
--        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
--        g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                           "Lock",
--                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                           NULL, NULL, NULL);
--}
--
--static void
- idle_dbus_signal_cb (GDBusProxy *proxy,
-                      const gchar *sender_name,
-                      const gchar *signal_name,
-@@ -3465,75 +3430,38 @@ out:
- }
- 
- static void
--lock_screensaver (GsdPowerManager *manager)
-+lock_screensaver (GsdPowerManager *manager,
-+                  GSourceFunc      done_cb)
- {
-         gboolean do_lock;
- 
-         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
-                                           "lock-enabled");
--        if (!do_lock)
-+        if (!do_lock && done_cb) {
-+                done_cb (manager);
-                 return;
--
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_debug ("doing gnome-screensaver lock");
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "Lock",
--                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                                   NULL, NULL, NULL);
--        } else {
--                /* connect to the screensaver first */
--                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                          NULL,
--                                          GS_DBUS_NAME,
--                                          GS_DBUS_PATH,
--                                          GS_DBUS_INTERFACE,
--                                          NULL,
--                                          sleep_cb_screensaver_proxy_ready_cb,
--                                          manager);
-         }
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        GsdPowerManager *manager)
--{
--        lock_screensaver (manager);
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
--        }
--
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
- 
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "Lock",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* Wait until gnome-shell shield animation is done
-+         *
-+         * FIXME: the shell should mark the lock as active
-+         * when the shield is down, then we could wait for
-+         * that. This would also fix the problem that we wait
-+         * needlessly when the shell has already locked the
-+         * screen because it is initiating the suspend.
-+         *
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
-+         */
-+        g_timeout_add (500, done_cb, manager);
- }
- 
- static void
-@@ -3621,6 +3549,287 @@ engine_session_active_changed_cb (GnomeSettingsSession *session,
-         idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL);
- }
- 
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                g_debug ("no lid-switch inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing lid switch system inhibitor");
-+        close (manager->priv->inhibit_lid_switch_fd);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_lid_switch_taken = FALSE;
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "GNOME needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+}
-+
-+static gboolean
-+randr_output_is_on (GnomeRROutput *output)
-+{
-+	GnomeRRCrtc *crtc;
-+
-+	crtc = gnome_rr_output_get_crtc (output);
-+	if (!crtc)
-+		return FALSE;
-+	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
-+}
-+
-+static gboolean
-+external_monitor_is_connected (GnomeRRScreen *screen)
-+{
-+        GnomeRROutput **outputs;
-+        guint i;
-+
-+        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
-+                return TRUE;
-+
-+        /* see if we have more than one screen plugged in */
-+        outputs = gnome_rr_screen_list_outputs (screen);
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (randr_output_is_on (outputs[i]) &&
-+                    !gnome_rr_output_is_laptop (outputs[i]))
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+on_randr_event (GnomeRRScreen *screen, gpointer user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+
-+        /* when a second monitor is plugged in, we take the
-+         * handle-lid-switch inhibitor lock of logind to prevent
-+         * it from suspending.
-+         *
-+         * Uninhibiting is done in the inhibit_lid_switch_timer,
-+         * since we want to give users a few seconds when unplugging
-+         * and replugging an external monitor, not suspend right away.
-+         */
-+        if (external_monitor_is_connected (screen) &&
-+            !g_settings_get_boolean (manager->priv->settings,
-+                                     "lid-close-suspend-with-external-monitor")) {
-+                inhibit_lid_switch (manager);
-+                setup_inhibit_lid_switch_timer (manager);
-+        }
-+        else {
-+                restart_inhibit_lid_switch_timer (manager);
-+        }
-+}
-+
-+static gboolean
-+screen_lock_done_cb (gpointer data)
-+{
-+        GsdPowerManager *manager = data;
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        lock_screensaver (manager, screen_lock_done_cb);
-+}
-+
-+static void
-+handle_resume_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3630,6 +3839,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
- 
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return FALSE;
-+        }
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-         /* track the active session */
-         manager->priv->session = gnome_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3644,10 +3872,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
-         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-         manager->priv->up_client = up_client_new ();
--        g_signal_connect (manager->priv->up_client, "notify-sleep",
--                          G_CALLBACK (upower_notify_sleep_cb), manager);
--        g_signal_connect (manager->priv->up_client, "notify-resume",
--                          G_CALLBACK (upower_notify_resume_cb), manager);
-         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-         g_signal_connect (manager->priv->up_client, "device-added",
-                           G_CALLBACK (engine_device_added_cb), manager);
-@@ -3761,6 +3985,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
-         if (manager->priv->x11_screen == NULL)
-                 return FALSE;
-+        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
-+        /* set up initial state */
-+        on_randr_event (manager->priv->x11_screen, manager);
- 
-         /* ensure the default dpms timeouts are cleared */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3787,6 +4014,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
- 
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+        }
-+
-         if (manager->priv->bus_cancellable != NULL) {
-                 g_cancellable_cancel (manager->priv->bus_cancellable);
-                 g_object_unref (manager->priv->bus_cancellable);
-@@ -3798,8 +4030,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-                 manager->priv->introspection_data = NULL;
-         }
- 
--        kill_lid_close_safety_timer (manager);
--
-         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
- 
-         g_clear_object (&manager->priv->connection);
-@@ -3807,6 +4037,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-         g_clear_object (&manager->priv->settings);
-         g_clear_object (&manager->priv->settings_screensaver);
-         g_clear_object (&manager->priv->up_client);
-+
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        g_clear_object (&manager->priv->logind_proxy);
-         g_clear_object (&manager->priv->x11_screen);
- 
-         g_ptr_array_unref (manager->priv->devices_array);
-@@ -3835,6 +4078,8 @@ static void
- gsd_power_manager_init (GsdPowerManager *manager)
- {
-         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
- 
- static void
--- 
-1.7.12.1
-
diff --git a/gnome-unstable/gnome-settings-daemon/PKGBUILD b/gnome-unstable/gnome-settings-daemon/PKGBUILD
deleted file mode 100644
index ead00043f..000000000
--- a/gnome-unstable/gnome-settings-daemon/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 168324 2012-10-08 19:48:38Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-settings-daemon
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
-         'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus')
-makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch)
-sha256sums=('1fe96e0709d7c618d90cc1bfcddc46eede3c2cdb305f5e7f4cb388d43dd5526a'
-            '3b72ba86321446e92a6fe32167ebd5edbdd66ab1f7d1eda8a7a3edf5c6d5e1eb')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # logind key handling FS#31801, patches from Fedora
-  patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
-  aclocal
-  automake
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Plugins that aren't installed still have schema references
-  # and cause gsettings errors - remove the references we're not using
-  sed -i '/org\.gnome\.settings-daemon\.plugins\.updates/d' \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml"
-}
diff --git a/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install b/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/gnome-unstable/gnome-settings-daemon/gnome-settings-daemon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD
deleted file mode 100644
index 411564527..000000000
--- a/gnome-unstable/gnome-shell/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168833 2012-10-16 11:21:12Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('566a9d902f85a89c23dc29f1789f859aa2c5a0de7dffa5235bf5a1885c76a3a7')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-shell/gnome-shell.install b/gnome-unstable/gnome-shell/gnome-shell.install
deleted file mode 100644
index 27d70b19d..000000000
--- a/gnome-unstable/gnome-shell/gnome-shell.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-shell/recorder.patch b/gnome-unstable/gnome-shell/recorder.patch
deleted file mode 100644
index 41134a31a..000000000
--- a/gnome-unstable/gnome-shell/recorder.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 915524e1ab7d2c5efb95985f30ee2f7c5ca69554 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 02 May 2012 14:44:40 +0000
-Subject: main: Close the recorder instead of pausing it
-
-Pausing means that we will continue to use the same output file when
-the keybinding is activated again. While useful to record a single
-video in chunks, it doesn't seem to be how most users understand the
-keybinding. Closing the recorder will close the file and create a new
-one the next time the keybinding is pressed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=675128
----
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 3b80297..25ad8d8 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -110,7 +110,7 @@ function _initRecorder() {
-         }
- 
-         if (recorder.is_recording()) {
--            recorder.pause();
-+            recorder.close();
-             Meta.enable_unredirect_for_screen(global.screen);
-         } else {
-             // read the parameters from GSettings always in case they have changed
---
-cgit v0.9.0.2
diff --git a/gnome-unstable/gnome-system-log/PKGBUILD b/gnome-unstable/gnome-system-log/PKGBUILD
deleted file mode 100644
index 954b61179..000000000
--- a/gnome-unstable/gnome-system-log/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167047 2012-09-24 20:47:21Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-system-log
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="View your system logs"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3')
-makedepends=('intltool' 'itstool' 'docbook-xsl')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('46dea7cb8c63c26578bd0c854aa9143e86b094bc676564400bf4c57fc259369a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-system-log/gnome-system-log.install b/gnome-unstable/gnome-system-log/gnome-system-log.install
deleted file mode 100644
index 847019792..000000000
--- a/gnome-unstable/gnome-system-log/gnome-system-log.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-system-monitor/PKGBUILD b/gnome-unstable/gnome-system-monitor/PKGBUILD
deleted file mode 100644
index 82b3f0d90..000000000
--- a/gnome-unstable/gnome-system-monitor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167036 2012-09-24 20:18:58Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-system-monitor
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd')
-makedepends=('itstool' 'docbook-xsl' 'intltool')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install b/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/gnome-terminal/PKGBUILD b/gnome-unstable/gnome-terminal/PKGBUILD
deleted file mode 100644
index b5c5f6bb8..000000000
--- a/gnome-unstable/gnome-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167769 2012-10-03 14:39:33Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl')
-options=('!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/gnome-unstable/gnome-terminal/gnome-terminal.install b/gnome-unstable/gnome-terminal/gnome-terminal.install
deleted file mode 100644
index 1d8510f06..000000000
--- a/gnome-unstable/gnome-terminal/gnome-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-terminal
-
-post_install() {
-  gconfpkg --install $pkgname
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
diff --git a/gnome-unstable/gnome-themes-standard/PKGBUILD b/gnome-unstable/gnome-themes-standard/PKGBUILD
deleted file mode 100644
index 4fdb81e35..000000000
--- a/gnome-unstable/gnome-themes-standard/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168975 2012-10-17 07:20:15Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-themes-standard
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f56dd1f593b0a853041b54f9167aab0cb3689ced9cd8f8f4d777c3116bb4878a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/gnome-user-share/PKGBUILD b/gnome-unstable/gnome-user-share/PKGBUILD
deleted file mode 100644
index db00ff47f..000000000
--- a/gnome-unstable/gnome-user-share/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167785 2012-10-03 14:41:05Z heftig $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-user-share
-pkgver=3.0.4
-pkgrel=1
-pkgdesc="Easy to use user-level file sharing for GNOME."
-arch=('i686' 'x86_64')
-url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
-license=('GPL')
-depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
-makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl')
-options=('!emptydirs' '!libtool')
-install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-user-share \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gnome-user-share/gnome-user-share.install b/gnome-unstable/gnome-user-share/gnome-user-share.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/gnome-unstable/gnome-user-share/gnome-user-share.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gobject-introspection/PKGBUILD b/gnome-unstable/gobject-introspection/PKGBUILD
deleted file mode 100644
index f684b120d..000000000
--- a/gnome-unstable/gobject-introspection/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169074 2012-10-17 17:41:57Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gobject-introspection
-pkgver=1.34.1.1
-pkgrel=1
-pkgdesc="Introspection system for GObject-based libraries"
-url="https://live.gnome.org/GObjectIntrospection"
-arch=('x86_64' 'i686')
-license=('LGPL' 'GPL')
-depends=('glib2' 'python2')
-makedepends=('cairo')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('85b9ac268d34311138f3c6bf646c07975eebfae6ae67d9239e1066a42c5d525b')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  sed -i '1s|#!/usr/bin/env python$|&2|' \
-    "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py
-}
diff --git a/gnome-unstable/grilo-plugins/PKGBUILD b/gnome-unstable/grilo-plugins/PKGBUILD
deleted file mode 100644
index 972566440..000000000
--- a/gnome-unstable/grilo-plugins/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 167998 2012-10-04 23:16:55Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=grilo-plugins
-pkgver=0.2.2
-pkgrel=1
-pkgdesc="Plugins for Grilo"
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('grilo' 'sqlite' 'libgcrypt')
-makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing
-             json-glib)
-optdepends=('gupnp-av: uPnP plugin'
-            'libgdata: Youtube plugin'
-            'libquvi: Youtube plugin'
-            'sqlite: Podcasts plugin'
-            'gmime: Podcasts plugin'
-            'rest: Blip.tv plugin'
-            'libtracker-sparql: Tracker plugin'
-            'totem-plparser: Optical media plugin'
-            'libdmapsharing: DMAP sharing plugin'
-            'json-glib: TMDb plugin')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('54e65b734917df74ba5e53d92a3b2e69edd669625820fd0353c22e9b0f61e90d')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/grilo/PKGBUILD b/gnome-unstable/grilo/PKGBUILD
deleted file mode 100644
index 024f59890..000000000
--- a/gnome-unstable/grilo/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 167997 2012-10-04 23:14:47Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=grilo
-pkgver=0.2.2
-pkgrel=1
-pkgdesc="Framework that provides access to various sources of multimedia content"
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3' 'libxml2' 'libsoup')
-makedepends=('gobject-introspection' 'gtk-doc' 'vala')
-optdepends=('grilo-plugins: Plugins for grilo')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e98d86e9c26dc444f43782e68f44a90da47f69da8a4ac313da9a3795fb72271f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gssdp/PKGBUILD b/gnome-unstable/gssdp/PKGBUILD
deleted file mode 100644
index 222da9525..000000000
--- a/gnome-unstable/gssdp/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167730 2012-10-03 12:52:04Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gssdp
-pkgver=0.12.2.1
-pkgrel=1
-pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
-arch=('i686' 'x86_64')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('libsoup')
-makedepends=('gobject-introspection' 'gtk2' 'gtk-doc')
-optdepends=('gtk2: gssdp-device-sniffer')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gst-libav/PKGBUILD b/gnome-unstable/gst-libav/PKGBUILD
deleted file mode 100644
index 67f877215..000000000
--- a/gnome-unstable/gst-libav/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 168815 2012-10-16 09:05:59Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-libav
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="Gstreamer libav Plugin"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('gst-plugins-base-libs' 'bzip2')
-makedepends=('yasm')
-options=(!libtool !emptydirs)
-provides=("gst-ffmpeg=$pkgver-pkgrel")
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('7c998468ffa57b5d1c2c76d6857dbc0c4ed87fd207ef71bf96aeaada6a1cfa89')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \
-    --with-package-name="GStreamer libav Plugin (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gst-plugins-bad/PKGBUILD b/gnome-unstable/gst-plugins-bad/PKGBUILD
deleted file mode 100644
index 1326152c6..000000000
--- a/gnome-unstable/gst-plugins-bad/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-bad
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Bad Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'faac' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus')
-makedepends=('gstreamer' 'schroedinger' 'gtk3' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e3cffcd258c4c722c880a52ebc9920d6b38aa4153bbc49d1b5a9893885d45f3')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Bad Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
-    --with-gtk=3.0
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gst-plugins-base/PKGBUILD b/gnome-unstable/gst-plugins-base/PKGBUILD
deleted file mode 100644
index 27c9ccd41..000000000
--- a/gnome-unstable/gst-plugins-base/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 153256 2012-03-12 15:48:30Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gst-plugins-base
-pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
-options=(!libtool !emptydirs)
-url="http://gstreamer.freedesktop.org/"
-source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('75466452e4267fff86e322bc52ed0c962c6c3785f802230fe898cb09984b8de0')
-
-build() {
-  cd $pkgbase-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
-}
-
-check() {
-  cd $pkgbase-$pkgver
-  # Testsuite fails on one test. Some refcount leak
-  #make check
-}
-
-package_gst-plugins-base-libs() {
-  pkgdesc="GStreamer Multimedia Framework Base Plugin libraries"
-  depends=('gstreamer' 'orc' 'libxv')
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gst-plugins-base() {
-  depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango')
-
-  cd $pkgbase-$pkgver
-  make -C gst-libs DESTDIR="${pkgdir}" install
-  make -C ext DESTDIR="${pkgdir}" install
-  make -C gst-libs DESTDIR="${pkgdir}" uninstall
-}
diff --git a/gnome-unstable/gst-plugins-good/PKGBUILD b/gnome-unstable/gst-plugins-good/PKGBUILD
deleted file mode 100644
index 159322646..000000000
--- a/gnome-unstable/gst-plugins-good/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-good
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Good Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883')
-makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('30bc72d77d274289844e2138ca79c840')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gst-plugins-ugly/PKGBUILD b/gnome-unstable/gst-plugins-ugly/PKGBUILD
deleted file mode 100644
index e54276afd..000000000
--- a/gnome-unstable/gst-plugins-ugly/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 168810 2012-10-16 08:45:47Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-ugly
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('378952a36e553f65fc1fcbcb0cc445304337e2e75503fb6b5f0ca2c05405e4f0')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gstreamer/PKGBUILD b/gnome-unstable/gstreamer/PKGBUILD
deleted file mode 100644
index 474424f8a..000000000
--- a/gnome-unstable/gstreamer/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 153251 2012-03-12 14:53:13Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gstreamer
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('libxml2' 'glib2')
-optdepends=('sh: feedback script')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('e0e5478bc81caa7e208b0863419bb98b2fbef281a7c806bea61bd70db8c9d3dc')
-
-build() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-    --with-package-name="GStreamer (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
-    --enable-gtk-doc --disable-static
-  make
-}
-
-check() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/gthumb/PKGBUILD b/gnome-unstable/gthumb/PKGBUILD
deleted file mode 100644
index 6af778627..000000000
--- a/gnome-unstable/gthumb/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 167923 2012-10-03 20:33:57Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=3.1.1
-pkgrel=1
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/gthumb"
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp')
-makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
-             'brasero' 'librsvg' 'libopenraw' 'liboauth')
-optdepends=('libopenraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'libsoup-gnome: web albums'
-            'liboauth: web albums')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7e725ba38d1220ed09d0657dd365982547856aa0d03c775891de33d04c31e332')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-libchamplain --enable-libopenraw
-  
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gthumb/gthumb.install b/gnome-unstable/gthumb/gthumb.install
deleted file mode 100644
index 9d4e7822f..000000000
--- a/gnome-unstable/gthumb/gthumb.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.1) < 0 )); then
-    gconfpkg --uninstall gthumb
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gtk3/PKGBUILD b/gnome-unstable/gtk3/PKGBUILD
deleted file mode 100644
index d10f53fb2..000000000
--- a/gnome-unstable/gtk3/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 168831 2012-10-16 11:12:48Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk')
-makedepends=('gobject-introspection')
-options=('!libtool')
-backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-        settings.ini wacom.patch)
-sha256sums=('fe6c89ae40145b077d7291105e81d4f876be01bf21ddfb9cba449f6be49d7996'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5')
-build() {
-    cd "gtk+-$pkgver"
-
-    # Partially revert BGO#673440 in order to fix BGO#674157
-    patch -Np1 -i ../wacom.patch
-
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-gtk2-dependency \
-        --disable-schemas-compile
-    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make
-}
-
-package() {
-    cd "gtk+-$pkgver"
-    make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
-}
diff --git a/gnome-unstable/gtk3/gtk3.install b/gnome-unstable/gtk3/gtk3.install
deleted file mode 100644
index ca20d2865..000000000
--- a/gnome-unstable/gtk3/gtk3.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    /usr/bin/gtk-query-immodules-3.0 --update-cache
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/gtk3/settings.ini b/gnome-unstable/gtk3/settings.ini
deleted file mode 100644
index 039000d38..000000000
--- a/gnome-unstable/gtk3/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
diff --git a/gnome-unstable/gtk3/wacom.patch b/gnome-unstable/gtk3/wacom.patch
deleted file mode 100644
index 79ad84fc6..000000000
--- a/gnome-unstable/gtk3/wacom.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c
---- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c	2012-05-02 14:45:04.000000000 +0200
-+++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c	2012-05-03 18:34:18.034807644 +0200
-@@ -331,6 +331,8 @@
-         input_source = GDK_SOURCE_ERASER;
-       else if (strstr (tmp_name, "cursor"))
-         input_source = GDK_SOURCE_CURSOR;
-+      else if (strstr (tmp_name, "finger"))
-+        input_source = GDK_SOURCE_TOUCHSCREEN;
-       else if (strstr (tmp_name, "wacom") ||
-                strstr (tmp_name, "pen"))
-         input_source = GDK_SOURCE_PEN;
diff --git a/gnome-unstable/gtkhtml4/PKGBUILD b/gnome-unstable/gtkhtml4/PKGBUILD
deleted file mode 100644
index 47972b0a8..000000000
--- a/gnome-unstable/gtkhtml4/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167053 2012-09-24 21:03:47Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtkhtml4
-_pkgbasename=gtkhtml
-pkgver=4.6.0
-pkgrel=1
-pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
-makedepends=('intltool')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('129023d83d5e53f22c7b103ed8668204f78c23837955905315dc95b48618c29e')
-
-build() {
-    cd "$_pkgbasename-$pkgver"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gtkhtml4 \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "$_pkgbasename-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gtkmm3/PKGBUILD b/gnome-unstable/gtkmm3/PKGBUILD
deleted file mode 100644
index 63ec30798..000000000
--- a/gnome-unstable/gtkmm3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 167340 2012-10-01 14:04:39Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=gtkmm3
-_pkgbasename=gtkmm
-pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.5.13
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://www.gtkmm.org/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('2dcd3654f1e88cd80d1641e91bb9bceb10216ee74ec400c14f7bb7c5e4cecbfc')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm3() {
-  pkgdesc="C++ bindings for gtk3"
-  depends=('gtk3' 'pangomm' 'atkmm')
-  cd "$_pkgbasename-$pkgver"
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR="$pkgdir" install
-}
-
-package_gtkmm3-docs() {
-  pkgdesc="Developer documentation for gtkmm v3"
-
-  cd "$_pkgbasename-$pkgver"
-  make -C docs DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gtksourceview3/PKGBUILD b/gnome-unstable/gtksourceview3/PKGBUILD
deleted file mode 100644
index c2416d321..000000000
--- a/gnome-unstable/gtksourceview3/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167744 2012-10-03 14:04:40Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtksourceview3
-_pkgbasename=gtksourceview
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libxml2')
-makedepends=('intltool' 'gobject-introspection' 'glade')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('7d268618fbe8c2960300a305d38255294c9f497fcbc0e53a1da1bf9bda0d1c7a')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-glade-catalog
-  make
-}
-
-package() {
-  cd "$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gucharmap/PKGBUILD b/gnome-unstable/gucharmap/PKGBUILD
deleted file mode 100644
index cb002ec81..000000000
--- a/gnome-unstable/gucharmap/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168934 2012-10-16 15:45:21Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gucharmap
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('dconf' 'gtk3' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
-install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('778bbc61bedcb6c573800ccebc56d360d988a156727b5a8f8bac9787c1fe7fb4')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile  --enable-introspection
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gucharmap/gucharmap.install b/gnome-unstable/gucharmap/gucharmap.install
deleted file mode 100644
index 0a9ddf4c2..000000000
--- a/gnome-unstable/gucharmap/gucharmap.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/gupnp/PKGBUILD b/gnome-unstable/gupnp/PKGBUILD
deleted file mode 100644
index 31020ff1f..000000000
--- a/gnome-unstable/gupnp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167735 2012-10-03 13:16:53Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gupnp
-pkgver=0.18.4
-pkgrel=1
-pkgdesc="An object-oriented UPNP framework"
-arch=('i686' 'x86_64')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('gssdp' 'util-linux')
-makedepends=('gobject-introspection' 'gtk-doc')
-optdepends=('python2: gupnp-binding-tool')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --with-context-manager=linux
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/gvfs/PKGBUILD b/gnome-unstable/gvfs/PKGBUILD
deleted file mode 100644
index 48d8a03ba..000000000
--- a/gnome-unstable/gvfs/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 167024 2012-09-24 19:21:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.14.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)   
-sha256sums=('71ab8cf60070025d1aff9bee1f514fdb45682ffad01b6856cabab1bc3791bfb4')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/usr/share/bash-completion/completions
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret')
-  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'
-              'gtk3: Recent files support')
-  install=gvfs.install
-
-  cd "$pkgbase-$pkgver"
-  sed -e 's/^am__append_4/#am__append_4/' \
-      -e 's/^am__append_5/#am__append_5/' \
-      -i monitor/Makefile
-  make DESTDIR="$pkgdir" install
-
-  cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=$pkgver" 'smbclient')
-  install=gvfs-smb.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=$pkgver" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=$pkgver")
-  install=gvfs-module.install
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-}
diff --git a/gnome-unstable/gvfs/gvfs-module.install b/gnome-unstable/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/gnome-unstable/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
diff --git a/gnome-unstable/gvfs/gvfs-smb.install b/gnome-unstable/gvfs/gvfs-smb.install
deleted file mode 100644
index da6a2ab6d..000000000
--- a/gnome-unstable/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/gvfs/gvfs.install b/gnome-unstable/gvfs/gvfs.install
deleted file mode 100644
index 3482d99e3..000000000
--- a/gnome-unstable/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/harfbuzz/PKGBUILD b/gnome-unstable/harfbuzz/PKGBUILD
deleted file mode 100644
index 3ceed5738..000000000
--- a/gnome-unstable/harfbuzz/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=harfbuzz
-pkgver=0.9.4
-pkgrel=1
-pkgdesc="OpenType text shaping engine."
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-license=('MIT')
-depends=('icu' 'glib2' 'freetype2')
-makedepends=('icu' 'cairo' 'glib2' 'freetype2')
-optdepends=('cairo: hb-view program')
-options=(!libtool)
-source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc')
-
-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/harfbuzz/COPYING"
-}
diff --git a/gnome-unstable/ibus/PKGBUILD b/gnome-unstable/ibus/PKGBUILD
deleted file mode 100644
index 79bf2f9b3..000000000
--- a/gnome-unstable/ibus/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-# Contributor: Rainy <rainylau(at)gmail(dot)com>
-# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=ibus
-pkgver=1.4.99.20120822
-pkgrel=1
-pkgdesc="Next Generation Input Bus for Linux"
-arch=('i686' 'x86_64')
-url="http://ibus.googlecode.com"
-license=('LGPL')
-makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool')
-depends=('hicolor-icon-theme' 'gtk2' 'gtk3')
-options=('!libtool')
-install=ibus.install
-source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('46d836b68733953b443859f47ad6991f4584658d')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  export PYTHON=python2
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus \
-    --sysconfdir=/etc \
-    --disable-gconf \
-    --enable-dconf \
-    --disable-memconf \
-    --disable-ui
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/ibus/ibus.install b/gnome-unstable/ibus/ibus.install
deleted file mode 100644
index e4e446693..000000000
--- a/gnome-unstable/ibus/ibus.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-    gtk-query-immodules-3.0 --update-cache 
-
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-    gtk-query-immodules-3.0 --update-cache 
-
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/gnome-unstable/json-glib/PKGBUILD b/gnome-unstable/json-glib/PKGBUILD
deleted file mode 100644
index 15103ec4e..000000000
--- a/gnome-unstable/json-glib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 166351 2012-09-06 20:52:29Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=json-glib
-pkgver=0.15.2
-pkgrel=1
-pkgdesc="JSON library built on GLib"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/JsonGlib"
-license=('GPL')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde')
-
-build(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-
-check(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
diff --git a/gnome-unstable/libcroco/PKGBUILD b/gnome-unstable/libcroco/PKGBUILD
deleted file mode 100644
index f25316ba6..000000000
--- a/gnome-unstable/libcroco/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168930 2012-10-16 15:30:37Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libcroco
-pkgver=0.6.7
-pkgrel=1
-pkgdesc="A CSS parsing library"
-arch=('x86_64' 'i686')
-depends=('glib2' 'libxml2')
-makedepends=('intltool')
-license=('LGPL')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz)
-url="http://www.gnome.org"
-sha256sums=('892b8a7e311b80d0a5a633b8204fed5656d7af20e884719e5ec6e340e1f0cd88')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgdata/PKGBUILD b/gnome-unstable/libgdata/PKGBUILD
deleted file mode 100644
index d5884c060..000000000
--- a/gnome-unstable/libgdata/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 167310 2012-09-30 23:09:54Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgdata
-pkgver=0.13.2
-pkgrel=1
-pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'liboauth' 'gcr' 'gnome-online-accounts')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgnome-keyring/PKGBUILD b/gnome-unstable/libgnome-keyring/PKGBUILD
deleted file mode 100644
index cf9d595e1..000000000
--- a/gnome-unstable/libgnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#$Id: PKGBUILD 167177 2012-09-26 19:37:17Z jgc $
-#Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=libgnome-keyring
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME keyring client library"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('dbus-core' 'glib2' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgnomekbd/PKGBUILD b/gnome-unstable/libgnomekbd/PKGBUILD
deleted file mode 100644
index 2c7afa73b..000000000
--- a/gnome-unstable/libgnomekbd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 167169 2012-09-26 18:42:15Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomekbd
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Gnome keyboard library"
-url="http://gswitchit.sourceforge.net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libxklavier' 'gtk3' 'dconf')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgnomekbd/libgnomekbd.install b/gnome-unstable/libgnomekbd/libgnomekbd.install
deleted file mode 100644
index a3d820459..000000000
--- a/gnome-unstable/libgnomekbd/libgnomekbd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/gnome-unstable/libgweather/PKGBUILD b/gnome-unstable/libgweather/PKGBUILD
deleted file mode 100644
index 13cfb55a9..000000000
--- a/gnome-unstable/libgweather/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 167732 2012-10-03 12:52:47Z jgc $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-
-pkgname=libgweather
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libsoup-gnome' 'gnome-icon-theme' 'gtk3')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/"
-install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gettext-not-xml.patch
-        no_external_gettext.patch)
-sha256sums=('93c9ef9bba3feb559c02b860909915fa9ffc7c08b4789a825939236e3e84b676'
-            '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533'
-            'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672')
-
-build() {
-    cd "$pkgname-$pkgver"
-
-    patch -Np1 -i "$srcdir/gettext-not-xml.patch"
-    patch -Np1 -i "$srcdir/no_external_gettext.patch"
-    gtkdocize
-    autoreconf -fi
-
-    cd po
-     intltool-update --pot
-    cd ../po-locations
-    intltool-update --gettext-package libgweather-locations --pot
-    cd ..
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-        --enable-locations-compression
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libgweather/gettext-not-xml.patch b/gnome-unstable/libgweather/gettext-not-xml.patch
deleted file mode 100644
index b966c5648..000000000
--- a/gnome-unstable/libgweather/gettext-not-xml.patch
+++ /dev/null
@@ -1,551 +0,0 @@
-Description: Switch to using gettext to find localized names for locations, instead of shipping very large locale-specific XML files with lots of duplicate information.
-Author: ?
-
-only in patch2:
-unchanged:
-Index: libgweather-3.5.1/configure.ac
-===================================================================
---- libgweather-3.5.1.orig/configure.ac	2012-06-25 03:23:11.000000000 +1200
-+++ libgweather-3.5.1/configure.ac	2012-07-05 10:27:51.457384292 +1200
-@@ -46,6 +46,10 @@
- LT_INIT([dlopen win32-dll disable-static])
- LT_LIB_M
- 
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- PKG_PROG_PKG_CONFIG([0.19])
- 
- AC_PROG_CC
-@@ -53,13 +57,6 @@
- 
- GLIB_GSETTINGS
- 
--AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AS_HELP_STRING([--enable-all-translations-in-one-xml],
--                        [Put all translations in a big Locations.xml file (slow to parse)])],
--        [enable_big_xml=yes],
--        [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
-         [AS_HELP_STRING([--enable-locations-compression],
-                         [Compress Locations.xml files])],
-@@ -183,7 +180,7 @@
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather-3.0.pc
- libgweather/gweather-3.0-uninstalled.pc
-@@ -192,12 +189,6 @@
- ])
- AC_OUTPUT
- 
--if test "x$enable_big_xml" = "xyes"; then
--	LOCATIONS_XML_TRANSLATIONS="one big file"
--else
--	LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary                                                     ***
- dnl ***************************************************************************
-@@ -208,6 +199,4 @@
- 	Source code location:		${srcdir}
- 	Compiler:			${CC}
- 	Introspection support:          ${found_introspection}
--	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
--	Locations.xml compression:	${enable_locations_compression}
- " >&2
-Index: libgweather-3.5.1/data/Makefile.am
-===================================================================
---- libgweather-3.5.1.orig/data/Makefile.am	2012-06-06 04:07:53.000000000 +1200
-+++ libgweather-3.5.1/data/Makefile.am	2012-07-05 10:27:51.461384292 +1200
-@@ -4,61 +4,21 @@
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
- 
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP = 
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
--	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
--		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
--	fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
- 
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
- 
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
- 
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
--	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
--	for pofile in $(PO_LOCATIONS); do \
--		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
--		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
--		rm -f $$locale/$(libgweatherlocations_data);		\
--		test -d $$locale && rmdir $$locale;			\
--		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
--			gzip --force Locations.$$locale.xml;		\
--		fi;							\
--	done &&								\
--	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
--	rm -f C/$(libgweatherlocations_data) &&				\
--	test -d C && rmdir C &&						\
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
--		gzip --force Locations.xml;				\
--	fi &&								\
--	touch $@
--
--endif # USE_ONE_BIG_XML
--
--### Locations.xml.in rebuild
--rebuild-locations: locationdb.sqlite update-locations.py
--	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
--
--locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt city-fixups.pl station-fixups.pl
--	$(AM_V_GEN)$(srcdir)/build-locationdb.pl
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)  && \
-+	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \
-+	rm -f C/$(libgweatherlocations_DATA) &&				\
-+ 	touch $@
- 
- check:
- 	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
-Index: libgweather-3.5.1/libgweather/gweather-location.c
-===================================================================
---- libgweather-3.5.1.orig/libgweather/gweather-location.c	2012-06-15 08:15:23.000000000 +1200
-+++ libgweather-3.5.1/libgweather/gweather-location.c	2012-07-05 10:27:51.461384292 +1200
-@@ -22,11 +22,14 @@
- #include <config.h>
- #endif
- 
-+#include "config.h"
-+
- #include <string.h>
- #include <math.h>
- #include <locale.h>
- #include <gtk/gtk.h>
- #include <libxml/xmlreader.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -157,10 +160,20 @@
- 
- 	tagname = (const char *) xmlTextReaderConstName (parser->xml);
- 	if (!strcmp (tagname, "name") && !loc->name) {
--	    value = gweather_parser_get_localized_value (parser);
-+	    char *context = NULL;
-+	    context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+	   
-+	    value = gweather_parser_get_value (parser);
- 	    if (!value)
- 		goto error_out;
--	    loc->name = g_strdup (value);
-+
-+	    if (context != NULL) {
-+	    	loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+	    	xmlFree (context);
-+	    }
-+	    else
-+	    	loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+	    
- 	    xmlFree (value);
- 	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- 	    loc->sort_name = g_utf8_casefold (normalized, -1);
-Index: libgweather-3.5.1/libgweather/gweather-timezone.c
-===================================================================
---- libgweather-3.5.1.orig/libgweather/gweather-timezone.c	2011-11-16 01:03:32.000000000 +1300
-+++ libgweather-3.5.1/libgweather/gweather-timezone.c	2012-07-05 10:27:51.461384292 +1200
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -154,7 +155,7 @@
- parse_timezone (GWeatherParser *parser)
- {
-     GWeatherTimezone *zone = NULL;
--    char *id = NULL, *name = NULL;
-+    char *id = NULL, *name = NULL, *context = NULL;
-     int offset = 0, dst_offset = 0;
-     gboolean has_dst = FALSE;
- 
-@@ -177,27 +178,34 @@
- 		continue;
- 	    }
- 
--	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
--		name = gweather_parser_get_localized_value (parser);
-+	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+		context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+		name = gweather_parser_get_value (parser);
-+	    }
- 	    else {
- 		if (xmlTextReaderNext (parser->xml) != 1)
- 		    break;
- 	    }
- 	}
-     }
--
-+	    
-     if (parse_tzdata (id, parser->year_start, parser->year_end,
- 		      &offset, &has_dst, &dst_offset)) {
- 	zone = g_slice_new0 (GWeatherTimezone);
- 	zone->ref_count = 1;
- 	zone->id = g_strdup (id);
--	zone->name = g_strdup (name);
-+	if (context != NULL)
-+		zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+	else
-+		zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- 	zone->offset = offset;
- 	zone->has_dst = has_dst;
- 	zone->dst_offset = dst_offset;
-     }
- 
-     xmlFree (id);
-+    if (context)
-+    	xmlFree (context);
-     if (name)
- 	xmlFree (name);
- 
-Index: libgweather-3.5.1/po-locations/LINGUAS
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/LINGUAS	2012-07-05 10:27:51.461384292 +1200
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-Index: libgweather-3.5.1/po-locations/Makefile.in.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/Makefile.in.in	2012-07-05 10:27:51.461384292 +1200
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-+#
-+# This file may be copied and used freely without restrictions.  It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob@ximian.com> to install
-+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+	$(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+	file=`echo $* | sed 's,.*/,,'`.gmo \
-+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+	sed -f ../intl/po2msg.sed < $< > $*.msg \
-+	  && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+	$(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+	  $(mkdir_p) $$dir; \
-+	  if test -r $$lang.gmo; then \
-+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  else \
-+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $(srcdir)/$$lang.gmo as" \
-+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  fi; \
-+	  if test -r $$lang.gmo.m; then \
-+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	  else \
-+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	    else \
-+	      true; \
-+	    fi; \
-+	  fi; \
-+	done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+	done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+	rm -f missing notexist
-+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+	if [ -r missing -o -r notexist ]; then \
-+	  exit 1; \
-+	fi
-+
-+mostlyclean:
-+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+	rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+	rm -f Makefile Makefile.in POTFILES stamp-it
-+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+	dists="$(DISTFILES)"; \
-+	extra_dists="$(EXTRA_DISTFILES)"; \
-+	for file in $$extra_dists; do \
-+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+	done; \
-+	for file in $$dists; do \
-+	  test -f $$file || file="$(srcdir)/$$file"; \
-+	  ln $$file $(distdir) 2> /dev/null \
-+	    || cp -p $$file $(distdir); \
-+	done
-+
-+update-po: Makefile
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	tmpdir=`pwd`; \
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  echo "$$lang:"; \
-+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+	  if $$result; then \
-+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+	      rm -f $$tmpdir/$$lang.new.po; \
-+            else \
-+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+	        :; \
-+	      else \
-+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+	        rm -f $$tmpdir/$$lang.new.po; \
-+	        exit 1; \
-+	      fi; \
-+	    fi; \
-+	  else \
-+	    echo "msgmerge for $$lang.gmo failed!"; \
-+	    rm -f $$tmpdir/$$lang.new.po; \
-+	  fi; \
-+	done
-+
-+Makefile POTFILES: stamp-it
-+	@if test ! -f $@; then \
-+	  rm -f stamp-it; \
-+	  $(MAKE) stamp-it; \
-+	fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+	       $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-Index: libgweather-3.5.1/po-locations/POTFILES.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/POTFILES.in	2012-07-05 10:27:51.461384292 +1200
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/gnome-unstable/libgweather/libgweather.install b/gnome-unstable/libgweather/libgweather.install
deleted file mode 100644
index 3ba0d0a48..000000000
--- a/gnome-unstable/libgweather/libgweather.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/libgweather.schemas ]; then
-    gconfpkg --uninstall libgweather
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/libgweather/no_external_gettext.patch b/gnome-unstable/libgweather/no_external_gettext.patch
deleted file mode 100644
index 64b3c5ad5..000000000
--- a/gnome-unstable/libgweather/no_external_gettext.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libgweather-3.5.1/configure.ac
-===================================================================
---- libgweather-3.5.1.orig/configure.ac	2012-07-05 10:33:10.277373254 +1200
-+++ libgweather-3.5.1/configure.ac	2012-07-05 10:33:44.957372053 +1200
-@@ -97,9 +97,6 @@
- dnl gettext
- IT_PROG_INTLTOOL([0.50.0])
- 
--AM_GNU_GETTEXT_VERSION([0.18])
--AM_GNU_GETTEXT([external])
--
- GETTEXT_PACKAGE=libgweather-3.0
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
diff --git a/gnome-unstable/libnice/PKGBUILD b/gnome-unstable/libnice/PKGBUILD
deleted file mode 100644
index 05890543b..000000000
--- a/gnome-unstable/libnice/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 500 2009-08-01 11:44:28Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: William Díaz <wdiaz@archlinux.us>
-
-pkgname=libnice
-pkgver=0.1.3
-pkgrel=1
-pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)"
-arch=('i686' 'x86_64')
-url="http://nice.freedesktop.org"
-license=('LGPL')
-depends=('glib2')
-makedepends=('gstreamer' 'gstreamer0.10')
-optdepends=('gstreamer' 'gstreamer0.10')
-options=('!libtool')
-source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('1a0907605f852dcda32a3b3daf38d36c')
diff --git a/gnome-unstable/libpeas/PKGBUILD b/gnome-unstable/libpeas/PKGBUILD
deleted file mode 100644
index d5bcdcfb2..000000000
--- a/gnome-unstable/libpeas/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168808 2012-10-16 08:40:44Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libpeas
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="A GObject-based plugins engine"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
-makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade')
-optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
-            'seed: gobject-based plugin engine - seed runtime loader')
-options=('!libtool')
-install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/libpeas/libpeas.install b/gnome-unstable/libpeas/libpeas.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/gnome-unstable/libpeas/libpeas.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/libpwquality/PKGBUILD b/gnome-unstable/libpwquality/PKGBUILD
deleted file mode 100644
index b40a35d4b..000000000
--- a/gnome-unstable/libpwquality/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libpwquality
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="Library for password quality checking and generating random passwords"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/libpwquality/"
-license=('GPL')
-options=('!libtool')
-depends=('cracklib')
-optdepends=('python2: Python bindings')
-makedepends=('python2')
-source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2)
-md5sums=('8827419118064539db70090cbed5cb21')
-
-build() {
-    cd "$pkgname-$pkgver"
-    sed -i -e 's/python setup.py/python2 setup.py/' python/Makefile.in
-
-    PYTHON=python2 ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/librsvg/PKGBUILD b/gnome-unstable/librsvg/PKGBUILD
deleted file mode 100644
index 8acf2ed45..000000000
--- a/gnome-unstable/librsvg/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168932 2012-10-16 15:37:33Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=librsvg
-pkgver=2.36.4
-pkgrel=1
-pkgdesc="A SVG viewing library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection')
-optdepends=('gtk3: for rsvg-view-3'
-            'gtk2: gtk2 SVG engine module')
-options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
-install=librsvg.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/librsvg/librsvg.install b/gnome-unstable/librsvg/librsvg.install
deleted file mode 100644
index 8852ebf28..000000000
--- a/gnome-unstable/librsvg/librsvg.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/libsecret/PKGBUILD b/gnome-unstable/libsecret/PKGBUILD
deleted file mode 100644
index 1ec9f5695..000000000
--- a/gnome-unstable/libsecret/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libsecret
-pkgver=0.10
-pkgrel=1
-pkgdesc='library for storing and retrieving passwords and other secrets.'
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="https://live.gnome.org/Libsecret"
-depends=('glib2' 'libgcrypt')
-makedepends=('intltool' 'docbook-xsl')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libsoup/PKGBUILD b/gnome-unstable/libsoup/PKGBUILD
deleted file mode 100644
index 22a9a3c1a..000000000
--- a/gnome-unstable/libsoup/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168884 2012-10-16 11:55:47Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.40.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('77a55d57e7e8055acd2f44e0cc889b9ba48052e8b7f07e829157d57417ac650a')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/env python/python2/' libsoup/tld-parser.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
-  pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-2.4"
-  rm -rf "$pkgdir/usr/share"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib"
-}
diff --git a/gnome-unstable/libxklavier/PKGBUILD b/gnome-unstable/libxklavier/PKGBUILD
deleted file mode 100644
index 94e99d10e..000000000
--- a/gnome-unstable/libxklavier/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 167099 2012-09-25 11:40:49Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-
-pkgname=libxklavier
-pkgver=5.3
-pkgrel=1
-pkgdesc="High-level API for X Keyboard Extension"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes')
-makedepends=('gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://gswitchit.sourceforge.net"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libzapojit/PKGBUILD b/gnome-unstable/libzapojit/PKGBUILD
deleted file mode 100644
index af49e2190..000000000
--- a/gnome-unstable/libzapojit/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 167689 2012-10-03 00:44:12Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libzapojit
-pkgver=0.0.2
-pkgrel=1
-pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup' 'gnome-online-accounts')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/libzeitgeist/PKGBUILD b/gnome-unstable/libzeitgeist/PKGBUILD
deleted file mode 100644
index 65137cd82..000000000
--- a/gnome-unstable/libzeitgeist/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: kiefer <jorgelmadrid@gmail.com>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=libzeitgeist
-pkgver=0.3.18
-_pkgmainver=0.3
-pkgrel=3
-pkgdesc="Zeitgeist client library"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/libzeitgeist"
-license=('LGPL2.1')
-depends=('glib2')
-optdepends=("zeitgeist: zeitgeist framework")
-options=('!libtool')
-source=(http://launchpad.net/${pkgname}/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d63a37295d01a58086d0d4ae26e604c2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/mousetweaks/PKGBUILD b/gnome-unstable/mousetweaks/PKGBUILD
deleted file mode 100644
index 4dddd4cb5..000000000
--- a/gnome-unstable/mousetweaks/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> 
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=mousetweaks
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
-arch=(i686 x86_64)
-license=('GPL3' 'FDL')
-depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=mousetweaks.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c48f655c5b53615270503fd1631e0cf7baa5872b20f75af8608983f039c5cfc')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/mousetweaks/mousetweaks.install b/gnome-unstable/mousetweaks/mousetweaks.install
deleted file mode 100644
index 1ae919322..000000000
--- a/gnome-unstable/mousetweaks/mousetweaks.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall mousetweaks
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/mutter/PKGBUILD b/gnome-unstable/mutter/PKGBUILD
deleted file mode 100644
index e31c80a0a..000000000
--- a/gnome-unstable/mutter/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168829 2012-10-16 10:42:58Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity')
-makedepends=('intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4bec46ceb114a78d5f851823d8966b9b386a9319fbec740ff59bf5eb265d6637')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/mutter \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/mutter/mutter.install b/gnome-unstable/mutter/mutter.install
deleted file mode 100644
index c47f1cef2..000000000
--- a/gnome-unstable/mutter/mutter.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=mutter
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        /usr/sbin/gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/nautilus-open-terminal/PKGBUILD b/gnome-unstable/nautilus-open-terminal/PKGBUILD
deleted file mode 100644
index bb24ee9eb..000000000
--- a/gnome-unstable/nautilus-open-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167897 2012-10-03 16:24:35Z jgc $
-# Maintainer : Biru Ionut <ionut@archlinux.ro>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=nautilus-open-terminal
-pkgver=0.19
-pkgrel=3
-pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths"
-arch=('i686' 'x86_64')
-url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal"
-license=('GPL')
-depends=('nautilus' 'gconf')
-makedepends=('pkgconfig' 'gettext' 'intltool')
-install=nautilus-open-terminal.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -dm755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -rf "${pkgdir}"/etc/gconf/schemas
-}
diff --git a/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install b/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install
deleted file mode 100644
index f7cdb9507..000000000
--- a/gnome-unstable/nautilus-open-terminal/nautilus-open-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=nautilus-open-terminal
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/gnome-unstable/nautilus-sendto/PKGBUILD b/gnome-unstable/nautilus-sendto/PKGBUILD
deleted file mode 100644
index 01d5804e7..000000000
--- a/gnome-unstable/nautilus-sendto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167075 2012-09-25 09:23:58Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Tor Krill <tor@krill.nu>
-
-pkgname=nautilus-sendto
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Nautilus context menu for sending files."
-arch=('i686' 'x86_64')
-url="http://download.gnome.org/sources/nautilus-sendto/"
-license=('GPL')
-groups=('gnome-extra')
-depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp')
-options=('!libtool' '!emptydirs')
-install=nautilus-sendto.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/nautilus-sendto/nautilus-sendto.install b/gnome-unstable/nautilus-sendto/nautilus-sendto.install
deleted file mode 100644
index d33a1b261..000000000
--- a/gnome-unstable/nautilus-sendto/nautilus-sendto.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/gnome-unstable/nautilus/PKGBUILD b/gnome-unstable/nautilus/PKGBUILD
deleted file mode 100644
index 17497f9cc..000000000
--- a/gnome-unstable/nautilus/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167026 2012-09-24 19:35:57Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nautilus
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('44d9b967d39c6785f077e4a83e61b398d1676742b9795f9e82a645fc20e80d72')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nautilus \
-      --disable-nst-extension \
-      --disable-update-mimedb \
-      --disable-packagekit \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/nautilus/nautilus.install b/gnome-unstable/nautilus/nautilus.install
deleted file mode 100644
index 082126d24..000000000
--- a/gnome-unstable/nautilus/nautilus.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/networkmanager/NetworkManager.conf b/gnome-unstable/networkmanager/NetworkManager.conf
deleted file mode 100644
index c37b59680..000000000
--- a/gnome-unstable/networkmanager/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD
deleted file mode 100644
index 552d189d6..000000000
--- a/gnome-unstable/networkmanager/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 168706 2012-10-14 16:54:10Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: Jan de Groot <jgc@archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
-
-pkgname=networkmanager
-_pkgname=NetworkManager
-pkgver=0.9.6.0
-pkgrel=5
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/"
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
-         libsoup systemd)
-makedepends=(intltool dhcpcd iptables gobject-introspection)
-optdepends=('modemmanager: for modem management service'
-            'dhcpcd: alternative DHCP client; does not support DHCPv6'
-            'iptables: Connection sharing'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support'
-            'openresolv: resolvconf support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-        nm-polkit-permissive.patch repair-signals.patch systemd-sleep.patch)
-sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
-            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6'
-            '24c181ab69e769e703e45f64a552add5df5de22fbcd8899d588add053674420a')
-
-build() {
-  cd $_pkgname-$pkgver
-
-  patch -Np1 -i ../disable_set_hostname.patch
-  patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../nm-polkit-permissive.patch
-  patch -Np1 -i ../repair-signals.patch # FS#31115
-  patch -Np1 -i ../systemd-sleep.patch
-  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-distro=arch \
-    --with-dhclient=/usr/sbin/dhclient \
-    --with-dhcpcd=/usr/sbin/dhcpcd \
-    --with-iptables=/usr/sbin/iptables \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/sbin/resolvconf \
-    --with-session-tracking=systemd \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax
-
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-
-  rm -r "$pkgdir/var/run"
-}
diff --git a/gnome-unstable/networkmanager/disable_set_hostname.patch b/gnome-unstable/networkmanager/disable_set_hostname.patch
deleted file mode 100644
index ee95dd0e1..000000000
--- a/gnome-unstable/networkmanager/disable_set_hostname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
- 		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */
diff --git a/gnome-unstable/networkmanager/dnsmasq-path.patch b/gnome-unstable/networkmanager/dnsmasq-path.patch
deleted file mode 100644
index c0e713266..000000000
--- a/gnome-unstable/networkmanager/dnsmasq-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c	2011-10-10 23:38:20.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c	2012-03-06 09:07:24.137460927 +0100
-@@ -52,8 +52,11 @@
- find_dnsmasq (void)
- {
- 	static const char *paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
-diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c	2011-04-19 07:06:22.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c	2012-03-06 09:07:58.603851818 +0100
-@@ -170,8 +170,11 @@
- nm_find_dnsmasq (void)
- {
- 	static const char *dnsmasq_binary_paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
diff --git a/gnome-unstable/networkmanager/networkmanager.install b/gnome-unstable/networkmanager/networkmanager.install
deleted file mode 100644
index de40c17ed..000000000
--- a/gnome-unstable/networkmanager/networkmanager.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
-  /etc/NetworkManager/nm-system-settings.conf has been replaced
-  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
-  any custom settings to the new config file.
-MSG
-  true
-}
diff --git a/gnome-unstable/networkmanager/nm-polkit-permissive.patch b/gnome-unstable/networkmanager/nm-polkit-permissive.patch
deleted file mode 100644
index 1ac406224..000000000
--- a/gnome-unstable/networkmanager/nm-polkit-permissive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
---- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive	2011-03-24 14:21:35.100912222 -0500
-+++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in	2011-03-24 14:21:49.916726997 -0500
-@@ -95,7 +95,7 @@
-     <_message>System policy prevents modification of network settings for all users</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_admin_keep</allow_active>
-+      <allow_active>yes</allow_active>
-     </defaults>
-   </action>
- 
diff --git a/gnome-unstable/networkmanager/repair-signals.patch b/gnome-unstable/networkmanager/repair-signals.patch
deleted file mode 100644
index cf1319dc5..000000000
--- a/gnome-unstable/networkmanager/repair-signals.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 13 Sep 2012 09:32:53 +0000
-Subject: core: wait until we daemonized before setting up signals (bgo #683932)
-
-If we mask signals before daemonizing, the daemon process will not be
-able to handle them, and thus would be unkillable with anything other
-than SIGKILL.
----
-diff --git a/src/main.c b/src/main.c
-index 8bc6d3f..5b82cfa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -401,10 +401,6 @@ main (int argc, char *argv[])
- 		exit (1);
- 	}
- 
--	/* Set up unix signal handling */
--	if (!setup_signals ())
--		exit (1);
--
- 	/* Set locale to be able to use environment variables */
- 	setlocale (LC_ALL, "");
- 
-@@ -501,6 +497,10 @@ main (int argc, char *argv[])
- 			wrote_pidfile = TRUE;
- 	}
- 
-+	/* Set up unix signal handling - before creating threads, but after daemonizing! */
-+	if (!setup_signals ())
-+		exit (1);
-+
- 	if (g_fatal_warnings) {
- 		GLogLevelFlags fatal_mask;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/gnome-unstable/networkmanager/systemd-sleep.patch b/gnome-unstable/networkmanager/systemd-sleep.patch
deleted file mode 100644
index 3470d4654..000000000
--- a/gnome-unstable/networkmanager/systemd-sleep.patch
+++ /dev/null
@@ -1,616 +0,0 @@
-From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 9 Oct 2012 00:36:35 -0400
-Subject: [PATCH] core: factor out the upower suspend/resume code (bgo
- #677694)
-
-Factor the code that listens for upower sleeping and resuming
-signals out into a class code NMSleepMonitor.
-
-core: add a systemd suspend/resume monitor (bgo #677694)
-
-This implementation uses a delay inhibitor to get systemd to
-emit PrepareForSleep, and then emits ::Sleeping and ::Resuming
-when receiving the before/after PrepareForSleep emissions.
-
-core: DBusGConnections are not GObjects
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2.
-
-core: fix suspend/resume signal names which the manager listens for
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly
-I also thought GObject lower-cased signal names since it munges them
-for - and _ too.  Apparently not.
----
- configure.ac                   |   2 +-
- src/Makefile.am                |   9 +-
- src/nm-manager.c               |  40 +++-----
- src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++
- src/nm-sleep-monitor-upower.c  | 151 ++++++++++++++++++++++++++++
- src/nm-sleep-monitor.h         |  46 +++++++++
- 6 files changed, 437 insertions(+), 28 deletions(-)
- create mode 100644 src/nm-sleep-monitor-systemd.c
- create mode 100644 src/nm-sleep-monitor-upower.c
- create mode 100644 src/nm-sleep-monitor.h
-
-diff --git a/configure.ac b/configure.ac
-index e76e193..9152c23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
- AC_SUBST(GUDEV_CFLAGS)
- AC_SUBST(GUDEV_LIBS)
- 
--PKG_CHECK_MODULES(GIO, gio-2.0)
-+PKG_CHECK_MODULES(GIO, gio-unix-2.0)
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b155209..ba7d2d6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \
- 		nm-session-monitor.h \
- 		nm-session-utils.c \
- 		nm-session-utils.h \
-+		nm-sleep-monitor.h \
- 		nm-connection-provider.h \
- 		nm-connection-provider.c \
- 		nm-dispatcher.c \
-@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
- endif
- 
- if SESSION_TRACKING_SYSTEMD
--NetworkManager_SOURCES += nm-session-monitor-systemd.c
-+NetworkManager_SOURCES += \
-+		nm-session-monitor-systemd.c \
-+		nm-sleep-monitor-systemd.c
- else
- if SESSION_TRACKING_CK
- NetworkManager_SOURCES += nm-session-monitor-ck.c
- else
- NetworkManager_SOURCES += nm-session-monitor-null.c
- endif
-+
-+# UPower suspend/resume used whenever systemd is not enabled
-+NetworkManager_SOURCES += nm-sleep-monitor-upower.c
- endif
- 
- nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
-@@ -283,6 +289,7 @@ BUILT_SOURCES = \
- NetworkManager_CPPFLAGS = \
- 	$(DBUS_CFLAGS) \
- 	$(GLIB_CFLAGS) \
-+	$(GIO_CFLAGS) \
- 	$(GUDEV_CFLAGS) \
- 	$(LIBNL_CFLAGS) \
- 	$(GMODULE_CFLAGS) \
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 618c4ed..c8ce115 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -69,6 +69,7 @@
- #include "nm-device-factory.h"
- #include "wifi-utils.h"
- #include "nm-enum-types.h"
-+#include "nm-sleep-monitor.h"
- 
- #if WITH_CONCHECK
- #include "nm-connectivity.h"
-@@ -78,8 +79,6 @@
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
- #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
- 
--#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
--
- static gboolean impl_manager_get_devices (NMManager *manager,
-                                           GPtrArray **devices,
-                                           GError **err);
-@@ -228,7 +227,7 @@ typedef struct {
- 	guint modem_removed_id;
- 
- 	DBusGProxy *aipd_proxy;
--	DBusGProxy *upower_proxy;
-+	NMSleepMonitor *sleep_monitor;
- 
- 	GSList *auth_chains;
- 
-@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self,
- }
- 
- static void
--upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+sleeping_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal");
- 	_internal_sleep (NM_MANAGER (user_data), TRUE);
- }
- 
- static void
--upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+resuming_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received resuming signal");
- 	_internal_sleep (NM_MANAGER (user_data), FALSE);
- }
- 
-@@ -4049,8 +4048,8 @@ dispose (GObject *object)
- 	if (priv->aipd_proxy)
- 		g_object_unref (priv->aipd_proxy);
- 
--	if (priv->upower_proxy)
--		g_object_unref (priv->upower_proxy);
-+	if (priv->sleep_monitor)
-+		g_object_unref (priv->sleep_monitor);
- 
- 	if (priv->fw_monitor) {
- 		if (priv->fw_monitor_id)
-@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager)
- 	} else
- 		nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy");
- 
--	/* upower sleep/wake handling */
--	priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection,
--	                                                UPOWER_DBUS_SERVICE,
--	                                                "/org/freedesktop/UPower",
--	                                                "org.freedesktop.UPower");
--	if (priv->upower_proxy) {
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping",
--		                             G_CALLBACK (upower_sleeping_cb),
--		                             manager, NULL);
--
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming",
--		                             G_CALLBACK (upower_resuming_cb),
--		                             manager, NULL);
--	} else
--		nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+	/* sleep/wake handling */
-+	priv->sleep_monitor = nm_sleep_monitor_get ();
-+	g_signal_connect (priv->sleep_monitor, "sleeping",
-+	                  G_CALLBACK (sleeping_cb), manager);
-+	g_signal_connect (priv->sleep_monitor, "resuming",
-+	                  G_CALLBACK (resuming_cb), manager);
- 
- 	/* Listen for authorization changes */
- 	nm_auth_changed_func_register (authority_changed_cb, manager);
-diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
-new file mode 100644
-index 0000000..70adc89
---- /dev/null
-+++ b/src/nm-sleep-monitor-systemd.c
-@@ -0,0 +1,217 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include <gio/gunixfdlist.h>
-+
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define SD_NAME              "org.freedesktop.login1"
-+#define SD_PATH              "/org/freedesktop/login1"
-+#define SD_INTERFACE         "org.freedesktop.login1.Manager"
-+
-+
-+struct _NMSleepMonitor {
-+	GObject parent_instance;
-+
-+	GDBusProxy *sd_proxy;
-+	gint inhibit_fd;
-+};
-+
-+struct _NMSleepMonitorClass {
-+	GObjectClass parent_class;
-+
-+	void (*sleeping) (NMSleepMonitor *monitor);
-+	void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+	SLEEPING,
-+	RESUMING,
-+	LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
-+	NMSleepMonitor *self = user_data;
-+	GError *error = NULL;
-+	GVariant *res;
-+	GUnixFDList *fd_list;
-+
-+	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
-+	if (!res) {
-+		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
-+		g_error_free (error);
-+	} else {
-+		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
-+			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
-+
-+		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
-+
-+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
-+		g_object_unref (fd_list);
-+		g_variant_unref (res);
-+	}
-+}
-+
-+static void
-+take_inhibitor (NMSleepMonitor *self)
-+{
-+	g_assert (self->inhibit_fd == -1);
-+
-+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
-+	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
-+	                                     "Inhibit",
-+	                                     g_variant_new ("(ssss)",
-+	                                                    "sleep",
-+	                                                    g_get_user_name (),
-+	                                                    "inhibited",
-+	                                                    "delay"),
-+	                                     0,
-+	                                     G_MAXINT,
-+	                                     NULL,
-+	                                     NULL,
-+	                                     inhibit_done,
-+	                                     self);
-+}
-+
-+static gboolean
-+drop_inhibitor (NMSleepMonitor *self)
-+{
-+	if (self->inhibit_fd >= 0) {
-+		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
-+		close (self->inhibit_fd);
-+		self->inhibit_fd = -1;
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+static void
-+signal_cb (GDBusProxy  *proxy,
-+           const gchar *sendername,
-+           const gchar *signalname,
-+           GVariant    *args,
-+           gpointer     data)
-+{
-+	NMSleepMonitor *self = data;
-+	gboolean is_about_to_suspend;
-+
-+	if (strcmp (signalname, "PrepareForSleep") != 0)
-+		return;
-+
-+	g_variant_get (args, "(b)", &is_about_to_suspend);
-+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
-+
-+	if (is_about_to_suspend) {
-+		g_signal_emit (self, signals[SLEEPING], 0);
-+		drop_inhibitor (self);
-+	} else {
-+		take_inhibitor (self);
-+		g_signal_emit (self, signals[RESUMING], 0);
-+	}
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+	GDBusConnection *bus;
-+
-+	self->inhibit_fd = -1;
-+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
-+	                                        SD_NAME, SD_PATH, SD_INTERFACE,
-+	                                        NULL, NULL);
-+	g_object_unref (bus);
-+	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
-+	take_inhibitor (self);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+	drop_inhibitor (self);
-+	if (self->sd_proxy)
-+		g_object_unref (self->sd_proxy);
-+
-+	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+	GObjectClass *gobject_class;
-+
-+	gobject_class = G_OBJECT_CLASS (klass);
-+
-+	gobject_class->finalize = finalize;
-+
-+	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+	static NMSleepMonitor *singleton = NULL;
-+
-+	if (singleton)
-+		return g_object_ref (singleton);
-+
-+	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+	return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-new file mode 100644
-index 0000000..3c93f66
---- /dev/null
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -0,0 +1,151 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
-+
-+struct _NMSleepMonitor {
-+        GObject parent_instance;
-+
-+        DBusGProxy *upower_proxy;
-+};
-+
-+struct _NMSleepMonitorClass {
-+        GObjectClass parent_class;
-+
-+        void (*sleeping) (NMSleepMonitor *monitor);
-+        void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+        SLEEPING,
-+        RESUMING,
-+        LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+        g_signal_emit (user_data, signals[SLEEPING], 0);
-+}
-+
-+static void
-+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+        g_signal_emit (user_data, signals[RESUMING], 0);
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+        NMDBusManager *dbus_mgr;
-+        DBusGConnection *bus;
-+
-+        dbus_mgr = nm_dbus_manager_get ();
-+        bus = nm_dbus_manager_get_connection (dbus_mgr);
-+        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
-+                                                        UPOWER_DBUS_SERVICE,
-+                                                        "/org/freedesktop/UPower",
-+                                                        "org.freedesktop.UPower");
-+        if (self->upower_proxy) {
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
-+                                             G_CALLBACK (upower_sleeping_cb),
-+                                             self, NULL);
-+
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
-+                                             G_CALLBACK (upower_resuming_cb),
-+                                             self, NULL);
-+        } else
-+                nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+        g_object_unref (dbus_mgr);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+        NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+        if (self->upower_proxy)
-+                g_object_unref (self->upower_proxy);
-+
-+        if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+                G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+        GObjectClass *gobject_class;
-+
-+        gobject_class = G_OBJECT_CLASS (klass);
-+
-+        gobject_class->finalize = finalize;
-+
-+        signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+        signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+        static NMSleepMonitor *singleton = NULL;
-+
-+        if (singleton)
-+                return g_object_ref (singleton);
-+
-+        singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+        return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
-new file mode 100644
-index 0000000..173e6a1
---- /dev/null
-+++ b/src/nm-sleep-monitor.h
-@@ -0,0 +1,46 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#ifndef NM_SLEEP_MONITOR_H
-+#define NM_SLEEP_MONITOR_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define NM_TYPE_SLEEP_MONITOR         (nm_sleep_monitor_get_type ())
-+#define NM_SLEEP_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor))
-+#define NM_SLEEP_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_IS_SLEEP_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR))
-+#define NM_IS_SLEEP_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR))
-+
-+#define NM_SLEEP_MONITOR_SLEEPING "sleeping"
-+#define NM_SLEEP_MONITOR_RESUMING "resuming"
-+
-+typedef struct _NMSleepMonitor         NMSleepMonitor;
-+typedef struct _NMSleepMonitorClass    NMSleepMonitorClass;
-+
-+GType           nm_sleep_monitor_get_type     (void) G_GNUC_CONST;
-+NMSleepMonitor *nm_sleep_monitor_get          (void);
-+
-+G_END_DECLS
-+
-+#endif /* NM_SLEEP_MONITOR_H */
-+
--- 
-1.7.12.2
-
diff --git a/gnome-unstable/opus/PKGBUILD b/gnome-unstable/opus/PKGBUILD
deleted file mode 100644
index c250b548d..000000000
--- a/gnome-unstable/opus/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
-# Contributor: pumbur
-
-pkgname=opus
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="codec designed for interactive speech and audio transmission over the Internet"
-arch=('i686' 'x86_64')
-url="http://www.opus-codec.org/"
-license=('custom')
-depends=('glibc')
-source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-options=('!libtool')
-md5sums=('bbac19996957b404a1139816e2f357f5')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  install -m755 -d "${pkgdir}/usr/share/licenses/opus"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/opus/"
-}
diff --git a/gnome-unstable/pango/PKGBUILD b/gnome-unstable/pango/PKGBUILD
deleted file mode 100644
index 6e085f97d..000000000
--- a/gnome-unstable/pango/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167315 2012-09-30 23:21:49Z heftig $ 
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pango
-pkgver=1.32.1
-pkgrel=1
-pkgdesc="A library for layout and rendering of text"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libthai' 'cairo' 'libxft' 'harfbuzz')
-makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection')
-options=('!libtool')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('484babf7e1ac4bf959a0babe8168f180acb516932d70e2985de5f6e2961fcd82')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-included-modules=basic-fc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/pango"
-}
diff --git a/gnome-unstable/pango/pango.install b/gnome-unstable/pango/pango.install
deleted file mode 100644
index 73b0f5bf1..000000000
--- a/gnome-unstable/pango/pango.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	usr/bin/pango-querymodules >etc/pango/pango.modules
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	if [ -f usr/etc/pango/pango.modules ]; then
-		rm usr/etc/pango/pango.modules
-	fi
-	post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-	rm etc/pango/pango.modules
-}
diff --git a/gnome-unstable/pangox-compat/PKGBUILD b/gnome-unstable/pangox-compat/PKGBUILD
deleted file mode 100644
index d6f3b6a1e..000000000
--- a/gnome-unstable/pangox-compat/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169099 2012-10-17 23:24:52Z heftig $ 
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=pangox-compat
-pkgver=0.0.2
-pkgrel=1
-pkgdesc="X Window System font support for Pango"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('pango')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
-}
diff --git a/gnome-unstable/pidgin/PKGBUILD b/gnome-unstable/pidgin/PKGBUILD
deleted file mode 100644
index cc41d66a4..000000000
--- a/gnome-unstable/pidgin/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# $Id: PKGBUILD 168421 2012-10-11 15:28:56Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.6
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pidgin.im/"
-license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
-             'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'avahi'
-             'tk' 'ca-certificates' 'intltool'
-             'networkmanager')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' */plugins/*.py \
-    libpurple/purple-{remote,notifications-example,url-handler}
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-schemas-install \
-    --disable-meanwhile \
-    --disable-gnutls \
-    --enable-cyrus-sasl \
-    --disable-doxygen \
-    --enable-nm \
-    --disable-vv \
-    --with-python=/usr/bin/python2 \
-    --with-system-ssl-certs=/etc/ssl/certs
-    make
-}
-
-package_pidgin(){
-  pkgdesc="Multi-protocol instant messaging client"
-  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-           'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction')
-  install=pidgin.install
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C pidgin DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
-
-  rm "$pkgdir/usr/share/man/man1/finch.1"
-}
-
-package_libpurple(){
-  pkgdesc="IM library extracted from Pidgin"
-  depends=('gstreamer0.10' 'libsasl' 'libidn' 'dbus-glib' 'nss')
-  optdepends=('avahi: Bonjour protocol support'
-              'ca-certificates: SSL CA certificates'
-              'python2-dbus: for purple-remote and purple-url-handler'
-              'tk: Tcl/Tk scripting support')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
-    make -C "$_dir" DESTDIR="$pkgdir" install
-  done
-}
-
-package_finch(){
-  pkgdesc="A ncurses-based messaging client"
-  depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C finch DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/pidgin/pidgin.install b/gnome-unstable/pidgin/pidgin.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/gnome-unstable/pidgin/pidgin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/polkit/PKGBUILD b/gnome-unstable/polkit/PKGBUILD
deleted file mode 100644
index fd432af0b..000000000
--- a/gnome-unstable/polkit/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 167252 2012-09-29 12:13:31Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=polkit
-pkgver=0.107
-pkgrel=4
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
-options=('!libtool')
-install=polkit.install
-source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam fix-empty-wheel.patch)
-md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
-         '6564f95878297b954f0572bc1610dd15'
-         'c99ab2a7919ad0b69fde4804c043b07f')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # https://bugs.archlinux.org/task/31717
-  patch -Np1 -i ../fix-empty-wheel.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static --enable-gtk-doc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  chown 102 "$pkgdir/etc/polkit-1/rules.d"
-  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
-
-  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
-}
diff --git a/gnome-unstable/polkit/autogen.sh b/gnome-unstable/polkit/autogen.sh
deleted file mode 100755
index d08b00a49..000000000
--- a/gnome-unstable/polkit/autogen.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory $srcdir does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-olddir=`pwd`
-cd "$srcdir"
-
-touch ChangeLog
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoconf installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
-  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have libtool installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have automake installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing aclocal.  The version of automake"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-
-# if no automake, don't bother testing for autoreconf
-test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoreconf installed."
-  echo "You can get autoreconf from ..."
-  DIE=1
-}
-
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run configure with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo $0 " command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      echo "Running autoreconf on test/mocklibc ..."
-      (cd "test/mocklibc"; autoreconf --install)
-
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu -Wno-portability $am_opt ..."
-      automake --add-missing --gnu -Wno-portability $am_opt
-      echo "Running autoconf ..."
-      autoconf
-
-intltoolize --copy --force --automake                  || exit 1
-
-cd "$olddir"
-
-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-
-if test x$NOCONFIGURE = x; then
-  echo "Running $srcdir/configure $conf_flags $@ ..."
-  $srcdir/configure $conf_flags "$@" \
-  && echo "Now type make to compile." || exit 1
-else
-  echo "Skipping configure process."
-fi
diff --git a/gnome-unstable/polkit/fix-empty-wheel.patch b/gnome-unstable/polkit/fix-empty-wheel.patch
deleted file mode 100644
index d6f99c43d..000000000
--- a/gnome-unstable/polkit/fix-empty-wheel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Tue, 18 Sep 2012 18:47:06 +0000
-Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty
-
-For example, this can happen if the wheel group has no members. This
-was reported in Red Hat bug 834494, see
-
- https://bugzilla.redhat.com/show_bug.cgi?id=834494
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
-index 1d4a555..3bd2f0b 100644
---- a/src/polkitbackend/polkitbackendinteractiveauthority.c
-+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
-@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract
-                                                            PolkitDetails                     *details)
- {
-   PolkitBackendInteractiveAuthorityClass *klass;
--  GList *ret;
-+  GList *ret = NULL;
- 
-   klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority);
- 
--  if (klass->get_admin_identities == NULL)
--    {
--      ret = g_list_prepend (NULL, polkit_unix_user_new (0));
--    }
--  else
-+  if (klass->get_admin_identities != NULL)
-     {
-       ret = klass->get_admin_identities (authority,
-                                          caller,
-@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent         *agent,
-         }
-     }
- 
-+  /* Fall back to uid 0 if no users are available (rhbz #834494) */
-+  if (user_identities == NULL)
-+    user_identities = g_list_prepend (NULL, polkit_unix_user_new (0));
-+
-   session = authentication_session_new (agent,
-                                         cookie,
-                                         subject,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/gnome-unstable/polkit/logind+ConsoleKit.patch b/gnome-unstable/polkit/logind+ConsoleKit.patch
deleted file mode 100644
index 042d1043a..000000000
--- a/gnome-unstable/polkit/logind+ConsoleKit.patch
+++ /dev/null
@@ -1,638 +0,0 @@
-From ba143769e17e4bbc1f2b0c88e735f993dfb3c873 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Tue, 7 Aug 2012 21:06:18 +0200
-Subject: [PATCH] session tracking: always require consolekit
-
-Only systemd is now optional at compile-time, and if enabled we fallback to consolekit
-at runtime, if not booted with systemd.
-
-Bits-stolen-from: Jan Alexander Steffens <jan.steffens@gmail.com>
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- configure.ac                                       |   6 +-
- src/polkit/polkitunixsession-systemd.c             |  96 ++++++-
- src/polkitbackend/polkitbackendjsauthority.c       |  10 +-
- .../polkitbackendsessionmonitor-systemd.c          | 313 +++++++++++++++++++--
- 4 files changed, 380 insertions(+), 45 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7a0d938..1d1e4ba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -163,15 +163,15 @@ AC_ARG_ENABLE([libsystemd-login],
-               [enable_libsystemd_login=auto])
- if test "$enable_libsystemd_login" != "no"; then
-   PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN,
--                    [libsystemd-login],
-+                    [libsystemd-login libsystemd-daemon],
-                     have_libsystemd_login=yes,
-                     have_libsystemd_login=no)
-   if test "$have_libsystemd_login" = "yes"; then
--    SESSION_TRACKING=libsystemd-login
-+    SESSION_TRACKING="libsystemd-login (with ConsoleKit runtime fallback)"
-     AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
-   else
-     if test "$enable_libsystemd_login" = "yes"; then
--      AC_MSG_ERROR([libsystemd-login support requested but libsystemd-login library not found])
-+      AC_MSG_ERROR([libsystemd-login support requested but systemd libraries not found])
-     fi
-   fi
- fi
-diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c
-index 8a8bf65..bb89044 100644
---- a/src/polkit/polkitunixsession-systemd.c
-+++ b/src/polkit/polkitunixsession-systemd.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2011 Red Hat, Inc.
-+ * Copyright (C) 2008, 2011 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -17,6 +17,7 @@
-  * Boston, MA 02111-1307, USA.
-  *
-  * Author: Matthias Clasen
-+ * Author: David Zeuthen <davidz@redhat.com>
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -31,6 +32,7 @@
- #include "polkitprivate.h"
- 
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- 
- /**
-  * SECTION:polkitunixsession
-@@ -367,9 +369,41 @@ polkit_unix_session_exists_sync (PolkitSubject   *subject,
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
-   gboolean ret = FALSE;
-   uid_t uid;
-+  GDBusConnection *connection; /* consolekit */
-+  GVariant *result; /* consolekit */
- 
--  if (sd_session_get_uid (session->session_id, &uid) == 0)
--    ret = TRUE;
-+  if (sd_booted())
-+    {
-+      if (sd_session_get_uid (session->session_id, &uid) == 0)
-+      ret = TRUE;
-+    }
-+  else /* consolekit */
-+    {
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            session->session_id,                    /* object path */
-+                                            "org.freedesktop.ConsoleKit.Session",   /* interface name */
-+                                            "GetUser",                              /* method */
-+                                            NULL, /* parameters */
-+                                            G_VARIANT_TYPE ("(u)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
-+
-+      ret = TRUE;
-+      g_variant_unref (result);
-+
-+     out:
-+      if (connection != NULL)
-+        g_object_unref (connection);
-+    }
- 
-   return ret;
- }
-@@ -451,29 +485,61 @@ polkit_unix_session_initable_init (GInitable     *initable,
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
-   gboolean ret = FALSE;
-   char *s;
-+  GDBusConnection *connection; /* consolekit */
-+  GVariant *result; /* consolekit */
-+  connection = NULL; /* consolekit */
- 
-   if (session->session_id != NULL)
-     {
-       /* already set, nothing to do */
--      ret = TRUE;
--      goto out;
-+      return TRUE;
-     }
- 
--  if (sd_pid_get_session (session->pid, &s) == 0)
-+  if (sd_booted())
-+    {
-+      if (sd_pid_get_session (session->pid, &s) == 0)
-+        {
-+          session->session_id = g_strdup (s);
-+          free (s);
-+          return TRUE;
-+        }
-+
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "No session for pid %d",
-+                  (gint) session->pid);
-+    }
-+  else /* consolekit */
-     {
--      session->session_id = g_strdup (s);
--      free (s);
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            "/org/freedesktop/ConsoleKit/Manager",  /* object path */
-+                                            "org.freedesktop.ConsoleKit.Manager",   /* interface name */
-+                                            "GetSessionForUnixProcess",             /* method */
-+                                            g_variant_new ("(u)", session->pid),    /* parameters */
-+                                            G_VARIANT_TYPE ("(o)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
-+
-+      g_variant_get (result, "(o)", &session->session_id);
-+      g_variant_unref (result);
-+
-       ret = TRUE;
--      goto out;
-     }
- 
--  g_set_error (error,
--               POLKIT_ERROR,
--               POLKIT_ERROR_FAILED,
--               "No session for pid %d",
--               (gint) session->pid);
-+ out:
-+  if (connection != NULL) /* consolekit */
-+    g_object_unref (connection);
- 
--out:
-   return ret;
- }
- 
-diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c
-index bdfaa73..ee38739 100644
---- a/src/polkitbackend/polkitbackendjsauthority.c
-+++ b/src/polkitbackend/polkitbackendjsauthority.c
-@@ -36,6 +36,7 @@
- 
- #ifdef HAVE_LIBSYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- #endif /* HAVE_LIBSYSTEMD_LOGIN */
- 
- #include <jsapi.h>
-@@ -731,11 +732,14 @@ subject_to_jsval (PolkitBackendJsAuthority  *authority,
-     }
- 
- #ifdef HAVE_LIBSYSTEMD_LOGIN
--  if (sd_pid_get_session (pid, &session_str) == 0)
-+  if (sd_booted())
-     {
--      if (sd_session_get_seat (session_str, &seat_str) == 0)
-+      if (sd_pid_get_session (pid, &session_str) == 0)
-         {
--          /* do nothing */
-+          if (sd_session_get_seat (session_str, &seat_str) == 0)
-+            {
-+              /* do nothing */
-+            }
-         }
-     }
- #endif /* HAVE_LIBSYSTEMD_LOGIN */
-diff --git a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-index 58593c3..5114dfa 100644
---- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-+++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-@@ -26,11 +26,15 @@
- #include <string.h>
- #include <glib/gstdio.h>
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- #include <stdlib.h>
- 
- #include <polkit/polkit.h>
- #include "polkitbackendsessionmonitor.h"
- 
-+/* consolekit */
-+#define CKDB_PATH "/var/run/ConsoleKit/database"
-+
- /* <internal>
-  * SECTION:polkitbackendsessionmonitor
-  * @title: PolkitBackendSessionMonitor
-@@ -126,6 +130,11 @@ struct _PolkitBackendSessionMonitor
-   GDBusConnection *system_bus;
- 
-   GSource *sd_source;
-+
-+  /* consolekit */
-+  GKeyFile *database;
-+  GFileMonitor *database_monitor;
-+  time_t database_mtime;
- };
- 
- struct _PolkitBackendSessionMonitorClass
-@@ -148,6 +157,101 @@ G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TY
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+/* consolekit */
-+static gboolean
-+reload_database (PolkitBackendSessionMonitor  *monitor,
-+                 GError                      **error)
-+{
-+  gboolean ret;
-+  struct stat statbuf;
-+
-+  ret = FALSE;
-+
-+  if (monitor->database != NULL)
-+    {
-+      g_key_file_free (monitor->database);
-+      monitor->database = NULL;
-+    }
-+
-+  if (stat (CKDB_PATH, &statbuf) != 0)
-+    {
-+      g_set_error (error,
-+                   G_IO_ERROR,
-+                   g_io_error_from_errno (errno),
-+                   "Error statting file " CKDB_PATH ": %s",
-+                   strerror (errno));
-+      goto out;
-+    }
-+
-+  monitor->database_mtime = statbuf.st_mtime;
-+
-+  monitor->database = g_key_file_new ();
-+  if (!g_key_file_load_from_file (monitor->database,
-+                                  CKDB_PATH,
-+                                  G_KEY_FILE_NONE,
-+                                  error))
-+    {
-+      goto out;
-+    }
-+
-+  ret = TRUE;
-+
-+ out:
-+  return ret;
-+}
-+
-+static gboolean
-+ensure_database (PolkitBackendSessionMonitor  *monitor,
-+		                 GError                      **error)
-+{
-+  gboolean ret = FALSE;
-+
-+  if (monitor->database != NULL)
-+    {
-+      struct stat statbuf;
-+
-+      if (stat (CKDB_PATH, &statbuf) != 0)
-+        {
-+          g_set_error (error,
-+                       G_IO_ERROR,
-+                       g_io_error_from_errno (errno),
-+                       "Error statting file " CKDB_PATH " to check timestamp: %s",
-+                       strerror (errno));
-+          goto out;
-+        }
-+      if (statbuf.st_mtime == monitor->database_mtime)
-+        {
-+          ret = TRUE;
-+          goto out;
-+        }
-+    }
-+
-+  ret = reload_database (monitor, error);
-+
-+ out:
-+  return ret;
-+}
-+
-+static void
-+on_file_monitor_changed (GFileMonitor     *file_monitor,
-+                         GFile            *file,
-+                         GFile            *other_file,
-+                         GFileMonitorEvent event_type,
-+                         gpointer          user_data)
-+{
-+  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
-+
-+  /* throw away cache */
-+  if (monitor->database != NULL)
-+    {
-+      g_key_file_free (monitor->database);
-+      monitor->database = NULL;
-+    }
-+  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
-+}
-+
-+/* consolekit - end */
-+
- static gboolean
- sessions_changed (gpointer user_data)
- {
-@@ -163,6 +267,7 @@ static void
- polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
- {
-   GError *error;
-+  GFile *file; /* consolekit */
- 
-   error = NULL;
-   monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-@@ -172,9 +277,41 @@ polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
-       g_error_free (error);
-     }
- 
--  monitor->sd_source = sd_source_new ();
--  g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--  g_source_attach (monitor->sd_source, NULL);
-+  if (sd_booted())
-+    {
-+      monitor->sd_source = sd_source_new ();
-+      g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+      g_source_attach (monitor->sd_source, NULL);
-+    }
-+  else /* consolekit */
-+    {
-+      error = NULL;
-+      if (!ensure_database (monitor, &error))
-+        {
-+          g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+
-+      error = NULL;
-+      file = g_file_new_for_path (CKDB_PATH);
-+      monitor->database_monitor = g_file_monitor_file (file,
-+                                                       G_FILE_MONITOR_NONE,
-+                                                       NULL,
-+                                                       &error);
-+      g_object_unref (file);
-+      if (monitor->database_monitor == NULL)
-+        {
-+          g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+      else
-+        {
-+          g_signal_connect (monitor->database_monitor,
-+                            "changed",
-+                            G_CALLBACK (on_file_monitor_changed),
-+                            monitor);
-+        }
-+    }
- }
- 
- static void
-@@ -191,6 +328,14 @@ polkit_backend_session_monitor_finalize (GObject *object)
-       g_source_unref (monitor->sd_source);
-     }
- 
-+  /* consolekit */
-+  if (monitor->database_monitor != NULL)
-+    g_object_unref (monitor->database_monitor);
-+
-+  if (monitor->database != NULL)
-+    g_key_file_free (monitor->database);
-+  /* consolekit - end */
-+
-   if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL)
-     G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object);
- }
-@@ -258,6 +403,8 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
-                                                      GError                      **error)
- {
-   PolkitIdentity *ret;
-+  GError *local_error; /* consolekit */
-+  gchar *group; /* consolekit */
-   guint32 uid;
- 
-   ret = NULL;
-@@ -300,16 +447,38 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
- 
--      if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
-+      if (sd_booted())
-         {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Error getting uid for session");
--          goto out;
-+          if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
-+            {
-+              g_set_error (error,
-+                           POLKIT_ERROR,
-+                           POLKIT_ERROR_FAILED,
-+                           "Error getting uid for session");
-+              goto out;
-+            }
-+
-+          ret = polkit_unix_user_new (uid);
-+        }
-+      else /* consolekit */
-+        {
-+          if (!ensure_database (monitor, error))
-+            {
-+              g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
-+              goto out;
-+            }
-+
-+         group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
-+         local_error = NULL;
-+         uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
-+         if (local_error != NULL)
-+           {
-+             g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
-+             g_free (group);
-+             goto out;
-+           }
-+         g_free (group);
-         }
--
--      ret = polkit_unix_user_new (uid);
-     }
- 
-  out:
-@@ -337,20 +506,43 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      gchar *session_id;
--      pid_t pid;
-+      if (sd_booted())
-+        {
-+          gchar *session_id;
-+          pid_t pid;
- 
--      pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
-+          pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+          goto out;
- 
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+	}
-+      else /* consolekit */
-+        {
-+          const gchar *session_id;
-+          GVariant *result;
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                                -1, /* timeout_msec */
-+                                                NULL, /* GCancellable */
-+                                                error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
-     {
-       guint32 pid;
--      gchar *session_id;
-       GVariant *result;
- 
-       result = g_dbus_connection_call_sync (monitor->system_bus,
-@@ -369,11 +561,35 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
-       g_variant_get (result, "(u)", &pid);
-       g_variant_unref (result);
- 
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
-+      if (sd_booted())
-+        {
-+          gchar *session_id;
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+            goto out;
- 
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+        }
-+      else /* consolekit */
-+        {
-+          const gchar *session_id;
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", pid),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                               -1, /* timeout_msec */
-+                                               NULL, /* GCancellable */
-+                                               error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else
-     {
-@@ -389,12 +605,58 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
-   return session;
- }
- 
-+static gboolean
-+get_boolean (PolkitBackendSessionMonitor *monitor,
-+             PolkitSubject               *session,
-+             const gchar                 *key_name)
-+{
-+  gboolean ret;
-+  gchar *group;
-+  GError *error;
-+
-+  ret = FALSE;
-+
-+  group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+
-+  error = NULL;
-+  if (!ensure_database (monitor, &error))
-+    {
-+      g_printerr ("Error getting boolean `%s' in group `%s': Error ensuring CK database at " CKDB_PATH ": %s",
-+                  key_name,
-+                  group,
-+                  error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+
-+  error = NULL;
-+  ret = g_key_file_get_boolean (monitor->database, group, key_name, &error);
-+  if (error != NULL)
-+    {
-+      g_printerr ("Error looking %s using " CKDB_PATH " for %s: %s\n",
-+                  key_name,
-+                  group,
-+                  error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+
-+ out:
-+  g_free (group);
-+  return ret;
-+}
-+
- gboolean
- polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor,
-                                                  PolkitSubject               *session)
- {
-   char *seat;
- 
-+  if (!sd_booted()) /* consolekit */
-+    {
-+      return get_boolean (monitor, session, "is_local");
-+    }
-+
-   if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
-     {
-       free (seat);
-@@ -409,6 +671,9 @@ gboolean
- polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
-                                                   PolkitSubject               *session)
- {
--  return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+  if (sd_booted())
-+    return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+  else /* consolekit */
-+    return get_boolean (monitor, session, "is_active");
- }
- 
--- 
-1.7.11.4
-
diff --git a/gnome-unstable/polkit/polkit.install b/gnome-unstable/polkit/polkit.install
deleted file mode 100644
index fbb98919e..000000000
--- a/gnome-unstable/polkit/polkit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-       getent group polkitd >/dev/null || groupadd -g 102 polkitd
-       getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
-       passwd -l polkitd &>/dev/null
-}
-
-post_upgrade() {
-       post_install
-}
-
-post_remove() {
-       if getent passwd polkitd >/dev/null; then
-               userdel polkitd
-       fi
-       if getent group polkitd >/dev/null; then
-               groupdel polkitd
-       fi
-}
diff --git a/gnome-unstable/polkit/polkit.pam b/gnome-unstable/polkit/polkit.pam
deleted file mode 100644
index 04f53e0db..000000000
--- a/gnome-unstable/polkit/polkit.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
diff --git a/gnome-unstable/pygobject/PKGBUILD b/gnome-unstable/pygobject/PKGBUILD
deleted file mode 100644
index c42b7ba78..000000000
--- a/gnome-unstable/pygobject/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 169075 2012-10-17 17:43:30Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.4.1.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('dbcff64a641b4eb251a3ca72c782c8a2318c3bbf4a31bffc40446e15111e6017')
-
-build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
-}
-
-package_python2-gobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
-
-  cd "python2-build"
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
-}
-
-package_pygobject-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-  cd "devel"
-  mkdir -p "$pkgdir"/usr/{include,lib}
-  mv include "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-}
diff --git a/gnome-unstable/rest/PKGBUILD b/gnome-unstable/rest/PKGBUILD
deleted file mode 100644
index 16f5b5e63..000000000
--- a/gnome-unstable/rest/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 166595 2012-09-12 18:10:17Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=rest
-pkgver=0.7.90
-pkgrel=1
-pkgdesc="A helper library for RESTful services."
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libxml2' 'libsoup-gnome')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/rhythmbox/PKGBUILD b/gnome-unstable/rhythmbox/PKGBUILD
deleted file mode 100644
index 820e743d3..000000000
--- a/gnome-unstable/rhythmbox/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 169093 2012-10-17 21:17:47Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rhythmbox
-pkgver=2.98
-pkgrel=2
-pkgdesc="An iTunes-like music playback and management application"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.rhythmbox.org"
-depends=('dconf' 'desktop-file-utils' 'grilo'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
-         'libdmapsharing' 'libgpod' 'libmtp' 'libnotify' 'libpeas'
-         'lirc-utils' 'media-player-info' 'python2-gobject' 'python2-mako' 'totem-plparser'
-         'tdb' 'libdiscid')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: cd burning')
-options=('!libtool' '!emptydirs')
-install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/rhythmbox \
-      --localstatedir=/var --disable-static \
-      --enable-daap --enable-python --enable-vala \
-      --with-mdns=avahi --disable-scrollkeeper --without-webkit
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
-}
diff --git a/gnome-unstable/rhythmbox/rhythmbox.install b/gnome-unstable/rhythmbox/rhythmbox.install
deleted file mode 100644
index e02ee2c16..000000000
--- a/gnome-unstable/rhythmbox/rhythmbox.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/seahorse/PKGBUILD b/gnome-unstable/seahorse/PKGBUILD
deleted file mode 100644
index cb1623721..000000000
--- a/gnome-unstable/seahorse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 168977 2012-10-17 07:36:23Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Michel Brabants <michel.linux@tiscali.be>
-
-pkgname=seahorse
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GNOME application for managing PGP keys."
-arch=(i686 x86_64)
-license=(GPL)
-url="http://projects.gnome.org/seahorse/"
-depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils hicolor-icon-theme dconf)
-makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm)
-optdepends=('openssh: SSH support')
-provides=(x11-ssh-askpass)
-options=('!libtool' '!emptydirs')
-groups=(gnome-extra)
-install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        seahorse-ssh-askpass.sh)
-sha256sums=('dcdd9681a7896a13a597cf02aa2d6718b5f0ab3b50ed81f8d24b8db296a9214b'
-            '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-ldap --enable-hkp \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \
-    "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh"
-}
diff --git a/gnome-unstable/seahorse/seahorse-ssh-askpass.sh b/gnome-unstable/seahorse/seahorse-ssh-askpass.sh
deleted file mode 100644
index 04f79d8f2..000000000
--- a/gnome-unstable/seahorse/seahorse-ssh-askpass.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then
-  export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass
-fi
diff --git a/gnome-unstable/seahorse/seahorse.install b/gnome-unstable/seahorse/seahorse.install
deleted file mode 100644
index 1571179ca..000000000
--- a/gnome-unstable/seahorse/seahorse.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/sushi/PKGBUILD b/gnome-unstable/sushi/PKGBUILD
deleted file mode 100644
index 3276116b3..000000000
--- a/gnome-unstable/sushi/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167042 2012-09-24 20:39:02Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=sushi
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A quick previewer for Nautilus"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince')
-install=sushi.install
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('506f0f1f934e9e6c0f5584619c3f2ab0d5906248472ca1bf08a159504ad02f78')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/sushi
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/sushi/sushi.install b/gnome-unstable/sushi/sushi.install
deleted file mode 100644
index c19349f72..000000000
--- a/gnome-unstable/sushi/sushi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/telepathy-farstream/PKGBUILD b/gnome-unstable/telepathy-farstream/PKGBUILD
deleted file mode 100644
index 42665b4d5..000000000
--- a/gnome-unstable/telepathy-farstream/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167406 2012-10-01 23:31:27Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=telepathy-farstream
-pkgver=0.6.0
-pkgrel=1
-pkgdesc="A telepathy-backend to use stream engine."
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'farstream')
-makedepends=('dbus-glib' 'gobject-introspection')
-conflicts=('telepathy-farsight')
-replaces=('telepathy-farsight')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d154350f9f1e3bdba87617c0668481a5')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/telepathy \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/telepathy-gabble/PKGBUILD b/gnome-unstable/telepathy-gabble/PKGBUILD
deleted file mode 100644
index fa23be823..000000000
--- a/gnome-unstable/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168140 2012-10-06 09:00:15Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.17.1
-pkgrel=1
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite')
-makedepends=('libxslt' 'python2')
-options=('!libtool' '!emptydirs')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-install=telepathy-gabble.install
-md5sums=('42e01fdc4117255080883495411e7318')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console"
-}
diff --git a/gnome-unstable/telepathy-gabble/telepathy-gabble.install b/gnome-unstable/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/gnome-unstable/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/gnome-unstable/telepathy-glib/PKGBUILD b/gnome-unstable/telepathy-glib/PKGBUILD
deleted file mode 100644
index e2085a262..000000000
--- a/gnome-unstable/telepathy-glib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167963 2012-10-04 12:22:42Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-
-pkgname=telepathy-glib
-pkgver=0.20.0
-pkgrel=1
-pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('LGPL2.1')
-options=('!libtool' '!emptydirs')
-depends=('dbus-glib')
-makedepends=('libxslt' 'vala' 'gobject-introspection')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('9d7b2bcc2d9f8e0352c8789952717d83')
-
-build() {
-    cd $pkgname-$pkgver
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-        --libexecdir=/usr/lib/telepathy \
-        --enable-vala-bindings \
-        --enable-static=no
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/telepathy-mission-control/PKGBUILD b/gnome-unstable/telepathy-mission-control/PKGBUILD
deleted file mode 100644
index 6e9108ca1..000000000
--- a/gnome-unstable/telepathy-mission-control/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167968 2012-10-04 13:06:03Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Ju Liu <liuju86 at gmail dot com>
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Contributor: Andreas Zwinkau <beza1e1@web.de>
-
-pkgname=telepathy-mission-control
-pkgver=5.14.0
-pkgrel=1
-pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org/wiki/Mission Control"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgnome-keyring' 'dconf' 'upower' 'networkmanager')
-makedepends=('libxslt' 'python2')
-install=telepathy-mission-control.install
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('483fa8860891815a540ecf1bb9155122')
-
-build() {
-    cd "$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy \
-	--enable-gnome-keyring \
-        --disable-schemas-compile
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install b/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/gnome-unstable/telepathy-mission-control/telepathy-mission-control.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/gnome-unstable/totem-plparser/PKGBUILD b/gnome-unstable/totem-plparser/PKGBUILD
deleted file mode 100644
index 3665ad94b..000000000
--- a/gnome-unstable/totem-plparser/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167018 2012-09-24 18:57:55Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=totem-plparser
-pkgver=3.4.3
-pkgrel=1
-url="http://www.gnome.org"
-pkgdesc="Totem playlist parser library"
-license=('LGPL')
-arch=(i686 x86_64)
-depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b')
-
-build() {
-  cd totem-pl-parser-$pkgver
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
-  make
-}
-
-package(){
-  cd totem-pl-parser-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/totem/PKGBUILD b/gnome-unstable/totem/PKGBUILD
deleted file mode 100644
index e6649d299..000000000
--- a/gnome-unstable/totem/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 167895 2012-10-03 15:58:28Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME3 movie player based on GStreamer"
-url="http://www.gnome.org"
-arch=(i686 x86_64)
-license=(GPL2 custom)
-depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
-         hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst
-         clutter-gtk mx python2-gobject gst-plugins-bad)
-makedepends=(intltool gnome-doc-utils nautilus lirc-utils vala grilo pylint)
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        browser-plugins.ini)
-sha256sums=('e767da34f5212bd9b2d3ea9bc7e3a87b284581ee012214274225dd8decb8fe3e'
-            'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/totem \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-python \
-    --enable-nautilus
-  make
-}
-
-package_totem() {
-  groups=(gnome-extra)
-  install=totem.install
-  optdepends=('gst-plugins-ugly: Extra media codecs'
-              'gst-ffmpeg: Extra media codecs'
-              'lirc-utils: Infrared Remote Control plugin'
-              'grilo-plugins: Browse sidebar (remote media)'
-              'pyxdg: opensubtitles plugin')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "$pkgdir/usr/lib/mozilla"
-  rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
-
-  sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
-    $pkgdir/usr/lib/totem/totem/totem-bugreport.py
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
-  pkgdesc="Totem plugin for web browsers"
-  depends=("totem=$pkgver")
-  backup=(etc/totem/browser-plugins.ini)
-
-  cd "$pkgbase-$pkgver"
-  make -C browser-plugin \
-    plugindir=/usr/lib/mozilla/plugins \
-    xptdir=/usr/lib/mozilla/plugins \
-    DESTDIR="$pkgdir" install
-  
-  install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
-}
diff --git a/gnome-unstable/totem/browser-plugins.ini b/gnome-unstable/totem/browser-plugins.ini
deleted file mode 100644
index cf3014997..000000000
--- a/gnome-unstable/totem/browser-plugins.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Plugins]
-application/x-shockwave-flash.disabled=true
diff --git a/gnome-unstable/totem/totem.install b/gnome-unstable/totem/totem.install
deleted file mode 100644
index 7f0fc704b..000000000
--- a/gnome-unstable/totem/totem.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/tracker/PKGBUILD b/gnome-unstable/tracker/PKGBUILD
deleted file mode 100644
index 5751a041e..000000000
--- a/gnome-unstable/tracker/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 167544 2012-10-02 13:24:36Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.14.2
-_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
-        bug675660.patch
-        tracker-extract-pdf-crash-fix.patch)
-sha256sums=('9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1'
-            '77c1377860f09aba42fc0bb662cb188613d5ed3744f3ffb3a710d1e60499cb8c'
-            'afa14805b9a1adb2442dc4a6032b1575a07a87aa969599ca28669a2cf975e772')
-
-build() {
-  cd $pkgbase-$pkgver
-
-  patch -Np1 -i "${srcdir}/bug675660.patch"
-  patch -Np1 -i "${srcdir}/tracker-extract-pdf-crash-fix.patch"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/tracker \
-    --disable-unit-tests \
-    --enable-libflac \
-    --enable-libvorbis
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
-              'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
-              'libvorbis: Vorbis metadata extractor'
-              'flac: FLAC metadata extractor'
-              'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir" install
-
-### Split libtracker-sparql
-
-  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
-
-  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
-    "$srcdir/sparql/usr/lib/tracker-$_tver"
-
-  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
-    "$srcdir/sparql/usr/share/vala/vapi"
-
-  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv "$srcdir"/sparql/* "$pkgdir"
-}
diff --git a/gnome-unstable/tracker/bug675660.patch b/gnome-unstable/tracker/bug675660.patch
deleted file mode 100644
index 5f217d983..000000000
--- a/gnome-unstable/tracker/bug675660.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 20 Jul 2012 14:46:33 +0000
-Subject: libtracker-fts: ICU cannot handle complex locale descriptions
-
-ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"),
-not the full definition of your various locale variables and their
-values as returned by glibc's setlocale(LC_ALL, NULL).
-
-Instead, limit ourselves to LC_CTYPE, since after all, that's all we
-need to determine word boundaries.
-
-Fixes GB#675660.
----
-diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
-index 7388f69..69f75ed 100644
---- a/src/libtracker-fts/tracker-parser-libicu.c
-+++ b/src/libtracker-fts/tracker-parser-libicu.c
-@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser,
- 
- 		/* Open word-break iterator */
- 		parser->bi = ubrk_open(UBRK_WORD,
--		                       setlocale (LC_ALL, NULL),
-+		                       setlocale (LC_CTYPE, NULL),
- 		                       parser->utxt,
- 		                       parser->utxt_size,
- 		                       &error);
---
-cgit v0.9.0.2
diff --git a/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch b/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch
deleted file mode 100644
index ac8522f6a..000000000
--- a/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 008677280d32b6db56483832b143760888c91ad4 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam.thursfield@codethink.co.uk>
-Date: Tue, 31 Jul 2012 14:26:53 +0000
-Subject: tracker-extract-pdf: Fix crash if mmap() fails
-
-Patch from Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=751922
----
-diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
-index caa24c7..85066b3 100644
---- a/src/tracker-extract/tracker-extract-pdf.c
-+++ b/src/tracker-extract/tracker-extract-pdf.c
-@@ -451,7 +451,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
- 		len = 0;
- 	} else {
- 		contents = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
--		if (contents == NULL) {
-+		if (contents == NULL || contents == MAP_FAILED) {
- 			g_warning ("Could not mmap pdf file '%s': %s\n",
- 			           filename,
- 			           g_strerror (errno));
---
-cgit v0.9.0.2
diff --git a/gnome-unstable/tracker/tracker.install b/gnome-unstable/tracker/tracker.install
deleted file mode 100644
index 95114273e..000000000
--- a/gnome-unstable/tracker/tracker.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/udisks2/PKGBUILD b/gnome-unstable/udisks2/PKGBUILD
deleted file mode 100644
index 04b21537f..000000000
--- a/gnome-unstable/udisks2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 166493 2012-09-08 11:04:55Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=udisks2
-pkgver=1.99.0
-pkgrel=1
-pkgdesc="Disk Management Service, version 2"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL2')
-depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
-optdepends=('parted: partition management'
-            'gptfdisk: GUID partition table support')
-options=(!libtool)
-source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('f06d1947ac3c79f3de85ee17b7046da9d22dd9ab06cc75a985e767161704e176')
-
-build() {
-  cd "udisks-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "udisks-$pkgver"
-  make DESTDIR="$pkgdir" install \
-    bash_completiondir=/usr/share/bash-completion/completions
-}
diff --git a/gnome-unstable/vala/PKGBUILD b/gnome-unstable/vala/PKGBUILD
deleted file mode 100644
index 1cfa11586..000000000
--- a/gnome-unstable/vala/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 167032 2012-09-24 20:01:02Z jgc $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-
-pkgname=vala
-pkgver=0.18.0
-pkgrel=1
-pkgdesc="Compiler for the GObject type system"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Vala"
-license=('LGPL')
-depends=('glib2')
-makedepends=('libxslt')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('18cb2220ce7352a9dd71be058530f7d4a6c8215a1d9c471430af60a04496a60b')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --enable-vapigen
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/vinagre/PKGBUILD b/gnome-unstable/vinagre/PKGBUILD
deleted file mode 100644
index 5dd566d72..000000000
--- a/gnome-unstable/vinagre/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168958 2012-10-16 22:54:38Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=vinagre
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A VNC Client for the GNOME Desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/vinagre/"
-install=vinagre.install
-depends=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
-optdepends=('openssh: SSH plugin'
-            'rdesktop: RDP plugin')
-makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('768727f9833ba9b9879d72671bc4b10577f4dfe74488cb0cf4c49edfe0165c62')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/vinagre/vinagre.install b/gnome-unstable/vinagre/vinagre.install
deleted file mode 100644
index 4998e6e8b..000000000
--- a/gnome-unstable/vinagre/vinagre.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/vino/PKGBUILD b/gnome-unstable/vino/PKGBUILD
deleted file mode 100644
index 45ac66e11..000000000
--- a/gnome-unstable/vino/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168957 2012-10-16 22:51:56Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vino
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager' 'gnome-common')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-options=(!emptydirs)
-install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('60fdc2271e27c4e10bef40dc2ee836d587930a178c3f189bd975c4d477f32783')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vino \
-      --localstatedir=/var \
-      --disable-http-server --with-secret
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/vino/vino.install b/gnome-unstable/vino/vino.install
deleted file mode 100644
index fabaa1ed7..000000000
--- a/gnome-unstable/vino/vino.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/vte3/PKGBUILD b/gnome-unstable/vte3/PKGBUILD
deleted file mode 100644
index f4005fc7b..000000000
--- a/gnome-unstable/vte3/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 168890 2012-10-16 12:09:06Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=vte3
-pkgname=(vte3 vte-common)
-pkgver=0.34.1
-pkgrel=1
-pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
-arch=('i686' 'x86_64')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-makedepends=('intltool' 'gobject-introspection' 'gtk3')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz)
-sha256sums=('06b78824875545ced8ebaff111b656d0b4ed370f46a4b609f43f88a0ee908f08')
-
-build() {
-  cd "vte-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vte \
-      --localstatedir=/var --disable-static \
-      --enable-introspection
-  make
-}
-
-package_vte3(){
-  depends=('gtk3' 'vte-common')
-  cd "vte-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm "$pkgdir"/usr/lib/vte/gnome-pty-helper
-}
-
-package_vte-common() {
-  pkgdesc="Common files used by vte and vte3"
-  depends=('glibc')
-  cd "vte-$pkgver"
-
-  make -C gnome-pty-helper DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/webkitgtk/PKGBUILD b/gnome-unstable/webkitgtk/PKGBUILD
deleted file mode 100644
index d77de3a00..000000000
--- a/gnome-unstable/webkitgtk/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=webkitgtk
-pkgname=('webkitgtk2' 'webkitgtk3')
-pkgver=1.10.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
-options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493')
-
-build() {
-  cd "$srcdir/webkitgtk-$pkgver"
-  mkdir build-gtk2 build-gtk3
-
-  cd build-gtk2
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk2 \
-    --with-gstreamer=1.0 \
-    --with-gtk=2.0 \
-    --disable-webkit2
-  make all stamp-po
-  
-  cd ../build-gtk3
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk3 \
-    --with-gstreamer=1.0
-  make all stamp-po
-}
-
-package_webkitgtk3() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs')
-  conflicts=('libwebkit3')
-  provides=("libwebkit3=${pkgver}")
-  replaces=('libwebkit3')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk3"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_webkitgtk2() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gst-plugins-base-libs')
-  conflicts=('libwebkit')
-  provides=("libwebkit=${pkgver}")
-  replaces=('libwebkit')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/gnome-unstable/webkitgtk3/PKGBUILD b/gnome-unstable/webkitgtk3/PKGBUILD
deleted file mode 100644
index 8613cbfae..000000000
--- a/gnome-unstable/webkitgtk3/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=webkitgtk3
-pkgver=1.10.0
-pkgrel=1
-pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs')
-makedepends=('gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
-conflicts=('libwebkit3')
-provides=("libwebkit3=${pkgver}")
-replaces=('libwebkit3')
-options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha1sums=('5e022110cef5ff87a4c55ff0358dedd596502a84')
-
-build() {
-  cd "$srcdir/webkitgtk-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk3 \
-    --with-gstreamer=1.0
-  make all stamp-po
-}
-
-package() {
-  cd "$srcdir/webkitgtk-$pkgver"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/gnome-unstable/yelp/PKGBUILD b/gnome-unstable/yelp/PKGBUILD
deleted file mode 100644
index 7dcd1c68c..000000000
--- a/gnome-unstable/yelp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167105 2012-09-25 11:50:12Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=yelp
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64')
-depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'dbus-glib' 'xz' 'bzip2'
-         'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gtk-doc' 'itstool')
-groups=('gnome')
-license=('GPL')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('966a513420674c488b18df0ffcf51f8b4687cdba04b1d1d5e76d59c0484ac048')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/gnome-unstable/yelp/yelp.install b/gnome-unstable/yelp/yelp.install
deleted file mode 100644
index 2a1cb91e9..000000000
--- a/gnome-unstable/yelp/yelp.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/gnome-unstable/zenity/PKGBUILD b/gnome-unstable/zenity/PKGBUILD
deleted file mode 100644
index 2269a84c3..000000000
--- a/gnome-unstable/zenity/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 167165 2012-09-26 17:56:40Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=zenity
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk3' 'libnotify')
-makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/akonadi/PKGBUILD b/kde-unstable/akonadi/PKGBUILD
deleted file mode 100644
index 3e9ebc376..000000000
--- a/kde-unstable/akonadi/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171089 2012-11-16 15:34:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=akonadi
-pkgver=1.8.80
-pkgrel=1
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://community.kde.org/KDE_PIM/Akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('63471d004c0db6fd8cd230cbdb18b036')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/akonadi/akonadi.install b/kde-unstable/akonadi/akonadi.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/kde-unstable/akonadi/akonadi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde-unstable/kactivities/PKGBUILD b/kde-unstable/kactivities/PKGBUILD
deleted file mode 100644
index 5a4806653..000000000
--- a/kde-unstable/kactivities/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 171714 2012-11-21 18:09:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kactivities
-pkgver=4.9.80
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='API for using and interacting with the Activity Manager'
-url='https://projects.kde.org/projects/kde/kdelibs/kactivities'
-license=('GPL' 'FDL')
-depends=('nepomuk-core')
-makedepends=('cmake' 'automoc4' 'mesa')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('6dafbee6369e288c055875803f77273d28faddc6')
-
-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 329fe6221..000000000
--- a/kde-unstable/kdeaccessibility-jovie/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 171743 2012-11-21 18:33:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-jovie
-pkgver=4.9.80
-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.xz")
-sha1sums=('e613c5513edb00ff58b1932c61703bd1b27a21ad')
-
-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 934cc5058..000000000
--- a/kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171744 2012-11-21 18:34:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kaccessible
-pkgver=4.9.80
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-url='https://projects.kde.org/projects/kde/kdeaccessibility/kaccessible'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdelibs' 'speech-dispatcher')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('9f3007f9752f56bdf3c524c7fda6544f1c75dece')
-
-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 0e1b79703..000000000
--- a/kde-unstable/kdeaccessibility-kmag/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171745 2012-11-21 18:34:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmag
-pkgver=4.9.80
-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.xz")
-sha1sums=('876654b279b9c85fa357057fe64665291ba23b6c')
-
-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 dac7ad841..000000000
--- a/kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171746 2012-11-21 18:35:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmousetool
-pkgver=4.9.80
-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.xz")
-sha1sums=('522ff8389c49da50175d06eb9fe9e841249daad4')
-
-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 2f3a0dca5..000000000
--- a/kde-unstable/kdeaccessibility-kmouth/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171747 2012-11-21 18:35:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmouth
-pkgver=4.9.80
-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.xz")
-sha1sums=('72a6bb10b38a2bca50e17921b0ce7561cbe6aaef')
-
-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 f76fb29ff..000000000
--- a/kde-unstable/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 171748 2012-11-21 18:36:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
-         'kdeadmin-ksystemlog'
-         'kdeadmin-kuser')
-pkgver=4.9.80
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'syslog-path.patch')
-sha1sums=('385569286ace7061f42c2c0f333366b0e75e8f9e'
-          '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_INSTALL_PREFIX=/usr \
-		-DBUILD_strigi-analyzer=OFF
-	make
-}
-
-package_kdeadmin-kcron() {
-	pkgdesc='Configure and schedule tasks'
-    url='http://userbase.kde.org/KCron'
-	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=('kdebase-runtime' 'kdepimlibs')
-	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
-}
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 fa43840d7..000000000
--- a/kde-unstable/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# $Id: PKGBUILD 171749 2012-11-21 18:37:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-colorschemes'
-         'kdeartwork-desktopthemes'
-         'kdeartwork-emoticons'
-         'kdeartwork-iconthemes'
-         'kdeartwork-kscreensaver'
-         'kdeartwork-sounds'
-         'kdeartwork-styles'
-         'kdeartwork-wallpapers'
-         'kdeartwork-weatherwallpapers')
-pkgver=4.9.80
-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' 'mesa')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('070e6186d7bfd6cc9422bf1fe33ecb47e96ab8d5')
-
-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-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 4e72d5cc8..000000000
--- a/kde-unstable/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171750 2012-11-21 18:42:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.9.80
-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' 'kdebase-lib')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('11ee54496d4a9f7d59f40a585710c5d104c5de81')
-
-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 10909a591..000000000
--- a/kde-unstable/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 163354 2012-07-11 21:54:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.8.97
-pkgrel=1
-pkgdesc="Plugins and applications necessary for the running of KDE applications"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-runtime'
-license=('GPL' 'LGPL')
-depends=('kdepimlibs' 'nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-'xorg-xauth' 'kactivities')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager')
-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.xz")
-sha1sums=('5eff74a293c9adf8e76fb45f5a085726c083c179')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_QNtrack=OFF \
-        -DWITH_Xine=OFF
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-
-    ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/kde-unstable/kdebase-runtime/kdebase-runtime.install b/kde-unstable/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/kde-unstable/kdebase-runtime/kdebase-runtime.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/kdebase-workspace/PKGBUILD b/kde-unstable/kdebase-workspace/PKGBUILD
deleted file mode 100644
index 4f9c3c767..000000000
--- a/kde-unstable/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 171727 2012-11-21 18:23:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Provides the interface and basic tools for the KDE workspace"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-workspace'
-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' 'xorg-xprop' 'libxdamage'
-         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
-         'xorg-xmessage' 'libusb-compat' 'kde-base-artwork'
-         'xcb-util-renderutil' 'xcb-util-image')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/unstable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('6144d8d136b481155d9fcbcb831a5a9b9c58d772'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          '660eae40a707d2711d8d7f32a93214865506b795'
-          '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
-          'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
-          'c079ebd157c836ba996190f0d2bcea1a7828d02c'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
-
-build() {
-	cd ${_pkgname}-${pkgver}
-
-    # reads the shell scripts in /etc/kde/
-    patch -p0 -i "${srcdir}"/etc-scripts.patch
-    # FS#26120
-	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-
-    # KDEBUG#202629
-	patch -p0 -i "${srcdir}"/terminate-server.patch
-
-    cd ../
-
-	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 \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DWITH_CkConnector=OFF
-	make
-}
-
-package() {
-	cd build
-	make DESTDIR="${pkgdir}" install
-
-	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
-    install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
-    install -D -m644 "${srcdir}"/kdm.service \
-      "${pkgdir}"/usr/lib/systemd/system/kdm.service
-    install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
-}
diff --git a/kde-unstable/kdebase-workspace/etc-scripts.patch b/kde-unstable/kdebase-workspace/etc-scripts.patch
deleted file mode 100644
index 903a90a53..000000000
--- a/kde-unstable/kdebase-workspace/etc-scripts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -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/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 2a4a940c7..000000000
--- a/kde-unstable/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
-auth		required	pam_shells.so
-auth		requisite	pam_nologin.so
-auth		required	pam_env.so
-auth		optional	pam_permit.so
-
-account		include      system-login
-
-password	include      system-login
-
-session		include      system-login
diff --git a/kde-unstable/kdebase-workspace/kde.pam b/kde-unstable/kdebase-workspace/kde.pam
deleted file mode 100644
index a0a29483d..000000000
--- a/kde-unstable/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		include		system-login
-
-account		include		system-login
-
-password	include		system-login
-
-session		include		system-login
diff --git a/kde-unstable/kdebase-workspace/kdebase-workspace.install b/kde-unstable/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index c52c06417..000000000
--- a/kde-unstable/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,31 +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
-    genkdmconf --no-old --no-backup &>/dev/null
-}
-
-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
-    genkdmconf &>/dev/null
-}
-
-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
-
-    if [ -d usr/share/apps/kdm/faces ]; then
-        rm -r usr/share/apps/kdm/faces
-    fi
-}
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/kdm.logrotate b/kde-unstable/kdebase-workspace/kdm.logrotate
deleted file mode 100644
index 34331feae..000000000
--- a/kde-unstable/kdebase-workspace/kdm.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/kdm.log {
-    maxage 365
-    size=+1024k
-    notifempty
-    missingok
-}
diff --git a/kde-unstable/kdebase-workspace/kdm.service b/kde-unstable/kdebase-workspace/kdm.service
deleted file mode 100644
index c57aba920..000000000
--- a/kde-unstable/kdebase-workspace/kdm.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=K Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/kdm -nodaemon
-
-[Install]
-Alias=display-manager.service
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 d0185e74d..000000000
--- a/kde-unstable/kdebase/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 171728 2012-11-21 18:25:15Z 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.9.80
-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.xz")
-sha1sums=('9cde28381d72f86aa4d975e48e545026bc0c6d0a')
-
-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 022161204..000000000
--- a/kde-unstable/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171751 2012-11-21 18:43:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.9.80
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the KDE libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qyoto' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
-optdepends=('kdepimlibs: akonadi bindings')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.xz")
-sha1sums=('75263f0b3cba2fe1acc1d668cd7f03a4d4f07dc0')
-
-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 1872ad76c..000000000
--- a/kde-unstable/kdebindings-korundum/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 171752 2012-11-21 18:44:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-korundum
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Ruby bindings for libraries created by the KDE community"
-url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
-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')
-optdepends=('kdegraphics-okular: okular bindings'
-            'kdepimlibs: akonadi bindings')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.xz"
-        'ruby19.patch')
-sha1sums=('e16ed8f538fc1208c2b29c1704da186fe3d97e8c'
-          'c074f027bac3b9bffe70a2c2304a6a7be12be034')
-
-build() {
-  cd "${srcdir}/korundum-${pkgver}"
-  patch -p1 -i "${srcdir}/ruby19.patch"
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-
-  cmake ../korundum-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCUSTOM_RUBY_SITE_LIB_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]') \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]')
-
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-korundum/ruby19.patch b/kde-unstable/kdebindings-korundum/ruby19.patch
deleted file mode 100644
index c2468d9ce..000000000
--- a/kde-unstable/kdebindings-korundum/ruby19.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- korundum-4.9.0/src/krubypluginfactory.cpp~	2012-07-27 10:44:19.544464612 +0000
-+++ korundum-4.9.0/src/krubypluginfactory.cpp	2012-07-27 10:53:15.247374749 +0000
-@@ -39,7 +39,6 @@
- extern "C" {
- extern VALUE rb_load_path;
- extern VALUE qt_internal_module;
--void Init_prelude(void);
- }
- 
- //
-@@ -165,7 +164,8 @@
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude(); 
-+    char *opts[] = { "ruby", "-e;" };
-+    ruby_options(2, opts);
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
-@@ -342,7 +342,8 @@
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude();                                             
-+    char *opts[] = { "ruby", "-e;" };
-+    ruby_options(2, opts);
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
diff --git a/kde-unstable/kdebindings-kross/PKGBUILD b/kde-unstable/kdebindings-kross/PKGBUILD
deleted file mode 100644
index b784d749b..000000000
--- a/kde-unstable/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 171753 2012-11-21 18:44:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-#         'kdebindings-kross-ruby'
-         'kdebindings-kross-java')
-pkgver=4.9.80
-pkgrel=1
-url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
-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.xz")
-sha1sums=('236973dde05ba0ad139b54bcf619f2e99e815dbb')
-
-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 3b9edd6fc..000000000
--- a/kde-unstable/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171754 2012-11-21 18:45:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Perl bindings for the KDE libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
-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.xz")
-sha1sums=('cfa442fcdce76523d7d978cfe9459c6385ead228')
-
-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 a0a9580aa..000000000
--- a/kde-unstable/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171723 2012-11-21 18:15:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Perl bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
-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.xz")
-sha1sums=('8e4e5c677a1cbca607681f99bb0433ef92538010')
-
-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 ff4ad9597..000000000
--- a/kde-unstable/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 171720 2012-11-21 18:13:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
-         'kdebindings-python2')
-pkgver=4.9.80
-pkgrel=1
-url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/unstable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('e2b3ac142195a1aa31b6cca5463803665675d97d')
-
-build() {
-  export PYTHONDONTWRITEBYTECODE="TRUE"
-
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
-  make
-  cd ..
-
-  mkdir build-python2
-  cd build-python2
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-python() {
-  pkgdesc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
-  pkgdesc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-  conflicts=('kdebindings-python<4.8.1-2')
- 
-  cd "${srcdir}"/build-python2
-  make DESTDIR="${pkgdir}" install
-
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/pykdeuic4
-  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
-    "${pkgdir}"/usr/bin/python2-pykdeuic4
-
-  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
-    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
-
-  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
-    "${pkgdir}"/usr/share/sip/python2-PyKDE4
-
-  # 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 67c28abfb..000000000
--- a/kde-unstable/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171725 2012-11-21 18:17:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Ruby bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
-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.xz")
-sha1sums=('02f2e194105c5e3fbc4181d0969c0c59a76f241b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qtruby-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCUSTOM_RUBY_SITE_LIB_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]') \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]')
-  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 143c2d50b..000000000
--- a/kde-unstable/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171724 2012-11-21 18:16:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.9.80
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
-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.xz")
-sha1sums=('4b8e3927487c9c67f59e21422274d17e2c2a3dc6')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../qyoto-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdebindings-smokegen/PKGBUILD b/kde-unstable/kdebindings-smokegen/PKGBUILD
deleted file mode 100644
index 60a731eb2..000000000
--- a/kde-unstable/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171717 2012-11-21 18:11:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A general purpose C++ parser with a plugin infrastructure"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
-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.xz")
-sha1sums=('d02f7496caa82457f4d620939c80979b90f8249f')
-
-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 c65f2d4b7..000000000
--- a/kde-unstable/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 171722 2012-11-21 18:15:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Language independent library for KDE bindings"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate'
-             'mesa')
-optdepends=('kdesdk-kate: Kate bindings'
-            'kdegraphics-okular: Okular bindings'
-            'kdepimlibs: akonadi bindings')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('42138a1b2778f4d34c047883768803824ec62bc4')
-
-build() {
-  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 3b281741e..000000000
--- a/kde-unstable/kdebindings-smokeqt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171718 2012-11-21 18:11:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokeqt
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Language independent library for Qt bindings"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
-makedepends=('cmake' 'automoc4' 'mesa')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('10311b9dc028aed75d2707a5a5d22f91a14de8c8')
-
-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 bd01ad97b..000000000
--- a/kde-unstable/kdeedu-analitza/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171737 2012-11-21 18:29:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-analitza
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A library to add mathematical features to your program"
-url="https://projects.kde.org/projects/kde/kdeedu/analitza"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('9b2e7dc9c6eab7b49e28540d63dc3d3531999d2e')
-
-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 afadce2df..000000000
--- a/kde-unstable/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171755 2012-11-21 18:45:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.9.80
-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.xz")
-sha1sums=('c80dcd05980eae7927ceb1d227f2772b0897b40b')
-
-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 38e013443..000000000
--- a/kde-unstable/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 171756 2012-11-21 18:46:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.9.80
-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' 'libqalculate')
-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.xz")
-sha1sums=('5bd9d025f83baa2425cf8d722edfd18a6630796d')
-
-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 2d51e8697..000000000
--- a/kde-unstable/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171757 2012-11-21 18:46:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.9.80
-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' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
-sha1sums=('96817a31f5af00bebc138f9ad84adbadb3850608')
-
-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 2591f8f50..000000000
--- a/kde-unstable/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171758 2012-11-21 18:47:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.9.80
-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=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
-sha1sums=('2902940de1dc5d33b846aeb82064d51adc286da4')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kalzium-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd 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 81ce5c4b0..000000000
--- a/kde-unstable/kdeedu-kalzium/kdeedu-kalzium.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-kanagram/PKGBUILD b/kde-unstable/kdeedu-kanagram/PKGBUILD
deleted file mode 100644
index a197061b8..000000000
--- a/kde-unstable/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171759 2012-11-21 18:48:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.9.80
-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.xz")
-sha1sums=('1c19a72b7639a36f20ef5c00cc03a35c84f5bb69')
-
-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 03feaba94..000000000
--- a/kde-unstable/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171760 2012-11-21 18:48:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.9.80
-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.xz")
-sha1sums=('0531fdbf4bb401b7c28593a920a42c32687a3bb9')
-
-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 0d6ee2203..000000000
--- a/kde-unstable/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171761 2012-11-21 18:49:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.9.80
-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.xz")
-sha1sums=('b6f55e05c8ed67631eac9e23d3638f61a2264388')
-
-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 7c6360d12..000000000
--- a/kde-unstable/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171762 2012-11-21 18:50:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.9.80
-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.xz")
-sha1sums=('fcbed31b1fba92f82f5e1118ff054103c6b76216')
-
-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 9bd55fba0..000000000
--- a/kde-unstable/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 171763 2012-11-21 18:50:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.9.80
-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.xz")
-sha1sums=('4bf3c256adab6a6afdc2e10d5fa59df8c745fd7f')
-
-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 393fdb73e..000000000
--- a/kde-unstable/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171764 2012-11-21 18:51:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.9.80
-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.xz")
-sha1sums=('d4a3023afcc44191585d36471d7fed931af6b339')
-
-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 45e18c9a8..000000000
--- a/kde-unstable/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171765 2012-11-21 18:52:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.9.80
-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.xz")
-sha1sums=('9d888105518aed6843b2a260b4ae7495ca54471e')
-
-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 a993a4a54..000000000
--- a/kde-unstable/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171767 2012-11-21 18:53:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.9.80
-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.xz")
-sha1sums=('64af9b098973e1e84e3cff4d31f8e5047039dbd6')
-
-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 c9a1dff27..000000000
--- a/kde-unstable/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171872 2012-11-21 22:01:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.9.80
-pkgrel=3
-pkgdesc="Desktop Planetarium"
-url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'wcslib' 'libindi')
-makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('792b0f991512fd372e9492b008540c6357059bb3')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kstars-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Xplanet=OFF
-  make
-}
-
-package() {
-  cd 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 5db86131f..000000000
--- a/kde-unstable/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171770 2012-11-21 19:10:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.9.80
-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.xz")
-sha1sums=('9bbf7d9c68ec28e81ed6cde4710be794f1124a1f')
-
-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 fb4d32ac6..000000000
--- a/kde-unstable/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171771 2012-11-21 19:11:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.9.80
-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.xz")
-sha1sums=('87b537edebc1733b994711d263a9f61acabad035')
-
-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 b525760d6..000000000
--- a/kde-unstable/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171772 2012-11-21 19:12:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.9.80
-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.xz")
-sha1sums=('9c6638006cf18466ca262c956afd7e36662ddb8b')
-
-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 f72577df8..000000000
--- a/kde-unstable/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171731 2012-11-21 18:26:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.9.80
-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.xz")
-sha1sums=('449f3e87b5d111e36730ebaf321f5081dded028d')
-
-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 117b47128..000000000
--- a/kde-unstable/kdeedu-marble/kdeedu-marble.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/kdeedu-pairs/PKGBUILD b/kde-unstable/kdeedu-pairs/PKGBUILD
deleted file mode 100644
index 837281cd4..000000000
--- a/kde-unstable/kdeedu-pairs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171773 2012-11-21 19:12:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-pairs
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A memory and pairs game for KDE"
-url="https://projects.kde.org/projects/kde/kdeedu/pairs"
-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/pairs-${pkgver}.tar.xz")
-sha1sums=('fae86e3a2e3990d82c59d3d36852d13e2277caea')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pairs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeedu-pairs/kdeedu-pairs.install b/kde-unstable/kdeedu-pairs/kdeedu-pairs.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdeedu-pairs/kdeedu-pairs.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 38a09c291..000000000
--- a/kde-unstable/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171774 2012-11-21 19:13:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.9.80
-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.xz")
-sha1sums=('cc99fe01b84b36452a45c02c86bea6ae99342d43')
-
-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 0df3d29a6..000000000
--- a/kde-unstable/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171775 2012-11-21 19:14:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.9.80
-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')
-makedepends=('cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('a3feecc05b8408ccfa1d101554a8916b5700649f')
-
-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-rocs/kdeedu-rocs.install b/kde-unstable/kdeedu-rocs/kdeedu-rocs.install
deleted file mode 100644
index 88ac37896..000000000
--- a/kde-unstable/kdeedu-rocs/kdeedu-rocs.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/kdeedu-step/PKGBUILD b/kde-unstable/kdeedu-step/PKGBUILD
deleted file mode 100644
index 8cb730a8b..000000000
--- a/kde-unstable/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171776 2012-11-21 19:15:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.9.80
-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')
-makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('c331946fc2a459a9f8235cfdb6e3d42b5dcd6920')
-
-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-bomber/PKGBUILD b/kde-unstable/kdegames-bomber/PKGBUILD
deleted file mode 100644
index 68832916d..000000000
--- a/kde-unstable/kdegames-bomber/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171777 2012-11-21 19:15:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-bomber
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A single player arcade game"
-url="http://kde.org/applications/games/bomber/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/bomber-${pkgver}.tar.xz")
-sha1sums=('d3e1154bca1246fc91b46f30c3534cfc678a9c28')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../bomber-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-bomber/kdegames-bomber.install b/kde-unstable/kdegames-bomber/kdegames-bomber.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-bomber/kdegames-bomber.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-bovo/PKGBUILD b/kde-unstable/kdegames-bovo/PKGBUILD
deleted file mode 100644
index 65c9062e9..000000000
--- a/kde-unstable/kdegames-bovo/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171779 2012-11-21 19:16:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-bovo
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A Gomoku like game for two players"
-url="http://kde.org/applications/games/bovo/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/bovo-${pkgver}.tar.xz")
-sha1sums=('f9080a1f1e6cd8107379bab9d9130fad83b6fb16')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../bovo-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-bovo/kdegames-bovo.install b/kde-unstable/kdegames-bovo/kdegames-bovo.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-bovo/kdegames-bovo.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-granatier/PKGBUILD b/kde-unstable/kdegames-granatier/PKGBUILD
deleted file mode 100644
index 23a62833a..000000000
--- a/kde-unstable/kdegames-granatier/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171781 2012-11-21 19:17:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-granatier
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A clone of the classic Bomberman game"
-url="http://kde.org/applications/games/granatier/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/granatier-${pkgver}.tar.xz")
-sha1sums=('879691fd8c595430362fdce8e76e07cb4f912531')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../granatier-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-granatier/kdegames-granatier.install b/kde-unstable/kdegames-granatier/kdegames-granatier.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-granatier/kdegames-granatier.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-kapman/PKGBUILD b/kde-unstable/kdegames-kapman/PKGBUILD
deleted file mode 100644
index d1f0fe5a2..000000000
--- a/kde-unstable/kdegames-kapman/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171783 2012-11-21 19:18:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kapman
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A clone of the well known game Pac-Man"
-url="http://kde.org/applications/games/kapman/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kapman-${pkgver}.tar.xz")
-sha1sums=('0fb3a2043e5091673d52e8259e38a8412157ccff')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kapman-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kapman/kdegames-kapman.install b/kde-unstable/kdegames-kapman/kdegames-kapman.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kapman/kdegames-kapman.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-katomic/PKGBUILD b/kde-unstable/kdegames-katomic/PKGBUILD
deleted file mode 100644
index 448b80760..000000000
--- a/kde-unstable/kdegames-katomic/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171784 2012-11-21 19:19:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-katomic
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A fun and educational game built around molecular geometry"
-url="http://kde.org/applications/games/katomic/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/katomic-${pkgver}.tar.xz")
-sha1sums=('f0c9508c32f3d5f8f7adb75c39f11a539e756ef4')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../katomic-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-katomic/kdegames-katomic.install b/kde-unstable/kdegames-katomic/kdegames-katomic.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-katomic/kdegames-katomic.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-kblackbox/PKGBUILD b/kde-unstable/kdegames-kblackbox/PKGBUILD
deleted file mode 100644
index 367b01a19..000000000
--- a/kde-unstable/kdegames-kblackbox/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171785 2012-11-21 19:19:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kblackbox
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A game of hide and seek played on a grid of boxes"
-url="http://kde.org/applications/games/kblackbox/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kblackbox-${pkgver}.tar.xz")
-sha1sums=('a9e0cecc512af02c034435f3a3bdee0294e3bd9a')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kblackbox-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kblackbox/kdegames-kblackbox.install b/kde-unstable/kdegames-kblackbox/kdegames-kblackbox.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kblackbox/kdegames-kblackbox.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-kblocks/PKGBUILD b/kde-unstable/kdegames-kblocks/PKGBUILD
deleted file mode 100644
index 3df22f8a1..000000000
--- a/kde-unstable/kdegames-kblocks/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171786 2012-11-21 19:20:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kblocks
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="The classic falling blocks game"
-url="http://kde.org/applications/games/kblocks/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kblocks-${pkgver}.tar.xz")
-sha1sums=('21138737da1c5334fded3f0430a5ff1252873238')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kblocks-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kblocks/kdegames-kblocks.install b/kde-unstable/kdegames-kblocks/kdegames-kblocks.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kblocks/kdegames-kblocks.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-kbounce/PKGBUILD b/kde-unstable/kdegames-kbounce/PKGBUILD
deleted file mode 100644
index 6c9711f34..000000000
--- a/kde-unstable/kdegames-kbounce/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171787 2012-11-21 19:21:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kbounce
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A single player arcade game with the elements of puzzle"
-url="http://kde.org/applications/games/kbounce/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kbounce-${pkgver}.tar.xz")
-sha1sums=('037e27c540a879ba58340c20b9d1bfe073fed8df')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kbounce-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kbounce/kdegames-kbounce.install b/kde-unstable/kdegames-kbounce/kdegames-kbounce.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kbounce/kdegames-kbounce.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-kbreakout/PKGBUILD b/kde-unstable/kdegames-kbreakout/PKGBUILD
deleted file mode 100644
index 99d891b43..000000000
--- a/kde-unstable/kdegames-kbreakout/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171788 2012-11-21 19:21:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kbreakout
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A Breakout-like game"
-url="http://kde.org/applications/games/kbreakout/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kbreakout-${pkgver}.tar.xz")
-sha1sums=('5b3dac9a9352e2a246c42e36ee25125ddd195a06')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kbreakout-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kbreakout/kdegames-kbreakout.install b/kde-unstable/kdegames-kbreakout/kdegames-kbreakout.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kbreakout/kdegames-kbreakout.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-kdiamond/PKGBUILD b/kde-unstable/kdegames-kdiamond/PKGBUILD
deleted file mode 100644
index 5db398ab4..000000000
--- a/kde-unstable/kdegames-kdiamond/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171789 2012-11-21 19:22:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kdiamond
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A single player puzzle game"
-url="http://kde.org/applications/games/kdiamond/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kdiamond-${pkgver}.tar.xz")
-sha1sums=('054bdda050ee60bc475a9f95ad92fab8f60d77f7')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kdiamond-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kdiamond/kdegames-kdiamond.install b/kde-unstable/kdegames-kdiamond/kdegames-kdiamond.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kdiamond/kdegames-kdiamond.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-kfourinline/PKGBUILD b/kde-unstable/kdegames-kfourinline/PKGBUILD
deleted file mode 100644
index ca6905de3..000000000
--- a/kde-unstable/kdegames-kfourinline/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171790 2012-11-21 19:23:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kfourinline
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A four-in-a-row game"
-url="http://kde.org/applications/games/kfourinline/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kfourinline-${pkgver}.tar.xz")
-sha1sums=('6512cbdd437dc498e1de5305ef262ab5d6a10463')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kfourinline-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kfourinline/kdegames-kfourinline.install b/kde-unstable/kdegames-kfourinline/kdegames-kfourinline.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/kdegames-kfourinline/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-kgoldrunner/PKGBUILD b/kde-unstable/kdegames-kgoldrunner/PKGBUILD
deleted file mode 100644
index 6b885c7b9..000000000
--- a/kde-unstable/kdegames-kgoldrunner/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171791 2012-11-21 19:24:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kgoldrunner
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A game of action and puzzle solving"
-url="http://kde.org/applications/games/kgoldrunner/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz")
-sha1sums=('3b4b78694ab4be2cbc1b7e7da55be0bd0ee0fe03')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kgoldrunner-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kgoldrunner/kdegames-kgoldrunner.install b/kde-unstable/kdegames-kgoldrunner/kdegames-kgoldrunner.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kgoldrunner/kdegames-kgoldrunner.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-kigo/PKGBUILD b/kde-unstable/kdegames-kigo/PKGBUILD
deleted file mode 100644
index e8fcc0b52..000000000
--- a/kde-unstable/kdegames-kigo/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171878 2012-11-22 08:11:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kigo
-pkgver=4.9.80
-pkgrel=2
-pkgdesc="An open-source implementation of the popular Go game"
-url="http://kde.org/applications/games/kigo/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames' 'gnugo')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kigo-${pkgver}.tar.xz")
-sha1sums=('b19b2f147bb5bccae5f88f6eba7940fc95e693f8')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kigo-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kigo/kdegames-kigo.install b/kde-unstable/kdegames-kigo/kdegames-kigo.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/kde-unstable/kdegames-kigo/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-killbots/PKGBUILD b/kde-unstable/kdegames-killbots/PKGBUILD
deleted file mode 100644
index 69bfb423f..000000000
--- a/kde-unstable/kdegames-killbots/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171793 2012-11-21 19:25:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-killbots
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A simple game of evading killer robots"
-url="http://kde.org/applications/games/killbots/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/killbots-${pkgver}.tar.xz")
-sha1sums=('403e36ec16722d985bc5f58ecb2e28dcb83007f3')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../killbots-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-killbots/kdegames-killbots.install b/kde-unstable/kdegames-killbots/kdegames-killbots.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-killbots/kdegames-killbots.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-kiriki/PKGBUILD b/kde-unstable/kdegames-kiriki/PKGBUILD
deleted file mode 100644
index ba670d9ee..000000000
--- a/kde-unstable/kdegames-kiriki/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171794 2012-11-21 19:26:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kiriki
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="An addictive and fun dice game"
-url="http://kde.org/applications/games/kiriki/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kiriki-${pkgver}.tar.xz")
-sha1sums=('c0502c16e074a1347b6a698d22a51c8a48f93b69')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kiriki-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kiriki/kdegames-kiriki.install b/kde-unstable/kdegames-kiriki/kdegames-kiriki.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kiriki/kdegames-kiriki.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-kjumpingcube/PKGBUILD b/kde-unstable/kdegames-kjumpingcube/PKGBUILD
deleted file mode 100644
index 768022474..000000000
--- a/kde-unstable/kdegames-kjumpingcube/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171795 2012-11-21 19:26:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kjumpingcube
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A simple tactical game"
-url="http://kde.org/applications/games/kjumpingcube/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz")
-sha1sums=('961bfa473f600230b5318988fc79c954c9d0de22')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kjumpingcube-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kjumpingcube/kdegames-kjumpingcube.install b/kde-unstable/kdegames-kjumpingcube/kdegames-kjumpingcube.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kjumpingcube/kdegames-kjumpingcube.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-klickety/PKGBUILD b/kde-unstable/kdegames-klickety/PKGBUILD
deleted file mode 100644
index 606b7205e..000000000
--- a/kde-unstable/kdegames-klickety/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171796 2012-11-21 19:27:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-klickety
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="An adaptation of the Clickomania game"
-url="http://kde.org/applications/games/klickety/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/klickety-${pkgver}.tar.xz")
-sha1sums=('32393e1e3277536a62688c1e960977eb5a33f43d')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../klickety-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-klickety/kdegames-klickety.install b/kde-unstable/kdegames-klickety/kdegames-klickety.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-klickety/kdegames-klickety.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-klines/PKGBUILD b/kde-unstable/kdegames-klines/PKGBUILD
deleted file mode 100644
index 28b2b26ee..000000000
--- a/kde-unstable/kdegames-klines/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171797 2012-11-21 19:28:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-klines
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A simple but highly addictive, one player game"
-url="http://kde.org/applications/games/klines/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/klines-${pkgver}.tar.xz")
-sha1sums=('0773efb8ca8cf9fbf6359e09e66bec86fbc29ec8')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../klines-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-klines/kdegames-klines.install b/kde-unstable/kdegames-klines/kdegames-klines.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-klines/kdegames-klines.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-kmahjongg/PKGBUILD b/kde-unstable/kdegames-kmahjongg/PKGBUILD
deleted file mode 100644
index 92179d5b3..000000000
--- a/kde-unstable/kdegames-kmahjongg/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171798 2012-11-21 19:28:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kmahjongg
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A tile matching game for one or two players"
-url="http://kde.org/applications/games/kmahjongg/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz")
-sha1sums=('ec723bc34ba6f2f6081edfa9ed3cd79266d901cb')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kmahjongg-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kmahjongg/kdegames-kmahjongg.install b/kde-unstable/kdegames-kmahjongg/kdegames-kmahjongg.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kmahjongg/kdegames-kmahjongg.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-kmines/PKGBUILD b/kde-unstable/kdegames-kmines/PKGBUILD
deleted file mode 100644
index 3b9e5a8fc..000000000
--- a/kde-unstable/kdegames-kmines/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171799 2012-11-21 19:29:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kmines
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="The classic Minesweeper game"
-url="http://kde.org/applications/games/kmines/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kmines-${pkgver}.tar.xz")
-sha1sums=('a433c87f8694b58a98142225b45dafa40ddcb911')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kmines-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kmines/kdegames-kmines.install b/kde-unstable/kdegames-kmines/kdegames-kmines.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kmines/kdegames-kmines.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-knavalbattle/PKGBUILD b/kde-unstable/kdegames-knavalbattle/PKGBUILD
deleted file mode 100644
index ea75ca11e..000000000
--- a/kde-unstable/kdegames-knavalbattle/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171800 2012-11-21 19:30:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-knavalbattle
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A ship sinking game"
-url="http://kde.org/applications/games/knavalbattle/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz")
-sha1sums=('cbe7b3cc2599a8078f7c4d241746ded1795f5b91')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../knavalbattle-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-knavalbattle/kdegames-knavalbattle.install b/kde-unstable/kdegames-knavalbattle/kdegames-knavalbattle.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/kdegames-knavalbattle/kdegames-knavalbattle.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-knetwalk/PKGBUILD b/kde-unstable/kdegames-knetwalk/PKGBUILD
deleted file mode 100644
index 6a18fd6d6..000000000
--- a/kde-unstable/kdegames-knetwalk/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171801 2012-11-21 19:31:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-knetwalk
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Connect all the terminals to the server, in as few turns as possible"
-url="http://kde.org/applications/games/knetwalk/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/knetwalk-${pkgver}.tar.xz")
-sha1sums=('54638b39f2f23f231b5a533bbf3deb82b25bc93b')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../knetwalk-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-knetwalk/kdegames-knetwalk.install b/kde-unstable/kdegames-knetwalk/kdegames-knetwalk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-knetwalk/kdegames-knetwalk.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-kolf/PKGBUILD b/kde-unstable/kdegames-kolf/PKGBUILD
deleted file mode 100644
index 5449d24a7..000000000
--- a/kde-unstable/kdegames-kolf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171802 2012-11-21 19:31:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kolf
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A miniature golf game with 2d top-down view"
-url="http://kde.org/applications/games/kolf/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kolf-${pkgver}.tar.xz")
-sha1sums=('4083457d9d3331e554b3ea391bcd37ce7eea973f')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kolf-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kolf/kdegames-kolf.install b/kde-unstable/kdegames-kolf/kdegames-kolf.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/kdegames-kolf/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-kollision/PKGBUILD b/kde-unstable/kdegames-kollision/PKGBUILD
deleted file mode 100644
index 243e1581b..000000000
--- a/kde-unstable/kdegames-kollision/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171803 2012-11-21 19:32:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kollision
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A simple ball dodging game"
-url="http://kde.org/applications/games/kollision/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kollision-${pkgver}.tar.xz")
-sha1sums=('f07924e70eb07b56d34ecee5061831466bea9618')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kollision-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kollision/kdegames-kollision.install b/kde-unstable/kdegames-kollision/kdegames-kollision.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kollision/kdegames-kollision.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-konquest/PKGBUILD b/kde-unstable/kdegames-konquest/PKGBUILD
deleted file mode 100644
index 405fc8a0e..000000000
--- a/kde-unstable/kdegames-konquest/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171804 2012-11-21 19:33:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-konquest
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="The KDE version of Gnu-Lactic"
-url="http://kde.org/applications/games/konquest/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/konquest-${pkgver}.tar.xz")
-sha1sums=('46334547e2dc0606b05930293037ba0006ecc05b')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../konquest-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-konquest/kdegames-konquest.install b/kde-unstable/kdegames-konquest/kdegames-konquest.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-konquest/kdegames-konquest.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-kpatience/PKGBUILD b/kde-unstable/kdegames-kpatience/PKGBUILD
deleted file mode 100644
index 677d87ee6..000000000
--- a/kde-unstable/kdegames-kpatience/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171805 2012-11-21 19:33:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kpatience
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Offers a selection of solitaire card games"
-url="http://kde.org/applications/games/kpat/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kpat-${pkgver}.tar.xz")
-sha1sums=('2ee0773fd86fd6321714be1d583e4d25a3589a44')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kpat-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kpatience/kdegames-kpatience.install b/kde-unstable/kdegames-kpatience/kdegames-kpatience.install
deleted file mode 100644
index 279b8f38d..000000000
--- a/kde-unstable/kdegames-kpatience/kdegames-kpatience.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/kdegames-kreversi/PKGBUILD b/kde-unstable/kdegames-kreversi/PKGBUILD
deleted file mode 100644
index 4db0e8ca7..000000000
--- a/kde-unstable/kdegames-kreversi/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171806 2012-11-21 19:34:54Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kreversi
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A simple one player strategy game played against the computer"
-url="http://kde.org/applications/games/kreversi/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kreversi-${pkgver}.tar.xz")
-sha1sums=('3c33f7b7d2ddc246d7a304b7a1893bd3a17ace58')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kreversi-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kreversi/kdegames-kreversi.install b/kde-unstable/kdegames-kreversi/kdegames-kreversi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kreversi/kdegames-kreversi.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-kshisen/PKGBUILD b/kde-unstable/kdegames-kshisen/PKGBUILD
deleted file mode 100644
index 718b28e78..000000000
--- a/kde-unstable/kdegames-kshisen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171807 2012-11-21 19:35:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kshisen
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles"
-url="http://kde.org/applications/games/kshisen/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kshisen-${pkgver}.tar.xz")
-sha1sums=('c29e40eab8424139421560bd4c38c90c2c044eb5')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kshisen-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kshisen/kdegames-kshisen.install b/kde-unstable/kdegames-kshisen/kdegames-kshisen.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kshisen/kdegames-kshisen.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-ksirk/PKGBUILD b/kde-unstable/kdegames-ksirk/PKGBUILD
deleted file mode 100644
index cb93bdbad..000000000
--- a/kde-unstable/kdegames-ksirk/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171808 2012-11-21 19:36:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-ksirk
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A computerized version of a well known strategy game"
-url="http://kde.org/applications/games/ksirk/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ksirk-${pkgver}.tar.xz")
-sha1sums=('9689540da05872676f10ba81d06d19149eabb643')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../ksirk-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-ksirk/kdegames-ksirk.install b/kde-unstable/kdegames-ksirk/kdegames-ksirk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-ksirk/kdegames-ksirk.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-ksnakeduel/PKGBUILD b/kde-unstable/kdegames-ksnakeduel/PKGBUILD
deleted file mode 100644
index 15a426d67..000000000
--- a/kde-unstable/kdegames-ksnakeduel/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171809 2012-11-21 19:36:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-ksnakeduel
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A simple snake duel game"
-url="http://kde.org/applications/games/ksnakeduel/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz")
-sha1sums=('46b7e6e3810487d5c7669653e1c9eb5ff372fd19')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../ksnakeduel-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-ksnakeduel/kdegames-ksnakeduel.install b/kde-unstable/kdegames-ksnakeduel/kdegames-ksnakeduel.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-ksnakeduel/kdegames-ksnakeduel.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-kspaceduel/PKGBUILD b/kde-unstable/kdegames-kspaceduel/PKGBUILD
deleted file mode 100644
index b4a7bc671..000000000
--- a/kde-unstable/kdegames-kspaceduel/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171810 2012-11-21 19:37:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kspaceduel
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun"
-url="http://kde.org/applications/games/kspaceduel/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz")
-sha1sums=('44ed8e2d47db3e6eebd3e843a33ef484fe8f69c6')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kspaceduel-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kspaceduel/kdegames-kspaceduel.install b/kde-unstable/kdegames-kspaceduel/kdegames-kspaceduel.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/kdegames-kspaceduel/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-ksquares/PKGBUILD b/kde-unstable/kdegames-ksquares/PKGBUILD
deleted file mode 100644
index 6810f17f3..000000000
--- a/kde-unstable/kdegames-ksquares/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171811 2012-11-21 19:38:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-ksquares
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes"
-url="http://kde.org/applications/games/ksquares/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ksquares-${pkgver}.tar.xz")
-sha1sums=('2fe82e3abc870eb7a66e62e94b343de1d4a71b84')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../ksquares-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-ksquares/kdegames-ksquares.install b/kde-unstable/kdegames-ksquares/kdegames-ksquares.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-ksquares/kdegames-ksquares.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-ksudoku/PKGBUILD b/kde-unstable/kdegames-ksudoku/PKGBUILD
deleted file mode 100644
index e8d2bd7fd..000000000
--- a/kde-unstable/kdegames-ksudoku/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171812 2012-11-21 19:38:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-ksudoku
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A logic-based symbol placement puzzle"
-url="http://kde.org/applications/games/ksudoku/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ksudoku-${pkgver}.tar.xz")
-sha1sums=('332821c53f1f08f2dbaf03fdf0588879725d628b')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../ksudoku-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-ksudoku/kdegames-ksudoku.install b/kde-unstable/kdegames-ksudoku/kdegames-ksudoku.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-ksudoku/kdegames-ksudoku.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-ktuberling/PKGBUILD b/kde-unstable/kdegames-ktuberling/PKGBUILD
deleted file mode 100644
index c25e8e3b9..000000000
--- a/kde-unstable/kdegames-ktuberling/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171813 2012-11-21 19:39:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-ktuberling
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A simple constructor game suitable for children and adults alike"
-url="http://kde.org/applications/games/ktuberling/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ktuberling-${pkgver}.tar.xz")
-sha1sums=('a3045890cf761f8e9ea6bd22699281f614468d83')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../ktuberling-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-ktuberling/kdegames-ktuberling.install b/kde-unstable/kdegames-ktuberling/kdegames-ktuberling.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/kdegames-ktuberling/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-kubrick/PKGBUILD b/kde-unstable/kdegames-kubrick/PKGBUILD
deleted file mode 100644
index 895388772..000000000
--- a/kde-unstable/kdegames-kubrick/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171814 2012-11-21 19:40:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-kubrick
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Based on the famous Rubik's Cube"
-url="http://kde.org/applications/games/kubrick/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4' 'mesa')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kubrick-${pkgver}.tar.xz")
-sha1sums=('c553b86fcb78b1c182945ab75bc85391b4dca593')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../kubrick-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-kubrick/kdegames-kubrick.install b/kde-unstable/kdegames-kubrick/kdegames-kubrick.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-kubrick/kdegames-kubrick.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-lskat/PKGBUILD b/kde-unstable/kdegames-lskat/PKGBUILD
deleted file mode 100644
index e2e543075..000000000
--- a/kde-unstable/kdegames-lskat/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171815 2012-11-21 19:40:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-lskat
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Lieutenant Skat is a fun and engaging card game for two players"
-url="http://kde.org/applications/games/lskat/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/lskat-${pkgver}.tar.xz")
-sha1sums=('7de09b0e2678f6f5a95e72049d3ba5438e3c6b2d')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../lskat-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-lskat/kdegames-lskat.install b/kde-unstable/kdegames-lskat/kdegames-lskat.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/kde-unstable/kdegames-lskat/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-palapeli/PKGBUILD b/kde-unstable/kdegames-palapeli/PKGBUILD
deleted file mode 100644
index f9f8dea45..000000000
--- a/kde-unstable/kdegames-palapeli/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171816 2012-11-21 19:41:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-palapeli
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A single-player jigsaw puzzle game"
-url="http://kde.org/applications/games/palapeli/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/palapeli-${pkgver}.tar.xz")
-sha1sums=('be62e6e82f7c5b2f3f8c4a6cee895170a4c49bc4')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../palapeli-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-palapeli/kdegames-palapeli.install b/kde-unstable/kdegames-palapeli/kdegames-palapeli.install
deleted file mode 100644
index 279b8f38d..000000000
--- a/kde-unstable/kdegames-palapeli/kdegames-palapeli.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/kdegames-picmi/PKGBUILD b/kde-unstable/kdegames-picmi/PKGBUILD
deleted file mode 100644
index 4d3ea8e9e..000000000
--- a/kde-unstable/kdegames-picmi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171873 2012-11-21 22:04:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegames-picmi
-pkgver=4.9.80
-pkgrel=2
-pkgdesc="A nonogram logic game for KDE"
-url="http://kde.org/applications/games/picmi/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'libkdegames')
-makedepends=('cmake' 'automoc4')
-replaces=('picmi')
-conflicts=('picmi')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/picmi-${pkgver}.tar.xz")
-sha1sums=('03b8385e5b1de2c6fb51c9cf40e3a1473eb21db9')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../picmi-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdegames-picmi/kdegames-picmi.install b/kde-unstable/kdegames-picmi/kdegames-picmi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdegames-picmi/kdegames-picmi.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 899278af8..000000000
--- a/kde-unstable/kdegames/PKGBUILD
+++ /dev/null
@@ -1,510 +0,0 @@
-# $Id: PKGBUILD 163411 2012-07-11 22:37:02Z 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.97
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2'
-             'openal')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('81a28078640a69e36412722a43be03ebb6224ea1')
-
-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-python2' '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')
-	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
-}
-
-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')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kreversi
-	make DESTDIR=$pkgdir install
-}
-
-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')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/ksquares
-	make DESTDIR=$pkgdir install
-}
-
-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' 'openal')
-	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 81ce5c4b0..000000000
--- a/kde-unstable/kdegames/kdegames-kbattleship.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-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 3af34a012..000000000
--- a/kde-unstable/kdegames/kdegames-kpatience.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-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-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 c28f5e477..000000000
--- a/kde-unstable/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171818 2012-11-21 19:42:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.9.80
-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' 'kdebase-runtime' 'libkipi' 'lcms2')
-makedepends=('cmake' 'automoc4' 'mesa')
-optdepends=('kipi-plugins: extra plugins to share photos')
-install=$pkgname.install
-source=("http://download.kde.org/unstable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
-sha1sums=('483eff39d7944d3df38f93f434abe3479c2bcd07')
-
-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 1aadf2950..000000000
--- a/kde-unstable/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171819 2012-11-21 19:43:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.9.80
-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' 'libgphoto2')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/kamera-${pkgver}.tar.xz")
-sha1sums=('db8cf609357d90eda1c55a02d1d52faa976fd97d')
-
-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 dc81a4a6c..000000000
--- a/kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171820 2012-11-21 19:43:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.9.80
-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.xz")
-sha1sums=('b366981076edfcdafdb8e00844a132db26b8393c')
-
-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 cdbd2db53..000000000
--- a/kde-unstable/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171821 2012-11-21 19:44:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.9.80
-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.xz")
-sha1sums=('c61e290893733b5bb80559e0c6b62b04b04a017c')
-
-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 1fc4783c6..000000000
--- a/kde-unstable/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171822 2012-11-21 19:44:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.9.80
-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.xz")
-sha1sums=('147b3e8aa6f7f0ed6370631e3742022e5dfa0b01')
-
-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 ad3058fb1..000000000
--- a/kde-unstable/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171823 2012-11-21 19:45:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.9.80
-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.xz")
-sha1sums=('73c97e77b4b89c985c08b9e429f9d17d5d0fe69e')
-
-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 969049c7f..000000000
--- a/kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171824 2012-11-21 19:46:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A scan plugin that implements the scanning"
-url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
-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.xz")
-sha1sums=('23a37da7e6417e6e3283fc969a3b2900ca48a709')
-
-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 ed0b89c21..000000000
--- a/kde-unstable/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171826 2012-11-21 19:46:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.9.80
-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=('kdebase-runtime' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('50b937b84b44e8ff3ea4a1f4659f286677f545a3')
-
-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 1a3b2e533..000000000
--- a/kde-unstable/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171828 2012-11-21 19:47:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A collection of plugins to handle mobipocket files"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
-groups=('kde' 'kdegraphics')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('1c68cfeebe9f7a753e762f2e129867eb3e99a584')
-
-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-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 f2122691d..000000000
--- a/kde-unstable/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 171719 2012-11-21 18:12:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.9.80
-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.xz")
-sha1sums=('0eae6e67e5861d4f6771147bcfa50513ae003f23')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_ActiveApp=OFF
-  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 844c99454..000000000
--- a/kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171829 2012-11-21 19:47:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
-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.xz")
-sha1sums=('a6586b8043a37ac6dfbdd60f1555d4ae976b9871')
-
-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 5d33bf3eb..000000000
--- a/kde-unstable/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171830 2012-11-21 19:48:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A KPart for viewing SVGs"
-url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
-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.xz")
-sha1sums=('820adf5ca725571a411b33b204ec616d2f266d35')
-
-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 1833953a6..000000000
--- a/kde-unstable/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171831 2012-11-21 19:48:54Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Thumbnailers for various graphics file formats"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
-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.xz")
-sha1sums=('634800a6818305924bca74e8dcaa1731ade554f3')
-
-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/kdemultimedia-audiocd-kio/PKGBUILD b/kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
deleted file mode 100644
index def5eecab..000000000
--- a/kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171832 2012-11-21 19:49:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-audiocd-kio
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Kioslave for accessing audio CDs"
-url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libkcddb' 'libkcompactdisc' 'lame')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdemultimedia')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/unstable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('2ca7092d54467a667049c29d037c6d0a046c4fe1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../audiocd-kio-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdemultimedia-dragonplayer/PKGBUILD b/kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
deleted file mode 100644
index 082a1aa19..000000000
--- a/kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171833 2012-11-21 19:50:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-dragonplayer
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A multimedia player where the focus is on simplicity, instead of
-features"
-url='http://kde.org/applications/multimedia/dragonplayer/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('f578c03c050d8ba018931eb458ecea11c3a81f94')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../dragon-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdemultimedia-dragonplayer/kdemultimedia-dragonplayer.install b/kde-unstable/kdemultimedia-dragonplayer/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/kde-unstable/kdemultimedia-dragonplayer/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-ffmpegthumbs/PKGBUILD b/kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
deleted file mode 100644
index 5c69944c1..000000000
--- a/kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171834 2012-11-21 19:50:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.9.80
-pkgrel=1
-pkgdesc='FFmpeg-based thumbnail creator for video files'
-url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdelibs' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('f4f53267642f8181741a0491e34fb6b85ba0e298')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ffmpegthumbs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdemultimedia-juk/PKGBUILD b/kde-unstable/kdemultimedia-juk/PKGBUILD
deleted file mode 100644
index b8e8ae0f6..000000000
--- a/kde-unstable/kdemultimedia-juk/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171835 2012-11-21 19:51:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-juk
-pkgver=4.9.80
-pkgrel=1
-pkgdesc='A jukebox, tagger and music collection manager'
-url='http://kde.org/applications/multimedia/juk/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime' 'taglib')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('236f1d9003239a2b8805932af1a019e14b8450b1')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../juk-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_TunePimp=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdemultimedia-juk/kdemultimedia-juk.install b/kde-unstable/kdemultimedia-juk/kdemultimedia-juk.install
deleted file mode 100644
index c0797237a..000000000
--- a/kde-unstable/kdemultimedia-juk/kdemultimedia-juk.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-kmix/PKGBUILD b/kde-unstable/kdemultimedia-kmix/PKGBUILD
deleted file mode 100644
index e9ce4ad64..000000000
--- a/kde-unstable/kdemultimedia-kmix/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171836 2012-11-21 19:51:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-kmix
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="KDE volume control program"
-url='http://kde.org/applications/multimedia/kmix/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('60c5d851ece3fd62db2604d2fcde05639ac49c83')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmix-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdemultimedia-kmix/kdemultimedia-kmix.install b/kde-unstable/kdemultimedia-kmix/kdemultimedia-kmix.install
deleted file mode 100644
index c0797237a..000000000
--- a/kde-unstable/kdemultimedia-kmix/kdemultimedia-kmix.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-kscd/PKGBUILD b/kde-unstable/kdemultimedia-kscd/PKGBUILD
deleted file mode 100644
index 6ac47add5..000000000
--- a/kde-unstable/kdemultimedia-kscd/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171837 2012-11-21 19:52:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-kscd
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="KDE CD player"
-url='http://kde.org/applications/multimedia/kscd/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('b92a7d1f1d35616e0ac3272bf33aa7c0aef116ca')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kscd-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdemultimedia-kscd/kdemultimedia-kscd.install b/kde-unstable/kdemultimedia-kscd/kdemultimedia-kscd.install
deleted file mode 100644
index c0797237a..000000000
--- a/kde-unstable/kdemultimedia-kscd/kdemultimedia-kscd.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/PKGBUILD b/kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
deleted file mode 100644
index dfd729f3b..000000000
--- a/kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171838 2012-11-21 19:53:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="MPlayer based thumbnail generator for video files"
-url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
-arch=('i686' 'x86_64')
-groups=('kde' 'kdemultimedia')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'mplayer')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('1da7ccdcdd9980aaa2adf338496de52469582fb4')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../mplayerthumbs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdenetwork/PKGBUILD b/kde-unstable/kdenetwork/PKGBUILD
deleted file mode 100644
index cbf5ba729..000000000
--- a/kde-unstable/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,118 +0,0 @@
-# $Id: PKGBUILD 171839 2012-11-21 19:54:05Z 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.9.80
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
-    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
-    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'use-libotr3.patch')
-sha1sums=('98ac23fe593001486f233c9b6f8b98ab76914a14'
-          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384')
-
-build() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/use-libotr3.patch
-    cd ../
-
-	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 \
-        -DWITH_qq=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' 'libotr3' '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' 'telepathy-qt')
-    optdepends=('libvncserver: VNC support'
-                'rdesktop: RDP support'
-                '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' 'telepathy-qt')
-	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/kdenetwork/use-libotr3.patch b/kde-unstable/kdenetwork/use-libotr3.patch
deleted file mode 100644
index 1e96c98d6..000000000
--- a/kde-unstable/kdenetwork/use-libotr3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
---- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
-+++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
-@@ -13,13 +13,13 @@
-     SET(LIBOTR_FIND_QUIETLY TRUE)
- ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
- 
--FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
-+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
- 
--FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
-+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
- 
--# Determine version information from libotr/version.h
-+# Determine version information from libotr3/version.h
- IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
--  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
-+  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
-   STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
-   STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
-   # Check if version is at least 3.2.0
-diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
---- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
-@@ -26,7 +26,7 @@
-   */
- 
- extern "C"{
--#include "libotr/proto.h"
-+#include "libotr3/proto.h"
- }
- 
- #include "kopetechatsession.h"
-diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
---- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
-@@ -36,10 +36,10 @@
- #include "authenticationwizard.h"
- 
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
- }
- 
- 
-diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
---- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
-@@ -32,11 +32,11 @@
- #include <kopetechatsession.h>
- 
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
--#include <libotr/context.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
-+#include <libotr3/context.h>
- }
- 
- class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/kde-unstable/kdepim-runtime/PKGBUILD b/kde-unstable/kdepim-runtime/PKGBUILD
deleted file mode 100644
index d6e7c783a..000000000
--- a/kde-unstable/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171716 2012-11-21 18:10:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.9.80
-pkgrel=1
-pkgdesc='Extends the functionality of kdepim'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepim-runtime'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi')
-makedepends=('cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d5d47f830786c627e6fb3a336b5506ba525e7e17')
-
-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/kdepim-runtime/kdepim-runtime.install b/kde-unstable/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/kde-unstable/kdepim-runtime/kdepim-runtime.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/kdepim-runtime/libkgapi.patch b/kde-unstable/kdepim-runtime/libkgapi.patch
deleted file mode 100644
index 35fc55dff..000000000
--- a/kde-unstable/kdepim-runtime/libkgapi.patch
+++ /dev/null
@@ -1,1742 +0,0 @@
-From: Dan Vrátil <dan@progdan.cz>
-Date: Thu, 31 May 2012 20:17:18 +0000
-Subject: Adapt Google resources to LibKGoogle/LibKGAPI renaming
-X-Git-Url: http://quickgit.kde.org/?p=kdepim-runtime.git&amp;a=commitdiff&amp;h=0f169f44a5c514a7fc297041fa46f7a727ecf71d
----
-Adapt Google resources to LibKGoogle/LibKGAPI renaming
-
-- use KGAPI namespace
-- fix headers location
-- require LibKGAPI 0.4.0
-
-REVIEW: 105109
----
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -93,11 +93,11 @@ endif(NOT KDEPIM_NO_NEPOMUK)
- find_package(Strigi)
- macro_log_feature(STRIGI_FOUND "Strigi" "Strigi desktop search engine" "http://strigi.sourceforge.net" FALSE "" "")
- 
--set(LibKGoogle_MIN_VERSION 0.3.2)
--find_package(LibKGoogle QUIET NO_MODULE)
--macro_log_feature(LibKGoogle_FOUND "LibKGoogle" "A library to access Google services" "http://projects.kde.org/libkgoogle" FALSE "${LibKGoogle_MIN_VERSION}" "LibKGoogle is required to build Akonadi resources to access Google Contacts, Calendars and Tasks" )
-+set(LibKGAPI_MIN_VERSION 0.4.0)
-+find_package(LibKGAPI QUIET NO_MODULE)
-+macro_log_feature(LibKGAPI_FOUND "LibKGAPI" "A library to access Google services" "http://projects.kde.org/libkgapi" FALSE "${LibKGAPI_MIN_VERSION}" "LibKGAPI is required to build Akonadi resources to access Google Contacts, Calendars and Tasks" )
- 
--if(LibKGoogle_FOUND)
-+if(LibKGAPI_FOUND)
-   find_package(QJSON)
-   macro_log_feature(QJSON_FOUND "QJSON" "Qt library for handling JSON data" "http://qjson.sourceforge.net/" TRUE)
- endif()
-
---- a/resources/CMakeLists.txt
-+++ b/resources/CMakeLists.txt
-@@ -54,7 +54,7 @@ macro_optional_add_subdirectory( microbl
- macro_optional_add_subdirectory( openxchange )
- add_subdirectory( pop3 )
- 
--if( LibKGoogle_FOUND )
-+if( LibKGAPI_FOUND )
-   add_subdirectory( google )
- endif()
- 
-
---- a/resources/google/CMakeLists.txt
-+++ b/resources/google/CMakeLists.txt
-@@ -1,4 +1,4 @@
--include_directories(${LibKGoogle_INCLUDE_DIR})
-+include_directories(${LibKGAPI_INCLUDE_DIR})
- 
- macro_optional_add_subdirectory(calendar)
- macro_optional_add_subdirectory(contacts)
-
---- a/resources/google/calendar/CMakeLists.txt
-+++ b/resources/google/calendar/CMakeLists.txt
-@@ -43,7 +43,7 @@ target_link_libraries(akonadi_googlecale
-   ${KDE4_KDECORE_LIBS}
-   ${KDE4_KDEWEBKIT_LIBS}
-   ${QJSON_LIBRARIES}
--  ${LibKGoogle_LIBRARY}
-+  ${LibKGAPI_LIBRARY}
- )
- 
- install(TARGETS akonadi_googlecalendar_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
-
---- a/resources/google/calendar/calendareditor.cpp
-+++ b/resources/google/calendar/calendareditor.cpp
-@@ -23,8 +23,9 @@
- 
- #include <QFile>
- 
--#include <libkgoogle/services/calendar.h>
--using namespace KGoogle::Objects;
-+#include <libkgapi/services/calendar.h>
-+
-+using namespace KGAPI::Objects;
- 
- CalendarEditor::CalendarEditor( Calendar *calendar ) :
-   QDialog(),
-@@ -56,7 +57,7 @@ CalendarEditor::~CalendarEditor()
- void CalendarEditor::accepted()
- {
-   if ( !m_calendar ) {
--    m_calendar = new KGoogle::Objects::Calendar();
-+    m_calendar = new KGAPI::Objects::Calendar();
-   }
- 
-   m_calendar->setTitle( m_ui->nameEdit->text() );
-
---- a/resources/google/calendar/calendareditor.h
-+++ b/resources/google/calendar/calendareditor.h
-@@ -20,13 +20,13 @@
- 
- #include <QDialog>
- 
--#include <libkgoogle/objects/calendar.h>
-+#include <libkgapi/objects/calendar.h>
- 
- namespace Ui {
-   class CalendarEditor;
- }
- 
--using namespace KGoogle::Objects;
-+using namespace KGAPI::Objects;
- 
- class CalendarEditor: public QDialog
- {
-@@ -37,7 +37,7 @@ class CalendarEditor: public QDialog
-     virtual ~CalendarEditor();
- 
-   Q_SIGNALS:
--    void accepted( KGoogle::Objects::Calendar *calendar );
-+    void accepted( KGAPI::Objects::Calendar *calendar );
- 
-   private Q_SLOTS:
-     void accepted();
-
---- a/resources/google/calendar/calendarresource.cpp
-+++ b/resources/google/calendar/calendarresource.cpp
-@@ -36,23 +36,23 @@
- #include <QStringList>
- #include <QMetaType>
- 
--#include <libkgoogle/common.h>
--#include <libkgoogle/account.h>
--#include <libkgoogle/accessmanager.h>
--#include <libkgoogle/auth.h>
--#include <libkgoogle/fetchlistjob.h>
--#include <libkgoogle/request.h>
--#include <libkgoogle/reply.h>
--#include <libkgoogle/objects/calendar.h>
--#include <libkgoogle/objects/event.h>
--#include <libkgoogle/objects/task.h>
--#include <libkgoogle/objects/tasklist.h>
--#include <libkgoogle/services/calendar.h>
--#include <libkgoogle/services/tasks.h>
-+#include <libkgapi/common.h>
-+#include <libkgapi/account.h>
-+#include <libkgapi/accessmanager.h>
-+#include <libkgapi/auth.h>
-+#include <libkgapi/fetchlistjob.h>
-+#include <libkgapi/request.h>
-+#include <libkgapi/reply.h>
-+#include <libkgapi/objects/calendar.h>
-+#include <libkgapi/objects/event.h>
-+#include <libkgapi/objects/task.h>
-+#include <libkgapi/objects/tasklist.h>
-+#include <libkgapi/services/calendar.h>
-+#include <libkgapi/services/tasks.h>
- 
- using namespace KCalCore;
- using namespace Akonadi;
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- CalendarResource::CalendarResource( const QString &id ):
-   ResourceBase( id ),
-@@ -60,8 +60,8 @@ CalendarResource::CalendarResource( cons
-   m_fetchedCalendars( false ),
-   m_fetchedTaskLists( false )
- {
--  qRegisterMetaType< KGoogle::Services::Calendar >( "Calendar" );
--  qRegisterMetaType< KGoogle::Services::Tasks >( "Tasks" );
-+  qRegisterMetaType< KGAPI::Services::Calendar >( "Calendar" );
-+  qRegisterMetaType< KGAPI::Services::Tasks >( "Tasks" );
-   AttributeFactory::registerAttribute< DefaultReminderAttribute >();
- 
-   Auth *auth = Auth::instance();
-@@ -71,10 +71,10 @@ CalendarResource::CalendarResource( cons
-   setOnline( true );
- 
-   m_gam = new AccessManager();
--  connect( m_gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
--  connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(replyReceived(KGoogle::Reply*)) );
-+  connect( m_gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
-+  connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(replyReceived(KGAPI::Reply*)) );
- 
-   connect( this, SIGNAL(abortRequested()),
-            this, SLOT(slotAbortRequested()) );
-@@ -113,7 +113,7 @@ void CalendarResource::slotAbortRequeste
-   abort();
- }
- 
--void CalendarResource::error( const KGoogle::Error errCode, const QString &msg )
-+void CalendarResource::error( const KGAPI::Error errCode, const QString &msg )
- {
-   cancelTask( msg );
- 
-@@ -160,7 +160,7 @@ Account::Ptr CalendarResource::getAccoun
-   Auth *auth = Auth::instance();
-   try {
-     m_account = auth->getAccount( Settings::self()->account() );
--  } catch( KGoogle::Exception::BaseException &e ) {
-+  } catch( KGAPI::Exception::BaseException &e ) {
-     Q_EMIT status( Broken, e.what() );
-     return Account::Ptr();
-   }
-@@ -267,7 +267,7 @@ bool CalendarResource::retrieveItem( con
-     return true;
-   }
- 
--  Request *request = new Request( url, KGoogle::Request::Fetch, service, account );
-+  Request *request = new Request( url, KGAPI::Request::Fetch, service, account );
-   request->setProperty( "Item", QVariant::fromValue( item ) );
-   m_gam->sendRequest( request );
- 
-@@ -340,7 +340,7 @@ void CalendarResource::itemAdded( const
- 
-     Services::Calendar service;
-     kevent.setUid( "" );
--    data = service.objectToJSON( static_cast< KGoogle::Object * >( &kevent ) );
-+    data = service.objectToJSON( static_cast< KGAPI::Object * >( &kevent ) );
- 
-   } else if ( item.mimeType() == Todo::todoMimeType() ) {
- 
-@@ -355,7 +355,7 @@ void CalendarResource::itemAdded( const
-     }
- 
-     Services::Tasks service;
--    data = service.objectToJSON( static_cast< KGoogle::Object * >( &ktodo ) );
-+    data = service.objectToJSON( static_cast< KGAPI::Object * >( &ktodo ) );
- 
-   } else {
-     cancelTask( i18n( "Unknown payload type '%1'", item.mimeType() ) );
-@@ -399,7 +399,7 @@ void CalendarResource::itemChanged( cons
-     url = Services::Calendar::updateEventUrl( item.parentCollection().remoteId(), item.remoteId() );
- 
-     Services::Calendar service;
--    data = service.objectToJSON( static_cast< KGoogle::Object * >( &kevent ) );
-+    data = service.objectToJSON( static_cast< KGAPI::Object * >( &kevent ) );
- 
-     Request *request = new Request( url, Request::Patch, "Calendar", account );
-     request->setRequestData( data, "application/json" );
-@@ -498,13 +498,13 @@ void CalendarResource::itemMoved( const
-   url = Services::Calendar::moveEventUrl( collectionSource.remoteId(),
-                                           collectionDestination.remoteId(),
-                                           item.remoteId() );
--  Request *request = new Request( url, KGoogle::Request::Move, "Calendar", account );
-+  Request *request = new Request( url, KGAPI::Request::Move, "Calendar", account );
-   request->setProperty( "Item", qVariantFromValue( item ) );
- 
-   m_gam->sendRequest( request );
- }
- 
--void CalendarResource::replyReceived( KGoogle::Reply *reply )
-+void CalendarResource::replyReceived( KGAPI::Reply *reply )
- {
-   switch ( reply->requestType() ) {
-   case Request::FetchAll:
-
---- a/resources/google/calendar/calendarresource.h
-+++ b/resources/google/calendar/calendarresource.h
-@@ -23,17 +23,17 @@
- #include <Akonadi/Item>
- #include <Akonadi/Collection>
- 
--#include <libkgoogle/common.h>
--#include <libkgoogle/account.h>
-+#include <libkgapi/common.h>
-+#include <libkgapi/account.h>
- 
--namespace KGoogle {
-+namespace KGAPI {
-   class AccessManager;
-   class Account;
-   class Reply;
-   class Request;
- }
- 
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- class CalendarResource : public Akonadi::ResourceBase, public Akonadi::AgentBase::ObserverV2
- {
-@@ -61,40 +61,40 @@ class CalendarResource : public Akonadi:
-     void aboutToQuit();
- 
-   private Q_SLOTS:
--    void error( const KGoogle::Error, const QString & );
-+    void error( const KGAPI::Error, const QString & );
-     void slotAbortRequested();
- 
-     void cachedItemsRetrieved( KJob *job );
--    void replyReceived( KGoogle::Reply *reply );
-+    void replyReceived( KGAPI::Reply *reply );
- 
-     void itemsReceived( KJob *job );
--    void itemReceived( KGoogle::Reply *reply );
--    void itemCreated( KGoogle::Reply *reply );
--    void itemUpdated( KGoogle::Reply *reply );
--    void itemRemoved( KGoogle::Reply *reply );
--    void itemMoved( KGoogle::Reply *reply );
-+    void itemReceived( KGAPI::Reply *reply );
-+    void itemCreated( KGAPI::Reply *reply );
-+    void itemUpdated( KGAPI::Reply *reply );
-+    void itemRemoved( KGAPI::Reply *reply );
-+    void itemMoved( KGAPI::Reply *reply );
- 
-     void taskListReceived( KJob *job );
-     void calendarsReceived( KJob *job );
- 
-     /* The actual update of task */
--    void taskDoUpdate( KGoogle::Reply *reply );
-+    void taskDoUpdate( KGAPI::Reply *reply );
- 
--    void taskReceived( KGoogle::Reply *reply );
-+    void taskReceived( KGAPI::Reply *reply );
-     void tasksReceived( KJob *job );
--    void taskCreated( KGoogle::Reply *reply );
--    void taskUpdated( KGoogle::Reply *reply );
--    void taskRemoved( KGoogle::Reply *reply );
-+    void taskCreated( KGAPI::Reply *reply );
-+    void taskUpdated( KGAPI::Reply *reply );
-+    void taskRemoved( KGAPI::Reply *reply );
- 
-     void removeTaskFetchJobFinished( KJob *job );
-     void doRemoveTask( KJob *job );
- 
--    void eventReceived( KGoogle::Reply *reply );
-+    void eventReceived( KGAPI::Reply *reply );
-     void eventsReceived( KJob *job );
--    void eventCreated( KGoogle::Reply *reply );
--    void eventUpdated( KGoogle::Reply *reply );
--    void eventRemoved( KGoogle::Reply *reply );
--    void eventMoved( KGoogle::Reply *reply );
-+    void eventCreated( KGAPI::Reply *reply );
-+    void eventUpdated( KGAPI::Reply *reply );
-+    void eventRemoved( KGAPI::Reply *reply );
-+    void eventMoved( KGAPI::Reply *reply );
- 
-     void emitPercent( KJob *job, ulong percent );
- 
-
---- a/resources/google/calendar/defaultreminderattribute.cpp
-+++ b/resources/google/calendar/defaultreminderattribute.cpp
-@@ -19,13 +19,13 @@
- 
- #include <QVariant>
- 
--#include <libkgoogle/objects/calendar.h>
-+#include <libkgapi/objects/calendar.h>
- 
- #include <qjson/parser.h>
- #include <qjson/serializer.h>
- 
- using namespace KCalCore;
--using namespace KGoogle::Objects;
-+using namespace KGAPI::Objects;
- 
- DefaultReminderAttribute::DefaultReminderAttribute( const Reminder::List &reminders )
-   : m_reminders( reminders )
-
---- a/resources/google/calendar/defaultreminderattribute.h
-+++ b/resources/google/calendar/defaultreminderattribute.h
-@@ -19,14 +19,14 @@
- #ifndef GOOGLE_CALENDAR_DEFAULTREMINDERATTRIBUTE_H
- #define GOOGLE_CALENDAR_DEFAULTREMINDERATTRIBUTE_H
- 
--#include <libkgoogle/objects/calendar.h>
-+#include <libkgapi/objects/calendar.h>
- 
- #include <Akonadi/Attribute>
- #include <KCalCore/Alarm>
- #include <KCalCore/Incidence>
- 
- using namespace KCalCore;
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- class DefaultReminderAttribute : public Akonadi::Attribute
- {
-
---- a/resources/google/calendar/resource_events.cpp
-+++ b/resources/google/calendar/resource_events.cpp
-@@ -19,12 +19,12 @@
- #include "defaultreminderattribute.h"
- #include "settings.h"
- 
--#include <libkgoogle/fetchlistjob.h>
--#include <libkgoogle/reply.h>
--#include <libkgoogle/request.h>
--#include <libkgoogle/objects/event.h>
--#include <libkgoogle/objects/calendar.h>
--#include <libkgoogle/services/calendar.h>
-+#include <libkgapi/fetchlistjob.h>
-+#include <libkgapi/reply.h>
-+#include <libkgapi/request.h>
-+#include <libkgapi/objects/event.h>
-+#include <libkgapi/objects/calendar.h>
-+#include <libkgapi/services/calendar.h>
- 
- #include <KLocalizedString>
- 
-@@ -37,7 +37,7 @@
- #include <KCalCore/Todo>
- 
- using namespace Akonadi;
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- void CalendarResource::calendarsReceived( KJob *job )
- {
-@@ -51,8 +51,8 @@ void CalendarResource::calendarsReceived
- 
-   QStringList calendars = Settings::self()->calendars();
- 
--  QList< KGoogle::Object *> allData = fetchJob->items();
--  Q_FOREACH ( KGoogle::Object * replyData, allData ) {
-+  QList< KGAPI::Object *> allData = fetchJob->items();
-+  Q_FOREACH ( KGAPI::Object * replyData, allData ) {
- 
-     Objects::Calendar *calendar = static_cast< Objects::Calendar * >( replyData );
- 
-@@ -94,7 +94,7 @@ void CalendarResource::calendarsReceived
-   }
- }
- 
--void CalendarResource::eventReceived( KGoogle::Reply *reply )
-+void CalendarResource::eventReceived( KGAPI::Reply *reply )
- {
-   if ( reply->error() != OK ) {
-     cancelTask();
-@@ -218,7 +218,7 @@ void CalendarResource::eventsReceived( K
-   modifyJob->start();
- }
- 
--void CalendarResource::eventCreated( KGoogle::Reply *reply )
-+void CalendarResource::eventCreated( KGAPI::Reply *reply )
- {
-   if ( reply->error() != OK ) {
-     cancelTask( i18n( "Failed to create a new event: %1", reply->errorString() ) );
-@@ -244,7 +244,7 @@ void CalendarResource::eventCreated( KGo
-   changeCommitted( item );
- }
- 
--void CalendarResource::eventUpdated( KGoogle::Reply *reply )
-+void CalendarResource::eventUpdated( KGAPI::Reply *reply )
- {
-   if ( reply->error() != OK ) {
-     cancelTask( i18n( "Failed to update an event: %1", reply->errorString() ) );
-@@ -266,7 +266,7 @@ void CalendarResource::eventUpdated( KGo
-   changeCommitted( item );
- }
- 
--void CalendarResource::eventRemoved( KGoogle::Reply *reply )
-+void CalendarResource::eventRemoved( KGAPI::Reply *reply )
- {
-   if ( reply->error() != NoContent ) {
-     cancelTask( i18n( "Failed to delete event: %1", reply->errorString() ) );
-@@ -277,7 +277,7 @@ void CalendarResource::eventRemoved( KGo
-   changeCommitted( item );
- }
- 
--void CalendarResource::eventMoved( KGoogle::Reply *reply )
-+void CalendarResource::eventMoved( KGAPI::Reply *reply )
- {
-   if ( reply->error() != OK ) {
-     cancelTask( i18n( "Failed to move event: %1", reply->errorString() ) );
-
---- a/resources/google/calendar/resource_tasks.cpp
-+++ b/resources/google/calendar/resource_tasks.cpp
-@@ -18,13 +18,13 @@
- #include "calendarresource.h"
- #include "settings.h"
- 
--#include <libkgoogle/accessmanager.h>
--#include <libkgoogle/auth.h>
--#include <libkgoogle/fetchlistjob.h>
--#include <libkgoogle/reply.h>
--#include <libkgoogle/objects/task.h>
--#include <libkgoogle/objects/tasklist.h>
--#include <libkgoogle/services/tasks.h>
-+#include <libkgapi/accessmanager.h>
-+#include <libkgapi/auth.h>
-+#include <libkgapi/fetchlistjob.h>
-+#include <libkgapi/reply.h>
-+#include <libkgapi/objects/task.h>
-+#include <libkgapi/objects/tasklist.h>
-+#include <libkgapi/services/tasks.h>
- 
- #include <KLocalizedString>
- #include <KDebug>
-@@ -36,7 +36,7 @@
- #include <Akonadi/ItemFetchScope>
- 
- using namespace Akonadi;
--using namespace KGoogle;
-+using namespace KGAPI;
- using namespace KCalCore;
- 
- void CalendarResource::taskDoUpdate( Reply *reply )
-@@ -54,7 +54,7 @@ void CalendarResource::taskDoUpdate( Rep
-   QUrl url = Services::Tasks::updateTaskUrl( item.parentCollection().remoteId(), item.remoteId() );
- 
-   Services::Tasks service;
--  QByteArray data = service.objectToJSON( static_cast< KGoogle::Object *>( &ktodo ) );
-+  QByteArray data = service.objectToJSON( static_cast< KGAPI::Object *>( &ktodo ) );
- 
-   Request *request = new Request( url, Request::Update, "Tasks", account );
-   request->setRequestData( data, "application/json" );
-@@ -110,7 +110,7 @@ void CalendarResource::taskListReceived(
-   }
- }
- 
--void CalendarResource::taskReceived( KGoogle::Reply *reply )
-+void CalendarResource::taskReceived( KGAPI::Reply *reply )
- {
-   if ( reply->error() != OK ) {
-     cancelTask( i18n( "Failed to fetch task: %1", reply->errorString() ) );
-@@ -180,7 +180,7 @@ void CalendarResource::tasksReceived( KJ
-   modifyJob->start();
- }
- 
--void CalendarResource::taskCreated( KGoogle::Reply *reply )
-+void CalendarResource::taskCreated( KGAPI::Reply *reply )
- {
-   if ( reply->error() != OK ) {
-     cancelTask( i18n( "Failed to create a task: %1", reply->errorString() ) );
-@@ -205,7 +205,7 @@ void CalendarResource::taskCreated( KGoo
-   changeCommitted( item );
- }
- 
--void CalendarResource::taskUpdated( KGoogle::Reply *reply )
-+void CalendarResource::taskUpdated( KGAPI::Reply *reply )
- {
-   if ( reply->error() != OK ) {
-     cancelTask( i18n( "Failed to update task: %1", reply->errorString() ) );
-@@ -290,12 +290,12 @@ void CalendarResource::doRemoveTask( KJo
-   Request *request =
-     new Request(
-       Services::Tasks::removeTaskUrl( item.parentCollection().remoteId(), item.remoteId() ),
--      KGoogle::Request::Remove, "Tasks", account );
-+      KGAPI::Request::Remove, "Tasks", account );
-   request->setProperty( "Item", qVariantFromValue( item ) );
-   m_gam->sendRequest( request );
- }
- 
--void CalendarResource::taskRemoved( KGoogle::Reply *reply )
-+void CalendarResource::taskRemoved( KGAPI::Reply *reply )
- {
-   if ( reply->error() != NoContent ) {
-     cancelTask( i18n( "Failed to delete task (5): %1", reply->errorString() ) );
-
---- a/resources/google/calendar/settingsdialog.cpp
-+++ b/resources/google/calendar/settingsdialog.cpp
-@@ -30,20 +30,20 @@
- #include <QListWidget>
- #include <QPointer>
- 
--#include <libkgoogle/accessmanager.h>
--#include <libkgoogle/request.h>
--#include <libkgoogle/reply.h>
--#include <libkgoogle/auth.h>
--#include <libkgoogle/objects/calendar.h>
--#include <libkgoogle/objects/tasklist.h>
--#include <libkgoogle/services/calendar.h>
--#include <libkgoogle/services/tasks.h>
--#include <libkgoogle/ui/accountscombo.h>
-+#include <libkgapi/accessmanager.h>
-+#include <libkgapi/request.h>
-+#include <libkgapi/reply.h>
-+#include <libkgapi/auth.h>
-+#include <libkgapi/objects/calendar.h>
-+#include <libkgapi/objects/tasklist.h>
-+#include <libkgapi/services/calendar.h>
-+#include <libkgapi/services/tasks.h>
-+#include <libkgapi/ui/accountscombo.h>
- 
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- enum {
--  KGoogleObjectRole = Qt::UserRole,
-+  KGAPIObjectRole = Qt::UserRole,
-   ObjectUIDRole = Qt::UserRole + 1
- };
- 
-@@ -51,8 +51,8 @@ SettingsDialog::SettingsDialog( WId wind
-   KDialog( parent ),
-   m_windowId( windowId )
- {
--  qRegisterMetaType<KGoogle::Services::Calendar>( "Calendar" );
--  qRegisterMetaType<KGoogle::Services::Tasks>( "Tasks" );
-+  qRegisterMetaType<KGAPI::Services::Calendar>( "Calendar" );
-+  qRegisterMetaType<KGAPI::Services::Tasks>( "Tasks" );
- 
-   KWindowSystem::setMainWindow( this, windowId );
- 
-@@ -98,14 +98,14 @@ SettingsDialog::SettingsDialog( WId wind
-   connect( this, SIGNAL(accepted()),
-            this, SLOT(saveSettings()) );
- 
--  m_gam = new KGoogle::AccessManager;
--  connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) );
--  connect( m_gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  m_gam = new KGAPI::AccessManager;
-+  connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) );
-+  connect( m_gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  KGoogle::Auth *auth = KGoogle::Auth::instance();
--  connect( auth, SIGNAL(authenticated(KGoogle::Account::Ptr&)),
-+  KGAPI::Auth *auth = KGAPI::Auth::instance();
-+  connect( auth, SIGNAL(authenticated(KGAPI::Account::Ptr&)),
-            this, SLOT(reloadAccounts()) );
- 
-   m_ui->accountsCombo->clear();
-@@ -121,7 +121,7 @@ SettingsDialog::~SettingsDialog()
-   delete m_ui;
- }
- 
--void SettingsDialog::error( KGoogle::Error code, const QString &msg )
-+void SettingsDialog::error( KGAPI::Error code, const QString &msg )
- {
-   KMessageBox::sorry( this, msg, i18n( "Error while talking to Google" ) );
- 
-@@ -183,22 +183,22 @@ void SettingsDialog::reloadAccounts()
- 
- void SettingsDialog::addAccountClicked()
- {
--  KGoogle::Auth *auth = KGoogle::Auth::instance();
-+  KGAPI::Auth *auth = KGAPI::Auth::instance();
- 
--  KGoogle::Account::Ptr account( new KGoogle::Account() );
-+  KGAPI::Account::Ptr account( new KGAPI::Account() );
-   account->addScope( Services::Calendar::ScopeUrl );
-   account->addScope( Services::Tasks::ScopeUrl );
- 
-   try {
-     auth->authenticate( account, true );
--  } catch ( KGoogle::Exception::BaseException &e ) {
-+  } catch ( KGAPI::Exception::BaseException &e ) {
-     KMessageBox::error( this, e.what() );
-   }
- }
- 
- void SettingsDialog::removeAccountClicked()
- {
--  KGoogle::Account::Ptr account = m_ui->accountsCombo->currentAccount();
-+  KGAPI::Account::Ptr account = m_ui->accountsCombo->currentAccount();
-   if ( account.isNull() ) {
-     return;
-   }
-@@ -217,10 +217,10 @@ void SettingsDialog::removeAccountClicke
-     return;
-   }
- 
--  KGoogle::Auth *auth = KGoogle::Auth::instance();
-+  KGAPI::Auth *auth = KGAPI::Auth::instance();
-   try {
-     auth->revoke( account );
--  } catch ( KGoogle::Exception::BaseException &e ) {
-+  } catch ( KGAPI::Exception::BaseException &e ) {
-     KMessageBox::error( this, e.what() );
-   }
- 
-@@ -243,15 +243,15 @@ void SettingsDialog::accountChanged()
-     return;
-   }
- 
--  KGoogle::Request *request;
-+  KGAPI::Request *request;
- 
-   m_ui->calendarsList->clear();
--  request = new KGoogle::Request( Services::Calendar::fetchCalendarsUrl(),
-+  request = new KGAPI::Request( Services::Calendar::fetchCalendarsUrl(),
-                                   Request::FetchAll, "Calendar", account );
-   m_gam->queueRequest( request );
- 
-   m_ui->tasksList->clear();
--  request = new KGoogle::Request( Services::Tasks::fetchTaskListsUrl(),
-+  request = new KGAPI::Request( Services::Tasks::fetchTaskListsUrl(),
-                                   Request::FetchAll, "Tasks", account );
-   m_gam->sendRequest( request );
- }
-@@ -259,19 +259,19 @@ void SettingsDialog::accountChanged()
- void SettingsDialog::addCalendarClicked()
- {
-   QPointer<CalendarEditor> editor = new CalendarEditor;
--  connect( editor, SIGNAL(accepted(KGoogle::Objects::Calendar*)),
--           this, SLOT(addCalendar(KGoogle::Objects::Calendar*)) );
-+  connect( editor, SIGNAL(accepted(KGAPI::Objects::Calendar*)),
-+           this, SLOT(addCalendar(KGAPI::Objects::Calendar*)) );
- 
-   editor->exec();
- 
-   delete editor;
- }
- 
--void SettingsDialog::addCalendar( KGoogle::Objects::Calendar *calendar )
-+void SettingsDialog::addCalendar( KGAPI::Objects::Calendar *calendar )
- {
--  KGoogle::Account::Ptr account;
--  KGoogle::AccessManager *gam;
--  KGoogle::Request *request;
-+  KGAPI::Account::Ptr account;
-+  KGAPI::AccessManager *gam;
-+  KGAPI::Request *request;
-   Services::Calendar parser;
-   QByteArray data;
- 
-@@ -283,17 +283,17 @@ void SettingsDialog::addCalendar( KGoogl
-   m_ui->accountsBox->setDisabled( true );
-   m_ui->calendarsBox->setDisabled( true );
- 
--  gam = new KGoogle::AccessManager;
--  connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(gam_objectCreated(KGoogle::Reply*)) );
--  connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
-+  gam = new KGAPI::AccessManager;
-+  connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(gam_objectCreated(KGAPI::Reply*)) );
-+  connect( gam, SIGNAL(requestFinished(KGAPI::Request*)),
-            gam, SLOT(deleteLater()) );
--  connect( gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect( gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  request = new KGoogle::Request( Services::Calendar::createCalendarUrl(),
-+  request = new KGAPI::Request( Services::Calendar::createCalendarUrl(),
-                                   Request::Create, "Calendar", account );
--  data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( calendar ) );
-+  data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( calendar ) );
-   request->setRequestData( data, "application/json" );
-   gam->sendRequest( request );
- 
-@@ -316,25 +316,25 @@ void SettingsDialog::editCalendarClicked
-     return;
-   }
- 
--  calendar = item->data( KGoogleObjectRole ).value< KGoogle::Objects::Calendar * >();
-+  calendar = item->data( KGAPIObjectRole ).value< KGAPI::Objects::Calendar * >();
-   if ( !calendar ) {
-     return;
-   }
- 
-   QPointer<CalendarEditor> editor = new CalendarEditor( calendar );
--  connect( editor, SIGNAL(accepted(KGoogle::Objects::Calendar*)),
--           this, SLOT(editCalendar(KGoogle::Objects::Calendar*)) );
-+  connect( editor, SIGNAL(accepted(KGAPI::Objects::Calendar*)),
-+           this, SLOT(editCalendar(KGAPI::Objects::Calendar*)) );
- 
-   editor->exec();
- 
-   delete editor;
- }
- 
--void SettingsDialog::editCalendar( KGoogle::Objects::Calendar *calendar )
-+void SettingsDialog::editCalendar( KGAPI::Objects::Calendar *calendar )
- {
--  KGoogle::Account::Ptr account;
--  KGoogle::AccessManager *gam;
--  KGoogle::Request *request;
-+  KGAPI::Account::Ptr account;
-+  KGAPI::AccessManager *gam;
-+  KGAPI::Request *request;
-   Services::Calendar parser;
-   QByteArray data;
- 
-@@ -346,17 +346,17 @@ void SettingsDialog::editCalendar( KGoog
-   m_ui->accountsBox->setDisabled( true );
-   m_ui->calendarsBox->setDisabled( true );
- 
--  gam = new KGoogle::AccessManager;
--  connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(gam_objectModified(KGoogle::Reply*)) );
--  connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
-+  gam = new KGAPI::AccessManager;
-+  connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(gam_objectModified(KGAPI::Reply*)) );
-+  connect( gam, SIGNAL(requestFinished(KGAPI::Request*)),
-            gam, SLOT(deleteLater()) );
--  connect( gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect( gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  request = new KGoogle::Request( Services::Calendar::updateCalendarUrl( calendar->uid() ),
-+  request = new KGAPI::Request( Services::Calendar::updateCalendarUrl( calendar->uid() ),
-                                   Request::Update, "Calendar", account );
--  data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( calendar ) );
-+  data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( calendar ) );
-   request->setRequestData( data, "application/json" );
-   gam->sendRequest( request );
- 
-@@ -379,7 +379,7 @@ void SettingsDialog::removeCalendarClick
-     return;
-   }
- 
--  calendar = item->data( KGoogleObjectRole ).value< KGoogle::Objects::Calendar * >();
-+  calendar = item->data( KGAPIObjectRole ).value< KGAPI::Objects::Calendar * >();
-   if ( !calendar ) {
-     return;
-   }
-@@ -398,9 +398,9 @@ void SettingsDialog::removeCalendarClick
-     return;
-   }
- 
--  KGoogle::Account::Ptr account;
--  KGoogle::AccessManager *gam;
--  KGoogle::Request *request;
-+  KGAPI::Account::Ptr account;
-+  KGAPI::AccessManager *gam;
-+  KGAPI::Request *request;
- 
-   account = m_ui->accountsCombo->currentAccount();
-   if ( account.isNull() ) {
-@@ -410,15 +410,15 @@ void SettingsDialog::removeCalendarClick
-   m_ui->accountsBox->setDisabled( true );
-   m_ui->calendarsBox->setDisabled( true );
- 
--  gam = new KGoogle::AccessManager;
--  connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
-+  gam = new KGAPI::AccessManager;
-+  connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-            this, SLOT(reloadCalendarsClicked()) );
--  connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
-+  connect( gam, SIGNAL(requestFinished(KGAPI::Request*)),
-            gam, SLOT(deleteLater()) );
--  connect( gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect( gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  request = new KGoogle::Request( Services::Calendar::removeCalendarUrl( calendar->uid() ),
-+  request = new KGAPI::Request( Services::Calendar::removeCalendarUrl( calendar->uid() ),
-                                   Request::Remove, "Calendar", account );
-   gam->sendRequest( request );
- }
-@@ -426,8 +426,8 @@ void SettingsDialog::removeCalendarClick
- void SettingsDialog::addTaskListClicked()
- {
-   TasklistEditor *editor = new TasklistEditor;
--  connect( editor, SIGNAL(accepted(KGoogle::Objects::TaskList*)),
--           this, SLOT(addTaskList(KGoogle::Objects::TaskList*)) );
-+  connect( editor, SIGNAL(accepted(KGAPI::Objects::TaskList*)),
-+           this, SLOT(addTaskList(KGAPI::Objects::TaskList*)) );
- 
-   editor->exec();
- 
-@@ -436,9 +436,9 @@ void SettingsDialog::addTaskListClicked(
- 
- void SettingsDialog::reloadCalendarsClicked()
- {
--  KGoogle::AccessManager *gam;
--  KGoogle::Account::Ptr account;
--  KGoogle::Request *request;
-+  KGAPI::AccessManager *gam;
-+  KGAPI::Account::Ptr account;
-+  KGAPI::Request *request;
- 
-   account = m_ui->accountsCombo->currentAccount();
-   if ( account.isNull() ) {
-@@ -449,24 +449,24 @@ void SettingsDialog::reloadCalendarsClic
-   m_ui->calendarsBox->setDisabled( true );
- 
-   m_ui->calendarsList->clear();
--  gam = new KGoogle::AccessManager;
--  connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) );
--  connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
-+  gam = new KGAPI::AccessManager;
-+  connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) );
-+  connect( gam, SIGNAL(requestFinished(KGAPI::Request*)),
-            gam, SLOT(deleteLater()) );
--  connect( gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect( gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  request = new KGoogle::Request( Services::Calendar::fetchCalendarsUrl(),
-+  request = new KGAPI::Request( Services::Calendar::fetchCalendarsUrl(),
-                                   Request::FetchAll, "Calendar", account );
-   gam->sendRequest( request );
- }
- 
- void SettingsDialog::addTaskList( TaskList *taskList )
- {
--  KGoogle::Account::Ptr account;
--  KGoogle::AccessManager *gam;
--  KGoogle::Request *request;
-+  KGAPI::Account::Ptr account;
-+  KGAPI::AccessManager *gam;
-+  KGAPI::Request *request;
-   Services::Tasks parser;
-   QByteArray data;
- 
-@@ -478,17 +478,17 @@ void SettingsDialog::addTaskList( TaskLi
-   m_ui->accountsBox->setDisabled( true );
-   m_ui->tasksBox->setDisabled( true );
- 
--  gam = new KGoogle::AccessManager;
--  connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(gam_objectCreated(KGoogle::Reply*)) );
--  connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
-+  gam = new KGAPI::AccessManager;
-+  connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(gam_objectCreated(KGAPI::Reply*)) );
-+  connect( gam, SIGNAL(requestFinished(KGAPI::Request*)),
-            gam, SLOT(deleteLater()) );
--  connect( gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect( gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  request = new KGoogle::Request( Services::Tasks::createTaskListUrl(),
-+  request = new KGAPI::Request( Services::Tasks::createTaskListUrl(),
-                                   Request::Create, "Tasks", account );
--  data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( taskList ) );
-+  data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( taskList ) );
-   request->setRequestData( data, "application/json" );
-   gam->sendRequest( request );
- 
-@@ -511,14 +511,14 @@ void SettingsDialog::editTaskListClicked
-     return;
-   }
- 
--  taskList = item->data( KGoogleObjectRole ).value< KGoogle::Objects::TaskList * >();
-+  taskList = item->data( KGAPIObjectRole ).value< KGAPI::Objects::TaskList * >();
-   if ( !taskList ) {
-     return;
-   }
- 
-   QPointer<TasklistEditor> editor = new TasklistEditor( taskList );
--  connect( editor, SIGNAL(accepted(KGoogle::Objects::TaskList*)),
--           this, SLOT(editTaskList(KGoogle::Objects::TaskList*)) );
-+  connect( editor, SIGNAL(accepted(KGAPI::Objects::TaskList*)),
-+           this, SLOT(editTaskList(KGAPI::Objects::TaskList*)) );
- 
-   editor->exec();
- 
-@@ -527,9 +527,9 @@ void SettingsDialog::editTaskListClicked
- 
- void SettingsDialog::editTaskList( TaskList *taskList )
- {
--  KGoogle::Account::Ptr account;
--  KGoogle::AccessManager *gam;
--  KGoogle::Request *request;
-+  KGAPI::Account::Ptr account;
-+  KGAPI::AccessManager *gam;
-+  KGAPI::Request *request;
-   Services::Tasks parser;
-   QByteArray data;
- 
-@@ -541,17 +541,17 @@ void SettingsDialog::editTaskList( TaskL
-   m_ui->accountsBox->setDisabled( true );
-   m_ui->tasksBox->setDisabled( true );
- 
--  gam = new KGoogle::AccessManager;
--  connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(gam_objectModified(KGoogle::Reply*)) );
--  connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
-+  gam = new KGAPI::AccessManager;
-+  connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(gam_objectModified(KGAPI::Reply*)) );
-+  connect( gam, SIGNAL(requestFinished(KGAPI::Request*)),
-            gam, SLOT(deleteLater()) );
--  connect( gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect( gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  request = new KGoogle::Request( Services::Tasks::updateTaskListUrl( taskList->uid() ),
-+  request = new KGAPI::Request( Services::Tasks::updateTaskListUrl( taskList->uid() ),
-                                   Request::Update, "Tasks", account );
--  data = parser.objectToJSON( dynamic_cast< KGoogle::Object * >( taskList ) );
-+  data = parser.objectToJSON( dynamic_cast< KGAPI::Object * >( taskList ) );
-   request->setRequestData( data, "application/json" );
-   gam->sendRequest( request );
- 
-@@ -574,7 +574,7 @@ void SettingsDialog::removeTaskListClick
-     return;
-   }
- 
--  taskList = item->data( KGoogleObjectRole ).value< KGoogle::Objects::TaskList * >();
-+  taskList = item->data( KGAPIObjectRole ).value< KGAPI::Objects::TaskList * >();
-   if ( !taskList ) {
-     return;
-   }
-@@ -593,9 +593,9 @@ void SettingsDialog::removeTaskListClick
-     return;
-   }
- 
--  KGoogle::Account::Ptr account;
--  KGoogle::AccessManager *gam;
--  KGoogle::Request *request;
-+  KGAPI::Account::Ptr account;
-+  KGAPI::AccessManager *gam;
-+  KGAPI::Request *request;
- 
-   account = m_ui->accountsCombo->currentAccount();
-   if ( account.isNull() ) {
-@@ -605,24 +605,24 @@ void SettingsDialog::removeTaskListClick
-   m_ui->accountsBox->setDisabled( true );
-   m_ui->tasksBox->setDisabled( true );
- 
--  gam = new KGoogle::AccessManager;
--  connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
-+  gam = new KGAPI::AccessManager;
-+  connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-            this, SLOT(reloadTaskListsClicked()) );
--  connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
-+  connect( gam, SIGNAL(requestFinished(KGAPI::Request*)),
-            gam, SLOT(deleteLater()) );
--  connect( gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect( gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  request = new KGoogle::Request( Services::Tasks::removeTaskListUrl( taskList->uid() ),
-+  request = new KGAPI::Request( Services::Tasks::removeTaskListUrl( taskList->uid() ),
-                                   Request::Remove, "Tasks", account );
-   gam->sendRequest( request );
- }
- 
- void SettingsDialog::reloadTaskListsClicked()
- {
--  KGoogle::AccessManager *gam;
--  KGoogle::Account::Ptr account;
--  KGoogle::Request *request;
-+  KGAPI::AccessManager *gam;
-+  KGAPI::Account::Ptr account;
-+  KGAPI::Request *request;
- 
-   account = m_ui->accountsCombo->currentAccount();
-   if ( !account ) {
-@@ -634,30 +634,30 @@ void SettingsDialog::reloadTaskListsClic
- 
-   m_ui->tasksList->clear();
- 
--  gam = new KGoogle::AccessManager;
--  connect( gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(gam_objectsListReceived(KGoogle::Reply*)) );
--  connect( gam, SIGNAL(requestFinished(KGoogle::Request*)),
-+  gam = new KGAPI::AccessManager;
-+  connect( gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(gam_objectsListReceived(KGAPI::Reply*)) );
-+  connect( gam, SIGNAL(requestFinished(KGAPI::Request*)),
-            gam, SLOT(deleteLater()) );
--  connect (gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect (gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
- 
--  request = new KGoogle::Request( Services::Tasks::fetchTaskListsUrl(),
-+  request = new KGAPI::Request( Services::Tasks::fetchTaskListsUrl(),
-                                   Request::FetchAll, "Tasks", account );
-   gam->sendRequest( request );
- }
- 
- void SettingsDialog::gam_objectCreated( Reply *reply )
- {
--  QList< KGoogle::Object * > objects = reply->replyData();
-+  QList< KGAPI::Object * > objects = reply->replyData();
- 
-   if ( reply->serviceName() == "Calendar" ) {
- 
--    Q_FOREACH ( KGoogle::Object * object, objects ) {
--      KGoogle::Objects::Calendar *calendar = static_cast< KGoogle::Objects::Calendar * >( object );
-+    Q_FOREACH ( KGAPI::Object * object, objects ) {
-+      KGAPI::Objects::Calendar *calendar = static_cast< KGAPI::Objects::Calendar * >( object );
- 
-       QListWidgetItem *item = new QListWidgetItem( calendar->title() );
--      item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) );
-+      item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) );
-       item->setData( ObjectUIDRole, calendar->uid() );
-       item->setCheckState( Qt::Unchecked );
- 
-@@ -669,11 +669,11 @@ void SettingsDialog::gam_objectCreated(
- 
-   } else if ( reply->serviceName() == "Tasks" ) {
- 
--    Q_FOREACH ( KGoogle::Object * object, objects ) {
--      KGoogle::Objects::TaskList *taskList = static_cast< KGoogle::Objects::TaskList * >( object );
-+    Q_FOREACH ( KGAPI::Object * object, objects ) {
-+      KGAPI::Objects::TaskList *taskList = static_cast< KGAPI::Objects::TaskList * >( object );
- 
-       QListWidgetItem *item = new QListWidgetItem( taskList->title() );
--      item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) );
-+      item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) );
-       item->setData( ObjectUIDRole, taskList->uid() );
-       item->setCheckState( Qt::Unchecked );
- 
-@@ -690,18 +690,18 @@ void SettingsDialog::gam_objectCreated(
- 
- void SettingsDialog::gam_objectsListReceived( Reply *reply )
- {
--  QList< KGoogle::Object * > objects = reply->replyData();
-+  QList< KGAPI::Object * > objects = reply->replyData();
- 
-   if ( reply->serviceName() == "Calendar" ) {
- 
--    Q_FOREACH ( KGoogle::Object * object, objects ) {
-+    Q_FOREACH ( KGAPI::Object * object, objects ) {
-       Objects::Calendar *calendar;
-       QListWidgetItem *item;
- 
-       calendar = static_cast< Objects::Calendar * >( object );
-       item = new QListWidgetItem;
-       item->setText( calendar->title() );
--      item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) );
-+      item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) );
-       item->setData( ObjectUIDRole, calendar->uid() );
- 
-       if ( Settings::self()->calendars().contains( calendar->uid() ) ) {
-@@ -718,14 +718,14 @@ void SettingsDialog::gam_objectsListRece
- 
-   } else if ( reply->serviceName() == "Tasks" ) {
- 
--    Q_FOREACH ( KGoogle::Object *object, objects ) {
-+    Q_FOREACH ( KGAPI::Object *object, objects ) {
-       Objects::TaskList *taskList;
-       QListWidgetItem *item;
- 
-       taskList = static_cast< Objects::TaskList * >( object );
-       item = new QListWidgetItem;
-       item->setText( taskList->title() );
--      item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) );
-+      item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) );
-       item->setData( ObjectUIDRole, taskList->uid() );
- 
-       if ( Settings::self()->taskLists().contains( taskList->uid() ) ) {
-@@ -749,12 +749,12 @@ void SettingsDialog::gam_objectsListRece
- 
- void SettingsDialog::gam_objectModified( Reply *reply )
- {
--  QList< KGoogle::Object * > objects = reply->replyData();
-+  QList< KGAPI::Object * > objects = reply->replyData();
- 
-   if ( reply->serviceName() == "Calendar" ) {
- 
--    Q_FOREACH ( KGoogle::Object * object, objects ) {
--      KGoogle::Objects::Calendar *calendar = static_cast< KGoogle::Objects::Calendar * >( object );
-+    Q_FOREACH ( KGAPI::Object * object, objects ) {
-+      KGAPI::Objects::Calendar *calendar = static_cast< KGAPI::Objects::Calendar * >( object );
-       QListWidgetItem *item = 0;
- 
-       for ( int i = 0; i < m_ui->calendarsList->count(); i++ ) {
-@@ -773,7 +773,7 @@ void SettingsDialog::gam_objectModified(
- 
-       item->setText( calendar->title() );
-       item->setData( ObjectUIDRole, calendar->uid() );
--      item->setData( KGoogleObjectRole, qVariantFromValue( calendar ) );
-+      item->setData( KGAPIObjectRole, qVariantFromValue( calendar ) );
-     }
- 
-     m_ui->calendarsBox->setEnabled( true );
-@@ -781,8 +781,8 @@ void SettingsDialog::gam_objectModified(
- 
-   } else if ( reply->serviceName() == "Tasks" ) {
- 
--    Q_FOREACH ( KGoogle::Object * object, objects ) {
--      KGoogle::Objects::TaskList *taskList = static_cast< KGoogle::Objects::TaskList * >( object );
-+    Q_FOREACH ( KGAPI::Object * object, objects ) {
-+      KGAPI::Objects::TaskList *taskList = static_cast< KGAPI::Objects::TaskList * >( object );
-       QListWidgetItem *item = 0;
- 
-       for ( int i = 0; i < m_ui->tasksList->count(); i++ ) {
-@@ -801,7 +801,7 @@ void SettingsDialog::gam_objectModified(
- 
-       item->setText( taskList->title() );
-       item->setData( ObjectUIDRole, taskList->uid() );
--      item->setData( KGoogleObjectRole, qVariantFromValue( taskList ) );
-+      item->setData( KGAPIObjectRole, qVariantFromValue( taskList ) );
- 
-     }
-     m_ui->tasksBox->setEnabled( true );
-
---- a/resources/google/calendar/settingsdialog.h
-+++ b/resources/google/calendar/settingsdialog.h
-@@ -22,13 +22,13 @@
- #include <KJob>
- #include <Akonadi/ResourceBase>
- 
--#include <libkgoogle/common.h>
-+#include <libkgapi/common.h>
- 
- namespace Ui {
-   class SettingsDialog;
- }
- 
--namespace KGoogle {
-+namespace KGAPI {
-   class Reply;
-   class AccessManager;
- 
-@@ -40,7 +40,7 @@ namespace Objects {
- 
- class QListWidgetItem;
- 
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- class SettingsDialog : public KDialog
- {
-@@ -63,19 +63,19 @@ class SettingsDialog : public KDialog
-     void removeTaskListClicked();
-     void reloadTaskListsClicked();
- 
--    void gam_objectsListReceived( KGoogle::Reply *reply );
--    void gam_objectCreated( KGoogle::Reply *reply );
--    void gam_objectModified( KGoogle::Reply *reply );
-+    void gam_objectsListReceived( KGAPI::Reply *reply );
-+    void gam_objectCreated( KGAPI::Reply *reply );
-+    void gam_objectModified( KGAPI::Reply *reply );
- 
--    void addCalendar( KGoogle::Objects::Calendar *calendar );
--    void editCalendar( KGoogle::Objects::Calendar *calendar );
-+    void addCalendar( KGAPI::Objects::Calendar *calendar );
-+    void editCalendar( KGAPI::Objects::Calendar *calendar );
- 
--    void addTaskList( KGoogle::Objects::TaskList *taskList );
--    void editTaskList( KGoogle::Objects::TaskList *taskList );
-+    void addTaskList( KGAPI::Objects::TaskList *taskList );
-+    void editTaskList( KGAPI::Objects::TaskList *taskList );
- 
-     void saveSettings();
- 
--    void error( KGoogle::Error code, const QString &msg );
-+    void error( KGAPI::Error code, const QString &msg );
- 
-   private:
-     Ui::SettingsDialog *m_ui;
-
---- a/resources/google/calendar/tasklisteditor.cpp
-+++ b/resources/google/calendar/tasklisteditor.cpp
-@@ -18,7 +18,7 @@
- #include "tasklisteditor.h"
- #include "ui_tasklist_editor.h"
- 
--using namespace KGoogle::Objects;
-+using namespace KGAPI::Objects;
- 
- TasklistEditor::TasklistEditor( TaskList *taskList ):
-   QDialog(),
-@@ -43,7 +43,7 @@ TasklistEditor::~TasklistEditor()
- void TasklistEditor::accepted()
- {
-   if ( !m_taskList ) {
--    m_taskList = new KGoogle::Objects::TaskList;
-+    m_taskList = new KGAPI::Objects::TaskList;
-   }
- 
-   m_taskList->setTitle( m_ui->nameEdit->text() );
-
---- a/resources/google/calendar/tasklisteditor.h
-+++ b/resources/google/calendar/tasklisteditor.h
-@@ -20,7 +20,7 @@
- 
- #include <QDialog>
- 
--#include <libkgoogle/objects/tasklist.h>
-+#include <libkgapi/objects/tasklist.h>
- 
- namespace Ui {
-   class TaskListEditor;
-@@ -31,18 +31,18 @@ class TasklistEditor : public QDialog
-   Q_OBJECT
- 
-   public:
--    explicit TasklistEditor( KGoogle::Objects::TaskList *taskList = 0 );
-+    explicit TasklistEditor( KGAPI::Objects::TaskList *taskList = 0 );
- 
-     virtual ~TasklistEditor();
- 
-   Q_SIGNALS:
--    void accepted( KGoogle::Objects::TaskList *taskList );
-+    void accepted( KGAPI::Objects::TaskList *taskList );
- 
-   private Q_SLOTS:
-     void accepted();
- 
-   private:
--    KGoogle::Objects::TaskList *m_taskList;
-+    KGAPI::Objects::TaskList *m_taskList;
-     Ui::TaskListEditor *m_ui;
- };
- 
-
---- a/resources/google/calendar/ui/settingsdialog.ui
-+++ b/resources/google/calendar/ui/settingsdialog.ui
-@@ -72,7 +72,7 @@
-        </spacer>
-       </item>
-       <item row="0" column="0">
--       <widget class="KGoogle::Ui::AccountsCombo" name="accountsCombo">
-+       <widget class="KGAPI::Ui::AccountsCombo" name="accountsCombo">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-@@ -194,9 +194,9 @@
-  </widget>
-  <customwidgets>
-   <customwidget>
--   <class>KGoogle::Ui::AccountsCombo</class>
-+   <class>KGAPI::Ui::AccountsCombo</class>
-    <extends>QComboBox</extends>
--   <header location="global">libkgoogle/ui/accountscombo.h</header>
-+   <header location="global">libkgapi/ui/accountscombo.h</header>
-   </customwidget>
-  </customwidgets>
-  <resources/>
-
---- a/resources/google/contacts/CMakeLists.txt
-+++ b/resources/google/contacts/CMakeLists.txt
-@@ -30,7 +30,7 @@ target_link_libraries(akonadi_googlecont
-   ${QT_QTNETWORK_LIBRARY}
-   ${KDE4_KDECORE_LIBS}
-   ${KDE4_KIO_LIBS}
--  ${LibKGoogle_LIBRARY}
-+  ${LibKGAPI_LIBRARY}
- )
- 
- install(TARGETS akonadi_googlecontacts_resource ${INSTALL_TARGETS_DEFAULT_ARGS})
-
---- a/resources/google/contacts/contactsresource.cpp
-+++ b/resources/google/contacts/contactsresource.cpp
-@@ -41,16 +41,16 @@
- #include <QNetworkReply>
- #include <QNetworkRequest>
- 
--#include <libkgoogle/accessmanager.h>
--#include <libkgoogle/auth.h>
--#include <libkgoogle/fetchlistjob.h>
--#include <libkgoogle/request.h>
--#include <libkgoogle/reply.h>
--#include <libkgoogle/objects/contact.h>
--#include <libkgoogle/services/contacts.h>
-+#include <libkgapi/accessmanager.h>
-+#include <libkgapi/auth.h>
-+#include <libkgapi/fetchlistjob.h>
-+#include <libkgapi/request.h>
-+#include <libkgapi/reply.h>
-+#include <libkgapi/objects/contact.h>
-+#include <libkgapi/services/contacts.h>
- 
- using namespace Akonadi;
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- #define RootCollection "root"
- #define MyContacts     "myContacts"
-@@ -69,14 +69,14 @@ ContactsResource::ContactsResource( cons
-   Auth *auth = Auth::instance();
-   auth->init( "Akonadi Google", Settings::self()->clientId(), Settings::self()->clientSecret() );
- 
--  m_gam = new KGoogle::AccessManager();
-+  m_gam = new KGAPI::AccessManager();
-   m_photoNam = new KIO::Integration::AccessManager( this );
- 
--  connect( m_gam, SIGNAL(replyReceived(KGoogle::Reply*)),
--           this, SLOT(replyReceived(KGoogle::Reply*)) );
-+  connect( m_gam, SIGNAL(replyReceived(KGAPI::Reply*)),
-+           this, SLOT(replyReceived(KGAPI::Reply*)) );
- 
--  connect( m_gam, SIGNAL(error(KGoogle::Error,QString)),
--           this, SLOT(error(KGoogle::Error,QString)) );
-+  connect( m_gam, SIGNAL(error(KGAPI::Error,QString)),
-+           this, SLOT(error(KGAPI::Error,QString)) );
-   connect( this, SIGNAL(abortRequested()),
-            this, SLOT(slotAbortRequested()) );
-   connect( this, SIGNAL(reloadConfiguration()),
-@@ -164,7 +164,7 @@ Account::Ptr ContactsResource::getAccoun
-   Auth *auth = Auth::instance();
-   try {
-     m_account = auth->getAccount( Settings::self()->account() );
--  } catch ( KGoogle::Exception::BaseException &e ) {
-+  } catch ( KGAPI::Exception::BaseException &e ) {
-     Q_EMIT status( Broken, e.what() );
-     return Account::Ptr();
-   }
-@@ -205,8 +205,8 @@ bool ContactsResource::retrieveItem( con
- 
-   QUrl url( Services::Contacts::fetchContactUrl( account->accountName(), item.remoteId() ) );
- 
--  KGoogle::Request *request;
--  request = new KGoogle::Request( url, KGoogle::Request::Fetch, "Contacts", account );
-+  KGAPI::Request *request;
-+  request = new KGAPI::Request( url, KGAPI::Request::Fetch, "Contacts", account );
-   request->setProperty( "Item", QVariant::fromValue( item ) );
- 
-   m_gam->sendRequest( request );
-@@ -278,7 +278,7 @@ void ContactsResource::initialItemsFetch
- 
-   Collection collection = job->property( "Collection" ).value< Collection >();
- 
--  QUrl url = KGoogle::Services::Contacts::fetchAllContactsUrl( account->accountName(), true );
-+  QUrl url = KGAPI::Services::Contacts::fetchAllContactsUrl( account->accountName(), true );
- 
-   QString lastSync = collection.remoteRevision();
-   if ( !lastSync.isEmpty() ) {
-@@ -333,8 +333,8 @@ void ContactsResource::itemAdded( const
-                 "term=\"http://schemas.google.com/contact/2008#contact\"/>" );
-   data.append( "</atom:entry>" );
- 
--  KGoogle::Request *request;
--  request = new KGoogle::Request( Services::Contacts::createContactUrl( account->accountName() ),
-+  KGAPI::Request *request;
-+  request = new KGAPI::Request( Services::Contacts::createContactUrl( account->accountName() ),
-                                   Request::Create, "Contacts", account );
-   request->setRequestData( data, "application/atom+xml" );
-   request->setProperty( "Item", QVariant::fromValue( item ) );
-@@ -375,9 +375,9 @@ void ContactsResource::itemChanged( cons
-                 "term=\"http://schemas.google.com/contact/2008#contact\"/>" );
-   data.append( "</atom:entry>" );
- 
--  KGoogle::Request *request;
-+  KGAPI::Request *request;
-   request =
--    new KGoogle::Request(
-+    new KGAPI::Request(
-       Services::Contacts::updateContactUrl( account->accountName(), item.remoteId() ),
-       Request::Update, "Contacts", account );
-   request->setRequestData( data, "application/atom+xml" );
-@@ -430,9 +430,9 @@ void ContactsResource::itemMoved( const
-                 "term=\"http://schemas.google.com/contact/2008#contact\"/>" );
-   data.append( "</atom:entry>" );
- 
--  KGoogle::Request *request;
-+  KGAPI::Request *request;
-   request =
--    new KGoogle::Request(
-+    new KGAPI::Request(
-       Services::Contacts::updateContactUrl( account->accountName(), item.remoteId() ),
-       Request::Update, "Contacts", account );
-   request->setRequestData( data, "application/atom+xml" );
-@@ -449,9 +449,9 @@ void ContactsResource::itemRemoved( cons
-     return;
-   }
- 
--  KGoogle::Request *request;
-+  KGAPI::Request *request;
-   request =
--    new KGoogle::Request(
-+    new KGAPI::Request(
-       Services::Contacts::removeContactUrl( account->accountName(), item.remoteId() ),
-       Request::Remove, "Contacts", account );
-   request->setProperty( "Item", QVariant::fromValue( item ) );
-@@ -459,7 +459,7 @@ void ContactsResource::itemRemoved( cons
-   m_gam->sendRequest( request );
- }
- 
--void ContactsResource::replyReceived( KGoogle::Reply *reply )
-+void ContactsResource::replyReceived( KGAPI::Reply *reply )
- {
-   switch ( reply->requestType() ) {
-   case Request::Fetch:
-@@ -500,9 +500,9 @@ void ContactsResource::contactListReceiv
-   Item::List changed;
- 
-   FetchListJob *fetchJob = dynamic_cast< FetchListJob * >( job );
--  QList< KGoogle::Object * > objects = fetchJob->items();
-+  QList< KGAPI::Object * > objects = fetchJob->items();
- 
--  Q_FOREACH ( KGoogle::Object * object, objects ) {
-+  Q_FOREACH ( KGAPI::Object * object, objects ) {
- 
-     Item item;
-     Objects::Contact *contact = static_cast< Objects::Contact * >( object );
-@@ -543,14 +543,14 @@ void ContactsResource::contactListReceiv
-   modifyJob->setAutoDelete( true );
- }
- 
--void ContactsResource::contactReceived( KGoogle::Reply *reply )
-+void ContactsResource::contactReceived( KGAPI::Reply *reply )
- {
--  if ( reply->error() != KGoogle::OK ) {
-+  if ( reply->error() != KGAPI::OK ) {
-     cancelTask( i18n( "Failed to fetch contact" ) );
-     return;
-   }
- 
--  QList< KGoogle::Object * > data = reply->replyData();
-+  QList< KGAPI::Object * > data = reply->replyData();
-   if ( data.length() != 1 ) {
-     kWarning() << "Server send " << data.length() << "items, which is not OK";
-     cancelTask( i18n( "Failed to create a contact" ) );
-@@ -575,14 +575,14 @@ void ContactsResource::contactReceived(
-   }
- }
- 
--void ContactsResource::contactCreated( KGoogle::Reply *reply )
-+void ContactsResource::contactCreated( KGAPI::Reply *reply )
- {
--  if ( reply->error() != KGoogle::Created ) {
-+  if ( reply->error() != KGAPI::Created ) {
-     cancelTask( i18n( "Failed to create a contact" ) );
-     return;
-   }
- 
--  QList< KGoogle::Object * > data = reply->replyData();
-+  QList< KGAPI::Object * > data = reply->replyData();
-   if ( data.length() != 1 ) {
-     kWarning() << "Server send " << data.length() << "items, which is not OK";
-     cancelTask( i18n( "Failed to create a contact" ) );
-@@ -604,14 +604,14 @@ void ContactsResource::contactCreated( K
-   updatePhoto( item );
- }
- 
--void ContactsResource::contactUpdated( KGoogle::Reply *reply )
-+void ContactsResource::contactUpdated( KGAPI::Reply *reply )
- {
--  if ( reply->error() != KGoogle::OK ) {
-+  if ( reply->error() != KGAPI::OK ) {
-     cancelTask( i18n( "Failed to update contact" ) );
-     return;
-   }
- 
--  QList< KGoogle::Object * > data = reply->replyData();
-+  QList< KGAPI::Object * > data = reply->replyData();
-   if ( data.length() != 1 ) {
-     kWarning() << "Server send " << data.length() << "items, which is not OK";
-     cancelTask( i18n( "Failed to update a contact" ) );
-@@ -629,9 +629,9 @@ void ContactsResource::contactUpdated( K
-   updatePhoto( item );
- }
- 
--void ContactsResource::contactRemoved( KGoogle::Reply *reply )
-+void ContactsResource::contactRemoved( KGAPI::Reply *reply )
- {
--  if ( reply->error() != KGoogle::OK ) {
-+  if ( reply->error() != KGAPI::OK ) {
-     cancelTask( i18n( "Failed to remove contact" ) );
-     return;
-   }
-
---- a/resources/google/contacts/contactsresource.h
-+++ b/resources/google/contacts/contactsresource.h
-@@ -24,10 +24,10 @@
- #include <Akonadi/Item>
- #include <KDateTime>
- 
--#include <libkgoogle/common.h>
--#include <libkgoogle/account.h>
-+#include <libkgapi/common.h>
-+#include <libkgapi/account.h>
- 
--namespace KGoogle {
-+namespace KGAPI {
-   class AccessManager;
-   class Reply;
-   class Request;
-@@ -36,7 +36,7 @@ namespace KGoogle {
- class QNetworkAccessManager;
- class QNetworkReply;
- 
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- class ContactsResource: public Akonadi::ResourceBase,
-                         public Akonadi::AgentBase::ObserverV2
-@@ -71,7 +71,7 @@ class ContactsResource: public Akonadi::
-     void aboutToQuit();
- 
-   private Q_SLOTS:
--    void error( KGoogle::Error errCode, const QString &msg );
-+    void error( KGAPI::Error errCode, const QString &msg );
- 
-     void slotAbortRequested();
- 
-@@ -80,12 +80,12 @@ class ContactsResource: public Akonadi::
- 
-     void photoRequestFinished( QNetworkReply *reply );
- 
--    void replyReceived( KGoogle::Reply *reply );
-+    void replyReceived( KGAPI::Reply *reply );
- 
--    void contactReceived( KGoogle::Reply *reply );
--    void contactUpdated( KGoogle::Reply *reply );
--    void contactCreated( KGoogle::Reply *reply );
--    void contactRemoved( KGoogle::Reply *reply );
-+    void contactReceived( KGAPI::Reply *reply );
-+    void contactUpdated( KGAPI::Reply *reply );
-+    void contactCreated( KGAPI::Reply *reply );
-+    void contactRemoved( KGAPI::Reply *reply );
- 
-     void emitPercent( KJob *job, ulong progress );
- 
-@@ -97,9 +97,9 @@ class ContactsResource: public Akonadi::
- 
-     Account::Ptr getAccount();
- 
--    KGoogle::Account::Ptr m_account;
-+    KGAPI::Account::Ptr m_account;
- 
--    KGoogle::AccessManager *m_gam;
-+    KGAPI::AccessManager *m_gam;
-     QNetworkAccessManager *m_photoNam;
- 
-     QMap< QString, Akonadi::Collection > m_collections;
-
---- a/resources/google/contacts/settingsdialog.cpp
-+++ b/resources/google/contacts/settingsdialog.cpp
-@@ -22,13 +22,13 @@
- #include <KMessageBox>
- #include <KWindowSystem>
- 
--#include <libkgoogle/auth.h>
--#include <libkgoogle/services/contacts.h>
-+#include <libkgapi/auth.h>
-+#include <libkgapi/services/contacts.h>
- 
--using namespace KGoogle;
-+using namespace KGAPI;
- 
- enum {
--  KGoogleObjectRole = Qt::UserRole,
-+  KGAPIObjectRole = Qt::UserRole,
-   ObjectUIDRole
- };
- 
-@@ -38,7 +38,7 @@ SettingsDialog::SettingsDialog( WId wind
- {
-   KWindowSystem::setMainWindow( this, windowId );
- 
--  qRegisterMetaType<KGoogle::Services::Contacts>( "Contacts" );
-+  qRegisterMetaType<KGAPI::Services::Contacts>( "Contacts" );
- 
-   this->setButtons( Ok | Cancel );
- 
-@@ -58,8 +58,8 @@ SettingsDialog::SettingsDialog( WId wind
-   connect( m_ui->removeAccountBtn, SIGNAL(clicked(bool)),
-            this, SLOT(removeAccountClicked()) );
- 
--  KGoogle::Auth *auth = KGoogle::Auth::instance();
--  connect( auth, SIGNAL(authenticated(KGoogle::Account::Ptr&)),
-+  KGAPI::Auth *auth = KGAPI::Auth::instance();
-+  connect( auth, SIGNAL(authenticated(KGAPI::Account::Ptr&)),
-            this, SLOT(reloadAccounts()) );
- 
-   reloadAccounts();
-@@ -78,9 +78,9 @@ void SettingsDialog::saveSettings()
-   Settings::self()->writeConfig();
- }
- 
--void SettingsDialog::error( KGoogle::Error errCode, const QString &msg )
-+void SettingsDialog::error( KGAPI::Error errCode, const QString &msg )
- {
--  if ( errCode == KGoogle::OK ) {
-+  if ( errCode == KGAPI::OK ) {
-     return;
-   }
- 
-@@ -107,22 +107,22 @@ void SettingsDialog::reloadAccounts()
- 
- void SettingsDialog::addAccountClicked()
- {
--  KGoogle::Auth *auth = KGoogle::Auth::instance();
-+  KGAPI::Auth *auth = KGAPI::Auth::instance();
- 
--  KGoogle::Account::Ptr account( new KGoogle::Account() );
-+  KGAPI::Account::Ptr account( new KGAPI::Account() );
-   account->addScope( Services::Contacts::ScopeUrl );
- 
-   try {
-     auth->authenticate( account, true );
-     updateButtons();
--  } catch ( KGoogle::Exception::BaseException &e ) {
-+  } catch ( KGAPI::Exception::BaseException &e ) {
-     KMessageBox::error( this, e.what() );
-   }
- }
- 
- void SettingsDialog::removeAccountClicked()
- {
--  KGoogle::Account::Ptr account = m_ui->accountsCombo->currentAccount();
-+  KGAPI::Account::Ptr account = m_ui->accountsCombo->currentAccount();
- 
-   if ( account.isNull() ) {
-     return;
-@@ -142,12 +142,12 @@ void SettingsDialog::removeAccountClicke
-     return;
-   }
- 
--  KGoogle::Auth *auth = KGoogle::Auth::instance();
-+  KGAPI::Auth *auth = KGAPI::Auth::instance();
- 
-   try {
-     auth->revoke( account );
-     updateButtons();
--  } catch ( KGoogle::Exception::BaseException &e ) {
-+  } catch ( KGAPI::Exception::BaseException &e ) {
-     KMessageBox::error( this, e.what() );
-   }
- 
-
---- a/resources/google/contacts/settingsdialog.h
-+++ b/resources/google/contacts/settingsdialog.h
-@@ -20,7 +20,7 @@
- 
- #include <KDialog>
- 
--#include <libkgoogle/common.h>
-+#include <libkgapi/common.h>
- 
- namespace Ui {
-   class SettingsDialog;
-@@ -40,7 +40,7 @@ class SettingsDialog : public KDialog
-     void removeAccountClicked();
-     void reloadAccounts();
- 
--    void error( KGoogle::Error errCode, const QString &msg );
-+    void error( KGAPI::Error errCode, const QString &msg );
-     void saveSettings();
- 
-   private:
-
---- a/resources/google/contacts/ui/settingsdialog.ui
-+++ b/resources/google/contacts/ui/settingsdialog.ui
-@@ -21,7 +21,7 @@
-      </property>
-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
--       <widget class="KGoogle::Ui::AccountsCombo" name="accountsCombo">
-+       <widget class="KGAPI::Ui::AccountsCombo" name="accountsCombo">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-@@ -51,9 +51,9 @@
-  </widget>
-  <customwidgets>
-   <customwidget>
--   <class>KGoogle::Ui::AccountsCombo</class>
-+   <class>KGAPI::Ui::AccountsCombo</class>
-    <extends>QComboBox</extends>
--   <header location="global">libkgoogle/ui/accountscombo.h</header>
-+   <header location="global">libkgapi/ui/accountscombo.h</header>
-   </customwidget>
-  </customwidgets>
-  <resources/>
-
diff --git a/kde-unstable/kdepim/PKGBUILD b/kde-unstable/kdepim/PKGBUILD
deleted file mode 100644
index b3d8d37c8..000000000
--- a/kde-unstable/kdepim/PKGBUILD
+++ /dev/null
@@ -1,269 +0,0 @@
-# $Id: PKGBUILD 171840 2012-11-21 19:56:05Z 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-ktnef'
-         'kdepim-libkdepim')
-pkgver=4.9.80
-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.xz"
-        'fix-build.patch')
-sha1sums=('c139bfb4fc4a39c270de4fea75790fe12cefc89c'
-          '974056ad2c3a00b33a8ac9403b369ab636000832')
-
-build() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-build.patch
-    cd ..
-
-	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' 'nepomuk-widgets')
-	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-akregator.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
-	cd "${srcdir}"/build/doc/kabcclient
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/konsolekalendar
-	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
-	cd "${srcdir}"/build/doc/kwatchgnupg
-	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 archivemailagent \
-	importwizard ksendemail libksieve messagelist 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-knode.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kioslave/news
-	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 doc/kontact-admin; 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'
-	for i in korganizer doc/korganizer kontact/plugins/korganizer \
-		calendarviews; do
-		cd "${srcdir}"/build/${i} 
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-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-ktnef() {
-	pkgdesc='A viewer/extractor for TNEF files'
-	depends=('kdebase-runtime' 'kdepimlibs')
-	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
-    install=kdepim-ktnef.install
-	cd "${srcdir}"/build/ktnef
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/ktnef
-	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 incidenceeditor-ng \
-	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-	mailcommon mailimporter messagecomposer messagecore messageviewer \
-	icons strigi-analyzer templateparser plugins/messageviewer \
-	plugins/ktexteditor pimcommon pimsettingexporter; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
diff --git a/kde-unstable/kdepim/fix-build.patch b/kde-unstable/kdepim/fix-build.patch
deleted file mode 100644
index 7060e814f..000000000
--- a/kde-unstable/kdepim/fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdepim-4.9.0/kleopatra/CMakeLists.txt~	2012-07-30 08:06:15.031181647 +0000
-+++ kdepim-4.9.0/kleopatra/CMakeLists.txt	2012-07-30 08:07:13.594082584 +0000
-@@ -365,7 +365,7 @@
- endif(KDEPIM_MOBILE_UI)
- 
- add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
--
-+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
- 
- kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
- kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS} )
diff --git a/kde-unstable/kdepim/kdepim-akregator.install b/kde-unstable/kdepim/kdepim-akregator.install
deleted file mode 100644
index 5787df72f..000000000
--- a/kde-unstable/kdepim/kdepim-akregator.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-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-knode.install b/kde-unstable/kdepim/kdepim-knode.install
deleted file mode 100644
index 5787df72f..000000000
--- a/kde-unstable/kdepim/kdepim-knode.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-ktnef.install b/kde-unstable/kdepim/kdepim-ktnef.install
deleted file mode 100644
index 5787df72f..000000000
--- a/kde-unstable/kdepim/kdepim-ktnef.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 9b77f2dbc..000000000
--- a/kde-unstable/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171711 2012-11-21 18:02:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepimlibs'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
-install='kdepimlibs.install'
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('f792dbc1d0829925939f4fd61fe88d834baca445')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd 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 30763577f..000000000
--- a/kde-unstable/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,644 +0,0 @@
-# $Id: PKGBUILD 171841 2012-11-21 19:57:32Z 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-dictionary'
-         '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-runners-youtube'
-         'kdeplasma-addons-wallpapers-mandelbrot'
-         'kdeplasma-addons-wallpapers-marble'
-         'kdeplasma-addons-wallpapers-pattern'
-         'kdeplasma-addons-wallpapers-potd'
-         'kdeplasma-addons-wallpapers-qmlwallpapers'
-         'kdeplasma-addons-wallpapers-virus'
-         'kdeplasma-addons-wallpapers-weather')
-pkgver=4.9.80
-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' 'qoauth' 'mesa')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('24d1ecd77e4acc2effc495e098352fdb480fbbce')
-
-build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeplasma-addons-applets-bball() {
-	pkgdesc='A bouncy ball for plasma'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.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=('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.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.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=('kdeplasma-addons-libs' 'qwt')
-	install='kdeplasma-addons.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=('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-konqueror' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/konqprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
-	pkgdesc='List and launch Konsole profiles'
-	depends=('kdebase-konsole' 'kdeplasma-addons-libs')
-	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.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.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=('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.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.install'
-	cd $srcdir/build/applets/qalculate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
-	pkgdesc='Remember The Milk Todo list applet'
-	depends=('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=('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=('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=('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-dictionary() {
-	pkgdesc='Define words'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/runners/dictionary
-	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' 'kdesdk-kate')
-	cd $srcdir/build/runners/katesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
-	pkgdesc='Matches Konqueror Sessions'
-	depends=('kdebase-workspace' 'kdebase-konqueror')
-	cd $srcdir/build/runners/konquerorsessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
-	pkgdesc='Matches Konsole Sessions'
-	depends=('kdebase-workspace' 'kdebase-konsole')
-	cd $srcdir/build/runners/konsolesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
-	pkgdesc='Kopete Contact runner'
-	depends=('kdebase-workspace' 'kdenetwork-kopete')
-	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-runners-youtube() {
-	pkgdesc='Matches YouTube queries'
-	depends=('kdebase-workspace' 'qjson')
-    install='kdeplasma-addons.install'
-	cd $srcdir/build/runners/youtube
-	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=('kdeplasma-addons-libs')
-        cd $srcdir/build/wallpapers/potd
-        make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-qmlwallpapers() {
-	pkgdesc='Animated Wallpapers'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/wallpapers/qmlwallpapers
-	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=('kdeplasma-addons-libs')
-	cd $srcdir/build/wallpapers/weather
-	make DESTDIR=$pkgdir install
-}
diff --git a/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch b/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch
deleted file mode 100644
index 0a55ce6ce..000000000
--- a/kde-unstable/kdeplasma-addons/fix-twitter-auth.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit edc7699f4f4b6d9fc0568b031143cb653ae4294e
-Author: Sebastian Kügler <sebas@kde.org>
-Date:   Tue Jul 10 00:56:58 2012 +0200
-
-    fix authorization from twitter applet
-    
-    user in authorize() can be empty when it's already set in d->user,
-    respect that and successfully authorize.
-    
-    Thanks to phoenix_fbrd for finding this issue and the patch.
-    
-    REVIEW:105498
-    BUG:302267
-    
-    Please reopen the bug report if you still encounter crashes.
-    
-    Cherry-picked from 28f6d7cee7e81fda9ba396cc6477370a8ed3ada7
-
-diff --git a/dataengines/microblog/koauth.cpp b/dataengines/microblog/koauth.cpp
-index 565d79f..7566b95 100644
---- a/dataengines/microblog/koauth.cpp
-+++ b/dataengines/microblog/koauth.cpp
-@@ -168,13 +168,15 @@ void KOAuth::run()
- 
- void KOAuth::authorize(const QString &serviceBaseUrl, const QString &user, const QString &password)
- {
--    d->user = user;
-+    if (!user.isEmpty()) {
-+        d->user = user;
-+    }
-     d->password = password;
-     d->serviceBaseUrl = serviceBaseUrl;
-     d->accessToken = QByteArray();
-     d->accessTokenSecret = QByteArray();
- 
--    d->w->setUser(user);
-+    d->w->setUser(d->user);
-     d->w->setServiceBaseUrl(serviceBaseUrl);
-     d->w->setPassword(password);
- 
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.install b/kde-unstable/kdeplasma-addons/kdeplasma-addons.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/kde-unstable/kdeplasma-addons/kdeplasma-addons.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 b9116693e..000000000
--- a/kde-unstable/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 171721 2012-11-21 18:14:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-katepart'
-         'kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.9.80
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python2')
-source=("http://download.kde.org/unstable/${pkgver}/src/kate-${pkgver}.tar.xz"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('8d4091c03312a75052b8a81a3c3676acef109a47'
-          '5b45d0df8f340105633eba9ef7c58086e6c2e750')
-
-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 \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebase-katepart() {
-  pkgdesc="A fast and feature-rich text editor component"
-  depends=('kdelibs')
-  url="http://kate-editor.org/about-katepart/"
-  install='kdebase-katepart.install'
-
-  cd "${srcdir}"/build/part
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  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/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart' 'qjson')
-  groups=('kde' 'kdesdk')
-  url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-  optdepends=('kdebase-konsole: open a terminal in Kate'
-              'kdebindings-python2: python bindings')
-
-  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-katepart.install b/kde-unstable/kdesdk-kate/kdebase-katepart.install
deleted file mode 100644
index e70c054ec..000000000
--- a/kde-unstable/kdesdk-kate/kdebase-katepart.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/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 60c142391..000000000
--- a/kde-unstable/kdesdk-kate/pkgbuild-syntax-highlight.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kate-4.9.80/part/syntax/data/bash.xml~	2012-11-16 16:53:27.599718819 +0000
-+++ kate-4.9.80/part/syntax/data/bash.xml	2012-11-16 16:54:27.549287684 +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.15" 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.15" 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 fe146fe40..000000000
--- a/kde-unstable/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,249 +0,0 @@
-# $Id: PKGBUILD 171842 2012-11-21 19:59:18Z 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-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.9.80
-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.xz"
-        'fix-python2-path.patch')
-sha1sums=('c9afd6e11f0d2a54706b5dfb79c47ced93a31e99'
-          '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')
-    optdepends=('bzr: bazaar support'
-                'git: git support'
-                'mercurial: hg support'
-                'subversion: svn support')
-	install='kdesdk.install'
-    for i in bazaar git hg svn; do
-        cd $srcdir/build/dolphin-plugins/$i
-    	make DESTDIR=$pkgdir install
-    done
-}
-
-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-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-kompare.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-python2' 'kdesdk-strigi-analyzer')
-	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/{zonetab2pot,kde-systemsettings-tree}.py
-  sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{kdelnk2desktop.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')
-    optdepends=('ruby')
-	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 bd496be55..000000000
--- a/kde-unstable/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 171843 2012-11-21 20:00:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-pkgver=4.9.80
-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.xz")
-sha1sums=('0886cff4963f23330dbdc65568b8897f28b12401')
-
-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 2c41d5b87..000000000
--- a/kde-unstable/kdeutils-filelight/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 171845 2012-11-21 20:01:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-filelight
-pkgver=4.9.80
-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.xz")
-sha1sums=('29decc10b702f0e2e0ef75da0e1905db71388cda')
-
-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 cca9a5f86..000000000
--- a/kde-unstable/kdeutils-kcalc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171846 2012-11-21 20:01:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcalc
-pkgver=4.9.80
-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.xz")
-sha1sums=('7ec4953e9f0b9ac26d7cbe10765c2ccd9e0a8a36')
-
-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 21c1db389..000000000
--- a/kde-unstable/kdeutils-kcharselect/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171847 2012-11-21 20:02:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcharselect
-pkgver=4.9.80
-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.xz")
-sha1sums=('33ebdb9ee73c7b4d0130bd230e0a7938f3f06abe')
-
-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 a091ccebc..000000000
--- a/kde-unstable/kdeutils-kdf/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171848 2012-11-21 20:02:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kdf
-pkgver=4.9.80
-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.xz")
-sha1sums=('0dede2c0adb2c9e013282253cd86dcd611457989')
-
-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 a7b8b009a..000000000
--- a/kde-unstable/kdeutils-kfloppy/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171849 2012-11-21 20:03:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kfloppy
-pkgver=4.9.80
-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.xz")
-sha1sums=('de19d2d304323b46e91fae742b2c353583290572')
-
-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 9c529889d..000000000
--- a/kde-unstable/kdeutils-kgpg/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171850 2012-11-21 20:03:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kgpg
-pkgver=4.9.80
-pkgrel=1
-pkgdesc='A GnuPG frontend'
-url='http://kde.org/applications/utilities/kgpg/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('32f2d281433c5b9be712d49c9e5f9e4587345d83')
-
-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 0ba2d4c1d..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.9.80
-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.xz")
-sha1sums=('3f421acef70929146354211cdc79c0c58700cc57')
-
-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-ktimer/PKGBUILD b/kde-unstable/kdeutils-ktimer/PKGBUILD
deleted file mode 100644
index 4664f6487..000000000
--- a/kde-unstable/kdeutils-ktimer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171852 2012-11-21 20:04:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ktimer
-pkgver=4.9.80
-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.xz")
-sha1sums=('4916ddc92dcc5d9ddca459e9fef4c51b44865956')
-
-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 5bc7ff27d..000000000
--- a/kde-unstable/kdeutils-kwallet/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 171853 2012-11-21 20:05:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kwallet
-pkgver=4.9.80
-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.xz")
-sha1sums=('930bff03f1338c6b4357b42c8a9ce1f2c91db48e')
-
-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-print-manager/PKGBUILD b/kde-unstable/kdeutils-print-manager/PKGBUILD
deleted file mode 100644
index 27cd7cea0..000000000
--- a/kde-unstable/kdeutils-print-manager/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171880 2012-11-22 08:18:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-print-manager
-pkgver=4.9.80
-pkgrel=2
-pkgdesc="A tool for managing print jobs and printers"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdeutils/print-manager'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-workspace' 'libcups' 'system-config-printer')
-makedepends=('cmake' 'automoc4')
-replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-printer-kde')
-conflicts=('print-manager')
-groups=('kde' 'kdeutils')
-source=("http://download.kde.org/unstable/${pkgver}/src/print-manager-${pkgver}.tar.xz")
-md5sums=('98678a81d89f7d1671136e81f5e8e01e')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../print-manager-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/kdeutils-superkaramba/PKGBUILD b/kde-unstable/kdeutils-superkaramba/PKGBUILD
deleted file mode 100644
index 78b7934d2..000000000
--- a/kde-unstable/kdeutils-superkaramba/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171855 2012-11-21 20:06:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-superkaramba
-pkgver=4.9.80
-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.xz")
-sha1sums=('7ac9b8150e4469d9a72aa2973a4a6eb3380bc60f')
-
-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 71f193c29..000000000
--- a/kde-unstable/kdeutils-sweeper/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171856 2012-11-21 20:06:54Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-sweeper
-pkgver=4.9.80
-pkgrel=1
-pkgdesc='System Cleaner'
-url='http://kde.org/applications/utilities/sweeper'
-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/sweeper-${pkgver}.tar.xz")
-sha1sums=('1df2ef712bddb9d55a440c614c473858ec24d9fe')
-
-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 7e5382a78..000000000
--- a/kde-unstable/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 171857 2012-11-21 20:07:29Z 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.9.80
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('9fceae50b807b862d80b695bebf6348fdf4cff66')
-
-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=('kdebase-runtime' 'kdepimlibs' '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/libkcddb/PKGBUILD b/kde-unstable/libkcddb/PKGBUILD
deleted file mode 100644
index 961c7c7d1..000000000
--- a/kde-unstable/libkcddb/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171738 2012-11-21 18:30:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkcddb
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="KDE CDDB library"
-url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'libmusicbrainz5')
-makedepends=('cmake' 'automoc4')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('b7bfdec3f562deed9e2537051d497a72b1ec26a4')
-
-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/libkcompactdisc/PKGBUILD b/kde-unstable/libkcompactdisc/PKGBUILD
deleted file mode 100644
index 19393560e..000000000
--- a/kde-unstable/libkcompactdisc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171739 2012-11-21 18:31:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkcompactdisc
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A library for interfacing with CDs"
-url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2b2bf035690da07c12217e06858e0b342505dad7')
-
-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/PKGBUILD b/kde-unstable/libkdcraw/PKGBUILD
deleted file mode 100644
index 872bfa442..000000000
--- a/kde-unstable/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171733 2012-11-21 18:27:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
-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.xz")
-sha1sums=('d49164f9524345e7485242aacda20ca9c7c04722')
-
-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 c3575de22..000000000
--- a/kde-unstable/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171730 2012-11-21 18:26:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Libraries used by KDE Education applications"
-url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
-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.xz")
-sha1sums=('d76f9cc99b98ce7368d2b72737b949777d758705')
-
-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/libkdegames/PKGBUILD b/kde-unstable/libkdegames/PKGBUILD
deleted file mode 100644
index 893d769c2..000000000
--- a/kde-unstable/libkdegames/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171740 2012-11-21 18:31:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdegames
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Common code and data for many KDE games"
-url="https://projects.kde.org/projects/kde/kdegames/libkdegames"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'openal')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegames-libkdegames')
-conflicts=('kdegames-libkdegames')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ddeae85ab3a6ec74588471897acd7f017c2df823')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/libkexiv2/PKGBUILD b/kde-unstable/libkexiv2/PKGBUILD
deleted file mode 100644
index efe2ea679..000000000
--- a/kde-unstable/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 171734 2012-11-21 18:28:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
-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.xz")
-sha1sums=('c6b1088ee658e0cbdd76a5b67561d4f77090a936')
-
-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/libkgapi/PKGBUILD b/kde-unstable/libkgapi/PKGBUILD
deleted file mode 100644
index d214bb73a..000000000
--- a/kde-unstable/libkgapi/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 162021 2012-06-18 21:49:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkgapi
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="A KDE-based library for accessing various Google services via their public API"
-url='https://projects.kde.org/projects/kdereview/libkgoogle'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost')
-replaces=('akonadi-google' 'libkgoogle')
-conflicts=('akonadi-google' 'libkgoogle')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b4cefa643e95f5670997b5001547988f')
-
-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 97bb0a662..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.9.80
-pkgrel=1
-pkgdesc="An interface to use kipi-plugins from a KDE application"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
-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.xz")
-sha1sums=('97ac7e6df6aac11f48ccc146ef4473f9162644b1')
-
-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/libkmahjongg/PKGBUILD b/kde-unstable/libkmahjongg/PKGBUILD
deleted file mode 100644
index 17cb7af63..000000000
--- a/kde-unstable/libkmahjongg/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 171741 2012-11-21 18:32:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkmahjongg
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles"
-url="https://projects.kde.org/projects/kde/kdegames/libmahjongg"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegames-libkmahjongg')
-conflicts=('kdegames-libkmahjongg')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('13fda308bc5371eb48f5535a34f0f6edb9319659')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/libksane/PKGBUILD b/kde-unstable/libksane/PKGBUILD
deleted file mode 100644
index e0ba0e082..000000000
--- a/kde-unstable/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171736 2012-11-21 18:29:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="An image scanning library"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
-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.xz")
-sha1sums=('b1e33f62cc3bfbb99deceab63ead8c4d9fca825f')
-
-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/kde-unstable/nepomuk-core/PKGBUILD b/kde-unstable/nepomuk-core/PKGBUILD
deleted file mode 100644
index cba123fab..000000000
--- a/kde-unstable/nepomuk-core/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 171713 2012-11-21 18:08:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=nepomuk-core
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
-url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
-makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c296a0e4a601d7f0afece4a27cdbcc220692c4f7')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Fix the python shebang
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
-}
diff --git a/kde-unstable/nepomuk-widgets/PKGBUILD b/kde-unstable/nepomuk-widgets/PKGBUILD
deleted file mode 100644
index 228a2f301..000000000
--- a/kde-unstable/nepomuk-widgets/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 171742 2012-11-21 18:33:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=nepomuk-widgets
-pkgver=4.9.80
-pkgrel=1
-pkgdesc="The Library containing the Nepomuk Widgets"
-url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('nepomuk-core')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ed84cb208430afcb30d41ee5ab456ed3edd211f4')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/kde-unstable/soprano/PKGBUILD b/kde-unstable/soprano/PKGBUILD
deleted file mode 100644
index 627063cdd..000000000
--- a/kde-unstable/soprano/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 163682 2012-07-17 18:39:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=soprano
-pkgver=2.8.0
-pkgrel=2
-pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
-arch=('i686' 'x86_64')
-url='http://soprano.sourceforge.net/'
-license=('GPL' 'LGPL')
-depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base')
-makedepends=('cmake' 'openjdk6' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('273c3403aeb6d8a43e78a4887f50a385')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  . /etc/profile.d/openjdk6.sh
-  # we need the rpath
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSOPRANO_DISABLE_CLUCENE_INDEX=ON
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/addinclude-libre/PKGBUILD b/libre/addinclude-libre/PKGBUILD
new file mode 100644
index 000000000..7a5121eb3
--- /dev/null
+++ b/libre/addinclude-libre/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+_pkgname=addinclude
+pkgname=addinclude-libre
+pkgver=0.9
+pkgrel=1
+pkgdesc='Utility to add includes to C header- and sourcefiles'
+arch=('x86_64' 'i686' 'mips64el')
+url='https://gitorious.org/ovruni/addinclude/'
+license=('GPL')
+provides=("$_pkgname=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+source=("http://gnu.org.pe/software/$_pkgname/$_pkgname-$pkgver.tar.xz")
+md5sums=('e8c254e5c8f41a69f87787a08c65d1a5')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 "$_pkgname.1.gz" "$pkgdir/usr/share/man/man1/$_pkgname.1.gz"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/COPYING"
+}
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 8c631469b..e6e221629 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -32,8 +32,9 @@ makedepends=("audacious>=${pkgver}"
              'glib2' 'python2' # for gdbus-codegen
              'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac'
              'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplayfp' 'wavpack'
-             'libnotify' 'lirc-utils' 'curl' 'libmtp'
+             'libnotify' 'curl' 'libmtp'
              'neon' 'libmms' 'libcue')
+[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils-libre')
 
 optdepends=('alsa-lib: Advanced Linux Sound Arch. output'
             'pulseaudio: PulseAudio output'
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index 8fb7ec8e0..c87f114ea 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -6,7 +6,7 @@ _pkgname=cups-filters
 pkgver=1.0.46
 pkgrel=1
 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting"
 license=('GPL')
 depends=('lcms2' 'poppler' 'qpdf')
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 4c2586f5d..f1a68f299 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=ecasound-libre
 pkgver=2.9.1
 pkgrel=2
 pkgdesc="Command-line multitrack audio processor, without nonfree faac recommendation"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.eca.cx/ecasound/"
 license=('GPL' 'LGPL')
 depends=('audiofile' 'liblo>=0.28' 'liboil' 'lilv')
diff --git a/libre/epdfview-libre/epdfview-0.1.8-cups-1.6.1.patch b/libre/epdfview-libre/epdfview-0.1.8-cups-1.6.1.patch
new file mode 100644
index 000000000..739579d29
--- /dev/null
+++ b/libre/epdfview-libre/epdfview-0.1.8-cups-1.6.1.patch
@@ -0,0 +1,74 @@
+diff -up epdfview-0.1.8/configure.ac.cups16 epdfview-0.1.8/configure.ac
+diff -up epdfview-0.1.8/src/PrintPter.cxx.cups16 epdfview-0.1.8/src/PrintPter.cxx
+--- epdfview-0.1.8/src/PrintPter.cxx.cups16	2011-05-28 12:25:01.000000000 +0200
++++ epdfview-0.1.8/src/PrintPter.cxx	2012-07-20 15:04:30.846111813 +0200
+@@ -22,6 +22,40 @@
+ #include <locale.h>
+ #include "epdfview.h"
+ 
++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5)
++#define HAVE_CUPS_1_6 1
++#endif
++
++#ifndef HAVE_CUPS_1_6
++inline int ippGetInteger (ipp_attribute_t *attr, int element)
++{
++    return (attr->values[element].integer);
++}
++
++inline const char * ippGetString (ipp_attribute_t *attr,
++                                  int             element,
++                                  const char      **language /*UNUSED*/)
++{
++    return (attr->values[element].string.text);
++}
++
++inline int ippSetOperation (ipp_t *ipp, ipp_op_t op)
++{
++  if (!ipp)
++    return (0);
++  ipp->request.op.operation_id = op;
++  return (1);
++}
++
++inline int ippSetRequestId (ipp_t *ipp, int request_id)
++{
++    if (!ipp)
++        return (0);
++    ipp->request.any.request_id = request_id;
++    return (1);
++}
++#endif
++
+ using namespace ePDFView;
+ 
+ // Structures
+@@ -380,8 +414,8 @@ PrintPter::getPrinterAttributes (const g
+ 
+     ipp_t *request = ippNew ();
+ 
+-    request->request.op.operation_id = IPP_GET_PRINTER_ATTRIBUTES;
+-    request->request.op.request_id = 1;
++    ippSetOperation(request, IPP_GET_PRINTER_ATTRIBUTES);
++    ippSetRequestId(request, 1);
+ 
+     ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET,
+                   "attributes-charset", NULL, "utf-8");
+@@ -403,7 +437,7 @@ PrintPter::getPrinterAttributes (const g
+             ippFindAttribute (answer, "printer-state", IPP_TAG_ZERO);
+         if ( NULL != state )
+         {
+-            switch (state->values[0].integer)
++            switch (ippGetInteger (state, 0))
+             {
+                 case IPP_PRINTER_IDLE:
+                     attributes->state = g_strdup (_("Idle"));
+@@ -425,7 +459,7 @@ PrintPter::getPrinterAttributes (const g
+             ippFindAttribute (answer, "printer-location", IPP_TAG_ZERO);
+         if ( NULL != location )
+         {
+-            attributes->location = g_strdup (location->values[0].string.text);
++            attributes->location = g_strdup (ippGetString (location, 0, NULL));
+         }
+ 
+         ippDelete (answer);
diff --git a/libre/gendesk-libre/PKGBUILD b/libre/gendesk-libre/PKGBUILD
new file mode 100644
index 000000000..b2f5c7cea
--- /dev/null
+++ b/libre/gendesk-libre/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+
+_pkgname=gendesk
+pkgname=gendesk-libre
+pkgver=0.5.2
+pkgrel=1
+pkgdesc='Utility to generate .desktop files and download icons'
+arch=('x86_64' 'i686' 'mips64el')
+url='https://gitorious.org/ovruni/gendesk/'
+license=('MIT')
+makedepends=('curl' 'openssl')
+provides=("$_pkgname=$pkgver")
+replaces=("$_pkgname")
+conflicts=("$_pkgname")
+source=("http://gnu.org.pe/software/$_pkgname/$_pkgname-$pkgver.tar.xz")
+md5sums=('416e81aaa4d8963e229b6341a5c4db1a')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  install -Dm755 "$_pkgname" "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 default.png "$pkgdir/usr/share/pixmaps/default.png"
+  install -Dm644 "$_pkgname.1.gz" "$pkgdir/usr/share/man/man1/$_pkgname.1.gz"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+}
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 4ed863e35..f0cdd45db 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=hplip-libre
 pkgver=3.14.1
 pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
 license=('GPL')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 6a9a4a394..cb50faa1c 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -8,7 +8,7 @@ pkgname=liferea-libre
 pkgver=1.10.5
 pkgrel=1.1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://liferea.sourceforge.net/"
 provides=("liferea=$pkgver")
 replaces=('liferea')
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index c20fee223..d50c27934 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -89,11 +89,14 @@ build() {
   make VERSION=$pkgver-$pkgrel
   popd
 
+  if [ "$CARCH" != "mips64el" ]; then
   msg2 'x86_energy_perf_policy-libre'
   pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
   make
   popd
 
+  fi
+
   msg2 'usbip-libre'
   pushd linux-$pkgver/drivers/staging/usbip/userspace
   # fix missing man page
@@ -131,8 +134,8 @@ package_linux-libre-tools-meta() {
     'perf-libre'
     'tmon-libre'
     'usbip-libre'
-    'x86_energy_perf_policy-libre'
   )
+  [ "$CARCH" != "mips64el" ] && depends+=('x86_energy_perf_policy-libre')
   replaces=('linux-tools-meta')
   conflicts=('linux-tools-meta')
   provides=("linux-tools-meta=$pkgver") 
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 77251bc07..690b6cc8e 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -124,21 +124,30 @@ prepare() {
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
-        < "${srcdir}/lxo-config.patch" > lxo-config.patch
+        < "${srcdir}/config.patch" > config.patch
     msg2 "Adding loongson-community patches"
     patch -p1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch
     patch -p0 -i lxo-config.patch
 
-  # ensure N32, add localversion, remove uevent helper as per
-  # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
-  # and make USB storage support builtin (e.g. for booting from USB
-  # disks without slowly loading an initramfs)
+    # ensure N32, add localversion, remove uevent helper as per
+    # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
+    # and make USB storage support builtin (e.g. for booting from USB
+    # disks without slowly loading an initramfs)
+    # since 3.4 rtl8187 supports adhoc mode, so batman-adv is enabled again
     sed -ri \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
         -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
-        -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \
+        -e "s|# CONFIG_BATMAN_ADV is not set|CONFIG_BATMAN_ADV=m|g" \
         ./.config
+
+    for i in BATMAN_ADV_BLA BATMAN_ADV_DAT BATMAN_ADV_NC; do
+      echo "CONFIG_${i}=y" >>.config
+    done
+
+    for i in ATH9K_LEGACY_RATE_CONTROL BATMAN_ADV_DEBUG; do
+      echo "# CONFIG_${i} is not set" >>.config
+    done
   else
     cat "${srcdir}/config.${CARCH}" > ./.config # simpler
   fi
@@ -154,6 +163,8 @@ prepare() {
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
 
+  cd "${srcdir}/linux-${_basekernel}"
+
   # get kernel version
   make prepare
 
@@ -454,3 +465,26 @@ for _p in ${pkgname[@]}; do
 done
 
 # vim:set ts=8 sts=2 sw=2 et:
+md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
+         'd09e8017d22370b873628942f3ece3b0'
+         'b7718a81faf845ab53234336122ad631'
+         'f7ee88ffc93b665345b6ee89ff192e1f'
+         'e49ac236dfeef709f91a3d993ea7b62c'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '36e90334b12b2e9d53fd92129ee98f5b'
+         '98beb36f9b8cf16e58de2483ea9985e3'
+         'd50c1ac47394e9aec637002ef3392bd1'
+         '1040ae6c10d4a68f89899f94a2318a17'
+         'e92d4241b533fdd7165b5d47197f7162')
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+         '4b18ce60daff87504e6740670edf6b50'
+         'aa6614d1dbf46ab7d317bcde1e58f80c'
+         '3ecb40ee3bdd78e4d310c2afc1ccf209'
+         'e49ac236dfeef709f91a3d993ea7b62c'
+         '2967cecc3af9f954ccc822fd63dca6ff'
+         '8267264d9a8966e57fdacd1fa1fc65c4'
+         '44260d2cb1a8b51c119d2ce1f83e457a'
+         '98beb36f9b8cf16e58de2483ea9985e3'
+         'd50c1ac47394e9aec637002ef3392bd1'
+         '71bbddd5f9799aa045660d92baa05845')
diff --git a/libre/linux-libre/linux-libre.preset.mips64el b/libre/linux-libre/linux-libre.preset.mips64el
new file mode 100644
index 000000000..7af90ba7a
--- /dev/null
+++ b/libre/linux-libre/linux-libre.preset.mips64el
@@ -0,0 +1,14 @@
+# mkinitcpio preset file for the 'linux' package
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="/boot/vmlinuz-linux-libre"
+
+PRESETS=('default' 'fallback')
+
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-linux-libre.img"
+#default_options=""
+
+#fallback_config="/etc/mkinitcpio.conf"
+fallback_image="/boot/initramfs-linux-libre-fallback.img" 
+fallback_options="-S autodetect"
diff --git a/multilib-staging/gens-gs/PKGBUILD b/multilib-staging/gens-gs/PKGBUILD
deleted file mode 100755
index 9c5bde780..000000000
--- a/multilib-staging/gens-gs/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 89400 2013-04-29 08:52:25Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: trya <tryagainprod@gmail.com>
-# Contributor: Yvan <madridista40@orange.fr>
-
-pkgname=gens-gs
-pkgver=2.16.7
-pkgrel=4
-pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens"
-arch=('i686' 'x86_64')
-url="http://segaretro.org/Gens/GS"
-license=('GPL')
-if [[ $CARCH == "x86_64" ]]; then
-  makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm')
-  optdepends=('lib32-alsa-plugins: Sound support for PulseAudio'
-              'lib32-libpulse: Sound support for PulseAudio')
-else
-  depends=('gtk2' 'sdl')
-  makedepends=('nasm')
-fi
-conflicts=('gens')
-options=('!libtool')
-source=('http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz'
-        'gens-gtk.patch')
-sha256sums=('6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1'
-            '29b1e9755b34e00ef7d19bdc527dc4f841400a0022c81ee71c331be4a76a6c1c')
-
-prepare() {
-  cd "${srcdir}"/${pkgname}-r7
-
-  patch -Np1 -i ../gens-gtk.patch
-}
-
-build() {
-  cd "${srcdir}"/${pkgname}-r7
-
-  if [[ $CARCH == "x86_64" ]]; then
-    export CC="gcc -m32"
-    export CXX="g++ -m32"
-    export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  fi
-
-  if [[ $CARCH == "x86_64" ]]; then
-    LIBS='-ldl -lX11' ./configure --host=i686-unknown-linux-gnu --prefix=/usr --libdir=/usr/lib32 --with-pic --disable-static
-  else
-    LIBS='-ldl -lX11' ./configure --prefix=/usr --with-pic --disable-static
-  fi
-  make
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-r7
-
-  if [[ $CARCH == "x86_64" ]]; then
-    depends=('lib32-gtk2' 'lib32-sdl')
-  fi
-
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/multilib-staging/gens-gs/gens-gtk.patch b/multilib-staging/gens-gs/gens-gtk.patch
deleted file mode 100755
index 0bc6fd0ee..000000000
--- a/multilib-staging/gens-gs/gens-gtk.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp
---- gens/src/gens/ui/gtk/about/about_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/about/about_window.cpp	2010-10-11 15:46:25.000000000 +0000
-@@ -84,7 +84,7 @@
- 	gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE);
-+	g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)about_window, "delete_event",
-diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp
---- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp	2010-10-11 15:33:03.000000000 +0000
-@@ -84,7 +84,7 @@
- 	gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE);
-+	g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)bmf_window, "delete_event",
-diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp
---- gens/src/gens/ui/gtk/directory_config/dir_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp	2010-10-11 15:34:21.000000000 +0000
-@@ -109,7 +109,7 @@
- 	gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE);
-+	g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(dir_window), "delete_event",
-diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp
---- gens/src/gens/ui/gtk/general_options/genopt_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp	2010-10-11 15:36:00.000000000 +0000
-@@ -140,7 +140,7 @@
- 	gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(genopt_window), false);
- 	gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false);
-+	g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)genopt_window, "delete_event",
-@@ -458,11 +458,11 @@
- 	gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0);
- 	
- 	// Dropdown for intro effect.
--	cboIntroEffect = gtk_combo_box_new_text();
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None");
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect");
--	gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect");
--	//gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
-+	cboIntroEffect = gtk_combo_box_text_new();
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None");
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect");
-+	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect");
-+	//gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken.
- 	gtk_widget_show(cboIntroEffect);
- 	gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0);
- 	g_signal_connect((gpointer)(cboIntroEffect), "changed",
-diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp
---- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp	2010-10-11 15:21:28.000000000 +0000
-@@ -154,9 +154,9 @@
- 	GSFT_UNUSED_PARAMETER(y);
- 	GSFT_UNUSED_PARAMETER(user_data);
- 	
--	if (context->targets)
-+	if (gdk_drag_context_list_targets(context))
- 	{
--		GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0));
-+		GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0));
- 		gtk_drag_get_data(widget, context, target_type, time);
- 		return true;
- 	}
-diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp
---- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp	2010-10-11 15:46:21.000000000 +0000
-@@ -75,7 +75,7 @@
- 	gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE);
-+	g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(glres_window), "delete_event",
-diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp
---- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp	2010-10-11 15:46:29.000000000 +0000
-@@ -80,8 +80,7 @@
- // Callbacks.
- static gboolean	pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data);
- static void	pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data);
--static void	pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
--							       guint page_num, gpointer user_data);
-+static void	pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data);
- static void	pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data);
- static void	pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data);
- 
-@@ -119,7 +118,7 @@
- 	gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE);
-+	g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)pmgr_window, "delete_event",
-@@ -559,11 +558,9 @@
-  * @param page_num New notebook page index.
-  * @param user_data User data.
-  */
--static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page,
--							   guint page_num, gpointer user_data)
-+static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data)
- {
- 	GSFT_UNUSED_PARAMETER(notebook);
--	GSFT_UNUSED_PARAMETER(page);
- 	GSFT_UNUSED_PARAMETER(user_data);
- 	
- 	// Activate the "cursor-changed" callback for the page.
-diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp
---- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp	2010-10-11 15:46:16.000000000 +0000
-@@ -94,7 +94,7 @@
- 	gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE);
- 	gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE);
-+	g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL);
- 	
- 	// Callbacks for if the window is closed.
- 	g_signal_connect((gpointer)(selcd_window), "delete_event",
-@@ -128,7 +128,7 @@
- 	gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0);
- 	
- 	// Create the dropdown for the CD-ROM device name.
--	cboDeviceName = gtk_combo_box_entry_new_text();
-+	cboDeviceName = gtk_combo_box_text_new_with_entry();
- 	gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63);
- 	gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName);
- 	gtk_widget_show(cboDeviceName);
-@@ -156,7 +156,7 @@
- 	gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0);
- 	
- 	// Create the dropdown for the CD-ROM drive speed selection.
--	cboDriveSpeed = gtk_combo_box_new_text();
-+	cboDriveSpeed = gtk_combo_box_text_new();
- 	char tmpSpeed[16];
- 	for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++)
- 	{
-@@ -167,7 +167,7 @@
- 		else
- 			szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]);
- 
--		gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed);
-+		gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed);
- 	}
- 	gtk_widget_show(cboDriveSpeed);
- 	gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0);
-@@ -252,7 +252,7 @@
- 				continue;
- 			
- 			// Add the device file.
--			gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName);
-+			gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName);
- 		}
- 	}
- 	
-diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp
---- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp	2010-10-11 16:32:29.000000000 +0000
-+++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp	2010-10-11 15:52:05.000000000 +0000
-@@ -111,7 +111,7 @@
- 	gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER);
- 	gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE);
- 	gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG);
--	gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE);
-+	g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL);
- 	
- 	// Add the window icon.
- 	GList *icon_list = NULL;
diff --git a/multilib-staging/lib32-cairo/PKGBUILD b/multilib-staging/lib32-cairo/PKGBUILD
deleted file mode 100644
index 87ddae50b..000000000
--- a/multilib-staging/lib32-cairo/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 89175 2013-04-27 13:22:02Z ioni $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.12.14
-pkgrel=4
-pkgdesc="Cairo vector graphics library (32-bit)"
-arch=('x86_64')
-url="http://cairographics.org/"
-license=('LGPL' 'MPL')
-makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa>=9.1' 'lib32-mesa-libgl>=9.1' 'mesa-libgl') # we need to avoid old libgl in [extra]
-source=(http://cairographics.org/releases/${_pkgbasename}-${pkgver}.tar.xz
-        libpng16.patch)
-options=(!libtool)
-sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15'
-          'c9911f185637d266ce1d2985bd6fb7d0df3d75b2')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-   
-  patch -Np1 -i ../libpng16.patch
-  ./configure --prefix=/usr \
-      --libdir=/usr/lib32 \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static \
-      --enable-tee \
-      --enable-gl \
-      --enable-egl
-      # --disable-xlib-xcb
-  make
-}
-
-package() {
-  depends=('lib32-libpng' 'lib32-libxext' 'lib32-libxrender' 'lib32-fontconfig'
-           'lib32-pixman' 'lib32-glib2' 'lib32-mesa>=9.1' 'lib32-libgl' ${_pkgbasename})
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-}
diff --git a/multilib-staging/lib32-cairo/libpng16.patch b/multilib-staging/lib32-cairo/libpng16.patch
deleted file mode 100644
index c16317811..000000000
--- a/multilib-staging/lib32-cairo/libpng16.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Tue, 16 Apr 2013 09:58:56 +0000
-Subject: png: Avoid marking the surface as in error after a png warning
-
-It turns out that libpng will continue to load an image after throwing a
-warning, and that libpng16 now throws warnings for images that libpng15
-and earlier loaded without error. As we were happily loading those
-images into cairo surfaces before, we are therefore being overzealous
-in throwing an error now - so just squelch the warning.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-png.c b/src/cairo-png.c
-index e74a4a8..068617d 100644
---- a/src/cairo-png.c
-+++ b/src/cairo-png.c
-@@ -149,13 +149,13 @@ static void
- png_simple_warning_callback (png_structp png,
- 	                     png_const_charp error_msg)
- {
--    cairo_status_t *error = png_get_error_ptr (png);
--
--    /* default to the most likely error */
--    if (*error == CAIRO_STATUS_SUCCESS)
--	*error = _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--    /* png does not expect to abort and will try to tidy up after a warning */
-+    /* png does not expect to abort and will try to tidy up and continue
-+     * loading the image after a warning. So we also want to return the
-+     * (incorrect?) surface.
-+     *
-+     * We use our own warning callback to squelch any attempts by libpng
-+     * to write to stderr as we may not be in control of that output.
-+     */
- }
- 
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD b/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index a517b2722..000000000
--- a/multilib-staging/lib32-gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 89167 2013-04-27 12:41:00Z ioni $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=gdk-pixbuf2
-pkgname=lib32-$_pkgbasename
-pkgver=2.28.1
-pkgrel=2
-pkgdesc="An image loading library (32-bit)"
-arch=('x86_64')
-url="http://www.gtk.org/"
-license=('LGPL2')
-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/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb')
-
-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-pixdata
-  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-gtk2/PKGBUILD b/multilib-staging/lib32-gtk2/PKGBUILD
deleted file mode 100644
index 3e303e874..000000000
--- a/multilib-staging/lib32-gtk2/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 89396 2013-04-29 08:14:33Z alucryd $
-# 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.17
-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=('e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415'
-            '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-libpng/PKGBUILD b/multilib-staging/lib32-libpng/PKGBUILD
deleted file mode 100644
index fb0e987e1..000000000
--- a/multilib-staging/lib32-libpng/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 89165 2013-04-27 12:32:54Z ioni $
-# 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.6.2
-_apngver=1.6.1
-_libversion=16
-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=('9d838f6fca9948a9f360a0cc1b516d5f'
-         '39c34060c2f0e48f3849dcdbd4a16b7a')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 --program-suffix=-32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png
-
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  rm "$pkgdir/usr/bin/libpng-config"
-  ln -s "libpng${_libversion}-config-32" "$pkgdir/usr/bin/libpng-config-32"
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-staging/lib32-pango/PKGBUILD b/multilib-staging/lib32-pango/PKGBUILD
deleted file mode 100644
index 74a1b1fc4..000000000
--- a/multilib-staging/lib32-pango/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 89394 2013-04-29 08:13:56Z alucryd $
-# 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.34.0
-pkgrel=2
-pkgdesc="A library for layout and rendering of text (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-makedepends=("gcc-multilib" 'lib32-fontconfig' \
-             'lib32-mesa-libgl' 'lib32-cairo' 'lib32-libxft' 'lib32-harfbuzz' $_pkgbasename)
-options=('!libtool' '!emptydirs')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver:0:4}/${_pkgbasename}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27')
-
-prepare() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  sed -i 's#"pango.modules"#"pango.modules-32"#' pango/modules.c
-}
-
-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 --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() {
-  depends=('lib32-cairo' 'lib32-libxft' 'lib32-harfbuzz' $_pkgbasename)
-  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.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-wxgtk/PKGBUILD b/multilib-staging/lib32-wxgtk/PKGBUILD
deleted file mode 100755
index 105cde328..000000000
--- a/multilib-staging/lib32-wxgtk/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 89392 2013-04-29 08:12:47Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: Limao Luo <luolimao@gmail.com>
-# Contributor: Devin Cofer <ranguvar@archlinux.us>
-# Contributor: Yggdrasil <tetzank@web.de>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Bob Finch <w9ya@arrl.net>
-# Contributor: J. Santiago "Angelus" Hirschfeld <jsantiagoh@yahoo.com.ar>
-
-pkgname=lib32-wxgtk
-pkgver=2.8.12.1
-pkgrel=5
-pkgdesc="GTK+ implementation of wxWidgets API for GUI (lib32)"
-arch=('x86_64')
-url="http://wxwidgets.org/"
-license=('custom:wxWindows')
-makedepends=('lib32-gstreamer0.10-base-plugins' 'lib32-gtk2' 'lib32-mesa' 'lib32-glu' 'lib32-libxt' 'lib32-libsm' 'lib32-sdl' 'lib32-mesa-libgl')
-source=("http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2")
-sha256sums=('1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0')
-
-build() {
-  cd "${srcdir}"/wxPython-src-${pkgver}
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 --with-{gtk=2,libjpeg=sys,libpng=sys,libtiff=sys,libxpm=sys,opengl,regex=builtin,sdl} --enable-{graphics_ctx,unicode} --disable-{mediactrl,optimize,precomp-headers}
-  make
-  make -C locale allmo
-  make -C contrib/src
-}
-
-package() {
-  depends=('lib32-gtk2' 'lib32-gstreamer0.10-base' 'lib32-libsm' 'lib32-sdl' "${pkgname#*-}")
-
-  cd "${srcdir}"/wxPython-src-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-  make -C contrib/src DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/{include,share,bin/wxrc}
-  mv "${pkgdir}"/usr/bin/wx-config{,32}
-  mv "${pkgdir}"/usr/bin/wxrc{,32}-2.8
-
-  install -dm 755 "${pkgdir}"/usr/share/licenses
-  ln -s ${pkgname#*-} "${pkgdir}"/usr/share/licenses/${pkgname}
-}
-
-# vim: ts=2 sw=2 et:
diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD
deleted file mode 100644
index 77edc6ddb..000000000
--- a/multilib-testing/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 75114 2012-08-14 08:29:19Z allan $
-# Maintainer: Jan Alexander Steffens (heftig) <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=10
-_date=20120323
-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.16' 'zlib')
-makedepends=('gcc-multilib') # Make sure we compile this with gcc-multilib
-checkdepends=('dejagnu')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('de2ac4298732827f8af706fc24020330')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --with-lib-path=/usr/lib:/usr/local/lib \
-    --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
-
-  # Rebuild libopcodes.a with -fPIC
-  cp -a opcodes opcodes-pic
-  make -C opcodes-pic clean 
-  make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-
-  # do not abort on errors - manually check log files
-  # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror)
-  make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \
-       CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k 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
-  install -m644 opcodes/libopcodes.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/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
deleted file mode 100644
index bcfb1f9cb..000000000
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,319 +0,0 @@
-# $Id: PKGBUILD 77268 2012-10-08 13:37:04Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <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.7.2
-pkgrel=1
-#_snapshot=4.7-20120721
-_libstdcppmanver=20120924		# Note: check source directory name when updating this
-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.16')
-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++-api.${_libstdcppmanver}.man.tar.bz2
-	gcc_pure64-multilib.patch
-        gcc-4.7.1-libada-pic.patch
-        gcc-4.7.1-libgo-write.patch)
-md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         '7f3d52515daafffb57c287f427381106'
-         'ec24c32d3d1030c2bc8cb2ad2d1dc629'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c')
-
-
-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 -p1 -i ${srcdir}/gcc_pure64-multilib.patch
-
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-  
-  # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.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 \
-      --disable-ppl-version-check --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu \
-      --enable-multilib --disable-libssp \
-      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
-      --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-multilib()
-{
-  pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.16' "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 libitm; 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 -C $CHOST/libitm 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 -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove stuff in lib32-gcc-libs
-  rm -r ${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.16' "gcc-libs>=$pkgver")
-
-  cd gcc-build
-  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src libitm; 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 -r ${pkgdir}/usr/lib
-  rm -r ${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
-  
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
-  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
-
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  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}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{libcaf_single,libgfortranbegin}.a
-  rm -r $pkgdir/usr/lib{,32}/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.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 expect this symlinks
-  ln -s gcc ${pkgdir}/usr/bin/cc
-
-  # 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}/libstdc++-api.${_libstdcppmanver}.man/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
-
-  ln -s gfortran ${pkgdir}/usr/bin/f95
-
-  # 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
-
-  ln -s gcc ${pkgdir}/usr/bin/gnatgcc
-  
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
-  pkgdesc="Go front-end for GCC for multilib"
-  depends=("gcc-multilib=$pkgver-$pkgrel")
-  provides=("gcc-go=$pkgver-$pkgrel")
-  conflicts=('gcc-go')
-  install=gcc-go.install
-
-  cd gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch b/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch
deleted file mode 100644
index c7146fa04..000000000
--- a/multilib-testing/gcc-multilib/gcc-4.7.0-cloog-0.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
diff --git a/multilib-testing/gcc-multilib/gcc-4.7.1-libada-pic.patch b/multilib-testing/gcc-multilib/gcc-4.7.1-libada-pic.patch
deleted file mode 100644
index 591da1e4a..000000000
--- a/multilib-testing/gcc-multilib/gcc-4.7.1-libada-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- 	-fexceptions -DIN_RTS @have_getipinfo@
- 
- host_subdir = @host_subdir@
diff --git a/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch b/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
deleted file mode 100644
index 427efe8a6..000000000
--- a/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
--  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
--  rusage=`echo $rusage | sed -e 's/^ *//'`
-   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
-   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+  rusage=`echo $rusage | sed -e 's/^ *//'`
-   nrusage=
-   while test -n "$rusage"; do
-     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-write.patch b/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-write.patch
deleted file mode 100644
index a7be83fda..000000000
--- a/multilib-testing/gcc-multilib/gcc-4.7.1-libgo-write.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
---- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
-+++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
-@@ -17,7 +17,8 @@
- 	G* g = runtime_g();
- 
- 	if(g == nil || g->writebuf == nil) {
--		runtime_write(2, v, n);
-+		ssize_t bytesWritten = runtime_write(2, v, n);
-+		(void)bytesWritten;
- 		return;
- 	}
- 	
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-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 b5576ae0e..000000000
--- a/multilib-testing/gcc-multilib/gcc_pure64-multilib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r gcc-4.7.0/gcc/config/i386/linux64.h gcc-4.7.0-pure64/gcc/config/i386/linux64.h
---- gcc-4.7.0/gcc/config/i386/linux64.h	2011-07-07 17:38:34.000000000 +0200
-+++ gcc-4.7.0-pure64/gcc/config/i386/linux64.h	2012-03-24 11:52:58.926204014 +0100
-@@ -29,5 +29,5 @@
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
- #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"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -u -r gcc-4.7.0/gcc/config/i386/t-linux64 gcc-4.7.0-pure64/gcc/config/i386/t-linux64
---- gcc-4.7.0/gcc/config/i386/t-linux64	2011-11-02 16:23:48.000000000 +0100
-+++ gcc-4.7.0-pure64/gcc/config/i386/t-linux64	2012-03-24 11:52:44.119651885 +0100
-@@ -34,6 +34,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
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 e5b3d3b47..000000000
--- a/multilib-testing/jack2-multilib/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 76737 2012-09-28 17:05:26Z 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=4
-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'
-        'ffado_setbuffsize-jack2.patch')
-md5sums=('1dd2ff054cab79dfc11d134756f27165'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef'
-         '1502d82fe2276d6f224fff6467a0b6f9')
-
-_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"
-
-  # backport firewire stuff
-  #   - needed for setbuffsize feature in latest stable ffado
-  # from https://github.com/jackaudio/jack2/commit/96e0251
-  (
-  cd $_tarname-$pkgver
-  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch"
-  )
-
-  # Some optimisation bug exists for current GCC
-  # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
-  export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
-  export CXXFLAGS="$CFLAGS"
-
-  # 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/usr/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/usr/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  _mklinks
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch b/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch
deleted file mode 100644
index 0c74aad24..000000000
--- a/multilib-testing/jack2-multilib/ffado_setbuffsize-jack2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
-Date: Sat, 17 Mar 2012 22:36:30 +0100
-Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size
-
-This is a port of Jonathan Woithe's patch from jackd1.
-With sufficiently recent versions of FFADO, it allows to change
-the buffersize at runtime.
----
- linux/firewire/JackFFADODriver.cpp |   65 ++++++++++++++++++++++++++++++++----
- linux/firewire/JackFFADODriver.h   |    6 ++++
- 2 files changed, 65 insertions(+), 6 deletions(-)
-
-diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
-index b33e1cd..085b78a 100644
---- a/linux/firewire/JackFFADODriver.cpp
-+++ b/linux/firewire/JackFFADODriver.cpp
-@@ -3,6 +3,7 @@
- Copyright (C) 2004 Grame
- Copyright (C) 2007 Pieter Palmers
- Copyright (C) 2009 Devin Anderson
-+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
- 
- 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
-@@ -48,7 +49,10 @@
- namespace Jack
- {
- 
-+// Basic functionality requires API version 8.  If version 9 or later
-+// is present the buffers can be resized at runtime.
- #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
-+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
- 
- #define jack_get_microseconds GetMicroSeconds
- 
-@@ -281,19 +285,68 @@
- int
- JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
- {
--    printError("Buffer size change requested but not supported!!!");
-+    ffado_driver_t* driver = (ffado_driver_t*)fDriver;
-+    signed int chn;
-+
-+    // The speed of this function isn't critical; we can afford the
-+    // time to check the FFADO API version.
-+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
-+		    ffado_streaming_set_period_size == NULL) {
-+	    printError("unsupported on current version of FFADO; please upgrade FFADO");
-+	    return -1;
-+    }
- 
--    /*
-     driver->period_size = nframes;
-     driver->period_usecs =
-             (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
-                                  * 1000000.0f);
--    */
-+
-+
-+    // Reallocate the null and scratch buffers.
-+    driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+    if(driver->nullbuffer == NULL) {
-+	    printError("could not allocate memory for null buffer");
-+	    return -1;
-+    }
-+    driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+    if(driver->scratchbuffer == NULL) {
-+	    printError("could not allocate memory for scratch buffer");
-+	    return -1;
-+    }
-+
-+    // MIDI buffers need reallocating
-+    for (chn = 0; chn < driver->capture_nchannels; chn++) {
-+	    if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-+		    // setup the midi buffer
-+		    if (driver->capture_channels[chn].midi_buffer != NULL)
-+			    free(driver->capture_channels[chn].midi_buffer);
-+		    driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+	    }
-+    }
-+    for (chn = 0; chn < driver->playback_nchannels; chn++) {
-+	    if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-+		    if (driver->playback_channels[chn].midi_buffer != NULL)
-+			    free(driver->playback_channels[chn].midi_buffer);
-+		    driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+	    }
-+    }
-+
-+    // Notify FFADO of the period size change
-+    if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
-+	    printError("could not alter FFADO device period size");
-+	    return -1;
-+    }
-+
-+    // This is needed to give the shadow variables a chance to
-+    // properly update to the changes.
-+    sleep(1);
- 
-     /* tell the engine to change its buffer size */
--    //driver->engine->set_buffer_size (driver->engine, nframes);
-+    JackAudioDriver::SetBufferSize(nframes);  // Generic change, never fails
- 
--    return -1; // unsupported
-+    UpdateLatencies();
-+
-+    return 0;
- }
- 
- typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-@@ -306,7 +359,7 @@
- 
-     assert(params);
- 
--    if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-         printError("Incompatible libffado version! (%s)", ffado_get_version());
-         return NULL;
-     }
-diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h
-index cb2a45d..790f4dd 100644
---- a/linux/firewire/JackFFADODriver.h
-+++ b/linux/firewire/JackFFADODriver.h
-@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
-         int Read();
-         int Write();
- 
-+        // BufferSize can be changed
-+        bool IsFixedBufferSize()
-+        {
-+            return false;
-+        }
-+
-         int SetBufferSize(jack_nframes_t nframes);
- };
- 
--- 
-1.7.10
-
diff --git a/multilib-testing/lib32-catalyst-utils/PKGBUILD b/multilib-testing/lib32-catalyst-utils/PKGBUILD
deleted file mode 100644
index 5d8c1dcc2..000000000
--- a/multilib-testing/lib32-catalyst-utils/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 78745 2012-10-23 22:16:55Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
-# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
-
-pkgname=lib32-catalyst-utils
-pkgver=12.10
-pkgrel=1
-pkgdesc="AMD Catalyst drivers libraries (32 bits)"
-arch=('x86_64')
-url="http://www.amd.com"
-license=('custom')
-source=("http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-x86.x86_64.zip")
-md5sums=('ef6ecd984e47e80849215b33fbfa5b7f')
-provides=('lib32-libgl')
-conflicts=('lib32-libgl' 'lib32-nvidia-utils')
-
-build() {
-  cd ${srcdir}
-
-  sh ./amd-driver-installer*.run --extract fglrx-install
-}
-
-package() {
-  depends=("catalyst-utils=${pkgver}")
-
-  install -dm755 "${pkgdir}"/usr/bin
-  install -dm755 "${pkgdir}"/usr/lib32/{dri,xorg/modules/{dri,extensions/fglrx}}
-  
-  # binaries
-  cd ${srcdir}/fglrx-install
-  install -m755 arch/x86/usr/X11R6/bin/fgl_glxgears "${pkgdir}/usr/bin/fgl_glxgears32"
-  install -m755 arch/x86/usr/X11R6/bin/fglrxinfo "${pkgdir}/usr/bin/fglrxinfo32"
-  
-  # dri/gl/... drivers
-  cd ${srcdir}/fglrx-install/xpic/usr/X11R6/lib/modules
-  install -m755 *.so "${pkgdir}/usr/lib32/xorg/modules/"
-  cd ${srcdir}/fglrx-install/arch/x86/usr/X11R6/lib
-  install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/"
-  ln -s /usr/lib32/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/dri/"
-  install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/"
-  install -m755 *.so* "${pkgdir}/usr/lib32/"
-  install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib32/"
-  cd ${srcdir}/fglrx-install/arch/x86/usr/lib
-  install -m755 *.so* "${pkgdir}/usr/lib32/"
-  # needed symlinks
-  ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib32/libatiuki.so.1"
-  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so.1"
-  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so"
-  ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/libAMDXvBA.so.1"
-  ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/libAMDXvBA.so"
-  ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib32/libfglrx_dm.so.1"
-  
-  # useful for 32 bits ?
-  rm "${pkgdir}"/usr/lib32/lib{amdocl*,OpenCL}.so* 
-
-  # licenses
-  install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
-}
diff --git a/multilib-testing/lib32-glew/PKGBUILD b/multilib-testing/lib32-glew/PKGBUILD
deleted file mode 100644
index b5302e8ef..000000000
--- a/multilib-testing/lib32-glew/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 77251 2012-10-08 08:13:50Z bluewind $
-# Maintainer: Florian Pritz <flo@xinu.at>
-
-_pkgbasename=glew
-pkgname=lib32-$_pkgbasename
-pkgver=1.8.0
-pkgrel=2
-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-glu' "$_pkgbasename>=$pkgver")
-makedepends=('gcc-multilib')
-source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz)
-sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4')
-
-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-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
deleted file mode 100644
index 2f586aeb6..000000000
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,144 +0,0 @@
-# $Id: PKGBUILD 75727 2012-08-29 17:49:29Z 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.16.0
-pkgrel=4
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-makedepends=('gcc-multilib>=4.7')
-options=('!strip' '!emptydirs')
-source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
-        glibc-2.15-fix-res_query-assert.patch
-        glibc-2.15-revert-c5a0802a.patch
-        glibc-2.16-rpcgen-cpp-path.patch
-        glibc-2.16-strncasecmp-segfault.patch
-        glibc-2.16-strtod-overflow.patch
-        lib32-glibc.conf)
-md5sums=('80b181b02ab249524ec92822c0174cf7'
-         '2a1221a15575820751c325ef4d2fbb90'
-         '31f415b41197d85d3bbee3d1eecd06a3'
-         '0a0383d50d63f1c02919fe9943b82014'
-         'ea6a43915474e8276e9361eed6a01280'
-         'f042d37cc8ca3459023431809039bc88'
-         '61d322f7681a85d3293ada5c3ccc2c7e'
-         '6e052f1cb693d5d3203f50f9d4e8c33b')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  # fix res_query assertion
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
-
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=552960
-  patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
-  # prevent need for /lib/cpp symlink
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
-  patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
-
-  # strncasecmp segfault on i686
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737
-  patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch
-
-  # strtod integer/buffer overflow
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319
-  patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch
-
-  # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
-  sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  #if [[ ${CARCH} = "i686" ]]; then
-    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-    # TODO: make separate glibc-xen package for i686
-    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-  #fi
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  echo "slibdir=/usr/lib32" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
-      --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
-      --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization \
-      --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 "/build-programs=/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
-  make -k check
-}
-
-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}-*.so \
-                      usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
-  # Dynamic linker
-  mkdir ${pkgdir}/usr/lib
-  ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/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.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.15-__libc_res_nquerydomain-out-of-bounds.patch b/multilib-testing/lib32-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
deleted file mode 100644
index 6f0a0398f..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 947c651..abccd4a 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
- 		 * copy without '.' if present.
- 		 */
- 		n = strlen(name);
--		if (n >= MAXDNAME) {
-+
-+		/* Decrement N prior to checking it against MAXDNAME
-+		   so that we detect a wrap to SIZE_MAX and return
-+		   a reasonable error.  */
-+		n--;
-+		if (n >= MAXDNAME - 1) {
- 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
- 			return (-1);
- 		}
--		n--;
--		if (n >= 0 && name[n] == '.') {
-+		if (name[n] == '.') {
- 			strncpy(nbuf, name, n);
- 			nbuf[n] = '\0';
- 		} else
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-arena.patch b/multilib-testing/lib32-glibc/glibc-2.15-arena.patch
deleted file mode 100644
index 46f52e98d..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-arena.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/malloc/arena.c b/malloc/arena.c
-index d3cf4b9..b1c9469 100644
---- a/malloc/arena.c
-+++ b/malloc/arena.c
-@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
- 	{
- 	  if (mp_.arena_max != 0)
- 	    narenas_limit = mp_.arena_max;
--	  else
-+	  else if (narenas > mp_.arena_test)
- 	    {
- 	      int n  = __get_nprocs ();
- 
-@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
- 	}
-     repeat:;
-       size_t n = narenas;
--      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
-+      /* NB: the following depends on the fact that (size_t)0 - 1 is a
-+	 very large number and that the underflow is OK.  If arena_max
-+	 is set the value of arena_test is irrelevant.  If arena_test
-+	 is set but narenas is not yet larger or equal to arena_test
-+	 narenas_limit is 0.  There is no possibility for narenas to
-+	 be too big for the test to always fail since there is not
-+	 enough address space to create that many arenas.  */
-+      if (__builtin_expect (n <= narenas_limit - 1, 0))
- 	{
- 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
- 	    goto repeat;
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-avx.patch b/multilib-testing/lib32-glibc/glibc-2.15-avx.patch
deleted file mode 100644
index 5439da8d0..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-avx.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-index 6867c6e..3a615fc 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-@@ -14,7 +14,7 @@ extern double __ieee754_atan2_fma4 (double, double);
- 
- libm_ifunc (__ieee754_atan2,
- 	    HAS_FMA4 ? __ieee754_atan2_fma4
--	    : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
- strong_alias (__ieee754_atan2, __atan2_finite)
- 
- # define __ieee754_atan2 __ieee754_atan2_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-index 3c65028..7b2320a 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_exp.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-@@ -14,7 +14,7 @@ extern double __ieee754_exp_fma4 (double);
- 
- libm_ifunc (__ieee754_exp,
- 	    HAS_FMA4 ? __ieee754_exp_fma4
--	    : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2));
- strong_alias (__ieee754_exp, __exp_finite)
- 
- # define __ieee754_exp __ieee754_exp_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c
-index 3b468d0..ab277d6 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_log.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_log.c
-@@ -14,7 +14,7 @@ extern double __ieee754_log_fma4 (double);
- 
- libm_ifunc (__ieee754_log,
- 	    HAS_FMA4 ? __ieee754_log_fma4
--	    : (HAS_AVX ? __ieee754_log_avx
-+	    : (HAS_YMM_USABLE ? __ieee754_log_avx
- 	       : __ieee754_log_sse2));
- strong_alias (__ieee754_log, __log_finite)
- 
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-index 3160201..78c7e09 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_atan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-@@ -12,7 +12,8 @@ extern double __atan_fma4 (double);
- #  define __atan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (atan, HAS_FMA4 ? __atan_fma4 : HAS_AVX ? __atan_avx : __atan_sse2);
-+libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 :
-+		   HAS_YMM_USABLE ? __atan_avx : __atan_sse2));
- 
- # define atan __atan_sse2
- #endif
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-index 1ba9dbc..417acd0 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-@@ -17,10 +17,12 @@ extern double __sin_fma4 (double);
- #  define __sin_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
-+libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 :
-+		    HAS_YMM_USABLE ? __cos_avx : __cos_sse2));
- weak_alias (__cos, cos)
- 
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
-+libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 :
-+		    HAS_YMM_USABLE ? __sin_avx : __sin_sse2));
- weak_alias (__sin, sin)
- 
- # define __cos __cos_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-index 8f6601e..3047155 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-@@ -12,7 +12,8 @@ extern double __tan_fma4 (double);
- #  define __tan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
-+libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 :
-+		  HAS_YMM_USABLE ? __tan_avx : __tan_sse2));
- 
- # define tan __tan_sse2
- #endif
-diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
-index 65b0ee9..76d146c 100644
---- a/sysdeps/x86_64/multiarch/init-arch.c
-+++ b/sysdeps/x86_64/multiarch/init-arch.c
-@@ -1,6 +1,6 @@
- /* Initialize CPU feature data.
-    This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    Contributed by Ulrich Drepper <drepper@redhat.com>.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -144,6 +144,18 @@ __init_cpu_features (void)
-   else
-     kind = arch_kind_other;
- 
-+  if (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_AVX)
-+    {
-+      /* Reset the AVX bit in case OSXSAVE is disabled.  */
-+      if ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_OSXSAVE) != 0
-+	  && ({ unsigned int xcrlow;
-+		unsigned int xcrhigh;
-+		asm ("xgetbv"
-+		     : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
-+		(xcrlow & 6) == 6; }))
-+	__cpu_features.feature[index_YMM_Usable] |= bit_YMM_Usable;
-+    }
-+
-   __cpu_features.family = family;
-   __cpu_features.model = model;
-   atomic_write_barrier ();
-diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
-index 2a1df39..2dc75ab 100644
---- a/sysdeps/x86_64/multiarch/init-arch.h
-+++ b/sysdeps/x86_64/multiarch/init-arch.h
-@@ -1,5 +1,5 @@
- /* This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-@@ -22,11 +22,13 @@
- #define bit_Prefer_SSE_for_memop	(1 << 3)
- #define bit_Fast_Unaligned_Load		(1 << 4)
- #define bit_Prefer_PMINUB_for_stringop	(1 << 5)
-+#define bit_YMM_Usable			(1 << 6)
- 
- #define bit_SSE2	(1 << 26)
- #define bit_SSSE3	(1 << 9)
- #define bit_SSE4_1	(1 << 19)
- #define bit_SSE4_2	(1 << 20)
-+#define bit_OSXSAVE	(1 << 27)
- #define bit_AVX		(1 << 28)
- #define bit_POPCOUNT	(1 << 23)
- #define bit_FMA		(1 << 12)
-@@ -48,6 +50,7 @@
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
-+# define index_YMM_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- 
- #else	/* __ASSEMBLER__ */
- 
-@@ -92,7 +95,7 @@ extern struct cpu_features
- 
- 
- extern void __init_cpu_features (void) attribute_hidden;
--#define INIT_ARCH()\
-+# define INIT_ARCH() \
-   do							\
-     if (__cpu_features.kind == arch_kind_unknown)	\
-       __init_cpu_features ();				\
-@@ -125,23 +128,21 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define index_Slow_BSF			FEATURE_INDEX_1
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1
-+# define index_YMM_Usable		FEATURE_INDEX_1
- 
--#define HAS_ARCH_FEATURE(idx, bit) \
--  ((__get_cpu_features ()->feature[idx] & (bit)) != 0)
-+# define HAS_ARCH_FEATURE(name) \
-+  ((__get_cpu_features ()->feature[index_##name] & (bit_##name)) != 0)
- 
--#define HAS_FAST_REP_STRING \
--  HAS_ARCH_FEATURE (index_Fast_Rep_String, bit_Fast_Rep_String)
-+# define HAS_FAST_REP_STRING	HAS_ARCH_FEATURE (Fast_Rep_String)
- 
--#define HAS_FAST_COPY_BACKWARD \
--  HAS_ARCH_FEATURE (index_Fast_Copy_Backward, bit_Fast_Copy_Backward)
-+# define HAS_FAST_COPY_BACKWARD	HAS_ARCH_FEATURE (Fast_Copy_Backward)
- 
--#define HAS_SLOW_BSF \
--  HAS_ARCH_FEATURE (index_Slow_BSF, bit_Slow_BSF)
-+# define HAS_SLOW_BSF		HAS_ARCH_FEATURE (Slow_BSF)
- 
--#define HAS_PREFER_SSE_FOR_MEMOP \
--  HAS_ARCH_FEATURE (index_Prefer_SSE_for_memop, bit_Prefer_SSE_for_memop)
-+# define HAS_PREFER_SSE_FOR_MEMOP HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
- 
--#define HAS_FAST_UNALIGNED_LOAD \
--  HAS_ARCH_FEATURE (index_Fast_Unaligned_Load, bit_Fast_Unaligned_Load)
-+# define HAS_FAST_UNALIGNED_LOAD HAS_ARCH_FEATURE (Fast_Unaligned_Load)
-+
-+# define HAS_YMM_USABLE		HAS_ARCH_FEATURE (YMM_Usable)
- 
- #endif	/* __ASSEMBLER__ */
--- 
-1.7.9
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch b/multilib-testing/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch
deleted file mode 100644
index 483b28532..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff --git a/posix/confstr.c b/posix/confstr.c
-index 3c9566d..cad6561 100644
---- a/posix/confstr.c
-+++ b/posix/confstr.c
-@@ -35,6 +34,10 @@ confstr (name, buf, len)
-   const char *string = "";
-   size_t string_len = 1;
- 
-+  /* Note that this buffer must be large enough for the longest strings
-+     used below.  */
-+  char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
-+
-   switch (name)
-     {
-     case _CS_PATH:
-@@ -53,59 +56,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V7_ILP32_OFF32
--	if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
--		    sizeof "POSIX_V7_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
-+		  sizeof "POSIX_V7_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_ILP32_OFFBIG
--	if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
--		    sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
-+		  sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LP64_OFF64
--	if (__sysconf (_SC_V7_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V7_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
--		    sizeof "POSIX_V7_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
-+		  sizeof "POSIX_V7_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LPBIG_OFFBIG
--	if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
--		    sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V6_WIDTH_RESTRICTED_ENVS:
-@@ -116,59 +115,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V6_ILP32_OFF32
--	if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
--		    sizeof "POSIX_V6_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
-+		  sizeof "POSIX_V6_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_ILP32_OFFBIG
--	if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
--		    sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
-+		  sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LP64_OFF64
--	if (__sysconf (_SC_V6_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V6_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
--		    sizeof "POSIX_V6_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
-+		  sizeof "POSIX_V6_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LPBIG_OFFBIG
--	if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
--		    sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V5_WIDTH_RESTRICTED_ENVS:
-@@ -179,59 +174,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _XBS5_ILP32_OFF32
--	if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
--		    sizeof "XBS5_ILP32_OFF32" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
-+		  sizeof "XBS5_ILP32_OFF32" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _XBS5_ILP32_OFFBIG
--	if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
--		    sizeof "XBS5_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
-+		  sizeof "XBS5_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _XBS5_LP64_OFF64
--	if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
- #endif
- #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
--		    sizeof "XBS5_LP64_OFF64" - 1);
--	    string_len += sizeof "XBS5_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
-+		  sizeof "XBS5_LP64_OFF64" - 1);
-+	  string_len += sizeof "XBS5_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _XBS5_LPBIG_OFFBIG
--	if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
--		    sizeof "XBS5_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
-+		  sizeof "XBS5_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_XBS5_ILP32_OFF32_CFLAGS:
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch
deleted file mode 100644
index d28237f85..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index 00bfba6..9e55a6a 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -45,7 +45,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- CPPFLAGS-zic = -DNOT_IN_libc
- 
- ifeq ($(have-ksh),yes)
--install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
- generated += tzselect
- endif
-@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- 	    -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
- 	chmod 555 $@.new
- 	mv -f $@.new $@
--
--$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \
--    $(inst_zonedir)/%: % $(+force)
--	$(do-install)
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch b/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch
deleted file mode 100644
index e4f29bc1a..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index e8fb716..d5ea538 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -1,4 +1,4 @@
--# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2000,2002,2005,2007,2012 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
-@@ -49,33 +49,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- 
- CPPFLAGS-zic = -DNOT_IN_libc
- 
--# z.* use this variable.
--define nl
--
--
--endef
--ifndef avoid-generated
--ifndef inhibit_timezone_rules
---include $(addprefix $(objpfx)z.,$(tzfiles))
--endif
--endif
--
--# Make these absolute file names.
--installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \
--					$(addprefix $(inst_zonedir)/, \
--						    $(localtime-file)))
--installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \
--					 $(addprefix $(inst_zonedir)/, \
--						     $(posixrules-file)))
--
--ifeq ($(cross-compiling),no)
--# Don't try to install the zoneinfo files since we can't run zic.
--install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
--					      $(zonenames:%=posix/%) \
--					      $(zonenames:%=right/%)) \
--		 $(installed-localtime-file) $(installed-posixrules-file)
--endif
--
- ifeq ($(have-ksh),yes)
- install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
-@@ -85,79 +58,6 @@ endif
- include ../Rules
- 
- 
--$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
--# Kludge alert: we use an implicit rule (in what we are generating here)
--# because that is the only way to tell Make that the one command builds all
--# the files.
--# The extra kludge for the $(tzlinks) files is necessary since running zic
--# this file requires all other files to exist.  Blech!
--	$(make-target-directory)
--	(echo 'define $*-zones'						    ;\
--	 $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\
--	 echo 'endef'							    ;\
--	 echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))'		    ;\
--	 echo 'ifdef $*-zones'						    ;\
--	 if test x$(findstring $*, $(tzlinks)) != x; then		     \
--	   echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \'	    ;\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\
--	 fi								    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic leapseconds yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic /dev/null yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic $$(leapseconds) yearistype'		    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo 'endif'							    ;\
--	 echo 'zonenames := $$(zonenames) $$($*-zones)'			    ;\
--	) > $@.new
--	mv $@.new $@
--
--.PHONY: echo-zonenames
--echo-zonenames:
--	@echo 'Known zones: $(zonenames)'
--
--
--# We have to use `-d $(inst_zonedir)' to explictly tell zic where to
--# place the output files although $(zonedir) is compiled in.  But the
--# user might have set $(install_root) on the command line of `make install'.
--zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
--tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
--	    -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
--
--# The source files specify the zone names relative to the -d directory,
--# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix
--# and the like.  This magic extracts /posix or /right if it's the first
--# component after $(inst_zonedir) in the target name $@.
--target-zone-flavor = $(filter /posix /right, \
--			      /$(firstword $(subst /, , \
--					  $(patsubst $(inst_zonedir)/%,%,$@))))
--
--ifdef localtime
--$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \
--			     $(+force)
--	$(make-target-directory)
--	if test -r $@; then \
--	  echo Site timezone NOT reset to Factory.; \
--	else \
--	  rm -f $@T; \
--	  $(SHELL) $(..)scripts/rellns-sh $< $@T; \
--	  mv -f $@T $@; \
--	fi
--endif
--ifdef posixrules
--$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \
--			      $(+force)
--	$(zic-cmd) -p $(posixrules)
--endif
--
--
- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
- 
- tz-cflags = -DTZDIR='"$(zonedir)"' \
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch b/multilib-testing/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch
deleted file mode 100644
index c41acc169..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
-index 70f9ee2..6e2ce35 100644
---- a/sysdeps/i386/fpu/feupdateenv.c
-+++ b/sysdeps/i386/fpu/feupdateenv.c
-@@ -1,5 +1,5 @@
- /* Install given floating-point environment and raise exceptions.
--   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
-+   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
- 
-@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
-   /* Raise the saved exception.  Incidently for us the implementation
-      defined format of the values in objects of type fexcept_t is the
-      same as the ones specified using the FE_* constants.  */
--  feraiseexcept ((int) temp);
-+  __feraiseexcept ((int) temp);
- 
-   /* Success.  */
-   return 0;
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-fix-res_query-assert.patch b/multilib-testing/lib32-glibc/glibc-2.15-fix-res_query-assert.patch
deleted file mode 100644
index a894da9c7..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-fix-res_query-assert.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/resolv/res_query.c	
-+++ a/resolv/res_query.c	
-@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
- 		  int *resplen2)
- {
- 	HEADER *hp = (HEADER *) answer;
-+	HEADER *hp2;
- 	int n, use_malloc = 0;
- 	u_int oflags = statp->_flags;
- 
-@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
- 	  /* __libc_res_nsend might have reallocated the buffer.  */
- 	  hp = (HEADER *) *answerp;
- 
--	/* We simplify the following tests by assigning HP to HP2.  It
--	   is easy to verify that this is the same as ignoring all
--	   tests of HP2.  */
--	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
--
--	if (n < (int) sizeof (HEADER) && answerp2 != NULL
--	    && *resplen2 > (int) sizeof (HEADER))
-+	/* We simplify the following tests by assigning HP to HP2 or
-+	   vice versa.  It is easy to verify that this is the same as
-+	   ignoring all tests of HP or HP2.  */
-+	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp = hp2;
-+	    hp2 = hp;
- 	  }
--	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
--		 && n > (int) sizeof (HEADER))
-+	else
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp2 = hp;
-+	    hp2 = (HEADER *) *answerp2;
-+	    if (n < (int) sizeof (HEADER))
-+	      {
-+	        hp = hp2;
-+	      }
- 	  }
- 
-+	/* Make sure both hp and hp2 are defined */
-+	assert((hp != NULL) && (hp2 != NULL));
-+
- 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
- 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
- #ifdef DEBUG
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-fmtmsg-locking.patch b/multilib-testing/lib32-glibc/glibc-2.15-fmtmsg-locking.patch
deleted file mode 100644
index f5976abd9..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-fmtmsg-locking.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
-index 9203317..4c02302 100644
---- a/stdlib/fmtmsg.c
-+++ b/stdlib/fmtmsg.c
-@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	const char *text, const char *action, const char *tag)
- {
-   __libc_once_define (static, once);
--  int result = MM_OK;
-   struct severity_info *severity_rec;
- 
-   /* Make sure everything is initialized.  */
-@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	return MM_NOTOK;
-     }
- 
--  for (severity_rec = severity_list; severity_rec != NULL;
--       severity_rec = severity_rec->next)
--    if (severity == severity_rec->severity)
--      /* Bingo.  */
--      break;
--
--  /* If we don't know anything about the severity level return an error.  */
--  if (severity_rec == NULL)
--    return MM_NOTOK;
--
--
- #ifdef __libc_ptf_call
-   /* We do not want this call to be cut short by a thread
-      cancellation.  Therefore disable cancellation for now.  */
-@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
- 		   0);
- #endif
- 
--  /* Now we can print.  */
--  if (classification & MM_PRINT)
--    {
--      int do_label = (print & label_mask) && label != MM_NULLLBL;
--      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
--      int do_text = (print & text_mask) && text != MM_NULLTXT;
--      int do_action = (print & action_mask) && action != MM_NULLACT;
--      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
--
--      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
--		      do_label ? label : "",
--		      do_label && (do_severity | do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_severity ? severity_rec->string : "",
--		      do_severity && (do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_text ? text : "",
--		      do_text && (do_action | do_tag) ? "\n" : "",
--		      do_action ? "TO FIX: " : "",
--		      do_action ? action : "",
--		      do_action && do_tag ? "  " : "",
--		      do_tag ? tag : "") < 0)
--	/* Oh, oh.  An error occurred during the output.  */
--	result = MM_NOMSG;
--    }
-+  __libc_lock_lock (lock);
- 
--  if (classification & MM_CONSOLE)
-+  for (severity_rec = severity_list; severity_rec != NULL;
-+       severity_rec = severity_rec->next)
-+    if (severity == severity_rec->severity)
-+      /* Bingo.  */
-+      break;
-+
-+  /* If we don't know anything about the severity level return an error.  */
-+  int result = MM_NOTOK;
-+  if (severity_rec != NULL)
-     {
--      int do_label = label != MM_NULLLBL;
--      int do_severity = severity != MM_NULLSEV;
--      int do_text = text != MM_NULLTXT;
--      int do_action = action != MM_NULLACT;
--      int do_tag = tag != MM_NULLTAG;
--
--      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
--	      do_label ? label : "",
--	      do_label && (do_severity | do_text | do_action | do_tag)
--	      ? ": " : "",
--	      do_severity ? severity_rec->string : "",
--	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
--	      do_text ? text : "",
--	      do_text && (do_action | do_tag) ? "\n" : "",
--	      do_action ? "TO FIX: " : "",
--	      do_action ? action : "",
--	      do_action && do_tag ? "  " : "",
--	      do_tag ? tag : "");
-+      result = MM_OK;
-+
-+      /* Now we can print.  */
-+      if (classification & MM_PRINT)
-+	{
-+	  int do_label = (print & label_mask) && label != MM_NULLLBL;
-+	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
-+	  int do_text = (print & text_mask) && text != MM_NULLTXT;
-+	  int do_action = (print & action_mask) && action != MM_NULLACT;
-+	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
-+			  do_label ? label : "",
-+			  need_colon ? ": " : "",
-+			  do_severity ? severity_rec->string : "",
-+			  do_severity && (do_text | do_action | do_tag)
-+			  ? ": " : "",
-+			  do_text ? text : "",
-+			  do_text && (do_action | do_tag) ? "\n" : "",
-+			  do_action ? "TO FIX: " : "",
-+			  do_action ? action : "",
-+			  do_action && do_tag ? "  " : "",
-+			  do_tag ? tag : "") < 0)
-+	    /* Oh, oh.  An error occurred during the output.  */
-+	    result = MM_NOMSG;
-+	}
-+
-+      if (classification & MM_CONSOLE)
-+	{
-+	  int do_label = label != MM_NULLLBL;
-+	  int do_severity = severity != MM_NULLSEV;
-+	  int do_text = text != MM_NULLTXT;
-+	  int do_action = action != MM_NULLACT;
-+	  int do_tag = tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
-+		  do_label ? label : "",
-+		  need_colon ? ": " : "",
-+		  do_severity ? severity_rec->string : "",
-+		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
-+		  do_text ? text : "",
-+		  do_text && (do_action | do_tag) ? "\n" : "",
-+		  do_action ? "TO FIX: " : "",
-+		  do_action ? action : "",
-+		  do_action && do_tag ? "  " : "",
-+		  do_tag ? tag : "");
-+	}
-     }
- 
-+  __libc_lock_unlock (lock);
-+
- #ifdef __libc_ptf_call
-   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
- #endif
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-gb18030.patch.gz b/multilib-testing/lib32-glibc/glibc-2.15-gb18030.patch.gz
deleted file mode 100644
index dde59c056..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-gb18030.patch.gz
+++ /dev/null
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-ifunc.patch b/multilib-testing/lib32-glibc/glibc-2.15-ifunc.patch
deleted file mode 100644
index 115afa02a..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-ifunc.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff --git a/Makeconfig b/Makeconfig
-index 2db2821..68547b2 100644
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -900,6 +900,12 @@ else
- libdl = $(common-objpfx)dlfcn/libdl.a
- endif
- 
-+ifeq ($(build-shared),yes)
-+libm = $(common-objpfx)math/libm.so$(libm.so-version)
-+else
-+libm = $(common-objpfx)math/libm.a
-+endif
-+
- # These are the subdirectories containing the library source.  The order
- # is more or less arbitrary.  The sorting step will take care of the
- # dependencies.
-diff --git a/elf/Makefile b/elf/Makefile
-index 052e763..3f1772a 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -124,7 +124,8 @@ distribute	:= rtld-Rules \
- 		   tst-initordera1.c tst-initordera2.c tst-initorderb1.c \
- 		   tst-initorderb2.c tst-initordera3.c tst-initordera4.c \
- 		   tst-initorder.c \
--		   tst-initorder2.c
-+		   tst-initorder2.c \
-+		   tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c
- 
- CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
- CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
-@@ -227,7 +228,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- 	 tst-audit1 tst-audit2 \
- 	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
--	 tst-initorder tst-initorder2
-+	 tst-initorder tst-initorder2 tst-relsort1
- #	 reldep9
- test-srcs = tst-pathopt
- selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
-@@ -290,7 +291,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
- 		tst-initordera1 tst-initorderb1 \
- 		tst-initordera2 tst-initorderb2 \
- 		tst-initordera3 tst-initordera4 \
--		tst-initorder2a tst-initorder2b tst-initorder2c tst-initorder2d
-+		tst-initorder2a tst-initorder2b tst-initorder2c \
-+		tst-initorder2d \
-+		tst-relsort1mod1 tst-relsort1mod2
- ifeq (yes,$(have-initfini-array))
- modules-names += tst-array2dep tst-array5dep
- endif
-@@ -1195,3 +1198,9 @@ CFLAGS-tst-auditmod6b.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod6c.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod7b.c += $(AVX-CFLAGS)
- endif
-+
-+$(objpfx)tst-relsort1: $(libdl)
-+$(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
-+$(objpfx)tst-relsort1mod2.so: $(libm)
-+$(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
-+			   $(objpfx)tst-relsort1mod2.so
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index a0b5c50..a56bdc1 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -1,5 +1,5 @@
- /* Load a shared object at runtime, relocate it, and run its initializer.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 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
-@@ -302,45 +302,109 @@ dl_open_worker (void *a)
-   if (GLRO(dl_lazy))
-     reloc_mode |= mode & RTLD_LAZY;
- 
--  /* Relocate the objects loaded.  We do this in reverse order so that copy
--     relocs of earlier objects overwrite the data written by later objects.  */
--
-+  /* Sort the objects by dependency for the relocation process.  This
-+     allows IFUNC relocations to work and it also means copy
-+     relocation of dependencies are if necessary overwritten.  */
-+  size_t nmaps = 0;
-   struct link_map *l = new;
--  while (l->l_next)
--    l = l->l_next;
--  while (1)
-+  do
-+    {
-+      if (! l->l_real->l_relocated)
-+	++nmaps;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  struct link_map *maps[nmaps];
-+  nmaps = 0;
-+  l = new;
-+  do
-     {
-       if (! l->l_real->l_relocated)
-+	maps[nmaps++] = l;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  if (nmaps > 1)
-+    {
-+      char seen[nmaps];
-+      memset (seen, '\0', nmaps);
-+      size_t i = 0;
-+      while (1)
- 	{
--#ifdef SHARED
--	  if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	  ++seen[i];
-+	  struct link_map *thisp = maps[i];
-+
-+	  /* Find the last object in the list for which the current one is
-+	     a dependency and move the current object behind the object
-+	     with the dependency.  */
-+	  size_t k = nmaps - 1;
-+	  while (k > i)
- 	    {
--	      /* If this here is the shared object which we want to profile
--		 make sure the profile is started.  We can find out whether
--		 this is necessary or not by observing the `_dl_profile_map'
--		 variable.  If was NULL but is not NULL afterwars we must
--		 start the profiling.  */
--	      struct link_map *old_profile_map = GL(dl_profile_map);
-+	      struct link_map **runp = maps[k]->l_initfini;
-+	      if (runp != NULL)
-+		/* Look through the dependencies of the object.  */
-+		while (*runp != NULL)
-+		  if (__builtin_expect (*runp++ == thisp, 0))
-+		    {
-+		      /* Move the current object to the back past the last
-+			 object with it as the dependency.  */
-+		      memmove (&maps[i], &maps[i + 1],
-+			       (k - i) * sizeof (maps[0]));
-+		      maps[k] = thisp;
-+
-+		      if (seen[i + 1] > 1)
-+			{
-+			  ++i;
-+			  goto next_clear;
-+			}
-+
-+		      char this_seen = seen[i];
-+		      memmove (&seen[i], &seen[i + 1],
-+			       (k - i) * sizeof (seen[0]));
-+		      seen[k] = this_seen;
-+
-+		      goto next;
-+		    }
-+
-+	      --k;
-+	    }
- 
--	      _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+	  if (++i == nmaps)
-+	    break;
-+	next_clear:
-+	  memset (&seen[i], 0, (nmaps - i) * sizeof (seen[0]));
-+	next:;
-+	}
-+    }
- 
--	      if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
--		{
--		  /* We must prepare the profiling.  */
--		  _dl_start_profile ();
-+  for (size_t i = nmaps; i-- > 0; )
-+    {
-+      l = maps[i];
- 
--		  /* Prevent unloading the object.  */
--		  GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
--		}
-+#ifdef SHARED
-+      if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	{
-+	  /* If this here is the shared object which we want to profile
-+	     make sure the profile is started.  We can find out whether
-+	     this is necessary or not by observing the `_dl_profile_map'
-+	     variable.  If it was NULL but is not NULL afterwars we must
-+	     start the profiling.  */
-+	  struct link_map *old_profile_map = GL(dl_profile_map);
-+
-+	  _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+
-+	  if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
-+	    {
-+	      /* We must prepare the profiling.  */
-+	      _dl_start_profile ();
-+
-+	      /* Prevent unloading the object.  */
-+	      GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
- 	    }
--	  else
--#endif
--	    _dl_relocate_object (l, l->l_scope, reloc_mode, 0);
- 	}
--
--      if (l == new)
--	break;
--      l = l->l_prev;
-+      else
-+#endif
-+	_dl_relocate_object (l, l->l_scope, reloc_mode, 0);
-     }
- 
-   /* If the file is not loaded now as a dependency, add the search
-diff --git a/elf/tst-relsort1.c b/elf/tst-relsort1.c
-new file mode 100644
-index 0000000..972100c
---- /dev/null
-+++ b/elf/tst-relsort1.c
-@@ -0,0 +1,19 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+
-+
-+static int
-+do_test ()
-+{
-+  const char lib[] = "$ORIGIN/tst-relsort1mod1.so";
-+  void *h = dlopen (lib, RTLD_NOW);
-+  if (h == NULL)
-+    {
-+      puts (dlerror ());
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/elf/tst-relsort1mod1.c b/elf/tst-relsort1mod1.c
-new file mode 100644
-index 0000000..9e4a943
---- /dev/null
-+++ b/elf/tst-relsort1mod1.c
-@@ -0,0 +1,7 @@
-+extern int foo (double);
-+
-+int
-+bar (void)
-+{
-+  return foo (1.2);
-+}
-diff --git a/elf/tst-relsort1mod2.c b/elf/tst-relsort1mod2.c
-new file mode 100644
-index 0000000..a2c3e55
---- /dev/null
-+++ b/elf/tst-relsort1mod2.c
-@@ -0,0 +1,7 @@
-+#include <math.h>
-+
-+int
-+foo (double d)
-+{
-+  return floor (d) != 0.0;
-+}
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-multiarch-x86-strcmp.patch b/multilib-testing/lib32-glibc/glibc-2.15-multiarch-x86-strcmp.patch
deleted file mode 100644
index 38c9e617f..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-multiarch-x86-strcmp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-index d10e872..d4fcd2b 100644
---- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strcasecmp.c>
- 
-+strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
-index 5410d17..b3b9eb8 100644
---- a/sysdeps/i386/i686/multiarch/strcmp.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp.S
-@@ -111,6 +111,7 @@ END(STRCMP)
- # endif
- #endif
- 
--#ifndef USE_AS_STRNCMP
-+#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
-+    && !defined USE_AS_STRNCASECMP_L
- # include "../strcmp.S"
- #endif
-diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-index 0c68b8d..7e601af 100644
---- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strncase.c>
- 
-+strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch b/multilib-testing/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch
deleted file mode 100644
index b2bb9caac..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index c8186c8..1016753 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -4632,6 +4632,29 @@ nearbyint_test (void)
-   TEST_f_f (nearbyint, 524286.75, 524287.0);
-   TEST_f_f (nearbyint, 524288.75, 524289.0);
- 
-+  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
-+  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
-+  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
-+  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
-+  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
-+  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
-+  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
-+  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
-+  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
-+  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
-+#endif
-+
-   END (nearbyint);
- }
- 
-diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-index 04ef9ab..a6d602b 100644
---- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
-+++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-@@ -30,18 +30,12 @@ __nearbyintf(float x)
- {
- 	fenv_t env;
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		libc_feholdexceptf (&env);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
-@@ -49,17 +43,11 @@ __nearbyintf(float x)
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	libc_feholdexceptf (&env);
- 	w = TWO23[sx]+x;
- 	t = w-TWO23[sx];
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch b/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch
deleted file mode 100644
index c09e79a17..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/nscd/aicache.c b/nscd/aicache.c
-index aaaf80d..e1f1244 100644
---- a/nscd/aicache.c
-+++ b/nscd/aicache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -514,8 +514,9 @@ next_nip:
-       if (fd != -1)
- 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
- 
--      /* If we cannot permanently store the result, so be it.  */
--      if (__builtin_expect (db->negtimeout == 0, 0))
-+      /* If we have a transient error or cannot permanently store the
-+	 result, so be it.  */
-+      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	{
- 	  /* Mark the old entry as obsolete.  */
- 	  if (dh != NULL)
-diff --git a/nscd/grpcache.c b/nscd/grpcache.c
-index e9607c6..a698f36 100644
---- a/nscd/grpcache.c
-+++ b/nscd/grpcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for group lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
- 	  else
- 	    written = total;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (db->negtimeout == 0)
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/hstcache.c b/nscd/hstcache.c
-index 4d68ade..c72feaa 100644
---- a/nscd/hstcache.c
-+++ b/nscd/hstcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
- 					MSG_NOSIGNAL)) != total)
- 	    all_written = false;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
-index 4ac9942..2019991 100644
---- a/nscd/initgrcache.c
-+++ b/nscd/initgrcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
-index 49e130c..e2ba09d 100644
---- a/nscd/pwdcache.c
-+++ b/nscd/pwdcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for passwd lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/servicescache.c b/nscd/servicescache.c
-index d3d5dce..a6337e3 100644
---- a/nscd/servicescache.c
-+++ b/nscd/servicescache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for services lookup.
--   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
- 
-@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch b/multilib-testing/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch
deleted file mode 100644
index 874f8b4cb..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch
+++ /dev/null
@@ -1,886 +0,0 @@
-diff --git a/math/w_acos.c b/math/w_acos.c
-index 3138408..0490933 100644
---- a/math/w_acos.c
-+++ b/math/w_acos.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __acos (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosf.c b/math/w_acosf.c
-index 0e41a2c..2500a7d 100644
---- a/math/w_acosf.c
-+++ b/math/w_acosf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __acosf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosh.c b/math/w_acosh.c
-index 0bd2686..d632987 100644
---- a/math/w_acosh.c
-+++ b/math/w_acosh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __acosh (double x)
- {
--  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 29);
- 
-diff --git a/math/w_acoshf.c b/math/w_acoshf.c
-index c59bf94..f77df2b 100644
---- a/math/w_acoshf.c
-+++ b/math/w_acoshf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __acoshf (float x)
- {
--  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard_f (x, x, 129);
- 
-diff --git a/math/w_acoshl.c b/math/w_acoshl.c
-index 819bdfc..cc823b8 100644
---- a/math/w_acoshl.c
-+++ b/math/w_acoshl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __acoshl (long double x)
- {
--  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 229);
- 
-diff --git a/math/w_acosl.c b/math/w_acosl.c
-index 6417068..05023b4 100644
---- a/math/w_acosl.c
-+++ b/math/w_acosl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __acosl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asin.c b/math/w_asin.c
-index d4e89ce..0fa9487 100644
---- a/math/w_asin.c
-+++ b/math/w_asin.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __asin (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinf.c b/math/w_asinf.c
-index 270961f..c28edab 100644
---- a/math/w_asinf.c
-+++ b/math/w_asinf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __asinf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinl.c b/math/w_asinl.c
-index 32e5273..e4036d8 100644
---- a/math/w_asinl.c
-+++ b/math/w_asinl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __asinl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_atanh.c b/math/w_atanh.c
-index 1022bd5..190d2e9 100644
---- a/math/w_atanh.c
-+++ b/math/w_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- double
- __atanh (double x)
- {
--  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabs (x) > 1.0
- 			      ? 30		/* atanh(|x|>1) */
-diff --git a/math/w_atanhf.c b/math/w_atanhf.c
-index 3c8cf83..e0c5dc3 100644
---- a/math/w_atanhf.c
-+++ b/math/w_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- float
- __atanhf (float x)
- {
--  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x,
- 				fabsf (x) > 1.0f
- 				? 130		/* atanh(|x|>1) */
-diff --git a/math/w_atanhl.c b/math/w_atanhl.c
-index f582acf..319535d 100644
---- a/math/w_atanhl.c
-+++ b/math/w_atanhl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- long double
- __atanhl (long double x)
- {
--  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabsl (x) > 1.0L
- 			      ? 230		/* atanh(|x|>1) */
-diff --git a/math/w_exp2.c b/math/w_exp2.c
-index bf22326..7a3b0af 100644
---- a/math/w_exp2.c
-+++ b/math/w_exp2.c
-@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
- double
- __exp2 (double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finite (x))
-     /* exp2 overflow: 44, exp2 underflow: 45 */
-     return __kernel_standard (x, x, 44 + (x <= o_threshold));
-diff --git a/math/w_exp2f.c b/math/w_exp2f.c
-index 7215fca..c4e9e94 100644
---- a/math/w_exp2f.c
-+++ b/math/w_exp2f.c
-@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
- float
- __exp2f (float x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitef (x))
-     /* exp2 overflow: 144, exp2 underflow: 145 */
-     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
-diff --git a/math/w_exp2l.c b/math/w_exp2l.c
-index ac8d231..442a637 100644
---- a/math/w_exp2l.c
-+++ b/math/w_exp2l.c
-@@ -13,7 +13,8 @@ static const long double u_threshold
- long double
- __exp2l (long double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitel (x))
-     /* exp2 overflow: 244, exp2 underflow: 245 */
-     return __kernel_standard (x, x, 244 + (x <= o_threshold));
-diff --git a/math/w_j0.c b/math/w_j0.c
-index 1dff8b4..f8d3724 100644
---- a/math/w_j0.c
-+++ b/math/w_j0.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j0 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 34);
- 
-@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
- double
- y0 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j0f.c b/math/w_j0f.c
-index fc52f26..cef36aa 100644
---- a/math/w_j0f.c
-+++ b/math/w_j0f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- j0f (float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 134);
-@@ -38,7 +38,8 @@ j0f (float x)
- float
- y0f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+                        || isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j0l.c b/math/w_j0l.c
-index 8d72d50..144f33c 100644
---- a/math/w_j0l.c
-+++ b/math/w_j0l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j0l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 234);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
- long double
- __y0l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_j1.c b/math/w_j1.c
-index 358e0e1..e9a5357 100644
---- a/math/w_j1.c
-+++ b/math/w_j1.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j1 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 36);
- 
-@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
- double
- y1 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j1f.c b/math/w_j1f.c
-index 096fdf5..29bd949 100644
---- a/math/w_j1f.c
-+++ b/math/w_j1f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- j1f (float x)
- {
--  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 136);
- 
-@@ -37,7 +38,8 @@ j1f (float x)
- float
- y1f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j1l.c b/math/w_j1l.c
-index 93e4ee4..01b8551 100644
---- a/math/w_j1l.c
-+++ b/math/w_j1l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j1l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 236);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
- long double
- __y1l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_jn.c b/math/w_jn.c
-index f0dd8c6..fd3fb16 100644
---- a/math/w_jn.c
-+++ b/math/w_jn.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- jn (int n, double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard (n, x, 38);
- 
-@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
- double
- yn (int n, double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_jnf.c b/math/w_jnf.c
-index ef29eb4..36d6f6d 100644
---- a/math/w_jnf.c
-+++ b/math/w_jnf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- jnf (int n, float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard_f (n, x, 138);
-@@ -38,7 +38,8 @@ jnf (int n, float x)
- float
- ynf (int n, float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_log.c b/math/w_log.c
-index efc1c4c..ec33605 100644
---- a/math/w_log.c
-+++ b/math/w_log.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10.c b/math/w_log10.c
-index 2717ade..fe799ad 100644
---- a/math/w_log10.c
-+++ b/math/w_log10.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log10 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10f.c b/math/w_log10f.c
-index 60737ca..4b821f7 100644
---- a/math/w_log10f.c
-+++ b/math/w_log10f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log10f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_log10l.c b/math/w_log10l.c
-index b26f18c..0e5a137 100644
---- a/math/w_log10l.c
-+++ b/math/w_log10l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log10l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_log2.c b/math/w_log2.c
-index 998e5d9..e58e109 100644
---- a/math/w_log2.c
-+++ b/math/w_log2.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log2 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2f.c b/math/w_log2f.c
-index 6d91bf4..6963ed2 100644
---- a/math/w_log2f.c
-+++ b/math/w_log2f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log2f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2l.c b/math/w_log2l.c
-index e51c1bc..eed04ff6c 100644
---- a/math/w_log2l.c
-+++ b/math/w_log2l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log2l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_logf.c b/math/w_logf.c
-index 8aa27c8..38d408f 100644
---- a/math/w_logf.c
-+++ b/math/w_logf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __logf (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_logl.c b/math/w_logl.c
-index a3139ff..593b37d 100644
---- a/math/w_logl.c
-+++ b/math/w_logl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __logl (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_sqrt.c b/math/w_sqrt.c
-index 409a6df..f6ba542 100644
---- a/math/w_sqrt.c
-+++ b/math/w_sqrt.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __sqrt (double x)
- {
--  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 26); /* sqrt(negative) */
- 
-   return __ieee754_sqrt (x);
-diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
-index 3c3d2f8..c128e9b 100644
---- a/math/w_sqrtf.c
-+++ b/math/w_sqrtf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __sqrtf (float x)
- {
--  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
- 
-   return __ieee754_sqrtf (x);
-diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
-index 5e18f44..2a4a048 100644
---- a/math/w_sqrtl.c
-+++ b/math/w_sqrtl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __sqrtl (long double x)
- {
--  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 226); /* sqrt(negative) */
- 
-   return __ieee754_sqrtl (x);
-diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
-index 9fc21ab..5f471b1 100644
---- a/sysdeps/ieee754/dbl-64/e_atanh.c
-+++ b/sysdeps/ieee754/dbl-64/e_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
- {
-   double xa = fabs (x);
-   double t;
--  if (xa < 0.5)
-+  if (isless (xa, 0.5))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
-       t = xa + xa;
-       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
-     }
--  else if (__builtin_expect (xa < 1.0, 1))
-+  else if (__builtin_expect (isless (xa, 1.0), 1))
-     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
-   else
-     {
--      if (xa > 1.0)
-+      if (isgreater (xa, 1.0))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0;
-diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
-index ee42587..b584ed8 100644
---- a/sysdeps/ieee754/dbl-64/w_exp.c
-+++ b/sysdeps/ieee754/dbl-64/w_exp.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
- double
- __exp (double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 6);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 7);
-diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
-index 75ed691..7af2f6c 100644
---- a/sysdeps/ieee754/flt-32/e_atanhf.c
-+++ b/sysdeps/ieee754/flt-32/e_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
- {
-   float xa = fabsf (x);
-   float t;
--  if (xa < 0.5f)
-+  if (isless (xa, 0.5f))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28f, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
-       t = xa + xa;
-       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
-     }
--  else if (__builtin_expect (xa < 1.0f, 1))
-+  else if (__builtin_expect (isless (xa, 1.0f), 1))
-     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
-   else
-     {
--      if (xa > 1.0f)
-+      if (isgreater (xa, 1.0f))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0f;
-diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
-index 5500872..bc3b2f6 100644
---- a/sysdeps/ieee754/flt-32/w_expf.c
-+++ b/sysdeps/ieee754/flt-32/w_expf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
- float
- __expf (float x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 106);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 107);
-diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
-index ec9d8a7..d61c0a3 100644
---- a/sysdeps/ieee754/ldbl-96/w_expl.c
-+++ b/sysdeps/ieee754/ldbl-96/w_expl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
- long double
- __expl (long double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 206);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 207);
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 d8894723a..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,226 +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 <stap-probe.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
--	LP_OP(cmp) $-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
--	LP_OP(cmp) $-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
--	mov	dep_mutex(%rdi), %R8_LP
--	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:
- 
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-revert-netlink-cache.patch b/multilib-testing/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
deleted file mode 100644
index 87d04c794..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
+++ /dev/null
@@ -1,680 +0,0 @@
-diff --git a/include/ifaddrs.h b/include/ifaddrs.h
-index e1c6cac..50e4c48 100644
---- a/include/ifaddrs.h
-+++ b/include/ifaddrs.h
-@@ -21,13 +21,8 @@ struct in6addrinfo
- extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 			struct in6addrinfo **in6ai, size_t *in6ailen)
-   attribute_hidden;
--extern void __free_in6ai (struct in6addrinfo *in6ai) attribute_hidden;
- extern void __check_native (uint32_t a1_index, int *a1_native,
- 			    uint32_t a2_index, int *a2_native)
-   attribute_hidden;
- 
--#ifdef IS_IN_nscd
--extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
--#endif
--
- #endif	/* ifaddrs.h */
-diff --git a/inet/check_pf.c b/inet/check_pf.c
-index 0fa34cc..b015432 100644
---- a/inet/check_pf.c
-+++ b/inet/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Generic version.
--   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006 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
-@@ -54,19 +54,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   (void) freeifaddrs (ifa);
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *in6ai)
--{
--  /* Nothing to do.  */
--}
--
--
--#ifdef IS_IN_nscd
--uint32_t
--__bump_nl_timestamp (void)
--{
--  return 0;
--}
--#endif
-diff --git a/nscd/connections.c b/nscd/connections.c
-index c741996..2b5c7ef 100644
---- a/nscd/connections.c
-+++ b/nscd/connections.c
-@@ -24,7 +24,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <grp.h>
--#include <ifaddrs.h>
- #include <libintl.h>
- #include <pthread.h>
- #include <pwd.h>
-@@ -33,10 +32,6 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <arpa/inet.h>
--#ifdef HAVE_NETLINK
--# include <linux/netlink.h>
--# include <linux/rtnetlink.h>
--#endif
- #ifdef HAVE_EPOLL
- # include <sys/epoll.h>
- #endif
-@@ -252,11 +247,6 @@ static int sock;
- int inotify_fd = -1;
- #endif
- 
--#ifdef HAVE_NETLINK
--/* Descriptor for netlink status updates.  */
--static int nl_status_fd = -1;
--#endif
--
- #ifndef __ASSUME_SOCK_CLOEXEC
- /* Negative if SOCK_CLOEXEC is not supported, positive if it is, zero
-    before be know the result.  */
-@@ -913,65 +903,6 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
-       exit (1);
-     }
- 
--#ifdef HAVE_NETLINK
--  if (dbs[hstdb].enabled)
--    {
--      /* Try to open netlink socket to monitor network setting changes.  */
--      nl_status_fd = socket (AF_NETLINK,
--			     SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK,
--			     NETLINK_ROUTE);
--      if (nl_status_fd != -1)
--	{
--	  struct sockaddr_nl snl;
--	  memset (&snl, '\0', sizeof (snl));
--	  snl.nl_family = AF_NETLINK;
--	  /* XXX Is this the best set to use?  */
--	  snl.nl_groups = (RTMGRP_IPV4_IFADDR | RTMGRP_TC | RTMGRP_IPV4_MROUTE
--			   | RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_RULE
--			   | RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_MROUTE
--			   | RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFINFO
--			   | RTMGRP_IPV6_PREFIX);
--
--	  if (bind (nl_status_fd, (struct sockaddr *) &snl, sizeof (snl)) != 0)
--	    {
--	      close (nl_status_fd);
--	      nl_status_fd = -1;
--	    }
--	  else
--	    {
--	      /* Start the timestamp process.  */
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--
--# ifndef __ASSUME_SOCK_CLOEXEC
--	      if (have_sock_cloexec < 0)
--		{
--		  /* We don't want to get stuck on accept.  */
--		  int fl = fcntl (nl_status_fd, F_GETFL);
--		  if (fl == -1
--		      || fcntl (nl_status_fd, F_SETFL, fl | O_NONBLOCK) == -1)
--		    {
--		      dbg_log (_("\
--cannot change socket to nonblocking mode: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--
--		  /* The descriptor needs to be closed on exec.  */
--		  if (paranoia
--		      && fcntl (nl_status_fd, F_SETFD, FD_CLOEXEC) == -1)
--		    {
--		      dbg_log (_("cannot set socket to close on exec: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--		}
--# endif
--	    }
--	}
--    }
--#endif
--
-   /* Change to unprivileged uid/gid/groups if specified in config file */
-   if (server_user != NULL)
-     finish_drop_privileges ();
-@@ -1895,18 +1826,6 @@ main_loop_poll (void)
-     }
- #endif
- 
--#ifdef HAVE_NETLINK
--  size_t idx_nl_status_fd = 0;
--  if (nl_status_fd != -1)
--    {
--      idx_nl_status_fd = nused;
--      conns[nused].fd = nl_status_fd;
--      conns[nused].events = POLLRDNORM;
--      ++nused;
--      firstfree = nused;
--    }
--#endif
--
-   while (1)
-     {
-       /* Wait for any event.  We wait at most a couple of seconds so
-@@ -2049,20 +1968,6 @@ disabled inotify after read error %d"),
- 	    }
- #endif
- 
--#ifdef HAVE_NETLINK
--	  if (idx_nl_status_fd != 0 && conns[idx_nl_status_fd].revents != 0)
--	    {
--	      char buf[4096];
--	      /* Read all the data.  We do not interpret it here.  */
--	      while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					       sizeof (buf))) != -1)
--		;
--
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--	    }
--#endif
--
- 	  for (size_t cnt = first; cnt < nused && n > 0; ++cnt)
- 	    if (conns[cnt].revents != 0)
- 	      {
-@@ -2141,17 +2046,6 @@ main_loop_epoll (int efd)
-     }
- # endif
- 
--# ifdef HAVE_NETLINK
--  if (nl_status_fd != -1)
--    {
--      ev.events = EPOLLRDNORM;
--      ev.data.fd = nl_status_fd;
--      if (epoll_ctl (efd, EPOLL_CTL_ADD, nl_status_fd, &ev) == -1)
--	/* We cannot use epoll.  */
--	return;
--    }
--# endif
--
-   while (1)
-     {
-       struct epoll_event revs[100];
-@@ -2268,18 +2162,6 @@ main_loop_epoll (int efd)
- 		}
- 	  }
- # endif
--# ifdef HAVE_NETLINK
--	else if (revs[cnt].data.fd == nl_status_fd)
--	  {
--	    char buf[4096];
--	    /* Read all the data.  We do not interpret it here.  */
--	    while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					     sizeof (buf))) != -1)
--	      ;
--
--	    __bump_nl_timestamp ();
--	  }
--# endif
- 	else
- 	  {
- 	    /* Remove the descriptor from the epoll descriptor.  */
-@@ -2303,7 +2185,6 @@ main_loop_epoll (int efd)
-       time_t laststart = now - ACCEPT_TIMEOUT;
-       assert (starttime[sock] == 0);
-       assert (inotify_fd == -1 || starttime[inotify_fd] == 0);
--      assert (nl_status_fd == -1 || starttime[nl_status_fd] == 0);
-       for (int cnt = highest; cnt > STDERR_FILENO; --cnt)
- 	if (starttime[cnt] != 0 && starttime[cnt] < laststart)
- 	  {
-diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
-index b5cd2d2..caad26a 100644
---- a/nscd/nscd-client.h
-+++ b/nscd/nscd-client.h
-@@ -260,17 +260,12 @@ struct hashentry
- 
- 
- /* Current persistent database version.  */
--#define DB_VERSION	2
-+#define DB_VERSION	1
- 
- /* Maximum time allowed between updates of the timestamp.  */
- #define MAPPING_TIMEOUT (5 * 60)
- 
- 
--/* Used indices for the EXTRA_DATA element of 'database_pers_head'.
--   Each database has its own indices.  */
--#define NSCD_HST_IDX_CONF_TIMESTAMP	0
--
--
- /* Header of persistent database file.  */
- struct database_pers_head
- {
-@@ -279,8 +274,6 @@ struct database_pers_head
-   volatile int32_t gc_cycle;
-   volatile int32_t nscd_certainly_running;
-   volatile nscd_time_t timestamp;
--  /* Room for extensions.  */
--  volatile uint32_t extra_data[4];
- 
-   nscd_ssize_t module;
-   nscd_ssize_t data_size;
-@@ -329,12 +322,6 @@ extern int __nscd_open_socket (const char *key, size_t keylen,
- 			       request_type type, void *response,
- 			       size_t responselen) attribute_hidden;
- 
--/* Try to get a file descriptor for the shared meory segment
--   containing the database.  */
--extern struct mapped_database *__nscd_get_mapping (request_type type,
--						   const char *key,
--						   struct mapped_database **mappedp) attribute_hidden;
--
- /* Get reference of mapping.  */
- extern struct mapped_database *__nscd_get_map_ref (request_type type,
- 						   const char *name,
-@@ -384,7 +371,4 @@ extern ssize_t writeall (int fd, const void *buf, size_t len)
- extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len)
-   attribute_hidden;
- 
--/* Get netlink timestamp counter from mapped area or zero.  */
--extern uint32_t __nscd_get_nl_timestamp (void);
--
- #endif /* nscd.h */
-diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
-index 6ee142d..70631fa 100644
---- a/nscd/nscd_gethst_r.c
-+++ b/nscd/nscd_gethst_r.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009, 2011
-+/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-@@ -98,27 +98,6 @@ libc_freeres_fn (hst_map_free)
- }
- 
- 
--uint32_t
--__nscd_get_nl_timestamp (void)
--{
--  if (__nss_not_use_nscd_hosts != 0)
--    return 0;
--
--  struct mapped_database *map = __hst_map_handle.mapped;
--
--  if (map == NULL
--      || (map != NO_MAPPING
--	  && map->head->nscd_certainly_running == 0
--	  && map->head->timestamp + MAPPING_TIMEOUT < time (NULL)))
--    map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped);
--
--  if (map == NO_MAPPING)
--    return 0;
--
--  return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP];
--}
--
--
- int __nss_have_localdomain attribute_hidden;
- 
- static int
-diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
-index 365b599..fe63f9a 100644
---- a/nscd/nscd_helper.c
-+++ b/nscd/nscd_helper.c
-@@ -277,9 +277,9 @@ __nscd_unmap (struct mapped_database *mapped)
- 
- /* Try to get a file descriptor for the shared meory segment
-    containing the database.  */
--struct mapped_database *
--__nscd_get_mapping (request_type type, const char *key,
--		    struct mapped_database **mappedp)
-+static struct mapped_database *
-+get_mapping (request_type type, const char *key,
-+	     struct mapped_database **mappedp)
- {
-   struct mapped_database *result = NO_MAPPING;
- #ifdef SCM_RIGHTS
-@@ -449,8 +449,8 @@ __nscd_get_map_ref (request_type type, const char *name,
- 	  || (cur->head->nscd_certainly_running == 0
- 	      && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))
- 	  || cur->head->data_size > cur->datasize)
--	cur = __nscd_get_mapping (type, name,
--				  (struct mapped_database **) &mapptr->mapped);
-+	cur = get_mapping (type, name,
-+			   (struct mapped_database **) &mapptr->mapped);
- 
-       if (__builtin_expect (cur != NO_MAPPING, 1))
- 	{
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index 1a023f9..4979805 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2386,7 +2386,7 @@ getaddrinfo (const char *name, const char *service,
- 	       || (hints->ai_family == PF_INET6 && ! seen_ipv6))
- 	{
- 	  /* We cannot possibly return a valid answer.  */
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 	  return EAI_NONAME;
- 	}
-     }
-@@ -2400,7 +2400,7 @@ getaddrinfo (const char *name, const char *service,
- 	{
- 	  if (hints->ai_flags & AI_NUMERICSERV)
- 	    {
--	      __free_in6ai (in6ai);
-+	      free (in6ai);
- 	      return EAI_NONAME;
- 	    }
- 
-@@ -2422,7 +2422,7 @@ getaddrinfo (const char *name, const char *service,
-       if (last_i != 0)
- 	{
- 	  freeaddrinfo (p);
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 
- 	  return -(last_i & GAIH_EAI);
- 	}
-@@ -2434,7 +2434,7 @@ getaddrinfo (const char *name, const char *service,
-     }
-   else
-     {
--      __free_in6ai (in6ai);
-+      free (in6ai);
-       return EAI_FAMILY;
-     }
- 
-@@ -2622,7 +2622,7 @@ getaddrinfo (const char *name, const char *service,
-       p->ai_canonname = canonname;
-     }
- 
--  __free_in6ai (in6ai);
-+  free (in6ai);
- 
-   if (p)
-     {
-diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
-index e684b16..c907af4 100644
---- a/sysdeps/unix/sysv/linux/Makefile
-+++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -173,6 +173,6 @@ CFLAGS-mq_receive.c += -fexceptions
- endif
- 
- ifeq ($(subdir),nscd)
--sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY -DHAVE_NETLINK
-+sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY
- CFLAGS-gai.c += -DNEED_NETLINK
- endif
-diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
-index 0738a70..d5ad7ea 100644
---- a/sysdeps/unix/sysv/linux/check_pf.c
-+++ b/sysdeps/unix/sysv/linux/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Linux version.
--   Copyright (C) 2003, 2006-2008, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006, 2007, 2008, 2010, 2011 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
-@@ -33,9 +33,6 @@
- 
- #include <not-cancel.h>
- #include <kernel-features.h>
--#include <bits/libc-lock.h>
--#include <atomic.h>
--#include <nscd/nscd-client.h>
- 
- 
- #ifndef IFA_F_HOMEADDRESS
-@@ -46,42 +43,9 @@
- #endif
- 
- 
--struct cached_data
--{
--  uint32_t timestamp;
--  uint32_t usecnt;
--  bool seen_ipv4;
--  bool seen_ipv6;
--  size_t in6ailen;
--  struct in6addrinfo in6ai[0];
--};
--
--static struct cached_data noai6ai_cached =
--  {
--    .usecnt = 1,	/* Make sure we never try to delete this entry.  */
--    .in6ailen = 0
--  };
--
--static struct cached_data *cache;
--__libc_lock_define_initialized (static, lock);
--
--
--#ifdef IS_IN_nscd
--static uint32_t nl_timestamp;
--
--uint32_t
--__bump_nl_timestamp (void)
--{
--  if (atomic_increment_val (&nl_timestamp) == 0)
--    atomic_increment (&nl_timestamp);
--
--  return nl_timestamp;
--}
--#endif
--
--
--static struct cached_data *
--make_request (int fd, pid_t pid)
-+static int
-+make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
-+	      struct in6addrinfo **in6ai, size_t *in6ailen)
- {
-   struct req
-   {
-@@ -135,6 +99,9 @@ make_request (int fd, pid_t pid)
- 				    sizeof (nladdr))) < 0)
-     goto out_fail;
- 
-+  *seen_ipv4 = false;
-+  *seen_ipv6 = false;
-+
-   bool done = false;
-   struct in6ailist
-   {
-@@ -142,8 +109,6 @@ make_request (int fd, pid_t pid)
-     struct in6ailist *next;
-   } *in6ailist = NULL;
-   size_t in6ailistlen = 0;
--  bool seen_ipv4 = false;
--  bool seen_ipv6 = false;
- 
-   do
-     {
-@@ -207,12 +172,12 @@ make_request (int fd, pid_t pid)
- 		    {
- 		      if (*(const in_addr_t *) address
- 			  != htonl (INADDR_LOOPBACK))
--			seen_ipv4 = true;
-+			*seen_ipv4 = true;
- 		    }
- 		  else
- 		    {
- 		      if (!IN6_IS_ADDR_LOOPBACK (address))
--			seen_ipv6 = true;
-+			*seen_ipv6 = true;
- 		    }
- 		}
- 
-@@ -246,47 +211,30 @@ make_request (int fd, pid_t pid)
-     }
-   while (! done);
- 
--  struct cached_data *result;
--  if (seen_ipv6 && in6ailist != NULL)
-+  if (*seen_ipv6 && in6ailist != NULL)
-     {
--      result = malloc (sizeof (*result)
--		       + in6ailistlen * sizeof (struct in6addrinfo));
--      if (result == NULL)
-+      *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
-+      if (*in6ai == NULL)
- 	goto out_fail;
- 
--#ifdef IS_IN_nscd
--      result->timestamp = nl_timestamp;
--#else
--      result->timestamp = __nscd_get_nl_timestamp ();
--#endif
--      result->usecnt = 2;
--      result->seen_ipv4 = seen_ipv4;
--      result->seen_ipv6 = true;
--      result->in6ailen = in6ailistlen;
-+      *in6ailen = in6ailistlen;
- 
-       do
- 	{
--	  result->in6ai[--in6ailistlen] = in6ailist->info;
-+	  (*in6ai)[--in6ailistlen] = in6ailist->info;
- 	  in6ailist = in6ailist->next;
- 	}
-       while (in6ailist != NULL);
-     }
--  else
--    {
--      atomic_add (&noai6ai_cached.usecnt, 2);
--      noai6ai_cached.seen_ipv4 = seen_ipv4;
--      noai6ai_cached.seen_ipv6 = seen_ipv6;
--      result = &noai6ai_cached;
--    }
- 
-   if (use_malloc)
-     free (buf);
--  return result;
-+  return 0;
- 
- out_fail:
-   if (use_malloc)
-     free (buf);
--  return NULL;
-+  return -1;
- }
- 
- 
-@@ -310,65 +258,28 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   if (! __no_netlink_support)
-     {
--      struct cached_data *olddata = NULL;
--      struct cached_data *data = NULL;
-+      int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- 
--      __libc_lock_lock (lock);
--
--#ifdef IS_IN_nscd
--# define cache_valid() nl_timestamp != 0 && cache->timestamp == nl_timestamp
--#else
--# define cache_valid() \
--      ({ uint32_t val = __nscd_get_nl_timestamp ();			      \
--	 val != 0 && cache->timestamp == val; })
--#endif
--      if (cache != NULL && cache_valid ())
--	{
--	  data = cache;
--	  atomic_increment (&cache->usecnt);
--	}
--      else
-+      if (__builtin_expect (fd >= 0, 1))
- 	{
--	  int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-+	  struct sockaddr_nl nladdr;
-+	  memset (&nladdr, '\0', sizeof (nladdr));
-+	  nladdr.nl_family = AF_NETLINK;
- 
--	  if (__builtin_expect (fd >= 0, 1))
--	    {
--	      struct sockaddr_nl nladdr;
--	      memset (&nladdr, '\0', sizeof (nladdr));
--	      nladdr.nl_family = AF_NETLINK;
--
--	      socklen_t addr_len = sizeof (nladdr);
--
--	      if(__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
--		 && __getsockname (fd, (struct sockaddr *) &nladdr,
--				   &addr_len) == 0)
--		data = make_request (fd, nladdr.nl_pid);
--
--	      close_not_cancel_no_status (fd);
--	    }
--
--	  if (data != NULL)
--	    {
--	      olddata = cache;
--	      cache = data;
--	    }
--	}
-+	  socklen_t addr_len = sizeof (nladdr);
- 
--      __libc_lock_unlock (lock);
-+	  bool success
-+	    = (__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
-+	       && __getsockname (fd, (struct sockaddr *) &nladdr,
-+				 &addr_len) == 0
-+	       && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
-+				in6ai, in6ailen) == 0);
- 
--      if (data != NULL)
--	{
--	  /* It worked.  */
--	  *seen_ipv4 = data->seen_ipv4;
--	  *seen_ipv6 = data->seen_ipv6;
--	  *in6ailen = data->in6ailen;
--	  *in6ai = data->in6ai;
--
--	  if (olddata != NULL && olddata->usecnt > 0
--	      && atomic_add_zero (&olddata->usecnt, -1))
--	    free (olddata);
-+	  close_not_cancel_no_status (fd);
- 
--	  return;
-+	  if (success)
-+	    /* It worked.  */
-+	    return;
- 	}
- 
- #if __ASSUME_NETLINK_SUPPORT == 0
-@@ -407,26 +318,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
-   (void) freeifaddrs (ifa);
- #endif
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *ai)
--{
--  if (ai != NULL)
--    {
--      struct cached_data *data =
--	(struct cached_data *) ((char *) ai
--				- offsetof (struct cached_data, in6ai));
--
--      if (atomic_add_zero (&data->usecnt, -1))
--	{
--	  __libc_lock_lock (lock);
--
--	  if (data->usecnt == 0)
--	    /* Still unused.  */
--	    free (data);
--
--	  __libc_lock_unlock (lock);
--	}
--    }
--}
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-rintf-rounding.patch b/multilib-testing/lib32-glibc/glibc-2.15-rintf-rounding.patch
deleted file mode 100644
index e0240ac6c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-rintf-rounding.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index 6243e1e..c8186c8 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -5037,6 +5037,22 @@ rint_test (void)
-   TEST_f_f (rint, 262142.75, 262143.0);
-   TEST_f_f (rint, 524286.75, 524287.0);
-   TEST_f_f (rint, 524288.75, 524289.0);
-+  TEST_f_f (rint, 1048576.75, 1048577.0);
-+  TEST_f_f (rint, 2097152.75, 2097153.0);
-+  TEST_f_f (rint, -1048576.75, -1048577.0);
-+  TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-   /* The result can only be represented in long double.  */
-   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5277,6 +5325,22 @@ rint_test_downward (void)
-       TEST_f_f (rint, -0.1, -1.0);
-       TEST_f_f (rint, -0.25, -1.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5347,6 +5411,22 @@ rint_test_upward (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
-index 9ea9b6f..9ba6b57 100644
---- a/sysdeps/ieee754/flt-32/s_rintf.c
-+++ b/sysdeps/ieee754/flt-32/s_rintf.c
-@@ -26,34 +26,22 @@ float
- __rintf(float x)
- {
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(j0==0x80) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	w = TWO23[sx]+x;
- 	return w-TWO23[sx];
- }
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-scanf.patch b/multilib-testing/lib32-glibc/glibc-2.15-scanf.patch
deleted file mode 100644
index a2561b232..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-scanf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
-index 0e71deb..e18a6c3 100644
---- a/stdio-common/vfscanf.c
-+++ b/stdio-common/vfscanf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 1991-2007, 2010, 2011, 2012 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
-@@ -274,7 +274,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
- 	  CHAR_T *old = wp;						    \
- 	  size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax			    \
- 			    ? UCHAR_MAX + 1 : 2 * wpmax);		    \
--	  if (use_malloc || __libc_use_alloca (newsize))		    \
-+	  if (use_malloc || !__libc_use_alloca (newsize))		    \
- 	    {								    \
- 	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
- 	      if (wp == NULL)						    \
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch b/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
deleted file mode 100644
index 4c104fa55..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-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-2.15-testsuite.patch b/multilib-testing/lib32-glibc/glibc-2.15-testsuite.patch
deleted file mode 100644
index 7eaeaed65..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-testsuite.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Mon, 16 Apr 2012 14:06:47 +1000
-Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
----
- ChangeLog       |   24 ++++++++++++++++++++++++
- elf/Makefile    |   21 ++++++++++++++++++++-
- nptl/ChangeLog  |    5 +++++
- nptl/Makefile   |    3 ++-
- stdlib/Makefile |    1 +
- 5 files changed, 52 insertions(+), 2 deletions(-)
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 57dcab0..47729c3 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb
- $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so
- $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so
- 
-+LDFLAGS-nodel2mod3.so = $(no-as-needed)
-+LDFLAGS-reldepmod5.so = $(no-as-needed)
-+LDFLAGS-reldep6mod1.so = $(no-as-needed)
-+LDFLAGS-reldep6mod4.so = $(no-as-needed)
-+LDFLAGS-reldep8mod3.so = $(no-as-needed)
-+LDFLAGS-unload4mod1.so = $(no-as-needed)
-+LDFLAGS-unload4mod2.so = $(no-as-needed)
-+LDFLAGS-tst-initorder = $(no-as-needed)
-+LDFLAGS-tst-initordera2.so = $(no-as-needed)
-+LDFLAGS-tst-initordera3.so = $(no-as-needed)
-+LDFLAGS-tst-initordera4.so = $(no-as-needed)
-+LDFLAGS-tst-initorderb2.so = $(no-as-needed)
- LDFLAGS-tst-tlsmod5.so = -nostdlib
- LDFLAGS-tst-tlsmod6.so = -nostdlib
- 
-@@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so)
- vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so)
- 
- $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so
--LDFLAGS-noload = -rdynamic
-+LDFLAGS-noload = -rdynamic $(no-as-needed)
- $(objpfx)noload.out: $(objpfx)testobj5.so
- 
- $(objpfx)noload-mem: $(objpfx)noload.out
-@@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl)
- $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so
- 
- $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl)
-+LDFLAGS-next = $(no-as-needed)
- 
- $(objpfx)unload2: $(libdl)
- $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so
-@@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so
- $(objpfx)order2mod4.so: $(objpfx)order2mod3.so
- $(objpfx)order2mod2.so: $(objpfx)order2mod3.so
- order2mod2.so-no-z-defs = yes
-+LDFLAGS-order2mod1.so = $(no-as-needed)
-+LDFLAGS-order2mod2.so = $(no-as-needed)
- 
- tst-stackguard1-ARGS = --command "$(built-program-cmd) --child"
- tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
-@@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so
- $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so
- $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so
- $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so
-+LDFLAGS-tst-initorder2 = $(no-as-needed)
-+LDFLAGS-tst-initorder2a.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2b.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2c.so = $(no-as-needed)
- define o-iterator-doit
- $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \
- $$(compile-command.c) -DNAME=\"$o\"
-diff --git a/nptl/Makefile b/nptl/Makefile
-index 09acd8a..07a1022 100644
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library)
- $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so
- 
- $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library)
-+LDFLAGS-tst-tls5 = $(no-as-needed)
- LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so
- 
- ifeq ($(build-shared),yes)
-@@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a
- $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a
- endif
- 
--LDFLAGS-tst-cancel24 = -lstdc++
-+LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++
- 
- extra-B-pthread.so = -B$(common-objpfx)nptl/
- $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index 44eb20d..f7811c5 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
- 	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/
- 
- $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so
-+LDFLAGS-tst-putenv = $(no-as-needed)
- 
- $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os
- 	$(build-module)
--- 
-1.7.3.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-vdso.patch b/multilib-testing/lib32-glibc/glibc-2.15-vdso.patch
deleted file mode 100644
index 7fd394f90..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-vdso.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/elf/Makefile b/elf/Makefile
-index 8234ba7..25ffc57 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
- $(objpfx)tst-relsort1mod2.so: $(libm)
- $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
- 			   $(objpfx)tst-relsort1mod2.so
-+
-+tests: $(objpfx)tst-unused-dep.out
-+
-+$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
-+	LD_TRACE_LOADED_OBJECTS=1 \
-+	LD_DEBUG=unused \
-+	LD_PRELOAD= \
-+	$(elf-objpfx)${rtld-installed-name} \
-+	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
-+	  $< > $@
-+	cmp $@ /dev/null > /dev/null
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2e4f97f..3e15447 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1,5 +1,5 @@
- /* Run time dynamic linker.
--   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2012 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
-@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	  _dl_setup_hash (l);
- 	  l->l_relocated = 1;
- 
-+	  /* The vDSO is always used.  */
-+	  l->l_used = 1;
-+
- 	  /* Initialize l_local_scope to contain just this map.  This allows
- 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
- 	     So we create a single entry list pointing to l_real as its only
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch b/multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
deleted file mode 100644
index f8dde53f5..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/stdio-common/Makefile b/stdio-common/Makefile
-index a847b28..080badc 100644
---- a/stdio-common/Makefile
-+++ b/stdio-common/Makefile
-@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
- 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
- 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
- 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
--	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
-+	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
-+	 bug-vfprintf-nargs
- 
- test-srcs = tst-unbputc tst-printf
- 
-diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
-new file mode 100644
-index 0000000..13c66c0
---- /dev/null
-+++ b/stdio-common/bug-vfprintf-nargs.c
-@@ -0,0 +1,78 @@
-+/* Test for vfprintf nargs allocation overflow (BZ #13656).
-+   Copyright (C) 2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Kees Cook <keescook@chromium.org>, 2012.
-+
-+   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 <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <unistd.h>
-+#include <inttypes.h>
-+#include <string.h>
-+#include <signal.h>
-+
-+static int
-+format_failed (const char *fmt, const char *expected)
-+{
-+  char output[80];
-+
-+  printf ("%s : ", fmt);
-+
-+  memset (output, 0, sizeof output);
-+  /* Having sprintf itself detect a failure is good.  */
-+  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
-+      && strcmp (output, expected) != 0)
-+    {
-+      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
-+      return 1;
-+    }
-+  puts ("ok");
-+  return 0;
-+}
-+
-+static int
-+do_test (void)
-+{
-+  int rc = 0;
-+  char buf[64];
-+
-+  /* Regular positionals work.  */
-+  if (format_failed ("%1$d", "1") != 0)
-+    rc = 1;
-+
-+  /* Regular width positionals work.  */
-+  if (format_failed ("%1$*2$d", " 1") != 0)
-+    rc = 1;
-+
-+  /* Positional arguments are constructed via read_int, so nargs can only
-+     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
-+     allocate a giant amount of memory and possibly crash, which is the
-+     expected situation.  Since the 64-bit behavior is arch-specific, only
-+     test this on 32-bit systems.  */
-+  if (sizeof (long int) == 4)
-+    {
-+      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
-+      if (format_failed (buf, "1 %$d") != 0)
-+        rc = 1;
-+    }
-+
-+  return rc;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
-index 863cd5d..c802e46 100644
---- a/stdio-common/vfprintf.c
-+++ b/stdio-common/vfprintf.c
-@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
-      0 if unknown.  */
-   int readonly_format = 0;
- 
-+  /* For the argument descriptions, which may be allocated on the heap.  */
-+  void *args_malloced = NULL;
-+
-   /* This table maps a character into a number representing a
-      class.  In each step there is a destination label for each
-      class.  */
-@@ -1647,9 +1650,10 @@ do_positional:
-        determine the size of the array needed to store the argument
-        attributes.  */
-     size_t nargs = 0;
--    int *args_type;
--    union printf_arg *args_value = NULL;
-+    size_t bytes_per_arg;
-+    union printf_arg *args_value;
-     int *args_size;
-+    int *args_type;
- 
-     /* Positional parameters refer to arguments directly.  This could
-        also determine the maximum number of arguments.  Track the
-@@ -1698,13 +1702,38 @@ do_positional:
- 
-     /* Determine the number of arguments the format string consumes.  */
-     nargs = MAX (nargs, max_ref_arg);
-+    /* Calculate total size needed to represent a single argument across
-+       all three argument-related arrays.  */
-+    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
-+                    + sizeof (*args_type);
-+
-+    /* Check for potential integer overflow.  */
-+    if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0))
-+      {
-+         __set_errno (ERANGE);
-+         done = -1;
-+         goto all_done;
-+      }
- 
--    /* Allocate memory for the argument descriptions.  */
--    args_type = alloca (nargs * sizeof (int));
-+    /* Allocate memory for all three argument arrays.  */
-+    if (__libc_use_alloca (nargs * bytes_per_arg))
-+        args_value = alloca (nargs * bytes_per_arg);
-+    else
-+      {
-+        args_value = args_malloced = malloc (nargs * bytes_per_arg);
-+        if (args_value == NULL)
-+          {
-+            done = -1;
-+            goto all_done;
-+          }
-+      }
-+
-+    /* Set up the remaining two arrays to each point past the end of the
-+       prior array, since space for all three has been allocated now.  */
-+    args_size = &args_value[nargs].pa_int;
-+    args_type = &args_size[nargs];
-     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
--	    nargs * sizeof (int));
--    args_value = alloca (nargs * sizeof (union printf_arg));
--    args_size = alloca (nargs * sizeof (int));
-+	    nargs * sizeof (*args_type));
- 
-     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
-        still zero after this loop, format is invalid.  For now we
-@@ -1973,8 +2002,8 @@ do_positional:
-   }
- 
- all_done:
--  if (__builtin_expect (workstart != NULL, 0))
--    free (workstart);
-+  free (args_malloced);
-+  free (workstart);
-   /* Unlock the stream.  */
-   _IO_funlockfile (s);
-   _IO_cleanup_region_end (0);
diff --git a/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch b/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch
deleted file mode 100644
index 822b57294..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
-index 06d951a..2103b10 100644
---- a/sunrpc/rpc_main.c
-+++ b/sunrpc/rpc_main.c
-@@ -75,12 +75,9 @@ struct commandline
- 
- static const char *cmdname;
- 
--#define SVR4_CPP "/usr/ccs/lib/cpp"
--#define SUNOS_CPP "/lib/cpp"
--
- static const char *svcclosetime = "120";
- static int cppDefined;	/* explicit path for C preprocessor */
--static const char *CPP = SUNOS_CPP;
-+static const char *CPP = "/lib/cpp";
- static const char CPPFLAGS[] = "-C";
- static char *pathbuf;
- static int cpp_pid;
-@@ -327,23 +324,17 @@ find_cpp (void)
- {
-   struct stat buf;
- 
--  if (stat (CPP, &buf) < 0)
--    {				/* /lib/cpp or explicit cpp does not exist */
--      if (cppDefined)
--	{
--	  fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
--	  crash ();
--	}
--      else
--	{			/* try the other one */
--	  CPP = SVR4_CPP;
--	  if (stat (CPP, &buf) < 0)
--	    {			/* can't find any cpp */
--	      fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
--	      crash ();
--	    }
--	}
-+  if (stat (CPP, &buf) == 0)
-+    return;
-+
-+  if (cppDefined) /* user specified cpp but it does not exist */
-+    {
-+      fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+      crash ();
-     }
-+
-+  /* fall back to system CPP */
-+  CPP = "cpp";
- }
- 
- /*
-@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define)
-       close (1);
-       dup2 (pd[1], 1);
-       close (pd[0]);
--      execv (arglist[0], (char **) arglist);
--      perror ("execv");
-+      execvp (arglist[0], (char **) arglist);
-+      if (errno == ENOENT)
-+        {
-+          fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+          exit (1);
-+        }
-+      perror ("execvp");
-       exit (1);
-     case -1:
-       perror ("fork");
diff --git a/multilib-testing/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch b/multilib-testing/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch
deleted file mode 100644
index ce91bbe82..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c
-index 6c17530..acfe668 100644
---- a/string/test-strncasecmp.c
-+++ b/string/test-strncasecmp.c
-@@ -1,5 +1,5 @@
- /* Test and measure strncasecmp functions.
--   Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc.
-+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
- 
-@@ -251,9 +251,9 @@ do_random_tests (void)
-     }
- }
- 
--
-+/* Regression test for BZ #12205 */
- static void
--check1 (void)
-+bz12205 (void)
- {
-   static char cp [4096+16] __attribute__ ((aligned(4096)));
-   static char gotrel[4096] __attribute__ ((aligned(4096)));
-@@ -270,6 +270,15 @@ check1 (void)
-     check_result (impl, s1, s2, n, exp_result);
- }
- 
-+/* Regression test for BZ #14195 */
-+static void
-+bz14195 (void)
-+{
-+  const char *empty_string  = "";
-+  FOR_EACH_IMPL (impl, 0)
-+    check_result (impl, empty_string, "", 5, 0);
-+}
-+
- int
- test_main (void)
- {
-@@ -277,7 +286,8 @@ test_main (void)
- 
-   test_init ();
- 
--  check1 ();
-+  bz12205 ();
-+  bz14195 ();
- 
-   printf ("%23s", "");
-   FOR_EACH_IMPL (impl, 0)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-index 5e6321e..9735ad0 100644
---- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-@@ -2445,7 +2445,7 @@ L(less16bytes_sncmp):
- # endif
- 	jne	L(neq_sncmp)
- 	test	%cl, %cl
--	je	L(eq)
-+	je	L(eq_sncmp)
- 
- 	cmp	$1, REM
- 	je	L(eq_sncmp)
--- 
-1.7.3.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.16-strtod-overflow.patch b/multilib-testing/lib32-glibc/glibc-2.16-strtod-overflow.patch
deleted file mode 100644
index 526296325..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.16-strtod-overflow.patch
+++ /dev/null
@@ -1,389 +0,0 @@
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index f7811c5..79c9acb 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -68,7 +68,8 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
- 		   tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
- 		   tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2	    \
- 		   tst-makecontext2 tst-strtod6 tst-unsetenv1		    \
--		   tst-makecontext3 bug-getcontext bug-fmtmsg1
-+		   tst-makecontext3 bug-getcontext bug-fmtmsg1		    \
-+		   tst-strtod-overflow
- 
- include ../Makeconfig
- 
-diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
-index 2166a08..a8a7ea8 100644
---- a/stdlib/strtod_l.c
-+++ b/stdlib/strtod_l.c
-@@ -60,6 +60,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
- #include <math.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /* The gmp headers need some configuration frobs.  */
- #define HAVE_ALLOCA 1
-@@ -72,7 +73,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
- #include "longlong.h"
- #include "fpioconst.h"
- 
--#define NDEBUG 1
- #include <assert.h>
- 
- 
-@@ -174,19 +174,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1];
- /* Return a floating point number of the needed type according to the given
-    multi-precision number after possible rounding.  */
- static FLOAT
--round_and_return (mp_limb_t *retval, int exponent, int negative,
-+round_and_return (mp_limb_t *retval, intmax_t exponent, int negative,
- 		  mp_limb_t round_limb, mp_size_t round_bit, int more_bits)
- {
-   if (exponent < MIN_EXP - 1)
-     {
--      mp_size_t shift = MIN_EXP - 1 - exponent;
--
--      if (shift > MANT_DIG)
-+      if (exponent < MIN_EXP - 1 - MANT_DIG)
- 	{
- 	  __set_errno (ERANGE);
- 	  return 0.0;
- 	}
- 
-+      mp_size_t shift = MIN_EXP - 1 - exponent;
-+
-       more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0;
-       if (shift == MANT_DIG)
- 	/* This is a special case to handle the very seldom case where
-@@ -233,6 +233,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-       __set_errno (ERANGE);
-     }
- 
-+  if (exponent > MAX_EXP)
-+    goto overflow;
-+
-   if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0
-       && (more_bits || (retval[0] & 1) != 0
- 	  || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0))
-@@ -258,6 +261,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-     }
- 
-   if (exponent > MAX_EXP)
-+  overflow:
-     return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
- 
-   return MPN2FLOAT (retval, exponent, negative);
-@@ -271,7 +275,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-    factor for the resulting number (see code) multiply by it.  */
- static const STRING_TYPE *
- str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
--	    int *exponent
-+	    intmax_t *exponent
- #ifndef USE_WIDE_CHAR
- 	    , const char *decimal, size_t decimal_len, const char *thousands
- #endif
-@@ -301,6 +305,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
- 	      cy += __mpn_add_1 (n, n, *nsize, low);
- 	      if (cy != 0)
- 		{
-+		  assert (*nsize < MPNSIZE);
- 		  n[*nsize] = cy;
- 		  ++(*nsize);
- 		}
-@@ -335,7 +340,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
-     }
-   while (--digcnt > 0);
- 
--  if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB)
-+  if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt)
-     {
-       low *= _tens_in_limb[*exponent];
-       start = _tens_in_limb[cnt + *exponent];
-@@ -355,7 +360,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
-       cy = __mpn_mul_1 (n, n, *nsize, start);
-       cy += __mpn_add_1 (n, n, *nsize, low);
-       if (cy != 0)
--	n[(*nsize)++] = cy;
-+	{
-+	  assert (*nsize < MPNSIZE);
-+	  n[(*nsize)++] = cy;
-+	}
-     }
- 
-   return str;
-@@ -413,7 +421,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- {
-   int negative;			/* The sign of the number.  */
-   MPN_VAR (num);		/* MP representation of the number.  */
--  int exponent;			/* Exponent of the number.  */
-+  intmax_t exponent;		/* Exponent of the number.  */
- 
-   /* Numbers starting `0X' or `0x' have to be processed with base 16.  */
-   int base = 10;
-@@ -435,7 +443,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-   /* Points at the character following the integer and fractional digits.  */
-   const STRING_TYPE *expp;
-   /* Total number of digit and number of digits in integer part.  */
--  int dig_no, int_no, lead_zero;
-+  size_t dig_no, int_no, lead_zero;
-   /* Contains the last character read.  */
-   CHAR_TYPE c;
- 
-@@ -767,7 +775,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-      are all or any is really a fractional digit will be decided
-      later.  */
-   int_no = dig_no;
--  lead_zero = int_no == 0 ? -1 : 0;
-+  lead_zero = int_no == 0 ? (size_t) -1 : 0;
- 
-   /* Read the fractional digits.  A special case are the 'american
-      style' numbers like `16.' i.e. with decimal point but without
-@@ -789,12 +797,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	     (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c);
- 			       lo >= L_('a') && lo <= L_('f'); })))
- 	{
--	  if (c != L_('0') && lead_zero == -1)
-+	  if (c != L_('0') && lead_zero == (size_t) -1)
- 	    lead_zero = dig_no - int_no;
- 	  ++dig_no;
- 	  c = *++cp;
- 	}
-     }
-+  assert (dig_no <= (uintmax_t) INTMAX_MAX);
- 
-   /* Remember start of exponent (if any).  */
-   expp = cp;
-@@ -817,24 +826,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 
-       if (c >= L_('0') && c <= L_('9'))
- 	{
--	  int exp_limit;
-+	  intmax_t exp_limit;
- 
- 	  /* Get the exponent limit. */
- 	  if (base == 16)
--	    exp_limit = (exp_negative ?
--			 -MIN_EXP + MANT_DIG + 4 * int_no :
--			 MAX_EXP - 4 * int_no + 4 * lead_zero + 3);
-+	    {
-+	      if (exp_negative)
-+		{
-+		  assert (int_no <= (uintmax_t) (INTMAX_MAX
-+						 + MIN_EXP - MANT_DIG) / 4);
-+		  exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no;
-+		}
-+	      else
-+		{
-+		  if (int_no)
-+		    {
-+		      assert (lead_zero == 0
-+			      && int_no <= (uintmax_t) INTMAX_MAX / 4);
-+		      exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3;
-+		    }
-+		  else if (lead_zero == (size_t) -1)
-+		    {
-+		      /* The number is zero and this limit is
-+			 arbitrary.  */
-+		      exp_limit = MAX_EXP + 3;
-+		    }
-+		  else
-+		    {
-+		      assert (lead_zero
-+			      <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4);
-+		      exp_limit = (MAX_EXP
-+				   + 4 * (intmax_t) lead_zero
-+				   + 3);
-+		    }
-+		}
-+	    }
- 	  else
--	    exp_limit = (exp_negative ?
--			 -MIN_10_EXP + MANT_DIG + int_no :
--			 MAX_10_EXP - int_no + lead_zero + 1);
-+	    {
-+	      if (exp_negative)
-+		{
-+		  assert (int_no
-+			  <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG));
-+		  exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no;
-+		}
-+	      else
-+		{
-+		  if (int_no)
-+		    {
-+		      assert (lead_zero == 0
-+			      && int_no <= (uintmax_t) INTMAX_MAX);
-+		      exp_limit = MAX_10_EXP - (intmax_t) int_no + 1;
-+		    }
-+		  else if (lead_zero == (size_t) -1)
-+		    {
-+		      /* The number is zero and this limit is
-+			 arbitrary.  */
-+		      exp_limit = MAX_10_EXP + 1;
-+		    }
-+		  else
-+		    {
-+		      assert (lead_zero
-+			      <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1));
-+		      exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1;
-+		    }
-+		}
-+	    }
-+
-+	  if (exp_limit < 0)
-+	    exp_limit = 0;
- 
- 	  do
- 	    {
--	      exponent *= 10;
--	      exponent += c - L_('0');
--
--	      if (__builtin_expect (exponent > exp_limit, 0))
-+	      if (__builtin_expect ((exponent > exp_limit / 10
-+				     || (exponent == exp_limit / 10
-+					 && c - L_('0') > exp_limit % 10)), 0))
- 		/* The exponent is too large/small to represent a valid
- 		   number.  */
- 		{
-@@ -843,7 +908,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 		  /* We have to take care for special situation: a joker
- 		     might have written "0.0e100000" which is in fact
- 		     zero.  */
--		  if (lead_zero == -1)
-+		  if (lead_zero == (size_t) -1)
- 		    result = negative ? -0.0 : 0.0;
- 		  else
- 		    {
-@@ -862,6 +927,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 		  /* NOTREACHED */
- 		}
- 
-+	      exponent *= 10;
-+	      exponent += c - L_('0');
-+
- 	      c = *++cp;
- 	    }
- 	  while (c >= L_('0') && c <= L_('9'));
-@@ -930,7 +998,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	}
- #endif
-       startp += lead_zero + decimal_len;
--      exponent -= base == 16 ? 4 * lead_zero : lead_zero;
-+      assert (lead_zero <= (base == 16
-+			    ? (uintmax_t) INTMAX_MAX / 4
-+			    : (uintmax_t) INTMAX_MAX));
-+      assert (lead_zero <= (base == 16
-+			    ? ((uintmax_t) exponent
-+			       - (uintmax_t) INTMAX_MIN) / 4
-+			    : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN)));
-+      exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero;
-       dig_no -= lead_zero;
-     }
- 
-@@ -972,7 +1047,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	}
- 
-       /* Adjust the exponent for the bits we are shifting in.  */
--      exponent += bits - 1 + (int_no - 1) * 4;
-+      assert (int_no <= (uintmax_t) (exponent < 0
-+				     ? (INTMAX_MAX - bits + 1) / 4
-+				     : (INTMAX_MAX - exponent - bits + 1) / 4));
-+      exponent += bits - 1 + ((intmax_t) int_no - 1) * 4;
- 
-       while (--dig_no > 0 && idx >= 0)
- 	{
-@@ -1024,13 +1102,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-      really integer digits or belong to the fractional part; i.e. we normalize
-      123e-2 to 1.23.  */
-   {
--    register int incr = (exponent < 0 ? MAX (-int_no, exponent)
--			 : MIN (dig_no - int_no, exponent));
-+    register intmax_t incr = (exponent < 0
-+			      ? MAX (-(intmax_t) int_no, exponent)
-+			      : MIN ((intmax_t) dig_no - (intmax_t) int_no,
-+				     exponent));
-     int_no += incr;
-     exponent -= incr;
-   }
- 
--  if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0))
-+  if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0))
-     {
-       __set_errno (ERANGE);
-       return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
-@@ -1215,7 +1295,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-        digits we should have enough bits for the result.  The remaining
-        decimal digits give us the information that more bits are following.
-        This can be used while rounding.  (Two added as a safety margin.)  */
--    if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2)
-+    if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2)
-       {
- 	dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2;
- 	more_bits = 1;
-@@ -1223,7 +1303,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-     else
-       more_bits = 0;
- 
--    neg_exp = dig_no - int_no - exponent;
-+    neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent;
- 
-     /* Construct the denominator.  */
-     densize = 0;
-diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c
-new file mode 100644
-index 0000000..668d55b
---- /dev/null
-+++ b/stdlib/tst-strtod-overflow.c
-@@ -0,0 +1,48 @@
-+/* Test for integer/buffer overflow in strtod.
-+   Copyright (C) 2012 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
-+   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, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#define EXPONENT "e-2147483649"
-+#define SIZE 214748364
-+
-+static int
-+do_test (void)
-+{
-+  char *p = malloc (1 + SIZE + sizeof (EXPONENT));
-+  if (p == NULL)
-+    {
-+      puts ("malloc failed, cannot test for overflow");
-+      return 0;
-+    }
-+  p[0] = '1';
-+  memset (p + 1, '0', SIZE);
-+  memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT));
-+  double d = strtod (p, NULL);
-+  if (d != 0)
-+    {
-+      printf ("strtod returned wrong value: %a\n", d);
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
--- 
-1.7.3.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 16f84c536..000000000
--- a/multilib-testing/lib32-glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c
-index 9c00dc0..f5d4df8 100644
---- a/nptl/sysdeps/pthread/pt-initfini.c
-+++ b/nptl/sysdeps/pthread/pt-initfini.c
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
-
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
-diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
-index 64ef400..726b1df 100644
---- a/sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
-
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
-
- /* For Linux we can use the system call table in the header file
-        /usr/include/asm/unistd.h
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-glu/PKGBUILD b/multilib-testing/lib32-glu/PKGBUILD
deleted file mode 100644
index ff718f165..000000000
--- a/multilib-testing/lib32-glu/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 77209 2012-10-06 21:02:42Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=lib32-glu
-pkgver=9.0.0
-pkgrel=1
-pkgdesc="Mesa OpenGL utility library (32 bits)"
-arch=('x86_64')
-url="http://mesa.freedesktop.org/"
-license=('LGPL')
-depends=('lib32-libgl')
-makedepends=('gcc-multilib' 'lib32-mesa')
-options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.bz2)
-sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
-
-build() {
-  cd ${srcdir}/glu-$pkgver
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --disable-static \
-    --libdir=/usr/lib32 
-  make
-}
-
-check() {
-  cd "$srcdir/glu-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  make -k check
-}
-
-package() {
-  cd ${srcdir}/glu-$pkgver
-
-  make DESTDIR=${pkgdir} install
-  
-  rm -rf ${pkgdir}/usr/include
-}
diff --git a/multilib-testing/lib32-libdrm/PKGBUILD b/multilib-testing/lib32-libdrm/PKGBUILD
deleted file mode 100644
index 06ac29444..000000000
--- a/multilib-testing/lib32-libdrm/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 75477 2012-08-25 23:25:21Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.39
-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)
-sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d'
-            '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930')
-
-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-vmwgfx-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/no-pthread-stubs.patch b/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
deleted file mode 100644
index a8de91d9d..000000000
--- a/multilib-testing/lib32-libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,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@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +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:1 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
diff --git a/multilib-testing/lib32-libpng/PKGBUILD b/multilib-testing/lib32-libpng/PKGBUILD
deleted file mode 100644
index eaf7a6869..000000000
--- a/multilib-testing/lib32-libpng/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 72500 2012-06-16 01:36:14Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Travis Willard <travis@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-_pkgbasename=libpng
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.11
-_apngver=1.5.11
-_libversion=15
-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=('57f838299e701b6db9e8389c5602dc18'
-         'e9ddf7670e78ad93f4cc189c884d4f26')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 --program-suffix=-32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png
-
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  rm "$pkgdir/usr/bin/libpng-config"
-  ln -s "libpng${_libversion}-config-32" "$pkgdir/usr/bin/libpng-config-32"
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD
deleted file mode 100644
index 1de801819..000000000
--- a/multilib-testing/lib32-libxcb/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 77207 2012-10-06 21:00:14Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.9
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('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=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
-
-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 \
-	  --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-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 8e8162f0a..000000000
--- a/multilib-testing/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD
deleted file mode 100644
index 35b76887b..000000000
--- a/multilib-testing/lib32-mesa/PKGBUILD
+++ /dev/null
@@ -1,257 +0,0 @@
-# $Id: PKGBUILD 77479 2012-10-10 21:26:42Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri'
-         'lib32-nouveau-dri') # lib32-libgbm needs udev
-#_git=true
-#_gitdate=20121005
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=8.99.git_$_gitdate
-  else
-    pkgver=9.0
-fi
-
-pkgrel=1
-arch=('x86_64')
-makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0'
-             'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2'
-             'gcc-multilib' 'imake' 'lib32-llvm')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-options=('!libtool')
-source=(git_fixes.diff)
-if [ "${_git}" = "true" ]; then
-  # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
-  #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-  source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz")
-else
-  source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-fi
-md5sums=('2ebce12196dbb7b69bdf7ef53b8afdee'
-         '60e557ce407be3732711da484ab3db6c')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  # for our llvm-config for 32 bit
-  export LLVM_CONFIG=/usr/bin/llvm-config32
-
-  # fix segfault with gfx cards > Ati R700
-  export CFLAGS="${CFLAGS} -O1"
-  export CXXFLAGS="${CXXFLAGS} -O1"
-
-  cd ${srcdir}/?esa-*
-
-  # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-
-  COMMONOPTS="--prefix=/usr \
-    --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
-    --enable-gallium-llvm \
-    --disable-gallium-egl --enable-shared-glapi \
-    --enable-shared-glapi \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-gles1 \
-    --enable-gles2 \
-    --disable-egl \
-    --enable-texture-float \
-    --enable-osmesa \
-    --enable-32-bit \
-    --libdir=/usr/lib32 "
-    # --enable-gbm disabled because it needs udev
-
-  if [ "${_git}" = "true" ]; then
-    ./autogen.sh \
-      $COMMONOPTS
-  else
-    autoreconf -vfi
-    ./configure \
-      $COMMONOPTS
-  fi
-
-  make
-}
-
-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-*   
-
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
-}
-
-package_lib32-libgl() {
-  depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libglapi'
-           'libgl')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
-  # currently disabled so force the remove
-  conflicts=('lib32-libgbm')
-  replace=('lib32-libgbm')
-
-  cd ${srcdir}/?esa-*
-
-  # fix linking because of splitted package
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # libGL & libdricore
-  make -C src/glx DESTDIR="${pkgdir}" install
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-  
-  # --with-gallium-drivers=swrast
-  make -C src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  ln -s libgl "${pkgdir}/usr/share/licenses/libgl/lib32-libgl"
-}
-
-package_lib32-mesa() {
-  # check also gl.pc
-  depends=('lib32-libgl' 'lib32-libx11>=1.5.0' 'lib32-libxext>=1.3.1' 'lib32-libxdamage' 'lib32-libxfixes' 'lib32-libxcb'
-           'lib32-libxxf86vm' 'mesa')
-  pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
-
-  cd ${srcdir}/?esa-*
-
-  # .pc files
-  make -C src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
-  make -C src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
-}
-
-package_lib32-osmesa() {
-  depends=('lib32-libglapi' 'lib32-gcc-libs' 'osmesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library (32-bits)"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-}
-
-# package_lib32-libgbm() {
-#   depends=('lib32-libglapi' 'lib32-libdrm' 'libgbm')
-#   pkgdesc="Mesa gbm library (32-bit)"
-# 
-#   cd ${srcdir}/?esa-*
-# 
-#   # fix linking because of splitted package
-#   make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-# 
-#   make -C src/gbm DESTDIR="${pkgdir}" install
-# 
-#   # fix linking because of splitted package - cleanup
-#   make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-# 
-#   install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-#   ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm"
-# }
-
-package_lib32-libgles() {
-  depends=('lib32-libglapi' 'lib32-libdrm' 'libgles')
-  pkgdesc="Mesa GLES libraries (32-bit)"
-
-  cd ${srcdir}/?esa-*
-
-  # fix linking because of splitted package
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # --enable-gles1 --enable-gles2
-  make -C src/mapi/es1api DESTDIR="${pkgdir}" install
-  make -C src/mapi/es2api DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-  
-  rm -r "${pkgdir}"/usr/include
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
-}
-
-package_lib32-ati-dri() {
-  depends=("lib32-libgl=${pkgver}" 'ati-dri')
-  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-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # classic mesa drivers for radeon,r200
-  make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600
-  make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  make -C src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
-  ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri"
-}
-
-package_lib32-intel-dri() {
-  depends=("lib32-libgl=${pkgver}" 'intel-dri')
-  pkgdesc="Mesa DRI drivers for Intel (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  make -C src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
-  ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri"
-}
-
-package_lib32-nouveau-dri() {
-  depends=("lib32-libgl=${pkgver}" 'nouveau-dri')
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
-  ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri"
-}
-
diff --git a/multilib-testing/lib32-mesa/git_fixes.diff b/multilib-testing/lib32-mesa/git_fixes.diff
deleted file mode 100644
index 8132d1d10..000000000
--- a/multilib-testing/lib32-mesa/git_fixes.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
-From: Ian Romanick <ian.d.romanick@intel.com>
-Date: Mon, 08 Oct 2012 22:07:10 +0000
-Subject: docs: Add 9.0 release md5sums
-
-Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
----
-diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
-index d72c5bb..02b7324 100644
---- a/docs/relnotes-9.0.html
-+++ b/docs/relnotes-9.0.html
-@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
- 
- <h2>MD5 checksums</h2>
- <pre>
--tbd
-+be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
-+60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
-+16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
- </pre>
- 
- 
---
-cgit v0.9.0.2-2-gbebe
-From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:47:40 +0000
-Subject: mesa: don't call TexImage driver hooks for zero-sized images
-
-This simply avoids some failed assertions but there's no reason to
-call the driver hooks for storing a tex image if its size is zero.
-
-Note: This is a candidate for the stable branches.
-(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 21646cc..8004876 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
-                                           border, internalFormat, texFormat);
- 
-                /* Give the texture to the driver.  <pixels> may be null. */
--               if (compressed) {
--                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
--                                                 imageSize, pixels);
--               }
--               else {
--                  ctx->Driver.TexImage(ctx, dims, texImage, format,
--                                       type, pixels, unpack);
-+               if (width > 0 && height > 0 && depth > 0) {
-+                  if (compressed) {
-+                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
-+                                                    imageSize, pixels);
-+                  }
-+                  else {
-+                     ctx->Driver.TexImage(ctx, dims, texImage, format,
-+                                          type, pixels, unpack);
-+                  }
-                }
- 
-                check_gen_mipmap(ctx, target, texObj, level);
---
-cgit v0.9.0.2-2-gbebe
-From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:59:27 +0000
-Subject: mesa: fix error check for zero-sized compressed subtexture
-
-For glCompressedTexSubImage, width or height = 0 is legal.
-Fixes a failure in piglit's s3tc-errors test.
-
-This is for the 9.0 and 8.0 branches.  Already fixed on master.
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 8004876..38fa9fa 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
-    if (!_mesa_is_compressed_format(ctx, format))
-       return GL_INVALID_ENUM;
- 
--   if (width < 1 || width > maxTextureSize)
-+   if (width < 0 || width > maxTextureSize)
-       return GL_INVALID_VALUE;
- 
--   if ((height < 1 || height > maxTextureSize)
-+   if ((height < 0 || height > maxTextureSize)
-        && dimensions > 1)
-       return GL_INVALID_VALUE;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/multilib-testing/lib32-mesa/pthread_fix.diff b/multilib-testing/lib32-mesa/pthread_fix.diff
deleted file mode 100644
index bdfe2d865..000000000
--- a/multilib-testing/lib32-mesa/pthread_fix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Thu, 27 Sep 2012 22:49:52 +0000
-Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty
-
----
-diff --git a/configure.ac b/configure.ac
-index 770df2f..dc2720d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[],
- 
- dnl Check for pthreads
- AX_PTHREAD
-+dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
-+dnl to -pthread, which causes problems if we need -lpthread to appear in
-+dnl pkgconfig files.
-+test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
- 
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
---
-cgit v0.9.0.2-2-gbebe
diff --git a/multilib-testing/lib32-util-linux/PKGBUILD b/multilib-testing/lib32-util-linux/PKGBUILD
deleted file mode 100644
index 704327be8..000000000
--- a/multilib-testing/lib32-util-linux/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 75896 2012-09-05 04:43:08Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-_pkgbasename=util-linux
-pkgname=lib32-$_pkgbasename
-pkgver=2.22
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
-url='http://www.kernel.org/pub/linux/utils/util-linux/'
-arch=('x86_64')
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
-provides=('lib32-util-linux-ng')
-conflicts=('lib32-util-linux-ng')
-replaces=('lib32-util-linux-ng')
-license=('GPL2')
-options=('!libtool' '!emptydirs')
-source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v$pkgver/util-linux-$pkgver.tar.xz")
-md5sums=('ba2d8cc12a937231c80a04f7f7149303')
-
-shopt -s extglob
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --without-ncurses --libdir=/usr/lib32
-
-  make lib{uuid,blkid,mount}.la
-}
-
-package() {
-  make -C "$_pkgbasename-$pkgver" \
-    DESTDIR="$pkgdir" \
-    install-usrlib_execLTLIBRARIES \
-    install-pkgconfigDATA
-}
diff --git a/multilib-testing/libtool-multilib/PKGBUILD b/multilib-testing/libtool-multilib/PKGBUILD
deleted file mode 100644
index 020346e32..000000000
--- a/multilib-testing/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 77269 2012-10-08 13:37:49Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <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=7
-pkgdesc="A generic library support script for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-_gccver=4.7.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 f4f700705..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/wine/PKGBUILD b/multilib-testing/wine/PKGBUILD
deleted file mode 100644
index 6bffe1ffb..000000000
--- a/multilib-testing/wine/PKGBUILD
+++ /dev/null
@@ -1,154 +0,0 @@
-# $Id: PKGBUILD 77392 2012-10-09 14:39:41Z 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.5.14
-pkgrel=2
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign})
-md5sums=('f84c54bd7422328e96b6cf14ee6e163c'
-         'dd0c87e2dea529f0c898fe2ffa5390ce')
-
-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
-  glu             lib32-glu
-  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
-  libxcomposite   lib32-libxcomposite
-  oss
-  samba
-)
-  
-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
-  libjpeg-turbo   lib32-libjpeg-turbo
-  libxcomposite   lib32-libxcomposite
-  oss             cups
-  samba
-)
-
-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="${CXXFLAGS/-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 and FS#23277
-  make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
-}
-
-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 b633b2483..000000000
--- a/multilib/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 75201 2012-08-16 01:54:04Z allan $
-# Maintainer: Jan Alexander Steffens (heftig) <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=10
-_date=20120323
-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.16' 'zlib')
-makedepends=('gcc-multilib') # Make sure we compile this with gcc-multilib
-checkdepends=('dejagnu')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('de2ac4298732827f8af706fc24020330')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --with-lib-path=/usr/lib:/usr/local/lib \
-    --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
-
-  # Rebuild libopcodes.a with -fPIC
-  cp -a opcodes opcodes-pic
-  make -C opcodes-pic clean 
-  make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-
-  # do not abort on errors - manually check log files
-  # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror)
-  make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \
-       CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k 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
-  install -m644 opcodes/libopcodes.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 274b8899f..000000000
--- a/multilib/chuck/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 75783 2012-08-31 07:48:07Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: 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.3.0.2
-pkgrel=1
-pkgdesc="Concurrent, on-the-fly audio programming language"
-arch=('x86_64' 'i686')
-url="http://chuck.cs.princeton.edu/"
-license=('GPL')
-depends=('gcc-libs' 'libsndfile')
-makedepends=('bison' 'flex' 'setconf') 
-source=("http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz")
-sha256sums=('05a9d2d54b6a5068a8bb186805a1376c3f353743b95b5691770ffadea0ca13a6')
-
-if [[ $CARCH == x86_64 ]]; then
-  depends=('gcc-libs-multilib' 'lib32-libsndfile' 'lib32-alsa-lib')
-  makedepends+=('gcc-multilib')
-fi
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver/src"
-
-  msg2 "Configuring..."
-  if [[ $CARCH == x86_64 ]]; then
-    setconf makefile CC 'gcc -m32'
-    setconf makefile CXX 'g++ -m32'
-    setconf makefile LD 'g++ -m32'
-  fi
-	CFLAGS+=' -fno-strict-aliasing -lpthread'
-	CXXFLAGS+=' -fno-strict-aliasing -fpermissive -lpthread'
-
-  msg2 "Compiling..."
-  # Alternatives to linux-alsa are: linux-jack linux-oss osx win32
-  make linux-alsa
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/src"
-
-  install -Dm755 chuck $pkgdir/usr/bin/chuck
-  mkdir -p "$pkgdir/usr/share/doc/$pkgname"
-  cp -r ../examples "$pkgdir/usr/share/doc/$pkgname/"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/dev86/PKGBUILD b/multilib/dev86/PKGBUILD
deleted file mode 100644
index 5175e7173..000000000
--- a/multilib/dev86/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 78764 2012-10-24 11:32:14Z 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.19
-pkgrel=1
-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
-	mandir.patch
-	copt.patch)
-md5sums=('442e98e1afa23fe00d40c5a996385942'
-         '509df653dec8956faf1a40a8c544d9ce'
-         '32839371e28c1a04477df883e970d6cd')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/mandir.patch
-  patch -p1 <$srcdir/copt.patch
-  echo 'quit' | make PREFIX=/usr DIST="$pkgdir"
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make install-all DIST="$pkgdir"
-
-  # 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/copt.patch b/multilib/dev86/copt.patch
deleted file mode 100644
index f3dc1f310..000000000
--- a/multilib/dev86/copt.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -wbBur dev86-0.16.19.org/copt/copt.c dev86-0.16.19/copt/copt.c
---- dev86-0.16.19.org/copt/copt.c	2003-10-07 23:46:35.000000000 +0400
-+++ dev86-0.16.19/copt/copt.c	2012-10-24 15:23:48.604705265 +0400
-@@ -174,7 +174,11 @@
-   /* Delete leading white spaces */
-   for (cp = buf; *cp && isspace(*cp); cp++) ;
-   if (cp != buf && *cp)
--	strcpy(buf, cp);
-+  {
-+	int len = strlen(cp);
-+	memmove(buf, cp, len);
-+	buf[len] = 0;
-+  }
- 
-   return(buf);
- }
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/dev86/mandir.patch b/multilib/dev86/mandir.patch
deleted file mode 100644
index 980bc3176..000000000
--- a/multilib/dev86/mandir.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -wbBur dev86-0.16.19.org/dis88/Makefile dev86-0.16.19/dis88/Makefile
---- dev86-0.16.19.org/dis88/Makefile	1998-07-31 17:01:40.000000000 +0400
-+++ dev86-0.16.19/dis88/Makefile	2012-10-24 14:46:02.684587469 +0400
-@@ -38,7 +38,7 @@
- 
- install:	dis88
- 	install -m 755 -s dis88   $(DIST)$(PREFIX)/bin/dis86
--	install -m 644    dis88.1 $(DIST)$(PREFIX)/man/man1/dis86.1
-+	install -m 644    dis88.1 $(DIST)$(PREFIX)/share/man/man1/dis86.1
- 
- $(OBJ): dis.h a.out.h
- 
-diff -wbBur dev86-0.16.19.org/Makefile dev86-0.16.19/Makefile
---- dev86-0.16.19.org/Makefile	2012-08-14 00:10:08.000000000 +0400
-+++ dev86-0.16.19/Makefile	2012-10-24 14:45:50.917920191 +0400
-@@ -17,7 +17,7 @@
- LIBDIR=  $(PREFIX)/lib/bcc
- INCLDIR= $(PREFIX)/lib/bcc
- ASLDDIR= $(BINDIR)
--MANDIR=	 $(PREFIX)/man
-+MANDIR=	 $(PREFIX)/share/man
- CFLAGS=  -O
- IFDEFNAME= ifdef
- 
-diff -wbBur dev86-0.16.19.org/man/Makefile dev86-0.16.19/man/Makefile
---- dev86-0.16.19.org/man/Makefile	1998-07-31 17:03:30.000000000 +0400
-+++ dev86-0.16.19/man/Makefile	2012-10-24 14:45:55.494587123 +0400
-@@ -1,5 +1,5 @@
- 
--MANDIR=/usr/man
-+MANDIR=/usr/share/man
- MAN1PG=as86.1 bcc.1 elks.1 elksemu.1 ld86.1
- MAN1DIR=$(MANDIR)/man1
- 
diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD
deleted file mode 100644
index db9faeb04..000000000
--- a/multilib/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,319 +0,0 @@
-# $Id: PKGBUILD 77389 2012-10-09 14:32:55Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <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.7.2
-pkgrel=1
-#_snapshot=4.7-20120721
-_libstdcppmanver=20120924		# Note: check source directory name when updating this
-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.16')
-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++-api.${_libstdcppmanver}.man.tar.bz2
-	gcc_pure64-multilib.patch
-        gcc-4.7.1-libada-pic.patch
-        gcc-4.7.1-libgo-write.patch)
-md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         '7f3d52515daafffb57c287f427381106'
-         'ec24c32d3d1030c2bc8cb2ad2d1dc629'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c')
-
-
-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 -p1 -i ${srcdir}/gcc_pure64-multilib.patch
-
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-  
-  # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.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 \
-      --disable-ppl-version-check --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu \
-      --enable-multilib --disable-libssp \
-      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
-      --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-multilib()
-{
-  pkgdesc="Runtime libraries shipped by GCC for multilib"
-  depends=('glibc>=2.16' "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 libitm; 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 -C $CHOST/libitm 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 -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
-  # remove stuff in lib32-gcc-libs
-  rm -r ${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.16' "gcc-libs>=$pkgver")
-
-  cd gcc-build
-  make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src libitm; 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 -r ${pkgdir}/usr/lib
-  rm -r ${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
-  
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
-  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
-
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  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}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{,32/}{libcaf_single,libgfortranbegin}.a
-  rm -r $pkgdir/usr/lib{,32}/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.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 expect this symlinks
-  ln -s gcc ${pkgdir}/usr/bin/cc
-
-  # 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}/libstdc++-api.${_libstdcppmanver}.man/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
-
-  ln -s gfortran ${pkgdir}/usr/bin/f95
-
-  # 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
-
-  ln -s gcc ${pkgdir}/usr/bin/gnatgcc
-  
-  # 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-4.7.0-cloog-0.17.patch b/multilib/gcc-multilib/gcc-4.7.0-cloog-0.17.patch
deleted file mode 100644
index c7146fa04..000000000
--- a/multilib/gcc-multilib/gcc-4.7.0-cloog-0.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
diff --git a/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch b/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch
deleted file mode 100644
index 591da1e4a..000000000
--- a/multilib/gcc-multilib/gcc-4.7.1-libada-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- 	-fexceptions -DIN_RTS @have_getipinfo@
- 
- host_subdir = @host_subdir@
diff --git a/multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch b/multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
deleted file mode 100644
index 427efe8a6..000000000
--- a/multilib/gcc-multilib/gcc-4.7.1-libgo-mksysinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
--  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
--  rusage=`echo $rusage | sed -e 's/^ *//'`
-   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
-   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+  rusage=`echo $rusage | sed -e 's/^ *//'`
-   nrusage=
-   while test -n "$rusage"; do
-     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch b/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch
deleted file mode 100644
index a7be83fda..000000000
--- a/multilib/gcc-multilib/gcc-4.7.1-libgo-write.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
---- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
-+++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
-@@ -17,7 +17,8 @@
- 	G* g = runtime_g();
- 
- 	if(g == nil || g->writebuf == nil) {
--		runtime_write(2, v, n);
-+		ssize_t bytesWritten = runtime_write(2, v, n);
-+		(void)bytesWritten;
- 		return;
- 	}
- 	
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-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 b5576ae0e..000000000
--- a/multilib/gcc-multilib/gcc_pure64-multilib.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -u -r gcc-4.7.0/gcc/config/i386/linux64.h gcc-4.7.0-pure64/gcc/config/i386/linux64.h
---- gcc-4.7.0/gcc/config/i386/linux64.h	2011-07-07 17:38:34.000000000 +0200
-+++ gcc-4.7.0-pure64/gcc/config/i386/linux64.h	2012-03-24 11:52:58.926204014 +0100
-@@ -29,5 +29,5 @@
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
- #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"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -u -r gcc-4.7.0/gcc/config/i386/t-linux64 gcc-4.7.0-pure64/gcc/config/i386/t-linux64
---- gcc-4.7.0/gcc/config/i386/t-linux64	2011-11-02 16:23:48.000000000 +0100
-+++ gcc-4.7.0-pure64/gcc/config/i386/t-linux64	2012-03-24 11:52:44.119651885 +0100
-@@ -34,6 +34,6 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
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 7a1a5f2b7..000000000
--- a/multilib/jack2-multilib/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 77161 2012-10-06 07:18:34Z 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=4
-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'
-        'ffado_setbuffsize-jack2.patch')
-md5sums=('1dd2ff054cab79dfc11d134756f27165'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef'
-         '1502d82fe2276d6f224fff6467a0b6f9')
-
-_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"
-
-  # backport firewire stuff
-  #   - needed for setbuffsize feature in latest stable ffado
-  # from https://github.com/jackaudio/jack2/commit/96e0251
-  (
-  cd $_tarname-$pkgver
-  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch"
-  )
-
-  # Some optimisation bug exists for current GCC
-  # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663
-  export CFLAGS="${CFLAGS/-O[0-9]/-O0}"
-  export CXXFLAGS="$CFLAGS"
-
-  # 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/usr/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/usr/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  _mklinks
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/jack2-multilib/ffado_setbuffsize-jack2.patch b/multilib/jack2-multilib/ffado_setbuffsize-jack2.patch
deleted file mode 100644
index 0c74aad24..000000000
--- a/multilib/jack2-multilib/ffado_setbuffsize-jack2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
-Date: Sat, 17 Mar 2012 22:36:30 +0100
-Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size
-
-This is a port of Jonathan Woithe's patch from jackd1.
-With sufficiently recent versions of FFADO, it allows to change
-the buffersize at runtime.
----
- linux/firewire/JackFFADODriver.cpp |   65 ++++++++++++++++++++++++++++++++----
- linux/firewire/JackFFADODriver.h   |    6 ++++
- 2 files changed, 65 insertions(+), 6 deletions(-)
-
-diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
-index b33e1cd..085b78a 100644
---- a/linux/firewire/JackFFADODriver.cpp
-+++ b/linux/firewire/JackFFADODriver.cpp
-@@ -3,6 +3,7 @@
- Copyright (C) 2004 Grame
- Copyright (C) 2007 Pieter Palmers
- Copyright (C) 2009 Devin Anderson
-+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth
- 
- 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
-@@ -48,7 +49,10 @@
- namespace Jack
- {
- 
-+// Basic functionality requires API version 8.  If version 9 or later
-+// is present the buffers can be resized at runtime.
- #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
-+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
- 
- #define jack_get_microseconds GetMicroSeconds
- 
-@@ -281,19 +285,68 @@
- int
- JackFFADODriver::SetBufferSize (jack_nframes_t nframes)
- {
--    printError("Buffer size change requested but not supported!!!");
-+    ffado_driver_t* driver = (ffado_driver_t*)fDriver;
-+    signed int chn;
-+
-+    // The speed of this function isn't critical; we can afford the
-+    // time to check the FFADO API version.
-+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
-+		    ffado_streaming_set_period_size == NULL) {
-+	    printError("unsupported on current version of FFADO; please upgrade FFADO");
-+	    return -1;
-+    }
- 
--    /*
-     driver->period_size = nframes;
-     driver->period_usecs =
-             (jack_time_t) floor ((((float) nframes) / driver->sample_rate)
-                                  * 1000000.0f);
--    */
-+
-+
-+    // Reallocate the null and scratch buffers.
-+    driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+    if(driver->nullbuffer == NULL) {
-+	    printError("could not allocate memory for null buffer");
-+	    return -1;
-+    }
-+    driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t));
-+    if(driver->scratchbuffer == NULL) {
-+	    printError("could not allocate memory for scratch buffer");
-+	    return -1;
-+    }
-+
-+    // MIDI buffers need reallocating
-+    for (chn = 0; chn < driver->capture_nchannels; chn++) {
-+	    if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-+		    // setup the midi buffer
-+		    if (driver->capture_channels[chn].midi_buffer != NULL)
-+			    free(driver->capture_channels[chn].midi_buffer);
-+		    driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+	    }
-+    }
-+    for (chn = 0; chn < driver->playback_nchannels; chn++) {
-+	    if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-+		    if (driver->playback_channels[chn].midi_buffer != NULL)
-+			    free(driver->playback_channels[chn].midi_buffer);
-+		    driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t));
-+	    }
-+    }
-+
-+    // Notify FFADO of the period size change
-+    if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
-+	    printError("could not alter FFADO device period size");
-+	    return -1;
-+    }
-+
-+    // This is needed to give the shadow variables a chance to
-+    // properly update to the changes.
-+    sleep(1);
- 
-     /* tell the engine to change its buffer size */
--    //driver->engine->set_buffer_size (driver->engine, nframes);
-+    JackAudioDriver::SetBufferSize(nframes);  // Generic change, never fails
- 
--    return -1; // unsupported
-+    UpdateLatencies();
-+
-+    return 0;
- }
- 
- typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-@@ -306,7 +359,7 @@
- 
-     assert(params);
- 
--    if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-+    if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-         printError("Incompatible libffado version! (%s)", ffado_get_version());
-         return NULL;
-     }
-diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h
-index cb2a45d..790f4dd 100644
---- a/linux/firewire/JackFFADODriver.h
-+++ b/linux/firewire/JackFFADODriver.h
-@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver
-         int Read();
-         int Write();
- 
-+        // BufferSize can be changed
-+        bool IsFixedBufferSize()
-+        {
-+            return false;
-+        }
-+
-         int SetBufferSize(jack_nframes_t nframes);
- };
- 
--- 
-1.7.10
-
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 35ed7c985..000000000
--- a/multilib/lib32-alsa-lib/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 75960 2012-09-07 10:05:13Z lcarlier $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=alsa-lib
-pkgname=lib32-${_pkgbasename}
-pkgver=1.0.26
-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)
-md5sums=('2dfa35d28471d721e592b616beedf965')
-
-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}
-}
diff --git a/multilib/lib32-alsa-oss/PKGBUILD b/multilib/lib32-alsa-oss/PKGBUILD
deleted file mode 100644
index 51273a145..000000000
--- a/multilib/lib32-alsa-oss/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 62816 2012-01-27 09:25:54Z bluewind $
-# Maintainer: judd <jvinet@zeroflux.org>
-
-_pkgbasename=alsa-oss
-pkgname=lib32-${_pkgbasename}
-pkgver=1.0.25
-pkgrel=1
-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=('922ea177db15c72f1b5037181c73f934')
-
-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 38001e967..000000000
--- a/multilib/lib32-alsa-plugins/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 75962 2012-09-07 10:09:56Z lcarlier $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-_pkgbasename=alsa-plugins
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.26
-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 lib32-jack lib32-speex lib32-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=('4facd408326ef5567a7d4ceb6589e6b0')
-
-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
-  rm -r "$pkgdir/usr/share"
-}
diff --git a/multilib/lib32-atk/PKGBUILD b/multilib/lib32-atk/PKGBUILD
deleted file mode 100644
index eacc6e69e..000000000
--- a/multilib/lib32-atk/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 70627 2012-05-13 11:29:51Z bluewind $
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer: Mikko Seppälä <t-r-a-y@mbnet.fi>
-_pkgbasename=atk
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.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=('091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d')
-
-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 f93330658..000000000
--- a/multilib/lib32-cairo/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 70681 2012-05-14 16:17:30Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=cairo
-pkgname=lib32-$_pkgbasename
-pkgver=1.12.2
-pkgrel=1
-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.xz
-cairo-1.10.0-buggy_gradients.patch)
-md5sums=('87649eb75789739d517c743e94879e51'
-         '9b323790dab003e228c6955633cb888e')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  autoreconf -vfi
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-      --sysconfdir=/etc  --localstatedir=/var \
-      --disable-static --enable-tee --disable-xlib-xcb
-  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-cairo/git_fixes.patch b/multilib/lib32-cairo/git_fixes.patch
deleted file mode 100644
index 6ad8979eb..000000000
--- a/multilib/lib32-cairo/git_fixes.patch
+++ /dev/null
@@ -1,1086 +0,0 @@
-From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Sun, 25 Mar 2012 18:37:14 +0000
-Subject: Fix math in comments
-
----
-diff --git a/src/cairo-arc.c b/src/cairo-arc.c
-index dc07fee..6977e88 100644
---- a/src/cairo-arc.c
-+++ b/src/cairo-arc.c
-@@ -139,7 +139,7 @@ _arc_segments_needed (double	      angle,
- 
-    From that paper, a very practical value of h is:
- 
--	h = 4/3 * tan(angle/4)
-+	h = 4/3 * R * tan(angle/4)
- 
-    This value does not give the spline with minimal error, but it does
-    provide a very good approximation, (6th-order convergence), and the
---
-cgit v0.9.0.2-2-gbebe
-From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Tue, 27 Mar 2012 21:25:37 +0000
-Subject: gl: use font's antialias option to check whether it needs mask
-
-There is need to loop over number of glyphs to check wether the glyph
-image is a ARGB32 as the font's antialias option can be used for checking.
-If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32,
-otherwise it will be A8 format. Therefore we will only be using
-component-alpha at SUBPIXEL (or better) font quality and only then need
-a mask for multiple pass glyph composition.
----
-diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
-index 832956f..9756ea4 100644
---- a/src/cairo-gl-glyphs.c
-+++ b/src/cairo-gl-glyphs.c
-@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void			*_dst,
- 
-     TRACE ((stderr, "%s\n", __FUNCTION__));
- 
--    /* If any of the glyphs are component alpha, we have to go through a mask,
--     * since only _cairo_gl_surface_composite() currently supports component
--     * alpha.
-+    /* If any of the glyphs require component alpha, we have to go through
-+     * a mask, since only _cairo_gl_surface_composite() currently supports
-+     * component alpha.
-      */
--    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER) {
--	for (i = 0; i < info->num_glyphs; i++) {
--	    cairo_scaled_glyph_t *scaled_glyph;
--
--	    if (_cairo_scaled_glyph_lookup (info->font, info->glyphs[i].index,
--					    CAIRO_SCALED_GLYPH_INFO_SURFACE,
--					    &scaled_glyph) == CAIRO_INT_STATUS_SUCCESS &&
--		scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32)
--	    {
--		info->use_mask = TRUE;
--		break;
--	    }
--	}
-+    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER &&
-+	(info->font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL ||
-+	 info->font->options.antialias == CAIRO_ANTIALIAS_BEST))
-+    {
-+	info->use_mask = TRUE;
-     }
- 
-     if (info->use_mask) {
---
-cgit v0.9.0.2-2-gbebe
-From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 28 Mar 2012 23:32:36 +0000
-Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask
-
-The SOURCE and CLEAR are the odd pair in Cairo's range of operators that
-are bound by the shape/mask, but are unbound by the source. This
-regularly leads to bugs as only track the bound/unbound rectangles and
-confuse the meaning when bound only by the mask.
-
-What is required is that the unbound extents in this case is only
-trimmed by the mask (the bounded extents are still the intersection of
-all).
-
-Fixes bug-source-cu
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c
-index 106571e..8c5cd5a 100644
---- a/src/cairo-composite-rectangles.c
-+++ b/src/cairo-composite-rectangles.c
-@@ -147,8 +147,12 @@ _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents,
-     if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK)
- 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
-     if (_cairo_clip_is_all_clipped (extents->clip))
-@@ -199,8 +203,12 @@ _cairo_composite_rectangles_intersect_source_extents (cairo_composite_rectangles
- 	rect.height == extents->bounded.height)
- 	return CAIRO_INT_STATUS_SUCCESS;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     clip = extents->clip;
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
-@@ -253,8 +261,12 @@ _cairo_composite_rectangles_intersect_mask_extents (cairo_composite_rectangles_t
- 	mask.height == extents->bounded.height)
- 	return CAIRO_INT_STATUS_SUCCESS;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     clip = extents->clip;
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
---
-cgit v0.9.0.2-2-gbebe
-From af6e084dd78fcbb8ecce46c57f655f5e24343b8c Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu, 29 Mar 2012 13:48:24 +0000
-Subject: cairoint: Mark PDF surface as requiring the deflate stream output
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairoint.h b/src/cairoint.h
-index 9a8003e..9f20d51 100644
---- a/src/cairoint.h
-+++ b/src/cairoint.h
-@@ -73,7 +73,10 @@
- #include "cairo-compiler-private.h"
- #include "cairo-error-private.h"
- 
--#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE
-+#if CAIRO_HAS_PDF_SURFACE    || \
-+    CAIRO_HAS_PS_SURFACE     || \
-+    CAIRO_HAS_SCRIPT_SURFACE || \
-+    CAIRO_HAS_XML_SURFACE
- #define CAIRO_HAS_DEFLATE_STREAM 1
- #endif
- 
-@@ -84,7 +87,9 @@
- #define CAIRO_HAS_FONT_SUBSET 1
- #endif
- 
--#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_FONT_SUBSET
-+#if CAIRO_HAS_PS_SURFACE  || \
-+    CAIRO_HAS_PDF_SURFACE || \
-+    CAIRO_HAS_FONT_SUBSET
- #define CAIRO_HAS_PDF_OPERATORS 1
- #endif
- 
---
-cgit v0.9.0.2-2-gbebe
-From a965b0f95fdeb567f7ccb51f7c8c47735a61e2d9 Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Thu, 29 Mar 2012 01:08:51 +0000
-Subject: gl: fix y-axis origin when map_to_image() for non texture GL surface
-
-We need to fix y-axis origin when map a GL surface to image surface for
-non-texture GL surface.
-
-Test cases: extended-blend-alpha-mask, extended-blend-mask.
-Although the image outputs is not right, but the image on the first grid
-(upper-left corner) is correct comparing to image output.
----
-diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
-index 8bbf939..32ecf63 100644
---- a/src/cairo-gl-surface.c
-+++ b/src/cairo-gl-surface.c
-@@ -985,6 +985,7 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
-     unsigned int cpp;
-     cairo_bool_t invert;
-     cairo_status_t status;
-+    int y;
- 
-     /* Want to use a switch statement here but the compiler gets whiny. */
-     if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) {
-@@ -1065,7 +1066,12 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
- 	glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp);
-     if (invert)
- 	glPixelStorei (GL_PACK_INVERT_MESA, 1);
--    glReadPixels (extents->x, extents->y,
-+
-+    y = extents->y;
-+    if (! _cairo_gl_surface_is_texture (surface))
-+	y = surface->height - extents->y - extents->height;
-+
-+    glReadPixels (extents->x, y,
- 		  extents->width, extents->height,
- 		  format, type, image->data);
-     if (invert)
---
-cgit v0.9.0.2-2-gbebe
-From c77112c5464d7ff21052527f82f4d729cc509291 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Mon, 02 Apr 2012 18:43:00 +0000
-Subject: xcb: Fix SHM in _get_image()
-
-Commit 2283ab9 introduced a logic error. Instead of falling back to the non-SHM
-path when getting the image via SHM failed, we now did the fallback when getting
-the image via SHM worked (which means that the SHM operation was a waste of
-time).
-
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
-index fff4f52..6bedbda 100644
---- a/src/cairo-xcb-surface.c
-+++ b/src/cairo-xcb-surface.c
-@@ -367,7 +367,7 @@ _get_image (cairo_xcb_surface_t		 *surface,
-     if (use_shm) {
- 	image = _get_shm_image (surface, x, y, width, height);
- 	if (image) {
--	    if (image->status) {
-+	    if (image->status == CAIRO_STATUS_SUCCESS) {
- 		_cairo_xcb_connection_release (connection);
- 		return image;
- 	    }
---
-cgit v0.9.0.2-2-gbebe
-From cc247c346b75353f16ab40ac74c54cdd9663d16b Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Mon, 02 Apr 2012 21:29:47 +0000
-Subject: gl: Remove an unused variable
-
----
-diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c
-index b364b92..ce7c0dd 100644
---- a/src/cairo-gl-gradient.c
-+++ b/src/cairo-gl-gradient.c
-@@ -207,7 +207,6 @@ _cairo_gl_gradient_create (cairo_gl_context_t           *ctx,
-     cairo_status_t status;
-     int tex_width;
-     void *data;
--    cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
- 
-     if ((unsigned int) ctx->max_texture_size / 2 <= n_stops)
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
---
-cgit v0.9.0.2-2-gbebe
-From 7a262fd398c8a1f3c9052e8d9ec459e27ff91b4d Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed, 04 Apr 2012 10:23:09 +0000
-Subject: fix bug in _cairo_image_analyze_color
-
----
-diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
-index 8208a15..e860e1b 100644
---- a/src/cairo-image-surface.c
-+++ b/src/cairo-image-surface.c
-@@ -1130,9 +1130,12 @@ _cairo_image_analyze_color (cairo_image_surface_t      *image)
-     if (image->color != CAIRO_IMAGE_UNKNOWN_COLOR)
- 	return image->color;
- 
--    if (image->format == CAIRO_FORMAT_A1 || image->format == CAIRO_FORMAT_A8)
-+    if (image->format == CAIRO_FORMAT_A1)
- 	return image->color = CAIRO_IMAGE_IS_MONOCHROME;
- 
-+    if (image->format == CAIRO_FORMAT_A8)
-+	return image->color = CAIRO_IMAGE_IS_GRAYSCALE;
-+
-     if (image->format == CAIRO_FORMAT_ARGB32) {
- 	image->color = CAIRO_IMAGE_IS_MONOCHROME;
- 	for (y = 0; y < image->height; y++) {
---
-cgit v0.9.0.2-2-gbebe
-From 70b2856ed3d31b41e69b3d82fb9c5c11c2b3d3d4 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 05 Apr 2012 23:43:35 +0000
-Subject: type1-subset: use fallback font if glyph widths are calculated
-
-Bug 48349 has a pdf file with a Type 1 font where the glyph widths are
-of the form:
-
-34 9302 19 div hsbw
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index 607ac8e..ba1008a 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -751,6 +751,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 	    command = *p++;
- 	    switch (command) {
- 		case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		     if (! last_op_was_integer)
-+			  return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
-@@ -797,6 +800,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 			    break;
- 
- 			case TYPE1_CHARSTRING_COMMAND_SBW:
-+			     if (! last_op_was_integer)
-+				  return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
- 			    font->build_stack.sp = 0;
- 			    last_op_was_integer = FALSE;
---
-cgit v0.9.0.2-2-gbebe
-From a6d955fcc46ae2da8d6f3b2cadeae64c03066461 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 05 Apr 2012 23:53:50 +0000
-Subject: fix indentation in cairo_type1_font_subset_parse_charstring
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index ba1008a..ddef8ae 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -1,3 +1,4 @@
-+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
- /* cairo - a vector graphics library with display and print output
-  *
-  * Copyright © 2006 Red Hat, Inc
-@@ -750,86 +751,79 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
-         if (*p < 32) {
- 	    command = *p++;
- 	    switch (command) {
--		case TYPE1_CHARSTRING_COMMAND_HSBW:
--		     if (! last_op_was_integer)
--			  return CAIRO_INT_STATUS_UNSUPPORTED;
-+	    case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		if (! last_op_was_integer)
-+		    return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
-+		font->build_stack.sp = 0;
-+		last_op_was_integer = FALSE;
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
-+		if (font->subset_subrs  &&
-+		    last_op_was_integer &&
-+		    font->build_stack.top_value >= 0    &&
-+		    font->build_stack.top_value < font->num_subrs)
-+		{
-+		    subr_num = font->build_stack.top_value;
-+		    font->subrs[subr_num].used = TRUE;
-+		    last_op_was_integer = FALSE;
-+		    status = cairo_type1_font_subset_parse_charstring (font,
-+								       glyph,
-+								       font->subrs[subr_num].subr_string,
-+								       font->subrs[subr_num].subr_length);
-+		} else {
-+		    font->subset_subrs = FALSE;
-+		}
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_ESCAPE:
-+		command = command << 8 | *p++;
-+		switch (command) {
-+		case TYPE1_CHARSTRING_COMMAND_SEAC:
-+		    /* The seac command takes five integer arguments.  The
-+		     * last two are glyph indices into the PS standard
-+		     * encoding give the names of the glyphs that this
-+		     * glyph is composed from.  All we need to do is to
-+		     * make sure those glyphs are present in the subset
-+		     * under their standard names. */
-+		    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
-+		    if (unlikely (status))
-+			return status;
-+
-+		    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
-+		    if (unlikely (status))
-+			return status;
- 
--		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
--		    if (font->subset_subrs  &&
--			last_op_was_integer &&
--			font->build_stack.top_value >= 0    &&
--			font->build_stack.top_value < font->num_subrs)
--		    {
--			subr_num = font->build_stack.top_value;
--			font->subrs[subr_num].used = TRUE;
--			last_op_was_integer = FALSE;
--			status = cairo_type1_font_subset_parse_charstring (font,
--									   glyph,
--									   font->subrs[subr_num].subr_string,
--									   font->subrs[subr_num].subr_length);
--		    } else {
--			font->subset_subrs = FALSE;
--		    }
-+		case TYPE1_CHARSTRING_COMMAND_SBW:
-+		    if (! last_op_was_integer)
-+			return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
-+		    font->build_stack.sp = 0;
-+		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_ESCAPE:
--		    command = command << 8 | *p++;
--		    switch (command) {
--			case TYPE1_CHARSTRING_COMMAND_SEAC:
--			    /* The seac command takes five integer arguments.  The
--			     * last two are glyph indices into the PS standard
--			     * encoding give the names of the glyphs that this
--			     * glyph is composed from.  All we need to do is to
--			     * make sure those glyphs are present in the subset
--			     * under their standard names. */
--			    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
--			    if (unlikely (status))
--				return status;
--
--			    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
--			    if (unlikely (status))
--				return status;
--
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_SBW:
--			     if (! last_op_was_integer)
--				  return CAIRO_INT_STATUS_UNSUPPORTED;
--
--			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
--			    for (i = 0; i < font->build_stack.sp; i++)
--				font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
--			    font->ps_stack.num_other_subr_args = font->build_stack.sp;
--			    font->ps_stack.cur_other_subr_arg = 0;
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_POP:
--			    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
--				font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
--				last_op_was_integer = TRUE;
--			    } else {
--				font->subset_subrs = FALSE;
--			    }
--			    break;
--
--			default:
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
-+		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
-+		    for (i = 0; i < font->build_stack.sp; i++)
-+			font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
-+		    font->ps_stack.num_other_subr_args = font->build_stack.sp;
-+		    font->ps_stack.cur_other_subr_arg = 0;
-+		    font->build_stack.sp = 0;
-+		    last_op_was_integer = FALSE;
-+		    break;
-+
-+		case TYPE1_CHARSTRING_COMMAND_POP:
-+		    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
-+			font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
-+			last_op_was_integer = TRUE;
-+		    } else {
-+			font->subset_subrs = FALSE;
- 		    }
- 		    break;
- 
-@@ -837,6 +831,13 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
- 		    break;
-+		}
-+		break;
-+
-+	    default:
-+		font->build_stack.sp = 0;
-+		last_op_was_integer = FALSE;
-+		break;
- 	    }
-         } else {
-             /* integer argument */
---
-cgit v0.9.0.2-2-gbebe
-From 8886220b5027296f5b3b95e9c2f93509108d3b9e Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 06 Apr 2012 00:13:53 +0000
-Subject: type1-subset: if font name is prefixed with a subset tag, strip it off
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index ddef8ae..e507abe 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -381,6 +381,7 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
- {
-     const char *start, *end, *segment_end;
-     char *s;
-+    int i;
- 
-     segment_end = font->header_segment + font->header_segment_size;
-     start = find_token (font->header_segment, segment_end, "/FontName");
-@@ -406,6 +407,16 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
-     }
- 
-+    /* If font name is prefixed with a subset tag, strip it off. */
-+    if (strlen(start) > 7 && start[6] == '+') {
-+	for (i = 0; i < 6; i++) {
-+	    if (start[i] < 'A' || start[i] > 'Z')
-+		break;
-+	}
-+	if (i == 6)
-+	    start += 7;
-+    }
-+
-     font->base.base_font = strdup (start);
-     free (s);
-     if (unlikely (font->base.base_font == NULL))
---
-cgit v0.9.0.2-2-gbebe
-From 8657ca10e34b0034602680b4304d47ecf90ccbfd Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 06 Apr 2012 11:50:40 +0000
-Subject: fix _cairo_pattern_get_ink_extents to work with snapshot recording surfaces
-
-It had caused pdf bbox sizes to regress to page size bboxes.
----
-diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
-index 27ba004..5b3e177 100644
---- a/src/cairo-pattern.c
-+++ b/src/cairo-pattern.c
-@@ -37,6 +37,7 @@
- #include "cairo-path-private.h"
- #include "cairo-pattern-private.h"
- #include "cairo-recording-surface-private.h"
-+#include "cairo-surface-snapshot-private.h"
- 
- #include <float.h>
- 
-@@ -3666,6 +3667,9 @@ _cairo_pattern_get_ink_extents (const cairo_pattern_t         *pattern,
- 	    (const cairo_surface_pattern_t *) pattern;
- 	cairo_surface_t *surface = surface_pattern->surface;
- 
-+	if (_cairo_surface_is_snapshot (surface))
-+	    surface = _cairo_surface_snapshot_get_target (surface);
-+
- 	if (_cairo_surface_is_recording (surface)) {
- 	    cairo_matrix_t imatrix;
- 	    cairo_box_t box;
---
-cgit v0.9.0.2-2-gbebe
-From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 08 Apr 2012 10:28:59 +0000
-Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes
-
-A typo using half_line_x instead of half_line_y when emitting dashed
-segments of the rectilinear stroke.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c
-index 3e8c5a4..cc9dd19 100644
---- a/src/cairo-path-stroke-boxes.c
-+++ b/src/cairo-path-stroke-boxes.c
-@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st
- 		    box.p1.x = box.p2.x - half_line_x;
- 		}
- 		if (out_slope.dy >= 0)
--		    box.p1.y -= half_line_x;
-+		    box.p1.y -= half_line_y;
- 		if (out_slope.dy <= 0)
--		    box.p2.y += half_line_x;
-+		    box.p2.y += half_line_y;
- 	    } else {
- 		if (box.p1.y <= box.p2.y) {
- 		    box.p1.y = box.p2.y;
--		    box.p2.y += half_line_x;
-+		    box.p2.y += half_line_y;
- 		} else {
--		    box.p1.y = box.p2.y - half_line_x;
-+		    box.p1.y = box.p2.y - half_line_y;
- 		}
- 		if (out_slope.dx >= 0)
- 		    box.p1.x -= half_line_x;
---
-cgit v0.9.0.2-2-gbebe
-From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 08 Apr 2012 16:58:13 +0000
-Subject: traps: Clip the trapezoid extents against the clip extents
-
-Just in case the clip polygon turns out to be much larger than the
-operation extents (silly us for not reducing it correctly) and lead to
-catastrophe, such as:
-
-Program received signal SIGSEGV, Segmentation fault.
-pixman_fill_sse2 (bits=<optimized out>, stride=4, bpp=8, x=0, y=0,
-width=3, height=-34811, data=0) at pixman-sse2.c:3369
-3369		    *(uint16_t *)d = data;
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c
-index 284a0be..c49e208 100644
---- a/src/cairo-traps-compositor.c
-+++ b/src/cairo-traps-compositor.c
-@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t *compositor,
-     _cairo_traps_fini (&traps);
-     cairo_surface_destroy (src);
- 
--    if (status == CAIRO_INT_STATUS_SUCCESS &&
--	(fixup.width < extents->width || fixup.height < extents->height)) {
-+    if (unlikely (status))
-+	return status;
-+
-+    if (! _cairo_rectangle_intersect (&fixup, extents))
-+	return CAIRO_STATUS_SUCCESS;
-+
-+    if (fixup.width < extents->width || fixup.height < extents->height) {
- 	cairo_boxes_t clear;
- 
- 	_cairo_boxes_init (&clear);
---
-cgit v0.9.0.2-2-gbebe
-From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 09 Apr 2012 11:47:34 +0000
-Subject: build: Disable -Wset-but-unused-variable
-
-This is too noisy in the current build, and masking more important
-warnings.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index 3eb0104..f1b17f4 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -21,6 +21,9 @@ MAYBE_WARN="-Wall -Wextra \
- -Wno-missing-field-initializers -Wno-unused-parameter \
- -Wno-attributes -Wno-long-long -Winline"
- 
-+# -Wunused-but-set-variable is too noisy at present
-+NO_WARN="-Wno-unused-but-set-variable"
-+
- dnl Sun Studio 12 likes to rag at us for abusing enums like
- dnl having cairo_status_t variables hold cairo_int_status_t
- dnl values.  It's bad, we know.  Now please be quiet.
-@@ -34,6 +37,8 @@ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
- dnl Also to turn various gcc/glibc-specific preprocessor checks
- MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
- 
-+MAYBE_WARN="$MAYBE_WARN $NO_WARN"
-+
- # invalidate cached value if MAYBE_WARN has changed
- if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
- 	unset cairo_cv_warn_cflags
---
-cgit v0.9.0.2-2-gbebe
-From 7cb5053c0694992320b5f7ea3b91ea497431813b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 09 Apr 2012 11:49:20 +0000
-Subject: analysis: Apply the integer translation to the bbox as well
-
-The bbox is used to compute the ink extents (and so the pattern extents
-of a recording surface) and if given an integer translation we failed to
-transform the bbox into the target space.
-
-Fixes mask (pdf).
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c
-index b8abe02..8878f62 100644
---- a/src/cairo-analysis-surface.c
-+++ b/src/cairo-analysis-surface.c
-@@ -220,6 +220,14 @@ _add_operation (cairo_analysis_surface_t *surface,
- 	if (_cairo_matrix_is_integer_translation (&surface->ctm, &tx, &ty)) {
- 	    rect->x += tx;
- 	    rect->y += ty;
-+
-+	    tx = _cairo_fixed_from_int (tx);
-+	    bbox.p1.x += tx;
-+	    bbox.p2.x += tx;
-+
-+	    ty = _cairo_fixed_from_int (ty);
-+	    bbox.p1.y += ty;
-+	    bbox.p2.y += ty;
- 	} else {
- 	    _cairo_matrix_transform_bounding_box_fixed (&surface->ctm,
- 							&bbox, NULL);
---
-cgit v0.9.0.2-2-gbebe
-From 038e4991912656a3239ca82d60056ca129016ba6 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon, 09 Apr 2012 08:31:44 +0000
-Subject: pdf: avoid unnecessary use of patterns in mask groups
-
----
-diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
-index 4930e72..78537ce 100644
---- a/src/cairo-pdf-surface.c
-+++ b/src/cairo-pdf-surface.c
-@@ -5703,56 +5703,68 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
-     if (unlikely (status))
- 	return status;
- 
--    pattern_res.id = 0;
--    gstate_res.id = 0;
--    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
--						 &pattern_res, &gstate_res);
--    if (unlikely (status))
--	return status;
--
--    if (gstate_res.id != 0) {
--	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
--	if (unlikely (smask_group == NULL))
--	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--	smask_group->width = group->width;
--	smask_group->height = group->height;
--	smask_group->operation = PDF_PAINT;
--	smask_group->source = cairo_pattern_reference (group->mask);
--	smask_group->source_res = pattern_res;
--	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
--	if (unlikely (status)) {
--	    _cairo_pdf_smask_group_destroy (smask_group);
--	    return status;
--	}
--
--	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
--	if (unlikely (status))
--	    return status;
--
--	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+    if (_can_paint_pattern (group->mask)) {
-+	_cairo_output_stream_printf (surface->output, "q\n");
-+	status = _cairo_pdf_surface_paint_pattern (surface,
-+						   group->mask,
-+						   &group->extents,
-+						   FALSE);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "q /s%d gs /x%d Do Q\n",
--				     gstate_res.id,
--				     smask_group->group_res.id);
-+	_cairo_output_stream_printf (surface->output, "Q\n");
-     } else {
--	status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
-+	pattern_res.id = 0;
-+	gstate_res.id = 0;
-+	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
-+						     &pattern_res, &gstate_res);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "%f %f %f %f re f\n",
--				     bbox.p1.x,
--				     bbox.p1.y,
--				     bbox.p2.x - bbox.p1.x,
--				     bbox.p2.y - bbox.p1.y);
-+	if (gstate_res.id != 0) {
-+	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
-+	    if (unlikely (smask_group == NULL))
-+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--	status = _cairo_pdf_surface_unselect_pattern (surface);
--	if (unlikely (status))
--	    return status;
-+	    smask_group->width = group->width;
-+	    smask_group->height = group->height;
-+	    smask_group->operation = PDF_PAINT;
-+	    smask_group->source = cairo_pattern_reference (group->mask);
-+	    smask_group->source_res = pattern_res;
-+	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
-+	    if (unlikely (status)) {
-+		_cairo_pdf_smask_group_destroy (smask_group);
-+		return status;
-+	    }
-+
-+	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "q /s%d gs /x%d Do Q\n",
-+					 gstate_res.id,
-+					 smask_group->group_res.id);
-+	} else {
-+	    status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "%f %f %f %f re f\n",
-+					 bbox.p1.x,
-+					 bbox.p1.y,
-+					 bbox.p2.x - bbox.p1.x,
-+					 bbox.p2.y - bbox.p1.y);
-+
-+	    status = _cairo_pdf_surface_unselect_pattern (surface);
-+	    if (unlikely (status))
-+		return status;
-+	}
-     }
- 
-     status = _cairo_pdf_surface_close_group (surface, &mask_group);
-@@ -5764,54 +5776,66 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
-     if (unlikely (status))
- 	return status;
- 
--    pattern_res.id = 0;
--    gstate_res.id = 0;
--    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
--						 &pattern_res, &gstate_res);
--    if (unlikely (status))
--	return status;
--
--    if (gstate_res.id != 0) {
--	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
--	if (unlikely (smask_group == NULL))
--	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--	smask_group->operation = PDF_PAINT;
--	smask_group->source = cairo_pattern_reference (group->source);
--	smask_group->source_res = pattern_res;
--	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
--	if (unlikely (status)) {
--	    _cairo_pdf_smask_group_destroy (smask_group);
--	    return status;
--	}
--
--	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
--	if (unlikely (status))
--	    return status;
--
--	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+    if (_can_paint_pattern (group->source)) {
-+	_cairo_output_stream_printf (surface->output, "q\n");
-+	status = _cairo_pdf_surface_paint_pattern (surface,
-+						   group->source,
-+						   &group->extents,
-+						   FALSE);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "q /s%d gs /x%d Do Q\n",
--				     gstate_res.id,
--				     smask_group->group_res.id);
-+	_cairo_output_stream_printf (surface->output, "Q\n");
-     } else {
--	status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
-+	pattern_res.id = 0;
-+	gstate_res.id = 0;
-+	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
-+						     &pattern_res, &gstate_res);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "%f %f %f %f re f\n",
--				     bbox.p1.x,
--				     bbox.p1.y,
--				     bbox.p2.x - bbox.p1.x,
--				     bbox.p2.y - bbox.p1.y);
-+	if (gstate_res.id != 0) {
-+	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
-+	    if (unlikely (smask_group == NULL))
-+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--	status = _cairo_pdf_surface_unselect_pattern (surface);
--	if (unlikely (status))
--	    return status;
-+	    smask_group->operation = PDF_PAINT;
-+	    smask_group->source = cairo_pattern_reference (group->source);
-+	    smask_group->source_res = pattern_res;
-+	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
-+	    if (unlikely (status)) {
-+		_cairo_pdf_smask_group_destroy (smask_group);
-+		return status;
-+	    }
-+
-+	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "q /s%d gs /x%d Do Q\n",
-+					 gstate_res.id,
-+					 smask_group->group_res.id);
-+	} else {
-+	    status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "%f %f %f %f re f\n",
-+					 bbox.p1.x,
-+					 bbox.p1.y,
-+					 bbox.p2.x - bbox.p1.x,
-+					 bbox.p2.y - bbox.p1.y);
-+
-+	    status = _cairo_pdf_surface_unselect_pattern (surface);
-+	    if (unlikely (status))
-+		return status;
-+	}
-     }
- 
-     status = _cairo_pdf_surface_close_group (surface, NULL);
---
-cgit v0.9.0.2-2-gbebe
-From 9fcbe25c2dcf831783bb0fd20af9754c0b5c409b Mon Sep 17 00:00:00 2001
-From: Maarten Bosmans <mkbosmans@gmail.com>
-Date: Mon, 09 Apr 2012 19:33:50 +0000
-Subject: Protect code using dlfcn.h with CAIRO_HAS_DLSYM
-
----
-diff --git a/configure.ac b/configure.ac
-index cedfebe..5d2e6ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes")
- if test "x$have_dlsym" = "xyes"; then
-   AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available])
- fi
-+AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes")
- 
- dnl ===========================================================================
- 
-diff --git a/util/Makefile.am b/util/Makefile.am
-index f202f35..82d0a80 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -12,20 +12,24 @@ endif
- 
- if CAIRO_HAS_TRACE
- SUBDIRS += cairo-trace
-+if CAIRO_HAS_DLSYM
- if CAIRO_HAS_SCRIPT_SURFACE
- if CAIRO_HAS_TEE_SURFACE
- SUBDIRS += cairo-fdr
- endif
- endif
- endif
-+endif
- 
- if BUILD_SPHINX
-+if CAIRO_HAS_DLSYM
- if CAIRO_HAS_SCRIPT_SURFACE
- if CAIRO_HAS_TEE_SURFACE
- SUBDIRS += cairo-sphinx
- endif
- endif
- endif
-+endif
- 
- AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_builddir)/src \
---
-cgit v0.9.0.2-2-gbebe
-From c7b86ab97be1d3d3ccf43b652832f148a2fcf290 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue, 10 Apr 2012 13:04:05 +0000
-Subject: any2ppm: fix missing enumeration warning
-
----
-diff --git a/test/any2ppm.c b/test/any2ppm.c
-index 6b61c47..2403347 100644
---- a/test/any2ppm.c
-+++ b/test/any2ppm.c
-@@ -193,6 +193,7 @@ write_ppm (cairo_surface_t *surface, int fd)
- 	break;
-     case CAIRO_FORMAT_A1:
-     case CAIRO_FORMAT_RGB16_565:
-+    case CAIRO_FORMAT_RGB30:
-     case CAIRO_FORMAT_INVALID:
-     default:
- 	return "unhandled image format";
---
-cgit v0.9.0.2-2-gbebe
-From 09de481ce5f6ed1c38c0d5bf3af7c60642c4c947 Mon Sep 17 00:00:00 2001
-From: Gilles Espinasse <g.esp@free.fr>
-Date: Sat, 07 Apr 2012 21:09:51 +0000
-Subject: Cosmetic configure fix
-
-'how to allow undefined symbols in shared libraries' test should use CAIRO_CC_TRY_FLAG_SILENT or configure display is a bit out of order like this
-
-checking how to allow undefined symbols in shared libraries used by test suite... checking whether gcc supports -Wl,--allow-shlib-undefined... yes
--Wl,--allow-shlib-undefined
-
-Signed-off-by: Gilles Espinasse <g.esp@free.fr>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index f1b17f4..3b2c6f3 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result],
- 
- dnl check linker flags
- AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags,
--	       [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [],
-+	       [CAIRO_CC_TRY_FLAG_SILENT([-Wl,--allow-shlib-undefined], [],
- 				  [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")])
- CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags"
- AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS)
---
-cgit v0.9.0.2-2-gbebe
-From 07fc63676dfdaa57ed919ad7be8f59c97c615473 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Wed, 11 Apr 2012 19:37:55 +0000
-Subject: xlib: Disable fallback compositor with xlib-xcb
-
-When xlib-xcb is enabled, this is just dead code which is never used. Thus, this
-shouldn't hurt. However, this does include cairo-xlib-private.h. Shouldn't be a
-problem? Well, that header contains static inline functions which some compiler
-on Solaris will emit even when they are unused.
-
-This brings us to the real problem: That static inline function refers to a
-function which isn't compiled with xlib-xcb and thus linking fails with
-undefined symbols.
-
-This can be reproduced with GCC by adding a call to
-_cairo_xlib_screen_put_gc(NULL, NULL, 0, 0); to
-_cairo_xlib_fallback_compositor_get.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48489
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/src/cairo-xlib-fallback-compositor.c b/src/cairo-xlib-fallback-compositor.c
-index 5391926..7d45cd1 100644
---- a/src/cairo-xlib-fallback-compositor.c
-+++ b/src/cairo-xlib-fallback-compositor.c
-@@ -42,6 +42,8 @@
- 
- #include "cairoint.h"
- 
-+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
-+
- #include "cairo-xlib-private.h"
- 
- #include "cairo-compositor-private.h"
-@@ -52,3 +54,5 @@ _cairo_xlib_fallback_compositor_get (void)
-     /* XXX Do something interesting here to mitigate fallbacks ala xcb */
-     return &_cairo_fallback_compositor;
- }
-+
-+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/multilib/lib32-catalyst-utils/PKGBUILD b/multilib/lib32-catalyst-utils/PKGBUILD
deleted file mode 100644
index e94f84b62..000000000
--- a/multilib/lib32-catalyst-utils/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 77685 2012-10-13 13:39:25Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero
-# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert
-
-pkgname=lib32-catalyst-utils
-pkgver=12.9
-pkgrel=0.1
-pkgdesc="AMD Catalyst drivers libraries (32 bits)"
-arch=('x86_64')
-url="http://www.amd.com"
-license=('custom')
-source=(#"http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip"
-        https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz)
-md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b')
-provides=('lib32-libgl')
-conflicts=('lib32-libgl' 'lib32-nvidia-utils')
-
-#build() {
-#  cd ${srcdir}
-#  
-#  sh ./amd-driver-installer*.run --extract fglrx-install
-#}
-
-package() {
-  depends=("catalyst-utils=${pkgver}")
-
-  install -dm755 "${pkgdir}"/usr/bin
-  install -dm755 "${pkgdir}"/usr/lib32/{dri,xorg/modules/{dri,extensions/fglrx}}
-  
-  # binaries
-  cd ${srcdir}
-  install -m755 arch/x86/usr/X11R6/bin/fgl_glxgears "${pkgdir}/usr/bin/fgl_glxgears32"
-  install -m755 arch/x86/usr/X11R6/bin/fglrxinfo "${pkgdir}/usr/bin/fglrxinfo32"
-  
-  # dri/gl/... drivers
-  cd ${srcdir}/xpic/usr/X11R6/lib/modules
-  install -m755 *.so "${pkgdir}/usr/lib32/xorg/modules/"
-  cd ${srcdir}/arch/x86/usr/X11R6/lib
-  install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/"
-  ln -s /usr/lib32/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/dri/"
-  install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/"
-  install -m755 *.so* "${pkgdir}/usr/lib32/"
-  install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib32/"
-  cd ${srcdir}/arch/x86/usr/lib
-  install -m755 *.so* "${pkgdir}/usr/lib32/"
-  # needed symlinks
-  ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib32/libatiuki.so.1"
-  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so.1"
-  ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so"
-  ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/libAMDXvBA.so.1"
-  ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/libAMDXvBA.so"
-  ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib32/libfglrx_dm.so.1"
-  
-  # useful for 32 bits ?
-  rm "${pkgdir}"/usr/lib32/lib{amdocl*,OpenCL}.so* 
-
-  # licenses
-  install -Dm644 "${srcdir}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT"
-}
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 830249945..000000000
--- a/multilib/lib32-dbus-core/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 77410 2012-10-09 17:10:05Z bluewind $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgname=lib32-dbus-core
-_pkgbasename=dbus-core
-pkgver=1.6.8
-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=('3bf059c7dd5eda5f539a1b7cfe7a14a2')
-
-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 --disable-systemd \
-		--with-console-auth-dir=/run/console/
-
-    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 ab2d1389f..000000000
--- a/multilib/lib32-e2fsprogs/PKGBUILD
+++ /dev/null
@@ -1,36 +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.42.4
-pkgrel=1
-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=('944002c1f8f1f87e7d2d53263346b001962bc1f9')
-
-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 5e6176724..000000000
--- a/multilib/lib32-expat/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 68878 2012-04-04 16:55:37Z bluewind $
-
-_pkgbasename=expat
-pkgname=lib32-${_pkgbasename}
-pkgver=2.1.0
-pkgrel=1
-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)
-md5sums=('dd7dab7a5fea97d2a6a43f511449b7cd')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  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 4827d9391..000000000
--- a/multilib/lib32-flac/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 63972 2012-02-08 18:48:33Z pschmitz $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=flac
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.1
-pkgrel=8
-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 b3b29008a..000000000
--- a/multilib/lib32-fontconfig/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 75964 2012-09-07 10:17:43Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=fontconfig
-pkgname=lib32-$_pkgbasename
-pkgver=2.10.1
-pkgrel=1
-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)
-md5sums=('c94e380eea42f2f23ca9537035ef1899')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
-  libtoolize -f
-  autoreconf -f
-
-  ./configure --prefix=/usr \
-	  --sysconfdir=/etc \
-	  --with-templatedir=/etc/fonts/conf.avail \
-	  --with-xmldir=/etc/fonts \
-	  --localstatedir=/var \
-	  --disable-static \
-	  --with-default-fonts=/usr/share/fonts \
-	  --with-add-fonts=/usr/share/fonts \
-	  --libdir=/usr/lib32
-
-  make
-}
-
-check() {
-	cd "$srcdir/$_pkgbasename-$pkgver"
-	make -k check
-}
-
-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 05b152d39..000000000
--- a/multilib/lib32-freetype2/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 72526 2012-06-16 10:07:26Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=freetype2
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.10
-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=('13286702e9390a91661f980608adaff1'
-         '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 eacfe358d..000000000
--- a/multilib/lib32-gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 75782 2012-08-31 07:22:21Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=gdk-pixbuf2
-pkgname=lib32-$_pkgbasename
-pkgver=2.26.3
-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/${pkgver%.*}/gdk-pixbuf-${pkgver}.tar.xz)
-sha256sums=('a22373a72621c6f73e8c216410aeb46e3bb05b477e600b6ac481a47ecd4c09cc')
-
-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-pixdata
-  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 6f92a26b1..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=6
-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 f93d91895..000000000
--- a/multilib/lib32-glew/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 77618 2012-10-13 11:32:25Z allan $
-# Maintainer: Florian Pritz <flo@xinu.at>
-
-_pkgbasename=glew
-pkgname=lib32-$_pkgbasename
-pkgver=1.8.0
-pkgrel=2
-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-glu' "$_pkgbasename>=$pkgver")
-makedepends=('gcc-multilib')
-source=(http://downloads.sourceforge.net/${_pkgbasename}/${_pkgbasename}-${pkgver}.tgz)
-sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4')
-
-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 cee5a4db4..000000000
--- a/multilib/lib32-glib/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 63980 2012-02-08 18:50:06Z pschmitz $
-
-_pkgbasename=glib
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.10
-pkgrel=12
-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 a5734a92a..000000000
--- a/multilib/lib32-glib2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 74439 2012-07-28 15:03:45Z bluewind $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-
-_pkgbasename=glib2
-pkgname=lib32-$_pkgbasename
-pkgver=2.32.4
-pkgrel=1
-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.32/glib-${pkgver}.tar.xz)
-sha256sums=('a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2')
-
-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,lib32/gdbus-2.0}
-}
diff --git a/multilib/lib32-glibc/PKGBUILD b/multilib/lib32-glibc/PKGBUILD
deleted file mode 100644
index 4c03ea5a5..000000000
--- a/multilib/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,144 +0,0 @@
-# $Id: PKGBUILD 75735 2012-08-30 10:49:53Z 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.16.0
-pkgrel=4
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-makedepends=('gcc-multilib>=4.7')
-options=('!strip' '!emptydirs')
-source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
-        glibc-2.15-fix-res_query-assert.patch
-        glibc-2.15-revert-c5a0802a.patch
-        glibc-2.16-rpcgen-cpp-path.patch
-        glibc-2.16-strncasecmp-segfault.patch
-        glibc-2.16-strtod-overflow.patch
-        lib32-glibc.conf)
-md5sums=('80b181b02ab249524ec92822c0174cf7'
-         '2a1221a15575820751c325ef4d2fbb90'
-         '31f415b41197d85d3bbee3d1eecd06a3'
-         '0a0383d50d63f1c02919fe9943b82014'
-         'ea6a43915474e8276e9361eed6a01280'
-         'f042d37cc8ca3459023431809039bc88'
-         '61d322f7681a85d3293ada5c3ccc2c7e'
-         '6e052f1cb693d5d3203f50f9d4e8c33b')
-
-build() {
-  cd ${srcdir}/${_pkgbasename}-${pkgver}
-
-  # fix res_query assertion
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
-
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=552960
-  patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
-  # prevent need for /lib/cpp symlink
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
-  patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
-
-  # strncasecmp segfault on i686
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737
-  patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch
-
-  # strtod integer/buffer overflow
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319
-  patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch
-
-  # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
-  sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  #if [[ ${CARCH} = "i686" ]]; then
-    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-    # TODO: make separate glibc-xen package for i686
-    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-  #fi
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  echo "slibdir=/usr/lib32" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/${_pkgbasename}-${pkgver}/configure --prefix=/usr \
-      --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
-      --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization \
-      --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 "/build-programs=/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
-  make -k check
-}
-
-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}-*.so \
-                      usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
-  # Dynamic linker
-  mkdir ${pkgdir}/usr/lib
-  ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/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.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 533fc1b4b..000000000
--- a/multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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;
- }
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.15-__libc_res_nquerydomain-out-of-bounds.patch b/multilib/lib32-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
deleted file mode 100644
index 6f0a0398f..000000000
--- a/multilib/lib32-glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 947c651..abccd4a 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
- 		 * copy without '.' if present.
- 		 */
- 		n = strlen(name);
--		if (n >= MAXDNAME) {
-+
-+		/* Decrement N prior to checking it against MAXDNAME
-+		   so that we detect a wrap to SIZE_MAX and return
-+		   a reasonable error.  */
-+		n--;
-+		if (n >= MAXDNAME - 1) {
- 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
- 			return (-1);
- 		}
--		n--;
--		if (n >= 0 && name[n] == '.') {
-+		if (name[n] == '.') {
- 			strncpy(nbuf, name, n);
- 			nbuf[n] = '\0';
- 		} else
diff --git a/multilib/lib32-glibc/glibc-2.15-arena.patch b/multilib/lib32-glibc/glibc-2.15-arena.patch
deleted file mode 100644
index 46f52e98d..000000000
--- a/multilib/lib32-glibc/glibc-2.15-arena.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/malloc/arena.c b/malloc/arena.c
-index d3cf4b9..b1c9469 100644
---- a/malloc/arena.c
-+++ b/malloc/arena.c
-@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
- 	{
- 	  if (mp_.arena_max != 0)
- 	    narenas_limit = mp_.arena_max;
--	  else
-+	  else if (narenas > mp_.arena_test)
- 	    {
- 	      int n  = __get_nprocs ();
- 
-@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
- 	}
-     repeat:;
-       size_t n = narenas;
--      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
-+      /* NB: the following depends on the fact that (size_t)0 - 1 is a
-+	 very large number and that the underflow is OK.  If arena_max
-+	 is set the value of arena_test is irrelevant.  If arena_test
-+	 is set but narenas is not yet larger or equal to arena_test
-+	 narenas_limit is 0.  There is no possibility for narenas to
-+	 be too big for the test to always fail since there is not
-+	 enough address space to create that many arenas.  */
-+      if (__builtin_expect (n <= narenas_limit - 1, 0))
- 	{
- 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
- 	    goto repeat;
diff --git a/multilib/lib32-glibc/glibc-2.15-avx.patch b/multilib/lib32-glibc/glibc-2.15-avx.patch
deleted file mode 100644
index 5439da8d0..000000000
--- a/multilib/lib32-glibc/glibc-2.15-avx.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-index 6867c6e..3a615fc 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-@@ -14,7 +14,7 @@ extern double __ieee754_atan2_fma4 (double, double);
- 
- libm_ifunc (__ieee754_atan2,
- 	    HAS_FMA4 ? __ieee754_atan2_fma4
--	    : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
- strong_alias (__ieee754_atan2, __atan2_finite)
- 
- # define __ieee754_atan2 __ieee754_atan2_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-index 3c65028..7b2320a 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_exp.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-@@ -14,7 +14,7 @@ extern double __ieee754_exp_fma4 (double);
- 
- libm_ifunc (__ieee754_exp,
- 	    HAS_FMA4 ? __ieee754_exp_fma4
--	    : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2));
- strong_alias (__ieee754_exp, __exp_finite)
- 
- # define __ieee754_exp __ieee754_exp_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c
-index 3b468d0..ab277d6 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_log.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_log.c
-@@ -14,7 +14,7 @@ extern double __ieee754_log_fma4 (double);
- 
- libm_ifunc (__ieee754_log,
- 	    HAS_FMA4 ? __ieee754_log_fma4
--	    : (HAS_AVX ? __ieee754_log_avx
-+	    : (HAS_YMM_USABLE ? __ieee754_log_avx
- 	       : __ieee754_log_sse2));
- strong_alias (__ieee754_log, __log_finite)
- 
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-index 3160201..78c7e09 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_atan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-@@ -12,7 +12,8 @@ extern double __atan_fma4 (double);
- #  define __atan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (atan, HAS_FMA4 ? __atan_fma4 : HAS_AVX ? __atan_avx : __atan_sse2);
-+libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 :
-+		   HAS_YMM_USABLE ? __atan_avx : __atan_sse2));
- 
- # define atan __atan_sse2
- #endif
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-index 1ba9dbc..417acd0 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-@@ -17,10 +17,12 @@ extern double __sin_fma4 (double);
- #  define __sin_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
-+libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 :
-+		    HAS_YMM_USABLE ? __cos_avx : __cos_sse2));
- weak_alias (__cos, cos)
- 
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
-+libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 :
-+		    HAS_YMM_USABLE ? __sin_avx : __sin_sse2));
- weak_alias (__sin, sin)
- 
- # define __cos __cos_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-index 8f6601e..3047155 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-@@ -12,7 +12,8 @@ extern double __tan_fma4 (double);
- #  define __tan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
-+libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 :
-+		  HAS_YMM_USABLE ? __tan_avx : __tan_sse2));
- 
- # define tan __tan_sse2
- #endif
-diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
-index 65b0ee9..76d146c 100644
---- a/sysdeps/x86_64/multiarch/init-arch.c
-+++ b/sysdeps/x86_64/multiarch/init-arch.c
-@@ -1,6 +1,6 @@
- /* Initialize CPU feature data.
-    This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    Contributed by Ulrich Drepper <drepper@redhat.com>.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -144,6 +144,18 @@ __init_cpu_features (void)
-   else
-     kind = arch_kind_other;
- 
-+  if (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_AVX)
-+    {
-+      /* Reset the AVX bit in case OSXSAVE is disabled.  */
-+      if ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_OSXSAVE) != 0
-+	  && ({ unsigned int xcrlow;
-+		unsigned int xcrhigh;
-+		asm ("xgetbv"
-+		     : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
-+		(xcrlow & 6) == 6; }))
-+	__cpu_features.feature[index_YMM_Usable] |= bit_YMM_Usable;
-+    }
-+
-   __cpu_features.family = family;
-   __cpu_features.model = model;
-   atomic_write_barrier ();
-diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
-index 2a1df39..2dc75ab 100644
---- a/sysdeps/x86_64/multiarch/init-arch.h
-+++ b/sysdeps/x86_64/multiarch/init-arch.h
-@@ -1,5 +1,5 @@
- /* This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-@@ -22,11 +22,13 @@
- #define bit_Prefer_SSE_for_memop	(1 << 3)
- #define bit_Fast_Unaligned_Load		(1 << 4)
- #define bit_Prefer_PMINUB_for_stringop	(1 << 5)
-+#define bit_YMM_Usable			(1 << 6)
- 
- #define bit_SSE2	(1 << 26)
- #define bit_SSSE3	(1 << 9)
- #define bit_SSE4_1	(1 << 19)
- #define bit_SSE4_2	(1 << 20)
-+#define bit_OSXSAVE	(1 << 27)
- #define bit_AVX		(1 << 28)
- #define bit_POPCOUNT	(1 << 23)
- #define bit_FMA		(1 << 12)
-@@ -48,6 +50,7 @@
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
-+# define index_YMM_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- 
- #else	/* __ASSEMBLER__ */
- 
-@@ -92,7 +95,7 @@ extern struct cpu_features
- 
- 
- extern void __init_cpu_features (void) attribute_hidden;
--#define INIT_ARCH()\
-+# define INIT_ARCH() \
-   do							\
-     if (__cpu_features.kind == arch_kind_unknown)	\
-       __init_cpu_features ();				\
-@@ -125,23 +128,21 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define index_Slow_BSF			FEATURE_INDEX_1
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1
-+# define index_YMM_Usable		FEATURE_INDEX_1
- 
--#define HAS_ARCH_FEATURE(idx, bit) \
--  ((__get_cpu_features ()->feature[idx] & (bit)) != 0)
-+# define HAS_ARCH_FEATURE(name) \
-+  ((__get_cpu_features ()->feature[index_##name] & (bit_##name)) != 0)
- 
--#define HAS_FAST_REP_STRING \
--  HAS_ARCH_FEATURE (index_Fast_Rep_String, bit_Fast_Rep_String)
-+# define HAS_FAST_REP_STRING	HAS_ARCH_FEATURE (Fast_Rep_String)
- 
--#define HAS_FAST_COPY_BACKWARD \
--  HAS_ARCH_FEATURE (index_Fast_Copy_Backward, bit_Fast_Copy_Backward)
-+# define HAS_FAST_COPY_BACKWARD	HAS_ARCH_FEATURE (Fast_Copy_Backward)
- 
--#define HAS_SLOW_BSF \
--  HAS_ARCH_FEATURE (index_Slow_BSF, bit_Slow_BSF)
-+# define HAS_SLOW_BSF		HAS_ARCH_FEATURE (Slow_BSF)
- 
--#define HAS_PREFER_SSE_FOR_MEMOP \
--  HAS_ARCH_FEATURE (index_Prefer_SSE_for_memop, bit_Prefer_SSE_for_memop)
-+# define HAS_PREFER_SSE_FOR_MEMOP HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
- 
--#define HAS_FAST_UNALIGNED_LOAD \
--  HAS_ARCH_FEATURE (index_Fast_Unaligned_Load, bit_Fast_Unaligned_Load)
-+# define HAS_FAST_UNALIGNED_LOAD HAS_ARCH_FEATURE (Fast_Unaligned_Load)
-+
-+# define HAS_YMM_USABLE		HAS_ARCH_FEATURE (YMM_Usable)
- 
- #endif	/* __ASSEMBLER__ */
--- 
-1.7.9
-
diff --git a/multilib/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch b/multilib/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch
deleted file mode 100644
index 483b28532..000000000
--- a/multilib/lib32-glibc/glibc-2.15-confstr-local-buffer-extent.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff --git a/posix/confstr.c b/posix/confstr.c
-index 3c9566d..cad6561 100644
---- a/posix/confstr.c
-+++ b/posix/confstr.c
-@@ -35,6 +34,10 @@ confstr (name, buf, len)
-   const char *string = "";
-   size_t string_len = 1;
- 
-+  /* Note that this buffer must be large enough for the longest strings
-+     used below.  */
-+  char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
-+
-   switch (name)
-     {
-     case _CS_PATH:
-@@ -53,59 +56,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V7_ILP32_OFF32
--	if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
--		    sizeof "POSIX_V7_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
-+		  sizeof "POSIX_V7_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_ILP32_OFFBIG
--	if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
--		    sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
-+		  sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LP64_OFF64
--	if (__sysconf (_SC_V7_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V7_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
--		    sizeof "POSIX_V7_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
-+		  sizeof "POSIX_V7_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LPBIG_OFFBIG
--	if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
--		    sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V6_WIDTH_RESTRICTED_ENVS:
-@@ -116,59 +115,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V6_ILP32_OFF32
--	if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
--		    sizeof "POSIX_V6_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
-+		  sizeof "POSIX_V6_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_ILP32_OFFBIG
--	if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
--		    sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
-+		  sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LP64_OFF64
--	if (__sysconf (_SC_V6_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V6_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
--		    sizeof "POSIX_V6_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
-+		  sizeof "POSIX_V6_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LPBIG_OFFBIG
--	if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
--		    sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V5_WIDTH_RESTRICTED_ENVS:
-@@ -179,59 +174,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _XBS5_ILP32_OFF32
--	if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
--		    sizeof "XBS5_ILP32_OFF32" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
-+		  sizeof "XBS5_ILP32_OFF32" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _XBS5_ILP32_OFFBIG
--	if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
--		    sizeof "XBS5_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
-+		  sizeof "XBS5_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _XBS5_LP64_OFF64
--	if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
- #endif
- #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
--		    sizeof "XBS5_LP64_OFF64" - 1);
--	    string_len += sizeof "XBS5_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
-+		  sizeof "XBS5_LP64_OFF64" - 1);
-+	  string_len += sizeof "XBS5_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _XBS5_LPBIG_OFFBIG
--	if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
--		    sizeof "XBS5_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
-+		  sizeof "XBS5_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_XBS5_ILP32_OFF32_CFLAGS:
diff --git a/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch
deleted file mode 100644
index d28237f85..000000000
--- a/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index 00bfba6..9e55a6a 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -45,7 +45,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- CPPFLAGS-zic = -DNOT_IN_libc
- 
- ifeq ($(have-ksh),yes)
--install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
- generated += tzselect
- endif
-@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- 	    -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
- 	chmod 555 $@.new
- 	mv -f $@.new $@
--
--$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \
--    $(inst_zonedir)/%: % $(+force)
--	$(do-install)
diff --git a/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch b/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch
deleted file mode 100644
index e4f29bc1a..000000000
--- a/multilib/lib32-glibc/glibc-2.15-do-not-install-timezone-files.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index e8fb716..d5ea538 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -1,4 +1,4 @@
--# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2000,2002,2005,2007,2012 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
-@@ -49,33 +49,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- 
- CPPFLAGS-zic = -DNOT_IN_libc
- 
--# z.* use this variable.
--define nl
--
--
--endef
--ifndef avoid-generated
--ifndef inhibit_timezone_rules
---include $(addprefix $(objpfx)z.,$(tzfiles))
--endif
--endif
--
--# Make these absolute file names.
--installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \
--					$(addprefix $(inst_zonedir)/, \
--						    $(localtime-file)))
--installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \
--					 $(addprefix $(inst_zonedir)/, \
--						     $(posixrules-file)))
--
--ifeq ($(cross-compiling),no)
--# Don't try to install the zoneinfo files since we can't run zic.
--install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
--					      $(zonenames:%=posix/%) \
--					      $(zonenames:%=right/%)) \
--		 $(installed-localtime-file) $(installed-posixrules-file)
--endif
--
- ifeq ($(have-ksh),yes)
- install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
-@@ -85,79 +58,6 @@ endif
- include ../Rules
- 
- 
--$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
--# Kludge alert: we use an implicit rule (in what we are generating here)
--# because that is the only way to tell Make that the one command builds all
--# the files.
--# The extra kludge for the $(tzlinks) files is necessary since running zic
--# this file requires all other files to exist.  Blech!
--	$(make-target-directory)
--	(echo 'define $*-zones'						    ;\
--	 $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\
--	 echo 'endef'							    ;\
--	 echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))'		    ;\
--	 echo 'ifdef $*-zones'						    ;\
--	 if test x$(findstring $*, $(tzlinks)) != x; then		     \
--	   echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \'	    ;\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\
--	 fi								    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic leapseconds yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic /dev/null yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic $$(leapseconds) yearistype'		    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo 'endif'							    ;\
--	 echo 'zonenames := $$(zonenames) $$($*-zones)'			    ;\
--	) > $@.new
--	mv $@.new $@
--
--.PHONY: echo-zonenames
--echo-zonenames:
--	@echo 'Known zones: $(zonenames)'
--
--
--# We have to use `-d $(inst_zonedir)' to explictly tell zic where to
--# place the output files although $(zonedir) is compiled in.  But the
--# user might have set $(install_root) on the command line of `make install'.
--zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
--tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
--	    -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
--
--# The source files specify the zone names relative to the -d directory,
--# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix
--# and the like.  This magic extracts /posix or /right if it's the first
--# component after $(inst_zonedir) in the target name $@.
--target-zone-flavor = $(filter /posix /right, \
--			      /$(firstword $(subst /, , \
--					  $(patsubst $(inst_zonedir)/%,%,$@))))
--
--ifdef localtime
--$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \
--			     $(+force)
--	$(make-target-directory)
--	if test -r $@; then \
--	  echo Site timezone NOT reset to Factory.; \
--	else \
--	  rm -f $@T; \
--	  $(SHELL) $(..)scripts/rellns-sh $< $@T; \
--	  mv -f $@T $@; \
--	fi
--endif
--ifdef posixrules
--$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \
--			      $(+force)
--	$(zic-cmd) -p $(posixrules)
--endif
--
--
- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
- 
- tz-cflags = -DTZDIR='"$(zonedir)"' \
diff --git a/multilib/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch b/multilib/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch
deleted file mode 100644
index c41acc169..000000000
--- a/multilib/lib32-glibc/glibc-2.15-feraiseexcept-plt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
-index 70f9ee2..6e2ce35 100644
---- a/sysdeps/i386/fpu/feupdateenv.c
-+++ b/sysdeps/i386/fpu/feupdateenv.c
-@@ -1,5 +1,5 @@
- /* Install given floating-point environment and raise exceptions.
--   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
-+   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
- 
-@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
-   /* Raise the saved exception.  Incidently for us the implementation
-      defined format of the values in objects of type fexcept_t is the
-      same as the ones specified using the FE_* constants.  */
--  feraiseexcept ((int) temp);
-+  __feraiseexcept ((int) temp);
- 
-   /* Success.  */
-   return 0;
diff --git a/multilib/lib32-glibc/glibc-2.15-fix-res_query-assert.patch b/multilib/lib32-glibc/glibc-2.15-fix-res_query-assert.patch
deleted file mode 100644
index a894da9c7..000000000
--- a/multilib/lib32-glibc/glibc-2.15-fix-res_query-assert.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/resolv/res_query.c	
-+++ a/resolv/res_query.c	
-@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
- 		  int *resplen2)
- {
- 	HEADER *hp = (HEADER *) answer;
-+	HEADER *hp2;
- 	int n, use_malloc = 0;
- 	u_int oflags = statp->_flags;
- 
-@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
- 	  /* __libc_res_nsend might have reallocated the buffer.  */
- 	  hp = (HEADER *) *answerp;
- 
--	/* We simplify the following tests by assigning HP to HP2.  It
--	   is easy to verify that this is the same as ignoring all
--	   tests of HP2.  */
--	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
--
--	if (n < (int) sizeof (HEADER) && answerp2 != NULL
--	    && *resplen2 > (int) sizeof (HEADER))
-+	/* We simplify the following tests by assigning HP to HP2 or
-+	   vice versa.  It is easy to verify that this is the same as
-+	   ignoring all tests of HP or HP2.  */
-+	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp = hp2;
-+	    hp2 = hp;
- 	  }
--	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
--		 && n > (int) sizeof (HEADER))
-+	else
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp2 = hp;
-+	    hp2 = (HEADER *) *answerp2;
-+	    if (n < (int) sizeof (HEADER))
-+	      {
-+	        hp = hp2;
-+	      }
- 	  }
- 
-+	/* Make sure both hp and hp2 are defined */
-+	assert((hp != NULL) && (hp2 != NULL));
-+
- 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
- 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
- #ifdef DEBUG
diff --git a/multilib/lib32-glibc/glibc-2.15-fmtmsg-locking.patch b/multilib/lib32-glibc/glibc-2.15-fmtmsg-locking.patch
deleted file mode 100644
index f5976abd9..000000000
--- a/multilib/lib32-glibc/glibc-2.15-fmtmsg-locking.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
-index 9203317..4c02302 100644
---- a/stdlib/fmtmsg.c
-+++ b/stdlib/fmtmsg.c
-@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	const char *text, const char *action, const char *tag)
- {
-   __libc_once_define (static, once);
--  int result = MM_OK;
-   struct severity_info *severity_rec;
- 
-   /* Make sure everything is initialized.  */
-@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	return MM_NOTOK;
-     }
- 
--  for (severity_rec = severity_list; severity_rec != NULL;
--       severity_rec = severity_rec->next)
--    if (severity == severity_rec->severity)
--      /* Bingo.  */
--      break;
--
--  /* If we don't know anything about the severity level return an error.  */
--  if (severity_rec == NULL)
--    return MM_NOTOK;
--
--
- #ifdef __libc_ptf_call
-   /* We do not want this call to be cut short by a thread
-      cancellation.  Therefore disable cancellation for now.  */
-@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
- 		   0);
- #endif
- 
--  /* Now we can print.  */
--  if (classification & MM_PRINT)
--    {
--      int do_label = (print & label_mask) && label != MM_NULLLBL;
--      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
--      int do_text = (print & text_mask) && text != MM_NULLTXT;
--      int do_action = (print & action_mask) && action != MM_NULLACT;
--      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
--
--      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
--		      do_label ? label : "",
--		      do_label && (do_severity | do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_severity ? severity_rec->string : "",
--		      do_severity && (do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_text ? text : "",
--		      do_text && (do_action | do_tag) ? "\n" : "",
--		      do_action ? "TO FIX: " : "",
--		      do_action ? action : "",
--		      do_action && do_tag ? "  " : "",
--		      do_tag ? tag : "") < 0)
--	/* Oh, oh.  An error occurred during the output.  */
--	result = MM_NOMSG;
--    }
-+  __libc_lock_lock (lock);
- 
--  if (classification & MM_CONSOLE)
-+  for (severity_rec = severity_list; severity_rec != NULL;
-+       severity_rec = severity_rec->next)
-+    if (severity == severity_rec->severity)
-+      /* Bingo.  */
-+      break;
-+
-+  /* If we don't know anything about the severity level return an error.  */
-+  int result = MM_NOTOK;
-+  if (severity_rec != NULL)
-     {
--      int do_label = label != MM_NULLLBL;
--      int do_severity = severity != MM_NULLSEV;
--      int do_text = text != MM_NULLTXT;
--      int do_action = action != MM_NULLACT;
--      int do_tag = tag != MM_NULLTAG;
--
--      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
--	      do_label ? label : "",
--	      do_label && (do_severity | do_text | do_action | do_tag)
--	      ? ": " : "",
--	      do_severity ? severity_rec->string : "",
--	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
--	      do_text ? text : "",
--	      do_text && (do_action | do_tag) ? "\n" : "",
--	      do_action ? "TO FIX: " : "",
--	      do_action ? action : "",
--	      do_action && do_tag ? "  " : "",
--	      do_tag ? tag : "");
-+      result = MM_OK;
-+
-+      /* Now we can print.  */
-+      if (classification & MM_PRINT)
-+	{
-+	  int do_label = (print & label_mask) && label != MM_NULLLBL;
-+	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
-+	  int do_text = (print & text_mask) && text != MM_NULLTXT;
-+	  int do_action = (print & action_mask) && action != MM_NULLACT;
-+	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
-+			  do_label ? label : "",
-+			  need_colon ? ": " : "",
-+			  do_severity ? severity_rec->string : "",
-+			  do_severity && (do_text | do_action | do_tag)
-+			  ? ": " : "",
-+			  do_text ? text : "",
-+			  do_text && (do_action | do_tag) ? "\n" : "",
-+			  do_action ? "TO FIX: " : "",
-+			  do_action ? action : "",
-+			  do_action && do_tag ? "  " : "",
-+			  do_tag ? tag : "") < 0)
-+	    /* Oh, oh.  An error occurred during the output.  */
-+	    result = MM_NOMSG;
-+	}
-+
-+      if (classification & MM_CONSOLE)
-+	{
-+	  int do_label = label != MM_NULLLBL;
-+	  int do_severity = severity != MM_NULLSEV;
-+	  int do_text = text != MM_NULLTXT;
-+	  int do_action = action != MM_NULLACT;
-+	  int do_tag = tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
-+		  do_label ? label : "",
-+		  need_colon ? ": " : "",
-+		  do_severity ? severity_rec->string : "",
-+		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
-+		  do_text ? text : "",
-+		  do_text && (do_action | do_tag) ? "\n" : "",
-+		  do_action ? "TO FIX: " : "",
-+		  do_action ? action : "",
-+		  do_action && do_tag ? "  " : "",
-+		  do_tag ? tag : "");
-+	}
-     }
- 
-+  __libc_lock_unlock (lock);
-+
- #ifdef __libc_ptf_call
-   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
- #endif
diff --git a/multilib/lib32-glibc/glibc-2.15-gb18030.patch b/multilib/lib32-glibc/glibc-2.15-gb18030.patch
deleted file mode 100644
index eaae12a9b..000000000
--- a/multilib/lib32-glibc/glibc-2.15-gb18030.patch
+++ /dev/null
@@ -1,49081 +0,0 @@
-From 4620eceb9e5cb1d65db68c9bc64c34926d27457f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 21 Jun 2011 11:01:43 +0200
-Subject: [PATCH] Repair GB18030 charmap
-
-Fix more bugs in GB18030 charmap
----
- iconvdata/gb18030.c         |11211 ++++++++++---
- localedata/charmaps/GB18030 |37248 ++++++++++++++++++++++++++++++++++++++++---
- 2 files changed, 43756 insertions(+), 4703 deletions(-)
-
-diff --git a/iconvdata/gb18030.c b/iconvdata/gb18030.c
-index a06b75d..1e1b3f8 100644
---- a/iconvdata/gb18030.c
-+++ b/iconvdata/gb18030.c
-@@ -62,17 +62,18 @@
- 	   (unless line (return))
- 	   (when (eql (position #\Tab line) 6)
- 	     (let ((gbk (parse-integer line :start 2 :end 6 :radix 16))
--		   (ucs (parse-integer line :start 9 :end 13 :radix 16)))
--	       (when (= (mod count 4) 0)
--		 (format t " "))
--	       (format t " ~([0x~4,'0X] = 0x~4,'0X~),"
--			 (let ((ch1 (ldb (byte 8 8) gbk))
--			       (ch2 (ldb (byte 8 0) gbk)))
--			   (+ (* (- ch1 #x81) 192) (- ch2 #x40)))
--			 ucs)
--	       (incf count)
--	       (when (= (mod count 4) 0)
--		 (format t "~%"))))))
-+		   (ucs (parse-integer line :start 9 :radix 16)))
-+	       (when (<= ucs #xffff)
-+		 (when (= (mod count 4) 0)
-+		   (format t " "))
-+		 (format t " ~([0x~4,'0X] = 0x~4,'0X~),"
-+			   (let ((ch1 (ldb (byte 8 8) gbk))
-+				 (ch2 (ldb (byte 8 0) gbk)))
-+			     (+ (* (- ch1 #x81) 192) (- ch2 #x40)))
-+			   ucs)
-+		 (incf count)
-+		 (when (= (mod count 4) 0)
-+		   (format t "~%")))))))
-        (format t "~%")))
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- */
-@@ -1874,14 +1875,14 @@ static const uint16_t __twobyte_to_ucs[] =
-   [0x1c4b] = 0x03bb, [0x1c4c] = 0x03bc, [0x1c4d] = 0x03bd, [0x1c4e] = 0x03be,
-   [0x1c4f] = 0x03bf, [0x1c50] = 0x03c0, [0x1c51] = 0x03c1, [0x1c52] = 0x03c3,
-   [0x1c53] = 0x03c4, [0x1c54] = 0x03c5, [0x1c55] = 0x03c6, [0x1c56] = 0x03c7,
--  [0x1c57] = 0x03c8, [0x1c58] = 0x03c9, [0x1c59] = 0xe78d, [0x1c5a] = 0xe78e,
--  [0x1c5b] = 0xe78f, [0x1c5c] = 0xe790, [0x1c5d] = 0xe791, [0x1c5e] = 0xe792,
--  [0x1c5f] = 0xe793, [0x1c60] = 0xfe35, [0x1c61] = 0xfe36, [0x1c62] = 0xfe39,
-+  [0x1c57] = 0x03c8, [0x1c58] = 0x03c9, [0x1c59] = 0xfe10, [0x1c5a] = 0xfe12,
-+  [0x1c5b] = 0xfe11, [0x1c5c] = 0xfe13, [0x1c5d] = 0xfe14, [0x1c5e] = 0xfe15,
-+  [0x1c5f] = 0xfe16, [0x1c60] = 0xfe35, [0x1c61] = 0xfe36, [0x1c62] = 0xfe39,
-   [0x1c63] = 0xfe3a, [0x1c64] = 0xfe3f, [0x1c65] = 0xfe40, [0x1c66] = 0xfe3d,
-   [0x1c67] = 0xfe3e, [0x1c68] = 0xfe41, [0x1c69] = 0xfe42, [0x1c6a] = 0xfe43,
--  [0x1c6b] = 0xfe44, [0x1c6c] = 0xe794, [0x1c6d] = 0xe795, [0x1c6e] = 0xfe3b,
-+  [0x1c6b] = 0xfe44, [0x1c6c] = 0xfe17, [0x1c6d] = 0xfe18, [0x1c6e] = 0xfe3b,
-   [0x1c6f] = 0xfe3c, [0x1c70] = 0xfe37, [0x1c71] = 0xfe38, [0x1c72] = 0xfe31,
--  [0x1c73] = 0xe796, [0x1c74] = 0xfe33, [0x1c75] = 0xfe34, [0x1c76] = 0xe797,
-+  [0x1c73] = 0xfe19, [0x1c74] = 0xfe33, [0x1c75] = 0xfe34, [0x1c76] = 0xe797,
-   [0x1c77] = 0xe798, [0x1c78] = 0xe799, [0x1c79] = 0xe79a, [0x1c7a] = 0xe79b,
-   [0x1c7b] = 0xe79c, [0x1c7c] = 0xe79d, [0x1c7d] = 0xe79e, [0x1c7e] = 0xe79f,
-   [0x1c80] = 0xe706, [0x1c81] = 0xe707, [0x1c82] = 0xe708, [0x1c83] = 0xe709,
-@@ -6020,50 +6021,49 @@ static const uint16_t __twobyte_to_ucs[] =
-   [0x5dc2] = 0xfa0e, [0x5dc3] = 0xfa0f, [0x5dc4] = 0xfa11, [0x5dc5] = 0xfa13,
-   [0x5dc6] = 0xfa14, [0x5dc7] = 0xfa18, [0x5dc8] = 0xfa1f, [0x5dc9] = 0xfa20,
-   [0x5dca] = 0xfa21, [0x5dcb] = 0xfa23, [0x5dcc] = 0xfa24, [0x5dcd] = 0xfa27,
--  [0x5dce] = 0xfa28, [0x5dcf] = 0xfa29, [0x5dd0] = 0x2e81, [0x5dd1] = 0xe816,
--  [0x5dd2] = 0xe817, [0x5dd3] = 0xe818, [0x5dd4] = 0x2e84, [0x5dd5] = 0x3473,
--  [0x5dd6] = 0x3447, [0x5dd7] = 0x2e88, [0x5dd8] = 0x2e8b, [0x5dd9] = 0xe81e,
--  [0x5dda] = 0x359e, [0x5ddb] = 0x361a, [0x5ddc] = 0x360e, [0x5ddd] = 0x2e8c,
--  [0x5dde] = 0x2e97, [0x5ddf] = 0x396e, [0x5de0] = 0x3918, [0x5de1] = 0xe826,
--  [0x5de2] = 0x39cf, [0x5de3] = 0x39df, [0x5de4] = 0x3a73, [0x5de5] = 0x39d0,
--  [0x5de6] = 0xe82b, [0x5de7] = 0xe82c, [0x5de8] = 0x3b4e, [0x5de9] = 0x3c6e,
--  [0x5dea] = 0x3ce0, [0x5deb] = 0x2ea7, [0x5dec] = 0xe831, [0x5ded] = 0xe832,
-+  [0x5dce] = 0xfa28, [0x5dcf] = 0xfa29, [0x5dd0] = 0x2e81, [0x5dd4] = 0x2e84,
-+  [0x5dd5] = 0x3473, [0x5dd6] = 0x3447, [0x5dd7] = 0x2e88, [0x5dd8] = 0x2e8b,
-+  [0x5dd9] = 0x9fb4, [0x5dda] = 0x359e, [0x5ddb] = 0x361a, [0x5ddc] = 0x360e,
-+  [0x5ddd] = 0x2e8c, [0x5dde] = 0x2e97, [0x5ddf] = 0x396e, [0x5de0] = 0x3918,
-+  [0x5de1] = 0x9fb5, [0x5de2] = 0x39cf, [0x5de3] = 0x39df, [0x5de4] = 0x3a73,
-+  [0x5de5] = 0x39d0, [0x5de6] = 0x9fb6, [0x5de7] = 0x9fb7, [0x5de8] = 0x3b4e,
-+  [0x5de9] = 0x3c6e, [0x5dea] = 0x3ce0, [0x5deb] = 0x2ea7, [0x5ded] = 0x9fb8,
-   [0x5dee] = 0x2eaa, [0x5def] = 0x4056, [0x5df0] = 0x415f, [0x5df1] = 0x2eae,
-   [0x5df2] = 0x4337, [0x5df3] = 0x2eb3, [0x5df4] = 0x2eb6, [0x5df5] = 0x2eb7,
--  [0x5df6] = 0xe83b, [0x5df7] = 0x43b1, [0x5df8] = 0x43ac, [0x5df9] = 0x2ebb,
--  [0x5dfa] = 0x43dd, [0x5dfb] = 0x44d6, [0x5dfc] = 0x4661, [0x5dfd] = 0x464c,
--  [0x5dfe] = 0xe843, [0x5e00] = 0x4723, [0x5e01] = 0x4729, [0x5e02] = 0x477c,
--  [0x5e03] = 0x478d, [0x5e04] = 0x2eca, [0x5e05] = 0x4947, [0x5e06] = 0x497a,
--  [0x5e07] = 0x497d, [0x5e08] = 0x4982, [0x5e09] = 0x4983, [0x5e0a] = 0x4985,
--  [0x5e0b] = 0x4986, [0x5e0c] = 0x499f, [0x5e0d] = 0x499b, [0x5e0e] = 0x49b7,
--  [0x5e0f] = 0x49b6, [0x5e10] = 0xe854, [0x5e11] = 0xe855, [0x5e12] = 0x4ca3,
--  [0x5e13] = 0x4c9f, [0x5e14] = 0x4ca0, [0x5e15] = 0x4ca1, [0x5e16] = 0x4c77,
--  [0x5e17] = 0x4ca2, [0x5e18] = 0x4d13, [0x5e19] = 0x4d14, [0x5e1a] = 0x4d15,
--  [0x5e1b] = 0x4d16, [0x5e1c] = 0x4d17, [0x5e1d] = 0x4d18, [0x5e1e] = 0x4d19,
--  [0x5e1f] = 0x4dae, [0x5e20] = 0xe864, [0x5e21] = 0xe468, [0x5e22] = 0xe469,
--  [0x5e23] = 0xe46a, [0x5e24] = 0xe46b, [0x5e25] = 0xe46c, [0x5e26] = 0xe46d,
--  [0x5e27] = 0xe46e, [0x5e28] = 0xe46f, [0x5e29] = 0xe470, [0x5e2a] = 0xe471,
--  [0x5e2b] = 0xe472, [0x5e2c] = 0xe473, [0x5e2d] = 0xe474, [0x5e2e] = 0xe475,
--  [0x5e2f] = 0xe476, [0x5e30] = 0xe477, [0x5e31] = 0xe478, [0x5e32] = 0xe479,
--  [0x5e33] = 0xe47a, [0x5e34] = 0xe47b, [0x5e35] = 0xe47c, [0x5e36] = 0xe47d,
--  [0x5e37] = 0xe47e, [0x5e38] = 0xe47f, [0x5e39] = 0xe480, [0x5e3a] = 0xe481,
--  [0x5e3b] = 0xe482, [0x5e3c] = 0xe483, [0x5e3d] = 0xe484, [0x5e3e] = 0xe485,
--  [0x5e3f] = 0xe486, [0x5e40] = 0xe487, [0x5e41] = 0xe488, [0x5e42] = 0xe489,
--  [0x5e43] = 0xe48a, [0x5e44] = 0xe48b, [0x5e45] = 0xe48c, [0x5e46] = 0xe48d,
--  [0x5e47] = 0xe48e, [0x5e48] = 0xe48f, [0x5e49] = 0xe490, [0x5e4a] = 0xe491,
--  [0x5e4b] = 0xe492, [0x5e4c] = 0xe493, [0x5e4d] = 0xe494, [0x5e4e] = 0xe495,
--  [0x5e4f] = 0xe496, [0x5e50] = 0xe497, [0x5e51] = 0xe498, [0x5e52] = 0xe499,
--  [0x5e53] = 0xe49a, [0x5e54] = 0xe49b, [0x5e55] = 0xe49c, [0x5e56] = 0xe49d,
--  [0x5e57] = 0xe49e, [0x5e58] = 0xe49f, [0x5e59] = 0xe4a0, [0x5e5a] = 0xe4a1,
--  [0x5e5b] = 0xe4a2, [0x5e5c] = 0xe4a3, [0x5e5d] = 0xe4a4, [0x5e5e] = 0xe4a5,
--  [0x5e5f] = 0xe4a6, [0x5e60] = 0xe4a7, [0x5e61] = 0xe4a8, [0x5e62] = 0xe4a9,
--  [0x5e63] = 0xe4aa, [0x5e64] = 0xe4ab, [0x5e65] = 0xe4ac, [0x5e66] = 0xe4ad,
--  [0x5e67] = 0xe4ae, [0x5e68] = 0xe4af, [0x5e69] = 0xe4b0, [0x5e6a] = 0xe4b1,
--  [0x5e6b] = 0xe4b2, [0x5e6c] = 0xe4b3, [0x5e6d] = 0xe4b4, [0x5e6e] = 0xe4b5,
--  [0x5e6f] = 0xe4b6, [0x5e70] = 0xe4b7, [0x5e71] = 0xe4b8, [0x5e72] = 0xe4b9,
--  [0x5e73] = 0xe4ba, [0x5e74] = 0xe4bb, [0x5e75] = 0xe4bc, [0x5e76] = 0xe4bd,
--  [0x5e77] = 0xe4be, [0x5e78] = 0xe4bf, [0x5e79] = 0xe4c0, [0x5e7a] = 0xe4c1,
--  [0x5e7b] = 0xe4c2, [0x5e7c] = 0xe4c3, [0x5e7d] = 0xe4c4, [0x5e7e] = 0xe4c5
-+  [0x5df7] = 0x43b1, [0x5df8] = 0x43ac, [0x5df9] = 0x2ebb, [0x5dfa] = 0x43dd,
-+  [0x5dfb] = 0x44d6, [0x5dfc] = 0x4661, [0x5dfd] = 0x464c, [0x5dfe] = 0x9fb9,
-+  [0x5e00] = 0x4723, [0x5e01] = 0x4729, [0x5e02] = 0x477c, [0x5e03] = 0x478d,
-+  [0x5e04] = 0x2eca, [0x5e05] = 0x4947, [0x5e06] = 0x497a, [0x5e07] = 0x497d,
-+  [0x5e08] = 0x4982, [0x5e09] = 0x4983, [0x5e0a] = 0x4985, [0x5e0b] = 0x4986,
-+  [0x5e0c] = 0x499f, [0x5e0d] = 0x499b, [0x5e0e] = 0x49b7, [0x5e0f] = 0x49b6,
-+  [0x5e10] = 0x9fba, [0x5e12] = 0x4ca3, [0x5e13] = 0x4c9f, [0x5e14] = 0x4ca0,
-+  [0x5e15] = 0x4ca1, [0x5e16] = 0x4c77, [0x5e17] = 0x4ca2, [0x5e18] = 0x4d13,
-+  [0x5e19] = 0x4d14, [0x5e1a] = 0x4d15, [0x5e1b] = 0x4d16, [0x5e1c] = 0x4d17,
-+  [0x5e1d] = 0x4d18, [0x5e1e] = 0x4d19, [0x5e1f] = 0x4dae, [0x5e20] = 0x9fbb,
-+  [0x5e21] = 0xe468, [0x5e22] = 0xe469, [0x5e23] = 0xe46a, [0x5e24] = 0xe46b,
-+  [0x5e25] = 0xe46c, [0x5e26] = 0xe46d, [0x5e27] = 0xe46e, [0x5e28] = 0xe46f,
-+  [0x5e29] = 0xe470, [0x5e2a] = 0xe471, [0x5e2b] = 0xe472, [0x5e2c] = 0xe473,
-+  [0x5e2d] = 0xe474, [0x5e2e] = 0xe475, [0x5e2f] = 0xe476, [0x5e30] = 0xe477,
-+  [0x5e31] = 0xe478, [0x5e32] = 0xe479, [0x5e33] = 0xe47a, [0x5e34] = 0xe47b,
-+  [0x5e35] = 0xe47c, [0x5e36] = 0xe47d, [0x5e37] = 0xe47e, [0x5e38] = 0xe47f,
-+  [0x5e39] = 0xe480, [0x5e3a] = 0xe481, [0x5e3b] = 0xe482, [0x5e3c] = 0xe483,
-+  [0x5e3d] = 0xe484, [0x5e3e] = 0xe485, [0x5e3f] = 0xe486, [0x5e40] = 0xe487,
-+  [0x5e41] = 0xe488, [0x5e42] = 0xe489, [0x5e43] = 0xe48a, [0x5e44] = 0xe48b,
-+  [0x5e45] = 0xe48c, [0x5e46] = 0xe48d, [0x5e47] = 0xe48e, [0x5e48] = 0xe48f,
-+  [0x5e49] = 0xe490, [0x5e4a] = 0xe491, [0x5e4b] = 0xe492, [0x5e4c] = 0xe493,
-+  [0x5e4d] = 0xe494, [0x5e4e] = 0xe495, [0x5e4f] = 0xe496, [0x5e50] = 0xe497,
-+  [0x5e51] = 0xe498, [0x5e52] = 0xe499, [0x5e53] = 0xe49a, [0x5e54] = 0xe49b,
-+  [0x5e55] = 0xe49c, [0x5e56] = 0xe49d, [0x5e57] = 0xe49e, [0x5e58] = 0xe49f,
-+  [0x5e59] = 0xe4a0, [0x5e5a] = 0xe4a1, [0x5e5b] = 0xe4a2, [0x5e5c] = 0xe4a3,
-+  [0x5e5d] = 0xe4a4, [0x5e5e] = 0xe4a5, [0x5e5f] = 0xe4a6, [0x5e60] = 0xe4a7,
-+  [0x5e61] = 0xe4a8, [0x5e62] = 0xe4a9, [0x5e63] = 0xe4aa, [0x5e64] = 0xe4ab,
-+  [0x5e65] = 0xe4ac, [0x5e66] = 0xe4ad, [0x5e67] = 0xe4ae, [0x5e68] = 0xe4af,
-+  [0x5e69] = 0xe4b0, [0x5e6a] = 0xe4b1, [0x5e6b] = 0xe4b2, [0x5e6c] = 0xe4b3,
-+  [0x5e6d] = 0xe4b4, [0x5e6e] = 0xe4b5, [0x5e6f] = 0xe4b6, [0x5e70] = 0xe4b7,
-+  [0x5e71] = 0xe4b8, [0x5e72] = 0xe4b9, [0x5e73] = 0xe4ba, [0x5e74] = 0xe4bb,
-+  [0x5e75] = 0xe4bc, [0x5e76] = 0xe4bd, [0x5e77] = 0xe4be, [0x5e78] = 0xe4bf,
-+  [0x5e79] = 0xe4c0, [0x5e7a] = 0xe4c1, [0x5e7b] = 0xe4c2, [0x5e7c] = 0xe4c3,
-+  [0x5e7d] = 0xe4c4, [0x5e7e] = 0xe4c5,
- };
- 
- /* Table for GB18030 -> UCS-4, containing the four-byte characters only,
-@@ -6094,13 +6094,13 @@ static const uint16_t __twobyte_to_ucs[] =
- 		    ; There are five ranges. The gap lengths are:
- 		    ;   (- #x1d21 #x334) = 6637,
- 		    ;   (- #x2c41 #x2403) = 2110,
--		    ;   (- #x82bd #x4a63) = 14426,
-+		    ;   (- #x82bd #x4a79) = 14404,
- 		    ;   (- #x93d5 #x830e) = 4295.
- 		    (idx (cond ((<= 0 linear #x333) linear)
- 			       ((<= #x1d21 linear #x2402) (- linear 6637))
--			       ((<= #x2c41 linear #x4a62) (- linear 6637 2110))
--			       ((<= #x82bd linear #x830d) (- linear 6637 2110 14426))
--			       ((<= #x93d5 linear #x99de) (- linear 6637 2110 14426 4295))
-+			       ((<= #x2c41 linear #x4a78) (- linear 6637 2110))
-+			       ((<= #x82bd linear #x830d) (- linear 6637 2110 14404))
-+			       ((<= #x93d5 linear #x99e1) (- linear 6637 2110 14404 4295))
- 			       (t nil))))
- 	       (when idx
- 		 (when (= (mod count 4) 0)
-@@ -6113,7 +6113,7 @@ static const uint16_t __twobyte_to_ucs[] =
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
- */
- 
--static const uint16_t __fourbyte_to_ucs[39419-11172-4295] =
-+static const uint16_t __fourbyte_to_ucs[0x99e2 - 6637 - 2110 - 14404 - 4295] =
- {
-   [0x0000] = 0x0080, [0x0001] = 0x0081, [0x0002] = 0x0082, [0x0003] = 0x0083,
-   [0x0004] = 0x0084, [0x0005] = 0x0085, [0x0006] = 0x0086, [0x0007] = 0x0087,
-@@ -6294,65 +6294,192 @@ static const uint16_t __fourbyte_to_ucs[39419-11172-4295] =
-   [0x02c0] = 0x036c, [0x02c1] = 0x036d, [0x02c2] = 0x036e, [0x02c3] = 0x036f,
-   [0x02c4] = 0x0370, [0x02c5] = 0x0371, [0x02c6] = 0x0372, [0x02c7] = 0x0373,
-   [0x02c8] = 0x0374, [0x02c9] = 0x0375, [0x02ca] = 0x0376, [0x02cb] = 0x0377,
--  [0x02ce] = 0x037a, [0x02cf] = 0x037b, [0x02d0] = 0x037c, [0x02d1] = 0x037d,
--  [0x02d2] = 0x037e, [0x02d8] = 0x0384, [0x02d9] = 0x0385, [0x02da] = 0x0386,
--  [0x02db] = 0x0387, [0x02dc] = 0x0388, [0x02dd] = 0x0389, [0x02de] = 0x038a,
--  [0x02e0] = 0x038c, [0x02e2] = 0x038e, [0x02e3] = 0x038f, [0x02e4] = 0x0390,
--  [0x02e6] = 0x03aa, [0x02e7] = 0x03ab, [0x02e8] = 0x03ac, [0x02e9] = 0x03ad,
--  [0x02ea] = 0x03ae, [0x02eb] = 0x03af, [0x02ec] = 0x03b0, [0x02ed] = 0x03c2,
--  [0x02ee] = 0x03ca, [0x02ef] = 0x03cb, [0x02f0] = 0x03cc, [0x02f1] = 0x03cd,
--  [0x02f2] = 0x03ce, [0x02f4] = 0x03d0, [0x02f5] = 0x03d1, [0x02f6] = 0x03d2,
--  [0x02f7] = 0x03d3, [0x02f8] = 0x03d4, [0x02f9] = 0x03d5, [0x02fa] = 0x03d6,
--  [0x02fb] = 0x03d7, [0x02fc] = 0x03d8, [0x02fd] = 0x03d9, [0x02fe] = 0x03da,
--  [0x02ff] = 0x03db, [0x0300] = 0x03dc, [0x0301] = 0x03dd, [0x0302] = 0x03de,
--  [0x0303] = 0x03df, [0x0304] = 0x03e0, [0x0305] = 0x03e1, [0x0306] = 0x03e2,
--  [0x0307] = 0x03e3, [0x0308] = 0x03e4, [0x0309] = 0x03e5, [0x030a] = 0x03e6,
--  [0x030b] = 0x03e7, [0x030c] = 0x03e8, [0x030d] = 0x03e9, [0x030e] = 0x03ea,
--  [0x030f] = 0x03eb, [0x0310] = 0x03ec, [0x0311] = 0x03ed, [0x0312] = 0x03ee,
--  [0x0313] = 0x03ef, [0x0314] = 0x03f0, [0x0315] = 0x03f1, [0x0316] = 0x03f2,
--  [0x0317] = 0x03f3, [0x0318] = 0x03f4, [0x0319] = 0x03f5, [0x031a] = 0x03f6,
--  [0x031b] = 0x03f7, [0x031c] = 0x03f8, [0x031d] = 0x03f9, [0x031e] = 0x03fa,
--  [0x031f] = 0x03fb, [0x0320] = 0x03fc, [0x0321] = 0x03fd, [0x0322] = 0x03fe,
--  [0x0323] = 0x03ff, [0x0324] = 0x0400, [0x0325] = 0x0402, [0x0326] = 0x0403,
--  [0x0327] = 0x0404, [0x0328] = 0x0405, [0x0329] = 0x0406, [0x032a] = 0x0407,
--  [0x032b] = 0x0408, [0x032c] = 0x0409, [0x032d] = 0x040a, [0x032e] = 0x040b,
--  [0x032f] = 0x040c, [0x0330] = 0x040d, [0x0331] = 0x040e, [0x0332] = 0x040f,
--  [0x0333] = 0x0450, [0x0334] = 0xe7c7, [0x0505] = 0x2011, [0x0506] = 0x2012,
--  [0x0507] = 0x2017, [0x0508] = 0x201a, [0x0509] = 0x201b, [0x050a] = 0x201e,
--  [0x050b] = 0x201f, [0x050c] = 0x2020, [0x050d] = 0x2021, [0x050e] = 0x2022,
--  [0x050f] = 0x2023, [0x0510] = 0x2024, [0x0511] = 0x2027, [0x0512] = 0x2028,
--  [0x0513] = 0x2029, [0x0514] = 0x202a, [0x0515] = 0x202b, [0x0516] = 0x202c,
--  [0x0517] = 0x202d, [0x0518] = 0x202e, [0x0519] = 0x202f, [0x051a] = 0x2031,
--  [0x051b] = 0x2034, [0x051c] = 0x2036, [0x051d] = 0x2037, [0x051e] = 0x2038,
--  [0x051f] = 0x2039, [0x0520] = 0x203a, [0x0521] = 0x203c, [0x0522] = 0x203d,
--  [0x0523] = 0x203e, [0x0524] = 0x203f, [0x0525] = 0x2040, [0x0526] = 0x2041,
--  [0x0527] = 0x2042, [0x0528] = 0x2043, [0x0529] = 0x2044, [0x052a] = 0x2045,
--  [0x052b] = 0x2046, [0x052c] = 0x2047, [0x052d] = 0x2048, [0x052e] = 0x2049,
--  [0x052f] = 0x204a, [0x0530] = 0x204b, [0x0531] = 0x204c, [0x0532] = 0x204d,
--  [0x0533] = 0x204e, [0x0534] = 0x204f, [0x0535] = 0x2050, [0x0536] = 0x2051,
--  [0x0537] = 0x2052, [0x0538] = 0x2053, [0x0539] = 0x2054, [0x053a] = 0x2055,
--  [0x053b] = 0x2056, [0x053c] = 0x2057, [0x053d] = 0x2058, [0x053e] = 0x2059,
--  [0x053f] = 0x205a, [0x0540] = 0x205b, [0x0541] = 0x205c, [0x0542] = 0x205d,
--  [0x0543] = 0x205e, [0x0544] = 0x205f, [0x0545] = 0x2060, [0x0546] = 0x2061,
--  [0x0547] = 0x2062, [0x0548] = 0x2063, [0x0549] = 0x2064, [0x054f] = 0x206a,
-+  [0x02cc] = 0x0378, [0x02cd] = 0x0379, [0x02ce] = 0x037a, [0x02cf] = 0x037b,
-+  [0x02d0] = 0x037c, [0x02d1] = 0x037d, [0x02d2] = 0x037e, [0x02d3] = 0x037f,
-+  [0x02d4] = 0x0380, [0x02d5] = 0x0381, [0x02d6] = 0x0382, [0x02d7] = 0x0383,
-+  [0x02d8] = 0x0384, [0x02d9] = 0x0385, [0x02da] = 0x0386, [0x02db] = 0x0387,
-+  [0x02dc] = 0x0388, [0x02dd] = 0x0389, [0x02de] = 0x038a, [0x02df] = 0x038b,
-+  [0x02e0] = 0x038c, [0x02e1] = 0x038d, [0x02e2] = 0x038e, [0x02e3] = 0x038f,
-+  [0x02e4] = 0x0390, [0x02e5] = 0x03a2, [0x02e6] = 0x03aa, [0x02e7] = 0x03ab,
-+  [0x02e8] = 0x03ac, [0x02e9] = 0x03ad, [0x02ea] = 0x03ae, [0x02eb] = 0x03af,
-+  [0x02ec] = 0x03b0, [0x02ed] = 0x03c2, [0x02ee] = 0x03ca, [0x02ef] = 0x03cb,
-+  [0x02f0] = 0x03cc, [0x02f1] = 0x03cd, [0x02f2] = 0x03ce, [0x02f3] = 0x03cf,
-+  [0x02f4] = 0x03d0, [0x02f5] = 0x03d1, [0x02f6] = 0x03d2, [0x02f7] = 0x03d3,
-+  [0x02f8] = 0x03d4, [0x02f9] = 0x03d5, [0x02fa] = 0x03d6, [0x02fb] = 0x03d7,
-+  [0x02fc] = 0x03d8, [0x02fd] = 0x03d9, [0x02fe] = 0x03da, [0x02ff] = 0x03db,
-+  [0x0300] = 0x03dc, [0x0301] = 0x03dd, [0x0302] = 0x03de, [0x0303] = 0x03df,
-+  [0x0304] = 0x03e0, [0x0305] = 0x03e1, [0x0306] = 0x03e2, [0x0307] = 0x03e3,
-+  [0x0308] = 0x03e4, [0x0309] = 0x03e5, [0x030a] = 0x03e6, [0x030b] = 0x03e7,
-+  [0x030c] = 0x03e8, [0x030d] = 0x03e9, [0x030e] = 0x03ea, [0x030f] = 0x03eb,
-+  [0x0310] = 0x03ec, [0x0311] = 0x03ed, [0x0312] = 0x03ee, [0x0313] = 0x03ef,
-+  [0x0314] = 0x03f0, [0x0315] = 0x03f1, [0x0316] = 0x03f2, [0x0317] = 0x03f3,
-+  [0x0318] = 0x03f4, [0x0319] = 0x03f5, [0x031a] = 0x03f6, [0x031b] = 0x03f7,
-+  [0x031c] = 0x03f8, [0x031d] = 0x03f9, [0x031e] = 0x03fa, [0x031f] = 0x03fb,
-+  [0x0320] = 0x03fc, [0x0321] = 0x03fd, [0x0322] = 0x03fe, [0x0323] = 0x03ff,
-+  [0x0324] = 0x0400, [0x0325] = 0x0402, [0x0326] = 0x0403, [0x0327] = 0x0404,
-+  [0x0328] = 0x0405, [0x0329] = 0x0406, [0x032a] = 0x0407, [0x032b] = 0x0408,
-+  [0x032c] = 0x0409, [0x032d] = 0x040a, [0x032e] = 0x040b, [0x032f] = 0x040c,
-+  [0x0330] = 0x040d, [0x0331] = 0x040e, [0x0332] = 0x040f, [0x0333] = 0x0450,
-+  [0x0334] = 0xe7c7, [0x0335] = 0x1e40, [0x0336] = 0x1e41, [0x0337] = 0x1e42,
-+  [0x0338] = 0x1e43, [0x0339] = 0x1e44, [0x033a] = 0x1e45, [0x033b] = 0x1e46,
-+  [0x033c] = 0x1e47, [0x033d] = 0x1e48, [0x033e] = 0x1e49, [0x033f] = 0x1e4a,
-+  [0x0340] = 0x1e4b, [0x0341] = 0x1e4c, [0x0342] = 0x1e4d, [0x0343] = 0x1e4e,
-+  [0x0344] = 0x1e4f, [0x0345] = 0x1e50, [0x0346] = 0x1e51, [0x0347] = 0x1e52,
-+  [0x0348] = 0x1e53, [0x0349] = 0x1e54, [0x034a] = 0x1e55, [0x034b] = 0x1e56,
-+  [0x034c] = 0x1e57, [0x034d] = 0x1e58, [0x034e] = 0x1e59, [0x034f] = 0x1e5a,
-+  [0x0350] = 0x1e5b, [0x0351] = 0x1e5c, [0x0352] = 0x1e5d, [0x0353] = 0x1e5e,
-+  [0x0354] = 0x1e5f, [0x0355] = 0x1e60, [0x0356] = 0x1e61, [0x0357] = 0x1e62,
-+  [0x0358] = 0x1e63, [0x0359] = 0x1e64, [0x035a] = 0x1e65, [0x035b] = 0x1e66,
-+  [0x035c] = 0x1e67, [0x035d] = 0x1e68, [0x035e] = 0x1e69, [0x035f] = 0x1e6a,
-+  [0x0360] = 0x1e6b, [0x0361] = 0x1e6c, [0x0362] = 0x1e6d, [0x0363] = 0x1e6e,
-+  [0x0364] = 0x1e6f, [0x0365] = 0x1e70, [0x0366] = 0x1e71, [0x0367] = 0x1e72,
-+  [0x0368] = 0x1e73, [0x0369] = 0x1e74, [0x036a] = 0x1e75, [0x036b] = 0x1e76,
-+  [0x036c] = 0x1e77, [0x036d] = 0x1e78, [0x036e] = 0x1e79, [0x036f] = 0x1e7a,
-+  [0x0370] = 0x1e7b, [0x0371] = 0x1e7c, [0x0372] = 0x1e7d, [0x0373] = 0x1e7e,
-+  [0x0374] = 0x1e7f, [0x0375] = 0x1e80, [0x0376] = 0x1e81, [0x0377] = 0x1e82,
-+  [0x0378] = 0x1e83, [0x0379] = 0x1e84, [0x037a] = 0x1e85, [0x037b] = 0x1e86,
-+  [0x037c] = 0x1e87, [0x037d] = 0x1e88, [0x037e] = 0x1e89, [0x037f] = 0x1e8a,
-+  [0x0380] = 0x1e8b, [0x0381] = 0x1e8c, [0x0382] = 0x1e8d, [0x0383] = 0x1e8e,
-+  [0x0384] = 0x1e8f, [0x0385] = 0x1e90, [0x0386] = 0x1e91, [0x0387] = 0x1e92,
-+  [0x0388] = 0x1e93, [0x0389] = 0x1e94, [0x038a] = 0x1e95, [0x038b] = 0x1e96,
-+  [0x038c] = 0x1e97, [0x038d] = 0x1e98, [0x038e] = 0x1e99, [0x038f] = 0x1e9a,
-+  [0x0390] = 0x1e9b, [0x0391] = 0x1e9c, [0x0392] = 0x1e9d, [0x0393] = 0x1e9e,
-+  [0x0394] = 0x1e9f, [0x0395] = 0x1ea0, [0x0396] = 0x1ea1, [0x0397] = 0x1ea2,
-+  [0x0398] = 0x1ea3, [0x0399] = 0x1ea4, [0x039a] = 0x1ea5, [0x039b] = 0x1ea6,
-+  [0x039c] = 0x1ea7, [0x039d] = 0x1ea8, [0x039e] = 0x1ea9, [0x039f] = 0x1eaa,
-+  [0x03a0] = 0x1eab, [0x03a1] = 0x1eac, [0x03a2] = 0x1ead, [0x03a3] = 0x1eae,
-+  [0x03a4] = 0x1eaf, [0x03a5] = 0x1eb0, [0x03a6] = 0x1eb1, [0x03a7] = 0x1eb2,
-+  [0x03a8] = 0x1eb3, [0x03a9] = 0x1eb4, [0x03aa] = 0x1eb5, [0x03ab] = 0x1eb6,
-+  [0x03ac] = 0x1eb7, [0x03ad] = 0x1eb8, [0x03ae] = 0x1eb9, [0x03af] = 0x1eba,
-+  [0x03b0] = 0x1ebb, [0x03b1] = 0x1ebc, [0x03b2] = 0x1ebd, [0x03b3] = 0x1ebe,
-+  [0x03b4] = 0x1ebf, [0x03b5] = 0x1ec0, [0x03b6] = 0x1ec1, [0x03b7] = 0x1ec2,
-+  [0x03b8] = 0x1ec3, [0x03b9] = 0x1ec4, [0x03ba] = 0x1ec5, [0x03bb] = 0x1ec6,
-+  [0x03bc] = 0x1ec7, [0x03bd] = 0x1ec8, [0x03be] = 0x1ec9, [0x03bf] = 0x1eca,
-+  [0x03c0] = 0x1ecb, [0x03c1] = 0x1ecc, [0x03c2] = 0x1ecd, [0x03c3] = 0x1ece,
-+  [0x03c4] = 0x1ecf, [0x03c5] = 0x1ed0, [0x03c6] = 0x1ed1, [0x03c7] = 0x1ed2,
-+  [0x03c8] = 0x1ed3, [0x03c9] = 0x1ed4, [0x03ca] = 0x1ed5, [0x03cb] = 0x1ed6,
-+  [0x03cc] = 0x1ed7, [0x03cd] = 0x1ed8, [0x03ce] = 0x1ed9, [0x03cf] = 0x1eda,
-+  [0x03d0] = 0x1edb, [0x03d1] = 0x1edc, [0x03d2] = 0x1edd, [0x03d3] = 0x1ede,
-+  [0x03d4] = 0x1edf, [0x03d5] = 0x1ee0, [0x03d6] = 0x1ee1, [0x03d7] = 0x1ee2,
-+  [0x03d8] = 0x1ee3, [0x03d9] = 0x1ee4, [0x03da] = 0x1ee5, [0x03db] = 0x1ee6,
-+  [0x03dc] = 0x1ee7, [0x03dd] = 0x1ee8, [0x03de] = 0x1ee9, [0x03df] = 0x1eea,
-+  [0x03e0] = 0x1eeb, [0x03e1] = 0x1eec, [0x03e2] = 0x1eed, [0x03e3] = 0x1eee,
-+  [0x03e4] = 0x1eef, [0x03e5] = 0x1ef0, [0x03e6] = 0x1ef1, [0x03e7] = 0x1ef2,
-+  [0x03e8] = 0x1ef3, [0x03e9] = 0x1ef4, [0x03ea] = 0x1ef5, [0x03eb] = 0x1ef6,
-+  [0x03ec] = 0x1ef7, [0x03ed] = 0x1ef8, [0x03ee] = 0x1ef9, [0x03ef] = 0x1efa,
-+  [0x03f0] = 0x1efb, [0x03f1] = 0x1efc, [0x03f2] = 0x1efd, [0x03f3] = 0x1efe,
-+  [0x03f4] = 0x1eff, [0x03f5] = 0x1f00, [0x03f6] = 0x1f01, [0x03f7] = 0x1f02,
-+  [0x03f8] = 0x1f03, [0x03f9] = 0x1f04, [0x03fa] = 0x1f05, [0x03fb] = 0x1f06,
-+  [0x03fc] = 0x1f07, [0x03fd] = 0x1f08, [0x03fe] = 0x1f09, [0x03ff] = 0x1f0a,
-+  [0x0400] = 0x1f0b, [0x0401] = 0x1f0c, [0x0402] = 0x1f0d, [0x0403] = 0x1f0e,
-+  [0x0404] = 0x1f0f, [0x0405] = 0x1f10, [0x0406] = 0x1f11, [0x0407] = 0x1f12,
-+  [0x0408] = 0x1f13, [0x0409] = 0x1f14, [0x040a] = 0x1f15, [0x040b] = 0x1f16,
-+  [0x040c] = 0x1f17, [0x040d] = 0x1f18, [0x040e] = 0x1f19, [0x040f] = 0x1f1a,
-+  [0x0410] = 0x1f1b, [0x0411] = 0x1f1c, [0x0412] = 0x1f1d, [0x0413] = 0x1f1e,
-+  [0x0414] = 0x1f1f, [0x0415] = 0x1f20, [0x0416] = 0x1f21, [0x0417] = 0x1f22,
-+  [0x0418] = 0x1f23, [0x0419] = 0x1f24, [0x041a] = 0x1f25, [0x041b] = 0x1f26,
-+  [0x041c] = 0x1f27, [0x041d] = 0x1f28, [0x041e] = 0x1f29, [0x041f] = 0x1f2a,
-+  [0x0420] = 0x1f2b, [0x0421] = 0x1f2c, [0x0422] = 0x1f2d, [0x0423] = 0x1f2e,
-+  [0x0424] = 0x1f2f, [0x0425] = 0x1f30, [0x0426] = 0x1f31, [0x0427] = 0x1f32,
-+  [0x0428] = 0x1f33, [0x0429] = 0x1f34, [0x042a] = 0x1f35, [0x042b] = 0x1f36,
-+  [0x042c] = 0x1f37, [0x042d] = 0x1f38, [0x042e] = 0x1f39, [0x042f] = 0x1f3a,
-+  [0x0430] = 0x1f3b, [0x0431] = 0x1f3c, [0x0432] = 0x1f3d, [0x0433] = 0x1f3e,
-+  [0x0434] = 0x1f3f, [0x0435] = 0x1f40, [0x0436] = 0x1f41, [0x0437] = 0x1f42,
-+  [0x0438] = 0x1f43, [0x0439] = 0x1f44, [0x043a] = 0x1f45, [0x043b] = 0x1f46,
-+  [0x043c] = 0x1f47, [0x043d] = 0x1f48, [0x043e] = 0x1f49, [0x043f] = 0x1f4a,
-+  [0x0440] = 0x1f4b, [0x0441] = 0x1f4c, [0x0442] = 0x1f4d, [0x0443] = 0x1f4e,
-+  [0x0444] = 0x1f4f, [0x0445] = 0x1f50, [0x0446] = 0x1f51, [0x0447] = 0x1f52,
-+  [0x0448] = 0x1f53, [0x0449] = 0x1f54, [0x044a] = 0x1f55, [0x044b] = 0x1f56,
-+  [0x044c] = 0x1f57, [0x044d] = 0x1f58, [0x044e] = 0x1f59, [0x044f] = 0x1f5a,
-+  [0x0450] = 0x1f5b, [0x0451] = 0x1f5c, [0x0452] = 0x1f5d, [0x0453] = 0x1f5e,
-+  [0x0454] = 0x1f5f, [0x0455] = 0x1f60, [0x0456] = 0x1f61, [0x0457] = 0x1f62,
-+  [0x0458] = 0x1f63, [0x0459] = 0x1f64, [0x045a] = 0x1f65, [0x045b] = 0x1f66,
-+  [0x045c] = 0x1f67, [0x045d] = 0x1f68, [0x045e] = 0x1f69, [0x045f] = 0x1f6a,
-+  [0x0460] = 0x1f6b, [0x0461] = 0x1f6c, [0x0462] = 0x1f6d, [0x0463] = 0x1f6e,
-+  [0x0464] = 0x1f6f, [0x0465] = 0x1f70, [0x0466] = 0x1f71, [0x0467] = 0x1f72,
-+  [0x0468] = 0x1f73, [0x0469] = 0x1f74, [0x046a] = 0x1f75, [0x046b] = 0x1f76,
-+  [0x046c] = 0x1f77, [0x046d] = 0x1f78, [0x046e] = 0x1f79, [0x046f] = 0x1f7a,
-+  [0x0470] = 0x1f7b, [0x0471] = 0x1f7c, [0x0472] = 0x1f7d, [0x0473] = 0x1f7e,
-+  [0x0474] = 0x1f7f, [0x0475] = 0x1f80, [0x0476] = 0x1f81, [0x0477] = 0x1f82,
-+  [0x0478] = 0x1f83, [0x0479] = 0x1f84, [0x047a] = 0x1f85, [0x047b] = 0x1f86,
-+  [0x047c] = 0x1f87, [0x047d] = 0x1f88, [0x047e] = 0x1f89, [0x047f] = 0x1f8a,
-+  [0x0480] = 0x1f8b, [0x0481] = 0x1f8c, [0x0482] = 0x1f8d, [0x0483] = 0x1f8e,
-+  [0x0484] = 0x1f8f, [0x0485] = 0x1f90, [0x0486] = 0x1f91, [0x0487] = 0x1f92,
-+  [0x0488] = 0x1f93, [0x0489] = 0x1f94, [0x048a] = 0x1f95, [0x048b] = 0x1f96,
-+  [0x048c] = 0x1f97, [0x048d] = 0x1f98, [0x048e] = 0x1f99, [0x048f] = 0x1f9a,
-+  [0x0490] = 0x1f9b, [0x0491] = 0x1f9c, [0x0492] = 0x1f9d, [0x0493] = 0x1f9e,
-+  [0x0494] = 0x1f9f, [0x0495] = 0x1fa0, [0x0496] = 0x1fa1, [0x0497] = 0x1fa2,
-+  [0x0498] = 0x1fa3, [0x0499] = 0x1fa4, [0x049a] = 0x1fa5, [0x049b] = 0x1fa6,
-+  [0x049c] = 0x1fa7, [0x049d] = 0x1fa8, [0x049e] = 0x1fa9, [0x049f] = 0x1faa,
-+  [0x04a0] = 0x1fab, [0x04a1] = 0x1fac, [0x04a2] = 0x1fad, [0x04a3] = 0x1fae,
-+  [0x04a4] = 0x1faf, [0x04a5] = 0x1fb0, [0x04a6] = 0x1fb1, [0x04a7] = 0x1fb2,
-+  [0x04a8] = 0x1fb3, [0x04a9] = 0x1fb4, [0x04aa] = 0x1fb5, [0x04ab] = 0x1fb6,
-+  [0x04ac] = 0x1fb7, [0x04ad] = 0x1fb8, [0x04ae] = 0x1fb9, [0x04af] = 0x1fba,
-+  [0x04b0] = 0x1fbb, [0x04b1] = 0x1fbc, [0x04b2] = 0x1fbd, [0x04b3] = 0x1fbe,
-+  [0x04b4] = 0x1fbf, [0x04b5] = 0x1fc0, [0x04b6] = 0x1fc1, [0x04b7] = 0x1fc2,
-+  [0x04b8] = 0x1fc3, [0x04b9] = 0x1fc4, [0x04ba] = 0x1fc5, [0x04bb] = 0x1fc6,
-+  [0x04bc] = 0x1fc7, [0x04bd] = 0x1fc8, [0x04be] = 0x1fc9, [0x04bf] = 0x1fca,
-+  [0x04c0] = 0x1fcb, [0x04c1] = 0x1fcc, [0x04c2] = 0x1fcd, [0x04c3] = 0x1fce,
-+  [0x04c4] = 0x1fcf, [0x04c5] = 0x1fd0, [0x04c6] = 0x1fd1, [0x04c7] = 0x1fd2,
-+  [0x04c8] = 0x1fd3, [0x04c9] = 0x1fd4, [0x04ca] = 0x1fd5, [0x04cb] = 0x1fd6,
-+  [0x04cc] = 0x1fd7, [0x04cd] = 0x1fd8, [0x04ce] = 0x1fd9, [0x04cf] = 0x1fda,
-+  [0x04d0] = 0x1fdb, [0x04d1] = 0x1fdc, [0x04d2] = 0x1fdd, [0x04d3] = 0x1fde,
-+  [0x04d4] = 0x1fdf, [0x04d5] = 0x1fe0, [0x04d6] = 0x1fe1, [0x04d7] = 0x1fe2,
-+  [0x04d8] = 0x1fe3, [0x04d9] = 0x1fe4, [0x04da] = 0x1fe5, [0x04db] = 0x1fe6,
-+  [0x04dc] = 0x1fe7, [0x04dd] = 0x1fe8, [0x04de] = 0x1fe9, [0x04df] = 0x1fea,
-+  [0x04e0] = 0x1feb, [0x04e1] = 0x1fec, [0x04e2] = 0x1fed, [0x04e3] = 0x1fee,
-+  [0x04e4] = 0x1fef, [0x04e5] = 0x1ff0, [0x04e6] = 0x1ff1, [0x04e7] = 0x1ff2,
-+  [0x04e8] = 0x1ff3, [0x04e9] = 0x1ff4, [0x04ea] = 0x1ff5, [0x04eb] = 0x1ff6,
-+  [0x04ec] = 0x1ff7, [0x04ed] = 0x1ff8, [0x04ee] = 0x1ff9, [0x04ef] = 0x1ffa,
-+  [0x04f0] = 0x1ffb, [0x04f1] = 0x1ffc, [0x04f2] = 0x1ffd, [0x04f3] = 0x1ffe,
-+  [0x04f4] = 0x1fff, [0x04f5] = 0x2000, [0x04f6] = 0x2001, [0x04f7] = 0x2002,
-+  [0x04f8] = 0x2003, [0x04f9] = 0x2004, [0x04fa] = 0x2005, [0x04fb] = 0x2006,
-+  [0x04fc] = 0x2007, [0x04fd] = 0x2008, [0x04fe] = 0x2009, [0x04ff] = 0x200a,
-+  [0x0500] = 0x200b, [0x0501] = 0x200c, [0x0502] = 0x200d, [0x0503] = 0x200e,
-+  [0x0504] = 0x200f, [0x0505] = 0x2011, [0x0506] = 0x2012, [0x0507] = 0x2017,
-+  [0x0508] = 0x201a, [0x0509] = 0x201b, [0x050a] = 0x201e, [0x050b] = 0x201f,
-+  [0x050c] = 0x2020, [0x050d] = 0x2021, [0x050e] = 0x2022, [0x050f] = 0x2023,
-+  [0x0510] = 0x2024, [0x0511] = 0x2027, [0x0512] = 0x2028, [0x0513] = 0x2029,
-+  [0x0514] = 0x202a, [0x0515] = 0x202b, [0x0516] = 0x202c, [0x0517] = 0x202d,
-+  [0x0518] = 0x202e, [0x0519] = 0x202f, [0x051a] = 0x2031, [0x051b] = 0x2034,
-+  [0x051c] = 0x2036, [0x051d] = 0x2037, [0x051e] = 0x2038, [0x051f] = 0x2039,
-+  [0x0520] = 0x203a, [0x0521] = 0x203c, [0x0522] = 0x203d, [0x0523] = 0x203e,
-+  [0x0524] = 0x203f, [0x0525] = 0x2040, [0x0526] = 0x2041, [0x0527] = 0x2042,
-+  [0x0528] = 0x2043, [0x0529] = 0x2044, [0x052a] = 0x2045, [0x052b] = 0x2046,
-+  [0x052c] = 0x2047, [0x052d] = 0x2048, [0x052e] = 0x2049, [0x052f] = 0x204a,
-+  [0x0530] = 0x204b, [0x0531] = 0x204c, [0x0532] = 0x204d, [0x0533] = 0x204e,
-+  [0x0534] = 0x204f, [0x0535] = 0x2050, [0x0536] = 0x2051, [0x0537] = 0x2052,
-+  [0x0538] = 0x2053, [0x0539] = 0x2054, [0x053a] = 0x2055, [0x053b] = 0x2056,
-+  [0x053c] = 0x2057, [0x053d] = 0x2058, [0x053e] = 0x2059, [0x053f] = 0x205a,
-+  [0x0540] = 0x205b, [0x0541] = 0x205c, [0x0542] = 0x205d, [0x0543] = 0x205e,
-+  [0x0544] = 0x205f, [0x0545] = 0x2060, [0x0546] = 0x2061, [0x0547] = 0x2062,
-+  [0x0548] = 0x2063, [0x0549] = 0x2064, [0x054a] = 0x2065, [0x054b] = 0x2066,
-+  [0x054c] = 0x2067, [0x054d] = 0x2068, [0x054e] = 0x2069, [0x054f] = 0x206a,
-   [0x0550] = 0x206b, [0x0551] = 0x206c, [0x0552] = 0x206d, [0x0553] = 0x206e,
--  [0x0554] = 0x206f, [0x0555] = 0x2070, [0x0556] = 0x2071, [0x0559] = 0x2074,
--  [0x055a] = 0x2075, [0x055b] = 0x2076, [0x055c] = 0x2077, [0x055d] = 0x2078,
--  [0x055e] = 0x2079, [0x055f] = 0x207a, [0x0560] = 0x207b, [0x0561] = 0x207c,
--  [0x0562] = 0x207d, [0x0563] = 0x207e, [0x0564] = 0x207f, [0x0565] = 0x2080,
--  [0x0566] = 0x2081, [0x0567] = 0x2082, [0x0568] = 0x2083, [0x0569] = 0x2084,
--  [0x056a] = 0x2085, [0x056b] = 0x2086, [0x056c] = 0x2087, [0x056d] = 0x2088,
--  [0x056e] = 0x2089, [0x056f] = 0x208a, [0x0570] = 0x208b, [0x0571] = 0x208c,
--  [0x0572] = 0x208d, [0x0573] = 0x208e, [0x0575] = 0x2090, [0x0576] = 0x2091,
--  [0x0577] = 0x2092, [0x0578] = 0x2093, [0x0579] = 0x2094, [0x057a] = 0x2095,
--  [0x057b] = 0x2096, [0x057c] = 0x2097, [0x057d] = 0x2098, [0x057e] = 0x2099,
--  [0x057f] = 0x209a, [0x0580] = 0x209b, [0x0581] = 0x209c, [0x0585] = 0x20a0,
--  [0x0586] = 0x20a1, [0x0587] = 0x20a2, [0x0588] = 0x20a3, [0x0589] = 0x20a4,
--  [0x058a] = 0x20a5, [0x058b] = 0x20a6, [0x058c] = 0x20a7, [0x058d] = 0x20a8,
--  [0x058e] = 0x20a9, [0x058f] = 0x20aa, [0x0590] = 0x20ab, [0x0591] = 0x20ad,
--  [0x0592] = 0x20ae, [0x0593] = 0x20af, [0x0594] = 0x20b0, [0x0595] = 0x20b1,
--  [0x0596] = 0x20b2, [0x0597] = 0x20b3, [0x0598] = 0x20b4, [0x0599] = 0x20b5,
--  [0x059a] = 0x20b6, [0x059b] = 0x20b7, [0x059c] = 0x20b8, [0x059d] = 0x20b9,
-+  [0x0554] = 0x206f, [0x0555] = 0x2070, [0x0556] = 0x2071, [0x0557] = 0x2072,
-+  [0x0558] = 0x2073, [0x0559] = 0x2074, [0x055a] = 0x2075, [0x055b] = 0x2076,
-+  [0x055c] = 0x2077, [0x055d] = 0x2078, [0x055e] = 0x2079, [0x055f] = 0x207a,
-+  [0x0560] = 0x207b, [0x0561] = 0x207c, [0x0562] = 0x207d, [0x0563] = 0x207e,
-+  [0x0564] = 0x207f, [0x0565] = 0x2080, [0x0566] = 0x2081, [0x0567] = 0x2082,
-+  [0x0568] = 0x2083, [0x0569] = 0x2084, [0x056a] = 0x2085, [0x056b] = 0x2086,
-+  [0x056c] = 0x2087, [0x056d] = 0x2088, [0x056e] = 0x2089, [0x056f] = 0x208a,
-+  [0x0570] = 0x208b, [0x0571] = 0x208c, [0x0572] = 0x208d, [0x0573] = 0x208e,
-+  [0x0574] = 0x208f, [0x0575] = 0x2090, [0x0576] = 0x2091, [0x0577] = 0x2092,
-+  [0x0578] = 0x2093, [0x0579] = 0x2094, [0x057a] = 0x2095, [0x057b] = 0x2096,
-+  [0x057c] = 0x2097, [0x057d] = 0x2098, [0x057e] = 0x2099, [0x057f] = 0x209a,
-+  [0x0580] = 0x209b, [0x0581] = 0x209c, [0x0582] = 0x209d, [0x0583] = 0x209e,
-+  [0x0584] = 0x209f, [0x0585] = 0x20a0, [0x0586] = 0x20a1, [0x0587] = 0x20a2,
-+  [0x0588] = 0x20a3, [0x0589] = 0x20a4, [0x058a] = 0x20a5, [0x058b] = 0x20a6,
-+  [0x058c] = 0x20a7, [0x058d] = 0x20a8, [0x058e] = 0x20a9, [0x058f] = 0x20aa,
-+  [0x0590] = 0x20ab, [0x0591] = 0x20ad, [0x0592] = 0x20ae, [0x0593] = 0x20af,
-+  [0x0594] = 0x20b0, [0x0595] = 0x20b1, [0x0596] = 0x20b2, [0x0597] = 0x20b3,
-+  [0x0598] = 0x20b4, [0x0599] = 0x20b5, [0x059a] = 0x20b6, [0x059b] = 0x20b7,
-+  [0x059c] = 0x20b8, [0x059d] = 0x20b9, [0x059e] = 0x20ba, [0x059f] = 0x20bb,
-+  [0x05a0] = 0x20bc, [0x05a1] = 0x20bd, [0x05a2] = 0x20be, [0x05a3] = 0x20bf,
-+  [0x05a4] = 0x20c0, [0x05a5] = 0x20c1, [0x05a6] = 0x20c2, [0x05a7] = 0x20c3,
-+  [0x05a8] = 0x20c4, [0x05a9] = 0x20c5, [0x05aa] = 0x20c6, [0x05ab] = 0x20c7,
-+  [0x05ac] = 0x20c8, [0x05ad] = 0x20c9, [0x05ae] = 0x20ca, [0x05af] = 0x20cb,
-+  [0x05b0] = 0x20cc, [0x05b1] = 0x20cd, [0x05b2] = 0x20ce, [0x05b3] = 0x20cf,
-   [0x05b4] = 0x20d0, [0x05b5] = 0x20d1, [0x05b6] = 0x20d2, [0x05b7] = 0x20d3,
-   [0x05b8] = 0x20d4, [0x05b9] = 0x20d5, [0x05ba] = 0x20d6, [0x05bb] = 0x20d7,
-   [0x05bc] = 0x20d8, [0x05bd] = 0x20d9, [0x05be] = 0x20da, [0x05bf] = 0x20db,
-@@ -6361,264 +6488,284 @@ static const uint16_t __fourbyte_to_ucs[39419-11172-4295] =
-   [0x05c8] = 0x20e4, [0x05c9] = 0x20e5, [0x05ca] = 0x20e6, [0x05cb] = 0x20e7,
-   [0x05cc] = 0x20e8, [0x05cd] = 0x20e9, [0x05ce] = 0x20ea, [0x05cf] = 0x20eb,
-   [0x05d0] = 0x20ec, [0x05d1] = 0x20ed, [0x05d2] = 0x20ee, [0x05d3] = 0x20ef,
--  [0x05d4] = 0x20f0, [0x05e4] = 0x2100, [0x05e5] = 0x2101, [0x05e6] = 0x2102,
--  [0x05e7] = 0x2104, [0x05e8] = 0x2106, [0x05e9] = 0x2107, [0x05ea] = 0x2108,
--  [0x05eb] = 0x210a, [0x05ec] = 0x210b, [0x05ed] = 0x210c, [0x05ee] = 0x210d,
--  [0x05ef] = 0x210e, [0x05f0] = 0x210f, [0x05f1] = 0x2110, [0x05f2] = 0x2111,
--  [0x05f3] = 0x2112, [0x05f4] = 0x2113, [0x05f5] = 0x2114, [0x05f6] = 0x2115,
--  [0x05f7] = 0x2117, [0x05f8] = 0x2118, [0x05f9] = 0x2119, [0x05fa] = 0x211a,
--  [0x05fb] = 0x211b, [0x05fc] = 0x211c, [0x05fd] = 0x211d, [0x05fe] = 0x211e,
--  [0x05ff] = 0x211f, [0x0600] = 0x2120, [0x0601] = 0x2122, [0x0602] = 0x2123,
--  [0x0603] = 0x2124, [0x0604] = 0x2125, [0x0605] = 0x2126, [0x0606] = 0x2127,
--  [0x0607] = 0x2128, [0x0608] = 0x2129, [0x0609] = 0x212a, [0x060a] = 0x212b,
--  [0x060b] = 0x212c, [0x060c] = 0x212d, [0x060d] = 0x212e, [0x060e] = 0x212f,
--  [0x060f] = 0x2130, [0x0610] = 0x2131, [0x0611] = 0x2132, [0x0612] = 0x2133,
--  [0x0613] = 0x2134, [0x0614] = 0x2135, [0x0615] = 0x2136, [0x0616] = 0x2137,
--  [0x0617] = 0x2138, [0x0618] = 0x2139, [0x0619] = 0x213a, [0x061a] = 0x213b,
--  [0x061b] = 0x213c, [0x061c] = 0x213d, [0x061d] = 0x213e, [0x061e] = 0x213f,
--  [0x061f] = 0x2140, [0x0620] = 0x2141, [0x0621] = 0x2142, [0x0622] = 0x2143,
--  [0x0623] = 0x2144, [0x0624] = 0x2145, [0x0625] = 0x2146, [0x0626] = 0x2147,
--  [0x0627] = 0x2148, [0x0628] = 0x2149, [0x0629] = 0x214a, [0x062a] = 0x214b,
--  [0x062b] = 0x214c, [0x062c] = 0x214d, [0x062d] = 0x214e, [0x062e] = 0x214f,
--  [0x062f] = 0x2150, [0x0630] = 0x2151, [0x0631] = 0x2152, [0x0632] = 0x2153,
--  [0x0633] = 0x2154, [0x0634] = 0x2155, [0x0635] = 0x2156, [0x0636] = 0x2157,
--  [0x0637] = 0x2158, [0x0638] = 0x2159, [0x0639] = 0x215a, [0x063a] = 0x215b,
--  [0x063b] = 0x215c, [0x063c] = 0x215d, [0x063d] = 0x215e, [0x063e] = 0x215f,
--  [0x063f] = 0x216c, [0x0640] = 0x216d, [0x0641] = 0x216e, [0x0642] = 0x216f,
--  [0x0643] = 0x217a, [0x0644] = 0x217b, [0x0645] = 0x217c, [0x0646] = 0x217d,
--  [0x0647] = 0x217e, [0x0648] = 0x217f, [0x0649] = 0x2180, [0x064a] = 0x2181,
--  [0x064b] = 0x2182, [0x064c] = 0x2183, [0x064d] = 0x2184, [0x064e] = 0x2185,
--  [0x064f] = 0x2186, [0x0650] = 0x2187, [0x0651] = 0x2188, [0x0652] = 0x2189,
--  [0x0659] = 0x2194, [0x065a] = 0x2195, [0x065b] = 0x219a, [0x065c] = 0x219b,
--  [0x065d] = 0x219c, [0x065e] = 0x219d, [0x065f] = 0x219e, [0x0660] = 0x219f,
--  [0x0661] = 0x21a0, [0x0662] = 0x21a1, [0x0663] = 0x21a2, [0x0664] = 0x21a3,
--  [0x0665] = 0x21a4, [0x0666] = 0x21a5, [0x0667] = 0x21a6, [0x0668] = 0x21a7,
--  [0x0669] = 0x21a8, [0x066a] = 0x21a9, [0x066b] = 0x21aa, [0x066c] = 0x21ab,
--  [0x066d] = 0x21ac, [0x066e] = 0x21ad, [0x066f] = 0x21ae, [0x0670] = 0x21af,
--  [0x0671] = 0x21b0, [0x0672] = 0x21b1, [0x0673] = 0x21b2, [0x0674] = 0x21b3,
--  [0x0675] = 0x21b4, [0x0676] = 0x21b5, [0x0677] = 0x21b6, [0x0678] = 0x21b7,
--  [0x0679] = 0x21b8, [0x067a] = 0x21b9, [0x067b] = 0x21ba, [0x067c] = 0x21bb,
--  [0x067d] = 0x21bc, [0x067e] = 0x21bd, [0x067f] = 0x21be, [0x0680] = 0x21bf,
--  [0x0681] = 0x21c0, [0x0682] = 0x21c1, [0x0683] = 0x21c2, [0x0684] = 0x21c3,
--  [0x0685] = 0x21c4, [0x0686] = 0x21c5, [0x0687] = 0x21c6, [0x0688] = 0x21c7,
--  [0x0689] = 0x21c8, [0x068a] = 0x21c9, [0x068b] = 0x21ca, [0x068c] = 0x21cb,
--  [0x068d] = 0x21cc, [0x068e] = 0x21cd, [0x068f] = 0x21ce, [0x0690] = 0x21cf,
--  [0x0691] = 0x21d0, [0x0692] = 0x21d1, [0x0693] = 0x21d2, [0x0694] = 0x21d3,
--  [0x0695] = 0x21d4, [0x0696] = 0x21d5, [0x0697] = 0x21d6, [0x0698] = 0x21d7,
--  [0x0699] = 0x21d8, [0x069a] = 0x21d9, [0x069b] = 0x21da, [0x069c] = 0x21db,
--  [0x069d] = 0x21dc, [0x069e] = 0x21dd, [0x069f] = 0x21de, [0x06a0] = 0x21df,
--  [0x06a1] = 0x21e0, [0x06a2] = 0x21e1, [0x06a3] = 0x21e2, [0x06a4] = 0x21e3,
--  [0x06a5] = 0x21e4, [0x06a6] = 0x21e5, [0x06a7] = 0x21e6, [0x06a8] = 0x21e7,
--  [0x06a9] = 0x21e8, [0x06aa] = 0x21e9, [0x06ab] = 0x21ea, [0x06ac] = 0x21eb,
--  [0x06ad] = 0x21ec, [0x06ae] = 0x21ed, [0x06af] = 0x21ee, [0x06b0] = 0x21ef,
--  [0x06b1] = 0x21f0, [0x06b2] = 0x21f1, [0x06b3] = 0x21f2, [0x06b4] = 0x21f3,
--  [0x06b5] = 0x21f4, [0x06b6] = 0x21f5, [0x06b7] = 0x21f6, [0x06b8] = 0x21f7,
--  [0x06b9] = 0x21f8, [0x06ba] = 0x21f9, [0x06bb] = 0x21fa, [0x06bc] = 0x21fb,
--  [0x06bd] = 0x21fc, [0x06be] = 0x21fd, [0x06bf] = 0x21fe, [0x06c0] = 0x21ff,
--  [0x06c1] = 0x2200, [0x06c2] = 0x2201, [0x06c3] = 0x2202, [0x06c4] = 0x2203,
--  [0x06c5] = 0x2204, [0x06c6] = 0x2205, [0x06c7] = 0x2206, [0x06c8] = 0x2207,
--  [0x06c9] = 0x2209, [0x06ca] = 0x220a, [0x06cb] = 0x220b, [0x06cc] = 0x220c,
--  [0x06cd] = 0x220d, [0x06ce] = 0x220e, [0x06cf] = 0x2210, [0x06d0] = 0x2212,
--  [0x06d1] = 0x2213, [0x06d2] = 0x2214, [0x06d3] = 0x2216, [0x06d4] = 0x2217,
--  [0x06d5] = 0x2218, [0x06d6] = 0x2219, [0x06d7] = 0x221b, [0x06d8] = 0x221c,
--  [0x06d9] = 0x2221, [0x06da] = 0x2222, [0x06db] = 0x2224, [0x06dc] = 0x2226,
--  [0x06dd] = 0x222c, [0x06de] = 0x222d, [0x06df] = 0x222f, [0x06e0] = 0x2230,
--  [0x06e1] = 0x2231, [0x06e2] = 0x2232, [0x06e3] = 0x2233, [0x06e4] = 0x2238,
--  [0x06e5] = 0x2239, [0x06e6] = 0x223a, [0x06e7] = 0x223b, [0x06e8] = 0x223c,
--  [0x06e9] = 0x223e, [0x06ea] = 0x223f, [0x06eb] = 0x2240, [0x06ec] = 0x2241,
--  [0x06ed] = 0x2242, [0x06ee] = 0x2243, [0x06ef] = 0x2244, [0x06f0] = 0x2245,
--  [0x06f1] = 0x2246, [0x06f2] = 0x2247, [0x06f3] = 0x2249, [0x06f4] = 0x224a,
--  [0x06f5] = 0x224b, [0x06f6] = 0x224d, [0x06f7] = 0x224e, [0x06f8] = 0x224f,
--  [0x06f9] = 0x2250, [0x06fa] = 0x2251, [0x06fb] = 0x2253, [0x06fc] = 0x2254,
--  [0x06fd] = 0x2255, [0x06fe] = 0x2256, [0x06ff] = 0x2257, [0x0700] = 0x2258,
--  [0x0701] = 0x2259, [0x0702] = 0x225a, [0x0703] = 0x225b, [0x0704] = 0x225c,
--  [0x0705] = 0x225d, [0x0706] = 0x225e, [0x0707] = 0x225f, [0x0708] = 0x2262,
--  [0x0709] = 0x2263, [0x070a] = 0x2268, [0x070b] = 0x2269, [0x070c] = 0x226a,
--  [0x070d] = 0x226b, [0x070e] = 0x226c, [0x070f] = 0x226d, [0x0710] = 0x2270,
--  [0x0711] = 0x2271, [0x0712] = 0x2272, [0x0713] = 0x2273, [0x0714] = 0x2274,
--  [0x0715] = 0x2275, [0x0716] = 0x2276, [0x0717] = 0x2277, [0x0718] = 0x2278,
--  [0x0719] = 0x2279, [0x071a] = 0x227a, [0x071b] = 0x227b, [0x071c] = 0x227c,
--  [0x071d] = 0x227d, [0x071e] = 0x227e, [0x071f] = 0x227f, [0x0720] = 0x2280,
--  [0x0721] = 0x2281, [0x0722] = 0x2282, [0x0723] = 0x2283, [0x0724] = 0x2284,
--  [0x0725] = 0x2285, [0x0726] = 0x2286, [0x0727] = 0x2287, [0x0728] = 0x2288,
--  [0x0729] = 0x2289, [0x072a] = 0x228a, [0x072b] = 0x228b, [0x072c] = 0x228c,
--  [0x072d] = 0x228d, [0x072e] = 0x228e, [0x072f] = 0x228f, [0x0730] = 0x2290,
--  [0x0731] = 0x2291, [0x0732] = 0x2292, [0x0733] = 0x2293, [0x0734] = 0x2294,
--  [0x0735] = 0x2296, [0x0736] = 0x2297, [0x0737] = 0x2298, [0x0738] = 0x229a,
--  [0x0739] = 0x229b, [0x073a] = 0x229c, [0x073b] = 0x229d, [0x073c] = 0x229e,
--  [0x073d] = 0x229f, [0x073e] = 0x22a0, [0x073f] = 0x22a1, [0x0740] = 0x22a2,
--  [0x0741] = 0x22a3, [0x0742] = 0x22a4, [0x0743] = 0x22a6, [0x0744] = 0x22a7,
--  [0x0745] = 0x22a8, [0x0746] = 0x22a9, [0x0747] = 0x22aa, [0x0748] = 0x22ab,
--  [0x0749] = 0x22ac, [0x074a] = 0x22ad, [0x074b] = 0x22ae, [0x074c] = 0x22af,
--  [0x074d] = 0x22b0, [0x074e] = 0x22b1, [0x074f] = 0x22b2, [0x0750] = 0x22b3,
--  [0x0751] = 0x22b4, [0x0752] = 0x22b5, [0x0753] = 0x22b6, [0x0754] = 0x22b7,
--  [0x0755] = 0x22b8, [0x0756] = 0x22b9, [0x0757] = 0x22ba, [0x0758] = 0x22bb,
--  [0x0759] = 0x22bc, [0x075a] = 0x22bd, [0x075b] = 0x22be, [0x075c] = 0x22c0,
--  [0x075d] = 0x22c1, [0x075e] = 0x22c2, [0x075f] = 0x22c3, [0x0760] = 0x22c4,
--  [0x0761] = 0x22c5, [0x0762] = 0x22c6, [0x0763] = 0x22c7, [0x0764] = 0x22c8,
--  [0x0765] = 0x22c9, [0x0766] = 0x22ca, [0x0767] = 0x22cb, [0x0768] = 0x22cc,
--  [0x0769] = 0x22cd, [0x076a] = 0x22ce, [0x076b] = 0x22cf, [0x076c] = 0x22d0,
--  [0x076d] = 0x22d1, [0x076e] = 0x22d2, [0x076f] = 0x22d3, [0x0770] = 0x22d4,
--  [0x0771] = 0x22d5, [0x0772] = 0x22d6, [0x0773] = 0x22d7, [0x0774] = 0x22d8,
--  [0x0775] = 0x22d9, [0x0776] = 0x22da, [0x0777] = 0x22db, [0x0778] = 0x22dc,
--  [0x0779] = 0x22dd, [0x077a] = 0x22de, [0x077b] = 0x22df, [0x077c] = 0x22e0,
--  [0x077d] = 0x22e1, [0x077e] = 0x22e2, [0x077f] = 0x22e3, [0x0780] = 0x22e4,
--  [0x0781] = 0x22e5, [0x0782] = 0x22e6, [0x0783] = 0x22e7, [0x0784] = 0x22e8,
--  [0x0785] = 0x22e9, [0x0786] = 0x22ea, [0x0787] = 0x22eb, [0x0788] = 0x22ec,
--  [0x0789] = 0x22ed, [0x078a] = 0x22ee, [0x078b] = 0x22ef, [0x078c] = 0x22f0,
--  [0x078d] = 0x22f1, [0x078e] = 0x22f2, [0x078f] = 0x22f3, [0x0790] = 0x22f4,
--  [0x0791] = 0x22f5, [0x0792] = 0x22f6, [0x0793] = 0x22f7, [0x0794] = 0x22f8,
--  [0x0795] = 0x22f9, [0x0796] = 0x22fa, [0x0797] = 0x22fb, [0x0798] = 0x22fc,
--  [0x0799] = 0x22fd, [0x079a] = 0x22fe, [0x079b] = 0x22ff, [0x079c] = 0x2300,
--  [0x079d] = 0x2301, [0x079e] = 0x2302, [0x079f] = 0x2303, [0x07a0] = 0x2304,
--  [0x07a1] = 0x2305, [0x07a2] = 0x2306, [0x07a3] = 0x2307, [0x07a4] = 0x2308,
--  [0x07a5] = 0x2309, [0x07a6] = 0x230a, [0x07a7] = 0x230b, [0x07a8] = 0x230c,
--  [0x07a9] = 0x230d, [0x07aa] = 0x230e, [0x07ab] = 0x230f, [0x07ac] = 0x2310,
--  [0x07ad] = 0x2311, [0x07ae] = 0x2313, [0x07af] = 0x2314, [0x07b0] = 0x2315,
--  [0x07b1] = 0x2316, [0x07b2] = 0x2317, [0x07b3] = 0x2318, [0x07b4] = 0x2319,
--  [0x07b5] = 0x231a, [0x07b6] = 0x231b, [0x07b7] = 0x231c, [0x07b8] = 0x231d,
--  [0x07b9] = 0x231e, [0x07ba] = 0x231f, [0x07bb] = 0x2320, [0x07bc] = 0x2321,
--  [0x07bd] = 0x2322, [0x07be] = 0x2323, [0x07bf] = 0x2324, [0x07c0] = 0x2325,
--  [0x07c1] = 0x2326, [0x07c2] = 0x2327, [0x07c3] = 0x2328, [0x07c4] = 0x2329,
--  [0x07c5] = 0x232a, [0x07c6] = 0x232b, [0x07c7] = 0x232c, [0x07c8] = 0x232d,
--  [0x07c9] = 0x232e, [0x07ca] = 0x232f, [0x07cb] = 0x2330, [0x07cc] = 0x2331,
--  [0x07cd] = 0x2332, [0x07ce] = 0x2333, [0x07cf] = 0x2334, [0x07d0] = 0x2335,
--  [0x07d1] = 0x2336, [0x07d2] = 0x2337, [0x07d3] = 0x2338, [0x07d4] = 0x2339,
--  [0x07d5] = 0x233a, [0x07d6] = 0x233b, [0x07d7] = 0x233c, [0x07d8] = 0x233d,
--  [0x07d9] = 0x233e, [0x07da] = 0x233f, [0x07db] = 0x2340, [0x07dc] = 0x2341,
--  [0x07dd] = 0x2342, [0x07de] = 0x2343, [0x07df] = 0x2344, [0x07e0] = 0x2345,
--  [0x07e1] = 0x2346, [0x07e2] = 0x2347, [0x07e3] = 0x2348, [0x07e4] = 0x2349,
--  [0x07e5] = 0x234a, [0x07e6] = 0x234b, [0x07e7] = 0x234c, [0x07e8] = 0x234d,
--  [0x07e9] = 0x234e, [0x07ea] = 0x234f, [0x07eb] = 0x2350, [0x07ec] = 0x2351,
--  [0x07ed] = 0x2352, [0x07ee] = 0x2353, [0x07ef] = 0x2354, [0x07f0] = 0x2355,
--  [0x07f1] = 0x2356, [0x07f2] = 0x2357, [0x07f3] = 0x2358, [0x07f4] = 0x2359,
--  [0x07f5] = 0x235a, [0x07f6] = 0x235b, [0x07f7] = 0x235c, [0x07f8] = 0x235d,
--  [0x07f9] = 0x235e, [0x07fa] = 0x235f, [0x07fb] = 0x2360, [0x07fc] = 0x2361,
--  [0x07fd] = 0x2362, [0x07fe] = 0x2363, [0x07ff] = 0x2364, [0x0800] = 0x2365,
--  [0x0801] = 0x2366, [0x0802] = 0x2367, [0x0803] = 0x2368, [0x0804] = 0x2369,
--  [0x0805] = 0x236a, [0x0806] = 0x236b, [0x0807] = 0x236c, [0x0808] = 0x236d,
--  [0x0809] = 0x236e, [0x080a] = 0x236f, [0x080b] = 0x2370, [0x080c] = 0x2371,
--  [0x080d] = 0x2372, [0x080e] = 0x2373, [0x080f] = 0x2374, [0x0810] = 0x2375,
--  [0x0811] = 0x2376, [0x0812] = 0x2377, [0x0813] = 0x2378, [0x0814] = 0x2379,
--  [0x0815] = 0x237a, [0x0816] = 0x237b, [0x0817] = 0x237c, [0x0818] = 0x237d,
--  [0x0819] = 0x237e, [0x081a] = 0x237f, [0x081b] = 0x2380, [0x081c] = 0x2381,
--  [0x081d] = 0x2382, [0x081e] = 0x2383, [0x081f] = 0x2384, [0x0820] = 0x2385,
--  [0x0821] = 0x2386, [0x0822] = 0x2387, [0x0823] = 0x2388, [0x0824] = 0x2389,
--  [0x0825] = 0x238a, [0x0826] = 0x238b, [0x0827] = 0x238c, [0x0828] = 0x238d,
--  [0x0829] = 0x238e, [0x082a] = 0x238f, [0x082b] = 0x2390, [0x082c] = 0x2391,
--  [0x082d] = 0x2392, [0x082e] = 0x2393, [0x082f] = 0x2394, [0x0830] = 0x2395,
--  [0x0831] = 0x2396, [0x0832] = 0x2397, [0x0833] = 0x2398, [0x0834] = 0x2399,
--  [0x0835] = 0x239a, [0x0836] = 0x239b, [0x0837] = 0x239c, [0x0838] = 0x239d,
--  [0x0839] = 0x239e, [0x083a] = 0x239f, [0x083b] = 0x23a0, [0x083c] = 0x23a1,
--  [0x083d] = 0x23a2, [0x083e] = 0x23a3, [0x083f] = 0x23a4, [0x0840] = 0x23a5,
--  [0x0841] = 0x23a6, [0x0842] = 0x23a7, [0x0843] = 0x23a8, [0x0844] = 0x23a9,
--  [0x0845] = 0x23aa, [0x0846] = 0x23ab, [0x0847] = 0x23ac, [0x0848] = 0x23ad,
--  [0x0849] = 0x23ae, [0x084a] = 0x23af, [0x084b] = 0x23b0, [0x084c] = 0x23b1,
--  [0x084d] = 0x23b2, [0x084e] = 0x23b3, [0x084f] = 0x23b4, [0x0850] = 0x23b5,
--  [0x0851] = 0x23b6, [0x0852] = 0x23b7, [0x0853] = 0x23b8, [0x0854] = 0x23b9,
--  [0x0855] = 0x23ba, [0x0856] = 0x23bb, [0x0857] = 0x23bc, [0x0858] = 0x23bd,
--  [0x0859] = 0x23be, [0x085a] = 0x23bf, [0x085b] = 0x23c0, [0x085c] = 0x23c1,
--  [0x085d] = 0x23c2, [0x085e] = 0x23c3, [0x085f] = 0x23c4, [0x0860] = 0x23c5,
--  [0x0861] = 0x23c6, [0x0862] = 0x23c7, [0x0863] = 0x23c8, [0x0864] = 0x23c9,
--  [0x0865] = 0x23ca, [0x0866] = 0x23cb, [0x0867] = 0x23cc, [0x0868] = 0x23cd,
--  [0x0869] = 0x23ce, [0x086a] = 0x23cf, [0x086b] = 0x23d0, [0x086c] = 0x23d1,
--  [0x086d] = 0x23d2, [0x086e] = 0x23d3, [0x086f] = 0x23d4, [0x0870] = 0x23d5,
--  [0x0871] = 0x23d6, [0x0872] = 0x23d7, [0x0873] = 0x23d8, [0x0874] = 0x23d9,
--  [0x0875] = 0x23da, [0x0876] = 0x23db, [0x0877] = 0x23dc, [0x0878] = 0x23dd,
--  [0x0879] = 0x23de, [0x087a] = 0x23df, [0x087b] = 0x23e0, [0x087c] = 0x23e1,
--  [0x087d] = 0x23e2, [0x087e] = 0x23e3, [0x087f] = 0x23e4, [0x0880] = 0x23e5,
--  [0x0881] = 0x23e6, [0x0882] = 0x23e7, [0x0883] = 0x23e8, [0x0884] = 0x23e9,
--  [0x0885] = 0x23ea, [0x0886] = 0x23eb, [0x0887] = 0x23ec, [0x0888] = 0x23ed,
--  [0x0889] = 0x23ee, [0x088a] = 0x23ef, [0x088b] = 0x23f0, [0x088c] = 0x23f1,
--  [0x088d] = 0x23f2, [0x088e] = 0x23f3, [0x089b] = 0x2400, [0x089c] = 0x2401,
--  [0x089d] = 0x2402, [0x089e] = 0x2403, [0x089f] = 0x2404, [0x08a0] = 0x2405,
--  [0x08a1] = 0x2406, [0x08a2] = 0x2407, [0x08a3] = 0x2408, [0x08a4] = 0x2409,
--  [0x08a5] = 0x240a, [0x08a6] = 0x240b, [0x08a7] = 0x240c, [0x08a8] = 0x240d,
--  [0x08a9] = 0x240e, [0x08aa] = 0x240f, [0x08ab] = 0x2410, [0x08ac] = 0x2411,
--  [0x08ad] = 0x2412, [0x08ae] = 0x2413, [0x08af] = 0x2414, [0x08b0] = 0x2415,
--  [0x08b1] = 0x2416, [0x08b2] = 0x2417, [0x08b3] = 0x2418, [0x08b4] = 0x2419,
--  [0x08b5] = 0x241a, [0x08b6] = 0x241b, [0x08b7] = 0x241c, [0x08b8] = 0x241d,
--  [0x08b9] = 0x241e, [0x08ba] = 0x241f, [0x08bb] = 0x2420, [0x08bc] = 0x2421,
--  [0x08bd] = 0x2422, [0x08be] = 0x2423, [0x08bf] = 0x2424, [0x08c0] = 0x2425,
--  [0x08c1] = 0x2426, [0x08db] = 0x2440, [0x08dc] = 0x2441, [0x08dd] = 0x2442,
--  [0x08de] = 0x2443, [0x08df] = 0x2444, [0x08e0] = 0x2445, [0x08e1] = 0x2446,
--  [0x08e2] = 0x2447, [0x08e3] = 0x2448, [0x08e4] = 0x2449, [0x08e5] = 0x244a,
--  [0x08fb] = 0x246a, [0x08fc] = 0x246b, [0x08fd] = 0x246c, [0x08fe] = 0x246d,
--  [0x08ff] = 0x246e, [0x0900] = 0x246f, [0x0901] = 0x2470, [0x0902] = 0x2471,
--  [0x0903] = 0x2472, [0x0904] = 0x2473, [0x0905] = 0x249c, [0x0906] = 0x249d,
--  [0x0907] = 0x249e, [0x0908] = 0x249f, [0x0909] = 0x24a0, [0x090a] = 0x24a1,
--  [0x090b] = 0x24a2, [0x090c] = 0x24a3, [0x090d] = 0x24a4, [0x090e] = 0x24a5,
--  [0x090f] = 0x24a6, [0x0910] = 0x24a7, [0x0911] = 0x24a8, [0x0912] = 0x24a9,
--  [0x0913] = 0x24aa, [0x0914] = 0x24ab, [0x0915] = 0x24ac, [0x0916] = 0x24ad,
--  [0x0917] = 0x24ae, [0x0918] = 0x24af, [0x0919] = 0x24b0, [0x091a] = 0x24b1,
--  [0x091b] = 0x24b2, [0x091c] = 0x24b3, [0x091d] = 0x24b4, [0x091e] = 0x24b5,
--  [0x091f] = 0x24b6, [0x0920] = 0x24b7, [0x0921] = 0x24b8, [0x0922] = 0x24b9,
--  [0x0923] = 0x24ba, [0x0924] = 0x24bb, [0x0925] = 0x24bc, [0x0926] = 0x24bd,
--  [0x0927] = 0x24be, [0x0928] = 0x24bf, [0x0929] = 0x24c0, [0x092a] = 0x24c1,
--  [0x092b] = 0x24c2, [0x092c] = 0x24c3, [0x092d] = 0x24c4, [0x092e] = 0x24c5,
--  [0x092f] = 0x24c6, [0x0930] = 0x24c7, [0x0931] = 0x24c8, [0x0932] = 0x24c9,
--  [0x0933] = 0x24ca, [0x0934] = 0x24cb, [0x0935] = 0x24cc, [0x0936] = 0x24cd,
--  [0x0937] = 0x24ce, [0x0938] = 0x24cf, [0x0939] = 0x24d0, [0x093a] = 0x24d1,
--  [0x093b] = 0x24d2, [0x093c] = 0x24d3, [0x093d] = 0x24d4, [0x093e] = 0x24d5,
--  [0x093f] = 0x24d6, [0x0940] = 0x24d7, [0x0941] = 0x24d8, [0x0942] = 0x24d9,
--  [0x0943] = 0x24da, [0x0944] = 0x24db, [0x0945] = 0x24dc, [0x0946] = 0x24dd,
--  [0x0947] = 0x24de, [0x0948] = 0x24df, [0x0949] = 0x24e0, [0x094a] = 0x24e1,
--  [0x094b] = 0x24e2, [0x094c] = 0x24e3, [0x094d] = 0x24e4, [0x094e] = 0x24e5,
--  [0x094f] = 0x24e6, [0x0950] = 0x24e7, [0x0951] = 0x24e8, [0x0952] = 0x24e9,
--  [0x0953] = 0x24ea, [0x0954] = 0x24eb, [0x0955] = 0x24ec, [0x0956] = 0x24ed,
--  [0x0957] = 0x24ee, [0x0958] = 0x24ef, [0x0959] = 0x24f0, [0x095a] = 0x24f1,
--  [0x095b] = 0x24f2, [0x095c] = 0x24f3, [0x095d] = 0x24f4, [0x095e] = 0x24f5,
--  [0x095f] = 0x24f6, [0x0960] = 0x24f7, [0x0961] = 0x24f8, [0x0962] = 0x24f9,
--  [0x0963] = 0x24fa, [0x0964] = 0x24fb, [0x0965] = 0x24fc, [0x0966] = 0x24fd,
--  [0x0967] = 0x24fe, [0x0968] = 0x24ff, [0x0969] = 0x254c, [0x096a] = 0x254d,
--  [0x096b] = 0x254e, [0x096c] = 0x254f, [0x096d] = 0x2574, [0x096e] = 0x2575,
--  [0x096f] = 0x2576, [0x0970] = 0x2577, [0x0971] = 0x2578, [0x0972] = 0x2579,
--  [0x0973] = 0x257a, [0x0974] = 0x257b, [0x0975] = 0x257c, [0x0976] = 0x257d,
--  [0x0977] = 0x257e, [0x0978] = 0x257f, [0x0979] = 0x2580, [0x097a] = 0x2590,
--  [0x097b] = 0x2591, [0x097c] = 0x2592, [0x097d] = 0x2596, [0x097e] = 0x2597,
--  [0x097f] = 0x2598, [0x0980] = 0x2599, [0x0981] = 0x259a, [0x0982] = 0x259b,
--  [0x0983] = 0x259c, [0x0984] = 0x259d, [0x0985] = 0x259e, [0x0986] = 0x259f,
--  [0x0987] = 0x25a2, [0x0988] = 0x25a3, [0x0989] = 0x25a4, [0x098a] = 0x25a5,
--  [0x098b] = 0x25a6, [0x098c] = 0x25a7, [0x098d] = 0x25a8, [0x098e] = 0x25a9,
--  [0x098f] = 0x25aa, [0x0990] = 0x25ab, [0x0991] = 0x25ac, [0x0992] = 0x25ad,
--  [0x0993] = 0x25ae, [0x0994] = 0x25af, [0x0995] = 0x25b0, [0x0996] = 0x25b1,
--  [0x0997] = 0x25b4, [0x0998] = 0x25b5, [0x0999] = 0x25b6, [0x099a] = 0x25b7,
--  [0x099b] = 0x25b8, [0x099c] = 0x25b9, [0x099d] = 0x25ba, [0x099e] = 0x25bb,
--  [0x099f] = 0x25be, [0x09a0] = 0x25bf, [0x09a1] = 0x25c0, [0x09a2] = 0x25c1,
--  [0x09a3] = 0x25c2, [0x09a4] = 0x25c3, [0x09a5] = 0x25c4, [0x09a6] = 0x25c5,
--  [0x09a7] = 0x25c8, [0x09a8] = 0x25c9, [0x09a9] = 0x25ca, [0x09aa] = 0x25cc,
--  [0x09ab] = 0x25cd, [0x09ac] = 0x25d0, [0x09ad] = 0x25d1, [0x09ae] = 0x25d2,
--  [0x09af] = 0x25d3, [0x09b0] = 0x25d4, [0x09b1] = 0x25d5, [0x09b2] = 0x25d6,
--  [0x09b3] = 0x25d7, [0x09b4] = 0x25d8, [0x09b5] = 0x25d9, [0x09b6] = 0x25da,
--  [0x09b7] = 0x25db, [0x09b8] = 0x25dc, [0x09b9] = 0x25dd, [0x09ba] = 0x25de,
--  [0x09bb] = 0x25df, [0x09bc] = 0x25e0, [0x09bd] = 0x25e1, [0x09be] = 0x25e6,
--  [0x09bf] = 0x25e7, [0x09c0] = 0x25e8, [0x09c1] = 0x25e9, [0x09c2] = 0x25ea,
--  [0x09c3] = 0x25eb, [0x09c4] = 0x25ec, [0x09c5] = 0x25ed, [0x09c6] = 0x25ee,
--  [0x09c7] = 0x25ef, [0x09c8] = 0x25f0, [0x09c9] = 0x25f1, [0x09ca] = 0x25f2,
--  [0x09cb] = 0x25f3, [0x09cc] = 0x25f4, [0x09cd] = 0x25f5, [0x09ce] = 0x25f6,
--  [0x09cf] = 0x25f7, [0x09d0] = 0x25f8, [0x09d1] = 0x25f9, [0x09d2] = 0x25fa,
--  [0x09d3] = 0x25fb, [0x09d4] = 0x25fc, [0x09d5] = 0x25fd, [0x09d6] = 0x25fe,
--  [0x09d7] = 0x25ff, [0x09d8] = 0x2600, [0x09d9] = 0x2601, [0x09da] = 0x2602,
--  [0x09db] = 0x2603, [0x09dc] = 0x2604, [0x09dd] = 0x2607, [0x09de] = 0x2608,
--  [0x09df] = 0x260a, [0x09e0] = 0x260b, [0x09e1] = 0x260c, [0x09e2] = 0x260d,
--  [0x09e3] = 0x260e, [0x09e4] = 0x260f, [0x09e5] = 0x2610, [0x09e6] = 0x2611,
--  [0x09e7] = 0x2612, [0x09e8] = 0x2613, [0x09e9] = 0x2614, [0x09ea] = 0x2615,
--  [0x09eb] = 0x2616, [0x09ec] = 0x2617, [0x09ed] = 0x2618, [0x09ee] = 0x2619,
--  [0x09ef] = 0x261a, [0x09f0] = 0x261b, [0x09f1] = 0x261c, [0x09f2] = 0x261d,
--  [0x09f3] = 0x261e, [0x09f4] = 0x261f, [0x09f5] = 0x2620, [0x09f6] = 0x2621,
--  [0x09f7] = 0x2622, [0x09f8] = 0x2623, [0x09f9] = 0x2624, [0x09fa] = 0x2625,
--  [0x09fb] = 0x2626, [0x09fc] = 0x2627, [0x09fd] = 0x2628, [0x09fe] = 0x2629,
--  [0x09ff] = 0x262a, [0x0a00] = 0x262b, [0x0a01] = 0x262c, [0x0a02] = 0x262d,
--  [0x0a03] = 0x262e, [0x0a04] = 0x262f, [0x0a05] = 0x2630, [0x0a06] = 0x2631,
--  [0x0a07] = 0x2632, [0x0a08] = 0x2633, [0x0a09] = 0x2634, [0x0a0a] = 0x2635,
--  [0x0a0b] = 0x2636, [0x0a0c] = 0x2637, [0x0a0d] = 0x2638, [0x0a0e] = 0x2639,
--  [0x0a0f] = 0x263a, [0x0a10] = 0x263b, [0x0a11] = 0x263c, [0x0a12] = 0x263d,
--  [0x0a13] = 0x263e, [0x0a14] = 0x263f, [0x0a15] = 0x2641, [0x0a16] = 0x2e82,
--  [0x0a17] = 0x2e83, [0x0a18] = 0x2e85, [0x0a19] = 0x2e86, [0x0a1a] = 0x2e87,
--  [0x0a1b] = 0x2e89, [0x0a1c] = 0x2e8a, [0x0a1d] = 0x2e8d, [0x0a1e] = 0x2e8e,
--  [0x0a1f] = 0x2e8f, [0x0a20] = 0x2e90, [0x0a21] = 0x2e91, [0x0a22] = 0x2e92,
--  [0x0a23] = 0x2e93, [0x0a24] = 0x2e94, [0x0a25] = 0x2e95, [0x0a26] = 0x2e96,
--  [0x0a27] = 0x2e98, [0x0a28] = 0x2e99, [0x0a2a] = 0x2e9b, [0x0a2b] = 0x2e9c,
-+  [0x05d4] = 0x20f0, [0x05d5] = 0x20f1, [0x05d6] = 0x20f2, [0x05d7] = 0x20f3,
-+  [0x05d8] = 0x20f4, [0x05d9] = 0x20f5, [0x05da] = 0x20f6, [0x05db] = 0x20f7,
-+  [0x05dc] = 0x20f8, [0x05dd] = 0x20f9, [0x05de] = 0x20fa, [0x05df] = 0x20fb,
-+  [0x05e0] = 0x20fc, [0x05e1] = 0x20fd, [0x05e2] = 0x20fe, [0x05e3] = 0x20ff,
-+  [0x05e4] = 0x2100, [0x05e5] = 0x2101, [0x05e6] = 0x2102, [0x05e7] = 0x2104,
-+  [0x05e8] = 0x2106, [0x05e9] = 0x2107, [0x05ea] = 0x2108, [0x05eb] = 0x210a,
-+  [0x05ec] = 0x210b, [0x05ed] = 0x210c, [0x05ee] = 0x210d, [0x05ef] = 0x210e,
-+  [0x05f0] = 0x210f, [0x05f1] = 0x2110, [0x05f2] = 0x2111, [0x05f3] = 0x2112,
-+  [0x05f4] = 0x2113, [0x05f5] = 0x2114, [0x05f6] = 0x2115, [0x05f7] = 0x2117,
-+  [0x05f8] = 0x2118, [0x05f9] = 0x2119, [0x05fa] = 0x211a, [0x05fb] = 0x211b,
-+  [0x05fc] = 0x211c, [0x05fd] = 0x211d, [0x05fe] = 0x211e, [0x05ff] = 0x211f,
-+  [0x0600] = 0x2120, [0x0601] = 0x2122, [0x0602] = 0x2123, [0x0603] = 0x2124,
-+  [0x0604] = 0x2125, [0x0605] = 0x2126, [0x0606] = 0x2127, [0x0607] = 0x2128,
-+  [0x0608] = 0x2129, [0x0609] = 0x212a, [0x060a] = 0x212b, [0x060b] = 0x212c,
-+  [0x060c] = 0x212d, [0x060d] = 0x212e, [0x060e] = 0x212f, [0x060f] = 0x2130,
-+  [0x0610] = 0x2131, [0x0611] = 0x2132, [0x0612] = 0x2133, [0x0613] = 0x2134,
-+  [0x0614] = 0x2135, [0x0615] = 0x2136, [0x0616] = 0x2137, [0x0617] = 0x2138,
-+  [0x0618] = 0x2139, [0x0619] = 0x213a, [0x061a] = 0x213b, [0x061b] = 0x213c,
-+  [0x061c] = 0x213d, [0x061d] = 0x213e, [0x061e] = 0x213f, [0x061f] = 0x2140,
-+  [0x0620] = 0x2141, [0x0621] = 0x2142, [0x0622] = 0x2143, [0x0623] = 0x2144,
-+  [0x0624] = 0x2145, [0x0625] = 0x2146, [0x0626] = 0x2147, [0x0627] = 0x2148,
-+  [0x0628] = 0x2149, [0x0629] = 0x214a, [0x062a] = 0x214b, [0x062b] = 0x214c,
-+  [0x062c] = 0x214d, [0x062d] = 0x214e, [0x062e] = 0x214f, [0x062f] = 0x2150,
-+  [0x0630] = 0x2151, [0x0631] = 0x2152, [0x0632] = 0x2153, [0x0633] = 0x2154,
-+  [0x0634] = 0x2155, [0x0635] = 0x2156, [0x0636] = 0x2157, [0x0637] = 0x2158,
-+  [0x0638] = 0x2159, [0x0639] = 0x215a, [0x063a] = 0x215b, [0x063b] = 0x215c,
-+  [0x063c] = 0x215d, [0x063d] = 0x215e, [0x063e] = 0x215f, [0x063f] = 0x216c,
-+  [0x0640] = 0x216d, [0x0641] = 0x216e, [0x0642] = 0x216f, [0x0643] = 0x217a,
-+  [0x0644] = 0x217b, [0x0645] = 0x217c, [0x0646] = 0x217d, [0x0647] = 0x217e,
-+  [0x0648] = 0x217f, [0x0649] = 0x2180, [0x064a] = 0x2181, [0x064b] = 0x2182,
-+  [0x064c] = 0x2183, [0x064d] = 0x2184, [0x064e] = 0x2185, [0x064f] = 0x2186,
-+  [0x0650] = 0x2187, [0x0651] = 0x2188, [0x0652] = 0x2189, [0x0653] = 0x218a,
-+  [0x0654] = 0x218b, [0x0655] = 0x218c, [0x0656] = 0x218d, [0x0657] = 0x218e,
-+  [0x0658] = 0x218f, [0x0659] = 0x2194, [0x065a] = 0x2195, [0x065b] = 0x219a,
-+  [0x065c] = 0x219b, [0x065d] = 0x219c, [0x065e] = 0x219d, [0x065f] = 0x219e,
-+  [0x0660] = 0x219f, [0x0661] = 0x21a0, [0x0662] = 0x21a1, [0x0663] = 0x21a2,
-+  [0x0664] = 0x21a3, [0x0665] = 0x21a4, [0x0666] = 0x21a5, [0x0667] = 0x21a6,
-+  [0x0668] = 0x21a7, [0x0669] = 0x21a8, [0x066a] = 0x21a9, [0x066b] = 0x21aa,
-+  [0x066c] = 0x21ab, [0x066d] = 0x21ac, [0x066e] = 0x21ad, [0x066f] = 0x21ae,
-+  [0x0670] = 0x21af, [0x0671] = 0x21b0, [0x0672] = 0x21b1, [0x0673] = 0x21b2,
-+  [0x0674] = 0x21b3, [0x0675] = 0x21b4, [0x0676] = 0x21b5, [0x0677] = 0x21b6,
-+  [0x0678] = 0x21b7, [0x0679] = 0x21b8, [0x067a] = 0x21b9, [0x067b] = 0x21ba,
-+  [0x067c] = 0x21bb, [0x067d] = 0x21bc, [0x067e] = 0x21bd, [0x067f] = 0x21be,
-+  [0x0680] = 0x21bf, [0x0681] = 0x21c0, [0x0682] = 0x21c1, [0x0683] = 0x21c2,
-+  [0x0684] = 0x21c3, [0x0685] = 0x21c4, [0x0686] = 0x21c5, [0x0687] = 0x21c6,
-+  [0x0688] = 0x21c7, [0x0689] = 0x21c8, [0x068a] = 0x21c9, [0x068b] = 0x21ca,
-+  [0x068c] = 0x21cb, [0x068d] = 0x21cc, [0x068e] = 0x21cd, [0x068f] = 0x21ce,
-+  [0x0690] = 0x21cf, [0x0691] = 0x21d0, [0x0692] = 0x21d1, [0x0693] = 0x21d2,
-+  [0x0694] = 0x21d3, [0x0695] = 0x21d4, [0x0696] = 0x21d5, [0x0697] = 0x21d6,
-+  [0x0698] = 0x21d7, [0x0699] = 0x21d8, [0x069a] = 0x21d9, [0x069b] = 0x21da,
-+  [0x069c] = 0x21db, [0x069d] = 0x21dc, [0x069e] = 0x21dd, [0x069f] = 0x21de,
-+  [0x06a0] = 0x21df, [0x06a1] = 0x21e0, [0x06a2] = 0x21e1, [0x06a3] = 0x21e2,
-+  [0x06a4] = 0x21e3, [0x06a5] = 0x21e4, [0x06a6] = 0x21e5, [0x06a7] = 0x21e6,
-+  [0x06a8] = 0x21e7, [0x06a9] = 0x21e8, [0x06aa] = 0x21e9, [0x06ab] = 0x21ea,
-+  [0x06ac] = 0x21eb, [0x06ad] = 0x21ec, [0x06ae] = 0x21ed, [0x06af] = 0x21ee,
-+  [0x06b0] = 0x21ef, [0x06b1] = 0x21f0, [0x06b2] = 0x21f1, [0x06b3] = 0x21f2,
-+  [0x06b4] = 0x21f3, [0x06b5] = 0x21f4, [0x06b6] = 0x21f5, [0x06b7] = 0x21f6,
-+  [0x06b8] = 0x21f7, [0x06b9] = 0x21f8, [0x06ba] = 0x21f9, [0x06bb] = 0x21fa,
-+  [0x06bc] = 0x21fb, [0x06bd] = 0x21fc, [0x06be] = 0x21fd, [0x06bf] = 0x21fe,
-+  [0x06c0] = 0x21ff, [0x06c1] = 0x2200, [0x06c2] = 0x2201, [0x06c3] = 0x2202,
-+  [0x06c4] = 0x2203, [0x06c5] = 0x2204, [0x06c6] = 0x2205, [0x06c7] = 0x2206,
-+  [0x06c8] = 0x2207, [0x06c9] = 0x2209, [0x06ca] = 0x220a, [0x06cb] = 0x220b,
-+  [0x06cc] = 0x220c, [0x06cd] = 0x220d, [0x06ce] = 0x220e, [0x06cf] = 0x2210,
-+  [0x06d0] = 0x2212, [0x06d1] = 0x2213, [0x06d2] = 0x2214, [0x06d3] = 0x2216,
-+  [0x06d4] = 0x2217, [0x06d5] = 0x2218, [0x06d6] = 0x2219, [0x06d7] = 0x221b,
-+  [0x06d8] = 0x221c, [0x06d9] = 0x2221, [0x06da] = 0x2222, [0x06db] = 0x2224,
-+  [0x06dc] = 0x2226, [0x06dd] = 0x222c, [0x06de] = 0x222d, [0x06df] = 0x222f,
-+  [0x06e0] = 0x2230, [0x06e1] = 0x2231, [0x06e2] = 0x2232, [0x06e3] = 0x2233,
-+  [0x06e4] = 0x2238, [0x06e5] = 0x2239, [0x06e6] = 0x223a, [0x06e7] = 0x223b,
-+  [0x06e8] = 0x223c, [0x06e9] = 0x223e, [0x06ea] = 0x223f, [0x06eb] = 0x2240,
-+  [0x06ec] = 0x2241, [0x06ed] = 0x2242, [0x06ee] = 0x2243, [0x06ef] = 0x2244,
-+  [0x06f0] = 0x2245, [0x06f1] = 0x2246, [0x06f2] = 0x2247, [0x06f3] = 0x2249,
-+  [0x06f4] = 0x224a, [0x06f5] = 0x224b, [0x06f6] = 0x224d, [0x06f7] = 0x224e,
-+  [0x06f8] = 0x224f, [0x06f9] = 0x2250, [0x06fa] = 0x2251, [0x06fb] = 0x2253,
-+  [0x06fc] = 0x2254, [0x06fd] = 0x2255, [0x06fe] = 0x2256, [0x06ff] = 0x2257,
-+  [0x0700] = 0x2258, [0x0701] = 0x2259, [0x0702] = 0x225a, [0x0703] = 0x225b,
-+  [0x0704] = 0x225c, [0x0705] = 0x225d, [0x0706] = 0x225e, [0x0707] = 0x225f,
-+  [0x0708] = 0x2262, [0x0709] = 0x2263, [0x070a] = 0x2268, [0x070b] = 0x2269,
-+  [0x070c] = 0x226a, [0x070d] = 0x226b, [0x070e] = 0x226c, [0x070f] = 0x226d,
-+  [0x0710] = 0x2270, [0x0711] = 0x2271, [0x0712] = 0x2272, [0x0713] = 0x2273,
-+  [0x0714] = 0x2274, [0x0715] = 0x2275, [0x0716] = 0x2276, [0x0717] = 0x2277,
-+  [0x0718] = 0x2278, [0x0719] = 0x2279, [0x071a] = 0x227a, [0x071b] = 0x227b,
-+  [0x071c] = 0x227c, [0x071d] = 0x227d, [0x071e] = 0x227e, [0x071f] = 0x227f,
-+  [0x0720] = 0x2280, [0x0721] = 0x2281, [0x0722] = 0x2282, [0x0723] = 0x2283,
-+  [0x0724] = 0x2284, [0x0725] = 0x2285, [0x0726] = 0x2286, [0x0727] = 0x2287,
-+  [0x0728] = 0x2288, [0x0729] = 0x2289, [0x072a] = 0x228a, [0x072b] = 0x228b,
-+  [0x072c] = 0x228c, [0x072d] = 0x228d, [0x072e] = 0x228e, [0x072f] = 0x228f,
-+  [0x0730] = 0x2290, [0x0731] = 0x2291, [0x0732] = 0x2292, [0x0733] = 0x2293,
-+  [0x0734] = 0x2294, [0x0735] = 0x2296, [0x0736] = 0x2297, [0x0737] = 0x2298,
-+  [0x0738] = 0x229a, [0x0739] = 0x229b, [0x073a] = 0x229c, [0x073b] = 0x229d,
-+  [0x073c] = 0x229e, [0x073d] = 0x229f, [0x073e] = 0x22a0, [0x073f] = 0x22a1,
-+  [0x0740] = 0x22a2, [0x0741] = 0x22a3, [0x0742] = 0x22a4, [0x0743] = 0x22a6,
-+  [0x0744] = 0x22a7, [0x0745] = 0x22a8, [0x0746] = 0x22a9, [0x0747] = 0x22aa,
-+  [0x0748] = 0x22ab, [0x0749] = 0x22ac, [0x074a] = 0x22ad, [0x074b] = 0x22ae,
-+  [0x074c] = 0x22af, [0x074d] = 0x22b0, [0x074e] = 0x22b1, [0x074f] = 0x22b2,
-+  [0x0750] = 0x22b3, [0x0751] = 0x22b4, [0x0752] = 0x22b5, [0x0753] = 0x22b6,
-+  [0x0754] = 0x22b7, [0x0755] = 0x22b8, [0x0756] = 0x22b9, [0x0757] = 0x22ba,
-+  [0x0758] = 0x22bb, [0x0759] = 0x22bc, [0x075a] = 0x22bd, [0x075b] = 0x22be,
-+  [0x075c] = 0x22c0, [0x075d] = 0x22c1, [0x075e] = 0x22c2, [0x075f] = 0x22c3,
-+  [0x0760] = 0x22c4, [0x0761] = 0x22c5, [0x0762] = 0x22c6, [0x0763] = 0x22c7,
-+  [0x0764] = 0x22c8, [0x0765] = 0x22c9, [0x0766] = 0x22ca, [0x0767] = 0x22cb,
-+  [0x0768] = 0x22cc, [0x0769] = 0x22cd, [0x076a] = 0x22ce, [0x076b] = 0x22cf,
-+  [0x076c] = 0x22d0, [0x076d] = 0x22d1, [0x076e] = 0x22d2, [0x076f] = 0x22d3,
-+  [0x0770] = 0x22d4, [0x0771] = 0x22d5, [0x0772] = 0x22d6, [0x0773] = 0x22d7,
-+  [0x0774] = 0x22d8, [0x0775] = 0x22d9, [0x0776] = 0x22da, [0x0777] = 0x22db,
-+  [0x0778] = 0x22dc, [0x0779] = 0x22dd, [0x077a] = 0x22de, [0x077b] = 0x22df,
-+  [0x077c] = 0x22e0, [0x077d] = 0x22e1, [0x077e] = 0x22e2, [0x077f] = 0x22e3,
-+  [0x0780] = 0x22e4, [0x0781] = 0x22e5, [0x0782] = 0x22e6, [0x0783] = 0x22e7,
-+  [0x0784] = 0x22e8, [0x0785] = 0x22e9, [0x0786] = 0x22ea, [0x0787] = 0x22eb,
-+  [0x0788] = 0x22ec, [0x0789] = 0x22ed, [0x078a] = 0x22ee, [0x078b] = 0x22ef,
-+  [0x078c] = 0x22f0, [0x078d] = 0x22f1, [0x078e] = 0x22f2, [0x078f] = 0x22f3,
-+  [0x0790] = 0x22f4, [0x0791] = 0x22f5, [0x0792] = 0x22f6, [0x0793] = 0x22f7,
-+  [0x0794] = 0x22f8, [0x0795] = 0x22f9, [0x0796] = 0x22fa, [0x0797] = 0x22fb,
-+  [0x0798] = 0x22fc, [0x0799] = 0x22fd, [0x079a] = 0x22fe, [0x079b] = 0x22ff,
-+  [0x079c] = 0x2300, [0x079d] = 0x2301, [0x079e] = 0x2302, [0x079f] = 0x2303,
-+  [0x07a0] = 0x2304, [0x07a1] = 0x2305, [0x07a2] = 0x2306, [0x07a3] = 0x2307,
-+  [0x07a4] = 0x2308, [0x07a5] = 0x2309, [0x07a6] = 0x230a, [0x07a7] = 0x230b,
-+  [0x07a8] = 0x230c, [0x07a9] = 0x230d, [0x07aa] = 0x230e, [0x07ab] = 0x230f,
-+  [0x07ac] = 0x2310, [0x07ad] = 0x2311, [0x07ae] = 0x2313, [0x07af] = 0x2314,
-+  [0x07b0] = 0x2315, [0x07b1] = 0x2316, [0x07b2] = 0x2317, [0x07b3] = 0x2318,
-+  [0x07b4] = 0x2319, [0x07b5] = 0x231a, [0x07b6] = 0x231b, [0x07b7] = 0x231c,
-+  [0x07b8] = 0x231d, [0x07b9] = 0x231e, [0x07ba] = 0x231f, [0x07bb] = 0x2320,
-+  [0x07bc] = 0x2321, [0x07bd] = 0x2322, [0x07be] = 0x2323, [0x07bf] = 0x2324,
-+  [0x07c0] = 0x2325, [0x07c1] = 0x2326, [0x07c2] = 0x2327, [0x07c3] = 0x2328,
-+  [0x07c4] = 0x2329, [0x07c5] = 0x232a, [0x07c6] = 0x232b, [0x07c7] = 0x232c,
-+  [0x07c8] = 0x232d, [0x07c9] = 0x232e, [0x07ca] = 0x232f, [0x07cb] = 0x2330,
-+  [0x07cc] = 0x2331, [0x07cd] = 0x2332, [0x07ce] = 0x2333, [0x07cf] = 0x2334,
-+  [0x07d0] = 0x2335, [0x07d1] = 0x2336, [0x07d2] = 0x2337, [0x07d3] = 0x2338,
-+  [0x07d4] = 0x2339, [0x07d5] = 0x233a, [0x07d6] = 0x233b, [0x07d7] = 0x233c,
-+  [0x07d8] = 0x233d, [0x07d9] = 0x233e, [0x07da] = 0x233f, [0x07db] = 0x2340,
-+  [0x07dc] = 0x2341, [0x07dd] = 0x2342, [0x07de] = 0x2343, [0x07df] = 0x2344,
-+  [0x07e0] = 0x2345, [0x07e1] = 0x2346, [0x07e2] = 0x2347, [0x07e3] = 0x2348,
-+  [0x07e4] = 0x2349, [0x07e5] = 0x234a, [0x07e6] = 0x234b, [0x07e7] = 0x234c,
-+  [0x07e8] = 0x234d, [0x07e9] = 0x234e, [0x07ea] = 0x234f, [0x07eb] = 0x2350,
-+  [0x07ec] = 0x2351, [0x07ed] = 0x2352, [0x07ee] = 0x2353, [0x07ef] = 0x2354,
-+  [0x07f0] = 0x2355, [0x07f1] = 0x2356, [0x07f2] = 0x2357, [0x07f3] = 0x2358,
-+  [0x07f4] = 0x2359, [0x07f5] = 0x235a, [0x07f6] = 0x235b, [0x07f7] = 0x235c,
-+  [0x07f8] = 0x235d, [0x07f9] = 0x235e, [0x07fa] = 0x235f, [0x07fb] = 0x2360,
-+  [0x07fc] = 0x2361, [0x07fd] = 0x2362, [0x07fe] = 0x2363, [0x07ff] = 0x2364,
-+  [0x0800] = 0x2365, [0x0801] = 0x2366, [0x0802] = 0x2367, [0x0803] = 0x2368,
-+  [0x0804] = 0x2369, [0x0805] = 0x236a, [0x0806] = 0x236b, [0x0807] = 0x236c,
-+  [0x0808] = 0x236d, [0x0809] = 0x236e, [0x080a] = 0x236f, [0x080b] = 0x2370,
-+  [0x080c] = 0x2371, [0x080d] = 0x2372, [0x080e] = 0x2373, [0x080f] = 0x2374,
-+  [0x0810] = 0x2375, [0x0811] = 0x2376, [0x0812] = 0x2377, [0x0813] = 0x2378,
-+  [0x0814] = 0x2379, [0x0815] = 0x237a, [0x0816] = 0x237b, [0x0817] = 0x237c,
-+  [0x0818] = 0x237d, [0x0819] = 0x237e, [0x081a] = 0x237f, [0x081b] = 0x2380,
-+  [0x081c] = 0x2381, [0x081d] = 0x2382, [0x081e] = 0x2383, [0x081f] = 0x2384,
-+  [0x0820] = 0x2385, [0x0821] = 0x2386, [0x0822] = 0x2387, [0x0823] = 0x2388,
-+  [0x0824] = 0x2389, [0x0825] = 0x238a, [0x0826] = 0x238b, [0x0827] = 0x238c,
-+  [0x0828] = 0x238d, [0x0829] = 0x238e, [0x082a] = 0x238f, [0x082b] = 0x2390,
-+  [0x082c] = 0x2391, [0x082d] = 0x2392, [0x082e] = 0x2393, [0x082f] = 0x2394,
-+  [0x0830] = 0x2395, [0x0831] = 0x2396, [0x0832] = 0x2397, [0x0833] = 0x2398,
-+  [0x0834] = 0x2399, [0x0835] = 0x239a, [0x0836] = 0x239b, [0x0837] = 0x239c,
-+  [0x0838] = 0x239d, [0x0839] = 0x239e, [0x083a] = 0x239f, [0x083b] = 0x23a0,
-+  [0x083c] = 0x23a1, [0x083d] = 0x23a2, [0x083e] = 0x23a3, [0x083f] = 0x23a4,
-+  [0x0840] = 0x23a5, [0x0841] = 0x23a6, [0x0842] = 0x23a7, [0x0843] = 0x23a8,
-+  [0x0844] = 0x23a9, [0x0845] = 0x23aa, [0x0846] = 0x23ab, [0x0847] = 0x23ac,
-+  [0x0848] = 0x23ad, [0x0849] = 0x23ae, [0x084a] = 0x23af, [0x084b] = 0x23b0,
-+  [0x084c] = 0x23b1, [0x084d] = 0x23b2, [0x084e] = 0x23b3, [0x084f] = 0x23b4,
-+  [0x0850] = 0x23b5, [0x0851] = 0x23b6, [0x0852] = 0x23b7, [0x0853] = 0x23b8,
-+  [0x0854] = 0x23b9, [0x0855] = 0x23ba, [0x0856] = 0x23bb, [0x0857] = 0x23bc,
-+  [0x0858] = 0x23bd, [0x0859] = 0x23be, [0x085a] = 0x23bf, [0x085b] = 0x23c0,
-+  [0x085c] = 0x23c1, [0x085d] = 0x23c2, [0x085e] = 0x23c3, [0x085f] = 0x23c4,
-+  [0x0860] = 0x23c5, [0x0861] = 0x23c6, [0x0862] = 0x23c7, [0x0863] = 0x23c8,
-+  [0x0864] = 0x23c9, [0x0865] = 0x23ca, [0x0866] = 0x23cb, [0x0867] = 0x23cc,
-+  [0x0868] = 0x23cd, [0x0869] = 0x23ce, [0x086a] = 0x23cf, [0x086b] = 0x23d0,
-+  [0x086c] = 0x23d1, [0x086d] = 0x23d2, [0x086e] = 0x23d3, [0x086f] = 0x23d4,
-+  [0x0870] = 0x23d5, [0x0871] = 0x23d6, [0x0872] = 0x23d7, [0x0873] = 0x23d8,
-+  [0x0874] = 0x23d9, [0x0875] = 0x23da, [0x0876] = 0x23db, [0x0877] = 0x23dc,
-+  [0x0878] = 0x23dd, [0x0879] = 0x23de, [0x087a] = 0x23df, [0x087b] = 0x23e0,
-+  [0x087c] = 0x23e1, [0x087d] = 0x23e2, [0x087e] = 0x23e3, [0x087f] = 0x23e4,
-+  [0x0880] = 0x23e5, [0x0881] = 0x23e6, [0x0882] = 0x23e7, [0x0883] = 0x23e8,
-+  [0x0884] = 0x23e9, [0x0885] = 0x23ea, [0x0886] = 0x23eb, [0x0887] = 0x23ec,
-+  [0x0888] = 0x23ed, [0x0889] = 0x23ee, [0x088a] = 0x23ef, [0x088b] = 0x23f0,
-+  [0x088c] = 0x23f1, [0x088d] = 0x23f2, [0x088e] = 0x23f3, [0x088f] = 0x23f4,
-+  [0x0890] = 0x23f5, [0x0891] = 0x23f6, [0x0892] = 0x23f7, [0x0893] = 0x23f8,
-+  [0x0894] = 0x23f9, [0x0895] = 0x23fa, [0x0896] = 0x23fb, [0x0897] = 0x23fc,
-+  [0x0898] = 0x23fd, [0x0899] = 0x23fe, [0x089a] = 0x23ff, [0x089b] = 0x2400,
-+  [0x089c] = 0x2401, [0x089d] = 0x2402, [0x089e] = 0x2403, [0x089f] = 0x2404,
-+  [0x08a0] = 0x2405, [0x08a1] = 0x2406, [0x08a2] = 0x2407, [0x08a3] = 0x2408,
-+  [0x08a4] = 0x2409, [0x08a5] = 0x240a, [0x08a6] = 0x240b, [0x08a7] = 0x240c,
-+  [0x08a8] = 0x240d, [0x08a9] = 0x240e, [0x08aa] = 0x240f, [0x08ab] = 0x2410,
-+  [0x08ac] = 0x2411, [0x08ad] = 0x2412, [0x08ae] = 0x2413, [0x08af] = 0x2414,
-+  [0x08b0] = 0x2415, [0x08b1] = 0x2416, [0x08b2] = 0x2417, [0x08b3] = 0x2418,
-+  [0x08b4] = 0x2419, [0x08b5] = 0x241a, [0x08b6] = 0x241b, [0x08b7] = 0x241c,
-+  [0x08b8] = 0x241d, [0x08b9] = 0x241e, [0x08ba] = 0x241f, [0x08bb] = 0x2420,
-+  [0x08bc] = 0x2421, [0x08bd] = 0x2422, [0x08be] = 0x2423, [0x08bf] = 0x2424,
-+  [0x08c0] = 0x2425, [0x08c1] = 0x2426, [0x08c2] = 0x2427, [0x08c3] = 0x2428,
-+  [0x08c4] = 0x2429, [0x08c5] = 0x242a, [0x08c6] = 0x242b, [0x08c7] = 0x242c,
-+  [0x08c8] = 0x242d, [0x08c9] = 0x242e, [0x08ca] = 0x242f, [0x08cb] = 0x2430,
-+  [0x08cc] = 0x2431, [0x08cd] = 0x2432, [0x08ce] = 0x2433, [0x08cf] = 0x2434,
-+  [0x08d0] = 0x2435, [0x08d1] = 0x2436, [0x08d2] = 0x2437, [0x08d3] = 0x2438,
-+  [0x08d4] = 0x2439, [0x08d5] = 0x243a, [0x08d6] = 0x243b, [0x08d7] = 0x243c,
-+  [0x08d8] = 0x243d, [0x08d9] = 0x243e, [0x08da] = 0x243f, [0x08db] = 0x2440,
-+  [0x08dc] = 0x2441, [0x08dd] = 0x2442, [0x08de] = 0x2443, [0x08df] = 0x2444,
-+  [0x08e0] = 0x2445, [0x08e1] = 0x2446, [0x08e2] = 0x2447, [0x08e3] = 0x2448,
-+  [0x08e4] = 0x2449, [0x08e5] = 0x244a, [0x08e6] = 0x244b, [0x08e7] = 0x244c,
-+  [0x08e8] = 0x244d, [0x08e9] = 0x244e, [0x08ea] = 0x244f, [0x08eb] = 0x2450,
-+  [0x08ec] = 0x2451, [0x08ed] = 0x2452, [0x08ee] = 0x2453, [0x08ef] = 0x2454,
-+  [0x08f0] = 0x2455, [0x08f1] = 0x2456, [0x08f2] = 0x2457, [0x08f3] = 0x2458,
-+  [0x08f4] = 0x2459, [0x08f5] = 0x245a, [0x08f6] = 0x245b, [0x08f7] = 0x245c,
-+  [0x08f8] = 0x245d, [0x08f9] = 0x245e, [0x08fa] = 0x245f, [0x08fb] = 0x246a,
-+  [0x08fc] = 0x246b, [0x08fd] = 0x246c, [0x08fe] = 0x246d, [0x08ff] = 0x246e,
-+  [0x0900] = 0x246f, [0x0901] = 0x2470, [0x0902] = 0x2471, [0x0903] = 0x2472,
-+  [0x0904] = 0x2473, [0x0905] = 0x249c, [0x0906] = 0x249d, [0x0907] = 0x249e,
-+  [0x0908] = 0x249f, [0x0909] = 0x24a0, [0x090a] = 0x24a1, [0x090b] = 0x24a2,
-+  [0x090c] = 0x24a3, [0x090d] = 0x24a4, [0x090e] = 0x24a5, [0x090f] = 0x24a6,
-+  [0x0910] = 0x24a7, [0x0911] = 0x24a8, [0x0912] = 0x24a9, [0x0913] = 0x24aa,
-+  [0x0914] = 0x24ab, [0x0915] = 0x24ac, [0x0916] = 0x24ad, [0x0917] = 0x24ae,
-+  [0x0918] = 0x24af, [0x0919] = 0x24b0, [0x091a] = 0x24b1, [0x091b] = 0x24b2,
-+  [0x091c] = 0x24b3, [0x091d] = 0x24b4, [0x091e] = 0x24b5, [0x091f] = 0x24b6,
-+  [0x0920] = 0x24b7, [0x0921] = 0x24b8, [0x0922] = 0x24b9, [0x0923] = 0x24ba,
-+  [0x0924] = 0x24bb, [0x0925] = 0x24bc, [0x0926] = 0x24bd, [0x0927] = 0x24be,
-+  [0x0928] = 0x24bf, [0x0929] = 0x24c0, [0x092a] = 0x24c1, [0x092b] = 0x24c2,
-+  [0x092c] = 0x24c3, [0x092d] = 0x24c4, [0x092e] = 0x24c5, [0x092f] = 0x24c6,
-+  [0x0930] = 0x24c7, [0x0931] = 0x24c8, [0x0932] = 0x24c9, [0x0933] = 0x24ca,
-+  [0x0934] = 0x24cb, [0x0935] = 0x24cc, [0x0936] = 0x24cd, [0x0937] = 0x24ce,
-+  [0x0938] = 0x24cf, [0x0939] = 0x24d0, [0x093a] = 0x24d1, [0x093b] = 0x24d2,
-+  [0x093c] = 0x24d3, [0x093d] = 0x24d4, [0x093e] = 0x24d5, [0x093f] = 0x24d6,
-+  [0x0940] = 0x24d7, [0x0941] = 0x24d8, [0x0942] = 0x24d9, [0x0943] = 0x24da,
-+  [0x0944] = 0x24db, [0x0945] = 0x24dc, [0x0946] = 0x24dd, [0x0947] = 0x24de,
-+  [0x0948] = 0x24df, [0x0949] = 0x24e0, [0x094a] = 0x24e1, [0x094b] = 0x24e2,
-+  [0x094c] = 0x24e3, [0x094d] = 0x24e4, [0x094e] = 0x24e5, [0x094f] = 0x24e6,
-+  [0x0950] = 0x24e7, [0x0951] = 0x24e8, [0x0952] = 0x24e9, [0x0953] = 0x24ea,
-+  [0x0954] = 0x24eb, [0x0955] = 0x24ec, [0x0956] = 0x24ed, [0x0957] = 0x24ee,
-+  [0x0958] = 0x24ef, [0x0959] = 0x24f0, [0x095a] = 0x24f1, [0x095b] = 0x24f2,
-+  [0x095c] = 0x24f3, [0x095d] = 0x24f4, [0x095e] = 0x24f5, [0x095f] = 0x24f6,
-+  [0x0960] = 0x24f7, [0x0961] = 0x24f8, [0x0962] = 0x24f9, [0x0963] = 0x24fa,
-+  [0x0964] = 0x24fb, [0x0965] = 0x24fc, [0x0966] = 0x24fd, [0x0967] = 0x24fe,
-+  [0x0968] = 0x24ff, [0x0969] = 0x254c, [0x096a] = 0x254d, [0x096b] = 0x254e,
-+  [0x096c] = 0x254f, [0x096d] = 0x2574, [0x096e] = 0x2575, [0x096f] = 0x2576,
-+  [0x0970] = 0x2577, [0x0971] = 0x2578, [0x0972] = 0x2579, [0x0973] = 0x257a,
-+  [0x0974] = 0x257b, [0x0975] = 0x257c, [0x0976] = 0x257d, [0x0977] = 0x257e,
-+  [0x0978] = 0x257f, [0x0979] = 0x2580, [0x097a] = 0x2590, [0x097b] = 0x2591,
-+  [0x097c] = 0x2592, [0x097d] = 0x2596, [0x097e] = 0x2597, [0x097f] = 0x2598,
-+  [0x0980] = 0x2599, [0x0981] = 0x259a, [0x0982] = 0x259b, [0x0983] = 0x259c,
-+  [0x0984] = 0x259d, [0x0985] = 0x259e, [0x0986] = 0x259f, [0x0987] = 0x25a2,
-+  [0x0988] = 0x25a3, [0x0989] = 0x25a4, [0x098a] = 0x25a5, [0x098b] = 0x25a6,
-+  [0x098c] = 0x25a7, [0x098d] = 0x25a8, [0x098e] = 0x25a9, [0x098f] = 0x25aa,
-+  [0x0990] = 0x25ab, [0x0991] = 0x25ac, [0x0992] = 0x25ad, [0x0993] = 0x25ae,
-+  [0x0994] = 0x25af, [0x0995] = 0x25b0, [0x0996] = 0x25b1, [0x0997] = 0x25b4,
-+  [0x0998] = 0x25b5, [0x0999] = 0x25b6, [0x099a] = 0x25b7, [0x099b] = 0x25b8,
-+  [0x099c] = 0x25b9, [0x099d] = 0x25ba, [0x099e] = 0x25bb, [0x099f] = 0x25be,
-+  [0x09a0] = 0x25bf, [0x09a1] = 0x25c0, [0x09a2] = 0x25c1, [0x09a3] = 0x25c2,
-+  [0x09a4] = 0x25c3, [0x09a5] = 0x25c4, [0x09a6] = 0x25c5, [0x09a7] = 0x25c8,
-+  [0x09a8] = 0x25c9, [0x09a9] = 0x25ca, [0x09aa] = 0x25cc, [0x09ab] = 0x25cd,
-+  [0x09ac] = 0x25d0, [0x09ad] = 0x25d1, [0x09ae] = 0x25d2, [0x09af] = 0x25d3,
-+  [0x09b0] = 0x25d4, [0x09b1] = 0x25d5, [0x09b2] = 0x25d6, [0x09b3] = 0x25d7,
-+  [0x09b4] = 0x25d8, [0x09b5] = 0x25d9, [0x09b6] = 0x25da, [0x09b7] = 0x25db,
-+  [0x09b8] = 0x25dc, [0x09b9] = 0x25dd, [0x09ba] = 0x25de, [0x09bb] = 0x25df,
-+  [0x09bc] = 0x25e0, [0x09bd] = 0x25e1, [0x09be] = 0x25e6, [0x09bf] = 0x25e7,
-+  [0x09c0] = 0x25e8, [0x09c1] = 0x25e9, [0x09c2] = 0x25ea, [0x09c3] = 0x25eb,
-+  [0x09c4] = 0x25ec, [0x09c5] = 0x25ed, [0x09c6] = 0x25ee, [0x09c7] = 0x25ef,
-+  [0x09c8] = 0x25f0, [0x09c9] = 0x25f1, [0x09ca] = 0x25f2, [0x09cb] = 0x25f3,
-+  [0x09cc] = 0x25f4, [0x09cd] = 0x25f5, [0x09ce] = 0x25f6, [0x09cf] = 0x25f7,
-+  [0x09d0] = 0x25f8, [0x09d1] = 0x25f9, [0x09d2] = 0x25fa, [0x09d3] = 0x25fb,
-+  [0x09d4] = 0x25fc, [0x09d5] = 0x25fd, [0x09d6] = 0x25fe, [0x09d7] = 0x25ff,
-+  [0x09d8] = 0x2600, [0x09d9] = 0x2601, [0x09da] = 0x2602, [0x09db] = 0x2603,
-+  [0x09dc] = 0x2604, [0x09dd] = 0x2607, [0x09de] = 0x2608, [0x09df] = 0x260a,
-+  [0x09e0] = 0x260b, [0x09e1] = 0x260c, [0x09e2] = 0x260d, [0x09e3] = 0x260e,
-+  [0x09e4] = 0x260f, [0x09e5] = 0x2610, [0x09e6] = 0x2611, [0x09e7] = 0x2612,
-+  [0x09e8] = 0x2613, [0x09e9] = 0x2614, [0x09ea] = 0x2615, [0x09eb] = 0x2616,
-+  [0x09ec] = 0x2617, [0x09ed] = 0x2618, [0x09ee] = 0x2619, [0x09ef] = 0x261a,
-+  [0x09f0] = 0x261b, [0x09f1] = 0x261c, [0x09f2] = 0x261d, [0x09f3] = 0x261e,
-+  [0x09f4] = 0x261f, [0x09f5] = 0x2620, [0x09f6] = 0x2621, [0x09f7] = 0x2622,
-+  [0x09f8] = 0x2623, [0x09f9] = 0x2624, [0x09fa] = 0x2625, [0x09fb] = 0x2626,
-+  [0x09fc] = 0x2627, [0x09fd] = 0x2628, [0x09fe] = 0x2629, [0x09ff] = 0x262a,
-+  [0x0a00] = 0x262b, [0x0a01] = 0x262c, [0x0a02] = 0x262d, [0x0a03] = 0x262e,
-+  [0x0a04] = 0x262f, [0x0a05] = 0x2630, [0x0a06] = 0x2631, [0x0a07] = 0x2632,
-+  [0x0a08] = 0x2633, [0x0a09] = 0x2634, [0x0a0a] = 0x2635, [0x0a0b] = 0x2636,
-+  [0x0a0c] = 0x2637, [0x0a0d] = 0x2638, [0x0a0e] = 0x2639, [0x0a0f] = 0x263a,
-+  [0x0a10] = 0x263b, [0x0a11] = 0x263c, [0x0a12] = 0x263d, [0x0a13] = 0x263e,
-+  [0x0a14] = 0x263f, [0x0a15] = 0x2641, [0x0a16] = 0x2e82, [0x0a17] = 0x2e83,
-+  [0x0a18] = 0x2e85, [0x0a19] = 0x2e86, [0x0a1a] = 0x2e87, [0x0a1b] = 0x2e89,
-+  [0x0a1c] = 0x2e8a, [0x0a1d] = 0x2e8d, [0x0a1e] = 0x2e8e, [0x0a1f] = 0x2e8f,
-+  [0x0a20] = 0x2e90, [0x0a21] = 0x2e91, [0x0a22] = 0x2e92, [0x0a23] = 0x2e93,
-+  [0x0a24] = 0x2e94, [0x0a25] = 0x2e95, [0x0a26] = 0x2e96, [0x0a27] = 0x2e98,
-+  [0x0a28] = 0x2e99, [0x0a29] = 0x2e9a, [0x0a2a] = 0x2e9b, [0x0a2b] = 0x2e9c,
-   [0x0a2c] = 0x2e9d, [0x0a2d] = 0x2e9e, [0x0a2e] = 0x2e9f, [0x0a2f] = 0x2ea0,
-   [0x0a30] = 0x2ea1, [0x0a31] = 0x2ea2, [0x0a32] = 0x2ea3, [0x0a33] = 0x2ea4,
-   [0x0a34] = 0x2ea5, [0x0a35] = 0x2ea6, [0x0a36] = 0x2ea8, [0x0a37] = 0x2ea9,
-@@ -6638,7 +6785,10 @@ static const uint16_t __fourbyte_to_ucs[39419-11172-4295] =
-   [0x0a6c] = 0x2ee5, [0x0a6d] = 0x2ee6, [0x0a6e] = 0x2ee7, [0x0a6f] = 0x2ee8,
-   [0x0a70] = 0x2ee9, [0x0a71] = 0x2eea, [0x0a72] = 0x2eeb, [0x0a73] = 0x2eec,
-   [0x0a74] = 0x2eed, [0x0a75] = 0x2eee, [0x0a76] = 0x2eef, [0x0a77] = 0x2ef0,
--  [0x0a78] = 0x2ef1, [0x0a79] = 0x2ef2, [0x0a7a] = 0x2ef3, [0x0a87] = 0x2f00,
-+  [0x0a78] = 0x2ef1, [0x0a79] = 0x2ef2, [0x0a7a] = 0x2ef3, [0x0a7b] = 0x2ef4,
-+  [0x0a7c] = 0x2ef5, [0x0a7d] = 0x2ef6, [0x0a7e] = 0x2ef7, [0x0a7f] = 0x2ef8,
-+  [0x0a80] = 0x2ef9, [0x0a81] = 0x2efa, [0x0a82] = 0x2efb, [0x0a83] = 0x2efc,
-+  [0x0a84] = 0x2efd, [0x0a85] = 0x2efe, [0x0a86] = 0x2eff, [0x0a87] = 0x2f00,
-   [0x0a88] = 0x2f01, [0x0a89] = 0x2f02, [0x0a8a] = 0x2f03, [0x0a8b] = 0x2f04,
-   [0x0a8c] = 0x2f05, [0x0a8d] = 0x2f06, [0x0a8e] = 0x2f07, [0x0a8f] = 0x2f08,
-   [0x0a90] = 0x2f09, [0x0a91] = 0x2f0a, [0x0a92] = 0x2f0b, [0x0a93] = 0x2f0c,
-@@ -6692,73 +6842,88 @@ static const uint16_t __fourbyte_to_ucs[39419-11172-4295] =
-   [0x0b50] = 0x2fc9, [0x0b51] = 0x2fca, [0x0b52] = 0x2fcb, [0x0b53] = 0x2fcc,
-   [0x0b54] = 0x2fcd, [0x0b55] = 0x2fce, [0x0b56] = 0x2fcf, [0x0b57] = 0x2fd0,
-   [0x0b58] = 0x2fd1, [0x0b59] = 0x2fd2, [0x0b5a] = 0x2fd3, [0x0b5b] = 0x2fd4,
--  [0x0b5c] = 0x2fd5, [0x0b7b] = 0x3004, [0x0b7c] = 0x3018, [0x0b7d] = 0x3019,
--  [0x0b7e] = 0x301a, [0x0b7f] = 0x301b, [0x0b80] = 0x301c, [0x0b81] = 0x301f,
--  [0x0b82] = 0x3020, [0x0b83] = 0x302a, [0x0b84] = 0x302b, [0x0b85] = 0x302c,
--  [0x0b86] = 0x302d, [0x0b87] = 0x302e, [0x0b88] = 0x302f, [0x0b89] = 0x3030,
--  [0x0b8a] = 0x3031, [0x0b8b] = 0x3032, [0x0b8c] = 0x3033, [0x0b8d] = 0x3034,
--  [0x0b8e] = 0x3035, [0x0b8f] = 0x3036, [0x0b90] = 0x3037, [0x0b91] = 0x3038,
--  [0x0b92] = 0x3039, [0x0b93] = 0x303a, [0x0b94] = 0x303b, [0x0b95] = 0x303c,
--  [0x0b96] = 0x303d, [0x0b97] = 0x303f, [0x0b99] = 0x3094, [0x0b9a] = 0x3095,
--  [0x0b9b] = 0x3096, [0x0b9e] = 0x3099, [0x0b9f] = 0x309a, [0x0ba0] = 0x309f,
--  [0x0ba1] = 0x30a0, [0x0ba2] = 0x30f7, [0x0ba3] = 0x30f8, [0x0ba4] = 0x30f9,
--  [0x0ba5] = 0x30fa, [0x0ba6] = 0x30fb, [0x0ba7] = 0x30ff, [0x0bad] = 0x312a,
--  [0x0bae] = 0x312b, [0x0baf] = 0x312c, [0x0bb0] = 0x312d, [0x0bb4] = 0x3131,
--  [0x0bb5] = 0x3132, [0x0bb6] = 0x3133, [0x0bb7] = 0x3134, [0x0bb8] = 0x3135,
--  [0x0bb9] = 0x3136, [0x0bba] = 0x3137, [0x0bbb] = 0x3138, [0x0bbc] = 0x3139,
--  [0x0bbd] = 0x313a, [0x0bbe] = 0x313b, [0x0bbf] = 0x313c, [0x0bc0] = 0x313d,
--  [0x0bc1] = 0x313e, [0x0bc2] = 0x313f, [0x0bc3] = 0x3140, [0x0bc4] = 0x3141,
--  [0x0bc5] = 0x3142, [0x0bc6] = 0x3143, [0x0bc7] = 0x3144, [0x0bc8] = 0x3145,
--  [0x0bc9] = 0x3146, [0x0bca] = 0x3147, [0x0bcb] = 0x3148, [0x0bcc] = 0x3149,
--  [0x0bcd] = 0x314a, [0x0bce] = 0x314b, [0x0bcf] = 0x314c, [0x0bd0] = 0x314d,
--  [0x0bd1] = 0x314e, [0x0bd2] = 0x314f, [0x0bd3] = 0x3150, [0x0bd4] = 0x3151,
--  [0x0bd5] = 0x3152, [0x0bd6] = 0x3153, [0x0bd7] = 0x3154, [0x0bd8] = 0x3155,
--  [0x0bd9] = 0x3156, [0x0bda] = 0x3157, [0x0bdb] = 0x3158, [0x0bdc] = 0x3159,
--  [0x0bdd] = 0x315a, [0x0bde] = 0x315b, [0x0bdf] = 0x315c, [0x0be0] = 0x315d,
--  [0x0be1] = 0x315e, [0x0be2] = 0x315f, [0x0be3] = 0x3160, [0x0be4] = 0x3161,
--  [0x0be5] = 0x3162, [0x0be6] = 0x3163, [0x0be7] = 0x3164, [0x0be8] = 0x3165,
--  [0x0be9] = 0x3166, [0x0bea] = 0x3167, [0x0beb] = 0x3168, [0x0bec] = 0x3169,
--  [0x0bed] = 0x316a, [0x0bee] = 0x316b, [0x0bef] = 0x316c, [0x0bf0] = 0x316d,
--  [0x0bf1] = 0x316e, [0x0bf2] = 0x316f, [0x0bf3] = 0x3170, [0x0bf4] = 0x3171,
--  [0x0bf5] = 0x3172, [0x0bf6] = 0x3173, [0x0bf7] = 0x3174, [0x0bf8] = 0x3175,
--  [0x0bf9] = 0x3176, [0x0bfa] = 0x3177, [0x0bfb] = 0x3178, [0x0bfc] = 0x3179,
--  [0x0bfd] = 0x317a, [0x0bfe] = 0x317b, [0x0bff] = 0x317c, [0x0c00] = 0x317d,
--  [0x0c01] = 0x317e, [0x0c02] = 0x317f, [0x0c03] = 0x3180, [0x0c04] = 0x3181,
--  [0x0c05] = 0x3182, [0x0c06] = 0x3183, [0x0c07] = 0x3184, [0x0c08] = 0x3185,
--  [0x0c09] = 0x3186, [0x0c0a] = 0x3187, [0x0c0b] = 0x3188, [0x0c0c] = 0x3189,
--  [0x0c0d] = 0x318a, [0x0c0e] = 0x318b, [0x0c0f] = 0x318c, [0x0c10] = 0x318d,
--  [0x0c11] = 0x318e, [0x0c13] = 0x3190, [0x0c14] = 0x3191, [0x0c15] = 0x3192,
--  [0x0c16] = 0x3193, [0x0c17] = 0x3194, [0x0c18] = 0x3195, [0x0c19] = 0x3196,
--  [0x0c1a] = 0x3197, [0x0c1b] = 0x3198, [0x0c1c] = 0x3199, [0x0c1d] = 0x319a,
--  [0x0c1e] = 0x319b, [0x0c1f] = 0x319c, [0x0c20] = 0x319d, [0x0c21] = 0x319e,
--  [0x0c22] = 0x319f, [0x0c23] = 0x31a0, [0x0c24] = 0x31a1, [0x0c25] = 0x31a2,
--  [0x0c26] = 0x31a3, [0x0c27] = 0x31a4, [0x0c28] = 0x31a5, [0x0c29] = 0x31a6,
--  [0x0c2a] = 0x31a7, [0x0c2b] = 0x31a8, [0x0c2c] = 0x31a9, [0x0c2d] = 0x31aa,
--  [0x0c2e] = 0x31ab, [0x0c2f] = 0x31ac, [0x0c30] = 0x31ad, [0x0c31] = 0x31ae,
--  [0x0c32] = 0x31af, [0x0c33] = 0x31b0, [0x0c34] = 0x31b1, [0x0c35] = 0x31b2,
--  [0x0c36] = 0x31b3, [0x0c37] = 0x31b4, [0x0c38] = 0x31b5, [0x0c39] = 0x31b6,
--  [0x0c3a] = 0x31b7, [0x0c3b] = 0x31b8, [0x0c3c] = 0x31b9, [0x0c3d] = 0x31ba,
--  [0x0c43] = 0x31c0, [0x0c44] = 0x31c1, [0x0c45] = 0x31c2, [0x0c46] = 0x31c3,
--  [0x0c47] = 0x31c4, [0x0c48] = 0x31c5, [0x0c49] = 0x31c6, [0x0c4a] = 0x31c7,
--  [0x0c4b] = 0x31c8, [0x0c4c] = 0x31c9, [0x0c4d] = 0x31ca, [0x0c4e] = 0x31cb,
--  [0x0c4f] = 0x31cc, [0x0c50] = 0x31cd, [0x0c51] = 0x31ce, [0x0c52] = 0x31cf,
--  [0x0c53] = 0x31d0, [0x0c54] = 0x31d1, [0x0c55] = 0x31d2, [0x0c56] = 0x31d3,
--  [0x0c57] = 0x31d4, [0x0c58] = 0x31d5, [0x0c59] = 0x31d6, [0x0c5a] = 0x31d7,
--  [0x0c5b] = 0x31d8, [0x0c5c] = 0x31d9, [0x0c5d] = 0x31da, [0x0c5e] = 0x31db,
--  [0x0c5f] = 0x31dc, [0x0c60] = 0x31dd, [0x0c61] = 0x31de, [0x0c62] = 0x31df,
--  [0x0c63] = 0x31e0, [0x0c64] = 0x31e1, [0x0c65] = 0x31e2, [0x0c66] = 0x31e3,
--  [0x0c73] = 0x31f0, [0x0c74] = 0x31f1, [0x0c75] = 0x31f2, [0x0c76] = 0x31f3,
--  [0x0c77] = 0x31f4, [0x0c78] = 0x31f5, [0x0c79] = 0x31f6, [0x0c7a] = 0x31f7,
--  [0x0c7b] = 0x31f8, [0x0c7c] = 0x31f9, [0x0c7d] = 0x31fa, [0x0c7e] = 0x31fb,
--  [0x0c7f] = 0x31fc, [0x0c80] = 0x31fd, [0x0c81] = 0x31fe, [0x0c82] = 0x31ff,
--  [0x0c83] = 0x3200, [0x0c84] = 0x3201, [0x0c85] = 0x3202, [0x0c86] = 0x3203,
--  [0x0c87] = 0x3204, [0x0c88] = 0x3205, [0x0c89] = 0x3206, [0x0c8a] = 0x3207,
--  [0x0c8b] = 0x3208, [0x0c8c] = 0x3209, [0x0c8d] = 0x320a, [0x0c8e] = 0x320b,
--  [0x0c8f] = 0x320c, [0x0c90] = 0x320d, [0x0c91] = 0x320e, [0x0c92] = 0x320f,
--  [0x0c93] = 0x3210, [0x0c94] = 0x3211, [0x0c95] = 0x3212, [0x0c96] = 0x3213,
--  [0x0c97] = 0x3214, [0x0c98] = 0x3215, [0x0c99] = 0x3216, [0x0c9a] = 0x3217,
--  [0x0c9b] = 0x3218, [0x0c9c] = 0x3219, [0x0c9d] = 0x321a, [0x0c9e] = 0x321b,
--  [0x0c9f] = 0x321c, [0x0ca0] = 0x321d, [0x0ca1] = 0x321e, [0x0ca3] = 0x322a,
-+  [0x0b5c] = 0x2fd5, [0x0b5d] = 0x2fd6, [0x0b5e] = 0x2fd7, [0x0b5f] = 0x2fd8,
-+  [0x0b60] = 0x2fd9, [0x0b61] = 0x2fda, [0x0b62] = 0x2fdb, [0x0b63] = 0x2fdc,
-+  [0x0b64] = 0x2fdd, [0x0b65] = 0x2fde, [0x0b66] = 0x2fdf, [0x0b67] = 0x2fe0,
-+  [0x0b68] = 0x2fe1, [0x0b69] = 0x2fe2, [0x0b6a] = 0x2fe3, [0x0b6b] = 0x2fe4,
-+  [0x0b6c] = 0x2fe5, [0x0b6d] = 0x2fe6, [0x0b6e] = 0x2fe7, [0x0b6f] = 0x2fe8,
-+  [0x0b70] = 0x2fe9, [0x0b71] = 0x2fea, [0x0b72] = 0x2feb, [0x0b73] = 0x2fec,
-+  [0x0b74] = 0x2fed, [0x0b75] = 0x2fee, [0x0b76] = 0x2fef, [0x0b77] = 0x2ffc,
-+  [0x0b78] = 0x2ffd, [0x0b79] = 0x2ffe, [0x0b7a] = 0x2fff, [0x0b7b] = 0x3004,
-+  [0x0b7c] = 0x3018, [0x0b7d] = 0x3019, [0x0b7e] = 0x301a, [0x0b7f] = 0x301b,
-+  [0x0b80] = 0x301c, [0x0b81] = 0x301f, [0x0b82] = 0x3020, [0x0b83] = 0x302a,
-+  [0x0b84] = 0x302b, [0x0b85] = 0x302c, [0x0b86] = 0x302d, [0x0b87] = 0x302e,
-+  [0x0b88] = 0x302f, [0x0b89] = 0x3030, [0x0b8a] = 0x3031, [0x0b8b] = 0x3032,
-+  [0x0b8c] = 0x3033, [0x0b8d] = 0x3034, [0x0b8e] = 0x3035, [0x0b8f] = 0x3036,
-+  [0x0b90] = 0x3037, [0x0b91] = 0x3038, [0x0b92] = 0x3039, [0x0b93] = 0x303a,
-+  [0x0b94] = 0x303b, [0x0b95] = 0x303c, [0x0b96] = 0x303d, [0x0b97] = 0x303f,
-+  [0x0b98] = 0x3040, [0x0b99] = 0x3094, [0x0b9a] = 0x3095, [0x0b9b] = 0x3096,
-+  [0x0b9c] = 0x3097, [0x0b9d] = 0x3098, [0x0b9e] = 0x3099, [0x0b9f] = 0x309a,
-+  [0x0ba0] = 0x309f, [0x0ba1] = 0x30a0, [0x0ba2] = 0x30f7, [0x0ba3] = 0x30f8,
-+  [0x0ba4] = 0x30f9, [0x0ba5] = 0x30fa, [0x0ba6] = 0x30fb, [0x0ba7] = 0x30ff,
-+  [0x0ba8] = 0x3100, [0x0ba9] = 0x3101, [0x0baa] = 0x3102, [0x0bab] = 0x3103,
-+  [0x0bac] = 0x3104, [0x0bad] = 0x312a, [0x0bae] = 0x312b, [0x0baf] = 0x312c,
-+  [0x0bb0] = 0x312d, [0x0bb1] = 0x312e, [0x0bb2] = 0x312f, [0x0bb3] = 0x3130,
-+  [0x0bb4] = 0x3131, [0x0bb5] = 0x3132, [0x0bb6] = 0x3133, [0x0bb7] = 0x3134,
-+  [0x0bb8] = 0x3135, [0x0bb9] = 0x3136, [0x0bba] = 0x3137, [0x0bbb] = 0x3138,
-+  [0x0bbc] = 0x3139, [0x0bbd] = 0x313a, [0x0bbe] = 0x313b, [0x0bbf] = 0x313c,
-+  [0x0bc0] = 0x313d, [0x0bc1] = 0x313e, [0x0bc2] = 0x313f, [0x0bc3] = 0x3140,
-+  [0x0bc4] = 0x3141, [0x0bc5] = 0x3142, [0x0bc6] = 0x3143, [0x0bc7] = 0x3144,
-+  [0x0bc8] = 0x3145, [0x0bc9] = 0x3146, [0x0bca] = 0x3147, [0x0bcb] = 0x3148,
-+  [0x0bcc] = 0x3149, [0x0bcd] = 0x314a, [0x0bce] = 0x314b, [0x0bcf] = 0x314c,
-+  [0x0bd0] = 0x314d, [0x0bd1] = 0x314e, [0x0bd2] = 0x314f, [0x0bd3] = 0x3150,
-+  [0x0bd4] = 0x3151, [0x0bd5] = 0x3152, [0x0bd6] = 0x3153, [0x0bd7] = 0x3154,
-+  [0x0bd8] = 0x3155, [0x0bd9] = 0x3156, [0x0bda] = 0x3157, [0x0bdb] = 0x3158,
-+  [0x0bdc] = 0x3159, [0x0bdd] = 0x315a, [0x0bde] = 0x315b, [0x0bdf] = 0x315c,
-+  [0x0be0] = 0x315d, [0x0be1] = 0x315e, [0x0be2] = 0x315f, [0x0be3] = 0x3160,
-+  [0x0be4] = 0x3161, [0x0be5] = 0x3162, [0x0be6] = 0x3163, [0x0be7] = 0x3164,
-+  [0x0be8] = 0x3165, [0x0be9] = 0x3166, [0x0bea] = 0x3167, [0x0beb] = 0x3168,
-+  [0x0bec] = 0x3169, [0x0bed] = 0x316a, [0x0bee] = 0x316b, [0x0bef] = 0x316c,
-+  [0x0bf0] = 0x316d, [0x0bf1] = 0x316e, [0x0bf2] = 0x316f, [0x0bf3] = 0x3170,
-+  [0x0bf4] = 0x3171, [0x0bf5] = 0x3172, [0x0bf6] = 0x3173, [0x0bf7] = 0x3174,
-+  [0x0bf8] = 0x3175, [0x0bf9] = 0x3176, [0x0bfa] = 0x3177, [0x0bfb] = 0x3178,
-+  [0x0bfc] = 0x3179, [0x0bfd] = 0x317a, [0x0bfe] = 0x317b, [0x0bff] = 0x317c,
-+  [0x0c00] = 0x317d, [0x0c01] = 0x317e, [0x0c02] = 0x317f, [0x0c03] = 0x3180,
-+  [0x0c04] = 0x3181, [0x0c05] = 0x3182, [0x0c06] = 0x3183, [0x0c07] = 0x3184,
-+  [0x0c08] = 0x3185, [0x0c09] = 0x3186, [0x0c0a] = 0x3187, [0x0c0b] = 0x3188,
-+  [0x0c0c] = 0x3189, [0x0c0d] = 0x318a, [0x0c0e] = 0x318b, [0x0c0f] = 0x318c,
-+  [0x0c10] = 0x318d, [0x0c11] = 0x318e, [0x0c12] = 0x318f, [0x0c13] = 0x3190,
-+  [0x0c14] = 0x3191, [0x0c15] = 0x3192, [0x0c16] = 0x3193, [0x0c17] = 0x3194,
-+  [0x0c18] = 0x3195, [0x0c19] = 0x3196, [0x0c1a] = 0x3197, [0x0c1b] = 0x3198,
-+  [0x0c1c] = 0x3199, [0x0c1d] = 0x319a, [0x0c1e] = 0x319b, [0x0c1f] = 0x319c,
-+  [0x0c20] = 0x319d, [0x0c21] = 0x319e, [0x0c22] = 0x319f, [0x0c23] = 0x31a0,
-+  [0x0c24] = 0x31a1, [0x0c25] = 0x31a2, [0x0c26] = 0x31a3, [0x0c27] = 0x31a4,
-+  [0x0c28] = 0x31a5, [0x0c29] = 0x31a6, [0x0c2a] = 0x31a7, [0x0c2b] = 0x31a8,
-+  [0x0c2c] = 0x31a9, [0x0c2d] = 0x31aa, [0x0c2e] = 0x31ab, [0x0c2f] = 0x31ac,
-+  [0x0c30] = 0x31ad, [0x0c31] = 0x31ae, [0x0c32] = 0x31af, [0x0c33] = 0x31b0,
-+  [0x0c34] = 0x31b1, [0x0c35] = 0x31b2, [0x0c36] = 0x31b3, [0x0c37] = 0x31b4,
-+  [0x0c38] = 0x31b5, [0x0c39] = 0x31b6, [0x0c3a] = 0x31b7, [0x0c3b] = 0x31b8,
-+  [0x0c3c] = 0x31b9, [0x0c3d] = 0x31ba, [0x0c3e] = 0x31bb, [0x0c3f] = 0x31bc,
-+  [0x0c40] = 0x31bd, [0x0c41] = 0x31be, [0x0c42] = 0x31bf, [0x0c43] = 0x31c0,
-+  [0x0c44] = 0x31c1, [0x0c45] = 0x31c2, [0x0c46] = 0x31c3, [0x0c47] = 0x31c4,
-+  [0x0c48] = 0x31c5, [0x0c49] = 0x31c6, [0x0c4a] = 0x31c7, [0x0c4b] = 0x31c8,
-+  [0x0c4c] = 0x31c9, [0x0c4d] = 0x31ca, [0x0c4e] = 0x31cb, [0x0c4f] = 0x31cc,
-+  [0x0c50] = 0x31cd, [0x0c51] = 0x31ce, [0x0c52] = 0x31cf, [0x0c53] = 0x31d0,
-+  [0x0c54] = 0x31d1, [0x0c55] = 0x31d2, [0x0c56] = 0x31d3, [0x0c57] = 0x31d4,
-+  [0x0c58] = 0x31d5, [0x0c59] = 0x31d6, [0x0c5a] = 0x31d7, [0x0c5b] = 0x31d8,
-+  [0x0c5c] = 0x31d9, [0x0c5d] = 0x31da, [0x0c5e] = 0x31db, [0x0c5f] = 0x31dc,
-+  [0x0c60] = 0x31dd, [0x0c61] = 0x31de, [0x0c62] = 0x31df, [0x0c63] = 0x31e0,
-+  [0x0c64] = 0x31e1, [0x0c65] = 0x31e2, [0x0c66] = 0x31e3, [0x0c67] = 0x31e4,
-+  [0x0c68] = 0x31e5, [0x0c69] = 0x31e6, [0x0c6a] = 0x31e7, [0x0c6b] = 0x31e8,
-+  [0x0c6c] = 0x31e9, [0x0c6d] = 0x31ea, [0x0c6e] = 0x31eb, [0x0c6f] = 0x31ec,
-+  [0x0c70] = 0x31ed, [0x0c71] = 0x31ee, [0x0c72] = 0x31ef, [0x0c73] = 0x31f0,
-+  [0x0c74] = 0x31f1, [0x0c75] = 0x31f2, [0x0c76] = 0x31f3, [0x0c77] = 0x31f4,
-+  [0x0c78] = 0x31f5, [0x0c79] = 0x31f6, [0x0c7a] = 0x31f7, [0x0c7b] = 0x31f8,
-+  [0x0c7c] = 0x31f9, [0x0c7d] = 0x31fa, [0x0c7e] = 0x31fb, [0x0c7f] = 0x31fc,
-+  [0x0c80] = 0x31fd, [0x0c81] = 0x31fe, [0x0c82] = 0x31ff, [0x0c83] = 0x3200,
-+  [0x0c84] = 0x3201, [0x0c85] = 0x3202, [0x0c86] = 0x3203, [0x0c87] = 0x3204,
-+  [0x0c88] = 0x3205, [0x0c89] = 0x3206, [0x0c8a] = 0x3207, [0x0c8b] = 0x3208,
-+  [0x0c8c] = 0x3209, [0x0c8d] = 0x320a, [0x0c8e] = 0x320b, [0x0c8f] = 0x320c,
-+  [0x0c90] = 0x320d, [0x0c91] = 0x320e, [0x0c92] = 0x320f, [0x0c93] = 0x3210,
-+  [0x0c94] = 0x3211, [0x0c95] = 0x3212, [0x0c96] = 0x3213, [0x0c97] = 0x3214,
-+  [0x0c98] = 0x3215, [0x0c99] = 0x3216, [0x0c9a] = 0x3217, [0x0c9b] = 0x3218,
-+  [0x0c9c] = 0x3219, [0x0c9d] = 0x321a, [0x0c9e] = 0x321b, [0x0c9f] = 0x321c,
-+  [0x0ca0] = 0x321d, [0x0ca1] = 0x321e, [0x0ca2] = 0x321f, [0x0ca3] = 0x322a,
-   [0x0ca4] = 0x322b, [0x0ca5] = 0x322c, [0x0ca6] = 0x322d, [0x0ca7] = 0x322e,
-   [0x0ca8] = 0x322f, [0x0ca9] = 0x3230, [0x0caa] = 0x3232, [0x0cab] = 0x3233,
-   [0x0cac] = 0x3234, [0x0cad] = 0x3235, [0x0cae] = 0x3236, [0x0caf] = 0x3237,
-@@ -6811,689 +6976,1423 @@ static const uint16_t __fourbyte_to_ucs[39419-11172-4295] =
-   [0x0d68] = 0x32f1, [0x0d69] = 0x32f2, [0x0d6a] = 0x32f3, [0x0d6b] = 0x32f4,
-   [0x0d6c] = 0x32f5, [0x0d6d] = 0x32f6, [0x0d6e] = 0x32f7, [0x0d6f] = 0x32f8,
-   [0x0d70] = 0x32f9, [0x0d71] = 0x32fa, [0x0d72] = 0x32fb, [0x0d73] = 0x32fc,
--  [0x0d74] = 0x32fd, [0x0d75] = 0x32fe, [0x0d77] = 0x3300, [0x0d78] = 0x3301,
--  [0x0d79] = 0x3302, [0x0d7a] = 0x3303, [0x0d7b] = 0x3304, [0x0d7c] = 0x3305,
--  [0x0d7d] = 0x3306, [0x0d7e] = 0x3307, [0x0d7f] = 0x3308, [0x0d80] = 0x3309,
--  [0x0d81] = 0x330a, [0x0d82] = 0x330b, [0x0d83] = 0x330c, [0x0d84] = 0x330d,
--  [0x0d85] = 0x330e, [0x0d86] = 0x330f, [0x0d87] = 0x3310, [0x0d88] = 0x3311,
--  [0x0d89] = 0x3312, [0x0d8a] = 0x3313, [0x0d8b] = 0x3314, [0x0d8c] = 0x3315,
--  [0x0d8d] = 0x3316, [0x0d8e] = 0x3317, [0x0d8f] = 0x3318, [0x0d90] = 0x3319,
--  [0x0d91] = 0x331a, [0x0d92] = 0x331b, [0x0d93] = 0x331c, [0x0d94] = 0x331d,
--  [0x0d95] = 0x331e, [0x0d96] = 0x331f, [0x0d97] = 0x3320, [0x0d98] = 0x3321,
--  [0x0d99] = 0x3322, [0x0d9a] = 0x3323, [0x0d9b] = 0x3324, [0x0d9c] = 0x3325,
--  [0x0d9d] = 0x3326, [0x0d9e] = 0x3327, [0x0d9f] = 0x3328, [0x0da0] = 0x3329,
--  [0x0da1] = 0x332a, [0x0da2] = 0x332b, [0x0da3] = 0x332c, [0x0da4] = 0x332d,
--  [0x0da5] = 0x332e, [0x0da6] = 0x332f, [0x0da7] = 0x3330, [0x0da8] = 0x3331,
--  [0x0da9] = 0x3332, [0x0daa] = 0x3333, [0x0dab] = 0x3334, [0x0dac] = 0x3335,
--  [0x0dad] = 0x3336, [0x0dae] = 0x3337, [0x0daf] = 0x3338, [0x0db0] = 0x3339,
--  [0x0db1] = 0x333a, [0x0db2] = 0x333b, [0x0db3] = 0x333c, [0x0db4] = 0x333d,
--  [0x0db5] = 0x333e, [0x0db6] = 0x333f, [0x0db7] = 0x3340, [0x0db8] = 0x3341,
--  [0x0db9] = 0x3342, [0x0dba] = 0x3343, [0x0dbb] = 0x3344, [0x0dbc] = 0x3345,
--  [0x0dbd] = 0x3346, [0x0dbe] = 0x3347, [0x0dbf] = 0x3348, [0x0dc0] = 0x3349,
--  [0x0dc1] = 0x334a, [0x0dc2] = 0x334b, [0x0dc3] = 0x334c, [0x0dc4] = 0x334d,
--  [0x0dc5] = 0x334e, [0x0dc6] = 0x334f, [0x0dc7] = 0x3350, [0x0dc8] = 0x3351,
--  [0x0dc9] = 0x3352, [0x0dca] = 0x3353, [0x0dcb] = 0x3354, [0x0dcc] = 0x3355,
--  [0x0dcd] = 0x3356, [0x0dce] = 0x3357, [0x0dcf] = 0x3358, [0x0dd0] = 0x3359,
--  [0x0dd1] = 0x335a, [0x0dd2] = 0x335b, [0x0dd3] = 0x335c, [0x0dd4] = 0x335d,
--  [0x0dd5] = 0x335e, [0x0dd6] = 0x335f, [0x0dd7] = 0x3360, [0x0dd8] = 0x3361,
--  [0x0dd9] = 0x3362, [0x0dda] = 0x3363, [0x0ddb] = 0x3364, [0x0ddc] = 0x3365,
--  [0x0ddd] = 0x3366, [0x0dde] = 0x3367, [0x0ddf] = 0x3368, [0x0de0] = 0x3369,
--  [0x0de1] = 0x336a, [0x0de2] = 0x336b, [0x0de3] = 0x336c, [0x0de4] = 0x336d,
--  [0x0de5] = 0x336e, [0x0de6] = 0x336f, [0x0de7] = 0x3370, [0x0de8] = 0x3371,
--  [0x0de9] = 0x3372, [0x0dea] = 0x3373, [0x0deb] = 0x3374, [0x0dec] = 0x3375,
--  [0x0ded] = 0x3376, [0x0dee] = 0x3377, [0x0def] = 0x3378, [0x0df0] = 0x3379,
--  [0x0df1] = 0x337a, [0x0df2] = 0x337b, [0x0df3] = 0x337c, [0x0df4] = 0x337d,
--  [0x0df5] = 0x337e, [0x0df6] = 0x337f, [0x0df7] = 0x3380, [0x0df8] = 0x3381,
--  [0x0df9] = 0x3382, [0x0dfa] = 0x3383, [0x0dfb] = 0x3384, [0x0dfc] = 0x3385,
--  [0x0dfd] = 0x3386, [0x0dfe] = 0x3387, [0x0dff] = 0x3388, [0x0e00] = 0x3389,
--  [0x0e01] = 0x338a, [0x0e02] = 0x338b, [0x0e03] = 0x338c, [0x0e04] = 0x338d,
--  [0x0e05] = 0x3390, [0x0e06] = 0x3391, [0x0e07] = 0x3392, [0x0e08] = 0x3393,
--  [0x0e09] = 0x3394, [0x0e0a] = 0x3395, [0x0e0b] = 0x3396, [0x0e0c] = 0x3397,
--  [0x0e0d] = 0x3398, [0x0e0e] = 0x3399, [0x0e0f] = 0x339a, [0x0e10] = 0x339b,
--  [0x0e11] = 0x339f, [0x0e12] = 0x33a0, [0x0e13] = 0x33a2, [0x0e14] = 0x33a3,
--  [0x0e15] = 0x33a4, [0x0e16] = 0x33a5, [0x0e17] = 0x33a6, [0x0e18] = 0x33a7,
--  [0x0e19] = 0x33a8, [0x0e1a] = 0x33a9, [0x0e1b] = 0x33aa, [0x0e1c] = 0x33ab,
--  [0x0e1d] = 0x33ac, [0x0e1e] = 0x33ad, [0x0e1f] = 0x33ae, [0x0e20] = 0x33af,
--  [0x0e21] = 0x33b0, [0x0e22] = 0x33b1, [0x0e23] = 0x33b2, [0x0e24] = 0x33b3,
--  [0x0e25] = 0x33b4, [0x0e26] = 0x33b5, [0x0e27] = 0x33b6, [0x0e28] = 0x33b7,
--  [0x0e29] = 0x33b8, [0x0e2a] = 0x33b9, [0x0e2b] = 0x33ba, [0x0e2c] = 0x33bb,
--  [0x0e2d] = 0x33bc, [0x0e2e] = 0x33bd, [0x0e2f] = 0x33be, [0x0e30] = 0x33bf,
--  [0x0e31] = 0x33c0, [0x0e32] = 0x33c1, [0x0e33] = 0x33c2, [0x0e34] = 0x33c3,
--  [0x0e35] = 0x33c5, [0x0e36] = 0x33c6, [0x0e37] = 0x33c7, [0x0e38] = 0x33c8,
--  [0x0e39] = 0x33c9, [0x0e3a] = 0x33ca, [0x0e3b] = 0x33cb, [0x0e3c] = 0x33cc,
--  [0x0e3d] = 0x33cd, [0x0e3e] = 0x33cf, [0x0e3f] = 0x33d0, [0x0e40] = 0x33d3,
--  [0x0e41] = 0x33d4, [0x0e42] = 0x33d6, [0x0e43] = 0x33d7, [0x0e44] = 0x33d8,
--  [0x0e45] = 0x33d9, [0x0e46] = 0x33da, [0x0e47] = 0x33db, [0x0e48] = 0x33dc,
--  [0x0e49] = 0x33dd, [0x0e4a] = 0x33de, [0x0e4b] = 0x33df, [0x0e4c] = 0x33e0,
--  [0x0e4d] = 0x33e1, [0x0e4e] = 0x33e2, [0x0e4f] = 0x33e3, [0x0e50] = 0x33e4,
--  [0x0e51] = 0x33e5, [0x0e52] = 0x33e6, [0x0e53] = 0x33e7, [0x0e54] = 0x33e8,
--  [0x0e55] = 0x33e9, [0x0e56] = 0x33ea, [0x0e57] = 0x33eb, [0x0e58] = 0x33ec,
--  [0x0e59] = 0x33ed, [0x0e5a] = 0x33ee, [0x0e5b] = 0x33ef, [0x0e5c] = 0x33f0,
--  [0x0e5d] = 0x33f1, [0x0e5e] = 0x33f2, [0x0e5f] = 0x33f3, [0x0e60] = 0x33f4,
--  [0x0e61] = 0x33f5, [0x0e62] = 0x33f6, [0x0e63] = 0x33f7, [0x0e64] = 0x33f8,
--  [0x0e65] = 0x33f9, [0x0e66] = 0x33fa, [0x0e67] = 0x33fb, [0x0e68] = 0x33fc,
--  [0x0e69] = 0x33fd, [0x0e6a] = 0x33fe, [0x0e6b] = 0x33ff, [0x0e6c] = 0x3400,
--  [0x0e6d] = 0x3401, [0x0e6e] = 0x3402, [0x0e6f] = 0x3403, [0x0e70] = 0x3404,
--  [0x0e71] = 0x3405, [0x0e72] = 0x3406, [0x0e73] = 0x3407, [0x0e74] = 0x3408,
--  [0x0e75] = 0x3409, [0x0e76] = 0x340a, [0x0e77] = 0x340b, [0x0e78] = 0x340c,
--  [0x0e79] = 0x340d, [0x0e7a] = 0x340e, [0x0e7b] = 0x340f, [0x0e7c] = 0x3410,
--  [0x0e7d] = 0x3411, [0x0e7e] = 0x3412, [0x0e7f] = 0x3413, [0x0e80] = 0x3414,
--  [0x0e81] = 0x3415, [0x0e82] = 0x3416, [0x0e83] = 0x3417, [0x0e84] = 0x3418,
--  [0x0e85] = 0x3419, [0x0e86] = 0x341a, [0x0e87] = 0x341b, [0x0e88] = 0x341c,
--  [0x0e89] = 0x341d, [0x0e8a] = 0x341e, [0x0e8b] = 0x341f, [0x0e8c] = 0x3420,
--  [0x0e8d] = 0x3421, [0x0e8e] = 0x3422, [0x0e8f] = 0x3423, [0x0e90] = 0x3424,
--  [0x0e91] = 0x3425, [0x0e92] = 0x3426, [0x0e93] = 0x3427, [0x0e94] = 0x3428,
--  [0x0e95] = 0x3429, [0x0e96] = 0x342a, [0x0e97] = 0x342b, [0x0e98] = 0x342c,
--  [0x0e99] = 0x342d, [0x0e9a] = 0x342e, [0x0e9b] = 0x342f, [0x0e9c] = 0x3430,
--  [0x0e9d] = 0x3431, [0x0e9e] = 0x3432, [0x0e9f] = 0x3433, [0x0ea0] = 0x3434,
--  [0x0ea1] = 0x3435, [0x0ea2] = 0x3436, [0x0ea3] = 0x3437, [0x0ea4] = 0x3438,
--  [0x0ea5] = 0x3439, [0x0ea6] = 0x343a, [0x0ea7] = 0x343b, [0x0ea8] = 0x343c,
--  [0x0ea9] = 0x343d, [0x0eaa] = 0x343e, [0x0eab] = 0x343f, [0x0eac] = 0x3440,
--  [0x0ead] = 0x3441, [0x0eae] = 0x3442, [0x0eaf] = 0x3443, [0x0eb0] = 0x3444,
--  [0x0eb1] = 0x3445, [0x0eb2] = 0x3446, [0x0eb3] = 0x3448, [0x0eb4] = 0x3449,
--  [0x0eb5] = 0x344a, [0x0eb6] = 0x344b, [0x0eb7] = 0x344c, [0x0eb8] = 0x344d,
--  [0x0eb9] = 0x344e, [0x0eba] = 0x344f, [0x0ebb] = 0x3450, [0x0ebc] = 0x3451,
--  [0x0ebd] = 0x3452, [0x0ebe] = 0x3453, [0x0ebf] = 0x3454, [0x0ec0] = 0x3455,
--  [0x0ec1] = 0x3456, [0x0ec2] = 0x3457, [0x0ec3] = 0x3458, [0x0ec4] = 0x3459,
--  [0x0ec5] = 0x345a, [0x0ec6] = 0x345b, [0x0ec7] = 0x345c, [0x0ec8] = 0x345d,
--  [0x0ec9] = 0x345e, [0x0eca] = 0x345f, [0x0ecb] = 0x3460, [0x0ecc] = 0x3461,
--  [0x0ecd] = 0x3462, [0x0ece] = 0x3463, [0x0ecf] = 0x3464, [0x0ed0] = 0x3465,
--  [0x0ed1] = 0x3466, [0x0ed2] = 0x3467, [0x0ed3] = 0x3468, [0x0ed4] = 0x3469,
--  [0x0ed5] = 0x346a, [0x0ed6] = 0x346b, [0x0ed7] = 0x346c, [0x0ed8] = 0x346d,
--  [0x0ed9] = 0x346e, [0x0eda] = 0x346f, [0x0edb] = 0x3470, [0x0edc] = 0x3471,
--  [0x0edd] = 0x3472, [0x0ede] = 0x3474, [0x0edf] = 0x3475, [0x0ee0] = 0x3476,
--  [0x0ee1] = 0x3477, [0x0ee2] = 0x3478, [0x0ee3] = 0x3479, [0x0ee4] = 0x347a,
--  [0x0ee5] = 0x347b, [0x0ee6] = 0x347c, [0x0ee7] = 0x347d, [0x0ee8] = 0x347e,
--  [0x0ee9] = 0x347f, [0x0eea] = 0x3480, [0x0eeb] = 0x3481, [0x0eec] = 0x3482,
--  [0x0eed] = 0x3483, [0x0eee] = 0x3484, [0x0eef] = 0x3485, [0x0ef0] = 0x3486,
--  [0x0ef1] = 0x3487, [0x0ef2] = 0x3488, [0x0ef3] = 0x3489, [0x0ef4] = 0x348a,
--  [0x0ef5] = 0x348b, [0x0ef6] = 0x348c, [0x0ef7] = 0x348d, [0x0ef8] = 0x348e,
--  [0x0ef9] = 0x348f, [0x0efa] = 0x3490, [0x0efb] = 0x3491, [0x0efc] = 0x3492,
--  [0x0efd] = 0x3493, [0x0efe] = 0x3494, [0x0eff] = 0x3495, [0x0f00] = 0x3496,
--  [0x0f01] = 0x3497, [0x0f02] = 0x3498, [0x0f03] = 0x3499, [0x0f04] = 0x349a,
--  [0x0f05] = 0x349b, [0x0f06] = 0x349c, [0x0f07] = 0x349d, [0x0f08] = 0x349e,
--  [0x0f09] = 0x349f, [0x0f0a] = 0x34a0, [0x0f0b] = 0x34a1, [0x0f0c] = 0x34a2,
--  [0x0f0d] = 0x34a3, [0x0f0e] = 0x34a4, [0x0f0f] = 0x34a5, [0x0f10] = 0x34a6,
--  [0x0f11] = 0x34a7, [0x0f12] = 0x34a8, [0x0f13] = 0x34a9, [0x0f14] = 0x34aa,
--  [0x0f15] = 0x34ab, [0x0f16] = 0x34ac, [0x0f17] = 0x34ad, [0x0f18] = 0x34ae,
--  [0x0f19] = 0x34af, [0x0f1a] = 0x34b0, [0x0f1b] = 0x34b1, [0x0f1c] = 0x34b2,
--  [0x0f1d] = 0x34b3, [0x0f1e] = 0x34b4, [0x0f1f] = 0x34b5, [0x0f20] = 0x34b6,
--  [0x0f21] = 0x34b7, [0x0f22] = 0x34b8, [0x0f23] = 0x34b9, [0x0f24] = 0x34ba,
--  [0x0f25] = 0x34bb, [0x0f26] = 0x34bc, [0x0f27] = 0x34bd, [0x0f28] = 0x34be,
--  [0x0f29] = 0x34bf, [0x0f2a] = 0x34c0, [0x0f2b] = 0x34c1, [0x0f2c] = 0x34c2,
--  [0x0f2d] = 0x34c3, [0x0f2e] = 0x34c4, [0x0f2f] = 0x34c5, [0x0f30] = 0x34c6,
--  [0x0f31] = 0x34c7, [0x0f32] = 0x34c8, [0x0f33] = 0x34c9, [0x0f34] = 0x34ca,
--  [0x0f35] = 0x34cb, [0x0f36] = 0x34cc, [0x0f37] = 0x34cd, [0x0f38] = 0x34ce,
--  [0x0f39] = 0x34cf, [0x0f3a] = 0x34d0, [0x0f3b] = 0x34d1, [0x0f3c] = 0x34d2,
--  [0x0f3d] = 0x34d3, [0x0f3e] = 0x34d4, [0x0f3f] = 0x34d5, [0x0f40] = 0x34d6,
--  [0x0f41] = 0x34d7, [0x0f42] = 0x34d8, [0x0f43] = 0x34d9, [0x0f44] = 0x34da,
--  [0x0f45] = 0x34db, [0x0f46] = 0x34dc, [0x0f47] = 0x34dd, [0x0f48] = 0x34de,
--  [0x0f49] = 0x34df, [0x0f4a] = 0x34e0, [0x0f4b] = 0x34e1, [0x0f4c] = 0x34e2,
--  [0x0f4d] = 0x34e3, [0x0f4e] = 0x34e4, [0x0f4f] = 0x34e5, [0x0f50] = 0x34e6,
--  [0x0f51] = 0x34e7, [0x0f52] = 0x34e8, [0x0f53] = 0x34e9, [0x0f54] = 0x34ea,
--  [0x0f55] = 0x34eb, [0x0f56] = 0x34ec, [0x0f57] = 0x34ed, [0x0f58] = 0x34ee,
--  [0x0f59] = 0x34ef, [0x0f5a] = 0x34f0, [0x0f5b] = 0x34f1, [0x0f5c] = 0x34f2,
--  [0x0f5d] = 0x34f3, [0x0f5e] = 0x34f4, [0x0f5f] = 0x34f5, [0x0f60] = 0x34f6,
--  [0x0f61] = 0x34f7, [0x0f62] = 0x34f8, [0x0f63] = 0x34f9, [0x0f64] = 0x34fa,
--  [0x0f65] = 0x34fb, [0x0f66] = 0x34fc, [0x0f67] = 0x34fd, [0x0f68] = 0x34fe,
--  [0x0f69] = 0x34ff, [0x0f6a] = 0x3500, [0x0f6b] = 0x3501, [0x0f6c] = 0x3502,
--  [0x0f6d] = 0x3503, [0x0f6e] = 0x3504, [0x0f6f] = 0x3505, [0x0f70] = 0x3506,
--  [0x0f71] = 0x3507, [0x0f72] = 0x3508, [0x0f73] = 0x3509, [0x0f74] = 0x350a,
--  [0x0f75] = 0x350b, [0x0f76] = 0x350c, [0x0f77] = 0x350d, [0x0f78] = 0x350e,
--  [0x0f79] = 0x350f, [0x0f7a] = 0x3510, [0x0f7b] = 0x3511, [0x0f7c] = 0x3512,
--  [0x0f7d] = 0x3513, [0x0f7e] = 0x3514, [0x0f7f] = 0x3515, [0x0f80] = 0x3516,
--  [0x0f81] = 0x3517, [0x0f82] = 0x3518, [0x0f83] = 0x3519, [0x0f84] = 0x351a,
--  [0x0f85] = 0x351b, [0x0f86] = 0x351c, [0x0f87] = 0x351d, [0x0f88] = 0x351e,
--  [0x0f89] = 0x351f, [0x0f8a] = 0x3520, [0x0f8b] = 0x3521, [0x0f8c] = 0x3522,
--  [0x0f8d] = 0x3523, [0x0f8e] = 0x3524, [0x0f8f] = 0x3525, [0x0f90] = 0x3526,
--  [0x0f91] = 0x3527, [0x0f92] = 0x3528, [0x0f93] = 0x3529, [0x0f94] = 0x352a,
--  [0x0f95] = 0x352b, [0x0f96] = 0x352c, [0x0f97] = 0x352d, [0x0f98] = 0x352e,
--  [0x0f99] = 0x352f, [0x0f9a] = 0x3530, [0x0f9b] = 0x3531, [0x0f9c] = 0x3532,
--  [0x0f9d] = 0x3533, [0x0f9e] = 0x3534, [0x0f9f] = 0x3535, [0x0fa0] = 0x3536,
--  [0x0fa1] = 0x3537, [0x0fa2] = 0x3538, [0x0fa3] = 0x3539, [0x0fa4] = 0x353a,
--  [0x0fa5] = 0x353b, [0x0fa6] = 0x353c, [0x0fa7] = 0x353d, [0x0fa8] = 0x353e,
--  [0x0fa9] = 0x353f, [0x0faa] = 0x3540, [0x0fab] = 0x3541, [0x0fac] = 0x3542,
--  [0x0fad] = 0x3543, [0x0fae] = 0x3544, [0x0faf] = 0x3545, [0x0fb0] = 0x3546,
--  [0x0fb1] = 0x3547, [0x0fb2] = 0x3548, [0x0fb3] = 0x3549, [0x0fb4] = 0x354a,
--  [0x0fb5] = 0x354b, [0x0fb6] = 0x354c, [0x0fb7] = 0x354d, [0x0fb8] = 0x354e,
--  [0x0fb9] = 0x354f, [0x0fba] = 0x3550, [0x0fbb] = 0x3551, [0x0fbc] = 0x3552,
--  [0x0fbd] = 0x3553, [0x0fbe] = 0x3554, [0x0fbf] = 0x3555, [0x0fc0] = 0x3556,
--  [0x0fc1] = 0x3557, [0x0fc2] = 0x3558, [0x0fc3] = 0x3559, [0x0fc4] = 0x355a,
--  [0x0fc5] = 0x355b, [0x0fc6] = 0x355c, [0x0fc7] = 0x355d, [0x0fc8] = 0x355e,
--  [0x0fc9] = 0x355f, [0x0fca] = 0x3560, [0x0fcb] = 0x3561, [0x0fcc] = 0x3562,
--  [0x0fcd] = 0x3563, [0x0fce] = 0x3564, [0x0fcf] = 0x3565, [0x0fd0] = 0x3566,
--  [0x0fd1] = 0x3567, [0x0fd2] = 0x3568, [0x0fd3] = 0x3569, [0x0fd4] = 0x356a,
--  [0x0fd5] = 0x356b, [0x0fd6] = 0x356c, [0x0fd7] = 0x356d, [0x0fd8] = 0x356e,
--  [0x0fd9] = 0x356f, [0x0fda] = 0x3570, [0x0fdb] = 0x3571, [0x0fdc] = 0x3572,
--  [0x0fdd] = 0x3573, [0x0fde] = 0x3574, [0x0fdf] = 0x3575, [0x0fe0] = 0x3576,
--  [0x0fe1] = 0x3577, [0x0fe2] = 0x3578, [0x0fe3] = 0x3579, [0x0fe4] = 0x357a,
--  [0x0fe5] = 0x357b, [0x0fe6] = 0x357c, [0x0fe7] = 0x357d, [0x0fe8] = 0x357e,
--  [0x0fe9] = 0x357f, [0x0fea] = 0x3580, [0x0feb] = 0x3581, [0x0fec] = 0x3582,
--  [0x0fed] = 0x3583, [0x0fee] = 0x3584, [0x0fef] = 0x3585, [0x0ff0] = 0x3586,
--  [0x0ff1] = 0x3587, [0x0ff2] = 0x3588, [0x0ff3] = 0x3589, [0x0ff4] = 0x358a,
--  [0x0ff5] = 0x358b, [0x0ff6] = 0x358c, [0x0ff7] = 0x358d, [0x0ff8] = 0x358e,
--  [0x0ff9] = 0x358f, [0x0ffa] = 0x3590, [0x0ffb] = 0x3591, [0x0ffc] = 0x3592,
--  [0x0ffd] = 0x3593, [0x0ffe] = 0x3594, [0x0fff] = 0x3595, [0x1000] = 0x3596,
--  [0x1001] = 0x3597, [0x1002] = 0x3598, [0x1003] = 0x3599, [0x1004] = 0x359a,
--  [0x1005] = 0x359b, [0x1006] = 0x359c, [0x1007] = 0x359d, [0x1008] = 0x359f,
--  [0x1009] = 0x35a0, [0x100a] = 0x35a1, [0x100b] = 0x35a2, [0x100c] = 0x35a3,
--  [0x100d] = 0x35a4, [0x100e] = 0x35a5, [0x100f] = 0x35a6, [0x1010] = 0x35a7,
--  [0x1011] = 0x35a8, [0x1012] = 0x35a9, [0x1013] = 0x35aa, [0x1014] = 0x35ab,
--  [0x1015] = 0x35ac, [0x1016] = 0x35ad, [0x1017] = 0x35ae, [0x1018] = 0x35af,
--  [0x1019] = 0x35b0, [0x101a] = 0x35b1, [0x101b] = 0x35b2, [0x101c] = 0x35b3,
--  [0x101d] = 0x35b4, [0x101e] = 0x35b5, [0x101f] = 0x35b6, [0x1020] = 0x35b7,
--  [0x1021] = 0x35b8, [0x1022] = 0x35b9, [0x1023] = 0x35ba, [0x1024] = 0x35bb,
--  [0x1025] = 0x35bc, [0x1026] = 0x35bd, [0x1027] = 0x35be, [0x1028] = 0x35bf,
--  [0x1029] = 0x35c0, [0x102a] = 0x35c1, [0x102b] = 0x35c2, [0x102c] = 0x35c3,
--  [0x102d] = 0x35c4, [0x102e] = 0x35c5, [0x102f] = 0x35c6, [0x1030] = 0x35c7,
--  [0x1031] = 0x35c8, [0x1032] = 0x35c9, [0x1033] = 0x35ca, [0x1034] = 0x35cb,
--  [0x1035] = 0x35cc, [0x1036] = 0x35cd, [0x1037] = 0x35ce, [0x1038] = 0x35cf,
--  [0x1039] = 0x35d0, [0x103a] = 0x35d1, [0x103b] = 0x35d2, [0x103c] = 0x35d3,
--  [0x103d] = 0x35d4, [0x103e] = 0x35d5, [0x103f] = 0x35d6, [0x1040] = 0x35d7,
--  [0x1041] = 0x35d8, [0x1042] = 0x35d9, [0x1043] = 0x35da, [0x1044] = 0x35db,
--  [0x1045] = 0x35dc, [0x1046] = 0x35dd, [0x1047] = 0x35de, [0x1048] = 0x35df,
--  [0x1049] = 0x35e0, [0x104a] = 0x35e1, [0x104b] = 0x35e2, [0x104c] = 0x35e3,
--  [0x104d] = 0x35e4, [0x104e] = 0x35e5, [0x104f] = 0x35e6, [0x1050] = 0x35e7,
--  [0x1051] = 0x35e8, [0x1052] = 0x35e9, [0x1053] = 0x35ea, [0x1054] = 0x35eb,
--  [0x1055] = 0x35ec, [0x1056] = 0x35ed, [0x1057] = 0x35ee, [0x1058] = 0x35ef,
--  [0x1059] = 0x35f0, [0x105a] = 0x35f1, [0x105b] = 0x35f2, [0x105c] = 0x35f3,
--  [0x105d] = 0x35f4, [0x105e] = 0x35f5, [0x105f] = 0x35f6, [0x1060] = 0x35f7,
--  [0x1061] = 0x35f8, [0x1062] = 0x35f9, [0x1063] = 0x35fa, [0x1064] = 0x35fb,
--  [0x1065] = 0x35fc, [0x1066] = 0x35fd, [0x1067] = 0x35fe, [0x1068] = 0x35ff,
--  [0x1069] = 0x3600, [0x106a] = 0x3601, [0x106b] = 0x3602, [0x106c] = 0x3603,
--  [0x106d] = 0x3604, [0x106e] = 0x3605, [0x106f] = 0x3606, [0x1070] = 0x3607,
--  [0x1071] = 0x3608, [0x1072] = 0x3609, [0x1073] = 0x360a, [0x1074] = 0x360b,
--  [0x1075] = 0x360c, [0x1076] = 0x360d, [0x1077] = 0x360f, [0x1078] = 0x3610,
--  [0x1079] = 0x3611, [0x107a] = 0x3612, [0x107b] = 0x3613, [0x107c] = 0x3614,
--  [0x107d] = 0x3615, [0x107e] = 0x3616, [0x107f] = 0x3617, [0x1080] = 0x3618,
--  [0x1081] = 0x3619, [0x137f] = 0x3919, [0x1380] = 0x391a, [0x1381] = 0x391b,
--  [0x1382] = 0x391c, [0x1383] = 0x391d, [0x1384] = 0x391e, [0x1385] = 0x391f,
--  [0x1386] = 0x3920, [0x1387] = 0x3921, [0x1388] = 0x3922, [0x1389] = 0x3923,
--  [0x138a] = 0x3924, [0x138b] = 0x3925, [0x138c] = 0x3926, [0x138d] = 0x3927,
--  [0x138e] = 0x3928, [0x138f] = 0x3929, [0x1390] = 0x392a, [0x1391] = 0x392b,
--  [0x1392] = 0x392c, [0x1393] = 0x392d, [0x1394] = 0x392e, [0x1395] = 0x392f,
--  [0x1396] = 0x3930, [0x1397] = 0x3931, [0x1398] = 0x3932, [0x1399] = 0x3933,
--  [0x139a] = 0x3934, [0x139b] = 0x3935, [0x139c] = 0x3936, [0x139d] = 0x3937,
--  [0x139e] = 0x3938, [0x139f] = 0x3939, [0x13a0] = 0x393a, [0x13a1] = 0x393b,
--  [0x13a2] = 0x393c, [0x13a3] = 0x393d, [0x13a4] = 0x393e, [0x13a5] = 0x393f,
--  [0x13a6] = 0x3940, [0x13a7] = 0x3941, [0x13a8] = 0x3942, [0x13a9] = 0x3943,
--  [0x13aa] = 0x3944, [0x13ab] = 0x3945, [0x13ac] = 0x3946, [0x13ad] = 0x3947,
--  [0x13ae] = 0x3948, [0x13af] = 0x3949, [0x13b0] = 0x394a, [0x13b1] = 0x394b,
--  [0x13b2] = 0x394c, [0x13b3] = 0x394d, [0x13b4] = 0x394e, [0x13b5] = 0x394f,
--  [0x13b6] = 0x3950, [0x13b7] = 0x3951, [0x13b8] = 0x3952, [0x13b9] = 0x3953,
--  [0x13ba] = 0x3954, [0x13bb] = 0x3955, [0x13bc] = 0x3956, [0x13bd] = 0x3957,
--  [0x13be] = 0x3958, [0x13bf] = 0x3959, [0x13c0] = 0x395a, [0x13c1] = 0x395b,
--  [0x13c2] = 0x395c, [0x13c3] = 0x395d, [0x13c4] = 0x395e, [0x13c5] = 0x395f,
--  [0x13c6] = 0x3960, [0x13c7] = 0x3961, [0x13c8] = 0x3962, [0x13c9] = 0x3963,
--  [0x13ca] = 0x3964, [0x13cb] = 0x3965, [0x13cc] = 0x3966, [0x13cd] = 0x3967,
--  [0x13ce] = 0x3968, [0x13cf] = 0x3969, [0x13d0] = 0x396a, [0x13d1] = 0x396b,
--  [0x13d2] = 0x396c, [0x13d3] = 0x396d, [0x13d4] = 0x396f, [0x13d5] = 0x3970,
--  [0x13d6] = 0x3971, [0x13d7] = 0x3972, [0x13d8] = 0x3973, [0x13d9] = 0x3974,
--  [0x13da] = 0x3975, [0x13db] = 0x3976, [0x13dc] = 0x3977, [0x13dd] = 0x3978,
--  [0x13de] = 0x3979, [0x13df] = 0x397a, [0x13e0] = 0x397b, [0x13e1] = 0x397c,
--  [0x13e2] = 0x397d, [0x13e3] = 0x397e, [0x13e4] = 0x397f, [0x13e5] = 0x3980,
--  [0x13e6] = 0x3981, [0x13e7] = 0x3982, [0x13e8] = 0x3983, [0x13e9] = 0x3984,
--  [0x13ea] = 0x3985, [0x13eb] = 0x3986, [0x13ec] = 0x3987, [0x13ed] = 0x3988,
--  [0x13ee] = 0x3989, [0x13ef] = 0x398a, [0x13f0] = 0x398b, [0x13f1] = 0x398c,
--  [0x13f2] = 0x398d, [0x13f3] = 0x398e, [0x13f4] = 0x398f, [0x13f5] = 0x3990,
--  [0x13f6] = 0x3991, [0x13f7] = 0x3992, [0x13f8] = 0x3993, [0x13f9] = 0x3994,
--  [0x13fa] = 0x3995, [0x13fb] = 0x3996, [0x13fc] = 0x3997, [0x13fd] = 0x3998,
--  [0x13fe] = 0x3999, [0x13ff] = 0x399a, [0x1400] = 0x399b, [0x1401] = 0x399c,
--  [0x1402] = 0x399d, [0x1403] = 0x399e, [0x1404] = 0x399f, [0x1405] = 0x39a0,
--  [0x1406] = 0x39a1, [0x1407] = 0x39a2, [0x1408] = 0x39a3, [0x1409] = 0x39a4,
--  [0x140a] = 0x39a5, [0x140b] = 0x39a6, [0x140c] = 0x39a7, [0x140d] = 0x39a8,
--  [0x140e] = 0x39a9, [0x140f] = 0x39aa, [0x1410] = 0x39ab, [0x1411] = 0x39ac,
--  [0x1412] = 0x39ad, [0x1413] = 0x39ae, [0x1414] = 0x39af, [0x1415] = 0x39b0,
--  [0x1416] = 0x39b1, [0x1417] = 0x39b2, [0x1418] = 0x39b3, [0x1419] = 0x39b4,
--  [0x141a] = 0x39b5, [0x141b] = 0x39b6, [0x141c] = 0x39b7, [0x141d] = 0x39b8,
--  [0x141e] = 0x39b9, [0x141f] = 0x39ba, [0x1420] = 0x39bb, [0x1421] = 0x39bc,
--  [0x1422] = 0x39bd, [0x1423] = 0x39be, [0x1424] = 0x39bf, [0x1425] = 0x39c0,
--  [0x1426] = 0x39c1, [0x1427] = 0x39c2, [0x1428] = 0x39c3, [0x1429] = 0x39c4,
--  [0x142a] = 0x39c5, [0x142b] = 0x39c6, [0x142c] = 0x39c7, [0x142d] = 0x39c8,
--  [0x142e] = 0x39c9, [0x142f] = 0x39ca, [0x1430] = 0x39cb, [0x1431] = 0x39cc,
--  [0x1432] = 0x39cd, [0x1433] = 0x39ce, [0x1434] = 0x39d1, [0x1435] = 0x39d2,
--  [0x1436] = 0x39d3, [0x1437] = 0x39d4, [0x1438] = 0x39d5, [0x1439] = 0x39d6,
--  [0x143a] = 0x39d7, [0x143b] = 0x39d8, [0x143c] = 0x39d9, [0x143d] = 0x39da,
--  [0x143e] = 0x39db, [0x143f] = 0x39dc, [0x1440] = 0x39dd, [0x1441] = 0x39de,
--  [0x1442] = 0x39e0, [0x1443] = 0x39e1, [0x1444] = 0x39e2, [0x1445] = 0x39e3,
--  [0x1446] = 0x39e4, [0x1447] = 0x39e5, [0x1448] = 0x39e6, [0x1449] = 0x39e7,
--  [0x144a] = 0x39e8, [0x144b] = 0x39e9, [0x144c] = 0x39ea, [0x144d] = 0x39eb,
--  [0x144e] = 0x39ec, [0x144f] = 0x39ed, [0x1450] = 0x39ee, [0x1451] = 0x39ef,
--  [0x1452] = 0x39f0, [0x1453] = 0x39f1, [0x1454] = 0x39f2, [0x1455] = 0x39f3,
--  [0x1456] = 0x39f4, [0x1457] = 0x39f5, [0x1458] = 0x39f6, [0x1459] = 0x39f7,
--  [0x145a] = 0x39f8, [0x145b] = 0x39f9, [0x145c] = 0x39fa, [0x145d] = 0x39fb,
--  [0x145e] = 0x39fc, [0x145f] = 0x39fd, [0x1460] = 0x39fe, [0x1461] = 0x39ff,
--  [0x1462] = 0x3a00, [0x1463] = 0x3a01, [0x1464] = 0x3a02, [0x1465] = 0x3a03,
--  [0x1466] = 0x3a04, [0x1467] = 0x3a05, [0x1468] = 0x3a06, [0x1469] = 0x3a07,
--  [0x146a] = 0x3a08, [0x146b] = 0x3a09, [0x146c] = 0x3a0a, [0x146d] = 0x3a0b,
--  [0x146e] = 0x3a0c, [0x146f] = 0x3a0d, [0x1470] = 0x3a0e, [0x1471] = 0x3a0f,
--  [0x1472] = 0x3a10, [0x1473] = 0x3a11, [0x1474] = 0x3a12, [0x1475] = 0x3a13,
--  [0x1476] = 0x3a14, [0x1477] = 0x3a15, [0x1478] = 0x3a16, [0x1479] = 0x3a17,
--  [0x147a] = 0x3a18, [0x147b] = 0x3a19, [0x147c] = 0x3a1a, [0x147d] = 0x3a1b,
--  [0x147e] = 0x3a1c, [0x147f] = 0x3a1d, [0x1480] = 0x3a1e, [0x1481] = 0x3a1f,
--  [0x1482] = 0x3a20, [0x1483] = 0x3a21, [0x1484] = 0x3a22, [0x1485] = 0x3a23,
--  [0x1486] = 0x3a24, [0x1487] = 0x3a25, [0x1488] = 0x3a26, [0x1489] = 0x3a27,
--  [0x148a] = 0x3a28, [0x148b] = 0x3a29, [0x148c] = 0x3a2a, [0x148d] = 0x3a2b,
--  [0x148e] = 0x3a2c, [0x148f] = 0x3a2d, [0x1490] = 0x3a2e, [0x1491] = 0x3a2f,
--  [0x1492] = 0x3a30, [0x1493] = 0x3a31, [0x1494] = 0x3a32, [0x1495] = 0x3a33,
--  [0x1496] = 0x3a34, [0x1497] = 0x3a35, [0x1498] = 0x3a36, [0x1499] = 0x3a37,
--  [0x149a] = 0x3a38, [0x149b] = 0x3a39, [0x149c] = 0x3a3a, [0x149d] = 0x3a3b,
--  [0x149e] = 0x3a3c, [0x149f] = 0x3a3d, [0x14a0] = 0x3a3e, [0x14a1] = 0x3a3f,
--  [0x14a2] = 0x3a40, [0x14a3] = 0x3a41, [0x14a4] = 0x3a42, [0x14a5] = 0x3a43,
--  [0x14a6] = 0x3a44, [0x14a7] = 0x3a45, [0x14a8] = 0x3a46, [0x14a9] = 0x3a47,
--  [0x14aa] = 0x3a48, [0x14ab] = 0x3a49, [0x14ac] = 0x3a4a, [0x14ad] = 0x3a4b,
--  [0x14ae] = 0x3a4c, [0x14af] = 0x3a4d, [0x14b0] = 0x3a4e, [0x14b1] = 0x3a4f,
--  [0x14b2] = 0x3a50, [0x14b3] = 0x3a51, [0x14b4] = 0x3a52, [0x14b5] = 0x3a53,
--  [0x14b6] = 0x3a54, [0x14b7] = 0x3a55, [0x14b8] = 0x3a56, [0x14b9] = 0x3a57,
--  [0x14ba] = 0x3a58, [0x14bb] = 0x3a59, [0x14bc] = 0x3a5a, [0x14bd] = 0x3a5b,
--  [0x14be] = 0x3a5c, [0x14bf] = 0x3a5d, [0x14c0] = 0x3a5e, [0x14c1] = 0x3a5f,
--  [0x14c2] = 0x3a60, [0x14c3] = 0x3a61, [0x14c4] = 0x3a62, [0x14c5] = 0x3a63,
--  [0x14c6] = 0x3a64, [0x14c7] = 0x3a65, [0x14c8] = 0x3a66, [0x14c9] = 0x3a67,
--  [0x14ca] = 0x3a68, [0x14cb] = 0x3a69, [0x14cc] = 0x3a6a, [0x14cd] = 0x3a6b,
--  [0x14ce] = 0x3a6c, [0x14cf] = 0x3a6d, [0x14d0] = 0x3a6e, [0x14d1] = 0x3a6f,
--  [0x14d2] = 0x3a70, [0x14d3] = 0x3a71, [0x14d4] = 0x3a72, [0x14d5] = 0x3a74,
--  [0x14d6] = 0x3a75, [0x14d7] = 0x3a76, [0x14d8] = 0x3a77, [0x14d9] = 0x3a78,
--  [0x14da] = 0x3a79, [0x14db] = 0x3a7a, [0x14dc] = 0x3a7b, [0x14dd] = 0x3a7c,
--  [0x14de] = 0x3a7d, [0x14df] = 0x3a7e, [0x14e0] = 0x3a7f, [0x14e1] = 0x3a80,
--  [0x14e2] = 0x3a81, [0x14e3] = 0x3a82, [0x14e4] = 0x3a83, [0x14e5] = 0x3a84,
--  [0x14e6] = 0x3a85, [0x14e7] = 0x3a86, [0x14e8] = 0x3a87, [0x14e9] = 0x3a88,
--  [0x14ea] = 0x3a89, [0x14eb] = 0x3a8a, [0x14ec] = 0x3a8b, [0x14ed] = 0x3a8c,
--  [0x14ee] = 0x3a8d, [0x14ef] = 0x3a8e, [0x14f0] = 0x3a8f, [0x14f1] = 0x3a90,
--  [0x14f2] = 0x3a91, [0x14f3] = 0x3a92, [0x14f4] = 0x3a93, [0x14f5] = 0x3a94,
--  [0x14f6] = 0x3a95, [0x14f7] = 0x3a96, [0x14f8] = 0x3a97, [0x14f9] = 0x3a98,
--  [0x14fa] = 0x3a99, [0x14fb] = 0x3a9a, [0x14fc] = 0x3a9b, [0x14fd] = 0x3a9c,
--  [0x14fe] = 0x3a9d, [0x14ff] = 0x3a9e, [0x1500] = 0x3a9f, [0x1501] = 0x3aa0,
--  [0x1502] = 0x3aa1, [0x1503] = 0x3aa2, [0x1504] = 0x3aa3, [0x1505] = 0x3aa4,
--  [0x1506] = 0x3aa5, [0x1507] = 0x3aa6, [0x1508] = 0x3aa7, [0x1509] = 0x3aa8,
--  [0x150a] = 0x3aa9, [0x150b] = 0x3aaa, [0x150c] = 0x3aab, [0x150d] = 0x3aac,
--  [0x150e] = 0x3aad, [0x150f] = 0x3aae, [0x1510] = 0x3aaf, [0x1511] = 0x3ab0,
--  [0x1512] = 0x3ab1, [0x1513] = 0x3ab2, [0x1514] = 0x3ab3, [0x1515] = 0x3ab4,
--  [0x1516] = 0x3ab5, [0x1517] = 0x3ab6, [0x1518] = 0x3ab7, [0x1519] = 0x3ab8,
--  [0x151a] = 0x3ab9, [0x151b] = 0x3aba, [0x151c] = 0x3abb, [0x151d] = 0x3abc,
--  [0x151e] = 0x3abd, [0x151f] = 0x3abe, [0x1520] = 0x3abf, [0x1521] = 0x3ac0,
--  [0x1522] = 0x3ac1, [0x1523] = 0x3ac2, [0x1524] = 0x3ac3, [0x1525] = 0x3ac4,
--  [0x1526] = 0x3ac5, [0x1527] = 0x3ac6, [0x1528] = 0x3ac7, [0x1529] = 0x3ac8,
--  [0x152a] = 0x3ac9, [0x152b] = 0x3aca, [0x152c] = 0x3acb, [0x152d] = 0x3acc,
--  [0x152e] = 0x3acd, [0x152f] = 0x3ace, [0x1530] = 0x3acf, [0x1531] = 0x3ad0,
--  [0x1532] = 0x3ad1, [0x1533] = 0x3ad2, [0x1534] = 0x3ad3, [0x1535] = 0x3ad4,
--  [0x1536] = 0x3ad5, [0x1537] = 0x3ad6, [0x1538] = 0x3ad7, [0x1539] = 0x3ad8,
--  [0x153a] = 0x3ad9, [0x153b] = 0x3ada, [0x153c] = 0x3adb, [0x153d] = 0x3adc,
--  [0x153e] = 0x3add, [0x153f] = 0x3ade, [0x1540] = 0x3adf, [0x1541] = 0x3ae0,
--  [0x1542] = 0x3ae1, [0x1543] = 0x3ae2, [0x1544] = 0x3ae3, [0x1545] = 0x3ae4,
--  [0x1546] = 0x3ae5, [0x1547] = 0x3ae6, [0x1548] = 0x3ae7, [0x1549] = 0x3ae8,
--  [0x154a] = 0x3ae9, [0x154b] = 0x3aea, [0x154c] = 0x3aeb, [0x154d] = 0x3aec,
--  [0x154e] = 0x3aed, [0x154f] = 0x3aee, [0x1550] = 0x3aef, [0x1551] = 0x3af0,
--  [0x1552] = 0x3af1, [0x1553] = 0x3af2, [0x1554] = 0x3af3, [0x1555] = 0x3af4,
--  [0x1556] = 0x3af5, [0x1557] = 0x3af6, [0x1558] = 0x3af7, [0x1559] = 0x3af8,
--  [0x155a] = 0x3af9, [0x155b] = 0x3afa, [0x155c] = 0x3afb, [0x155d] = 0x3afc,
--  [0x155e] = 0x3afd, [0x155f] = 0x3afe, [0x1560] = 0x3aff, [0x1561] = 0x3b00,
--  [0x1562] = 0x3b01, [0x1563] = 0x3b02, [0x1564] = 0x3b03, [0x1565] = 0x3b04,
--  [0x1566] = 0x3b05, [0x1567] = 0x3b06, [0x1568] = 0x3b07, [0x1569] = 0x3b08,
--  [0x156a] = 0x3b09, [0x156b] = 0x3b0a, [0x156c] = 0x3b0b, [0x156d] = 0x3b0c,
--  [0x156e] = 0x3b0d, [0x156f] = 0x3b0e, [0x1570] = 0x3b0f, [0x1571] = 0x3b10,
--  [0x1572] = 0x3b11, [0x1573] = 0x3b12, [0x1574] = 0x3b13, [0x1575] = 0x3b14,
--  [0x1576] = 0x3b15, [0x1577] = 0x3b16, [0x1578] = 0x3b17, [0x1579] = 0x3b18,
--  [0x157a] = 0x3b19, [0x157b] = 0x3b1a, [0x157c] = 0x3b1b, [0x157d] = 0x3b1c,
--  [0x157e] = 0x3b1d, [0x157f] = 0x3b1e, [0x1580] = 0x3b1f, [0x1581] = 0x3b20,
--  [0x1582] = 0x3b21, [0x1583] = 0x3b22, [0x1584] = 0x3b23, [0x1585] = 0x3b24,
--  [0x1586] = 0x3b25, [0x1587] = 0x3b26, [0x1588] = 0x3b27, [0x1589] = 0x3b28,
--  [0x158a] = 0x3b29, [0x158b] = 0x3b2a, [0x158c] = 0x3b2b, [0x158d] = 0x3b2c,
--  [0x158e] = 0x3b2d, [0x158f] = 0x3b2e, [0x1590] = 0x3b2f, [0x1591] = 0x3b30,
--  [0x1592] = 0x3b31, [0x1593] = 0x3b32, [0x1594] = 0x3b33, [0x1595] = 0x3b34,
--  [0x1596] = 0x3b35, [0x1597] = 0x3b36, [0x1598] = 0x3b37, [0x1599] = 0x3b38,
--  [0x159a] = 0x3b39, [0x159b] = 0x3b3a, [0x159c] = 0x3b3b, [0x159d] = 0x3b3c,
--  [0x159e] = 0x3b3d, [0x159f] = 0x3b3e, [0x15a0] = 0x3b3f, [0x15a1] = 0x3b40,
--  [0x15a2] = 0x3b41, [0x15a3] = 0x3b42, [0x15a4] = 0x3b43, [0x15a5] = 0x3b44,
--  [0x15a6] = 0x3b45, [0x15a7] = 0x3b46, [0x15a8] = 0x3b47, [0x15a9] = 0x3b48,
--  [0x15aa] = 0x3b49, [0x15ab] = 0x3b4a, [0x15ac] = 0x3b4b, [0x15ad] = 0x3b4c,
--  [0x15ae] = 0x3b4d, [0x15af] = 0x3b4f, [0x15b0] = 0x3b50, [0x15b1] = 0x3b51,
--  [0x15b2] = 0x3b52, [0x15b3] = 0x3b53, [0x15b4] = 0x3b54, [0x15b5] = 0x3b55,
--  [0x15b6] = 0x3b56, [0x15b7] = 0x3b57, [0x15b8] = 0x3b58, [0x15b9] = 0x3b59,
--  [0x15ba] = 0x3b5a, [0x15bb] = 0x3b5b, [0x15bc] = 0x3b5c, [0x15bd] = 0x3b5d,
--  [0x15be] = 0x3b5e, [0x15bf] = 0x3b5f, [0x15c0] = 0x3b60, [0x15c1] = 0x3b61,
--  [0x15c2] = 0x3b62, [0x15c3] = 0x3b63, [0x15c4] = 0x3b64, [0x15c5] = 0x3b65,
--  [0x15c6] = 0x3b66, [0x15c7] = 0x3b67, [0x15c8] = 0x3b68, [0x15c9] = 0x3b69,
--  [0x15ca] = 0x3b6a, [0x15cb] = 0x3b6b, [0x15cc] = 0x3b6c, [0x15cd] = 0x3b6d,
--  [0x15ce] = 0x3b6e, [0x15cf] = 0x3b6f, [0x15d0] = 0x3b70, [0x15d1] = 0x3b71,
--  [0x15d2] = 0x3b72, [0x15d3] = 0x3b73, [0x15d4] = 0x3b74, [0x15d5] = 0x3b75,
--  [0x15d6] = 0x3b76, [0x15d7] = 0x3b77, [0x15d8] = 0x3b78, [0x15d9] = 0x3b79,
--  [0x15da] = 0x3b7a, [0x15db] = 0x3b7b, [0x15dc] = 0x3b7c, [0x15dd] = 0x3b7d,
--  [0x15de] = 0x3b7e, [0x15df] = 0x3b7f, [0x15e0] = 0x3b80, [0x15e1] = 0x3b81,
--  [0x15e2] = 0x3b82, [0x15e3] = 0x3b83, [0x15e4] = 0x3b84, [0x15e5] = 0x3b85,
--  [0x15e6] = 0x3b86, [0x15e7] = 0x3b87, [0x15e8] = 0x3b88, [0x15e9] = 0x3b89,
--  [0x15ea] = 0x3b8a, [0x15eb] = 0x3b8b, [0x15ec] = 0x3b8c, [0x15ed] = 0x3b8d,
--  [0x15ee] = 0x3b8e, [0x15ef] = 0x3b8f, [0x15f0] = 0x3b90, [0x15f1] = 0x3b91,
--  [0x15f2] = 0x3b92, [0x15f3] = 0x3b93, [0x15f4] = 0x3b94, [0x15f5] = 0x3b95,
--  [0x15f6] = 0x3b96, [0x15f7] = 0x3b97, [0x15f8] = 0x3b98, [0x15f9] = 0x3b99,
--  [0x15fa] = 0x3b9a, [0x15fb] = 0x3b9b, [0x15fc] = 0x3b9c, [0x15fd] = 0x3b9d,
--  [0x15fe] = 0x3b9e, [0x15ff] = 0x3b9f, [0x1600] = 0x3ba0, [0x1601] = 0x3ba1,
--  [0x1602] = 0x3ba2, [0x1603] = 0x3ba3, [0x1604] = 0x3ba4, [0x1605] = 0x3ba5,
--  [0x1606] = 0x3ba6, [0x1607] = 0x3ba7, [0x1608] = 0x3ba8, [0x1609] = 0x3ba9,
--  [0x160a] = 0x3baa, [0x160b] = 0x3bab, [0x160c] = 0x3bac, [0x160d] = 0x3bad,
--  [0x160e] = 0x3bae, [0x160f] = 0x3baf, [0x1610] = 0x3bb0, [0x1611] = 0x3bb1,
--  [0x1612] = 0x3bb2, [0x1613] = 0x3bb3, [0x1614] = 0x3bb4, [0x1615] = 0x3bb5,
--  [0x1616] = 0x3bb6, [0x1617] = 0x3bb7, [0x1618] = 0x3bb8, [0x1619] = 0x3bb9,
--  [0x161a] = 0x3bba, [0x161b] = 0x3bbb, [0x161c] = 0x3bbc, [0x161d] = 0x3bbd,
--  [0x161e] = 0x3bbe, [0x161f] = 0x3bbf, [0x1620] = 0x3bc0, [0x1621] = 0x3bc1,
--  [0x1622] = 0x3bc2, [0x1623] = 0x3bc3, [0x1624] = 0x3bc4, [0x1625] = 0x3bc5,
--  [0x1626] = 0x3bc6, [0x1627] = 0x3bc7, [0x1628] = 0x3bc8, [0x1629] = 0x3bc9,
--  [0x162a] = 0x3bca, [0x162b] = 0x3bcb, [0x162c] = 0x3bcc, [0x162d] = 0x3bcd,
--  [0x162e] = 0x3bce, [0x162f] = 0x3bcf, [0x1630] = 0x3bd0, [0x1631] = 0x3bd1,
--  [0x1632] = 0x3bd2, [0x1633] = 0x3bd3, [0x1634] = 0x3bd4, [0x1635] = 0x3bd5,
--  [0x1636] = 0x3bd6, [0x1637] = 0x3bd7, [0x1638] = 0x3bd8, [0x1639] = 0x3bd9,
--  [0x163a] = 0x3bda, [0x163b] = 0x3bdb, [0x163c] = 0x3bdc, [0x163d] = 0x3bdd,
--  [0x163e] = 0x3bde, [0x163f] = 0x3bdf, [0x1640] = 0x3be0, [0x1641] = 0x3be1,
--  [0x1642] = 0x3be2, [0x1643] = 0x3be3, [0x1644] = 0x3be4, [0x1645] = 0x3be5,
--  [0x1646] = 0x3be6, [0x1647] = 0x3be7, [0x1648] = 0x3be8, [0x1649] = 0x3be9,
--  [0x164a] = 0x3bea, [0x164b] = 0x3beb, [0x164c] = 0x3bec, [0x164d] = 0x3bed,
--  [0x164e] = 0x3bee, [0x164f] = 0x3bef, [0x1650] = 0x3bf0, [0x1651] = 0x3bf1,
--  [0x1652] = 0x3bf2, [0x1653] = 0x3bf3, [0x1654] = 0x3bf4, [0x1655] = 0x3bf5,
--  [0x1656] = 0x3bf6, [0x1657] = 0x3bf7, [0x1658] = 0x3bf8, [0x1659] = 0x3bf9,
--  [0x165a] = 0x3bfa, [0x165b] = 0x3bfb, [0x165c] = 0x3bfc, [0x165d] = 0x3bfd,
--  [0x165e] = 0x3bfe, [0x165f] = 0x3bff, [0x1660] = 0x3c00, [0x1661] = 0x3c01,
--  [0x1662] = 0x3c02, [0x1663] = 0x3c03, [0x1664] = 0x3c04, [0x1665] = 0x3c05,
--  [0x1666] = 0x3c06, [0x1667] = 0x3c07, [0x1668] = 0x3c08, [0x1669] = 0x3c09,
--  [0x166a] = 0x3c0a, [0x166b] = 0x3c0b, [0x166c] = 0x3c0c, [0x166d] = 0x3c0d,
--  [0x166e] = 0x3c0e, [0x166f] = 0x3c0f, [0x1670] = 0x3c10, [0x1671] = 0x3c11,
--  [0x1672] = 0x3c12, [0x1673] = 0x3c13, [0x1674] = 0x3c14, [0x1675] = 0x3c15,
--  [0x1676] = 0x3c16, [0x1677] = 0x3c17, [0x1678] = 0x3c18, [0x1679] = 0x3c19,
--  [0x167a] = 0x3c1a, [0x167b] = 0x3c1b, [0x167c] = 0x3c1c, [0x167d] = 0x3c1d,
--  [0x167e] = 0x3c1e, [0x167f] = 0x3c1f, [0x1680] = 0x3c20, [0x1681] = 0x3c21,
--  [0x1682] = 0x3c22, [0x1683] = 0x3c23, [0x1684] = 0x3c24, [0x1685] = 0x3c25,
--  [0x1686] = 0x3c26, [0x1687] = 0x3c27, [0x1688] = 0x3c28, [0x1689] = 0x3c29,
--  [0x168a] = 0x3c2a, [0x168b] = 0x3c2b, [0x168c] = 0x3c2c, [0x168d] = 0x3c2d,
--  [0x168e] = 0x3c2e, [0x168f] = 0x3c2f, [0x1690] = 0x3c30, [0x1691] = 0x3c31,
--  [0x1692] = 0x3c32, [0x1693] = 0x3c33, [0x1694] = 0x3c34, [0x1695] = 0x3c35,
--  [0x1696] = 0x3c36, [0x1697] = 0x3c37, [0x1698] = 0x3c38, [0x1699] = 0x3c39,
--  [0x169a] = 0x3c3a, [0x169b] = 0x3c3b, [0x169c] = 0x3c3c, [0x169d] = 0x3c3d,
--  [0x169e] = 0x3c3e, [0x169f] = 0x3c3f, [0x16a0] = 0x3c40, [0x16a1] = 0x3c41,
--  [0x16a2] = 0x3c42, [0x16a3] = 0x3c43, [0x16a4] = 0x3c44, [0x16a5] = 0x3c45,
--  [0x16a6] = 0x3c46, [0x16a7] = 0x3c47, [0x16a8] = 0x3c48, [0x16a9] = 0x3c49,
--  [0x16aa] = 0x3c4a, [0x16ab] = 0x3c4b, [0x16ac] = 0x3c4c, [0x16ad] = 0x3c4d,
--  [0x16ae] = 0x3c4e, [0x16af] = 0x3c4f, [0x16b0] = 0x3c50, [0x16b1] = 0x3c51,
--  [0x16b2] = 0x3c52, [0x16b3] = 0x3c53, [0x16b4] = 0x3c54, [0x16b5] = 0x3c55,
--  [0x16b6] = 0x3c56, [0x16b7] = 0x3c57, [0x16b8] = 0x3c58, [0x16b9] = 0x3c59,
--  [0x16ba] = 0x3c5a, [0x16bb] = 0x3c5b, [0x16bc] = 0x3c5c, [0x16bd] = 0x3c5d,
--  [0x16be] = 0x3c5e, [0x16bf] = 0x3c5f, [0x16c0] = 0x3c60, [0x16c1] = 0x3c61,
--  [0x16c2] = 0x3c62, [0x16c3] = 0x3c63, [0x16c4] = 0x3c64, [0x16c5] = 0x3c65,
--  [0x16c6] = 0x3c66, [0x16c7] = 0x3c67, [0x16c8] = 0x3c68, [0x16c9] = 0x3c69,
--  [0x16ca] = 0x3c6a, [0x16cb] = 0x3c6b, [0x16cc] = 0x3c6c, [0x16cd] = 0x3c6d,
--  [0x16ce] = 0x3c6f, [0x16cf] = 0x3c70, [0x16d0] = 0x3c71, [0x16d1] = 0x3c72,
--  [0x16d2] = 0x3c73, [0x16d3] = 0x3c74, [0x16d4] = 0x3c75, [0x16d5] = 0x3c76,
--  [0x16d6] = 0x3c77, [0x16d7] = 0x3c78, [0x16d8] = 0x3c79, [0x16d9] = 0x3c7a,
--  [0x16da] = 0x3c7b, [0x16db] = 0x3c7c, [0x16dc] = 0x3c7d, [0x16dd] = 0x3c7e,
--  [0x16de] = 0x3c7f, [0x16df] = 0x3c80, [0x16e0] = 0x3c81, [0x16e1] = 0x3c82,
--  [0x16e2] = 0x3c83, [0x16e3] = 0x3c84, [0x16e4] = 0x3c85, [0x16e5] = 0x3c86,
--  [0x16e6] = 0x3c87, [0x16e7] = 0x3c88, [0x16e8] = 0x3c89, [0x16e9] = 0x3c8a,
--  [0x16ea] = 0x3c8b, [0x16eb] = 0x3c8c, [0x16ec] = 0x3c8d, [0x16ed] = 0x3c8e,
--  [0x16ee] = 0x3c8f, [0x16ef] = 0x3c90, [0x16f0] = 0x3c91, [0x16f1] = 0x3c92,
--  [0x16f2] = 0x3c93, [0x16f3] = 0x3c94, [0x16f4] = 0x3c95, [0x16f5] = 0x3c96,
--  [0x16f6] = 0x3c97, [0x16f7] = 0x3c98, [0x16f8] = 0x3c99, [0x16f9] = 0x3c9a,
--  [0x16fa] = 0x3c9b, [0x16fb] = 0x3c9c, [0x16fc] = 0x3c9d, [0x16fd] = 0x3c9e,
--  [0x16fe] = 0x3c9f, [0x16ff] = 0x3ca0, [0x1700] = 0x3ca1, [0x1701] = 0x3ca2,
--  [0x1702] = 0x3ca3, [0x1703] = 0x3ca4, [0x1704] = 0x3ca5, [0x1705] = 0x3ca6,
--  [0x1706] = 0x3ca7, [0x1707] = 0x3ca8, [0x1708] = 0x3ca9, [0x1709] = 0x3caa,
--  [0x170a] = 0x3cab, [0x170b] = 0x3cac, [0x170c] = 0x3cad, [0x170d] = 0x3cae,
--  [0x170e] = 0x3caf, [0x170f] = 0x3cb0, [0x1710] = 0x3cb1, [0x1711] = 0x3cb2,
--  [0x1712] = 0x3cb3, [0x1713] = 0x3cb4, [0x1714] = 0x3cb5, [0x1715] = 0x3cb6,
--  [0x1716] = 0x3cb7, [0x1717] = 0x3cb8, [0x1718] = 0x3cb9, [0x1719] = 0x3cba,
--  [0x171a] = 0x3cbb, [0x171b] = 0x3cbc, [0x171c] = 0x3cbd, [0x171d] = 0x3cbe,
--  [0x171e] = 0x3cbf, [0x171f] = 0x3cc0, [0x1720] = 0x3cc1, [0x1721] = 0x3cc2,
--  [0x1722] = 0x3cc3, [0x1723] = 0x3cc4, [0x1724] = 0x3cc5, [0x1725] = 0x3cc6,
--  [0x1726] = 0x3cc7, [0x1727] = 0x3cc8, [0x1728] = 0x3cc9, [0x1729] = 0x3cca,
--  [0x172a] = 0x3ccb, [0x172b] = 0x3ccc, [0x172c] = 0x3ccd, [0x172d] = 0x3cce,
--  [0x172e] = 0x3ccf, [0x172f] = 0x3cd0, [0x1730] = 0x3cd1, [0x1731] = 0x3cd2,
--  [0x1732] = 0x3cd3, [0x1733] = 0x3cd4, [0x1734] = 0x3cd5, [0x1735] = 0x3cd6,
--  [0x1736] = 0x3cd7, [0x1737] = 0x3cd8, [0x1738] = 0x3cd9, [0x1739] = 0x3cda,
--  [0x173a] = 0x3cdb, [0x173b] = 0x3cdc, [0x173c] = 0x3cdd, [0x173d] = 0x3cde,
--  [0x173e] = 0x3cdf, [0x1ab4] = 0x4057, [0x1ab5] = 0x4058, [0x1ab6] = 0x4059,
--  [0x1ab7] = 0x405a, [0x1ab8] = 0x405b, [0x1ab9] = 0x405c, [0x1aba] = 0x405d,
--  [0x1abb] = 0x405e, [0x1abc] = 0x405f, [0x1abd] = 0x4060, [0x1abe] = 0x4061,
--  [0x1abf] = 0x4062, [0x1ac0] = 0x4063, [0x1ac1] = 0x4064, [0x1ac2] = 0x4065,
--  [0x1ac3] = 0x4066, [0x1ac4] = 0x4067, [0x1ac5] = 0x4068, [0x1ac6] = 0x4069,
--  [0x1ac7] = 0x406a, [0x1ac8] = 0x406b, [0x1ac9] = 0x406c, [0x1aca] = 0x406d,
--  [0x1acb] = 0x406e, [0x1acc] = 0x406f, [0x1acd] = 0x4070, [0x1ace] = 0x4071,
--  [0x1acf] = 0x4072, [0x1ad0] = 0x4073, [0x1ad1] = 0x4074, [0x1ad2] = 0x4075,
--  [0x1ad3] = 0x4076, [0x1ad4] = 0x4077, [0x1ad5] = 0x4078, [0x1ad6] = 0x4079,
--  [0x1ad7] = 0x407a, [0x1ad8] = 0x407b, [0x1ad9] = 0x407c, [0x1ada] = 0x407d,
--  [0x1adb] = 0x407e, [0x1adc] = 0x407f, [0x1add] = 0x4080, [0x1ade] = 0x4081,
--  [0x1adf] = 0x4082, [0x1ae0] = 0x4083, [0x1ae1] = 0x4084, [0x1ae2] = 0x4085,
--  [0x1ae3] = 0x4086, [0x1ae4] = 0x4087, [0x1ae5] = 0x4088, [0x1ae6] = 0x4089,
--  [0x1ae7] = 0x408a, [0x1ae8] = 0x408b, [0x1ae9] = 0x408c, [0x1aea] = 0x408d,
--  [0x1aeb] = 0x408e, [0x1aec] = 0x408f, [0x1aed] = 0x4090, [0x1aee] = 0x4091,
--  [0x1aef] = 0x4092, [0x1af0] = 0x4093, [0x1af1] = 0x4094, [0x1af2] = 0x4095,
--  [0x1af3] = 0x4096, [0x1af4] = 0x4097, [0x1af5] = 0x4098, [0x1af6] = 0x4099,
--  [0x1af7] = 0x409a, [0x1af8] = 0x409b, [0x1af9] = 0x409c, [0x1afa] = 0x409d,
--  [0x1afb] = 0x409e, [0x1afc] = 0x409f, [0x1afd] = 0x40a0, [0x1afe] = 0x40a1,
--  [0x1aff] = 0x40a2, [0x1b00] = 0x40a3, [0x1b01] = 0x40a4, [0x1b02] = 0x40a5,
--  [0x1b03] = 0x40a6, [0x1b04] = 0x40a7, [0x1b05] = 0x40a8, [0x1b06] = 0x40a9,
--  [0x1b07] = 0x40aa, [0x1b08] = 0x40ab, [0x1b09] = 0x40ac, [0x1b0a] = 0x40ad,
--  [0x1b0b] = 0x40ae, [0x1b0c] = 0x40af, [0x1b0d] = 0x40b0, [0x1b0e] = 0x40b1,
--  [0x1b0f] = 0x40b2, [0x1b10] = 0x40b3, [0x1b11] = 0x40b4, [0x1b12] = 0x40b5,
--  [0x1b13] = 0x40b6, [0x1b14] = 0x40b7, [0x1b15] = 0x40b8, [0x1b16] = 0x40b9,
--  [0x1b17] = 0x40ba, [0x1b18] = 0x40bb, [0x1b19] = 0x40bc, [0x1b1a] = 0x40bd,
--  [0x1b1b] = 0x40be, [0x1b1c] = 0x40bf, [0x1b1d] = 0x40c0, [0x1b1e] = 0x40c1,
--  [0x1b1f] = 0x40c2, [0x1b20] = 0x40c3, [0x1b21] = 0x40c4, [0x1b22] = 0x40c5,
--  [0x1b23] = 0x40c6, [0x1b24] = 0x40c7, [0x1b25] = 0x40c8, [0x1b26] = 0x40c9,
--  [0x1b27] = 0x40ca, [0x1b28] = 0x40cb, [0x1b29] = 0x40cc, [0x1b2a] = 0x40cd,
--  [0x1b2b] = 0x40ce, [0x1b2c] = 0x40cf, [0x1b2d] = 0x40d0, [0x1b2e] = 0x40d1,
--  [0x1b2f] = 0x40d2, [0x1b30] = 0x40d3, [0x1b31] = 0x40d4, [0x1b32] = 0x40d5,
--  [0x1b33] = 0x40d6, [0x1b34] = 0x40d7, [0x1b35] = 0x40d8, [0x1b36] = 0x40d9,
--  [0x1b37] = 0x40da, [0x1b38] = 0x40db, [0x1b39] = 0x40dc, [0x1b3a] = 0x40dd,
--  [0x1b3b] = 0x40de, [0x1b3c] = 0x40df, [0x1b3d] = 0x40e0, [0x1b3e] = 0x40e1,
--  [0x1b3f] = 0x40e2, [0x1b40] = 0x40e3, [0x1b41] = 0x40e4, [0x1b42] = 0x40e5,
--  [0x1b43] = 0x40e6, [0x1b44] = 0x40e7, [0x1b45] = 0x40e8, [0x1b46] = 0x40e9,
--  [0x1b47] = 0x40ea, [0x1b48] = 0x40eb, [0x1b49] = 0x40ec, [0x1b4a] = 0x40ed,
--  [0x1b4b] = 0x40ee, [0x1b4c] = 0x40ef, [0x1b4d] = 0x40f0, [0x1b4e] = 0x40f1,
--  [0x1b4f] = 0x40f2, [0x1b50] = 0x40f3, [0x1b51] = 0x40f4, [0x1b52] = 0x40f5,
--  [0x1b53] = 0x40f6, [0x1b54] = 0x40f7, [0x1b55] = 0x40f8, [0x1b56] = 0x40f9,
--  [0x1b57] = 0x40fa, [0x1b58] = 0x40fb, [0x1b59] = 0x40fc, [0x1b5a] = 0x40fd,
--  [0x1b5b] = 0x40fe, [0x1b5c] = 0x40ff, [0x1b5d] = 0x4100, [0x1b5e] = 0x4101,
--  [0x1b5f] = 0x4102, [0x1b60] = 0x4103, [0x1b61] = 0x4104, [0x1b62] = 0x4105,
--  [0x1b63] = 0x4106, [0x1b64] = 0x4107, [0x1b65] = 0x4108, [0x1b66] = 0x4109,
--  [0x1b67] = 0x410a, [0x1b68] = 0x410b, [0x1b69] = 0x410c, [0x1b6a] = 0x410d,
--  [0x1b6b] = 0x410e, [0x1b6c] = 0x410f, [0x1b6d] = 0x4110, [0x1b6e] = 0x4111,
--  [0x1b6f] = 0x4112, [0x1b70] = 0x4113, [0x1b71] = 0x4114, [0x1b72] = 0x4115,
--  [0x1b73] = 0x4116, [0x1b74] = 0x4117, [0x1b75] = 0x4118, [0x1b76] = 0x4119,
--  [0x1b77] = 0x411a, [0x1b78] = 0x411b, [0x1b79] = 0x411c, [0x1b7a] = 0x411d,
--  [0x1b7b] = 0x411e, [0x1b7c] = 0x411f, [0x1b7d] = 0x4120, [0x1b7e] = 0x4121,
--  [0x1b7f] = 0x4122, [0x1b80] = 0x4123, [0x1b81] = 0x4124, [0x1b82] = 0x4125,
--  [0x1b83] = 0x4126, [0x1b84] = 0x4127, [0x1b85] = 0x4128, [0x1b86] = 0x4129,
--  [0x1b87] = 0x412a, [0x1b88] = 0x412b, [0x1b89] = 0x412c, [0x1b8a] = 0x412d,
--  [0x1b8b] = 0x412e, [0x1b8c] = 0x412f, [0x1b8d] = 0x4130, [0x1b8e] = 0x4131,
--  [0x1b8f] = 0x4132, [0x1b90] = 0x4133, [0x1b91] = 0x4134, [0x1b92] = 0x4135,
--  [0x1b93] = 0x4136, [0x1b94] = 0x4137, [0x1b95] = 0x4138, [0x1b96] = 0x4139,
--  [0x1b97] = 0x413a, [0x1b98] = 0x413b, [0x1b99] = 0x413c, [0x1b9a] = 0x413d,
--  [0x1b9b] = 0x413e, [0x1b9c] = 0x413f, [0x1b9d] = 0x4140, [0x1b9e] = 0x4141,
--  [0x1b9f] = 0x4142, [0x1ba0] = 0x4143, [0x1ba1] = 0x4144, [0x1ba2] = 0x4145,
--  [0x1ba3] = 0x4146, [0x1ba4] = 0x4147, [0x1ba5] = 0x4148, [0x1ba6] = 0x4149,
--  [0x1ba7] = 0x414a, [0x1ba8] = 0x414b, [0x1ba9] = 0x414c, [0x1baa] = 0x414d,
--  [0x1bab] = 0x414e, [0x1bac] = 0x414f, [0x1bad] = 0x4150, [0x1bae] = 0x4151,
--  [0x1baf] = 0x4152, [0x1bb0] = 0x4153, [0x1bb1] = 0x4154, [0x1bb2] = 0x4155,
--  [0x1bb3] = 0x4156, [0x1bb4] = 0x4157, [0x1bb5] = 0x4158, [0x1bb6] = 0x4159,
--  [0x1bb7] = 0x415a, [0x1bb8] = 0x415b, [0x1bb9] = 0x415c, [0x1bba] = 0x415d,
--  [0x1bbb] = 0x415e, [0x1d93] = 0x4338, [0x1d94] = 0x4339, [0x1d95] = 0x433a,
--  [0x1d96] = 0x433b, [0x1d97] = 0x433c, [0x1d98] = 0x433d, [0x1d99] = 0x433e,
--  [0x1d9a] = 0x433f, [0x1d9b] = 0x4340, [0x1d9c] = 0x4341, [0x1d9d] = 0x4342,
--  [0x1d9e] = 0x4343, [0x1d9f] = 0x4344, [0x1da0] = 0x4345, [0x1da1] = 0x4346,
--  [0x1da2] = 0x4347, [0x1da3] = 0x4348, [0x1da4] = 0x4349, [0x1da5] = 0x434a,
--  [0x1da6] = 0x434b, [0x1da7] = 0x434c, [0x1da8] = 0x434d, [0x1da9] = 0x434e,
--  [0x1daa] = 0x434f, [0x1dab] = 0x4350, [0x1dac] = 0x4351, [0x1dad] = 0x4352,
--  [0x1dae] = 0x4353, [0x1daf] = 0x4354, [0x1db0] = 0x4355, [0x1db1] = 0x4356,
--  [0x1db2] = 0x4357, [0x1db3] = 0x4358, [0x1db4] = 0x4359, [0x1db5] = 0x435a,
--  [0x1db6] = 0x435b, [0x1db7] = 0x435c, [0x1db8] = 0x435d, [0x1db9] = 0x435e,
--  [0x1dba] = 0x435f, [0x1dbb] = 0x4360, [0x1dbc] = 0x4361, [0x1dbd] = 0x4362,
--  [0x1dbe] = 0x4363, [0x1dbf] = 0x4364, [0x1dc0] = 0x4365, [0x1dc1] = 0x4366,
--  [0x1dc2] = 0x4367, [0x1dc3] = 0x4368, [0x1dc4] = 0x4369, [0x1dc5] = 0x436a,
--  [0x1dc6] = 0x436b, [0x1dc7] = 0x436c, [0x1dc8] = 0x436d, [0x1dc9] = 0x436e,
--  [0x1dca] = 0x436f, [0x1dcb] = 0x4370, [0x1dcc] = 0x4371, [0x1dcd] = 0x4372,
--  [0x1dce] = 0x4373, [0x1dcf] = 0x4374, [0x1dd0] = 0x4375, [0x1dd1] = 0x4376,
--  [0x1dd2] = 0x4377, [0x1dd3] = 0x4378, [0x1dd4] = 0x4379, [0x1dd5] = 0x437a,
--  [0x1dd6] = 0x437b, [0x1dd7] = 0x437c, [0x1dd8] = 0x437d, [0x1dd9] = 0x437e,
--  [0x1dda] = 0x437f, [0x1ddb] = 0x4380, [0x1ddc] = 0x4381, [0x1ddd] = 0x4382,
--  [0x1dde] = 0x4383, [0x1ddf] = 0x4384, [0x1de0] = 0x4385, [0x1de1] = 0x4386,
--  [0x1de2] = 0x4387, [0x1de3] = 0x4388, [0x1de4] = 0x4389, [0x1de5] = 0x438a,
--  [0x1de6] = 0x438b, [0x1de7] = 0x438c, [0x1de8] = 0x438d, [0x1de9] = 0x438e,
--  [0x1dea] = 0x438f, [0x1deb] = 0x4390, [0x1dec] = 0x4391, [0x1ded] = 0x4392,
--  [0x1dee] = 0x4393, [0x1def] = 0x4394, [0x1df0] = 0x4395, [0x1df1] = 0x4396,
--  [0x1df2] = 0x4397, [0x1df3] = 0x4398, [0x1df4] = 0x4399, [0x1df5] = 0x439a,
--  [0x1df6] = 0x439b, [0x1df7] = 0x439c, [0x1df8] = 0x439d, [0x1df9] = 0x439e,
--  [0x1dfa] = 0x439f, [0x1dfb] = 0x43a0, [0x1dfc] = 0x43a1, [0x1dfd] = 0x43a2,
--  [0x1dfe] = 0x43a3, [0x1dff] = 0x43a4, [0x1e00] = 0x43a5, [0x1e01] = 0x43a6,
--  [0x1e02] = 0x43a7, [0x1e03] = 0x43a8, [0x1e04] = 0x43a9, [0x1e05] = 0x43aa,
--  [0x1e06] = 0x43ab, [0x1e07] = 0x43ad, [0x1e08] = 0x43ae, [0x1e09] = 0x43af,
--  [0x1e0a] = 0x43b0, [0x1e0b] = 0x43b2, [0x1e0c] = 0x43b3, [0x1e0d] = 0x43b4,
--  [0x1e0e] = 0x43b5, [0x1e0f] = 0x43b6, [0x1e10] = 0x43b7, [0x1e11] = 0x43b8,
--  [0x1e12] = 0x43b9, [0x1e13] = 0x43ba, [0x1e14] = 0x43bb, [0x1e15] = 0x43bc,
--  [0x1e16] = 0x43bd, [0x1e17] = 0x43be, [0x1e18] = 0x43bf, [0x1e19] = 0x43c0,
--  [0x1e1a] = 0x43c1, [0x1e1b] = 0x43c2, [0x1e1c] = 0x43c3, [0x1e1d] = 0x43c4,
--  [0x1e1e] = 0x43c5, [0x1e1f] = 0x43c6, [0x1e20] = 0x43c7, [0x1e21] = 0x43c8,
--  [0x1e22] = 0x43c9, [0x1e23] = 0x43ca, [0x1e24] = 0x43cb, [0x1e25] = 0x43cc,
--  [0x1e26] = 0x43cd, [0x1e27] = 0x43ce, [0x1e28] = 0x43cf, [0x1e29] = 0x43d0,
--  [0x1e2a] = 0x43d1, [0x1e2b] = 0x43d2, [0x1e2c] = 0x43d3, [0x1e2d] = 0x43d4,
--  [0x1e2e] = 0x43d5, [0x1e2f] = 0x43d6, [0x1e30] = 0x43d7, [0x1e31] = 0x43d8,
--  [0x1e32] = 0x43d9, [0x1e33] = 0x43da, [0x1e34] = 0x43db, [0x1e35] = 0x43dc,
--  [0x1e36] = 0x43de, [0x1e37] = 0x43df, [0x1e38] = 0x43e0, [0x1e39] = 0x43e1,
--  [0x1e3a] = 0x43e2, [0x1e3b] = 0x43e3, [0x1e3c] = 0x43e4, [0x1e3d] = 0x43e5,
--  [0x1e3e] = 0x43e6, [0x1e3f] = 0x43e7, [0x1e40] = 0x43e8, [0x1e41] = 0x43e9,
--  [0x1e42] = 0x43ea, [0x1e43] = 0x43eb, [0x1e44] = 0x43ec, [0x1e45] = 0x43ed,
--  [0x1e46] = 0x43ee, [0x1e47] = 0x43ef, [0x1e48] = 0x43f0, [0x1e49] = 0x43f1,
--  [0x1e4a] = 0x43f2, [0x1e4b] = 0x43f3, [0x1e4c] = 0x43f4, [0x1e4d] = 0x43f5,
--  [0x1e4e] = 0x43f6, [0x1e4f] = 0x43f7, [0x1e50] = 0x43f8, [0x1e51] = 0x43f9,
--  [0x1e52] = 0x43fa, [0x1e53] = 0x43fb, [0x1e54] = 0x43fc, [0x1e55] = 0x43fd,
--  [0x1e56] = 0x43fe, [0x1e57] = 0x43ff, [0x1e58] = 0x4400, [0x1e59] = 0x4401,
--  [0x1e5a] = 0x4402, [0x1e5b] = 0x4403, [0x1e5c] = 0x4404, [0x1e5d] = 0x4405,
--  [0x1e5e] = 0x4406, [0x1e5f] = 0x4407, [0x1e60] = 0x4408, [0x1e61] = 0x4409,
--  [0x1e62] = 0x440a, [0x1e63] = 0x440b, [0x1e64] = 0x440c, [0x1e65] = 0x440d,
--  [0x1e66] = 0x440e, [0x1e67] = 0x440f, [0x1e68] = 0x4410, [0x1e69] = 0x4411,
--  [0x1e6a] = 0x4412, [0x1e6b] = 0x4413, [0x1e6c] = 0x4414, [0x1e6d] = 0x4415,
--  [0x1e6e] = 0x4416, [0x1e6f] = 0x4417, [0x1e70] = 0x4418, [0x1e71] = 0x4419,
--  [0x1e72] = 0x441a, [0x1e73] = 0x441b, [0x1e74] = 0x441c, [0x1e75] = 0x441d,
--  [0x1e76] = 0x441e, [0x1e77] = 0x441f, [0x1e78] = 0x4420, [0x1e79] = 0x4421,
--  [0x1e7a] = 0x4422, [0x1e7b] = 0x4423, [0x1e7c] = 0x4424, [0x1e7d] = 0x4425,
--  [0x1e7e] = 0x4426, [0x1e7f] = 0x4427, [0x1e80] = 0x4428, [0x1e81] = 0x4429,
--  [0x1e82] = 0x442a, [0x1e83] = 0x442b, [0x1e84] = 0x442c, [0x1e85] = 0x442d,
--  [0x1e86] = 0x442e, [0x1e87] = 0x442f, [0x1e88] = 0x4430, [0x1e89] = 0x4431,
--  [0x1e8a] = 0x4432, [0x1e8b] = 0x4433, [0x1e8c] = 0x4434, [0x1e8d] = 0x4435,
--  [0x1e8e] = 0x4436, [0x1e8f] = 0x4437, [0x1e90] = 0x4438, [0x1e91] = 0x4439,
--  [0x1e92] = 0x443a, [0x1e93] = 0x443b, [0x1e94] = 0x443c, [0x1e95] = 0x443d,
--  [0x1e96] = 0x443e, [0x1e97] = 0x443f, [0x1e98] = 0x4440, [0x1e99] = 0x4441,
--  [0x1e9a] = 0x4442, [0x1e9b] = 0x4443, [0x1e9c] = 0x4444, [0x1e9d] = 0x4445,
--  [0x1e9e] = 0x4446, [0x1e9f] = 0x4447, [0x1ea0] = 0x4448, [0x1ea1] = 0x4449,
--  [0x1ea2] = 0x444a, [0x1ea3] = 0x444b, [0x1ea4] = 0x444c, [0x1ea5] = 0x444d,
--  [0x1ea6] = 0x444e, [0x1ea7] = 0x444f, [0x1ea8] = 0x4450, [0x1ea9] = 0x4451,
--  [0x1eaa] = 0x4452, [0x1eab] = 0x4453, [0x1eac] = 0x4454, [0x1ead] = 0x4455,
--  [0x1eae] = 0x4456, [0x1eaf] = 0x4457, [0x1eb0] = 0x4458, [0x1eb1] = 0x4459,
--  [0x1eb2] = 0x445a, [0x1eb3] = 0x445b, [0x1eb4] = 0x445c, [0x1eb5] = 0x445d,
--  [0x1eb6] = 0x445e, [0x1eb7] = 0x445f, [0x1eb8] = 0x4460, [0x1eb9] = 0x4461,
--  [0x1eba] = 0x4462, [0x1ebb] = 0x4463, [0x1ebc] = 0x4464, [0x1ebd] = 0x4465,
--  [0x1ebe] = 0x4466, [0x1ebf] = 0x4467, [0x1ec0] = 0x4468, [0x1ec1] = 0x4469,
--  [0x1ec2] = 0x446a, [0x1ec3] = 0x446b, [0x1ec4] = 0x446c, [0x1ec5] = 0x446d,
--  [0x1ec6] = 0x446e, [0x1ec7] = 0x446f, [0x1ec8] = 0x4470, [0x1ec9] = 0x4471,
--  [0x1eca] = 0x4472, [0x1ecb] = 0x4473, [0x1ecc] = 0x4474, [0x1ecd] = 0x4475,
--  [0x1ece] = 0x4476, [0x1ecf] = 0x4477, [0x1ed0] = 0x4478, [0x1ed1] = 0x4479,
--  [0x1ed2] = 0x447a, [0x1ed3] = 0x447b, [0x1ed4] = 0x447c, [0x1ed5] = 0x447d,
--  [0x1ed6] = 0x447e, [0x1ed7] = 0x447f, [0x1ed8] = 0x4480, [0x1ed9] = 0x4481,
--  [0x1eda] = 0x4482, [0x1edb] = 0x4483, [0x1edc] = 0x4484, [0x1edd] = 0x4485,
--  [0x1ede] = 0x4486, [0x1edf] = 0x4487, [0x1ee0] = 0x4488, [0x1ee1] = 0x4489,
--  [0x1ee2] = 0x448a, [0x1ee3] = 0x448b, [0x1ee4] = 0x448c, [0x1ee5] = 0x448d,
--  [0x1ee6] = 0x448e, [0x1ee7] = 0x448f, [0x1ee8] = 0x4490, [0x1ee9] = 0x4491,
--  [0x1eea] = 0x4492, [0x1eeb] = 0x4493, [0x1eec] = 0x4494, [0x1eed] = 0x4495,
--  [0x1eee] = 0x4496, [0x1eef] = 0x4497, [0x1ef0] = 0x4498, [0x1ef1] = 0x4499,
--  [0x1ef2] = 0x449a, [0x1ef3] = 0x449b, [0x1ef4] = 0x449c, [0x1ef5] = 0x449d,
--  [0x1ef6] = 0x449e, [0x1ef7] = 0x449f, [0x1ef8] = 0x44a0, [0x1ef9] = 0x44a1,
--  [0x1efa] = 0x44a2, [0x1efb] = 0x44a3, [0x1efc] = 0x44a4, [0x1efd] = 0x44a5,
--  [0x1efe] = 0x44a6, [0x1eff] = 0x44a7, [0x1f00] = 0x44a8, [0x1f01] = 0x44a9,
--  [0x1f02] = 0x44aa, [0x1f03] = 0x44ab, [0x1f04] = 0x44ac, [0x1f05] = 0x44ad,
--  [0x1f06] = 0x44ae, [0x1f07] = 0x44af, [0x1f08] = 0x44b0, [0x1f09] = 0x44b1,
--  [0x1f0a] = 0x44b2, [0x1f0b] = 0x44b3, [0x1f0c] = 0x44b4, [0x1f0d] = 0x44b5,
--  [0x1f0e] = 0x44b6, [0x1f0f] = 0x44b7, [0x1f10] = 0x44b8, [0x1f11] = 0x44b9,
--  [0x1f12] = 0x44ba, [0x1f13] = 0x44bb, [0x1f14] = 0x44bc, [0x1f15] = 0x44bd,
--  [0x1f16] = 0x44be, [0x1f17] = 0x44bf, [0x1f18] = 0x44c0, [0x1f19] = 0x44c1,
--  [0x1f1a] = 0x44c2, [0x1f1b] = 0x44c3, [0x1f1c] = 0x44c4, [0x1f1d] = 0x44c5,
--  [0x1f1e] = 0x44c6, [0x1f1f] = 0x44c7, [0x1f20] = 0x44c8, [0x1f21] = 0x44c9,
--  [0x1f22] = 0x44ca, [0x1f23] = 0x44cb, [0x1f24] = 0x44cc, [0x1f25] = 0x44cd,
--  [0x1f26] = 0x44ce, [0x1f27] = 0x44cf, [0x1f28] = 0x44d0, [0x1f29] = 0x44d1,
--  [0x1f2a] = 0x44d2, [0x1f2b] = 0x44d3, [0x1f2c] = 0x44d4, [0x1f2d] = 0x44d5,
--  [0x20a3] = 0x464d, [0x20a4] = 0x464e, [0x20a5] = 0x464f, [0x20a6] = 0x4650,
--  [0x20a7] = 0x4651, [0x20a8] = 0x4652, [0x20a9] = 0x4653, [0x20aa] = 0x4654,
--  [0x20ab] = 0x4655, [0x20ac] = 0x4656, [0x20ad] = 0x4657, [0x20ae] = 0x4658,
--  [0x20af] = 0x4659, [0x20b0] = 0x465a, [0x20b1] = 0x465b, [0x20b2] = 0x465c,
--  [0x20b3] = 0x465d, [0x20b4] = 0x465e, [0x20b5] = 0x465f, [0x20b6] = 0x4660,
--  [0x20b7] = 0x4662, [0x20b8] = 0x4663, [0x20b9] = 0x4664, [0x20ba] = 0x4665,
--  [0x20bb] = 0x4666, [0x20bc] = 0x4667, [0x20bd] = 0x4668, [0x20be] = 0x4669,
--  [0x20bf] = 0x466a, [0x20c0] = 0x466b, [0x20c1] = 0x466c, [0x20c2] = 0x466d,
--  [0x20c3] = 0x466e, [0x20c4] = 0x466f, [0x20c5] = 0x4670, [0x20c6] = 0x4671,
--  [0x20c7] = 0x4672, [0x20c8] = 0x4673, [0x20c9] = 0x4674, [0x20ca] = 0x4675,
--  [0x20cb] = 0x4676, [0x20cc] = 0x4677, [0x20cd] = 0x4678, [0x20ce] = 0x4679,
--  [0x20cf] = 0x467a, [0x20d0] = 0x467b, [0x20d1] = 0x467c, [0x20d2] = 0x467d,
--  [0x20d3] = 0x467e, [0x20d4] = 0x467f, [0x20d5] = 0x4680, [0x20d6] = 0x4681,
--  [0x20d7] = 0x4682, [0x20d8] = 0x4683, [0x20d9] = 0x4684, [0x20da] = 0x4685,
--  [0x20db] = 0x4686, [0x20dc] = 0x4687, [0x20dd] = 0x4688, [0x20de] = 0x4689,
--  [0x20df] = 0x468a, [0x20e0] = 0x468b, [0x20e1] = 0x468c, [0x20e2] = 0x468d,
--  [0x20e3] = 0x468e, [0x20e4] = 0x468f, [0x20e5] = 0x4690, [0x20e6] = 0x4691,
--  [0x20e7] = 0x4692, [0x20e8] = 0x4693, [0x20e9] = 0x4694, [0x20ea] = 0x4695,
--  [0x20eb] = 0x4696, [0x20ec] = 0x4697, [0x20ed] = 0x4698, [0x20ee] = 0x4699,
--  [0x20ef] = 0x469a, [0x20f0] = 0x469b, [0x20f1] = 0x469c, [0x20f2] = 0x469d,
--  [0x20f3] = 0x469e, [0x20f4] = 0x469f, [0x20f5] = 0x46a0, [0x20f6] = 0x46a1,
--  [0x20f7] = 0x46a2, [0x20f8] = 0x46a3, [0x20f9] = 0x46a4, [0x20fa] = 0x46a5,
--  [0x20fb] = 0x46a6, [0x20fc] = 0x46a7, [0x20fd] = 0x46a8, [0x20fe] = 0x46a9,
--  [0x20ff] = 0x46aa, [0x2100] = 0x46ab, [0x2101] = 0x46ac, [0x2102] = 0x46ad,
--  [0x2103] = 0x46ae, [0x2104] = 0x46af, [0x2105] = 0x46b0, [0x2106] = 0x46b1,
--  [0x2107] = 0x46b2, [0x2108] = 0x46b3, [0x2109] = 0x46b4, [0x210a] = 0x46b5,
--  [0x210b] = 0x46b6, [0x210c] = 0x46b7, [0x210d] = 0x46b8, [0x210e] = 0x46b9,
--  [0x210f] = 0x46ba, [0x2110] = 0x46bb, [0x2111] = 0x46bc, [0x2112] = 0x46bd,
--  [0x2113] = 0x46be, [0x2114] = 0x46bf, [0x2115] = 0x46c0, [0x2116] = 0x46c1,
--  [0x2117] = 0x46c2, [0x2118] = 0x46c3, [0x2119] = 0x46c4, [0x211a] = 0x46c5,
--  [0x211b] = 0x46c6, [0x211c] = 0x46c7, [0x211d] = 0x46c8, [0x211e] = 0x46c9,
--  [0x211f] = 0x46ca, [0x2120] = 0x46cb, [0x2121] = 0x46cc, [0x2122] = 0x46cd,
--  [0x2123] = 0x46ce, [0x2124] = 0x46cf, [0x2125] = 0x46d0, [0x2126] = 0x46d1,
--  [0x2127] = 0x46d2, [0x2128] = 0x46d3, [0x2129] = 0x46d4, [0x212a] = 0x46d5,
--  [0x212b] = 0x46d6, [0x212c] = 0x46d7, [0x212d] = 0x46d8, [0x212e] = 0x46d9,
--  [0x212f] = 0x46da, [0x2130] = 0x46db, [0x2131] = 0x46dc, [0x2132] = 0x46dd,
--  [0x2133] = 0x46de, [0x2134] = 0x46df, [0x2135] = 0x46e0, [0x2136] = 0x46e1,
--  [0x2137] = 0x46e2, [0x2138] = 0x46e3, [0x2139] = 0x46e4, [0x213a] = 0x46e5,
--  [0x213b] = 0x46e6, [0x213c] = 0x46e7, [0x213d] = 0x46e8, [0x213e] = 0x46e9,
--  [0x213f] = 0x46ea, [0x2140] = 0x46eb, [0x2141] = 0x46ec, [0x2142] = 0x46ed,
--  [0x2143] = 0x46ee, [0x2144] = 0x46ef, [0x2145] = 0x46f0, [0x2146] = 0x46f1,
--  [0x2147] = 0x46f2, [0x2148] = 0x46f3, [0x2149] = 0x46f4, [0x214a] = 0x46f5,
--  [0x214b] = 0x46f6, [0x214c] = 0x46f7, [0x214d] = 0x46f8, [0x214e] = 0x46f9,
--  [0x214f] = 0x46fa, [0x2150] = 0x46fb, [0x2151] = 0x46fc, [0x2152] = 0x46fd,
--  [0x2153] = 0x46fe, [0x2154] = 0x46ff, [0x2155] = 0x4700, [0x2156] = 0x4701,
--  [0x2157] = 0x4702, [0x2158] = 0x4703, [0x2159] = 0x4704, [0x215a] = 0x4705,
--  [0x215b] = 0x4706, [0x215c] = 0x4707, [0x215d] = 0x4708, [0x215e] = 0x4709,
--  [0x215f] = 0x470a, [0x2160] = 0x470b, [0x2161] = 0x470c, [0x2162] = 0x470d,
--  [0x2163] = 0x470e, [0x2164] = 0x470f, [0x2165] = 0x4710, [0x2166] = 0x4711,
--  [0x2167] = 0x4712, [0x2168] = 0x4713, [0x2169] = 0x4714, [0x216a] = 0x4715,
--  [0x216b] = 0x4716, [0x216c] = 0x4717, [0x216d] = 0x4718, [0x216e] = 0x4719,
--  [0x216f] = 0x471a, [0x2170] = 0x471b, [0x2171] = 0x471c, [0x2172] = 0x471d,
--  [0x2173] = 0x471e, [0x2174] = 0x471f, [0x2175] = 0x4720, [0x2176] = 0x4721,
--  [0x2177] = 0x4722, [0x2178] = 0x4724, [0x2179] = 0x4725, [0x217a] = 0x4726,
--  [0x217b] = 0x4727, [0x217c] = 0x4728, [0x217d] = 0x472a, [0x217e] = 0x472b,
--  [0x217f] = 0x472c, [0x2180] = 0x472d, [0x2181] = 0x472e, [0x2182] = 0x472f,
--  [0x2183] = 0x4730, [0x2184] = 0x4731, [0x2185] = 0x4732, [0x2186] = 0x4733,
--  [0x2187] = 0x4734, [0x2188] = 0x4735, [0x2189] = 0x4736, [0x218a] = 0x4737,
--  [0x218b] = 0x4738, [0x218c] = 0x4739, [0x218d] = 0x473a, [0x218e] = 0x473b,
--  [0x218f] = 0x473c, [0x2190] = 0x473d, [0x2191] = 0x473e, [0x2192] = 0x473f,
--  [0x2193] = 0x4740, [0x2194] = 0x4741, [0x2195] = 0x4742, [0x2196] = 0x4743,
--  [0x2197] = 0x4744, [0x2198] = 0x4745, [0x2199] = 0x4746, [0x219a] = 0x4747,
--  [0x219b] = 0x4748, [0x219c] = 0x4749, [0x219d] = 0x474a, [0x219e] = 0x474b,
--  [0x219f] = 0x474c, [0x21a0] = 0x474d, [0x21a1] = 0x474e, [0x21a2] = 0x474f,
--  [0x21a3] = 0x4750, [0x21a4] = 0x4751, [0x21a5] = 0x4752, [0x21a6] = 0x4753,
--  [0x21a7] = 0x4754, [0x21a8] = 0x4755, [0x21a9] = 0x4756, [0x21aa] = 0x4757,
--  [0x21ab] = 0x4758, [0x21ac] = 0x4759, [0x21ad] = 0x475a, [0x21ae] = 0x475b,
--  [0x21af] = 0x475c, [0x21b0] = 0x475d, [0x21b1] = 0x475e, [0x21b2] = 0x475f,
--  [0x21b3] = 0x4760, [0x21b4] = 0x4761, [0x21b5] = 0x4762, [0x21b6] = 0x4763,
--  [0x21b7] = 0x4764, [0x21b8] = 0x4765, [0x21b9] = 0x4766, [0x21ba] = 0x4767,
--  [0x21bb] = 0x4768, [0x21bc] = 0x4769, [0x21bd] = 0x476a, [0x21be] = 0x476b,
--  [0x21bf] = 0x476c, [0x21c0] = 0x476d, [0x21c1] = 0x476e, [0x21c2] = 0x476f,
--  [0x21c3] = 0x4770, [0x21c4] = 0x4771, [0x21c5] = 0x4772, [0x21c6] = 0x4773,
--  [0x21c7] = 0x4774, [0x21c8] = 0x4775, [0x21c9] = 0x4776, [0x21ca] = 0x4777,
--  [0x21cb] = 0x4778, [0x21cc] = 0x4779, [0x21cd] = 0x477a, [0x21ce] = 0x477b,
--  [0x21cf] = 0x477d, [0x21d0] = 0x477e, [0x21d1] = 0x477f, [0x21d2] = 0x4780,
--  [0x21d3] = 0x4781, [0x21d4] = 0x4782, [0x21d5] = 0x4783, [0x21d6] = 0x4784,
--  [0x21d7] = 0x4785, [0x21d8] = 0x4786, [0x21d9] = 0x4787, [0x21da] = 0x4788,
--  [0x21db] = 0x4789, [0x21dc] = 0x478a, [0x21dd] = 0x478b, [0x21de] = 0x478c,
-+  [0x0d74] = 0x32fd, [0x0d75] = 0x32fe, [0x0d76] = 0x32ff, [0x0d77] = 0x3300,
-+  [0x0d78] = 0x3301, [0x0d79] = 0x3302, [0x0d7a] = 0x3303, [0x0d7b] = 0x3304,
-+  [0x0d7c] = 0x3305, [0x0d7d] = 0x3306, [0x0d7e] = 0x3307, [0x0d7f] = 0x3308,
-+  [0x0d80] = 0x3309, [0x0d81] = 0x330a, [0x0d82] = 0x330b, [0x0d83] = 0x330c,
-+  [0x0d84] = 0x330d, [0x0d85] = 0x330e, [0x0d86] = 0x330f, [0x0d87] = 0x3310,
-+  [0x0d88] = 0x3311, [0x0d89] = 0x3312, [0x0d8a] = 0x3313, [0x0d8b] = 0x3314,
-+  [0x0d8c] = 0x3315, [0x0d8d] = 0x3316, [0x0d8e] = 0x3317, [0x0d8f] = 0x3318,
-+  [0x0d90] = 0x3319, [0x0d91] = 0x331a, [0x0d92] = 0x331b, [0x0d93] = 0x331c,
-+  [0x0d94] = 0x331d, [0x0d95] = 0x331e, [0x0d96] = 0x331f, [0x0d97] = 0x3320,
-+  [0x0d98] = 0x3321, [0x0d99] = 0x3322, [0x0d9a] = 0x3323, [0x0d9b] = 0x3324,
-+  [0x0d9c] = 0x3325, [0x0d9d] = 0x3326, [0x0d9e] = 0x3327, [0x0d9f] = 0x3328,
-+  [0x0da0] = 0x3329, [0x0da1] = 0x332a, [0x0da2] = 0x332b, [0x0da3] = 0x332c,
-+  [0x0da4] = 0x332d, [0x0da5] = 0x332e, [0x0da6] = 0x332f, [0x0da7] = 0x3330,
-+  [0x0da8] = 0x3331, [0x0da9] = 0x3332, [0x0daa] = 0x3333, [0x0dab] = 0x3334,
-+  [0x0dac] = 0x3335, [0x0dad] = 0x3336, [0x0dae] = 0x3337, [0x0daf] = 0x3338,
-+  [0x0db0] = 0x3339, [0x0db1] = 0x333a, [0x0db2] = 0x333b, [0x0db3] = 0x333c,
-+  [0x0db4] = 0x333d, [0x0db5] = 0x333e, [0x0db6] = 0x333f, [0x0db7] = 0x3340,
-+  [0x0db8] = 0x3341, [0x0db9] = 0x3342, [0x0dba] = 0x3343, [0x0dbb] = 0x3344,
-+  [0x0dbc] = 0x3345, [0x0dbd] = 0x3346, [0x0dbe] = 0x3347, [0x0dbf] = 0x3348,
-+  [0x0dc0] = 0x3349, [0x0dc1] = 0x334a, [0x0dc2] = 0x334b, [0x0dc3] = 0x334c,
-+  [0x0dc4] = 0x334d, [0x0dc5] = 0x334e, [0x0dc6] = 0x334f, [0x0dc7] = 0x3350,
-+  [0x0dc8] = 0x3351, [0x0dc9] = 0x3352, [0x0dca] = 0x3353, [0x0dcb] = 0x3354,
-+  [0x0dcc] = 0x3355, [0x0dcd] = 0x3356, [0x0dce] = 0x3357, [0x0dcf] = 0x3358,
-+  [0x0dd0] = 0x3359, [0x0dd1] = 0x335a, [0x0dd2] = 0x335b, [0x0dd3] = 0x335c,
-+  [0x0dd4] = 0x335d, [0x0dd5] = 0x335e, [0x0dd6] = 0x335f, [0x0dd7] = 0x3360,
-+  [0x0dd8] = 0x3361, [0x0dd9] = 0x3362, [0x0dda] = 0x3363, [0x0ddb] = 0x3364,
-+  [0x0ddc] = 0x3365, [0x0ddd] = 0x3366, [0x0dde] = 0x3367, [0x0ddf] = 0x3368,
-+  [0x0de0] = 0x3369, [0x0de1] = 0x336a, [0x0de2] = 0x336b, [0x0de3] = 0x336c,
-+  [0x0de4] = 0x336d, [0x0de5] = 0x336e, [0x0de6] = 0x336f, [0x0de7] = 0x3370,
-+  [0x0de8] = 0x3371, [0x0de9] = 0x3372, [0x0dea] = 0x3373, [0x0deb] = 0x3374,
-+  [0x0dec] = 0x3375, [0x0ded] = 0x3376, [0x0dee] = 0x3377, [0x0def] = 0x3378,
-+  [0x0df0] = 0x3379, [0x0df1] = 0x337a, [0x0df2] = 0x337b, [0x0df3] = 0x337c,
-+  [0x0df4] = 0x337d, [0x0df5] = 0x337e, [0x0df6] = 0x337f, [0x0df7] = 0x3380,
-+  [0x0df8] = 0x3381, [0x0df9] = 0x3382, [0x0dfa] = 0x3383, [0x0dfb] = 0x3384,
-+  [0x0dfc] = 0x3385, [0x0dfd] = 0x3386, [0x0dfe] = 0x3387, [0x0dff] = 0x3388,
-+  [0x0e00] = 0x3389, [0x0e01] = 0x338a, [0x0e02] = 0x338b, [0x0e03] = 0x338c,
-+  [0x0e04] = 0x338d, [0x0e05] = 0x3390, [0x0e06] = 0x3391, [0x0e07] = 0x3392,
-+  [0x0e08] = 0x3393, [0x0e09] = 0x3394, [0x0e0a] = 0x3395, [0x0e0b] = 0x3396,
-+  [0x0e0c] = 0x3397, [0x0e0d] = 0x3398, [0x0e0e] = 0x3399, [0x0e0f] = 0x339a,
-+  [0x0e10] = 0x339b, [0x0e11] = 0x339f, [0x0e12] = 0x33a0, [0x0e13] = 0x33a2,
-+  [0x0e14] = 0x33a3, [0x0e15] = 0x33a4, [0x0e16] = 0x33a5, [0x0e17] = 0x33a6,
-+  [0x0e18] = 0x33a7, [0x0e19] = 0x33a8, [0x0e1a] = 0x33a9, [0x0e1b] = 0x33aa,
-+  [0x0e1c] = 0x33ab, [0x0e1d] = 0x33ac, [0x0e1e] = 0x33ad, [0x0e1f] = 0x33ae,
-+  [0x0e20] = 0x33af, [0x0e21] = 0x33b0, [0x0e22] = 0x33b1, [0x0e23] = 0x33b2,
-+  [0x0e24] = 0x33b3, [0x0e25] = 0x33b4, [0x0e26] = 0x33b5, [0x0e27] = 0x33b6,
-+  [0x0e28] = 0x33b7, [0x0e29] = 0x33b8, [0x0e2a] = 0x33b9, [0x0e2b] = 0x33ba,
-+  [0x0e2c] = 0x33bb, [0x0e2d] = 0x33bc, [0x0e2e] = 0x33bd, [0x0e2f] = 0x33be,
-+  [0x0e30] = 0x33bf, [0x0e31] = 0x33c0, [0x0e32] = 0x33c1, [0x0e33] = 0x33c2,
-+  [0x0e34] = 0x33c3, [0x0e35] = 0x33c5, [0x0e36] = 0x33c6, [0x0e37] = 0x33c7,
-+  [0x0e38] = 0x33c8, [0x0e39] = 0x33c9, [0x0e3a] = 0x33ca, [0x0e3b] = 0x33cb,
-+  [0x0e3c] = 0x33cc, [0x0e3d] = 0x33cd, [0x0e3e] = 0x33cf, [0x0e3f] = 0x33d0,
-+  [0x0e40] = 0x33d3, [0x0e41] = 0x33d4, [0x0e42] = 0x33d6, [0x0e43] = 0x33d7,
-+  [0x0e44] = 0x33d8, [0x0e45] = 0x33d9, [0x0e46] = 0x33da, [0x0e47] = 0x33db,
-+  [0x0e48] = 0x33dc, [0x0e49] = 0x33dd, [0x0e4a] = 0x33de, [0x0e4b] = 0x33df,
-+  [0x0e4c] = 0x33e0, [0x0e4d] = 0x33e1, [0x0e4e] = 0x33e2, [0x0e4f] = 0x33e3,
-+  [0x0e50] = 0x33e4, [0x0e51] = 0x33e5, [0x0e52] = 0x33e6, [0x0e53] = 0x33e7,
-+  [0x0e54] = 0x33e8, [0x0e55] = 0x33e9, [0x0e56] = 0x33ea, [0x0e57] = 0x33eb,
-+  [0x0e58] = 0x33ec, [0x0e59] = 0x33ed, [0x0e5a] = 0x33ee, [0x0e5b] = 0x33ef,
-+  [0x0e5c] = 0x33f0, [0x0e5d] = 0x33f1, [0x0e5e] = 0x33f2, [0x0e5f] = 0x33f3,
-+  [0x0e60] = 0x33f4, [0x0e61] = 0x33f5, [0x0e62] = 0x33f6, [0x0e63] = 0x33f7,
-+  [0x0e64] = 0x33f8, [0x0e65] = 0x33f9, [0x0e66] = 0x33fa, [0x0e67] = 0x33fb,
-+  [0x0e68] = 0x33fc, [0x0e69] = 0x33fd, [0x0e6a] = 0x33fe, [0x0e6b] = 0x33ff,
-+  [0x0e6c] = 0x3400, [0x0e6d] = 0x3401, [0x0e6e] = 0x3402, [0x0e6f] = 0x3403,
-+  [0x0e70] = 0x3404, [0x0e71] = 0x3405, [0x0e72] = 0x3406, [0x0e73] = 0x3407,
-+  [0x0e74] = 0x3408, [0x0e75] = 0x3409, [0x0e76] = 0x340a, [0x0e77] = 0x340b,
-+  [0x0e78] = 0x340c, [0x0e79] = 0x340d, [0x0e7a] = 0x340e, [0x0e7b] = 0x340f,
-+  [0x0e7c] = 0x3410, [0x0e7d] = 0x3411, [0x0e7e] = 0x3412, [0x0e7f] = 0x3413,
-+  [0x0e80] = 0x3414, [0x0e81] = 0x3415, [0x0e82] = 0x3416, [0x0e83] = 0x3417,
-+  [0x0e84] = 0x3418, [0x0e85] = 0x3419, [0x0e86] = 0x341a, [0x0e87] = 0x341b,
-+  [0x0e88] = 0x341c, [0x0e89] = 0x341d, [0x0e8a] = 0x341e, [0x0e8b] = 0x341f,
-+  [0x0e8c] = 0x3420, [0x0e8d] = 0x3421, [0x0e8e] = 0x3422, [0x0e8f] = 0x3423,
-+  [0x0e90] = 0x3424, [0x0e91] = 0x3425, [0x0e92] = 0x3426, [0x0e93] = 0x3427,
-+  [0x0e94] = 0x3428, [0x0e95] = 0x3429, [0x0e96] = 0x342a, [0x0e97] = 0x342b,
-+  [0x0e98] = 0x342c, [0x0e99] = 0x342d, [0x0e9a] = 0x342e, [0x0e9b] = 0x342f,
-+  [0x0e9c] = 0x3430, [0x0e9d] = 0x3431, [0x0e9e] = 0x3432, [0x0e9f] = 0x3433,
-+  [0x0ea0] = 0x3434, [0x0ea1] = 0x3435, [0x0ea2] = 0x3436, [0x0ea3] = 0x3437,
-+  [0x0ea4] = 0x3438, [0x0ea5] = 0x3439, [0x0ea6] = 0x343a, [0x0ea7] = 0x343b,
-+  [0x0ea8] = 0x343c, [0x0ea9] = 0x343d, [0x0eaa] = 0x343e, [0x0eab] = 0x343f,
-+  [0x0eac] = 0x3440, [0x0ead] = 0x3441, [0x0eae] = 0x3442, [0x0eaf] = 0x3443,
-+  [0x0eb0] = 0x3444, [0x0eb1] = 0x3445, [0x0eb2] = 0x3446, [0x0eb3] = 0x3448,
-+  [0x0eb4] = 0x3449, [0x0eb5] = 0x344a, [0x0eb6] = 0x344b, [0x0eb7] = 0x344c,
-+  [0x0eb8] = 0x344d, [0x0eb9] = 0x344e, [0x0eba] = 0x344f, [0x0ebb] = 0x3450,
-+  [0x0ebc] = 0x3451, [0x0ebd] = 0x3452, [0x0ebe] = 0x3453, [0x0ebf] = 0x3454,
-+  [0x0ec0] = 0x3455, [0x0ec1] = 0x3456, [0x0ec2] = 0x3457, [0x0ec3] = 0x3458,
-+  [0x0ec4] = 0x3459, [0x0ec5] = 0x345a, [0x0ec6] = 0x345b, [0x0ec7] = 0x345c,
-+  [0x0ec8] = 0x345d, [0x0ec9] = 0x345e, [0x0eca] = 0x345f, [0x0ecb] = 0x3460,
-+  [0x0ecc] = 0x3461, [0x0ecd] = 0x3462, [0x0ece] = 0x3463, [0x0ecf] = 0x3464,
-+  [0x0ed0] = 0x3465, [0x0ed1] = 0x3466, [0x0ed2] = 0x3467, [0x0ed3] = 0x3468,
-+  [0x0ed4] = 0x3469, [0x0ed5] = 0x346a, [0x0ed6] = 0x346b, [0x0ed7] = 0x346c,
-+  [0x0ed8] = 0x346d, [0x0ed9] = 0x346e, [0x0eda] = 0x346f, [0x0edb] = 0x3470,
-+  [0x0edc] = 0x3471, [0x0edd] = 0x3472, [0x0ede] = 0x3474, [0x0edf] = 0x3475,
-+  [0x0ee0] = 0x3476, [0x0ee1] = 0x3477, [0x0ee2] = 0x3478, [0x0ee3] = 0x3479,
-+  [0x0ee4] = 0x347a, [0x0ee5] = 0x347b, [0x0ee6] = 0x347c, [0x0ee7] = 0x347d,
-+  [0x0ee8] = 0x347e, [0x0ee9] = 0x347f, [0x0eea] = 0x3480, [0x0eeb] = 0x3481,
-+  [0x0eec] = 0x3482, [0x0eed] = 0x3483, [0x0eee] = 0x3484, [0x0eef] = 0x3485,
-+  [0x0ef0] = 0x3486, [0x0ef1] = 0x3487, [0x0ef2] = 0x3488, [0x0ef3] = 0x3489,
-+  [0x0ef4] = 0x348a, [0x0ef5] = 0x348b, [0x0ef6] = 0x348c, [0x0ef7] = 0x348d,
-+  [0x0ef8] = 0x348e, [0x0ef9] = 0x348f, [0x0efa] = 0x3490, [0x0efb] = 0x3491,
-+  [0x0efc] = 0x3492, [0x0efd] = 0x3493, [0x0efe] = 0x3494, [0x0eff] = 0x3495,
-+  [0x0f00] = 0x3496, [0x0f01] = 0x3497, [0x0f02] = 0x3498, [0x0f03] = 0x3499,
-+  [0x0f04] = 0x349a, [0x0f05] = 0x349b, [0x0f06] = 0x349c, [0x0f07] = 0x349d,
-+  [0x0f08] = 0x349e, [0x0f09] = 0x349f, [0x0f0a] = 0x34a0, [0x0f0b] = 0x34a1,
-+  [0x0f0c] = 0x34a2, [0x0f0d] = 0x34a3, [0x0f0e] = 0x34a4, [0x0f0f] = 0x34a5,
-+  [0x0f10] = 0x34a6, [0x0f11] = 0x34a7, [0x0f12] = 0x34a8, [0x0f13] = 0x34a9,
-+  [0x0f14] = 0x34aa, [0x0f15] = 0x34ab, [0x0f16] = 0x34ac, [0x0f17] = 0x34ad,
-+  [0x0f18] = 0x34ae, [0x0f19] = 0x34af, [0x0f1a] = 0x34b0, [0x0f1b] = 0x34b1,
-+  [0x0f1c] = 0x34b2, [0x0f1d] = 0x34b3, [0x0f1e] = 0x34b4, [0x0f1f] = 0x34b5,
-+  [0x0f20] = 0x34b6, [0x0f21] = 0x34b7, [0x0f22] = 0x34b8, [0x0f23] = 0x34b9,
-+  [0x0f24] = 0x34ba, [0x0f25] = 0x34bb, [0x0f26] = 0x34bc, [0x0f27] = 0x34bd,
-+  [0x0f28] = 0x34be, [0x0f29] = 0x34bf, [0x0f2a] = 0x34c0, [0x0f2b] = 0x34c1,
-+  [0x0f2c] = 0x34c2, [0x0f2d] = 0x34c3, [0x0f2e] = 0x34c4, [0x0f2f] = 0x34c5,
-+  [0x0f30] = 0x34c6, [0x0f31] = 0x34c7, [0x0f32] = 0x34c8, [0x0f33] = 0x34c9,
-+  [0x0f34] = 0x34ca, [0x0f35] = 0x34cb, [0x0f36] = 0x34cc, [0x0f37] = 0x34cd,
-+  [0x0f38] = 0x34ce, [0x0f39] = 0x34cf, [0x0f3a] = 0x34d0, [0x0f3b] = 0x34d1,
-+  [0x0f3c] = 0x34d2, [0x0f3d] = 0x34d3, [0x0f3e] = 0x34d4, [0x0f3f] = 0x34d5,
-+  [0x0f40] = 0x34d6, [0x0f41] = 0x34d7, [0x0f42] = 0x34d8, [0x0f43] = 0x34d9,
-+  [0x0f44] = 0x34da, [0x0f45] = 0x34db, [0x0f46] = 0x34dc, [0x0f47] = 0x34dd,
-+  [0x0f48] = 0x34de, [0x0f49] = 0x34df, [0x0f4a] = 0x34e0, [0x0f4b] = 0x34e1,
-+  [0x0f4c] = 0x34e2, [0x0f4d] = 0x34e3, [0x0f4e] = 0x34e4, [0x0f4f] = 0x34e5,
-+  [0x0f50] = 0x34e6, [0x0f51] = 0x34e7, [0x0f52] = 0x34e8, [0x0f53] = 0x34e9,
-+  [0x0f54] = 0x34ea, [0x0f55] = 0x34eb, [0x0f56] = 0x34ec, [0x0f57] = 0x34ed,
-+  [0x0f58] = 0x34ee, [0x0f59] = 0x34ef, [0x0f5a] = 0x34f0, [0x0f5b] = 0x34f1,
-+  [0x0f5c] = 0x34f2, [0x0f5d] = 0x34f3, [0x0f5e] = 0x34f4, [0x0f5f] = 0x34f5,
-+  [0x0f60] = 0x34f6, [0x0f61] = 0x34f7, [0x0f62] = 0x34f8, [0x0f63] = 0x34f9,
-+  [0x0f64] = 0x34fa, [0x0f65] = 0x34fb, [0x0f66] = 0x34fc, [0x0f67] = 0x34fd,
-+  [0x0f68] = 0x34fe, [0x0f69] = 0x34ff, [0x0f6a] = 0x3500, [0x0f6b] = 0x3501,
-+  [0x0f6c] = 0x3502, [0x0f6d] = 0x3503, [0x0f6e] = 0x3504, [0x0f6f] = 0x3505,
-+  [0x0f70] = 0x3506, [0x0f71] = 0x3507, [0x0f72] = 0x3508, [0x0f73] = 0x3509,
-+  [0x0f74] = 0x350a, [0x0f75] = 0x350b, [0x0f76] = 0x350c, [0x0f77] = 0x350d,
-+  [0x0f78] = 0x350e, [0x0f79] = 0x350f, [0x0f7a] = 0x3510, [0x0f7b] = 0x3511,
-+  [0x0f7c] = 0x3512, [0x0f7d] = 0x3513, [0x0f7e] = 0x3514, [0x0f7f] = 0x3515,
-+  [0x0f80] = 0x3516, [0x0f81] = 0x3517, [0x0f82] = 0x3518, [0x0f83] = 0x3519,
-+  [0x0f84] = 0x351a, [0x0f85] = 0x351b, [0x0f86] = 0x351c, [0x0f87] = 0x351d,
-+  [0x0f88] = 0x351e, [0x0f89] = 0x351f, [0x0f8a] = 0x3520, [0x0f8b] = 0x3521,
-+  [0x0f8c] = 0x3522, [0x0f8d] = 0x3523, [0x0f8e] = 0x3524, [0x0f8f] = 0x3525,
-+  [0x0f90] = 0x3526, [0x0f91] = 0x3527, [0x0f92] = 0x3528, [0x0f93] = 0x3529,
-+  [0x0f94] = 0x352a, [0x0f95] = 0x352b, [0x0f96] = 0x352c, [0x0f97] = 0x352d,
-+  [0x0f98] = 0x352e, [0x0f99] = 0x352f, [0x0f9a] = 0x3530, [0x0f9b] = 0x3531,
-+  [0x0f9c] = 0x3532, [0x0f9d] = 0x3533, [0x0f9e] = 0x3534, [0x0f9f] = 0x3535,
-+  [0x0fa0] = 0x3536, [0x0fa1] = 0x3537, [0x0fa2] = 0x3538, [0x0fa3] = 0x3539,
-+  [0x0fa4] = 0x353a, [0x0fa5] = 0x353b, [0x0fa6] = 0x353c, [0x0fa7] = 0x353d,
-+  [0x0fa8] = 0x353e, [0x0fa9] = 0x353f, [0x0faa] = 0x3540, [0x0fab] = 0x3541,
-+  [0x0fac] = 0x3542, [0x0fad] = 0x3543, [0x0fae] = 0x3544, [0x0faf] = 0x3545,
-+  [0x0fb0] = 0x3546, [0x0fb1] = 0x3547, [0x0fb2] = 0x3548, [0x0fb3] = 0x3549,
-+  [0x0fb4] = 0x354a, [0x0fb5] = 0x354b, [0x0fb6] = 0x354c, [0x0fb7] = 0x354d,
-+  [0x0fb8] = 0x354e, [0x0fb9] = 0x354f, [0x0fba] = 0x3550, [0x0fbb] = 0x3551,
-+  [0x0fbc] = 0x3552, [0x0fbd] = 0x3553, [0x0fbe] = 0x3554, [0x0fbf] = 0x3555,
-+  [0x0fc0] = 0x3556, [0x0fc1] = 0x3557, [0x0fc2] = 0x3558, [0x0fc3] = 0x3559,
-+  [0x0fc4] = 0x355a, [0x0fc5] = 0x355b, [0x0fc6] = 0x355c, [0x0fc7] = 0x355d,
-+  [0x0fc8] = 0x355e, [0x0fc9] = 0x355f, [0x0fca] = 0x3560, [0x0fcb] = 0x3561,
-+  [0x0fcc] = 0x3562, [0x0fcd] = 0x3563, [0x0fce] = 0x3564, [0x0fcf] = 0x3565,
-+  [0x0fd0] = 0x3566, [0x0fd1] = 0x3567, [0x0fd2] = 0x3568, [0x0fd3] = 0x3569,
-+  [0x0fd4] = 0x356a, [0x0fd5] = 0x356b, [0x0fd6] = 0x356c, [0x0fd7] = 0x356d,
-+  [0x0fd8] = 0x356e, [0x0fd9] = 0x356f, [0x0fda] = 0x3570, [0x0fdb] = 0x3571,
-+  [0x0fdc] = 0x3572, [0x0fdd] = 0x3573, [0x0fde] = 0x3574, [0x0fdf] = 0x3575,
-+  [0x0fe0] = 0x3576, [0x0fe1] = 0x3577, [0x0fe2] = 0x3578, [0x0fe3] = 0x3579,
-+  [0x0fe4] = 0x357a, [0x0fe5] = 0x357b, [0x0fe6] = 0x357c, [0x0fe7] = 0x357d,
-+  [0x0fe8] = 0x357e, [0x0fe9] = 0x357f, [0x0fea] = 0x3580, [0x0feb] = 0x3581,
-+  [0x0fec] = 0x3582, [0x0fed] = 0x3583, [0x0fee] = 0x3584, [0x0fef] = 0x3585,
-+  [0x0ff0] = 0x3586, [0x0ff1] = 0x3587, [0x0ff2] = 0x3588, [0x0ff3] = 0x3589,
-+  [0x0ff4] = 0x358a, [0x0ff5] = 0x358b, [0x0ff6] = 0x358c, [0x0ff7] = 0x358d,
-+  [0x0ff8] = 0x358e, [0x0ff9] = 0x358f, [0x0ffa] = 0x3590, [0x0ffb] = 0x3591,
-+  [0x0ffc] = 0x3592, [0x0ffd] = 0x3593, [0x0ffe] = 0x3594, [0x0fff] = 0x3595,
-+  [0x1000] = 0x3596, [0x1001] = 0x3597, [0x1002] = 0x3598, [0x1003] = 0x3599,
-+  [0x1004] = 0x359a, [0x1005] = 0x359b, [0x1006] = 0x359c, [0x1007] = 0x359d,
-+  [0x1008] = 0x359f, [0x1009] = 0x35a0, [0x100a] = 0x35a1, [0x100b] = 0x35a2,
-+  [0x100c] = 0x35a3, [0x100d] = 0x35a4, [0x100e] = 0x35a5, [0x100f] = 0x35a6,
-+  [0x1010] = 0x35a7, [0x1011] = 0x35a8, [0x1012] = 0x35a9, [0x1013] = 0x35aa,
-+  [0x1014] = 0x35ab, [0x1015] = 0x35ac, [0x1016] = 0x35ad, [0x1017] = 0x35ae,
-+  [0x1018] = 0x35af, [0x1019] = 0x35b0, [0x101a] = 0x35b1, [0x101b] = 0x35b2,
-+  [0x101c] = 0x35b3, [0x101d] = 0x35b4, [0x101e] = 0x35b5, [0x101f] = 0x35b6,
-+  [0x1020] = 0x35b7, [0x1021] = 0x35b8, [0x1022] = 0x35b9, [0x1023] = 0x35ba,
-+  [0x1024] = 0x35bb, [0x1025] = 0x35bc, [0x1026] = 0x35bd, [0x1027] = 0x35be,
-+  [0x1028] = 0x35bf, [0x1029] = 0x35c0, [0x102a] = 0x35c1, [0x102b] = 0x35c2,
-+  [0x102c] = 0x35c3, [0x102d] = 0x35c4, [0x102e] = 0x35c5, [0x102f] = 0x35c6,
-+  [0x1030] = 0x35c7, [0x1031] = 0x35c8, [0x1032] = 0x35c9, [0x1033] = 0x35ca,
-+  [0x1034] = 0x35cb, [0x1035] = 0x35cc, [0x1036] = 0x35cd, [0x1037] = 0x35ce,
-+  [0x1038] = 0x35cf, [0x1039] = 0x35d0, [0x103a] = 0x35d1, [0x103b] = 0x35d2,
-+  [0x103c] = 0x35d3, [0x103d] = 0x35d4, [0x103e] = 0x35d5, [0x103f] = 0x35d6,
-+  [0x1040] = 0x35d7, [0x1041] = 0x35d8, [0x1042] = 0x35d9, [0x1043] = 0x35da,
-+  [0x1044] = 0x35db, [0x1045] = 0x35dc, [0x1046] = 0x35dd, [0x1047] = 0x35de,
-+  [0x1048] = 0x35df, [0x1049] = 0x35e0, [0x104a] = 0x35e1, [0x104b] = 0x35e2,
-+  [0x104c] = 0x35e3, [0x104d] = 0x35e4, [0x104e] = 0x35e5, [0x104f] = 0x35e6,
-+  [0x1050] = 0x35e7, [0x1051] = 0x35e8, [0x1052] = 0x35e9, [0x1053] = 0x35ea,
-+  [0x1054] = 0x35eb, [0x1055] = 0x35ec, [0x1056] = 0x35ed, [0x1057] = 0x35ee,
-+  [0x1058] = 0x35ef, [0x1059] = 0x35f0, [0x105a] = 0x35f1, [0x105b] = 0x35f2,
-+  [0x105c] = 0x35f3, [0x105d] = 0x35f4, [0x105e] = 0x35f5, [0x105f] = 0x35f6,
-+  [0x1060] = 0x35f7, [0x1061] = 0x35f8, [0x1062] = 0x35f9, [0x1063] = 0x35fa,
-+  [0x1064] = 0x35fb, [0x1065] = 0x35fc, [0x1066] = 0x35fd, [0x1067] = 0x35fe,
-+  [0x1068] = 0x35ff, [0x1069] = 0x3600, [0x106a] = 0x3601, [0x106b] = 0x3602,
-+  [0x106c] = 0x3603, [0x106d] = 0x3604, [0x106e] = 0x3605, [0x106f] = 0x3606,
-+  [0x1070] = 0x3607, [0x1071] = 0x3608, [0x1072] = 0x3609, [0x1073] = 0x360a,
-+  [0x1074] = 0x360b, [0x1075] = 0x360c, [0x1076] = 0x360d, [0x1077] = 0x360f,
-+  [0x1078] = 0x3610, [0x1079] = 0x3611, [0x107a] = 0x3612, [0x107b] = 0x3613,
-+  [0x107c] = 0x3614, [0x107d] = 0x3615, [0x107e] = 0x3616, [0x107f] = 0x3617,
-+  [0x1080] = 0x3618, [0x1081] = 0x3619, [0x1082] = 0x361b, [0x1083] = 0x361c,
-+  [0x1084] = 0x361d, [0x1085] = 0x361e, [0x1086] = 0x361f, [0x1087] = 0x3620,
-+  [0x1088] = 0x3621, [0x1089] = 0x3622, [0x108a] = 0x3623, [0x108b] = 0x3624,
-+  [0x108c] = 0x3625, [0x108d] = 0x3626, [0x108e] = 0x3627, [0x108f] = 0x3628,
-+  [0x1090] = 0x3629, [0x1091] = 0x362a, [0x1092] = 0x362b, [0x1093] = 0x362c,
-+  [0x1094] = 0x362d, [0x1095] = 0x362e, [0x1096] = 0x362f, [0x1097] = 0x3630,
-+  [0x1098] = 0x3631, [0x1099] = 0x3632, [0x109a] = 0x3633, [0x109b] = 0x3634,
-+  [0x109c] = 0x3635, [0x109d] = 0x3636, [0x109e] = 0x3637, [0x109f] = 0x3638,
-+  [0x10a0] = 0x3639, [0x10a1] = 0x363a, [0x10a2] = 0x363b, [0x10a3] = 0x363c,
-+  [0x10a4] = 0x363d, [0x10a5] = 0x363e, [0x10a6] = 0x363f, [0x10a7] = 0x3640,
-+  [0x10a8] = 0x3641, [0x10a9] = 0x3642, [0x10aa] = 0x3643, [0x10ab] = 0x3644,
-+  [0x10ac] = 0x3645, [0x10ad] = 0x3646, [0x10ae] = 0x3647, [0x10af] = 0x3648,
-+  [0x10b0] = 0x3649, [0x10b1] = 0x364a, [0x10b2] = 0x364b, [0x10b3] = 0x364c,
-+  [0x10b4] = 0x364d, [0x10b5] = 0x364e, [0x10b6] = 0x364f, [0x10b7] = 0x3650,
-+  [0x10b8] = 0x3651, [0x10b9] = 0x3652, [0x10ba] = 0x3653, [0x10bb] = 0x3654,
-+  [0x10bc] = 0x3655, [0x10bd] = 0x3656, [0x10be] = 0x3657, [0x10bf] = 0x3658,
-+  [0x10c0] = 0x3659, [0x10c1] = 0x365a, [0x10c2] = 0x365b, [0x10c3] = 0x365c,
-+  [0x10c4] = 0x365d, [0x10c5] = 0x365e, [0x10c6] = 0x365f, [0x10c7] = 0x3660,
-+  [0x10c8] = 0x3661, [0x10c9] = 0x3662, [0x10ca] = 0x3663, [0x10cb] = 0x3664,
-+  [0x10cc] = 0x3665, [0x10cd] = 0x3666, [0x10ce] = 0x3667, [0x10cf] = 0x3668,
-+  [0x10d0] = 0x3669, [0x10d1] = 0x366a, [0x10d2] = 0x366b, [0x10d3] = 0x366c,
-+  [0x10d4] = 0x366d, [0x10d5] = 0x366e, [0x10d6] = 0x366f, [0x10d7] = 0x3670,
-+  [0x10d8] = 0x3671, [0x10d9] = 0x3672, [0x10da] = 0x3673, [0x10db] = 0x3674,
-+  [0x10dc] = 0x3675, [0x10dd] = 0x3676, [0x10de] = 0x3677, [0x10df] = 0x3678,
-+  [0x10e0] = 0x3679, [0x10e1] = 0x367a, [0x10e2] = 0x367b, [0x10e3] = 0x367c,
-+  [0x10e4] = 0x367d, [0x10e5] = 0x367e, [0x10e6] = 0x367f, [0x10e7] = 0x3680,
-+  [0x10e8] = 0x3681, [0x10e9] = 0x3682, [0x10ea] = 0x3683, [0x10eb] = 0x3684,
-+  [0x10ec] = 0x3685, [0x10ed] = 0x3686, [0x10ee] = 0x3687, [0x10ef] = 0x3688,
-+  [0x10f0] = 0x3689, [0x10f1] = 0x368a, [0x10f2] = 0x368b, [0x10f3] = 0x368c,
-+  [0x10f4] = 0x368d, [0x10f5] = 0x368e, [0x10f6] = 0x368f, [0x10f7] = 0x3690,
-+  [0x10f8] = 0x3691, [0x10f9] = 0x3692, [0x10fa] = 0x3693, [0x10fb] = 0x3694,
-+  [0x10fc] = 0x3695, [0x10fd] = 0x3696, [0x10fe] = 0x3697, [0x10ff] = 0x3698,
-+  [0x1100] = 0x3699, [0x1101] = 0x369a, [0x1102] = 0x369b, [0x1103] = 0x369c,
-+  [0x1104] = 0x369d, [0x1105] = 0x369e, [0x1106] = 0x369f, [0x1107] = 0x36a0,
-+  [0x1108] = 0x36a1, [0x1109] = 0x36a2, [0x110a] = 0x36a3, [0x110b] = 0x36a4,
-+  [0x110c] = 0x36a5, [0x110d] = 0x36a6, [0x110e] = 0x36a7, [0x110f] = 0x36a8,
-+  [0x1110] = 0x36a9, [0x1111] = 0x36aa, [0x1112] = 0x36ab, [0x1113] = 0x36ac,
-+  [0x1114] = 0x36ad, [0x1115] = 0x36ae, [0x1116] = 0x36af, [0x1117] = 0x36b0,
-+  [0x1118] = 0x36b1, [0x1119] = 0x36b2, [0x111a] = 0x36b3, [0x111b] = 0x36b4,
-+  [0x111c] = 0x36b5, [0x111d] = 0x36b6, [0x111e] = 0x36b7, [0x111f] = 0x36b8,
-+  [0x1120] = 0x36b9, [0x1121] = 0x36ba, [0x1122] = 0x36bb, [0x1123] = 0x36bc,
-+  [0x1124] = 0x36bd, [0x1125] = 0x36be, [0x1126] = 0x36bf, [0x1127] = 0x36c0,
-+  [0x1128] = 0x36c1, [0x1129] = 0x36c2, [0x112a] = 0x36c3, [0x112b] = 0x36c4,
-+  [0x112c] = 0x36c5, [0x112d] = 0x36c6, [0x112e] = 0x36c7, [0x112f] = 0x36c8,
-+  [0x1130] = 0x36c9, [0x1131] = 0x36ca, [0x1132] = 0x36cb, [0x1133] = 0x36cc,
-+  [0x1134] = 0x36cd, [0x1135] = 0x36ce, [0x1136] = 0x36cf, [0x1137] = 0x36d0,
-+  [0x1138] = 0x36d1, [0x1139] = 0x36d2, [0x113a] = 0x36d3, [0x113b] = 0x36d4,
-+  [0x113c] = 0x36d5, [0x113d] = 0x36d6, [0x113e] = 0x36d7, [0x113f] = 0x36d8,
-+  [0x1140] = 0x36d9, [0x1141] = 0x36da, [0x1142] = 0x36db, [0x1143] = 0x36dc,
-+  [0x1144] = 0x36dd, [0x1145] = 0x36de, [0x1146] = 0x36df, [0x1147] = 0x36e0,
-+  [0x1148] = 0x36e1, [0x1149] = 0x36e2, [0x114a] = 0x36e3, [0x114b] = 0x36e4,
-+  [0x114c] = 0x36e5, [0x114d] = 0x36e6, [0x114e] = 0x36e7, [0x114f] = 0x36e8,
-+  [0x1150] = 0x36e9, [0x1151] = 0x36ea, [0x1152] = 0x36eb, [0x1153] = 0x36ec,
-+  [0x1154] = 0x36ed, [0x1155] = 0x36ee, [0x1156] = 0x36ef, [0x1157] = 0x36f0,
-+  [0x1158] = 0x36f1, [0x1159] = 0x36f2, [0x115a] = 0x36f3, [0x115b] = 0x36f4,
-+  [0x115c] = 0x36f5, [0x115d] = 0x36f6, [0x115e] = 0x36f7, [0x115f] = 0x36f8,
-+  [0x1160] = 0x36f9, [0x1161] = 0x36fa, [0x1162] = 0x36fb, [0x1163] = 0x36fc,
-+  [0x1164] = 0x36fd, [0x1165] = 0x36fe, [0x1166] = 0x36ff, [0x1167] = 0x3700,
-+  [0x1168] = 0x3701, [0x1169] = 0x3702, [0x116a] = 0x3703, [0x116b] = 0x3704,
-+  [0x116c] = 0x3705, [0x116d] = 0x3706, [0x116e] = 0x3707, [0x116f] = 0x3708,
-+  [0x1170] = 0x3709, [0x1171] = 0x370a, [0x1172] = 0x370b, [0x1173] = 0x370c,
-+  [0x1174] = 0x370d, [0x1175] = 0x370e, [0x1176] = 0x370f, [0x1177] = 0x3710,
-+  [0x1178] = 0x3711, [0x1179] = 0x3712, [0x117a] = 0x3713, [0x117b] = 0x3714,
-+  [0x117c] = 0x3715, [0x117d] = 0x3716, [0x117e] = 0x3717, [0x117f] = 0x3718,
-+  [0x1180] = 0x3719, [0x1181] = 0x371a, [0x1182] = 0x371b, [0x1183] = 0x371c,
-+  [0x1184] = 0x371d, [0x1185] = 0x371e, [0x1186] = 0x371f, [0x1187] = 0x3720,
-+  [0x1188] = 0x3721, [0x1189] = 0x3722, [0x118a] = 0x3723, [0x118b] = 0x3724,
-+  [0x118c] = 0x3725, [0x118d] = 0x3726, [0x118e] = 0x3727, [0x118f] = 0x3728,
-+  [0x1190] = 0x3729, [0x1191] = 0x372a, [0x1192] = 0x372b, [0x1193] = 0x372c,
-+  [0x1194] = 0x372d, [0x1195] = 0x372e, [0x1196] = 0x372f, [0x1197] = 0x3730,
-+  [0x1198] = 0x3731, [0x1199] = 0x3732, [0x119a] = 0x3733, [0x119b] = 0x3734,
-+  [0x119c] = 0x3735, [0x119d] = 0x3736, [0x119e] = 0x3737, [0x119f] = 0x3738,
-+  [0x11a0] = 0x3739, [0x11a1] = 0x373a, [0x11a2] = 0x373b, [0x11a3] = 0x373c,
-+  [0x11a4] = 0x373d, [0x11a5] = 0x373e, [0x11a6] = 0x373f, [0x11a7] = 0x3740,
-+  [0x11a8] = 0x3741, [0x11a9] = 0x3742, [0x11aa] = 0x3743, [0x11ab] = 0x3744,
-+  [0x11ac] = 0x3745, [0x11ad] = 0x3746, [0x11ae] = 0x3747, [0x11af] = 0x3748,
-+  [0x11b0] = 0x3749, [0x11b1] = 0x374a, [0x11b2] = 0x374b, [0x11b3] = 0x374c,
-+  [0x11b4] = 0x374d, [0x11b5] = 0x374e, [0x11b6] = 0x374f, [0x11b7] = 0x3750,
-+  [0x11b8] = 0x3751, [0x11b9] = 0x3752, [0x11ba] = 0x3753, [0x11bb] = 0x3754,
-+  [0x11bc] = 0x3755, [0x11bd] = 0x3756, [0x11be] = 0x3757, [0x11bf] = 0x3758,
-+  [0x11c0] = 0x3759, [0x11c1] = 0x375a, [0x11c2] = 0x375b, [0x11c3] = 0x375c,
-+  [0x11c4] = 0x375d, [0x11c5] = 0x375e, [0x11c6] = 0x375f, [0x11c7] = 0x3760,
-+  [0x11c8] = 0x3761, [0x11c9] = 0x3762, [0x11ca] = 0x3763, [0x11cb] = 0x3764,
-+  [0x11cc] = 0x3765, [0x11cd] = 0x3766, [0x11ce] = 0x3767, [0x11cf] = 0x3768,
-+  [0x11d0] = 0x3769, [0x11d1] = 0x376a, [0x11d2] = 0x376b, [0x11d3] = 0x376c,
-+  [0x11d4] = 0x376d, [0x11d5] = 0x376e, [0x11d6] = 0x376f, [0x11d7] = 0x3770,
-+  [0x11d8] = 0x3771, [0x11d9] = 0x3772, [0x11da] = 0x3773, [0x11db] = 0x3774,
-+  [0x11dc] = 0x3775, [0x11dd] = 0x3776, [0x11de] = 0x3777, [0x11df] = 0x3778,
-+  [0x11e0] = 0x3779, [0x11e1] = 0x377a, [0x11e2] = 0x377b, [0x11e3] = 0x377c,
-+  [0x11e4] = 0x377d, [0x11e5] = 0x377e, [0x11e6] = 0x377f, [0x11e7] = 0x3780,
-+  [0x11e8] = 0x3781, [0x11e9] = 0x3782, [0x11ea] = 0x3783, [0x11eb] = 0x3784,
-+  [0x11ec] = 0x3785, [0x11ed] = 0x3786, [0x11ee] = 0x3787, [0x11ef] = 0x3788,
-+  [0x11f0] = 0x3789, [0x11f1] = 0x378a, [0x11f2] = 0x378b, [0x11f3] = 0x378c,
-+  [0x11f4] = 0x378d, [0x11f5] = 0x378e, [0x11f6] = 0x378f, [0x11f7] = 0x3790,
-+  [0x11f8] = 0x3791, [0x11f9] = 0x3792, [0x11fa] = 0x3793, [0x11fb] = 0x3794,
-+  [0x11fc] = 0x3795, [0x11fd] = 0x3796, [0x11fe] = 0x3797, [0x11ff] = 0x3798,
-+  [0x1200] = 0x3799, [0x1201] = 0x379a, [0x1202] = 0x379b, [0x1203] = 0x379c,
-+  [0x1204] = 0x379d, [0x1205] = 0x379e, [0x1206] = 0x379f, [0x1207] = 0x37a0,
-+  [0x1208] = 0x37a1, [0x1209] = 0x37a2, [0x120a] = 0x37a3, [0x120b] = 0x37a4,
-+  [0x120c] = 0x37a5, [0x120d] = 0x37a6, [0x120e] = 0x37a7, [0x120f] = 0x37a8,
-+  [0x1210] = 0x37a9, [0x1211] = 0x37aa, [0x1212] = 0x37ab, [0x1213] = 0x37ac,
-+  [0x1214] = 0x37ad, [0x1215] = 0x37ae, [0x1216] = 0x37af, [0x1217] = 0x37b0,
-+  [0x1218] = 0x37b1, [0x1219] = 0x37b2, [0x121a] = 0x37b3, [0x121b] = 0x37b4,
-+  [0x121c] = 0x37b5, [0x121d] = 0x37b6, [0x121e] = 0x37b7, [0x121f] = 0x37b8,
-+  [0x1220] = 0x37b9, [0x1221] = 0x37ba, [0x1222] = 0x37bb, [0x1223] = 0x37bc,
-+  [0x1224] = 0x37bd, [0x1225] = 0x37be, [0x1226] = 0x37bf, [0x1227] = 0x37c0,
-+  [0x1228] = 0x37c1, [0x1229] = 0x37c2, [0x122a] = 0x37c3, [0x122b] = 0x37c4,
-+  [0x122c] = 0x37c5, [0x122d] = 0x37c6, [0x122e] = 0x37c7, [0x122f] = 0x37c8,
-+  [0x1230] = 0x37c9, [0x1231] = 0x37ca, [0x1232] = 0x37cb, [0x1233] = 0x37cc,
-+  [0x1234] = 0x37cd, [0x1235] = 0x37ce, [0x1236] = 0x37cf, [0x1237] = 0x37d0,
-+  [0x1238] = 0x37d1, [0x1239] = 0x37d2, [0x123a] = 0x37d3, [0x123b] = 0x37d4,
-+  [0x123c] = 0x37d5, [0x123d] = 0x37d6, [0x123e] = 0x37d7, [0x123f] = 0x37d8,
-+  [0x1240] = 0x37d9, [0x1241] = 0x37da, [0x1242] = 0x37db, [0x1243] = 0x37dc,
-+  [0x1244] = 0x37dd, [0x1245] = 0x37de, [0x1246] = 0x37df, [0x1247] = 0x37e0,
-+  [0x1248] = 0x37e1, [0x1249] = 0x37e2, [0x124a] = 0x37e3, [0x124b] = 0x37e4,
-+  [0x124c] = 0x37e5, [0x124d] = 0x37e6, [0x124e] = 0x37e7, [0x124f] = 0x37e8,
-+  [0x1250] = 0x37e9, [0x1251] = 0x37ea, [0x1252] = 0x37eb, [0x1253] = 0x37ec,
-+  [0x1254] = 0x37ed, [0x1255] = 0x37ee, [0x1256] = 0x37ef, [0x1257] = 0x37f0,
-+  [0x1258] = 0x37f1, [0x1259] = 0x37f2, [0x125a] = 0x37f3, [0x125b] = 0x37f4,
-+  [0x125c] = 0x37f5, [0x125d] = 0x37f6, [0x125e] = 0x37f7, [0x125f] = 0x37f8,
-+  [0x1260] = 0x37f9, [0x1261] = 0x37fa, [0x1262] = 0x37fb, [0x1263] = 0x37fc,
-+  [0x1264] = 0x37fd, [0x1265] = 0x37fe, [0x1266] = 0x37ff, [0x1267] = 0x3800,
-+  [0x1268] = 0x3801, [0x1269] = 0x3802, [0x126a] = 0x3803, [0x126b] = 0x3804,
-+  [0x126c] = 0x3805, [0x126d] = 0x3806, [0x126e] = 0x3807, [0x126f] = 0x3808,
-+  [0x1270] = 0x3809, [0x1271] = 0x380a, [0x1272] = 0x380b, [0x1273] = 0x380c,
-+  [0x1274] = 0x380d, [0x1275] = 0x380e, [0x1276] = 0x380f, [0x1277] = 0x3810,
-+  [0x1278] = 0x3811, [0x1279] = 0x3812, [0x127a] = 0x3813, [0x127b] = 0x3814,
-+  [0x127c] = 0x3815, [0x127d] = 0x3816, [0x127e] = 0x3817, [0x127f] = 0x3818,
-+  [0x1280] = 0x3819, [0x1281] = 0x381a, [0x1282] = 0x381b, [0x1283] = 0x381c,
-+  [0x1284] = 0x381d, [0x1285] = 0x381e, [0x1286] = 0x381f, [0x1287] = 0x3820,
-+  [0x1288] = 0x3821, [0x1289] = 0x3822, [0x128a] = 0x3823, [0x128b] = 0x3824,
-+  [0x128c] = 0x3825, [0x128d] = 0x3826, [0x128e] = 0x3827, [0x128f] = 0x3828,
-+  [0x1290] = 0x3829, [0x1291] = 0x382a, [0x1292] = 0x382b, [0x1293] = 0x382c,
-+  [0x1294] = 0x382d, [0x1295] = 0x382e, [0x1296] = 0x382f, [0x1297] = 0x3830,
-+  [0x1298] = 0x3831, [0x1299] = 0x3832, [0x129a] = 0x3833, [0x129b] = 0x3834,
-+  [0x129c] = 0x3835, [0x129d] = 0x3836, [0x129e] = 0x3837, [0x129f] = 0x3838,
-+  [0x12a0] = 0x3839, [0x12a1] = 0x383a, [0x12a2] = 0x383b, [0x12a3] = 0x383c,
-+  [0x12a4] = 0x383d, [0x12a5] = 0x383e, [0x12a6] = 0x383f, [0x12a7] = 0x3840,
-+  [0x12a8] = 0x3841, [0x12a9] = 0x3842, [0x12aa] = 0x3843, [0x12ab] = 0x3844,
-+  [0x12ac] = 0x3845, [0x12ad] = 0x3846, [0x12ae] = 0x3847, [0x12af] = 0x3848,
-+  [0x12b0] = 0x3849, [0x12b1] = 0x384a, [0x12b2] = 0x384b, [0x12b3] = 0x384c,
-+  [0x12b4] = 0x384d, [0x12b5] = 0x384e, [0x12b6] = 0x384f, [0x12b7] = 0x3850,
-+  [0x12b8] = 0x3851, [0x12b9] = 0x3852, [0x12ba] = 0x3853, [0x12bb] = 0x3854,
-+  [0x12bc] = 0x3855, [0x12bd] = 0x3856, [0x12be] = 0x3857, [0x12bf] = 0x3858,
-+  [0x12c0] = 0x3859, [0x12c1] = 0x385a, [0x12c2] = 0x385b, [0x12c3] = 0x385c,
-+  [0x12c4] = 0x385d, [0x12c5] = 0x385e, [0x12c6] = 0x385f, [0x12c7] = 0x3860,
-+  [0x12c8] = 0x3861, [0x12c9] = 0x3862, [0x12ca] = 0x3863, [0x12cb] = 0x3864,
-+  [0x12cc] = 0x3865, [0x12cd] = 0x3866, [0x12ce] = 0x3867, [0x12cf] = 0x3868,
-+  [0x12d0] = 0x3869, [0x12d1] = 0x386a, [0x12d2] = 0x386b, [0x12d3] = 0x386c,
-+  [0x12d4] = 0x386d, [0x12d5] = 0x386e, [0x12d6] = 0x386f, [0x12d7] = 0x3870,
-+  [0x12d8] = 0x3871, [0x12d9] = 0x3872, [0x12da] = 0x3873, [0x12db] = 0x3874,
-+  [0x12dc] = 0x3875, [0x12dd] = 0x3876, [0x12de] = 0x3877, [0x12df] = 0x3878,
-+  [0x12e0] = 0x3879, [0x12e1] = 0x387a, [0x12e2] = 0x387b, [0x12e3] = 0x387c,
-+  [0x12e4] = 0x387d, [0x12e5] = 0x387e, [0x12e6] = 0x387f, [0x12e7] = 0x3880,
-+  [0x12e8] = 0x3881, [0x12e9] = 0x3882, [0x12ea] = 0x3883, [0x12eb] = 0x3884,
-+  [0x12ec] = 0x3885, [0x12ed] = 0x3886, [0x12ee] = 0x3887, [0x12ef] = 0x3888,
-+  [0x12f0] = 0x3889, [0x12f1] = 0x388a, [0x12f2] = 0x388b, [0x12f3] = 0x388c,
-+  [0x12f4] = 0x388d, [0x12f5] = 0x388e, [0x12f6] = 0x388f, [0x12f7] = 0x3890,
-+  [0x12f8] = 0x3891, [0x12f9] = 0x3892, [0x12fa] = 0x3893, [0x12fb] = 0x3894,
-+  [0x12fc] = 0x3895, [0x12fd] = 0x3896, [0x12fe] = 0x3897, [0x12ff] = 0x3898,
-+  [0x1300] = 0x3899, [0x1301] = 0x389a, [0x1302] = 0x389b, [0x1303] = 0x389c,
-+  [0x1304] = 0x389d, [0x1305] = 0x389e, [0x1306] = 0x389f, [0x1307] = 0x38a0,
-+  [0x1308] = 0x38a1, [0x1309] = 0x38a2, [0x130a] = 0x38a3, [0x130b] = 0x38a4,
-+  [0x130c] = 0x38a5, [0x130d] = 0x38a6, [0x130e] = 0x38a7, [0x130f] = 0x38a8,
-+  [0x1310] = 0x38a9, [0x1311] = 0x38aa, [0x1312] = 0x38ab, [0x1313] = 0x38ac,
-+  [0x1314] = 0x38ad, [0x1315] = 0x38ae, [0x1316] = 0x38af, [0x1317] = 0x38b0,
-+  [0x1318] = 0x38b1, [0x1319] = 0x38b2, [0x131a] = 0x38b3, [0x131b] = 0x38b4,
-+  [0x131c] = 0x38b5, [0x131d] = 0x38b6, [0x131e] = 0x38b7, [0x131f] = 0x38b8,
-+  [0x1320] = 0x38b9, [0x1321] = 0x38ba, [0x1322] = 0x38bb, [0x1323] = 0x38bc,
-+  [0x1324] = 0x38bd, [0x1325] = 0x38be, [0x1326] = 0x38bf, [0x1327] = 0x38c0,
-+  [0x1328] = 0x38c1, [0x1329] = 0x38c2, [0x132a] = 0x38c3, [0x132b] = 0x38c4,
-+  [0x132c] = 0x38c5, [0x132d] = 0x38c6, [0x132e] = 0x38c7, [0x132f] = 0x38c8,
-+  [0x1330] = 0x38c9, [0x1331] = 0x38ca, [0x1332] = 0x38cb, [0x1333] = 0x38cc,
-+  [0x1334] = 0x38cd, [0x1335] = 0x38ce, [0x1336] = 0x38cf, [0x1337] = 0x38d0,
-+  [0x1338] = 0x38d1, [0x1339] = 0x38d2, [0x133a] = 0x38d3, [0x133b] = 0x38d4,
-+  [0x133c] = 0x38d5, [0x133d] = 0x38d6, [0x133e] = 0x38d7, [0x133f] = 0x38d8,
-+  [0x1340] = 0x38d9, [0x1341] = 0x38da, [0x1342] = 0x38db, [0x1343] = 0x38dc,
-+  [0x1344] = 0x38dd, [0x1345] = 0x38de, [0x1346] = 0x38df, [0x1347] = 0x38e0,
-+  [0x1348] = 0x38e1, [0x1349] = 0x38e2, [0x134a] = 0x38e3, [0x134b] = 0x38e4,
-+  [0x134c] = 0x38e5, [0x134d] = 0x38e6, [0x134e] = 0x38e7, [0x134f] = 0x38e8,
-+  [0x1350] = 0x38e9, [0x1351] = 0x38ea, [0x1352] = 0x38eb, [0x1353] = 0x38ec,
-+  [0x1354] = 0x38ed, [0x1355] = 0x38ee, [0x1356] = 0x38ef, [0x1357] = 0x38f0,
-+  [0x1358] = 0x38f1, [0x1359] = 0x38f2, [0x135a] = 0x38f3, [0x135b] = 0x38f4,
-+  [0x135c] = 0x38f5, [0x135d] = 0x38f6, [0x135e] = 0x38f7, [0x135f] = 0x38f8,
-+  [0x1360] = 0x38f9, [0x1361] = 0x38fa, [0x1362] = 0x38fb, [0x1363] = 0x38fc,
-+  [0x1364] = 0x38fd, [0x1365] = 0x38fe, [0x1366] = 0x38ff, [0x1367] = 0x3900,
-+  [0x1368] = 0x3901, [0x1369] = 0x3902, [0x136a] = 0x3903, [0x136b] = 0x3904,
-+  [0x136c] = 0x3905, [0x136d] = 0x3906, [0x136e] = 0x3907, [0x136f] = 0x3908,
-+  [0x1370] = 0x3909, [0x1371] = 0x390a, [0x1372] = 0x390b, [0x1373] = 0x390c,
-+  [0x1374] = 0x390d, [0x1375] = 0x390e, [0x1376] = 0x390f, [0x1377] = 0x3910,
-+  [0x1378] = 0x3911, [0x1379] = 0x3912, [0x137a] = 0x3913, [0x137b] = 0x3914,
-+  [0x137c] = 0x3915, [0x137d] = 0x3916, [0x137e] = 0x3917, [0x137f] = 0x3919,
-+  [0x1380] = 0x391a, [0x1381] = 0x391b, [0x1382] = 0x391c, [0x1383] = 0x391d,
-+  [0x1384] = 0x391e, [0x1385] = 0x391f, [0x1386] = 0x3920, [0x1387] = 0x3921,
-+  [0x1388] = 0x3922, [0x1389] = 0x3923, [0x138a] = 0x3924, [0x138b] = 0x3925,
-+  [0x138c] = 0x3926, [0x138d] = 0x3927, [0x138e] = 0x3928, [0x138f] = 0x3929,
-+  [0x1390] = 0x392a, [0x1391] = 0x392b, [0x1392] = 0x392c, [0x1393] = 0x392d,
-+  [0x1394] = 0x392e, [0x1395] = 0x392f, [0x1396] = 0x3930, [0x1397] = 0x3931,
-+  [0x1398] = 0x3932, [0x1399] = 0x3933, [0x139a] = 0x3934, [0x139b] = 0x3935,
-+  [0x139c] = 0x3936, [0x139d] = 0x3937, [0x139e] = 0x3938, [0x139f] = 0x3939,
-+  [0x13a0] = 0x393a, [0x13a1] = 0x393b, [0x13a2] = 0x393c, [0x13a3] = 0x393d,
-+  [0x13a4] = 0x393e, [0x13a5] = 0x393f, [0x13a6] = 0x3940, [0x13a7] = 0x3941,
-+  [0x13a8] = 0x3942, [0x13a9] = 0x3943, [0x13aa] = 0x3944, [0x13ab] = 0x3945,
-+  [0x13ac] = 0x3946, [0x13ad] = 0x3947, [0x13ae] = 0x3948, [0x13af] = 0x3949,
-+  [0x13b0] = 0x394a, [0x13b1] = 0x394b, [0x13b2] = 0x394c, [0x13b3] = 0x394d,
-+  [0x13b4] = 0x394e, [0x13b5] = 0x394f, [0x13b6] = 0x3950, [0x13b7] = 0x3951,
-+  [0x13b8] = 0x3952, [0x13b9] = 0x3953, [0x13ba] = 0x3954, [0x13bb] = 0x3955,
-+  [0x13bc] = 0x3956, [0x13bd] = 0x3957, [0x13be] = 0x3958, [0x13bf] = 0x3959,
-+  [0x13c0] = 0x395a, [0x13c1] = 0x395b, [0x13c2] = 0x395c, [0x13c3] = 0x395d,
-+  [0x13c4] = 0x395e, [0x13c5] = 0x395f, [0x13c6] = 0x3960, [0x13c7] = 0x3961,
-+  [0x13c8] = 0x3962, [0x13c9] = 0x3963, [0x13ca] = 0x3964, [0x13cb] = 0x3965,
-+  [0x13cc] = 0x3966, [0x13cd] = 0x3967, [0x13ce] = 0x3968, [0x13cf] = 0x3969,
-+  [0x13d0] = 0x396a, [0x13d1] = 0x396b, [0x13d2] = 0x396c, [0x13d3] = 0x396d,
-+  [0x13d4] = 0x396f, [0x13d5] = 0x3970, [0x13d6] = 0x3971, [0x13d7] = 0x3972,
-+  [0x13d8] = 0x3973, [0x13d9] = 0x3974, [0x13da] = 0x3975, [0x13db] = 0x3976,
-+  [0x13dc] = 0x3977, [0x13dd] = 0x3978, [0x13de] = 0x3979, [0x13df] = 0x397a,
-+  [0x13e0] = 0x397b, [0x13e1] = 0x397c, [0x13e2] = 0x397d, [0x13e3] = 0x397e,
-+  [0x13e4] = 0x397f, [0x13e5] = 0x3980, [0x13e6] = 0x3981, [0x13e7] = 0x3982,
-+  [0x13e8] = 0x3983, [0x13e9] = 0x3984, [0x13ea] = 0x3985, [0x13eb] = 0x3986,
-+  [0x13ec] = 0x3987, [0x13ed] = 0x3988, [0x13ee] = 0x3989, [0x13ef] = 0x398a,
-+  [0x13f0] = 0x398b, [0x13f1] = 0x398c, [0x13f2] = 0x398d, [0x13f3] = 0x398e,
-+  [0x13f4] = 0x398f, [0x13f5] = 0x3990, [0x13f6] = 0x3991, [0x13f7] = 0x3992,
-+  [0x13f8] = 0x3993, [0x13f9] = 0x3994, [0x13fa] = 0x3995, [0x13fb] = 0x3996,
-+  [0x13fc] = 0x3997, [0x13fd] = 0x3998, [0x13fe] = 0x3999, [0x13ff] = 0x399a,
-+  [0x1400] = 0x399b, [0x1401] = 0x399c, [0x1402] = 0x399d, [0x1403] = 0x399e,
-+  [0x1404] = 0x399f, [0x1405] = 0x39a0, [0x1406] = 0x39a1, [0x1407] = 0x39a2,
-+  [0x1408] = 0x39a3, [0x1409] = 0x39a4, [0x140a] = 0x39a5, [0x140b] = 0x39a6,
-+  [0x140c] = 0x39a7, [0x140d] = 0x39a8, [0x140e] = 0x39a9, [0x140f] = 0x39aa,
-+  [0x1410] = 0x39ab, [0x1411] = 0x39ac, [0x1412] = 0x39ad, [0x1413] = 0x39ae,
-+  [0x1414] = 0x39af, [0x1415] = 0x39b0, [0x1416] = 0x39b1, [0x1417] = 0x39b2,
-+  [0x1418] = 0x39b3, [0x1419] = 0x39b4, [0x141a] = 0x39b5, [0x141b] = 0x39b6,
-+  [0x141c] = 0x39b7, [0x141d] = 0x39b8, [0x141e] = 0x39b9, [0x141f] = 0x39ba,
-+  [0x1420] = 0x39bb, [0x1421] = 0x39bc, [0x1422] = 0x39bd, [0x1423] = 0x39be,
-+  [0x1424] = 0x39bf, [0x1425] = 0x39c0, [0x1426] = 0x39c1, [0x1427] = 0x39c2,
-+  [0x1428] = 0x39c3, [0x1429] = 0x39c4, [0x142a] = 0x39c5, [0x142b] = 0x39c6,
-+  [0x142c] = 0x39c7, [0x142d] = 0x39c8, [0x142e] = 0x39c9, [0x142f] = 0x39ca,
-+  [0x1430] = 0x39cb, [0x1431] = 0x39cc, [0x1432] = 0x39cd, [0x1433] = 0x39ce,
-+  [0x1434] = 0x39d1, [0x1435] = 0x39d2, [0x1436] = 0x39d3, [0x1437] = 0x39d4,
-+  [0x1438] = 0x39d5, [0x1439] = 0x39d6, [0x143a] = 0x39d7, [0x143b] = 0x39d8,
-+  [0x143c] = 0x39d9, [0x143d] = 0x39da, [0x143e] = 0x39db, [0x143f] = 0x39dc,
-+  [0x1440] = 0x39dd, [0x1441] = 0x39de, [0x1442] = 0x39e0, [0x1443] = 0x39e1,
-+  [0x1444] = 0x39e2, [0x1445] = 0x39e3, [0x1446] = 0x39e4, [0x1447] = 0x39e5,
-+  [0x1448] = 0x39e6, [0x1449] = 0x39e7, [0x144a] = 0x39e8, [0x144b] = 0x39e9,
-+  [0x144c] = 0x39ea, [0x144d] = 0x39eb, [0x144e] = 0x39ec, [0x144f] = 0x39ed,
-+  [0x1450] = 0x39ee, [0x1451] = 0x39ef, [0x1452] = 0x39f0, [0x1453] = 0x39f1,
-+  [0x1454] = 0x39f2, [0x1455] = 0x39f3, [0x1456] = 0x39f4, [0x1457] = 0x39f5,
-+  [0x1458] = 0x39f6, [0x1459] = 0x39f7, [0x145a] = 0x39f8, [0x145b] = 0x39f9,
-+  [0x145c] = 0x39fa, [0x145d] = 0x39fb, [0x145e] = 0x39fc, [0x145f] = 0x39fd,
-+  [0x1460] = 0x39fe, [0x1461] = 0x39ff, [0x1462] = 0x3a00, [0x1463] = 0x3a01,
-+  [0x1464] = 0x3a02, [0x1465] = 0x3a03, [0x1466] = 0x3a04, [0x1467] = 0x3a05,
-+  [0x1468] = 0x3a06, [0x1469] = 0x3a07, [0x146a] = 0x3a08, [0x146b] = 0x3a09,
-+  [0x146c] = 0x3a0a, [0x146d] = 0x3a0b, [0x146e] = 0x3a0c, [0x146f] = 0x3a0d,
-+  [0x1470] = 0x3a0e, [0x1471] = 0x3a0f, [0x1472] = 0x3a10, [0x1473] = 0x3a11,
-+  [0x1474] = 0x3a12, [0x1475] = 0x3a13, [0x1476] = 0x3a14, [0x1477] = 0x3a15,
-+  [0x1478] = 0x3a16, [0x1479] = 0x3a17, [0x147a] = 0x3a18, [0x147b] = 0x3a19,
-+  [0x147c] = 0x3a1a, [0x147d] = 0x3a1b, [0x147e] = 0x3a1c, [0x147f] = 0x3a1d,
-+  [0x1480] = 0x3a1e, [0x1481] = 0x3a1f, [0x1482] = 0x3a20, [0x1483] = 0x3a21,
-+  [0x1484] = 0x3a22, [0x1485] = 0x3a23, [0x1486] = 0x3a24, [0x1487] = 0x3a25,
-+  [0x1488] = 0x3a26, [0x1489] = 0x3a27, [0x148a] = 0x3a28, [0x148b] = 0x3a29,
-+  [0x148c] = 0x3a2a, [0x148d] = 0x3a2b, [0x148e] = 0x3a2c, [0x148f] = 0x3a2d,
-+  [0x1490] = 0x3a2e, [0x1491] = 0x3a2f, [0x1492] = 0x3a30, [0x1493] = 0x3a31,
-+  [0x1494] = 0x3a32, [0x1495] = 0x3a33, [0x1496] = 0x3a34, [0x1497] = 0x3a35,
-+  [0x1498] = 0x3a36, [0x1499] = 0x3a37, [0x149a] = 0x3a38, [0x149b] = 0x3a39,
-+  [0x149c] = 0x3a3a, [0x149d] = 0x3a3b, [0x149e] = 0x3a3c, [0x149f] = 0x3a3d,
-+  [0x14a0] = 0x3a3e, [0x14a1] = 0x3a3f, [0x14a2] = 0x3a40, [0x14a3] = 0x3a41,
-+  [0x14a4] = 0x3a42, [0x14a5] = 0x3a43, [0x14a6] = 0x3a44, [0x14a7] = 0x3a45,
-+  [0x14a8] = 0x3a46, [0x14a9] = 0x3a47, [0x14aa] = 0x3a48, [0x14ab] = 0x3a49,
-+  [0x14ac] = 0x3a4a, [0x14ad] = 0x3a4b, [0x14ae] = 0x3a4c, [0x14af] = 0x3a4d,
-+  [0x14b0] = 0x3a4e, [0x14b1] = 0x3a4f, [0x14b2] = 0x3a50, [0x14b3] = 0x3a51,
-+  [0x14b4] = 0x3a52, [0x14b5] = 0x3a53, [0x14b6] = 0x3a54, [0x14b7] = 0x3a55,
-+  [0x14b8] = 0x3a56, [0x14b9] = 0x3a57, [0x14ba] = 0x3a58, [0x14bb] = 0x3a59,
-+  [0x14bc] = 0x3a5a, [0x14bd] = 0x3a5b, [0x14be] = 0x3a5c, [0x14bf] = 0x3a5d,
-+  [0x14c0] = 0x3a5e, [0x14c1] = 0x3a5f, [0x14c2] = 0x3a60, [0x14c3] = 0x3a61,
-+  [0x14c4] = 0x3a62, [0x14c5] = 0x3a63, [0x14c6] = 0x3a64, [0x14c7] = 0x3a65,
-+  [0x14c8] = 0x3a66, [0x14c9] = 0x3a67, [0x14ca] = 0x3a68, [0x14cb] = 0x3a69,
-+  [0x14cc] = 0x3a6a, [0x14cd] = 0x3a6b, [0x14ce] = 0x3a6c, [0x14cf] = 0x3a6d,
-+  [0x14d0] = 0x3a6e, [0x14d1] = 0x3a6f, [0x14d2] = 0x3a70, [0x14d3] = 0x3a71,
-+  [0x14d4] = 0x3a72, [0x14d5] = 0x3a74, [0x14d6] = 0x3a75, [0x14d7] = 0x3a76,
-+  [0x14d8] = 0x3a77, [0x14d9] = 0x3a78, [0x14da] = 0x3a79, [0x14db] = 0x3a7a,
-+  [0x14dc] = 0x3a7b, [0x14dd] = 0x3a7c, [0x14de] = 0x3a7d, [0x14df] = 0x3a7e,
-+  [0x14e0] = 0x3a7f, [0x14e1] = 0x3a80, [0x14e2] = 0x3a81, [0x14e3] = 0x3a82,
-+  [0x14e4] = 0x3a83, [0x14e5] = 0x3a84, [0x14e6] = 0x3a85, [0x14e7] = 0x3a86,
-+  [0x14e8] = 0x3a87, [0x14e9] = 0x3a88, [0x14ea] = 0x3a89, [0x14eb] = 0x3a8a,
-+  [0x14ec] = 0x3a8b, [0x14ed] = 0x3a8c, [0x14ee] = 0x3a8d, [0x14ef] = 0x3a8e,
-+  [0x14f0] = 0x3a8f, [0x14f1] = 0x3a90, [0x14f2] = 0x3a91, [0x14f3] = 0x3a92,
-+  [0x14f4] = 0x3a93, [0x14f5] = 0x3a94, [0x14f6] = 0x3a95, [0x14f7] = 0x3a96,
-+  [0x14f8] = 0x3a97, [0x14f9] = 0x3a98, [0x14fa] = 0x3a99, [0x14fb] = 0x3a9a,
-+  [0x14fc] = 0x3a9b, [0x14fd] = 0x3a9c, [0x14fe] = 0x3a9d, [0x14ff] = 0x3a9e,
-+  [0x1500] = 0x3a9f, [0x1501] = 0x3aa0, [0x1502] = 0x3aa1, [0x1503] = 0x3aa2,
-+  [0x1504] = 0x3aa3, [0x1505] = 0x3aa4, [0x1506] = 0x3aa5, [0x1507] = 0x3aa6,
-+  [0x1508] = 0x3aa7, [0x1509] = 0x3aa8, [0x150a] = 0x3aa9, [0x150b] = 0x3aaa,
-+  [0x150c] = 0x3aab, [0x150d] = 0x3aac, [0x150e] = 0x3aad, [0x150f] = 0x3aae,
-+  [0x1510] = 0x3aaf, [0x1511] = 0x3ab0, [0x1512] = 0x3ab1, [0x1513] = 0x3ab2,
-+  [0x1514] = 0x3ab3, [0x1515] = 0x3ab4, [0x1516] = 0x3ab5, [0x1517] = 0x3ab6,
-+  [0x1518] = 0x3ab7, [0x1519] = 0x3ab8, [0x151a] = 0x3ab9, [0x151b] = 0x3aba,
-+  [0x151c] = 0x3abb, [0x151d] = 0x3abc, [0x151e] = 0x3abd, [0x151f] = 0x3abe,
-+  [0x1520] = 0x3abf, [0x1521] = 0x3ac0, [0x1522] = 0x3ac1, [0x1523] = 0x3ac2,
-+  [0x1524] = 0x3ac3, [0x1525] = 0x3ac4, [0x1526] = 0x3ac5, [0x1527] = 0x3ac6,
-+  [0x1528] = 0x3ac7, [0x1529] = 0x3ac8, [0x152a] = 0x3ac9, [0x152b] = 0x3aca,
-+  [0x152c] = 0x3acb, [0x152d] = 0x3acc, [0x152e] = 0x3acd, [0x152f] = 0x3ace,
-+  [0x1530] = 0x3acf, [0x1531] = 0x3ad0, [0x1532] = 0x3ad1, [0x1533] = 0x3ad2,
-+  [0x1534] = 0x3ad3, [0x1535] = 0x3ad4, [0x1536] = 0x3ad5, [0x1537] = 0x3ad6,
-+  [0x1538] = 0x3ad7, [0x1539] = 0x3ad8, [0x153a] = 0x3ad9, [0x153b] = 0x3ada,
-+  [0x153c] = 0x3adb, [0x153d] = 0x3adc, [0x153e] = 0x3add, [0x153f] = 0x3ade,
-+  [0x1540] = 0x3adf, [0x1541] = 0x3ae0, [0x1542] = 0x3ae1, [0x1543] = 0x3ae2,
-+  [0x1544] = 0x3ae3, [0x1545] = 0x3ae4, [0x1546] = 0x3ae5, [0x1547] = 0x3ae6,
-+  [0x1548] = 0x3ae7, [0x1549] = 0x3ae8, [0x154a] = 0x3ae9, [0x154b] = 0x3aea,
-+  [0x154c] = 0x3aeb, [0x154d] = 0x3aec, [0x154e] = 0x3aed, [0x154f] = 0x3aee,
-+  [0x1550] = 0x3aef, [0x1551] = 0x3af0, [0x1552] = 0x3af1, [0x1553] = 0x3af2,
-+  [0x1554] = 0x3af3, [0x1555] = 0x3af4, [0x1556] = 0x3af5, [0x1557] = 0x3af6,
-+  [0x1558] = 0x3af7, [0x1559] = 0x3af8, [0x155a] = 0x3af9, [0x155b] = 0x3afa,
-+  [0x155c] = 0x3afb, [0x155d] = 0x3afc, [0x155e] = 0x3afd, [0x155f] = 0x3afe,
-+  [0x1560] = 0x3aff, [0x1561] = 0x3b00, [0x1562] = 0x3b01, [0x1563] = 0x3b02,
-+  [0x1564] = 0x3b03, [0x1565] = 0x3b04, [0x1566] = 0x3b05, [0x1567] = 0x3b06,
-+  [0x1568] = 0x3b07, [0x1569] = 0x3b08, [0x156a] = 0x3b09, [0x156b] = 0x3b0a,
-+  [0x156c] = 0x3b0b, [0x156d] = 0x3b0c, [0x156e] = 0x3b0d, [0x156f] = 0x3b0e,
-+  [0x1570] = 0x3b0f, [0x1571] = 0x3b10, [0x1572] = 0x3b11, [0x1573] = 0x3b12,
-+  [0x1574] = 0x3b13, [0x1575] = 0x3b14, [0x1576] = 0x3b15, [0x1577] = 0x3b16,
-+  [0x1578] = 0x3b17, [0x1579] = 0x3b18, [0x157a] = 0x3b19, [0x157b] = 0x3b1a,
-+  [0x157c] = 0x3b1b, [0x157d] = 0x3b1c, [0x157e] = 0x3b1d, [0x157f] = 0x3b1e,
-+  [0x1580] = 0x3b1f, [0x1581] = 0x3b20, [0x1582] = 0x3b21, [0x1583] = 0x3b22,
-+  [0x1584] = 0x3b23, [0x1585] = 0x3b24, [0x1586] = 0x3b25, [0x1587] = 0x3b26,
-+  [0x1588] = 0x3b27, [0x1589] = 0x3b28, [0x158a] = 0x3b29, [0x158b] = 0x3b2a,
-+  [0x158c] = 0x3b2b, [0x158d] = 0x3b2c, [0x158e] = 0x3b2d, [0x158f] = 0x3b2e,
-+  [0x1590] = 0x3b2f, [0x1591] = 0x3b30, [0x1592] = 0x3b31, [0x1593] = 0x3b32,
-+  [0x1594] = 0x3b33, [0x1595] = 0x3b34, [0x1596] = 0x3b35, [0x1597] = 0x3b36,
-+  [0x1598] = 0x3b37, [0x1599] = 0x3b38, [0x159a] = 0x3b39, [0x159b] = 0x3b3a,
-+  [0x159c] = 0x3b3b, [0x159d] = 0x3b3c, [0x159e] = 0x3b3d, [0x159f] = 0x3b3e,
-+  [0x15a0] = 0x3b3f, [0x15a1] = 0x3b40, [0x15a2] = 0x3b41, [0x15a3] = 0x3b42,
-+  [0x15a4] = 0x3b43, [0x15a5] = 0x3b44, [0x15a6] = 0x3b45, [0x15a7] = 0x3b46,
-+  [0x15a8] = 0x3b47, [0x15a9] = 0x3b48, [0x15aa] = 0x3b49, [0x15ab] = 0x3b4a,
-+  [0x15ac] = 0x3b4b, [0x15ad] = 0x3b4c, [0x15ae] = 0x3b4d, [0x15af] = 0x3b4f,
-+  [0x15b0] = 0x3b50, [0x15b1] = 0x3b51, [0x15b2] = 0x3b52, [0x15b3] = 0x3b53,
-+  [0x15b4] = 0x3b54, [0x15b5] = 0x3b55, [0x15b6] = 0x3b56, [0x15b7] = 0x3b57,
-+  [0x15b8] = 0x3b58, [0x15b9] = 0x3b59, [0x15ba] = 0x3b5a, [0x15bb] = 0x3b5b,
-+  [0x15bc] = 0x3b5c, [0x15bd] = 0x3b5d, [0x15be] = 0x3b5e, [0x15bf] = 0x3b5f,
-+  [0x15c0] = 0x3b60, [0x15c1] = 0x3b61, [0x15c2] = 0x3b62, [0x15c3] = 0x3b63,
-+  [0x15c4] = 0x3b64, [0x15c5] = 0x3b65, [0x15c6] = 0x3b66, [0x15c7] = 0x3b67,
-+  [0x15c8] = 0x3b68, [0x15c9] = 0x3b69, [0x15ca] = 0x3b6a, [0x15cb] = 0x3b6b,
-+  [0x15cc] = 0x3b6c, [0x15cd] = 0x3b6d, [0x15ce] = 0x3b6e, [0x15cf] = 0x3b6f,
-+  [0x15d0] = 0x3b70, [0x15d1] = 0x3b71, [0x15d2] = 0x3b72, [0x15d3] = 0x3b73,
-+  [0x15d4] = 0x3b74, [0x15d5] = 0x3b75, [0x15d6] = 0x3b76, [0x15d7] = 0x3b77,
-+  [0x15d8] = 0x3b78, [0x15d9] = 0x3b79, [0x15da] = 0x3b7a, [0x15db] = 0x3b7b,
-+  [0x15dc] = 0x3b7c, [0x15dd] = 0x3b7d, [0x15de] = 0x3b7e, [0x15df] = 0x3b7f,
-+  [0x15e0] = 0x3b80, [0x15e1] = 0x3b81, [0x15e2] = 0x3b82, [0x15e3] = 0x3b83,
-+  [0x15e4] = 0x3b84, [0x15e5] = 0x3b85, [0x15e6] = 0x3b86, [0x15e7] = 0x3b87,
-+  [0x15e8] = 0x3b88, [0x15e9] = 0x3b89, [0x15ea] = 0x3b8a, [0x15eb] = 0x3b8b,
-+  [0x15ec] = 0x3b8c, [0x15ed] = 0x3b8d, [0x15ee] = 0x3b8e, [0x15ef] = 0x3b8f,
-+  [0x15f0] = 0x3b90, [0x15f1] = 0x3b91, [0x15f2] = 0x3b92, [0x15f3] = 0x3b93,
-+  [0x15f4] = 0x3b94, [0x15f5] = 0x3b95, [0x15f6] = 0x3b96, [0x15f7] = 0x3b97,
-+  [0x15f8] = 0x3b98, [0x15f9] = 0x3b99, [0x15fa] = 0x3b9a, [0x15fb] = 0x3b9b,
-+  [0x15fc] = 0x3b9c, [0x15fd] = 0x3b9d, [0x15fe] = 0x3b9e, [0x15ff] = 0x3b9f,
-+  [0x1600] = 0x3ba0, [0x1601] = 0x3ba1, [0x1602] = 0x3ba2, [0x1603] = 0x3ba3,
-+  [0x1604] = 0x3ba4, [0x1605] = 0x3ba5, [0x1606] = 0x3ba6, [0x1607] = 0x3ba7,
-+  [0x1608] = 0x3ba8, [0x1609] = 0x3ba9, [0x160a] = 0x3baa, [0x160b] = 0x3bab,
-+  [0x160c] = 0x3bac, [0x160d] = 0x3bad, [0x160e] = 0x3bae, [0x160f] = 0x3baf,
-+  [0x1610] = 0x3bb0, [0x1611] = 0x3bb1, [0x1612] = 0x3bb2, [0x1613] = 0x3bb3,
-+  [0x1614] = 0x3bb4, [0x1615] = 0x3bb5, [0x1616] = 0x3bb6, [0x1617] = 0x3bb7,
-+  [0x1618] = 0x3bb8, [0x1619] = 0x3bb9, [0x161a] = 0x3bba, [0x161b] = 0x3bbb,
-+  [0x161c] = 0x3bbc, [0x161d] = 0x3bbd, [0x161e] = 0x3bbe, [0x161f] = 0x3bbf,
-+  [0x1620] = 0x3bc0, [0x1621] = 0x3bc1, [0x1622] = 0x3bc2, [0x1623] = 0x3bc3,
-+  [0x1624] = 0x3bc4, [0x1625] = 0x3bc5, [0x1626] = 0x3bc6, [0x1627] = 0x3bc7,
-+  [0x1628] = 0x3bc8, [0x1629] = 0x3bc9, [0x162a] = 0x3bca, [0x162b] = 0x3bcb,
-+  [0x162c] = 0x3bcc, [0x162d] = 0x3bcd, [0x162e] = 0x3bce, [0x162f] = 0x3bcf,
-+  [0x1630] = 0x3bd0, [0x1631] = 0x3bd1, [0x1632] = 0x3bd2, [0x1633] = 0x3bd3,
-+  [0x1634] = 0x3bd4, [0x1635] = 0x3bd5, [0x1636] = 0x3bd6, [0x1637] = 0x3bd7,
-+  [0x1638] = 0x3bd8, [0x1639] = 0x3bd9, [0x163a] = 0x3bda, [0x163b] = 0x3bdb,
-+  [0x163c] = 0x3bdc, [0x163d] = 0x3bdd, [0x163e] = 0x3bde, [0x163f] = 0x3bdf,
-+  [0x1640] = 0x3be0, [0x1641] = 0x3be1, [0x1642] = 0x3be2, [0x1643] = 0x3be3,
-+  [0x1644] = 0x3be4, [0x1645] = 0x3be5, [0x1646] = 0x3be6, [0x1647] = 0x3be7,
-+  [0x1648] = 0x3be8, [0x1649] = 0x3be9, [0x164a] = 0x3bea, [0x164b] = 0x3beb,
-+  [0x164c] = 0x3bec, [0x164d] = 0x3bed, [0x164e] = 0x3bee, [0x164f] = 0x3bef,
-+  [0x1650] = 0x3bf0, [0x1651] = 0x3bf1, [0x1652] = 0x3bf2, [0x1653] = 0x3bf3,
-+  [0x1654] = 0x3bf4, [0x1655] = 0x3bf5, [0x1656] = 0x3bf6, [0x1657] = 0x3bf7,
-+  [0x1658] = 0x3bf8, [0x1659] = 0x3bf9, [0x165a] = 0x3bfa, [0x165b] = 0x3bfb,
-+  [0x165c] = 0x3bfc, [0x165d] = 0x3bfd, [0x165e] = 0x3bfe, [0x165f] = 0x3bff,
-+  [0x1660] = 0x3c00, [0x1661] = 0x3c01, [0x1662] = 0x3c02, [0x1663] = 0x3c03,
-+  [0x1664] = 0x3c04, [0x1665] = 0x3c05, [0x1666] = 0x3c06, [0x1667] = 0x3c07,
-+  [0x1668] = 0x3c08, [0x1669] = 0x3c09, [0x166a] = 0x3c0a, [0x166b] = 0x3c0b,
-+  [0x166c] = 0x3c0c, [0x166d] = 0x3c0d, [0x166e] = 0x3c0e, [0x166f] = 0x3c0f,
-+  [0x1670] = 0x3c10, [0x1671] = 0x3c11, [0x1672] = 0x3c12, [0x1673] = 0x3c13,
-+  [0x1674] = 0x3c14, [0x1675] = 0x3c15, [0x1676] = 0x3c16, [0x1677] = 0x3c17,
-+  [0x1678] = 0x3c18, [0x1679] = 0x3c19, [0x167a] = 0x3c1a, [0x167b] = 0x3c1b,
-+  [0x167c] = 0x3c1c, [0x167d] = 0x3c1d, [0x167e] = 0x3c1e, [0x167f] = 0x3c1f,
-+  [0x1680] = 0x3c20, [0x1681] = 0x3c21, [0x1682] = 0x3c22, [0x1683] = 0x3c23,
-+  [0x1684] = 0x3c24, [0x1685] = 0x3c25, [0x1686] = 0x3c26, [0x1687] = 0x3c27,
-+  [0x1688] = 0x3c28, [0x1689] = 0x3c29, [0x168a] = 0x3c2a, [0x168b] = 0x3c2b,
-+  [0x168c] = 0x3c2c, [0x168d] = 0x3c2d, [0x168e] = 0x3c2e, [0x168f] = 0x3c2f,
-+  [0x1690] = 0x3c30, [0x1691] = 0x3c31, [0x1692] = 0x3c32, [0x1693] = 0x3c33,
-+  [0x1694] = 0x3c34, [0x1695] = 0x3c35, [0x1696] = 0x3c36, [0x1697] = 0x3c37,
-+  [0x1698] = 0x3c38, [0x1699] = 0x3c39, [0x169a] = 0x3c3a, [0x169b] = 0x3c3b,
-+  [0x169c] = 0x3c3c, [0x169d] = 0x3c3d, [0x169e] = 0x3c3e, [0x169f] = 0x3c3f,
-+  [0x16a0] = 0x3c40, [0x16a1] = 0x3c41, [0x16a2] = 0x3c42, [0x16a3] = 0x3c43,
-+  [0x16a4] = 0x3c44, [0x16a5] = 0x3c45, [0x16a6] = 0x3c46, [0x16a7] = 0x3c47,
-+  [0x16a8] = 0x3c48, [0x16a9] = 0x3c49, [0x16aa] = 0x3c4a, [0x16ab] = 0x3c4b,
-+  [0x16ac] = 0x3c4c, [0x16ad] = 0x3c4d, [0x16ae] = 0x3c4e, [0x16af] = 0x3c4f,
-+  [0x16b0] = 0x3c50, [0x16b1] = 0x3c51, [0x16b2] = 0x3c52, [0x16b3] = 0x3c53,
-+  [0x16b4] = 0x3c54, [0x16b5] = 0x3c55, [0x16b6] = 0x3c56, [0x16b7] = 0x3c57,
-+  [0x16b8] = 0x3c58, [0x16b9] = 0x3c59, [0x16ba] = 0x3c5a, [0x16bb] = 0x3c5b,
-+  [0x16bc] = 0x3c5c, [0x16bd] = 0x3c5d, [0x16be] = 0x3c5e, [0x16bf] = 0x3c5f,
-+  [0x16c0] = 0x3c60, [0x16c1] = 0x3c61, [0x16c2] = 0x3c62, [0x16c3] = 0x3c63,
-+  [0x16c4] = 0x3c64, [0x16c5] = 0x3c65, [0x16c6] = 0x3c66, [0x16c7] = 0x3c67,
-+  [0x16c8] = 0x3c68, [0x16c9] = 0x3c69, [0x16ca] = 0x3c6a, [0x16cb] = 0x3c6b,
-+  [0x16cc] = 0x3c6c, [0x16cd] = 0x3c6d, [0x16ce] = 0x3c6f, [0x16cf] = 0x3c70,
-+  [0x16d0] = 0x3c71, [0x16d1] = 0x3c72, [0x16d2] = 0x3c73, [0x16d3] = 0x3c74,
-+  [0x16d4] = 0x3c75, [0x16d5] = 0x3c76, [0x16d6] = 0x3c77, [0x16d7] = 0x3c78,
-+  [0x16d8] = 0x3c79, [0x16d9] = 0x3c7a, [0x16da] = 0x3c7b, [0x16db] = 0x3c7c,
-+  [0x16dc] = 0x3c7d, [0x16dd] = 0x3c7e, [0x16de] = 0x3c7f, [0x16df] = 0x3c80,
-+  [0x16e0] = 0x3c81, [0x16e1] = 0x3c82, [0x16e2] = 0x3c83, [0x16e3] = 0x3c84,
-+  [0x16e4] = 0x3c85, [0x16e5] = 0x3c86, [0x16e6] = 0x3c87, [0x16e7] = 0x3c88,
-+  [0x16e8] = 0x3c89, [0x16e9] = 0x3c8a, [0x16ea] = 0x3c8b, [0x16eb] = 0x3c8c,
-+  [0x16ec] = 0x3c8d, [0x16ed] = 0x3c8e, [0x16ee] = 0x3c8f, [0x16ef] = 0x3c90,
-+  [0x16f0] = 0x3c91, [0x16f1] = 0x3c92, [0x16f2] = 0x3c93, [0x16f3] = 0x3c94,
-+  [0x16f4] = 0x3c95, [0x16f5] = 0x3c96, [0x16f6] = 0x3c97, [0x16f7] = 0x3c98,
-+  [0x16f8] = 0x3c99, [0x16f9] = 0x3c9a, [0x16fa] = 0x3c9b, [0x16fb] = 0x3c9c,
-+  [0x16fc] = 0x3c9d, [0x16fd] = 0x3c9e, [0x16fe] = 0x3c9f, [0x16ff] = 0x3ca0,
-+  [0x1700] = 0x3ca1, [0x1701] = 0x3ca2, [0x1702] = 0x3ca3, [0x1703] = 0x3ca4,
-+  [0x1704] = 0x3ca5, [0x1705] = 0x3ca6, [0x1706] = 0x3ca7, [0x1707] = 0x3ca8,
-+  [0x1708] = 0x3ca9, [0x1709] = 0x3caa, [0x170a] = 0x3cab, [0x170b] = 0x3cac,
-+  [0x170c] = 0x3cad, [0x170d] = 0x3cae, [0x170e] = 0x3caf, [0x170f] = 0x3cb0,
-+  [0x1710] = 0x3cb1, [0x1711] = 0x3cb2, [0x1712] = 0x3cb3, [0x1713] = 0x3cb4,
-+  [0x1714] = 0x3cb5, [0x1715] = 0x3cb6, [0x1716] = 0x3cb7, [0x1717] = 0x3cb8,
-+  [0x1718] = 0x3cb9, [0x1719] = 0x3cba, [0x171a] = 0x3cbb, [0x171b] = 0x3cbc,
-+  [0x171c] = 0x3cbd, [0x171d] = 0x3cbe, [0x171e] = 0x3cbf, [0x171f] = 0x3cc0,
-+  [0x1720] = 0x3cc1, [0x1721] = 0x3cc2, [0x1722] = 0x3cc3, [0x1723] = 0x3cc4,
-+  [0x1724] = 0x3cc5, [0x1725] = 0x3cc6, [0x1726] = 0x3cc7, [0x1727] = 0x3cc8,
-+  [0x1728] = 0x3cc9, [0x1729] = 0x3cca, [0x172a] = 0x3ccb, [0x172b] = 0x3ccc,
-+  [0x172c] = 0x3ccd, [0x172d] = 0x3cce, [0x172e] = 0x3ccf, [0x172f] = 0x3cd0,
-+  [0x1730] = 0x3cd1, [0x1731] = 0x3cd2, [0x1732] = 0x3cd3, [0x1733] = 0x3cd4,
-+  [0x1734] = 0x3cd5, [0x1735] = 0x3cd6, [0x1736] = 0x3cd7, [0x1737] = 0x3cd8,
-+  [0x1738] = 0x3cd9, [0x1739] = 0x3cda, [0x173a] = 0x3cdb, [0x173b] = 0x3cdc,
-+  [0x173c] = 0x3cdd, [0x173d] = 0x3cde, [0x173e] = 0x3cdf, [0x173f] = 0x3ce1,
-+  [0x1740] = 0x3ce2, [0x1741] = 0x3ce3, [0x1742] = 0x3ce4, [0x1743] = 0x3ce5,
-+  [0x1744] = 0x3ce6, [0x1745] = 0x3ce7, [0x1746] = 0x3ce8, [0x1747] = 0x3ce9,
-+  [0x1748] = 0x3cea, [0x1749] = 0x3ceb, [0x174a] = 0x3cec, [0x174b] = 0x3ced,
-+  [0x174c] = 0x3cee, [0x174d] = 0x3cef, [0x174e] = 0x3cf0, [0x174f] = 0x3cf1,
-+  [0x1750] = 0x3cf2, [0x1751] = 0x3cf3, [0x1752] = 0x3cf4, [0x1753] = 0x3cf5,
-+  [0x1754] = 0x3cf6, [0x1755] = 0x3cf7, [0x1756] = 0x3cf8, [0x1757] = 0x3cf9,
-+  [0x1758] = 0x3cfa, [0x1759] = 0x3cfb, [0x175a] = 0x3cfc, [0x175b] = 0x3cfd,
-+  [0x175c] = 0x3cfe, [0x175d] = 0x3cff, [0x175e] = 0x3d00, [0x175f] = 0x3d01,
-+  [0x1760] = 0x3d02, [0x1761] = 0x3d03, [0x1762] = 0x3d04, [0x1763] = 0x3d05,
-+  [0x1764] = 0x3d06, [0x1765] = 0x3d07, [0x1766] = 0x3d08, [0x1767] = 0x3d09,
-+  [0x1768] = 0x3d0a, [0x1769] = 0x3d0b, [0x176a] = 0x3d0c, [0x176b] = 0x3d0d,
-+  [0x176c] = 0x3d0e, [0x176d] = 0x3d0f, [0x176e] = 0x3d10, [0x176f] = 0x3d11,
-+  [0x1770] = 0x3d12, [0x1771] = 0x3d13, [0x1772] = 0x3d14, [0x1773] = 0x3d15,
-+  [0x1774] = 0x3d16, [0x1775] = 0x3d17, [0x1776] = 0x3d18, [0x1777] = 0x3d19,
-+  [0x1778] = 0x3d1a, [0x1779] = 0x3d1b, [0x177a] = 0x3d1c, [0x177b] = 0x3d1d,
-+  [0x177c] = 0x3d1e, [0x177d] = 0x3d1f, [0x177e] = 0x3d20, [0x177f] = 0x3d21,
-+  [0x1780] = 0x3d22, [0x1781] = 0x3d23, [0x1782] = 0x3d24, [0x1783] = 0x3d25,
-+  [0x1784] = 0x3d26, [0x1785] = 0x3d27, [0x1786] = 0x3d28, [0x1787] = 0x3d29,
-+  [0x1788] = 0x3d2a, [0x1789] = 0x3d2b, [0x178a] = 0x3d2c, [0x178b] = 0x3d2d,
-+  [0x178c] = 0x3d2e, [0x178d] = 0x3d2f, [0x178e] = 0x3d30, [0x178f] = 0x3d31,
-+  [0x1790] = 0x3d32, [0x1791] = 0x3d33, [0x1792] = 0x3d34, [0x1793] = 0x3d35,
-+  [0x1794] = 0x3d36, [0x1795] = 0x3d37, [0x1796] = 0x3d38, [0x1797] = 0x3d39,
-+  [0x1798] = 0x3d3a, [0x1799] = 0x3d3b, [0x179a] = 0x3d3c, [0x179b] = 0x3d3d,
-+  [0x179c] = 0x3d3e, [0x179d] = 0x3d3f, [0x179e] = 0x3d40, [0x179f] = 0x3d41,
-+  [0x17a0] = 0x3d42, [0x17a1] = 0x3d43, [0x17a2] = 0x3d44, [0x17a3] = 0x3d45,
-+  [0x17a4] = 0x3d46, [0x17a5] = 0x3d47, [0x17a6] = 0x3d48, [0x17a7] = 0x3d49,
-+  [0x17a8] = 0x3d4a, [0x17a9] = 0x3d4b, [0x17aa] = 0x3d4c, [0x17ab] = 0x3d4d,
-+  [0x17ac] = 0x3d4e, [0x17ad] = 0x3d4f, [0x17ae] = 0x3d50, [0x17af] = 0x3d51,
-+  [0x17b0] = 0x3d52, [0x17b1] = 0x3d53, [0x17b2] = 0x3d54, [0x17b3] = 0x3d55,
-+  [0x17b4] = 0x3d56, [0x17b5] = 0x3d57, [0x17b6] = 0x3d58, [0x17b7] = 0x3d59,
-+  [0x17b8] = 0x3d5a, [0x17b9] = 0x3d5b, [0x17ba] = 0x3d5c, [0x17bb] = 0x3d5d,
-+  [0x17bc] = 0x3d5e, [0x17bd] = 0x3d5f, [0x17be] = 0x3d60, [0x17bf] = 0x3d61,
-+  [0x17c0] = 0x3d62, [0x17c1] = 0x3d63, [0x17c2] = 0x3d64, [0x17c3] = 0x3d65,
-+  [0x17c4] = 0x3d66, [0x17c5] = 0x3d67, [0x17c6] = 0x3d68, [0x17c7] = 0x3d69,
-+  [0x17c8] = 0x3d6a, [0x17c9] = 0x3d6b, [0x17ca] = 0x3d6c, [0x17cb] = 0x3d6d,
-+  [0x17cc] = 0x3d6e, [0x17cd] = 0x3d6f, [0x17ce] = 0x3d70, [0x17cf] = 0x3d71,
-+  [0x17d0] = 0x3d72, [0x17d1] = 0x3d73, [0x17d2] = 0x3d74, [0x17d3] = 0x3d75,
-+  [0x17d4] = 0x3d76, [0x17d5] = 0x3d77, [0x17d6] = 0x3d78, [0x17d7] = 0x3d79,
-+  [0x17d8] = 0x3d7a, [0x17d9] = 0x3d7b, [0x17da] = 0x3d7c, [0x17db] = 0x3d7d,
-+  [0x17dc] = 0x3d7e, [0x17dd] = 0x3d7f, [0x17de] = 0x3d80, [0x17df] = 0x3d81,
-+  [0x17e0] = 0x3d82, [0x17e1] = 0x3d83, [0x17e2] = 0x3d84, [0x17e3] = 0x3d85,
-+  [0x17e4] = 0x3d86, [0x17e5] = 0x3d87, [0x17e6] = 0x3d88, [0x17e7] = 0x3d89,
-+  [0x17e8] = 0x3d8a, [0x17e9] = 0x3d8b, [0x17ea] = 0x3d8c, [0x17eb] = 0x3d8d,
-+  [0x17ec] = 0x3d8e, [0x17ed] = 0x3d8f, [0x17ee] = 0x3d90, [0x17ef] = 0x3d91,
-+  [0x17f0] = 0x3d92, [0x17f1] = 0x3d93, [0x17f2] = 0x3d94, [0x17f3] = 0x3d95,
-+  [0x17f4] = 0x3d96, [0x17f5] = 0x3d97, [0x17f6] = 0x3d98, [0x17f7] = 0x3d99,
-+  [0x17f8] = 0x3d9a, [0x17f9] = 0x3d9b, [0x17fa] = 0x3d9c, [0x17fb] = 0x3d9d,
-+  [0x17fc] = 0x3d9e, [0x17fd] = 0x3d9f, [0x17fe] = 0x3da0, [0x17ff] = 0x3da1,
-+  [0x1800] = 0x3da2, [0x1801] = 0x3da3, [0x1802] = 0x3da4, [0x1803] = 0x3da5,
-+  [0x1804] = 0x3da6, [0x1805] = 0x3da7, [0x1806] = 0x3da8, [0x1807] = 0x3da9,
-+  [0x1808] = 0x3daa, [0x1809] = 0x3dab, [0x180a] = 0x3dac, [0x180b] = 0x3dad,
-+  [0x180c] = 0x3dae, [0x180d] = 0x3daf, [0x180e] = 0x3db0, [0x180f] = 0x3db1,
-+  [0x1810] = 0x3db2, [0x1811] = 0x3db3, [0x1812] = 0x3db4, [0x1813] = 0x3db5,
-+  [0x1814] = 0x3db6, [0x1815] = 0x3db7, [0x1816] = 0x3db8, [0x1817] = 0x3db9,
-+  [0x1818] = 0x3dba, [0x1819] = 0x3dbb, [0x181a] = 0x3dbc, [0x181b] = 0x3dbd,
-+  [0x181c] = 0x3dbe, [0x181d] = 0x3dbf, [0x181e] = 0x3dc0, [0x181f] = 0x3dc1,
-+  [0x1820] = 0x3dc2, [0x1821] = 0x3dc3, [0x1822] = 0x3dc4, [0x1823] = 0x3dc5,
-+  [0x1824] = 0x3dc6, [0x1825] = 0x3dc7, [0x1826] = 0x3dc8, [0x1827] = 0x3dc9,
-+  [0x1828] = 0x3dca, [0x1829] = 0x3dcb, [0x182a] = 0x3dcc, [0x182b] = 0x3dcd,
-+  [0x182c] = 0x3dce, [0x182d] = 0x3dcf, [0x182e] = 0x3dd0, [0x182f] = 0x3dd1,
-+  [0x1830] = 0x3dd2, [0x1831] = 0x3dd3, [0x1832] = 0x3dd4, [0x1833] = 0x3dd5,
-+  [0x1834] = 0x3dd6, [0x1835] = 0x3dd7, [0x1836] = 0x3dd8, [0x1837] = 0x3dd9,
-+  [0x1838] = 0x3dda, [0x1839] = 0x3ddb, [0x183a] = 0x3ddc, [0x183b] = 0x3ddd,
-+  [0x183c] = 0x3dde, [0x183d] = 0x3ddf, [0x183e] = 0x3de0, [0x183f] = 0x3de1,
-+  [0x1840] = 0x3de2, [0x1841] = 0x3de3, [0x1842] = 0x3de4, [0x1843] = 0x3de5,
-+  [0x1844] = 0x3de6, [0x1845] = 0x3de7, [0x1846] = 0x3de8, [0x1847] = 0x3de9,
-+  [0x1848] = 0x3dea, [0x1849] = 0x3deb, [0x184a] = 0x3dec, [0x184b] = 0x3ded,
-+  [0x184c] = 0x3dee, [0x184d] = 0x3def, [0x184e] = 0x3df0, [0x184f] = 0x3df1,
-+  [0x1850] = 0x3df2, [0x1851] = 0x3df3, [0x1852] = 0x3df4, [0x1853] = 0x3df5,
-+  [0x1854] = 0x3df6, [0x1855] = 0x3df7, [0x1856] = 0x3df8, [0x1857] = 0x3df9,
-+  [0x1858] = 0x3dfa, [0x1859] = 0x3dfb, [0x185a] = 0x3dfc, [0x185b] = 0x3dfd,
-+  [0x185c] = 0x3dfe, [0x185d] = 0x3dff, [0x185e] = 0x3e00, [0x185f] = 0x3e01,
-+  [0x1860] = 0x3e02, [0x1861] = 0x3e03, [0x1862] = 0x3e04, [0x1863] = 0x3e05,
-+  [0x1864] = 0x3e06, [0x1865] = 0x3e07, [0x1866] = 0x3e08, [0x1867] = 0x3e09,
-+  [0x1868] = 0x3e0a, [0x1869] = 0x3e0b, [0x186a] = 0x3e0c, [0x186b] = 0x3e0d,
-+  [0x186c] = 0x3e0e, [0x186d] = 0x3e0f, [0x186e] = 0x3e10, [0x186f] = 0x3e11,
-+  [0x1870] = 0x3e12, [0x1871] = 0x3e13, [0x1872] = 0x3e14, [0x1873] = 0x3e15,
-+  [0x1874] = 0x3e16, [0x1875] = 0x3e17, [0x1876] = 0x3e18, [0x1877] = 0x3e19,
-+  [0x1878] = 0x3e1a, [0x1879] = 0x3e1b, [0x187a] = 0x3e1c, [0x187b] = 0x3e1d,
-+  [0x187c] = 0x3e1e, [0x187d] = 0x3e1f, [0x187e] = 0x3e20, [0x187f] = 0x3e21,
-+  [0x1880] = 0x3e22, [0x1881] = 0x3e23, [0x1882] = 0x3e24, [0x1883] = 0x3e25,
-+  [0x1884] = 0x3e26, [0x1885] = 0x3e27, [0x1886] = 0x3e28, [0x1887] = 0x3e29,
-+  [0x1888] = 0x3e2a, [0x1889] = 0x3e2b, [0x188a] = 0x3e2c, [0x188b] = 0x3e2d,
-+  [0x188c] = 0x3e2e, [0x188d] = 0x3e2f, [0x188e] = 0x3e30, [0x188f] = 0x3e31,
-+  [0x1890] = 0x3e32, [0x1891] = 0x3e33, [0x1892] = 0x3e34, [0x1893] = 0x3e35,
-+  [0x1894] = 0x3e36, [0x1895] = 0x3e37, [0x1896] = 0x3e38, [0x1897] = 0x3e39,
-+  [0x1898] = 0x3e3a, [0x1899] = 0x3e3b, [0x189a] = 0x3e3c, [0x189b] = 0x3e3d,
-+  [0x189c] = 0x3e3e, [0x189d] = 0x3e3f, [0x189e] = 0x3e40, [0x189f] = 0x3e41,
-+  [0x18a0] = 0x3e42, [0x18a1] = 0x3e43, [0x18a2] = 0x3e44, [0x18a3] = 0x3e45,
-+  [0x18a4] = 0x3e46, [0x18a5] = 0x3e47, [0x18a6] = 0x3e48, [0x18a7] = 0x3e49,
-+  [0x18a8] = 0x3e4a, [0x18a9] = 0x3e4b, [0x18aa] = 0x3e4c, [0x18ab] = 0x3e4d,
-+  [0x18ac] = 0x3e4e, [0x18ad] = 0x3e4f, [0x18ae] = 0x3e50, [0x18af] = 0x3e51,
-+  [0x18b0] = 0x3e52, [0x18b1] = 0x3e53, [0x18b2] = 0x3e54, [0x18b3] = 0x3e55,
-+  [0x18b4] = 0x3e56, [0x18b5] = 0x3e57, [0x18b6] = 0x3e58, [0x18b7] = 0x3e59,
-+  [0x18b8] = 0x3e5a, [0x18b9] = 0x3e5b, [0x18ba] = 0x3e5c, [0x18bb] = 0x3e5d,
-+  [0x18bc] = 0x3e5e, [0x18bd] = 0x3e5f, [0x18be] = 0x3e60, [0x18bf] = 0x3e61,
-+  [0x18c0] = 0x3e62, [0x18c1] = 0x3e63, [0x18c2] = 0x3e64, [0x18c3] = 0x3e65,
-+  [0x18c4] = 0x3e66, [0x18c5] = 0x3e67, [0x18c6] = 0x3e68, [0x18c7] = 0x3e69,
-+  [0x18c8] = 0x3e6a, [0x18c9] = 0x3e6b, [0x18ca] = 0x3e6c, [0x18cb] = 0x3e6d,
-+  [0x18cc] = 0x3e6e, [0x18cd] = 0x3e6f, [0x18ce] = 0x3e70, [0x18cf] = 0x3e71,
-+  [0x18d0] = 0x3e72, [0x18d1] = 0x3e73, [0x18d2] = 0x3e74, [0x18d3] = 0x3e75,
-+  [0x18d4] = 0x3e76, [0x18d5] = 0x3e77, [0x18d6] = 0x3e78, [0x18d7] = 0x3e79,
-+  [0x18d8] = 0x3e7a, [0x18d9] = 0x3e7b, [0x18da] = 0x3e7c, [0x18db] = 0x3e7d,
-+  [0x18dc] = 0x3e7e, [0x18dd] = 0x3e7f, [0x18de] = 0x3e80, [0x18df] = 0x3e81,
-+  [0x18e0] = 0x3e82, [0x18e1] = 0x3e83, [0x18e2] = 0x3e84, [0x18e3] = 0x3e85,
-+  [0x18e4] = 0x3e86, [0x18e5] = 0x3e87, [0x18e6] = 0x3e88, [0x18e7] = 0x3e89,
-+  [0x18e8] = 0x3e8a, [0x18e9] = 0x3e8b, [0x18ea] = 0x3e8c, [0x18eb] = 0x3e8d,
-+  [0x18ec] = 0x3e8e, [0x18ed] = 0x3e8f, [0x18ee] = 0x3e90, [0x18ef] = 0x3e91,
-+  [0x18f0] = 0x3e92, [0x18f1] = 0x3e93, [0x18f2] = 0x3e94, [0x18f3] = 0x3e95,
-+  [0x18f4] = 0x3e96, [0x18f5] = 0x3e97, [0x18f6] = 0x3e98, [0x18f7] = 0x3e99,
-+  [0x18f8] = 0x3e9a, [0x18f9] = 0x3e9b, [0x18fa] = 0x3e9c, [0x18fb] = 0x3e9d,
-+  [0x18fc] = 0x3e9e, [0x18fd] = 0x3e9f, [0x18fe] = 0x3ea0, [0x18ff] = 0x3ea1,
-+  [0x1900] = 0x3ea2, [0x1901] = 0x3ea3, [0x1902] = 0x3ea4, [0x1903] = 0x3ea5,
-+  [0x1904] = 0x3ea6, [0x1905] = 0x3ea7, [0x1906] = 0x3ea8, [0x1907] = 0x3ea9,
-+  [0x1908] = 0x3eaa, [0x1909] = 0x3eab, [0x190a] = 0x3eac, [0x190b] = 0x3ead,
-+  [0x190c] = 0x3eae, [0x190d] = 0x3eaf, [0x190e] = 0x3eb0, [0x190f] = 0x3eb1,
-+  [0x1910] = 0x3eb2, [0x1911] = 0x3eb3, [0x1912] = 0x3eb4, [0x1913] = 0x3eb5,
-+  [0x1914] = 0x3eb6, [0x1915] = 0x3eb7, [0x1916] = 0x3eb8, [0x1917] = 0x3eb9,
-+  [0x1918] = 0x3eba, [0x1919] = 0x3ebb, [0x191a] = 0x3ebc, [0x191b] = 0x3ebd,
-+  [0x191c] = 0x3ebe, [0x191d] = 0x3ebf, [0x191e] = 0x3ec0, [0x191f] = 0x3ec1,
-+  [0x1920] = 0x3ec2, [0x1921] = 0x3ec3, [0x1922] = 0x3ec4, [0x1923] = 0x3ec5,
-+  [0x1924] = 0x3ec6, [0x1925] = 0x3ec7, [0x1926] = 0x3ec8, [0x1927] = 0x3ec9,
-+  [0x1928] = 0x3eca, [0x1929] = 0x3ecb, [0x192a] = 0x3ecc, [0x192b] = 0x3ecd,
-+  [0x192c] = 0x3ece, [0x192d] = 0x3ecf, [0x192e] = 0x3ed0, [0x192f] = 0x3ed1,
-+  [0x1930] = 0x3ed2, [0x1931] = 0x3ed3, [0x1932] = 0x3ed4, [0x1933] = 0x3ed5,
-+  [0x1934] = 0x3ed6, [0x1935] = 0x3ed7, [0x1936] = 0x3ed8, [0x1937] = 0x3ed9,
-+  [0x1938] = 0x3eda, [0x1939] = 0x3edb, [0x193a] = 0x3edc, [0x193b] = 0x3edd,
-+  [0x193c] = 0x3ede, [0x193d] = 0x3edf, [0x193e] = 0x3ee0, [0x193f] = 0x3ee1,
-+  [0x1940] = 0x3ee2, [0x1941] = 0x3ee3, [0x1942] = 0x3ee4, [0x1943] = 0x3ee5,
-+  [0x1944] = 0x3ee6, [0x1945] = 0x3ee7, [0x1946] = 0x3ee8, [0x1947] = 0x3ee9,
-+  [0x1948] = 0x3eea, [0x1949] = 0x3eeb, [0x194a] = 0x3eec, [0x194b] = 0x3eed,
-+  [0x194c] = 0x3eee, [0x194d] = 0x3eef, [0x194e] = 0x3ef0, [0x194f] = 0x3ef1,
-+  [0x1950] = 0x3ef2, [0x1951] = 0x3ef3, [0x1952] = 0x3ef4, [0x1953] = 0x3ef5,
-+  [0x1954] = 0x3ef6, [0x1955] = 0x3ef7, [0x1956] = 0x3ef8, [0x1957] = 0x3ef9,
-+  [0x1958] = 0x3efa, [0x1959] = 0x3efb, [0x195a] = 0x3efc, [0x195b] = 0x3efd,
-+  [0x195c] = 0x3efe, [0x195d] = 0x3eff, [0x195e] = 0x3f00, [0x195f] = 0x3f01,
-+  [0x1960] = 0x3f02, [0x1961] = 0x3f03, [0x1962] = 0x3f04, [0x1963] = 0x3f05,
-+  [0x1964] = 0x3f06, [0x1965] = 0x3f07, [0x1966] = 0x3f08, [0x1967] = 0x3f09,
-+  [0x1968] = 0x3f0a, [0x1969] = 0x3f0b, [0x196a] = 0x3f0c, [0x196b] = 0x3f0d,
-+  [0x196c] = 0x3f0e, [0x196d] = 0x3f0f, [0x196e] = 0x3f10, [0x196f] = 0x3f11,
-+  [0x1970] = 0x3f12, [0x1971] = 0x3f13, [0x1972] = 0x3f14, [0x1973] = 0x3f15,
-+  [0x1974] = 0x3f16, [0x1975] = 0x3f17, [0x1976] = 0x3f18, [0x1977] = 0x3f19,
-+  [0x1978] = 0x3f1a, [0x1979] = 0x3f1b, [0x197a] = 0x3f1c, [0x197b] = 0x3f1d,
-+  [0x197c] = 0x3f1e, [0x197d] = 0x3f1f, [0x197e] = 0x3f20, [0x197f] = 0x3f21,
-+  [0x1980] = 0x3f22, [0x1981] = 0x3f23, [0x1982] = 0x3f24, [0x1983] = 0x3f25,
-+  [0x1984] = 0x3f26, [0x1985] = 0x3f27, [0x1986] = 0x3f28, [0x1987] = 0x3f29,
-+  [0x1988] = 0x3f2a, [0x1989] = 0x3f2b, [0x198a] = 0x3f2c, [0x198b] = 0x3f2d,
-+  [0x198c] = 0x3f2e, [0x198d] = 0x3f2f, [0x198e] = 0x3f30, [0x198f] = 0x3f31,
-+  [0x1990] = 0x3f32, [0x1991] = 0x3f33, [0x1992] = 0x3f34, [0x1993] = 0x3f35,
-+  [0x1994] = 0x3f36, [0x1995] = 0x3f37, [0x1996] = 0x3f38, [0x1997] = 0x3f39,
-+  [0x1998] = 0x3f3a, [0x1999] = 0x3f3b, [0x199a] = 0x3f3c, [0x199b] = 0x3f3d,
-+  [0x199c] = 0x3f3e, [0x199d] = 0x3f3f, [0x199e] = 0x3f40, [0x199f] = 0x3f41,
-+  [0x19a0] = 0x3f42, [0x19a1] = 0x3f43, [0x19a2] = 0x3f44, [0x19a3] = 0x3f45,
-+  [0x19a4] = 0x3f46, [0x19a5] = 0x3f47, [0x19a6] = 0x3f48, [0x19a7] = 0x3f49,
-+  [0x19a8] = 0x3f4a, [0x19a9] = 0x3f4b, [0x19aa] = 0x3f4c, [0x19ab] = 0x3f4d,
-+  [0x19ac] = 0x3f4e, [0x19ad] = 0x3f4f, [0x19ae] = 0x3f50, [0x19af] = 0x3f51,
-+  [0x19b0] = 0x3f52, [0x19b1] = 0x3f53, [0x19b2] = 0x3f54, [0x19b3] = 0x3f55,
-+  [0x19b4] = 0x3f56, [0x19b5] = 0x3f57, [0x19b6] = 0x3f58, [0x19b7] = 0x3f59,
-+  [0x19b8] = 0x3f5a, [0x19b9] = 0x3f5b, [0x19ba] = 0x3f5c, [0x19bb] = 0x3f5d,
-+  [0x19bc] = 0x3f5e, [0x19bd] = 0x3f5f, [0x19be] = 0x3f60, [0x19bf] = 0x3f61,
-+  [0x19c0] = 0x3f62, [0x19c1] = 0x3f63, [0x19c2] = 0x3f64, [0x19c3] = 0x3f65,
-+  [0x19c4] = 0x3f66, [0x19c5] = 0x3f67, [0x19c6] = 0x3f68, [0x19c7] = 0x3f69,
-+  [0x19c8] = 0x3f6a, [0x19c9] = 0x3f6b, [0x19ca] = 0x3f6c, [0x19cb] = 0x3f6d,
-+  [0x19cc] = 0x3f6e, [0x19cd] = 0x3f6f, [0x19ce] = 0x3f70, [0x19cf] = 0x3f71,
-+  [0x19d0] = 0x3f72, [0x19d1] = 0x3f73, [0x19d2] = 0x3f74, [0x19d3] = 0x3f75,
-+  [0x19d4] = 0x3f76, [0x19d5] = 0x3f77, [0x19d6] = 0x3f78, [0x19d7] = 0x3f79,
-+  [0x19d8] = 0x3f7a, [0x19d9] = 0x3f7b, [0x19da] = 0x3f7c, [0x19db] = 0x3f7d,
-+  [0x19dc] = 0x3f7e, [0x19dd] = 0x3f7f, [0x19de] = 0x3f80, [0x19df] = 0x3f81,
-+  [0x19e0] = 0x3f82, [0x19e1] = 0x3f83, [0x19e2] = 0x3f84, [0x19e3] = 0x3f85,
-+  [0x19e4] = 0x3f86, [0x19e5] = 0x3f87, [0x19e6] = 0x3f88, [0x19e7] = 0x3f89,
-+  [0x19e8] = 0x3f8a, [0x19e9] = 0x3f8b, [0x19ea] = 0x3f8c, [0x19eb] = 0x3f8d,
-+  [0x19ec] = 0x3f8e, [0x19ed] = 0x3f8f, [0x19ee] = 0x3f90, [0x19ef] = 0x3f91,
-+  [0x19f0] = 0x3f92, [0x19f1] = 0x3f93, [0x19f2] = 0x3f94, [0x19f3] = 0x3f95,
-+  [0x19f4] = 0x3f96, [0x19f5] = 0x3f97, [0x19f6] = 0x3f98, [0x19f7] = 0x3f99,
-+  [0x19f8] = 0x3f9a, [0x19f9] = 0x3f9b, [0x19fa] = 0x3f9c, [0x19fb] = 0x3f9d,
-+  [0x19fc] = 0x3f9e, [0x19fd] = 0x3f9f, [0x19fe] = 0x3fa0, [0x19ff] = 0x3fa1,
-+  [0x1a00] = 0x3fa2, [0x1a01] = 0x3fa3, [0x1a02] = 0x3fa4, [0x1a03] = 0x3fa5,
-+  [0x1a04] = 0x3fa6, [0x1a05] = 0x3fa7, [0x1a06] = 0x3fa8, [0x1a07] = 0x3fa9,
-+  [0x1a08] = 0x3faa, [0x1a09] = 0x3fab, [0x1a0a] = 0x3fac, [0x1a0b] = 0x3fad,
-+  [0x1a0c] = 0x3fae, [0x1a0d] = 0x3faf, [0x1a0e] = 0x3fb0, [0x1a0f] = 0x3fb1,
-+  [0x1a10] = 0x3fb2, [0x1a11] = 0x3fb3, [0x1a12] = 0x3fb4, [0x1a13] = 0x3fb5,
-+  [0x1a14] = 0x3fb6, [0x1a15] = 0x3fb7, [0x1a16] = 0x3fb8, [0x1a17] = 0x3fb9,
-+  [0x1a18] = 0x3fba, [0x1a19] = 0x3fbb, [0x1a1a] = 0x3fbc, [0x1a1b] = 0x3fbd,
-+  [0x1a1c] = 0x3fbe, [0x1a1d] = 0x3fbf, [0x1a1e] = 0x3fc0, [0x1a1f] = 0x3fc1,
-+  [0x1a20] = 0x3fc2, [0x1a21] = 0x3fc3, [0x1a22] = 0x3fc4, [0x1a23] = 0x3fc5,
-+  [0x1a24] = 0x3fc6, [0x1a25] = 0x3fc7, [0x1a26] = 0x3fc8, [0x1a27] = 0x3fc9,
-+  [0x1a28] = 0x3fca, [0x1a29] = 0x3fcb, [0x1a2a] = 0x3fcc, [0x1a2b] = 0x3fcd,
-+  [0x1a2c] = 0x3fce, [0x1a2d] = 0x3fcf, [0x1a2e] = 0x3fd0, [0x1a2f] = 0x3fd1,
-+  [0x1a30] = 0x3fd2, [0x1a31] = 0x3fd3, [0x1a32] = 0x3fd4, [0x1a33] = 0x3fd5,
-+  [0x1a34] = 0x3fd6, [0x1a35] = 0x3fd7, [0x1a36] = 0x3fd8, [0x1a37] = 0x3fd9,
-+  [0x1a38] = 0x3fda, [0x1a39] = 0x3fdb, [0x1a3a] = 0x3fdc, [0x1a3b] = 0x3fdd,
-+  [0x1a3c] = 0x3fde, [0x1a3d] = 0x3fdf, [0x1a3e] = 0x3fe0, [0x1a3f] = 0x3fe1,
-+  [0x1a40] = 0x3fe2, [0x1a41] = 0x3fe3, [0x1a42] = 0x3fe4, [0x1a43] = 0x3fe5,
-+  [0x1a44] = 0x3fe6, [0x1a45] = 0x3fe7, [0x1a46] = 0x3fe8, [0x1a47] = 0x3fe9,
-+  [0x1a48] = 0x3fea, [0x1a49] = 0x3feb, [0x1a4a] = 0x3fec, [0x1a4b] = 0x3fed,
-+  [0x1a4c] = 0x3fee, [0x1a4d] = 0x3fef, [0x1a4e] = 0x3ff0, [0x1a4f] = 0x3ff1,
-+  [0x1a50] = 0x3ff2, [0x1a51] = 0x3ff3, [0x1a52] = 0x3ff4, [0x1a53] = 0x3ff5,
-+  [0x1a54] = 0x3ff6, [0x1a55] = 0x3ff7, [0x1a56] = 0x3ff8, [0x1a57] = 0x3ff9,
-+  [0x1a58] = 0x3ffa, [0x1a59] = 0x3ffb, [0x1a5a] = 0x3ffc, [0x1a5b] = 0x3ffd,
-+  [0x1a5c] = 0x3ffe, [0x1a5d] = 0x3fff, [0x1a5e] = 0x4000, [0x1a5f] = 0x4001,
-+  [0x1a60] = 0x4002, [0x1a61] = 0x4003, [0x1a62] = 0x4004, [0x1a63] = 0x4005,
-+  [0x1a64] = 0x4006, [0x1a65] = 0x4007, [0x1a66] = 0x4008, [0x1a67] = 0x4009,
-+  [0x1a68] = 0x400a, [0x1a69] = 0x400b, [0x1a6a] = 0x400c, [0x1a6b] = 0x400d,
-+  [0x1a6c] = 0x400e, [0x1a6d] = 0x400f, [0x1a6e] = 0x4010, [0x1a6f] = 0x4011,
-+  [0x1a70] = 0x4012, [0x1a71] = 0x4013, [0x1a72] = 0x4014, [0x1a73] = 0x4015,
-+  [0x1a74] = 0x4016, [0x1a75] = 0x4017, [0x1a76] = 0x4018, [0x1a77] = 0x4019,
-+  [0x1a78] = 0x401a, [0x1a79] = 0x401b, [0x1a7a] = 0x401c, [0x1a7b] = 0x401d,
-+  [0x1a7c] = 0x401e, [0x1a7d] = 0x401f, [0x1a7e] = 0x4020, [0x1a7f] = 0x4021,
-+  [0x1a80] = 0x4022, [0x1a81] = 0x4023, [0x1a82] = 0x4024, [0x1a83] = 0x4025,
-+  [0x1a84] = 0x4026, [0x1a85] = 0x4027, [0x1a86] = 0x4028, [0x1a87] = 0x4029,
-+  [0x1a88] = 0x402a, [0x1a89] = 0x402b, [0x1a8a] = 0x402c, [0x1a8b] = 0x402d,
-+  [0x1a8c] = 0x402e, [0x1a8d] = 0x402f, [0x1a8e] = 0x4030, [0x1a8f] = 0x4031,
-+  [0x1a90] = 0x4032, [0x1a91] = 0x4033, [0x1a92] = 0x4034, [0x1a93] = 0x4035,
-+  [0x1a94] = 0x4036, [0x1a95] = 0x4037, [0x1a96] = 0x4038, [0x1a97] = 0x4039,
-+  [0x1a98] = 0x403a, [0x1a99] = 0x403b, [0x1a9a] = 0x403c, [0x1a9b] = 0x403d,
-+  [0x1a9c] = 0x403e, [0x1a9d] = 0x403f, [0x1a9e] = 0x4040, [0x1a9f] = 0x4041,
-+  [0x1aa0] = 0x4042, [0x1aa1] = 0x4043, [0x1aa2] = 0x4044, [0x1aa3] = 0x4045,
-+  [0x1aa4] = 0x4046, [0x1aa5] = 0x4047, [0x1aa6] = 0x4048, [0x1aa7] = 0x4049,
-+  [0x1aa8] = 0x404a, [0x1aa9] = 0x404b, [0x1aaa] = 0x404c, [0x1aab] = 0x404d,
-+  [0x1aac] = 0x404e, [0x1aad] = 0x404f, [0x1aae] = 0x4050, [0x1aaf] = 0x4051,
-+  [0x1ab0] = 0x4052, [0x1ab1] = 0x4053, [0x1ab2] = 0x4054, [0x1ab3] = 0x4055,
-+  [0x1ab4] = 0x4057, [0x1ab5] = 0x4058, [0x1ab6] = 0x4059, [0x1ab7] = 0x405a,
-+  [0x1ab8] = 0x405b, [0x1ab9] = 0x405c, [0x1aba] = 0x405d, [0x1abb] = 0x405e,
-+  [0x1abc] = 0x405f, [0x1abd] = 0x4060, [0x1abe] = 0x4061, [0x1abf] = 0x4062,
-+  [0x1ac0] = 0x4063, [0x1ac1] = 0x4064, [0x1ac2] = 0x4065, [0x1ac3] = 0x4066,
-+  [0x1ac4] = 0x4067, [0x1ac5] = 0x4068, [0x1ac6] = 0x4069, [0x1ac7] = 0x406a,
-+  [0x1ac8] = 0x406b, [0x1ac9] = 0x406c, [0x1aca] = 0x406d, [0x1acb] = 0x406e,
-+  [0x1acc] = 0x406f, [0x1acd] = 0x4070, [0x1ace] = 0x4071, [0x1acf] = 0x4072,
-+  [0x1ad0] = 0x4073, [0x1ad1] = 0x4074, [0x1ad2] = 0x4075, [0x1ad3] = 0x4076,
-+  [0x1ad4] = 0x4077, [0x1ad5] = 0x4078, [0x1ad6] = 0x4079, [0x1ad7] = 0x407a,
-+  [0x1ad8] = 0x407b, [0x1ad9] = 0x407c, [0x1ada] = 0x407d, [0x1adb] = 0x407e,
-+  [0x1adc] = 0x407f, [0x1add] = 0x4080, [0x1ade] = 0x4081, [0x1adf] = 0x4082,
-+  [0x1ae0] = 0x4083, [0x1ae1] = 0x4084, [0x1ae2] = 0x4085, [0x1ae3] = 0x4086,
-+  [0x1ae4] = 0x4087, [0x1ae5] = 0x4088, [0x1ae6] = 0x4089, [0x1ae7] = 0x408a,
-+  [0x1ae8] = 0x408b, [0x1ae9] = 0x408c, [0x1aea] = 0x408d, [0x1aeb] = 0x408e,
-+  [0x1aec] = 0x408f, [0x1aed] = 0x4090, [0x1aee] = 0x4091, [0x1aef] = 0x4092,
-+  [0x1af0] = 0x4093, [0x1af1] = 0x4094, [0x1af2] = 0x4095, [0x1af3] = 0x4096,
-+  [0x1af4] = 0x4097, [0x1af5] = 0x4098, [0x1af6] = 0x4099, [0x1af7] = 0x409a,
-+  [0x1af8] = 0x409b, [0x1af9] = 0x409c, [0x1afa] = 0x409d, [0x1afb] = 0x409e,
-+  [0x1afc] = 0x409f, [0x1afd] = 0x40a0, [0x1afe] = 0x40a1, [0x1aff] = 0x40a2,
-+  [0x1b00] = 0x40a3, [0x1b01] = 0x40a4, [0x1b02] = 0x40a5, [0x1b03] = 0x40a6,
-+  [0x1b04] = 0x40a7, [0x1b05] = 0x40a8, [0x1b06] = 0x40a9, [0x1b07] = 0x40aa,
-+  [0x1b08] = 0x40ab, [0x1b09] = 0x40ac, [0x1b0a] = 0x40ad, [0x1b0b] = 0x40ae,
-+  [0x1b0c] = 0x40af, [0x1b0d] = 0x40b0, [0x1b0e] = 0x40b1, [0x1b0f] = 0x40b2,
-+  [0x1b10] = 0x40b3, [0x1b11] = 0x40b4, [0x1b12] = 0x40b5, [0x1b13] = 0x40b6,
-+  [0x1b14] = 0x40b7, [0x1b15] = 0x40b8, [0x1b16] = 0x40b9, [0x1b17] = 0x40ba,
-+  [0x1b18] = 0x40bb, [0x1b19] = 0x40bc, [0x1b1a] = 0x40bd, [0x1b1b] = 0x40be,
-+  [0x1b1c] = 0x40bf, [0x1b1d] = 0x40c0, [0x1b1e] = 0x40c1, [0x1b1f] = 0x40c2,
-+  [0x1b20] = 0x40c3, [0x1b21] = 0x40c4, [0x1b22] = 0x40c5, [0x1b23] = 0x40c6,
-+  [0x1b24] = 0x40c7, [0x1b25] = 0x40c8, [0x1b26] = 0x40c9, [0x1b27] = 0x40ca,
-+  [0x1b28] = 0x40cb, [0x1b29] = 0x40cc, [0x1b2a] = 0x40cd, [0x1b2b] = 0x40ce,
-+  [0x1b2c] = 0x40cf, [0x1b2d] = 0x40d0, [0x1b2e] = 0x40d1, [0x1b2f] = 0x40d2,
-+  [0x1b30] = 0x40d3, [0x1b31] = 0x40d4, [0x1b32] = 0x40d5, [0x1b33] = 0x40d6,
-+  [0x1b34] = 0x40d7, [0x1b35] = 0x40d8, [0x1b36] = 0x40d9, [0x1b37] = 0x40da,
-+  [0x1b38] = 0x40db, [0x1b39] = 0x40dc, [0x1b3a] = 0x40dd, [0x1b3b] = 0x40de,
-+  [0x1b3c] = 0x40df, [0x1b3d] = 0x40e0, [0x1b3e] = 0x40e1, [0x1b3f] = 0x40e2,
-+  [0x1b40] = 0x40e3, [0x1b41] = 0x40e4, [0x1b42] = 0x40e5, [0x1b43] = 0x40e6,
-+  [0x1b44] = 0x40e7, [0x1b45] = 0x40e8, [0x1b46] = 0x40e9, [0x1b47] = 0x40ea,
-+  [0x1b48] = 0x40eb, [0x1b49] = 0x40ec, [0x1b4a] = 0x40ed, [0x1b4b] = 0x40ee,
-+  [0x1b4c] = 0x40ef, [0x1b4d] = 0x40f0, [0x1b4e] = 0x40f1, [0x1b4f] = 0x40f2,
-+  [0x1b50] = 0x40f3, [0x1b51] = 0x40f4, [0x1b52] = 0x40f5, [0x1b53] = 0x40f6,
-+  [0x1b54] = 0x40f7, [0x1b55] = 0x40f8, [0x1b56] = 0x40f9, [0x1b57] = 0x40fa,
-+  [0x1b58] = 0x40fb, [0x1b59] = 0x40fc, [0x1b5a] = 0x40fd, [0x1b5b] = 0x40fe,
-+  [0x1b5c] = 0x40ff, [0x1b5d] = 0x4100, [0x1b5e] = 0x4101, [0x1b5f] = 0x4102,
-+  [0x1b60] = 0x4103, [0x1b61] = 0x4104, [0x1b62] = 0x4105, [0x1b63] = 0x4106,
-+  [0x1b64] = 0x4107, [0x1b65] = 0x4108, [0x1b66] = 0x4109, [0x1b67] = 0x410a,
-+  [0x1b68] = 0x410b, [0x1b69] = 0x410c, [0x1b6a] = 0x410d, [0x1b6b] = 0x410e,
-+  [0x1b6c] = 0x410f, [0x1b6d] = 0x4110, [0x1b6e] = 0x4111, [0x1b6f] = 0x4112,
-+  [0x1b70] = 0x4113, [0x1b71] = 0x4114, [0x1b72] = 0x4115, [0x1b73] = 0x4116,
-+  [0x1b74] = 0x4117, [0x1b75] = 0x4118, [0x1b76] = 0x4119, [0x1b77] = 0x411a,
-+  [0x1b78] = 0x411b, [0x1b79] = 0x411c, [0x1b7a] = 0x411d, [0x1b7b] = 0x411e,
-+  [0x1b7c] = 0x411f, [0x1b7d] = 0x4120, [0x1b7e] = 0x4121, [0x1b7f] = 0x4122,
-+  [0x1b80] = 0x4123, [0x1b81] = 0x4124, [0x1b82] = 0x4125, [0x1b83] = 0x4126,
-+  [0x1b84] = 0x4127, [0x1b85] = 0x4128, [0x1b86] = 0x4129, [0x1b87] = 0x412a,
-+  [0x1b88] = 0x412b, [0x1b89] = 0x412c, [0x1b8a] = 0x412d, [0x1b8b] = 0x412e,
-+  [0x1b8c] = 0x412f, [0x1b8d] = 0x4130, [0x1b8e] = 0x4131, [0x1b8f] = 0x4132,
-+  [0x1b90] = 0x4133, [0x1b91] = 0x4134, [0x1b92] = 0x4135, [0x1b93] = 0x4136,
-+  [0x1b94] = 0x4137, [0x1b95] = 0x4138, [0x1b96] = 0x4139, [0x1b97] = 0x413a,
-+  [0x1b98] = 0x413b, [0x1b99] = 0x413c, [0x1b9a] = 0x413d, [0x1b9b] = 0x413e,
-+  [0x1b9c] = 0x413f, [0x1b9d] = 0x4140, [0x1b9e] = 0x4141, [0x1b9f] = 0x4142,
-+  [0x1ba0] = 0x4143, [0x1ba1] = 0x4144, [0x1ba2] = 0x4145, [0x1ba3] = 0x4146,
-+  [0x1ba4] = 0x4147, [0x1ba5] = 0x4148, [0x1ba6] = 0x4149, [0x1ba7] = 0x414a,
-+  [0x1ba8] = 0x414b, [0x1ba9] = 0x414c, [0x1baa] = 0x414d, [0x1bab] = 0x414e,
-+  [0x1bac] = 0x414f, [0x1bad] = 0x4150, [0x1bae] = 0x4151, [0x1baf] = 0x4152,
-+  [0x1bb0] = 0x4153, [0x1bb1] = 0x4154, [0x1bb2] = 0x4155, [0x1bb3] = 0x4156,
-+  [0x1bb4] = 0x4157, [0x1bb5] = 0x4158, [0x1bb6] = 0x4159, [0x1bb7] = 0x415a,
-+  [0x1bb8] = 0x415b, [0x1bb9] = 0x415c, [0x1bba] = 0x415d, [0x1bbb] = 0x415e,
-+  [0x1bbc] = 0x4160, [0x1bbd] = 0x4161, [0x1bbe] = 0x4162, [0x1bbf] = 0x4163,
-+  [0x1bc0] = 0x4164, [0x1bc1] = 0x4165, [0x1bc2] = 0x4166, [0x1bc3] = 0x4167,
-+  [0x1bc4] = 0x4168, [0x1bc5] = 0x4169, [0x1bc6] = 0x416a, [0x1bc7] = 0x416b,
-+  [0x1bc8] = 0x416c, [0x1bc9] = 0x416d, [0x1bca] = 0x416e, [0x1bcb] = 0x416f,
-+  [0x1bcc] = 0x4170, [0x1bcd] = 0x4171, [0x1bce] = 0x4172, [0x1bcf] = 0x4173,
-+  [0x1bd0] = 0x4174, [0x1bd1] = 0x4175, [0x1bd2] = 0x4176, [0x1bd3] = 0x4177,
-+  [0x1bd4] = 0x4178, [0x1bd5] = 0x4179, [0x1bd6] = 0x417a, [0x1bd7] = 0x417b,
-+  [0x1bd8] = 0x417c, [0x1bd9] = 0x417d, [0x1bda] = 0x417e, [0x1bdb] = 0x417f,
-+  [0x1bdc] = 0x4180, [0x1bdd] = 0x4181, [0x1bde] = 0x4182, [0x1bdf] = 0x4183,
-+  [0x1be0] = 0x4184, [0x1be1] = 0x4185, [0x1be2] = 0x4186, [0x1be3] = 0x4187,
-+  [0x1be4] = 0x4188, [0x1be5] = 0x4189, [0x1be6] = 0x418a, [0x1be7] = 0x418b,
-+  [0x1be8] = 0x418c, [0x1be9] = 0x418d, [0x1bea] = 0x418e, [0x1beb] = 0x418f,
-+  [0x1bec] = 0x4190, [0x1bed] = 0x4191, [0x1bee] = 0x4192, [0x1bef] = 0x4193,
-+  [0x1bf0] = 0x4194, [0x1bf1] = 0x4195, [0x1bf2] = 0x4196, [0x1bf3] = 0x4197,
-+  [0x1bf4] = 0x4198, [0x1bf5] = 0x4199, [0x1bf6] = 0x419a, [0x1bf7] = 0x419b,
-+  [0x1bf8] = 0x419c, [0x1bf9] = 0x419d, [0x1bfa] = 0x419e, [0x1bfb] = 0x419f,
-+  [0x1bfc] = 0x41a0, [0x1bfd] = 0x41a1, [0x1bfe] = 0x41a2, [0x1bff] = 0x41a3,
-+  [0x1c00] = 0x41a4, [0x1c01] = 0x41a5, [0x1c02] = 0x41a6, [0x1c03] = 0x41a7,
-+  [0x1c04] = 0x41a8, [0x1c05] = 0x41a9, [0x1c06] = 0x41aa, [0x1c07] = 0x41ab,
-+  [0x1c08] = 0x41ac, [0x1c09] = 0x41ad, [0x1c0a] = 0x41ae, [0x1c0b] = 0x41af,
-+  [0x1c0c] = 0x41b0, [0x1c0d] = 0x41b1, [0x1c0e] = 0x41b2, [0x1c0f] = 0x41b3,
-+  [0x1c10] = 0x41b4, [0x1c11] = 0x41b5, [0x1c12] = 0x41b6, [0x1c13] = 0x41b7,
-+  [0x1c14] = 0x41b8, [0x1c15] = 0x41b9, [0x1c16] = 0x41ba, [0x1c17] = 0x41bb,
-+  [0x1c18] = 0x41bc, [0x1c19] = 0x41bd, [0x1c1a] = 0x41be, [0x1c1b] = 0x41bf,
-+  [0x1c1c] = 0x41c0, [0x1c1d] = 0x41c1, [0x1c1e] = 0x41c2, [0x1c1f] = 0x41c3,
-+  [0x1c20] = 0x41c4, [0x1c21] = 0x41c5, [0x1c22] = 0x41c6, [0x1c23] = 0x41c7,
-+  [0x1c24] = 0x41c8, [0x1c25] = 0x41c9, [0x1c26] = 0x41ca, [0x1c27] = 0x41cb,
-+  [0x1c28] = 0x41cc, [0x1c29] = 0x41cd, [0x1c2a] = 0x41ce, [0x1c2b] = 0x41cf,
-+  [0x1c2c] = 0x41d0, [0x1c2d] = 0x41d1, [0x1c2e] = 0x41d2, [0x1c2f] = 0x41d3,
-+  [0x1c30] = 0x41d4, [0x1c31] = 0x41d5, [0x1c32] = 0x41d6, [0x1c33] = 0x41d7,
-+  [0x1c34] = 0x41d8, [0x1c35] = 0x41d9, [0x1c36] = 0x41da, [0x1c37] = 0x41db,
-+  [0x1c38] = 0x41dc, [0x1c39] = 0x41dd, [0x1c3a] = 0x41de, [0x1c3b] = 0x41df,
-+  [0x1c3c] = 0x41e0, [0x1c3d] = 0x41e1, [0x1c3e] = 0x41e2, [0x1c3f] = 0x41e3,
-+  [0x1c40] = 0x41e4, [0x1c41] = 0x41e5, [0x1c42] = 0x41e6, [0x1c43] = 0x41e7,
-+  [0x1c44] = 0x41e8, [0x1c45] = 0x41e9, [0x1c46] = 0x41ea, [0x1c47] = 0x41eb,
-+  [0x1c48] = 0x41ec, [0x1c49] = 0x41ed, [0x1c4a] = 0x41ee, [0x1c4b] = 0x41ef,
-+  [0x1c4c] = 0x41f0, [0x1c4d] = 0x41f1, [0x1c4e] = 0x41f2, [0x1c4f] = 0x41f3,
-+  [0x1c50] = 0x41f4, [0x1c51] = 0x41f5, [0x1c52] = 0x41f6, [0x1c53] = 0x41f7,
-+  [0x1c54] = 0x41f8, [0x1c55] = 0x41f9, [0x1c56] = 0x41fa, [0x1c57] = 0x41fb,
-+  [0x1c58] = 0x41fc, [0x1c59] = 0x41fd, [0x1c5a] = 0x41fe, [0x1c5b] = 0x41ff,
-+  [0x1c5c] = 0x4200, [0x1c5d] = 0x4201, [0x1c5e] = 0x4202, [0x1c5f] = 0x4203,
-+  [0x1c60] = 0x4204, [0x1c61] = 0x4205, [0x1c62] = 0x4206, [0x1c63] = 0x4207,
-+  [0x1c64] = 0x4208, [0x1c65] = 0x4209, [0x1c66] = 0x420a, [0x1c67] = 0x420b,
-+  [0x1c68] = 0x420c, [0x1c69] = 0x420d, [0x1c6a] = 0x420e, [0x1c6b] = 0x420f,
-+  [0x1c6c] = 0x4210, [0x1c6d] = 0x4211, [0x1c6e] = 0x4212, [0x1c6f] = 0x4213,
-+  [0x1c70] = 0x4214, [0x1c71] = 0x4215, [0x1c72] = 0x4216, [0x1c73] = 0x4217,
-+  [0x1c74] = 0x4218, [0x1c75] = 0x4219, [0x1c76] = 0x421a, [0x1c77] = 0x421b,
-+  [0x1c78] = 0x421c, [0x1c79] = 0x421d, [0x1c7a] = 0x421e, [0x1c7b] = 0x421f,
-+  [0x1c7c] = 0x4220, [0x1c7d] = 0x4221, [0x1c7e] = 0x4222, [0x1c7f] = 0x4223,
-+  [0x1c80] = 0x4224, [0x1c81] = 0x4225, [0x1c82] = 0x4226, [0x1c83] = 0x4227,
-+  [0x1c84] = 0x4228, [0x1c85] = 0x4229, [0x1c86] = 0x422a, [0x1c87] = 0x422b,
-+  [0x1c88] = 0x422c, [0x1c89] = 0x422d, [0x1c8a] = 0x422e, [0x1c8b] = 0x422f,
-+  [0x1c8c] = 0x4230, [0x1c8d] = 0x4231, [0x1c8e] = 0x4232, [0x1c8f] = 0x4233,
-+  [0x1c90] = 0x4234, [0x1c91] = 0x4235, [0x1c92] = 0x4236, [0x1c93] = 0x4237,
-+  [0x1c94] = 0x4238, [0x1c95] = 0x4239, [0x1c96] = 0x423a, [0x1c97] = 0x423b,
-+  [0x1c98] = 0x423c, [0x1c99] = 0x423d, [0x1c9a] = 0x423e, [0x1c9b] = 0x423f,
-+  [0x1c9c] = 0x4240, [0x1c9d] = 0x4241, [0x1c9e] = 0x4242, [0x1c9f] = 0x4243,
-+  [0x1ca0] = 0x4244, [0x1ca1] = 0x4245, [0x1ca2] = 0x4246, [0x1ca3] = 0x4247,
-+  [0x1ca4] = 0x4248, [0x1ca5] = 0x4249, [0x1ca6] = 0x424a, [0x1ca7] = 0x424b,
-+  [0x1ca8] = 0x424c, [0x1ca9] = 0x424d, [0x1caa] = 0x424e, [0x1cab] = 0x424f,
-+  [0x1cac] = 0x4250, [0x1cad] = 0x4251, [0x1cae] = 0x4252, [0x1caf] = 0x4253,
-+  [0x1cb0] = 0x4254, [0x1cb1] = 0x4255, [0x1cb2] = 0x4256, [0x1cb3] = 0x4257,
-+  [0x1cb4] = 0x4258, [0x1cb5] = 0x4259, [0x1cb6] = 0x425a, [0x1cb7] = 0x425b,
-+  [0x1cb8] = 0x425c, [0x1cb9] = 0x425d, [0x1cba] = 0x425e, [0x1cbb] = 0x425f,
-+  [0x1cbc] = 0x4260, [0x1cbd] = 0x4261, [0x1cbe] = 0x4262, [0x1cbf] = 0x4263,
-+  [0x1cc0] = 0x4264, [0x1cc1] = 0x4265, [0x1cc2] = 0x4266, [0x1cc3] = 0x4267,
-+  [0x1cc4] = 0x4268, [0x1cc5] = 0x4269, [0x1cc6] = 0x426a, [0x1cc7] = 0x426b,
-+  [0x1cc8] = 0x426c, [0x1cc9] = 0x426d, [0x1cca] = 0x426e, [0x1ccb] = 0x426f,
-+  [0x1ccc] = 0x4270, [0x1ccd] = 0x4271, [0x1cce] = 0x4272, [0x1ccf] = 0x4273,
-+  [0x1cd0] = 0x4274, [0x1cd1] = 0x4275, [0x1cd2] = 0x4276, [0x1cd3] = 0x4277,
-+  [0x1cd4] = 0x4278, [0x1cd5] = 0x4279, [0x1cd6] = 0x427a, [0x1cd7] = 0x427b,
-+  [0x1cd8] = 0x427c, [0x1cd9] = 0x427d, [0x1cda] = 0x427e, [0x1cdb] = 0x427f,
-+  [0x1cdc] = 0x4280, [0x1cdd] = 0x4281, [0x1cde] = 0x4282, [0x1cdf] = 0x4283,
-+  [0x1ce0] = 0x4284, [0x1ce1] = 0x4285, [0x1ce2] = 0x4286, [0x1ce3] = 0x4287,
-+  [0x1ce4] = 0x4288, [0x1ce5] = 0x4289, [0x1ce6] = 0x428a, [0x1ce7] = 0x428b,
-+  [0x1ce8] = 0x428c, [0x1ce9] = 0x428d, [0x1cea] = 0x428e, [0x1ceb] = 0x428f,
-+  [0x1cec] = 0x4290, [0x1ced] = 0x4291, [0x1cee] = 0x4292, [0x1cef] = 0x4293,
-+  [0x1cf0] = 0x4294, [0x1cf1] = 0x4295, [0x1cf2] = 0x4296, [0x1cf3] = 0x4297,
-+  [0x1cf4] = 0x4298, [0x1cf5] = 0x4299, [0x1cf6] = 0x429a, [0x1cf7] = 0x429b,
-+  [0x1cf8] = 0x429c, [0x1cf9] = 0x429d, [0x1cfa] = 0x429e, [0x1cfb] = 0x429f,
-+  [0x1cfc] = 0x42a0, [0x1cfd] = 0x42a1, [0x1cfe] = 0x42a2, [0x1cff] = 0x42a3,
-+  [0x1d00] = 0x42a4, [0x1d01] = 0x42a5, [0x1d02] = 0x42a6, [0x1d03] = 0x42a7,
-+  [0x1d04] = 0x42a8, [0x1d05] = 0x42a9, [0x1d06] = 0x42aa, [0x1d07] = 0x42ab,
-+  [0x1d08] = 0x42ac, [0x1d09] = 0x42ad, [0x1d0a] = 0x42ae, [0x1d0b] = 0x42af,
-+  [0x1d0c] = 0x42b0, [0x1d0d] = 0x42b1, [0x1d0e] = 0x42b2, [0x1d0f] = 0x42b3,
-+  [0x1d10] = 0x42b4, [0x1d11] = 0x42b5, [0x1d12] = 0x42b6, [0x1d13] = 0x42b7,
-+  [0x1d14] = 0x42b8, [0x1d15] = 0x42b9, [0x1d16] = 0x42ba, [0x1d17] = 0x42bb,
-+  [0x1d18] = 0x42bc, [0x1d19] = 0x42bd, [0x1d1a] = 0x42be, [0x1d1b] = 0x42bf,
-+  [0x1d1c] = 0x42c0, [0x1d1d] = 0x42c1, [0x1d1e] = 0x42c2, [0x1d1f] = 0x42c3,
-+  [0x1d20] = 0x42c4, [0x1d21] = 0x42c5, [0x1d22] = 0x42c6, [0x1d23] = 0x42c7,
-+  [0x1d24] = 0x42c8, [0x1d25] = 0x42c9, [0x1d26] = 0x42ca, [0x1d27] = 0x42cb,
-+  [0x1d28] = 0x42cc, [0x1d29] = 0x42cd, [0x1d2a] = 0x42ce, [0x1d2b] = 0x42cf,
-+  [0x1d2c] = 0x42d0, [0x1d2d] = 0x42d1, [0x1d2e] = 0x42d2, [0x1d2f] = 0x42d3,
-+  [0x1d30] = 0x42d4, [0x1d31] = 0x42d5, [0x1d32] = 0x42d6, [0x1d33] = 0x42d7,
-+  [0x1d34] = 0x42d8, [0x1d35] = 0x42d9, [0x1d36] = 0x42da, [0x1d37] = 0x42db,
-+  [0x1d38] = 0x42dc, [0x1d39] = 0x42dd, [0x1d3a] = 0x42de, [0x1d3b] = 0x42df,
-+  [0x1d3c] = 0x42e0, [0x1d3d] = 0x42e1, [0x1d3e] = 0x42e2, [0x1d3f] = 0x42e3,
-+  [0x1d40] = 0x42e4, [0x1d41] = 0x42e5, [0x1d42] = 0x42e6, [0x1d43] = 0x42e7,
-+  [0x1d44] = 0x42e8, [0x1d45] = 0x42e9, [0x1d46] = 0x42ea, [0x1d47] = 0x42eb,
-+  [0x1d48] = 0x42ec, [0x1d49] = 0x42ed, [0x1d4a] = 0x42ee, [0x1d4b] = 0x42ef,
-+  [0x1d4c] = 0x42f0, [0x1d4d] = 0x42f1, [0x1d4e] = 0x42f2, [0x1d4f] = 0x42f3,
-+  [0x1d50] = 0x42f4, [0x1d51] = 0x42f5, [0x1d52] = 0x42f6, [0x1d53] = 0x42f7,
-+  [0x1d54] = 0x42f8, [0x1d55] = 0x42f9, [0x1d56] = 0x42fa, [0x1d57] = 0x42fb,
-+  [0x1d58] = 0x42fc, [0x1d59] = 0x42fd, [0x1d5a] = 0x42fe, [0x1d5b] = 0x42ff,
-+  [0x1d5c] = 0x4300, [0x1d5d] = 0x4301, [0x1d5e] = 0x4302, [0x1d5f] = 0x4303,
-+  [0x1d60] = 0x4304, [0x1d61] = 0x4305, [0x1d62] = 0x4306, [0x1d63] = 0x4307,
-+  [0x1d64] = 0x4308, [0x1d65] = 0x4309, [0x1d66] = 0x430a, [0x1d67] = 0x430b,
-+  [0x1d68] = 0x430c, [0x1d69] = 0x430d, [0x1d6a] = 0x430e, [0x1d6b] = 0x430f,
-+  [0x1d6c] = 0x4310, [0x1d6d] = 0x4311, [0x1d6e] = 0x4312, [0x1d6f] = 0x4313,
-+  [0x1d70] = 0x4314, [0x1d71] = 0x4315, [0x1d72] = 0x4316, [0x1d73] = 0x4317,
-+  [0x1d74] = 0x4318, [0x1d75] = 0x4319, [0x1d76] = 0x431a, [0x1d77] = 0x431b,
-+  [0x1d78] = 0x431c, [0x1d79] = 0x431d, [0x1d7a] = 0x431e, [0x1d7b] = 0x431f,
-+  [0x1d7c] = 0x4320, [0x1d7d] = 0x4321, [0x1d7e] = 0x4322, [0x1d7f] = 0x4323,
-+  [0x1d80] = 0x4324, [0x1d81] = 0x4325, [0x1d82] = 0x4326, [0x1d83] = 0x4327,
-+  [0x1d84] = 0x4328, [0x1d85] = 0x4329, [0x1d86] = 0x432a, [0x1d87] = 0x432b,
-+  [0x1d88] = 0x432c, [0x1d89] = 0x432d, [0x1d8a] = 0x432e, [0x1d8b] = 0x432f,
-+  [0x1d8c] = 0x4330, [0x1d8d] = 0x4331, [0x1d8e] = 0x4332, [0x1d8f] = 0x4333,
-+  [0x1d90] = 0x4334, [0x1d91] = 0x4335, [0x1d92] = 0x4336, [0x1d93] = 0x4338,
-+  [0x1d94] = 0x4339, [0x1d95] = 0x433a, [0x1d96] = 0x433b, [0x1d97] = 0x433c,
-+  [0x1d98] = 0x433d, [0x1d99] = 0x433e, [0x1d9a] = 0x433f, [0x1d9b] = 0x4340,
-+  [0x1d9c] = 0x4341, [0x1d9d] = 0x4342, [0x1d9e] = 0x4343, [0x1d9f] = 0x4344,
-+  [0x1da0] = 0x4345, [0x1da1] = 0x4346, [0x1da2] = 0x4347, [0x1da3] = 0x4348,
-+  [0x1da4] = 0x4349, [0x1da5] = 0x434a, [0x1da6] = 0x434b, [0x1da7] = 0x434c,
-+  [0x1da8] = 0x434d, [0x1da9] = 0x434e, [0x1daa] = 0x434f, [0x1dab] = 0x4350,
-+  [0x1dac] = 0x4351, [0x1dad] = 0x4352, [0x1dae] = 0x4353, [0x1daf] = 0x4354,
-+  [0x1db0] = 0x4355, [0x1db1] = 0x4356, [0x1db2] = 0x4357, [0x1db3] = 0x4358,
-+  [0x1db4] = 0x4359, [0x1db5] = 0x435a, [0x1db6] = 0x435b, [0x1db7] = 0x435c,
-+  [0x1db8] = 0x435d, [0x1db9] = 0x435e, [0x1dba] = 0x435f, [0x1dbb] = 0x4360,
-+  [0x1dbc] = 0x4361, [0x1dbd] = 0x4362, [0x1dbe] = 0x4363, [0x1dbf] = 0x4364,
-+  [0x1dc0] = 0x4365, [0x1dc1] = 0x4366, [0x1dc2] = 0x4367, [0x1dc3] = 0x4368,
-+  [0x1dc4] = 0x4369, [0x1dc5] = 0x436a, [0x1dc6] = 0x436b, [0x1dc7] = 0x436c,
-+  [0x1dc8] = 0x436d, [0x1dc9] = 0x436e, [0x1dca] = 0x436f, [0x1dcb] = 0x4370,
-+  [0x1dcc] = 0x4371, [0x1dcd] = 0x4372, [0x1dce] = 0x4373, [0x1dcf] = 0x4374,
-+  [0x1dd0] = 0x4375, [0x1dd1] = 0x4376, [0x1dd2] = 0x4377, [0x1dd3] = 0x4378,
-+  [0x1dd4] = 0x4379, [0x1dd5] = 0x437a, [0x1dd6] = 0x437b, [0x1dd7] = 0x437c,
-+  [0x1dd8] = 0x437d, [0x1dd9] = 0x437e, [0x1dda] = 0x437f, [0x1ddb] = 0x4380,
-+  [0x1ddc] = 0x4381, [0x1ddd] = 0x4382, [0x1dde] = 0x4383, [0x1ddf] = 0x4384,
-+  [0x1de0] = 0x4385, [0x1de1] = 0x4386, [0x1de2] = 0x4387, [0x1de3] = 0x4388,
-+  [0x1de4] = 0x4389, [0x1de5] = 0x438a, [0x1de6] = 0x438b, [0x1de7] = 0x438c,
-+  [0x1de8] = 0x438d, [0x1de9] = 0x438e, [0x1dea] = 0x438f, [0x1deb] = 0x4390,
-+  [0x1dec] = 0x4391, [0x1ded] = 0x4392, [0x1dee] = 0x4393, [0x1def] = 0x4394,
-+  [0x1df0] = 0x4395, [0x1df1] = 0x4396, [0x1df2] = 0x4397, [0x1df3] = 0x4398,
-+  [0x1df4] = 0x4399, [0x1df5] = 0x439a, [0x1df6] = 0x439b, [0x1df7] = 0x439c,
-+  [0x1df8] = 0x439d, [0x1df9] = 0x439e, [0x1dfa] = 0x439f, [0x1dfb] = 0x43a0,
-+  [0x1dfc] = 0x43a1, [0x1dfd] = 0x43a2, [0x1dfe] = 0x43a3, [0x1dff] = 0x43a4,
-+  [0x1e00] = 0x43a5, [0x1e01] = 0x43a6, [0x1e02] = 0x43a7, [0x1e03] = 0x43a8,
-+  [0x1e04] = 0x43a9, [0x1e05] = 0x43aa, [0x1e06] = 0x43ab, [0x1e07] = 0x43ad,
-+  [0x1e08] = 0x43ae, [0x1e09] = 0x43af, [0x1e0a] = 0x43b0, [0x1e0b] = 0x43b2,
-+  [0x1e0c] = 0x43b3, [0x1e0d] = 0x43b4, [0x1e0e] = 0x43b5, [0x1e0f] = 0x43b6,
-+  [0x1e10] = 0x43b7, [0x1e11] = 0x43b8, [0x1e12] = 0x43b9, [0x1e13] = 0x43ba,
-+  [0x1e14] = 0x43bb, [0x1e15] = 0x43bc, [0x1e16] = 0x43bd, [0x1e17] = 0x43be,
-+  [0x1e18] = 0x43bf, [0x1e19] = 0x43c0, [0x1e1a] = 0x43c1, [0x1e1b] = 0x43c2,
-+  [0x1e1c] = 0x43c3, [0x1e1d] = 0x43c4, [0x1e1e] = 0x43c5, [0x1e1f] = 0x43c6,
-+  [0x1e20] = 0x43c7, [0x1e21] = 0x43c8, [0x1e22] = 0x43c9, [0x1e23] = 0x43ca,
-+  [0x1e24] = 0x43cb, [0x1e25] = 0x43cc, [0x1e26] = 0x43cd, [0x1e27] = 0x43ce,
-+  [0x1e28] = 0x43cf, [0x1e29] = 0x43d0, [0x1e2a] = 0x43d1, [0x1e2b] = 0x43d2,
-+  [0x1e2c] = 0x43d3, [0x1e2d] = 0x43d4, [0x1e2e] = 0x43d5, [0x1e2f] = 0x43d6,
-+  [0x1e30] = 0x43d7, [0x1e31] = 0x43d8, [0x1e32] = 0x43d9, [0x1e33] = 0x43da,
-+  [0x1e34] = 0x43db, [0x1e35] = 0x43dc, [0x1e36] = 0x43de, [0x1e37] = 0x43df,
-+  [0x1e38] = 0x43e0, [0x1e39] = 0x43e1, [0x1e3a] = 0x43e2, [0x1e3b] = 0x43e3,
-+  [0x1e3c] = 0x43e4, [0x1e3d] = 0x43e5, [0x1e3e] = 0x43e6, [0x1e3f] = 0x43e7,
-+  [0x1e40] = 0x43e8, [0x1e41] = 0x43e9, [0x1e42] = 0x43ea, [0x1e43] = 0x43eb,
-+  [0x1e44] = 0x43ec, [0x1e45] = 0x43ed, [0x1e46] = 0x43ee, [0x1e47] = 0x43ef,
-+  [0x1e48] = 0x43f0, [0x1e49] = 0x43f1, [0x1e4a] = 0x43f2, [0x1e4b] = 0x43f3,
-+  [0x1e4c] = 0x43f4, [0x1e4d] = 0x43f5, [0x1e4e] = 0x43f6, [0x1e4f] = 0x43f7,
-+  [0x1e50] = 0x43f8, [0x1e51] = 0x43f9, [0x1e52] = 0x43fa, [0x1e53] = 0x43fb,
-+  [0x1e54] = 0x43fc, [0x1e55] = 0x43fd, [0x1e56] = 0x43fe, [0x1e57] = 0x43ff,
-+  [0x1e58] = 0x4400, [0x1e59] = 0x4401, [0x1e5a] = 0x4402, [0x1e5b] = 0x4403,
-+  [0x1e5c] = 0x4404, [0x1e5d] = 0x4405, [0x1e5e] = 0x4406, [0x1e5f] = 0x4407,
-+  [0x1e60] = 0x4408, [0x1e61] = 0x4409, [0x1e62] = 0x440a, [0x1e63] = 0x440b,
-+  [0x1e64] = 0x440c, [0x1e65] = 0x440d, [0x1e66] = 0x440e, [0x1e67] = 0x440f,
-+  [0x1e68] = 0x4410, [0x1e69] = 0x4411, [0x1e6a] = 0x4412, [0x1e6b] = 0x4413,
-+  [0x1e6c] = 0x4414, [0x1e6d] = 0x4415, [0x1e6e] = 0x4416, [0x1e6f] = 0x4417,
-+  [0x1e70] = 0x4418, [0x1e71] = 0x4419, [0x1e72] = 0x441a, [0x1e73] = 0x441b,
-+  [0x1e74] = 0x441c, [0x1e75] = 0x441d, [0x1e76] = 0x441e, [0x1e77] = 0x441f,
-+  [0x1e78] = 0x4420, [0x1e79] = 0x4421, [0x1e7a] = 0x4422, [0x1e7b] = 0x4423,
-+  [0x1e7c] = 0x4424, [0x1e7d] = 0x4425, [0x1e7e] = 0x4426, [0x1e7f] = 0x4427,
-+  [0x1e80] = 0x4428, [0x1e81] = 0x4429, [0x1e82] = 0x442a, [0x1e83] = 0x442b,
-+  [0x1e84] = 0x442c, [0x1e85] = 0x442d, [0x1e86] = 0x442e, [0x1e87] = 0x442f,
-+  [0x1e88] = 0x4430, [0x1e89] = 0x4431, [0x1e8a] = 0x4432, [0x1e8b] = 0x4433,
-+  [0x1e8c] = 0x4434, [0x1e8d] = 0x4435, [0x1e8e] = 0x4436, [0x1e8f] = 0x4437,
-+  [0x1e90] = 0x4438, [0x1e91] = 0x4439, [0x1e92] = 0x443a, [0x1e93] = 0x443b,
-+  [0x1e94] = 0x443c, [0x1e95] = 0x443d, [0x1e96] = 0x443e, [0x1e97] = 0x443f,
-+  [0x1e98] = 0x4440, [0x1e99] = 0x4441, [0x1e9a] = 0x4442, [0x1e9b] = 0x4443,
-+  [0x1e9c] = 0x4444, [0x1e9d] = 0x4445, [0x1e9e] = 0x4446, [0x1e9f] = 0x4447,
-+  [0x1ea0] = 0x4448, [0x1ea1] = 0x4449, [0x1ea2] = 0x444a, [0x1ea3] = 0x444b,
-+  [0x1ea4] = 0x444c, [0x1ea5] = 0x444d, [0x1ea6] = 0x444e, [0x1ea7] = 0x444f,
-+  [0x1ea8] = 0x4450, [0x1ea9] = 0x4451, [0x1eaa] = 0x4452, [0x1eab] = 0x4453,
-+  [0x1eac] = 0x4454, [0x1ead] = 0x4455, [0x1eae] = 0x4456, [0x1eaf] = 0x4457,
-+  [0x1eb0] = 0x4458, [0x1eb1] = 0x4459, [0x1eb2] = 0x445a, [0x1eb3] = 0x445b,
-+  [0x1eb4] = 0x445c, [0x1eb5] = 0x445d, [0x1eb6] = 0x445e, [0x1eb7] = 0x445f,
-+  [0x1eb8] = 0x4460, [0x1eb9] = 0x4461, [0x1eba] = 0x4462, [0x1ebb] = 0x4463,
-+  [0x1ebc] = 0x4464, [0x1ebd] = 0x4465, [0x1ebe] = 0x4466, [0x1ebf] = 0x4467,
-+  [0x1ec0] = 0x4468, [0x1ec1] = 0x4469, [0x1ec2] = 0x446a, [0x1ec3] = 0x446b,
-+  [0x1ec4] = 0x446c, [0x1ec5] = 0x446d, [0x1ec6] = 0x446e, [0x1ec7] = 0x446f,
-+  [0x1ec8] = 0x4470, [0x1ec9] = 0x4471, [0x1eca] = 0x4472, [0x1ecb] = 0x4473,
-+  [0x1ecc] = 0x4474, [0x1ecd] = 0x4475, [0x1ece] = 0x4476, [0x1ecf] = 0x4477,
-+  [0x1ed0] = 0x4478, [0x1ed1] = 0x4479, [0x1ed2] = 0x447a, [0x1ed3] = 0x447b,
-+  [0x1ed4] = 0x447c, [0x1ed5] = 0x447d, [0x1ed6] = 0x447e, [0x1ed7] = 0x447f,
-+  [0x1ed8] = 0x4480, [0x1ed9] = 0x4481, [0x1eda] = 0x4482, [0x1edb] = 0x4483,
-+  [0x1edc] = 0x4484, [0x1edd] = 0x4485, [0x1ede] = 0x4486, [0x1edf] = 0x4487,
-+  [0x1ee0] = 0x4488, [0x1ee1] = 0x4489, [0x1ee2] = 0x448a, [0x1ee3] = 0x448b,
-+  [0x1ee4] = 0x448c, [0x1ee5] = 0x448d, [0x1ee6] = 0x448e, [0x1ee7] = 0x448f,
-+  [0x1ee8] = 0x4490, [0x1ee9] = 0x4491, [0x1eea] = 0x4492, [0x1eeb] = 0x4493,
-+  [0x1eec] = 0x4494, [0x1eed] = 0x4495, [0x1eee] = 0x4496, [0x1eef] = 0x4497,
-+  [0x1ef0] = 0x4498, [0x1ef1] = 0x4499, [0x1ef2] = 0x449a, [0x1ef3] = 0x449b,
-+  [0x1ef4] = 0x449c, [0x1ef5] = 0x449d, [0x1ef6] = 0x449e, [0x1ef7] = 0x449f,
-+  [0x1ef8] = 0x44a0, [0x1ef9] = 0x44a1, [0x1efa] = 0x44a2, [0x1efb] = 0x44a3,
-+  [0x1efc] = 0x44a4, [0x1efd] = 0x44a5, [0x1efe] = 0x44a6, [0x1eff] = 0x44a7,
-+  [0x1f00] = 0x44a8, [0x1f01] = 0x44a9, [0x1f02] = 0x44aa, [0x1f03] = 0x44ab,
-+  [0x1f04] = 0x44ac, [0x1f05] = 0x44ad, [0x1f06] = 0x44ae, [0x1f07] = 0x44af,
-+  [0x1f08] = 0x44b0, [0x1f09] = 0x44b1, [0x1f0a] = 0x44b2, [0x1f0b] = 0x44b3,
-+  [0x1f0c] = 0x44b4, [0x1f0d] = 0x44b5, [0x1f0e] = 0x44b6, [0x1f0f] = 0x44b7,
-+  [0x1f10] = 0x44b8, [0x1f11] = 0x44b9, [0x1f12] = 0x44ba, [0x1f13] = 0x44bb,
-+  [0x1f14] = 0x44bc, [0x1f15] = 0x44bd, [0x1f16] = 0x44be, [0x1f17] = 0x44bf,
-+  [0x1f18] = 0x44c0, [0x1f19] = 0x44c1, [0x1f1a] = 0x44c2, [0x1f1b] = 0x44c3,
-+  [0x1f1c] = 0x44c4, [0x1f1d] = 0x44c5, [0x1f1e] = 0x44c6, [0x1f1f] = 0x44c7,
-+  [0x1f20] = 0x44c8, [0x1f21] = 0x44c9, [0x1f22] = 0x44ca, [0x1f23] = 0x44cb,
-+  [0x1f24] = 0x44cc, [0x1f25] = 0x44cd, [0x1f26] = 0x44ce, [0x1f27] = 0x44cf,
-+  [0x1f28] = 0x44d0, [0x1f29] = 0x44d1, [0x1f2a] = 0x44d2, [0x1f2b] = 0x44d3,
-+  [0x1f2c] = 0x44d4, [0x1f2d] = 0x44d5, [0x1f2e] = 0x44d7, [0x1f2f] = 0x44d8,
-+  [0x1f30] = 0x44d9, [0x1f31] = 0x44da, [0x1f32] = 0x44db, [0x1f33] = 0x44dc,
-+  [0x1f34] = 0x44dd, [0x1f35] = 0x44de, [0x1f36] = 0x44df, [0x1f37] = 0x44e0,
-+  [0x1f38] = 0x44e1, [0x1f39] = 0x44e2, [0x1f3a] = 0x44e3, [0x1f3b] = 0x44e4,
-+  [0x1f3c] = 0x44e5, [0x1f3d] = 0x44e6, [0x1f3e] = 0x44e7, [0x1f3f] = 0x44e8,
-+  [0x1f40] = 0x44e9, [0x1f41] = 0x44ea, [0x1f42] = 0x44eb, [0x1f43] = 0x44ec,
-+  [0x1f44] = 0x44ed, [0x1f45] = 0x44ee, [0x1f46] = 0x44ef, [0x1f47] = 0x44f0,
-+  [0x1f48] = 0x44f1, [0x1f49] = 0x44f2, [0x1f4a] = 0x44f3, [0x1f4b] = 0x44f4,
-+  [0x1f4c] = 0x44f5, [0x1f4d] = 0x44f6, [0x1f4e] = 0x44f7, [0x1f4f] = 0x44f8,
-+  [0x1f50] = 0x44f9, [0x1f51] = 0x44fa, [0x1f52] = 0x44fb, [0x1f53] = 0x44fc,
-+  [0x1f54] = 0x44fd, [0x1f55] = 0x44fe, [0x1f56] = 0x44ff, [0x1f57] = 0x4500,
-+  [0x1f58] = 0x4501, [0x1f59] = 0x4502, [0x1f5a] = 0x4503, [0x1f5b] = 0x4504,
-+  [0x1f5c] = 0x4505, [0x1f5d] = 0x4506, [0x1f5e] = 0x4507, [0x1f5f] = 0x4508,
-+  [0x1f60] = 0x4509, [0x1f61] = 0x450a, [0x1f62] = 0x450b, [0x1f63] = 0x450c,
-+  [0x1f64] = 0x450d, [0x1f65] = 0x450e, [0x1f66] = 0x450f, [0x1f67] = 0x4510,
-+  [0x1f68] = 0x4511, [0x1f69] = 0x4512, [0x1f6a] = 0x4513, [0x1f6b] = 0x4514,
-+  [0x1f6c] = 0x4515, [0x1f6d] = 0x4516, [0x1f6e] = 0x4517, [0x1f6f] = 0x4518,
-+  [0x1f70] = 0x4519, [0x1f71] = 0x451a, [0x1f72] = 0x451b, [0x1f73] = 0x451c,
-+  [0x1f74] = 0x451d, [0x1f75] = 0x451e, [0x1f76] = 0x451f, [0x1f77] = 0x4520,
-+  [0x1f78] = 0x4521, [0x1f79] = 0x4522, [0x1f7a] = 0x4523, [0x1f7b] = 0x4524,
-+  [0x1f7c] = 0x4525, [0x1f7d] = 0x4526, [0x1f7e] = 0x4527, [0x1f7f] = 0x4528,
-+  [0x1f80] = 0x4529, [0x1f81] = 0x452a, [0x1f82] = 0x452b, [0x1f83] = 0x452c,
-+  [0x1f84] = 0x452d, [0x1f85] = 0x452e, [0x1f86] = 0x452f, [0x1f87] = 0x4530,
-+  [0x1f88] = 0x4531, [0x1f89] = 0x4532, [0x1f8a] = 0x4533, [0x1f8b] = 0x4534,
-+  [0x1f8c] = 0x4535, [0x1f8d] = 0x4536, [0x1f8e] = 0x4537, [0x1f8f] = 0x4538,
-+  [0x1f90] = 0x4539, [0x1f91] = 0x453a, [0x1f92] = 0x453b, [0x1f93] = 0x453c,
-+  [0x1f94] = 0x453d, [0x1f95] = 0x453e, [0x1f96] = 0x453f, [0x1f97] = 0x4540,
-+  [0x1f98] = 0x4541, [0x1f99] = 0x4542, [0x1f9a] = 0x4543, [0x1f9b] = 0x4544,
-+  [0x1f9c] = 0x4545, [0x1f9d] = 0x4546, [0x1f9e] = 0x4547, [0x1f9f] = 0x4548,
-+  [0x1fa0] = 0x4549, [0x1fa1] = 0x454a, [0x1fa2] = 0x454b, [0x1fa3] = 0x454c,
-+  [0x1fa4] = 0x454d, [0x1fa5] = 0x454e, [0x1fa6] = 0x454f, [0x1fa7] = 0x4550,
-+  [0x1fa8] = 0x4551, [0x1fa9] = 0x4552, [0x1faa] = 0x4553, [0x1fab] = 0x4554,
-+  [0x1fac] = 0x4555, [0x1fad] = 0x4556, [0x1fae] = 0x4557, [0x1faf] = 0x4558,
-+  [0x1fb0] = 0x4559, [0x1fb1] = 0x455a, [0x1fb2] = 0x455b, [0x1fb3] = 0x455c,
-+  [0x1fb4] = 0x455d, [0x1fb5] = 0x455e, [0x1fb6] = 0x455f, [0x1fb7] = 0x4560,
-+  [0x1fb8] = 0x4561, [0x1fb9] = 0x4562, [0x1fba] = 0x4563, [0x1fbb] = 0x4564,
-+  [0x1fbc] = 0x4565, [0x1fbd] = 0x4566, [0x1fbe] = 0x4567, [0x1fbf] = 0x4568,
-+  [0x1fc0] = 0x4569, [0x1fc1] = 0x456a, [0x1fc2] = 0x456b, [0x1fc3] = 0x456c,
-+  [0x1fc4] = 0x456d, [0x1fc5] = 0x456e, [0x1fc6] = 0x456f, [0x1fc7] = 0x4570,
-+  [0x1fc8] = 0x4571, [0x1fc9] = 0x4572, [0x1fca] = 0x4573, [0x1fcb] = 0x4574,
-+  [0x1fcc] = 0x4575, [0x1fcd] = 0x4576, [0x1fce] = 0x4577, [0x1fcf] = 0x4578,
-+  [0x1fd0] = 0x4579, [0x1fd1] = 0x457a, [0x1fd2] = 0x457b, [0x1fd3] = 0x457c,
-+  [0x1fd4] = 0x457d, [0x1fd5] = 0x457e, [0x1fd6] = 0x457f, [0x1fd7] = 0x4580,
-+  [0x1fd8] = 0x4581, [0x1fd9] = 0x4582, [0x1fda] = 0x4583, [0x1fdb] = 0x4584,
-+  [0x1fdc] = 0x4585, [0x1fdd] = 0x4586, [0x1fde] = 0x4587, [0x1fdf] = 0x4588,
-+  [0x1fe0] = 0x4589, [0x1fe1] = 0x458a, [0x1fe2] = 0x458b, [0x1fe3] = 0x458c,
-+  [0x1fe4] = 0x458d, [0x1fe5] = 0x458e, [0x1fe6] = 0x458f, [0x1fe7] = 0x4590,
-+  [0x1fe8] = 0x4591, [0x1fe9] = 0x4592, [0x1fea] = 0x4593, [0x1feb] = 0x4594,
-+  [0x1fec] = 0x4595, [0x1fed] = 0x4596, [0x1fee] = 0x4597, [0x1fef] = 0x4598,
-+  [0x1ff0] = 0x4599, [0x1ff1] = 0x459a, [0x1ff2] = 0x459b, [0x1ff3] = 0x459c,
-+  [0x1ff4] = 0x459d, [0x1ff5] = 0x459e, [0x1ff6] = 0x459f, [0x1ff7] = 0x45a0,
-+  [0x1ff8] = 0x45a1, [0x1ff9] = 0x45a2, [0x1ffa] = 0x45a3, [0x1ffb] = 0x45a4,
-+  [0x1ffc] = 0x45a5, [0x1ffd] = 0x45a6, [0x1ffe] = 0x45a7, [0x1fff] = 0x45a8,
-+  [0x2000] = 0x45a9, [0x2001] = 0x45aa, [0x2002] = 0x45ab, [0x2003] = 0x45ac,
-+  [0x2004] = 0x45ad, [0x2005] = 0x45ae, [0x2006] = 0x45af, [0x2007] = 0x45b0,
-+  [0x2008] = 0x45b1, [0x2009] = 0x45b2, [0x200a] = 0x45b3, [0x200b] = 0x45b4,
-+  [0x200c] = 0x45b5, [0x200d] = 0x45b6, [0x200e] = 0x45b7, [0x200f] = 0x45b8,
-+  [0x2010] = 0x45b9, [0x2011] = 0x45ba, [0x2012] = 0x45bb, [0x2013] = 0x45bc,
-+  [0x2014] = 0x45bd, [0x2015] = 0x45be, [0x2016] = 0x45bf, [0x2017] = 0x45c0,
-+  [0x2018] = 0x45c1, [0x2019] = 0x45c2, [0x201a] = 0x45c3, [0x201b] = 0x45c4,
-+  [0x201c] = 0x45c5, [0x201d] = 0x45c6, [0x201e] = 0x45c7, [0x201f] = 0x45c8,
-+  [0x2020] = 0x45c9, [0x2021] = 0x45ca, [0x2022] = 0x45cb, [0x2023] = 0x45cc,
-+  [0x2024] = 0x45cd, [0x2025] = 0x45ce, [0x2026] = 0x45cf, [0x2027] = 0x45d0,
-+  [0x2028] = 0x45d1, [0x2029] = 0x45d2, [0x202a] = 0x45d3, [0x202b] = 0x45d4,
-+  [0x202c] = 0x45d5, [0x202d] = 0x45d6, [0x202e] = 0x45d7, [0x202f] = 0x45d8,
-+  [0x2030] = 0x45d9, [0x2031] = 0x45da, [0x2032] = 0x45db, [0x2033] = 0x45dc,
-+  [0x2034] = 0x45dd, [0x2035] = 0x45de, [0x2036] = 0x45df, [0x2037] = 0x45e0,
-+  [0x2038] = 0x45e1, [0x2039] = 0x45e2, [0x203a] = 0x45e3, [0x203b] = 0x45e4,
-+  [0x203c] = 0x45e5, [0x203d] = 0x45e6, [0x203e] = 0x45e7, [0x203f] = 0x45e8,
-+  [0x2040] = 0x45e9, [0x2041] = 0x45ea, [0x2042] = 0x45eb, [0x2043] = 0x45ec,
-+  [0x2044] = 0x45ed, [0x2045] = 0x45ee, [0x2046] = 0x45ef, [0x2047] = 0x45f0,
-+  [0x2048] = 0x45f1, [0x2049] = 0x45f2, [0x204a] = 0x45f3, [0x204b] = 0x45f4,
-+  [0x204c] = 0x45f5, [0x204d] = 0x45f6, [0x204e] = 0x45f7, [0x204f] = 0x45f8,
-+  [0x2050] = 0x45f9, [0x2051] = 0x45fa, [0x2052] = 0x45fb, [0x2053] = 0x45fc,
-+  [0x2054] = 0x45fd, [0x2055] = 0x45fe, [0x2056] = 0x45ff, [0x2057] = 0x4600,
-+  [0x2058] = 0x4601, [0x2059] = 0x4602, [0x205a] = 0x4603, [0x205b] = 0x4604,
-+  [0x205c] = 0x4605, [0x205d] = 0x4606, [0x205e] = 0x4607, [0x205f] = 0x4608,
-+  [0x2060] = 0x4609, [0x2061] = 0x460a, [0x2062] = 0x460b, [0x2063] = 0x460c,
-+  [0x2064] = 0x460d, [0x2065] = 0x460e, [0x2066] = 0x460f, [0x2067] = 0x4610,
-+  [0x2068] = 0x4611, [0x2069] = 0x4612, [0x206a] = 0x4613, [0x206b] = 0x4614,
-+  [0x206c] = 0x4615, [0x206d] = 0x4616, [0x206e] = 0x4617, [0x206f] = 0x4618,
-+  [0x2070] = 0x4619, [0x2071] = 0x461a, [0x2072] = 0x461b, [0x2073] = 0x461c,
-+  [0x2074] = 0x461d, [0x2075] = 0x461e, [0x2076] = 0x461f, [0x2077] = 0x4620,
-+  [0x2078] = 0x4621, [0x2079] = 0x4622, [0x207a] = 0x4623, [0x207b] = 0x4624,
-+  [0x207c] = 0x4625, [0x207d] = 0x4626, [0x207e] = 0x4627, [0x207f] = 0x4628,
-+  [0x2080] = 0x4629, [0x2081] = 0x462a, [0x2082] = 0x462b, [0x2083] = 0x462c,
-+  [0x2084] = 0x462d, [0x2085] = 0x462e, [0x2086] = 0x462f, [0x2087] = 0x4630,
-+  [0x2088] = 0x4631, [0x2089] = 0x4632, [0x208a] = 0x4633, [0x208b] = 0x4634,
-+  [0x208c] = 0x4635, [0x208d] = 0x4636, [0x208e] = 0x4637, [0x208f] = 0x4638,
-+  [0x2090] = 0x4639, [0x2091] = 0x463a, [0x2092] = 0x463b, [0x2093] = 0x463c,
-+  [0x2094] = 0x463d, [0x2095] = 0x463e, [0x2096] = 0x463f, [0x2097] = 0x4640,
-+  [0x2098] = 0x4641, [0x2099] = 0x4642, [0x209a] = 0x4643, [0x209b] = 0x4644,
-+  [0x209c] = 0x4645, [0x209d] = 0x4646, [0x209e] = 0x4647, [0x209f] = 0x4648,
-+  [0x20a0] = 0x4649, [0x20a1] = 0x464a, [0x20a2] = 0x464b, [0x20a3] = 0x464d,
-+  [0x20a4] = 0x464e, [0x20a5] = 0x464f, [0x20a6] = 0x4650, [0x20a7] = 0x4651,
-+  [0x20a8] = 0x4652, [0x20a9] = 0x4653, [0x20aa] = 0x4654, [0x20ab] = 0x4655,
-+  [0x20ac] = 0x4656, [0x20ad] = 0x4657, [0x20ae] = 0x4658, [0x20af] = 0x4659,
-+  [0x20b0] = 0x465a, [0x20b1] = 0x465b, [0x20b2] = 0x465c, [0x20b3] = 0x465d,
-+  [0x20b4] = 0x465e, [0x20b5] = 0x465f, [0x20b6] = 0x4660, [0x20b7] = 0x4662,
-+  [0x20b8] = 0x4663, [0x20b9] = 0x4664, [0x20ba] = 0x4665, [0x20bb] = 0x4666,
-+  [0x20bc] = 0x4667, [0x20bd] = 0x4668, [0x20be] = 0x4669, [0x20bf] = 0x466a,
-+  [0x20c0] = 0x466b, [0x20c1] = 0x466c, [0x20c2] = 0x466d, [0x20c3] = 0x466e,
-+  [0x20c4] = 0x466f, [0x20c5] = 0x4670, [0x20c6] = 0x4671, [0x20c7] = 0x4672,
-+  [0x20c8] = 0x4673, [0x20c9] = 0x4674, [0x20ca] = 0x4675, [0x20cb] = 0x4676,
-+  [0x20cc] = 0x4677, [0x20cd] = 0x4678, [0x20ce] = 0x4679, [0x20cf] = 0x467a,
-+  [0x20d0] = 0x467b, [0x20d1] = 0x467c, [0x20d2] = 0x467d, [0x20d3] = 0x467e,
-+  [0x20d4] = 0x467f, [0x20d5] = 0x4680, [0x20d6] = 0x4681, [0x20d7] = 0x4682,
-+  [0x20d8] = 0x4683, [0x20d9] = 0x4684, [0x20da] = 0x4685, [0x20db] = 0x4686,
-+  [0x20dc] = 0x4687, [0x20dd] = 0x4688, [0x20de] = 0x4689, [0x20df] = 0x468a,
-+  [0x20e0] = 0x468b, [0x20e1] = 0x468c, [0x20e2] = 0x468d, [0x20e3] = 0x468e,
-+  [0x20e4] = 0x468f, [0x20e5] = 0x4690, [0x20e6] = 0x4691, [0x20e7] = 0x4692,
-+  [0x20e8] = 0x4693, [0x20e9] = 0x4694, [0x20ea] = 0x4695, [0x20eb] = 0x4696,
-+  [0x20ec] = 0x4697, [0x20ed] = 0x4698, [0x20ee] = 0x4699, [0x20ef] = 0x469a,
-+  [0x20f0] = 0x469b, [0x20f1] = 0x469c, [0x20f2] = 0x469d, [0x20f3] = 0x469e,
-+  [0x20f4] = 0x469f, [0x20f5] = 0x46a0, [0x20f6] = 0x46a1, [0x20f7] = 0x46a2,
-+  [0x20f8] = 0x46a3, [0x20f9] = 0x46a4, [0x20fa] = 0x46a5, [0x20fb] = 0x46a6,
-+  [0x20fc] = 0x46a7, [0x20fd] = 0x46a8, [0x20fe] = 0x46a9, [0x20ff] = 0x46aa,
-+  [0x2100] = 0x46ab, [0x2101] = 0x46ac, [0x2102] = 0x46ad, [0x2103] = 0x46ae,
-+  [0x2104] = 0x46af, [0x2105] = 0x46b0, [0x2106] = 0x46b1, [0x2107] = 0x46b2,
-+  [0x2108] = 0x46b3, [0x2109] = 0x46b4, [0x210a] = 0x46b5, [0x210b] = 0x46b6,
-+  [0x210c] = 0x46b7, [0x210d] = 0x46b8, [0x210e] = 0x46b9, [0x210f] = 0x46ba,
-+  [0x2110] = 0x46bb, [0x2111] = 0x46bc, [0x2112] = 0x46bd, [0x2113] = 0x46be,
-+  [0x2114] = 0x46bf, [0x2115] = 0x46c0, [0x2116] = 0x46c1, [0x2117] = 0x46c2,
-+  [0x2118] = 0x46c3, [0x2119] = 0x46c4, [0x211a] = 0x46c5, [0x211b] = 0x46c6,
-+  [0x211c] = 0x46c7, [0x211d] = 0x46c8, [0x211e] = 0x46c9, [0x211f] = 0x46ca,
-+  [0x2120] = 0x46cb, [0x2121] = 0x46cc, [0x2122] = 0x46cd, [0x2123] = 0x46ce,
-+  [0x2124] = 0x46cf, [0x2125] = 0x46d0, [0x2126] = 0x46d1, [0x2127] = 0x46d2,
-+  [0x2128] = 0x46d3, [0x2129] = 0x46d4, [0x212a] = 0x46d5, [0x212b] = 0x46d6,
-+  [0x212c] = 0x46d7, [0x212d] = 0x46d8, [0x212e] = 0x46d9, [0x212f] = 0x46da,
-+  [0x2130] = 0x46db, [0x2131] = 0x46dc, [0x2132] = 0x46dd, [0x2133] = 0x46de,
-+  [0x2134] = 0x46df, [0x2135] = 0x46e0, [0x2136] = 0x46e1, [0x2137] = 0x46e2,
-+  [0x2138] = 0x46e3, [0x2139] = 0x46e4, [0x213a] = 0x46e5, [0x213b] = 0x46e6,
-+  [0x213c] = 0x46e7, [0x213d] = 0x46e8, [0x213e] = 0x46e9, [0x213f] = 0x46ea,
-+  [0x2140] = 0x46eb, [0x2141] = 0x46ec, [0x2142] = 0x46ed, [0x2143] = 0x46ee,
-+  [0x2144] = 0x46ef, [0x2145] = 0x46f0, [0x2146] = 0x46f1, [0x2147] = 0x46f2,
-+  [0x2148] = 0x46f3, [0x2149] = 0x46f4, [0x214a] = 0x46f5, [0x214b] = 0x46f6,
-+  [0x214c] = 0x46f7, [0x214d] = 0x46f8, [0x214e] = 0x46f9, [0x214f] = 0x46fa,
-+  [0x2150] = 0x46fb, [0x2151] = 0x46fc, [0x2152] = 0x46fd, [0x2153] = 0x46fe,
-+  [0x2154] = 0x46ff, [0x2155] = 0x4700, [0x2156] = 0x4701, [0x2157] = 0x4702,
-+  [0x2158] = 0x4703, [0x2159] = 0x4704, [0x215a] = 0x4705, [0x215b] = 0x4706,
-+  [0x215c] = 0x4707, [0x215d] = 0x4708, [0x215e] = 0x4709, [0x215f] = 0x470a,
-+  [0x2160] = 0x470b, [0x2161] = 0x470c, [0x2162] = 0x470d, [0x2163] = 0x470e,
-+  [0x2164] = 0x470f, [0x2165] = 0x4710, [0x2166] = 0x4711, [0x2167] = 0x4712,
-+  [0x2168] = 0x4713, [0x2169] = 0x4714, [0x216a] = 0x4715, [0x216b] = 0x4716,
-+  [0x216c] = 0x4717, [0x216d] = 0x4718, [0x216e] = 0x4719, [0x216f] = 0x471a,
-+  [0x2170] = 0x471b, [0x2171] = 0x471c, [0x2172] = 0x471d, [0x2173] = 0x471e,
-+  [0x2174] = 0x471f, [0x2175] = 0x4720, [0x2176] = 0x4721, [0x2177] = 0x4722,
-+  [0x2178] = 0x4724, [0x2179] = 0x4725, [0x217a] = 0x4726, [0x217b] = 0x4727,
-+  [0x217c] = 0x4728, [0x217d] = 0x472a, [0x217e] = 0x472b, [0x217f] = 0x472c,
-+  [0x2180] = 0x472d, [0x2181] = 0x472e, [0x2182] = 0x472f, [0x2183] = 0x4730,
-+  [0x2184] = 0x4731, [0x2185] = 0x4732, [0x2186] = 0x4733, [0x2187] = 0x4734,
-+  [0x2188] = 0x4735, [0x2189] = 0x4736, [0x218a] = 0x4737, [0x218b] = 0x4738,
-+  [0x218c] = 0x4739, [0x218d] = 0x473a, [0x218e] = 0x473b, [0x218f] = 0x473c,
-+  [0x2190] = 0x473d, [0x2191] = 0x473e, [0x2192] = 0x473f, [0x2193] = 0x4740,
-+  [0x2194] = 0x4741, [0x2195] = 0x4742, [0x2196] = 0x4743, [0x2197] = 0x4744,
-+  [0x2198] = 0x4745, [0x2199] = 0x4746, [0x219a] = 0x4747, [0x219b] = 0x4748,
-+  [0x219c] = 0x4749, [0x219d] = 0x474a, [0x219e] = 0x474b, [0x219f] = 0x474c,
-+  [0x21a0] = 0x474d, [0x21a1] = 0x474e, [0x21a2] = 0x474f, [0x21a3] = 0x4750,
-+  [0x21a4] = 0x4751, [0x21a5] = 0x4752, [0x21a6] = 0x4753, [0x21a7] = 0x4754,
-+  [0x21a8] = 0x4755, [0x21a9] = 0x4756, [0x21aa] = 0x4757, [0x21ab] = 0x4758,
-+  [0x21ac] = 0x4759, [0x21ad] = 0x475a, [0x21ae] = 0x475b, [0x21af] = 0x475c,
-+  [0x21b0] = 0x475d, [0x21b1] = 0x475e, [0x21b2] = 0x475f, [0x21b3] = 0x4760,
-+  [0x21b4] = 0x4761, [0x21b5] = 0x4762, [0x21b6] = 0x4763, [0x21b7] = 0x4764,
-+  [0x21b8] = 0x4765, [0x21b9] = 0x4766, [0x21ba] = 0x4767, [0x21bb] = 0x4768,
-+  [0x21bc] = 0x4769, [0x21bd] = 0x476a, [0x21be] = 0x476b, [0x21bf] = 0x476c,
-+  [0x21c0] = 0x476d, [0x21c1] = 0x476e, [0x21c2] = 0x476f, [0x21c3] = 0x4770,
-+  [0x21c4] = 0x4771, [0x21c5] = 0x4772, [0x21c6] = 0x4773, [0x21c7] = 0x4774,
-+  [0x21c8] = 0x4775, [0x21c9] = 0x4776, [0x21ca] = 0x4777, [0x21cb] = 0x4778,
-+  [0x21cc] = 0x4779, [0x21cd] = 0x477a, [0x21ce] = 0x477b, [0x21cf] = 0x477d,
-+  [0x21d0] = 0x477e, [0x21d1] = 0x477f, [0x21d2] = 0x4780, [0x21d3] = 0x4781,
-+  [0x21d4] = 0x4782, [0x21d5] = 0x4783, [0x21d6] = 0x4784, [0x21d7] = 0x4785,
-+  [0x21d8] = 0x4786, [0x21d9] = 0x4787, [0x21da] = 0x4788, [0x21db] = 0x4789,
-+  [0x21dc] = 0x478a, [0x21dd] = 0x478b, [0x21de] = 0x478c, [0x21df] = 0x478e,
-+  [0x21e0] = 0x478f, [0x21e1] = 0x4790, [0x21e2] = 0x4791, [0x21e3] = 0x4792,
-+  [0x21e4] = 0x4793, [0x21e5] = 0x4794, [0x21e6] = 0x4795, [0x21e7] = 0x4796,
-+  [0x21e8] = 0x4797, [0x21e9] = 0x4798, [0x21ea] = 0x4799, [0x21eb] = 0x479a,
-+  [0x21ec] = 0x479b, [0x21ed] = 0x479c, [0x21ee] = 0x479d, [0x21ef] = 0x479e,
-+  [0x21f0] = 0x479f, [0x21f1] = 0x47a0, [0x21f2] = 0x47a1, [0x21f3] = 0x47a2,
-+  [0x21f4] = 0x47a3, [0x21f5] = 0x47a4, [0x21f6] = 0x47a5, [0x21f7] = 0x47a6,
-+  [0x21f8] = 0x47a7, [0x21f9] = 0x47a8, [0x21fa] = 0x47a9, [0x21fb] = 0x47aa,
-+  [0x21fc] = 0x47ab, [0x21fd] = 0x47ac, [0x21fe] = 0x47ad, [0x21ff] = 0x47ae,
-+  [0x2200] = 0x47af, [0x2201] = 0x47b0, [0x2202] = 0x47b1, [0x2203] = 0x47b2,
-+  [0x2204] = 0x47b3, [0x2205] = 0x47b4, [0x2206] = 0x47b5, [0x2207] = 0x47b6,
-+  [0x2208] = 0x47b7, [0x2209] = 0x47b8, [0x220a] = 0x47b9, [0x220b] = 0x47ba,
-+  [0x220c] = 0x47bb, [0x220d] = 0x47bc, [0x220e] = 0x47bd, [0x220f] = 0x47be,
-+  [0x2210] = 0x47bf, [0x2211] = 0x47c0, [0x2212] = 0x47c1, [0x2213] = 0x47c2,
-+  [0x2214] = 0x47c3, [0x2215] = 0x47c4, [0x2216] = 0x47c5, [0x2217] = 0x47c6,
-+  [0x2218] = 0x47c7, [0x2219] = 0x47c8, [0x221a] = 0x47c9, [0x221b] = 0x47ca,
-+  [0x221c] = 0x47cb, [0x221d] = 0x47cc, [0x221e] = 0x47cd, [0x221f] = 0x47ce,
-+  [0x2220] = 0x47cf, [0x2221] = 0x47d0, [0x2222] = 0x47d1, [0x2223] = 0x47d2,
-+  [0x2224] = 0x47d3, [0x2225] = 0x47d4, [0x2226] = 0x47d5, [0x2227] = 0x47d6,
-+  [0x2228] = 0x47d7, [0x2229] = 0x47d8, [0x222a] = 0x47d9, [0x222b] = 0x47da,
-+  [0x222c] = 0x47db, [0x222d] = 0x47dc, [0x222e] = 0x47dd, [0x222f] = 0x47de,
-+  [0x2230] = 0x47df, [0x2231] = 0x47e0, [0x2232] = 0x47e1, [0x2233] = 0x47e2,
-+  [0x2234] = 0x47e3, [0x2235] = 0x47e4, [0x2236] = 0x47e5, [0x2237] = 0x47e6,
-+  [0x2238] = 0x47e7, [0x2239] = 0x47e8, [0x223a] = 0x47e9, [0x223b] = 0x47ea,
-+  [0x223c] = 0x47eb, [0x223d] = 0x47ec, [0x223e] = 0x47ed, [0x223f] = 0x47ee,
-+  [0x2240] = 0x47ef, [0x2241] = 0x47f0, [0x2242] = 0x47f1, [0x2243] = 0x47f2,
-+  [0x2244] = 0x47f3, [0x2245] = 0x47f4, [0x2246] = 0x47f5, [0x2247] = 0x47f6,
-+  [0x2248] = 0x47f7, [0x2249] = 0x47f8, [0x224a] = 0x47f9, [0x224b] = 0x47fa,
-+  [0x224c] = 0x47fb, [0x224d] = 0x47fc, [0x224e] = 0x47fd, [0x224f] = 0x47fe,
-+  [0x2250] = 0x47ff, [0x2251] = 0x4800, [0x2252] = 0x4801, [0x2253] = 0x4802,
-+  [0x2254] = 0x4803, [0x2255] = 0x4804, [0x2256] = 0x4805, [0x2257] = 0x4806,
-+  [0x2258] = 0x4807, [0x2259] = 0x4808, [0x225a] = 0x4809, [0x225b] = 0x480a,
-+  [0x225c] = 0x480b, [0x225d] = 0x480c, [0x225e] = 0x480d, [0x225f] = 0x480e,
-+  [0x2260] = 0x480f, [0x2261] = 0x4810, [0x2262] = 0x4811, [0x2263] = 0x4812,
-+  [0x2264] = 0x4813, [0x2265] = 0x4814, [0x2266] = 0x4815, [0x2267] = 0x4816,
-+  [0x2268] = 0x4817, [0x2269] = 0x4818, [0x226a] = 0x4819, [0x226b] = 0x481a,
-+  [0x226c] = 0x481b, [0x226d] = 0x481c, [0x226e] = 0x481d, [0x226f] = 0x481e,
-+  [0x2270] = 0x481f, [0x2271] = 0x4820, [0x2272] = 0x4821, [0x2273] = 0x4822,
-+  [0x2274] = 0x4823, [0x2275] = 0x4824, [0x2276] = 0x4825, [0x2277] = 0x4826,
-+  [0x2278] = 0x4827, [0x2279] = 0x4828, [0x227a] = 0x4829, [0x227b] = 0x482a,
-+  [0x227c] = 0x482b, [0x227d] = 0x482c, [0x227e] = 0x482d, [0x227f] = 0x482e,
-+  [0x2280] = 0x482f, [0x2281] = 0x4830, [0x2282] = 0x4831, [0x2283] = 0x4832,
-+  [0x2284] = 0x4833, [0x2285] = 0x4834, [0x2286] = 0x4835, [0x2287] = 0x4836,
-+  [0x2288] = 0x4837, [0x2289] = 0x4838, [0x228a] = 0x4839, [0x228b] = 0x483a,
-+  [0x228c] = 0x483b, [0x228d] = 0x483c, [0x228e] = 0x483d, [0x228f] = 0x483e,
-+  [0x2290] = 0x483f, [0x2291] = 0x4840, [0x2292] = 0x4841, [0x2293] = 0x4842,
-+  [0x2294] = 0x4843, [0x2295] = 0x4844, [0x2296] = 0x4845, [0x2297] = 0x4846,
-+  [0x2298] = 0x4847, [0x2299] = 0x4848, [0x229a] = 0x4849, [0x229b] = 0x484a,
-+  [0x229c] = 0x484b, [0x229d] = 0x484c, [0x229e] = 0x484d, [0x229f] = 0x484e,
-+  [0x22a0] = 0x484f, [0x22a1] = 0x4850, [0x22a2] = 0x4851, [0x22a3] = 0x4852,
-+  [0x22a4] = 0x4853, [0x22a5] = 0x4854, [0x22a6] = 0x4855, [0x22a7] = 0x4856,
-+  [0x22a8] = 0x4857, [0x22a9] = 0x4858, [0x22aa] = 0x4859, [0x22ab] = 0x485a,
-+  [0x22ac] = 0x485b, [0x22ad] = 0x485c, [0x22ae] = 0x485d, [0x22af] = 0x485e,
-+  [0x22b0] = 0x485f, [0x22b1] = 0x4860, [0x22b2] = 0x4861, [0x22b3] = 0x4862,
-+  [0x22b4] = 0x4863, [0x22b5] = 0x4864, [0x22b6] = 0x4865, [0x22b7] = 0x4866,
-+  [0x22b8] = 0x4867, [0x22b9] = 0x4868, [0x22ba] = 0x4869, [0x22bb] = 0x486a,
-+  [0x22bc] = 0x486b, [0x22bd] = 0x486c, [0x22be] = 0x486d, [0x22bf] = 0x486e,
-+  [0x22c0] = 0x486f, [0x22c1] = 0x4870, [0x22c2] = 0x4871, [0x22c3] = 0x4872,
-+  [0x22c4] = 0x4873, [0x22c5] = 0x4874, [0x22c6] = 0x4875, [0x22c7] = 0x4876,
-+  [0x22c8] = 0x4877, [0x22c9] = 0x4878, [0x22ca] = 0x4879, [0x22cb] = 0x487a,
-+  [0x22cc] = 0x487b, [0x22cd] = 0x487c, [0x22ce] = 0x487d, [0x22cf] = 0x487e,
-+  [0x22d0] = 0x487f, [0x22d1] = 0x4880, [0x22d2] = 0x4881, [0x22d3] = 0x4882,
-+  [0x22d4] = 0x4883, [0x22d5] = 0x4884, [0x22d6] = 0x4885, [0x22d7] = 0x4886,
-+  [0x22d8] = 0x4887, [0x22d9] = 0x4888, [0x22da] = 0x4889, [0x22db] = 0x488a,
-+  [0x22dc] = 0x488b, [0x22dd] = 0x488c, [0x22de] = 0x488d, [0x22df] = 0x488e,
-+  [0x22e0] = 0x488f, [0x22e1] = 0x4890, [0x22e2] = 0x4891, [0x22e3] = 0x4892,
-+  [0x22e4] = 0x4893, [0x22e5] = 0x4894, [0x22e6] = 0x4895, [0x22e7] = 0x4896,
-+  [0x22e8] = 0x4897, [0x22e9] = 0x4898, [0x22ea] = 0x4899, [0x22eb] = 0x489a,
-+  [0x22ec] = 0x489b, [0x22ed] = 0x489c, [0x22ee] = 0x489d, [0x22ef] = 0x489e,
-+  [0x22f0] = 0x489f, [0x22f1] = 0x48a0, [0x22f2] = 0x48a1, [0x22f3] = 0x48a2,
-+  [0x22f4] = 0x48a3, [0x22f5] = 0x48a4, [0x22f6] = 0x48a5, [0x22f7] = 0x48a6,
-+  [0x22f8] = 0x48a7, [0x22f9] = 0x48a8, [0x22fa] = 0x48a9, [0x22fb] = 0x48aa,
-+  [0x22fc] = 0x48ab, [0x22fd] = 0x48ac, [0x22fe] = 0x48ad, [0x22ff] = 0x48ae,
-+  [0x2300] = 0x48af, [0x2301] = 0x48b0, [0x2302] = 0x48b1, [0x2303] = 0x48b2,
-+  [0x2304] = 0x48b3, [0x2305] = 0x48b4, [0x2306] = 0x48b5, [0x2307] = 0x48b6,
-+  [0x2308] = 0x48b7, [0x2309] = 0x48b8, [0x230a] = 0x48b9, [0x230b] = 0x48ba,
-+  [0x230c] = 0x48bb, [0x230d] = 0x48bc, [0x230e] = 0x48bd, [0x230f] = 0x48be,
-+  [0x2310] = 0x48bf, [0x2311] = 0x48c0, [0x2312] = 0x48c1, [0x2313] = 0x48c2,
-+  [0x2314] = 0x48c3, [0x2315] = 0x48c4, [0x2316] = 0x48c5, [0x2317] = 0x48c6,
-+  [0x2318] = 0x48c7, [0x2319] = 0x48c8, [0x231a] = 0x48c9, [0x231b] = 0x48ca,
-+  [0x231c] = 0x48cb, [0x231d] = 0x48cc, [0x231e] = 0x48cd, [0x231f] = 0x48ce,
-+  [0x2320] = 0x48cf, [0x2321] = 0x48d0, [0x2322] = 0x48d1, [0x2323] = 0x48d2,
-+  [0x2324] = 0x48d3, [0x2325] = 0x48d4, [0x2326] = 0x48d5, [0x2327] = 0x48d6,
-+  [0x2328] = 0x48d7, [0x2329] = 0x48d8, [0x232a] = 0x48d9, [0x232b] = 0x48da,
-+  [0x232c] = 0x48db, [0x232d] = 0x48dc, [0x232e] = 0x48dd, [0x232f] = 0x48de,
-+  [0x2330] = 0x48df, [0x2331] = 0x48e0, [0x2332] = 0x48e1, [0x2333] = 0x48e2,
-+  [0x2334] = 0x48e3, [0x2335] = 0x48e4, [0x2336] = 0x48e5, [0x2337] = 0x48e6,
-+  [0x2338] = 0x48e7, [0x2339] = 0x48e8, [0x233a] = 0x48e9, [0x233b] = 0x48ea,
-+  [0x233c] = 0x48eb, [0x233d] = 0x48ec, [0x233e] = 0x48ed, [0x233f] = 0x48ee,
-+  [0x2340] = 0x48ef, [0x2341] = 0x48f0, [0x2342] = 0x48f1, [0x2343] = 0x48f2,
-+  [0x2344] = 0x48f3, [0x2345] = 0x48f4, [0x2346] = 0x48f5, [0x2347] = 0x48f6,
-+  [0x2348] = 0x48f7, [0x2349] = 0x48f8, [0x234a] = 0x48f9, [0x234b] = 0x48fa,
-+  [0x234c] = 0x48fb, [0x234d] = 0x48fc, [0x234e] = 0x48fd, [0x234f] = 0x48fe,
-+  [0x2350] = 0x48ff, [0x2351] = 0x4900, [0x2352] = 0x4901, [0x2353] = 0x4902,
-+  [0x2354] = 0x4903, [0x2355] = 0x4904, [0x2356] = 0x4905, [0x2357] = 0x4906,
-+  [0x2358] = 0x4907, [0x2359] = 0x4908, [0x235a] = 0x4909, [0x235b] = 0x490a,
-+  [0x235c] = 0x490b, [0x235d] = 0x490c, [0x235e] = 0x490d, [0x235f] = 0x490e,
-+  [0x2360] = 0x490f, [0x2361] = 0x4910, [0x2362] = 0x4911, [0x2363] = 0x4912,
-+  [0x2364] = 0x4913, [0x2365] = 0x4914, [0x2366] = 0x4915, [0x2367] = 0x4916,
-+  [0x2368] = 0x4917, [0x2369] = 0x4918, [0x236a] = 0x4919, [0x236b] = 0x491a,
-+  [0x236c] = 0x491b, [0x236d] = 0x491c, [0x236e] = 0x491d, [0x236f] = 0x491e,
-+  [0x2370] = 0x491f, [0x2371] = 0x4920, [0x2372] = 0x4921, [0x2373] = 0x4922,
-+  [0x2374] = 0x4923, [0x2375] = 0x4924, [0x2376] = 0x4925, [0x2377] = 0x4926,
-+  [0x2378] = 0x4927, [0x2379] = 0x4928, [0x237a] = 0x4929, [0x237b] = 0x492a,
-+  [0x237c] = 0x492b, [0x237d] = 0x492c, [0x237e] = 0x492d, [0x237f] = 0x492e,
-+  [0x2380] = 0x492f, [0x2381] = 0x4930, [0x2382] = 0x4931, [0x2383] = 0x4932,
-+  [0x2384] = 0x4933, [0x2385] = 0x4934, [0x2386] = 0x4935, [0x2387] = 0x4936,
-+  [0x2388] = 0x4937, [0x2389] = 0x4938, [0x238a] = 0x4939, [0x238b] = 0x493a,
-+  [0x238c] = 0x493b, [0x238d] = 0x493c, [0x238e] = 0x493d, [0x238f] = 0x493e,
-+  [0x2390] = 0x493f, [0x2391] = 0x4940, [0x2392] = 0x4941, [0x2393] = 0x4942,
-+  [0x2394] = 0x4943, [0x2395] = 0x4944, [0x2396] = 0x4945, [0x2397] = 0x4946,
-   [0x2398] = 0x4948, [0x2399] = 0x4949, [0x239a] = 0x494a, [0x239b] = 0x494b,
-   [0x239c] = 0x494c, [0x239d] = 0x494d, [0x239e] = 0x494e, [0x239f] = 0x494f,
-   [0x23a0] = 0x4950, [0x23a1] = 0x4951, [0x23a2] = 0x4952, [0x23a3] = 0x4953,
-@@ -7519,244 +8418,686 @@ static const uint16_t __fourbyte_to_ucs[39419-11172-4295] =
-   [0x23f0] = 0x49a8, [0x23f1] = 0x49a9, [0x23f2] = 0x49aa, [0x23f3] = 0x49ab,
-   [0x23f4] = 0x49ac, [0x23f5] = 0x49ad, [0x23f6] = 0x49ae, [0x23f7] = 0x49af,
-   [0x23f8] = 0x49b0, [0x23f9] = 0x49b1, [0x23fa] = 0x49b2, [0x23fb] = 0x49b3,
--  [0x23fc] = 0x49b4, [0x23fd] = 0x49b5, [0x26bd] = 0x4c78, [0x26be] = 0x4c79,
--  [0x26bf] = 0x4c7a, [0x26c0] = 0x4c7b, [0x26c1] = 0x4c7c, [0x26c2] = 0x4c7d,
--  [0x26c3] = 0x4c7e, [0x26c4] = 0x4c7f, [0x26c5] = 0x4c80, [0x26c6] = 0x4c81,
--  [0x26c7] = 0x4c82, [0x26c8] = 0x4c83, [0x26c9] = 0x4c84, [0x26ca] = 0x4c85,
--  [0x26cb] = 0x4c86, [0x26cc] = 0x4c87, [0x26cd] = 0x4c88, [0x26ce] = 0x4c89,
--  [0x26cf] = 0x4c8a, [0x26d0] = 0x4c8b, [0x26d1] = 0x4c8c, [0x26d2] = 0x4c8d,
--  [0x26d3] = 0x4c8e, [0x26d4] = 0x4c8f, [0x26d5] = 0x4c90, [0x26d6] = 0x4c91,
--  [0x26d7] = 0x4c92, [0x26d8] = 0x4c93, [0x26d9] = 0x4c94, [0x26da] = 0x4c95,
--  [0x26db] = 0x4c96, [0x26dc] = 0x4c97, [0x26dd] = 0x4c98, [0x26de] = 0x4c99,
--  [0x26df] = 0x4c9a, [0x26e0] = 0x4c9b, [0x26e1] = 0x4c9c, [0x26e2] = 0x4c9d,
--  [0x26e3] = 0x4c9e, [0x26e4] = 0x4ca4, [0x26e5] = 0x4ca5, [0x26e6] = 0x4ca6,
--  [0x26e7] = 0x4ca7, [0x26e8] = 0x4ca8, [0x26e9] = 0x4ca9, [0x26ea] = 0x4caa,
--  [0x26eb] = 0x4cab, [0x26ec] = 0x4cac, [0x26ed] = 0x4cad, [0x26ee] = 0x4cae,
--  [0x26ef] = 0x4caf, [0x26f0] = 0x4cb0, [0x26f1] = 0x4cb1, [0x26f2] = 0x4cb2,
--  [0x26f3] = 0x4cb3, [0x26f4] = 0x4cb4, [0x26f5] = 0x4cb5, [0x26f6] = 0x4cb6,
--  [0x26f7] = 0x4cb7, [0x26f8] = 0x4cb8, [0x26f9] = 0x4cb9, [0x26fa] = 0x4cba,
--  [0x26fb] = 0x4cbb, [0x26fc] = 0x4cbc, [0x26fd] = 0x4cbd, [0x26fe] = 0x4cbe,
--  [0x26ff] = 0x4cbf, [0x2700] = 0x4cc0, [0x2701] = 0x4cc1, [0x2702] = 0x4cc2,
--  [0x2703] = 0x4cc3, [0x2704] = 0x4cc4, [0x2705] = 0x4cc5, [0x2706] = 0x4cc6,
--  [0x2707] = 0x4cc7, [0x2708] = 0x4cc8, [0x2709] = 0x4cc9, [0x270a] = 0x4cca,
--  [0x270b] = 0x4ccb, [0x270c] = 0x4ccc, [0x270d] = 0x4ccd, [0x270e] = 0x4cce,
--  [0x270f] = 0x4ccf, [0x2710] = 0x4cd0, [0x2711] = 0x4cd1, [0x2712] = 0x4cd2,
--  [0x2713] = 0x4cd3, [0x2714] = 0x4cd4, [0x2715] = 0x4cd5, [0x2716] = 0x4cd6,
--  [0x2717] = 0x4cd7, [0x2718] = 0x4cd8, [0x2719] = 0x4cd9, [0x271a] = 0x4cda,
--  [0x271b] = 0x4cdb, [0x271c] = 0x4cdc, [0x271d] = 0x4cdd, [0x271e] = 0x4cde,
--  [0x271f] = 0x4cdf, [0x2720] = 0x4ce0, [0x2721] = 0x4ce1, [0x2722] = 0x4ce2,
--  [0x2723] = 0x4ce3, [0x2724] = 0x4ce4, [0x2725] = 0x4ce5, [0x2726] = 0x4ce6,
--  [0x2727] = 0x4ce7, [0x2728] = 0x4ce8, [0x2729] = 0x4ce9, [0x272a] = 0x4cea,
--  [0x272b] = 0x4ceb, [0x272c] = 0x4cec, [0x272d] = 0x4ced, [0x272e] = 0x4cee,
--  [0x272f] = 0x4cef, [0x2730] = 0x4cf0, [0x2731] = 0x4cf1, [0x2732] = 0x4cf2,
--  [0x2733] = 0x4cf3, [0x2734] = 0x4cf4, [0x2735] = 0x4cf5, [0x2736] = 0x4cf6,
--  [0x2737] = 0x4cf7, [0x2738] = 0x4cf8, [0x2739] = 0x4cf9, [0x273a] = 0x4cfa,
--  [0x273b] = 0x4cfb, [0x273c] = 0x4cfc, [0x273d] = 0x4cfd, [0x273e] = 0x4cfe,
--  [0x273f] = 0x4cff, [0x2740] = 0x4d00, [0x2741] = 0x4d01, [0x2742] = 0x4d02,
--  [0x2743] = 0x4d03, [0x2744] = 0x4d04, [0x2745] = 0x4d05, [0x2746] = 0x4d06,
--  [0x2747] = 0x4d07, [0x2748] = 0x4d08, [0x2749] = 0x4d09, [0x274a] = 0x4d0a,
--  [0x274b] = 0x4d0b, [0x274c] = 0x4d0c, [0x274d] = 0x4d0d, [0x274e] = 0x4d0e,
--  [0x274f] = 0x4d0f, [0x2750] = 0x4d10, [0x2751] = 0x4d11, [0x2752] = 0x4d12,
--  [0x2753] = 0x4d1a, [0x2754] = 0x4d1b, [0x2755] = 0x4d1c, [0x2756] = 0x4d1d,
--  [0x2757] = 0x4d1e, [0x2758] = 0x4d1f, [0x2759] = 0x4d20, [0x275a] = 0x4d21,
--  [0x275b] = 0x4d22, [0x275c] = 0x4d23, [0x275d] = 0x4d24, [0x275e] = 0x4d25,
--  [0x275f] = 0x4d26, [0x2760] = 0x4d27, [0x2761] = 0x4d28, [0x2762] = 0x4d29,
--  [0x2763] = 0x4d2a, [0x2764] = 0x4d2b, [0x2765] = 0x4d2c, [0x2766] = 0x4d2d,
--  [0x2767] = 0x4d2e, [0x2768] = 0x4d2f, [0x2769] = 0x4d30, [0x276a] = 0x4d31,
--  [0x276b] = 0x4d32, [0x276c] = 0x4d33, [0x276d] = 0x4d34, [0x276e] = 0x4d35,
--  [0x276f] = 0x4d36, [0x2770] = 0x4d37, [0x2771] = 0x4d38, [0x2772] = 0x4d39,
--  [0x2773] = 0x4d3a, [0x2774] = 0x4d3b, [0x2775] = 0x4d3c, [0x2776] = 0x4d3d,
--  [0x2777] = 0x4d3e, [0x2778] = 0x4d3f, [0x2779] = 0x4d40, [0x277a] = 0x4d41,
--  [0x277b] = 0x4d42, [0x277c] = 0x4d43, [0x277d] = 0x4d44, [0x277e] = 0x4d45,
--  [0x277f] = 0x4d46, [0x2780] = 0x4d47, [0x2781] = 0x4d48, [0x2782] = 0x4d49,
--  [0x2783] = 0x4d4a, [0x2784] = 0x4d4b, [0x2785] = 0x4d4c, [0x2786] = 0x4d4d,
--  [0x2787] = 0x4d4e, [0x2788] = 0x4d4f, [0x2789] = 0x4d50, [0x278a] = 0x4d51,
--  [0x278b] = 0x4d52, [0x278c] = 0x4d53, [0x278d] = 0x4d54, [0x278e] = 0x4d55,
--  [0x278f] = 0x4d56, [0x2790] = 0x4d57, [0x2791] = 0x4d58, [0x2792] = 0x4d59,
--  [0x2793] = 0x4d5a, [0x2794] = 0x4d5b, [0x2795] = 0x4d5c, [0x2796] = 0x4d5d,
--  [0x2797] = 0x4d5e, [0x2798] = 0x4d5f, [0x2799] = 0x4d60, [0x279a] = 0x4d61,
--  [0x279b] = 0x4d62, [0x279c] = 0x4d63, [0x279d] = 0x4d64, [0x279e] = 0x4d65,
--  [0x279f] = 0x4d66, [0x27a0] = 0x4d67, [0x27a1] = 0x4d68, [0x27a2] = 0x4d69,
--  [0x27a3] = 0x4d6a, [0x27a4] = 0x4d6b, [0x27a5] = 0x4d6c, [0x27a6] = 0x4d6d,
--  [0x27a7] = 0x4d6e, [0x27a8] = 0x4d6f, [0x27a9] = 0x4d70, [0x27aa] = 0x4d71,
--  [0x27ab] = 0x4d72, [0x27ac] = 0x4d73, [0x27ad] = 0x4d74, [0x27ae] = 0x4d75,
--  [0x27af] = 0x4d76, [0x27b0] = 0x4d77, [0x27b1] = 0x4d78, [0x27b2] = 0x4d79,
--  [0x27b3] = 0x4d7a, [0x27b4] = 0x4d7b, [0x27b5] = 0x4d7c, [0x27b6] = 0x4d7d,
--  [0x27b7] = 0x4d7e, [0x27b8] = 0x4d7f, [0x27b9] = 0x4d80, [0x27ba] = 0x4d81,
--  [0x27bb] = 0x4d82, [0x27bc] = 0x4d83, [0x27bd] = 0x4d84, [0x27be] = 0x4d85,
--  [0x27bf] = 0x4d86, [0x27c0] = 0x4d87, [0x27c1] = 0x4d88, [0x27c2] = 0x4d89,
--  [0x27c3] = 0x4d8a, [0x27c4] = 0x4d8b, [0x27c5] = 0x4d8c, [0x27c6] = 0x4d8d,
--  [0x27c7] = 0x4d8e, [0x27c8] = 0x4d8f, [0x27c9] = 0x4d90, [0x27ca] = 0x4d91,
--  [0x27cb] = 0x4d92, [0x27cc] = 0x4d93, [0x27cd] = 0x4d94, [0x27ce] = 0x4d95,
--  [0x27cf] = 0x4d96, [0x27d0] = 0x4d97, [0x27d1] = 0x4d98, [0x27d2] = 0x4d99,
--  [0x27d3] = 0x4d9a, [0x27d4] = 0x4d9b, [0x27d5] = 0x4d9c, [0x27d6] = 0x4d9d,
--  [0x27d7] = 0x4d9e, [0x27d8] = 0x4d9f, [0x27d9] = 0x4da0, [0x27da] = 0x4da1,
--  [0x27db] = 0x4da2, [0x27dc] = 0x4da3, [0x27dd] = 0x4da4, [0x27de] = 0x4da5,
--  [0x27df] = 0x4da6, [0x27e0] = 0x4da7, [0x27e1] = 0x4da8, [0x27e2] = 0x4da9,
--  [0x27e3] = 0x4daa, [0x27e4] = 0x4dab, [0x27e5] = 0x4dac, [0x27e6] = 0x4dad,
--  [0x27e7] = 0x4daf, [0x27e8] = 0x4db0, [0x27e9] = 0x4db1, [0x27ea] = 0x4db2,
--  [0x27eb] = 0x4db3, [0x27ec] = 0x4db4, [0x27ed] = 0x4db5, [0x27f8] = 0x4dc0,
--  [0x27f9] = 0x4dc1, [0x27fa] = 0x4dc2, [0x27fb] = 0x4dc3, [0x27fc] = 0x4dc4,
--  [0x27fd] = 0x4dc5, [0x27fe] = 0x4dc6, [0x27ff] = 0x4dc7, [0x2800] = 0x4dc8,
--  [0x2801] = 0x4dc9, [0x2802] = 0x4dca, [0x2803] = 0x4dcb, [0x2804] = 0x4dcc,
--  [0x2805] = 0x4dcd, [0x2806] = 0x4dce, [0x2807] = 0x4dcf, [0x2808] = 0x4dd0,
--  [0x2809] = 0x4dd1, [0x280a] = 0x4dd2, [0x280b] = 0x4dd3, [0x280c] = 0x4dd4,
--  [0x280d] = 0x4dd5, [0x280e] = 0x4dd6, [0x280f] = 0x4dd7, [0x2810] = 0x4dd8,
--  [0x2811] = 0x4dd9, [0x2812] = 0x4dda, [0x2813] = 0x4ddb, [0x2814] = 0x4ddc,
--  [0x2815] = 0x4ddd, [0x2816] = 0x4dde, [0x2817] = 0x4ddf, [0x2818] = 0x4de0,
--  [0x2819] = 0x4de1, [0x281a] = 0x4de2, [0x281b] = 0x4de3, [0x281c] = 0x4de4,
--  [0x281d] = 0x4de5, [0x281e] = 0x4de6, [0x281f] = 0x4de7, [0x2820] = 0x4de8,
--  [0x2821] = 0x4de9, [0x2822] = 0x4dea, [0x2823] = 0x4deb, [0x2824] = 0x4dec,
--  [0x2825] = 0x4ded, [0x2826] = 0x4dee, [0x2827] = 0x4def, [0x2828] = 0x4df0,
--  [0x2829] = 0x4df1, [0x282a] = 0x4df2, [0x282b] = 0x4df3, [0x282c] = 0x4df4,
--  [0x282d] = 0x4df5, [0x282e] = 0x4df6, [0x282f] = 0x4df7, [0x2830] = 0x4df8,
--  [0x2831] = 0x4df9, [0x2832] = 0x4dfa, [0x2833] = 0x4dfb, [0x2834] = 0x4dfc,
--  [0x2835] = 0x4dfd, [0x2836] = 0x4dfe, [0x2837] = 0x4dff, [0x2838] = 0xe76c,
--  [0x2839] = 0xe7c8, [0x283a] = 0xe7e7, [0x283b] = 0xe7e8, [0x283c] = 0xe7e9,
--  [0x283d] = 0xe7ea, [0x283e] = 0xe7eb, [0x283f] = 0xe7ec, [0x2840] = 0xe7ed,
--  [0x2841] = 0xe7ee, [0x2842] = 0xe7ef, [0x2843] = 0xe7f0, [0x2844] = 0xe7f1,
--  [0x2845] = 0xe7f2, [0x2846] = 0xe7f3, [0x2847] = 0xe815, [0x2848] = 0xe819,
--  [0x2849] = 0xe81a, [0x284a] = 0xe81b, [0x284b] = 0xe81c, [0x284c] = 0xe81d,
--  [0x284d] = 0xe81f, [0x284e] = 0xe820, [0x284f] = 0xe821, [0x2850] = 0xe822,
--  [0x2851] = 0xe823, [0x2852] = 0xe824, [0x2853] = 0xe825, [0x2854] = 0xe827,
--  [0x2855] = 0xe828, [0x2856] = 0xe829, [0x2857] = 0xe82a, [0x2858] = 0xe82d,
--  [0x2859] = 0xe82e, [0x285a] = 0xe82f, [0x285b] = 0xe830, [0x285c] = 0xe833,
--  [0x285d] = 0xe834, [0x285e] = 0xe835, [0x285f] = 0xe836, [0x2860] = 0xe837,
--  [0x2861] = 0xe838, [0x2862] = 0xe839, [0x2863] = 0xe83a, [0x2864] = 0xe83c,
--  [0x2865] = 0xe83d, [0x2866] = 0xe83e, [0x2867] = 0xe83f, [0x2868] = 0xe840,
--  [0x2869] = 0xe841, [0x286a] = 0xe842, [0x286b] = 0xe844, [0x286c] = 0xe845,
--  [0x286d] = 0xe846, [0x286e] = 0xe847, [0x286f] = 0xe848, [0x2870] = 0xe849,
--  [0x2871] = 0xe84a, [0x2872] = 0xe84b, [0x2873] = 0xe84c, [0x2874] = 0xe84d,
--  [0x2875] = 0xe84e, [0x2876] = 0xe84f, [0x2877] = 0xe850, [0x2878] = 0xe851,
--  [0x2879] = 0xe852, [0x287a] = 0xe853, [0x287b] = 0xe856, [0x287c] = 0xe857,
--  [0x287d] = 0xe858, [0x287e] = 0xe859, [0x287f] = 0xe85a, [0x2880] = 0xe85b,
--  [0x2881] = 0xe85c, [0x2882] = 0xe85d, [0x2883] = 0xe85e, [0x2884] = 0xe85f,
--  [0x2885] = 0xe860, [0x2886] = 0xe861, [0x2887] = 0xe862, [0x2888] = 0xe863,
--  [0x2889] = 0xf92d, [0x288a] = 0xf92e, [0x288b] = 0xf92f, [0x288c] = 0xf930,
--  [0x288d] = 0xf931, [0x288e] = 0xf932, [0x288f] = 0xf933, [0x2890] = 0xf934,
--  [0x2891] = 0xf935, [0x2892] = 0xf936, [0x2893] = 0xf937, [0x2894] = 0xf938,
--  [0x2895] = 0xf939, [0x2896] = 0xf93a, [0x2897] = 0xf93b, [0x2898] = 0xf93c,
--  [0x2899] = 0xf93d, [0x289a] = 0xf93e, [0x289b] = 0xf93f, [0x289c] = 0xf940,
--  [0x289d] = 0xf941, [0x289e] = 0xf942, [0x289f] = 0xf943, [0x28a0] = 0xf944,
--  [0x28a1] = 0xf945, [0x28a2] = 0xf946, [0x28a3] = 0xf947, [0x28a4] = 0xf948,
--  [0x28a5] = 0xf949, [0x28a6] = 0xf94a, [0x28a7] = 0xf94b, [0x28a8] = 0xf94c,
--  [0x28a9] = 0xf94d, [0x28aa] = 0xf94e, [0x28ab] = 0xf94f, [0x28ac] = 0xf950,
--  [0x28ad] = 0xf951, [0x28ae] = 0xf952, [0x28af] = 0xf953, [0x28b0] = 0xf954,
--  [0x28b1] = 0xf955, [0x28b2] = 0xf956, [0x28b3] = 0xf957, [0x28b4] = 0xf958,
--  [0x28b5] = 0xf959, [0x28b6] = 0xf95a, [0x28b7] = 0xf95b, [0x28b8] = 0xf95c,
--  [0x28b9] = 0xf95d, [0x28ba] = 0xf95e, [0x28bb] = 0xf95f, [0x28bc] = 0xf960,
--  [0x28bd] = 0xf961, [0x28be] = 0xf962, [0x28bf] = 0xf963, [0x28c0] = 0xf964,
--  [0x28c1] = 0xf965, [0x28c2] = 0xf966, [0x28c3] = 0xf967, [0x28c4] = 0xf968,
--  [0x28c5] = 0xf969, [0x28c6] = 0xf96a, [0x28c7] = 0xf96b, [0x28c8] = 0xf96c,
--  [0x28c9] = 0xf96d, [0x28ca] = 0xf96e, [0x28cb] = 0xf96f, [0x28cc] = 0xf970,
--  [0x28cd] = 0xf971, [0x28ce] = 0xf972, [0x28cf] = 0xf973, [0x28d0] = 0xf974,
--  [0x28d1] = 0xf975, [0x28d2] = 0xf976, [0x28d3] = 0xf977, [0x28d4] = 0xf978,
--  [0x28d5] = 0xf97a, [0x28d6] = 0xf97b, [0x28d7] = 0xf97c, [0x28d8] = 0xf97d,
--  [0x28d9] = 0xf97e, [0x28da] = 0xf97f, [0x28db] = 0xf980, [0x28dc] = 0xf981,
--  [0x28dd] = 0xf982, [0x28de] = 0xf983, [0x28df] = 0xf984, [0x28e0] = 0xf985,
--  [0x28e1] = 0xf986, [0x28e2] = 0xf987, [0x28e3] = 0xf988, [0x28e4] = 0xf989,
--  [0x28e5] = 0xf98a, [0x28e6] = 0xf98b, [0x28e7] = 0xf98c, [0x28e8] = 0xf98d,
--  [0x28e9] = 0xf98e, [0x28ea] = 0xf98f, [0x28eb] = 0xf990, [0x28ec] = 0xf991,
--  [0x28ed] = 0xf992, [0x28ee] = 0xf993, [0x28ef] = 0xf994, [0x28f0] = 0xf996,
--  [0x28f1] = 0xf997, [0x28f2] = 0xf998, [0x28f3] = 0xf999, [0x28f4] = 0xf99a,
--  [0x28f5] = 0xf99b, [0x28f6] = 0xf99c, [0x28f7] = 0xf99d, [0x28f8] = 0xf99e,
--  [0x28f9] = 0xf99f, [0x28fa] = 0xf9a0, [0x28fb] = 0xf9a1, [0x28fc] = 0xf9a2,
--  [0x28fd] = 0xf9a3, [0x28fe] = 0xf9a4, [0x28ff] = 0xf9a5, [0x2900] = 0xf9a6,
--  [0x2901] = 0xf9a7, [0x2902] = 0xf9a8, [0x2903] = 0xf9a9, [0x2904] = 0xf9aa,
--  [0x2905] = 0xf9ab, [0x2906] = 0xf9ac, [0x2907] = 0xf9ad, [0x2908] = 0xf9ae,
--  [0x2909] = 0xf9af, [0x290a] = 0xf9b0, [0x290b] = 0xf9b1, [0x290c] = 0xf9b2,
--  [0x290d] = 0xf9b3, [0x290e] = 0xf9b4, [0x290f] = 0xf9b5, [0x2910] = 0xf9b6,
--  [0x2911] = 0xf9b7, [0x2912] = 0xf9b8, [0x2913] = 0xf9b9, [0x2914] = 0xf9ba,
--  [0x2915] = 0xf9bb, [0x2916] = 0xf9bc, [0x2917] = 0xf9bd, [0x2918] = 0xf9be,
--  [0x2919] = 0xf9bf, [0x291a] = 0xf9c0, [0x291b] = 0xf9c1, [0x291c] = 0xf9c2,
--  [0x291d] = 0xf9c3, [0x291e] = 0xf9c4, [0x291f] = 0xf9c5, [0x2920] = 0xf9c6,
--  [0x2921] = 0xf9c7, [0x2922] = 0xf9c8, [0x2923] = 0xf9c9, [0x2924] = 0xf9ca,
--  [0x2925] = 0xf9cb, [0x2926] = 0xf9cc, [0x2927] = 0xf9cd, [0x2928] = 0xf9ce,
--  [0x2929] = 0xf9cf, [0x292a] = 0xf9d0, [0x292b] = 0xf9d1, [0x292c] = 0xf9d2,
--  [0x292d] = 0xf9d3, [0x292e] = 0xf9d4, [0x292f] = 0xf9d5, [0x2930] = 0xf9d6,
--  [0x2931] = 0xf9d7, [0x2932] = 0xf9d8, [0x2933] = 0xf9d9, [0x2934] = 0xf9da,
--  [0x2935] = 0xf9db, [0x2936] = 0xf9dc, [0x2937] = 0xf9dd, [0x2938] = 0xf9de,
--  [0x2939] = 0xf9df, [0x293a] = 0xf9e0, [0x293b] = 0xf9e1, [0x293c] = 0xf9e2,
--  [0x293d] = 0xf9e3, [0x293e] = 0xf9e4, [0x293f] = 0xf9e5, [0x2940] = 0xf9e6,
--  [0x2941] = 0xf9e8, [0x2942] = 0xf9e9, [0x2943] = 0xf9ea, [0x2944] = 0xf9eb,
--  [0x2945] = 0xf9ec, [0x2946] = 0xf9ed, [0x2947] = 0xf9ee, [0x2948] = 0xf9ef,
--  [0x2949] = 0xf9f0, [0x294a] = 0xf9f2, [0x294b] = 0xf9f3, [0x294c] = 0xf9f4,
--  [0x294d] = 0xf9f5, [0x294e] = 0xf9f6, [0x294f] = 0xf9f7, [0x2950] = 0xf9f8,
--  [0x2951] = 0xf9f9, [0x2952] = 0xf9fa, [0x2953] = 0xf9fb, [0x2954] = 0xf9fc,
--  [0x2955] = 0xf9fd, [0x2956] = 0xf9fe, [0x2957] = 0xf9ff, [0x2958] = 0xfa00,
--  [0x2959] = 0xfa01, [0x295a] = 0xfa02, [0x295b] = 0xfa03, [0x295c] = 0xfa04,
--  [0x295d] = 0xfa05, [0x295e] = 0xfa06, [0x295f] = 0xfa07, [0x2960] = 0xfa08,
--  [0x2961] = 0xfa09, [0x2962] = 0xfa0a, [0x2963] = 0xfa0b, [0x2964] = 0xfa10,
--  [0x2965] = 0xfa12, [0x2966] = 0xfa15, [0x2967] = 0xfa16, [0x2968] = 0xfa17,
--  [0x2969] = 0xfa19, [0x296a] = 0xfa1a, [0x296b] = 0xfa1b, [0x296c] = 0xfa1c,
--  [0x296d] = 0xfa1d, [0x296e] = 0xfa1e, [0x296f] = 0xfa22, [0x2970] = 0xfa25,
--  [0x2971] = 0xfa26, [0x2d78] = 0xfe32, [0x2d79] = 0xfe45, [0x2d7a] = 0xfe46,
--  [0x2d7b] = 0xfe47, [0x2d7c] = 0xfe48, [0x2d7e] = 0xfe58, [0x2d84] = 0xfe70,
--  [0x2d85] = 0xfe71, [0x2d86] = 0xfe72, [0x2d87] = 0xfe73, [0x2d88] = 0xfe74,
--  [0x2d8a] = 0xfe76, [0x2d8b] = 0xfe77, [0x2d8c] = 0xfe78, [0x2d8d] = 0xfe79,
--  [0x2d8e] = 0xfe7a, [0x2d8f] = 0xfe7b, [0x2d90] = 0xfe7c, [0x2d91] = 0xfe7d,
--  [0x2d92] = 0xfe7e, [0x2d93] = 0xfe7f, [0x2d94] = 0xfe80, [0x2d95] = 0xfe81,
--  [0x2d96] = 0xfe82, [0x2d97] = 0xfe83, [0x2d98] = 0xfe84, [0x2d99] = 0xfe85,
--  [0x2d9a] = 0xfe86, [0x2d9b] = 0xfe87, [0x2d9c] = 0xfe88, [0x2d9d] = 0xfe89,
--  [0x2d9e] = 0xfe8a, [0x2d9f] = 0xfe8b, [0x2da0] = 0xfe8c, [0x2da1] = 0xfe8d,
--  [0x2da2] = 0xfe8e, [0x2da3] = 0xfe8f, [0x2da4] = 0xfe90, [0x2da5] = 0xfe91,
--  [0x2da6] = 0xfe92, [0x2da7] = 0xfe93, [0x2da8] = 0xfe94, [0x2da9] = 0xfe95,
--  [0x2daa] = 0xfe96, [0x2dab] = 0xfe97, [0x2dac] = 0xfe98, [0x2dad] = 0xfe99,
--  [0x2dae] = 0xfe9a, [0x2daf] = 0xfe9b, [0x2db0] = 0xfe9c, [0x2db1] = 0xfe9d,
--  [0x2db2] = 0xfe9e, [0x2db3] = 0xfe9f, [0x2db4] = 0xfea0, [0x2db5] = 0xfea1,
--  [0x2db6] = 0xfea2, [0x2db7] = 0xfea3, [0x2db8] = 0xfea4, [0x2db9] = 0xfea5,
--  [0x2dba] = 0xfea6, [0x2dbb] = 0xfea7, [0x2dbc] = 0xfea8, [0x2dbd] = 0xfea9,
--  [0x2dbe] = 0xfeaa, [0x2dbf] = 0xfeab, [0x2dc0] = 0xfeac, [0x2dc1] = 0xfead,
--  [0x2dc2] = 0xfeae, [0x2dc3] = 0xfeaf, [0x2dc4] = 0xfeb0, [0x2dc5] = 0xfeb1,
--  [0x2dc6] = 0xfeb2, [0x2dc7] = 0xfeb3, [0x2dc8] = 0xfeb4, [0x2dc9] = 0xfeb5,
--  [0x2dca] = 0xfeb6, [0x2dcb] = 0xfeb7, [0x2dcc] = 0xfeb8, [0x2dcd] = 0xfeb9,
--  [0x2dce] = 0xfeba, [0x2dcf] = 0xfebb, [0x2dd0] = 0xfebc, [0x2dd1] = 0xfebd,
--  [0x2dd2] = 0xfebe, [0x2dd3] = 0xfebf, [0x2dd4] = 0xfec0, [0x2dd5] = 0xfec1,
--  [0x2dd6] = 0xfec2, [0x2dd7] = 0xfec3, [0x2dd8] = 0xfec4, [0x2dd9] = 0xfec5,
--  [0x2dda] = 0xfec6, [0x2ddb] = 0xfec7, [0x2ddc] = 0xfec8, [0x2ddd] = 0xfec9,
--  [0x2dde] = 0xfeca, [0x2ddf] = 0xfecb, [0x2de0] = 0xfecc, [0x2de1] = 0xfecd,
--  [0x2de2] = 0xfece, [0x2de3] = 0xfecf, [0x2de4] = 0xfed0, [0x2de5] = 0xfed1,
--  [0x2de6] = 0xfed2, [0x2de7] = 0xfed3, [0x2de8] = 0xfed4, [0x2de9] = 0xfed5,
--  [0x2dea] = 0xfed6, [0x2deb] = 0xfed7, [0x2dec] = 0xfed8, [0x2ded] = 0xfed9,
--  [0x2dee] = 0xfeda, [0x2def] = 0xfedb, [0x2df0] = 0xfedc, [0x2df1] = 0xfedd,
--  [0x2df2] = 0xfede, [0x2df3] = 0xfedf, [0x2df4] = 0xfee0, [0x2df5] = 0xfee1,
--  [0x2df6] = 0xfee2, [0x2df7] = 0xfee3, [0x2df8] = 0xfee4, [0x2df9] = 0xfee5,
--  [0x2dfa] = 0xfee6, [0x2dfb] = 0xfee7, [0x2dfc] = 0xfee8, [0x2dfd] = 0xfee9,
--  [0x2dfe] = 0xfeea, [0x2dff] = 0xfeeb, [0x2e00] = 0xfeec, [0x2e01] = 0xfeed,
--  [0x2e02] = 0xfeee, [0x2e03] = 0xfeef, [0x2e04] = 0xfef0, [0x2e05] = 0xfef1,
--  [0x2e06] = 0xfef2, [0x2e07] = 0xfef3, [0x2e08] = 0xfef4, [0x2e09] = 0xfef5,
--  [0x2e0a] = 0xfef6, [0x2e0b] = 0xfef7, [0x2e0c] = 0xfef8, [0x2e0d] = 0xfef9,
--  [0x2e0e] = 0xfefa, [0x2e0f] = 0xfefb, [0x2e10] = 0xfefc, [0x2e13] = 0xfeff,
--  [0x2e15] = 0xff5f, [0x2e16] = 0xff60, [0x2e17] = 0xff61, [0x2e18] = 0xff62,
--  [0x2e19] = 0xff63, [0x2e1a] = 0xff64, [0x2e1b] = 0xff65, [0x2e1c] = 0xff66,
--  [0x2e1d] = 0xff67, [0x2e1e] = 0xff68, [0x2e1f] = 0xff69, [0x2e20] = 0xff6a,
--  [0x2e21] = 0xff6b, [0x2e22] = 0xff6c, [0x2e23] = 0xff6d, [0x2e24] = 0xff6e,
--  [0x2e25] = 0xff6f, [0x2e26] = 0xff70, [0x2e27] = 0xff71, [0x2e28] = 0xff72,
--  [0x2e29] = 0xff73, [0x2e2a] = 0xff74, [0x2e2b] = 0xff75, [0x2e2c] = 0xff76,
--  [0x2e2d] = 0xff77, [0x2e2e] = 0xff78, [0x2e2f] = 0xff79, [0x2e30] = 0xff7a,
--  [0x2e31] = 0xff7b, [0x2e32] = 0xff7c, [0x2e33] = 0xff7d, [0x2e34] = 0xff7e,
--  [0x2e35] = 0xff7f, [0x2e36] = 0xff80, [0x2e37] = 0xff81, [0x2e38] = 0xff82,
--  [0x2e39] = 0xff83, [0x2e3a] = 0xff84, [0x2e3b] = 0xff85, [0x2e3c] = 0xff86,
--  [0x2e3d] = 0xff87, [0x2e3e] = 0xff88, [0x2e3f] = 0xff89, [0x2e40] = 0xff8a,
--  [0x2e41] = 0xff8b, [0x2e42] = 0xff8c, [0x2e43] = 0xff8d, [0x2e44] = 0xff8e,
--  [0x2e45] = 0xff8f, [0x2e46] = 0xff90, [0x2e47] = 0xff91, [0x2e48] = 0xff92,
--  [0x2e49] = 0xff93, [0x2e4a] = 0xff94, [0x2e4b] = 0xff95, [0x2e4c] = 0xff96,
--  [0x2e4d] = 0xff97, [0x2e4e] = 0xff98, [0x2e4f] = 0xff99, [0x2e50] = 0xff9a,
--  [0x2e51] = 0xff9b, [0x2e52] = 0xff9c, [0x2e53] = 0xff9d, [0x2e54] = 0xff9e,
--  [0x2e55] = 0xff9f, [0x2e56] = 0xffa0, [0x2e57] = 0xffa1, [0x2e58] = 0xffa2,
--  [0x2e59] = 0xffa3, [0x2e5a] = 0xffa4, [0x2e5b] = 0xffa5, [0x2e5c] = 0xffa6,
--  [0x2e5d] = 0xffa7, [0x2e5e] = 0xffa8, [0x2e5f] = 0xffa9, [0x2e60] = 0xffaa,
--  [0x2e61] = 0xffab, [0x2e62] = 0xffac, [0x2e63] = 0xffad, [0x2e64] = 0xffae,
--  [0x2e65] = 0xffaf, [0x2e66] = 0xffb0, [0x2e67] = 0xffb1, [0x2e68] = 0xffb2,
--  [0x2e69] = 0xffb3, [0x2e6a] = 0xffb4, [0x2e6b] = 0xffb5, [0x2e6c] = 0xffb6,
--  [0x2e6d] = 0xffb7, [0x2e6e] = 0xffb8, [0x2e6f] = 0xffb9, [0x2e70] = 0xffba,
--  [0x2e71] = 0xffbb, [0x2e72] = 0xffbc, [0x2e73] = 0xffbd, [0x2e74] = 0xffbe,
--  [0x2e78] = 0xffc2, [0x2e79] = 0xffc3, [0x2e7a] = 0xffc4, [0x2e7b] = 0xffc5,
--  [0x2e7c] = 0xffc6, [0x2e7d] = 0xffc7, [0x2e80] = 0xffca, [0x2e81] = 0xffcb,
--  [0x2e82] = 0xffcc, [0x2e83] = 0xffcd, [0x2e84] = 0xffce, [0x2e85] = 0xffcf,
--  [0x2e88] = 0xffd2, [0x2e89] = 0xffd3, [0x2e8a] = 0xffd4, [0x2e8b] = 0xffd5,
--  [0x2e8c] = 0xffd6, [0x2e8d] = 0xffd7, [0x2e90] = 0xffda, [0x2e91] = 0xffdb,
--  [0x2e92] = 0xffdc,
-+  [0x23fc] = 0x49b4, [0x23fd] = 0x49b5, [0x23fe] = 0x49b8, [0x23ff] = 0x49b9,
-+  [0x2400] = 0x49ba, [0x2401] = 0x49bb, [0x2402] = 0x49bc, [0x2403] = 0x49bd,
-+  [0x2404] = 0x49be, [0x2405] = 0x49bf, [0x2406] = 0x49c0, [0x2407] = 0x49c1,
-+  [0x2408] = 0x49c2, [0x2409] = 0x49c3, [0x240a] = 0x49c4, [0x240b] = 0x49c5,
-+  [0x240c] = 0x49c6, [0x240d] = 0x49c7, [0x240e] = 0x49c8, [0x240f] = 0x49c9,
-+  [0x2410] = 0x49ca, [0x2411] = 0x49cb, [0x2412] = 0x49cc, [0x2413] = 0x49cd,
-+  [0x2414] = 0x49ce, [0x2415] = 0x49cf, [0x2416] = 0x49d0, [0x2417] = 0x49d1,
-+  [0x2418] = 0x49d2, [0x2419] = 0x49d3, [0x241a] = 0x49d4, [0x241b] = 0x49d5,
-+  [0x241c] = 0x49d6, [0x241d] = 0x49d7, [0x241e] = 0x49d8, [0x241f] = 0x49d9,
-+  [0x2420] = 0x49da, [0x2421] = 0x49db, [0x2422] = 0x49dc, [0x2423] = 0x49dd,
-+  [0x2424] = 0x49de, [0x2425] = 0x49df, [0x2426] = 0x49e0, [0x2427] = 0x49e1,
-+  [0x2428] = 0x49e2, [0x2429] = 0x49e3, [0x242a] = 0x49e4, [0x242b] = 0x49e5,
-+  [0x242c] = 0x49e6, [0x242d] = 0x49e7, [0x242e] = 0x49e8, [0x242f] = 0x49e9,
-+  [0x2430] = 0x49ea, [0x2431] = 0x49eb, [0x2432] = 0x49ec, [0x2433] = 0x49ed,
-+  [0x2434] = 0x49ee, [0x2435] = 0x49ef, [0x2436] = 0x49f0, [0x2437] = 0x49f1,
-+  [0x2438] = 0x49f2, [0x2439] = 0x49f3, [0x243a] = 0x49f4, [0x243b] = 0x49f5,
-+  [0x243c] = 0x49f6, [0x243d] = 0x49f7, [0x243e] = 0x49f8, [0x243f] = 0x49f9,
-+  [0x2440] = 0x49fa, [0x2441] = 0x49fb, [0x2442] = 0x49fc, [0x2443] = 0x49fd,
-+  [0x2444] = 0x49fe, [0x2445] = 0x49ff, [0x2446] = 0x4a00, [0x2447] = 0x4a01,
-+  [0x2448] = 0x4a02, [0x2449] = 0x4a03, [0x244a] = 0x4a04, [0x244b] = 0x4a05,
-+  [0x244c] = 0x4a06, [0x244d] = 0x4a07, [0x244e] = 0x4a08, [0x244f] = 0x4a09,
-+  [0x2450] = 0x4a0a, [0x2451] = 0x4a0b, [0x2452] = 0x4a0c, [0x2453] = 0x4a0d,
-+  [0x2454] = 0x4a0e, [0x2455] = 0x4a0f, [0x2456] = 0x4a10, [0x2457] = 0x4a11,
-+  [0x2458] = 0x4a12, [0x2459] = 0x4a13, [0x245a] = 0x4a14, [0x245b] = 0x4a15,
-+  [0x245c] = 0x4a16, [0x245d] = 0x4a17, [0x245e] = 0x4a18, [0x245f] = 0x4a19,
-+  [0x2460] = 0x4a1a, [0x2461] = 0x4a1b, [0x2462] = 0x4a1c, [0x2463] = 0x4a1d,
-+  [0x2464] = 0x4a1e, [0x2465] = 0x4a1f, [0x2466] = 0x4a20, [0x2467] = 0x4a21,
-+  [0x2468] = 0x4a22, [0x2469] = 0x4a23, [0x246a] = 0x4a24, [0x246b] = 0x4a25,
-+  [0x246c] = 0x4a26, [0x246d] = 0x4a27, [0x246e] = 0x4a28, [0x246f] = 0x4a29,
-+  [0x2470] = 0x4a2a, [0x2471] = 0x4a2b, [0x2472] = 0x4a2c, [0x2473] = 0x4a2d,
-+  [0x2474] = 0x4a2e, [0x2475] = 0x4a2f, [0x2476] = 0x4a30, [0x2477] = 0x4a31,
-+  [0x2478] = 0x4a32, [0x2479] = 0x4a33, [0x247a] = 0x4a34, [0x247b] = 0x4a35,
-+  [0x247c] = 0x4a36, [0x247d] = 0x4a37, [0x247e] = 0x4a38, [0x247f] = 0x4a39,
-+  [0x2480] = 0x4a3a, [0x2481] = 0x4a3b, [0x2482] = 0x4a3c, [0x2483] = 0x4a3d,
-+  [0x2484] = 0x4a3e, [0x2485] = 0x4a3f, [0x2486] = 0x4a40, [0x2487] = 0x4a41,
-+  [0x2488] = 0x4a42, [0x2489] = 0x4a43, [0x248a] = 0x4a44, [0x248b] = 0x4a45,
-+  [0x248c] = 0x4a46, [0x248d] = 0x4a47, [0x248e] = 0x4a48, [0x248f] = 0x4a49,
-+  [0x2490] = 0x4a4a, [0x2491] = 0x4a4b, [0x2492] = 0x4a4c, [0x2493] = 0x4a4d,
-+  [0x2494] = 0x4a4e, [0x2495] = 0x4a4f, [0x2496] = 0x4a50, [0x2497] = 0x4a51,
-+  [0x2498] = 0x4a52, [0x2499] = 0x4a53, [0x249a] = 0x4a54, [0x249b] = 0x4a55,
-+  [0x249c] = 0x4a56, [0x249d] = 0x4a57, [0x249e] = 0x4a58, [0x249f] = 0x4a59,
-+  [0x24a0] = 0x4a5a, [0x24a1] = 0x4a5b, [0x24a2] = 0x4a5c, [0x24a3] = 0x4a5d,
-+  [0x24a4] = 0x4a5e, [0x24a5] = 0x4a5f, [0x24a6] = 0x4a60, [0x24a7] = 0x4a61,
-+  [0x24a8] = 0x4a62, [0x24a9] = 0x4a63, [0x24aa] = 0x4a64, [0x24ab] = 0x4a65,
-+  [0x24ac] = 0x4a66, [0x24ad] = 0x4a67, [0x24ae] = 0x4a68, [0x24af] = 0x4a69,
-+  [0x24b0] = 0x4a6a, [0x24b1] = 0x4a6b, [0x24b2] = 0x4a6c, [0x24b3] = 0x4a6d,
-+  [0x24b4] = 0x4a6e, [0x24b5] = 0x4a6f, [0x24b6] = 0x4a70, [0x24b7] = 0x4a71,
-+  [0x24b8] = 0x4a72, [0x24b9] = 0x4a73, [0x24ba] = 0x4a74, [0x24bb] = 0x4a75,
-+  [0x24bc] = 0x4a76, [0x24bd] = 0x4a77, [0x24be] = 0x4a78, [0x24bf] = 0x4a79,
-+  [0x24c0] = 0x4a7a, [0x24c1] = 0x4a7b, [0x24c2] = 0x4a7c, [0x24c3] = 0x4a7d,
-+  [0x24c4] = 0x4a7e, [0x24c5] = 0x4a7f, [0x24c6] = 0x4a80, [0x24c7] = 0x4a81,
-+  [0x24c8] = 0x4a82, [0x24c9] = 0x4a83, [0x24ca] = 0x4a84, [0x24cb] = 0x4a85,
-+  [0x24cc] = 0x4a86, [0x24cd] = 0x4a87, [0x24ce] = 0x4a88, [0x24cf] = 0x4a89,
-+  [0x24d0] = 0x4a8a, [0x24d1] = 0x4a8b, [0x24d2] = 0x4a8c, [0x24d3] = 0x4a8d,
-+  [0x24d4] = 0x4a8e, [0x24d5] = 0x4a8f, [0x24d6] = 0x4a90, [0x24d7] = 0x4a91,
-+  [0x24d8] = 0x4a92, [0x24d9] = 0x4a93, [0x24da] = 0x4a94, [0x24db] = 0x4a95,
-+  [0x24dc] = 0x4a96, [0x24dd] = 0x4a97, [0x24de] = 0x4a98, [0x24df] = 0x4a99,
-+  [0x24e0] = 0x4a9a, [0x24e1] = 0x4a9b, [0x24e2] = 0x4a9c, [0x24e3] = 0x4a9d,
-+  [0x24e4] = 0x4a9e, [0x24e5] = 0x4a9f, [0x24e6] = 0x4aa0, [0x24e7] = 0x4aa1,
-+  [0x24e8] = 0x4aa2, [0x24e9] = 0x4aa3, [0x24ea] = 0x4aa4, [0x24eb] = 0x4aa5,
-+  [0x24ec] = 0x4aa6, [0x24ed] = 0x4aa7, [0x24ee] = 0x4aa8, [0x24ef] = 0x4aa9,
-+  [0x24f0] = 0x4aaa, [0x24f1] = 0x4aab, [0x24f2] = 0x4aac, [0x24f3] = 0x4aad,
-+  [0x24f4] = 0x4aae, [0x24f5] = 0x4aaf, [0x24f6] = 0x4ab0, [0x24f7] = 0x4ab1,
-+  [0x24f8] = 0x4ab2, [0x24f9] = 0x4ab3, [0x24fa] = 0x4ab4, [0x24fb] = 0x4ab5,
-+  [0x24fc] = 0x4ab6, [0x24fd] = 0x4ab7, [0x24fe] = 0x4ab8, [0x24ff] = 0x4ab9,
-+  [0x2500] = 0x4aba, [0x2501] = 0x4abb, [0x2502] = 0x4abc, [0x2503] = 0x4abd,
-+  [0x2504] = 0x4abe, [0x2505] = 0x4abf, [0x2506] = 0x4ac0, [0x2507] = 0x4ac1,
-+  [0x2508] = 0x4ac2, [0x2509] = 0x4ac3, [0x250a] = 0x4ac4, [0x250b] = 0x4ac5,
-+  [0x250c] = 0x4ac6, [0x250d] = 0x4ac7, [0x250e] = 0x4ac8, [0x250f] = 0x4ac9,
-+  [0x2510] = 0x4aca, [0x2511] = 0x4acb, [0x2512] = 0x4acc, [0x2513] = 0x4acd,
-+  [0x2514] = 0x4ace, [0x2515] = 0x4acf, [0x2516] = 0x4ad0, [0x2517] = 0x4ad1,
-+  [0x2518] = 0x4ad2, [0x2519] = 0x4ad3, [0x251a] = 0x4ad4, [0x251b] = 0x4ad5,
-+  [0x251c] = 0x4ad6, [0x251d] = 0x4ad7, [0x251e] = 0x4ad8, [0x251f] = 0x4ad9,
-+  [0x2520] = 0x4ada, [0x2521] = 0x4adb, [0x2522] = 0x4adc, [0x2523] = 0x4add,
-+  [0x2524] = 0x4ade, [0x2525] = 0x4adf, [0x2526] = 0x4ae0, [0x2527] = 0x4ae1,
-+  [0x2528] = 0x4ae2, [0x2529] = 0x4ae3, [0x252a] = 0x4ae4, [0x252b] = 0x4ae5,
-+  [0x252c] = 0x4ae6, [0x252d] = 0x4ae7, [0x252e] = 0x4ae8, [0x252f] = 0x4ae9,
-+  [0x2530] = 0x4aea, [0x2531] = 0x4aeb, [0x2532] = 0x4aec, [0x2533] = 0x4aed,
-+  [0x2534] = 0x4aee, [0x2535] = 0x4aef, [0x2536] = 0x4af0, [0x2537] = 0x4af1,
-+  [0x2538] = 0x4af2, [0x2539] = 0x4af3, [0x253a] = 0x4af4, [0x253b] = 0x4af5,
-+  [0x253c] = 0x4af6, [0x253d] = 0x4af7, [0x253e] = 0x4af8, [0x253f] = 0x4af9,
-+  [0x2540] = 0x4afa, [0x2541] = 0x4afb, [0x2542] = 0x4afc, [0x2543] = 0x4afd,
-+  [0x2544] = 0x4afe, [0x2545] = 0x4aff, [0x2546] = 0x4b00, [0x2547] = 0x4b01,
-+  [0x2548] = 0x4b02, [0x2549] = 0x4b03, [0x254a] = 0x4b04, [0x254b] = 0x4b05,
-+  [0x254c] = 0x4b06, [0x254d] = 0x4b07, [0x254e] = 0x4b08, [0x254f] = 0x4b09,
-+  [0x2550] = 0x4b0a, [0x2551] = 0x4b0b, [0x2552] = 0x4b0c, [0x2553] = 0x4b0d,
-+  [0x2554] = 0x4b0e, [0x2555] = 0x4b0f, [0x2556] = 0x4b10, [0x2557] = 0x4b11,
-+  [0x2558] = 0x4b12, [0x2559] = 0x4b13, [0x255a] = 0x4b14, [0x255b] = 0x4b15,
-+  [0x255c] = 0x4b16, [0x255d] = 0x4b17, [0x255e] = 0x4b18, [0x255f] = 0x4b19,
-+  [0x2560] = 0x4b1a, [0x2561] = 0x4b1b, [0x2562] = 0x4b1c, [0x2563] = 0x4b1d,
-+  [0x2564] = 0x4b1e, [0x2565] = 0x4b1f, [0x2566] = 0x4b20, [0x2567] = 0x4b21,
-+  [0x2568] = 0x4b22, [0x2569] = 0x4b23, [0x256a] = 0x4b24, [0x256b] = 0x4b25,
-+  [0x256c] = 0x4b26, [0x256d] = 0x4b27, [0x256e] = 0x4b28, [0x256f] = 0x4b29,
-+  [0x2570] = 0x4b2a, [0x2571] = 0x4b2b, [0x2572] = 0x4b2c, [0x2573] = 0x4b2d,
-+  [0x2574] = 0x4b2e, [0x2575] = 0x4b2f, [0x2576] = 0x4b30, [0x2577] = 0x4b31,
-+  [0x2578] = 0x4b32, [0x2579] = 0x4b33, [0x257a] = 0x4b34, [0x257b] = 0x4b35,
-+  [0x257c] = 0x4b36, [0x257d] = 0x4b37, [0x257e] = 0x4b38, [0x257f] = 0x4b39,
-+  [0x2580] = 0x4b3a, [0x2581] = 0x4b3b, [0x2582] = 0x4b3c, [0x2583] = 0x4b3d,
-+  [0x2584] = 0x4b3e, [0x2585] = 0x4b3f, [0x2586] = 0x4b40, [0x2587] = 0x4b41,
-+  [0x2588] = 0x4b42, [0x2589] = 0x4b43, [0x258a] = 0x4b44, [0x258b] = 0x4b45,
-+  [0x258c] = 0x4b46, [0x258d] = 0x4b47, [0x258e] = 0x4b48, [0x258f] = 0x4b49,
-+  [0x2590] = 0x4b4a, [0x2591] = 0x4b4b, [0x2592] = 0x4b4c, [0x2593] = 0x4b4d,
-+  [0x2594] = 0x4b4e, [0x2595] = 0x4b4f, [0x2596] = 0x4b50, [0x2597] = 0x4b51,
-+  [0x2598] = 0x4b52, [0x2599] = 0x4b53, [0x259a] = 0x4b54, [0x259b] = 0x4b55,
-+  [0x259c] = 0x4b56, [0x259d] = 0x4b57, [0x259e] = 0x4b58, [0x259f] = 0x4b59,
-+  [0x25a0] = 0x4b5a, [0x25a1] = 0x4b5b, [0x25a2] = 0x4b5c, [0x25a3] = 0x4b5d,
-+  [0x25a4] = 0x4b5e, [0x25a5] = 0x4b5f, [0x25a6] = 0x4b60, [0x25a7] = 0x4b61,
-+  [0x25a8] = 0x4b62, [0x25a9] = 0x4b63, [0x25aa] = 0x4b64, [0x25ab] = 0x4b65,
-+  [0x25ac] = 0x4b66, [0x25ad] = 0x4b67, [0x25ae] = 0x4b68, [0x25af] = 0x4b69,
-+  [0x25b0] = 0x4b6a, [0x25b1] = 0x4b6b, [0x25b2] = 0x4b6c, [0x25b3] = 0x4b6d,
-+  [0x25b4] = 0x4b6e, [0x25b5] = 0x4b6f, [0x25b6] = 0x4b70, [0x25b7] = 0x4b71,
-+  [0x25b8] = 0x4b72, [0x25b9] = 0x4b73, [0x25ba] = 0x4b74, [0x25bb] = 0x4b75,
-+  [0x25bc] = 0x4b76, [0x25bd] = 0x4b77, [0x25be] = 0x4b78, [0x25bf] = 0x4b79,
-+  [0x25c0] = 0x4b7a, [0x25c1] = 0x4b7b, [0x25c2] = 0x4b7c, [0x25c3] = 0x4b7d,
-+  [0x25c4] = 0x4b7e, [0x25c5] = 0x4b7f, [0x25c6] = 0x4b80, [0x25c7] = 0x4b81,
-+  [0x25c8] = 0x4b82, [0x25c9] = 0x4b83, [0x25ca] = 0x4b84, [0x25cb] = 0x4b85,
-+  [0x25cc] = 0x4b86, [0x25cd] = 0x4b87, [0x25ce] = 0x4b88, [0x25cf] = 0x4b89,
-+  [0x25d0] = 0x4b8a, [0x25d1] = 0x4b8b, [0x25d2] = 0x4b8c, [0x25d3] = 0x4b8d,
-+  [0x25d4] = 0x4b8e, [0x25d5] = 0x4b8f, [0x25d6] = 0x4b90, [0x25d7] = 0x4b91,
-+  [0x25d8] = 0x4b92, [0x25d9] = 0x4b93, [0x25da] = 0x4b94, [0x25db] = 0x4b95,
-+  [0x25dc] = 0x4b96, [0x25dd] = 0x4b97, [0x25de] = 0x4b98, [0x25df] = 0x4b99,
-+  [0x25e0] = 0x4b9a, [0x25e1] = 0x4b9b, [0x25e2] = 0x4b9c, [0x25e3] = 0x4b9d,
-+  [0x25e4] = 0x4b9e, [0x25e5] = 0x4b9f, [0x25e6] = 0x4ba0, [0x25e7] = 0x4ba1,
-+  [0x25e8] = 0x4ba2, [0x25e9] = 0x4ba3, [0x25ea] = 0x4ba4, [0x25eb] = 0x4ba5,
-+  [0x25ec] = 0x4ba6, [0x25ed] = 0x4ba7, [0x25ee] = 0x4ba8, [0x25ef] = 0x4ba9,
-+  [0x25f0] = 0x4baa, [0x25f1] = 0x4bab, [0x25f2] = 0x4bac, [0x25f3] = 0x4bad,
-+  [0x25f4] = 0x4bae, [0x25f5] = 0x4baf, [0x25f6] = 0x4bb0, [0x25f7] = 0x4bb1,
-+  [0x25f8] = 0x4bb2, [0x25f9] = 0x4bb3, [0x25fa] = 0x4bb4, [0x25fb] = 0x4bb5,
-+  [0x25fc] = 0x4bb6, [0x25fd] = 0x4bb7, [0x25fe] = 0x4bb8, [0x25ff] = 0x4bb9,
-+  [0x2600] = 0x4bba, [0x2601] = 0x4bbb, [0x2602] = 0x4bbc, [0x2603] = 0x4bbd,
-+  [0x2604] = 0x4bbe, [0x2605] = 0x4bbf, [0x2606] = 0x4bc0, [0x2607] = 0x4bc1,
-+  [0x2608] = 0x4bc2, [0x2609] = 0x4bc3, [0x260a] = 0x4bc4, [0x260b] = 0x4bc5,
-+  [0x260c] = 0x4bc6, [0x260d] = 0x4bc7, [0x260e] = 0x4bc8, [0x260f] = 0x4bc9,
-+  [0x2610] = 0x4bca, [0x2611] = 0x4bcb, [0x2612] = 0x4bcc, [0x2613] = 0x4bcd,
-+  [0x2614] = 0x4bce, [0x2615] = 0x4bcf, [0x2616] = 0x4bd0, [0x2617] = 0x4bd1,
-+  [0x2618] = 0x4bd2, [0x2619] = 0x4bd3, [0x261a] = 0x4bd4, [0x261b] = 0x4bd5,
-+  [0x261c] = 0x4bd6, [0x261d] = 0x4bd7, [0x261e] = 0x4bd8, [0x261f] = 0x4bd9,
-+  [0x2620] = 0x4bda, [0x2621] = 0x4bdb, [0x2622] = 0x4bdc, [0x2623] = 0x4bdd,
-+  [0x2624] = 0x4bde, [0x2625] = 0x4bdf, [0x2626] = 0x4be0, [0x2627] = 0x4be1,
-+  [0x2628] = 0x4be2, [0x2629] = 0x4be3, [0x262a] = 0x4be4, [0x262b] = 0x4be5,
-+  [0x262c] = 0x4be6, [0x262d] = 0x4be7, [0x262e] = 0x4be8, [0x262f] = 0x4be9,
-+  [0x2630] = 0x4bea, [0x2631] = 0x4beb, [0x2632] = 0x4bec, [0x2633] = 0x4bed,
-+  [0x2634] = 0x4bee, [0x2635] = 0x4bef, [0x2636] = 0x4bf0, [0x2637] = 0x4bf1,
-+  [0x2638] = 0x4bf2, [0x2639] = 0x4bf3, [0x263a] = 0x4bf4, [0x263b] = 0x4bf5,
-+  [0x263c] = 0x4bf6, [0x263d] = 0x4bf7, [0x263e] = 0x4bf8, [0x263f] = 0x4bf9,
-+  [0x2640] = 0x4bfa, [0x2641] = 0x4bfb, [0x2642] = 0x4bfc, [0x2643] = 0x4bfd,
-+  [0x2644] = 0x4bfe, [0x2645] = 0x4bff, [0x2646] = 0x4c00, [0x2647] = 0x4c01,
-+  [0x2648] = 0x4c02, [0x2649] = 0x4c03, [0x264a] = 0x4c04, [0x264b] = 0x4c05,
-+  [0x264c] = 0x4c06, [0x264d] = 0x4c07, [0x264e] = 0x4c08, [0x264f] = 0x4c09,
-+  [0x2650] = 0x4c0a, [0x2651] = 0x4c0b, [0x2652] = 0x4c0c, [0x2653] = 0x4c0d,
-+  [0x2654] = 0x4c0e, [0x2655] = 0x4c0f, [0x2656] = 0x4c10, [0x2657] = 0x4c11,
-+  [0x2658] = 0x4c12, [0x2659] = 0x4c13, [0x265a] = 0x4c14, [0x265b] = 0x4c15,
-+  [0x265c] = 0x4c16, [0x265d] = 0x4c17, [0x265e] = 0x4c18, [0x265f] = 0x4c19,
-+  [0x2660] = 0x4c1a, [0x2661] = 0x4c1b, [0x2662] = 0x4c1c, [0x2663] = 0x4c1d,
-+  [0x2664] = 0x4c1e, [0x2665] = 0x4c1f, [0x2666] = 0x4c20, [0x2667] = 0x4c21,
-+  [0x2668] = 0x4c22, [0x2669] = 0x4c23, [0x266a] = 0x4c24, [0x266b] = 0x4c25,
-+  [0x266c] = 0x4c26, [0x266d] = 0x4c27, [0x266e] = 0x4c28, [0x266f] = 0x4c29,
-+  [0x2670] = 0x4c2a, [0x2671] = 0x4c2b, [0x2672] = 0x4c2c, [0x2673] = 0x4c2d,
-+  [0x2674] = 0x4c2e, [0x2675] = 0x4c2f, [0x2676] = 0x4c30, [0x2677] = 0x4c31,
-+  [0x2678] = 0x4c32, [0x2679] = 0x4c33, [0x267a] = 0x4c34, [0x267b] = 0x4c35,
-+  [0x267c] = 0x4c36, [0x267d] = 0x4c37, [0x267e] = 0x4c38, [0x267f] = 0x4c39,
-+  [0x2680] = 0x4c3a, [0x2681] = 0x4c3b, [0x2682] = 0x4c3c, [0x2683] = 0x4c3d,
-+  [0x2684] = 0x4c3e, [0x2685] = 0x4c3f, [0x2686] = 0x4c40, [0x2687] = 0x4c41,
-+  [0x2688] = 0x4c42, [0x2689] = 0x4c43, [0x268a] = 0x4c44, [0x268b] = 0x4c45,
-+  [0x268c] = 0x4c46, [0x268d] = 0x4c47, [0x268e] = 0x4c48, [0x268f] = 0x4c49,
-+  [0x2690] = 0x4c4a, [0x2691] = 0x4c4b, [0x2692] = 0x4c4c, [0x2693] = 0x4c4d,
-+  [0x2694] = 0x4c4e, [0x2695] = 0x4c4f, [0x2696] = 0x4c50, [0x2697] = 0x4c51,
-+  [0x2698] = 0x4c52, [0x2699] = 0x4c53, [0x269a] = 0x4c54, [0x269b] = 0x4c55,
-+  [0x269c] = 0x4c56, [0x269d] = 0x4c57, [0x269e] = 0x4c58, [0x269f] = 0x4c59,
-+  [0x26a0] = 0x4c5a, [0x26a1] = 0x4c5b, [0x26a2] = 0x4c5c, [0x26a3] = 0x4c5d,
-+  [0x26a4] = 0x4c5e, [0x26a5] = 0x4c5f, [0x26a6] = 0x4c60, [0x26a7] = 0x4c61,
-+  [0x26a8] = 0x4c62, [0x26a9] = 0x4c63, [0x26aa] = 0x4c64, [0x26ab] = 0x4c65,
-+  [0x26ac] = 0x4c66, [0x26ad] = 0x4c67, [0x26ae] = 0x4c68, [0x26af] = 0x4c69,
-+  [0x26b0] = 0x4c6a, [0x26b1] = 0x4c6b, [0x26b2] = 0x4c6c, [0x26b3] = 0x4c6d,
-+  [0x26b4] = 0x4c6e, [0x26b5] = 0x4c6f, [0x26b6] = 0x4c70, [0x26b7] = 0x4c71,
-+  [0x26b8] = 0x4c72, [0x26b9] = 0x4c73, [0x26ba] = 0x4c74, [0x26bb] = 0x4c75,
-+  [0x26bc] = 0x4c76, [0x26bd] = 0x4c78, [0x26be] = 0x4c79, [0x26bf] = 0x4c7a,
-+  [0x26c0] = 0x4c7b, [0x26c1] = 0x4c7c, [0x26c2] = 0x4c7d, [0x26c3] = 0x4c7e,
-+  [0x26c4] = 0x4c7f, [0x26c5] = 0x4c80, [0x26c6] = 0x4c81, [0x26c7] = 0x4c82,
-+  [0x26c8] = 0x4c83, [0x26c9] = 0x4c84, [0x26ca] = 0x4c85, [0x26cb] = 0x4c86,
-+  [0x26cc] = 0x4c87, [0x26cd] = 0x4c88, [0x26ce] = 0x4c89, [0x26cf] = 0x4c8a,
-+  [0x26d0] = 0x4c8b, [0x26d1] = 0x4c8c, [0x26d2] = 0x4c8d, [0x26d3] = 0x4c8e,
-+  [0x26d4] = 0x4c8f, [0x26d5] = 0x4c90, [0x26d6] = 0x4c91, [0x26d7] = 0x4c92,
-+  [0x26d8] = 0x4c93, [0x26d9] = 0x4c94, [0x26da] = 0x4c95, [0x26db] = 0x4c96,
-+  [0x26dc] = 0x4c97, [0x26dd] = 0x4c98, [0x26de] = 0x4c99, [0x26df] = 0x4c9a,
-+  [0x26e0] = 0x4c9b, [0x26e1] = 0x4c9c, [0x26e2] = 0x4c9d, [0x26e3] = 0x4c9e,
-+  [0x26e4] = 0x4ca4, [0x26e5] = 0x4ca5, [0x26e6] = 0x4ca6, [0x26e7] = 0x4ca7,
-+  [0x26e8] = 0x4ca8, [0x26e9] = 0x4ca9, [0x26ea] = 0x4caa, [0x26eb] = 0x4cab,
-+  [0x26ec] = 0x4cac, [0x26ed] = 0x4cad, [0x26ee] = 0x4cae, [0x26ef] = 0x4caf,
-+  [0x26f0] = 0x4cb0, [0x26f1] = 0x4cb1, [0x26f2] = 0x4cb2, [0x26f3] = 0x4cb3,
-+  [0x26f4] = 0x4cb4, [0x26f5] = 0x4cb5, [0x26f6] = 0x4cb6, [0x26f7] = 0x4cb7,
-+  [0x26f8] = 0x4cb8, [0x26f9] = 0x4cb9, [0x26fa] = 0x4cba, [0x26fb] = 0x4cbb,
-+  [0x26fc] = 0x4cbc, [0x26fd] = 0x4cbd, [0x26fe] = 0x4cbe, [0x26ff] = 0x4cbf,
-+  [0x2700] = 0x4cc0, [0x2701] = 0x4cc1, [0x2702] = 0x4cc2, [0x2703] = 0x4cc3,
-+  [0x2704] = 0x4cc4, [0x2705] = 0x4cc5, [0x2706] = 0x4cc6, [0x2707] = 0x4cc7,
-+  [0x2708] = 0x4cc8, [0x2709] = 0x4cc9, [0x270a] = 0x4cca, [0x270b] = 0x4ccb,
-+  [0x270c] = 0x4ccc, [0x270d] = 0x4ccd, [0x270e] = 0x4cce, [0x270f] = 0x4ccf,
-+  [0x2710] = 0x4cd0, [0x2711] = 0x4cd1, [0x2712] = 0x4cd2, [0x2713] = 0x4cd3,
-+  [0x2714] = 0x4cd4, [0x2715] = 0x4cd5, [0x2716] = 0x4cd6, [0x2717] = 0x4cd7,
-+  [0x2718] = 0x4cd8, [0x2719] = 0x4cd9, [0x271a] = 0x4cda, [0x271b] = 0x4cdb,
-+  [0x271c] = 0x4cdc, [0x271d] = 0x4cdd, [0x271e] = 0x4cde, [0x271f] = 0x4cdf,
-+  [0x2720] = 0x4ce0, [0x2721] = 0x4ce1, [0x2722] = 0x4ce2, [0x2723] = 0x4ce3,
-+  [0x2724] = 0x4ce4, [0x2725] = 0x4ce5, [0x2726] = 0x4ce6, [0x2727] = 0x4ce7,
-+  [0x2728] = 0x4ce8, [0x2729] = 0x4ce9, [0x272a] = 0x4cea, [0x272b] = 0x4ceb,
-+  [0x272c] = 0x4cec, [0x272d] = 0x4ced, [0x272e] = 0x4cee, [0x272f] = 0x4cef,
-+  [0x2730] = 0x4cf0, [0x2731] = 0x4cf1, [0x2732] = 0x4cf2, [0x2733] = 0x4cf3,
-+  [0x2734] = 0x4cf4, [0x2735] = 0x4cf5, [0x2736] = 0x4cf6, [0x2737] = 0x4cf7,
-+  [0x2738] = 0x4cf8, [0x2739] = 0x4cf9, [0x273a] = 0x4cfa, [0x273b] = 0x4cfb,
-+  [0x273c] = 0x4cfc, [0x273d] = 0x4cfd, [0x273e] = 0x4cfe, [0x273f] = 0x4cff,
-+  [0x2740] = 0x4d00, [0x2741] = 0x4d01, [0x2742] = 0x4d02, [0x2743] = 0x4d03,
-+  [0x2744] = 0x4d04, [0x2745] = 0x4d05, [0x2746] = 0x4d06, [0x2747] = 0x4d07,
-+  [0x2748] = 0x4d08, [0x2749] = 0x4d09, [0x274a] = 0x4d0a, [0x274b] = 0x4d0b,
-+  [0x274c] = 0x4d0c, [0x274d] = 0x4d0d, [0x274e] = 0x4d0e, [0x274f] = 0x4d0f,
-+  [0x2750] = 0x4d10, [0x2751] = 0x4d11, [0x2752] = 0x4d12, [0x2753] = 0x4d1a,
-+  [0x2754] = 0x4d1b, [0x2755] = 0x4d1c, [0x2756] = 0x4d1d, [0x2757] = 0x4d1e,
-+  [0x2758] = 0x4d1f, [0x2759] = 0x4d20, [0x275a] = 0x4d21, [0x275b] = 0x4d22,
-+  [0x275c] = 0x4d23, [0x275d] = 0x4d24, [0x275e] = 0x4d25, [0x275f] = 0x4d26,
-+  [0x2760] = 0x4d27, [0x2761] = 0x4d28, [0x2762] = 0x4d29, [0x2763] = 0x4d2a,
-+  [0x2764] = 0x4d2b, [0x2765] = 0x4d2c, [0x2766] = 0x4d2d, [0x2767] = 0x4d2e,
-+  [0x2768] = 0x4d2f, [0x2769] = 0x4d30, [0x276a] = 0x4d31, [0x276b] = 0x4d32,
-+  [0x276c] = 0x4d33, [0x276d] = 0x4d34, [0x276e] = 0x4d35, [0x276f] = 0x4d36,
-+  [0x2770] = 0x4d37, [0x2771] = 0x4d38, [0x2772] = 0x4d39, [0x2773] = 0x4d3a,
-+  [0x2774] = 0x4d3b, [0x2775] = 0x4d3c, [0x2776] = 0x4d3d, [0x2777] = 0x4d3e,
-+  [0x2778] = 0x4d3f, [0x2779] = 0x4d40, [0x277a] = 0x4d41, [0x277b] = 0x4d42,
-+  [0x277c] = 0x4d43, [0x277d] = 0x4d44, [0x277e] = 0x4d45, [0x277f] = 0x4d46,
-+  [0x2780] = 0x4d47, [0x2781] = 0x4d48, [0x2782] = 0x4d49, [0x2783] = 0x4d4a,
-+  [0x2784] = 0x4d4b, [0x2785] = 0x4d4c, [0x2786] = 0x4d4d, [0x2787] = 0x4d4e,
-+  [0x2788] = 0x4d4f, [0x2789] = 0x4d50, [0x278a] = 0x4d51, [0x278b] = 0x4d52,
-+  [0x278c] = 0x4d53, [0x278d] = 0x4d54, [0x278e] = 0x4d55, [0x278f] = 0x4d56,
-+  [0x2790] = 0x4d57, [0x2791] = 0x4d58, [0x2792] = 0x4d59, [0x2793] = 0x4d5a,
-+  [0x2794] = 0x4d5b, [0x2795] = 0x4d5c, [0x2796] = 0x4d5d, [0x2797] = 0x4d5e,
-+  [0x2798] = 0x4d5f, [0x2799] = 0x4d60, [0x279a] = 0x4d61, [0x279b] = 0x4d62,
-+  [0x279c] = 0x4d63, [0x279d] = 0x4d64, [0x279e] = 0x4d65, [0x279f] = 0x4d66,
-+  [0x27a0] = 0x4d67, [0x27a1] = 0x4d68, [0x27a2] = 0x4d69, [0x27a3] = 0x4d6a,
-+  [0x27a4] = 0x4d6b, [0x27a5] = 0x4d6c, [0x27a6] = 0x4d6d, [0x27a7] = 0x4d6e,
-+  [0x27a8] = 0x4d6f, [0x27a9] = 0x4d70, [0x27aa] = 0x4d71, [0x27ab] = 0x4d72,
-+  [0x27ac] = 0x4d73, [0x27ad] = 0x4d74, [0x27ae] = 0x4d75, [0x27af] = 0x4d76,
-+  [0x27b0] = 0x4d77, [0x27b1] = 0x4d78, [0x27b2] = 0x4d79, [0x27b3] = 0x4d7a,
-+  [0x27b4] = 0x4d7b, [0x27b5] = 0x4d7c, [0x27b6] = 0x4d7d, [0x27b7] = 0x4d7e,
-+  [0x27b8] = 0x4d7f, [0x27b9] = 0x4d80, [0x27ba] = 0x4d81, [0x27bb] = 0x4d82,
-+  [0x27bc] = 0x4d83, [0x27bd] = 0x4d84, [0x27be] = 0x4d85, [0x27bf] = 0x4d86,
-+  [0x27c0] = 0x4d87, [0x27c1] = 0x4d88, [0x27c2] = 0x4d89, [0x27c3] = 0x4d8a,
-+  [0x27c4] = 0x4d8b, [0x27c5] = 0x4d8c, [0x27c6] = 0x4d8d, [0x27c7] = 0x4d8e,
-+  [0x27c8] = 0x4d8f, [0x27c9] = 0x4d90, [0x27ca] = 0x4d91, [0x27cb] = 0x4d92,
-+  [0x27cc] = 0x4d93, [0x27cd] = 0x4d94, [0x27ce] = 0x4d95, [0x27cf] = 0x4d96,
-+  [0x27d0] = 0x4d97, [0x27d1] = 0x4d98, [0x27d2] = 0x4d99, [0x27d3] = 0x4d9a,
-+  [0x27d4] = 0x4d9b, [0x27d5] = 0x4d9c, [0x27d6] = 0x4d9d, [0x27d7] = 0x4d9e,
-+  [0x27d8] = 0x4d9f, [0x27d9] = 0x4da0, [0x27da] = 0x4da1, [0x27db] = 0x4da2,
-+  [0x27dc] = 0x4da3, [0x27dd] = 0x4da4, [0x27de] = 0x4da5, [0x27df] = 0x4da6,
-+  [0x27e0] = 0x4da7, [0x27e1] = 0x4da8, [0x27e2] = 0x4da9, [0x27e3] = 0x4daa,
-+  [0x27e4] = 0x4dab, [0x27e5] = 0x4dac, [0x27e6] = 0x4dad, [0x27e7] = 0x4daf,
-+  [0x27e8] = 0x4db0, [0x27e9] = 0x4db1, [0x27ea] = 0x4db2, [0x27eb] = 0x4db3,
-+  [0x27ec] = 0x4db4, [0x27ed] = 0x4db5, [0x27ee] = 0x4db6, [0x27ef] = 0x4db7,
-+  [0x27f0] = 0x4db8, [0x27f1] = 0x4db9, [0x27f2] = 0x4dba, [0x27f3] = 0x4dbb,
-+  [0x27f4] = 0x4dbc, [0x27f5] = 0x4dbd, [0x27f6] = 0x4dbe, [0x27f7] = 0x4dbf,
-+  [0x27f8] = 0x4dc0, [0x27f9] = 0x4dc1, [0x27fa] = 0x4dc2, [0x27fb] = 0x4dc3,
-+  [0x27fc] = 0x4dc4, [0x27fd] = 0x4dc5, [0x27fe] = 0x4dc6, [0x27ff] = 0x4dc7,
-+  [0x2800] = 0x4dc8, [0x2801] = 0x4dc9, [0x2802] = 0x4dca, [0x2803] = 0x4dcb,
-+  [0x2804] = 0x4dcc, [0x2805] = 0x4dcd, [0x2806] = 0x4dce, [0x2807] = 0x4dcf,
-+  [0x2808] = 0x4dd0, [0x2809] = 0x4dd1, [0x280a] = 0x4dd2, [0x280b] = 0x4dd3,
-+  [0x280c] = 0x4dd4, [0x280d] = 0x4dd5, [0x280e] = 0x4dd6, [0x280f] = 0x4dd7,
-+  [0x2810] = 0x4dd8, [0x2811] = 0x4dd9, [0x2812] = 0x4dda, [0x2813] = 0x4ddb,
-+  [0x2814] = 0x4ddc, [0x2815] = 0x4ddd, [0x2816] = 0x4dde, [0x2817] = 0x4ddf,
-+  [0x2818] = 0x4de0, [0x2819] = 0x4de1, [0x281a] = 0x4de2, [0x281b] = 0x4de3,
-+  [0x281c] = 0x4de4, [0x281d] = 0x4de5, [0x281e] = 0x4de6, [0x281f] = 0x4de7,
-+  [0x2820] = 0x4de8, [0x2821] = 0x4de9, [0x2822] = 0x4dea, [0x2823] = 0x4deb,
-+  [0x2824] = 0x4dec, [0x2825] = 0x4ded, [0x2826] = 0x4dee, [0x2827] = 0x4def,
-+  [0x2828] = 0x4df0, [0x2829] = 0x4df1, [0x282a] = 0x4df2, [0x282b] = 0x4df3,
-+  [0x282c] = 0x4df4, [0x282d] = 0x4df5, [0x282e] = 0x4df6, [0x282f] = 0x4df7,
-+  [0x2830] = 0x4df8, [0x2831] = 0x4df9, [0x2832] = 0x4dfa, [0x2833] = 0x4dfb,
-+  [0x2834] = 0x4dfc, [0x2835] = 0x4dfd, [0x2836] = 0x4dfe, [0x2837] = 0x4dff,
-+  [0x2838] = 0x9fa6, [0x2839] = 0x9fa7, [0x283a] = 0x9fa8, [0x283b] = 0x9fa9,
-+  [0x283c] = 0x9faa, [0x283d] = 0x9fab, [0x283e] = 0x9fac, [0x283f] = 0x9fad,
-+  [0x2840] = 0x9fae, [0x2841] = 0x9faf, [0x2842] = 0x9fb0, [0x2843] = 0x9fb1,
-+  [0x2844] = 0x9fb2, [0x2845] = 0x9fb3, [0x284e] = 0xe76c, [0x284f] = 0xe7c8,
-+  [0x2850] = 0xe7e7, [0x2851] = 0xe7e8, [0x2852] = 0xe7e9, [0x2853] = 0xe7ea,
-+  [0x2854] = 0xe7eb, [0x2855] = 0xe7ec, [0x2856] = 0xe7ed, [0x2857] = 0xe7ee,
-+  [0x2858] = 0xe7ef, [0x2859] = 0xe7f0, [0x285a] = 0xe7f1, [0x285b] = 0xe7f2,
-+  [0x285c] = 0xe7f3, [0x285d] = 0xe815, [0x285e] = 0xe819, [0x285f] = 0xe81a,
-+  [0x2860] = 0xe81b, [0x2861] = 0xe81c, [0x2862] = 0xe81d, [0x2863] = 0xe81f,
-+  [0x2864] = 0xe820, [0x2865] = 0xe821, [0x2866] = 0xe822, [0x2867] = 0xe823,
-+  [0x2868] = 0xe824, [0x2869] = 0xe825, [0x286a] = 0xe827, [0x286b] = 0xe828,
-+  [0x286c] = 0xe829, [0x286d] = 0xe82a, [0x286e] = 0xe82d, [0x286f] = 0xe82e,
-+  [0x2870] = 0xe82f, [0x2871] = 0xe830, [0x2872] = 0xe833, [0x2873] = 0xe834,
-+  [0x2874] = 0xe835, [0x2875] = 0xe836, [0x2876] = 0xe837, [0x2877] = 0xe838,
-+  [0x2878] = 0xe839, [0x2879] = 0xe83a, [0x287a] = 0xe83c, [0x287b] = 0xe83d,
-+  [0x287c] = 0xe83e, [0x287d] = 0xe83f, [0x287e] = 0xe840, [0x287f] = 0xe841,
-+  [0x2880] = 0xe842, [0x2881] = 0xe844, [0x2882] = 0xe845, [0x2883] = 0xe846,
-+  [0x2884] = 0xe847, [0x2885] = 0xe848, [0x2886] = 0xe849, [0x2887] = 0xe84a,
-+  [0x2888] = 0xe84b, [0x2889] = 0xe84c, [0x288a] = 0xe84d, [0x288b] = 0xe84e,
-+  [0x288c] = 0xe84f, [0x288d] = 0xe850, [0x288e] = 0xe851, [0x288f] = 0xe852,
-+  [0x2890] = 0xe853, [0x2891] = 0xe856, [0x2892] = 0xe857, [0x2893] = 0xe858,
-+  [0x2894] = 0xe859, [0x2895] = 0xe85a, [0x2896] = 0xe85b, [0x2897] = 0xe85c,
-+  [0x2898] = 0xe85d, [0x2899] = 0xe85e, [0x289a] = 0xe85f, [0x289b] = 0xe860,
-+  [0x289c] = 0xe861, [0x289d] = 0xe862, [0x289e] = 0xe863, [0x289f] = 0xf92d,
-+  [0x28a0] = 0xf92e, [0x28a1] = 0xf92f, [0x28a2] = 0xf930, [0x28a3] = 0xf931,
-+  [0x28a4] = 0xf932, [0x28a5] = 0xf933, [0x28a6] = 0xf934, [0x28a7] = 0xf935,
-+  [0x28a8] = 0xf936, [0x28a9] = 0xf937, [0x28aa] = 0xf938, [0x28ab] = 0xf939,
-+  [0x28ac] = 0xf93a, [0x28ad] = 0xf93b, [0x28ae] = 0xf93c, [0x28af] = 0xf93d,
-+  [0x28b0] = 0xf93e, [0x28b1] = 0xf93f, [0x28b2] = 0xf940, [0x28b3] = 0xf941,
-+  [0x28b4] = 0xf942, [0x28b5] = 0xf943, [0x28b6] = 0xf944, [0x28b7] = 0xf945,
-+  [0x28b8] = 0xf946, [0x28b9] = 0xf947, [0x28ba] = 0xf948, [0x28bb] = 0xf949,
-+  [0x28bc] = 0xf94a, [0x28bd] = 0xf94b, [0x28be] = 0xf94c, [0x28bf] = 0xf94d,
-+  [0x28c0] = 0xf94e, [0x28c1] = 0xf94f, [0x28c2] = 0xf950, [0x28c3] = 0xf951,
-+  [0x28c4] = 0xf952, [0x28c5] = 0xf953, [0x28c6] = 0xf954, [0x28c7] = 0xf955,
-+  [0x28c8] = 0xf956, [0x28c9] = 0xf957, [0x28ca] = 0xf958, [0x28cb] = 0xf959,
-+  [0x28cc] = 0xf95a, [0x28cd] = 0xf95b, [0x28ce] = 0xf95c, [0x28cf] = 0xf95d,
-+  [0x28d0] = 0xf95e, [0x28d1] = 0xf95f, [0x28d2] = 0xf960, [0x28d3] = 0xf961,
-+  [0x28d4] = 0xf962, [0x28d5] = 0xf963, [0x28d6] = 0xf964, [0x28d7] = 0xf965,
-+  [0x28d8] = 0xf966, [0x28d9] = 0xf967, [0x28da] = 0xf968, [0x28db] = 0xf969,
-+  [0x28dc] = 0xf96a, [0x28dd] = 0xf96b, [0x28de] = 0xf96c, [0x28df] = 0xf96d,
-+  [0x28e0] = 0xf96e, [0x28e1] = 0xf96f, [0x28e2] = 0xf970, [0x28e3] = 0xf971,
-+  [0x28e4] = 0xf972, [0x28e5] = 0xf973, [0x28e6] = 0xf974, [0x28e7] = 0xf975,
-+  [0x28e8] = 0xf976, [0x28e9] = 0xf977, [0x28ea] = 0xf978, [0x28eb] = 0xf97a,
-+  [0x28ec] = 0xf97b, [0x28ed] = 0xf97c, [0x28ee] = 0xf97d, [0x28ef] = 0xf97e,
-+  [0x28f0] = 0xf97f, [0x28f1] = 0xf980, [0x28f2] = 0xf981, [0x28f3] = 0xf982,
-+  [0x28f4] = 0xf983, [0x28f5] = 0xf984, [0x28f6] = 0xf985, [0x28f7] = 0xf986,
-+  [0x28f8] = 0xf987, [0x28f9] = 0xf988, [0x28fa] = 0xf989, [0x28fb] = 0xf98a,
-+  [0x28fc] = 0xf98b, [0x28fd] = 0xf98c, [0x28fe] = 0xf98d, [0x28ff] = 0xf98e,
-+  [0x2900] = 0xf98f, [0x2901] = 0xf990, [0x2902] = 0xf991, [0x2903] = 0xf992,
-+  [0x2904] = 0xf993, [0x2905] = 0xf994, [0x2906] = 0xf996, [0x2907] = 0xf997,
-+  [0x2908] = 0xf998, [0x2909] = 0xf999, [0x290a] = 0xf99a, [0x290b] = 0xf99b,
-+  [0x290c] = 0xf99c, [0x290d] = 0xf99d, [0x290e] = 0xf99e, [0x290f] = 0xf99f,
-+  [0x2910] = 0xf9a0, [0x2911] = 0xf9a1, [0x2912] = 0xf9a2, [0x2913] = 0xf9a3,
-+  [0x2914] = 0xf9a4, [0x2915] = 0xf9a5, [0x2916] = 0xf9a6, [0x2917] = 0xf9a7,
-+  [0x2918] = 0xf9a8, [0x2919] = 0xf9a9, [0x291a] = 0xf9aa, [0x291b] = 0xf9ab,
-+  [0x291c] = 0xf9ac, [0x291d] = 0xf9ad, [0x291e] = 0xf9ae, [0x291f] = 0xf9af,
-+  [0x2920] = 0xf9b0, [0x2921] = 0xf9b1, [0x2922] = 0xf9b2, [0x2923] = 0xf9b3,
-+  [0x2924] = 0xf9b4, [0x2925] = 0xf9b5, [0x2926] = 0xf9b6, [0x2927] = 0xf9b7,
-+  [0x2928] = 0xf9b8, [0x2929] = 0xf9b9, [0x292a] = 0xf9ba, [0x292b] = 0xf9bb,
-+  [0x292c] = 0xf9bc, [0x292d] = 0xf9bd, [0x292e] = 0xf9be, [0x292f] = 0xf9bf,
-+  [0x2930] = 0xf9c0, [0x2931] = 0xf9c1, [0x2932] = 0xf9c2, [0x2933] = 0xf9c3,
-+  [0x2934] = 0xf9c4, [0x2935] = 0xf9c5, [0x2936] = 0xf9c6, [0x2937] = 0xf9c7,
-+  [0x2938] = 0xf9c8, [0x2939] = 0xf9c9, [0x293a] = 0xf9ca, [0x293b] = 0xf9cb,
-+  [0x293c] = 0xf9cc, [0x293d] = 0xf9cd, [0x293e] = 0xf9ce, [0x293f] = 0xf9cf,
-+  [0x2940] = 0xf9d0, [0x2941] = 0xf9d1, [0x2942] = 0xf9d2, [0x2943] = 0xf9d3,
-+  [0x2944] = 0xf9d4, [0x2945] = 0xf9d5, [0x2946] = 0xf9d6, [0x2947] = 0xf9d7,
-+  [0x2948] = 0xf9d8, [0x2949] = 0xf9d9, [0x294a] = 0xf9da, [0x294b] = 0xf9db,
-+  [0x294c] = 0xf9dc, [0x294d] = 0xf9dd, [0x294e] = 0xf9de, [0x294f] = 0xf9df,
-+  [0x2950] = 0xf9e0, [0x2951] = 0xf9e1, [0x2952] = 0xf9e2, [0x2953] = 0xf9e3,
-+  [0x2954] = 0xf9e4, [0x2955] = 0xf9e5, [0x2956] = 0xf9e6, [0x2957] = 0xf9e8,
-+  [0x2958] = 0xf9e9, [0x2959] = 0xf9ea, [0x295a] = 0xf9eb, [0x295b] = 0xf9ec,
-+  [0x295c] = 0xf9ed, [0x295d] = 0xf9ee, [0x295e] = 0xf9ef, [0x295f] = 0xf9f0,
-+  [0x2960] = 0xf9f2, [0x2961] = 0xf9f3, [0x2962] = 0xf9f4, [0x2963] = 0xf9f5,
-+  [0x2964] = 0xf9f6, [0x2965] = 0xf9f7, [0x2966] = 0xf9f8, [0x2967] = 0xf9f9,
-+  [0x2968] = 0xf9fa, [0x2969] = 0xf9fb, [0x296a] = 0xf9fc, [0x296b] = 0xf9fd,
-+  [0x296c] = 0xf9fe, [0x296d] = 0xf9ff, [0x296e] = 0xfa00, [0x296f] = 0xfa01,
-+  [0x2970] = 0xfa02, [0x2971] = 0xfa03, [0x2972] = 0xfa04, [0x2973] = 0xfa05,
-+  [0x2974] = 0xfa06, [0x2975] = 0xfa07, [0x2976] = 0xfa08, [0x2977] = 0xfa09,
-+  [0x2978] = 0xfa0a, [0x2979] = 0xfa0b, [0x297a] = 0xfa10, [0x297b] = 0xfa12,
-+  [0x297c] = 0xfa15, [0x297d] = 0xfa16, [0x297e] = 0xfa17, [0x297f] = 0xfa19,
-+  [0x2980] = 0xfa1a, [0x2981] = 0xfa1b, [0x2982] = 0xfa1c, [0x2983] = 0xfa1d,
-+  [0x2984] = 0xfa1e, [0x2985] = 0xfa22, [0x2986] = 0xfa25, [0x2987] = 0xfa26,
-+  [0x2988] = 0xfa2a, [0x2989] = 0xfa2b, [0x298a] = 0xfa2c, [0x298b] = 0xfa2d,
-+  [0x298c] = 0xfa2e, [0x298d] = 0xfa2f, [0x298e] = 0xfa30, [0x298f] = 0xfa31,
-+  [0x2990] = 0xfa32, [0x2991] = 0xfa33, [0x2992] = 0xfa34, [0x2993] = 0xfa35,
-+  [0x2994] = 0xfa36, [0x2995] = 0xfa37, [0x2996] = 0xfa38, [0x2997] = 0xfa39,
-+  [0x2998] = 0xfa3a, [0x2999] = 0xfa3b, [0x299a] = 0xfa3c, [0x299b] = 0xfa3d,
-+  [0x299c] = 0xfa3e, [0x299d] = 0xfa3f, [0x299e] = 0xfa40, [0x299f] = 0xfa41,
-+  [0x29a0] = 0xfa42, [0x29a1] = 0xfa43, [0x29a2] = 0xfa44, [0x29a3] = 0xfa45,
-+  [0x29a4] = 0xfa46, [0x29a5] = 0xfa47, [0x29a6] = 0xfa48, [0x29a7] = 0xfa49,
-+  [0x29a8] = 0xfa4a, [0x29a9] = 0xfa4b, [0x29aa] = 0xfa4c, [0x29ab] = 0xfa4d,
-+  [0x29ac] = 0xfa4e, [0x29ad] = 0xfa4f, [0x29ae] = 0xfa50, [0x29af] = 0xfa51,
-+  [0x29b0] = 0xfa52, [0x29b1] = 0xfa53, [0x29b2] = 0xfa54, [0x29b3] = 0xfa55,
-+  [0x29b4] = 0xfa56, [0x29b5] = 0xfa57, [0x29b6] = 0xfa58, [0x29b7] = 0xfa59,
-+  [0x29b8] = 0xfa5a, [0x29b9] = 0xfa5b, [0x29ba] = 0xfa5c, [0x29bb] = 0xfa5d,
-+  [0x29bc] = 0xfa5e, [0x29bd] = 0xfa5f, [0x29be] = 0xfa60, [0x29bf] = 0xfa61,
-+  [0x29c0] = 0xfa62, [0x29c1] = 0xfa63, [0x29c2] = 0xfa64, [0x29c3] = 0xfa65,
-+  [0x29c4] = 0xfa66, [0x29c5] = 0xfa67, [0x29c6] = 0xfa68, [0x29c7] = 0xfa69,
-+  [0x29c8] = 0xfa6a, [0x29c9] = 0xfa6b, [0x29ca] = 0xfa6c, [0x29cb] = 0xfa6d,
-+  [0x29cc] = 0xfa6e, [0x29cd] = 0xfa6f, [0x29ce] = 0xfa70, [0x29cf] = 0xfa71,
-+  [0x29d0] = 0xfa72, [0x29d1] = 0xfa73, [0x29d2] = 0xfa74, [0x29d3] = 0xfa75,
-+  [0x29d4] = 0xfa76, [0x29d5] = 0xfa77, [0x29d6] = 0xfa78, [0x29d7] = 0xfa79,
-+  [0x29d8] = 0xfa7a, [0x29d9] = 0xfa7b, [0x29da] = 0xfa7c, [0x29db] = 0xfa7d,
-+  [0x29dc] = 0xfa7e, [0x29dd] = 0xfa7f, [0x29de] = 0xfa80, [0x29df] = 0xfa81,
-+  [0x29e0] = 0xfa82, [0x29e1] = 0xfa83, [0x29e2] = 0xfa84, [0x29e3] = 0xfa85,
-+  [0x29e4] = 0xfa86, [0x29e5] = 0xfa87, [0x29e6] = 0xfa88, [0x29e7] = 0xfa89,
-+  [0x29e8] = 0xfa8a, [0x29e9] = 0xfa8b, [0x29ea] = 0xfa8c, [0x29eb] = 0xfa8d,
-+  [0x29ec] = 0xfa8e, [0x29ed] = 0xfa8f, [0x29ee] = 0xfa90, [0x29ef] = 0xfa91,
-+  [0x29f0] = 0xfa92, [0x29f1] = 0xfa93, [0x29f2] = 0xfa94, [0x29f3] = 0xfa95,
-+  [0x29f4] = 0xfa96, [0x29f5] = 0xfa97, [0x29f6] = 0xfa98, [0x29f7] = 0xfa99,
-+  [0x29f8] = 0xfa9a, [0x29f9] = 0xfa9b, [0x29fa] = 0xfa9c, [0x29fb] = 0xfa9d,
-+  [0x29fc] = 0xfa9e, [0x29fd] = 0xfa9f, [0x29fe] = 0xfaa0, [0x29ff] = 0xfaa1,
-+  [0x2a00] = 0xfaa2, [0x2a01] = 0xfaa3, [0x2a02] = 0xfaa4, [0x2a03] = 0xfaa5,
-+  [0x2a04] = 0xfaa6, [0x2a05] = 0xfaa7, [0x2a06] = 0xfaa8, [0x2a07] = 0xfaa9,
-+  [0x2a08] = 0xfaaa, [0x2a09] = 0xfaab, [0x2a0a] = 0xfaac, [0x2a0b] = 0xfaad,
-+  [0x2a0c] = 0xfaae, [0x2a0d] = 0xfaaf, [0x2a0e] = 0xfab0, [0x2a0f] = 0xfab1,
-+  [0x2a10] = 0xfab2, [0x2a11] = 0xfab3, [0x2a12] = 0xfab4, [0x2a13] = 0xfab5,
-+  [0x2a14] = 0xfab6, [0x2a15] = 0xfab7, [0x2a16] = 0xfab8, [0x2a17] = 0xfab9,
-+  [0x2a18] = 0xfaba, [0x2a19] = 0xfabb, [0x2a1a] = 0xfabc, [0x2a1b] = 0xfabd,
-+  [0x2a1c] = 0xfabe, [0x2a1d] = 0xfabf, [0x2a1e] = 0xfac0, [0x2a1f] = 0xfac1,
-+  [0x2a20] = 0xfac2, [0x2a21] = 0xfac3, [0x2a22] = 0xfac4, [0x2a23] = 0xfac5,
-+  [0x2a24] = 0xfac6, [0x2a25] = 0xfac7, [0x2a26] = 0xfac8, [0x2a27] = 0xfac9,
-+  [0x2a28] = 0xfaca, [0x2a29] = 0xfacb, [0x2a2a] = 0xfacc, [0x2a2b] = 0xfacd,
-+  [0x2a2c] = 0xface, [0x2a2d] = 0xfacf, [0x2a2e] = 0xfad0, [0x2a2f] = 0xfad1,
-+  [0x2a30] = 0xfad2, [0x2a31] = 0xfad3, [0x2a32] = 0xfad4, [0x2a33] = 0xfad5,
-+  [0x2a34] = 0xfad6, [0x2a35] = 0xfad7, [0x2a36] = 0xfad8, [0x2a37] = 0xfad9,
-+  [0x2a38] = 0xfada, [0x2a39] = 0xfadb, [0x2a3a] = 0xfadc, [0x2a3b] = 0xfadd,
-+  [0x2a3c] = 0xfade, [0x2a3d] = 0xfadf, [0x2a3e] = 0xfae0, [0x2a3f] = 0xfae1,
-+  [0x2a40] = 0xfae2, [0x2a41] = 0xfae3, [0x2a42] = 0xfae4, [0x2a43] = 0xfae5,
-+  [0x2a44] = 0xfae6, [0x2a45] = 0xfae7, [0x2a46] = 0xfae8, [0x2a47] = 0xfae9,
-+  [0x2a48] = 0xfaea, [0x2a49] = 0xfaeb, [0x2a4a] = 0xfaec, [0x2a4b] = 0xfaed,
-+  [0x2a4c] = 0xfaee, [0x2a4d] = 0xfaef, [0x2a4e] = 0xfaf0, [0x2a4f] = 0xfaf1,
-+  [0x2a50] = 0xfaf2, [0x2a51] = 0xfaf3, [0x2a52] = 0xfaf4, [0x2a53] = 0xfaf5,
-+  [0x2a54] = 0xfaf6, [0x2a55] = 0xfaf7, [0x2a56] = 0xfaf8, [0x2a57] = 0xfaf9,
-+  [0x2a58] = 0xfafa, [0x2a59] = 0xfafb, [0x2a5a] = 0xfafc, [0x2a5b] = 0xfafd,
-+  [0x2a5c] = 0xfafe, [0x2a5d] = 0xfaff, [0x2a5e] = 0xfb00, [0x2a5f] = 0xfb01,
-+  [0x2a60] = 0xfb02, [0x2a61] = 0xfb03, [0x2a62] = 0xfb04, [0x2a63] = 0xfb05,
-+  [0x2a64] = 0xfb06, [0x2a65] = 0xfb07, [0x2a66] = 0xfb08, [0x2a67] = 0xfb09,
-+  [0x2a68] = 0xfb0a, [0x2a69] = 0xfb0b, [0x2a6a] = 0xfb0c, [0x2a6b] = 0xfb0d,
-+  [0x2a6c] = 0xfb0e, [0x2a6d] = 0xfb0f, [0x2a6e] = 0xfb10, [0x2a6f] = 0xfb11,
-+  [0x2a70] = 0xfb12, [0x2a71] = 0xfb13, [0x2a72] = 0xfb14, [0x2a73] = 0xfb15,
-+  [0x2a74] = 0xfb16, [0x2a75] = 0xfb17, [0x2a76] = 0xfb18, [0x2a77] = 0xfb19,
-+  [0x2a78] = 0xfb1a, [0x2a79] = 0xfb1b, [0x2a7a] = 0xfb1c, [0x2a7b] = 0xfb1d,
-+  [0x2a7c] = 0xfb1e, [0x2a7d] = 0xfb1f, [0x2a7e] = 0xfb20, [0x2a7f] = 0xfb21,
-+  [0x2a80] = 0xfb22, [0x2a81] = 0xfb23, [0x2a82] = 0xfb24, [0x2a83] = 0xfb25,
-+  [0x2a84] = 0xfb26, [0x2a85] = 0xfb27, [0x2a86] = 0xfb28, [0x2a87] = 0xfb29,
-+  [0x2a88] = 0xfb2a, [0x2a89] = 0xfb2b, [0x2a8a] = 0xfb2c, [0x2a8b] = 0xfb2d,
-+  [0x2a8c] = 0xfb2e, [0x2a8d] = 0xfb2f, [0x2a8e] = 0xfb30, [0x2a8f] = 0xfb31,
-+  [0x2a90] = 0xfb32, [0x2a91] = 0xfb33, [0x2a92] = 0xfb34, [0x2a93] = 0xfb35,
-+  [0x2a94] = 0xfb36, [0x2a95] = 0xfb37, [0x2a96] = 0xfb38, [0x2a97] = 0xfb39,
-+  [0x2a98] = 0xfb3a, [0x2a99] = 0xfb3b, [0x2a9a] = 0xfb3c, [0x2a9b] = 0xfb3d,
-+  [0x2a9c] = 0xfb3e, [0x2a9d] = 0xfb3f, [0x2a9e] = 0xfb40, [0x2a9f] = 0xfb41,
-+  [0x2aa0] = 0xfb42, [0x2aa1] = 0xfb43, [0x2aa2] = 0xfb44, [0x2aa3] = 0xfb45,
-+  [0x2aa4] = 0xfb46, [0x2aa5] = 0xfb47, [0x2aa6] = 0xfb48, [0x2aa7] = 0xfb49,
-+  [0x2aa8] = 0xfb4a, [0x2aa9] = 0xfb4b, [0x2aaa] = 0xfb4c, [0x2aab] = 0xfb4d,
-+  [0x2aac] = 0xfb4e, [0x2aad] = 0xfb4f, [0x2aae] = 0xfb50, [0x2aaf] = 0xfb51,
-+  [0x2ab0] = 0xfb52, [0x2ab1] = 0xfb53, [0x2ab2] = 0xfb54, [0x2ab3] = 0xfb55,
-+  [0x2ab4] = 0xfb56, [0x2ab5] = 0xfb57, [0x2ab6] = 0xfb58, [0x2ab7] = 0xfb59,
-+  [0x2ab8] = 0xfb5a, [0x2ab9] = 0xfb5b, [0x2aba] = 0xfb5c, [0x2abb] = 0xfb5d,
-+  [0x2abc] = 0xfb5e, [0x2abd] = 0xfb5f, [0x2abe] = 0xfb60, [0x2abf] = 0xfb61,
-+  [0x2ac0] = 0xfb62, [0x2ac1] = 0xfb63, [0x2ac2] = 0xfb64, [0x2ac3] = 0xfb65,
-+  [0x2ac4] = 0xfb66, [0x2ac5] = 0xfb67, [0x2ac6] = 0xfb68, [0x2ac7] = 0xfb69,
-+  [0x2ac8] = 0xfb6a, [0x2ac9] = 0xfb6b, [0x2aca] = 0xfb6c, [0x2acb] = 0xfb6d,
-+  [0x2acc] = 0xfb6e, [0x2acd] = 0xfb6f, [0x2ace] = 0xfb70, [0x2acf] = 0xfb71,
-+  [0x2ad0] = 0xfb72, [0x2ad1] = 0xfb73, [0x2ad2] = 0xfb74, [0x2ad3] = 0xfb75,
-+  [0x2ad4] = 0xfb76, [0x2ad5] = 0xfb77, [0x2ad6] = 0xfb78, [0x2ad7] = 0xfb79,
-+  [0x2ad8] = 0xfb7a, [0x2ad9] = 0xfb7b, [0x2ada] = 0xfb7c, [0x2adb] = 0xfb7d,
-+  [0x2adc] = 0xfb7e, [0x2add] = 0xfb7f, [0x2ade] = 0xfb80, [0x2adf] = 0xfb81,
-+  [0x2ae0] = 0xfb82, [0x2ae1] = 0xfb83, [0x2ae2] = 0xfb84, [0x2ae3] = 0xfb85,
-+  [0x2ae4] = 0xfb86, [0x2ae5] = 0xfb87, [0x2ae6] = 0xfb88, [0x2ae7] = 0xfb89,
-+  [0x2ae8] = 0xfb8a, [0x2ae9] = 0xfb8b, [0x2aea] = 0xfb8c, [0x2aeb] = 0xfb8d,
-+  [0x2aec] = 0xfb8e, [0x2aed] = 0xfb8f, [0x2aee] = 0xfb90, [0x2aef] = 0xfb91,
-+  [0x2af0] = 0xfb92, [0x2af1] = 0xfb93, [0x2af2] = 0xfb94, [0x2af3] = 0xfb95,
-+  [0x2af4] = 0xfb96, [0x2af5] = 0xfb97, [0x2af6] = 0xfb98, [0x2af7] = 0xfb99,
-+  [0x2af8] = 0xfb9a, [0x2af9] = 0xfb9b, [0x2afa] = 0xfb9c, [0x2afb] = 0xfb9d,
-+  [0x2afc] = 0xfb9e, [0x2afd] = 0xfb9f, [0x2afe] = 0xfba0, [0x2aff] = 0xfba1,
-+  [0x2b00] = 0xfba2, [0x2b01] = 0xfba3, [0x2b02] = 0xfba4, [0x2b03] = 0xfba5,
-+  [0x2b04] = 0xfba6, [0x2b05] = 0xfba7, [0x2b06] = 0xfba8, [0x2b07] = 0xfba9,
-+  [0x2b08] = 0xfbaa, [0x2b09] = 0xfbab, [0x2b0a] = 0xfbac, [0x2b0b] = 0xfbad,
-+  [0x2b0c] = 0xfbae, [0x2b0d] = 0xfbaf, [0x2b0e] = 0xfbb0, [0x2b0f] = 0xfbb1,
-+  [0x2b10] = 0xfbb2, [0x2b11] = 0xfbb3, [0x2b12] = 0xfbb4, [0x2b13] = 0xfbb5,
-+  [0x2b14] = 0xfbb6, [0x2b15] = 0xfbb7, [0x2b16] = 0xfbb8, [0x2b17] = 0xfbb9,
-+  [0x2b18] = 0xfbba, [0x2b19] = 0xfbbb, [0x2b1a] = 0xfbbc, [0x2b1b] = 0xfbbd,
-+  [0x2b1c] = 0xfbbe, [0x2b1d] = 0xfbbf, [0x2b1e] = 0xfbc0, [0x2b1f] = 0xfbc1,
-+  [0x2b20] = 0xfbc2, [0x2b21] = 0xfbc3, [0x2b22] = 0xfbc4, [0x2b23] = 0xfbc5,
-+  [0x2b24] = 0xfbc6, [0x2b25] = 0xfbc7, [0x2b26] = 0xfbc8, [0x2b27] = 0xfbc9,
-+  [0x2b28] = 0xfbca, [0x2b29] = 0xfbcb, [0x2b2a] = 0xfbcc, [0x2b2b] = 0xfbcd,
-+  [0x2b2c] = 0xfbce, [0x2b2d] = 0xfbcf, [0x2b2e] = 0xfbd0, [0x2b2f] = 0xfbd1,
-+  [0x2b30] = 0xfbd2, [0x2b31] = 0xfbd3, [0x2b32] = 0xfbd4, [0x2b33] = 0xfbd5,
-+  [0x2b34] = 0xfbd6, [0x2b35] = 0xfbd7, [0x2b36] = 0xfbd8, [0x2b37] = 0xfbd9,
-+  [0x2b38] = 0xfbda, [0x2b39] = 0xfbdb, [0x2b3a] = 0xfbdc, [0x2b3b] = 0xfbdd,
-+  [0x2b3c] = 0xfbde, [0x2b3d] = 0xfbdf, [0x2b3e] = 0xfbe0, [0x2b3f] = 0xfbe1,
-+  [0x2b40] = 0xfbe2, [0x2b41] = 0xfbe3, [0x2b42] = 0xfbe4, [0x2b43] = 0xfbe5,
-+  [0x2b44] = 0xfbe6, [0x2b45] = 0xfbe7, [0x2b46] = 0xfbe8, [0x2b47] = 0xfbe9,
-+  [0x2b48] = 0xfbea, [0x2b49] = 0xfbeb, [0x2b4a] = 0xfbec, [0x2b4b] = 0xfbed,
-+  [0x2b4c] = 0xfbee, [0x2b4d] = 0xfbef, [0x2b4e] = 0xfbf0, [0x2b4f] = 0xfbf1,
-+  [0x2b50] = 0xfbf2, [0x2b51] = 0xfbf3, [0x2b52] = 0xfbf4, [0x2b53] = 0xfbf5,
-+  [0x2b54] = 0xfbf6, [0x2b55] = 0xfbf7, [0x2b56] = 0xfbf8, [0x2b57] = 0xfbf9,
-+  [0x2b58] = 0xfbfa, [0x2b59] = 0xfbfb, [0x2b5a] = 0xfbfc, [0x2b5b] = 0xfbfd,
-+  [0x2b5c] = 0xfbfe, [0x2b5d] = 0xfbff, [0x2b5e] = 0xfc00, [0x2b5f] = 0xfc01,
-+  [0x2b60] = 0xfc02, [0x2b61] = 0xfc03, [0x2b62] = 0xfc04, [0x2b63] = 0xfc05,
-+  [0x2b64] = 0xfc06, [0x2b65] = 0xfc07, [0x2b66] = 0xfc08, [0x2b67] = 0xfc09,
-+  [0x2b68] = 0xfc0a, [0x2b69] = 0xfc0b, [0x2b6a] = 0xfc0c, [0x2b6b] = 0xfc0d,
-+  [0x2b6c] = 0xfc0e, [0x2b6d] = 0xfc0f, [0x2b6e] = 0xfc10, [0x2b6f] = 0xfc11,
-+  [0x2b70] = 0xfc12, [0x2b71] = 0xfc13, [0x2b72] = 0xfc14, [0x2b73] = 0xfc15,
-+  [0x2b74] = 0xfc16, [0x2b75] = 0xfc17, [0x2b76] = 0xfc18, [0x2b77] = 0xfc19,
-+  [0x2b78] = 0xfc1a, [0x2b79] = 0xfc1b, [0x2b7a] = 0xfc1c, [0x2b7b] = 0xfc1d,
-+  [0x2b7c] = 0xfc1e, [0x2b7d] = 0xfc1f, [0x2b7e] = 0xfc20, [0x2b7f] = 0xfc21,
-+  [0x2b80] = 0xfc22, [0x2b81] = 0xfc23, [0x2b82] = 0xfc24, [0x2b83] = 0xfc25,
-+  [0x2b84] = 0xfc26, [0x2b85] = 0xfc27, [0x2b86] = 0xfc28, [0x2b87] = 0xfc29,
-+  [0x2b88] = 0xfc2a, [0x2b89] = 0xfc2b, [0x2b8a] = 0xfc2c, [0x2b8b] = 0xfc2d,
-+  [0x2b8c] = 0xfc2e, [0x2b8d] = 0xfc2f, [0x2b8e] = 0xfc30, [0x2b8f] = 0xfc31,
-+  [0x2b90] = 0xfc32, [0x2b91] = 0xfc33, [0x2b92] = 0xfc34, [0x2b93] = 0xfc35,
-+  [0x2b94] = 0xfc36, [0x2b95] = 0xfc37, [0x2b96] = 0xfc38, [0x2b97] = 0xfc39,
-+  [0x2b98] = 0xfc3a, [0x2b99] = 0xfc3b, [0x2b9a] = 0xfc3c, [0x2b9b] = 0xfc3d,
-+  [0x2b9c] = 0xfc3e, [0x2b9d] = 0xfc3f, [0x2b9e] = 0xfc40, [0x2b9f] = 0xfc41,
-+  [0x2ba0] = 0xfc42, [0x2ba1] = 0xfc43, [0x2ba2] = 0xfc44, [0x2ba3] = 0xfc45,
-+  [0x2ba4] = 0xfc46, [0x2ba5] = 0xfc47, [0x2ba6] = 0xfc48, [0x2ba7] = 0xfc49,
-+  [0x2ba8] = 0xfc4a, [0x2ba9] = 0xfc4b, [0x2baa] = 0xfc4c, [0x2bab] = 0xfc4d,
-+  [0x2bac] = 0xfc4e, [0x2bad] = 0xfc4f, [0x2bae] = 0xfc50, [0x2baf] = 0xfc51,
-+  [0x2bb0] = 0xfc52, [0x2bb1] = 0xfc53, [0x2bb2] = 0xfc54, [0x2bb3] = 0xfc55,
-+  [0x2bb4] = 0xfc56, [0x2bb5] = 0xfc57, [0x2bb6] = 0xfc58, [0x2bb7] = 0xfc59,
-+  [0x2bb8] = 0xfc5a, [0x2bb9] = 0xfc5b, [0x2bba] = 0xfc5c, [0x2bbb] = 0xfc5d,
-+  [0x2bbc] = 0xfc5e, [0x2bbd] = 0xfc5f, [0x2bbe] = 0xfc60, [0x2bbf] = 0xfc61,
-+  [0x2bc0] = 0xfc62, [0x2bc1] = 0xfc63, [0x2bc2] = 0xfc64, [0x2bc3] = 0xfc65,
-+  [0x2bc4] = 0xfc66, [0x2bc5] = 0xfc67, [0x2bc6] = 0xfc68, [0x2bc7] = 0xfc69,
-+  [0x2bc8] = 0xfc6a, [0x2bc9] = 0xfc6b, [0x2bca] = 0xfc6c, [0x2bcb] = 0xfc6d,
-+  [0x2bcc] = 0xfc6e, [0x2bcd] = 0xfc6f, [0x2bce] = 0xfc70, [0x2bcf] = 0xfc71,
-+  [0x2bd0] = 0xfc72, [0x2bd1] = 0xfc73, [0x2bd2] = 0xfc74, [0x2bd3] = 0xfc75,
-+  [0x2bd4] = 0xfc76, [0x2bd5] = 0xfc77, [0x2bd6] = 0xfc78, [0x2bd7] = 0xfc79,
-+  [0x2bd8] = 0xfc7a, [0x2bd9] = 0xfc7b, [0x2bda] = 0xfc7c, [0x2bdb] = 0xfc7d,
-+  [0x2bdc] = 0xfc7e, [0x2bdd] = 0xfc7f, [0x2bde] = 0xfc80, [0x2bdf] = 0xfc81,
-+  [0x2be0] = 0xfc82, [0x2be1] = 0xfc83, [0x2be2] = 0xfc84, [0x2be3] = 0xfc85,
-+  [0x2be4] = 0xfc86, [0x2be5] = 0xfc87, [0x2be6] = 0xfc88, [0x2be7] = 0xfc89,
-+  [0x2be8] = 0xfc8a, [0x2be9] = 0xfc8b, [0x2bea] = 0xfc8c, [0x2beb] = 0xfc8d,
-+  [0x2bec] = 0xfc8e, [0x2bed] = 0xfc8f, [0x2bee] = 0xfc90, [0x2bef] = 0xfc91,
-+  [0x2bf0] = 0xfc92, [0x2bf1] = 0xfc93, [0x2bf2] = 0xfc94, [0x2bf3] = 0xfc95,
-+  [0x2bf4] = 0xfc96, [0x2bf5] = 0xfc97, [0x2bf6] = 0xfc98, [0x2bf7] = 0xfc99,
-+  [0x2bf8] = 0xfc9a, [0x2bf9] = 0xfc9b, [0x2bfa] = 0xfc9c, [0x2bfb] = 0xfc9d,
-+  [0x2bfc] = 0xfc9e, [0x2bfd] = 0xfc9f, [0x2bfe] = 0xfca0, [0x2bff] = 0xfca1,
-+  [0x2c00] = 0xfca2, [0x2c01] = 0xfca3, [0x2c02] = 0xfca4, [0x2c03] = 0xfca5,
-+  [0x2c04] = 0xfca6, [0x2c05] = 0xfca7, [0x2c06] = 0xfca8, [0x2c07] = 0xfca9,
-+  [0x2c08] = 0xfcaa, [0x2c09] = 0xfcab, [0x2c0a] = 0xfcac, [0x2c0b] = 0xfcad,
-+  [0x2c0c] = 0xfcae, [0x2c0d] = 0xfcaf, [0x2c0e] = 0xfcb0, [0x2c0f] = 0xfcb1,
-+  [0x2c10] = 0xfcb2, [0x2c11] = 0xfcb3, [0x2c12] = 0xfcb4, [0x2c13] = 0xfcb5,
-+  [0x2c14] = 0xfcb6, [0x2c15] = 0xfcb7, [0x2c16] = 0xfcb8, [0x2c17] = 0xfcb9,
-+  [0x2c18] = 0xfcba, [0x2c19] = 0xfcbb, [0x2c1a] = 0xfcbc, [0x2c1b] = 0xfcbd,
-+  [0x2c1c] = 0xfcbe, [0x2c1d] = 0xfcbf, [0x2c1e] = 0xfcc0, [0x2c1f] = 0xfcc1,
-+  [0x2c20] = 0xfcc2, [0x2c21] = 0xfcc3, [0x2c22] = 0xfcc4, [0x2c23] = 0xfcc5,
-+  [0x2c24] = 0xfcc6, [0x2c25] = 0xfcc7, [0x2c26] = 0xfcc8, [0x2c27] = 0xfcc9,
-+  [0x2c28] = 0xfcca, [0x2c29] = 0xfccb, [0x2c2a] = 0xfccc, [0x2c2b] = 0xfccd,
-+  [0x2c2c] = 0xfcce, [0x2c2d] = 0xfccf, [0x2c2e] = 0xfcd0, [0x2c2f] = 0xfcd1,
-+  [0x2c30] = 0xfcd2, [0x2c31] = 0xfcd3, [0x2c32] = 0xfcd4, [0x2c33] = 0xfcd5,
-+  [0x2c34] = 0xfcd6, [0x2c35] = 0xfcd7, [0x2c36] = 0xfcd8, [0x2c37] = 0xfcd9,
-+  [0x2c38] = 0xfcda, [0x2c39] = 0xfcdb, [0x2c3a] = 0xfcdc, [0x2c3b] = 0xfcdd,
-+  [0x2c3c] = 0xfcde, [0x2c3d] = 0xfcdf, [0x2c3e] = 0xfce0, [0x2c3f] = 0xfce1,
-+  [0x2c40] = 0xfce2, [0x2c41] = 0xfce3, [0x2c42] = 0xfce4, [0x2c43] = 0xfce5,
-+  [0x2c44] = 0xfce6, [0x2c45] = 0xfce7, [0x2c46] = 0xfce8, [0x2c47] = 0xfce9,
-+  [0x2c48] = 0xfcea, [0x2c49] = 0xfceb, [0x2c4a] = 0xfcec, [0x2c4b] = 0xfced,
-+  [0x2c4c] = 0xfcee, [0x2c4d] = 0xfcef, [0x2c4e] = 0xfcf0, [0x2c4f] = 0xfcf1,
-+  [0x2c50] = 0xfcf2, [0x2c51] = 0xfcf3, [0x2c52] = 0xfcf4, [0x2c53] = 0xfcf5,
-+  [0x2c54] = 0xfcf6, [0x2c55] = 0xfcf7, [0x2c56] = 0xfcf8, [0x2c57] = 0xfcf9,
-+  [0x2c58] = 0xfcfa, [0x2c59] = 0xfcfb, [0x2c5a] = 0xfcfc, [0x2c5b] = 0xfcfd,
-+  [0x2c5c] = 0xfcfe, [0x2c5d] = 0xfcff, [0x2c5e] = 0xfd00, [0x2c5f] = 0xfd01,
-+  [0x2c60] = 0xfd02, [0x2c61] = 0xfd03, [0x2c62] = 0xfd04, [0x2c63] = 0xfd05,
-+  [0x2c64] = 0xfd06, [0x2c65] = 0xfd07, [0x2c66] = 0xfd08, [0x2c67] = 0xfd09,
-+  [0x2c68] = 0xfd0a, [0x2c69] = 0xfd0b, [0x2c6a] = 0xfd0c, [0x2c6b] = 0xfd0d,
-+  [0x2c6c] = 0xfd0e, [0x2c6d] = 0xfd0f, [0x2c6e] = 0xfd10, [0x2c6f] = 0xfd11,
-+  [0x2c70] = 0xfd12, [0x2c71] = 0xfd13, [0x2c72] = 0xfd14, [0x2c73] = 0xfd15,
-+  [0x2c74] = 0xfd16, [0x2c75] = 0xfd17, [0x2c76] = 0xfd18, [0x2c77] = 0xfd19,
-+  [0x2c78] = 0xfd1a, [0x2c79] = 0xfd1b, [0x2c7a] = 0xfd1c, [0x2c7b] = 0xfd1d,
-+  [0x2c7c] = 0xfd1e, [0x2c7d] = 0xfd1f, [0x2c7e] = 0xfd20, [0x2c7f] = 0xfd21,
-+  [0x2c80] = 0xfd22, [0x2c81] = 0xfd23, [0x2c82] = 0xfd24, [0x2c83] = 0xfd25,
-+  [0x2c84] = 0xfd26, [0x2c85] = 0xfd27, [0x2c86] = 0xfd28, [0x2c87] = 0xfd29,
-+  [0x2c88] = 0xfd2a, [0x2c89] = 0xfd2b, [0x2c8a] = 0xfd2c, [0x2c8b] = 0xfd2d,
-+  [0x2c8c] = 0xfd2e, [0x2c8d] = 0xfd2f, [0x2c8e] = 0xfd30, [0x2c8f] = 0xfd31,
-+  [0x2c90] = 0xfd32, [0x2c91] = 0xfd33, [0x2c92] = 0xfd34, [0x2c93] = 0xfd35,
-+  [0x2c94] = 0xfd36, [0x2c95] = 0xfd37, [0x2c96] = 0xfd38, [0x2c97] = 0xfd39,
-+  [0x2c98] = 0xfd3a, [0x2c99] = 0xfd3b, [0x2c9a] = 0xfd3c, [0x2c9b] = 0xfd3d,
-+  [0x2c9c] = 0xfd3e, [0x2c9d] = 0xfd3f, [0x2c9e] = 0xfd40, [0x2c9f] = 0xfd41,
-+  [0x2ca0] = 0xfd42, [0x2ca1] = 0xfd43, [0x2ca2] = 0xfd44, [0x2ca3] = 0xfd45,
-+  [0x2ca4] = 0xfd46, [0x2ca5] = 0xfd47, [0x2ca6] = 0xfd48, [0x2ca7] = 0xfd49,
-+  [0x2ca8] = 0xfd4a, [0x2ca9] = 0xfd4b, [0x2caa] = 0xfd4c, [0x2cab] = 0xfd4d,
-+  [0x2cac] = 0xfd4e, [0x2cad] = 0xfd4f, [0x2cae] = 0xfd50, [0x2caf] = 0xfd51,
-+  [0x2cb0] = 0xfd52, [0x2cb1] = 0xfd53, [0x2cb2] = 0xfd54, [0x2cb3] = 0xfd55,
-+  [0x2cb4] = 0xfd56, [0x2cb5] = 0xfd57, [0x2cb6] = 0xfd58, [0x2cb7] = 0xfd59,
-+  [0x2cb8] = 0xfd5a, [0x2cb9] = 0xfd5b, [0x2cba] = 0xfd5c, [0x2cbb] = 0xfd5d,
-+  [0x2cbc] = 0xfd5e, [0x2cbd] = 0xfd5f, [0x2cbe] = 0xfd60, [0x2cbf] = 0xfd61,
-+  [0x2cc0] = 0xfd62, [0x2cc1] = 0xfd63, [0x2cc2] = 0xfd64, [0x2cc3] = 0xfd65,
-+  [0x2cc4] = 0xfd66, [0x2cc5] = 0xfd67, [0x2cc6] = 0xfd68, [0x2cc7] = 0xfd69,
-+  [0x2cc8] = 0xfd6a, [0x2cc9] = 0xfd6b, [0x2cca] = 0xfd6c, [0x2ccb] = 0xfd6d,
-+  [0x2ccc] = 0xfd6e, [0x2ccd] = 0xfd6f, [0x2cce] = 0xfd70, [0x2ccf] = 0xfd71,
-+  [0x2cd0] = 0xfd72, [0x2cd1] = 0xfd73, [0x2cd2] = 0xfd74, [0x2cd3] = 0xfd75,
-+  [0x2cd4] = 0xfd76, [0x2cd5] = 0xfd77, [0x2cd6] = 0xfd78, [0x2cd7] = 0xfd79,
-+  [0x2cd8] = 0xfd7a, [0x2cd9] = 0xfd7b, [0x2cda] = 0xfd7c, [0x2cdb] = 0xfd7d,
-+  [0x2cdc] = 0xfd7e, [0x2cdd] = 0xfd7f, [0x2cde] = 0xfd80, [0x2cdf] = 0xfd81,
-+  [0x2ce0] = 0xfd82, [0x2ce1] = 0xfd83, [0x2ce2] = 0xfd84, [0x2ce3] = 0xfd85,
-+  [0x2ce4] = 0xfd86, [0x2ce5] = 0xfd87, [0x2ce6] = 0xfd88, [0x2ce7] = 0xfd89,
-+  [0x2ce8] = 0xfd8a, [0x2ce9] = 0xfd8b, [0x2cea] = 0xfd8c, [0x2ceb] = 0xfd8d,
-+  [0x2cec] = 0xfd8e, [0x2ced] = 0xfd8f, [0x2cee] = 0xfd90, [0x2cef] = 0xfd91,
-+  [0x2cf0] = 0xfd92, [0x2cf1] = 0xfd93, [0x2cf2] = 0xfd94, [0x2cf3] = 0xfd95,
-+  [0x2cf4] = 0xfd96, [0x2cf5] = 0xfd97, [0x2cf6] = 0xfd98, [0x2cf7] = 0xfd99,
-+  [0x2cf8] = 0xfd9a, [0x2cf9] = 0xfd9b, [0x2cfa] = 0xfd9c, [0x2cfb] = 0xfd9d,
-+  [0x2cfc] = 0xfd9e, [0x2cfd] = 0xfd9f, [0x2cfe] = 0xfda0, [0x2cff] = 0xfda1,
-+  [0x2d00] = 0xfda2, [0x2d01] = 0xfda3, [0x2d02] = 0xfda4, [0x2d03] = 0xfda5,
-+  [0x2d04] = 0xfda6, [0x2d05] = 0xfda7, [0x2d06] = 0xfda8, [0x2d07] = 0xfda9,
-+  [0x2d08] = 0xfdaa, [0x2d09] = 0xfdab, [0x2d0a] = 0xfdac, [0x2d0b] = 0xfdad,
-+  [0x2d0c] = 0xfdae, [0x2d0d] = 0xfdaf, [0x2d0e] = 0xfdb0, [0x2d0f] = 0xfdb1,
-+  [0x2d10] = 0xfdb2, [0x2d11] = 0xfdb3, [0x2d12] = 0xfdb4, [0x2d13] = 0xfdb5,
-+  [0x2d14] = 0xfdb6, [0x2d15] = 0xfdb7, [0x2d16] = 0xfdb8, [0x2d17] = 0xfdb9,
-+  [0x2d18] = 0xfdba, [0x2d19] = 0xfdbb, [0x2d1a] = 0xfdbc, [0x2d1b] = 0xfdbd,
-+  [0x2d1c] = 0xfdbe, [0x2d1d] = 0xfdbf, [0x2d1e] = 0xfdc0, [0x2d1f] = 0xfdc1,
-+  [0x2d20] = 0xfdc2, [0x2d21] = 0xfdc3, [0x2d22] = 0xfdc4, [0x2d23] = 0xfdc5,
-+  [0x2d24] = 0xfdc6, [0x2d25] = 0xfdc7, [0x2d26] = 0xfdc8, [0x2d27] = 0xfdc9,
-+  [0x2d28] = 0xfdca, [0x2d29] = 0xfdcb, [0x2d2a] = 0xfdcc, [0x2d2b] = 0xfdcd,
-+  [0x2d2c] = 0xfdce, [0x2d2d] = 0xfdcf, [0x2d2e] = 0xfdd0, [0x2d2f] = 0xfdd1,
-+  [0x2d30] = 0xfdd2, [0x2d31] = 0xfdd3, [0x2d32] = 0xfdd4, [0x2d33] = 0xfdd5,
-+  [0x2d34] = 0xfdd6, [0x2d35] = 0xfdd7, [0x2d36] = 0xfdd8, [0x2d37] = 0xfdd9,
-+  [0x2d38] = 0xfdda, [0x2d39] = 0xfddb, [0x2d3a] = 0xfddc, [0x2d3b] = 0xfddd,
-+  [0x2d3c] = 0xfdde, [0x2d3d] = 0xfddf, [0x2d3e] = 0xfde0, [0x2d3f] = 0xfde1,
-+  [0x2d40] = 0xfde2, [0x2d41] = 0xfde3, [0x2d42] = 0xfde4, [0x2d43] = 0xfde5,
-+  [0x2d44] = 0xfde6, [0x2d45] = 0xfde7, [0x2d46] = 0xfde8, [0x2d47] = 0xfde9,
-+  [0x2d48] = 0xfdea, [0x2d49] = 0xfdeb, [0x2d4a] = 0xfdec, [0x2d4b] = 0xfded,
-+  [0x2d4c] = 0xfdee, [0x2d4d] = 0xfdef, [0x2d4e] = 0xfdf0, [0x2d4f] = 0xfdf1,
-+  [0x2d50] = 0xfdf2, [0x2d51] = 0xfdf3, [0x2d52] = 0xfdf4, [0x2d53] = 0xfdf5,
-+  [0x2d54] = 0xfdf6, [0x2d55] = 0xfdf7, [0x2d56] = 0xfdf8, [0x2d57] = 0xfdf9,
-+  [0x2d58] = 0xfdfa, [0x2d59] = 0xfdfb, [0x2d5a] = 0xfdfc, [0x2d5b] = 0xfdfd,
-+  [0x2d5c] = 0xfdfe, [0x2d5d] = 0xfdff, [0x2d5e] = 0xfe00, [0x2d5f] = 0xfe01,
-+  [0x2d60] = 0xfe02, [0x2d61] = 0xfe03, [0x2d62] = 0xfe04, [0x2d63] = 0xfe05,
-+  [0x2d64] = 0xfe06, [0x2d65] = 0xfe07, [0x2d66] = 0xfe08, [0x2d67] = 0xfe09,
-+  [0x2d68] = 0xfe0a, [0x2d69] = 0xfe0b, [0x2d6a] = 0xfe0c, [0x2d6b] = 0xfe0d,
-+  [0x2d6c] = 0xfe0e, [0x2d6d] = 0xfe0f, [0x2d78] = 0xfe1a, [0x2d79] = 0xfe1b,
-+  [0x2d7a] = 0xfe1c, [0x2d7b] = 0xfe1d, [0x2d7c] = 0xfe1e, [0x2d7d] = 0xfe1f,
-+  [0x2d7e] = 0xfe20, [0x2d7f] = 0xfe21, [0x2d80] = 0xfe22, [0x2d81] = 0xfe23,
-+  [0x2d82] = 0xfe24, [0x2d83] = 0xfe25, [0x2d84] = 0xfe26, [0x2d85] = 0xfe27,
-+  [0x2d86] = 0xfe28, [0x2d87] = 0xfe29, [0x2d88] = 0xfe2a, [0x2d89] = 0xfe2b,
-+  [0x2d8a] = 0xfe2c, [0x2d8b] = 0xfe2d, [0x2d8c] = 0xfe2e, [0x2d8d] = 0xfe2f,
-+  [0x2d8e] = 0xfe32, [0x2d8f] = 0xfe45, [0x2d90] = 0xfe46, [0x2d91] = 0xfe47,
-+  [0x2d92] = 0xfe48, [0x2d93] = 0xfe53, [0x2d94] = 0xfe58, [0x2d95] = 0xfe67,
-+  [0x2d96] = 0xfe6c, [0x2d97] = 0xfe6d, [0x2d98] = 0xfe6e, [0x2d99] = 0xfe6f,
-+  [0x2d9a] = 0xfe70, [0x2d9b] = 0xfe71, [0x2d9c] = 0xfe72, [0x2d9d] = 0xfe73,
-+  [0x2d9e] = 0xfe74, [0x2d9f] = 0xfe75, [0x2da0] = 0xfe76, [0x2da1] = 0xfe77,
-+  [0x2da2] = 0xfe78, [0x2da3] = 0xfe79, [0x2da4] = 0xfe7a, [0x2da5] = 0xfe7b,
-+  [0x2da6] = 0xfe7c, [0x2da7] = 0xfe7d, [0x2da8] = 0xfe7e, [0x2da9] = 0xfe7f,
-+  [0x2daa] = 0xfe80, [0x2dab] = 0xfe81, [0x2dac] = 0xfe82, [0x2dad] = 0xfe83,
-+  [0x2dae] = 0xfe84, [0x2daf] = 0xfe85, [0x2db0] = 0xfe86, [0x2db1] = 0xfe87,
-+  [0x2db2] = 0xfe88, [0x2db3] = 0xfe89, [0x2db4] = 0xfe8a, [0x2db5] = 0xfe8b,
-+  [0x2db6] = 0xfe8c, [0x2db7] = 0xfe8d, [0x2db8] = 0xfe8e, [0x2db9] = 0xfe8f,
-+  [0x2dba] = 0xfe90, [0x2dbb] = 0xfe91, [0x2dbc] = 0xfe92, [0x2dbd] = 0xfe93,
-+  [0x2dbe] = 0xfe94, [0x2dbf] = 0xfe95, [0x2dc0] = 0xfe96, [0x2dc1] = 0xfe97,
-+  [0x2dc2] = 0xfe98, [0x2dc3] = 0xfe99, [0x2dc4] = 0xfe9a, [0x2dc5] = 0xfe9b,
-+  [0x2dc6] = 0xfe9c, [0x2dc7] = 0xfe9d, [0x2dc8] = 0xfe9e, [0x2dc9] = 0xfe9f,
-+  [0x2dca] = 0xfea0, [0x2dcb] = 0xfea1, [0x2dcc] = 0xfea2, [0x2dcd] = 0xfea3,
-+  [0x2dce] = 0xfea4, [0x2dcf] = 0xfea5, [0x2dd0] = 0xfea6, [0x2dd1] = 0xfea7,
-+  [0x2dd2] = 0xfea8, [0x2dd3] = 0xfea9, [0x2dd4] = 0xfeaa, [0x2dd5] = 0xfeab,
-+  [0x2dd6] = 0xfeac, [0x2dd7] = 0xfead, [0x2dd8] = 0xfeae, [0x2dd9] = 0xfeaf,
-+  [0x2dda] = 0xfeb0, [0x2ddb] = 0xfeb1, [0x2ddc] = 0xfeb2, [0x2ddd] = 0xfeb3,
-+  [0x2dde] = 0xfeb4, [0x2ddf] = 0xfeb5, [0x2de0] = 0xfeb6, [0x2de1] = 0xfeb7,
-+  [0x2de2] = 0xfeb8, [0x2de3] = 0xfeb9, [0x2de4] = 0xfeba, [0x2de5] = 0xfebb,
-+  [0x2de6] = 0xfebc, [0x2de7] = 0xfebd, [0x2de8] = 0xfebe, [0x2de9] = 0xfebf,
-+  [0x2dea] = 0xfec0, [0x2deb] = 0xfec1, [0x2dec] = 0xfec2, [0x2ded] = 0xfec3,
-+  [0x2dee] = 0xfec4, [0x2def] = 0xfec5, [0x2df0] = 0xfec6, [0x2df1] = 0xfec7,
-+  [0x2df2] = 0xfec8, [0x2df3] = 0xfec9, [0x2df4] = 0xfeca, [0x2df5] = 0xfecb,
-+  [0x2df6] = 0xfecc, [0x2df7] = 0xfecd, [0x2df8] = 0xfece, [0x2df9] = 0xfecf,
-+  [0x2dfa] = 0xfed0, [0x2dfb] = 0xfed1, [0x2dfc] = 0xfed2, [0x2dfd] = 0xfed3,
-+  [0x2dfe] = 0xfed4, [0x2dff] = 0xfed5, [0x2e00] = 0xfed6, [0x2e01] = 0xfed7,
-+  [0x2e02] = 0xfed8, [0x2e03] = 0xfed9, [0x2e04] = 0xfeda, [0x2e05] = 0xfedb,
-+  [0x2e06] = 0xfedc, [0x2e07] = 0xfedd, [0x2e08] = 0xfede, [0x2e09] = 0xfedf,
-+  [0x2e0a] = 0xfee0, [0x2e0b] = 0xfee1, [0x2e0c] = 0xfee2, [0x2e0d] = 0xfee3,
-+  [0x2e0e] = 0xfee4, [0x2e0f] = 0xfee5, [0x2e10] = 0xfee6, [0x2e11] = 0xfee7,
-+  [0x2e12] = 0xfee8, [0x2e13] = 0xfee9, [0x2e14] = 0xfeea, [0x2e15] = 0xfeeb,
-+  [0x2e16] = 0xfeec, [0x2e17] = 0xfeed, [0x2e18] = 0xfeee, [0x2e19] = 0xfeef,
-+  [0x2e1a] = 0xfef0, [0x2e1b] = 0xfef1, [0x2e1c] = 0xfef2, [0x2e1d] = 0xfef3,
-+  [0x2e1e] = 0xfef4, [0x2e1f] = 0xfef5, [0x2e20] = 0xfef6, [0x2e21] = 0xfef7,
-+  [0x2e22] = 0xfef8, [0x2e23] = 0xfef9, [0x2e24] = 0xfefa, [0x2e25] = 0xfefb,
-+  [0x2e26] = 0xfefc, [0x2e27] = 0xfefd, [0x2e28] = 0xfefe, [0x2e29] = 0xfeff,
-+  [0x2e2a] = 0xff00, [0x2e2b] = 0xff5f, [0x2e2c] = 0xff60, [0x2e2d] = 0xff61,
-+  [0x2e2e] = 0xff62, [0x2e2f] = 0xff63, [0x2e30] = 0xff64, [0x2e31] = 0xff65,
-+  [0x2e32] = 0xff66, [0x2e33] = 0xff67, [0x2e34] = 0xff68, [0x2e35] = 0xff69,
-+  [0x2e36] = 0xff6a, [0x2e37] = 0xff6b, [0x2e38] = 0xff6c, [0x2e39] = 0xff6d,
-+  [0x2e3a] = 0xff6e, [0x2e3b] = 0xff6f, [0x2e3c] = 0xff70, [0x2e3d] = 0xff71,
-+  [0x2e3e] = 0xff72, [0x2e3f] = 0xff73, [0x2e40] = 0xff74, [0x2e41] = 0xff75,
-+  [0x2e42] = 0xff76, [0x2e43] = 0xff77, [0x2e44] = 0xff78, [0x2e45] = 0xff79,
-+  [0x2e46] = 0xff7a, [0x2e47] = 0xff7b, [0x2e48] = 0xff7c, [0x2e49] = 0xff7d,
-+  [0x2e4a] = 0xff7e, [0x2e4b] = 0xff7f, [0x2e4c] = 0xff80, [0x2e4d] = 0xff81,
-+  [0x2e4e] = 0xff82, [0x2e4f] = 0xff83, [0x2e50] = 0xff84, [0x2e51] = 0xff85,
-+  [0x2e52] = 0xff86, [0x2e53] = 0xff87, [0x2e54] = 0xff88, [0x2e55] = 0xff89,
-+  [0x2e56] = 0xff8a, [0x2e57] = 0xff8b, [0x2e58] = 0xff8c, [0x2e59] = 0xff8d,
-+  [0x2e5a] = 0xff8e, [0x2e5b] = 0xff8f, [0x2e5c] = 0xff90, [0x2e5d] = 0xff91,
-+  [0x2e5e] = 0xff92, [0x2e5f] = 0xff93, [0x2e60] = 0xff94, [0x2e61] = 0xff95,
-+  [0x2e62] = 0xff96, [0x2e63] = 0xff97, [0x2e64] = 0xff98, [0x2e65] = 0xff99,
-+  [0x2e66] = 0xff9a, [0x2e67] = 0xff9b, [0x2e68] = 0xff9c, [0x2e69] = 0xff9d,
-+  [0x2e6a] = 0xff9e, [0x2e6b] = 0xff9f, [0x2e6c] = 0xffa0, [0x2e6d] = 0xffa1,
-+  [0x2e6e] = 0xffa2, [0x2e6f] = 0xffa3, [0x2e70] = 0xffa4, [0x2e71] = 0xffa5,
-+  [0x2e72] = 0xffa6, [0x2e73] = 0xffa7, [0x2e74] = 0xffa8, [0x2e75] = 0xffa9,
-+  [0x2e76] = 0xffaa, [0x2e77] = 0xffab, [0x2e78] = 0xffac, [0x2e79] = 0xffad,
-+  [0x2e7a] = 0xffae, [0x2e7b] = 0xffaf, [0x2e7c] = 0xffb0, [0x2e7d] = 0xffb1,
-+  [0x2e7e] = 0xffb2, [0x2e7f] = 0xffb3, [0x2e80] = 0xffb4, [0x2e81] = 0xffb5,
-+  [0x2e82] = 0xffb6, [0x2e83] = 0xffb7, [0x2e84] = 0xffb8, [0x2e85] = 0xffb9,
-+  [0x2e86] = 0xffba, [0x2e87] = 0xffbb, [0x2e88] = 0xffbc, [0x2e89] = 0xffbd,
-+  [0x2e8a] = 0xffbe, [0x2e8b] = 0xffbf, [0x2e8c] = 0xffc0, [0x2e8d] = 0xffc1,
-+  [0x2e8e] = 0xffc2, [0x2e8f] = 0xffc3, [0x2e90] = 0xffc4, [0x2e91] = 0xffc5,
-+  [0x2e92] = 0xffc6, [0x2e93] = 0xffc7, [0x2e94] = 0xffc8, [0x2e95] = 0xffc9,
-+  [0x2e96] = 0xffca, [0x2e97] = 0xffcb, [0x2e98] = 0xffcc, [0x2e99] = 0xffcd,
-+  [0x2e9a] = 0xffce, [0x2e9b] = 0xffcf, [0x2e9c] = 0xffd0, [0x2e9d] = 0xffd1,
-+  [0x2e9e] = 0xffd2, [0x2e9f] = 0xffd3, [0x2ea0] = 0xffd4, [0x2ea1] = 0xffd5,
-+  [0x2ea2] = 0xffd6, [0x2ea3] = 0xffd7, [0x2ea4] = 0xffd8, [0x2ea5] = 0xffd9,
-+  [0x2ea6] = 0xffda, [0x2ea7] = 0xffdb, [0x2ea8] = 0xffdc, [0x2ea9] = 0xffdd,
-+  [0x2eaa] = 0xffde, [0x2eab] = 0xffdf,
- };
- 
- /* Table for UCS-4 -> GB18030, for the range U+0080..U+9FBB.
-@@ -8068,107 +9409,2480 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x02ee] = "\x22\xc2", [0x02ef] = "\x22\xc3", [0x02f0] = "\x22\xc4",
-   [0x02f1] = "\x22\xc5", [0x02f2] = "\x22\xc6", [0x02f3] = "\x22\xc7",
-   [0x02f4] = "\x22\xc8", [0x02f5] = "\x22\xc9", [0x02f6] = "\x22\xca",
--  [0x02f7] = "\x22\xcb", [0x02fa] = "\x22\xce", [0x02fb] = "\x22\xcf",
--  [0x02fc] = "\x22\xd0", [0x02fd] = "\x22\xd1", [0x02fe] = "\x22\xd2",
--  [0x0304] = "\x22\xd8", [0x0305] = "\x22\xd9", [0x0306] = "\x22\xda",
--  [0x0307] = "\x22\xdb", [0x0308] = "\x22\xdc", [0x0309] = "\x22\xdd",
--  [0x030a] = "\x22\xde", [0x030c] = "\x22\xe0", [0x030e] = "\x22\xe2",
-+  [0x02f7] = "\x22\xcb", [0x02f8] = "\x22\xcc", [0x02f9] = "\x22\xcd",
-+  [0x02fa] = "\x22\xce", [0x02fb] = "\x22\xcf", [0x02fc] = "\x22\xd0",
-+  [0x02fd] = "\x22\xd1", [0x02fe] = "\x22\xd2", [0x02ff] = "\x22\xd3",
-+  [0x0300] = "\x22\xd4", [0x0301] = "\x22\xd5", [0x0302] = "\x22\xd6",
-+  [0x0303] = "\x22\xd7", [0x0304] = "\x22\xd8", [0x0305] = "\x22\xd9",
-+  [0x0306] = "\x22\xda", [0x0307] = "\x22\xdb", [0x0308] = "\x22\xdc",
-+  [0x0309] = "\x22\xdd", [0x030a] = "\x22\xde", [0x030b] = "\x22\xdf",
-+  [0x030c] = "\x22\xe0", [0x030d] = "\x22\xe1", [0x030e] = "\x22\xe2",
-   [0x030f] = "\x22\xe3", [0x0310] = "\x22\xe4", [0x0311] = "\xa6\xa1",
-   [0x0312] = "\xa6\xa2", [0x0313] = "\xa6\xa3", [0x0314] = "\xa6\xa4",
-   [0x0315] = "\xa6\xa5", [0x0316] = "\xa6\xa6", [0x0317] = "\xa6\xa7",
-   [0x0318] = "\xa6\xa8", [0x0319] = "\xa6\xa9", [0x031a] = "\xa6\xaa",
-   [0x031b] = "\xa6\xab", [0x031c] = "\xa6\xac", [0x031d] = "\xa6\xad",
-   [0x031e] = "\xa6\xae", [0x031f] = "\xa6\xaf", [0x0320] = "\xa6\xb0",
--  [0x0321] = "\xa6\xb1", [0x0323] = "\xa6\xb2", [0x0324] = "\xa6\xb3",
--  [0x0325] = "\xa6\xb4", [0x0326] = "\xa6\xb5", [0x0327] = "\xa6\xb6",
--  [0x0328] = "\xa6\xb7", [0x0329] = "\xa6\xb8", [0x032a] = "\x22\xe6",
--  [0x032b] = "\x22\xe7", [0x032c] = "\x22\xe8", [0x032d] = "\x22\xe9",
--  [0x032e] = "\x22\xea", [0x032f] = "\x22\xeb", [0x0330] = "\x22\xec",
--  [0x0331] = "\xa6\xc1", [0x0332] = "\xa6\xc2", [0x0333] = "\xa6\xc3",
--  [0x0334] = "\xa6\xc4", [0x0335] = "\xa6\xc5", [0x0336] = "\xa6\xc6",
--  [0x0337] = "\xa6\xc7", [0x0338] = "\xa6\xc8", [0x0339] = "\xa6\xc9",
--  [0x033a] = "\xa6\xca", [0x033b] = "\xa6\xcb", [0x033c] = "\xa6\xcc",
--  [0x033d] = "\xa6\xcd", [0x033e] = "\xa6\xce", [0x033f] = "\xa6\xcf",
--  [0x0340] = "\xa6\xd0", [0x0341] = "\xa6\xd1", [0x0342] = "\x22\xed",
--  [0x0343] = "\xa6\xd2", [0x0344] = "\xa6\xd3", [0x0345] = "\xa6\xd4",
--  [0x0346] = "\xa6\xd5", [0x0347] = "\xa6\xd6", [0x0348] = "\xa6\xd7",
--  [0x0349] = "\xa6\xd8", [0x034a] = "\x22\xee", [0x034b] = "\x22\xef",
--  [0x034c] = "\x22\xf0", [0x034d] = "\x22\xf1", [0x034e] = "\x22\xf2",
--  [0x0350] = "\x22\xf4", [0x0351] = "\x22\xf5", [0x0352] = "\x22\xf6",
--  [0x0353] = "\x22\xf7", [0x0354] = "\x22\xf8", [0x0355] = "\x22\xf9",
--  [0x0356] = "\x22\xfa", [0x0357] = "\x22\xfb", [0x0358] = "\x22\xfc",
--  [0x0359] = "\x22\xfd", [0x035a] = "\x22\xfe", [0x035b] = "\x22\xff",
--  [0x035c] = "\x23\x00", [0x035d] = "\x23\x01", [0x035e] = "\x23\x02",
--  [0x035f] = "\x23\x03", [0x0360] = "\x23\x04", [0x0361] = "\x23\x05",
--  [0x0362] = "\x23\x06", [0x0363] = "\x23\x07", [0x0364] = "\x23\x08",
--  [0x0365] = "\x23\x09", [0x0366] = "\x23\x0a", [0x0367] = "\x23\x0b",
--  [0x0368] = "\x23\x0c", [0x0369] = "\x23\x0d", [0x036a] = "\x23\x0e",
--  [0x036b] = "\x23\x0f", [0x036c] = "\x23\x10", [0x036d] = "\x23\x11",
--  [0x036e] = "\x23\x12", [0x036f] = "\x23\x13", [0x0370] = "\x23\x14",
--  [0x0371] = "\x23\x15", [0x0372] = "\x23\x16", [0x0373] = "\x23\x17",
--  [0x0374] = "\x23\x18", [0x0375] = "\x23\x19", [0x0376] = "\x23\x1a",
--  [0x0377] = "\x23\x1b", [0x0378] = "\x23\x1c", [0x0379] = "\x23\x1d",
--  [0x037a] = "\x23\x1e", [0x037b] = "\x23\x1f", [0x037c] = "\x23\x20",
--  [0x037d] = "\x23\x21", [0x037e] = "\x23\x22", [0x037f] = "\x23\x23",
--  [0x0380] = "\x23\x24", [0x0381] = "\xa7\xa7", [0x0382] = "\x23\x25",
--  [0x0383] = "\x23\x26", [0x0384] = "\x23\x27", [0x0385] = "\x23\x28",
--  [0x0386] = "\x23\x29", [0x0387] = "\x23\x2a", [0x0388] = "\x23\x2b",
--  [0x0389] = "\x23\x2c", [0x038a] = "\x23\x2d", [0x038b] = "\x23\x2e",
--  [0x038c] = "\x23\x2f", [0x038d] = "\x23\x30", [0x038e] = "\x23\x31",
--  [0x038f] = "\x23\x32", [0x0390] = "\xa7\xa1", [0x0391] = "\xa7\xa2",
--  [0x0392] = "\xa7\xa3", [0x0393] = "\xa7\xa4", [0x0394] = "\xa7\xa5",
--  [0x0395] = "\xa7\xa6", [0x0396] = "\xa7\xa8", [0x0397] = "\xa7\xa9",
--  [0x0398] = "\xa7\xaa", [0x0399] = "\xa7\xab", [0x039a] = "\xa7\xac",
--  [0x039b] = "\xa7\xad", [0x039c] = "\xa7\xae", [0x039d] = "\xa7\xaf",
--  [0x039e] = "\xa7\xb0", [0x039f] = "\xa7\xb1", [0x03a0] = "\xa7\xb2",
--  [0x03a1] = "\xa7\xb3", [0x03a2] = "\xa7\xb4", [0x03a3] = "\xa7\xb5",
--  [0x03a4] = "\xa7\xb6", [0x03a5] = "\xa7\xb7", [0x03a6] = "\xa7\xb8",
--  [0x03a7] = "\xa7\xb9", [0x03a8] = "\xa7\xba", [0x03a9] = "\xa7\xbb",
--  [0x03aa] = "\xa7\xbc", [0x03ab] = "\xa7\xbd", [0x03ac] = "\xa7\xbe",
--  [0x03ad] = "\xa7\xbf", [0x03ae] = "\xa7\xc0", [0x03af] = "\xa7\xc1",
--  [0x03b0] = "\xa7\xd1", [0x03b1] = "\xa7\xd2", [0x03b2] = "\xa7\xd3",
--  [0x03b3] = "\xa7\xd4", [0x03b4] = "\xa7\xd5", [0x03b5] = "\xa7\xd6",
--  [0x03b6] = "\xa7\xd8", [0x03b7] = "\xa7\xd9", [0x03b8] = "\xa7\xda",
--  [0x03b9] = "\xa7\xdb", [0x03ba] = "\xa7\xdc", [0x03bb] = "\xa7\xdd",
--  [0x03bc] = "\xa7\xde", [0x03bd] = "\xa7\xdf", [0x03be] = "\xa7\xe0",
--  [0x03bf] = "\xa7\xe1", [0x03c0] = "\xa7\xe2", [0x03c1] = "\xa7\xe3",
--  [0x03c2] = "\xa7\xe4", [0x03c3] = "\xa7\xe5", [0x03c4] = "\xa7\xe6",
--  [0x03c5] = "\xa7\xe7", [0x03c6] = "\xa7\xe8", [0x03c7] = "\xa7\xe9",
--  [0x03c8] = "\xa7\xea", [0x03c9] = "\xa7\xeb", [0x03ca] = "\xa7\xec",
--  [0x03cb] = "\xa7\xed", [0x03cc] = "\xa7\xee", [0x03cd] = "\xa7\xef",
--  [0x03ce] = "\xa7\xf0", [0x03cf] = "\xa7\xf1", [0x03d0] = "\x23\x33",
--  [0x03d1] = "\xa7\xd7", [0x1dbf] = "\xa8\xbc", [0x1f90] = "\xa9\x5c",
--  [0x1f91] = "\x3e\xf2", [0x1f92] = "\x3e\xf3", [0x1f93] = "\xa8\x43",
--  [0x1f94] = "\xa1\xaa", [0x1f95] = "\xa8\x44", [0x1f96] = "\xa1\xac",
--  [0x1f97] = "\x3e\xf4", [0x1f98] = "\xa1\xae", [0x1f99] = "\xa1\xaf",
--  [0x1f9a] = "\x3e\xf5", [0x1f9b] = "\x3e\xf6", [0x1f9c] = "\xa1\xb0",
--  [0x1f9d] = "\xa1\xb1", [0x1f9e] = "\x3e\xf7", [0x1f9f] = "\x3e\xf8",
--  [0x1fa0] = "\x3e\xf9", [0x1fa1] = "\x3e\xfa", [0x1fa2] = "\x3e\xfb",
--  [0x1fa3] = "\x3e\xfc", [0x1fa4] = "\x3e\xfd", [0x1fa5] = "\xa8\x45",
--  [0x1fa6] = "\xa1\xad", [0x1fa7] = "\x3e\xfe", [0x1fa8] = "\x3e\xff",
--  [0x1fa9] = "\x3f\x00", [0x1faa] = "\x3f\x01", [0x1fab] = "\x3f\x02",
--  [0x1fac] = "\x3f\x03", [0x1fad] = "\x3f\x04", [0x1fae] = "\x3f\x05",
--  [0x1faf] = "\x3f\x06", [0x1fb0] = "\xa1\xeb", [0x1fb1] = "\x3f\x07",
--  [0x1fb2] = "\xa1\xe4", [0x1fb3] = "\xa1\xe5", [0x1fb4] = "\x3f\x08",
--  [0x1fb5] = "\xa8\x46", [0x1fb6] = "\x3f\x09", [0x1fb7] = "\x3f\x0a",
--  [0x1fb8] = "\x3f\x0b", [0x1fb9] = "\x3f\x0c", [0x1fba] = "\x3f\x0d",
--  [0x1fbb] = "\xa1\xf9", [0x1fbc] = "\x3f\x0e", [0x1fbd] = "\x3f\x0f",
--  [0x1fbe] = "\x3f\x10", [0x1fbf] = "\x3f\x11", [0x1fc0] = "\x3f\x12",
--  [0x1fc1] = "\x3f\x13", [0x1fc2] = "\x3f\x14", [0x1fc3] = "\x3f\x15",
--  [0x1fc4] = "\x3f\x16", [0x1fc5] = "\x3f\x17", [0x1fc6] = "\x3f\x18",
--  [0x1fc7] = "\x3f\x19", [0x1fc8] = "\x3f\x1a", [0x1fc9] = "\x3f\x1b",
--  [0x1fca] = "\x3f\x1c", [0x1fcb] = "\x3f\x1d", [0x1fcc] = "\x3f\x1e",
--  [0x1fcd] = "\x3f\x1f", [0x1fce] = "\x3f\x20", [0x1fcf] = "\x3f\x21",
--  [0x1fd0] = "\x3f\x22", [0x1fd1] = "\x3f\x23", [0x1fd2] = "\x3f\x24",
--  [0x1fd3] = "\x3f\x25", [0x1fd4] = "\x3f\x26", [0x1fd5] = "\x3f\x27",
--  [0x1fd6] = "\x3f\x28", [0x1fd7] = "\x3f\x29", [0x1fd8] = "\x3f\x2a",
--  [0x1fd9] = "\x3f\x2b", [0x1fda] = "\x3f\x2c", [0x1fdb] = "\x3f\x2d",
--  [0x1fdc] = "\x3f\x2e", [0x1fdd] = "\x3f\x2f", [0x1fde] = "\x3f\x30",
--  [0x1fdf] = "\x3f\x31", [0x1fe0] = "\x3f\x32", [0x1fe1] = "\x3f\x33",
--  [0x1fe2] = "\x3f\x34", [0x1fe3] = "\x3f\x35", [0x1fe4] = "\x3f\x36",
--  [0x1fea] = "\x3f\x3c", [0x1feb] = "\x3f\x3d", [0x1fec] = "\x3f\x3e",
--  [0x1fed] = "\x3f\x3f", [0x1fee] = "\x3f\x40", [0x1fef] = "\x3f\x41",
--  [0x1ff0] = "\x3f\x42", [0x1ff1] = "\x3f\x43", [0x1ff4] = "\x3f\x46",
-+  [0x0321] = "\xa6\xb1", [0x0322] = "\x22\xe5", [0x0323] = "\xa6\xb2",
-+  [0x0324] = "\xa6\xb3", [0x0325] = "\xa6\xb4", [0x0326] = "\xa6\xb5",
-+  [0x0327] = "\xa6\xb6", [0x0328] = "\xa6\xb7", [0x0329] = "\xa6\xb8",
-+  [0x032a] = "\x22\xe6", [0x032b] = "\x22\xe7", [0x032c] = "\x22\xe8",
-+  [0x032d] = "\x22\xe9", [0x032e] = "\x22\xea", [0x032f] = "\x22\xeb",
-+  [0x0330] = "\x22\xec", [0x0331] = "\xa6\xc1", [0x0332] = "\xa6\xc2",
-+  [0x0333] = "\xa6\xc3", [0x0334] = "\xa6\xc4", [0x0335] = "\xa6\xc5",
-+  [0x0336] = "\xa6\xc6", [0x0337] = "\xa6\xc7", [0x0338] = "\xa6\xc8",
-+  [0x0339] = "\xa6\xc9", [0x033a] = "\xa6\xca", [0x033b] = "\xa6\xcb",
-+  [0x033c] = "\xa6\xcc", [0x033d] = "\xa6\xcd", [0x033e] = "\xa6\xce",
-+  [0x033f] = "\xa6\xcf", [0x0340] = "\xa6\xd0", [0x0341] = "\xa6\xd1",
-+  [0x0342] = "\x22\xed", [0x0343] = "\xa6\xd2", [0x0344] = "\xa6\xd3",
-+  [0x0345] = "\xa6\xd4", [0x0346] = "\xa6\xd5", [0x0347] = "\xa6\xd6",
-+  [0x0348] = "\xa6\xd7", [0x0349] = "\xa6\xd8", [0x034a] = "\x22\xee",
-+  [0x034b] = "\x22\xef", [0x034c] = "\x22\xf0", [0x034d] = "\x22\xf1",
-+  [0x034e] = "\x22\xf2", [0x034f] = "\x22\xf3", [0x0350] = "\x22\xf4",
-+  [0x0351] = "\x22\xf5", [0x0352] = "\x22\xf6", [0x0353] = "\x22\xf7",
-+  [0x0354] = "\x22\xf8", [0x0355] = "\x22\xf9", [0x0356] = "\x22\xfa",
-+  [0x0357] = "\x22\xfb", [0x0358] = "\x22\xfc", [0x0359] = "\x22\xfd",
-+  [0x035a] = "\x22\xfe", [0x035b] = "\x22\xff", [0x035c] = "\x23\x00",
-+  [0x035d] = "\x23\x01", [0x035e] = "\x23\x02", [0x035f] = "\x23\x03",
-+  [0x0360] = "\x23\x04", [0x0361] = "\x23\x05", [0x0362] = "\x23\x06",
-+  [0x0363] = "\x23\x07", [0x0364] = "\x23\x08", [0x0365] = "\x23\x09",
-+  [0x0366] = "\x23\x0a", [0x0367] = "\x23\x0b", [0x0368] = "\x23\x0c",
-+  [0x0369] = "\x23\x0d", [0x036a] = "\x23\x0e", [0x036b] = "\x23\x0f",
-+  [0x036c] = "\x23\x10", [0x036d] = "\x23\x11", [0x036e] = "\x23\x12",
-+  [0x036f] = "\x23\x13", [0x0370] = "\x23\x14", [0x0371] = "\x23\x15",
-+  [0x0372] = "\x23\x16", [0x0373] = "\x23\x17", [0x0374] = "\x23\x18",
-+  [0x0375] = "\x23\x19", [0x0376] = "\x23\x1a", [0x0377] = "\x23\x1b",
-+  [0x0378] = "\x23\x1c", [0x0379] = "\x23\x1d", [0x037a] = "\x23\x1e",
-+  [0x037b] = "\x23\x1f", [0x037c] = "\x23\x20", [0x037d] = "\x23\x21",
-+  [0x037e] = "\x23\x22", [0x037f] = "\x23\x23", [0x0380] = "\x23\x24",
-+  [0x0381] = "\xa7\xa7", [0x0382] = "\x23\x25", [0x0383] = "\x23\x26",
-+  [0x0384] = "\x23\x27", [0x0385] = "\x23\x28", [0x0386] = "\x23\x29",
-+  [0x0387] = "\x23\x2a", [0x0388] = "\x23\x2b", [0x0389] = "\x23\x2c",
-+  [0x038a] = "\x23\x2d", [0x038b] = "\x23\x2e", [0x038c] = "\x23\x2f",
-+  [0x038d] = "\x23\x30", [0x038e] = "\x23\x31", [0x038f] = "\x23\x32",
-+  [0x0390] = "\xa7\xa1", [0x0391] = "\xa7\xa2", [0x0392] = "\xa7\xa3",
-+  [0x0393] = "\xa7\xa4", [0x0394] = "\xa7\xa5", [0x0395] = "\xa7\xa6",
-+  [0x0396] = "\xa7\xa8", [0x0397] = "\xa7\xa9", [0x0398] = "\xa7\xaa",
-+  [0x0399] = "\xa7\xab", [0x039a] = "\xa7\xac", [0x039b] = "\xa7\xad",
-+  [0x039c] = "\xa7\xae", [0x039d] = "\xa7\xaf", [0x039e] = "\xa7\xb0",
-+  [0x039f] = "\xa7\xb1", [0x03a0] = "\xa7\xb2", [0x03a1] = "\xa7\xb3",
-+  [0x03a2] = "\xa7\xb4", [0x03a3] = "\xa7\xb5", [0x03a4] = "\xa7\xb6",
-+  [0x03a5] = "\xa7\xb7", [0x03a6] = "\xa7\xb8", [0x03a7] = "\xa7\xb9",
-+  [0x03a8] = "\xa7\xba", [0x03a9] = "\xa7\xbb", [0x03aa] = "\xa7\xbc",
-+  [0x03ab] = "\xa7\xbd", [0x03ac] = "\xa7\xbe", [0x03ad] = "\xa7\xbf",
-+  [0x03ae] = "\xa7\xc0", [0x03af] = "\xa7\xc1", [0x03b0] = "\xa7\xd1",
-+  [0x03b1] = "\xa7\xd2", [0x03b2] = "\xa7\xd3", [0x03b3] = "\xa7\xd4",
-+  [0x03b4] = "\xa7\xd5", [0x03b5] = "\xa7\xd6", [0x03b6] = "\xa7\xd8",
-+  [0x03b7] = "\xa7\xd9", [0x03b8] = "\xa7\xda", [0x03b9] = "\xa7\xdb",
-+  [0x03ba] = "\xa7\xdc", [0x03bb] = "\xa7\xdd", [0x03bc] = "\xa7\xde",
-+  [0x03bd] = "\xa7\xdf", [0x03be] = "\xa7\xe0", [0x03bf] = "\xa7\xe1",
-+  [0x03c0] = "\xa7\xe2", [0x03c1] = "\xa7\xe3", [0x03c2] = "\xa7\xe4",
-+  [0x03c3] = "\xa7\xe5", [0x03c4] = "\xa7\xe6", [0x03c5] = "\xa7\xe7",
-+  [0x03c6] = "\xa7\xe8", [0x03c7] = "\xa7\xe9", [0x03c8] = "\xa7\xea",
-+  [0x03c9] = "\xa7\xeb", [0x03ca] = "\xa7\xec", [0x03cb] = "\xa7\xed",
-+  [0x03cc] = "\xa7\xee", [0x03cd] = "\xa7\xef", [0x03ce] = "\xa7\xf0",
-+  [0x03cf] = "\xa7\xf1", [0x03d0] = "\x23\x33", [0x03d1] = "\xa7\xd7",
-+  [0x03d2] = "\x23\x34", [0x03d3] = "\x23\x35", [0x03d4] = "\x23\x36",
-+  [0x03d5] = "\x23\x37", [0x03d6] = "\x23\x38", [0x03d7] = "\x23\x39",
-+  [0x03d8] = "\x23\x3a", [0x03d9] = "\x23\x3b", [0x03da] = "\x23\x3c",
-+  [0x03db] = "\x23\x3d", [0x03dc] = "\x23\x3e", [0x03dd] = "\x23\x3f",
-+  [0x03de] = "\x23\x40", [0x03df] = "\x23\x41", [0x03e0] = "\x23\x42",
-+  [0x03e1] = "\x23\x43", [0x03e2] = "\x23\x44", [0x03e3] = "\x23\x45",
-+  [0x03e4] = "\x23\x46", [0x03e5] = "\x23\x47", [0x03e6] = "\x23\x48",
-+  [0x03e7] = "\x23\x49", [0x03e8] = "\x23\x4a", [0x03e9] = "\x23\x4b",
-+  [0x03ea] = "\x23\x4c", [0x03eb] = "\x23\x4d", [0x03ec] = "\x23\x4e",
-+  [0x03ed] = "\x23\x4f", [0x03ee] = "\x23\x50", [0x03ef] = "\x23\x51",
-+  [0x03f0] = "\x23\x52", [0x03f1] = "\x23\x53", [0x03f2] = "\x23\x54",
-+  [0x03f3] = "\x23\x55", [0x03f4] = "\x23\x56", [0x03f5] = "\x23\x57",
-+  [0x03f6] = "\x23\x58", [0x03f7] = "\x23\x59", [0x03f8] = "\x23\x5a",
-+  [0x03f9] = "\x23\x5b", [0x03fa] = "\x23\x5c", [0x03fb] = "\x23\x5d",
-+  [0x03fc] = "\x23\x5e", [0x03fd] = "\x23\x5f", [0x03fe] = "\x23\x60",
-+  [0x03ff] = "\x23\x61", [0x0400] = "\x23\x62", [0x0401] = "\x23\x63",
-+  [0x0402] = "\x23\x64", [0x0403] = "\x23\x65", [0x0404] = "\x23\x66",
-+  [0x0405] = "\x23\x67", [0x0406] = "\x23\x68", [0x0407] = "\x23\x69",
-+  [0x0408] = "\x23\x6a", [0x0409] = "\x23\x6b", [0x040a] = "\x23\x6c",
-+  [0x040b] = "\x23\x6d", [0x040c] = "\x23\x6e", [0x040d] = "\x23\x6f",
-+  [0x040e] = "\x23\x70", [0x040f] = "\x23\x71", [0x0410] = "\x23\x72",
-+  [0x0411] = "\x23\x73", [0x0412] = "\x23\x74", [0x0413] = "\x23\x75",
-+  [0x0414] = "\x23\x76", [0x0415] = "\x23\x77", [0x0416] = "\x23\x78",
-+  [0x0417] = "\x23\x79", [0x0418] = "\x23\x7a", [0x0419] = "\x23\x7b",
-+  [0x041a] = "\x23\x7c", [0x041b] = "\x23\x7d", [0x041c] = "\x23\x7e",
-+  [0x041d] = "\x23\x7f", [0x041e] = "\x23\x80", [0x041f] = "\x23\x81",
-+  [0x0420] = "\x23\x82", [0x0421] = "\x23\x83", [0x0422] = "\x23\x84",
-+  [0x0423] = "\x23\x85", [0x0424] = "\x23\x86", [0x0425] = "\x23\x87",
-+  [0x0426] = "\x23\x88", [0x0427] = "\x23\x89", [0x0428] = "\x23\x8a",
-+  [0x0429] = "\x23\x8b", [0x042a] = "\x23\x8c", [0x042b] = "\x23\x8d",
-+  [0x042c] = "\x23\x8e", [0x042d] = "\x23\x8f", [0x042e] = "\x23\x90",
-+  [0x042f] = "\x23\x91", [0x0430] = "\x23\x92", [0x0431] = "\x23\x93",
-+  [0x0432] = "\x23\x94", [0x0433] = "\x23\x95", [0x0434] = "\x23\x96",
-+  [0x0435] = "\x23\x97", [0x0436] = "\x23\x98", [0x0437] = "\x23\x99",
-+  [0x0438] = "\x23\x9a", [0x0439] = "\x23\x9b", [0x043a] = "\x23\x9c",
-+  [0x043b] = "\x23\x9d", [0x043c] = "\x23\x9e", [0x043d] = "\x23\x9f",
-+  [0x043e] = "\x23\xa0", [0x043f] = "\x23\xa1", [0x0440] = "\x23\xa2",
-+  [0x0441] = "\x23\xa3", [0x0442] = "\x23\xa4", [0x0443] = "\x23\xa5",
-+  [0x0444] = "\x23\xa6", [0x0445] = "\x23\xa7", [0x0446] = "\x23\xa8",
-+  [0x0447] = "\x23\xa9", [0x0448] = "\x23\xaa", [0x0449] = "\x23\xab",
-+  [0x044a] = "\x23\xac", [0x044b] = "\x23\xad", [0x044c] = "\x23\xae",
-+  [0x044d] = "\x23\xaf", [0x044e] = "\x23\xb0", [0x044f] = "\x23\xb1",
-+  [0x0450] = "\x23\xb2", [0x0451] = "\x23\xb3", [0x0452] = "\x23\xb4",
-+  [0x0453] = "\x23\xb5", [0x0454] = "\x23\xb6", [0x0455] = "\x23\xb7",
-+  [0x0456] = "\x23\xb8", [0x0457] = "\x23\xb9", [0x0458] = "\x23\xba",
-+  [0x0459] = "\x23\xbb", [0x045a] = "\x23\xbc", [0x045b] = "\x23\xbd",
-+  [0x045c] = "\x23\xbe", [0x045d] = "\x23\xbf", [0x045e] = "\x23\xc0",
-+  [0x045f] = "\x23\xc1", [0x0460] = "\x23\xc2", [0x0461] = "\x23\xc3",
-+  [0x0462] = "\x23\xc4", [0x0463] = "\x23\xc5", [0x0464] = "\x23\xc6",
-+  [0x0465] = "\x23\xc7", [0x0466] = "\x23\xc8", [0x0467] = "\x23\xc9",
-+  [0x0468] = "\x23\xca", [0x0469] = "\x23\xcb", [0x046a] = "\x23\xcc",
-+  [0x046b] = "\x23\xcd", [0x046c] = "\x23\xce", [0x046d] = "\x23\xcf",
-+  [0x046e] = "\x23\xd0", [0x046f] = "\x23\xd1", [0x0470] = "\x23\xd2",
-+  [0x0471] = "\x23\xd3", [0x0472] = "\x23\xd4", [0x0473] = "\x23\xd5",
-+  [0x0474] = "\x23\xd6", [0x0475] = "\x23\xd7", [0x0476] = "\x23\xd8",
-+  [0x0477] = "\x23\xd9", [0x0478] = "\x23\xda", [0x0479] = "\x23\xdb",
-+  [0x047a] = "\x23\xdc", [0x047b] = "\x23\xdd", [0x047c] = "\x23\xde",
-+  [0x047d] = "\x23\xdf", [0x047e] = "\x23\xe0", [0x047f] = "\x23\xe1",
-+  [0x0480] = "\x23\xe2", [0x0481] = "\x23\xe3", [0x0482] = "\x23\xe4",
-+  [0x0483] = "\x23\xe5", [0x0484] = "\x23\xe6", [0x0485] = "\x23\xe7",
-+  [0x0486] = "\x23\xe8", [0x0487] = "\x23\xe9", [0x0488] = "\x23\xea",
-+  [0x0489] = "\x23\xeb", [0x048a] = "\x23\xec", [0x048b] = "\x23\xed",
-+  [0x048c] = "\x23\xee", [0x048d] = "\x23\xef", [0x048e] = "\x23\xf0",
-+  [0x048f] = "\x23\xf1", [0x0490] = "\x23\xf2", [0x0491] = "\x23\xf3",
-+  [0x0492] = "\x23\xf4", [0x0493] = "\x23\xf5", [0x0494] = "\x23\xf6",
-+  [0x0495] = "\x23\xf7", [0x0496] = "\x23\xf8", [0x0497] = "\x23\xf9",
-+  [0x0498] = "\x23\xfa", [0x0499] = "\x23\xfb", [0x049a] = "\x23\xfc",
-+  [0x049b] = "\x23\xfd", [0x049c] = "\x23\xfe", [0x049d] = "\x23\xff",
-+  [0x049e] = "\x24\x00", [0x049f] = "\x24\x01", [0x04a0] = "\x24\x02",
-+  [0x04a1] = "\x24\x03", [0x04a2] = "\x24\x04", [0x04a3] = "\x24\x05",
-+  [0x04a4] = "\x24\x06", [0x04a5] = "\x24\x07", [0x04a6] = "\x24\x08",
-+  [0x04a7] = "\x24\x09", [0x04a8] = "\x24\x0a", [0x04a9] = "\x24\x0b",
-+  [0x04aa] = "\x24\x0c", [0x04ab] = "\x24\x0d", [0x04ac] = "\x24\x0e",
-+  [0x04ad] = "\x24\x0f", [0x04ae] = "\x24\x10", [0x04af] = "\x24\x11",
-+  [0x04b0] = "\x24\x12", [0x04b1] = "\x24\x13", [0x04b2] = "\x24\x14",
-+  [0x04b3] = "\x24\x15", [0x04b4] = "\x24\x16", [0x04b5] = "\x24\x17",
-+  [0x04b6] = "\x24\x18", [0x04b7] = "\x24\x19", [0x04b8] = "\x24\x1a",
-+  [0x04b9] = "\x24\x1b", [0x04ba] = "\x24\x1c", [0x04bb] = "\x24\x1d",
-+  [0x04bc] = "\x24\x1e", [0x04bd] = "\x24\x1f", [0x04be] = "\x24\x20",
-+  [0x04bf] = "\x24\x21", [0x04c0] = "\x24\x22", [0x04c1] = "\x24\x23",
-+  [0x04c2] = "\x24\x24", [0x04c3] = "\x24\x25", [0x04c4] = "\x24\x26",
-+  [0x04c5] = "\x24\x27", [0x04c6] = "\x24\x28", [0x04c7] = "\x24\x29",
-+  [0x04c8] = "\x24\x2a", [0x04c9] = "\x24\x2b", [0x04ca] = "\x24\x2c",
-+  [0x04cb] = "\x24\x2d", [0x04cc] = "\x24\x2e", [0x04cd] = "\x24\x2f",
-+  [0x04ce] = "\x24\x30", [0x04cf] = "\x24\x31", [0x04d0] = "\x24\x32",
-+  [0x04d1] = "\x24\x33", [0x04d2] = "\x24\x34", [0x04d3] = "\x24\x35",
-+  [0x04d4] = "\x24\x36", [0x04d5] = "\x24\x37", [0x04d6] = "\x24\x38",
-+  [0x04d7] = "\x24\x39", [0x04d8] = "\x24\x3a", [0x04d9] = "\x24\x3b",
-+  [0x04da] = "\x24\x3c", [0x04db] = "\x24\x3d", [0x04dc] = "\x24\x3e",
-+  [0x04dd] = "\x24\x3f", [0x04de] = "\x24\x40", [0x04df] = "\x24\x41",
-+  [0x04e0] = "\x24\x42", [0x04e1] = "\x24\x43", [0x04e2] = "\x24\x44",
-+  [0x04e3] = "\x24\x45", [0x04e4] = "\x24\x46", [0x04e5] = "\x24\x47",
-+  [0x04e6] = "\x24\x48", [0x04e7] = "\x24\x49", [0x04e8] = "\x24\x4a",
-+  [0x04e9] = "\x24\x4b", [0x04ea] = "\x24\x4c", [0x04eb] = "\x24\x4d",
-+  [0x04ec] = "\x24\x4e", [0x04ed] = "\x24\x4f", [0x04ee] = "\x24\x50",
-+  [0x04ef] = "\x24\x51", [0x04f0] = "\x24\x52", [0x04f1] = "\x24\x53",
-+  [0x04f2] = "\x24\x54", [0x04f3] = "\x24\x55", [0x04f4] = "\x24\x56",
-+  [0x04f5] = "\x24\x57", [0x04f6] = "\x24\x58", [0x04f7] = "\x24\x59",
-+  [0x04f8] = "\x24\x5a", [0x04f9] = "\x24\x5b", [0x04fa] = "\x24\x5c",
-+  [0x04fb] = "\x24\x5d", [0x04fc] = "\x24\x5e", [0x04fd] = "\x24\x5f",
-+  [0x04fe] = "\x24\x60", [0x04ff] = "\x24\x61", [0x0500] = "\x24\x62",
-+  [0x0501] = "\x24\x63", [0x0502] = "\x24\x64", [0x0503] = "\x24\x65",
-+  [0x0504] = "\x24\x66", [0x0505] = "\x24\x67", [0x0506] = "\x24\x68",
-+  [0x0507] = "\x24\x69", [0x0508] = "\x24\x6a", [0x0509] = "\x24\x6b",
-+  [0x050a] = "\x24\x6c", [0x050b] = "\x24\x6d", [0x050c] = "\x24\x6e",
-+  [0x050d] = "\x24\x6f", [0x050e] = "\x24\x70", [0x050f] = "\x24\x71",
-+  [0x0510] = "\x24\x72", [0x0511] = "\x24\x73", [0x0512] = "\x24\x74",
-+  [0x0513] = "\x24\x75", [0x0514] = "\x24\x76", [0x0515] = "\x24\x77",
-+  [0x0516] = "\x24\x78", [0x0517] = "\x24\x79", [0x0518] = "\x24\x7a",
-+  [0x0519] = "\x24\x7b", [0x051a] = "\x24\x7c", [0x051b] = "\x24\x7d",
-+  [0x051c] = "\x24\x7e", [0x051d] = "\x24\x7f", [0x051e] = "\x24\x80",
-+  [0x051f] = "\x24\x81", [0x0520] = "\x24\x82", [0x0521] = "\x24\x83",
-+  [0x0522] = "\x24\x84", [0x0523] = "\x24\x85", [0x0524] = "\x24\x86",
-+  [0x0525] = "\x24\x87", [0x0526] = "\x24\x88", [0x0527] = "\x24\x89",
-+  [0x0528] = "\x24\x8a", [0x0529] = "\x24\x8b", [0x052a] = "\x24\x8c",
-+  [0x052b] = "\x24\x8d", [0x052c] = "\x24\x8e", [0x052d] = "\x24\x8f",
-+  [0x052e] = "\x24\x90", [0x052f] = "\x24\x91", [0x0530] = "\x24\x92",
-+  [0x0531] = "\x24\x93", [0x0532] = "\x24\x94", [0x0533] = "\x24\x95",
-+  [0x0534] = "\x24\x96", [0x0535] = "\x24\x97", [0x0536] = "\x24\x98",
-+  [0x0537] = "\x24\x99", [0x0538] = "\x24\x9a", [0x0539] = "\x24\x9b",
-+  [0x053a] = "\x24\x9c", [0x053b] = "\x24\x9d", [0x053c] = "\x24\x9e",
-+  [0x053d] = "\x24\x9f", [0x053e] = "\x24\xa0", [0x053f] = "\x24\xa1",
-+  [0x0540] = "\x24\xa2", [0x0541] = "\x24\xa3", [0x0542] = "\x24\xa4",
-+  [0x0543] = "\x24\xa5", [0x0544] = "\x24\xa6", [0x0545] = "\x24\xa7",
-+  [0x0546] = "\x24\xa8", [0x0547] = "\x24\xa9", [0x0548] = "\x24\xaa",
-+  [0x0549] = "\x24\xab", [0x054a] = "\x24\xac", [0x054b] = "\x24\xad",
-+  [0x054c] = "\x24\xae", [0x054d] = "\x24\xaf", [0x054e] = "\x24\xb0",
-+  [0x054f] = "\x24\xb1", [0x0550] = "\x24\xb2", [0x0551] = "\x24\xb3",
-+  [0x0552] = "\x24\xb4", [0x0553] = "\x24\xb5", [0x0554] = "\x24\xb6",
-+  [0x0555] = "\x24\xb7", [0x0556] = "\x24\xb8", [0x0557] = "\x24\xb9",
-+  [0x0558] = "\x24\xba", [0x0559] = "\x24\xbb", [0x055a] = "\x24\xbc",
-+  [0x055b] = "\x24\xbd", [0x055c] = "\x24\xbe", [0x055d] = "\x24\xbf",
-+  [0x055e] = "\x24\xc0", [0x055f] = "\x24\xc1", [0x0560] = "\x24\xc2",
-+  [0x0561] = "\x24\xc3", [0x0562] = "\x24\xc4", [0x0563] = "\x24\xc5",
-+  [0x0564] = "\x24\xc6", [0x0565] = "\x24\xc7", [0x0566] = "\x24\xc8",
-+  [0x0567] = "\x24\xc9", [0x0568] = "\x24\xca", [0x0569] = "\x24\xcb",
-+  [0x056a] = "\x24\xcc", [0x056b] = "\x24\xcd", [0x056c] = "\x24\xce",
-+  [0x056d] = "\x24\xcf", [0x056e] = "\x24\xd0", [0x056f] = "\x24\xd1",
-+  [0x0570] = "\x24\xd2", [0x0571] = "\x24\xd3", [0x0572] = "\x24\xd4",
-+  [0x0573] = "\x24\xd5", [0x0574] = "\x24\xd6", [0x0575] = "\x24\xd7",
-+  [0x0576] = "\x24\xd8", [0x0577] = "\x24\xd9", [0x0578] = "\x24\xda",
-+  [0x0579] = "\x24\xdb", [0x057a] = "\x24\xdc", [0x057b] = "\x24\xdd",
-+  [0x057c] = "\x24\xde", [0x057d] = "\x24\xdf", [0x057e] = "\x24\xe0",
-+  [0x057f] = "\x24\xe1", [0x0580] = "\x24\xe2", [0x0581] = "\x24\xe3",
-+  [0x0582] = "\x24\xe4", [0x0583] = "\x24\xe5", [0x0584] = "\x24\xe6",
-+  [0x0585] = "\x24\xe7", [0x0586] = "\x24\xe8", [0x0587] = "\x24\xe9",
-+  [0x0588] = "\x24\xea", [0x0589] = "\x24\xeb", [0x058a] = "\x24\xec",
-+  [0x058b] = "\x24\xed", [0x058c] = "\x24\xee", [0x058d] = "\x24\xef",
-+  [0x058e] = "\x24\xf0", [0x058f] = "\x24\xf1", [0x0590] = "\x24\xf2",
-+  [0x0591] = "\x24\xf3", [0x0592] = "\x24\xf4", [0x0593] = "\x24\xf5",
-+  [0x0594] = "\x24\xf6", [0x0595] = "\x24\xf7", [0x0596] = "\x24\xf8",
-+  [0x0597] = "\x24\xf9", [0x0598] = "\x24\xfa", [0x0599] = "\x24\xfb",
-+  [0x059a] = "\x24\xfc", [0x059b] = "\x24\xfd", [0x059c] = "\x24\xfe",
-+  [0x059d] = "\x24\xff", [0x059e] = "\x25\x00", [0x059f] = "\x25\x01",
-+  [0x05a0] = "\x25\x02", [0x05a1] = "\x25\x03", [0x05a2] = "\x25\x04",
-+  [0x05a3] = "\x25\x05", [0x05a4] = "\x25\x06", [0x05a5] = "\x25\x07",
-+  [0x05a6] = "\x25\x08", [0x05a7] = "\x25\x09", [0x05a8] = "\x25\x0a",
-+  [0x05a9] = "\x25\x0b", [0x05aa] = "\x25\x0c", [0x05ab] = "\x25\x0d",
-+  [0x05ac] = "\x25\x0e", [0x05ad] = "\x25\x0f", [0x05ae] = "\x25\x10",
-+  [0x05af] = "\x25\x11", [0x05b0] = "\x25\x12", [0x05b1] = "\x25\x13",
-+  [0x05b2] = "\x25\x14", [0x05b3] = "\x25\x15", [0x05b4] = "\x25\x16",
-+  [0x05b5] = "\x25\x17", [0x05b6] = "\x25\x18", [0x05b7] = "\x25\x19",
-+  [0x05b8] = "\x25\x1a", [0x05b9] = "\x25\x1b", [0x05ba] = "\x25\x1c",
-+  [0x05bb] = "\x25\x1d", [0x05bc] = "\x25\x1e", [0x05bd] = "\x25\x1f",
-+  [0x05be] = "\x25\x20", [0x05bf] = "\x25\x21", [0x05c0] = "\x25\x22",
-+  [0x05c1] = "\x25\x23", [0x05c2] = "\x25\x24", [0x05c3] = "\x25\x25",
-+  [0x05c4] = "\x25\x26", [0x05c5] = "\x25\x27", [0x05c6] = "\x25\x28",
-+  [0x05c7] = "\x25\x29", [0x05c8] = "\x25\x2a", [0x05c9] = "\x25\x2b",
-+  [0x05ca] = "\x25\x2c", [0x05cb] = "\x25\x2d", [0x05cc] = "\x25\x2e",
-+  [0x05cd] = "\x25\x2f", [0x05ce] = "\x25\x30", [0x05cf] = "\x25\x31",
-+  [0x05d0] = "\x25\x32", [0x05d1] = "\x25\x33", [0x05d2] = "\x25\x34",
-+  [0x05d3] = "\x25\x35", [0x05d4] = "\x25\x36", [0x05d5] = "\x25\x37",
-+  [0x05d6] = "\x25\x38", [0x05d7] = "\x25\x39", [0x05d8] = "\x25\x3a",
-+  [0x05d9] = "\x25\x3b", [0x05da] = "\x25\x3c", [0x05db] = "\x25\x3d",
-+  [0x05dc] = "\x25\x3e", [0x05dd] = "\x25\x3f", [0x05de] = "\x25\x40",
-+  [0x05df] = "\x25\x41", [0x05e0] = "\x25\x42", [0x05e1] = "\x25\x43",
-+  [0x05e2] = "\x25\x44", [0x05e3] = "\x25\x45", [0x05e4] = "\x25\x46",
-+  [0x05e5] = "\x25\x47", [0x05e6] = "\x25\x48", [0x05e7] = "\x25\x49",
-+  [0x05e8] = "\x25\x4a", [0x05e9] = "\x25\x4b", [0x05ea] = "\x25\x4c",
-+  [0x05eb] = "\x25\x4d", [0x05ec] = "\x25\x4e", [0x05ed] = "\x25\x4f",
-+  [0x05ee] = "\x25\x50", [0x05ef] = "\x25\x51", [0x05f0] = "\x25\x52",
-+  [0x05f1] = "\x25\x53", [0x05f2] = "\x25\x54", [0x05f3] = "\x25\x55",
-+  [0x05f4] = "\x25\x56", [0x05f5] = "\x25\x57", [0x05f6] = "\x25\x58",
-+  [0x05f7] = "\x25\x59", [0x05f8] = "\x25\x5a", [0x05f9] = "\x25\x5b",
-+  [0x05fa] = "\x25\x5c", [0x05fb] = "\x25\x5d", [0x05fc] = "\x25\x5e",
-+  [0x05fd] = "\x25\x5f", [0x05fe] = "\x25\x60", [0x05ff] = "\x25\x61",
-+  [0x0600] = "\x25\x62", [0x0601] = "\x25\x63", [0x0602] = "\x25\x64",
-+  [0x0603] = "\x25\x65", [0x0604] = "\x25\x66", [0x0605] = "\x25\x67",
-+  [0x0606] = "\x25\x68", [0x0607] = "\x25\x69", [0x0608] = "\x25\x6a",
-+  [0x0609] = "\x25\x6b", [0x060a] = "\x25\x6c", [0x060b] = "\x25\x6d",
-+  [0x060c] = "\x25\x6e", [0x060d] = "\x25\x6f", [0x060e] = "\x25\x70",
-+  [0x060f] = "\x25\x71", [0x0610] = "\x25\x72", [0x0611] = "\x25\x73",
-+  [0x0612] = "\x25\x74", [0x0613] = "\x25\x75", [0x0614] = "\x25\x76",
-+  [0x0615] = "\x25\x77", [0x0616] = "\x25\x78", [0x0617] = "\x25\x79",
-+  [0x0618] = "\x25\x7a", [0x0619] = "\x25\x7b", [0x061a] = "\x25\x7c",
-+  [0x061b] = "\x25\x7d", [0x061c] = "\x25\x7e", [0x061d] = "\x25\x7f",
-+  [0x061e] = "\x25\x80", [0x061f] = "\x25\x81", [0x0620] = "\x25\x82",
-+  [0x0621] = "\x25\x83", [0x0622] = "\x25\x84", [0x0623] = "\x25\x85",
-+  [0x0624] = "\x25\x86", [0x0625] = "\x25\x87", [0x0626] = "\x25\x88",
-+  [0x0627] = "\x25\x89", [0x0628] = "\x25\x8a", [0x0629] = "\x25\x8b",
-+  [0x062a] = "\x25\x8c", [0x062b] = "\x25\x8d", [0x062c] = "\x25\x8e",
-+  [0x062d] = "\x25\x8f", [0x062e] = "\x25\x90", [0x062f] = "\x25\x91",
-+  [0x0630] = "\x25\x92", [0x0631] = "\x25\x93", [0x0632] = "\x25\x94",
-+  [0x0633] = "\x25\x95", [0x0634] = "\x25\x96", [0x0635] = "\x25\x97",
-+  [0x0636] = "\x25\x98", [0x0637] = "\x25\x99", [0x0638] = "\x25\x9a",
-+  [0x0639] = "\x25\x9b", [0x063a] = "\x25\x9c", [0x063b] = "\x25\x9d",
-+  [0x063c] = "\x25\x9e", [0x063d] = "\x25\x9f", [0x063e] = "\x25\xa0",
-+  [0x063f] = "\x25\xa1", [0x0640] = "\x25\xa2", [0x0641] = "\x25\xa3",
-+  [0x0642] = "\x25\xa4", [0x0643] = "\x25\xa5", [0x0644] = "\x25\xa6",
-+  [0x0645] = "\x25\xa7", [0x0646] = "\x25\xa8", [0x0647] = "\x25\xa9",
-+  [0x0648] = "\x25\xaa", [0x0649] = "\x25\xab", [0x064a] = "\x25\xac",
-+  [0x064b] = "\x25\xad", [0x064c] = "\x25\xae", [0x064d] = "\x25\xaf",
-+  [0x064e] = "\x25\xb0", [0x064f] = "\x25\xb1", [0x0650] = "\x25\xb2",
-+  [0x0651] = "\x25\xb3", [0x0652] = "\x25\xb4", [0x0653] = "\x25\xb5",
-+  [0x0654] = "\x25\xb6", [0x0655] = "\x25\xb7", [0x0656] = "\x25\xb8",
-+  [0x0657] = "\x25\xb9", [0x0658] = "\x25\xba", [0x0659] = "\x25\xbb",
-+  [0x065a] = "\x25\xbc", [0x065b] = "\x25\xbd", [0x065c] = "\x25\xbe",
-+  [0x065d] = "\x25\xbf", [0x065e] = "\x25\xc0", [0x065f] = "\x25\xc1",
-+  [0x0660] = "\x25\xc2", [0x0661] = "\x25\xc3", [0x0662] = "\x25\xc4",
-+  [0x0663] = "\x25\xc5", [0x0664] = "\x25\xc6", [0x0665] = "\x25\xc7",
-+  [0x0666] = "\x25\xc8", [0x0667] = "\x25\xc9", [0x0668] = "\x25\xca",
-+  [0x0669] = "\x25\xcb", [0x066a] = "\x25\xcc", [0x066b] = "\x25\xcd",
-+  [0x066c] = "\x25\xce", [0x066d] = "\x25\xcf", [0x066e] = "\x25\xd0",
-+  [0x066f] = "\x25\xd1", [0x0670] = "\x25\xd2", [0x0671] = "\x25\xd3",
-+  [0x0672] = "\x25\xd4", [0x0673] = "\x25\xd5", [0x0674] = "\x25\xd6",
-+  [0x0675] = "\x25\xd7", [0x0676] = "\x25\xd8", [0x0677] = "\x25\xd9",
-+  [0x0678] = "\x25\xda", [0x0679] = "\x25\xdb", [0x067a] = "\x25\xdc",
-+  [0x067b] = "\x25\xdd", [0x067c] = "\x25\xde", [0x067d] = "\x25\xdf",
-+  [0x067e] = "\x25\xe0", [0x067f] = "\x25\xe1", [0x0680] = "\x25\xe2",
-+  [0x0681] = "\x25\xe3", [0x0682] = "\x25\xe4", [0x0683] = "\x25\xe5",
-+  [0x0684] = "\x25\xe6", [0x0685] = "\x25\xe7", [0x0686] = "\x25\xe8",
-+  [0x0687] = "\x25\xe9", [0x0688] = "\x25\xea", [0x0689] = "\x25\xeb",
-+  [0x068a] = "\x25\xec", [0x068b] = "\x25\xed", [0x068c] = "\x25\xee",
-+  [0x068d] = "\x25\xef", [0x068e] = "\x25\xf0", [0x068f] = "\x25\xf1",
-+  [0x0690] = "\x25\xf2", [0x0691] = "\x25\xf3", [0x0692] = "\x25\xf4",
-+  [0x0693] = "\x25\xf5", [0x0694] = "\x25\xf6", [0x0695] = "\x25\xf7",
-+  [0x0696] = "\x25\xf8", [0x0697] = "\x25\xf9", [0x0698] = "\x25\xfa",
-+  [0x0699] = "\x25\xfb", [0x069a] = "\x25\xfc", [0x069b] = "\x25\xfd",
-+  [0x069c] = "\x25\xfe", [0x069d] = "\x25\xff", [0x069e] = "\x26\x00",
-+  [0x069f] = "\x26\x01", [0x06a0] = "\x26\x02", [0x06a1] = "\x26\x03",
-+  [0x06a2] = "\x26\x04", [0x06a3] = "\x26\x05", [0x06a4] = "\x26\x06",
-+  [0x06a5] = "\x26\x07", [0x06a6] = "\x26\x08", [0x06a7] = "\x26\x09",
-+  [0x06a8] = "\x26\x0a", [0x06a9] = "\x26\x0b", [0x06aa] = "\x26\x0c",
-+  [0x06ab] = "\x26\x0d", [0x06ac] = "\x26\x0e", [0x06ad] = "\x26\x0f",
-+  [0x06ae] = "\x26\x10", [0x06af] = "\x26\x11", [0x06b0] = "\x26\x12",
-+  [0x06b1] = "\x26\x13", [0x06b2] = "\x26\x14", [0x06b3] = "\x26\x15",
-+  [0x06b4] = "\x26\x16", [0x06b5] = "\x26\x17", [0x06b6] = "\x26\x18",
-+  [0x06b7] = "\x26\x19", [0x06b8] = "\x26\x1a", [0x06b9] = "\x26\x1b",
-+  [0x06ba] = "\x26\x1c", [0x06bb] = "\x26\x1d", [0x06bc] = "\x26\x1e",
-+  [0x06bd] = "\x26\x1f", [0x06be] = "\x26\x20", [0x06bf] = "\x26\x21",
-+  [0x06c0] = "\x26\x22", [0x06c1] = "\x26\x23", [0x06c2] = "\x26\x24",
-+  [0x06c3] = "\x26\x25", [0x06c4] = "\x26\x26", [0x06c5] = "\x26\x27",
-+  [0x06c6] = "\x26\x28", [0x06c7] = "\x26\x29", [0x06c8] = "\x26\x2a",
-+  [0x06c9] = "\x26\x2b", [0x06ca] = "\x26\x2c", [0x06cb] = "\x26\x2d",
-+  [0x06cc] = "\x26\x2e", [0x06cd] = "\x26\x2f", [0x06ce] = "\x26\x30",
-+  [0x06cf] = "\x26\x31", [0x06d0] = "\x26\x32", [0x06d1] = "\x26\x33",
-+  [0x06d2] = "\x26\x34", [0x06d3] = "\x26\x35", [0x06d4] = "\x26\x36",
-+  [0x06d5] = "\x26\x37", [0x06d6] = "\x26\x38", [0x06d7] = "\x26\x39",
-+  [0x06d8] = "\x26\x3a", [0x06d9] = "\x26\x3b", [0x06da] = "\x26\x3c",
-+  [0x06db] = "\x26\x3d", [0x06dc] = "\x26\x3e", [0x06dd] = "\x26\x3f",
-+  [0x06de] = "\x26\x40", [0x06df] = "\x26\x41", [0x06e0] = "\x26\x42",
-+  [0x06e1] = "\x26\x43", [0x06e2] = "\x26\x44", [0x06e3] = "\x26\x45",
-+  [0x06e4] = "\x26\x46", [0x06e5] = "\x26\x47", [0x06e6] = "\x26\x48",
-+  [0x06e7] = "\x26\x49", [0x06e8] = "\x26\x4a", [0x06e9] = "\x26\x4b",
-+  [0x06ea] = "\x26\x4c", [0x06eb] = "\x26\x4d", [0x06ec] = "\x26\x4e",
-+  [0x06ed] = "\x26\x4f", [0x06ee] = "\x26\x50", [0x06ef] = "\x26\x51",
-+  [0x06f0] = "\x26\x52", [0x06f1] = "\x26\x53", [0x06f2] = "\x26\x54",
-+  [0x06f3] = "\x26\x55", [0x06f4] = "\x26\x56", [0x06f5] = "\x26\x57",
-+  [0x06f6] = "\x26\x58", [0x06f7] = "\x26\x59", [0x06f8] = "\x26\x5a",
-+  [0x06f9] = "\x26\x5b", [0x06fa] = "\x26\x5c", [0x06fb] = "\x26\x5d",
-+  [0x06fc] = "\x26\x5e", [0x06fd] = "\x26\x5f", [0x06fe] = "\x26\x60",
-+  [0x06ff] = "\x26\x61", [0x0700] = "\x26\x62", [0x0701] = "\x26\x63",
-+  [0x0702] = "\x26\x64", [0x0703] = "\x26\x65", [0x0704] = "\x26\x66",
-+  [0x0705] = "\x26\x67", [0x0706] = "\x26\x68", [0x0707] = "\x26\x69",
-+  [0x0708] = "\x26\x6a", [0x0709] = "\x26\x6b", [0x070a] = "\x26\x6c",
-+  [0x070b] = "\x26\x6d", [0x070c] = "\x26\x6e", [0x070d] = "\x26\x6f",
-+  [0x070e] = "\x26\x70", [0x070f] = "\x26\x71", [0x0710] = "\x26\x72",
-+  [0x0711] = "\x26\x73", [0x0712] = "\x26\x74", [0x0713] = "\x26\x75",
-+  [0x0714] = "\x26\x76", [0x0715] = "\x26\x77", [0x0716] = "\x26\x78",
-+  [0x0717] = "\x26\x79", [0x0718] = "\x26\x7a", [0x0719] = "\x26\x7b",
-+  [0x071a] = "\x26\x7c", [0x071b] = "\x26\x7d", [0x071c] = "\x26\x7e",
-+  [0x071d] = "\x26\x7f", [0x071e] = "\x26\x80", [0x071f] = "\x26\x81",
-+  [0x0720] = "\x26\x82", [0x0721] = "\x26\x83", [0x0722] = "\x26\x84",
-+  [0x0723] = "\x26\x85", [0x0724] = "\x26\x86", [0x0725] = "\x26\x87",
-+  [0x0726] = "\x26\x88", [0x0727] = "\x26\x89", [0x0728] = "\x26\x8a",
-+  [0x0729] = "\x26\x8b", [0x072a] = "\x26\x8c", [0x072b] = "\x26\x8d",
-+  [0x072c] = "\x26\x8e", [0x072d] = "\x26\x8f", [0x072e] = "\x26\x90",
-+  [0x072f] = "\x26\x91", [0x0730] = "\x26\x92", [0x0731] = "\x26\x93",
-+  [0x0732] = "\x26\x94", [0x0733] = "\x26\x95", [0x0734] = "\x26\x96",
-+  [0x0735] = "\x26\x97", [0x0736] = "\x26\x98", [0x0737] = "\x26\x99",
-+  [0x0738] = "\x26\x9a", [0x0739] = "\x26\x9b", [0x073a] = "\x26\x9c",
-+  [0x073b] = "\x26\x9d", [0x073c] = "\x26\x9e", [0x073d] = "\x26\x9f",
-+  [0x073e] = "\x26\xa0", [0x073f] = "\x26\xa1", [0x0740] = "\x26\xa2",
-+  [0x0741] = "\x26\xa3", [0x0742] = "\x26\xa4", [0x0743] = "\x26\xa5",
-+  [0x0744] = "\x26\xa6", [0x0745] = "\x26\xa7", [0x0746] = "\x26\xa8",
-+  [0x0747] = "\x26\xa9", [0x0748] = "\x26\xaa", [0x0749] = "\x26\xab",
-+  [0x074a] = "\x26\xac", [0x074b] = "\x26\xad", [0x074c] = "\x26\xae",
-+  [0x074d] = "\x26\xaf", [0x074e] = "\x26\xb0", [0x074f] = "\x26\xb1",
-+  [0x0750] = "\x26\xb2", [0x0751] = "\x26\xb3", [0x0752] = "\x26\xb4",
-+  [0x0753] = "\x26\xb5", [0x0754] = "\x26\xb6", [0x0755] = "\x26\xb7",
-+  [0x0756] = "\x26\xb8", [0x0757] = "\x26\xb9", [0x0758] = "\x26\xba",
-+  [0x0759] = "\x26\xbb", [0x075a] = "\x26\xbc", [0x075b] = "\x26\xbd",
-+  [0x075c] = "\x26\xbe", [0x075d] = "\x26\xbf", [0x075e] = "\x26\xc0",
-+  [0x075f] = "\x26\xc1", [0x0760] = "\x26\xc2", [0x0761] = "\x26\xc3",
-+  [0x0762] = "\x26\xc4", [0x0763] = "\x26\xc5", [0x0764] = "\x26\xc6",
-+  [0x0765] = "\x26\xc7", [0x0766] = "\x26\xc8", [0x0767] = "\x26\xc9",
-+  [0x0768] = "\x26\xca", [0x0769] = "\x26\xcb", [0x076a] = "\x26\xcc",
-+  [0x076b] = "\x26\xcd", [0x076c] = "\x26\xce", [0x076d] = "\x26\xcf",
-+  [0x076e] = "\x26\xd0", [0x076f] = "\x26\xd1", [0x0770] = "\x26\xd2",
-+  [0x0771] = "\x26\xd3", [0x0772] = "\x26\xd4", [0x0773] = "\x26\xd5",
-+  [0x0774] = "\x26\xd6", [0x0775] = "\x26\xd7", [0x0776] = "\x26\xd8",
-+  [0x0777] = "\x26\xd9", [0x0778] = "\x26\xda", [0x0779] = "\x26\xdb",
-+  [0x077a] = "\x26\xdc", [0x077b] = "\x26\xdd", [0x077c] = "\x26\xde",
-+  [0x077d] = "\x26\xdf", [0x077e] = "\x26\xe0", [0x077f] = "\x26\xe1",
-+  [0x0780] = "\x26\xe2", [0x0781] = "\x26\xe3", [0x0782] = "\x26\xe4",
-+  [0x0783] = "\x26\xe5", [0x0784] = "\x26\xe6", [0x0785] = "\x26\xe7",
-+  [0x0786] = "\x26\xe8", [0x0787] = "\x26\xe9", [0x0788] = "\x26\xea",
-+  [0x0789] = "\x26\xeb", [0x078a] = "\x26\xec", [0x078b] = "\x26\xed",
-+  [0x078c] = "\x26\xee", [0x078d] = "\x26\xef", [0x078e] = "\x26\xf0",
-+  [0x078f] = "\x26\xf1", [0x0790] = "\x26\xf2", [0x0791] = "\x26\xf3",
-+  [0x0792] = "\x26\xf4", [0x0793] = "\x26\xf5", [0x0794] = "\x26\xf6",
-+  [0x0795] = "\x26\xf7", [0x0796] = "\x26\xf8", [0x0797] = "\x26\xf9",
-+  [0x0798] = "\x26\xfa", [0x0799] = "\x26\xfb", [0x079a] = "\x26\xfc",
-+  [0x079b] = "\x26\xfd", [0x079c] = "\x26\xfe", [0x079d] = "\x26\xff",
-+  [0x079e] = "\x27\x00", [0x079f] = "\x27\x01", [0x07a0] = "\x27\x02",
-+  [0x07a1] = "\x27\x03", [0x07a2] = "\x27\x04", [0x07a3] = "\x27\x05",
-+  [0x07a4] = "\x27\x06", [0x07a5] = "\x27\x07", [0x07a6] = "\x27\x08",
-+  [0x07a7] = "\x27\x09", [0x07a8] = "\x27\x0a", [0x07a9] = "\x27\x0b",
-+  [0x07aa] = "\x27\x0c", [0x07ab] = "\x27\x0d", [0x07ac] = "\x27\x0e",
-+  [0x07ad] = "\x27\x0f", [0x07ae] = "\x27\x10", [0x07af] = "\x27\x11",
-+  [0x07b0] = "\x27\x12", [0x07b1] = "\x27\x13", [0x07b2] = "\x27\x14",
-+  [0x07b3] = "\x27\x15", [0x07b4] = "\x27\x16", [0x07b5] = "\x27\x17",
-+  [0x07b6] = "\x27\x18", [0x07b7] = "\x27\x19", [0x07b8] = "\x27\x1a",
-+  [0x07b9] = "\x27\x1b", [0x07ba] = "\x27\x1c", [0x07bb] = "\x27\x1d",
-+  [0x07bc] = "\x27\x1e", [0x07bd] = "\x27\x1f", [0x07be] = "\x27\x20",
-+  [0x07bf] = "\x27\x21", [0x07c0] = "\x27\x22", [0x07c1] = "\x27\x23",
-+  [0x07c2] = "\x27\x24", [0x07c3] = "\x27\x25", [0x07c4] = "\x27\x26",
-+  [0x07c5] = "\x27\x27", [0x07c6] = "\x27\x28", [0x07c7] = "\x27\x29",
-+  [0x07c8] = "\x27\x2a", [0x07c9] = "\x27\x2b", [0x07ca] = "\x27\x2c",
-+  [0x07cb] = "\x27\x2d", [0x07cc] = "\x27\x2e", [0x07cd] = "\x27\x2f",
-+  [0x07ce] = "\x27\x30", [0x07cf] = "\x27\x31", [0x07d0] = "\x27\x32",
-+  [0x07d1] = "\x27\x33", [0x07d2] = "\x27\x34", [0x07d3] = "\x27\x35",
-+  [0x07d4] = "\x27\x36", [0x07d5] = "\x27\x37", [0x07d6] = "\x27\x38",
-+  [0x07d7] = "\x27\x39", [0x07d8] = "\x27\x3a", [0x07d9] = "\x27\x3b",
-+  [0x07da] = "\x27\x3c", [0x07db] = "\x27\x3d", [0x07dc] = "\x27\x3e",
-+  [0x07dd] = "\x27\x3f", [0x07de] = "\x27\x40", [0x07df] = "\x27\x41",
-+  [0x07e0] = "\x27\x42", [0x07e1] = "\x27\x43", [0x07e2] = "\x27\x44",
-+  [0x07e3] = "\x27\x45", [0x07e4] = "\x27\x46", [0x07e5] = "\x27\x47",
-+  [0x07e6] = "\x27\x48", [0x07e7] = "\x27\x49", [0x07e8] = "\x27\x4a",
-+  [0x07e9] = "\x27\x4b", [0x07ea] = "\x27\x4c", [0x07eb] = "\x27\x4d",
-+  [0x07ec] = "\x27\x4e", [0x07ed] = "\x27\x4f", [0x07ee] = "\x27\x50",
-+  [0x07ef] = "\x27\x51", [0x07f0] = "\x27\x52", [0x07f1] = "\x27\x53",
-+  [0x07f2] = "\x27\x54", [0x07f3] = "\x27\x55", [0x07f4] = "\x27\x56",
-+  [0x07f5] = "\x27\x57", [0x07f6] = "\x27\x58", [0x07f7] = "\x27\x59",
-+  [0x07f8] = "\x27\x5a", [0x07f9] = "\x27\x5b", [0x07fa] = "\x27\x5c",
-+  [0x07fb] = "\x27\x5d", [0x07fc] = "\x27\x5e", [0x07fd] = "\x27\x5f",
-+  [0x07fe] = "\x27\x60", [0x07ff] = "\x27\x61", [0x0800] = "\x27\x62",
-+  [0x0801] = "\x27\x63", [0x0802] = "\x27\x64", [0x0803] = "\x27\x65",
-+  [0x0804] = "\x27\x66", [0x0805] = "\x27\x67", [0x0806] = "\x27\x68",
-+  [0x0807] = "\x27\x69", [0x0808] = "\x27\x6a", [0x0809] = "\x27\x6b",
-+  [0x080a] = "\x27\x6c", [0x080b] = "\x27\x6d", [0x080c] = "\x27\x6e",
-+  [0x080d] = "\x27\x6f", [0x080e] = "\x27\x70", [0x080f] = "\x27\x71",
-+  [0x0810] = "\x27\x72", [0x0811] = "\x27\x73", [0x0812] = "\x27\x74",
-+  [0x0813] = "\x27\x75", [0x0814] = "\x27\x76", [0x0815] = "\x27\x77",
-+  [0x0816] = "\x27\x78", [0x0817] = "\x27\x79", [0x0818] = "\x27\x7a",
-+  [0x0819] = "\x27\x7b", [0x081a] = "\x27\x7c", [0x081b] = "\x27\x7d",
-+  [0x081c] = "\x27\x7e", [0x081d] = "\x27\x7f", [0x081e] = "\x27\x80",
-+  [0x081f] = "\x27\x81", [0x0820] = "\x27\x82", [0x0821] = "\x27\x83",
-+  [0x0822] = "\x27\x84", [0x0823] = "\x27\x85", [0x0824] = "\x27\x86",
-+  [0x0825] = "\x27\x87", [0x0826] = "\x27\x88", [0x0827] = "\x27\x89",
-+  [0x0828] = "\x27\x8a", [0x0829] = "\x27\x8b", [0x082a] = "\x27\x8c",
-+  [0x082b] = "\x27\x8d", [0x082c] = "\x27\x8e", [0x082d] = "\x27\x8f",
-+  [0x082e] = "\x27\x90", [0x082f] = "\x27\x91", [0x0830] = "\x27\x92",
-+  [0x0831] = "\x27\x93", [0x0832] = "\x27\x94", [0x0833] = "\x27\x95",
-+  [0x0834] = "\x27\x96", [0x0835] = "\x27\x97", [0x0836] = "\x27\x98",
-+  [0x0837] = "\x27\x99", [0x0838] = "\x27\x9a", [0x0839] = "\x27\x9b",
-+  [0x083a] = "\x27\x9c", [0x083b] = "\x27\x9d", [0x083c] = "\x27\x9e",
-+  [0x083d] = "\x27\x9f", [0x083e] = "\x27\xa0", [0x083f] = "\x27\xa1",
-+  [0x0840] = "\x27\xa2", [0x0841] = "\x27\xa3", [0x0842] = "\x27\xa4",
-+  [0x0843] = "\x27\xa5", [0x0844] = "\x27\xa6", [0x0845] = "\x27\xa7",
-+  [0x0846] = "\x27\xa8", [0x0847] = "\x27\xa9", [0x0848] = "\x27\xaa",
-+  [0x0849] = "\x27\xab", [0x084a] = "\x27\xac", [0x084b] = "\x27\xad",
-+  [0x084c] = "\x27\xae", [0x084d] = "\x27\xaf", [0x084e] = "\x27\xb0",
-+  [0x084f] = "\x27\xb1", [0x0850] = "\x27\xb2", [0x0851] = "\x27\xb3",
-+  [0x0852] = "\x27\xb4", [0x0853] = "\x27\xb5", [0x0854] = "\x27\xb6",
-+  [0x0855] = "\x27\xb7", [0x0856] = "\x27\xb8", [0x0857] = "\x27\xb9",
-+  [0x0858] = "\x27\xba", [0x0859] = "\x27\xbb", [0x085a] = "\x27\xbc",
-+  [0x085b] = "\x27\xbd", [0x085c] = "\x27\xbe", [0x085d] = "\x27\xbf",
-+  [0x085e] = "\x27\xc0", [0x085f] = "\x27\xc1", [0x0860] = "\x27\xc2",
-+  [0x0861] = "\x27\xc3", [0x0862] = "\x27\xc4", [0x0863] = "\x27\xc5",
-+  [0x0864] = "\x27\xc6", [0x0865] = "\x27\xc7", [0x0866] = "\x27\xc8",
-+  [0x0867] = "\x27\xc9", [0x0868] = "\x27\xca", [0x0869] = "\x27\xcb",
-+  [0x086a] = "\x27\xcc", [0x086b] = "\x27\xcd", [0x086c] = "\x27\xce",
-+  [0x086d] = "\x27\xcf", [0x086e] = "\x27\xd0", [0x086f] = "\x27\xd1",
-+  [0x0870] = "\x27\xd2", [0x0871] = "\x27\xd3", [0x0872] = "\x27\xd4",
-+  [0x0873] = "\x27\xd5", [0x0874] = "\x27\xd6", [0x0875] = "\x27\xd7",
-+  [0x0876] = "\x27\xd8", [0x0877] = "\x27\xd9", [0x0878] = "\x27\xda",
-+  [0x0879] = "\x27\xdb", [0x087a] = "\x27\xdc", [0x087b] = "\x27\xdd",
-+  [0x087c] = "\x27\xde", [0x087d] = "\x27\xdf", [0x087e] = "\x27\xe0",
-+  [0x087f] = "\x27\xe1", [0x0880] = "\x27\xe2", [0x0881] = "\x27\xe3",
-+  [0x0882] = "\x27\xe4", [0x0883] = "\x27\xe5", [0x0884] = "\x27\xe6",
-+  [0x0885] = "\x27\xe7", [0x0886] = "\x27\xe8", [0x0887] = "\x27\xe9",
-+  [0x0888] = "\x27\xea", [0x0889] = "\x27\xeb", [0x088a] = "\x27\xec",
-+  [0x088b] = "\x27\xed", [0x088c] = "\x27\xee", [0x088d] = "\x27\xef",
-+  [0x088e] = "\x27\xf0", [0x088f] = "\x27\xf1", [0x0890] = "\x27\xf2",
-+  [0x0891] = "\x27\xf3", [0x0892] = "\x27\xf4", [0x0893] = "\x27\xf5",
-+  [0x0894] = "\x27\xf6", [0x0895] = "\x27\xf7", [0x0896] = "\x27\xf8",
-+  [0x0897] = "\x27\xf9", [0x0898] = "\x27\xfa", [0x0899] = "\x27\xfb",
-+  [0x089a] = "\x27\xfc", [0x089b] = "\x27\xfd", [0x089c] = "\x27\xfe",
-+  [0x089d] = "\x27\xff", [0x089e] = "\x28\x00", [0x089f] = "\x28\x01",
-+  [0x08a0] = "\x28\x02", [0x08a1] = "\x28\x03", [0x08a2] = "\x28\x04",
-+  [0x08a3] = "\x28\x05", [0x08a4] = "\x28\x06", [0x08a5] = "\x28\x07",
-+  [0x08a6] = "\x28\x08", [0x08a7] = "\x28\x09", [0x08a8] = "\x28\x0a",
-+  [0x08a9] = "\x28\x0b", [0x08aa] = "\x28\x0c", [0x08ab] = "\x28\x0d",
-+  [0x08ac] = "\x28\x0e", [0x08ad] = "\x28\x0f", [0x08ae] = "\x28\x10",
-+  [0x08af] = "\x28\x11", [0x08b0] = "\x28\x12", [0x08b1] = "\x28\x13",
-+  [0x08b2] = "\x28\x14", [0x08b3] = "\x28\x15", [0x08b4] = "\x28\x16",
-+  [0x08b5] = "\x28\x17", [0x08b6] = "\x28\x18", [0x08b7] = "\x28\x19",
-+  [0x08b8] = "\x28\x1a", [0x08b9] = "\x28\x1b", [0x08ba] = "\x28\x1c",
-+  [0x08bb] = "\x28\x1d", [0x08bc] = "\x28\x1e", [0x08bd] = "\x28\x1f",
-+  [0x08be] = "\x28\x20", [0x08bf] = "\x28\x21", [0x08c0] = "\x28\x22",
-+  [0x08c1] = "\x28\x23", [0x08c2] = "\x28\x24", [0x08c3] = "\x28\x25",
-+  [0x08c4] = "\x28\x26", [0x08c5] = "\x28\x27", [0x08c6] = "\x28\x28",
-+  [0x08c7] = "\x28\x29", [0x08c8] = "\x28\x2a", [0x08c9] = "\x28\x2b",
-+  [0x08ca] = "\x28\x2c", [0x08cb] = "\x28\x2d", [0x08cc] = "\x28\x2e",
-+  [0x08cd] = "\x28\x2f", [0x08ce] = "\x28\x30", [0x08cf] = "\x28\x31",
-+  [0x08d0] = "\x28\x32", [0x08d1] = "\x28\x33", [0x08d2] = "\x28\x34",
-+  [0x08d3] = "\x28\x35", [0x08d4] = "\x28\x36", [0x08d5] = "\x28\x37",
-+  [0x08d6] = "\x28\x38", [0x08d7] = "\x28\x39", [0x08d8] = "\x28\x3a",
-+  [0x08d9] = "\x28\x3b", [0x08da] = "\x28\x3c", [0x08db] = "\x28\x3d",
-+  [0x08dc] = "\x28\x3e", [0x08dd] = "\x28\x3f", [0x08de] = "\x28\x40",
-+  [0x08df] = "\x28\x41", [0x08e0] = "\x28\x42", [0x08e1] = "\x28\x43",
-+  [0x08e2] = "\x28\x44", [0x08e3] = "\x28\x45", [0x08e4] = "\x28\x46",
-+  [0x08e5] = "\x28\x47", [0x08e6] = "\x28\x48", [0x08e7] = "\x28\x49",
-+  [0x08e8] = "\x28\x4a", [0x08e9] = "\x28\x4b", [0x08ea] = "\x28\x4c",
-+  [0x08eb] = "\x28\x4d", [0x08ec] = "\x28\x4e", [0x08ed] = "\x28\x4f",
-+  [0x08ee] = "\x28\x50", [0x08ef] = "\x28\x51", [0x08f0] = "\x28\x52",
-+  [0x08f1] = "\x28\x53", [0x08f2] = "\x28\x54", [0x08f3] = "\x28\x55",
-+  [0x08f4] = "\x28\x56", [0x08f5] = "\x28\x57", [0x08f6] = "\x28\x58",
-+  [0x08f7] = "\x28\x59", [0x08f8] = "\x28\x5a", [0x08f9] = "\x28\x5b",
-+  [0x08fa] = "\x28\x5c", [0x08fb] = "\x28\x5d", [0x08fc] = "\x28\x5e",
-+  [0x08fd] = "\x28\x5f", [0x08fe] = "\x28\x60", [0x08ff] = "\x28\x61",
-+  [0x0900] = "\x28\x62", [0x0901] = "\x28\x63", [0x0902] = "\x28\x64",
-+  [0x0903] = "\x28\x65", [0x0904] = "\x28\x66", [0x0905] = "\x28\x67",
-+  [0x0906] = "\x28\x68", [0x0907] = "\x28\x69", [0x0908] = "\x28\x6a",
-+  [0x0909] = "\x28\x6b", [0x090a] = "\x28\x6c", [0x090b] = "\x28\x6d",
-+  [0x090c] = "\x28\x6e", [0x090d] = "\x28\x6f", [0x090e] = "\x28\x70",
-+  [0x090f] = "\x28\x71", [0x0910] = "\x28\x72", [0x0911] = "\x28\x73",
-+  [0x0912] = "\x28\x74", [0x0913] = "\x28\x75", [0x0914] = "\x28\x76",
-+  [0x0915] = "\x28\x77", [0x0916] = "\x28\x78", [0x0917] = "\x28\x79",
-+  [0x0918] = "\x28\x7a", [0x0919] = "\x28\x7b", [0x091a] = "\x28\x7c",
-+  [0x091b] = "\x28\x7d", [0x091c] = "\x28\x7e", [0x091d] = "\x28\x7f",
-+  [0x091e] = "\x28\x80", [0x091f] = "\x28\x81", [0x0920] = "\x28\x82",
-+  [0x0921] = "\x28\x83", [0x0922] = "\x28\x84", [0x0923] = "\x28\x85",
-+  [0x0924] = "\x28\x86", [0x0925] = "\x28\x87", [0x0926] = "\x28\x88",
-+  [0x0927] = "\x28\x89", [0x0928] = "\x28\x8a", [0x0929] = "\x28\x8b",
-+  [0x092a] = "\x28\x8c", [0x092b] = "\x28\x8d", [0x092c] = "\x28\x8e",
-+  [0x092d] = "\x28\x8f", [0x092e] = "\x28\x90", [0x092f] = "\x28\x91",
-+  [0x0930] = "\x28\x92", [0x0931] = "\x28\x93", [0x0932] = "\x28\x94",
-+  [0x0933] = "\x28\x95", [0x0934] = "\x28\x96", [0x0935] = "\x28\x97",
-+  [0x0936] = "\x28\x98", [0x0937] = "\x28\x99", [0x0938] = "\x28\x9a",
-+  [0x0939] = "\x28\x9b", [0x093a] = "\x28\x9c", [0x093b] = "\x28\x9d",
-+  [0x093c] = "\x28\x9e", [0x093d] = "\x28\x9f", [0x093e] = "\x28\xa0",
-+  [0x093f] = "\x28\xa1", [0x0940] = "\x28\xa2", [0x0941] = "\x28\xa3",
-+  [0x0942] = "\x28\xa4", [0x0943] = "\x28\xa5", [0x0944] = "\x28\xa6",
-+  [0x0945] = "\x28\xa7", [0x0946] = "\x28\xa8", [0x0947] = "\x28\xa9",
-+  [0x0948] = "\x28\xaa", [0x0949] = "\x28\xab", [0x094a] = "\x28\xac",
-+  [0x094b] = "\x28\xad", [0x094c] = "\x28\xae", [0x094d] = "\x28\xaf",
-+  [0x094e] = "\x28\xb0", [0x094f] = "\x28\xb1", [0x0950] = "\x28\xb2",
-+  [0x0951] = "\x28\xb3", [0x0952] = "\x28\xb4", [0x0953] = "\x28\xb5",
-+  [0x0954] = "\x28\xb6", [0x0955] = "\x28\xb7", [0x0956] = "\x28\xb8",
-+  [0x0957] = "\x28\xb9", [0x0958] = "\x28\xba", [0x0959] = "\x28\xbb",
-+  [0x095a] = "\x28\xbc", [0x095b] = "\x28\xbd", [0x095c] = "\x28\xbe",
-+  [0x095d] = "\x28\xbf", [0x095e] = "\x28\xc0", [0x095f] = "\x28\xc1",
-+  [0x0960] = "\x28\xc2", [0x0961] = "\x28\xc3", [0x0962] = "\x28\xc4",
-+  [0x0963] = "\x28\xc5", [0x0964] = "\x28\xc6", [0x0965] = "\x28\xc7",
-+  [0x0966] = "\x28\xc8", [0x0967] = "\x28\xc9", [0x0968] = "\x28\xca",
-+  [0x0969] = "\x28\xcb", [0x096a] = "\x28\xcc", [0x096b] = "\x28\xcd",
-+  [0x096c] = "\x28\xce", [0x096d] = "\x28\xcf", [0x096e] = "\x28\xd0",
-+  [0x096f] = "\x28\xd1", [0x0970] = "\x28\xd2", [0x0971] = "\x28\xd3",
-+  [0x0972] = "\x28\xd4", [0x0973] = "\x28\xd5", [0x0974] = "\x28\xd6",
-+  [0x0975] = "\x28\xd7", [0x0976] = "\x28\xd8", [0x0977] = "\x28\xd9",
-+  [0x0978] = "\x28\xda", [0x0979] = "\x28\xdb", [0x097a] = "\x28\xdc",
-+  [0x097b] = "\x28\xdd", [0x097c] = "\x28\xde", [0x097d] = "\x28\xdf",
-+  [0x097e] = "\x28\xe0", [0x097f] = "\x28\xe1", [0x0980] = "\x28\xe2",
-+  [0x0981] = "\x28\xe3", [0x0982] = "\x28\xe4", [0x0983] = "\x28\xe5",
-+  [0x0984] = "\x28\xe6", [0x0985] = "\x28\xe7", [0x0986] = "\x28\xe8",
-+  [0x0987] = "\x28\xe9", [0x0988] = "\x28\xea", [0x0989] = "\x28\xeb",
-+  [0x098a] = "\x28\xec", [0x098b] = "\x28\xed", [0x098c] = "\x28\xee",
-+  [0x098d] = "\x28\xef", [0x098e] = "\x28\xf0", [0x098f] = "\x28\xf1",
-+  [0x0990] = "\x28\xf2", [0x0991] = "\x28\xf3", [0x0992] = "\x28\xf4",
-+  [0x0993] = "\x28\xf5", [0x0994] = "\x28\xf6", [0x0995] = "\x28\xf7",
-+  [0x0996] = "\x28\xf8", [0x0997] = "\x28\xf9", [0x0998] = "\x28\xfa",
-+  [0x0999] = "\x28\xfb", [0x099a] = "\x28\xfc", [0x099b] = "\x28\xfd",
-+  [0x099c] = "\x28\xfe", [0x099d] = "\x28\xff", [0x099e] = "\x29\x00",
-+  [0x099f] = "\x29\x01", [0x09a0] = "\x29\x02", [0x09a1] = "\x29\x03",
-+  [0x09a2] = "\x29\x04", [0x09a3] = "\x29\x05", [0x09a4] = "\x29\x06",
-+  [0x09a5] = "\x29\x07", [0x09a6] = "\x29\x08", [0x09a7] = "\x29\x09",
-+  [0x09a8] = "\x29\x0a", [0x09a9] = "\x29\x0b", [0x09aa] = "\x29\x0c",
-+  [0x09ab] = "\x29\x0d", [0x09ac] = "\x29\x0e", [0x09ad] = "\x29\x0f",
-+  [0x09ae] = "\x29\x10", [0x09af] = "\x29\x11", [0x09b0] = "\x29\x12",
-+  [0x09b1] = "\x29\x13", [0x09b2] = "\x29\x14", [0x09b3] = "\x29\x15",
-+  [0x09b4] = "\x29\x16", [0x09b5] = "\x29\x17", [0x09b6] = "\x29\x18",
-+  [0x09b7] = "\x29\x19", [0x09b8] = "\x29\x1a", [0x09b9] = "\x29\x1b",
-+  [0x09ba] = "\x29\x1c", [0x09bb] = "\x29\x1d", [0x09bc] = "\x29\x1e",
-+  [0x09bd] = "\x29\x1f", [0x09be] = "\x29\x20", [0x09bf] = "\x29\x21",
-+  [0x09c0] = "\x29\x22", [0x09c1] = "\x29\x23", [0x09c2] = "\x29\x24",
-+  [0x09c3] = "\x29\x25", [0x09c4] = "\x29\x26", [0x09c5] = "\x29\x27",
-+  [0x09c6] = "\x29\x28", [0x09c7] = "\x29\x29", [0x09c8] = "\x29\x2a",
-+  [0x09c9] = "\x29\x2b", [0x09ca] = "\x29\x2c", [0x09cb] = "\x29\x2d",
-+  [0x09cc] = "\x29\x2e", [0x09cd] = "\x29\x2f", [0x09ce] = "\x29\x30",
-+  [0x09cf] = "\x29\x31", [0x09d0] = "\x29\x32", [0x09d1] = "\x29\x33",
-+  [0x09d2] = "\x29\x34", [0x09d3] = "\x29\x35", [0x09d4] = "\x29\x36",
-+  [0x09d5] = "\x29\x37", [0x09d6] = "\x29\x38", [0x09d7] = "\x29\x39",
-+  [0x09d8] = "\x29\x3a", [0x09d9] = "\x29\x3b", [0x09da] = "\x29\x3c",
-+  [0x09db] = "\x29\x3d", [0x09dc] = "\x29\x3e", [0x09dd] = "\x29\x3f",
-+  [0x09de] = "\x29\x40", [0x09df] = "\x29\x41", [0x09e0] = "\x29\x42",
-+  [0x09e1] = "\x29\x43", [0x09e2] = "\x29\x44", [0x09e3] = "\x29\x45",
-+  [0x09e4] = "\x29\x46", [0x09e5] = "\x29\x47", [0x09e6] = "\x29\x48",
-+  [0x09e7] = "\x29\x49", [0x09e8] = "\x29\x4a", [0x09e9] = "\x29\x4b",
-+  [0x09ea] = "\x29\x4c", [0x09eb] = "\x29\x4d", [0x09ec] = "\x29\x4e",
-+  [0x09ed] = "\x29\x4f", [0x09ee] = "\x29\x50", [0x09ef] = "\x29\x51",
-+  [0x09f0] = "\x29\x52", [0x09f1] = "\x29\x53", [0x09f2] = "\x29\x54",
-+  [0x09f3] = "\x29\x55", [0x09f4] = "\x29\x56", [0x09f5] = "\x29\x57",
-+  [0x09f6] = "\x29\x58", [0x09f7] = "\x29\x59", [0x09f8] = "\x29\x5a",
-+  [0x09f9] = "\x29\x5b", [0x09fa] = "\x29\x5c", [0x09fb] = "\x29\x5d",
-+  [0x09fc] = "\x29\x5e", [0x09fd] = "\x29\x5f", [0x09fe] = "\x29\x60",
-+  [0x09ff] = "\x29\x61", [0x0a00] = "\x29\x62", [0x0a01] = "\x29\x63",
-+  [0x0a02] = "\x29\x64", [0x0a03] = "\x29\x65", [0x0a04] = "\x29\x66",
-+  [0x0a05] = "\x29\x67", [0x0a06] = "\x29\x68", [0x0a07] = "\x29\x69",
-+  [0x0a08] = "\x29\x6a", [0x0a09] = "\x29\x6b", [0x0a0a] = "\x29\x6c",
-+  [0x0a0b] = "\x29\x6d", [0x0a0c] = "\x29\x6e", [0x0a0d] = "\x29\x6f",
-+  [0x0a0e] = "\x29\x70", [0x0a0f] = "\x29\x71", [0x0a10] = "\x29\x72",
-+  [0x0a11] = "\x29\x73", [0x0a12] = "\x29\x74", [0x0a13] = "\x29\x75",
-+  [0x0a14] = "\x29\x76", [0x0a15] = "\x29\x77", [0x0a16] = "\x29\x78",
-+  [0x0a17] = "\x29\x79", [0x0a18] = "\x29\x7a", [0x0a19] = "\x29\x7b",
-+  [0x0a1a] = "\x29\x7c", [0x0a1b] = "\x29\x7d", [0x0a1c] = "\x29\x7e",
-+  [0x0a1d] = "\x29\x7f", [0x0a1e] = "\x29\x80", [0x0a1f] = "\x29\x81",
-+  [0x0a20] = "\x29\x82", [0x0a21] = "\x29\x83", [0x0a22] = "\x29\x84",
-+  [0x0a23] = "\x29\x85", [0x0a24] = "\x29\x86", [0x0a25] = "\x29\x87",
-+  [0x0a26] = "\x29\x88", [0x0a27] = "\x29\x89", [0x0a28] = "\x29\x8a",
-+  [0x0a29] = "\x29\x8b", [0x0a2a] = "\x29\x8c", [0x0a2b] = "\x29\x8d",
-+  [0x0a2c] = "\x29\x8e", [0x0a2d] = "\x29\x8f", [0x0a2e] = "\x29\x90",
-+  [0x0a2f] = "\x29\x91", [0x0a30] = "\x29\x92", [0x0a31] = "\x29\x93",
-+  [0x0a32] = "\x29\x94", [0x0a33] = "\x29\x95", [0x0a34] = "\x29\x96",
-+  [0x0a35] = "\x29\x97", [0x0a36] = "\x29\x98", [0x0a37] = "\x29\x99",
-+  [0x0a38] = "\x29\x9a", [0x0a39] = "\x29\x9b", [0x0a3a] = "\x29\x9c",
-+  [0x0a3b] = "\x29\x9d", [0x0a3c] = "\x29\x9e", [0x0a3d] = "\x29\x9f",
-+  [0x0a3e] = "\x29\xa0", [0x0a3f] = "\x29\xa1", [0x0a40] = "\x29\xa2",
-+  [0x0a41] = "\x29\xa3", [0x0a42] = "\x29\xa4", [0x0a43] = "\x29\xa5",
-+  [0x0a44] = "\x29\xa6", [0x0a45] = "\x29\xa7", [0x0a46] = "\x29\xa8",
-+  [0x0a47] = "\x29\xa9", [0x0a48] = "\x29\xaa", [0x0a49] = "\x29\xab",
-+  [0x0a4a] = "\x29\xac", [0x0a4b] = "\x29\xad", [0x0a4c] = "\x29\xae",
-+  [0x0a4d] = "\x29\xaf", [0x0a4e] = "\x29\xb0", [0x0a4f] = "\x29\xb1",
-+  [0x0a50] = "\x29\xb2", [0x0a51] = "\x29\xb3", [0x0a52] = "\x29\xb4",
-+  [0x0a53] = "\x29\xb5", [0x0a54] = "\x29\xb6", [0x0a55] = "\x29\xb7",
-+  [0x0a56] = "\x29\xb8", [0x0a57] = "\x29\xb9", [0x0a58] = "\x29\xba",
-+  [0x0a59] = "\x29\xbb", [0x0a5a] = "\x29\xbc", [0x0a5b] = "\x29\xbd",
-+  [0x0a5c] = "\x29\xbe", [0x0a5d] = "\x29\xbf", [0x0a5e] = "\x29\xc0",
-+  [0x0a5f] = "\x29\xc1", [0x0a60] = "\x29\xc2", [0x0a61] = "\x29\xc3",
-+  [0x0a62] = "\x29\xc4", [0x0a63] = "\x29\xc5", [0x0a64] = "\x29\xc6",
-+  [0x0a65] = "\x29\xc7", [0x0a66] = "\x29\xc8", [0x0a67] = "\x29\xc9",
-+  [0x0a68] = "\x29\xca", [0x0a69] = "\x29\xcb", [0x0a6a] = "\x29\xcc",
-+  [0x0a6b] = "\x29\xcd", [0x0a6c] = "\x29\xce", [0x0a6d] = "\x29\xcf",
-+  [0x0a6e] = "\x29\xd0", [0x0a6f] = "\x29\xd1", [0x0a70] = "\x29\xd2",
-+  [0x0a71] = "\x29\xd3", [0x0a72] = "\x29\xd4", [0x0a73] = "\x29\xd5",
-+  [0x0a74] = "\x29\xd6", [0x0a75] = "\x29\xd7", [0x0a76] = "\x29\xd8",
-+  [0x0a77] = "\x29\xd9", [0x0a78] = "\x29\xda", [0x0a79] = "\x29\xdb",
-+  [0x0a7a] = "\x29\xdc", [0x0a7b] = "\x29\xdd", [0x0a7c] = "\x29\xde",
-+  [0x0a7d] = "\x29\xdf", [0x0a7e] = "\x29\xe0", [0x0a7f] = "\x29\xe1",
-+  [0x0a80] = "\x29\xe2", [0x0a81] = "\x29\xe3", [0x0a82] = "\x29\xe4",
-+  [0x0a83] = "\x29\xe5", [0x0a84] = "\x29\xe6", [0x0a85] = "\x29\xe7",
-+  [0x0a86] = "\x29\xe8", [0x0a87] = "\x29\xe9", [0x0a88] = "\x29\xea",
-+  [0x0a89] = "\x29\xeb", [0x0a8a] = "\x29\xec", [0x0a8b] = "\x29\xed",
-+  [0x0a8c] = "\x29\xee", [0x0a8d] = "\x29\xef", [0x0a8e] = "\x29\xf0",
-+  [0x0a8f] = "\x29\xf1", [0x0a90] = "\x29\xf2", [0x0a91] = "\x29\xf3",
-+  [0x0a92] = "\x29\xf4", [0x0a93] = "\x29\xf5", [0x0a94] = "\x29\xf6",
-+  [0x0a95] = "\x29\xf7", [0x0a96] = "\x29\xf8", [0x0a97] = "\x29\xf9",
-+  [0x0a98] = "\x29\xfa", [0x0a99] = "\x29\xfb", [0x0a9a] = "\x29\xfc",
-+  [0x0a9b] = "\x29\xfd", [0x0a9c] = "\x29\xfe", [0x0a9d] = "\x29\xff",
-+  [0x0a9e] = "\x2a\x00", [0x0a9f] = "\x2a\x01", [0x0aa0] = "\x2a\x02",
-+  [0x0aa1] = "\x2a\x03", [0x0aa2] = "\x2a\x04", [0x0aa3] = "\x2a\x05",
-+  [0x0aa4] = "\x2a\x06", [0x0aa5] = "\x2a\x07", [0x0aa6] = "\x2a\x08",
-+  [0x0aa7] = "\x2a\x09", [0x0aa8] = "\x2a\x0a", [0x0aa9] = "\x2a\x0b",
-+  [0x0aaa] = "\x2a\x0c", [0x0aab] = "\x2a\x0d", [0x0aac] = "\x2a\x0e",
-+  [0x0aad] = "\x2a\x0f", [0x0aae] = "\x2a\x10", [0x0aaf] = "\x2a\x11",
-+  [0x0ab0] = "\x2a\x12", [0x0ab1] = "\x2a\x13", [0x0ab2] = "\x2a\x14",
-+  [0x0ab3] = "\x2a\x15", [0x0ab4] = "\x2a\x16", [0x0ab5] = "\x2a\x17",
-+  [0x0ab6] = "\x2a\x18", [0x0ab7] = "\x2a\x19", [0x0ab8] = "\x2a\x1a",
-+  [0x0ab9] = "\x2a\x1b", [0x0aba] = "\x2a\x1c", [0x0abb] = "\x2a\x1d",
-+  [0x0abc] = "\x2a\x1e", [0x0abd] = "\x2a\x1f", [0x0abe] = "\x2a\x20",
-+  [0x0abf] = "\x2a\x21", [0x0ac0] = "\x2a\x22", [0x0ac1] = "\x2a\x23",
-+  [0x0ac2] = "\x2a\x24", [0x0ac3] = "\x2a\x25", [0x0ac4] = "\x2a\x26",
-+  [0x0ac5] = "\x2a\x27", [0x0ac6] = "\x2a\x28", [0x0ac7] = "\x2a\x29",
-+  [0x0ac8] = "\x2a\x2a", [0x0ac9] = "\x2a\x2b", [0x0aca] = "\x2a\x2c",
-+  [0x0acb] = "\x2a\x2d", [0x0acc] = "\x2a\x2e", [0x0acd] = "\x2a\x2f",
-+  [0x0ace] = "\x2a\x30", [0x0acf] = "\x2a\x31", [0x0ad0] = "\x2a\x32",
-+  [0x0ad1] = "\x2a\x33", [0x0ad2] = "\x2a\x34", [0x0ad3] = "\x2a\x35",
-+  [0x0ad4] = "\x2a\x36", [0x0ad5] = "\x2a\x37", [0x0ad6] = "\x2a\x38",
-+  [0x0ad7] = "\x2a\x39", [0x0ad8] = "\x2a\x3a", [0x0ad9] = "\x2a\x3b",
-+  [0x0ada] = "\x2a\x3c", [0x0adb] = "\x2a\x3d", [0x0adc] = "\x2a\x3e",
-+  [0x0add] = "\x2a\x3f", [0x0ade] = "\x2a\x40", [0x0adf] = "\x2a\x41",
-+  [0x0ae0] = "\x2a\x42", [0x0ae1] = "\x2a\x43", [0x0ae2] = "\x2a\x44",
-+  [0x0ae3] = "\x2a\x45", [0x0ae4] = "\x2a\x46", [0x0ae5] = "\x2a\x47",
-+  [0x0ae6] = "\x2a\x48", [0x0ae7] = "\x2a\x49", [0x0ae8] = "\x2a\x4a",
-+  [0x0ae9] = "\x2a\x4b", [0x0aea] = "\x2a\x4c", [0x0aeb] = "\x2a\x4d",
-+  [0x0aec] = "\x2a\x4e", [0x0aed] = "\x2a\x4f", [0x0aee] = "\x2a\x50",
-+  [0x0aef] = "\x2a\x51", [0x0af0] = "\x2a\x52", [0x0af1] = "\x2a\x53",
-+  [0x0af2] = "\x2a\x54", [0x0af3] = "\x2a\x55", [0x0af4] = "\x2a\x56",
-+  [0x0af5] = "\x2a\x57", [0x0af6] = "\x2a\x58", [0x0af7] = "\x2a\x59",
-+  [0x0af8] = "\x2a\x5a", [0x0af9] = "\x2a\x5b", [0x0afa] = "\x2a\x5c",
-+  [0x0afb] = "\x2a\x5d", [0x0afc] = "\x2a\x5e", [0x0afd] = "\x2a\x5f",
-+  [0x0afe] = "\x2a\x60", [0x0aff] = "\x2a\x61", [0x0b00] = "\x2a\x62",
-+  [0x0b01] = "\x2a\x63", [0x0b02] = "\x2a\x64", [0x0b03] = "\x2a\x65",
-+  [0x0b04] = "\x2a\x66", [0x0b05] = "\x2a\x67", [0x0b06] = "\x2a\x68",
-+  [0x0b07] = "\x2a\x69", [0x0b08] = "\x2a\x6a", [0x0b09] = "\x2a\x6b",
-+  [0x0b0a] = "\x2a\x6c", [0x0b0b] = "\x2a\x6d", [0x0b0c] = "\x2a\x6e",
-+  [0x0b0d] = "\x2a\x6f", [0x0b0e] = "\x2a\x70", [0x0b0f] = "\x2a\x71",
-+  [0x0b10] = "\x2a\x72", [0x0b11] = "\x2a\x73", [0x0b12] = "\x2a\x74",
-+  [0x0b13] = "\x2a\x75", [0x0b14] = "\x2a\x76", [0x0b15] = "\x2a\x77",
-+  [0x0b16] = "\x2a\x78", [0x0b17] = "\x2a\x79", [0x0b18] = "\x2a\x7a",
-+  [0x0b19] = "\x2a\x7b", [0x0b1a] = "\x2a\x7c", [0x0b1b] = "\x2a\x7d",
-+  [0x0b1c] = "\x2a\x7e", [0x0b1d] = "\x2a\x7f", [0x0b1e] = "\x2a\x80",
-+  [0x0b1f] = "\x2a\x81", [0x0b20] = "\x2a\x82", [0x0b21] = "\x2a\x83",
-+  [0x0b22] = "\x2a\x84", [0x0b23] = "\x2a\x85", [0x0b24] = "\x2a\x86",
-+  [0x0b25] = "\x2a\x87", [0x0b26] = "\x2a\x88", [0x0b27] = "\x2a\x89",
-+  [0x0b28] = "\x2a\x8a", [0x0b29] = "\x2a\x8b", [0x0b2a] = "\x2a\x8c",
-+  [0x0b2b] = "\x2a\x8d", [0x0b2c] = "\x2a\x8e", [0x0b2d] = "\x2a\x8f",
-+  [0x0b2e] = "\x2a\x90", [0x0b2f] = "\x2a\x91", [0x0b30] = "\x2a\x92",
-+  [0x0b31] = "\x2a\x93", [0x0b32] = "\x2a\x94", [0x0b33] = "\x2a\x95",
-+  [0x0b34] = "\x2a\x96", [0x0b35] = "\x2a\x97", [0x0b36] = "\x2a\x98",
-+  [0x0b37] = "\x2a\x99", [0x0b38] = "\x2a\x9a", [0x0b39] = "\x2a\x9b",
-+  [0x0b3a] = "\x2a\x9c", [0x0b3b] = "\x2a\x9d", [0x0b3c] = "\x2a\x9e",
-+  [0x0b3d] = "\x2a\x9f", [0x0b3e] = "\x2a\xa0", [0x0b3f] = "\x2a\xa1",
-+  [0x0b40] = "\x2a\xa2", [0x0b41] = "\x2a\xa3", [0x0b42] = "\x2a\xa4",
-+  [0x0b43] = "\x2a\xa5", [0x0b44] = "\x2a\xa6", [0x0b45] = "\x2a\xa7",
-+  [0x0b46] = "\x2a\xa8", [0x0b47] = "\x2a\xa9", [0x0b48] = "\x2a\xaa",
-+  [0x0b49] = "\x2a\xab", [0x0b4a] = "\x2a\xac", [0x0b4b] = "\x2a\xad",
-+  [0x0b4c] = "\x2a\xae", [0x0b4d] = "\x2a\xaf", [0x0b4e] = "\x2a\xb0",
-+  [0x0b4f] = "\x2a\xb1", [0x0b50] = "\x2a\xb2", [0x0b51] = "\x2a\xb3",
-+  [0x0b52] = "\x2a\xb4", [0x0b53] = "\x2a\xb5", [0x0b54] = "\x2a\xb6",
-+  [0x0b55] = "\x2a\xb7", [0x0b56] = "\x2a\xb8", [0x0b57] = "\x2a\xb9",
-+  [0x0b58] = "\x2a\xba", [0x0b59] = "\x2a\xbb", [0x0b5a] = "\x2a\xbc",
-+  [0x0b5b] = "\x2a\xbd", [0x0b5c] = "\x2a\xbe", [0x0b5d] = "\x2a\xbf",
-+  [0x0b5e] = "\x2a\xc0", [0x0b5f] = "\x2a\xc1", [0x0b60] = "\x2a\xc2",
-+  [0x0b61] = "\x2a\xc3", [0x0b62] = "\x2a\xc4", [0x0b63] = "\x2a\xc5",
-+  [0x0b64] = "\x2a\xc6", [0x0b65] = "\x2a\xc7", [0x0b66] = "\x2a\xc8",
-+  [0x0b67] = "\x2a\xc9", [0x0b68] = "\x2a\xca", [0x0b69] = "\x2a\xcb",
-+  [0x0b6a] = "\x2a\xcc", [0x0b6b] = "\x2a\xcd", [0x0b6c] = "\x2a\xce",
-+  [0x0b6d] = "\x2a\xcf", [0x0b6e] = "\x2a\xd0", [0x0b6f] = "\x2a\xd1",
-+  [0x0b70] = "\x2a\xd2", [0x0b71] = "\x2a\xd3", [0x0b72] = "\x2a\xd4",
-+  [0x0b73] = "\x2a\xd5", [0x0b74] = "\x2a\xd6", [0x0b75] = "\x2a\xd7",
-+  [0x0b76] = "\x2a\xd8", [0x0b77] = "\x2a\xd9", [0x0b78] = "\x2a\xda",
-+  [0x0b79] = "\x2a\xdb", [0x0b7a] = "\x2a\xdc", [0x0b7b] = "\x2a\xdd",
-+  [0x0b7c] = "\x2a\xde", [0x0b7d] = "\x2a\xdf", [0x0b7e] = "\x2a\xe0",
-+  [0x0b7f] = "\x2a\xe1", [0x0b80] = "\x2a\xe2", [0x0b81] = "\x2a\xe3",
-+  [0x0b82] = "\x2a\xe4", [0x0b83] = "\x2a\xe5", [0x0b84] = "\x2a\xe6",
-+  [0x0b85] = "\x2a\xe7", [0x0b86] = "\x2a\xe8", [0x0b87] = "\x2a\xe9",
-+  [0x0b88] = "\x2a\xea", [0x0b89] = "\x2a\xeb", [0x0b8a] = "\x2a\xec",
-+  [0x0b8b] = "\x2a\xed", [0x0b8c] = "\x2a\xee", [0x0b8d] = "\x2a\xef",
-+  [0x0b8e] = "\x2a\xf0", [0x0b8f] = "\x2a\xf1", [0x0b90] = "\x2a\xf2",
-+  [0x0b91] = "\x2a\xf3", [0x0b92] = "\x2a\xf4", [0x0b93] = "\x2a\xf5",
-+  [0x0b94] = "\x2a\xf6", [0x0b95] = "\x2a\xf7", [0x0b96] = "\x2a\xf8",
-+  [0x0b97] = "\x2a\xf9", [0x0b98] = "\x2a\xfa", [0x0b99] = "\x2a\xfb",
-+  [0x0b9a] = "\x2a\xfc", [0x0b9b] = "\x2a\xfd", [0x0b9c] = "\x2a\xfe",
-+  [0x0b9d] = "\x2a\xff", [0x0b9e] = "\x2b\x00", [0x0b9f] = "\x2b\x01",
-+  [0x0ba0] = "\x2b\x02", [0x0ba1] = "\x2b\x03", [0x0ba2] = "\x2b\x04",
-+  [0x0ba3] = "\x2b\x05", [0x0ba4] = "\x2b\x06", [0x0ba5] = "\x2b\x07",
-+  [0x0ba6] = "\x2b\x08", [0x0ba7] = "\x2b\x09", [0x0ba8] = "\x2b\x0a",
-+  [0x0ba9] = "\x2b\x0b", [0x0baa] = "\x2b\x0c", [0x0bab] = "\x2b\x0d",
-+  [0x0bac] = "\x2b\x0e", [0x0bad] = "\x2b\x0f", [0x0bae] = "\x2b\x10",
-+  [0x0baf] = "\x2b\x11", [0x0bb0] = "\x2b\x12", [0x0bb1] = "\x2b\x13",
-+  [0x0bb2] = "\x2b\x14", [0x0bb3] = "\x2b\x15", [0x0bb4] = "\x2b\x16",
-+  [0x0bb5] = "\x2b\x17", [0x0bb6] = "\x2b\x18", [0x0bb7] = "\x2b\x19",
-+  [0x0bb8] = "\x2b\x1a", [0x0bb9] = "\x2b\x1b", [0x0bba] = "\x2b\x1c",
-+  [0x0bbb] = "\x2b\x1d", [0x0bbc] = "\x2b\x1e", [0x0bbd] = "\x2b\x1f",
-+  [0x0bbe] = "\x2b\x20", [0x0bbf] = "\x2b\x21", [0x0bc0] = "\x2b\x22",
-+  [0x0bc1] = "\x2b\x23", [0x0bc2] = "\x2b\x24", [0x0bc3] = "\x2b\x25",
-+  [0x0bc4] = "\x2b\x26", [0x0bc5] = "\x2b\x27", [0x0bc6] = "\x2b\x28",
-+  [0x0bc7] = "\x2b\x29", [0x0bc8] = "\x2b\x2a", [0x0bc9] = "\x2b\x2b",
-+  [0x0bca] = "\x2b\x2c", [0x0bcb] = "\x2b\x2d", [0x0bcc] = "\x2b\x2e",
-+  [0x0bcd] = "\x2b\x2f", [0x0bce] = "\x2b\x30", [0x0bcf] = "\x2b\x31",
-+  [0x0bd0] = "\x2b\x32", [0x0bd1] = "\x2b\x33", [0x0bd2] = "\x2b\x34",
-+  [0x0bd3] = "\x2b\x35", [0x0bd4] = "\x2b\x36", [0x0bd5] = "\x2b\x37",
-+  [0x0bd6] = "\x2b\x38", [0x0bd7] = "\x2b\x39", [0x0bd8] = "\x2b\x3a",
-+  [0x0bd9] = "\x2b\x3b", [0x0bda] = "\x2b\x3c", [0x0bdb] = "\x2b\x3d",
-+  [0x0bdc] = "\x2b\x3e", [0x0bdd] = "\x2b\x3f", [0x0bde] = "\x2b\x40",
-+  [0x0bdf] = "\x2b\x41", [0x0be0] = "\x2b\x42", [0x0be1] = "\x2b\x43",
-+  [0x0be2] = "\x2b\x44", [0x0be3] = "\x2b\x45", [0x0be4] = "\x2b\x46",
-+  [0x0be5] = "\x2b\x47", [0x0be6] = "\x2b\x48", [0x0be7] = "\x2b\x49",
-+  [0x0be8] = "\x2b\x4a", [0x0be9] = "\x2b\x4b", [0x0bea] = "\x2b\x4c",
-+  [0x0beb] = "\x2b\x4d", [0x0bec] = "\x2b\x4e", [0x0bed] = "\x2b\x4f",
-+  [0x0bee] = "\x2b\x50", [0x0bef] = "\x2b\x51", [0x0bf0] = "\x2b\x52",
-+  [0x0bf1] = "\x2b\x53", [0x0bf2] = "\x2b\x54", [0x0bf3] = "\x2b\x55",
-+  [0x0bf4] = "\x2b\x56", [0x0bf5] = "\x2b\x57", [0x0bf6] = "\x2b\x58",
-+  [0x0bf7] = "\x2b\x59", [0x0bf8] = "\x2b\x5a", [0x0bf9] = "\x2b\x5b",
-+  [0x0bfa] = "\x2b\x5c", [0x0bfb] = "\x2b\x5d", [0x0bfc] = "\x2b\x5e",
-+  [0x0bfd] = "\x2b\x5f", [0x0bfe] = "\x2b\x60", [0x0bff] = "\x2b\x61",
-+  [0x0c00] = "\x2b\x62", [0x0c01] = "\x2b\x63", [0x0c02] = "\x2b\x64",
-+  [0x0c03] = "\x2b\x65", [0x0c04] = "\x2b\x66", [0x0c05] = "\x2b\x67",
-+  [0x0c06] = "\x2b\x68", [0x0c07] = "\x2b\x69", [0x0c08] = "\x2b\x6a",
-+  [0x0c09] = "\x2b\x6b", [0x0c0a] = "\x2b\x6c", [0x0c0b] = "\x2b\x6d",
-+  [0x0c0c] = "\x2b\x6e", [0x0c0d] = "\x2b\x6f", [0x0c0e] = "\x2b\x70",
-+  [0x0c0f] = "\x2b\x71", [0x0c10] = "\x2b\x72", [0x0c11] = "\x2b\x73",
-+  [0x0c12] = "\x2b\x74", [0x0c13] = "\x2b\x75", [0x0c14] = "\x2b\x76",
-+  [0x0c15] = "\x2b\x77", [0x0c16] = "\x2b\x78", [0x0c17] = "\x2b\x79",
-+  [0x0c18] = "\x2b\x7a", [0x0c19] = "\x2b\x7b", [0x0c1a] = "\x2b\x7c",
-+  [0x0c1b] = "\x2b\x7d", [0x0c1c] = "\x2b\x7e", [0x0c1d] = "\x2b\x7f",
-+  [0x0c1e] = "\x2b\x80", [0x0c1f] = "\x2b\x81", [0x0c20] = "\x2b\x82",
-+  [0x0c21] = "\x2b\x83", [0x0c22] = "\x2b\x84", [0x0c23] = "\x2b\x85",
-+  [0x0c24] = "\x2b\x86", [0x0c25] = "\x2b\x87", [0x0c26] = "\x2b\x88",
-+  [0x0c27] = "\x2b\x89", [0x0c28] = "\x2b\x8a", [0x0c29] = "\x2b\x8b",
-+  [0x0c2a] = "\x2b\x8c", [0x0c2b] = "\x2b\x8d", [0x0c2c] = "\x2b\x8e",
-+  [0x0c2d] = "\x2b\x8f", [0x0c2e] = "\x2b\x90", [0x0c2f] = "\x2b\x91",
-+  [0x0c30] = "\x2b\x92", [0x0c31] = "\x2b\x93", [0x0c32] = "\x2b\x94",
-+  [0x0c33] = "\x2b\x95", [0x0c34] = "\x2b\x96", [0x0c35] = "\x2b\x97",
-+  [0x0c36] = "\x2b\x98", [0x0c37] = "\x2b\x99", [0x0c38] = "\x2b\x9a",
-+  [0x0c39] = "\x2b\x9b", [0x0c3a] = "\x2b\x9c", [0x0c3b] = "\x2b\x9d",
-+  [0x0c3c] = "\x2b\x9e", [0x0c3d] = "\x2b\x9f", [0x0c3e] = "\x2b\xa0",
-+  [0x0c3f] = "\x2b\xa1", [0x0c40] = "\x2b\xa2", [0x0c41] = "\x2b\xa3",
-+  [0x0c42] = "\x2b\xa4", [0x0c43] = "\x2b\xa5", [0x0c44] = "\x2b\xa6",
-+  [0x0c45] = "\x2b\xa7", [0x0c46] = "\x2b\xa8", [0x0c47] = "\x2b\xa9",
-+  [0x0c48] = "\x2b\xaa", [0x0c49] = "\x2b\xab", [0x0c4a] = "\x2b\xac",
-+  [0x0c4b] = "\x2b\xad", [0x0c4c] = "\x2b\xae", [0x0c4d] = "\x2b\xaf",
-+  [0x0c4e] = "\x2b\xb0", [0x0c4f] = "\x2b\xb1", [0x0c50] = "\x2b\xb2",
-+  [0x0c51] = "\x2b\xb3", [0x0c52] = "\x2b\xb4", [0x0c53] = "\x2b\xb5",
-+  [0x0c54] = "\x2b\xb6", [0x0c55] = "\x2b\xb7", [0x0c56] = "\x2b\xb8",
-+  [0x0c57] = "\x2b\xb9", [0x0c58] = "\x2b\xba", [0x0c59] = "\x2b\xbb",
-+  [0x0c5a] = "\x2b\xbc", [0x0c5b] = "\x2b\xbd", [0x0c5c] = "\x2b\xbe",
-+  [0x0c5d] = "\x2b\xbf", [0x0c5e] = "\x2b\xc0", [0x0c5f] = "\x2b\xc1",
-+  [0x0c60] = "\x2b\xc2", [0x0c61] = "\x2b\xc3", [0x0c62] = "\x2b\xc4",
-+  [0x0c63] = "\x2b\xc5", [0x0c64] = "\x2b\xc6", [0x0c65] = "\x2b\xc7",
-+  [0x0c66] = "\x2b\xc8", [0x0c67] = "\x2b\xc9", [0x0c68] = "\x2b\xca",
-+  [0x0c69] = "\x2b\xcb", [0x0c6a] = "\x2b\xcc", [0x0c6b] = "\x2b\xcd",
-+  [0x0c6c] = "\x2b\xce", [0x0c6d] = "\x2b\xcf", [0x0c6e] = "\x2b\xd0",
-+  [0x0c6f] = "\x2b\xd1", [0x0c70] = "\x2b\xd2", [0x0c71] = "\x2b\xd3",
-+  [0x0c72] = "\x2b\xd4", [0x0c73] = "\x2b\xd5", [0x0c74] = "\x2b\xd6",
-+  [0x0c75] = "\x2b\xd7", [0x0c76] = "\x2b\xd8", [0x0c77] = "\x2b\xd9",
-+  [0x0c78] = "\x2b\xda", [0x0c79] = "\x2b\xdb", [0x0c7a] = "\x2b\xdc",
-+  [0x0c7b] = "\x2b\xdd", [0x0c7c] = "\x2b\xde", [0x0c7d] = "\x2b\xdf",
-+  [0x0c7e] = "\x2b\xe0", [0x0c7f] = "\x2b\xe1", [0x0c80] = "\x2b\xe2",
-+  [0x0c81] = "\x2b\xe3", [0x0c82] = "\x2b\xe4", [0x0c83] = "\x2b\xe5",
-+  [0x0c84] = "\x2b\xe6", [0x0c85] = "\x2b\xe7", [0x0c86] = "\x2b\xe8",
-+  [0x0c87] = "\x2b\xe9", [0x0c88] = "\x2b\xea", [0x0c89] = "\x2b\xeb",
-+  [0x0c8a] = "\x2b\xec", [0x0c8b] = "\x2b\xed", [0x0c8c] = "\x2b\xee",
-+  [0x0c8d] = "\x2b\xef", [0x0c8e] = "\x2b\xf0", [0x0c8f] = "\x2b\xf1",
-+  [0x0c90] = "\x2b\xf2", [0x0c91] = "\x2b\xf3", [0x0c92] = "\x2b\xf4",
-+  [0x0c93] = "\x2b\xf5", [0x0c94] = "\x2b\xf6", [0x0c95] = "\x2b\xf7",
-+  [0x0c96] = "\x2b\xf8", [0x0c97] = "\x2b\xf9", [0x0c98] = "\x2b\xfa",
-+  [0x0c99] = "\x2b\xfb", [0x0c9a] = "\x2b\xfc", [0x0c9b] = "\x2b\xfd",
-+  [0x0c9c] = "\x2b\xfe", [0x0c9d] = "\x2b\xff", [0x0c9e] = "\x2c\x00",
-+  [0x0c9f] = "\x2c\x01", [0x0ca0] = "\x2c\x02", [0x0ca1] = "\x2c\x03",
-+  [0x0ca2] = "\x2c\x04", [0x0ca3] = "\x2c\x05", [0x0ca4] = "\x2c\x06",
-+  [0x0ca5] = "\x2c\x07", [0x0ca6] = "\x2c\x08", [0x0ca7] = "\x2c\x09",
-+  [0x0ca8] = "\x2c\x0a", [0x0ca9] = "\x2c\x0b", [0x0caa] = "\x2c\x0c",
-+  [0x0cab] = "\x2c\x0d", [0x0cac] = "\x2c\x0e", [0x0cad] = "\x2c\x0f",
-+  [0x0cae] = "\x2c\x10", [0x0caf] = "\x2c\x11", [0x0cb0] = "\x2c\x12",
-+  [0x0cb1] = "\x2c\x13", [0x0cb2] = "\x2c\x14", [0x0cb3] = "\x2c\x15",
-+  [0x0cb4] = "\x2c\x16", [0x0cb5] = "\x2c\x17", [0x0cb6] = "\x2c\x18",
-+  [0x0cb7] = "\x2c\x19", [0x0cb8] = "\x2c\x1a", [0x0cb9] = "\x2c\x1b",
-+  [0x0cba] = "\x2c\x1c", [0x0cbb] = "\x2c\x1d", [0x0cbc] = "\x2c\x1e",
-+  [0x0cbd] = "\x2c\x1f", [0x0cbe] = "\x2c\x20", [0x0cbf] = "\x2c\x21",
-+  [0x0cc0] = "\x2c\x22", [0x0cc1] = "\x2c\x23", [0x0cc2] = "\x2c\x24",
-+  [0x0cc3] = "\x2c\x25", [0x0cc4] = "\x2c\x26", [0x0cc5] = "\x2c\x27",
-+  [0x0cc6] = "\x2c\x28", [0x0cc7] = "\x2c\x29", [0x0cc8] = "\x2c\x2a",
-+  [0x0cc9] = "\x2c\x2b", [0x0cca] = "\x2c\x2c", [0x0ccb] = "\x2c\x2d",
-+  [0x0ccc] = "\x2c\x2e", [0x0ccd] = "\x2c\x2f", [0x0cce] = "\x2c\x30",
-+  [0x0ccf] = "\x2c\x31", [0x0cd0] = "\x2c\x32", [0x0cd1] = "\x2c\x33",
-+  [0x0cd2] = "\x2c\x34", [0x0cd3] = "\x2c\x35", [0x0cd4] = "\x2c\x36",
-+  [0x0cd5] = "\x2c\x37", [0x0cd6] = "\x2c\x38", [0x0cd7] = "\x2c\x39",
-+  [0x0cd8] = "\x2c\x3a", [0x0cd9] = "\x2c\x3b", [0x0cda] = "\x2c\x3c",
-+  [0x0cdb] = "\x2c\x3d", [0x0cdc] = "\x2c\x3e", [0x0cdd] = "\x2c\x3f",
-+  [0x0cde] = "\x2c\x40", [0x0cdf] = "\x2c\x41", [0x0ce0] = "\x2c\x42",
-+  [0x0ce1] = "\x2c\x43", [0x0ce2] = "\x2c\x44", [0x0ce3] = "\x2c\x45",
-+  [0x0ce4] = "\x2c\x46", [0x0ce5] = "\x2c\x47", [0x0ce6] = "\x2c\x48",
-+  [0x0ce7] = "\x2c\x49", [0x0ce8] = "\x2c\x4a", [0x0ce9] = "\x2c\x4b",
-+  [0x0cea] = "\x2c\x4c", [0x0ceb] = "\x2c\x4d", [0x0cec] = "\x2c\x4e",
-+  [0x0ced] = "\x2c\x4f", [0x0cee] = "\x2c\x50", [0x0cef] = "\x2c\x51",
-+  [0x0cf0] = "\x2c\x52", [0x0cf1] = "\x2c\x53", [0x0cf2] = "\x2c\x54",
-+  [0x0cf3] = "\x2c\x55", [0x0cf4] = "\x2c\x56", [0x0cf5] = "\x2c\x57",
-+  [0x0cf6] = "\x2c\x58", [0x0cf7] = "\x2c\x59", [0x0cf8] = "\x2c\x5a",
-+  [0x0cf9] = "\x2c\x5b", [0x0cfa] = "\x2c\x5c", [0x0cfb] = "\x2c\x5d",
-+  [0x0cfc] = "\x2c\x5e", [0x0cfd] = "\x2c\x5f", [0x0cfe] = "\x2c\x60",
-+  [0x0cff] = "\x2c\x61", [0x0d00] = "\x2c\x62", [0x0d01] = "\x2c\x63",
-+  [0x0d02] = "\x2c\x64", [0x0d03] = "\x2c\x65", [0x0d04] = "\x2c\x66",
-+  [0x0d05] = "\x2c\x67", [0x0d06] = "\x2c\x68", [0x0d07] = "\x2c\x69",
-+  [0x0d08] = "\x2c\x6a", [0x0d09] = "\x2c\x6b", [0x0d0a] = "\x2c\x6c",
-+  [0x0d0b] = "\x2c\x6d", [0x0d0c] = "\x2c\x6e", [0x0d0d] = "\x2c\x6f",
-+  [0x0d0e] = "\x2c\x70", [0x0d0f] = "\x2c\x71", [0x0d10] = "\x2c\x72",
-+  [0x0d11] = "\x2c\x73", [0x0d12] = "\x2c\x74", [0x0d13] = "\x2c\x75",
-+  [0x0d14] = "\x2c\x76", [0x0d15] = "\x2c\x77", [0x0d16] = "\x2c\x78",
-+  [0x0d17] = "\x2c\x79", [0x0d18] = "\x2c\x7a", [0x0d19] = "\x2c\x7b",
-+  [0x0d1a] = "\x2c\x7c", [0x0d1b] = "\x2c\x7d", [0x0d1c] = "\x2c\x7e",
-+  [0x0d1d] = "\x2c\x7f", [0x0d1e] = "\x2c\x80", [0x0d1f] = "\x2c\x81",
-+  [0x0d20] = "\x2c\x82", [0x0d21] = "\x2c\x83", [0x0d22] = "\x2c\x84",
-+  [0x0d23] = "\x2c\x85", [0x0d24] = "\x2c\x86", [0x0d25] = "\x2c\x87",
-+  [0x0d26] = "\x2c\x88", [0x0d27] = "\x2c\x89", [0x0d28] = "\x2c\x8a",
-+  [0x0d29] = "\x2c\x8b", [0x0d2a] = "\x2c\x8c", [0x0d2b] = "\x2c\x8d",
-+  [0x0d2c] = "\x2c\x8e", [0x0d2d] = "\x2c\x8f", [0x0d2e] = "\x2c\x90",
-+  [0x0d2f] = "\x2c\x91", [0x0d30] = "\x2c\x92", [0x0d31] = "\x2c\x93",
-+  [0x0d32] = "\x2c\x94", [0x0d33] = "\x2c\x95", [0x0d34] = "\x2c\x96",
-+  [0x0d35] = "\x2c\x97", [0x0d36] = "\x2c\x98", [0x0d37] = "\x2c\x99",
-+  [0x0d38] = "\x2c\x9a", [0x0d39] = "\x2c\x9b", [0x0d3a] = "\x2c\x9c",
-+  [0x0d3b] = "\x2c\x9d", [0x0d3c] = "\x2c\x9e", [0x0d3d] = "\x2c\x9f",
-+  [0x0d3e] = "\x2c\xa0", [0x0d3f] = "\x2c\xa1", [0x0d40] = "\x2c\xa2",
-+  [0x0d41] = "\x2c\xa3", [0x0d42] = "\x2c\xa4", [0x0d43] = "\x2c\xa5",
-+  [0x0d44] = "\x2c\xa6", [0x0d45] = "\x2c\xa7", [0x0d46] = "\x2c\xa8",
-+  [0x0d47] = "\x2c\xa9", [0x0d48] = "\x2c\xaa", [0x0d49] = "\x2c\xab",
-+  [0x0d4a] = "\x2c\xac", [0x0d4b] = "\x2c\xad", [0x0d4c] = "\x2c\xae",
-+  [0x0d4d] = "\x2c\xaf", [0x0d4e] = "\x2c\xb0", [0x0d4f] = "\x2c\xb1",
-+  [0x0d50] = "\x2c\xb2", [0x0d51] = "\x2c\xb3", [0x0d52] = "\x2c\xb4",
-+  [0x0d53] = "\x2c\xb5", [0x0d54] = "\x2c\xb6", [0x0d55] = "\x2c\xb7",
-+  [0x0d56] = "\x2c\xb8", [0x0d57] = "\x2c\xb9", [0x0d58] = "\x2c\xba",
-+  [0x0d59] = "\x2c\xbb", [0x0d5a] = "\x2c\xbc", [0x0d5b] = "\x2c\xbd",
-+  [0x0d5c] = "\x2c\xbe", [0x0d5d] = "\x2c\xbf", [0x0d5e] = "\x2c\xc0",
-+  [0x0d5f] = "\x2c\xc1", [0x0d60] = "\x2c\xc2", [0x0d61] = "\x2c\xc3",
-+  [0x0d62] = "\x2c\xc4", [0x0d63] = "\x2c\xc5", [0x0d64] = "\x2c\xc6",
-+  [0x0d65] = "\x2c\xc7", [0x0d66] = "\x2c\xc8", [0x0d67] = "\x2c\xc9",
-+  [0x0d68] = "\x2c\xca", [0x0d69] = "\x2c\xcb", [0x0d6a] = "\x2c\xcc",
-+  [0x0d6b] = "\x2c\xcd", [0x0d6c] = "\x2c\xce", [0x0d6d] = "\x2c\xcf",
-+  [0x0d6e] = "\x2c\xd0", [0x0d6f] = "\x2c\xd1", [0x0d70] = "\x2c\xd2",
-+  [0x0d71] = "\x2c\xd3", [0x0d72] = "\x2c\xd4", [0x0d73] = "\x2c\xd5",
-+  [0x0d74] = "\x2c\xd6", [0x0d75] = "\x2c\xd7", [0x0d76] = "\x2c\xd8",
-+  [0x0d77] = "\x2c\xd9", [0x0d78] = "\x2c\xda", [0x0d79] = "\x2c\xdb",
-+  [0x0d7a] = "\x2c\xdc", [0x0d7b] = "\x2c\xdd", [0x0d7c] = "\x2c\xde",
-+  [0x0d7d] = "\x2c\xdf", [0x0d7e] = "\x2c\xe0", [0x0d7f] = "\x2c\xe1",
-+  [0x0d80] = "\x2c\xe2", [0x0d81] = "\x2c\xe3", [0x0d82] = "\x2c\xe4",
-+  [0x0d83] = "\x2c\xe5", [0x0d84] = "\x2c\xe6", [0x0d85] = "\x2c\xe7",
-+  [0x0d86] = "\x2c\xe8", [0x0d87] = "\x2c\xe9", [0x0d88] = "\x2c\xea",
-+  [0x0d89] = "\x2c\xeb", [0x0d8a] = "\x2c\xec", [0x0d8b] = "\x2c\xed",
-+  [0x0d8c] = "\x2c\xee", [0x0d8d] = "\x2c\xef", [0x0d8e] = "\x2c\xf0",
-+  [0x0d8f] = "\x2c\xf1", [0x0d90] = "\x2c\xf2", [0x0d91] = "\x2c\xf3",
-+  [0x0d92] = "\x2c\xf4", [0x0d93] = "\x2c\xf5", [0x0d94] = "\x2c\xf6",
-+  [0x0d95] = "\x2c\xf7", [0x0d96] = "\x2c\xf8", [0x0d97] = "\x2c\xf9",
-+  [0x0d98] = "\x2c\xfa", [0x0d99] = "\x2c\xfb", [0x0d9a] = "\x2c\xfc",
-+  [0x0d9b] = "\x2c\xfd", [0x0d9c] = "\x2c\xfe", [0x0d9d] = "\x2c\xff",
-+  [0x0d9e] = "\x2d\x00", [0x0d9f] = "\x2d\x01", [0x0da0] = "\x2d\x02",
-+  [0x0da1] = "\x2d\x03", [0x0da2] = "\x2d\x04", [0x0da3] = "\x2d\x05",
-+  [0x0da4] = "\x2d\x06", [0x0da5] = "\x2d\x07", [0x0da6] = "\x2d\x08",
-+  [0x0da7] = "\x2d\x09", [0x0da8] = "\x2d\x0a", [0x0da9] = "\x2d\x0b",
-+  [0x0daa] = "\x2d\x0c", [0x0dab] = "\x2d\x0d", [0x0dac] = "\x2d\x0e",
-+  [0x0dad] = "\x2d\x0f", [0x0dae] = "\x2d\x10", [0x0daf] = "\x2d\x11",
-+  [0x0db0] = "\x2d\x12", [0x0db1] = "\x2d\x13", [0x0db2] = "\x2d\x14",
-+  [0x0db3] = "\x2d\x15", [0x0db4] = "\x2d\x16", [0x0db5] = "\x2d\x17",
-+  [0x0db6] = "\x2d\x18", [0x0db7] = "\x2d\x19", [0x0db8] = "\x2d\x1a",
-+  [0x0db9] = "\x2d\x1b", [0x0dba] = "\x2d\x1c", [0x0dbb] = "\x2d\x1d",
-+  [0x0dbc] = "\x2d\x1e", [0x0dbd] = "\x2d\x1f", [0x0dbe] = "\x2d\x20",
-+  [0x0dbf] = "\x2d\x21", [0x0dc0] = "\x2d\x22", [0x0dc1] = "\x2d\x23",
-+  [0x0dc2] = "\x2d\x24", [0x0dc3] = "\x2d\x25", [0x0dc4] = "\x2d\x26",
-+  [0x0dc5] = "\x2d\x27", [0x0dc6] = "\x2d\x28", [0x0dc7] = "\x2d\x29",
-+  [0x0dc8] = "\x2d\x2a", [0x0dc9] = "\x2d\x2b", [0x0dca] = "\x2d\x2c",
-+  [0x0dcb] = "\x2d\x2d", [0x0dcc] = "\x2d\x2e", [0x0dcd] = "\x2d\x2f",
-+  [0x0dce] = "\x2d\x30", [0x0dcf] = "\x2d\x31", [0x0dd0] = "\x2d\x32",
-+  [0x0dd1] = "\x2d\x33", [0x0dd2] = "\x2d\x34", [0x0dd3] = "\x2d\x35",
-+  [0x0dd4] = "\x2d\x36", [0x0dd5] = "\x2d\x37", [0x0dd6] = "\x2d\x38",
-+  [0x0dd7] = "\x2d\x39", [0x0dd8] = "\x2d\x3a", [0x0dd9] = "\x2d\x3b",
-+  [0x0dda] = "\x2d\x3c", [0x0ddb] = "\x2d\x3d", [0x0ddc] = "\x2d\x3e",
-+  [0x0ddd] = "\x2d\x3f", [0x0dde] = "\x2d\x40", [0x0ddf] = "\x2d\x41",
-+  [0x0de0] = "\x2d\x42", [0x0de1] = "\x2d\x43", [0x0de2] = "\x2d\x44",
-+  [0x0de3] = "\x2d\x45", [0x0de4] = "\x2d\x46", [0x0de5] = "\x2d\x47",
-+  [0x0de6] = "\x2d\x48", [0x0de7] = "\x2d\x49", [0x0de8] = "\x2d\x4a",
-+  [0x0de9] = "\x2d\x4b", [0x0dea] = "\x2d\x4c", [0x0deb] = "\x2d\x4d",
-+  [0x0dec] = "\x2d\x4e", [0x0ded] = "\x2d\x4f", [0x0dee] = "\x2d\x50",
-+  [0x0def] = "\x2d\x51", [0x0df0] = "\x2d\x52", [0x0df1] = "\x2d\x53",
-+  [0x0df2] = "\x2d\x54", [0x0df3] = "\x2d\x55", [0x0df4] = "\x2d\x56",
-+  [0x0df5] = "\x2d\x57", [0x0df6] = "\x2d\x58", [0x0df7] = "\x2d\x59",
-+  [0x0df8] = "\x2d\x5a", [0x0df9] = "\x2d\x5b", [0x0dfa] = "\x2d\x5c",
-+  [0x0dfb] = "\x2d\x5d", [0x0dfc] = "\x2d\x5e", [0x0dfd] = "\x2d\x5f",
-+  [0x0dfe] = "\x2d\x60", [0x0dff] = "\x2d\x61", [0x0e00] = "\x2d\x62",
-+  [0x0e01] = "\x2d\x63", [0x0e02] = "\x2d\x64", [0x0e03] = "\x2d\x65",
-+  [0x0e04] = "\x2d\x66", [0x0e05] = "\x2d\x67", [0x0e06] = "\x2d\x68",
-+  [0x0e07] = "\x2d\x69", [0x0e08] = "\x2d\x6a", [0x0e09] = "\x2d\x6b",
-+  [0x0e0a] = "\x2d\x6c", [0x0e0b] = "\x2d\x6d", [0x0e0c] = "\x2d\x6e",
-+  [0x0e0d] = "\x2d\x6f", [0x0e0e] = "\x2d\x70", [0x0e0f] = "\x2d\x71",
-+  [0x0e10] = "\x2d\x72", [0x0e11] = "\x2d\x73", [0x0e12] = "\x2d\x74",
-+  [0x0e13] = "\x2d\x75", [0x0e14] = "\x2d\x76", [0x0e15] = "\x2d\x77",
-+  [0x0e16] = "\x2d\x78", [0x0e17] = "\x2d\x79", [0x0e18] = "\x2d\x7a",
-+  [0x0e19] = "\x2d\x7b", [0x0e1a] = "\x2d\x7c", [0x0e1b] = "\x2d\x7d",
-+  [0x0e1c] = "\x2d\x7e", [0x0e1d] = "\x2d\x7f", [0x0e1e] = "\x2d\x80",
-+  [0x0e1f] = "\x2d\x81", [0x0e20] = "\x2d\x82", [0x0e21] = "\x2d\x83",
-+  [0x0e22] = "\x2d\x84", [0x0e23] = "\x2d\x85", [0x0e24] = "\x2d\x86",
-+  [0x0e25] = "\x2d\x87", [0x0e26] = "\x2d\x88", [0x0e27] = "\x2d\x89",
-+  [0x0e28] = "\x2d\x8a", [0x0e29] = "\x2d\x8b", [0x0e2a] = "\x2d\x8c",
-+  [0x0e2b] = "\x2d\x8d", [0x0e2c] = "\x2d\x8e", [0x0e2d] = "\x2d\x8f",
-+  [0x0e2e] = "\x2d\x90", [0x0e2f] = "\x2d\x91", [0x0e30] = "\x2d\x92",
-+  [0x0e31] = "\x2d\x93", [0x0e32] = "\x2d\x94", [0x0e33] = "\x2d\x95",
-+  [0x0e34] = "\x2d\x96", [0x0e35] = "\x2d\x97", [0x0e36] = "\x2d\x98",
-+  [0x0e37] = "\x2d\x99", [0x0e38] = "\x2d\x9a", [0x0e39] = "\x2d\x9b",
-+  [0x0e3a] = "\x2d\x9c", [0x0e3b] = "\x2d\x9d", [0x0e3c] = "\x2d\x9e",
-+  [0x0e3d] = "\x2d\x9f", [0x0e3e] = "\x2d\xa0", [0x0e3f] = "\x2d\xa1",
-+  [0x0e40] = "\x2d\xa2", [0x0e41] = "\x2d\xa3", [0x0e42] = "\x2d\xa4",
-+  [0x0e43] = "\x2d\xa5", [0x0e44] = "\x2d\xa6", [0x0e45] = "\x2d\xa7",
-+  [0x0e46] = "\x2d\xa8", [0x0e47] = "\x2d\xa9", [0x0e48] = "\x2d\xaa",
-+  [0x0e49] = "\x2d\xab", [0x0e4a] = "\x2d\xac", [0x0e4b] = "\x2d\xad",
-+  [0x0e4c] = "\x2d\xae", [0x0e4d] = "\x2d\xaf", [0x0e4e] = "\x2d\xb0",
-+  [0x0e4f] = "\x2d\xb1", [0x0e50] = "\x2d\xb2", [0x0e51] = "\x2d\xb3",
-+  [0x0e52] = "\x2d\xb4", [0x0e53] = "\x2d\xb5", [0x0e54] = "\x2d\xb6",
-+  [0x0e55] = "\x2d\xb7", [0x0e56] = "\x2d\xb8", [0x0e57] = "\x2d\xb9",
-+  [0x0e58] = "\x2d\xba", [0x0e59] = "\x2d\xbb", [0x0e5a] = "\x2d\xbc",
-+  [0x0e5b] = "\x2d\xbd", [0x0e5c] = "\x2d\xbe", [0x0e5d] = "\x2d\xbf",
-+  [0x0e5e] = "\x2d\xc0", [0x0e5f] = "\x2d\xc1", [0x0e60] = "\x2d\xc2",
-+  [0x0e61] = "\x2d\xc3", [0x0e62] = "\x2d\xc4", [0x0e63] = "\x2d\xc5",
-+  [0x0e64] = "\x2d\xc6", [0x0e65] = "\x2d\xc7", [0x0e66] = "\x2d\xc8",
-+  [0x0e67] = "\x2d\xc9", [0x0e68] = "\x2d\xca", [0x0e69] = "\x2d\xcb",
-+  [0x0e6a] = "\x2d\xcc", [0x0e6b] = "\x2d\xcd", [0x0e6c] = "\x2d\xce",
-+  [0x0e6d] = "\x2d\xcf", [0x0e6e] = "\x2d\xd0", [0x0e6f] = "\x2d\xd1",
-+  [0x0e70] = "\x2d\xd2", [0x0e71] = "\x2d\xd3", [0x0e72] = "\x2d\xd4",
-+  [0x0e73] = "\x2d\xd5", [0x0e74] = "\x2d\xd6", [0x0e75] = "\x2d\xd7",
-+  [0x0e76] = "\x2d\xd8", [0x0e77] = "\x2d\xd9", [0x0e78] = "\x2d\xda",
-+  [0x0e79] = "\x2d\xdb", [0x0e7a] = "\x2d\xdc", [0x0e7b] = "\x2d\xdd",
-+  [0x0e7c] = "\x2d\xde", [0x0e7d] = "\x2d\xdf", [0x0e7e] = "\x2d\xe0",
-+  [0x0e7f] = "\x2d\xe1", [0x0e80] = "\x2d\xe2", [0x0e81] = "\x2d\xe3",
-+  [0x0e82] = "\x2d\xe4", [0x0e83] = "\x2d\xe5", [0x0e84] = "\x2d\xe6",
-+  [0x0e85] = "\x2d\xe7", [0x0e86] = "\x2d\xe8", [0x0e87] = "\x2d\xe9",
-+  [0x0e88] = "\x2d\xea", [0x0e89] = "\x2d\xeb", [0x0e8a] = "\x2d\xec",
-+  [0x0e8b] = "\x2d\xed", [0x0e8c] = "\x2d\xee", [0x0e8d] = "\x2d\xef",
-+  [0x0e8e] = "\x2d\xf0", [0x0e8f] = "\x2d\xf1", [0x0e90] = "\x2d\xf2",
-+  [0x0e91] = "\x2d\xf3", [0x0e92] = "\x2d\xf4", [0x0e93] = "\x2d\xf5",
-+  [0x0e94] = "\x2d\xf6", [0x0e95] = "\x2d\xf7", [0x0e96] = "\x2d\xf8",
-+  [0x0e97] = "\x2d\xf9", [0x0e98] = "\x2d\xfa", [0x0e99] = "\x2d\xfb",
-+  [0x0e9a] = "\x2d\xfc", [0x0e9b] = "\x2d\xfd", [0x0e9c] = "\x2d\xfe",
-+  [0x0e9d] = "\x2d\xff", [0x0e9e] = "\x2e\x00", [0x0e9f] = "\x2e\x01",
-+  [0x0ea0] = "\x2e\x02", [0x0ea1] = "\x2e\x03", [0x0ea2] = "\x2e\x04",
-+  [0x0ea3] = "\x2e\x05", [0x0ea4] = "\x2e\x06", [0x0ea5] = "\x2e\x07",
-+  [0x0ea6] = "\x2e\x08", [0x0ea7] = "\x2e\x09", [0x0ea8] = "\x2e\x0a",
-+  [0x0ea9] = "\x2e\x0b", [0x0eaa] = "\x2e\x0c", [0x0eab] = "\x2e\x0d",
-+  [0x0eac] = "\x2e\x0e", [0x0ead] = "\x2e\x0f", [0x0eae] = "\x2e\x10",
-+  [0x0eaf] = "\x2e\x11", [0x0eb0] = "\x2e\x12", [0x0eb1] = "\x2e\x13",
-+  [0x0eb2] = "\x2e\x14", [0x0eb3] = "\x2e\x15", [0x0eb4] = "\x2e\x16",
-+  [0x0eb5] = "\x2e\x17", [0x0eb6] = "\x2e\x18", [0x0eb7] = "\x2e\x19",
-+  [0x0eb8] = "\x2e\x1a", [0x0eb9] = "\x2e\x1b", [0x0eba] = "\x2e\x1c",
-+  [0x0ebb] = "\x2e\x1d", [0x0ebc] = "\x2e\x1e", [0x0ebd] = "\x2e\x1f",
-+  [0x0ebe] = "\x2e\x20", [0x0ebf] = "\x2e\x21", [0x0ec0] = "\x2e\x22",
-+  [0x0ec1] = "\x2e\x23", [0x0ec2] = "\x2e\x24", [0x0ec3] = "\x2e\x25",
-+  [0x0ec4] = "\x2e\x26", [0x0ec5] = "\x2e\x27", [0x0ec6] = "\x2e\x28",
-+  [0x0ec7] = "\x2e\x29", [0x0ec8] = "\x2e\x2a", [0x0ec9] = "\x2e\x2b",
-+  [0x0eca] = "\x2e\x2c", [0x0ecb] = "\x2e\x2d", [0x0ecc] = "\x2e\x2e",
-+  [0x0ecd] = "\x2e\x2f", [0x0ece] = "\x2e\x30", [0x0ecf] = "\x2e\x31",
-+  [0x0ed0] = "\x2e\x32", [0x0ed1] = "\x2e\x33", [0x0ed2] = "\x2e\x34",
-+  [0x0ed3] = "\x2e\x35", [0x0ed4] = "\x2e\x36", [0x0ed5] = "\x2e\x37",
-+  [0x0ed6] = "\x2e\x38", [0x0ed7] = "\x2e\x39", [0x0ed8] = "\x2e\x3a",
-+  [0x0ed9] = "\x2e\x3b", [0x0eda] = "\x2e\x3c", [0x0edb] = "\x2e\x3d",
-+  [0x0edc] = "\x2e\x3e", [0x0edd] = "\x2e\x3f", [0x0ede] = "\x2e\x40",
-+  [0x0edf] = "\x2e\x41", [0x0ee0] = "\x2e\x42", [0x0ee1] = "\x2e\x43",
-+  [0x0ee2] = "\x2e\x44", [0x0ee3] = "\x2e\x45", [0x0ee4] = "\x2e\x46",
-+  [0x0ee5] = "\x2e\x47", [0x0ee6] = "\x2e\x48", [0x0ee7] = "\x2e\x49",
-+  [0x0ee8] = "\x2e\x4a", [0x0ee9] = "\x2e\x4b", [0x0eea] = "\x2e\x4c",
-+  [0x0eeb] = "\x2e\x4d", [0x0eec] = "\x2e\x4e", [0x0eed] = "\x2e\x4f",
-+  [0x0eee] = "\x2e\x50", [0x0eef] = "\x2e\x51", [0x0ef0] = "\x2e\x52",
-+  [0x0ef1] = "\x2e\x53", [0x0ef2] = "\x2e\x54", [0x0ef3] = "\x2e\x55",
-+  [0x0ef4] = "\x2e\x56", [0x0ef5] = "\x2e\x57", [0x0ef6] = "\x2e\x58",
-+  [0x0ef7] = "\x2e\x59", [0x0ef8] = "\x2e\x5a", [0x0ef9] = "\x2e\x5b",
-+  [0x0efa] = "\x2e\x5c", [0x0efb] = "\x2e\x5d", [0x0efc] = "\x2e\x5e",
-+  [0x0efd] = "\x2e\x5f", [0x0efe] = "\x2e\x60", [0x0eff] = "\x2e\x61",
-+  [0x0f00] = "\x2e\x62", [0x0f01] = "\x2e\x63", [0x0f02] = "\x2e\x64",
-+  [0x0f03] = "\x2e\x65", [0x0f04] = "\x2e\x66", [0x0f05] = "\x2e\x67",
-+  [0x0f06] = "\x2e\x68", [0x0f07] = "\x2e\x69", [0x0f08] = "\x2e\x6a",
-+  [0x0f09] = "\x2e\x6b", [0x0f0a] = "\x2e\x6c", [0x0f0b] = "\x2e\x6d",
-+  [0x0f0c] = "\x2e\x6e", [0x0f0d] = "\x2e\x6f", [0x0f0e] = "\x2e\x70",
-+  [0x0f0f] = "\x2e\x71", [0x0f10] = "\x2e\x72", [0x0f11] = "\x2e\x73",
-+  [0x0f12] = "\x2e\x74", [0x0f13] = "\x2e\x75", [0x0f14] = "\x2e\x76",
-+  [0x0f15] = "\x2e\x77", [0x0f16] = "\x2e\x78", [0x0f17] = "\x2e\x79",
-+  [0x0f18] = "\x2e\x7a", [0x0f19] = "\x2e\x7b", [0x0f1a] = "\x2e\x7c",
-+  [0x0f1b] = "\x2e\x7d", [0x0f1c] = "\x2e\x7e", [0x0f1d] = "\x2e\x7f",
-+  [0x0f1e] = "\x2e\x80", [0x0f1f] = "\x2e\x81", [0x0f20] = "\x2e\x82",
-+  [0x0f21] = "\x2e\x83", [0x0f22] = "\x2e\x84", [0x0f23] = "\x2e\x85",
-+  [0x0f24] = "\x2e\x86", [0x0f25] = "\x2e\x87", [0x0f26] = "\x2e\x88",
-+  [0x0f27] = "\x2e\x89", [0x0f28] = "\x2e\x8a", [0x0f29] = "\x2e\x8b",
-+  [0x0f2a] = "\x2e\x8c", [0x0f2b] = "\x2e\x8d", [0x0f2c] = "\x2e\x8e",
-+  [0x0f2d] = "\x2e\x8f", [0x0f2e] = "\x2e\x90", [0x0f2f] = "\x2e\x91",
-+  [0x0f30] = "\x2e\x92", [0x0f31] = "\x2e\x93", [0x0f32] = "\x2e\x94",
-+  [0x0f33] = "\x2e\x95", [0x0f34] = "\x2e\x96", [0x0f35] = "\x2e\x97",
-+  [0x0f36] = "\x2e\x98", [0x0f37] = "\x2e\x99", [0x0f38] = "\x2e\x9a",
-+  [0x0f39] = "\x2e\x9b", [0x0f3a] = "\x2e\x9c", [0x0f3b] = "\x2e\x9d",
-+  [0x0f3c] = "\x2e\x9e", [0x0f3d] = "\x2e\x9f", [0x0f3e] = "\x2e\xa0",
-+  [0x0f3f] = "\x2e\xa1", [0x0f40] = "\x2e\xa2", [0x0f41] = "\x2e\xa3",
-+  [0x0f42] = "\x2e\xa4", [0x0f43] = "\x2e\xa5", [0x0f44] = "\x2e\xa6",
-+  [0x0f45] = "\x2e\xa7", [0x0f46] = "\x2e\xa8", [0x0f47] = "\x2e\xa9",
-+  [0x0f48] = "\x2e\xaa", [0x0f49] = "\x2e\xab", [0x0f4a] = "\x2e\xac",
-+  [0x0f4b] = "\x2e\xad", [0x0f4c] = "\x2e\xae", [0x0f4d] = "\x2e\xaf",
-+  [0x0f4e] = "\x2e\xb0", [0x0f4f] = "\x2e\xb1", [0x0f50] = "\x2e\xb2",
-+  [0x0f51] = "\x2e\xb3", [0x0f52] = "\x2e\xb4", [0x0f53] = "\x2e\xb5",
-+  [0x0f54] = "\x2e\xb6", [0x0f55] = "\x2e\xb7", [0x0f56] = "\x2e\xb8",
-+  [0x0f57] = "\x2e\xb9", [0x0f58] = "\x2e\xba", [0x0f59] = "\x2e\xbb",
-+  [0x0f5a] = "\x2e\xbc", [0x0f5b] = "\x2e\xbd", [0x0f5c] = "\x2e\xbe",
-+  [0x0f5d] = "\x2e\xbf", [0x0f5e] = "\x2e\xc0", [0x0f5f] = "\x2e\xc1",
-+  [0x0f60] = "\x2e\xc2", [0x0f61] = "\x2e\xc3", [0x0f62] = "\x2e\xc4",
-+  [0x0f63] = "\x2e\xc5", [0x0f64] = "\x2e\xc6", [0x0f65] = "\x2e\xc7",
-+  [0x0f66] = "\x2e\xc8", [0x0f67] = "\x2e\xc9", [0x0f68] = "\x2e\xca",
-+  [0x0f69] = "\x2e\xcb", [0x0f6a] = "\x2e\xcc", [0x0f6b] = "\x2e\xcd",
-+  [0x0f6c] = "\x2e\xce", [0x0f6d] = "\x2e\xcf", [0x0f6e] = "\x2e\xd0",
-+  [0x0f6f] = "\x2e\xd1", [0x0f70] = "\x2e\xd2", [0x0f71] = "\x2e\xd3",
-+  [0x0f72] = "\x2e\xd4", [0x0f73] = "\x2e\xd5", [0x0f74] = "\x2e\xd6",
-+  [0x0f75] = "\x2e\xd7", [0x0f76] = "\x2e\xd8", [0x0f77] = "\x2e\xd9",
-+  [0x0f78] = "\x2e\xda", [0x0f79] = "\x2e\xdb", [0x0f7a] = "\x2e\xdc",
-+  [0x0f7b] = "\x2e\xdd", [0x0f7c] = "\x2e\xde", [0x0f7d] = "\x2e\xdf",
-+  [0x0f7e] = "\x2e\xe0", [0x0f7f] = "\x2e\xe1", [0x0f80] = "\x2e\xe2",
-+  [0x0f81] = "\x2e\xe3", [0x0f82] = "\x2e\xe4", [0x0f83] = "\x2e\xe5",
-+  [0x0f84] = "\x2e\xe6", [0x0f85] = "\x2e\xe7", [0x0f86] = "\x2e\xe8",
-+  [0x0f87] = "\x2e\xe9", [0x0f88] = "\x2e\xea", [0x0f89] = "\x2e\xeb",
-+  [0x0f8a] = "\x2e\xec", [0x0f8b] = "\x2e\xed", [0x0f8c] = "\x2e\xee",
-+  [0x0f8d] = "\x2e\xef", [0x0f8e] = "\x2e\xf0", [0x0f8f] = "\x2e\xf1",
-+  [0x0f90] = "\x2e\xf2", [0x0f91] = "\x2e\xf3", [0x0f92] = "\x2e\xf4",
-+  [0x0f93] = "\x2e\xf5", [0x0f94] = "\x2e\xf6", [0x0f95] = "\x2e\xf7",
-+  [0x0f96] = "\x2e\xf8", [0x0f97] = "\x2e\xf9", [0x0f98] = "\x2e\xfa",
-+  [0x0f99] = "\x2e\xfb", [0x0f9a] = "\x2e\xfc", [0x0f9b] = "\x2e\xfd",
-+  [0x0f9c] = "\x2e\xfe", [0x0f9d] = "\x2e\xff", [0x0f9e] = "\x2f\x00",
-+  [0x0f9f] = "\x2f\x01", [0x0fa0] = "\x2f\x02", [0x0fa1] = "\x2f\x03",
-+  [0x0fa2] = "\x2f\x04", [0x0fa3] = "\x2f\x05", [0x0fa4] = "\x2f\x06",
-+  [0x0fa5] = "\x2f\x07", [0x0fa6] = "\x2f\x08", [0x0fa7] = "\x2f\x09",
-+  [0x0fa8] = "\x2f\x0a", [0x0fa9] = "\x2f\x0b", [0x0faa] = "\x2f\x0c",
-+  [0x0fab] = "\x2f\x0d", [0x0fac] = "\x2f\x0e", [0x0fad] = "\x2f\x0f",
-+  [0x0fae] = "\x2f\x10", [0x0faf] = "\x2f\x11", [0x0fb0] = "\x2f\x12",
-+  [0x0fb1] = "\x2f\x13", [0x0fb2] = "\x2f\x14", [0x0fb3] = "\x2f\x15",
-+  [0x0fb4] = "\x2f\x16", [0x0fb5] = "\x2f\x17", [0x0fb6] = "\x2f\x18",
-+  [0x0fb7] = "\x2f\x19", [0x0fb8] = "\x2f\x1a", [0x0fb9] = "\x2f\x1b",
-+  [0x0fba] = "\x2f\x1c", [0x0fbb] = "\x2f\x1d", [0x0fbc] = "\x2f\x1e",
-+  [0x0fbd] = "\x2f\x1f", [0x0fbe] = "\x2f\x20", [0x0fbf] = "\x2f\x21",
-+  [0x0fc0] = "\x2f\x22", [0x0fc1] = "\x2f\x23", [0x0fc2] = "\x2f\x24",
-+  [0x0fc3] = "\x2f\x25", [0x0fc4] = "\x2f\x26", [0x0fc5] = "\x2f\x27",
-+  [0x0fc6] = "\x2f\x28", [0x0fc7] = "\x2f\x29", [0x0fc8] = "\x2f\x2a",
-+  [0x0fc9] = "\x2f\x2b", [0x0fca] = "\x2f\x2c", [0x0fcb] = "\x2f\x2d",
-+  [0x0fcc] = "\x2f\x2e", [0x0fcd] = "\x2f\x2f", [0x0fce] = "\x2f\x30",
-+  [0x0fcf] = "\x2f\x31", [0x0fd0] = "\x2f\x32", [0x0fd1] = "\x2f\x33",
-+  [0x0fd2] = "\x2f\x34", [0x0fd3] = "\x2f\x35", [0x0fd4] = "\x2f\x36",
-+  [0x0fd5] = "\x2f\x37", [0x0fd6] = "\x2f\x38", [0x0fd7] = "\x2f\x39",
-+  [0x0fd8] = "\x2f\x3a", [0x0fd9] = "\x2f\x3b", [0x0fda] = "\x2f\x3c",
-+  [0x0fdb] = "\x2f\x3d", [0x0fdc] = "\x2f\x3e", [0x0fdd] = "\x2f\x3f",
-+  [0x0fde] = "\x2f\x40", [0x0fdf] = "\x2f\x41", [0x0fe0] = "\x2f\x42",
-+  [0x0fe1] = "\x2f\x43", [0x0fe2] = "\x2f\x44", [0x0fe3] = "\x2f\x45",
-+  [0x0fe4] = "\x2f\x46", [0x0fe5] = "\x2f\x47", [0x0fe6] = "\x2f\x48",
-+  [0x0fe7] = "\x2f\x49", [0x0fe8] = "\x2f\x4a", [0x0fe9] = "\x2f\x4b",
-+  [0x0fea] = "\x2f\x4c", [0x0feb] = "\x2f\x4d", [0x0fec] = "\x2f\x4e",
-+  [0x0fed] = "\x2f\x4f", [0x0fee] = "\x2f\x50", [0x0fef] = "\x2f\x51",
-+  [0x0ff0] = "\x2f\x52", [0x0ff1] = "\x2f\x53", [0x0ff2] = "\x2f\x54",
-+  [0x0ff3] = "\x2f\x55", [0x0ff4] = "\x2f\x56", [0x0ff5] = "\x2f\x57",
-+  [0x0ff6] = "\x2f\x58", [0x0ff7] = "\x2f\x59", [0x0ff8] = "\x2f\x5a",
-+  [0x0ff9] = "\x2f\x5b", [0x0ffa] = "\x2f\x5c", [0x0ffb] = "\x2f\x5d",
-+  [0x0ffc] = "\x2f\x5e", [0x0ffd] = "\x2f\x5f", [0x0ffe] = "\x2f\x60",
-+  [0x0fff] = "\x2f\x61", [0x1000] = "\x2f\x62", [0x1001] = "\x2f\x63",
-+  [0x1002] = "\x2f\x64", [0x1003] = "\x2f\x65", [0x1004] = "\x2f\x66",
-+  [0x1005] = "\x2f\x67", [0x1006] = "\x2f\x68", [0x1007] = "\x2f\x69",
-+  [0x1008] = "\x2f\x6a", [0x1009] = "\x2f\x6b", [0x100a] = "\x2f\x6c",
-+  [0x100b] = "\x2f\x6d", [0x100c] = "\x2f\x6e", [0x100d] = "\x2f\x6f",
-+  [0x100e] = "\x2f\x70", [0x100f] = "\x2f\x71", [0x1010] = "\x2f\x72",
-+  [0x1011] = "\x2f\x73", [0x1012] = "\x2f\x74", [0x1013] = "\x2f\x75",
-+  [0x1014] = "\x2f\x76", [0x1015] = "\x2f\x77", [0x1016] = "\x2f\x78",
-+  [0x1017] = "\x2f\x79", [0x1018] = "\x2f\x7a", [0x1019] = "\x2f\x7b",
-+  [0x101a] = "\x2f\x7c", [0x101b] = "\x2f\x7d", [0x101c] = "\x2f\x7e",
-+  [0x101d] = "\x2f\x7f", [0x101e] = "\x2f\x80", [0x101f] = "\x2f\x81",
-+  [0x1020] = "\x2f\x82", [0x1021] = "\x2f\x83", [0x1022] = "\x2f\x84",
-+  [0x1023] = "\x2f\x85", [0x1024] = "\x2f\x86", [0x1025] = "\x2f\x87",
-+  [0x1026] = "\x2f\x88", [0x1027] = "\x2f\x89", [0x1028] = "\x2f\x8a",
-+  [0x1029] = "\x2f\x8b", [0x102a] = "\x2f\x8c", [0x102b] = "\x2f\x8d",
-+  [0x102c] = "\x2f\x8e", [0x102d] = "\x2f\x8f", [0x102e] = "\x2f\x90",
-+  [0x102f] = "\x2f\x91", [0x1030] = "\x2f\x92", [0x1031] = "\x2f\x93",
-+  [0x1032] = "\x2f\x94", [0x1033] = "\x2f\x95", [0x1034] = "\x2f\x96",
-+  [0x1035] = "\x2f\x97", [0x1036] = "\x2f\x98", [0x1037] = "\x2f\x99",
-+  [0x1038] = "\x2f\x9a", [0x1039] = "\x2f\x9b", [0x103a] = "\x2f\x9c",
-+  [0x103b] = "\x2f\x9d", [0x103c] = "\x2f\x9e", [0x103d] = "\x2f\x9f",
-+  [0x103e] = "\x2f\xa0", [0x103f] = "\x2f\xa1", [0x1040] = "\x2f\xa2",
-+  [0x1041] = "\x2f\xa3", [0x1042] = "\x2f\xa4", [0x1043] = "\x2f\xa5",
-+  [0x1044] = "\x2f\xa6", [0x1045] = "\x2f\xa7", [0x1046] = "\x2f\xa8",
-+  [0x1047] = "\x2f\xa9", [0x1048] = "\x2f\xaa", [0x1049] = "\x2f\xab",
-+  [0x104a] = "\x2f\xac", [0x104b] = "\x2f\xad", [0x104c] = "\x2f\xae",
-+  [0x104d] = "\x2f\xaf", [0x104e] = "\x2f\xb0", [0x104f] = "\x2f\xb1",
-+  [0x1050] = "\x2f\xb2", [0x1051] = "\x2f\xb3", [0x1052] = "\x2f\xb4",
-+  [0x1053] = "\x2f\xb5", [0x1054] = "\x2f\xb6", [0x1055] = "\x2f\xb7",
-+  [0x1056] = "\x2f\xb8", [0x1057] = "\x2f\xb9", [0x1058] = "\x2f\xba",
-+  [0x1059] = "\x2f\xbb", [0x105a] = "\x2f\xbc", [0x105b] = "\x2f\xbd",
-+  [0x105c] = "\x2f\xbe", [0x105d] = "\x2f\xbf", [0x105e] = "\x2f\xc0",
-+  [0x105f] = "\x2f\xc1", [0x1060] = "\x2f\xc2", [0x1061] = "\x2f\xc3",
-+  [0x1062] = "\x2f\xc4", [0x1063] = "\x2f\xc5", [0x1064] = "\x2f\xc6",
-+  [0x1065] = "\x2f\xc7", [0x1066] = "\x2f\xc8", [0x1067] = "\x2f\xc9",
-+  [0x1068] = "\x2f\xca", [0x1069] = "\x2f\xcb", [0x106a] = "\x2f\xcc",
-+  [0x106b] = "\x2f\xcd", [0x106c] = "\x2f\xce", [0x106d] = "\x2f\xcf",
-+  [0x106e] = "\x2f\xd0", [0x106f] = "\x2f\xd1", [0x1070] = "\x2f\xd2",
-+  [0x1071] = "\x2f\xd3", [0x1072] = "\x2f\xd4", [0x1073] = "\x2f\xd5",
-+  [0x1074] = "\x2f\xd6", [0x1075] = "\x2f\xd7", [0x1076] = "\x2f\xd8",
-+  [0x1077] = "\x2f\xd9", [0x1078] = "\x2f\xda", [0x1079] = "\x2f\xdb",
-+  [0x107a] = "\x2f\xdc", [0x107b] = "\x2f\xdd", [0x107c] = "\x2f\xde",
-+  [0x107d] = "\x2f\xdf", [0x107e] = "\x2f\xe0", [0x107f] = "\x2f\xe1",
-+  [0x1080] = "\x2f\xe2", [0x1081] = "\x2f\xe3", [0x1082] = "\x2f\xe4",
-+  [0x1083] = "\x2f\xe5", [0x1084] = "\x2f\xe6", [0x1085] = "\x2f\xe7",
-+  [0x1086] = "\x2f\xe8", [0x1087] = "\x2f\xe9", [0x1088] = "\x2f\xea",
-+  [0x1089] = "\x2f\xeb", [0x108a] = "\x2f\xec", [0x108b] = "\x2f\xed",
-+  [0x108c] = "\x2f\xee", [0x108d] = "\x2f\xef", [0x108e] = "\x2f\xf0",
-+  [0x108f] = "\x2f\xf1", [0x1090] = "\x2f\xf2", [0x1091] = "\x2f\xf3",
-+  [0x1092] = "\x2f\xf4", [0x1093] = "\x2f\xf5", [0x1094] = "\x2f\xf6",
-+  [0x1095] = "\x2f\xf7", [0x1096] = "\x2f\xf8", [0x1097] = "\x2f\xf9",
-+  [0x1098] = "\x2f\xfa", [0x1099] = "\x2f\xfb", [0x109a] = "\x2f\xfc",
-+  [0x109b] = "\x2f\xfd", [0x109c] = "\x2f\xfe", [0x109d] = "\x2f\xff",
-+  [0x109e] = "\x30\x00", [0x109f] = "\x30\x01", [0x10a0] = "\x30\x02",
-+  [0x10a1] = "\x30\x03", [0x10a2] = "\x30\x04", [0x10a3] = "\x30\x05",
-+  [0x10a4] = "\x30\x06", [0x10a5] = "\x30\x07", [0x10a6] = "\x30\x08",
-+  [0x10a7] = "\x30\x09", [0x10a8] = "\x30\x0a", [0x10a9] = "\x30\x0b",
-+  [0x10aa] = "\x30\x0c", [0x10ab] = "\x30\x0d", [0x10ac] = "\x30\x0e",
-+  [0x10ad] = "\x30\x0f", [0x10ae] = "\x30\x10", [0x10af] = "\x30\x11",
-+  [0x10b0] = "\x30\x12", [0x10b1] = "\x30\x13", [0x10b2] = "\x30\x14",
-+  [0x10b3] = "\x30\x15", [0x10b4] = "\x30\x16", [0x10b5] = "\x30\x17",
-+  [0x10b6] = "\x30\x18", [0x10b7] = "\x30\x19", [0x10b8] = "\x30\x1a",
-+  [0x10b9] = "\x30\x1b", [0x10ba] = "\x30\x1c", [0x10bb] = "\x30\x1d",
-+  [0x10bc] = "\x30\x1e", [0x10bd] = "\x30\x1f", [0x10be] = "\x30\x20",
-+  [0x10bf] = "\x30\x21", [0x10c0] = "\x30\x22", [0x10c1] = "\x30\x23",
-+  [0x10c2] = "\x30\x24", [0x10c3] = "\x30\x25", [0x10c4] = "\x30\x26",
-+  [0x10c5] = "\x30\x27", [0x10c6] = "\x30\x28", [0x10c7] = "\x30\x29",
-+  [0x10c8] = "\x30\x2a", [0x10c9] = "\x30\x2b", [0x10ca] = "\x30\x2c",
-+  [0x10cb] = "\x30\x2d", [0x10cc] = "\x30\x2e", [0x10cd] = "\x30\x2f",
-+  [0x10ce] = "\x30\x30", [0x10cf] = "\x30\x31", [0x10d0] = "\x30\x32",
-+  [0x10d1] = "\x30\x33", [0x10d2] = "\x30\x34", [0x10d3] = "\x30\x35",
-+  [0x10d4] = "\x30\x36", [0x10d5] = "\x30\x37", [0x10d6] = "\x30\x38",
-+  [0x10d7] = "\x30\x39", [0x10d8] = "\x30\x3a", [0x10d9] = "\x30\x3b",
-+  [0x10da] = "\x30\x3c", [0x10db] = "\x30\x3d", [0x10dc] = "\x30\x3e",
-+  [0x10dd] = "\x30\x3f", [0x10de] = "\x30\x40", [0x10df] = "\x30\x41",
-+  [0x10e0] = "\x30\x42", [0x10e1] = "\x30\x43", [0x10e2] = "\x30\x44",
-+  [0x10e3] = "\x30\x45", [0x10e4] = "\x30\x46", [0x10e5] = "\x30\x47",
-+  [0x10e6] = "\x30\x48", [0x10e7] = "\x30\x49", [0x10e8] = "\x30\x4a",
-+  [0x10e9] = "\x30\x4b", [0x10ea] = "\x30\x4c", [0x10eb] = "\x30\x4d",
-+  [0x10ec] = "\x30\x4e", [0x10ed] = "\x30\x4f", [0x10ee] = "\x30\x50",
-+  [0x10ef] = "\x30\x51", [0x10f0] = "\x30\x52", [0x10f1] = "\x30\x53",
-+  [0x10f2] = "\x30\x54", [0x10f3] = "\x30\x55", [0x10f4] = "\x30\x56",
-+  [0x10f5] = "\x30\x57", [0x10f6] = "\x30\x58", [0x10f7] = "\x30\x59",
-+  [0x10f8] = "\x30\x5a", [0x10f9] = "\x30\x5b", [0x10fa] = "\x30\x5c",
-+  [0x10fb] = "\x30\x5d", [0x10fc] = "\x30\x5e", [0x10fd] = "\x30\x5f",
-+  [0x10fe] = "\x30\x60", [0x10ff] = "\x30\x61", [0x1100] = "\x30\x62",
-+  [0x1101] = "\x30\x63", [0x1102] = "\x30\x64", [0x1103] = "\x30\x65",
-+  [0x1104] = "\x30\x66", [0x1105] = "\x30\x67", [0x1106] = "\x30\x68",
-+  [0x1107] = "\x30\x69", [0x1108] = "\x30\x6a", [0x1109] = "\x30\x6b",
-+  [0x110a] = "\x30\x6c", [0x110b] = "\x30\x6d", [0x110c] = "\x30\x6e",
-+  [0x110d] = "\x30\x6f", [0x110e] = "\x30\x70", [0x110f] = "\x30\x71",
-+  [0x1110] = "\x30\x72", [0x1111] = "\x30\x73", [0x1112] = "\x30\x74",
-+  [0x1113] = "\x30\x75", [0x1114] = "\x30\x76", [0x1115] = "\x30\x77",
-+  [0x1116] = "\x30\x78", [0x1117] = "\x30\x79", [0x1118] = "\x30\x7a",
-+  [0x1119] = "\x30\x7b", [0x111a] = "\x30\x7c", [0x111b] = "\x30\x7d",
-+  [0x111c] = "\x30\x7e", [0x111d] = "\x30\x7f", [0x111e] = "\x30\x80",
-+  [0x111f] = "\x30\x81", [0x1120] = "\x30\x82", [0x1121] = "\x30\x83",
-+  [0x1122] = "\x30\x84", [0x1123] = "\x30\x85", [0x1124] = "\x30\x86",
-+  [0x1125] = "\x30\x87", [0x1126] = "\x30\x88", [0x1127] = "\x30\x89",
-+  [0x1128] = "\x30\x8a", [0x1129] = "\x30\x8b", [0x112a] = "\x30\x8c",
-+  [0x112b] = "\x30\x8d", [0x112c] = "\x30\x8e", [0x112d] = "\x30\x8f",
-+  [0x112e] = "\x30\x90", [0x112f] = "\x30\x91", [0x1130] = "\x30\x92",
-+  [0x1131] = "\x30\x93", [0x1132] = "\x30\x94", [0x1133] = "\x30\x95",
-+  [0x1134] = "\x30\x96", [0x1135] = "\x30\x97", [0x1136] = "\x30\x98",
-+  [0x1137] = "\x30\x99", [0x1138] = "\x30\x9a", [0x1139] = "\x30\x9b",
-+  [0x113a] = "\x30\x9c", [0x113b] = "\x30\x9d", [0x113c] = "\x30\x9e",
-+  [0x113d] = "\x30\x9f", [0x113e] = "\x30\xa0", [0x113f] = "\x30\xa1",
-+  [0x1140] = "\x30\xa2", [0x1141] = "\x30\xa3", [0x1142] = "\x30\xa4",
-+  [0x1143] = "\x30\xa5", [0x1144] = "\x30\xa6", [0x1145] = "\x30\xa7",
-+  [0x1146] = "\x30\xa8", [0x1147] = "\x30\xa9", [0x1148] = "\x30\xaa",
-+  [0x1149] = "\x30\xab", [0x114a] = "\x30\xac", [0x114b] = "\x30\xad",
-+  [0x114c] = "\x30\xae", [0x114d] = "\x30\xaf", [0x114e] = "\x30\xb0",
-+  [0x114f] = "\x30\xb1", [0x1150] = "\x30\xb2", [0x1151] = "\x30\xb3",
-+  [0x1152] = "\x30\xb4", [0x1153] = "\x30\xb5", [0x1154] = "\x30\xb6",
-+  [0x1155] = "\x30\xb7", [0x1156] = "\x30\xb8", [0x1157] = "\x30\xb9",
-+  [0x1158] = "\x30\xba", [0x1159] = "\x30\xbb", [0x115a] = "\x30\xbc",
-+  [0x115b] = "\x30\xbd", [0x115c] = "\x30\xbe", [0x115d] = "\x30\xbf",
-+  [0x115e] = "\x30\xc0", [0x115f] = "\x30\xc1", [0x1160] = "\x30\xc2",
-+  [0x1161] = "\x30\xc3", [0x1162] = "\x30\xc4", [0x1163] = "\x30\xc5",
-+  [0x1164] = "\x30\xc6", [0x1165] = "\x30\xc7", [0x1166] = "\x30\xc8",
-+  [0x1167] = "\x30\xc9", [0x1168] = "\x30\xca", [0x1169] = "\x30\xcb",
-+  [0x116a] = "\x30\xcc", [0x116b] = "\x30\xcd", [0x116c] = "\x30\xce",
-+  [0x116d] = "\x30\xcf", [0x116e] = "\x30\xd0", [0x116f] = "\x30\xd1",
-+  [0x1170] = "\x30\xd2", [0x1171] = "\x30\xd3", [0x1172] = "\x30\xd4",
-+  [0x1173] = "\x30\xd5", [0x1174] = "\x30\xd6", [0x1175] = "\x30\xd7",
-+  [0x1176] = "\x30\xd8", [0x1177] = "\x30\xd9", [0x1178] = "\x30\xda",
-+  [0x1179] = "\x30\xdb", [0x117a] = "\x30\xdc", [0x117b] = "\x30\xdd",
-+  [0x117c] = "\x30\xde", [0x117d] = "\x30\xdf", [0x117e] = "\x30\xe0",
-+  [0x117f] = "\x30\xe1", [0x1180] = "\x30\xe2", [0x1181] = "\x30\xe3",
-+  [0x1182] = "\x30\xe4", [0x1183] = "\x30\xe5", [0x1184] = "\x30\xe6",
-+  [0x1185] = "\x30\xe7", [0x1186] = "\x30\xe8", [0x1187] = "\x30\xe9",
-+  [0x1188] = "\x30\xea", [0x1189] = "\x30\xeb", [0x118a] = "\x30\xec",
-+  [0x118b] = "\x30\xed", [0x118c] = "\x30\xee", [0x118d] = "\x30\xef",
-+  [0x118e] = "\x30\xf0", [0x118f] = "\x30\xf1", [0x1190] = "\x30\xf2",
-+  [0x1191] = "\x30\xf3", [0x1192] = "\x30\xf4", [0x1193] = "\x30\xf5",
-+  [0x1194] = "\x30\xf6", [0x1195] = "\x30\xf7", [0x1196] = "\x30\xf8",
-+  [0x1197] = "\x30\xf9", [0x1198] = "\x30\xfa", [0x1199] = "\x30\xfb",
-+  [0x119a] = "\x30\xfc", [0x119b] = "\x30\xfd", [0x119c] = "\x30\xfe",
-+  [0x119d] = "\x30\xff", [0x119e] = "\x31\x00", [0x119f] = "\x31\x01",
-+  [0x11a0] = "\x31\x02", [0x11a1] = "\x31\x03", [0x11a2] = "\x31\x04",
-+  [0x11a3] = "\x31\x05", [0x11a4] = "\x31\x06", [0x11a5] = "\x31\x07",
-+  [0x11a6] = "\x31\x08", [0x11a7] = "\x31\x09", [0x11a8] = "\x31\x0a",
-+  [0x11a9] = "\x31\x0b", [0x11aa] = "\x31\x0c", [0x11ab] = "\x31\x0d",
-+  [0x11ac] = "\x31\x0e", [0x11ad] = "\x31\x0f", [0x11ae] = "\x31\x10",
-+  [0x11af] = "\x31\x11", [0x11b0] = "\x31\x12", [0x11b1] = "\x31\x13",
-+  [0x11b2] = "\x31\x14", [0x11b3] = "\x31\x15", [0x11b4] = "\x31\x16",
-+  [0x11b5] = "\x31\x17", [0x11b6] = "\x31\x18", [0x11b7] = "\x31\x19",
-+  [0x11b8] = "\x31\x1a", [0x11b9] = "\x31\x1b", [0x11ba] = "\x31\x1c",
-+  [0x11bb] = "\x31\x1d", [0x11bc] = "\x31\x1e", [0x11bd] = "\x31\x1f",
-+  [0x11be] = "\x31\x20", [0x11bf] = "\x31\x21", [0x11c0] = "\x31\x22",
-+  [0x11c1] = "\x31\x23", [0x11c2] = "\x31\x24", [0x11c3] = "\x31\x25",
-+  [0x11c4] = "\x31\x26", [0x11c5] = "\x31\x27", [0x11c6] = "\x31\x28",
-+  [0x11c7] = "\x31\x29", [0x11c8] = "\x31\x2a", [0x11c9] = "\x31\x2b",
-+  [0x11ca] = "\x31\x2c", [0x11cb] = "\x31\x2d", [0x11cc] = "\x31\x2e",
-+  [0x11cd] = "\x31\x2f", [0x11ce] = "\x31\x30", [0x11cf] = "\x31\x31",
-+  [0x11d0] = "\x31\x32", [0x11d1] = "\x31\x33", [0x11d2] = "\x31\x34",
-+  [0x11d3] = "\x31\x35", [0x11d4] = "\x31\x36", [0x11d5] = "\x31\x37",
-+  [0x11d6] = "\x31\x38", [0x11d7] = "\x31\x39", [0x11d8] = "\x31\x3a",
-+  [0x11d9] = "\x31\x3b", [0x11da] = "\x31\x3c", [0x11db] = "\x31\x3d",
-+  [0x11dc] = "\x31\x3e", [0x11dd] = "\x31\x3f", [0x11de] = "\x31\x40",
-+  [0x11df] = "\x31\x41", [0x11e0] = "\x31\x42", [0x11e1] = "\x31\x43",
-+  [0x11e2] = "\x31\x44", [0x11e3] = "\x31\x45", [0x11e4] = "\x31\x46",
-+  [0x11e5] = "\x31\x47", [0x11e6] = "\x31\x48", [0x11e7] = "\x31\x49",
-+  [0x11e8] = "\x31\x4a", [0x11e9] = "\x31\x4b", [0x11ea] = "\x31\x4c",
-+  [0x11eb] = "\x31\x4d", [0x11ec] = "\x31\x4e", [0x11ed] = "\x31\x4f",
-+  [0x11ee] = "\x31\x50", [0x11ef] = "\x31\x51", [0x11f0] = "\x31\x52",
-+  [0x11f1] = "\x31\x53", [0x11f2] = "\x31\x54", [0x11f3] = "\x31\x55",
-+  [0x11f4] = "\x31\x56", [0x11f5] = "\x31\x57", [0x11f6] = "\x31\x58",
-+  [0x11f7] = "\x31\x59", [0x11f8] = "\x31\x5a", [0x11f9] = "\x31\x5b",
-+  [0x11fa] = "\x31\x5c", [0x11fb] = "\x31\x5d", [0x11fc] = "\x31\x5e",
-+  [0x11fd] = "\x31\x5f", [0x11fe] = "\x31\x60", [0x11ff] = "\x31\x61",
-+  [0x1200] = "\x31\x62", [0x1201] = "\x31\x63", [0x1202] = "\x31\x64",
-+  [0x1203] = "\x31\x65", [0x1204] = "\x31\x66", [0x1205] = "\x31\x67",
-+  [0x1206] = "\x31\x68", [0x1207] = "\x31\x69", [0x1208] = "\x31\x6a",
-+  [0x1209] = "\x31\x6b", [0x120a] = "\x31\x6c", [0x120b] = "\x31\x6d",
-+  [0x120c] = "\x31\x6e", [0x120d] = "\x31\x6f", [0x120e] = "\x31\x70",
-+  [0x120f] = "\x31\x71", [0x1210] = "\x31\x72", [0x1211] = "\x31\x73",
-+  [0x1212] = "\x31\x74", [0x1213] = "\x31\x75", [0x1214] = "\x31\x76",
-+  [0x1215] = "\x31\x77", [0x1216] = "\x31\x78", [0x1217] = "\x31\x79",
-+  [0x1218] = "\x31\x7a", [0x1219] = "\x31\x7b", [0x121a] = "\x31\x7c",
-+  [0x121b] = "\x31\x7d", [0x121c] = "\x31\x7e", [0x121d] = "\x31\x7f",
-+  [0x121e] = "\x31\x80", [0x121f] = "\x31\x81", [0x1220] = "\x31\x82",
-+  [0x1221] = "\x31\x83", [0x1222] = "\x31\x84", [0x1223] = "\x31\x85",
-+  [0x1224] = "\x31\x86", [0x1225] = "\x31\x87", [0x1226] = "\x31\x88",
-+  [0x1227] = "\x31\x89", [0x1228] = "\x31\x8a", [0x1229] = "\x31\x8b",
-+  [0x122a] = "\x31\x8c", [0x122b] = "\x31\x8d", [0x122c] = "\x31\x8e",
-+  [0x122d] = "\x31\x8f", [0x122e] = "\x31\x90", [0x122f] = "\x31\x91",
-+  [0x1230] = "\x31\x92", [0x1231] = "\x31\x93", [0x1232] = "\x31\x94",
-+  [0x1233] = "\x31\x95", [0x1234] = "\x31\x96", [0x1235] = "\x31\x97",
-+  [0x1236] = "\x31\x98", [0x1237] = "\x31\x99", [0x1238] = "\x31\x9a",
-+  [0x1239] = "\x31\x9b", [0x123a] = "\x31\x9c", [0x123b] = "\x31\x9d",
-+  [0x123c] = "\x31\x9e", [0x123d] = "\x31\x9f", [0x123e] = "\x31\xa0",
-+  [0x123f] = "\x31\xa1", [0x1240] = "\x31\xa2", [0x1241] = "\x31\xa3",
-+  [0x1242] = "\x31\xa4", [0x1243] = "\x31\xa5", [0x1244] = "\x31\xa6",
-+  [0x1245] = "\x31\xa7", [0x1246] = "\x31\xa8", [0x1247] = "\x31\xa9",
-+  [0x1248] = "\x31\xaa", [0x1249] = "\x31\xab", [0x124a] = "\x31\xac",
-+  [0x124b] = "\x31\xad", [0x124c] = "\x31\xae", [0x124d] = "\x31\xaf",
-+  [0x124e] = "\x31\xb0", [0x124f] = "\x31\xb1", [0x1250] = "\x31\xb2",
-+  [0x1251] = "\x31\xb3", [0x1252] = "\x31\xb4", [0x1253] = "\x31\xb5",
-+  [0x1254] = "\x31\xb6", [0x1255] = "\x31\xb7", [0x1256] = "\x31\xb8",
-+  [0x1257] = "\x31\xb9", [0x1258] = "\x31\xba", [0x1259] = "\x31\xbb",
-+  [0x125a] = "\x31\xbc", [0x125b] = "\x31\xbd", [0x125c] = "\x31\xbe",
-+  [0x125d] = "\x31\xbf", [0x125e] = "\x31\xc0", [0x125f] = "\x31\xc1",
-+  [0x1260] = "\x31\xc2", [0x1261] = "\x31\xc3", [0x1262] = "\x31\xc4",
-+  [0x1263] = "\x31\xc5", [0x1264] = "\x31\xc6", [0x1265] = "\x31\xc7",
-+  [0x1266] = "\x31\xc8", [0x1267] = "\x31\xc9", [0x1268] = "\x31\xca",
-+  [0x1269] = "\x31\xcb", [0x126a] = "\x31\xcc", [0x126b] = "\x31\xcd",
-+  [0x126c] = "\x31\xce", [0x126d] = "\x31\xcf", [0x126e] = "\x31\xd0",
-+  [0x126f] = "\x31\xd1", [0x1270] = "\x31\xd2", [0x1271] = "\x31\xd3",
-+  [0x1272] = "\x31\xd4", [0x1273] = "\x31\xd5", [0x1274] = "\x31\xd6",
-+  [0x1275] = "\x31\xd7", [0x1276] = "\x31\xd8", [0x1277] = "\x31\xd9",
-+  [0x1278] = "\x31\xda", [0x1279] = "\x31\xdb", [0x127a] = "\x31\xdc",
-+  [0x127b] = "\x31\xdd", [0x127c] = "\x31\xde", [0x127d] = "\x31\xdf",
-+  [0x127e] = "\x31\xe0", [0x127f] = "\x31\xe1", [0x1280] = "\x31\xe2",
-+  [0x1281] = "\x31\xe3", [0x1282] = "\x31\xe4", [0x1283] = "\x31\xe5",
-+  [0x1284] = "\x31\xe6", [0x1285] = "\x31\xe7", [0x1286] = "\x31\xe8",
-+  [0x1287] = "\x31\xe9", [0x1288] = "\x31\xea", [0x1289] = "\x31\xeb",
-+  [0x128a] = "\x31\xec", [0x128b] = "\x31\xed", [0x128c] = "\x31\xee",
-+  [0x128d] = "\x31\xef", [0x128e] = "\x31\xf0", [0x128f] = "\x31\xf1",
-+  [0x1290] = "\x31\xf2", [0x1291] = "\x31\xf3", [0x1292] = "\x31\xf4",
-+  [0x1293] = "\x31\xf5", [0x1294] = "\x31\xf6", [0x1295] = "\x31\xf7",
-+  [0x1296] = "\x31\xf8", [0x1297] = "\x31\xf9", [0x1298] = "\x31\xfa",
-+  [0x1299] = "\x31\xfb", [0x129a] = "\x31\xfc", [0x129b] = "\x31\xfd",
-+  [0x129c] = "\x31\xfe", [0x129d] = "\x31\xff", [0x129e] = "\x32\x00",
-+  [0x129f] = "\x32\x01", [0x12a0] = "\x32\x02", [0x12a1] = "\x32\x03",
-+  [0x12a2] = "\x32\x04", [0x12a3] = "\x32\x05", [0x12a4] = "\x32\x06",
-+  [0x12a5] = "\x32\x07", [0x12a6] = "\x32\x08", [0x12a7] = "\x32\x09",
-+  [0x12a8] = "\x32\x0a", [0x12a9] = "\x32\x0b", [0x12aa] = "\x32\x0c",
-+  [0x12ab] = "\x32\x0d", [0x12ac] = "\x32\x0e", [0x12ad] = "\x32\x0f",
-+  [0x12ae] = "\x32\x10", [0x12af] = "\x32\x11", [0x12b0] = "\x32\x12",
-+  [0x12b1] = "\x32\x13", [0x12b2] = "\x32\x14", [0x12b3] = "\x32\x15",
-+  [0x12b4] = "\x32\x16", [0x12b5] = "\x32\x17", [0x12b6] = "\x32\x18",
-+  [0x12b7] = "\x32\x19", [0x12b8] = "\x32\x1a", [0x12b9] = "\x32\x1b",
-+  [0x12ba] = "\x32\x1c", [0x12bb] = "\x32\x1d", [0x12bc] = "\x32\x1e",
-+  [0x12bd] = "\x32\x1f", [0x12be] = "\x32\x20", [0x12bf] = "\x32\x21",
-+  [0x12c0] = "\x32\x22", [0x12c1] = "\x32\x23", [0x12c2] = "\x32\x24",
-+  [0x12c3] = "\x32\x25", [0x12c4] = "\x32\x26", [0x12c5] = "\x32\x27",
-+  [0x12c6] = "\x32\x28", [0x12c7] = "\x32\x29", [0x12c8] = "\x32\x2a",
-+  [0x12c9] = "\x32\x2b", [0x12ca] = "\x32\x2c", [0x12cb] = "\x32\x2d",
-+  [0x12cc] = "\x32\x2e", [0x12cd] = "\x32\x2f", [0x12ce] = "\x32\x30",
-+  [0x12cf] = "\x32\x31", [0x12d0] = "\x32\x32", [0x12d1] = "\x32\x33",
-+  [0x12d2] = "\x32\x34", [0x12d3] = "\x32\x35", [0x12d4] = "\x32\x36",
-+  [0x12d5] = "\x32\x37", [0x12d6] = "\x32\x38", [0x12d7] = "\x32\x39",
-+  [0x12d8] = "\x32\x3a", [0x12d9] = "\x32\x3b", [0x12da] = "\x32\x3c",
-+  [0x12db] = "\x32\x3d", [0x12dc] = "\x32\x3e", [0x12dd] = "\x32\x3f",
-+  [0x12de] = "\x32\x40", [0x12df] = "\x32\x41", [0x12e0] = "\x32\x42",
-+  [0x12e1] = "\x32\x43", [0x12e2] = "\x32\x44", [0x12e3] = "\x32\x45",
-+  [0x12e4] = "\x32\x46", [0x12e5] = "\x32\x47", [0x12e6] = "\x32\x48",
-+  [0x12e7] = "\x32\x49", [0x12e8] = "\x32\x4a", [0x12e9] = "\x32\x4b",
-+  [0x12ea] = "\x32\x4c", [0x12eb] = "\x32\x4d", [0x12ec] = "\x32\x4e",
-+  [0x12ed] = "\x32\x4f", [0x12ee] = "\x32\x50", [0x12ef] = "\x32\x51",
-+  [0x12f0] = "\x32\x52", [0x12f1] = "\x32\x53", [0x12f2] = "\x32\x54",
-+  [0x12f3] = "\x32\x55", [0x12f4] = "\x32\x56", [0x12f5] = "\x32\x57",
-+  [0x12f6] = "\x32\x58", [0x12f7] = "\x32\x59", [0x12f8] = "\x32\x5a",
-+  [0x12f9] = "\x32\x5b", [0x12fa] = "\x32\x5c", [0x12fb] = "\x32\x5d",
-+  [0x12fc] = "\x32\x5e", [0x12fd] = "\x32\x5f", [0x12fe] = "\x32\x60",
-+  [0x12ff] = "\x32\x61", [0x1300] = "\x32\x62", [0x1301] = "\x32\x63",
-+  [0x1302] = "\x32\x64", [0x1303] = "\x32\x65", [0x1304] = "\x32\x66",
-+  [0x1305] = "\x32\x67", [0x1306] = "\x32\x68", [0x1307] = "\x32\x69",
-+  [0x1308] = "\x32\x6a", [0x1309] = "\x32\x6b", [0x130a] = "\x32\x6c",
-+  [0x130b] = "\x32\x6d", [0x130c] = "\x32\x6e", [0x130d] = "\x32\x6f",
-+  [0x130e] = "\x32\x70", [0x130f] = "\x32\x71", [0x1310] = "\x32\x72",
-+  [0x1311] = "\x32\x73", [0x1312] = "\x32\x74", [0x1313] = "\x32\x75",
-+  [0x1314] = "\x32\x76", [0x1315] = "\x32\x77", [0x1316] = "\x32\x78",
-+  [0x1317] = "\x32\x79", [0x1318] = "\x32\x7a", [0x1319] = "\x32\x7b",
-+  [0x131a] = "\x32\x7c", [0x131b] = "\x32\x7d", [0x131c] = "\x32\x7e",
-+  [0x131d] = "\x32\x7f", [0x131e] = "\x32\x80", [0x131f] = "\x32\x81",
-+  [0x1320] = "\x32\x82", [0x1321] = "\x32\x83", [0x1322] = "\x32\x84",
-+  [0x1323] = "\x32\x85", [0x1324] = "\x32\x86", [0x1325] = "\x32\x87",
-+  [0x1326] = "\x32\x88", [0x1327] = "\x32\x89", [0x1328] = "\x32\x8a",
-+  [0x1329] = "\x32\x8b", [0x132a] = "\x32\x8c", [0x132b] = "\x32\x8d",
-+  [0x132c] = "\x32\x8e", [0x132d] = "\x32\x8f", [0x132e] = "\x32\x90",
-+  [0x132f] = "\x32\x91", [0x1330] = "\x32\x92", [0x1331] = "\x32\x93",
-+  [0x1332] = "\x32\x94", [0x1333] = "\x32\x95", [0x1334] = "\x32\x96",
-+  [0x1335] = "\x32\x97", [0x1336] = "\x32\x98", [0x1337] = "\x32\x99",
-+  [0x1338] = "\x32\x9a", [0x1339] = "\x32\x9b", [0x133a] = "\x32\x9c",
-+  [0x133b] = "\x32\x9d", [0x133c] = "\x32\x9e", [0x133d] = "\x32\x9f",
-+  [0x133e] = "\x32\xa0", [0x133f] = "\x32\xa1", [0x1340] = "\x32\xa2",
-+  [0x1341] = "\x32\xa3", [0x1342] = "\x32\xa4", [0x1343] = "\x32\xa5",
-+  [0x1344] = "\x32\xa6", [0x1345] = "\x32\xa7", [0x1346] = "\x32\xa8",
-+  [0x1347] = "\x32\xa9", [0x1348] = "\x32\xaa", [0x1349] = "\x32\xab",
-+  [0x134a] = "\x32\xac", [0x134b] = "\x32\xad", [0x134c] = "\x32\xae",
-+  [0x134d] = "\x32\xaf", [0x134e] = "\x32\xb0", [0x134f] = "\x32\xb1",
-+  [0x1350] = "\x32\xb2", [0x1351] = "\x32\xb3", [0x1352] = "\x32\xb4",
-+  [0x1353] = "\x32\xb5", [0x1354] = "\x32\xb6", [0x1355] = "\x32\xb7",
-+  [0x1356] = "\x32\xb8", [0x1357] = "\x32\xb9", [0x1358] = "\x32\xba",
-+  [0x1359] = "\x32\xbb", [0x135a] = "\x32\xbc", [0x135b] = "\x32\xbd",
-+  [0x135c] = "\x32\xbe", [0x135d] = "\x32\xbf", [0x135e] = "\x32\xc0",
-+  [0x135f] = "\x32\xc1", [0x1360] = "\x32\xc2", [0x1361] = "\x32\xc3",
-+  [0x1362] = "\x32\xc4", [0x1363] = "\x32\xc5", [0x1364] = "\x32\xc6",
-+  [0x1365] = "\x32\xc7", [0x1366] = "\x32\xc8", [0x1367] = "\x32\xc9",
-+  [0x1368] = "\x32\xca", [0x1369] = "\x32\xcb", [0x136a] = "\x32\xcc",
-+  [0x136b] = "\x32\xcd", [0x136c] = "\x32\xce", [0x136d] = "\x32\xcf",
-+  [0x136e] = "\x32\xd0", [0x136f] = "\x32\xd1", [0x1370] = "\x32\xd2",
-+  [0x1371] = "\x32\xd3", [0x1372] = "\x32\xd4", [0x1373] = "\x32\xd5",
-+  [0x1374] = "\x32\xd6", [0x1375] = "\x32\xd7", [0x1376] = "\x32\xd8",
-+  [0x1377] = "\x32\xd9", [0x1378] = "\x32\xda", [0x1379] = "\x32\xdb",
-+  [0x137a] = "\x32\xdc", [0x137b] = "\x32\xdd", [0x137c] = "\x32\xde",
-+  [0x137d] = "\x32\xdf", [0x137e] = "\x32\xe0", [0x137f] = "\x32\xe1",
-+  [0x1380] = "\x32\xe2", [0x1381] = "\x32\xe3", [0x1382] = "\x32\xe4",
-+  [0x1383] = "\x32\xe5", [0x1384] = "\x32\xe6", [0x1385] = "\x32\xe7",
-+  [0x1386] = "\x32\xe8", [0x1387] = "\x32\xe9", [0x1388] = "\x32\xea",
-+  [0x1389] = "\x32\xeb", [0x138a] = "\x32\xec", [0x138b] = "\x32\xed",
-+  [0x138c] = "\x32\xee", [0x138d] = "\x32\xef", [0x138e] = "\x32\xf0",
-+  [0x138f] = "\x32\xf1", [0x1390] = "\x32\xf2", [0x1391] = "\x32\xf3",
-+  [0x1392] = "\x32\xf4", [0x1393] = "\x32\xf5", [0x1394] = "\x32\xf6",
-+  [0x1395] = "\x32\xf7", [0x1396] = "\x32\xf8", [0x1397] = "\x32\xf9",
-+  [0x1398] = "\x32\xfa", [0x1399] = "\x32\xfb", [0x139a] = "\x32\xfc",
-+  [0x139b] = "\x32\xfd", [0x139c] = "\x32\xfe", [0x139d] = "\x32\xff",
-+  [0x139e] = "\x33\x00", [0x139f] = "\x33\x01", [0x13a0] = "\x33\x02",
-+  [0x13a1] = "\x33\x03", [0x13a2] = "\x33\x04", [0x13a3] = "\x33\x05",
-+  [0x13a4] = "\x33\x06", [0x13a5] = "\x33\x07", [0x13a6] = "\x33\x08",
-+  [0x13a7] = "\x33\x09", [0x13a8] = "\x33\x0a", [0x13a9] = "\x33\x0b",
-+  [0x13aa] = "\x33\x0c", [0x13ab] = "\x33\x0d", [0x13ac] = "\x33\x0e",
-+  [0x13ad] = "\x33\x0f", [0x13ae] = "\x33\x10", [0x13af] = "\x33\x11",
-+  [0x13b0] = "\x33\x12", [0x13b1] = "\x33\x13", [0x13b2] = "\x33\x14",
-+  [0x13b3] = "\x33\x15", [0x13b4] = "\x33\x16", [0x13b5] = "\x33\x17",
-+  [0x13b6] = "\x33\x18", [0x13b7] = "\x33\x19", [0x13b8] = "\x33\x1a",
-+  [0x13b9] = "\x33\x1b", [0x13ba] = "\x33\x1c", [0x13bb] = "\x33\x1d",
-+  [0x13bc] = "\x33\x1e", [0x13bd] = "\x33\x1f", [0x13be] = "\x33\x20",
-+  [0x13bf] = "\x33\x21", [0x13c0] = "\x33\x22", [0x13c1] = "\x33\x23",
-+  [0x13c2] = "\x33\x24", [0x13c3] = "\x33\x25", [0x13c4] = "\x33\x26",
-+  [0x13c5] = "\x33\x27", [0x13c6] = "\x33\x28", [0x13c7] = "\x33\x29",
-+  [0x13c8] = "\x33\x2a", [0x13c9] = "\x33\x2b", [0x13ca] = "\x33\x2c",
-+  [0x13cb] = "\x33\x2d", [0x13cc] = "\x33\x2e", [0x13cd] = "\x33\x2f",
-+  [0x13ce] = "\x33\x30", [0x13cf] = "\x33\x31", [0x13d0] = "\x33\x32",
-+  [0x13d1] = "\x33\x33", [0x13d2] = "\x33\x34", [0x13d3] = "\x33\x35",
-+  [0x13d4] = "\x33\x36", [0x13d5] = "\x33\x37", [0x13d6] = "\x33\x38",
-+  [0x13d7] = "\x33\x39", [0x13d8] = "\x33\x3a", [0x13d9] = "\x33\x3b",
-+  [0x13da] = "\x33\x3c", [0x13db] = "\x33\x3d", [0x13dc] = "\x33\x3e",
-+  [0x13dd] = "\x33\x3f", [0x13de] = "\x33\x40", [0x13df] = "\x33\x41",
-+  [0x13e0] = "\x33\x42", [0x13e1] = "\x33\x43", [0x13e2] = "\x33\x44",
-+  [0x13e3] = "\x33\x45", [0x13e4] = "\x33\x46", [0x13e5] = "\x33\x47",
-+  [0x13e6] = "\x33\x48", [0x13e7] = "\x33\x49", [0x13e8] = "\x33\x4a",
-+  [0x13e9] = "\x33\x4b", [0x13ea] = "\x33\x4c", [0x13eb] = "\x33\x4d",
-+  [0x13ec] = "\x33\x4e", [0x13ed] = "\x33\x4f", [0x13ee] = "\x33\x50",
-+  [0x13ef] = "\x33\x51", [0x13f0] = "\x33\x52", [0x13f1] = "\x33\x53",
-+  [0x13f2] = "\x33\x54", [0x13f3] = "\x33\x55", [0x13f4] = "\x33\x56",
-+  [0x13f5] = "\x33\x57", [0x13f6] = "\x33\x58", [0x13f7] = "\x33\x59",
-+  [0x13f8] = "\x33\x5a", [0x13f9] = "\x33\x5b", [0x13fa] = "\x33\x5c",
-+  [0x13fb] = "\x33\x5d", [0x13fc] = "\x33\x5e", [0x13fd] = "\x33\x5f",
-+  [0x13fe] = "\x33\x60", [0x13ff] = "\x33\x61", [0x1400] = "\x33\x62",
-+  [0x1401] = "\x33\x63", [0x1402] = "\x33\x64", [0x1403] = "\x33\x65",
-+  [0x1404] = "\x33\x66", [0x1405] = "\x33\x67", [0x1406] = "\x33\x68",
-+  [0x1407] = "\x33\x69", [0x1408] = "\x33\x6a", [0x1409] = "\x33\x6b",
-+  [0x140a] = "\x33\x6c", [0x140b] = "\x33\x6d", [0x140c] = "\x33\x6e",
-+  [0x140d] = "\x33\x6f", [0x140e] = "\x33\x70", [0x140f] = "\x33\x71",
-+  [0x1410] = "\x33\x72", [0x1411] = "\x33\x73", [0x1412] = "\x33\x74",
-+  [0x1413] = "\x33\x75", [0x1414] = "\x33\x76", [0x1415] = "\x33\x77",
-+  [0x1416] = "\x33\x78", [0x1417] = "\x33\x79", [0x1418] = "\x33\x7a",
-+  [0x1419] = "\x33\x7b", [0x141a] = "\x33\x7c", [0x141b] = "\x33\x7d",
-+  [0x141c] = "\x33\x7e", [0x141d] = "\x33\x7f", [0x141e] = "\x33\x80",
-+  [0x141f] = "\x33\x81", [0x1420] = "\x33\x82", [0x1421] = "\x33\x83",
-+  [0x1422] = "\x33\x84", [0x1423] = "\x33\x85", [0x1424] = "\x33\x86",
-+  [0x1425] = "\x33\x87", [0x1426] = "\x33\x88", [0x1427] = "\x33\x89",
-+  [0x1428] = "\x33\x8a", [0x1429] = "\x33\x8b", [0x142a] = "\x33\x8c",
-+  [0x142b] = "\x33\x8d", [0x142c] = "\x33\x8e", [0x142d] = "\x33\x8f",
-+  [0x142e] = "\x33\x90", [0x142f] = "\x33\x91", [0x1430] = "\x33\x92",
-+  [0x1431] = "\x33\x93", [0x1432] = "\x33\x94", [0x1433] = "\x33\x95",
-+  [0x1434] = "\x33\x96", [0x1435] = "\x33\x97", [0x1436] = "\x33\x98",
-+  [0x1437] = "\x33\x99", [0x1438] = "\x33\x9a", [0x1439] = "\x33\x9b",
-+  [0x143a] = "\x33\x9c", [0x143b] = "\x33\x9d", [0x143c] = "\x33\x9e",
-+  [0x143d] = "\x33\x9f", [0x143e] = "\x33\xa0", [0x143f] = "\x33\xa1",
-+  [0x1440] = "\x33\xa2", [0x1441] = "\x33\xa3", [0x1442] = "\x33\xa4",
-+  [0x1443] = "\x33\xa5", [0x1444] = "\x33\xa6", [0x1445] = "\x33\xa7",
-+  [0x1446] = "\x33\xa8", [0x1447] = "\x33\xa9", [0x1448] = "\x33\xaa",
-+  [0x1449] = "\x33\xab", [0x144a] = "\x33\xac", [0x144b] = "\x33\xad",
-+  [0x144c] = "\x33\xae", [0x144d] = "\x33\xaf", [0x144e] = "\x33\xb0",
-+  [0x144f] = "\x33\xb1", [0x1450] = "\x33\xb2", [0x1451] = "\x33\xb3",
-+  [0x1452] = "\x33\xb4", [0x1453] = "\x33\xb5", [0x1454] = "\x33\xb6",
-+  [0x1455] = "\x33\xb7", [0x1456] = "\x33\xb8", [0x1457] = "\x33\xb9",
-+  [0x1458] = "\x33\xba", [0x1459] = "\x33\xbb", [0x145a] = "\x33\xbc",
-+  [0x145b] = "\x33\xbd", [0x145c] = "\x33\xbe", [0x145d] = "\x33\xbf",
-+  [0x145e] = "\x33\xc0", [0x145f] = "\x33\xc1", [0x1460] = "\x33\xc2",
-+  [0x1461] = "\x33\xc3", [0x1462] = "\x33\xc4", [0x1463] = "\x33\xc5",
-+  [0x1464] = "\x33\xc6", [0x1465] = "\x33\xc7", [0x1466] = "\x33\xc8",
-+  [0x1467] = "\x33\xc9", [0x1468] = "\x33\xca", [0x1469] = "\x33\xcb",
-+  [0x146a] = "\x33\xcc", [0x146b] = "\x33\xcd", [0x146c] = "\x33\xce",
-+  [0x146d] = "\x33\xcf", [0x146e] = "\x33\xd0", [0x146f] = "\x33\xd1",
-+  [0x1470] = "\x33\xd2", [0x1471] = "\x33\xd3", [0x1472] = "\x33\xd4",
-+  [0x1473] = "\x33\xd5", [0x1474] = "\x33\xd6", [0x1475] = "\x33\xd7",
-+  [0x1476] = "\x33\xd8", [0x1477] = "\x33\xd9", [0x1478] = "\x33\xda",
-+  [0x1479] = "\x33\xdb", [0x147a] = "\x33\xdc", [0x147b] = "\x33\xdd",
-+  [0x147c] = "\x33\xde", [0x147d] = "\x33\xdf", [0x147e] = "\x33\xe0",
-+  [0x147f] = "\x33\xe1", [0x1480] = "\x33\xe2", [0x1481] = "\x33\xe3",
-+  [0x1482] = "\x33\xe4", [0x1483] = "\x33\xe5", [0x1484] = "\x33\xe6",
-+  [0x1485] = "\x33\xe7", [0x1486] = "\x33\xe8", [0x1487] = "\x33\xe9",
-+  [0x1488] = "\x33\xea", [0x1489] = "\x33\xeb", [0x148a] = "\x33\xec",
-+  [0x148b] = "\x33\xed", [0x148c] = "\x33\xee", [0x148d] = "\x33\xef",
-+  [0x148e] = "\x33\xf0", [0x148f] = "\x33\xf1", [0x1490] = "\x33\xf2",
-+  [0x1491] = "\x33\xf3", [0x1492] = "\x33\xf4", [0x1493] = "\x33\xf5",
-+  [0x1494] = "\x33\xf6", [0x1495] = "\x33\xf7", [0x1496] = "\x33\xf8",
-+  [0x1497] = "\x33\xf9", [0x1498] = "\x33\xfa", [0x1499] = "\x33\xfb",
-+  [0x149a] = "\x33\xfc", [0x149b] = "\x33\xfd", [0x149c] = "\x33\xfe",
-+  [0x149d] = "\x33\xff", [0x149e] = "\x34\x00", [0x149f] = "\x34\x01",
-+  [0x14a0] = "\x34\x02", [0x14a1] = "\x34\x03", [0x14a2] = "\x34\x04",
-+  [0x14a3] = "\x34\x05", [0x14a4] = "\x34\x06", [0x14a5] = "\x34\x07",
-+  [0x14a6] = "\x34\x08", [0x14a7] = "\x34\x09", [0x14a8] = "\x34\x0a",
-+  [0x14a9] = "\x34\x0b", [0x14aa] = "\x34\x0c", [0x14ab] = "\x34\x0d",
-+  [0x14ac] = "\x34\x0e", [0x14ad] = "\x34\x0f", [0x14ae] = "\x34\x10",
-+  [0x14af] = "\x34\x11", [0x14b0] = "\x34\x12", [0x14b1] = "\x34\x13",
-+  [0x14b2] = "\x34\x14", [0x14b3] = "\x34\x15", [0x14b4] = "\x34\x16",
-+  [0x14b5] = "\x34\x17", [0x14b6] = "\x34\x18", [0x14b7] = "\x34\x19",
-+  [0x14b8] = "\x34\x1a", [0x14b9] = "\x34\x1b", [0x14ba] = "\x34\x1c",
-+  [0x14bb] = "\x34\x1d", [0x14bc] = "\x34\x1e", [0x14bd] = "\x34\x1f",
-+  [0x14be] = "\x34\x20", [0x14bf] = "\x34\x21", [0x14c0] = "\x34\x22",
-+  [0x14c1] = "\x34\x23", [0x14c2] = "\x34\x24", [0x14c3] = "\x34\x25",
-+  [0x14c4] = "\x34\x26", [0x14c5] = "\x34\x27", [0x14c6] = "\x34\x28",
-+  [0x14c7] = "\x34\x29", [0x14c8] = "\x34\x2a", [0x14c9] = "\x34\x2b",
-+  [0x14ca] = "\x34\x2c", [0x14cb] = "\x34\x2d", [0x14cc] = "\x34\x2e",
-+  [0x14cd] = "\x34\x2f", [0x14ce] = "\x34\x30", [0x14cf] = "\x34\x31",
-+  [0x14d0] = "\x34\x32", [0x14d1] = "\x34\x33", [0x14d2] = "\x34\x34",
-+  [0x14d3] = "\x34\x35", [0x14d4] = "\x34\x36", [0x14d5] = "\x34\x37",
-+  [0x14d6] = "\x34\x38", [0x14d7] = "\x34\x39", [0x14d8] = "\x34\x3a",
-+  [0x14d9] = "\x34\x3b", [0x14da] = "\x34\x3c", [0x14db] = "\x34\x3d",
-+  [0x14dc] = "\x34\x3e", [0x14dd] = "\x34\x3f", [0x14de] = "\x34\x40",
-+  [0x14df] = "\x34\x41", [0x14e0] = "\x34\x42", [0x14e1] = "\x34\x43",
-+  [0x14e2] = "\x34\x44", [0x14e3] = "\x34\x45", [0x14e4] = "\x34\x46",
-+  [0x14e5] = "\x34\x47", [0x14e6] = "\x34\x48", [0x14e7] = "\x34\x49",
-+  [0x14e8] = "\x34\x4a", [0x14e9] = "\x34\x4b", [0x14ea] = "\x34\x4c",
-+  [0x14eb] = "\x34\x4d", [0x14ec] = "\x34\x4e", [0x14ed] = "\x34\x4f",
-+  [0x14ee] = "\x34\x50", [0x14ef] = "\x34\x51", [0x14f0] = "\x34\x52",
-+  [0x14f1] = "\x34\x53", [0x14f2] = "\x34\x54", [0x14f3] = "\x34\x55",
-+  [0x14f4] = "\x34\x56", [0x14f5] = "\x34\x57", [0x14f6] = "\x34\x58",
-+  [0x14f7] = "\x34\x59", [0x14f8] = "\x34\x5a", [0x14f9] = "\x34\x5b",
-+  [0x14fa] = "\x34\x5c", [0x14fb] = "\x34\x5d", [0x14fc] = "\x34\x5e",
-+  [0x14fd] = "\x34\x5f", [0x14fe] = "\x34\x60", [0x14ff] = "\x34\x61",
-+  [0x1500] = "\x34\x62", [0x1501] = "\x34\x63", [0x1502] = "\x34\x64",
-+  [0x1503] = "\x34\x65", [0x1504] = "\x34\x66", [0x1505] = "\x34\x67",
-+  [0x1506] = "\x34\x68", [0x1507] = "\x34\x69", [0x1508] = "\x34\x6a",
-+  [0x1509] = "\x34\x6b", [0x150a] = "\x34\x6c", [0x150b] = "\x34\x6d",
-+  [0x150c] = "\x34\x6e", [0x150d] = "\x34\x6f", [0x150e] = "\x34\x70",
-+  [0x150f] = "\x34\x71", [0x1510] = "\x34\x72", [0x1511] = "\x34\x73",
-+  [0x1512] = "\x34\x74", [0x1513] = "\x34\x75", [0x1514] = "\x34\x76",
-+  [0x1515] = "\x34\x77", [0x1516] = "\x34\x78", [0x1517] = "\x34\x79",
-+  [0x1518] = "\x34\x7a", [0x1519] = "\x34\x7b", [0x151a] = "\x34\x7c",
-+  [0x151b] = "\x34\x7d", [0x151c] = "\x34\x7e", [0x151d] = "\x34\x7f",
-+  [0x151e] = "\x34\x80", [0x151f] = "\x34\x81", [0x1520] = "\x34\x82",
-+  [0x1521] = "\x34\x83", [0x1522] = "\x34\x84", [0x1523] = "\x34\x85",
-+  [0x1524] = "\x34\x86", [0x1525] = "\x34\x87", [0x1526] = "\x34\x88",
-+  [0x1527] = "\x34\x89", [0x1528] = "\x34\x8a", [0x1529] = "\x34\x8b",
-+  [0x152a] = "\x34\x8c", [0x152b] = "\x34\x8d", [0x152c] = "\x34\x8e",
-+  [0x152d] = "\x34\x8f", [0x152e] = "\x34\x90", [0x152f] = "\x34\x91",
-+  [0x1530] = "\x34\x92", [0x1531] = "\x34\x93", [0x1532] = "\x34\x94",
-+  [0x1533] = "\x34\x95", [0x1534] = "\x34\x96", [0x1535] = "\x34\x97",
-+  [0x1536] = "\x34\x98", [0x1537] = "\x34\x99", [0x1538] = "\x34\x9a",
-+  [0x1539] = "\x34\x9b", [0x153a] = "\x34\x9c", [0x153b] = "\x34\x9d",
-+  [0x153c] = "\x34\x9e", [0x153d] = "\x34\x9f", [0x153e] = "\x34\xa0",
-+  [0x153f] = "\x34\xa1", [0x1540] = "\x34\xa2", [0x1541] = "\x34\xa3",
-+  [0x1542] = "\x34\xa4", [0x1543] = "\x34\xa5", [0x1544] = "\x34\xa6",
-+  [0x1545] = "\x34\xa7", [0x1546] = "\x34\xa8", [0x1547] = "\x34\xa9",
-+  [0x1548] = "\x34\xaa", [0x1549] = "\x34\xab", [0x154a] = "\x34\xac",
-+  [0x154b] = "\x34\xad", [0x154c] = "\x34\xae", [0x154d] = "\x34\xaf",
-+  [0x154e] = "\x34\xb0", [0x154f] = "\x34\xb1", [0x1550] = "\x34\xb2",
-+  [0x1551] = "\x34\xb3", [0x1552] = "\x34\xb4", [0x1553] = "\x34\xb5",
-+  [0x1554] = "\x34\xb6", [0x1555] = "\x34\xb7", [0x1556] = "\x34\xb8",
-+  [0x1557] = "\x34\xb9", [0x1558] = "\x34\xba", [0x1559] = "\x34\xbb",
-+  [0x155a] = "\x34\xbc", [0x155b] = "\x34\xbd", [0x155c] = "\x34\xbe",
-+  [0x155d] = "\x34\xbf", [0x155e] = "\x34\xc0", [0x155f] = "\x34\xc1",
-+  [0x1560] = "\x34\xc2", [0x1561] = "\x34\xc3", [0x1562] = "\x34\xc4",
-+  [0x1563] = "\x34\xc5", [0x1564] = "\x34\xc6", [0x1565] = "\x34\xc7",
-+  [0x1566] = "\x34\xc8", [0x1567] = "\x34\xc9", [0x1568] = "\x34\xca",
-+  [0x1569] = "\x34\xcb", [0x156a] = "\x34\xcc", [0x156b] = "\x34\xcd",
-+  [0x156c] = "\x34\xce", [0x156d] = "\x34\xcf", [0x156e] = "\x34\xd0",
-+  [0x156f] = "\x34\xd1", [0x1570] = "\x34\xd2", [0x1571] = "\x34\xd3",
-+  [0x1572] = "\x34\xd4", [0x1573] = "\x34\xd5", [0x1574] = "\x34\xd6",
-+  [0x1575] = "\x34\xd7", [0x1576] = "\x34\xd8", [0x1577] = "\x34\xd9",
-+  [0x1578] = "\x34\xda", [0x1579] = "\x34\xdb", [0x157a] = "\x34\xdc",
-+  [0x157b] = "\x34\xdd", [0x157c] = "\x34\xde", [0x157d] = "\x34\xdf",
-+  [0x157e] = "\x34\xe0", [0x157f] = "\x34\xe1", [0x1580] = "\x34\xe2",
-+  [0x1581] = "\x34\xe3", [0x1582] = "\x34\xe4", [0x1583] = "\x34\xe5",
-+  [0x1584] = "\x34\xe6", [0x1585] = "\x34\xe7", [0x1586] = "\x34\xe8",
-+  [0x1587] = "\x34\xe9", [0x1588] = "\x34\xea", [0x1589] = "\x34\xeb",
-+  [0x158a] = "\x34\xec", [0x158b] = "\x34\xed", [0x158c] = "\x34\xee",
-+  [0x158d] = "\x34\xef", [0x158e] = "\x34\xf0", [0x158f] = "\x34\xf1",
-+  [0x1590] = "\x34\xf2", [0x1591] = "\x34\xf3", [0x1592] = "\x34\xf4",
-+  [0x1593] = "\x34\xf5", [0x1594] = "\x34\xf6", [0x1595] = "\x34\xf7",
-+  [0x1596] = "\x34\xf8", [0x1597] = "\x34\xf9", [0x1598] = "\x34\xfa",
-+  [0x1599] = "\x34\xfb", [0x159a] = "\x34\xfc", [0x159b] = "\x34\xfd",
-+  [0x159c] = "\x34\xfe", [0x159d] = "\x34\xff", [0x159e] = "\x35\x00",
-+  [0x159f] = "\x35\x01", [0x15a0] = "\x35\x02", [0x15a1] = "\x35\x03",
-+  [0x15a2] = "\x35\x04", [0x15a3] = "\x35\x05", [0x15a4] = "\x35\x06",
-+  [0x15a5] = "\x35\x07", [0x15a6] = "\x35\x08", [0x15a7] = "\x35\x09",
-+  [0x15a8] = "\x35\x0a", [0x15a9] = "\x35\x0b", [0x15aa] = "\x35\x0c",
-+  [0x15ab] = "\x35\x0d", [0x15ac] = "\x35\x0e", [0x15ad] = "\x35\x0f",
-+  [0x15ae] = "\x35\x10", [0x15af] = "\x35\x11", [0x15b0] = "\x35\x12",
-+  [0x15b1] = "\x35\x13", [0x15b2] = "\x35\x14", [0x15b3] = "\x35\x15",
-+  [0x15b4] = "\x35\x16", [0x15b5] = "\x35\x17", [0x15b6] = "\x35\x18",
-+  [0x15b7] = "\x35\x19", [0x15b8] = "\x35\x1a", [0x15b9] = "\x35\x1b",
-+  [0x15ba] = "\x35\x1c", [0x15bb] = "\x35\x1d", [0x15bc] = "\x35\x1e",
-+  [0x15bd] = "\x35\x1f", [0x15be] = "\x35\x20", [0x15bf] = "\x35\x21",
-+  [0x15c0] = "\x35\x22", [0x15c1] = "\x35\x23", [0x15c2] = "\x35\x24",
-+  [0x15c3] = "\x35\x25", [0x15c4] = "\x35\x26", [0x15c5] = "\x35\x27",
-+  [0x15c6] = "\x35\x28", [0x15c7] = "\x35\x29", [0x15c8] = "\x35\x2a",
-+  [0x15c9] = "\x35\x2b", [0x15ca] = "\x35\x2c", [0x15cb] = "\x35\x2d",
-+  [0x15cc] = "\x35\x2e", [0x15cd] = "\x35\x2f", [0x15ce] = "\x35\x30",
-+  [0x15cf] = "\x35\x31", [0x15d0] = "\x35\x32", [0x15d1] = "\x35\x33",
-+  [0x15d2] = "\x35\x34", [0x15d3] = "\x35\x35", [0x15d4] = "\x35\x36",
-+  [0x15d5] = "\x35\x37", [0x15d6] = "\x35\x38", [0x15d7] = "\x35\x39",
-+  [0x15d8] = "\x35\x3a", [0x15d9] = "\x35\x3b", [0x15da] = "\x35\x3c",
-+  [0x15db] = "\x35\x3d", [0x15dc] = "\x35\x3e", [0x15dd] = "\x35\x3f",
-+  [0x15de] = "\x35\x40", [0x15df] = "\x35\x41", [0x15e0] = "\x35\x42",
-+  [0x15e1] = "\x35\x43", [0x15e2] = "\x35\x44", [0x15e3] = "\x35\x45",
-+  [0x15e4] = "\x35\x46", [0x15e5] = "\x35\x47", [0x15e6] = "\x35\x48",
-+  [0x15e7] = "\x35\x49", [0x15e8] = "\x35\x4a", [0x15e9] = "\x35\x4b",
-+  [0x15ea] = "\x35\x4c", [0x15eb] = "\x35\x4d", [0x15ec] = "\x35\x4e",
-+  [0x15ed] = "\x35\x4f", [0x15ee] = "\x35\x50", [0x15ef] = "\x35\x51",
-+  [0x15f0] = "\x35\x52", [0x15f1] = "\x35\x53", [0x15f2] = "\x35\x54",
-+  [0x15f3] = "\x35\x55", [0x15f4] = "\x35\x56", [0x15f5] = "\x35\x57",
-+  [0x15f6] = "\x35\x58", [0x15f7] = "\x35\x59", [0x15f8] = "\x35\x5a",
-+  [0x15f9] = "\x35\x5b", [0x15fa] = "\x35\x5c", [0x15fb] = "\x35\x5d",
-+  [0x15fc] = "\x35\x5e", [0x15fd] = "\x35\x5f", [0x15fe] = "\x35\x60",
-+  [0x15ff] = "\x35\x61", [0x1600] = "\x35\x62", [0x1601] = "\x35\x63",
-+  [0x1602] = "\x35\x64", [0x1603] = "\x35\x65", [0x1604] = "\x35\x66",
-+  [0x1605] = "\x35\x67", [0x1606] = "\x35\x68", [0x1607] = "\x35\x69",
-+  [0x1608] = "\x35\x6a", [0x1609] = "\x35\x6b", [0x160a] = "\x35\x6c",
-+  [0x160b] = "\x35\x6d", [0x160c] = "\x35\x6e", [0x160d] = "\x35\x6f",
-+  [0x160e] = "\x35\x70", [0x160f] = "\x35\x71", [0x1610] = "\x35\x72",
-+  [0x1611] = "\x35\x73", [0x1612] = "\x35\x74", [0x1613] = "\x35\x75",
-+  [0x1614] = "\x35\x76", [0x1615] = "\x35\x77", [0x1616] = "\x35\x78",
-+  [0x1617] = "\x35\x79", [0x1618] = "\x35\x7a", [0x1619] = "\x35\x7b",
-+  [0x161a] = "\x35\x7c", [0x161b] = "\x35\x7d", [0x161c] = "\x35\x7e",
-+  [0x161d] = "\x35\x7f", [0x161e] = "\x35\x80", [0x161f] = "\x35\x81",
-+  [0x1620] = "\x35\x82", [0x1621] = "\x35\x83", [0x1622] = "\x35\x84",
-+  [0x1623] = "\x35\x85", [0x1624] = "\x35\x86", [0x1625] = "\x35\x87",
-+  [0x1626] = "\x35\x88", [0x1627] = "\x35\x89", [0x1628] = "\x35\x8a",
-+  [0x1629] = "\x35\x8b", [0x162a] = "\x35\x8c", [0x162b] = "\x35\x8d",
-+  [0x162c] = "\x35\x8e", [0x162d] = "\x35\x8f", [0x162e] = "\x35\x90",
-+  [0x162f] = "\x35\x91", [0x1630] = "\x35\x92", [0x1631] = "\x35\x93",
-+  [0x1632] = "\x35\x94", [0x1633] = "\x35\x95", [0x1634] = "\x35\x96",
-+  [0x1635] = "\x35\x97", [0x1636] = "\x35\x98", [0x1637] = "\x35\x99",
-+  [0x1638] = "\x35\x9a", [0x1639] = "\x35\x9b", [0x163a] = "\x35\x9c",
-+  [0x163b] = "\x35\x9d", [0x163c] = "\x35\x9e", [0x163d] = "\x35\x9f",
-+  [0x163e] = "\x35\xa0", [0x163f] = "\x35\xa1", [0x1640] = "\x35\xa2",
-+  [0x1641] = "\x35\xa3", [0x1642] = "\x35\xa4", [0x1643] = "\x35\xa5",
-+  [0x1644] = "\x35\xa6", [0x1645] = "\x35\xa7", [0x1646] = "\x35\xa8",
-+  [0x1647] = "\x35\xa9", [0x1648] = "\x35\xaa", [0x1649] = "\x35\xab",
-+  [0x164a] = "\x35\xac", [0x164b] = "\x35\xad", [0x164c] = "\x35\xae",
-+  [0x164d] = "\x35\xaf", [0x164e] = "\x35\xb0", [0x164f] = "\x35\xb1",
-+  [0x1650] = "\x35\xb2", [0x1651] = "\x35\xb3", [0x1652] = "\x35\xb4",
-+  [0x1653] = "\x35\xb5", [0x1654] = "\x35\xb6", [0x1655] = "\x35\xb7",
-+  [0x1656] = "\x35\xb8", [0x1657] = "\x35\xb9", [0x1658] = "\x35\xba",
-+  [0x1659] = "\x35\xbb", [0x165a] = "\x35\xbc", [0x165b] = "\x35\xbd",
-+  [0x165c] = "\x35\xbe", [0x165d] = "\x35\xbf", [0x165e] = "\x35\xc0",
-+  [0x165f] = "\x35\xc1", [0x1660] = "\x35\xc2", [0x1661] = "\x35\xc3",
-+  [0x1662] = "\x35\xc4", [0x1663] = "\x35\xc5", [0x1664] = "\x35\xc6",
-+  [0x1665] = "\x35\xc7", [0x1666] = "\x35\xc8", [0x1667] = "\x35\xc9",
-+  [0x1668] = "\x35\xca", [0x1669] = "\x35\xcb", [0x166a] = "\x35\xcc",
-+  [0x166b] = "\x35\xcd", [0x166c] = "\x35\xce", [0x166d] = "\x35\xcf",
-+  [0x166e] = "\x35\xd0", [0x166f] = "\x35\xd1", [0x1670] = "\x35\xd2",
-+  [0x1671] = "\x35\xd3", [0x1672] = "\x35\xd4", [0x1673] = "\x35\xd5",
-+  [0x1674] = "\x35\xd6", [0x1675] = "\x35\xd7", [0x1676] = "\x35\xd8",
-+  [0x1677] = "\x35\xd9", [0x1678] = "\x35\xda", [0x1679] = "\x35\xdb",
-+  [0x167a] = "\x35\xdc", [0x167b] = "\x35\xdd", [0x167c] = "\x35\xde",
-+  [0x167d] = "\x35\xdf", [0x167e] = "\x35\xe0", [0x167f] = "\x35\xe1",
-+  [0x1680] = "\x35\xe2", [0x1681] = "\x35\xe3", [0x1682] = "\x35\xe4",
-+  [0x1683] = "\x35\xe5", [0x1684] = "\x35\xe6", [0x1685] = "\x35\xe7",
-+  [0x1686] = "\x35\xe8", [0x1687] = "\x35\xe9", [0x1688] = "\x35\xea",
-+  [0x1689] = "\x35\xeb", [0x168a] = "\x35\xec", [0x168b] = "\x35\xed",
-+  [0x168c] = "\x35\xee", [0x168d] = "\x35\xef", [0x168e] = "\x35\xf0",
-+  [0x168f] = "\x35\xf1", [0x1690] = "\x35\xf2", [0x1691] = "\x35\xf3",
-+  [0x1692] = "\x35\xf4", [0x1693] = "\x35\xf5", [0x1694] = "\x35\xf6",
-+  [0x1695] = "\x35\xf7", [0x1696] = "\x35\xf8", [0x1697] = "\x35\xf9",
-+  [0x1698] = "\x35\xfa", [0x1699] = "\x35\xfb", [0x169a] = "\x35\xfc",
-+  [0x169b] = "\x35\xfd", [0x169c] = "\x35\xfe", [0x169d] = "\x35\xff",
-+  [0x169e] = "\x36\x00", [0x169f] = "\x36\x01", [0x16a0] = "\x36\x02",
-+  [0x16a1] = "\x36\x03", [0x16a2] = "\x36\x04", [0x16a3] = "\x36\x05",
-+  [0x16a4] = "\x36\x06", [0x16a5] = "\x36\x07", [0x16a6] = "\x36\x08",
-+  [0x16a7] = "\x36\x09", [0x16a8] = "\x36\x0a", [0x16a9] = "\x36\x0b",
-+  [0x16aa] = "\x36\x0c", [0x16ab] = "\x36\x0d", [0x16ac] = "\x36\x0e",
-+  [0x16ad] = "\x36\x0f", [0x16ae] = "\x36\x10", [0x16af] = "\x36\x11",
-+  [0x16b0] = "\x36\x12", [0x16b1] = "\x36\x13", [0x16b2] = "\x36\x14",
-+  [0x16b3] = "\x36\x15", [0x16b4] = "\x36\x16", [0x16b5] = "\x36\x17",
-+  [0x16b6] = "\x36\x18", [0x16b7] = "\x36\x19", [0x16b8] = "\x36\x1a",
-+  [0x16b9] = "\x36\x1b", [0x16ba] = "\x36\x1c", [0x16bb] = "\x36\x1d",
-+  [0x16bc] = "\x36\x1e", [0x16bd] = "\x36\x1f", [0x16be] = "\x36\x20",
-+  [0x16bf] = "\x36\x21", [0x16c0] = "\x36\x22", [0x16c1] = "\x36\x23",
-+  [0x16c2] = "\x36\x24", [0x16c3] = "\x36\x25", [0x16c4] = "\x36\x26",
-+  [0x16c5] = "\x36\x27", [0x16c6] = "\x36\x28", [0x16c7] = "\x36\x29",
-+  [0x16c8] = "\x36\x2a", [0x16c9] = "\x36\x2b", [0x16ca] = "\x36\x2c",
-+  [0x16cb] = "\x36\x2d", [0x16cc] = "\x36\x2e", [0x16cd] = "\x36\x2f",
-+  [0x16ce] = "\x36\x30", [0x16cf] = "\x36\x31", [0x16d0] = "\x36\x32",
-+  [0x16d1] = "\x36\x33", [0x16d2] = "\x36\x34", [0x16d3] = "\x36\x35",
-+  [0x16d4] = "\x36\x36", [0x16d5] = "\x36\x37", [0x16d6] = "\x36\x38",
-+  [0x16d7] = "\x36\x39", [0x16d8] = "\x36\x3a", [0x16d9] = "\x36\x3b",
-+  [0x16da] = "\x36\x3c", [0x16db] = "\x36\x3d", [0x16dc] = "\x36\x3e",
-+  [0x16dd] = "\x36\x3f", [0x16de] = "\x36\x40", [0x16df] = "\x36\x41",
-+  [0x16e0] = "\x36\x42", [0x16e1] = "\x36\x43", [0x16e2] = "\x36\x44",
-+  [0x16e3] = "\x36\x45", [0x16e4] = "\x36\x46", [0x16e5] = "\x36\x47",
-+  [0x16e6] = "\x36\x48", [0x16e7] = "\x36\x49", [0x16e8] = "\x36\x4a",
-+  [0x16e9] = "\x36\x4b", [0x16ea] = "\x36\x4c", [0x16eb] = "\x36\x4d",
-+  [0x16ec] = "\x36\x4e", [0x16ed] = "\x36\x4f", [0x16ee] = "\x36\x50",
-+  [0x16ef] = "\x36\x51", [0x16f0] = "\x36\x52", [0x16f1] = "\x36\x53",
-+  [0x16f2] = "\x36\x54", [0x16f3] = "\x36\x55", [0x16f4] = "\x36\x56",
-+  [0x16f5] = "\x36\x57", [0x16f6] = "\x36\x58", [0x16f7] = "\x36\x59",
-+  [0x16f8] = "\x36\x5a", [0x16f9] = "\x36\x5b", [0x16fa] = "\x36\x5c",
-+  [0x16fb] = "\x36\x5d", [0x16fc] = "\x36\x5e", [0x16fd] = "\x36\x5f",
-+  [0x16fe] = "\x36\x60", [0x16ff] = "\x36\x61", [0x1700] = "\x36\x62",
-+  [0x1701] = "\x36\x63", [0x1702] = "\x36\x64", [0x1703] = "\x36\x65",
-+  [0x1704] = "\x36\x66", [0x1705] = "\x36\x67", [0x1706] = "\x36\x68",
-+  [0x1707] = "\x36\x69", [0x1708] = "\x36\x6a", [0x1709] = "\x36\x6b",
-+  [0x170a] = "\x36\x6c", [0x170b] = "\x36\x6d", [0x170c] = "\x36\x6e",
-+  [0x170d] = "\x36\x6f", [0x170e] = "\x36\x70", [0x170f] = "\x36\x71",
-+  [0x1710] = "\x36\x72", [0x1711] = "\x36\x73", [0x1712] = "\x36\x74",
-+  [0x1713] = "\x36\x75", [0x1714] = "\x36\x76", [0x1715] = "\x36\x77",
-+  [0x1716] = "\x36\x78", [0x1717] = "\x36\x79", [0x1718] = "\x36\x7a",
-+  [0x1719] = "\x36\x7b", [0x171a] = "\x36\x7c", [0x171b] = "\x36\x7d",
-+  [0x171c] = "\x36\x7e", [0x171d] = "\x36\x7f", [0x171e] = "\x36\x80",
-+  [0x171f] = "\x36\x81", [0x1720] = "\x36\x82", [0x1721] = "\x36\x83",
-+  [0x1722] = "\x36\x84", [0x1723] = "\x36\x85", [0x1724] = "\x36\x86",
-+  [0x1725] = "\x36\x87", [0x1726] = "\x36\x88", [0x1727] = "\x36\x89",
-+  [0x1728] = "\x36\x8a", [0x1729] = "\x36\x8b", [0x172a] = "\x36\x8c",
-+  [0x172b] = "\x36\x8d", [0x172c] = "\x36\x8e", [0x172d] = "\x36\x8f",
-+  [0x172e] = "\x36\x90", [0x172f] = "\x36\x91", [0x1730] = "\x36\x92",
-+  [0x1731] = "\x36\x93", [0x1732] = "\x36\x94", [0x1733] = "\x36\x95",
-+  [0x1734] = "\x36\x96", [0x1735] = "\x36\x97", [0x1736] = "\x36\x98",
-+  [0x1737] = "\x36\x99", [0x1738] = "\x36\x9a", [0x1739] = "\x36\x9b",
-+  [0x173a] = "\x36\x9c", [0x173b] = "\x36\x9d", [0x173c] = "\x36\x9e",
-+  [0x173d] = "\x36\x9f", [0x173e] = "\x36\xa0", [0x173f] = "\x36\xa1",
-+  [0x1740] = "\x36\xa2", [0x1741] = "\x36\xa3", [0x1742] = "\x36\xa4",
-+  [0x1743] = "\x36\xa5", [0x1744] = "\x36\xa6", [0x1745] = "\x36\xa7",
-+  [0x1746] = "\x36\xa8", [0x1747] = "\x36\xa9", [0x1748] = "\x36\xaa",
-+  [0x1749] = "\x36\xab", [0x174a] = "\x36\xac", [0x174b] = "\x36\xad",
-+  [0x174c] = "\x36\xae", [0x174d] = "\x36\xaf", [0x174e] = "\x36\xb0",
-+  [0x174f] = "\x36\xb1", [0x1750] = "\x36\xb2", [0x1751] = "\x36\xb3",
-+  [0x1752] = "\x36\xb4", [0x1753] = "\x36\xb5", [0x1754] = "\x36\xb6",
-+  [0x1755] = "\x36\xb7", [0x1756] = "\x36\xb8", [0x1757] = "\x36\xb9",
-+  [0x1758] = "\x36\xba", [0x1759] = "\x36\xbb", [0x175a] = "\x36\xbc",
-+  [0x175b] = "\x36\xbd", [0x175c] = "\x36\xbe", [0x175d] = "\x36\xbf",
-+  [0x175e] = "\x36\xc0", [0x175f] = "\x36\xc1", [0x1760] = "\x36\xc2",
-+  [0x1761] = "\x36\xc3", [0x1762] = "\x36\xc4", [0x1763] = "\x36\xc5",
-+  [0x1764] = "\x36\xc6", [0x1765] = "\x36\xc7", [0x1766] = "\x36\xc8",
-+  [0x1767] = "\x36\xc9", [0x1768] = "\x36\xca", [0x1769] = "\x36\xcb",
-+  [0x176a] = "\x36\xcc", [0x176b] = "\x36\xcd", [0x176c] = "\x36\xce",
-+  [0x176d] = "\x36\xcf", [0x176e] = "\x36\xd0", [0x176f] = "\x36\xd1",
-+  [0x1770] = "\x36\xd2", [0x1771] = "\x36\xd3", [0x1772] = "\x36\xd4",
-+  [0x1773] = "\x36\xd5", [0x1774] = "\x36\xd6", [0x1775] = "\x36\xd7",
-+  [0x1776] = "\x36\xd8", [0x1777] = "\x36\xd9", [0x1778] = "\x36\xda",
-+  [0x1779] = "\x36\xdb", [0x177a] = "\x36\xdc", [0x177b] = "\x36\xdd",
-+  [0x177c] = "\x36\xde", [0x177d] = "\x36\xdf", [0x177e] = "\x36\xe0",
-+  [0x177f] = "\x36\xe1", [0x1780] = "\x36\xe2", [0x1781] = "\x36\xe3",
-+  [0x1782] = "\x36\xe4", [0x1783] = "\x36\xe5", [0x1784] = "\x36\xe6",
-+  [0x1785] = "\x36\xe7", [0x1786] = "\x36\xe8", [0x1787] = "\x36\xe9",
-+  [0x1788] = "\x36\xea", [0x1789] = "\x36\xeb", [0x178a] = "\x36\xec",
-+  [0x178b] = "\x36\xed", [0x178c] = "\x36\xee", [0x178d] = "\x36\xef",
-+  [0x178e] = "\x36\xf0", [0x178f] = "\x36\xf1", [0x1790] = "\x36\xf2",
-+  [0x1791] = "\x36\xf3", [0x1792] = "\x36\xf4", [0x1793] = "\x36\xf5",
-+  [0x1794] = "\x36\xf6", [0x1795] = "\x36\xf7", [0x1796] = "\x36\xf8",
-+  [0x1797] = "\x36\xf9", [0x1798] = "\x36\xfa", [0x1799] = "\x36\xfb",
-+  [0x179a] = "\x36\xfc", [0x179b] = "\x36\xfd", [0x179c] = "\x36\xfe",
-+  [0x179d] = "\x36\xff", [0x179e] = "\x37\x00", [0x179f] = "\x37\x01",
-+  [0x17a0] = "\x37\x02", [0x17a1] = "\x37\x03", [0x17a2] = "\x37\x04",
-+  [0x17a3] = "\x37\x05", [0x17a4] = "\x37\x06", [0x17a5] = "\x37\x07",
-+  [0x17a6] = "\x37\x08", [0x17a7] = "\x37\x09", [0x17a8] = "\x37\x0a",
-+  [0x17a9] = "\x37\x0b", [0x17aa] = "\x37\x0c", [0x17ab] = "\x37\x0d",
-+  [0x17ac] = "\x37\x0e", [0x17ad] = "\x37\x0f", [0x17ae] = "\x37\x10",
-+  [0x17af] = "\x37\x11", [0x17b0] = "\x37\x12", [0x17b1] = "\x37\x13",
-+  [0x17b2] = "\x37\x14", [0x17b3] = "\x37\x15", [0x17b4] = "\x37\x16",
-+  [0x17b5] = "\x37\x17", [0x17b6] = "\x37\x18", [0x17b7] = "\x37\x19",
-+  [0x17b8] = "\x37\x1a", [0x17b9] = "\x37\x1b", [0x17ba] = "\x37\x1c",
-+  [0x17bb] = "\x37\x1d", [0x17bc] = "\x37\x1e", [0x17bd] = "\x37\x1f",
-+  [0x17be] = "\x37\x20", [0x17bf] = "\x37\x21", [0x17c0] = "\x37\x22",
-+  [0x17c1] = "\x37\x23", [0x17c2] = "\x37\x24", [0x17c3] = "\x37\x25",
-+  [0x17c4] = "\x37\x26", [0x17c5] = "\x37\x27", [0x17c6] = "\x37\x28",
-+  [0x17c7] = "\x37\x29", [0x17c8] = "\x37\x2a", [0x17c9] = "\x37\x2b",
-+  [0x17ca] = "\x37\x2c", [0x17cb] = "\x37\x2d", [0x17cc] = "\x37\x2e",
-+  [0x17cd] = "\x37\x2f", [0x17ce] = "\x37\x30", [0x17cf] = "\x37\x31",
-+  [0x17d0] = "\x37\x32", [0x17d1] = "\x37\x33", [0x17d2] = "\x37\x34",
-+  [0x17d3] = "\x37\x35", [0x17d4] = "\x37\x36", [0x17d5] = "\x37\x37",
-+  [0x17d6] = "\x37\x38", [0x17d7] = "\x37\x39", [0x17d8] = "\x37\x3a",
-+  [0x17d9] = "\x37\x3b", [0x17da] = "\x37\x3c", [0x17db] = "\x37\x3d",
-+  [0x17dc] = "\x37\x3e", [0x17dd] = "\x37\x3f", [0x17de] = "\x37\x40",
-+  [0x17df] = "\x37\x41", [0x17e0] = "\x37\x42", [0x17e1] = "\x37\x43",
-+  [0x17e2] = "\x37\x44", [0x17e3] = "\x37\x45", [0x17e4] = "\x37\x46",
-+  [0x17e5] = "\x37\x47", [0x17e6] = "\x37\x48", [0x17e7] = "\x37\x49",
-+  [0x17e8] = "\x37\x4a", [0x17e9] = "\x37\x4b", [0x17ea] = "\x37\x4c",
-+  [0x17eb] = "\x37\x4d", [0x17ec] = "\x37\x4e", [0x17ed] = "\x37\x4f",
-+  [0x17ee] = "\x37\x50", [0x17ef] = "\x37\x51", [0x17f0] = "\x37\x52",
-+  [0x17f1] = "\x37\x53", [0x17f2] = "\x37\x54", [0x17f3] = "\x37\x55",
-+  [0x17f4] = "\x37\x56", [0x17f5] = "\x37\x57", [0x17f6] = "\x37\x58",
-+  [0x17f7] = "\x37\x59", [0x17f8] = "\x37\x5a", [0x17f9] = "\x37\x5b",
-+  [0x17fa] = "\x37\x5c", [0x17fb] = "\x37\x5d", [0x17fc] = "\x37\x5e",
-+  [0x17fd] = "\x37\x5f", [0x17fe] = "\x37\x60", [0x17ff] = "\x37\x61",
-+  [0x1800] = "\x37\x62", [0x1801] = "\x37\x63", [0x1802] = "\x37\x64",
-+  [0x1803] = "\x37\x65", [0x1804] = "\x37\x66", [0x1805] = "\x37\x67",
-+  [0x1806] = "\x37\x68", [0x1807] = "\x37\x69", [0x1808] = "\x37\x6a",
-+  [0x1809] = "\x37\x6b", [0x180a] = "\x37\x6c", [0x180b] = "\x37\x6d",
-+  [0x180c] = "\x37\x6e", [0x180d] = "\x37\x6f", [0x180e] = "\x37\x70",
-+  [0x180f] = "\x37\x71", [0x1810] = "\x37\x72", [0x1811] = "\x37\x73",
-+  [0x1812] = "\x37\x74", [0x1813] = "\x37\x75", [0x1814] = "\x37\x76",
-+  [0x1815] = "\x37\x77", [0x1816] = "\x37\x78", [0x1817] = "\x37\x79",
-+  [0x1818] = "\x37\x7a", [0x1819] = "\x37\x7b", [0x181a] = "\x37\x7c",
-+  [0x181b] = "\x37\x7d", [0x181c] = "\x37\x7e", [0x181d] = "\x37\x7f",
-+  [0x181e] = "\x37\x80", [0x181f] = "\x37\x81", [0x1820] = "\x37\x82",
-+  [0x1821] = "\x37\x83", [0x1822] = "\x37\x84", [0x1823] = "\x37\x85",
-+  [0x1824] = "\x37\x86", [0x1825] = "\x37\x87", [0x1826] = "\x37\x88",
-+  [0x1827] = "\x37\x89", [0x1828] = "\x37\x8a", [0x1829] = "\x37\x8b",
-+  [0x182a] = "\x37\x8c", [0x182b] = "\x37\x8d", [0x182c] = "\x37\x8e",
-+  [0x182d] = "\x37\x8f", [0x182e] = "\x37\x90", [0x182f] = "\x37\x91",
-+  [0x1830] = "\x37\x92", [0x1831] = "\x37\x93", [0x1832] = "\x37\x94",
-+  [0x1833] = "\x37\x95", [0x1834] = "\x37\x96", [0x1835] = "\x37\x97",
-+  [0x1836] = "\x37\x98", [0x1837] = "\x37\x99", [0x1838] = "\x37\x9a",
-+  [0x1839] = "\x37\x9b", [0x183a] = "\x37\x9c", [0x183b] = "\x37\x9d",
-+  [0x183c] = "\x37\x9e", [0x183d] = "\x37\x9f", [0x183e] = "\x37\xa0",
-+  [0x183f] = "\x37\xa1", [0x1840] = "\x37\xa2", [0x1841] = "\x37\xa3",
-+  [0x1842] = "\x37\xa4", [0x1843] = "\x37\xa5", [0x1844] = "\x37\xa6",
-+  [0x1845] = "\x37\xa7", [0x1846] = "\x37\xa8", [0x1847] = "\x37\xa9",
-+  [0x1848] = "\x37\xaa", [0x1849] = "\x37\xab", [0x184a] = "\x37\xac",
-+  [0x184b] = "\x37\xad", [0x184c] = "\x37\xae", [0x184d] = "\x37\xaf",
-+  [0x184e] = "\x37\xb0", [0x184f] = "\x37\xb1", [0x1850] = "\x37\xb2",
-+  [0x1851] = "\x37\xb3", [0x1852] = "\x37\xb4", [0x1853] = "\x37\xb5",
-+  [0x1854] = "\x37\xb6", [0x1855] = "\x37\xb7", [0x1856] = "\x37\xb8",
-+  [0x1857] = "\x37\xb9", [0x1858] = "\x37\xba", [0x1859] = "\x37\xbb",
-+  [0x185a] = "\x37\xbc", [0x185b] = "\x37\xbd", [0x185c] = "\x37\xbe",
-+  [0x185d] = "\x37\xbf", [0x185e] = "\x37\xc0", [0x185f] = "\x37\xc1",
-+  [0x1860] = "\x37\xc2", [0x1861] = "\x37\xc3", [0x1862] = "\x37\xc4",
-+  [0x1863] = "\x37\xc5", [0x1864] = "\x37\xc6", [0x1865] = "\x37\xc7",
-+  [0x1866] = "\x37\xc8", [0x1867] = "\x37\xc9", [0x1868] = "\x37\xca",
-+  [0x1869] = "\x37\xcb", [0x186a] = "\x37\xcc", [0x186b] = "\x37\xcd",
-+  [0x186c] = "\x37\xce", [0x186d] = "\x37\xcf", [0x186e] = "\x37\xd0",
-+  [0x186f] = "\x37\xd1", [0x1870] = "\x37\xd2", [0x1871] = "\x37\xd3",
-+  [0x1872] = "\x37\xd4", [0x1873] = "\x37\xd5", [0x1874] = "\x37\xd6",
-+  [0x1875] = "\x37\xd7", [0x1876] = "\x37\xd8", [0x1877] = "\x37\xd9",
-+  [0x1878] = "\x37\xda", [0x1879] = "\x37\xdb", [0x187a] = "\x37\xdc",
-+  [0x187b] = "\x37\xdd", [0x187c] = "\x37\xde", [0x187d] = "\x37\xdf",
-+  [0x187e] = "\x37\xe0", [0x187f] = "\x37\xe1", [0x1880] = "\x37\xe2",
-+  [0x1881] = "\x37\xe3", [0x1882] = "\x37\xe4", [0x1883] = "\x37\xe5",
-+  [0x1884] = "\x37\xe6", [0x1885] = "\x37\xe7", [0x1886] = "\x37\xe8",
-+  [0x1887] = "\x37\xe9", [0x1888] = "\x37\xea", [0x1889] = "\x37\xeb",
-+  [0x188a] = "\x37\xec", [0x188b] = "\x37\xed", [0x188c] = "\x37\xee",
-+  [0x188d] = "\x37\xef", [0x188e] = "\x37\xf0", [0x188f] = "\x37\xf1",
-+  [0x1890] = "\x37\xf2", [0x1891] = "\x37\xf3", [0x1892] = "\x37\xf4",
-+  [0x1893] = "\x37\xf5", [0x1894] = "\x37\xf6", [0x1895] = "\x37\xf7",
-+  [0x1896] = "\x37\xf8", [0x1897] = "\x37\xf9", [0x1898] = "\x37\xfa",
-+  [0x1899] = "\x37\xfb", [0x189a] = "\x37\xfc", [0x189b] = "\x37\xfd",
-+  [0x189c] = "\x37\xfe", [0x189d] = "\x37\xff", [0x189e] = "\x38\x00",
-+  [0x189f] = "\x38\x01", [0x18a0] = "\x38\x02", [0x18a1] = "\x38\x03",
-+  [0x18a2] = "\x38\x04", [0x18a3] = "\x38\x05", [0x18a4] = "\x38\x06",
-+  [0x18a5] = "\x38\x07", [0x18a6] = "\x38\x08", [0x18a7] = "\x38\x09",
-+  [0x18a8] = "\x38\x0a", [0x18a9] = "\x38\x0b", [0x18aa] = "\x38\x0c",
-+  [0x18ab] = "\x38\x0d", [0x18ac] = "\x38\x0e", [0x18ad] = "\x38\x0f",
-+  [0x18ae] = "\x38\x10", [0x18af] = "\x38\x11", [0x18b0] = "\x38\x12",
-+  [0x18b1] = "\x38\x13", [0x18b2] = "\x38\x14", [0x18b3] = "\x38\x15",
-+  [0x18b4] = "\x38\x16", [0x18b5] = "\x38\x17", [0x18b6] = "\x38\x18",
-+  [0x18b7] = "\x38\x19", [0x18b8] = "\x38\x1a", [0x18b9] = "\x38\x1b",
-+  [0x18ba] = "\x38\x1c", [0x18bb] = "\x38\x1d", [0x18bc] = "\x38\x1e",
-+  [0x18bd] = "\x38\x1f", [0x18be] = "\x38\x20", [0x18bf] = "\x38\x21",
-+  [0x18c0] = "\x38\x22", [0x18c1] = "\x38\x23", [0x18c2] = "\x38\x24",
-+  [0x18c3] = "\x38\x25", [0x18c4] = "\x38\x26", [0x18c5] = "\x38\x27",
-+  [0x18c6] = "\x38\x28", [0x18c7] = "\x38\x29", [0x18c8] = "\x38\x2a",
-+  [0x18c9] = "\x38\x2b", [0x18ca] = "\x38\x2c", [0x18cb] = "\x38\x2d",
-+  [0x18cc] = "\x38\x2e", [0x18cd] = "\x38\x2f", [0x18ce] = "\x38\x30",
-+  [0x18cf] = "\x38\x31", [0x18d0] = "\x38\x32", [0x18d1] = "\x38\x33",
-+  [0x18d2] = "\x38\x34", [0x18d3] = "\x38\x35", [0x18d4] = "\x38\x36",
-+  [0x18d5] = "\x38\x37", [0x18d6] = "\x38\x38", [0x18d7] = "\x38\x39",
-+  [0x18d8] = "\x38\x3a", [0x18d9] = "\x38\x3b", [0x18da] = "\x38\x3c",
-+  [0x18db] = "\x38\x3d", [0x18dc] = "\x38\x3e", [0x18dd] = "\x38\x3f",
-+  [0x18de] = "\x38\x40", [0x18df] = "\x38\x41", [0x18e0] = "\x38\x42",
-+  [0x18e1] = "\x38\x43", [0x18e2] = "\x38\x44", [0x18e3] = "\x38\x45",
-+  [0x18e4] = "\x38\x46", [0x18e5] = "\x38\x47", [0x18e6] = "\x38\x48",
-+  [0x18e7] = "\x38\x49", [0x18e8] = "\x38\x4a", [0x18e9] = "\x38\x4b",
-+  [0x18ea] = "\x38\x4c", [0x18eb] = "\x38\x4d", [0x18ec] = "\x38\x4e",
-+  [0x18ed] = "\x38\x4f", [0x18ee] = "\x38\x50", [0x18ef] = "\x38\x51",
-+  [0x18f0] = "\x38\x52", [0x18f1] = "\x38\x53", [0x18f2] = "\x38\x54",
-+  [0x18f3] = "\x38\x55", [0x18f4] = "\x38\x56", [0x18f5] = "\x38\x57",
-+  [0x18f6] = "\x38\x58", [0x18f7] = "\x38\x59", [0x18f8] = "\x38\x5a",
-+  [0x18f9] = "\x38\x5b", [0x18fa] = "\x38\x5c", [0x18fb] = "\x38\x5d",
-+  [0x18fc] = "\x38\x5e", [0x18fd] = "\x38\x5f", [0x18fe] = "\x38\x60",
-+  [0x18ff] = "\x38\x61", [0x1900] = "\x38\x62", [0x1901] = "\x38\x63",
-+  [0x1902] = "\x38\x64", [0x1903] = "\x38\x65", [0x1904] = "\x38\x66",
-+  [0x1905] = "\x38\x67", [0x1906] = "\x38\x68", [0x1907] = "\x38\x69",
-+  [0x1908] = "\x38\x6a", [0x1909] = "\x38\x6b", [0x190a] = "\x38\x6c",
-+  [0x190b] = "\x38\x6d", [0x190c] = "\x38\x6e", [0x190d] = "\x38\x6f",
-+  [0x190e] = "\x38\x70", [0x190f] = "\x38\x71", [0x1910] = "\x38\x72",
-+  [0x1911] = "\x38\x73", [0x1912] = "\x38\x74", [0x1913] = "\x38\x75",
-+  [0x1914] = "\x38\x76", [0x1915] = "\x38\x77", [0x1916] = "\x38\x78",
-+  [0x1917] = "\x38\x79", [0x1918] = "\x38\x7a", [0x1919] = "\x38\x7b",
-+  [0x191a] = "\x38\x7c", [0x191b] = "\x38\x7d", [0x191c] = "\x38\x7e",
-+  [0x191d] = "\x38\x7f", [0x191e] = "\x38\x80", [0x191f] = "\x38\x81",
-+  [0x1920] = "\x38\x82", [0x1921] = "\x38\x83", [0x1922] = "\x38\x84",
-+  [0x1923] = "\x38\x85", [0x1924] = "\x38\x86", [0x1925] = "\x38\x87",
-+  [0x1926] = "\x38\x88", [0x1927] = "\x38\x89", [0x1928] = "\x38\x8a",
-+  [0x1929] = "\x38\x8b", [0x192a] = "\x38\x8c", [0x192b] = "\x38\x8d",
-+  [0x192c] = "\x38\x8e", [0x192d] = "\x38\x8f", [0x192e] = "\x38\x90",
-+  [0x192f] = "\x38\x91", [0x1930] = "\x38\x92", [0x1931] = "\x38\x93",
-+  [0x1932] = "\x38\x94", [0x1933] = "\x38\x95", [0x1934] = "\x38\x96",
-+  [0x1935] = "\x38\x97", [0x1936] = "\x38\x98", [0x1937] = "\x38\x99",
-+  [0x1938] = "\x38\x9a", [0x1939] = "\x38\x9b", [0x193a] = "\x38\x9c",
-+  [0x193b] = "\x38\x9d", [0x193c] = "\x38\x9e", [0x193d] = "\x38\x9f",
-+  [0x193e] = "\x38\xa0", [0x193f] = "\x38\xa1", [0x1940] = "\x38\xa2",
-+  [0x1941] = "\x38\xa3", [0x1942] = "\x38\xa4", [0x1943] = "\x38\xa5",
-+  [0x1944] = "\x38\xa6", [0x1945] = "\x38\xa7", [0x1946] = "\x38\xa8",
-+  [0x1947] = "\x38\xa9", [0x1948] = "\x38\xaa", [0x1949] = "\x38\xab",
-+  [0x194a] = "\x38\xac", [0x194b] = "\x38\xad", [0x194c] = "\x38\xae",
-+  [0x194d] = "\x38\xaf", [0x194e] = "\x38\xb0", [0x194f] = "\x38\xb1",
-+  [0x1950] = "\x38\xb2", [0x1951] = "\x38\xb3", [0x1952] = "\x38\xb4",
-+  [0x1953] = "\x38\xb5", [0x1954] = "\x38\xb6", [0x1955] = "\x38\xb7",
-+  [0x1956] = "\x38\xb8", [0x1957] = "\x38\xb9", [0x1958] = "\x38\xba",
-+  [0x1959] = "\x38\xbb", [0x195a] = "\x38\xbc", [0x195b] = "\x38\xbd",
-+  [0x195c] = "\x38\xbe", [0x195d] = "\x38\xbf", [0x195e] = "\x38\xc0",
-+  [0x195f] = "\x38\xc1", [0x1960] = "\x38\xc2", [0x1961] = "\x38\xc3",
-+  [0x1962] = "\x38\xc4", [0x1963] = "\x38\xc5", [0x1964] = "\x38\xc6",
-+  [0x1965] = "\x38\xc7", [0x1966] = "\x38\xc8", [0x1967] = "\x38\xc9",
-+  [0x1968] = "\x38\xca", [0x1969] = "\x38\xcb", [0x196a] = "\x38\xcc",
-+  [0x196b] = "\x38\xcd", [0x196c] = "\x38\xce", [0x196d] = "\x38\xcf",
-+  [0x196e] = "\x38\xd0", [0x196f] = "\x38\xd1", [0x1970] = "\x38\xd2",
-+  [0x1971] = "\x38\xd3", [0x1972] = "\x38\xd4", [0x1973] = "\x38\xd5",
-+  [0x1974] = "\x38\xd6", [0x1975] = "\x38\xd7", [0x1976] = "\x38\xd8",
-+  [0x1977] = "\x38\xd9", [0x1978] = "\x38\xda", [0x1979] = "\x38\xdb",
-+  [0x197a] = "\x38\xdc", [0x197b] = "\x38\xdd", [0x197c] = "\x38\xde",
-+  [0x197d] = "\x38\xdf", [0x197e] = "\x38\xe0", [0x197f] = "\x38\xe1",
-+  [0x1980] = "\x38\xe2", [0x1981] = "\x38\xe3", [0x1982] = "\x38\xe4",
-+  [0x1983] = "\x38\xe5", [0x1984] = "\x38\xe6", [0x1985] = "\x38\xe7",
-+  [0x1986] = "\x38\xe8", [0x1987] = "\x38\xe9", [0x1988] = "\x38\xea",
-+  [0x1989] = "\x38\xeb", [0x198a] = "\x38\xec", [0x198b] = "\x38\xed",
-+  [0x198c] = "\x38\xee", [0x198d] = "\x38\xef", [0x198e] = "\x38\xf0",
-+  [0x198f] = "\x38\xf1", [0x1990] = "\x38\xf2", [0x1991] = "\x38\xf3",
-+  [0x1992] = "\x38\xf4", [0x1993] = "\x38\xf5", [0x1994] = "\x38\xf6",
-+  [0x1995] = "\x38\xf7", [0x1996] = "\x38\xf8", [0x1997] = "\x38\xf9",
-+  [0x1998] = "\x38\xfa", [0x1999] = "\x38\xfb", [0x199a] = "\x38\xfc",
-+  [0x199b] = "\x38\xfd", [0x199c] = "\x38\xfe", [0x199d] = "\x38\xff",
-+  [0x199e] = "\x39\x00", [0x199f] = "\x39\x01", [0x19a0] = "\x39\x02",
-+  [0x19a1] = "\x39\x03", [0x19a2] = "\x39\x04", [0x19a3] = "\x39\x05",
-+  [0x19a4] = "\x39\x06", [0x19a5] = "\x39\x07", [0x19a6] = "\x39\x08",
-+  [0x19a7] = "\x39\x09", [0x19a8] = "\x39\x0a", [0x19a9] = "\x39\x0b",
-+  [0x19aa] = "\x39\x0c", [0x19ab] = "\x39\x0d", [0x19ac] = "\x39\x0e",
-+  [0x19ad] = "\x39\x0f", [0x19ae] = "\x39\x10", [0x19af] = "\x39\x11",
-+  [0x19b0] = "\x39\x12", [0x19b1] = "\x39\x13", [0x19b2] = "\x39\x14",
-+  [0x19b3] = "\x39\x15", [0x19b4] = "\x39\x16", [0x19b5] = "\x39\x17",
-+  [0x19b6] = "\x39\x18", [0x19b7] = "\x39\x19", [0x19b8] = "\x39\x1a",
-+  [0x19b9] = "\x39\x1b", [0x19ba] = "\x39\x1c", [0x19bb] = "\x39\x1d",
-+  [0x19bc] = "\x39\x1e", [0x19bd] = "\x39\x1f", [0x19be] = "\x39\x20",
-+  [0x19bf] = "\x39\x21", [0x19c0] = "\x39\x22", [0x19c1] = "\x39\x23",
-+  [0x19c2] = "\x39\x24", [0x19c3] = "\x39\x25", [0x19c4] = "\x39\x26",
-+  [0x19c5] = "\x39\x27", [0x19c6] = "\x39\x28", [0x19c7] = "\x39\x29",
-+  [0x19c8] = "\x39\x2a", [0x19c9] = "\x39\x2b", [0x19ca] = "\x39\x2c",
-+  [0x19cb] = "\x39\x2d", [0x19cc] = "\x39\x2e", [0x19cd] = "\x39\x2f",
-+  [0x19ce] = "\x39\x30", [0x19cf] = "\x39\x31", [0x19d0] = "\x39\x32",
-+  [0x19d1] = "\x39\x33", [0x19d2] = "\x39\x34", [0x19d3] = "\x39\x35",
-+  [0x19d4] = "\x39\x36", [0x19d5] = "\x39\x37", [0x19d6] = "\x39\x38",
-+  [0x19d7] = "\x39\x39", [0x19d8] = "\x39\x3a", [0x19d9] = "\x39\x3b",
-+  [0x19da] = "\x39\x3c", [0x19db] = "\x39\x3d", [0x19dc] = "\x39\x3e",
-+  [0x19dd] = "\x39\x3f", [0x19de] = "\x39\x40", [0x19df] = "\x39\x41",
-+  [0x19e0] = "\x39\x42", [0x19e1] = "\x39\x43", [0x19e2] = "\x39\x44",
-+  [0x19e3] = "\x39\x45", [0x19e4] = "\x39\x46", [0x19e5] = "\x39\x47",
-+  [0x19e6] = "\x39\x48", [0x19e7] = "\x39\x49", [0x19e8] = "\x39\x4a",
-+  [0x19e9] = "\x39\x4b", [0x19ea] = "\x39\x4c", [0x19eb] = "\x39\x4d",
-+  [0x19ec] = "\x39\x4e", [0x19ed] = "\x39\x4f", [0x19ee] = "\x39\x50",
-+  [0x19ef] = "\x39\x51", [0x19f0] = "\x39\x52", [0x19f1] = "\x39\x53",
-+  [0x19f2] = "\x39\x54", [0x19f3] = "\x39\x55", [0x19f4] = "\x39\x56",
-+  [0x19f5] = "\x39\x57", [0x19f6] = "\x39\x58", [0x19f7] = "\x39\x59",
-+  [0x19f8] = "\x39\x5a", [0x19f9] = "\x39\x5b", [0x19fa] = "\x39\x5c",
-+  [0x19fb] = "\x39\x5d", [0x19fc] = "\x39\x5e", [0x19fd] = "\x39\x5f",
-+  [0x19fe] = "\x39\x60", [0x19ff] = "\x39\x61", [0x1a00] = "\x39\x62",
-+  [0x1a01] = "\x39\x63", [0x1a02] = "\x39\x64", [0x1a03] = "\x39\x65",
-+  [0x1a04] = "\x39\x66", [0x1a05] = "\x39\x67", [0x1a06] = "\x39\x68",
-+  [0x1a07] = "\x39\x69", [0x1a08] = "\x39\x6a", [0x1a09] = "\x39\x6b",
-+  [0x1a0a] = "\x39\x6c", [0x1a0b] = "\x39\x6d", [0x1a0c] = "\x39\x6e",
-+  [0x1a0d] = "\x39\x6f", [0x1a0e] = "\x39\x70", [0x1a0f] = "\x39\x71",
-+  [0x1a10] = "\x39\x72", [0x1a11] = "\x39\x73", [0x1a12] = "\x39\x74",
-+  [0x1a13] = "\x39\x75", [0x1a14] = "\x39\x76", [0x1a15] = "\x39\x77",
-+  [0x1a16] = "\x39\x78", [0x1a17] = "\x39\x79", [0x1a18] = "\x39\x7a",
-+  [0x1a19] = "\x39\x7b", [0x1a1a] = "\x39\x7c", [0x1a1b] = "\x39\x7d",
-+  [0x1a1c] = "\x39\x7e", [0x1a1d] = "\x39\x7f", [0x1a1e] = "\x39\x80",
-+  [0x1a1f] = "\x39\x81", [0x1a20] = "\x39\x82", [0x1a21] = "\x39\x83",
-+  [0x1a22] = "\x39\x84", [0x1a23] = "\x39\x85", [0x1a24] = "\x39\x86",
-+  [0x1a25] = "\x39\x87", [0x1a26] = "\x39\x88", [0x1a27] = "\x39\x89",
-+  [0x1a28] = "\x39\x8a", [0x1a29] = "\x39\x8b", [0x1a2a] = "\x39\x8c",
-+  [0x1a2b] = "\x39\x8d", [0x1a2c] = "\x39\x8e", [0x1a2d] = "\x39\x8f",
-+  [0x1a2e] = "\x39\x90", [0x1a2f] = "\x39\x91", [0x1a30] = "\x39\x92",
-+  [0x1a31] = "\x39\x93", [0x1a32] = "\x39\x94", [0x1a33] = "\x39\x95",
-+  [0x1a34] = "\x39\x96", [0x1a35] = "\x39\x97", [0x1a36] = "\x39\x98",
-+  [0x1a37] = "\x39\x99", [0x1a38] = "\x39\x9a", [0x1a39] = "\x39\x9b",
-+  [0x1a3a] = "\x39\x9c", [0x1a3b] = "\x39\x9d", [0x1a3c] = "\x39\x9e",
-+  [0x1a3d] = "\x39\x9f", [0x1a3e] = "\x39\xa0", [0x1a3f] = "\x39\xa1",
-+  [0x1a40] = "\x39\xa2", [0x1a41] = "\x39\xa3", [0x1a42] = "\x39\xa4",
-+  [0x1a43] = "\x39\xa5", [0x1a44] = "\x39\xa6", [0x1a45] = "\x39\xa7",
-+  [0x1a46] = "\x39\xa8", [0x1a47] = "\x39\xa9", [0x1a48] = "\x39\xaa",
-+  [0x1a49] = "\x39\xab", [0x1a4a] = "\x39\xac", [0x1a4b] = "\x39\xad",
-+  [0x1a4c] = "\x39\xae", [0x1a4d] = "\x39\xaf", [0x1a4e] = "\x39\xb0",
-+  [0x1a4f] = "\x39\xb1", [0x1a50] = "\x39\xb2", [0x1a51] = "\x39\xb3",
-+  [0x1a52] = "\x39\xb4", [0x1a53] = "\x39\xb5", [0x1a54] = "\x39\xb6",
-+  [0x1a55] = "\x39\xb7", [0x1a56] = "\x39\xb8", [0x1a57] = "\x39\xb9",
-+  [0x1a58] = "\x39\xba", [0x1a59] = "\x39\xbb", [0x1a5a] = "\x39\xbc",
-+  [0x1a5b] = "\x39\xbd", [0x1a5c] = "\x39\xbe", [0x1a5d] = "\x39\xbf",
-+  [0x1a5e] = "\x39\xc0", [0x1a5f] = "\x39\xc1", [0x1a60] = "\x39\xc2",
-+  [0x1a61] = "\x39\xc3", [0x1a62] = "\x39\xc4", [0x1a63] = "\x39\xc5",
-+  [0x1a64] = "\x39\xc6", [0x1a65] = "\x39\xc7", [0x1a66] = "\x39\xc8",
-+  [0x1a67] = "\x39\xc9", [0x1a68] = "\x39\xca", [0x1a69] = "\x39\xcb",
-+  [0x1a6a] = "\x39\xcc", [0x1a6b] = "\x39\xcd", [0x1a6c] = "\x39\xce",
-+  [0x1a6d] = "\x39\xcf", [0x1a6e] = "\x39\xd0", [0x1a6f] = "\x39\xd1",
-+  [0x1a70] = "\x39\xd2", [0x1a71] = "\x39\xd3", [0x1a72] = "\x39\xd4",
-+  [0x1a73] = "\x39\xd5", [0x1a74] = "\x39\xd6", [0x1a75] = "\x39\xd7",
-+  [0x1a76] = "\x39\xd8", [0x1a77] = "\x39\xd9", [0x1a78] = "\x39\xda",
-+  [0x1a79] = "\x39\xdb", [0x1a7a] = "\x39\xdc", [0x1a7b] = "\x39\xdd",
-+  [0x1a7c] = "\x39\xde", [0x1a7d] = "\x39\xdf", [0x1a7e] = "\x39\xe0",
-+  [0x1a7f] = "\x39\xe1", [0x1a80] = "\x39\xe2", [0x1a81] = "\x39\xe3",
-+  [0x1a82] = "\x39\xe4", [0x1a83] = "\x39\xe5", [0x1a84] = "\x39\xe6",
-+  [0x1a85] = "\x39\xe7", [0x1a86] = "\x39\xe8", [0x1a87] = "\x39\xe9",
-+  [0x1a88] = "\x39\xea", [0x1a89] = "\x39\xeb", [0x1a8a] = "\x39\xec",
-+  [0x1a8b] = "\x39\xed", [0x1a8c] = "\x39\xee", [0x1a8d] = "\x39\xef",
-+  [0x1a8e] = "\x39\xf0", [0x1a8f] = "\x39\xf1", [0x1a90] = "\x39\xf2",
-+  [0x1a91] = "\x39\xf3", [0x1a92] = "\x39\xf4", [0x1a93] = "\x39\xf5",
-+  [0x1a94] = "\x39\xf6", [0x1a95] = "\x39\xf7", [0x1a96] = "\x39\xf8",
-+  [0x1a97] = "\x39\xf9", [0x1a98] = "\x39\xfa", [0x1a99] = "\x39\xfb",
-+  [0x1a9a] = "\x39\xfc", [0x1a9b] = "\x39\xfd", [0x1a9c] = "\x39\xfe",
-+  [0x1a9d] = "\x39\xff", [0x1a9e] = "\x3a\x00", [0x1a9f] = "\x3a\x01",
-+  [0x1aa0] = "\x3a\x02", [0x1aa1] = "\x3a\x03", [0x1aa2] = "\x3a\x04",
-+  [0x1aa3] = "\x3a\x05", [0x1aa4] = "\x3a\x06", [0x1aa5] = "\x3a\x07",
-+  [0x1aa6] = "\x3a\x08", [0x1aa7] = "\x3a\x09", [0x1aa8] = "\x3a\x0a",
-+  [0x1aa9] = "\x3a\x0b", [0x1aaa] = "\x3a\x0c", [0x1aab] = "\x3a\x0d",
-+  [0x1aac] = "\x3a\x0e", [0x1aad] = "\x3a\x0f", [0x1aae] = "\x3a\x10",
-+  [0x1aaf] = "\x3a\x11", [0x1ab0] = "\x3a\x12", [0x1ab1] = "\x3a\x13",
-+  [0x1ab2] = "\x3a\x14", [0x1ab3] = "\x3a\x15", [0x1ab4] = "\x3a\x16",
-+  [0x1ab5] = "\x3a\x17", [0x1ab6] = "\x3a\x18", [0x1ab7] = "\x3a\x19",
-+  [0x1ab8] = "\x3a\x1a", [0x1ab9] = "\x3a\x1b", [0x1aba] = "\x3a\x1c",
-+  [0x1abb] = "\x3a\x1d", [0x1abc] = "\x3a\x1e", [0x1abd] = "\x3a\x1f",
-+  [0x1abe] = "\x3a\x20", [0x1abf] = "\x3a\x21", [0x1ac0] = "\x3a\x22",
-+  [0x1ac1] = "\x3a\x23", [0x1ac2] = "\x3a\x24", [0x1ac3] = "\x3a\x25",
-+  [0x1ac4] = "\x3a\x26", [0x1ac5] = "\x3a\x27", [0x1ac6] = "\x3a\x28",
-+  [0x1ac7] = "\x3a\x29", [0x1ac8] = "\x3a\x2a", [0x1ac9] = "\x3a\x2b",
-+  [0x1aca] = "\x3a\x2c", [0x1acb] = "\x3a\x2d", [0x1acc] = "\x3a\x2e",
-+  [0x1acd] = "\x3a\x2f", [0x1ace] = "\x3a\x30", [0x1acf] = "\x3a\x31",
-+  [0x1ad0] = "\x3a\x32", [0x1ad1] = "\x3a\x33", [0x1ad2] = "\x3a\x34",
-+  [0x1ad3] = "\x3a\x35", [0x1ad4] = "\x3a\x36", [0x1ad5] = "\x3a\x37",
-+  [0x1ad6] = "\x3a\x38", [0x1ad7] = "\x3a\x39", [0x1ad8] = "\x3a\x3a",
-+  [0x1ad9] = "\x3a\x3b", [0x1ada] = "\x3a\x3c", [0x1adb] = "\x3a\x3d",
-+  [0x1adc] = "\x3a\x3e", [0x1add] = "\x3a\x3f", [0x1ade] = "\x3a\x40",
-+  [0x1adf] = "\x3a\x41", [0x1ae0] = "\x3a\x42", [0x1ae1] = "\x3a\x43",
-+  [0x1ae2] = "\x3a\x44", [0x1ae3] = "\x3a\x45", [0x1ae4] = "\x3a\x46",
-+  [0x1ae5] = "\x3a\x47", [0x1ae6] = "\x3a\x48", [0x1ae7] = "\x3a\x49",
-+  [0x1ae8] = "\x3a\x4a", [0x1ae9] = "\x3a\x4b", [0x1aea] = "\x3a\x4c",
-+  [0x1aeb] = "\x3a\x4d", [0x1aec] = "\x3a\x4e", [0x1aed] = "\x3a\x4f",
-+  [0x1aee] = "\x3a\x50", [0x1aef] = "\x3a\x51", [0x1af0] = "\x3a\x52",
-+  [0x1af1] = "\x3a\x53", [0x1af2] = "\x3a\x54", [0x1af3] = "\x3a\x55",
-+  [0x1af4] = "\x3a\x56", [0x1af5] = "\x3a\x57", [0x1af6] = "\x3a\x58",
-+  [0x1af7] = "\x3a\x59", [0x1af8] = "\x3a\x5a", [0x1af9] = "\x3a\x5b",
-+  [0x1afa] = "\x3a\x5c", [0x1afb] = "\x3a\x5d", [0x1afc] = "\x3a\x5e",
-+  [0x1afd] = "\x3a\x5f", [0x1afe] = "\x3a\x60", [0x1aff] = "\x3a\x61",
-+  [0x1b00] = "\x3a\x62", [0x1b01] = "\x3a\x63", [0x1b02] = "\x3a\x64",
-+  [0x1b03] = "\x3a\x65", [0x1b04] = "\x3a\x66", [0x1b05] = "\x3a\x67",
-+  [0x1b06] = "\x3a\x68", [0x1b07] = "\x3a\x69", [0x1b08] = "\x3a\x6a",
-+  [0x1b09] = "\x3a\x6b", [0x1b0a] = "\x3a\x6c", [0x1b0b] = "\x3a\x6d",
-+  [0x1b0c] = "\x3a\x6e", [0x1b0d] = "\x3a\x6f", [0x1b0e] = "\x3a\x70",
-+  [0x1b0f] = "\x3a\x71", [0x1b10] = "\x3a\x72", [0x1b11] = "\x3a\x73",
-+  [0x1b12] = "\x3a\x74", [0x1b13] = "\x3a\x75", [0x1b14] = "\x3a\x76",
-+  [0x1b15] = "\x3a\x77", [0x1b16] = "\x3a\x78", [0x1b17] = "\x3a\x79",
-+  [0x1b18] = "\x3a\x7a", [0x1b19] = "\x3a\x7b", [0x1b1a] = "\x3a\x7c",
-+  [0x1b1b] = "\x3a\x7d", [0x1b1c] = "\x3a\x7e", [0x1b1d] = "\x3a\x7f",
-+  [0x1b1e] = "\x3a\x80", [0x1b1f] = "\x3a\x81", [0x1b20] = "\x3a\x82",
-+  [0x1b21] = "\x3a\x83", [0x1b22] = "\x3a\x84", [0x1b23] = "\x3a\x85",
-+  [0x1b24] = "\x3a\x86", [0x1b25] = "\x3a\x87", [0x1b26] = "\x3a\x88",
-+  [0x1b27] = "\x3a\x89", [0x1b28] = "\x3a\x8a", [0x1b29] = "\x3a\x8b",
-+  [0x1b2a] = "\x3a\x8c", [0x1b2b] = "\x3a\x8d", [0x1b2c] = "\x3a\x8e",
-+  [0x1b2d] = "\x3a\x8f", [0x1b2e] = "\x3a\x90", [0x1b2f] = "\x3a\x91",
-+  [0x1b30] = "\x3a\x92", [0x1b31] = "\x3a\x93", [0x1b32] = "\x3a\x94",
-+  [0x1b33] = "\x3a\x95", [0x1b34] = "\x3a\x96", [0x1b35] = "\x3a\x97",
-+  [0x1b36] = "\x3a\x98", [0x1b37] = "\x3a\x99", [0x1b38] = "\x3a\x9a",
-+  [0x1b39] = "\x3a\x9b", [0x1b3a] = "\x3a\x9c", [0x1b3b] = "\x3a\x9d",
-+  [0x1b3c] = "\x3a\x9e", [0x1b3d] = "\x3a\x9f", [0x1b3e] = "\x3a\xa0",
-+  [0x1b3f] = "\x3a\xa1", [0x1b40] = "\x3a\xa2", [0x1b41] = "\x3a\xa3",
-+  [0x1b42] = "\x3a\xa4", [0x1b43] = "\x3a\xa5", [0x1b44] = "\x3a\xa6",
-+  [0x1b45] = "\x3a\xa7", [0x1b46] = "\x3a\xa8", [0x1b47] = "\x3a\xa9",
-+  [0x1b48] = "\x3a\xaa", [0x1b49] = "\x3a\xab", [0x1b4a] = "\x3a\xac",
-+  [0x1b4b] = "\x3a\xad", [0x1b4c] = "\x3a\xae", [0x1b4d] = "\x3a\xaf",
-+  [0x1b4e] = "\x3a\xb0", [0x1b4f] = "\x3a\xb1", [0x1b50] = "\x3a\xb2",
-+  [0x1b51] = "\x3a\xb3", [0x1b52] = "\x3a\xb4", [0x1b53] = "\x3a\xb5",
-+  [0x1b54] = "\x3a\xb6", [0x1b55] = "\x3a\xb7", [0x1b56] = "\x3a\xb8",
-+  [0x1b57] = "\x3a\xb9", [0x1b58] = "\x3a\xba", [0x1b59] = "\x3a\xbb",
-+  [0x1b5a] = "\x3a\xbc", [0x1b5b] = "\x3a\xbd", [0x1b5c] = "\x3a\xbe",
-+  [0x1b5d] = "\x3a\xbf", [0x1b5e] = "\x3a\xc0", [0x1b5f] = "\x3a\xc1",
-+  [0x1b60] = "\x3a\xc2", [0x1b61] = "\x3a\xc3", [0x1b62] = "\x3a\xc4",
-+  [0x1b63] = "\x3a\xc5", [0x1b64] = "\x3a\xc6", [0x1b65] = "\x3a\xc7",
-+  [0x1b66] = "\x3a\xc8", [0x1b67] = "\x3a\xc9", [0x1b68] = "\x3a\xca",
-+  [0x1b69] = "\x3a\xcb", [0x1b6a] = "\x3a\xcc", [0x1b6b] = "\x3a\xcd",
-+  [0x1b6c] = "\x3a\xce", [0x1b6d] = "\x3a\xcf", [0x1b6e] = "\x3a\xd0",
-+  [0x1b6f] = "\x3a\xd1", [0x1b70] = "\x3a\xd2", [0x1b71] = "\x3a\xd3",
-+  [0x1b72] = "\x3a\xd4", [0x1b73] = "\x3a\xd5", [0x1b74] = "\x3a\xd6",
-+  [0x1b75] = "\x3a\xd7", [0x1b76] = "\x3a\xd8", [0x1b77] = "\x3a\xd9",
-+  [0x1b78] = "\x3a\xda", [0x1b79] = "\x3a\xdb", [0x1b7a] = "\x3a\xdc",
-+  [0x1b7b] = "\x3a\xdd", [0x1b7c] = "\x3a\xde", [0x1b7d] = "\x3a\xdf",
-+  [0x1b7e] = "\x3a\xe0", [0x1b7f] = "\x3a\xe1", [0x1b80] = "\x3a\xe2",
-+  [0x1b81] = "\x3a\xe3", [0x1b82] = "\x3a\xe4", [0x1b83] = "\x3a\xe5",
-+  [0x1b84] = "\x3a\xe6", [0x1b85] = "\x3a\xe7", [0x1b86] = "\x3a\xe8",
-+  [0x1b87] = "\x3a\xe9", [0x1b88] = "\x3a\xea", [0x1b89] = "\x3a\xeb",
-+  [0x1b8a] = "\x3a\xec", [0x1b8b] = "\x3a\xed", [0x1b8c] = "\x3a\xee",
-+  [0x1b8d] = "\x3a\xef", [0x1b8e] = "\x3a\xf0", [0x1b8f] = "\x3a\xf1",
-+  [0x1b90] = "\x3a\xf2", [0x1b91] = "\x3a\xf3", [0x1b92] = "\x3a\xf4",
-+  [0x1b93] = "\x3a\xf5", [0x1b94] = "\x3a\xf6", [0x1b95] = "\x3a\xf7",
-+  [0x1b96] = "\x3a\xf8", [0x1b97] = "\x3a\xf9", [0x1b98] = "\x3a\xfa",
-+  [0x1b99] = "\x3a\xfb", [0x1b9a] = "\x3a\xfc", [0x1b9b] = "\x3a\xfd",
-+  [0x1b9c] = "\x3a\xfe", [0x1b9d] = "\x3a\xff", [0x1b9e] = "\x3b\x00",
-+  [0x1b9f] = "\x3b\x01", [0x1ba0] = "\x3b\x02", [0x1ba1] = "\x3b\x03",
-+  [0x1ba2] = "\x3b\x04", [0x1ba3] = "\x3b\x05", [0x1ba4] = "\x3b\x06",
-+  [0x1ba5] = "\x3b\x07", [0x1ba6] = "\x3b\x08", [0x1ba7] = "\x3b\x09",
-+  [0x1ba8] = "\x3b\x0a", [0x1ba9] = "\x3b\x0b", [0x1baa] = "\x3b\x0c",
-+  [0x1bab] = "\x3b\x0d", [0x1bac] = "\x3b\x0e", [0x1bad] = "\x3b\x0f",
-+  [0x1bae] = "\x3b\x10", [0x1baf] = "\x3b\x11", [0x1bb0] = "\x3b\x12",
-+  [0x1bb1] = "\x3b\x13", [0x1bb2] = "\x3b\x14", [0x1bb3] = "\x3b\x15",
-+  [0x1bb4] = "\x3b\x16", [0x1bb5] = "\x3b\x17", [0x1bb6] = "\x3b\x18",
-+  [0x1bb7] = "\x3b\x19", [0x1bb8] = "\x3b\x1a", [0x1bb9] = "\x3b\x1b",
-+  [0x1bba] = "\x3b\x1c", [0x1bbb] = "\x3b\x1d", [0x1bbc] = "\x3b\x1e",
-+  [0x1bbd] = "\x3b\x1f", [0x1bbe] = "\x3b\x20", [0x1bbf] = "\x3b\x21",
-+  [0x1bc0] = "\x3b\x22", [0x1bc1] = "\x3b\x23", [0x1bc2] = "\x3b\x24",
-+  [0x1bc3] = "\x3b\x25", [0x1bc4] = "\x3b\x26", [0x1bc5] = "\x3b\x27",
-+  [0x1bc6] = "\x3b\x28", [0x1bc7] = "\x3b\x29", [0x1bc8] = "\x3b\x2a",
-+  [0x1bc9] = "\x3b\x2b", [0x1bca] = "\x3b\x2c", [0x1bcb] = "\x3b\x2d",
-+  [0x1bcc] = "\x3b\x2e", [0x1bcd] = "\x3b\x2f", [0x1bce] = "\x3b\x30",
-+  [0x1bcf] = "\x3b\x31", [0x1bd0] = "\x3b\x32", [0x1bd1] = "\x3b\x33",
-+  [0x1bd2] = "\x3b\x34", [0x1bd3] = "\x3b\x35", [0x1bd4] = "\x3b\x36",
-+  [0x1bd5] = "\x3b\x37", [0x1bd6] = "\x3b\x38", [0x1bd7] = "\x3b\x39",
-+  [0x1bd8] = "\x3b\x3a", [0x1bd9] = "\x3b\x3b", [0x1bda] = "\x3b\x3c",
-+  [0x1bdb] = "\x3b\x3d", [0x1bdc] = "\x3b\x3e", [0x1bdd] = "\x3b\x3f",
-+  [0x1bde] = "\x3b\x40", [0x1bdf] = "\x3b\x41", [0x1be0] = "\x3b\x42",
-+  [0x1be1] = "\x3b\x43", [0x1be2] = "\x3b\x44", [0x1be3] = "\x3b\x45",
-+  [0x1be4] = "\x3b\x46", [0x1be5] = "\x3b\x47", [0x1be6] = "\x3b\x48",
-+  [0x1be7] = "\x3b\x49", [0x1be8] = "\x3b\x4a", [0x1be9] = "\x3b\x4b",
-+  [0x1bea] = "\x3b\x4c", [0x1beb] = "\x3b\x4d", [0x1bec] = "\x3b\x4e",
-+  [0x1bed] = "\x3b\x4f", [0x1bee] = "\x3b\x50", [0x1bef] = "\x3b\x51",
-+  [0x1bf0] = "\x3b\x52", [0x1bf1] = "\x3b\x53", [0x1bf2] = "\x3b\x54",
-+  [0x1bf3] = "\x3b\x55", [0x1bf4] = "\x3b\x56", [0x1bf5] = "\x3b\x57",
-+  [0x1bf6] = "\x3b\x58", [0x1bf7] = "\x3b\x59", [0x1bf8] = "\x3b\x5a",
-+  [0x1bf9] = "\x3b\x5b", [0x1bfa] = "\x3b\x5c", [0x1bfb] = "\x3b\x5d",
-+  [0x1bfc] = "\x3b\x5e", [0x1bfd] = "\x3b\x5f", [0x1bfe] = "\x3b\x60",
-+  [0x1bff] = "\x3b\x61", [0x1c00] = "\x3b\x62", [0x1c01] = "\x3b\x63",
-+  [0x1c02] = "\x3b\x64", [0x1c03] = "\x3b\x65", [0x1c04] = "\x3b\x66",
-+  [0x1c05] = "\x3b\x67", [0x1c06] = "\x3b\x68", [0x1c07] = "\x3b\x69",
-+  [0x1c08] = "\x3b\x6a", [0x1c09] = "\x3b\x6b", [0x1c0a] = "\x3b\x6c",
-+  [0x1c0b] = "\x3b\x6d", [0x1c0c] = "\x3b\x6e", [0x1c0d] = "\x3b\x6f",
-+  [0x1c0e] = "\x3b\x70", [0x1c0f] = "\x3b\x71", [0x1c10] = "\x3b\x72",
-+  [0x1c11] = "\x3b\x73", [0x1c12] = "\x3b\x74", [0x1c13] = "\x3b\x75",
-+  [0x1c14] = "\x3b\x76", [0x1c15] = "\x3b\x77", [0x1c16] = "\x3b\x78",
-+  [0x1c17] = "\x3b\x79", [0x1c18] = "\x3b\x7a", [0x1c19] = "\x3b\x7b",
-+  [0x1c1a] = "\x3b\x7c", [0x1c1b] = "\x3b\x7d", [0x1c1c] = "\x3b\x7e",
-+  [0x1c1d] = "\x3b\x7f", [0x1c1e] = "\x3b\x80", [0x1c1f] = "\x3b\x81",
-+  [0x1c20] = "\x3b\x82", [0x1c21] = "\x3b\x83", [0x1c22] = "\x3b\x84",
-+  [0x1c23] = "\x3b\x85", [0x1c24] = "\x3b\x86", [0x1c25] = "\x3b\x87",
-+  [0x1c26] = "\x3b\x88", [0x1c27] = "\x3b\x89", [0x1c28] = "\x3b\x8a",
-+  [0x1c29] = "\x3b\x8b", [0x1c2a] = "\x3b\x8c", [0x1c2b] = "\x3b\x8d",
-+  [0x1c2c] = "\x3b\x8e", [0x1c2d] = "\x3b\x8f", [0x1c2e] = "\x3b\x90",
-+  [0x1c2f] = "\x3b\x91", [0x1c30] = "\x3b\x92", [0x1c31] = "\x3b\x93",
-+  [0x1c32] = "\x3b\x94", [0x1c33] = "\x3b\x95", [0x1c34] = "\x3b\x96",
-+  [0x1c35] = "\x3b\x97", [0x1c36] = "\x3b\x98", [0x1c37] = "\x3b\x99",
-+  [0x1c38] = "\x3b\x9a", [0x1c39] = "\x3b\x9b", [0x1c3a] = "\x3b\x9c",
-+  [0x1c3b] = "\x3b\x9d", [0x1c3c] = "\x3b\x9e", [0x1c3d] = "\x3b\x9f",
-+  [0x1c3e] = "\x3b\xa0", [0x1c3f] = "\x3b\xa1", [0x1c40] = "\x3b\xa2",
-+  [0x1c41] = "\x3b\xa3", [0x1c42] = "\x3b\xa4", [0x1c43] = "\x3b\xa5",
-+  [0x1c44] = "\x3b\xa6", [0x1c45] = "\x3b\xa7", [0x1c46] = "\x3b\xa8",
-+  [0x1c47] = "\x3b\xa9", [0x1c48] = "\x3b\xaa", [0x1c49] = "\x3b\xab",
-+  [0x1c4a] = "\x3b\xac", [0x1c4b] = "\x3b\xad", [0x1c4c] = "\x3b\xae",
-+  [0x1c4d] = "\x3b\xaf", [0x1c4e] = "\x3b\xb0", [0x1c4f] = "\x3b\xb1",
-+  [0x1c50] = "\x3b\xb2", [0x1c51] = "\x3b\xb3", [0x1c52] = "\x3b\xb4",
-+  [0x1c53] = "\x3b\xb5", [0x1c54] = "\x3b\xb6", [0x1c55] = "\x3b\xb7",
-+  [0x1c56] = "\x3b\xb8", [0x1c57] = "\x3b\xb9", [0x1c58] = "\x3b\xba",
-+  [0x1c59] = "\x3b\xbb", [0x1c5a] = "\x3b\xbc", [0x1c5b] = "\x3b\xbd",
-+  [0x1c5c] = "\x3b\xbe", [0x1c5d] = "\x3b\xbf", [0x1c5e] = "\x3b\xc0",
-+  [0x1c5f] = "\x3b\xc1", [0x1c60] = "\x3b\xc2", [0x1c61] = "\x3b\xc3",
-+  [0x1c62] = "\x3b\xc4", [0x1c63] = "\x3b\xc5", [0x1c64] = "\x3b\xc6",
-+  [0x1c65] = "\x3b\xc7", [0x1c66] = "\x3b\xc8", [0x1c67] = "\x3b\xc9",
-+  [0x1c68] = "\x3b\xca", [0x1c69] = "\x3b\xcb", [0x1c6a] = "\x3b\xcc",
-+  [0x1c6b] = "\x3b\xcd", [0x1c6c] = "\x3b\xce", [0x1c6d] = "\x3b\xcf",
-+  [0x1c6e] = "\x3b\xd0", [0x1c6f] = "\x3b\xd1", [0x1c70] = "\x3b\xd2",
-+  [0x1c71] = "\x3b\xd3", [0x1c72] = "\x3b\xd4", [0x1c73] = "\x3b\xd5",
-+  [0x1c74] = "\x3b\xd6", [0x1c75] = "\x3b\xd7", [0x1c76] = "\x3b\xd8",
-+  [0x1c77] = "\x3b\xd9", [0x1c78] = "\x3b\xda", [0x1c79] = "\x3b\xdb",
-+  [0x1c7a] = "\x3b\xdc", [0x1c7b] = "\x3b\xdd", [0x1c7c] = "\x3b\xde",
-+  [0x1c7d] = "\x3b\xdf", [0x1c7e] = "\x3b\xe0", [0x1c7f] = "\x3b\xe1",
-+  [0x1c80] = "\x3b\xe2", [0x1c81] = "\x3b\xe3", [0x1c82] = "\x3b\xe4",
-+  [0x1c83] = "\x3b\xe5", [0x1c84] = "\x3b\xe6", [0x1c85] = "\x3b\xe7",
-+  [0x1c86] = "\x3b\xe8", [0x1c87] = "\x3b\xe9", [0x1c88] = "\x3b\xea",
-+  [0x1c89] = "\x3b\xeb", [0x1c8a] = "\x3b\xec", [0x1c8b] = "\x3b\xed",
-+  [0x1c8c] = "\x3b\xee", [0x1c8d] = "\x3b\xef", [0x1c8e] = "\x3b\xf0",
-+  [0x1c8f] = "\x3b\xf1", [0x1c90] = "\x3b\xf2", [0x1c91] = "\x3b\xf3",
-+  [0x1c92] = "\x3b\xf4", [0x1c93] = "\x3b\xf5", [0x1c94] = "\x3b\xf6",
-+  [0x1c95] = "\x3b\xf7", [0x1c96] = "\x3b\xf8", [0x1c97] = "\x3b\xf9",
-+  [0x1c98] = "\x3b\xfa", [0x1c99] = "\x3b\xfb", [0x1c9a] = "\x3b\xfc",
-+  [0x1c9b] = "\x3b\xfd", [0x1c9c] = "\x3b\xfe", [0x1c9d] = "\x3b\xff",
-+  [0x1c9e] = "\x3c\x00", [0x1c9f] = "\x3c\x01", [0x1ca0] = "\x3c\x02",
-+  [0x1ca1] = "\x3c\x03", [0x1ca2] = "\x3c\x04", [0x1ca3] = "\x3c\x05",
-+  [0x1ca4] = "\x3c\x06", [0x1ca5] = "\x3c\x07", [0x1ca6] = "\x3c\x08",
-+  [0x1ca7] = "\x3c\x09", [0x1ca8] = "\x3c\x0a", [0x1ca9] = "\x3c\x0b",
-+  [0x1caa] = "\x3c\x0c", [0x1cab] = "\x3c\x0d", [0x1cac] = "\x3c\x0e",
-+  [0x1cad] = "\x3c\x0f", [0x1cae] = "\x3c\x10", [0x1caf] = "\x3c\x11",
-+  [0x1cb0] = "\x3c\x12", [0x1cb1] = "\x3c\x13", [0x1cb2] = "\x3c\x14",
-+  [0x1cb3] = "\x3c\x15", [0x1cb4] = "\x3c\x16", [0x1cb5] = "\x3c\x17",
-+  [0x1cb6] = "\x3c\x18", [0x1cb7] = "\x3c\x19", [0x1cb8] = "\x3c\x1a",
-+  [0x1cb9] = "\x3c\x1b", [0x1cba] = "\x3c\x1c", [0x1cbb] = "\x3c\x1d",
-+  [0x1cbc] = "\x3c\x1e", [0x1cbd] = "\x3c\x1f", [0x1cbe] = "\x3c\x20",
-+  [0x1cbf] = "\x3c\x21", [0x1cc0] = "\x3c\x22", [0x1cc1] = "\x3c\x23",
-+  [0x1cc2] = "\x3c\x24", [0x1cc3] = "\x3c\x25", [0x1cc4] = "\x3c\x26",
-+  [0x1cc5] = "\x3c\x27", [0x1cc6] = "\x3c\x28", [0x1cc7] = "\x3c\x29",
-+  [0x1cc8] = "\x3c\x2a", [0x1cc9] = "\x3c\x2b", [0x1cca] = "\x3c\x2c",
-+  [0x1ccb] = "\x3c\x2d", [0x1ccc] = "\x3c\x2e", [0x1ccd] = "\x3c\x2f",
-+  [0x1cce] = "\x3c\x30", [0x1ccf] = "\x3c\x31", [0x1cd0] = "\x3c\x32",
-+  [0x1cd1] = "\x3c\x33", [0x1cd2] = "\x3c\x34", [0x1cd3] = "\x3c\x35",
-+  [0x1cd4] = "\x3c\x36", [0x1cd5] = "\x3c\x37", [0x1cd6] = "\x3c\x38",
-+  [0x1cd7] = "\x3c\x39", [0x1cd8] = "\x3c\x3a", [0x1cd9] = "\x3c\x3b",
-+  [0x1cda] = "\x3c\x3c", [0x1cdb] = "\x3c\x3d", [0x1cdc] = "\x3c\x3e",
-+  [0x1cdd] = "\x3c\x3f", [0x1cde] = "\x3c\x40", [0x1cdf] = "\x3c\x41",
-+  [0x1ce0] = "\x3c\x42", [0x1ce1] = "\x3c\x43", [0x1ce2] = "\x3c\x44",
-+  [0x1ce3] = "\x3c\x45", [0x1ce4] = "\x3c\x46", [0x1ce5] = "\x3c\x47",
-+  [0x1ce6] = "\x3c\x48", [0x1ce7] = "\x3c\x49", [0x1ce8] = "\x3c\x4a",
-+  [0x1ce9] = "\x3c\x4b", [0x1cea] = "\x3c\x4c", [0x1ceb] = "\x3c\x4d",
-+  [0x1cec] = "\x3c\x4e", [0x1ced] = "\x3c\x4f", [0x1cee] = "\x3c\x50",
-+  [0x1cef] = "\x3c\x51", [0x1cf0] = "\x3c\x52", [0x1cf1] = "\x3c\x53",
-+  [0x1cf2] = "\x3c\x54", [0x1cf3] = "\x3c\x55", [0x1cf4] = "\x3c\x56",
-+  [0x1cf5] = "\x3c\x57", [0x1cf6] = "\x3c\x58", [0x1cf7] = "\x3c\x59",
-+  [0x1cf8] = "\x3c\x5a", [0x1cf9] = "\x3c\x5b", [0x1cfa] = "\x3c\x5c",
-+  [0x1cfb] = "\x3c\x5d", [0x1cfc] = "\x3c\x5e", [0x1cfd] = "\x3c\x5f",
-+  [0x1cfe] = "\x3c\x60", [0x1cff] = "\x3c\x61", [0x1d00] = "\x3c\x62",
-+  [0x1d01] = "\x3c\x63", [0x1d02] = "\x3c\x64", [0x1d03] = "\x3c\x65",
-+  [0x1d04] = "\x3c\x66", [0x1d05] = "\x3c\x67", [0x1d06] = "\x3c\x68",
-+  [0x1d07] = "\x3c\x69", [0x1d08] = "\x3c\x6a", [0x1d09] = "\x3c\x6b",
-+  [0x1d0a] = "\x3c\x6c", [0x1d0b] = "\x3c\x6d", [0x1d0c] = "\x3c\x6e",
-+  [0x1d0d] = "\x3c\x6f", [0x1d0e] = "\x3c\x70", [0x1d0f] = "\x3c\x71",
-+  [0x1d10] = "\x3c\x72", [0x1d11] = "\x3c\x73", [0x1d12] = "\x3c\x74",
-+  [0x1d13] = "\x3c\x75", [0x1d14] = "\x3c\x76", [0x1d15] = "\x3c\x77",
-+  [0x1d16] = "\x3c\x78", [0x1d17] = "\x3c\x79", [0x1d18] = "\x3c\x7a",
-+  [0x1d19] = "\x3c\x7b", [0x1d1a] = "\x3c\x7c", [0x1d1b] = "\x3c\x7d",
-+  [0x1d1c] = "\x3c\x7e", [0x1d1d] = "\x3c\x7f", [0x1d1e] = "\x3c\x80",
-+  [0x1d1f] = "\x3c\x81", [0x1d20] = "\x3c\x82", [0x1d21] = "\x3c\x83",
-+  [0x1d22] = "\x3c\x84", [0x1d23] = "\x3c\x85", [0x1d24] = "\x3c\x86",
-+  [0x1d25] = "\x3c\x87", [0x1d26] = "\x3c\x88", [0x1d27] = "\x3c\x89",
-+  [0x1d28] = "\x3c\x8a", [0x1d29] = "\x3c\x8b", [0x1d2a] = "\x3c\x8c",
-+  [0x1d2b] = "\x3c\x8d", [0x1d2c] = "\x3c\x8e", [0x1d2d] = "\x3c\x8f",
-+  [0x1d2e] = "\x3c\x90", [0x1d2f] = "\x3c\x91", [0x1d30] = "\x3c\x92",
-+  [0x1d31] = "\x3c\x93", [0x1d32] = "\x3c\x94", [0x1d33] = "\x3c\x95",
-+  [0x1d34] = "\x3c\x96", [0x1d35] = "\x3c\x97", [0x1d36] = "\x3c\x98",
-+  [0x1d37] = "\x3c\x99", [0x1d38] = "\x3c\x9a", [0x1d39] = "\x3c\x9b",
-+  [0x1d3a] = "\x3c\x9c", [0x1d3b] = "\x3c\x9d", [0x1d3c] = "\x3c\x9e",
-+  [0x1d3d] = "\x3c\x9f", [0x1d3e] = "\x3c\xa0", [0x1d3f] = "\x3c\xa1",
-+  [0x1d40] = "\x3c\xa2", [0x1d41] = "\x3c\xa3", [0x1d42] = "\x3c\xa4",
-+  [0x1d43] = "\x3c\xa5", [0x1d44] = "\x3c\xa6", [0x1d45] = "\x3c\xa7",
-+  [0x1d46] = "\x3c\xa8", [0x1d47] = "\x3c\xa9", [0x1d48] = "\x3c\xaa",
-+  [0x1d49] = "\x3c\xab", [0x1d4a] = "\x3c\xac", [0x1d4b] = "\x3c\xad",
-+  [0x1d4c] = "\x3c\xae", [0x1d4d] = "\x3c\xaf", [0x1d4e] = "\x3c\xb0",
-+  [0x1d4f] = "\x3c\xb1", [0x1d50] = "\x3c\xb2", [0x1d51] = "\x3c\xb3",
-+  [0x1d52] = "\x3c\xb4", [0x1d53] = "\x3c\xb5", [0x1d54] = "\x3c\xb6",
-+  [0x1d55] = "\x3c\xb7", [0x1d56] = "\x3c\xb8", [0x1d57] = "\x3c\xb9",
-+  [0x1d58] = "\x3c\xba", [0x1d59] = "\x3c\xbb", [0x1d5a] = "\x3c\xbc",
-+  [0x1d5b] = "\x3c\xbd", [0x1d5c] = "\x3c\xbe", [0x1d5d] = "\x3c\xbf",
-+  [0x1d5e] = "\x3c\xc0", [0x1d5f] = "\x3c\xc1", [0x1d60] = "\x3c\xc2",
-+  [0x1d61] = "\x3c\xc3", [0x1d62] = "\x3c\xc4", [0x1d63] = "\x3c\xc5",
-+  [0x1d64] = "\x3c\xc6", [0x1d65] = "\x3c\xc7", [0x1d66] = "\x3c\xc8",
-+  [0x1d67] = "\x3c\xc9", [0x1d68] = "\x3c\xca", [0x1d69] = "\x3c\xcb",
-+  [0x1d6a] = "\x3c\xcc", [0x1d6b] = "\x3c\xcd", [0x1d6c] = "\x3c\xce",
-+  [0x1d6d] = "\x3c\xcf", [0x1d6e] = "\x3c\xd0", [0x1d6f] = "\x3c\xd1",
-+  [0x1d70] = "\x3c\xd2", [0x1d71] = "\x3c\xd3", [0x1d72] = "\x3c\xd4",
-+  [0x1d73] = "\x3c\xd5", [0x1d74] = "\x3c\xd6", [0x1d75] = "\x3c\xd7",
-+  [0x1d76] = "\x3c\xd8", [0x1d77] = "\x3c\xd9", [0x1d78] = "\x3c\xda",
-+  [0x1d79] = "\x3c\xdb", [0x1d7a] = "\x3c\xdc", [0x1d7b] = "\x3c\xdd",
-+  [0x1d7c] = "\x3c\xde", [0x1d7d] = "\x3c\xdf", [0x1d7e] = "\x3c\xe0",
-+  [0x1d7f] = "\x3c\xe1", [0x1d80] = "\x3c\xe2", [0x1d81] = "\x3c\xe3",
-+  [0x1d82] = "\x3c\xe4", [0x1d83] = "\x3c\xe5", [0x1d84] = "\x3c\xe6",
-+  [0x1d85] = "\x3c\xe7", [0x1d86] = "\x3c\xe8", [0x1d87] = "\x3c\xe9",
-+  [0x1d88] = "\x3c\xea", [0x1d89] = "\x3c\xeb", [0x1d8a] = "\x3c\xec",
-+  [0x1d8b] = "\x3c\xed", [0x1d8c] = "\x3c\xee", [0x1d8d] = "\x3c\xef",
-+  [0x1d8e] = "\x3c\xf0", [0x1d8f] = "\x3c\xf1", [0x1d90] = "\x3c\xf2",
-+  [0x1d91] = "\x3c\xf3", [0x1d92] = "\x3c\xf4", [0x1d93] = "\x3c\xf5",
-+  [0x1d94] = "\x3c\xf6", [0x1d95] = "\x3c\xf7", [0x1d96] = "\x3c\xf8",
-+  [0x1d97] = "\x3c\xf9", [0x1d98] = "\x3c\xfa", [0x1d99] = "\x3c\xfb",
-+  [0x1d9a] = "\x3c\xfc", [0x1d9b] = "\x3c\xfd", [0x1d9c] = "\x3c\xfe",
-+  [0x1d9d] = "\x3c\xff", [0x1d9e] = "\x3d\x00", [0x1d9f] = "\x3d\x01",
-+  [0x1da0] = "\x3d\x02", [0x1da1] = "\x3d\x03", [0x1da2] = "\x3d\x04",
-+  [0x1da3] = "\x3d\x05", [0x1da4] = "\x3d\x06", [0x1da5] = "\x3d\x07",
-+  [0x1da6] = "\x3d\x08", [0x1da7] = "\x3d\x09", [0x1da8] = "\x3d\x0a",
-+  [0x1da9] = "\x3d\x0b", [0x1daa] = "\x3d\x0c", [0x1dab] = "\x3d\x0d",
-+  [0x1dac] = "\x3d\x0e", [0x1dad] = "\x3d\x0f", [0x1dae] = "\x3d\x10",
-+  [0x1daf] = "\x3d\x11", [0x1db0] = "\x3d\x12", [0x1db1] = "\x3d\x13",
-+  [0x1db2] = "\x3d\x14", [0x1db3] = "\x3d\x15", [0x1db4] = "\x3d\x16",
-+  [0x1db5] = "\x3d\x17", [0x1db6] = "\x3d\x18", [0x1db7] = "\x3d\x19",
-+  [0x1db8] = "\x3d\x1a", [0x1db9] = "\x3d\x1b", [0x1dba] = "\x3d\x1c",
-+  [0x1dbb] = "\x3d\x1d", [0x1dbc] = "\x3d\x1e", [0x1dbd] = "\x3d\x1f",
-+  [0x1dbe] = "\x3d\x20", [0x1dbf] = "\xa8\xbc", [0x1dc0] = "\x3d\x22",
-+  [0x1dc1] = "\x3d\x23", [0x1dc2] = "\x3d\x24", [0x1dc3] = "\x3d\x25",
-+  [0x1dc4] = "\x3d\x26", [0x1dc5] = "\x3d\x27", [0x1dc6] = "\x3d\x28",
-+  [0x1dc7] = "\x3d\x29", [0x1dc8] = "\x3d\x2a", [0x1dc9] = "\x3d\x2b",
-+  [0x1dca] = "\x3d\x2c", [0x1dcb] = "\x3d\x2d", [0x1dcc] = "\x3d\x2e",
-+  [0x1dcd] = "\x3d\x2f", [0x1dce] = "\x3d\x30", [0x1dcf] = "\x3d\x31",
-+  [0x1dd0] = "\x3d\x32", [0x1dd1] = "\x3d\x33", [0x1dd2] = "\x3d\x34",
-+  [0x1dd3] = "\x3d\x35", [0x1dd4] = "\x3d\x36", [0x1dd5] = "\x3d\x37",
-+  [0x1dd6] = "\x3d\x38", [0x1dd7] = "\x3d\x39", [0x1dd8] = "\x3d\x3a",
-+  [0x1dd9] = "\x3d\x3b", [0x1dda] = "\x3d\x3c", [0x1ddb] = "\x3d\x3d",
-+  [0x1ddc] = "\x3d\x3e", [0x1ddd] = "\x3d\x3f", [0x1dde] = "\x3d\x40",
-+  [0x1ddf] = "\x3d\x41", [0x1de0] = "\x3d\x42", [0x1de1] = "\x3d\x43",
-+  [0x1de2] = "\x3d\x44", [0x1de3] = "\x3d\x45", [0x1de4] = "\x3d\x46",
-+  [0x1de5] = "\x3d\x47", [0x1de6] = "\x3d\x48", [0x1de7] = "\x3d\x49",
-+  [0x1de8] = "\x3d\x4a", [0x1de9] = "\x3d\x4b", [0x1dea] = "\x3d\x4c",
-+  [0x1deb] = "\x3d\x4d", [0x1dec] = "\x3d\x4e", [0x1ded] = "\x3d\x4f",
-+  [0x1dee] = "\x3d\x50", [0x1def] = "\x3d\x51", [0x1df0] = "\x3d\x52",
-+  [0x1df1] = "\x3d\x53", [0x1df2] = "\x3d\x54", [0x1df3] = "\x3d\x55",
-+  [0x1df4] = "\x3d\x56", [0x1df5] = "\x3d\x57", [0x1df6] = "\x3d\x58",
-+  [0x1df7] = "\x3d\x59", [0x1df8] = "\x3d\x5a", [0x1df9] = "\x3d\x5b",
-+  [0x1dfa] = "\x3d\x5c", [0x1dfb] = "\x3d\x5d", [0x1dfc] = "\x3d\x5e",
-+  [0x1dfd] = "\x3d\x5f", [0x1dfe] = "\x3d\x60", [0x1dff] = "\x3d\x61",
-+  [0x1e00] = "\x3d\x62", [0x1e01] = "\x3d\x63", [0x1e02] = "\x3d\x64",
-+  [0x1e03] = "\x3d\x65", [0x1e04] = "\x3d\x66", [0x1e05] = "\x3d\x67",
-+  [0x1e06] = "\x3d\x68", [0x1e07] = "\x3d\x69", [0x1e08] = "\x3d\x6a",
-+  [0x1e09] = "\x3d\x6b", [0x1e0a] = "\x3d\x6c", [0x1e0b] = "\x3d\x6d",
-+  [0x1e0c] = "\x3d\x6e", [0x1e0d] = "\x3d\x6f", [0x1e0e] = "\x3d\x70",
-+  [0x1e0f] = "\x3d\x71", [0x1e10] = "\x3d\x72", [0x1e11] = "\x3d\x73",
-+  [0x1e12] = "\x3d\x74", [0x1e13] = "\x3d\x75", [0x1e14] = "\x3d\x76",
-+  [0x1e15] = "\x3d\x77", [0x1e16] = "\x3d\x78", [0x1e17] = "\x3d\x79",
-+  [0x1e18] = "\x3d\x7a", [0x1e19] = "\x3d\x7b", [0x1e1a] = "\x3d\x7c",
-+  [0x1e1b] = "\x3d\x7d", [0x1e1c] = "\x3d\x7e", [0x1e1d] = "\x3d\x7f",
-+  [0x1e1e] = "\x3d\x80", [0x1e1f] = "\x3d\x81", [0x1e20] = "\x3d\x82",
-+  [0x1e21] = "\x3d\x83", [0x1e22] = "\x3d\x84", [0x1e23] = "\x3d\x85",
-+  [0x1e24] = "\x3d\x86", [0x1e25] = "\x3d\x87", [0x1e26] = "\x3d\x88",
-+  [0x1e27] = "\x3d\x89", [0x1e28] = "\x3d\x8a", [0x1e29] = "\x3d\x8b",
-+  [0x1e2a] = "\x3d\x8c", [0x1e2b] = "\x3d\x8d", [0x1e2c] = "\x3d\x8e",
-+  [0x1e2d] = "\x3d\x8f", [0x1e2e] = "\x3d\x90", [0x1e2f] = "\x3d\x91",
-+  [0x1e30] = "\x3d\x92", [0x1e31] = "\x3d\x93", [0x1e32] = "\x3d\x94",
-+  [0x1e33] = "\x3d\x95", [0x1e34] = "\x3d\x96", [0x1e35] = "\x3d\x97",
-+  [0x1e36] = "\x3d\x98", [0x1e37] = "\x3d\x99", [0x1e38] = "\x3d\x9a",
-+  [0x1e39] = "\x3d\x9b", [0x1e3a] = "\x3d\x9c", [0x1e3b] = "\x3d\x9d",
-+  [0x1e3c] = "\x3d\x9e", [0x1e3d] = "\x3d\x9f", [0x1e3e] = "\x3d\xa0",
-+  [0x1e3f] = "\x3d\xa1", [0x1e40] = "\x3d\xa2", [0x1e41] = "\x3d\xa3",
-+  [0x1e42] = "\x3d\xa4", [0x1e43] = "\x3d\xa5", [0x1e44] = "\x3d\xa6",
-+  [0x1e45] = "\x3d\xa7", [0x1e46] = "\x3d\xa8", [0x1e47] = "\x3d\xa9",
-+  [0x1e48] = "\x3d\xaa", [0x1e49] = "\x3d\xab", [0x1e4a] = "\x3d\xac",
-+  [0x1e4b] = "\x3d\xad", [0x1e4c] = "\x3d\xae", [0x1e4d] = "\x3d\xaf",
-+  [0x1e4e] = "\x3d\xb0", [0x1e4f] = "\x3d\xb1", [0x1e50] = "\x3d\xb2",
-+  [0x1e51] = "\x3d\xb3", [0x1e52] = "\x3d\xb4", [0x1e53] = "\x3d\xb5",
-+  [0x1e54] = "\x3d\xb6", [0x1e55] = "\x3d\xb7", [0x1e56] = "\x3d\xb8",
-+  [0x1e57] = "\x3d\xb9", [0x1e58] = "\x3d\xba", [0x1e59] = "\x3d\xbb",
-+  [0x1e5a] = "\x3d\xbc", [0x1e5b] = "\x3d\xbd", [0x1e5c] = "\x3d\xbe",
-+  [0x1e5d] = "\x3d\xbf", [0x1e5e] = "\x3d\xc0", [0x1e5f] = "\x3d\xc1",
-+  [0x1e60] = "\x3d\xc2", [0x1e61] = "\x3d\xc3", [0x1e62] = "\x3d\xc4",
-+  [0x1e63] = "\x3d\xc5", [0x1e64] = "\x3d\xc6", [0x1e65] = "\x3d\xc7",
-+  [0x1e66] = "\x3d\xc8", [0x1e67] = "\x3d\xc9", [0x1e68] = "\x3d\xca",
-+  [0x1e69] = "\x3d\xcb", [0x1e6a] = "\x3d\xcc", [0x1e6b] = "\x3d\xcd",
-+  [0x1e6c] = "\x3d\xce", [0x1e6d] = "\x3d\xcf", [0x1e6e] = "\x3d\xd0",
-+  [0x1e6f] = "\x3d\xd1", [0x1e70] = "\x3d\xd2", [0x1e71] = "\x3d\xd3",
-+  [0x1e72] = "\x3d\xd4", [0x1e73] = "\x3d\xd5", [0x1e74] = "\x3d\xd6",
-+  [0x1e75] = "\x3d\xd7", [0x1e76] = "\x3d\xd8", [0x1e77] = "\x3d\xd9",
-+  [0x1e78] = "\x3d\xda", [0x1e79] = "\x3d\xdb", [0x1e7a] = "\x3d\xdc",
-+  [0x1e7b] = "\x3d\xdd", [0x1e7c] = "\x3d\xde", [0x1e7d] = "\x3d\xdf",
-+  [0x1e7e] = "\x3d\xe0", [0x1e7f] = "\x3d\xe1", [0x1e80] = "\x3d\xe2",
-+  [0x1e81] = "\x3d\xe3", [0x1e82] = "\x3d\xe4", [0x1e83] = "\x3d\xe5",
-+  [0x1e84] = "\x3d\xe6", [0x1e85] = "\x3d\xe7", [0x1e86] = "\x3d\xe8",
-+  [0x1e87] = "\x3d\xe9", [0x1e88] = "\x3d\xea", [0x1e89] = "\x3d\xeb",
-+  [0x1e8a] = "\x3d\xec", [0x1e8b] = "\x3d\xed", [0x1e8c] = "\x3d\xee",
-+  [0x1e8d] = "\x3d\xef", [0x1e8e] = "\x3d\xf0", [0x1e8f] = "\x3d\xf1",
-+  [0x1e90] = "\x3d\xf2", [0x1e91] = "\x3d\xf3", [0x1e92] = "\x3d\xf4",
-+  [0x1e93] = "\x3d\xf5", [0x1e94] = "\x3d\xf6", [0x1e95] = "\x3d\xf7",
-+  [0x1e96] = "\x3d\xf8", [0x1e97] = "\x3d\xf9", [0x1e98] = "\x3d\xfa",
-+  [0x1e99] = "\x3d\xfb", [0x1e9a] = "\x3d\xfc", [0x1e9b] = "\x3d\xfd",
-+  [0x1e9c] = "\x3d\xfe", [0x1e9d] = "\x3d\xff", [0x1e9e] = "\x3e\x00",
-+  [0x1e9f] = "\x3e\x01", [0x1ea0] = "\x3e\x02", [0x1ea1] = "\x3e\x03",
-+  [0x1ea2] = "\x3e\x04", [0x1ea3] = "\x3e\x05", [0x1ea4] = "\x3e\x06",
-+  [0x1ea5] = "\x3e\x07", [0x1ea6] = "\x3e\x08", [0x1ea7] = "\x3e\x09",
-+  [0x1ea8] = "\x3e\x0a", [0x1ea9] = "\x3e\x0b", [0x1eaa] = "\x3e\x0c",
-+  [0x1eab] = "\x3e\x0d", [0x1eac] = "\x3e\x0e", [0x1ead] = "\x3e\x0f",
-+  [0x1eae] = "\x3e\x10", [0x1eaf] = "\x3e\x11", [0x1eb0] = "\x3e\x12",
-+  [0x1eb1] = "\x3e\x13", [0x1eb2] = "\x3e\x14", [0x1eb3] = "\x3e\x15",
-+  [0x1eb4] = "\x3e\x16", [0x1eb5] = "\x3e\x17", [0x1eb6] = "\x3e\x18",
-+  [0x1eb7] = "\x3e\x19", [0x1eb8] = "\x3e\x1a", [0x1eb9] = "\x3e\x1b",
-+  [0x1eba] = "\x3e\x1c", [0x1ebb] = "\x3e\x1d", [0x1ebc] = "\x3e\x1e",
-+  [0x1ebd] = "\x3e\x1f", [0x1ebe] = "\x3e\x20", [0x1ebf] = "\x3e\x21",
-+  [0x1ec0] = "\x3e\x22", [0x1ec1] = "\x3e\x23", [0x1ec2] = "\x3e\x24",
-+  [0x1ec3] = "\x3e\x25", [0x1ec4] = "\x3e\x26", [0x1ec5] = "\x3e\x27",
-+  [0x1ec6] = "\x3e\x28", [0x1ec7] = "\x3e\x29", [0x1ec8] = "\x3e\x2a",
-+  [0x1ec9] = "\x3e\x2b", [0x1eca] = "\x3e\x2c", [0x1ecb] = "\x3e\x2d",
-+  [0x1ecc] = "\x3e\x2e", [0x1ecd] = "\x3e\x2f", [0x1ece] = "\x3e\x30",
-+  [0x1ecf] = "\x3e\x31", [0x1ed0] = "\x3e\x32", [0x1ed1] = "\x3e\x33",
-+  [0x1ed2] = "\x3e\x34", [0x1ed3] = "\x3e\x35", [0x1ed4] = "\x3e\x36",
-+  [0x1ed5] = "\x3e\x37", [0x1ed6] = "\x3e\x38", [0x1ed7] = "\x3e\x39",
-+  [0x1ed8] = "\x3e\x3a", [0x1ed9] = "\x3e\x3b", [0x1eda] = "\x3e\x3c",
-+  [0x1edb] = "\x3e\x3d", [0x1edc] = "\x3e\x3e", [0x1edd] = "\x3e\x3f",
-+  [0x1ede] = "\x3e\x40", [0x1edf] = "\x3e\x41", [0x1ee0] = "\x3e\x42",
-+  [0x1ee1] = "\x3e\x43", [0x1ee2] = "\x3e\x44", [0x1ee3] = "\x3e\x45",
-+  [0x1ee4] = "\x3e\x46", [0x1ee5] = "\x3e\x47", [0x1ee6] = "\x3e\x48",
-+  [0x1ee7] = "\x3e\x49", [0x1ee8] = "\x3e\x4a", [0x1ee9] = "\x3e\x4b",
-+  [0x1eea] = "\x3e\x4c", [0x1eeb] = "\x3e\x4d", [0x1eec] = "\x3e\x4e",
-+  [0x1eed] = "\x3e\x4f", [0x1eee] = "\x3e\x50", [0x1eef] = "\x3e\x51",
-+  [0x1ef0] = "\x3e\x52", [0x1ef1] = "\x3e\x53", [0x1ef2] = "\x3e\x54",
-+  [0x1ef3] = "\x3e\x55", [0x1ef4] = "\x3e\x56", [0x1ef5] = "\x3e\x57",
-+  [0x1ef6] = "\x3e\x58", [0x1ef7] = "\x3e\x59", [0x1ef8] = "\x3e\x5a",
-+  [0x1ef9] = "\x3e\x5b", [0x1efa] = "\x3e\x5c", [0x1efb] = "\x3e\x5d",
-+  [0x1efc] = "\x3e\x5e", [0x1efd] = "\x3e\x5f", [0x1efe] = "\x3e\x60",
-+  [0x1eff] = "\x3e\x61", [0x1f00] = "\x3e\x62", [0x1f01] = "\x3e\x63",
-+  [0x1f02] = "\x3e\x64", [0x1f03] = "\x3e\x65", [0x1f04] = "\x3e\x66",
-+  [0x1f05] = "\x3e\x67", [0x1f06] = "\x3e\x68", [0x1f07] = "\x3e\x69",
-+  [0x1f08] = "\x3e\x6a", [0x1f09] = "\x3e\x6b", [0x1f0a] = "\x3e\x6c",
-+  [0x1f0b] = "\x3e\x6d", [0x1f0c] = "\x3e\x6e", [0x1f0d] = "\x3e\x6f",
-+  [0x1f0e] = "\x3e\x70", [0x1f0f] = "\x3e\x71", [0x1f10] = "\x3e\x72",
-+  [0x1f11] = "\x3e\x73", [0x1f12] = "\x3e\x74", [0x1f13] = "\x3e\x75",
-+  [0x1f14] = "\x3e\x76", [0x1f15] = "\x3e\x77", [0x1f16] = "\x3e\x78",
-+  [0x1f17] = "\x3e\x79", [0x1f18] = "\x3e\x7a", [0x1f19] = "\x3e\x7b",
-+  [0x1f1a] = "\x3e\x7c", [0x1f1b] = "\x3e\x7d", [0x1f1c] = "\x3e\x7e",
-+  [0x1f1d] = "\x3e\x7f", [0x1f1e] = "\x3e\x80", [0x1f1f] = "\x3e\x81",
-+  [0x1f20] = "\x3e\x82", [0x1f21] = "\x3e\x83", [0x1f22] = "\x3e\x84",
-+  [0x1f23] = "\x3e\x85", [0x1f24] = "\x3e\x86", [0x1f25] = "\x3e\x87",
-+  [0x1f26] = "\x3e\x88", [0x1f27] = "\x3e\x89", [0x1f28] = "\x3e\x8a",
-+  [0x1f29] = "\x3e\x8b", [0x1f2a] = "\x3e\x8c", [0x1f2b] = "\x3e\x8d",
-+  [0x1f2c] = "\x3e\x8e", [0x1f2d] = "\x3e\x8f", [0x1f2e] = "\x3e\x90",
-+  [0x1f2f] = "\x3e\x91", [0x1f30] = "\x3e\x92", [0x1f31] = "\x3e\x93",
-+  [0x1f32] = "\x3e\x94", [0x1f33] = "\x3e\x95", [0x1f34] = "\x3e\x96",
-+  [0x1f35] = "\x3e\x97", [0x1f36] = "\x3e\x98", [0x1f37] = "\x3e\x99",
-+  [0x1f38] = "\x3e\x9a", [0x1f39] = "\x3e\x9b", [0x1f3a] = "\x3e\x9c",
-+  [0x1f3b] = "\x3e\x9d", [0x1f3c] = "\x3e\x9e", [0x1f3d] = "\x3e\x9f",
-+  [0x1f3e] = "\x3e\xa0", [0x1f3f] = "\x3e\xa1", [0x1f40] = "\x3e\xa2",
-+  [0x1f41] = "\x3e\xa3", [0x1f42] = "\x3e\xa4", [0x1f43] = "\x3e\xa5",
-+  [0x1f44] = "\x3e\xa6", [0x1f45] = "\x3e\xa7", [0x1f46] = "\x3e\xa8",
-+  [0x1f47] = "\x3e\xa9", [0x1f48] = "\x3e\xaa", [0x1f49] = "\x3e\xab",
-+  [0x1f4a] = "\x3e\xac", [0x1f4b] = "\x3e\xad", [0x1f4c] = "\x3e\xae",
-+  [0x1f4d] = "\x3e\xaf", [0x1f4e] = "\x3e\xb0", [0x1f4f] = "\x3e\xb1",
-+  [0x1f50] = "\x3e\xb2", [0x1f51] = "\x3e\xb3", [0x1f52] = "\x3e\xb4",
-+  [0x1f53] = "\x3e\xb5", [0x1f54] = "\x3e\xb6", [0x1f55] = "\x3e\xb7",
-+  [0x1f56] = "\x3e\xb8", [0x1f57] = "\x3e\xb9", [0x1f58] = "\x3e\xba",
-+  [0x1f59] = "\x3e\xbb", [0x1f5a] = "\x3e\xbc", [0x1f5b] = "\x3e\xbd",
-+  [0x1f5c] = "\x3e\xbe", [0x1f5d] = "\x3e\xbf", [0x1f5e] = "\x3e\xc0",
-+  [0x1f5f] = "\x3e\xc1", [0x1f60] = "\x3e\xc2", [0x1f61] = "\x3e\xc3",
-+  [0x1f62] = "\x3e\xc4", [0x1f63] = "\x3e\xc5", [0x1f64] = "\x3e\xc6",
-+  [0x1f65] = "\x3e\xc7", [0x1f66] = "\x3e\xc8", [0x1f67] = "\x3e\xc9",
-+  [0x1f68] = "\x3e\xca", [0x1f69] = "\x3e\xcb", [0x1f6a] = "\x3e\xcc",
-+  [0x1f6b] = "\x3e\xcd", [0x1f6c] = "\x3e\xce", [0x1f6d] = "\x3e\xcf",
-+  [0x1f6e] = "\x3e\xd0", [0x1f6f] = "\x3e\xd1", [0x1f70] = "\x3e\xd2",
-+  [0x1f71] = "\x3e\xd3", [0x1f72] = "\x3e\xd4", [0x1f73] = "\x3e\xd5",
-+  [0x1f74] = "\x3e\xd6", [0x1f75] = "\x3e\xd7", [0x1f76] = "\x3e\xd8",
-+  [0x1f77] = "\x3e\xd9", [0x1f78] = "\x3e\xda", [0x1f79] = "\x3e\xdb",
-+  [0x1f7a] = "\x3e\xdc", [0x1f7b] = "\x3e\xdd", [0x1f7c] = "\x3e\xde",
-+  [0x1f7d] = "\x3e\xdf", [0x1f7e] = "\x3e\xe0", [0x1f7f] = "\x3e\xe1",
-+  [0x1f80] = "\x3e\xe2", [0x1f81] = "\x3e\xe3", [0x1f82] = "\x3e\xe4",
-+  [0x1f83] = "\x3e\xe5", [0x1f84] = "\x3e\xe6", [0x1f85] = "\x3e\xe7",
-+  [0x1f86] = "\x3e\xe8", [0x1f87] = "\x3e\xe9", [0x1f88] = "\x3e\xea",
-+  [0x1f89] = "\x3e\xeb", [0x1f8a] = "\x3e\xec", [0x1f8b] = "\x3e\xed",
-+  [0x1f8c] = "\x3e\xee", [0x1f8d] = "\x3e\xef", [0x1f8e] = "\x3e\xf0",
-+  [0x1f8f] = "\x3e\xf1", [0x1f90] = "\xa9\x5c", [0x1f91] = "\x3e\xf2",
-+  [0x1f92] = "\x3e\xf3", [0x1f93] = "\xa8\x43", [0x1f94] = "\xa1\xaa",
-+  [0x1f95] = "\xa8\x44", [0x1f96] = "\xa1\xac", [0x1f97] = "\x3e\xf4",
-+  [0x1f98] = "\xa1\xae", [0x1f99] = "\xa1\xaf", [0x1f9a] = "\x3e\xf5",
-+  [0x1f9b] = "\x3e\xf6", [0x1f9c] = "\xa1\xb0", [0x1f9d] = "\xa1\xb1",
-+  [0x1f9e] = "\x3e\xf7", [0x1f9f] = "\x3e\xf8", [0x1fa0] = "\x3e\xf9",
-+  [0x1fa1] = "\x3e\xfa", [0x1fa2] = "\x3e\xfb", [0x1fa3] = "\x3e\xfc",
-+  [0x1fa4] = "\x3e\xfd", [0x1fa5] = "\xa8\x45", [0x1fa6] = "\xa1\xad",
-+  [0x1fa7] = "\x3e\xfe", [0x1fa8] = "\x3e\xff", [0x1fa9] = "\x3f\x00",
-+  [0x1faa] = "\x3f\x01", [0x1fab] = "\x3f\x02", [0x1fac] = "\x3f\x03",
-+  [0x1fad] = "\x3f\x04", [0x1fae] = "\x3f\x05", [0x1faf] = "\x3f\x06",
-+  [0x1fb0] = "\xa1\xeb", [0x1fb1] = "\x3f\x07", [0x1fb2] = "\xa1\xe4",
-+  [0x1fb3] = "\xa1\xe5", [0x1fb4] = "\x3f\x08", [0x1fb5] = "\xa8\x46",
-+  [0x1fb6] = "\x3f\x09", [0x1fb7] = "\x3f\x0a", [0x1fb8] = "\x3f\x0b",
-+  [0x1fb9] = "\x3f\x0c", [0x1fba] = "\x3f\x0d", [0x1fbb] = "\xa1\xf9",
-+  [0x1fbc] = "\x3f\x0e", [0x1fbd] = "\x3f\x0f", [0x1fbe] = "\x3f\x10",
-+  [0x1fbf] = "\x3f\x11", [0x1fc0] = "\x3f\x12", [0x1fc1] = "\x3f\x13",
-+  [0x1fc2] = "\x3f\x14", [0x1fc3] = "\x3f\x15", [0x1fc4] = "\x3f\x16",
-+  [0x1fc5] = "\x3f\x17", [0x1fc6] = "\x3f\x18", [0x1fc7] = "\x3f\x19",
-+  [0x1fc8] = "\x3f\x1a", [0x1fc9] = "\x3f\x1b", [0x1fca] = "\x3f\x1c",
-+  [0x1fcb] = "\x3f\x1d", [0x1fcc] = "\x3f\x1e", [0x1fcd] = "\x3f\x1f",
-+  [0x1fce] = "\x3f\x20", [0x1fcf] = "\x3f\x21", [0x1fd0] = "\x3f\x22",
-+  [0x1fd1] = "\x3f\x23", [0x1fd2] = "\x3f\x24", [0x1fd3] = "\x3f\x25",
-+  [0x1fd4] = "\x3f\x26", [0x1fd5] = "\x3f\x27", [0x1fd6] = "\x3f\x28",
-+  [0x1fd7] = "\x3f\x29", [0x1fd8] = "\x3f\x2a", [0x1fd9] = "\x3f\x2b",
-+  [0x1fda] = "\x3f\x2c", [0x1fdb] = "\x3f\x2d", [0x1fdc] = "\x3f\x2e",
-+  [0x1fdd] = "\x3f\x2f", [0x1fde] = "\x3f\x30", [0x1fdf] = "\x3f\x31",
-+  [0x1fe0] = "\x3f\x32", [0x1fe1] = "\x3f\x33", [0x1fe2] = "\x3f\x34",
-+  [0x1fe3] = "\x3f\x35", [0x1fe4] = "\x3f\x36", [0x1fe5] = "\x3f\x37",
-+  [0x1fe6] = "\x3f\x38", [0x1fe7] = "\x3f\x39", [0x1fe8] = "\x3f\x3a",
-+  [0x1fe9] = "\x3f\x3b", [0x1fea] = "\x3f\x3c", [0x1feb] = "\x3f\x3d",
-+  [0x1fec] = "\x3f\x3e", [0x1fed] = "\x3f\x3f", [0x1fee] = "\x3f\x40",
-+  [0x1fef] = "\x3f\x41", [0x1ff0] = "\x3f\x42", [0x1ff1] = "\x3f\x43",
-+  [0x1ff2] = "\x3f\x44", [0x1ff3] = "\x3f\x45", [0x1ff4] = "\x3f\x46",
-   [0x1ff5] = "\x3f\x47", [0x1ff6] = "\x3f\x48", [0x1ff7] = "\x3f\x49",
-   [0x1ff8] = "\x3f\x4a", [0x1ff9] = "\x3f\x4b", [0x1ffa] = "\x3f\x4c",
-   [0x1ffb] = "\x3f\x4d", [0x1ffc] = "\x3f\x4e", [0x1ffd] = "\x3f\x4f",
-@@ -8177,298 +11891,333 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x2004] = "\x3f\x56", [0x2005] = "\x3f\x57", [0x2006] = "\x3f\x58",
-   [0x2007] = "\x3f\x59", [0x2008] = "\x3f\x5a", [0x2009] = "\x3f\x5b",
-   [0x200a] = "\x3f\x5c", [0x200b] = "\x3f\x5d", [0x200c] = "\x3f\x5e",
--  [0x200d] = "\x3f\x5f", [0x200e] = "\x3f\x60", [0x2010] = "\x3f\x62",
--  [0x2011] = "\x3f\x63", [0x2012] = "\x3f\x64", [0x2013] = "\x3f\x65",
--  [0x2014] = "\x3f\x66", [0x2015] = "\x3f\x67", [0x2016] = "\x3f\x68",
--  [0x2017] = "\x3f\x69", [0x2018] = "\x3f\x6a", [0x2019] = "\x3f\x6b",
--  [0x201a] = "\x3f\x6c", [0x201b] = "\x3f\x6d", [0x201c] = "\x3f\x6e",
--  [0x2020] = "\x3f\x72", [0x2021] = "\x3f\x73", [0x2022] = "\x3f\x74",
--  [0x2023] = "\x3f\x75", [0x2024] = "\x3f\x76", [0x2025] = "\x3f\x77",
--  [0x2026] = "\x3f\x78", [0x2027] = "\x3f\x79", [0x2028] = "\x3f\x7a",
--  [0x2029] = "\x3f\x7b", [0x202a] = "\x3f\x7c", [0x202b] = "\x3f\x7d",
--  [0x202c] = "\xa2\xe3", [0x202d] = "\x3f\x7e", [0x202e] = "\x3f\x7f",
--  [0x202f] = "\x3f\x80", [0x2030] = "\x3f\x81", [0x2031] = "\x3f\x82",
--  [0x2032] = "\x3f\x83", [0x2033] = "\x3f\x84", [0x2034] = "\x3f\x85",
--  [0x2035] = "\x3f\x86", [0x2036] = "\x3f\x87", [0x2037] = "\x3f\x88",
--  [0x2038] = "\x3f\x89", [0x2039] = "\x3f\x8a", [0x2050] = "\x3f\xa1",
--  [0x2051] = "\x3f\xa2", [0x2052] = "\x3f\xa3", [0x2053] = "\x3f\xa4",
--  [0x2054] = "\x3f\xa5", [0x2055] = "\x3f\xa6", [0x2056] = "\x3f\xa7",
--  [0x2057] = "\x3f\xa8", [0x2058] = "\x3f\xa9", [0x2059] = "\x3f\xaa",
--  [0x205a] = "\x3f\xab", [0x205b] = "\x3f\xac", [0x205c] = "\x3f\xad",
--  [0x205d] = "\x3f\xae", [0x205e] = "\x3f\xaf", [0x205f] = "\x3f\xb0",
--  [0x2060] = "\x3f\xb1", [0x2061] = "\x3f\xb2", [0x2062] = "\x3f\xb3",
--  [0x2063] = "\x3f\xb4", [0x2064] = "\x3f\xb5", [0x2065] = "\x3f\xb6",
--  [0x2066] = "\x3f\xb7", [0x2067] = "\x3f\xb8", [0x2068] = "\x3f\xb9",
--  [0x2069] = "\x3f\xba", [0x206a] = "\x3f\xbb", [0x206b] = "\x3f\xbc",
--  [0x206c] = "\x3f\xbd", [0x206d] = "\x3f\xbe", [0x206e] = "\x3f\xbf",
--  [0x206f] = "\x3f\xc0", [0x2070] = "\x3f\xc1", [0x2080] = "\x3f\xd1",
--  [0x2081] = "\x3f\xd2", [0x2082] = "\x3f\xd3", [0x2083] = "\xa1\xe6",
--  [0x2084] = "\x3f\xd4", [0x2085] = "\xa8\x47", [0x2086] = "\x3f\xd5",
--  [0x2087] = "\x3f\xd6", [0x2088] = "\x3f\xd7", [0x2089] = "\xa8\x48",
--  [0x208a] = "\x3f\xd8", [0x208b] = "\x3f\xd9", [0x208c] = "\x3f\xda",
--  [0x208d] = "\x3f\xdb", [0x208e] = "\x3f\xdc", [0x208f] = "\x3f\xdd",
--  [0x2090] = "\x3f\xde", [0x2091] = "\x3f\xdf", [0x2092] = "\x3f\xe0",
--  [0x2093] = "\x3f\xe1", [0x2094] = "\x3f\xe2", [0x2095] = "\x3f\xe3",
--  [0x2096] = "\xa1\xed", [0x2097] = "\x3f\xe4", [0x2098] = "\x3f\xe5",
--  [0x2099] = "\x3f\xe6", [0x209a] = "\x3f\xe7", [0x209b] = "\x3f\xe8",
--  [0x209c] = "\x3f\xe9", [0x209d] = "\x3f\xea", [0x209e] = "\x3f\xeb",
--  [0x209f] = "\x3f\xec", [0x20a0] = "\x3f\xed", [0x20a1] = "\xa9\x59",
--  [0x20a2] = "\x3f\xee", [0x20a3] = "\x3f\xef", [0x20a4] = "\x3f\xf0",
--  [0x20a5] = "\x3f\xf1", [0x20a6] = "\x3f\xf2", [0x20a7] = "\x3f\xf3",
--  [0x20a8] = "\x3f\xf4", [0x20a9] = "\x3f\xf5", [0x20aa] = "\x3f\xf6",
--  [0x20ab] = "\x3f\xf7", [0x20ac] = "\x3f\xf8", [0x20ad] = "\x3f\xf9",
--  [0x20ae] = "\x3f\xfa", [0x20af] = "\x3f\xfb", [0x20b0] = "\x3f\xfc",
--  [0x20b1] = "\x3f\xfd", [0x20b2] = "\x3f\xfe", [0x20b3] = "\x3f\xff",
--  [0x20b4] = "\x40\x00", [0x20b5] = "\x40\x01", [0x20b6] = "\x40\x02",
--  [0x20b7] = "\x40\x03", [0x20b8] = "\x40\x04", [0x20b9] = "\x40\x05",
--  [0x20ba] = "\x40\x06", [0x20bb] = "\x40\x07", [0x20bc] = "\x40\x08",
--  [0x20bd] = "\x40\x09", [0x20be] = "\x40\x0a", [0x20bf] = "\x40\x0b",
--  [0x20c0] = "\x40\x0c", [0x20c1] = "\x40\x0d", [0x20c2] = "\x40\x0e",
--  [0x20c3] = "\x40\x0f", [0x20c4] = "\x40\x10", [0x20c5] = "\x40\x11",
--  [0x20c6] = "\x40\x12", [0x20c7] = "\x40\x13", [0x20c8] = "\x40\x14",
--  [0x20c9] = "\x40\x15", [0x20ca] = "\x40\x16", [0x20cb] = "\x40\x17",
--  [0x20cc] = "\x40\x18", [0x20cd] = "\x40\x19", [0x20ce] = "\x40\x1a",
--  [0x20cf] = "\x40\x1b", [0x20d0] = "\x40\x1c", [0x20d1] = "\x40\x1d",
--  [0x20d2] = "\x40\x1e", [0x20d3] = "\x40\x1f", [0x20d4] = "\x40\x20",
--  [0x20d5] = "\x40\x21", [0x20d6] = "\x40\x22", [0x20d7] = "\x40\x23",
--  [0x20d8] = "\x40\x24", [0x20d9] = "\x40\x25", [0x20da] = "\x40\x26",
--  [0x20db] = "\x40\x27", [0x20dc] = "\x40\x28", [0x20dd] = "\x40\x29",
--  [0x20de] = "\x40\x2a", [0x20df] = "\x40\x2b", [0x20e0] = "\xa2\xf1",
--  [0x20e1] = "\xa2\xf2", [0x20e2] = "\xa2\xf3", [0x20e3] = "\xa2\xf4",
--  [0x20e4] = "\xa2\xf5", [0x20e5] = "\xa2\xf6", [0x20e6] = "\xa2\xf7",
--  [0x20e7] = "\xa2\xf8", [0x20e8] = "\xa2\xf9", [0x20e9] = "\xa2\xfa",
--  [0x20ea] = "\xa2\xfb", [0x20eb] = "\xa2\xfc", [0x20ec] = "\x40\x2c",
--  [0x20ed] = "\x40\x2d", [0x20ee] = "\x40\x2e", [0x20ef] = "\x40\x2f",
--  [0x20f0] = "\xa2\xa1", [0x20f1] = "\xa2\xa2", [0x20f2] = "\xa2\xa3",
--  [0x20f3] = "\xa2\xa4", [0x20f4] = "\xa2\xa5", [0x20f5] = "\xa2\xa6",
--  [0x20f6] = "\xa2\xa7", [0x20f7] = "\xa2\xa8", [0x20f8] = "\xa2\xa9",
--  [0x20f9] = "\xa2\xaa", [0x20fa] = "\x40\x30", [0x20fb] = "\x40\x31",
--  [0x20fc] = "\x40\x32", [0x20fd] = "\x40\x33", [0x20fe] = "\x40\x34",
--  [0x20ff] = "\x40\x35", [0x2100] = "\x40\x36", [0x2101] = "\x40\x37",
--  [0x2102] = "\x40\x38", [0x2103] = "\x40\x39", [0x2104] = "\x40\x3a",
--  [0x2105] = "\x40\x3b", [0x2106] = "\x40\x3c", [0x2107] = "\x40\x3d",
--  [0x2108] = "\x40\x3e", [0x2109] = "\x40\x3f", [0x2110] = "\xa1\xfb",
--  [0x2111] = "\xa1\xfc", [0x2112] = "\xa1\xfa", [0x2113] = "\xa1\xfd",
--  [0x2114] = "\x40\x46", [0x2115] = "\x40\x47", [0x2116] = "\xa8\x49",
--  [0x2117] = "\xa8\x4a", [0x2118] = "\xa8\x4b", [0x2119] = "\xa8\x4c",
--  [0x211a] = "\x40\x48", [0x211b] = "\x40\x49", [0x211c] = "\x40\x4a",
--  [0x211d] = "\x40\x4b", [0x211e] = "\x40\x4c", [0x211f] = "\x40\x4d",
--  [0x2120] = "\x40\x4e", [0x2121] = "\x40\x4f", [0x2122] = "\x40\x50",
--  [0x2123] = "\x40\x51", [0x2124] = "\x40\x52", [0x2125] = "\x40\x53",
--  [0x2126] = "\x40\x54", [0x2127] = "\x40\x55", [0x2128] = "\x40\x56",
--  [0x2129] = "\x40\x57", [0x212a] = "\x40\x58", [0x212b] = "\x40\x59",
--  [0x212c] = "\x40\x5a", [0x212d] = "\x40\x5b", [0x212e] = "\x40\x5c",
--  [0x212f] = "\x40\x5d", [0x2130] = "\x40\x5e", [0x2131] = "\x40\x5f",
--  [0x2132] = "\x40\x60", [0x2133] = "\x40\x61", [0x2134] = "\x40\x62",
--  [0x2135] = "\x40\x63", [0x2136] = "\x40\x64", [0x2137] = "\x40\x65",
--  [0x2138] = "\x40\x66", [0x2139] = "\x40\x67", [0x213a] = "\x40\x68",
--  [0x213b] = "\x40\x69", [0x213c] = "\x40\x6a", [0x213d] = "\x40\x6b",
--  [0x213e] = "\x40\x6c", [0x213f] = "\x40\x6d", [0x2140] = "\x40\x6e",
--  [0x2141] = "\x40\x6f", [0x2142] = "\x40\x70", [0x2143] = "\x40\x71",
--  [0x2144] = "\x40\x72", [0x2145] = "\x40\x73", [0x2146] = "\x40\x74",
--  [0x2147] = "\x40\x75", [0x2148] = "\x40\x76", [0x2149] = "\x40\x77",
--  [0x214a] = "\x40\x78", [0x214b] = "\x40\x79", [0x214c] = "\x40\x7a",
--  [0x214d] = "\x40\x7b", [0x214e] = "\x40\x7c", [0x214f] = "\x40\x7d",
--  [0x2150] = "\x40\x7e", [0x2151] = "\x40\x7f", [0x2152] = "\x40\x80",
--  [0x2153] = "\x40\x81", [0x2154] = "\x40\x82", [0x2155] = "\x40\x83",
--  [0x2156] = "\x40\x84", [0x2157] = "\x40\x85", [0x2158] = "\x40\x86",
--  [0x2159] = "\x40\x87", [0x215a] = "\x40\x88", [0x215b] = "\x40\x89",
--  [0x215c] = "\x40\x8a", [0x215d] = "\x40\x8b", [0x215e] = "\x40\x8c",
--  [0x215f] = "\x40\x8d", [0x2160] = "\x40\x8e", [0x2161] = "\x40\x8f",
--  [0x2162] = "\x40\x90", [0x2163] = "\x40\x91", [0x2164] = "\x40\x92",
--  [0x2165] = "\x40\x93", [0x2166] = "\x40\x94", [0x2167] = "\x40\x95",
--  [0x2168] = "\x40\x96", [0x2169] = "\x40\x97", [0x216a] = "\x40\x98",
--  [0x216b] = "\x40\x99", [0x216c] = "\x40\x9a", [0x216d] = "\x40\x9b",
--  [0x216e] = "\x40\x9c", [0x216f] = "\x40\x9d", [0x2170] = "\x40\x9e",
--  [0x2171] = "\x40\x9f", [0x2172] = "\x40\xa0", [0x2173] = "\x40\xa1",
--  [0x2174] = "\x40\xa2", [0x2175] = "\x40\xa3", [0x2176] = "\x40\xa4",
--  [0x2177] = "\x40\xa5", [0x2178] = "\x40\xa6", [0x2179] = "\x40\xa7",
--  [0x217a] = "\x40\xa8", [0x217b] = "\x40\xa9", [0x217c] = "\x40\xaa",
--  [0x217d] = "\x40\xab", [0x217e] = "\x40\xac", [0x217f] = "\x40\xad",
--  [0x2180] = "\x40\xae", [0x2181] = "\x40\xaf", [0x2182] = "\x40\xb0",
--  [0x2183] = "\x40\xb1", [0x2184] = "\x40\xb2", [0x2185] = "\x40\xb3",
--  [0x2186] = "\x40\xb4", [0x2187] = "\x40\xb5", [0x2188] = "\xa1\xca",
--  [0x2189] = "\x40\xb6", [0x218a] = "\x40\xb7", [0x218b] = "\x40\xb8",
--  [0x218c] = "\x40\xb9", [0x218d] = "\x40\xba", [0x218e] = "\x40\xbb",
--  [0x218f] = "\xa1\xc7", [0x2190] = "\x40\xbc", [0x2191] = "\xa1\xc6",
--  [0x2192] = "\x40\xbd", [0x2193] = "\x40\xbe", [0x2194] = "\x40\xbf",
--  [0x2195] = "\xa8\x4d", [0x2196] = "\x40\xc0", [0x2197] = "\x40\xc1",
--  [0x2198] = "\x40\xc2", [0x2199] = "\x40\xc3", [0x219a] = "\xa1\xcc",
--  [0x219b] = "\x40\xc4", [0x219c] = "\x40\xc5", [0x219d] = "\xa1\xd8",
--  [0x219e] = "\xa1\xde", [0x219f] = "\xa8\x4e", [0x21a0] = "\xa1\xcf",
--  [0x21a1] = "\x40\xc6", [0x21a2] = "\x40\xc7", [0x21a3] = "\xa8\x4f",
--  [0x21a4] = "\x40\xc8", [0x21a5] = "\xa1\xce", [0x21a6] = "\x40\xc9",
--  [0x21a7] = "\xa1\xc4", [0x21a8] = "\xa1\xc5", [0x21a9] = "\xa1\xc9",
--  [0x21aa] = "\xa1\xc8", [0x21ab] = "\xa1\xd2", [0x21ac] = "\x40\xca",
--  [0x21ad] = "\x40\xcb", [0x21ae] = "\xa1\xd3", [0x21af] = "\x40\xcc",
--  [0x21b0] = "\x40\xcd", [0x21b1] = "\x40\xce", [0x21b2] = "\x40\xcf",
--  [0x21b3] = "\x40\xd0", [0x21b4] = "\xa1\xe0", [0x21b5] = "\xa1\xdf",
--  [0x21b6] = "\xa1\xc3", [0x21b7] = "\xa1\xcb", [0x21b8] = "\x40\xd1",
--  [0x21b9] = "\x40\xd2", [0x21ba] = "\x40\xd3", [0x21bb] = "\x40\xd4",
--  [0x21bc] = "\x40\xd5", [0x21bd] = "\xa1\xd7", [0x21be] = "\x40\xd6",
--  [0x21bf] = "\x40\xd7", [0x21c0] = "\x40\xd8", [0x21c1] = "\x40\xd9",
--  [0x21c2] = "\x40\xda", [0x21c3] = "\x40\xdb", [0x21c4] = "\x40\xdc",
--  [0x21c5] = "\x40\xdd", [0x21c6] = "\x40\xde", [0x21c7] = "\x40\xdf",
--  [0x21c8] = "\xa1\xd6", [0x21c9] = "\x40\xe0", [0x21ca] = "\x40\xe1",
--  [0x21cb] = "\x40\xe2", [0x21cc] = "\xa1\xd5", [0x21cd] = "\x40\xe3",
--  [0x21ce] = "\x40\xe4", [0x21cf] = "\x40\xe5", [0x21d0] = "\x40\xe6",
--  [0x21d1] = "\x40\xe7", [0x21d2] = "\xa8\x50", [0x21d3] = "\x40\xe8",
--  [0x21d4] = "\x40\xe9", [0x21d5] = "\x40\xea", [0x21d6] = "\x40\xeb",
--  [0x21d7] = "\x40\xec", [0x21d8] = "\x40\xed", [0x21d9] = "\x40\xee",
--  [0x21da] = "\x40\xef", [0x21db] = "\x40\xf0", [0x21dc] = "\x40\xf1",
--  [0x21dd] = "\x40\xf2", [0x21de] = "\x40\xf3", [0x21df] = "\x40\xf4",
--  [0x21e0] = "\xa1\xd9", [0x21e1] = "\xa1\xd4", [0x21e2] = "\x40\xf5",
--  [0x21e3] = "\x40\xf6", [0x21e4] = "\xa1\xdc", [0x21e5] = "\xa1\xdd",
--  [0x21e6] = "\xa8\x51", [0x21e7] = "\xa8\x52", [0x21e8] = "\x40\xf7",
--  [0x21e9] = "\x40\xf8", [0x21ea] = "\x40\xf9", [0x21eb] = "\x40\xfa",
--  [0x21ec] = "\x40\xfb", [0x21ed] = "\x40\xfc", [0x21ee] = "\xa1\xda",
--  [0x21ef] = "\xa1\xdb", [0x21f0] = "\x40\xfd", [0x21f1] = "\x40\xfe",
--  [0x21f2] = "\x40\xff", [0x21f3] = "\x41\x00", [0x21f4] = "\x41\x01",
--  [0x21f5] = "\x41\x02", [0x21f6] = "\x41\x03", [0x21f7] = "\x41\x04",
--  [0x21f8] = "\x41\x05", [0x21f9] = "\x41\x06", [0x21fa] = "\x41\x07",
--  [0x21fb] = "\x41\x08", [0x21fc] = "\x41\x09", [0x21fd] = "\x41\x0a",
--  [0x21fe] = "\x41\x0b", [0x21ff] = "\x41\x0c", [0x2200] = "\x41\x0d",
--  [0x2201] = "\x41\x0e", [0x2202] = "\x41\x0f", [0x2203] = "\x41\x10",
--  [0x2204] = "\x41\x11", [0x2205] = "\x41\x12", [0x2206] = "\x41\x13",
--  [0x2207] = "\x41\x14", [0x2208] = "\x41\x15", [0x2209] = "\x41\x16",
--  [0x220a] = "\x41\x17", [0x220b] = "\x41\x18", [0x220c] = "\x41\x19",
--  [0x220d] = "\x41\x1a", [0x220e] = "\x41\x1b", [0x220f] = "\x41\x1c",
--  [0x2210] = "\x41\x1d", [0x2211] = "\x41\x1e", [0x2212] = "\x41\x1f",
--  [0x2213] = "\x41\x20", [0x2214] = "\x41\x21", [0x2215] = "\xa8\x92",
--  [0x2216] = "\x41\x22", [0x2217] = "\x41\x23", [0x2218] = "\x41\x24",
--  [0x2219] = "\xa1\xd1", [0x221a] = "\x41\x25", [0x221b] = "\x41\x26",
--  [0x221c] = "\x41\x27", [0x221d] = "\x41\x28", [0x221e] = "\x41\x29",
--  [0x221f] = "\x41\x2a", [0x2220] = "\x41\x2b", [0x2221] = "\x41\x2c",
--  [0x2222] = "\x41\x2d", [0x2223] = "\x41\x2e", [0x2224] = "\x41\x2f",
--  [0x2225] = "\xa1\xcd", [0x2226] = "\x41\x30", [0x2227] = "\x41\x31",
--  [0x2228] = "\x41\x32", [0x2229] = "\x41\x33", [0x222a] = "\x41\x34",
--  [0x222b] = "\x41\x35", [0x222c] = "\x41\x36", [0x222d] = "\x41\x37",
--  [0x222e] = "\x41\x38", [0x222f] = "\x41\x39", [0x2230] = "\x41\x3a",
--  [0x2231] = "\x41\x3b", [0x2232] = "\x41\x3c", [0x2233] = "\x41\x3d",
--  [0x2234] = "\x41\x3e", [0x2235] = "\x41\x3f", [0x2236] = "\x41\x40",
--  [0x2237] = "\x41\x41", [0x2238] = "\x41\x42", [0x2239] = "\x41\x43",
--  [0x223a] = "\x41\x44", [0x223b] = "\x41\x45", [0x223c] = "\x41\x46",
--  [0x223d] = "\x41\x47", [0x223e] = "\x41\x48", [0x223f] = "\xa8\x53",
--  [0x2240] = "\x41\x49", [0x2241] = "\x41\x4a", [0x2242] = "\x41\x4b",
--  [0x2243] = "\x41\x4c", [0x2244] = "\x41\x4d", [0x2245] = "\x41\x4e",
--  [0x2246] = "\x41\x4f", [0x2247] = "\x41\x50", [0x2248] = "\x41\x51",
--  [0x2249] = "\x41\x52", [0x224a] = "\x41\x53", [0x224b] = "\x41\x54",
--  [0x224c] = "\x41\x55", [0x224d] = "\x41\x56", [0x224e] = "\x41\x57",
--  [0x224f] = "\x41\x58", [0x2250] = "\x41\x59", [0x2251] = "\x41\x5a",
--  [0x2252] = "\x41\x5b", [0x2253] = "\x41\x5c", [0x2254] = "\x41\x5d",
--  [0x2255] = "\x41\x5e", [0x2256] = "\x41\x5f", [0x2257] = "\x41\x60",
--  [0x2258] = "\x41\x61", [0x2259] = "\x41\x62", [0x225a] = "\x41\x63",
--  [0x225b] = "\x41\x64", [0x225c] = "\x41\x65", [0x225d] = "\x41\x66",
--  [0x225e] = "\x41\x67", [0x225f] = "\x41\x68", [0x2260] = "\x41\x69",
--  [0x2261] = "\x41\x6a", [0x2262] = "\x41\x6b", [0x2263] = "\x41\x6c",
--  [0x2264] = "\x41\x6d", [0x2265] = "\x41\x6e", [0x2266] = "\x41\x6f",
--  [0x2267] = "\x41\x70", [0x2268] = "\x41\x71", [0x2269] = "\x41\x72",
--  [0x226a] = "\x41\x73", [0x226b] = "\x41\x74", [0x226c] = "\x41\x75",
--  [0x226d] = "\x41\x76", [0x226e] = "\x41\x77", [0x226f] = "\x41\x78",
--  [0x2270] = "\x41\x79", [0x2271] = "\x41\x7a", [0x2272] = "\x41\x7b",
--  [0x2273] = "\x41\x7c", [0x2274] = "\x41\x7d", [0x2275] = "\x41\x7e",
--  [0x2276] = "\x41\x7f", [0x2277] = "\x41\x80", [0x2278] = "\x41\x81",
--  [0x2279] = "\x41\x82", [0x227a] = "\x41\x83", [0x227b] = "\x41\x84",
--  [0x227c] = "\x41\x85", [0x227d] = "\x41\x86", [0x227e] = "\x41\x87",
--  [0x227f] = "\x41\x88", [0x2280] = "\x41\x89", [0x2281] = "\x41\x8a",
--  [0x2282] = "\x41\x8b", [0x2283] = "\x41\x8c", [0x2284] = "\x41\x8d",
--  [0x2285] = "\x41\x8e", [0x2286] = "\x41\x8f", [0x2287] = "\x41\x90",
--  [0x2288] = "\x41\x91", [0x2289] = "\x41\x92", [0x228a] = "\x41\x93",
--  [0x228b] = "\x41\x94", [0x228c] = "\x41\x95", [0x228d] = "\x41\x96",
--  [0x228e] = "\x41\x97", [0x228f] = "\x41\x98", [0x2290] = "\x41\x99",
--  [0x2291] = "\x41\x9a", [0x2292] = "\xa1\xd0", [0x2293] = "\x41\x9b",
--  [0x2294] = "\x41\x9c", [0x2295] = "\x41\x9d", [0x2296] = "\x41\x9e",
--  [0x2297] = "\x41\x9f", [0x2298] = "\x41\xa0", [0x2299] = "\x41\xa1",
--  [0x229a] = "\x41\xa2", [0x229b] = "\x41\xa3", [0x229c] = "\x41\xa4",
--  [0x229d] = "\x41\xa5", [0x229e] = "\x41\xa6", [0x229f] = "\x41\xa7",
--  [0x22a0] = "\x41\xa8", [0x22a1] = "\x41\xa9", [0x22a2] = "\x41\xaa",
--  [0x22a3] = "\x41\xab", [0x22a4] = "\x41\xac", [0x22a5] = "\x41\xad",
--  [0x22a6] = "\x41\xae", [0x22a7] = "\x41\xaf", [0x22a8] = "\x41\xb0",
--  [0x22a9] = "\x41\xb1", [0x22aa] = "\x41\xb2", [0x22ab] = "\x41\xb3",
--  [0x22ac] = "\x41\xb4", [0x22ad] = "\x41\xb5", [0x22ae] = "\x41\xb6",
--  [0x22af] = "\x41\xb7", [0x22b0] = "\x41\xb8", [0x22b1] = "\x41\xb9",
--  [0x22b2] = "\x41\xba", [0x22b3] = "\x41\xbb", [0x22b4] = "\x41\xbc",
--  [0x22b5] = "\x41\xbd", [0x22b6] = "\x41\xbe", [0x22b7] = "\x41\xbf",
--  [0x22b8] = "\x41\xc0", [0x22b9] = "\x41\xc1", [0x22ba] = "\x41\xc2",
--  [0x22bb] = "\x41\xc3", [0x22bc] = "\x41\xc4", [0x22bd] = "\x41\xc5",
--  [0x22be] = "\x41\xc6", [0x22bf] = "\x41\xc7", [0x22c0] = "\x41\xc8",
--  [0x22c1] = "\x41\xc9", [0x22c2] = "\x41\xca", [0x22c3] = "\x41\xcb",
--  [0x22c4] = "\x41\xcc", [0x22c5] = "\x41\xcd", [0x22c6] = "\x41\xce",
--  [0x22c7] = "\x41\xcf", [0x22c8] = "\x41\xd0", [0x22c9] = "\x41\xd1",
--  [0x22ca] = "\x41\xd2", [0x22cb] = "\x41\xd3", [0x22cc] = "\x41\xd4",
--  [0x22cd] = "\x41\xd5", [0x22ce] = "\x41\xd6", [0x22cf] = "\x41\xd7",
--  [0x22d0] = "\x41\xd8", [0x22d1] = "\x41\xd9", [0x22d2] = "\x41\xda",
--  [0x22d3] = "\x41\xdb", [0x22d4] = "\x41\xdc", [0x22d5] = "\x41\xdd",
--  [0x22d6] = "\x41\xde", [0x22d7] = "\x41\xdf", [0x22d8] = "\x41\xe0",
--  [0x22d9] = "\x41\xe1", [0x22da] = "\x41\xe2", [0x22db] = "\x41\xe3",
--  [0x22dc] = "\x41\xe4", [0x22dd] = "\x41\xe5", [0x22de] = "\x41\xe6",
--  [0x22df] = "\x41\xe7", [0x22e0] = "\x41\xe8", [0x22e1] = "\x41\xe9",
--  [0x22e2] = "\x41\xea", [0x22e3] = "\x41\xeb", [0x22e4] = "\x41\xec",
--  [0x22e5] = "\x41\xed", [0x22e6] = "\x41\xee", [0x22e7] = "\x41\xef",
--  [0x22e8] = "\x41\xf0", [0x22e9] = "\x41\xf1", [0x22ea] = "\x41\xf2",
--  [0x22eb] = "\x41\xf3", [0x22ec] = "\x41\xf4", [0x22ed] = "\x41\xf5",
--  [0x22ee] = "\x41\xf6", [0x22ef] = "\x41\xf7", [0x22f0] = "\x41\xf8",
--  [0x22f1] = "\x41\xf9", [0x22f2] = "\x41\xfa", [0x22f3] = "\x41\xfb",
--  [0x22f4] = "\x41\xfc", [0x22f5] = "\x41\xfd", [0x22f6] = "\x41\xfe",
--  [0x22f7] = "\x41\xff", [0x22f8] = "\x42\x00", [0x22f9] = "\x42\x01",
--  [0x22fa] = "\x42\x02", [0x22fb] = "\x42\x03", [0x22fc] = "\x42\x04",
--  [0x22fd] = "\x42\x05", [0x22fe] = "\x42\x06", [0x22ff] = "\x42\x07",
--  [0x2300] = "\x42\x08", [0x2301] = "\x42\x09", [0x2302] = "\x42\x0a",
--  [0x2303] = "\x42\x0b", [0x2304] = "\x42\x0c", [0x2305] = "\x42\x0d",
--  [0x2306] = "\x42\x0e", [0x2307] = "\x42\x0f", [0x2308] = "\x42\x10",
--  [0x2309] = "\x42\x11", [0x230a] = "\x42\x12", [0x230b] = "\x42\x13",
--  [0x230c] = "\x42\x14", [0x230d] = "\x42\x15", [0x230e] = "\x42\x16",
--  [0x230f] = "\x42\x17", [0x2310] = "\x42\x18", [0x2311] = "\x42\x19",
--  [0x2312] = "\x42\x1a", [0x2313] = "\x42\x1b", [0x2314] = "\x42\x1c",
--  [0x2315] = "\x42\x1d", [0x2316] = "\x42\x1e", [0x2317] = "\x42\x1f",
--  [0x2318] = "\x42\x20", [0x2319] = "\x42\x21", [0x231a] = "\x42\x22",
--  [0x231b] = "\x42\x23", [0x231c] = "\x42\x24", [0x231d] = "\x42\x25",
--  [0x231e] = "\x42\x26", [0x231f] = "\x42\x27", [0x2320] = "\x42\x28",
--  [0x2321] = "\x42\x29", [0x2322] = "\x42\x2a", [0x2323] = "\x42\x2b",
--  [0x2324] = "\x42\x2c", [0x2325] = "\x42\x2d", [0x2326] = "\x42\x2e",
--  [0x2327] = "\x42\x2f", [0x2328] = "\x42\x30", [0x2329] = "\x42\x31",
--  [0x232a] = "\x42\x32", [0x232b] = "\x42\x33", [0x232c] = "\x42\x34",
--  [0x232d] = "\x42\x35", [0x232e] = "\x42\x36", [0x232f] = "\x42\x37",
--  [0x2330] = "\x42\x38", [0x2331] = "\x42\x39", [0x2332] = "\x42\x3a",
--  [0x2333] = "\x42\x3b", [0x2334] = "\x42\x3c", [0x2335] = "\x42\x3d",
--  [0x2336] = "\x42\x3e", [0x2337] = "\x42\x3f", [0x2338] = "\x42\x40",
--  [0x2339] = "\x42\x41", [0x233a] = "\x42\x42", [0x233b] = "\x42\x43",
--  [0x233c] = "\x42\x44", [0x233d] = "\x42\x45", [0x233e] = "\x42\x46",
--  [0x233f] = "\x42\x47", [0x2340] = "\x42\x48", [0x2341] = "\x42\x49",
--  [0x2342] = "\x42\x4a", [0x2343] = "\x42\x4b", [0x2344] = "\x42\x4c",
--  [0x2345] = "\x42\x4d", [0x2346] = "\x42\x4e", [0x2347] = "\x42\x4f",
--  [0x2348] = "\x42\x50", [0x2349] = "\x42\x51", [0x234a] = "\x42\x52",
--  [0x234b] = "\x42\x53", [0x234c] = "\x42\x54", [0x234d] = "\x42\x55",
--  [0x234e] = "\x42\x56", [0x234f] = "\x42\x57", [0x2350] = "\x42\x58",
--  [0x2351] = "\x42\x59", [0x2352] = "\x42\x5a", [0x2353] = "\x42\x5b",
--  [0x2354] = "\x42\x5c", [0x2355] = "\x42\x5d", [0x2356] = "\x42\x5e",
--  [0x2357] = "\x42\x5f", [0x2358] = "\x42\x60", [0x2359] = "\x42\x61",
--  [0x235a] = "\x42\x62", [0x235b] = "\x42\x63", [0x235c] = "\x42\x64",
--  [0x235d] = "\x42\x65", [0x235e] = "\x42\x66", [0x235f] = "\x42\x67",
--  [0x2360] = "\x42\x68", [0x2361] = "\x42\x69", [0x2362] = "\x42\x6a",
--  [0x2363] = "\x42\x6b", [0x2364] = "\x42\x6c", [0x2365] = "\x42\x6d",
--  [0x2366] = "\x42\x6e", [0x2367] = "\x42\x6f", [0x2368] = "\x42\x70",
--  [0x2369] = "\x42\x71", [0x236a] = "\x42\x72", [0x236b] = "\x42\x73",
--  [0x236c] = "\x42\x74", [0x236d] = "\x42\x75", [0x236e] = "\x42\x76",
--  [0x236f] = "\x42\x77", [0x2370] = "\x42\x78", [0x2371] = "\x42\x79",
--  [0x2372] = "\x42\x7a", [0x2373] = "\x42\x7b", [0x2380] = "\x42\x88",
--  [0x2381] = "\x42\x89", [0x2382] = "\x42\x8a", [0x2383] = "\x42\x8b",
--  [0x2384] = "\x42\x8c", [0x2385] = "\x42\x8d", [0x2386] = "\x42\x8e",
--  [0x2387] = "\x42\x8f", [0x2388] = "\x42\x90", [0x2389] = "\x42\x91",
--  [0x238a] = "\x42\x92", [0x238b] = "\x42\x93", [0x238c] = "\x42\x94",
--  [0x238d] = "\x42\x95", [0x238e] = "\x42\x96", [0x238f] = "\x42\x97",
--  [0x2390] = "\x42\x98", [0x2391] = "\x42\x99", [0x2392] = "\x42\x9a",
--  [0x2393] = "\x42\x9b", [0x2394] = "\x42\x9c", [0x2395] = "\x42\x9d",
--  [0x2396] = "\x42\x9e", [0x2397] = "\x42\x9f", [0x2398] = "\x42\xa0",
--  [0x2399] = "\x42\xa1", [0x239a] = "\x42\xa2", [0x239b] = "\x42\xa3",
--  [0x239c] = "\x42\xa4", [0x239d] = "\x42\xa5", [0x239e] = "\x42\xa6",
--  [0x239f] = "\x42\xa7", [0x23a0] = "\x42\xa8", [0x23a1] = "\x42\xa9",
--  [0x23a2] = "\x42\xaa", [0x23a3] = "\x42\xab", [0x23a4] = "\x42\xac",
--  [0x23a5] = "\x42\xad", [0x23a6] = "\x42\xae", [0x23c0] = "\x42\xc8",
-+  [0x200d] = "\x3f\x5f", [0x200e] = "\x3f\x60", [0x200f] = "\x3f\x61",
-+  [0x2010] = "\x3f\x62", [0x2011] = "\x3f\x63", [0x2012] = "\x3f\x64",
-+  [0x2013] = "\x3f\x65", [0x2014] = "\x3f\x66", [0x2015] = "\x3f\x67",
-+  [0x2016] = "\x3f\x68", [0x2017] = "\x3f\x69", [0x2018] = "\x3f\x6a",
-+  [0x2019] = "\x3f\x6b", [0x201a] = "\x3f\x6c", [0x201b] = "\x3f\x6d",
-+  [0x201c] = "\x3f\x6e", [0x201d] = "\x3f\x6f", [0x201e] = "\x3f\x70",
-+  [0x201f] = "\x3f\x71", [0x2020] = "\x3f\x72", [0x2021] = "\x3f\x73",
-+  [0x2022] = "\x3f\x74", [0x2023] = "\x3f\x75", [0x2024] = "\x3f\x76",
-+  [0x2025] = "\x3f\x77", [0x2026] = "\x3f\x78", [0x2027] = "\x3f\x79",
-+  [0x2028] = "\x3f\x7a", [0x2029] = "\x3f\x7b", [0x202a] = "\x3f\x7c",
-+  [0x202b] = "\x3f\x7d", [0x202c] = "\xa2\xe3", [0x202d] = "\x3f\x7e",
-+  [0x202e] = "\x3f\x7f", [0x202f] = "\x3f\x80", [0x2030] = "\x3f\x81",
-+  [0x2031] = "\x3f\x82", [0x2032] = "\x3f\x83", [0x2033] = "\x3f\x84",
-+  [0x2034] = "\x3f\x85", [0x2035] = "\x3f\x86", [0x2036] = "\x3f\x87",
-+  [0x2037] = "\x3f\x88", [0x2038] = "\x3f\x89", [0x2039] = "\x3f\x8a",
-+  [0x203a] = "\x3f\x8b", [0x203b] = "\x3f\x8c", [0x203c] = "\x3f\x8d",
-+  [0x203d] = "\x3f\x8e", [0x203e] = "\x3f\x8f", [0x203f] = "\x3f\x90",
-+  [0x2040] = "\x3f\x91", [0x2041] = "\x3f\x92", [0x2042] = "\x3f\x93",
-+  [0x2043] = "\x3f\x94", [0x2044] = "\x3f\x95", [0x2045] = "\x3f\x96",
-+  [0x2046] = "\x3f\x97", [0x2047] = "\x3f\x98", [0x2048] = "\x3f\x99",
-+  [0x2049] = "\x3f\x9a", [0x204a] = "\x3f\x9b", [0x204b] = "\x3f\x9c",
-+  [0x204c] = "\x3f\x9d", [0x204d] = "\x3f\x9e", [0x204e] = "\x3f\x9f",
-+  [0x204f] = "\x3f\xa0", [0x2050] = "\x3f\xa1", [0x2051] = "\x3f\xa2",
-+  [0x2052] = "\x3f\xa3", [0x2053] = "\x3f\xa4", [0x2054] = "\x3f\xa5",
-+  [0x2055] = "\x3f\xa6", [0x2056] = "\x3f\xa7", [0x2057] = "\x3f\xa8",
-+  [0x2058] = "\x3f\xa9", [0x2059] = "\x3f\xaa", [0x205a] = "\x3f\xab",
-+  [0x205b] = "\x3f\xac", [0x205c] = "\x3f\xad", [0x205d] = "\x3f\xae",
-+  [0x205e] = "\x3f\xaf", [0x205f] = "\x3f\xb0", [0x2060] = "\x3f\xb1",
-+  [0x2061] = "\x3f\xb2", [0x2062] = "\x3f\xb3", [0x2063] = "\x3f\xb4",
-+  [0x2064] = "\x3f\xb5", [0x2065] = "\x3f\xb6", [0x2066] = "\x3f\xb7",
-+  [0x2067] = "\x3f\xb8", [0x2068] = "\x3f\xb9", [0x2069] = "\x3f\xba",
-+  [0x206a] = "\x3f\xbb", [0x206b] = "\x3f\xbc", [0x206c] = "\x3f\xbd",
-+  [0x206d] = "\x3f\xbe", [0x206e] = "\x3f\xbf", [0x206f] = "\x3f\xc0",
-+  [0x2070] = "\x3f\xc1", [0x2071] = "\x3f\xc2", [0x2072] = "\x3f\xc3",
-+  [0x2073] = "\x3f\xc4", [0x2074] = "\x3f\xc5", [0x2075] = "\x3f\xc6",
-+  [0x2076] = "\x3f\xc7", [0x2077] = "\x3f\xc8", [0x2078] = "\x3f\xc9",
-+  [0x2079] = "\x3f\xca", [0x207a] = "\x3f\xcb", [0x207b] = "\x3f\xcc",
-+  [0x207c] = "\x3f\xcd", [0x207d] = "\x3f\xce", [0x207e] = "\x3f\xcf",
-+  [0x207f] = "\x3f\xd0", [0x2080] = "\x3f\xd1", [0x2081] = "\x3f\xd2",
-+  [0x2082] = "\x3f\xd3", [0x2083] = "\xa1\xe6", [0x2084] = "\x3f\xd4",
-+  [0x2085] = "\xa8\x47", [0x2086] = "\x3f\xd5", [0x2087] = "\x3f\xd6",
-+  [0x2088] = "\x3f\xd7", [0x2089] = "\xa8\x48", [0x208a] = "\x3f\xd8",
-+  [0x208b] = "\x3f\xd9", [0x208c] = "\x3f\xda", [0x208d] = "\x3f\xdb",
-+  [0x208e] = "\x3f\xdc", [0x208f] = "\x3f\xdd", [0x2090] = "\x3f\xde",
-+  [0x2091] = "\x3f\xdf", [0x2092] = "\x3f\xe0", [0x2093] = "\x3f\xe1",
-+  [0x2094] = "\x3f\xe2", [0x2095] = "\x3f\xe3", [0x2096] = "\xa1\xed",
-+  [0x2097] = "\x3f\xe4", [0x2098] = "\x3f\xe5", [0x2099] = "\x3f\xe6",
-+  [0x209a] = "\x3f\xe7", [0x209b] = "\x3f\xe8", [0x209c] = "\x3f\xe9",
-+  [0x209d] = "\x3f\xea", [0x209e] = "\x3f\xeb", [0x209f] = "\x3f\xec",
-+  [0x20a0] = "\x3f\xed", [0x20a1] = "\xa9\x59", [0x20a2] = "\x3f\xee",
-+  [0x20a3] = "\x3f\xef", [0x20a4] = "\x3f\xf0", [0x20a5] = "\x3f\xf1",
-+  [0x20a6] = "\x3f\xf2", [0x20a7] = "\x3f\xf3", [0x20a8] = "\x3f\xf4",
-+  [0x20a9] = "\x3f\xf5", [0x20aa] = "\x3f\xf6", [0x20ab] = "\x3f\xf7",
-+  [0x20ac] = "\x3f\xf8", [0x20ad] = "\x3f\xf9", [0x20ae] = "\x3f\xfa",
-+  [0x20af] = "\x3f\xfb", [0x20b0] = "\x3f\xfc", [0x20b1] = "\x3f\xfd",
-+  [0x20b2] = "\x3f\xfe", [0x20b3] = "\x3f\xff", [0x20b4] = "\x40\x00",
-+  [0x20b5] = "\x40\x01", [0x20b6] = "\x40\x02", [0x20b7] = "\x40\x03",
-+  [0x20b8] = "\x40\x04", [0x20b9] = "\x40\x05", [0x20ba] = "\x40\x06",
-+  [0x20bb] = "\x40\x07", [0x20bc] = "\x40\x08", [0x20bd] = "\x40\x09",
-+  [0x20be] = "\x40\x0a", [0x20bf] = "\x40\x0b", [0x20c0] = "\x40\x0c",
-+  [0x20c1] = "\x40\x0d", [0x20c2] = "\x40\x0e", [0x20c3] = "\x40\x0f",
-+  [0x20c4] = "\x40\x10", [0x20c5] = "\x40\x11", [0x20c6] = "\x40\x12",
-+  [0x20c7] = "\x40\x13", [0x20c8] = "\x40\x14", [0x20c9] = "\x40\x15",
-+  [0x20ca] = "\x40\x16", [0x20cb] = "\x40\x17", [0x20cc] = "\x40\x18",
-+  [0x20cd] = "\x40\x19", [0x20ce] = "\x40\x1a", [0x20cf] = "\x40\x1b",
-+  [0x20d0] = "\x40\x1c", [0x20d1] = "\x40\x1d", [0x20d2] = "\x40\x1e",
-+  [0x20d3] = "\x40\x1f", [0x20d4] = "\x40\x20", [0x20d5] = "\x40\x21",
-+  [0x20d6] = "\x40\x22", [0x20d7] = "\x40\x23", [0x20d8] = "\x40\x24",
-+  [0x20d9] = "\x40\x25", [0x20da] = "\x40\x26", [0x20db] = "\x40\x27",
-+  [0x20dc] = "\x40\x28", [0x20dd] = "\x40\x29", [0x20de] = "\x40\x2a",
-+  [0x20df] = "\x40\x2b", [0x20e0] = "\xa2\xf1", [0x20e1] = "\xa2\xf2",
-+  [0x20e2] = "\xa2\xf3", [0x20e3] = "\xa2\xf4", [0x20e4] = "\xa2\xf5",
-+  [0x20e5] = "\xa2\xf6", [0x20e6] = "\xa2\xf7", [0x20e7] = "\xa2\xf8",
-+  [0x20e8] = "\xa2\xf9", [0x20e9] = "\xa2\xfa", [0x20ea] = "\xa2\xfb",
-+  [0x20eb] = "\xa2\xfc", [0x20ec] = "\x40\x2c", [0x20ed] = "\x40\x2d",
-+  [0x20ee] = "\x40\x2e", [0x20ef] = "\x40\x2f", [0x20f0] = "\xa2\xa1",
-+  [0x20f1] = "\xa2\xa2", [0x20f2] = "\xa2\xa3", [0x20f3] = "\xa2\xa4",
-+  [0x20f4] = "\xa2\xa5", [0x20f5] = "\xa2\xa6", [0x20f6] = "\xa2\xa7",
-+  [0x20f7] = "\xa2\xa8", [0x20f8] = "\xa2\xa9", [0x20f9] = "\xa2\xaa",
-+  [0x20fa] = "\x40\x30", [0x20fb] = "\x40\x31", [0x20fc] = "\x40\x32",
-+  [0x20fd] = "\x40\x33", [0x20fe] = "\x40\x34", [0x20ff] = "\x40\x35",
-+  [0x2100] = "\x40\x36", [0x2101] = "\x40\x37", [0x2102] = "\x40\x38",
-+  [0x2103] = "\x40\x39", [0x2104] = "\x40\x3a", [0x2105] = "\x40\x3b",
-+  [0x2106] = "\x40\x3c", [0x2107] = "\x40\x3d", [0x2108] = "\x40\x3e",
-+  [0x2109] = "\x40\x3f", [0x210a] = "\x40\x40", [0x210b] = "\x40\x41",
-+  [0x210c] = "\x40\x42", [0x210d] = "\x40\x43", [0x210e] = "\x40\x44",
-+  [0x210f] = "\x40\x45", [0x2110] = "\xa1\xfb", [0x2111] = "\xa1\xfc",
-+  [0x2112] = "\xa1\xfa", [0x2113] = "\xa1\xfd", [0x2114] = "\x40\x46",
-+  [0x2115] = "\x40\x47", [0x2116] = "\xa8\x49", [0x2117] = "\xa8\x4a",
-+  [0x2118] = "\xa8\x4b", [0x2119] = "\xa8\x4c", [0x211a] = "\x40\x48",
-+  [0x211b] = "\x40\x49", [0x211c] = "\x40\x4a", [0x211d] = "\x40\x4b",
-+  [0x211e] = "\x40\x4c", [0x211f] = "\x40\x4d", [0x2120] = "\x40\x4e",
-+  [0x2121] = "\x40\x4f", [0x2122] = "\x40\x50", [0x2123] = "\x40\x51",
-+  [0x2124] = "\x40\x52", [0x2125] = "\x40\x53", [0x2126] = "\x40\x54",
-+  [0x2127] = "\x40\x55", [0x2128] = "\x40\x56", [0x2129] = "\x40\x57",
-+  [0x212a] = "\x40\x58", [0x212b] = "\x40\x59", [0x212c] = "\x40\x5a",
-+  [0x212d] = "\x40\x5b", [0x212e] = "\x40\x5c", [0x212f] = "\x40\x5d",
-+  [0x2130] = "\x40\x5e", [0x2131] = "\x40\x5f", [0x2132] = "\x40\x60",
-+  [0x2133] = "\x40\x61", [0x2134] = "\x40\x62", [0x2135] = "\x40\x63",
-+  [0x2136] = "\x40\x64", [0x2137] = "\x40\x65", [0x2138] = "\x40\x66",
-+  [0x2139] = "\x40\x67", [0x213a] = "\x40\x68", [0x213b] = "\x40\x69",
-+  [0x213c] = "\x40\x6a", [0x213d] = "\x40\x6b", [0x213e] = "\x40\x6c",
-+  [0x213f] = "\x40\x6d", [0x2140] = "\x40\x6e", [0x2141] = "\x40\x6f",
-+  [0x2142] = "\x40\x70", [0x2143] = "\x40\x71", [0x2144] = "\x40\x72",
-+  [0x2145] = "\x40\x73", [0x2146] = "\x40\x74", [0x2147] = "\x40\x75",
-+  [0x2148] = "\x40\x76", [0x2149] = "\x40\x77", [0x214a] = "\x40\x78",
-+  [0x214b] = "\x40\x79", [0x214c] = "\x40\x7a", [0x214d] = "\x40\x7b",
-+  [0x214e] = "\x40\x7c", [0x214f] = "\x40\x7d", [0x2150] = "\x40\x7e",
-+  [0x2151] = "\x40\x7f", [0x2152] = "\x40\x80", [0x2153] = "\x40\x81",
-+  [0x2154] = "\x40\x82", [0x2155] = "\x40\x83", [0x2156] = "\x40\x84",
-+  [0x2157] = "\x40\x85", [0x2158] = "\x40\x86", [0x2159] = "\x40\x87",
-+  [0x215a] = "\x40\x88", [0x215b] = "\x40\x89", [0x215c] = "\x40\x8a",
-+  [0x215d] = "\x40\x8b", [0x215e] = "\x40\x8c", [0x215f] = "\x40\x8d",
-+  [0x2160] = "\x40\x8e", [0x2161] = "\x40\x8f", [0x2162] = "\x40\x90",
-+  [0x2163] = "\x40\x91", [0x2164] = "\x40\x92", [0x2165] = "\x40\x93",
-+  [0x2166] = "\x40\x94", [0x2167] = "\x40\x95", [0x2168] = "\x40\x96",
-+  [0x2169] = "\x40\x97", [0x216a] = "\x40\x98", [0x216b] = "\x40\x99",
-+  [0x216c] = "\x40\x9a", [0x216d] = "\x40\x9b", [0x216e] = "\x40\x9c",
-+  [0x216f] = "\x40\x9d", [0x2170] = "\x40\x9e", [0x2171] = "\x40\x9f",
-+  [0x2172] = "\x40\xa0", [0x2173] = "\x40\xa1", [0x2174] = "\x40\xa2",
-+  [0x2175] = "\x40\xa3", [0x2176] = "\x40\xa4", [0x2177] = "\x40\xa5",
-+  [0x2178] = "\x40\xa6", [0x2179] = "\x40\xa7", [0x217a] = "\x40\xa8",
-+  [0x217b] = "\x40\xa9", [0x217c] = "\x40\xaa", [0x217d] = "\x40\xab",
-+  [0x217e] = "\x40\xac", [0x217f] = "\x40\xad", [0x2180] = "\x40\xae",
-+  [0x2181] = "\x40\xaf", [0x2182] = "\x40\xb0", [0x2183] = "\x40\xb1",
-+  [0x2184] = "\x40\xb2", [0x2185] = "\x40\xb3", [0x2186] = "\x40\xb4",
-+  [0x2187] = "\x40\xb5", [0x2188] = "\xa1\xca", [0x2189] = "\x40\xb6",
-+  [0x218a] = "\x40\xb7", [0x218b] = "\x40\xb8", [0x218c] = "\x40\xb9",
-+  [0x218d] = "\x40\xba", [0x218e] = "\x40\xbb", [0x218f] = "\xa1\xc7",
-+  [0x2190] = "\x40\xbc", [0x2191] = "\xa1\xc6", [0x2192] = "\x40\xbd",
-+  [0x2193] = "\x40\xbe", [0x2194] = "\x40\xbf", [0x2195] = "\xa8\x4d",
-+  [0x2196] = "\x40\xc0", [0x2197] = "\x40\xc1", [0x2198] = "\x40\xc2",
-+  [0x2199] = "\x40\xc3", [0x219a] = "\xa1\xcc", [0x219b] = "\x40\xc4",
-+  [0x219c] = "\x40\xc5", [0x219d] = "\xa1\xd8", [0x219e] = "\xa1\xde",
-+  [0x219f] = "\xa8\x4e", [0x21a0] = "\xa1\xcf", [0x21a1] = "\x40\xc6",
-+  [0x21a2] = "\x40\xc7", [0x21a3] = "\xa8\x4f", [0x21a4] = "\x40\xc8",
-+  [0x21a5] = "\xa1\xce", [0x21a6] = "\x40\xc9", [0x21a7] = "\xa1\xc4",
-+  [0x21a8] = "\xa1\xc5", [0x21a9] = "\xa1\xc9", [0x21aa] = "\xa1\xc8",
-+  [0x21ab] = "\xa1\xd2", [0x21ac] = "\x40\xca", [0x21ad] = "\x40\xcb",
-+  [0x21ae] = "\xa1\xd3", [0x21af] = "\x40\xcc", [0x21b0] = "\x40\xcd",
-+  [0x21b1] = "\x40\xce", [0x21b2] = "\x40\xcf", [0x21b3] = "\x40\xd0",
-+  [0x21b4] = "\xa1\xe0", [0x21b5] = "\xa1\xdf", [0x21b6] = "\xa1\xc3",
-+  [0x21b7] = "\xa1\xcb", [0x21b8] = "\x40\xd1", [0x21b9] = "\x40\xd2",
-+  [0x21ba] = "\x40\xd3", [0x21bb] = "\x40\xd4", [0x21bc] = "\x40\xd5",
-+  [0x21bd] = "\xa1\xd7", [0x21be] = "\x40\xd6", [0x21bf] = "\x40\xd7",
-+  [0x21c0] = "\x40\xd8", [0x21c1] = "\x40\xd9", [0x21c2] = "\x40\xda",
-+  [0x21c3] = "\x40\xdb", [0x21c4] = "\x40\xdc", [0x21c5] = "\x40\xdd",
-+  [0x21c6] = "\x40\xde", [0x21c7] = "\x40\xdf", [0x21c8] = "\xa1\xd6",
-+  [0x21c9] = "\x40\xe0", [0x21ca] = "\x40\xe1", [0x21cb] = "\x40\xe2",
-+  [0x21cc] = "\xa1\xd5", [0x21cd] = "\x40\xe3", [0x21ce] = "\x40\xe4",
-+  [0x21cf] = "\x40\xe5", [0x21d0] = "\x40\xe6", [0x21d1] = "\x40\xe7",
-+  [0x21d2] = "\xa8\x50", [0x21d3] = "\x40\xe8", [0x21d4] = "\x40\xe9",
-+  [0x21d5] = "\x40\xea", [0x21d6] = "\x40\xeb", [0x21d7] = "\x40\xec",
-+  [0x21d8] = "\x40\xed", [0x21d9] = "\x40\xee", [0x21da] = "\x40\xef",
-+  [0x21db] = "\x40\xf0", [0x21dc] = "\x40\xf1", [0x21dd] = "\x40\xf2",
-+  [0x21de] = "\x40\xf3", [0x21df] = "\x40\xf4", [0x21e0] = "\xa1\xd9",
-+  [0x21e1] = "\xa1\xd4", [0x21e2] = "\x40\xf5", [0x21e3] = "\x40\xf6",
-+  [0x21e4] = "\xa1\xdc", [0x21e5] = "\xa1\xdd", [0x21e6] = "\xa8\x51",
-+  [0x21e7] = "\xa8\x52", [0x21e8] = "\x40\xf7", [0x21e9] = "\x40\xf8",
-+  [0x21ea] = "\x40\xf9", [0x21eb] = "\x40\xfa", [0x21ec] = "\x40\xfb",
-+  [0x21ed] = "\x40\xfc", [0x21ee] = "\xa1\xda", [0x21ef] = "\xa1\xdb",
-+  [0x21f0] = "\x40\xfd", [0x21f1] = "\x40\xfe", [0x21f2] = "\x40\xff",
-+  [0x21f3] = "\x41\x00", [0x21f4] = "\x41\x01", [0x21f5] = "\x41\x02",
-+  [0x21f6] = "\x41\x03", [0x21f7] = "\x41\x04", [0x21f8] = "\x41\x05",
-+  [0x21f9] = "\x41\x06", [0x21fa] = "\x41\x07", [0x21fb] = "\x41\x08",
-+  [0x21fc] = "\x41\x09", [0x21fd] = "\x41\x0a", [0x21fe] = "\x41\x0b",
-+  [0x21ff] = "\x41\x0c", [0x2200] = "\x41\x0d", [0x2201] = "\x41\x0e",
-+  [0x2202] = "\x41\x0f", [0x2203] = "\x41\x10", [0x2204] = "\x41\x11",
-+  [0x2205] = "\x41\x12", [0x2206] = "\x41\x13", [0x2207] = "\x41\x14",
-+  [0x2208] = "\x41\x15", [0x2209] = "\x41\x16", [0x220a] = "\x41\x17",
-+  [0x220b] = "\x41\x18", [0x220c] = "\x41\x19", [0x220d] = "\x41\x1a",
-+  [0x220e] = "\x41\x1b", [0x220f] = "\x41\x1c", [0x2210] = "\x41\x1d",
-+  [0x2211] = "\x41\x1e", [0x2212] = "\x41\x1f", [0x2213] = "\x41\x20",
-+  [0x2214] = "\x41\x21", [0x2215] = "\xa8\x92", [0x2216] = "\x41\x22",
-+  [0x2217] = "\x41\x23", [0x2218] = "\x41\x24", [0x2219] = "\xa1\xd1",
-+  [0x221a] = "\x41\x25", [0x221b] = "\x41\x26", [0x221c] = "\x41\x27",
-+  [0x221d] = "\x41\x28", [0x221e] = "\x41\x29", [0x221f] = "\x41\x2a",
-+  [0x2220] = "\x41\x2b", [0x2221] = "\x41\x2c", [0x2222] = "\x41\x2d",
-+  [0x2223] = "\x41\x2e", [0x2224] = "\x41\x2f", [0x2225] = "\xa1\xcd",
-+  [0x2226] = "\x41\x30", [0x2227] = "\x41\x31", [0x2228] = "\x41\x32",
-+  [0x2229] = "\x41\x33", [0x222a] = "\x41\x34", [0x222b] = "\x41\x35",
-+  [0x222c] = "\x41\x36", [0x222d] = "\x41\x37", [0x222e] = "\x41\x38",
-+  [0x222f] = "\x41\x39", [0x2230] = "\x41\x3a", [0x2231] = "\x41\x3b",
-+  [0x2232] = "\x41\x3c", [0x2233] = "\x41\x3d", [0x2234] = "\x41\x3e",
-+  [0x2235] = "\x41\x3f", [0x2236] = "\x41\x40", [0x2237] = "\x41\x41",
-+  [0x2238] = "\x41\x42", [0x2239] = "\x41\x43", [0x223a] = "\x41\x44",
-+  [0x223b] = "\x41\x45", [0x223c] = "\x41\x46", [0x223d] = "\x41\x47",
-+  [0x223e] = "\x41\x48", [0x223f] = "\xa8\x53", [0x2240] = "\x41\x49",
-+  [0x2241] = "\x41\x4a", [0x2242] = "\x41\x4b", [0x2243] = "\x41\x4c",
-+  [0x2244] = "\x41\x4d", [0x2245] = "\x41\x4e", [0x2246] = "\x41\x4f",
-+  [0x2247] = "\x41\x50", [0x2248] = "\x41\x51", [0x2249] = "\x41\x52",
-+  [0x224a] = "\x41\x53", [0x224b] = "\x41\x54", [0x224c] = "\x41\x55",
-+  [0x224d] = "\x41\x56", [0x224e] = "\x41\x57", [0x224f] = "\x41\x58",
-+  [0x2250] = "\x41\x59", [0x2251] = "\x41\x5a", [0x2252] = "\x41\x5b",
-+  [0x2253] = "\x41\x5c", [0x2254] = "\x41\x5d", [0x2255] = "\x41\x5e",
-+  [0x2256] = "\x41\x5f", [0x2257] = "\x41\x60", [0x2258] = "\x41\x61",
-+  [0x2259] = "\x41\x62", [0x225a] = "\x41\x63", [0x225b] = "\x41\x64",
-+  [0x225c] = "\x41\x65", [0x225d] = "\x41\x66", [0x225e] = "\x41\x67",
-+  [0x225f] = "\x41\x68", [0x2260] = "\x41\x69", [0x2261] = "\x41\x6a",
-+  [0x2262] = "\x41\x6b", [0x2263] = "\x41\x6c", [0x2264] = "\x41\x6d",
-+  [0x2265] = "\x41\x6e", [0x2266] = "\x41\x6f", [0x2267] = "\x41\x70",
-+  [0x2268] = "\x41\x71", [0x2269] = "\x41\x72", [0x226a] = "\x41\x73",
-+  [0x226b] = "\x41\x74", [0x226c] = "\x41\x75", [0x226d] = "\x41\x76",
-+  [0x226e] = "\x41\x77", [0x226f] = "\x41\x78", [0x2270] = "\x41\x79",
-+  [0x2271] = "\x41\x7a", [0x2272] = "\x41\x7b", [0x2273] = "\x41\x7c",
-+  [0x2274] = "\x41\x7d", [0x2275] = "\x41\x7e", [0x2276] = "\x41\x7f",
-+  [0x2277] = "\x41\x80", [0x2278] = "\x41\x81", [0x2279] = "\x41\x82",
-+  [0x227a] = "\x41\x83", [0x227b] = "\x41\x84", [0x227c] = "\x41\x85",
-+  [0x227d] = "\x41\x86", [0x227e] = "\x41\x87", [0x227f] = "\x41\x88",
-+  [0x2280] = "\x41\x89", [0x2281] = "\x41\x8a", [0x2282] = "\x41\x8b",
-+  [0x2283] = "\x41\x8c", [0x2284] = "\x41\x8d", [0x2285] = "\x41\x8e",
-+  [0x2286] = "\x41\x8f", [0x2287] = "\x41\x90", [0x2288] = "\x41\x91",
-+  [0x2289] = "\x41\x92", [0x228a] = "\x41\x93", [0x228b] = "\x41\x94",
-+  [0x228c] = "\x41\x95", [0x228d] = "\x41\x96", [0x228e] = "\x41\x97",
-+  [0x228f] = "\x41\x98", [0x2290] = "\x41\x99", [0x2291] = "\x41\x9a",
-+  [0x2292] = "\xa1\xd0", [0x2293] = "\x41\x9b", [0x2294] = "\x41\x9c",
-+  [0x2295] = "\x41\x9d", [0x2296] = "\x41\x9e", [0x2297] = "\x41\x9f",
-+  [0x2298] = "\x41\xa0", [0x2299] = "\x41\xa1", [0x229a] = "\x41\xa2",
-+  [0x229b] = "\x41\xa3", [0x229c] = "\x41\xa4", [0x229d] = "\x41\xa5",
-+  [0x229e] = "\x41\xa6", [0x229f] = "\x41\xa7", [0x22a0] = "\x41\xa8",
-+  [0x22a1] = "\x41\xa9", [0x22a2] = "\x41\xaa", [0x22a3] = "\x41\xab",
-+  [0x22a4] = "\x41\xac", [0x22a5] = "\x41\xad", [0x22a6] = "\x41\xae",
-+  [0x22a7] = "\x41\xaf", [0x22a8] = "\x41\xb0", [0x22a9] = "\x41\xb1",
-+  [0x22aa] = "\x41\xb2", [0x22ab] = "\x41\xb3", [0x22ac] = "\x41\xb4",
-+  [0x22ad] = "\x41\xb5", [0x22ae] = "\x41\xb6", [0x22af] = "\x41\xb7",
-+  [0x22b0] = "\x41\xb8", [0x22b1] = "\x41\xb9", [0x22b2] = "\x41\xba",
-+  [0x22b3] = "\x41\xbb", [0x22b4] = "\x41\xbc", [0x22b5] = "\x41\xbd",
-+  [0x22b6] = "\x41\xbe", [0x22b7] = "\x41\xbf", [0x22b8] = "\x41\xc0",
-+  [0x22b9] = "\x41\xc1", [0x22ba] = "\x41\xc2", [0x22bb] = "\x41\xc3",
-+  [0x22bc] = "\x41\xc4", [0x22bd] = "\x41\xc5", [0x22be] = "\x41\xc6",
-+  [0x22bf] = "\x41\xc7", [0x22c0] = "\x41\xc8", [0x22c1] = "\x41\xc9",
-+  [0x22c2] = "\x41\xca", [0x22c3] = "\x41\xcb", [0x22c4] = "\x41\xcc",
-+  [0x22c5] = "\x41\xcd", [0x22c6] = "\x41\xce", [0x22c7] = "\x41\xcf",
-+  [0x22c8] = "\x41\xd0", [0x22c9] = "\x41\xd1", [0x22ca] = "\x41\xd2",
-+  [0x22cb] = "\x41\xd3", [0x22cc] = "\x41\xd4", [0x22cd] = "\x41\xd5",
-+  [0x22ce] = "\x41\xd6", [0x22cf] = "\x41\xd7", [0x22d0] = "\x41\xd8",
-+  [0x22d1] = "\x41\xd9", [0x22d2] = "\x41\xda", [0x22d3] = "\x41\xdb",
-+  [0x22d4] = "\x41\xdc", [0x22d5] = "\x41\xdd", [0x22d6] = "\x41\xde",
-+  [0x22d7] = "\x41\xdf", [0x22d8] = "\x41\xe0", [0x22d9] = "\x41\xe1",
-+  [0x22da] = "\x41\xe2", [0x22db] = "\x41\xe3", [0x22dc] = "\x41\xe4",
-+  [0x22dd] = "\x41\xe5", [0x22de] = "\x41\xe6", [0x22df] = "\x41\xe7",
-+  [0x22e0] = "\x41\xe8", [0x22e1] = "\x41\xe9", [0x22e2] = "\x41\xea",
-+  [0x22e3] = "\x41\xeb", [0x22e4] = "\x41\xec", [0x22e5] = "\x41\xed",
-+  [0x22e6] = "\x41\xee", [0x22e7] = "\x41\xef", [0x22e8] = "\x41\xf0",
-+  [0x22e9] = "\x41\xf1", [0x22ea] = "\x41\xf2", [0x22eb] = "\x41\xf3",
-+  [0x22ec] = "\x41\xf4", [0x22ed] = "\x41\xf5", [0x22ee] = "\x41\xf6",
-+  [0x22ef] = "\x41\xf7", [0x22f0] = "\x41\xf8", [0x22f1] = "\x41\xf9",
-+  [0x22f2] = "\x41\xfa", [0x22f3] = "\x41\xfb", [0x22f4] = "\x41\xfc",
-+  [0x22f5] = "\x41\xfd", [0x22f6] = "\x41\xfe", [0x22f7] = "\x41\xff",
-+  [0x22f8] = "\x42\x00", [0x22f9] = "\x42\x01", [0x22fa] = "\x42\x02",
-+  [0x22fb] = "\x42\x03", [0x22fc] = "\x42\x04", [0x22fd] = "\x42\x05",
-+  [0x22fe] = "\x42\x06", [0x22ff] = "\x42\x07", [0x2300] = "\x42\x08",
-+  [0x2301] = "\x42\x09", [0x2302] = "\x42\x0a", [0x2303] = "\x42\x0b",
-+  [0x2304] = "\x42\x0c", [0x2305] = "\x42\x0d", [0x2306] = "\x42\x0e",
-+  [0x2307] = "\x42\x0f", [0x2308] = "\x42\x10", [0x2309] = "\x42\x11",
-+  [0x230a] = "\x42\x12", [0x230b] = "\x42\x13", [0x230c] = "\x42\x14",
-+  [0x230d] = "\x42\x15", [0x230e] = "\x42\x16", [0x230f] = "\x42\x17",
-+  [0x2310] = "\x42\x18", [0x2311] = "\x42\x19", [0x2312] = "\x42\x1a",
-+  [0x2313] = "\x42\x1b", [0x2314] = "\x42\x1c", [0x2315] = "\x42\x1d",
-+  [0x2316] = "\x42\x1e", [0x2317] = "\x42\x1f", [0x2318] = "\x42\x20",
-+  [0x2319] = "\x42\x21", [0x231a] = "\x42\x22", [0x231b] = "\x42\x23",
-+  [0x231c] = "\x42\x24", [0x231d] = "\x42\x25", [0x231e] = "\x42\x26",
-+  [0x231f] = "\x42\x27", [0x2320] = "\x42\x28", [0x2321] = "\x42\x29",
-+  [0x2322] = "\x42\x2a", [0x2323] = "\x42\x2b", [0x2324] = "\x42\x2c",
-+  [0x2325] = "\x42\x2d", [0x2326] = "\x42\x2e", [0x2327] = "\x42\x2f",
-+  [0x2328] = "\x42\x30", [0x2329] = "\x42\x31", [0x232a] = "\x42\x32",
-+  [0x232b] = "\x42\x33", [0x232c] = "\x42\x34", [0x232d] = "\x42\x35",
-+  [0x232e] = "\x42\x36", [0x232f] = "\x42\x37", [0x2330] = "\x42\x38",
-+  [0x2331] = "\x42\x39", [0x2332] = "\x42\x3a", [0x2333] = "\x42\x3b",
-+  [0x2334] = "\x42\x3c", [0x2335] = "\x42\x3d", [0x2336] = "\x42\x3e",
-+  [0x2337] = "\x42\x3f", [0x2338] = "\x42\x40", [0x2339] = "\x42\x41",
-+  [0x233a] = "\x42\x42", [0x233b] = "\x42\x43", [0x233c] = "\x42\x44",
-+  [0x233d] = "\x42\x45", [0x233e] = "\x42\x46", [0x233f] = "\x42\x47",
-+  [0x2340] = "\x42\x48", [0x2341] = "\x42\x49", [0x2342] = "\x42\x4a",
-+  [0x2343] = "\x42\x4b", [0x2344] = "\x42\x4c", [0x2345] = "\x42\x4d",
-+  [0x2346] = "\x42\x4e", [0x2347] = "\x42\x4f", [0x2348] = "\x42\x50",
-+  [0x2349] = "\x42\x51", [0x234a] = "\x42\x52", [0x234b] = "\x42\x53",
-+  [0x234c] = "\x42\x54", [0x234d] = "\x42\x55", [0x234e] = "\x42\x56",
-+  [0x234f] = "\x42\x57", [0x2350] = "\x42\x58", [0x2351] = "\x42\x59",
-+  [0x2352] = "\x42\x5a", [0x2353] = "\x42\x5b", [0x2354] = "\x42\x5c",
-+  [0x2355] = "\x42\x5d", [0x2356] = "\x42\x5e", [0x2357] = "\x42\x5f",
-+  [0x2358] = "\x42\x60", [0x2359] = "\x42\x61", [0x235a] = "\x42\x62",
-+  [0x235b] = "\x42\x63", [0x235c] = "\x42\x64", [0x235d] = "\x42\x65",
-+  [0x235e] = "\x42\x66", [0x235f] = "\x42\x67", [0x2360] = "\x42\x68",
-+  [0x2361] = "\x42\x69", [0x2362] = "\x42\x6a", [0x2363] = "\x42\x6b",
-+  [0x2364] = "\x42\x6c", [0x2365] = "\x42\x6d", [0x2366] = "\x42\x6e",
-+  [0x2367] = "\x42\x6f", [0x2368] = "\x42\x70", [0x2369] = "\x42\x71",
-+  [0x236a] = "\x42\x72", [0x236b] = "\x42\x73", [0x236c] = "\x42\x74",
-+  [0x236d] = "\x42\x75", [0x236e] = "\x42\x76", [0x236f] = "\x42\x77",
-+  [0x2370] = "\x42\x78", [0x2371] = "\x42\x79", [0x2372] = "\x42\x7a",
-+  [0x2373] = "\x42\x7b", [0x2374] = "\x42\x7c", [0x2375] = "\x42\x7d",
-+  [0x2376] = "\x42\x7e", [0x2377] = "\x42\x7f", [0x2378] = "\x42\x80",
-+  [0x2379] = "\x42\x81", [0x237a] = "\x42\x82", [0x237b] = "\x42\x83",
-+  [0x237c] = "\x42\x84", [0x237d] = "\x42\x85", [0x237e] = "\x42\x86",
-+  [0x237f] = "\x42\x87", [0x2380] = "\x42\x88", [0x2381] = "\x42\x89",
-+  [0x2382] = "\x42\x8a", [0x2383] = "\x42\x8b", [0x2384] = "\x42\x8c",
-+  [0x2385] = "\x42\x8d", [0x2386] = "\x42\x8e", [0x2387] = "\x42\x8f",
-+  [0x2388] = "\x42\x90", [0x2389] = "\x42\x91", [0x238a] = "\x42\x92",
-+  [0x238b] = "\x42\x93", [0x238c] = "\x42\x94", [0x238d] = "\x42\x95",
-+  [0x238e] = "\x42\x96", [0x238f] = "\x42\x97", [0x2390] = "\x42\x98",
-+  [0x2391] = "\x42\x99", [0x2392] = "\x42\x9a", [0x2393] = "\x42\x9b",
-+  [0x2394] = "\x42\x9c", [0x2395] = "\x42\x9d", [0x2396] = "\x42\x9e",
-+  [0x2397] = "\x42\x9f", [0x2398] = "\x42\xa0", [0x2399] = "\x42\xa1",
-+  [0x239a] = "\x42\xa2", [0x239b] = "\x42\xa3", [0x239c] = "\x42\xa4",
-+  [0x239d] = "\x42\xa5", [0x239e] = "\x42\xa6", [0x239f] = "\x42\xa7",
-+  [0x23a0] = "\x42\xa8", [0x23a1] = "\x42\xa9", [0x23a2] = "\x42\xaa",
-+  [0x23a3] = "\x42\xab", [0x23a4] = "\x42\xac", [0x23a5] = "\x42\xad",
-+  [0x23a6] = "\x42\xae", [0x23a7] = "\x42\xaf", [0x23a8] = "\x42\xb0",
-+  [0x23a9] = "\x42\xb1", [0x23aa] = "\x42\xb2", [0x23ab] = "\x42\xb3",
-+  [0x23ac] = "\x42\xb4", [0x23ad] = "\x42\xb5", [0x23ae] = "\x42\xb6",
-+  [0x23af] = "\x42\xb7", [0x23b0] = "\x42\xb8", [0x23b1] = "\x42\xb9",
-+  [0x23b2] = "\x42\xba", [0x23b3] = "\x42\xbb", [0x23b4] = "\x42\xbc",
-+  [0x23b5] = "\x42\xbd", [0x23b6] = "\x42\xbe", [0x23b7] = "\x42\xbf",
-+  [0x23b8] = "\x42\xc0", [0x23b9] = "\x42\xc1", [0x23ba] = "\x42\xc2",
-+  [0x23bb] = "\x42\xc3", [0x23bc] = "\x42\xc4", [0x23bd] = "\x42\xc5",
-+  [0x23be] = "\x42\xc6", [0x23bf] = "\x42\xc7", [0x23c0] = "\x42\xc8",
-   [0x23c1] = "\x42\xc9", [0x23c2] = "\x42\xca", [0x23c3] = "\x42\xcb",
-   [0x23c4] = "\x42\xcc", [0x23c5] = "\x42\xcd", [0x23c6] = "\x42\xce",
-   [0x23c7] = "\x42\xcf", [0x23c8] = "\x42\xd0", [0x23c9] = "\x42\xd1",
--  [0x23ca] = "\x42\xd2", [0x23e0] = "\xa2\xd9", [0x23e1] = "\xa2\xda",
-+  [0x23ca] = "\x42\xd2", [0x23cb] = "\x42\xd3", [0x23cc] = "\x42\xd4",
-+  [0x23cd] = "\x42\xd5", [0x23ce] = "\x42\xd6", [0x23cf] = "\x42\xd7",
-+  [0x23d0] = "\x42\xd8", [0x23d1] = "\x42\xd9", [0x23d2] = "\x42\xda",
-+  [0x23d3] = "\x42\xdb", [0x23d4] = "\x42\xdc", [0x23d5] = "\x42\xdd",
-+  [0x23d6] = "\x42\xde", [0x23d7] = "\x42\xdf", [0x23d8] = "\x42\xe0",
-+  [0x23d9] = "\x42\xe1", [0x23da] = "\x42\xe2", [0x23db] = "\x42\xe3",
-+  [0x23dc] = "\x42\xe4", [0x23dd] = "\x42\xe5", [0x23de] = "\x42\xe6",
-+  [0x23df] = "\x42\xe7", [0x23e0] = "\xa2\xd9", [0x23e1] = "\xa2\xda",
-   [0x23e2] = "\xa2\xdb", [0x23e3] = "\xa2\xdc", [0x23e4] = "\xa2\xdd",
-   [0x23e5] = "\xa2\xde", [0x23e6] = "\xa2\xdf", [0x23e7] = "\xa2\xe0",
-   [0x23e8] = "\xa2\xe1", [0x23e9] = "\xa2\xe2", [0x23ea] = "\x42\xe8",
-@@ -8629,141 +12378,859 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x25b9] = "\x43\xfb", [0x25ba] = "\x43\xfc", [0x25bb] = "\x43\xfd",
-   [0x25bc] = "\x43\xfe", [0x25bd] = "\x43\xff", [0x25be] = "\x44\x00",
-   [0x25bf] = "\x44\x01", [0x25c0] = "\xa1\xe2", [0x25c1] = "\x44\x02",
--  [0x25c2] = "\xa1\xe1", [0x2e01] = "\xfe\x50", [0x2e02] = "\x4c\x41",
--  [0x2e03] = "\x4c\x42", [0x2e04] = "\xfe\x54", [0x2e05] = "\x4c\x43",
--  [0x2e06] = "\x4c\x44", [0x2e07] = "\x4c\x45", [0x2e08] = "\xfe\x57",
--  [0x2e09] = "\x4c\x46", [0x2e0a] = "\x4c\x47", [0x2e0b] = "\xfe\x58",
--  [0x2e0c] = "\xfe\x5d", [0x2e0d] = "\x4c\x48", [0x2e0e] = "\x4c\x49",
--  [0x2e0f] = "\x4c\x4a", [0x2e10] = "\x4c\x4b", [0x2e11] = "\x4c\x4c",
--  [0x2e12] = "\x4c\x4d", [0x2e13] = "\x4c\x4e", [0x2e14] = "\x4c\x4f",
--  [0x2e15] = "\x4c\x50", [0x2e16] = "\x4c\x51", [0x2e17] = "\xfe\x5e",
--  [0x2e18] = "\x4c\x52", [0x2e19] = "\x4c\x53", [0x2e1b] = "\x4c\x55",
--  [0x2e1c] = "\x4c\x56", [0x2e1d] = "\x4c\x57", [0x2e1e] = "\x4c\x58",
--  [0x2e1f] = "\x4c\x59", [0x2e20] = "\x4c\x5a", [0x2e21] = "\x4c\x5b",
--  [0x2e22] = "\x4c\x5c", [0x2e23] = "\x4c\x5d", [0x2e24] = "\x4c\x5e",
--  [0x2e25] = "\x4c\x5f", [0x2e26] = "\x4c\x60", [0x2e27] = "\xfe\x6b",
--  [0x2e28] = "\x4c\x61", [0x2e29] = "\x4c\x62", [0x2e2a] = "\xfe\x6e",
--  [0x2e2b] = "\x4c\x63", [0x2e2c] = "\x4c\x64", [0x2e2d] = "\x4c\x65",
--  [0x2e2e] = "\xfe\x71", [0x2e2f] = "\x4c\x66", [0x2e30] = "\x4c\x67",
--  [0x2e31] = "\x4c\x68", [0x2e32] = "\x4c\x69", [0x2e33] = "\xfe\x73",
--  [0x2e34] = "\x4c\x6a", [0x2e35] = "\x4c\x6b", [0x2e36] = "\xfe\x74",
--  [0x2e37] = "\xfe\x75", [0x2e38] = "\x4c\x6c", [0x2e39] = "\x4c\x6d",
--  [0x2e3a] = "\x4c\x6e", [0x2e3b] = "\xfe\x79", [0x2e3c] = "\x4c\x6f",
--  [0x2e3d] = "\x4c\x70", [0x2e3e] = "\x4c\x71", [0x2e3f] = "\x4c\x72",
--  [0x2e40] = "\x4c\x73", [0x2e41] = "\x4c\x74", [0x2e42] = "\x4c\x75",
--  [0x2e43] = "\x4c\x76", [0x2e44] = "\x4c\x77", [0x2e45] = "\x4c\x78",
--  [0x2e46] = "\x4c\x79", [0x2e47] = "\x4c\x7a", [0x2e48] = "\x4c\x7b",
--  [0x2e49] = "\x4c\x7c", [0x2e4a] = "\xfe\x84", [0x2e4b] = "\x4c\x7d",
--  [0x2e4c] = "\x4c\x7e", [0x2e4d] = "\x4c\x7f", [0x2e4e] = "\x4c\x80",
--  [0x2e4f] = "\x4c\x81", [0x2e50] = "\x4c\x82", [0x2e51] = "\x4c\x83",
--  [0x2e52] = "\x4c\x84", [0x2e53] = "\x4c\x85", [0x2e54] = "\x4c\x86",
--  [0x2e55] = "\x4c\x87", [0x2e56] = "\x4c\x88", [0x2e57] = "\x4c\x89",
--  [0x2e58] = "\x4c\x8a", [0x2e59] = "\x4c\x8b", [0x2e5a] = "\x4c\x8c",
--  [0x2e5b] = "\x4c\x8d", [0x2e5c] = "\x4c\x8e", [0x2e5d] = "\x4c\x8f",
--  [0x2e5e] = "\x4c\x90", [0x2e5f] = "\x4c\x91", [0x2e60] = "\x4c\x92",
--  [0x2e61] = "\x4c\x93", [0x2e62] = "\x4c\x94", [0x2e63] = "\x4c\x95",
--  [0x2e64] = "\x4c\x96", [0x2e65] = "\x4c\x97", [0x2e66] = "\x4c\x98",
--  [0x2e67] = "\x4c\x99", [0x2e68] = "\x4c\x9a", [0x2e69] = "\x4c\x9b",
--  [0x2e6a] = "\x4c\x9c", [0x2e6b] = "\x4c\x9d", [0x2e6c] = "\x4c\x9e",
--  [0x2e6d] = "\x4c\x9f", [0x2e6e] = "\x4c\xa0", [0x2e6f] = "\x4c\xa1",
--  [0x2e70] = "\x4c\xa2", [0x2e71] = "\x4c\xa3", [0x2e72] = "\x4c\xa4",
--  [0x2e73] = "\x4c\xa5", [0x2e80] = "\x4c\xb2", [0x2e81] = "\x4c\xb3",
--  [0x2e82] = "\x4c\xb4", [0x2e83] = "\x4c\xb5", [0x2e84] = "\x4c\xb6",
--  [0x2e85] = "\x4c\xb7", [0x2e86] = "\x4c\xb8", [0x2e87] = "\x4c\xb9",
--  [0x2e88] = "\x4c\xba", [0x2e89] = "\x4c\xbb", [0x2e8a] = "\x4c\xbc",
--  [0x2e8b] = "\x4c\xbd", [0x2e8c] = "\x4c\xbe", [0x2e8d] = "\x4c\xbf",
--  [0x2e8e] = "\x4c\xc0", [0x2e8f] = "\x4c\xc1", [0x2e90] = "\x4c\xc2",
--  [0x2e91] = "\x4c\xc3", [0x2e92] = "\x4c\xc4", [0x2e93] = "\x4c\xc5",
--  [0x2e94] = "\x4c\xc6", [0x2e95] = "\x4c\xc7", [0x2e96] = "\x4c\xc8",
--  [0x2e97] = "\x4c\xc9", [0x2e98] = "\x4c\xca", [0x2e99] = "\x4c\xcb",
--  [0x2e9a] = "\x4c\xcc", [0x2e9b] = "\x4c\xcd", [0x2e9c] = "\x4c\xce",
--  [0x2e9d] = "\x4c\xcf", [0x2e9e] = "\x4c\xd0", [0x2e9f] = "\x4c\xd1",
--  [0x2ea0] = "\x4c\xd2", [0x2ea1] = "\x4c\xd3", [0x2ea2] = "\x4c\xd4",
--  [0x2ea3] = "\x4c\xd5", [0x2ea4] = "\x4c\xd6", [0x2ea5] = "\x4c\xd7",
--  [0x2ea6] = "\x4c\xd8", [0x2ea7] = "\x4c\xd9", [0x2ea8] = "\x4c\xda",
--  [0x2ea9] = "\x4c\xdb", [0x2eaa] = "\x4c\xdc", [0x2eab] = "\x4c\xdd",
--  [0x2eac] = "\x4c\xde", [0x2ead] = "\x4c\xdf", [0x2eae] = "\x4c\xe0",
--  [0x2eaf] = "\x4c\xe1", [0x2eb0] = "\x4c\xe2", [0x2eb1] = "\x4c\xe3",
--  [0x2eb2] = "\x4c\xe4", [0x2eb3] = "\x4c\xe5", [0x2eb4] = "\x4c\xe6",
--  [0x2eb5] = "\x4c\xe7", [0x2eb6] = "\x4c\xe8", [0x2eb7] = "\x4c\xe9",
--  [0x2eb8] = "\x4c\xea", [0x2eb9] = "\x4c\xeb", [0x2eba] = "\x4c\xec",
--  [0x2ebb] = "\x4c\xed", [0x2ebc] = "\x4c\xee", [0x2ebd] = "\x4c\xef",
--  [0x2ebe] = "\x4c\xf0", [0x2ebf] = "\x4c\xf1", [0x2ec0] = "\x4c\xf2",
--  [0x2ec1] = "\x4c\xf3", [0x2ec2] = "\x4c\xf4", [0x2ec3] = "\x4c\xf5",
--  [0x2ec4] = "\x4c\xf6", [0x2ec5] = "\x4c\xf7", [0x2ec6] = "\x4c\xf8",
--  [0x2ec7] = "\x4c\xf9", [0x2ec8] = "\x4c\xfa", [0x2ec9] = "\x4c\xfb",
--  [0x2eca] = "\x4c\xfc", [0x2ecb] = "\x4c\xfd", [0x2ecc] = "\x4c\xfe",
--  [0x2ecd] = "\x4c\xff", [0x2ece] = "\x4d\x00", [0x2ecf] = "\x4d\x01",
--  [0x2ed0] = "\x4d\x02", [0x2ed1] = "\x4d\x03", [0x2ed2] = "\x4d\x04",
--  [0x2ed3] = "\x4d\x05", [0x2ed4] = "\x4d\x06", [0x2ed5] = "\x4d\x07",
--  [0x2ed6] = "\x4d\x08", [0x2ed7] = "\x4d\x09", [0x2ed8] = "\x4d\x0a",
--  [0x2ed9] = "\x4d\x0b", [0x2eda] = "\x4d\x0c", [0x2edb] = "\x4d\x0d",
--  [0x2edc] = "\x4d\x0e", [0x2edd] = "\x4d\x0f", [0x2ede] = "\x4d\x10",
--  [0x2edf] = "\x4d\x11", [0x2ee0] = "\x4d\x12", [0x2ee1] = "\x4d\x13",
--  [0x2ee2] = "\x4d\x14", [0x2ee3] = "\x4d\x15", [0x2ee4] = "\x4d\x16",
--  [0x2ee5] = "\x4d\x17", [0x2ee6] = "\x4d\x18", [0x2ee7] = "\x4d\x19",
--  [0x2ee8] = "\x4d\x1a", [0x2ee9] = "\x4d\x1b", [0x2eea] = "\x4d\x1c",
--  [0x2eeb] = "\x4d\x1d", [0x2eec] = "\x4d\x1e", [0x2eed] = "\x4d\x1f",
--  [0x2eee] = "\x4d\x20", [0x2eef] = "\x4d\x21", [0x2ef0] = "\x4d\x22",
--  [0x2ef1] = "\x4d\x23", [0x2ef2] = "\x4d\x24", [0x2ef3] = "\x4d\x25",
--  [0x2ef4] = "\x4d\x26", [0x2ef5] = "\x4d\x27", [0x2ef6] = "\x4d\x28",
--  [0x2ef7] = "\x4d\x29", [0x2ef8] = "\x4d\x2a", [0x2ef9] = "\x4d\x2b",
--  [0x2efa] = "\x4d\x2c", [0x2efb] = "\x4d\x2d", [0x2efc] = "\x4d\x2e",
--  [0x2efd] = "\x4d\x2f", [0x2efe] = "\x4d\x30", [0x2eff] = "\x4d\x31",
--  [0x2f00] = "\x4d\x32", [0x2f01] = "\x4d\x33", [0x2f02] = "\x4d\x34",
--  [0x2f03] = "\x4d\x35", [0x2f04] = "\x4d\x36", [0x2f05] = "\x4d\x37",
--  [0x2f06] = "\x4d\x38", [0x2f07] = "\x4d\x39", [0x2f08] = "\x4d\x3a",
--  [0x2f09] = "\x4d\x3b", [0x2f0a] = "\x4d\x3c", [0x2f0b] = "\x4d\x3d",
--  [0x2f0c] = "\x4d\x3e", [0x2f0d] = "\x4d\x3f", [0x2f0e] = "\x4d\x40",
--  [0x2f0f] = "\x4d\x41", [0x2f10] = "\x4d\x42", [0x2f11] = "\x4d\x43",
--  [0x2f12] = "\x4d\x44", [0x2f13] = "\x4d\x45", [0x2f14] = "\x4d\x46",
--  [0x2f15] = "\x4d\x47", [0x2f16] = "\x4d\x48", [0x2f17] = "\x4d\x49",
--  [0x2f18] = "\x4d\x4a", [0x2f19] = "\x4d\x4b", [0x2f1a] = "\x4d\x4c",
--  [0x2f1b] = "\x4d\x4d", [0x2f1c] = "\x4d\x4e", [0x2f1d] = "\x4d\x4f",
--  [0x2f1e] = "\x4d\x50", [0x2f1f] = "\x4d\x51", [0x2f20] = "\x4d\x52",
--  [0x2f21] = "\x4d\x53", [0x2f22] = "\x4d\x54", [0x2f23] = "\x4d\x55",
--  [0x2f24] = "\x4d\x56", [0x2f25] = "\x4d\x57", [0x2f26] = "\x4d\x58",
--  [0x2f27] = "\x4d\x59", [0x2f28] = "\x4d\x5a", [0x2f29] = "\x4d\x5b",
--  [0x2f2a] = "\x4d\x5c", [0x2f2b] = "\x4d\x5d", [0x2f2c] = "\x4d\x5e",
--  [0x2f2d] = "\x4d\x5f", [0x2f2e] = "\x4d\x60", [0x2f2f] = "\x4d\x61",
--  [0x2f30] = "\x4d\x62", [0x2f31] = "\x4d\x63", [0x2f32] = "\x4d\x64",
--  [0x2f33] = "\x4d\x65", [0x2f34] = "\x4d\x66", [0x2f35] = "\x4d\x67",
--  [0x2f36] = "\x4d\x68", [0x2f37] = "\x4d\x69", [0x2f38] = "\x4d\x6a",
--  [0x2f39] = "\x4d\x6b", [0x2f3a] = "\x4d\x6c", [0x2f3b] = "\x4d\x6d",
--  [0x2f3c] = "\x4d\x6e", [0x2f3d] = "\x4d\x6f", [0x2f3e] = "\x4d\x70",
--  [0x2f3f] = "\x4d\x71", [0x2f40] = "\x4d\x72", [0x2f41] = "\x4d\x73",
--  [0x2f42] = "\x4d\x74", [0x2f43] = "\x4d\x75", [0x2f44] = "\x4d\x76",
--  [0x2f45] = "\x4d\x77", [0x2f46] = "\x4d\x78", [0x2f47] = "\x4d\x79",
--  [0x2f48] = "\x4d\x7a", [0x2f49] = "\x4d\x7b", [0x2f4a] = "\x4d\x7c",
--  [0x2f4b] = "\x4d\x7d", [0x2f4c] = "\x4d\x7e", [0x2f4d] = "\x4d\x7f",
--  [0x2f4e] = "\x4d\x80", [0x2f4f] = "\x4d\x81", [0x2f50] = "\x4d\x82",
--  [0x2f51] = "\x4d\x83", [0x2f52] = "\x4d\x84", [0x2f53] = "\x4d\x85",
--  [0x2f54] = "\x4d\x86", [0x2f55] = "\x4d\x87", [0x2f70] = "\xa9\x8a",
--  [0x2f71] = "\xa9\x8b", [0x2f72] = "\xa9\x8c", [0x2f73] = "\xa9\x8d",
--  [0x2f74] = "\xa9\x8e", [0x2f75] = "\xa9\x8f", [0x2f76] = "\xa9\x90",
--  [0x2f77] = "\xa9\x91", [0x2f78] = "\xa9\x92", [0x2f79] = "\xa9\x93",
--  [0x2f7a] = "\xa9\x94", [0x2f7b] = "\xa9\x95", [0x2f80] = "\xa1\xa1",
--  [0x2f81] = "\xa1\xa2", [0x2f82] = "\xa1\xa3", [0x2f83] = "\xa1\xa8",
--  [0x2f84] = "\x4d\xa6", [0x2f85] = "\xa1\xa9", [0x2f86] = "\xa9\x65",
--  [0x2f87] = "\xa9\x96", [0x2f88] = "\xa1\xb4", [0x2f89] = "\xa1\xb5",
--  [0x2f8a] = "\xa1\xb6", [0x2f8b] = "\xa1\xb7", [0x2f8c] = "\xa1\xb8",
--  [0x2f8d] = "\xa1\xb9", [0x2f8e] = "\xa1\xba", [0x2f8f] = "\xa1\xbb",
--  [0x2f90] = "\xa1\xbe", [0x2f91] = "\xa1\xbf", [0x2f92] = "\xa8\x93",
--  [0x2f93] = "\xa1\xfe", [0x2f94] = "\xa1\xb2", [0x2f95] = "\xa1\xb3",
--  [0x2f96] = "\xa1\xbc", [0x2f97] = "\xa1\xbd", [0x2f98] = "\x4d\xa7",
--  [0x2f99] = "\x4d\xa8", [0x2f9a] = "\x4d\xa9", [0x2f9b] = "\x4d\xaa",
--  [0x2f9c] = "\x4d\xab", [0x2f9d] = "\xa8\x94", [0x2f9e] = "\xa8\x95",
--  [0x2f9f] = "\x4d\xac", [0x2fa0] = "\x4d\xad", [0x2fa1] = "\xa9\x40",
--  [0x2fa2] = "\xa9\x41", [0x2fa3] = "\xa9\x42", [0x2fa4] = "\xa9\x43",
--  [0x2fa5] = "\xa9\x44", [0x2fa6] = "\xa9\x45", [0x2fa7] = "\xa9\x46",
--  [0x2fa8] = "\xa9\x47", [0x2fa9] = "\xa9\x48", [0x2faa] = "\x4d\xae",
--  [0x2fab] = "\x4d\xaf", [0x2fac] = "\x4d\xb0", [0x2fad] = "\x4d\xb1",
--  [0x2fae] = "\x4d\xb2", [0x2faf] = "\x4d\xb3", [0x2fb0] = "\x4d\xb4",
--  [0x2fb1] = "\x4d\xb5", [0x2fb2] = "\x4d\xb6", [0x2fb3] = "\x4d\xb7",
--  [0x2fb4] = "\x4d\xb8", [0x2fb5] = "\x4d\xb9", [0x2fb6] = "\x4d\xba",
--  [0x2fb7] = "\x4d\xbb", [0x2fb8] = "\x4d\xbc", [0x2fb9] = "\x4d\xbd",
--  [0x2fba] = "\x4d\xbe", [0x2fbb] = "\x4d\xbf", [0x2fbc] = "\x4d\xc0",
--  [0x2fbd] = "\x4d\xc1", [0x2fbe] = "\xa9\x89", [0x2fbf] = "\x4d\xc2",
-+  [0x25c2] = "\xa1\xe1", [0x25c3] = "\x44\x03", [0x25c4] = "\x44\x04",
-+  [0x25c5] = "\x44\x05", [0x25c6] = "\x44\x06", [0x25c7] = "\x44\x07",
-+  [0x25c8] = "\x44\x08", [0x25c9] = "\x44\x09", [0x25ca] = "\x44\x0a",
-+  [0x25cb] = "\x44\x0b", [0x25cc] = "\x44\x0c", [0x25cd] = "\x44\x0d",
-+  [0x25ce] = "\x44\x0e", [0x25cf] = "\x44\x0f", [0x25d0] = "\x44\x10",
-+  [0x25d1] = "\x44\x11", [0x25d2] = "\x44\x12", [0x25d3] = "\x44\x13",
-+  [0x25d4] = "\x44\x14", [0x25d5] = "\x44\x15", [0x25d6] = "\x44\x16",
-+  [0x25d7] = "\x44\x17", [0x25d8] = "\x44\x18", [0x25d9] = "\x44\x19",
-+  [0x25da] = "\x44\x1a", [0x25db] = "\x44\x1b", [0x25dc] = "\x44\x1c",
-+  [0x25dd] = "\x44\x1d", [0x25de] = "\x44\x1e", [0x25df] = "\x44\x1f",
-+  [0x25e0] = "\x44\x20", [0x25e1] = "\x44\x21", [0x25e2] = "\x44\x22",
-+  [0x25e3] = "\x44\x23", [0x25e4] = "\x44\x24", [0x25e5] = "\x44\x25",
-+  [0x25e6] = "\x44\x26", [0x25e7] = "\x44\x27", [0x25e8] = "\x44\x28",
-+  [0x25e9] = "\x44\x29", [0x25ea] = "\x44\x2a", [0x25eb] = "\x44\x2b",
-+  [0x25ec] = "\x44\x2c", [0x25ed] = "\x44\x2d", [0x25ee] = "\x44\x2e",
-+  [0x25ef] = "\x44\x2f", [0x25f0] = "\x44\x30", [0x25f1] = "\x44\x31",
-+  [0x25f2] = "\x44\x32", [0x25f3] = "\x44\x33", [0x25f4] = "\x44\x34",
-+  [0x25f5] = "\x44\x35", [0x25f6] = "\x44\x36", [0x25f7] = "\x44\x37",
-+  [0x25f8] = "\x44\x38", [0x25f9] = "\x44\x39", [0x25fa] = "\x44\x3a",
-+  [0x25fb] = "\x44\x3b", [0x25fc] = "\x44\x3c", [0x25fd] = "\x44\x3d",
-+  [0x25fe] = "\x44\x3e", [0x25ff] = "\x44\x3f", [0x2600] = "\x44\x40",
-+  [0x2601] = "\x44\x41", [0x2602] = "\x44\x42", [0x2603] = "\x44\x43",
-+  [0x2604] = "\x44\x44", [0x2605] = "\x44\x45", [0x2606] = "\x44\x46",
-+  [0x2607] = "\x44\x47", [0x2608] = "\x44\x48", [0x2609] = "\x44\x49",
-+  [0x260a] = "\x44\x4a", [0x260b] = "\x44\x4b", [0x260c] = "\x44\x4c",
-+  [0x260d] = "\x44\x4d", [0x260e] = "\x44\x4e", [0x260f] = "\x44\x4f",
-+  [0x2610] = "\x44\x50", [0x2611] = "\x44\x51", [0x2612] = "\x44\x52",
-+  [0x2613] = "\x44\x53", [0x2614] = "\x44\x54", [0x2615] = "\x44\x55",
-+  [0x2616] = "\x44\x56", [0x2617] = "\x44\x57", [0x2618] = "\x44\x58",
-+  [0x2619] = "\x44\x59", [0x261a] = "\x44\x5a", [0x261b] = "\x44\x5b",
-+  [0x261c] = "\x44\x5c", [0x261d] = "\x44\x5d", [0x261e] = "\x44\x5e",
-+  [0x261f] = "\x44\x5f", [0x2620] = "\x44\x60", [0x2621] = "\x44\x61",
-+  [0x2622] = "\x44\x62", [0x2623] = "\x44\x63", [0x2624] = "\x44\x64",
-+  [0x2625] = "\x44\x65", [0x2626] = "\x44\x66", [0x2627] = "\x44\x67",
-+  [0x2628] = "\x44\x68", [0x2629] = "\x44\x69", [0x262a] = "\x44\x6a",
-+  [0x262b] = "\x44\x6b", [0x262c] = "\x44\x6c", [0x262d] = "\x44\x6d",
-+  [0x262e] = "\x44\x6e", [0x262f] = "\x44\x6f", [0x2630] = "\x44\x70",
-+  [0x2631] = "\x44\x71", [0x2632] = "\x44\x72", [0x2633] = "\x44\x73",
-+  [0x2634] = "\x44\x74", [0x2635] = "\x44\x75", [0x2636] = "\x44\x76",
-+  [0x2637] = "\x44\x77", [0x2638] = "\x44\x78", [0x2639] = "\x44\x79",
-+  [0x263a] = "\x44\x7a", [0x263b] = "\x44\x7b", [0x263c] = "\x44\x7c",
-+  [0x263d] = "\x44\x7d", [0x263e] = "\x44\x7e", [0x263f] = "\x44\x7f",
-+  [0x2640] = "\x44\x80", [0x2641] = "\x44\x81", [0x2642] = "\x44\x82",
-+  [0x2643] = "\x44\x83", [0x2644] = "\x44\x84", [0x2645] = "\x44\x85",
-+  [0x2646] = "\x44\x86", [0x2647] = "\x44\x87", [0x2648] = "\x44\x88",
-+  [0x2649] = "\x44\x89", [0x264a] = "\x44\x8a", [0x264b] = "\x44\x8b",
-+  [0x264c] = "\x44\x8c", [0x264d] = "\x44\x8d", [0x264e] = "\x44\x8e",
-+  [0x264f] = "\x44\x8f", [0x2650] = "\x44\x90", [0x2651] = "\x44\x91",
-+  [0x2652] = "\x44\x92", [0x2653] = "\x44\x93", [0x2654] = "\x44\x94",
-+  [0x2655] = "\x44\x95", [0x2656] = "\x44\x96", [0x2657] = "\x44\x97",
-+  [0x2658] = "\x44\x98", [0x2659] = "\x44\x99", [0x265a] = "\x44\x9a",
-+  [0x265b] = "\x44\x9b", [0x265c] = "\x44\x9c", [0x265d] = "\x44\x9d",
-+  [0x265e] = "\x44\x9e", [0x265f] = "\x44\x9f", [0x2660] = "\x44\xa0",
-+  [0x2661] = "\x44\xa1", [0x2662] = "\x44\xa2", [0x2663] = "\x44\xa3",
-+  [0x2664] = "\x44\xa4", [0x2665] = "\x44\xa5", [0x2666] = "\x44\xa6",
-+  [0x2667] = "\x44\xa7", [0x2668] = "\x44\xa8", [0x2669] = "\x44\xa9",
-+  [0x266a] = "\x44\xaa", [0x266b] = "\x44\xab", [0x266c] = "\x44\xac",
-+  [0x266d] = "\x44\xad", [0x266e] = "\x44\xae", [0x266f] = "\x44\xaf",
-+  [0x2670] = "\x44\xb0", [0x2671] = "\x44\xb1", [0x2672] = "\x44\xb2",
-+  [0x2673] = "\x44\xb3", [0x2674] = "\x44\xb4", [0x2675] = "\x44\xb5",
-+  [0x2676] = "\x44\xb6", [0x2677] = "\x44\xb7", [0x2678] = "\x44\xb8",
-+  [0x2679] = "\x44\xb9", [0x267a] = "\x44\xba", [0x267b] = "\x44\xbb",
-+  [0x267c] = "\x44\xbc", [0x267d] = "\x44\xbd", [0x267e] = "\x44\xbe",
-+  [0x267f] = "\x44\xbf", [0x2680] = "\x44\xc0", [0x2681] = "\x44\xc1",
-+  [0x2682] = "\x44\xc2", [0x2683] = "\x44\xc3", [0x2684] = "\x44\xc4",
-+  [0x2685] = "\x44\xc5", [0x2686] = "\x44\xc6", [0x2687] = "\x44\xc7",
-+  [0x2688] = "\x44\xc8", [0x2689] = "\x44\xc9", [0x268a] = "\x44\xca",
-+  [0x268b] = "\x44\xcb", [0x268c] = "\x44\xcc", [0x268d] = "\x44\xcd",
-+  [0x268e] = "\x44\xce", [0x268f] = "\x44\xcf", [0x2690] = "\x44\xd0",
-+  [0x2691] = "\x44\xd1", [0x2692] = "\x44\xd2", [0x2693] = "\x44\xd3",
-+  [0x2694] = "\x44\xd4", [0x2695] = "\x44\xd5", [0x2696] = "\x44\xd6",
-+  [0x2697] = "\x44\xd7", [0x2698] = "\x44\xd8", [0x2699] = "\x44\xd9",
-+  [0x269a] = "\x44\xda", [0x269b] = "\x44\xdb", [0x269c] = "\x44\xdc",
-+  [0x269d] = "\x44\xdd", [0x269e] = "\x44\xde", [0x269f] = "\x44\xdf",
-+  [0x26a0] = "\x44\xe0", [0x26a1] = "\x44\xe1", [0x26a2] = "\x44\xe2",
-+  [0x26a3] = "\x44\xe3", [0x26a4] = "\x44\xe4", [0x26a5] = "\x44\xe5",
-+  [0x26a6] = "\x44\xe6", [0x26a7] = "\x44\xe7", [0x26a8] = "\x44\xe8",
-+  [0x26a9] = "\x44\xe9", [0x26aa] = "\x44\xea", [0x26ab] = "\x44\xeb",
-+  [0x26ac] = "\x44\xec", [0x26ad] = "\x44\xed", [0x26ae] = "\x44\xee",
-+  [0x26af] = "\x44\xef", [0x26b0] = "\x44\xf0", [0x26b1] = "\x44\xf1",
-+  [0x26b2] = "\x44\xf2", [0x26b3] = "\x44\xf3", [0x26b4] = "\x44\xf4",
-+  [0x26b5] = "\x44\xf5", [0x26b6] = "\x44\xf6", [0x26b7] = "\x44\xf7",
-+  [0x26b8] = "\x44\xf8", [0x26b9] = "\x44\xf9", [0x26ba] = "\x44\xfa",
-+  [0x26bb] = "\x44\xfb", [0x26bc] = "\x44\xfc", [0x26bd] = "\x44\xfd",
-+  [0x26be] = "\x44\xfe", [0x26bf] = "\x44\xff", [0x26c0] = "\x45\x00",
-+  [0x26c1] = "\x45\x01", [0x26c2] = "\x45\x02", [0x26c3] = "\x45\x03",
-+  [0x26c4] = "\x45\x04", [0x26c5] = "\x45\x05", [0x26c6] = "\x45\x06",
-+  [0x26c7] = "\x45\x07", [0x26c8] = "\x45\x08", [0x26c9] = "\x45\x09",
-+  [0x26ca] = "\x45\x0a", [0x26cb] = "\x45\x0b", [0x26cc] = "\x45\x0c",
-+  [0x26cd] = "\x45\x0d", [0x26ce] = "\x45\x0e", [0x26cf] = "\x45\x0f",
-+  [0x26d0] = "\x45\x10", [0x26d1] = "\x45\x11", [0x26d2] = "\x45\x12",
-+  [0x26d3] = "\x45\x13", [0x26d4] = "\x45\x14", [0x26d5] = "\x45\x15",
-+  [0x26d6] = "\x45\x16", [0x26d7] = "\x45\x17", [0x26d8] = "\x45\x18",
-+  [0x26d9] = "\x45\x19", [0x26da] = "\x45\x1a", [0x26db] = "\x45\x1b",
-+  [0x26dc] = "\x45\x1c", [0x26dd] = "\x45\x1d", [0x26de] = "\x45\x1e",
-+  [0x26df] = "\x45\x1f", [0x26e0] = "\x45\x20", [0x26e1] = "\x45\x21",
-+  [0x26e2] = "\x45\x22", [0x26e3] = "\x45\x23", [0x26e4] = "\x45\x24",
-+  [0x26e5] = "\x45\x25", [0x26e6] = "\x45\x26", [0x26e7] = "\x45\x27",
-+  [0x26e8] = "\x45\x28", [0x26e9] = "\x45\x29", [0x26ea] = "\x45\x2a",
-+  [0x26eb] = "\x45\x2b", [0x26ec] = "\x45\x2c", [0x26ed] = "\x45\x2d",
-+  [0x26ee] = "\x45\x2e", [0x26ef] = "\x45\x2f", [0x26f0] = "\x45\x30",
-+  [0x26f1] = "\x45\x31", [0x26f2] = "\x45\x32", [0x26f3] = "\x45\x33",
-+  [0x26f4] = "\x45\x34", [0x26f5] = "\x45\x35", [0x26f6] = "\x45\x36",
-+  [0x26f7] = "\x45\x37", [0x26f8] = "\x45\x38", [0x26f9] = "\x45\x39",
-+  [0x26fa] = "\x45\x3a", [0x26fb] = "\x45\x3b", [0x26fc] = "\x45\x3c",
-+  [0x26fd] = "\x45\x3d", [0x26fe] = "\x45\x3e", [0x26ff] = "\x45\x3f",
-+  [0x2700] = "\x45\x40", [0x2701] = "\x45\x41", [0x2702] = "\x45\x42",
-+  [0x2703] = "\x45\x43", [0x2704] = "\x45\x44", [0x2705] = "\x45\x45",
-+  [0x2706] = "\x45\x46", [0x2707] = "\x45\x47", [0x2708] = "\x45\x48",
-+  [0x2709] = "\x45\x49", [0x270a] = "\x45\x4a", [0x270b] = "\x45\x4b",
-+  [0x270c] = "\x45\x4c", [0x270d] = "\x45\x4d", [0x270e] = "\x45\x4e",
-+  [0x270f] = "\x45\x4f", [0x2710] = "\x45\x50", [0x2711] = "\x45\x51",
-+  [0x2712] = "\x45\x52", [0x2713] = "\x45\x53", [0x2714] = "\x45\x54",
-+  [0x2715] = "\x45\x55", [0x2716] = "\x45\x56", [0x2717] = "\x45\x57",
-+  [0x2718] = "\x45\x58", [0x2719] = "\x45\x59", [0x271a] = "\x45\x5a",
-+  [0x271b] = "\x45\x5b", [0x271c] = "\x45\x5c", [0x271d] = "\x45\x5d",
-+  [0x271e] = "\x45\x5e", [0x271f] = "\x45\x5f", [0x2720] = "\x45\x60",
-+  [0x2721] = "\x45\x61", [0x2722] = "\x45\x62", [0x2723] = "\x45\x63",
-+  [0x2724] = "\x45\x64", [0x2725] = "\x45\x65", [0x2726] = "\x45\x66",
-+  [0x2727] = "\x45\x67", [0x2728] = "\x45\x68", [0x2729] = "\x45\x69",
-+  [0x272a] = "\x45\x6a", [0x272b] = "\x45\x6b", [0x272c] = "\x45\x6c",
-+  [0x272d] = "\x45\x6d", [0x272e] = "\x45\x6e", [0x272f] = "\x45\x6f",
-+  [0x2730] = "\x45\x70", [0x2731] = "\x45\x71", [0x2732] = "\x45\x72",
-+  [0x2733] = "\x45\x73", [0x2734] = "\x45\x74", [0x2735] = "\x45\x75",
-+  [0x2736] = "\x45\x76", [0x2737] = "\x45\x77", [0x2738] = "\x45\x78",
-+  [0x2739] = "\x45\x79", [0x273a] = "\x45\x7a", [0x273b] = "\x45\x7b",
-+  [0x273c] = "\x45\x7c", [0x273d] = "\x45\x7d", [0x273e] = "\x45\x7e",
-+  [0x273f] = "\x45\x7f", [0x2740] = "\x45\x80", [0x2741] = "\x45\x81",
-+  [0x2742] = "\x45\x82", [0x2743] = "\x45\x83", [0x2744] = "\x45\x84",
-+  [0x2745] = "\x45\x85", [0x2746] = "\x45\x86", [0x2747] = "\x45\x87",
-+  [0x2748] = "\x45\x88", [0x2749] = "\x45\x89", [0x274a] = "\x45\x8a",
-+  [0x274b] = "\x45\x8b", [0x274c] = "\x45\x8c", [0x274d] = "\x45\x8d",
-+  [0x274e] = "\x45\x8e", [0x274f] = "\x45\x8f", [0x2750] = "\x45\x90",
-+  [0x2751] = "\x45\x91", [0x2752] = "\x45\x92", [0x2753] = "\x45\x93",
-+  [0x2754] = "\x45\x94", [0x2755] = "\x45\x95", [0x2756] = "\x45\x96",
-+  [0x2757] = "\x45\x97", [0x2758] = "\x45\x98", [0x2759] = "\x45\x99",
-+  [0x275a] = "\x45\x9a", [0x275b] = "\x45\x9b", [0x275c] = "\x45\x9c",
-+  [0x275d] = "\x45\x9d", [0x275e] = "\x45\x9e", [0x275f] = "\x45\x9f",
-+  [0x2760] = "\x45\xa0", [0x2761] = "\x45\xa1", [0x2762] = "\x45\xa2",
-+  [0x2763] = "\x45\xa3", [0x2764] = "\x45\xa4", [0x2765] = "\x45\xa5",
-+  [0x2766] = "\x45\xa6", [0x2767] = "\x45\xa7", [0x2768] = "\x45\xa8",
-+  [0x2769] = "\x45\xa9", [0x276a] = "\x45\xaa", [0x276b] = "\x45\xab",
-+  [0x276c] = "\x45\xac", [0x276d] = "\x45\xad", [0x276e] = "\x45\xae",
-+  [0x276f] = "\x45\xaf", [0x2770] = "\x45\xb0", [0x2771] = "\x45\xb1",
-+  [0x2772] = "\x45\xb2", [0x2773] = "\x45\xb3", [0x2774] = "\x45\xb4",
-+  [0x2775] = "\x45\xb5", [0x2776] = "\x45\xb6", [0x2777] = "\x45\xb7",
-+  [0x2778] = "\x45\xb8", [0x2779] = "\x45\xb9", [0x277a] = "\x45\xba",
-+  [0x277b] = "\x45\xbb", [0x277c] = "\x45\xbc", [0x277d] = "\x45\xbd",
-+  [0x277e] = "\x45\xbe", [0x277f] = "\x45\xbf", [0x2780] = "\x45\xc0",
-+  [0x2781] = "\x45\xc1", [0x2782] = "\x45\xc2", [0x2783] = "\x45\xc3",
-+  [0x2784] = "\x45\xc4", [0x2785] = "\x45\xc5", [0x2786] = "\x45\xc6",
-+  [0x2787] = "\x45\xc7", [0x2788] = "\x45\xc8", [0x2789] = "\x45\xc9",
-+  [0x278a] = "\x45\xca", [0x278b] = "\x45\xcb", [0x278c] = "\x45\xcc",
-+  [0x278d] = "\x45\xcd", [0x278e] = "\x45\xce", [0x278f] = "\x45\xcf",
-+  [0x2790] = "\x45\xd0", [0x2791] = "\x45\xd1", [0x2792] = "\x45\xd2",
-+  [0x2793] = "\x45\xd3", [0x2794] = "\x45\xd4", [0x2795] = "\x45\xd5",
-+  [0x2796] = "\x45\xd6", [0x2797] = "\x45\xd7", [0x2798] = "\x45\xd8",
-+  [0x2799] = "\x45\xd9", [0x279a] = "\x45\xda", [0x279b] = "\x45\xdb",
-+  [0x279c] = "\x45\xdc", [0x279d] = "\x45\xdd", [0x279e] = "\x45\xde",
-+  [0x279f] = "\x45\xdf", [0x27a0] = "\x45\xe0", [0x27a1] = "\x45\xe1",
-+  [0x27a2] = "\x45\xe2", [0x27a3] = "\x45\xe3", [0x27a4] = "\x45\xe4",
-+  [0x27a5] = "\x45\xe5", [0x27a6] = "\x45\xe6", [0x27a7] = "\x45\xe7",
-+  [0x27a8] = "\x45\xe8", [0x27a9] = "\x45\xe9", [0x27aa] = "\x45\xea",
-+  [0x27ab] = "\x45\xeb", [0x27ac] = "\x45\xec", [0x27ad] = "\x45\xed",
-+  [0x27ae] = "\x45\xee", [0x27af] = "\x45\xef", [0x27b0] = "\x45\xf0",
-+  [0x27b1] = "\x45\xf1", [0x27b2] = "\x45\xf2", [0x27b3] = "\x45\xf3",
-+  [0x27b4] = "\x45\xf4", [0x27b5] = "\x45\xf5", [0x27b6] = "\x45\xf6",
-+  [0x27b7] = "\x45\xf7", [0x27b8] = "\x45\xf8", [0x27b9] = "\x45\xf9",
-+  [0x27ba] = "\x45\xfa", [0x27bb] = "\x45\xfb", [0x27bc] = "\x45\xfc",
-+  [0x27bd] = "\x45\xfd", [0x27be] = "\x45\xfe", [0x27bf] = "\x45\xff",
-+  [0x27c0] = "\x46\x00", [0x27c1] = "\x46\x01", [0x27c2] = "\x46\x02",
-+  [0x27c3] = "\x46\x03", [0x27c4] = "\x46\x04", [0x27c5] = "\x46\x05",
-+  [0x27c6] = "\x46\x06", [0x27c7] = "\x46\x07", [0x27c8] = "\x46\x08",
-+  [0x27c9] = "\x46\x09", [0x27ca] = "\x46\x0a", [0x27cb] = "\x46\x0b",
-+  [0x27cc] = "\x46\x0c", [0x27cd] = "\x46\x0d", [0x27ce] = "\x46\x0e",
-+  [0x27cf] = "\x46\x0f", [0x27d0] = "\x46\x10", [0x27d1] = "\x46\x11",
-+  [0x27d2] = "\x46\x12", [0x27d3] = "\x46\x13", [0x27d4] = "\x46\x14",
-+  [0x27d5] = "\x46\x15", [0x27d6] = "\x46\x16", [0x27d7] = "\x46\x17",
-+  [0x27d8] = "\x46\x18", [0x27d9] = "\x46\x19", [0x27da] = "\x46\x1a",
-+  [0x27db] = "\x46\x1b", [0x27dc] = "\x46\x1c", [0x27dd] = "\x46\x1d",
-+  [0x27de] = "\x46\x1e", [0x27df] = "\x46\x1f", [0x27e0] = "\x46\x20",
-+  [0x27e1] = "\x46\x21", [0x27e2] = "\x46\x22", [0x27e3] = "\x46\x23",
-+  [0x27e4] = "\x46\x24", [0x27e5] = "\x46\x25", [0x27e6] = "\x46\x26",
-+  [0x27e7] = "\x46\x27", [0x27e8] = "\x46\x28", [0x27e9] = "\x46\x29",
-+  [0x27ea] = "\x46\x2a", [0x27eb] = "\x46\x2b", [0x27ec] = "\x46\x2c",
-+  [0x27ed] = "\x46\x2d", [0x27ee] = "\x46\x2e", [0x27ef] = "\x46\x2f",
-+  [0x27f0] = "\x46\x30", [0x27f1] = "\x46\x31", [0x27f2] = "\x46\x32",
-+  [0x27f3] = "\x46\x33", [0x27f4] = "\x46\x34", [0x27f5] = "\x46\x35",
-+  [0x27f6] = "\x46\x36", [0x27f7] = "\x46\x37", [0x27f8] = "\x46\x38",
-+  [0x27f9] = "\x46\x39", [0x27fa] = "\x46\x3a", [0x27fb] = "\x46\x3b",
-+  [0x27fc] = "\x46\x3c", [0x27fd] = "\x46\x3d", [0x27fe] = "\x46\x3e",
-+  [0x27ff] = "\x46\x3f", [0x2800] = "\x46\x40", [0x2801] = "\x46\x41",
-+  [0x2802] = "\x46\x42", [0x2803] = "\x46\x43", [0x2804] = "\x46\x44",
-+  [0x2805] = "\x46\x45", [0x2806] = "\x46\x46", [0x2807] = "\x46\x47",
-+  [0x2808] = "\x46\x48", [0x2809] = "\x46\x49", [0x280a] = "\x46\x4a",
-+  [0x280b] = "\x46\x4b", [0x280c] = "\x46\x4c", [0x280d] = "\x46\x4d",
-+  [0x280e] = "\x46\x4e", [0x280f] = "\x46\x4f", [0x2810] = "\x46\x50",
-+  [0x2811] = "\x46\x51", [0x2812] = "\x46\x52", [0x2813] = "\x46\x53",
-+  [0x2814] = "\x46\x54", [0x2815] = "\x46\x55", [0x2816] = "\x46\x56",
-+  [0x2817] = "\x46\x57", [0x2818] = "\x46\x58", [0x2819] = "\x46\x59",
-+  [0x281a] = "\x46\x5a", [0x281b] = "\x46\x5b", [0x281c] = "\x46\x5c",
-+  [0x281d] = "\x46\x5d", [0x281e] = "\x46\x5e", [0x281f] = "\x46\x5f",
-+  [0x2820] = "\x46\x60", [0x2821] = "\x46\x61", [0x2822] = "\x46\x62",
-+  [0x2823] = "\x46\x63", [0x2824] = "\x46\x64", [0x2825] = "\x46\x65",
-+  [0x2826] = "\x46\x66", [0x2827] = "\x46\x67", [0x2828] = "\x46\x68",
-+  [0x2829] = "\x46\x69", [0x282a] = "\x46\x6a", [0x282b] = "\x46\x6b",
-+  [0x282c] = "\x46\x6c", [0x282d] = "\x46\x6d", [0x282e] = "\x46\x6e",
-+  [0x282f] = "\x46\x6f", [0x2830] = "\x46\x70", [0x2831] = "\x46\x71",
-+  [0x2832] = "\x46\x72", [0x2833] = "\x46\x73", [0x2834] = "\x46\x74",
-+  [0x2835] = "\x46\x75", [0x2836] = "\x46\x76", [0x2837] = "\x46\x77",
-+  [0x2838] = "\x46\x78", [0x2839] = "\x46\x79", [0x283a] = "\x46\x7a",
-+  [0x283b] = "\x46\x7b", [0x283c] = "\x46\x7c", [0x283d] = "\x46\x7d",
-+  [0x283e] = "\x46\x7e", [0x283f] = "\x46\x7f", [0x2840] = "\x46\x80",
-+  [0x2841] = "\x46\x81", [0x2842] = "\x46\x82", [0x2843] = "\x46\x83",
-+  [0x2844] = "\x46\x84", [0x2845] = "\x46\x85", [0x2846] = "\x46\x86",
-+  [0x2847] = "\x46\x87", [0x2848] = "\x46\x88", [0x2849] = "\x46\x89",
-+  [0x284a] = "\x46\x8a", [0x284b] = "\x46\x8b", [0x284c] = "\x46\x8c",
-+  [0x284d] = "\x46\x8d", [0x284e] = "\x46\x8e", [0x284f] = "\x46\x8f",
-+  [0x2850] = "\x46\x90", [0x2851] = "\x46\x91", [0x2852] = "\x46\x92",
-+  [0x2853] = "\x46\x93", [0x2854] = "\x46\x94", [0x2855] = "\x46\x95",
-+  [0x2856] = "\x46\x96", [0x2857] = "\x46\x97", [0x2858] = "\x46\x98",
-+  [0x2859] = "\x46\x99", [0x285a] = "\x46\x9a", [0x285b] = "\x46\x9b",
-+  [0x285c] = "\x46\x9c", [0x285d] = "\x46\x9d", [0x285e] = "\x46\x9e",
-+  [0x285f] = "\x46\x9f", [0x2860] = "\x46\xa0", [0x2861] = "\x46\xa1",
-+  [0x2862] = "\x46\xa2", [0x2863] = "\x46\xa3", [0x2864] = "\x46\xa4",
-+  [0x2865] = "\x46\xa5", [0x2866] = "\x46\xa6", [0x2867] = "\x46\xa7",
-+  [0x2868] = "\x46\xa8", [0x2869] = "\x46\xa9", [0x286a] = "\x46\xaa",
-+  [0x286b] = "\x46\xab", [0x286c] = "\x46\xac", [0x286d] = "\x46\xad",
-+  [0x286e] = "\x46\xae", [0x286f] = "\x46\xaf", [0x2870] = "\x46\xb0",
-+  [0x2871] = "\x46\xb1", [0x2872] = "\x46\xb2", [0x2873] = "\x46\xb3",
-+  [0x2874] = "\x46\xb4", [0x2875] = "\x46\xb5", [0x2876] = "\x46\xb6",
-+  [0x2877] = "\x46\xb7", [0x2878] = "\x46\xb8", [0x2879] = "\x46\xb9",
-+  [0x287a] = "\x46\xba", [0x287b] = "\x46\xbb", [0x287c] = "\x46\xbc",
-+  [0x287d] = "\x46\xbd", [0x287e] = "\x46\xbe", [0x287f] = "\x46\xbf",
-+  [0x2880] = "\x46\xc0", [0x2881] = "\x46\xc1", [0x2882] = "\x46\xc2",
-+  [0x2883] = "\x46\xc3", [0x2884] = "\x46\xc4", [0x2885] = "\x46\xc5",
-+  [0x2886] = "\x46\xc6", [0x2887] = "\x46\xc7", [0x2888] = "\x46\xc8",
-+  [0x2889] = "\x46\xc9", [0x288a] = "\x46\xca", [0x288b] = "\x46\xcb",
-+  [0x288c] = "\x46\xcc", [0x288d] = "\x46\xcd", [0x288e] = "\x46\xce",
-+  [0x288f] = "\x46\xcf", [0x2890] = "\x46\xd0", [0x2891] = "\x46\xd1",
-+  [0x2892] = "\x46\xd2", [0x2893] = "\x46\xd3", [0x2894] = "\x46\xd4",
-+  [0x2895] = "\x46\xd5", [0x2896] = "\x46\xd6", [0x2897] = "\x46\xd7",
-+  [0x2898] = "\x46\xd8", [0x2899] = "\x46\xd9", [0x289a] = "\x46\xda",
-+  [0x289b] = "\x46\xdb", [0x289c] = "\x46\xdc", [0x289d] = "\x46\xdd",
-+  [0x289e] = "\x46\xde", [0x289f] = "\x46\xdf", [0x28a0] = "\x46\xe0",
-+  [0x28a1] = "\x46\xe1", [0x28a2] = "\x46\xe2", [0x28a3] = "\x46\xe3",
-+  [0x28a4] = "\x46\xe4", [0x28a5] = "\x46\xe5", [0x28a6] = "\x46\xe6",
-+  [0x28a7] = "\x46\xe7", [0x28a8] = "\x46\xe8", [0x28a9] = "\x46\xe9",
-+  [0x28aa] = "\x46\xea", [0x28ab] = "\x46\xeb", [0x28ac] = "\x46\xec",
-+  [0x28ad] = "\x46\xed", [0x28ae] = "\x46\xee", [0x28af] = "\x46\xef",
-+  [0x28b0] = "\x46\xf0", [0x28b1] = "\x46\xf1", [0x28b2] = "\x46\xf2",
-+  [0x28b3] = "\x46\xf3", [0x28b4] = "\x46\xf4", [0x28b5] = "\x46\xf5",
-+  [0x28b6] = "\x46\xf6", [0x28b7] = "\x46\xf7", [0x28b8] = "\x46\xf8",
-+  [0x28b9] = "\x46\xf9", [0x28ba] = "\x46\xfa", [0x28bb] = "\x46\xfb",
-+  [0x28bc] = "\x46\xfc", [0x28bd] = "\x46\xfd", [0x28be] = "\x46\xfe",
-+  [0x28bf] = "\x46\xff", [0x28c0] = "\x47\x00", [0x28c1] = "\x47\x01",
-+  [0x28c2] = "\x47\x02", [0x28c3] = "\x47\x03", [0x28c4] = "\x47\x04",
-+  [0x28c5] = "\x47\x05", [0x28c6] = "\x47\x06", [0x28c7] = "\x47\x07",
-+  [0x28c8] = "\x47\x08", [0x28c9] = "\x47\x09", [0x28ca] = "\x47\x0a",
-+  [0x28cb] = "\x47\x0b", [0x28cc] = "\x47\x0c", [0x28cd] = "\x47\x0d",
-+  [0x28ce] = "\x47\x0e", [0x28cf] = "\x47\x0f", [0x28d0] = "\x47\x10",
-+  [0x28d1] = "\x47\x11", [0x28d2] = "\x47\x12", [0x28d3] = "\x47\x13",
-+  [0x28d4] = "\x47\x14", [0x28d5] = "\x47\x15", [0x28d6] = "\x47\x16",
-+  [0x28d7] = "\x47\x17", [0x28d8] = "\x47\x18", [0x28d9] = "\x47\x19",
-+  [0x28da] = "\x47\x1a", [0x28db] = "\x47\x1b", [0x28dc] = "\x47\x1c",
-+  [0x28dd] = "\x47\x1d", [0x28de] = "\x47\x1e", [0x28df] = "\x47\x1f",
-+  [0x28e0] = "\x47\x20", [0x28e1] = "\x47\x21", [0x28e2] = "\x47\x22",
-+  [0x28e3] = "\x47\x23", [0x28e4] = "\x47\x24", [0x28e5] = "\x47\x25",
-+  [0x28e6] = "\x47\x26", [0x28e7] = "\x47\x27", [0x28e8] = "\x47\x28",
-+  [0x28e9] = "\x47\x29", [0x28ea] = "\x47\x2a", [0x28eb] = "\x47\x2b",
-+  [0x28ec] = "\x47\x2c", [0x28ed] = "\x47\x2d", [0x28ee] = "\x47\x2e",
-+  [0x28ef] = "\x47\x2f", [0x28f0] = "\x47\x30", [0x28f1] = "\x47\x31",
-+  [0x28f2] = "\x47\x32", [0x28f3] = "\x47\x33", [0x28f4] = "\x47\x34",
-+  [0x28f5] = "\x47\x35", [0x28f6] = "\x47\x36", [0x28f7] = "\x47\x37",
-+  [0x28f8] = "\x47\x38", [0x28f9] = "\x47\x39", [0x28fa] = "\x47\x3a",
-+  [0x28fb] = "\x47\x3b", [0x28fc] = "\x47\x3c", [0x28fd] = "\x47\x3d",
-+  [0x28fe] = "\x47\x3e", [0x28ff] = "\x47\x3f", [0x2900] = "\x47\x40",
-+  [0x2901] = "\x47\x41", [0x2902] = "\x47\x42", [0x2903] = "\x47\x43",
-+  [0x2904] = "\x47\x44", [0x2905] = "\x47\x45", [0x2906] = "\x47\x46",
-+  [0x2907] = "\x47\x47", [0x2908] = "\x47\x48", [0x2909] = "\x47\x49",
-+  [0x290a] = "\x47\x4a", [0x290b] = "\x47\x4b", [0x290c] = "\x47\x4c",
-+  [0x290d] = "\x47\x4d", [0x290e] = "\x47\x4e", [0x290f] = "\x47\x4f",
-+  [0x2910] = "\x47\x50", [0x2911] = "\x47\x51", [0x2912] = "\x47\x52",
-+  [0x2913] = "\x47\x53", [0x2914] = "\x47\x54", [0x2915] = "\x47\x55",
-+  [0x2916] = "\x47\x56", [0x2917] = "\x47\x57", [0x2918] = "\x47\x58",
-+  [0x2919] = "\x47\x59", [0x291a] = "\x47\x5a", [0x291b] = "\x47\x5b",
-+  [0x291c] = "\x47\x5c", [0x291d] = "\x47\x5d", [0x291e] = "\x47\x5e",
-+  [0x291f] = "\x47\x5f", [0x2920] = "\x47\x60", [0x2921] = "\x47\x61",
-+  [0x2922] = "\x47\x62", [0x2923] = "\x47\x63", [0x2924] = "\x47\x64",
-+  [0x2925] = "\x47\x65", [0x2926] = "\x47\x66", [0x2927] = "\x47\x67",
-+  [0x2928] = "\x47\x68", [0x2929] = "\x47\x69", [0x292a] = "\x47\x6a",
-+  [0x292b] = "\x47\x6b", [0x292c] = "\x47\x6c", [0x292d] = "\x47\x6d",
-+  [0x292e] = "\x47\x6e", [0x292f] = "\x47\x6f", [0x2930] = "\x47\x70",
-+  [0x2931] = "\x47\x71", [0x2932] = "\x47\x72", [0x2933] = "\x47\x73",
-+  [0x2934] = "\x47\x74", [0x2935] = "\x47\x75", [0x2936] = "\x47\x76",
-+  [0x2937] = "\x47\x77", [0x2938] = "\x47\x78", [0x2939] = "\x47\x79",
-+  [0x293a] = "\x47\x7a", [0x293b] = "\x47\x7b", [0x293c] = "\x47\x7c",
-+  [0x293d] = "\x47\x7d", [0x293e] = "\x47\x7e", [0x293f] = "\x47\x7f",
-+  [0x2940] = "\x47\x80", [0x2941] = "\x47\x81", [0x2942] = "\x47\x82",
-+  [0x2943] = "\x47\x83", [0x2944] = "\x47\x84", [0x2945] = "\x47\x85",
-+  [0x2946] = "\x47\x86", [0x2947] = "\x47\x87", [0x2948] = "\x47\x88",
-+  [0x2949] = "\x47\x89", [0x294a] = "\x47\x8a", [0x294b] = "\x47\x8b",
-+  [0x294c] = "\x47\x8c", [0x294d] = "\x47\x8d", [0x294e] = "\x47\x8e",
-+  [0x294f] = "\x47\x8f", [0x2950] = "\x47\x90", [0x2951] = "\x47\x91",
-+  [0x2952] = "\x47\x92", [0x2953] = "\x47\x93", [0x2954] = "\x47\x94",
-+  [0x2955] = "\x47\x95", [0x2956] = "\x47\x96", [0x2957] = "\x47\x97",
-+  [0x2958] = "\x47\x98", [0x2959] = "\x47\x99", [0x295a] = "\x47\x9a",
-+  [0x295b] = "\x47\x9b", [0x295c] = "\x47\x9c", [0x295d] = "\x47\x9d",
-+  [0x295e] = "\x47\x9e", [0x295f] = "\x47\x9f", [0x2960] = "\x47\xa0",
-+  [0x2961] = "\x47\xa1", [0x2962] = "\x47\xa2", [0x2963] = "\x47\xa3",
-+  [0x2964] = "\x47\xa4", [0x2965] = "\x47\xa5", [0x2966] = "\x47\xa6",
-+  [0x2967] = "\x47\xa7", [0x2968] = "\x47\xa8", [0x2969] = "\x47\xa9",
-+  [0x296a] = "\x47\xaa", [0x296b] = "\x47\xab", [0x296c] = "\x47\xac",
-+  [0x296d] = "\x47\xad", [0x296e] = "\x47\xae", [0x296f] = "\x47\xaf",
-+  [0x2970] = "\x47\xb0", [0x2971] = "\x47\xb1", [0x2972] = "\x47\xb2",
-+  [0x2973] = "\x47\xb3", [0x2974] = "\x47\xb4", [0x2975] = "\x47\xb5",
-+  [0x2976] = "\x47\xb6", [0x2977] = "\x47\xb7", [0x2978] = "\x47\xb8",
-+  [0x2979] = "\x47\xb9", [0x297a] = "\x47\xba", [0x297b] = "\x47\xbb",
-+  [0x297c] = "\x47\xbc", [0x297d] = "\x47\xbd", [0x297e] = "\x47\xbe",
-+  [0x297f] = "\x47\xbf", [0x2980] = "\x47\xc0", [0x2981] = "\x47\xc1",
-+  [0x2982] = "\x47\xc2", [0x2983] = "\x47\xc3", [0x2984] = "\x47\xc4",
-+  [0x2985] = "\x47\xc5", [0x2986] = "\x47\xc6", [0x2987] = "\x47\xc7",
-+  [0x2988] = "\x47\xc8", [0x2989] = "\x47\xc9", [0x298a] = "\x47\xca",
-+  [0x298b] = "\x47\xcb", [0x298c] = "\x47\xcc", [0x298d] = "\x47\xcd",
-+  [0x298e] = "\x47\xce", [0x298f] = "\x47\xcf", [0x2990] = "\x47\xd0",
-+  [0x2991] = "\x47\xd1", [0x2992] = "\x47\xd2", [0x2993] = "\x47\xd3",
-+  [0x2994] = "\x47\xd4", [0x2995] = "\x47\xd5", [0x2996] = "\x47\xd6",
-+  [0x2997] = "\x47\xd7", [0x2998] = "\x47\xd8", [0x2999] = "\x47\xd9",
-+  [0x299a] = "\x47\xda", [0x299b] = "\x47\xdb", [0x299c] = "\x47\xdc",
-+  [0x299d] = "\x47\xdd", [0x299e] = "\x47\xde", [0x299f] = "\x47\xdf",
-+  [0x29a0] = "\x47\xe0", [0x29a1] = "\x47\xe1", [0x29a2] = "\x47\xe2",
-+  [0x29a3] = "\x47\xe3", [0x29a4] = "\x47\xe4", [0x29a5] = "\x47\xe5",
-+  [0x29a6] = "\x47\xe6", [0x29a7] = "\x47\xe7", [0x29a8] = "\x47\xe8",
-+  [0x29a9] = "\x47\xe9", [0x29aa] = "\x47\xea", [0x29ab] = "\x47\xeb",
-+  [0x29ac] = "\x47\xec", [0x29ad] = "\x47\xed", [0x29ae] = "\x47\xee",
-+  [0x29af] = "\x47\xef", [0x29b0] = "\x47\xf0", [0x29b1] = "\x47\xf1",
-+  [0x29b2] = "\x47\xf2", [0x29b3] = "\x47\xf3", [0x29b4] = "\x47\xf4",
-+  [0x29b5] = "\x47\xf5", [0x29b6] = "\x47\xf6", [0x29b7] = "\x47\xf7",
-+  [0x29b8] = "\x47\xf8", [0x29b9] = "\x47\xf9", [0x29ba] = "\x47\xfa",
-+  [0x29bb] = "\x47\xfb", [0x29bc] = "\x47\xfc", [0x29bd] = "\x47\xfd",
-+  [0x29be] = "\x47\xfe", [0x29bf] = "\x47\xff", [0x29c0] = "\x48\x00",
-+  [0x29c1] = "\x48\x01", [0x29c2] = "\x48\x02", [0x29c3] = "\x48\x03",
-+  [0x29c4] = "\x48\x04", [0x29c5] = "\x48\x05", [0x29c6] = "\x48\x06",
-+  [0x29c7] = "\x48\x07", [0x29c8] = "\x48\x08", [0x29c9] = "\x48\x09",
-+  [0x29ca] = "\x48\x0a", [0x29cb] = "\x48\x0b", [0x29cc] = "\x48\x0c",
-+  [0x29cd] = "\x48\x0d", [0x29ce] = "\x48\x0e", [0x29cf] = "\x48\x0f",
-+  [0x29d0] = "\x48\x10", [0x29d1] = "\x48\x11", [0x29d2] = "\x48\x12",
-+  [0x29d3] = "\x48\x13", [0x29d4] = "\x48\x14", [0x29d5] = "\x48\x15",
-+  [0x29d6] = "\x48\x16", [0x29d7] = "\x48\x17", [0x29d8] = "\x48\x18",
-+  [0x29d9] = "\x48\x19", [0x29da] = "\x48\x1a", [0x29db] = "\x48\x1b",
-+  [0x29dc] = "\x48\x1c", [0x29dd] = "\x48\x1d", [0x29de] = "\x48\x1e",
-+  [0x29df] = "\x48\x1f", [0x29e0] = "\x48\x20", [0x29e1] = "\x48\x21",
-+  [0x29e2] = "\x48\x22", [0x29e3] = "\x48\x23", [0x29e4] = "\x48\x24",
-+  [0x29e5] = "\x48\x25", [0x29e6] = "\x48\x26", [0x29e7] = "\x48\x27",
-+  [0x29e8] = "\x48\x28", [0x29e9] = "\x48\x29", [0x29ea] = "\x48\x2a",
-+  [0x29eb] = "\x48\x2b", [0x29ec] = "\x48\x2c", [0x29ed] = "\x48\x2d",
-+  [0x29ee] = "\x48\x2e", [0x29ef] = "\x48\x2f", [0x29f0] = "\x48\x30",
-+  [0x29f1] = "\x48\x31", [0x29f2] = "\x48\x32", [0x29f3] = "\x48\x33",
-+  [0x29f4] = "\x48\x34", [0x29f5] = "\x48\x35", [0x29f6] = "\x48\x36",
-+  [0x29f7] = "\x48\x37", [0x29f8] = "\x48\x38", [0x29f9] = "\x48\x39",
-+  [0x29fa] = "\x48\x3a", [0x29fb] = "\x48\x3b", [0x29fc] = "\x48\x3c",
-+  [0x29fd] = "\x48\x3d", [0x29fe] = "\x48\x3e", [0x29ff] = "\x48\x3f",
-+  [0x2a00] = "\x48\x40", [0x2a01] = "\x48\x41", [0x2a02] = "\x48\x42",
-+  [0x2a03] = "\x48\x43", [0x2a04] = "\x48\x44", [0x2a05] = "\x48\x45",
-+  [0x2a06] = "\x48\x46", [0x2a07] = "\x48\x47", [0x2a08] = "\x48\x48",
-+  [0x2a09] = "\x48\x49", [0x2a0a] = "\x48\x4a", [0x2a0b] = "\x48\x4b",
-+  [0x2a0c] = "\x48\x4c", [0x2a0d] = "\x48\x4d", [0x2a0e] = "\x48\x4e",
-+  [0x2a0f] = "\x48\x4f", [0x2a10] = "\x48\x50", [0x2a11] = "\x48\x51",
-+  [0x2a12] = "\x48\x52", [0x2a13] = "\x48\x53", [0x2a14] = "\x48\x54",
-+  [0x2a15] = "\x48\x55", [0x2a16] = "\x48\x56", [0x2a17] = "\x48\x57",
-+  [0x2a18] = "\x48\x58", [0x2a19] = "\x48\x59", [0x2a1a] = "\x48\x5a",
-+  [0x2a1b] = "\x48\x5b", [0x2a1c] = "\x48\x5c", [0x2a1d] = "\x48\x5d",
-+  [0x2a1e] = "\x48\x5e", [0x2a1f] = "\x48\x5f", [0x2a20] = "\x48\x60",
-+  [0x2a21] = "\x48\x61", [0x2a22] = "\x48\x62", [0x2a23] = "\x48\x63",
-+  [0x2a24] = "\x48\x64", [0x2a25] = "\x48\x65", [0x2a26] = "\x48\x66",
-+  [0x2a27] = "\x48\x67", [0x2a28] = "\x48\x68", [0x2a29] = "\x48\x69",
-+  [0x2a2a] = "\x48\x6a", [0x2a2b] = "\x48\x6b", [0x2a2c] = "\x48\x6c",
-+  [0x2a2d] = "\x48\x6d", [0x2a2e] = "\x48\x6e", [0x2a2f] = "\x48\x6f",
-+  [0x2a30] = "\x48\x70", [0x2a31] = "\x48\x71", [0x2a32] = "\x48\x72",
-+  [0x2a33] = "\x48\x73", [0x2a34] = "\x48\x74", [0x2a35] = "\x48\x75",
-+  [0x2a36] = "\x48\x76", [0x2a37] = "\x48\x77", [0x2a38] = "\x48\x78",
-+  [0x2a39] = "\x48\x79", [0x2a3a] = "\x48\x7a", [0x2a3b] = "\x48\x7b",
-+  [0x2a3c] = "\x48\x7c", [0x2a3d] = "\x48\x7d", [0x2a3e] = "\x48\x7e",
-+  [0x2a3f] = "\x48\x7f", [0x2a40] = "\x48\x80", [0x2a41] = "\x48\x81",
-+  [0x2a42] = "\x48\x82", [0x2a43] = "\x48\x83", [0x2a44] = "\x48\x84",
-+  [0x2a45] = "\x48\x85", [0x2a46] = "\x48\x86", [0x2a47] = "\x48\x87",
-+  [0x2a48] = "\x48\x88", [0x2a49] = "\x48\x89", [0x2a4a] = "\x48\x8a",
-+  [0x2a4b] = "\x48\x8b", [0x2a4c] = "\x48\x8c", [0x2a4d] = "\x48\x8d",
-+  [0x2a4e] = "\x48\x8e", [0x2a4f] = "\x48\x8f", [0x2a50] = "\x48\x90",
-+  [0x2a51] = "\x48\x91", [0x2a52] = "\x48\x92", [0x2a53] = "\x48\x93",
-+  [0x2a54] = "\x48\x94", [0x2a55] = "\x48\x95", [0x2a56] = "\x48\x96",
-+  [0x2a57] = "\x48\x97", [0x2a58] = "\x48\x98", [0x2a59] = "\x48\x99",
-+  [0x2a5a] = "\x48\x9a", [0x2a5b] = "\x48\x9b", [0x2a5c] = "\x48\x9c",
-+  [0x2a5d] = "\x48\x9d", [0x2a5e] = "\x48\x9e", [0x2a5f] = "\x48\x9f",
-+  [0x2a60] = "\x48\xa0", [0x2a61] = "\x48\xa1", [0x2a62] = "\x48\xa2",
-+  [0x2a63] = "\x48\xa3", [0x2a64] = "\x48\xa4", [0x2a65] = "\x48\xa5",
-+  [0x2a66] = "\x48\xa6", [0x2a67] = "\x48\xa7", [0x2a68] = "\x48\xa8",
-+  [0x2a69] = "\x48\xa9", [0x2a6a] = "\x48\xaa", [0x2a6b] = "\x48\xab",
-+  [0x2a6c] = "\x48\xac", [0x2a6d] = "\x48\xad", [0x2a6e] = "\x48\xae",
-+  [0x2a6f] = "\x48\xaf", [0x2a70] = "\x48\xb0", [0x2a71] = "\x48\xb1",
-+  [0x2a72] = "\x48\xb2", [0x2a73] = "\x48\xb3", [0x2a74] = "\x48\xb4",
-+  [0x2a75] = "\x48\xb5", [0x2a76] = "\x48\xb6", [0x2a77] = "\x48\xb7",
-+  [0x2a78] = "\x48\xb8", [0x2a79] = "\x48\xb9", [0x2a7a] = "\x48\xba",
-+  [0x2a7b] = "\x48\xbb", [0x2a7c] = "\x48\xbc", [0x2a7d] = "\x48\xbd",
-+  [0x2a7e] = "\x48\xbe", [0x2a7f] = "\x48\xbf", [0x2a80] = "\x48\xc0",
-+  [0x2a81] = "\x48\xc1", [0x2a82] = "\x48\xc2", [0x2a83] = "\x48\xc3",
-+  [0x2a84] = "\x48\xc4", [0x2a85] = "\x48\xc5", [0x2a86] = "\x48\xc6",
-+  [0x2a87] = "\x48\xc7", [0x2a88] = "\x48\xc8", [0x2a89] = "\x48\xc9",
-+  [0x2a8a] = "\x48\xca", [0x2a8b] = "\x48\xcb", [0x2a8c] = "\x48\xcc",
-+  [0x2a8d] = "\x48\xcd", [0x2a8e] = "\x48\xce", [0x2a8f] = "\x48\xcf",
-+  [0x2a90] = "\x48\xd0", [0x2a91] = "\x48\xd1", [0x2a92] = "\x48\xd2",
-+  [0x2a93] = "\x48\xd3", [0x2a94] = "\x48\xd4", [0x2a95] = "\x48\xd5",
-+  [0x2a96] = "\x48\xd6", [0x2a97] = "\x48\xd7", [0x2a98] = "\x48\xd8",
-+  [0x2a99] = "\x48\xd9", [0x2a9a] = "\x48\xda", [0x2a9b] = "\x48\xdb",
-+  [0x2a9c] = "\x48\xdc", [0x2a9d] = "\x48\xdd", [0x2a9e] = "\x48\xde",
-+  [0x2a9f] = "\x48\xdf", [0x2aa0] = "\x48\xe0", [0x2aa1] = "\x48\xe1",
-+  [0x2aa2] = "\x48\xe2", [0x2aa3] = "\x48\xe3", [0x2aa4] = "\x48\xe4",
-+  [0x2aa5] = "\x48\xe5", [0x2aa6] = "\x48\xe6", [0x2aa7] = "\x48\xe7",
-+  [0x2aa8] = "\x48\xe8", [0x2aa9] = "\x48\xe9", [0x2aaa] = "\x48\xea",
-+  [0x2aab] = "\x48\xeb", [0x2aac] = "\x48\xec", [0x2aad] = "\x48\xed",
-+  [0x2aae] = "\x48\xee", [0x2aaf] = "\x48\xef", [0x2ab0] = "\x48\xf0",
-+  [0x2ab1] = "\x48\xf1", [0x2ab2] = "\x48\xf2", [0x2ab3] = "\x48\xf3",
-+  [0x2ab4] = "\x48\xf4", [0x2ab5] = "\x48\xf5", [0x2ab6] = "\x48\xf6",
-+  [0x2ab7] = "\x48\xf7", [0x2ab8] = "\x48\xf8", [0x2ab9] = "\x48\xf9",
-+  [0x2aba] = "\x48\xfa", [0x2abb] = "\x48\xfb", [0x2abc] = "\x48\xfc",
-+  [0x2abd] = "\x48\xfd", [0x2abe] = "\x48\xfe", [0x2abf] = "\x48\xff",
-+  [0x2ac0] = "\x49\x00", [0x2ac1] = "\x49\x01", [0x2ac2] = "\x49\x02",
-+  [0x2ac3] = "\x49\x03", [0x2ac4] = "\x49\x04", [0x2ac5] = "\x49\x05",
-+  [0x2ac6] = "\x49\x06", [0x2ac7] = "\x49\x07", [0x2ac8] = "\x49\x08",
-+  [0x2ac9] = "\x49\x09", [0x2aca] = "\x49\x0a", [0x2acb] = "\x49\x0b",
-+  [0x2acc] = "\x49\x0c", [0x2acd] = "\x49\x0d", [0x2ace] = "\x49\x0e",
-+  [0x2acf] = "\x49\x0f", [0x2ad0] = "\x49\x10", [0x2ad1] = "\x49\x11",
-+  [0x2ad2] = "\x49\x12", [0x2ad3] = "\x49\x13", [0x2ad4] = "\x49\x14",
-+  [0x2ad5] = "\x49\x15", [0x2ad6] = "\x49\x16", [0x2ad7] = "\x49\x17",
-+  [0x2ad8] = "\x49\x18", [0x2ad9] = "\x49\x19", [0x2ada] = "\x49\x1a",
-+  [0x2adb] = "\x49\x1b", [0x2adc] = "\x49\x1c", [0x2add] = "\x49\x1d",
-+  [0x2ade] = "\x49\x1e", [0x2adf] = "\x49\x1f", [0x2ae0] = "\x49\x20",
-+  [0x2ae1] = "\x49\x21", [0x2ae2] = "\x49\x22", [0x2ae3] = "\x49\x23",
-+  [0x2ae4] = "\x49\x24", [0x2ae5] = "\x49\x25", [0x2ae6] = "\x49\x26",
-+  [0x2ae7] = "\x49\x27", [0x2ae8] = "\x49\x28", [0x2ae9] = "\x49\x29",
-+  [0x2aea] = "\x49\x2a", [0x2aeb] = "\x49\x2b", [0x2aec] = "\x49\x2c",
-+  [0x2aed] = "\x49\x2d", [0x2aee] = "\x49\x2e", [0x2aef] = "\x49\x2f",
-+  [0x2af0] = "\x49\x30", [0x2af1] = "\x49\x31", [0x2af2] = "\x49\x32",
-+  [0x2af3] = "\x49\x33", [0x2af4] = "\x49\x34", [0x2af5] = "\x49\x35",
-+  [0x2af6] = "\x49\x36", [0x2af7] = "\x49\x37", [0x2af8] = "\x49\x38",
-+  [0x2af9] = "\x49\x39", [0x2afa] = "\x49\x3a", [0x2afb] = "\x49\x3b",
-+  [0x2afc] = "\x49\x3c", [0x2afd] = "\x49\x3d", [0x2afe] = "\x49\x3e",
-+  [0x2aff] = "\x49\x3f", [0x2b00] = "\x49\x40", [0x2b01] = "\x49\x41",
-+  [0x2b02] = "\x49\x42", [0x2b03] = "\x49\x43", [0x2b04] = "\x49\x44",
-+  [0x2b05] = "\x49\x45", [0x2b06] = "\x49\x46", [0x2b07] = "\x49\x47",
-+  [0x2b08] = "\x49\x48", [0x2b09] = "\x49\x49", [0x2b0a] = "\x49\x4a",
-+  [0x2b0b] = "\x49\x4b", [0x2b0c] = "\x49\x4c", [0x2b0d] = "\x49\x4d",
-+  [0x2b0e] = "\x49\x4e", [0x2b0f] = "\x49\x4f", [0x2b10] = "\x49\x50",
-+  [0x2b11] = "\x49\x51", [0x2b12] = "\x49\x52", [0x2b13] = "\x49\x53",
-+  [0x2b14] = "\x49\x54", [0x2b15] = "\x49\x55", [0x2b16] = "\x49\x56",
-+  [0x2b17] = "\x49\x57", [0x2b18] = "\x49\x58", [0x2b19] = "\x49\x59",
-+  [0x2b1a] = "\x49\x5a", [0x2b1b] = "\x49\x5b", [0x2b1c] = "\x49\x5c",
-+  [0x2b1d] = "\x49\x5d", [0x2b1e] = "\x49\x5e", [0x2b1f] = "\x49\x5f",
-+  [0x2b20] = "\x49\x60", [0x2b21] = "\x49\x61", [0x2b22] = "\x49\x62",
-+  [0x2b23] = "\x49\x63", [0x2b24] = "\x49\x64", [0x2b25] = "\x49\x65",
-+  [0x2b26] = "\x49\x66", [0x2b27] = "\x49\x67", [0x2b28] = "\x49\x68",
-+  [0x2b29] = "\x49\x69", [0x2b2a] = "\x49\x6a", [0x2b2b] = "\x49\x6b",
-+  [0x2b2c] = "\x49\x6c", [0x2b2d] = "\x49\x6d", [0x2b2e] = "\x49\x6e",
-+  [0x2b2f] = "\x49\x6f", [0x2b30] = "\x49\x70", [0x2b31] = "\x49\x71",
-+  [0x2b32] = "\x49\x72", [0x2b33] = "\x49\x73", [0x2b34] = "\x49\x74",
-+  [0x2b35] = "\x49\x75", [0x2b36] = "\x49\x76", [0x2b37] = "\x49\x77",
-+  [0x2b38] = "\x49\x78", [0x2b39] = "\x49\x79", [0x2b3a] = "\x49\x7a",
-+  [0x2b3b] = "\x49\x7b", [0x2b3c] = "\x49\x7c", [0x2b3d] = "\x49\x7d",
-+  [0x2b3e] = "\x49\x7e", [0x2b3f] = "\x49\x7f", [0x2b40] = "\x49\x80",
-+  [0x2b41] = "\x49\x81", [0x2b42] = "\x49\x82", [0x2b43] = "\x49\x83",
-+  [0x2b44] = "\x49\x84", [0x2b45] = "\x49\x85", [0x2b46] = "\x49\x86",
-+  [0x2b47] = "\x49\x87", [0x2b48] = "\x49\x88", [0x2b49] = "\x49\x89",
-+  [0x2b4a] = "\x49\x8a", [0x2b4b] = "\x49\x8b", [0x2b4c] = "\x49\x8c",
-+  [0x2b4d] = "\x49\x8d", [0x2b4e] = "\x49\x8e", [0x2b4f] = "\x49\x8f",
-+  [0x2b50] = "\x49\x90", [0x2b51] = "\x49\x91", [0x2b52] = "\x49\x92",
-+  [0x2b53] = "\x49\x93", [0x2b54] = "\x49\x94", [0x2b55] = "\x49\x95",
-+  [0x2b56] = "\x49\x96", [0x2b57] = "\x49\x97", [0x2b58] = "\x49\x98",
-+  [0x2b59] = "\x49\x99", [0x2b5a] = "\x49\x9a", [0x2b5b] = "\x49\x9b",
-+  [0x2b5c] = "\x49\x9c", [0x2b5d] = "\x49\x9d", [0x2b5e] = "\x49\x9e",
-+  [0x2b5f] = "\x49\x9f", [0x2b60] = "\x49\xa0", [0x2b61] = "\x49\xa1",
-+  [0x2b62] = "\x49\xa2", [0x2b63] = "\x49\xa3", [0x2b64] = "\x49\xa4",
-+  [0x2b65] = "\x49\xa5", [0x2b66] = "\x49\xa6", [0x2b67] = "\x49\xa7",
-+  [0x2b68] = "\x49\xa8", [0x2b69] = "\x49\xa9", [0x2b6a] = "\x49\xaa",
-+  [0x2b6b] = "\x49\xab", [0x2b6c] = "\x49\xac", [0x2b6d] = "\x49\xad",
-+  [0x2b6e] = "\x49\xae", [0x2b6f] = "\x49\xaf", [0x2b70] = "\x49\xb0",
-+  [0x2b71] = "\x49\xb1", [0x2b72] = "\x49\xb2", [0x2b73] = "\x49\xb3",
-+  [0x2b74] = "\x49\xb4", [0x2b75] = "\x49\xb5", [0x2b76] = "\x49\xb6",
-+  [0x2b77] = "\x49\xb7", [0x2b78] = "\x49\xb8", [0x2b79] = "\x49\xb9",
-+  [0x2b7a] = "\x49\xba", [0x2b7b] = "\x49\xbb", [0x2b7c] = "\x49\xbc",
-+  [0x2b7d] = "\x49\xbd", [0x2b7e] = "\x49\xbe", [0x2b7f] = "\x49\xbf",
-+  [0x2b80] = "\x49\xc0", [0x2b81] = "\x49\xc1", [0x2b82] = "\x49\xc2",
-+  [0x2b83] = "\x49\xc3", [0x2b84] = "\x49\xc4", [0x2b85] = "\x49\xc5",
-+  [0x2b86] = "\x49\xc6", [0x2b87] = "\x49\xc7", [0x2b88] = "\x49\xc8",
-+  [0x2b89] = "\x49\xc9", [0x2b8a] = "\x49\xca", [0x2b8b] = "\x49\xcb",
-+  [0x2b8c] = "\x49\xcc", [0x2b8d] = "\x49\xcd", [0x2b8e] = "\x49\xce",
-+  [0x2b8f] = "\x49\xcf", [0x2b90] = "\x49\xd0", [0x2b91] = "\x49\xd1",
-+  [0x2b92] = "\x49\xd2", [0x2b93] = "\x49\xd3", [0x2b94] = "\x49\xd4",
-+  [0x2b95] = "\x49\xd5", [0x2b96] = "\x49\xd6", [0x2b97] = "\x49\xd7",
-+  [0x2b98] = "\x49\xd8", [0x2b99] = "\x49\xd9", [0x2b9a] = "\x49\xda",
-+  [0x2b9b] = "\x49\xdb", [0x2b9c] = "\x49\xdc", [0x2b9d] = "\x49\xdd",
-+  [0x2b9e] = "\x49\xde", [0x2b9f] = "\x49\xdf", [0x2ba0] = "\x49\xe0",
-+  [0x2ba1] = "\x49\xe1", [0x2ba2] = "\x49\xe2", [0x2ba3] = "\x49\xe3",
-+  [0x2ba4] = "\x49\xe4", [0x2ba5] = "\x49\xe5", [0x2ba6] = "\x49\xe6",
-+  [0x2ba7] = "\x49\xe7", [0x2ba8] = "\x49\xe8", [0x2ba9] = "\x49\xe9",
-+  [0x2baa] = "\x49\xea", [0x2bab] = "\x49\xeb", [0x2bac] = "\x49\xec",
-+  [0x2bad] = "\x49\xed", [0x2bae] = "\x49\xee", [0x2baf] = "\x49\xef",
-+  [0x2bb0] = "\x49\xf0", [0x2bb1] = "\x49\xf1", [0x2bb2] = "\x49\xf2",
-+  [0x2bb3] = "\x49\xf3", [0x2bb4] = "\x49\xf4", [0x2bb5] = "\x49\xf5",
-+  [0x2bb6] = "\x49\xf6", [0x2bb7] = "\x49\xf7", [0x2bb8] = "\x49\xf8",
-+  [0x2bb9] = "\x49\xf9", [0x2bba] = "\x49\xfa", [0x2bbb] = "\x49\xfb",
-+  [0x2bbc] = "\x49\xfc", [0x2bbd] = "\x49\xfd", [0x2bbe] = "\x49\xfe",
-+  [0x2bbf] = "\x49\xff", [0x2bc0] = "\x4a\x00", [0x2bc1] = "\x4a\x01",
-+  [0x2bc2] = "\x4a\x02", [0x2bc3] = "\x4a\x03", [0x2bc4] = "\x4a\x04",
-+  [0x2bc5] = "\x4a\x05", [0x2bc6] = "\x4a\x06", [0x2bc7] = "\x4a\x07",
-+  [0x2bc8] = "\x4a\x08", [0x2bc9] = "\x4a\x09", [0x2bca] = "\x4a\x0a",
-+  [0x2bcb] = "\x4a\x0b", [0x2bcc] = "\x4a\x0c", [0x2bcd] = "\x4a\x0d",
-+  [0x2bce] = "\x4a\x0e", [0x2bcf] = "\x4a\x0f", [0x2bd0] = "\x4a\x10",
-+  [0x2bd1] = "\x4a\x11", [0x2bd2] = "\x4a\x12", [0x2bd3] = "\x4a\x13",
-+  [0x2bd4] = "\x4a\x14", [0x2bd5] = "\x4a\x15", [0x2bd6] = "\x4a\x16",
-+  [0x2bd7] = "\x4a\x17", [0x2bd8] = "\x4a\x18", [0x2bd9] = "\x4a\x19",
-+  [0x2bda] = "\x4a\x1a", [0x2bdb] = "\x4a\x1b", [0x2bdc] = "\x4a\x1c",
-+  [0x2bdd] = "\x4a\x1d", [0x2bde] = "\x4a\x1e", [0x2bdf] = "\x4a\x1f",
-+  [0x2be0] = "\x4a\x20", [0x2be1] = "\x4a\x21", [0x2be2] = "\x4a\x22",
-+  [0x2be3] = "\x4a\x23", [0x2be4] = "\x4a\x24", [0x2be5] = "\x4a\x25",
-+  [0x2be6] = "\x4a\x26", [0x2be7] = "\x4a\x27", [0x2be8] = "\x4a\x28",
-+  [0x2be9] = "\x4a\x29", [0x2bea] = "\x4a\x2a", [0x2beb] = "\x4a\x2b",
-+  [0x2bec] = "\x4a\x2c", [0x2bed] = "\x4a\x2d", [0x2bee] = "\x4a\x2e",
-+  [0x2bef] = "\x4a\x2f", [0x2bf0] = "\x4a\x30", [0x2bf1] = "\x4a\x31",
-+  [0x2bf2] = "\x4a\x32", [0x2bf3] = "\x4a\x33", [0x2bf4] = "\x4a\x34",
-+  [0x2bf5] = "\x4a\x35", [0x2bf6] = "\x4a\x36", [0x2bf7] = "\x4a\x37",
-+  [0x2bf8] = "\x4a\x38", [0x2bf9] = "\x4a\x39", [0x2bfa] = "\x4a\x3a",
-+  [0x2bfb] = "\x4a\x3b", [0x2bfc] = "\x4a\x3c", [0x2bfd] = "\x4a\x3d",
-+  [0x2bfe] = "\x4a\x3e", [0x2bff] = "\x4a\x3f", [0x2c00] = "\x4a\x40",
-+  [0x2c01] = "\x4a\x41", [0x2c02] = "\x4a\x42", [0x2c03] = "\x4a\x43",
-+  [0x2c04] = "\x4a\x44", [0x2c05] = "\x4a\x45", [0x2c06] = "\x4a\x46",
-+  [0x2c07] = "\x4a\x47", [0x2c08] = "\x4a\x48", [0x2c09] = "\x4a\x49",
-+  [0x2c0a] = "\x4a\x4a", [0x2c0b] = "\x4a\x4b", [0x2c0c] = "\x4a\x4c",
-+  [0x2c0d] = "\x4a\x4d", [0x2c0e] = "\x4a\x4e", [0x2c0f] = "\x4a\x4f",
-+  [0x2c10] = "\x4a\x50", [0x2c11] = "\x4a\x51", [0x2c12] = "\x4a\x52",
-+  [0x2c13] = "\x4a\x53", [0x2c14] = "\x4a\x54", [0x2c15] = "\x4a\x55",
-+  [0x2c16] = "\x4a\x56", [0x2c17] = "\x4a\x57", [0x2c18] = "\x4a\x58",
-+  [0x2c19] = "\x4a\x59", [0x2c1a] = "\x4a\x5a", [0x2c1b] = "\x4a\x5b",
-+  [0x2c1c] = "\x4a\x5c", [0x2c1d] = "\x4a\x5d", [0x2c1e] = "\x4a\x5e",
-+  [0x2c1f] = "\x4a\x5f", [0x2c20] = "\x4a\x60", [0x2c21] = "\x4a\x61",
-+  [0x2c22] = "\x4a\x62", [0x2c23] = "\x4a\x63", [0x2c24] = "\x4a\x64",
-+  [0x2c25] = "\x4a\x65", [0x2c26] = "\x4a\x66", [0x2c27] = "\x4a\x67",
-+  [0x2c28] = "\x4a\x68", [0x2c29] = "\x4a\x69", [0x2c2a] = "\x4a\x6a",
-+  [0x2c2b] = "\x4a\x6b", [0x2c2c] = "\x4a\x6c", [0x2c2d] = "\x4a\x6d",
-+  [0x2c2e] = "\x4a\x6e", [0x2c2f] = "\x4a\x6f", [0x2c30] = "\x4a\x70",
-+  [0x2c31] = "\x4a\x71", [0x2c32] = "\x4a\x72", [0x2c33] = "\x4a\x73",
-+  [0x2c34] = "\x4a\x74", [0x2c35] = "\x4a\x75", [0x2c36] = "\x4a\x76",
-+  [0x2c37] = "\x4a\x77", [0x2c38] = "\x4a\x78", [0x2c39] = "\x4a\x79",
-+  [0x2c3a] = "\x4a\x7a", [0x2c3b] = "\x4a\x7b", [0x2c3c] = "\x4a\x7c",
-+  [0x2c3d] = "\x4a\x7d", [0x2c3e] = "\x4a\x7e", [0x2c3f] = "\x4a\x7f",
-+  [0x2c40] = "\x4a\x80", [0x2c41] = "\x4a\x81", [0x2c42] = "\x4a\x82",
-+  [0x2c43] = "\x4a\x83", [0x2c44] = "\x4a\x84", [0x2c45] = "\x4a\x85",
-+  [0x2c46] = "\x4a\x86", [0x2c47] = "\x4a\x87", [0x2c48] = "\x4a\x88",
-+  [0x2c49] = "\x4a\x89", [0x2c4a] = "\x4a\x8a", [0x2c4b] = "\x4a\x8b",
-+  [0x2c4c] = "\x4a\x8c", [0x2c4d] = "\x4a\x8d", [0x2c4e] = "\x4a\x8e",
-+  [0x2c4f] = "\x4a\x8f", [0x2c50] = "\x4a\x90", [0x2c51] = "\x4a\x91",
-+  [0x2c52] = "\x4a\x92", [0x2c53] = "\x4a\x93", [0x2c54] = "\x4a\x94",
-+  [0x2c55] = "\x4a\x95", [0x2c56] = "\x4a\x96", [0x2c57] = "\x4a\x97",
-+  [0x2c58] = "\x4a\x98", [0x2c59] = "\x4a\x99", [0x2c5a] = "\x4a\x9a",
-+  [0x2c5b] = "\x4a\x9b", [0x2c5c] = "\x4a\x9c", [0x2c5d] = "\x4a\x9d",
-+  [0x2c5e] = "\x4a\x9e", [0x2c5f] = "\x4a\x9f", [0x2c60] = "\x4a\xa0",
-+  [0x2c61] = "\x4a\xa1", [0x2c62] = "\x4a\xa2", [0x2c63] = "\x4a\xa3",
-+  [0x2c64] = "\x4a\xa4", [0x2c65] = "\x4a\xa5", [0x2c66] = "\x4a\xa6",
-+  [0x2c67] = "\x4a\xa7", [0x2c68] = "\x4a\xa8", [0x2c69] = "\x4a\xa9",
-+  [0x2c6a] = "\x4a\xaa", [0x2c6b] = "\x4a\xab", [0x2c6c] = "\x4a\xac",
-+  [0x2c6d] = "\x4a\xad", [0x2c6e] = "\x4a\xae", [0x2c6f] = "\x4a\xaf",
-+  [0x2c70] = "\x4a\xb0", [0x2c71] = "\x4a\xb1", [0x2c72] = "\x4a\xb2",
-+  [0x2c73] = "\x4a\xb3", [0x2c74] = "\x4a\xb4", [0x2c75] = "\x4a\xb5",
-+  [0x2c76] = "\x4a\xb6", [0x2c77] = "\x4a\xb7", [0x2c78] = "\x4a\xb8",
-+  [0x2c79] = "\x4a\xb9", [0x2c7a] = "\x4a\xba", [0x2c7b] = "\x4a\xbb",
-+  [0x2c7c] = "\x4a\xbc", [0x2c7d] = "\x4a\xbd", [0x2c7e] = "\x4a\xbe",
-+  [0x2c7f] = "\x4a\xbf", [0x2c80] = "\x4a\xc0", [0x2c81] = "\x4a\xc1",
-+  [0x2c82] = "\x4a\xc2", [0x2c83] = "\x4a\xc3", [0x2c84] = "\x4a\xc4",
-+  [0x2c85] = "\x4a\xc5", [0x2c86] = "\x4a\xc6", [0x2c87] = "\x4a\xc7",
-+  [0x2c88] = "\x4a\xc8", [0x2c89] = "\x4a\xc9", [0x2c8a] = "\x4a\xca",
-+  [0x2c8b] = "\x4a\xcb", [0x2c8c] = "\x4a\xcc", [0x2c8d] = "\x4a\xcd",
-+  [0x2c8e] = "\x4a\xce", [0x2c8f] = "\x4a\xcf", [0x2c90] = "\x4a\xd0",
-+  [0x2c91] = "\x4a\xd1", [0x2c92] = "\x4a\xd2", [0x2c93] = "\x4a\xd3",
-+  [0x2c94] = "\x4a\xd4", [0x2c95] = "\x4a\xd5", [0x2c96] = "\x4a\xd6",
-+  [0x2c97] = "\x4a\xd7", [0x2c98] = "\x4a\xd8", [0x2c99] = "\x4a\xd9",
-+  [0x2c9a] = "\x4a\xda", [0x2c9b] = "\x4a\xdb", [0x2c9c] = "\x4a\xdc",
-+  [0x2c9d] = "\x4a\xdd", [0x2c9e] = "\x4a\xde", [0x2c9f] = "\x4a\xdf",
-+  [0x2ca0] = "\x4a\xe0", [0x2ca1] = "\x4a\xe1", [0x2ca2] = "\x4a\xe2",
-+  [0x2ca3] = "\x4a\xe3", [0x2ca4] = "\x4a\xe4", [0x2ca5] = "\x4a\xe5",
-+  [0x2ca6] = "\x4a\xe6", [0x2ca7] = "\x4a\xe7", [0x2ca8] = "\x4a\xe8",
-+  [0x2ca9] = "\x4a\xe9", [0x2caa] = "\x4a\xea", [0x2cab] = "\x4a\xeb",
-+  [0x2cac] = "\x4a\xec", [0x2cad] = "\x4a\xed", [0x2cae] = "\x4a\xee",
-+  [0x2caf] = "\x4a\xef", [0x2cb0] = "\x4a\xf0", [0x2cb1] = "\x4a\xf1",
-+  [0x2cb2] = "\x4a\xf2", [0x2cb3] = "\x4a\xf3", [0x2cb4] = "\x4a\xf4",
-+  [0x2cb5] = "\x4a\xf5", [0x2cb6] = "\x4a\xf6", [0x2cb7] = "\x4a\xf7",
-+  [0x2cb8] = "\x4a\xf8", [0x2cb9] = "\x4a\xf9", [0x2cba] = "\x4a\xfa",
-+  [0x2cbb] = "\x4a\xfb", [0x2cbc] = "\x4a\xfc", [0x2cbd] = "\x4a\xfd",
-+  [0x2cbe] = "\x4a\xfe", [0x2cbf] = "\x4a\xff", [0x2cc0] = "\x4b\x00",
-+  [0x2cc1] = "\x4b\x01", [0x2cc2] = "\x4b\x02", [0x2cc3] = "\x4b\x03",
-+  [0x2cc4] = "\x4b\x04", [0x2cc5] = "\x4b\x05", [0x2cc6] = "\x4b\x06",
-+  [0x2cc7] = "\x4b\x07", [0x2cc8] = "\x4b\x08", [0x2cc9] = "\x4b\x09",
-+  [0x2cca] = "\x4b\x0a", [0x2ccb] = "\x4b\x0b", [0x2ccc] = "\x4b\x0c",
-+  [0x2ccd] = "\x4b\x0d", [0x2cce] = "\x4b\x0e", [0x2ccf] = "\x4b\x0f",
-+  [0x2cd0] = "\x4b\x10", [0x2cd1] = "\x4b\x11", [0x2cd2] = "\x4b\x12",
-+  [0x2cd3] = "\x4b\x13", [0x2cd4] = "\x4b\x14", [0x2cd5] = "\x4b\x15",
-+  [0x2cd6] = "\x4b\x16", [0x2cd7] = "\x4b\x17", [0x2cd8] = "\x4b\x18",
-+  [0x2cd9] = "\x4b\x19", [0x2cda] = "\x4b\x1a", [0x2cdb] = "\x4b\x1b",
-+  [0x2cdc] = "\x4b\x1c", [0x2cdd] = "\x4b\x1d", [0x2cde] = "\x4b\x1e",
-+  [0x2cdf] = "\x4b\x1f", [0x2ce0] = "\x4b\x20", [0x2ce1] = "\x4b\x21",
-+  [0x2ce2] = "\x4b\x22", [0x2ce3] = "\x4b\x23", [0x2ce4] = "\x4b\x24",
-+  [0x2ce5] = "\x4b\x25", [0x2ce6] = "\x4b\x26", [0x2ce7] = "\x4b\x27",
-+  [0x2ce8] = "\x4b\x28", [0x2ce9] = "\x4b\x29", [0x2cea] = "\x4b\x2a",
-+  [0x2ceb] = "\x4b\x2b", [0x2cec] = "\x4b\x2c", [0x2ced] = "\x4b\x2d",
-+  [0x2cee] = "\x4b\x2e", [0x2cef] = "\x4b\x2f", [0x2cf0] = "\x4b\x30",
-+  [0x2cf1] = "\x4b\x31", [0x2cf2] = "\x4b\x32", [0x2cf3] = "\x4b\x33",
-+  [0x2cf4] = "\x4b\x34", [0x2cf5] = "\x4b\x35", [0x2cf6] = "\x4b\x36",
-+  [0x2cf7] = "\x4b\x37", [0x2cf8] = "\x4b\x38", [0x2cf9] = "\x4b\x39",
-+  [0x2cfa] = "\x4b\x3a", [0x2cfb] = "\x4b\x3b", [0x2cfc] = "\x4b\x3c",
-+  [0x2cfd] = "\x4b\x3d", [0x2cfe] = "\x4b\x3e", [0x2cff] = "\x4b\x3f",
-+  [0x2d00] = "\x4b\x40", [0x2d01] = "\x4b\x41", [0x2d02] = "\x4b\x42",
-+  [0x2d03] = "\x4b\x43", [0x2d04] = "\x4b\x44", [0x2d05] = "\x4b\x45",
-+  [0x2d06] = "\x4b\x46", [0x2d07] = "\x4b\x47", [0x2d08] = "\x4b\x48",
-+  [0x2d09] = "\x4b\x49", [0x2d0a] = "\x4b\x4a", [0x2d0b] = "\x4b\x4b",
-+  [0x2d0c] = "\x4b\x4c", [0x2d0d] = "\x4b\x4d", [0x2d0e] = "\x4b\x4e",
-+  [0x2d0f] = "\x4b\x4f", [0x2d10] = "\x4b\x50", [0x2d11] = "\x4b\x51",
-+  [0x2d12] = "\x4b\x52", [0x2d13] = "\x4b\x53", [0x2d14] = "\x4b\x54",
-+  [0x2d15] = "\x4b\x55", [0x2d16] = "\x4b\x56", [0x2d17] = "\x4b\x57",
-+  [0x2d18] = "\x4b\x58", [0x2d19] = "\x4b\x59", [0x2d1a] = "\x4b\x5a",
-+  [0x2d1b] = "\x4b\x5b", [0x2d1c] = "\x4b\x5c", [0x2d1d] = "\x4b\x5d",
-+  [0x2d1e] = "\x4b\x5e", [0x2d1f] = "\x4b\x5f", [0x2d20] = "\x4b\x60",
-+  [0x2d21] = "\x4b\x61", [0x2d22] = "\x4b\x62", [0x2d23] = "\x4b\x63",
-+  [0x2d24] = "\x4b\x64", [0x2d25] = "\x4b\x65", [0x2d26] = "\x4b\x66",
-+  [0x2d27] = "\x4b\x67", [0x2d28] = "\x4b\x68", [0x2d29] = "\x4b\x69",
-+  [0x2d2a] = "\x4b\x6a", [0x2d2b] = "\x4b\x6b", [0x2d2c] = "\x4b\x6c",
-+  [0x2d2d] = "\x4b\x6d", [0x2d2e] = "\x4b\x6e", [0x2d2f] = "\x4b\x6f",
-+  [0x2d30] = "\x4b\x70", [0x2d31] = "\x4b\x71", [0x2d32] = "\x4b\x72",
-+  [0x2d33] = "\x4b\x73", [0x2d34] = "\x4b\x74", [0x2d35] = "\x4b\x75",
-+  [0x2d36] = "\x4b\x76", [0x2d37] = "\x4b\x77", [0x2d38] = "\x4b\x78",
-+  [0x2d39] = "\x4b\x79", [0x2d3a] = "\x4b\x7a", [0x2d3b] = "\x4b\x7b",
-+  [0x2d3c] = "\x4b\x7c", [0x2d3d] = "\x4b\x7d", [0x2d3e] = "\x4b\x7e",
-+  [0x2d3f] = "\x4b\x7f", [0x2d40] = "\x4b\x80", [0x2d41] = "\x4b\x81",
-+  [0x2d42] = "\x4b\x82", [0x2d43] = "\x4b\x83", [0x2d44] = "\x4b\x84",
-+  [0x2d45] = "\x4b\x85", [0x2d46] = "\x4b\x86", [0x2d47] = "\x4b\x87",
-+  [0x2d48] = "\x4b\x88", [0x2d49] = "\x4b\x89", [0x2d4a] = "\x4b\x8a",
-+  [0x2d4b] = "\x4b\x8b", [0x2d4c] = "\x4b\x8c", [0x2d4d] = "\x4b\x8d",
-+  [0x2d4e] = "\x4b\x8e", [0x2d4f] = "\x4b\x8f", [0x2d50] = "\x4b\x90",
-+  [0x2d51] = "\x4b\x91", [0x2d52] = "\x4b\x92", [0x2d53] = "\x4b\x93",
-+  [0x2d54] = "\x4b\x94", [0x2d55] = "\x4b\x95", [0x2d56] = "\x4b\x96",
-+  [0x2d57] = "\x4b\x97", [0x2d58] = "\x4b\x98", [0x2d59] = "\x4b\x99",
-+  [0x2d5a] = "\x4b\x9a", [0x2d5b] = "\x4b\x9b", [0x2d5c] = "\x4b\x9c",
-+  [0x2d5d] = "\x4b\x9d", [0x2d5e] = "\x4b\x9e", [0x2d5f] = "\x4b\x9f",
-+  [0x2d60] = "\x4b\xa0", [0x2d61] = "\x4b\xa1", [0x2d62] = "\x4b\xa2",
-+  [0x2d63] = "\x4b\xa3", [0x2d64] = "\x4b\xa4", [0x2d65] = "\x4b\xa5",
-+  [0x2d66] = "\x4b\xa6", [0x2d67] = "\x4b\xa7", [0x2d68] = "\x4b\xa8",
-+  [0x2d69] = "\x4b\xa9", [0x2d6a] = "\x4b\xaa", [0x2d6b] = "\x4b\xab",
-+  [0x2d6c] = "\x4b\xac", [0x2d6d] = "\x4b\xad", [0x2d6e] = "\x4b\xae",
-+  [0x2d6f] = "\x4b\xaf", [0x2d70] = "\x4b\xb0", [0x2d71] = "\x4b\xb1",
-+  [0x2d72] = "\x4b\xb2", [0x2d73] = "\x4b\xb3", [0x2d74] = "\x4b\xb4",
-+  [0x2d75] = "\x4b\xb5", [0x2d76] = "\x4b\xb6", [0x2d77] = "\x4b\xb7",
-+  [0x2d78] = "\x4b\xb8", [0x2d79] = "\x4b\xb9", [0x2d7a] = "\x4b\xba",
-+  [0x2d7b] = "\x4b\xbb", [0x2d7c] = "\x4b\xbc", [0x2d7d] = "\x4b\xbd",
-+  [0x2d7e] = "\x4b\xbe", [0x2d7f] = "\x4b\xbf", [0x2d80] = "\x4b\xc0",
-+  [0x2d81] = "\x4b\xc1", [0x2d82] = "\x4b\xc2", [0x2d83] = "\x4b\xc3",
-+  [0x2d84] = "\x4b\xc4", [0x2d85] = "\x4b\xc5", [0x2d86] = "\x4b\xc6",
-+  [0x2d87] = "\x4b\xc7", [0x2d88] = "\x4b\xc8", [0x2d89] = "\x4b\xc9",
-+  [0x2d8a] = "\x4b\xca", [0x2d8b] = "\x4b\xcb", [0x2d8c] = "\x4b\xcc",
-+  [0x2d8d] = "\x4b\xcd", [0x2d8e] = "\x4b\xce", [0x2d8f] = "\x4b\xcf",
-+  [0x2d90] = "\x4b\xd0", [0x2d91] = "\x4b\xd1", [0x2d92] = "\x4b\xd2",
-+  [0x2d93] = "\x4b\xd3", [0x2d94] = "\x4b\xd4", [0x2d95] = "\x4b\xd5",
-+  [0x2d96] = "\x4b\xd6", [0x2d97] = "\x4b\xd7", [0x2d98] = "\x4b\xd8",
-+  [0x2d99] = "\x4b\xd9", [0x2d9a] = "\x4b\xda", [0x2d9b] = "\x4b\xdb",
-+  [0x2d9c] = "\x4b\xdc", [0x2d9d] = "\x4b\xdd", [0x2d9e] = "\x4b\xde",
-+  [0x2d9f] = "\x4b\xdf", [0x2da0] = "\x4b\xe0", [0x2da1] = "\x4b\xe1",
-+  [0x2da2] = "\x4b\xe2", [0x2da3] = "\x4b\xe3", [0x2da4] = "\x4b\xe4",
-+  [0x2da5] = "\x4b\xe5", [0x2da6] = "\x4b\xe6", [0x2da7] = "\x4b\xe7",
-+  [0x2da8] = "\x4b\xe8", [0x2da9] = "\x4b\xe9", [0x2daa] = "\x4b\xea",
-+  [0x2dab] = "\x4b\xeb", [0x2dac] = "\x4b\xec", [0x2dad] = "\x4b\xed",
-+  [0x2dae] = "\x4b\xee", [0x2daf] = "\x4b\xef", [0x2db0] = "\x4b\xf0",
-+  [0x2db1] = "\x4b\xf1", [0x2db2] = "\x4b\xf2", [0x2db3] = "\x4b\xf3",
-+  [0x2db4] = "\x4b\xf4", [0x2db5] = "\x4b\xf5", [0x2db6] = "\x4b\xf6",
-+  [0x2db7] = "\x4b\xf7", [0x2db8] = "\x4b\xf8", [0x2db9] = "\x4b\xf9",
-+  [0x2dba] = "\x4b\xfa", [0x2dbb] = "\x4b\xfb", [0x2dbc] = "\x4b\xfc",
-+  [0x2dbd] = "\x4b\xfd", [0x2dbe] = "\x4b\xfe", [0x2dbf] = "\x4b\xff",
-+  [0x2dc0] = "\x4c\x00", [0x2dc1] = "\x4c\x01", [0x2dc2] = "\x4c\x02",
-+  [0x2dc3] = "\x4c\x03", [0x2dc4] = "\x4c\x04", [0x2dc5] = "\x4c\x05",
-+  [0x2dc6] = "\x4c\x06", [0x2dc7] = "\x4c\x07", [0x2dc8] = "\x4c\x08",
-+  [0x2dc9] = "\x4c\x09", [0x2dca] = "\x4c\x0a", [0x2dcb] = "\x4c\x0b",
-+  [0x2dcc] = "\x4c\x0c", [0x2dcd] = "\x4c\x0d", [0x2dce] = "\x4c\x0e",
-+  [0x2dcf] = "\x4c\x0f", [0x2dd0] = "\x4c\x10", [0x2dd1] = "\x4c\x11",
-+  [0x2dd2] = "\x4c\x12", [0x2dd3] = "\x4c\x13", [0x2dd4] = "\x4c\x14",
-+  [0x2dd5] = "\x4c\x15", [0x2dd6] = "\x4c\x16", [0x2dd7] = "\x4c\x17",
-+  [0x2dd8] = "\x4c\x18", [0x2dd9] = "\x4c\x19", [0x2dda] = "\x4c\x1a",
-+  [0x2ddb] = "\x4c\x1b", [0x2ddc] = "\x4c\x1c", [0x2ddd] = "\x4c\x1d",
-+  [0x2dde] = "\x4c\x1e", [0x2ddf] = "\x4c\x1f", [0x2de0] = "\x4c\x20",
-+  [0x2de1] = "\x4c\x21", [0x2de2] = "\x4c\x22", [0x2de3] = "\x4c\x23",
-+  [0x2de4] = "\x4c\x24", [0x2de5] = "\x4c\x25", [0x2de6] = "\x4c\x26",
-+  [0x2de7] = "\x4c\x27", [0x2de8] = "\x4c\x28", [0x2de9] = "\x4c\x29",
-+  [0x2dea] = "\x4c\x2a", [0x2deb] = "\x4c\x2b", [0x2dec] = "\x4c\x2c",
-+  [0x2ded] = "\x4c\x2d", [0x2dee] = "\x4c\x2e", [0x2def] = "\x4c\x2f",
-+  [0x2df0] = "\x4c\x30", [0x2df1] = "\x4c\x31", [0x2df2] = "\x4c\x32",
-+  [0x2df3] = "\x4c\x33", [0x2df4] = "\x4c\x34", [0x2df5] = "\x4c\x35",
-+  [0x2df6] = "\x4c\x36", [0x2df7] = "\x4c\x37", [0x2df8] = "\x4c\x38",
-+  [0x2df9] = "\x4c\x39", [0x2dfa] = "\x4c\x3a", [0x2dfb] = "\x4c\x3b",
-+  [0x2dfc] = "\x4c\x3c", [0x2dfd] = "\x4c\x3d", [0x2dfe] = "\x4c\x3e",
-+  [0x2dff] = "\x4c\x3f", [0x2e00] = "\x4c\x40", [0x2e01] = "\xfe\x50",
-+  [0x2e02] = "\x4c\x41", [0x2e03] = "\x4c\x42", [0x2e04] = "\xfe\x54",
-+  [0x2e05] = "\x4c\x43", [0x2e06] = "\x4c\x44", [0x2e07] = "\x4c\x45",
-+  [0x2e08] = "\xfe\x57", [0x2e09] = "\x4c\x46", [0x2e0a] = "\x4c\x47",
-+  [0x2e0b] = "\xfe\x58", [0x2e0c] = "\xfe\x5d", [0x2e0d] = "\x4c\x48",
-+  [0x2e0e] = "\x4c\x49", [0x2e0f] = "\x4c\x4a", [0x2e10] = "\x4c\x4b",
-+  [0x2e11] = "\x4c\x4c", [0x2e12] = "\x4c\x4d", [0x2e13] = "\x4c\x4e",
-+  [0x2e14] = "\x4c\x4f", [0x2e15] = "\x4c\x50", [0x2e16] = "\x4c\x51",
-+  [0x2e17] = "\xfe\x5e", [0x2e18] = "\x4c\x52", [0x2e19] = "\x4c\x53",
-+  [0x2e1a] = "\x4c\x54", [0x2e1b] = "\x4c\x55", [0x2e1c] = "\x4c\x56",
-+  [0x2e1d] = "\x4c\x57", [0x2e1e] = "\x4c\x58", [0x2e1f] = "\x4c\x59",
-+  [0x2e20] = "\x4c\x5a", [0x2e21] = "\x4c\x5b", [0x2e22] = "\x4c\x5c",
-+  [0x2e23] = "\x4c\x5d", [0x2e24] = "\x4c\x5e", [0x2e25] = "\x4c\x5f",
-+  [0x2e26] = "\x4c\x60", [0x2e27] = "\xfe\x6b", [0x2e28] = "\x4c\x61",
-+  [0x2e29] = "\x4c\x62", [0x2e2a] = "\xfe\x6e", [0x2e2b] = "\x4c\x63",
-+  [0x2e2c] = "\x4c\x64", [0x2e2d] = "\x4c\x65", [0x2e2e] = "\xfe\x71",
-+  [0x2e2f] = "\x4c\x66", [0x2e30] = "\x4c\x67", [0x2e31] = "\x4c\x68",
-+  [0x2e32] = "\x4c\x69", [0x2e33] = "\xfe\x73", [0x2e34] = "\x4c\x6a",
-+  [0x2e35] = "\x4c\x6b", [0x2e36] = "\xfe\x74", [0x2e37] = "\xfe\x75",
-+  [0x2e38] = "\x4c\x6c", [0x2e39] = "\x4c\x6d", [0x2e3a] = "\x4c\x6e",
-+  [0x2e3b] = "\xfe\x79", [0x2e3c] = "\x4c\x6f", [0x2e3d] = "\x4c\x70",
-+  [0x2e3e] = "\x4c\x71", [0x2e3f] = "\x4c\x72", [0x2e40] = "\x4c\x73",
-+  [0x2e41] = "\x4c\x74", [0x2e42] = "\x4c\x75", [0x2e43] = "\x4c\x76",
-+  [0x2e44] = "\x4c\x77", [0x2e45] = "\x4c\x78", [0x2e46] = "\x4c\x79",
-+  [0x2e47] = "\x4c\x7a", [0x2e48] = "\x4c\x7b", [0x2e49] = "\x4c\x7c",
-+  [0x2e4a] = "\xfe\x84", [0x2e4b] = "\x4c\x7d", [0x2e4c] = "\x4c\x7e",
-+  [0x2e4d] = "\x4c\x7f", [0x2e4e] = "\x4c\x80", [0x2e4f] = "\x4c\x81",
-+  [0x2e50] = "\x4c\x82", [0x2e51] = "\x4c\x83", [0x2e52] = "\x4c\x84",
-+  [0x2e53] = "\x4c\x85", [0x2e54] = "\x4c\x86", [0x2e55] = "\x4c\x87",
-+  [0x2e56] = "\x4c\x88", [0x2e57] = "\x4c\x89", [0x2e58] = "\x4c\x8a",
-+  [0x2e59] = "\x4c\x8b", [0x2e5a] = "\x4c\x8c", [0x2e5b] = "\x4c\x8d",
-+  [0x2e5c] = "\x4c\x8e", [0x2e5d] = "\x4c\x8f", [0x2e5e] = "\x4c\x90",
-+  [0x2e5f] = "\x4c\x91", [0x2e60] = "\x4c\x92", [0x2e61] = "\x4c\x93",
-+  [0x2e62] = "\x4c\x94", [0x2e63] = "\x4c\x95", [0x2e64] = "\x4c\x96",
-+  [0x2e65] = "\x4c\x97", [0x2e66] = "\x4c\x98", [0x2e67] = "\x4c\x99",
-+  [0x2e68] = "\x4c\x9a", [0x2e69] = "\x4c\x9b", [0x2e6a] = "\x4c\x9c",
-+  [0x2e6b] = "\x4c\x9d", [0x2e6c] = "\x4c\x9e", [0x2e6d] = "\x4c\x9f",
-+  [0x2e6e] = "\x4c\xa0", [0x2e6f] = "\x4c\xa1", [0x2e70] = "\x4c\xa2",
-+  [0x2e71] = "\x4c\xa3", [0x2e72] = "\x4c\xa4", [0x2e73] = "\x4c\xa5",
-+  [0x2e74] = "\x4c\xa6", [0x2e75] = "\x4c\xa7", [0x2e76] = "\x4c\xa8",
-+  [0x2e77] = "\x4c\xa9", [0x2e78] = "\x4c\xaa", [0x2e79] = "\x4c\xab",
-+  [0x2e7a] = "\x4c\xac", [0x2e7b] = "\x4c\xad", [0x2e7c] = "\x4c\xae",
-+  [0x2e7d] = "\x4c\xaf", [0x2e7e] = "\x4c\xb0", [0x2e7f] = "\x4c\xb1",
-+  [0x2e80] = "\x4c\xb2", [0x2e81] = "\x4c\xb3", [0x2e82] = "\x4c\xb4",
-+  [0x2e83] = "\x4c\xb5", [0x2e84] = "\x4c\xb6", [0x2e85] = "\x4c\xb7",
-+  [0x2e86] = "\x4c\xb8", [0x2e87] = "\x4c\xb9", [0x2e88] = "\x4c\xba",
-+  [0x2e89] = "\x4c\xbb", [0x2e8a] = "\x4c\xbc", [0x2e8b] = "\x4c\xbd",
-+  [0x2e8c] = "\x4c\xbe", [0x2e8d] = "\x4c\xbf", [0x2e8e] = "\x4c\xc0",
-+  [0x2e8f] = "\x4c\xc1", [0x2e90] = "\x4c\xc2", [0x2e91] = "\x4c\xc3",
-+  [0x2e92] = "\x4c\xc4", [0x2e93] = "\x4c\xc5", [0x2e94] = "\x4c\xc6",
-+  [0x2e95] = "\x4c\xc7", [0x2e96] = "\x4c\xc8", [0x2e97] = "\x4c\xc9",
-+  [0x2e98] = "\x4c\xca", [0x2e99] = "\x4c\xcb", [0x2e9a] = "\x4c\xcc",
-+  [0x2e9b] = "\x4c\xcd", [0x2e9c] = "\x4c\xce", [0x2e9d] = "\x4c\xcf",
-+  [0x2e9e] = "\x4c\xd0", [0x2e9f] = "\x4c\xd1", [0x2ea0] = "\x4c\xd2",
-+  [0x2ea1] = "\x4c\xd3", [0x2ea2] = "\x4c\xd4", [0x2ea3] = "\x4c\xd5",
-+  [0x2ea4] = "\x4c\xd6", [0x2ea5] = "\x4c\xd7", [0x2ea6] = "\x4c\xd8",
-+  [0x2ea7] = "\x4c\xd9", [0x2ea8] = "\x4c\xda", [0x2ea9] = "\x4c\xdb",
-+  [0x2eaa] = "\x4c\xdc", [0x2eab] = "\x4c\xdd", [0x2eac] = "\x4c\xde",
-+  [0x2ead] = "\x4c\xdf", [0x2eae] = "\x4c\xe0", [0x2eaf] = "\x4c\xe1",
-+  [0x2eb0] = "\x4c\xe2", [0x2eb1] = "\x4c\xe3", [0x2eb2] = "\x4c\xe4",
-+  [0x2eb3] = "\x4c\xe5", [0x2eb4] = "\x4c\xe6", [0x2eb5] = "\x4c\xe7",
-+  [0x2eb6] = "\x4c\xe8", [0x2eb7] = "\x4c\xe9", [0x2eb8] = "\x4c\xea",
-+  [0x2eb9] = "\x4c\xeb", [0x2eba] = "\x4c\xec", [0x2ebb] = "\x4c\xed",
-+  [0x2ebc] = "\x4c\xee", [0x2ebd] = "\x4c\xef", [0x2ebe] = "\x4c\xf0",
-+  [0x2ebf] = "\x4c\xf1", [0x2ec0] = "\x4c\xf2", [0x2ec1] = "\x4c\xf3",
-+  [0x2ec2] = "\x4c\xf4", [0x2ec3] = "\x4c\xf5", [0x2ec4] = "\x4c\xf6",
-+  [0x2ec5] = "\x4c\xf7", [0x2ec6] = "\x4c\xf8", [0x2ec7] = "\x4c\xf9",
-+  [0x2ec8] = "\x4c\xfa", [0x2ec9] = "\x4c\xfb", [0x2eca] = "\x4c\xfc",
-+  [0x2ecb] = "\x4c\xfd", [0x2ecc] = "\x4c\xfe", [0x2ecd] = "\x4c\xff",
-+  [0x2ece] = "\x4d\x00", [0x2ecf] = "\x4d\x01", [0x2ed0] = "\x4d\x02",
-+  [0x2ed1] = "\x4d\x03", [0x2ed2] = "\x4d\x04", [0x2ed3] = "\x4d\x05",
-+  [0x2ed4] = "\x4d\x06", [0x2ed5] = "\x4d\x07", [0x2ed6] = "\x4d\x08",
-+  [0x2ed7] = "\x4d\x09", [0x2ed8] = "\x4d\x0a", [0x2ed9] = "\x4d\x0b",
-+  [0x2eda] = "\x4d\x0c", [0x2edb] = "\x4d\x0d", [0x2edc] = "\x4d\x0e",
-+  [0x2edd] = "\x4d\x0f", [0x2ede] = "\x4d\x10", [0x2edf] = "\x4d\x11",
-+  [0x2ee0] = "\x4d\x12", [0x2ee1] = "\x4d\x13", [0x2ee2] = "\x4d\x14",
-+  [0x2ee3] = "\x4d\x15", [0x2ee4] = "\x4d\x16", [0x2ee5] = "\x4d\x17",
-+  [0x2ee6] = "\x4d\x18", [0x2ee7] = "\x4d\x19", [0x2ee8] = "\x4d\x1a",
-+  [0x2ee9] = "\x4d\x1b", [0x2eea] = "\x4d\x1c", [0x2eeb] = "\x4d\x1d",
-+  [0x2eec] = "\x4d\x1e", [0x2eed] = "\x4d\x1f", [0x2eee] = "\x4d\x20",
-+  [0x2eef] = "\x4d\x21", [0x2ef0] = "\x4d\x22", [0x2ef1] = "\x4d\x23",
-+  [0x2ef2] = "\x4d\x24", [0x2ef3] = "\x4d\x25", [0x2ef4] = "\x4d\x26",
-+  [0x2ef5] = "\x4d\x27", [0x2ef6] = "\x4d\x28", [0x2ef7] = "\x4d\x29",
-+  [0x2ef8] = "\x4d\x2a", [0x2ef9] = "\x4d\x2b", [0x2efa] = "\x4d\x2c",
-+  [0x2efb] = "\x4d\x2d", [0x2efc] = "\x4d\x2e", [0x2efd] = "\x4d\x2f",
-+  [0x2efe] = "\x4d\x30", [0x2eff] = "\x4d\x31", [0x2f00] = "\x4d\x32",
-+  [0x2f01] = "\x4d\x33", [0x2f02] = "\x4d\x34", [0x2f03] = "\x4d\x35",
-+  [0x2f04] = "\x4d\x36", [0x2f05] = "\x4d\x37", [0x2f06] = "\x4d\x38",
-+  [0x2f07] = "\x4d\x39", [0x2f08] = "\x4d\x3a", [0x2f09] = "\x4d\x3b",
-+  [0x2f0a] = "\x4d\x3c", [0x2f0b] = "\x4d\x3d", [0x2f0c] = "\x4d\x3e",
-+  [0x2f0d] = "\x4d\x3f", [0x2f0e] = "\x4d\x40", [0x2f0f] = "\x4d\x41",
-+  [0x2f10] = "\x4d\x42", [0x2f11] = "\x4d\x43", [0x2f12] = "\x4d\x44",
-+  [0x2f13] = "\x4d\x45", [0x2f14] = "\x4d\x46", [0x2f15] = "\x4d\x47",
-+  [0x2f16] = "\x4d\x48", [0x2f17] = "\x4d\x49", [0x2f18] = "\x4d\x4a",
-+  [0x2f19] = "\x4d\x4b", [0x2f1a] = "\x4d\x4c", [0x2f1b] = "\x4d\x4d",
-+  [0x2f1c] = "\x4d\x4e", [0x2f1d] = "\x4d\x4f", [0x2f1e] = "\x4d\x50",
-+  [0x2f1f] = "\x4d\x51", [0x2f20] = "\x4d\x52", [0x2f21] = "\x4d\x53",
-+  [0x2f22] = "\x4d\x54", [0x2f23] = "\x4d\x55", [0x2f24] = "\x4d\x56",
-+  [0x2f25] = "\x4d\x57", [0x2f26] = "\x4d\x58", [0x2f27] = "\x4d\x59",
-+  [0x2f28] = "\x4d\x5a", [0x2f29] = "\x4d\x5b", [0x2f2a] = "\x4d\x5c",
-+  [0x2f2b] = "\x4d\x5d", [0x2f2c] = "\x4d\x5e", [0x2f2d] = "\x4d\x5f",
-+  [0x2f2e] = "\x4d\x60", [0x2f2f] = "\x4d\x61", [0x2f30] = "\x4d\x62",
-+  [0x2f31] = "\x4d\x63", [0x2f32] = "\x4d\x64", [0x2f33] = "\x4d\x65",
-+  [0x2f34] = "\x4d\x66", [0x2f35] = "\x4d\x67", [0x2f36] = "\x4d\x68",
-+  [0x2f37] = "\x4d\x69", [0x2f38] = "\x4d\x6a", [0x2f39] = "\x4d\x6b",
-+  [0x2f3a] = "\x4d\x6c", [0x2f3b] = "\x4d\x6d", [0x2f3c] = "\x4d\x6e",
-+  [0x2f3d] = "\x4d\x6f", [0x2f3e] = "\x4d\x70", [0x2f3f] = "\x4d\x71",
-+  [0x2f40] = "\x4d\x72", [0x2f41] = "\x4d\x73", [0x2f42] = "\x4d\x74",
-+  [0x2f43] = "\x4d\x75", [0x2f44] = "\x4d\x76", [0x2f45] = "\x4d\x77",
-+  [0x2f46] = "\x4d\x78", [0x2f47] = "\x4d\x79", [0x2f48] = "\x4d\x7a",
-+  [0x2f49] = "\x4d\x7b", [0x2f4a] = "\x4d\x7c", [0x2f4b] = "\x4d\x7d",
-+  [0x2f4c] = "\x4d\x7e", [0x2f4d] = "\x4d\x7f", [0x2f4e] = "\x4d\x80",
-+  [0x2f4f] = "\x4d\x81", [0x2f50] = "\x4d\x82", [0x2f51] = "\x4d\x83",
-+  [0x2f52] = "\x4d\x84", [0x2f53] = "\x4d\x85", [0x2f54] = "\x4d\x86",
-+  [0x2f55] = "\x4d\x87", [0x2f56] = "\x4d\x88", [0x2f57] = "\x4d\x89",
-+  [0x2f58] = "\x4d\x8a", [0x2f59] = "\x4d\x8b", [0x2f5a] = "\x4d\x8c",
-+  [0x2f5b] = "\x4d\x8d", [0x2f5c] = "\x4d\x8e", [0x2f5d] = "\x4d\x8f",
-+  [0x2f5e] = "\x4d\x90", [0x2f5f] = "\x4d\x91", [0x2f60] = "\x4d\x92",
-+  [0x2f61] = "\x4d\x93", [0x2f62] = "\x4d\x94", [0x2f63] = "\x4d\x95",
-+  [0x2f64] = "\x4d\x96", [0x2f65] = "\x4d\x97", [0x2f66] = "\x4d\x98",
-+  [0x2f67] = "\x4d\x99", [0x2f68] = "\x4d\x9a", [0x2f69] = "\x4d\x9b",
-+  [0x2f6a] = "\x4d\x9c", [0x2f6b] = "\x4d\x9d", [0x2f6c] = "\x4d\x9e",
-+  [0x2f6d] = "\x4d\x9f", [0x2f6e] = "\x4d\xa0", [0x2f6f] = "\x4d\xa1",
-+  [0x2f70] = "\xa9\x8a", [0x2f71] = "\xa9\x8b", [0x2f72] = "\xa9\x8c",
-+  [0x2f73] = "\xa9\x8d", [0x2f74] = "\xa9\x8e", [0x2f75] = "\xa9\x8f",
-+  [0x2f76] = "\xa9\x90", [0x2f77] = "\xa9\x91", [0x2f78] = "\xa9\x92",
-+  [0x2f79] = "\xa9\x93", [0x2f7a] = "\xa9\x94", [0x2f7b] = "\xa9\x95",
-+  [0x2f7c] = "\x4d\xa2", [0x2f7d] = "\x4d\xa3", [0x2f7e] = "\x4d\xa4",
-+  [0x2f7f] = "\x4d\xa5", [0x2f80] = "\xa1\xa1", [0x2f81] = "\xa1\xa2",
-+  [0x2f82] = "\xa1\xa3", [0x2f83] = "\xa1\xa8", [0x2f84] = "\x4d\xa6",
-+  [0x2f85] = "\xa1\xa9", [0x2f86] = "\xa9\x65", [0x2f87] = "\xa9\x96",
-+  [0x2f88] = "\xa1\xb4", [0x2f89] = "\xa1\xb5", [0x2f8a] = "\xa1\xb6",
-+  [0x2f8b] = "\xa1\xb7", [0x2f8c] = "\xa1\xb8", [0x2f8d] = "\xa1\xb9",
-+  [0x2f8e] = "\xa1\xba", [0x2f8f] = "\xa1\xbb", [0x2f90] = "\xa1\xbe",
-+  [0x2f91] = "\xa1\xbf", [0x2f92] = "\xa8\x93", [0x2f93] = "\xa1\xfe",
-+  [0x2f94] = "\xa1\xb2", [0x2f95] = "\xa1\xb3", [0x2f96] = "\xa1\xbc",
-+  [0x2f97] = "\xa1\xbd", [0x2f98] = "\x4d\xa7", [0x2f99] = "\x4d\xa8",
-+  [0x2f9a] = "\x4d\xa9", [0x2f9b] = "\x4d\xaa", [0x2f9c] = "\x4d\xab",
-+  [0x2f9d] = "\xa8\x94", [0x2f9e] = "\xa8\x95", [0x2f9f] = "\x4d\xac",
-+  [0x2fa0] = "\x4d\xad", [0x2fa1] = "\xa9\x40", [0x2fa2] = "\xa9\x41",
-+  [0x2fa3] = "\xa9\x42", [0x2fa4] = "\xa9\x43", [0x2fa5] = "\xa9\x44",
-+  [0x2fa6] = "\xa9\x45", [0x2fa7] = "\xa9\x46", [0x2fa8] = "\xa9\x47",
-+  [0x2fa9] = "\xa9\x48", [0x2faa] = "\x4d\xae", [0x2fab] = "\x4d\xaf",
-+  [0x2fac] = "\x4d\xb0", [0x2fad] = "\x4d\xb1", [0x2fae] = "\x4d\xb2",
-+  [0x2faf] = "\x4d\xb3", [0x2fb0] = "\x4d\xb4", [0x2fb1] = "\x4d\xb5",
-+  [0x2fb2] = "\x4d\xb6", [0x2fb3] = "\x4d\xb7", [0x2fb4] = "\x4d\xb8",
-+  [0x2fb5] = "\x4d\xb9", [0x2fb6] = "\x4d\xba", [0x2fb7] = "\x4d\xbb",
-+  [0x2fb8] = "\x4d\xbc", [0x2fb9] = "\x4d\xbd", [0x2fba] = "\x4d\xbe",
-+  [0x2fbb] = "\x4d\xbf", [0x2fbc] = "\x4d\xc0", [0x2fbd] = "\x4d\xc1",
-+  [0x2fbe] = "\xa9\x89", [0x2fbf] = "\x4d\xc2", [0x2fc0] = "\x4d\xc3",
-   [0x2fc1] = "\xa4\xa1", [0x2fc2] = "\xa4\xa2", [0x2fc3] = "\xa4\xa3",
-   [0x2fc4] = "\xa4\xa4", [0x2fc5] = "\xa4\xa5", [0x2fc6] = "\xa4\xa6",
-   [0x2fc7] = "\xa4\xa7", [0x2fc8] = "\xa4\xa8", [0x2fc9] = "\xa4\xa9",
-@@ -8792,203 +13259,213 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x300c] = "\xa4\xec", [0x300d] = "\xa4\xed", [0x300e] = "\xa4\xee",
-   [0x300f] = "\xa4\xef", [0x3010] = "\xa4\xf0", [0x3011] = "\xa4\xf1",
-   [0x3012] = "\xa4\xf2", [0x3013] = "\xa4\xf3", [0x3014] = "\x4d\xc4",
--  [0x3015] = "\x4d\xc5", [0x3016] = "\x4d\xc6", [0x3019] = "\x4d\xc9",
--  [0x301a] = "\x4d\xca", [0x301b] = "\xa9\x61", [0x301c] = "\xa9\x62",
--  [0x301d] = "\xa9\x66", [0x301e] = "\xa9\x67", [0x301f] = "\x4d\xcb",
--  [0x3020] = "\x4d\xcc", [0x3021] = "\xa5\xa1", [0x3022] = "\xa5\xa2",
--  [0x3023] = "\xa5\xa3", [0x3024] = "\xa5\xa4", [0x3025] = "\xa5\xa5",
--  [0x3026] = "\xa5\xa6", [0x3027] = "\xa5\xa7", [0x3028] = "\xa5\xa8",
--  [0x3029] = "\xa5\xa9", [0x302a] = "\xa5\xaa", [0x302b] = "\xa5\xab",
--  [0x302c] = "\xa5\xac", [0x302d] = "\xa5\xad", [0x302e] = "\xa5\xae",
--  [0x302f] = "\xa5\xaf", [0x3030] = "\xa5\xb0", [0x3031] = "\xa5\xb1",
--  [0x3032] = "\xa5\xb2", [0x3033] = "\xa5\xb3", [0x3034] = "\xa5\xb4",
--  [0x3035] = "\xa5\xb5", [0x3036] = "\xa5\xb6", [0x3037] = "\xa5\xb7",
--  [0x3038] = "\xa5\xb8", [0x3039] = "\xa5\xb9", [0x303a] = "\xa5\xba",
--  [0x303b] = "\xa5\xbb", [0x303c] = "\xa5\xbc", [0x303d] = "\xa5\xbd",
--  [0x303e] = "\xa5\xbe", [0x303f] = "\xa5\xbf", [0x3040] = "\xa5\xc0",
--  [0x3041] = "\xa5\xc1", [0x3042] = "\xa5\xc2", [0x3043] = "\xa5\xc3",
--  [0x3044] = "\xa5\xc4", [0x3045] = "\xa5\xc5", [0x3046] = "\xa5\xc6",
--  [0x3047] = "\xa5\xc7", [0x3048] = "\xa5\xc8", [0x3049] = "\xa5\xc9",
--  [0x304a] = "\xa5\xca", [0x304b] = "\xa5\xcb", [0x304c] = "\xa5\xcc",
--  [0x304d] = "\xa5\xcd", [0x304e] = "\xa5\xce", [0x304f] = "\xa5\xcf",
--  [0x3050] = "\xa5\xd0", [0x3051] = "\xa5\xd1", [0x3052] = "\xa5\xd2",
--  [0x3053] = "\xa5\xd3", [0x3054] = "\xa5\xd4", [0x3055] = "\xa5\xd5",
--  [0x3056] = "\xa5\xd6", [0x3057] = "\xa5\xd7", [0x3058] = "\xa5\xd8",
--  [0x3059] = "\xa5\xd9", [0x305a] = "\xa5\xda", [0x305b] = "\xa5\xdb",
--  [0x305c] = "\xa5\xdc", [0x305d] = "\xa5\xdd", [0x305e] = "\xa5\xde",
--  [0x305f] = "\xa5\xdf", [0x3060] = "\xa5\xe0", [0x3061] = "\xa5\xe1",
--  [0x3062] = "\xa5\xe2", [0x3063] = "\xa5\xe3", [0x3064] = "\xa5\xe4",
--  [0x3065] = "\xa5\xe5", [0x3066] = "\xa5\xe6", [0x3067] = "\xa5\xe7",
--  [0x3068] = "\xa5\xe8", [0x3069] = "\xa5\xe9", [0x306a] = "\xa5\xea",
--  [0x306b] = "\xa5\xeb", [0x306c] = "\xa5\xec", [0x306d] = "\xa5\xed",
--  [0x306e] = "\xa5\xee", [0x306f] = "\xa5\xef", [0x3070] = "\xa5\xf0",
--  [0x3071] = "\xa5\xf1", [0x3072] = "\xa5\xf2", [0x3073] = "\xa5\xf3",
--  [0x3074] = "\xa5\xf4", [0x3075] = "\xa5\xf5", [0x3076] = "\xa5\xf6",
--  [0x3077] = "\x4d\xcd", [0x3078] = "\x4d\xce", [0x3079] = "\x4d\xcf",
--  [0x307a] = "\x4d\xd0", [0x307b] = "\x4d\xd1", [0x307c] = "\xa9\x60",
--  [0x307d] = "\xa9\x63", [0x307e] = "\xa9\x64", [0x307f] = "\x4d\xd2",
--  [0x3085] = "\xa8\xc5", [0x3086] = "\xa8\xc6", [0x3087] = "\xa8\xc7",
--  [0x3088] = "\xa8\xc8", [0x3089] = "\xa8\xc9", [0x308a] = "\xa8\xca",
--  [0x308b] = "\xa8\xcb", [0x308c] = "\xa8\xcc", [0x308d] = "\xa8\xcd",
--  [0x308e] = "\xa8\xce", [0x308f] = "\xa8\xcf", [0x3090] = "\xa8\xd0",
--  [0x3091] = "\xa8\xd1", [0x3092] = "\xa8\xd2", [0x3093] = "\xa8\xd3",
--  [0x3094] = "\xa8\xd4", [0x3095] = "\xa8\xd5", [0x3096] = "\xa8\xd6",
--  [0x3097] = "\xa8\xd7", [0x3098] = "\xa8\xd8", [0x3099] = "\xa8\xd9",
--  [0x309a] = "\xa8\xda", [0x309b] = "\xa8\xdb", [0x309c] = "\xa8\xdc",
--  [0x309d] = "\xa8\xdd", [0x309e] = "\xa8\xde", [0x309f] = "\xa8\xdf",
--  [0x30a0] = "\xa8\xe0", [0x30a1] = "\xa8\xe1", [0x30a2] = "\xa8\xe2",
--  [0x30a3] = "\xa8\xe3", [0x30a4] = "\xa8\xe4", [0x30a5] = "\xa8\xe5",
--  [0x30a6] = "\xa8\xe6", [0x30a7] = "\xa8\xe7", [0x30a8] = "\xa8\xe8",
--  [0x30a9] = "\xa8\xe9", [0x30aa] = "\x4d\xd8", [0x30ab] = "\x4d\xd9",
--  [0x30ac] = "\x4d\xda", [0x30ad] = "\x4d\xdb", [0x30b1] = "\x4d\xdf",
--  [0x30b2] = "\x4d\xe0", [0x30b3] = "\x4d\xe1", [0x30b4] = "\x4d\xe2",
--  [0x30b5] = "\x4d\xe3", [0x30b6] = "\x4d\xe4", [0x30b7] = "\x4d\xe5",
--  [0x30b8] = "\x4d\xe6", [0x30b9] = "\x4d\xe7", [0x30ba] = "\x4d\xe8",
--  [0x30bb] = "\x4d\xe9", [0x30bc] = "\x4d\xea", [0x30bd] = "\x4d\xeb",
--  [0x30be] = "\x4d\xec", [0x30bf] = "\x4d\xed", [0x30c0] = "\x4d\xee",
--  [0x30c1] = "\x4d\xef", [0x30c2] = "\x4d\xf0", [0x30c3] = "\x4d\xf1",
--  [0x30c4] = "\x4d\xf2", [0x30c5] = "\x4d\xf3", [0x30c6] = "\x4d\xf4",
--  [0x30c7] = "\x4d\xf5", [0x30c8] = "\x4d\xf6", [0x30c9] = "\x4d\xf7",
--  [0x30ca] = "\x4d\xf8", [0x30cb] = "\x4d\xf9", [0x30cc] = "\x4d\xfa",
--  [0x30cd] = "\x4d\xfb", [0x30ce] = "\x4d\xfc", [0x30cf] = "\x4d\xfd",
--  [0x30d0] = "\x4d\xfe", [0x30d1] = "\x4d\xff", [0x30d2] = "\x4e\x00",
--  [0x30d3] = "\x4e\x01", [0x30d4] = "\x4e\x02", [0x30d5] = "\x4e\x03",
--  [0x30d6] = "\x4e\x04", [0x30d7] = "\x4e\x05", [0x30d8] = "\x4e\x06",
--  [0x30d9] = "\x4e\x07", [0x30da] = "\x4e\x08", [0x30db] = "\x4e\x09",
--  [0x30dc] = "\x4e\x0a", [0x30dd] = "\x4e\x0b", [0x30de] = "\x4e\x0c",
--  [0x30df] = "\x4e\x0d", [0x30e0] = "\x4e\x0e", [0x30e1] = "\x4e\x0f",
--  [0x30e2] = "\x4e\x10", [0x30e3] = "\x4e\x11", [0x30e4] = "\x4e\x12",
--  [0x30e5] = "\x4e\x13", [0x30e6] = "\x4e\x14", [0x30e7] = "\x4e\x15",
--  [0x30e8] = "\x4e\x16", [0x30e9] = "\x4e\x17", [0x30ea] = "\x4e\x18",
--  [0x30eb] = "\x4e\x19", [0x30ec] = "\x4e\x1a", [0x30ed] = "\x4e\x1b",
--  [0x30ee] = "\x4e\x1c", [0x30ef] = "\x4e\x1d", [0x30f0] = "\x4e\x1e",
--  [0x30f1] = "\x4e\x1f", [0x30f2] = "\x4e\x20", [0x30f3] = "\x4e\x21",
--  [0x30f4] = "\x4e\x22", [0x30f5] = "\x4e\x23", [0x30f6] = "\x4e\x24",
--  [0x30f7] = "\x4e\x25", [0x30f8] = "\x4e\x26", [0x30f9] = "\x4e\x27",
--  [0x30fa] = "\x4e\x28", [0x30fb] = "\x4e\x29", [0x30fc] = "\x4e\x2a",
--  [0x30fd] = "\x4e\x2b", [0x30fe] = "\x4e\x2c", [0x30ff] = "\x4e\x2d",
--  [0x3100] = "\x4e\x2e", [0x3101] = "\x4e\x2f", [0x3102] = "\x4e\x30",
--  [0x3103] = "\x4e\x31", [0x3104] = "\x4e\x32", [0x3105] = "\x4e\x33",
--  [0x3106] = "\x4e\x34", [0x3107] = "\x4e\x35", [0x3108] = "\x4e\x36",
--  [0x3109] = "\x4e\x37", [0x310a] = "\x4e\x38", [0x310b] = "\x4e\x39",
--  [0x310c] = "\x4e\x3a", [0x310d] = "\x4e\x3b", [0x310e] = "\x4e\x3c",
--  [0x3110] = "\x4e\x3e", [0x3111] = "\x4e\x3f", [0x3112] = "\x4e\x40",
--  [0x3113] = "\x4e\x41", [0x3114] = "\x4e\x42", [0x3115] = "\x4e\x43",
--  [0x3116] = "\x4e\x44", [0x3117] = "\x4e\x45", [0x3118] = "\x4e\x46",
--  [0x3119] = "\x4e\x47", [0x311a] = "\x4e\x48", [0x311b] = "\x4e\x49",
--  [0x311c] = "\x4e\x4a", [0x311d] = "\x4e\x4b", [0x311e] = "\x4e\x4c",
--  [0x311f] = "\x4e\x4d", [0x3120] = "\x4e\x4e", [0x3121] = "\x4e\x4f",
--  [0x3122] = "\x4e\x50", [0x3123] = "\x4e\x51", [0x3124] = "\x4e\x52",
--  [0x3125] = "\x4e\x53", [0x3126] = "\x4e\x54", [0x3127] = "\x4e\x55",
--  [0x3128] = "\x4e\x56", [0x3129] = "\x4e\x57", [0x312a] = "\x4e\x58",
--  [0x312b] = "\x4e\x59", [0x312c] = "\x4e\x5a", [0x312d] = "\x4e\x5b",
--  [0x312e] = "\x4e\x5c", [0x312f] = "\x4e\x5d", [0x3130] = "\x4e\x5e",
--  [0x3131] = "\x4e\x5f", [0x3132] = "\x4e\x60", [0x3133] = "\x4e\x61",
--  [0x3134] = "\x4e\x62", [0x3135] = "\x4e\x63", [0x3136] = "\x4e\x64",
--  [0x3137] = "\x4e\x65", [0x3138] = "\x4e\x66", [0x3139] = "\x4e\x67",
--  [0x313a] = "\x4e\x68", [0x3140] = "\x4e\x6e", [0x3141] = "\x4e\x6f",
--  [0x3142] = "\x4e\x70", [0x3143] = "\x4e\x71", [0x3144] = "\x4e\x72",
--  [0x3145] = "\x4e\x73", [0x3146] = "\x4e\x74", [0x3147] = "\x4e\x75",
--  [0x3148] = "\x4e\x76", [0x3149] = "\x4e\x77", [0x314a] = "\x4e\x78",
--  [0x314b] = "\x4e\x79", [0x314c] = "\x4e\x7a", [0x314d] = "\x4e\x7b",
--  [0x314e] = "\x4e\x7c", [0x314f] = "\x4e\x7d", [0x3150] = "\x4e\x7e",
--  [0x3151] = "\x4e\x7f", [0x3152] = "\x4e\x80", [0x3153] = "\x4e\x81",
--  [0x3154] = "\x4e\x82", [0x3155] = "\x4e\x83", [0x3156] = "\x4e\x84",
--  [0x3157] = "\x4e\x85", [0x3158] = "\x4e\x86", [0x3159] = "\x4e\x87",
--  [0x315a] = "\x4e\x88", [0x315b] = "\x4e\x89", [0x315c] = "\x4e\x8a",
--  [0x315d] = "\x4e\x8b", [0x315e] = "\x4e\x8c", [0x315f] = "\x4e\x8d",
--  [0x3160] = "\x4e\x8e", [0x3161] = "\x4e\x8f", [0x3162] = "\x4e\x90",
--  [0x3163] = "\x4e\x91", [0x3170] = "\x4e\x9e", [0x3171] = "\x4e\x9f",
--  [0x3172] = "\x4e\xa0", [0x3173] = "\x4e\xa1", [0x3174] = "\x4e\xa2",
--  [0x3175] = "\x4e\xa3", [0x3176] = "\x4e\xa4", [0x3177] = "\x4e\xa5",
--  [0x3178] = "\x4e\xa6", [0x3179] = "\x4e\xa7", [0x317a] = "\x4e\xa8",
--  [0x317b] = "\x4e\xa9", [0x317c] = "\x4e\xaa", [0x317d] = "\x4e\xab",
--  [0x317e] = "\x4e\xac", [0x317f] = "\x4e\xad", [0x3180] = "\x4e\xae",
--  [0x3181] = "\x4e\xaf", [0x3182] = "\x4e\xb0", [0x3183] = "\x4e\xb1",
--  [0x3184] = "\x4e\xb2", [0x3185] = "\x4e\xb3", [0x3186] = "\x4e\xb4",
--  [0x3187] = "\x4e\xb5", [0x3188] = "\x4e\xb6", [0x3189] = "\x4e\xb7",
--  [0x318a] = "\x4e\xb8", [0x318b] = "\x4e\xb9", [0x318c] = "\x4e\xba",
--  [0x318d] = "\x4e\xbb", [0x318e] = "\x4e\xbc", [0x318f] = "\x4e\xbd",
--  [0x3190] = "\x4e\xbe", [0x3191] = "\x4e\xbf", [0x3192] = "\x4e\xc0",
--  [0x3193] = "\x4e\xc1", [0x3194] = "\x4e\xc2", [0x3195] = "\x4e\xc3",
--  [0x3196] = "\x4e\xc4", [0x3197] = "\x4e\xc5", [0x3198] = "\x4e\xc6",
--  [0x3199] = "\x4e\xc7", [0x319a] = "\x4e\xc8", [0x319b] = "\x4e\xc9",
--  [0x319c] = "\x4e\xca", [0x319d] = "\x4e\xcb", [0x319e] = "\x4e\xcc",
--  [0x31a0] = "\xa2\xe5", [0x31a1] = "\xa2\xe6", [0x31a2] = "\xa2\xe7",
--  [0x31a3] = "\xa2\xe8", [0x31a4] = "\xa2\xe9", [0x31a5] = "\xa2\xea",
--  [0x31a6] = "\xa2\xeb", [0x31a7] = "\xa2\xec", [0x31a8] = "\xa2\xed",
--  [0x31a9] = "\xa2\xee", [0x31aa] = "\x4e\xce", [0x31ab] = "\x4e\xcf",
--  [0x31ac] = "\x4e\xd0", [0x31ad] = "\x4e\xd1", [0x31ae] = "\x4e\xd2",
--  [0x31af] = "\x4e\xd3", [0x31b0] = "\x4e\xd4", [0x31b1] = "\xa9\x5a",
--  [0x31b2] = "\x4e\xd5", [0x31b3] = "\x4e\xd6", [0x31b4] = "\x4e\xd7",
--  [0x31b5] = "\x4e\xd8", [0x31b6] = "\x4e\xd9", [0x31b7] = "\x4e\xda",
--  [0x31b8] = "\x4e\xdb", [0x31b9] = "\x4e\xdc", [0x31ba] = "\x4e\xdd",
--  [0x31bb] = "\x4e\xde", [0x31bc] = "\x4e\xdf", [0x31bd] = "\x4e\xe0",
--  [0x31be] = "\x4e\xe1", [0x31bf] = "\x4e\xe2", [0x31c0] = "\x4e\xe3",
--  [0x31c1] = "\x4e\xe4", [0x31c2] = "\x4e\xe5", [0x31c3] = "\x4e\xe6",
--  [0x31c4] = "\x4e\xe7", [0x31c5] = "\x4e\xe8", [0x31c6] = "\x4e\xe9",
--  [0x31c7] = "\x4e\xea", [0x31c8] = "\x4e\xeb", [0x31c9] = "\x4e\xec",
--  [0x31ca] = "\x4e\xed", [0x31cb] = "\x4e\xee", [0x31cc] = "\x4e\xef",
--  [0x31cd] = "\x4e\xf0", [0x31ce] = "\x4e\xf1", [0x31cf] = "\x4e\xf2",
--  [0x31d0] = "\x4e\xf3", [0x31d1] = "\x4e\xf4", [0x31d2] = "\x4e\xf5",
--  [0x31d3] = "\x4e\xf6", [0x31d4] = "\x4e\xf7", [0x31d5] = "\x4e\xf8",
--  [0x31d6] = "\x4e\xf9", [0x31d7] = "\x4e\xfa", [0x31d8] = "\x4e\xfb",
--  [0x31d9] = "\x4e\xfc", [0x31da] = "\x4e\xfd", [0x31db] = "\x4e\xfe",
--  [0x31dc] = "\x4e\xff", [0x31dd] = "\x4f\x00", [0x31de] = "\x4f\x01",
--  [0x31df] = "\x4f\x02", [0x31e0] = "\x4f\x03", [0x31e1] = "\x4f\x04",
--  [0x31e2] = "\x4f\x05", [0x31e3] = "\x4f\x06", [0x31e4] = "\x4f\x07",
--  [0x31e5] = "\x4f\x08", [0x31e6] = "\x4f\x09", [0x31e7] = "\x4f\x0a",
--  [0x31e8] = "\x4f\x0b", [0x31e9] = "\x4f\x0c", [0x31ea] = "\x4f\x0d",
--  [0x31eb] = "\x4f\x0e", [0x31ec] = "\x4f\x0f", [0x31ed] = "\x4f\x10",
--  [0x31ee] = "\x4f\x11", [0x31ef] = "\x4f\x12", [0x31f0] = "\x4f\x13",
--  [0x31f1] = "\x4f\x14", [0x31f2] = "\x4f\x15", [0x31f3] = "\x4f\x16",
--  [0x31f4] = "\x4f\x17", [0x31f5] = "\x4f\x18", [0x31f6] = "\x4f\x19",
--  [0x31f7] = "\x4f\x1a", [0x31f8] = "\x4f\x1b", [0x31f9] = "\x4f\x1c",
--  [0x31fa] = "\x4f\x1d", [0x31fb] = "\x4f\x1e", [0x31fc] = "\x4f\x1f",
--  [0x31fd] = "\x4f\x20", [0x31fe] = "\x4f\x21", [0x31ff] = "\x4f\x22",
--  [0x3200] = "\x4f\x23", [0x3201] = "\x4f\x24", [0x3202] = "\x4f\x25",
--  [0x3203] = "\x4f\x26", [0x3204] = "\x4f\x27", [0x3205] = "\x4f\x28",
--  [0x3206] = "\x4f\x29", [0x3207] = "\x4f\x2a", [0x3208] = "\x4f\x2b",
--  [0x3209] = "\x4f\x2c", [0x320a] = "\x4f\x2d", [0x320b] = "\x4f\x2e",
--  [0x320c] = "\x4f\x2f", [0x320d] = "\x4f\x30", [0x320e] = "\x4f\x31",
--  [0x320f] = "\x4f\x32", [0x3210] = "\x4f\x33", [0x3211] = "\x4f\x34",
--  [0x3212] = "\x4f\x35", [0x3213] = "\x4f\x36", [0x3214] = "\x4f\x37",
--  [0x3215] = "\x4f\x38", [0x3216] = "\x4f\x39", [0x3217] = "\x4f\x3a",
--  [0x3218] = "\x4f\x3b", [0x3219] = "\x4f\x3c", [0x321a] = "\x4f\x3d",
--  [0x321b] = "\x4f\x3e", [0x321c] = "\x4f\x3f", [0x321d] = "\x4f\x40",
--  [0x321e] = "\x4f\x41", [0x321f] = "\x4f\x42", [0x3220] = "\x4f\x43",
--  [0x3221] = "\x4f\x44", [0x3222] = "\x4f\x45", [0x3223] = "\xa9\x49",
--  [0x3224] = "\x4f\x46", [0x3225] = "\x4f\x47", [0x3226] = "\x4f\x48",
--  [0x3227] = "\x4f\x49", [0x3228] = "\x4f\x4a", [0x3229] = "\x4f\x4b",
--  [0x322a] = "\x4f\x4c", [0x322b] = "\x4f\x4d", [0x322c] = "\x4f\x4e",
--  [0x322d] = "\x4f\x4f", [0x322e] = "\x4f\x50", [0x322f] = "\x4f\x51",
--  [0x3230] = "\x4f\x52", [0x3231] = "\x4f\x53", [0x3232] = "\x4f\x54",
--  [0x3233] = "\x4f\x55", [0x3234] = "\x4f\x56", [0x3235] = "\x4f\x57",
--  [0x3236] = "\x4f\x58", [0x3237] = "\x4f\x59", [0x3238] = "\x4f\x5a",
--  [0x3239] = "\x4f\x5b", [0x323a] = "\x4f\x5c", [0x323b] = "\x4f\x5d",
--  [0x323c] = "\x4f\x5e", [0x323d] = "\x4f\x5f", [0x323e] = "\x4f\x60",
--  [0x323f] = "\x4f\x61", [0x3240] = "\x4f\x62", [0x3241] = "\x4f\x63",
--  [0x3242] = "\x4f\x64", [0x3243] = "\x4f\x65", [0x3244] = "\x4f\x66",
--  [0x3245] = "\x4f\x67", [0x3246] = "\x4f\x68", [0x3247] = "\x4f\x69",
--  [0x3248] = "\x4f\x6a", [0x3249] = "\x4f\x6b", [0x324a] = "\x4f\x6c",
--  [0x324b] = "\x4f\x6d", [0x324c] = "\x4f\x6e", [0x324d] = "\x4f\x6f",
--  [0x324e] = "\x4f\x70", [0x324f] = "\x4f\x71", [0x3250] = "\x4f\x72",
--  [0x3251] = "\x4f\x73", [0x3252] = "\x4f\x74", [0x3253] = "\x4f\x75",
--  [0x3254] = "\x4f\x76", [0x3255] = "\x4f\x77", [0x3256] = "\x4f\x78",
--  [0x3257] = "\x4f\x79", [0x3258] = "\x4f\x7a", [0x3259] = "\x4f\x7b",
--  [0x325a] = "\x4f\x7c", [0x325b] = "\x4f\x7d", [0x325c] = "\x4f\x7e",
--  [0x325d] = "\x4f\x7f", [0x325e] = "\x4f\x80", [0x325f] = "\x4f\x81",
--  [0x3260] = "\x4f\x82", [0x3261] = "\x4f\x83", [0x3262] = "\x4f\x84",
--  [0x3263] = "\x4f\x85", [0x3264] = "\x4f\x86", [0x3265] = "\x4f\x87",
--  [0x3266] = "\x4f\x88", [0x3267] = "\x4f\x89", [0x3268] = "\x4f\x8a",
--  [0x3269] = "\x4f\x8b", [0x326a] = "\x4f\x8c", [0x326b] = "\x4f\x8d",
--  [0x326c] = "\x4f\x8e", [0x326d] = "\x4f\x8f", [0x326e] = "\x4f\x90",
--  [0x326f] = "\x4f\x91", [0x3270] = "\x4f\x92", [0x3271] = "\x4f\x93",
--  [0x3272] = "\x4f\x94", [0x3273] = "\x4f\x95", [0x3274] = "\x4f\x96",
--  [0x3275] = "\x4f\x97", [0x3276] = "\x4f\x98", [0x3277] = "\x4f\x99",
--  [0x3278] = "\x4f\x9a", [0x3279] = "\x4f\x9b", [0x327a] = "\x4f\x9c",
--  [0x327b] = "\x4f\x9d", [0x327c] = "\x4f\x9e", [0x327d] = "\x4f\x9f",
--  [0x327e] = "\x4f\xa0", [0x3280] = "\x4f\xa2", [0x3281] = "\x4f\xa3",
-+  [0x3015] = "\x4d\xc5", [0x3016] = "\x4d\xc6", [0x3017] = "\x4d\xc7",
-+  [0x3018] = "\x4d\xc8", [0x3019] = "\x4d\xc9", [0x301a] = "\x4d\xca",
-+  [0x301b] = "\xa9\x61", [0x301c] = "\xa9\x62", [0x301d] = "\xa9\x66",
-+  [0x301e] = "\xa9\x67", [0x301f] = "\x4d\xcb", [0x3020] = "\x4d\xcc",
-+  [0x3021] = "\xa5\xa1", [0x3022] = "\xa5\xa2", [0x3023] = "\xa5\xa3",
-+  [0x3024] = "\xa5\xa4", [0x3025] = "\xa5\xa5", [0x3026] = "\xa5\xa6",
-+  [0x3027] = "\xa5\xa7", [0x3028] = "\xa5\xa8", [0x3029] = "\xa5\xa9",
-+  [0x302a] = "\xa5\xaa", [0x302b] = "\xa5\xab", [0x302c] = "\xa5\xac",
-+  [0x302d] = "\xa5\xad", [0x302e] = "\xa5\xae", [0x302f] = "\xa5\xaf",
-+  [0x3030] = "\xa5\xb0", [0x3031] = "\xa5\xb1", [0x3032] = "\xa5\xb2",
-+  [0x3033] = "\xa5\xb3", [0x3034] = "\xa5\xb4", [0x3035] = "\xa5\xb5",
-+  [0x3036] = "\xa5\xb6", [0x3037] = "\xa5\xb7", [0x3038] = "\xa5\xb8",
-+  [0x3039] = "\xa5\xb9", [0x303a] = "\xa5\xba", [0x303b] = "\xa5\xbb",
-+  [0x303c] = "\xa5\xbc", [0x303d] = "\xa5\xbd", [0x303e] = "\xa5\xbe",
-+  [0x303f] = "\xa5\xbf", [0x3040] = "\xa5\xc0", [0x3041] = "\xa5\xc1",
-+  [0x3042] = "\xa5\xc2", [0x3043] = "\xa5\xc3", [0x3044] = "\xa5\xc4",
-+  [0x3045] = "\xa5\xc5", [0x3046] = "\xa5\xc6", [0x3047] = "\xa5\xc7",
-+  [0x3048] = "\xa5\xc8", [0x3049] = "\xa5\xc9", [0x304a] = "\xa5\xca",
-+  [0x304b] = "\xa5\xcb", [0x304c] = "\xa5\xcc", [0x304d] = "\xa5\xcd",
-+  [0x304e] = "\xa5\xce", [0x304f] = "\xa5\xcf", [0x3050] = "\xa5\xd0",
-+  [0x3051] = "\xa5\xd1", [0x3052] = "\xa5\xd2", [0x3053] = "\xa5\xd3",
-+  [0x3054] = "\xa5\xd4", [0x3055] = "\xa5\xd5", [0x3056] = "\xa5\xd6",
-+  [0x3057] = "\xa5\xd7", [0x3058] = "\xa5\xd8", [0x3059] = "\xa5\xd9",
-+  [0x305a] = "\xa5\xda", [0x305b] = "\xa5\xdb", [0x305c] = "\xa5\xdc",
-+  [0x305d] = "\xa5\xdd", [0x305e] = "\xa5\xde", [0x305f] = "\xa5\xdf",
-+  [0x3060] = "\xa5\xe0", [0x3061] = "\xa5\xe1", [0x3062] = "\xa5\xe2",
-+  [0x3063] = "\xa5\xe3", [0x3064] = "\xa5\xe4", [0x3065] = "\xa5\xe5",
-+  [0x3066] = "\xa5\xe6", [0x3067] = "\xa5\xe7", [0x3068] = "\xa5\xe8",
-+  [0x3069] = "\xa5\xe9", [0x306a] = "\xa5\xea", [0x306b] = "\xa5\xeb",
-+  [0x306c] = "\xa5\xec", [0x306d] = "\xa5\xed", [0x306e] = "\xa5\xee",
-+  [0x306f] = "\xa5\xef", [0x3070] = "\xa5\xf0", [0x3071] = "\xa5\xf1",
-+  [0x3072] = "\xa5\xf2", [0x3073] = "\xa5\xf3", [0x3074] = "\xa5\xf4",
-+  [0x3075] = "\xa5\xf5", [0x3076] = "\xa5\xf6", [0x3077] = "\x4d\xcd",
-+  [0x3078] = "\x4d\xce", [0x3079] = "\x4d\xcf", [0x307a] = "\x4d\xd0",
-+  [0x307b] = "\x4d\xd1", [0x307c] = "\xa9\x60", [0x307d] = "\xa9\x63",
-+  [0x307e] = "\xa9\x64", [0x307f] = "\x4d\xd2", [0x3080] = "\x4d\xd3",
-+  [0x3081] = "\x4d\xd4", [0x3082] = "\x4d\xd5", [0x3083] = "\x4d\xd6",
-+  [0x3084] = "\x4d\xd7", [0x3085] = "\xa8\xc5", [0x3086] = "\xa8\xc6",
-+  [0x3087] = "\xa8\xc7", [0x3088] = "\xa8\xc8", [0x3089] = "\xa8\xc9",
-+  [0x308a] = "\xa8\xca", [0x308b] = "\xa8\xcb", [0x308c] = "\xa8\xcc",
-+  [0x308d] = "\xa8\xcd", [0x308e] = "\xa8\xce", [0x308f] = "\xa8\xcf",
-+  [0x3090] = "\xa8\xd0", [0x3091] = "\xa8\xd1", [0x3092] = "\xa8\xd2",
-+  [0x3093] = "\xa8\xd3", [0x3094] = "\xa8\xd4", [0x3095] = "\xa8\xd5",
-+  [0x3096] = "\xa8\xd6", [0x3097] = "\xa8\xd7", [0x3098] = "\xa8\xd8",
-+  [0x3099] = "\xa8\xd9", [0x309a] = "\xa8\xda", [0x309b] = "\xa8\xdb",
-+  [0x309c] = "\xa8\xdc", [0x309d] = "\xa8\xdd", [0x309e] = "\xa8\xde",
-+  [0x309f] = "\xa8\xdf", [0x30a0] = "\xa8\xe0", [0x30a1] = "\xa8\xe1",
-+  [0x30a2] = "\xa8\xe2", [0x30a3] = "\xa8\xe3", [0x30a4] = "\xa8\xe4",
-+  [0x30a5] = "\xa8\xe5", [0x30a6] = "\xa8\xe6", [0x30a7] = "\xa8\xe7",
-+  [0x30a8] = "\xa8\xe8", [0x30a9] = "\xa8\xe9", [0x30aa] = "\x4d\xd8",
-+  [0x30ab] = "\x4d\xd9", [0x30ac] = "\x4d\xda", [0x30ad] = "\x4d\xdb",
-+  [0x30ae] = "\x4d\xdc", [0x30af] = "\x4d\xdd", [0x30b0] = "\x4d\xde",
-+  [0x30b1] = "\x4d\xdf", [0x30b2] = "\x4d\xe0", [0x30b3] = "\x4d\xe1",
-+  [0x30b4] = "\x4d\xe2", [0x30b5] = "\x4d\xe3", [0x30b6] = "\x4d\xe4",
-+  [0x30b7] = "\x4d\xe5", [0x30b8] = "\x4d\xe6", [0x30b9] = "\x4d\xe7",
-+  [0x30ba] = "\x4d\xe8", [0x30bb] = "\x4d\xe9", [0x30bc] = "\x4d\xea",
-+  [0x30bd] = "\x4d\xeb", [0x30be] = "\x4d\xec", [0x30bf] = "\x4d\xed",
-+  [0x30c0] = "\x4d\xee", [0x30c1] = "\x4d\xef", [0x30c2] = "\x4d\xf0",
-+  [0x30c3] = "\x4d\xf1", [0x30c4] = "\x4d\xf2", [0x30c5] = "\x4d\xf3",
-+  [0x30c6] = "\x4d\xf4", [0x30c7] = "\x4d\xf5", [0x30c8] = "\x4d\xf6",
-+  [0x30c9] = "\x4d\xf7", [0x30ca] = "\x4d\xf8", [0x30cb] = "\x4d\xf9",
-+  [0x30cc] = "\x4d\xfa", [0x30cd] = "\x4d\xfb", [0x30ce] = "\x4d\xfc",
-+  [0x30cf] = "\x4d\xfd", [0x30d0] = "\x4d\xfe", [0x30d1] = "\x4d\xff",
-+  [0x30d2] = "\x4e\x00", [0x30d3] = "\x4e\x01", [0x30d4] = "\x4e\x02",
-+  [0x30d5] = "\x4e\x03", [0x30d6] = "\x4e\x04", [0x30d7] = "\x4e\x05",
-+  [0x30d8] = "\x4e\x06", [0x30d9] = "\x4e\x07", [0x30da] = "\x4e\x08",
-+  [0x30db] = "\x4e\x09", [0x30dc] = "\x4e\x0a", [0x30dd] = "\x4e\x0b",
-+  [0x30de] = "\x4e\x0c", [0x30df] = "\x4e\x0d", [0x30e0] = "\x4e\x0e",
-+  [0x30e1] = "\x4e\x0f", [0x30e2] = "\x4e\x10", [0x30e3] = "\x4e\x11",
-+  [0x30e4] = "\x4e\x12", [0x30e5] = "\x4e\x13", [0x30e6] = "\x4e\x14",
-+  [0x30e7] = "\x4e\x15", [0x30e8] = "\x4e\x16", [0x30e9] = "\x4e\x17",
-+  [0x30ea] = "\x4e\x18", [0x30eb] = "\x4e\x19", [0x30ec] = "\x4e\x1a",
-+  [0x30ed] = "\x4e\x1b", [0x30ee] = "\x4e\x1c", [0x30ef] = "\x4e\x1d",
-+  [0x30f0] = "\x4e\x1e", [0x30f1] = "\x4e\x1f", [0x30f2] = "\x4e\x20",
-+  [0x30f3] = "\x4e\x21", [0x30f4] = "\x4e\x22", [0x30f5] = "\x4e\x23",
-+  [0x30f6] = "\x4e\x24", [0x30f7] = "\x4e\x25", [0x30f8] = "\x4e\x26",
-+  [0x30f9] = "\x4e\x27", [0x30fa] = "\x4e\x28", [0x30fb] = "\x4e\x29",
-+  [0x30fc] = "\x4e\x2a", [0x30fd] = "\x4e\x2b", [0x30fe] = "\x4e\x2c",
-+  [0x30ff] = "\x4e\x2d", [0x3100] = "\x4e\x2e", [0x3101] = "\x4e\x2f",
-+  [0x3102] = "\x4e\x30", [0x3103] = "\x4e\x31", [0x3104] = "\x4e\x32",
-+  [0x3105] = "\x4e\x33", [0x3106] = "\x4e\x34", [0x3107] = "\x4e\x35",
-+  [0x3108] = "\x4e\x36", [0x3109] = "\x4e\x37", [0x310a] = "\x4e\x38",
-+  [0x310b] = "\x4e\x39", [0x310c] = "\x4e\x3a", [0x310d] = "\x4e\x3b",
-+  [0x310e] = "\x4e\x3c", [0x310f] = "\x4e\x3d", [0x3110] = "\x4e\x3e",
-+  [0x3111] = "\x4e\x3f", [0x3112] = "\x4e\x40", [0x3113] = "\x4e\x41",
-+  [0x3114] = "\x4e\x42", [0x3115] = "\x4e\x43", [0x3116] = "\x4e\x44",
-+  [0x3117] = "\x4e\x45", [0x3118] = "\x4e\x46", [0x3119] = "\x4e\x47",
-+  [0x311a] = "\x4e\x48", [0x311b] = "\x4e\x49", [0x311c] = "\x4e\x4a",
-+  [0x311d] = "\x4e\x4b", [0x311e] = "\x4e\x4c", [0x311f] = "\x4e\x4d",
-+  [0x3120] = "\x4e\x4e", [0x3121] = "\x4e\x4f", [0x3122] = "\x4e\x50",
-+  [0x3123] = "\x4e\x51", [0x3124] = "\x4e\x52", [0x3125] = "\x4e\x53",
-+  [0x3126] = "\x4e\x54", [0x3127] = "\x4e\x55", [0x3128] = "\x4e\x56",
-+  [0x3129] = "\x4e\x57", [0x312a] = "\x4e\x58", [0x312b] = "\x4e\x59",
-+  [0x312c] = "\x4e\x5a", [0x312d] = "\x4e\x5b", [0x312e] = "\x4e\x5c",
-+  [0x312f] = "\x4e\x5d", [0x3130] = "\x4e\x5e", [0x3131] = "\x4e\x5f",
-+  [0x3132] = "\x4e\x60", [0x3133] = "\x4e\x61", [0x3134] = "\x4e\x62",
-+  [0x3135] = "\x4e\x63", [0x3136] = "\x4e\x64", [0x3137] = "\x4e\x65",
-+  [0x3138] = "\x4e\x66", [0x3139] = "\x4e\x67", [0x313a] = "\x4e\x68",
-+  [0x313b] = "\x4e\x69", [0x313c] = "\x4e\x6a", [0x313d] = "\x4e\x6b",
-+  [0x313e] = "\x4e\x6c", [0x313f] = "\x4e\x6d", [0x3140] = "\x4e\x6e",
-+  [0x3141] = "\x4e\x6f", [0x3142] = "\x4e\x70", [0x3143] = "\x4e\x71",
-+  [0x3144] = "\x4e\x72", [0x3145] = "\x4e\x73", [0x3146] = "\x4e\x74",
-+  [0x3147] = "\x4e\x75", [0x3148] = "\x4e\x76", [0x3149] = "\x4e\x77",
-+  [0x314a] = "\x4e\x78", [0x314b] = "\x4e\x79", [0x314c] = "\x4e\x7a",
-+  [0x314d] = "\x4e\x7b", [0x314e] = "\x4e\x7c", [0x314f] = "\x4e\x7d",
-+  [0x3150] = "\x4e\x7e", [0x3151] = "\x4e\x7f", [0x3152] = "\x4e\x80",
-+  [0x3153] = "\x4e\x81", [0x3154] = "\x4e\x82", [0x3155] = "\x4e\x83",
-+  [0x3156] = "\x4e\x84", [0x3157] = "\x4e\x85", [0x3158] = "\x4e\x86",
-+  [0x3159] = "\x4e\x87", [0x315a] = "\x4e\x88", [0x315b] = "\x4e\x89",
-+  [0x315c] = "\x4e\x8a", [0x315d] = "\x4e\x8b", [0x315e] = "\x4e\x8c",
-+  [0x315f] = "\x4e\x8d", [0x3160] = "\x4e\x8e", [0x3161] = "\x4e\x8f",
-+  [0x3162] = "\x4e\x90", [0x3163] = "\x4e\x91", [0x3164] = "\x4e\x92",
-+  [0x3165] = "\x4e\x93", [0x3166] = "\x4e\x94", [0x3167] = "\x4e\x95",
-+  [0x3168] = "\x4e\x96", [0x3169] = "\x4e\x97", [0x316a] = "\x4e\x98",
-+  [0x316b] = "\x4e\x99", [0x316c] = "\x4e\x9a", [0x316d] = "\x4e\x9b",
-+  [0x316e] = "\x4e\x9c", [0x316f] = "\x4e\x9d", [0x3170] = "\x4e\x9e",
-+  [0x3171] = "\x4e\x9f", [0x3172] = "\x4e\xa0", [0x3173] = "\x4e\xa1",
-+  [0x3174] = "\x4e\xa2", [0x3175] = "\x4e\xa3", [0x3176] = "\x4e\xa4",
-+  [0x3177] = "\x4e\xa5", [0x3178] = "\x4e\xa6", [0x3179] = "\x4e\xa7",
-+  [0x317a] = "\x4e\xa8", [0x317b] = "\x4e\xa9", [0x317c] = "\x4e\xaa",
-+  [0x317d] = "\x4e\xab", [0x317e] = "\x4e\xac", [0x317f] = "\x4e\xad",
-+  [0x3180] = "\x4e\xae", [0x3181] = "\x4e\xaf", [0x3182] = "\x4e\xb0",
-+  [0x3183] = "\x4e\xb1", [0x3184] = "\x4e\xb2", [0x3185] = "\x4e\xb3",
-+  [0x3186] = "\x4e\xb4", [0x3187] = "\x4e\xb5", [0x3188] = "\x4e\xb6",
-+  [0x3189] = "\x4e\xb7", [0x318a] = "\x4e\xb8", [0x318b] = "\x4e\xb9",
-+  [0x318c] = "\x4e\xba", [0x318d] = "\x4e\xbb", [0x318e] = "\x4e\xbc",
-+  [0x318f] = "\x4e\xbd", [0x3190] = "\x4e\xbe", [0x3191] = "\x4e\xbf",
-+  [0x3192] = "\x4e\xc0", [0x3193] = "\x4e\xc1", [0x3194] = "\x4e\xc2",
-+  [0x3195] = "\x4e\xc3", [0x3196] = "\x4e\xc4", [0x3197] = "\x4e\xc5",
-+  [0x3198] = "\x4e\xc6", [0x3199] = "\x4e\xc7", [0x319a] = "\x4e\xc8",
-+  [0x319b] = "\x4e\xc9", [0x319c] = "\x4e\xca", [0x319d] = "\x4e\xcb",
-+  [0x319e] = "\x4e\xcc", [0x319f] = "\x4e\xcd", [0x31a0] = "\xa2\xe5",
-+  [0x31a1] = "\xa2\xe6", [0x31a2] = "\xa2\xe7", [0x31a3] = "\xa2\xe8",
-+  [0x31a4] = "\xa2\xe9", [0x31a5] = "\xa2\xea", [0x31a6] = "\xa2\xeb",
-+  [0x31a7] = "\xa2\xec", [0x31a8] = "\xa2\xed", [0x31a9] = "\xa2\xee",
-+  [0x31aa] = "\x4e\xce", [0x31ab] = "\x4e\xcf", [0x31ac] = "\x4e\xd0",
-+  [0x31ad] = "\x4e\xd1", [0x31ae] = "\x4e\xd2", [0x31af] = "\x4e\xd3",
-+  [0x31b0] = "\x4e\xd4", [0x31b1] = "\xa9\x5a", [0x31b2] = "\x4e\xd5",
-+  [0x31b3] = "\x4e\xd6", [0x31b4] = "\x4e\xd7", [0x31b5] = "\x4e\xd8",
-+  [0x31b6] = "\x4e\xd9", [0x31b7] = "\x4e\xda", [0x31b8] = "\x4e\xdb",
-+  [0x31b9] = "\x4e\xdc", [0x31ba] = "\x4e\xdd", [0x31bb] = "\x4e\xde",
-+  [0x31bc] = "\x4e\xdf", [0x31bd] = "\x4e\xe0", [0x31be] = "\x4e\xe1",
-+  [0x31bf] = "\x4e\xe2", [0x31c0] = "\x4e\xe3", [0x31c1] = "\x4e\xe4",
-+  [0x31c2] = "\x4e\xe5", [0x31c3] = "\x4e\xe6", [0x31c4] = "\x4e\xe7",
-+  [0x31c5] = "\x4e\xe8", [0x31c6] = "\x4e\xe9", [0x31c7] = "\x4e\xea",
-+  [0x31c8] = "\x4e\xeb", [0x31c9] = "\x4e\xec", [0x31ca] = "\x4e\xed",
-+  [0x31cb] = "\x4e\xee", [0x31cc] = "\x4e\xef", [0x31cd] = "\x4e\xf0",
-+  [0x31ce] = "\x4e\xf1", [0x31cf] = "\x4e\xf2", [0x31d0] = "\x4e\xf3",
-+  [0x31d1] = "\x4e\xf4", [0x31d2] = "\x4e\xf5", [0x31d3] = "\x4e\xf6",
-+  [0x31d4] = "\x4e\xf7", [0x31d5] = "\x4e\xf8", [0x31d6] = "\x4e\xf9",
-+  [0x31d7] = "\x4e\xfa", [0x31d8] = "\x4e\xfb", [0x31d9] = "\x4e\xfc",
-+  [0x31da] = "\x4e\xfd", [0x31db] = "\x4e\xfe", [0x31dc] = "\x4e\xff",
-+  [0x31dd] = "\x4f\x00", [0x31de] = "\x4f\x01", [0x31df] = "\x4f\x02",
-+  [0x31e0] = "\x4f\x03", [0x31e1] = "\x4f\x04", [0x31e2] = "\x4f\x05",
-+  [0x31e3] = "\x4f\x06", [0x31e4] = "\x4f\x07", [0x31e5] = "\x4f\x08",
-+  [0x31e6] = "\x4f\x09", [0x31e7] = "\x4f\x0a", [0x31e8] = "\x4f\x0b",
-+  [0x31e9] = "\x4f\x0c", [0x31ea] = "\x4f\x0d", [0x31eb] = "\x4f\x0e",
-+  [0x31ec] = "\x4f\x0f", [0x31ed] = "\x4f\x10", [0x31ee] = "\x4f\x11",
-+  [0x31ef] = "\x4f\x12", [0x31f0] = "\x4f\x13", [0x31f1] = "\x4f\x14",
-+  [0x31f2] = "\x4f\x15", [0x31f3] = "\x4f\x16", [0x31f4] = "\x4f\x17",
-+  [0x31f5] = "\x4f\x18", [0x31f6] = "\x4f\x19", [0x31f7] = "\x4f\x1a",
-+  [0x31f8] = "\x4f\x1b", [0x31f9] = "\x4f\x1c", [0x31fa] = "\x4f\x1d",
-+  [0x31fb] = "\x4f\x1e", [0x31fc] = "\x4f\x1f", [0x31fd] = "\x4f\x20",
-+  [0x31fe] = "\x4f\x21", [0x31ff] = "\x4f\x22", [0x3200] = "\x4f\x23",
-+  [0x3201] = "\x4f\x24", [0x3202] = "\x4f\x25", [0x3203] = "\x4f\x26",
-+  [0x3204] = "\x4f\x27", [0x3205] = "\x4f\x28", [0x3206] = "\x4f\x29",
-+  [0x3207] = "\x4f\x2a", [0x3208] = "\x4f\x2b", [0x3209] = "\x4f\x2c",
-+  [0x320a] = "\x4f\x2d", [0x320b] = "\x4f\x2e", [0x320c] = "\x4f\x2f",
-+  [0x320d] = "\x4f\x30", [0x320e] = "\x4f\x31", [0x320f] = "\x4f\x32",
-+  [0x3210] = "\x4f\x33", [0x3211] = "\x4f\x34", [0x3212] = "\x4f\x35",
-+  [0x3213] = "\x4f\x36", [0x3214] = "\x4f\x37", [0x3215] = "\x4f\x38",
-+  [0x3216] = "\x4f\x39", [0x3217] = "\x4f\x3a", [0x3218] = "\x4f\x3b",
-+  [0x3219] = "\x4f\x3c", [0x321a] = "\x4f\x3d", [0x321b] = "\x4f\x3e",
-+  [0x321c] = "\x4f\x3f", [0x321d] = "\x4f\x40", [0x321e] = "\x4f\x41",
-+  [0x321f] = "\x4f\x42", [0x3220] = "\x4f\x43", [0x3221] = "\x4f\x44",
-+  [0x3222] = "\x4f\x45", [0x3223] = "\xa9\x49", [0x3224] = "\x4f\x46",
-+  [0x3225] = "\x4f\x47", [0x3226] = "\x4f\x48", [0x3227] = "\x4f\x49",
-+  [0x3228] = "\x4f\x4a", [0x3229] = "\x4f\x4b", [0x322a] = "\x4f\x4c",
-+  [0x322b] = "\x4f\x4d", [0x322c] = "\x4f\x4e", [0x322d] = "\x4f\x4f",
-+  [0x322e] = "\x4f\x50", [0x322f] = "\x4f\x51", [0x3230] = "\x4f\x52",
-+  [0x3231] = "\x4f\x53", [0x3232] = "\x4f\x54", [0x3233] = "\x4f\x55",
-+  [0x3234] = "\x4f\x56", [0x3235] = "\x4f\x57", [0x3236] = "\x4f\x58",
-+  [0x3237] = "\x4f\x59", [0x3238] = "\x4f\x5a", [0x3239] = "\x4f\x5b",
-+  [0x323a] = "\x4f\x5c", [0x323b] = "\x4f\x5d", [0x323c] = "\x4f\x5e",
-+  [0x323d] = "\x4f\x5f", [0x323e] = "\x4f\x60", [0x323f] = "\x4f\x61",
-+  [0x3240] = "\x4f\x62", [0x3241] = "\x4f\x63", [0x3242] = "\x4f\x64",
-+  [0x3243] = "\x4f\x65", [0x3244] = "\x4f\x66", [0x3245] = "\x4f\x67",
-+  [0x3246] = "\x4f\x68", [0x3247] = "\x4f\x69", [0x3248] = "\x4f\x6a",
-+  [0x3249] = "\x4f\x6b", [0x324a] = "\x4f\x6c", [0x324b] = "\x4f\x6d",
-+  [0x324c] = "\x4f\x6e", [0x324d] = "\x4f\x6f", [0x324e] = "\x4f\x70",
-+  [0x324f] = "\x4f\x71", [0x3250] = "\x4f\x72", [0x3251] = "\x4f\x73",
-+  [0x3252] = "\x4f\x74", [0x3253] = "\x4f\x75", [0x3254] = "\x4f\x76",
-+  [0x3255] = "\x4f\x77", [0x3256] = "\x4f\x78", [0x3257] = "\x4f\x79",
-+  [0x3258] = "\x4f\x7a", [0x3259] = "\x4f\x7b", [0x325a] = "\x4f\x7c",
-+  [0x325b] = "\x4f\x7d", [0x325c] = "\x4f\x7e", [0x325d] = "\x4f\x7f",
-+  [0x325e] = "\x4f\x80", [0x325f] = "\x4f\x81", [0x3260] = "\x4f\x82",
-+  [0x3261] = "\x4f\x83", [0x3262] = "\x4f\x84", [0x3263] = "\x4f\x85",
-+  [0x3264] = "\x4f\x86", [0x3265] = "\x4f\x87", [0x3266] = "\x4f\x88",
-+  [0x3267] = "\x4f\x89", [0x3268] = "\x4f\x8a", [0x3269] = "\x4f\x8b",
-+  [0x326a] = "\x4f\x8c", [0x326b] = "\x4f\x8d", [0x326c] = "\x4f\x8e",
-+  [0x326d] = "\x4f\x8f", [0x326e] = "\x4f\x90", [0x326f] = "\x4f\x91",
-+  [0x3270] = "\x4f\x92", [0x3271] = "\x4f\x93", [0x3272] = "\x4f\x94",
-+  [0x3273] = "\x4f\x95", [0x3274] = "\x4f\x96", [0x3275] = "\x4f\x97",
-+  [0x3276] = "\x4f\x98", [0x3277] = "\x4f\x99", [0x3278] = "\x4f\x9a",
-+  [0x3279] = "\x4f\x9b", [0x327a] = "\x4f\x9c", [0x327b] = "\x4f\x9d",
-+  [0x327c] = "\x4f\x9e", [0x327d] = "\x4f\x9f", [0x327e] = "\x4f\xa0",
-+  [0x327f] = "\x4f\xa1", [0x3280] = "\x4f\xa2", [0x3281] = "\x4f\xa3",
-   [0x3282] = "\x4f\xa4", [0x3283] = "\x4f\xa5", [0x3284] = "\x4f\xa6",
-   [0x3285] = "\x4f\xa7", [0x3286] = "\x4f\xa8", [0x3287] = "\x4f\xa9",
-   [0x3288] = "\x4f\xaa", [0x3289] = "\x4f\xab", [0x328a] = "\x4f\xac",
-@@ -9253,7 +13730,262 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x3591] = "\x52\xa4", [0x3592] = "\x52\xa5", [0x3593] = "\x52\xa6",
-   [0x3594] = "\x52\xa7", [0x3595] = "\x52\xa8", [0x3596] = "\x52\xa9",
-   [0x3597] = "\x52\xaa", [0x3598] = "\x52\xab", [0x3599] = "\x52\xac",
--  [0x359a] = "\xfe\x5b", [0x3898] = "\xfe\x60", [0x3899] = "\x55\xaa",
-+  [0x359a] = "\xfe\x5b", [0x359b] = "\x52\xad", [0x359c] = "\x52\xae",
-+  [0x359d] = "\x52\xaf", [0x359e] = "\x52\xb0", [0x359f] = "\x52\xb1",
-+  [0x35a0] = "\x52\xb2", [0x35a1] = "\x52\xb3", [0x35a2] = "\x52\xb4",
-+  [0x35a3] = "\x52\xb5", [0x35a4] = "\x52\xb6", [0x35a5] = "\x52\xb7",
-+  [0x35a6] = "\x52\xb8", [0x35a7] = "\x52\xb9", [0x35a8] = "\x52\xba",
-+  [0x35a9] = "\x52\xbb", [0x35aa] = "\x52\xbc", [0x35ab] = "\x52\xbd",
-+  [0x35ac] = "\x52\xbe", [0x35ad] = "\x52\xbf", [0x35ae] = "\x52\xc0",
-+  [0x35af] = "\x52\xc1", [0x35b0] = "\x52\xc2", [0x35b1] = "\x52\xc3",
-+  [0x35b2] = "\x52\xc4", [0x35b3] = "\x52\xc5", [0x35b4] = "\x52\xc6",
-+  [0x35b5] = "\x52\xc7", [0x35b6] = "\x52\xc8", [0x35b7] = "\x52\xc9",
-+  [0x35b8] = "\x52\xca", [0x35b9] = "\x52\xcb", [0x35ba] = "\x52\xcc",
-+  [0x35bb] = "\x52\xcd", [0x35bc] = "\x52\xce", [0x35bd] = "\x52\xcf",
-+  [0x35be] = "\x52\xd0", [0x35bf] = "\x52\xd1", [0x35c0] = "\x52\xd2",
-+  [0x35c1] = "\x52\xd3", [0x35c2] = "\x52\xd4", [0x35c3] = "\x52\xd5",
-+  [0x35c4] = "\x52\xd6", [0x35c5] = "\x52\xd7", [0x35c6] = "\x52\xd8",
-+  [0x35c7] = "\x52\xd9", [0x35c8] = "\x52\xda", [0x35c9] = "\x52\xdb",
-+  [0x35ca] = "\x52\xdc", [0x35cb] = "\x52\xdd", [0x35cc] = "\x52\xde",
-+  [0x35cd] = "\x52\xdf", [0x35ce] = "\x52\xe0", [0x35cf] = "\x52\xe1",
-+  [0x35d0] = "\x52\xe2", [0x35d1] = "\x52\xe3", [0x35d2] = "\x52\xe4",
-+  [0x35d3] = "\x52\xe5", [0x35d4] = "\x52\xe6", [0x35d5] = "\x52\xe7",
-+  [0x35d6] = "\x52\xe8", [0x35d7] = "\x52\xe9", [0x35d8] = "\x52\xea",
-+  [0x35d9] = "\x52\xeb", [0x35da] = "\x52\xec", [0x35db] = "\x52\xed",
-+  [0x35dc] = "\x52\xee", [0x35dd] = "\x52\xef", [0x35de] = "\x52\xf0",
-+  [0x35df] = "\x52\xf1", [0x35e0] = "\x52\xf2", [0x35e1] = "\x52\xf3",
-+  [0x35e2] = "\x52\xf4", [0x35e3] = "\x52\xf5", [0x35e4] = "\x52\xf6",
-+  [0x35e5] = "\x52\xf7", [0x35e6] = "\x52\xf8", [0x35e7] = "\x52\xf9",
-+  [0x35e8] = "\x52\xfa", [0x35e9] = "\x52\xfb", [0x35ea] = "\x52\xfc",
-+  [0x35eb] = "\x52\xfd", [0x35ec] = "\x52\xfe", [0x35ed] = "\x52\xff",
-+  [0x35ee] = "\x53\x00", [0x35ef] = "\x53\x01", [0x35f0] = "\x53\x02",
-+  [0x35f1] = "\x53\x03", [0x35f2] = "\x53\x04", [0x35f3] = "\x53\x05",
-+  [0x35f4] = "\x53\x06", [0x35f5] = "\x53\x07", [0x35f6] = "\x53\x08",
-+  [0x35f7] = "\x53\x09", [0x35f8] = "\x53\x0a", [0x35f9] = "\x53\x0b",
-+  [0x35fa] = "\x53\x0c", [0x35fb] = "\x53\x0d", [0x35fc] = "\x53\x0e",
-+  [0x35fd] = "\x53\x0f", [0x35fe] = "\x53\x10", [0x35ff] = "\x53\x11",
-+  [0x3600] = "\x53\x12", [0x3601] = "\x53\x13", [0x3602] = "\x53\x14",
-+  [0x3603] = "\x53\x15", [0x3604] = "\x53\x16", [0x3605] = "\x53\x17",
-+  [0x3606] = "\x53\x18", [0x3607] = "\x53\x19", [0x3608] = "\x53\x1a",
-+  [0x3609] = "\x53\x1b", [0x360a] = "\x53\x1c", [0x360b] = "\x53\x1d",
-+  [0x360c] = "\x53\x1e", [0x360d] = "\x53\x1f", [0x360e] = "\x53\x20",
-+  [0x360f] = "\x53\x21", [0x3610] = "\x53\x22", [0x3611] = "\x53\x23",
-+  [0x3612] = "\x53\x24", [0x3613] = "\x53\x25", [0x3614] = "\x53\x26",
-+  [0x3615] = "\x53\x27", [0x3616] = "\x53\x28", [0x3617] = "\x53\x29",
-+  [0x3618] = "\x53\x2a", [0x3619] = "\x53\x2b", [0x361a] = "\x53\x2c",
-+  [0x361b] = "\x53\x2d", [0x361c] = "\x53\x2e", [0x361d] = "\x53\x2f",
-+  [0x361e] = "\x53\x30", [0x361f] = "\x53\x31", [0x3620] = "\x53\x32",
-+  [0x3621] = "\x53\x33", [0x3622] = "\x53\x34", [0x3623] = "\x53\x35",
-+  [0x3624] = "\x53\x36", [0x3625] = "\x53\x37", [0x3626] = "\x53\x38",
-+  [0x3627] = "\x53\x39", [0x3628] = "\x53\x3a", [0x3629] = "\x53\x3b",
-+  [0x362a] = "\x53\x3c", [0x362b] = "\x53\x3d", [0x362c] = "\x53\x3e",
-+  [0x362d] = "\x53\x3f", [0x362e] = "\x53\x40", [0x362f] = "\x53\x41",
-+  [0x3630] = "\x53\x42", [0x3631] = "\x53\x43", [0x3632] = "\x53\x44",
-+  [0x3633] = "\x53\x45", [0x3634] = "\x53\x46", [0x3635] = "\x53\x47",
-+  [0x3636] = "\x53\x48", [0x3637] = "\x53\x49", [0x3638] = "\x53\x4a",
-+  [0x3639] = "\x53\x4b", [0x363a] = "\x53\x4c", [0x363b] = "\x53\x4d",
-+  [0x363c] = "\x53\x4e", [0x363d] = "\x53\x4f", [0x363e] = "\x53\x50",
-+  [0x363f] = "\x53\x51", [0x3640] = "\x53\x52", [0x3641] = "\x53\x53",
-+  [0x3642] = "\x53\x54", [0x3643] = "\x53\x55", [0x3644] = "\x53\x56",
-+  [0x3645] = "\x53\x57", [0x3646] = "\x53\x58", [0x3647] = "\x53\x59",
-+  [0x3648] = "\x53\x5a", [0x3649] = "\x53\x5b", [0x364a] = "\x53\x5c",
-+  [0x364b] = "\x53\x5d", [0x364c] = "\x53\x5e", [0x364d] = "\x53\x5f",
-+  [0x364e] = "\x53\x60", [0x364f] = "\x53\x61", [0x3650] = "\x53\x62",
-+  [0x3651] = "\x53\x63", [0x3652] = "\x53\x64", [0x3653] = "\x53\x65",
-+  [0x3654] = "\x53\x66", [0x3655] = "\x53\x67", [0x3656] = "\x53\x68",
-+  [0x3657] = "\x53\x69", [0x3658] = "\x53\x6a", [0x3659] = "\x53\x6b",
-+  [0x365a] = "\x53\x6c", [0x365b] = "\x53\x6d", [0x365c] = "\x53\x6e",
-+  [0x365d] = "\x53\x6f", [0x365e] = "\x53\x70", [0x365f] = "\x53\x71",
-+  [0x3660] = "\x53\x72", [0x3661] = "\x53\x73", [0x3662] = "\x53\x74",
-+  [0x3663] = "\x53\x75", [0x3664] = "\x53\x76", [0x3665] = "\x53\x77",
-+  [0x3666] = "\x53\x78", [0x3667] = "\x53\x79", [0x3668] = "\x53\x7a",
-+  [0x3669] = "\x53\x7b", [0x366a] = "\x53\x7c", [0x366b] = "\x53\x7d",
-+  [0x366c] = "\x53\x7e", [0x366d] = "\x53\x7f", [0x366e] = "\x53\x80",
-+  [0x366f] = "\x53\x81", [0x3670] = "\x53\x82", [0x3671] = "\x53\x83",
-+  [0x3672] = "\x53\x84", [0x3673] = "\x53\x85", [0x3674] = "\x53\x86",
-+  [0x3675] = "\x53\x87", [0x3676] = "\x53\x88", [0x3677] = "\x53\x89",
-+  [0x3678] = "\x53\x8a", [0x3679] = "\x53\x8b", [0x367a] = "\x53\x8c",
-+  [0x367b] = "\x53\x8d", [0x367c] = "\x53\x8e", [0x367d] = "\x53\x8f",
-+  [0x367e] = "\x53\x90", [0x367f] = "\x53\x91", [0x3680] = "\x53\x92",
-+  [0x3681] = "\x53\x93", [0x3682] = "\x53\x94", [0x3683] = "\x53\x95",
-+  [0x3684] = "\x53\x96", [0x3685] = "\x53\x97", [0x3686] = "\x53\x98",
-+  [0x3687] = "\x53\x99", [0x3688] = "\x53\x9a", [0x3689] = "\x53\x9b",
-+  [0x368a] = "\x53\x9c", [0x368b] = "\x53\x9d", [0x368c] = "\x53\x9e",
-+  [0x368d] = "\x53\x9f", [0x368e] = "\x53\xa0", [0x368f] = "\x53\xa1",
-+  [0x3690] = "\x53\xa2", [0x3691] = "\x53\xa3", [0x3692] = "\x53\xa4",
-+  [0x3693] = "\x53\xa5", [0x3694] = "\x53\xa6", [0x3695] = "\x53\xa7",
-+  [0x3696] = "\x53\xa8", [0x3697] = "\x53\xa9", [0x3698] = "\x53\xaa",
-+  [0x3699] = "\x53\xab", [0x369a] = "\x53\xac", [0x369b] = "\x53\xad",
-+  [0x369c] = "\x53\xae", [0x369d] = "\x53\xaf", [0x369e] = "\x53\xb0",
-+  [0x369f] = "\x53\xb1", [0x36a0] = "\x53\xb2", [0x36a1] = "\x53\xb3",
-+  [0x36a2] = "\x53\xb4", [0x36a3] = "\x53\xb5", [0x36a4] = "\x53\xb6",
-+  [0x36a5] = "\x53\xb7", [0x36a6] = "\x53\xb8", [0x36a7] = "\x53\xb9",
-+  [0x36a8] = "\x53\xba", [0x36a9] = "\x53\xbb", [0x36aa] = "\x53\xbc",
-+  [0x36ab] = "\x53\xbd", [0x36ac] = "\x53\xbe", [0x36ad] = "\x53\xbf",
-+  [0x36ae] = "\x53\xc0", [0x36af] = "\x53\xc1", [0x36b0] = "\x53\xc2",
-+  [0x36b1] = "\x53\xc3", [0x36b2] = "\x53\xc4", [0x36b3] = "\x53\xc5",
-+  [0x36b4] = "\x53\xc6", [0x36b5] = "\x53\xc7", [0x36b6] = "\x53\xc8",
-+  [0x36b7] = "\x53\xc9", [0x36b8] = "\x53\xca", [0x36b9] = "\x53\xcb",
-+  [0x36ba] = "\x53\xcc", [0x36bb] = "\x53\xcd", [0x36bc] = "\x53\xce",
-+  [0x36bd] = "\x53\xcf", [0x36be] = "\x53\xd0", [0x36bf] = "\x53\xd1",
-+  [0x36c0] = "\x53\xd2", [0x36c1] = "\x53\xd3", [0x36c2] = "\x53\xd4",
-+  [0x36c3] = "\x53\xd5", [0x36c4] = "\x53\xd6", [0x36c5] = "\x53\xd7",
-+  [0x36c6] = "\x53\xd8", [0x36c7] = "\x53\xd9", [0x36c8] = "\x53\xda",
-+  [0x36c9] = "\x53\xdb", [0x36ca] = "\x53\xdc", [0x36cb] = "\x53\xdd",
-+  [0x36cc] = "\x53\xde", [0x36cd] = "\x53\xdf", [0x36ce] = "\x53\xe0",
-+  [0x36cf] = "\x53\xe1", [0x36d0] = "\x53\xe2", [0x36d1] = "\x53\xe3",
-+  [0x36d2] = "\x53\xe4", [0x36d3] = "\x53\xe5", [0x36d4] = "\x53\xe6",
-+  [0x36d5] = "\x53\xe7", [0x36d6] = "\x53\xe8", [0x36d7] = "\x53\xe9",
-+  [0x36d8] = "\x53\xea", [0x36d9] = "\x53\xeb", [0x36da] = "\x53\xec",
-+  [0x36db] = "\x53\xed", [0x36dc] = "\x53\xee", [0x36dd] = "\x53\xef",
-+  [0x36de] = "\x53\xf0", [0x36df] = "\x53\xf1", [0x36e0] = "\x53\xf2",
-+  [0x36e1] = "\x53\xf3", [0x36e2] = "\x53\xf4", [0x36e3] = "\x53\xf5",
-+  [0x36e4] = "\x53\xf6", [0x36e5] = "\x53\xf7", [0x36e6] = "\x53\xf8",
-+  [0x36e7] = "\x53\xf9", [0x36e8] = "\x53\xfa", [0x36e9] = "\x53\xfb",
-+  [0x36ea] = "\x53\xfc", [0x36eb] = "\x53\xfd", [0x36ec] = "\x53\xfe",
-+  [0x36ed] = "\x53\xff", [0x36ee] = "\x54\x00", [0x36ef] = "\x54\x01",
-+  [0x36f0] = "\x54\x02", [0x36f1] = "\x54\x03", [0x36f2] = "\x54\x04",
-+  [0x36f3] = "\x54\x05", [0x36f4] = "\x54\x06", [0x36f5] = "\x54\x07",
-+  [0x36f6] = "\x54\x08", [0x36f7] = "\x54\x09", [0x36f8] = "\x54\x0a",
-+  [0x36f9] = "\x54\x0b", [0x36fa] = "\x54\x0c", [0x36fb] = "\x54\x0d",
-+  [0x36fc] = "\x54\x0e", [0x36fd] = "\x54\x0f", [0x36fe] = "\x54\x10",
-+  [0x36ff] = "\x54\x11", [0x3700] = "\x54\x12", [0x3701] = "\x54\x13",
-+  [0x3702] = "\x54\x14", [0x3703] = "\x54\x15", [0x3704] = "\x54\x16",
-+  [0x3705] = "\x54\x17", [0x3706] = "\x54\x18", [0x3707] = "\x54\x19",
-+  [0x3708] = "\x54\x1a", [0x3709] = "\x54\x1b", [0x370a] = "\x54\x1c",
-+  [0x370b] = "\x54\x1d", [0x370c] = "\x54\x1e", [0x370d] = "\x54\x1f",
-+  [0x370e] = "\x54\x20", [0x370f] = "\x54\x21", [0x3710] = "\x54\x22",
-+  [0x3711] = "\x54\x23", [0x3712] = "\x54\x24", [0x3713] = "\x54\x25",
-+  [0x3714] = "\x54\x26", [0x3715] = "\x54\x27", [0x3716] = "\x54\x28",
-+  [0x3717] = "\x54\x29", [0x3718] = "\x54\x2a", [0x3719] = "\x54\x2b",
-+  [0x371a] = "\x54\x2c", [0x371b] = "\x54\x2d", [0x371c] = "\x54\x2e",
-+  [0x371d] = "\x54\x2f", [0x371e] = "\x54\x30", [0x371f] = "\x54\x31",
-+  [0x3720] = "\x54\x32", [0x3721] = "\x54\x33", [0x3722] = "\x54\x34",
-+  [0x3723] = "\x54\x35", [0x3724] = "\x54\x36", [0x3725] = "\x54\x37",
-+  [0x3726] = "\x54\x38", [0x3727] = "\x54\x39", [0x3728] = "\x54\x3a",
-+  [0x3729] = "\x54\x3b", [0x372a] = "\x54\x3c", [0x372b] = "\x54\x3d",
-+  [0x372c] = "\x54\x3e", [0x372d] = "\x54\x3f", [0x372e] = "\x54\x40",
-+  [0x372f] = "\x54\x41", [0x3730] = "\x54\x42", [0x3731] = "\x54\x43",
-+  [0x3732] = "\x54\x44", [0x3733] = "\x54\x45", [0x3734] = "\x54\x46",
-+  [0x3735] = "\x54\x47", [0x3736] = "\x54\x48", [0x3737] = "\x54\x49",
-+  [0x3738] = "\x54\x4a", [0x3739] = "\x54\x4b", [0x373a] = "\x54\x4c",
-+  [0x373b] = "\x54\x4d", [0x373c] = "\x54\x4e", [0x373d] = "\x54\x4f",
-+  [0x373e] = "\x54\x50", [0x373f] = "\x54\x51", [0x3740] = "\x54\x52",
-+  [0x3741] = "\x54\x53", [0x3742] = "\x54\x54", [0x3743] = "\x54\x55",
-+  [0x3744] = "\x54\x56", [0x3745] = "\x54\x57", [0x3746] = "\x54\x58",
-+  [0x3747] = "\x54\x59", [0x3748] = "\x54\x5a", [0x3749] = "\x54\x5b",
-+  [0x374a] = "\x54\x5c", [0x374b] = "\x54\x5d", [0x374c] = "\x54\x5e",
-+  [0x374d] = "\x54\x5f", [0x374e] = "\x54\x60", [0x374f] = "\x54\x61",
-+  [0x3750] = "\x54\x62", [0x3751] = "\x54\x63", [0x3752] = "\x54\x64",
-+  [0x3753] = "\x54\x65", [0x3754] = "\x54\x66", [0x3755] = "\x54\x67",
-+  [0x3756] = "\x54\x68", [0x3757] = "\x54\x69", [0x3758] = "\x54\x6a",
-+  [0x3759] = "\x54\x6b", [0x375a] = "\x54\x6c", [0x375b] = "\x54\x6d",
-+  [0x375c] = "\x54\x6e", [0x375d] = "\x54\x6f", [0x375e] = "\x54\x70",
-+  [0x375f] = "\x54\x71", [0x3760] = "\x54\x72", [0x3761] = "\x54\x73",
-+  [0x3762] = "\x54\x74", [0x3763] = "\x54\x75", [0x3764] = "\x54\x76",
-+  [0x3765] = "\x54\x77", [0x3766] = "\x54\x78", [0x3767] = "\x54\x79",
-+  [0x3768] = "\x54\x7a", [0x3769] = "\x54\x7b", [0x376a] = "\x54\x7c",
-+  [0x376b] = "\x54\x7d", [0x376c] = "\x54\x7e", [0x376d] = "\x54\x7f",
-+  [0x376e] = "\x54\x80", [0x376f] = "\x54\x81", [0x3770] = "\x54\x82",
-+  [0x3771] = "\x54\x83", [0x3772] = "\x54\x84", [0x3773] = "\x54\x85",
-+  [0x3774] = "\x54\x86", [0x3775] = "\x54\x87", [0x3776] = "\x54\x88",
-+  [0x3777] = "\x54\x89", [0x3778] = "\x54\x8a", [0x3779] = "\x54\x8b",
-+  [0x377a] = "\x54\x8c", [0x377b] = "\x54\x8d", [0x377c] = "\x54\x8e",
-+  [0x377d] = "\x54\x8f", [0x377e] = "\x54\x90", [0x377f] = "\x54\x91",
-+  [0x3780] = "\x54\x92", [0x3781] = "\x54\x93", [0x3782] = "\x54\x94",
-+  [0x3783] = "\x54\x95", [0x3784] = "\x54\x96", [0x3785] = "\x54\x97",
-+  [0x3786] = "\x54\x98", [0x3787] = "\x54\x99", [0x3788] = "\x54\x9a",
-+  [0x3789] = "\x54\x9b", [0x378a] = "\x54\x9c", [0x378b] = "\x54\x9d",
-+  [0x378c] = "\x54\x9e", [0x378d] = "\x54\x9f", [0x378e] = "\x54\xa0",
-+  [0x378f] = "\x54\xa1", [0x3790] = "\x54\xa2", [0x3791] = "\x54\xa3",
-+  [0x3792] = "\x54\xa4", [0x3793] = "\x54\xa5", [0x3794] = "\x54\xa6",
-+  [0x3795] = "\x54\xa7", [0x3796] = "\x54\xa8", [0x3797] = "\x54\xa9",
-+  [0x3798] = "\x54\xaa", [0x3799] = "\x54\xab", [0x379a] = "\x54\xac",
-+  [0x379b] = "\x54\xad", [0x379c] = "\x54\xae", [0x379d] = "\x54\xaf",
-+  [0x379e] = "\x54\xb0", [0x379f] = "\x54\xb1", [0x37a0] = "\x54\xb2",
-+  [0x37a1] = "\x54\xb3", [0x37a2] = "\x54\xb4", [0x37a3] = "\x54\xb5",
-+  [0x37a4] = "\x54\xb6", [0x37a5] = "\x54\xb7", [0x37a6] = "\x54\xb8",
-+  [0x37a7] = "\x54\xb9", [0x37a8] = "\x54\xba", [0x37a9] = "\x54\xbb",
-+  [0x37aa] = "\x54\xbc", [0x37ab] = "\x54\xbd", [0x37ac] = "\x54\xbe",
-+  [0x37ad] = "\x54\xbf", [0x37ae] = "\x54\xc0", [0x37af] = "\x54\xc1",
-+  [0x37b0] = "\x54\xc2", [0x37b1] = "\x54\xc3", [0x37b2] = "\x54\xc4",
-+  [0x37b3] = "\x54\xc5", [0x37b4] = "\x54\xc6", [0x37b5] = "\x54\xc7",
-+  [0x37b6] = "\x54\xc8", [0x37b7] = "\x54\xc9", [0x37b8] = "\x54\xca",
-+  [0x37b9] = "\x54\xcb", [0x37ba] = "\x54\xcc", [0x37bb] = "\x54\xcd",
-+  [0x37bc] = "\x54\xce", [0x37bd] = "\x54\xcf", [0x37be] = "\x54\xd0",
-+  [0x37bf] = "\x54\xd1", [0x37c0] = "\x54\xd2", [0x37c1] = "\x54\xd3",
-+  [0x37c2] = "\x54\xd4", [0x37c3] = "\x54\xd5", [0x37c4] = "\x54\xd6",
-+  [0x37c5] = "\x54\xd7", [0x37c6] = "\x54\xd8", [0x37c7] = "\x54\xd9",
-+  [0x37c8] = "\x54\xda", [0x37c9] = "\x54\xdb", [0x37ca] = "\x54\xdc",
-+  [0x37cb] = "\x54\xdd", [0x37cc] = "\x54\xde", [0x37cd] = "\x54\xdf",
-+  [0x37ce] = "\x54\xe0", [0x37cf] = "\x54\xe1", [0x37d0] = "\x54\xe2",
-+  [0x37d1] = "\x54\xe3", [0x37d2] = "\x54\xe4", [0x37d3] = "\x54\xe5",
-+  [0x37d4] = "\x54\xe6", [0x37d5] = "\x54\xe7", [0x37d6] = "\x54\xe8",
-+  [0x37d7] = "\x54\xe9", [0x37d8] = "\x54\xea", [0x37d9] = "\x54\xeb",
-+  [0x37da] = "\x54\xec", [0x37db] = "\x54\xed", [0x37dc] = "\x54\xee",
-+  [0x37dd] = "\x54\xef", [0x37de] = "\x54\xf0", [0x37df] = "\x54\xf1",
-+  [0x37e0] = "\x54\xf2", [0x37e1] = "\x54\xf3", [0x37e2] = "\x54\xf4",
-+  [0x37e3] = "\x54\xf5", [0x37e4] = "\x54\xf6", [0x37e5] = "\x54\xf7",
-+  [0x37e6] = "\x54\xf8", [0x37e7] = "\x54\xf9", [0x37e8] = "\x54\xfa",
-+  [0x37e9] = "\x54\xfb", [0x37ea] = "\x54\xfc", [0x37eb] = "\x54\xfd",
-+  [0x37ec] = "\x54\xfe", [0x37ed] = "\x54\xff", [0x37ee] = "\x55\x00",
-+  [0x37ef] = "\x55\x01", [0x37f0] = "\x55\x02", [0x37f1] = "\x55\x03",
-+  [0x37f2] = "\x55\x04", [0x37f3] = "\x55\x05", [0x37f4] = "\x55\x06",
-+  [0x37f5] = "\x55\x07", [0x37f6] = "\x55\x08", [0x37f7] = "\x55\x09",
-+  [0x37f8] = "\x55\x0a", [0x37f9] = "\x55\x0b", [0x37fa] = "\x55\x0c",
-+  [0x37fb] = "\x55\x0d", [0x37fc] = "\x55\x0e", [0x37fd] = "\x55\x0f",
-+  [0x37fe] = "\x55\x10", [0x37ff] = "\x55\x11", [0x3800] = "\x55\x12",
-+  [0x3801] = "\x55\x13", [0x3802] = "\x55\x14", [0x3803] = "\x55\x15",
-+  [0x3804] = "\x55\x16", [0x3805] = "\x55\x17", [0x3806] = "\x55\x18",
-+  [0x3807] = "\x55\x19", [0x3808] = "\x55\x1a", [0x3809] = "\x55\x1b",
-+  [0x380a] = "\x55\x1c", [0x380b] = "\x55\x1d", [0x380c] = "\x55\x1e",
-+  [0x380d] = "\x55\x1f", [0x380e] = "\x55\x20", [0x380f] = "\x55\x21",
-+  [0x3810] = "\x55\x22", [0x3811] = "\x55\x23", [0x3812] = "\x55\x24",
-+  [0x3813] = "\x55\x25", [0x3814] = "\x55\x26", [0x3815] = "\x55\x27",
-+  [0x3816] = "\x55\x28", [0x3817] = "\x55\x29", [0x3818] = "\x55\x2a",
-+  [0x3819] = "\x55\x2b", [0x381a] = "\x55\x2c", [0x381b] = "\x55\x2d",
-+  [0x381c] = "\x55\x2e", [0x381d] = "\x55\x2f", [0x381e] = "\x55\x30",
-+  [0x381f] = "\x55\x31", [0x3820] = "\x55\x32", [0x3821] = "\x55\x33",
-+  [0x3822] = "\x55\x34", [0x3823] = "\x55\x35", [0x3824] = "\x55\x36",
-+  [0x3825] = "\x55\x37", [0x3826] = "\x55\x38", [0x3827] = "\x55\x39",
-+  [0x3828] = "\x55\x3a", [0x3829] = "\x55\x3b", [0x382a] = "\x55\x3c",
-+  [0x382b] = "\x55\x3d", [0x382c] = "\x55\x3e", [0x382d] = "\x55\x3f",
-+  [0x382e] = "\x55\x40", [0x382f] = "\x55\x41", [0x3830] = "\x55\x42",
-+  [0x3831] = "\x55\x43", [0x3832] = "\x55\x44", [0x3833] = "\x55\x45",
-+  [0x3834] = "\x55\x46", [0x3835] = "\x55\x47", [0x3836] = "\x55\x48",
-+  [0x3837] = "\x55\x49", [0x3838] = "\x55\x4a", [0x3839] = "\x55\x4b",
-+  [0x383a] = "\x55\x4c", [0x383b] = "\x55\x4d", [0x383c] = "\x55\x4e",
-+  [0x383d] = "\x55\x4f", [0x383e] = "\x55\x50", [0x383f] = "\x55\x51",
-+  [0x3840] = "\x55\x52", [0x3841] = "\x55\x53", [0x3842] = "\x55\x54",
-+  [0x3843] = "\x55\x55", [0x3844] = "\x55\x56", [0x3845] = "\x55\x57",
-+  [0x3846] = "\x55\x58", [0x3847] = "\x55\x59", [0x3848] = "\x55\x5a",
-+  [0x3849] = "\x55\x5b", [0x384a] = "\x55\x5c", [0x384b] = "\x55\x5d",
-+  [0x384c] = "\x55\x5e", [0x384d] = "\x55\x5f", [0x384e] = "\x55\x60",
-+  [0x384f] = "\x55\x61", [0x3850] = "\x55\x62", [0x3851] = "\x55\x63",
-+  [0x3852] = "\x55\x64", [0x3853] = "\x55\x65", [0x3854] = "\x55\x66",
-+  [0x3855] = "\x55\x67", [0x3856] = "\x55\x68", [0x3857] = "\x55\x69",
-+  [0x3858] = "\x55\x6a", [0x3859] = "\x55\x6b", [0x385a] = "\x55\x6c",
-+  [0x385b] = "\x55\x6d", [0x385c] = "\x55\x6e", [0x385d] = "\x55\x6f",
-+  [0x385e] = "\x55\x70", [0x385f] = "\x55\x71", [0x3860] = "\x55\x72",
-+  [0x3861] = "\x55\x73", [0x3862] = "\x55\x74", [0x3863] = "\x55\x75",
-+  [0x3864] = "\x55\x76", [0x3865] = "\x55\x77", [0x3866] = "\x55\x78",
-+  [0x3867] = "\x55\x79", [0x3868] = "\x55\x7a", [0x3869] = "\x55\x7b",
-+  [0x386a] = "\x55\x7c", [0x386b] = "\x55\x7d", [0x386c] = "\x55\x7e",
-+  [0x386d] = "\x55\x7f", [0x386e] = "\x55\x80", [0x386f] = "\x55\x81",
-+  [0x3870] = "\x55\x82", [0x3871] = "\x55\x83", [0x3872] = "\x55\x84",
-+  [0x3873] = "\x55\x85", [0x3874] = "\x55\x86", [0x3875] = "\x55\x87",
-+  [0x3876] = "\x55\x88", [0x3877] = "\x55\x89", [0x3878] = "\x55\x8a",
-+  [0x3879] = "\x55\x8b", [0x387a] = "\x55\x8c", [0x387b] = "\x55\x8d",
-+  [0x387c] = "\x55\x8e", [0x387d] = "\x55\x8f", [0x387e] = "\x55\x90",
-+  [0x387f] = "\x55\x91", [0x3880] = "\x55\x92", [0x3881] = "\x55\x93",
-+  [0x3882] = "\x55\x94", [0x3883] = "\x55\x95", [0x3884] = "\x55\x96",
-+  [0x3885] = "\x55\x97", [0x3886] = "\x55\x98", [0x3887] = "\x55\x99",
-+  [0x3888] = "\x55\x9a", [0x3889] = "\x55\x9b", [0x388a] = "\x55\x9c",
-+  [0x388b] = "\x55\x9d", [0x388c] = "\x55\x9e", [0x388d] = "\x55\x9f",
-+  [0x388e] = "\x55\xa0", [0x388f] = "\x55\xa1", [0x3890] = "\x55\xa2",
-+  [0x3891] = "\x55\xa3", [0x3892] = "\x55\xa4", [0x3893] = "\x55\xa5",
-+  [0x3894] = "\x55\xa6", [0x3895] = "\x55\xa7", [0x3896] = "\x55\xa8",
-+  [0x3897] = "\x55\xa9", [0x3898] = "\xfe\x60", [0x3899] = "\x55\xaa",
-   [0x389a] = "\x55\xab", [0x389b] = "\x55\xac", [0x389c] = "\x55\xad",
-   [0x389d] = "\x55\xae", [0x389e] = "\x55\xaf", [0x389f] = "\x55\xb0",
-   [0x38a0] = "\x55\xb1", [0x38a1] = "\x55\xb2", [0x38a2] = "\x55\xb3",
-@@ -9576,7 +14308,302 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x3c57] = "\x59\x61", [0x3c58] = "\x59\x62", [0x3c59] = "\x59\x63",
-   [0x3c5a] = "\x59\x64", [0x3c5b] = "\x59\x65", [0x3c5c] = "\x59\x66",
-   [0x3c5d] = "\x59\x67", [0x3c5e] = "\x59\x68", [0x3c5f] = "\x59\x69",
--  [0x3c60] = "\xfe\x6a", [0x3fd6] = "\xfe\x6f", [0x3fd7] = "\x5c\xdf",
-+  [0x3c60] = "\xfe\x6a", [0x3c61] = "\x59\x6a", [0x3c62] = "\x59\x6b",
-+  [0x3c63] = "\x59\x6c", [0x3c64] = "\x59\x6d", [0x3c65] = "\x59\x6e",
-+  [0x3c66] = "\x59\x6f", [0x3c67] = "\x59\x70", [0x3c68] = "\x59\x71",
-+  [0x3c69] = "\x59\x72", [0x3c6a] = "\x59\x73", [0x3c6b] = "\x59\x74",
-+  [0x3c6c] = "\x59\x75", [0x3c6d] = "\x59\x76", [0x3c6e] = "\x59\x77",
-+  [0x3c6f] = "\x59\x78", [0x3c70] = "\x59\x79", [0x3c71] = "\x59\x7a",
-+  [0x3c72] = "\x59\x7b", [0x3c73] = "\x59\x7c", [0x3c74] = "\x59\x7d",
-+  [0x3c75] = "\x59\x7e", [0x3c76] = "\x59\x7f", [0x3c77] = "\x59\x80",
-+  [0x3c78] = "\x59\x81", [0x3c79] = "\x59\x82", [0x3c7a] = "\x59\x83",
-+  [0x3c7b] = "\x59\x84", [0x3c7c] = "\x59\x85", [0x3c7d] = "\x59\x86",
-+  [0x3c7e] = "\x59\x87", [0x3c7f] = "\x59\x88", [0x3c80] = "\x59\x89",
-+  [0x3c81] = "\x59\x8a", [0x3c82] = "\x59\x8b", [0x3c83] = "\x59\x8c",
-+  [0x3c84] = "\x59\x8d", [0x3c85] = "\x59\x8e", [0x3c86] = "\x59\x8f",
-+  [0x3c87] = "\x59\x90", [0x3c88] = "\x59\x91", [0x3c89] = "\x59\x92",
-+  [0x3c8a] = "\x59\x93", [0x3c8b] = "\x59\x94", [0x3c8c] = "\x59\x95",
-+  [0x3c8d] = "\x59\x96", [0x3c8e] = "\x59\x97", [0x3c8f] = "\x59\x98",
-+  [0x3c90] = "\x59\x99", [0x3c91] = "\x59\x9a", [0x3c92] = "\x59\x9b",
-+  [0x3c93] = "\x59\x9c", [0x3c94] = "\x59\x9d", [0x3c95] = "\x59\x9e",
-+  [0x3c96] = "\x59\x9f", [0x3c97] = "\x59\xa0", [0x3c98] = "\x59\xa1",
-+  [0x3c99] = "\x59\xa2", [0x3c9a] = "\x59\xa3", [0x3c9b] = "\x59\xa4",
-+  [0x3c9c] = "\x59\xa5", [0x3c9d] = "\x59\xa6", [0x3c9e] = "\x59\xa7",
-+  [0x3c9f] = "\x59\xa8", [0x3ca0] = "\x59\xa9", [0x3ca1] = "\x59\xaa",
-+  [0x3ca2] = "\x59\xab", [0x3ca3] = "\x59\xac", [0x3ca4] = "\x59\xad",
-+  [0x3ca5] = "\x59\xae", [0x3ca6] = "\x59\xaf", [0x3ca7] = "\x59\xb0",
-+  [0x3ca8] = "\x59\xb1", [0x3ca9] = "\x59\xb2", [0x3caa] = "\x59\xb3",
-+  [0x3cab] = "\x59\xb4", [0x3cac] = "\x59\xb5", [0x3cad] = "\x59\xb6",
-+  [0x3cae] = "\x59\xb7", [0x3caf] = "\x59\xb8", [0x3cb0] = "\x59\xb9",
-+  [0x3cb1] = "\x59\xba", [0x3cb2] = "\x59\xbb", [0x3cb3] = "\x59\xbc",
-+  [0x3cb4] = "\x59\xbd", [0x3cb5] = "\x59\xbe", [0x3cb6] = "\x59\xbf",
-+  [0x3cb7] = "\x59\xc0", [0x3cb8] = "\x59\xc1", [0x3cb9] = "\x59\xc2",
-+  [0x3cba] = "\x59\xc3", [0x3cbb] = "\x59\xc4", [0x3cbc] = "\x59\xc5",
-+  [0x3cbd] = "\x59\xc6", [0x3cbe] = "\x59\xc7", [0x3cbf] = "\x59\xc8",
-+  [0x3cc0] = "\x59\xc9", [0x3cc1] = "\x59\xca", [0x3cc2] = "\x59\xcb",
-+  [0x3cc3] = "\x59\xcc", [0x3cc4] = "\x59\xcd", [0x3cc5] = "\x59\xce",
-+  [0x3cc6] = "\x59\xcf", [0x3cc7] = "\x59\xd0", [0x3cc8] = "\x59\xd1",
-+  [0x3cc9] = "\x59\xd2", [0x3cca] = "\x59\xd3", [0x3ccb] = "\x59\xd4",
-+  [0x3ccc] = "\x59\xd5", [0x3ccd] = "\x59\xd6", [0x3cce] = "\x59\xd7",
-+  [0x3ccf] = "\x59\xd8", [0x3cd0] = "\x59\xd9", [0x3cd1] = "\x59\xda",
-+  [0x3cd2] = "\x59\xdb", [0x3cd3] = "\x59\xdc", [0x3cd4] = "\x59\xdd",
-+  [0x3cd5] = "\x59\xde", [0x3cd6] = "\x59\xdf", [0x3cd7] = "\x59\xe0",
-+  [0x3cd8] = "\x59\xe1", [0x3cd9] = "\x59\xe2", [0x3cda] = "\x59\xe3",
-+  [0x3cdb] = "\x59\xe4", [0x3cdc] = "\x59\xe5", [0x3cdd] = "\x59\xe6",
-+  [0x3cde] = "\x59\xe7", [0x3cdf] = "\x59\xe8", [0x3ce0] = "\x59\xe9",
-+  [0x3ce1] = "\x59\xea", [0x3ce2] = "\x59\xeb", [0x3ce3] = "\x59\xec",
-+  [0x3ce4] = "\x59\xed", [0x3ce5] = "\x59\xee", [0x3ce6] = "\x59\xef",
-+  [0x3ce7] = "\x59\xf0", [0x3ce8] = "\x59\xf1", [0x3ce9] = "\x59\xf2",
-+  [0x3cea] = "\x59\xf3", [0x3ceb] = "\x59\xf4", [0x3cec] = "\x59\xf5",
-+  [0x3ced] = "\x59\xf6", [0x3cee] = "\x59\xf7", [0x3cef] = "\x59\xf8",
-+  [0x3cf0] = "\x59\xf9", [0x3cf1] = "\x59\xfa", [0x3cf2] = "\x59\xfb",
-+  [0x3cf3] = "\x59\xfc", [0x3cf4] = "\x59\xfd", [0x3cf5] = "\x59\xfe",
-+  [0x3cf6] = "\x59\xff", [0x3cf7] = "\x5a\x00", [0x3cf8] = "\x5a\x01",
-+  [0x3cf9] = "\x5a\x02", [0x3cfa] = "\x5a\x03", [0x3cfb] = "\x5a\x04",
-+  [0x3cfc] = "\x5a\x05", [0x3cfd] = "\x5a\x06", [0x3cfe] = "\x5a\x07",
-+  [0x3cff] = "\x5a\x08", [0x3d00] = "\x5a\x09", [0x3d01] = "\x5a\x0a",
-+  [0x3d02] = "\x5a\x0b", [0x3d03] = "\x5a\x0c", [0x3d04] = "\x5a\x0d",
-+  [0x3d05] = "\x5a\x0e", [0x3d06] = "\x5a\x0f", [0x3d07] = "\x5a\x10",
-+  [0x3d08] = "\x5a\x11", [0x3d09] = "\x5a\x12", [0x3d0a] = "\x5a\x13",
-+  [0x3d0b] = "\x5a\x14", [0x3d0c] = "\x5a\x15", [0x3d0d] = "\x5a\x16",
-+  [0x3d0e] = "\x5a\x17", [0x3d0f] = "\x5a\x18", [0x3d10] = "\x5a\x19",
-+  [0x3d11] = "\x5a\x1a", [0x3d12] = "\x5a\x1b", [0x3d13] = "\x5a\x1c",
-+  [0x3d14] = "\x5a\x1d", [0x3d15] = "\x5a\x1e", [0x3d16] = "\x5a\x1f",
-+  [0x3d17] = "\x5a\x20", [0x3d18] = "\x5a\x21", [0x3d19] = "\x5a\x22",
-+  [0x3d1a] = "\x5a\x23", [0x3d1b] = "\x5a\x24", [0x3d1c] = "\x5a\x25",
-+  [0x3d1d] = "\x5a\x26", [0x3d1e] = "\x5a\x27", [0x3d1f] = "\x5a\x28",
-+  [0x3d20] = "\x5a\x29", [0x3d21] = "\x5a\x2a", [0x3d22] = "\x5a\x2b",
-+  [0x3d23] = "\x5a\x2c", [0x3d24] = "\x5a\x2d", [0x3d25] = "\x5a\x2e",
-+  [0x3d26] = "\x5a\x2f", [0x3d27] = "\x5a\x30", [0x3d28] = "\x5a\x31",
-+  [0x3d29] = "\x5a\x32", [0x3d2a] = "\x5a\x33", [0x3d2b] = "\x5a\x34",
-+  [0x3d2c] = "\x5a\x35", [0x3d2d] = "\x5a\x36", [0x3d2e] = "\x5a\x37",
-+  [0x3d2f] = "\x5a\x38", [0x3d30] = "\x5a\x39", [0x3d31] = "\x5a\x3a",
-+  [0x3d32] = "\x5a\x3b", [0x3d33] = "\x5a\x3c", [0x3d34] = "\x5a\x3d",
-+  [0x3d35] = "\x5a\x3e", [0x3d36] = "\x5a\x3f", [0x3d37] = "\x5a\x40",
-+  [0x3d38] = "\x5a\x41", [0x3d39] = "\x5a\x42", [0x3d3a] = "\x5a\x43",
-+  [0x3d3b] = "\x5a\x44", [0x3d3c] = "\x5a\x45", [0x3d3d] = "\x5a\x46",
-+  [0x3d3e] = "\x5a\x47", [0x3d3f] = "\x5a\x48", [0x3d40] = "\x5a\x49",
-+  [0x3d41] = "\x5a\x4a", [0x3d42] = "\x5a\x4b", [0x3d43] = "\x5a\x4c",
-+  [0x3d44] = "\x5a\x4d", [0x3d45] = "\x5a\x4e", [0x3d46] = "\x5a\x4f",
-+  [0x3d47] = "\x5a\x50", [0x3d48] = "\x5a\x51", [0x3d49] = "\x5a\x52",
-+  [0x3d4a] = "\x5a\x53", [0x3d4b] = "\x5a\x54", [0x3d4c] = "\x5a\x55",
-+  [0x3d4d] = "\x5a\x56", [0x3d4e] = "\x5a\x57", [0x3d4f] = "\x5a\x58",
-+  [0x3d50] = "\x5a\x59", [0x3d51] = "\x5a\x5a", [0x3d52] = "\x5a\x5b",
-+  [0x3d53] = "\x5a\x5c", [0x3d54] = "\x5a\x5d", [0x3d55] = "\x5a\x5e",
-+  [0x3d56] = "\x5a\x5f", [0x3d57] = "\x5a\x60", [0x3d58] = "\x5a\x61",
-+  [0x3d59] = "\x5a\x62", [0x3d5a] = "\x5a\x63", [0x3d5b] = "\x5a\x64",
-+  [0x3d5c] = "\x5a\x65", [0x3d5d] = "\x5a\x66", [0x3d5e] = "\x5a\x67",
-+  [0x3d5f] = "\x5a\x68", [0x3d60] = "\x5a\x69", [0x3d61] = "\x5a\x6a",
-+  [0x3d62] = "\x5a\x6b", [0x3d63] = "\x5a\x6c", [0x3d64] = "\x5a\x6d",
-+  [0x3d65] = "\x5a\x6e", [0x3d66] = "\x5a\x6f", [0x3d67] = "\x5a\x70",
-+  [0x3d68] = "\x5a\x71", [0x3d69] = "\x5a\x72", [0x3d6a] = "\x5a\x73",
-+  [0x3d6b] = "\x5a\x74", [0x3d6c] = "\x5a\x75", [0x3d6d] = "\x5a\x76",
-+  [0x3d6e] = "\x5a\x77", [0x3d6f] = "\x5a\x78", [0x3d70] = "\x5a\x79",
-+  [0x3d71] = "\x5a\x7a", [0x3d72] = "\x5a\x7b", [0x3d73] = "\x5a\x7c",
-+  [0x3d74] = "\x5a\x7d", [0x3d75] = "\x5a\x7e", [0x3d76] = "\x5a\x7f",
-+  [0x3d77] = "\x5a\x80", [0x3d78] = "\x5a\x81", [0x3d79] = "\x5a\x82",
-+  [0x3d7a] = "\x5a\x83", [0x3d7b] = "\x5a\x84", [0x3d7c] = "\x5a\x85",
-+  [0x3d7d] = "\x5a\x86", [0x3d7e] = "\x5a\x87", [0x3d7f] = "\x5a\x88",
-+  [0x3d80] = "\x5a\x89", [0x3d81] = "\x5a\x8a", [0x3d82] = "\x5a\x8b",
-+  [0x3d83] = "\x5a\x8c", [0x3d84] = "\x5a\x8d", [0x3d85] = "\x5a\x8e",
-+  [0x3d86] = "\x5a\x8f", [0x3d87] = "\x5a\x90", [0x3d88] = "\x5a\x91",
-+  [0x3d89] = "\x5a\x92", [0x3d8a] = "\x5a\x93", [0x3d8b] = "\x5a\x94",
-+  [0x3d8c] = "\x5a\x95", [0x3d8d] = "\x5a\x96", [0x3d8e] = "\x5a\x97",
-+  [0x3d8f] = "\x5a\x98", [0x3d90] = "\x5a\x99", [0x3d91] = "\x5a\x9a",
-+  [0x3d92] = "\x5a\x9b", [0x3d93] = "\x5a\x9c", [0x3d94] = "\x5a\x9d",
-+  [0x3d95] = "\x5a\x9e", [0x3d96] = "\x5a\x9f", [0x3d97] = "\x5a\xa0",
-+  [0x3d98] = "\x5a\xa1", [0x3d99] = "\x5a\xa2", [0x3d9a] = "\x5a\xa3",
-+  [0x3d9b] = "\x5a\xa4", [0x3d9c] = "\x5a\xa5", [0x3d9d] = "\x5a\xa6",
-+  [0x3d9e] = "\x5a\xa7", [0x3d9f] = "\x5a\xa8", [0x3da0] = "\x5a\xa9",
-+  [0x3da1] = "\x5a\xaa", [0x3da2] = "\x5a\xab", [0x3da3] = "\x5a\xac",
-+  [0x3da4] = "\x5a\xad", [0x3da5] = "\x5a\xae", [0x3da6] = "\x5a\xaf",
-+  [0x3da7] = "\x5a\xb0", [0x3da8] = "\x5a\xb1", [0x3da9] = "\x5a\xb2",
-+  [0x3daa] = "\x5a\xb3", [0x3dab] = "\x5a\xb4", [0x3dac] = "\x5a\xb5",
-+  [0x3dad] = "\x5a\xb6", [0x3dae] = "\x5a\xb7", [0x3daf] = "\x5a\xb8",
-+  [0x3db0] = "\x5a\xb9", [0x3db1] = "\x5a\xba", [0x3db2] = "\x5a\xbb",
-+  [0x3db3] = "\x5a\xbc", [0x3db4] = "\x5a\xbd", [0x3db5] = "\x5a\xbe",
-+  [0x3db6] = "\x5a\xbf", [0x3db7] = "\x5a\xc0", [0x3db8] = "\x5a\xc1",
-+  [0x3db9] = "\x5a\xc2", [0x3dba] = "\x5a\xc3", [0x3dbb] = "\x5a\xc4",
-+  [0x3dbc] = "\x5a\xc5", [0x3dbd] = "\x5a\xc6", [0x3dbe] = "\x5a\xc7",
-+  [0x3dbf] = "\x5a\xc8", [0x3dc0] = "\x5a\xc9", [0x3dc1] = "\x5a\xca",
-+  [0x3dc2] = "\x5a\xcb", [0x3dc3] = "\x5a\xcc", [0x3dc4] = "\x5a\xcd",
-+  [0x3dc5] = "\x5a\xce", [0x3dc6] = "\x5a\xcf", [0x3dc7] = "\x5a\xd0",
-+  [0x3dc8] = "\x5a\xd1", [0x3dc9] = "\x5a\xd2", [0x3dca] = "\x5a\xd3",
-+  [0x3dcb] = "\x5a\xd4", [0x3dcc] = "\x5a\xd5", [0x3dcd] = "\x5a\xd6",
-+  [0x3dce] = "\x5a\xd7", [0x3dcf] = "\x5a\xd8", [0x3dd0] = "\x5a\xd9",
-+  [0x3dd1] = "\x5a\xda", [0x3dd2] = "\x5a\xdb", [0x3dd3] = "\x5a\xdc",
-+  [0x3dd4] = "\x5a\xdd", [0x3dd5] = "\x5a\xde", [0x3dd6] = "\x5a\xdf",
-+  [0x3dd7] = "\x5a\xe0", [0x3dd8] = "\x5a\xe1", [0x3dd9] = "\x5a\xe2",
-+  [0x3dda] = "\x5a\xe3", [0x3ddb] = "\x5a\xe4", [0x3ddc] = "\x5a\xe5",
-+  [0x3ddd] = "\x5a\xe6", [0x3dde] = "\x5a\xe7", [0x3ddf] = "\x5a\xe8",
-+  [0x3de0] = "\x5a\xe9", [0x3de1] = "\x5a\xea", [0x3de2] = "\x5a\xeb",
-+  [0x3de3] = "\x5a\xec", [0x3de4] = "\x5a\xed", [0x3de5] = "\x5a\xee",
-+  [0x3de6] = "\x5a\xef", [0x3de7] = "\x5a\xf0", [0x3de8] = "\x5a\xf1",
-+  [0x3de9] = "\x5a\xf2", [0x3dea] = "\x5a\xf3", [0x3deb] = "\x5a\xf4",
-+  [0x3dec] = "\x5a\xf5", [0x3ded] = "\x5a\xf6", [0x3dee] = "\x5a\xf7",
-+  [0x3def] = "\x5a\xf8", [0x3df0] = "\x5a\xf9", [0x3df1] = "\x5a\xfa",
-+  [0x3df2] = "\x5a\xfb", [0x3df3] = "\x5a\xfc", [0x3df4] = "\x5a\xfd",
-+  [0x3df5] = "\x5a\xfe", [0x3df6] = "\x5a\xff", [0x3df7] = "\x5b\x00",
-+  [0x3df8] = "\x5b\x01", [0x3df9] = "\x5b\x02", [0x3dfa] = "\x5b\x03",
-+  [0x3dfb] = "\x5b\x04", [0x3dfc] = "\x5b\x05", [0x3dfd] = "\x5b\x06",
-+  [0x3dfe] = "\x5b\x07", [0x3dff] = "\x5b\x08", [0x3e00] = "\x5b\x09",
-+  [0x3e01] = "\x5b\x0a", [0x3e02] = "\x5b\x0b", [0x3e03] = "\x5b\x0c",
-+  [0x3e04] = "\x5b\x0d", [0x3e05] = "\x5b\x0e", [0x3e06] = "\x5b\x0f",
-+  [0x3e07] = "\x5b\x10", [0x3e08] = "\x5b\x11", [0x3e09] = "\x5b\x12",
-+  [0x3e0a] = "\x5b\x13", [0x3e0b] = "\x5b\x14", [0x3e0c] = "\x5b\x15",
-+  [0x3e0d] = "\x5b\x16", [0x3e0e] = "\x5b\x17", [0x3e0f] = "\x5b\x18",
-+  [0x3e10] = "\x5b\x19", [0x3e11] = "\x5b\x1a", [0x3e12] = "\x5b\x1b",
-+  [0x3e13] = "\x5b\x1c", [0x3e14] = "\x5b\x1d", [0x3e15] = "\x5b\x1e",
-+  [0x3e16] = "\x5b\x1f", [0x3e17] = "\x5b\x20", [0x3e18] = "\x5b\x21",
-+  [0x3e19] = "\x5b\x22", [0x3e1a] = "\x5b\x23", [0x3e1b] = "\x5b\x24",
-+  [0x3e1c] = "\x5b\x25", [0x3e1d] = "\x5b\x26", [0x3e1e] = "\x5b\x27",
-+  [0x3e1f] = "\x5b\x28", [0x3e20] = "\x5b\x29", [0x3e21] = "\x5b\x2a",
-+  [0x3e22] = "\x5b\x2b", [0x3e23] = "\x5b\x2c", [0x3e24] = "\x5b\x2d",
-+  [0x3e25] = "\x5b\x2e", [0x3e26] = "\x5b\x2f", [0x3e27] = "\x5b\x30",
-+  [0x3e28] = "\x5b\x31", [0x3e29] = "\x5b\x32", [0x3e2a] = "\x5b\x33",
-+  [0x3e2b] = "\x5b\x34", [0x3e2c] = "\x5b\x35", [0x3e2d] = "\x5b\x36",
-+  [0x3e2e] = "\x5b\x37", [0x3e2f] = "\x5b\x38", [0x3e30] = "\x5b\x39",
-+  [0x3e31] = "\x5b\x3a", [0x3e32] = "\x5b\x3b", [0x3e33] = "\x5b\x3c",
-+  [0x3e34] = "\x5b\x3d", [0x3e35] = "\x5b\x3e", [0x3e36] = "\x5b\x3f",
-+  [0x3e37] = "\x5b\x40", [0x3e38] = "\x5b\x41", [0x3e39] = "\x5b\x42",
-+  [0x3e3a] = "\x5b\x43", [0x3e3b] = "\x5b\x44", [0x3e3c] = "\x5b\x45",
-+  [0x3e3d] = "\x5b\x46", [0x3e3e] = "\x5b\x47", [0x3e3f] = "\x5b\x48",
-+  [0x3e40] = "\x5b\x49", [0x3e41] = "\x5b\x4a", [0x3e42] = "\x5b\x4b",
-+  [0x3e43] = "\x5b\x4c", [0x3e44] = "\x5b\x4d", [0x3e45] = "\x5b\x4e",
-+  [0x3e46] = "\x5b\x4f", [0x3e47] = "\x5b\x50", [0x3e48] = "\x5b\x51",
-+  [0x3e49] = "\x5b\x52", [0x3e4a] = "\x5b\x53", [0x3e4b] = "\x5b\x54",
-+  [0x3e4c] = "\x5b\x55", [0x3e4d] = "\x5b\x56", [0x3e4e] = "\x5b\x57",
-+  [0x3e4f] = "\x5b\x58", [0x3e50] = "\x5b\x59", [0x3e51] = "\x5b\x5a",
-+  [0x3e52] = "\x5b\x5b", [0x3e53] = "\x5b\x5c", [0x3e54] = "\x5b\x5d",
-+  [0x3e55] = "\x5b\x5e", [0x3e56] = "\x5b\x5f", [0x3e57] = "\x5b\x60",
-+  [0x3e58] = "\x5b\x61", [0x3e59] = "\x5b\x62", [0x3e5a] = "\x5b\x63",
-+  [0x3e5b] = "\x5b\x64", [0x3e5c] = "\x5b\x65", [0x3e5d] = "\x5b\x66",
-+  [0x3e5e] = "\x5b\x67", [0x3e5f] = "\x5b\x68", [0x3e60] = "\x5b\x69",
-+  [0x3e61] = "\x5b\x6a", [0x3e62] = "\x5b\x6b", [0x3e63] = "\x5b\x6c",
-+  [0x3e64] = "\x5b\x6d", [0x3e65] = "\x5b\x6e", [0x3e66] = "\x5b\x6f",
-+  [0x3e67] = "\x5b\x70", [0x3e68] = "\x5b\x71", [0x3e69] = "\x5b\x72",
-+  [0x3e6a] = "\x5b\x73", [0x3e6b] = "\x5b\x74", [0x3e6c] = "\x5b\x75",
-+  [0x3e6d] = "\x5b\x76", [0x3e6e] = "\x5b\x77", [0x3e6f] = "\x5b\x78",
-+  [0x3e70] = "\x5b\x79", [0x3e71] = "\x5b\x7a", [0x3e72] = "\x5b\x7b",
-+  [0x3e73] = "\x5b\x7c", [0x3e74] = "\x5b\x7d", [0x3e75] = "\x5b\x7e",
-+  [0x3e76] = "\x5b\x7f", [0x3e77] = "\x5b\x80", [0x3e78] = "\x5b\x81",
-+  [0x3e79] = "\x5b\x82", [0x3e7a] = "\x5b\x83", [0x3e7b] = "\x5b\x84",
-+  [0x3e7c] = "\x5b\x85", [0x3e7d] = "\x5b\x86", [0x3e7e] = "\x5b\x87",
-+  [0x3e7f] = "\x5b\x88", [0x3e80] = "\x5b\x89", [0x3e81] = "\x5b\x8a",
-+  [0x3e82] = "\x5b\x8b", [0x3e83] = "\x5b\x8c", [0x3e84] = "\x5b\x8d",
-+  [0x3e85] = "\x5b\x8e", [0x3e86] = "\x5b\x8f", [0x3e87] = "\x5b\x90",
-+  [0x3e88] = "\x5b\x91", [0x3e89] = "\x5b\x92", [0x3e8a] = "\x5b\x93",
-+  [0x3e8b] = "\x5b\x94", [0x3e8c] = "\x5b\x95", [0x3e8d] = "\x5b\x96",
-+  [0x3e8e] = "\x5b\x97", [0x3e8f] = "\x5b\x98", [0x3e90] = "\x5b\x99",
-+  [0x3e91] = "\x5b\x9a", [0x3e92] = "\x5b\x9b", [0x3e93] = "\x5b\x9c",
-+  [0x3e94] = "\x5b\x9d", [0x3e95] = "\x5b\x9e", [0x3e96] = "\x5b\x9f",
-+  [0x3e97] = "\x5b\xa0", [0x3e98] = "\x5b\xa1", [0x3e99] = "\x5b\xa2",
-+  [0x3e9a] = "\x5b\xa3", [0x3e9b] = "\x5b\xa4", [0x3e9c] = "\x5b\xa5",
-+  [0x3e9d] = "\x5b\xa6", [0x3e9e] = "\x5b\xa7", [0x3e9f] = "\x5b\xa8",
-+  [0x3ea0] = "\x5b\xa9", [0x3ea1] = "\x5b\xaa", [0x3ea2] = "\x5b\xab",
-+  [0x3ea3] = "\x5b\xac", [0x3ea4] = "\x5b\xad", [0x3ea5] = "\x5b\xae",
-+  [0x3ea6] = "\x5b\xaf", [0x3ea7] = "\x5b\xb0", [0x3ea8] = "\x5b\xb1",
-+  [0x3ea9] = "\x5b\xb2", [0x3eaa] = "\x5b\xb3", [0x3eab] = "\x5b\xb4",
-+  [0x3eac] = "\x5b\xb5", [0x3ead] = "\x5b\xb6", [0x3eae] = "\x5b\xb7",
-+  [0x3eaf] = "\x5b\xb8", [0x3eb0] = "\x5b\xb9", [0x3eb1] = "\x5b\xba",
-+  [0x3eb2] = "\x5b\xbb", [0x3eb3] = "\x5b\xbc", [0x3eb4] = "\x5b\xbd",
-+  [0x3eb5] = "\x5b\xbe", [0x3eb6] = "\x5b\xbf", [0x3eb7] = "\x5b\xc0",
-+  [0x3eb8] = "\x5b\xc1", [0x3eb9] = "\x5b\xc2", [0x3eba] = "\x5b\xc3",
-+  [0x3ebb] = "\x5b\xc4", [0x3ebc] = "\x5b\xc5", [0x3ebd] = "\x5b\xc6",
-+  [0x3ebe] = "\x5b\xc7", [0x3ebf] = "\x5b\xc8", [0x3ec0] = "\x5b\xc9",
-+  [0x3ec1] = "\x5b\xca", [0x3ec2] = "\x5b\xcb", [0x3ec3] = "\x5b\xcc",
-+  [0x3ec4] = "\x5b\xcd", [0x3ec5] = "\x5b\xce", [0x3ec6] = "\x5b\xcf",
-+  [0x3ec7] = "\x5b\xd0", [0x3ec8] = "\x5b\xd1", [0x3ec9] = "\x5b\xd2",
-+  [0x3eca] = "\x5b\xd3", [0x3ecb] = "\x5b\xd4", [0x3ecc] = "\x5b\xd5",
-+  [0x3ecd] = "\x5b\xd6", [0x3ece] = "\x5b\xd7", [0x3ecf] = "\x5b\xd8",
-+  [0x3ed0] = "\x5b\xd9", [0x3ed1] = "\x5b\xda", [0x3ed2] = "\x5b\xdb",
-+  [0x3ed3] = "\x5b\xdc", [0x3ed4] = "\x5b\xdd", [0x3ed5] = "\x5b\xde",
-+  [0x3ed6] = "\x5b\xdf", [0x3ed7] = "\x5b\xe0", [0x3ed8] = "\x5b\xe1",
-+  [0x3ed9] = "\x5b\xe2", [0x3eda] = "\x5b\xe3", [0x3edb] = "\x5b\xe4",
-+  [0x3edc] = "\x5b\xe5", [0x3edd] = "\x5b\xe6", [0x3ede] = "\x5b\xe7",
-+  [0x3edf] = "\x5b\xe8", [0x3ee0] = "\x5b\xe9", [0x3ee1] = "\x5b\xea",
-+  [0x3ee2] = "\x5b\xeb", [0x3ee3] = "\x5b\xec", [0x3ee4] = "\x5b\xed",
-+  [0x3ee5] = "\x5b\xee", [0x3ee6] = "\x5b\xef", [0x3ee7] = "\x5b\xf0",
-+  [0x3ee8] = "\x5b\xf1", [0x3ee9] = "\x5b\xf2", [0x3eea] = "\x5b\xf3",
-+  [0x3eeb] = "\x5b\xf4", [0x3eec] = "\x5b\xf5", [0x3eed] = "\x5b\xf6",
-+  [0x3eee] = "\x5b\xf7", [0x3eef] = "\x5b\xf8", [0x3ef0] = "\x5b\xf9",
-+  [0x3ef1] = "\x5b\xfa", [0x3ef2] = "\x5b\xfb", [0x3ef3] = "\x5b\xfc",
-+  [0x3ef4] = "\x5b\xfd", [0x3ef5] = "\x5b\xfe", [0x3ef6] = "\x5b\xff",
-+  [0x3ef7] = "\x5c\x00", [0x3ef8] = "\x5c\x01", [0x3ef9] = "\x5c\x02",
-+  [0x3efa] = "\x5c\x03", [0x3efb] = "\x5c\x04", [0x3efc] = "\x5c\x05",
-+  [0x3efd] = "\x5c\x06", [0x3efe] = "\x5c\x07", [0x3eff] = "\x5c\x08",
-+  [0x3f00] = "\x5c\x09", [0x3f01] = "\x5c\x0a", [0x3f02] = "\x5c\x0b",
-+  [0x3f03] = "\x5c\x0c", [0x3f04] = "\x5c\x0d", [0x3f05] = "\x5c\x0e",
-+  [0x3f06] = "\x5c\x0f", [0x3f07] = "\x5c\x10", [0x3f08] = "\x5c\x11",
-+  [0x3f09] = "\x5c\x12", [0x3f0a] = "\x5c\x13", [0x3f0b] = "\x5c\x14",
-+  [0x3f0c] = "\x5c\x15", [0x3f0d] = "\x5c\x16", [0x3f0e] = "\x5c\x17",
-+  [0x3f0f] = "\x5c\x18", [0x3f10] = "\x5c\x19", [0x3f11] = "\x5c\x1a",
-+  [0x3f12] = "\x5c\x1b", [0x3f13] = "\x5c\x1c", [0x3f14] = "\x5c\x1d",
-+  [0x3f15] = "\x5c\x1e", [0x3f16] = "\x5c\x1f", [0x3f17] = "\x5c\x20",
-+  [0x3f18] = "\x5c\x21", [0x3f19] = "\x5c\x22", [0x3f1a] = "\x5c\x23",
-+  [0x3f1b] = "\x5c\x24", [0x3f1c] = "\x5c\x25", [0x3f1d] = "\x5c\x26",
-+  [0x3f1e] = "\x5c\x27", [0x3f1f] = "\x5c\x28", [0x3f20] = "\x5c\x29",
-+  [0x3f21] = "\x5c\x2a", [0x3f22] = "\x5c\x2b", [0x3f23] = "\x5c\x2c",
-+  [0x3f24] = "\x5c\x2d", [0x3f25] = "\x5c\x2e", [0x3f26] = "\x5c\x2f",
-+  [0x3f27] = "\x5c\x30", [0x3f28] = "\x5c\x31", [0x3f29] = "\x5c\x32",
-+  [0x3f2a] = "\x5c\x33", [0x3f2b] = "\x5c\x34", [0x3f2c] = "\x5c\x35",
-+  [0x3f2d] = "\x5c\x36", [0x3f2e] = "\x5c\x37", [0x3f2f] = "\x5c\x38",
-+  [0x3f30] = "\x5c\x39", [0x3f31] = "\x5c\x3a", [0x3f32] = "\x5c\x3b",
-+  [0x3f33] = "\x5c\x3c", [0x3f34] = "\x5c\x3d", [0x3f35] = "\x5c\x3e",
-+  [0x3f36] = "\x5c\x3f", [0x3f37] = "\x5c\x40", [0x3f38] = "\x5c\x41",
-+  [0x3f39] = "\x5c\x42", [0x3f3a] = "\x5c\x43", [0x3f3b] = "\x5c\x44",
-+  [0x3f3c] = "\x5c\x45", [0x3f3d] = "\x5c\x46", [0x3f3e] = "\x5c\x47",
-+  [0x3f3f] = "\x5c\x48", [0x3f40] = "\x5c\x49", [0x3f41] = "\x5c\x4a",
-+  [0x3f42] = "\x5c\x4b", [0x3f43] = "\x5c\x4c", [0x3f44] = "\x5c\x4d",
-+  [0x3f45] = "\x5c\x4e", [0x3f46] = "\x5c\x4f", [0x3f47] = "\x5c\x50",
-+  [0x3f48] = "\x5c\x51", [0x3f49] = "\x5c\x52", [0x3f4a] = "\x5c\x53",
-+  [0x3f4b] = "\x5c\x54", [0x3f4c] = "\x5c\x55", [0x3f4d] = "\x5c\x56",
-+  [0x3f4e] = "\x5c\x57", [0x3f4f] = "\x5c\x58", [0x3f50] = "\x5c\x59",
-+  [0x3f51] = "\x5c\x5a", [0x3f52] = "\x5c\x5b", [0x3f53] = "\x5c\x5c",
-+  [0x3f54] = "\x5c\x5d", [0x3f55] = "\x5c\x5e", [0x3f56] = "\x5c\x5f",
-+  [0x3f57] = "\x5c\x60", [0x3f58] = "\x5c\x61", [0x3f59] = "\x5c\x62",
-+  [0x3f5a] = "\x5c\x63", [0x3f5b] = "\x5c\x64", [0x3f5c] = "\x5c\x65",
-+  [0x3f5d] = "\x5c\x66", [0x3f5e] = "\x5c\x67", [0x3f5f] = "\x5c\x68",
-+  [0x3f60] = "\x5c\x69", [0x3f61] = "\x5c\x6a", [0x3f62] = "\x5c\x6b",
-+  [0x3f63] = "\x5c\x6c", [0x3f64] = "\x5c\x6d", [0x3f65] = "\x5c\x6e",
-+  [0x3f66] = "\x5c\x6f", [0x3f67] = "\x5c\x70", [0x3f68] = "\x5c\x71",
-+  [0x3f69] = "\x5c\x72", [0x3f6a] = "\x5c\x73", [0x3f6b] = "\x5c\x74",
-+  [0x3f6c] = "\x5c\x75", [0x3f6d] = "\x5c\x76", [0x3f6e] = "\x5c\x77",
-+  [0x3f6f] = "\x5c\x78", [0x3f70] = "\x5c\x79", [0x3f71] = "\x5c\x7a",
-+  [0x3f72] = "\x5c\x7b", [0x3f73] = "\x5c\x7c", [0x3f74] = "\x5c\x7d",
-+  [0x3f75] = "\x5c\x7e", [0x3f76] = "\x5c\x7f", [0x3f77] = "\x5c\x80",
-+  [0x3f78] = "\x5c\x81", [0x3f79] = "\x5c\x82", [0x3f7a] = "\x5c\x83",
-+  [0x3f7b] = "\x5c\x84", [0x3f7c] = "\x5c\x85", [0x3f7d] = "\x5c\x86",
-+  [0x3f7e] = "\x5c\x87", [0x3f7f] = "\x5c\x88", [0x3f80] = "\x5c\x89",
-+  [0x3f81] = "\x5c\x8a", [0x3f82] = "\x5c\x8b", [0x3f83] = "\x5c\x8c",
-+  [0x3f84] = "\x5c\x8d", [0x3f85] = "\x5c\x8e", [0x3f86] = "\x5c\x8f",
-+  [0x3f87] = "\x5c\x90", [0x3f88] = "\x5c\x91", [0x3f89] = "\x5c\x92",
-+  [0x3f8a] = "\x5c\x93", [0x3f8b] = "\x5c\x94", [0x3f8c] = "\x5c\x95",
-+  [0x3f8d] = "\x5c\x96", [0x3f8e] = "\x5c\x97", [0x3f8f] = "\x5c\x98",
-+  [0x3f90] = "\x5c\x99", [0x3f91] = "\x5c\x9a", [0x3f92] = "\x5c\x9b",
-+  [0x3f93] = "\x5c\x9c", [0x3f94] = "\x5c\x9d", [0x3f95] = "\x5c\x9e",
-+  [0x3f96] = "\x5c\x9f", [0x3f97] = "\x5c\xa0", [0x3f98] = "\x5c\xa1",
-+  [0x3f99] = "\x5c\xa2", [0x3f9a] = "\x5c\xa3", [0x3f9b] = "\x5c\xa4",
-+  [0x3f9c] = "\x5c\xa5", [0x3f9d] = "\x5c\xa6", [0x3f9e] = "\x5c\xa7",
-+  [0x3f9f] = "\x5c\xa8", [0x3fa0] = "\x5c\xa9", [0x3fa1] = "\x5c\xaa",
-+  [0x3fa2] = "\x5c\xab", [0x3fa3] = "\x5c\xac", [0x3fa4] = "\x5c\xad",
-+  [0x3fa5] = "\x5c\xae", [0x3fa6] = "\x5c\xaf", [0x3fa7] = "\x5c\xb0",
-+  [0x3fa8] = "\x5c\xb1", [0x3fa9] = "\x5c\xb2", [0x3faa] = "\x5c\xb3",
-+  [0x3fab] = "\x5c\xb4", [0x3fac] = "\x5c\xb5", [0x3fad] = "\x5c\xb6",
-+  [0x3fae] = "\x5c\xb7", [0x3faf] = "\x5c\xb8", [0x3fb0] = "\x5c\xb9",
-+  [0x3fb1] = "\x5c\xba", [0x3fb2] = "\x5c\xbb", [0x3fb3] = "\x5c\xbc",
-+  [0x3fb4] = "\x5c\xbd", [0x3fb5] = "\x5c\xbe", [0x3fb6] = "\x5c\xbf",
-+  [0x3fb7] = "\x5c\xc0", [0x3fb8] = "\x5c\xc1", [0x3fb9] = "\x5c\xc2",
-+  [0x3fba] = "\x5c\xc3", [0x3fbb] = "\x5c\xc4", [0x3fbc] = "\x5c\xc5",
-+  [0x3fbd] = "\x5c\xc6", [0x3fbe] = "\x5c\xc7", [0x3fbf] = "\x5c\xc8",
-+  [0x3fc0] = "\x5c\xc9", [0x3fc1] = "\x5c\xca", [0x3fc2] = "\x5c\xcb",
-+  [0x3fc3] = "\x5c\xcc", [0x3fc4] = "\x5c\xcd", [0x3fc5] = "\x5c\xce",
-+  [0x3fc6] = "\x5c\xcf", [0x3fc7] = "\x5c\xd0", [0x3fc8] = "\x5c\xd1",
-+  [0x3fc9] = "\x5c\xd2", [0x3fca] = "\x5c\xd3", [0x3fcb] = "\x5c\xd4",
-+  [0x3fcc] = "\x5c\xd5", [0x3fcd] = "\x5c\xd6", [0x3fce] = "\x5c\xd7",
-+  [0x3fcf] = "\x5c\xd8", [0x3fd0] = "\x5c\xd9", [0x3fd1] = "\x5c\xda",
-+  [0x3fd2] = "\x5c\xdb", [0x3fd3] = "\x5c\xdc", [0x3fd4] = "\x5c\xdd",
-+  [0x3fd5] = "\x5c\xde", [0x3fd6] = "\xfe\x6f", [0x3fd7] = "\x5c\xdf",
-   [0x3fd8] = "\x5c\xe0", [0x3fd9] = "\x5c\xe1", [0x3fda] = "\x5c\xe2",
-   [0x3fdb] = "\x5c\xe3", [0x3fdc] = "\x5c\xe4", [0x3fdd] = "\x5c\xe5",
-   [0x3fde] = "\x5c\xe6", [0x3fdf] = "\x5c\xe7", [0x3fe0] = "\x5c\xe8",
-@@ -9665,6 +14692,163 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x40d7] = "\x5d\xdf", [0x40d8] = "\x5d\xe0", [0x40d9] = "\x5d\xe1",
-   [0x40da] = "\x5d\xe2", [0x40db] = "\x5d\xe3", [0x40dc] = "\x5d\xe4",
-   [0x40dd] = "\x5d\xe5", [0x40de] = "\x5d\xe6", [0x40df] = "\xfe\x70",
-+  [0x40e0] = "\x5d\xe7", [0x40e1] = "\x5d\xe8", [0x40e2] = "\x5d\xe9",
-+  [0x40e3] = "\x5d\xea", [0x40e4] = "\x5d\xeb", [0x40e5] = "\x5d\xec",
-+  [0x40e6] = "\x5d\xed", [0x40e7] = "\x5d\xee", [0x40e8] = "\x5d\xef",
-+  [0x40e9] = "\x5d\xf0", [0x40ea] = "\x5d\xf1", [0x40eb] = "\x5d\xf2",
-+  [0x40ec] = "\x5d\xf3", [0x40ed] = "\x5d\xf4", [0x40ee] = "\x5d\xf5",
-+  [0x40ef] = "\x5d\xf6", [0x40f0] = "\x5d\xf7", [0x40f1] = "\x5d\xf8",
-+  [0x40f2] = "\x5d\xf9", [0x40f3] = "\x5d\xfa", [0x40f4] = "\x5d\xfb",
-+  [0x40f5] = "\x5d\xfc", [0x40f6] = "\x5d\xfd", [0x40f7] = "\x5d\xfe",
-+  [0x40f8] = "\x5d\xff", [0x40f9] = "\x5e\x00", [0x40fa] = "\x5e\x01",
-+  [0x40fb] = "\x5e\x02", [0x40fc] = "\x5e\x03", [0x40fd] = "\x5e\x04",
-+  [0x40fe] = "\x5e\x05", [0x40ff] = "\x5e\x06", [0x4100] = "\x5e\x07",
-+  [0x4101] = "\x5e\x08", [0x4102] = "\x5e\x09", [0x4103] = "\x5e\x0a",
-+  [0x4104] = "\x5e\x0b", [0x4105] = "\x5e\x0c", [0x4106] = "\x5e\x0d",
-+  [0x4107] = "\x5e\x0e", [0x4108] = "\x5e\x0f", [0x4109] = "\x5e\x10",
-+  [0x410a] = "\x5e\x11", [0x410b] = "\x5e\x12", [0x410c] = "\x5e\x13",
-+  [0x410d] = "\x5e\x14", [0x410e] = "\x5e\x15", [0x410f] = "\x5e\x16",
-+  [0x4110] = "\x5e\x17", [0x4111] = "\x5e\x18", [0x4112] = "\x5e\x19",
-+  [0x4113] = "\x5e\x1a", [0x4114] = "\x5e\x1b", [0x4115] = "\x5e\x1c",
-+  [0x4116] = "\x5e\x1d", [0x4117] = "\x5e\x1e", [0x4118] = "\x5e\x1f",
-+  [0x4119] = "\x5e\x20", [0x411a] = "\x5e\x21", [0x411b] = "\x5e\x22",
-+  [0x411c] = "\x5e\x23", [0x411d] = "\x5e\x24", [0x411e] = "\x5e\x25",
-+  [0x411f] = "\x5e\x26", [0x4120] = "\x5e\x27", [0x4121] = "\x5e\x28",
-+  [0x4122] = "\x5e\x29", [0x4123] = "\x5e\x2a", [0x4124] = "\x5e\x2b",
-+  [0x4125] = "\x5e\x2c", [0x4126] = "\x5e\x2d", [0x4127] = "\x5e\x2e",
-+  [0x4128] = "\x5e\x2f", [0x4129] = "\x5e\x30", [0x412a] = "\x5e\x31",
-+  [0x412b] = "\x5e\x32", [0x412c] = "\x5e\x33", [0x412d] = "\x5e\x34",
-+  [0x412e] = "\x5e\x35", [0x412f] = "\x5e\x36", [0x4130] = "\x5e\x37",
-+  [0x4131] = "\x5e\x38", [0x4132] = "\x5e\x39", [0x4133] = "\x5e\x3a",
-+  [0x4134] = "\x5e\x3b", [0x4135] = "\x5e\x3c", [0x4136] = "\x5e\x3d",
-+  [0x4137] = "\x5e\x3e", [0x4138] = "\x5e\x3f", [0x4139] = "\x5e\x40",
-+  [0x413a] = "\x5e\x41", [0x413b] = "\x5e\x42", [0x413c] = "\x5e\x43",
-+  [0x413d] = "\x5e\x44", [0x413e] = "\x5e\x45", [0x413f] = "\x5e\x46",
-+  [0x4140] = "\x5e\x47", [0x4141] = "\x5e\x48", [0x4142] = "\x5e\x49",
-+  [0x4143] = "\x5e\x4a", [0x4144] = "\x5e\x4b", [0x4145] = "\x5e\x4c",
-+  [0x4146] = "\x5e\x4d", [0x4147] = "\x5e\x4e", [0x4148] = "\x5e\x4f",
-+  [0x4149] = "\x5e\x50", [0x414a] = "\x5e\x51", [0x414b] = "\x5e\x52",
-+  [0x414c] = "\x5e\x53", [0x414d] = "\x5e\x54", [0x414e] = "\x5e\x55",
-+  [0x414f] = "\x5e\x56", [0x4150] = "\x5e\x57", [0x4151] = "\x5e\x58",
-+  [0x4152] = "\x5e\x59", [0x4153] = "\x5e\x5a", [0x4154] = "\x5e\x5b",
-+  [0x4155] = "\x5e\x5c", [0x4156] = "\x5e\x5d", [0x4157] = "\x5e\x5e",
-+  [0x4158] = "\x5e\x5f", [0x4159] = "\x5e\x60", [0x415a] = "\x5e\x61",
-+  [0x415b] = "\x5e\x62", [0x415c] = "\x5e\x63", [0x415d] = "\x5e\x64",
-+  [0x415e] = "\x5e\x65", [0x415f] = "\x5e\x66", [0x4160] = "\x5e\x67",
-+  [0x4161] = "\x5e\x68", [0x4162] = "\x5e\x69", [0x4163] = "\x5e\x6a",
-+  [0x4164] = "\x5e\x6b", [0x4165] = "\x5e\x6c", [0x4166] = "\x5e\x6d",
-+  [0x4167] = "\x5e\x6e", [0x4168] = "\x5e\x6f", [0x4169] = "\x5e\x70",
-+  [0x416a] = "\x5e\x71", [0x416b] = "\x5e\x72", [0x416c] = "\x5e\x73",
-+  [0x416d] = "\x5e\x74", [0x416e] = "\x5e\x75", [0x416f] = "\x5e\x76",
-+  [0x4170] = "\x5e\x77", [0x4171] = "\x5e\x78", [0x4172] = "\x5e\x79",
-+  [0x4173] = "\x5e\x7a", [0x4174] = "\x5e\x7b", [0x4175] = "\x5e\x7c",
-+  [0x4176] = "\x5e\x7d", [0x4177] = "\x5e\x7e", [0x4178] = "\x5e\x7f",
-+  [0x4179] = "\x5e\x80", [0x417a] = "\x5e\x81", [0x417b] = "\x5e\x82",
-+  [0x417c] = "\x5e\x83", [0x417d] = "\x5e\x84", [0x417e] = "\x5e\x85",
-+  [0x417f] = "\x5e\x86", [0x4180] = "\x5e\x87", [0x4181] = "\x5e\x88",
-+  [0x4182] = "\x5e\x89", [0x4183] = "\x5e\x8a", [0x4184] = "\x5e\x8b",
-+  [0x4185] = "\x5e\x8c", [0x4186] = "\x5e\x8d", [0x4187] = "\x5e\x8e",
-+  [0x4188] = "\x5e\x8f", [0x4189] = "\x5e\x90", [0x418a] = "\x5e\x91",
-+  [0x418b] = "\x5e\x92", [0x418c] = "\x5e\x93", [0x418d] = "\x5e\x94",
-+  [0x418e] = "\x5e\x95", [0x418f] = "\x5e\x96", [0x4190] = "\x5e\x97",
-+  [0x4191] = "\x5e\x98", [0x4192] = "\x5e\x99", [0x4193] = "\x5e\x9a",
-+  [0x4194] = "\x5e\x9b", [0x4195] = "\x5e\x9c", [0x4196] = "\x5e\x9d",
-+  [0x4197] = "\x5e\x9e", [0x4198] = "\x5e\x9f", [0x4199] = "\x5e\xa0",
-+  [0x419a] = "\x5e\xa1", [0x419b] = "\x5e\xa2", [0x419c] = "\x5e\xa3",
-+  [0x419d] = "\x5e\xa4", [0x419e] = "\x5e\xa5", [0x419f] = "\x5e\xa6",
-+  [0x41a0] = "\x5e\xa7", [0x41a1] = "\x5e\xa8", [0x41a2] = "\x5e\xa9",
-+  [0x41a3] = "\x5e\xaa", [0x41a4] = "\x5e\xab", [0x41a5] = "\x5e\xac",
-+  [0x41a6] = "\x5e\xad", [0x41a7] = "\x5e\xae", [0x41a8] = "\x5e\xaf",
-+  [0x41a9] = "\x5e\xb0", [0x41aa] = "\x5e\xb1", [0x41ab] = "\x5e\xb2",
-+  [0x41ac] = "\x5e\xb3", [0x41ad] = "\x5e\xb4", [0x41ae] = "\x5e\xb5",
-+  [0x41af] = "\x5e\xb6", [0x41b0] = "\x5e\xb7", [0x41b1] = "\x5e\xb8",
-+  [0x41b2] = "\x5e\xb9", [0x41b3] = "\x5e\xba", [0x41b4] = "\x5e\xbb",
-+  [0x41b5] = "\x5e\xbc", [0x41b6] = "\x5e\xbd", [0x41b7] = "\x5e\xbe",
-+  [0x41b8] = "\x5e\xbf", [0x41b9] = "\x5e\xc0", [0x41ba] = "\x5e\xc1",
-+  [0x41bb] = "\x5e\xc2", [0x41bc] = "\x5e\xc3", [0x41bd] = "\x5e\xc4",
-+  [0x41be] = "\x5e\xc5", [0x41bf] = "\x5e\xc6", [0x41c0] = "\x5e\xc7",
-+  [0x41c1] = "\x5e\xc8", [0x41c2] = "\x5e\xc9", [0x41c3] = "\x5e\xca",
-+  [0x41c4] = "\x5e\xcb", [0x41c5] = "\x5e\xcc", [0x41c6] = "\x5e\xcd",
-+  [0x41c7] = "\x5e\xce", [0x41c8] = "\x5e\xcf", [0x41c9] = "\x5e\xd0",
-+  [0x41ca] = "\x5e\xd1", [0x41cb] = "\x5e\xd2", [0x41cc] = "\x5e\xd3",
-+  [0x41cd] = "\x5e\xd4", [0x41ce] = "\x5e\xd5", [0x41cf] = "\x5e\xd6",
-+  [0x41d0] = "\x5e\xd7", [0x41d1] = "\x5e\xd8", [0x41d2] = "\x5e\xd9",
-+  [0x41d3] = "\x5e\xda", [0x41d4] = "\x5e\xdb", [0x41d5] = "\x5e\xdc",
-+  [0x41d6] = "\x5e\xdd", [0x41d7] = "\x5e\xde", [0x41d8] = "\x5e\xdf",
-+  [0x41d9] = "\x5e\xe0", [0x41da] = "\x5e\xe1", [0x41db] = "\x5e\xe2",
-+  [0x41dc] = "\x5e\xe3", [0x41dd] = "\x5e\xe4", [0x41de] = "\x5e\xe5",
-+  [0x41df] = "\x5e\xe6", [0x41e0] = "\x5e\xe7", [0x41e1] = "\x5e\xe8",
-+  [0x41e2] = "\x5e\xe9", [0x41e3] = "\x5e\xea", [0x41e4] = "\x5e\xeb",
-+  [0x41e5] = "\x5e\xec", [0x41e6] = "\x5e\xed", [0x41e7] = "\x5e\xee",
-+  [0x41e8] = "\x5e\xef", [0x41e9] = "\x5e\xf0", [0x41ea] = "\x5e\xf1",
-+  [0x41eb] = "\x5e\xf2", [0x41ec] = "\x5e\xf3", [0x41ed] = "\x5e\xf4",
-+  [0x41ee] = "\x5e\xf5", [0x41ef] = "\x5e\xf6", [0x41f0] = "\x5e\xf7",
-+  [0x41f1] = "\x5e\xf8", [0x41f2] = "\x5e\xf9", [0x41f3] = "\x5e\xfa",
-+  [0x41f4] = "\x5e\xfb", [0x41f5] = "\x5e\xfc", [0x41f6] = "\x5e\xfd",
-+  [0x41f7] = "\x5e\xfe", [0x41f8] = "\x5e\xff", [0x41f9] = "\x5f\x00",
-+  [0x41fa] = "\x5f\x01", [0x41fb] = "\x5f\x02", [0x41fc] = "\x5f\x03",
-+  [0x41fd] = "\x5f\x04", [0x41fe] = "\x5f\x05", [0x41ff] = "\x5f\x06",
-+  [0x4200] = "\x5f\x07", [0x4201] = "\x5f\x08", [0x4202] = "\x5f\x09",
-+  [0x4203] = "\x5f\x0a", [0x4204] = "\x5f\x0b", [0x4205] = "\x5f\x0c",
-+  [0x4206] = "\x5f\x0d", [0x4207] = "\x5f\x0e", [0x4208] = "\x5f\x0f",
-+  [0x4209] = "\x5f\x10", [0x420a] = "\x5f\x11", [0x420b] = "\x5f\x12",
-+  [0x420c] = "\x5f\x13", [0x420d] = "\x5f\x14", [0x420e] = "\x5f\x15",
-+  [0x420f] = "\x5f\x16", [0x4210] = "\x5f\x17", [0x4211] = "\x5f\x18",
-+  [0x4212] = "\x5f\x19", [0x4213] = "\x5f\x1a", [0x4214] = "\x5f\x1b",
-+  [0x4215] = "\x5f\x1c", [0x4216] = "\x5f\x1d", [0x4217] = "\x5f\x1e",
-+  [0x4218] = "\x5f\x1f", [0x4219] = "\x5f\x20", [0x421a] = "\x5f\x21",
-+  [0x421b] = "\x5f\x22", [0x421c] = "\x5f\x23", [0x421d] = "\x5f\x24",
-+  [0x421e] = "\x5f\x25", [0x421f] = "\x5f\x26", [0x4220] = "\x5f\x27",
-+  [0x4221] = "\x5f\x28", [0x4222] = "\x5f\x29", [0x4223] = "\x5f\x2a",
-+  [0x4224] = "\x5f\x2b", [0x4225] = "\x5f\x2c", [0x4226] = "\x5f\x2d",
-+  [0x4227] = "\x5f\x2e", [0x4228] = "\x5f\x2f", [0x4229] = "\x5f\x30",
-+  [0x422a] = "\x5f\x31", [0x422b] = "\x5f\x32", [0x422c] = "\x5f\x33",
-+  [0x422d] = "\x5f\x34", [0x422e] = "\x5f\x35", [0x422f] = "\x5f\x36",
-+  [0x4230] = "\x5f\x37", [0x4231] = "\x5f\x38", [0x4232] = "\x5f\x39",
-+  [0x4233] = "\x5f\x3a", [0x4234] = "\x5f\x3b", [0x4235] = "\x5f\x3c",
-+  [0x4236] = "\x5f\x3d", [0x4237] = "\x5f\x3e", [0x4238] = "\x5f\x3f",
-+  [0x4239] = "\x5f\x40", [0x423a] = "\x5f\x41", [0x423b] = "\x5f\x42",
-+  [0x423c] = "\x5f\x43", [0x423d] = "\x5f\x44", [0x423e] = "\x5f\x45",
-+  [0x423f] = "\x5f\x46", [0x4240] = "\x5f\x47", [0x4241] = "\x5f\x48",
-+  [0x4242] = "\x5f\x49", [0x4243] = "\x5f\x4a", [0x4244] = "\x5f\x4b",
-+  [0x4245] = "\x5f\x4c", [0x4246] = "\x5f\x4d", [0x4247] = "\x5f\x4e",
-+  [0x4248] = "\x5f\x4f", [0x4249] = "\x5f\x50", [0x424a] = "\x5f\x51",
-+  [0x424b] = "\x5f\x52", [0x424c] = "\x5f\x53", [0x424d] = "\x5f\x54",
-+  [0x424e] = "\x5f\x55", [0x424f] = "\x5f\x56", [0x4250] = "\x5f\x57",
-+  [0x4251] = "\x5f\x58", [0x4252] = "\x5f\x59", [0x4253] = "\x5f\x5a",
-+  [0x4254] = "\x5f\x5b", [0x4255] = "\x5f\x5c", [0x4256] = "\x5f\x5d",
-+  [0x4257] = "\x5f\x5e", [0x4258] = "\x5f\x5f", [0x4259] = "\x5f\x60",
-+  [0x425a] = "\x5f\x61", [0x425b] = "\x5f\x62", [0x425c] = "\x5f\x63",
-+  [0x425d] = "\x5f\x64", [0x425e] = "\x5f\x65", [0x425f] = "\x5f\x66",
-+  [0x4260] = "\x5f\x67", [0x4261] = "\x5f\x68", [0x4262] = "\x5f\x69",
-+  [0x4263] = "\x5f\x6a", [0x4264] = "\x5f\x6b", [0x4265] = "\x5f\x6c",
-+  [0x4266] = "\x5f\x6d", [0x4267] = "\x5f\x6e", [0x4268] = "\x5f\x6f",
-+  [0x4269] = "\x5f\x70", [0x426a] = "\x5f\x71", [0x426b] = "\x5f\x72",
-+  [0x426c] = "\x5f\x73", [0x426d] = "\x5f\x74", [0x426e] = "\x5f\x75",
-+  [0x426f] = "\x5f\x76", [0x4270] = "\x5f\x77", [0x4271] = "\x5f\x78",
-+  [0x4272] = "\x5f\x79", [0x4273] = "\x5f\x7a", [0x4274] = "\x5f\x7b",
-+  [0x4275] = "\x5f\x7c", [0x4276] = "\x5f\x7d", [0x4277] = "\x5f\x7e",
-+  [0x4278] = "\x5f\x7f", [0x4279] = "\x5f\x80", [0x427a] = "\x5f\x81",
-+  [0x427b] = "\x5f\x82", [0x427c] = "\x5f\x83", [0x427d] = "\x5f\x84",
-+  [0x427e] = "\x5f\x85", [0x427f] = "\x5f\x86", [0x4280] = "\x5f\x87",
-+  [0x4281] = "\x5f\x88", [0x4282] = "\x5f\x89", [0x4283] = "\x5f\x8a",
-+  [0x4284] = "\x5f\x8b", [0x4285] = "\x5f\x8c", [0x4286] = "\x5f\x8d",
-+  [0x4287] = "\x5f\x8e", [0x4288] = "\x5f\x8f", [0x4289] = "\x5f\x90",
-+  [0x428a] = "\x5f\x91", [0x428b] = "\x5f\x92", [0x428c] = "\x5f\x93",
-+  [0x428d] = "\x5f\x94", [0x428e] = "\x5f\x95", [0x428f] = "\x5f\x96",
-+  [0x4290] = "\x5f\x97", [0x4291] = "\x5f\x98", [0x4292] = "\x5f\x99",
-+  [0x4293] = "\x5f\x9a", [0x4294] = "\x5f\x9b", [0x4295] = "\x5f\x9c",
-+  [0x4296] = "\x5f\x9d", [0x4297] = "\x5f\x9e", [0x4298] = "\x5f\x9f",
-+  [0x4299] = "\x5f\xa0", [0x429a] = "\x5f\xa1", [0x429b] = "\x5f\xa2",
-+  [0x429c] = "\x5f\xa3", [0x429d] = "\x5f\xa4", [0x429e] = "\x5f\xa5",
-+  [0x429f] = "\x5f\xa6", [0x42a0] = "\x5f\xa7", [0x42a1] = "\x5f\xa8",
-+  [0x42a2] = "\x5f\xa9", [0x42a3] = "\x5f\xaa", [0x42a4] = "\x5f\xab",
-+  [0x42a5] = "\x5f\xac", [0x42a6] = "\x5f\xad", [0x42a7] = "\x5f\xae",
-+  [0x42a8] = "\x5f\xaf", [0x42a9] = "\x5f\xb0", [0x42aa] = "\x5f\xb1",
-+  [0x42ab] = "\x5f\xb2", [0x42ac] = "\x5f\xb3", [0x42ad] = "\x5f\xb4",
-+  [0x42ae] = "\x5f\xb5", [0x42af] = "\x5f\xb6", [0x42b0] = "\x5f\xb7",
-+  [0x42b1] = "\x5f\xb8", [0x42b2] = "\x5f\xb9", [0x42b3] = "\x5f\xba",
-+  [0x42b4] = "\x5f\xbb", [0x42b5] = "\x5f\xbc", [0x42b6] = "\x5f\xbd",
-   [0x42b7] = "\xfe\x72", [0x42b8] = "\x5f\xbe", [0x42b9] = "\x5f\xbf",
-   [0x42ba] = "\x5f\xc0", [0x42bb] = "\x5f\xc1", [0x42bc] = "\x5f\xc2",
-   [0x42bd] = "\x5f\xc3", [0x42be] = "\x5f\xc4", [0x42bf] = "\x5f\xc5",
-@@ -9803,258 +14987,767 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x444c] = "\x61\x4f", [0x444d] = "\x61\x50", [0x444e] = "\x61\x51",
-   [0x444f] = "\x61\x52", [0x4450] = "\x61\x53", [0x4451] = "\x61\x54",
-   [0x4452] = "\x61\x55", [0x4453] = "\x61\x56", [0x4454] = "\x61\x57",
--  [0x4455] = "\x61\x58", [0x4456] = "\xfe\x7b", [0x45cc] = "\xfe\x7d",
--  [0x45cd] = "\x62\xce", [0x45ce] = "\x62\xcf", [0x45cf] = "\x62\xd0",
--  [0x45d0] = "\x62\xd1", [0x45d1] = "\x62\xd2", [0x45d2] = "\x62\xd3",
--  [0x45d3] = "\x62\xd4", [0x45d4] = "\x62\xd5", [0x45d5] = "\x62\xd6",
--  [0x45d6] = "\x62\xd7", [0x45d7] = "\x62\xd8", [0x45d8] = "\x62\xd9",
--  [0x45d9] = "\x62\xda", [0x45da] = "\x62\xdb", [0x45db] = "\x62\xdc",
--  [0x45dc] = "\x62\xdd", [0x45dd] = "\x62\xde", [0x45de] = "\x62\xdf",
--  [0x45df] = "\x62\xe0", [0x45e0] = "\x62\xe1", [0x45e1] = "\xfe\x7c",
--  [0x45e2] = "\x62\xe2", [0x45e3] = "\x62\xe3", [0x45e4] = "\x62\xe4",
--  [0x45e5] = "\x62\xe5", [0x45e6] = "\x62\xe6", [0x45e7] = "\x62\xe7",
--  [0x45e8] = "\x62\xe8", [0x45e9] = "\x62\xe9", [0x45ea] = "\x62\xea",
--  [0x45eb] = "\x62\xeb", [0x45ec] = "\x62\xec", [0x45ed] = "\x62\xed",
--  [0x45ee] = "\x62\xee", [0x45ef] = "\x62\xef", [0x45f0] = "\x62\xf0",
--  [0x45f1] = "\x62\xf1", [0x45f2] = "\x62\xf2", [0x45f3] = "\x62\xf3",
--  [0x45f4] = "\x62\xf4", [0x45f5] = "\x62\xf5", [0x45f6] = "\x62\xf6",
--  [0x45f7] = "\x62\xf7", [0x45f8] = "\x62\xf8", [0x45f9] = "\x62\xf9",
--  [0x45fa] = "\x62\xfa", [0x45fb] = "\x62\xfb", [0x45fc] = "\x62\xfc",
--  [0x45fd] = "\x62\xfd", [0x45fe] = "\x62\xfe", [0x45ff] = "\x62\xff",
--  [0x4600] = "\x63\x00", [0x4601] = "\x63\x01", [0x4602] = "\x63\x02",
--  [0x4603] = "\x63\x03", [0x4604] = "\x63\x04", [0x4605] = "\x63\x05",
--  [0x4606] = "\x63\x06", [0x4607] = "\x63\x07", [0x4608] = "\x63\x08",
--  [0x4609] = "\x63\x09", [0x460a] = "\x63\x0a", [0x460b] = "\x63\x0b",
--  [0x460c] = "\x63\x0c", [0x460d] = "\x63\x0d", [0x460e] = "\x63\x0e",
--  [0x460f] = "\x63\x0f", [0x4610] = "\x63\x10", [0x4611] = "\x63\x11",
--  [0x4612] = "\x63\x12", [0x4613] = "\x63\x13", [0x4614] = "\x63\x14",
--  [0x4615] = "\x63\x15", [0x4616] = "\x63\x16", [0x4617] = "\x63\x17",
--  [0x4618] = "\x63\x18", [0x4619] = "\x63\x19", [0x461a] = "\x63\x1a",
--  [0x461b] = "\x63\x1b", [0x461c] = "\x63\x1c", [0x461d] = "\x63\x1d",
--  [0x461e] = "\x63\x1e", [0x461f] = "\x63\x1f", [0x4620] = "\x63\x20",
--  [0x4621] = "\x63\x21", [0x4622] = "\x63\x22", [0x4623] = "\x63\x23",
--  [0x4624] = "\x63\x24", [0x4625] = "\x63\x25", [0x4626] = "\x63\x26",
--  [0x4627] = "\x63\x27", [0x4628] = "\x63\x28", [0x4629] = "\x63\x29",
--  [0x462a] = "\x63\x2a", [0x462b] = "\x63\x2b", [0x462c] = "\x63\x2c",
--  [0x462d] = "\x63\x2d", [0x462e] = "\x63\x2e", [0x462f] = "\x63\x2f",
--  [0x4630] = "\x63\x30", [0x4631] = "\x63\x31", [0x4632] = "\x63\x32",
--  [0x4633] = "\x63\x33", [0x4634] = "\x63\x34", [0x4635] = "\x63\x35",
--  [0x4636] = "\x63\x36", [0x4637] = "\x63\x37", [0x4638] = "\x63\x38",
--  [0x4639] = "\x63\x39", [0x463a] = "\x63\x3a", [0x463b] = "\x63\x3b",
--  [0x463c] = "\x63\x3c", [0x463d] = "\x63\x3d", [0x463e] = "\x63\x3e",
--  [0x463f] = "\x63\x3f", [0x4640] = "\x63\x40", [0x4641] = "\x63\x41",
--  [0x4642] = "\x63\x42", [0x4643] = "\x63\x43", [0x4644] = "\x63\x44",
--  [0x4645] = "\x63\x45", [0x4646] = "\x63\x46", [0x4647] = "\x63\x47",
--  [0x4648] = "\x63\x48", [0x4649] = "\x63\x49", [0x464a] = "\x63\x4a",
--  [0x464b] = "\x63\x4b", [0x464c] = "\x63\x4c", [0x464d] = "\x63\x4d",
--  [0x464e] = "\x63\x4e", [0x464f] = "\x63\x4f", [0x4650] = "\x63\x50",
--  [0x4651] = "\x63\x51", [0x4652] = "\x63\x52", [0x4653] = "\x63\x53",
--  [0x4654] = "\x63\x54", [0x4655] = "\x63\x55", [0x4656] = "\x63\x56",
--  [0x4657] = "\x63\x57", [0x4658] = "\x63\x58", [0x4659] = "\x63\x59",
--  [0x465a] = "\x63\x5a", [0x465b] = "\x63\x5b", [0x465c] = "\x63\x5c",
--  [0x465d] = "\x63\x5d", [0x465e] = "\x63\x5e", [0x465f] = "\x63\x5f",
--  [0x4660] = "\x63\x60", [0x4661] = "\x63\x61", [0x4662] = "\x63\x62",
--  [0x4663] = "\x63\x63", [0x4664] = "\x63\x64", [0x4665] = "\x63\x65",
--  [0x4666] = "\x63\x66", [0x4667] = "\x63\x67", [0x4668] = "\x63\x68",
--  [0x4669] = "\x63\x69", [0x466a] = "\x63\x6a", [0x466b] = "\x63\x6b",
--  [0x466c] = "\x63\x6c", [0x466d] = "\x63\x6d", [0x466e] = "\x63\x6e",
--  [0x466f] = "\x63\x6f", [0x4670] = "\x63\x70", [0x4671] = "\x63\x71",
--  [0x4672] = "\x63\x72", [0x4673] = "\x63\x73", [0x4674] = "\x63\x74",
--  [0x4675] = "\x63\x75", [0x4676] = "\x63\x76", [0x4677] = "\x63\x77",
--  [0x4678] = "\x63\x78", [0x4679] = "\x63\x79", [0x467a] = "\x63\x7a",
--  [0x467b] = "\x63\x7b", [0x467c] = "\x63\x7c", [0x467d] = "\x63\x7d",
--  [0x467e] = "\x63\x7e", [0x467f] = "\x63\x7f", [0x4680] = "\x63\x80",
--  [0x4681] = "\x63\x81", [0x4682] = "\x63\x82", [0x4683] = "\x63\x83",
--  [0x4684] = "\x63\x84", [0x4685] = "\x63\x85", [0x4686] = "\x63\x86",
--  [0x4687] = "\x63\x87", [0x4688] = "\x63\x88", [0x4689] = "\x63\x89",
--  [0x468a] = "\x63\x8a", [0x468b] = "\x63\x8b", [0x468c] = "\x63\x8c",
--  [0x468d] = "\x63\x8d", [0x468e] = "\x63\x8e", [0x468f] = "\x63\x8f",
--  [0x4690] = "\x63\x90", [0x4691] = "\x63\x91", [0x4692] = "\x63\x92",
--  [0x4693] = "\x63\x93", [0x4694] = "\x63\x94", [0x4695] = "\x63\x95",
--  [0x4696] = "\x63\x96", [0x4697] = "\x63\x97", [0x4698] = "\x63\x98",
--  [0x4699] = "\x63\x99", [0x469a] = "\x63\x9a", [0x469b] = "\x63\x9b",
--  [0x469c] = "\x63\x9c", [0x469d] = "\x63\x9d", [0x469e] = "\x63\x9e",
--  [0x469f] = "\x63\x9f", [0x46a0] = "\x63\xa0", [0x46a1] = "\x63\xa1",
--  [0x46a2] = "\x63\xa2", [0x46a3] = "\xfe\x80", [0x46a4] = "\x63\xa3",
--  [0x46a5] = "\x63\xa4", [0x46a6] = "\x63\xa5", [0x46a7] = "\x63\xa6",
--  [0x46a8] = "\x63\xa7", [0x46a9] = "\xfe\x81", [0x46aa] = "\x63\xa8",
--  [0x46ab] = "\x63\xa9", [0x46ac] = "\x63\xaa", [0x46ad] = "\x63\xab",
--  [0x46ae] = "\x63\xac", [0x46af] = "\x63\xad", [0x46b0] = "\x63\xae",
--  [0x46b1] = "\x63\xaf", [0x46b2] = "\x63\xb0", [0x46b3] = "\x63\xb1",
--  [0x46b4] = "\x63\xb2", [0x46b5] = "\x63\xb3", [0x46b6] = "\x63\xb4",
--  [0x46b7] = "\x63\xb5", [0x46b8] = "\x63\xb6", [0x46b9] = "\x63\xb7",
--  [0x46ba] = "\x63\xb8", [0x46bb] = "\x63\xb9", [0x46bc] = "\x63\xba",
--  [0x46bd] = "\x63\xbb", [0x46be] = "\x63\xbc", [0x46bf] = "\x63\xbd",
--  [0x46c0] = "\x63\xbe", [0x46c1] = "\x63\xbf", [0x46c2] = "\x63\xc0",
--  [0x46c3] = "\x63\xc1", [0x46c4] = "\x63\xc2", [0x46c5] = "\x63\xc3",
--  [0x46c6] = "\x63\xc4", [0x46c7] = "\x63\xc5", [0x46c8] = "\x63\xc6",
--  [0x46c9] = "\x63\xc7", [0x46ca] = "\x63\xc8", [0x46cb] = "\x63\xc9",
--  [0x46cc] = "\x63\xca", [0x46cd] = "\x63\xcb", [0x46ce] = "\x63\xcc",
--  [0x46cf] = "\x63\xcd", [0x46d0] = "\x63\xce", [0x46d1] = "\x63\xcf",
--  [0x46d2] = "\x63\xd0", [0x46d3] = "\x63\xd1", [0x46d4] = "\x63\xd2",
--  [0x46d5] = "\x63\xd3", [0x46d6] = "\x63\xd4", [0x46d7] = "\x63\xd5",
--  [0x46d8] = "\x63\xd6", [0x46d9] = "\x63\xd7", [0x46da] = "\x63\xd8",
--  [0x46db] = "\x63\xd9", [0x46dc] = "\x63\xda", [0x46dd] = "\x63\xdb",
--  [0x46de] = "\x63\xdc", [0x46df] = "\x63\xdd", [0x46e0] = "\x63\xde",
--  [0x46e1] = "\x63\xdf", [0x46e2] = "\x63\xe0", [0x46e3] = "\x63\xe1",
--  [0x46e4] = "\x63\xe2", [0x46e5] = "\x63\xe3", [0x46e6] = "\x63\xe4",
--  [0x46e7] = "\x63\xe5", [0x46e8] = "\x63\xe6", [0x46e9] = "\x63\xe7",
--  [0x46ea] = "\x63\xe8", [0x46eb] = "\x63\xe9", [0x46ec] = "\x63\xea",
--  [0x46ed] = "\x63\xeb", [0x46ee] = "\x63\xec", [0x46ef] = "\x63\xed",
--  [0x46f0] = "\x63\xee", [0x46f1] = "\x63\xef", [0x46f2] = "\x63\xf0",
--  [0x46f3] = "\x63\xf1", [0x46f4] = "\x63\xf2", [0x46f5] = "\x63\xf3",
--  [0x46f6] = "\x63\xf4", [0x46f7] = "\x63\xf5", [0x46f8] = "\x63\xf6",
--  [0x46f9] = "\x63\xf7", [0x46fa] = "\x63\xf8", [0x46fb] = "\x63\xf9",
--  [0x46fc] = "\xfe\x82", [0x46fd] = "\x63\xfa", [0x46fe] = "\x63\xfb",
--  [0x46ff] = "\x63\xfc", [0x4700] = "\x63\xfd", [0x4701] = "\x63\xfe",
--  [0x4702] = "\x63\xff", [0x4703] = "\x64\x00", [0x4704] = "\x64\x01",
--  [0x4705] = "\x64\x02", [0x4706] = "\x64\x03", [0x4707] = "\x64\x04",
--  [0x4708] = "\x64\x05", [0x4709] = "\x64\x06", [0x470a] = "\x64\x07",
--  [0x470b] = "\x64\x08", [0x470c] = "\x64\x09", [0x470d] = "\xfe\x83",
--  [0x48c7] = "\xfe\x85", [0x48c8] = "\x65\xc3", [0x48c9] = "\x65\xc4",
--  [0x48ca] = "\x65\xc5", [0x48cb] = "\x65\xc6", [0x48cc] = "\x65\xc7",
--  [0x48cd] = "\x65\xc8", [0x48ce] = "\x65\xc9", [0x48cf] = "\x65\xca",
--  [0x48d0] = "\x65\xcb", [0x48d1] = "\x65\xcc", [0x48d2] = "\x65\xcd",
--  [0x48d3] = "\x65\xce", [0x48d4] = "\x65\xcf", [0x48d5] = "\x65\xd0",
--  [0x48d6] = "\x65\xd1", [0x48d7] = "\x65\xd2", [0x48d8] = "\x65\xd3",
--  [0x48d9] = "\x65\xd4", [0x48da] = "\x65\xd5", [0x48db] = "\x65\xd6",
--  [0x48dc] = "\x65\xd7", [0x48dd] = "\x65\xd8", [0x48de] = "\x65\xd9",
--  [0x48df] = "\x65\xda", [0x48e0] = "\x65\xdb", [0x48e1] = "\x65\xdc",
--  [0x48e2] = "\x65\xdd", [0x48e3] = "\x65\xde", [0x48e4] = "\x65\xdf",
--  [0x48e5] = "\x65\xe0", [0x48e6] = "\x65\xe1", [0x48e7] = "\x65\xe2",
--  [0x48e8] = "\x65\xe3", [0x48e9] = "\x65\xe4", [0x48ea] = "\x65\xe5",
--  [0x48eb] = "\x65\xe6", [0x48ec] = "\x65\xe7", [0x48ed] = "\x65\xe8",
--  [0x48ee] = "\x65\xe9", [0x48ef] = "\x65\xea", [0x48f0] = "\x65\xeb",
--  [0x48f1] = "\x65\xec", [0x48f2] = "\x65\xed", [0x48f3] = "\x65\xee",
--  [0x48f4] = "\x65\xef", [0x48f5] = "\x65\xf0", [0x48f6] = "\x65\xf1",
--  [0x48f7] = "\x65\xf2", [0x48f8] = "\x65\xf3", [0x48f9] = "\x65\xf4",
--  [0x48fa] = "\xfe\x86", [0x48fb] = "\x65\xf5", [0x48fc] = "\x65\xf6",
--  [0x48fd] = "\xfe\x87", [0x48fe] = "\x65\xf7", [0x48ff] = "\x65\xf8",
--  [0x4900] = "\x65\xf9", [0x4901] = "\x65\xfa", [0x4902] = "\xfe\x88",
--  [0x4903] = "\xfe\x89", [0x4904] = "\x65\xfb", [0x4905] = "\xfe\x8a",
--  [0x4906] = "\xfe\x8b", [0x4907] = "\x65\xfc", [0x4908] = "\x65\xfd",
--  [0x4909] = "\x65\xfe", [0x490a] = "\x65\xff", [0x490b] = "\x66\x00",
--  [0x490c] = "\x66\x01", [0x490d] = "\x66\x02", [0x490e] = "\x66\x03",
--  [0x490f] = "\x66\x04", [0x4910] = "\x66\x05", [0x4911] = "\x66\x06",
--  [0x4912] = "\x66\x07", [0x4913] = "\x66\x08", [0x4914] = "\x66\x09",
--  [0x4915] = "\x66\x0a", [0x4916] = "\x66\x0b", [0x4917] = "\x66\x0c",
--  [0x4918] = "\x66\x0d", [0x4919] = "\x66\x0e", [0x491a] = "\x66\x0f",
--  [0x491b] = "\xfe\x8d", [0x491c] = "\x66\x10", [0x491d] = "\x66\x11",
--  [0x491e] = "\x66\x12", [0x491f] = "\xfe\x8c", [0x4920] = "\x66\x13",
--  [0x4921] = "\x66\x14", [0x4922] = "\x66\x15", [0x4923] = "\x66\x16",
--  [0x4924] = "\x66\x17", [0x4925] = "\x66\x18", [0x4926] = "\x66\x19",
--  [0x4927] = "\x66\x1a", [0x4928] = "\x66\x1b", [0x4929] = "\x66\x1c",
--  [0x492a] = "\x66\x1d", [0x492b] = "\x66\x1e", [0x492c] = "\x66\x1f",
--  [0x492d] = "\x66\x20", [0x492e] = "\x66\x21", [0x492f] = "\x66\x22",
--  [0x4930] = "\x66\x23", [0x4931] = "\x66\x24", [0x4932] = "\x66\x25",
--  [0x4933] = "\x66\x26", [0x4934] = "\x66\x27", [0x4935] = "\x66\x28",
--  [0x4936] = "\xfe\x8f", [0x4937] = "\xfe\x8e", [0x4bf7] = "\xfe\x96",
--  [0x4bf8] = "\x68\xe8", [0x4bf9] = "\x68\xe9", [0x4bfa] = "\x68\xea",
--  [0x4bfb] = "\x68\xeb", [0x4bfc] = "\x68\xec", [0x4bfd] = "\x68\xed",
--  [0x4bfe] = "\x68\xee", [0x4bff] = "\x68\xef", [0x4c00] = "\x68\xf0",
--  [0x4c01] = "\x68\xf1", [0x4c02] = "\x68\xf2", [0x4c03] = "\x68\xf3",
--  [0x4c04] = "\x68\xf4", [0x4c05] = "\x68\xf5", [0x4c06] = "\x68\xf6",
--  [0x4c07] = "\x68\xf7", [0x4c08] = "\x68\xf8", [0x4c09] = "\x68\xf9",
--  [0x4c0a] = "\x68\xfa", [0x4c0b] = "\x68\xfb", [0x4c0c] = "\x68\xfc",
--  [0x4c0d] = "\x68\xfd", [0x4c0e] = "\x68\xfe", [0x4c0f] = "\x68\xff",
--  [0x4c10] = "\x69\x00", [0x4c11] = "\x69\x01", [0x4c12] = "\x69\x02",
--  [0x4c13] = "\x69\x03", [0x4c14] = "\x69\x04", [0x4c15] = "\x69\x05",
--  [0x4c16] = "\x69\x06", [0x4c17] = "\x69\x07", [0x4c18] = "\x69\x08",
--  [0x4c19] = "\x69\x09", [0x4c1a] = "\x69\x0a", [0x4c1b] = "\x69\x0b",
--  [0x4c1c] = "\x69\x0c", [0x4c1d] = "\x69\x0d", [0x4c1e] = "\x69\x0e",
--  [0x4c1f] = "\xfe\x93", [0x4c20] = "\xfe\x94", [0x4c21] = "\xfe\x95",
--  [0x4c22] = "\xfe\x97", [0x4c23] = "\xfe\x92", [0x4c24] = "\x69\x0f",
--  [0x4c25] = "\x69\x10", [0x4c26] = "\x69\x11", [0x4c27] = "\x69\x12",
--  [0x4c28] = "\x69\x13", [0x4c29] = "\x69\x14", [0x4c2a] = "\x69\x15",
--  [0x4c2b] = "\x69\x16", [0x4c2c] = "\x69\x17", [0x4c2d] = "\x69\x18",
--  [0x4c2e] = "\x69\x19", [0x4c2f] = "\x69\x1a", [0x4c30] = "\x69\x1b",
--  [0x4c31] = "\x69\x1c", [0x4c32] = "\x69\x1d", [0x4c33] = "\x69\x1e",
--  [0x4c34] = "\x69\x1f", [0x4c35] = "\x69\x20", [0x4c36] = "\x69\x21",
--  [0x4c37] = "\x69\x22", [0x4c38] = "\x69\x23", [0x4c39] = "\x69\x24",
--  [0x4c3a] = "\x69\x25", [0x4c3b] = "\x69\x26", [0x4c3c] = "\x69\x27",
--  [0x4c3d] = "\x69\x28", [0x4c3e] = "\x69\x29", [0x4c3f] = "\x69\x2a",
--  [0x4c40] = "\x69\x2b", [0x4c41] = "\x69\x2c", [0x4c42] = "\x69\x2d",
--  [0x4c43] = "\x69\x2e", [0x4c44] = "\x69\x2f", [0x4c45] = "\x69\x30",
--  [0x4c46] = "\x69\x31", [0x4c47] = "\x69\x32", [0x4c48] = "\x69\x33",
--  [0x4c49] = "\x69\x34", [0x4c4a] = "\x69\x35", [0x4c4b] = "\x69\x36",
--  [0x4c4c] = "\x69\x37", [0x4c4d] = "\x69\x38", [0x4c4e] = "\x69\x39",
--  [0x4c4f] = "\x69\x3a", [0x4c50] = "\x69\x3b", [0x4c51] = "\x69\x3c",
--  [0x4c52] = "\x69\x3d", [0x4c53] = "\x69\x3e", [0x4c54] = "\x69\x3f",
--  [0x4c55] = "\x69\x40", [0x4c56] = "\x69\x41", [0x4c57] = "\x69\x42",
--  [0x4c58] = "\x69\x43", [0x4c59] = "\x69\x44", [0x4c5a] = "\x69\x45",
--  [0x4c5b] = "\x69\x46", [0x4c5c] = "\x69\x47", [0x4c5d] = "\x69\x48",
--  [0x4c5e] = "\x69\x49", [0x4c5f] = "\x69\x4a", [0x4c60] = "\x69\x4b",
--  [0x4c61] = "\x69\x4c", [0x4c62] = "\x69\x4d", [0x4c63] = "\x69\x4e",
--  [0x4c64] = "\x69\x4f", [0x4c65] = "\x69\x50", [0x4c66] = "\x69\x51",
--  [0x4c67] = "\x69\x52", [0x4c68] = "\x69\x53", [0x4c69] = "\x69\x54",
--  [0x4c6a] = "\x69\x55", [0x4c6b] = "\x69\x56", [0x4c6c] = "\x69\x57",
--  [0x4c6d] = "\x69\x58", [0x4c6e] = "\x69\x59", [0x4c6f] = "\x69\x5a",
--  [0x4c70] = "\x69\x5b", [0x4c71] = "\x69\x5c", [0x4c72] = "\x69\x5d",
--  [0x4c73] = "\x69\x5e", [0x4c74] = "\x69\x5f", [0x4c75] = "\x69\x60",
--  [0x4c76] = "\x69\x61", [0x4c77] = "\x69\x62", [0x4c78] = "\x69\x63",
--  [0x4c79] = "\x69\x64", [0x4c7a] = "\x69\x65", [0x4c7b] = "\x69\x66",
--  [0x4c7c] = "\x69\x67", [0x4c7d] = "\x69\x68", [0x4c7e] = "\x69\x69",
--  [0x4c7f] = "\x69\x6a", [0x4c80] = "\x69\x6b", [0x4c81] = "\x69\x6c",
--  [0x4c82] = "\x69\x6d", [0x4c83] = "\x69\x6e", [0x4c84] = "\x69\x6f",
--  [0x4c85] = "\x69\x70", [0x4c86] = "\x69\x71", [0x4c87] = "\x69\x72",
--  [0x4c88] = "\x69\x73", [0x4c89] = "\x69\x74", [0x4c8a] = "\x69\x75",
--  [0x4c8b] = "\x69\x76", [0x4c8c] = "\x69\x77", [0x4c8d] = "\x69\x78",
--  [0x4c8e] = "\x69\x79", [0x4c8f] = "\x69\x7a", [0x4c90] = "\x69\x7b",
--  [0x4c91] = "\x69\x7c", [0x4c92] = "\x69\x7d", [0x4c93] = "\xfe\x98",
--  [0x4c94] = "\xfe\x99", [0x4c95] = "\xfe\x9a", [0x4c96] = "\xfe\x9b",
--  [0x4c97] = "\xfe\x9c", [0x4c98] = "\xfe\x9d", [0x4c99] = "\xfe\x9e",
--  [0x4c9a] = "\x69\x7e", [0x4c9b] = "\x69\x7f", [0x4c9c] = "\x69\x80",
--  [0x4c9d] = "\x69\x81", [0x4c9e] = "\x69\x82", [0x4c9f] = "\x69\x83",
--  [0x4ca0] = "\x69\x84", [0x4ca1] = "\x69\x85", [0x4ca2] = "\x69\x86",
--  [0x4ca3] = "\x69\x87", [0x4ca4] = "\x69\x88", [0x4ca5] = "\x69\x89",
--  [0x4ca6] = "\x69\x8a", [0x4ca7] = "\x69\x8b", [0x4ca8] = "\x69\x8c",
--  [0x4ca9] = "\x69\x8d", [0x4caa] = "\x69\x8e", [0x4cab] = "\x69\x8f",
--  [0x4cac] = "\x69\x90", [0x4cad] = "\x69\x91", [0x4cae] = "\x69\x92",
--  [0x4caf] = "\x69\x93", [0x4cb0] = "\x69\x94", [0x4cb1] = "\x69\x95",
--  [0x4cb2] = "\x69\x96", [0x4cb3] = "\x69\x97", [0x4cb4] = "\x69\x98",
--  [0x4cb5] = "\x69\x99", [0x4cb6] = "\x69\x9a", [0x4cb7] = "\x69\x9b",
--  [0x4cb8] = "\x69\x9c", [0x4cb9] = "\x69\x9d", [0x4cba] = "\x69\x9e",
--  [0x4cbb] = "\x69\x9f", [0x4cbc] = "\x69\xa0", [0x4cbd] = "\x69\xa1",
--  [0x4cbe] = "\x69\xa2", [0x4cbf] = "\x69\xa3", [0x4cc0] = "\x69\xa4",
--  [0x4cc1] = "\x69\xa5", [0x4cc2] = "\x69\xa6", [0x4cc3] = "\x69\xa7",
--  [0x4cc4] = "\x69\xa8", [0x4cc5] = "\x69\xa9", [0x4cc6] = "\x69\xaa",
--  [0x4cc7] = "\x69\xab", [0x4cc8] = "\x69\xac", [0x4cc9] = "\x69\xad",
--  [0x4cca] = "\x69\xae", [0x4ccb] = "\x69\xaf", [0x4ccc] = "\x69\xb0",
--  [0x4ccd] = "\x69\xb1", [0x4cce] = "\x69\xb2", [0x4ccf] = "\x69\xb3",
--  [0x4cd0] = "\x69\xb4", [0x4cd1] = "\x69\xb5", [0x4cd2] = "\x69\xb6",
--  [0x4cd3] = "\x69\xb7", [0x4cd4] = "\x69\xb8", [0x4cd5] = "\x69\xb9",
--  [0x4cd6] = "\x69\xba", [0x4cd7] = "\x69\xbb", [0x4cd8] = "\x69\xbc",
--  [0x4cd9] = "\x69\xbd", [0x4cda] = "\x69\xbe", [0x4cdb] = "\x69\xbf",
--  [0x4cdc] = "\x69\xc0", [0x4cdd] = "\x69\xc1", [0x4cde] = "\x69\xc2",
--  [0x4cdf] = "\x69\xc3", [0x4ce0] = "\x69\xc4", [0x4ce1] = "\x69\xc5",
--  [0x4ce2] = "\x69\xc6", [0x4ce3] = "\x69\xc7", [0x4ce4] = "\x69\xc8",
--  [0x4ce5] = "\x69\xc9", [0x4ce6] = "\x69\xca", [0x4ce7] = "\x69\xcb",
--  [0x4ce8] = "\x69\xcc", [0x4ce9] = "\x69\xcd", [0x4cea] = "\x69\xce",
--  [0x4ceb] = "\x69\xcf", [0x4cec] = "\x69\xd0", [0x4ced] = "\x69\xd1",
--  [0x4cee] = "\x69\xd2", [0x4cef] = "\x69\xd3", [0x4cf0] = "\x69\xd4",
--  [0x4cf1] = "\x69\xd5", [0x4cf2] = "\x69\xd6", [0x4cf3] = "\x69\xd7",
--  [0x4cf4] = "\x69\xd8", [0x4cf5] = "\x69\xd9", [0x4cf6] = "\x69\xda",
--  [0x4cf7] = "\x69\xdb", [0x4cf8] = "\x69\xdc", [0x4cf9] = "\x69\xdd",
--  [0x4cfa] = "\x69\xde", [0x4cfb] = "\x69\xdf", [0x4cfc] = "\x69\xe0",
--  [0x4cfd] = "\x69\xe1", [0x4cfe] = "\x69\xe2", [0x4cff] = "\x69\xe3",
--  [0x4d00] = "\x69\xe4", [0x4d01] = "\x69\xe5", [0x4d02] = "\x69\xe6",
--  [0x4d03] = "\x69\xe7", [0x4d04] = "\x69\xe8", [0x4d05] = "\x69\xe9",
--  [0x4d06] = "\x69\xea", [0x4d07] = "\x69\xeb", [0x4d08] = "\x69\xec",
--  [0x4d09] = "\x69\xed", [0x4d0a] = "\x69\xee", [0x4d0b] = "\x69\xef",
--  [0x4d0c] = "\x69\xf0", [0x4d0d] = "\x69\xf1", [0x4d0e] = "\x69\xf2",
--  [0x4d0f] = "\x69\xf3", [0x4d10] = "\x69\xf4", [0x4d11] = "\x69\xf5",
--  [0x4d12] = "\x69\xf6", [0x4d13] = "\x69\xf7", [0x4d14] = "\x69\xf8",
--  [0x4d15] = "\x69\xf9", [0x4d16] = "\x69\xfa", [0x4d17] = "\x69\xfb",
--  [0x4d18] = "\x69\xfc", [0x4d19] = "\x69\xfd", [0x4d1a] = "\x69\xfe",
--  [0x4d1b] = "\x69\xff", [0x4d1c] = "\x6a\x00", [0x4d1d] = "\x6a\x01",
--  [0x4d1e] = "\x6a\x02", [0x4d1f] = "\x6a\x03", [0x4d20] = "\x6a\x04",
--  [0x4d21] = "\x6a\x05", [0x4d22] = "\x6a\x06", [0x4d23] = "\x6a\x07",
--  [0x4d24] = "\x6a\x08", [0x4d25] = "\x6a\x09", [0x4d26] = "\x6a\x0a",
--  [0x4d27] = "\x6a\x0b", [0x4d28] = "\x6a\x0c", [0x4d29] = "\x6a\x0d",
--  [0x4d2a] = "\x6a\x0e", [0x4d2b] = "\x6a\x0f", [0x4d2c] = "\x6a\x10",
--  [0x4d2d] = "\x6a\x11", [0x4d2e] = "\xfe\x9f", [0x4d2f] = "\x6a\x12",
--  [0x4d30] = "\x6a\x13", [0x4d31] = "\x6a\x14", [0x4d32] = "\x6a\x15",
--  [0x4d33] = "\x6a\x16", [0x4d34] = "\x6a\x17", [0x4d35] = "\x6a\x18",
-+  [0x4455] = "\x61\x58", [0x4456] = "\xfe\x7b", [0x4457] = "\x61\x59",
-+  [0x4458] = "\x61\x5a", [0x4459] = "\x61\x5b", [0x445a] = "\x61\x5c",
-+  [0x445b] = "\x61\x5d", [0x445c] = "\x61\x5e", [0x445d] = "\x61\x5f",
-+  [0x445e] = "\x61\x60", [0x445f] = "\x61\x61", [0x4460] = "\x61\x62",
-+  [0x4461] = "\x61\x63", [0x4462] = "\x61\x64", [0x4463] = "\x61\x65",
-+  [0x4464] = "\x61\x66", [0x4465] = "\x61\x67", [0x4466] = "\x61\x68",
-+  [0x4467] = "\x61\x69", [0x4468] = "\x61\x6a", [0x4469] = "\x61\x6b",
-+  [0x446a] = "\x61\x6c", [0x446b] = "\x61\x6d", [0x446c] = "\x61\x6e",
-+  [0x446d] = "\x61\x6f", [0x446e] = "\x61\x70", [0x446f] = "\x61\x71",
-+  [0x4470] = "\x61\x72", [0x4471] = "\x61\x73", [0x4472] = "\x61\x74",
-+  [0x4473] = "\x61\x75", [0x4474] = "\x61\x76", [0x4475] = "\x61\x77",
-+  [0x4476] = "\x61\x78", [0x4477] = "\x61\x79", [0x4478] = "\x61\x7a",
-+  [0x4479] = "\x61\x7b", [0x447a] = "\x61\x7c", [0x447b] = "\x61\x7d",
-+  [0x447c] = "\x61\x7e", [0x447d] = "\x61\x7f", [0x447e] = "\x61\x80",
-+  [0x447f] = "\x61\x81", [0x4480] = "\x61\x82", [0x4481] = "\x61\x83",
-+  [0x4482] = "\x61\x84", [0x4483] = "\x61\x85", [0x4484] = "\x61\x86",
-+  [0x4485] = "\x61\x87", [0x4486] = "\x61\x88", [0x4487] = "\x61\x89",
-+  [0x4488] = "\x61\x8a", [0x4489] = "\x61\x8b", [0x448a] = "\x61\x8c",
-+  [0x448b] = "\x61\x8d", [0x448c] = "\x61\x8e", [0x448d] = "\x61\x8f",
-+  [0x448e] = "\x61\x90", [0x448f] = "\x61\x91", [0x4490] = "\x61\x92",
-+  [0x4491] = "\x61\x93", [0x4492] = "\x61\x94", [0x4493] = "\x61\x95",
-+  [0x4494] = "\x61\x96", [0x4495] = "\x61\x97", [0x4496] = "\x61\x98",
-+  [0x4497] = "\x61\x99", [0x4498] = "\x61\x9a", [0x4499] = "\x61\x9b",
-+  [0x449a] = "\x61\x9c", [0x449b] = "\x61\x9d", [0x449c] = "\x61\x9e",
-+  [0x449d] = "\x61\x9f", [0x449e] = "\x61\xa0", [0x449f] = "\x61\xa1",
-+  [0x44a0] = "\x61\xa2", [0x44a1] = "\x61\xa3", [0x44a2] = "\x61\xa4",
-+  [0x44a3] = "\x61\xa5", [0x44a4] = "\x61\xa6", [0x44a5] = "\x61\xa7",
-+  [0x44a6] = "\x61\xa8", [0x44a7] = "\x61\xa9", [0x44a8] = "\x61\xaa",
-+  [0x44a9] = "\x61\xab", [0x44aa] = "\x61\xac", [0x44ab] = "\x61\xad",
-+  [0x44ac] = "\x61\xae", [0x44ad] = "\x61\xaf", [0x44ae] = "\x61\xb0",
-+  [0x44af] = "\x61\xb1", [0x44b0] = "\x61\xb2", [0x44b1] = "\x61\xb3",
-+  [0x44b2] = "\x61\xb4", [0x44b3] = "\x61\xb5", [0x44b4] = "\x61\xb6",
-+  [0x44b5] = "\x61\xb7", [0x44b6] = "\x61\xb8", [0x44b7] = "\x61\xb9",
-+  [0x44b8] = "\x61\xba", [0x44b9] = "\x61\xbb", [0x44ba] = "\x61\xbc",
-+  [0x44bb] = "\x61\xbd", [0x44bc] = "\x61\xbe", [0x44bd] = "\x61\xbf",
-+  [0x44be] = "\x61\xc0", [0x44bf] = "\x61\xc1", [0x44c0] = "\x61\xc2",
-+  [0x44c1] = "\x61\xc3", [0x44c2] = "\x61\xc4", [0x44c3] = "\x61\xc5",
-+  [0x44c4] = "\x61\xc6", [0x44c5] = "\x61\xc7", [0x44c6] = "\x61\xc8",
-+  [0x44c7] = "\x61\xc9", [0x44c8] = "\x61\xca", [0x44c9] = "\x61\xcb",
-+  [0x44ca] = "\x61\xcc", [0x44cb] = "\x61\xcd", [0x44cc] = "\x61\xce",
-+  [0x44cd] = "\x61\xcf", [0x44ce] = "\x61\xd0", [0x44cf] = "\x61\xd1",
-+  [0x44d0] = "\x61\xd2", [0x44d1] = "\x61\xd3", [0x44d2] = "\x61\xd4",
-+  [0x44d3] = "\x61\xd5", [0x44d4] = "\x61\xd6", [0x44d5] = "\x61\xd7",
-+  [0x44d6] = "\x61\xd8", [0x44d7] = "\x61\xd9", [0x44d8] = "\x61\xda",
-+  [0x44d9] = "\x61\xdb", [0x44da] = "\x61\xdc", [0x44db] = "\x61\xdd",
-+  [0x44dc] = "\x61\xde", [0x44dd] = "\x61\xdf", [0x44de] = "\x61\xe0",
-+  [0x44df] = "\x61\xe1", [0x44e0] = "\x61\xe2", [0x44e1] = "\x61\xe3",
-+  [0x44e2] = "\x61\xe4", [0x44e3] = "\x61\xe5", [0x44e4] = "\x61\xe6",
-+  [0x44e5] = "\x61\xe7", [0x44e6] = "\x61\xe8", [0x44e7] = "\x61\xe9",
-+  [0x44e8] = "\x61\xea", [0x44e9] = "\x61\xeb", [0x44ea] = "\x61\xec",
-+  [0x44eb] = "\x61\xed", [0x44ec] = "\x61\xee", [0x44ed] = "\x61\xef",
-+  [0x44ee] = "\x61\xf0", [0x44ef] = "\x61\xf1", [0x44f0] = "\x61\xf2",
-+  [0x44f1] = "\x61\xf3", [0x44f2] = "\x61\xf4", [0x44f3] = "\x61\xf5",
-+  [0x44f4] = "\x61\xf6", [0x44f5] = "\x61\xf7", [0x44f6] = "\x61\xf8",
-+  [0x44f7] = "\x61\xf9", [0x44f8] = "\x61\xfa", [0x44f9] = "\x61\xfb",
-+  [0x44fa] = "\x61\xfc", [0x44fb] = "\x61\xfd", [0x44fc] = "\x61\xfe",
-+  [0x44fd] = "\x61\xff", [0x44fe] = "\x62\x00", [0x44ff] = "\x62\x01",
-+  [0x4500] = "\x62\x02", [0x4501] = "\x62\x03", [0x4502] = "\x62\x04",
-+  [0x4503] = "\x62\x05", [0x4504] = "\x62\x06", [0x4505] = "\x62\x07",
-+  [0x4506] = "\x62\x08", [0x4507] = "\x62\x09", [0x4508] = "\x62\x0a",
-+  [0x4509] = "\x62\x0b", [0x450a] = "\x62\x0c", [0x450b] = "\x62\x0d",
-+  [0x450c] = "\x62\x0e", [0x450d] = "\x62\x0f", [0x450e] = "\x62\x10",
-+  [0x450f] = "\x62\x11", [0x4510] = "\x62\x12", [0x4511] = "\x62\x13",
-+  [0x4512] = "\x62\x14", [0x4513] = "\x62\x15", [0x4514] = "\x62\x16",
-+  [0x4515] = "\x62\x17", [0x4516] = "\x62\x18", [0x4517] = "\x62\x19",
-+  [0x4518] = "\x62\x1a", [0x4519] = "\x62\x1b", [0x451a] = "\x62\x1c",
-+  [0x451b] = "\x62\x1d", [0x451c] = "\x62\x1e", [0x451d] = "\x62\x1f",
-+  [0x451e] = "\x62\x20", [0x451f] = "\x62\x21", [0x4520] = "\x62\x22",
-+  [0x4521] = "\x62\x23", [0x4522] = "\x62\x24", [0x4523] = "\x62\x25",
-+  [0x4524] = "\x62\x26", [0x4525] = "\x62\x27", [0x4526] = "\x62\x28",
-+  [0x4527] = "\x62\x29", [0x4528] = "\x62\x2a", [0x4529] = "\x62\x2b",
-+  [0x452a] = "\x62\x2c", [0x452b] = "\x62\x2d", [0x452c] = "\x62\x2e",
-+  [0x452d] = "\x62\x2f", [0x452e] = "\x62\x30", [0x452f] = "\x62\x31",
-+  [0x4530] = "\x62\x32", [0x4531] = "\x62\x33", [0x4532] = "\x62\x34",
-+  [0x4533] = "\x62\x35", [0x4534] = "\x62\x36", [0x4535] = "\x62\x37",
-+  [0x4536] = "\x62\x38", [0x4537] = "\x62\x39", [0x4538] = "\x62\x3a",
-+  [0x4539] = "\x62\x3b", [0x453a] = "\x62\x3c", [0x453b] = "\x62\x3d",
-+  [0x453c] = "\x62\x3e", [0x453d] = "\x62\x3f", [0x453e] = "\x62\x40",
-+  [0x453f] = "\x62\x41", [0x4540] = "\x62\x42", [0x4541] = "\x62\x43",
-+  [0x4542] = "\x62\x44", [0x4543] = "\x62\x45", [0x4544] = "\x62\x46",
-+  [0x4545] = "\x62\x47", [0x4546] = "\x62\x48", [0x4547] = "\x62\x49",
-+  [0x4548] = "\x62\x4a", [0x4549] = "\x62\x4b", [0x454a] = "\x62\x4c",
-+  [0x454b] = "\x62\x4d", [0x454c] = "\x62\x4e", [0x454d] = "\x62\x4f",
-+  [0x454e] = "\x62\x50", [0x454f] = "\x62\x51", [0x4550] = "\x62\x52",
-+  [0x4551] = "\x62\x53", [0x4552] = "\x62\x54", [0x4553] = "\x62\x55",
-+  [0x4554] = "\x62\x56", [0x4555] = "\x62\x57", [0x4556] = "\x62\x58",
-+  [0x4557] = "\x62\x59", [0x4558] = "\x62\x5a", [0x4559] = "\x62\x5b",
-+  [0x455a] = "\x62\x5c", [0x455b] = "\x62\x5d", [0x455c] = "\x62\x5e",
-+  [0x455d] = "\x62\x5f", [0x455e] = "\x62\x60", [0x455f] = "\x62\x61",
-+  [0x4560] = "\x62\x62", [0x4561] = "\x62\x63", [0x4562] = "\x62\x64",
-+  [0x4563] = "\x62\x65", [0x4564] = "\x62\x66", [0x4565] = "\x62\x67",
-+  [0x4566] = "\x62\x68", [0x4567] = "\x62\x69", [0x4568] = "\x62\x6a",
-+  [0x4569] = "\x62\x6b", [0x456a] = "\x62\x6c", [0x456b] = "\x62\x6d",
-+  [0x456c] = "\x62\x6e", [0x456d] = "\x62\x6f", [0x456e] = "\x62\x70",
-+  [0x456f] = "\x62\x71", [0x4570] = "\x62\x72", [0x4571] = "\x62\x73",
-+  [0x4572] = "\x62\x74", [0x4573] = "\x62\x75", [0x4574] = "\x62\x76",
-+  [0x4575] = "\x62\x77", [0x4576] = "\x62\x78", [0x4577] = "\x62\x79",
-+  [0x4578] = "\x62\x7a", [0x4579] = "\x62\x7b", [0x457a] = "\x62\x7c",
-+  [0x457b] = "\x62\x7d", [0x457c] = "\x62\x7e", [0x457d] = "\x62\x7f",
-+  [0x457e] = "\x62\x80", [0x457f] = "\x62\x81", [0x4580] = "\x62\x82",
-+  [0x4581] = "\x62\x83", [0x4582] = "\x62\x84", [0x4583] = "\x62\x85",
-+  [0x4584] = "\x62\x86", [0x4585] = "\x62\x87", [0x4586] = "\x62\x88",
-+  [0x4587] = "\x62\x89", [0x4588] = "\x62\x8a", [0x4589] = "\x62\x8b",
-+  [0x458a] = "\x62\x8c", [0x458b] = "\x62\x8d", [0x458c] = "\x62\x8e",
-+  [0x458d] = "\x62\x8f", [0x458e] = "\x62\x90", [0x458f] = "\x62\x91",
-+  [0x4590] = "\x62\x92", [0x4591] = "\x62\x93", [0x4592] = "\x62\x94",
-+  [0x4593] = "\x62\x95", [0x4594] = "\x62\x96", [0x4595] = "\x62\x97",
-+  [0x4596] = "\x62\x98", [0x4597] = "\x62\x99", [0x4598] = "\x62\x9a",
-+  [0x4599] = "\x62\x9b", [0x459a] = "\x62\x9c", [0x459b] = "\x62\x9d",
-+  [0x459c] = "\x62\x9e", [0x459d] = "\x62\x9f", [0x459e] = "\x62\xa0",
-+  [0x459f] = "\x62\xa1", [0x45a0] = "\x62\xa2", [0x45a1] = "\x62\xa3",
-+  [0x45a2] = "\x62\xa4", [0x45a3] = "\x62\xa5", [0x45a4] = "\x62\xa6",
-+  [0x45a5] = "\x62\xa7", [0x45a6] = "\x62\xa8", [0x45a7] = "\x62\xa9",
-+  [0x45a8] = "\x62\xaa", [0x45a9] = "\x62\xab", [0x45aa] = "\x62\xac",
-+  [0x45ab] = "\x62\xad", [0x45ac] = "\x62\xae", [0x45ad] = "\x62\xaf",
-+  [0x45ae] = "\x62\xb0", [0x45af] = "\x62\xb1", [0x45b0] = "\x62\xb2",
-+  [0x45b1] = "\x62\xb3", [0x45b2] = "\x62\xb4", [0x45b3] = "\x62\xb5",
-+  [0x45b4] = "\x62\xb6", [0x45b5] = "\x62\xb7", [0x45b6] = "\x62\xb8",
-+  [0x45b7] = "\x62\xb9", [0x45b8] = "\x62\xba", [0x45b9] = "\x62\xbb",
-+  [0x45ba] = "\x62\xbc", [0x45bb] = "\x62\xbd", [0x45bc] = "\x62\xbe",
-+  [0x45bd] = "\x62\xbf", [0x45be] = "\x62\xc0", [0x45bf] = "\x62\xc1",
-+  [0x45c0] = "\x62\xc2", [0x45c1] = "\x62\xc3", [0x45c2] = "\x62\xc4",
-+  [0x45c3] = "\x62\xc5", [0x45c4] = "\x62\xc6", [0x45c5] = "\x62\xc7",
-+  [0x45c6] = "\x62\xc8", [0x45c7] = "\x62\xc9", [0x45c8] = "\x62\xca",
-+  [0x45c9] = "\x62\xcb", [0x45ca] = "\x62\xcc", [0x45cb] = "\x62\xcd",
-+  [0x45cc] = "\xfe\x7d", [0x45cd] = "\x62\xce", [0x45ce] = "\x62\xcf",
-+  [0x45cf] = "\x62\xd0", [0x45d0] = "\x62\xd1", [0x45d1] = "\x62\xd2",
-+  [0x45d2] = "\x62\xd3", [0x45d3] = "\x62\xd4", [0x45d4] = "\x62\xd5",
-+  [0x45d5] = "\x62\xd6", [0x45d6] = "\x62\xd7", [0x45d7] = "\x62\xd8",
-+  [0x45d8] = "\x62\xd9", [0x45d9] = "\x62\xda", [0x45da] = "\x62\xdb",
-+  [0x45db] = "\x62\xdc", [0x45dc] = "\x62\xdd", [0x45dd] = "\x62\xde",
-+  [0x45de] = "\x62\xdf", [0x45df] = "\x62\xe0", [0x45e0] = "\x62\xe1",
-+  [0x45e1] = "\xfe\x7c", [0x45e2] = "\x62\xe2", [0x45e3] = "\x62\xe3",
-+  [0x45e4] = "\x62\xe4", [0x45e5] = "\x62\xe5", [0x45e6] = "\x62\xe6",
-+  [0x45e7] = "\x62\xe7", [0x45e8] = "\x62\xe8", [0x45e9] = "\x62\xe9",
-+  [0x45ea] = "\x62\xea", [0x45eb] = "\x62\xeb", [0x45ec] = "\x62\xec",
-+  [0x45ed] = "\x62\xed", [0x45ee] = "\x62\xee", [0x45ef] = "\x62\xef",
-+  [0x45f0] = "\x62\xf0", [0x45f1] = "\x62\xf1", [0x45f2] = "\x62\xf2",
-+  [0x45f3] = "\x62\xf3", [0x45f4] = "\x62\xf4", [0x45f5] = "\x62\xf5",
-+  [0x45f6] = "\x62\xf6", [0x45f7] = "\x62\xf7", [0x45f8] = "\x62\xf8",
-+  [0x45f9] = "\x62\xf9", [0x45fa] = "\x62\xfa", [0x45fb] = "\x62\xfb",
-+  [0x45fc] = "\x62\xfc", [0x45fd] = "\x62\xfd", [0x45fe] = "\x62\xfe",
-+  [0x45ff] = "\x62\xff", [0x4600] = "\x63\x00", [0x4601] = "\x63\x01",
-+  [0x4602] = "\x63\x02", [0x4603] = "\x63\x03", [0x4604] = "\x63\x04",
-+  [0x4605] = "\x63\x05", [0x4606] = "\x63\x06", [0x4607] = "\x63\x07",
-+  [0x4608] = "\x63\x08", [0x4609] = "\x63\x09", [0x460a] = "\x63\x0a",
-+  [0x460b] = "\x63\x0b", [0x460c] = "\x63\x0c", [0x460d] = "\x63\x0d",
-+  [0x460e] = "\x63\x0e", [0x460f] = "\x63\x0f", [0x4610] = "\x63\x10",
-+  [0x4611] = "\x63\x11", [0x4612] = "\x63\x12", [0x4613] = "\x63\x13",
-+  [0x4614] = "\x63\x14", [0x4615] = "\x63\x15", [0x4616] = "\x63\x16",
-+  [0x4617] = "\x63\x17", [0x4618] = "\x63\x18", [0x4619] = "\x63\x19",
-+  [0x461a] = "\x63\x1a", [0x461b] = "\x63\x1b", [0x461c] = "\x63\x1c",
-+  [0x461d] = "\x63\x1d", [0x461e] = "\x63\x1e", [0x461f] = "\x63\x1f",
-+  [0x4620] = "\x63\x20", [0x4621] = "\x63\x21", [0x4622] = "\x63\x22",
-+  [0x4623] = "\x63\x23", [0x4624] = "\x63\x24", [0x4625] = "\x63\x25",
-+  [0x4626] = "\x63\x26", [0x4627] = "\x63\x27", [0x4628] = "\x63\x28",
-+  [0x4629] = "\x63\x29", [0x462a] = "\x63\x2a", [0x462b] = "\x63\x2b",
-+  [0x462c] = "\x63\x2c", [0x462d] = "\x63\x2d", [0x462e] = "\x63\x2e",
-+  [0x462f] = "\x63\x2f", [0x4630] = "\x63\x30", [0x4631] = "\x63\x31",
-+  [0x4632] = "\x63\x32", [0x4633] = "\x63\x33", [0x4634] = "\x63\x34",
-+  [0x4635] = "\x63\x35", [0x4636] = "\x63\x36", [0x4637] = "\x63\x37",
-+  [0x4638] = "\x63\x38", [0x4639] = "\x63\x39", [0x463a] = "\x63\x3a",
-+  [0x463b] = "\x63\x3b", [0x463c] = "\x63\x3c", [0x463d] = "\x63\x3d",
-+  [0x463e] = "\x63\x3e", [0x463f] = "\x63\x3f", [0x4640] = "\x63\x40",
-+  [0x4641] = "\x63\x41", [0x4642] = "\x63\x42", [0x4643] = "\x63\x43",
-+  [0x4644] = "\x63\x44", [0x4645] = "\x63\x45", [0x4646] = "\x63\x46",
-+  [0x4647] = "\x63\x47", [0x4648] = "\x63\x48", [0x4649] = "\x63\x49",
-+  [0x464a] = "\x63\x4a", [0x464b] = "\x63\x4b", [0x464c] = "\x63\x4c",
-+  [0x464d] = "\x63\x4d", [0x464e] = "\x63\x4e", [0x464f] = "\x63\x4f",
-+  [0x4650] = "\x63\x50", [0x4651] = "\x63\x51", [0x4652] = "\x63\x52",
-+  [0x4653] = "\x63\x53", [0x4654] = "\x63\x54", [0x4655] = "\x63\x55",
-+  [0x4656] = "\x63\x56", [0x4657] = "\x63\x57", [0x4658] = "\x63\x58",
-+  [0x4659] = "\x63\x59", [0x465a] = "\x63\x5a", [0x465b] = "\x63\x5b",
-+  [0x465c] = "\x63\x5c", [0x465d] = "\x63\x5d", [0x465e] = "\x63\x5e",
-+  [0x465f] = "\x63\x5f", [0x4660] = "\x63\x60", [0x4661] = "\x63\x61",
-+  [0x4662] = "\x63\x62", [0x4663] = "\x63\x63", [0x4664] = "\x63\x64",
-+  [0x4665] = "\x63\x65", [0x4666] = "\x63\x66", [0x4667] = "\x63\x67",
-+  [0x4668] = "\x63\x68", [0x4669] = "\x63\x69", [0x466a] = "\x63\x6a",
-+  [0x466b] = "\x63\x6b", [0x466c] = "\x63\x6c", [0x466d] = "\x63\x6d",
-+  [0x466e] = "\x63\x6e", [0x466f] = "\x63\x6f", [0x4670] = "\x63\x70",
-+  [0x4671] = "\x63\x71", [0x4672] = "\x63\x72", [0x4673] = "\x63\x73",
-+  [0x4674] = "\x63\x74", [0x4675] = "\x63\x75", [0x4676] = "\x63\x76",
-+  [0x4677] = "\x63\x77", [0x4678] = "\x63\x78", [0x4679] = "\x63\x79",
-+  [0x467a] = "\x63\x7a", [0x467b] = "\x63\x7b", [0x467c] = "\x63\x7c",
-+  [0x467d] = "\x63\x7d", [0x467e] = "\x63\x7e", [0x467f] = "\x63\x7f",
-+  [0x4680] = "\x63\x80", [0x4681] = "\x63\x81", [0x4682] = "\x63\x82",
-+  [0x4683] = "\x63\x83", [0x4684] = "\x63\x84", [0x4685] = "\x63\x85",
-+  [0x4686] = "\x63\x86", [0x4687] = "\x63\x87", [0x4688] = "\x63\x88",
-+  [0x4689] = "\x63\x89", [0x468a] = "\x63\x8a", [0x468b] = "\x63\x8b",
-+  [0x468c] = "\x63\x8c", [0x468d] = "\x63\x8d", [0x468e] = "\x63\x8e",
-+  [0x468f] = "\x63\x8f", [0x4690] = "\x63\x90", [0x4691] = "\x63\x91",
-+  [0x4692] = "\x63\x92", [0x4693] = "\x63\x93", [0x4694] = "\x63\x94",
-+  [0x4695] = "\x63\x95", [0x4696] = "\x63\x96", [0x4697] = "\x63\x97",
-+  [0x4698] = "\x63\x98", [0x4699] = "\x63\x99", [0x469a] = "\x63\x9a",
-+  [0x469b] = "\x63\x9b", [0x469c] = "\x63\x9c", [0x469d] = "\x63\x9d",
-+  [0x469e] = "\x63\x9e", [0x469f] = "\x63\x9f", [0x46a0] = "\x63\xa0",
-+  [0x46a1] = "\x63\xa1", [0x46a2] = "\x63\xa2", [0x46a3] = "\xfe\x80",
-+  [0x46a4] = "\x63\xa3", [0x46a5] = "\x63\xa4", [0x46a6] = "\x63\xa5",
-+  [0x46a7] = "\x63\xa6", [0x46a8] = "\x63\xa7", [0x46a9] = "\xfe\x81",
-+  [0x46aa] = "\x63\xa8", [0x46ab] = "\x63\xa9", [0x46ac] = "\x63\xaa",
-+  [0x46ad] = "\x63\xab", [0x46ae] = "\x63\xac", [0x46af] = "\x63\xad",
-+  [0x46b0] = "\x63\xae", [0x46b1] = "\x63\xaf", [0x46b2] = "\x63\xb0",
-+  [0x46b3] = "\x63\xb1", [0x46b4] = "\x63\xb2", [0x46b5] = "\x63\xb3",
-+  [0x46b6] = "\x63\xb4", [0x46b7] = "\x63\xb5", [0x46b8] = "\x63\xb6",
-+  [0x46b9] = "\x63\xb7", [0x46ba] = "\x63\xb8", [0x46bb] = "\x63\xb9",
-+  [0x46bc] = "\x63\xba", [0x46bd] = "\x63\xbb", [0x46be] = "\x63\xbc",
-+  [0x46bf] = "\x63\xbd", [0x46c0] = "\x63\xbe", [0x46c1] = "\x63\xbf",
-+  [0x46c2] = "\x63\xc0", [0x46c3] = "\x63\xc1", [0x46c4] = "\x63\xc2",
-+  [0x46c5] = "\x63\xc3", [0x46c6] = "\x63\xc4", [0x46c7] = "\x63\xc5",
-+  [0x46c8] = "\x63\xc6", [0x46c9] = "\x63\xc7", [0x46ca] = "\x63\xc8",
-+  [0x46cb] = "\x63\xc9", [0x46cc] = "\x63\xca", [0x46cd] = "\x63\xcb",
-+  [0x46ce] = "\x63\xcc", [0x46cf] = "\x63\xcd", [0x46d0] = "\x63\xce",
-+  [0x46d1] = "\x63\xcf", [0x46d2] = "\x63\xd0", [0x46d3] = "\x63\xd1",
-+  [0x46d4] = "\x63\xd2", [0x46d5] = "\x63\xd3", [0x46d6] = "\x63\xd4",
-+  [0x46d7] = "\x63\xd5", [0x46d8] = "\x63\xd6", [0x46d9] = "\x63\xd7",
-+  [0x46da] = "\x63\xd8", [0x46db] = "\x63\xd9", [0x46dc] = "\x63\xda",
-+  [0x46dd] = "\x63\xdb", [0x46de] = "\x63\xdc", [0x46df] = "\x63\xdd",
-+  [0x46e0] = "\x63\xde", [0x46e1] = "\x63\xdf", [0x46e2] = "\x63\xe0",
-+  [0x46e3] = "\x63\xe1", [0x46e4] = "\x63\xe2", [0x46e5] = "\x63\xe3",
-+  [0x46e6] = "\x63\xe4", [0x46e7] = "\x63\xe5", [0x46e8] = "\x63\xe6",
-+  [0x46e9] = "\x63\xe7", [0x46ea] = "\x63\xe8", [0x46eb] = "\x63\xe9",
-+  [0x46ec] = "\x63\xea", [0x46ed] = "\x63\xeb", [0x46ee] = "\x63\xec",
-+  [0x46ef] = "\x63\xed", [0x46f0] = "\x63\xee", [0x46f1] = "\x63\xef",
-+  [0x46f2] = "\x63\xf0", [0x46f3] = "\x63\xf1", [0x46f4] = "\x63\xf2",
-+  [0x46f5] = "\x63\xf3", [0x46f6] = "\x63\xf4", [0x46f7] = "\x63\xf5",
-+  [0x46f8] = "\x63\xf6", [0x46f9] = "\x63\xf7", [0x46fa] = "\x63\xf8",
-+  [0x46fb] = "\x63\xf9", [0x46fc] = "\xfe\x82", [0x46fd] = "\x63\xfa",
-+  [0x46fe] = "\x63\xfb", [0x46ff] = "\x63\xfc", [0x4700] = "\x63\xfd",
-+  [0x4701] = "\x63\xfe", [0x4702] = "\x63\xff", [0x4703] = "\x64\x00",
-+  [0x4704] = "\x64\x01", [0x4705] = "\x64\x02", [0x4706] = "\x64\x03",
-+  [0x4707] = "\x64\x04", [0x4708] = "\x64\x05", [0x4709] = "\x64\x06",
-+  [0x470a] = "\x64\x07", [0x470b] = "\x64\x08", [0x470c] = "\x64\x09",
-+  [0x470d] = "\xfe\x83", [0x470e] = "\x64\x0a", [0x470f] = "\x64\x0b",
-+  [0x4710] = "\x64\x0c", [0x4711] = "\x64\x0d", [0x4712] = "\x64\x0e",
-+  [0x4713] = "\x64\x0f", [0x4714] = "\x64\x10", [0x4715] = "\x64\x11",
-+  [0x4716] = "\x64\x12", [0x4717] = "\x64\x13", [0x4718] = "\x64\x14",
-+  [0x4719] = "\x64\x15", [0x471a] = "\x64\x16", [0x471b] = "\x64\x17",
-+  [0x471c] = "\x64\x18", [0x471d] = "\x64\x19", [0x471e] = "\x64\x1a",
-+  [0x471f] = "\x64\x1b", [0x4720] = "\x64\x1c", [0x4721] = "\x64\x1d",
-+  [0x4722] = "\x64\x1e", [0x4723] = "\x64\x1f", [0x4724] = "\x64\x20",
-+  [0x4725] = "\x64\x21", [0x4726] = "\x64\x22", [0x4727] = "\x64\x23",
-+  [0x4728] = "\x64\x24", [0x4729] = "\x64\x25", [0x472a] = "\x64\x26",
-+  [0x472b] = "\x64\x27", [0x472c] = "\x64\x28", [0x472d] = "\x64\x29",
-+  [0x472e] = "\x64\x2a", [0x472f] = "\x64\x2b", [0x4730] = "\x64\x2c",
-+  [0x4731] = "\x64\x2d", [0x4732] = "\x64\x2e", [0x4733] = "\x64\x2f",
-+  [0x4734] = "\x64\x30", [0x4735] = "\x64\x31", [0x4736] = "\x64\x32",
-+  [0x4737] = "\x64\x33", [0x4738] = "\x64\x34", [0x4739] = "\x64\x35",
-+  [0x473a] = "\x64\x36", [0x473b] = "\x64\x37", [0x473c] = "\x64\x38",
-+  [0x473d] = "\x64\x39", [0x473e] = "\x64\x3a", [0x473f] = "\x64\x3b",
-+  [0x4740] = "\x64\x3c", [0x4741] = "\x64\x3d", [0x4742] = "\x64\x3e",
-+  [0x4743] = "\x64\x3f", [0x4744] = "\x64\x40", [0x4745] = "\x64\x41",
-+  [0x4746] = "\x64\x42", [0x4747] = "\x64\x43", [0x4748] = "\x64\x44",
-+  [0x4749] = "\x64\x45", [0x474a] = "\x64\x46", [0x474b] = "\x64\x47",
-+  [0x474c] = "\x64\x48", [0x474d] = "\x64\x49", [0x474e] = "\x64\x4a",
-+  [0x474f] = "\x64\x4b", [0x4750] = "\x64\x4c", [0x4751] = "\x64\x4d",
-+  [0x4752] = "\x64\x4e", [0x4753] = "\x64\x4f", [0x4754] = "\x64\x50",
-+  [0x4755] = "\x64\x51", [0x4756] = "\x64\x52", [0x4757] = "\x64\x53",
-+  [0x4758] = "\x64\x54", [0x4759] = "\x64\x55", [0x475a] = "\x64\x56",
-+  [0x475b] = "\x64\x57", [0x475c] = "\x64\x58", [0x475d] = "\x64\x59",
-+  [0x475e] = "\x64\x5a", [0x475f] = "\x64\x5b", [0x4760] = "\x64\x5c",
-+  [0x4761] = "\x64\x5d", [0x4762] = "\x64\x5e", [0x4763] = "\x64\x5f",
-+  [0x4764] = "\x64\x60", [0x4765] = "\x64\x61", [0x4766] = "\x64\x62",
-+  [0x4767] = "\x64\x63", [0x4768] = "\x64\x64", [0x4769] = "\x64\x65",
-+  [0x476a] = "\x64\x66", [0x476b] = "\x64\x67", [0x476c] = "\x64\x68",
-+  [0x476d] = "\x64\x69", [0x476e] = "\x64\x6a", [0x476f] = "\x64\x6b",
-+  [0x4770] = "\x64\x6c", [0x4771] = "\x64\x6d", [0x4772] = "\x64\x6e",
-+  [0x4773] = "\x64\x6f", [0x4774] = "\x64\x70", [0x4775] = "\x64\x71",
-+  [0x4776] = "\x64\x72", [0x4777] = "\x64\x73", [0x4778] = "\x64\x74",
-+  [0x4779] = "\x64\x75", [0x477a] = "\x64\x76", [0x477b] = "\x64\x77",
-+  [0x477c] = "\x64\x78", [0x477d] = "\x64\x79", [0x477e] = "\x64\x7a",
-+  [0x477f] = "\x64\x7b", [0x4780] = "\x64\x7c", [0x4781] = "\x64\x7d",
-+  [0x4782] = "\x64\x7e", [0x4783] = "\x64\x7f", [0x4784] = "\x64\x80",
-+  [0x4785] = "\x64\x81", [0x4786] = "\x64\x82", [0x4787] = "\x64\x83",
-+  [0x4788] = "\x64\x84", [0x4789] = "\x64\x85", [0x478a] = "\x64\x86",
-+  [0x478b] = "\x64\x87", [0x478c] = "\x64\x88", [0x478d] = "\x64\x89",
-+  [0x478e] = "\x64\x8a", [0x478f] = "\x64\x8b", [0x4790] = "\x64\x8c",
-+  [0x4791] = "\x64\x8d", [0x4792] = "\x64\x8e", [0x4793] = "\x64\x8f",
-+  [0x4794] = "\x64\x90", [0x4795] = "\x64\x91", [0x4796] = "\x64\x92",
-+  [0x4797] = "\x64\x93", [0x4798] = "\x64\x94", [0x4799] = "\x64\x95",
-+  [0x479a] = "\x64\x96", [0x479b] = "\x64\x97", [0x479c] = "\x64\x98",
-+  [0x479d] = "\x64\x99", [0x479e] = "\x64\x9a", [0x479f] = "\x64\x9b",
-+  [0x47a0] = "\x64\x9c", [0x47a1] = "\x64\x9d", [0x47a2] = "\x64\x9e",
-+  [0x47a3] = "\x64\x9f", [0x47a4] = "\x64\xa0", [0x47a5] = "\x64\xa1",
-+  [0x47a6] = "\x64\xa2", [0x47a7] = "\x64\xa3", [0x47a8] = "\x64\xa4",
-+  [0x47a9] = "\x64\xa5", [0x47aa] = "\x64\xa6", [0x47ab] = "\x64\xa7",
-+  [0x47ac] = "\x64\xa8", [0x47ad] = "\x64\xa9", [0x47ae] = "\x64\xaa",
-+  [0x47af] = "\x64\xab", [0x47b0] = "\x64\xac", [0x47b1] = "\x64\xad",
-+  [0x47b2] = "\x64\xae", [0x47b3] = "\x64\xaf", [0x47b4] = "\x64\xb0",
-+  [0x47b5] = "\x64\xb1", [0x47b6] = "\x64\xb2", [0x47b7] = "\x64\xb3",
-+  [0x47b8] = "\x64\xb4", [0x47b9] = "\x64\xb5", [0x47ba] = "\x64\xb6",
-+  [0x47bb] = "\x64\xb7", [0x47bc] = "\x64\xb8", [0x47bd] = "\x64\xb9",
-+  [0x47be] = "\x64\xba", [0x47bf] = "\x64\xbb", [0x47c0] = "\x64\xbc",
-+  [0x47c1] = "\x64\xbd", [0x47c2] = "\x64\xbe", [0x47c3] = "\x64\xbf",
-+  [0x47c4] = "\x64\xc0", [0x47c5] = "\x64\xc1", [0x47c6] = "\x64\xc2",
-+  [0x47c7] = "\x64\xc3", [0x47c8] = "\x64\xc4", [0x47c9] = "\x64\xc5",
-+  [0x47ca] = "\x64\xc6", [0x47cb] = "\x64\xc7", [0x47cc] = "\x64\xc8",
-+  [0x47cd] = "\x64\xc9", [0x47ce] = "\x64\xca", [0x47cf] = "\x64\xcb",
-+  [0x47d0] = "\x64\xcc", [0x47d1] = "\x64\xcd", [0x47d2] = "\x64\xce",
-+  [0x47d3] = "\x64\xcf", [0x47d4] = "\x64\xd0", [0x47d5] = "\x64\xd1",
-+  [0x47d6] = "\x64\xd2", [0x47d7] = "\x64\xd3", [0x47d8] = "\x64\xd4",
-+  [0x47d9] = "\x64\xd5", [0x47da] = "\x64\xd6", [0x47db] = "\x64\xd7",
-+  [0x47dc] = "\x64\xd8", [0x47dd] = "\x64\xd9", [0x47de] = "\x64\xda",
-+  [0x47df] = "\x64\xdb", [0x47e0] = "\x64\xdc", [0x47e1] = "\x64\xdd",
-+  [0x47e2] = "\x64\xde", [0x47e3] = "\x64\xdf", [0x47e4] = "\x64\xe0",
-+  [0x47e5] = "\x64\xe1", [0x47e6] = "\x64\xe2", [0x47e7] = "\x64\xe3",
-+  [0x47e8] = "\x64\xe4", [0x47e9] = "\x64\xe5", [0x47ea] = "\x64\xe6",
-+  [0x47eb] = "\x64\xe7", [0x47ec] = "\x64\xe8", [0x47ed] = "\x64\xe9",
-+  [0x47ee] = "\x64\xea", [0x47ef] = "\x64\xeb", [0x47f0] = "\x64\xec",
-+  [0x47f1] = "\x64\xed", [0x47f2] = "\x64\xee", [0x47f3] = "\x64\xef",
-+  [0x47f4] = "\x64\xf0", [0x47f5] = "\x64\xf1", [0x47f6] = "\x64\xf2",
-+  [0x47f7] = "\x64\xf3", [0x47f8] = "\x64\xf4", [0x47f9] = "\x64\xf5",
-+  [0x47fa] = "\x64\xf6", [0x47fb] = "\x64\xf7", [0x47fc] = "\x64\xf8",
-+  [0x47fd] = "\x64\xf9", [0x47fe] = "\x64\xfa", [0x47ff] = "\x64\xfb",
-+  [0x4800] = "\x64\xfc", [0x4801] = "\x64\xfd", [0x4802] = "\x64\xfe",
-+  [0x4803] = "\x64\xff", [0x4804] = "\x65\x00", [0x4805] = "\x65\x01",
-+  [0x4806] = "\x65\x02", [0x4807] = "\x65\x03", [0x4808] = "\x65\x04",
-+  [0x4809] = "\x65\x05", [0x480a] = "\x65\x06", [0x480b] = "\x65\x07",
-+  [0x480c] = "\x65\x08", [0x480d] = "\x65\x09", [0x480e] = "\x65\x0a",
-+  [0x480f] = "\x65\x0b", [0x4810] = "\x65\x0c", [0x4811] = "\x65\x0d",
-+  [0x4812] = "\x65\x0e", [0x4813] = "\x65\x0f", [0x4814] = "\x65\x10",
-+  [0x4815] = "\x65\x11", [0x4816] = "\x65\x12", [0x4817] = "\x65\x13",
-+  [0x4818] = "\x65\x14", [0x4819] = "\x65\x15", [0x481a] = "\x65\x16",
-+  [0x481b] = "\x65\x17", [0x481c] = "\x65\x18", [0x481d] = "\x65\x19",
-+  [0x481e] = "\x65\x1a", [0x481f] = "\x65\x1b", [0x4820] = "\x65\x1c",
-+  [0x4821] = "\x65\x1d", [0x4822] = "\x65\x1e", [0x4823] = "\x65\x1f",
-+  [0x4824] = "\x65\x20", [0x4825] = "\x65\x21", [0x4826] = "\x65\x22",
-+  [0x4827] = "\x65\x23", [0x4828] = "\x65\x24", [0x4829] = "\x65\x25",
-+  [0x482a] = "\x65\x26", [0x482b] = "\x65\x27", [0x482c] = "\x65\x28",
-+  [0x482d] = "\x65\x29", [0x482e] = "\x65\x2a", [0x482f] = "\x65\x2b",
-+  [0x4830] = "\x65\x2c", [0x4831] = "\x65\x2d", [0x4832] = "\x65\x2e",
-+  [0x4833] = "\x65\x2f", [0x4834] = "\x65\x30", [0x4835] = "\x65\x31",
-+  [0x4836] = "\x65\x32", [0x4837] = "\x65\x33", [0x4838] = "\x65\x34",
-+  [0x4839] = "\x65\x35", [0x483a] = "\x65\x36", [0x483b] = "\x65\x37",
-+  [0x483c] = "\x65\x38", [0x483d] = "\x65\x39", [0x483e] = "\x65\x3a",
-+  [0x483f] = "\x65\x3b", [0x4840] = "\x65\x3c", [0x4841] = "\x65\x3d",
-+  [0x4842] = "\x65\x3e", [0x4843] = "\x65\x3f", [0x4844] = "\x65\x40",
-+  [0x4845] = "\x65\x41", [0x4846] = "\x65\x42", [0x4847] = "\x65\x43",
-+  [0x4848] = "\x65\x44", [0x4849] = "\x65\x45", [0x484a] = "\x65\x46",
-+  [0x484b] = "\x65\x47", [0x484c] = "\x65\x48", [0x484d] = "\x65\x49",
-+  [0x484e] = "\x65\x4a", [0x484f] = "\x65\x4b", [0x4850] = "\x65\x4c",
-+  [0x4851] = "\x65\x4d", [0x4852] = "\x65\x4e", [0x4853] = "\x65\x4f",
-+  [0x4854] = "\x65\x50", [0x4855] = "\x65\x51", [0x4856] = "\x65\x52",
-+  [0x4857] = "\x65\x53", [0x4858] = "\x65\x54", [0x4859] = "\x65\x55",
-+  [0x485a] = "\x65\x56", [0x485b] = "\x65\x57", [0x485c] = "\x65\x58",
-+  [0x485d] = "\x65\x59", [0x485e] = "\x65\x5a", [0x485f] = "\x65\x5b",
-+  [0x4860] = "\x65\x5c", [0x4861] = "\x65\x5d", [0x4862] = "\x65\x5e",
-+  [0x4863] = "\x65\x5f", [0x4864] = "\x65\x60", [0x4865] = "\x65\x61",
-+  [0x4866] = "\x65\x62", [0x4867] = "\x65\x63", [0x4868] = "\x65\x64",
-+  [0x4869] = "\x65\x65", [0x486a] = "\x65\x66", [0x486b] = "\x65\x67",
-+  [0x486c] = "\x65\x68", [0x486d] = "\x65\x69", [0x486e] = "\x65\x6a",
-+  [0x486f] = "\x65\x6b", [0x4870] = "\x65\x6c", [0x4871] = "\x65\x6d",
-+  [0x4872] = "\x65\x6e", [0x4873] = "\x65\x6f", [0x4874] = "\x65\x70",
-+  [0x4875] = "\x65\x71", [0x4876] = "\x65\x72", [0x4877] = "\x65\x73",
-+  [0x4878] = "\x65\x74", [0x4879] = "\x65\x75", [0x487a] = "\x65\x76",
-+  [0x487b] = "\x65\x77", [0x487c] = "\x65\x78", [0x487d] = "\x65\x79",
-+  [0x487e] = "\x65\x7a", [0x487f] = "\x65\x7b", [0x4880] = "\x65\x7c",
-+  [0x4881] = "\x65\x7d", [0x4882] = "\x65\x7e", [0x4883] = "\x65\x7f",
-+  [0x4884] = "\x65\x80", [0x4885] = "\x65\x81", [0x4886] = "\x65\x82",
-+  [0x4887] = "\x65\x83", [0x4888] = "\x65\x84", [0x4889] = "\x65\x85",
-+  [0x488a] = "\x65\x86", [0x488b] = "\x65\x87", [0x488c] = "\x65\x88",
-+  [0x488d] = "\x65\x89", [0x488e] = "\x65\x8a", [0x488f] = "\x65\x8b",
-+  [0x4890] = "\x65\x8c", [0x4891] = "\x65\x8d", [0x4892] = "\x65\x8e",
-+  [0x4893] = "\x65\x8f", [0x4894] = "\x65\x90", [0x4895] = "\x65\x91",
-+  [0x4896] = "\x65\x92", [0x4897] = "\x65\x93", [0x4898] = "\x65\x94",
-+  [0x4899] = "\x65\x95", [0x489a] = "\x65\x96", [0x489b] = "\x65\x97",
-+  [0x489c] = "\x65\x98", [0x489d] = "\x65\x99", [0x489e] = "\x65\x9a",
-+  [0x489f] = "\x65\x9b", [0x48a0] = "\x65\x9c", [0x48a1] = "\x65\x9d",
-+  [0x48a2] = "\x65\x9e", [0x48a3] = "\x65\x9f", [0x48a4] = "\x65\xa0",
-+  [0x48a5] = "\x65\xa1", [0x48a6] = "\x65\xa2", [0x48a7] = "\x65\xa3",
-+  [0x48a8] = "\x65\xa4", [0x48a9] = "\x65\xa5", [0x48aa] = "\x65\xa6",
-+  [0x48ab] = "\x65\xa7", [0x48ac] = "\x65\xa8", [0x48ad] = "\x65\xa9",
-+  [0x48ae] = "\x65\xaa", [0x48af] = "\x65\xab", [0x48b0] = "\x65\xac",
-+  [0x48b1] = "\x65\xad", [0x48b2] = "\x65\xae", [0x48b3] = "\x65\xaf",
-+  [0x48b4] = "\x65\xb0", [0x48b5] = "\x65\xb1", [0x48b6] = "\x65\xb2",
-+  [0x48b7] = "\x65\xb3", [0x48b8] = "\x65\xb4", [0x48b9] = "\x65\xb5",
-+  [0x48ba] = "\x65\xb6", [0x48bb] = "\x65\xb7", [0x48bc] = "\x65\xb8",
-+  [0x48bd] = "\x65\xb9", [0x48be] = "\x65\xba", [0x48bf] = "\x65\xbb",
-+  [0x48c0] = "\x65\xbc", [0x48c1] = "\x65\xbd", [0x48c2] = "\x65\xbe",
-+  [0x48c3] = "\x65\xbf", [0x48c4] = "\x65\xc0", [0x48c5] = "\x65\xc1",
-+  [0x48c6] = "\x65\xc2", [0x48c7] = "\xfe\x85", [0x48c8] = "\x65\xc3",
-+  [0x48c9] = "\x65\xc4", [0x48ca] = "\x65\xc5", [0x48cb] = "\x65\xc6",
-+  [0x48cc] = "\x65\xc7", [0x48cd] = "\x65\xc8", [0x48ce] = "\x65\xc9",
-+  [0x48cf] = "\x65\xca", [0x48d0] = "\x65\xcb", [0x48d1] = "\x65\xcc",
-+  [0x48d2] = "\x65\xcd", [0x48d3] = "\x65\xce", [0x48d4] = "\x65\xcf",
-+  [0x48d5] = "\x65\xd0", [0x48d6] = "\x65\xd1", [0x48d7] = "\x65\xd2",
-+  [0x48d8] = "\x65\xd3", [0x48d9] = "\x65\xd4", [0x48da] = "\x65\xd5",
-+  [0x48db] = "\x65\xd6", [0x48dc] = "\x65\xd7", [0x48dd] = "\x65\xd8",
-+  [0x48de] = "\x65\xd9", [0x48df] = "\x65\xda", [0x48e0] = "\x65\xdb",
-+  [0x48e1] = "\x65\xdc", [0x48e2] = "\x65\xdd", [0x48e3] = "\x65\xde",
-+  [0x48e4] = "\x65\xdf", [0x48e5] = "\x65\xe0", [0x48e6] = "\x65\xe1",
-+  [0x48e7] = "\x65\xe2", [0x48e8] = "\x65\xe3", [0x48e9] = "\x65\xe4",
-+  [0x48ea] = "\x65\xe5", [0x48eb] = "\x65\xe6", [0x48ec] = "\x65\xe7",
-+  [0x48ed] = "\x65\xe8", [0x48ee] = "\x65\xe9", [0x48ef] = "\x65\xea",
-+  [0x48f0] = "\x65\xeb", [0x48f1] = "\x65\xec", [0x48f2] = "\x65\xed",
-+  [0x48f3] = "\x65\xee", [0x48f4] = "\x65\xef", [0x48f5] = "\x65\xf0",
-+  [0x48f6] = "\x65\xf1", [0x48f7] = "\x65\xf2", [0x48f8] = "\x65\xf3",
-+  [0x48f9] = "\x65\xf4", [0x48fa] = "\xfe\x86", [0x48fb] = "\x65\xf5",
-+  [0x48fc] = "\x65\xf6", [0x48fd] = "\xfe\x87", [0x48fe] = "\x65\xf7",
-+  [0x48ff] = "\x65\xf8", [0x4900] = "\x65\xf9", [0x4901] = "\x65\xfa",
-+  [0x4902] = "\xfe\x88", [0x4903] = "\xfe\x89", [0x4904] = "\x65\xfb",
-+  [0x4905] = "\xfe\x8a", [0x4906] = "\xfe\x8b", [0x4907] = "\x65\xfc",
-+  [0x4908] = "\x65\xfd", [0x4909] = "\x65\xfe", [0x490a] = "\x65\xff",
-+  [0x490b] = "\x66\x00", [0x490c] = "\x66\x01", [0x490d] = "\x66\x02",
-+  [0x490e] = "\x66\x03", [0x490f] = "\x66\x04", [0x4910] = "\x66\x05",
-+  [0x4911] = "\x66\x06", [0x4912] = "\x66\x07", [0x4913] = "\x66\x08",
-+  [0x4914] = "\x66\x09", [0x4915] = "\x66\x0a", [0x4916] = "\x66\x0b",
-+  [0x4917] = "\x66\x0c", [0x4918] = "\x66\x0d", [0x4919] = "\x66\x0e",
-+  [0x491a] = "\x66\x0f", [0x491b] = "\xfe\x8d", [0x491c] = "\x66\x10",
-+  [0x491d] = "\x66\x11", [0x491e] = "\x66\x12", [0x491f] = "\xfe\x8c",
-+  [0x4920] = "\x66\x13", [0x4921] = "\x66\x14", [0x4922] = "\x66\x15",
-+  [0x4923] = "\x66\x16", [0x4924] = "\x66\x17", [0x4925] = "\x66\x18",
-+  [0x4926] = "\x66\x19", [0x4927] = "\x66\x1a", [0x4928] = "\x66\x1b",
-+  [0x4929] = "\x66\x1c", [0x492a] = "\x66\x1d", [0x492b] = "\x66\x1e",
-+  [0x492c] = "\x66\x1f", [0x492d] = "\x66\x20", [0x492e] = "\x66\x21",
-+  [0x492f] = "\x66\x22", [0x4930] = "\x66\x23", [0x4931] = "\x66\x24",
-+  [0x4932] = "\x66\x25", [0x4933] = "\x66\x26", [0x4934] = "\x66\x27",
-+  [0x4935] = "\x66\x28", [0x4936] = "\xfe\x8f", [0x4937] = "\xfe\x8e",
-+  [0x4938] = "\x66\x29", [0x4939] = "\x66\x2a", [0x493a] = "\x66\x2b",
-+  [0x493b] = "\x66\x2c", [0x493c] = "\x66\x2d", [0x493d] = "\x66\x2e",
-+  [0x493e] = "\x66\x2f", [0x493f] = "\x66\x30", [0x4940] = "\x66\x31",
-+  [0x4941] = "\x66\x32", [0x4942] = "\x66\x33", [0x4943] = "\x66\x34",
-+  [0x4944] = "\x66\x35", [0x4945] = "\x66\x36", [0x4946] = "\x66\x37",
-+  [0x4947] = "\x66\x38", [0x4948] = "\x66\x39", [0x4949] = "\x66\x3a",
-+  [0x494a] = "\x66\x3b", [0x494b] = "\x66\x3c", [0x494c] = "\x66\x3d",
-+  [0x494d] = "\x66\x3e", [0x494e] = "\x66\x3f", [0x494f] = "\x66\x40",
-+  [0x4950] = "\x66\x41", [0x4951] = "\x66\x42", [0x4952] = "\x66\x43",
-+  [0x4953] = "\x66\x44", [0x4954] = "\x66\x45", [0x4955] = "\x66\x46",
-+  [0x4956] = "\x66\x47", [0x4957] = "\x66\x48", [0x4958] = "\x66\x49",
-+  [0x4959] = "\x66\x4a", [0x495a] = "\x66\x4b", [0x495b] = "\x66\x4c",
-+  [0x495c] = "\x66\x4d", [0x495d] = "\x66\x4e", [0x495e] = "\x66\x4f",
-+  [0x495f] = "\x66\x50", [0x4960] = "\x66\x51", [0x4961] = "\x66\x52",
-+  [0x4962] = "\x66\x53", [0x4963] = "\x66\x54", [0x4964] = "\x66\x55",
-+  [0x4965] = "\x66\x56", [0x4966] = "\x66\x57", [0x4967] = "\x66\x58",
-+  [0x4968] = "\x66\x59", [0x4969] = "\x66\x5a", [0x496a] = "\x66\x5b",
-+  [0x496b] = "\x66\x5c", [0x496c] = "\x66\x5d", [0x496d] = "\x66\x5e",
-+  [0x496e] = "\x66\x5f", [0x496f] = "\x66\x60", [0x4970] = "\x66\x61",
-+  [0x4971] = "\x66\x62", [0x4972] = "\x66\x63", [0x4973] = "\x66\x64",
-+  [0x4974] = "\x66\x65", [0x4975] = "\x66\x66", [0x4976] = "\x66\x67",
-+  [0x4977] = "\x66\x68", [0x4978] = "\x66\x69", [0x4979] = "\x66\x6a",
-+  [0x497a] = "\x66\x6b", [0x497b] = "\x66\x6c", [0x497c] = "\x66\x6d",
-+  [0x497d] = "\x66\x6e", [0x497e] = "\x66\x6f", [0x497f] = "\x66\x70",
-+  [0x4980] = "\x66\x71", [0x4981] = "\x66\x72", [0x4982] = "\x66\x73",
-+  [0x4983] = "\x66\x74", [0x4984] = "\x66\x75", [0x4985] = "\x66\x76",
-+  [0x4986] = "\x66\x77", [0x4987] = "\x66\x78", [0x4988] = "\x66\x79",
-+  [0x4989] = "\x66\x7a", [0x498a] = "\x66\x7b", [0x498b] = "\x66\x7c",
-+  [0x498c] = "\x66\x7d", [0x498d] = "\x66\x7e", [0x498e] = "\x66\x7f",
-+  [0x498f] = "\x66\x80", [0x4990] = "\x66\x81", [0x4991] = "\x66\x82",
-+  [0x4992] = "\x66\x83", [0x4993] = "\x66\x84", [0x4994] = "\x66\x85",
-+  [0x4995] = "\x66\x86", [0x4996] = "\x66\x87", [0x4997] = "\x66\x88",
-+  [0x4998] = "\x66\x89", [0x4999] = "\x66\x8a", [0x499a] = "\x66\x8b",
-+  [0x499b] = "\x66\x8c", [0x499c] = "\x66\x8d", [0x499d] = "\x66\x8e",
-+  [0x499e] = "\x66\x8f", [0x499f] = "\x66\x90", [0x49a0] = "\x66\x91",
-+  [0x49a1] = "\x66\x92", [0x49a2] = "\x66\x93", [0x49a3] = "\x66\x94",
-+  [0x49a4] = "\x66\x95", [0x49a5] = "\x66\x96", [0x49a6] = "\x66\x97",
-+  [0x49a7] = "\x66\x98", [0x49a8] = "\x66\x99", [0x49a9] = "\x66\x9a",
-+  [0x49aa] = "\x66\x9b", [0x49ab] = "\x66\x9c", [0x49ac] = "\x66\x9d",
-+  [0x49ad] = "\x66\x9e", [0x49ae] = "\x66\x9f", [0x49af] = "\x66\xa0",
-+  [0x49b0] = "\x66\xa1", [0x49b1] = "\x66\xa2", [0x49b2] = "\x66\xa3",
-+  [0x49b3] = "\x66\xa4", [0x49b4] = "\x66\xa5", [0x49b5] = "\x66\xa6",
-+  [0x49b6] = "\x66\xa7", [0x49b7] = "\x66\xa8", [0x49b8] = "\x66\xa9",
-+  [0x49b9] = "\x66\xaa", [0x49ba] = "\x66\xab", [0x49bb] = "\x66\xac",
-+  [0x49bc] = "\x66\xad", [0x49bd] = "\x66\xae", [0x49be] = "\x66\xaf",
-+  [0x49bf] = "\x66\xb0", [0x49c0] = "\x66\xb1", [0x49c1] = "\x66\xb2",
-+  [0x49c2] = "\x66\xb3", [0x49c3] = "\x66\xb4", [0x49c4] = "\x66\xb5",
-+  [0x49c5] = "\x66\xb6", [0x49c6] = "\x66\xb7", [0x49c7] = "\x66\xb8",
-+  [0x49c8] = "\x66\xb9", [0x49c9] = "\x66\xba", [0x49ca] = "\x66\xbb",
-+  [0x49cb] = "\x66\xbc", [0x49cc] = "\x66\xbd", [0x49cd] = "\x66\xbe",
-+  [0x49ce] = "\x66\xbf", [0x49cf] = "\x66\xc0", [0x49d0] = "\x66\xc1",
-+  [0x49d1] = "\x66\xc2", [0x49d2] = "\x66\xc3", [0x49d3] = "\x66\xc4",
-+  [0x49d4] = "\x66\xc5", [0x49d5] = "\x66\xc6", [0x49d6] = "\x66\xc7",
-+  [0x49d7] = "\x66\xc8", [0x49d8] = "\x66\xc9", [0x49d9] = "\x66\xca",
-+  [0x49da] = "\x66\xcb", [0x49db] = "\x66\xcc", [0x49dc] = "\x66\xcd",
-+  [0x49dd] = "\x66\xce", [0x49de] = "\x66\xcf", [0x49df] = "\x66\xd0",
-+  [0x49e0] = "\x66\xd1", [0x49e1] = "\x66\xd2", [0x49e2] = "\x66\xd3",
-+  [0x49e3] = "\x66\xd4", [0x49e4] = "\x66\xd5", [0x49e5] = "\x66\xd6",
-+  [0x49e6] = "\x66\xd7", [0x49e7] = "\x66\xd8", [0x49e8] = "\x66\xd9",
-+  [0x49e9] = "\x66\xda", [0x49ea] = "\x66\xdb", [0x49eb] = "\x66\xdc",
-+  [0x49ec] = "\x66\xdd", [0x49ed] = "\x66\xde", [0x49ee] = "\x66\xdf",
-+  [0x49ef] = "\x66\xe0", [0x49f0] = "\x66\xe1", [0x49f1] = "\x66\xe2",
-+  [0x49f2] = "\x66\xe3", [0x49f3] = "\x66\xe4", [0x49f4] = "\x66\xe5",
-+  [0x49f5] = "\x66\xe6", [0x49f6] = "\x66\xe7", [0x49f7] = "\x66\xe8",
-+  [0x49f8] = "\x66\xe9", [0x49f9] = "\x66\xea", [0x49fa] = "\x66\xeb",
-+  [0x49fb] = "\x66\xec", [0x49fc] = "\x66\xed", [0x49fd] = "\x66\xee",
-+  [0x49fe] = "\x66\xef", [0x49ff] = "\x66\xf0", [0x4a00] = "\x66\xf1",
-+  [0x4a01] = "\x66\xf2", [0x4a02] = "\x66\xf3", [0x4a03] = "\x66\xf4",
-+  [0x4a04] = "\x66\xf5", [0x4a05] = "\x66\xf6", [0x4a06] = "\x66\xf7",
-+  [0x4a07] = "\x66\xf8", [0x4a08] = "\x66\xf9", [0x4a09] = "\x66\xfa",
-+  [0x4a0a] = "\x66\xfb", [0x4a0b] = "\x66\xfc", [0x4a0c] = "\x66\xfd",
-+  [0x4a0d] = "\x66\xfe", [0x4a0e] = "\x66\xff", [0x4a0f] = "\x67\x00",
-+  [0x4a10] = "\x67\x01", [0x4a11] = "\x67\x02", [0x4a12] = "\x67\x03",
-+  [0x4a13] = "\x67\x04", [0x4a14] = "\x67\x05", [0x4a15] = "\x67\x06",
-+  [0x4a16] = "\x67\x07", [0x4a17] = "\x67\x08", [0x4a18] = "\x67\x09",
-+  [0x4a19] = "\x67\x0a", [0x4a1a] = "\x67\x0b", [0x4a1b] = "\x67\x0c",
-+  [0x4a1c] = "\x67\x0d", [0x4a1d] = "\x67\x0e", [0x4a1e] = "\x67\x0f",
-+  [0x4a1f] = "\x67\x10", [0x4a20] = "\x67\x11", [0x4a21] = "\x67\x12",
-+  [0x4a22] = "\x67\x13", [0x4a23] = "\x67\x14", [0x4a24] = "\x67\x15",
-+  [0x4a25] = "\x67\x16", [0x4a26] = "\x67\x17", [0x4a27] = "\x67\x18",
-+  [0x4a28] = "\x67\x19", [0x4a29] = "\x67\x1a", [0x4a2a] = "\x67\x1b",
-+  [0x4a2b] = "\x67\x1c", [0x4a2c] = "\x67\x1d", [0x4a2d] = "\x67\x1e",
-+  [0x4a2e] = "\x67\x1f", [0x4a2f] = "\x67\x20", [0x4a30] = "\x67\x21",
-+  [0x4a31] = "\x67\x22", [0x4a32] = "\x67\x23", [0x4a33] = "\x67\x24",
-+  [0x4a34] = "\x67\x25", [0x4a35] = "\x67\x26", [0x4a36] = "\x67\x27",
-+  [0x4a37] = "\x67\x28", [0x4a38] = "\x67\x29", [0x4a39] = "\x67\x2a",
-+  [0x4a3a] = "\x67\x2b", [0x4a3b] = "\x67\x2c", [0x4a3c] = "\x67\x2d",
-+  [0x4a3d] = "\x67\x2e", [0x4a3e] = "\x67\x2f", [0x4a3f] = "\x67\x30",
-+  [0x4a40] = "\x67\x31", [0x4a41] = "\x67\x32", [0x4a42] = "\x67\x33",
-+  [0x4a43] = "\x67\x34", [0x4a44] = "\x67\x35", [0x4a45] = "\x67\x36",
-+  [0x4a46] = "\x67\x37", [0x4a47] = "\x67\x38", [0x4a48] = "\x67\x39",
-+  [0x4a49] = "\x67\x3a", [0x4a4a] = "\x67\x3b", [0x4a4b] = "\x67\x3c",
-+  [0x4a4c] = "\x67\x3d", [0x4a4d] = "\x67\x3e", [0x4a4e] = "\x67\x3f",
-+  [0x4a4f] = "\x67\x40", [0x4a50] = "\x67\x41", [0x4a51] = "\x67\x42",
-+  [0x4a52] = "\x67\x43", [0x4a53] = "\x67\x44", [0x4a54] = "\x67\x45",
-+  [0x4a55] = "\x67\x46", [0x4a56] = "\x67\x47", [0x4a57] = "\x67\x48",
-+  [0x4a58] = "\x67\x49", [0x4a59] = "\x67\x4a", [0x4a5a] = "\x67\x4b",
-+  [0x4a5b] = "\x67\x4c", [0x4a5c] = "\x67\x4d", [0x4a5d] = "\x67\x4e",
-+  [0x4a5e] = "\x67\x4f", [0x4a5f] = "\x67\x50", [0x4a60] = "\x67\x51",
-+  [0x4a61] = "\x67\x52", [0x4a62] = "\x67\x53", [0x4a63] = "\x67\x54",
-+  [0x4a64] = "\x67\x55", [0x4a65] = "\x67\x56", [0x4a66] = "\x67\x57",
-+  [0x4a67] = "\x67\x58", [0x4a68] = "\x67\x59", [0x4a69] = "\x67\x5a",
-+  [0x4a6a] = "\x67\x5b", [0x4a6b] = "\x67\x5c", [0x4a6c] = "\x67\x5d",
-+  [0x4a6d] = "\x67\x5e", [0x4a6e] = "\x67\x5f", [0x4a6f] = "\x67\x60",
-+  [0x4a70] = "\x67\x61", [0x4a71] = "\x67\x62", [0x4a72] = "\x67\x63",
-+  [0x4a73] = "\x67\x64", [0x4a74] = "\x67\x65", [0x4a75] = "\x67\x66",
-+  [0x4a76] = "\x67\x67", [0x4a77] = "\x67\x68", [0x4a78] = "\x67\x69",
-+  [0x4a79] = "\x67\x6a", [0x4a7a] = "\x67\x6b", [0x4a7b] = "\x67\x6c",
-+  [0x4a7c] = "\x67\x6d", [0x4a7d] = "\x67\x6e", [0x4a7e] = "\x67\x6f",
-+  [0x4a7f] = "\x67\x70", [0x4a80] = "\x67\x71", [0x4a81] = "\x67\x72",
-+  [0x4a82] = "\x67\x73", [0x4a83] = "\x67\x74", [0x4a84] = "\x67\x75",
-+  [0x4a85] = "\x67\x76", [0x4a86] = "\x67\x77", [0x4a87] = "\x67\x78",
-+  [0x4a88] = "\x67\x79", [0x4a89] = "\x67\x7a", [0x4a8a] = "\x67\x7b",
-+  [0x4a8b] = "\x67\x7c", [0x4a8c] = "\x67\x7d", [0x4a8d] = "\x67\x7e",
-+  [0x4a8e] = "\x67\x7f", [0x4a8f] = "\x67\x80", [0x4a90] = "\x67\x81",
-+  [0x4a91] = "\x67\x82", [0x4a92] = "\x67\x83", [0x4a93] = "\x67\x84",
-+  [0x4a94] = "\x67\x85", [0x4a95] = "\x67\x86", [0x4a96] = "\x67\x87",
-+  [0x4a97] = "\x67\x88", [0x4a98] = "\x67\x89", [0x4a99] = "\x67\x8a",
-+  [0x4a9a] = "\x67\x8b", [0x4a9b] = "\x67\x8c", [0x4a9c] = "\x67\x8d",
-+  [0x4a9d] = "\x67\x8e", [0x4a9e] = "\x67\x8f", [0x4a9f] = "\x67\x90",
-+  [0x4aa0] = "\x67\x91", [0x4aa1] = "\x67\x92", [0x4aa2] = "\x67\x93",
-+  [0x4aa3] = "\x67\x94", [0x4aa4] = "\x67\x95", [0x4aa5] = "\x67\x96",
-+  [0x4aa6] = "\x67\x97", [0x4aa7] = "\x67\x98", [0x4aa8] = "\x67\x99",
-+  [0x4aa9] = "\x67\x9a", [0x4aaa] = "\x67\x9b", [0x4aab] = "\x67\x9c",
-+  [0x4aac] = "\x67\x9d", [0x4aad] = "\x67\x9e", [0x4aae] = "\x67\x9f",
-+  [0x4aaf] = "\x67\xa0", [0x4ab0] = "\x67\xa1", [0x4ab1] = "\x67\xa2",
-+  [0x4ab2] = "\x67\xa3", [0x4ab3] = "\x67\xa4", [0x4ab4] = "\x67\xa5",
-+  [0x4ab5] = "\x67\xa6", [0x4ab6] = "\x67\xa7", [0x4ab7] = "\x67\xa8",
-+  [0x4ab8] = "\x67\xa9", [0x4ab9] = "\x67\xaa", [0x4aba] = "\x67\xab",
-+  [0x4abb] = "\x67\xac", [0x4abc] = "\x67\xad", [0x4abd] = "\x67\xae",
-+  [0x4abe] = "\x67\xaf", [0x4abf] = "\x67\xb0", [0x4ac0] = "\x67\xb1",
-+  [0x4ac1] = "\x67\xb2", [0x4ac2] = "\x67\xb3", [0x4ac3] = "\x67\xb4",
-+  [0x4ac4] = "\x67\xb5", [0x4ac5] = "\x67\xb6", [0x4ac6] = "\x67\xb7",
-+  [0x4ac7] = "\x67\xb8", [0x4ac8] = "\x67\xb9", [0x4ac9] = "\x67\xba",
-+  [0x4aca] = "\x67\xbb", [0x4acb] = "\x67\xbc", [0x4acc] = "\x67\xbd",
-+  [0x4acd] = "\x67\xbe", [0x4ace] = "\x67\xbf", [0x4acf] = "\x67\xc0",
-+  [0x4ad0] = "\x67\xc1", [0x4ad1] = "\x67\xc2", [0x4ad2] = "\x67\xc3",
-+  [0x4ad3] = "\x67\xc4", [0x4ad4] = "\x67\xc5", [0x4ad5] = "\x67\xc6",
-+  [0x4ad6] = "\x67\xc7", [0x4ad7] = "\x67\xc8", [0x4ad8] = "\x67\xc9",
-+  [0x4ad9] = "\x67\xca", [0x4ada] = "\x67\xcb", [0x4adb] = "\x67\xcc",
-+  [0x4adc] = "\x67\xcd", [0x4add] = "\x67\xce", [0x4ade] = "\x67\xcf",
-+  [0x4adf] = "\x67\xd0", [0x4ae0] = "\x67\xd1", [0x4ae1] = "\x67\xd2",
-+  [0x4ae2] = "\x67\xd3", [0x4ae3] = "\x67\xd4", [0x4ae4] = "\x67\xd5",
-+  [0x4ae5] = "\x67\xd6", [0x4ae6] = "\x67\xd7", [0x4ae7] = "\x67\xd8",
-+  [0x4ae8] = "\x67\xd9", [0x4ae9] = "\x67\xda", [0x4aea] = "\x67\xdb",
-+  [0x4aeb] = "\x67\xdc", [0x4aec] = "\x67\xdd", [0x4aed] = "\x67\xde",
-+  [0x4aee] = "\x67\xdf", [0x4aef] = "\x67\xe0", [0x4af0] = "\x67\xe1",
-+  [0x4af1] = "\x67\xe2", [0x4af2] = "\x67\xe3", [0x4af3] = "\x67\xe4",
-+  [0x4af4] = "\x67\xe5", [0x4af5] = "\x67\xe6", [0x4af6] = "\x67\xe7",
-+  [0x4af7] = "\x67\xe8", [0x4af8] = "\x67\xe9", [0x4af9] = "\x67\xea",
-+  [0x4afa] = "\x67\xeb", [0x4afb] = "\x67\xec", [0x4afc] = "\x67\xed",
-+  [0x4afd] = "\x67\xee", [0x4afe] = "\x67\xef", [0x4aff] = "\x67\xf0",
-+  [0x4b00] = "\x67\xf1", [0x4b01] = "\x67\xf2", [0x4b02] = "\x67\xf3",
-+  [0x4b03] = "\x67\xf4", [0x4b04] = "\x67\xf5", [0x4b05] = "\x67\xf6",
-+  [0x4b06] = "\x67\xf7", [0x4b07] = "\x67\xf8", [0x4b08] = "\x67\xf9",
-+  [0x4b09] = "\x67\xfa", [0x4b0a] = "\x67\xfb", [0x4b0b] = "\x67\xfc",
-+  [0x4b0c] = "\x67\xfd", [0x4b0d] = "\x67\xfe", [0x4b0e] = "\x67\xff",
-+  [0x4b0f] = "\x68\x00", [0x4b10] = "\x68\x01", [0x4b11] = "\x68\x02",
-+  [0x4b12] = "\x68\x03", [0x4b13] = "\x68\x04", [0x4b14] = "\x68\x05",
-+  [0x4b15] = "\x68\x06", [0x4b16] = "\x68\x07", [0x4b17] = "\x68\x08",
-+  [0x4b18] = "\x68\x09", [0x4b19] = "\x68\x0a", [0x4b1a] = "\x68\x0b",
-+  [0x4b1b] = "\x68\x0c", [0x4b1c] = "\x68\x0d", [0x4b1d] = "\x68\x0e",
-+  [0x4b1e] = "\x68\x0f", [0x4b1f] = "\x68\x10", [0x4b20] = "\x68\x11",
-+  [0x4b21] = "\x68\x12", [0x4b22] = "\x68\x13", [0x4b23] = "\x68\x14",
-+  [0x4b24] = "\x68\x15", [0x4b25] = "\x68\x16", [0x4b26] = "\x68\x17",
-+  [0x4b27] = "\x68\x18", [0x4b28] = "\x68\x19", [0x4b29] = "\x68\x1a",
-+  [0x4b2a] = "\x68\x1b", [0x4b2b] = "\x68\x1c", [0x4b2c] = "\x68\x1d",
-+  [0x4b2d] = "\x68\x1e", [0x4b2e] = "\x68\x1f", [0x4b2f] = "\x68\x20",
-+  [0x4b30] = "\x68\x21", [0x4b31] = "\x68\x22", [0x4b32] = "\x68\x23",
-+  [0x4b33] = "\x68\x24", [0x4b34] = "\x68\x25", [0x4b35] = "\x68\x26",
-+  [0x4b36] = "\x68\x27", [0x4b37] = "\x68\x28", [0x4b38] = "\x68\x29",
-+  [0x4b39] = "\x68\x2a", [0x4b3a] = "\x68\x2b", [0x4b3b] = "\x68\x2c",
-+  [0x4b3c] = "\x68\x2d", [0x4b3d] = "\x68\x2e", [0x4b3e] = "\x68\x2f",
-+  [0x4b3f] = "\x68\x30", [0x4b40] = "\x68\x31", [0x4b41] = "\x68\x32",
-+  [0x4b42] = "\x68\x33", [0x4b43] = "\x68\x34", [0x4b44] = "\x68\x35",
-+  [0x4b45] = "\x68\x36", [0x4b46] = "\x68\x37", [0x4b47] = "\x68\x38",
-+  [0x4b48] = "\x68\x39", [0x4b49] = "\x68\x3a", [0x4b4a] = "\x68\x3b",
-+  [0x4b4b] = "\x68\x3c", [0x4b4c] = "\x68\x3d", [0x4b4d] = "\x68\x3e",
-+  [0x4b4e] = "\x68\x3f", [0x4b4f] = "\x68\x40", [0x4b50] = "\x68\x41",
-+  [0x4b51] = "\x68\x42", [0x4b52] = "\x68\x43", [0x4b53] = "\x68\x44",
-+  [0x4b54] = "\x68\x45", [0x4b55] = "\x68\x46", [0x4b56] = "\x68\x47",
-+  [0x4b57] = "\x68\x48", [0x4b58] = "\x68\x49", [0x4b59] = "\x68\x4a",
-+  [0x4b5a] = "\x68\x4b", [0x4b5b] = "\x68\x4c", [0x4b5c] = "\x68\x4d",
-+  [0x4b5d] = "\x68\x4e", [0x4b5e] = "\x68\x4f", [0x4b5f] = "\x68\x50",
-+  [0x4b60] = "\x68\x51", [0x4b61] = "\x68\x52", [0x4b62] = "\x68\x53",
-+  [0x4b63] = "\x68\x54", [0x4b64] = "\x68\x55", [0x4b65] = "\x68\x56",
-+  [0x4b66] = "\x68\x57", [0x4b67] = "\x68\x58", [0x4b68] = "\x68\x59",
-+  [0x4b69] = "\x68\x5a", [0x4b6a] = "\x68\x5b", [0x4b6b] = "\x68\x5c",
-+  [0x4b6c] = "\x68\x5d", [0x4b6d] = "\x68\x5e", [0x4b6e] = "\x68\x5f",
-+  [0x4b6f] = "\x68\x60", [0x4b70] = "\x68\x61", [0x4b71] = "\x68\x62",
-+  [0x4b72] = "\x68\x63", [0x4b73] = "\x68\x64", [0x4b74] = "\x68\x65",
-+  [0x4b75] = "\x68\x66", [0x4b76] = "\x68\x67", [0x4b77] = "\x68\x68",
-+  [0x4b78] = "\x68\x69", [0x4b79] = "\x68\x6a", [0x4b7a] = "\x68\x6b",
-+  [0x4b7b] = "\x68\x6c", [0x4b7c] = "\x68\x6d", [0x4b7d] = "\x68\x6e",
-+  [0x4b7e] = "\x68\x6f", [0x4b7f] = "\x68\x70", [0x4b80] = "\x68\x71",
-+  [0x4b81] = "\x68\x72", [0x4b82] = "\x68\x73", [0x4b83] = "\x68\x74",
-+  [0x4b84] = "\x68\x75", [0x4b85] = "\x68\x76", [0x4b86] = "\x68\x77",
-+  [0x4b87] = "\x68\x78", [0x4b88] = "\x68\x79", [0x4b89] = "\x68\x7a",
-+  [0x4b8a] = "\x68\x7b", [0x4b8b] = "\x68\x7c", [0x4b8c] = "\x68\x7d",
-+  [0x4b8d] = "\x68\x7e", [0x4b8e] = "\x68\x7f", [0x4b8f] = "\x68\x80",
-+  [0x4b90] = "\x68\x81", [0x4b91] = "\x68\x82", [0x4b92] = "\x68\x83",
-+  [0x4b93] = "\x68\x84", [0x4b94] = "\x68\x85", [0x4b95] = "\x68\x86",
-+  [0x4b96] = "\x68\x87", [0x4b97] = "\x68\x88", [0x4b98] = "\x68\x89",
-+  [0x4b99] = "\x68\x8a", [0x4b9a] = "\x68\x8b", [0x4b9b] = "\x68\x8c",
-+  [0x4b9c] = "\x68\x8d", [0x4b9d] = "\x68\x8e", [0x4b9e] = "\x68\x8f",
-+  [0x4b9f] = "\x68\x90", [0x4ba0] = "\x68\x91", [0x4ba1] = "\x68\x92",
-+  [0x4ba2] = "\x68\x93", [0x4ba3] = "\x68\x94", [0x4ba4] = "\x68\x95",
-+  [0x4ba5] = "\x68\x96", [0x4ba6] = "\x68\x97", [0x4ba7] = "\x68\x98",
-+  [0x4ba8] = "\x68\x99", [0x4ba9] = "\x68\x9a", [0x4baa] = "\x68\x9b",
-+  [0x4bab] = "\x68\x9c", [0x4bac] = "\x68\x9d", [0x4bad] = "\x68\x9e",
-+  [0x4bae] = "\x68\x9f", [0x4baf] = "\x68\xa0", [0x4bb0] = "\x68\xa1",
-+  [0x4bb1] = "\x68\xa2", [0x4bb2] = "\x68\xa3", [0x4bb3] = "\x68\xa4",
-+  [0x4bb4] = "\x68\xa5", [0x4bb5] = "\x68\xa6", [0x4bb6] = "\x68\xa7",
-+  [0x4bb7] = "\x68\xa8", [0x4bb8] = "\x68\xa9", [0x4bb9] = "\x68\xaa",
-+  [0x4bba] = "\x68\xab", [0x4bbb] = "\x68\xac", [0x4bbc] = "\x68\xad",
-+  [0x4bbd] = "\x68\xae", [0x4bbe] = "\x68\xaf", [0x4bbf] = "\x68\xb0",
-+  [0x4bc0] = "\x68\xb1", [0x4bc1] = "\x68\xb2", [0x4bc2] = "\x68\xb3",
-+  [0x4bc3] = "\x68\xb4", [0x4bc4] = "\x68\xb5", [0x4bc5] = "\x68\xb6",
-+  [0x4bc6] = "\x68\xb7", [0x4bc7] = "\x68\xb8", [0x4bc8] = "\x68\xb9",
-+  [0x4bc9] = "\x68\xba", [0x4bca] = "\x68\xbb", [0x4bcb] = "\x68\xbc",
-+  [0x4bcc] = "\x68\xbd", [0x4bcd] = "\x68\xbe", [0x4bce] = "\x68\xbf",
-+  [0x4bcf] = "\x68\xc0", [0x4bd0] = "\x68\xc1", [0x4bd1] = "\x68\xc2",
-+  [0x4bd2] = "\x68\xc3", [0x4bd3] = "\x68\xc4", [0x4bd4] = "\x68\xc5",
-+  [0x4bd5] = "\x68\xc6", [0x4bd6] = "\x68\xc7", [0x4bd7] = "\x68\xc8",
-+  [0x4bd8] = "\x68\xc9", [0x4bd9] = "\x68\xca", [0x4bda] = "\x68\xcb",
-+  [0x4bdb] = "\x68\xcc", [0x4bdc] = "\x68\xcd", [0x4bdd] = "\x68\xce",
-+  [0x4bde] = "\x68\xcf", [0x4bdf] = "\x68\xd0", [0x4be0] = "\x68\xd1",
-+  [0x4be1] = "\x68\xd2", [0x4be2] = "\x68\xd3", [0x4be3] = "\x68\xd4",
-+  [0x4be4] = "\x68\xd5", [0x4be5] = "\x68\xd6", [0x4be6] = "\x68\xd7",
-+  [0x4be7] = "\x68\xd8", [0x4be8] = "\x68\xd9", [0x4be9] = "\x68\xda",
-+  [0x4bea] = "\x68\xdb", [0x4beb] = "\x68\xdc", [0x4bec] = "\x68\xdd",
-+  [0x4bed] = "\x68\xde", [0x4bee] = "\x68\xdf", [0x4bef] = "\x68\xe0",
-+  [0x4bf0] = "\x68\xe1", [0x4bf1] = "\x68\xe2", [0x4bf2] = "\x68\xe3",
-+  [0x4bf3] = "\x68\xe4", [0x4bf4] = "\x68\xe5", [0x4bf5] = "\x68\xe6",
-+  [0x4bf6] = "\x68\xe7", [0x4bf7] = "\xfe\x96", [0x4bf8] = "\x68\xe8",
-+  [0x4bf9] = "\x68\xe9", [0x4bfa] = "\x68\xea", [0x4bfb] = "\x68\xeb",
-+  [0x4bfc] = "\x68\xec", [0x4bfd] = "\x68\xed", [0x4bfe] = "\x68\xee",
-+  [0x4bff] = "\x68\xef", [0x4c00] = "\x68\xf0", [0x4c01] = "\x68\xf1",
-+  [0x4c02] = "\x68\xf2", [0x4c03] = "\x68\xf3", [0x4c04] = "\x68\xf4",
-+  [0x4c05] = "\x68\xf5", [0x4c06] = "\x68\xf6", [0x4c07] = "\x68\xf7",
-+  [0x4c08] = "\x68\xf8", [0x4c09] = "\x68\xf9", [0x4c0a] = "\x68\xfa",
-+  [0x4c0b] = "\x68\xfb", [0x4c0c] = "\x68\xfc", [0x4c0d] = "\x68\xfd",
-+  [0x4c0e] = "\x68\xfe", [0x4c0f] = "\x68\xff", [0x4c10] = "\x69\x00",
-+  [0x4c11] = "\x69\x01", [0x4c12] = "\x69\x02", [0x4c13] = "\x69\x03",
-+  [0x4c14] = "\x69\x04", [0x4c15] = "\x69\x05", [0x4c16] = "\x69\x06",
-+  [0x4c17] = "\x69\x07", [0x4c18] = "\x69\x08", [0x4c19] = "\x69\x09",
-+  [0x4c1a] = "\x69\x0a", [0x4c1b] = "\x69\x0b", [0x4c1c] = "\x69\x0c",
-+  [0x4c1d] = "\x69\x0d", [0x4c1e] = "\x69\x0e", [0x4c1f] = "\xfe\x93",
-+  [0x4c20] = "\xfe\x94", [0x4c21] = "\xfe\x95", [0x4c22] = "\xfe\x97",
-+  [0x4c23] = "\xfe\x92", [0x4c24] = "\x69\x0f", [0x4c25] = "\x69\x10",
-+  [0x4c26] = "\x69\x11", [0x4c27] = "\x69\x12", [0x4c28] = "\x69\x13",
-+  [0x4c29] = "\x69\x14", [0x4c2a] = "\x69\x15", [0x4c2b] = "\x69\x16",
-+  [0x4c2c] = "\x69\x17", [0x4c2d] = "\x69\x18", [0x4c2e] = "\x69\x19",
-+  [0x4c2f] = "\x69\x1a", [0x4c30] = "\x69\x1b", [0x4c31] = "\x69\x1c",
-+  [0x4c32] = "\x69\x1d", [0x4c33] = "\x69\x1e", [0x4c34] = "\x69\x1f",
-+  [0x4c35] = "\x69\x20", [0x4c36] = "\x69\x21", [0x4c37] = "\x69\x22",
-+  [0x4c38] = "\x69\x23", [0x4c39] = "\x69\x24", [0x4c3a] = "\x69\x25",
-+  [0x4c3b] = "\x69\x26", [0x4c3c] = "\x69\x27", [0x4c3d] = "\x69\x28",
-+  [0x4c3e] = "\x69\x29", [0x4c3f] = "\x69\x2a", [0x4c40] = "\x69\x2b",
-+  [0x4c41] = "\x69\x2c", [0x4c42] = "\x69\x2d", [0x4c43] = "\x69\x2e",
-+  [0x4c44] = "\x69\x2f", [0x4c45] = "\x69\x30", [0x4c46] = "\x69\x31",
-+  [0x4c47] = "\x69\x32", [0x4c48] = "\x69\x33", [0x4c49] = "\x69\x34",
-+  [0x4c4a] = "\x69\x35", [0x4c4b] = "\x69\x36", [0x4c4c] = "\x69\x37",
-+  [0x4c4d] = "\x69\x38", [0x4c4e] = "\x69\x39", [0x4c4f] = "\x69\x3a",
-+  [0x4c50] = "\x69\x3b", [0x4c51] = "\x69\x3c", [0x4c52] = "\x69\x3d",
-+  [0x4c53] = "\x69\x3e", [0x4c54] = "\x69\x3f", [0x4c55] = "\x69\x40",
-+  [0x4c56] = "\x69\x41", [0x4c57] = "\x69\x42", [0x4c58] = "\x69\x43",
-+  [0x4c59] = "\x69\x44", [0x4c5a] = "\x69\x45", [0x4c5b] = "\x69\x46",
-+  [0x4c5c] = "\x69\x47", [0x4c5d] = "\x69\x48", [0x4c5e] = "\x69\x49",
-+  [0x4c5f] = "\x69\x4a", [0x4c60] = "\x69\x4b", [0x4c61] = "\x69\x4c",
-+  [0x4c62] = "\x69\x4d", [0x4c63] = "\x69\x4e", [0x4c64] = "\x69\x4f",
-+  [0x4c65] = "\x69\x50", [0x4c66] = "\x69\x51", [0x4c67] = "\x69\x52",
-+  [0x4c68] = "\x69\x53", [0x4c69] = "\x69\x54", [0x4c6a] = "\x69\x55",
-+  [0x4c6b] = "\x69\x56", [0x4c6c] = "\x69\x57", [0x4c6d] = "\x69\x58",
-+  [0x4c6e] = "\x69\x59", [0x4c6f] = "\x69\x5a", [0x4c70] = "\x69\x5b",
-+  [0x4c71] = "\x69\x5c", [0x4c72] = "\x69\x5d", [0x4c73] = "\x69\x5e",
-+  [0x4c74] = "\x69\x5f", [0x4c75] = "\x69\x60", [0x4c76] = "\x69\x61",
-+  [0x4c77] = "\x69\x62", [0x4c78] = "\x69\x63", [0x4c79] = "\x69\x64",
-+  [0x4c7a] = "\x69\x65", [0x4c7b] = "\x69\x66", [0x4c7c] = "\x69\x67",
-+  [0x4c7d] = "\x69\x68", [0x4c7e] = "\x69\x69", [0x4c7f] = "\x69\x6a",
-+  [0x4c80] = "\x69\x6b", [0x4c81] = "\x69\x6c", [0x4c82] = "\x69\x6d",
-+  [0x4c83] = "\x69\x6e", [0x4c84] = "\x69\x6f", [0x4c85] = "\x69\x70",
-+  [0x4c86] = "\x69\x71", [0x4c87] = "\x69\x72", [0x4c88] = "\x69\x73",
-+  [0x4c89] = "\x69\x74", [0x4c8a] = "\x69\x75", [0x4c8b] = "\x69\x76",
-+  [0x4c8c] = "\x69\x77", [0x4c8d] = "\x69\x78", [0x4c8e] = "\x69\x79",
-+  [0x4c8f] = "\x69\x7a", [0x4c90] = "\x69\x7b", [0x4c91] = "\x69\x7c",
-+  [0x4c92] = "\x69\x7d", [0x4c93] = "\xfe\x98", [0x4c94] = "\xfe\x99",
-+  [0x4c95] = "\xfe\x9a", [0x4c96] = "\xfe\x9b", [0x4c97] = "\xfe\x9c",
-+  [0x4c98] = "\xfe\x9d", [0x4c99] = "\xfe\x9e", [0x4c9a] = "\x69\x7e",
-+  [0x4c9b] = "\x69\x7f", [0x4c9c] = "\x69\x80", [0x4c9d] = "\x69\x81",
-+  [0x4c9e] = "\x69\x82", [0x4c9f] = "\x69\x83", [0x4ca0] = "\x69\x84",
-+  [0x4ca1] = "\x69\x85", [0x4ca2] = "\x69\x86", [0x4ca3] = "\x69\x87",
-+  [0x4ca4] = "\x69\x88", [0x4ca5] = "\x69\x89", [0x4ca6] = "\x69\x8a",
-+  [0x4ca7] = "\x69\x8b", [0x4ca8] = "\x69\x8c", [0x4ca9] = "\x69\x8d",
-+  [0x4caa] = "\x69\x8e", [0x4cab] = "\x69\x8f", [0x4cac] = "\x69\x90",
-+  [0x4cad] = "\x69\x91", [0x4cae] = "\x69\x92", [0x4caf] = "\x69\x93",
-+  [0x4cb0] = "\x69\x94", [0x4cb1] = "\x69\x95", [0x4cb2] = "\x69\x96",
-+  [0x4cb3] = "\x69\x97", [0x4cb4] = "\x69\x98", [0x4cb5] = "\x69\x99",
-+  [0x4cb6] = "\x69\x9a", [0x4cb7] = "\x69\x9b", [0x4cb8] = "\x69\x9c",
-+  [0x4cb9] = "\x69\x9d", [0x4cba] = "\x69\x9e", [0x4cbb] = "\x69\x9f",
-+  [0x4cbc] = "\x69\xa0", [0x4cbd] = "\x69\xa1", [0x4cbe] = "\x69\xa2",
-+  [0x4cbf] = "\x69\xa3", [0x4cc0] = "\x69\xa4", [0x4cc1] = "\x69\xa5",
-+  [0x4cc2] = "\x69\xa6", [0x4cc3] = "\x69\xa7", [0x4cc4] = "\x69\xa8",
-+  [0x4cc5] = "\x69\xa9", [0x4cc6] = "\x69\xaa", [0x4cc7] = "\x69\xab",
-+  [0x4cc8] = "\x69\xac", [0x4cc9] = "\x69\xad", [0x4cca] = "\x69\xae",
-+  [0x4ccb] = "\x69\xaf", [0x4ccc] = "\x69\xb0", [0x4ccd] = "\x69\xb1",
-+  [0x4cce] = "\x69\xb2", [0x4ccf] = "\x69\xb3", [0x4cd0] = "\x69\xb4",
-+  [0x4cd1] = "\x69\xb5", [0x4cd2] = "\x69\xb6", [0x4cd3] = "\x69\xb7",
-+  [0x4cd4] = "\x69\xb8", [0x4cd5] = "\x69\xb9", [0x4cd6] = "\x69\xba",
-+  [0x4cd7] = "\x69\xbb", [0x4cd8] = "\x69\xbc", [0x4cd9] = "\x69\xbd",
-+  [0x4cda] = "\x69\xbe", [0x4cdb] = "\x69\xbf", [0x4cdc] = "\x69\xc0",
-+  [0x4cdd] = "\x69\xc1", [0x4cde] = "\x69\xc2", [0x4cdf] = "\x69\xc3",
-+  [0x4ce0] = "\x69\xc4", [0x4ce1] = "\x69\xc5", [0x4ce2] = "\x69\xc6",
-+  [0x4ce3] = "\x69\xc7", [0x4ce4] = "\x69\xc8", [0x4ce5] = "\x69\xc9",
-+  [0x4ce6] = "\x69\xca", [0x4ce7] = "\x69\xcb", [0x4ce8] = "\x69\xcc",
-+  [0x4ce9] = "\x69\xcd", [0x4cea] = "\x69\xce", [0x4ceb] = "\x69\xcf",
-+  [0x4cec] = "\x69\xd0", [0x4ced] = "\x69\xd1", [0x4cee] = "\x69\xd2",
-+  [0x4cef] = "\x69\xd3", [0x4cf0] = "\x69\xd4", [0x4cf1] = "\x69\xd5",
-+  [0x4cf2] = "\x69\xd6", [0x4cf3] = "\x69\xd7", [0x4cf4] = "\x69\xd8",
-+  [0x4cf5] = "\x69\xd9", [0x4cf6] = "\x69\xda", [0x4cf7] = "\x69\xdb",
-+  [0x4cf8] = "\x69\xdc", [0x4cf9] = "\x69\xdd", [0x4cfa] = "\x69\xde",
-+  [0x4cfb] = "\x69\xdf", [0x4cfc] = "\x69\xe0", [0x4cfd] = "\x69\xe1",
-+  [0x4cfe] = "\x69\xe2", [0x4cff] = "\x69\xe3", [0x4d00] = "\x69\xe4",
-+  [0x4d01] = "\x69\xe5", [0x4d02] = "\x69\xe6", [0x4d03] = "\x69\xe7",
-+  [0x4d04] = "\x69\xe8", [0x4d05] = "\x69\xe9", [0x4d06] = "\x69\xea",
-+  [0x4d07] = "\x69\xeb", [0x4d08] = "\x69\xec", [0x4d09] = "\x69\xed",
-+  [0x4d0a] = "\x69\xee", [0x4d0b] = "\x69\xef", [0x4d0c] = "\x69\xf0",
-+  [0x4d0d] = "\x69\xf1", [0x4d0e] = "\x69\xf2", [0x4d0f] = "\x69\xf3",
-+  [0x4d10] = "\x69\xf4", [0x4d11] = "\x69\xf5", [0x4d12] = "\x69\xf6",
-+  [0x4d13] = "\x69\xf7", [0x4d14] = "\x69\xf8", [0x4d15] = "\x69\xf9",
-+  [0x4d16] = "\x69\xfa", [0x4d17] = "\x69\xfb", [0x4d18] = "\x69\xfc",
-+  [0x4d19] = "\x69\xfd", [0x4d1a] = "\x69\xfe", [0x4d1b] = "\x69\xff",
-+  [0x4d1c] = "\x6a\x00", [0x4d1d] = "\x6a\x01", [0x4d1e] = "\x6a\x02",
-+  [0x4d1f] = "\x6a\x03", [0x4d20] = "\x6a\x04", [0x4d21] = "\x6a\x05",
-+  [0x4d22] = "\x6a\x06", [0x4d23] = "\x6a\x07", [0x4d24] = "\x6a\x08",
-+  [0x4d25] = "\x6a\x09", [0x4d26] = "\x6a\x0a", [0x4d27] = "\x6a\x0b",
-+  [0x4d28] = "\x6a\x0c", [0x4d29] = "\x6a\x0d", [0x4d2a] = "\x6a\x0e",
-+  [0x4d2b] = "\x6a\x0f", [0x4d2c] = "\x6a\x10", [0x4d2d] = "\x6a\x11",
-+  [0x4d2e] = "\xfe\x9f", [0x4d2f] = "\x6a\x12", [0x4d30] = "\x6a\x13",
-+  [0x4d31] = "\x6a\x14", [0x4d32] = "\x6a\x15", [0x4d33] = "\x6a\x16",
-+  [0x4d34] = "\x6a\x17", [0x4d35] = "\x6a\x18", [0x4d36] = "\x6a\x19",
-+  [0x4d37] = "\x6a\x1a", [0x4d38] = "\x6a\x1b", [0x4d39] = "\x6a\x1c",
-+  [0x4d3a] = "\x6a\x1d", [0x4d3b] = "\x6a\x1e", [0x4d3c] = "\x6a\x1f",
-+  [0x4d3d] = "\x6a\x20", [0x4d3e] = "\x6a\x21", [0x4d3f] = "\x6a\x22",
-   [0x4d40] = "\x6a\x23", [0x4d41] = "\x6a\x24", [0x4d42] = "\x6a\x25",
-   [0x4d43] = "\x6a\x26", [0x4d44] = "\x6a\x27", [0x4d45] = "\x6a\x28",
-   [0x4d46] = "\x6a\x29", [0x4d47] = "\x6a\x2a", [0x4d48] = "\x6a\x2b",
-@@ -17043,7 +22736,15 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-   [0x9f1b] = "\xed\xe8", [0x9f1c] = "\xfd\x94", [0x9f1d] = "\xfd\x95",
-   [0x9f1e] = "\xfd\x96", [0x9f1f] = "\xb9\xea", [0x9f20] = "\xd9\xdf",
-   [0x9f21] = "\xfd\x97", [0x9f22] = "\xfd\x98", [0x9f23] = "\xfd\x99",
--  [0x9f24] = "\xfd\x9a", [0x9f25] = "\xfd\x9b",
-+  [0x9f24] = "\xfd\x9a", [0x9f25] = "\xfd\x9b", [0x9f26] = "\x6a\x63",
-+  [0x9f27] = "\x6a\x64", [0x9f28] = "\x6a\x65", [0x9f29] = "\x6a\x66",
-+  [0x9f2a] = "\x6a\x67", [0x9f2b] = "\x6a\x68", [0x9f2c] = "\x6a\x69",
-+  [0x9f2d] = "\x6a\x6a", [0x9f2e] = "\x6a\x6b", [0x9f2f] = "\x6a\x6c",
-+  [0x9f30] = "\x6a\x6d", [0x9f31] = "\x6a\x6e", [0x9f32] = "\x6a\x6f",
-+  [0x9f33] = "\x6a\x70", [0x9f34] = "\xfe\x59", [0x9f35] = "\xfe\x61",
-+  [0x9f36] = "\xfe\x66", [0x9f37] = "\xfe\x67", [0x9f38] = "\xfe\x6d",
-+  [0x9f39] = "\xfe\x7e", [0x9f3a] = "\xfe\x90", [0x9f3b] = "\xfe\xa0",
-+
- };
- 
- /* Table for UCS-4 -> GB18030, for the range U+E000..U+FFFF.
-@@ -17059,7 +22760,8 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
-    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-    (locally (declare (compile))
-      (let ((count 0)
--	   (range-start #xE000) (range-end #xFFFF))
-+	   (range-start #xE000) (range-end #xFFFF)
-+	   (gap-start #xE865) (gap-end #xF92C))
-        (flet ((output-pair (ucs entry)
- 		(when (= (mod count 3) 0)
- 		  (format t " "))
-@@ -17092,7 +22794,8 @@ static const unsigned char __ucs_to_gb18030_tab1[][2] =
- 				       (- ch3 #x81))
- 				    10)
- 				 (- ch4 #x30))))
--		 (when (<= range-start ucs range-end)
-+		 (when (and (<= range-start ucs range-end)
-+			    (not (<= gap-start ucs gap-end)))
- 		   (assert (>= linear 7457))
- 		   (assert (< (- linear 7456) #x8100))
- 		   (output-pair ucs (- linear 7456))))))))
-@@ -17746,79 +23449,71 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
-   [0x0783] = "\xa5\xfd", [0x0784] = "\xa5\xfe", [0x0785] = "\xa6\xb9",
-   [0x0786] = "\xa6\xba", [0x0787] = "\xa6\xbb", [0x0788] = "\xa6\xbc",
-   [0x0789] = "\xa6\xbd", [0x078a] = "\xa6\xbe", [0x078b] = "\xa6\xbf",
--  [0x078c] = "\xa6\xc0", [0x078d] = "\xa6\xd9", [0x078e] = "\xa6\xda",
--  [0x078f] = "\xa6\xdb", [0x0790] = "\xa6\xdc", [0x0791] = "\xa6\xdd",
--  [0x0792] = "\xa6\xde", [0x0793] = "\xa6\xdf", [0x0794] = "\xa6\xec",
--  [0x0795] = "\xa6\xed", [0x0796] = "\xa6\xf3", [0x0797] = "\xa6\xf6",
--  [0x0798] = "\xa6\xf7", [0x0799] = "\xa6\xf8", [0x079a] = "\xa6\xf9",
--  [0x079b] = "\xa6\xfa", [0x079c] = "\xa6\xfb", [0x079d] = "\xa6\xfc",
--  [0x079e] = "\xa6\xfd", [0x079f] = "\xa6\xfe", [0x07a0] = "\xa7\xc2",
--  [0x07a1] = "\xa7\xc3", [0x07a2] = "\xa7\xc4", [0x07a3] = "\xa7\xc5",
--  [0x07a4] = "\xa7\xc6", [0x07a5] = "\xa7\xc7", [0x07a6] = "\xa7\xc8",
--  [0x07a7] = "\xa7\xc9", [0x07a8] = "\xa7\xca", [0x07a9] = "\xa7\xcb",
--  [0x07aa] = "\xa7\xcc", [0x07ab] = "\xa7\xcd", [0x07ac] = "\xa7\xce",
--  [0x07ad] = "\xa7\xcf", [0x07ae] = "\xa7\xd0", [0x07af] = "\xa7\xf2",
--  [0x07b0] = "\xa7\xf3", [0x07b1] = "\xa7\xf4", [0x07b2] = "\xa7\xf5",
--  [0x07b3] = "\xa7\xf6", [0x07b4] = "\xa7\xf7", [0x07b5] = "\xa7\xf8",
--  [0x07b6] = "\xa7\xf9", [0x07b7] = "\xa7\xfa", [0x07b8] = "\xa7\xfb",
--  [0x07b9] = "\xa7\xfc", [0x07ba] = "\xa7\xfd", [0x07bb] = "\xa7\xfe",
--  [0x07bc] = "\xa8\x96", [0x07bd] = "\xa8\x97", [0x07be] = "\xa8\x98",
--  [0x07bf] = "\xa8\x99", [0x07c0] = "\xa8\x9a", [0x07c1] = "\xa8\x9b",
--  [0x07c2] = "\xa8\x9c", [0x07c3] = "\xa8\x9d", [0x07c4] = "\xa8\x9e",
--  [0x07c5] = "\xa8\x9f", [0x07c6] = "\xa8\xa0", [0x07c7] = "\x00\x01",
--  [0x07c8] = "\x65\x9e", [0x07c9] = "\xa8\xc1", [0x07ca] = "\xa8\xc2",
--  [0x07cb] = "\xa8\xc3", [0x07cc] = "\xa8\xc4", [0x07cd] = "\xa8\xea",
--  [0x07ce] = "\xa8\xeb", [0x07cf] = "\xa8\xec", [0x07d0] = "\xa8\xed",
--  [0x07d1] = "\xa8\xee", [0x07d2] = "\xa8\xef", [0x07d3] = "\xa8\xf0",
--  [0x07d4] = "\xa8\xf1", [0x07d5] = "\xa8\xf2", [0x07d6] = "\xa8\xf3",
--  [0x07d7] = "\xa8\xf4", [0x07d8] = "\xa8\xf5", [0x07d9] = "\xa8\xf6",
--  [0x07da] = "\xa8\xf7", [0x07db] = "\xa8\xf8", [0x07dc] = "\xa8\xf9",
--  [0x07dd] = "\xa8\xfa", [0x07de] = "\xa8\xfb", [0x07df] = "\xa8\xfc",
--  [0x07e0] = "\xa8\xfd", [0x07e1] = "\xa8\xfe", [0x07e2] = "\xa9\x58",
--  [0x07e3] = "\xa9\x5b", [0x07e4] = "\xa9\x5d", [0x07e5] = "\xa9\x5e",
--  [0x07e6] = "\xa9\x5f", [0x07e7] = "\x65\x9f", [0x07e8] = "\x65\xa0",
--  [0x07e9] = "\x65\xa1", [0x07ea] = "\x65\xa2", [0x07eb] = "\x65\xa3",
--  [0x07ec] = "\x65\xa4", [0x07ed] = "\x65\xa5", [0x07ee] = "\x65\xa6",
--  [0x07ef] = "\x65\xa7", [0x07f0] = "\x65\xa8", [0x07f1] = "\x65\xa9",
--  [0x07f2] = "\x65\xaa", [0x07f3] = "\x65\xab", [0x07f4] = "\xa9\x97",
--  [0x07f5] = "\xa9\x98", [0x07f6] = "\xa9\x99", [0x07f7] = "\xa9\x9a",
--  [0x07f8] = "\xa9\x9b", [0x07f9] = "\xa9\x9c", [0x07fa] = "\xa9\x9d",
--  [0x07fb] = "\xa9\x9e", [0x07fc] = "\xa9\x9f", [0x07fd] = "\xa9\xa0",
--  [0x07fe] = "\xa9\xa1", [0x07ff] = "\xa9\xa2", [0x0800] = "\xa9\xa3",
--  [0x0801] = "\xa9\xf0", [0x0802] = "\xa9\xf1", [0x0803] = "\xa9\xf2",
--  [0x0804] = "\xa9\xf3", [0x0805] = "\xa9\xf4", [0x0806] = "\xa9\xf5",
--  [0x0807] = "\xa9\xf6", [0x0808] = "\xa9\xf7", [0x0809] = "\xa9\xf8",
--  [0x080a] = "\xa9\xf9", [0x080b] = "\xa9\xfa", [0x080c] = "\xa9\xfb",
--  [0x080d] = "\xa9\xfc", [0x080e] = "\xa9\xfd", [0x080f] = "\xa9\xfe",
--  [0x0810] = "\xd7\xfa", [0x0811] = "\xd7\xfb", [0x0812] = "\xd7\xfc",
--  [0x0813] = "\xd7\xfd", [0x0814] = "\xd7\xfe", [0x0815] = "\x65\xac",
--  [0x0816] = "\xfe\x51", [0x0817] = "\xfe\x52", [0x0818] = "\xfe\x53",
--  [0x0819] = "\x65\xad", [0x081a] = "\x65\xae", [0x081b] = "\x65\xaf",
--  [0x081c] = "\x65\xb0", [0x081d] = "\x65\xb1", [0x081e] = "\xfe\x59",
--  [0x081f] = "\x65\xb2", [0x0820] = "\x65\xb3", [0x0821] = "\x65\xb4",
--  [0x0822] = "\x65\xb5", [0x0823] = "\x65\xb6", [0x0824] = "\x65\xb7",
--  [0x0825] = "\x65\xb8", [0x0826] = "\xfe\x61", [0x0827] = "\x65\xb9",
-+  [0x078c] = "\xa6\xc0", [0x0797] = "\xa6\xf6", [0x0798] = "\xa6\xf7",
-+  [0x0799] = "\xa6\xf8", [0x079a] = "\xa6\xf9", [0x079b] = "\xa6\xfa",
-+  [0x079c] = "\xa6\xfb", [0x079d] = "\xa6\xfc", [0x079e] = "\xa6\xfd",
-+  [0x079f] = "\xa6\xfe", [0x07a0] = "\xa7\xc2", [0x07a1] = "\xa7\xc3",
-+  [0x07a2] = "\xa7\xc4", [0x07a3] = "\xa7\xc5", [0x07a4] = "\xa7\xc6",
-+  [0x07a5] = "\xa7\xc7", [0x07a6] = "\xa7\xc8", [0x07a7] = "\xa7\xc9",
-+  [0x07a8] = "\xa7\xca", [0x07a9] = "\xa7\xcb", [0x07aa] = "\xa7\xcc",
-+  [0x07ab] = "\xa7\xcd", [0x07ac] = "\xa7\xce", [0x07ad] = "\xa7\xcf",
-+  [0x07ae] = "\xa7\xd0", [0x07af] = "\xa7\xf2", [0x07b0] = "\xa7\xf3",
-+  [0x07b1] = "\xa7\xf4", [0x07b2] = "\xa7\xf5", [0x07b3] = "\xa7\xf6",
-+  [0x07b4] = "\xa7\xf7", [0x07b5] = "\xa7\xf8", [0x07b6] = "\xa7\xf9",
-+  [0x07b7] = "\xa7\xfa", [0x07b8] = "\xa7\xfb", [0x07b9] = "\xa7\xfc",
-+  [0x07ba] = "\xa7\xfd", [0x07bb] = "\xa7\xfe", [0x07bc] = "\xa8\x96",
-+  [0x07bd] = "\xa8\x97", [0x07be] = "\xa8\x98", [0x07bf] = "\xa8\x99",
-+  [0x07c0] = "\xa8\x9a", [0x07c1] = "\xa8\x9b", [0x07c2] = "\xa8\x9c",
-+  [0x07c3] = "\xa8\x9d", [0x07c4] = "\xa8\x9e", [0x07c5] = "\xa8\x9f",
-+  [0x07c6] = "\xa8\xa0", [0x07c7] = "\x00\x01", [0x07c8] = "\x65\x9e",
-+  [0x07c9] = "\xa8\xc1", [0x07ca] = "\xa8\xc2", [0x07cb] = "\xa8\xc3",
-+  [0x07cc] = "\xa8\xc4", [0x07cd] = "\xa8\xea", [0x07ce] = "\xa8\xeb",
-+  [0x07cf] = "\xa8\xec", [0x07d0] = "\xa8\xed", [0x07d1] = "\xa8\xee",
-+  [0x07d2] = "\xa8\xef", [0x07d3] = "\xa8\xf0", [0x07d4] = "\xa8\xf1",
-+  [0x07d5] = "\xa8\xf2", [0x07d6] = "\xa8\xf3", [0x07d7] = "\xa8\xf4",
-+  [0x07d8] = "\xa8\xf5", [0x07d9] = "\xa8\xf6", [0x07da] = "\xa8\xf7",
-+  [0x07db] = "\xa8\xf8", [0x07dc] = "\xa8\xf9", [0x07dd] = "\xa8\xfa",
-+  [0x07de] = "\xa8\xfb", [0x07df] = "\xa8\xfc", [0x07e0] = "\xa8\xfd",
-+  [0x07e1] = "\xa8\xfe", [0x07e2] = "\xa9\x58", [0x07e3] = "\xa9\x5b",
-+  [0x07e4] = "\xa9\x5d", [0x07e5] = "\xa9\x5e", [0x07e6] = "\xa9\x5f",
-+  [0x07e7] = "\x65\x9f", [0x07e8] = "\x65\xa0", [0x07e9] = "\x65\xa1",
-+  [0x07ea] = "\x65\xa2", [0x07eb] = "\x65\xa3", [0x07ec] = "\x65\xa4",
-+  [0x07ed] = "\x65\xa5", [0x07ee] = "\x65\xa6", [0x07ef] = "\x65\xa7",
-+  [0x07f0] = "\x65\xa8", [0x07f1] = "\x65\xa9", [0x07f2] = "\x65\xaa",
-+  [0x07f3] = "\x65\xab", [0x07f4] = "\xa9\x97", [0x07f5] = "\xa9\x98",
-+  [0x07f6] = "\xa9\x99", [0x07f7] = "\xa9\x9a", [0x07f8] = "\xa9\x9b",
-+  [0x07f9] = "\xa9\x9c", [0x07fa] = "\xa9\x9d", [0x07fb] = "\xa9\x9e",
-+  [0x07fc] = "\xa9\x9f", [0x07fd] = "\xa9\xa0", [0x07fe] = "\xa9\xa1",
-+  [0x07ff] = "\xa9\xa2", [0x0800] = "\xa9\xa3", [0x0801] = "\xa9\xf0",
-+  [0x0802] = "\xa9\xf1", [0x0803] = "\xa9\xf2", [0x0804] = "\xa9\xf3",
-+  [0x0805] = "\xa9\xf4", [0x0806] = "\xa9\xf5", [0x0807] = "\xa9\xf6",
-+  [0x0808] = "\xa9\xf7", [0x0809] = "\xa9\xf8", [0x080a] = "\xa9\xf9",
-+  [0x080b] = "\xa9\xfa", [0x080c] = "\xa9\xfb", [0x080d] = "\xa9\xfc",
-+  [0x080e] = "\xa9\xfd", [0x080f] = "\xa9\xfe", [0x0810] = "\xd7\xfa",
-+  [0x0811] = "\xd7\xfb", [0x0812] = "\xd7\xfc", [0x0813] = "\xd7\xfd",
-+  [0x0814] = "\xd7\xfe", [0x0815] = "\x65\xac", [0x0819] = "\x65\xad",
-+  [0x081a] = "\x65\xae", [0x081b] = "\x65\xaf", [0x081c] = "\x65\xb0",
-+  [0x081d] = "\x65\xb1", [0x081f] = "\x65\xb2", [0x0820] = "\x65\xb3",
-+  [0x0821] = "\x65\xb4", [0x0822] = "\x65\xb5", [0x0823] = "\x65\xb6",
-+  [0x0824] = "\x65\xb7", [0x0825] = "\x65\xb8", [0x0827] = "\x65\xb9",
-   [0x0828] = "\x65\xba", [0x0829] = "\x65\xbb", [0x082a] = "\x65\xbc",
--  [0x082b] = "\xfe\x66", [0x082c] = "\xfe\x67", [0x082d] = "\x65\xbd",
--  [0x082e] = "\x65\xbe", [0x082f] = "\x65\xbf", [0x0830] = "\x65\xc0",
--  [0x0831] = "\xfe\x6c", [0x0832] = "\xfe\x6d", [0x0833] = "\x65\xc1",
--  [0x0834] = "\x65\xc2", [0x0835] = "\x65\xc3", [0x0836] = "\x65\xc4",
--  [0x0837] = "\x65\xc5", [0x0838] = "\x65\xc6", [0x0839] = "\x65\xc7",
--  [0x083a] = "\x65\xc8", [0x083b] = "\xfe\x76", [0x083c] = "\x65\xc9",
--  [0x083d] = "\x65\xca", [0x083e] = "\x65\xcb", [0x083f] = "\x65\xcc",
--  [0x0840] = "\x65\xcd", [0x0841] = "\x65\xce", [0x0842] = "\x65\xcf",
--  [0x0843] = "\xfe\x7e", [0x0844] = "\x65\xd0", [0x0845] = "\x65\xd1",
-+  [0x082d] = "\x65\xbd", [0x082e] = "\x65\xbe", [0x082f] = "\x65\xbf",
-+  [0x0830] = "\x65\xc0", [0x0833] = "\x65\xc1", [0x0834] = "\x65\xc2",
-+  [0x0835] = "\x65\xc3", [0x0836] = "\x65\xc4", [0x0837] = "\x65\xc5",
-+  [0x0838] = "\x65\xc6", [0x0839] = "\x65\xc7", [0x083a] = "\x65\xc8",
-+  [0x083c] = "\x65\xc9", [0x083d] = "\x65\xca", [0x083e] = "\x65\xcb",
-+  [0x083f] = "\x65\xcc", [0x0840] = "\x65\xcd", [0x0841] = "\x65\xce",
-+  [0x0842] = "\x65\xcf", [0x0844] = "\x65\xd0", [0x0845] = "\x65\xd1",
-   [0x0846] = "\x65\xd2", [0x0847] = "\x65\xd3", [0x0848] = "\x65\xd4",
-   [0x0849] = "\x65\xd5", [0x084a] = "\x65\xd6", [0x084b] = "\x65\xd7",
-   [0x084c] = "\x65\xd8", [0x084d] = "\x65\xd9", [0x084e] = "\x65\xda",
-   [0x084f] = "\x65\xdb", [0x0850] = "\x65\xdc", [0x0851] = "\x65\xdd",
--  [0x0852] = "\x65\xde", [0x0853] = "\x65\xdf", [0x0854] = "\xfe\x90",
--  [0x0855] = "\xfe\x91", [0x0856] = "\x65\xe0", [0x0857] = "\x65\xe1",
--  [0x0858] = "\x65\xe2", [0x0859] = "\x65\xe3", [0x085a] = "\x65\xe4",
--  [0x085b] = "\x65\xe5", [0x085c] = "\x65\xe6", [0x085d] = "\x65\xe7",
--  [0x085e] = "\x65\xe8", [0x085f] = "\x65\xe9", [0x0860] = "\x65\xea",
--  [0x0861] = "\x65\xeb", [0x0862] = "\x65\xec", [0x0863] = "\x65\xed",
--  [0x0864] = "\xfe\xa0", [0x0865] = "\xfd\x9c", [0x0866] = "\x76\xb5",
-+  [0x0852] = "\x65\xde", [0x0853] = "\x65\xdf", [0x0856] = "\x65\xe0",
-+  [0x0857] = "\x65\xe1", [0x0858] = "\x65\xe2", [0x0859] = "\x65\xe3",
-+  [0x085a] = "\x65\xe4", [0x085b] = "\x65\xe5", [0x085c] = "\x65\xe6",
-+  [0x085d] = "\x65\xe7", [0x085e] = "\x65\xe8", [0x085f] = "\x65\xe9",
-+  [0x0860] = "\x65\xea", [0x0861] = "\x65\xeb", [0x0862] = "\x65\xec",
-+  [0x0863] = "\x65\xed", [0x0865] = "\xfd\x9c", [0x0866] = "\x76\xb5",
-   [0x0867] = "\x76\xb6", [0x0868] = "\x76\xb7", [0x0869] = "\x76\xb8",
-   [0x086a] = "\x76\xb9", [0x086b] = "\x76\xba", [0x086c] = "\x76\xbb",
-   [0x086d] = "\x76\xbc", [0x086e] = "\x76\xbd", [0x086f] = "\x76\xbe",
-@@ -17903,145 +23598,505 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
-   [0x095a] = "\xfe\x4a", [0x095b] = "\x77\x9b", [0x095c] = "\xfe\x4b",
-   [0x095d] = "\xfe\x4c", [0x095e] = "\x77\x9c", [0x095f] = "\x77\x9d",
-   [0x0960] = "\xfe\x4d", [0x0961] = "\xfe\x4e", [0x0962] = "\xfe\x4f",
--  [0x0d69] = "\xa9\x55", [0x0d6a] = "\xa6\xf2", [0x0d6b] = "\x7b\xa4",
--  [0x0d6c] = "\xa6\xf4", [0x0d6d] = "\xa6\xf5", [0x0d6e] = "\xa6\xe0",
--  [0x0d6f] = "\xa6\xe1", [0x0d70] = "\xa6\xf0", [0x0d71] = "\xa6\xf1",
--  [0x0d72] = "\xa6\xe2", [0x0d73] = "\xa6\xe3", [0x0d74] = "\xa6\xee",
--  [0x0d75] = "\xa6\xef", [0x0d76] = "\xa6\xe6", [0x0d77] = "\xa6\xe7",
--  [0x0d78] = "\xa6\xe4", [0x0d79] = "\xa6\xe5", [0x0d7a] = "\xa6\xe8",
--  [0x0d7b] = "\xa6\xe9", [0x0d7c] = "\xa6\xea", [0x0d7d] = "\xa6\xeb",
--  [0x0d7e] = "\x7b\xa5", [0x0d7f] = "\x7b\xa6", [0x0d80] = "\x7b\xa7",
--  [0x0d81] = "\x7b\xa8", [0x0d82] = "\xa9\x68", [0x0d83] = "\xa9\x69",
--  [0x0d84] = "\xa9\x6a", [0x0d85] = "\xa9\x6b", [0x0d86] = "\xa9\x6c",
--  [0x0d87] = "\xa9\x6d", [0x0d88] = "\xa9\x6e", [0x0d89] = "\xa9\x6f",
--  [0x0d8a] = "\xa9\x70", [0x0d8b] = "\xa9\x71", [0x0d8d] = "\xa9\x72",
--  [0x0d8e] = "\xa9\x73", [0x0d8f] = "\xa9\x74", [0x0d90] = "\xa9\x75",
--  [0x0d91] = "\x7b\xaa", [0x0d92] = "\xa9\x76", [0x0d93] = "\xa9\x77",
--  [0x0d94] = "\xa9\x78", [0x0d95] = "\xa9\x79", [0x0d96] = "\xa9\x7a",
--  [0x0d97] = "\xa9\x7b", [0x0d98] = "\xa9\x7c", [0x0d99] = "\xa9\x7d",
--  [0x0d9a] = "\xa9\x7e", [0x0d9b] = "\xa9\x80", [0x0d9c] = "\xa9\x81",
--  [0x0d9d] = "\xa9\x82", [0x0d9e] = "\xa9\x83", [0x0d9f] = "\xa9\x84",
-+  [0x0963] = "\x77\x9e", [0x0964] = "\x77\x9f", [0x0965] = "\x77\xa0",
-+  [0x0966] = "\x77\xa1", [0x0967] = "\x77\xa2", [0x0968] = "\x77\xa3",
-+  [0x0969] = "\x77\xa4", [0x096a] = "\x77\xa5", [0x096b] = "\x77\xa6",
-+  [0x096c] = "\x77\xa7", [0x096d] = "\x77\xa8", [0x096e] = "\x77\xa9",
-+  [0x096f] = "\x77\xaa", [0x0970] = "\x77\xab", [0x0971] = "\x77\xac",
-+  [0x0972] = "\x77\xad", [0x0973] = "\x77\xae", [0x0974] = "\x77\xaf",
-+  [0x0975] = "\x77\xb0", [0x0976] = "\x77\xb1", [0x0977] = "\x77\xb2",
-+  [0x0978] = "\x77\xb3", [0x0979] = "\x77\xb4", [0x097a] = "\x77\xb5",
-+  [0x097b] = "\x77\xb6", [0x097c] = "\x77\xb7", [0x097d] = "\x77\xb8",
-+  [0x097e] = "\x77\xb9", [0x097f] = "\x77\xba", [0x0980] = "\x77\xbb",
-+  [0x0981] = "\x77\xbc", [0x0982] = "\x77\xbd", [0x0983] = "\x77\xbe",
-+  [0x0984] = "\x77\xbf", [0x0985] = "\x77\xc0", [0x0986] = "\x77\xc1",
-+  [0x0987] = "\x77\xc2", [0x0988] = "\x77\xc3", [0x0989] = "\x77\xc4",
-+  [0x098a] = "\x77\xc5", [0x098b] = "\x77\xc6", [0x098c] = "\x77\xc7",
-+  [0x098d] = "\x77\xc8", [0x098e] = "\x77\xc9", [0x098f] = "\x77\xca",
-+  [0x0990] = "\x77\xcb", [0x0991] = "\x77\xcc", [0x0992] = "\x77\xcd",
-+  [0x0993] = "\x77\xce", [0x0994] = "\x77\xcf", [0x0995] = "\x77\xd0",
-+  [0x0996] = "\x77\xd1", [0x0997] = "\x77\xd2", [0x0998] = "\x77\xd3",
-+  [0x0999] = "\x77\xd4", [0x099a] = "\x77\xd5", [0x099b] = "\x77\xd6",
-+  [0x099c] = "\x77\xd7", [0x099d] = "\x77\xd8", [0x099e] = "\x77\xd9",
-+  [0x099f] = "\x77\xda", [0x09a0] = "\x77\xdb", [0x09a1] = "\x77\xdc",
-+  [0x09a2] = "\x77\xdd", [0x09a3] = "\x77\xde", [0x09a4] = "\x77\xdf",
-+  [0x09a5] = "\x77\xe0", [0x09a6] = "\x77\xe1", [0x09a7] = "\x77\xe2",
-+  [0x09a8] = "\x77\xe3", [0x09a9] = "\x77\xe4", [0x09aa] = "\x77\xe5",
-+  [0x09ab] = "\x77\xe6", [0x09ac] = "\x77\xe7", [0x09ad] = "\x77\xe8",
-+  [0x09ae] = "\x77\xe9", [0x09af] = "\x77\xea", [0x09b0] = "\x77\xeb",
-+  [0x09b1] = "\x77\xec", [0x09b2] = "\x77\xed", [0x09b3] = "\x77\xee",
-+  [0x09b4] = "\x77\xef", [0x09b5] = "\x77\xf0", [0x09b6] = "\x77\xf1",
-+  [0x09b7] = "\x77\xf2", [0x09b8] = "\x77\xf3", [0x09b9] = "\x77\xf4",
-+  [0x09ba] = "\x77\xf5", [0x09bb] = "\x77\xf6", [0x09bc] = "\x77\xf7",
-+  [0x09bd] = "\x77\xf8", [0x09be] = "\x77\xf9", [0x09bf] = "\x77\xfa",
-+  [0x09c0] = "\x77\xfb", [0x09c1] = "\x77\xfc", [0x09c2] = "\x77\xfd",
-+  [0x09c3] = "\x77\xfe", [0x09c4] = "\x77\xff", [0x09c5] = "\x78\x00",
-+  [0x09c6] = "\x78\x01", [0x09c7] = "\x78\x02", [0x09c8] = "\x78\x03",
-+  [0x09c9] = "\x78\x04", [0x09ca] = "\x78\x05", [0x09cb] = "\x78\x06",
-+  [0x09cc] = "\x78\x07", [0x09cd] = "\x78\x08", [0x09ce] = "\x78\x09",
-+  [0x09cf] = "\x78\x0a", [0x09d0] = "\x78\x0b", [0x09d1] = "\x78\x0c",
-+  [0x09d2] = "\x78\x0d", [0x09d3] = "\x78\x0e", [0x09d4] = "\x78\x0f",
-+  [0x09d5] = "\x78\x10", [0x09d6] = "\x78\x11", [0x09d7] = "\x78\x12",
-+  [0x09d8] = "\x78\x13", [0x09d9] = "\x78\x14", [0x09da] = "\x78\x15",
-+  [0x09db] = "\x78\x16", [0x09dc] = "\x78\x17", [0x09dd] = "\x78\x18",
-+  [0x09de] = "\x78\x19", [0x09df] = "\x78\x1a", [0x09e0] = "\x78\x1b",
-+  [0x09e1] = "\x78\x1c", [0x09e2] = "\x78\x1d", [0x09e3] = "\x78\x1e",
-+  [0x09e4] = "\x78\x1f", [0x09e5] = "\x78\x20", [0x09e6] = "\x78\x21",
-+  [0x09e7] = "\x78\x22", [0x09e8] = "\x78\x23", [0x09e9] = "\x78\x24",
-+  [0x09ea] = "\x78\x25", [0x09eb] = "\x78\x26", [0x09ec] = "\x78\x27",
-+  [0x09ed] = "\x78\x28", [0x09ee] = "\x78\x29", [0x09ef] = "\x78\x2a",
-+  [0x09f0] = "\x78\x2b", [0x09f1] = "\x78\x2c", [0x09f2] = "\x78\x2d",
-+  [0x09f3] = "\x78\x2e", [0x09f4] = "\x78\x2f", [0x09f5] = "\x78\x30",
-+  [0x09f6] = "\x78\x31", [0x09f7] = "\x78\x32", [0x09f8] = "\x78\x33",
-+  [0x09f9] = "\x78\x34", [0x09fa] = "\x78\x35", [0x09fb] = "\x78\x36",
-+  [0x09fc] = "\x78\x37", [0x09fd] = "\x78\x38", [0x09fe] = "\x78\x39",
-+  [0x09ff] = "\x78\x3a", [0x0a00] = "\x78\x3b", [0x0a01] = "\x78\x3c",
-+  [0x0a02] = "\x78\x3d", [0x0a03] = "\x78\x3e", [0x0a04] = "\x78\x3f",
-+  [0x0a05] = "\x78\x40", [0x0a06] = "\x78\x41", [0x0a07] = "\x78\x42",
-+  [0x0a08] = "\x78\x43", [0x0a09] = "\x78\x44", [0x0a0a] = "\x78\x45",
-+  [0x0a0b] = "\x78\x46", [0x0a0c] = "\x78\x47", [0x0a0d] = "\x78\x48",
-+  [0x0a0e] = "\x78\x49", [0x0a0f] = "\x78\x4a", [0x0a10] = "\x78\x4b",
-+  [0x0a11] = "\x78\x4c", [0x0a12] = "\x78\x4d", [0x0a13] = "\x78\x4e",
-+  [0x0a14] = "\x78\x4f", [0x0a15] = "\x78\x50", [0x0a16] = "\x78\x51",
-+  [0x0a17] = "\x78\x52", [0x0a18] = "\x78\x53", [0x0a19] = "\x78\x54",
-+  [0x0a1a] = "\x78\x55", [0x0a1b] = "\x78\x56", [0x0a1c] = "\x78\x57",
-+  [0x0a1d] = "\x78\x58", [0x0a1e] = "\x78\x59", [0x0a1f] = "\x78\x5a",
-+  [0x0a20] = "\x78\x5b", [0x0a21] = "\x78\x5c", [0x0a22] = "\x78\x5d",
-+  [0x0a23] = "\x78\x5e", [0x0a24] = "\x78\x5f", [0x0a25] = "\x78\x60",
-+  [0x0a26] = "\x78\x61", [0x0a27] = "\x78\x62", [0x0a28] = "\x78\x63",
-+  [0x0a29] = "\x78\x64", [0x0a2a] = "\x78\x65", [0x0a2b] = "\x78\x66",
-+  [0x0a2c] = "\x78\x67", [0x0a2d] = "\x78\x68", [0x0a2e] = "\x78\x69",
-+  [0x0a2f] = "\x78\x6a", [0x0a30] = "\x78\x6b", [0x0a31] = "\x78\x6c",
-+  [0x0a32] = "\x78\x6d", [0x0a33] = "\x78\x6e", [0x0a34] = "\x78\x6f",
-+  [0x0a35] = "\x78\x70", [0x0a36] = "\x78\x71", [0x0a37] = "\x78\x72",
-+  [0x0a38] = "\x78\x73", [0x0a39] = "\x78\x74", [0x0a3a] = "\x78\x75",
-+  [0x0a3b] = "\x78\x76", [0x0a3c] = "\x78\x77", [0x0a3d] = "\x78\x78",
-+  [0x0a3e] = "\x78\x79", [0x0a3f] = "\x78\x7a", [0x0a40] = "\x78\x7b",
-+  [0x0a41] = "\x78\x7c", [0x0a42] = "\x78\x7d", [0x0a43] = "\x78\x7e",
-+  [0x0a44] = "\x78\x7f", [0x0a45] = "\x78\x80", [0x0a46] = "\x78\x81",
-+  [0x0a47] = "\x78\x82", [0x0a48] = "\x78\x83", [0x0a49] = "\x78\x84",
-+  [0x0a4a] = "\x78\x85", [0x0a4b] = "\x78\x86", [0x0a4c] = "\x78\x87",
-+  [0x0a4d] = "\x78\x88", [0x0a4e] = "\x78\x89", [0x0a4f] = "\x78\x8a",
-+  [0x0a50] = "\x78\x8b", [0x0a51] = "\x78\x8c", [0x0a52] = "\x78\x8d",
-+  [0x0a53] = "\x78\x8e", [0x0a54] = "\x78\x8f", [0x0a55] = "\x78\x90",
-+  [0x0a56] = "\x78\x91", [0x0a57] = "\x78\x92", [0x0a58] = "\x78\x93",
-+  [0x0a59] = "\x78\x94", [0x0a5a] = "\x78\x95", [0x0a5b] = "\x78\x96",
-+  [0x0a5c] = "\x78\x97", [0x0a5d] = "\x78\x98", [0x0a5e] = "\x78\x99",
-+  [0x0a5f] = "\x78\x9a", [0x0a60] = "\x78\x9b", [0x0a61] = "\x78\x9c",
-+  [0x0a62] = "\x78\x9d", [0x0a63] = "\x78\x9e", [0x0a64] = "\x78\x9f",
-+  [0x0a65] = "\x78\xa0", [0x0a66] = "\x78\xa1", [0x0a67] = "\x78\xa2",
-+  [0x0a68] = "\x78\xa3", [0x0a69] = "\x78\xa4", [0x0a6a] = "\x78\xa5",
-+  [0x0a6b] = "\x78\xa6", [0x0a6c] = "\x78\xa7", [0x0a6d] = "\x78\xa8",
-+  [0x0a6e] = "\x78\xa9", [0x0a6f] = "\x78\xaa", [0x0a70] = "\x78\xab",
-+  [0x0a71] = "\x78\xac", [0x0a72] = "\x78\xad", [0x0a73] = "\x78\xae",
-+  [0x0a74] = "\x78\xaf", [0x0a75] = "\x78\xb0", [0x0a76] = "\x78\xb1",
-+  [0x0a77] = "\x78\xb2", [0x0a78] = "\x78\xb3", [0x0a79] = "\x78\xb4",
-+  [0x0a7a] = "\x78\xb5", [0x0a7b] = "\x78\xb6", [0x0a7c] = "\x78\xb7",
-+  [0x0a7d] = "\x78\xb8", [0x0a7e] = "\x78\xb9", [0x0a7f] = "\x78\xba",
-+  [0x0a80] = "\x78\xbb", [0x0a81] = "\x78\xbc", [0x0a82] = "\x78\xbd",
-+  [0x0a83] = "\x78\xbe", [0x0a84] = "\x78\xbf", [0x0a85] = "\x78\xc0",
-+  [0x0a86] = "\x78\xc1", [0x0a87] = "\x78\xc2", [0x0a88] = "\x78\xc3",
-+  [0x0a89] = "\x78\xc4", [0x0a8a] = "\x78\xc5", [0x0a8b] = "\x78\xc6",
-+  [0x0a8c] = "\x78\xc7", [0x0a8d] = "\x78\xc8", [0x0a8e] = "\x78\xc9",
-+  [0x0a8f] = "\x78\xca", [0x0a90] = "\x78\xcb", [0x0a91] = "\x78\xcc",
-+  [0x0a92] = "\x78\xcd", [0x0a93] = "\x78\xce", [0x0a94] = "\x78\xcf",
-+  [0x0a95] = "\x78\xd0", [0x0a96] = "\x78\xd1", [0x0a97] = "\x78\xd2",
-+  [0x0a98] = "\x78\xd3", [0x0a99] = "\x78\xd4", [0x0a9a] = "\x78\xd5",
-+  [0x0a9b] = "\x78\xd6", [0x0a9c] = "\x78\xd7", [0x0a9d] = "\x78\xd8",
-+  [0x0a9e] = "\x78\xd9", [0x0a9f] = "\x78\xda", [0x0aa0] = "\x78\xdb",
-+  [0x0aa1] = "\x78\xdc", [0x0aa2] = "\x78\xdd", [0x0aa3] = "\x78\xde",
-+  [0x0aa4] = "\x78\xdf", [0x0aa5] = "\x78\xe0", [0x0aa6] = "\x78\xe1",
-+  [0x0aa7] = "\x78\xe2", [0x0aa8] = "\x78\xe3", [0x0aa9] = "\x78\xe4",
-+  [0x0aaa] = "\x78\xe5", [0x0aab] = "\x78\xe6", [0x0aac] = "\x78\xe7",
-+  [0x0aad] = "\x78\xe8", [0x0aae] = "\x78\xe9", [0x0aaf] = "\x78\xea",
-+  [0x0ab0] = "\x78\xeb", [0x0ab1] = "\x78\xec", [0x0ab2] = "\x78\xed",
-+  [0x0ab3] = "\x78\xee", [0x0ab4] = "\x78\xef", [0x0ab5] = "\x78\xf0",
-+  [0x0ab6] = "\x78\xf1", [0x0ab7] = "\x78\xf2", [0x0ab8] = "\x78\xf3",
-+  [0x0ab9] = "\x78\xf4", [0x0aba] = "\x78\xf5", [0x0abb] = "\x78\xf6",
-+  [0x0abc] = "\x78\xf7", [0x0abd] = "\x78\xf8", [0x0abe] = "\x78\xf9",
-+  [0x0abf] = "\x78\xfa", [0x0ac0] = "\x78\xfb", [0x0ac1] = "\x78\xfc",
-+  [0x0ac2] = "\x78\xfd", [0x0ac3] = "\x78\xfe", [0x0ac4] = "\x78\xff",
-+  [0x0ac5] = "\x79\x00", [0x0ac6] = "\x79\x01", [0x0ac7] = "\x79\x02",
-+  [0x0ac8] = "\x79\x03", [0x0ac9] = "\x79\x04", [0x0aca] = "\x79\x05",
-+  [0x0acb] = "\x79\x06", [0x0acc] = "\x79\x07", [0x0acd] = "\x79\x08",
-+  [0x0ace] = "\x79\x09", [0x0acf] = "\x79\x0a", [0x0ad0] = "\x79\x0b",
-+  [0x0ad1] = "\x79\x0c", [0x0ad2] = "\x79\x0d", [0x0ad3] = "\x79\x0e",
-+  [0x0ad4] = "\x79\x0f", [0x0ad5] = "\x79\x10", [0x0ad6] = "\x79\x11",
-+  [0x0ad7] = "\x79\x12", [0x0ad8] = "\x79\x13", [0x0ad9] = "\x79\x14",
-+  [0x0ada] = "\x79\x15", [0x0adb] = "\x79\x16", [0x0adc] = "\x79\x17",
-+  [0x0add] = "\x79\x18", [0x0ade] = "\x79\x19", [0x0adf] = "\x79\x1a",
-+  [0x0ae0] = "\x79\x1b", [0x0ae1] = "\x79\x1c", [0x0ae2] = "\x79\x1d",
-+  [0x0ae3] = "\x79\x1e", [0x0ae4] = "\x79\x1f", [0x0ae5] = "\x79\x20",
-+  [0x0ae6] = "\x79\x21", [0x0ae7] = "\x79\x22", [0x0ae8] = "\x79\x23",
-+  [0x0ae9] = "\x79\x24", [0x0aea] = "\x79\x25", [0x0aeb] = "\x79\x26",
-+  [0x0aec] = "\x79\x27", [0x0aed] = "\x79\x28", [0x0aee] = "\x79\x29",
-+  [0x0aef] = "\x79\x2a", [0x0af0] = "\x79\x2b", [0x0af1] = "\x79\x2c",
-+  [0x0af2] = "\x79\x2d", [0x0af3] = "\x79\x2e", [0x0af4] = "\x79\x2f",
-+  [0x0af5] = "\x79\x30", [0x0af6] = "\x79\x31", [0x0af7] = "\x79\x32",
-+  [0x0af8] = "\x79\x33", [0x0af9] = "\x79\x34", [0x0afa] = "\x79\x35",
-+  [0x0afb] = "\x79\x36", [0x0afc] = "\x79\x37", [0x0afd] = "\x79\x38",
-+  [0x0afe] = "\x79\x39", [0x0aff] = "\x79\x3a", [0x0b00] = "\x79\x3b",
-+  [0x0b01] = "\x79\x3c", [0x0b02] = "\x79\x3d", [0x0b03] = "\x79\x3e",
-+  [0x0b04] = "\x79\x3f", [0x0b05] = "\x79\x40", [0x0b06] = "\x79\x41",
-+  [0x0b07] = "\x79\x42", [0x0b08] = "\x79\x43", [0x0b09] = "\x79\x44",
-+  [0x0b0a] = "\x79\x45", [0x0b0b] = "\x79\x46", [0x0b0c] = "\x79\x47",
-+  [0x0b0d] = "\x79\x48", [0x0b0e] = "\x79\x49", [0x0b0f] = "\x79\x4a",
-+  [0x0b10] = "\x79\x4b", [0x0b11] = "\x79\x4c", [0x0b12] = "\x79\x4d",
-+  [0x0b13] = "\x79\x4e", [0x0b14] = "\x79\x4f", [0x0b15] = "\x79\x50",
-+  [0x0b16] = "\x79\x51", [0x0b17] = "\x79\x52", [0x0b18] = "\x79\x53",
-+  [0x0b19] = "\x79\x54", [0x0b1a] = "\x79\x55", [0x0b1b] = "\x79\x56",
-+  [0x0b1c] = "\x79\x57", [0x0b1d] = "\x79\x58", [0x0b1e] = "\x79\x59",
-+  [0x0b1f] = "\x79\x5a", [0x0b20] = "\x79\x5b", [0x0b21] = "\x79\x5c",
-+  [0x0b22] = "\x79\x5d", [0x0b23] = "\x79\x5e", [0x0b24] = "\x79\x5f",
-+  [0x0b25] = "\x79\x60", [0x0b26] = "\x79\x61", [0x0b27] = "\x79\x62",
-+  [0x0b28] = "\x79\x63", [0x0b29] = "\x79\x64", [0x0b2a] = "\x79\x65",
-+  [0x0b2b] = "\x79\x66", [0x0b2c] = "\x79\x67", [0x0b2d] = "\x79\x68",
-+  [0x0b2e] = "\x79\x69", [0x0b2f] = "\x79\x6a", [0x0b30] = "\x79\x6b",
-+  [0x0b31] = "\x79\x6c", [0x0b32] = "\x79\x6d", [0x0b33] = "\x79\x6e",
-+  [0x0b34] = "\x79\x6f", [0x0b35] = "\x79\x70", [0x0b36] = "\x79\x71",
-+  [0x0b37] = "\x79\x72", [0x0b38] = "\x79\x73", [0x0b39] = "\x79\x74",
-+  [0x0b3a] = "\x79\x75", [0x0b3b] = "\x79\x76", [0x0b3c] = "\x79\x77",
-+  [0x0b3d] = "\x79\x78", [0x0b3e] = "\x79\x79", [0x0b3f] = "\x79\x7a",
-+  [0x0b40] = "\x79\x7b", [0x0b41] = "\x79\x7c", [0x0b42] = "\x79\x7d",
-+  [0x0b43] = "\x79\x7e", [0x0b44] = "\x79\x7f", [0x0b45] = "\x79\x80",
-+  [0x0b46] = "\x79\x81", [0x0b47] = "\x79\x82", [0x0b48] = "\x79\x83",
-+  [0x0b49] = "\x79\x84", [0x0b4a] = "\x79\x85", [0x0b4b] = "\x79\x86",
-+  [0x0b4c] = "\x79\x87", [0x0b4d] = "\x79\x88", [0x0b4e] = "\x79\x89",
-+  [0x0b4f] = "\x79\x8a", [0x0b50] = "\x79\x8b", [0x0b51] = "\x79\x8c",
-+  [0x0b52] = "\x79\x8d", [0x0b53] = "\x79\x8e", [0x0b54] = "\x79\x8f",
-+  [0x0b55] = "\x79\x90", [0x0b56] = "\x79\x91", [0x0b57] = "\x79\x92",
-+  [0x0b58] = "\x79\x93", [0x0b59] = "\x79\x94", [0x0b5a] = "\x79\x95",
-+  [0x0b5b] = "\x79\x96", [0x0b5c] = "\x79\x97", [0x0b5d] = "\x79\x98",
-+  [0x0b5e] = "\x79\x99", [0x0b5f] = "\x79\x9a", [0x0b60] = "\x79\x9b",
-+  [0x0b61] = "\x79\x9c", [0x0b62] = "\x79\x9d", [0x0b63] = "\x79\x9e",
-+  [0x0b64] = "\x79\x9f", [0x0b65] = "\x79\xa0", [0x0b66] = "\x79\xa1",
-+  [0x0b67] = "\x79\xa2", [0x0b68] = "\x79\xa3", [0x0b69] = "\x79\xa4",
-+  [0x0b6a] = "\x79\xa5", [0x0b6b] = "\x79\xa6", [0x0b6c] = "\x79\xa7",
-+  [0x0b6d] = "\x79\xa8", [0x0b6e] = "\x79\xa9", [0x0b6f] = "\x79\xaa",
-+  [0x0b70] = "\x79\xab", [0x0b71] = "\x79\xac", [0x0b72] = "\x79\xad",
-+  [0x0b73] = "\x79\xae", [0x0b74] = "\x79\xaf", [0x0b75] = "\x79\xb0",
-+  [0x0b76] = "\x79\xb1", [0x0b77] = "\x79\xb2", [0x0b78] = "\x79\xb3",
-+  [0x0b79] = "\x79\xb4", [0x0b7a] = "\x79\xb5", [0x0b7b] = "\x79\xb6",
-+  [0x0b7c] = "\x79\xb7", [0x0b7d] = "\x79\xb8", [0x0b7e] = "\x79\xb9",
-+  [0x0b7f] = "\x79\xba", [0x0b80] = "\x79\xbb", [0x0b81] = "\x79\xbc",
-+  [0x0b82] = "\x79\xbd", [0x0b83] = "\x79\xbe", [0x0b84] = "\x79\xbf",
-+  [0x0b85] = "\x79\xc0", [0x0b86] = "\x79\xc1", [0x0b87] = "\x79\xc2",
-+  [0x0b88] = "\x79\xc3", [0x0b89] = "\x79\xc4", [0x0b8a] = "\x79\xc5",
-+  [0x0b8b] = "\x79\xc6", [0x0b8c] = "\x79\xc7", [0x0b8d] = "\x79\xc8",
-+  [0x0b8e] = "\x79\xc9", [0x0b8f] = "\x79\xca", [0x0b90] = "\x79\xcb",
-+  [0x0b91] = "\x79\xcc", [0x0b92] = "\x79\xcd", [0x0b93] = "\x79\xce",
-+  [0x0b94] = "\x79\xcf", [0x0b95] = "\x79\xd0", [0x0b96] = "\x79\xd1",
-+  [0x0b97] = "\x79\xd2", [0x0b98] = "\x79\xd3", [0x0b99] = "\x79\xd4",
-+  [0x0b9a] = "\x79\xd5", [0x0b9b] = "\x79\xd6", [0x0b9c] = "\x79\xd7",
-+  [0x0b9d] = "\x79\xd8", [0x0b9e] = "\x79\xd9", [0x0b9f] = "\x79\xda",
-+  [0x0ba0] = "\x79\xdb", [0x0ba1] = "\x79\xdc", [0x0ba2] = "\x79\xdd",
-+  [0x0ba3] = "\x79\xde", [0x0ba4] = "\x79\xdf", [0x0ba5] = "\x79\xe0",
-+  [0x0ba6] = "\x79\xe1", [0x0ba7] = "\x79\xe2", [0x0ba8] = "\x79\xe3",
-+  [0x0ba9] = "\x79\xe4", [0x0baa] = "\x79\xe5", [0x0bab] = "\x79\xe6",
-+  [0x0bac] = "\x79\xe7", [0x0bad] = "\x79\xe8", [0x0bae] = "\x79\xe9",
-+  [0x0baf] = "\x79\xea", [0x0bb0] = "\x79\xeb", [0x0bb1] = "\x79\xec",
-+  [0x0bb2] = "\x79\xed", [0x0bb3] = "\x79\xee", [0x0bb4] = "\x79\xef",
-+  [0x0bb5] = "\x79\xf0", [0x0bb6] = "\x79\xf1", [0x0bb7] = "\x79\xf2",
-+  [0x0bb8] = "\x79\xf3", [0x0bb9] = "\x79\xf4", [0x0bba] = "\x79\xf5",
-+  [0x0bbb] = "\x79\xf6", [0x0bbc] = "\x79\xf7", [0x0bbd] = "\x79\xf8",
-+  [0x0bbe] = "\x79\xf9", [0x0bbf] = "\x79\xfa", [0x0bc0] = "\x79\xfb",
-+  [0x0bc1] = "\x79\xfc", [0x0bc2] = "\x79\xfd", [0x0bc3] = "\x79\xfe",
-+  [0x0bc4] = "\x79\xff", [0x0bc5] = "\x7a\x00", [0x0bc6] = "\x7a\x01",
-+  [0x0bc7] = "\x7a\x02", [0x0bc8] = "\x7a\x03", [0x0bc9] = "\x7a\x04",
-+  [0x0bca] = "\x7a\x05", [0x0bcb] = "\x7a\x06", [0x0bcc] = "\x7a\x07",
-+  [0x0bcd] = "\x7a\x08", [0x0bce] = "\x7a\x09", [0x0bcf] = "\x7a\x0a",
-+  [0x0bd0] = "\x7a\x0b", [0x0bd1] = "\x7a\x0c", [0x0bd2] = "\x7a\x0d",
-+  [0x0bd3] = "\x7a\x0e", [0x0bd4] = "\x7a\x0f", [0x0bd5] = "\x7a\x10",
-+  [0x0bd6] = "\x7a\x11", [0x0bd7] = "\x7a\x12", [0x0bd8] = "\x7a\x13",
-+  [0x0bd9] = "\x7a\x14", [0x0bda] = "\x7a\x15", [0x0bdb] = "\x7a\x16",
-+  [0x0bdc] = "\x7a\x17", [0x0bdd] = "\x7a\x18", [0x0bde] = "\x7a\x19",
-+  [0x0bdf] = "\x7a\x1a", [0x0be0] = "\x7a\x1b", [0x0be1] = "\x7a\x1c",
-+  [0x0be2] = "\x7a\x1d", [0x0be3] = "\x7a\x1e", [0x0be4] = "\x7a\x1f",
-+  [0x0be5] = "\x7a\x20", [0x0be6] = "\x7a\x21", [0x0be7] = "\x7a\x22",
-+  [0x0be8] = "\x7a\x23", [0x0be9] = "\x7a\x24", [0x0bea] = "\x7a\x25",
-+  [0x0beb] = "\x7a\x26", [0x0bec] = "\x7a\x27", [0x0bed] = "\x7a\x28",
-+  [0x0bee] = "\x7a\x29", [0x0bef] = "\x7a\x2a", [0x0bf0] = "\x7a\x2b",
-+  [0x0bf1] = "\x7a\x2c", [0x0bf2] = "\x7a\x2d", [0x0bf3] = "\x7a\x2e",
-+  [0x0bf4] = "\x7a\x2f", [0x0bf5] = "\x7a\x30", [0x0bf6] = "\x7a\x31",
-+  [0x0bf7] = "\x7a\x32", [0x0bf8] = "\x7a\x33", [0x0bf9] = "\x7a\x34",
-+  [0x0bfa] = "\x7a\x35", [0x0bfb] = "\x7a\x36", [0x0bfc] = "\x7a\x37",
-+  [0x0bfd] = "\x7a\x38", [0x0bfe] = "\x7a\x39", [0x0bff] = "\x7a\x3a",
-+  [0x0c00] = "\x7a\x3b", [0x0c01] = "\x7a\x3c", [0x0c02] = "\x7a\x3d",
-+  [0x0c03] = "\x7a\x3e", [0x0c04] = "\x7a\x3f", [0x0c05] = "\x7a\x40",
-+  [0x0c06] = "\x7a\x41", [0x0c07] = "\x7a\x42", [0x0c08] = "\x7a\x43",
-+  [0x0c09] = "\x7a\x44", [0x0c0a] = "\x7a\x45", [0x0c0b] = "\x7a\x46",
-+  [0x0c0c] = "\x7a\x47", [0x0c0d] = "\x7a\x48", [0x0c0e] = "\x7a\x49",
-+  [0x0c0f] = "\x7a\x4a", [0x0c10] = "\x7a\x4b", [0x0c11] = "\x7a\x4c",
-+  [0x0c12] = "\x7a\x4d", [0x0c13] = "\x7a\x4e", [0x0c14] = "\x7a\x4f",
-+  [0x0c15] = "\x7a\x50", [0x0c16] = "\x7a\x51", [0x0c17] = "\x7a\x52",
-+  [0x0c18] = "\x7a\x53", [0x0c19] = "\x7a\x54", [0x0c1a] = "\x7a\x55",
-+  [0x0c1b] = "\x7a\x56", [0x0c1c] = "\x7a\x57", [0x0c1d] = "\x7a\x58",
-+  [0x0c1e] = "\x7a\x59", [0x0c1f] = "\x7a\x5a", [0x0c20] = "\x7a\x5b",
-+  [0x0c21] = "\x7a\x5c", [0x0c22] = "\x7a\x5d", [0x0c23] = "\x7a\x5e",
-+  [0x0c24] = "\x7a\x5f", [0x0c25] = "\x7a\x60", [0x0c26] = "\x7a\x61",
-+  [0x0c27] = "\x7a\x62", [0x0c28] = "\x7a\x63", [0x0c29] = "\x7a\x64",
-+  [0x0c2a] = "\x7a\x65", [0x0c2b] = "\x7a\x66", [0x0c2c] = "\x7a\x67",
-+  [0x0c2d] = "\x7a\x68", [0x0c2e] = "\x7a\x69", [0x0c2f] = "\x7a\x6a",
-+  [0x0c30] = "\x7a\x6b", [0x0c31] = "\x7a\x6c", [0x0c32] = "\x7a\x6d",
-+  [0x0c33] = "\x7a\x6e", [0x0c34] = "\x7a\x6f", [0x0c35] = "\x7a\x70",
-+  [0x0c36] = "\x7a\x71", [0x0c37] = "\x7a\x72", [0x0c38] = "\x7a\x73",
-+  [0x0c39] = "\x7a\x74", [0x0c3a] = "\x7a\x75", [0x0c3b] = "\x7a\x76",
-+  [0x0c3c] = "\x7a\x77", [0x0c3d] = "\x7a\x78", [0x0c3e] = "\x7a\x79",
-+  [0x0c3f] = "\x7a\x7a", [0x0c40] = "\x7a\x7b", [0x0c41] = "\x7a\x7c",
-+  [0x0c42] = "\x7a\x7d", [0x0c43] = "\x7a\x7e", [0x0c44] = "\x7a\x7f",
-+  [0x0c45] = "\x7a\x80", [0x0c46] = "\x7a\x81", [0x0c47] = "\x7a\x82",
-+  [0x0c48] = "\x7a\x83", [0x0c49] = "\x7a\x84", [0x0c4a] = "\x7a\x85",
-+  [0x0c4b] = "\x7a\x86", [0x0c4c] = "\x7a\x87", [0x0c4d] = "\x7a\x88",
-+  [0x0c4e] = "\x7a\x89", [0x0c4f] = "\x7a\x8a", [0x0c50] = "\x7a\x8b",
-+  [0x0c51] = "\x7a\x8c", [0x0c52] = "\x7a\x8d", [0x0c53] = "\x7a\x8e",
-+  [0x0c54] = "\x7a\x8f", [0x0c55] = "\x7a\x90", [0x0c56] = "\x7a\x91",
-+  [0x0c57] = "\x7a\x92", [0x0c58] = "\x7a\x93", [0x0c59] = "\x7a\x94",
-+  [0x0c5a] = "\x7a\x95", [0x0c5b] = "\x7a\x96", [0x0c5c] = "\x7a\x97",
-+  [0x0c5d] = "\x7a\x98", [0x0c5e] = "\x7a\x99", [0x0c5f] = "\x7a\x9a",
-+  [0x0c60] = "\x7a\x9b", [0x0c61] = "\x7a\x9c", [0x0c62] = "\x7a\x9d",
-+  [0x0c63] = "\x7a\x9e", [0x0c64] = "\x7a\x9f", [0x0c65] = "\x7a\xa0",
-+  [0x0c66] = "\x7a\xa1", [0x0c67] = "\x7a\xa2", [0x0c68] = "\x7a\xa3",
-+  [0x0c69] = "\x7a\xa4", [0x0c6a] = "\x7a\xa5", [0x0c6b] = "\x7a\xa6",
-+  [0x0c6c] = "\x7a\xa7", [0x0c6d] = "\x7a\xa8", [0x0c6e] = "\x7a\xa9",
-+  [0x0c6f] = "\x7a\xaa", [0x0c70] = "\x7a\xab", [0x0c71] = "\x7a\xac",
-+  [0x0c72] = "\x7a\xad", [0x0c73] = "\x7a\xae", [0x0c74] = "\x7a\xaf",
-+  [0x0c75] = "\x7a\xb0", [0x0c76] = "\x7a\xb1", [0x0c77] = "\x7a\xb2",
-+  [0x0c78] = "\x7a\xb3", [0x0c79] = "\x7a\xb4", [0x0c7a] = "\x7a\xb5",
-+  [0x0c7b] = "\x7a\xb6", [0x0c7c] = "\x7a\xb7", [0x0c7d] = "\x7a\xb8",
-+  [0x0c7e] = "\x7a\xb9", [0x0c7f] = "\x7a\xba", [0x0c80] = "\x7a\xbb",
-+  [0x0c81] = "\x7a\xbc", [0x0c82] = "\x7a\xbd", [0x0c83] = "\x7a\xbe",
-+  [0x0c84] = "\x7a\xbf", [0x0c85] = "\x7a\xc0", [0x0c86] = "\x7a\xc1",
-+  [0x0c87] = "\x7a\xc2", [0x0c88] = "\x7a\xc3", [0x0c89] = "\x7a\xc4",
-+  [0x0c8a] = "\x7a\xc5", [0x0c8b] = "\x7a\xc6", [0x0c8c] = "\x7a\xc7",
-+  [0x0c8d] = "\x7a\xc8", [0x0c8e] = "\x7a\xc9", [0x0c8f] = "\x7a\xca",
-+  [0x0c90] = "\x7a\xcb", [0x0c91] = "\x7a\xcc", [0x0c92] = "\x7a\xcd",
-+  [0x0c93] = "\x7a\xce", [0x0c94] = "\x7a\xcf", [0x0c95] = "\x7a\xd0",
-+  [0x0c96] = "\x7a\xd1", [0x0c97] = "\x7a\xd2", [0x0c98] = "\x7a\xd3",
-+  [0x0c99] = "\x7a\xd4", [0x0c9a] = "\x7a\xd5", [0x0c9b] = "\x7a\xd6",
-+  [0x0c9c] = "\x7a\xd7", [0x0c9d] = "\x7a\xd8", [0x0c9e] = "\x7a\xd9",
-+  [0x0c9f] = "\x7a\xda", [0x0ca0] = "\x7a\xdb", [0x0ca1] = "\x7a\xdc",
-+  [0x0ca2] = "\x7a\xdd", [0x0ca3] = "\x7a\xde", [0x0ca4] = "\x7a\xdf",
-+  [0x0ca5] = "\x7a\xe0", [0x0ca6] = "\x7a\xe1", [0x0ca7] = "\x7a\xe2",
-+  [0x0ca8] = "\x7a\xe3", [0x0ca9] = "\x7a\xe4", [0x0caa] = "\x7a\xe5",
-+  [0x0cab] = "\x7a\xe6", [0x0cac] = "\x7a\xe7", [0x0cad] = "\x7a\xe8",
-+  [0x0cae] = "\x7a\xe9", [0x0caf] = "\x7a\xea", [0x0cb0] = "\x7a\xeb",
-+  [0x0cb1] = "\x7a\xec", [0x0cb2] = "\x7a\xed", [0x0cb3] = "\x7a\xee",
-+  [0x0cb4] = "\x7a\xef", [0x0cb5] = "\x7a\xf0", [0x0cb6] = "\x7a\xf1",
-+  [0x0cb7] = "\x7a\xf2", [0x0cb8] = "\x7a\xf3", [0x0cb9] = "\x7a\xf4",
-+  [0x0cba] = "\x7a\xf5", [0x0cbb] = "\x7a\xf6", [0x0cbc] = "\x7a\xf7",
-+  [0x0cbd] = "\x7a\xf8", [0x0cbe] = "\x7a\xf9", [0x0cbf] = "\x7a\xfa",
-+  [0x0cc0] = "\x7a\xfb", [0x0cc1] = "\x7a\xfc", [0x0cc2] = "\x7a\xfd",
-+  [0x0cc3] = "\x7a\xfe", [0x0cc4] = "\x7a\xff", [0x0cc5] = "\x7b\x00",
-+  [0x0cc6] = "\x7b\x01", [0x0cc7] = "\x7b\x02", [0x0cc8] = "\x7b\x03",
-+  [0x0cc9] = "\x7b\x04", [0x0cca] = "\x7b\x05", [0x0ccb] = "\x7b\x06",
-+  [0x0ccc] = "\x7b\x07", [0x0ccd] = "\x7b\x08", [0x0cce] = "\x7b\x09",
-+  [0x0ccf] = "\x7b\x0a", [0x0cd0] = "\x7b\x0b", [0x0cd1] = "\x7b\x0c",
-+  [0x0cd2] = "\x7b\x0d", [0x0cd3] = "\x7b\x0e", [0x0cd4] = "\x7b\x0f",
-+  [0x0cd5] = "\x7b\x10", [0x0cd6] = "\x7b\x11", [0x0cd7] = "\x7b\x12",
-+  [0x0cd8] = "\x7b\x13", [0x0cd9] = "\x7b\x14", [0x0cda] = "\x7b\x15",
-+  [0x0cdb] = "\x7b\x16", [0x0cdc] = "\x7b\x17", [0x0cdd] = "\x7b\x18",
-+  [0x0cde] = "\x7b\x19", [0x0cdf] = "\x7b\x1a", [0x0ce0] = "\x7b\x1b",
-+  [0x0ce1] = "\x7b\x1c", [0x0ce2] = "\x7b\x1d", [0x0ce3] = "\x7b\x1e",
-+  [0x0ce4] = "\x7b\x1f", [0x0ce5] = "\x7b\x20", [0x0ce6] = "\x7b\x21",
-+  [0x0ce7] = "\x7b\x22", [0x0ce8] = "\x7b\x23", [0x0ce9] = "\x7b\x24",
-+  [0x0cea] = "\x7b\x25", [0x0ceb] = "\x7b\x26", [0x0cec] = "\x7b\x27",
-+  [0x0ced] = "\x7b\x28", [0x0cee] = "\x7b\x29", [0x0cef] = "\x7b\x2a",
-+  [0x0cf0] = "\x7b\x2b", [0x0cf1] = "\x7b\x2c", [0x0cf2] = "\x7b\x2d",
-+  [0x0cf3] = "\x7b\x2e", [0x0cf4] = "\x7b\x2f", [0x0cf5] = "\x7b\x30",
-+  [0x0cf6] = "\x7b\x31", [0x0cf7] = "\x7b\x32", [0x0cf8] = "\x7b\x33",
-+  [0x0cf9] = "\x7b\x34", [0x0cfa] = "\x7b\x35", [0x0cfb] = "\x7b\x36",
-+  [0x0cfc] = "\x7b\x37", [0x0cfd] = "\x7b\x38", [0x0cfe] = "\x7b\x39",
-+  [0x0cff] = "\x7b\x3a", [0x0d00] = "\x7b\x3b", [0x0d01] = "\x7b\x3c",
-+  [0x0d02] = "\x7b\x3d", [0x0d03] = "\x7b\x3e", [0x0d04] = "\x7b\x3f",
-+  [0x0d05] = "\x7b\x40", [0x0d06] = "\x7b\x41", [0x0d07] = "\x7b\x42",
-+  [0x0d08] = "\x7b\x43", [0x0d09] = "\x7b\x44", [0x0d0a] = "\x7b\x45",
-+  [0x0d0b] = "\x7b\x46", [0x0d0c] = "\x7b\x47", [0x0d0d] = "\x7b\x48",
-+  [0x0d0e] = "\x7b\x49", [0x0d0f] = "\x7b\x4a", [0x0d10] = "\x7b\x4b",
-+  [0x0d11] = "\x7b\x4c", [0x0d12] = "\x7b\x4d", [0x0d13] = "\x7b\x4e",
-+  [0x0d14] = "\x7b\x4f", [0x0d15] = "\x7b\x50", [0x0d16] = "\x7b\x51",
-+  [0x0d17] = "\x7b\x52", [0x0d18] = "\x7b\x53", [0x0d19] = "\x7b\x54",
-+  [0x0d1a] = "\x7b\x55", [0x0d1b] = "\x7b\x56", [0x0d1c] = "\x7b\x57",
-+  [0x0d1d] = "\x7b\x58", [0x0d1e] = "\x7b\x59", [0x0d1f] = "\x7b\x5a",
-+  [0x0d20] = "\x7b\x5b", [0x0d21] = "\x7b\x5c", [0x0d22] = "\x7b\x5d",
-+  [0x0d23] = "\x7b\x5e", [0x0d24] = "\x7b\x5f", [0x0d25] = "\x7b\x60",
-+  [0x0d26] = "\x7b\x61", [0x0d27] = "\x7b\x62", [0x0d28] = "\x7b\x63",
-+  [0x0d29] = "\x7b\x64", [0x0d2a] = "\x7b\x65", [0x0d2b] = "\x7b\x66",
-+  [0x0d2c] = "\x7b\x67", [0x0d2d] = "\x7b\x68", [0x0d2e] = "\x7b\x69",
-+  [0x0d2f] = "\x7b\x6a", [0x0d30] = "\x7b\x6b", [0x0d31] = "\x7b\x6c",
-+  [0x0d32] = "\x7b\x6d", [0x0d33] = "\x7b\x6e", [0x0d34] = "\x7b\x6f",
-+  [0x0d35] = "\x7b\x70", [0x0d36] = "\x7b\x71", [0x0d37] = "\x7b\x72",
-+  [0x0d38] = "\x7b\x73", [0x0d39] = "\x7b\x74", [0x0d3a] = "\x7b\x75",
-+  [0x0d3b] = "\x7b\x76", [0x0d3c] = "\x7b\x77", [0x0d3d] = "\x7b\x78",
-+  [0x0d3e] = "\x7b\x79", [0x0d3f] = "\x7b\x7a", [0x0d40] = "\x7b\x7b",
-+  [0x0d41] = "\x7b\x7c", [0x0d42] = "\x7b\x7d", [0x0d43] = "\x7b\x7e",
-+  [0x0d44] = "\x7b\x7f", [0x0d45] = "\x7b\x80", [0x0d46] = "\x7b\x81",
-+  [0x0d47] = "\x7b\x82", [0x0d48] = "\x7b\x83", [0x0d49] = "\xa6\xd9",
-+  [0x0d4a] = "\xa6\xdb", [0x0d4b] = "\xa6\xda", [0x0d4c] = "\xa6\xdc",
-+  [0x0d4d] = "\xa6\xdd", [0x0d4e] = "\xa6\xde", [0x0d4f] = "\xa6\xdf",
-+  [0x0d50] = "\xa6\xec", [0x0d51] = "\xa6\xed", [0x0d52] = "\xa6\xf3",
-+  [0x0d53] = "\x7b\x8e", [0x0d54] = "\x7b\x8f", [0x0d55] = "\x7b\x90",
-+  [0x0d56] = "\x7b\x91", [0x0d57] = "\x7b\x92", [0x0d58] = "\x7b\x93",
-+  [0x0d59] = "\x7b\x94", [0x0d5a] = "\x7b\x95", [0x0d5b] = "\x7b\x96",
-+  [0x0d5c] = "\x7b\x97", [0x0d5d] = "\x7b\x98", [0x0d5e] = "\x7b\x99",
-+  [0x0d5f] = "\x7b\x9a", [0x0d60] = "\x7b\x9b", [0x0d61] = "\x7b\x9c",
-+  [0x0d62] = "\x7b\x9d", [0x0d63] = "\x7b\x9e", [0x0d64] = "\x7b\x9f",
-+  [0x0d65] = "\x7b\xa0", [0x0d66] = "\x7b\xa1", [0x0d67] = "\x7b\xa2",
-+  [0x0d68] = "\x7b\xa3", [0x0d69] = "\xa9\x55", [0x0d6a] = "\xa6\xf2",
-+  [0x0d6b] = "\x7b\xa4", [0x0d6c] = "\xa6\xf4", [0x0d6d] = "\xa6\xf5",
-+  [0x0d6e] = "\xa6\xe0", [0x0d6f] = "\xa6\xe1", [0x0d70] = "\xa6\xf0",
-+  [0x0d71] = "\xa6\xf1", [0x0d72] = "\xa6\xe2", [0x0d73] = "\xa6\xe3",
-+  [0x0d74] = "\xa6\xee", [0x0d75] = "\xa6\xef", [0x0d76] = "\xa6\xe6",
-+  [0x0d77] = "\xa6\xe7", [0x0d78] = "\xa6\xe4", [0x0d79] = "\xa6\xe5",
-+  [0x0d7a] = "\xa6\xe8", [0x0d7b] = "\xa6\xe9", [0x0d7c] = "\xa6\xea",
-+  [0x0d7d] = "\xa6\xeb", [0x0d7e] = "\x7b\xa5", [0x0d7f] = "\x7b\xa6",
-+  [0x0d80] = "\x7b\xa7", [0x0d81] = "\x7b\xa8", [0x0d82] = "\xa9\x68",
-+  [0x0d83] = "\xa9\x69", [0x0d84] = "\xa9\x6a", [0x0d85] = "\xa9\x6b",
-+  [0x0d86] = "\xa9\x6c", [0x0d87] = "\xa9\x6d", [0x0d88] = "\xa9\x6e",
-+  [0x0d89] = "\xa9\x6f", [0x0d8a] = "\xa9\x70", [0x0d8b] = "\xa9\x71",
-+  [0x0d8c] = "\x7b\xa9", [0x0d8d] = "\xa9\x72", [0x0d8e] = "\xa9\x73",
-+  [0x0d8f] = "\xa9\x74", [0x0d90] = "\xa9\x75", [0x0d91] = "\x7b\xaa",
-+  [0x0d92] = "\xa9\x76", [0x0d93] = "\xa9\x77", [0x0d94] = "\xa9\x78",
-+  [0x0d95] = "\xa9\x79", [0x0d96] = "\xa9\x7a", [0x0d97] = "\xa9\x7b",
-+  [0x0d98] = "\xa9\x7c", [0x0d99] = "\xa9\x7d", [0x0d9a] = "\xa9\x7e",
-+  [0x0d9b] = "\xa9\x80", [0x0d9c] = "\xa9\x81", [0x0d9d] = "\xa9\x82",
-+  [0x0d9e] = "\xa9\x83", [0x0d9f] = "\xa9\x84", [0x0da0] = "\x7b\xab",
-   [0x0da1] = "\xa9\x85", [0x0da2] = "\xa9\x86", [0x0da3] = "\xa9\x87",
--  [0x0da4] = "\xa9\x88", [0x0da9] = "\x7b\xb0", [0x0daa] = "\x7b\xb1",
--  [0x0dab] = "\x7b\xb2", [0x0dac] = "\x7b\xb3", [0x0dad] = "\x7b\xb4",
--  [0x0daf] = "\x7b\xb6", [0x0db0] = "\x7b\xb7", [0x0db1] = "\x7b\xb8",
--  [0x0db2] = "\x7b\xb9", [0x0db3] = "\x7b\xba", [0x0db4] = "\x7b\xbb",
--  [0x0db5] = "\x7b\xbc", [0x0db6] = "\x7b\xbd", [0x0db7] = "\x7b\xbe",
--  [0x0db8] = "\x7b\xbf", [0x0db9] = "\x7b\xc0", [0x0dba] = "\x7b\xc1",
--  [0x0dbb] = "\x7b\xc2", [0x0dbc] = "\x7b\xc3", [0x0dbd] = "\x7b\xc4",
--  [0x0dbe] = "\x7b\xc5", [0x0dbf] = "\x7b\xc6", [0x0dc0] = "\x7b\xc7",
--  [0x0dc1] = "\x7b\xc8", [0x0dc2] = "\x7b\xc9", [0x0dc3] = "\x7b\xca",
--  [0x0dc4] = "\x7b\xcb", [0x0dc5] = "\x7b\xcc", [0x0dc6] = "\x7b\xcd",
--  [0x0dc7] = "\x7b\xce", [0x0dc8] = "\x7b\xcf", [0x0dc9] = "\x7b\xd0",
--  [0x0dca] = "\x7b\xd1", [0x0dcb] = "\x7b\xd2", [0x0dcc] = "\x7b\xd3",
--  [0x0dcd] = "\x7b\xd4", [0x0dce] = "\x7b\xd5", [0x0dcf] = "\x7b\xd6",
--  [0x0dd0] = "\x7b\xd7", [0x0dd1] = "\x7b\xd8", [0x0dd2] = "\x7b\xd9",
--  [0x0dd3] = "\x7b\xda", [0x0dd4] = "\x7b\xdb", [0x0dd5] = "\x7b\xdc",
--  [0x0dd6] = "\x7b\xdd", [0x0dd7] = "\x7b\xde", [0x0dd8] = "\x7b\xdf",
--  [0x0dd9] = "\x7b\xe0", [0x0dda] = "\x7b\xe1", [0x0ddb] = "\x7b\xe2",
--  [0x0ddc] = "\x7b\xe3", [0x0ddd] = "\x7b\xe4", [0x0dde] = "\x7b\xe5",
--  [0x0ddf] = "\x7b\xe6", [0x0de0] = "\x7b\xe7", [0x0de1] = "\x7b\xe8",
--  [0x0de2] = "\x7b\xe9", [0x0de3] = "\x7b\xea", [0x0de4] = "\x7b\xeb",
--  [0x0de5] = "\x7b\xec", [0x0de6] = "\x7b\xed", [0x0de7] = "\x7b\xee",
--  [0x0de8] = "\x7b\xef", [0x0de9] = "\x7b\xf0", [0x0dea] = "\x7b\xf1",
--  [0x0deb] = "\x7b\xf2", [0x0dec] = "\x7b\xf3", [0x0ded] = "\x7b\xf4",
--  [0x0dee] = "\x7b\xf5", [0x0def] = "\x7b\xf6", [0x0df0] = "\x7b\xf7",
--  [0x0df1] = "\x7b\xf8", [0x0df2] = "\x7b\xf9", [0x0df3] = "\x7b\xfa",
--  [0x0df4] = "\x7b\xfb", [0x0df5] = "\x7b\xfc", [0x0df6] = "\x7b\xfd",
--  [0x0df7] = "\x7b\xfe", [0x0df8] = "\x7b\xff", [0x0df9] = "\x7c\x00",
--  [0x0dfa] = "\x7c\x01", [0x0dfb] = "\x7c\x02", [0x0dfc] = "\x7c\x03",
--  [0x0dfd] = "\x7c\x04", [0x0dfe] = "\x7c\x05", [0x0dff] = "\x7c\x06",
--  [0x0e00] = "\x7c\x07", [0x0e01] = "\x7c\x08", [0x0e02] = "\x7c\x09",
--  [0x0e03] = "\x7c\x0a", [0x0e04] = "\x7c\x0b", [0x0e05] = "\x7c\x0c",
--  [0x0e06] = "\x7c\x0d", [0x0e07] = "\x7c\x0e", [0x0e08] = "\x7c\x0f",
--  [0x0e09] = "\x7c\x10", [0x0e0a] = "\x7c\x11", [0x0e0b] = "\x7c\x12",
--  [0x0e0c] = "\x7c\x13", [0x0e0d] = "\x7c\x14", [0x0e0e] = "\x7c\x15",
--  [0x0e0f] = "\x7c\x16", [0x0e10] = "\x7c\x17", [0x0e11] = "\x7c\x18",
--  [0x0e12] = "\x7c\x19", [0x0e13] = "\x7c\x1a", [0x0e14] = "\x7c\x1b",
--  [0x0e15] = "\x7c\x1c", [0x0e16] = "\x7c\x1d", [0x0e17] = "\x7c\x1e",
--  [0x0e18] = "\x7c\x1f", [0x0e19] = "\x7c\x20", [0x0e1a] = "\x7c\x21",
--  [0x0e1b] = "\x7c\x22", [0x0e1c] = "\x7c\x23", [0x0e1d] = "\x7c\x24",
--  [0x0e1e] = "\x7c\x25", [0x0e1f] = "\x7c\x26", [0x0e20] = "\x7c\x27",
--  [0x0e21] = "\x7c\x28", [0x0e22] = "\x7c\x29", [0x0e23] = "\x7c\x2a",
--  [0x0e24] = "\x7c\x2b", [0x0e25] = "\x7c\x2c", [0x0e26] = "\x7c\x2d",
--  [0x0e27] = "\x7c\x2e", [0x0e28] = "\x7c\x2f", [0x0e29] = "\x7c\x30",
--  [0x0e2a] = "\x7c\x31", [0x0e2b] = "\x7c\x32", [0x0e2c] = "\x7c\x33",
--  [0x0e2d] = "\x7c\x34", [0x0e2e] = "\x7c\x35", [0x0e2f] = "\x7c\x36",
--  [0x0e30] = "\x7c\x37", [0x0e31] = "\x7c\x38", [0x0e32] = "\x7c\x39",
--  [0x0e33] = "\x7c\x3a", [0x0e34] = "\x7c\x3b", [0x0e35] = "\x7c\x3c",
--  [0x0e38] = "\x7c\x3f", [0x0e3a] = "\xa3\xa1", [0x0e3b] = "\xa3\xa2",
--  [0x0e3c] = "\xa3\xa3", [0x0e3d] = "\xa1\xe7", [0x0e3e] = "\xa3\xa5",
--  [0x0e3f] = "\xa3\xa6", [0x0e40] = "\xa3\xa7", [0x0e41] = "\xa3\xa8",
--  [0x0e42] = "\xa3\xa9", [0x0e43] = "\xa3\xaa", [0x0e44] = "\xa3\xab",
--  [0x0e45] = "\xa3\xac", [0x0e46] = "\xa3\xad", [0x0e47] = "\xa3\xae",
--  [0x0e48] = "\xa3\xaf", [0x0e49] = "\xa3\xb0", [0x0e4a] = "\xa3\xb1",
--  [0x0e4b] = "\xa3\xb2", [0x0e4c] = "\xa3\xb3", [0x0e4d] = "\xa3\xb4",
--  [0x0e4e] = "\xa3\xb5", [0x0e4f] = "\xa3\xb6", [0x0e50] = "\xa3\xb7",
--  [0x0e51] = "\xa3\xb8", [0x0e52] = "\xa3\xb9", [0x0e53] = "\xa3\xba",
--  [0x0e54] = "\xa3\xbb", [0x0e55] = "\xa3\xbc", [0x0e56] = "\xa3\xbd",
--  [0x0e57] = "\xa3\xbe", [0x0e58] = "\xa3\xbf", [0x0e59] = "\xa3\xc0",
--  [0x0e5a] = "\xa3\xc1", [0x0e5b] = "\xa3\xc2", [0x0e5c] = "\xa3\xc3",
--  [0x0e5d] = "\xa3\xc4", [0x0e5e] = "\xa3\xc5", [0x0e5f] = "\xa3\xc6",
--  [0x0e60] = "\xa3\xc7", [0x0e61] = "\xa3\xc8", [0x0e62] = "\xa3\xc9",
--  [0x0e63] = "\xa3\xca", [0x0e64] = "\xa3\xcb", [0x0e65] = "\xa3\xcc",
--  [0x0e66] = "\xa3\xcd", [0x0e67] = "\xa3\xce", [0x0e68] = "\xa3\xcf",
--  [0x0e69] = "\xa3\xd0", [0x0e6a] = "\xa3\xd1", [0x0e6b] = "\xa3\xd2",
--  [0x0e6c] = "\xa3\xd3", [0x0e6d] = "\xa3\xd4", [0x0e6e] = "\xa3\xd5",
--  [0x0e6f] = "\xa3\xd6", [0x0e70] = "\xa3\xd7", [0x0e71] = "\xa3\xd8",
--  [0x0e72] = "\xa3\xd9", [0x0e73] = "\xa3\xda", [0x0e74] = "\xa3\xdb",
--  [0x0e75] = "\xa3\xdc", [0x0e76] = "\xa3\xdd", [0x0e77] = "\xa3\xde",
--  [0x0e78] = "\xa3\xdf", [0x0e79] = "\xa3\xe0", [0x0e7a] = "\xa3\xe1",
--  [0x0e7b] = "\xa3\xe2", [0x0e7c] = "\xa3\xe3", [0x0e7d] = "\xa3\xe4",
--  [0x0e7e] = "\xa3\xe5", [0x0e7f] = "\xa3\xe6", [0x0e80] = "\xa3\xe7",
--  [0x0e81] = "\xa3\xe8", [0x0e82] = "\xa3\xe9", [0x0e83] = "\xa3\xea",
--  [0x0e84] = "\xa3\xeb", [0x0e85] = "\xa3\xec", [0x0e86] = "\xa3\xed",
--  [0x0e87] = "\xa3\xee", [0x0e88] = "\xa3\xef", [0x0e89] = "\xa3\xf0",
--  [0x0e8a] = "\xa3\xf1", [0x0e8b] = "\xa3\xf2", [0x0e8c] = "\xa3\xf3",
--  [0x0e8d] = "\xa3\xf4", [0x0e8e] = "\xa3\xf5", [0x0e8f] = "\xa3\xf6",
--  [0x0e90] = "\xa3\xf7", [0x0e91] = "\xa3\xf8", [0x0e92] = "\xa3\xf9",
--  [0x0e93] = "\xa3\xfa", [0x0e94] = "\xa3\xfb", [0x0e95] = "\xa3\xfc",
--  [0x0e96] = "\xa3\xfd", [0x0e97] = "\xa1\xab", [0x0e98] = "\x7c\x41",
--  [0x0e99] = "\x7c\x42", [0x0e9a] = "\x7c\x43", [0x0e9b] = "\x7c\x44",
--  [0x0e9c] = "\x7c\x45", [0x0e9d] = "\x7c\x46", [0x0e9e] = "\x7c\x47",
--  [0x0e9f] = "\x7c\x48", [0x0ea0] = "\x7c\x49", [0x0ea1] = "\x7c\x4a",
--  [0x0ea2] = "\x7c\x4b", [0x0ea3] = "\x7c\x4c", [0x0ea4] = "\x7c\x4d",
--  [0x0ea5] = "\x7c\x4e", [0x0ea6] = "\x7c\x4f", [0x0ea7] = "\x7c\x50",
--  [0x0ea8] = "\x7c\x51", [0x0ea9] = "\x7c\x52", [0x0eaa] = "\x7c\x53",
--  [0x0eab] = "\x7c\x54", [0x0eac] = "\x7c\x55", [0x0ead] = "\x7c\x56",
--  [0x0eae] = "\x7c\x57", [0x0eaf] = "\x7c\x58", [0x0eb0] = "\x7c\x59",
--  [0x0eb1] = "\x7c\x5a", [0x0eb2] = "\x7c\x5b", [0x0eb3] = "\x7c\x5c",
--  [0x0eb4] = "\x7c\x5d", [0x0eb5] = "\x7c\x5e", [0x0eb6] = "\x7c\x5f",
--  [0x0eb7] = "\x7c\x60", [0x0eb8] = "\x7c\x61", [0x0eb9] = "\x7c\x62",
--  [0x0eba] = "\x7c\x63", [0x0ebb] = "\x7c\x64", [0x0ebc] = "\x7c\x65",
--  [0x0ebd] = "\x7c\x66", [0x0ebe] = "\x7c\x67", [0x0ebf] = "\x7c\x68",
--  [0x0ec0] = "\x7c\x69", [0x0ec1] = "\x7c\x6a", [0x0ec2] = "\x7c\x6b",
--  [0x0ec3] = "\x7c\x6c", [0x0ec4] = "\x7c\x6d", [0x0ec5] = "\x7c\x6e",
--  [0x0ec6] = "\x7c\x6f", [0x0ec7] = "\x7c\x70", [0x0ec8] = "\x7c\x71",
--  [0x0ec9] = "\x7c\x72", [0x0eca] = "\x7c\x73", [0x0ecb] = "\x7c\x74",
--  [0x0ecc] = "\x7c\x75", [0x0ecd] = "\x7c\x76", [0x0ece] = "\x7c\x77",
--  [0x0ecf] = "\x7c\x78", [0x0ed0] = "\x7c\x79", [0x0ed1] = "\x7c\x7a",
--  [0x0ed2] = "\x7c\x7b", [0x0ed3] = "\x7c\x7c", [0x0ed4] = "\x7c\x7d",
--  [0x0ed5] = "\x7c\x7e", [0x0ed6] = "\x7c\x7f", [0x0ed7] = "\x7c\x80",
--  [0x0ed8] = "\x7c\x81", [0x0ed9] = "\x7c\x82", [0x0eda] = "\x7c\x83",
--  [0x0edb] = "\x7c\x84", [0x0edc] = "\x7c\x85", [0x0edd] = "\x7c\x86",
--  [0x0ede] = "\x7c\x87", [0x0edf] = "\x7c\x88", [0x0ee0] = "\x7c\x89",
--  [0x0ee1] = "\x7c\x8a", [0x0ee2] = "\x7c\x8b", [0x0ee3] = "\x7c\x8c",
--  [0x0ee4] = "\x7c\x8d", [0x0ee5] = "\x7c\x8e", [0x0ee6] = "\x7c\x8f",
--  [0x0ee7] = "\x7c\x90", [0x0ee8] = "\x7c\x91", [0x0ee9] = "\x7c\x92",
--  [0x0eea] = "\x7c\x93", [0x0eeb] = "\x7c\x94", [0x0eec] = "\x7c\x95",
--  [0x0eed] = "\x7c\x96", [0x0eee] = "\x7c\x97", [0x0eef] = "\x7c\x98",
--  [0x0ef0] = "\x7c\x99", [0x0ef1] = "\x7c\x9a", [0x0ef2] = "\x7c\x9b",
--  [0x0ef3] = "\x7c\x9c", [0x0ef4] = "\x7c\x9d", [0x0ef5] = "\x7c\x9e",
--  [0x0ef6] = "\x7c\x9f", [0x0ef7] = "\x7c\xa0", [0x0efb] = "\x7c\xa4",
--  [0x0efc] = "\x7c\xa5", [0x0efd] = "\x7c\xa6", [0x0efe] = "\x7c\xa7",
--  [0x0eff] = "\x7c\xa8", [0x0f00] = "\x7c\xa9", [0x0f03] = "\x7c\xac",
--  [0x0f04] = "\x7c\xad", [0x0f05] = "\x7c\xae", [0x0f06] = "\x7c\xaf",
--  [0x0f07] = "\x7c\xb0", [0x0f08] = "\x7c\xb1", [0x0f0b] = "\x7c\xb4",
-+  [0x0da4] = "\xa9\x88", [0x0da5] = "\x7b\xac", [0x0da6] = "\x7b\xad",
-+  [0x0da7] = "\x7b\xae", [0x0da8] = "\x7b\xaf", [0x0da9] = "\x7b\xb0",
-+  [0x0daa] = "\x7b\xb1", [0x0dab] = "\x7b\xb2", [0x0dac] = "\x7b\xb3",
-+  [0x0dad] = "\x7b\xb4", [0x0dae] = "\x7b\xb5", [0x0daf] = "\x7b\xb6",
-+  [0x0db0] = "\x7b\xb7", [0x0db1] = "\x7b\xb8", [0x0db2] = "\x7b\xb9",
-+  [0x0db3] = "\x7b\xba", [0x0db4] = "\x7b\xbb", [0x0db5] = "\x7b\xbc",
-+  [0x0db6] = "\x7b\xbd", [0x0db7] = "\x7b\xbe", [0x0db8] = "\x7b\xbf",
-+  [0x0db9] = "\x7b\xc0", [0x0dba] = "\x7b\xc1", [0x0dbb] = "\x7b\xc2",
-+  [0x0dbc] = "\x7b\xc3", [0x0dbd] = "\x7b\xc4", [0x0dbe] = "\x7b\xc5",
-+  [0x0dbf] = "\x7b\xc6", [0x0dc0] = "\x7b\xc7", [0x0dc1] = "\x7b\xc8",
-+  [0x0dc2] = "\x7b\xc9", [0x0dc3] = "\x7b\xca", [0x0dc4] = "\x7b\xcb",
-+  [0x0dc5] = "\x7b\xcc", [0x0dc6] = "\x7b\xcd", [0x0dc7] = "\x7b\xce",
-+  [0x0dc8] = "\x7b\xcf", [0x0dc9] = "\x7b\xd0", [0x0dca] = "\x7b\xd1",
-+  [0x0dcb] = "\x7b\xd2", [0x0dcc] = "\x7b\xd3", [0x0dcd] = "\x7b\xd4",
-+  [0x0dce] = "\x7b\xd5", [0x0dcf] = "\x7b\xd6", [0x0dd0] = "\x7b\xd7",
-+  [0x0dd1] = "\x7b\xd8", [0x0dd2] = "\x7b\xd9", [0x0dd3] = "\x7b\xda",
-+  [0x0dd4] = "\x7b\xdb", [0x0dd5] = "\x7b\xdc", [0x0dd6] = "\x7b\xdd",
-+  [0x0dd7] = "\x7b\xde", [0x0dd8] = "\x7b\xdf", [0x0dd9] = "\x7b\xe0",
-+  [0x0dda] = "\x7b\xe1", [0x0ddb] = "\x7b\xe2", [0x0ddc] = "\x7b\xe3",
-+  [0x0ddd] = "\x7b\xe4", [0x0dde] = "\x7b\xe5", [0x0ddf] = "\x7b\xe6",
-+  [0x0de0] = "\x7b\xe7", [0x0de1] = "\x7b\xe8", [0x0de2] = "\x7b\xe9",
-+  [0x0de3] = "\x7b\xea", [0x0de4] = "\x7b\xeb", [0x0de5] = "\x7b\xec",
-+  [0x0de6] = "\x7b\xed", [0x0de7] = "\x7b\xee", [0x0de8] = "\x7b\xef",
-+  [0x0de9] = "\x7b\xf0", [0x0dea] = "\x7b\xf1", [0x0deb] = "\x7b\xf2",
-+  [0x0dec] = "\x7b\xf3", [0x0ded] = "\x7b\xf4", [0x0dee] = "\x7b\xf5",
-+  [0x0def] = "\x7b\xf6", [0x0df0] = "\x7b\xf7", [0x0df1] = "\x7b\xf8",
-+  [0x0df2] = "\x7b\xf9", [0x0df3] = "\x7b\xfa", [0x0df4] = "\x7b\xfb",
-+  [0x0df5] = "\x7b\xfc", [0x0df6] = "\x7b\xfd", [0x0df7] = "\x7b\xfe",
-+  [0x0df8] = "\x7b\xff", [0x0df9] = "\x7c\x00", [0x0dfa] = "\x7c\x01",
-+  [0x0dfb] = "\x7c\x02", [0x0dfc] = "\x7c\x03", [0x0dfd] = "\x7c\x04",
-+  [0x0dfe] = "\x7c\x05", [0x0dff] = "\x7c\x06", [0x0e00] = "\x7c\x07",
-+  [0x0e01] = "\x7c\x08", [0x0e02] = "\x7c\x09", [0x0e03] = "\x7c\x0a",
-+  [0x0e04] = "\x7c\x0b", [0x0e05] = "\x7c\x0c", [0x0e06] = "\x7c\x0d",
-+  [0x0e07] = "\x7c\x0e", [0x0e08] = "\x7c\x0f", [0x0e09] = "\x7c\x10",
-+  [0x0e0a] = "\x7c\x11", [0x0e0b] = "\x7c\x12", [0x0e0c] = "\x7c\x13",
-+  [0x0e0d] = "\x7c\x14", [0x0e0e] = "\x7c\x15", [0x0e0f] = "\x7c\x16",
-+  [0x0e10] = "\x7c\x17", [0x0e11] = "\x7c\x18", [0x0e12] = "\x7c\x19",
-+  [0x0e13] = "\x7c\x1a", [0x0e14] = "\x7c\x1b", [0x0e15] = "\x7c\x1c",
-+  [0x0e16] = "\x7c\x1d", [0x0e17] = "\x7c\x1e", [0x0e18] = "\x7c\x1f",
-+  [0x0e19] = "\x7c\x20", [0x0e1a] = "\x7c\x21", [0x0e1b] = "\x7c\x22",
-+  [0x0e1c] = "\x7c\x23", [0x0e1d] = "\x7c\x24", [0x0e1e] = "\x7c\x25",
-+  [0x0e1f] = "\x7c\x26", [0x0e20] = "\x7c\x27", [0x0e21] = "\x7c\x28",
-+  [0x0e22] = "\x7c\x29", [0x0e23] = "\x7c\x2a", [0x0e24] = "\x7c\x2b",
-+  [0x0e25] = "\x7c\x2c", [0x0e26] = "\x7c\x2d", [0x0e27] = "\x7c\x2e",
-+  [0x0e28] = "\x7c\x2f", [0x0e29] = "\x7c\x30", [0x0e2a] = "\x7c\x31",
-+  [0x0e2b] = "\x7c\x32", [0x0e2c] = "\x7c\x33", [0x0e2d] = "\x7c\x34",
-+  [0x0e2e] = "\x7c\x35", [0x0e2f] = "\x7c\x36", [0x0e30] = "\x7c\x37",
-+  [0x0e31] = "\x7c\x38", [0x0e32] = "\x7c\x39", [0x0e33] = "\x7c\x3a",
-+  [0x0e34] = "\x7c\x3b", [0x0e35] = "\x7c\x3c", [0x0e36] = "\x7c\x3d",
-+  [0x0e37] = "\x7c\x3e", [0x0e38] = "\x7c\x3f", [0x0e39] = "\x7c\x40",
-+  [0x0e3a] = "\xa3\xa1", [0x0e3b] = "\xa3\xa2", [0x0e3c] = "\xa3\xa3",
-+  [0x0e3d] = "\xa1\xe7", [0x0e3e] = "\xa3\xa5", [0x0e3f] = "\xa3\xa6",
-+  [0x0e40] = "\xa3\xa7", [0x0e41] = "\xa3\xa8", [0x0e42] = "\xa3\xa9",
-+  [0x0e43] = "\xa3\xaa", [0x0e44] = "\xa3\xab", [0x0e45] = "\xa3\xac",
-+  [0x0e46] = "\xa3\xad", [0x0e47] = "\xa3\xae", [0x0e48] = "\xa3\xaf",
-+  [0x0e49] = "\xa3\xb0", [0x0e4a] = "\xa3\xb1", [0x0e4b] = "\xa3\xb2",
-+  [0x0e4c] = "\xa3\xb3", [0x0e4d] = "\xa3\xb4", [0x0e4e] = "\xa3\xb5",
-+  [0x0e4f] = "\xa3\xb6", [0x0e50] = "\xa3\xb7", [0x0e51] = "\xa3\xb8",
-+  [0x0e52] = "\xa3\xb9", [0x0e53] = "\xa3\xba", [0x0e54] = "\xa3\xbb",
-+  [0x0e55] = "\xa3\xbc", [0x0e56] = "\xa3\xbd", [0x0e57] = "\xa3\xbe",
-+  [0x0e58] = "\xa3\xbf", [0x0e59] = "\xa3\xc0", [0x0e5a] = "\xa3\xc1",
-+  [0x0e5b] = "\xa3\xc2", [0x0e5c] = "\xa3\xc3", [0x0e5d] = "\xa3\xc4",
-+  [0x0e5e] = "\xa3\xc5", [0x0e5f] = "\xa3\xc6", [0x0e60] = "\xa3\xc7",
-+  [0x0e61] = "\xa3\xc8", [0x0e62] = "\xa3\xc9", [0x0e63] = "\xa3\xca",
-+  [0x0e64] = "\xa3\xcb", [0x0e65] = "\xa3\xcc", [0x0e66] = "\xa3\xcd",
-+  [0x0e67] = "\xa3\xce", [0x0e68] = "\xa3\xcf", [0x0e69] = "\xa3\xd0",
-+  [0x0e6a] = "\xa3\xd1", [0x0e6b] = "\xa3\xd2", [0x0e6c] = "\xa3\xd3",
-+  [0x0e6d] = "\xa3\xd4", [0x0e6e] = "\xa3\xd5", [0x0e6f] = "\xa3\xd6",
-+  [0x0e70] = "\xa3\xd7", [0x0e71] = "\xa3\xd8", [0x0e72] = "\xa3\xd9",
-+  [0x0e73] = "\xa3\xda", [0x0e74] = "\xa3\xdb", [0x0e75] = "\xa3\xdc",
-+  [0x0e76] = "\xa3\xdd", [0x0e77] = "\xa3\xde", [0x0e78] = "\xa3\xdf",
-+  [0x0e79] = "\xa3\xe0", [0x0e7a] = "\xa3\xe1", [0x0e7b] = "\xa3\xe2",
-+  [0x0e7c] = "\xa3\xe3", [0x0e7d] = "\xa3\xe4", [0x0e7e] = "\xa3\xe5",
-+  [0x0e7f] = "\xa3\xe6", [0x0e80] = "\xa3\xe7", [0x0e81] = "\xa3\xe8",
-+  [0x0e82] = "\xa3\xe9", [0x0e83] = "\xa3\xea", [0x0e84] = "\xa3\xeb",
-+  [0x0e85] = "\xa3\xec", [0x0e86] = "\xa3\xed", [0x0e87] = "\xa3\xee",
-+  [0x0e88] = "\xa3\xef", [0x0e89] = "\xa3\xf0", [0x0e8a] = "\xa3\xf1",
-+  [0x0e8b] = "\xa3\xf2", [0x0e8c] = "\xa3\xf3", [0x0e8d] = "\xa3\xf4",
-+  [0x0e8e] = "\xa3\xf5", [0x0e8f] = "\xa3\xf6", [0x0e90] = "\xa3\xf7",
-+  [0x0e91] = "\xa3\xf8", [0x0e92] = "\xa3\xf9", [0x0e93] = "\xa3\xfa",
-+  [0x0e94] = "\xa3\xfb", [0x0e95] = "\xa3\xfc", [0x0e96] = "\xa3\xfd",
-+  [0x0e97] = "\xa1\xab", [0x0e98] = "\x7c\x41", [0x0e99] = "\x7c\x42",
-+  [0x0e9a] = "\x7c\x43", [0x0e9b] = "\x7c\x44", [0x0e9c] = "\x7c\x45",
-+  [0x0e9d] = "\x7c\x46", [0x0e9e] = "\x7c\x47", [0x0e9f] = "\x7c\x48",
-+  [0x0ea0] = "\x7c\x49", [0x0ea1] = "\x7c\x4a", [0x0ea2] = "\x7c\x4b",
-+  [0x0ea3] = "\x7c\x4c", [0x0ea4] = "\x7c\x4d", [0x0ea5] = "\x7c\x4e",
-+  [0x0ea6] = "\x7c\x4f", [0x0ea7] = "\x7c\x50", [0x0ea8] = "\x7c\x51",
-+  [0x0ea9] = "\x7c\x52", [0x0eaa] = "\x7c\x53", [0x0eab] = "\x7c\x54",
-+  [0x0eac] = "\x7c\x55", [0x0ead] = "\x7c\x56", [0x0eae] = "\x7c\x57",
-+  [0x0eaf] = "\x7c\x58", [0x0eb0] = "\x7c\x59", [0x0eb1] = "\x7c\x5a",
-+  [0x0eb2] = "\x7c\x5b", [0x0eb3] = "\x7c\x5c", [0x0eb4] = "\x7c\x5d",
-+  [0x0eb5] = "\x7c\x5e", [0x0eb6] = "\x7c\x5f", [0x0eb7] = "\x7c\x60",
-+  [0x0eb8] = "\x7c\x61", [0x0eb9] = "\x7c\x62", [0x0eba] = "\x7c\x63",
-+  [0x0ebb] = "\x7c\x64", [0x0ebc] = "\x7c\x65", [0x0ebd] = "\x7c\x66",
-+  [0x0ebe] = "\x7c\x67", [0x0ebf] = "\x7c\x68", [0x0ec0] = "\x7c\x69",
-+  [0x0ec1] = "\x7c\x6a", [0x0ec2] = "\x7c\x6b", [0x0ec3] = "\x7c\x6c",
-+  [0x0ec4] = "\x7c\x6d", [0x0ec5] = "\x7c\x6e", [0x0ec6] = "\x7c\x6f",
-+  [0x0ec7] = "\x7c\x70", [0x0ec8] = "\x7c\x71", [0x0ec9] = "\x7c\x72",
-+  [0x0eca] = "\x7c\x73", [0x0ecb] = "\x7c\x74", [0x0ecc] = "\x7c\x75",
-+  [0x0ecd] = "\x7c\x76", [0x0ece] = "\x7c\x77", [0x0ecf] = "\x7c\x78",
-+  [0x0ed0] = "\x7c\x79", [0x0ed1] = "\x7c\x7a", [0x0ed2] = "\x7c\x7b",
-+  [0x0ed3] = "\x7c\x7c", [0x0ed4] = "\x7c\x7d", [0x0ed5] = "\x7c\x7e",
-+  [0x0ed6] = "\x7c\x7f", [0x0ed7] = "\x7c\x80", [0x0ed8] = "\x7c\x81",
-+  [0x0ed9] = "\x7c\x82", [0x0eda] = "\x7c\x83", [0x0edb] = "\x7c\x84",
-+  [0x0edc] = "\x7c\x85", [0x0edd] = "\x7c\x86", [0x0ede] = "\x7c\x87",
-+  [0x0edf] = "\x7c\x88", [0x0ee0] = "\x7c\x89", [0x0ee1] = "\x7c\x8a",
-+  [0x0ee2] = "\x7c\x8b", [0x0ee3] = "\x7c\x8c", [0x0ee4] = "\x7c\x8d",
-+  [0x0ee5] = "\x7c\x8e", [0x0ee6] = "\x7c\x8f", [0x0ee7] = "\x7c\x90",
-+  [0x0ee8] = "\x7c\x91", [0x0ee9] = "\x7c\x92", [0x0eea] = "\x7c\x93",
-+  [0x0eeb] = "\x7c\x94", [0x0eec] = "\x7c\x95", [0x0eed] = "\x7c\x96",
-+  [0x0eee] = "\x7c\x97", [0x0eef] = "\x7c\x98", [0x0ef0] = "\x7c\x99",
-+  [0x0ef1] = "\x7c\x9a", [0x0ef2] = "\x7c\x9b", [0x0ef3] = "\x7c\x9c",
-+  [0x0ef4] = "\x7c\x9d", [0x0ef5] = "\x7c\x9e", [0x0ef6] = "\x7c\x9f",
-+  [0x0ef7] = "\x7c\xa0", [0x0ef8] = "\x7c\xa1", [0x0ef9] = "\x7c\xa2",
-+  [0x0efa] = "\x7c\xa3", [0x0efb] = "\x7c\xa4", [0x0efc] = "\x7c\xa5",
-+  [0x0efd] = "\x7c\xa6", [0x0efe] = "\x7c\xa7", [0x0eff] = "\x7c\xa8",
-+  [0x0f00] = "\x7c\xa9", [0x0f01] = "\x7c\xaa", [0x0f02] = "\x7c\xab",
-+  [0x0f03] = "\x7c\xac", [0x0f04] = "\x7c\xad", [0x0f05] = "\x7c\xae",
-+  [0x0f06] = "\x7c\xaf", [0x0f07] = "\x7c\xb0", [0x0f08] = "\x7c\xb1",
-+  [0x0f09] = "\x7c\xb2", [0x0f0a] = "\x7c\xb3", [0x0f0b] = "\x7c\xb4",
-   [0x0f0c] = "\x7c\xb5", [0x0f0d] = "\x7c\xb6", [0x0f0e] = "\x7c\xb7",
--  [0x0f0f] = "\x7c\xb8", [0x0f10] = "\x7c\xb9", [0x0f13] = "\x7c\xbc",
--  [0x0f14] = "\x7c\xbd", [0x0f15] = "\x7c\xbe", [0x0f19] = "\xa1\xe9",
--  [0x0f1a] = "\xa1\xea", [0x0f1b] = "\xa9\x56", [0x0f1c] = "\xa3\xfe",
--  [0x0f1d] = "\xa9\x57", [0x0f1e] = "\xa3\xa4"
-+  [0x0f0f] = "\x7c\xb8", [0x0f10] = "\x7c\xb9", [0x0f11] = "\x7c\xba",
-+  [0x0f12] = "\x7c\xbb", [0x0f13] = "\x7c\xbc", [0x0f14] = "\x7c\xbd",
-+  [0x0f15] = "\x7c\xbe", [0x0f16] = "\x7c\xbf", [0x0f17] = "\x7c\xc0",
-+  [0x0f18] = "\x7c\xc1", [0x0f19] = "\xa1\xe9", [0x0f1a] = "\xa1\xea",
-+  [0x0f1b] = "\xa9\x56", [0x0f1c] = "\xa3\xfe", [0x0f1d] = "\xa9\x57",
-+  [0x0f1e] = "\xa3\xa4", [0x0f1f] = "\x7c\xc2", [0x0f20] = "\x7c\xc3",
-+  [0x0f21] = "\x7c\xc4", [0x0f22] = "\x7c\xc5", [0x0f23] = "\x7c\xc6",
-+  [0x0f24] = "\x7c\xc7", [0x0f25] = "\x7c\xc8", [0x0f26] = "\x7c\xc9",
-+  [0x0f27] = "\x7c\xca", [0x0f28] = "\x7c\xcb", [0x0f29] = "\x7c\xcc",
-+  [0x0f2a] = "\x7c\xcd", [0x0f2b] = "\x7c\xce", [0x0f2c] = "\x7c\xcf",
-+  [0x0f2d] = "\x7c\xd0", [0x0f2e] = "\x7c\xd1", [0x0f2f] = "\x7c\xd2",
-+  [0x0f30] = "\x7c\xd3", [0x0f31] = "\x7c\xd4", [0x0f32] = "\x7c\xd5",
-+  [0x0f33] = "\x7c\xd6", [0x0f34] = "\x7c\xd7", [0x0f35] = "\x7c\xd8",
-+  [0x0f36] = "\x7c\xd9", [0x0f37] = "\x7c\xda", [0x0f38] = "\x7c\xdb",
-+
- };
- 
- /* Definitions used in the body of the `gconv' function.  */
-@@ -18127,14 +24182,26 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
- 									      \
- 	      if (idx <= 0x333)						      \
- 		ch = __fourbyte_to_ucs[idx];				      \
-+	      else if (idx >= 0x334 && idx <= 0x1d20)			      \
-+		ch = idx + 0x11e;					      \
- 	      else if (idx >= 0x1d21 && idx <= 0x2402)			      \
- 		ch = __fourbyte_to_ucs[idx - 6637];			      \
--	      else if (idx >= 0x2c41 && idx <= 0x4a62)			      \
-+	      else if (idx >= 0x2403 && idx <= 0x2c40)			      \
-+		ch = idx + 0x240;					      \
-+	      else if (idx >= 0x2c41 && idx <= 0x4a78)			      \
- 		ch = __fourbyte_to_ucs[idx - 6637 - 2110];		      \
-+	      else if (idx >= 0x4a79 && idx <= 0x82bc)			      \
-+		ch = idx + 0x5543;					      \
- 	      else if (idx >= 0x82bd && idx <= 0x830d)			      \
--		ch = __fourbyte_to_ucs[idx - 6637 - 2110 - 14426];	      \
--	      else if (idx >= 0x93d5 && idx <= 0x99de)			      \
--		ch = __fourbyte_to_ucs[idx - 6637 - 2110 - 14426 - 4295];     \
-+		ch = __fourbyte_to_ucs[idx - 6637 - 2110 - 14404];	      \
-+	      else if (idx >= 0x830e && idx <= 0x93d4)			      \
-+		ch = idx + 0x6557;					      \
-+	      else if (idx >= 0x93d5 && idx <= 0x99e1)			      \
-+		ch = __fourbyte_to_ucs[idx - 6637 - 2110 - 14404 - 4295];     \
-+	      else if (idx >= 0x99e2 && idx <= 0x99fb)			      \
-+		ch = idx + 0x6604;					      \
-+	      else if (idx >= 0x2e248 && idx <= 0x12e247)		      \
-+		ch = idx - 0x1e248;					      \
- 	      else							      \
- 		ch = 0;							      \
- 									      \
-@@ -18155,8 +24222,24 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
- 		  || (ch = __twobyte_to_ucs[idx],			      \
- 		      ch == 0 && *inptr != '\0'))			      \
- 		{							      \
--		  /* This is an illegal character.  */			      \
--		  STANDARD_FROM_LOOP_ERR_HANDLER (2);			      \
-+		  /* Handle a few special cases.  */			      \
-+		  if (idx == 0x5dd1)					      \
-+		    ch = 0x20087;					      \
-+		  else if (idx == 0x5dd2)				      \
-+		    ch = 0x20089;					      \
-+		  else if (idx == 0x5dd3)				      \
-+		    ch = 0x200cc;					      \
-+		  else if (idx == 0x5dec)				      \
-+		    ch = 0x215D7;					      \
-+		  else if (idx == 0x5df6)				      \
-+		    ch = 0x2298F;					      \
-+		  else if (idx == 0x5e11)				      \
-+		    ch = 0x241FE;					      \
-+		  else							      \
-+		    {							      \
-+		      /* This is an illegal character.  */		      \
-+		      STANDARD_FROM_LOOP_ERR_HANDLER (2);		      \
-+		    }							      \
- 		}							      \
- 									      \
- 	      inptr += 2;						      \
-@@ -18199,7 +24282,7 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
- 	unsigned long int idx = 0;					      \
- 	const unsigned char *cp = NULL;					      \
- 	int len = 2;	/* This is the most common case.  */		      \
--	if (ch <= 0x9FA5)						      \
-+	if (ch <= 0x9FBB)						      \
- 	  {								      \
- 	    cp = __ucs_to_gb18030_tab1[ch - 0x80];			      \
- 	    if (*cp && *cp < 0x81)					      \
-@@ -18210,6 +24293,11 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
- 	    if (cp[0] == 0 && cp[1] == 0)				      \
- 	      len = 0;							      \
- 	  }								      \
-+	else if (ch >= 0x9fbc && ch <= 0xD7ff)				      \
-+	  {								      \
-+	    idx = ch - 0x5543;						      \
-+	    len = 4;							      \
-+	  }								      \
- 	else if (ch >= 0xE000 && ch <= 0xE864)				      \
- 	  {								      \
- 	    cp = __ucs_to_gb18030_tab2[ch - 0xE000];			      \
-@@ -18221,6 +24309,11 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
- 	    else if (cp[0] == 0 && cp[1] == 0)				      \
- 	      len = 0;							      \
- 	  }								      \
-+	else if (ch >= 0xE865 && ch <= 0xF92B)				      \
-+	  {								      \
-+	    idx = ch - 0x6557;						      \
-+	    len = 4;							      \
-+	  }								      \
- 	else if (ch >= 0xF92C && ch <= 0xFFE5)				      \
- 	  {								      \
- 	    cp = __ucs_to_gb18030_tab2[ch - 0xE000 - 4295];		      \
-@@ -18232,6 +24325,11 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
- 	    else if (cp[0] == 0 && cp[1] == 0)				      \
- 	      len = 0;							      \
- 	  }								      \
-+	else if (ch >= 0xFFE6 && ch <= 0xFFFF)				      \
-+	  {								      \
-+	    idx = ch - 0x6604;						      \
-+	    len = 4;							      \
-+	  }								      \
- 	else if (ch == 0x20087)						      \
- 	  cp = (const unsigned char *) "\xfe\x51";			      \
- 	else if (ch == 0x20089)						      \
-@@ -18243,6 +24341,11 @@ static const unsigned char __ucs_to_gb18030_tab2[][2] =
- 	  cp = (const unsigned char *) "\xfe\x76";			      \
- 	else if (ch == 0x241FE)						      \
- 	  cp = (const unsigned char *) "\xfe\x91";			      \
-+	else if (ch >= 0x10000 && ch <= 0x10FFFF)			      \
-+	  {								      \
-+	    idx = ch + 0x1E248;						      \
-+	    len = 4;							      \
-+	  }								      \
- 	else								      \
- 	  len = 0;							      \
- 									      \
-diff --git a/localedata/charmaps/GB18030 b/localedata/charmaps/GB18030
-index 4a83678..db911ec 100644
---- a/localedata/charmaps/GB18030
-+++ b/localedata/charmaps/GB18030
-@@ -893,11 +893,18 @@ CHARMAP
- <U0375>     /x81/x30/xc8/x33 GREEK LOWER NUMERAL SIGN
- <U0376>     /x81/x30/xc8/x34 GREEK CAPITAL LETTER PAMPHYLIAN DIGAMMA
- <U0377>     /x81/x30/xc8/x35 GREEK SMALL LETTER PAMPHYLIAN DIGAMMA
-+<U0378>     /x81/x30/xc8/x36 <UNASSIGNED>
-+<U0379>     /x81/x30/xc8/x37 <UNASSIGNED>
- <U037A>     /x81/x30/xc8/x38 GREEK YPOGEGRAMMENI
- <U037B>     /x81/x30/xc8/x39 GREEK SMALL REVERSED LUNATE SIGMA SYMBOL
- <U037C>     /x81/x30/xc9/x30 GREEK SMALL DOTTED LUNATE SIGMA SYMBOL
- <U037D>     /x81/x30/xc9/x31 GREEK SMALL REVERSED DOTTED LUNATE SIGMA SYMBOL
- <U037E>     /x81/x30/xc9/x32 GREEK QUESTION MARK
-+<U037F>     /x81/x30/xc9/x33 <UNASSIGNED>
-+<U0380>     /x81/x30/xc9/x34 <UNASSIGNED>
-+<U0381>     /x81/x30/xc9/x35 <UNASSIGNED>
-+<U0382>     /x81/x30/xc9/x36 <UNASSIGNED>
-+<U0383>     /x81/x30/xc9/x37 <UNASSIGNED>
- <U0384>     /x81/x30/xc9/x38 GREEK TONOS
- <U0385>     /x81/x30/xc9/x39 GREEK DIALYTIKA TONOS
- <U0386>     /x81/x30/xca/x30 GREEK CAPITAL LETTER ALPHA WITH TONOS
-@@ -905,7 +912,9 @@ CHARMAP
- <U0388>     /x81/x30/xca/x32 GREEK CAPITAL LETTER EPSILON WITH TONOS
- <U0389>     /x81/x30/xca/x33 GREEK CAPITAL LETTER ETA WITH TONOS
- <U038A>     /x81/x30/xca/x34 GREEK CAPITAL LETTER IOTA WITH TONOS
-+<U038B>     /x81/x30/xca/x35 <UNASSIGNED>
- <U038C>     /x81/x30/xca/x36 GREEK CAPITAL LETTER OMICRON WITH TONOS
-+<U038D>     /x81/x30/xca/x37 <UNASSIGNED>
- <U038E>     /x81/x30/xca/x38 GREEK CAPITAL LETTER UPSILON WITH TONOS
- <U038F>     /x81/x30/xca/x39 GREEK CAPITAL LETTER OMEGA WITH TONOS
- <U0390>     /x81/x30/xcb/x30 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS
-@@ -926,6 +935,7 @@ CHARMAP
- <U039F>     /xa6/xaf         GREEK CAPITAL LETTER OMICRON
- <U03A0>     /xa6/xb0         GREEK CAPITAL LETTER PI
- <U03A1>     /xa6/xb1         GREEK CAPITAL LETTER RHO
-+<U03A2>     /x81/x30/xcb/x31 <UNASSIGNED>
- <U03A3>     /xa6/xb2         GREEK CAPITAL LETTER SIGMA
- <U03A4>     /xa6/xb3         GREEK CAPITAL LETTER TAU
- <U03A5>     /xa6/xb4         GREEK CAPITAL LETTER UPSILON
-@@ -970,6 +980,7 @@ CHARMAP
- <U03CC>     /x81/x30/xcc/x32 GREEK SMALL LETTER OMICRON WITH TONOS
- <U03CD>     /x81/x30/xcc/x33 GREEK SMALL LETTER UPSILON WITH TONOS
- <U03CE>     /x81/x30/xcc/x34 GREEK SMALL LETTER OMEGA WITH TONOS
-+<U03CF>     /x81/x30/xcc/x35 <UNASSIGNED>
- <U03D0>     /x81/x30/xcc/x36 GREEK BETA SYMBOL
- <U03D1>     /x81/x30/xcc/x37 GREEK THETA SYMBOL
- <U03D2>     /x81/x30/xcc/x38 GREEK UPSILON WITH HOOK SYMBOL
-@@ -1100,7 +1111,7108 @@ CHARMAP
- <U044F>     /xa7/xf1         CYRILLIC SMALL LETTER YA
- <U0450>     /x81/x30/xd2/x39 CYRILLIC SMALL LETTER IE WITH GRAVE
- <U0451>     /xa7/xd7         CYRILLIC SMALL LETTER IO
-+<U0452>     /x81/x30/xd3/x30 CYRILLIC SMALL LETTER DJE
-+<U0453>     /x81/x30/xd3/x31 CYRILLIC SMALL LETTER GJE
-+<U0454>     /x81/x30/xd3/x32 CYRILLIC SMALL LETTER UKRAINIAN IE
-+<U0455>     /x81/x30/xd3/x33 CYRILLIC SMALL LETTER DZE
-+<U0456>     /x81/x30/xd3/x34 CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
-+<U0457>     /x81/x30/xd3/x35 CYRILLIC SMALL LETTER YI
-+<U0458>     /x81/x30/xd3/x36 CYRILLIC SMALL LETTER JE
-+<U0459>     /x81/x30/xd3/x37 CYRILLIC SMALL LETTER LJE
-+<U045A>     /x81/x30/xd3/x38 CYRILLIC SMALL LETTER NJE
-+<U045B>     /x81/x30/xd3/x39 CYRILLIC SMALL LETTER TSHE
-+<U045C>     /x81/x30/xd4/x30 CYRILLIC SMALL LETTER KJE
-+<U045D>     /x81/x30/xd4/x31 CYRILLIC SMALL LETTER I WITH GRAVE
-+<U045E>     /x81/x30/xd4/x32 CYRILLIC SMALL LETTER SHORT U
-+<U045F>     /x81/x30/xd4/x33 CYRILLIC SMALL LETTER DZHE
-+<U0460>     /x81/x30/xd4/x34 CYRILLIC CAPITAL LETTER OMEGA
-+<U0461>     /x81/x30/xd4/x35 CYRILLIC SMALL LETTER OMEGA
-+<U0462>     /x81/x30/xd4/x36 CYRILLIC CAPITAL LETTER YAT
-+<U0463>     /x81/x30/xd4/x37 CYRILLIC SMALL LETTER YAT
-+<U0464>     /x81/x30/xd4/x38 CYRILLIC CAPITAL LETTER IOTIFIED E
-+<U0465>     /x81/x30/xd4/x39 CYRILLIC SMALL LETTER IOTIFIED E
-+<U0466>     /x81/x30/xd5/x30 CYRILLIC CAPITAL LETTER LITTLE YUS
-+<U0467>     /x81/x30/xd5/x31 CYRILLIC SMALL LETTER LITTLE YUS
-+<U0468>     /x81/x30/xd5/x32 CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS
-+<U0469>     /x81/x30/xd5/x33 CYRILLIC SMALL LETTER IOTIFIED LITTLE YUS
-+<U046A>     /x81/x30/xd5/x34 CYRILLIC CAPITAL LETTER BIG YUS
-+<U046B>     /x81/x30/xd5/x35 CYRILLIC SMALL LETTER BIG YUS
-+<U046C>     /x81/x30/xd5/x36 CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS
-+<U046D>     /x81/x30/xd5/x37 CYRILLIC SMALL LETTER IOTIFIED BIG YUS
-+<U046E>     /x81/x30/xd5/x38 CYRILLIC CAPITAL LETTER KSI
-+<U046F>     /x81/x30/xd5/x39 CYRILLIC SMALL LETTER KSI
-+<U0470>     /x81/x30/xd6/x30 CYRILLIC CAPITAL LETTER PSI
-+<U0471>     /x81/x30/xd6/x31 CYRILLIC SMALL LETTER PSI
-+<U0472>     /x81/x30/xd6/x32 CYRILLIC CAPITAL LETTER FITA
-+<U0473>     /x81/x30/xd6/x33 CYRILLIC SMALL LETTER FITA
-+<U0474>     /x81/x30/xd6/x34 CYRILLIC CAPITAL LETTER IZHITSA
-+<U0475>     /x81/x30/xd6/x35 CYRILLIC SMALL LETTER IZHITSA
-+<U0476>     /x81/x30/xd6/x36 CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-+<U0477>     /x81/x30/xd6/x37 CYRILLIC SMALL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT
-+<U0478>     /x81/x30/xd6/x38 CYRILLIC CAPITAL LETTER UK
-+<U0479>     /x81/x30/xd6/x39 CYRILLIC SMALL LETTER UK
-+<U047A>     /x81/x30/xd7/x30 CYRILLIC CAPITAL LETTER ROUND OMEGA
-+<U047B>     /x81/x30/xd7/x31 CYRILLIC SMALL LETTER ROUND OMEGA
-+<U047C>     /x81/x30/xd7/x32 CYRILLIC CAPITAL LETTER OMEGA WITH TITLO
-+<U047D>     /x81/x30/xd7/x33 CYRILLIC SMALL LETTER OMEGA WITH TITLO
-+<U047E>     /x81/x30/xd7/x34 CYRILLIC CAPITAL LETTER OT
-+<U047F>     /x81/x30/xd7/x35 CYRILLIC SMALL LETTER OT
-+<U0480>     /x81/x30/xd7/x36 CYRILLIC CAPITAL LETTER KOPPA
-+<U0481>     /x81/x30/xd7/x37 CYRILLIC SMALL LETTER KOPPA
-+<U0482>     /x81/x30/xd7/x38 CYRILLIC THOUSANDS SIGN
-+<U0483>     /x81/x30/xd7/x39 COMBINING CYRILLIC TITLO
-+<U0484>     /x81/x30/xd8/x30 COMBINING CYRILLIC PALATALIZATION
-+<U0485>     /x81/x30/xd8/x31 COMBINING CYRILLIC DASIA PNEUMATA
-+<U0486>     /x81/x30/xd8/x32 COMBINING CYRILLIC PSILI PNEUMATA
-+<U0487>     /x81/x30/xd8/x33 <UNASSIGNED>
-+<U0488>     /x81/x30/xd8/x34 COMBINING CYRILLIC HUNDRED THOUSANDS SIGN
-+<U0489>     /x81/x30/xd8/x35 COMBINING CYRILLIC MILLIONS SIGN
-+<U048A>     /x81/x30/xd8/x36 CYRILLIC CAPITAL LETTER SHORT I WITH TAIL
-+<U048B>     /x81/x30/xd8/x37 CYRILLIC SMALL LETTER SHORT I WITH TAIL
-+<U048C>     /x81/x30/xd8/x38 CYRILLIC CAPITAL LETTER SEMISOFT SIGN
-+<U048D>     /x81/x30/xd8/x39 CYRILLIC SMALL LETTER SEMISOFT SIGN
-+<U048E>     /x81/x30/xd9/x30 CYRILLIC CAPITAL LETTER ER WITH TICK
-+<U048F>     /x81/x30/xd9/x31 CYRILLIC SMALL LETTER ER WITH TICK
-+<U0490>     /x81/x30/xd9/x32 CYRILLIC CAPITAL LETTER GHE WITH UPTURN
-+<U0491>     /x81/x30/xd9/x33 CYRILLIC SMALL LETTER GHE WITH UPTURN
-+<U0492>     /x81/x30/xd9/x34 CYRILLIC CAPITAL LETTER GHE WITH STROKE
-+<U0493>     /x81/x30/xd9/x35 CYRILLIC SMALL LETTER GHE WITH STROKE
-+<U0494>     /x81/x30/xd9/x36 CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK
-+<U0495>     /x81/x30/xd9/x37 CYRILLIC SMALL LETTER GHE WITH MIDDLE HOOK
-+<U0496>     /x81/x30/xd9/x38 CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER
-+<U0497>     /x81/x30/xd9/x39 CYRILLIC SMALL LETTER ZHE WITH DESCENDER
-+<U0498>     /x81/x30/xda/x30 CYRILLIC CAPITAL LETTER ZE WITH DESCENDER
-+<U0499>     /x81/x30/xda/x31 CYRILLIC SMALL LETTER ZE WITH DESCENDER
-+<U049A>     /x81/x30/xda/x32 CYRILLIC CAPITAL LETTER KA WITH DESCENDER
-+<U049B>     /x81/x30/xda/x33 CYRILLIC SMALL LETTER KA WITH DESCENDER
-+<U049C>     /x81/x30/xda/x34 CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE
-+<U049D>     /x81/x30/xda/x35 CYRILLIC SMALL LETTER KA WITH VERTICAL STROKE
-+<U049E>     /x81/x30/xda/x36 CYRILLIC CAPITAL LETTER KA WITH STROKE
-+<U049F>     /x81/x30/xda/x37 CYRILLIC SMALL LETTER KA WITH STROKE
-+<U04A0>     /x81/x30/xda/x38 CYRILLIC CAPITAL LETTER BASHKIR KA
-+<U04A1>     /x81/x30/xda/x39 CYRILLIC SMALL LETTER BASHKIR KA
-+<U04A2>     /x81/x30/xdb/x30 CYRILLIC CAPITAL LETTER EN WITH DESCENDER
-+<U04A3>     /x81/x30/xdb/x31 CYRILLIC SMALL LETTER EN WITH DESCENDER
-+<U04A4>     /x81/x30/xdb/x32 CYRILLIC CAPITAL LIGATURE EN GHE
-+<U04A5>     /x81/x30/xdb/x33 CYRILLIC SMALL LIGATURE EN GHE
-+<U04A6>     /x81/x30/xdb/x34 CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK
-+<U04A7>     /x81/x30/xdb/x35 CYRILLIC SMALL LETTER PE WITH MIDDLE HOOK
-+<U04A8>     /x81/x30/xdb/x36 CYRILLIC CAPITAL LETTER ABKHASIAN HA
-+<U04A9>     /x81/x30/xdb/x37 CYRILLIC SMALL LETTER ABKHASIAN HA
-+<U04AA>     /x81/x30/xdb/x38 CYRILLIC CAPITAL LETTER ES WITH DESCENDER
-+<U04AB>     /x81/x30/xdb/x39 CYRILLIC SMALL LETTER ES WITH DESCENDER
-+<U04AC>     /x81/x30/xdc/x30 CYRILLIC CAPITAL LETTER TE WITH DESCENDER
-+<U04AD>     /x81/x30/xdc/x31 CYRILLIC SMALL LETTER TE WITH DESCENDER
-+<U04AE>     /x81/x30/xdc/x32 CYRILLIC CAPITAL LETTER STRAIGHT U
-+<U04AF>     /x81/x30/xdc/x33 CYRILLIC SMALL LETTER STRAIGHT U
-+<U04B0>     /x81/x30/xdc/x34 CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
-+<U04B1>     /x81/x30/xdc/x35 CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
-+<U04B2>     /x81/x30/xdc/x36 CYRILLIC CAPITAL LETTER HA WITH DESCENDER
-+<U04B3>     /x81/x30/xdc/x37 CYRILLIC SMALL LETTER HA WITH DESCENDER
-+<U04B4>     /x81/x30/xdc/x38 CYRILLIC CAPITAL LIGATURE TE TSE
-+<U04B5>     /x81/x30/xdc/x39 CYRILLIC SMALL LIGATURE TE TSE
-+<U04B6>     /x81/x30/xdd/x30 CYRILLIC CAPITAL LETTER CHE WITH DESCENDER
-+<U04B7>     /x81/x30/xdd/x31 CYRILLIC SMALL LETTER CHE WITH DESCENDER
-+<U04B8>     /x81/x30/xdd/x32 CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE
-+<U04B9>     /x81/x30/xdd/x33 CYRILLIC SMALL LETTER CHE WITH VERTICAL STROKE
-+<U04BA>     /x81/x30/xdd/x34 CYRILLIC CAPITAL LETTER SHHA
-+<U04BB>     /x81/x30/xdd/x35 CYRILLIC SMALL LETTER SHHA
-+<U04BC>     /x81/x30/xdd/x36 CYRILLIC CAPITAL LETTER ABKHASIAN CHE
-+<U04BD>     /x81/x30/xdd/x37 CYRILLIC SMALL LETTER ABKHASIAN CHE
-+<U04BE>     /x81/x30/xdd/x38 CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER
-+<U04BF>     /x81/x30/xdd/x39 CYRILLIC SMALL LETTER ABKHASIAN CHE WITH DESCENDER
-+<U04C0>     /x81/x30/xde/x30 CYRILLIC LETTER PALOCHKA
-+<U04C1>     /x81/x30/xde/x31 CYRILLIC CAPITAL LETTER ZHE WITH BREVE
-+<U04C2>     /x81/x30/xde/x32 CYRILLIC SMALL LETTER ZHE WITH BREVE
-+<U04C3>     /x81/x30/xde/x33 CYRILLIC CAPITAL LETTER KA WITH HOOK
-+<U04C4>     /x81/x30/xde/x34 CYRILLIC SMALL LETTER KA WITH HOOK
-+<U04C5>     /x81/x30/xde/x35 CYRILLIC CAPITAL LETTER EL WITH TAIL
-+<U04C6>     /x81/x30/xde/x36 CYRILLIC SMALL LETTER EL WITH TAIL
-+<U04C7>     /x81/x30/xde/x37 CYRILLIC CAPITAL LETTER EN WITH HOOK
-+<U04C8>     /x81/x30/xde/x38 CYRILLIC SMALL LETTER EN WITH HOOK
-+<U04C9>     /x81/x30/xde/x39 CYRILLIC CAPITAL LETTER EN WITH TAIL
-+<U04CA>     /x81/x30/xdf/x30 CYRILLIC SMALL LETTER EN WITH TAIL
-+<U04CB>     /x81/x30/xdf/x31 CYRILLIC CAPITAL LETTER KHAKASSIAN CHE
-+<U04CC>     /x81/x30/xdf/x32 CYRILLIC SMALL LETTER KHAKASSIAN CHE
-+<U04CD>     /x81/x30/xdf/x33 CYRILLIC CAPITAL LETTER EM WITH TAIL
-+<U04CE>     /x81/x30/xdf/x34 CYRILLIC SMALL LETTER EM WITH TAIL
-+<U04CF>     /x81/x30/xdf/x35 <UNASSIGNED>
-+<U04D0>     /x81/x30/xdf/x36 CYRILLIC CAPITAL LETTER A WITH BREVE
-+<U04D1>     /x81/x30/xdf/x37 CYRILLIC SMALL LETTER A WITH BREVE
-+<U04D2>     /x81/x30/xdf/x38 CYRILLIC CAPITAL LETTER A WITH DIAERESIS
-+<U04D3>     /x81/x30/xdf/x39 CYRILLIC SMALL LETTER A WITH DIAERESIS
-+<U04D4>     /x81/x30/xe0/x30 CYRILLIC CAPITAL LIGATURE A IE
-+<U04D5>     /x81/x30/xe0/x31 CYRILLIC SMALL LIGATURE A IE
-+<U04D6>     /x81/x30/xe0/x32 CYRILLIC CAPITAL LETTER IE WITH BREVE
-+<U04D7>     /x81/x30/xe0/x33 CYRILLIC SMALL LETTER IE WITH BREVE
-+<U04D8>     /x81/x30/xe0/x34 CYRILLIC CAPITAL LETTER SCHWA
-+<U04D9>     /x81/x30/xe0/x35 CYRILLIC SMALL LETTER SCHWA
-+<U04DA>     /x81/x30/xe0/x36 CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS
-+<U04DB>     /x81/x30/xe0/x37 CYRILLIC SMALL LETTER SCHWA WITH DIAERESIS
-+<U04DC>     /x81/x30/xe0/x38 CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS
-+<U04DD>     /x81/x30/xe0/x39 CYRILLIC SMALL LETTER ZHE WITH DIAERESIS
-+<U04DE>     /x81/x30/xe1/x30 CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS
-+<U04DF>     /x81/x30/xe1/x31 CYRILLIC SMALL LETTER ZE WITH DIAERESIS
-+<U04E0>     /x81/x30/xe1/x32 CYRILLIC CAPITAL LETTER ABKHASIAN DZE
-+<U04E1>     /x81/x30/xe1/x33 CYRILLIC SMALL LETTER ABKHASIAN DZE
-+<U04E2>     /x81/x30/xe1/x34 CYRILLIC CAPITAL LETTER I WITH MACRON
-+<U04E3>     /x81/x30/xe1/x35 CYRILLIC SMALL LETTER I WITH MACRON
-+<U04E4>     /x81/x30/xe1/x36 CYRILLIC CAPITAL LETTER I WITH DIAERESIS
-+<U04E5>     /x81/x30/xe1/x37 CYRILLIC SMALL LETTER I WITH DIAERESIS
-+<U04E6>     /x81/x30/xe1/x38 CYRILLIC CAPITAL LETTER O WITH DIAERESIS
-+<U04E7>     /x81/x30/xe1/x39 CYRILLIC SMALL LETTER O WITH DIAERESIS
-+<U04E8>     /x81/x30/xe2/x30 CYRILLIC CAPITAL LETTER BARRED O
-+<U04E9>     /x81/x30/xe2/x31 CYRILLIC SMALL LETTER BARRED O
-+<U04EA>     /x81/x30/xe2/x32 CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS
-+<U04EB>     /x81/x30/xe2/x33 CYRILLIC SMALL LETTER BARRED O WITH DIAERESIS
-+<U04EC>     /x81/x30/xe2/x34 CYRILLIC CAPITAL LETTER E WITH DIAERESIS
-+<U04ED>     /x81/x30/xe2/x35 CYRILLIC SMALL LETTER E WITH DIAERESIS
-+<U04EE>     /x81/x30/xe2/x36 CYRILLIC CAPITAL LETTER U WITH MACRON
-+<U04EF>     /x81/x30/xe2/x37 CYRILLIC SMALL LETTER U WITH MACRON
-+<U04F0>     /x81/x30/xe2/x38 CYRILLIC CAPITAL LETTER U WITH DIAERESIS
-+<U04F1>     /x81/x30/xe2/x39 CYRILLIC SMALL LETTER U WITH DIAERESIS
-+<U04F2>     /x81/x30/xe3/x30 CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE
-+<U04F3>     /x81/x30/xe3/x31 CYRILLIC SMALL LETTER U WITH DOUBLE ACUTE
-+<U04F4>     /x81/x30/xe3/x32 CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS
-+<U04F5>     /x81/x30/xe3/x33 CYRILLIC SMALL LETTER CHE WITH DIAERESIS
-+<U04F6>     /x81/x30/xe3/x34 <UNASSIGNED>
-+<U04F7>     /x81/x30/xe3/x35 <UNASSIGNED>
-+<U04F8>     /x81/x30/xe3/x36 CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS
-+<U04F9>     /x81/x30/xe3/x37 CYRILLIC SMALL LETTER YERU WITH DIAERESIS
-+<U04FA>     /x81/x30/xe3/x38 <UNASSIGNED>
-+<U04FB>     /x81/x30/xe3/x39 <UNASSIGNED>
-+<U04FC>     /x81/x30/xe4/x30 <UNASSIGNED>
-+<U04FD>     /x81/x30/xe4/x31 <UNASSIGNED>
-+<U04FE>     /x81/x30/xe4/x32 <UNASSIGNED>
-+<U04FF>     /x81/x30/xe4/x33 <UNASSIGNED>
-+<U0500>     /x81/x30/xe4/x34 CYRILLIC CAPITAL LETTER KOMI DE
-+<U0501>     /x81/x30/xe4/x35 CYRILLIC SMALL LETTER KOMI DE
-+<U0502>     /x81/x30/xe4/x36 CYRILLIC CAPITAL LETTER KOMI DJE
-+<U0503>     /x81/x30/xe4/x37 CYRILLIC SMALL LETTER KOMI DJE
-+<U0504>     /x81/x30/xe4/x38 CYRILLIC CAPITAL LETTER KOMI ZJE
-+<U0505>     /x81/x30/xe4/x39 CYRILLIC SMALL LETTER KOMI ZJE
-+<U0506>     /x81/x30/xe5/x30 CYRILLIC CAPITAL LETTER KOMI DZJE
-+<U0507>     /x81/x30/xe5/x31 CYRILLIC SMALL LETTER KOMI DZJE
-+<U0508>     /x81/x30/xe5/x32 CYRILLIC CAPITAL LETTER KOMI LJE
-+<U0509>     /x81/x30/xe5/x33 CYRILLIC SMALL LETTER KOMI LJE
-+<U050A>     /x81/x30/xe5/x34 CYRILLIC CAPITAL LETTER KOMI NJE
-+<U050B>     /x81/x30/xe5/x35 CYRILLIC SMALL LETTER KOMI NJE
-+<U050C>     /x81/x30/xe5/x36 CYRILLIC CAPITAL LETTER KOMI SJE
-+<U050D>     /x81/x30/xe5/x37 CYRILLIC SMALL LETTER KOMI SJE
-+<U050E>     /x81/x30/xe5/x38 CYRILLIC CAPITAL LETTER KOMI TJE
-+<U050F>     /x81/x30/xe5/x39 CYRILLIC SMALL LETTER KOMI TJE
-+<U0510>     /x81/x30/xe6/x30 <UNASSIGNED>
-+<U0511>     /x81/x30/xe6/x31 <UNASSIGNED>
-+<U0512>     /x81/x30/xe6/x32 <UNASSIGNED>
-+<U0513>     /x81/x30/xe6/x33 <UNASSIGNED>
-+<U0514>     /x81/x30/xe6/x34 <UNASSIGNED>
-+<U0515>     /x81/x30/xe6/x35 <UNASSIGNED>
-+<U0516>     /x81/x30/xe6/x36 <UNASSIGNED>
-+<U0517>     /x81/x30/xe6/x37 <UNASSIGNED>
-+<U0518>     /x81/x30/xe6/x38 <UNASSIGNED>
-+<U0519>     /x81/x30/xe6/x39 <UNASSIGNED>
-+<U051A>     /x81/x30/xe7/x30 <UNASSIGNED>
-+<U051B>     /x81/x30/xe7/x31 <UNASSIGNED>
-+<U051C>     /x81/x30/xe7/x32 <UNASSIGNED>
-+<U051D>     /x81/x30/xe7/x33 <UNASSIGNED>
-+<U051E>     /x81/x30/xe7/x34 <UNASSIGNED>
-+<U051F>     /x81/x30/xe7/x35 <UNASSIGNED>
-+<U0520>     /x81/x30/xe7/x36 <UNASSIGNED>
-+<U0521>     /x81/x30/xe7/x37 <UNASSIGNED>
-+<U0522>     /x81/x30/xe7/x38 <UNASSIGNED>
-+<U0523>     /x81/x30/xe7/x39 <UNASSIGNED>
-+<U0524>     /x81/x30/xe8/x30 <UNASSIGNED>
-+<U0525>     /x81/x30/xe8/x31 <UNASSIGNED>
-+<U0526>     /x81/x30/xe8/x32 <UNASSIGNED>
-+<U0527>     /x81/x30/xe8/x33 <UNASSIGNED>
-+<U0528>     /x81/x30/xe8/x34 <UNASSIGNED>
-+<U0529>     /x81/x30/xe8/x35 <UNASSIGNED>
-+<U052A>     /x81/x30/xe8/x36 <UNASSIGNED>
-+<U052B>     /x81/x30/xe8/x37 <UNASSIGNED>
-+<U052C>     /x81/x30/xe8/x38 <UNASSIGNED>
-+<U052D>     /x81/x30/xe8/x39 <UNASSIGNED>
-+<U052E>     /x81/x30/xe9/x30 <UNASSIGNED>
-+<U052F>     /x81/x30/xe9/x31 <UNASSIGNED>
-+<U0530>     /x81/x30/xe9/x32 <UNASSIGNED>
-+<U0531>     /x81/x30/xe9/x33 ARMENIAN CAPITAL LETTER AYB
-+<U0532>     /x81/x30/xe9/x34 ARMENIAN CAPITAL LETTER BEN
-+<U0533>     /x81/x30/xe9/x35 ARMENIAN CAPITAL LETTER GIM
-+<U0534>     /x81/x30/xe9/x36 ARMENIAN CAPITAL LETTER DA
-+<U0535>     /x81/x30/xe9/x37 ARMENIAN CAPITAL LETTER ECH
-+<U0536>     /x81/x30/xe9/x38 ARMENIAN CAPITAL LETTER ZA
-+<U0537>     /x81/x30/xe9/x39 ARMENIAN CAPITAL LETTER EH
-+<U0538>     /x81/x30/xea/x30 ARMENIAN CAPITAL LETTER ET
-+<U0539>     /x81/x30/xea/x31 ARMENIAN CAPITAL LETTER TO
-+<U053A>     /x81/x30/xea/x32 ARMENIAN CAPITAL LETTER ZHE
-+<U053B>     /x81/x30/xea/x33 ARMENIAN CAPITAL LETTER INI
-+<U053C>     /x81/x30/xea/x34 ARMENIAN CAPITAL LETTER LIWN
-+<U053D>     /x81/x30/xea/x35 ARMENIAN CAPITAL LETTER XEH
-+<U053E>     /x81/x30/xea/x36 ARMENIAN CAPITAL LETTER CA
-+<U053F>     /x81/x30/xea/x37 ARMENIAN CAPITAL LETTER KEN
-+<U0540>     /x81/x30/xea/x38 ARMENIAN CAPITAL LETTER HO
-+<U0541>     /x81/x30/xea/x39 ARMENIAN CAPITAL LETTER JA
-+<U0542>     /x81/x30/xeb/x30 ARMENIAN CAPITAL LETTER GHAD
-+<U0543>     /x81/x30/xeb/x31 ARMENIAN CAPITAL LETTER CHEH
-+<U0544>     /x81/x30/xeb/x32 ARMENIAN CAPITAL LETTER MEN
-+<U0545>     /x81/x30/xeb/x33 ARMENIAN CAPITAL LETTER YI
-+<U0546>     /x81/x30/xeb/x34 ARMENIAN CAPITAL LETTER NOW
-+<U0547>     /x81/x30/xeb/x35 ARMENIAN CAPITAL LETTER SHA
-+<U0548>     /x81/x30/xeb/x36 ARMENIAN CAPITAL LETTER VO
-+<U0549>     /x81/x30/xeb/x37 ARMENIAN CAPITAL LETTER CHA
-+<U054A>     /x81/x30/xeb/x38 ARMENIAN CAPITAL LETTER PEH
-+<U054B>     /x81/x30/xeb/x39 ARMENIAN CAPITAL LETTER JHEH
-+<U054C>     /x81/x30/xec/x30 ARMENIAN CAPITAL LETTER RA
-+<U054D>     /x81/x30/xec/x31 ARMENIAN CAPITAL LETTER SEH
-+<U054E>     /x81/x30/xec/x32 ARMENIAN CAPITAL LETTER VEW
-+<U054F>     /x81/x30/xec/x33 ARMENIAN CAPITAL LETTER TIWN
-+<U0550>     /x81/x30/xec/x34 ARMENIAN CAPITAL LETTER REH
-+<U0551>     /x81/x30/xec/x35 ARMENIAN CAPITAL LETTER CO
-+<U0552>     /x81/x30/xec/x36 ARMENIAN CAPITAL LETTER YIWN
-+<U0553>     /x81/x30/xec/x37 ARMENIAN CAPITAL LETTER PIWR
-+<U0554>     /x81/x30/xec/x38 ARMENIAN CAPITAL LETTER KEH
-+<U0555>     /x81/x30/xec/x39 ARMENIAN CAPITAL LETTER OH
-+<U0556>     /x81/x30/xed/x30 ARMENIAN CAPITAL LETTER FEH
-+<U0557>     /x81/x30/xed/x31 <UNASSIGNED>
-+<U0558>     /x81/x30/xed/x32 <UNASSIGNED>
-+<U0559>     /x81/x30/xed/x33 ARMENIAN MODIFIER LETTER LEFT HALF RING
-+<U055A>     /x81/x30/xed/x34 ARMENIAN APOSTROPHE
-+<U055B>     /x81/x30/xed/x35 ARMENIAN EMPHASIS MARK
-+<U055C>     /x81/x30/xed/x36 ARMENIAN EXCLAMATION MARK
-+<U055D>     /x81/x30/xed/x37 ARMENIAN COMMA
-+<U055E>     /x81/x30/xed/x38 ARMENIAN QUESTION MARK
-+<U055F>     /x81/x30/xed/x39 ARMENIAN ABBREVIATION MARK
-+<U0560>     /x81/x30/xee/x30 <UNASSIGNED>
-+<U0561>     /x81/x30/xee/x31 ARMENIAN SMALL LETTER AYB
-+<U0562>     /x81/x30/xee/x32 ARMENIAN SMALL LETTER BEN
-+<U0563>     /x81/x30/xee/x33 ARMENIAN SMALL LETTER GIM
-+<U0564>     /x81/x30/xee/x34 ARMENIAN SMALL LETTER DA
-+<U0565>     /x81/x30/xee/x35 ARMENIAN SMALL LETTER ECH
-+<U0566>     /x81/x30/xee/x36 ARMENIAN SMALL LETTER ZA
-+<U0567>     /x81/x30/xee/x37 ARMENIAN SMALL LETTER EH
-+<U0568>     /x81/x30/xee/x38 ARMENIAN SMALL LETTER ET
-+<U0569>     /x81/x30/xee/x39 ARMENIAN SMALL LETTER TO
-+<U056A>     /x81/x30/xef/x30 ARMENIAN SMALL LETTER ZHE
-+<U056B>     /x81/x30/xef/x31 ARMENIAN SMALL LETTER INI
-+<U056C>     /x81/x30/xef/x32 ARMENIAN SMALL LETTER LIWN
-+<U056D>     /x81/x30/xef/x33 ARMENIAN SMALL LETTER XEH
-+<U056E>     /x81/x30/xef/x34 ARMENIAN SMALL LETTER CA
-+<U056F>     /x81/x30/xef/x35 ARMENIAN SMALL LETTER KEN
-+<U0570>     /x81/x30/xef/x36 ARMENIAN SMALL LETTER HO
-+<U0571>     /x81/x30/xef/x37 ARMENIAN SMALL LETTER JA
-+<U0572>     /x81/x30/xef/x38 ARMENIAN SMALL LETTER GHAD
-+<U0573>     /x81/x30/xef/x39 ARMENIAN SMALL LETTER CHEH
-+<U0574>     /x81/x30/xf0/x30 ARMENIAN SMALL LETTER MEN
-+<U0575>     /x81/x30/xf0/x31 ARMENIAN SMALL LETTER YI
-+<U0576>     /x81/x30/xf0/x32 ARMENIAN SMALL LETTER NOW
-+<U0577>     /x81/x30/xf0/x33 ARMENIAN SMALL LETTER SHA
-+<U0578>     /x81/x30/xf0/x34 ARMENIAN SMALL LETTER VO
-+<U0579>     /x81/x30/xf0/x35 ARMENIAN SMALL LETTER CHA
-+<U057A>     /x81/x30/xf0/x36 ARMENIAN SMALL LETTER PEH
-+<U057B>     /x81/x30/xf0/x37 ARMENIAN SMALL LETTER JHEH
-+<U057C>     /x81/x30/xf0/x38 ARMENIAN SMALL LETTER RA
-+<U057D>     /x81/x30/xf0/x39 ARMENIAN SMALL LETTER SEH
-+<U057E>     /x81/x30/xf1/x30 ARMENIAN SMALL LETTER VEW
-+<U057F>     /x81/x30/xf1/x31 ARMENIAN SMALL LETTER TIWN
-+<U0580>     /x81/x30/xf1/x32 ARMENIAN SMALL LETTER REH
-+<U0581>     /x81/x30/xf1/x33 ARMENIAN SMALL LETTER CO
-+<U0582>     /x81/x30/xf1/x34 ARMENIAN SMALL LETTER YIWN
-+<U0583>     /x81/x30/xf1/x35 ARMENIAN SMALL LETTER PIWR
-+<U0584>     /x81/x30/xf1/x36 ARMENIAN SMALL LETTER KEH
-+<U0585>     /x81/x30/xf1/x37 ARMENIAN SMALL LETTER OH
-+<U0586>     /x81/x30/xf1/x38 ARMENIAN SMALL LETTER FEH
-+<U0587>     /x81/x30/xf1/x39 ARMENIAN SMALL LIGATURE ECH YIWN
-+<U0588>     /x81/x30/xf2/x30 <UNASSIGNED>
-+<U0589>     /x81/x30/xf2/x31 ARMENIAN FULL STOP
-+<U058A>     /x81/x30/xf2/x32 ARMENIAN HYPHEN
-+<U058B>     /x81/x30/xf2/x33 <UNASSIGNED>
-+<U058C>     /x81/x30/xf2/x34 <UNASSIGNED>
-+<U058D>     /x81/x30/xf2/x35 <UNASSIGNED>
-+<U058E>     /x81/x30/xf2/x36 <UNASSIGNED>
-+<U058F>     /x81/x30/xf2/x37 <UNASSIGNED>
-+<U0590>     /x81/x30/xf2/x38 <UNASSIGNED>
-+<U0591>     /x81/x30/xf2/x39 HEBREW ACCENT ETNAHTA
-+<U0592>     /x81/x30/xf3/x30 HEBREW ACCENT SEGOL
-+<U0593>     /x81/x30/xf3/x31 HEBREW ACCENT SHALSHELET
-+<U0594>     /x81/x30/xf3/x32 HEBREW ACCENT ZAQEF QATAN
-+<U0595>     /x81/x30/xf3/x33 HEBREW ACCENT ZAQEF GADOL
-+<U0596>     /x81/x30/xf3/x34 HEBREW ACCENT TIPEHA
-+<U0597>     /x81/x30/xf3/x35 HEBREW ACCENT REVIA
-+<U0598>     /x81/x30/xf3/x36 HEBREW ACCENT ZARQA
-+<U0599>     /x81/x30/xf3/x37 HEBREW ACCENT PASHTA
-+<U059A>     /x81/x30/xf3/x38 HEBREW ACCENT YETIV
-+<U059B>     /x81/x30/xf3/x39 HEBREW ACCENT TEVIR
-+<U059C>     /x81/x30/xf4/x30 HEBREW ACCENT GERESH
-+<U059D>     /x81/x30/xf4/x31 HEBREW ACCENT GERESH MUQDAM
-+<U059E>     /x81/x30/xf4/x32 HEBREW ACCENT GERSHAYIM
-+<U059F>     /x81/x30/xf4/x33 HEBREW ACCENT QARNEY PARA
-+<U05A0>     /x81/x30/xf4/x34 HEBREW ACCENT TELISHA GEDOLA
-+<U05A1>     /x81/x30/xf4/x35 HEBREW ACCENT PAZER
-+<U05A2>     /x81/x30/xf4/x36 <UNASSIGNED>
-+<U05A3>     /x81/x30/xf4/x37 HEBREW ACCENT MUNAH
-+<U05A4>     /x81/x30/xf4/x38 HEBREW ACCENT MAHAPAKH
-+<U05A5>     /x81/x30/xf4/x39 HEBREW ACCENT MERKHA
-+<U05A6>     /x81/x30/xf5/x30 HEBREW ACCENT MERKHA KEFULA
-+<U05A7>     /x81/x30/xf5/x31 HEBREW ACCENT DARGA
-+<U05A8>     /x81/x30/xf5/x32 HEBREW ACCENT QADMA
-+<U05A9>     /x81/x30/xf5/x33 HEBREW ACCENT TELISHA QETANA
-+<U05AA>     /x81/x30/xf5/x34 HEBREW ACCENT YERAH BEN YOMO
-+<U05AB>     /x81/x30/xf5/x35 HEBREW ACCENT OLE
-+<U05AC>     /x81/x30/xf5/x36 HEBREW ACCENT ILUY
-+<U05AD>     /x81/x30/xf5/x37 HEBREW ACCENT DEHI
-+<U05AE>     /x81/x30/xf5/x38 HEBREW ACCENT ZINOR
-+<U05AF>     /x81/x30/xf5/x39 HEBREW MARK MASORA CIRCLE
-+<U05B0>     /x81/x30/xf6/x30 HEBREW POINT SHEVA
-+<U05B1>     /x81/x30/xf6/x31 HEBREW POINT HATAF SEGOL
-+<U05B2>     /x81/x30/xf6/x32 HEBREW POINT HATAF PATAH
-+<U05B3>     /x81/x30/xf6/x33 HEBREW POINT HATAF QAMATS
-+<U05B4>     /x81/x30/xf6/x34 HEBREW POINT HIRIQ
-+<U05B5>     /x81/x30/xf6/x35 HEBREW POINT TSERE
-+<U05B6>     /x81/x30/xf6/x36 HEBREW POINT SEGOL
-+<U05B7>     /x81/x30/xf6/x37 HEBREW POINT PATAH
-+<U05B8>     /x81/x30/xf6/x38 HEBREW POINT QAMATS
-+<U05B9>     /x81/x30/xf6/x39 HEBREW POINT HOLAM
-+<U05BA>     /x81/x30/xf7/x30 <UNASSIGNED>
-+<U05BB>     /x81/x30/xf7/x31 HEBREW POINT QUBUTS
-+<U05BC>     /x81/x30/xf7/x32 HEBREW POINT DAGESH OR MAPIQ
-+<U05BD>     /x81/x30/xf7/x33 HEBREW POINT METEG
-+<U05BE>     /x81/x30/xf7/x34 HEBREW PUNCTUATION MAQAF
-+<U05BF>     /x81/x30/xf7/x35 HEBREW POINT RAFE
-+<U05C0>     /x81/x30/xf7/x36 HEBREW PUNCTUATION PASEQ
-+<U05C1>     /x81/x30/xf7/x37 HEBREW POINT SHIN DOT
-+<U05C2>     /x81/x30/xf7/x38 HEBREW POINT SIN DOT
-+<U05C3>     /x81/x30/xf7/x39 HEBREW PUNCTUATION SOF PASUQ
-+<U05C4>     /x81/x30/xf8/x30 HEBREW MARK UPPER DOT
-+<U05C5>     /x81/x30/xf8/x31 <UNASSIGNED>
-+<U05C6>     /x81/x30/xf8/x32 <UNASSIGNED>
-+<U05C7>     /x81/x30/xf8/x33 <UNASSIGNED>
-+<U05C8>     /x81/x30/xf8/x34 <UNASSIGNED>
-+<U05C9>     /x81/x30/xf8/x35 <UNASSIGNED>
-+<U05CA>     /x81/x30/xf8/x36 <UNASSIGNED>
-+<U05CB>     /x81/x30/xf8/x37 <UNASSIGNED>
-+<U05CC>     /x81/x30/xf8/x38 <UNASSIGNED>
-+<U05CD>     /x81/x30/xf8/x39 <UNASSIGNED>
-+<U05CE>     /x81/x30/xf9/x30 <UNASSIGNED>
-+<U05CF>     /x81/x30/xf9/x31 <UNASSIGNED>
-+<U05D0>     /x81/x30/xf9/x32 HEBREW LETTER ALEF
-+<U05D1>     /x81/x30/xf9/x33 HEBREW LETTER BET
-+<U05D2>     /x81/x30/xf9/x34 HEBREW LETTER GIMEL
-+<U05D3>     /x81/x30/xf9/x35 HEBREW LETTER DALET
-+<U05D4>     /x81/x30/xf9/x36 HEBREW LETTER HE
-+<U05D5>     /x81/x30/xf9/x37 HEBREW LETTER VAV
-+<U05D6>     /x81/x30/xf9/x38 HEBREW LETTER ZAYIN
-+<U05D7>     /x81/x30/xf9/x39 HEBREW LETTER HET
-+<U05D8>     /x81/x30/xfa/x30 HEBREW LETTER TET
-+<U05D9>     /x81/x30/xfa/x31 HEBREW LETTER YOD
-+<U05DA>     /x81/x30/xfa/x32 HEBREW LETTER FINAL KAF
-+<U05DB>     /x81/x30/xfa/x33 HEBREW LETTER KAF
-+<U05DC>     /x81/x30/xfa/x34 HEBREW LETTER LAMED
-+<U05DD>     /x81/x30/xfa/x35 HEBREW LETTER FINAL MEM
-+<U05DE>     /x81/x30/xfa/x36 HEBREW LETTER MEM
-+<U05DF>     /x81/x30/xfa/x37 HEBREW LETTER FINAL NUN
-+<U05E0>     /x81/x30/xfa/x38 HEBREW LETTER NUN
-+<U05E1>     /x81/x30/xfa/x39 HEBREW LETTER SAMEKH
-+<U05E2>     /x81/x30/xfb/x30 HEBREW LETTER AYIN
-+<U05E3>     /x81/x30/xfb/x31 HEBREW LETTER FINAL PE
-+<U05E4>     /x81/x30/xfb/x32 HEBREW LETTER PE
-+<U05E5>     /x81/x30/xfb/x33 HEBREW LETTER FINAL TSADI
-+<U05E6>     /x81/x30/xfb/x34 HEBREW LETTER TSADI
-+<U05E7>     /x81/x30/xfb/x35 HEBREW LETTER QOF
-+<U05E8>     /x81/x30/xfb/x36 HEBREW LETTER RESH
-+<U05E9>     /x81/x30/xfb/x37 HEBREW LETTER SHIN
-+<U05EA>     /x81/x30/xfb/x38 HEBREW LETTER TAV
-+<U05EB>     /x81/x30/xfb/x39 <UNASSIGNED>
-+<U05EC>     /x81/x30/xfc/x30 <UNASSIGNED>
-+<U05ED>     /x81/x30/xfc/x31 <UNASSIGNED>
-+<U05EE>     /x81/x30/xfc/x32 <UNASSIGNED>
-+<U05EF>     /x81/x30/xfc/x33 <UNASSIGNED>
-+<U05F0>     /x81/x30/xfc/x34 HEBREW LIGATURE YIDDISH DOUBLE VAV
-+<U05F1>     /x81/x30/xfc/x35 HEBREW LIGATURE YIDDISH VAV YOD
-+<U05F2>     /x81/x30/xfc/x36 HEBREW LIGATURE YIDDISH DOUBLE YOD
-+<U05F3>     /x81/x30/xfc/x37 HEBREW PUNCTUATION GERESH
-+<U05F4>     /x81/x30/xfc/x38 HEBREW PUNCTUATION GERSHAYIM
-+<U05F5>     /x81/x30/xfc/x39 <UNASSIGNED>
-+<U05F6>     /x81/x30/xfd/x30 <UNASSIGNED>
-+<U05F7>     /x81/x30/xfd/x31 <UNASSIGNED>
-+<U05F8>     /x81/x30/xfd/x32 <UNASSIGNED>
-+<U05F9>     /x81/x30/xfd/x33 <UNASSIGNED>
-+<U05FA>     /x81/x30/xfd/x34 <UNASSIGNED>
-+<U05FB>     /x81/x30/xfd/x35 <UNASSIGNED>
-+<U05FC>     /x81/x30/xfd/x36 <UNASSIGNED>
-+<U05FD>     /x81/x30/xfd/x37 <UNASSIGNED>
-+<U05FE>     /x81/x30/xfd/x38 <UNASSIGNED>
-+<U05FF>     /x81/x30/xfd/x39 <UNASSIGNED>
-+<U0600>     /x81/x30/xfe/x30 <UNASSIGNED>
-+<U0601>     /x81/x30/xfe/x31 <UNASSIGNED>
-+<U0602>     /x81/x30/xfe/x32 <UNASSIGNED>
-+<U0603>     /x81/x30/xfe/x33 <UNASSIGNED>
-+<U0604>     /x81/x30/xfe/x34 <UNASSIGNED>
-+<U0605>     /x81/x30/xfe/x35 <UNASSIGNED>
-+<U0606>     /x81/x30/xfe/x36 <UNASSIGNED>
-+<U0607>     /x81/x30/xfe/x37 <UNASSIGNED>
-+<U0608>     /x81/x30/xfe/x38 <UNASSIGNED>
-+<U0609>     /x81/x30/xfe/x39 <UNASSIGNED>
-+<U060A>     /x81/x31/x81/x30 <UNASSIGNED>
-+<U060B>     /x81/x31/x81/x31 <UNASSIGNED>
-+<U060C>     /x81/x31/x81/x32 ARABIC COMMA
-+<U060D>     /x81/x31/x81/x33 <UNASSIGNED>
-+<U060E>     /x81/x31/x81/x34 <UNASSIGNED>
-+<U060F>     /x81/x31/x81/x35 <UNASSIGNED>
-+<U0610>     /x81/x31/x81/x36 <UNASSIGNED>
-+<U0611>     /x81/x31/x81/x37 <UNASSIGNED>
-+<U0612>     /x81/x31/x81/x38 <UNASSIGNED>
-+<U0613>     /x81/x31/x81/x39 <UNASSIGNED>
-+<U0614>     /x81/x31/x82/x30 <UNASSIGNED>
-+<U0615>     /x81/x31/x82/x31 <UNASSIGNED>
-+<U0616>     /x81/x31/x82/x32 <UNASSIGNED>
-+<U0617>     /x81/x31/x82/x33 <UNASSIGNED>
-+<U0618>     /x81/x31/x82/x34 <UNASSIGNED>
-+<U0619>     /x81/x31/x82/x35 <UNASSIGNED>
-+<U061A>     /x81/x31/x82/x36 <UNASSIGNED>
-+<U061B>     /x81/x31/x82/x37 ARABIC SEMICOLON
-+<U061C>     /x81/x31/x82/x38 <UNASSIGNED>
-+<U061D>     /x81/x31/x82/x39 <UNASSIGNED>
-+<U061E>     /x81/x31/x83/x30 <UNASSIGNED>
-+<U061F>     /x81/x31/x83/x31 ARABIC QUESTION MARK
-+<U0620>     /x81/x31/x83/x32 <UNASSIGNED>
-+<U0621>     /x81/x31/x83/x33 ARABIC LETTER HAMZA
-+<U0622>     /x81/x31/x83/x34 ARABIC LETTER ALEF WITH MADDA ABOVE
-+<U0623>     /x81/x31/x83/x35 ARABIC LETTER ALEF WITH HAMZA ABOVE
-+<U0624>     /x81/x31/x83/x36 ARABIC LETTER WAW WITH HAMZA ABOVE
-+<U0625>     /x81/x31/x83/x37 ARABIC LETTER ALEF WITH HAMZA BELOW
-+<U0626>     /x81/x31/x83/x38 ARABIC LETTER YEH WITH HAMZA ABOVE
-+<U0627>     /x81/x31/x83/x39 ARABIC LETTER ALEF
-+<U0628>     /x81/x31/x84/x30 ARABIC LETTER BEH
-+<U0629>     /x81/x31/x84/x31 ARABIC LETTER TEH MARBUTA
-+<U062A>     /x81/x31/x84/x32 ARABIC LETTER TEH
-+<U062B>     /x81/x31/x84/x33 ARABIC LETTER THEH
-+<U062C>     /x81/x31/x84/x34 ARABIC LETTER JEEM
-+<U062D>     /x81/x31/x84/x35 ARABIC LETTER HAH
-+<U062E>     /x81/x31/x84/x36 ARABIC LETTER KHAH
-+<U062F>     /x81/x31/x84/x37 ARABIC LETTER DAL
-+<U0630>     /x81/x31/x84/x38 ARABIC LETTER THAL
-+<U0631>     /x81/x31/x84/x39 ARABIC LETTER REH
-+<U0632>     /x81/x31/x85/x30 ARABIC LETTER ZAIN
-+<U0633>     /x81/x31/x85/x31 ARABIC LETTER SEEN
-+<U0634>     /x81/x31/x85/x32 ARABIC LETTER SHEEN
-+<U0635>     /x81/x31/x85/x33 ARABIC LETTER SAD
-+<U0636>     /x81/x31/x85/x34 ARABIC LETTER DAD
-+<U0637>     /x81/x31/x85/x35 ARABIC LETTER TAH
-+<U0638>     /x81/x31/x85/x36 ARABIC LETTER ZAH
-+<U0639>     /x81/x31/x85/x37 ARABIC LETTER AIN
-+<U063A>     /x81/x31/x85/x38 ARABIC LETTER GHAIN
-+<U063B>     /x81/x31/x85/x39 <UNASSIGNED>
-+<U063C>     /x81/x31/x86/x30 <UNASSIGNED>
-+<U063D>     /x81/x31/x86/x31 <UNASSIGNED>
-+<U063E>     /x81/x31/x86/x32 <UNASSIGNED>
-+<U063F>     /x81/x31/x86/x33 <UNASSIGNED>
-+<U0640>     /x81/x31/x86/x34 ARABIC TATWEEL
-+<U0641>     /x81/x31/x86/x35 ARABIC LETTER FEH
-+<U0642>     /x81/x31/x86/x36 ARABIC LETTER QAF
-+<U0643>     /x81/x31/x86/x37 ARABIC LETTER KAF
-+<U0644>     /x81/x31/x86/x38 ARABIC LETTER LAM
-+<U0645>     /x81/x31/x86/x39 ARABIC LETTER MEEM
-+<U0646>     /x81/x31/x87/x30 ARABIC LETTER NOON
-+<U0647>     /x81/x31/x87/x31 ARABIC LETTER HEH
-+<U0648>     /x81/x31/x87/x32 ARABIC LETTER WAW
-+<U0649>     /x81/x31/x87/x33 ARABIC LETTER ALEF MAKSURA
-+<U064A>     /x81/x31/x87/x34 ARABIC LETTER YEH
-+<U064B>     /x81/x31/x87/x35 ARABIC FATHATAN
-+<U064C>     /x81/x31/x87/x36 ARABIC DAMMATAN
-+<U064D>     /x81/x31/x87/x37 ARABIC KASRATAN
-+<U064E>     /x81/x31/x87/x38 ARABIC FATHA
-+<U064F>     /x81/x31/x87/x39 ARABIC DAMMA
-+<U0650>     /x81/x31/x88/x30 ARABIC KASRA
-+<U0651>     /x81/x31/x88/x31 ARABIC SHADDA
-+<U0652>     /x81/x31/x88/x32 ARABIC SUKUN
-+<U0653>     /x81/x31/x88/x33 ARABIC MADDAH ABOVE
-+<U0654>     /x81/x31/x88/x34 ARABIC HAMZA ABOVE
-+<U0655>     /x81/x31/x88/x35 ARABIC HAMZA BELOW
-+<U0656>     /x81/x31/x88/x36 <UNASSIGNED>
-+<U0657>     /x81/x31/x88/x37 <UNASSIGNED>
-+<U0658>     /x81/x31/x88/x38 <UNASSIGNED>
-+<U0659>     /x81/x31/x88/x39 <UNASSIGNED>
-+<U065A>     /x81/x31/x89/x30 <UNASSIGNED>
-+<U065B>     /x81/x31/x89/x31 <UNASSIGNED>
-+<U065C>     /x81/x31/x89/x32 <UNASSIGNED>
-+<U065D>     /x81/x31/x89/x33 <UNASSIGNED>
-+<U065E>     /x81/x31/x89/x34 <UNASSIGNED>
-+<U065F>     /x81/x31/x89/x35 <UNASSIGNED>
-+<U0660>     /x81/x31/x89/x36 ARABIC-INDIC DIGIT ZERO
-+<U0661>     /x81/x31/x89/x37 ARABIC-INDIC DIGIT ONE
-+<U0662>     /x81/x31/x89/x38 ARABIC-INDIC DIGIT TWO
-+<U0663>     /x81/x31/x89/x39 ARABIC-INDIC DIGIT THREE
-+<U0664>     /x81/x31/x8a/x30 ARABIC-INDIC DIGIT FOUR
-+<U0665>     /x81/x31/x8a/x31 ARABIC-INDIC DIGIT FIVE
-+<U0666>     /x81/x31/x8a/x32 ARABIC-INDIC DIGIT SIX
-+<U0667>     /x81/x31/x8a/x33 ARABIC-INDIC DIGIT SEVEN
-+<U0668>     /x81/x31/x8a/x34 ARABIC-INDIC DIGIT EIGHT
-+<U0669>     /x81/x31/x8a/x35 ARABIC-INDIC DIGIT NINE
-+<U066A>     /x81/x31/x8a/x36 ARABIC PERCENT SIGN
-+<U066B>     /x81/x31/x8a/x37 ARABIC DECIMAL SEPARATOR
-+<U066C>     /x81/x31/x8a/x38 ARABIC THOUSANDS SEPARATOR
-+<U066D>     /x81/x31/x8a/x39 ARABIC FIVE POINTED STAR
-+<U066E>     /x81/x31/x8b/x30 ARABIC LETTER DOTLESS BEH
-+<U066F>     /x81/x31/x8b/x31 ARABIC LETTER DOTLESS QAF
-+<U0670>     /x81/x31/x8b/x32 ARABIC LETTER SUPERSCRIPT ALEF
-+<U0671>     /x81/x31/x8b/x33 ARABIC LETTER ALEF WASLA
-+<U0672>     /x81/x31/x8b/x34 ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE
-+<U0673>     /x81/x31/x8b/x35 ARABIC LETTER ALEF WITH WAVY HAMZA BELOW
-+<U0674>     /x81/x31/x8b/x36 ARABIC LETTER HIGH HAMZA
-+<U0675>     /x81/x31/x8b/x37 ARABIC LETTER HIGH HAMZA ALEF
-+<U0676>     /x81/x31/x8b/x38 ARABIC LETTER HIGH HAMZA WAW
-+<U0677>     /x81/x31/x8b/x39 ARABIC LETTER U WITH HAMZA ABOVE
-+<U0678>     /x81/x31/x8c/x30 ARABIC LETTER HIGH HAMZA YEH
-+<U0679>     /x81/x31/x8c/x31 ARABIC LETTER TTEH
-+<U067A>     /x81/x31/x8c/x32 ARABIC LETTER TTEHEH
-+<U067B>     /x81/x31/x8c/x33 ARABIC LETTER BEEH
-+<U067C>     /x81/x31/x8c/x34 ARABIC LETTER TEH WITH RING
-+<U067D>     /x81/x31/x8c/x35 ARABIC LETTER TEH WITH THREE DOTS ABOVE DOWNWARDS
-+<U067E>     /x81/x31/x8c/x36 ARABIC LETTER PEH
-+<U067F>     /x81/x31/x8c/x37 ARABIC LETTER TEHEH
-+<U0680>     /x81/x31/x8c/x38 ARABIC LETTER BEHEH
-+<U0681>     /x81/x31/x8c/x39 ARABIC LETTER HAH WITH HAMZA ABOVE
-+<U0682>     /x81/x31/x8d/x30 ARABIC LETTER HAH WITH TWO DOTS VERTICAL ABOVE
-+<U0683>     /x81/x31/x8d/x31 ARABIC LETTER NYEH
-+<U0684>     /x81/x31/x8d/x32 ARABIC LETTER DYEH
-+<U0685>     /x81/x31/x8d/x33 ARABIC LETTER HAH WITH THREE DOTS ABOVE
-+<U0686>     /x81/x31/x8d/x34 ARABIC LETTER TCHEH
-+<U0687>     /x81/x31/x8d/x35 ARABIC LETTER TCHEHEH
-+<U0688>     /x81/x31/x8d/x36 ARABIC LETTER DDAL
-+<U0689>     /x81/x31/x8d/x37 ARABIC LETTER DAL WITH RING
-+<U068A>     /x81/x31/x8d/x38 ARABIC LETTER DAL WITH DOT BELOW
-+<U068B>     /x81/x31/x8d/x39 ARABIC LETTER DAL WITH DOT BELOW AND SMALL TAH
-+<U068C>     /x81/x31/x8e/x30 ARABIC LETTER DAHAL
-+<U068D>     /x81/x31/x8e/x31 ARABIC LETTER DDAHAL
-+<U068E>     /x81/x31/x8e/x32 ARABIC LETTER DUL
-+<U068F>     /x81/x31/x8e/x33 ARABIC LETTER DAL WITH THREE DOTS ABOVE DOWNWARDS
-+<U0690>     /x81/x31/x8e/x34 ARABIC LETTER DAL WITH FOUR DOTS ABOVE
-+<U0691>     /x81/x31/x8e/x35 ARABIC LETTER RREH
-+<U0692>     /x81/x31/x8e/x36 ARABIC LETTER REH WITH SMALL V
-+<U0693>     /x81/x31/x8e/x37 ARABIC LETTER REH WITH RING
-+<U0694>     /x81/x31/x8e/x38 ARABIC LETTER REH WITH DOT BELOW
-+<U0695>     /x81/x31/x8e/x39 ARABIC LETTER REH WITH SMALL V BELOW
-+<U0696>     /x81/x31/x8f/x30 ARABIC LETTER REH WITH DOT BELOW AND DOT ABOVE
-+<U0697>     /x81/x31/x8f/x31 ARABIC LETTER REH WITH TWO DOTS ABOVE
-+<U0698>     /x81/x31/x8f/x32 ARABIC LETTER JEH
-+<U0699>     /x81/x31/x8f/x33 ARABIC LETTER REH WITH FOUR DOTS ABOVE
-+<U069A>     /x81/x31/x8f/x34 ARABIC LETTER SEEN WITH DOT BELOW AND DOT ABOVE
-+<U069B>     /x81/x31/x8f/x35 ARABIC LETTER SEEN WITH THREE DOTS BELOW
-+<U069C>     /x81/x31/x8f/x36 ARABIC LETTER SEEN WITH THREE DOTS BELOW AND THREE DOTS ABOVE
-+<U069D>     /x81/x31/x8f/x37 ARABIC LETTER SAD WITH TWO DOTS BELOW
-+<U069E>     /x81/x31/x8f/x38 ARABIC LETTER SAD WITH THREE DOTS ABOVE
-+<U069F>     /x81/x31/x8f/x39 ARABIC LETTER TAH WITH THREE DOTS ABOVE
-+<U06A0>     /x81/x31/x90/x30 ARABIC LETTER AIN WITH THREE DOTS ABOVE
-+<U06A1>     /x81/x31/x90/x31 ARABIC LETTER DOTLESS FEH
-+<U06A2>     /x81/x31/x90/x32 ARABIC LETTER FEH WITH DOT MOVED BELOW
-+<U06A3>     /x81/x31/x90/x33 ARABIC LETTER FEH WITH DOT BELOW
-+<U06A4>     /x81/x31/x90/x34 ARABIC LETTER VEH
-+<U06A5>     /x81/x31/x90/x35 ARABIC LETTER FEH WITH THREE DOTS BELOW
-+<U06A6>     /x81/x31/x90/x36 ARABIC LETTER PEHEH
-+<U06A7>     /x81/x31/x90/x37 ARABIC LETTER QAF WITH DOT ABOVE
-+<U06A8>     /x81/x31/x90/x38 ARABIC LETTER QAF WITH THREE DOTS ABOVE
-+<U06A9>     /x81/x31/x90/x39 ARABIC LETTER KEHEH
-+<U06AA>     /x81/x31/x91/x30 ARABIC LETTER SWASH KAF
-+<U06AB>     /x81/x31/x91/x31 ARABIC LETTER KAF WITH RING
-+<U06AC>     /x81/x31/x91/x32 ARABIC LETTER KAF WITH DOT ABOVE
-+<U06AD>     /x81/x31/x91/x33 ARABIC LETTER NG
-+<U06AE>     /x81/x31/x91/x34 ARABIC LETTER KAF WITH THREE DOTS BELOW
-+<U06AF>     /x81/x31/x91/x35 ARABIC LETTER GAF
-+<U06B0>     /x81/x31/x91/x36 ARABIC LETTER GAF WITH RING
-+<U06B1>     /x81/x31/x91/x37 ARABIC LETTER NGOEH
-+<U06B2>     /x81/x31/x91/x38 ARABIC LETTER GAF WITH TWO DOTS BELOW
-+<U06B3>     /x81/x31/x91/x39 ARABIC LETTER GUEH
-+<U06B4>     /x81/x31/x92/x30 ARABIC LETTER GAF WITH THREE DOTS ABOVE
-+<U06B5>     /x81/x31/x92/x31 ARABIC LETTER LAM WITH SMALL V
-+<U06B6>     /x81/x31/x92/x32 ARABIC LETTER LAM WITH DOT ABOVE
-+<U06B7>     /x81/x31/x92/x33 ARABIC LETTER LAM WITH THREE DOTS ABOVE
-+<U06B8>     /x81/x31/x92/x34 ARABIC LETTER LAM WITH THREE DOTS BELOW
-+<U06B9>     /x81/x31/x92/x35 ARABIC LETTER NOON WITH DOT BELOW
-+<U06BA>     /x81/x31/x92/x36 ARABIC LETTER NOON GHUNNA
-+<U06BB>     /x81/x31/x92/x37 ARABIC LETTER RNOON
-+<U06BC>     /x81/x31/x92/x38 ARABIC LETTER NOON WITH RING
-+<U06BD>     /x81/x31/x92/x39 ARABIC LETTER NOON WITH THREE DOTS ABOVE
-+<U06BE>     /x81/x31/x93/x30 ARABIC LETTER HEH DOACHASHMEE
-+<U06BF>     /x81/x31/x93/x31 ARABIC LETTER TCHEH WITH DOT ABOVE
-+<U06C0>     /x81/x31/x93/x32 ARABIC LETTER HEH WITH YEH ABOVE
-+<U06C1>     /x81/x31/x93/x33 ARABIC LETTER HEH GOAL
-+<U06C2>     /x81/x31/x93/x34 ARABIC LETTER HEH GOAL WITH HAMZA ABOVE
-+<U06C3>     /x81/x31/x93/x35 ARABIC LETTER TEH MARBUTA GOAL
-+<U06C4>     /x81/x31/x93/x36 ARABIC LETTER WAW WITH RING
-+<U06C5>     /x81/x31/x93/x37 ARABIC LETTER KIRGHIZ OE
-+<U06C6>     /x81/x31/x93/x38 ARABIC LETTER OE
-+<U06C7>     /x81/x31/x93/x39 ARABIC LETTER U
-+<U06C8>     /x81/x31/x94/x30 ARABIC LETTER YU
-+<U06C9>     /x81/x31/x94/x31 ARABIC LETTER KIRGHIZ YU
-+<U06CA>     /x81/x31/x94/x32 ARABIC LETTER WAW WITH TWO DOTS ABOVE
-+<U06CB>     /x81/x31/x94/x33 ARABIC LETTER VE
-+<U06CC>     /x81/x31/x94/x34 ARABIC LETTER FARSI YEH
-+<U06CD>     /x81/x31/x94/x35 ARABIC LETTER YEH WITH TAIL
-+<U06CE>     /x81/x31/x94/x36 ARABIC LETTER YEH WITH SMALL V
-+<U06CF>     /x81/x31/x94/x37 ARABIC LETTER WAW WITH DOT ABOVE
-+<U06D0>     /x81/x31/x94/x38 ARABIC LETTER E
-+<U06D1>     /x81/x31/x94/x39 ARABIC LETTER YEH WITH THREE DOTS BELOW
-+<U06D2>     /x81/x31/x95/x30 ARABIC LETTER YEH BARREE
-+<U06D3>     /x81/x31/x95/x31 ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
-+<U06D4>     /x81/x31/x95/x32 ARABIC FULL STOP
-+<U06D5>     /x81/x31/x95/x33 ARABIC LETTER AE
-+<U06D6>     /x81/x31/x95/x34 ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA
-+<U06D7>     /x81/x31/x95/x35 ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA
-+<U06D8>     /x81/x31/x95/x36 ARABIC SMALL HIGH MEEM INITIAL FORM
-+<U06D9>     /x81/x31/x95/x37 ARABIC SMALL HIGH LAM ALEF
-+<U06DA>     /x81/x31/x95/x38 ARABIC SMALL HIGH JEEM
-+<U06DB>     /x81/x31/x95/x39 ARABIC SMALL HIGH THREE DOTS
-+<U06DC>     /x81/x31/x96/x30 ARABIC SMALL HIGH SEEN
-+<U06DD>     /x81/x31/x96/x31 ARABIC END OF AYAH
-+<U06DE>     /x81/x31/x96/x32 ARABIC START OF RUB EL HIZB
-+<U06DF>     /x81/x31/x96/x33 ARABIC SMALL HIGH ROUNDED ZERO
-+<U06E0>     /x81/x31/x96/x34 ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO
-+<U06E1>     /x81/x31/x96/x35 ARABIC SMALL HIGH DOTLESS HEAD OF KHAH
-+<U06E2>     /x81/x31/x96/x36 ARABIC SMALL HIGH MEEM ISOLATED FORM
-+<U06E3>     /x81/x31/x96/x37 ARABIC SMALL LOW SEEN
-+<U06E4>     /x81/x31/x96/x38 ARABIC SMALL HIGH MADDA
-+<U06E5>     /x81/x31/x96/x39 ARABIC SMALL WAW
-+<U06E6>     /x81/x31/x97/x30 ARABIC SMALL YEH
-+<U06E7>     /x81/x31/x97/x31 ARABIC SMALL HIGH YEH
-+<U06E8>     /x81/x31/x97/x32 ARABIC SMALL HIGH NOON
-+<U06E9>     /x81/x31/x97/x33 ARABIC PLACE OF SAJDAH
-+<U06EA>     /x81/x31/x97/x34 ARABIC EMPTY CENTRE LOW STOP
-+<U06EB>     /x81/x31/x97/x35 ARABIC EMPTY CENTRE HIGH STOP
-+<U06EC>     /x81/x31/x97/x36 ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE
-+<U06ED>     /x81/x31/x97/x37 ARABIC SMALL LOW MEEM
-+<U06EE>     /x81/x31/x97/x38 <UNASSIGNED>
-+<U06EF>     /x81/x31/x97/x39 <UNASSIGNED>
-+<U06F0>     /x81/x31/x98/x30 EXTENDED ARABIC-INDIC DIGIT ZERO
-+<U06F1>     /x81/x31/x98/x31 EXTENDED ARABIC-INDIC DIGIT ONE
-+<U06F2>     /x81/x31/x98/x32 EXTENDED ARABIC-INDIC DIGIT TWO
-+<U06F3>     /x81/x31/x98/x33 EXTENDED ARABIC-INDIC DIGIT THREE
-+<U06F4>     /x81/x31/x98/x34 EXTENDED ARABIC-INDIC DIGIT FOUR
-+<U06F5>     /x81/x31/x98/x35 EXTENDED ARABIC-INDIC DIGIT FIVE
-+<U06F6>     /x81/x31/x98/x36 EXTENDED ARABIC-INDIC DIGIT SIX
-+<U06F7>     /x81/x31/x98/x37 EXTENDED ARABIC-INDIC DIGIT SEVEN
-+<U06F8>     /x81/x31/x98/x38 EXTENDED ARABIC-INDIC DIGIT EIGHT
-+<U06F9>     /x81/x31/x98/x39 EXTENDED ARABIC-INDIC DIGIT NINE
-+<U06FA>     /x81/x31/x99/x30 ARABIC LETTER SHEEN WITH DOT BELOW
-+<U06FB>     /x81/x31/x99/x31 ARABIC LETTER DAD WITH DOT BELOW
-+<U06FC>     /x81/x31/x99/x32 ARABIC LETTER GHAIN WITH DOT BELOW
-+<U06FD>     /x81/x31/x99/x33 ARABIC SIGN SINDHI AMPERSAND
-+<U06FE>     /x81/x31/x99/x34 ARABIC SIGN SINDHI POSTPOSITION MEN
-+<U06FF>     /x81/x31/x99/x35 <UNASSIGNED>
-+<U0700>     /x81/x31/x99/x36 SYRIAC END OF PARAGRAPH
-+<U0701>     /x81/x31/x99/x37 SYRIAC SUPRALINEAR FULL STOP
-+<U0702>     /x81/x31/x99/x38 SYRIAC SUBLINEAR FULL STOP
-+<U0703>     /x81/x31/x99/x39 SYRIAC SUPRALINEAR COLON
-+<U0704>     /x81/x31/x9a/x30 SYRIAC SUBLINEAR COLON
-+<U0705>     /x81/x31/x9a/x31 SYRIAC HORIZONTAL COLON
-+<U0706>     /x81/x31/x9a/x32 SYRIAC COLON SKEWED LEFT
-+<U0707>     /x81/x31/x9a/x33 SYRIAC COLON SKEWED RIGHT
-+<U0708>     /x81/x31/x9a/x34 SYRIAC SUPRALINEAR COLON SKEWED LEFT
-+<U0709>     /x81/x31/x9a/x35 SYRIAC SUBLINEAR COLON SKEWED RIGHT
-+<U070A>     /x81/x31/x9a/x36 SYRIAC CONTRACTION
-+<U070B>     /x81/x31/x9a/x37 SYRIAC HARKLEAN OBELUS
-+<U070C>     /x81/x31/x9a/x38 SYRIAC HARKLEAN METOBELUS
-+<U070D>     /x81/x31/x9a/x39 SYRIAC HARKLEAN ASTERISCUS
-+<U070E>     /x81/x31/x9b/x30 <UNASSIGNED>
-+<U070F>     /x81/x31/x9b/x31 SYRIAC ABBREVIATION MARK
-+<U0710>     /x81/x31/x9b/x32 SYRIAC LETTER ALAPH
-+<U0711>     /x81/x31/x9b/x33 SYRIAC LETTER SUPERSCRIPT ALAPH
-+<U0712>     /x81/x31/x9b/x34 SYRIAC LETTER BETH
-+<U0713>     /x81/x31/x9b/x35 SYRIAC LETTER GAMAL
-+<U0714>     /x81/x31/x9b/x36 SYRIAC LETTER GAMAL GARSHUNI
-+<U0715>     /x81/x31/x9b/x37 SYRIAC LETTER DALATH
-+<U0716>     /x81/x31/x9b/x38 SYRIAC LETTER DOTLESS DALATH RISH
-+<U0717>     /x81/x31/x9b/x39 SYRIAC LETTER HE
-+<U0718>     /x81/x31/x9c/x30 SYRIAC LETTER WAW
-+<U0719>     /x81/x31/x9c/x31 SYRIAC LETTER ZAIN
-+<U071A>     /x81/x31/x9c/x32 SYRIAC LETTER HETH
-+<U071B>     /x81/x31/x9c/x33 SYRIAC LETTER TETH
-+<U071C>     /x81/x31/x9c/x34 SYRIAC LETTER TETH GARSHUNI
-+<U071D>     /x81/x31/x9c/x35 SYRIAC LETTER YUDH
-+<U071E>     /x81/x31/x9c/x36 SYRIAC LETTER YUDH HE
-+<U071F>     /x81/x31/x9c/x37 SYRIAC LETTER KAPH
-+<U0720>     /x81/x31/x9c/x38 SYRIAC LETTER LAMADH
-+<U0721>     /x81/x31/x9c/x39 SYRIAC LETTER MIM
-+<U0722>     /x81/x31/x9d/x30 SYRIAC LETTER NUN
-+<U0723>     /x81/x31/x9d/x31 SYRIAC LETTER SEMKATH
-+<U0724>     /x81/x31/x9d/x32 SYRIAC LETTER FINAL SEMKATH
-+<U0725>     /x81/x31/x9d/x33 SYRIAC LETTER E
-+<U0726>     /x81/x31/x9d/x34 SYRIAC LETTER PE
-+<U0727>     /x81/x31/x9d/x35 SYRIAC LETTER REVERSED PE
-+<U0728>     /x81/x31/x9d/x36 SYRIAC LETTER SADHE
-+<U0729>     /x81/x31/x9d/x37 SYRIAC LETTER QAPH
-+<U072A>     /x81/x31/x9d/x38 SYRIAC LETTER RISH
-+<U072B>     /x81/x31/x9d/x39 SYRIAC LETTER SHIN
-+<U072C>     /x81/x31/x9e/x30 SYRIAC LETTER TAW
-+<U072D>     /x81/x31/x9e/x31 <UNASSIGNED>
-+<U072E>     /x81/x31/x9e/x32 <UNASSIGNED>
-+<U072F>     /x81/x31/x9e/x33 <UNASSIGNED>
-+<U0730>     /x81/x31/x9e/x34 SYRIAC PTHAHA ABOVE
-+<U0731>     /x81/x31/x9e/x35 SYRIAC PTHAHA BELOW
-+<U0732>     /x81/x31/x9e/x36 SYRIAC PTHAHA DOTTED
-+<U0733>     /x81/x31/x9e/x37 SYRIAC ZQAPHA ABOVE
-+<U0734>     /x81/x31/x9e/x38 SYRIAC ZQAPHA BELOW
-+<U0735>     /x81/x31/x9e/x39 SYRIAC ZQAPHA DOTTED
-+<U0736>     /x81/x31/x9f/x30 SYRIAC RBASA ABOVE
-+<U0737>     /x81/x31/x9f/x31 SYRIAC RBASA BELOW
-+<U0738>     /x81/x31/x9f/x32 SYRIAC DOTTED ZLAMA HORIZONTAL
-+<U0739>     /x81/x31/x9f/x33 SYRIAC DOTTED ZLAMA ANGULAR
-+<U073A>     /x81/x31/x9f/x34 SYRIAC HBASA ABOVE
-+<U073B>     /x81/x31/x9f/x35 SYRIAC HBASA BELOW
-+<U073C>     /x81/x31/x9f/x36 SYRIAC HBASA-ESASA DOTTED
-+<U073D>     /x81/x31/x9f/x37 SYRIAC ESASA ABOVE
-+<U073E>     /x81/x31/x9f/x38 SYRIAC ESASA BELOW
-+<U073F>     /x81/x31/x9f/x39 SYRIAC RWAHA
-+<U0740>     /x81/x31/xa0/x30 SYRIAC FEMININE DOT
-+<U0741>     /x81/x31/xa0/x31 SYRIAC QUSHSHAYA
-+<U0742>     /x81/x31/xa0/x32 SYRIAC RUKKAKHA
-+<U0743>     /x81/x31/xa0/x33 SYRIAC TWO VERTICAL DOTS ABOVE
-+<U0744>     /x81/x31/xa0/x34 SYRIAC TWO VERTICAL DOTS BELOW
-+<U0745>     /x81/x31/xa0/x35 SYRIAC THREE DOTS ABOVE
-+<U0746>     /x81/x31/xa0/x36 SYRIAC THREE DOTS BELOW
-+<U0747>     /x81/x31/xa0/x37 SYRIAC OBLIQUE LINE ABOVE
-+<U0748>     /x81/x31/xa0/x38 SYRIAC OBLIQUE LINE BELOW
-+<U0749>     /x81/x31/xa0/x39 SYRIAC MUSIC
-+<U074A>     /x81/x31/xa1/x30 SYRIAC BARREKH
-+<U074B>     /x81/x31/xa1/x31 <UNASSIGNED>
-+<U074C>     /x81/x31/xa1/x32 <UNASSIGNED>
-+<U074D>     /x81/x31/xa1/x33 <UNASSIGNED>
-+<U074E>     /x81/x31/xa1/x34 <UNASSIGNED>
-+<U074F>     /x81/x31/xa1/x35 <UNASSIGNED>
-+<U0750>     /x81/x31/xa1/x36 <UNASSIGNED>
-+<U0751>     /x81/x31/xa1/x37 <UNASSIGNED>
-+<U0752>     /x81/x31/xa1/x38 <UNASSIGNED>
-+<U0753>     /x81/x31/xa1/x39 <UNASSIGNED>
-+<U0754>     /x81/x31/xa2/x30 <UNASSIGNED>
-+<U0755>     /x81/x31/xa2/x31 <UNASSIGNED>
-+<U0756>     /x81/x31/xa2/x32 <UNASSIGNED>
-+<U0757>     /x81/x31/xa2/x33 <UNASSIGNED>
-+<U0758>     /x81/x31/xa2/x34 <UNASSIGNED>
-+<U0759>     /x81/x31/xa2/x35 <UNASSIGNED>
-+<U075A>     /x81/x31/xa2/x36 <UNASSIGNED>
-+<U075B>     /x81/x31/xa2/x37 <UNASSIGNED>
-+<U075C>     /x81/x31/xa2/x38 <UNASSIGNED>
-+<U075D>     /x81/x31/xa2/x39 <UNASSIGNED>
-+<U075E>     /x81/x31/xa3/x30 <UNASSIGNED>
-+<U075F>     /x81/x31/xa3/x31 <UNASSIGNED>
-+<U0760>     /x81/x31/xa3/x32 <UNASSIGNED>
-+<U0761>     /x81/x31/xa3/x33 <UNASSIGNED>
-+<U0762>     /x81/x31/xa3/x34 <UNASSIGNED>
-+<U0763>     /x81/x31/xa3/x35 <UNASSIGNED>
-+<U0764>     /x81/x31/xa3/x36 <UNASSIGNED>
-+<U0765>     /x81/x31/xa3/x37 <UNASSIGNED>
-+<U0766>     /x81/x31/xa3/x38 <UNASSIGNED>
-+<U0767>     /x81/x31/xa3/x39 <UNASSIGNED>
-+<U0768>     /x81/x31/xa4/x30 <UNASSIGNED>
-+<U0769>     /x81/x31/xa4/x31 <UNASSIGNED>
-+<U076A>     /x81/x31/xa4/x32 <UNASSIGNED>
-+<U076B>     /x81/x31/xa4/x33 <UNASSIGNED>
-+<U076C>     /x81/x31/xa4/x34 <UNASSIGNED>
-+<U076D>     /x81/x31/xa4/x35 <UNASSIGNED>
-+<U076E>     /x81/x31/xa4/x36 <UNASSIGNED>
-+<U076F>     /x81/x31/xa4/x37 <UNASSIGNED>
-+<U0770>     /x81/x31/xa4/x38 <UNASSIGNED>
-+<U0771>     /x81/x31/xa4/x39 <UNASSIGNED>
-+<U0772>     /x81/x31/xa5/x30 <UNASSIGNED>
-+<U0773>     /x81/x31/xa5/x31 <UNASSIGNED>
-+<U0774>     /x81/x31/xa5/x32 <UNASSIGNED>
-+<U0775>     /x81/x31/xa5/x33 <UNASSIGNED>
-+<U0776>     /x81/x31/xa5/x34 <UNASSIGNED>
-+<U0777>     /x81/x31/xa5/x35 <UNASSIGNED>
-+<U0778>     /x81/x31/xa5/x36 <UNASSIGNED>
-+<U0779>     /x81/x31/xa5/x37 <UNASSIGNED>
-+<U077A>     /x81/x31/xa5/x38 <UNASSIGNED>
-+<U077B>     /x81/x31/xa5/x39 <UNASSIGNED>
-+<U077C>     /x81/x31/xa6/x30 <UNASSIGNED>
-+<U077D>     /x81/x31/xa6/x31 <UNASSIGNED>
-+<U077E>     /x81/x31/xa6/x32 <UNASSIGNED>
-+<U077F>     /x81/x31/xa6/x33 <UNASSIGNED>
-+<U0780>     /x81/x31/xa6/x34 THAANA LETTER HAA
-+<U0781>     /x81/x31/xa6/x35 THAANA LETTER SHAVIYANI
-+<U0782>     /x81/x31/xa6/x36 THAANA LETTER NOONU
-+<U0783>     /x81/x31/xa6/x37 THAANA LETTER RAA
-+<U0784>     /x81/x31/xa6/x38 THAANA LETTER BAA
-+<U0785>     /x81/x31/xa6/x39 THAANA LETTER LHAVIYANI
-+<U0786>     /x81/x31/xa7/x30 THAANA LETTER KAAFU
-+<U0787>     /x81/x31/xa7/x31 THAANA LETTER ALIFU
-+<U0788>     /x81/x31/xa7/x32 THAANA LETTER VAAVU
-+<U0789>     /x81/x31/xa7/x33 THAANA LETTER MEEMU
-+<U078A>     /x81/x31/xa7/x34 THAANA LETTER FAAFU
-+<U078B>     /x81/x31/xa7/x35 THAANA LETTER DHAALU
-+<U078C>     /x81/x31/xa7/x36 THAANA LETTER THAA
-+<U078D>     /x81/x31/xa7/x37 THAANA LETTER LAAMU
-+<U078E>     /x81/x31/xa7/x38 THAANA LETTER GAAFU
-+<U078F>     /x81/x31/xa7/x39 THAANA LETTER GNAVIYANI
-+<U0790>     /x81/x31/xa8/x30 THAANA LETTER SEENU
-+<U0791>     /x81/x31/xa8/x31 THAANA LETTER DAVIYANI
-+<U0792>     /x81/x31/xa8/x32 THAANA LETTER ZAVIYANI
-+<U0793>     /x81/x31/xa8/x33 THAANA LETTER TAVIYANI
-+<U0794>     /x81/x31/xa8/x34 THAANA LETTER YAA
-+<U0795>     /x81/x31/xa8/x35 THAANA LETTER PAVIYANI
-+<U0796>     /x81/x31/xa8/x36 THAANA LETTER JAVIYANI
-+<U0797>     /x81/x31/xa8/x37 THAANA LETTER CHAVIYANI
-+<U0798>     /x81/x31/xa8/x38 THAANA LETTER TTAA
-+<U0799>     /x81/x31/xa8/x39 THAANA LETTER HHAA
-+<U079A>     /x81/x31/xa9/x30 THAANA LETTER KHAA
-+<U079B>     /x81/x31/xa9/x31 THAANA LETTER THAALU
-+<U079C>     /x81/x31/xa9/x32 THAANA LETTER ZAA
-+<U079D>     /x81/x31/xa9/x33 THAANA LETTER SHEENU
-+<U079E>     /x81/x31/xa9/x34 THAANA LETTER SAADHU
-+<U079F>     /x81/x31/xa9/x35 THAANA LETTER DAADHU
-+<U07A0>     /x81/x31/xa9/x36 THAANA LETTER TO
-+<U07A1>     /x81/x31/xa9/x37 THAANA LETTER ZO
-+<U07A2>     /x81/x31/xa9/x38 THAANA LETTER AINU
-+<U07A3>     /x81/x31/xa9/x39 THAANA LETTER GHAINU
-+<U07A4>     /x81/x31/xaa/x30 THAANA LETTER QAAFU
-+<U07A5>     /x81/x31/xaa/x31 THAANA LETTER WAAVU
-+<U07A6>     /x81/x31/xaa/x32 THAANA ABAFILI
-+<U07A7>     /x81/x31/xaa/x33 THAANA AABAAFILI
-+<U07A8>     /x81/x31/xaa/x34 THAANA IBIFILI
-+<U07A9>     /x81/x31/xaa/x35 THAANA EEBEEFILI
-+<U07AA>     /x81/x31/xaa/x36 THAANA UBUFILI
-+<U07AB>     /x81/x31/xaa/x37 THAANA OOBOOFILI
-+<U07AC>     /x81/x31/xaa/x38 THAANA EBEFILI
-+<U07AD>     /x81/x31/xaa/x39 THAANA EYBEYFILI
-+<U07AE>     /x81/x31/xab/x30 THAANA OBOFILI
-+<U07AF>     /x81/x31/xab/x31 THAANA OABOAFILI
-+<U07B0>     /x81/x31/xab/x32 THAANA SUKUN
-+<U07B1>     /x81/x31/xab/x33 THAANA LETTER NAA
-+<U07B2>     /x81/x31/xab/x34 <UNASSIGNED>
-+<U07B3>     /x81/x31/xab/x35 <UNASSIGNED>
-+<U07B4>     /x81/x31/xab/x36 <UNASSIGNED>
-+<U07B5>     /x81/x31/xab/x37 <UNASSIGNED>
-+<U07B6>     /x81/x31/xab/x38 <UNASSIGNED>
-+<U07B7>     /x81/x31/xab/x39 <UNASSIGNED>
-+<U07B8>     /x81/x31/xac/x30 <UNASSIGNED>
-+<U07B9>     /x81/x31/xac/x31 <UNASSIGNED>
-+<U07BA>     /x81/x31/xac/x32 <UNASSIGNED>
-+<U07BB>     /x81/x31/xac/x33 <UNASSIGNED>
-+<U07BC>     /x81/x31/xac/x34 <UNASSIGNED>
-+<U07BD>     /x81/x31/xac/x35 <UNASSIGNED>
-+<U07BE>     /x81/x31/xac/x36 <UNASSIGNED>
-+<U07BF>     /x81/x31/xac/x37 <UNASSIGNED>
-+<U07C0>     /x81/x31/xac/x38 <UNASSIGNED>
-+<U07C1>     /x81/x31/xac/x39 <UNASSIGNED>
-+<U07C2>     /x81/x31/xad/x30 <UNASSIGNED>
-+<U07C3>     /x81/x31/xad/x31 <UNASSIGNED>
-+<U07C4>     /x81/x31/xad/x32 <UNASSIGNED>
-+<U07C5>     /x81/x31/xad/x33 <UNASSIGNED>
-+<U07C6>     /x81/x31/xad/x34 <UNASSIGNED>
-+<U07C7>     /x81/x31/xad/x35 <UNASSIGNED>
-+<U07C8>     /x81/x31/xad/x36 <UNASSIGNED>
-+<U07C9>     /x81/x31/xad/x37 <UNASSIGNED>
-+<U07CA>     /x81/x31/xad/x38 <UNASSIGNED>
-+<U07CB>     /x81/x31/xad/x39 <UNASSIGNED>
-+<U07CC>     /x81/x31/xae/x30 <UNASSIGNED>
-+<U07CD>     /x81/x31/xae/x31 <UNASSIGNED>
-+<U07CE>     /x81/x31/xae/x32 <UNASSIGNED>
-+<U07CF>     /x81/x31/xae/x33 <UNASSIGNED>
-+<U07D0>     /x81/x31/xae/x34 <UNASSIGNED>
-+<U07D1>     /x81/x31/xae/x35 <UNASSIGNED>
-+<U07D2>     /x81/x31/xae/x36 <UNASSIGNED>
-+<U07D3>     /x81/x31/xae/x37 <UNASSIGNED>
-+<U07D4>     /x81/x31/xae/x38 <UNASSIGNED>
-+<U07D5>     /x81/x31/xae/x39 <UNASSIGNED>
-+<U07D6>     /x81/x31/xaf/x30 <UNASSIGNED>
-+<U07D7>     /x81/x31/xaf/x31 <UNASSIGNED>
-+<U07D8>     /x81/x31/xaf/x32 <UNASSIGNED>
-+<U07D9>     /x81/x31/xaf/x33 <UNASSIGNED>
-+<U07DA>     /x81/x31/xaf/x34 <UNASSIGNED>
-+<U07DB>     /x81/x31/xaf/x35 <UNASSIGNED>
-+<U07DC>     /x81/x31/xaf/x36 <UNASSIGNED>
-+<U07DD>     /x81/x31/xaf/x37 <UNASSIGNED>
-+<U07DE>     /x81/x31/xaf/x38 <UNASSIGNED>
-+<U07DF>     /x81/x31/xaf/x39 <UNASSIGNED>
-+<U07E0>     /x81/x31/xb0/x30 <UNASSIGNED>
-+<U07E1>     /x81/x31/xb0/x31 <UNASSIGNED>
-+<U07E2>     /x81/x31/xb0/x32 <UNASSIGNED>
-+<U07E3>     /x81/x31/xb0/x33 <UNASSIGNED>
-+<U07E4>     /x81/x31/xb0/x34 <UNASSIGNED>
-+<U07E5>     /x81/x31/xb0/x35 <UNASSIGNED>
-+<U07E6>     /x81/x31/xb0/x36 <UNASSIGNED>
-+<U07E7>     /x81/x31/xb0/x37 <UNASSIGNED>
-+<U07E8>     /x81/x31/xb0/x38 <UNASSIGNED>
-+<U07E9>     /x81/x31/xb0/x39 <UNASSIGNED>
-+<U07EA>     /x81/x31/xb1/x30 <UNASSIGNED>
-+<U07EB>     /x81/x31/xb1/x31 <UNASSIGNED>
-+<U07EC>     /x81/x31/xb1/x32 <UNASSIGNED>
-+<U07ED>     /x81/x31/xb1/x33 <UNASSIGNED>
-+<U07EE>     /x81/x31/xb1/x34 <UNASSIGNED>
-+<U07EF>     /x81/x31/xb1/x35 <UNASSIGNED>
-+<U07F0>     /x81/x31/xb1/x36 <UNASSIGNED>
-+<U07F1>     /x81/x31/xb1/x37 <UNASSIGNED>
-+<U07F2>     /x81/x31/xb1/x38 <UNASSIGNED>
-+<U07F3>     /x81/x31/xb1/x39 <UNASSIGNED>
-+<U07F4>     /x81/x31/xb2/x30 <UNASSIGNED>
-+<U07F5>     /x81/x31/xb2/x31 <UNASSIGNED>
-+<U07F6>     /x81/x31/xb2/x32 <UNASSIGNED>
-+<U07F7>     /x81/x31/xb2/x33 <UNASSIGNED>
-+<U07F8>     /x81/x31/xb2/x34 <UNASSIGNED>
-+<U07F9>     /x81/x31/xb2/x35 <UNASSIGNED>
-+<U07FA>     /x81/x31/xb2/x36 <UNASSIGNED>
-+<U07FB>     /x81/x31/xb2/x37 <UNASSIGNED>
-+<U07FC>     /x81/x31/xb2/x38 <UNASSIGNED>
-+<U07FD>     /x81/x31/xb2/x39 <UNASSIGNED>
-+<U07FE>     /x81/x31/xb3/x30 <UNASSIGNED>
-+<U07FF>     /x81/x31/xb3/x31 <UNASSIGNED>
-+<U0800>     /x81/x31/xb3/x32 <UNASSIGNED>
-+<U0801>     /x81/x31/xb3/x33 <UNASSIGNED>
-+<U0802>     /x81/x31/xb3/x34 <UNASSIGNED>
-+<U0803>     /x81/x31/xb3/x35 <UNASSIGNED>
-+<U0804>     /x81/x31/xb3/x36 <UNASSIGNED>
-+<U0805>     /x81/x31/xb3/x37 <UNASSIGNED>
-+<U0806>     /x81/x31/xb3/x38 <UNASSIGNED>
-+<U0807>     /x81/x31/xb3/x39 <UNASSIGNED>
-+<U0808>     /x81/x31/xb4/x30 <UNASSIGNED>
-+<U0809>     /x81/x31/xb4/x31 <UNASSIGNED>
-+<U080A>     /x81/x31/xb4/x32 <UNASSIGNED>
-+<U080B>     /x81/x31/xb4/x33 <UNASSIGNED>
-+<U080C>     /x81/x31/xb4/x34 <UNASSIGNED>
-+<U080D>     /x81/x31/xb4/x35 <UNASSIGNED>
-+<U080E>     /x81/x31/xb4/x36 <UNASSIGNED>
-+<U080F>     /x81/x31/xb4/x37 <UNASSIGNED>
-+<U0810>     /x81/x31/xb4/x38 <UNASSIGNED>
-+<U0811>     /x81/x31/xb4/x39 <UNASSIGNED>
-+<U0812>     /x81/x31/xb5/x30 <UNASSIGNED>
-+<U0813>     /x81/x31/xb5/x31 <UNASSIGNED>
-+<U0814>     /x81/x31/xb5/x32 <UNASSIGNED>
-+<U0815>     /x81/x31/xb5/x33 <UNASSIGNED>
-+<U0816>     /x81/x31/xb5/x34 <UNASSIGNED>
-+<U0817>     /x81/x31/xb5/x35 <UNASSIGNED>
-+<U0818>     /x81/x31/xb5/x36 <UNASSIGNED>
-+<U0819>     /x81/x31/xb5/x37 <UNASSIGNED>
-+<U081A>     /x81/x31/xb5/x38 <UNASSIGNED>
-+<U081B>     /x81/x31/xb5/x39 <UNASSIGNED>
-+<U081C>     /x81/x31/xb6/x30 <UNASSIGNED>
-+<U081D>     /x81/x31/xb6/x31 <UNASSIGNED>
-+<U081E>     /x81/x31/xb6/x32 <UNASSIGNED>
-+<U081F>     /x81/x31/xb6/x33 <UNASSIGNED>
-+<U0820>     /x81/x31/xb6/x34 <UNASSIGNED>
-+<U0821>     /x81/x31/xb6/x35 <UNASSIGNED>
-+<U0822>     /x81/x31/xb6/x36 <UNASSIGNED>
-+<U0823>     /x81/x31/xb6/x37 <UNASSIGNED>
-+<U0824>     /x81/x31/xb6/x38 <UNASSIGNED>
-+<U0825>     /x81/x31/xb6/x39 <UNASSIGNED>
-+<U0826>     /x81/x31/xb7/x30 <UNASSIGNED>
-+<U0827>     /x81/x31/xb7/x31 <UNASSIGNED>
-+<U0828>     /x81/x31/xb7/x32 <UNASSIGNED>
-+<U0829>     /x81/x31/xb7/x33 <UNASSIGNED>
-+<U082A>     /x81/x31/xb7/x34 <UNASSIGNED>
-+<U082B>     /x81/x31/xb7/x35 <UNASSIGNED>
-+<U082C>     /x81/x31/xb7/x36 <UNASSIGNED>
-+<U082D>     /x81/x31/xb7/x37 <UNASSIGNED>
-+<U082E>     /x81/x31/xb7/x38 <UNASSIGNED>
-+<U082F>     /x81/x31/xb7/x39 <UNASSIGNED>
-+<U0830>     /x81/x31/xb8/x30 <UNASSIGNED>
-+<U0831>     /x81/x31/xb8/x31 <UNASSIGNED>
-+<U0832>     /x81/x31/xb8/x32 <UNASSIGNED>
-+<U0833>     /x81/x31/xb8/x33 <UNASSIGNED>
-+<U0834>     /x81/x31/xb8/x34 <UNASSIGNED>
-+<U0835>     /x81/x31/xb8/x35 <UNASSIGNED>
-+<U0836>     /x81/x31/xb8/x36 <UNASSIGNED>
-+<U0837>     /x81/x31/xb8/x37 <UNASSIGNED>
-+<U0838>     /x81/x31/xb8/x38 <UNASSIGNED>
-+<U0839>     /x81/x31/xb8/x39 <UNASSIGNED>
-+<U083A>     /x81/x31/xb9/x30 <UNASSIGNED>
-+<U083B>     /x81/x31/xb9/x31 <UNASSIGNED>
-+<U083C>     /x81/x31/xb9/x32 <UNASSIGNED>
-+<U083D>     /x81/x31/xb9/x33 <UNASSIGNED>
-+<U083E>     /x81/x31/xb9/x34 <UNASSIGNED>
-+<U083F>     /x81/x31/xb9/x35 <UNASSIGNED>
-+<U0840>     /x81/x31/xb9/x36 <UNASSIGNED>
-+<U0841>     /x81/x31/xb9/x37 <UNASSIGNED>
-+<U0842>     /x81/x31/xb9/x38 <UNASSIGNED>
-+<U0843>     /x81/x31/xb9/x39 <UNASSIGNED>
-+<U0844>     /x81/x31/xba/x30 <UNASSIGNED>
-+<U0845>     /x81/x31/xba/x31 <UNASSIGNED>
-+<U0846>     /x81/x31/xba/x32 <UNASSIGNED>
-+<U0847>     /x81/x31/xba/x33 <UNASSIGNED>
-+<U0848>     /x81/x31/xba/x34 <UNASSIGNED>
-+<U0849>     /x81/x31/xba/x35 <UNASSIGNED>
-+<U084A>     /x81/x31/xba/x36 <UNASSIGNED>
-+<U084B>     /x81/x31/xba/x37 <UNASSIGNED>
-+<U084C>     /x81/x31/xba/x38 <UNASSIGNED>
-+<U084D>     /x81/x31/xba/x39 <UNASSIGNED>
-+<U084E>     /x81/x31/xbb/x30 <UNASSIGNED>
-+<U084F>     /x81/x31/xbb/x31 <UNASSIGNED>
-+<U0850>     /x81/x31/xbb/x32 <UNASSIGNED>
-+<U0851>     /x81/x31/xbb/x33 <UNASSIGNED>
-+<U0852>     /x81/x31/xbb/x34 <UNASSIGNED>
-+<U0853>     /x81/x31/xbb/x35 <UNASSIGNED>
-+<U0854>     /x81/x31/xbb/x36 <UNASSIGNED>
-+<U0855>     /x81/x31/xbb/x37 <UNASSIGNED>
-+<U0856>     /x81/x31/xbb/x38 <UNASSIGNED>
-+<U0857>     /x81/x31/xbb/x39 <UNASSIGNED>
-+<U0858>     /x81/x31/xbc/x30 <UNASSIGNED>
-+<U0859>     /x81/x31/xbc/x31 <UNASSIGNED>
-+<U085A>     /x81/x31/xbc/x32 <UNASSIGNED>
-+<U085B>     /x81/x31/xbc/x33 <UNASSIGNED>
-+<U085C>     /x81/x31/xbc/x34 <UNASSIGNED>
-+<U085D>     /x81/x31/xbc/x35 <UNASSIGNED>
-+<U085E>     /x81/x31/xbc/x36 <UNASSIGNED>
-+<U085F>     /x81/x31/xbc/x37 <UNASSIGNED>
-+<U0860>     /x81/x31/xbc/x38 <UNASSIGNED>
-+<U0861>     /x81/x31/xbc/x39 <UNASSIGNED>
-+<U0862>     /x81/x31/xbd/x30 <UNASSIGNED>
-+<U0863>     /x81/x31/xbd/x31 <UNASSIGNED>
-+<U0864>     /x81/x31/xbd/x32 <UNASSIGNED>
-+<U0865>     /x81/x31/xbd/x33 <UNASSIGNED>
-+<U0866>     /x81/x31/xbd/x34 <UNASSIGNED>
-+<U0867>     /x81/x31/xbd/x35 <UNASSIGNED>
-+<U0868>     /x81/x31/xbd/x36 <UNASSIGNED>
-+<U0869>     /x81/x31/xbd/x37 <UNASSIGNED>
-+<U086A>     /x81/x31/xbd/x38 <UNASSIGNED>
-+<U086B>     /x81/x31/xbd/x39 <UNASSIGNED>
-+<U086C>     /x81/x31/xbe/x30 <UNASSIGNED>
-+<U086D>     /x81/x31/xbe/x31 <UNASSIGNED>
-+<U086E>     /x81/x31/xbe/x32 <UNASSIGNED>
-+<U086F>     /x81/x31/xbe/x33 <UNASSIGNED>
-+<U0870>     /x81/x31/xbe/x34 <UNASSIGNED>
-+<U0871>     /x81/x31/xbe/x35 <UNASSIGNED>
-+<U0872>     /x81/x31/xbe/x36 <UNASSIGNED>
-+<U0873>     /x81/x31/xbe/x37 <UNASSIGNED>
-+<U0874>     /x81/x31/xbe/x38 <UNASSIGNED>
-+<U0875>     /x81/x31/xbe/x39 <UNASSIGNED>
-+<U0876>     /x81/x31/xbf/x30 <UNASSIGNED>
-+<U0877>     /x81/x31/xbf/x31 <UNASSIGNED>
-+<U0878>     /x81/x31/xbf/x32 <UNASSIGNED>
-+<U0879>     /x81/x31/xbf/x33 <UNASSIGNED>
-+<U087A>     /x81/x31/xbf/x34 <UNASSIGNED>
-+<U087B>     /x81/x31/xbf/x35 <UNASSIGNED>
-+<U087C>     /x81/x31/xbf/x36 <UNASSIGNED>
-+<U087D>     /x81/x31/xbf/x37 <UNASSIGNED>
-+<U087E>     /x81/x31/xbf/x38 <UNASSIGNED>
-+<U087F>     /x81/x31/xbf/x39 <UNASSIGNED>
-+<U0880>     /x81/x31/xc0/x30 <UNASSIGNED>
-+<U0881>     /x81/x31/xc0/x31 <UNASSIGNED>
-+<U0882>     /x81/x31/xc0/x32 <UNASSIGNED>
-+<U0883>     /x81/x31/xc0/x33 <UNASSIGNED>
-+<U0884>     /x81/x31/xc0/x34 <UNASSIGNED>
-+<U0885>     /x81/x31/xc0/x35 <UNASSIGNED>
-+<U0886>     /x81/x31/xc0/x36 <UNASSIGNED>
-+<U0887>     /x81/x31/xc0/x37 <UNASSIGNED>
-+<U0888>     /x81/x31/xc0/x38 <UNASSIGNED>
-+<U0889>     /x81/x31/xc0/x39 <UNASSIGNED>
-+<U088A>     /x81/x31/xc1/x30 <UNASSIGNED>
-+<U088B>     /x81/x31/xc1/x31 <UNASSIGNED>
-+<U088C>     /x81/x31/xc1/x32 <UNASSIGNED>
-+<U088D>     /x81/x31/xc1/x33 <UNASSIGNED>
-+<U088E>     /x81/x31/xc1/x34 <UNASSIGNED>
-+<U088F>     /x81/x31/xc1/x35 <UNASSIGNED>
-+<U0890>     /x81/x31/xc1/x36 <UNASSIGNED>
-+<U0891>     /x81/x31/xc1/x37 <UNASSIGNED>
-+<U0892>     /x81/x31/xc1/x38 <UNASSIGNED>
-+<U0893>     /x81/x31/xc1/x39 <UNASSIGNED>
-+<U0894>     /x81/x31/xc2/x30 <UNASSIGNED>
-+<U0895>     /x81/x31/xc2/x31 <UNASSIGNED>
-+<U0896>     /x81/x31/xc2/x32 <UNASSIGNED>
-+<U0897>     /x81/x31/xc2/x33 <UNASSIGNED>
-+<U0898>     /x81/x31/xc2/x34 <UNASSIGNED>
-+<U0899>     /x81/x31/xc2/x35 <UNASSIGNED>
-+<U089A>     /x81/x31/xc2/x36 <UNASSIGNED>
-+<U089B>     /x81/x31/xc2/x37 <UNASSIGNED>
-+<U089C>     /x81/x31/xc2/x38 <UNASSIGNED>
-+<U089D>     /x81/x31/xc2/x39 <UNASSIGNED>
-+<U089E>     /x81/x31/xc3/x30 <UNASSIGNED>
-+<U089F>     /x81/x31/xc3/x31 <UNASSIGNED>
-+<U08A0>     /x81/x31/xc3/x32 <UNASSIGNED>
-+<U08A1>     /x81/x31/xc3/x33 <UNASSIGNED>
-+<U08A2>     /x81/x31/xc3/x34 <UNASSIGNED>
-+<U08A3>     /x81/x31/xc3/x35 <UNASSIGNED>
-+<U08A4>     /x81/x31/xc3/x36 <UNASSIGNED>
-+<U08A5>     /x81/x31/xc3/x37 <UNASSIGNED>
-+<U08A6>     /x81/x31/xc3/x38 <UNASSIGNED>
-+<U08A7>     /x81/x31/xc3/x39 <UNASSIGNED>
-+<U08A8>     /x81/x31/xc4/x30 <UNASSIGNED>
-+<U08A9>     /x81/x31/xc4/x31 <UNASSIGNED>
-+<U08AA>     /x81/x31/xc4/x32 <UNASSIGNED>
-+<U08AB>     /x81/x31/xc4/x33 <UNASSIGNED>
-+<U08AC>     /x81/x31/xc4/x34 <UNASSIGNED>
-+<U08AD>     /x81/x31/xc4/x35 <UNASSIGNED>
-+<U08AE>     /x81/x31/xc4/x36 <UNASSIGNED>
-+<U08AF>     /x81/x31/xc4/x37 <UNASSIGNED>
-+<U08B0>     /x81/x31/xc4/x38 <UNASSIGNED>
-+<U08B1>     /x81/x31/xc4/x39 <UNASSIGNED>
-+<U08B2>     /x81/x31/xc5/x30 <UNASSIGNED>
-+<U08B3>     /x81/x31/xc5/x31 <UNASSIGNED>
-+<U08B4>     /x81/x31/xc5/x32 <UNASSIGNED>
-+<U08B5>     /x81/x31/xc5/x33 <UNASSIGNED>
-+<U08B6>     /x81/x31/xc5/x34 <UNASSIGNED>
-+<U08B7>     /x81/x31/xc5/x35 <UNASSIGNED>
-+<U08B8>     /x81/x31/xc5/x36 <UNASSIGNED>
-+<U08B9>     /x81/x31/xc5/x37 <UNASSIGNED>
-+<U08BA>     /x81/x31/xc5/x38 <UNASSIGNED>
-+<U08BB>     /x81/x31/xc5/x39 <UNASSIGNED>
-+<U08BC>     /x81/x31/xc6/x30 <UNASSIGNED>
-+<U08BD>     /x81/x31/xc6/x31 <UNASSIGNED>
-+<U08BE>     /x81/x31/xc6/x32 <UNASSIGNED>
-+<U08BF>     /x81/x31/xc6/x33 <UNASSIGNED>
-+<U08C0>     /x81/x31/xc6/x34 <UNASSIGNED>
-+<U08C1>     /x81/x31/xc6/x35 <UNASSIGNED>
-+<U08C2>     /x81/x31/xc6/x36 <UNASSIGNED>
-+<U08C3>     /x81/x31/xc6/x37 <UNASSIGNED>
-+<U08C4>     /x81/x31/xc6/x38 <UNASSIGNED>
-+<U08C5>     /x81/x31/xc6/x39 <UNASSIGNED>
-+<U08C6>     /x81/x31/xc7/x30 <UNASSIGNED>
-+<U08C7>     /x81/x31/xc7/x31 <UNASSIGNED>
-+<U08C8>     /x81/x31/xc7/x32 <UNASSIGNED>
-+<U08C9>     /x81/x31/xc7/x33 <UNASSIGNED>
-+<U08CA>     /x81/x31/xc7/x34 <UNASSIGNED>
-+<U08CB>     /x81/x31/xc7/x35 <UNASSIGNED>
-+<U08CC>     /x81/x31/xc7/x36 <UNASSIGNED>
-+<U08CD>     /x81/x31/xc7/x37 <UNASSIGNED>
-+<U08CE>     /x81/x31/xc7/x38 <UNASSIGNED>
-+<U08CF>     /x81/x31/xc7/x39 <UNASSIGNED>
-+<U08D0>     /x81/x31/xc8/x30 <UNASSIGNED>
-+<U08D1>     /x81/x31/xc8/x31 <UNASSIGNED>
-+<U08D2>     /x81/x31/xc8/x32 <UNASSIGNED>
-+<U08D3>     /x81/x31/xc8/x33 <UNASSIGNED>
-+<U08D4>     /x81/x31/xc8/x34 <UNASSIGNED>
-+<U08D5>     /x81/x31/xc8/x35 <UNASSIGNED>
-+<U08D6>     /x81/x31/xc8/x36 <UNASSIGNED>
-+<U08D7>     /x81/x31/xc8/x37 <UNASSIGNED>
-+<U08D8>     /x81/x31/xc8/x38 <UNASSIGNED>
-+<U08D9>     /x81/x31/xc8/x39 <UNASSIGNED>
-+<U08DA>     /x81/x31/xc9/x30 <UNASSIGNED>
-+<U08DB>     /x81/x31/xc9/x31 <UNASSIGNED>
-+<U08DC>     /x81/x31/xc9/x32 <UNASSIGNED>
-+<U08DD>     /x81/x31/xc9/x33 <UNASSIGNED>
-+<U08DE>     /x81/x31/xc9/x34 <UNASSIGNED>
-+<U08DF>     /x81/x31/xc9/x35 <UNASSIGNED>
-+<U08E0>     /x81/x31/xc9/x36 <UNASSIGNED>
-+<U08E1>     /x81/x31/xc9/x37 <UNASSIGNED>
-+<U08E2>     /x81/x31/xc9/x38 <UNASSIGNED>
-+<U08E3>     /x81/x31/xc9/x39 <UNASSIGNED>
-+<U08E4>     /x81/x31/xca/x30 <UNASSIGNED>
-+<U08E5>     /x81/x31/xca/x31 <UNASSIGNED>
-+<U08E6>     /x81/x31/xca/x32 <UNASSIGNED>
-+<U08E7>     /x81/x31/xca/x33 <UNASSIGNED>
-+<U08E8>     /x81/x31/xca/x34 <UNASSIGNED>
-+<U08E9>     /x81/x31/xca/x35 <UNASSIGNED>
-+<U08EA>     /x81/x31/xca/x36 <UNASSIGNED>
-+<U08EB>     /x81/x31/xca/x37 <UNASSIGNED>
-+<U08EC>     /x81/x31/xca/x38 <UNASSIGNED>
-+<U08ED>     /x81/x31/xca/x39 <UNASSIGNED>
-+<U08EE>     /x81/x31/xcb/x30 <UNASSIGNED>
-+<U08EF>     /x81/x31/xcb/x31 <UNASSIGNED>
-+<U08F0>     /x81/x31/xcb/x32 <UNASSIGNED>
-+<U08F1>     /x81/x31/xcb/x33 <UNASSIGNED>
-+<U08F2>     /x81/x31/xcb/x34 <UNASSIGNED>
-+<U08F3>     /x81/x31/xcb/x35 <UNASSIGNED>
-+<U08F4>     /x81/x31/xcb/x36 <UNASSIGNED>
-+<U08F5>     /x81/x31/xcb/x37 <UNASSIGNED>
-+<U08F6>     /x81/x31/xcb/x38 <UNASSIGNED>
-+<U08F7>     /x81/x31/xcb/x39 <UNASSIGNED>
-+<U08F8>     /x81/x31/xcc/x30 <UNASSIGNED>
-+<U08F9>     /x81/x31/xcc/x31 <UNASSIGNED>
-+<U08FA>     /x81/x31/xcc/x32 <UNASSIGNED>
-+<U08FB>     /x81/x31/xcc/x33 <UNASSIGNED>
-+<U08FC>     /x81/x31/xcc/x34 <UNASSIGNED>
-+<U08FD>     /x81/x31/xcc/x35 <UNASSIGNED>
-+<U08FE>     /x81/x31/xcc/x36 <UNASSIGNED>
-+<U08FF>     /x81/x31/xcc/x37 <UNASSIGNED>
-+<U0900>     /x81/x31/xcc/x38 <UNASSIGNED>
-+<U0901>     /x81/x31/xcc/x39 DEVANAGARI SIGN CANDRABINDU
-+<U0902>     /x81/x31/xcd/x30 DEVANAGARI SIGN ANUSVARA
-+<U0903>     /x81/x31/xcd/x31 DEVANAGARI SIGN VISARGA
-+<U0904>     /x81/x31/xcd/x32 <UNASSIGNED>
-+<U0905>     /x81/x31/xcd/x33 DEVANAGARI LETTER A
-+<U0906>     /x81/x31/xcd/x34 DEVANAGARI LETTER AA
-+<U0907>     /x81/x31/xcd/x35 DEVANAGARI LETTER I
-+<U0908>     /x81/x31/xcd/x36 DEVANAGARI LETTER II
-+<U0909>     /x81/x31/xcd/x37 DEVANAGARI LETTER U
-+<U090A>     /x81/x31/xcd/x38 DEVANAGARI LETTER UU
-+<U090B>     /x81/x31/xcd/x39 DEVANAGARI LETTER VOCALIC R
-+<U090C>     /x81/x31/xce/x30 DEVANAGARI LETTER VOCALIC L
-+<U090D>     /x81/x31/xce/x31 DEVANAGARI LETTER CANDRA E
-+<U090E>     /x81/x31/xce/x32 DEVANAGARI LETTER SHORT E
-+<U090F>     /x81/x31/xce/x33 DEVANAGARI LETTER E
-+<U0910>     /x81/x31/xce/x34 DEVANAGARI LETTER AI
-+<U0911>     /x81/x31/xce/x35 DEVANAGARI LETTER CANDRA O
-+<U0912>     /x81/x31/xce/x36 DEVANAGARI LETTER SHORT O
-+<U0913>     /x81/x31/xce/x37 DEVANAGARI LETTER O
-+<U0914>     /x81/x31/xce/x38 DEVANAGARI LETTER AU
-+<U0915>     /x81/x31/xce/x39 DEVANAGARI LETTER KA
-+<U0916>     /x81/x31/xcf/x30 DEVANAGARI LETTER KHA
-+<U0917>     /x81/x31/xcf/x31 DEVANAGARI LETTER GA
-+<U0918>     /x81/x31/xcf/x32 DEVANAGARI LETTER GHA
-+<U0919>     /x81/x31/xcf/x33 DEVANAGARI LETTER NGA
-+<U091A>     /x81/x31/xcf/x34 DEVANAGARI LETTER CA
-+<U091B>     /x81/x31/xcf/x35 DEVANAGARI LETTER CHA
-+<U091C>     /x81/x31/xcf/x36 DEVANAGARI LETTER JA
-+<U091D>     /x81/x31/xcf/x37 DEVANAGARI LETTER JHA
-+<U091E>     /x81/x31/xcf/x38 DEVANAGARI LETTER NYA
-+<U091F>     /x81/x31/xcf/x39 DEVANAGARI LETTER TTA
-+<U0920>     /x81/x31/xd0/x30 DEVANAGARI LETTER TTHA
-+<U0921>     /x81/x31/xd0/x31 DEVANAGARI LETTER DDA
-+<U0922>     /x81/x31/xd0/x32 DEVANAGARI LETTER DDHA
-+<U0923>     /x81/x31/xd0/x33 DEVANAGARI LETTER NNA
-+<U0924>     /x81/x31/xd0/x34 DEVANAGARI LETTER TA
-+<U0925>     /x81/x31/xd0/x35 DEVANAGARI LETTER THA
-+<U0926>     /x81/x31/xd0/x36 DEVANAGARI LETTER DA
-+<U0927>     /x81/x31/xd0/x37 DEVANAGARI LETTER DHA
-+<U0928>     /x81/x31/xd0/x38 DEVANAGARI LETTER NA
-+<U0929>     /x81/x31/xd0/x39 DEVANAGARI LETTER NNNA
-+<U092A>     /x81/x31/xd1/x30 DEVANAGARI LETTER PA
-+<U092B>     /x81/x31/xd1/x31 DEVANAGARI LETTER PHA
-+<U092C>     /x81/x31/xd1/x32 DEVANAGARI LETTER BA
-+<U092D>     /x81/x31/xd1/x33 DEVANAGARI LETTER BHA
-+<U092E>     /x81/x31/xd1/x34 DEVANAGARI LETTER MA
-+<U092F>     /x81/x31/xd1/x35 DEVANAGARI LETTER YA
-+<U0930>     /x81/x31/xd1/x36 DEVANAGARI LETTER RA
-+<U0931>     /x81/x31/xd1/x37 DEVANAGARI LETTER RRA
-+<U0932>     /x81/x31/xd1/x38 DEVANAGARI LETTER LA
-+<U0933>     /x81/x31/xd1/x39 DEVANAGARI LETTER LLA
-+<U0934>     /x81/x31/xd2/x30 DEVANAGARI LETTER LLLA
-+<U0935>     /x81/x31/xd2/x31 DEVANAGARI LETTER VA
-+<U0936>     /x81/x31/xd2/x32 DEVANAGARI LETTER SHA
-+<U0937>     /x81/x31/xd2/x33 DEVANAGARI LETTER SSA
-+<U0938>     /x81/x31/xd2/x34 DEVANAGARI LETTER SA
-+<U0939>     /x81/x31/xd2/x35 DEVANAGARI LETTER HA
-+<U093A>     /x81/x31/xd2/x36 <UNASSIGNED>
-+<U093B>     /x81/x31/xd2/x37 <UNASSIGNED>
-+<U093C>     /x81/x31/xd2/x38 DEVANAGARI SIGN NUKTA
-+<U093D>     /x81/x31/xd2/x39 DEVANAGARI SIGN AVAGRAHA
-+<U093E>     /x81/x31/xd3/x30 DEVANAGARI VOWEL SIGN AA
-+<U093F>     /x81/x31/xd3/x31 DEVANAGARI VOWEL SIGN I
-+<U0940>     /x81/x31/xd3/x32 DEVANAGARI VOWEL SIGN II
-+<U0941>     /x81/x31/xd3/x33 DEVANAGARI VOWEL SIGN U
-+<U0942>     /x81/x31/xd3/x34 DEVANAGARI VOWEL SIGN UU
-+<U0943>     /x81/x31/xd3/x35 DEVANAGARI VOWEL SIGN VOCALIC R
-+<U0944>     /x81/x31/xd3/x36 DEVANAGARI VOWEL SIGN VOCALIC RR
-+<U0945>     /x81/x31/xd3/x37 DEVANAGARI VOWEL SIGN CANDRA E
-+<U0946>     /x81/x31/xd3/x38 DEVANAGARI VOWEL SIGN SHORT E
-+<U0947>     /x81/x31/xd3/x39 DEVANAGARI VOWEL SIGN E
-+<U0948>     /x81/x31/xd4/x30 DEVANAGARI VOWEL SIGN AI
-+<U0949>     /x81/x31/xd4/x31 DEVANAGARI VOWEL SIGN CANDRA O
-+<U094A>     /x81/x31/xd4/x32 DEVANAGARI VOWEL SIGN SHORT O
-+<U094B>     /x81/x31/xd4/x33 DEVANAGARI VOWEL SIGN O
-+<U094C>     /x81/x31/xd4/x34 DEVANAGARI VOWEL SIGN AU
-+<U094D>     /x81/x31/xd4/x35 DEVANAGARI SIGN VIRAMA
-+<U094E>     /x81/x31/xd4/x36 <UNASSIGNED>
-+<U094F>     /x81/x31/xd4/x37 <UNASSIGNED>
-+<U0950>     /x81/x31/xd4/x38 DEVANAGARI OM
-+<U0951>     /x81/x31/xd4/x39 DEVANAGARI STRESS SIGN UDATTA
-+<U0952>     /x81/x31/xd5/x30 DEVANAGARI STRESS SIGN ANUDATTA
-+<U0953>     /x81/x31/xd5/x31 DEVANAGARI GRAVE ACCENT
-+<U0954>     /x81/x31/xd5/x32 DEVANAGARI ACUTE ACCENT
-+<U0955>     /x81/x31/xd5/x33 <UNASSIGNED>
-+<U0956>     /x81/x31/xd5/x34 <UNASSIGNED>
-+<U0957>     /x81/x31/xd5/x35 <UNASSIGNED>
-+<U0958>     /x81/x31/xd5/x36 DEVANAGARI LETTER QA
-+<U0959>     /x81/x31/xd5/x37 DEVANAGARI LETTER KHHA
-+<U095A>     /x81/x31/xd5/x38 DEVANAGARI LETTER GHHA
-+<U095B>     /x81/x31/xd5/x39 DEVANAGARI LETTER ZA
-+<U095C>     /x81/x31/xd6/x30 DEVANAGARI LETTER DDDHA
-+<U095D>     /x81/x31/xd6/x31 DEVANAGARI LETTER RHA
-+<U095E>     /x81/x31/xd6/x32 DEVANAGARI LETTER FA
-+<U095F>     /x81/x31/xd6/x33 DEVANAGARI LETTER YYA
-+<U0960>     /x81/x31/xd6/x34 DEVANAGARI LETTER VOCALIC RR
-+<U0961>     /x81/x31/xd6/x35 DEVANAGARI LETTER VOCALIC LL
-+<U0962>     /x81/x31/xd6/x36 DEVANAGARI VOWEL SIGN VOCALIC L
-+<U0963>     /x81/x31/xd6/x37 DEVANAGARI VOWEL SIGN VOCALIC LL
-+<U0964>     /x81/x31/xd6/x38 DEVANAGARI DANDA
-+<U0965>     /x81/x31/xd6/x39 DEVANAGARI DOUBLE DANDA
-+<U0966>     /x81/x31/xd7/x30 DEVANAGARI DIGIT ZERO
-+<U0967>     /x81/x31/xd7/x31 DEVANAGARI DIGIT ONE
-+<U0968>     /x81/x31/xd7/x32 DEVANAGARI DIGIT TWO
-+<U0969>     /x81/x31/xd7/x33 DEVANAGARI DIGIT THREE
-+<U096A>     /x81/x31/xd7/x34 DEVANAGARI DIGIT FOUR
-+<U096B>     /x81/x31/xd7/x35 DEVANAGARI DIGIT FIVE
-+<U096C>     /x81/x31/xd7/x36 DEVANAGARI DIGIT SIX
-+<U096D>     /x81/x31/xd7/x37 DEVANAGARI DIGIT SEVEN
-+<U096E>     /x81/x31/xd7/x38 DEVANAGARI DIGIT EIGHT
-+<U096F>     /x81/x31/xd7/x39 DEVANAGARI DIGIT NINE
-+<U0970>     /x81/x31/xd8/x30 DEVANAGARI ABBREVIATION SIGN
-+<U0971>     /x81/x31/xd8/x31 <UNASSIGNED>
-+<U0972>     /x81/x31/xd8/x32 <UNASSIGNED>
-+<U0973>     /x81/x31/xd8/x33 <UNASSIGNED>
-+<U0974>     /x81/x31/xd8/x34 <UNASSIGNED>
-+<U0975>     /x81/x31/xd8/x35 <UNASSIGNED>
-+<U0976>     /x81/x31/xd8/x36 <UNASSIGNED>
-+<U0977>     /x81/x31/xd8/x37 <UNASSIGNED>
-+<U0978>     /x81/x31/xd8/x38 <UNASSIGNED>
-+<U0979>     /x81/x31/xd8/x39 <UNASSIGNED>
-+<U097A>     /x81/x31/xd9/x30 <UNASSIGNED>
-+<U097B>     /x81/x31/xd9/x31 <UNASSIGNED>
-+<U097C>     /x81/x31/xd9/x32 <UNASSIGNED>
-+<U097D>     /x81/x31/xd9/x33 <UNASSIGNED>
-+<U097E>     /x81/x31/xd9/x34 <UNASSIGNED>
-+<U097F>     /x81/x31/xd9/x35 <UNASSIGNED>
-+<U0980>     /x81/x31/xd9/x36 <UNASSIGNED>
-+<U0981>     /x81/x31/xd9/x37 BENGALI SIGN CANDRABINDU
-+<U0982>     /x81/x31/xd9/x38 BENGALI SIGN ANUSVARA
-+<U0983>     /x81/x31/xd9/x39 BENGALI SIGN VISARGA
-+<U0984>     /x81/x31/xda/x30 <UNASSIGNED>
-+<U0985>     /x81/x31/xda/x31 BENGALI LETTER A
-+<U0986>     /x81/x31/xda/x32 BENGALI LETTER AA
-+<U0987>     /x81/x31/xda/x33 BENGALI LETTER I
-+<U0988>     /x81/x31/xda/x34 BENGALI LETTER II
-+<U0989>     /x81/x31/xda/x35 BENGALI LETTER U
-+<U098A>     /x81/x31/xda/x36 BENGALI LETTER UU
-+<U098B>     /x81/x31/xda/x37 BENGALI LETTER VOCALIC R
-+<U098C>     /x81/x31/xda/x38 BENGALI LETTER VOCALIC L
-+<U098D>     /x81/x31/xda/x39 <UNASSIGNED>
-+<U098E>     /x81/x31/xdb/x30 <UNASSIGNED>
-+<U098F>     /x81/x31/xdb/x31 BENGALI LETTER E
-+<U0990>     /x81/x31/xdb/x32 BENGALI LETTER AI
-+<U0991>     /x81/x31/xdb/x33 <UNASSIGNED>
-+<U0992>     /x81/x31/xdb/x34 <UNASSIGNED>
-+<U0993>     /x81/x31/xdb/x35 BENGALI LETTER O
-+<U0994>     /x81/x31/xdb/x36 BENGALI LETTER AU
-+<U0995>     /x81/x31/xdb/x37 BENGALI LETTER KA
-+<U0996>     /x81/x31/xdb/x38 BENGALI LETTER KHA
-+<U0997>     /x81/x31/xdb/x39 BENGALI LETTER GA
-+<U0998>     /x81/x31/xdc/x30 BENGALI LETTER GHA
-+<U0999>     /x81/x31/xdc/x31 BENGALI LETTER NGA
-+<U099A>     /x81/x31/xdc/x32 BENGALI LETTER CA
-+<U099B>     /x81/x31/xdc/x33 BENGALI LETTER CHA
-+<U099C>     /x81/x31/xdc/x34 BENGALI LETTER JA
-+<U099D>     /x81/x31/xdc/x35 BENGALI LETTER JHA
-+<U099E>     /x81/x31/xdc/x36 BENGALI LETTER NYA
-+<U099F>     /x81/x31/xdc/x37 BENGALI LETTER TTA
-+<U09A0>     /x81/x31/xdc/x38 BENGALI LETTER TTHA
-+<U09A1>     /x81/x31/xdc/x39 BENGALI LETTER DDA
-+<U09A2>     /x81/x31/xdd/x30 BENGALI LETTER DDHA
-+<U09A3>     /x81/x31/xdd/x31 BENGALI LETTER NNA
-+<U09A4>     /x81/x31/xdd/x32 BENGALI LETTER TA
-+<U09A5>     /x81/x31/xdd/x33 BENGALI LETTER THA
-+<U09A6>     /x81/x31/xdd/x34 BENGALI LETTER DA
-+<U09A7>     /x81/x31/xdd/x35 BENGALI LETTER DHA
-+<U09A8>     /x81/x31/xdd/x36 BENGALI LETTER NA
-+<U09A9>     /x81/x31/xdd/x37 <UNASSIGNED>
-+<U09AA>     /x81/x31/xdd/x38 BENGALI LETTER PA
-+<U09AB>     /x81/x31/xdd/x39 BENGALI LETTER PHA
-+<U09AC>     /x81/x31/xde/x30 BENGALI LETTER BA
-+<U09AD>     /x81/x31/xde/x31 BENGALI LETTER BHA
-+<U09AE>     /x81/x31/xde/x32 BENGALI LETTER MA
-+<U09AF>     /x81/x31/xde/x33 BENGALI LETTER YA
-+<U09B0>     /x81/x31/xde/x34 BENGALI LETTER RA
-+<U09B1>     /x81/x31/xde/x35 <UNASSIGNED>
-+<U09B2>     /x81/x31/xde/x36 BENGALI LETTER LA
-+<U09B3>     /x81/x31/xde/x37 <UNASSIGNED>
-+<U09B4>     /x81/x31/xde/x38 <UNASSIGNED>
-+<U09B5>     /x81/x31/xde/x39 <UNASSIGNED>
-+<U09B6>     /x81/x31/xdf/x30 BENGALI LETTER SHA
-+<U09B7>     /x81/x31/xdf/x31 BENGALI LETTER SSA
-+<U09B8>     /x81/x31/xdf/x32 BENGALI LETTER SA
-+<U09B9>     /x81/x31/xdf/x33 BENGALI LETTER HA
-+<U09BA>     /x81/x31/xdf/x34 <UNASSIGNED>
-+<U09BB>     /x81/x31/xdf/x35 <UNASSIGNED>
-+<U09BC>     /x81/x31/xdf/x36 BENGALI SIGN NUKTA
-+<U09BD>     /x81/x31/xdf/x37 <UNASSIGNED>
-+<U09BE>     /x81/x31/xdf/x38 BENGALI VOWEL SIGN AA
-+<U09BF>     /x81/x31/xdf/x39 BENGALI VOWEL SIGN I
-+<U09C0>     /x81/x31/xe0/x30 BENGALI VOWEL SIGN II
-+<U09C1>     /x81/x31/xe0/x31 BENGALI VOWEL SIGN U
-+<U09C2>     /x81/x31/xe0/x32 BENGALI VOWEL SIGN UU
-+<U09C3>     /x81/x31/xe0/x33 BENGALI VOWEL SIGN VOCALIC R
-+<U09C4>     /x81/x31/xe0/x34 BENGALI VOWEL SIGN VOCALIC RR
-+<U09C5>     /x81/x31/xe0/x35 <UNASSIGNED>
-+<U09C6>     /x81/x31/xe0/x36 <UNASSIGNED>
-+<U09C7>     /x81/x31/xe0/x37 BENGALI VOWEL SIGN E
-+<U09C8>     /x81/x31/xe0/x38 BENGALI VOWEL SIGN AI
-+<U09C9>     /x81/x31/xe0/x39 <UNASSIGNED>
-+<U09CA>     /x81/x31/xe1/x30 <UNASSIGNED>
-+<U09CB>     /x81/x31/xe1/x31 BENGALI VOWEL SIGN O
-+<U09CC>     /x81/x31/xe1/x32 BENGALI VOWEL SIGN AU
-+<U09CD>     /x81/x31/xe1/x33 BENGALI SIGN VIRAMA
-+<U09CE>     /x81/x31/xe1/x34 <UNASSIGNED>
-+<U09CF>     /x81/x31/xe1/x35 <UNASSIGNED>
-+<U09D0>     /x81/x31/xe1/x36 <UNASSIGNED>
-+<U09D1>     /x81/x31/xe1/x37 <UNASSIGNED>
-+<U09D2>     /x81/x31/xe1/x38 <UNASSIGNED>
-+<U09D3>     /x81/x31/xe1/x39 <UNASSIGNED>
-+<U09D4>     /x81/x31/xe2/x30 <UNASSIGNED>
-+<U09D5>     /x81/x31/xe2/x31 <UNASSIGNED>
-+<U09D6>     /x81/x31/xe2/x32 <UNASSIGNED>
-+<U09D7>     /x81/x31/xe2/x33 BENGALI AU LENGTH MARK
-+<U09D8>     /x81/x31/xe2/x34 <UNASSIGNED>
-+<U09D9>     /x81/x31/xe2/x35 <UNASSIGNED>
-+<U09DA>     /x81/x31/xe2/x36 <UNASSIGNED>
-+<U09DB>     /x81/x31/xe2/x37 <UNASSIGNED>
-+<U09DC>     /x81/x31/xe2/x38 BENGALI LETTER RRA
-+<U09DD>     /x81/x31/xe2/x39 BENGALI LETTER RHA
-+<U09DE>     /x81/x31/xe3/x30 <UNASSIGNED>
-+<U09DF>     /x81/x31/xe3/x31 BENGALI LETTER YYA
-+<U09E0>     /x81/x31/xe3/x32 BENGALI LETTER VOCALIC RR
-+<U09E1>     /x81/x31/xe3/x33 BENGALI LETTER VOCALIC LL
-+<U09E2>     /x81/x31/xe3/x34 BENGALI VOWEL SIGN VOCALIC L
-+<U09E3>     /x81/x31/xe3/x35 BENGALI VOWEL SIGN VOCALIC LL
-+<U09E4>     /x81/x31/xe3/x36 <UNASSIGNED>
-+<U09E5>     /x81/x31/xe3/x37 <UNASSIGNED>
-+<U09E6>     /x81/x31/xe3/x38 BENGALI DIGIT ZERO
-+<U09E7>     /x81/x31/xe3/x39 BENGALI DIGIT ONE
-+<U09E8>     /x81/x31/xe4/x30 BENGALI DIGIT TWO
-+<U09E9>     /x81/x31/xe4/x31 BENGALI DIGIT THREE
-+<U09EA>     /x81/x31/xe4/x32 BENGALI DIGIT FOUR
-+<U09EB>     /x81/x31/xe4/x33 BENGALI DIGIT FIVE
-+<U09EC>     /x81/x31/xe4/x34 BENGALI DIGIT SIX
-+<U09ED>     /x81/x31/xe4/x35 BENGALI DIGIT SEVEN
-+<U09EE>     /x81/x31/xe4/x36 BENGALI DIGIT EIGHT
-+<U09EF>     /x81/x31/xe4/x37 BENGALI DIGIT NINE
-+<U09F0>     /x81/x31/xe4/x38 BENGALI LETTER RA WITH MIDDLE DIAGONAL
-+<U09F1>     /x81/x31/xe4/x39 BENGALI LETTER RA WITH LOWER DIAGONAL
-+<U09F2>     /x81/x31/xe5/x30 BENGALI RUPEE MARK
-+<U09F3>     /x81/x31/xe5/x31 BENGALI RUPEE SIGN
-+<U09F4>     /x81/x31/xe5/x32 BENGALI CURRENCY NUMERATOR ONE
-+<U09F5>     /x81/x31/xe5/x33 BENGALI CURRENCY NUMERATOR TWO
-+<U09F6>     /x81/x31/xe5/x34 BENGALI CURRENCY NUMERATOR THREE
-+<U09F7>     /x81/x31/xe5/x35 BENGALI CURRENCY NUMERATOR FOUR
-+<U09F8>     /x81/x31/xe5/x36 BENGALI CURRENCY NUMERATOR ONE LESS THAN THE DENOMINATOR
-+<U09F9>     /x81/x31/xe5/x37 BENGALI CURRENCY DENOMINATOR SIXTEEN
-+<U09FA>     /x81/x31/xe5/x38 BENGALI ISSHAR
-+<U09FB>     /x81/x31/xe5/x39 <UNASSIGNED>
-+<U09FC>     /x81/x31/xe6/x30 <UNASSIGNED>
-+<U09FD>     /x81/x31/xe6/x31 <UNASSIGNED>
-+<U09FE>     /x81/x31/xe6/x32 <UNASSIGNED>
-+<U09FF>     /x81/x31/xe6/x33 <UNASSIGNED>
-+<U0A00>     /x81/x31/xe6/x34 <UNASSIGNED>
-+<U0A01>     /x81/x31/xe6/x35 <UNASSIGNED>
-+<U0A02>     /x81/x31/xe6/x36 GURMUKHI SIGN BINDI
-+<U0A03>     /x81/x31/xe6/x37 <UNASSIGNED>
-+<U0A04>     /x81/x31/xe6/x38 <UNASSIGNED>
-+<U0A05>     /x81/x31/xe6/x39 GURMUKHI LETTER A
-+<U0A06>     /x81/x31/xe7/x30 GURMUKHI LETTER AA
-+<U0A07>     /x81/x31/xe7/x31 GURMUKHI LETTER I
-+<U0A08>     /x81/x31/xe7/x32 GURMUKHI LETTER II
-+<U0A09>     /x81/x31/xe7/x33 GURMUKHI LETTER U
-+<U0A0A>     /x81/x31/xe7/x34 GURMUKHI LETTER UU
-+<U0A0B>     /x81/x31/xe7/x35 <UNASSIGNED>
-+<U0A0C>     /x81/x31/xe7/x36 <UNASSIGNED>
-+<U0A0D>     /x81/x31/xe7/x37 <UNASSIGNED>
-+<U0A0E>     /x81/x31/xe7/x38 <UNASSIGNED>
-+<U0A0F>     /x81/x31/xe7/x39 GURMUKHI LETTER EE
-+<U0A10>     /x81/x31/xe8/x30 GURMUKHI LETTER AI
-+<U0A11>     /x81/x31/xe8/x31 <UNASSIGNED>
-+<U0A12>     /x81/x31/xe8/x32 <UNASSIGNED>
-+<U0A13>     /x81/x31/xe8/x33 GURMUKHI LETTER OO
-+<U0A14>     /x81/x31/xe8/x34 GURMUKHI LETTER AU
-+<U0A15>     /x81/x31/xe8/x35 GURMUKHI LETTER KA
-+<U0A16>     /x81/x31/xe8/x36 GURMUKHI LETTER KHA
-+<U0A17>     /x81/x31/xe8/x37 GURMUKHI LETTER GA
-+<U0A18>     /x81/x31/xe8/x38 GURMUKHI LETTER GHA
-+<U0A19>     /x81/x31/xe8/x39 GURMUKHI LETTER NGA
-+<U0A1A>     /x81/x31/xe9/x30 GURMUKHI LETTER CA
-+<U0A1B>     /x81/x31/xe9/x31 GURMUKHI LETTER CHA
-+<U0A1C>     /x81/x31/xe9/x32 GURMUKHI LETTER JA
-+<U0A1D>     /x81/x31/xe9/x33 GURMUKHI LETTER JHA
-+<U0A1E>     /x81/x31/xe9/x34 GURMUKHI LETTER NYA
-+<U0A1F>     /x81/x31/xe9/x35 GURMUKHI LETTER TTA
-+<U0A20>     /x81/x31/xe9/x36 GURMUKHI LETTER TTHA
-+<U0A21>     /x81/x31/xe9/x37 GURMUKHI LETTER DDA
-+<U0A22>     /x81/x31/xe9/x38 GURMUKHI LETTER DDHA
-+<U0A23>     /x81/x31/xe9/x39 GURMUKHI LETTER NNA
-+<U0A24>     /x81/x31/xea/x30 GURMUKHI LETTER TA
-+<U0A25>     /x81/x31/xea/x31 GURMUKHI LETTER THA
-+<U0A26>     /x81/x31/xea/x32 GURMUKHI LETTER DA
-+<U0A27>     /x81/x31/xea/x33 GURMUKHI LETTER DHA
-+<U0A28>     /x81/x31/xea/x34 GURMUKHI LETTER NA
-+<U0A29>     /x81/x31/xea/x35 <UNASSIGNED>
-+<U0A2A>     /x81/x31/xea/x36 GURMUKHI LETTER PA
-+<U0A2B>     /x81/x31/xea/x37 GURMUKHI LETTER PHA
-+<U0A2C>     /x81/x31/xea/x38 GURMUKHI LETTER BA
-+<U0A2D>     /x81/x31/xea/x39 GURMUKHI LETTER BHA
-+<U0A2E>     /x81/x31/xeb/x30 GURMUKHI LETTER MA
-+<U0A2F>     /x81/x31/xeb/x31 GURMUKHI LETTER YA
-+<U0A30>     /x81/x31/xeb/x32 GURMUKHI LETTER RA
-+<U0A31>     /x81/x31/xeb/x33 <UNASSIGNED>
-+<U0A32>     /x81/x31/xeb/x34 GURMUKHI LETTER LA
-+<U0A33>     /x81/x31/xeb/x35 GURMUKHI LETTER LLA
-+<U0A34>     /x81/x31/xeb/x36 <UNASSIGNED>
-+<U0A35>     /x81/x31/xeb/x37 GURMUKHI LETTER VA
-+<U0A36>     /x81/x31/xeb/x38 GURMUKHI LETTER SHA
-+<U0A37>     /x81/x31/xeb/x39 <UNASSIGNED>
-+<U0A38>     /x81/x31/xec/x30 GURMUKHI LETTER SA
-+<U0A39>     /x81/x31/xec/x31 GURMUKHI LETTER HA
-+<U0A3A>     /x81/x31/xec/x32 <UNASSIGNED>
-+<U0A3B>     /x81/x31/xec/x33 <UNASSIGNED>
-+<U0A3C>     /x81/x31/xec/x34 GURMUKHI SIGN NUKTA
-+<U0A3D>     /x81/x31/xec/x35 <UNASSIGNED>
-+<U0A3E>     /x81/x31/xec/x36 GURMUKHI VOWEL SIGN AA
-+<U0A3F>     /x81/x31/xec/x37 GURMUKHI VOWEL SIGN I
-+<U0A40>     /x81/x31/xec/x38 GURMUKHI VOWEL SIGN II
-+<U0A41>     /x81/x31/xec/x39 GURMUKHI VOWEL SIGN U
-+<U0A42>     /x81/x31/xed/x30 GURMUKHI VOWEL SIGN UU
-+<U0A43>     /x81/x31/xed/x31 <UNASSIGNED>
-+<U0A44>     /x81/x31/xed/x32 <UNASSIGNED>
-+<U0A45>     /x81/x31/xed/x33 <UNASSIGNED>
-+<U0A46>     /x81/x31/xed/x34 <UNASSIGNED>
-+<U0A47>     /x81/x31/xed/x35 GURMUKHI VOWEL SIGN EE
-+<U0A48>     /x81/x31/xed/x36 GURMUKHI VOWEL SIGN AI
-+<U0A49>     /x81/x31/xed/x37 <UNASSIGNED>
-+<U0A4A>     /x81/x31/xed/x38 <UNASSIGNED>
-+<U0A4B>     /x81/x31/xed/x39 GURMUKHI VOWEL SIGN OO
-+<U0A4C>     /x81/x31/xee/x30 GURMUKHI VOWEL SIGN AU
-+<U0A4D>     /x81/x31/xee/x31 GURMUKHI SIGN VIRAMA
-+<U0A4E>     /x81/x31/xee/x32 <UNASSIGNED>
-+<U0A4F>     /x81/x31/xee/x33 <UNASSIGNED>
-+<U0A50>     /x81/x31/xee/x34 <UNASSIGNED>
-+<U0A51>     /x81/x31/xee/x35 <UNASSIGNED>
-+<U0A52>     /x81/x31/xee/x36 <UNASSIGNED>
-+<U0A53>     /x81/x31/xee/x37 <UNASSIGNED>
-+<U0A54>     /x81/x31/xee/x38 <UNASSIGNED>
-+<U0A55>     /x81/x31/xee/x39 <UNASSIGNED>
-+<U0A56>     /x81/x31/xef/x30 <UNASSIGNED>
-+<U0A57>     /x81/x31/xef/x31 <UNASSIGNED>
-+<U0A58>     /x81/x31/xef/x32 <UNASSIGNED>
-+<U0A59>     /x81/x31/xef/x33 GURMUKHI LETTER KHHA
-+<U0A5A>     /x81/x31/xef/x34 GURMUKHI LETTER GHHA
-+<U0A5B>     /x81/x31/xef/x35 GURMUKHI LETTER ZA
-+<U0A5C>     /x81/x31/xef/x36 GURMUKHI LETTER RRA
-+<U0A5D>     /x81/x31/xef/x37 <UNASSIGNED>
-+<U0A5E>     /x81/x31/xef/x38 GURMUKHI LETTER FA
-+<U0A5F>     /x81/x31/xef/x39 <UNASSIGNED>
-+<U0A60>     /x81/x31/xf0/x30 <UNASSIGNED>
-+<U0A61>     /x81/x31/xf0/x31 <UNASSIGNED>
-+<U0A62>     /x81/x31/xf0/x32 <UNASSIGNED>
-+<U0A63>     /x81/x31/xf0/x33 <UNASSIGNED>
-+<U0A64>     /x81/x31/xf0/x34 <UNASSIGNED>
-+<U0A65>     /x81/x31/xf0/x35 <UNASSIGNED>
-+<U0A66>     /x81/x31/xf0/x36 GURMUKHI DIGIT ZERO
-+<U0A67>     /x81/x31/xf0/x37 GURMUKHI DIGIT ONE
-+<U0A68>     /x81/x31/xf0/x38 GURMUKHI DIGIT TWO
-+<U0A69>     /x81/x31/xf0/x39 GURMUKHI DIGIT THREE
-+<U0A6A>     /x81/x31/xf1/x30 GURMUKHI DIGIT FOUR
-+<U0A6B>     /x81/x31/xf1/x31 GURMUKHI DIGIT FIVE
-+<U0A6C>     /x81/x31/xf1/x32 GURMUKHI DIGIT SIX
-+<U0A6D>     /x81/x31/xf1/x33 GURMUKHI DIGIT SEVEN
-+<U0A6E>     /x81/x31/xf1/x34 GURMUKHI DIGIT EIGHT
-+<U0A6F>     /x81/x31/xf1/x35 GURMUKHI DIGIT NINE
-+<U0A70>     /x81/x31/xf1/x36 GURMUKHI TIPPI
-+<U0A71>     /x81/x31/xf1/x37 GURMUKHI ADDAK
-+<U0A72>     /x81/x31/xf1/x38 GURMUKHI IRI
-+<U0A73>     /x81/x31/xf1/x39 GURMUKHI URA
-+<U0A74>     /x81/x31/xf2/x30 GURMUKHI EK ONKAR
-+<U0A75>     /x81/x31/xf2/x31 <UNASSIGNED>
-+<U0A76>     /x81/x31/xf2/x32 <UNASSIGNED>
-+<U0A77>     /x81/x31/xf2/x33 <UNASSIGNED>
-+<U0A78>     /x81/x31/xf2/x34 <UNASSIGNED>
-+<U0A79>     /x81/x31/xf2/x35 <UNASSIGNED>
-+<U0A7A>     /x81/x31/xf2/x36 <UNASSIGNED>
-+<U0A7B>     /x81/x31/xf2/x37 <UNASSIGNED>
-+<U0A7C>     /x81/x31/xf2/x38 <UNASSIGNED>
-+<U0A7D>     /x81/x31/xf2/x39 <UNASSIGNED>
-+<U0A7E>     /x81/x31/xf3/x30 <UNASSIGNED>
-+<U0A7F>     /x81/x31/xf3/x31 <UNASSIGNED>
-+<U0A80>     /x81/x31/xf3/x32 <UNASSIGNED>
-+<U0A81>     /x81/x31/xf3/x33 GUJARATI SIGN CANDRABINDU
-+<U0A82>     /x81/x31/xf3/x34 GUJARATI SIGN ANUSVARA
-+<U0A83>     /x81/x31/xf3/x35 GUJARATI SIGN VISARGA
-+<U0A84>     /x81/x31/xf3/x36 <UNASSIGNED>
-+<U0A85>     /x81/x31/xf3/x37 GUJARATI LETTER A
-+<U0A86>     /x81/x31/xf3/x38 GUJARATI LETTER AA
-+<U0A87>     /x81/x31/xf3/x39 GUJARATI LETTER I
-+<U0A88>     /x81/x31/xf4/x30 GUJARATI LETTER II
-+<U0A89>     /x81/x31/xf4/x31 GUJARATI LETTER U
-+<U0A8A>     /x81/x31/xf4/x32 GUJARATI LETTER UU
-+<U0A8B>     /x81/x31/xf4/x33 GUJARATI LETTER VOCALIC R
-+<U0A8C>     /x81/x31/xf4/x34 <UNASSIGNED>
-+<U0A8D>     /x81/x31/xf4/x35 GUJARATI VOWEL CANDRA E
-+<U0A8E>     /x81/x31/xf4/x36 <UNASSIGNED>
-+<U0A8F>     /x81/x31/xf4/x37 GUJARATI LETTER E
-+<U0A90>     /x81/x31/xf4/x38 GUJARATI LETTER AI
-+<U0A91>     /x81/x31/xf4/x39 GUJARATI VOWEL CANDRA O
-+<U0A92>     /x81/x31/xf5/x30 <UNASSIGNED>
-+<U0A93>     /x81/x31/xf5/x31 GUJARATI LETTER O
-+<U0A94>     /x81/x31/xf5/x32 GUJARATI LETTER AU
-+<U0A95>     /x81/x31/xf5/x33 GUJARATI LETTER KA
-+<U0A96>     /x81/x31/xf5/x34 GUJARATI LETTER KHA
-+<U0A97>     /x81/x31/xf5/x35 GUJARATI LETTER GA
-+<U0A98>     /x81/x31/xf5/x36 GUJARATI LETTER GHA
-+<U0A99>     /x81/x31/xf5/x37 GUJARATI LETTER NGA
-+<U0A9A>     /x81/x31/xf5/x38 GUJARATI LETTER CA
-+<U0A9B>     /x81/x31/xf5/x39 GUJARATI LETTER CHA
-+<U0A9C>     /x81/x31/xf6/x30 GUJARATI LETTER JA
-+<U0A9D>     /x81/x31/xf6/x31 GUJARATI LETTER JHA
-+<U0A9E>     /x81/x31/xf6/x32 GUJARATI LETTER NYA
-+<U0A9F>     /x81/x31/xf6/x33 GUJARATI LETTER TTA
-+<U0AA0>     /x81/x31/xf6/x34 GUJARATI LETTER TTHA
-+<U0AA1>     /x81/x31/xf6/x35 GUJARATI LETTER DDA
-+<U0AA2>     /x81/x31/xf6/x36 GUJARATI LETTER DDHA
-+<U0AA3>     /x81/x31/xf6/x37 GUJARATI LETTER NNA
-+<U0AA4>     /x81/x31/xf6/x38 GUJARATI LETTER TA
-+<U0AA5>     /x81/x31/xf6/x39 GUJARATI LETTER THA
-+<U0AA6>     /x81/x31/xf7/x30 GUJARATI LETTER DA
-+<U0AA7>     /x81/x31/xf7/x31 GUJARATI LETTER DHA
-+<U0AA8>     /x81/x31/xf7/x32 GUJARATI LETTER NA
-+<U0AA9>     /x81/x31/xf7/x33 <UNASSIGNED>
-+<U0AAA>     /x81/x31/xf7/x34 GUJARATI LETTER PA
-+<U0AAB>     /x81/x31/xf7/x35 GUJARATI LETTER PHA
-+<U0AAC>     /x81/x31/xf7/x36 GUJARATI LETTER BA
-+<U0AAD>     /x81/x31/xf7/x37 GUJARATI LETTER BHA
-+<U0AAE>     /x81/x31/xf7/x38 GUJARATI LETTER MA
-+<U0AAF>     /x81/x31/xf7/x39 GUJARATI LETTER YA
-+<U0AB0>     /x81/x31/xf8/x30 GUJARATI LETTER RA
-+<U0AB1>     /x81/x31/xf8/x31 <UNASSIGNED>
-+<U0AB2>     /x81/x31/xf8/x32 GUJARATI LETTER LA
-+<U0AB3>     /x81/x31/xf8/x33 GUJARATI LETTER LLA
-+<U0AB4>     /x81/x31/xf8/x34 <UNASSIGNED>
-+<U0AB5>     /x81/x31/xf8/x35 GUJARATI LETTER VA
-+<U0AB6>     /x81/x31/xf8/x36 GUJARATI LETTER SHA
-+<U0AB7>     /x81/x31/xf8/x37 GUJARATI LETTER SSA
-+<U0AB8>     /x81/x31/xf8/x38 GUJARATI LETTER SA
-+<U0AB9>     /x81/x31/xf8/x39 GUJARATI LETTER HA
-+<U0ABA>     /x81/x31/xf9/x30 <UNASSIGNED>
-+<U0ABB>     /x81/x31/xf9/x31 <UNASSIGNED>
-+<U0ABC>     /x81/x31/xf9/x32 GUJARATI SIGN NUKTA
-+<U0ABD>     /x81/x31/xf9/x33 GUJARATI SIGN AVAGRAHA
-+<U0ABE>     /x81/x31/xf9/x34 GUJARATI VOWEL SIGN AA
-+<U0ABF>     /x81/x31/xf9/x35 GUJARATI VOWEL SIGN I
-+<U0AC0>     /x81/x31/xf9/x36 GUJARATI VOWEL SIGN II
-+<U0AC1>     /x81/x31/xf9/x37 GUJARATI VOWEL SIGN U
-+<U0AC2>     /x81/x31/xf9/x38 GUJARATI VOWEL SIGN UU
-+<U0AC3>     /x81/x31/xf9/x39 GUJARATI VOWEL SIGN VOCALIC R
-+<U0AC4>     /x81/x31/xfa/x30 GUJARATI VOWEL SIGN VOCALIC RR
-+<U0AC5>     /x81/x31/xfa/x31 GUJARATI VOWEL SIGN CANDRA E
-+<U0AC6>     /x81/x31/xfa/x32 <UNASSIGNED>
-+<U0AC7>     /x81/x31/xfa/x33 GUJARATI VOWEL SIGN E
-+<U0AC8>     /x81/x31/xfa/x34 GUJARATI VOWEL SIGN AI
-+<U0AC9>     /x81/x31/xfa/x35 GUJARATI VOWEL SIGN CANDRA O
-+<U0ACA>     /x81/x31/xfa/x36 <UNASSIGNED>
-+<U0ACB>     /x81/x31/xfa/x37 GUJARATI VOWEL SIGN O
-+<U0ACC>     /x81/x31/xfa/x38 GUJARATI VOWEL SIGN AU
-+<U0ACD>     /x81/x31/xfa/x39 GUJARATI SIGN VIRAMA
-+<U0ACE>     /x81/x31/xfb/x30 <UNASSIGNED>
-+<U0ACF>     /x81/x31/xfb/x31 <UNASSIGNED>
-+<U0AD0>     /x81/x31/xfb/x32 GUJARATI OM
-+<U0AD1>     /x81/x31/xfb/x33 <UNASSIGNED>
-+<U0AD2>     /x81/x31/xfb/x34 <UNASSIGNED>
-+<U0AD3>     /x81/x31/xfb/x35 <UNASSIGNED>
-+<U0AD4>     /x81/x31/xfb/x36 <UNASSIGNED>
-+<U0AD5>     /x81/x31/xfb/x37 <UNASSIGNED>
-+<U0AD6>     /x81/x31/xfb/x38 <UNASSIGNED>
-+<U0AD7>     /x81/x31/xfb/x39 <UNASSIGNED>
-+<U0AD8>     /x81/x31/xfc/x30 <UNASSIGNED>
-+<U0AD9>     /x81/x31/xfc/x31 <UNASSIGNED>
-+<U0ADA>     /x81/x31/xfc/x32 <UNASSIGNED>
-+<U0ADB>     /x81/x31/xfc/x33 <UNASSIGNED>
-+<U0ADC>     /x81/x31/xfc/x34 <UNASSIGNED>
-+<U0ADD>     /x81/x31/xfc/x35 <UNASSIGNED>
-+<U0ADE>     /x81/x31/xfc/x36 <UNASSIGNED>
-+<U0ADF>     /x81/x31/xfc/x37 <UNASSIGNED>
-+<U0AE0>     /x81/x31/xfc/x38 GUJARATI LETTER VOCALIC RR
-+<U0AE1>     /x81/x31/xfc/x39 <UNASSIGNED>
-+<U0AE2>     /x81/x31/xfd/x30 <UNASSIGNED>
-+<U0AE3>     /x81/x31/xfd/x31 <UNASSIGNED>
-+<U0AE4>     /x81/x31/xfd/x32 <UNASSIGNED>
-+<U0AE5>     /x81/x31/xfd/x33 <UNASSIGNED>
-+<U0AE6>     /x81/x31/xfd/x34 GUJARATI DIGIT ZERO
-+<U0AE7>     /x81/x31/xfd/x35 GUJARATI DIGIT ONE
-+<U0AE8>     /x81/x31/xfd/x36 GUJARATI DIGIT TWO
-+<U0AE9>     /x81/x31/xfd/x37 GUJARATI DIGIT THREE
-+<U0AEA>     /x81/x31/xfd/x38 GUJARATI DIGIT FOUR
-+<U0AEB>     /x81/x31/xfd/x39 GUJARATI DIGIT FIVE
-+<U0AEC>     /x81/x31/xfe/x30 GUJARATI DIGIT SIX
-+<U0AED>     /x81/x31/xfe/x31 GUJARATI DIGIT SEVEN
-+<U0AEE>     /x81/x31/xfe/x32 GUJARATI DIGIT EIGHT
-+<U0AEF>     /x81/x31/xfe/x33 GUJARATI DIGIT NINE
-+<U0AF0>     /x81/x31/xfe/x34 <UNASSIGNED>
-+<U0AF1>     /x81/x31/xfe/x35 <UNASSIGNED>
-+<U0AF2>     /x81/x31/xfe/x36 <UNASSIGNED>
-+<U0AF3>     /x81/x31/xfe/x37 <UNASSIGNED>
-+<U0AF4>     /x81/x31/xfe/x38 <UNASSIGNED>
-+<U0AF5>     /x81/x31/xfe/x39 <UNASSIGNED>
-+<U0AF6>     /x81/x32/x81/x30 <UNASSIGNED>
-+<U0AF7>     /x81/x32/x81/x31 <UNASSIGNED>
-+<U0AF8>     /x81/x32/x81/x32 <UNASSIGNED>
-+<U0AF9>     /x81/x32/x81/x33 <UNASSIGNED>
-+<U0AFA>     /x81/x32/x81/x34 <UNASSIGNED>
-+<U0AFB>     /x81/x32/x81/x35 <UNASSIGNED>
-+<U0AFC>     /x81/x32/x81/x36 <UNASSIGNED>
-+<U0AFD>     /x81/x32/x81/x37 <UNASSIGNED>
-+<U0AFE>     /x81/x32/x81/x38 <UNASSIGNED>
-+<U0AFF>     /x81/x32/x81/x39 <UNASSIGNED>
-+<U0B00>     /x81/x32/x82/x30 <UNASSIGNED>
-+<U0B01>     /x81/x32/x82/x31 ORIYA SIGN CANDRABINDU
-+<U0B02>     /x81/x32/x82/x32 ORIYA SIGN ANUSVARA
-+<U0B03>     /x81/x32/x82/x33 ORIYA SIGN VISARGA
-+<U0B04>     /x81/x32/x82/x34 <UNASSIGNED>
-+<U0B05>     /x81/x32/x82/x35 ORIYA LETTER A
-+<U0B06>     /x81/x32/x82/x36 ORIYA LETTER AA
-+<U0B07>     /x81/x32/x82/x37 ORIYA LETTER I
-+<U0B08>     /x81/x32/x82/x38 ORIYA LETTER II
-+<U0B09>     /x81/x32/x82/x39 ORIYA LETTER U
-+<U0B0A>     /x81/x32/x83/x30 ORIYA LETTER UU
-+<U0B0B>     /x81/x32/x83/x31 ORIYA LETTER VOCALIC R
-+<U0B0C>     /x81/x32/x83/x32 ORIYA LETTER VOCALIC L
-+<U0B0D>     /x81/x32/x83/x33 <UNASSIGNED>
-+<U0B0E>     /x81/x32/x83/x34 <UNASSIGNED>
-+<U0B0F>     /x81/x32/x83/x35 ORIYA LETTER E
-+<U0B10>     /x81/x32/x83/x36 ORIYA LETTER AI
-+<U0B11>     /x81/x32/x83/x37 <UNASSIGNED>
-+<U0B12>     /x81/x32/x83/x38 <UNASSIGNED>
-+<U0B13>     /x81/x32/x83/x39 ORIYA LETTER O
-+<U0B14>     /x81/x32/x84/x30 ORIYA LETTER AU
-+<U0B15>     /x81/x32/x84/x31 ORIYA LETTER KA
-+<U0B16>     /x81/x32/x84/x32 ORIYA LETTER KHA
-+<U0B17>     /x81/x32/x84/x33 ORIYA LETTER GA
-+<U0B18>     /x81/x32/x84/x34 ORIYA LETTER GHA
-+<U0B19>     /x81/x32/x84/x35 ORIYA LETTER NGA
-+<U0B1A>     /x81/x32/x84/x36 ORIYA LETTER CA
-+<U0B1B>     /x81/x32/x84/x37 ORIYA LETTER CHA
-+<U0B1C>     /x81/x32/x84/x38 ORIYA LETTER JA
-+<U0B1D>     /x81/x32/x84/x39 ORIYA LETTER JHA
-+<U0B1E>     /x81/x32/x85/x30 ORIYA LETTER NYA
-+<U0B1F>     /x81/x32/x85/x31 ORIYA LETTER TTA
-+<U0B20>     /x81/x32/x85/x32 ORIYA LETTER TTHA
-+<U0B21>     /x81/x32/x85/x33 ORIYA LETTER DDA
-+<U0B22>     /x81/x32/x85/x34 ORIYA LETTER DDHA
-+<U0B23>     /x81/x32/x85/x35 ORIYA LETTER NNA
-+<U0B24>     /x81/x32/x85/x36 ORIYA LETTER TA
-+<U0B25>     /x81/x32/x85/x37 ORIYA LETTER THA
-+<U0B26>     /x81/x32/x85/x38 ORIYA LETTER DA
-+<U0B27>     /x81/x32/x85/x39 ORIYA LETTER DHA
-+<U0B28>     /x81/x32/x86/x30 ORIYA LETTER NA
-+<U0B29>     /x81/x32/x86/x31 <UNASSIGNED>
-+<U0B2A>     /x81/x32/x86/x32 ORIYA LETTER PA
-+<U0B2B>     /x81/x32/x86/x33 ORIYA LETTER PHA
-+<U0B2C>     /x81/x32/x86/x34 ORIYA LETTER BA
-+<U0B2D>     /x81/x32/x86/x35 ORIYA LETTER BHA
-+<U0B2E>     /x81/x32/x86/x36 ORIYA LETTER MA
-+<U0B2F>     /x81/x32/x86/x37 ORIYA LETTER YA
-+<U0B30>     /x81/x32/x86/x38 ORIYA LETTER RA
-+<U0B31>     /x81/x32/x86/x39 <UNASSIGNED>
-+<U0B32>     /x81/x32/x87/x30 ORIYA LETTER LA
-+<U0B33>     /x81/x32/x87/x31 ORIYA LETTER LLA
-+<U0B34>     /x81/x32/x87/x32 <UNASSIGNED>
-+<U0B35>     /x81/x32/x87/x33 <UNASSIGNED>
-+<U0B36>     /x81/x32/x87/x34 ORIYA LETTER SHA
-+<U0B37>     /x81/x32/x87/x35 ORIYA LETTER SSA
-+<U0B38>     /x81/x32/x87/x36 ORIYA LETTER SA
-+<U0B39>     /x81/x32/x87/x37 ORIYA LETTER HA
-+<U0B3A>     /x81/x32/x87/x38 <UNASSIGNED>
-+<U0B3B>     /x81/x32/x87/x39 <UNASSIGNED>
-+<U0B3C>     /x81/x32/x88/x30 ORIYA SIGN NUKTA
-+<U0B3D>     /x81/x32/x88/x31 ORIYA SIGN AVAGRAHA
-+<U0B3E>     /x81/x32/x88/x32 ORIYA VOWEL SIGN AA
-+<U0B3F>     /x81/x32/x88/x33 ORIYA VOWEL SIGN I
-+<U0B40>     /x81/x32/x88/x34 ORIYA VOWEL SIGN II
-+<U0B41>     /x81/x32/x88/x35 ORIYA VOWEL SIGN U
-+<U0B42>     /x81/x32/x88/x36 ORIYA VOWEL SIGN UU
-+<U0B43>     /x81/x32/x88/x37 ORIYA VOWEL SIGN VOCALIC R
-+<U0B44>     /x81/x32/x88/x38 <UNASSIGNED>
-+<U0B45>     /x81/x32/x88/x39 <UNASSIGNED>
-+<U0B46>     /x81/x32/x89/x30 <UNASSIGNED>
-+<U0B47>     /x81/x32/x89/x31 ORIYA VOWEL SIGN E
-+<U0B48>     /x81/x32/x89/x32 ORIYA VOWEL SIGN AI
-+<U0B49>     /x81/x32/x89/x33 <UNASSIGNED>
-+<U0B4A>     /x81/x32/x89/x34 <UNASSIGNED>
-+<U0B4B>     /x81/x32/x89/x35 ORIYA VOWEL SIGN O
-+<U0B4C>     /x81/x32/x89/x36 ORIYA VOWEL SIGN AU
-+<U0B4D>     /x81/x32/x89/x37 ORIYA SIGN VIRAMA
-+<U0B4E>     /x81/x32/x89/x38 <UNASSIGNED>
-+<U0B4F>     /x81/x32/x89/x39 <UNASSIGNED>
-+<U0B50>     /x81/x32/x8a/x30 <UNASSIGNED>
-+<U0B51>     /x81/x32/x8a/x31 <UNASSIGNED>
-+<U0B52>     /x81/x32/x8a/x32 <UNASSIGNED>
-+<U0B53>     /x81/x32/x8a/x33 <UNASSIGNED>
-+<U0B54>     /x81/x32/x8a/x34 <UNASSIGNED>
-+<U0B55>     /x81/x32/x8a/x35 <UNASSIGNED>
-+<U0B56>     /x81/x32/x8a/x36 ORIYA AI LENGTH MARK
-+<U0B57>     /x81/x32/x8a/x37 ORIYA AU LENGTH MARK
-+<U0B58>     /x81/x32/x8a/x38 <UNASSIGNED>
-+<U0B59>     /x81/x32/x8a/x39 <UNASSIGNED>
-+<U0B5A>     /x81/x32/x8b/x30 <UNASSIGNED>
-+<U0B5B>     /x81/x32/x8b/x31 <UNASSIGNED>
-+<U0B5C>     /x81/x32/x8b/x32 ORIYA LETTER RRA
-+<U0B5D>     /x81/x32/x8b/x33 ORIYA LETTER RHA
-+<U0B5E>     /x81/x32/x8b/x34 <UNASSIGNED>
-+<U0B5F>     /x81/x32/x8b/x35 ORIYA LETTER YYA
-+<U0B60>     /x81/x32/x8b/x36 ORIYA LETTER VOCALIC RR
-+<U0B61>     /x81/x32/x8b/x37 ORIYA LETTER VOCALIC LL
-+<U0B62>     /x81/x32/x8b/x38 <UNASSIGNED>
-+<U0B63>     /x81/x32/x8b/x39 <UNASSIGNED>
-+<U0B64>     /x81/x32/x8c/x30 <UNASSIGNED>
-+<U0B65>     /x81/x32/x8c/x31 <UNASSIGNED>
-+<U0B66>     /x81/x32/x8c/x32 ORIYA DIGIT ZERO
-+<U0B67>     /x81/x32/x8c/x33 ORIYA DIGIT ONE
-+<U0B68>     /x81/x32/x8c/x34 ORIYA DIGIT TWO
-+<U0B69>     /x81/x32/x8c/x35 ORIYA DIGIT THREE
-+<U0B6A>     /x81/x32/x8c/x36 ORIYA DIGIT FOUR
-+<U0B6B>     /x81/x32/x8c/x37 ORIYA DIGIT FIVE
-+<U0B6C>     /x81/x32/x8c/x38 ORIYA DIGIT SIX
-+<U0B6D>     /x81/x32/x8c/x39 ORIYA DIGIT SEVEN
-+<U0B6E>     /x81/x32/x8d/x30 ORIYA DIGIT EIGHT
-+<U0B6F>     /x81/x32/x8d/x31 ORIYA DIGIT NINE
-+<U0B70>     /x81/x32/x8d/x32 ORIYA ISSHAR
-+<U0B71>     /x81/x32/x8d/x33 <UNASSIGNED>
-+<U0B72>     /x81/x32/x8d/x34 <UNASSIGNED>
-+<U0B73>     /x81/x32/x8d/x35 <UNASSIGNED>
-+<U0B74>     /x81/x32/x8d/x36 <UNASSIGNED>
-+<U0B75>     /x81/x32/x8d/x37 <UNASSIGNED>
-+<U0B76>     /x81/x32/x8d/x38 <UNASSIGNED>
-+<U0B77>     /x81/x32/x8d/x39 <UNASSIGNED>
-+<U0B78>     /x81/x32/x8e/x30 <UNASSIGNED>
-+<U0B79>     /x81/x32/x8e/x31 <UNASSIGNED>
-+<U0B7A>     /x81/x32/x8e/x32 <UNASSIGNED>
-+<U0B7B>     /x81/x32/x8e/x33 <UNASSIGNED>
-+<U0B7C>     /x81/x32/x8e/x34 <UNASSIGNED>
-+<U0B7D>     /x81/x32/x8e/x35 <UNASSIGNED>
-+<U0B7E>     /x81/x32/x8e/x36 <UNASSIGNED>
-+<U0B7F>     /x81/x32/x8e/x37 <UNASSIGNED>
-+<U0B80>     /x81/x32/x8e/x38 <UNASSIGNED>
-+<U0B81>     /x81/x32/x8e/x39 <UNASSIGNED>
-+<U0B82>     /x81/x32/x8f/x30 TAMIL SIGN ANUSVARA
-+<U0B83>     /x81/x32/x8f/x31 TAMIL SIGN VISARGA
-+<U0B84>     /x81/x32/x8f/x32 <UNASSIGNED>
-+<U0B85>     /x81/x32/x8f/x33 TAMIL LETTER A
-+<U0B86>     /x81/x32/x8f/x34 TAMIL LETTER AA
-+<U0B87>     /x81/x32/x8f/x35 TAMIL LETTER I
-+<U0B88>     /x81/x32/x8f/x36 TAMIL LETTER II
-+<U0B89>     /x81/x32/x8f/x37 TAMIL LETTER U
-+<U0B8A>     /x81/x32/x8f/x38 TAMIL LETTER UU
-+<U0B8B>     /x81/x32/x8f/x39 <UNASSIGNED>
-+<U0B8C>     /x81/x32/x90/x30 <UNASSIGNED>
-+<U0B8D>     /x81/x32/x90/x31 <UNASSIGNED>
-+<U0B8E>     /x81/x32/x90/x32 TAMIL LETTER E
-+<U0B8F>     /x81/x32/x90/x33 TAMIL LETTER EE
-+<U0B90>     /x81/x32/x90/x34 TAMIL LETTER AI
-+<U0B91>     /x81/x32/x90/x35 <UNASSIGNED>
-+<U0B92>     /x81/x32/x90/x36 TAMIL LETTER O
-+<U0B93>     /x81/x32/x90/x37 TAMIL LETTER OO
-+<U0B94>     /x81/x32/x90/x38 TAMIL LETTER AU
-+<U0B95>     /x81/x32/x90/x39 TAMIL LETTER KA
-+<U0B96>     /x81/x32/x91/x30 <UNASSIGNED>
-+<U0B97>     /x81/x32/x91/x31 <UNASSIGNED>
-+<U0B98>     /x81/x32/x91/x32 <UNASSIGNED>
-+<U0B99>     /x81/x32/x91/x33 TAMIL LETTER NGA
-+<U0B9A>     /x81/x32/x91/x34 TAMIL LETTER CA
-+<U0B9B>     /x81/x32/x91/x35 <UNASSIGNED>
-+<U0B9C>     /x81/x32/x91/x36 TAMIL LETTER JA
-+<U0B9D>     /x81/x32/x91/x37 <UNASSIGNED>
-+<U0B9E>     /x81/x32/x91/x38 TAMIL LETTER NYA
-+<U0B9F>     /x81/x32/x91/x39 TAMIL LETTER TTA
-+<U0BA0>     /x81/x32/x92/x30 <UNASSIGNED>
-+<U0BA1>     /x81/x32/x92/x31 <UNASSIGNED>
-+<U0BA2>     /x81/x32/x92/x32 <UNASSIGNED>
-+<U0BA3>     /x81/x32/x92/x33 TAMIL LETTER NNA
-+<U0BA4>     /x81/x32/x92/x34 TAMIL LETTER TA
-+<U0BA5>     /x81/x32/x92/x35 <UNASSIGNED>
-+<U0BA6>     /x81/x32/x92/x36 <UNASSIGNED>
-+<U0BA7>     /x81/x32/x92/x37 <UNASSIGNED>
-+<U0BA8>     /x81/x32/x92/x38 TAMIL LETTER NA
-+<U0BA9>     /x81/x32/x92/x39 TAMIL LETTER NNNA
-+<U0BAA>     /x81/x32/x93/x30 TAMIL LETTER PA
-+<U0BAB>     /x81/x32/x93/x31 <UNASSIGNED>
-+<U0BAC>     /x81/x32/x93/x32 <UNASSIGNED>
-+<U0BAD>     /x81/x32/x93/x33 <UNASSIGNED>
-+<U0BAE>     /x81/x32/x93/x34 TAMIL LETTER MA
-+<U0BAF>     /x81/x32/x93/x35 TAMIL LETTER YA
-+<U0BB0>     /x81/x32/x93/x36 TAMIL LETTER RA
-+<U0BB1>     /x81/x32/x93/x37 TAMIL LETTER RRA
-+<U0BB2>     /x81/x32/x93/x38 TAMIL LETTER LA
-+<U0BB3>     /x81/x32/x93/x39 TAMIL LETTER LLA
-+<U0BB4>     /x81/x32/x94/x30 TAMIL LETTER LLLA
-+<U0BB5>     /x81/x32/x94/x31 TAMIL LETTER VA
-+<U0BB6>     /x81/x32/x94/x32 <UNASSIGNED>
-+<U0BB7>     /x81/x32/x94/x33 TAMIL LETTER SSA
-+<U0BB8>     /x81/x32/x94/x34 TAMIL LETTER SA
-+<U0BB9>     /x81/x32/x94/x35 TAMIL LETTER HA
-+<U0BBA>     /x81/x32/x94/x36 <UNASSIGNED>
-+<U0BBB>     /x81/x32/x94/x37 <UNASSIGNED>
-+<U0BBC>     /x81/x32/x94/x38 <UNASSIGNED>
-+<U0BBD>     /x81/x32/x94/x39 <UNASSIGNED>
-+<U0BBE>     /x81/x32/x95/x30 TAMIL VOWEL SIGN AA
-+<U0BBF>     /x81/x32/x95/x31 TAMIL VOWEL SIGN I
-+<U0BC0>     /x81/x32/x95/x32 TAMIL VOWEL SIGN II
-+<U0BC1>     /x81/x32/x95/x33 TAMIL VOWEL SIGN U
-+<U0BC2>     /x81/x32/x95/x34 TAMIL VOWEL SIGN UU
-+<U0BC3>     /x81/x32/x95/x35 <UNASSIGNED>
-+<U0BC4>     /x81/x32/x95/x36 <UNASSIGNED>
-+<U0BC5>     /x81/x32/x95/x37 <UNASSIGNED>
-+<U0BC6>     /x81/x32/x95/x38 TAMIL VOWEL SIGN E
-+<U0BC7>     /x81/x32/x95/x39 TAMIL VOWEL SIGN EE
-+<U0BC8>     /x81/x32/x96/x30 TAMIL VOWEL SIGN AI
-+<U0BC9>     /x81/x32/x96/x31 <UNASSIGNED>
-+<U0BCA>     /x81/x32/x96/x32 TAMIL VOWEL SIGN O
-+<U0BCB>     /x81/x32/x96/x33 TAMIL VOWEL SIGN OO
-+<U0BCC>     /x81/x32/x96/x34 TAMIL VOWEL SIGN AU
-+<U0BCD>     /x81/x32/x96/x35 TAMIL SIGN VIRAMA
-+<U0BCE>     /x81/x32/x96/x36 <UNASSIGNED>
-+<U0BCF>     /x81/x32/x96/x37 <UNASSIGNED>
-+<U0BD0>     /x81/x32/x96/x38 <UNASSIGNED>
-+<U0BD1>     /x81/x32/x96/x39 <UNASSIGNED>
-+<U0BD2>     /x81/x32/x97/x30 <UNASSIGNED>
-+<U0BD3>     /x81/x32/x97/x31 <UNASSIGNED>
-+<U0BD4>     /x81/x32/x97/x32 <UNASSIGNED>
-+<U0BD5>     /x81/x32/x97/x33 <UNASSIGNED>
-+<U0BD6>     /x81/x32/x97/x34 <UNASSIGNED>
-+<U0BD7>     /x81/x32/x97/x35 TAMIL AU LENGTH MARK
-+<U0BD8>     /x81/x32/x97/x36 <UNASSIGNED>
-+<U0BD9>     /x81/x32/x97/x37 <UNASSIGNED>
-+<U0BDA>     /x81/x32/x97/x38 <UNASSIGNED>
-+<U0BDB>     /x81/x32/x97/x39 <UNASSIGNED>
-+<U0BDC>     /x81/x32/x98/x30 <UNASSIGNED>
-+<U0BDD>     /x81/x32/x98/x31 <UNASSIGNED>
-+<U0BDE>     /x81/x32/x98/x32 <UNASSIGNED>
-+<U0BDF>     /x81/x32/x98/x33 <UNASSIGNED>
-+<U0BE0>     /x81/x32/x98/x34 <UNASSIGNED>
-+<U0BE1>     /x81/x32/x98/x35 <UNASSIGNED>
-+<U0BE2>     /x81/x32/x98/x36 <UNASSIGNED>
-+<U0BE3>     /x81/x32/x98/x37 <UNASSIGNED>
-+<U0BE4>     /x81/x32/x98/x38 <UNASSIGNED>
-+<U0BE5>     /x81/x32/x98/x39 <UNASSIGNED>
-+<U0BE6>     /x81/x32/x99/x30 <UNASSIGNED>
-+<U0BE7>     /x81/x32/x99/x31 TAMIL DIGIT ONE
-+<U0BE8>     /x81/x32/x99/x32 TAMIL DIGIT TWO
-+<U0BE9>     /x81/x32/x99/x33 TAMIL DIGIT THREE
-+<U0BEA>     /x81/x32/x99/x34 TAMIL DIGIT FOUR
-+<U0BEB>     /x81/x32/x99/x35 TAMIL DIGIT FIVE
-+<U0BEC>     /x81/x32/x99/x36 TAMIL DIGIT SIX
-+<U0BED>     /x81/x32/x99/x37 TAMIL DIGIT SEVEN
-+<U0BEE>     /x81/x32/x99/x38 TAMIL DIGIT EIGHT
-+<U0BEF>     /x81/x32/x99/x39 TAMIL DIGIT NINE
-+<U0BF0>     /x81/x32/x9a/x30 TAMIL NUMBER TEN
-+<U0BF1>     /x81/x32/x9a/x31 TAMIL NUMBER ONE HUNDRED
-+<U0BF2>     /x81/x32/x9a/x32 TAMIL NUMBER ONE THOUSAND
-+<U0BF3>     /x81/x32/x9a/x33 <UNASSIGNED>
-+<U0BF4>     /x81/x32/x9a/x34 <UNASSIGNED>
-+<U0BF5>     /x81/x32/x9a/x35 <UNASSIGNED>
-+<U0BF6>     /x81/x32/x9a/x36 <UNASSIGNED>
-+<U0BF7>     /x81/x32/x9a/x37 <UNASSIGNED>
-+<U0BF8>     /x81/x32/x9a/x38 <UNASSIGNED>
-+<U0BF9>     /x81/x32/x9a/x39 <UNASSIGNED>
-+<U0BFA>     /x81/x32/x9b/x30 <UNASSIGNED>
-+<U0BFB>     /x81/x32/x9b/x31 <UNASSIGNED>
-+<U0BFC>     /x81/x32/x9b/x32 <UNASSIGNED>
-+<U0BFD>     /x81/x32/x9b/x33 <UNASSIGNED>
-+<U0BFE>     /x81/x32/x9b/x34 <UNASSIGNED>
-+<U0BFF>     /x81/x32/x9b/x35 <UNASSIGNED>
-+<U0C00>     /x81/x32/x9b/x36 <UNASSIGNED>
-+<U0C01>     /x81/x32/x9b/x37 TELUGU SIGN CANDRABINDU
-+<U0C02>     /x81/x32/x9b/x38 TELUGU SIGN ANUSVARA
-+<U0C03>     /x81/x32/x9b/x39 TELUGU SIGN VISARGA
-+<U0C04>     /x81/x32/x9c/x30 <UNASSIGNED>
-+<U0C05>     /x81/x32/x9c/x31 TELUGU LETTER A
-+<U0C06>     /x81/x32/x9c/x32 TELUGU LETTER AA
-+<U0C07>     /x81/x32/x9c/x33 TELUGU LETTER I
-+<U0C08>     /x81/x32/x9c/x34 TELUGU LETTER II
-+<U0C09>     /x81/x32/x9c/x35 TELUGU LETTER U
-+<U0C0A>     /x81/x32/x9c/x36 TELUGU LETTER UU
-+<U0C0B>     /x81/x32/x9c/x37 TELUGU LETTER VOCALIC R
-+<U0C0C>     /x81/x32/x9c/x38 TELUGU LETTER VOCALIC L
-+<U0C0D>     /x81/x32/x9c/x39 <UNASSIGNED>
-+<U0C0E>     /x81/x32/x9d/x30 TELUGU LETTER E
-+<U0C0F>     /x81/x32/x9d/x31 TELUGU LETTER EE
-+<U0C10>     /x81/x32/x9d/x32 TELUGU LETTER AI
-+<U0C11>     /x81/x32/x9d/x33 <UNASSIGNED>
-+<U0C12>     /x81/x32/x9d/x34 TELUGU LETTER O
-+<U0C13>     /x81/x32/x9d/x35 TELUGU LETTER OO
-+<U0C14>     /x81/x32/x9d/x36 TELUGU LETTER AU
-+<U0C15>     /x81/x32/x9d/x37 TELUGU LETTER KA
-+<U0C16>     /x81/x32/x9d/x38 TELUGU LETTER KHA
-+<U0C17>     /x81/x32/x9d/x39 TELUGU LETTER GA
-+<U0C18>     /x81/x32/x9e/x30 TELUGU LETTER GHA
-+<U0C19>     /x81/x32/x9e/x31 TELUGU LETTER NGA
-+<U0C1A>     /x81/x32/x9e/x32 TELUGU LETTER CA
-+<U0C1B>     /x81/x32/x9e/x33 TELUGU LETTER CHA
-+<U0C1C>     /x81/x32/x9e/x34 TELUGU LETTER JA
-+<U0C1D>     /x81/x32/x9e/x35 TELUGU LETTER JHA
-+<U0C1E>     /x81/x32/x9e/x36 TELUGU LETTER NYA
-+<U0C1F>     /x81/x32/x9e/x37 TELUGU LETTER TTA
-+<U0C20>     /x81/x32/x9e/x38 TELUGU LETTER TTHA
-+<U0C21>     /x81/x32/x9e/x39 TELUGU LETTER DDA
-+<U0C22>     /x81/x32/x9f/x30 TELUGU LETTER DDHA
-+<U0C23>     /x81/x32/x9f/x31 TELUGU LETTER NNA
-+<U0C24>     /x81/x32/x9f/x32 TELUGU LETTER TA
-+<U0C25>     /x81/x32/x9f/x33 TELUGU LETTER THA
-+<U0C26>     /x81/x32/x9f/x34 TELUGU LETTER DA
-+<U0C27>     /x81/x32/x9f/x35 TELUGU LETTER DHA
-+<U0C28>     /x81/x32/x9f/x36 TELUGU LETTER NA
-+<U0C29>     /x81/x32/x9f/x37 <UNASSIGNED>
-+<U0C2A>     /x81/x32/x9f/x38 TELUGU LETTER PA
-+<U0C2B>     /x81/x32/x9f/x39 TELUGU LETTER PHA
-+<U0C2C>     /x81/x32/xa0/x30 TELUGU LETTER BA
-+<U0C2D>     /x81/x32/xa0/x31 TELUGU LETTER BHA
-+<U0C2E>     /x81/x32/xa0/x32 TELUGU LETTER MA
-+<U0C2F>     /x81/x32/xa0/x33 TELUGU LETTER YA
-+<U0C30>     /x81/x32/xa0/x34 TELUGU LETTER RA
-+<U0C31>     /x81/x32/xa0/x35 TELUGU LETTER RRA
-+<U0C32>     /x81/x32/xa0/x36 TELUGU LETTER LA
-+<U0C33>     /x81/x32/xa0/x37 TELUGU LETTER LLA
-+<U0C34>     /x81/x32/xa0/x38 <UNASSIGNED>
-+<U0C35>     /x81/x32/xa0/x39 TELUGU LETTER VA
-+<U0C36>     /x81/x32/xa1/x30 TELUGU LETTER SHA
-+<U0C37>     /x81/x32/xa1/x31 TELUGU LETTER SSA
-+<U0C38>     /x81/x32/xa1/x32 TELUGU LETTER SA
-+<U0C39>     /x81/x32/xa1/x33 TELUGU LETTER HA
-+<U0C3A>     /x81/x32/xa1/x34 <UNASSIGNED>
-+<U0C3B>     /x81/x32/xa1/x35 <UNASSIGNED>
-+<U0C3C>     /x81/x32/xa1/x36 <UNASSIGNED>
-+<U0C3D>     /x81/x32/xa1/x37 <UNASSIGNED>
-+<U0C3E>     /x81/x32/xa1/x38 TELUGU VOWEL SIGN AA
-+<U0C3F>     /x81/x32/xa1/x39 TELUGU VOWEL SIGN I
-+<U0C40>     /x81/x32/xa2/x30 TELUGU VOWEL SIGN II
-+<U0C41>     /x81/x32/xa2/x31 TELUGU VOWEL SIGN U
-+<U0C42>     /x81/x32/xa2/x32 TELUGU VOWEL SIGN UU
-+<U0C43>     /x81/x32/xa2/x33 TELUGU VOWEL SIGN VOCALIC R
-+<U0C44>     /x81/x32/xa2/x34 TELUGU VOWEL SIGN VOCALIC RR
-+<U0C45>     /x81/x32/xa2/x35 <UNASSIGNED>
-+<U0C46>     /x81/x32/xa2/x36 TELUGU VOWEL SIGN E
-+<U0C47>     /x81/x32/xa2/x37 TELUGU VOWEL SIGN EE
-+<U0C48>     /x81/x32/xa2/x38 TELUGU VOWEL SIGN AI
-+<U0C49>     /x81/x32/xa2/x39 <UNASSIGNED>
-+<U0C4A>     /x81/x32/xa3/x30 TELUGU VOWEL SIGN O
-+<U0C4B>     /x81/x32/xa3/x31 TELUGU VOWEL SIGN OO
-+<U0C4C>     /x81/x32/xa3/x32 TELUGU VOWEL SIGN AU
-+<U0C4D>     /x81/x32/xa3/x33 TELUGU SIGN VIRAMA
-+<U0C4E>     /x81/x32/xa3/x34 <UNASSIGNED>
-+<U0C4F>     /x81/x32/xa3/x35 <UNASSIGNED>
-+<U0C50>     /x81/x32/xa3/x36 <UNASSIGNED>
-+<U0C51>     /x81/x32/xa3/x37 <UNASSIGNED>
-+<U0C52>     /x81/x32/xa3/x38 <UNASSIGNED>
-+<U0C53>     /x81/x32/xa3/x39 <UNASSIGNED>
-+<U0C54>     /x81/x32/xa4/x30 <UNASSIGNED>
-+<U0C55>     /x81/x32/xa4/x31 TELUGU LENGTH MARK
-+<U0C56>     /x81/x32/xa4/x32 TELUGU AI LENGTH MARK
-+<U0C57>     /x81/x32/xa4/x33 <UNASSIGNED>
-+<U0C58>     /x81/x32/xa4/x34 <UNASSIGNED>
-+<U0C59>     /x81/x32/xa4/x35 <UNASSIGNED>
-+<U0C5A>     /x81/x32/xa4/x36 <UNASSIGNED>
-+<U0C5B>     /x81/x32/xa4/x37 <UNASSIGNED>
-+<U0C5C>     /x81/x32/xa4/x38 <UNASSIGNED>
-+<U0C5D>     /x81/x32/xa4/x39 <UNASSIGNED>
-+<U0C5E>     /x81/x32/xa5/x30 <UNASSIGNED>
-+<U0C5F>     /x81/x32/xa5/x31 <UNASSIGNED>
-+<U0C60>     /x81/x32/xa5/x32 TELUGU LETTER VOCALIC RR
-+<U0C61>     /x81/x32/xa5/x33 TELUGU LETTER VOCALIC LL
-+<U0C62>     /x81/x32/xa5/x34 <UNASSIGNED>
-+<U0C63>     /x81/x32/xa5/x35 <UNASSIGNED>
-+<U0C64>     /x81/x32/xa5/x36 <UNASSIGNED>
-+<U0C65>     /x81/x32/xa5/x37 <UNASSIGNED>
-+<U0C66>     /x81/x32/xa5/x38 TELUGU DIGIT ZERO
-+<U0C67>     /x81/x32/xa5/x39 TELUGU DIGIT ONE
-+<U0C68>     /x81/x32/xa6/x30 TELUGU DIGIT TWO
-+<U0C69>     /x81/x32/xa6/x31 TELUGU DIGIT THREE
-+<U0C6A>     /x81/x32/xa6/x32 TELUGU DIGIT FOUR
-+<U0C6B>     /x81/x32/xa6/x33 TELUGU DIGIT FIVE
-+<U0C6C>     /x81/x32/xa6/x34 TELUGU DIGIT SIX
-+<U0C6D>     /x81/x32/xa6/x35 TELUGU DIGIT SEVEN
-+<U0C6E>     /x81/x32/xa6/x36 TELUGU DIGIT EIGHT
-+<U0C6F>     /x81/x32/xa6/x37 TELUGU DIGIT NINE
-+<U0C70>     /x81/x32/xa6/x38 <UNASSIGNED>
-+<U0C71>     /x81/x32/xa6/x39 <UNASSIGNED>
-+<U0C72>     /x81/x32/xa7/x30 <UNASSIGNED>
-+<U0C73>     /x81/x32/xa7/x31 <UNASSIGNED>
-+<U0C74>     /x81/x32/xa7/x32 <UNASSIGNED>
-+<U0C75>     /x81/x32/xa7/x33 <UNASSIGNED>
-+<U0C76>     /x81/x32/xa7/x34 <UNASSIGNED>
-+<U0C77>     /x81/x32/xa7/x35 <UNASSIGNED>
-+<U0C78>     /x81/x32/xa7/x36 <UNASSIGNED>
-+<U0C79>     /x81/x32/xa7/x37 <UNASSIGNED>
-+<U0C7A>     /x81/x32/xa7/x38 <UNASSIGNED>
-+<U0C7B>     /x81/x32/xa7/x39 <UNASSIGNED>
-+<U0C7C>     /x81/x32/xa8/x30 <UNASSIGNED>
-+<U0C7D>     /x81/x32/xa8/x31 <UNASSIGNED>
-+<U0C7E>     /x81/x32/xa8/x32 <UNASSIGNED>
-+<U0C7F>     /x81/x32/xa8/x33 <UNASSIGNED>
-+<U0C80>     /x81/x32/xa8/x34 <UNASSIGNED>
-+<U0C81>     /x81/x32/xa8/x35 <UNASSIGNED>
-+<U0C82>     /x81/x32/xa8/x36 KANNADA SIGN ANUSVARA
-+<U0C83>     /x81/x32/xa8/x37 KANNADA SIGN VISARGA
-+<U0C84>     /x81/x32/xa8/x38 <UNASSIGNED>
-+<U0C85>     /x81/x32/xa8/x39 KANNADA LETTER A
-+<U0C86>     /x81/x32/xa9/x30 KANNADA LETTER AA
-+<U0C87>     /x81/x32/xa9/x31 KANNADA LETTER I
-+<U0C88>     /x81/x32/xa9/x32 KANNADA LETTER II
-+<U0C89>     /x81/x32/xa9/x33 KANNADA LETTER U
-+<U0C8A>     /x81/x32/xa9/x34 KANNADA LETTER UU
-+<U0C8B>     /x81/x32/xa9/x35 KANNADA LETTER VOCALIC R
-+<U0C8C>     /x81/x32/xa9/x36 KANNADA LETTER VOCALIC L
-+<U0C8D>     /x81/x32/xa9/x37 <UNASSIGNED>
-+<U0C8E>     /x81/x32/xa9/x38 KANNADA LETTER E
-+<U0C8F>     /x81/x32/xa9/x39 KANNADA LETTER EE
-+<U0C90>     /x81/x32/xaa/x30 KANNADA LETTER AI
-+<U0C91>     /x81/x32/xaa/x31 <UNASSIGNED>
-+<U0C92>     /x81/x32/xaa/x32 KANNADA LETTER O
-+<U0C93>     /x81/x32/xaa/x33 KANNADA LETTER OO
-+<U0C94>     /x81/x32/xaa/x34 KANNADA LETTER AU
-+<U0C95>     /x81/x32/xaa/x35 KANNADA LETTER KA
-+<U0C96>     /x81/x32/xaa/x36 KANNADA LETTER KHA
-+<U0C97>     /x81/x32/xaa/x37 KANNADA LETTER GA
-+<U0C98>     /x81/x32/xaa/x38 KANNADA LETTER GHA
-+<U0C99>     /x81/x32/xaa/x39 KANNADA LETTER NGA
-+<U0C9A>     /x81/x32/xab/x30 KANNADA LETTER CA
-+<U0C9B>     /x81/x32/xab/x31 KANNADA LETTER CHA
-+<U0C9C>     /x81/x32/xab/x32 KANNADA LETTER JA
-+<U0C9D>     /x81/x32/xab/x33 KANNADA LETTER JHA
-+<U0C9E>     /x81/x32/xab/x34 KANNADA LETTER NYA
-+<U0C9F>     /x81/x32/xab/x35 KANNADA LETTER TTA
-+<U0CA0>     /x81/x32/xab/x36 KANNADA LETTER TTHA
-+<U0CA1>     /x81/x32/xab/x37 KANNADA LETTER DDA
-+<U0CA2>     /x81/x32/xab/x38 KANNADA LETTER DDHA
-+<U0CA3>     /x81/x32/xab/x39 KANNADA LETTER NNA
-+<U0CA4>     /x81/x32/xac/x30 KANNADA LETTER TA
-+<U0CA5>     /x81/x32/xac/x31 KANNADA LETTER THA
-+<U0CA6>     /x81/x32/xac/x32 KANNADA LETTER DA
-+<U0CA7>     /x81/x32/xac/x33 KANNADA LETTER DHA
-+<U0CA8>     /x81/x32/xac/x34 KANNADA LETTER NA
-+<U0CA9>     /x81/x32/xac/x35 <UNASSIGNED>
-+<U0CAA>     /x81/x32/xac/x36 KANNADA LETTER PA
-+<U0CAB>     /x81/x32/xac/x37 KANNADA LETTER PHA
-+<U0CAC>     /x81/x32/xac/x38 KANNADA LETTER BA
-+<U0CAD>     /x81/x32/xac/x39 KANNADA LETTER BHA
-+<U0CAE>     /x81/x32/xad/x30 KANNADA LETTER MA
-+<U0CAF>     /x81/x32/xad/x31 KANNADA LETTER YA
-+<U0CB0>     /x81/x32/xad/x32 KANNADA LETTER RA
-+<U0CB1>     /x81/x32/xad/x33 KANNADA LETTER RRA
-+<U0CB2>     /x81/x32/xad/x34 KANNADA LETTER LA
-+<U0CB3>     /x81/x32/xad/x35 KANNADA LETTER LLA
-+<U0CB4>     /x81/x32/xad/x36 <UNASSIGNED>
-+<U0CB5>     /x81/x32/xad/x37 KANNADA LETTER VA
-+<U0CB6>     /x81/x32/xad/x38 KANNADA LETTER SHA
-+<U0CB7>     /x81/x32/xad/x39 KANNADA LETTER SSA
-+<U0CB8>     /x81/x32/xae/x30 KANNADA LETTER SA
-+<U0CB9>     /x81/x32/xae/x31 KANNADA LETTER HA
-+<U0CBA>     /x81/x32/xae/x32 <UNASSIGNED>
-+<U0CBB>     /x81/x32/xae/x33 <UNASSIGNED>
-+<U0CBC>     /x81/x32/xae/x34 <UNASSIGNED>
-+<U0CBD>     /x81/x32/xae/x35 <UNASSIGNED>
-+<U0CBE>     /x81/x32/xae/x36 KANNADA VOWEL SIGN AA
-+<U0CBF>     /x81/x32/xae/x37 KANNADA VOWEL SIGN I
-+<U0CC0>     /x81/x32/xae/x38 KANNADA VOWEL SIGN II
-+<U0CC1>     /x81/x32/xae/x39 KANNADA VOWEL SIGN U
-+<U0CC2>     /x81/x32/xaf/x30 KANNADA VOWEL SIGN UU
-+<U0CC3>     /x81/x32/xaf/x31 KANNADA VOWEL SIGN VOCALIC R
-+<U0CC4>     /x81/x32/xaf/x32 KANNADA VOWEL SIGN VOCALIC RR
-+<U0CC5>     /x81/x32/xaf/x33 <UNASSIGNED>
-+<U0CC6>     /x81/x32/xaf/x34 KANNADA VOWEL SIGN E
-+<U0CC7>     /x81/x32/xaf/x35 KANNADA VOWEL SIGN EE
-+<U0CC8>     /x81/x32/xaf/x36 KANNADA VOWEL SIGN AI
-+<U0CC9>     /x81/x32/xaf/x37 <UNASSIGNED>
-+<U0CCA>     /x81/x32/xaf/x38 KANNADA VOWEL SIGN O
-+<U0CCB>     /x81/x32/xaf/x39 KANNADA VOWEL SIGN OO
-+<U0CCC>     /x81/x32/xb0/x30 KANNADA VOWEL SIGN AU
-+<U0CCD>     /x81/x32/xb0/x31 KANNADA SIGN VIRAMA
-+<U0CCE>     /x81/x32/xb0/x32 <UNASSIGNED>
-+<U0CCF>     /x81/x32/xb0/x33 <UNASSIGNED>
-+<U0CD0>     /x81/x32/xb0/x34 <UNASSIGNED>
-+<U0CD1>     /x81/x32/xb0/x35 <UNASSIGNED>
-+<U0CD2>     /x81/x32/xb0/x36 <UNASSIGNED>
-+<U0CD3>     /x81/x32/xb0/x37 <UNASSIGNED>
-+<U0CD4>     /x81/x32/xb0/x38 <UNASSIGNED>
-+<U0CD5>     /x81/x32/xb0/x39 KANNADA LENGTH MARK
-+<U0CD6>     /x81/x32/xb1/x30 KANNADA AI LENGTH MARK
-+<U0CD7>     /x81/x32/xb1/x31 <UNASSIGNED>
-+<U0CD8>     /x81/x32/xb1/x32 <UNASSIGNED>
-+<U0CD9>     /x81/x32/xb1/x33 <UNASSIGNED>
-+<U0CDA>     /x81/x32/xb1/x34 <UNASSIGNED>
-+<U0CDB>     /x81/x32/xb1/x35 <UNASSIGNED>
-+<U0CDC>     /x81/x32/xb1/x36 <UNASSIGNED>
-+<U0CDD>     /x81/x32/xb1/x37 <UNASSIGNED>
-+<U0CDE>     /x81/x32/xb1/x38 KANNADA LETTER FA
-+<U0CDF>     /x81/x32/xb1/x39 <UNASSIGNED>
-+<U0CE0>     /x81/x32/xb2/x30 KANNADA LETTER VOCALIC RR
-+<U0CE1>     /x81/x32/xb2/x31 KANNADA LETTER VOCALIC LL
-+<U0CE2>     /x81/x32/xb2/x32 <UNASSIGNED>
-+<U0CE3>     /x81/x32/xb2/x33 <UNASSIGNED>
-+<U0CE4>     /x81/x32/xb2/x34 <UNASSIGNED>
-+<U0CE5>     /x81/x32/xb2/x35 <UNASSIGNED>
-+<U0CE6>     /x81/x32/xb2/x36 KANNADA DIGIT ZERO
-+<U0CE7>     /x81/x32/xb2/x37 KANNADA DIGIT ONE
-+<U0CE8>     /x81/x32/xb2/x38 KANNADA DIGIT TWO
-+<U0CE9>     /x81/x32/xb2/x39 KANNADA DIGIT THREE
-+<U0CEA>     /x81/x32/xb3/x30 KANNADA DIGIT FOUR
-+<U0CEB>     /x81/x32/xb3/x31 KANNADA DIGIT FIVE
-+<U0CEC>     /x81/x32/xb3/x32 KANNADA DIGIT SIX
-+<U0CED>     /x81/x32/xb3/x33 KANNADA DIGIT SEVEN
-+<U0CEE>     /x81/x32/xb3/x34 KANNADA DIGIT EIGHT
-+<U0CEF>     /x81/x32/xb3/x35 KANNADA DIGIT NINE
-+<U0CF0>     /x81/x32/xb3/x36 <UNASSIGNED>
-+<U0CF1>     /x81/x32/xb3/x37 <UNASSIGNED>
-+<U0CF2>     /x81/x32/xb3/x38 <UNASSIGNED>
-+<U0CF3>     /x81/x32/xb3/x39 <UNASSIGNED>
-+<U0CF4>     /x81/x32/xb4/x30 <UNASSIGNED>
-+<U0CF5>     /x81/x32/xb4/x31 <UNASSIGNED>
-+<U0CF6>     /x81/x32/xb4/x32 <UNASSIGNED>
-+<U0CF7>     /x81/x32/xb4/x33 <UNASSIGNED>
-+<U0CF8>     /x81/x32/xb4/x34 <UNASSIGNED>
-+<U0CF9>     /x81/x32/xb4/x35 <UNASSIGNED>
-+<U0CFA>     /x81/x32/xb4/x36 <UNASSIGNED>
-+<U0CFB>     /x81/x32/xb4/x37 <UNASSIGNED>
-+<U0CFC>     /x81/x32/xb4/x38 <UNASSIGNED>
-+<U0CFD>     /x81/x32/xb4/x39 <UNASSIGNED>
-+<U0CFE>     /x81/x32/xb5/x30 <UNASSIGNED>
-+<U0CFF>     /x81/x32/xb5/x31 <UNASSIGNED>
-+<U0D00>     /x81/x32/xb5/x32 <UNASSIGNED>
-+<U0D01>     /x81/x32/xb5/x33 <UNASSIGNED>
-+<U0D02>     /x81/x32/xb5/x34 MALAYALAM SIGN ANUSVARA
-+<U0D03>     /x81/x32/xb5/x35 MALAYALAM SIGN VISARGA
-+<U0D04>     /x81/x32/xb5/x36 <UNASSIGNED>
-+<U0D05>     /x81/x32/xb5/x37 MALAYALAM LETTER A
-+<U0D06>     /x81/x32/xb5/x38 MALAYALAM LETTER AA
-+<U0D07>     /x81/x32/xb5/x39 MALAYALAM LETTER I
-+<U0D08>     /x81/x32/xb6/x30 MALAYALAM LETTER II
-+<U0D09>     /x81/x32/xb6/x31 MALAYALAM LETTER U
-+<U0D0A>     /x81/x32/xb6/x32 MALAYALAM LETTER UU
-+<U0D0B>     /x81/x32/xb6/x33 MALAYALAM LETTER VOCALIC R
-+<U0D0C>     /x81/x32/xb6/x34 MALAYALAM LETTER VOCALIC L
-+<U0D0D>     /x81/x32/xb6/x35 <UNASSIGNED>
-+<U0D0E>     /x81/x32/xb6/x36 MALAYALAM LETTER E
-+<U0D0F>     /x81/x32/xb6/x37 MALAYALAM LETTER EE
-+<U0D10>     /x81/x32/xb6/x38 MALAYALAM LETTER AI
-+<U0D11>     /x81/x32/xb6/x39 <UNASSIGNED>
-+<U0D12>     /x81/x32/xb7/x30 MALAYALAM LETTER O
-+<U0D13>     /x81/x32/xb7/x31 MALAYALAM LETTER OO
-+<U0D14>     /x81/x32/xb7/x32 MALAYALAM LETTER AU
-+<U0D15>     /x81/x32/xb7/x33 MALAYALAM LETTER KA
-+<U0D16>     /x81/x32/xb7/x34 MALAYALAM LETTER KHA
-+<U0D17>     /x81/x32/xb7/x35 MALAYALAM LETTER GA
-+<U0D18>     /x81/x32/xb7/x36 MALAYALAM LETTER GHA
-+<U0D19>     /x81/x32/xb7/x37 MALAYALAM LETTER NGA
-+<U0D1A>     /x81/x32/xb7/x38 MALAYALAM LETTER CA
-+<U0D1B>     /x81/x32/xb7/x39 MALAYALAM LETTER CHA
-+<U0D1C>     /x81/x32/xb8/x30 MALAYALAM LETTER JA
-+<U0D1D>     /x81/x32/xb8/x31 MALAYALAM LETTER JHA
-+<U0D1E>     /x81/x32/xb8/x32 MALAYALAM LETTER NYA
-+<U0D1F>     /x81/x32/xb8/x33 MALAYALAM LETTER TTA
-+<U0D20>     /x81/x32/xb8/x34 MALAYALAM LETTER TTHA
-+<U0D21>     /x81/x32/xb8/x35 MALAYALAM LETTER DDA
-+<U0D22>     /x81/x32/xb8/x36 MALAYALAM LETTER DDHA
-+<U0D23>     /x81/x32/xb8/x37 MALAYALAM LETTER NNA
-+<U0D24>     /x81/x32/xb8/x38 MALAYALAM LETTER TA
-+<U0D25>     /x81/x32/xb8/x39 MALAYALAM LETTER THA
-+<U0D26>     /x81/x32/xb9/x30 MALAYALAM LETTER DA
-+<U0D27>     /x81/x32/xb9/x31 MALAYALAM LETTER DHA
-+<U0D28>     /x81/x32/xb9/x32 MALAYALAM LETTER NA
-+<U0D29>     /x81/x32/xb9/x33 <UNASSIGNED>
-+<U0D2A>     /x81/x32/xb9/x34 MALAYALAM LETTER PA
-+<U0D2B>     /x81/x32/xb9/x35 MALAYALAM LETTER PHA
-+<U0D2C>     /x81/x32/xb9/x36 MALAYALAM LETTER BA
-+<U0D2D>     /x81/x32/xb9/x37 MALAYALAM LETTER BHA
-+<U0D2E>     /x81/x32/xb9/x38 MALAYALAM LETTER MA
-+<U0D2F>     /x81/x32/xb9/x39 MALAYALAM LETTER YA
-+<U0D30>     /x81/x32/xba/x30 MALAYALAM LETTER RA
-+<U0D31>     /x81/x32/xba/x31 MALAYALAM LETTER RRA
-+<U0D32>     /x81/x32/xba/x32 MALAYALAM LETTER LA
-+<U0D33>     /x81/x32/xba/x33 MALAYALAM LETTER LLA
-+<U0D34>     /x81/x32/xba/x34 MALAYALAM LETTER LLLA
-+<U0D35>     /x81/x32/xba/x35 MALAYALAM LETTER VA
-+<U0D36>     /x81/x32/xba/x36 MALAYALAM LETTER SHA
-+<U0D37>     /x81/x32/xba/x37 MALAYALAM LETTER SSA
-+<U0D38>     /x81/x32/xba/x38 MALAYALAM LETTER SA
-+<U0D39>     /x81/x32/xba/x39 MALAYALAM LETTER HA
-+<U0D3A>     /x81/x32/xbb/x30 <UNASSIGNED>
-+<U0D3B>     /x81/x32/xbb/x31 <UNASSIGNED>
-+<U0D3C>     /x81/x32/xbb/x32 <UNASSIGNED>
-+<U0D3D>     /x81/x32/xbb/x33 <UNASSIGNED>
-+<U0D3E>     /x81/x32/xbb/x34 MALAYALAM VOWEL SIGN AA
-+<U0D3F>     /x81/x32/xbb/x35 MALAYALAM VOWEL SIGN I
-+<U0D40>     /x81/x32/xbb/x36 MALAYALAM VOWEL SIGN II
-+<U0D41>     /x81/x32/xbb/x37 MALAYALAM VOWEL SIGN U
-+<U0D42>     /x81/x32/xbb/x38 MALAYALAM VOWEL SIGN UU
-+<U0D43>     /x81/x32/xbb/x39 MALAYALAM VOWEL SIGN VOCALIC R
-+<U0D44>     /x81/x32/xbc/x30 <UNASSIGNED>
-+<U0D45>     /x81/x32/xbc/x31 <UNASSIGNED>
-+<U0D46>     /x81/x32/xbc/x32 MALAYALAM VOWEL SIGN E
-+<U0D47>     /x81/x32/xbc/x33 MALAYALAM VOWEL SIGN EE
-+<U0D48>     /x81/x32/xbc/x34 MALAYALAM VOWEL SIGN AI
-+<U0D49>     /x81/x32/xbc/x35 <UNASSIGNED>
-+<U0D4A>     /x81/x32/xbc/x36 MALAYALAM VOWEL SIGN O
-+<U0D4B>     /x81/x32/xbc/x37 MALAYALAM VOWEL SIGN OO
-+<U0D4C>     /x81/x32/xbc/x38 MALAYALAM VOWEL SIGN AU
-+<U0D4D>     /x81/x32/xbc/x39 MALAYALAM SIGN VIRAMA
-+<U0D4E>     /x81/x32/xbd/x30 <UNASSIGNED>
-+<U0D4F>     /x81/x32/xbd/x31 <UNASSIGNED>
-+<U0D50>     /x81/x32/xbd/x32 <UNASSIGNED>
-+<U0D51>     /x81/x32/xbd/x33 <UNASSIGNED>
-+<U0D52>     /x81/x32/xbd/x34 <UNASSIGNED>
-+<U0D53>     /x81/x32/xbd/x35 <UNASSIGNED>
-+<U0D54>     /x81/x32/xbd/x36 <UNASSIGNED>
-+<U0D55>     /x81/x32/xbd/x37 <UNASSIGNED>
-+<U0D56>     /x81/x32/xbd/x38 <UNASSIGNED>
-+<U0D57>     /x81/x32/xbd/x39 MALAYALAM AU LENGTH MARK
-+<U0D58>     /x81/x32/xbe/x30 <UNASSIGNED>
-+<U0D59>     /x81/x32/xbe/x31 <UNASSIGNED>
-+<U0D5A>     /x81/x32/xbe/x32 <UNASSIGNED>
-+<U0D5B>     /x81/x32/xbe/x33 <UNASSIGNED>
-+<U0D5C>     /x81/x32/xbe/x34 <UNASSIGNED>
-+<U0D5D>     /x81/x32/xbe/x35 <UNASSIGNED>
-+<U0D5E>     /x81/x32/xbe/x36 <UNASSIGNED>
-+<U0D5F>     /x81/x32/xbe/x37 <UNASSIGNED>
-+<U0D60>     /x81/x32/xbe/x38 MALAYALAM LETTER VOCALIC RR
-+<U0D61>     /x81/x32/xbe/x39 MALAYALAM LETTER VOCALIC LL
-+<U0D62>     /x81/x32/xbf/x30 <UNASSIGNED>
-+<U0D63>     /x81/x32/xbf/x31 <UNASSIGNED>
-+<U0D64>     /x81/x32/xbf/x32 <UNASSIGNED>
-+<U0D65>     /x81/x32/xbf/x33 <UNASSIGNED>
-+<U0D66>     /x81/x32/xbf/x34 MALAYALAM DIGIT ZERO
-+<U0D67>     /x81/x32/xbf/x35 MALAYALAM DIGIT ONE
-+<U0D68>     /x81/x32/xbf/x36 MALAYALAM DIGIT TWO
-+<U0D69>     /x81/x32/xbf/x37 MALAYALAM DIGIT THREE
-+<U0D6A>     /x81/x32/xbf/x38 MALAYALAM DIGIT FOUR
-+<U0D6B>     /x81/x32/xbf/x39 MALAYALAM DIGIT FIVE
-+<U0D6C>     /x81/x32/xc0/x30 MALAYALAM DIGIT SIX
-+<U0D6D>     /x81/x32/xc0/x31 MALAYALAM DIGIT SEVEN
-+<U0D6E>     /x81/x32/xc0/x32 MALAYALAM DIGIT EIGHT
-+<U0D6F>     /x81/x32/xc0/x33 MALAYALAM DIGIT NINE
-+<U0D70>     /x81/x32/xc0/x34 <UNASSIGNED>
-+<U0D71>     /x81/x32/xc0/x35 <UNASSIGNED>
-+<U0D72>     /x81/x32/xc0/x36 <UNASSIGNED>
-+<U0D73>     /x81/x32/xc0/x37 <UNASSIGNED>
-+<U0D74>     /x81/x32/xc0/x38 <UNASSIGNED>
-+<U0D75>     /x81/x32/xc0/x39 <UNASSIGNED>
-+<U0D76>     /x81/x32/xc1/x30 <UNASSIGNED>
-+<U0D77>     /x81/x32/xc1/x31 <UNASSIGNED>
-+<U0D78>     /x81/x32/xc1/x32 <UNASSIGNED>
-+<U0D79>     /x81/x32/xc1/x33 <UNASSIGNED>
-+<U0D7A>     /x81/x32/xc1/x34 <UNASSIGNED>
-+<U0D7B>     /x81/x32/xc1/x35 <UNASSIGNED>
-+<U0D7C>     /x81/x32/xc1/x36 <UNASSIGNED>
-+<U0D7D>     /x81/x32/xc1/x37 <UNASSIGNED>
-+<U0D7E>     /x81/x32/xc1/x38 <UNASSIGNED>
-+<U0D7F>     /x81/x32/xc1/x39 <UNASSIGNED>
-+<U0D80>     /x81/x32/xc2/x30 <UNASSIGNED>
-+<U0D81>     /x81/x32/xc2/x31 <UNASSIGNED>
-+<U0D82>     /x81/x32/xc2/x32 SINHALA SIGN ANUSVARAYA
-+<U0D83>     /x81/x32/xc2/x33 SINHALA SIGN VISARGAYA
-+<U0D84>     /x81/x32/xc2/x34 <UNASSIGNED>
-+<U0D85>     /x81/x32/xc2/x35 SINHALA LETTER AYANNA
-+<U0D86>     /x81/x32/xc2/x36 SINHALA LETTER AAYANNA
-+<U0D87>     /x81/x32/xc2/x37 SINHALA LETTER AEYANNA
-+<U0D88>     /x81/x32/xc2/x38 SINHALA LETTER AEEYANNA
-+<U0D89>     /x81/x32/xc2/x39 SINHALA LETTER IYANNA
-+<U0D8A>     /x81/x32/xc3/x30 SINHALA LETTER IIYANNA
-+<U0D8B>     /x81/x32/xc3/x31 SINHALA LETTER UYANNA
-+<U0D8C>     /x81/x32/xc3/x32 SINHALA LETTER UUYANNA
-+<U0D8D>     /x81/x32/xc3/x33 SINHALA LETTER IRUYANNA
-+<U0D8E>     /x81/x32/xc3/x34 SINHALA LETTER IRUUYANNA
-+<U0D8F>     /x81/x32/xc3/x35 SINHALA LETTER ILUYANNA
-+<U0D90>     /x81/x32/xc3/x36 SINHALA LETTER ILUUYANNA
-+<U0D91>     /x81/x32/xc3/x37 SINHALA LETTER EYANNA
-+<U0D92>     /x81/x32/xc3/x38 SINHALA LETTER EEYANNA
-+<U0D93>     /x81/x32/xc3/x39 SINHALA LETTER AIYANNA
-+<U0D94>     /x81/x32/xc4/x30 SINHALA LETTER OYANNA
-+<U0D95>     /x81/x32/xc4/x31 SINHALA LETTER OOYANNA
-+<U0D96>     /x81/x32/xc4/x32 SINHALA LETTER AUYANNA
-+<U0D97>     /x81/x32/xc4/x33 <UNASSIGNED>
-+<U0D98>     /x81/x32/xc4/x34 <UNASSIGNED>
-+<U0D99>     /x81/x32/xc4/x35 <UNASSIGNED>
-+<U0D9A>     /x81/x32/xc4/x36 SINHALA LETTER ALPAPRAANA KAYANNA
-+<U0D9B>     /x81/x32/xc4/x37 SINHALA LETTER MAHAAPRAANA KAYANNA
-+<U0D9C>     /x81/x32/xc4/x38 SINHALA LETTER ALPAPRAANA GAYANNA
-+<U0D9D>     /x81/x32/xc4/x39 SINHALA LETTER MAHAAPRAANA GAYANNA
-+<U0D9E>     /x81/x32/xc5/x30 SINHALA LETTER KANTAJA NAASIKYAYA
-+<U0D9F>     /x81/x32/xc5/x31 SINHALA LETTER SANYAKA GAYANNA
-+<U0DA0>     /x81/x32/xc5/x32 SINHALA LETTER ALPAPRAANA CAYANNA
-+<U0DA1>     /x81/x32/xc5/x33 SINHALA LETTER MAHAAPRAANA CAYANNA
-+<U0DA2>     /x81/x32/xc5/x34 SINHALA LETTER ALPAPRAANA JAYANNA
-+<U0DA3>     /x81/x32/xc5/x35 SINHALA LETTER MAHAAPRAANA JAYANNA
-+<U0DA4>     /x81/x32/xc5/x36 SINHALA LETTER TAALUJA NAASIKYAYA
-+<U0DA5>     /x81/x32/xc5/x37 SINHALA LETTER TAALUJA SANYOOGA NAAKSIKYAYA
-+<U0DA6>     /x81/x32/xc5/x38 SINHALA LETTER SANYAKA JAYANNA
-+<U0DA7>     /x81/x32/xc5/x39 SINHALA LETTER ALPAPRAANA TTAYANNA
-+<U0DA8>     /x81/x32/xc6/x30 SINHALA LETTER MAHAAPRAANA TTAYANNA
-+<U0DA9>     /x81/x32/xc6/x31 SINHALA LETTER ALPAPRAANA DDAYANNA
-+<U0DAA>     /x81/x32/xc6/x32 SINHALA LETTER MAHAAPRAANA DDAYANNA
-+<U0DAB>     /x81/x32/xc6/x33 SINHALA LETTER MUURDHAJA NAYANNA
-+<U0DAC>     /x81/x32/xc6/x34 SINHALA LETTER SANYAKA DDAYANNA
-+<U0DAD>     /x81/x32/xc6/x35 SINHALA LETTER ALPAPRAANA TAYANNA
-+<U0DAE>     /x81/x32/xc6/x36 SINHALA LETTER MAHAAPRAANA TAYANNA
-+<U0DAF>     /x81/x32/xc6/x37 SINHALA LETTER ALPAPRAANA DAYANNA
-+<U0DB0>     /x81/x32/xc6/x38 SINHALA LETTER MAHAAPRAANA DAYANNA
-+<U0DB1>     /x81/x32/xc6/x39 SINHALA LETTER DANTAJA NAYANNA
-+<U0DB2>     /x81/x32/xc7/x30 <UNASSIGNED>
-+<U0DB3>     /x81/x32/xc7/x31 SINHALA LETTER SANYAKA DAYANNA
-+<U0DB4>     /x81/x32/xc7/x32 SINHALA LETTER ALPAPRAANA PAYANNA
-+<U0DB5>     /x81/x32/xc7/x33 SINHALA LETTER MAHAAPRAANA PAYANNA
-+<U0DB6>     /x81/x32/xc7/x34 SINHALA LETTER ALPAPRAANA BAYANNA
-+<U0DB7>     /x81/x32/xc7/x35 SINHALA LETTER MAHAAPRAANA BAYANNA
-+<U0DB8>     /x81/x32/xc7/x36 SINHALA LETTER MAYANNA
-+<U0DB9>     /x81/x32/xc7/x37 SINHALA LETTER AMBA BAYANNA
-+<U0DBA>     /x81/x32/xc7/x38 SINHALA LETTER YAYANNA
-+<U0DBB>     /x81/x32/xc7/x39 SINHALA LETTER RAYANNA
-+<U0DBC>     /x81/x32/xc8/x30 <UNASSIGNED>
-+<U0DBD>     /x81/x32/xc8/x31 SINHALA LETTER DANTAJA LAYANNA
-+<U0DBE>     /x81/x32/xc8/x32 <UNASSIGNED>
-+<U0DBF>     /x81/x32/xc8/x33 <UNASSIGNED>
-+<U0DC0>     /x81/x32/xc8/x34 SINHALA LETTER VAYANNA
-+<U0DC1>     /x81/x32/xc8/x35 SINHALA LETTER TAALUJA SAYANNA
-+<U0DC2>     /x81/x32/xc8/x36 SINHALA LETTER MUURDHAJA SAYANNA
-+<U0DC3>     /x81/x32/xc8/x37 SINHALA LETTER DANTAJA SAYANNA
-+<U0DC4>     /x81/x32/xc8/x38 SINHALA LETTER HAYANNA
-+<U0DC5>     /x81/x32/xc8/x39 SINHALA LETTER MUURDHAJA LAYANNA
-+<U0DC6>     /x81/x32/xc9/x30 SINHALA LETTER FAYANNA
-+<U0DC7>     /x81/x32/xc9/x31 <UNASSIGNED>
-+<U0DC8>     /x81/x32/xc9/x32 <UNASSIGNED>
-+<U0DC9>     /x81/x32/xc9/x33 <UNASSIGNED>
-+<U0DCA>     /x81/x32/xc9/x34 SINHALA SIGN AL-LAKUNA
-+<U0DCB>     /x81/x32/xc9/x35 <UNASSIGNED>
-+<U0DCC>     /x81/x32/xc9/x36 <UNASSIGNED>
-+<U0DCD>     /x81/x32/xc9/x37 <UNASSIGNED>
-+<U0DCE>     /x81/x32/xc9/x38 <UNASSIGNED>
-+<U0DCF>     /x81/x32/xc9/x39 SINHALA VOWEL SIGN AELA-PILLA
-+<U0DD0>     /x81/x32/xca/x30 SINHALA VOWEL SIGN KETTI AEDA-PILLA
-+<U0DD1>     /x81/x32/xca/x31 SINHALA VOWEL SIGN DIGA AEDA-PILLA
-+<U0DD2>     /x81/x32/xca/x32 SINHALA VOWEL SIGN KETTI IS-PILLA
-+<U0DD3>     /x81/x32/xca/x33 SINHALA VOWEL SIGN DIGA IS-PILLA
-+<U0DD4>     /x81/x32/xca/x34 SINHALA VOWEL SIGN KETTI PAA-PILLA
-+<U0DD5>     /x81/x32/xca/x35 <UNASSIGNED>
-+<U0DD6>     /x81/x32/xca/x36 SINHALA VOWEL SIGN DIGA PAA-PILLA
-+<U0DD7>     /x81/x32/xca/x37 <UNASSIGNED>
-+<U0DD8>     /x81/x32/xca/x38 SINHALA VOWEL SIGN GAETTA-PILLA
-+<U0DD9>     /x81/x32/xca/x39 SINHALA VOWEL SIGN KOMBUVA
-+<U0DDA>     /x81/x32/xcb/x30 SINHALA VOWEL SIGN DIGA KOMBUVA
-+<U0DDB>     /x81/x32/xcb/x31 SINHALA VOWEL SIGN KOMBU DEKA
-+<U0DDC>     /x81/x32/xcb/x32 SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA
-+<U0DDD>     /x81/x32/xcb/x33 SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA
-+<U0DDE>     /x81/x32/xcb/x34 SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA
-+<U0DDF>     /x81/x32/xcb/x35 SINHALA VOWEL SIGN GAYANUKITTA
-+<U0DE0>     /x81/x32/xcb/x36 <UNASSIGNED>
-+<U0DE1>     /x81/x32/xcb/x37 <UNASSIGNED>
-+<U0DE2>     /x81/x32/xcb/x38 <UNASSIGNED>
-+<U0DE3>     /x81/x32/xcb/x39 <UNASSIGNED>
-+<U0DE4>     /x81/x32/xcc/x30 <UNASSIGNED>
-+<U0DE5>     /x81/x32/xcc/x31 <UNASSIGNED>
-+<U0DE6>     /x81/x32/xcc/x32 <UNASSIGNED>
-+<U0DE7>     /x81/x32/xcc/x33 <UNASSIGNED>
-+<U0DE8>     /x81/x32/xcc/x34 <UNASSIGNED>
-+<U0DE9>     /x81/x32/xcc/x35 <UNASSIGNED>
-+<U0DEA>     /x81/x32/xcc/x36 <UNASSIGNED>
-+<U0DEB>     /x81/x32/xcc/x37 <UNASSIGNED>
-+<U0DEC>     /x81/x32/xcc/x38 <UNASSIGNED>
-+<U0DED>     /x81/x32/xcc/x39 <UNASSIGNED>
-+<U0DEE>     /x81/x32/xcd/x30 <UNASSIGNED>
-+<U0DEF>     /x81/x32/xcd/x31 <UNASSIGNED>
-+<U0DF0>     /x81/x32/xcd/x32 <UNASSIGNED>
-+<U0DF1>     /x81/x32/xcd/x33 <UNASSIGNED>
-+<U0DF2>     /x81/x32/xcd/x34 SINHALA VOWEL SIGN DIGA GAETTA-PILLA
-+<U0DF3>     /x81/x32/xcd/x35 SINHALA VOWEL SIGN DIGA GAYANUKITTA
-+<U0DF4>     /x81/x32/xcd/x36 SINHALA PUNCTUATION KUNDDALIYA
-+<U0DF5>     /x81/x32/xcd/x37 <UNASSIGNED>
-+<U0DF6>     /x81/x32/xcd/x38 <UNASSIGNED>
-+<U0DF7>     /x81/x32/xcd/x39 <UNASSIGNED>
-+<U0DF8>     /x81/x32/xce/x30 <UNASSIGNED>
-+<U0DF9>     /x81/x32/xce/x31 <UNASSIGNED>
-+<U0DFA>     /x81/x32/xce/x32 <UNASSIGNED>
-+<U0DFB>     /x81/x32/xce/x33 <UNASSIGNED>
-+<U0DFC>     /x81/x32/xce/x34 <UNASSIGNED>
-+<U0DFD>     /x81/x32/xce/x35 <UNASSIGNED>
-+<U0DFE>     /x81/x32/xce/x36 <UNASSIGNED>
-+<U0DFF>     /x81/x32/xce/x37 <UNASSIGNED>
-+<U0E00>     /x81/x32/xce/x38 <UNASSIGNED>
-+<U0E01>     /x81/x32/xce/x39 THAI CHARACTER KO KAI
-+<U0E02>     /x81/x32/xcf/x30 THAI CHARACTER KHO KHAI
-+<U0E03>     /x81/x32/xcf/x31 THAI CHARACTER KHO KHUAT
-+<U0E04>     /x81/x32/xcf/x32 THAI CHARACTER KHO KHWAI
-+<U0E05>     /x81/x32/xcf/x33 THAI CHARACTER KHO KHON
-+<U0E06>     /x81/x32/xcf/x34 THAI CHARACTER KHO RAKHANG
-+<U0E07>     /x81/x32/xcf/x35 THAI CHARACTER NGO NGU
-+<U0E08>     /x81/x32/xcf/x36 THAI CHARACTER CHO CHAN
-+<U0E09>     /x81/x32/xcf/x37 THAI CHARACTER CHO CHING
-+<U0E0A>     /x81/x32/xcf/x38 THAI CHARACTER CHO CHANG
-+<U0E0B>     /x81/x32/xcf/x39 THAI CHARACTER SO SO
-+<U0E0C>     /x81/x32/xd0/x30 THAI CHARACTER CHO CHOE
-+<U0E0D>     /x81/x32/xd0/x31 THAI CHARACTER YO YING
-+<U0E0E>     /x81/x32/xd0/x32 THAI CHARACTER DO CHADA
-+<U0E0F>     /x81/x32/xd0/x33 THAI CHARACTER TO PATAK
-+<U0E10>     /x81/x32/xd0/x34 THAI CHARACTER THO THAN
-+<U0E11>     /x81/x32/xd0/x35 THAI CHARACTER THO NANGMONTHO
-+<U0E12>     /x81/x32/xd0/x36 THAI CHARACTER THO PHUTHAO
-+<U0E13>     /x81/x32/xd0/x37 THAI CHARACTER NO NEN
-+<U0E14>     /x81/x32/xd0/x38 THAI CHARACTER DO DEK
-+<U0E15>     /x81/x32/xd0/x39 THAI CHARACTER TO TAO
-+<U0E16>     /x81/x32/xd1/x30 THAI CHARACTER THO THUNG
-+<U0E17>     /x81/x32/xd1/x31 THAI CHARACTER THO THAHAN
-+<U0E18>     /x81/x32/xd1/x32 THAI CHARACTER THO THONG
-+<U0E19>     /x81/x32/xd1/x33 THAI CHARACTER NO NU
-+<U0E1A>     /x81/x32/xd1/x34 THAI CHARACTER BO BAIMAI
-+<U0E1B>     /x81/x32/xd1/x35 THAI CHARACTER PO PLA
-+<U0E1C>     /x81/x32/xd1/x36 THAI CHARACTER PHO PHUNG
-+<U0E1D>     /x81/x32/xd1/x37 THAI CHARACTER FO FA
-+<U0E1E>     /x81/x32/xd1/x38 THAI CHARACTER PHO PHAN
-+<U0E1F>     /x81/x32/xd1/x39 THAI CHARACTER FO FAN
-+<U0E20>     /x81/x32/xd2/x30 THAI CHARACTER PHO SAMPHAO
-+<U0E21>     /x81/x32/xd2/x31 THAI CHARACTER MO MA
-+<U0E22>     /x81/x32/xd2/x32 THAI CHARACTER YO YAK
-+<U0E23>     /x81/x32/xd2/x33 THAI CHARACTER RO RUA
-+<U0E24>     /x81/x32/xd2/x34 THAI CHARACTER RU
-+<U0E25>     /x81/x32/xd2/x35 THAI CHARACTER LO LING
-+<U0E26>     /x81/x32/xd2/x36 THAI CHARACTER LU
-+<U0E27>     /x81/x32/xd2/x37 THAI CHARACTER WO WAEN
-+<U0E28>     /x81/x32/xd2/x38 THAI CHARACTER SO SALA
-+<U0E29>     /x81/x32/xd2/x39 THAI CHARACTER SO RUSI
-+<U0E2A>     /x81/x32/xd3/x30 THAI CHARACTER SO SUA
-+<U0E2B>     /x81/x32/xd3/x31 THAI CHARACTER HO HIP
-+<U0E2C>     /x81/x32/xd3/x32 THAI CHARACTER LO CHULA
-+<U0E2D>     /x81/x32/xd3/x33 THAI CHARACTER O ANG
-+<U0E2E>     /x81/x32/xd3/x34 THAI CHARACTER HO NOKHUK
-+<U0E2F>     /x81/x32/xd3/x35 THAI CHARACTER PAIYANNOI
-+<U0E30>     /x81/x32/xd3/x36 THAI CHARACTER SARA A
-+<U0E31>     /x81/x32/xd3/x37 THAI CHARACTER MAI HAN-AKAT
-+<U0E32>     /x81/x32/xd3/x38 THAI CHARACTER SARA AA
-+<U0E33>     /x81/x32/xd3/x39 THAI CHARACTER SARA AM
-+<U0E34>     /x81/x32/xd4/x30 THAI CHARACTER SARA I
-+<U0E35>     /x81/x32/xd4/x31 THAI CHARACTER SARA II
-+<U0E36>     /x81/x32/xd4/x32 THAI CHARACTER SARA UE
-+<U0E37>     /x81/x32/xd4/x33 THAI CHARACTER SARA UEE
-+<U0E38>     /x81/x32/xd4/x34 THAI CHARACTER SARA U
-+<U0E39>     /x81/x32/xd4/x35 THAI CHARACTER SARA UU
-+<U0E3A>     /x81/x32/xd4/x36 THAI CHARACTER PHINTHU
-+<U0E3B>     /x81/x32/xd4/x37 <UNASSIGNED>
-+<U0E3C>     /x81/x32/xd4/x38 <UNASSIGNED>
-+<U0E3D>     /x81/x32/xd4/x39 <UNASSIGNED>
-+<U0E3E>     /x81/x32/xd5/x30 <UNASSIGNED>
-+<U0E3F>     /x81/x32/xd5/x31 THAI CURRENCY SYMBOL BAHT
-+<U0E40>     /x81/x32/xd5/x32 THAI CHARACTER SARA E
-+<U0E41>     /x81/x32/xd5/x33 THAI CHARACTER SARA AE
-+<U0E42>     /x81/x32/xd5/x34 THAI CHARACTER SARA O
-+<U0E43>     /x81/x32/xd5/x35 THAI CHARACTER SARA AI MAIMUAN
-+<U0E44>     /x81/x32/xd5/x36 THAI CHARACTER SARA AI MAIMALAI
-+<U0E45>     /x81/x32/xd5/x37 THAI CHARACTER LAKKHANGYAO
-+<U0E46>     /x81/x32/xd5/x38 THAI CHARACTER MAIYAMOK
-+<U0E47>     /x81/x32/xd5/x39 THAI CHARACTER MAITAIKHU
-+<U0E48>     /x81/x32/xd6/x30 THAI CHARACTER MAI EK
-+<U0E49>     /x81/x32/xd6/x31 THAI CHARACTER MAI THO
-+<U0E4A>     /x81/x32/xd6/x32 THAI CHARACTER MAI TRI
-+<U0E4B>     /x81/x32/xd6/x33 THAI CHARACTER MAI CHATTAWA
-+<U0E4C>     /x81/x32/xd6/x34 THAI CHARACTER THANTHAKHAT
-+<U0E4D>     /x81/x32/xd6/x35 THAI CHARACTER NIKHAHIT
-+<U0E4E>     /x81/x32/xd6/x36 THAI CHARACTER YAMAKKAN
-+<U0E4F>     /x81/x32/xd6/x37 THAI CHARACTER FONGMAN
-+<U0E50>     /x81/x32/xd6/x38 THAI DIGIT ZERO
-+<U0E51>     /x81/x32/xd6/x39 THAI DIGIT ONE
-+<U0E52>     /x81/x32/xd7/x30 THAI DIGIT TWO
-+<U0E53>     /x81/x32/xd7/x31 THAI DIGIT THREE
-+<U0E54>     /x81/x32/xd7/x32 THAI DIGIT FOUR
-+<U0E55>     /x81/x32/xd7/x33 THAI DIGIT FIVE
-+<U0E56>     /x81/x32/xd7/x34 THAI DIGIT SIX
-+<U0E57>     /x81/x32/xd7/x35 THAI DIGIT SEVEN
-+<U0E58>     /x81/x32/xd7/x36 THAI DIGIT EIGHT
-+<U0E59>     /x81/x32/xd7/x37 THAI DIGIT NINE
-+<U0E5A>     /x81/x32/xd7/x38 THAI CHARACTER ANGKHANKHU
-+<U0E5B>     /x81/x32/xd7/x39 THAI CHARACTER KHOMUT
-+<U0E5C>     /x81/x32/xd8/x30 <UNASSIGNED>
-+<U0E5D>     /x81/x32/xd8/x31 <UNASSIGNED>
-+<U0E5E>     /x81/x32/xd8/x32 <UNASSIGNED>
-+<U0E5F>     /x81/x32/xd8/x33 <UNASSIGNED>
-+<U0E60>     /x81/x32/xd8/x34 <UNASSIGNED>
-+<U0E61>     /x81/x32/xd8/x35 <UNASSIGNED>
-+<U0E62>     /x81/x32/xd8/x36 <UNASSIGNED>
-+<U0E63>     /x81/x32/xd8/x37 <UNASSIGNED>
-+<U0E64>     /x81/x32/xd8/x38 <UNASSIGNED>
-+<U0E65>     /x81/x32/xd8/x39 <UNASSIGNED>
-+<U0E66>     /x81/x32/xd9/x30 <UNASSIGNED>
-+<U0E67>     /x81/x32/xd9/x31 <UNASSIGNED>
-+<U0E68>     /x81/x32/xd9/x32 <UNASSIGNED>
-+<U0E69>     /x81/x32/xd9/x33 <UNASSIGNED>
-+<U0E6A>     /x81/x32/xd9/x34 <UNASSIGNED>
-+<U0E6B>     /x81/x32/xd9/x35 <UNASSIGNED>
-+<U0E6C>     /x81/x32/xd9/x36 <UNASSIGNED>
-+<U0E6D>     /x81/x32/xd9/x37 <UNASSIGNED>
-+<U0E6E>     /x81/x32/xd9/x38 <UNASSIGNED>
-+<U0E6F>     /x81/x32/xd9/x39 <UNASSIGNED>
-+<U0E70>     /x81/x32/xda/x30 <UNASSIGNED>
-+<U0E71>     /x81/x32/xda/x31 <UNASSIGNED>
-+<U0E72>     /x81/x32/xda/x32 <UNASSIGNED>
-+<U0E73>     /x81/x32/xda/x33 <UNASSIGNED>
-+<U0E74>     /x81/x32/xda/x34 <UNASSIGNED>
-+<U0E75>     /x81/x32/xda/x35 <UNASSIGNED>
-+<U0E76>     /x81/x32/xda/x36 <UNASSIGNED>
-+<U0E77>     /x81/x32/xda/x37 <UNASSIGNED>
-+<U0E78>     /x81/x32/xda/x38 <UNASSIGNED>
-+<U0E79>     /x81/x32/xda/x39 <UNASSIGNED>
-+<U0E7A>     /x81/x32/xdb/x30 <UNASSIGNED>
-+<U0E7B>     /x81/x32/xdb/x31 <UNASSIGNED>
-+<U0E7C>     /x81/x32/xdb/x32 <UNASSIGNED>
-+<U0E7D>     /x81/x32/xdb/x33 <UNASSIGNED>
-+<U0E7E>     /x81/x32/xdb/x34 <UNASSIGNED>
-+<U0E7F>     /x81/x32/xdb/x35 <UNASSIGNED>
-+<U0E80>     /x81/x32/xdb/x36 <UNASSIGNED>
-+<U0E81>     /x81/x32/xdb/x37 LAO LETTER KO
-+<U0E82>     /x81/x32/xdb/x38 LAO LETTER KHO SUNG
-+<U0E83>     /x81/x32/xdb/x39 <UNASSIGNED>
-+<U0E84>     /x81/x32/xdc/x30 LAO LETTER KHO TAM
-+<U0E85>     /x81/x32/xdc/x31 <UNASSIGNED>
-+<U0E86>     /x81/x32/xdc/x32 <UNASSIGNED>
-+<U0E87>     /x81/x32/xdc/x33 LAO LETTER NGO
-+<U0E88>     /x81/x32/xdc/x34 LAO LETTER CO
-+<U0E89>     /x81/x32/xdc/x35 <UNASSIGNED>
-+<U0E8A>     /x81/x32/xdc/x36 LAO LETTER SO TAM
-+<U0E8B>     /x81/x32/xdc/x37 <UNASSIGNED>
-+<U0E8C>     /x81/x32/xdc/x38 <UNASSIGNED>
-+<U0E8D>     /x81/x32/xdc/x39 LAO LETTER NYO
-+<U0E8E>     /x81/x32/xdd/x30 <UNASSIGNED>
-+<U0E8F>     /x81/x32/xdd/x31 <UNASSIGNED>
-+<U0E90>     /x81/x32/xdd/x32 <UNASSIGNED>
-+<U0E91>     /x81/x32/xdd/x33 <UNASSIGNED>
-+<U0E92>     /x81/x32/xdd/x34 <UNASSIGNED>
-+<U0E93>     /x81/x32/xdd/x35 <UNASSIGNED>
-+<U0E94>     /x81/x32/xdd/x36 LAO LETTER DO
-+<U0E95>     /x81/x32/xdd/x37 LAO LETTER TO
-+<U0E96>     /x81/x32/xdd/x38 LAO LETTER THO SUNG
-+<U0E97>     /x81/x32/xdd/x39 LAO LETTER THO TAM
-+<U0E98>     /x81/x32/xde/x30 <UNASSIGNED>
-+<U0E99>     /x81/x32/xde/x31 LAO LETTER NO
-+<U0E9A>     /x81/x32/xde/x32 LAO LETTER BO
-+<U0E9B>     /x81/x32/xde/x33 LAO LETTER PO
-+<U0E9C>     /x81/x32/xde/x34 LAO LETTER PHO SUNG
-+<U0E9D>     /x81/x32/xde/x35 LAO LETTER FO TAM
-+<U0E9E>     /x81/x32/xde/x36 LAO LETTER PHO TAM
-+<U0E9F>     /x81/x32/xde/x37 LAO LETTER FO SUNG
-+<U0EA0>     /x81/x32/xde/x38 <UNASSIGNED>
-+<U0EA1>     /x81/x32/xde/x39 LAO LETTER MO
-+<U0EA2>     /x81/x32/xdf/x30 LAO LETTER YO
-+<U0EA3>     /x81/x32/xdf/x31 LAO LETTER LO LING
-+<U0EA4>     /x81/x32/xdf/x32 <UNASSIGNED>
-+<U0EA5>     /x81/x32/xdf/x33 LAO LETTER LO LOOT
-+<U0EA6>     /x81/x32/xdf/x34 <UNASSIGNED>
-+<U0EA7>     /x81/x32/xdf/x35 LAO LETTER WO
-+<U0EA8>     /x81/x32/xdf/x36 <UNASSIGNED>
-+<U0EA9>     /x81/x32/xdf/x37 <UNASSIGNED>
-+<U0EAA>     /x81/x32/xdf/x38 LAO LETTER SO SUNG
-+<U0EAB>     /x81/x32/xdf/x39 LAO LETTER HO SUNG
-+<U0EAC>     /x81/x32/xe0/x30 <UNASSIGNED>
-+<U0EAD>     /x81/x32/xe0/x31 LAO LETTER O
-+<U0EAE>     /x81/x32/xe0/x32 LAO LETTER HO TAM
-+<U0EAF>     /x81/x32/xe0/x33 LAO ELLIPSIS
-+<U0EB0>     /x81/x32/xe0/x34 LAO VOWEL SIGN A
-+<U0EB1>     /x81/x32/xe0/x35 LAO VOWEL SIGN MAI KAN
-+<U0EB2>     /x81/x32/xe0/x36 LAO VOWEL SIGN AA
-+<U0EB3>     /x81/x32/xe0/x37 LAO VOWEL SIGN AM
-+<U0EB4>     /x81/x32/xe0/x38 LAO VOWEL SIGN I
-+<U0EB5>     /x81/x32/xe0/x39 LAO VOWEL SIGN II
-+<U0EB6>     /x81/x32/xe1/x30 LAO VOWEL SIGN Y
-+<U0EB7>     /x81/x32/xe1/x31 LAO VOWEL SIGN YY
-+<U0EB8>     /x81/x32/xe1/x32 LAO VOWEL SIGN U
-+<U0EB9>     /x81/x32/xe1/x33 LAO VOWEL SIGN UU
-+<U0EBA>     /x81/x32/xe1/x34 <UNASSIGNED>
-+<U0EBB>     /x81/x32/xe1/x35 LAO VOWEL SIGN MAI KON
-+<U0EBC>     /x81/x32/xe1/x36 LAO SEMIVOWEL SIGN LO
-+<U0EBD>     /x81/x32/xe1/x37 LAO SEMIVOWEL SIGN NYO
-+<U0EBE>     /x81/x32/xe1/x38 <UNASSIGNED>
-+<U0EBF>     /x81/x32/xe1/x39 <UNASSIGNED>
-+<U0EC0>     /x81/x32/xe2/x30 LAO VOWEL SIGN E
-+<U0EC1>     /x81/x32/xe2/x31 LAO VOWEL SIGN EI
-+<U0EC2>     /x81/x32/xe2/x32 LAO VOWEL SIGN O
-+<U0EC3>     /x81/x32/xe2/x33 LAO VOWEL SIGN AY
-+<U0EC4>     /x81/x32/xe2/x34 LAO VOWEL SIGN AI
-+<U0EC5>     /x81/x32/xe2/x35 <UNASSIGNED>
-+<U0EC6>     /x81/x32/xe2/x36 LAO KO LA
-+<U0EC7>     /x81/x32/xe2/x37 <UNASSIGNED>
-+<U0EC8>     /x81/x32/xe2/x38 LAO TONE MAI EK
-+<U0EC9>     /x81/x32/xe2/x39 LAO TONE MAI THO
-+<U0ECA>     /x81/x32/xe3/x30 LAO TONE MAI TI
-+<U0ECB>     /x81/x32/xe3/x31 LAO TONE MAI CATAWA
-+<U0ECC>     /x81/x32/xe3/x32 LAO CANCELLATION MARK
-+<U0ECD>     /x81/x32/xe3/x33 LAO NIGGAHITA
-+<U0ECE>     /x81/x32/xe3/x34 <UNASSIGNED>
-+<U0ECF>     /x81/x32/xe3/x35 <UNASSIGNED>
-+<U0ED0>     /x81/x32/xe3/x36 LAO DIGIT ZERO
-+<U0ED1>     /x81/x32/xe3/x37 LAO DIGIT ONE
-+<U0ED2>     /x81/x32/xe3/x38 LAO DIGIT TWO
-+<U0ED3>     /x81/x32/xe3/x39 LAO DIGIT THREE
-+<U0ED4>     /x81/x32/xe4/x30 LAO DIGIT FOUR
-+<U0ED5>     /x81/x32/xe4/x31 LAO DIGIT FIVE
-+<U0ED6>     /x81/x32/xe4/x32 LAO DIGIT SIX
-+<U0ED7>     /x81/x32/xe4/x33 LAO DIGIT SEVEN
-+<U0ED8>     /x81/x32/xe4/x34 LAO DIGIT EIGHT
-+<U0ED9>     /x81/x32/xe4/x35 LAO DIGIT NINE
-+<U0EDA>     /x81/x32/xe4/x36 <UNASSIGNED>
-+<U0EDB>     /x81/x32/xe4/x37 <UNASSIGNED>
-+<U0EDC>     /x81/x32/xe4/x38 LAO HO NO
-+<U0EDD>     /x81/x32/xe4/x39 LAO HO MO
-+<U0EDE>     /x81/x32/xe5/x30 <UNASSIGNED>
-+<U0EDF>     /x81/x32/xe5/x31 <UNASSIGNED>
-+<U0EE0>     /x81/x32/xe5/x32 <UNASSIGNED>
-+<U0EE1>     /x81/x32/xe5/x33 <UNASSIGNED>
-+<U0EE2>     /x81/x32/xe5/x34 <UNASSIGNED>
-+<U0EE3>     /x81/x32/xe5/x35 <UNASSIGNED>
-+<U0EE4>     /x81/x32/xe5/x36 <UNASSIGNED>
-+<U0EE5>     /x81/x32/xe5/x37 <UNASSIGNED>
-+<U0EE6>     /x81/x32/xe5/x38 <UNASSIGNED>
-+<U0EE7>     /x81/x32/xe5/x39 <UNASSIGNED>
-+<U0EE8>     /x81/x32/xe6/x30 <UNASSIGNED>
-+<U0EE9>     /x81/x32/xe6/x31 <UNASSIGNED>
-+<U0EEA>     /x81/x32/xe6/x32 <UNASSIGNED>
-+<U0EEB>     /x81/x32/xe6/x33 <UNASSIGNED>
-+<U0EEC>     /x81/x32/xe6/x34 <UNASSIGNED>
-+<U0EED>     /x81/x32/xe6/x35 <UNASSIGNED>
-+<U0EEE>     /x81/x32/xe6/x36 <UNASSIGNED>
-+<U0EEF>     /x81/x32/xe6/x37 <UNASSIGNED>
-+<U0EF0>     /x81/x32/xe6/x38 <UNASSIGNED>
-+<U0EF1>     /x81/x32/xe6/x39 <UNASSIGNED>
-+<U0EF2>     /x81/x32/xe7/x30 <UNASSIGNED>
-+<U0EF3>     /x81/x32/xe7/x31 <UNASSIGNED>
-+<U0EF4>     /x81/x32/xe7/x32 <UNASSIGNED>
-+<U0EF5>     /x81/x32/xe7/x33 <UNASSIGNED>
-+<U0EF6>     /x81/x32/xe7/x34 <UNASSIGNED>
-+<U0EF7>     /x81/x32/xe7/x35 <UNASSIGNED>
-+<U0EF8>     /x81/x32/xe7/x36 <UNASSIGNED>
-+<U0EF9>     /x81/x32/xe7/x37 <UNASSIGNED>
-+<U0EFA>     /x81/x32/xe7/x38 <UNASSIGNED>
-+<U0EFB>     /x81/x32/xe7/x39 <UNASSIGNED>
-+<U0EFC>     /x81/x32/xe8/x30 <UNASSIGNED>
-+<U0EFD>     /x81/x32/xe8/x31 <UNASSIGNED>
-+<U0EFE>     /x81/x32/xe8/x32 <UNASSIGNED>
-+<U0EFF>     /x81/x32/xe8/x33 <UNASSIGNED>
-+<U0F00>     /x81/x32/xe8/x34 TIBETAN SYLLABLE OM
-+<U0F01>     /x81/x32/xe8/x35 TIBETAN MARK GTER YIG MGO TRUNCATED A
-+<U0F02>     /x81/x32/xe8/x36 TIBETAN MARK GTER YIG MGO -UM RNAM BCAD MA
-+<U0F03>     /x81/x32/xe8/x37 TIBETAN MARK GTER YIG MGO -UM GTER TSHEG MA
-+<U0F04>     /x81/x32/xe8/x38 TIBETAN MARK INITIAL YIG MGO MDUN MA
-+<U0F05>     /x81/x32/xe8/x39 TIBETAN MARK CLOSING YIG MGO SGAB MA
-+<U0F06>     /x81/x32/xe9/x30 TIBETAN MARK CARET YIG MGO PHUR SHAD MA
-+<U0F07>     /x81/x32/xe9/x31 TIBETAN MARK YIG MGO TSHEG SHAD MA
-+<U0F08>     /x81/x32/xe9/x32 TIBETAN MARK SBRUL SHAD
-+<U0F09>     /x81/x32/xe9/x33 TIBETAN MARK BSKUR YIG MGO
-+<U0F0A>     /x81/x32/xe9/x34 TIBETAN MARK BKA- SHOG YIG MGO
-+<U0F0B>     /x81/x32/xe9/x35 TIBETAN MARK INTERSYLLABIC TSHEG
-+<U0F0C>     /x81/x32/xe9/x36 TIBETAN MARK DELIMITER TSHEG BSTAR
-+<U0F0D>     /x81/x32/xe9/x37 TIBETAN MARK SHAD
-+<U0F0E>     /x81/x32/xe9/x38 TIBETAN MARK NYIS SHAD
-+<U0F0F>     /x81/x32/xe9/x39 TIBETAN MARK TSHEG SHAD
-+<U0F10>     /x81/x32/xea/x30 TIBETAN MARK NYIS TSHEG SHAD
-+<U0F11>     /x81/x32/xea/x31 TIBETAN MARK RIN CHEN SPUNGS SHAD
-+<U0F12>     /x81/x32/xea/x32 TIBETAN MARK RGYA GRAM SHAD
-+<U0F13>     /x81/x32/xea/x33 TIBETAN MARK CARET -DZUD RTAGS ME LONG CAN
-+<U0F14>     /x81/x32/xea/x34 TIBETAN MARK GTER TSHEG
-+<U0F15>     /x81/x32/xea/x35 TIBETAN LOGOTYPE SIGN CHAD RTAGS
-+<U0F16>     /x81/x32/xea/x36 TIBETAN LOGOTYPE SIGN LHAG RTAGS
-+<U0F17>     /x81/x32/xea/x37 TIBETAN ASTROLOGICAL SIGN SGRA GCAN -CHAR RTAGS
-+<U0F18>     /x81/x32/xea/x38 TIBETAN ASTROLOGICAL SIGN -KHYUD PA
-+<U0F19>     /x81/x32/xea/x39 TIBETAN ASTROLOGICAL SIGN SDONG TSHUGS
-+<U0F1A>     /x81/x32/xeb/x30 TIBETAN SIGN RDEL DKAR GCIG
-+<U0F1B>     /x81/x32/xeb/x31 TIBETAN SIGN RDEL DKAR GNYIS
-+<U0F1C>     /x81/x32/xeb/x32 TIBETAN SIGN RDEL DKAR GSUM
-+<U0F1D>     /x81/x32/xeb/x33 TIBETAN SIGN RDEL NAG GCIG
-+<U0F1E>     /x81/x32/xeb/x34 TIBETAN SIGN RDEL NAG GNYIS
-+<U0F1F>     /x81/x32/xeb/x35 TIBETAN SIGN RDEL DKAR RDEL NAG
-+<U0F20>     /x81/x32/xeb/x36 TIBETAN DIGIT ZERO
-+<U0F21>     /x81/x32/xeb/x37 TIBETAN DIGIT ONE
-+<U0F22>     /x81/x32/xeb/x38 TIBETAN DIGIT TWO
-+<U0F23>     /x81/x32/xeb/x39 TIBETAN DIGIT THREE
-+<U0F24>     /x81/x32/xec/x30 TIBETAN DIGIT FOUR
-+<U0F25>     /x81/x32/xec/x31 TIBETAN DIGIT FIVE
-+<U0F26>     /x81/x32/xec/x32 TIBETAN DIGIT SIX
-+<U0F27>     /x81/x32/xec/x33 TIBETAN DIGIT SEVEN
-+<U0F28>     /x81/x32/xec/x34 TIBETAN DIGIT EIGHT
-+<U0F29>     /x81/x32/xec/x35 TIBETAN DIGIT NINE
-+<U0F2A>     /x81/x32/xec/x36 TIBETAN DIGIT HALF ONE
-+<U0F2B>     /x81/x32/xec/x37 TIBETAN DIGIT HALF TWO
-+<U0F2C>     /x81/x32/xec/x38 TIBETAN DIGIT HALF THREE
-+<U0F2D>     /x81/x32/xec/x39 TIBETAN DIGIT HALF FOUR
-+<U0F2E>     /x81/x32/xed/x30 TIBETAN DIGIT HALF FIVE
-+<U0F2F>     /x81/x32/xed/x31 TIBETAN DIGIT HALF SIX
-+<U0F30>     /x81/x32/xed/x32 TIBETAN DIGIT HALF SEVEN
-+<U0F31>     /x81/x32/xed/x33 TIBETAN DIGIT HALF EIGHT
-+<U0F32>     /x81/x32/xed/x34 TIBETAN DIGIT HALF NINE
-+<U0F33>     /x81/x32/xed/x35 TIBETAN DIGIT HALF ZERO
-+<U0F34>     /x81/x32/xed/x36 TIBETAN MARK BSDUS RTAGS
-+<U0F35>     /x81/x32/xed/x37 TIBETAN MARK NGAS BZUNG NYI ZLA
-+<U0F36>     /x81/x32/xed/x38 TIBETAN MARK CARET -DZUD RTAGS BZHI MIG CAN
-+<U0F37>     /x81/x32/xed/x39 TIBETAN MARK NGAS BZUNG SGOR RTAGS
-+<U0F38>     /x81/x32/xee/x30 TIBETAN MARK CHE MGO
-+<U0F39>     /x81/x32/xee/x31 TIBETAN MARK TSA -PHRU
-+<U0F3A>     /x81/x32/xee/x32 TIBETAN MARK GUG RTAGS GYON
-+<U0F3B>     /x81/x32/xee/x33 TIBETAN MARK GUG RTAGS GYAS
-+<U0F3C>     /x81/x32/xee/x34 TIBETAN MARK ANG KHANG GYON
-+<U0F3D>     /x81/x32/xee/x35 TIBETAN MARK ANG KHANG GYAS
-+<U0F3E>     /x81/x32/xee/x36 TIBETAN SIGN YAR TSHES
-+<U0F3F>     /x81/x32/xee/x37 TIBETAN SIGN MAR TSHES
-+<U0F40>     /x81/x32/xee/x38 TIBETAN LETTER KA
-+<U0F41>     /x81/x32/xee/x39 TIBETAN LETTER KHA
-+<U0F42>     /x81/x32/xef/x30 TIBETAN LETTER GA
-+<U0F43>     /x81/x32/xef/x31 TIBETAN LETTER GHA
-+<U0F44>     /x81/x32/xef/x32 TIBETAN LETTER NGA
-+<U0F45>     /x81/x32/xef/x33 TIBETAN LETTER CA
-+<U0F46>     /x81/x32/xef/x34 TIBETAN LETTER CHA
-+<U0F47>     /x81/x32/xef/x35 TIBETAN LETTER JA
-+<U0F48>     /x81/x32/xef/x36 <UNASSIGNED>
-+<U0F49>     /x81/x32/xef/x37 TIBETAN LETTER NYA
-+<U0F4A>     /x81/x32/xef/x38 TIBETAN LETTER TTA
-+<U0F4B>     /x81/x32/xef/x39 TIBETAN LETTER TTHA
-+<U0F4C>     /x81/x32/xf0/x30 TIBETAN LETTER DDA
-+<U0F4D>     /x81/x32/xf0/x31 TIBETAN LETTER DDHA
-+<U0F4E>     /x81/x32/xf0/x32 TIBETAN LETTER NNA
-+<U0F4F>     /x81/x32/xf0/x33 TIBETAN LETTER TA
-+<U0F50>     /x81/x32/xf0/x34 TIBETAN LETTER THA
-+<U0F51>     /x81/x32/xf0/x35 TIBETAN LETTER DA
-+<U0F52>     /x81/x32/xf0/x36 TIBETAN LETTER DHA
-+<U0F53>     /x81/x32/xf0/x37 TIBETAN LETTER NA
-+<U0F54>     /x81/x32/xf0/x38 TIBETAN LETTER PA
-+<U0F55>     /x81/x32/xf0/x39 TIBETAN LETTER PHA
-+<U0F56>     /x81/x32/xf1/x30 TIBETAN LETTER BA
-+<U0F57>     /x81/x32/xf1/x31 TIBETAN LETTER BHA
-+<U0F58>     /x81/x32/xf1/x32 TIBETAN LETTER MA
-+<U0F59>     /x81/x32/xf1/x33 TIBETAN LETTER TSA
-+<U0F5A>     /x81/x32/xf1/x34 TIBETAN LETTER TSHA
-+<U0F5B>     /x81/x32/xf1/x35 TIBETAN LETTER DZA
-+<U0F5C>     /x81/x32/xf1/x36 TIBETAN LETTER DZHA
-+<U0F5D>     /x81/x32/xf1/x37 TIBETAN LETTER WA
-+<U0F5E>     /x81/x32/xf1/x38 TIBETAN LETTER ZHA
-+<U0F5F>     /x81/x32/xf1/x39 TIBETAN LETTER ZA
-+<U0F60>     /x81/x32/xf2/x30 TIBETAN LETTER -A
-+<U0F61>     /x81/x32/xf2/x31 TIBETAN LETTER YA
-+<U0F62>     /x81/x32/xf2/x32 TIBETAN LETTER RA
-+<U0F63>     /x81/x32/xf2/x33 TIBETAN LETTER LA
-+<U0F64>     /x81/x32/xf2/x34 TIBETAN LETTER SHA
-+<U0F65>     /x81/x32/xf2/x35 TIBETAN LETTER SSA
-+<U0F66>     /x81/x32/xf2/x36 TIBETAN LETTER SA
-+<U0F67>     /x81/x32/xf2/x37 TIBETAN LETTER HA
-+<U0F68>     /x81/x32/xf2/x38 TIBETAN LETTER A
-+<U0F69>     /x81/x32/xf2/x39 TIBETAN LETTER KSSA
-+<U0F6A>     /x81/x32/xf3/x30 TIBETAN LETTER FIXED-FORM RA
-+<U0F6B>     /x81/x32/xf3/x31 <UNASSIGNED>
-+<U0F6C>     /x81/x32/xf3/x32 <UNASSIGNED>
-+<U0F6D>     /x81/x32/xf3/x33 <UNASSIGNED>
-+<U0F6E>     /x81/x32/xf3/x34 <UNASSIGNED>
-+<U0F6F>     /x81/x32/xf3/x35 <UNASSIGNED>
-+<U0F70>     /x81/x32/xf3/x36 <UNASSIGNED>
-+<U0F71>     /x81/x32/xf3/x37 TIBETAN VOWEL SIGN AA
-+<U0F72>     /x81/x32/xf3/x38 TIBETAN VOWEL SIGN I
-+<U0F73>     /x81/x32/xf3/x39 TIBETAN VOWEL SIGN II
-+<U0F74>     /x81/x32/xf4/x30 TIBETAN VOWEL SIGN U
-+<U0F75>     /x81/x32/xf4/x31 TIBETAN VOWEL SIGN UU
-+<U0F76>     /x81/x32/xf4/x32 TIBETAN VOWEL SIGN VOCALIC R
-+<U0F77>     /x81/x32/xf4/x33 TIBETAN VOWEL SIGN VOCALIC RR
-+<U0F78>     /x81/x32/xf4/x34 TIBETAN VOWEL SIGN VOCALIC L
-+<U0F79>     /x81/x32/xf4/x35 TIBETAN VOWEL SIGN VOCALIC LL
-+<U0F7A>     /x81/x32/xf4/x36 TIBETAN VOWEL SIGN E
-+<U0F7B>     /x81/x32/xf4/x37 TIBETAN VOWEL SIGN EE
-+<U0F7C>     /x81/x32/xf4/x38 TIBETAN VOWEL SIGN O
-+<U0F7D>     /x81/x32/xf4/x39 TIBETAN VOWEL SIGN OO
-+<U0F7E>     /x81/x32/xf5/x30 TIBETAN SIGN RJES SU NGA RO
-+<U0F7F>     /x81/x32/xf5/x31 TIBETAN SIGN RNAM BCAD
-+<U0F80>     /x81/x32/xf5/x32 TIBETAN VOWEL SIGN REVERSED I
-+<U0F81>     /x81/x32/xf5/x33 TIBETAN VOWEL SIGN REVERSED II
-+<U0F82>     /x81/x32/xf5/x34 TIBETAN SIGN NYI ZLA NAA DA
-+<U0F83>     /x81/x32/xf5/x35 TIBETAN SIGN SNA LDAN
-+<U0F84>     /x81/x32/xf5/x36 TIBETAN MARK HALANTA
-+<U0F85>     /x81/x32/xf5/x37 TIBETAN MARK PALUTA
-+<U0F86>     /x81/x32/xf5/x38 TIBETAN SIGN LCI RTAGS
-+<U0F87>     /x81/x32/xf5/x39 TIBETAN SIGN YANG RTAGS
-+<U0F88>     /x81/x32/xf6/x30 TIBETAN SIGN LCE TSA CAN
-+<U0F89>     /x81/x32/xf6/x31 TIBETAN SIGN MCHU CAN
-+<U0F8A>     /x81/x32/xf6/x32 TIBETAN SIGN GRU CAN RGYINGS
-+<U0F8B>     /x81/x32/xf6/x33 TIBETAN SIGN GRU MED RGYINGS
-+<U0F8C>     /x81/x32/xf6/x34 <UNASSIGNED>
-+<U0F8D>     /x81/x32/xf6/x35 <UNASSIGNED>
-+<U0F8E>     /x81/x32/xf6/x36 <UNASSIGNED>
-+<U0F8F>     /x81/x32/xf6/x37 <UNASSIGNED>
-+<U0F90>     /x81/x32/xf6/x38 TIBETAN SUBJOINED LETTER KA
-+<U0F91>     /x81/x32/xf6/x39 TIBETAN SUBJOINED LETTER KHA
-+<U0F92>     /x81/x32/xf7/x30 TIBETAN SUBJOINED LETTER GA
-+<U0F93>     /x81/x32/xf7/x31 TIBETAN SUBJOINED LETTER GHA
-+<U0F94>     /x81/x32/xf7/x32 TIBETAN SUBJOINED LETTER NGA
-+<U0F95>     /x81/x32/xf7/x33 TIBETAN SUBJOINED LETTER CA
-+<U0F96>     /x81/x32/xf7/x34 TIBETAN SUBJOINED LETTER CHA
-+<U0F97>     /x81/x32/xf7/x35 TIBETAN SUBJOINED LETTER JA
-+<U0F98>     /x81/x32/xf7/x36 <UNASSIGNED>
-+<U0F99>     /x81/x32/xf7/x37 TIBETAN SUBJOINED LETTER NYA
-+<U0F9A>     /x81/x32/xf7/x38 TIBETAN SUBJOINED LETTER TTA
-+<U0F9B>     /x81/x32/xf7/x39 TIBETAN SUBJOINED LETTER TTHA
-+<U0F9C>     /x81/x32/xf8/x30 TIBETAN SUBJOINED LETTER DDA
-+<U0F9D>     /x81/x32/xf8/x31 TIBETAN SUBJOINED LETTER DDHA
-+<U0F9E>     /x81/x32/xf8/x32 TIBETAN SUBJOINED LETTER NNA
-+<U0F9F>     /x81/x32/xf8/x33 TIBETAN SUBJOINED LETTER TA
-+<U0FA0>     /x81/x32/xf8/x34 TIBETAN SUBJOINED LETTER THA
-+<U0FA1>     /x81/x32/xf8/x35 TIBETAN SUBJOINED LETTER DA
-+<U0FA2>     /x81/x32/xf8/x36 TIBETAN SUBJOINED LETTER DHA
-+<U0FA3>     /x81/x32/xf8/x37 TIBETAN SUBJOINED LETTER NA
-+<U0FA4>     /x81/x32/xf8/x38 TIBETAN SUBJOINED LETTER PA
-+<U0FA5>     /x81/x32/xf8/x39 TIBETAN SUBJOINED LETTER PHA
-+<U0FA6>     /x81/x32/xf9/x30 TIBETAN SUBJOINED LETTER BA
-+<U0FA7>     /x81/x32/xf9/x31 TIBETAN SUBJOINED LETTER BHA
-+<U0FA8>     /x81/x32/xf9/x32 TIBETAN SUBJOINED LETTER MA
-+<U0FA9>     /x81/x32/xf9/x33 TIBETAN SUBJOINED LETTER TSA
-+<U0FAA>     /x81/x32/xf9/x34 TIBETAN SUBJOINED LETTER TSHA
-+<U0FAB>     /x81/x32/xf9/x35 TIBETAN SUBJOINED LETTER DZA
-+<U0FAC>     /x81/x32/xf9/x36 TIBETAN SUBJOINED LETTER DZHA
-+<U0FAD>     /x81/x32/xf9/x37 TIBETAN SUBJOINED LETTER WA
-+<U0FAE>     /x81/x32/xf9/x38 TIBETAN SUBJOINED LETTER ZHA
-+<U0FAF>     /x81/x32/xf9/x39 TIBETAN SUBJOINED LETTER ZA
-+<U0FB0>     /x81/x32/xfa/x30 TIBETAN SUBJOINED LETTER -A
-+<U0FB1>     /x81/x32/xfa/x31 TIBETAN SUBJOINED LETTER YA
-+<U0FB2>     /x81/x32/xfa/x32 TIBETAN SUBJOINED LETTER RA
-+<U0FB3>     /x81/x32/xfa/x33 TIBETAN SUBJOINED LETTER LA
-+<U0FB4>     /x81/x32/xfa/x34 TIBETAN SUBJOINED LETTER SHA
-+<U0FB5>     /x81/x32/xfa/x35 TIBETAN SUBJOINED LETTER SSA
-+<U0FB6>     /x81/x32/xfa/x36 TIBETAN SUBJOINED LETTER SA
-+<U0FB7>     /x81/x32/xfa/x37 TIBETAN SUBJOINED LETTER HA
-+<U0FB8>     /x81/x32/xfa/x38 TIBETAN SUBJOINED LETTER A
-+<U0FB9>     /x81/x32/xfa/x39 TIBETAN SUBJOINED LETTER KSSA
-+<U0FBA>     /x81/x32/xfb/x30 TIBETAN SUBJOINED LETTER FIXED-FORM WA
-+<U0FBB>     /x81/x32/xfb/x31 TIBETAN SUBJOINED LETTER FIXED-FORM YA
-+<U0FBC>     /x81/x32/xfb/x32 TIBETAN SUBJOINED LETTER FIXED-FORM RA
-+<U0FBD>     /x81/x32/xfb/x33 <UNASSIGNED>
-+<U0FBE>     /x81/x32/xfb/x34 TIBETAN KU RU KHA
-+<U0FBF>     /x81/x32/xfb/x35 TIBETAN KU RU KHA BZHI MIG CAN
-+<U0FC0>     /x81/x32/xfb/x36 TIBETAN CANTILLATION SIGN HEAVY BEAT
-+<U0FC1>     /x81/x32/xfb/x37 TIBETAN CANTILLATION SIGN LIGHT BEAT
-+<U0FC2>     /x81/x32/xfb/x38 TIBETAN CANTILLATION SIGN CANG TE-U
-+<U0FC3>     /x81/x32/xfb/x39 TIBETAN CANTILLATION SIGN SBUB -CHAL
-+<U0FC4>     /x81/x32/xfc/x30 TIBETAN SYMBOL DRIL BU
-+<U0FC5>     /x81/x32/xfc/x31 TIBETAN SYMBOL RDO RJE
-+<U0FC6>     /x81/x32/xfc/x32 TIBETAN SYMBOL PADMA GDAN
-+<U0FC7>     /x81/x32/xfc/x33 TIBETAN SYMBOL RDO RJE RGYA GRAM
-+<U0FC8>     /x81/x32/xfc/x34 TIBETAN SYMBOL PHUR PA
-+<U0FC9>     /x81/x32/xfc/x35 TIBETAN SYMBOL NOR BU
-+<U0FCA>     /x81/x32/xfc/x36 TIBETAN SYMBOL NOR BU NYIS -KHYIL
-+<U0FCB>     /x81/x32/xfc/x37 TIBETAN SYMBOL NOR BU GSUM -KHYIL
-+<U0FCC>     /x81/x32/xfc/x38 TIBETAN SYMBOL NOR BU BZHI -KHYIL
-+<U0FCD>     /x81/x32/xfc/x39 <UNASSIGNED>
-+<U0FCE>     /x81/x32/xfd/x30 <UNASSIGNED>
-+<U0FCF>     /x81/x32/xfd/x31 TIBETAN SIGN RDEL NAG GSUM
-+<U0FD0>     /x81/x32/xfd/x32 <UNASSIGNED>
-+<U0FD1>     /x81/x32/xfd/x33 <UNASSIGNED>
-+<U0FD2>     /x81/x32/xfd/x34 <UNASSIGNED>
-+<U0FD3>     /x81/x32/xfd/x35 <UNASSIGNED>
-+<U0FD4>     /x81/x32/xfd/x36 <UNASSIGNED>
-+<U0FD5>     /x81/x32/xfd/x37 <UNASSIGNED>
-+<U0FD6>     /x81/x32/xfd/x38 <UNASSIGNED>
-+<U0FD7>     /x81/x32/xfd/x39 <UNASSIGNED>
-+<U0FD8>     /x81/x32/xfe/x30 <UNASSIGNED>
-+<U0FD9>     /x81/x32/xfe/x31 <UNASSIGNED>
-+<U0FDA>     /x81/x32/xfe/x32 <UNASSIGNED>
-+<U0FDB>     /x81/x32/xfe/x33 <UNASSIGNED>
-+<U0FDC>     /x81/x32/xfe/x34 <UNASSIGNED>
-+<U0FDD>     /x81/x32/xfe/x35 <UNASSIGNED>
-+<U0FDE>     /x81/x32/xfe/x36 <UNASSIGNED>
-+<U0FDF>     /x81/x32/xfe/x37 <UNASSIGNED>
-+<U0FE0>     /x81/x32/xfe/x38 <UNASSIGNED>
-+<U0FE1>     /x81/x32/xfe/x39 <UNASSIGNED>
-+<U0FE2>     /x81/x33/x81/x30 <UNASSIGNED>
-+<U0FE3>     /x81/x33/x81/x31 <UNASSIGNED>
-+<U0FE4>     /x81/x33/x81/x32 <UNASSIGNED>
-+<U0FE5>     /x81/x33/x81/x33 <UNASSIGNED>
-+<U0FE6>     /x81/x33/x81/x34 <UNASSIGNED>
-+<U0FE7>     /x81/x33/x81/x35 <UNASSIGNED>
-+<U0FE8>     /x81/x33/x81/x36 <UNASSIGNED>
-+<U0FE9>     /x81/x33/x81/x37 <UNASSIGNED>
-+<U0FEA>     /x81/x33/x81/x38 <UNASSIGNED>
-+<U0FEB>     /x81/x33/x81/x39 <UNASSIGNED>
-+<U0FEC>     /x81/x33/x82/x30 <UNASSIGNED>
-+<U0FED>     /x81/x33/x82/x31 <UNASSIGNED>
-+<U0FEE>     /x81/x33/x82/x32 <UNASSIGNED>
-+<U0FEF>     /x81/x33/x82/x33 <UNASSIGNED>
-+<U0FF0>     /x81/x33/x82/x34 <UNASSIGNED>
-+<U0FF1>     /x81/x33/x82/x35 <UNASSIGNED>
-+<U0FF2>     /x81/x33/x82/x36 <UNASSIGNED>
-+<U0FF3>     /x81/x33/x82/x37 <UNASSIGNED>
-+<U0FF4>     /x81/x33/x82/x38 <UNASSIGNED>
-+<U0FF5>     /x81/x33/x82/x39 <UNASSIGNED>
-+<U0FF6>     /x81/x33/x83/x30 <UNASSIGNED>
-+<U0FF7>     /x81/x33/x83/x31 <UNASSIGNED>
-+<U0FF8>     /x81/x33/x83/x32 <UNASSIGNED>
-+<U0FF9>     /x81/x33/x83/x33 <UNASSIGNED>
-+<U0FFA>     /x81/x33/x83/x34 <UNASSIGNED>
-+<U0FFB>     /x81/x33/x83/x35 <UNASSIGNED>
-+<U0FFC>     /x81/x33/x83/x36 <UNASSIGNED>
-+<U0FFD>     /x81/x33/x83/x37 <UNASSIGNED>
-+<U0FFE>     /x81/x33/x83/x38 <UNASSIGNED>
-+<U0FFF>     /x81/x33/x83/x39 <UNASSIGNED>
-+<U1000>     /x81/x33/x84/x30 MYANMAR LETTER KA
-+<U1001>     /x81/x33/x84/x31 MYANMAR LETTER KHA
-+<U1002>     /x81/x33/x84/x32 MYANMAR LETTER GA
-+<U1003>     /x81/x33/x84/x33 MYANMAR LETTER GHA
-+<U1004>     /x81/x33/x84/x34 MYANMAR LETTER NGA
-+<U1005>     /x81/x33/x84/x35 MYANMAR LETTER CA
-+<U1006>     /x81/x33/x84/x36 MYANMAR LETTER CHA
-+<U1007>     /x81/x33/x84/x37 MYANMAR LETTER JA
-+<U1008>     /x81/x33/x84/x38 MYANMAR LETTER JHA
-+<U1009>     /x81/x33/x84/x39 MYANMAR LETTER NYA
-+<U100A>     /x81/x33/x85/x30 MYANMAR LETTER NNYA
-+<U100B>     /x81/x33/x85/x31 MYANMAR LETTER TTA
-+<U100C>     /x81/x33/x85/x32 MYANMAR LETTER TTHA
-+<U100D>     /x81/x33/x85/x33 MYANMAR LETTER DDA
-+<U100E>     /x81/x33/x85/x34 MYANMAR LETTER DDHA
-+<U100F>     /x81/x33/x85/x35 MYANMAR LETTER NNA
-+<U1010>     /x81/x33/x85/x36 MYANMAR LETTER TA
-+<U1011>     /x81/x33/x85/x37 MYANMAR LETTER THA
-+<U1012>     /x81/x33/x85/x38 MYANMAR LETTER DA
-+<U1013>     /x81/x33/x85/x39 MYANMAR LETTER DHA
-+<U1014>     /x81/x33/x86/x30 MYANMAR LETTER NA
-+<U1015>     /x81/x33/x86/x31 MYANMAR LETTER PA
-+<U1016>     /x81/x33/x86/x32 MYANMAR LETTER PHA
-+<U1017>     /x81/x33/x86/x33 MYANMAR LETTER BA
-+<U1018>     /x81/x33/x86/x34 MYANMAR LETTER BHA
-+<U1019>     /x81/x33/x86/x35 MYANMAR LETTER MA
-+<U101A>     /x81/x33/x86/x36 MYANMAR LETTER YA
-+<U101B>     /x81/x33/x86/x37 MYANMAR LETTER RA
-+<U101C>     /x81/x33/x86/x38 MYANMAR LETTER LA
-+<U101D>     /x81/x33/x86/x39 MYANMAR LETTER WA
-+<U101E>     /x81/x33/x87/x30 MYANMAR LETTER SA
-+<U101F>     /x81/x33/x87/x31 MYANMAR LETTER HA
-+<U1020>     /x81/x33/x87/x32 MYANMAR LETTER LLA
-+<U1021>     /x81/x33/x87/x33 MYANMAR LETTER A
-+<U1022>     /x81/x33/x87/x34 <UNASSIGNED>
-+<U1023>     /x81/x33/x87/x35 MYANMAR LETTER I
-+<U1024>     /x81/x33/x87/x36 MYANMAR LETTER II
-+<U1025>     /x81/x33/x87/x37 MYANMAR LETTER U
-+<U1026>     /x81/x33/x87/x38 MYANMAR LETTER UU
-+<U1027>     /x81/x33/x87/x39 MYANMAR LETTER E
-+<U1028>     /x81/x33/x88/x30 <UNASSIGNED>
-+<U1029>     /x81/x33/x88/x31 MYANMAR LETTER O
-+<U102A>     /x81/x33/x88/x32 MYANMAR LETTER AU
-+<U102B>     /x81/x33/x88/x33 <UNASSIGNED>
-+<U102C>     /x81/x33/x88/x34 MYANMAR VOWEL SIGN AA
-+<U102D>     /x81/x33/x88/x35 MYANMAR VOWEL SIGN I
-+<U102E>     /x81/x33/x88/x36 MYANMAR VOWEL SIGN II
-+<U102F>     /x81/x33/x88/x37 MYANMAR VOWEL SIGN U
-+<U1030>     /x81/x33/x88/x38 MYANMAR VOWEL SIGN UU
-+<U1031>     /x81/x33/x88/x39 MYANMAR VOWEL SIGN E
-+<U1032>     /x81/x33/x89/x30 MYANMAR VOWEL SIGN AI
-+<U1033>     /x81/x33/x89/x31 <UNASSIGNED>
-+<U1034>     /x81/x33/x89/x32 <UNASSIGNED>
-+<U1035>     /x81/x33/x89/x33 <UNASSIGNED>
-+<U1036>     /x81/x33/x89/x34 MYANMAR SIGN ANUSVARA
-+<U1037>     /x81/x33/x89/x35 MYANMAR SIGN DOT BELOW
-+<U1038>     /x81/x33/x89/x36 MYANMAR SIGN VISARGA
-+<U1039>     /x81/x33/x89/x37 MYANMAR SIGN VIRAMA
-+<U103A>     /x81/x33/x89/x38 <UNASSIGNED>
-+<U103B>     /x81/x33/x89/x39 <UNASSIGNED>
-+<U103C>     /x81/x33/x8a/x30 <UNASSIGNED>
-+<U103D>     /x81/x33/x8a/x31 <UNASSIGNED>
-+<U103E>     /x81/x33/x8a/x32 <UNASSIGNED>
-+<U103F>     /x81/x33/x8a/x33 <UNASSIGNED>
-+<U1040>     /x81/x33/x8a/x34 MYANMAR DIGIT ZERO
-+<U1041>     /x81/x33/x8a/x35 MYANMAR DIGIT ONE
-+<U1042>     /x81/x33/x8a/x36 MYANMAR DIGIT TWO
-+<U1043>     /x81/x33/x8a/x37 MYANMAR DIGIT THREE
-+<U1044>     /x81/x33/x8a/x38 MYANMAR DIGIT FOUR
-+<U1045>     /x81/x33/x8a/x39 MYANMAR DIGIT FIVE
-+<U1046>     /x81/x33/x8b/x30 MYANMAR DIGIT SIX
-+<U1047>     /x81/x33/x8b/x31 MYANMAR DIGIT SEVEN
-+<U1048>     /x81/x33/x8b/x32 MYANMAR DIGIT EIGHT
-+<U1049>     /x81/x33/x8b/x33 MYANMAR DIGIT NINE
-+<U104A>     /x81/x33/x8b/x34 MYANMAR SIGN LITTLE SECTION
-+<U104B>     /x81/x33/x8b/x35 MYANMAR SIGN SECTION
-+<U104C>     /x81/x33/x8b/x36 MYANMAR SYMBOL LOCATIVE
-+<U104D>     /x81/x33/x8b/x37 MYANMAR SYMBOL COMPLETED
-+<U104E>     /x81/x33/x8b/x38 MYANMAR SYMBOL AFOREMENTIONED
-+<U104F>     /x81/x33/x8b/x39 MYANMAR SYMBOL GENITIVE
-+<U1050>     /x81/x33/x8c/x30 MYANMAR LETTER SHA
-+<U1051>     /x81/x33/x8c/x31 MYANMAR LETTER SSA
-+<U1052>     /x81/x33/x8c/x32 MYANMAR LETTER VOCALIC R
-+<U1053>     /x81/x33/x8c/x33 MYANMAR LETTER VOCALIC RR
-+<U1054>     /x81/x33/x8c/x34 MYANMAR LETTER VOCALIC L
-+<U1055>     /x81/x33/x8c/x35 MYANMAR LETTER VOCALIC LL
-+<U1056>     /x81/x33/x8c/x36 MYANMAR VOWEL SIGN VOCALIC R
-+<U1057>     /x81/x33/x8c/x37 MYANMAR VOWEL SIGN VOCALIC RR
-+<U1058>     /x81/x33/x8c/x38 MYANMAR VOWEL SIGN VOCALIC L
-+<U1059>     /x81/x33/x8c/x39 MYANMAR VOWEL SIGN VOCALIC LL
-+<U105A>     /x81/x33/x8d/x30 <UNASSIGNED>
-+<U105B>     /x81/x33/x8d/x31 <UNASSIGNED>
-+<U105C>     /x81/x33/x8d/x32 <UNASSIGNED>
-+<U105D>     /x81/x33/x8d/x33 <UNASSIGNED>
-+<U105E>     /x81/x33/x8d/x34 <UNASSIGNED>
-+<U105F>     /x81/x33/x8d/x35 <UNASSIGNED>
-+<U1060>     /x81/x33/x8d/x36 <UNASSIGNED>
-+<U1061>     /x81/x33/x8d/x37 <UNASSIGNED>
-+<U1062>     /x81/x33/x8d/x38 <UNASSIGNED>
-+<U1063>     /x81/x33/x8d/x39 <UNASSIGNED>
-+<U1064>     /x81/x33/x8e/x30 <UNASSIGNED>
-+<U1065>     /x81/x33/x8e/x31 <UNASSIGNED>
-+<U1066>     /x81/x33/x8e/x32 <UNASSIGNED>
-+<U1067>     /x81/x33/x8e/x33 <UNASSIGNED>
-+<U1068>     /x81/x33/x8e/x34 <UNASSIGNED>
-+<U1069>     /x81/x33/x8e/x35 <UNASSIGNED>
-+<U106A>     /x81/x33/x8e/x36 <UNASSIGNED>
-+<U106B>     /x81/x33/x8e/x37 <UNASSIGNED>
-+<U106C>     /x81/x33/x8e/x38 <UNASSIGNED>
-+<U106D>     /x81/x33/x8e/x39 <UNASSIGNED>
-+<U106E>     /x81/x33/x8f/x30 <UNASSIGNED>
-+<U106F>     /x81/x33/x8f/x31 <UNASSIGNED>
-+<U1070>     /x81/x33/x8f/x32 <UNASSIGNED>
-+<U1071>     /x81/x33/x8f/x33 <UNASSIGNED>
-+<U1072>     /x81/x33/x8f/x34 <UNASSIGNED>
-+<U1073>     /x81/x33/x8f/x35 <UNASSIGNED>
-+<U1074>     /x81/x33/x8f/x36 <UNASSIGNED>
-+<U1075>     /x81/x33/x8f/x37 <UNASSIGNED>
-+<U1076>     /x81/x33/x8f/x38 <UNASSIGNED>
-+<U1077>     /x81/x33/x8f/x39 <UNASSIGNED>
-+<U1078>     /x81/x33/x90/x30 <UNASSIGNED>
-+<U1079>     /x81/x33/x90/x31 <UNASSIGNED>
-+<U107A>     /x81/x33/x90/x32 <UNASSIGNED>
-+<U107B>     /x81/x33/x90/x33 <UNASSIGNED>
-+<U107C>     /x81/x33/x90/x34 <UNASSIGNED>
-+<U107D>     /x81/x33/x90/x35 <UNASSIGNED>
-+<U107E>     /x81/x33/x90/x36 <UNASSIGNED>
-+<U107F>     /x81/x33/x90/x37 <UNASSIGNED>
-+<U1080>     /x81/x33/x90/x38 <UNASSIGNED>
-+<U1081>     /x81/x33/x90/x39 <UNASSIGNED>
-+<U1082>     /x81/x33/x91/x30 <UNASSIGNED>
-+<U1083>     /x81/x33/x91/x31 <UNASSIGNED>
-+<U1084>     /x81/x33/x91/x32 <UNASSIGNED>
-+<U1085>     /x81/x33/x91/x33 <UNASSIGNED>
-+<U1086>     /x81/x33/x91/x34 <UNASSIGNED>
-+<U1087>     /x81/x33/x91/x35 <UNASSIGNED>
-+<U1088>     /x81/x33/x91/x36 <UNASSIGNED>
-+<U1089>     /x81/x33/x91/x37 <UNASSIGNED>
-+<U108A>     /x81/x33/x91/x38 <UNASSIGNED>
-+<U108B>     /x81/x33/x91/x39 <UNASSIGNED>
-+<U108C>     /x81/x33/x92/x30 <UNASSIGNED>
-+<U108D>     /x81/x33/x92/x31 <UNASSIGNED>
-+<U108E>     /x81/x33/x92/x32 <UNASSIGNED>
-+<U108F>     /x81/x33/x92/x33 <UNASSIGNED>
-+<U1090>     /x81/x33/x92/x34 <UNASSIGNED>
-+<U1091>     /x81/x33/x92/x35 <UNASSIGNED>
-+<U1092>     /x81/x33/x92/x36 <UNASSIGNED>
-+<U1093>     /x81/x33/x92/x37 <UNASSIGNED>
-+<U1094>     /x81/x33/x92/x38 <UNASSIGNED>
-+<U1095>     /x81/x33/x92/x39 <UNASSIGNED>
-+<U1096>     /x81/x33/x93/x30 <UNASSIGNED>
-+<U1097>     /x81/x33/x93/x31 <UNASSIGNED>
-+<U1098>     /x81/x33/x93/x32 <UNASSIGNED>
-+<U1099>     /x81/x33/x93/x33 <UNASSIGNED>
-+<U109A>     /x81/x33/x93/x34 <UNASSIGNED>
-+<U109B>     /x81/x33/x93/x35 <UNASSIGNED>
-+<U109C>     /x81/x33/x93/x36 <UNASSIGNED>
-+<U109D>     /x81/x33/x93/x37 <UNASSIGNED>
-+<U109E>     /x81/x33/x93/x38 <UNASSIGNED>
-+<U109F>     /x81/x33/x93/x39 <UNASSIGNED>
-+<U10A0>     /x81/x33/x94/x30 GEORGIAN CAPITAL LETTER AN
-+<U10A1>     /x81/x33/x94/x31 GEORGIAN CAPITAL LETTER BAN
-+<U10A2>     /x81/x33/x94/x32 GEORGIAN CAPITAL LETTER GAN
-+<U10A3>     /x81/x33/x94/x33 GEORGIAN CAPITAL LETTER DON
-+<U10A4>     /x81/x33/x94/x34 GEORGIAN CAPITAL LETTER EN
-+<U10A5>     /x81/x33/x94/x35 GEORGIAN CAPITAL LETTER VIN
-+<U10A6>     /x81/x33/x94/x36 GEORGIAN CAPITAL LETTER ZEN
-+<U10A7>     /x81/x33/x94/x37 GEORGIAN CAPITAL LETTER TAN
-+<U10A8>     /x81/x33/x94/x38 GEORGIAN CAPITAL LETTER IN
-+<U10A9>     /x81/x33/x94/x39 GEORGIAN CAPITAL LETTER KAN
-+<U10AA>     /x81/x33/x95/x30 GEORGIAN CAPITAL LETTER LAS
-+<U10AB>     /x81/x33/x95/x31 GEORGIAN CAPITAL LETTER MAN
-+<U10AC>     /x81/x33/x95/x32 GEORGIAN CAPITAL LETTER NAR
-+<U10AD>     /x81/x33/x95/x33 GEORGIAN CAPITAL LETTER ON
-+<U10AE>     /x81/x33/x95/x34 GEORGIAN CAPITAL LETTER PAR
-+<U10AF>     /x81/x33/x95/x35 GEORGIAN CAPITAL LETTER ZHAR
-+<U10B0>     /x81/x33/x95/x36 GEORGIAN CAPITAL LETTER RAE
-+<U10B1>     /x81/x33/x95/x37 GEORGIAN CAPITAL LETTER SAN
-+<U10B2>     /x81/x33/x95/x38 GEORGIAN CAPITAL LETTER TAR
-+<U10B3>     /x81/x33/x95/x39 GEORGIAN CAPITAL LETTER UN
-+<U10B4>     /x81/x33/x96/x30 GEORGIAN CAPITAL LETTER PHAR
-+<U10B5>     /x81/x33/x96/x31 GEORGIAN CAPITAL LETTER KHAR
-+<U10B6>     /x81/x33/x96/x32 GEORGIAN CAPITAL LETTER GHAN
-+<U10B7>     /x81/x33/x96/x33 GEORGIAN CAPITAL LETTER QAR
-+<U10B8>     /x81/x33/x96/x34 GEORGIAN CAPITAL LETTER SHIN
-+<U10B9>     /x81/x33/x96/x35 GEORGIAN CAPITAL LETTER CHIN
-+<U10BA>     /x81/x33/x96/x36 GEORGIAN CAPITAL LETTER CAN
-+<U10BB>     /x81/x33/x96/x37 GEORGIAN CAPITAL LETTER JIL
-+<U10BC>     /x81/x33/x96/x38 GEORGIAN CAPITAL LETTER CIL
-+<U10BD>     /x81/x33/x96/x39 GEORGIAN CAPITAL LETTER CHAR
-+<U10BE>     /x81/x33/x97/x30 GEORGIAN CAPITAL LETTER XAN
-+<U10BF>     /x81/x33/x97/x31 GEORGIAN CAPITAL LETTER JHAN
-+<U10C0>     /x81/x33/x97/x32 GEORGIAN CAPITAL LETTER HAE
-+<U10C1>     /x81/x33/x97/x33 GEORGIAN CAPITAL LETTER HE
-+<U10C2>     /x81/x33/x97/x34 GEORGIAN CAPITAL LETTER HIE
-+<U10C3>     /x81/x33/x97/x35 GEORGIAN CAPITAL LETTER WE
-+<U10C4>     /x81/x33/x97/x36 GEORGIAN CAPITAL LETTER HAR
-+<U10C5>     /x81/x33/x97/x37 GEORGIAN CAPITAL LETTER HOE
-+<U10C6>     /x81/x33/x97/x38 <UNASSIGNED>
-+<U10C7>     /x81/x33/x97/x39 <UNASSIGNED>
-+<U10C8>     /x81/x33/x98/x30 <UNASSIGNED>
-+<U10C9>     /x81/x33/x98/x31 <UNASSIGNED>
-+<U10CA>     /x81/x33/x98/x32 <UNASSIGNED>
-+<U10CB>     /x81/x33/x98/x33 <UNASSIGNED>
-+<U10CC>     /x81/x33/x98/x34 <UNASSIGNED>
-+<U10CD>     /x81/x33/x98/x35 <UNASSIGNED>
-+<U10CE>     /x81/x33/x98/x36 <UNASSIGNED>
-+<U10CF>     /x81/x33/x98/x37 <UNASSIGNED>
-+<U10D0>     /x81/x33/x98/x38 GEORGIAN LETTER AN
-+<U10D1>     /x81/x33/x98/x39 GEORGIAN LETTER BAN
-+<U10D2>     /x81/x33/x99/x30 GEORGIAN LETTER GAN
-+<U10D3>     /x81/x33/x99/x31 GEORGIAN LETTER DON
-+<U10D4>     /x81/x33/x99/x32 GEORGIAN LETTER EN
-+<U10D5>     /x81/x33/x99/x33 GEORGIAN LETTER VIN
-+<U10D6>     /x81/x33/x99/x34 GEORGIAN LETTER ZEN
-+<U10D7>     /x81/x33/x99/x35 GEORGIAN LETTER TAN
-+<U10D8>     /x81/x33/x99/x36 GEORGIAN LETTER IN
-+<U10D9>     /x81/x33/x99/x37 GEORGIAN LETTER KAN
-+<U10DA>     /x81/x33/x99/x38 GEORGIAN LETTER LAS
-+<U10DB>     /x81/x33/x99/x39 GEORGIAN LETTER MAN
-+<U10DC>     /x81/x33/x9a/x30 GEORGIAN LETTER NAR
-+<U10DD>     /x81/x33/x9a/x31 GEORGIAN LETTER ON
-+<U10DE>     /x81/x33/x9a/x32 GEORGIAN LETTER PAR
-+<U10DF>     /x81/x33/x9a/x33 GEORGIAN LETTER ZHAR
-+<U10E0>     /x81/x33/x9a/x34 GEORGIAN LETTER RAE
-+<U10E1>     /x81/x33/x9a/x35 GEORGIAN LETTER SAN
-+<U10E2>     /x81/x33/x9a/x36 GEORGIAN LETTER TAR
-+<U10E3>     /x81/x33/x9a/x37 GEORGIAN LETTER UN
-+<U10E4>     /x81/x33/x9a/x38 GEORGIAN LETTER PHAR
-+<U10E5>     /x81/x33/x9a/x39 GEORGIAN LETTER KHAR
-+<U10E6>     /x81/x33/x9b/x30 GEORGIAN LETTER GHAN
-+<U10E7>     /x81/x33/x9b/x31 GEORGIAN LETTER QAR
-+<U10E8>     /x81/x33/x9b/x32 GEORGIAN LETTER SHIN
-+<U10E9>     /x81/x33/x9b/x33 GEORGIAN LETTER CHIN
-+<U10EA>     /x81/x33/x9b/x34 GEORGIAN LETTER CAN
-+<U10EB>     /x81/x33/x9b/x35 GEORGIAN LETTER JIL
-+<U10EC>     /x81/x33/x9b/x36 GEORGIAN LETTER CIL
-+<U10ED>     /x81/x33/x9b/x37 GEORGIAN LETTER CHAR
-+<U10EE>     /x81/x33/x9b/x38 GEORGIAN LETTER XAN
-+<U10EF>     /x81/x33/x9b/x39 GEORGIAN LETTER JHAN
-+<U10F0>     /x81/x33/x9c/x30 GEORGIAN LETTER HAE
-+<U10F1>     /x81/x33/x9c/x31 GEORGIAN LETTER HE
-+<U10F2>     /x81/x33/x9c/x32 GEORGIAN LETTER HIE
-+<U10F3>     /x81/x33/x9c/x33 GEORGIAN LETTER WE
-+<U10F4>     /x81/x33/x9c/x34 GEORGIAN LETTER HAR
-+<U10F5>     /x81/x33/x9c/x35 GEORGIAN LETTER HOE
-+<U10F6>     /x81/x33/x9c/x36 GEORGIAN LETTER FI
-+<U10F7>     /x81/x33/x9c/x37 GEORGIAN LETTER YN
-+<U10F8>     /x81/x33/x9c/x38 GEORGIAN LETTER ELIFI
-+<U10F9>     /x81/x33/x9c/x39 <UNASSIGNED>
-+<U10FA>     /x81/x33/x9d/x30 <UNASSIGNED>
-+<U10FB>     /x81/x33/x9d/x31 GEORGIAN PARAGRAPH SEPARATOR
-+<U10FC>     /x81/x33/x9d/x32 <UNASSIGNED>
-+<U10FD>     /x81/x33/x9d/x33 <UNASSIGNED>
-+<U10FE>     /x81/x33/x9d/x34 <UNASSIGNED>
-+<U10FF>     /x81/x33/x9d/x35 <UNASSIGNED>
-+<U1100>     /x81/x33/x9d/x36 HANGUL CHOSEONG KIYEOK
-+<U1101>     /x81/x33/x9d/x37 HANGUL CHOSEONG SSANGKIYEOK
-+<U1102>     /x81/x33/x9d/x38 HANGUL CHOSEONG NIEUN
-+<U1103>     /x81/x33/x9d/x39 HANGUL CHOSEONG TIKEUT
-+<U1104>     /x81/x33/x9e/x30 HANGUL CHOSEONG SSANGTIKEUT
-+<U1105>     /x81/x33/x9e/x31 HANGUL CHOSEONG RIEUL
-+<U1106>     /x81/x33/x9e/x32 HANGUL CHOSEONG MIEUM
-+<U1107>     /x81/x33/x9e/x33 HANGUL CHOSEONG PIEUP
-+<U1108>     /x81/x33/x9e/x34 HANGUL CHOSEONG SSANGPIEUP
-+<U1109>     /x81/x33/x9e/x35 HANGUL CHOSEONG SIOS
-+<U110A>     /x81/x33/x9e/x36 HANGUL CHOSEONG SSANGSIOS
-+<U110B>     /x81/x33/x9e/x37 HANGUL CHOSEONG IEUNG
-+<U110C>     /x81/x33/x9e/x38 HANGUL CHOSEONG CIEUC
-+<U110D>     /x81/x33/x9e/x39 HANGUL CHOSEONG SSANGCIEUC
-+<U110E>     /x81/x33/x9f/x30 HANGUL CHOSEONG CHIEUCH
-+<U110F>     /x81/x33/x9f/x31 HANGUL CHOSEONG KHIEUKH
-+<U1110>     /x81/x33/x9f/x32 HANGUL CHOSEONG THIEUTH
-+<U1111>     /x81/x33/x9f/x33 HANGUL CHOSEONG PHIEUPH
-+<U1112>     /x81/x33/x9f/x34 HANGUL CHOSEONG HIEUH
-+<U1113>     /x81/x33/x9f/x35 HANGUL CHOSEONG NIEUN-KIYEOK
-+<U1114>     /x81/x33/x9f/x36 HANGUL CHOSEONG SSANGNIEUN
-+<U1115>     /x81/x33/x9f/x37 HANGUL CHOSEONG NIEUN-TIKEUT
-+<U1116>     /x81/x33/x9f/x38 HANGUL CHOSEONG NIEUN-PIEUP
-+<U1117>     /x81/x33/x9f/x39 HANGUL CHOSEONG TIKEUT-KIYEOK
-+<U1118>     /x81/x33/xa0/x30 HANGUL CHOSEONG RIEUL-NIEUN
-+<U1119>     /x81/x33/xa0/x31 HANGUL CHOSEONG SSANGRIEUL
-+<U111A>     /x81/x33/xa0/x32 HANGUL CHOSEONG RIEUL-HIEUH
-+<U111B>     /x81/x33/xa0/x33 HANGUL CHOSEONG KAPYEOUNRIEUL
-+<U111C>     /x81/x33/xa0/x34 HANGUL CHOSEONG MIEUM-PIEUP
-+<U111D>     /x81/x33/xa0/x35 HANGUL CHOSEONG KAPYEOUNMIEUM
-+<U111E>     /x81/x33/xa0/x36 HANGUL CHOSEONG PIEUP-KIYEOK
-+<U111F>     /x81/x33/xa0/x37 HANGUL CHOSEONG PIEUP-NIEUN
-+<U1120>     /x81/x33/xa0/x38 HANGUL CHOSEONG PIEUP-TIKEUT
-+<U1121>     /x81/x33/xa0/x39 HANGUL CHOSEONG PIEUP-SIOS
-+<U1122>     /x81/x33/xa1/x30 HANGUL CHOSEONG PIEUP-SIOS-KIYEOK
-+<U1123>     /x81/x33/xa1/x31 HANGUL CHOSEONG PIEUP-SIOS-TIKEUT
-+<U1124>     /x81/x33/xa1/x32 HANGUL CHOSEONG PIEUP-SIOS-PIEUP
-+<U1125>     /x81/x33/xa1/x33 HANGUL CHOSEONG PIEUP-SSANGSIOS
-+<U1126>     /x81/x33/xa1/x34 HANGUL CHOSEONG PIEUP-SIOS-CIEUC
-+<U1127>     /x81/x33/xa1/x35 HANGUL CHOSEONG PIEUP-CIEUC
-+<U1128>     /x81/x33/xa1/x36 HANGUL CHOSEONG PIEUP-CHIEUCH
-+<U1129>     /x81/x33/xa1/x37 HANGUL CHOSEONG PIEUP-THIEUTH
-+<U112A>     /x81/x33/xa1/x38 HANGUL CHOSEONG PIEUP-PHIEUPH
-+<U112B>     /x81/x33/xa1/x39 HANGUL CHOSEONG KAPYEOUNPIEUP
-+<U112C>     /x81/x33/xa2/x30 HANGUL CHOSEONG KAPYEOUNSSANGPIEUP
-+<U112D>     /x81/x33/xa2/x31 HANGUL CHOSEONG SIOS-KIYEOK
-+<U112E>     /x81/x33/xa2/x32 HANGUL CHOSEONG SIOS-NIEUN
-+<U112F>     /x81/x33/xa2/x33 HANGUL CHOSEONG SIOS-TIKEUT
-+<U1130>     /x81/x33/xa2/x34 HANGUL CHOSEONG SIOS-RIEUL
-+<U1131>     /x81/x33/xa2/x35 HANGUL CHOSEONG SIOS-MIEUM
-+<U1132>     /x81/x33/xa2/x36 HANGUL CHOSEONG SIOS-PIEUP
-+<U1133>     /x81/x33/xa2/x37 HANGUL CHOSEONG SIOS-PIEUP-KIYEOK
-+<U1134>     /x81/x33/xa2/x38 HANGUL CHOSEONG SIOS-SSANGSIOS
-+<U1135>     /x81/x33/xa2/x39 HANGUL CHOSEONG SIOS-IEUNG
-+<U1136>     /x81/x33/xa3/x30 HANGUL CHOSEONG SIOS-CIEUC
-+<U1137>     /x81/x33/xa3/x31 HANGUL CHOSEONG SIOS-CHIEUCH
-+<U1138>     /x81/x33/xa3/x32 HANGUL CHOSEONG SIOS-KHIEUKH
-+<U1139>     /x81/x33/xa3/x33 HANGUL CHOSEONG SIOS-THIEUTH
-+<U113A>     /x81/x33/xa3/x34 HANGUL CHOSEONG SIOS-PHIEUPH
-+<U113B>     /x81/x33/xa3/x35 HANGUL CHOSEONG SIOS-HIEUH
-+<U113C>     /x81/x33/xa3/x36 HANGUL CHOSEONG CHITUEUMSIOS
-+<U113D>     /x81/x33/xa3/x37 HANGUL CHOSEONG CHITUEUMSSANGSIOS
-+<U113E>     /x81/x33/xa3/x38 HANGUL CHOSEONG CEONGCHIEUMSIOS
-+<U113F>     /x81/x33/xa3/x39 HANGUL CHOSEONG CEONGCHIEUMSSANGSIOS
-+<U1140>     /x81/x33/xa4/x30 HANGUL CHOSEONG PANSIOS
-+<U1141>     /x81/x33/xa4/x31 HANGUL CHOSEONG IEUNG-KIYEOK
-+<U1142>     /x81/x33/xa4/x32 HANGUL CHOSEONG IEUNG-TIKEUT
-+<U1143>     /x81/x33/xa4/x33 HANGUL CHOSEONG IEUNG-MIEUM
-+<U1144>     /x81/x33/xa4/x34 HANGUL CHOSEONG IEUNG-PIEUP
-+<U1145>     /x81/x33/xa4/x35 HANGUL CHOSEONG IEUNG-SIOS
-+<U1146>     /x81/x33/xa4/x36 HANGUL CHOSEONG IEUNG-PANSIOS
-+<U1147>     /x81/x33/xa4/x37 HANGUL CHOSEONG SSANGIEUNG
-+<U1148>     /x81/x33/xa4/x38 HANGUL CHOSEONG IEUNG-CIEUC
-+<U1149>     /x81/x33/xa4/x39 HANGUL CHOSEONG IEUNG-CHIEUCH
-+<U114A>     /x81/x33/xa5/x30 HANGUL CHOSEONG IEUNG-THIEUTH
-+<U114B>     /x81/x33/xa5/x31 HANGUL CHOSEONG IEUNG-PHIEUPH
-+<U114C>     /x81/x33/xa5/x32 HANGUL CHOSEONG YESIEUNG
-+<U114D>     /x81/x33/xa5/x33 HANGUL CHOSEONG CIEUC-IEUNG
-+<U114E>     /x81/x33/xa5/x34 HANGUL CHOSEONG CHITUEUMCIEUC
-+<U114F>     /x81/x33/xa5/x35 HANGUL CHOSEONG CHITUEUMSSANGCIEUC
-+<U1150>     /x81/x33/xa5/x36 HANGUL CHOSEONG CEONGCHIEUMCIEUC
-+<U1151>     /x81/x33/xa5/x37 HANGUL CHOSEONG CEONGCHIEUMSSANGCIEUC
-+<U1152>     /x81/x33/xa5/x38 HANGUL CHOSEONG CHIEUCH-KHIEUKH
-+<U1153>     /x81/x33/xa5/x39 HANGUL CHOSEONG CHIEUCH-HIEUH
-+<U1154>     /x81/x33/xa6/x30 HANGUL CHOSEONG CHITUEUMCHIEUCH
-+<U1155>     /x81/x33/xa6/x31 HANGUL CHOSEONG CEONGCHIEUMCHIEUCH
-+<U1156>     /x81/x33/xa6/x32 HANGUL CHOSEONG PHIEUPH-PIEUP
-+<U1157>     /x81/x33/xa6/x33 HANGUL CHOSEONG KAPYEOUNPHIEUPH
-+<U1158>     /x81/x33/xa6/x34 HANGUL CHOSEONG SSANGHIEUH
-+<U1159>     /x81/x33/xa6/x35 HANGUL CHOSEONG YEORINHIEUH
-+<U115A>     /x81/x33/xa6/x36 <UNASSIGNED>
-+<U115B>     /x81/x33/xa6/x37 <UNASSIGNED>
-+<U115C>     /x81/x33/xa6/x38 <UNASSIGNED>
-+<U115D>     /x81/x33/xa6/x39 <UNASSIGNED>
-+<U115E>     /x81/x33/xa7/x30 <UNASSIGNED>
-+<U115F>     /x81/x33/xa7/x31 HANGUL CHOSEONG FILLER
-+<U1160>     /x81/x33/xa7/x32 HANGUL JUNGSEONG FILLER
-+<U1161>     /x81/x33/xa7/x33 HANGUL JUNGSEONG A
-+<U1162>     /x81/x33/xa7/x34 HANGUL JUNGSEONG AE
-+<U1163>     /x81/x33/xa7/x35 HANGUL JUNGSEONG YA
-+<U1164>     /x81/x33/xa7/x36 HANGUL JUNGSEONG YAE
-+<U1165>     /x81/x33/xa7/x37 HANGUL JUNGSEONG EO
-+<U1166>     /x81/x33/xa7/x38 HANGUL JUNGSEONG E
-+<U1167>     /x81/x33/xa7/x39 HANGUL JUNGSEONG YEO
-+<U1168>     /x81/x33/xa8/x30 HANGUL JUNGSEONG YE
-+<U1169>     /x81/x33/xa8/x31 HANGUL JUNGSEONG O
-+<U116A>     /x81/x33/xa8/x32 HANGUL JUNGSEONG WA
-+<U116B>     /x81/x33/xa8/x33 HANGUL JUNGSEONG WAE
-+<U116C>     /x81/x33/xa8/x34 HANGUL JUNGSEONG OE
-+<U116D>     /x81/x33/xa8/x35 HANGUL JUNGSEONG YO
-+<U116E>     /x81/x33/xa8/x36 HANGUL JUNGSEONG U
-+<U116F>     /x81/x33/xa8/x37 HANGUL JUNGSEONG WEO
-+<U1170>     /x81/x33/xa8/x38 HANGUL JUNGSEONG WE
-+<U1171>     /x81/x33/xa8/x39 HANGUL JUNGSEONG WI
-+<U1172>     /x81/x33/xa9/x30 HANGUL JUNGSEONG YU
-+<U1173>     /x81/x33/xa9/x31 HANGUL JUNGSEONG EU
-+<U1174>     /x81/x33/xa9/x32 HANGUL JUNGSEONG YI
-+<U1175>     /x81/x33/xa9/x33 HANGUL JUNGSEONG I
-+<U1176>     /x81/x33/xa9/x34 HANGUL JUNGSEONG A-O
-+<U1177>     /x81/x33/xa9/x35 HANGUL JUNGSEONG A-U
-+<U1178>     /x81/x33/xa9/x36 HANGUL JUNGSEONG YA-O
-+<U1179>     /x81/x33/xa9/x37 HANGUL JUNGSEONG YA-YO
-+<U117A>     /x81/x33/xa9/x38 HANGUL JUNGSEONG EO-O
-+<U117B>     /x81/x33/xa9/x39 HANGUL JUNGSEONG EO-U
-+<U117C>     /x81/x33/xaa/x30 HANGUL JUNGSEONG EO-EU
-+<U117D>     /x81/x33/xaa/x31 HANGUL JUNGSEONG YEO-O
-+<U117E>     /x81/x33/xaa/x32 HANGUL JUNGSEONG YEO-U
-+<U117F>     /x81/x33/xaa/x33 HANGUL JUNGSEONG O-EO
-+<U1180>     /x81/x33/xaa/x34 HANGUL JUNGSEONG O-E
-+<U1181>     /x81/x33/xaa/x35 HANGUL JUNGSEONG O-YE
-+<U1182>     /x81/x33/xaa/x36 HANGUL JUNGSEONG O-O
-+<U1183>     /x81/x33/xaa/x37 HANGUL JUNGSEONG O-U
-+<U1184>     /x81/x33/xaa/x38 HANGUL JUNGSEONG YO-YA
-+<U1185>     /x81/x33/xaa/x39 HANGUL JUNGSEONG YO-YAE
-+<U1186>     /x81/x33/xab/x30 HANGUL JUNGSEONG YO-YEO
-+<U1187>     /x81/x33/xab/x31 HANGUL JUNGSEONG YO-O
-+<U1188>     /x81/x33/xab/x32 HANGUL JUNGSEONG YO-I
-+<U1189>     /x81/x33/xab/x33 HANGUL JUNGSEONG U-A
-+<U118A>     /x81/x33/xab/x34 HANGUL JUNGSEONG U-AE
-+<U118B>     /x81/x33/xab/x35 HANGUL JUNGSEONG U-EO-EU
-+<U118C>     /x81/x33/xab/x36 HANGUL JUNGSEONG U-YE
-+<U118D>     /x81/x33/xab/x37 HANGUL JUNGSEONG U-U
-+<U118E>     /x81/x33/xab/x38 HANGUL JUNGSEONG YU-A
-+<U118F>     /x81/x33/xab/x39 HANGUL JUNGSEONG YU-EO
-+<U1190>     /x81/x33/xac/x30 HANGUL JUNGSEONG YU-E
-+<U1191>     /x81/x33/xac/x31 HANGUL JUNGSEONG YU-YEO
-+<U1192>     /x81/x33/xac/x32 HANGUL JUNGSEONG YU-YE
-+<U1193>     /x81/x33/xac/x33 HANGUL JUNGSEONG YU-U
-+<U1194>     /x81/x33/xac/x34 HANGUL JUNGSEONG YU-I
-+<U1195>     /x81/x33/xac/x35 HANGUL JUNGSEONG EU-U
-+<U1196>     /x81/x33/xac/x36 HANGUL JUNGSEONG EU-EU
-+<U1197>     /x81/x33/xac/x37 HANGUL JUNGSEONG YI-U
-+<U1198>     /x81/x33/xac/x38 HANGUL JUNGSEONG I-A
-+<U1199>     /x81/x33/xac/x39 HANGUL JUNGSEONG I-YA
-+<U119A>     /x81/x33/xad/x30 HANGUL JUNGSEONG I-O
-+<U119B>     /x81/x33/xad/x31 HANGUL JUNGSEONG I-U
-+<U119C>     /x81/x33/xad/x32 HANGUL JUNGSEONG I-EU
-+<U119D>     /x81/x33/xad/x33 HANGUL JUNGSEONG I-ARAEA
-+<U119E>     /x81/x33/xad/x34 HANGUL JUNGSEONG ARAEA
-+<U119F>     /x81/x33/xad/x35 HANGUL JUNGSEONG ARAEA-EO
-+<U11A0>     /x81/x33/xad/x36 HANGUL JUNGSEONG ARAEA-U
-+<U11A1>     /x81/x33/xad/x37 HANGUL JUNGSEONG ARAEA-I
-+<U11A2>     /x81/x33/xad/x38 HANGUL JUNGSEONG SSANGARAEA
-+<U11A3>     /x81/x33/xad/x39 <UNASSIGNED>
-+<U11A4>     /x81/x33/xae/x30 <UNASSIGNED>
-+<U11A5>     /x81/x33/xae/x31 <UNASSIGNED>
-+<U11A6>     /x81/x33/xae/x32 <UNASSIGNED>
-+<U11A7>     /x81/x33/xae/x33 <UNASSIGNED>
-+<U11A8>     /x81/x33/xae/x34 HANGUL JONGSEONG KIYEOK
-+<U11A9>     /x81/x33/xae/x35 HANGUL JONGSEONG SSANGKIYEOK
-+<U11AA>     /x81/x33/xae/x36 HANGUL JONGSEONG KIYEOK-SIOS
-+<U11AB>     /x81/x33/xae/x37 HANGUL JONGSEONG NIEUN
-+<U11AC>     /x81/x33/xae/x38 HANGUL JONGSEONG NIEUN-CIEUC
-+<U11AD>     /x81/x33/xae/x39 HANGUL JONGSEONG NIEUN-HIEUH
-+<U11AE>     /x81/x33/xaf/x30 HANGUL JONGSEONG TIKEUT
-+<U11AF>     /x81/x33/xaf/x31 HANGUL JONGSEONG RIEUL
-+<U11B0>     /x81/x33/xaf/x32 HANGUL JONGSEONG RIEUL-KIYEOK
-+<U11B1>     /x81/x33/xaf/x33 HANGUL JONGSEONG RIEUL-MIEUM
-+<U11B2>     /x81/x33/xaf/x34 HANGUL JONGSEONG RIEUL-PIEUP
-+<U11B3>     /x81/x33/xaf/x35 HANGUL JONGSEONG RIEUL-SIOS
-+<U11B4>     /x81/x33/xaf/x36 HANGUL JONGSEONG RIEUL-THIEUTH
-+<U11B5>     /x81/x33/xaf/x37 HANGUL JONGSEONG RIEUL-PHIEUPH
-+<U11B6>     /x81/x33/xaf/x38 HANGUL JONGSEONG RIEUL-HIEUH
-+<U11B7>     /x81/x33/xaf/x39 HANGUL JONGSEONG MIEUM
-+<U11B8>     /x81/x33/xb0/x30 HANGUL JONGSEONG PIEUP
-+<U11B9>     /x81/x33/xb0/x31 HANGUL JONGSEONG PIEUP-SIOS
-+<U11BA>     /x81/x33/xb0/x32 HANGUL JONGSEONG SIOS
-+<U11BB>     /x81/x33/xb0/x33 HANGUL JONGSEONG SSANGSIOS
-+<U11BC>     /x81/x33/xb0/x34 HANGUL JONGSEONG IEUNG
-+<U11BD>     /x81/x33/xb0/x35 HANGUL JONGSEONG CIEUC
-+<U11BE>     /x81/x33/xb0/x36 HANGUL JONGSEONG CHIEUCH
-+<U11BF>     /x81/x33/xb0/x37 HANGUL JONGSEONG KHIEUKH
-+<U11C0>     /x81/x33/xb0/x38 HANGUL JONGSEONG THIEUTH
-+<U11C1>     /x81/x33/xb0/x39 HANGUL JONGSEONG PHIEUPH
-+<U11C2>     /x81/x33/xb1/x30 HANGUL JONGSEONG HIEUH
-+<U11C3>     /x81/x33/xb1/x31 HANGUL JONGSEONG KIYEOK-RIEUL
-+<U11C4>     /x81/x33/xb1/x32 HANGUL JONGSEONG KIYEOK-SIOS-KIYEOK
-+<U11C5>     /x81/x33/xb1/x33 HANGUL JONGSEONG NIEUN-KIYEOK
-+<U11C6>     /x81/x33/xb1/x34 HANGUL JONGSEONG NIEUN-TIKEUT
-+<U11C7>     /x81/x33/xb1/x35 HANGUL JONGSEONG NIEUN-SIOS
-+<U11C8>     /x81/x33/xb1/x36 HANGUL JONGSEONG NIEUN-PANSIOS
-+<U11C9>     /x81/x33/xb1/x37 HANGUL JONGSEONG NIEUN-THIEUTH
-+<U11CA>     /x81/x33/xb1/x38 HANGUL JONGSEONG TIKEUT-KIYEOK
-+<U11CB>     /x81/x33/xb1/x39 HANGUL JONGSEONG TIKEUT-RIEUL
-+<U11CC>     /x81/x33/xb2/x30 HANGUL JONGSEONG RIEUL-KIYEOK-SIOS
-+<U11CD>     /x81/x33/xb2/x31 HANGUL JONGSEONG RIEUL-NIEUN
-+<U11CE>     /x81/x33/xb2/x32 HANGUL JONGSEONG RIEUL-TIKEUT
-+<U11CF>     /x81/x33/xb2/x33 HANGUL JONGSEONG RIEUL-TIKEUT-HIEUH
-+<U11D0>     /x81/x33/xb2/x34 HANGUL JONGSEONG SSANGRIEUL
-+<U11D1>     /x81/x33/xb2/x35 HANGUL JONGSEONG RIEUL-MIEUM-KIYEOK
-+<U11D2>     /x81/x33/xb2/x36 HANGUL JONGSEONG RIEUL-MIEUM-SIOS
-+<U11D3>     /x81/x33/xb2/x37 HANGUL JONGSEONG RIEUL-PIEUP-SIOS
-+<U11D4>     /x81/x33/xb2/x38 HANGUL JONGSEONG RIEUL-PIEUP-HIEUH
-+<U11D5>     /x81/x33/xb2/x39 HANGUL JONGSEONG RIEUL-KAPYEOUNPIEUP
-+<U11D6>     /x81/x33/xb3/x30 HANGUL JONGSEONG RIEUL-SSANGSIOS
-+<U11D7>     /x81/x33/xb3/x31 HANGUL JONGSEONG RIEUL-PANSIOS
-+<U11D8>     /x81/x33/xb3/x32 HANGUL JONGSEONG RIEUL-KHIEUKH
-+<U11D9>     /x81/x33/xb3/x33 HANGUL JONGSEONG RIEUL-YEORINHIEUH
-+<U11DA>     /x81/x33/xb3/x34 HANGUL JONGSEONG MIEUM-KIYEOK
-+<U11DB>     /x81/x33/xb3/x35 HANGUL JONGSEONG MIEUM-RIEUL
-+<U11DC>     /x81/x33/xb3/x36 HANGUL JONGSEONG MIEUM-PIEUP
-+<U11DD>     /x81/x33/xb3/x37 HANGUL JONGSEONG MIEUM-SIOS
-+<U11DE>     /x81/x33/xb3/x38 HANGUL JONGSEONG MIEUM-SSANGSIOS
-+<U11DF>     /x81/x33/xb3/x39 HANGUL JONGSEONG MIEUM-PANSIOS
-+<U11E0>     /x81/x33/xb4/x30 HANGUL JONGSEONG MIEUM-CHIEUCH
-+<U11E1>     /x81/x33/xb4/x31 HANGUL JONGSEONG MIEUM-HIEUH
-+<U11E2>     /x81/x33/xb4/x32 HANGUL JONGSEONG KAPYEOUNMIEUM
-+<U11E3>     /x81/x33/xb4/x33 HANGUL JONGSEONG PIEUP-RIEUL
-+<U11E4>     /x81/x33/xb4/x34 HANGUL JONGSEONG PIEUP-PHIEUPH
-+<U11E5>     /x81/x33/xb4/x35 HANGUL JONGSEONG PIEUP-HIEUH
-+<U11E6>     /x81/x33/xb4/x36 HANGUL JONGSEONG KAPYEOUNPIEUP
-+<U11E7>     /x81/x33/xb4/x37 HANGUL JONGSEONG SIOS-KIYEOK
-+<U11E8>     /x81/x33/xb4/x38 HANGUL JONGSEONG SIOS-TIKEUT
-+<U11E9>     /x81/x33/xb4/x39 HANGUL JONGSEONG SIOS-RIEUL
-+<U11EA>     /x81/x33/xb5/x30 HANGUL JONGSEONG SIOS-PIEUP
-+<U11EB>     /x81/x33/xb5/x31 HANGUL JONGSEONG PANSIOS
-+<U11EC>     /x81/x33/xb5/x32 HANGUL JONGSEONG IEUNG-KIYEOK
-+<U11ED>     /x81/x33/xb5/x33 HANGUL JONGSEONG IEUNG-SSANGKIYEOK
-+<U11EE>     /x81/x33/xb5/x34 HANGUL JONGSEONG SSANGIEUNG
-+<U11EF>     /x81/x33/xb5/x35 HANGUL JONGSEONG IEUNG-KHIEUKH
-+<U11F0>     /x81/x33/xb5/x36 HANGUL JONGSEONG YESIEUNG
-+<U11F1>     /x81/x33/xb5/x37 HANGUL JONGSEONG YESIEUNG-SIOS
-+<U11F2>     /x81/x33/xb5/x38 HANGUL JONGSEONG YESIEUNG-PANSIOS
-+<U11F3>     /x81/x33/xb5/x39 HANGUL JONGSEONG PHIEUPH-PIEUP
-+<U11F4>     /x81/x33/xb6/x30 HANGUL JONGSEONG KAPYEOUNPHIEUPH
-+<U11F5>     /x81/x33/xb6/x31 HANGUL JONGSEONG HIEUH-NIEUN
-+<U11F6>     /x81/x33/xb6/x32 HANGUL JONGSEONG HIEUH-RIEUL
-+<U11F7>     /x81/x33/xb6/x33 HANGUL JONGSEONG HIEUH-MIEUM
-+<U11F8>     /x81/x33/xb6/x34 HANGUL JONGSEONG HIEUH-PIEUP
-+<U11F9>     /x81/x33/xb6/x35 HANGUL JONGSEONG YEORINHIEUH
-+<U11FA>     /x81/x33/xb6/x36 <UNASSIGNED>
-+<U11FB>     /x81/x33/xb6/x37 <UNASSIGNED>
-+<U11FC>     /x81/x33/xb6/x38 <UNASSIGNED>
-+<U11FD>     /x81/x33/xb6/x39 <UNASSIGNED>
-+<U11FE>     /x81/x33/xb7/x30 <UNASSIGNED>
-+<U11FF>     /x81/x33/xb7/x31 <UNASSIGNED>
-+<U1200>     /x81/x33/xb7/x32 ETHIOPIC SYLLABLE HA
-+<U1201>     /x81/x33/xb7/x33 ETHIOPIC SYLLABLE HU
-+<U1202>     /x81/x33/xb7/x34 ETHIOPIC SYLLABLE HI
-+<U1203>     /x81/x33/xb7/x35 ETHIOPIC SYLLABLE HAA
-+<U1204>     /x81/x33/xb7/x36 ETHIOPIC SYLLABLE HEE
-+<U1205>     /x81/x33/xb7/x37 ETHIOPIC SYLLABLE HE
-+<U1206>     /x81/x33/xb7/x38 ETHIOPIC SYLLABLE HO
-+<U1207>     /x81/x33/xb7/x39 <UNASSIGNED>
-+<U1208>     /x81/x33/xb8/x30 ETHIOPIC SYLLABLE LA
-+<U1209>     /x81/x33/xb8/x31 ETHIOPIC SYLLABLE LU
-+<U120A>     /x81/x33/xb8/x32 ETHIOPIC SYLLABLE LI
-+<U120B>     /x81/x33/xb8/x33 ETHIOPIC SYLLABLE LAA
-+<U120C>     /x81/x33/xb8/x34 ETHIOPIC SYLLABLE LEE
-+<U120D>     /x81/x33/xb8/x35 ETHIOPIC SYLLABLE LE
-+<U120E>     /x81/x33/xb8/x36 ETHIOPIC SYLLABLE LO
-+<U120F>     /x81/x33/xb8/x37 ETHIOPIC SYLLABLE LWA
-+<U1210>     /x81/x33/xb8/x38 ETHIOPIC SYLLABLE HHA
-+<U1211>     /x81/x33/xb8/x39 ETHIOPIC SYLLABLE HHU
-+<U1212>     /x81/x33/xb9/x30 ETHIOPIC SYLLABLE HHI
-+<U1213>     /x81/x33/xb9/x31 ETHIOPIC SYLLABLE HHAA
-+<U1214>     /x81/x33/xb9/x32 ETHIOPIC SYLLABLE HHEE
-+<U1215>     /x81/x33/xb9/x33 ETHIOPIC SYLLABLE HHE
-+<U1216>     /x81/x33/xb9/x34 ETHIOPIC SYLLABLE HHO
-+<U1217>     /x81/x33/xb9/x35 ETHIOPIC SYLLABLE HHWA
-+<U1218>     /x81/x33/xb9/x36 ETHIOPIC SYLLABLE MA
-+<U1219>     /x81/x33/xb9/x37 ETHIOPIC SYLLABLE MU
-+<U121A>     /x81/x33/xb9/x38 ETHIOPIC SYLLABLE MI
-+<U121B>     /x81/x33/xb9/x39 ETHIOPIC SYLLABLE MAA
-+<U121C>     /x81/x33/xba/x30 ETHIOPIC SYLLABLE MEE
-+<U121D>     /x81/x33/xba/x31 ETHIOPIC SYLLABLE ME
-+<U121E>     /x81/x33/xba/x32 ETHIOPIC SYLLABLE MO
-+<U121F>     /x81/x33/xba/x33 ETHIOPIC SYLLABLE MWA
-+<U1220>     /x81/x33/xba/x34 ETHIOPIC SYLLABLE SZA
-+<U1221>     /x81/x33/xba/x35 ETHIOPIC SYLLABLE SZU
-+<U1222>     /x81/x33/xba/x36 ETHIOPIC SYLLABLE SZI
-+<U1223>     /x81/x33/xba/x37 ETHIOPIC SYLLABLE SZAA
-+<U1224>     /x81/x33/xba/x38 ETHIOPIC SYLLABLE SZEE
-+<U1225>     /x81/x33/xba/x39 ETHIOPIC SYLLABLE SZE
-+<U1226>     /x81/x33/xbb/x30 ETHIOPIC SYLLABLE SZO
-+<U1227>     /x81/x33/xbb/x31 ETHIOPIC SYLLABLE SZWA
-+<U1228>     /x81/x33/xbb/x32 ETHIOPIC SYLLABLE RA
-+<U1229>     /x81/x33/xbb/x33 ETHIOPIC SYLLABLE RU
-+<U122A>     /x81/x33/xbb/x34 ETHIOPIC SYLLABLE RI
-+<U122B>     /x81/x33/xbb/x35 ETHIOPIC SYLLABLE RAA
-+<U122C>     /x81/x33/xbb/x36 ETHIOPIC SYLLABLE REE
-+<U122D>     /x81/x33/xbb/x37 ETHIOPIC SYLLABLE RE
-+<U122E>     /x81/x33/xbb/x38 ETHIOPIC SYLLABLE RO
-+<U122F>     /x81/x33/xbb/x39 ETHIOPIC SYLLABLE RWA
-+<U1230>     /x81/x33/xbc/x30 ETHIOPIC SYLLABLE SA
-+<U1231>     /x81/x33/xbc/x31 ETHIOPIC SYLLABLE SU
-+<U1232>     /x81/x33/xbc/x32 ETHIOPIC SYLLABLE SI
-+<U1233>     /x81/x33/xbc/x33 ETHIOPIC SYLLABLE SAA
-+<U1234>     /x81/x33/xbc/x34 ETHIOPIC SYLLABLE SEE
-+<U1235>     /x81/x33/xbc/x35 ETHIOPIC SYLLABLE SE
-+<U1236>     /x81/x33/xbc/x36 ETHIOPIC SYLLABLE SO
-+<U1237>     /x81/x33/xbc/x37 ETHIOPIC SYLLABLE SWA
-+<U1238>     /x81/x33/xbc/x38 ETHIOPIC SYLLABLE SHA
-+<U1239>     /x81/x33/xbc/x39 ETHIOPIC SYLLABLE SHU
-+<U123A>     /x81/x33/xbd/x30 ETHIOPIC SYLLABLE SHI
-+<U123B>     /x81/x33/xbd/x31 ETHIOPIC SYLLABLE SHAA
-+<U123C>     /x81/x33/xbd/x32 ETHIOPIC SYLLABLE SHEE
-+<U123D>     /x81/x33/xbd/x33 ETHIOPIC SYLLABLE SHE
-+<U123E>     /x81/x33/xbd/x34 ETHIOPIC SYLLABLE SHO
-+<U123F>     /x81/x33/xbd/x35 ETHIOPIC SYLLABLE SHWA
-+<U1240>     /x81/x33/xbd/x36 ETHIOPIC SYLLABLE QA
-+<U1241>     /x81/x33/xbd/x37 ETHIOPIC SYLLABLE QU
-+<U1242>     /x81/x33/xbd/x38 ETHIOPIC SYLLABLE QI
-+<U1243>     /x81/x33/xbd/x39 ETHIOPIC SYLLABLE QAA
-+<U1244>     /x81/x33/xbe/x30 ETHIOPIC SYLLABLE QEE
-+<U1245>     /x81/x33/xbe/x31 ETHIOPIC SYLLABLE QE
-+<U1246>     /x81/x33/xbe/x32 ETHIOPIC SYLLABLE QO
-+<U1247>     /x81/x33/xbe/x33 <UNASSIGNED>
-+<U1248>     /x81/x33/xbe/x34 ETHIOPIC SYLLABLE QWA
-+<U1249>     /x81/x33/xbe/x35 <UNASSIGNED>
-+<U124A>     /x81/x33/xbe/x36 ETHIOPIC SYLLABLE QWI
-+<U124B>     /x81/x33/xbe/x37 ETHIOPIC SYLLABLE QWAA
-+<U124C>     /x81/x33/xbe/x38 ETHIOPIC SYLLABLE QWEE
-+<U124D>     /x81/x33/xbe/x39 ETHIOPIC SYLLABLE QWE
-+<U124E>     /x81/x33/xbf/x30 <UNASSIGNED>
-+<U124F>     /x81/x33/xbf/x31 <UNASSIGNED>
-+<U1250>     /x81/x33/xbf/x32 ETHIOPIC SYLLABLE QHA
-+<U1251>     /x81/x33/xbf/x33 ETHIOPIC SYLLABLE QHU
-+<U1252>     /x81/x33/xbf/x34 ETHIOPIC SYLLABLE QHI
-+<U1253>     /x81/x33/xbf/x35 ETHIOPIC SYLLABLE QHAA
-+<U1254>     /x81/x33/xbf/x36 ETHIOPIC SYLLABLE QHEE
-+<U1255>     /x81/x33/xbf/x37 ETHIOPIC SYLLABLE QHE
-+<U1256>     /x81/x33/xbf/x38 ETHIOPIC SYLLABLE QHO
-+<U1257>     /x81/x33/xbf/x39 <UNASSIGNED>
-+<U1258>     /x81/x33/xc0/x30 ETHIOPIC SYLLABLE QHWA
-+<U1259>     /x81/x33/xc0/x31 <UNASSIGNED>
-+<U125A>     /x81/x33/xc0/x32 ETHIOPIC SYLLABLE QHWI
-+<U125B>     /x81/x33/xc0/x33 ETHIOPIC SYLLABLE QHWAA
-+<U125C>     /x81/x33/xc0/x34 ETHIOPIC SYLLABLE QHWEE
-+<U125D>     /x81/x33/xc0/x35 ETHIOPIC SYLLABLE QHWE
-+<U125E>     /x81/x33/xc0/x36 <UNASSIGNED>
-+<U125F>     /x81/x33/xc0/x37 <UNASSIGNED>
-+<U1260>     /x81/x33/xc0/x38 ETHIOPIC SYLLABLE BA
-+<U1261>     /x81/x33/xc0/x39 ETHIOPIC SYLLABLE BU
-+<U1262>     /x81/x33/xc1/x30 ETHIOPIC SYLLABLE BI
-+<U1263>     /x81/x33/xc1/x31 ETHIOPIC SYLLABLE BAA
-+<U1264>     /x81/x33/xc1/x32 ETHIOPIC SYLLABLE BEE
-+<U1265>     /x81/x33/xc1/x33 ETHIOPIC SYLLABLE BE
-+<U1266>     /x81/x33/xc1/x34 ETHIOPIC SYLLABLE BO
-+<U1267>     /x81/x33/xc1/x35 ETHIOPIC SYLLABLE BWA
-+<U1268>     /x81/x33/xc1/x36 ETHIOPIC SYLLABLE VA
-+<U1269>     /x81/x33/xc1/x37 ETHIOPIC SYLLABLE VU
-+<U126A>     /x81/x33/xc1/x38 ETHIOPIC SYLLABLE VI
-+<U126B>     /x81/x33/xc1/x39 ETHIOPIC SYLLABLE VAA
-+<U126C>     /x81/x33/xc2/x30 ETHIOPIC SYLLABLE VEE
-+<U126D>     /x81/x33/xc2/x31 ETHIOPIC SYLLABLE VE
-+<U126E>     /x81/x33/xc2/x32 ETHIOPIC SYLLABLE VO
-+<U126F>     /x81/x33/xc2/x33 ETHIOPIC SYLLABLE VWA
-+<U1270>     /x81/x33/xc2/x34 ETHIOPIC SYLLABLE TA
-+<U1271>     /x81/x33/xc2/x35 ETHIOPIC SYLLABLE TU
-+<U1272>     /x81/x33/xc2/x36 ETHIOPIC SYLLABLE TI
-+<U1273>     /x81/x33/xc2/x37 ETHIOPIC SYLLABLE TAA
-+<U1274>     /x81/x33/xc2/x38 ETHIOPIC SYLLABLE TEE
-+<U1275>     /x81/x33/xc2/x39 ETHIOPIC SYLLABLE TE
-+<U1276>     /x81/x33/xc3/x30 ETHIOPIC SYLLABLE TO
-+<U1277>     /x81/x33/xc3/x31 ETHIOPIC SYLLABLE TWA
-+<U1278>     /x81/x33/xc3/x32 ETHIOPIC SYLLABLE CA
-+<U1279>     /x81/x33/xc3/x33 ETHIOPIC SYLLABLE CU
-+<U127A>     /x81/x33/xc3/x34 ETHIOPIC SYLLABLE CI
-+<U127B>     /x81/x33/xc3/x35 ETHIOPIC SYLLABLE CAA
-+<U127C>     /x81/x33/xc3/x36 ETHIOPIC SYLLABLE CEE
-+<U127D>     /x81/x33/xc3/x37 ETHIOPIC SYLLABLE CE
-+<U127E>     /x81/x33/xc3/x38 ETHIOPIC SYLLABLE CO
-+<U127F>     /x81/x33/xc3/x39 ETHIOPIC SYLLABLE CWA
-+<U1280>     /x81/x33/xc4/x30 ETHIOPIC SYLLABLE XA
-+<U1281>     /x81/x33/xc4/x31 ETHIOPIC SYLLABLE XU
-+<U1282>     /x81/x33/xc4/x32 ETHIOPIC SYLLABLE XI
-+<U1283>     /x81/x33/xc4/x33 ETHIOPIC SYLLABLE XAA
-+<U1284>     /x81/x33/xc4/x34 ETHIOPIC SYLLABLE XEE
-+<U1285>     /x81/x33/xc4/x35 ETHIOPIC SYLLABLE XE
-+<U1286>     /x81/x33/xc4/x36 ETHIOPIC SYLLABLE XO
-+<U1287>     /x81/x33/xc4/x37 <UNASSIGNED>
-+<U1288>     /x81/x33/xc4/x38 ETHIOPIC SYLLABLE XWA
-+<U1289>     /x81/x33/xc4/x39 <UNASSIGNED>
-+<U128A>     /x81/x33/xc5/x30 ETHIOPIC SYLLABLE XWI
-+<U128B>     /x81/x33/xc5/x31 ETHIOPIC SYLLABLE XWAA
-+<U128C>     /x81/x33/xc5/x32 ETHIOPIC SYLLABLE XWEE
-+<U128D>     /x81/x33/xc5/x33 ETHIOPIC SYLLABLE XWE
-+<U128E>     /x81/x33/xc5/x34 <UNASSIGNED>
-+<U128F>     /x81/x33/xc5/x35 <UNASSIGNED>
-+<U1290>     /x81/x33/xc5/x36 ETHIOPIC SYLLABLE NA
-+<U1291>     /x81/x33/xc5/x37 ETHIOPIC SYLLABLE NU
-+<U1292>     /x81/x33/xc5/x38 ETHIOPIC SYLLABLE NI
-+<U1293>     /x81/x33/xc5/x39 ETHIOPIC SYLLABLE NAA
-+<U1294>     /x81/x33/xc6/x30 ETHIOPIC SYLLABLE NEE
-+<U1295>     /x81/x33/xc6/x31 ETHIOPIC SYLLABLE NE
-+<U1296>     /x81/x33/xc6/x32 ETHIOPIC SYLLABLE NO
-+<U1297>     /x81/x33/xc6/x33 ETHIOPIC SYLLABLE NWA
-+<U1298>     /x81/x33/xc6/x34 ETHIOPIC SYLLABLE NYA
-+<U1299>     /x81/x33/xc6/x35 ETHIOPIC SYLLABLE NYU
-+<U129A>     /x81/x33/xc6/x36 ETHIOPIC SYLLABLE NYI
-+<U129B>     /x81/x33/xc6/x37 ETHIOPIC SYLLABLE NYAA
-+<U129C>     /x81/x33/xc6/x38 ETHIOPIC SYLLABLE NYEE
-+<U129D>     /x81/x33/xc6/x39 ETHIOPIC SYLLABLE NYE
-+<U129E>     /x81/x33/xc7/x30 ETHIOPIC SYLLABLE NYO
-+<U129F>     /x81/x33/xc7/x31 ETHIOPIC SYLLABLE NYWA
-+<U12A0>     /x81/x33/xc7/x32 ETHIOPIC SYLLABLE GLOTTAL A
-+<U12A1>     /x81/x33/xc7/x33 ETHIOPIC SYLLABLE GLOTTAL U
-+<U12A2>     /x81/x33/xc7/x34 ETHIOPIC SYLLABLE GLOTTAL I
-+<U12A3>     /x81/x33/xc7/x35 ETHIOPIC SYLLABLE GLOTTAL AA
-+<U12A4>     /x81/x33/xc7/x36 ETHIOPIC SYLLABLE GLOTTAL EE
-+<U12A5>     /x81/x33/xc7/x37 ETHIOPIC SYLLABLE GLOTTAL E
-+<U12A6>     /x81/x33/xc7/x38 ETHIOPIC SYLLABLE GLOTTAL O
-+<U12A7>     /x81/x33/xc7/x39 ETHIOPIC SYLLABLE GLOTTAL WA
-+<U12A8>     /x81/x33/xc8/x30 ETHIOPIC SYLLABLE KA
-+<U12A9>     /x81/x33/xc8/x31 ETHIOPIC SYLLABLE KU
-+<U12AA>     /x81/x33/xc8/x32 ETHIOPIC SYLLABLE KI
-+<U12AB>     /x81/x33/xc8/x33 ETHIOPIC SYLLABLE KAA
-+<U12AC>     /x81/x33/xc8/x34 ETHIOPIC SYLLABLE KEE
-+<U12AD>     /x81/x33/xc8/x35 ETHIOPIC SYLLABLE KE
-+<U12AE>     /x81/x33/xc8/x36 ETHIOPIC SYLLABLE KO
-+<U12AF>     /x81/x33/xc8/x37 <UNASSIGNED>
-+<U12B0>     /x81/x33/xc8/x38 ETHIOPIC SYLLABLE KWA
-+<U12B1>     /x81/x33/xc8/x39 <UNASSIGNED>
-+<U12B2>     /x81/x33/xc9/x30 ETHIOPIC SYLLABLE KWI
-+<U12B3>     /x81/x33/xc9/x31 ETHIOPIC SYLLABLE KWAA
-+<U12B4>     /x81/x33/xc9/x32 ETHIOPIC SYLLABLE KWEE
-+<U12B5>     /x81/x33/xc9/x33 ETHIOPIC SYLLABLE KWE
-+<U12B6>     /x81/x33/xc9/x34 <UNASSIGNED>
-+<U12B7>     /x81/x33/xc9/x35 <UNASSIGNED>
-+<U12B8>     /x81/x33/xc9/x36 ETHIOPIC SYLLABLE KXA
-+<U12B9>     /x81/x33/xc9/x37 ETHIOPIC SYLLABLE KXU
-+<U12BA>     /x81/x33/xc9/x38 ETHIOPIC SYLLABLE KXI
-+<U12BB>     /x81/x33/xc9/x39 ETHIOPIC SYLLABLE KXAA
-+<U12BC>     /x81/x33/xca/x30 ETHIOPIC SYLLABLE KXEE
-+<U12BD>     /x81/x33/xca/x31 ETHIOPIC SYLLABLE KXE
-+<U12BE>     /x81/x33/xca/x32 ETHIOPIC SYLLABLE KXO
-+<U12BF>     /x81/x33/xca/x33 <UNASSIGNED>
-+<U12C0>     /x81/x33/xca/x34 ETHIOPIC SYLLABLE KXWA
-+<U12C1>     /x81/x33/xca/x35 <UNASSIGNED>
-+<U12C2>     /x81/x33/xca/x36 ETHIOPIC SYLLABLE KXWI
-+<U12C3>     /x81/x33/xca/x37 ETHIOPIC SYLLABLE KXWAA
-+<U12C4>     /x81/x33/xca/x38 ETHIOPIC SYLLABLE KXWEE
-+<U12C5>     /x81/x33/xca/x39 ETHIOPIC SYLLABLE KXWE
-+<U12C6>     /x81/x33/xcb/x30 <UNASSIGNED>
-+<U12C7>     /x81/x33/xcb/x31 <UNASSIGNED>
-+<U12C8>     /x81/x33/xcb/x32 ETHIOPIC SYLLABLE WA
-+<U12C9>     /x81/x33/xcb/x33 ETHIOPIC SYLLABLE WU
-+<U12CA>     /x81/x33/xcb/x34 ETHIOPIC SYLLABLE WI
-+<U12CB>     /x81/x33/xcb/x35 ETHIOPIC SYLLABLE WAA
-+<U12CC>     /x81/x33/xcb/x36 ETHIOPIC SYLLABLE WEE
-+<U12CD>     /x81/x33/xcb/x37 ETHIOPIC SYLLABLE WE
-+<U12CE>     /x81/x33/xcb/x38 ETHIOPIC SYLLABLE WO
-+<U12CF>     /x81/x33/xcb/x39 <UNASSIGNED>
-+<U12D0>     /x81/x33/xcc/x30 ETHIOPIC SYLLABLE PHARYNGEAL A
-+<U12D1>     /x81/x33/xcc/x31 ETHIOPIC SYLLABLE PHARYNGEAL U
-+<U12D2>     /x81/x33/xcc/x32 ETHIOPIC SYLLABLE PHARYNGEAL I
-+<U12D3>     /x81/x33/xcc/x33 ETHIOPIC SYLLABLE PHARYNGEAL AA
-+<U12D4>     /x81/x33/xcc/x34 ETHIOPIC SYLLABLE PHARYNGEAL EE
-+<U12D5>     /x81/x33/xcc/x35 ETHIOPIC SYLLABLE PHARYNGEAL E
-+<U12D6>     /x81/x33/xcc/x36 ETHIOPIC SYLLABLE PHARYNGEAL O
-+<U12D7>     /x81/x33/xcc/x37 <UNASSIGNED>
-+<U12D8>     /x81/x33/xcc/x38 ETHIOPIC SYLLABLE ZA
-+<U12D9>     /x81/x33/xcc/x39 ETHIOPIC SYLLABLE ZU
-+<U12DA>     /x81/x33/xcd/x30 ETHIOPIC SYLLABLE ZI
-+<U12DB>     /x81/x33/xcd/x31 ETHIOPIC SYLLABLE ZAA
-+<U12DC>     /x81/x33/xcd/x32 ETHIOPIC SYLLABLE ZEE
-+<U12DD>     /x81/x33/xcd/x33 ETHIOPIC SYLLABLE ZE
-+<U12DE>     /x81/x33/xcd/x34 ETHIOPIC SYLLABLE ZO
-+<U12DF>     /x81/x33/xcd/x35 ETHIOPIC SYLLABLE ZWA
-+<U12E0>     /x81/x33/xcd/x36 ETHIOPIC SYLLABLE ZHA
-+<U12E1>     /x81/x33/xcd/x37 ETHIOPIC SYLLABLE ZHU
-+<U12E2>     /x81/x33/xcd/x38 ETHIOPIC SYLLABLE ZHI
-+<U12E3>     /x81/x33/xcd/x39 ETHIOPIC SYLLABLE ZHAA
-+<U12E4>     /x81/x33/xce/x30 ETHIOPIC SYLLABLE ZHEE
-+<U12E5>     /x81/x33/xce/x31 ETHIOPIC SYLLABLE ZHE
-+<U12E6>     /x81/x33/xce/x32 ETHIOPIC SYLLABLE ZHO
-+<U12E7>     /x81/x33/xce/x33 ETHIOPIC SYLLABLE ZHWA
-+<U12E8>     /x81/x33/xce/x34 ETHIOPIC SYLLABLE YA
-+<U12E9>     /x81/x33/xce/x35 ETHIOPIC SYLLABLE YU
-+<U12EA>     /x81/x33/xce/x36 ETHIOPIC SYLLABLE YI
-+<U12EB>     /x81/x33/xce/x37 ETHIOPIC SYLLABLE YAA
-+<U12EC>     /x81/x33/xce/x38 ETHIOPIC SYLLABLE YEE
-+<U12ED>     /x81/x33/xce/x39 ETHIOPIC SYLLABLE YE
-+<U12EE>     /x81/x33/xcf/x30 ETHIOPIC SYLLABLE YO
-+<U12EF>     /x81/x33/xcf/x31 <UNASSIGNED>
-+<U12F0>     /x81/x33/xcf/x32 ETHIOPIC SYLLABLE DA
-+<U12F1>     /x81/x33/xcf/x33 ETHIOPIC SYLLABLE DU
-+<U12F2>     /x81/x33/xcf/x34 ETHIOPIC SYLLABLE DI
-+<U12F3>     /x81/x33/xcf/x35 ETHIOPIC SYLLABLE DAA
-+<U12F4>     /x81/x33/xcf/x36 ETHIOPIC SYLLABLE DEE
-+<U12F5>     /x81/x33/xcf/x37 ETHIOPIC SYLLABLE DE
-+<U12F6>     /x81/x33/xcf/x38 ETHIOPIC SYLLABLE DO
-+<U12F7>     /x81/x33/xcf/x39 ETHIOPIC SYLLABLE DWA
-+<U12F8>     /x81/x33/xd0/x30 ETHIOPIC SYLLABLE DDA
-+<U12F9>     /x81/x33/xd0/x31 ETHIOPIC SYLLABLE DDU
-+<U12FA>     /x81/x33/xd0/x32 ETHIOPIC SYLLABLE DDI
-+<U12FB>     /x81/x33/xd0/x33 ETHIOPIC SYLLABLE DDAA
-+<U12FC>     /x81/x33/xd0/x34 ETHIOPIC SYLLABLE DDEE
-+<U12FD>     /x81/x33/xd0/x35 ETHIOPIC SYLLABLE DDE
-+<U12FE>     /x81/x33/xd0/x36 ETHIOPIC SYLLABLE DDO
-+<U12FF>     /x81/x33/xd0/x37 ETHIOPIC SYLLABLE DDWA
-+<U1300>     /x81/x33/xd0/x38 ETHIOPIC SYLLABLE JA
-+<U1301>     /x81/x33/xd0/x39 ETHIOPIC SYLLABLE JU
-+<U1302>     /x81/x33/xd1/x30 ETHIOPIC SYLLABLE JI
-+<U1303>     /x81/x33/xd1/x31 ETHIOPIC SYLLABLE JAA
-+<U1304>     /x81/x33/xd1/x32 ETHIOPIC SYLLABLE JEE
-+<U1305>     /x81/x33/xd1/x33 ETHIOPIC SYLLABLE JE
-+<U1306>     /x81/x33/xd1/x34 ETHIOPIC SYLLABLE JO
-+<U1307>     /x81/x33/xd1/x35 ETHIOPIC SYLLABLE JWA
-+<U1308>     /x81/x33/xd1/x36 ETHIOPIC SYLLABLE GA
-+<U1309>     /x81/x33/xd1/x37 ETHIOPIC SYLLABLE GU
-+<U130A>     /x81/x33/xd1/x38 ETHIOPIC SYLLABLE GI
-+<U130B>     /x81/x33/xd1/x39 ETHIOPIC SYLLABLE GAA
-+<U130C>     /x81/x33/xd2/x30 ETHIOPIC SYLLABLE GEE
-+<U130D>     /x81/x33/xd2/x31 ETHIOPIC SYLLABLE GE
-+<U130E>     /x81/x33/xd2/x32 ETHIOPIC SYLLABLE GO
-+<U130F>     /x81/x33/xd2/x33 <UNASSIGNED>
-+<U1310>     /x81/x33/xd2/x34 ETHIOPIC SYLLABLE GWA
-+<U1311>     /x81/x33/xd2/x35 <UNASSIGNED>
-+<U1312>     /x81/x33/xd2/x36 ETHIOPIC SYLLABLE GWI
-+<U1313>     /x81/x33/xd2/x37 ETHIOPIC SYLLABLE GWAA
-+<U1314>     /x81/x33/xd2/x38 ETHIOPIC SYLLABLE GWEE
-+<U1315>     /x81/x33/xd2/x39 ETHIOPIC SYLLABLE GWE
-+<U1316>     /x81/x33/xd3/x30 <UNASSIGNED>
-+<U1317>     /x81/x33/xd3/x31 <UNASSIGNED>
-+<U1318>     /x81/x33/xd3/x32 ETHIOPIC SYLLABLE GGA
-+<U1319>     /x81/x33/xd3/x33 ETHIOPIC SYLLABLE GGU
-+<U131A>     /x81/x33/xd3/x34 ETHIOPIC SYLLABLE GGI
-+<U131B>     /x81/x33/xd3/x35 ETHIOPIC SYLLABLE GGAA
-+<U131C>     /x81/x33/xd3/x36 ETHIOPIC SYLLABLE GGEE
-+<U131D>     /x81/x33/xd3/x37 ETHIOPIC SYLLABLE GGE
-+<U131E>     /x81/x33/xd3/x38 ETHIOPIC SYLLABLE GGO
-+<U131F>     /x81/x33/xd3/x39 <UNASSIGNED>
-+<U1320>     /x81/x33/xd4/x30 ETHIOPIC SYLLABLE THA
-+<U1321>     /x81/x33/xd4/x31 ETHIOPIC SYLLABLE THU
-+<U1322>     /x81/x33/xd4/x32 ETHIOPIC SYLLABLE THI
-+<U1323>     /x81/x33/xd4/x33 ETHIOPIC SYLLABLE THAA
-+<U1324>     /x81/x33/xd4/x34 ETHIOPIC SYLLABLE THEE
-+<U1325>     /x81/x33/xd4/x35 ETHIOPIC SYLLABLE THE
-+<U1326>     /x81/x33/xd4/x36 ETHIOPIC SYLLABLE THO
-+<U1327>     /x81/x33/xd4/x37 ETHIOPIC SYLLABLE THWA
-+<U1328>     /x81/x33/xd4/x38 ETHIOPIC SYLLABLE CHA
-+<U1329>     /x81/x33/xd4/x39 ETHIOPIC SYLLABLE CHU
-+<U132A>     /x81/x33/xd5/x30 ETHIOPIC SYLLABLE CHI
-+<U132B>     /x81/x33/xd5/x31 ETHIOPIC SYLLABLE CHAA
-+<U132C>     /x81/x33/xd5/x32 ETHIOPIC SYLLABLE CHEE
-+<U132D>     /x81/x33/xd5/x33 ETHIOPIC SYLLABLE CHE
-+<U132E>     /x81/x33/xd5/x34 ETHIOPIC SYLLABLE CHO
-+<U132F>     /x81/x33/xd5/x35 ETHIOPIC SYLLABLE CHWA
-+<U1330>     /x81/x33/xd5/x36 ETHIOPIC SYLLABLE PHA
-+<U1331>     /x81/x33/xd5/x37 ETHIOPIC SYLLABLE PHU
-+<U1332>     /x81/x33/xd5/x38 ETHIOPIC SYLLABLE PHI
-+<U1333>     /x81/x33/xd5/x39 ETHIOPIC SYLLABLE PHAA
-+<U1334>     /x81/x33/xd6/x30 ETHIOPIC SYLLABLE PHEE
-+<U1335>     /x81/x33/xd6/x31 ETHIOPIC SYLLABLE PHE
-+<U1336>     /x81/x33/xd6/x32 ETHIOPIC SYLLABLE PHO
-+<U1337>     /x81/x33/xd6/x33 ETHIOPIC SYLLABLE PHWA
-+<U1338>     /x81/x33/xd6/x34 ETHIOPIC SYLLABLE TSA
-+<U1339>     /x81/x33/xd6/x35 ETHIOPIC SYLLABLE TSU
-+<U133A>     /x81/x33/xd6/x36 ETHIOPIC SYLLABLE TSI
-+<U133B>     /x81/x33/xd6/x37 ETHIOPIC SYLLABLE TSAA
-+<U133C>     /x81/x33/xd6/x38 ETHIOPIC SYLLABLE TSEE
-+<U133D>     /x81/x33/xd6/x39 ETHIOPIC SYLLABLE TSE
-+<U133E>     /x81/x33/xd7/x30 ETHIOPIC SYLLABLE TSO
-+<U133F>     /x81/x33/xd7/x31 ETHIOPIC SYLLABLE TSWA
-+<U1340>     /x81/x33/xd7/x32 ETHIOPIC SYLLABLE TZA
-+<U1341>     /x81/x33/xd7/x33 ETHIOPIC SYLLABLE TZU
-+<U1342>     /x81/x33/xd7/x34 ETHIOPIC SYLLABLE TZI
-+<U1343>     /x81/x33/xd7/x35 ETHIOPIC SYLLABLE TZAA
-+<U1344>     /x81/x33/xd7/x36 ETHIOPIC SYLLABLE TZEE
-+<U1345>     /x81/x33/xd7/x37 ETHIOPIC SYLLABLE TZE
-+<U1346>     /x81/x33/xd7/x38 ETHIOPIC SYLLABLE TZO
-+<U1347>     /x81/x33/xd7/x39 <UNASSIGNED>
-+<U1348>     /x81/x33/xd8/x30 ETHIOPIC SYLLABLE FA
-+<U1349>     /x81/x33/xd8/x31 ETHIOPIC SYLLABLE FU
-+<U134A>     /x81/x33/xd8/x32 ETHIOPIC SYLLABLE FI
-+<U134B>     /x81/x33/xd8/x33 ETHIOPIC SYLLABLE FAA
-+<U134C>     /x81/x33/xd8/x34 ETHIOPIC SYLLABLE FEE
-+<U134D>     /x81/x33/xd8/x35 ETHIOPIC SYLLABLE FE
-+<U134E>     /x81/x33/xd8/x36 ETHIOPIC SYLLABLE FO
-+<U134F>     /x81/x33/xd8/x37 ETHIOPIC SYLLABLE FWA
-+<U1350>     /x81/x33/xd8/x38 ETHIOPIC SYLLABLE PA
-+<U1351>     /x81/x33/xd8/x39 ETHIOPIC SYLLABLE PU
-+<U1352>     /x81/x33/xd9/x30 ETHIOPIC SYLLABLE PI
-+<U1353>     /x81/x33/xd9/x31 ETHIOPIC SYLLABLE PAA
-+<U1354>     /x81/x33/xd9/x32 ETHIOPIC SYLLABLE PEE
-+<U1355>     /x81/x33/xd9/x33 ETHIOPIC SYLLABLE PE
-+<U1356>     /x81/x33/xd9/x34 ETHIOPIC SYLLABLE PO
-+<U1357>     /x81/x33/xd9/x35 ETHIOPIC SYLLABLE PWA
-+<U1358>     /x81/x33/xd9/x36 ETHIOPIC SYLLABLE RYA
-+<U1359>     /x81/x33/xd9/x37 ETHIOPIC SYLLABLE MYA
-+<U135A>     /x81/x33/xd9/x38 ETHIOPIC SYLLABLE FYA
-+<U135B>     /x81/x33/xd9/x39 <UNASSIGNED>
-+<U135C>     /x81/x33/xda/x30 <UNASSIGNED>
-+<U135D>     /x81/x33/xda/x31 <UNASSIGNED>
-+<U135E>     /x81/x33/xda/x32 <UNASSIGNED>
-+<U135F>     /x81/x33/xda/x33 <UNASSIGNED>
-+<U1360>     /x81/x33/xda/x34 <UNASSIGNED>
-+<U1361>     /x81/x33/xda/x35 ETHIOPIC WORDSPACE
-+<U1362>     /x81/x33/xda/x36 ETHIOPIC FULL STOP
-+<U1363>     /x81/x33/xda/x37 ETHIOPIC COMMA
-+<U1364>     /x81/x33/xda/x38 ETHIOPIC SEMICOLON
-+<U1365>     /x81/x33/xda/x39 ETHIOPIC COLON
-+<U1366>     /x81/x33/xdb/x30 ETHIOPIC PREFACE COLON
-+<U1367>     /x81/x33/xdb/x31 ETHIOPIC QUESTION MARK
-+<U1368>     /x81/x33/xdb/x32 ETHIOPIC PARAGRAPH SEPARATOR
-+<U1369>     /x81/x33/xdb/x33 ETHIOPIC DIGIT ONE
-+<U136A>     /x81/x33/xdb/x34 ETHIOPIC DIGIT TWO
-+<U136B>     /x81/x33/xdb/x35 ETHIOPIC DIGIT THREE
-+<U136C>     /x81/x33/xdb/x36 ETHIOPIC DIGIT FOUR
-+<U136D>     /x81/x33/xdb/x37 ETHIOPIC DIGIT FIVE
-+<U136E>     /x81/x33/xdb/x38 ETHIOPIC DIGIT SIX
-+<U136F>     /x81/x33/xdb/x39 ETHIOPIC DIGIT SEVEN
-+<U1370>     /x81/x33/xdc/x30 ETHIOPIC DIGIT EIGHT
-+<U1371>     /x81/x33/xdc/x31 ETHIOPIC DIGIT NINE
-+<U1372>     /x81/x33/xdc/x32 ETHIOPIC NUMBER TEN
-+<U1373>     /x81/x33/xdc/x33 ETHIOPIC NUMBER TWENTY
-+<U1374>     /x81/x33/xdc/x34 ETHIOPIC NUMBER THIRTY
-+<U1375>     /x81/x33/xdc/x35 ETHIOPIC NUMBER FORTY
-+<U1376>     /x81/x33/xdc/x36 ETHIOPIC NUMBER FIFTY
-+<U1377>     /x81/x33/xdc/x37 ETHIOPIC NUMBER SIXTY
-+<U1378>     /x81/x33/xdc/x38 ETHIOPIC NUMBER SEVENTY
-+<U1379>     /x81/x33/xdc/x39 ETHIOPIC NUMBER EIGHTY
-+<U137A>     /x81/x33/xdd/x30 ETHIOPIC NUMBER NINETY
-+<U137B>     /x81/x33/xdd/x31 ETHIOPIC NUMBER HUNDRED
-+<U137C>     /x81/x33/xdd/x32 ETHIOPIC NUMBER TEN THOUSAND
-+<U137D>     /x81/x33/xdd/x33 <UNASSIGNED>
-+<U137E>     /x81/x33/xdd/x34 <UNASSIGNED>
-+<U137F>     /x81/x33/xdd/x35 <UNASSIGNED>
-+<U1380>     /x81/x33/xdd/x36 <UNASSIGNED>
-+<U1381>     /x81/x33/xdd/x37 <UNASSIGNED>
-+<U1382>     /x81/x33/xdd/x38 <UNASSIGNED>
-+<U1383>     /x81/x33/xdd/x39 <UNASSIGNED>
-+<U1384>     /x81/x33/xde/x30 <UNASSIGNED>
-+<U1385>     /x81/x33/xde/x31 <UNASSIGNED>
-+<U1386>     /x81/x33/xde/x32 <UNASSIGNED>
-+<U1387>     /x81/x33/xde/x33 <UNASSIGNED>
-+<U1388>     /x81/x33/xde/x34 <UNASSIGNED>
-+<U1389>     /x81/x33/xde/x35 <UNASSIGNED>
-+<U138A>     /x81/x33/xde/x36 <UNASSIGNED>
-+<U138B>     /x81/x33/xde/x37 <UNASSIGNED>
-+<U138C>     /x81/x33/xde/x38 <UNASSIGNED>
-+<U138D>     /x81/x33/xde/x39 <UNASSIGNED>
-+<U138E>     /x81/x33/xdf/x30 <UNASSIGNED>
-+<U138F>     /x81/x33/xdf/x31 <UNASSIGNED>
-+<U1390>     /x81/x33/xdf/x32 <UNASSIGNED>
-+<U1391>     /x81/x33/xdf/x33 <UNASSIGNED>
-+<U1392>     /x81/x33/xdf/x34 <UNASSIGNED>
-+<U1393>     /x81/x33/xdf/x35 <UNASSIGNED>
-+<U1394>     /x81/x33/xdf/x36 <UNASSIGNED>
-+<U1395>     /x81/x33/xdf/x37 <UNASSIGNED>
-+<U1396>     /x81/x33/xdf/x38 <UNASSIGNED>
-+<U1397>     /x81/x33/xdf/x39 <UNASSIGNED>
-+<U1398>     /x81/x33/xe0/x30 <UNASSIGNED>
-+<U1399>     /x81/x33/xe0/x31 <UNASSIGNED>
-+<U139A>     /x81/x33/xe0/x32 <UNASSIGNED>
-+<U139B>     /x81/x33/xe0/x33 <UNASSIGNED>
-+<U139C>     /x81/x33/xe0/x34 <UNASSIGNED>
-+<U139D>     /x81/x33/xe0/x35 <UNASSIGNED>
-+<U139E>     /x81/x33/xe0/x36 <UNASSIGNED>
-+<U139F>     /x81/x33/xe0/x37 <UNASSIGNED>
-+<U13A0>     /x81/x33/xe0/x38 CHEROKEE LETTER A
-+<U13A1>     /x81/x33/xe0/x39 CHEROKEE LETTER E
-+<U13A2>     /x81/x33/xe1/x30 CHEROKEE LETTER I
-+<U13A3>     /x81/x33/xe1/x31 CHEROKEE LETTER O
-+<U13A4>     /x81/x33/xe1/x32 CHEROKEE LETTER U
-+<U13A5>     /x81/x33/xe1/x33 CHEROKEE LETTER V
-+<U13A6>     /x81/x33/xe1/x34 CHEROKEE LETTER GA
-+<U13A7>     /x81/x33/xe1/x35 CHEROKEE LETTER KA
-+<U13A8>     /x81/x33/xe1/x36 CHEROKEE LETTER GE
-+<U13A9>     /x81/x33/xe1/x37 CHEROKEE LETTER GI
-+<U13AA>     /x81/x33/xe1/x38 CHEROKEE LETTER GO
-+<U13AB>     /x81/x33/xe1/x39 CHEROKEE LETTER GU
-+<U13AC>     /x81/x33/xe2/x30 CHEROKEE LETTER GV
-+<U13AD>     /x81/x33/xe2/x31 CHEROKEE LETTER HA
-+<U13AE>     /x81/x33/xe2/x32 CHEROKEE LETTER HE
-+<U13AF>     /x81/x33/xe2/x33 CHEROKEE LETTER HI
-+<U13B0>     /x81/x33/xe2/x34 CHEROKEE LETTER HO
-+<U13B1>     /x81/x33/xe2/x35 CHEROKEE LETTER HU
-+<U13B2>     /x81/x33/xe2/x36 CHEROKEE LETTER HV
-+<U13B3>     /x81/x33/xe2/x37 CHEROKEE LETTER LA
-+<U13B4>     /x81/x33/xe2/x38 CHEROKEE LETTER LE
-+<U13B5>     /x81/x33/xe2/x39 CHEROKEE LETTER LI
-+<U13B6>     /x81/x33/xe3/x30 CHEROKEE LETTER LO
-+<U13B7>     /x81/x33/xe3/x31 CHEROKEE LETTER LU
-+<U13B8>     /x81/x33/xe3/x32 CHEROKEE LETTER LV
-+<U13B9>     /x81/x33/xe3/x33 CHEROKEE LETTER MA
-+<U13BA>     /x81/x33/xe3/x34 CHEROKEE LETTER ME
-+<U13BB>     /x81/x33/xe3/x35 CHEROKEE LETTER MI
-+<U13BC>     /x81/x33/xe3/x36 CHEROKEE LETTER MO
-+<U13BD>     /x81/x33/xe3/x37 CHEROKEE LETTER MU
-+<U13BE>     /x81/x33/xe3/x38 CHEROKEE LETTER NA
-+<U13BF>     /x81/x33/xe3/x39 CHEROKEE LETTER HNA
-+<U13C0>     /x81/x33/xe4/x30 CHEROKEE LETTER NAH
-+<U13C1>     /x81/x33/xe4/x31 CHEROKEE LETTER NE
-+<U13C2>     /x81/x33/xe4/x32 CHEROKEE LETTER NI
-+<U13C3>     /x81/x33/xe4/x33 CHEROKEE LETTER NO
-+<U13C4>     /x81/x33/xe4/x34 CHEROKEE LETTER NU
-+<U13C5>     /x81/x33/xe4/x35 CHEROKEE LETTER NV
-+<U13C6>     /x81/x33/xe4/x36 CHEROKEE LETTER QUA
-+<U13C7>     /x81/x33/xe4/x37 CHEROKEE LETTER QUE
-+<U13C8>     /x81/x33/xe4/x38 CHEROKEE LETTER QUI
-+<U13C9>     /x81/x33/xe4/x39 CHEROKEE LETTER QUO
-+<U13CA>     /x81/x33/xe5/x30 CHEROKEE LETTER QUU
-+<U13CB>     /x81/x33/xe5/x31 CHEROKEE LETTER QUV
-+<U13CC>     /x81/x33/xe5/x32 CHEROKEE LETTER SA
-+<U13CD>     /x81/x33/xe5/x33 CHEROKEE LETTER S
-+<U13CE>     /x81/x33/xe5/x34 CHEROKEE LETTER SE
-+<U13CF>     /x81/x33/xe5/x35 CHEROKEE LETTER SI
-+<U13D0>     /x81/x33/xe5/x36 CHEROKEE LETTER SO
-+<U13D1>     /x81/x33/xe5/x37 CHEROKEE LETTER SU
-+<U13D2>     /x81/x33/xe5/x38 CHEROKEE LETTER SV
-+<U13D3>     /x81/x33/xe5/x39 CHEROKEE LETTER DA
-+<U13D4>     /x81/x33/xe6/x30 CHEROKEE LETTER TA
-+<U13D5>     /x81/x33/xe6/x31 CHEROKEE LETTER DE
-+<U13D6>     /x81/x33/xe6/x32 CHEROKEE LETTER TE
-+<U13D7>     /x81/x33/xe6/x33 CHEROKEE LETTER DI
-+<U13D8>     /x81/x33/xe6/x34 CHEROKEE LETTER TI
-+<U13D9>     /x81/x33/xe6/x35 CHEROKEE LETTER DO
-+<U13DA>     /x81/x33/xe6/x36 CHEROKEE LETTER DU
-+<U13DB>     /x81/x33/xe6/x37 CHEROKEE LETTER DV
-+<U13DC>     /x81/x33/xe6/x38 CHEROKEE LETTER DLA
-+<U13DD>     /x81/x33/xe6/x39 CHEROKEE LETTER TLA
-+<U13DE>     /x81/x33/xe7/x30 CHEROKEE LETTER TLE
-+<U13DF>     /x81/x33/xe7/x31 CHEROKEE LETTER TLI
-+<U13E0>     /x81/x33/xe7/x32 CHEROKEE LETTER TLO
-+<U13E1>     /x81/x33/xe7/x33 CHEROKEE LETTER TLU
-+<U13E2>     /x81/x33/xe7/x34 CHEROKEE LETTER TLV
-+<U13E3>     /x81/x33/xe7/x35 CHEROKEE LETTER TSA
-+<U13E4>     /x81/x33/xe7/x36 CHEROKEE LETTER TSE
-+<U13E5>     /x81/x33/xe7/x37 CHEROKEE LETTER TSI
-+<U13E6>     /x81/x33/xe7/x38 CHEROKEE LETTER TSO
-+<U13E7>     /x81/x33/xe7/x39 CHEROKEE LETTER TSU
-+<U13E8>     /x81/x33/xe8/x30 CHEROKEE LETTER TSV
-+<U13E9>     /x81/x33/xe8/x31 CHEROKEE LETTER WA
-+<U13EA>     /x81/x33/xe8/x32 CHEROKEE LETTER WE
-+<U13EB>     /x81/x33/xe8/x33 CHEROKEE LETTER WI
-+<U13EC>     /x81/x33/xe8/x34 CHEROKEE LETTER WO
-+<U13ED>     /x81/x33/xe8/x35 CHEROKEE LETTER WU
-+<U13EE>     /x81/x33/xe8/x36 CHEROKEE LETTER WV
-+<U13EF>     /x81/x33/xe8/x37 CHEROKEE LETTER YA
-+<U13F0>     /x81/x33/xe8/x38 CHEROKEE LETTER YE
-+<U13F1>     /x81/x33/xe8/x39 CHEROKEE LETTER YI
-+<U13F2>     /x81/x33/xe9/x30 CHEROKEE LETTER YO
-+<U13F3>     /x81/x33/xe9/x31 CHEROKEE LETTER YU
-+<U13F4>     /x81/x33/xe9/x32 CHEROKEE LETTER YV
-+<U13F5>     /x81/x33/xe9/x33 <UNASSIGNED>
-+<U13F6>     /x81/x33/xe9/x34 <UNASSIGNED>
-+<U13F7>     /x81/x33/xe9/x35 <UNASSIGNED>
-+<U13F8>     /x81/x33/xe9/x36 <UNASSIGNED>
-+<U13F9>     /x81/x33/xe9/x37 <UNASSIGNED>
-+<U13FA>     /x81/x33/xe9/x38 <UNASSIGNED>
-+<U13FB>     /x81/x33/xe9/x39 <UNASSIGNED>
-+<U13FC>     /x81/x33/xea/x30 <UNASSIGNED>
-+<U13FD>     /x81/x33/xea/x31 <UNASSIGNED>
-+<U13FE>     /x81/x33/xea/x32 <UNASSIGNED>
-+<U13FF>     /x81/x33/xea/x33 <UNASSIGNED>
-+<U1400>     /x81/x33/xea/x34 <UNASSIGNED>
-+<U1401>     /x81/x33/xea/x35 CANADIAN SYLLABICS E
-+<U1402>     /x81/x33/xea/x36 CANADIAN SYLLABICS AAI
-+<U1403>     /x81/x33/xea/x37 CANADIAN SYLLABICS I
-+<U1404>     /x81/x33/xea/x38 CANADIAN SYLLABICS II
-+<U1405>     /x81/x33/xea/x39 CANADIAN SYLLABICS O
-+<U1406>     /x81/x33/xeb/x30 CANADIAN SYLLABICS OO
-+<U1407>     /x81/x33/xeb/x31 CANADIAN SYLLABICS Y-CREE OO
-+<U1408>     /x81/x33/xeb/x32 CANADIAN SYLLABICS CARRIER EE
-+<U1409>     /x81/x33/xeb/x33 CANADIAN SYLLABICS CARRIER I
-+<U140A>     /x81/x33/xeb/x34 CANADIAN SYLLABICS A
-+<U140B>     /x81/x33/xeb/x35 CANADIAN SYLLABICS AA
-+<U140C>     /x81/x33/xeb/x36 CANADIAN SYLLABICS WE
-+<U140D>     /x81/x33/xeb/x37 CANADIAN SYLLABICS WEST-CREE WE
-+<U140E>     /x81/x33/xeb/x38 CANADIAN SYLLABICS WI
-+<U140F>     /x81/x33/xeb/x39 CANADIAN SYLLABICS WEST-CREE WI
-+<U1410>     /x81/x33/xec/x30 CANADIAN SYLLABICS WII
-+<U1411>     /x81/x33/xec/x31 CANADIAN SYLLABICS WEST-CREE WII
-+<U1412>     /x81/x33/xec/x32 CANADIAN SYLLABICS WO
-+<U1413>     /x81/x33/xec/x33 CANADIAN SYLLABICS WEST-CREE WO
-+<U1414>     /x81/x33/xec/x34 CANADIAN SYLLABICS WOO
-+<U1415>     /x81/x33/xec/x35 CANADIAN SYLLABICS WEST-CREE WOO
-+<U1416>     /x81/x33/xec/x36 CANADIAN SYLLABICS NASKAPI WOO
-+<U1417>     /x81/x33/xec/x37 CANADIAN SYLLABICS WA
-+<U1418>     /x81/x33/xec/x38 CANADIAN SYLLABICS WEST-CREE WA
-+<U1419>     /x81/x33/xec/x39 CANADIAN SYLLABICS WAA
-+<U141A>     /x81/x33/xed/x30 CANADIAN SYLLABICS WEST-CREE WAA
-+<U141B>     /x81/x33/xed/x31 CANADIAN SYLLABICS NASKAPI WAA
-+<U141C>     /x81/x33/xed/x32 CANADIAN SYLLABICS AI
-+<U141D>     /x81/x33/xed/x33 CANADIAN SYLLABICS Y-CREE W
-+<U141E>     /x81/x33/xed/x34 CANADIAN SYLLABICS GLOTTAL STOP
-+<U141F>     /x81/x33/xed/x35 CANADIAN SYLLABICS FINAL ACUTE
-+<U1420>     /x81/x33/xed/x36 CANADIAN SYLLABICS FINAL GRAVE
-+<U1421>     /x81/x33/xed/x37 CANADIAN SYLLABICS FINAL BOTTOM HALF RING
-+<U1422>     /x81/x33/xed/x38 CANADIAN SYLLABICS FINAL TOP HALF RING
-+<U1423>     /x81/x33/xed/x39 CANADIAN SYLLABICS FINAL RIGHT HALF RING
-+<U1424>     /x81/x33/xee/x30 CANADIAN SYLLABICS FINAL RING
-+<U1425>     /x81/x33/xee/x31 CANADIAN SYLLABICS FINAL DOUBLE ACUTE
-+<U1426>     /x81/x33/xee/x32 CANADIAN SYLLABICS FINAL DOUBLE SHORT VERTICAL STROKES
-+<U1427>     /x81/x33/xee/x33 CANADIAN SYLLABICS FINAL MIDDLE DOT
-+<U1428>     /x81/x33/xee/x34 CANADIAN SYLLABICS FINAL SHORT HORIZONTAL STROKE
-+<U1429>     /x81/x33/xee/x35 CANADIAN SYLLABICS FINAL PLUS
-+<U142A>     /x81/x33/xee/x36 CANADIAN SYLLABICS FINAL DOWN TACK
-+<U142B>     /x81/x33/xee/x37 CANADIAN SYLLABICS EN
-+<U142C>     /x81/x33/xee/x38 CANADIAN SYLLABICS IN
-+<U142D>     /x81/x33/xee/x39 CANADIAN SYLLABICS ON
-+<U142E>     /x81/x33/xef/x30 CANADIAN SYLLABICS AN
-+<U142F>     /x81/x33/xef/x31 CANADIAN SYLLABICS PE
-+<U1430>     /x81/x33/xef/x32 CANADIAN SYLLABICS PAAI
-+<U1431>     /x81/x33/xef/x33 CANADIAN SYLLABICS PI
-+<U1432>     /x81/x33/xef/x34 CANADIAN SYLLABICS PII
-+<U1433>     /x81/x33/xef/x35 CANADIAN SYLLABICS PO
-+<U1434>     /x81/x33/xef/x36 CANADIAN SYLLABICS POO
-+<U1435>     /x81/x33/xef/x37 CANADIAN SYLLABICS Y-CREE POO
-+<U1436>     /x81/x33/xef/x38 CANADIAN SYLLABICS CARRIER HEE
-+<U1437>     /x81/x33/xef/x39 CANADIAN SYLLABICS CARRIER HI
-+<U1438>     /x81/x33/xf0/x30 CANADIAN SYLLABICS PA
-+<U1439>     /x81/x33/xf0/x31 CANADIAN SYLLABICS PAA
-+<U143A>     /x81/x33/xf0/x32 CANADIAN SYLLABICS PWE
-+<U143B>     /x81/x33/xf0/x33 CANADIAN SYLLABICS WEST-CREE PWE
-+<U143C>     /x81/x33/xf0/x34 CANADIAN SYLLABICS PWI
-+<U143D>     /x81/x33/xf0/x35 CANADIAN SYLLABICS WEST-CREE PWI
-+<U143E>     /x81/x33/xf0/x36 CANADIAN SYLLABICS PWII
-+<U143F>     /x81/x33/xf0/x37 CANADIAN SYLLABICS WEST-CREE PWII
-+<U1440>     /x81/x33/xf0/x38 CANADIAN SYLLABICS PWO
-+<U1441>     /x81/x33/xf0/x39 CANADIAN SYLLABICS WEST-CREE PWO
-+<U1442>     /x81/x33/xf1/x30 CANADIAN SYLLABICS PWOO
-+<U1443>     /x81/x33/xf1/x31 CANADIAN SYLLABICS WEST-CREE PWOO
-+<U1444>     /x81/x33/xf1/x32 CANADIAN SYLLABICS PWA
-+<U1445>     /x81/x33/xf1/x33 CANADIAN SYLLABICS WEST-CREE PWA
-+<U1446>     /x81/x33/xf1/x34 CANADIAN SYLLABICS PWAA
-+<U1447>     /x81/x33/xf1/x35 CANADIAN SYLLABICS WEST-CREE PWAA
-+<U1448>     /x81/x33/xf1/x36 CANADIAN SYLLABICS Y-CREE PWAA
-+<U1449>     /x81/x33/xf1/x37 CANADIAN SYLLABICS P
-+<U144A>     /x81/x33/xf1/x38 CANADIAN SYLLABICS WEST-CREE P
-+<U144B>     /x81/x33/xf1/x39 CANADIAN SYLLABICS CARRIER H
-+<U144C>     /x81/x33/xf2/x30 CANADIAN SYLLABICS TE
-+<U144D>     /x81/x33/xf2/x31 CANADIAN SYLLABICS TAAI
-+<U144E>     /x81/x33/xf2/x32 CANADIAN SYLLABICS TI
-+<U144F>     /x81/x33/xf2/x33 CANADIAN SYLLABICS TII
-+<U1450>     /x81/x33/xf2/x34 CANADIAN SYLLABICS TO
-+<U1451>     /x81/x33/xf2/x35 CANADIAN SYLLABICS TOO
-+<U1452>     /x81/x33/xf2/x36 CANADIAN SYLLABICS Y-CREE TOO
-+<U1453>     /x81/x33/xf2/x37 CANADIAN SYLLABICS CARRIER DEE
-+<U1454>     /x81/x33/xf2/x38 CANADIAN SYLLABICS CARRIER DI
-+<U1455>     /x81/x33/xf2/x39 CANADIAN SYLLABICS TA
-+<U1456>     /x81/x33/xf3/x30 CANADIAN SYLLABICS TAA
-+<U1457>     /x81/x33/xf3/x31 CANADIAN SYLLABICS TWE
-+<U1458>     /x81/x33/xf3/x32 CANADIAN SYLLABICS WEST-CREE TWE
-+<U1459>     /x81/x33/xf3/x33 CANADIAN SYLLABICS TWI
-+<U145A>     /x81/x33/xf3/x34 CANADIAN SYLLABICS WEST-CREE TWI
-+<U145B>     /x81/x33/xf3/x35 CANADIAN SYLLABICS TWII
-+<U145C>     /x81/x33/xf3/x36 CANADIAN SYLLABICS WEST-CREE TWII
-+<U145D>     /x81/x33/xf3/x37 CANADIAN SYLLABICS TWO
-+<U145E>     /x81/x33/xf3/x38 CANADIAN SYLLABICS WEST-CREE TWO
-+<U145F>     /x81/x33/xf3/x39 CANADIAN SYLLABICS TWOO
-+<U1460>     /x81/x33/xf4/x30 CANADIAN SYLLABICS WEST-CREE TWOO
-+<U1461>     /x81/x33/xf4/x31 CANADIAN SYLLABICS TWA
-+<U1462>     /x81/x33/xf4/x32 CANADIAN SYLLABICS WEST-CREE TWA
-+<U1463>     /x81/x33/xf4/x33 CANADIAN SYLLABICS TWAA
-+<U1464>     /x81/x33/xf4/x34 CANADIAN SYLLABICS WEST-CREE TWAA
-+<U1465>     /x81/x33/xf4/x35 CANADIAN SYLLABICS NASKAPI TWAA
-+<U1466>     /x81/x33/xf4/x36 CANADIAN SYLLABICS T
-+<U1467>     /x81/x33/xf4/x37 CANADIAN SYLLABICS TTE
-+<U1468>     /x81/x33/xf4/x38 CANADIAN SYLLABICS TTI
-+<U1469>     /x81/x33/xf4/x39 CANADIAN SYLLABICS TTO
-+<U146A>     /x81/x33/xf5/x30 CANADIAN SYLLABICS TTA
-+<U146B>     /x81/x33/xf5/x31 CANADIAN SYLLABICS KE
-+<U146C>     /x81/x33/xf5/x32 CANADIAN SYLLABICS KAAI
-+<U146D>     /x81/x33/xf5/x33 CANADIAN SYLLABICS KI
-+<U146E>     /x81/x33/xf5/x34 CANADIAN SYLLABICS KII
-+<U146F>     /x81/x33/xf5/x35 CANADIAN SYLLABICS KO
-+<U1470>     /x81/x33/xf5/x36 CANADIAN SYLLABICS KOO
-+<U1471>     /x81/x33/xf5/x37 CANADIAN SYLLABICS Y-CREE KOO
-+<U1472>     /x81/x33/xf5/x38 CANADIAN SYLLABICS KA
-+<U1473>     /x81/x33/xf5/x39 CANADIAN SYLLABICS KAA
-+<U1474>     /x81/x33/xf6/x30 CANADIAN SYLLABICS KWE
-+<U1475>     /x81/x33/xf6/x31 CANADIAN SYLLABICS WEST-CREE KWE
-+<U1476>     /x81/x33/xf6/x32 CANADIAN SYLLABICS KWI
-+<U1477>     /x81/x33/xf6/x33 CANADIAN SYLLABICS WEST-CREE KWI
-+<U1478>     /x81/x33/xf6/x34 CANADIAN SYLLABICS KWII
-+<U1479>     /x81/x33/xf6/x35 CANADIAN SYLLABICS WEST-CREE KWII
-+<U147A>     /x81/x33/xf6/x36 CANADIAN SYLLABICS KWO
-+<U147B>     /x81/x33/xf6/x37 CANADIAN SYLLABICS WEST-CREE KWO
-+<U147C>     /x81/x33/xf6/x38 CANADIAN SYLLABICS KWOO
-+<U147D>     /x81/x33/xf6/x39 CANADIAN SYLLABICS WEST-CREE KWOO
-+<U147E>     /x81/x33/xf7/x30 CANADIAN SYLLABICS KWA
-+<U147F>     /x81/x33/xf7/x31 CANADIAN SYLLABICS WEST-CREE KWA
-+<U1480>     /x81/x33/xf7/x32 CANADIAN SYLLABICS KWAA
-+<U1481>     /x81/x33/xf7/x33 CANADIAN SYLLABICS WEST-CREE KWAA
-+<U1482>     /x81/x33/xf7/x34 CANADIAN SYLLABICS NASKAPI KWAA
-+<U1483>     /x81/x33/xf7/x35 CANADIAN SYLLABICS K
-+<U1484>     /x81/x33/xf7/x36 CANADIAN SYLLABICS KW
-+<U1485>     /x81/x33/xf7/x37 CANADIAN SYLLABICS SOUTH-SLAVEY KEH
-+<U1486>     /x81/x33/xf7/x38 CANADIAN SYLLABICS SOUTH-SLAVEY KIH
-+<U1487>     /x81/x33/xf7/x39 CANADIAN SYLLABICS SOUTH-SLAVEY KOH
-+<U1488>     /x81/x33/xf8/x30 CANADIAN SYLLABICS SOUTH-SLAVEY KAH
-+<U1489>     /x81/x33/xf8/x31 CANADIAN SYLLABICS CE
-+<U148A>     /x81/x33/xf8/x32 CANADIAN SYLLABICS CAAI
-+<U148B>     /x81/x33/xf8/x33 CANADIAN SYLLABICS CI
-+<U148C>     /x81/x33/xf8/x34 CANADIAN SYLLABICS CII
-+<U148D>     /x81/x33/xf8/x35 CANADIAN SYLLABICS CO
-+<U148E>     /x81/x33/xf8/x36 CANADIAN SYLLABICS COO
-+<U148F>     /x81/x33/xf8/x37 CANADIAN SYLLABICS Y-CREE COO
-+<U1490>     /x81/x33/xf8/x38 CANADIAN SYLLABICS CA
-+<U1491>     /x81/x33/xf8/x39 CANADIAN SYLLABICS CAA
-+<U1492>     /x81/x33/xf9/x30 CANADIAN SYLLABICS CWE
-+<U1493>     /x81/x33/xf9/x31 CANADIAN SYLLABICS WEST-CREE CWE
-+<U1494>     /x81/x33/xf9/x32 CANADIAN SYLLABICS CWI
-+<U1495>     /x81/x33/xf9/x33 CANADIAN SYLLABICS WEST-CREE CWI
-+<U1496>     /x81/x33/xf9/x34 CANADIAN SYLLABICS CWII
-+<U1497>     /x81/x33/xf9/x35 CANADIAN SYLLABICS WEST-CREE CWII
-+<U1498>     /x81/x33/xf9/x36 CANADIAN SYLLABICS CWO
-+<U1499>     /x81/x33/xf9/x37 CANADIAN SYLLABICS WEST-CREE CWO
-+<U149A>     /x81/x33/xf9/x38 CANADIAN SYLLABICS CWOO
-+<U149B>     /x81/x33/xf9/x39 CANADIAN SYLLABICS WEST-CREE CWOO
-+<U149C>     /x81/x33/xfa/x30 CANADIAN SYLLABICS CWA
-+<U149D>     /x81/x33/xfa/x31 CANADIAN SYLLABICS WEST-CREE CWA
-+<U149E>     /x81/x33/xfa/x32 CANADIAN SYLLABICS CWAA
-+<U149F>     /x81/x33/xfa/x33 CANADIAN SYLLABICS WEST-CREE CWAA
-+<U14A0>     /x81/x33/xfa/x34 CANADIAN SYLLABICS NASKAPI CWAA
-+<U14A1>     /x81/x33/xfa/x35 CANADIAN SYLLABICS C
-+<U14A2>     /x81/x33/xfa/x36 CANADIAN SYLLABICS SAYISI TH
-+<U14A3>     /x81/x33/xfa/x37 CANADIAN SYLLABICS ME
-+<U14A4>     /x81/x33/xfa/x38 CANADIAN SYLLABICS MAAI
-+<U14A5>     /x81/x33/xfa/x39 CANADIAN SYLLABICS MI
-+<U14A6>     /x81/x33/xfb/x30 CANADIAN SYLLABICS MII
-+<U14A7>     /x81/x33/xfb/x31 CANADIAN SYLLABICS MO
-+<U14A8>     /x81/x33/xfb/x32 CANADIAN SYLLABICS MOO
-+<U14A9>     /x81/x33/xfb/x33 CANADIAN SYLLABICS Y-CREE MOO
-+<U14AA>     /x81/x33/xfb/x34 CANADIAN SYLLABICS MA
-+<U14AB>     /x81/x33/xfb/x35 CANADIAN SYLLABICS MAA
-+<U14AC>     /x81/x33/xfb/x36 CANADIAN SYLLABICS MWE
-+<U14AD>     /x81/x33/xfb/x37 CANADIAN SYLLABICS WEST-CREE MWE
-+<U14AE>     /x81/x33/xfb/x38 CANADIAN SYLLABICS MWI
-+<U14AF>     /x81/x33/xfb/x39 CANADIAN SYLLABICS WEST-CREE MWI
-+<U14B0>     /x81/x33/xfc/x30 CANADIAN SYLLABICS MWII
-+<U14B1>     /x81/x33/xfc/x31 CANADIAN SYLLABICS WEST-CREE MWII
-+<U14B2>     /x81/x33/xfc/x32 CANADIAN SYLLABICS MWO
-+<U14B3>     /x81/x33/xfc/x33 CANADIAN SYLLABICS WEST-CREE MWO
-+<U14B4>     /x81/x33/xfc/x34 CANADIAN SYLLABICS MWOO
-+<U14B5>     /x81/x33/xfc/x35 CANADIAN SYLLABICS WEST-CREE MWOO
-+<U14B6>     /x81/x33/xfc/x36 CANADIAN SYLLABICS MWA
-+<U14B7>     /x81/x33/xfc/x37 CANADIAN SYLLABICS WEST-CREE MWA
-+<U14B8>     /x81/x33/xfc/x38 CANADIAN SYLLABICS MWAA
-+<U14B9>     /x81/x33/xfc/x39 CANADIAN SYLLABICS WEST-CREE MWAA
-+<U14BA>     /x81/x33/xfd/x30 CANADIAN SYLLABICS NASKAPI MWAA
-+<U14BB>     /x81/x33/xfd/x31 CANADIAN SYLLABICS M
-+<U14BC>     /x81/x33/xfd/x32 CANADIAN SYLLABICS WEST-CREE M
-+<U14BD>     /x81/x33/xfd/x33 CANADIAN SYLLABICS MH
-+<U14BE>     /x81/x33/xfd/x34 CANADIAN SYLLABICS ATHAPASCAN M
-+<U14BF>     /x81/x33/xfd/x35 CANADIAN SYLLABICS SAYISI M
-+<U14C0>     /x81/x33/xfd/x36 CANADIAN SYLLABICS NE
-+<U14C1>     /x81/x33/xfd/x37 CANADIAN SYLLABICS NAAI
-+<U14C2>     /x81/x33/xfd/x38 CANADIAN SYLLABICS NI
-+<U14C3>     /x81/x33/xfd/x39 CANADIAN SYLLABICS NII
-+<U14C4>     /x81/x33/xfe/x30 CANADIAN SYLLABICS NO
-+<U14C5>     /x81/x33/xfe/x31 CANADIAN SYLLABICS NOO
-+<U14C6>     /x81/x33/xfe/x32 CANADIAN SYLLABICS Y-CREE NOO
-+<U14C7>     /x81/x33/xfe/x33 CANADIAN SYLLABICS NA
-+<U14C8>     /x81/x33/xfe/x34 CANADIAN SYLLABICS NAA
-+<U14C9>     /x81/x33/xfe/x35 CANADIAN SYLLABICS NWE
-+<U14CA>     /x81/x33/xfe/x36 CANADIAN SYLLABICS WEST-CREE NWE
-+<U14CB>     /x81/x33/xfe/x37 CANADIAN SYLLABICS NWA
-+<U14CC>     /x81/x33/xfe/x38 CANADIAN SYLLABICS WEST-CREE NWA
-+<U14CD>     /x81/x33/xfe/x39 CANADIAN SYLLABICS NWAA
-+<U14CE>     /x81/x34/x81/x30 CANADIAN SYLLABICS WEST-CREE NWAA
-+<U14CF>     /x81/x34/x81/x31 CANADIAN SYLLABICS NASKAPI NWAA
-+<U14D0>     /x81/x34/x81/x32 CANADIAN SYLLABICS N
-+<U14D1>     /x81/x34/x81/x33 CANADIAN SYLLABICS CARRIER NG
-+<U14D2>     /x81/x34/x81/x34 CANADIAN SYLLABICS NH
-+<U14D3>     /x81/x34/x81/x35 CANADIAN SYLLABICS LE
-+<U14D4>     /x81/x34/x81/x36 CANADIAN SYLLABICS LAAI
-+<U14D5>     /x81/x34/x81/x37 CANADIAN SYLLABICS LI
-+<U14D6>     /x81/x34/x81/x38 CANADIAN SYLLABICS LII
-+<U14D7>     /x81/x34/x81/x39 CANADIAN SYLLABICS LO
-+<U14D8>     /x81/x34/x82/x30 CANADIAN SYLLABICS LOO
-+<U14D9>     /x81/x34/x82/x31 CANADIAN SYLLABICS Y-CREE LOO
-+<U14DA>     /x81/x34/x82/x32 CANADIAN SYLLABICS LA
-+<U14DB>     /x81/x34/x82/x33 CANADIAN SYLLABICS LAA
-+<U14DC>     /x81/x34/x82/x34 CANADIAN SYLLABICS LWE
-+<U14DD>     /x81/x34/x82/x35 CANADIAN SYLLABICS WEST-CREE LWE
-+<U14DE>     /x81/x34/x82/x36 CANADIAN SYLLABICS LWI
-+<U14DF>     /x81/x34/x82/x37 CANADIAN SYLLABICS WEST-CREE LWI
-+<U14E0>     /x81/x34/x82/x38 CANADIAN SYLLABICS LWII
-+<U14E1>     /x81/x34/x82/x39 CANADIAN SYLLABICS WEST-CREE LWII
-+<U14E2>     /x81/x34/x83/x30 CANADIAN SYLLABICS LWO
-+<U14E3>     /x81/x34/x83/x31 CANADIAN SYLLABICS WEST-CREE LWO
-+<U14E4>     /x81/x34/x83/x32 CANADIAN SYLLABICS LWOO
-+<U14E5>     /x81/x34/x83/x33 CANADIAN SYLLABICS WEST-CREE LWOO
-+<U14E6>     /x81/x34/x83/x34 CANADIAN SYLLABICS LWA
-+<U14E7>     /x81/x34/x83/x35 CANADIAN SYLLABICS WEST-CREE LWA
-+<U14E8>     /x81/x34/x83/x36 CANADIAN SYLLABICS LWAA
-+<U14E9>     /x81/x34/x83/x37 CANADIAN SYLLABICS WEST-CREE LWAA
-+<U14EA>     /x81/x34/x83/x38 CANADIAN SYLLABICS L
-+<U14EB>     /x81/x34/x83/x39 CANADIAN SYLLABICS WEST-CREE L
-+<U14EC>     /x81/x34/x84/x30 CANADIAN SYLLABICS MEDIAL L
-+<U14ED>     /x81/x34/x84/x31 CANADIAN SYLLABICS SE
-+<U14EE>     /x81/x34/x84/x32 CANADIAN SYLLABICS SAAI
-+<U14EF>     /x81/x34/x84/x33 CANADIAN SYLLABICS SI
-+<U14F0>     /x81/x34/x84/x34 CANADIAN SYLLABICS SII
-+<U14F1>     /x81/x34/x84/x35 CANADIAN SYLLABICS SO
-+<U14F2>     /x81/x34/x84/x36 CANADIAN SYLLABICS SOO
-+<U14F3>     /x81/x34/x84/x37 CANADIAN SYLLABICS Y-CREE SOO
-+<U14F4>     /x81/x34/x84/x38 CANADIAN SYLLABICS SA
-+<U14F5>     /x81/x34/x84/x39 CANADIAN SYLLABICS SAA
-+<U14F6>     /x81/x34/x85/x30 CANADIAN SYLLABICS SWE
-+<U14F7>     /x81/x34/x85/x31 CANADIAN SYLLABICS WEST-CREE SWE
-+<U14F8>     /x81/x34/x85/x32 CANADIAN SYLLABICS SWI
-+<U14F9>     /x81/x34/x85/x33 CANADIAN SYLLABICS WEST-CREE SWI
-+<U14FA>     /x81/x34/x85/x34 CANADIAN SYLLABICS SWII
-+<U14FB>     /x81/x34/x85/x35 CANADIAN SYLLABICS WEST-CREE SWII
-+<U14FC>     /x81/x34/x85/x36 CANADIAN SYLLABICS SWO
-+<U14FD>     /x81/x34/x85/x37 CANADIAN SYLLABICS WEST-CREE SWO
-+<U14FE>     /x81/x34/x85/x38 CANADIAN SYLLABICS SWOO
-+<U14FF>     /x81/x34/x85/x39 CANADIAN SYLLABICS WEST-CREE SWOO
-+<U1500>     /x81/x34/x86/x30 CANADIAN SYLLABICS SWA
-+<U1501>     /x81/x34/x86/x31 CANADIAN SYLLABICS WEST-CREE SWA
-+<U1502>     /x81/x34/x86/x32 CANADIAN SYLLABICS SWAA
-+<U1503>     /x81/x34/x86/x33 CANADIAN SYLLABICS WEST-CREE SWAA
-+<U1504>     /x81/x34/x86/x34 CANADIAN SYLLABICS NASKAPI SWAA
-+<U1505>     /x81/x34/x86/x35 CANADIAN SYLLABICS S
-+<U1506>     /x81/x34/x86/x36 CANADIAN SYLLABICS ATHAPASCAN S
-+<U1507>     /x81/x34/x86/x37 CANADIAN SYLLABICS SW
-+<U1508>     /x81/x34/x86/x38 CANADIAN SYLLABICS BLACKFOOT S
-+<U1509>     /x81/x34/x86/x39 CANADIAN SYLLABICS MOOSE-CREE SK
-+<U150A>     /x81/x34/x87/x30 CANADIAN SYLLABICS NASKAPI SKW
-+<U150B>     /x81/x34/x87/x31 CANADIAN SYLLABICS NASKAPI S-W
-+<U150C>     /x81/x34/x87/x32 CANADIAN SYLLABICS NASKAPI SPWA
-+<U150D>     /x81/x34/x87/x33 CANADIAN SYLLABICS NASKAPI STWA
-+<U150E>     /x81/x34/x87/x34 CANADIAN SYLLABICS NASKAPI SKWA
-+<U150F>     /x81/x34/x87/x35 CANADIAN SYLLABICS NASKAPI SCWA
-+<U1510>     /x81/x34/x87/x36 CANADIAN SYLLABICS SHE
-+<U1511>     /x81/x34/x87/x37 CANADIAN SYLLABICS SHI
-+<U1512>     /x81/x34/x87/x38 CANADIAN SYLLABICS SHII
-+<U1513>     /x81/x34/x87/x39 CANADIAN SYLLABICS SHO
-+<U1514>     /x81/x34/x88/x30 CANADIAN SYLLABICS SHOO
-+<U1515>     /x81/x34/x88/x31 CANADIAN SYLLABICS SHA
-+<U1516>     /x81/x34/x88/x32 CANADIAN SYLLABICS SHAA
-+<U1517>     /x81/x34/x88/x33 CANADIAN SYLLABICS SHWE
-+<U1518>     /x81/x34/x88/x34 CANADIAN SYLLABICS WEST-CREE SHWE
-+<U1519>     /x81/x34/x88/x35 CANADIAN SYLLABICS SHWI
-+<U151A>     /x81/x34/x88/x36 CANADIAN SYLLABICS WEST-CREE SHWI
-+<U151B>     /x81/x34/x88/x37 CANADIAN SYLLABICS SHWII
-+<U151C>     /x81/x34/x88/x38 CANADIAN SYLLABICS WEST-CREE SHWII
-+<U151D>     /x81/x34/x88/x39 CANADIAN SYLLABICS SHWO
-+<U151E>     /x81/x34/x89/x30 CANADIAN SYLLABICS WEST-CREE SHWO
-+<U151F>     /x81/x34/x89/x31 CANADIAN SYLLABICS SHWOO
-+<U1520>     /x81/x34/x89/x32 CANADIAN SYLLABICS WEST-CREE SHWOO
-+<U1521>     /x81/x34/x89/x33 CANADIAN SYLLABICS SHWA
-+<U1522>     /x81/x34/x89/x34 CANADIAN SYLLABICS WEST-CREE SHWA
-+<U1523>     /x81/x34/x89/x35 CANADIAN SYLLABICS SHWAA
-+<U1524>     /x81/x34/x89/x36 CANADIAN SYLLABICS WEST-CREE SHWAA
-+<U1525>     /x81/x34/x89/x37 CANADIAN SYLLABICS SH
-+<U1526>     /x81/x34/x89/x38 CANADIAN SYLLABICS YE
-+<U1527>     /x81/x34/x89/x39 CANADIAN SYLLABICS YAAI
-+<U1528>     /x81/x34/x8a/x30 CANADIAN SYLLABICS YI
-+<U1529>     /x81/x34/x8a/x31 CANADIAN SYLLABICS YII
-+<U152A>     /x81/x34/x8a/x32 CANADIAN SYLLABICS YO
-+<U152B>     /x81/x34/x8a/x33 CANADIAN SYLLABICS YOO
-+<U152C>     /x81/x34/x8a/x34 CANADIAN SYLLABICS Y-CREE YOO
-+<U152D>     /x81/x34/x8a/x35 CANADIAN SYLLABICS YA
-+<U152E>     /x81/x34/x8a/x36 CANADIAN SYLLABICS YAA
-+<U152F>     /x81/x34/x8a/x37 CANADIAN SYLLABICS YWE
-+<U1530>     /x81/x34/x8a/x38 CANADIAN SYLLABICS WEST-CREE YWE
-+<U1531>     /x81/x34/x8a/x39 CANADIAN SYLLABICS YWI
-+<U1532>     /x81/x34/x8b/x30 CANADIAN SYLLABICS WEST-CREE YWI
-+<U1533>     /x81/x34/x8b/x31 CANADIAN SYLLABICS YWII
-+<U1534>     /x81/x34/x8b/x32 CANADIAN SYLLABICS WEST-CREE YWII
-+<U1535>     /x81/x34/x8b/x33 CANADIAN SYLLABICS YWO
-+<U1536>     /x81/x34/x8b/x34 CANADIAN SYLLABICS WEST-CREE YWO
-+<U1537>     /x81/x34/x8b/x35 CANADIAN SYLLABICS YWOO
-+<U1538>     /x81/x34/x8b/x36 CANADIAN SYLLABICS WEST-CREE YWOO
-+<U1539>     /x81/x34/x8b/x37 CANADIAN SYLLABICS YWA
-+<U153A>     /x81/x34/x8b/x38 CANADIAN SYLLABICS WEST-CREE YWA
-+<U153B>     /x81/x34/x8b/x39 CANADIAN SYLLABICS YWAA
-+<U153C>     /x81/x34/x8c/x30 CANADIAN SYLLABICS WEST-CREE YWAA
-+<U153D>     /x81/x34/x8c/x31 CANADIAN SYLLABICS NASKAPI YWAA
-+<U153E>     /x81/x34/x8c/x32 CANADIAN SYLLABICS Y
-+<U153F>     /x81/x34/x8c/x33 CANADIAN SYLLABICS BIBLE-CREE Y
-+<U1540>     /x81/x34/x8c/x34 CANADIAN SYLLABICS WEST-CREE Y
-+<U1541>     /x81/x34/x8c/x35 CANADIAN SYLLABICS SAYISI YI
-+<U1542>     /x81/x34/x8c/x36 CANADIAN SYLLABICS RE
-+<U1543>     /x81/x34/x8c/x37 CANADIAN SYLLABICS R-CREE RE
-+<U1544>     /x81/x34/x8c/x38 CANADIAN SYLLABICS WEST-CREE LE
-+<U1545>     /x81/x34/x8c/x39 CANADIAN SYLLABICS RAAI
-+<U1546>     /x81/x34/x8d/x30 CANADIAN SYLLABICS RI
-+<U1547>     /x81/x34/x8d/x31 CANADIAN SYLLABICS RII
-+<U1548>     /x81/x34/x8d/x32 CANADIAN SYLLABICS RO
-+<U1549>     /x81/x34/x8d/x33 CANADIAN SYLLABICS ROO
-+<U154A>     /x81/x34/x8d/x34 CANADIAN SYLLABICS WEST-CREE LO
-+<U154B>     /x81/x34/x8d/x35 CANADIAN SYLLABICS RA
-+<U154C>     /x81/x34/x8d/x36 CANADIAN SYLLABICS RAA
-+<U154D>     /x81/x34/x8d/x37 CANADIAN SYLLABICS WEST-CREE LA
-+<U154E>     /x81/x34/x8d/x38 CANADIAN SYLLABICS RWAA
-+<U154F>     /x81/x34/x8d/x39 CANADIAN SYLLABICS WEST-CREE RWAA
-+<U1550>     /x81/x34/x8e/x30 CANADIAN SYLLABICS R
-+<U1551>     /x81/x34/x8e/x31 CANADIAN SYLLABICS WEST-CREE R
-+<U1552>     /x81/x34/x8e/x32 CANADIAN SYLLABICS MEDIAL R
-+<U1553>     /x81/x34/x8e/x33 CANADIAN SYLLABICS FE
-+<U1554>     /x81/x34/x8e/x34 CANADIAN SYLLABICS FAAI
-+<U1555>     /x81/x34/x8e/x35 CANADIAN SYLLABICS FI
-+<U1556>     /x81/x34/x8e/x36 CANADIAN SYLLABICS FII
-+<U1557>     /x81/x34/x8e/x37 CANADIAN SYLLABICS FO
-+<U1558>     /x81/x34/x8e/x38 CANADIAN SYLLABICS FOO
-+<U1559>     /x81/x34/x8e/x39 CANADIAN SYLLABICS FA
-+<U155A>     /x81/x34/x8f/x30 CANADIAN SYLLABICS FAA
-+<U155B>     /x81/x34/x8f/x31 CANADIAN SYLLABICS FWAA
-+<U155C>     /x81/x34/x8f/x32 CANADIAN SYLLABICS WEST-CREE FWAA
-+<U155D>     /x81/x34/x8f/x33 CANADIAN SYLLABICS F
-+<U155E>     /x81/x34/x8f/x34 CANADIAN SYLLABICS THE
-+<U155F>     /x81/x34/x8f/x35 CANADIAN SYLLABICS N-CREE THE
-+<U1560>     /x81/x34/x8f/x36 CANADIAN SYLLABICS THI
-+<U1561>     /x81/x34/x8f/x37 CANADIAN SYLLABICS N-CREE THI
-+<U1562>     /x81/x34/x8f/x38 CANADIAN SYLLABICS THII
-+<U1563>     /x81/x34/x8f/x39 CANADIAN SYLLABICS N-CREE THII
-+<U1564>     /x81/x34/x90/x30 CANADIAN SYLLABICS THO
-+<U1565>     /x81/x34/x90/x31 CANADIAN SYLLABICS THOO
-+<U1566>     /x81/x34/x90/x32 CANADIAN SYLLABICS THA
-+<U1567>     /x81/x34/x90/x33 CANADIAN SYLLABICS THAA
-+<U1568>     /x81/x34/x90/x34 CANADIAN SYLLABICS THWAA
-+<U1569>     /x81/x34/x90/x35 CANADIAN SYLLABICS WEST-CREE THWAA
-+<U156A>     /x81/x34/x90/x36 CANADIAN SYLLABICS TH
-+<U156B>     /x81/x34/x90/x37 CANADIAN SYLLABICS TTHE
-+<U156C>     /x81/x34/x90/x38 CANADIAN SYLLABICS TTHI
-+<U156D>     /x81/x34/x90/x39 CANADIAN SYLLABICS TTHO
-+<U156E>     /x81/x34/x91/x30 CANADIAN SYLLABICS TTHA
-+<U156F>     /x81/x34/x91/x31 CANADIAN SYLLABICS TTH
-+<U1570>     /x81/x34/x91/x32 CANADIAN SYLLABICS TYE
-+<U1571>     /x81/x34/x91/x33 CANADIAN SYLLABICS TYI
-+<U1572>     /x81/x34/x91/x34 CANADIAN SYLLABICS TYO
-+<U1573>     /x81/x34/x91/x35 CANADIAN SYLLABICS TYA
-+<U1574>     /x81/x34/x91/x36 CANADIAN SYLLABICS NUNAVIK HE
-+<U1575>     /x81/x34/x91/x37 CANADIAN SYLLABICS NUNAVIK HI
-+<U1576>     /x81/x34/x91/x38 CANADIAN SYLLABICS NUNAVIK HII
-+<U1577>     /x81/x34/x91/x39 CANADIAN SYLLABICS NUNAVIK HO
-+<U1578>     /x81/x34/x92/x30 CANADIAN SYLLABICS NUNAVIK HOO
-+<U1579>     /x81/x34/x92/x31 CANADIAN SYLLABICS NUNAVIK HA
-+<U157A>     /x81/x34/x92/x32 CANADIAN SYLLABICS NUNAVIK HAA
-+<U157B>     /x81/x34/x92/x33 CANADIAN SYLLABICS NUNAVIK H
-+<U157C>     /x81/x34/x92/x34 CANADIAN SYLLABICS NUNAVUT H
-+<U157D>     /x81/x34/x92/x35 CANADIAN SYLLABICS HK
-+<U157E>     /x81/x34/x92/x36 CANADIAN SYLLABICS QAAI
-+<U157F>     /x81/x34/x92/x37 CANADIAN SYLLABICS QI
-+<U1580>     /x81/x34/x92/x38 CANADIAN SYLLABICS QII
-+<U1581>     /x81/x34/x92/x39 CANADIAN SYLLABICS QO
-+<U1582>     /x81/x34/x93/x30 CANADIAN SYLLABICS QOO
-+<U1583>     /x81/x34/x93/x31 CANADIAN SYLLABICS QA
-+<U1584>     /x81/x34/x93/x32 CANADIAN SYLLABICS QAA
-+<U1585>     /x81/x34/x93/x33 CANADIAN SYLLABICS Q
-+<U1586>     /x81/x34/x93/x34 CANADIAN SYLLABICS TLHE
-+<U1587>     /x81/x34/x93/x35 CANADIAN SYLLABICS TLHI
-+<U1588>     /x81/x34/x93/x36 CANADIAN SYLLABICS TLHO
-+<U1589>     /x81/x34/x93/x37 CANADIAN SYLLABICS TLHA
-+<U158A>     /x81/x34/x93/x38 CANADIAN SYLLABICS WEST-CREE RE
-+<U158B>     /x81/x34/x93/x39 CANADIAN SYLLABICS WEST-CREE RI
-+<U158C>     /x81/x34/x94/x30 CANADIAN SYLLABICS WEST-CREE RO
-+<U158D>     /x81/x34/x94/x31 CANADIAN SYLLABICS WEST-CREE RA
-+<U158E>     /x81/x34/x94/x32 CANADIAN SYLLABICS NGAAI
-+<U158F>     /x81/x34/x94/x33 CANADIAN SYLLABICS NGI
-+<U1590>     /x81/x34/x94/x34 CANADIAN SYLLABICS NGII
-+<U1591>     /x81/x34/x94/x35 CANADIAN SYLLABICS NGO
-+<U1592>     /x81/x34/x94/x36 CANADIAN SYLLABICS NGOO
-+<U1593>     /x81/x34/x94/x37 CANADIAN SYLLABICS NGA
-+<U1594>     /x81/x34/x94/x38 CANADIAN SYLLABICS NGAA
-+<U1595>     /x81/x34/x94/x39 CANADIAN SYLLABICS NG
-+<U1596>     /x81/x34/x95/x30 CANADIAN SYLLABICS NNG
-+<U1597>     /x81/x34/x95/x31 CANADIAN SYLLABICS SAYISI SHE
-+<U1598>     /x81/x34/x95/x32 CANADIAN SYLLABICS SAYISI SHI
-+<U1599>     /x81/x34/x95/x33 CANADIAN SYLLABICS SAYISI SHO
-+<U159A>     /x81/x34/x95/x34 CANADIAN SYLLABICS SAYISI SHA
-+<U159B>     /x81/x34/x95/x35 CANADIAN SYLLABICS WOODS-CREE THE
-+<U159C>     /x81/x34/x95/x36 CANADIAN SYLLABICS WOODS-CREE THI
-+<U159D>     /x81/x34/x95/x37 CANADIAN SYLLABICS WOODS-CREE THO
-+<U159E>     /x81/x34/x95/x38 CANADIAN SYLLABICS WOODS-CREE THA
-+<U159F>     /x81/x34/x95/x39 CANADIAN SYLLABICS WOODS-CREE TH
-+<U15A0>     /x81/x34/x96/x30 CANADIAN SYLLABICS LHI
-+<U15A1>     /x81/x34/x96/x31 CANADIAN SYLLABICS LHII
-+<U15A2>     /x81/x34/x96/x32 CANADIAN SYLLABICS LHO
-+<U15A3>     /x81/x34/x96/x33 CANADIAN SYLLABICS LHOO
-+<U15A4>     /x81/x34/x96/x34 CANADIAN SYLLABICS LHA
-+<U15A5>     /x81/x34/x96/x35 CANADIAN SYLLABICS LHAA
-+<U15A6>     /x81/x34/x96/x36 CANADIAN SYLLABICS LH
-+<U15A7>     /x81/x34/x96/x37 CANADIAN SYLLABICS TH-CREE THE
-+<U15A8>     /x81/x34/x96/x38 CANADIAN SYLLABICS TH-CREE THI
-+<U15A9>     /x81/x34/x96/x39 CANADIAN SYLLABICS TH-CREE THII
-+<U15AA>     /x81/x34/x97/x30 CANADIAN SYLLABICS TH-CREE THO
-+<U15AB>     /x81/x34/x97/x31 CANADIAN SYLLABICS TH-CREE THOO
-+<U15AC>     /x81/x34/x97/x32 CANADIAN SYLLABICS TH-CREE THA
-+<U15AD>     /x81/x34/x97/x33 CANADIAN SYLLABICS TH-CREE THAA
-+<U15AE>     /x81/x34/x97/x34 CANADIAN SYLLABICS TH-CREE TH
-+<U15AF>     /x81/x34/x97/x35 CANADIAN SYLLABICS AIVILIK B
-+<U15B0>     /x81/x34/x97/x36 CANADIAN SYLLABICS BLACKFOOT E
-+<U15B1>     /x81/x34/x97/x37 CANADIAN SYLLABICS BLACKFOOT I
-+<U15B2>     /x81/x34/x97/x38 CANADIAN SYLLABICS BLACKFOOT O
-+<U15B3>     /x81/x34/x97/x39 CANADIAN SYLLABICS BLACKFOOT A
-+<U15B4>     /x81/x34/x98/x30 CANADIAN SYLLABICS BLACKFOOT WE
-+<U15B5>     /x81/x34/x98/x31 CANADIAN SYLLABICS BLACKFOOT WI
-+<U15B6>     /x81/x34/x98/x32 CANADIAN SYLLABICS BLACKFOOT WO
-+<U15B7>     /x81/x34/x98/x33 CANADIAN SYLLABICS BLACKFOOT WA
-+<U15B8>     /x81/x34/x98/x34 CANADIAN SYLLABICS BLACKFOOT NE
-+<U15B9>     /x81/x34/x98/x35 CANADIAN SYLLABICS BLACKFOOT NI
-+<U15BA>     /x81/x34/x98/x36 CANADIAN SYLLABICS BLACKFOOT NO
-+<U15BB>     /x81/x34/x98/x37 CANADIAN SYLLABICS BLACKFOOT NA
-+<U15BC>     /x81/x34/x98/x38 CANADIAN SYLLABICS BLACKFOOT KE
-+<U15BD>     /x81/x34/x98/x39 CANADIAN SYLLABICS BLACKFOOT KI
-+<U15BE>     /x81/x34/x99/x30 CANADIAN SYLLABICS BLACKFOOT KO
-+<U15BF>     /x81/x34/x99/x31 CANADIAN SYLLABICS BLACKFOOT KA
-+<U15C0>     /x81/x34/x99/x32 CANADIAN SYLLABICS SAYISI HE
-+<U15C1>     /x81/x34/x99/x33 CANADIAN SYLLABICS SAYISI HI
-+<U15C2>     /x81/x34/x99/x34 CANADIAN SYLLABICS SAYISI HO
-+<U15C3>     /x81/x34/x99/x35 CANADIAN SYLLABICS SAYISI HA
-+<U15C4>     /x81/x34/x99/x36 CANADIAN SYLLABICS CARRIER GHU
-+<U15C5>     /x81/x34/x99/x37 CANADIAN SYLLABICS CARRIER GHO
-+<U15C6>     /x81/x34/x99/x38 CANADIAN SYLLABICS CARRIER GHE
-+<U15C7>     /x81/x34/x99/x39 CANADIAN SYLLABICS CARRIER GHEE
-+<U15C8>     /x81/x34/x9a/x30 CANADIAN SYLLABICS CARRIER GHI
-+<U15C9>     /x81/x34/x9a/x31 CANADIAN SYLLABICS CARRIER GHA
-+<U15CA>     /x81/x34/x9a/x32 CANADIAN SYLLABICS CARRIER RU
-+<U15CB>     /x81/x34/x9a/x33 CANADIAN SYLLABICS CARRIER RO
-+<U15CC>     /x81/x34/x9a/x34 CANADIAN SYLLABICS CARRIER RE
-+<U15CD>     /x81/x34/x9a/x35 CANADIAN SYLLABICS CARRIER REE
-+<U15CE>     /x81/x34/x9a/x36 CANADIAN SYLLABICS CARRIER RI
-+<U15CF>     /x81/x34/x9a/x37 CANADIAN SYLLABICS CARRIER RA
-+<U15D0>     /x81/x34/x9a/x38 CANADIAN SYLLABICS CARRIER WU
-+<U15D1>     /x81/x34/x9a/x39 CANADIAN SYLLABICS CARRIER WO
-+<U15D2>     /x81/x34/x9b/x30 CANADIAN SYLLABICS CARRIER WE
-+<U15D3>     /x81/x34/x9b/x31 CANADIAN SYLLABICS CARRIER WEE
-+<U15D4>     /x81/x34/x9b/x32 CANADIAN SYLLABICS CARRIER WI
-+<U15D5>     /x81/x34/x9b/x33 CANADIAN SYLLABICS CARRIER WA
-+<U15D6>     /x81/x34/x9b/x34 CANADIAN SYLLABICS CARRIER HWU
-+<U15D7>     /x81/x34/x9b/x35 CANADIAN SYLLABICS CARRIER HWO
-+<U15D8>     /x81/x34/x9b/x36 CANADIAN SYLLABICS CARRIER HWE
-+<U15D9>     /x81/x34/x9b/x37 CANADIAN SYLLABICS CARRIER HWEE
-+<U15DA>     /x81/x34/x9b/x38 CANADIAN SYLLABICS CARRIER HWI
-+<U15DB>     /x81/x34/x9b/x39 CANADIAN SYLLABICS CARRIER HWA
-+<U15DC>     /x81/x34/x9c/x30 CANADIAN SYLLABICS CARRIER THU
-+<U15DD>     /x81/x34/x9c/x31 CANADIAN SYLLABICS CARRIER THO
-+<U15DE>     /x81/x34/x9c/x32 CANADIAN SYLLABICS CARRIER THE
-+<U15DF>     /x81/x34/x9c/x33 CANADIAN SYLLABICS CARRIER THEE
-+<U15E0>     /x81/x34/x9c/x34 CANADIAN SYLLABICS CARRIER THI
-+<U15E1>     /x81/x34/x9c/x35 CANADIAN SYLLABICS CARRIER THA
-+<U15E2>     /x81/x34/x9c/x36 CANADIAN SYLLABICS CARRIER TTU
-+<U15E3>     /x81/x34/x9c/x37 CANADIAN SYLLABICS CARRIER TTO
-+<U15E4>     /x81/x34/x9c/x38 CANADIAN SYLLABICS CARRIER TTE
-+<U15E5>     /x81/x34/x9c/x39 CANADIAN SYLLABICS CARRIER TTEE
-+<U15E6>     /x81/x34/x9d/x30 CANADIAN SYLLABICS CARRIER TTI
-+<U15E7>     /x81/x34/x9d/x31 CANADIAN SYLLABICS CARRIER TTA
-+<U15E8>     /x81/x34/x9d/x32 CANADIAN SYLLABICS CARRIER PU
-+<U15E9>     /x81/x34/x9d/x33 CANADIAN SYLLABICS CARRIER PO
-+<U15EA>     /x81/x34/x9d/x34 CANADIAN SYLLABICS CARRIER PE
-+<U15EB>     /x81/x34/x9d/x35 CANADIAN SYLLABICS CARRIER PEE
-+<U15EC>     /x81/x34/x9d/x36 CANADIAN SYLLABICS CARRIER PI
-+<U15ED>     /x81/x34/x9d/x37 CANADIAN SYLLABICS CARRIER PA
-+<U15EE>     /x81/x34/x9d/x38 CANADIAN SYLLABICS CARRIER P
-+<U15EF>     /x81/x34/x9d/x39 CANADIAN SYLLABICS CARRIER GU
-+<U15F0>     /x81/x34/x9e/x30 CANADIAN SYLLABICS CARRIER GO
-+<U15F1>     /x81/x34/x9e/x31 CANADIAN SYLLABICS CARRIER GE
-+<U15F2>     /x81/x34/x9e/x32 CANADIAN SYLLABICS CARRIER GEE
-+<U15F3>     /x81/x34/x9e/x33 CANADIAN SYLLABICS CARRIER GI
-+<U15F4>     /x81/x34/x9e/x34 CANADIAN SYLLABICS CARRIER GA
-+<U15F5>     /x81/x34/x9e/x35 CANADIAN SYLLABICS CARRIER KHU
-+<U15F6>     /x81/x34/x9e/x36 CANADIAN SYLLABICS CARRIER KHO
-+<U15F7>     /x81/x34/x9e/x37 CANADIAN SYLLABICS CARRIER KHE
-+<U15F8>     /x81/x34/x9e/x38 CANADIAN SYLLABICS CARRIER KHEE
-+<U15F9>     /x81/x34/x9e/x39 CANADIAN SYLLABICS CARRIER KHI
-+<U15FA>     /x81/x34/x9f/x30 CANADIAN SYLLABICS CARRIER KHA
-+<U15FB>     /x81/x34/x9f/x31 CANADIAN SYLLABICS CARRIER KKU
-+<U15FC>     /x81/x34/x9f/x32 CANADIAN SYLLABICS CARRIER KKO
-+<U15FD>     /x81/x34/x9f/x33 CANADIAN SYLLABICS CARRIER KKE
-+<U15FE>     /x81/x34/x9f/x34 CANADIAN SYLLABICS CARRIER KKEE
-+<U15FF>     /x81/x34/x9f/x35 CANADIAN SYLLABICS CARRIER KKI
-+<U1600>     /x81/x34/x9f/x36 CANADIAN SYLLABICS CARRIER KKA
-+<U1601>     /x81/x34/x9f/x37 CANADIAN SYLLABICS CARRIER KK
-+<U1602>     /x81/x34/x9f/x38 CANADIAN SYLLABICS CARRIER NU
-+<U1603>     /x81/x34/x9f/x39 CANADIAN SYLLABICS CARRIER NO
-+<U1604>     /x81/x34/xa0/x30 CANADIAN SYLLABICS CARRIER NE
-+<U1605>     /x81/x34/xa0/x31 CANADIAN SYLLABICS CARRIER NEE
-+<U1606>     /x81/x34/xa0/x32 CANADIAN SYLLABICS CARRIER NI
-+<U1607>     /x81/x34/xa0/x33 CANADIAN SYLLABICS CARRIER NA
-+<U1608>     /x81/x34/xa0/x34 CANADIAN SYLLABICS CARRIER MU
-+<U1609>     /x81/x34/xa0/x35 CANADIAN SYLLABICS CARRIER MO
-+<U160A>     /x81/x34/xa0/x36 CANADIAN SYLLABICS CARRIER ME
-+<U160B>     /x81/x34/xa0/x37 CANADIAN SYLLABICS CARRIER MEE
-+<U160C>     /x81/x34/xa0/x38 CANADIAN SYLLABICS CARRIER MI
-+<U160D>     /x81/x34/xa0/x39 CANADIAN SYLLABICS CARRIER MA
-+<U160E>     /x81/x34/xa1/x30 CANADIAN SYLLABICS CARRIER YU
-+<U160F>     /x81/x34/xa1/x31 CANADIAN SYLLABICS CARRIER YO
-+<U1610>     /x81/x34/xa1/x32 CANADIAN SYLLABICS CARRIER YE
-+<U1611>     /x81/x34/xa1/x33 CANADIAN SYLLABICS CARRIER YEE
-+<U1612>     /x81/x34/xa1/x34 CANADIAN SYLLABICS CARRIER YI
-+<U1613>     /x81/x34/xa1/x35 CANADIAN SYLLABICS CARRIER YA
-+<U1614>     /x81/x34/xa1/x36 CANADIAN SYLLABICS CARRIER JU
-+<U1615>     /x81/x34/xa1/x37 CANADIAN SYLLABICS SAYISI JU
-+<U1616>     /x81/x34/xa1/x38 CANADIAN SYLLABICS CARRIER JO
-+<U1617>     /x81/x34/xa1/x39 CANADIAN SYLLABICS CARRIER JE
-+<U1618>     /x81/x34/xa2/x30 CANADIAN SYLLABICS CARRIER JEE
-+<U1619>     /x81/x34/xa2/x31 CANADIAN SYLLABICS CARRIER JI
-+<U161A>     /x81/x34/xa2/x32 CANADIAN SYLLABICS SAYISI JI
-+<U161B>     /x81/x34/xa2/x33 CANADIAN SYLLABICS CARRIER JA
-+<U161C>     /x81/x34/xa2/x34 CANADIAN SYLLABICS CARRIER JJU
-+<U161D>     /x81/x34/xa2/x35 CANADIAN SYLLABICS CARRIER JJO
-+<U161E>     /x81/x34/xa2/x36 CANADIAN SYLLABICS CARRIER JJE
-+<U161F>     /x81/x34/xa2/x37 CANADIAN SYLLABICS CARRIER JJEE
-+<U1620>     /x81/x34/xa2/x38 CANADIAN SYLLABICS CARRIER JJI
-+<U1621>     /x81/x34/xa2/x39 CANADIAN SYLLABICS CARRIER JJA
-+<U1622>     /x81/x34/xa3/x30 CANADIAN SYLLABICS CARRIER LU
-+<U1623>     /x81/x34/xa3/x31 CANADIAN SYLLABICS CARRIER LO
-+<U1624>     /x81/x34/xa3/x32 CANADIAN SYLLABICS CARRIER LE
-+<U1625>     /x81/x34/xa3/x33 CANADIAN SYLLABICS CARRIER LEE
-+<U1626>     /x81/x34/xa3/x34 CANADIAN SYLLABICS CARRIER LI
-+<U1627>     /x81/x34/xa3/x35 CANADIAN SYLLABICS CARRIER LA
-+<U1628>     /x81/x34/xa3/x36 CANADIAN SYLLABICS CARRIER DLU
-+<U1629>     /x81/x34/xa3/x37 CANADIAN SYLLABICS CARRIER DLO
-+<U162A>     /x81/x34/xa3/x38 CANADIAN SYLLABICS CARRIER DLE
-+<U162B>     /x81/x34/xa3/x39 CANADIAN SYLLABICS CARRIER DLEE
-+<U162C>     /x81/x34/xa4/x30 CANADIAN SYLLABICS CARRIER DLI
-+<U162D>     /x81/x34/xa4/x31 CANADIAN SYLLABICS CARRIER DLA
-+<U162E>     /x81/x34/xa4/x32 CANADIAN SYLLABICS CARRIER LHU
-+<U162F>     /x81/x34/xa4/x33 CANADIAN SYLLABICS CARRIER LHO
-+<U1630>     /x81/x34/xa4/x34 CANADIAN SYLLABICS CARRIER LHE
-+<U1631>     /x81/x34/xa4/x35 CANADIAN SYLLABICS CARRIER LHEE
-+<U1632>     /x81/x34/xa4/x36 CANADIAN SYLLABICS CARRIER LHI
-+<U1633>     /x81/x34/xa4/x37 CANADIAN SYLLABICS CARRIER LHA
-+<U1634>     /x81/x34/xa4/x38 CANADIAN SYLLABICS CARRIER TLHU
-+<U1635>     /x81/x34/xa4/x39 CANADIAN SYLLABICS CARRIER TLHO
-+<U1636>     /x81/x34/xa5/x30 CANADIAN SYLLABICS CARRIER TLHE
-+<U1637>     /x81/x34/xa5/x31 CANADIAN SYLLABICS CARRIER TLHEE
-+<U1638>     /x81/x34/xa5/x32 CANADIAN SYLLABICS CARRIER TLHI
-+<U1639>     /x81/x34/xa5/x33 CANADIAN SYLLABICS CARRIER TLHA
-+<U163A>     /x81/x34/xa5/x34 CANADIAN SYLLABICS CARRIER TLU
-+<U163B>     /x81/x34/xa5/x35 CANADIAN SYLLABICS CARRIER TLO
-+<U163C>     /x81/x34/xa5/x36 CANADIAN SYLLABICS CARRIER TLE
-+<U163D>     /x81/x34/xa5/x37 CANADIAN SYLLABICS CARRIER TLEE
-+<U163E>     /x81/x34/xa5/x38 CANADIAN SYLLABICS CARRIER TLI
-+<U163F>     /x81/x34/xa5/x39 CANADIAN SYLLABICS CARRIER TLA
-+<U1640>     /x81/x34/xa6/x30 CANADIAN SYLLABICS CARRIER ZU
-+<U1641>     /x81/x34/xa6/x31 CANADIAN SYLLABICS CARRIER ZO
-+<U1642>     /x81/x34/xa6/x32 CANADIAN SYLLABICS CARRIER ZE
-+<U1643>     /x81/x34/xa6/x33 CANADIAN SYLLABICS CARRIER ZEE
-+<U1644>     /x81/x34/xa6/x34 CANADIAN SYLLABICS CARRIER ZI
-+<U1645>     /x81/x34/xa6/x35 CANADIAN SYLLABICS CARRIER ZA
-+<U1646>     /x81/x34/xa6/x36 CANADIAN SYLLABICS CARRIER Z
-+<U1647>     /x81/x34/xa6/x37 CANADIAN SYLLABICS CARRIER INITIAL Z
-+<U1648>     /x81/x34/xa6/x38 CANADIAN SYLLABICS CARRIER DZU
-+<U1649>     /x81/x34/xa6/x39 CANADIAN SYLLABICS CARRIER DZO
-+<U164A>     /x81/x34/xa7/x30 CANADIAN SYLLABICS CARRIER DZE
-+<U164B>     /x81/x34/xa7/x31 CANADIAN SYLLABICS CARRIER DZEE
-+<U164C>     /x81/x34/xa7/x32 CANADIAN SYLLABICS CARRIER DZI
-+<U164D>     /x81/x34/xa7/x33 CANADIAN SYLLABICS CARRIER DZA
-+<U164E>     /x81/x34/xa7/x34 CANADIAN SYLLABICS CARRIER SU
-+<U164F>     /x81/x34/xa7/x35 CANADIAN SYLLABICS CARRIER SO
-+<U1650>     /x81/x34/xa7/x36 CANADIAN SYLLABICS CARRIER SE
-+<U1651>     /x81/x34/xa7/x37 CANADIAN SYLLABICS CARRIER SEE
-+<U1652>     /x81/x34/xa7/x38 CANADIAN SYLLABICS CARRIER SI
-+<U1653>     /x81/x34/xa7/x39 CANADIAN SYLLABICS CARRIER SA
-+<U1654>     /x81/x34/xa8/x30 CANADIAN SYLLABICS CARRIER SHU
-+<U1655>     /x81/x34/xa8/x31 CANADIAN SYLLABICS CARRIER SHO
-+<U1656>     /x81/x34/xa8/x32 CANADIAN SYLLABICS CARRIER SHE
-+<U1657>     /x81/x34/xa8/x33 CANADIAN SYLLABICS CARRIER SHEE
-+<U1658>     /x81/x34/xa8/x34 CANADIAN SYLLABICS CARRIER SHI
-+<U1659>     /x81/x34/xa8/x35 CANADIAN SYLLABICS CARRIER SHA
-+<U165A>     /x81/x34/xa8/x36 CANADIAN SYLLABICS CARRIER SH
-+<U165B>     /x81/x34/xa8/x37 CANADIAN SYLLABICS CARRIER TSU
-+<U165C>     /x81/x34/xa8/x38 CANADIAN SYLLABICS CARRIER TSO
-+<U165D>     /x81/x34/xa8/x39 CANADIAN SYLLABICS CARRIER TSE
-+<U165E>     /x81/x34/xa9/x30 CANADIAN SYLLABICS CARRIER TSEE
-+<U165F>     /x81/x34/xa9/x31 CANADIAN SYLLABICS CARRIER TSI
-+<U1660>     /x81/x34/xa9/x32 CANADIAN SYLLABICS CARRIER TSA
-+<U1661>     /x81/x34/xa9/x33 CANADIAN SYLLABICS CARRIER CHU
-+<U1662>     /x81/x34/xa9/x34 CANADIAN SYLLABICS CARRIER CHO
-+<U1663>     /x81/x34/xa9/x35 CANADIAN SYLLABICS CARRIER CHE
-+<U1664>     /x81/x34/xa9/x36 CANADIAN SYLLABICS CARRIER CHEE
-+<U1665>     /x81/x34/xa9/x37 CANADIAN SYLLABICS CARRIER CHI
-+<U1666>     /x81/x34/xa9/x38 CANADIAN SYLLABICS CARRIER CHA
-+<U1667>     /x81/x34/xa9/x39 CANADIAN SYLLABICS CARRIER TTSU
-+<U1668>     /x81/x34/xaa/x30 CANADIAN SYLLABICS CARRIER TTSO
-+<U1669>     /x81/x34/xaa/x31 CANADIAN SYLLABICS CARRIER TTSE
-+<U166A>     /x81/x34/xaa/x32 CANADIAN SYLLABICS CARRIER TTSEE
-+<U166B>     /x81/x34/xaa/x33 CANADIAN SYLLABICS CARRIER TTSI
-+<U166C>     /x81/x34/xaa/x34 CANADIAN SYLLABICS CARRIER TTSA
-+<U166D>     /x81/x34/xaa/x35 CANADIAN SYLLABICS CHI SIGN
-+<U166E>     /x81/x34/xaa/x36 CANADIAN SYLLABICS FULL STOP
-+<U166F>     /x81/x34/xaa/x37 CANADIAN SYLLABICS QAI
-+<U1670>     /x81/x34/xaa/x38 CANADIAN SYLLABICS NGAI
-+<U1671>     /x81/x34/xaa/x39 CANADIAN SYLLABICS NNGI
-+<U1672>     /x81/x34/xab/x30 CANADIAN SYLLABICS NNGII
-+<U1673>     /x81/x34/xab/x31 CANADIAN SYLLABICS NNGO
-+<U1674>     /x81/x34/xab/x32 CANADIAN SYLLABICS NNGOO
-+<U1675>     /x81/x34/xab/x33 CANADIAN SYLLABICS NNGA
-+<U1676>     /x81/x34/xab/x34 CANADIAN SYLLABICS NNGAA
-+<U1677>     /x81/x34/xab/x35 <UNASSIGNED>
-+<U1678>     /x81/x34/xab/x36 <UNASSIGNED>
-+<U1679>     /x81/x34/xab/x37 <UNASSIGNED>
-+<U167A>     /x81/x34/xab/x38 <UNASSIGNED>
-+<U167B>     /x81/x34/xab/x39 <UNASSIGNED>
-+<U167C>     /x81/x34/xac/x30 <UNASSIGNED>
-+<U167D>     /x81/x34/xac/x31 <UNASSIGNED>
-+<U167E>     /x81/x34/xac/x32 <UNASSIGNED>
-+<U167F>     /x81/x34/xac/x33 <UNASSIGNED>
-+<U1680>     /x81/x34/xac/x34 OGHAM SPACE MARK
-+<U1681>     /x81/x34/xac/x35 OGHAM LETTER BEITH
-+<U1682>     /x81/x34/xac/x36 OGHAM LETTER LUIS
-+<U1683>     /x81/x34/xac/x37 OGHAM LETTER FEARN
-+<U1684>     /x81/x34/xac/x38 OGHAM LETTER SAIL
-+<U1685>     /x81/x34/xac/x39 OGHAM LETTER NION
-+<U1686>     /x81/x34/xad/x30 OGHAM LETTER UATH
-+<U1687>     /x81/x34/xad/x31 OGHAM LETTER DAIR
-+<U1688>     /x81/x34/xad/x32 OGHAM LETTER TINNE
-+<U1689>     /x81/x34/xad/x33 OGHAM LETTER COLL
-+<U168A>     /x81/x34/xad/x34 OGHAM LETTER CEIRT
-+<U168B>     /x81/x34/xad/x35 OGHAM LETTER MUIN
-+<U168C>     /x81/x34/xad/x36 OGHAM LETTER GORT
-+<U168D>     /x81/x34/xad/x37 OGHAM LETTER NGEADAL
-+<U168E>     /x81/x34/xad/x38 OGHAM LETTER STRAIF
-+<U168F>     /x81/x34/xad/x39 OGHAM LETTER RUIS
-+<U1690>     /x81/x34/xae/x30 OGHAM LETTER AILM
-+<U1691>     /x81/x34/xae/x31 OGHAM LETTER ONN
-+<U1692>     /x81/x34/xae/x32 OGHAM LETTER UR
-+<U1693>     /x81/x34/xae/x33 OGHAM LETTER EADHADH
-+<U1694>     /x81/x34/xae/x34 OGHAM LETTER IODHADH
-+<U1695>     /x81/x34/xae/x35 OGHAM LETTER EABHADH
-+<U1696>     /x81/x34/xae/x36 OGHAM LETTER OR
-+<U1697>     /x81/x34/xae/x37 OGHAM LETTER UILLEANN
-+<U1698>     /x81/x34/xae/x38 OGHAM LETTER IFIN
-+<U1699>     /x81/x34/xae/x39 OGHAM LETTER EAMHANCHOLL
-+<U169A>     /x81/x34/xaf/x30 OGHAM LETTER PEITH
-+<U169B>     /x81/x34/xaf/x31 OGHAM FEATHER MARK
-+<U169C>     /x81/x34/xaf/x32 OGHAM REVERSED FEATHER MARK
-+<U169D>     /x81/x34/xaf/x33 <UNASSIGNED>
-+<U169E>     /x81/x34/xaf/x34 <UNASSIGNED>
-+<U169F>     /x81/x34/xaf/x35 <UNASSIGNED>
-+<U16A0>     /x81/x34/xaf/x36 RUNIC LETTER FEHU FEOH FE F
-+<U16A1>     /x81/x34/xaf/x37 RUNIC LETTER V
-+<U16A2>     /x81/x34/xaf/x38 RUNIC LETTER URUZ UR U
-+<U16A3>     /x81/x34/xaf/x39 RUNIC LETTER YR
-+<U16A4>     /x81/x34/xb0/x30 RUNIC LETTER Y
-+<U16A5>     /x81/x34/xb0/x31 RUNIC LETTER W
-+<U16A6>     /x81/x34/xb0/x32 RUNIC LETTER THURISAZ THURS THORN
-+<U16A7>     /x81/x34/xb0/x33 RUNIC LETTER ETH
-+<U16A8>     /x81/x34/xb0/x34 RUNIC LETTER ANSUZ A
-+<U16A9>     /x81/x34/xb0/x35 RUNIC LETTER OS O
-+<U16AA>     /x81/x34/xb0/x36 RUNIC LETTER AC A
-+<U16AB>     /x81/x34/xb0/x37 RUNIC LETTER AESC
-+<U16AC>     /x81/x34/xb0/x38 RUNIC LETTER LONG-BRANCH-OSS O
-+<U16AD>     /x81/x34/xb0/x39 RUNIC LETTER SHORT-TWIG-OSS O
-+<U16AE>     /x81/x34/xb1/x30 RUNIC LETTER O
-+<U16AF>     /x81/x34/xb1/x31 RUNIC LETTER OE
-+<U16B0>     /x81/x34/xb1/x32 RUNIC LETTER ON
-+<U16B1>     /x81/x34/xb1/x33 RUNIC LETTER RAIDO RAD REID R
-+<U16B2>     /x81/x34/xb1/x34 RUNIC LETTER KAUNA
-+<U16B3>     /x81/x34/xb1/x35 RUNIC LETTER CEN
-+<U16B4>     /x81/x34/xb1/x36 RUNIC LETTER KAUN K
-+<U16B5>     /x81/x34/xb1/x37 RUNIC LETTER G
-+<U16B6>     /x81/x34/xb1/x38 RUNIC LETTER ENG
-+<U16B7>     /x81/x34/xb1/x39 RUNIC LETTER GEBO GYFU G
-+<U16B8>     /x81/x34/xb2/x30 RUNIC LETTER GAR
-+<U16B9>     /x81/x34/xb2/x31 RUNIC LETTER WUNJO WYNN W
-+<U16BA>     /x81/x34/xb2/x32 RUNIC LETTER HAGLAZ H
-+<U16BB>     /x81/x34/xb2/x33 RUNIC LETTER HAEGL H
-+<U16BC>     /x81/x34/xb2/x34 RUNIC LETTER LONG-BRANCH-HAGALL H
-+<U16BD>     /x81/x34/xb2/x35 RUNIC LETTER SHORT-TWIG-HAGALL H
-+<U16BE>     /x81/x34/xb2/x36 RUNIC LETTER NAUDIZ NYD NAUD N
-+<U16BF>     /x81/x34/xb2/x37 RUNIC LETTER SHORT-TWIG-NAUD N
-+<U16C0>     /x81/x34/xb2/x38 RUNIC LETTER DOTTED-N
-+<U16C1>     /x81/x34/xb2/x39 RUNIC LETTER ISAZ IS ISS I
-+<U16C2>     /x81/x34/xb3/x30 RUNIC LETTER E
-+<U16C3>     /x81/x34/xb3/x31 RUNIC LETTER JERAN J
-+<U16C4>     /x81/x34/xb3/x32 RUNIC LETTER GER
-+<U16C5>     /x81/x34/xb3/x33 RUNIC LETTER LONG-BRANCH-AR AE
-+<U16C6>     /x81/x34/xb3/x34 RUNIC LETTER SHORT-TWIG-AR A
-+<U16C7>     /x81/x34/xb3/x35 RUNIC LETTER IWAZ EOH
-+<U16C8>     /x81/x34/xb3/x36 RUNIC LETTER PERTHO PEORTH P
-+<U16C9>     /x81/x34/xb3/x37 RUNIC LETTER ALGIZ EOLHX
-+<U16CA>     /x81/x34/xb3/x38 RUNIC LETTER SOWILO S
-+<U16CB>     /x81/x34/xb3/x39 RUNIC LETTER SIGEL LONG-BRANCH-SOL S
-+<U16CC>     /x81/x34/xb4/x30 RUNIC LETTER SHORT-TWIG-SOL S
-+<U16CD>     /x81/x34/xb4/x31 RUNIC LETTER C
-+<U16CE>     /x81/x34/xb4/x32 RUNIC LETTER Z
-+<U16CF>     /x81/x34/xb4/x33 RUNIC LETTER TIWAZ TIR TYR T
-+<U16D0>     /x81/x34/xb4/x34 RUNIC LETTER SHORT-TWIG-TYR T
-+<U16D1>     /x81/x34/xb4/x35 RUNIC LETTER D
-+<U16D2>     /x81/x34/xb4/x36 RUNIC LETTER BERKANAN BEORC BJARKAN B
-+<U16D3>     /x81/x34/xb4/x37 RUNIC LETTER SHORT-TWIG-BJARKAN B
-+<U16D4>     /x81/x34/xb4/x38 RUNIC LETTER DOTTED-P
-+<U16D5>     /x81/x34/xb4/x39 RUNIC LETTER OPEN-P
-+<U16D6>     /x81/x34/xb5/x30 RUNIC LETTER EHWAZ EH E
-+<U16D7>     /x81/x34/xb5/x31 RUNIC LETTER MANNAZ MAN M
-+<U16D8>     /x81/x34/xb5/x32 RUNIC LETTER LONG-BRANCH-MADR M
-+<U16D9>     /x81/x34/xb5/x33 RUNIC LETTER SHORT-TWIG-MADR M
-+<U16DA>     /x81/x34/xb5/x34 RUNIC LETTER LAUKAZ LAGU LOGR L
-+<U16DB>     /x81/x34/xb5/x35 RUNIC LETTER DOTTED-L
-+<U16DC>     /x81/x34/xb5/x36 RUNIC LETTER INGWAZ
-+<U16DD>     /x81/x34/xb5/x37 RUNIC LETTER ING
-+<U16DE>     /x81/x34/xb5/x38 RUNIC LETTER DAGAZ DAEG D
-+<U16DF>     /x81/x34/xb5/x39 RUNIC LETTER OTHALAN ETHEL O
-+<U16E0>     /x81/x34/xb6/x30 RUNIC LETTER EAR
-+<U16E1>     /x81/x34/xb6/x31 RUNIC LETTER IOR
-+<U16E2>     /x81/x34/xb6/x32 RUNIC LETTER CWEORTH
-+<U16E3>     /x81/x34/xb6/x33 RUNIC LETTER CALC
-+<U16E4>     /x81/x34/xb6/x34 RUNIC LETTER CEALC
-+<U16E5>     /x81/x34/xb6/x35 RUNIC LETTER STAN
-+<U16E6>     /x81/x34/xb6/x36 RUNIC LETTER LONG-BRANCH-YR
-+<U16E7>     /x81/x34/xb6/x37 RUNIC LETTER SHORT-TWIG-YR
-+<U16E8>     /x81/x34/xb6/x38 RUNIC LETTER ICELANDIC-YR
-+<U16E9>     /x81/x34/xb6/x39 RUNIC LETTER Q
-+<U16EA>     /x81/x34/xb7/x30 RUNIC LETTER X
-+<U16EB>     /x81/x34/xb7/x31 RUNIC SINGLE PUNCTUATION
-+<U16EC>     /x81/x34/xb7/x32 RUNIC MULTIPLE PUNCTUATION
-+<U16ED>     /x81/x34/xb7/x33 RUNIC CROSS PUNCTUATION
-+<U16EE>     /x81/x34/xb7/x34 RUNIC ARLAUG SYMBOL
-+<U16EF>     /x81/x34/xb7/x35 RUNIC TVIMADUR SYMBOL
-+<U16F0>     /x81/x34/xb7/x36 RUNIC BELGTHOR SYMBOL
-+<U16F1>     /x81/x34/xb7/x37 <UNASSIGNED>
-+<U16F2>     /x81/x34/xb7/x38 <UNASSIGNED>
-+<U16F3>     /x81/x34/xb7/x39 <UNASSIGNED>
-+<U16F4>     /x81/x34/xb8/x30 <UNASSIGNED>
-+<U16F5>     /x81/x34/xb8/x31 <UNASSIGNED>
-+<U16F6>     /x81/x34/xb8/x32 <UNASSIGNED>
-+<U16F7>     /x81/x34/xb8/x33 <UNASSIGNED>
-+<U16F8>     /x81/x34/xb8/x34 <UNASSIGNED>
-+<U16F9>     /x81/x34/xb8/x35 <UNASSIGNED>
-+<U16FA>     /x81/x34/xb8/x36 <UNASSIGNED>
-+<U16FB>     /x81/x34/xb8/x37 <UNASSIGNED>
-+<U16FC>     /x81/x34/xb8/x38 <UNASSIGNED>
-+<U16FD>     /x81/x34/xb8/x39 <UNASSIGNED>
-+<U16FE>     /x81/x34/xb9/x30 <UNASSIGNED>
-+<U16FF>     /x81/x34/xb9/x31 <UNASSIGNED>
-+<U1700>     /x81/x34/xb9/x32 TAGALOG LETTER A
-+<U1701>     /x81/x34/xb9/x33 TAGALOG LETTER I
-+<U1702>     /x81/x34/xb9/x34 TAGALOG LETTER U
-+<U1703>     /x81/x34/xb9/x35 TAGALOG LETTER KA
-+<U1704>     /x81/x34/xb9/x36 TAGALOG LETTER GA
-+<U1705>     /x81/x34/xb9/x37 TAGALOG LETTER NGA
-+<U1706>     /x81/x34/xb9/x38 TAGALOG LETTER TA
-+<U1707>     /x81/x34/xb9/x39 TAGALOG LETTER DA
-+<U1708>     /x81/x34/xba/x30 TAGALOG LETTER NA
-+<U1709>     /x81/x34/xba/x31 TAGALOG LETTER PA
-+<U170A>     /x81/x34/xba/x32 TAGALOG LETTER BA
-+<U170B>     /x81/x34/xba/x33 TAGALOG LETTER MA
-+<U170C>     /x81/x34/xba/x34 TAGALOG LETTER YA
-+<U170D>     /x81/x34/xba/x35 <UNASSIGNED>
-+<U170E>     /x81/x34/xba/x36 TAGALOG LETTER LA
-+<U170F>     /x81/x34/xba/x37 TAGALOG LETTER WA
-+<U1710>     /x81/x34/xba/x38 TAGALOG LETTER SA
-+<U1711>     /x81/x34/xba/x39 TAGALOG LETTER HA
-+<U1712>     /x81/x34/xbb/x30 TAGALOG VOWEL SIGN I
-+<U1713>     /x81/x34/xbb/x31 TAGALOG VOWEL SIGN U
-+<U1714>     /x81/x34/xbb/x32 TAGALOG SIGN VIRAMA
-+<U1715>     /x81/x34/xbb/x33 <UNASSIGNED>
-+<U1716>     /x81/x34/xbb/x34 <UNASSIGNED>
-+<U1717>     /x81/x34/xbb/x35 <UNASSIGNED>
-+<U1718>     /x81/x34/xbb/x36 <UNASSIGNED>
-+<U1719>     /x81/x34/xbb/x37 <UNASSIGNED>
-+<U171A>     /x81/x34/xbb/x38 <UNASSIGNED>
-+<U171B>     /x81/x34/xbb/x39 <UNASSIGNED>
-+<U171C>     /x81/x34/xbc/x30 <UNASSIGNED>
-+<U171D>     /x81/x34/xbc/x31 <UNASSIGNED>
-+<U171E>     /x81/x34/xbc/x32 <UNASSIGNED>
-+<U171F>     /x81/x34/xbc/x33 <UNASSIGNED>
-+<U1720>     /x81/x34/xbc/x34 HANUNOO LETTER A
-+<U1721>     /x81/x34/xbc/x35 HANUNOO LETTER I
-+<U1722>     /x81/x34/xbc/x36 HANUNOO LETTER U
-+<U1723>     /x81/x34/xbc/x37 HANUNOO LETTER KA
-+<U1724>     /x81/x34/xbc/x38 HANUNOO LETTER GA
-+<U1725>     /x81/x34/xbc/x39 HANUNOO LETTER NGA
-+<U1726>     /x81/x34/xbd/x30 HANUNOO LETTER TA
-+<U1727>     /x81/x34/xbd/x31 HANUNOO LETTER DA
-+<U1728>     /x81/x34/xbd/x32 HANUNOO LETTER NA
-+<U1729>     /x81/x34/xbd/x33 HANUNOO LETTER PA
-+<U172A>     /x81/x34/xbd/x34 HANUNOO LETTER BA
-+<U172B>     /x81/x34/xbd/x35 HANUNOO LETTER MA
-+<U172C>     /x81/x34/xbd/x36 HANUNOO LETTER YA
-+<U172D>     /x81/x34/xbd/x37 HANUNOO LETTER RA
-+<U172E>     /x81/x34/xbd/x38 HANUNOO LETTER LA
-+<U172F>     /x81/x34/xbd/x39 HANUNOO LETTER WA
-+<U1730>     /x81/x34/xbe/x30 HANUNOO LETTER SA
-+<U1731>     /x81/x34/xbe/x31 HANUNOO LETTER HA
-+<U1732>     /x81/x34/xbe/x32 HANUNOO VOWEL SIGN I
-+<U1733>     /x81/x34/xbe/x33 HANUNOO VOWEL SIGN U
-+<U1734>     /x81/x34/xbe/x34 HANUNOO SIGN PAMUDPOD
-+<U1735>     /x81/x34/xbe/x35 PHILIPPINE SINGLE PUNCTUATION
-+<U1736>     /x81/x34/xbe/x36 PHILIPPINE DOUBLE PUNCTUATION
-+<U1737>     /x81/x34/xbe/x37 <UNASSIGNED>
-+<U1738>     /x81/x34/xbe/x38 <UNASSIGNED>
-+<U1739>     /x81/x34/xbe/x39 <UNASSIGNED>
-+<U173A>     /x81/x34/xbf/x30 <UNASSIGNED>
-+<U173B>     /x81/x34/xbf/x31 <UNASSIGNED>
-+<U173C>     /x81/x34/xbf/x32 <UNASSIGNED>
-+<U173D>     /x81/x34/xbf/x33 <UNASSIGNED>
-+<U173E>     /x81/x34/xbf/x34 <UNASSIGNED>
-+<U173F>     /x81/x34/xbf/x35 <UNASSIGNED>
-+<U1740>     /x81/x34/xbf/x36 BUHID LETTER A
-+<U1741>     /x81/x34/xbf/x37 BUHID LETTER I
-+<U1742>     /x81/x34/xbf/x38 BUHID LETTER U
-+<U1743>     /x81/x34/xbf/x39 BUHID LETTER KA
-+<U1744>     /x81/x34/xc0/x30 BUHID LETTER GA
-+<U1745>     /x81/x34/xc0/x31 BUHID LETTER NGA
-+<U1746>     /x81/x34/xc0/x32 BUHID LETTER TA
-+<U1747>     /x81/x34/xc0/x33 BUHID LETTER DA
-+<U1748>     /x81/x34/xc0/x34 BUHID LETTER NA
-+<U1749>     /x81/x34/xc0/x35 BUHID LETTER PA
-+<U174A>     /x81/x34/xc0/x36 BUHID LETTER BA
-+<U174B>     /x81/x34/xc0/x37 BUHID LETTER MA
-+<U174C>     /x81/x34/xc0/x38 BUHID LETTER YA
-+<U174D>     /x81/x34/xc0/x39 BUHID LETTER RA
-+<U174E>     /x81/x34/xc1/x30 BUHID LETTER LA
-+<U174F>     /x81/x34/xc1/x31 BUHID LETTER WA
-+<U1750>     /x81/x34/xc1/x32 BUHID LETTER SA
-+<U1751>     /x81/x34/xc1/x33 BUHID LETTER HA
-+<U1752>     /x81/x34/xc1/x34 BUHID VOWEL SIGN I
-+<U1753>     /x81/x34/xc1/x35 BUHID VOWEL SIGN U
-+<U1754>     /x81/x34/xc1/x36 <UNASSIGNED>
-+<U1755>     /x81/x34/xc1/x37 <UNASSIGNED>
-+<U1756>     /x81/x34/xc1/x38 <UNASSIGNED>
-+<U1757>     /x81/x34/xc1/x39 <UNASSIGNED>
-+<U1758>     /x81/x34/xc2/x30 <UNASSIGNED>
-+<U1759>     /x81/x34/xc2/x31 <UNASSIGNED>
-+<U175A>     /x81/x34/xc2/x32 <UNASSIGNED>
-+<U175B>     /x81/x34/xc2/x33 <UNASSIGNED>
-+<U175C>     /x81/x34/xc2/x34 <UNASSIGNED>
-+<U175D>     /x81/x34/xc2/x35 <UNASSIGNED>
-+<U175E>     /x81/x34/xc2/x36 <UNASSIGNED>
-+<U175F>     /x81/x34/xc2/x37 <UNASSIGNED>
-+<U1760>     /x81/x34/xc2/x38 TAGBANWA LETTER A
-+<U1761>     /x81/x34/xc2/x39 TAGBANWA LETTER I
-+<U1762>     /x81/x34/xc3/x30 TAGBANWA LETTER U
-+<U1763>     /x81/x34/xc3/x31 TAGBANWA LETTER KA
-+<U1764>     /x81/x34/xc3/x32 TAGBANWA LETTER GA
-+<U1765>     /x81/x34/xc3/x33 TAGBANWA LETTER NGA
-+<U1766>     /x81/x34/xc3/x34 TAGBANWA LETTER TA
-+<U1767>     /x81/x34/xc3/x35 TAGBANWA LETTER DA
-+<U1768>     /x81/x34/xc3/x36 TAGBANWA LETTER NA
-+<U1769>     /x81/x34/xc3/x37 TAGBANWA LETTER PA
-+<U176A>     /x81/x34/xc3/x38 TAGBANWA LETTER BA
-+<U176B>     /x81/x34/xc3/x39 TAGBANWA LETTER MA
-+<U176C>     /x81/x34/xc4/x30 TAGBANWA LETTER YA
-+<U176D>     /x81/x34/xc4/x31 <UNASSIGNED>
-+<U176E>     /x81/x34/xc4/x32 TAGBANWA LETTER LA
-+<U176F>     /x81/x34/xc4/x33 TAGBANWA LETTER WA
-+<U1770>     /x81/x34/xc4/x34 TAGBANWA LETTER SA
-+<U1771>     /x81/x34/xc4/x35 <UNASSIGNED>
-+<U1772>     /x81/x34/xc4/x36 TAGBANWA VOWEL SIGN I
-+<U1773>     /x81/x34/xc4/x37 TAGBANWA VOWEL SIGN U
-+<U1774>     /x81/x34/xc4/x38 <UNASSIGNED>
-+<U1775>     /x81/x34/xc4/x39 <UNASSIGNED>
-+<U1776>     /x81/x34/xc5/x30 <UNASSIGNED>
-+<U1777>     /x81/x34/xc5/x31 <UNASSIGNED>
-+<U1778>     /x81/x34/xc5/x32 <UNASSIGNED>
-+<U1779>     /x81/x34/xc5/x33 <UNASSIGNED>
-+<U177A>     /x81/x34/xc5/x34 <UNASSIGNED>
-+<U177B>     /x81/x34/xc5/x35 <UNASSIGNED>
-+<U177C>     /x81/x34/xc5/x36 <UNASSIGNED>
-+<U177D>     /x81/x34/xc5/x37 <UNASSIGNED>
-+<U177E>     /x81/x34/xc5/x38 <UNASSIGNED>
-+<U177F>     /x81/x34/xc5/x39 <UNASSIGNED>
-+<U1780>     /x81/x34/xc6/x30 KHMER LETTER KA
-+<U1781>     /x81/x34/xc6/x31 KHMER LETTER KHA
-+<U1782>     /x81/x34/xc6/x32 KHMER LETTER KO
-+<U1783>     /x81/x34/xc6/x33 KHMER LETTER KHO
-+<U1784>     /x81/x34/xc6/x34 KHMER LETTER NGO
-+<U1785>     /x81/x34/xc6/x35 KHMER LETTER CA
-+<U1786>     /x81/x34/xc6/x36 KHMER LETTER CHA
-+<U1787>     /x81/x34/xc6/x37 KHMER LETTER CO
-+<U1788>     /x81/x34/xc6/x38 KHMER LETTER CHO
-+<U1789>     /x81/x34/xc6/x39 KHMER LETTER NYO
-+<U178A>     /x81/x34/xc7/x30 KHMER LETTER DA
-+<U178B>     /x81/x34/xc7/x31 KHMER LETTER TTHA
-+<U178C>     /x81/x34/xc7/x32 KHMER LETTER DO
-+<U178D>     /x81/x34/xc7/x33 KHMER LETTER TTHO
-+<U178E>     /x81/x34/xc7/x34 KHMER LETTER NNO
-+<U178F>     /x81/x34/xc7/x35 KHMER LETTER TA
-+<U1790>     /x81/x34/xc7/x36 KHMER LETTER THA
-+<U1791>     /x81/x34/xc7/x37 KHMER LETTER TO
-+<U1792>     /x81/x34/xc7/x38 KHMER LETTER THO
-+<U1793>     /x81/x34/xc7/x39 KHMER LETTER NO
-+<U1794>     /x81/x34/xc8/x30 KHMER LETTER BA
-+<U1795>     /x81/x34/xc8/x31 KHMER LETTER PHA
-+<U1796>     /x81/x34/xc8/x32 KHMER LETTER PO
-+<U1797>     /x81/x34/xc8/x33 KHMER LETTER PHO
-+<U1798>     /x81/x34/xc8/x34 KHMER LETTER MO
-+<U1799>     /x81/x34/xc8/x35 KHMER LETTER YO
-+<U179A>     /x81/x34/xc8/x36 KHMER LETTER RO
-+<U179B>     /x81/x34/xc8/x37 KHMER LETTER LO
-+<U179C>     /x81/x34/xc8/x38 KHMER LETTER VO
-+<U179D>     /x81/x34/xc8/x39 KHMER LETTER SHA
-+<U179E>     /x81/x34/xc9/x30 KHMER LETTER SSO
-+<U179F>     /x81/x34/xc9/x31 KHMER LETTER SA
-+<U17A0>     /x81/x34/xc9/x32 KHMER LETTER HA
-+<U17A1>     /x81/x34/xc9/x33 KHMER LETTER LA
-+<U17A2>     /x81/x34/xc9/x34 KHMER LETTER QA
-+<U17A3>     /x81/x34/xc9/x35 KHMER INDEPENDENT VOWEL QAQ
-+<U17A4>     /x81/x34/xc9/x36 KHMER INDEPENDENT VOWEL QAA
-+<U17A5>     /x81/x34/xc9/x37 KHMER INDEPENDENT VOWEL QI
-+<U17A6>     /x81/x34/xc9/x38 KHMER INDEPENDENT VOWEL QII
-+<U17A7>     /x81/x34/xc9/x39 KHMER INDEPENDENT VOWEL QU
-+<U17A8>     /x81/x34/xca/x30 KHMER INDEPENDENT VOWEL QUK
-+<U17A9>     /x81/x34/xca/x31 KHMER INDEPENDENT VOWEL QUU
-+<U17AA>     /x81/x34/xca/x32 KHMER INDEPENDENT VOWEL QUUV
-+<U17AB>     /x81/x34/xca/x33 KHMER INDEPENDENT VOWEL RY
-+<U17AC>     /x81/x34/xca/x34 KHMER INDEPENDENT VOWEL RYY
-+<U17AD>     /x81/x34/xca/x35 KHMER INDEPENDENT VOWEL LY
-+<U17AE>     /x81/x34/xca/x36 KHMER INDEPENDENT VOWEL LYY
-+<U17AF>     /x81/x34/xca/x37 KHMER INDEPENDENT VOWEL QE
-+<U17B0>     /x81/x34/xca/x38 KHMER INDEPENDENT VOWEL QAI
-+<U17B1>     /x81/x34/xca/x39 KHMER INDEPENDENT VOWEL QOO TYPE ONE
-+<U17B2>     /x81/x34/xcb/x30 KHMER INDEPENDENT VOWEL QOO TYPE TWO
-+<U17B3>     /x81/x34/xcb/x31 KHMER INDEPENDENT VOWEL QAU
-+<U17B4>     /x81/x34/xcb/x32 KHMER VOWEL INHERENT AQ
-+<U17B5>     /x81/x34/xcb/x33 KHMER VOWEL INHERENT AA
-+<U17B6>     /x81/x34/xcb/x34 KHMER VOWEL SIGN AA
-+<U17B7>     /x81/x34/xcb/x35 KHMER VOWEL SIGN I
-+<U17B8>     /x81/x34/xcb/x36 KHMER VOWEL SIGN II
-+<U17B9>     /x81/x34/xcb/x37 KHMER VOWEL SIGN Y
-+<U17BA>     /x81/x34/xcb/x38 KHMER VOWEL SIGN YY
-+<U17BB>     /x81/x34/xcb/x39 KHMER VOWEL SIGN U
-+<U17BC>     /x81/x34/xcc/x30 KHMER VOWEL SIGN UU
-+<U17BD>     /x81/x34/xcc/x31 KHMER VOWEL SIGN UA
-+<U17BE>     /x81/x34/xcc/x32 KHMER VOWEL SIGN OE
-+<U17BF>     /x81/x34/xcc/x33 KHMER VOWEL SIGN YA
-+<U17C0>     /x81/x34/xcc/x34 KHMER VOWEL SIGN IE
-+<U17C1>     /x81/x34/xcc/x35 KHMER VOWEL SIGN E
-+<U17C2>     /x81/x34/xcc/x36 KHMER VOWEL SIGN AE
-+<U17C3>     /x81/x34/xcc/x37 KHMER VOWEL SIGN AI
-+<U17C4>     /x81/x34/xcc/x38 KHMER VOWEL SIGN OO
-+<U17C5>     /x81/x34/xcc/x39 KHMER VOWEL SIGN AU
-+<U17C6>     /x81/x34/xcd/x30 KHMER SIGN NIKAHIT
-+<U17C7>     /x81/x34/xcd/x31 KHMER SIGN REAHMUK
-+<U17C8>     /x81/x34/xcd/x32 KHMER SIGN YUUKALEAPINTU
-+<U17C9>     /x81/x34/xcd/x33 KHMER SIGN MUUSIKATOAN
-+<U17CA>     /x81/x34/xcd/x34 KHMER SIGN TRIISAP
-+<U17CB>     /x81/x34/xcd/x35 KHMER SIGN BANTOC
-+<U17CC>     /x81/x34/xcd/x36 KHMER SIGN ROBAT
-+<U17CD>     /x81/x34/xcd/x37 KHMER SIGN TOANDAKHIAT
-+<U17CE>     /x81/x34/xcd/x38 KHMER SIGN KAKABAT
-+<U17CF>     /x81/x34/xcd/x39 KHMER SIGN AHSDA
-+<U17D0>     /x81/x34/xce/x30 KHMER SIGN SAMYOK SANNYA
-+<U17D1>     /x81/x34/xce/x31 KHMER SIGN VIRIAM
-+<U17D2>     /x81/x34/xce/x32 KHMER SIGN COENG
-+<U17D3>     /x81/x34/xce/x33 KHMER SIGN BATHAMASAT
-+<U17D4>     /x81/x34/xce/x34 KHMER SIGN KHAN
-+<U17D5>     /x81/x34/xce/x35 KHMER SIGN BARIYOOSAN
-+<U17D6>     /x81/x34/xce/x36 KHMER SIGN CAMNUC PII KUUH
-+<U17D7>     /x81/x34/xce/x37 KHMER SIGN LEK TOO
-+<U17D8>     /x81/x34/xce/x38 KHMER SIGN BEYYAL
-+<U17D9>     /x81/x34/xce/x39 KHMER SIGN PHNAEK MUAN
-+<U17DA>     /x81/x34/xcf/x30 KHMER SIGN KOOMUUT
-+<U17DB>     /x81/x34/xcf/x31 KHMER CURRENCY SYMBOL RIEL
-+<U17DC>     /x81/x34/xcf/x32 KHMER SIGN AVAKRAHASANYA
-+<U17DD>     /x81/x34/xcf/x33 <UNASSIGNED>
-+<U17DE>     /x81/x34/xcf/x34 <UNASSIGNED>
-+<U17DF>     /x81/x34/xcf/x35 <UNASSIGNED>
-+<U17E0>     /x81/x34/xcf/x36 KHMER DIGIT ZERO
-+<U17E1>     /x81/x34/xcf/x37 KHMER DIGIT ONE
-+<U17E2>     /x81/x34/xcf/x38 KHMER DIGIT TWO
-+<U17E3>     /x81/x34/xcf/x39 KHMER DIGIT THREE
-+<U17E4>     /x81/x34/xd0/x30 KHMER DIGIT FOUR
-+<U17E5>     /x81/x34/xd0/x31 KHMER DIGIT FIVE
-+<U17E6>     /x81/x34/xd0/x32 KHMER DIGIT SIX
-+<U17E7>     /x81/x34/xd0/x33 KHMER DIGIT SEVEN
-+<U17E8>     /x81/x34/xd0/x34 KHMER DIGIT EIGHT
-+<U17E9>     /x81/x34/xd0/x35 KHMER DIGIT NINE
-+<U17EA>     /x81/x34/xd0/x36 <UNASSIGNED>
-+<U17EB>     /x81/x34/xd0/x37 <UNASSIGNED>
-+<U17EC>     /x81/x34/xd0/x38 <UNASSIGNED>
-+<U17ED>     /x81/x34/xd0/x39 <UNASSIGNED>
-+<U17EE>     /x81/x34/xd1/x30 <UNASSIGNED>
-+<U17EF>     /x81/x34/xd1/x31 <UNASSIGNED>
-+<U17F0>     /x81/x34/xd1/x32 <UNASSIGNED>
-+<U17F1>     /x81/x34/xd1/x33 <UNASSIGNED>
-+<U17F2>     /x81/x34/xd1/x34 <UNASSIGNED>
-+<U17F3>     /x81/x34/xd1/x35 <UNASSIGNED>
-+<U17F4>     /x81/x34/xd1/x36 <UNASSIGNED>
-+<U17F5>     /x81/x34/xd1/x37 <UNASSIGNED>
-+<U17F6>     /x81/x34/xd1/x38 <UNASSIGNED>
-+<U17F7>     /x81/x34/xd1/x39 <UNASSIGNED>
-+<U17F8>     /x81/x34/xd2/x30 <UNASSIGNED>
-+<U17F9>     /x81/x34/xd2/x31 <UNASSIGNED>
-+<U17FA>     /x81/x34/xd2/x32 <UNASSIGNED>
-+<U17FB>     /x81/x34/xd2/x33 <UNASSIGNED>
-+<U17FC>     /x81/x34/xd2/x34 <UNASSIGNED>
-+<U17FD>     /x81/x34/xd2/x35 <UNASSIGNED>
-+<U17FE>     /x81/x34/xd2/x36 <UNASSIGNED>
-+<U17FF>     /x81/x34/xd2/x37 <UNASSIGNED>
-+<U1800>     /x81/x34/xd2/x38 MONGOLIAN BIRGA
-+<U1801>     /x81/x34/xd2/x39 MONGOLIAN ELLIPSIS
-+<U1802>     /x81/x34/xd3/x30 MONGOLIAN COMMA
-+<U1803>     /x81/x34/xd3/x31 MONGOLIAN FULL STOP
-+<U1804>     /x81/x34/xd3/x32 MONGOLIAN COLON
-+<U1805>     /x81/x34/xd3/x33 MONGOLIAN FOUR DOTS
-+<U1806>     /x81/x34/xd3/x34 MONGOLIAN TODO SOFT HYPHEN
-+<U1807>     /x81/x34/xd3/x35 MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER
-+<U1808>     /x81/x34/xd3/x36 MONGOLIAN MANCHU COMMA
-+<U1809>     /x81/x34/xd3/x37 MONGOLIAN MANCHU FULL STOP
-+<U180A>     /x81/x34/xd3/x38 MONGOLIAN NIRUGU
-+<U180B>     /x81/x34/xd3/x39 MONGOLIAN FREE VARIATION SELECTOR ONE
-+<U180C>     /x81/x34/xd4/x30 MONGOLIAN FREE VARIATION SELECTOR TWO
-+<U180D>     /x81/x34/xd4/x31 MONGOLIAN FREE VARIATION SELECTOR THREE
-+<U180E>     /x81/x34/xd4/x32 MONGOLIAN VOWEL SEPARATOR
-+<U180F>     /x81/x34/xd4/x33 <UNASSIGNED>
-+<U1810>     /x81/x34/xd4/x34 MONGOLIAN DIGIT ZERO
-+<U1811>     /x81/x34/xd4/x35 MONGOLIAN DIGIT ONE
-+<U1812>     /x81/x34/xd4/x36 MONGOLIAN DIGIT TWO
-+<U1813>     /x81/x34/xd4/x37 MONGOLIAN DIGIT THREE
-+<U1814>     /x81/x34/xd4/x38 MONGOLIAN DIGIT FOUR
-+<U1815>     /x81/x34/xd4/x39 MONGOLIAN DIGIT FIVE
-+<U1816>     /x81/x34/xd5/x30 MONGOLIAN DIGIT SIX
-+<U1817>     /x81/x34/xd5/x31 MONGOLIAN DIGIT SEVEN
-+<U1818>     /x81/x34/xd5/x32 MONGOLIAN DIGIT EIGHT
-+<U1819>     /x81/x34/xd5/x33 MONGOLIAN DIGIT NINE
-+<U181A>     /x81/x34/xd5/x34 <UNASSIGNED>
-+<U181B>     /x81/x34/xd5/x35 <UNASSIGNED>
-+<U181C>     /x81/x34/xd5/x36 <UNASSIGNED>
-+<U181D>     /x81/x34/xd5/x37 <UNASSIGNED>
-+<U181E>     /x81/x34/xd5/x38 <UNASSIGNED>
-+<U181F>     /x81/x34/xd5/x39 <UNASSIGNED>
-+<U1820>     /x81/x34/xd6/x30 MONGOLIAN LETTER A
-+<U1821>     /x81/x34/xd6/x31 MONGOLIAN LETTER E
-+<U1822>     /x81/x34/xd6/x32 MONGOLIAN LETTER I
-+<U1823>     /x81/x34/xd6/x33 MONGOLIAN LETTER O
-+<U1824>     /x81/x34/xd6/x34 MONGOLIAN LETTER U
-+<U1825>     /x81/x34/xd6/x35 MONGOLIAN LETTER OE
-+<U1826>     /x81/x34/xd6/x36 MONGOLIAN LETTER UE
-+<U1827>     /x81/x34/xd6/x37 MONGOLIAN LETTER EE
-+<U1828>     /x81/x34/xd6/x38 MONGOLIAN LETTER NA
-+<U1829>     /x81/x34/xd6/x39 MONGOLIAN LETTER ANG
-+<U182A>     /x81/x34/xd7/x30 MONGOLIAN LETTER BA
-+<U182B>     /x81/x34/xd7/x31 MONGOLIAN LETTER PA
-+<U182C>     /x81/x34/xd7/x32 MONGOLIAN LETTER QA
-+<U182D>     /x81/x34/xd7/x33 MONGOLIAN LETTER GA
-+<U182E>     /x81/x34/xd7/x34 MONGOLIAN LETTER MA
-+<U182F>     /x81/x34/xd7/x35 MONGOLIAN LETTER LA
-+<U1830>     /x81/x34/xd7/x36 MONGOLIAN LETTER SA
-+<U1831>     /x81/x34/xd7/x37 MONGOLIAN LETTER SHA
-+<U1832>     /x81/x34/xd7/x38 MONGOLIAN LETTER TA
-+<U1833>     /x81/x34/xd7/x39 MONGOLIAN LETTER DA
-+<U1834>     /x81/x34/xd8/x30 MONGOLIAN LETTER CHA
-+<U1835>     /x81/x34/xd8/x31 MONGOLIAN LETTER JA
-+<U1836>     /x81/x34/xd8/x32 MONGOLIAN LETTER YA
-+<U1837>     /x81/x34/xd8/x33 MONGOLIAN LETTER RA
-+<U1838>     /x81/x34/xd8/x34 MONGOLIAN LETTER WA
-+<U1839>     /x81/x34/xd8/x35 MONGOLIAN LETTER FA
-+<U183A>     /x81/x34/xd8/x36 MONGOLIAN LETTER KA
-+<U183B>     /x81/x34/xd8/x37 MONGOLIAN LETTER KHA
-+<U183C>     /x81/x34/xd8/x38 MONGOLIAN LETTER TSA
-+<U183D>     /x81/x34/xd8/x39 MONGOLIAN LETTER ZA
-+<U183E>     /x81/x34/xd9/x30 MONGOLIAN LETTER HAA
-+<U183F>     /x81/x34/xd9/x31 MONGOLIAN LETTER ZRA
-+<U1840>     /x81/x34/xd9/x32 MONGOLIAN LETTER LHA
-+<U1841>     /x81/x34/xd9/x33 MONGOLIAN LETTER ZHI
-+<U1842>     /x81/x34/xd9/x34 MONGOLIAN LETTER CHI
-+<U1843>     /x81/x34/xd9/x35 MONGOLIAN LETTER TODO LONG VOWEL SIGN
-+<U1844>     /x81/x34/xd9/x36 MONGOLIAN LETTER TODO E
-+<U1845>     /x81/x34/xd9/x37 MONGOLIAN LETTER TODO I
-+<U1846>     /x81/x34/xd9/x38 MONGOLIAN LETTER TODO O
-+<U1847>     /x81/x34/xd9/x39 MONGOLIAN LETTER TODO U
-+<U1848>     /x81/x34/xda/x30 MONGOLIAN LETTER TODO OE
-+<U1849>     /x81/x34/xda/x31 MONGOLIAN LETTER TODO UE
-+<U184A>     /x81/x34/xda/x32 MONGOLIAN LETTER TODO ANG
-+<U184B>     /x81/x34/xda/x33 MONGOLIAN LETTER TODO BA
-+<U184C>     /x81/x34/xda/x34 MONGOLIAN LETTER TODO PA
-+<U184D>     /x81/x34/xda/x35 MONGOLIAN LETTER TODO QA
-+<U184E>     /x81/x34/xda/x36 MONGOLIAN LETTER TODO GA
-+<U184F>     /x81/x34/xda/x37 MONGOLIAN LETTER TODO MA
-+<U1850>     /x81/x34/xda/x38 MONGOLIAN LETTER TODO TA
-+<U1851>     /x81/x34/xda/x39 MONGOLIAN LETTER TODO DA
-+<U1852>     /x81/x34/xdb/x30 MONGOLIAN LETTER TODO CHA
-+<U1853>     /x81/x34/xdb/x31 MONGOLIAN LETTER TODO JA
-+<U1854>     /x81/x34/xdb/x32 MONGOLIAN LETTER TODO TSA
-+<U1855>     /x81/x34/xdb/x33 MONGOLIAN LETTER TODO YA
-+<U1856>     /x81/x34/xdb/x34 MONGOLIAN LETTER TODO WA
-+<U1857>     /x81/x34/xdb/x35 MONGOLIAN LETTER TODO KA
-+<U1858>     /x81/x34/xdb/x36 MONGOLIAN LETTER TODO GAA
-+<U1859>     /x81/x34/xdb/x37 MONGOLIAN LETTER TODO HAA
-+<U185A>     /x81/x34/xdb/x38 MONGOLIAN LETTER TODO JIA
-+<U185B>     /x81/x34/xdb/x39 MONGOLIAN LETTER TODO NIA
-+<U185C>     /x81/x34/xdc/x30 MONGOLIAN LETTER TODO DZA
-+<U185D>     /x81/x34/xdc/x31 MONGOLIAN LETTER SIBE E
-+<U185E>     /x81/x34/xdc/x32 MONGOLIAN LETTER SIBE I
-+<U185F>     /x81/x34/xdc/x33 MONGOLIAN LETTER SIBE IY
-+<U1860>     /x81/x34/xdc/x34 MONGOLIAN LETTER SIBE UE
-+<U1861>     /x81/x34/xdc/x35 MONGOLIAN LETTER SIBE U
-+<U1862>     /x81/x34/xdc/x36 MONGOLIAN LETTER SIBE ANG
-+<U1863>     /x81/x34/xdc/x37 MONGOLIAN LETTER SIBE KA
-+<U1864>     /x81/x34/xdc/x38 MONGOLIAN LETTER SIBE GA
-+<U1865>     /x81/x34/xdc/x39 MONGOLIAN LETTER SIBE HA
-+<U1866>     /x81/x34/xdd/x30 MONGOLIAN LETTER SIBE PA
-+<U1867>     /x81/x34/xdd/x31 MONGOLIAN LETTER SIBE SHA
-+<U1868>     /x81/x34/xdd/x32 MONGOLIAN LETTER SIBE TA
-+<U1869>     /x81/x34/xdd/x33 MONGOLIAN LETTER SIBE DA
-+<U186A>     /x81/x34/xdd/x34 MONGOLIAN LETTER SIBE JA
-+<U186B>     /x81/x34/xdd/x35 MONGOLIAN LETTER SIBE FA
-+<U186C>     /x81/x34/xdd/x36 MONGOLIAN LETTER SIBE GAA
-+<U186D>     /x81/x34/xdd/x37 MONGOLIAN LETTER SIBE HAA
-+<U186E>     /x81/x34/xdd/x38 MONGOLIAN LETTER SIBE TSA
-+<U186F>     /x81/x34/xdd/x39 MONGOLIAN LETTER SIBE ZA
-+<U1870>     /x81/x34/xde/x30 MONGOLIAN LETTER SIBE RAA
-+<U1871>     /x81/x34/xde/x31 MONGOLIAN LETTER SIBE CHA
-+<U1872>     /x81/x34/xde/x32 MONGOLIAN LETTER SIBE ZHA
-+<U1873>     /x81/x34/xde/x33 MONGOLIAN LETTER MANCHU I
-+<U1874>     /x81/x34/xde/x34 MONGOLIAN LETTER MANCHU KA
-+<U1875>     /x81/x34/xde/x35 MONGOLIAN LETTER MANCHU RA
-+<U1876>     /x81/x34/xde/x36 MONGOLIAN LETTER MANCHU FA
-+<U1877>     /x81/x34/xde/x37 MONGOLIAN LETTER MANCHU ZHA
-+<U1878>     /x81/x34/xde/x38 <UNASSIGNED>
-+<U1879>     /x81/x34/xde/x39 <UNASSIGNED>
-+<U187A>     /x81/x34/xdf/x30 <UNASSIGNED>
-+<U187B>     /x81/x34/xdf/x31 <UNASSIGNED>
-+<U187C>     /x81/x34/xdf/x32 <UNASSIGNED>
-+<U187D>     /x81/x34/xdf/x33 <UNASSIGNED>
-+<U187E>     /x81/x34/xdf/x34 <UNASSIGNED>
-+<U187F>     /x81/x34/xdf/x35 <UNASSIGNED>
-+<U1880>     /x81/x34/xdf/x36 MONGOLIAN LETTER ALI GALI ANUSVARA ONE
-+<U1881>     /x81/x34/xdf/x37 MONGOLIAN LETTER ALI GALI VISARGA ONE
-+<U1882>     /x81/x34/xdf/x38 MONGOLIAN LETTER ALI GALI DAMARU
-+<U1883>     /x81/x34/xdf/x39 MONGOLIAN LETTER ALI GALI UBADAMA
-+<U1884>     /x81/x34/xe0/x30 MONGOLIAN LETTER ALI GALI INVERTED UBADAMA
-+<U1885>     /x81/x34/xe0/x31 MONGOLIAN LETTER ALI GALI BALUDA
-+<U1886>     /x81/x34/xe0/x32 MONGOLIAN LETTER ALI GALI THREE BALUDA
-+<U1887>     /x81/x34/xe0/x33 MONGOLIAN LETTER ALI GALI A
-+<U1888>     /x81/x34/xe0/x34 MONGOLIAN LETTER ALI GALI I
-+<U1889>     /x81/x34/xe0/x35 MONGOLIAN LETTER ALI GALI KA
-+<U188A>     /x81/x34/xe0/x36 MONGOLIAN LETTER ALI GALI NGA
-+<U188B>     /x81/x34/xe0/x37 MONGOLIAN LETTER ALI GALI CA
-+<U188C>     /x81/x34/xe0/x38 MONGOLIAN LETTER ALI GALI TTA
-+<U188D>     /x81/x34/xe0/x39 MONGOLIAN LETTER ALI GALI TTHA
-+<U188E>     /x81/x34/xe1/x30 MONGOLIAN LETTER ALI GALI DDA
-+<U188F>     /x81/x34/xe1/x31 MONGOLIAN LETTER ALI GALI NNA
-+<U1890>     /x81/x34/xe1/x32 MONGOLIAN LETTER ALI GALI TA
-+<U1891>     /x81/x34/xe1/x33 MONGOLIAN LETTER ALI GALI DA
-+<U1892>     /x81/x34/xe1/x34 MONGOLIAN LETTER ALI GALI PA
-+<U1893>     /x81/x34/xe1/x35 MONGOLIAN LETTER ALI GALI PHA
-+<U1894>     /x81/x34/xe1/x36 MONGOLIAN LETTER ALI GALI SSA
-+<U1895>     /x81/x34/xe1/x37 MONGOLIAN LETTER ALI GALI ZHA
-+<U1896>     /x81/x34/xe1/x38 MONGOLIAN LETTER ALI GALI ZA
-+<U1897>     /x81/x34/xe1/x39 MONGOLIAN LETTER ALI GALI AH
-+<U1898>     /x81/x34/xe2/x30 MONGOLIAN LETTER TODO ALI GALI TA
-+<U1899>     /x81/x34/xe2/x31 MONGOLIAN LETTER TODO ALI GALI ZHA
-+<U189A>     /x81/x34/xe2/x32 MONGOLIAN LETTER MANCHU ALI GALI GHA
-+<U189B>     /x81/x34/xe2/x33 MONGOLIAN LETTER MANCHU ALI GALI NGA
-+<U189C>     /x81/x34/xe2/x34 MONGOLIAN LETTER MANCHU ALI GALI CA
-+<U189D>     /x81/x34/xe2/x35 MONGOLIAN LETTER MANCHU ALI GALI JHA
-+<U189E>     /x81/x34/xe2/x36 MONGOLIAN LETTER MANCHU ALI GALI TTA
-+<U189F>     /x81/x34/xe2/x37 MONGOLIAN LETTER MANCHU ALI GALI DDHA
-+<U18A0>     /x81/x34/xe2/x38 MONGOLIAN LETTER MANCHU ALI GALI TA
-+<U18A1>     /x81/x34/xe2/x39 MONGOLIAN LETTER MANCHU ALI GALI DHA
-+<U18A2>     /x81/x34/xe3/x30 MONGOLIAN LETTER MANCHU ALI GALI SSA
-+<U18A3>     /x81/x34/xe3/x31 MONGOLIAN LETTER MANCHU ALI GALI CYA
-+<U18A4>     /x81/x34/xe3/x32 MONGOLIAN LETTER MANCHU ALI GALI ZHA
-+<U18A5>     /x81/x34/xe3/x33 MONGOLIAN LETTER MANCHU ALI GALI ZA
-+<U18A6>     /x81/x34/xe3/x34 MONGOLIAN LETTER ALI GALI HALF U
-+<U18A7>     /x81/x34/xe3/x35 MONGOLIAN LETTER ALI GALI HALF YA
-+<U18A8>     /x81/x34/xe3/x36 MONGOLIAN LETTER MANCHU ALI GALI BHA
-+<U18A9>     /x81/x34/xe3/x37 MONGOLIAN LETTER ALI GALI DAGALGA
-+<U18AA>     /x81/x34/xe3/x38 <UNASSIGNED>
-+<U18AB>     /x81/x34/xe3/x39 <UNASSIGNED>
-+<U18AC>     /x81/x34/xe4/x30 <UNASSIGNED>
-+<U18AD>     /x81/x34/xe4/x31 <UNASSIGNED>
-+<U18AE>     /x81/x34/xe4/x32 <UNASSIGNED>
-+<U18AF>     /x81/x34/xe4/x33 <UNASSIGNED>
-+<U18B0>     /x81/x34/xe4/x34 <UNASSIGNED>
-+<U18B1>     /x81/x34/xe4/x35 <UNASSIGNED>
-+<U18B2>     /x81/x34/xe4/x36 <UNASSIGNED>
-+<U18B3>     /x81/x34/xe4/x37 <UNASSIGNED>
-+<U18B4>     /x81/x34/xe4/x38 <UNASSIGNED>
-+<U18B5>     /x81/x34/xe4/x39 <UNASSIGNED>
-+<U18B6>     /x81/x34/xe5/x30 <UNASSIGNED>
-+<U18B7>     /x81/x34/xe5/x31 <UNASSIGNED>
-+<U18B8>     /x81/x34/xe5/x32 <UNASSIGNED>
-+<U18B9>     /x81/x34/xe5/x33 <UNASSIGNED>
-+<U18BA>     /x81/x34/xe5/x34 <UNASSIGNED>
-+<U18BB>     /x81/x34/xe5/x35 <UNASSIGNED>
-+<U18BC>     /x81/x34/xe5/x36 <UNASSIGNED>
-+<U18BD>     /x81/x34/xe5/x37 <UNASSIGNED>
-+<U18BE>     /x81/x34/xe5/x38 <UNASSIGNED>
-+<U18BF>     /x81/x34/xe5/x39 <UNASSIGNED>
-+<U18C0>     /x81/x34/xe6/x30 <UNASSIGNED>
-+<U18C1>     /x81/x34/xe6/x31 <UNASSIGNED>
-+<U18C2>     /x81/x34/xe6/x32 <UNASSIGNED>
-+<U18C3>     /x81/x34/xe6/x33 <UNASSIGNED>
-+<U18C4>     /x81/x34/xe6/x34 <UNASSIGNED>
-+<U18C5>     /x81/x34/xe6/x35 <UNASSIGNED>
-+<U18C6>     /x81/x34/xe6/x36 <UNASSIGNED>
-+<U18C7>     /x81/x34/xe6/x37 <UNASSIGNED>
-+<U18C8>     /x81/x34/xe6/x38 <UNASSIGNED>
-+<U18C9>     /x81/x34/xe6/x39 <UNASSIGNED>
-+<U18CA>     /x81/x34/xe7/x30 <UNASSIGNED>
-+<U18CB>     /x81/x34/xe7/x31 <UNASSIGNED>
-+<U18CC>     /x81/x34/xe7/x32 <UNASSIGNED>
-+<U18CD>     /x81/x34/xe7/x33 <UNASSIGNED>
-+<U18CE>     /x81/x34/xe7/x34 <UNASSIGNED>
-+<U18CF>     /x81/x34/xe7/x35 <UNASSIGNED>
-+<U18D0>     /x81/x34/xe7/x36 <UNASSIGNED>
-+<U18D1>     /x81/x34/xe7/x37 <UNASSIGNED>
-+<U18D2>     /x81/x34/xe7/x38 <UNASSIGNED>
-+<U18D3>     /x81/x34/xe7/x39 <UNASSIGNED>
-+<U18D4>     /x81/x34/xe8/x30 <UNASSIGNED>
-+<U18D5>     /x81/x34/xe8/x31 <UNASSIGNED>
-+<U18D6>     /x81/x34/xe8/x32 <UNASSIGNED>
-+<U18D7>     /x81/x34/xe8/x33 <UNASSIGNED>
-+<U18D8>     /x81/x34/xe8/x34 <UNASSIGNED>
-+<U18D9>     /x81/x34/xe8/x35 <UNASSIGNED>
-+<U18DA>     /x81/x34/xe8/x36 <UNASSIGNED>
-+<U18DB>     /x81/x34/xe8/x37 <UNASSIGNED>
-+<U18DC>     /x81/x34/xe8/x38 <UNASSIGNED>
-+<U18DD>     /x81/x34/xe8/x39 <UNASSIGNED>
-+<U18DE>     /x81/x34/xe9/x30 <UNASSIGNED>
-+<U18DF>     /x81/x34/xe9/x31 <UNASSIGNED>
-+<U18E0>     /x81/x34/xe9/x32 <UNASSIGNED>
-+<U18E1>     /x81/x34/xe9/x33 <UNASSIGNED>
-+<U18E2>     /x81/x34/xe9/x34 <UNASSIGNED>
-+<U18E3>     /x81/x34/xe9/x35 <UNASSIGNED>
-+<U18E4>     /x81/x34/xe9/x36 <UNASSIGNED>
-+<U18E5>     /x81/x34/xe9/x37 <UNASSIGNED>
-+<U18E6>     /x81/x34/xe9/x38 <UNASSIGNED>
-+<U18E7>     /x81/x34/xe9/x39 <UNASSIGNED>
-+<U18E8>     /x81/x34/xea/x30 <UNASSIGNED>
-+<U18E9>     /x81/x34/xea/x31 <UNASSIGNED>
-+<U18EA>     /x81/x34/xea/x32 <UNASSIGNED>
-+<U18EB>     /x81/x34/xea/x33 <UNASSIGNED>
-+<U18EC>     /x81/x34/xea/x34 <UNASSIGNED>
-+<U18ED>     /x81/x34/xea/x35 <UNASSIGNED>
-+<U18EE>     /x81/x34/xea/x36 <UNASSIGNED>
-+<U18EF>     /x81/x34/xea/x37 <UNASSIGNED>
-+<U18F0>     /x81/x34/xea/x38 <UNASSIGNED>
-+<U18F1>     /x81/x34/xea/x39 <UNASSIGNED>
-+<U18F2>     /x81/x34/xeb/x30 <UNASSIGNED>
-+<U18F3>     /x81/x34/xeb/x31 <UNASSIGNED>
-+<U18F4>     /x81/x34/xeb/x32 <UNASSIGNED>
-+<U18F5>     /x81/x34/xeb/x33 <UNASSIGNED>
-+<U18F6>     /x81/x34/xeb/x34 <UNASSIGNED>
-+<U18F7>     /x81/x34/xeb/x35 <UNASSIGNED>
-+<U18F8>     /x81/x34/xeb/x36 <UNASSIGNED>
-+<U18F9>     /x81/x34/xeb/x37 <UNASSIGNED>
-+<U18FA>     /x81/x34/xeb/x38 <UNASSIGNED>
-+<U18FB>     /x81/x34/xeb/x39 <UNASSIGNED>
-+<U18FC>     /x81/x34/xec/x30 <UNASSIGNED>
-+<U18FD>     /x81/x34/xec/x31 <UNASSIGNED>
-+<U18FE>     /x81/x34/xec/x32 <UNASSIGNED>
-+<U18FF>     /x81/x34/xec/x33 <UNASSIGNED>
-+<U1900>     /x81/x34/xec/x34 <UNASSIGNED>
-+<U1901>     /x81/x34/xec/x35 <UNASSIGNED>
-+<U1902>     /x81/x34/xec/x36 <UNASSIGNED>
-+<U1903>     /x81/x34/xec/x37 <UNASSIGNED>
-+<U1904>     /x81/x34/xec/x38 <UNASSIGNED>
-+<U1905>     /x81/x34/xec/x39 <UNASSIGNED>
-+<U1906>     /x81/x34/xed/x30 <UNASSIGNED>
-+<U1907>     /x81/x34/xed/x31 <UNASSIGNED>
-+<U1908>     /x81/x34/xed/x32 <UNASSIGNED>
-+<U1909>     /x81/x34/xed/x33 <UNASSIGNED>
-+<U190A>     /x81/x34/xed/x34 <UNASSIGNED>
-+<U190B>     /x81/x34/xed/x35 <UNASSIGNED>
-+<U190C>     /x81/x34/xed/x36 <UNASSIGNED>
-+<U190D>     /x81/x34/xed/x37 <UNASSIGNED>
-+<U190E>     /x81/x34/xed/x38 <UNASSIGNED>
-+<U190F>     /x81/x34/xed/x39 <UNASSIGNED>
-+<U1910>     /x81/x34/xee/x30 <UNASSIGNED>
-+<U1911>     /x81/x34/xee/x31 <UNASSIGNED>
-+<U1912>     /x81/x34/xee/x32 <UNASSIGNED>
-+<U1913>     /x81/x34/xee/x33 <UNASSIGNED>
-+<U1914>     /x81/x34/xee/x34 <UNASSIGNED>
-+<U1915>     /x81/x34/xee/x35 <UNASSIGNED>
-+<U1916>     /x81/x34/xee/x36 <UNASSIGNED>
-+<U1917>     /x81/x34/xee/x37 <UNASSIGNED>
-+<U1918>     /x81/x34/xee/x38 <UNASSIGNED>
-+<U1919>     /x81/x34/xee/x39 <UNASSIGNED>
-+<U191A>     /x81/x34/xef/x30 <UNASSIGNED>
-+<U191B>     /x81/x34/xef/x31 <UNASSIGNED>
-+<U191C>     /x81/x34/xef/x32 <UNASSIGNED>
-+<U191D>     /x81/x34/xef/x33 <UNASSIGNED>
-+<U191E>     /x81/x34/xef/x34 <UNASSIGNED>
-+<U191F>     /x81/x34/xef/x35 <UNASSIGNED>
-+<U1920>     /x81/x34/xef/x36 <UNASSIGNED>
-+<U1921>     /x81/x34/xef/x37 <UNASSIGNED>
-+<U1922>     /x81/x34/xef/x38 <UNASSIGNED>
-+<U1923>     /x81/x34/xef/x39 <UNASSIGNED>
-+<U1924>     /x81/x34/xf0/x30 <UNASSIGNED>
-+<U1925>     /x81/x34/xf0/x31 <UNASSIGNED>
-+<U1926>     /x81/x34/xf0/x32 <UNASSIGNED>
-+<U1927>     /x81/x34/xf0/x33 <UNASSIGNED>
-+<U1928>     /x81/x34/xf0/x34 <UNASSIGNED>
-+<U1929>     /x81/x34/xf0/x35 <UNASSIGNED>
-+<U192A>     /x81/x34/xf0/x36 <UNASSIGNED>
-+<U192B>     /x81/x34/xf0/x37 <UNASSIGNED>
-+<U192C>     /x81/x34/xf0/x38 <UNASSIGNED>
-+<U192D>     /x81/x34/xf0/x39 <UNASSIGNED>
-+<U192E>     /x81/x34/xf1/x30 <UNASSIGNED>
-+<U192F>     /x81/x34/xf1/x31 <UNASSIGNED>
-+<U1930>     /x81/x34/xf1/x32 <UNASSIGNED>
-+<U1931>     /x81/x34/xf1/x33 <UNASSIGNED>
-+<U1932>     /x81/x34/xf1/x34 <UNASSIGNED>
-+<U1933>     /x81/x34/xf1/x35 <UNASSIGNED>
-+<U1934>     /x81/x34/xf1/x36 <UNASSIGNED>
-+<U1935>     /x81/x34/xf1/x37 <UNASSIGNED>
-+<U1936>     /x81/x34/xf1/x38 <UNASSIGNED>
-+<U1937>     /x81/x34/xf1/x39 <UNASSIGNED>
-+<U1938>     /x81/x34/xf2/x30 <UNASSIGNED>
-+<U1939>     /x81/x34/xf2/x31 <UNASSIGNED>
-+<U193A>     /x81/x34/xf2/x32 <UNASSIGNED>
-+<U193B>     /x81/x34/xf2/x33 <UNASSIGNED>
-+<U193C>     /x81/x34/xf2/x34 <UNASSIGNED>
-+<U193D>     /x81/x34/xf2/x35 <UNASSIGNED>
-+<U193E>     /x81/x34/xf2/x36 <UNASSIGNED>
-+<U193F>     /x81/x34/xf2/x37 <UNASSIGNED>
-+<U1940>     /x81/x34/xf2/x38 <UNASSIGNED>
-+<U1941>     /x81/x34/xf2/x39 <UNASSIGNED>
-+<U1942>     /x81/x34/xf3/x30 <UNASSIGNED>
-+<U1943>     /x81/x34/xf3/x31 <UNASSIGNED>
-+<U1944>     /x81/x34/xf3/x32 <UNASSIGNED>
-+<U1945>     /x81/x34/xf3/x33 <UNASSIGNED>
-+<U1946>     /x81/x34/xf3/x34 <UNASSIGNED>
-+<U1947>     /x81/x34/xf3/x35 <UNASSIGNED>
-+<U1948>     /x81/x34/xf3/x36 <UNASSIGNED>
-+<U1949>     /x81/x34/xf3/x37 <UNASSIGNED>
-+<U194A>     /x81/x34/xf3/x38 <UNASSIGNED>
-+<U194B>     /x81/x34/xf3/x39 <UNASSIGNED>
-+<U194C>     /x81/x34/xf4/x30 <UNASSIGNED>
-+<U194D>     /x81/x34/xf4/x31 <UNASSIGNED>
-+<U194E>     /x81/x34/xf4/x32 <UNASSIGNED>
-+<U194F>     /x81/x34/xf4/x33 <UNASSIGNED>
-+<U1950>     /x81/x34/xf4/x34 <UNASSIGNED>
-+<U1951>     /x81/x34/xf4/x35 <UNASSIGNED>
-+<U1952>     /x81/x34/xf4/x36 <UNASSIGNED>
-+<U1953>     /x81/x34/xf4/x37 <UNASSIGNED>
-+<U1954>     /x81/x34/xf4/x38 <UNASSIGNED>
-+<U1955>     /x81/x34/xf4/x39 <UNASSIGNED>
-+<U1956>     /x81/x34/xf5/x30 <UNASSIGNED>
-+<U1957>     /x81/x34/xf5/x31 <UNASSIGNED>
-+<U1958>     /x81/x34/xf5/x32 <UNASSIGNED>
-+<U1959>     /x81/x34/xf5/x33 <UNASSIGNED>
-+<U195A>     /x81/x34/xf5/x34 <UNASSIGNED>
-+<U195B>     /x81/x34/xf5/x35 <UNASSIGNED>
-+<U195C>     /x81/x34/xf5/x36 <UNASSIGNED>
-+<U195D>     /x81/x34/xf5/x37 <UNASSIGNED>
-+<U195E>     /x81/x34/xf5/x38 <UNASSIGNED>
-+<U195F>     /x81/x34/xf5/x39 <UNASSIGNED>
-+<U1960>     /x81/x34/xf6/x30 <UNASSIGNED>
-+<U1961>     /x81/x34/xf6/x31 <UNASSIGNED>
-+<U1962>     /x81/x34/xf6/x32 <UNASSIGNED>
-+<U1963>     /x81/x34/xf6/x33 <UNASSIGNED>
-+<U1964>     /x81/x34/xf6/x34 <UNASSIGNED>
-+<U1965>     /x81/x34/xf6/x35 <UNASSIGNED>
-+<U1966>     /x81/x34/xf6/x36 <UNASSIGNED>
-+<U1967>     /x81/x34/xf6/x37 <UNASSIGNED>
-+<U1968>     /x81/x34/xf6/x38 <UNASSIGNED>
-+<U1969>     /x81/x34/xf6/x39 <UNASSIGNED>
-+<U196A>     /x81/x34/xf7/x30 <UNASSIGNED>
-+<U196B>     /x81/x34/xf7/x31 <UNASSIGNED>
-+<U196C>     /x81/x34/xf7/x32 <UNASSIGNED>
-+<U196D>     /x81/x34/xf7/x33 <UNASSIGNED>
-+<U196E>     /x81/x34/xf7/x34 <UNASSIGNED>
-+<U196F>     /x81/x34/xf7/x35 <UNASSIGNED>
-+<U1970>     /x81/x34/xf7/x36 <UNASSIGNED>
-+<U1971>     /x81/x34/xf7/x37 <UNASSIGNED>
-+<U1972>     /x81/x34/xf7/x38 <UNASSIGNED>
-+<U1973>     /x81/x34/xf7/x39 <UNASSIGNED>
-+<U1974>     /x81/x34/xf8/x30 <UNASSIGNED>
-+<U1975>     /x81/x34/xf8/x31 <UNASSIGNED>
-+<U1976>     /x81/x34/xf8/x32 <UNASSIGNED>
-+<U1977>     /x81/x34/xf8/x33 <UNASSIGNED>
-+<U1978>     /x81/x34/xf8/x34 <UNASSIGNED>
-+<U1979>     /x81/x34/xf8/x35 <UNASSIGNED>
-+<U197A>     /x81/x34/xf8/x36 <UNASSIGNED>
-+<U197B>     /x81/x34/xf8/x37 <UNASSIGNED>
-+<U197C>     /x81/x34/xf8/x38 <UNASSIGNED>
-+<U197D>     /x81/x34/xf8/x39 <UNASSIGNED>
-+<U197E>     /x81/x34/xf9/x30 <UNASSIGNED>
-+<U197F>     /x81/x34/xf9/x31 <UNASSIGNED>
-+<U1980>     /x81/x34/xf9/x32 <UNASSIGNED>
-+<U1981>     /x81/x34/xf9/x33 <UNASSIGNED>
-+<U1982>     /x81/x34/xf9/x34 <UNASSIGNED>
-+<U1983>     /x81/x34/xf9/x35 <UNASSIGNED>
-+<U1984>     /x81/x34/xf9/x36 <UNASSIGNED>
-+<U1985>     /x81/x34/xf9/x37 <UNASSIGNED>
-+<U1986>     /x81/x34/xf9/x38 <UNASSIGNED>
-+<U1987>     /x81/x34/xf9/x39 <UNASSIGNED>
-+<U1988>     /x81/x34/xfa/x30 <UNASSIGNED>
-+<U1989>     /x81/x34/xfa/x31 <UNASSIGNED>
-+<U198A>     /x81/x34/xfa/x32 <UNASSIGNED>
-+<U198B>     /x81/x34/xfa/x33 <UNASSIGNED>
-+<U198C>     /x81/x34/xfa/x34 <UNASSIGNED>
-+<U198D>     /x81/x34/xfa/x35 <UNASSIGNED>
-+<U198E>     /x81/x34/xfa/x36 <UNASSIGNED>
-+<U198F>     /x81/x34/xfa/x37 <UNASSIGNED>
-+<U1990>     /x81/x34/xfa/x38 <UNASSIGNED>
-+<U1991>     /x81/x34/xfa/x39 <UNASSIGNED>
-+<U1992>     /x81/x34/xfb/x30 <UNASSIGNED>
-+<U1993>     /x81/x34/xfb/x31 <UNASSIGNED>
-+<U1994>     /x81/x34/xfb/x32 <UNASSIGNED>
-+<U1995>     /x81/x34/xfb/x33 <UNASSIGNED>
-+<U1996>     /x81/x34/xfb/x34 <UNASSIGNED>
-+<U1997>     /x81/x34/xfb/x35 <UNASSIGNED>
-+<U1998>     /x81/x34/xfb/x36 <UNASSIGNED>
-+<U1999>     /x81/x34/xfb/x37 <UNASSIGNED>
-+<U199A>     /x81/x34/xfb/x38 <UNASSIGNED>
-+<U199B>     /x81/x34/xfb/x39 <UNASSIGNED>
-+<U199C>     /x81/x34/xfc/x30 <UNASSIGNED>
-+<U199D>     /x81/x34/xfc/x31 <UNASSIGNED>
-+<U199E>     /x81/x34/xfc/x32 <UNASSIGNED>
-+<U199F>     /x81/x34/xfc/x33 <UNASSIGNED>
-+<U19A0>     /x81/x34/xfc/x34 <UNASSIGNED>
-+<U19A1>     /x81/x34/xfc/x35 <UNASSIGNED>
-+<U19A2>     /x81/x34/xfc/x36 <UNASSIGNED>
-+<U19A3>     /x81/x34/xfc/x37 <UNASSIGNED>
-+<U19A4>     /x81/x34/xfc/x38 <UNASSIGNED>
-+<U19A5>     /x81/x34/xfc/x39 <UNASSIGNED>
-+<U19A6>     /x81/x34/xfd/x30 <UNASSIGNED>
-+<U19A7>     /x81/x34/xfd/x31 <UNASSIGNED>
-+<U19A8>     /x81/x34/xfd/x32 <UNASSIGNED>
-+<U19A9>     /x81/x34/xfd/x33 <UNASSIGNED>
-+<U19AA>     /x81/x34/xfd/x34 <UNASSIGNED>
-+<U19AB>     /x81/x34/xfd/x35 <UNASSIGNED>
-+<U19AC>     /x81/x34/xfd/x36 <UNASSIGNED>
-+<U19AD>     /x81/x34/xfd/x37 <UNASSIGNED>
-+<U19AE>     /x81/x34/xfd/x38 <UNASSIGNED>
-+<U19AF>     /x81/x34/xfd/x39 <UNASSIGNED>
-+<U19B0>     /x81/x34/xfe/x30 <UNASSIGNED>
-+<U19B1>     /x81/x34/xfe/x31 <UNASSIGNED>
-+<U19B2>     /x81/x34/xfe/x32 <UNASSIGNED>
-+<U19B3>     /x81/x34/xfe/x33 <UNASSIGNED>
-+<U19B4>     /x81/x34/xfe/x34 <UNASSIGNED>
-+<U19B5>     /x81/x34/xfe/x35 <UNASSIGNED>
-+<U19B6>     /x81/x34/xfe/x36 <UNASSIGNED>
-+<U19B7>     /x81/x34/xfe/x37 <UNASSIGNED>
-+<U19B8>     /x81/x34/xfe/x38 <UNASSIGNED>
-+<U19B9>     /x81/x34/xfe/x39 <UNASSIGNED>
-+<U19BA>     /x81/x35/x81/x30 <UNASSIGNED>
-+<U19BB>     /x81/x35/x81/x31 <UNASSIGNED>
-+<U19BC>     /x81/x35/x81/x32 <UNASSIGNED>
-+<U19BD>     /x81/x35/x81/x33 <UNASSIGNED>
-+<U19BE>     /x81/x35/x81/x34 <UNASSIGNED>
-+<U19BF>     /x81/x35/x81/x35 <UNASSIGNED>
-+<U19C0>     /x81/x35/x81/x36 <UNASSIGNED>
-+<U19C1>     /x81/x35/x81/x37 <UNASSIGNED>
-+<U19C2>     /x81/x35/x81/x38 <UNASSIGNED>
-+<U19C3>     /x81/x35/x81/x39 <UNASSIGNED>
-+<U19C4>     /x81/x35/x82/x30 <UNASSIGNED>
-+<U19C5>     /x81/x35/x82/x31 <UNASSIGNED>
-+<U19C6>     /x81/x35/x82/x32 <UNASSIGNED>
-+<U19C7>     /x81/x35/x82/x33 <UNASSIGNED>
-+<U19C8>     /x81/x35/x82/x34 <UNASSIGNED>
-+<U19C9>     /x81/x35/x82/x35 <UNASSIGNED>
-+<U19CA>     /x81/x35/x82/x36 <UNASSIGNED>
-+<U19CB>     /x81/x35/x82/x37 <UNASSIGNED>
-+<U19CC>     /x81/x35/x82/x38 <UNASSIGNED>
-+<U19CD>     /x81/x35/x82/x39 <UNASSIGNED>
-+<U19CE>     /x81/x35/x83/x30 <UNASSIGNED>
-+<U19CF>     /x81/x35/x83/x31 <UNASSIGNED>
-+<U19D0>     /x81/x35/x83/x32 <UNASSIGNED>
-+<U19D1>     /x81/x35/x83/x33 <UNASSIGNED>
-+<U19D2>     /x81/x35/x83/x34 <UNASSIGNED>
-+<U19D3>     /x81/x35/x83/x35 <UNASSIGNED>
-+<U19D4>     /x81/x35/x83/x36 <UNASSIGNED>
-+<U19D5>     /x81/x35/x83/x37 <UNASSIGNED>
-+<U19D6>     /x81/x35/x83/x38 <UNASSIGNED>
-+<U19D7>     /x81/x35/x83/x39 <UNASSIGNED>
-+<U19D8>     /x81/x35/x84/x30 <UNASSIGNED>
-+<U19D9>     /x81/x35/x84/x31 <UNASSIGNED>
-+<U19DA>     /x81/x35/x84/x32 <UNASSIGNED>
-+<U19DB>     /x81/x35/x84/x33 <UNASSIGNED>
-+<U19DC>     /x81/x35/x84/x34 <UNASSIGNED>
-+<U19DD>     /x81/x35/x84/x35 <UNASSIGNED>
-+<U19DE>     /x81/x35/x84/x36 <UNASSIGNED>
-+<U19DF>     /x81/x35/x84/x37 <UNASSIGNED>
-+<U19E0>     /x81/x35/x84/x38 <UNASSIGNED>
-+<U19E1>     /x81/x35/x84/x39 <UNASSIGNED>
-+<U19E2>     /x81/x35/x85/x30 <UNASSIGNED>
-+<U19E3>     /x81/x35/x85/x31 <UNASSIGNED>
-+<U19E4>     /x81/x35/x85/x32 <UNASSIGNED>
-+<U19E5>     /x81/x35/x85/x33 <UNASSIGNED>
-+<U19E6>     /x81/x35/x85/x34 <UNASSIGNED>
-+<U19E7>     /x81/x35/x85/x35 <UNASSIGNED>
-+<U19E8>     /x81/x35/x85/x36 <UNASSIGNED>
-+<U19E9>     /x81/x35/x85/x37 <UNASSIGNED>
-+<U19EA>     /x81/x35/x85/x38 <UNASSIGNED>
-+<U19EB>     /x81/x35/x85/x39 <UNASSIGNED>
-+<U19EC>     /x81/x35/x86/x30 <UNASSIGNED>
-+<U19ED>     /x81/x35/x86/x31 <UNASSIGNED>
-+<U19EE>     /x81/x35/x86/x32 <UNASSIGNED>
-+<U19EF>     /x81/x35/x86/x33 <UNASSIGNED>
-+<U19F0>     /x81/x35/x86/x34 <UNASSIGNED>
-+<U19F1>     /x81/x35/x86/x35 <UNASSIGNED>
-+<U19F2>     /x81/x35/x86/x36 <UNASSIGNED>
-+<U19F3>     /x81/x35/x86/x37 <UNASSIGNED>
-+<U19F4>     /x81/x35/x86/x38 <UNASSIGNED>
-+<U19F5>     /x81/x35/x86/x39 <UNASSIGNED>
-+<U19F6>     /x81/x35/x87/x30 <UNASSIGNED>
-+<U19F7>     /x81/x35/x87/x31 <UNASSIGNED>
-+<U19F8>     /x81/x35/x87/x32 <UNASSIGNED>
-+<U19F9>     /x81/x35/x87/x33 <UNASSIGNED>
-+<U19FA>     /x81/x35/x87/x34 <UNASSIGNED>
-+<U19FB>     /x81/x35/x87/x35 <UNASSIGNED>
-+<U19FC>     /x81/x35/x87/x36 <UNASSIGNED>
-+<U19FD>     /x81/x35/x87/x37 <UNASSIGNED>
-+<U19FE>     /x81/x35/x87/x38 <UNASSIGNED>
-+<U19FF>     /x81/x35/x87/x39 <UNASSIGNED>
-+<U1A00>     /x81/x35/x88/x30 <UNASSIGNED>
-+<U1A01>     /x81/x35/x88/x31 <UNASSIGNED>
-+<U1A02>     /x81/x35/x88/x32 <UNASSIGNED>
-+<U1A03>     /x81/x35/x88/x33 <UNASSIGNED>
-+<U1A04>     /x81/x35/x88/x34 <UNASSIGNED>
-+<U1A05>     /x81/x35/x88/x35 <UNASSIGNED>
-+<U1A06>     /x81/x35/x88/x36 <UNASSIGNED>
-+<U1A07>     /x81/x35/x88/x37 <UNASSIGNED>
-+<U1A08>     /x81/x35/x88/x38 <UNASSIGNED>
-+<U1A09>     /x81/x35/x88/x39 <UNASSIGNED>
-+<U1A0A>     /x81/x35/x89/x30 <UNASSIGNED>
-+<U1A0B>     /x81/x35/x89/x31 <UNASSIGNED>
-+<U1A0C>     /x81/x35/x89/x32 <UNASSIGNED>
-+<U1A0D>     /x81/x35/x89/x33 <UNASSIGNED>
-+<U1A0E>     /x81/x35/x89/x34 <UNASSIGNED>
-+<U1A0F>     /x81/x35/x89/x35 <UNASSIGNED>
-+<U1A10>     /x81/x35/x89/x36 <UNASSIGNED>
-+<U1A11>     /x81/x35/x89/x37 <UNASSIGNED>
-+<U1A12>     /x81/x35/x89/x38 <UNASSIGNED>
-+<U1A13>     /x81/x35/x89/x39 <UNASSIGNED>
-+<U1A14>     /x81/x35/x8a/x30 <UNASSIGNED>
-+<U1A15>     /x81/x35/x8a/x31 <UNASSIGNED>
-+<U1A16>     /x81/x35/x8a/x32 <UNASSIGNED>
-+<U1A17>     /x81/x35/x8a/x33 <UNASSIGNED>
-+<U1A18>     /x81/x35/x8a/x34 <UNASSIGNED>
-+<U1A19>     /x81/x35/x8a/x35 <UNASSIGNED>
-+<U1A1A>     /x81/x35/x8a/x36 <UNASSIGNED>
-+<U1A1B>     /x81/x35/x8a/x37 <UNASSIGNED>
-+<U1A1C>     /x81/x35/x8a/x38 <UNASSIGNED>
-+<U1A1D>     /x81/x35/x8a/x39 <UNASSIGNED>
-+<U1A1E>     /x81/x35/x8b/x30 <UNASSIGNED>
-+<U1A1F>     /x81/x35/x8b/x31 <UNASSIGNED>
-+<U1A20>     /x81/x35/x8b/x32 <UNASSIGNED>
-+<U1A21>     /x81/x35/x8b/x33 <UNASSIGNED>
-+<U1A22>     /x81/x35/x8b/x34 <UNASSIGNED>
-+<U1A23>     /x81/x35/x8b/x35 <UNASSIGNED>
-+<U1A24>     /x81/x35/x8b/x36 <UNASSIGNED>
-+<U1A25>     /x81/x35/x8b/x37 <UNASSIGNED>
-+<U1A26>     /x81/x35/x8b/x38 <UNASSIGNED>
-+<U1A27>     /x81/x35/x8b/x39 <UNASSIGNED>
-+<U1A28>     /x81/x35/x8c/x30 <UNASSIGNED>
-+<U1A29>     /x81/x35/x8c/x31 <UNASSIGNED>
-+<U1A2A>     /x81/x35/x8c/x32 <UNASSIGNED>
-+<U1A2B>     /x81/x35/x8c/x33 <UNASSIGNED>
-+<U1A2C>     /x81/x35/x8c/x34 <UNASSIGNED>
-+<U1A2D>     /x81/x35/x8c/x35 <UNASSIGNED>
-+<U1A2E>     /x81/x35/x8c/x36 <UNASSIGNED>
-+<U1A2F>     /x81/x35/x8c/x37 <UNASSIGNED>
-+<U1A30>     /x81/x35/x8c/x38 <UNASSIGNED>
-+<U1A31>     /x81/x35/x8c/x39 <UNASSIGNED>
-+<U1A32>     /x81/x35/x8d/x30 <UNASSIGNED>
-+<U1A33>     /x81/x35/x8d/x31 <UNASSIGNED>
-+<U1A34>     /x81/x35/x8d/x32 <UNASSIGNED>
-+<U1A35>     /x81/x35/x8d/x33 <UNASSIGNED>
-+<U1A36>     /x81/x35/x8d/x34 <UNASSIGNED>
-+<U1A37>     /x81/x35/x8d/x35 <UNASSIGNED>
-+<U1A38>     /x81/x35/x8d/x36 <UNASSIGNED>
-+<U1A39>     /x81/x35/x8d/x37 <UNASSIGNED>
-+<U1A3A>     /x81/x35/x8d/x38 <UNASSIGNED>
-+<U1A3B>     /x81/x35/x8d/x39 <UNASSIGNED>
-+<U1A3C>     /x81/x35/x8e/x30 <UNASSIGNED>
-+<U1A3D>     /x81/x35/x8e/x31 <UNASSIGNED>
-+<U1A3E>     /x81/x35/x8e/x32 <UNASSIGNED>
-+<U1A3F>     /x81/x35/x8e/x33 <UNASSIGNED>
-+<U1A40>     /x81/x35/x8e/x34 <UNASSIGNED>
-+<U1A41>     /x81/x35/x8e/x35 <UNASSIGNED>
-+<U1A42>     /x81/x35/x8e/x36 <UNASSIGNED>
-+<U1A43>     /x81/x35/x8e/x37 <UNASSIGNED>
-+<U1A44>     /x81/x35/x8e/x38 <UNASSIGNED>
-+<U1A45>     /x81/x35/x8e/x39 <UNASSIGNED>
-+<U1A46>     /x81/x35/x8f/x30 <UNASSIGNED>
-+<U1A47>     /x81/x35/x8f/x31 <UNASSIGNED>
-+<U1A48>     /x81/x35/x8f/x32 <UNASSIGNED>
-+<U1A49>     /x81/x35/x8f/x33 <UNASSIGNED>
-+<U1A4A>     /x81/x35/x8f/x34 <UNASSIGNED>
-+<U1A4B>     /x81/x35/x8f/x35 <UNASSIGNED>
-+<U1A4C>     /x81/x35/x8f/x36 <UNASSIGNED>
-+<U1A4D>     /x81/x35/x8f/x37 <UNASSIGNED>
-+<U1A4E>     /x81/x35/x8f/x38 <UNASSIGNED>
-+<U1A4F>     /x81/x35/x8f/x39 <UNASSIGNED>
-+<U1A50>     /x81/x35/x90/x30 <UNASSIGNED>
-+<U1A51>     /x81/x35/x90/x31 <UNASSIGNED>
-+<U1A52>     /x81/x35/x90/x32 <UNASSIGNED>
-+<U1A53>     /x81/x35/x90/x33 <UNASSIGNED>
-+<U1A54>     /x81/x35/x90/x34 <UNASSIGNED>
-+<U1A55>     /x81/x35/x90/x35 <UNASSIGNED>
-+<U1A56>     /x81/x35/x90/x36 <UNASSIGNED>
-+<U1A57>     /x81/x35/x90/x37 <UNASSIGNED>
-+<U1A58>     /x81/x35/x90/x38 <UNASSIGNED>
-+<U1A59>     /x81/x35/x90/x39 <UNASSIGNED>
-+<U1A5A>     /x81/x35/x91/x30 <UNASSIGNED>
-+<U1A5B>     /x81/x35/x91/x31 <UNASSIGNED>
-+<U1A5C>     /x81/x35/x91/x32 <UNASSIGNED>
-+<U1A5D>     /x81/x35/x91/x33 <UNASSIGNED>
-+<U1A5E>     /x81/x35/x91/x34 <UNASSIGNED>
-+<U1A5F>     /x81/x35/x91/x35 <UNASSIGNED>
-+<U1A60>     /x81/x35/x91/x36 <UNASSIGNED>
-+<U1A61>     /x81/x35/x91/x37 <UNASSIGNED>
-+<U1A62>     /x81/x35/x91/x38 <UNASSIGNED>
-+<U1A63>     /x81/x35/x91/x39 <UNASSIGNED>
-+<U1A64>     /x81/x35/x92/x30 <UNASSIGNED>
-+<U1A65>     /x81/x35/x92/x31 <UNASSIGNED>
-+<U1A66>     /x81/x35/x92/x32 <UNASSIGNED>
-+<U1A67>     /x81/x35/x92/x33 <UNASSIGNED>
-+<U1A68>     /x81/x35/x92/x34 <UNASSIGNED>
-+<U1A69>     /x81/x35/x92/x35 <UNASSIGNED>
-+<U1A6A>     /x81/x35/x92/x36 <UNASSIGNED>
-+<U1A6B>     /x81/x35/x92/x37 <UNASSIGNED>
-+<U1A6C>     /x81/x35/x92/x38 <UNASSIGNED>
-+<U1A6D>     /x81/x35/x92/x39 <UNASSIGNED>
-+<U1A6E>     /x81/x35/x93/x30 <UNASSIGNED>
-+<U1A6F>     /x81/x35/x93/x31 <UNASSIGNED>
-+<U1A70>     /x81/x35/x93/x32 <UNASSIGNED>
-+<U1A71>     /x81/x35/x93/x33 <UNASSIGNED>
-+<U1A72>     /x81/x35/x93/x34 <UNASSIGNED>
-+<U1A73>     /x81/x35/x93/x35 <UNASSIGNED>
-+<U1A74>     /x81/x35/x93/x36 <UNASSIGNED>
-+<U1A75>     /x81/x35/x93/x37 <UNASSIGNED>
-+<U1A76>     /x81/x35/x93/x38 <UNASSIGNED>
-+<U1A77>     /x81/x35/x93/x39 <UNASSIGNED>
-+<U1A78>     /x81/x35/x94/x30 <UNASSIGNED>
-+<U1A79>     /x81/x35/x94/x31 <UNASSIGNED>
-+<U1A7A>     /x81/x35/x94/x32 <UNASSIGNED>
-+<U1A7B>     /x81/x35/x94/x33 <UNASSIGNED>
-+<U1A7C>     /x81/x35/x94/x34 <UNASSIGNED>
-+<U1A7D>     /x81/x35/x94/x35 <UNASSIGNED>
-+<U1A7E>     /x81/x35/x94/x36 <UNASSIGNED>
-+<U1A7F>     /x81/x35/x94/x37 <UNASSIGNED>
-+<U1A80>     /x81/x35/x94/x38 <UNASSIGNED>
-+<U1A81>     /x81/x35/x94/x39 <UNASSIGNED>
-+<U1A82>     /x81/x35/x95/x30 <UNASSIGNED>
-+<U1A83>     /x81/x35/x95/x31 <UNASSIGNED>
-+<U1A84>     /x81/x35/x95/x32 <UNASSIGNED>
-+<U1A85>     /x81/x35/x95/x33 <UNASSIGNED>
-+<U1A86>     /x81/x35/x95/x34 <UNASSIGNED>
-+<U1A87>     /x81/x35/x95/x35 <UNASSIGNED>
-+<U1A88>     /x81/x35/x95/x36 <UNASSIGNED>
-+<U1A89>     /x81/x35/x95/x37 <UNASSIGNED>
-+<U1A8A>     /x81/x35/x95/x38 <UNASSIGNED>
-+<U1A8B>     /x81/x35/x95/x39 <UNASSIGNED>
-+<U1A8C>     /x81/x35/x96/x30 <UNASSIGNED>
-+<U1A8D>     /x81/x35/x96/x31 <UNASSIGNED>
-+<U1A8E>     /x81/x35/x96/x32 <UNASSIGNED>
-+<U1A8F>     /x81/x35/x96/x33 <UNASSIGNED>
-+<U1A90>     /x81/x35/x96/x34 <UNASSIGNED>
-+<U1A91>     /x81/x35/x96/x35 <UNASSIGNED>
-+<U1A92>     /x81/x35/x96/x36 <UNASSIGNED>
-+<U1A93>     /x81/x35/x96/x37 <UNASSIGNED>
-+<U1A94>     /x81/x35/x96/x38 <UNASSIGNED>
-+<U1A95>     /x81/x35/x96/x39 <UNASSIGNED>
-+<U1A96>     /x81/x35/x97/x30 <UNASSIGNED>
-+<U1A97>     /x81/x35/x97/x31 <UNASSIGNED>
-+<U1A98>     /x81/x35/x97/x32 <UNASSIGNED>
-+<U1A99>     /x81/x35/x97/x33 <UNASSIGNED>
-+<U1A9A>     /x81/x35/x97/x34 <UNASSIGNED>
-+<U1A9B>     /x81/x35/x97/x35 <UNASSIGNED>
-+<U1A9C>     /x81/x35/x97/x36 <UNASSIGNED>
-+<U1A9D>     /x81/x35/x97/x37 <UNASSIGNED>
-+<U1A9E>     /x81/x35/x97/x38 <UNASSIGNED>
-+<U1A9F>     /x81/x35/x97/x39 <UNASSIGNED>
-+<U1AA0>     /x81/x35/x98/x30 <UNASSIGNED>
-+<U1AA1>     /x81/x35/x98/x31 <UNASSIGNED>
-+<U1AA2>     /x81/x35/x98/x32 <UNASSIGNED>
-+<U1AA3>     /x81/x35/x98/x33 <UNASSIGNED>
-+<U1AA4>     /x81/x35/x98/x34 <UNASSIGNED>
-+<U1AA5>     /x81/x35/x98/x35 <UNASSIGNED>
-+<U1AA6>     /x81/x35/x98/x36 <UNASSIGNED>
-+<U1AA7>     /x81/x35/x98/x37 <UNASSIGNED>
-+<U1AA8>     /x81/x35/x98/x38 <UNASSIGNED>
-+<U1AA9>     /x81/x35/x98/x39 <UNASSIGNED>
-+<U1AAA>     /x81/x35/x99/x30 <UNASSIGNED>
-+<U1AAB>     /x81/x35/x99/x31 <UNASSIGNED>
-+<U1AAC>     /x81/x35/x99/x32 <UNASSIGNED>
-+<U1AAD>     /x81/x35/x99/x33 <UNASSIGNED>
-+<U1AAE>     /x81/x35/x99/x34 <UNASSIGNED>
-+<U1AAF>     /x81/x35/x99/x35 <UNASSIGNED>
-+<U1AB0>     /x81/x35/x99/x36 <UNASSIGNED>
-+<U1AB1>     /x81/x35/x99/x37 <UNASSIGNED>
-+<U1AB2>     /x81/x35/x99/x38 <UNASSIGNED>
-+<U1AB3>     /x81/x35/x99/x39 <UNASSIGNED>
-+<U1AB4>     /x81/x35/x9a/x30 <UNASSIGNED>
-+<U1AB5>     /x81/x35/x9a/x31 <UNASSIGNED>
-+<U1AB6>     /x81/x35/x9a/x32 <UNASSIGNED>
-+<U1AB7>     /x81/x35/x9a/x33 <UNASSIGNED>
-+<U1AB8>     /x81/x35/x9a/x34 <UNASSIGNED>
-+<U1AB9>     /x81/x35/x9a/x35 <UNASSIGNED>
-+<U1ABA>     /x81/x35/x9a/x36 <UNASSIGNED>
-+<U1ABB>     /x81/x35/x9a/x37 <UNASSIGNED>
-+<U1ABC>     /x81/x35/x9a/x38 <UNASSIGNED>
-+<U1ABD>     /x81/x35/x9a/x39 <UNASSIGNED>
-+<U1ABE>     /x81/x35/x9b/x30 <UNASSIGNED>
-+<U1ABF>     /x81/x35/x9b/x31 <UNASSIGNED>
-+<U1AC0>     /x81/x35/x9b/x32 <UNASSIGNED>
-+<U1AC1>     /x81/x35/x9b/x33 <UNASSIGNED>
-+<U1AC2>     /x81/x35/x9b/x34 <UNASSIGNED>
-+<U1AC3>     /x81/x35/x9b/x35 <UNASSIGNED>
-+<U1AC4>     /x81/x35/x9b/x36 <UNASSIGNED>
-+<U1AC5>     /x81/x35/x9b/x37 <UNASSIGNED>
-+<U1AC6>     /x81/x35/x9b/x38 <UNASSIGNED>
-+<U1AC7>     /x81/x35/x9b/x39 <UNASSIGNED>
-+<U1AC8>     /x81/x35/x9c/x30 <UNASSIGNED>
-+<U1AC9>     /x81/x35/x9c/x31 <UNASSIGNED>
-+<U1ACA>     /x81/x35/x9c/x32 <UNASSIGNED>
-+<U1ACB>     /x81/x35/x9c/x33 <UNASSIGNED>
-+<U1ACC>     /x81/x35/x9c/x34 <UNASSIGNED>
-+<U1ACD>     /x81/x35/x9c/x35 <UNASSIGNED>
-+<U1ACE>     /x81/x35/x9c/x36 <UNASSIGNED>
-+<U1ACF>     /x81/x35/x9c/x37 <UNASSIGNED>
-+<U1AD0>     /x81/x35/x9c/x38 <UNASSIGNED>
-+<U1AD1>     /x81/x35/x9c/x39 <UNASSIGNED>
-+<U1AD2>     /x81/x35/x9d/x30 <UNASSIGNED>
-+<U1AD3>     /x81/x35/x9d/x31 <UNASSIGNED>
-+<U1AD4>     /x81/x35/x9d/x32 <UNASSIGNED>
-+<U1AD5>     /x81/x35/x9d/x33 <UNASSIGNED>
-+<U1AD6>     /x81/x35/x9d/x34 <UNASSIGNED>
-+<U1AD7>     /x81/x35/x9d/x35 <UNASSIGNED>
-+<U1AD8>     /x81/x35/x9d/x36 <UNASSIGNED>
-+<U1AD9>     /x81/x35/x9d/x37 <UNASSIGNED>
-+<U1ADA>     /x81/x35/x9d/x38 <UNASSIGNED>
-+<U1ADB>     /x81/x35/x9d/x39 <UNASSIGNED>
-+<U1ADC>     /x81/x35/x9e/x30 <UNASSIGNED>
-+<U1ADD>     /x81/x35/x9e/x31 <UNASSIGNED>
-+<U1ADE>     /x81/x35/x9e/x32 <UNASSIGNED>
-+<U1ADF>     /x81/x35/x9e/x33 <UNASSIGNED>
-+<U1AE0>     /x81/x35/x9e/x34 <UNASSIGNED>
-+<U1AE1>     /x81/x35/x9e/x35 <UNASSIGNED>
-+<U1AE2>     /x81/x35/x9e/x36 <UNASSIGNED>
-+<U1AE3>     /x81/x35/x9e/x37 <UNASSIGNED>
-+<U1AE4>     /x81/x35/x9e/x38 <UNASSIGNED>
-+<U1AE5>     /x81/x35/x9e/x39 <UNASSIGNED>
-+<U1AE6>     /x81/x35/x9f/x30 <UNASSIGNED>
-+<U1AE7>     /x81/x35/x9f/x31 <UNASSIGNED>
-+<U1AE8>     /x81/x35/x9f/x32 <UNASSIGNED>
-+<U1AE9>     /x81/x35/x9f/x33 <UNASSIGNED>
-+<U1AEA>     /x81/x35/x9f/x34 <UNASSIGNED>
-+<U1AEB>     /x81/x35/x9f/x35 <UNASSIGNED>
-+<U1AEC>     /x81/x35/x9f/x36 <UNASSIGNED>
-+<U1AED>     /x81/x35/x9f/x37 <UNASSIGNED>
-+<U1AEE>     /x81/x35/x9f/x38 <UNASSIGNED>
-+<U1AEF>     /x81/x35/x9f/x39 <UNASSIGNED>
-+<U1AF0>     /x81/x35/xa0/x30 <UNASSIGNED>
-+<U1AF1>     /x81/x35/xa0/x31 <UNASSIGNED>
-+<U1AF2>     /x81/x35/xa0/x32 <UNASSIGNED>
-+<U1AF3>     /x81/x35/xa0/x33 <UNASSIGNED>
-+<U1AF4>     /x81/x35/xa0/x34 <UNASSIGNED>
-+<U1AF5>     /x81/x35/xa0/x35 <UNASSIGNED>
-+<U1AF6>     /x81/x35/xa0/x36 <UNASSIGNED>
-+<U1AF7>     /x81/x35/xa0/x37 <UNASSIGNED>
-+<U1AF8>     /x81/x35/xa0/x38 <UNASSIGNED>
-+<U1AF9>     /x81/x35/xa0/x39 <UNASSIGNED>
-+<U1AFA>     /x81/x35/xa1/x30 <UNASSIGNED>
-+<U1AFB>     /x81/x35/xa1/x31 <UNASSIGNED>
-+<U1AFC>     /x81/x35/xa1/x32 <UNASSIGNED>
-+<U1AFD>     /x81/x35/xa1/x33 <UNASSIGNED>
-+<U1AFE>     /x81/x35/xa1/x34 <UNASSIGNED>
-+<U1AFF>     /x81/x35/xa1/x35 <UNASSIGNED>
-+<U1B00>     /x81/x35/xa1/x36 <UNASSIGNED>
-+<U1B01>     /x81/x35/xa1/x37 <UNASSIGNED>
-+<U1B02>     /x81/x35/xa1/x38 <UNASSIGNED>
-+<U1B03>     /x81/x35/xa1/x39 <UNASSIGNED>
-+<U1B04>     /x81/x35/xa2/x30 <UNASSIGNED>
-+<U1B05>     /x81/x35/xa2/x31 <UNASSIGNED>
-+<U1B06>     /x81/x35/xa2/x32 <UNASSIGNED>
-+<U1B07>     /x81/x35/xa2/x33 <UNASSIGNED>
-+<U1B08>     /x81/x35/xa2/x34 <UNASSIGNED>
-+<U1B09>     /x81/x35/xa2/x35 <UNASSIGNED>
-+<U1B0A>     /x81/x35/xa2/x36 <UNASSIGNED>
-+<U1B0B>     /x81/x35/xa2/x37 <UNASSIGNED>
-+<U1B0C>     /x81/x35/xa2/x38 <UNASSIGNED>
-+<U1B0D>     /x81/x35/xa2/x39 <UNASSIGNED>
-+<U1B0E>     /x81/x35/xa3/x30 <UNASSIGNED>
-+<U1B0F>     /x81/x35/xa3/x31 <UNASSIGNED>
-+<U1B10>     /x81/x35/xa3/x32 <UNASSIGNED>
-+<U1B11>     /x81/x35/xa3/x33 <UNASSIGNED>
-+<U1B12>     /x81/x35/xa3/x34 <UNASSIGNED>
-+<U1B13>     /x81/x35/xa3/x35 <UNASSIGNED>
-+<U1B14>     /x81/x35/xa3/x36 <UNASSIGNED>
-+<U1B15>     /x81/x35/xa3/x37 <UNASSIGNED>
-+<U1B16>     /x81/x35/xa3/x38 <UNASSIGNED>
-+<U1B17>     /x81/x35/xa3/x39 <UNASSIGNED>
-+<U1B18>     /x81/x35/xa4/x30 <UNASSIGNED>
-+<U1B19>     /x81/x35/xa4/x31 <UNASSIGNED>
-+<U1B1A>     /x81/x35/xa4/x32 <UNASSIGNED>
-+<U1B1B>     /x81/x35/xa4/x33 <UNASSIGNED>
-+<U1B1C>     /x81/x35/xa4/x34 <UNASSIGNED>
-+<U1B1D>     /x81/x35/xa4/x35 <UNASSIGNED>
-+<U1B1E>     /x81/x35/xa4/x36 <UNASSIGNED>
-+<U1B1F>     /x81/x35/xa4/x37 <UNASSIGNED>
-+<U1B20>     /x81/x35/xa4/x38 <UNASSIGNED>
-+<U1B21>     /x81/x35/xa4/x39 <UNASSIGNED>
-+<U1B22>     /x81/x35/xa5/x30 <UNASSIGNED>
-+<U1B23>     /x81/x35/xa5/x31 <UNASSIGNED>
-+<U1B24>     /x81/x35/xa5/x32 <UNASSIGNED>
-+<U1B25>     /x81/x35/xa5/x33 <UNASSIGNED>
-+<U1B26>     /x81/x35/xa5/x34 <UNASSIGNED>
-+<U1B27>     /x81/x35/xa5/x35 <UNASSIGNED>
-+<U1B28>     /x81/x35/xa5/x36 <UNASSIGNED>
-+<U1B29>     /x81/x35/xa5/x37 <UNASSIGNED>
-+<U1B2A>     /x81/x35/xa5/x38 <UNASSIGNED>
-+<U1B2B>     /x81/x35/xa5/x39 <UNASSIGNED>
-+<U1B2C>     /x81/x35/xa6/x30 <UNASSIGNED>
-+<U1B2D>     /x81/x35/xa6/x31 <UNASSIGNED>
-+<U1B2E>     /x81/x35/xa6/x32 <UNASSIGNED>
-+<U1B2F>     /x81/x35/xa6/x33 <UNASSIGNED>
-+<U1B30>     /x81/x35/xa6/x34 <UNASSIGNED>
-+<U1B31>     /x81/x35/xa6/x35 <UNASSIGNED>
-+<U1B32>     /x81/x35/xa6/x36 <UNASSIGNED>
-+<U1B33>     /x81/x35/xa6/x37 <UNASSIGNED>
-+<U1B34>     /x81/x35/xa6/x38 <UNASSIGNED>
-+<U1B35>     /x81/x35/xa6/x39 <UNASSIGNED>
-+<U1B36>     /x81/x35/xa7/x30 <UNASSIGNED>
-+<U1B37>     /x81/x35/xa7/x31 <UNASSIGNED>
-+<U1B38>     /x81/x35/xa7/x32 <UNASSIGNED>
-+<U1B39>     /x81/x35/xa7/x33 <UNASSIGNED>
-+<U1B3A>     /x81/x35/xa7/x34 <UNASSIGNED>
-+<U1B3B>     /x81/x35/xa7/x35 <UNASSIGNED>
-+<U1B3C>     /x81/x35/xa7/x36 <UNASSIGNED>
-+<U1B3D>     /x81/x35/xa7/x37 <UNASSIGNED>
-+<U1B3E>     /x81/x35/xa7/x38 <UNASSIGNED>
-+<U1B3F>     /x81/x35/xa7/x39 <UNASSIGNED>
-+<U1B40>     /x81/x35/xa8/x30 <UNASSIGNED>
-+<U1B41>     /x81/x35/xa8/x31 <UNASSIGNED>
-+<U1B42>     /x81/x35/xa8/x32 <UNASSIGNED>
-+<U1B43>     /x81/x35/xa8/x33 <UNASSIGNED>
-+<U1B44>     /x81/x35/xa8/x34 <UNASSIGNED>
-+<U1B45>     /x81/x35/xa8/x35 <UNASSIGNED>
-+<U1B46>     /x81/x35/xa8/x36 <UNASSIGNED>
-+<U1B47>     /x81/x35/xa8/x37 <UNASSIGNED>
-+<U1B48>     /x81/x35/xa8/x38 <UNASSIGNED>
-+<U1B49>     /x81/x35/xa8/x39 <UNASSIGNED>
-+<U1B4A>     /x81/x35/xa9/x30 <UNASSIGNED>
-+<U1B4B>     /x81/x35/xa9/x31 <UNASSIGNED>
-+<U1B4C>     /x81/x35/xa9/x32 <UNASSIGNED>
-+<U1B4D>     /x81/x35/xa9/x33 <UNASSIGNED>
-+<U1B4E>     /x81/x35/xa9/x34 <UNASSIGNED>
-+<U1B4F>     /x81/x35/xa9/x35 <UNASSIGNED>
-+<U1B50>     /x81/x35/xa9/x36 <UNASSIGNED>
-+<U1B51>     /x81/x35/xa9/x37 <UNASSIGNED>
-+<U1B52>     /x81/x35/xa9/x38 <UNASSIGNED>
-+<U1B53>     /x81/x35/xa9/x39 <UNASSIGNED>
-+<U1B54>     /x81/x35/xaa/x30 <UNASSIGNED>
-+<U1B55>     /x81/x35/xaa/x31 <UNASSIGNED>
-+<U1B56>     /x81/x35/xaa/x32 <UNASSIGNED>
-+<U1B57>     /x81/x35/xaa/x33 <UNASSIGNED>
-+<U1B58>     /x81/x35/xaa/x34 <UNASSIGNED>
-+<U1B59>     /x81/x35/xaa/x35 <UNASSIGNED>
-+<U1B5A>     /x81/x35/xaa/x36 <UNASSIGNED>
-+<U1B5B>     /x81/x35/xaa/x37 <UNASSIGNED>
-+<U1B5C>     /x81/x35/xaa/x38 <UNASSIGNED>
-+<U1B5D>     /x81/x35/xaa/x39 <UNASSIGNED>
-+<U1B5E>     /x81/x35/xab/x30 <UNASSIGNED>
-+<U1B5F>     /x81/x35/xab/x31 <UNASSIGNED>
-+<U1B60>     /x81/x35/xab/x32 <UNASSIGNED>
-+<U1B61>     /x81/x35/xab/x33 <UNASSIGNED>
-+<U1B62>     /x81/x35/xab/x34 <UNASSIGNED>
-+<U1B63>     /x81/x35/xab/x35 <UNASSIGNED>
-+<U1B64>     /x81/x35/xab/x36 <UNASSIGNED>
-+<U1B65>     /x81/x35/xab/x37 <UNASSIGNED>
-+<U1B66>     /x81/x35/xab/x38 <UNASSIGNED>
-+<U1B67>     /x81/x35/xab/x39 <UNASSIGNED>
-+<U1B68>     /x81/x35/xac/x30 <UNASSIGNED>
-+<U1B69>     /x81/x35/xac/x31 <UNASSIGNED>
-+<U1B6A>     /x81/x35/xac/x32 <UNASSIGNED>
-+<U1B6B>     /x81/x35/xac/x33 <UNASSIGNED>
-+<U1B6C>     /x81/x35/xac/x34 <UNASSIGNED>
-+<U1B6D>     /x81/x35/xac/x35 <UNASSIGNED>
-+<U1B6E>     /x81/x35/xac/x36 <UNASSIGNED>
-+<U1B6F>     /x81/x35/xac/x37 <UNASSIGNED>
-+<U1B70>     /x81/x35/xac/x38 <UNASSIGNED>
-+<U1B71>     /x81/x35/xac/x39 <UNASSIGNED>
-+<U1B72>     /x81/x35/xad/x30 <UNASSIGNED>
-+<U1B73>     /x81/x35/xad/x31 <UNASSIGNED>
-+<U1B74>     /x81/x35/xad/x32 <UNASSIGNED>
-+<U1B75>     /x81/x35/xad/x33 <UNASSIGNED>
-+<U1B76>     /x81/x35/xad/x34 <UNASSIGNED>
-+<U1B77>     /x81/x35/xad/x35 <UNASSIGNED>
-+<U1B78>     /x81/x35/xad/x36 <UNASSIGNED>
-+<U1B79>     /x81/x35/xad/x37 <UNASSIGNED>
-+<U1B7A>     /x81/x35/xad/x38 <UNASSIGNED>
-+<U1B7B>     /x81/x35/xad/x39 <UNASSIGNED>
-+<U1B7C>     /x81/x35/xae/x30 <UNASSIGNED>
-+<U1B7D>     /x81/x35/xae/x31 <UNASSIGNED>
-+<U1B7E>     /x81/x35/xae/x32 <UNASSIGNED>
-+<U1B7F>     /x81/x35/xae/x33 <UNASSIGNED>
-+<U1B80>     /x81/x35/xae/x34 <UNASSIGNED>
-+<U1B81>     /x81/x35/xae/x35 <UNASSIGNED>
-+<U1B82>     /x81/x35/xae/x36 <UNASSIGNED>
-+<U1B83>     /x81/x35/xae/x37 <UNASSIGNED>
-+<U1B84>     /x81/x35/xae/x38 <UNASSIGNED>
-+<U1B85>     /x81/x35/xae/x39 <UNASSIGNED>
-+<U1B86>     /x81/x35/xaf/x30 <UNASSIGNED>
-+<U1B87>     /x81/x35/xaf/x31 <UNASSIGNED>
-+<U1B88>     /x81/x35/xaf/x32 <UNASSIGNED>
-+<U1B89>     /x81/x35/xaf/x33 <UNASSIGNED>
-+<U1B8A>     /x81/x35/xaf/x34 <UNASSIGNED>
-+<U1B8B>     /x81/x35/xaf/x35 <UNASSIGNED>
-+<U1B8C>     /x81/x35/xaf/x36 <UNASSIGNED>
-+<U1B8D>     /x81/x35/xaf/x37 <UNASSIGNED>
-+<U1B8E>     /x81/x35/xaf/x38 <UNASSIGNED>
-+<U1B8F>     /x81/x35/xaf/x39 <UNASSIGNED>
-+<U1B90>     /x81/x35/xb0/x30 <UNASSIGNED>
-+<U1B91>     /x81/x35/xb0/x31 <UNASSIGNED>
-+<U1B92>     /x81/x35/xb0/x32 <UNASSIGNED>
-+<U1B93>     /x81/x35/xb0/x33 <UNASSIGNED>
-+<U1B94>     /x81/x35/xb0/x34 <UNASSIGNED>
-+<U1B95>     /x81/x35/xb0/x35 <UNASSIGNED>
-+<U1B96>     /x81/x35/xb0/x36 <UNASSIGNED>
-+<U1B97>     /x81/x35/xb0/x37 <UNASSIGNED>
-+<U1B98>     /x81/x35/xb0/x38 <UNASSIGNED>
-+<U1B99>     /x81/x35/xb0/x39 <UNASSIGNED>
-+<U1B9A>     /x81/x35/xb1/x30 <UNASSIGNED>
-+<U1B9B>     /x81/x35/xb1/x31 <UNASSIGNED>
-+<U1B9C>     /x81/x35/xb1/x32 <UNASSIGNED>
-+<U1B9D>     /x81/x35/xb1/x33 <UNASSIGNED>
-+<U1B9E>     /x81/x35/xb1/x34 <UNASSIGNED>
-+<U1B9F>     /x81/x35/xb1/x35 <UNASSIGNED>
-+<U1BA0>     /x81/x35/xb1/x36 <UNASSIGNED>
-+<U1BA1>     /x81/x35/xb1/x37 <UNASSIGNED>
-+<U1BA2>     /x81/x35/xb1/x38 <UNASSIGNED>
-+<U1BA3>     /x81/x35/xb1/x39 <UNASSIGNED>
-+<U1BA4>     /x81/x35/xb2/x30 <UNASSIGNED>
-+<U1BA5>     /x81/x35/xb2/x31 <UNASSIGNED>
-+<U1BA6>     /x81/x35/xb2/x32 <UNASSIGNED>
-+<U1BA7>     /x81/x35/xb2/x33 <UNASSIGNED>
-+<U1BA8>     /x81/x35/xb2/x34 <UNASSIGNED>
-+<U1BA9>     /x81/x35/xb2/x35 <UNASSIGNED>
-+<U1BAA>     /x81/x35/xb2/x36 <UNASSIGNED>
-+<U1BAB>     /x81/x35/xb2/x37 <UNASSIGNED>
-+<U1BAC>     /x81/x35/xb2/x38 <UNASSIGNED>
-+<U1BAD>     /x81/x35/xb2/x39 <UNASSIGNED>
-+<U1BAE>     /x81/x35/xb3/x30 <UNASSIGNED>
-+<U1BAF>     /x81/x35/xb3/x31 <UNASSIGNED>
-+<U1BB0>     /x81/x35/xb3/x32 <UNASSIGNED>
-+<U1BB1>     /x81/x35/xb3/x33 <UNASSIGNED>
-+<U1BB2>     /x81/x35/xb3/x34 <UNASSIGNED>
-+<U1BB3>     /x81/x35/xb3/x35 <UNASSIGNED>
-+<U1BB4>     /x81/x35/xb3/x36 <UNASSIGNED>
-+<U1BB5>     /x81/x35/xb3/x37 <UNASSIGNED>
-+<U1BB6>     /x81/x35/xb3/x38 <UNASSIGNED>
-+<U1BB7>     /x81/x35/xb3/x39 <UNASSIGNED>
-+<U1BB8>     /x81/x35/xb4/x30 <UNASSIGNED>
-+<U1BB9>     /x81/x35/xb4/x31 <UNASSIGNED>
-+<U1BBA>     /x81/x35/xb4/x32 <UNASSIGNED>
-+<U1BBB>     /x81/x35/xb4/x33 <UNASSIGNED>
-+<U1BBC>     /x81/x35/xb4/x34 <UNASSIGNED>
-+<U1BBD>     /x81/x35/xb4/x35 <UNASSIGNED>
-+<U1BBE>     /x81/x35/xb4/x36 <UNASSIGNED>
-+<U1BBF>     /x81/x35/xb4/x37 <UNASSIGNED>
-+<U1BC0>     /x81/x35/xb4/x38 <UNASSIGNED>
-+<U1BC1>     /x81/x35/xb4/x39 <UNASSIGNED>
-+<U1BC2>     /x81/x35/xb5/x30 <UNASSIGNED>
-+<U1BC3>     /x81/x35/xb5/x31 <UNASSIGNED>
-+<U1BC4>     /x81/x35/xb5/x32 <UNASSIGNED>
-+<U1BC5>     /x81/x35/xb5/x33 <UNASSIGNED>
-+<U1BC6>     /x81/x35/xb5/x34 <UNASSIGNED>
-+<U1BC7>     /x81/x35/xb5/x35 <UNASSIGNED>
-+<U1BC8>     /x81/x35/xb5/x36 <UNASSIGNED>
-+<U1BC9>     /x81/x35/xb5/x37 <UNASSIGNED>
-+<U1BCA>     /x81/x35/xb5/x38 <UNASSIGNED>
-+<U1BCB>     /x81/x35/xb5/x39 <UNASSIGNED>
-+<U1BCC>     /x81/x35/xb6/x30 <UNASSIGNED>
-+<U1BCD>     /x81/x35/xb6/x31 <UNASSIGNED>
-+<U1BCE>     /x81/x35/xb6/x32 <UNASSIGNED>
-+<U1BCF>     /x81/x35/xb6/x33 <UNASSIGNED>
-+<U1BD0>     /x81/x35/xb6/x34 <UNASSIGNED>
-+<U1BD1>     /x81/x35/xb6/x35 <UNASSIGNED>
-+<U1BD2>     /x81/x35/xb6/x36 <UNASSIGNED>
-+<U1BD3>     /x81/x35/xb6/x37 <UNASSIGNED>
-+<U1BD4>     /x81/x35/xb6/x38 <UNASSIGNED>
-+<U1BD5>     /x81/x35/xb6/x39 <UNASSIGNED>
-+<U1BD6>     /x81/x35/xb7/x30 <UNASSIGNED>
-+<U1BD7>     /x81/x35/xb7/x31 <UNASSIGNED>
-+<U1BD8>     /x81/x35/xb7/x32 <UNASSIGNED>
-+<U1BD9>     /x81/x35/xb7/x33 <UNASSIGNED>
-+<U1BDA>     /x81/x35/xb7/x34 <UNASSIGNED>
-+<U1BDB>     /x81/x35/xb7/x35 <UNASSIGNED>
-+<U1BDC>     /x81/x35/xb7/x36 <UNASSIGNED>
-+<U1BDD>     /x81/x35/xb7/x37 <UNASSIGNED>
-+<U1BDE>     /x81/x35/xb7/x38 <UNASSIGNED>
-+<U1BDF>     /x81/x35/xb7/x39 <UNASSIGNED>
-+<U1BE0>     /x81/x35/xb8/x30 <UNASSIGNED>
-+<U1BE1>     /x81/x35/xb8/x31 <UNASSIGNED>
-+<U1BE2>     /x81/x35/xb8/x32 <UNASSIGNED>
-+<U1BE3>     /x81/x35/xb8/x33 <UNASSIGNED>
-+<U1BE4>     /x81/x35/xb8/x34 <UNASSIGNED>
-+<U1BE5>     /x81/x35/xb8/x35 <UNASSIGNED>
-+<U1BE6>     /x81/x35/xb8/x36 <UNASSIGNED>
-+<U1BE7>     /x81/x35/xb8/x37 <UNASSIGNED>
-+<U1BE8>     /x81/x35/xb8/x38 <UNASSIGNED>
-+<U1BE9>     /x81/x35/xb8/x39 <UNASSIGNED>
-+<U1BEA>     /x81/x35/xb9/x30 <UNASSIGNED>
-+<U1BEB>     /x81/x35/xb9/x31 <UNASSIGNED>
-+<U1BEC>     /x81/x35/xb9/x32 <UNASSIGNED>
-+<U1BED>     /x81/x35/xb9/x33 <UNASSIGNED>
-+<U1BEE>     /x81/x35/xb9/x34 <UNASSIGNED>
-+<U1BEF>     /x81/x35/xb9/x35 <UNASSIGNED>
-+<U1BF0>     /x81/x35/xb9/x36 <UNASSIGNED>
-+<U1BF1>     /x81/x35/xb9/x37 <UNASSIGNED>
-+<U1BF2>     /x81/x35/xb9/x38 <UNASSIGNED>
-+<U1BF3>     /x81/x35/xb9/x39 <UNASSIGNED>
-+<U1BF4>     /x81/x35/xba/x30 <UNASSIGNED>
-+<U1BF5>     /x81/x35/xba/x31 <UNASSIGNED>
-+<U1BF6>     /x81/x35/xba/x32 <UNASSIGNED>
-+<U1BF7>     /x81/x35/xba/x33 <UNASSIGNED>
-+<U1BF8>     /x81/x35/xba/x34 <UNASSIGNED>
-+<U1BF9>     /x81/x35/xba/x35 <UNASSIGNED>
-+<U1BFA>     /x81/x35/xba/x36 <UNASSIGNED>
-+<U1BFB>     /x81/x35/xba/x37 <UNASSIGNED>
-+<U1BFC>     /x81/x35/xba/x38 <UNASSIGNED>
-+<U1BFD>     /x81/x35/xba/x39 <UNASSIGNED>
-+<U1BFE>     /x81/x35/xbb/x30 <UNASSIGNED>
-+<U1BFF>     /x81/x35/xbb/x31 <UNASSIGNED>
-+<U1C00>     /x81/x35/xbb/x32 <UNASSIGNED>
-+<U1C01>     /x81/x35/xbb/x33 <UNASSIGNED>
-+<U1C02>     /x81/x35/xbb/x34 <UNASSIGNED>
-+<U1C03>     /x81/x35/xbb/x35 <UNASSIGNED>
-+<U1C04>     /x81/x35/xbb/x36 <UNASSIGNED>
-+<U1C05>     /x81/x35/xbb/x37 <UNASSIGNED>
-+<U1C06>     /x81/x35/xbb/x38 <UNASSIGNED>
-+<U1C07>     /x81/x35/xbb/x39 <UNASSIGNED>
-+<U1C08>     /x81/x35/xbc/x30 <UNASSIGNED>
-+<U1C09>     /x81/x35/xbc/x31 <UNASSIGNED>
-+<U1C0A>     /x81/x35/xbc/x32 <UNASSIGNED>
-+<U1C0B>     /x81/x35/xbc/x33 <UNASSIGNED>
-+<U1C0C>     /x81/x35/xbc/x34 <UNASSIGNED>
-+<U1C0D>     /x81/x35/xbc/x35 <UNASSIGNED>
-+<U1C0E>     /x81/x35/xbc/x36 <UNASSIGNED>
-+<U1C0F>     /x81/x35/xbc/x37 <UNASSIGNED>
-+<U1C10>     /x81/x35/xbc/x38 <UNASSIGNED>
-+<U1C11>     /x81/x35/xbc/x39 <UNASSIGNED>
-+<U1C12>     /x81/x35/xbd/x30 <UNASSIGNED>
-+<U1C13>     /x81/x35/xbd/x31 <UNASSIGNED>
-+<U1C14>     /x81/x35/xbd/x32 <UNASSIGNED>
-+<U1C15>     /x81/x35/xbd/x33 <UNASSIGNED>
-+<U1C16>     /x81/x35/xbd/x34 <UNASSIGNED>
-+<U1C17>     /x81/x35/xbd/x35 <UNASSIGNED>
-+<U1C18>     /x81/x35/xbd/x36 <UNASSIGNED>
-+<U1C19>     /x81/x35/xbd/x37 <UNASSIGNED>
-+<U1C1A>     /x81/x35/xbd/x38 <UNASSIGNED>
-+<U1C1B>     /x81/x35/xbd/x39 <UNASSIGNED>
-+<U1C1C>     /x81/x35/xbe/x30 <UNASSIGNED>
-+<U1C1D>     /x81/x35/xbe/x31 <UNASSIGNED>
-+<U1C1E>     /x81/x35/xbe/x32 <UNASSIGNED>
-+<U1C1F>     /x81/x35/xbe/x33 <UNASSIGNED>
-+<U1C20>     /x81/x35/xbe/x34 <UNASSIGNED>
-+<U1C21>     /x81/x35/xbe/x35 <UNASSIGNED>
-+<U1C22>     /x81/x35/xbe/x36 <UNASSIGNED>
-+<U1C23>     /x81/x35/xbe/x37 <UNASSIGNED>
-+<U1C24>     /x81/x35/xbe/x38 <UNASSIGNED>
-+<U1C25>     /x81/x35/xbe/x39 <UNASSIGNED>
-+<U1C26>     /x81/x35/xbf/x30 <UNASSIGNED>
-+<U1C27>     /x81/x35/xbf/x31 <UNASSIGNED>
-+<U1C28>     /x81/x35/xbf/x32 <UNASSIGNED>
-+<U1C29>     /x81/x35/xbf/x33 <UNASSIGNED>
-+<U1C2A>     /x81/x35/xbf/x34 <UNASSIGNED>
-+<U1C2B>     /x81/x35/xbf/x35 <UNASSIGNED>
-+<U1C2C>     /x81/x35/xbf/x36 <UNASSIGNED>
-+<U1C2D>     /x81/x35/xbf/x37 <UNASSIGNED>
-+<U1C2E>     /x81/x35/xbf/x38 <UNASSIGNED>
-+<U1C2F>     /x81/x35/xbf/x39 <UNASSIGNED>
-+<U1C30>     /x81/x35/xc0/x30 <UNASSIGNED>
-+<U1C31>     /x81/x35/xc0/x31 <UNASSIGNED>
-+<U1C32>     /x81/x35/xc0/x32 <UNASSIGNED>
-+<U1C33>     /x81/x35/xc0/x33 <UNASSIGNED>
-+<U1C34>     /x81/x35/xc0/x34 <UNASSIGNED>
-+<U1C35>     /x81/x35/xc0/x35 <UNASSIGNED>
-+<U1C36>     /x81/x35/xc0/x36 <UNASSIGNED>
-+<U1C37>     /x81/x35/xc0/x37 <UNASSIGNED>
-+<U1C38>     /x81/x35/xc0/x38 <UNASSIGNED>
-+<U1C39>     /x81/x35/xc0/x39 <UNASSIGNED>
-+<U1C3A>     /x81/x35/xc1/x30 <UNASSIGNED>
-+<U1C3B>     /x81/x35/xc1/x31 <UNASSIGNED>
-+<U1C3C>     /x81/x35/xc1/x32 <UNASSIGNED>
-+<U1C3D>     /x81/x35/xc1/x33 <UNASSIGNED>
-+<U1C3E>     /x81/x35/xc1/x34 <UNASSIGNED>
-+<U1C3F>     /x81/x35/xc1/x35 <UNASSIGNED>
-+<U1C40>     /x81/x35/xc1/x36 <UNASSIGNED>
-+<U1C41>     /x81/x35/xc1/x37 <UNASSIGNED>
-+<U1C42>     /x81/x35/xc1/x38 <UNASSIGNED>
-+<U1C43>     /x81/x35/xc1/x39 <UNASSIGNED>
-+<U1C44>     /x81/x35/xc2/x30 <UNASSIGNED>
-+<U1C45>     /x81/x35/xc2/x31 <UNASSIGNED>
-+<U1C46>     /x81/x35/xc2/x32 <UNASSIGNED>
-+<U1C47>     /x81/x35/xc2/x33 <UNASSIGNED>
-+<U1C48>     /x81/x35/xc2/x34 <UNASSIGNED>
-+<U1C49>     /x81/x35/xc2/x35 <UNASSIGNED>
-+<U1C4A>     /x81/x35/xc2/x36 <UNASSIGNED>
-+<U1C4B>     /x81/x35/xc2/x37 <UNASSIGNED>
-+<U1C4C>     /x81/x35/xc2/x38 <UNASSIGNED>
-+<U1C4D>     /x81/x35/xc2/x39 <UNASSIGNED>
-+<U1C4E>     /x81/x35/xc3/x30 <UNASSIGNED>
-+<U1C4F>     /x81/x35/xc3/x31 <UNASSIGNED>
-+<U1C50>     /x81/x35/xc3/x32 <UNASSIGNED>
-+<U1C51>     /x81/x35/xc3/x33 <UNASSIGNED>
-+<U1C52>     /x81/x35/xc3/x34 <UNASSIGNED>
-+<U1C53>     /x81/x35/xc3/x35 <UNASSIGNED>
-+<U1C54>     /x81/x35/xc3/x36 <UNASSIGNED>
-+<U1C55>     /x81/x35/xc3/x37 <UNASSIGNED>
-+<U1C56>     /x81/x35/xc3/x38 <UNASSIGNED>
-+<U1C57>     /x81/x35/xc3/x39 <UNASSIGNED>
-+<U1C58>     /x81/x35/xc4/x30 <UNASSIGNED>
-+<U1C59>     /x81/x35/xc4/x31 <UNASSIGNED>
-+<U1C5A>     /x81/x35/xc4/x32 <UNASSIGNED>
-+<U1C5B>     /x81/x35/xc4/x33 <UNASSIGNED>
-+<U1C5C>     /x81/x35/xc4/x34 <UNASSIGNED>
-+<U1C5D>     /x81/x35/xc4/x35 <UNASSIGNED>
-+<U1C5E>     /x81/x35/xc4/x36 <UNASSIGNED>
-+<U1C5F>     /x81/x35/xc4/x37 <UNASSIGNED>
-+<U1C60>     /x81/x35/xc4/x38 <UNASSIGNED>
-+<U1C61>     /x81/x35/xc4/x39 <UNASSIGNED>
-+<U1C62>     /x81/x35/xc5/x30 <UNASSIGNED>
-+<U1C63>     /x81/x35/xc5/x31 <UNASSIGNED>
-+<U1C64>     /x81/x35/xc5/x32 <UNASSIGNED>
-+<U1C65>     /x81/x35/xc5/x33 <UNASSIGNED>
-+<U1C66>     /x81/x35/xc5/x34 <UNASSIGNED>
-+<U1C67>     /x81/x35/xc5/x35 <UNASSIGNED>
-+<U1C68>     /x81/x35/xc5/x36 <UNASSIGNED>
-+<U1C69>     /x81/x35/xc5/x37 <UNASSIGNED>
-+<U1C6A>     /x81/x35/xc5/x38 <UNASSIGNED>
-+<U1C6B>     /x81/x35/xc5/x39 <UNASSIGNED>
-+<U1C6C>     /x81/x35/xc6/x30 <UNASSIGNED>
-+<U1C6D>     /x81/x35/xc6/x31 <UNASSIGNED>
-+<U1C6E>     /x81/x35/xc6/x32 <UNASSIGNED>
-+<U1C6F>     /x81/x35/xc6/x33 <UNASSIGNED>
-+<U1C70>     /x81/x35/xc6/x34 <UNASSIGNED>
-+<U1C71>     /x81/x35/xc6/x35 <UNASSIGNED>
-+<U1C72>     /x81/x35/xc6/x36 <UNASSIGNED>
-+<U1C73>     /x81/x35/xc6/x37 <UNASSIGNED>
-+<U1C74>     /x81/x35/xc6/x38 <UNASSIGNED>
-+<U1C75>     /x81/x35/xc6/x39 <UNASSIGNED>
-+<U1C76>     /x81/x35/xc7/x30 <UNASSIGNED>
-+<U1C77>     /x81/x35/xc7/x31 <UNASSIGNED>
-+<U1C78>     /x81/x35/xc7/x32 <UNASSIGNED>
-+<U1C79>     /x81/x35/xc7/x33 <UNASSIGNED>
-+<U1C7A>     /x81/x35/xc7/x34 <UNASSIGNED>
-+<U1C7B>     /x81/x35/xc7/x35 <UNASSIGNED>
-+<U1C7C>     /x81/x35/xc7/x36 <UNASSIGNED>
-+<U1C7D>     /x81/x35/xc7/x37 <UNASSIGNED>
-+<U1C7E>     /x81/x35/xc7/x38 <UNASSIGNED>
-+<U1C7F>     /x81/x35/xc7/x39 <UNASSIGNED>
-+<U1C80>     /x81/x35/xc8/x30 <UNASSIGNED>
-+<U1C81>     /x81/x35/xc8/x31 <UNASSIGNED>
-+<U1C82>     /x81/x35/xc8/x32 <UNASSIGNED>
-+<U1C83>     /x81/x35/xc8/x33 <UNASSIGNED>
-+<U1C84>     /x81/x35/xc8/x34 <UNASSIGNED>
-+<U1C85>     /x81/x35/xc8/x35 <UNASSIGNED>
-+<U1C86>     /x81/x35/xc8/x36 <UNASSIGNED>
-+<U1C87>     /x81/x35/xc8/x37 <UNASSIGNED>
-+<U1C88>     /x81/x35/xc8/x38 <UNASSIGNED>
-+<U1C89>     /x81/x35/xc8/x39 <UNASSIGNED>
-+<U1C8A>     /x81/x35/xc9/x30 <UNASSIGNED>
-+<U1C8B>     /x81/x35/xc9/x31 <UNASSIGNED>
-+<U1C8C>     /x81/x35/xc9/x32 <UNASSIGNED>
-+<U1C8D>     /x81/x35/xc9/x33 <UNASSIGNED>
-+<U1C8E>     /x81/x35/xc9/x34 <UNASSIGNED>
-+<U1C8F>     /x81/x35/xc9/x35 <UNASSIGNED>
-+<U1C90>     /x81/x35/xc9/x36 <UNASSIGNED>
-+<U1C91>     /x81/x35/xc9/x37 <UNASSIGNED>
-+<U1C92>     /x81/x35/xc9/x38 <UNASSIGNED>
-+<U1C93>     /x81/x35/xc9/x39 <UNASSIGNED>
-+<U1C94>     /x81/x35/xca/x30 <UNASSIGNED>
-+<U1C95>     /x81/x35/xca/x31 <UNASSIGNED>
-+<U1C96>     /x81/x35/xca/x32 <UNASSIGNED>
-+<U1C97>     /x81/x35/xca/x33 <UNASSIGNED>
-+<U1C98>     /x81/x35/xca/x34 <UNASSIGNED>
-+<U1C99>     /x81/x35/xca/x35 <UNASSIGNED>
-+<U1C9A>     /x81/x35/xca/x36 <UNASSIGNED>
-+<U1C9B>     /x81/x35/xca/x37 <UNASSIGNED>
-+<U1C9C>     /x81/x35/xca/x38 <UNASSIGNED>
-+<U1C9D>     /x81/x35/xca/x39 <UNASSIGNED>
-+<U1C9E>     /x81/x35/xcb/x30 <UNASSIGNED>
-+<U1C9F>     /x81/x35/xcb/x31 <UNASSIGNED>
-+<U1CA0>     /x81/x35/xcb/x32 <UNASSIGNED>
-+<U1CA1>     /x81/x35/xcb/x33 <UNASSIGNED>
-+<U1CA2>     /x81/x35/xcb/x34 <UNASSIGNED>
-+<U1CA3>     /x81/x35/xcb/x35 <UNASSIGNED>
-+<U1CA4>     /x81/x35/xcb/x36 <UNASSIGNED>
-+<U1CA5>     /x81/x35/xcb/x37 <UNASSIGNED>
-+<U1CA6>     /x81/x35/xcb/x38 <UNASSIGNED>
-+<U1CA7>     /x81/x35/xcb/x39 <UNASSIGNED>
-+<U1CA8>     /x81/x35/xcc/x30 <UNASSIGNED>
-+<U1CA9>     /x81/x35/xcc/x31 <UNASSIGNED>
-+<U1CAA>     /x81/x35/xcc/x32 <UNASSIGNED>
-+<U1CAB>     /x81/x35/xcc/x33 <UNASSIGNED>
-+<U1CAC>     /x81/x35/xcc/x34 <UNASSIGNED>
-+<U1CAD>     /x81/x35/xcc/x35 <UNASSIGNED>
-+<U1CAE>     /x81/x35/xcc/x36 <UNASSIGNED>
-+<U1CAF>     /x81/x35/xcc/x37 <UNASSIGNED>
-+<U1CB0>     /x81/x35/xcc/x38 <UNASSIGNED>
-+<U1CB1>     /x81/x35/xcc/x39 <UNASSIGNED>
-+<U1CB2>     /x81/x35/xcd/x30 <UNASSIGNED>
-+<U1CB3>     /x81/x35/xcd/x31 <UNASSIGNED>
-+<U1CB4>     /x81/x35/xcd/x32 <UNASSIGNED>
-+<U1CB5>     /x81/x35/xcd/x33 <UNASSIGNED>
-+<U1CB6>     /x81/x35/xcd/x34 <UNASSIGNED>
-+<U1CB7>     /x81/x35/xcd/x35 <UNASSIGNED>
-+<U1CB8>     /x81/x35/xcd/x36 <UNASSIGNED>
-+<U1CB9>     /x81/x35/xcd/x37 <UNASSIGNED>
-+<U1CBA>     /x81/x35/xcd/x38 <UNASSIGNED>
-+<U1CBB>     /x81/x35/xcd/x39 <UNASSIGNED>
-+<U1CBC>     /x81/x35/xce/x30 <UNASSIGNED>
-+<U1CBD>     /x81/x35/xce/x31 <UNASSIGNED>
-+<U1CBE>     /x81/x35/xce/x32 <UNASSIGNED>
-+<U1CBF>     /x81/x35/xce/x33 <UNASSIGNED>
-+<U1CC0>     /x81/x35/xce/x34 <UNASSIGNED>
-+<U1CC1>     /x81/x35/xce/x35 <UNASSIGNED>
-+<U1CC2>     /x81/x35/xce/x36 <UNASSIGNED>
-+<U1CC3>     /x81/x35/xce/x37 <UNASSIGNED>
-+<U1CC4>     /x81/x35/xce/x38 <UNASSIGNED>
-+<U1CC5>     /x81/x35/xce/x39 <UNASSIGNED>
-+<U1CC6>     /x81/x35/xcf/x30 <UNASSIGNED>
-+<U1CC7>     /x81/x35/xcf/x31 <UNASSIGNED>
-+<U1CC8>     /x81/x35/xcf/x32 <UNASSIGNED>
-+<U1CC9>     /x81/x35/xcf/x33 <UNASSIGNED>
-+<U1CCA>     /x81/x35/xcf/x34 <UNASSIGNED>
-+<U1CCB>     /x81/x35/xcf/x35 <UNASSIGNED>
-+<U1CCC>     /x81/x35/xcf/x36 <UNASSIGNED>
-+<U1CCD>     /x81/x35/xcf/x37 <UNASSIGNED>
-+<U1CCE>     /x81/x35/xcf/x38 <UNASSIGNED>
-+<U1CCF>     /x81/x35/xcf/x39 <UNASSIGNED>
-+<U1CD0>     /x81/x35/xd0/x30 <UNASSIGNED>
-+<U1CD1>     /x81/x35/xd0/x31 <UNASSIGNED>
-+<U1CD2>     /x81/x35/xd0/x32 <UNASSIGNED>
-+<U1CD3>     /x81/x35/xd0/x33 <UNASSIGNED>
-+<U1CD4>     /x81/x35/xd0/x34 <UNASSIGNED>
-+<U1CD5>     /x81/x35/xd0/x35 <UNASSIGNED>
-+<U1CD6>     /x81/x35/xd0/x36 <UNASSIGNED>
-+<U1CD7>     /x81/x35/xd0/x37 <UNASSIGNED>
-+<U1CD8>     /x81/x35/xd0/x38 <UNASSIGNED>
-+<U1CD9>     /x81/x35/xd0/x39 <UNASSIGNED>
-+<U1CDA>     /x81/x35/xd1/x30 <UNASSIGNED>
-+<U1CDB>     /x81/x35/xd1/x31 <UNASSIGNED>
-+<U1CDC>     /x81/x35/xd1/x32 <UNASSIGNED>
-+<U1CDD>     /x81/x35/xd1/x33 <UNASSIGNED>
-+<U1CDE>     /x81/x35/xd1/x34 <UNASSIGNED>
-+<U1CDF>     /x81/x35/xd1/x35 <UNASSIGNED>
-+<U1CE0>     /x81/x35/xd1/x36 <UNASSIGNED>
-+<U1CE1>     /x81/x35/xd1/x37 <UNASSIGNED>
-+<U1CE2>     /x81/x35/xd1/x38 <UNASSIGNED>
-+<U1CE3>     /x81/x35/xd1/x39 <UNASSIGNED>
-+<U1CE4>     /x81/x35/xd2/x30 <UNASSIGNED>
-+<U1CE5>     /x81/x35/xd2/x31 <UNASSIGNED>
-+<U1CE6>     /x81/x35/xd2/x32 <UNASSIGNED>
-+<U1CE7>     /x81/x35/xd2/x33 <UNASSIGNED>
-+<U1CE8>     /x81/x35/xd2/x34 <UNASSIGNED>
-+<U1CE9>     /x81/x35/xd2/x35 <UNASSIGNED>
-+<U1CEA>     /x81/x35/xd2/x36 <UNASSIGNED>
-+<U1CEB>     /x81/x35/xd2/x37 <UNASSIGNED>
-+<U1CEC>     /x81/x35/xd2/x38 <UNASSIGNED>
-+<U1CED>     /x81/x35/xd2/x39 <UNASSIGNED>
-+<U1CEE>     /x81/x35/xd3/x30 <UNASSIGNED>
-+<U1CEF>     /x81/x35/xd3/x31 <UNASSIGNED>
-+<U1CF0>     /x81/x35/xd3/x32 <UNASSIGNED>
-+<U1CF1>     /x81/x35/xd3/x33 <UNASSIGNED>
-+<U1CF2>     /x81/x35/xd3/x34 <UNASSIGNED>
-+<U1CF3>     /x81/x35/xd3/x35 <UNASSIGNED>
-+<U1CF4>     /x81/x35/xd3/x36 <UNASSIGNED>
-+<U1CF5>     /x81/x35/xd3/x37 <UNASSIGNED>
-+<U1CF6>     /x81/x35/xd3/x38 <UNASSIGNED>
-+<U1CF7>     /x81/x35/xd3/x39 <UNASSIGNED>
-+<U1CF8>     /x81/x35/xd4/x30 <UNASSIGNED>
-+<U1CF9>     /x81/x35/xd4/x31 <UNASSIGNED>
-+<U1CFA>     /x81/x35/xd4/x32 <UNASSIGNED>
-+<U1CFB>     /x81/x35/xd4/x33 <UNASSIGNED>
-+<U1CFC>     /x81/x35/xd4/x34 <UNASSIGNED>
-+<U1CFD>     /x81/x35/xd4/x35 <UNASSIGNED>
-+<U1CFE>     /x81/x35/xd4/x36 <UNASSIGNED>
-+<U1CFF>     /x81/x35/xd4/x37 <UNASSIGNED>
-+<U1D00>     /x81/x35/xd4/x38 <UNASSIGNED>
-+<U1D01>     /x81/x35/xd4/x39 <UNASSIGNED>
-+<U1D02>     /x81/x35/xd5/x30 <UNASSIGNED>
-+<U1D03>     /x81/x35/xd5/x31 <UNASSIGNED>
-+<U1D04>     /x81/x35/xd5/x32 <UNASSIGNED>
-+<U1D05>     /x81/x35/xd5/x33 <UNASSIGNED>
-+<U1D06>     /x81/x35/xd5/x34 <UNASSIGNED>
-+<U1D07>     /x81/x35/xd5/x35 <UNASSIGNED>
-+<U1D08>     /x81/x35/xd5/x36 <UNASSIGNED>
-+<U1D09>     /x81/x35/xd5/x37 <UNASSIGNED>
-+<U1D0A>     /x81/x35/xd5/x38 <UNASSIGNED>
-+<U1D0B>     /x81/x35/xd5/x39 <UNASSIGNED>
-+<U1D0C>     /x81/x35/xd6/x30 <UNASSIGNED>
-+<U1D0D>     /x81/x35/xd6/x31 <UNASSIGNED>
-+<U1D0E>     /x81/x35/xd6/x32 <UNASSIGNED>
-+<U1D0F>     /x81/x35/xd6/x33 <UNASSIGNED>
-+<U1D10>     /x81/x35/xd6/x34 <UNASSIGNED>
-+<U1D11>     /x81/x35/xd6/x35 <UNASSIGNED>
-+<U1D12>     /x81/x35/xd6/x36 <UNASSIGNED>
-+<U1D13>     /x81/x35/xd6/x37 <UNASSIGNED>
-+<U1D14>     /x81/x35/xd6/x38 <UNASSIGNED>
-+<U1D15>     /x81/x35/xd6/x39 <UNASSIGNED>
-+<U1D16>     /x81/x35/xd7/x30 <UNASSIGNED>
-+<U1D17>     /x81/x35/xd7/x31 <UNASSIGNED>
-+<U1D18>     /x81/x35/xd7/x32 <UNASSIGNED>
-+<U1D19>     /x81/x35/xd7/x33 <UNASSIGNED>
-+<U1D1A>     /x81/x35/xd7/x34 <UNASSIGNED>
-+<U1D1B>     /x81/x35/xd7/x35 <UNASSIGNED>
-+<U1D1C>     /x81/x35/xd7/x36 <UNASSIGNED>
-+<U1D1D>     /x81/x35/xd7/x37 <UNASSIGNED>
-+<U1D1E>     /x81/x35/xd7/x38 <UNASSIGNED>
-+<U1D1F>     /x81/x35/xd7/x39 <UNASSIGNED>
-+<U1D20>     /x81/x35/xd8/x30 <UNASSIGNED>
-+<U1D21>     /x81/x35/xd8/x31 <UNASSIGNED>
-+<U1D22>     /x81/x35/xd8/x32 <UNASSIGNED>
-+<U1D23>     /x81/x35/xd8/x33 <UNASSIGNED>
-+<U1D24>     /x81/x35/xd8/x34 <UNASSIGNED>
-+<U1D25>     /x81/x35/xd8/x35 <UNASSIGNED>
-+<U1D26>     /x81/x35/xd8/x36 <UNASSIGNED>
-+<U1D27>     /x81/x35/xd8/x37 <UNASSIGNED>
-+<U1D28>     /x81/x35/xd8/x38 <UNASSIGNED>
-+<U1D29>     /x81/x35/xd8/x39 <UNASSIGNED>
-+<U1D2A>     /x81/x35/xd9/x30 <UNASSIGNED>
-+<U1D2B>     /x81/x35/xd9/x31 <UNASSIGNED>
-+<U1D2C>     /x81/x35/xd9/x32 <UNASSIGNED>
-+<U1D2D>     /x81/x35/xd9/x33 <UNASSIGNED>
-+<U1D2E>     /x81/x35/xd9/x34 <UNASSIGNED>
-+<U1D2F>     /x81/x35/xd9/x35 <UNASSIGNED>
-+<U1D30>     /x81/x35/xd9/x36 <UNASSIGNED>
-+<U1D31>     /x81/x35/xd9/x37 <UNASSIGNED>
-+<U1D32>     /x81/x35/xd9/x38 <UNASSIGNED>
-+<U1D33>     /x81/x35/xd9/x39 <UNASSIGNED>
-+<U1D34>     /x81/x35/xda/x30 <UNASSIGNED>
-+<U1D35>     /x81/x35/xda/x31 <UNASSIGNED>
-+<U1D36>     /x81/x35/xda/x32 <UNASSIGNED>
-+<U1D37>     /x81/x35/xda/x33 <UNASSIGNED>
-+<U1D38>     /x81/x35/xda/x34 <UNASSIGNED>
-+<U1D39>     /x81/x35/xda/x35 <UNASSIGNED>
-+<U1D3A>     /x81/x35/xda/x36 <UNASSIGNED>
-+<U1D3B>     /x81/x35/xda/x37 <UNASSIGNED>
-+<U1D3C>     /x81/x35/xda/x38 <UNASSIGNED>
-+<U1D3D>     /x81/x35/xda/x39 <UNASSIGNED>
-+<U1D3E>     /x81/x35/xdb/x30 <UNASSIGNED>
-+<U1D3F>     /x81/x35/xdb/x31 <UNASSIGNED>
-+<U1D40>     /x81/x35/xdb/x32 <UNASSIGNED>
-+<U1D41>     /x81/x35/xdb/x33 <UNASSIGNED>
-+<U1D42>     /x81/x35/xdb/x34 <UNASSIGNED>
-+<U1D43>     /x81/x35/xdb/x35 <UNASSIGNED>
-+<U1D44>     /x81/x35/xdb/x36 <UNASSIGNED>
-+<U1D45>     /x81/x35/xdb/x37 <UNASSIGNED>
-+<U1D46>     /x81/x35/xdb/x38 <UNASSIGNED>
-+<U1D47>     /x81/x35/xdb/x39 <UNASSIGNED>
-+<U1D48>     /x81/x35/xdc/x30 <UNASSIGNED>
-+<U1D49>     /x81/x35/xdc/x31 <UNASSIGNED>
-+<U1D4A>     /x81/x35/xdc/x32 <UNASSIGNED>
-+<U1D4B>     /x81/x35/xdc/x33 <UNASSIGNED>
-+<U1D4C>     /x81/x35/xdc/x34 <UNASSIGNED>
-+<U1D4D>     /x81/x35/xdc/x35 <UNASSIGNED>
-+<U1D4E>     /x81/x35/xdc/x36 <UNASSIGNED>
-+<U1D4F>     /x81/x35/xdc/x37 <UNASSIGNED>
-+<U1D50>     /x81/x35/xdc/x38 <UNASSIGNED>
-+<U1D51>     /x81/x35/xdc/x39 <UNASSIGNED>
-+<U1D52>     /x81/x35/xdd/x30 <UNASSIGNED>
-+<U1D53>     /x81/x35/xdd/x31 <UNASSIGNED>
-+<U1D54>     /x81/x35/xdd/x32 <UNASSIGNED>
-+<U1D55>     /x81/x35/xdd/x33 <UNASSIGNED>
-+<U1D56>     /x81/x35/xdd/x34 <UNASSIGNED>
-+<U1D57>     /x81/x35/xdd/x35 <UNASSIGNED>
-+<U1D58>     /x81/x35/xdd/x36 <UNASSIGNED>
-+<U1D59>     /x81/x35/xdd/x37 <UNASSIGNED>
-+<U1D5A>     /x81/x35/xdd/x38 <UNASSIGNED>
-+<U1D5B>     /x81/x35/xdd/x39 <UNASSIGNED>
-+<U1D5C>     /x81/x35/xde/x30 <UNASSIGNED>
-+<U1D5D>     /x81/x35/xde/x31 <UNASSIGNED>
-+<U1D5E>     /x81/x35/xde/x32 <UNASSIGNED>
-+<U1D5F>     /x81/x35/xde/x33 <UNASSIGNED>
-+<U1D60>     /x81/x35/xde/x34 <UNASSIGNED>
-+<U1D61>     /x81/x35/xde/x35 <UNASSIGNED>
-+<U1D62>     /x81/x35/xde/x36 <UNASSIGNED>
-+<U1D63>     /x81/x35/xde/x37 <UNASSIGNED>
-+<U1D64>     /x81/x35/xde/x38 <UNASSIGNED>
-+<U1D65>     /x81/x35/xde/x39 <UNASSIGNED>
-+<U1D66>     /x81/x35/xdf/x30 <UNASSIGNED>
-+<U1D67>     /x81/x35/xdf/x31 <UNASSIGNED>
-+<U1D68>     /x81/x35/xdf/x32 <UNASSIGNED>
-+<U1D69>     /x81/x35/xdf/x33 <UNASSIGNED>
-+<U1D6A>     /x81/x35/xdf/x34 <UNASSIGNED>
-+<U1D6B>     /x81/x35/xdf/x35 <UNASSIGNED>
-+<U1D6C>     /x81/x35/xdf/x36 <UNASSIGNED>
-+<U1D6D>     /x81/x35/xdf/x37 <UNASSIGNED>
-+<U1D6E>     /x81/x35/xdf/x38 <UNASSIGNED>
-+<U1D6F>     /x81/x35/xdf/x39 <UNASSIGNED>
-+<U1D70>     /x81/x35/xe0/x30 <UNASSIGNED>
-+<U1D71>     /x81/x35/xe0/x31 <UNASSIGNED>
-+<U1D72>     /x81/x35/xe0/x32 <UNASSIGNED>
-+<U1D73>     /x81/x35/xe0/x33 <UNASSIGNED>
-+<U1D74>     /x81/x35/xe0/x34 <UNASSIGNED>
-+<U1D75>     /x81/x35/xe0/x35 <UNASSIGNED>
-+<U1D76>     /x81/x35/xe0/x36 <UNASSIGNED>
-+<U1D77>     /x81/x35/xe0/x37 <UNASSIGNED>
-+<U1D78>     /x81/x35/xe0/x38 <UNASSIGNED>
-+<U1D79>     /x81/x35/xe0/x39 <UNASSIGNED>
-+<U1D7A>     /x81/x35/xe1/x30 <UNASSIGNED>
-+<U1D7B>     /x81/x35/xe1/x31 <UNASSIGNED>
-+<U1D7C>     /x81/x35/xe1/x32 <UNASSIGNED>
-+<U1D7D>     /x81/x35/xe1/x33 <UNASSIGNED>
-+<U1D7E>     /x81/x35/xe1/x34 <UNASSIGNED>
-+<U1D7F>     /x81/x35/xe1/x35 <UNASSIGNED>
-+<U1D80>     /x81/x35/xe1/x36 <UNASSIGNED>
-+<U1D81>     /x81/x35/xe1/x37 <UNASSIGNED>
-+<U1D82>     /x81/x35/xe1/x38 <UNASSIGNED>
-+<U1D83>     /x81/x35/xe1/x39 <UNASSIGNED>
-+<U1D84>     /x81/x35/xe2/x30 <UNASSIGNED>
-+<U1D85>     /x81/x35/xe2/x31 <UNASSIGNED>
-+<U1D86>     /x81/x35/xe2/x32 <UNASSIGNED>
-+<U1D87>     /x81/x35/xe2/x33 <UNASSIGNED>
-+<U1D88>     /x81/x35/xe2/x34 <UNASSIGNED>
-+<U1D89>     /x81/x35/xe2/x35 <UNASSIGNED>
-+<U1D8A>     /x81/x35/xe2/x36 <UNASSIGNED>
-+<U1D8B>     /x81/x35/xe2/x37 <UNASSIGNED>
-+<U1D8C>     /x81/x35/xe2/x38 <UNASSIGNED>
-+<U1D8D>     /x81/x35/xe2/x39 <UNASSIGNED>
-+<U1D8E>     /x81/x35/xe3/x30 <UNASSIGNED>
-+<U1D8F>     /x81/x35/xe3/x31 <UNASSIGNED>
-+<U1D90>     /x81/x35/xe3/x32 <UNASSIGNED>
-+<U1D91>     /x81/x35/xe3/x33 <UNASSIGNED>
-+<U1D92>     /x81/x35/xe3/x34 <UNASSIGNED>
-+<U1D93>     /x81/x35/xe3/x35 <UNASSIGNED>
-+<U1D94>     /x81/x35/xe3/x36 <UNASSIGNED>
-+<U1D95>     /x81/x35/xe3/x37 <UNASSIGNED>
-+<U1D96>     /x81/x35/xe3/x38 <UNASSIGNED>
-+<U1D97>     /x81/x35/xe3/x39 <UNASSIGNED>
-+<U1D98>     /x81/x35/xe4/x30 <UNASSIGNED>
-+<U1D99>     /x81/x35/xe4/x31 <UNASSIGNED>
-+<U1D9A>     /x81/x35/xe4/x32 <UNASSIGNED>
-+<U1D9B>     /x81/x35/xe4/x33 <UNASSIGNED>
-+<U1D9C>     /x81/x35/xe4/x34 <UNASSIGNED>
-+<U1D9D>     /x81/x35/xe4/x35 <UNASSIGNED>
-+<U1D9E>     /x81/x35/xe4/x36 <UNASSIGNED>
-+<U1D9F>     /x81/x35/xe4/x37 <UNASSIGNED>
-+<U1DA0>     /x81/x35/xe4/x38 <UNASSIGNED>
-+<U1DA1>     /x81/x35/xe4/x39 <UNASSIGNED>
-+<U1DA2>     /x81/x35/xe5/x30 <UNASSIGNED>
-+<U1DA3>     /x81/x35/xe5/x31 <UNASSIGNED>
-+<U1DA4>     /x81/x35/xe5/x32 <UNASSIGNED>
-+<U1DA5>     /x81/x35/xe5/x33 <UNASSIGNED>
-+<U1DA6>     /x81/x35/xe5/x34 <UNASSIGNED>
-+<U1DA7>     /x81/x35/xe5/x35 <UNASSIGNED>
-+<U1DA8>     /x81/x35/xe5/x36 <UNASSIGNED>
-+<U1DA9>     /x81/x35/xe5/x37 <UNASSIGNED>
-+<U1DAA>     /x81/x35/xe5/x38 <UNASSIGNED>
-+<U1DAB>     /x81/x35/xe5/x39 <UNASSIGNED>
-+<U1DAC>     /x81/x35/xe6/x30 <UNASSIGNED>
-+<U1DAD>     /x81/x35/xe6/x31 <UNASSIGNED>
-+<U1DAE>     /x81/x35/xe6/x32 <UNASSIGNED>
-+<U1DAF>     /x81/x35/xe6/x33 <UNASSIGNED>
-+<U1DB0>     /x81/x35/xe6/x34 <UNASSIGNED>
-+<U1DB1>     /x81/x35/xe6/x35 <UNASSIGNED>
-+<U1DB2>     /x81/x35/xe6/x36 <UNASSIGNED>
-+<U1DB3>     /x81/x35/xe6/x37 <UNASSIGNED>
-+<U1DB4>     /x81/x35/xe6/x38 <UNASSIGNED>
-+<U1DB5>     /x81/x35/xe6/x39 <UNASSIGNED>
-+<U1DB6>     /x81/x35/xe7/x30 <UNASSIGNED>
-+<U1DB7>     /x81/x35/xe7/x31 <UNASSIGNED>
-+<U1DB8>     /x81/x35/xe7/x32 <UNASSIGNED>
-+<U1DB9>     /x81/x35/xe7/x33 <UNASSIGNED>
-+<U1DBA>     /x81/x35/xe7/x34 <UNASSIGNED>
-+<U1DBB>     /x81/x35/xe7/x35 <UNASSIGNED>
-+<U1DBC>     /x81/x35/xe7/x36 <UNASSIGNED>
-+<U1DBD>     /x81/x35/xe7/x37 <UNASSIGNED>
-+<U1DBE>     /x81/x35/xe7/x38 <UNASSIGNED>
-+<U1DBF>     /x81/x35/xe7/x39 <UNASSIGNED>
-+<U1DC0>     /x81/x35/xe8/x30 <UNASSIGNED>
-+<U1DC1>     /x81/x35/xe8/x31 <UNASSIGNED>
-+<U1DC2>     /x81/x35/xe8/x32 <UNASSIGNED>
-+<U1DC3>     /x81/x35/xe8/x33 <UNASSIGNED>
-+<U1DC4>     /x81/x35/xe8/x34 <UNASSIGNED>
-+<U1DC5>     /x81/x35/xe8/x35 <UNASSIGNED>
-+<U1DC6>     /x81/x35/xe8/x36 <UNASSIGNED>
-+<U1DC7>     /x81/x35/xe8/x37 <UNASSIGNED>
-+<U1DC8>     /x81/x35/xe8/x38 <UNASSIGNED>
-+<U1DC9>     /x81/x35/xe8/x39 <UNASSIGNED>
-+<U1DCA>     /x81/x35/xe9/x30 <UNASSIGNED>
-+<U1DCB>     /x81/x35/xe9/x31 <UNASSIGNED>
-+<U1DCC>     /x81/x35/xe9/x32 <UNASSIGNED>
-+<U1DCD>     /x81/x35/xe9/x33 <UNASSIGNED>
-+<U1DCE>     /x81/x35/xe9/x34 <UNASSIGNED>
-+<U1DCF>     /x81/x35/xe9/x35 <UNASSIGNED>
-+<U1DD0>     /x81/x35/xe9/x36 <UNASSIGNED>
-+<U1DD1>     /x81/x35/xe9/x37 <UNASSIGNED>
-+<U1DD2>     /x81/x35/xe9/x38 <UNASSIGNED>
-+<U1DD3>     /x81/x35/xe9/x39 <UNASSIGNED>
-+<U1DD4>     /x81/x35/xea/x30 <UNASSIGNED>
-+<U1DD5>     /x81/x35/xea/x31 <UNASSIGNED>
-+<U1DD6>     /x81/x35/xea/x32 <UNASSIGNED>
-+<U1DD7>     /x81/x35/xea/x33 <UNASSIGNED>
-+<U1DD8>     /x81/x35/xea/x34 <UNASSIGNED>
-+<U1DD9>     /x81/x35/xea/x35 <UNASSIGNED>
-+<U1DDA>     /x81/x35/xea/x36 <UNASSIGNED>
-+<U1DDB>     /x81/x35/xea/x37 <UNASSIGNED>
-+<U1DDC>     /x81/x35/xea/x38 <UNASSIGNED>
-+<U1DDD>     /x81/x35/xea/x39 <UNASSIGNED>
-+<U1DDE>     /x81/x35/xeb/x30 <UNASSIGNED>
-+<U1DDF>     /x81/x35/xeb/x31 <UNASSIGNED>
-+<U1DE0>     /x81/x35/xeb/x32 <UNASSIGNED>
-+<U1DE1>     /x81/x35/xeb/x33 <UNASSIGNED>
-+<U1DE2>     /x81/x35/xeb/x34 <UNASSIGNED>
-+<U1DE3>     /x81/x35/xeb/x35 <UNASSIGNED>
-+<U1DE4>     /x81/x35/xeb/x36 <UNASSIGNED>
-+<U1DE5>     /x81/x35/xeb/x37 <UNASSIGNED>
-+<U1DE6>     /x81/x35/xeb/x38 <UNASSIGNED>
-+<U1DE7>     /x81/x35/xeb/x39 <UNASSIGNED>
-+<U1DE8>     /x81/x35/xec/x30 <UNASSIGNED>
-+<U1DE9>     /x81/x35/xec/x31 <UNASSIGNED>
-+<U1DEA>     /x81/x35/xec/x32 <UNASSIGNED>
-+<U1DEB>     /x81/x35/xec/x33 <UNASSIGNED>
-+<U1DEC>     /x81/x35/xec/x34 <UNASSIGNED>
-+<U1DED>     /x81/x35/xec/x35 <UNASSIGNED>
-+<U1DEE>     /x81/x35/xec/x36 <UNASSIGNED>
-+<U1DEF>     /x81/x35/xec/x37 <UNASSIGNED>
-+<U1DF0>     /x81/x35/xec/x38 <UNASSIGNED>
-+<U1DF1>     /x81/x35/xec/x39 <UNASSIGNED>
-+<U1DF2>     /x81/x35/xed/x30 <UNASSIGNED>
-+<U1DF3>     /x81/x35/xed/x31 <UNASSIGNED>
-+<U1DF4>     /x81/x35/xed/x32 <UNASSIGNED>
-+<U1DF5>     /x81/x35/xed/x33 <UNASSIGNED>
-+<U1DF6>     /x81/x35/xed/x34 <UNASSIGNED>
-+<U1DF7>     /x81/x35/xed/x35 <UNASSIGNED>
-+<U1DF8>     /x81/x35/xed/x36 <UNASSIGNED>
-+<U1DF9>     /x81/x35/xed/x37 <UNASSIGNED>
-+<U1DFA>     /x81/x35/xed/x38 <UNASSIGNED>
-+<U1DFB>     /x81/x35/xed/x39 <UNASSIGNED>
-+<U1DFC>     /x81/x35/xee/x30 <UNASSIGNED>
-+<U1DFD>     /x81/x35/xee/x31 <UNASSIGNED>
-+<U1DFE>     /x81/x35/xee/x32 <UNASSIGNED>
-+<U1DFF>     /x81/x35/xee/x33 <UNASSIGNED>
-+<U1E00>     /x81/x35/xee/x34 LATIN CAPITAL LETTER A WITH RING BELOW
-+<U1E01>     /x81/x35/xee/x35 LATIN SMALL LETTER A WITH RING BELOW
-+<U1E02>     /x81/x35/xee/x36 LATIN CAPITAL LETTER B WITH DOT ABOVE
-+<U1E03>     /x81/x35/xee/x37 LATIN SMALL LETTER B WITH DOT ABOVE
-+<U1E04>     /x81/x35/xee/x38 LATIN CAPITAL LETTER B WITH DOT BELOW
-+<U1E05>     /x81/x35/xee/x39 LATIN SMALL LETTER B WITH DOT BELOW
-+<U1E06>     /x81/x35/xef/x30 LATIN CAPITAL LETTER B WITH LINE BELOW
-+<U1E07>     /x81/x35/xef/x31 LATIN SMALL LETTER B WITH LINE BELOW
-+<U1E08>     /x81/x35/xef/x32 LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-+<U1E09>     /x81/x35/xef/x33 LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-+<U1E0A>     /x81/x35/xef/x34 LATIN CAPITAL LETTER D WITH DOT ABOVE
-+<U1E0B>     /x81/x35/xef/x35 LATIN SMALL LETTER D WITH DOT ABOVE
-+<U1E0C>     /x81/x35/xef/x36 LATIN CAPITAL LETTER D WITH DOT BELOW
-+<U1E0D>     /x81/x35/xef/x37 LATIN SMALL LETTER D WITH DOT BELOW
-+<U1E0E>     /x81/x35/xef/x38 LATIN CAPITAL LETTER D WITH LINE BELOW
-+<U1E0F>     /x81/x35/xef/x39 LATIN SMALL LETTER D WITH LINE BELOW
-+<U1E10>     /x81/x35/xf0/x30 LATIN CAPITAL LETTER D WITH CEDILLA
-+<U1E11>     /x81/x35/xf0/x31 LATIN SMALL LETTER D WITH CEDILLA
-+<U1E12>     /x81/x35/xf0/x32 LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW
-+<U1E13>     /x81/x35/xf0/x33 LATIN SMALL LETTER D WITH CIRCUMFLEX BELOW
-+<U1E14>     /x81/x35/xf0/x34 LATIN CAPITAL LETTER E WITH MACRON AND GRAVE
-+<U1E15>     /x81/x35/xf0/x35 LATIN SMALL LETTER E WITH MACRON AND GRAVE
-+<U1E16>     /x81/x35/xf0/x36 LATIN CAPITAL LETTER E WITH MACRON AND ACUTE
-+<U1E17>     /x81/x35/xf0/x37 LATIN SMALL LETTER E WITH MACRON AND ACUTE
-+<U1E18>     /x81/x35/xf0/x38 LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW
-+<U1E19>     /x81/x35/xf0/x39 LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW
-+<U1E1A>     /x81/x35/xf1/x30 LATIN CAPITAL LETTER E WITH TILDE BELOW
-+<U1E1B>     /x81/x35/xf1/x31 LATIN SMALL LETTER E WITH TILDE BELOW
-+<U1E1C>     /x81/x35/xf1/x32 LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
-+<U1E1D>     /x81/x35/xf1/x33 LATIN SMALL LETTER E WITH CEDILLA AND BREVE
-+<U1E1E>     /x81/x35/xf1/x34 LATIN CAPITAL LETTER F WITH DOT ABOVE
-+<U1E1F>     /x81/x35/xf1/x35 LATIN SMALL LETTER F WITH DOT ABOVE
-+<U1E20>     /x81/x35/xf1/x36 LATIN CAPITAL LETTER G WITH MACRON
-+<U1E21>     /x81/x35/xf1/x37 LATIN SMALL LETTER G WITH MACRON
-+<U1E22>     /x81/x35/xf1/x38 LATIN CAPITAL LETTER H WITH DOT ABOVE
-+<U1E23>     /x81/x35/xf1/x39 LATIN SMALL LETTER H WITH DOT ABOVE
-+<U1E24>     /x81/x35/xf2/x30 LATIN CAPITAL LETTER H WITH DOT BELOW
-+<U1E25>     /x81/x35/xf2/x31 LATIN SMALL LETTER H WITH DOT BELOW
-+<U1E26>     /x81/x35/xf2/x32 LATIN CAPITAL LETTER H WITH DIAERESIS
-+<U1E27>     /x81/x35/xf2/x33 LATIN SMALL LETTER H WITH DIAERESIS
-+<U1E28>     /x81/x35/xf2/x34 LATIN CAPITAL LETTER H WITH CEDILLA
-+<U1E29>     /x81/x35/xf2/x35 LATIN SMALL LETTER H WITH CEDILLA
-+<U1E2A>     /x81/x35/xf2/x36 LATIN CAPITAL LETTER H WITH BREVE BELOW
-+<U1E2B>     /x81/x35/xf2/x37 LATIN SMALL LETTER H WITH BREVE BELOW
-+<U1E2C>     /x81/x35/xf2/x38 LATIN CAPITAL LETTER I WITH TILDE BELOW
-+<U1E2D>     /x81/x35/xf2/x39 LATIN SMALL LETTER I WITH TILDE BELOW
-+<U1E2E>     /x81/x35/xf3/x30 LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE
-+<U1E2F>     /x81/x35/xf3/x31 LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE
-+<U1E30>     /x81/x35/xf3/x32 LATIN CAPITAL LETTER K WITH ACUTE
-+<U1E31>     /x81/x35/xf3/x33 LATIN SMALL LETTER K WITH ACUTE
-+<U1E32>     /x81/x35/xf3/x34 LATIN CAPITAL LETTER K WITH DOT BELOW
-+<U1E33>     /x81/x35/xf3/x35 LATIN SMALL LETTER K WITH DOT BELOW
-+<U1E34>     /x81/x35/xf3/x36 LATIN CAPITAL LETTER K WITH LINE BELOW
-+<U1E35>     /x81/x35/xf3/x37 LATIN SMALL LETTER K WITH LINE BELOW
-+<U1E36>     /x81/x35/xf3/x38 LATIN CAPITAL LETTER L WITH DOT BELOW
-+<U1E37>     /x81/x35/xf3/x39 LATIN SMALL LETTER L WITH DOT BELOW
-+<U1E38>     /x81/x35/xf4/x30 LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON
-+<U1E39>     /x81/x35/xf4/x31 LATIN SMALL LETTER L WITH DOT BELOW AND MACRON
-+<U1E3A>     /x81/x35/xf4/x32 LATIN CAPITAL LETTER L WITH LINE BELOW
-+<U1E3B>     /x81/x35/xf4/x33 LATIN SMALL LETTER L WITH LINE BELOW
-+<U1E3C>     /x81/x35/xf4/x34 LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW
-+<U1E3D>     /x81/x35/xf4/x35 LATIN SMALL LETTER L WITH CIRCUMFLEX BELOW
-+<U1E3E>     /x81/x35/xf4/x36 LATIN CAPITAL LETTER M WITH ACUTE
- <U1E3F>     /xa8/xbc         LATIN SMALL LETTER M WITH ACUTE
-+<U1E40>     /x81/x35/xf4/x38 LATIN CAPITAL LETTER M WITH DOT ABOVE
-+<U1E41>     /x81/x35/xf4/x39 LATIN SMALL LETTER M WITH DOT ABOVE
-+<U1E42>     /x81/x35/xf5/x30 LATIN CAPITAL LETTER M WITH DOT BELOW
-+<U1E43>     /x81/x35/xf5/x31 LATIN SMALL LETTER M WITH DOT BELOW
-+<U1E44>     /x81/x35/xf5/x32 LATIN CAPITAL LETTER N WITH DOT ABOVE
-+<U1E45>     /x81/x35/xf5/x33 LATIN SMALL LETTER N WITH DOT ABOVE
-+<U1E46>     /x81/x35/xf5/x34 LATIN CAPITAL LETTER N WITH DOT BELOW
-+<U1E47>     /x81/x35/xf5/x35 LATIN SMALL LETTER N WITH DOT BELOW
-+<U1E48>     /x81/x35/xf5/x36 LATIN CAPITAL LETTER N WITH LINE BELOW
-+<U1E49>     /x81/x35/xf5/x37 LATIN SMALL LETTER N WITH LINE BELOW
-+<U1E4A>     /x81/x35/xf5/x38 LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW
-+<U1E4B>     /x81/x35/xf5/x39 LATIN SMALL LETTER N WITH CIRCUMFLEX BELOW
-+<U1E4C>     /x81/x35/xf6/x30 LATIN CAPITAL LETTER O WITH TILDE AND ACUTE
-+<U1E4D>     /x81/x35/xf6/x31 LATIN SMALL LETTER O WITH TILDE AND ACUTE
-+<U1E4E>     /x81/x35/xf6/x32 LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS
-+<U1E4F>     /x81/x35/xf6/x33 LATIN SMALL LETTER O WITH TILDE AND DIAERESIS
-+<U1E50>     /x81/x35/xf6/x34 LATIN CAPITAL LETTER O WITH MACRON AND GRAVE
-+<U1E51>     /x81/x35/xf6/x35 LATIN SMALL LETTER O WITH MACRON AND GRAVE
-+<U1E52>     /x81/x35/xf6/x36 LATIN CAPITAL LETTER O WITH MACRON AND ACUTE
-+<U1E53>     /x81/x35/xf6/x37 LATIN SMALL LETTER O WITH MACRON AND ACUTE
-+<U1E54>     /x81/x35/xf6/x38 LATIN CAPITAL LETTER P WITH ACUTE
-+<U1E55>     /x81/x35/xf6/x39 LATIN SMALL LETTER P WITH ACUTE
-+<U1E56>     /x81/x35/xf7/x30 LATIN CAPITAL LETTER P WITH DOT ABOVE
-+<U1E57>     /x81/x35/xf7/x31 LATIN SMALL LETTER P WITH DOT ABOVE
-+<U1E58>     /x81/x35/xf7/x32 LATIN CAPITAL LETTER R WITH DOT ABOVE
-+<U1E59>     /x81/x35/xf7/x33 LATIN SMALL LETTER R WITH DOT ABOVE
-+<U1E5A>     /x81/x35/xf7/x34 LATIN CAPITAL LETTER R WITH DOT BELOW
-+<U1E5B>     /x81/x35/xf7/x35 LATIN SMALL LETTER R WITH DOT BELOW
-+<U1E5C>     /x81/x35/xf7/x36 LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON
-+<U1E5D>     /x81/x35/xf7/x37 LATIN SMALL LETTER R WITH DOT BELOW AND MACRON
-+<U1E5E>     /x81/x35/xf7/x38 LATIN CAPITAL LETTER R WITH LINE BELOW
-+<U1E5F>     /x81/x35/xf7/x39 LATIN SMALL LETTER R WITH LINE BELOW
-+<U1E60>     /x81/x35/xf8/x30 LATIN CAPITAL LETTER S WITH DOT ABOVE
-+<U1E61>     /x81/x35/xf8/x31 LATIN SMALL LETTER S WITH DOT ABOVE
-+<U1E62>     /x81/x35/xf8/x32 LATIN CAPITAL LETTER S WITH DOT BELOW
-+<U1E63>     /x81/x35/xf8/x33 LATIN SMALL LETTER S WITH DOT BELOW
-+<U1E64>     /x81/x35/xf8/x34 LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE
-+<U1E65>     /x81/x35/xf8/x35 LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE
-+<U1E66>     /x81/x35/xf8/x36 LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-+<U1E67>     /x81/x35/xf8/x37 LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
-+<U1E68>     /x81/x35/xf8/x38 LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
-+<U1E69>     /x81/x35/xf8/x39 LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE
-+<U1E6A>     /x81/x35/xf9/x30 LATIN CAPITAL LETTER T WITH DOT ABOVE
-+<U1E6B>     /x81/x35/xf9/x31 LATIN SMALL LETTER T WITH DOT ABOVE
-+<U1E6C>     /x81/x35/xf9/x32 LATIN CAPITAL LETTER T WITH DOT BELOW
-+<U1E6D>     /x81/x35/xf9/x33 LATIN SMALL LETTER T WITH DOT BELOW
-+<U1E6E>     /x81/x35/xf9/x34 LATIN CAPITAL LETTER T WITH LINE BELOW
-+<U1E6F>     /x81/x35/xf9/x35 LATIN SMALL LETTER T WITH LINE BELOW
-+<U1E70>     /x81/x35/xf9/x36 LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW
-+<U1E71>     /x81/x35/xf9/x37 LATIN SMALL LETTER T WITH CIRCUMFLEX BELOW
-+<U1E72>     /x81/x35/xf9/x38 LATIN CAPITAL LETTER U WITH DIAERESIS BELOW
-+<U1E73>     /x81/x35/xf9/x39 LATIN SMALL LETTER U WITH DIAERESIS BELOW
-+<U1E74>     /x81/x35/xfa/x30 LATIN CAPITAL LETTER U WITH TILDE BELOW
-+<U1E75>     /x81/x35/xfa/x31 LATIN SMALL LETTER U WITH TILDE BELOW
-+<U1E76>     /x81/x35/xfa/x32 LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW
-+<U1E77>     /x81/x35/xfa/x33 LATIN SMALL LETTER U WITH CIRCUMFLEX BELOW
-+<U1E78>     /x81/x35/xfa/x34 LATIN CAPITAL LETTER U WITH TILDE AND ACUTE
-+<U1E79>     /x81/x35/xfa/x35 LATIN SMALL LETTER U WITH TILDE AND ACUTE
-+<U1E7A>     /x81/x35/xfa/x36 LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS
-+<U1E7B>     /x81/x35/xfa/x37 LATIN SMALL LETTER U WITH MACRON AND DIAERESIS
-+<U1E7C>     /x81/x35/xfa/x38 LATIN CAPITAL LETTER V WITH TILDE
-+<U1E7D>     /x81/x35/xfa/x39 LATIN SMALL LETTER V WITH TILDE
-+<U1E7E>     /x81/x35/xfb/x30 LATIN CAPITAL LETTER V WITH DOT BELOW
-+<U1E7F>     /x81/x35/xfb/x31 LATIN SMALL LETTER V WITH DOT BELOW
-+<U1E80>     /x81/x35/xfb/x32 LATIN CAPITAL LETTER W WITH GRAVE
-+<U1E81>     /x81/x35/xfb/x33 LATIN SMALL LETTER W WITH GRAVE
-+<U1E82>     /x81/x35/xfb/x34 LATIN CAPITAL LETTER W WITH ACUTE
-+<U1E83>     /x81/x35/xfb/x35 LATIN SMALL LETTER W WITH ACUTE
-+<U1E84>     /x81/x35/xfb/x36 LATIN CAPITAL LETTER W WITH DIAERESIS
-+<U1E85>     /x81/x35/xfb/x37 LATIN SMALL LETTER W WITH DIAERESIS
-+<U1E86>     /x81/x35/xfb/x38 LATIN CAPITAL LETTER W WITH DOT ABOVE
-+<U1E87>     /x81/x35/xfb/x39 LATIN SMALL LETTER W WITH DOT ABOVE
-+<U1E88>     /x81/x35/xfc/x30 LATIN CAPITAL LETTER W WITH DOT BELOW
-+<U1E89>     /x81/x35/xfc/x31 LATIN SMALL LETTER W WITH DOT BELOW
-+<U1E8A>     /x81/x35/xfc/x32 LATIN CAPITAL LETTER X WITH DOT ABOVE
-+<U1E8B>     /x81/x35/xfc/x33 LATIN SMALL LETTER X WITH DOT ABOVE
-+<U1E8C>     /x81/x35/xfc/x34 LATIN CAPITAL LETTER X WITH DIAERESIS
-+<U1E8D>     /x81/x35/xfc/x35 LATIN SMALL LETTER X WITH DIAERESIS
-+<U1E8E>     /x81/x35/xfc/x36 LATIN CAPITAL LETTER Y WITH DOT ABOVE
-+<U1E8F>     /x81/x35/xfc/x37 LATIN SMALL LETTER Y WITH DOT ABOVE
-+<U1E90>     /x81/x35/xfc/x38 LATIN CAPITAL LETTER Z WITH CIRCUMFLEX
-+<U1E91>     /x81/x35/xfc/x39 LATIN SMALL LETTER Z WITH CIRCUMFLEX
-+<U1E92>     /x81/x35/xfd/x30 LATIN CAPITAL LETTER Z WITH DOT BELOW
-+<U1E93>     /x81/x35/xfd/x31 LATIN SMALL LETTER Z WITH DOT BELOW
-+<U1E94>     /x81/x35/xfd/x32 LATIN CAPITAL LETTER Z WITH LINE BELOW
-+<U1E95>     /x81/x35/xfd/x33 LATIN SMALL LETTER Z WITH LINE BELOW
-+<U1E96>     /x81/x35/xfd/x34 LATIN SMALL LETTER H WITH LINE BELOW
-+<U1E97>     /x81/x35/xfd/x35 LATIN SMALL LETTER T WITH DIAERESIS
-+<U1E98>     /x81/x35/xfd/x36 LATIN SMALL LETTER W WITH RING ABOVE
-+<U1E99>     /x81/x35/xfd/x37 LATIN SMALL LETTER Y WITH RING ABOVE
-+<U1E9A>     /x81/x35/xfd/x38 LATIN SMALL LETTER A WITH RIGHT HALF RING
-+<U1E9B>     /x81/x35/xfd/x39 LATIN SMALL LETTER LONG S WITH DOT ABOVE
-+<U1E9C>     /x81/x35/xfe/x30 <UNASSIGNED>
-+<U1E9D>     /x81/x35/xfe/x31 <UNASSIGNED>
-+<U1E9E>     /x81/x35/xfe/x32 <UNASSIGNED>
-+<U1E9F>     /x81/x35/xfe/x33 <UNASSIGNED>
-+<U1EA0>     /x81/x35/xfe/x34 LATIN CAPITAL LETTER A WITH DOT BELOW
-+<U1EA1>     /x81/x35/xfe/x35 LATIN SMALL LETTER A WITH DOT BELOW
-+<U1EA2>     /x81/x35/xfe/x36 LATIN CAPITAL LETTER A WITH HOOK ABOVE
-+<U1EA3>     /x81/x35/xfe/x37 LATIN SMALL LETTER A WITH HOOK ABOVE
-+<U1EA4>     /x81/x35/xfe/x38 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
-+<U1EA5>     /x81/x35/xfe/x39 LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
-+<U1EA6>     /x81/x36/x81/x30 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
-+<U1EA7>     /x81/x36/x81/x31 LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
-+<U1EA8>     /x81/x36/x81/x32 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-+<U1EA9>     /x81/x36/x81/x33 LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
-+<U1EAA>     /x81/x36/x81/x34 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
-+<U1EAB>     /x81/x36/x81/x35 LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
-+<U1EAC>     /x81/x36/x81/x36 LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-+<U1EAD>     /x81/x36/x81/x37 LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
-+<U1EAE>     /x81/x36/x81/x38 LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-+<U1EAF>     /x81/x36/x81/x39 LATIN SMALL LETTER A WITH BREVE AND ACUTE
-+<U1EB0>     /x81/x36/x82/x30 LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-+<U1EB1>     /x81/x36/x82/x31 LATIN SMALL LETTER A WITH BREVE AND GRAVE
-+<U1EB2>     /x81/x36/x82/x32 LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-+<U1EB3>     /x81/x36/x82/x33 LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-+<U1EB4>     /x81/x36/x82/x34 LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-+<U1EB5>     /x81/x36/x82/x35 LATIN SMALL LETTER A WITH BREVE AND TILDE
-+<U1EB6>     /x81/x36/x82/x36 LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
-+<U1EB7>     /x81/x36/x82/x37 LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
-+<U1EB8>     /x81/x36/x82/x38 LATIN CAPITAL LETTER E WITH DOT BELOW
-+<U1EB9>     /x81/x36/x82/x39 LATIN SMALL LETTER E WITH DOT BELOW
-+<U1EBA>     /x81/x36/x83/x30 LATIN CAPITAL LETTER E WITH HOOK ABOVE
-+<U1EBB>     /x81/x36/x83/x31 LATIN SMALL LETTER E WITH HOOK ABOVE
-+<U1EBC>     /x81/x36/x83/x32 LATIN CAPITAL LETTER E WITH TILDE
-+<U1EBD>     /x81/x36/x83/x33 LATIN SMALL LETTER E WITH TILDE
-+<U1EBE>     /x81/x36/x83/x34 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
-+<U1EBF>     /x81/x36/x83/x35 LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
-+<U1EC0>     /x81/x36/x83/x36 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
-+<U1EC1>     /x81/x36/x83/x37 LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
-+<U1EC2>     /x81/x36/x83/x38 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-+<U1EC3>     /x81/x36/x83/x39 LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
-+<U1EC4>     /x81/x36/x84/x30 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
-+<U1EC5>     /x81/x36/x84/x31 LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
-+<U1EC6>     /x81/x36/x84/x32 LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-+<U1EC7>     /x81/x36/x84/x33 LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
-+<U1EC8>     /x81/x36/x84/x34 LATIN CAPITAL LETTER I WITH HOOK ABOVE
-+<U1EC9>     /x81/x36/x84/x35 LATIN SMALL LETTER I WITH HOOK ABOVE
-+<U1ECA>     /x81/x36/x84/x36 LATIN CAPITAL LETTER I WITH DOT BELOW
-+<U1ECB>     /x81/x36/x84/x37 LATIN SMALL LETTER I WITH DOT BELOW
-+<U1ECC>     /x81/x36/x84/x38 LATIN CAPITAL LETTER O WITH DOT BELOW
-+<U1ECD>     /x81/x36/x84/x39 LATIN SMALL LETTER O WITH DOT BELOW
-+<U1ECE>     /x81/x36/x85/x30 LATIN CAPITAL LETTER O WITH HOOK ABOVE
-+<U1ECF>     /x81/x36/x85/x31 LATIN SMALL LETTER O WITH HOOK ABOVE
-+<U1ED0>     /x81/x36/x85/x32 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
-+<U1ED1>     /x81/x36/x85/x33 LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
-+<U1ED2>     /x81/x36/x85/x34 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
-+<U1ED3>     /x81/x36/x85/x35 LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
-+<U1ED4>     /x81/x36/x85/x36 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-+<U1ED5>     /x81/x36/x85/x37 LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
-+<U1ED6>     /x81/x36/x85/x38 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
-+<U1ED7>     /x81/x36/x85/x39 LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
-+<U1ED8>     /x81/x36/x86/x30 LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-+<U1ED9>     /x81/x36/x86/x31 LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
-+<U1EDA>     /x81/x36/x86/x32 LATIN CAPITAL LETTER O WITH HORN AND ACUTE
-+<U1EDB>     /x81/x36/x86/x33 LATIN SMALL LETTER O WITH HORN AND ACUTE
-+<U1EDC>     /x81/x36/x86/x34 LATIN CAPITAL LETTER O WITH HORN AND GRAVE
-+<U1EDD>     /x81/x36/x86/x35 LATIN SMALL LETTER O WITH HORN AND GRAVE
-+<U1EDE>     /x81/x36/x86/x36 LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
-+<U1EDF>     /x81/x36/x86/x37 LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
-+<U1EE0>     /x81/x36/x86/x38 LATIN CAPITAL LETTER O WITH HORN AND TILDE
-+<U1EE1>     /x81/x36/x86/x39 LATIN SMALL LETTER O WITH HORN AND TILDE
-+<U1EE2>     /x81/x36/x87/x30 LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
-+<U1EE3>     /x81/x36/x87/x31 LATIN SMALL LETTER O WITH HORN AND DOT BELOW
-+<U1EE4>     /x81/x36/x87/x32 LATIN CAPITAL LETTER U WITH DOT BELOW
-+<U1EE5>     /x81/x36/x87/x33 LATIN SMALL LETTER U WITH DOT BELOW
-+<U1EE6>     /x81/x36/x87/x34 LATIN CAPITAL LETTER U WITH HOOK ABOVE
-+<U1EE7>     /x81/x36/x87/x35 LATIN SMALL LETTER U WITH HOOK ABOVE
-+<U1EE8>     /x81/x36/x87/x36 LATIN CAPITAL LETTER U WITH HORN AND ACUTE
-+<U1EE9>     /x81/x36/x87/x37 LATIN SMALL LETTER U WITH HORN AND ACUTE
-+<U1EEA>     /x81/x36/x87/x38 LATIN CAPITAL LETTER U WITH HORN AND GRAVE
-+<U1EEB>     /x81/x36/x87/x39 LATIN SMALL LETTER U WITH HORN AND GRAVE
-+<U1EEC>     /x81/x36/x88/x30 LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
-+<U1EED>     /x81/x36/x88/x31 LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
-+<U1EEE>     /x81/x36/x88/x32 LATIN CAPITAL LETTER U WITH HORN AND TILDE
-+<U1EEF>     /x81/x36/x88/x33 LATIN SMALL LETTER U WITH HORN AND TILDE
-+<U1EF0>     /x81/x36/x88/x34 LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
-+<U1EF1>     /x81/x36/x88/x35 LATIN SMALL LETTER U WITH HORN AND DOT BELOW
-+<U1EF2>     /x81/x36/x88/x36 LATIN CAPITAL LETTER Y WITH GRAVE
-+<U1EF3>     /x81/x36/x88/x37 LATIN SMALL LETTER Y WITH GRAVE
-+<U1EF4>     /x81/x36/x88/x38 LATIN CAPITAL LETTER Y WITH DOT BELOW
-+<U1EF5>     /x81/x36/x88/x39 LATIN SMALL LETTER Y WITH DOT BELOW
-+<U1EF6>     /x81/x36/x89/x30 LATIN CAPITAL LETTER Y WITH HOOK ABOVE
-+<U1EF7>     /x81/x36/x89/x31 LATIN SMALL LETTER Y WITH HOOK ABOVE
-+<U1EF8>     /x81/x36/x89/x32 LATIN CAPITAL LETTER Y WITH TILDE
-+<U1EF9>     /x81/x36/x89/x33 LATIN SMALL LETTER Y WITH TILDE
-+<U1EFA>     /x81/x36/x89/x34 <UNASSIGNED>
-+<U1EFB>     /x81/x36/x89/x35 <UNASSIGNED>
-+<U1EFC>     /x81/x36/x89/x36 <UNASSIGNED>
-+<U1EFD>     /x81/x36/x89/x37 <UNASSIGNED>
-+<U1EFE>     /x81/x36/x89/x38 <UNASSIGNED>
-+<U1EFF>     /x81/x36/x89/x39 <UNASSIGNED>
-+<U1F00>     /x81/x36/x8a/x30 GREEK SMALL LETTER ALPHA WITH PSILI
-+<U1F01>     /x81/x36/x8a/x31 GREEK SMALL LETTER ALPHA WITH DASIA
-+<U1F02>     /x81/x36/x8a/x32 GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA
-+<U1F03>     /x81/x36/x8a/x33 GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA
-+<U1F04>     /x81/x36/x8a/x34 GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA
-+<U1F05>     /x81/x36/x8a/x35 GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA
-+<U1F06>     /x81/x36/x8a/x36 GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI
-+<U1F07>     /x81/x36/x8a/x37 GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI
-+<U1F08>     /x81/x36/x8a/x38 GREEK CAPITAL LETTER ALPHA WITH PSILI
-+<U1F09>     /x81/x36/x8a/x39 GREEK CAPITAL LETTER ALPHA WITH DASIA
-+<U1F0A>     /x81/x36/x8b/x30 GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA
-+<U1F0B>     /x81/x36/x8b/x31 GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA
-+<U1F0C>     /x81/x36/x8b/x32 GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA
-+<U1F0D>     /x81/x36/x8b/x33 GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA
-+<U1F0E>     /x81/x36/x8b/x34 GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI
-+<U1F0F>     /x81/x36/x8b/x35 GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI
-+<U1F10>     /x81/x36/x8b/x36 GREEK SMALL LETTER EPSILON WITH PSILI
-+<U1F11>     /x81/x36/x8b/x37 GREEK SMALL LETTER EPSILON WITH DASIA
-+<U1F12>     /x81/x36/x8b/x38 GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA
-+<U1F13>     /x81/x36/x8b/x39 GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA
-+<U1F14>     /x81/x36/x8c/x30 GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA
-+<U1F15>     /x81/x36/x8c/x31 GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA
-+<U1F16>     /x81/x36/x8c/x32 <UNASSIGNED>
-+<U1F17>     /x81/x36/x8c/x33 <UNASSIGNED>
-+<U1F18>     /x81/x36/x8c/x34 GREEK CAPITAL LETTER EPSILON WITH PSILI
-+<U1F19>     /x81/x36/x8c/x35 GREEK CAPITAL LETTER EPSILON WITH DASIA
-+<U1F1A>     /x81/x36/x8c/x36 GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA
-+<U1F1B>     /x81/x36/x8c/x37 GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA
-+<U1F1C>     /x81/x36/x8c/x38 GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA
-+<U1F1D>     /x81/x36/x8c/x39 GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA
-+<U1F1E>     /x81/x36/x8d/x30 <UNASSIGNED>
-+<U1F1F>     /x81/x36/x8d/x31 <UNASSIGNED>
-+<U1F20>     /x81/x36/x8d/x32 GREEK SMALL LETTER ETA WITH PSILI
-+<U1F21>     /x81/x36/x8d/x33 GREEK SMALL LETTER ETA WITH DASIA
-+<U1F22>     /x81/x36/x8d/x34 GREEK SMALL LETTER ETA WITH PSILI AND VARIA
-+<U1F23>     /x81/x36/x8d/x35 GREEK SMALL LETTER ETA WITH DASIA AND VARIA
-+<U1F24>     /x81/x36/x8d/x36 GREEK SMALL LETTER ETA WITH PSILI AND OXIA
-+<U1F25>     /x81/x36/x8d/x37 GREEK SMALL LETTER ETA WITH DASIA AND OXIA
-+<U1F26>     /x81/x36/x8d/x38 GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI
-+<U1F27>     /x81/x36/x8d/x39 GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI
-+<U1F28>     /x81/x36/x8e/x30 GREEK CAPITAL LETTER ETA WITH PSILI
-+<U1F29>     /x81/x36/x8e/x31 GREEK CAPITAL LETTER ETA WITH DASIA
-+<U1F2A>     /x81/x36/x8e/x32 GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA
-+<U1F2B>     /x81/x36/x8e/x33 GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA
-+<U1F2C>     /x81/x36/x8e/x34 GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA
-+<U1F2D>     /x81/x36/x8e/x35 GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA
-+<U1F2E>     /x81/x36/x8e/x36 GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI
-+<U1F2F>     /x81/x36/x8e/x37 GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI
-+<U1F30>     /x81/x36/x8e/x38 GREEK SMALL LETTER IOTA WITH PSILI
-+<U1F31>     /x81/x36/x8e/x39 GREEK SMALL LETTER IOTA WITH DASIA
-+<U1F32>     /x81/x36/x8f/x30 GREEK SMALL LETTER IOTA WITH PSILI AND VARIA
-+<U1F33>     /x81/x36/x8f/x31 GREEK SMALL LETTER IOTA WITH DASIA AND VARIA
-+<U1F34>     /x81/x36/x8f/x32 GREEK SMALL LETTER IOTA WITH PSILI AND OXIA
-+<U1F35>     /x81/x36/x8f/x33 GREEK SMALL LETTER IOTA WITH DASIA AND OXIA
-+<U1F36>     /x81/x36/x8f/x34 GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI
-+<U1F37>     /x81/x36/x8f/x35 GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI
-+<U1F38>     /x81/x36/x8f/x36 GREEK CAPITAL LETTER IOTA WITH PSILI
-+<U1F39>     /x81/x36/x8f/x37 GREEK CAPITAL LETTER IOTA WITH DASIA
-+<U1F3A>     /x81/x36/x8f/x38 GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA
-+<U1F3B>     /x81/x36/x8f/x39 GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA
-+<U1F3C>     /x81/x36/x90/x30 GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA
-+<U1F3D>     /x81/x36/x90/x31 GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA
-+<U1F3E>     /x81/x36/x90/x32 GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI
-+<U1F3F>     /x81/x36/x90/x33 GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI
-+<U1F40>     /x81/x36/x90/x34 GREEK SMALL LETTER OMICRON WITH PSILI
-+<U1F41>     /x81/x36/x90/x35 GREEK SMALL LETTER OMICRON WITH DASIA
-+<U1F42>     /x81/x36/x90/x36 GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA
-+<U1F43>     /x81/x36/x90/x37 GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA
-+<U1F44>     /x81/x36/x90/x38 GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA
-+<U1F45>     /x81/x36/x90/x39 GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA
-+<U1F46>     /x81/x36/x91/x30 <UNASSIGNED>
-+<U1F47>     /x81/x36/x91/x31 <UNASSIGNED>
-+<U1F48>     /x81/x36/x91/x32 GREEK CAPITAL LETTER OMICRON WITH PSILI
-+<U1F49>     /x81/x36/x91/x33 GREEK CAPITAL LETTER OMICRON WITH DASIA
-+<U1F4A>     /x81/x36/x91/x34 GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA
-+<U1F4B>     /x81/x36/x91/x35 GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA
-+<U1F4C>     /x81/x36/x91/x36 GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA
-+<U1F4D>     /x81/x36/x91/x37 GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA
-+<U1F4E>     /x81/x36/x91/x38 <UNASSIGNED>
-+<U1F4F>     /x81/x36/x91/x39 <UNASSIGNED>
-+<U1F50>     /x81/x36/x92/x30 GREEK SMALL LETTER UPSILON WITH PSILI
-+<U1F51>     /x81/x36/x92/x31 GREEK SMALL LETTER UPSILON WITH DASIA
-+<U1F52>     /x81/x36/x92/x32 GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA
-+<U1F53>     /x81/x36/x92/x33 GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA
-+<U1F54>     /x81/x36/x92/x34 GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA
-+<U1F55>     /x81/x36/x92/x35 GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA
-+<U1F56>     /x81/x36/x92/x36 GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI
-+<U1F57>     /x81/x36/x92/x37 GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI
-+<U1F58>     /x81/x36/x92/x38 <UNASSIGNED>
-+<U1F59>     /x81/x36/x92/x39 GREEK CAPITAL LETTER UPSILON WITH DASIA
-+<U1F5A>     /x81/x36/x93/x30 <UNASSIGNED>
-+<U1F5B>     /x81/x36/x93/x31 GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA
-+<U1F5C>     /x81/x36/x93/x32 <UNASSIGNED>
-+<U1F5D>     /x81/x36/x93/x33 GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA
-+<U1F5E>     /x81/x36/x93/x34 <UNASSIGNED>
-+<U1F5F>     /x81/x36/x93/x35 GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI
-+<U1F60>     /x81/x36/x93/x36 GREEK SMALL LETTER OMEGA WITH PSILI
-+<U1F61>     /x81/x36/x93/x37 GREEK SMALL LETTER OMEGA WITH DASIA
-+<U1F62>     /x81/x36/x93/x38 GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA
-+<U1F63>     /x81/x36/x93/x39 GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA
-+<U1F64>     /x81/x36/x94/x30 GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA
-+<U1F65>     /x81/x36/x94/x31 GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA
-+<U1F66>     /x81/x36/x94/x32 GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI
-+<U1F67>     /x81/x36/x94/x33 GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI
-+<U1F68>     /x81/x36/x94/x34 GREEK CAPITAL LETTER OMEGA WITH PSILI
-+<U1F69>     /x81/x36/x94/x35 GREEK CAPITAL LETTER OMEGA WITH DASIA
-+<U1F6A>     /x81/x36/x94/x36 GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA
-+<U1F6B>     /x81/x36/x94/x37 GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA
-+<U1F6C>     /x81/x36/x94/x38 GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA
-+<U1F6D>     /x81/x36/x94/x39 GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA
-+<U1F6E>     /x81/x36/x95/x30 GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI
-+<U1F6F>     /x81/x36/x95/x31 GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI
-+<U1F70>     /x81/x36/x95/x32 GREEK SMALL LETTER ALPHA WITH VARIA
-+<U1F71>     /x81/x36/x95/x33 GREEK SMALL LETTER ALPHA WITH OXIA
-+<U1F72>     /x81/x36/x95/x34 GREEK SMALL LETTER EPSILON WITH VARIA
-+<U1F73>     /x81/x36/x95/x35 GREEK SMALL LETTER EPSILON WITH OXIA
-+<U1F74>     /x81/x36/x95/x36 GREEK SMALL LETTER ETA WITH VARIA
-+<U1F75>     /x81/x36/x95/x37 GREEK SMALL LETTER ETA WITH OXIA
-+<U1F76>     /x81/x36/x95/x38 GREEK SMALL LETTER IOTA WITH VARIA
-+<U1F77>     /x81/x36/x95/x39 GREEK SMALL LETTER IOTA WITH OXIA
-+<U1F78>     /x81/x36/x96/x30 GREEK SMALL LETTER OMICRON WITH VARIA
-+<U1F79>     /x81/x36/x96/x31 GREEK SMALL LETTER OMICRON WITH OXIA
-+<U1F7A>     /x81/x36/x96/x32 GREEK SMALL LETTER UPSILON WITH VARIA
-+<U1F7B>     /x81/x36/x96/x33 GREEK SMALL LETTER UPSILON WITH OXIA
-+<U1F7C>     /x81/x36/x96/x34 GREEK SMALL LETTER OMEGA WITH VARIA
-+<U1F7D>     /x81/x36/x96/x35 GREEK SMALL LETTER OMEGA WITH OXIA
-+<U1F7E>     /x81/x36/x96/x36 <UNASSIGNED>
-+<U1F7F>     /x81/x36/x96/x37 <UNASSIGNED>
-+<U1F80>     /x81/x36/x96/x38 GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI
-+<U1F81>     /x81/x36/x96/x39 GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI
-+<U1F82>     /x81/x36/x97/x30 GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-+<U1F83>     /x81/x36/x97/x31 GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-+<U1F84>     /x81/x36/x97/x32 GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-+<U1F85>     /x81/x36/x97/x33 GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-+<U1F86>     /x81/x36/x97/x34 GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-+<U1F87>     /x81/x36/x97/x35 GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-+<U1F88>     /x81/x36/x97/x36 GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI
-+<U1F89>     /x81/x36/x97/x37 GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI
-+<U1F8A>     /x81/x36/x97/x38 GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-+<U1F8B>     /x81/x36/x97/x39 GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-+<U1F8C>     /x81/x36/x98/x30 GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-+<U1F8D>     /x81/x36/x98/x31 GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-+<U1F8E>     /x81/x36/x98/x32 GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-+<U1F8F>     /x81/x36/x98/x33 GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-+<U1F90>     /x81/x36/x98/x34 GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI
-+<U1F91>     /x81/x36/x98/x35 GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI
-+<U1F92>     /x81/x36/x98/x36 GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-+<U1F93>     /x81/x36/x98/x37 GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-+<U1F94>     /x81/x36/x98/x38 GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-+<U1F95>     /x81/x36/x98/x39 GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-+<U1F96>     /x81/x36/x99/x30 GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-+<U1F97>     /x81/x36/x99/x31 GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-+<U1F98>     /x81/x36/x99/x32 GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI
-+<U1F99>     /x81/x36/x99/x33 GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI
-+<U1F9A>     /x81/x36/x99/x34 GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-+<U1F9B>     /x81/x36/x99/x35 GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-+<U1F9C>     /x81/x36/x99/x36 GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-+<U1F9D>     /x81/x36/x99/x37 GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-+<U1F9E>     /x81/x36/x99/x38 GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-+<U1F9F>     /x81/x36/x99/x39 GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-+<U1FA0>     /x81/x36/x9a/x30 GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI
-+<U1FA1>     /x81/x36/x9a/x31 GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI
-+<U1FA2>     /x81/x36/x9a/x32 GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI
-+<U1FA3>     /x81/x36/x9a/x33 GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI
-+<U1FA4>     /x81/x36/x9a/x34 GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI
-+<U1FA5>     /x81/x36/x9a/x35 GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI
-+<U1FA6>     /x81/x36/x9a/x36 GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI
-+<U1FA7>     /x81/x36/x9a/x37 GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI
-+<U1FA8>     /x81/x36/x9a/x38 GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI
-+<U1FA9>     /x81/x36/x9a/x39 GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI
-+<U1FAA>     /x81/x36/x9b/x30 GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI
-+<U1FAB>     /x81/x36/x9b/x31 GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI
-+<U1FAC>     /x81/x36/x9b/x32 GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI
-+<U1FAD>     /x81/x36/x9b/x33 GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI
-+<U1FAE>     /x81/x36/x9b/x34 GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI
-+<U1FAF>     /x81/x36/x9b/x35 GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI
-+<U1FB0>     /x81/x36/x9b/x36 GREEK SMALL LETTER ALPHA WITH VRACHY
-+<U1FB1>     /x81/x36/x9b/x37 GREEK SMALL LETTER ALPHA WITH MACRON
-+<U1FB2>     /x81/x36/x9b/x38 GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI
-+<U1FB3>     /x81/x36/x9b/x39 GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI
-+<U1FB4>     /x81/x36/x9c/x30 GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI
-+<U1FB5>     /x81/x36/x9c/x31 <UNASSIGNED>
-+<U1FB6>     /x81/x36/x9c/x32 GREEK SMALL LETTER ALPHA WITH PERISPOMENI
-+<U1FB7>     /x81/x36/x9c/x33 GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI
-+<U1FB8>     /x81/x36/x9c/x34 GREEK CAPITAL LETTER ALPHA WITH VRACHY
-+<U1FB9>     /x81/x36/x9c/x35 GREEK CAPITAL LETTER ALPHA WITH MACRON
-+<U1FBA>     /x81/x36/x9c/x36 GREEK CAPITAL LETTER ALPHA WITH VARIA
-+<U1FBB>     /x81/x36/x9c/x37 GREEK CAPITAL LETTER ALPHA WITH OXIA
-+<U1FBC>     /x81/x36/x9c/x38 GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI
-+<U1FBD>     /x81/x36/x9c/x39 GREEK KORONIS
-+<U1FBE>     /x81/x36/x9d/x30 GREEK PROSGEGRAMMENI
-+<U1FBF>     /x81/x36/x9d/x31 GREEK PSILI
-+<U1FC0>     /x81/x36/x9d/x32 GREEK PERISPOMENI
-+<U1FC1>     /x81/x36/x9d/x33 GREEK DIALYTIKA AND PERISPOMENI
-+<U1FC2>     /x81/x36/x9d/x34 GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI
-+<U1FC3>     /x81/x36/x9d/x35 GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI
-+<U1FC4>     /x81/x36/x9d/x36 GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI
-+<U1FC5>     /x81/x36/x9d/x37 <UNASSIGNED>
-+<U1FC6>     /x81/x36/x9d/x38 GREEK SMALL LETTER ETA WITH PERISPOMENI
-+<U1FC7>     /x81/x36/x9d/x39 GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI
-+<U1FC8>     /x81/x36/x9e/x30 GREEK CAPITAL LETTER EPSILON WITH VARIA
-+<U1FC9>     /x81/x36/x9e/x31 GREEK CAPITAL LETTER EPSILON WITH OXIA
-+<U1FCA>     /x81/x36/x9e/x32 GREEK CAPITAL LETTER ETA WITH VARIA
-+<U1FCB>     /x81/x36/x9e/x33 GREEK CAPITAL LETTER ETA WITH OXIA
-+<U1FCC>     /x81/x36/x9e/x34 GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI
-+<U1FCD>     /x81/x36/x9e/x35 GREEK PSILI AND VARIA
-+<U1FCE>     /x81/x36/x9e/x36 GREEK PSILI AND OXIA
-+<U1FCF>     /x81/x36/x9e/x37 GREEK PSILI AND PERISPOMENI
-+<U1FD0>     /x81/x36/x9e/x38 GREEK SMALL LETTER IOTA WITH VRACHY
-+<U1FD1>     /x81/x36/x9e/x39 GREEK SMALL LETTER IOTA WITH MACRON
-+<U1FD2>     /x81/x36/x9f/x30 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA
-+<U1FD3>     /x81/x36/x9f/x31 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA
-+<U1FD4>     /x81/x36/x9f/x32 <UNASSIGNED>
-+<U1FD5>     /x81/x36/x9f/x33 <UNASSIGNED>
-+<U1FD6>     /x81/x36/x9f/x34 GREEK SMALL LETTER IOTA WITH PERISPOMENI
-+<U1FD7>     /x81/x36/x9f/x35 GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI
-+<U1FD8>     /x81/x36/x9f/x36 GREEK CAPITAL LETTER IOTA WITH VRACHY
-+<U1FD9>     /x81/x36/x9f/x37 GREEK CAPITAL LETTER IOTA WITH MACRON
-+<U1FDA>     /x81/x36/x9f/x38 GREEK CAPITAL LETTER IOTA WITH VARIA
-+<U1FDB>     /x81/x36/x9f/x39 GREEK CAPITAL LETTER IOTA WITH OXIA
-+<U1FDC>     /x81/x36/xa0/x30 <UNASSIGNED>
-+<U1FDD>     /x81/x36/xa0/x31 GREEK DASIA AND VARIA
-+<U1FDE>     /x81/x36/xa0/x32 GREEK DASIA AND OXIA
-+<U1FDF>     /x81/x36/xa0/x33 GREEK DASIA AND PERISPOMENI
-+<U1FE0>     /x81/x36/xa0/x34 GREEK SMALL LETTER UPSILON WITH VRACHY
-+<U1FE1>     /x81/x36/xa0/x35 GREEK SMALL LETTER UPSILON WITH MACRON
-+<U1FE2>     /x81/x36/xa0/x36 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA
-+<U1FE3>     /x81/x36/xa0/x37 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA
-+<U1FE4>     /x81/x36/xa0/x38 GREEK SMALL LETTER RHO WITH PSILI
-+<U1FE5>     /x81/x36/xa0/x39 GREEK SMALL LETTER RHO WITH DASIA
-+<U1FE6>     /x81/x36/xa1/x30 GREEK SMALL LETTER UPSILON WITH PERISPOMENI
-+<U1FE7>     /x81/x36/xa1/x31 GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI
-+<U1FE8>     /x81/x36/xa1/x32 GREEK CAPITAL LETTER UPSILON WITH VRACHY
-+<U1FE9>     /x81/x36/xa1/x33 GREEK CAPITAL LETTER UPSILON WITH MACRON
-+<U1FEA>     /x81/x36/xa1/x34 GREEK CAPITAL LETTER UPSILON WITH VARIA
-+<U1FEB>     /x81/x36/xa1/x35 GREEK CAPITAL LETTER UPSILON WITH OXIA
-+<U1FEC>     /x81/x36/xa1/x36 GREEK CAPITAL LETTER RHO WITH DASIA
-+<U1FED>     /x81/x36/xa1/x37 GREEK DIALYTIKA AND VARIA
-+<U1FEE>     /x81/x36/xa1/x38 GREEK DIALYTIKA AND OXIA
-+<U1FEF>     /x81/x36/xa1/x39 GREEK VARIA
-+<U1FF0>     /x81/x36/xa2/x30 <UNASSIGNED>
-+<U1FF1>     /x81/x36/xa2/x31 <UNASSIGNED>
-+<U1FF2>     /x81/x36/xa2/x32 GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI
-+<U1FF3>     /x81/x36/xa2/x33 GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI
-+<U1FF4>     /x81/x36/xa2/x34 GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI
-+<U1FF5>     /x81/x36/xa2/x35 <UNASSIGNED>
-+<U1FF6>     /x81/x36/xa2/x36 GREEK SMALL LETTER OMEGA WITH PERISPOMENI
-+<U1FF7>     /x81/x36/xa2/x37 GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI
-+<U1FF8>     /x81/x36/xa2/x38 GREEK CAPITAL LETTER OMICRON WITH VARIA
-+<U1FF9>     /x81/x36/xa2/x39 GREEK CAPITAL LETTER OMICRON WITH OXIA
-+<U1FFA>     /x81/x36/xa3/x30 GREEK CAPITAL LETTER OMEGA WITH VARIA
-+<U1FFB>     /x81/x36/xa3/x31 GREEK CAPITAL LETTER OMEGA WITH OXIA
-+<U1FFC>     /x81/x36/xa3/x32 GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI
-+<U1FFD>     /x81/x36/xa3/x33 GREEK OXIA
-+<U1FFE>     /x81/x36/xa3/x34 GREEK DASIA
-+<U1FFF>     /x81/x36/xa3/x35 <UNASSIGNED>
-+<U2000>     /x81/x36/xa3/x36 EN QUAD
-+<U2001>     /x81/x36/xa3/x37 EM QUAD
-+<U2002>     /x81/x36/xa3/x38 EN SPACE
-+<U2003>     /x81/x36/xa3/x39 EM SPACE
-+<U2004>     /x81/x36/xa4/x30 THREE-PER-EM SPACE
-+<U2005>     /x81/x36/xa4/x31 FOUR-PER-EM SPACE
-+<U2006>     /x81/x36/xa4/x32 SIX-PER-EM SPACE
-+<U2007>     /x81/x36/xa4/x33 FIGURE SPACE
-+<U2008>     /x81/x36/xa4/x34 PUNCTUATION SPACE
-+<U2009>     /x81/x36/xa4/x35 THIN SPACE
-+<U200A>     /x81/x36/xa4/x36 HAIR SPACE
-+<U200B>     /x81/x36/xa4/x37 ZERO WIDTH SPACE
-+<U200C>     /x81/x36/xa4/x38 ZERO WIDTH NON-JOINER
-+<U200D>     /x81/x36/xa4/x39 ZERO WIDTH JOINER
-+<U200E>     /x81/x36/xa5/x30 LEFT-TO-RIGHT MARK
-+<U200F>     /x81/x36/xa5/x31 RIGHT-TO-LEFT MARK
- <U2010>     /xa9/x5c         HYPHEN
- <U2011>     /x81/x36/xa5/x32 NON-BREAKING HYPHEN
- <U2012>     /x81/x36/xa5/x33 FIGURE DASH
-@@ -1186,6 +8298,11 @@ CHARMAP
- <U2062>     /x81/x36/xab/x38 INVISIBLE TIMES
- <U2063>     /x81/x36/xab/x39 INVISIBLE SEPARATOR
- <U2064>     /x81/x36/xac/x30 INVISIBLE PLUS
-+<U2065>     /x81/x36/xac/x31 <UNASSIGNED>
-+<U2066>     /x81/x36/xac/x32 <UNASSIGNED>
-+<U2067>     /x81/x36/xac/x33 <UNASSIGNED>
-+<U2068>     /x81/x36/xac/x34 <UNASSIGNED>
-+<U2069>     /x81/x36/xac/x35 <UNASSIGNED>
- <U206A>     /x81/x36/xac/x36 INHIBIT SYMMETRIC SWAPPING
- <U206B>     /x81/x36/xac/x37 ACTIVATE SYMMETRIC SWAPPING
- <U206C>     /x81/x36/xac/x38 INHIBIT ARABIC FORM SHAPING
-@@ -1194,6 +8311,8 @@ CHARMAP
- <U206F>     /x81/x36/xad/x31 NOMINAL DIGIT SHAPES
- <U2070>     /x81/x36/xad/x32 SUPERSCRIPT ZERO
- <U2071>     /x81/x36/xad/x33 SUPERSCRIPT LATIN SMALL LETTER I
-+<U2072>     /x81/x36/xad/x34 <UNASSIGNED>
-+<U2073>     /x81/x36/xad/x35 <UNASSIGNED>
- <U2074>     /x81/x36/xad/x36 SUPERSCRIPT FOUR
- <U2075>     /x81/x36/xad/x37 SUPERSCRIPT FIVE
- <U2076>     /x81/x36/xad/x38 SUPERSCRIPT SIX
-@@ -1221,6 +8340,7 @@ CHARMAP
- <U208C>     /x81/x36/xb0/x30 SUBSCRIPT EQUALS SIGN
- <U208D>     /x81/x36/xb0/x31 SUBSCRIPT LEFT PARENTHESIS
- <U208E>     /x81/x36/xb0/x32 SUBSCRIPT RIGHT PARENTHESIS
-+<U208F>     /x81/x36/xb0/x33 <UNASSIGNED>
- <U2090>     /x81/x36/xb0/x34 LATIN SUBSCRIPT SMALL LETTER A
- <U2091>     /x81/x36/xb0/x35 LATIN SUBSCRIPT SMALL LETTER E
- <U2092>     /x81/x36/xb0/x36 LATIN SUBSCRIPT SMALL LETTER O
-@@ -1234,6 +8354,9 @@ CHARMAP
- <U209A>     /x81/x36/xb1/x34 LATIN SUBSCRIPT SMALL LETTER P
- <U209B>     /x81/x36/xb1/x35 LATIN SUBSCRIPT SMALL LETTER S
- <U209C>     /x81/x36/xb1/x36 LATIN SUBSCRIPT SMALL LETTER T
-+<U209D>     /x81/x36/xb1/x37 <UNASSIGNED>
-+<U209E>     /x81/x36/xb1/x38 <UNASSIGNED>
-+<U209F>     /x81/x36/xb1/x39 <UNASSIGNED>
- <U20A0>     /x81/x36/xb2/x30 EURO-CURRENCY SIGN
- <U20A1>     /x81/x36/xb2/x31 COLON SIGN
- <U20A2>     /x81/x36/xb2/x32 CRUZEIRO SIGN
-@@ -1260,6 +8383,28 @@ CHARMAP
- <U20B7>     /x81/x36/xb4/x32 SPESMILO SIGN
- <U20B8>     /x81/x36/xb4/x33 TENGE SIGN
- <U20B9>     /x81/x36/xb4/x34 INDIAN RUPEE SIGN
-+<U20BA>     /x81/x36/xb4/x35 <UNASSIGNED>
-+<U20BB>     /x81/x36/xb4/x36 <UNASSIGNED>
-+<U20BC>     /x81/x36/xb4/x37 <UNASSIGNED>
-+<U20BD>     /x81/x36/xb4/x38 <UNASSIGNED>
-+<U20BE>     /x81/x36/xb4/x39 <UNASSIGNED>
-+<U20BF>     /x81/x36/xb5/x30 <UNASSIGNED>
-+<U20C0>     /x81/x36/xb5/x31 <UNASSIGNED>
-+<U20C1>     /x81/x36/xb5/x32 <UNASSIGNED>
-+<U20C2>     /x81/x36/xb5/x33 <UNASSIGNED>
-+<U20C3>     /x81/x36/xb5/x34 <UNASSIGNED>
-+<U20C4>     /x81/x36/xb5/x35 <UNASSIGNED>
-+<U20C5>     /x81/x36/xb5/x36 <UNASSIGNED>
-+<U20C6>     /x81/x36/xb5/x37 <UNASSIGNED>
-+<U20C7>     /x81/x36/xb5/x38 <UNASSIGNED>
-+<U20C8>     /x81/x36/xb5/x39 <UNASSIGNED>
-+<U20C9>     /x81/x36/xb6/x30 <UNASSIGNED>
-+<U20CA>     /x81/x36/xb6/x31 <UNASSIGNED>
-+<U20CB>     /x81/x36/xb6/x32 <UNASSIGNED>
-+<U20CC>     /x81/x36/xb6/x33 <UNASSIGNED>
-+<U20CD>     /x81/x36/xb6/x34 <UNASSIGNED>
-+<U20CE>     /x81/x36/xb6/x35 <UNASSIGNED>
-+<U20CF>     /x81/x36/xb6/x36 <UNASSIGNED>
- <U20D0>     /x81/x36/xb6/x37 COMBINING LEFT HARPOON ABOVE
- <U20D1>     /x81/x36/xb6/x38 COMBINING RIGHT HARPOON ABOVE
- <U20D2>     /x81/x36/xb6/x39 COMBINING LONG VERTICAL LINE OVERLAY
-@@ -1293,6 +8438,21 @@ CHARMAP
- <U20EE>     /x81/x36/xb9/x37 COMBINING LEFT ARROW BELOW
- <U20EF>     /x81/x36/xb9/x38 COMBINING RIGHT ARROW BELOW
- <U20F0>     /x81/x36/xb9/x39 COMBINING ASTERISK ABOVE
-+<U20F1>     /x81/x36/xba/x30 <UNASSIGNED>
-+<U20F2>     /x81/x36/xba/x31 <UNASSIGNED>
-+<U20F3>     /x81/x36/xba/x32 <UNASSIGNED>
-+<U20F4>     /x81/x36/xba/x33 <UNASSIGNED>
-+<U20F5>     /x81/x36/xba/x34 <UNASSIGNED>
-+<U20F6>     /x81/x36/xba/x35 <UNASSIGNED>
-+<U20F7>     /x81/x36/xba/x36 <UNASSIGNED>
-+<U20F8>     /x81/x36/xba/x37 <UNASSIGNED>
-+<U20F9>     /x81/x36/xba/x38 <UNASSIGNED>
-+<U20FA>     /x81/x36/xba/x39 <UNASSIGNED>
-+<U20FB>     /x81/x36/xbb/x30 <UNASSIGNED>
-+<U20FC>     /x81/x36/xbb/x31 <UNASSIGNED>
-+<U20FD>     /x81/x36/xbb/x32 <UNASSIGNED>
-+<U20FE>     /x81/x36/xbb/x33 <UNASSIGNED>
-+<U20FF>     /x81/x36/xbb/x34 <UNASSIGNED>
- <U2100>     /x81/x36/xbb/x35 ACCOUNT OF
- <U2101>     /x81/x36/xbb/x36 ADDRESSED TO THE SUBJECT
- <U2102>     /x81/x36/xbb/x37 DOUBLE-STRUCK CAPITAL C
-@@ -1431,6 +8591,12 @@ CHARMAP
- <U2187>     /x81/x36/xc6/x33 ROMAN NUMERAL FIFTY THOUSAND
- <U2188>     /x81/x36/xc6/x34 ROMAN NUMERAL ONE HUNDRED THOUSAND
- <U2189>     /x81/x36/xc6/x35 VULGAR FRACTION ZERO THIRDS
-+<U218A>     /x81/x36/xc6/x36 <UNASSIGNED>
-+<U218B>     /x81/x36/xc6/x37 <UNASSIGNED>
-+<U218C>     /x81/x36/xc6/x38 <UNASSIGNED>
-+<U218D>     /x81/x36/xc6/x39 <UNASSIGNED>
-+<U218E>     /x81/x36/xc7/x30 <UNASSIGNED>
-+<U218F>     /x81/x36/xc7/x31 <UNASSIGNED>
- <U2190>     /xa1/xfb         LEFTWARDS ARROW
- <U2191>     /xa1/xfc         UPWARDS ARROW
- <U2192>     /xa1/xfa         RIGHTWARDS ARROW
-@@ -2043,6 +9209,18 @@ CHARMAP
- <U23F1>     /x81/x37/x81/x35 STOPWATCH
- <U23F2>     /x81/x37/x81/x36 TIMER CLOCK
- <U23F3>     /x81/x37/x81/x37 HOURGLASS WITH FLOWING SAND
-+<U23F4>     /x81/x37/x81/x38 <UNASSIGNED>
-+<U23F5>     /x81/x37/x81/x39 <UNASSIGNED>
-+<U23F6>     /x81/x37/x82/x30 <UNASSIGNED>
-+<U23F7>     /x81/x37/x82/x31 <UNASSIGNED>
-+<U23F8>     /x81/x37/x82/x32 <UNASSIGNED>
-+<U23F9>     /x81/x37/x82/x33 <UNASSIGNED>
-+<U23FA>     /x81/x37/x82/x34 <UNASSIGNED>
-+<U23FB>     /x81/x37/x82/x35 <UNASSIGNED>
-+<U23FC>     /x81/x37/x82/x36 <UNASSIGNED>
-+<U23FD>     /x81/x37/x82/x37 <UNASSIGNED>
-+<U23FE>     /x81/x37/x82/x38 <UNASSIGNED>
-+<U23FF>     /x81/x37/x82/x39 <UNASSIGNED>
- <U2400>     /x81/x37/x83/x30 SYMBOL FOR NULL
- <U2401>     /x81/x37/x83/x31 SYMBOL FOR START OF HEADING
- <U2402>     /x81/x37/x83/x32 SYMBOL FOR START OF TEXT
-@@ -2082,6 +9260,31 @@ CHARMAP
- <U2424>     /x81/x37/x86/x36 SYMBOL FOR NEWLINE
- <U2425>     /x81/x37/x86/x37 SYMBOL FOR DELETE FORM TWO
- <U2426>     /x81/x37/x86/x38 SYMBOL FOR SUBSTITUTE FORM TWO
-+<U2427>     /x81/x37/x86/x39 <UNASSIGNED>
-+<U2428>     /x81/x37/x87/x30 <UNASSIGNED>
-+<U2429>     /x81/x37/x87/x31 <UNASSIGNED>
-+<U242A>     /x81/x37/x87/x32 <UNASSIGNED>
-+<U242B>     /x81/x37/x87/x33 <UNASSIGNED>
-+<U242C>     /x81/x37/x87/x34 <UNASSIGNED>
-+<U242D>     /x81/x37/x87/x35 <UNASSIGNED>
-+<U242E>     /x81/x37/x87/x36 <UNASSIGNED>
-+<U242F>     /x81/x37/x87/x37 <UNASSIGNED>
-+<U2430>     /x81/x37/x87/x38 <UNASSIGNED>
-+<U2431>     /x81/x37/x87/x39 <UNASSIGNED>
-+<U2432>     /x81/x37/x88/x30 <UNASSIGNED>
-+<U2433>     /x81/x37/x88/x31 <UNASSIGNED>
-+<U2434>     /x81/x37/x88/x32 <UNASSIGNED>
-+<U2435>     /x81/x37/x88/x33 <UNASSIGNED>
-+<U2436>     /x81/x37/x88/x34 <UNASSIGNED>
-+<U2437>     /x81/x37/x88/x35 <UNASSIGNED>
-+<U2438>     /x81/x37/x88/x36 <UNASSIGNED>
-+<U2439>     /x81/x37/x88/x37 <UNASSIGNED>
-+<U243A>     /x81/x37/x88/x38 <UNASSIGNED>
-+<U243B>     /x81/x37/x88/x39 <UNASSIGNED>
-+<U243C>     /x81/x37/x89/x30 <UNASSIGNED>
-+<U243D>     /x81/x37/x89/x31 <UNASSIGNED>
-+<U243E>     /x81/x37/x89/x32 <UNASSIGNED>
-+<U243F>     /x81/x37/x89/x33 <UNASSIGNED>
- <U2440>     /x81/x37/x89/x34 OCR HOOK
- <U2441>     /x81/x37/x89/x35 OCR CHAIR
- <U2442>     /x81/x37/x89/x36 OCR FORK
-@@ -2093,6 +9296,27 @@ CHARMAP
- <U2448>     /x81/x37/x8a/x32 OCR DASH
- <U2449>     /x81/x37/x8a/x33 OCR CUSTOMER ACCOUNT NUMBER
- <U244A>     /x81/x37/x8a/x34 OCR DOUBLE BACKSLASH
-+<U244B>     /x81/x37/x8a/x35 <UNASSIGNED>
-+<U244C>     /x81/x37/x8a/x36 <UNASSIGNED>
-+<U244D>     /x81/x37/x8a/x37 <UNASSIGNED>
-+<U244E>     /x81/x37/x8a/x38 <UNASSIGNED>
-+<U244F>     /x81/x37/x8a/x39 <UNASSIGNED>
-+<U2450>     /x81/x37/x8b/x30 <UNASSIGNED>
-+<U2451>     /x81/x37/x8b/x31 <UNASSIGNED>
-+<U2452>     /x81/x37/x8b/x32 <UNASSIGNED>
-+<U2453>     /x81/x37/x8b/x33 <UNASSIGNED>
-+<U2454>     /x81/x37/x8b/x34 <UNASSIGNED>
-+<U2455>     /x81/x37/x8b/x35 <UNASSIGNED>
-+<U2456>     /x81/x37/x8b/x36 <UNASSIGNED>
-+<U2457>     /x81/x37/x8b/x37 <UNASSIGNED>
-+<U2458>     /x81/x37/x8b/x38 <UNASSIGNED>
-+<U2459>     /x81/x37/x8b/x39 <UNASSIGNED>
-+<U245A>     /x81/x37/x8c/x30 <UNASSIGNED>
-+<U245B>     /x81/x37/x8c/x31 <UNASSIGNED>
-+<U245C>     /x81/x37/x8c/x32 <UNASSIGNED>
-+<U245D>     /x81/x37/x8c/x33 <UNASSIGNED>
-+<U245E>     /x81/x37/x8c/x34 <UNASSIGNED>
-+<U245F>     /x81/x37/x8c/x35 <UNASSIGNED>
- <U2460>     /xa2/xd9         CIRCLED DIGIT ONE
- <U2461>     /xa2/xda         CIRCLED DIGIT TWO
- <U2462>     /xa2/xdb         CIRCLED DIGIT THREE
-@@ -2576,6 +9800,2116 @@ CHARMAP
- <U2640>     /xa1/xe2         FEMALE SIGN
- <U2641>     /x81/x37/xa8/x38 EARTH
- <U2642>     /xa1/xe1         MALE SIGN
-+<U2643>     /x81/x37/xa8/x39 JUPITER
-+<U2644>     /x81/x37/xa9/x30 SATURN
-+<U2645>     /x81/x37/xa9/x31 URANUS
-+<U2646>     /x81/x37/xa9/x32 NEPTUNE
-+<U2647>     /x81/x37/xa9/x33 PLUTO
-+<U2648>     /x81/x37/xa9/x34 ARIES
-+<U2649>     /x81/x37/xa9/x35 TAURUS
-+<U264A>     /x81/x37/xa9/x36 GEMINI
-+<U264B>     /x81/x37/xa9/x37 CANCER
-+<U264C>     /x81/x37/xa9/x38 LEO
-+<U264D>     /x81/x37/xa9/x39 VIRGO
-+<U264E>     /x81/x37/xaa/x30 LIBRA
-+<U264F>     /x81/x37/xaa/x31 SCORPIUS
-+<U2650>     /x81/x37/xaa/x32 SAGITTARIUS
-+<U2651>     /x81/x37/xaa/x33 CAPRICORN
-+<U2652>     /x81/x37/xaa/x34 AQUARIUS
-+<U2653>     /x81/x37/xaa/x35 PISCES
-+<U2654>     /x81/x37/xaa/x36 WHITE CHESS KING
-+<U2655>     /x81/x37/xaa/x37 WHITE CHESS QUEEN
-+<U2656>     /x81/x37/xaa/x38 WHITE CHESS ROOK
-+<U2657>     /x81/x37/xaa/x39 WHITE CHESS BISHOP
-+<U2658>     /x81/x37/xab/x30 WHITE CHESS KNIGHT
-+<U2659>     /x81/x37/xab/x31 WHITE CHESS PAWN
-+<U265A>     /x81/x37/xab/x32 BLACK CHESS KING
-+<U265B>     /x81/x37/xab/x33 BLACK CHESS QUEEN
-+<U265C>     /x81/x37/xab/x34 BLACK CHESS ROOK
-+<U265D>     /x81/x37/xab/x35 BLACK CHESS BISHOP
-+<U265E>     /x81/x37/xab/x36 BLACK CHESS KNIGHT
-+<U265F>     /x81/x37/xab/x37 BLACK CHESS PAWN
-+<U2660>     /x81/x37/xab/x38 BLACK SPADE SUIT
-+<U2661>     /x81/x37/xab/x39 WHITE HEART SUIT
-+<U2662>     /x81/x37/xac/x30 WHITE DIAMOND SUIT
-+<U2663>     /x81/x37/xac/x31 BLACK CLUB SUIT
-+<U2664>     /x81/x37/xac/x32 WHITE SPADE SUIT
-+<U2665>     /x81/x37/xac/x33 BLACK HEART SUIT
-+<U2666>     /x81/x37/xac/x34 BLACK DIAMOND SUIT
-+<U2667>     /x81/x37/xac/x35 WHITE CLUB SUIT
-+<U2668>     /x81/x37/xac/x36 HOT SPRINGS
-+<U2669>     /x81/x37/xac/x37 QUARTER NOTE
-+<U266A>     /x81/x37/xac/x38 EIGHTH NOTE
-+<U266B>     /x81/x37/xac/x39 BEAMED EIGHTH NOTES
-+<U266C>     /x81/x37/xad/x30 BEAMED SIXTEENTH NOTES
-+<U266D>     /x81/x37/xad/x31 MUSIC FLAT SIGN
-+<U266E>     /x81/x37/xad/x32 MUSIC NATURAL SIGN
-+<U266F>     /x81/x37/xad/x33 MUSIC SHARP SIGN
-+<U2670>     /x81/x37/xad/x34 WEST SYRIAC CROSS
-+<U2671>     /x81/x37/xad/x35 EAST SYRIAC CROSS
-+<U2672>     /x81/x37/xad/x36 UNIVERSAL RECYCLING SYMBOL
-+<U2673>     /x81/x37/xad/x37 RECYCLING SYMBOL FOR TYPE-1 PLASTICS
-+<U2674>     /x81/x37/xad/x38 RECYCLING SYMBOL FOR TYPE-2 PLASTICS
-+<U2675>     /x81/x37/xad/x39 RECYCLING SYMBOL FOR TYPE-3 PLASTICS
-+<U2676>     /x81/x37/xae/x30 RECYCLING SYMBOL FOR TYPE-4 PLASTICS
-+<U2677>     /x81/x37/xae/x31 RECYCLING SYMBOL FOR TYPE-5 PLASTICS
-+<U2678>     /x81/x37/xae/x32 RECYCLING SYMBOL FOR TYPE-6 PLASTICS
-+<U2679>     /x81/x37/xae/x33 RECYCLING SYMBOL FOR TYPE-7 PLASTICS
-+<U267A>     /x81/x37/xae/x34 RECYCLING SYMBOL FOR GENERIC MATERIALS
-+<U267B>     /x81/x37/xae/x35 BLACK UNIVERSAL RECYCLING SYMBOL
-+<U267C>     /x81/x37/xae/x36 RECYCLED PAPER SYMBOL
-+<U267D>     /x81/x37/xae/x37 PARTIALLY-RECYCLED PAPER SYMBOL
-+<U267E>     /x81/x37/xae/x38 <UNASSIGNED>
-+<U267F>     /x81/x37/xae/x39 <UNASSIGNED>
-+<U2680>     /x81/x37/xaf/x30 DIE FACE-1
-+<U2681>     /x81/x37/xaf/x31 DIE FACE-2
-+<U2682>     /x81/x37/xaf/x32 DIE FACE-3
-+<U2683>     /x81/x37/xaf/x33 DIE FACE-4
-+<U2684>     /x81/x37/xaf/x34 DIE FACE-5
-+<U2685>     /x81/x37/xaf/x35 DIE FACE-6
-+<U2686>     /x81/x37/xaf/x36 WHITE CIRCLE WITH DOT RIGHT
-+<U2687>     /x81/x37/xaf/x37 WHITE CIRCLE WITH TWO DOTS
-+<U2688>     /x81/x37/xaf/x38 BLACK CIRCLE WITH WHITE DOT RIGHT
-+<U2689>     /x81/x37/xaf/x39 BLACK CIRCLE WITH TWO WHITE DOTS
-+<U268A>     /x81/x37/xb0/x30 <UNASSIGNED>
-+<U268B>     /x81/x37/xb0/x31 <UNASSIGNED>
-+<U268C>     /x81/x37/xb0/x32 <UNASSIGNED>
-+<U268D>     /x81/x37/xb0/x33 <UNASSIGNED>
-+<U268E>     /x81/x37/xb0/x34 <UNASSIGNED>
-+<U268F>     /x81/x37/xb0/x35 <UNASSIGNED>
-+<U2690>     /x81/x37/xb0/x36 <UNASSIGNED>
-+<U2691>     /x81/x37/xb0/x37 <UNASSIGNED>
-+<U2692>     /x81/x37/xb0/x38 <UNASSIGNED>
-+<U2693>     /x81/x37/xb0/x39 <UNASSIGNED>
-+<U2694>     /x81/x37/xb1/x30 <UNASSIGNED>
-+<U2695>     /x81/x37/xb1/x31 <UNASSIGNED>
-+<U2696>     /x81/x37/xb1/x32 <UNASSIGNED>
-+<U2697>     /x81/x37/xb1/x33 <UNASSIGNED>
-+<U2698>     /x81/x37/xb1/x34 <UNASSIGNED>
-+<U2699>     /x81/x37/xb1/x35 <UNASSIGNED>
-+<U269A>     /x81/x37/xb1/x36 <UNASSIGNED>
-+<U269B>     /x81/x37/xb1/x37 <UNASSIGNED>
-+<U269C>     /x81/x37/xb1/x38 <UNASSIGNED>
-+<U269D>     /x81/x37/xb1/x39 <UNASSIGNED>
-+<U269E>     /x81/x37/xb2/x30 <UNASSIGNED>
-+<U269F>     /x81/x37/xb2/x31 <UNASSIGNED>
-+<U26A0>     /x81/x37/xb2/x32 <UNASSIGNED>
-+<U26A1>     /x81/x37/xb2/x33 <UNASSIGNED>
-+<U26A2>     /x81/x37/xb2/x34 <UNASSIGNED>
-+<U26A3>     /x81/x37/xb2/x35 <UNASSIGNED>
-+<U26A4>     /x81/x37/xb2/x36 <UNASSIGNED>
-+<U26A5>     /x81/x37/xb2/x37 <UNASSIGNED>
-+<U26A6>     /x81/x37/xb2/x38 <UNASSIGNED>
-+<U26A7>     /x81/x37/xb2/x39 <UNASSIGNED>
-+<U26A8>     /x81/x37/xb3/x30 <UNASSIGNED>
-+<U26A9>     /x81/x37/xb3/x31 <UNASSIGNED>
-+<U26AA>     /x81/x37/xb3/x32 <UNASSIGNED>
-+<U26AB>     /x81/x37/xb3/x33 <UNASSIGNED>
-+<U26AC>     /x81/x37/xb3/x34 <UNASSIGNED>
-+<U26AD>     /x81/x37/xb3/x35 <UNASSIGNED>
-+<U26AE>     /x81/x37/xb3/x36 <UNASSIGNED>
-+<U26AF>     /x81/x37/xb3/x37 <UNASSIGNED>
-+<U26B0>     /x81/x37/xb3/x38 <UNASSIGNED>
-+<U26B1>     /x81/x37/xb3/x39 <UNASSIGNED>
-+<U26B2>     /x81/x37/xb4/x30 <UNASSIGNED>
-+<U26B3>     /x81/x37/xb4/x31 <UNASSIGNED>
-+<U26B4>     /x81/x37/xb4/x32 <UNASSIGNED>
-+<U26B5>     /x81/x37/xb4/x33 <UNASSIGNED>
-+<U26B6>     /x81/x37/xb4/x34 <UNASSIGNED>
-+<U26B7>     /x81/x37/xb4/x35 <UNASSIGNED>
-+<U26B8>     /x81/x37/xb4/x36 <UNASSIGNED>
-+<U26B9>     /x81/x37/xb4/x37 <UNASSIGNED>
-+<U26BA>     /x81/x37/xb4/x38 <UNASSIGNED>
-+<U26BB>     /x81/x37/xb4/x39 <UNASSIGNED>
-+<U26BC>     /x81/x37/xb5/x30 <UNASSIGNED>
-+<U26BD>     /x81/x37/xb5/x31 <UNASSIGNED>
-+<U26BE>     /x81/x37/xb5/x32 <UNASSIGNED>
-+<U26BF>     /x81/x37/xb5/x33 <UNASSIGNED>
-+<U26C0>     /x81/x37/xb5/x34 <UNASSIGNED>
-+<U26C1>     /x81/x37/xb5/x35 <UNASSIGNED>
-+<U26C2>     /x81/x37/xb5/x36 <UNASSIGNED>
-+<U26C3>     /x81/x37/xb5/x37 <UNASSIGNED>
-+<U26C4>     /x81/x37/xb5/x38 <UNASSIGNED>
-+<U26C5>     /x81/x37/xb5/x39 <UNASSIGNED>
-+<U26C6>     /x81/x37/xb6/x30 <UNASSIGNED>
-+<U26C7>     /x81/x37/xb6/x31 <UNASSIGNED>
-+<U26C8>     /x81/x37/xb6/x32 <UNASSIGNED>
-+<U26C9>     /x81/x37/xb6/x33 <UNASSIGNED>
-+<U26CA>     /x81/x37/xb6/x34 <UNASSIGNED>
-+<U26CB>     /x81/x37/xb6/x35 <UNASSIGNED>
-+<U26CC>     /x81/x37/xb6/x36 <UNASSIGNED>
-+<U26CD>     /x81/x37/xb6/x37 <UNASSIGNED>
-+<U26CE>     /x81/x37/xb6/x38 <UNASSIGNED>
-+<U26CF>     /x81/x37/xb6/x39 <UNASSIGNED>
-+<U26D0>     /x81/x37/xb7/x30 <UNASSIGNED>
-+<U26D1>     /x81/x37/xb7/x31 <UNASSIGNED>
-+<U26D2>     /x81/x37/xb7/x32 <UNASSIGNED>
-+<U26D3>     /x81/x37/xb7/x33 <UNASSIGNED>
-+<U26D4>     /x81/x37/xb7/x34 <UNASSIGNED>
-+<U26D5>     /x81/x37/xb7/x35 <UNASSIGNED>
-+<U26D6>     /x81/x37/xb7/x36 <UNASSIGNED>
-+<U26D7>     /x81/x37/xb7/x37 <UNASSIGNED>
-+<U26D8>     /x81/x37/xb7/x38 <UNASSIGNED>
-+<U26D9>     /x81/x37/xb7/x39 <UNASSIGNED>
-+<U26DA>     /x81/x37/xb8/x30 <UNASSIGNED>
-+<U26DB>     /x81/x37/xb8/x31 <UNASSIGNED>
-+<U26DC>     /x81/x37/xb8/x32 <UNASSIGNED>
-+<U26DD>     /x81/x37/xb8/x33 <UNASSIGNED>
-+<U26DE>     /x81/x37/xb8/x34 <UNASSIGNED>
-+<U26DF>     /x81/x37/xb8/x35 <UNASSIGNED>
-+<U26E0>     /x81/x37/xb8/x36 <UNASSIGNED>
-+<U26E1>     /x81/x37/xb8/x37 <UNASSIGNED>
-+<U26E2>     /x81/x37/xb8/x38 <UNASSIGNED>
-+<U26E3>     /x81/x37/xb8/x39 <UNASSIGNED>
-+<U26E4>     /x81/x37/xb9/x30 <UNASSIGNED>
-+<U26E5>     /x81/x37/xb9/x31 <UNASSIGNED>
-+<U26E6>     /x81/x37/xb9/x32 <UNASSIGNED>
-+<U26E7>     /x81/x37/xb9/x33 <UNASSIGNED>
-+<U26E8>     /x81/x37/xb9/x34 <UNASSIGNED>
-+<U26E9>     /x81/x37/xb9/x35 <UNASSIGNED>
-+<U26EA>     /x81/x37/xb9/x36 <UNASSIGNED>
-+<U26EB>     /x81/x37/xb9/x37 <UNASSIGNED>
-+<U26EC>     /x81/x37/xb9/x38 <UNASSIGNED>
-+<U26ED>     /x81/x37/xb9/x39 <UNASSIGNED>
-+<U26EE>     /x81/x37/xba/x30 <UNASSIGNED>
-+<U26EF>     /x81/x37/xba/x31 <UNASSIGNED>
-+<U26F0>     /x81/x37/xba/x32 <UNASSIGNED>
-+<U26F1>     /x81/x37/xba/x33 <UNASSIGNED>
-+<U26F2>     /x81/x37/xba/x34 <UNASSIGNED>
-+<U26F3>     /x81/x37/xba/x35 <UNASSIGNED>
-+<U26F4>     /x81/x37/xba/x36 <UNASSIGNED>
-+<U26F5>     /x81/x37/xba/x37 <UNASSIGNED>
-+<U26F6>     /x81/x37/xba/x38 <UNASSIGNED>
-+<U26F7>     /x81/x37/xba/x39 <UNASSIGNED>
-+<U26F8>     /x81/x37/xbb/x30 <UNASSIGNED>
-+<U26F9>     /x81/x37/xbb/x31 <UNASSIGNED>
-+<U26FA>     /x81/x37/xbb/x32 <UNASSIGNED>
-+<U26FB>     /x81/x37/xbb/x33 <UNASSIGNED>
-+<U26FC>     /x81/x37/xbb/x34 <UNASSIGNED>
-+<U26FD>     /x81/x37/xbb/x35 <UNASSIGNED>
-+<U26FE>     /x81/x37/xbb/x36 <UNASSIGNED>
-+<U26FF>     /x81/x37/xbb/x37 <UNASSIGNED>
-+<U2700>     /x81/x37/xbb/x38 <UNASSIGNED>
-+<U2701>     /x81/x37/xbb/x39 UPPER BLADE SCISSORS
-+<U2702>     /x81/x37/xbc/x30 BLACK SCISSORS
-+<U2703>     /x81/x37/xbc/x31 LOWER BLADE SCISSORS
-+<U2704>     /x81/x37/xbc/x32 WHITE SCISSORS
-+<U2705>     /x81/x37/xbc/x33 <UNASSIGNED>
-+<U2706>     /x81/x37/xbc/x34 TELEPHONE LOCATION SIGN
-+<U2707>     /x81/x37/xbc/x35 TAPE DRIVE
-+<U2708>     /x81/x37/xbc/x36 AIRPLANE
-+<U2709>     /x81/x37/xbc/x37 ENVELOPE
-+<U270A>     /x81/x37/xbc/x38 <UNASSIGNED>
-+<U270B>     /x81/x37/xbc/x39 <UNASSIGNED>
-+<U270C>     /x81/x37/xbd/x30 VICTORY HAND
-+<U270D>     /x81/x37/xbd/x31 WRITING HAND
-+<U270E>     /x81/x37/xbd/x32 LOWER RIGHT PENCIL
-+<U270F>     /x81/x37/xbd/x33 PENCIL
-+<U2710>     /x81/x37/xbd/x34 UPPER RIGHT PENCIL
-+<U2711>     /x81/x37/xbd/x35 WHITE NIB
-+<U2712>     /x81/x37/xbd/x36 BLACK NIB
-+<U2713>     /x81/x37/xbd/x37 CHECK MARK
-+<U2714>     /x81/x37/xbd/x38 HEAVY CHECK MARK
-+<U2715>     /x81/x37/xbd/x39 MULTIPLICATION X
-+<U2716>     /x81/x37/xbe/x30 HEAVY MULTIPLICATION X
-+<U2717>     /x81/x37/xbe/x31 BALLOT X
-+<U2718>     /x81/x37/xbe/x32 HEAVY BALLOT X
-+<U2719>     /x81/x37/xbe/x33 OUTLINED GREEK CROSS
-+<U271A>     /x81/x37/xbe/x34 HEAVY GREEK CROSS
-+<U271B>     /x81/x37/xbe/x35 OPEN CENTRE CROSS
-+<U271C>     /x81/x37/xbe/x36 HEAVY OPEN CENTRE CROSS
-+<U271D>     /x81/x37/xbe/x37 LATIN CROSS
-+<U271E>     /x81/x37/xbe/x38 SHADOWED WHITE LATIN CROSS
-+<U271F>     /x81/x37/xbe/x39 OUTLINED LATIN CROSS
-+<U2720>     /x81/x37/xbf/x30 MALTESE CROSS
-+<U2721>     /x81/x37/xbf/x31 STAR OF DAVID
-+<U2722>     /x81/x37/xbf/x32 FOUR TEARDROP-SPOKED ASTERISK
-+<U2723>     /x81/x37/xbf/x33 FOUR BALLOON-SPOKED ASTERISK
-+<U2724>     /x81/x37/xbf/x34 HEAVY FOUR BALLOON-SPOKED ASTERISK
-+<U2725>     /x81/x37/xbf/x35 FOUR CLUB-SPOKED ASTERISK
-+<U2726>     /x81/x37/xbf/x36 BLACK FOUR POINTED STAR
-+<U2727>     /x81/x37/xbf/x37 WHITE FOUR POINTED STAR
-+<U2728>     /x81/x37/xbf/x38 <UNASSIGNED>
-+<U2729>     /x81/x37/xbf/x39 STRESS OUTLINED WHITE STAR
-+<U272A>     /x81/x37/xc0/x30 CIRCLED WHITE STAR
-+<U272B>     /x81/x37/xc0/x31 OPEN CENTRE BLACK STAR
-+<U272C>     /x81/x37/xc0/x32 BLACK CENTRE WHITE STAR
-+<U272D>     /x81/x37/xc0/x33 OUTLINED BLACK STAR
-+<U272E>     /x81/x37/xc0/x34 HEAVY OUTLINED BLACK STAR
-+<U272F>     /x81/x37/xc0/x35 PINWHEEL STAR
-+<U2730>     /x81/x37/xc0/x36 SHADOWED WHITE STAR
-+<U2731>     /x81/x37/xc0/x37 HEAVY ASTERISK
-+<U2732>     /x81/x37/xc0/x38 OPEN CENTRE ASTERISK
-+<U2733>     /x81/x37/xc0/x39 EIGHT SPOKED ASTERISK
-+<U2734>     /x81/x37/xc1/x30 EIGHT POINTED BLACK STAR
-+<U2735>     /x81/x37/xc1/x31 EIGHT POINTED PINWHEEL STAR
-+<U2736>     /x81/x37/xc1/x32 SIX POINTED BLACK STAR
-+<U2737>     /x81/x37/xc1/x33 EIGHT POINTED RECTILINEAR BLACK STAR
-+<U2738>     /x81/x37/xc1/x34 HEAVY EIGHT POINTED RECTILINEAR BLACK STAR
-+<U2739>     /x81/x37/xc1/x35 TWELVE POINTED BLACK STAR
-+<U273A>     /x81/x37/xc1/x36 SIXTEEN POINTED ASTERISK
-+<U273B>     /x81/x37/xc1/x37 TEARDROP-SPOKED ASTERISK
-+<U273C>     /x81/x37/xc1/x38 OPEN CENTRE TEARDROP-SPOKED ASTERISK
-+<U273D>     /x81/x37/xc1/x39 HEAVY TEARDROP-SPOKED ASTERISK
-+<U273E>     /x81/x37/xc2/x30 SIX PETALLED BLACK AND WHITE FLORETTE
-+<U273F>     /x81/x37/xc2/x31 BLACK FLORETTE
-+<U2740>     /x81/x37/xc2/x32 WHITE FLORETTE
-+<U2741>     /x81/x37/xc2/x33 EIGHT PETALLED OUTLINED BLACK FLORETTE
-+<U2742>     /x81/x37/xc2/x34 CIRCLED OPEN CENTRE EIGHT POINTED STAR
-+<U2743>     /x81/x37/xc2/x35 HEAVY TEARDROP-SPOKED PINWHEEL ASTERISK
-+<U2744>     /x81/x37/xc2/x36 SNOWFLAKE
-+<U2745>     /x81/x37/xc2/x37 TIGHT TRIFOLIATE SNOWFLAKE
-+<U2746>     /x81/x37/xc2/x38 HEAVY CHEVRON SNOWFLAKE
-+<U2747>     /x81/x37/xc2/x39 SPARKLE
-+<U2748>     /x81/x37/xc3/x30 HEAVY SPARKLE
-+<U2749>     /x81/x37/xc3/x31 BALLOON-SPOKED ASTERISK
-+<U274A>     /x81/x37/xc3/x32 EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
-+<U274B>     /x81/x37/xc3/x33 HEAVY EIGHT TEARDROP-SPOKED PROPELLER ASTERISK
-+<U274C>     /x81/x37/xc3/x34 <UNASSIGNED>
-+<U274D>     /x81/x37/xc3/x35 SHADOWED WHITE CIRCLE
-+<U274E>     /x81/x37/xc3/x36 <UNASSIGNED>
-+<U274F>     /x81/x37/xc3/x37 LOWER RIGHT DROP-SHADOWED WHITE SQUARE
-+<U2750>     /x81/x37/xc3/x38 UPPER RIGHT DROP-SHADOWED WHITE SQUARE
-+<U2751>     /x81/x37/xc3/x39 LOWER RIGHT SHADOWED WHITE SQUARE
-+<U2752>     /x81/x37/xc4/x30 UPPER RIGHT SHADOWED WHITE SQUARE
-+<U2753>     /x81/x37/xc4/x31 <UNASSIGNED>
-+<U2754>     /x81/x37/xc4/x32 <UNASSIGNED>
-+<U2755>     /x81/x37/xc4/x33 <UNASSIGNED>
-+<U2756>     /x81/x37/xc4/x34 BLACK DIAMOND MINUS WHITE X
-+<U2757>     /x81/x37/xc4/x35 <UNASSIGNED>
-+<U2758>     /x81/x37/xc4/x36 LIGHT VERTICAL BAR
-+<U2759>     /x81/x37/xc4/x37 MEDIUM VERTICAL BAR
-+<U275A>     /x81/x37/xc4/x38 HEAVY VERTICAL BAR
-+<U275B>     /x81/x37/xc4/x39 HEAVY SINGLE TURNED COMMA QUOTATION MARK ORNAMENT
-+<U275C>     /x81/x37/xc5/x30 HEAVY SINGLE COMMA QUOTATION MARK ORNAMENT
-+<U275D>     /x81/x37/xc5/x31 HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT
-+<U275E>     /x81/x37/xc5/x32 HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT
-+<U275F>     /x81/x37/xc5/x33 <UNASSIGNED>
-+<U2760>     /x81/x37/xc5/x34 <UNASSIGNED>
-+<U2761>     /x81/x37/xc5/x35 CURVED STEM PARAGRAPH SIGN ORNAMENT
-+<U2762>     /x81/x37/xc5/x36 HEAVY EXCLAMATION MARK ORNAMENT
-+<U2763>     /x81/x37/xc5/x37 HEAVY HEART EXCLAMATION MARK ORNAMENT
-+<U2764>     /x81/x37/xc5/x38 HEAVY BLACK HEART
-+<U2765>     /x81/x37/xc5/x39 ROTATED HEAVY BLACK HEART BULLET
-+<U2766>     /x81/x37/xc6/x30 FLORAL HEART
-+<U2767>     /x81/x37/xc6/x31 ROTATED FLORAL HEART BULLET
-+<U2768>     /x81/x37/xc6/x32 MEDIUM LEFT PARENTHESIS ORNAMENT
-+<U2769>     /x81/x37/xc6/x33 MEDIUM RIGHT PARENTHESIS ORNAMENT
-+<U276A>     /x81/x37/xc6/x34 MEDIUM FLATTENED LEFT PARENTHESIS ORNAMENT
-+<U276B>     /x81/x37/xc6/x35 MEDIUM FLATTENED RIGHT PARENTHESIS ORNAMENT
-+<U276C>     /x81/x37/xc6/x36 MEDIUM LEFT-POINTING ANGLE BRACKET ORNAMENT
-+<U276D>     /x81/x37/xc6/x37 MEDIUM RIGHT-POINTING ANGLE BRACKET ORNAMENT
-+<U276E>     /x81/x37/xc6/x38 HEAVY LEFT-POINTING ANGLE QUOTATION MARK ORNAMENT
-+<U276F>     /x81/x37/xc6/x39 HEAVY RIGHT-POINTING ANGLE QUOTATION MARK ORNAMENT
-+<U2770>     /x81/x37/xc7/x30 HEAVY LEFT-POINTING ANGLE BRACKET ORNAMENT
-+<U2771>     /x81/x37/xc7/x31 HEAVY RIGHT-POINTING ANGLE BRACKET ORNAMENT
-+<U2772>     /x81/x37/xc7/x32 LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT
-+<U2773>     /x81/x37/xc7/x33 LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
-+<U2774>     /x81/x37/xc7/x34 MEDIUM LEFT CURLY BRACKET ORNAMENT
-+<U2775>     /x81/x37/xc7/x35 MEDIUM RIGHT CURLY BRACKET ORNAMENT
-+<U2776>     /x81/x37/xc7/x36 DINGBAT NEGATIVE CIRCLED DIGIT ONE
-+<U2777>     /x81/x37/xc7/x37 DINGBAT NEGATIVE CIRCLED DIGIT TWO
-+<U2778>     /x81/x37/xc7/x38 DINGBAT NEGATIVE CIRCLED DIGIT THREE
-+<U2779>     /x81/x37/xc7/x39 DINGBAT NEGATIVE CIRCLED DIGIT FOUR
-+<U277A>     /x81/x37/xc8/x30 DINGBAT NEGATIVE CIRCLED DIGIT FIVE
-+<U277B>     /x81/x37/xc8/x31 DINGBAT NEGATIVE CIRCLED DIGIT SIX
-+<U277C>     /x81/x37/xc8/x32 DINGBAT NEGATIVE CIRCLED DIGIT SEVEN
-+<U277D>     /x81/x37/xc8/x33 DINGBAT NEGATIVE CIRCLED DIGIT EIGHT
-+<U277E>     /x81/x37/xc8/x34 DINGBAT NEGATIVE CIRCLED DIGIT NINE
-+<U277F>     /x81/x37/xc8/x35 DINGBAT NEGATIVE CIRCLED NUMBER TEN
-+<U2780>     /x81/x37/xc8/x36 DINGBAT CIRCLED SANS-SERIF DIGIT ONE
-+<U2781>     /x81/x37/xc8/x37 DINGBAT CIRCLED SANS-SERIF DIGIT TWO
-+<U2782>     /x81/x37/xc8/x38 DINGBAT CIRCLED SANS-SERIF DIGIT THREE
-+<U2783>     /x81/x37/xc8/x39 DINGBAT CIRCLED SANS-SERIF DIGIT FOUR
-+<U2784>     /x81/x37/xc9/x30 DINGBAT CIRCLED SANS-SERIF DIGIT FIVE
-+<U2785>     /x81/x37/xc9/x31 DINGBAT CIRCLED SANS-SERIF DIGIT SIX
-+<U2786>     /x81/x37/xc9/x32 DINGBAT CIRCLED SANS-SERIF DIGIT SEVEN
-+<U2787>     /x81/x37/xc9/x33 DINGBAT CIRCLED SANS-SERIF DIGIT EIGHT
-+<U2788>     /x81/x37/xc9/x34 DINGBAT CIRCLED SANS-SERIF DIGIT NINE
-+<U2789>     /x81/x37/xc9/x35 DINGBAT CIRCLED SANS-SERIF NUMBER TEN
-+<U278A>     /x81/x37/xc9/x36 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT ONE
-+<U278B>     /x81/x37/xc9/x37 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT TWO
-+<U278C>     /x81/x37/xc9/x38 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT THREE
-+<U278D>     /x81/x37/xc9/x39 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FOUR
-+<U278E>     /x81/x37/xca/x30 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT FIVE
-+<U278F>     /x81/x37/xca/x31 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SIX
-+<U2790>     /x81/x37/xca/x32 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT SEVEN
-+<U2791>     /x81/x37/xca/x33 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT EIGHT
-+<U2792>     /x81/x37/xca/x34 DINGBAT NEGATIVE CIRCLED SANS-SERIF DIGIT NINE
-+<U2793>     /x81/x37/xca/x35 DINGBAT NEGATIVE CIRCLED SANS-SERIF NUMBER TEN
-+<U2794>     /x81/x37/xca/x36 HEAVY WIDE-HEADED RIGHTWARDS ARROW
-+<U2795>     /x81/x37/xca/x37 <UNASSIGNED>
-+<U2796>     /x81/x37/xca/x38 <UNASSIGNED>
-+<U2797>     /x81/x37/xca/x39 <UNASSIGNED>
-+<U2798>     /x81/x37/xcb/x30 HEAVY SOUTH EAST ARROW
-+<U2799>     /x81/x37/xcb/x31 HEAVY RIGHTWARDS ARROW
-+<U279A>     /x81/x37/xcb/x32 HEAVY NORTH EAST ARROW
-+<U279B>     /x81/x37/xcb/x33 DRAFTING POINT RIGHTWARDS ARROW
-+<U279C>     /x81/x37/xcb/x34 HEAVY ROUND-TIPPED RIGHTWARDS ARROW
-+<U279D>     /x81/x37/xcb/x35 TRIANGLE-HEADED RIGHTWARDS ARROW
-+<U279E>     /x81/x37/xcb/x36 HEAVY TRIANGLE-HEADED RIGHTWARDS ARROW
-+<U279F>     /x81/x37/xcb/x37 DASHED TRIANGLE-HEADED RIGHTWARDS ARROW
-+<U27A0>     /x81/x37/xcb/x38 HEAVY DASHED TRIANGLE-HEADED RIGHTWARDS ARROW
-+<U27A1>     /x81/x37/xcb/x39 BLACK RIGHTWARDS ARROW
-+<U27A2>     /x81/x37/xcc/x30 THREE-D TOP-LIGHTED RIGHTWARDS ARROWHEAD
-+<U27A3>     /x81/x37/xcc/x31 THREE-D BOTTOM-LIGHTED RIGHTWARDS ARROWHEAD
-+<U27A4>     /x81/x37/xcc/x32 BLACK RIGHTWARDS ARROWHEAD
-+<U27A5>     /x81/x37/xcc/x33 HEAVY BLACK CURVED DOWNWARDS AND RIGHTWARDS ARROW
-+<U27A6>     /x81/x37/xcc/x34 HEAVY BLACK CURVED UPWARDS AND RIGHTWARDS ARROW
-+<U27A7>     /x81/x37/xcc/x35 SQUAT BLACK RIGHTWARDS ARROW
-+<U27A8>     /x81/x37/xcc/x36 HEAVY CONCAVE-POINTED BLACK RIGHTWARDS ARROW
-+<U27A9>     /x81/x37/xcc/x37 RIGHT-SHADED WHITE RIGHTWARDS ARROW
-+<U27AA>     /x81/x37/xcc/x38 LEFT-SHADED WHITE RIGHTWARDS ARROW
-+<U27AB>     /x81/x37/xcc/x39 BACK-TILTED SHADOWED WHITE RIGHTWARDS ARROW
-+<U27AC>     /x81/x37/xcd/x30 FRONT-TILTED SHADOWED WHITE RIGHTWARDS ARROW
-+<U27AD>     /x81/x37/xcd/x31 HEAVY LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-+<U27AE>     /x81/x37/xcd/x32 HEAVY UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-+<U27AF>     /x81/x37/xcd/x33 NOTCHED LOWER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-+<U27B0>     /x81/x37/xcd/x34 <UNASSIGNED>
-+<U27B1>     /x81/x37/xcd/x35 NOTCHED UPPER RIGHT-SHADOWED WHITE RIGHTWARDS ARROW
-+<U27B2>     /x81/x37/xcd/x36 CIRCLED HEAVY WHITE RIGHTWARDS ARROW
-+<U27B3>     /x81/x37/xcd/x37 WHITE-FEATHERED RIGHTWARDS ARROW
-+<U27B4>     /x81/x37/xcd/x38 BLACK-FEATHERED SOUTH EAST ARROW
-+<U27B5>     /x81/x37/xcd/x39 BLACK-FEATHERED RIGHTWARDS ARROW
-+<U27B6>     /x81/x37/xce/x30 BLACK-FEATHERED NORTH EAST ARROW
-+<U27B7>     /x81/x37/xce/x31 HEAVY BLACK-FEATHERED SOUTH EAST ARROW
-+<U27B8>     /x81/x37/xce/x32 HEAVY BLACK-FEATHERED RIGHTWARDS ARROW
-+<U27B9>     /x81/x37/xce/x33 HEAVY BLACK-FEATHERED NORTH EAST ARROW
-+<U27BA>     /x81/x37/xce/x34 TEARDROP-BARBED RIGHTWARDS ARROW
-+<U27BB>     /x81/x37/xce/x35 HEAVY TEARDROP-SHANKED RIGHTWARDS ARROW
-+<U27BC>     /x81/x37/xce/x36 WEDGE-TAILED RIGHTWARDS ARROW
-+<U27BD>     /x81/x37/xce/x37 HEAVY WEDGE-TAILED RIGHTWARDS ARROW
-+<U27BE>     /x81/x37/xce/x38 OPEN-OUTLINED RIGHTWARDS ARROW
-+<U27BF>     /x81/x37/xce/x39 <UNASSIGNED>
-+<U27C0>     /x81/x37/xcf/x30 <UNASSIGNED>
-+<U27C1>     /x81/x37/xcf/x31 <UNASSIGNED>
-+<U27C2>     /x81/x37/xcf/x32 <UNASSIGNED>
-+<U27C3>     /x81/x37/xcf/x33 <UNASSIGNED>
-+<U27C4>     /x81/x37/xcf/x34 <UNASSIGNED>
-+<U27C5>     /x81/x37/xcf/x35 <UNASSIGNED>
-+<U27C6>     /x81/x37/xcf/x36 <UNASSIGNED>
-+<U27C7>     /x81/x37/xcf/x37 <UNASSIGNED>
-+<U27C8>     /x81/x37/xcf/x38 <UNASSIGNED>
-+<U27C9>     /x81/x37/xcf/x39 <UNASSIGNED>
-+<U27CA>     /x81/x37/xd0/x30 <UNASSIGNED>
-+<U27CB>     /x81/x37/xd0/x31 <UNASSIGNED>
-+<U27CC>     /x81/x37/xd0/x32 <UNASSIGNED>
-+<U27CD>     /x81/x37/xd0/x33 <UNASSIGNED>
-+<U27CE>     /x81/x37/xd0/x34 <UNASSIGNED>
-+<U27CF>     /x81/x37/xd0/x35 <UNASSIGNED>
-+<U27D0>     /x81/x37/xd0/x36 WHITE DIAMOND WITH CENTRED DOT
-+<U27D1>     /x81/x37/xd0/x37 AND WITH DOT
-+<U27D2>     /x81/x37/xd0/x38 ELEMENT OF OPENING UPWARDS
-+<U27D3>     /x81/x37/xd0/x39 LOWER RIGHT CORNER WITH DOT
-+<U27D4>     /x81/x37/xd1/x30 UPPER LEFT CORNER WITH DOT
-+<U27D5>     /x81/x37/xd1/x31 LEFT OUTER JOIN
-+<U27D6>     /x81/x37/xd1/x32 RIGHT OUTER JOIN
-+<U27D7>     /x81/x37/xd1/x33 FULL OUTER JOIN
-+<U27D8>     /x81/x37/xd1/x34 LARGE UP TACK
-+<U27D9>     /x81/x37/xd1/x35 LARGE DOWN TACK
-+<U27DA>     /x81/x37/xd1/x36 LEFT AND RIGHT DOUBLE TURNSTILE
-+<U27DB>     /x81/x37/xd1/x37 LEFT AND RIGHT TACK
-+<U27DC>     /x81/x37/xd1/x38 LEFT MULTIMAP
-+<U27DD>     /x81/x37/xd1/x39 LONG RIGHT TACK
-+<U27DE>     /x81/x37/xd2/x30 LONG LEFT TACK
-+<U27DF>     /x81/x37/xd2/x31 UP TACK WITH CIRCLE ABOVE
-+<U27E0>     /x81/x37/xd2/x32 LOZENGE DIVIDED BY HORIZONTAL RULE
-+<U27E1>     /x81/x37/xd2/x33 WHITE CONCAVE-SIDED DIAMOND
-+<U27E2>     /x81/x37/xd2/x34 WHITE CONCAVE-SIDED DIAMOND WITH LEFTWARDS TICK
-+<U27E3>     /x81/x37/xd2/x35 WHITE CONCAVE-SIDED DIAMOND WITH RIGHTWARDS TICK
-+<U27E4>     /x81/x37/xd2/x36 WHITE SQUARE WITH LEFTWARDS TICK
-+<U27E5>     /x81/x37/xd2/x37 WHITE SQUARE WITH RIGHTWARDS TICK
-+<U27E6>     /x81/x37/xd2/x38 MATHEMATICAL LEFT WHITE SQUARE BRACKET
-+<U27E7>     /x81/x37/xd2/x39 MATHEMATICAL RIGHT WHITE SQUARE BRACKET
-+<U27E8>     /x81/x37/xd3/x30 MATHEMATICAL LEFT ANGLE BRACKET
-+<U27E9>     /x81/x37/xd3/x31 MATHEMATICAL RIGHT ANGLE BRACKET
-+<U27EA>     /x81/x37/xd3/x32 MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
-+<U27EB>     /x81/x37/xd3/x33 MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
-+<U27EC>     /x81/x37/xd3/x34 <UNASSIGNED>
-+<U27ED>     /x81/x37/xd3/x35 <UNASSIGNED>
-+<U27EE>     /x81/x37/xd3/x36 <UNASSIGNED>
-+<U27EF>     /x81/x37/xd3/x37 <UNASSIGNED>
-+<U27F0>     /x81/x37/xd3/x38 UPWARDS QUADRUPLE ARROW
-+<U27F1>     /x81/x37/xd3/x39 DOWNWARDS QUADRUPLE ARROW
-+<U27F2>     /x81/x37/xd4/x30 ANTICLOCKWISE GAPPED CIRCLE ARROW
-+<U27F3>     /x81/x37/xd4/x31 CLOCKWISE GAPPED CIRCLE ARROW
-+<U27F4>     /x81/x37/xd4/x32 RIGHT ARROW WITH CIRCLED PLUS
-+<U27F5>     /x81/x37/xd4/x33 LONG LEFTWARDS ARROW
-+<U27F6>     /x81/x37/xd4/x34 LONG RIGHTWARDS ARROW
-+<U27F7>     /x81/x37/xd4/x35 LONG LEFT RIGHT ARROW
-+<U27F8>     /x81/x37/xd4/x36 LONG LEFTWARDS DOUBLE ARROW
-+<U27F9>     /x81/x37/xd4/x37 LONG RIGHTWARDS DOUBLE ARROW
-+<U27FA>     /x81/x37/xd4/x38 LONG LEFT RIGHT DOUBLE ARROW
-+<U27FB>     /x81/x37/xd4/x39 LONG LEFTWARDS ARROW FROM BAR
-+<U27FC>     /x81/x37/xd5/x30 LONG RIGHTWARDS ARROW FROM BAR
-+<U27FD>     /x81/x37/xd5/x31 LONG LEFTWARDS DOUBLE ARROW FROM BAR
-+<U27FE>     /x81/x37/xd5/x32 LONG RIGHTWARDS DOUBLE ARROW FROM BAR
-+<U27FF>     /x81/x37/xd5/x33 LONG RIGHTWARDS SQUIGGLE ARROW
-+<U2800>     /x81/x37/xd5/x34 BRAILLE PATTERN BLANK
-+<U2801>     /x81/x37/xd5/x35 BRAILLE PATTERN DOTS-1
-+<U2802>     /x81/x37/xd5/x36 BRAILLE PATTERN DOTS-2
-+<U2803>     /x81/x37/xd5/x37 BRAILLE PATTERN DOTS-12
-+<U2804>     /x81/x37/xd5/x38 BRAILLE PATTERN DOTS-3
-+<U2805>     /x81/x37/xd5/x39 BRAILLE PATTERN DOTS-13
-+<U2806>     /x81/x37/xd6/x30 BRAILLE PATTERN DOTS-23
-+<U2807>     /x81/x37/xd6/x31 BRAILLE PATTERN DOTS-123
-+<U2808>     /x81/x37/xd6/x32 BRAILLE PATTERN DOTS-4
-+<U2809>     /x81/x37/xd6/x33 BRAILLE PATTERN DOTS-14
-+<U280A>     /x81/x37/xd6/x34 BRAILLE PATTERN DOTS-24
-+<U280B>     /x81/x37/xd6/x35 BRAILLE PATTERN DOTS-124
-+<U280C>     /x81/x37/xd6/x36 BRAILLE PATTERN DOTS-34
-+<U280D>     /x81/x37/xd6/x37 BRAILLE PATTERN DOTS-134
-+<U280E>     /x81/x37/xd6/x38 BRAILLE PATTERN DOTS-234
-+<U280F>     /x81/x37/xd6/x39 BRAILLE PATTERN DOTS-1234
-+<U2810>     /x81/x37/xd7/x30 BRAILLE PATTERN DOTS-5
-+<U2811>     /x81/x37/xd7/x31 BRAILLE PATTERN DOTS-15
-+<U2812>     /x81/x37/xd7/x32 BRAILLE PATTERN DOTS-25
-+<U2813>     /x81/x37/xd7/x33 BRAILLE PATTERN DOTS-125
-+<U2814>     /x81/x37/xd7/x34 BRAILLE PATTERN DOTS-35
-+<U2815>     /x81/x37/xd7/x35 BRAILLE PATTERN DOTS-135
-+<U2816>     /x81/x37/xd7/x36 BRAILLE PATTERN DOTS-235
-+<U2817>     /x81/x37/xd7/x37 BRAILLE PATTERN DOTS-1235
-+<U2818>     /x81/x37/xd7/x38 BRAILLE PATTERN DOTS-45
-+<U2819>     /x81/x37/xd7/x39 BRAILLE PATTERN DOTS-145
-+<U281A>     /x81/x37/xd8/x30 BRAILLE PATTERN DOTS-245
-+<U281B>     /x81/x37/xd8/x31 BRAILLE PATTERN DOTS-1245
-+<U281C>     /x81/x37/xd8/x32 BRAILLE PATTERN DOTS-345
-+<U281D>     /x81/x37/xd8/x33 BRAILLE PATTERN DOTS-1345
-+<U281E>     /x81/x37/xd8/x34 BRAILLE PATTERN DOTS-2345
-+<U281F>     /x81/x37/xd8/x35 BRAILLE PATTERN DOTS-12345
-+<U2820>     /x81/x37/xd8/x36 BRAILLE PATTERN DOTS-6
-+<U2821>     /x81/x37/xd8/x37 BRAILLE PATTERN DOTS-16
-+<U2822>     /x81/x37/xd8/x38 BRAILLE PATTERN DOTS-26
-+<U2823>     /x81/x37/xd8/x39 BRAILLE PATTERN DOTS-126
-+<U2824>     /x81/x37/xd9/x30 BRAILLE PATTERN DOTS-36
-+<U2825>     /x81/x37/xd9/x31 BRAILLE PATTERN DOTS-136
-+<U2826>     /x81/x37/xd9/x32 BRAILLE PATTERN DOTS-236
-+<U2827>     /x81/x37/xd9/x33 BRAILLE PATTERN DOTS-1236
-+<U2828>     /x81/x37/xd9/x34 BRAILLE PATTERN DOTS-46
-+<U2829>     /x81/x37/xd9/x35 BRAILLE PATTERN DOTS-146
-+<U282A>     /x81/x37/xd9/x36 BRAILLE PATTERN DOTS-246
-+<U282B>     /x81/x37/xd9/x37 BRAILLE PATTERN DOTS-1246
-+<U282C>     /x81/x37/xd9/x38 BRAILLE PATTERN DOTS-346
-+<U282D>     /x81/x37/xd9/x39 BRAILLE PATTERN DOTS-1346
-+<U282E>     /x81/x37/xda/x30 BRAILLE PATTERN DOTS-2346
-+<U282F>     /x81/x37/xda/x31 BRAILLE PATTERN DOTS-12346
-+<U2830>     /x81/x37/xda/x32 BRAILLE PATTERN DOTS-56
-+<U2831>     /x81/x37/xda/x33 BRAILLE PATTERN DOTS-156
-+<U2832>     /x81/x37/xda/x34 BRAILLE PATTERN DOTS-256
-+<U2833>     /x81/x37/xda/x35 BRAILLE PATTERN DOTS-1256
-+<U2834>     /x81/x37/xda/x36 BRAILLE PATTERN DOTS-356
-+<U2835>     /x81/x37/xda/x37 BRAILLE PATTERN DOTS-1356
-+<U2836>     /x81/x37/xda/x38 BRAILLE PATTERN DOTS-2356
-+<U2837>     /x81/x37/xda/x39 BRAILLE PATTERN DOTS-12356
-+<U2838>     /x81/x37/xdb/x30 BRAILLE PATTERN DOTS-456
-+<U2839>     /x81/x37/xdb/x31 BRAILLE PATTERN DOTS-1456
-+<U283A>     /x81/x37/xdb/x32 BRAILLE PATTERN DOTS-2456
-+<U283B>     /x81/x37/xdb/x33 BRAILLE PATTERN DOTS-12456
-+<U283C>     /x81/x37/xdb/x34 BRAILLE PATTERN DOTS-3456
-+<U283D>     /x81/x37/xdb/x35 BRAILLE PATTERN DOTS-13456
-+<U283E>     /x81/x37/xdb/x36 BRAILLE PATTERN DOTS-23456
-+<U283F>     /x81/x37/xdb/x37 BRAILLE PATTERN DOTS-123456
-+<U2840>     /x81/x37/xdb/x38 BRAILLE PATTERN DOTS-7
-+<U2841>     /x81/x37/xdb/x39 BRAILLE PATTERN DOTS-17
-+<U2842>     /x81/x37/xdc/x30 BRAILLE PATTERN DOTS-27
-+<U2843>     /x81/x37/xdc/x31 BRAILLE PATTERN DOTS-127
-+<U2844>     /x81/x37/xdc/x32 BRAILLE PATTERN DOTS-37
-+<U2845>     /x81/x37/xdc/x33 BRAILLE PATTERN DOTS-137
-+<U2846>     /x81/x37/xdc/x34 BRAILLE PATTERN DOTS-237
-+<U2847>     /x81/x37/xdc/x35 BRAILLE PATTERN DOTS-1237
-+<U2848>     /x81/x37/xdc/x36 BRAILLE PATTERN DOTS-47
-+<U2849>     /x81/x37/xdc/x37 BRAILLE PATTERN DOTS-147
-+<U284A>     /x81/x37/xdc/x38 BRAILLE PATTERN DOTS-247
-+<U284B>     /x81/x37/xdc/x39 BRAILLE PATTERN DOTS-1247
-+<U284C>     /x81/x37/xdd/x30 BRAILLE PATTERN DOTS-347
-+<U284D>     /x81/x37/xdd/x31 BRAILLE PATTERN DOTS-1347
-+<U284E>     /x81/x37/xdd/x32 BRAILLE PATTERN DOTS-2347
-+<U284F>     /x81/x37/xdd/x33 BRAILLE PATTERN DOTS-12347
-+<U2850>     /x81/x37/xdd/x34 BRAILLE PATTERN DOTS-57
-+<U2851>     /x81/x37/xdd/x35 BRAILLE PATTERN DOTS-157
-+<U2852>     /x81/x37/xdd/x36 BRAILLE PATTERN DOTS-257
-+<U2853>     /x81/x37/xdd/x37 BRAILLE PATTERN DOTS-1257
-+<U2854>     /x81/x37/xdd/x38 BRAILLE PATTERN DOTS-357
-+<U2855>     /x81/x37/xdd/x39 BRAILLE PATTERN DOTS-1357
-+<U2856>     /x81/x37/xde/x30 BRAILLE PATTERN DOTS-2357
-+<U2857>     /x81/x37/xde/x31 BRAILLE PATTERN DOTS-12357
-+<U2858>     /x81/x37/xde/x32 BRAILLE PATTERN DOTS-457
-+<U2859>     /x81/x37/xde/x33 BRAILLE PATTERN DOTS-1457
-+<U285A>     /x81/x37/xde/x34 BRAILLE PATTERN DOTS-2457
-+<U285B>     /x81/x37/xde/x35 BRAILLE PATTERN DOTS-12457
-+<U285C>     /x81/x37/xde/x36 BRAILLE PATTERN DOTS-3457
-+<U285D>     /x81/x37/xde/x37 BRAILLE PATTERN DOTS-13457
-+<U285E>     /x81/x37/xde/x38 BRAILLE PATTERN DOTS-23457
-+<U285F>     /x81/x37/xde/x39 BRAILLE PATTERN DOTS-123457
-+<U2860>     /x81/x37/xdf/x30 BRAILLE PATTERN DOTS-67
-+<U2861>     /x81/x37/xdf/x31 BRAILLE PATTERN DOTS-167
-+<U2862>     /x81/x37/xdf/x32 BRAILLE PATTERN DOTS-267
-+<U2863>     /x81/x37/xdf/x33 BRAILLE PATTERN DOTS-1267
-+<U2864>     /x81/x37/xdf/x34 BRAILLE PATTERN DOTS-367
-+<U2865>     /x81/x37/xdf/x35 BRAILLE PATTERN DOTS-1367
-+<U2866>     /x81/x37/xdf/x36 BRAILLE PATTERN DOTS-2367
-+<U2867>     /x81/x37/xdf/x37 BRAILLE PATTERN DOTS-12367
-+<U2868>     /x81/x37/xdf/x38 BRAILLE PATTERN DOTS-467
-+<U2869>     /x81/x37/xdf/x39 BRAILLE PATTERN DOTS-1467
-+<U286A>     /x81/x37/xe0/x30 BRAILLE PATTERN DOTS-2467
-+<U286B>     /x81/x37/xe0/x31 BRAILLE PATTERN DOTS-12467
-+<U286C>     /x81/x37/xe0/x32 BRAILLE PATTERN DOTS-3467
-+<U286D>     /x81/x37/xe0/x33 BRAILLE PATTERN DOTS-13467
-+<U286E>     /x81/x37/xe0/x34 BRAILLE PATTERN DOTS-23467
-+<U286F>     /x81/x37/xe0/x35 BRAILLE PATTERN DOTS-123467
-+<U2870>     /x81/x37/xe0/x36 BRAILLE PATTERN DOTS-567
-+<U2871>     /x81/x37/xe0/x37 BRAILLE PATTERN DOTS-1567
-+<U2872>     /x81/x37/xe0/x38 BRAILLE PATTERN DOTS-2567
-+<U2873>     /x81/x37/xe0/x39 BRAILLE PATTERN DOTS-12567
-+<U2874>     /x81/x37/xe1/x30 BRAILLE PATTERN DOTS-3567
-+<U2875>     /x81/x37/xe1/x31 BRAILLE PATTERN DOTS-13567
-+<U2876>     /x81/x37/xe1/x32 BRAILLE PATTERN DOTS-23567
-+<U2877>     /x81/x37/xe1/x33 BRAILLE PATTERN DOTS-123567
-+<U2878>     /x81/x37/xe1/x34 BRAILLE PATTERN DOTS-4567
-+<U2879>     /x81/x37/xe1/x35 BRAILLE PATTERN DOTS-14567
-+<U287A>     /x81/x37/xe1/x36 BRAILLE PATTERN DOTS-24567
-+<U287B>     /x81/x37/xe1/x37 BRAILLE PATTERN DOTS-124567
-+<U287C>     /x81/x37/xe1/x38 BRAILLE PATTERN DOTS-34567
-+<U287D>     /x81/x37/xe1/x39 BRAILLE PATTERN DOTS-134567
-+<U287E>     /x81/x37/xe2/x30 BRAILLE PATTERN DOTS-234567
-+<U287F>     /x81/x37/xe2/x31 BRAILLE PATTERN DOTS-1234567
-+<U2880>     /x81/x37/xe2/x32 BRAILLE PATTERN DOTS-8
-+<U2881>     /x81/x37/xe2/x33 BRAILLE PATTERN DOTS-18
-+<U2882>     /x81/x37/xe2/x34 BRAILLE PATTERN DOTS-28
-+<U2883>     /x81/x37/xe2/x35 BRAILLE PATTERN DOTS-128
-+<U2884>     /x81/x37/xe2/x36 BRAILLE PATTERN DOTS-38
-+<U2885>     /x81/x37/xe2/x37 BRAILLE PATTERN DOTS-138
-+<U2886>     /x81/x37/xe2/x38 BRAILLE PATTERN DOTS-238
-+<U2887>     /x81/x37/xe2/x39 BRAILLE PATTERN DOTS-1238
-+<U2888>     /x81/x37/xe3/x30 BRAILLE PATTERN DOTS-48
-+<U2889>     /x81/x37/xe3/x31 BRAILLE PATTERN DOTS-148
-+<U288A>     /x81/x37/xe3/x32 BRAILLE PATTERN DOTS-248
-+<U288B>     /x81/x37/xe3/x33 BRAILLE PATTERN DOTS-1248
-+<U288C>     /x81/x37/xe3/x34 BRAILLE PATTERN DOTS-348
-+<U288D>     /x81/x37/xe3/x35 BRAILLE PATTERN DOTS-1348
-+<U288E>     /x81/x37/xe3/x36 BRAILLE PATTERN DOTS-2348
-+<U288F>     /x81/x37/xe3/x37 BRAILLE PATTERN DOTS-12348
-+<U2890>     /x81/x37/xe3/x38 BRAILLE PATTERN DOTS-58
-+<U2891>     /x81/x37/xe3/x39 BRAILLE PATTERN DOTS-158
-+<U2892>     /x81/x37/xe4/x30 BRAILLE PATTERN DOTS-258
-+<U2893>     /x81/x37/xe4/x31 BRAILLE PATTERN DOTS-1258
-+<U2894>     /x81/x37/xe4/x32 BRAILLE PATTERN DOTS-358
-+<U2895>     /x81/x37/xe4/x33 BRAILLE PATTERN DOTS-1358
-+<U2896>     /x81/x37/xe4/x34 BRAILLE PATTERN DOTS-2358
-+<U2897>     /x81/x37/xe4/x35 BRAILLE PATTERN DOTS-12358
-+<U2898>     /x81/x37/xe4/x36 BRAILLE PATTERN DOTS-458
-+<U2899>     /x81/x37/xe4/x37 BRAILLE PATTERN DOTS-1458
-+<U289A>     /x81/x37/xe4/x38 BRAILLE PATTERN DOTS-2458
-+<U289B>     /x81/x37/xe4/x39 BRAILLE PATTERN DOTS-12458
-+<U289C>     /x81/x37/xe5/x30 BRAILLE PATTERN DOTS-3458
-+<U289D>     /x81/x37/xe5/x31 BRAILLE PATTERN DOTS-13458
-+<U289E>     /x81/x37/xe5/x32 BRAILLE PATTERN DOTS-23458
-+<U289F>     /x81/x37/xe5/x33 BRAILLE PATTERN DOTS-123458
-+<U28A0>     /x81/x37/xe5/x34 BRAILLE PATTERN DOTS-68
-+<U28A1>     /x81/x37/xe5/x35 BRAILLE PATTERN DOTS-168
-+<U28A2>     /x81/x37/xe5/x36 BRAILLE PATTERN DOTS-268
-+<U28A3>     /x81/x37/xe5/x37 BRAILLE PATTERN DOTS-1268
-+<U28A4>     /x81/x37/xe5/x38 BRAILLE PATTERN DOTS-368
-+<U28A5>     /x81/x37/xe5/x39 BRAILLE PATTERN DOTS-1368
-+<U28A6>     /x81/x37/xe6/x30 BRAILLE PATTERN DOTS-2368
-+<U28A7>     /x81/x37/xe6/x31 BRAILLE PATTERN DOTS-12368
-+<U28A8>     /x81/x37/xe6/x32 BRAILLE PATTERN DOTS-468
-+<U28A9>     /x81/x37/xe6/x33 BRAILLE PATTERN DOTS-1468
-+<U28AA>     /x81/x37/xe6/x34 BRAILLE PATTERN DOTS-2468
-+<U28AB>     /x81/x37/xe6/x35 BRAILLE PATTERN DOTS-12468
-+<U28AC>     /x81/x37/xe6/x36 BRAILLE PATTERN DOTS-3468
-+<U28AD>     /x81/x37/xe6/x37 BRAILLE PATTERN DOTS-13468
-+<U28AE>     /x81/x37/xe6/x38 BRAILLE PATTERN DOTS-23468
-+<U28AF>     /x81/x37/xe6/x39 BRAILLE PATTERN DOTS-123468
-+<U28B0>     /x81/x37/xe7/x30 BRAILLE PATTERN DOTS-568
-+<U28B1>     /x81/x37/xe7/x31 BRAILLE PATTERN DOTS-1568
-+<U28B2>     /x81/x37/xe7/x32 BRAILLE PATTERN DOTS-2568
-+<U28B3>     /x81/x37/xe7/x33 BRAILLE PATTERN DOTS-12568
-+<U28B4>     /x81/x37/xe7/x34 BRAILLE PATTERN DOTS-3568
-+<U28B5>     /x81/x37/xe7/x35 BRAILLE PATTERN DOTS-13568
-+<U28B6>     /x81/x37/xe7/x36 BRAILLE PATTERN DOTS-23568
-+<U28B7>     /x81/x37/xe7/x37 BRAILLE PATTERN DOTS-123568
-+<U28B8>     /x81/x37/xe7/x38 BRAILLE PATTERN DOTS-4568
-+<U28B9>     /x81/x37/xe7/x39 BRAILLE PATTERN DOTS-14568
-+<U28BA>     /x81/x37/xe8/x30 BRAILLE PATTERN DOTS-24568
-+<U28BB>     /x81/x37/xe8/x31 BRAILLE PATTERN DOTS-124568
-+<U28BC>     /x81/x37/xe8/x32 BRAILLE PATTERN DOTS-34568
-+<U28BD>     /x81/x37/xe8/x33 BRAILLE PATTERN DOTS-134568
-+<U28BE>     /x81/x37/xe8/x34 BRAILLE PATTERN DOTS-234568
-+<U28BF>     /x81/x37/xe8/x35 BRAILLE PATTERN DOTS-1234568
-+<U28C0>     /x81/x37/xe8/x36 BRAILLE PATTERN DOTS-78
-+<U28C1>     /x81/x37/xe8/x37 BRAILLE PATTERN DOTS-178
-+<U28C2>     /x81/x37/xe8/x38 BRAILLE PATTERN DOTS-278
-+<U28C3>     /x81/x37/xe8/x39 BRAILLE PATTERN DOTS-1278
-+<U28C4>     /x81/x37/xe9/x30 BRAILLE PATTERN DOTS-378
-+<U28C5>     /x81/x37/xe9/x31 BRAILLE PATTERN DOTS-1378
-+<U28C6>     /x81/x37/xe9/x32 BRAILLE PATTERN DOTS-2378
-+<U28C7>     /x81/x37/xe9/x33 BRAILLE PATTERN DOTS-12378
-+<U28C8>     /x81/x37/xe9/x34 BRAILLE PATTERN DOTS-478
-+<U28C9>     /x81/x37/xe9/x35 BRAILLE PATTERN DOTS-1478
-+<U28CA>     /x81/x37/xe9/x36 BRAILLE PATTERN DOTS-2478
-+<U28CB>     /x81/x37/xe9/x37 BRAILLE PATTERN DOTS-12478
-+<U28CC>     /x81/x37/xe9/x38 BRAILLE PATTERN DOTS-3478
-+<U28CD>     /x81/x37/xe9/x39 BRAILLE PATTERN DOTS-13478
-+<U28CE>     /x81/x37/xea/x30 BRAILLE PATTERN DOTS-23478
-+<U28CF>     /x81/x37/xea/x31 BRAILLE PATTERN DOTS-123478
-+<U28D0>     /x81/x37/xea/x32 BRAILLE PATTERN DOTS-578
-+<U28D1>     /x81/x37/xea/x33 BRAILLE PATTERN DOTS-1578
-+<U28D2>     /x81/x37/xea/x34 BRAILLE PATTERN DOTS-2578
-+<U28D3>     /x81/x37/xea/x35 BRAILLE PATTERN DOTS-12578
-+<U28D4>     /x81/x37/xea/x36 BRAILLE PATTERN DOTS-3578
-+<U28D5>     /x81/x37/xea/x37 BRAILLE PATTERN DOTS-13578
-+<U28D6>     /x81/x37/xea/x38 BRAILLE PATTERN DOTS-23578
-+<U28D7>     /x81/x37/xea/x39 BRAILLE PATTERN DOTS-123578
-+<U28D8>     /x81/x37/xeb/x30 BRAILLE PATTERN DOTS-4578
-+<U28D9>     /x81/x37/xeb/x31 BRAILLE PATTERN DOTS-14578
-+<U28DA>     /x81/x37/xeb/x32 BRAILLE PATTERN DOTS-24578
-+<U28DB>     /x81/x37/xeb/x33 BRAILLE PATTERN DOTS-124578
-+<U28DC>     /x81/x37/xeb/x34 BRAILLE PATTERN DOTS-34578
-+<U28DD>     /x81/x37/xeb/x35 BRAILLE PATTERN DOTS-134578
-+<U28DE>     /x81/x37/xeb/x36 BRAILLE PATTERN DOTS-234578
-+<U28DF>     /x81/x37/xeb/x37 BRAILLE PATTERN DOTS-1234578
-+<U28E0>     /x81/x37/xeb/x38 BRAILLE PATTERN DOTS-678
-+<U28E1>     /x81/x37/xeb/x39 BRAILLE PATTERN DOTS-1678
-+<U28E2>     /x81/x37/xec/x30 BRAILLE PATTERN DOTS-2678
-+<U28E3>     /x81/x37/xec/x31 BRAILLE PATTERN DOTS-12678
-+<U28E4>     /x81/x37/xec/x32 BRAILLE PATTERN DOTS-3678
-+<U28E5>     /x81/x37/xec/x33 BRAILLE PATTERN DOTS-13678
-+<U28E6>     /x81/x37/xec/x34 BRAILLE PATTERN DOTS-23678
-+<U28E7>     /x81/x37/xec/x35 BRAILLE PATTERN DOTS-123678
-+<U28E8>     /x81/x37/xec/x36 BRAILLE PATTERN DOTS-4678
-+<U28E9>     /x81/x37/xec/x37 BRAILLE PATTERN DOTS-14678
-+<U28EA>     /x81/x37/xec/x38 BRAILLE PATTERN DOTS-24678
-+<U28EB>     /x81/x37/xec/x39 BRAILLE PATTERN DOTS-124678
-+<U28EC>     /x81/x37/xed/x30 BRAILLE PATTERN DOTS-34678
-+<U28ED>     /x81/x37/xed/x31 BRAILLE PATTERN DOTS-134678
-+<U28EE>     /x81/x37/xed/x32 BRAILLE PATTERN DOTS-234678
-+<U28EF>     /x81/x37/xed/x33 BRAILLE PATTERN DOTS-1234678
-+<U28F0>     /x81/x37/xed/x34 BRAILLE PATTERN DOTS-5678
-+<U28F1>     /x81/x37/xed/x35 BRAILLE PATTERN DOTS-15678
-+<U28F2>     /x81/x37/xed/x36 BRAILLE PATTERN DOTS-25678
-+<U28F3>     /x81/x37/xed/x37 BRAILLE PATTERN DOTS-125678
-+<U28F4>     /x81/x37/xed/x38 BRAILLE PATTERN DOTS-35678
-+<U28F5>     /x81/x37/xed/x39 BRAILLE PATTERN DOTS-135678
-+<U28F6>     /x81/x37/xee/x30 BRAILLE PATTERN DOTS-235678
-+<U28F7>     /x81/x37/xee/x31 BRAILLE PATTERN DOTS-1235678
-+<U28F8>     /x81/x37/xee/x32 BRAILLE PATTERN DOTS-45678
-+<U28F9>     /x81/x37/xee/x33 BRAILLE PATTERN DOTS-145678
-+<U28FA>     /x81/x37/xee/x34 BRAILLE PATTERN DOTS-245678
-+<U28FB>     /x81/x37/xee/x35 BRAILLE PATTERN DOTS-1245678
-+<U28FC>     /x81/x37/xee/x36 BRAILLE PATTERN DOTS-345678
-+<U28FD>     /x81/x37/xee/x37 BRAILLE PATTERN DOTS-1345678
-+<U28FE>     /x81/x37/xee/x38 BRAILLE PATTERN DOTS-2345678
-+<U28FF>     /x81/x37/xee/x39 BRAILLE PATTERN DOTS-12345678
-+<U2900>     /x81/x37/xef/x30 RIGHTWARDS TWO-HEADED ARROW WITH VERTICAL STROKE
-+<U2901>     /x81/x37/xef/x31 RIGHTWARDS TWO-HEADED ARROW WITH DOUBLE VERTICAL STROKE
-+<U2902>     /x81/x37/xef/x32 LEFTWARDS DOUBLE ARROW WITH VERTICAL STROKE
-+<U2903>     /x81/x37/xef/x33 RIGHTWARDS DOUBLE ARROW WITH VERTICAL STROKE
-+<U2904>     /x81/x37/xef/x34 LEFT RIGHT DOUBLE ARROW WITH VERTICAL STROKE
-+<U2905>     /x81/x37/xef/x35 RIGHTWARDS TWO-HEADED ARROW FROM BAR
-+<U2906>     /x81/x37/xef/x36 LEFTWARDS DOUBLE ARROW FROM BAR
-+<U2907>     /x81/x37/xef/x37 RIGHTWARDS DOUBLE ARROW FROM BAR
-+<U2908>     /x81/x37/xef/x38 DOWNWARDS ARROW WITH HORIZONTAL STROKE
-+<U2909>     /x81/x37/xef/x39 UPWARDS ARROW WITH HORIZONTAL STROKE
-+<U290A>     /x81/x37/xf0/x30 UPWARDS TRIPLE ARROW
-+<U290B>     /x81/x37/xf0/x31 DOWNWARDS TRIPLE ARROW
-+<U290C>     /x81/x37/xf0/x32 LEFTWARDS DOUBLE DASH ARROW
-+<U290D>     /x81/x37/xf0/x33 RIGHTWARDS DOUBLE DASH ARROW
-+<U290E>     /x81/x37/xf0/x34 LEFTWARDS TRIPLE DASH ARROW
-+<U290F>     /x81/x37/xf0/x35 RIGHTWARDS TRIPLE DASH ARROW
-+<U2910>     /x81/x37/xf0/x36 RIGHTWARDS TWO-HEADED TRIPLE DASH ARROW
-+<U2911>     /x81/x37/xf0/x37 RIGHTWARDS ARROW WITH DOTTED STEM
-+<U2912>     /x81/x37/xf0/x38 UPWARDS ARROW TO BAR
-+<U2913>     /x81/x37/xf0/x39 DOWNWARDS ARROW TO BAR
-+<U2914>     /x81/x37/xf1/x30 RIGHTWARDS ARROW WITH TAIL WITH VERTICAL STROKE
-+<U2915>     /x81/x37/xf1/x31 RIGHTWARDS ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE
-+<U2916>     /x81/x37/xf1/x32 RIGHTWARDS TWO-HEADED ARROW WITH TAIL
-+<U2917>     /x81/x37/xf1/x33 RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH VERTICAL STROKE
-+<U2918>     /x81/x37/xf1/x34 RIGHTWARDS TWO-HEADED ARROW WITH TAIL WITH DOUBLE VERTICAL STROKE
-+<U2919>     /x81/x37/xf1/x35 LEFTWARDS ARROW-TAIL
-+<U291A>     /x81/x37/xf1/x36 RIGHTWARDS ARROW-TAIL
-+<U291B>     /x81/x37/xf1/x37 LEFTWARDS DOUBLE ARROW-TAIL
-+<U291C>     /x81/x37/xf1/x38 RIGHTWARDS DOUBLE ARROW-TAIL
-+<U291D>     /x81/x37/xf1/x39 LEFTWARDS ARROW TO BLACK DIAMOND
-+<U291E>     /x81/x37/xf2/x30 RIGHTWARDS ARROW TO BLACK DIAMOND
-+<U291F>     /x81/x37/xf2/x31 LEFTWARDS ARROW FROM BAR TO BLACK DIAMOND
-+<U2920>     /x81/x37/xf2/x32 RIGHTWARDS ARROW FROM BAR TO BLACK DIAMOND
-+<U2921>     /x81/x37/xf2/x33 NORTH WEST AND SOUTH EAST ARROW
-+<U2922>     /x81/x37/xf2/x34 NORTH EAST AND SOUTH WEST ARROW
-+<U2923>     /x81/x37/xf2/x35 NORTH WEST ARROW WITH HOOK
-+<U2924>     /x81/x37/xf2/x36 NORTH EAST ARROW WITH HOOK
-+<U2925>     /x81/x37/xf2/x37 SOUTH EAST ARROW WITH HOOK
-+<U2926>     /x81/x37/xf2/x38 SOUTH WEST ARROW WITH HOOK
-+<U2927>     /x81/x37/xf2/x39 NORTH WEST ARROW AND NORTH EAST ARROW
-+<U2928>     /x81/x37/xf3/x30 NORTH EAST ARROW AND SOUTH EAST ARROW
-+<U2929>     /x81/x37/xf3/x31 SOUTH EAST ARROW AND SOUTH WEST ARROW
-+<U292A>     /x81/x37/xf3/x32 SOUTH WEST ARROW AND NORTH WEST ARROW
-+<U292B>     /x81/x37/xf3/x33 RISING DIAGONAL CROSSING FALLING DIAGONAL
-+<U292C>     /x81/x37/xf3/x34 FALLING DIAGONAL CROSSING RISING DIAGONAL
-+<U292D>     /x81/x37/xf3/x35 SOUTH EAST ARROW CROSSING NORTH EAST ARROW
-+<U292E>     /x81/x37/xf3/x36 NORTH EAST ARROW CROSSING SOUTH EAST ARROW
-+<U292F>     /x81/x37/xf3/x37 FALLING DIAGONAL CROSSING NORTH EAST ARROW
-+<U2930>     /x81/x37/xf3/x38 RISING DIAGONAL CROSSING SOUTH EAST ARROW
-+<U2931>     /x81/x37/xf3/x39 NORTH EAST ARROW CROSSING NORTH WEST ARROW
-+<U2932>     /x81/x37/xf4/x30 NORTH WEST ARROW CROSSING NORTH EAST ARROW
-+<U2933>     /x81/x37/xf4/x31 WAVE ARROW POINTING DIRECTLY RIGHT
-+<U2934>     /x81/x37/xf4/x32 ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
-+<U2935>     /x81/x37/xf4/x33 ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
-+<U2936>     /x81/x37/xf4/x34 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS
-+<U2937>     /x81/x37/xf4/x35 ARROW POINTING DOWNWARDS THEN CURVING RIGHTWARDS
-+<U2938>     /x81/x37/xf4/x36 RIGHT-SIDE ARC CLOCKWISE ARROW
-+<U2939>     /x81/x37/xf4/x37 LEFT-SIDE ARC ANTICLOCKWISE ARROW
-+<U293A>     /x81/x37/xf4/x38 TOP ARC ANTICLOCKWISE ARROW
-+<U293B>     /x81/x37/xf4/x39 BOTTOM ARC ANTICLOCKWISE ARROW
-+<U293C>     /x81/x37/xf5/x30 TOP ARC CLOCKWISE ARROW WITH MINUS
-+<U293D>     /x81/x37/xf5/x31 TOP ARC ANTICLOCKWISE ARROW WITH PLUS
-+<U293E>     /x81/x37/xf5/x32 LOWER RIGHT SEMICIRCULAR CLOCKWISE ARROW
-+<U293F>     /x81/x37/xf5/x33 LOWER LEFT SEMICIRCULAR ANTICLOCKWISE ARROW
-+<U2940>     /x81/x37/xf5/x34 ANTICLOCKWISE CLOSED CIRCLE ARROW
-+<U2941>     /x81/x37/xf5/x35 CLOCKWISE CLOSED CIRCLE ARROW
-+<U2942>     /x81/x37/xf5/x36 RIGHTWARDS ARROW ABOVE SHORT LEFTWARDS ARROW
-+<U2943>     /x81/x37/xf5/x37 LEFTWARDS ARROW ABOVE SHORT RIGHTWARDS ARROW
-+<U2944>     /x81/x37/xf5/x38 SHORT RIGHTWARDS ARROW ABOVE LEFTWARDS ARROW
-+<U2945>     /x81/x37/xf5/x39 RIGHTWARDS ARROW WITH PLUS BELOW
-+<U2946>     /x81/x37/xf6/x30 LEFTWARDS ARROW WITH PLUS BELOW
-+<U2947>     /x81/x37/xf6/x31 RIGHTWARDS ARROW THROUGH X
-+<U2948>     /x81/x37/xf6/x32 LEFT RIGHT ARROW THROUGH SMALL CIRCLE
-+<U2949>     /x81/x37/xf6/x33 UPWARDS TWO-HEADED ARROW FROM SMALL CIRCLE
-+<U294A>     /x81/x37/xf6/x34 LEFT BARB UP RIGHT BARB DOWN HARPOON
-+<U294B>     /x81/x37/xf6/x35 LEFT BARB DOWN RIGHT BARB UP HARPOON
-+<U294C>     /x81/x37/xf6/x36 UP BARB RIGHT DOWN BARB LEFT HARPOON
-+<U294D>     /x81/x37/xf6/x37 UP BARB LEFT DOWN BARB RIGHT HARPOON
-+<U294E>     /x81/x37/xf6/x38 LEFT BARB UP RIGHT BARB UP HARPOON
-+<U294F>     /x81/x37/xf6/x39 UP BARB RIGHT DOWN BARB RIGHT HARPOON
-+<U2950>     /x81/x37/xf7/x30 LEFT BARB DOWN RIGHT BARB DOWN HARPOON
-+<U2951>     /x81/x37/xf7/x31 UP BARB LEFT DOWN BARB LEFT HARPOON
-+<U2952>     /x81/x37/xf7/x32 LEFTWARDS HARPOON WITH BARB UP TO BAR
-+<U2953>     /x81/x37/xf7/x33 RIGHTWARDS HARPOON WITH BARB UP TO BAR
-+<U2954>     /x81/x37/xf7/x34 UPWARDS HARPOON WITH BARB RIGHT TO BAR
-+<U2955>     /x81/x37/xf7/x35 DOWNWARDS HARPOON WITH BARB RIGHT TO BAR
-+<U2956>     /x81/x37/xf7/x36 LEFTWARDS HARPOON WITH BARB DOWN TO BAR
-+<U2957>     /x81/x37/xf7/x37 RIGHTWARDS HARPOON WITH BARB DOWN TO BAR
-+<U2958>     /x81/x37/xf7/x38 UPWARDS HARPOON WITH BARB LEFT TO BAR
-+<U2959>     /x81/x37/xf7/x39 DOWNWARDS HARPOON WITH BARB LEFT TO BAR
-+<U295A>     /x81/x37/xf8/x30 LEFTWARDS HARPOON WITH BARB UP FROM BAR
-+<U295B>     /x81/x37/xf8/x31 RIGHTWARDS HARPOON WITH BARB UP FROM BAR
-+<U295C>     /x81/x37/xf8/x32 UPWARDS HARPOON WITH BARB RIGHT FROM BAR
-+<U295D>     /x81/x37/xf8/x33 DOWNWARDS HARPOON WITH BARB RIGHT FROM BAR
-+<U295E>     /x81/x37/xf8/x34 LEFTWARDS HARPOON WITH BARB DOWN FROM BAR
-+<U295F>     /x81/x37/xf8/x35 RIGHTWARDS HARPOON WITH BARB DOWN FROM BAR
-+<U2960>     /x81/x37/xf8/x36 UPWARDS HARPOON WITH BARB LEFT FROM BAR
-+<U2961>     /x81/x37/xf8/x37 DOWNWARDS HARPOON WITH BARB LEFT FROM BAR
-+<U2962>     /x81/x37/xf8/x38 LEFTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB DOWN
-+<U2963>     /x81/x37/xf8/x39 UPWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT
-+<U2964>     /x81/x37/xf9/x30 RIGHTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB DOWN
-+<U2965>     /x81/x37/xf9/x31 DOWNWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT
-+<U2966>     /x81/x37/xf9/x32 LEFTWARDS HARPOON WITH BARB UP ABOVE RIGHTWARDS HARPOON WITH BARB UP
-+<U2967>     /x81/x37/xf9/x33 LEFTWARDS HARPOON WITH BARB DOWN ABOVE RIGHTWARDS HARPOON WITH BARB DOWN
-+<U2968>     /x81/x37/xf9/x34 RIGHTWARDS HARPOON WITH BARB UP ABOVE LEFTWARDS HARPOON WITH BARB UP
-+<U2969>     /x81/x37/xf9/x35 RIGHTWARDS HARPOON WITH BARB DOWN ABOVE LEFTWARDS HARPOON WITH BARB DOWN
-+<U296A>     /x81/x37/xf9/x36 LEFTWARDS HARPOON WITH BARB UP ABOVE LONG DASH
-+<U296B>     /x81/x37/xf9/x37 LEFTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH
-+<U296C>     /x81/x37/xf9/x38 RIGHTWARDS HARPOON WITH BARB UP ABOVE LONG DASH
-+<U296D>     /x81/x37/xf9/x39 RIGHTWARDS HARPOON WITH BARB DOWN BELOW LONG DASH
-+<U296E>     /x81/x37/xfa/x30 UPWARDS HARPOON WITH BARB LEFT BESIDE DOWNWARDS HARPOON WITH BARB RIGHT
-+<U296F>     /x81/x37/xfa/x31 DOWNWARDS HARPOON WITH BARB LEFT BESIDE UPWARDS HARPOON WITH BARB RIGHT
-+<U2970>     /x81/x37/xfa/x32 RIGHT DOUBLE ARROW WITH ROUNDED HEAD
-+<U2971>     /x81/x37/xfa/x33 EQUALS SIGN ABOVE RIGHTWARDS ARROW
-+<U2972>     /x81/x37/xfa/x34 TILDE OPERATOR ABOVE RIGHTWARDS ARROW
-+<U2973>     /x81/x37/xfa/x35 LEFTWARDS ARROW ABOVE TILDE OPERATOR
-+<U2974>     /x81/x37/xfa/x36 RIGHTWARDS ARROW ABOVE TILDE OPERATOR
-+<U2975>     /x81/x37/xfa/x37 RIGHTWARDS ARROW ABOVE ALMOST EQUAL TO
-+<U2976>     /x81/x37/xfa/x38 LESS-THAN ABOVE LEFTWARDS ARROW
-+<U2977>     /x81/x37/xfa/x39 LEFTWARDS ARROW THROUGH LESS-THAN
-+<U2978>     /x81/x37/xfb/x30 GREATER-THAN ABOVE RIGHTWARDS ARROW
-+<U2979>     /x81/x37/xfb/x31 SUBSET ABOVE RIGHTWARDS ARROW
-+<U297A>     /x81/x37/xfb/x32 LEFTWARDS ARROW THROUGH SUBSET
-+<U297B>     /x81/x37/xfb/x33 SUPERSET ABOVE LEFTWARDS ARROW
-+<U297C>     /x81/x37/xfb/x34 LEFT FISH TAIL
-+<U297D>     /x81/x37/xfb/x35 RIGHT FISH TAIL
-+<U297E>     /x81/x37/xfb/x36 UP FISH TAIL
-+<U297F>     /x81/x37/xfb/x37 DOWN FISH TAIL
-+<U2980>     /x81/x37/xfb/x38 TRIPLE VERTICAL BAR DELIMITER
-+<U2981>     /x81/x37/xfb/x39 Z NOTATION SPOT
-+<U2982>     /x81/x37/xfc/x30 Z NOTATION TYPE COLON
-+<U2983>     /x81/x37/xfc/x31 LEFT WHITE CURLY BRACKET
-+<U2984>     /x81/x37/xfc/x32 RIGHT WHITE CURLY BRACKET
-+<U2985>     /x81/x37/xfc/x33 LEFT WHITE PARENTHESIS
-+<U2986>     /x81/x37/xfc/x34 RIGHT WHITE PARENTHESIS
-+<U2987>     /x81/x37/xfc/x35 Z NOTATION LEFT IMAGE BRACKET
-+<U2988>     /x81/x37/xfc/x36 Z NOTATION RIGHT IMAGE BRACKET
-+<U2989>     /x81/x37/xfc/x37 Z NOTATION LEFT BINDING BRACKET
-+<U298A>     /x81/x37/xfc/x38 Z NOTATION RIGHT BINDING BRACKET
-+<U298B>     /x81/x37/xfc/x39 LEFT SQUARE BRACKET WITH UNDERBAR
-+<U298C>     /x81/x37/xfd/x30 RIGHT SQUARE BRACKET WITH UNDERBAR
-+<U298D>     /x81/x37/xfd/x31 LEFT SQUARE BRACKET WITH TICK IN TOP CORNER
-+<U298E>     /x81/x37/xfd/x32 RIGHT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
-+<U298F>     /x81/x37/xfd/x33 LEFT SQUARE BRACKET WITH TICK IN BOTTOM CORNER
-+<U2990>     /x81/x37/xfd/x34 RIGHT SQUARE BRACKET WITH TICK IN TOP CORNER
-+<U2991>     /x81/x37/xfd/x35 LEFT ANGLE BRACKET WITH DOT
-+<U2992>     /x81/x37/xfd/x36 RIGHT ANGLE BRACKET WITH DOT
-+<U2993>     /x81/x37/xfd/x37 LEFT ARC LESS-THAN BRACKET
-+<U2994>     /x81/x37/xfd/x38 RIGHT ARC GREATER-THAN BRACKET
-+<U2995>     /x81/x37/xfd/x39 DOUBLE LEFT ARC GREATER-THAN BRACKET
-+<U2996>     /x81/x37/xfe/x30 DOUBLE RIGHT ARC LESS-THAN BRACKET
-+<U2997>     /x81/x37/xfe/x31 LEFT BLACK TORTOISE SHELL BRACKET
-+<U2998>     /x81/x37/xfe/x32 RIGHT BLACK TORTOISE SHELL BRACKET
-+<U2999>     /x81/x37/xfe/x33 DOTTED FENCE
-+<U299A>     /x81/x37/xfe/x34 VERTICAL ZIGZAG LINE
-+<U299B>     /x81/x37/xfe/x35 MEASURED ANGLE OPENING LEFT
-+<U299C>     /x81/x37/xfe/x36 RIGHT ANGLE VARIANT WITH SQUARE
-+<U299D>     /x81/x37/xfe/x37 MEASURED RIGHT ANGLE WITH DOT
-+<U299E>     /x81/x37/xfe/x38 ANGLE WITH S INSIDE
-+<U299F>     /x81/x37/xfe/x39 ACUTE ANGLE
-+<U29A0>     /x81/x38/x81/x30 SPHERICAL ANGLE OPENING LEFT
-+<U29A1>     /x81/x38/x81/x31 SPHERICAL ANGLE OPENING UP
-+<U29A2>     /x81/x38/x81/x32 TURNED ANGLE
-+<U29A3>     /x81/x38/x81/x33 REVERSED ANGLE
-+<U29A4>     /x81/x38/x81/x34 ANGLE WITH UNDERBAR
-+<U29A5>     /x81/x38/x81/x35 REVERSED ANGLE WITH UNDERBAR
-+<U29A6>     /x81/x38/x81/x36 OBLIQUE ANGLE OPENING UP
-+<U29A7>     /x81/x38/x81/x37 OBLIQUE ANGLE OPENING DOWN
-+<U29A8>     /x81/x38/x81/x38 MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND RIGHT
-+<U29A9>     /x81/x38/x81/x39 MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING UP AND LEFT
-+<U29AA>     /x81/x38/x82/x30 MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND RIGHT
-+<U29AB>     /x81/x38/x82/x31 MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING DOWN AND LEFT
-+<U29AC>     /x81/x38/x82/x32 MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND UP
-+<U29AD>     /x81/x38/x82/x33 MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND UP
-+<U29AE>     /x81/x38/x82/x34 MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING RIGHT AND DOWN
-+<U29AF>     /x81/x38/x82/x35 MEASURED ANGLE WITH OPEN ARM ENDING IN ARROW POINTING LEFT AND DOWN
-+<U29B0>     /x81/x38/x82/x36 REVERSED EMPTY SET
-+<U29B1>     /x81/x38/x82/x37 EMPTY SET WITH OVERBAR
-+<U29B2>     /x81/x38/x82/x38 EMPTY SET WITH SMALL CIRCLE ABOVE
-+<U29B3>     /x81/x38/x82/x39 EMPTY SET WITH RIGHT ARROW ABOVE
-+<U29B4>     /x81/x38/x83/x30 EMPTY SET WITH LEFT ARROW ABOVE
-+<U29B5>     /x81/x38/x83/x31 CIRCLE WITH HORIZONTAL BAR
-+<U29B6>     /x81/x38/x83/x32 CIRCLED VERTICAL BAR
-+<U29B7>     /x81/x38/x83/x33 CIRCLED PARALLEL
-+<U29B8>     /x81/x38/x83/x34 CIRCLED REVERSE SOLIDUS
-+<U29B9>     /x81/x38/x83/x35 CIRCLED PERPENDICULAR
-+<U29BA>     /x81/x38/x83/x36 CIRCLE DIVIDED BY HORIZONTAL BAR AND TOP HALF DIVIDED BY VERTICAL BAR
-+<U29BB>     /x81/x38/x83/x37 CIRCLE WITH SUPERIMPOSED X
-+<U29BC>     /x81/x38/x83/x38 CIRCLED ANTICLOCKWISE-ROTATED DIVISION SIGN
-+<U29BD>     /x81/x38/x83/x39 UP ARROW THROUGH CIRCLE
-+<U29BE>     /x81/x38/x84/x30 CIRCLED WHITE BULLET
-+<U29BF>     /x81/x38/x84/x31 CIRCLED BULLET
-+<U29C0>     /x81/x38/x84/x32 CIRCLED LESS-THAN
-+<U29C1>     /x81/x38/x84/x33 CIRCLED GREATER-THAN
-+<U29C2>     /x81/x38/x84/x34 CIRCLE WITH SMALL CIRCLE TO THE RIGHT
-+<U29C3>     /x81/x38/x84/x35 CIRCLE WITH TWO HORIZONTAL STROKES TO THE RIGHT
-+<U29C4>     /x81/x38/x84/x36 SQUARED RISING DIAGONAL SLASH
-+<U29C5>     /x81/x38/x84/x37 SQUARED FALLING DIAGONAL SLASH
-+<U29C6>     /x81/x38/x84/x38 SQUARED ASTERISK
-+<U29C7>     /x81/x38/x84/x39 SQUARED SMALL CIRCLE
-+<U29C8>     /x81/x38/x85/x30 SQUARED SQUARE
-+<U29C9>     /x81/x38/x85/x31 TWO JOINED SQUARES
-+<U29CA>     /x81/x38/x85/x32 TRIANGLE WITH DOT ABOVE
-+<U29CB>     /x81/x38/x85/x33 TRIANGLE WITH UNDERBAR
-+<U29CC>     /x81/x38/x85/x34 S IN TRIANGLE
-+<U29CD>     /x81/x38/x85/x35 TRIANGLE WITH SERIFS AT BOTTOM
-+<U29CE>     /x81/x38/x85/x36 RIGHT TRIANGLE ABOVE LEFT TRIANGLE
-+<U29CF>     /x81/x38/x85/x37 LEFT TRIANGLE BESIDE VERTICAL BAR
-+<U29D0>     /x81/x38/x85/x38 VERTICAL BAR BESIDE RIGHT TRIANGLE
-+<U29D1>     /x81/x38/x85/x39 BOWTIE WITH LEFT HALF BLACK
-+<U29D2>     /x81/x38/x86/x30 BOWTIE WITH RIGHT HALF BLACK
-+<U29D3>     /x81/x38/x86/x31 BLACK BOWTIE
-+<U29D4>     /x81/x38/x86/x32 TIMES WITH LEFT HALF BLACK
-+<U29D5>     /x81/x38/x86/x33 TIMES WITH RIGHT HALF BLACK
-+<U29D6>     /x81/x38/x86/x34 WHITE HOURGLASS
-+<U29D7>     /x81/x38/x86/x35 BLACK HOURGLASS
-+<U29D8>     /x81/x38/x86/x36 LEFT WIGGLY FENCE
-+<U29D9>     /x81/x38/x86/x37 RIGHT WIGGLY FENCE
-+<U29DA>     /x81/x38/x86/x38 LEFT DOUBLE WIGGLY FENCE
-+<U29DB>     /x81/x38/x86/x39 RIGHT DOUBLE WIGGLY FENCE
-+<U29DC>     /x81/x38/x87/x30 INCOMPLETE INFINITY
-+<U29DD>     /x81/x38/x87/x31 TIE OVER INFINITY
-+<U29DE>     /x81/x38/x87/x32 INFINITY NEGATED WITH VERTICAL BAR
-+<U29DF>     /x81/x38/x87/x33 DOUBLE-ENDED MULTIMAP
-+<U29E0>     /x81/x38/x87/x34 SQUARE WITH CONTOURED OUTLINE
-+<U29E1>     /x81/x38/x87/x35 INCREASES AS
-+<U29E2>     /x81/x38/x87/x36 SHUFFLE PRODUCT
-+<U29E3>     /x81/x38/x87/x37 EQUALS SIGN AND SLANTED PARALLEL
-+<U29E4>     /x81/x38/x87/x38 EQUALS SIGN AND SLANTED PARALLEL WITH TILDE ABOVE
-+<U29E5>     /x81/x38/x87/x39 IDENTICAL TO AND SLANTED PARALLEL
-+<U29E6>     /x81/x38/x88/x30 GLEICH STARK
-+<U29E7>     /x81/x38/x88/x31 THERMODYNAMIC
-+<U29E8>     /x81/x38/x88/x32 DOWN-POINTING TRIANGLE WITH LEFT HALF BLACK
-+<U29E9>     /x81/x38/x88/x33 DOWN-POINTING TRIANGLE WITH RIGHT HALF BLACK
-+<U29EA>     /x81/x38/x88/x34 BLACK DIAMOND WITH DOWN ARROW
-+<U29EB>     /x81/x38/x88/x35 BLACK LOZENGE
-+<U29EC>     /x81/x38/x88/x36 WHITE CIRCLE WITH DOWN ARROW
-+<U29ED>     /x81/x38/x88/x37 BLACK CIRCLE WITH DOWN ARROW
-+<U29EE>     /x81/x38/x88/x38 ERROR-BARRED WHITE SQUARE
-+<U29EF>     /x81/x38/x88/x39 ERROR-BARRED BLACK SQUARE
-+<U29F0>     /x81/x38/x89/x30 ERROR-BARRED WHITE DIAMOND
-+<U29F1>     /x81/x38/x89/x31 ERROR-BARRED BLACK DIAMOND
-+<U29F2>     /x81/x38/x89/x32 ERROR-BARRED WHITE CIRCLE
-+<U29F3>     /x81/x38/x89/x33 ERROR-BARRED BLACK CIRCLE
-+<U29F4>     /x81/x38/x89/x34 RULE-DELAYED
-+<U29F5>     /x81/x38/x89/x35 REVERSE SOLIDUS OPERATOR
-+<U29F6>     /x81/x38/x89/x36 SOLIDUS WITH OVERBAR
-+<U29F7>     /x81/x38/x89/x37 REVERSE SOLIDUS WITH HORIZONTAL STROKE
-+<U29F8>     /x81/x38/x89/x38 BIG SOLIDUS
-+<U29F9>     /x81/x38/x89/x39 BIG REVERSE SOLIDUS
-+<U29FA>     /x81/x38/x8a/x30 DOUBLE PLUS
-+<U29FB>     /x81/x38/x8a/x31 TRIPLE PLUS
-+<U29FC>     /x81/x38/x8a/x32 LEFT-POINTING CURVED ANGLE BRACKET
-+<U29FD>     /x81/x38/x8a/x33 RIGHT-POINTING CURVED ANGLE BRACKET
-+<U29FE>     /x81/x38/x8a/x34 TINY
-+<U29FF>     /x81/x38/x8a/x35 MINY
-+<U2A00>     /x81/x38/x8a/x36 N-ARY CIRCLED DOT OPERATOR
-+<U2A01>     /x81/x38/x8a/x37 N-ARY CIRCLED PLUS OPERATOR
-+<U2A02>     /x81/x38/x8a/x38 N-ARY CIRCLED TIMES OPERATOR
-+<U2A03>     /x81/x38/x8a/x39 N-ARY UNION OPERATOR WITH DOT
-+<U2A04>     /x81/x38/x8b/x30 N-ARY UNION OPERATOR WITH PLUS
-+<U2A05>     /x81/x38/x8b/x31 N-ARY SQUARE INTERSECTION OPERATOR
-+<U2A06>     /x81/x38/x8b/x32 N-ARY SQUARE UNION OPERATOR
-+<U2A07>     /x81/x38/x8b/x33 TWO LOGICAL AND OPERATOR
-+<U2A08>     /x81/x38/x8b/x34 TWO LOGICAL OR OPERATOR
-+<U2A09>     /x81/x38/x8b/x35 N-ARY TIMES OPERATOR
-+<U2A0A>     /x81/x38/x8b/x36 MODULO TWO SUM
-+<U2A0B>     /x81/x38/x8b/x37 SUMMATION WITH INTEGRAL
-+<U2A0C>     /x81/x38/x8b/x38 QUADRUPLE INTEGRAL OPERATOR
-+<U2A0D>     /x81/x38/x8b/x39 FINITE PART INTEGRAL
-+<U2A0E>     /x81/x38/x8c/x30 INTEGRAL WITH DOUBLE STROKE
-+<U2A0F>     /x81/x38/x8c/x31 INTEGRAL AVERAGE WITH SLASH
-+<U2A10>     /x81/x38/x8c/x32 CIRCULATION FUNCTION
-+<U2A11>     /x81/x38/x8c/x33 ANTICLOCKWISE INTEGRATION
-+<U2A12>     /x81/x38/x8c/x34 LINE INTEGRATION WITH RECTANGULAR PATH AROUND POLE
-+<U2A13>     /x81/x38/x8c/x35 LINE INTEGRATION WITH SEMICIRCULAR PATH AROUND POLE
-+<U2A14>     /x81/x38/x8c/x36 LINE INTEGRATION NOT INCLUDING THE POLE
-+<U2A15>     /x81/x38/x8c/x37 INTEGRAL AROUND A POINT OPERATOR
-+<U2A16>     /x81/x38/x8c/x38 QUATERNION INTEGRAL OPERATOR
-+<U2A17>     /x81/x38/x8c/x39 INTEGRAL WITH LEFTWARDS ARROW WITH HOOK
-+<U2A18>     /x81/x38/x8d/x30 INTEGRAL WITH TIMES SIGN
-+<U2A19>     /x81/x38/x8d/x31 INTEGRAL WITH INTERSECTION
-+<U2A1A>     /x81/x38/x8d/x32 INTEGRAL WITH UNION
-+<U2A1B>     /x81/x38/x8d/x33 INTEGRAL WITH OVERBAR
-+<U2A1C>     /x81/x38/x8d/x34 INTEGRAL WITH UNDERBAR
-+<U2A1D>     /x81/x38/x8d/x35 JOIN
-+<U2A1E>     /x81/x38/x8d/x36 LARGE LEFT TRIANGLE OPERATOR
-+<U2A1F>     /x81/x38/x8d/x37 Z NOTATION SCHEMA COMPOSITION
-+<U2A20>     /x81/x38/x8d/x38 Z NOTATION SCHEMA PIPING
-+<U2A21>     /x81/x38/x8d/x39 Z NOTATION SCHEMA PROJECTION
-+<U2A22>     /x81/x38/x8e/x30 PLUS SIGN WITH SMALL CIRCLE ABOVE
-+<U2A23>     /x81/x38/x8e/x31 PLUS SIGN WITH CIRCUMFLEX ACCENT ABOVE
-+<U2A24>     /x81/x38/x8e/x32 PLUS SIGN WITH TILDE ABOVE
-+<U2A25>     /x81/x38/x8e/x33 PLUS SIGN WITH DOT BELOW
-+<U2A26>     /x81/x38/x8e/x34 PLUS SIGN WITH TILDE BELOW
-+<U2A27>     /x81/x38/x8e/x35 PLUS SIGN WITH SUBSCRIPT TWO
-+<U2A28>     /x81/x38/x8e/x36 PLUS SIGN WITH BLACK TRIANGLE
-+<U2A29>     /x81/x38/x8e/x37 MINUS SIGN WITH COMMA ABOVE
-+<U2A2A>     /x81/x38/x8e/x38 MINUS SIGN WITH DOT BELOW
-+<U2A2B>     /x81/x38/x8e/x39 MINUS SIGN WITH FALLING DOTS
-+<U2A2C>     /x81/x38/x8f/x30 MINUS SIGN WITH RISING DOTS
-+<U2A2D>     /x81/x38/x8f/x31 PLUS SIGN IN LEFT HALF CIRCLE
-+<U2A2E>     /x81/x38/x8f/x32 PLUS SIGN IN RIGHT HALF CIRCLE
-+<U2A2F>     /x81/x38/x8f/x33 VECTOR OR CROSS PRODUCT
-+<U2A30>     /x81/x38/x8f/x34 MULTIPLICATION SIGN WITH DOT ABOVE
-+<U2A31>     /x81/x38/x8f/x35 MULTIPLICATION SIGN WITH UNDERBAR
-+<U2A32>     /x81/x38/x8f/x36 SEMIDIRECT PRODUCT WITH BOTTOM CLOSED
-+<U2A33>     /x81/x38/x8f/x37 SMASH PRODUCT
-+<U2A34>     /x81/x38/x8f/x38 MULTIPLICATION SIGN IN LEFT HALF CIRCLE
-+<U2A35>     /x81/x38/x8f/x39 MULTIPLICATION SIGN IN RIGHT HALF CIRCLE
-+<U2A36>     /x81/x38/x90/x30 CIRCLED MULTIPLICATION SIGN WITH CIRCUMFLEX ACCENT
-+<U2A37>     /x81/x38/x90/x31 MULTIPLICATION SIGN IN DOUBLE CIRCLE
-+<U2A38>     /x81/x38/x90/x32 CIRCLED DIVISION SIGN
-+<U2A39>     /x81/x38/x90/x33 PLUS SIGN IN TRIANGLE
-+<U2A3A>     /x81/x38/x90/x34 MINUS SIGN IN TRIANGLE
-+<U2A3B>     /x81/x38/x90/x35 MULTIPLICATION SIGN IN TRIANGLE
-+<U2A3C>     /x81/x38/x90/x36 INTERIOR PRODUCT
-+<U2A3D>     /x81/x38/x90/x37 RIGHTHAND INTERIOR PRODUCT
-+<U2A3E>     /x81/x38/x90/x38 Z NOTATION RELATIONAL COMPOSITION
-+<U2A3F>     /x81/x38/x90/x39 AMALGAMATION OR COPRODUCT
-+<U2A40>     /x81/x38/x91/x30 INTERSECTION WITH DOT
-+<U2A41>     /x81/x38/x91/x31 UNION WITH MINUS SIGN
-+<U2A42>     /x81/x38/x91/x32 UNION WITH OVERBAR
-+<U2A43>     /x81/x38/x91/x33 INTERSECTION WITH OVERBAR
-+<U2A44>     /x81/x38/x91/x34 INTERSECTION WITH LOGICAL AND
-+<U2A45>     /x81/x38/x91/x35 UNION WITH LOGICAL OR
-+<U2A46>     /x81/x38/x91/x36 UNION ABOVE INTERSECTION
-+<U2A47>     /x81/x38/x91/x37 INTERSECTION ABOVE UNION
-+<U2A48>     /x81/x38/x91/x38 UNION ABOVE BAR ABOVE INTERSECTION
-+<U2A49>     /x81/x38/x91/x39 INTERSECTION ABOVE BAR ABOVE UNION
-+<U2A4A>     /x81/x38/x92/x30 UNION BESIDE AND JOINED WITH UNION
-+<U2A4B>     /x81/x38/x92/x31 INTERSECTION BESIDE AND JOINED WITH INTERSECTION
-+<U2A4C>     /x81/x38/x92/x32 CLOSED UNION WITH SERIFS
-+<U2A4D>     /x81/x38/x92/x33 CLOSED INTERSECTION WITH SERIFS
-+<U2A4E>     /x81/x38/x92/x34 DOUBLE SQUARE INTERSECTION
-+<U2A4F>     /x81/x38/x92/x35 DOUBLE SQUARE UNION
-+<U2A50>     /x81/x38/x92/x36 CLOSED UNION WITH SERIFS AND SMASH PRODUCT
-+<U2A51>     /x81/x38/x92/x37 LOGICAL AND WITH DOT ABOVE
-+<U2A52>     /x81/x38/x92/x38 LOGICAL OR WITH DOT ABOVE
-+<U2A53>     /x81/x38/x92/x39 DOUBLE LOGICAL AND
-+<U2A54>     /x81/x38/x93/x30 DOUBLE LOGICAL OR
-+<U2A55>     /x81/x38/x93/x31 TWO INTERSECTING LOGICAL AND
-+<U2A56>     /x81/x38/x93/x32 TWO INTERSECTING LOGICAL OR
-+<U2A57>     /x81/x38/x93/x33 SLOPING LARGE OR
-+<U2A58>     /x81/x38/x93/x34 SLOPING LARGE AND
-+<U2A59>     /x81/x38/x93/x35 LOGICAL OR OVERLAPPING LOGICAL AND
-+<U2A5A>     /x81/x38/x93/x36 LOGICAL AND WITH MIDDLE STEM
-+<U2A5B>     /x81/x38/x93/x37 LOGICAL OR WITH MIDDLE STEM
-+<U2A5C>     /x81/x38/x93/x38 LOGICAL AND WITH HORIZONTAL DASH
-+<U2A5D>     /x81/x38/x93/x39 LOGICAL OR WITH HORIZONTAL DASH
-+<U2A5E>     /x81/x38/x94/x30 LOGICAL AND WITH DOUBLE OVERBAR
-+<U2A5F>     /x81/x38/x94/x31 LOGICAL AND WITH UNDERBAR
-+<U2A60>     /x81/x38/x94/x32 LOGICAL AND WITH DOUBLE UNDERBAR
-+<U2A61>     /x81/x38/x94/x33 SMALL VEE WITH UNDERBAR
-+<U2A62>     /x81/x38/x94/x34 LOGICAL OR WITH DOUBLE OVERBAR
-+<U2A63>     /x81/x38/x94/x35 LOGICAL OR WITH DOUBLE UNDERBAR
-+<U2A64>     /x81/x38/x94/x36 Z NOTATION DOMAIN ANTIRESTRICTION
-+<U2A65>     /x81/x38/x94/x37 Z NOTATION RANGE ANTIRESTRICTION
-+<U2A66>     /x81/x38/x94/x38 EQUALS SIGN WITH DOT BELOW
-+<U2A67>     /x81/x38/x94/x39 IDENTICAL WITH DOT ABOVE
-+<U2A68>     /x81/x38/x95/x30 TRIPLE HORIZONTAL BAR WITH DOUBLE VERTICAL STROKE
-+<U2A69>     /x81/x38/x95/x31 TRIPLE HORIZONTAL BAR WITH TRIPLE VERTICAL STROKE
-+<U2A6A>     /x81/x38/x95/x32 TILDE OPERATOR WITH DOT ABOVE
-+<U2A6B>     /x81/x38/x95/x33 TILDE OPERATOR WITH RISING DOTS
-+<U2A6C>     /x81/x38/x95/x34 SIMILAR MINUS SIMILAR
-+<U2A6D>     /x81/x38/x95/x35 CONGRUENT WITH DOT ABOVE
-+<U2A6E>     /x81/x38/x95/x36 EQUALS WITH ASTERISK
-+<U2A6F>     /x81/x38/x95/x37 ALMOST EQUAL TO WITH CIRCUMFLEX ACCENT
-+<U2A70>     /x81/x38/x95/x38 APPROXIMATELY EQUAL OR EQUAL TO
-+<U2A71>     /x81/x38/x95/x39 EQUALS SIGN ABOVE PLUS SIGN
-+<U2A72>     /x81/x38/x96/x30 PLUS SIGN ABOVE EQUALS SIGN
-+<U2A73>     /x81/x38/x96/x31 EQUALS SIGN ABOVE TILDE OPERATOR
-+<U2A74>     /x81/x38/x96/x32 DOUBLE COLON EQUAL
-+<U2A75>     /x81/x38/x96/x33 TWO CONSECUTIVE EQUALS SIGNS
-+<U2A76>     /x81/x38/x96/x34 THREE CONSECUTIVE EQUALS SIGNS
-+<U2A77>     /x81/x38/x96/x35 EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW
-+<U2A78>     /x81/x38/x96/x36 EQUIVALENT WITH FOUR DOTS ABOVE
-+<U2A79>     /x81/x38/x96/x37 LESS-THAN WITH CIRCLE INSIDE
-+<U2A7A>     /x81/x38/x96/x38 GREATER-THAN WITH CIRCLE INSIDE
-+<U2A7B>     /x81/x38/x96/x39 LESS-THAN WITH QUESTION MARK ABOVE
-+<U2A7C>     /x81/x38/x97/x30 GREATER-THAN WITH QUESTION MARK ABOVE
-+<U2A7D>     /x81/x38/x97/x31 LESS-THAN OR SLANTED EQUAL TO
-+<U2A7E>     /x81/x38/x97/x32 GREATER-THAN OR SLANTED EQUAL TO
-+<U2A7F>     /x81/x38/x97/x33 LESS-THAN OR SLANTED EQUAL TO WITH DOT INSIDE
-+<U2A80>     /x81/x38/x97/x34 GREATER-THAN OR SLANTED EQUAL TO WITH DOT INSIDE
-+<U2A81>     /x81/x38/x97/x35 LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE
-+<U2A82>     /x81/x38/x97/x36 GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE
-+<U2A83>     /x81/x38/x97/x37 LESS-THAN OR SLANTED EQUAL TO WITH DOT ABOVE RIGHT
-+<U2A84>     /x81/x38/x97/x38 GREATER-THAN OR SLANTED EQUAL TO WITH DOT ABOVE LEFT
-+<U2A85>     /x81/x38/x97/x39 LESS-THAN OR APPROXIMATE
-+<U2A86>     /x81/x38/x98/x30 GREATER-THAN OR APPROXIMATE
-+<U2A87>     /x81/x38/x98/x31 LESS-THAN AND SINGLE-LINE NOT EQUAL TO
-+<U2A88>     /x81/x38/x98/x32 GREATER-THAN AND SINGLE-LINE NOT EQUAL TO
-+<U2A89>     /x81/x38/x98/x33 LESS-THAN AND NOT APPROXIMATE
-+<U2A8A>     /x81/x38/x98/x34 GREATER-THAN AND NOT APPROXIMATE
-+<U2A8B>     /x81/x38/x98/x35 LESS-THAN ABOVE DOUBLE-LINE EQUAL ABOVE GREATER-THAN
-+<U2A8C>     /x81/x38/x98/x36 GREATER-THAN ABOVE DOUBLE-LINE EQUAL ABOVE LESS-THAN
-+<U2A8D>     /x81/x38/x98/x37 LESS-THAN ABOVE SIMILAR OR EQUAL
-+<U2A8E>     /x81/x38/x98/x38 GREATER-THAN ABOVE SIMILAR OR EQUAL
-+<U2A8F>     /x81/x38/x98/x39 LESS-THAN ABOVE SIMILAR ABOVE GREATER-THAN
-+<U2A90>     /x81/x38/x99/x30 GREATER-THAN ABOVE SIMILAR ABOVE LESS-THAN
-+<U2A91>     /x81/x38/x99/x31 LESS-THAN ABOVE GREATER-THAN ABOVE DOUBLE-LINE EQUAL
-+<U2A92>     /x81/x38/x99/x32 GREATER-THAN ABOVE LESS-THAN ABOVE DOUBLE-LINE EQUAL
-+<U2A93>     /x81/x38/x99/x33 LESS-THAN ABOVE SLANTED EQUAL ABOVE GREATER-THAN ABOVE SLANTED EQUAL
-+<U2A94>     /x81/x38/x99/x34 GREATER-THAN ABOVE SLANTED EQUAL ABOVE LESS-THAN ABOVE SLANTED EQUAL
-+<U2A95>     /x81/x38/x99/x35 SLANTED EQUAL TO OR LESS-THAN
-+<U2A96>     /x81/x38/x99/x36 SLANTED EQUAL TO OR GREATER-THAN
-+<U2A97>     /x81/x38/x99/x37 SLANTED EQUAL TO OR LESS-THAN WITH DOT INSIDE
-+<U2A98>     /x81/x38/x99/x38 SLANTED EQUAL TO OR GREATER-THAN WITH DOT INSIDE
-+<U2A99>     /x81/x38/x99/x39 DOUBLE-LINE EQUAL TO OR LESS-THAN
-+<U2A9A>     /x81/x38/x9a/x30 DOUBLE-LINE EQUAL TO OR GREATER-THAN
-+<U2A9B>     /x81/x38/x9a/x31 DOUBLE-LINE SLANTED EQUAL TO OR LESS-THAN
-+<U2A9C>     /x81/x38/x9a/x32 DOUBLE-LINE SLANTED EQUAL TO OR GREATER-THAN
-+<U2A9D>     /x81/x38/x9a/x33 SIMILAR OR LESS-THAN
-+<U2A9E>     /x81/x38/x9a/x34 SIMILAR OR GREATER-THAN
-+<U2A9F>     /x81/x38/x9a/x35 SIMILAR ABOVE LESS-THAN ABOVE EQUALS SIGN
-+<U2AA0>     /x81/x38/x9a/x36 SIMILAR ABOVE GREATER-THAN ABOVE EQUALS SIGN
-+<U2AA1>     /x81/x38/x9a/x37 DOUBLE NESTED LESS-THAN
-+<U2AA2>     /x81/x38/x9a/x38 DOUBLE NESTED GREATER-THAN
-+<U2AA3>     /x81/x38/x9a/x39 DOUBLE NESTED LESS-THAN WITH UNDERBAR
-+<U2AA4>     /x81/x38/x9b/x30 GREATER-THAN OVERLAPPING LESS-THAN
-+<U2AA5>     /x81/x38/x9b/x31 GREATER-THAN BESIDE LESS-THAN
-+<U2AA6>     /x81/x38/x9b/x32 LESS-THAN CLOSED BY CURVE
-+<U2AA7>     /x81/x38/x9b/x33 GREATER-THAN CLOSED BY CURVE
-+<U2AA8>     /x81/x38/x9b/x34 LESS-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL
-+<U2AA9>     /x81/x38/x9b/x35 GREATER-THAN CLOSED BY CURVE ABOVE SLANTED EQUAL
-+<U2AAA>     /x81/x38/x9b/x36 SMALLER THAN
-+<U2AAB>     /x81/x38/x9b/x37 LARGER THAN
-+<U2AAC>     /x81/x38/x9b/x38 SMALLER THAN OR EQUAL TO
-+<U2AAD>     /x81/x38/x9b/x39 LARGER THAN OR EQUAL TO
-+<U2AAE>     /x81/x38/x9c/x30 EQUALS SIGN WITH BUMPY ABOVE
-+<U2AAF>     /x81/x38/x9c/x31 PRECEDES ABOVE SINGLE-LINE EQUALS SIGN
-+<U2AB0>     /x81/x38/x9c/x32 SUCCEEDS ABOVE SINGLE-LINE EQUALS SIGN
-+<U2AB1>     /x81/x38/x9c/x33 PRECEDES ABOVE SINGLE-LINE NOT EQUAL TO
-+<U2AB2>     /x81/x38/x9c/x34 SUCCEEDS ABOVE SINGLE-LINE NOT EQUAL TO
-+<U2AB3>     /x81/x38/x9c/x35 PRECEDES ABOVE EQUALS SIGN
-+<U2AB4>     /x81/x38/x9c/x36 SUCCEEDS ABOVE EQUALS SIGN
-+<U2AB5>     /x81/x38/x9c/x37 PRECEDES ABOVE NOT EQUAL TO
-+<U2AB6>     /x81/x38/x9c/x38 SUCCEEDS ABOVE NOT EQUAL TO
-+<U2AB7>     /x81/x38/x9c/x39 PRECEDES ABOVE ALMOST EQUAL TO
-+<U2AB8>     /x81/x38/x9d/x30 SUCCEEDS ABOVE ALMOST EQUAL TO
-+<U2AB9>     /x81/x38/x9d/x31 PRECEDES ABOVE NOT ALMOST EQUAL TO
-+<U2ABA>     /x81/x38/x9d/x32 SUCCEEDS ABOVE NOT ALMOST EQUAL TO
-+<U2ABB>     /x81/x38/x9d/x33 DOUBLE PRECEDES
-+<U2ABC>     /x81/x38/x9d/x34 DOUBLE SUCCEEDS
-+<U2ABD>     /x81/x38/x9d/x35 SUBSET WITH DOT
-+<U2ABE>     /x81/x38/x9d/x36 SUPERSET WITH DOT
-+<U2ABF>     /x81/x38/x9d/x37 SUBSET WITH PLUS SIGN BELOW
-+<U2AC0>     /x81/x38/x9d/x38 SUPERSET WITH PLUS SIGN BELOW
-+<U2AC1>     /x81/x38/x9d/x39 SUBSET WITH MULTIPLICATION SIGN BELOW
-+<U2AC2>     /x81/x38/x9e/x30 SUPERSET WITH MULTIPLICATION SIGN BELOW
-+<U2AC3>     /x81/x38/x9e/x31 SUBSET OF OR EQUAL TO WITH DOT ABOVE
-+<U2AC4>     /x81/x38/x9e/x32 SUPERSET OF OR EQUAL TO WITH DOT ABOVE
-+<U2AC5>     /x81/x38/x9e/x33 SUBSET OF ABOVE EQUALS SIGN
-+<U2AC6>     /x81/x38/x9e/x34 SUPERSET OF ABOVE EQUALS SIGN
-+<U2AC7>     /x81/x38/x9e/x35 SUBSET OF ABOVE TILDE OPERATOR
-+<U2AC8>     /x81/x38/x9e/x36 SUPERSET OF ABOVE TILDE OPERATOR
-+<U2AC9>     /x81/x38/x9e/x37 SUBSET OF ABOVE ALMOST EQUAL TO
-+<U2ACA>     /x81/x38/x9e/x38 SUPERSET OF ABOVE ALMOST EQUAL TO
-+<U2ACB>     /x81/x38/x9e/x39 SUBSET OF ABOVE NOT EQUAL TO
-+<U2ACC>     /x81/x38/x9f/x30 SUPERSET OF ABOVE NOT EQUAL TO
-+<U2ACD>     /x81/x38/x9f/x31 SQUARE LEFT OPEN BOX OPERATOR
-+<U2ACE>     /x81/x38/x9f/x32 SQUARE RIGHT OPEN BOX OPERATOR
-+<U2ACF>     /x81/x38/x9f/x33 CLOSED SUBSET
-+<U2AD0>     /x81/x38/x9f/x34 CLOSED SUPERSET
-+<U2AD1>     /x81/x38/x9f/x35 CLOSED SUBSET OR EQUAL TO
-+<U2AD2>     /x81/x38/x9f/x36 CLOSED SUPERSET OR EQUAL TO
-+<U2AD3>     /x81/x38/x9f/x37 SUBSET ABOVE SUPERSET
-+<U2AD4>     /x81/x38/x9f/x38 SUPERSET ABOVE SUBSET
-+<U2AD5>     /x81/x38/x9f/x39 SUBSET ABOVE SUBSET
-+<U2AD6>     /x81/x38/xa0/x30 SUPERSET ABOVE SUPERSET
-+<U2AD7>     /x81/x38/xa0/x31 SUPERSET BESIDE SUBSET
-+<U2AD8>     /x81/x38/xa0/x32 SUPERSET BESIDE AND JOINED BY DASH WITH SUBSET
-+<U2AD9>     /x81/x38/xa0/x33 ELEMENT OF OPENING DOWNWARDS
-+<U2ADA>     /x81/x38/xa0/x34 PITCHFORK WITH TEE TOP
-+<U2ADB>     /x81/x38/xa0/x35 TRANSVERSAL INTERSECTION
-+<U2ADC>     /x81/x38/xa0/x36 FORKING
-+<U2ADD>     /x81/x38/xa0/x37 NONFORKING
-+<U2ADE>     /x81/x38/xa0/x38 SHORT LEFT TACK
-+<U2ADF>     /x81/x38/xa0/x39 SHORT DOWN TACK
-+<U2AE0>     /x81/x38/xa1/x30 SHORT UP TACK
-+<U2AE1>     /x81/x38/xa1/x31 PERPENDICULAR WITH S
-+<U2AE2>     /x81/x38/xa1/x32 VERTICAL BAR TRIPLE RIGHT TURNSTILE
-+<U2AE3>     /x81/x38/xa1/x33 DOUBLE VERTICAL BAR LEFT TURNSTILE
-+<U2AE4>     /x81/x38/xa1/x34 VERTICAL BAR DOUBLE LEFT TURNSTILE
-+<U2AE5>     /x81/x38/xa1/x35 DOUBLE VERTICAL BAR DOUBLE LEFT TURNSTILE
-+<U2AE6>     /x81/x38/xa1/x36 LONG DASH FROM LEFT MEMBER OF DOUBLE VERTICAL
-+<U2AE7>     /x81/x38/xa1/x37 SHORT DOWN TACK WITH OVERBAR
-+<U2AE8>     /x81/x38/xa1/x38 SHORT UP TACK WITH UNDERBAR
-+<U2AE9>     /x81/x38/xa1/x39 SHORT UP TACK ABOVE SHORT DOWN TACK
-+<U2AEA>     /x81/x38/xa2/x30 DOUBLE DOWN TACK
-+<U2AEB>     /x81/x38/xa2/x31 DOUBLE UP TACK
-+<U2AEC>     /x81/x38/xa2/x32 DOUBLE STROKE NOT SIGN
-+<U2AED>     /x81/x38/xa2/x33 REVERSED DOUBLE STROKE NOT SIGN
-+<U2AEE>     /x81/x38/xa2/x34 DOES NOT DIVIDE WITH REVERSED NEGATION SLASH
-+<U2AEF>     /x81/x38/xa2/x35 VERTICAL LINE WITH CIRCLE ABOVE
-+<U2AF0>     /x81/x38/xa2/x36 VERTICAL LINE WITH CIRCLE BELOW
-+<U2AF1>     /x81/x38/xa2/x37 DOWN TACK WITH CIRCLE BELOW
-+<U2AF2>     /x81/x38/xa2/x38 PARALLEL WITH HORIZONTAL STROKE
-+<U2AF3>     /x81/x38/xa2/x39 PARALLEL WITH TILDE OPERATOR
-+<U2AF4>     /x81/x38/xa3/x30 TRIPLE VERTICAL BAR BINARY RELATION
-+<U2AF5>     /x81/x38/xa3/x31 TRIPLE VERTICAL BAR WITH HORIZONTAL STROKE
-+<U2AF6>     /x81/x38/xa3/x32 TRIPLE COLON OPERATOR
-+<U2AF7>     /x81/x38/xa3/x33 TRIPLE NESTED LESS-THAN
-+<U2AF8>     /x81/x38/xa3/x34 TRIPLE NESTED GREATER-THAN
-+<U2AF9>     /x81/x38/xa3/x35 DOUBLE-LINE SLANTED LESS-THAN OR EQUAL TO
-+<U2AFA>     /x81/x38/xa3/x36 DOUBLE-LINE SLANTED GREATER-THAN OR EQUAL TO
-+<U2AFB>     /x81/x38/xa3/x37 TRIPLE SOLIDUS BINARY RELATION
-+<U2AFC>     /x81/x38/xa3/x38 LARGE TRIPLE VERTICAL BAR OPERATOR
-+<U2AFD>     /x81/x38/xa3/x39 DOUBLE SOLIDUS OPERATOR
-+<U2AFE>     /x81/x38/xa4/x30 WHITE VERTICAL BAR
-+<U2AFF>     /x81/x38/xa4/x31 N-ARY WHITE VERTICAL BAR
-+<U2B00>     /x81/x38/xa4/x32 <UNASSIGNED>
-+<U2B01>     /x81/x38/xa4/x33 <UNASSIGNED>
-+<U2B02>     /x81/x38/xa4/x34 <UNASSIGNED>
-+<U2B03>     /x81/x38/xa4/x35 <UNASSIGNED>
-+<U2B04>     /x81/x38/xa4/x36 <UNASSIGNED>
-+<U2B05>     /x81/x38/xa4/x37 <UNASSIGNED>
-+<U2B06>     /x81/x38/xa4/x38 <UNASSIGNED>
-+<U2B07>     /x81/x38/xa4/x39 <UNASSIGNED>
-+<U2B08>     /x81/x38/xa5/x30 <UNASSIGNED>
-+<U2B09>     /x81/x38/xa5/x31 <UNASSIGNED>
-+<U2B0A>     /x81/x38/xa5/x32 <UNASSIGNED>
-+<U2B0B>     /x81/x38/xa5/x33 <UNASSIGNED>
-+<U2B0C>     /x81/x38/xa5/x34 <UNASSIGNED>
-+<U2B0D>     /x81/x38/xa5/x35 <UNASSIGNED>
-+<U2B0E>     /x81/x38/xa5/x36 <UNASSIGNED>
-+<U2B0F>     /x81/x38/xa5/x37 <UNASSIGNED>
-+<U2B10>     /x81/x38/xa5/x38 <UNASSIGNED>
-+<U2B11>     /x81/x38/xa5/x39 <UNASSIGNED>
-+<U2B12>     /x81/x38/xa6/x30 <UNASSIGNED>
-+<U2B13>     /x81/x38/xa6/x31 <UNASSIGNED>
-+<U2B14>     /x81/x38/xa6/x32 <UNASSIGNED>
-+<U2B15>     /x81/x38/xa6/x33 <UNASSIGNED>
-+<U2B16>     /x81/x38/xa6/x34 <UNASSIGNED>
-+<U2B17>     /x81/x38/xa6/x35 <UNASSIGNED>
-+<U2B18>     /x81/x38/xa6/x36 <UNASSIGNED>
-+<U2B19>     /x81/x38/xa6/x37 <UNASSIGNED>
-+<U2B1A>     /x81/x38/xa6/x38 <UNASSIGNED>
-+<U2B1B>     /x81/x38/xa6/x39 <UNASSIGNED>
-+<U2B1C>     /x81/x38/xa7/x30 <UNASSIGNED>
-+<U2B1D>     /x81/x38/xa7/x31 <UNASSIGNED>
-+<U2B1E>     /x81/x38/xa7/x32 <UNASSIGNED>
-+<U2B1F>     /x81/x38/xa7/x33 <UNASSIGNED>
-+<U2B20>     /x81/x38/xa7/x34 <UNASSIGNED>
-+<U2B21>     /x81/x38/xa7/x35 <UNASSIGNED>
-+<U2B22>     /x81/x38/xa7/x36 <UNASSIGNED>
-+<U2B23>     /x81/x38/xa7/x37 <UNASSIGNED>
-+<U2B24>     /x81/x38/xa7/x38 <UNASSIGNED>
-+<U2B25>     /x81/x38/xa7/x39 <UNASSIGNED>
-+<U2B26>     /x81/x38/xa8/x30 <UNASSIGNED>
-+<U2B27>     /x81/x38/xa8/x31 <UNASSIGNED>
-+<U2B28>     /x81/x38/xa8/x32 <UNASSIGNED>
-+<U2B29>     /x81/x38/xa8/x33 <UNASSIGNED>
-+<U2B2A>     /x81/x38/xa8/x34 <UNASSIGNED>
-+<U2B2B>     /x81/x38/xa8/x35 <UNASSIGNED>
-+<U2B2C>     /x81/x38/xa8/x36 <UNASSIGNED>
-+<U2B2D>     /x81/x38/xa8/x37 <UNASSIGNED>
-+<U2B2E>     /x81/x38/xa8/x38 <UNASSIGNED>
-+<U2B2F>     /x81/x38/xa8/x39 <UNASSIGNED>
-+<U2B30>     /x81/x38/xa9/x30 <UNASSIGNED>
-+<U2B31>     /x81/x38/xa9/x31 <UNASSIGNED>
-+<U2B32>     /x81/x38/xa9/x32 <UNASSIGNED>
-+<U2B33>     /x81/x38/xa9/x33 <UNASSIGNED>
-+<U2B34>     /x81/x38/xa9/x34 <UNASSIGNED>
-+<U2B35>     /x81/x38/xa9/x35 <UNASSIGNED>
-+<U2B36>     /x81/x38/xa9/x36 <UNASSIGNED>
-+<U2B37>     /x81/x38/xa9/x37 <UNASSIGNED>
-+<U2B38>     /x81/x38/xa9/x38 <UNASSIGNED>
-+<U2B39>     /x81/x38/xa9/x39 <UNASSIGNED>
-+<U2B3A>     /x81/x38/xaa/x30 <UNASSIGNED>
-+<U2B3B>     /x81/x38/xaa/x31 <UNASSIGNED>
-+<U2B3C>     /x81/x38/xaa/x32 <UNASSIGNED>
-+<U2B3D>     /x81/x38/xaa/x33 <UNASSIGNED>
-+<U2B3E>     /x81/x38/xaa/x34 <UNASSIGNED>
-+<U2B3F>     /x81/x38/xaa/x35 <UNASSIGNED>
-+<U2B40>     /x81/x38/xaa/x36 <UNASSIGNED>
-+<U2B41>     /x81/x38/xaa/x37 <UNASSIGNED>
-+<U2B42>     /x81/x38/xaa/x38 <UNASSIGNED>
-+<U2B43>     /x81/x38/xaa/x39 <UNASSIGNED>
-+<U2B44>     /x81/x38/xab/x30 <UNASSIGNED>
-+<U2B45>     /x81/x38/xab/x31 <UNASSIGNED>
-+<U2B46>     /x81/x38/xab/x32 <UNASSIGNED>
-+<U2B47>     /x81/x38/xab/x33 <UNASSIGNED>
-+<U2B48>     /x81/x38/xab/x34 <UNASSIGNED>
-+<U2B49>     /x81/x38/xab/x35 <UNASSIGNED>
-+<U2B4A>     /x81/x38/xab/x36 <UNASSIGNED>
-+<U2B4B>     /x81/x38/xab/x37 <UNASSIGNED>
-+<U2B4C>     /x81/x38/xab/x38 <UNASSIGNED>
-+<U2B4D>     /x81/x38/xab/x39 <UNASSIGNED>
-+<U2B4E>     /x81/x38/xac/x30 <UNASSIGNED>
-+<U2B4F>     /x81/x38/xac/x31 <UNASSIGNED>
-+<U2B50>     /x81/x38/xac/x32 <UNASSIGNED>
-+<U2B51>     /x81/x38/xac/x33 <UNASSIGNED>
-+<U2B52>     /x81/x38/xac/x34 <UNASSIGNED>
-+<U2B53>     /x81/x38/xac/x35 <UNASSIGNED>
-+<U2B54>     /x81/x38/xac/x36 <UNASSIGNED>
-+<U2B55>     /x81/x38/xac/x37 <UNASSIGNED>
-+<U2B56>     /x81/x38/xac/x38 <UNASSIGNED>
-+<U2B57>     /x81/x38/xac/x39 <UNASSIGNED>
-+<U2B58>     /x81/x38/xad/x30 <UNASSIGNED>
-+<U2B59>     /x81/x38/xad/x31 <UNASSIGNED>
-+<U2B5A>     /x81/x38/xad/x32 <UNASSIGNED>
-+<U2B5B>     /x81/x38/xad/x33 <UNASSIGNED>
-+<U2B5C>     /x81/x38/xad/x34 <UNASSIGNED>
-+<U2B5D>     /x81/x38/xad/x35 <UNASSIGNED>
-+<U2B5E>     /x81/x38/xad/x36 <UNASSIGNED>
-+<U2B5F>     /x81/x38/xad/x37 <UNASSIGNED>
-+<U2B60>     /x81/x38/xad/x38 <UNASSIGNED>
-+<U2B61>     /x81/x38/xad/x39 <UNASSIGNED>
-+<U2B62>     /x81/x38/xae/x30 <UNASSIGNED>
-+<U2B63>     /x81/x38/xae/x31 <UNASSIGNED>
-+<U2B64>     /x81/x38/xae/x32 <UNASSIGNED>
-+<U2B65>     /x81/x38/xae/x33 <UNASSIGNED>
-+<U2B66>     /x81/x38/xae/x34 <UNASSIGNED>
-+<U2B67>     /x81/x38/xae/x35 <UNASSIGNED>
-+<U2B68>     /x81/x38/xae/x36 <UNASSIGNED>
-+<U2B69>     /x81/x38/xae/x37 <UNASSIGNED>
-+<U2B6A>     /x81/x38/xae/x38 <UNASSIGNED>
-+<U2B6B>     /x81/x38/xae/x39 <UNASSIGNED>
-+<U2B6C>     /x81/x38/xaf/x30 <UNASSIGNED>
-+<U2B6D>     /x81/x38/xaf/x31 <UNASSIGNED>
-+<U2B6E>     /x81/x38/xaf/x32 <UNASSIGNED>
-+<U2B6F>     /x81/x38/xaf/x33 <UNASSIGNED>
-+<U2B70>     /x81/x38/xaf/x34 <UNASSIGNED>
-+<U2B71>     /x81/x38/xaf/x35 <UNASSIGNED>
-+<U2B72>     /x81/x38/xaf/x36 <UNASSIGNED>
-+<U2B73>     /x81/x38/xaf/x37 <UNASSIGNED>
-+<U2B74>     /x81/x38/xaf/x38 <UNASSIGNED>
-+<U2B75>     /x81/x38/xaf/x39 <UNASSIGNED>
-+<U2B76>     /x81/x38/xb0/x30 <UNASSIGNED>
-+<U2B77>     /x81/x38/xb0/x31 <UNASSIGNED>
-+<U2B78>     /x81/x38/xb0/x32 <UNASSIGNED>
-+<U2B79>     /x81/x38/xb0/x33 <UNASSIGNED>
-+<U2B7A>     /x81/x38/xb0/x34 <UNASSIGNED>
-+<U2B7B>     /x81/x38/xb0/x35 <UNASSIGNED>
-+<U2B7C>     /x81/x38/xb0/x36 <UNASSIGNED>
-+<U2B7D>     /x81/x38/xb0/x37 <UNASSIGNED>
-+<U2B7E>     /x81/x38/xb0/x38 <UNASSIGNED>
-+<U2B7F>     /x81/x38/xb0/x39 <UNASSIGNED>
-+<U2B80>     /x81/x38/xb1/x30 <UNASSIGNED>
-+<U2B81>     /x81/x38/xb1/x31 <UNASSIGNED>
-+<U2B82>     /x81/x38/xb1/x32 <UNASSIGNED>
-+<U2B83>     /x81/x38/xb1/x33 <UNASSIGNED>
-+<U2B84>     /x81/x38/xb1/x34 <UNASSIGNED>
-+<U2B85>     /x81/x38/xb1/x35 <UNASSIGNED>
-+<U2B86>     /x81/x38/xb1/x36 <UNASSIGNED>
-+<U2B87>     /x81/x38/xb1/x37 <UNASSIGNED>
-+<U2B88>     /x81/x38/xb1/x38 <UNASSIGNED>
-+<U2B89>     /x81/x38/xb1/x39 <UNASSIGNED>
-+<U2B8A>     /x81/x38/xb2/x30 <UNASSIGNED>
-+<U2B8B>     /x81/x38/xb2/x31 <UNASSIGNED>
-+<U2B8C>     /x81/x38/xb2/x32 <UNASSIGNED>
-+<U2B8D>     /x81/x38/xb2/x33 <UNASSIGNED>
-+<U2B8E>     /x81/x38/xb2/x34 <UNASSIGNED>
-+<U2B8F>     /x81/x38/xb2/x35 <UNASSIGNED>
-+<U2B90>     /x81/x38/xb2/x36 <UNASSIGNED>
-+<U2B91>     /x81/x38/xb2/x37 <UNASSIGNED>
-+<U2B92>     /x81/x38/xb2/x38 <UNASSIGNED>
-+<U2B93>     /x81/x38/xb2/x39 <UNASSIGNED>
-+<U2B94>     /x81/x38/xb3/x30 <UNASSIGNED>
-+<U2B95>     /x81/x38/xb3/x31 <UNASSIGNED>
-+<U2B96>     /x81/x38/xb3/x32 <UNASSIGNED>
-+<U2B97>     /x81/x38/xb3/x33 <UNASSIGNED>
-+<U2B98>     /x81/x38/xb3/x34 <UNASSIGNED>
-+<U2B99>     /x81/x38/xb3/x35 <UNASSIGNED>
-+<U2B9A>     /x81/x38/xb3/x36 <UNASSIGNED>
-+<U2B9B>     /x81/x38/xb3/x37 <UNASSIGNED>
-+<U2B9C>     /x81/x38/xb3/x38 <UNASSIGNED>
-+<U2B9D>     /x81/x38/xb3/x39 <UNASSIGNED>
-+<U2B9E>     /x81/x38/xb4/x30 <UNASSIGNED>
-+<U2B9F>     /x81/x38/xb4/x31 <UNASSIGNED>
-+<U2BA0>     /x81/x38/xb4/x32 <UNASSIGNED>
-+<U2BA1>     /x81/x38/xb4/x33 <UNASSIGNED>
-+<U2BA2>     /x81/x38/xb4/x34 <UNASSIGNED>
-+<U2BA3>     /x81/x38/xb4/x35 <UNASSIGNED>
-+<U2BA4>     /x81/x38/xb4/x36 <UNASSIGNED>
-+<U2BA5>     /x81/x38/xb4/x37 <UNASSIGNED>
-+<U2BA6>     /x81/x38/xb4/x38 <UNASSIGNED>
-+<U2BA7>     /x81/x38/xb4/x39 <UNASSIGNED>
-+<U2BA8>     /x81/x38/xb5/x30 <UNASSIGNED>
-+<U2BA9>     /x81/x38/xb5/x31 <UNASSIGNED>
-+<U2BAA>     /x81/x38/xb5/x32 <UNASSIGNED>
-+<U2BAB>     /x81/x38/xb5/x33 <UNASSIGNED>
-+<U2BAC>     /x81/x38/xb5/x34 <UNASSIGNED>
-+<U2BAD>     /x81/x38/xb5/x35 <UNASSIGNED>
-+<U2BAE>     /x81/x38/xb5/x36 <UNASSIGNED>
-+<U2BAF>     /x81/x38/xb5/x37 <UNASSIGNED>
-+<U2BB0>     /x81/x38/xb5/x38 <UNASSIGNED>
-+<U2BB1>     /x81/x38/xb5/x39 <UNASSIGNED>
-+<U2BB2>     /x81/x38/xb6/x30 <UNASSIGNED>
-+<U2BB3>     /x81/x38/xb6/x31 <UNASSIGNED>
-+<U2BB4>     /x81/x38/xb6/x32 <UNASSIGNED>
-+<U2BB5>     /x81/x38/xb6/x33 <UNASSIGNED>
-+<U2BB6>     /x81/x38/xb6/x34 <UNASSIGNED>
-+<U2BB7>     /x81/x38/xb6/x35 <UNASSIGNED>
-+<U2BB8>     /x81/x38/xb6/x36 <UNASSIGNED>
-+<U2BB9>     /x81/x38/xb6/x37 <UNASSIGNED>
-+<U2BBA>     /x81/x38/xb6/x38 <UNASSIGNED>
-+<U2BBB>     /x81/x38/xb6/x39 <UNASSIGNED>
-+<U2BBC>     /x81/x38/xb7/x30 <UNASSIGNED>
-+<U2BBD>     /x81/x38/xb7/x31 <UNASSIGNED>
-+<U2BBE>     /x81/x38/xb7/x32 <UNASSIGNED>
-+<U2BBF>     /x81/x38/xb7/x33 <UNASSIGNED>
-+<U2BC0>     /x81/x38/xb7/x34 <UNASSIGNED>
-+<U2BC1>     /x81/x38/xb7/x35 <UNASSIGNED>
-+<U2BC2>     /x81/x38/xb7/x36 <UNASSIGNED>
-+<U2BC3>     /x81/x38/xb7/x37 <UNASSIGNED>
-+<U2BC4>     /x81/x38/xb7/x38 <UNASSIGNED>
-+<U2BC5>     /x81/x38/xb7/x39 <UNASSIGNED>
-+<U2BC6>     /x81/x38/xb8/x30 <UNASSIGNED>
-+<U2BC7>     /x81/x38/xb8/x31 <UNASSIGNED>
-+<U2BC8>     /x81/x38/xb8/x32 <UNASSIGNED>
-+<U2BC9>     /x81/x38/xb8/x33 <UNASSIGNED>
-+<U2BCA>     /x81/x38/xb8/x34 <UNASSIGNED>
-+<U2BCB>     /x81/x38/xb8/x35 <UNASSIGNED>
-+<U2BCC>     /x81/x38/xb8/x36 <UNASSIGNED>
-+<U2BCD>     /x81/x38/xb8/x37 <UNASSIGNED>
-+<U2BCE>     /x81/x38/xb8/x38 <UNASSIGNED>
-+<U2BCF>     /x81/x38/xb8/x39 <UNASSIGNED>
-+<U2BD0>     /x81/x38/xb9/x30 <UNASSIGNED>
-+<U2BD1>     /x81/x38/xb9/x31 <UNASSIGNED>
-+<U2BD2>     /x81/x38/xb9/x32 <UNASSIGNED>
-+<U2BD3>     /x81/x38/xb9/x33 <UNASSIGNED>
-+<U2BD4>     /x81/x38/xb9/x34 <UNASSIGNED>
-+<U2BD5>     /x81/x38/xb9/x35 <UNASSIGNED>
-+<U2BD6>     /x81/x38/xb9/x36 <UNASSIGNED>
-+<U2BD7>     /x81/x38/xb9/x37 <UNASSIGNED>
-+<U2BD8>     /x81/x38/xb9/x38 <UNASSIGNED>
-+<U2BD9>     /x81/x38/xb9/x39 <UNASSIGNED>
-+<U2BDA>     /x81/x38/xba/x30 <UNASSIGNED>
-+<U2BDB>     /x81/x38/xba/x31 <UNASSIGNED>
-+<U2BDC>     /x81/x38/xba/x32 <UNASSIGNED>
-+<U2BDD>     /x81/x38/xba/x33 <UNASSIGNED>
-+<U2BDE>     /x81/x38/xba/x34 <UNASSIGNED>
-+<U2BDF>     /x81/x38/xba/x35 <UNASSIGNED>
-+<U2BE0>     /x81/x38/xba/x36 <UNASSIGNED>
-+<U2BE1>     /x81/x38/xba/x37 <UNASSIGNED>
-+<U2BE2>     /x81/x38/xba/x38 <UNASSIGNED>
-+<U2BE3>     /x81/x38/xba/x39 <UNASSIGNED>
-+<U2BE4>     /x81/x38/xbb/x30 <UNASSIGNED>
-+<U2BE5>     /x81/x38/xbb/x31 <UNASSIGNED>
-+<U2BE6>     /x81/x38/xbb/x32 <UNASSIGNED>
-+<U2BE7>     /x81/x38/xbb/x33 <UNASSIGNED>
-+<U2BE8>     /x81/x38/xbb/x34 <UNASSIGNED>
-+<U2BE9>     /x81/x38/xbb/x35 <UNASSIGNED>
-+<U2BEA>     /x81/x38/xbb/x36 <UNASSIGNED>
-+<U2BEB>     /x81/x38/xbb/x37 <UNASSIGNED>
-+<U2BEC>     /x81/x38/xbb/x38 <UNASSIGNED>
-+<U2BED>     /x81/x38/xbb/x39 <UNASSIGNED>
-+<U2BEE>     /x81/x38/xbc/x30 <UNASSIGNED>
-+<U2BEF>     /x81/x38/xbc/x31 <UNASSIGNED>
-+<U2BF0>     /x81/x38/xbc/x32 <UNASSIGNED>
-+<U2BF1>     /x81/x38/xbc/x33 <UNASSIGNED>
-+<U2BF2>     /x81/x38/xbc/x34 <UNASSIGNED>
-+<U2BF3>     /x81/x38/xbc/x35 <UNASSIGNED>
-+<U2BF4>     /x81/x38/xbc/x36 <UNASSIGNED>
-+<U2BF5>     /x81/x38/xbc/x37 <UNASSIGNED>
-+<U2BF6>     /x81/x38/xbc/x38 <UNASSIGNED>
-+<U2BF7>     /x81/x38/xbc/x39 <UNASSIGNED>
-+<U2BF8>     /x81/x38/xbd/x30 <UNASSIGNED>
-+<U2BF9>     /x81/x38/xbd/x31 <UNASSIGNED>
-+<U2BFA>     /x81/x38/xbd/x32 <UNASSIGNED>
-+<U2BFB>     /x81/x38/xbd/x33 <UNASSIGNED>
-+<U2BFC>     /x81/x38/xbd/x34 <UNASSIGNED>
-+<U2BFD>     /x81/x38/xbd/x35 <UNASSIGNED>
-+<U2BFE>     /x81/x38/xbd/x36 <UNASSIGNED>
-+<U2BFF>     /x81/x38/xbd/x37 <UNASSIGNED>
-+<U2C00>     /x81/x38/xbd/x38 <UNASSIGNED>
-+<U2C01>     /x81/x38/xbd/x39 <UNASSIGNED>
-+<U2C02>     /x81/x38/xbe/x30 <UNASSIGNED>
-+<U2C03>     /x81/x38/xbe/x31 <UNASSIGNED>
-+<U2C04>     /x81/x38/xbe/x32 <UNASSIGNED>
-+<U2C05>     /x81/x38/xbe/x33 <UNASSIGNED>
-+<U2C06>     /x81/x38/xbe/x34 <UNASSIGNED>
-+<U2C07>     /x81/x38/xbe/x35 <UNASSIGNED>
-+<U2C08>     /x81/x38/xbe/x36 <UNASSIGNED>
-+<U2C09>     /x81/x38/xbe/x37 <UNASSIGNED>
-+<U2C0A>     /x81/x38/xbe/x38 <UNASSIGNED>
-+<U2C0B>     /x81/x38/xbe/x39 <UNASSIGNED>
-+<U2C0C>     /x81/x38/xbf/x30 <UNASSIGNED>
-+<U2C0D>     /x81/x38/xbf/x31 <UNASSIGNED>
-+<U2C0E>     /x81/x38/xbf/x32 <UNASSIGNED>
-+<U2C0F>     /x81/x38/xbf/x33 <UNASSIGNED>
-+<U2C10>     /x81/x38/xbf/x34 <UNASSIGNED>
-+<U2C11>     /x81/x38/xbf/x35 <UNASSIGNED>
-+<U2C12>     /x81/x38/xbf/x36 <UNASSIGNED>
-+<U2C13>     /x81/x38/xbf/x37 <UNASSIGNED>
-+<U2C14>     /x81/x38/xbf/x38 <UNASSIGNED>
-+<U2C15>     /x81/x38/xbf/x39 <UNASSIGNED>
-+<U2C16>     /x81/x38/xc0/x30 <UNASSIGNED>
-+<U2C17>     /x81/x38/xc0/x31 <UNASSIGNED>
-+<U2C18>     /x81/x38/xc0/x32 <UNASSIGNED>
-+<U2C19>     /x81/x38/xc0/x33 <UNASSIGNED>
-+<U2C1A>     /x81/x38/xc0/x34 <UNASSIGNED>
-+<U2C1B>     /x81/x38/xc0/x35 <UNASSIGNED>
-+<U2C1C>     /x81/x38/xc0/x36 <UNASSIGNED>
-+<U2C1D>     /x81/x38/xc0/x37 <UNASSIGNED>
-+<U2C1E>     /x81/x38/xc0/x38 <UNASSIGNED>
-+<U2C1F>     /x81/x38/xc0/x39 <UNASSIGNED>
-+<U2C20>     /x81/x38/xc1/x30 <UNASSIGNED>
-+<U2C21>     /x81/x38/xc1/x31 <UNASSIGNED>
-+<U2C22>     /x81/x38/xc1/x32 <UNASSIGNED>
-+<U2C23>     /x81/x38/xc1/x33 <UNASSIGNED>
-+<U2C24>     /x81/x38/xc1/x34 <UNASSIGNED>
-+<U2C25>     /x81/x38/xc1/x35 <UNASSIGNED>
-+<U2C26>     /x81/x38/xc1/x36 <UNASSIGNED>
-+<U2C27>     /x81/x38/xc1/x37 <UNASSIGNED>
-+<U2C28>     /x81/x38/xc1/x38 <UNASSIGNED>
-+<U2C29>     /x81/x38/xc1/x39 <UNASSIGNED>
-+<U2C2A>     /x81/x38/xc2/x30 <UNASSIGNED>
-+<U2C2B>     /x81/x38/xc2/x31 <UNASSIGNED>
-+<U2C2C>     /x81/x38/xc2/x32 <UNASSIGNED>
-+<U2C2D>     /x81/x38/xc2/x33 <UNASSIGNED>
-+<U2C2E>     /x81/x38/xc2/x34 <UNASSIGNED>
-+<U2C2F>     /x81/x38/xc2/x35 <UNASSIGNED>
-+<U2C30>     /x81/x38/xc2/x36 <UNASSIGNED>
-+<U2C31>     /x81/x38/xc2/x37 <UNASSIGNED>
-+<U2C32>     /x81/x38/xc2/x38 <UNASSIGNED>
-+<U2C33>     /x81/x38/xc2/x39 <UNASSIGNED>
-+<U2C34>     /x81/x38/xc3/x30 <UNASSIGNED>
-+<U2C35>     /x81/x38/xc3/x31 <UNASSIGNED>
-+<U2C36>     /x81/x38/xc3/x32 <UNASSIGNED>
-+<U2C37>     /x81/x38/xc3/x33 <UNASSIGNED>
-+<U2C38>     /x81/x38/xc3/x34 <UNASSIGNED>
-+<U2C39>     /x81/x38/xc3/x35 <UNASSIGNED>
-+<U2C3A>     /x81/x38/xc3/x36 <UNASSIGNED>
-+<U2C3B>     /x81/x38/xc3/x37 <UNASSIGNED>
-+<U2C3C>     /x81/x38/xc3/x38 <UNASSIGNED>
-+<U2C3D>     /x81/x38/xc3/x39 <UNASSIGNED>
-+<U2C3E>     /x81/x38/xc4/x30 <UNASSIGNED>
-+<U2C3F>     /x81/x38/xc4/x31 <UNASSIGNED>
-+<U2C40>     /x81/x38/xc4/x32 <UNASSIGNED>
-+<U2C41>     /x81/x38/xc4/x33 <UNASSIGNED>
-+<U2C42>     /x81/x38/xc4/x34 <UNASSIGNED>
-+<U2C43>     /x81/x38/xc4/x35 <UNASSIGNED>
-+<U2C44>     /x81/x38/xc4/x36 <UNASSIGNED>
-+<U2C45>     /x81/x38/xc4/x37 <UNASSIGNED>
-+<U2C46>     /x81/x38/xc4/x38 <UNASSIGNED>
-+<U2C47>     /x81/x38/xc4/x39 <UNASSIGNED>
-+<U2C48>     /x81/x38/xc5/x30 <UNASSIGNED>
-+<U2C49>     /x81/x38/xc5/x31 <UNASSIGNED>
-+<U2C4A>     /x81/x38/xc5/x32 <UNASSIGNED>
-+<U2C4B>     /x81/x38/xc5/x33 <UNASSIGNED>
-+<U2C4C>     /x81/x38/xc5/x34 <UNASSIGNED>
-+<U2C4D>     /x81/x38/xc5/x35 <UNASSIGNED>
-+<U2C4E>     /x81/x38/xc5/x36 <UNASSIGNED>
-+<U2C4F>     /x81/x38/xc5/x37 <UNASSIGNED>
-+<U2C50>     /x81/x38/xc5/x38 <UNASSIGNED>
-+<U2C51>     /x81/x38/xc5/x39 <UNASSIGNED>
-+<U2C52>     /x81/x38/xc6/x30 <UNASSIGNED>
-+<U2C53>     /x81/x38/xc6/x31 <UNASSIGNED>
-+<U2C54>     /x81/x38/xc6/x32 <UNASSIGNED>
-+<U2C55>     /x81/x38/xc6/x33 <UNASSIGNED>
-+<U2C56>     /x81/x38/xc6/x34 <UNASSIGNED>
-+<U2C57>     /x81/x38/xc6/x35 <UNASSIGNED>
-+<U2C58>     /x81/x38/xc6/x36 <UNASSIGNED>
-+<U2C59>     /x81/x38/xc6/x37 <UNASSIGNED>
-+<U2C5A>     /x81/x38/xc6/x38 <UNASSIGNED>
-+<U2C5B>     /x81/x38/xc6/x39 <UNASSIGNED>
-+<U2C5C>     /x81/x38/xc7/x30 <UNASSIGNED>
-+<U2C5D>     /x81/x38/xc7/x31 <UNASSIGNED>
-+<U2C5E>     /x81/x38/xc7/x32 <UNASSIGNED>
-+<U2C5F>     /x81/x38/xc7/x33 <UNASSIGNED>
-+<U2C60>     /x81/x38/xc7/x34 <UNASSIGNED>
-+<U2C61>     /x81/x38/xc7/x35 <UNASSIGNED>
-+<U2C62>     /x81/x38/xc7/x36 <UNASSIGNED>
-+<U2C63>     /x81/x38/xc7/x37 <UNASSIGNED>
-+<U2C64>     /x81/x38/xc7/x38 <UNASSIGNED>
-+<U2C65>     /x81/x38/xc7/x39 <UNASSIGNED>
-+<U2C66>     /x81/x38/xc8/x30 <UNASSIGNED>
-+<U2C67>     /x81/x38/xc8/x31 <UNASSIGNED>
-+<U2C68>     /x81/x38/xc8/x32 <UNASSIGNED>
-+<U2C69>     /x81/x38/xc8/x33 <UNASSIGNED>
-+<U2C6A>     /x81/x38/xc8/x34 <UNASSIGNED>
-+<U2C6B>     /x81/x38/xc8/x35 <UNASSIGNED>
-+<U2C6C>     /x81/x38/xc8/x36 <UNASSIGNED>
-+<U2C6D>     /x81/x38/xc8/x37 <UNASSIGNED>
-+<U2C6E>     /x81/x38/xc8/x38 <UNASSIGNED>
-+<U2C6F>     /x81/x38/xc8/x39 <UNASSIGNED>
-+<U2C70>     /x81/x38/xc9/x30 <UNASSIGNED>
-+<U2C71>     /x81/x38/xc9/x31 <UNASSIGNED>
-+<U2C72>     /x81/x38/xc9/x32 <UNASSIGNED>
-+<U2C73>     /x81/x38/xc9/x33 <UNASSIGNED>
-+<U2C74>     /x81/x38/xc9/x34 <UNASSIGNED>
-+<U2C75>     /x81/x38/xc9/x35 <UNASSIGNED>
-+<U2C76>     /x81/x38/xc9/x36 <UNASSIGNED>
-+<U2C77>     /x81/x38/xc9/x37 <UNASSIGNED>
-+<U2C78>     /x81/x38/xc9/x38 <UNASSIGNED>
-+<U2C79>     /x81/x38/xc9/x39 <UNASSIGNED>
-+<U2C7A>     /x81/x38/xca/x30 <UNASSIGNED>
-+<U2C7B>     /x81/x38/xca/x31 <UNASSIGNED>
-+<U2C7C>     /x81/x38/xca/x32 <UNASSIGNED>
-+<U2C7D>     /x81/x38/xca/x33 <UNASSIGNED>
-+<U2C7E>     /x81/x38/xca/x34 <UNASSIGNED>
-+<U2C7F>     /x81/x38/xca/x35 <UNASSIGNED>
-+<U2C80>     /x81/x38/xca/x36 <UNASSIGNED>
-+<U2C81>     /x81/x38/xca/x37 <UNASSIGNED>
-+<U2C82>     /x81/x38/xca/x38 <UNASSIGNED>
-+<U2C83>     /x81/x38/xca/x39 <UNASSIGNED>
-+<U2C84>     /x81/x38/xcb/x30 <UNASSIGNED>
-+<U2C85>     /x81/x38/xcb/x31 <UNASSIGNED>
-+<U2C86>     /x81/x38/xcb/x32 <UNASSIGNED>
-+<U2C87>     /x81/x38/xcb/x33 <UNASSIGNED>
-+<U2C88>     /x81/x38/xcb/x34 <UNASSIGNED>
-+<U2C89>     /x81/x38/xcb/x35 <UNASSIGNED>
-+<U2C8A>     /x81/x38/xcb/x36 <UNASSIGNED>
-+<U2C8B>     /x81/x38/xcb/x37 <UNASSIGNED>
-+<U2C8C>     /x81/x38/xcb/x38 <UNASSIGNED>
-+<U2C8D>     /x81/x38/xcb/x39 <UNASSIGNED>
-+<U2C8E>     /x81/x38/xcc/x30 <UNASSIGNED>
-+<U2C8F>     /x81/x38/xcc/x31 <UNASSIGNED>
-+<U2C90>     /x81/x38/xcc/x32 <UNASSIGNED>
-+<U2C91>     /x81/x38/xcc/x33 <UNASSIGNED>
-+<U2C92>     /x81/x38/xcc/x34 <UNASSIGNED>
-+<U2C93>     /x81/x38/xcc/x35 <UNASSIGNED>
-+<U2C94>     /x81/x38/xcc/x36 <UNASSIGNED>
-+<U2C95>     /x81/x38/xcc/x37 <UNASSIGNED>
-+<U2C96>     /x81/x38/xcc/x38 <UNASSIGNED>
-+<U2C97>     /x81/x38/xcc/x39 <UNASSIGNED>
-+<U2C98>     /x81/x38/xcd/x30 <UNASSIGNED>
-+<U2C99>     /x81/x38/xcd/x31 <UNASSIGNED>
-+<U2C9A>     /x81/x38/xcd/x32 <UNASSIGNED>
-+<U2C9B>     /x81/x38/xcd/x33 <UNASSIGNED>
-+<U2C9C>     /x81/x38/xcd/x34 <UNASSIGNED>
-+<U2C9D>     /x81/x38/xcd/x35 <UNASSIGNED>
-+<U2C9E>     /x81/x38/xcd/x36 <UNASSIGNED>
-+<U2C9F>     /x81/x38/xcd/x37 <UNASSIGNED>
-+<U2CA0>     /x81/x38/xcd/x38 <UNASSIGNED>
-+<U2CA1>     /x81/x38/xcd/x39 <UNASSIGNED>
-+<U2CA2>     /x81/x38/xce/x30 <UNASSIGNED>
-+<U2CA3>     /x81/x38/xce/x31 <UNASSIGNED>
-+<U2CA4>     /x81/x38/xce/x32 <UNASSIGNED>
-+<U2CA5>     /x81/x38/xce/x33 <UNASSIGNED>
-+<U2CA6>     /x81/x38/xce/x34 <UNASSIGNED>
-+<U2CA7>     /x81/x38/xce/x35 <UNASSIGNED>
-+<U2CA8>     /x81/x38/xce/x36 <UNASSIGNED>
-+<U2CA9>     /x81/x38/xce/x37 <UNASSIGNED>
-+<U2CAA>     /x81/x38/xce/x38 <UNASSIGNED>
-+<U2CAB>     /x81/x38/xce/x39 <UNASSIGNED>
-+<U2CAC>     /x81/x38/xcf/x30 <UNASSIGNED>
-+<U2CAD>     /x81/x38/xcf/x31 <UNASSIGNED>
-+<U2CAE>     /x81/x38/xcf/x32 <UNASSIGNED>
-+<U2CAF>     /x81/x38/xcf/x33 <UNASSIGNED>
-+<U2CB0>     /x81/x38/xcf/x34 <UNASSIGNED>
-+<U2CB1>     /x81/x38/xcf/x35 <UNASSIGNED>
-+<U2CB2>     /x81/x38/xcf/x36 <UNASSIGNED>
-+<U2CB3>     /x81/x38/xcf/x37 <UNASSIGNED>
-+<U2CB4>     /x81/x38/xcf/x38 <UNASSIGNED>
-+<U2CB5>     /x81/x38/xcf/x39 <UNASSIGNED>
-+<U2CB6>     /x81/x38/xd0/x30 <UNASSIGNED>
-+<U2CB7>     /x81/x38/xd0/x31 <UNASSIGNED>
-+<U2CB8>     /x81/x38/xd0/x32 <UNASSIGNED>
-+<U2CB9>     /x81/x38/xd0/x33 <UNASSIGNED>
-+<U2CBA>     /x81/x38/xd0/x34 <UNASSIGNED>
-+<U2CBB>     /x81/x38/xd0/x35 <UNASSIGNED>
-+<U2CBC>     /x81/x38/xd0/x36 <UNASSIGNED>
-+<U2CBD>     /x81/x38/xd0/x37 <UNASSIGNED>
-+<U2CBE>     /x81/x38/xd0/x38 <UNASSIGNED>
-+<U2CBF>     /x81/x38/xd0/x39 <UNASSIGNED>
-+<U2CC0>     /x81/x38/xd1/x30 <UNASSIGNED>
-+<U2CC1>     /x81/x38/xd1/x31 <UNASSIGNED>
-+<U2CC2>     /x81/x38/xd1/x32 <UNASSIGNED>
-+<U2CC3>     /x81/x38/xd1/x33 <UNASSIGNED>
-+<U2CC4>     /x81/x38/xd1/x34 <UNASSIGNED>
-+<U2CC5>     /x81/x38/xd1/x35 <UNASSIGNED>
-+<U2CC6>     /x81/x38/xd1/x36 <UNASSIGNED>
-+<U2CC7>     /x81/x38/xd1/x37 <UNASSIGNED>
-+<U2CC8>     /x81/x38/xd1/x38 <UNASSIGNED>
-+<U2CC9>     /x81/x38/xd1/x39 <UNASSIGNED>
-+<U2CCA>     /x81/x38/xd2/x30 <UNASSIGNED>
-+<U2CCB>     /x81/x38/xd2/x31 <UNASSIGNED>
-+<U2CCC>     /x81/x38/xd2/x32 <UNASSIGNED>
-+<U2CCD>     /x81/x38/xd2/x33 <UNASSIGNED>
-+<U2CCE>     /x81/x38/xd2/x34 <UNASSIGNED>
-+<U2CCF>     /x81/x38/xd2/x35 <UNASSIGNED>
-+<U2CD0>     /x81/x38/xd2/x36 <UNASSIGNED>
-+<U2CD1>     /x81/x38/xd2/x37 <UNASSIGNED>
-+<U2CD2>     /x81/x38/xd2/x38 <UNASSIGNED>
-+<U2CD3>     /x81/x38/xd2/x39 <UNASSIGNED>
-+<U2CD4>     /x81/x38/xd3/x30 <UNASSIGNED>
-+<U2CD5>     /x81/x38/xd3/x31 <UNASSIGNED>
-+<U2CD6>     /x81/x38/xd3/x32 <UNASSIGNED>
-+<U2CD7>     /x81/x38/xd3/x33 <UNASSIGNED>
-+<U2CD8>     /x81/x38/xd3/x34 <UNASSIGNED>
-+<U2CD9>     /x81/x38/xd3/x35 <UNASSIGNED>
-+<U2CDA>     /x81/x38/xd3/x36 <UNASSIGNED>
-+<U2CDB>     /x81/x38/xd3/x37 <UNASSIGNED>
-+<U2CDC>     /x81/x38/xd3/x38 <UNASSIGNED>
-+<U2CDD>     /x81/x38/xd3/x39 <UNASSIGNED>
-+<U2CDE>     /x81/x38/xd4/x30 <UNASSIGNED>
-+<U2CDF>     /x81/x38/xd4/x31 <UNASSIGNED>
-+<U2CE0>     /x81/x38/xd4/x32 <UNASSIGNED>
-+<U2CE1>     /x81/x38/xd4/x33 <UNASSIGNED>
-+<U2CE2>     /x81/x38/xd4/x34 <UNASSIGNED>
-+<U2CE3>     /x81/x38/xd4/x35 <UNASSIGNED>
-+<U2CE4>     /x81/x38/xd4/x36 <UNASSIGNED>
-+<U2CE5>     /x81/x38/xd4/x37 <UNASSIGNED>
-+<U2CE6>     /x81/x38/xd4/x38 <UNASSIGNED>
-+<U2CE7>     /x81/x38/xd4/x39 <UNASSIGNED>
-+<U2CE8>     /x81/x38/xd5/x30 <UNASSIGNED>
-+<U2CE9>     /x81/x38/xd5/x31 <UNASSIGNED>
-+<U2CEA>     /x81/x38/xd5/x32 <UNASSIGNED>
-+<U2CEB>     /x81/x38/xd5/x33 <UNASSIGNED>
-+<U2CEC>     /x81/x38/xd5/x34 <UNASSIGNED>
-+<U2CED>     /x81/x38/xd5/x35 <UNASSIGNED>
-+<U2CEE>     /x81/x38/xd5/x36 <UNASSIGNED>
-+<U2CEF>     /x81/x38/xd5/x37 <UNASSIGNED>
-+<U2CF0>     /x81/x38/xd5/x38 <UNASSIGNED>
-+<U2CF1>     /x81/x38/xd5/x39 <UNASSIGNED>
-+<U2CF2>     /x81/x38/xd6/x30 <UNASSIGNED>
-+<U2CF3>     /x81/x38/xd6/x31 <UNASSIGNED>
-+<U2CF4>     /x81/x38/xd6/x32 <UNASSIGNED>
-+<U2CF5>     /x81/x38/xd6/x33 <UNASSIGNED>
-+<U2CF6>     /x81/x38/xd6/x34 <UNASSIGNED>
-+<U2CF7>     /x81/x38/xd6/x35 <UNASSIGNED>
-+<U2CF8>     /x81/x38/xd6/x36 <UNASSIGNED>
-+<U2CF9>     /x81/x38/xd6/x37 <UNASSIGNED>
-+<U2CFA>     /x81/x38/xd6/x38 <UNASSIGNED>
-+<U2CFB>     /x81/x38/xd6/x39 <UNASSIGNED>
-+<U2CFC>     /x81/x38/xd7/x30 <UNASSIGNED>
-+<U2CFD>     /x81/x38/xd7/x31 <UNASSIGNED>
-+<U2CFE>     /x81/x38/xd7/x32 <UNASSIGNED>
-+<U2CFF>     /x81/x38/xd7/x33 <UNASSIGNED>
-+<U2D00>     /x81/x38/xd7/x34 <UNASSIGNED>
-+<U2D01>     /x81/x38/xd7/x35 <UNASSIGNED>
-+<U2D02>     /x81/x38/xd7/x36 <UNASSIGNED>
-+<U2D03>     /x81/x38/xd7/x37 <UNASSIGNED>
-+<U2D04>     /x81/x38/xd7/x38 <UNASSIGNED>
-+<U2D05>     /x81/x38/xd7/x39 <UNASSIGNED>
-+<U2D06>     /x81/x38/xd8/x30 <UNASSIGNED>
-+<U2D07>     /x81/x38/xd8/x31 <UNASSIGNED>
-+<U2D08>     /x81/x38/xd8/x32 <UNASSIGNED>
-+<U2D09>     /x81/x38/xd8/x33 <UNASSIGNED>
-+<U2D0A>     /x81/x38/xd8/x34 <UNASSIGNED>
-+<U2D0B>     /x81/x38/xd8/x35 <UNASSIGNED>
-+<U2D0C>     /x81/x38/xd8/x36 <UNASSIGNED>
-+<U2D0D>     /x81/x38/xd8/x37 <UNASSIGNED>
-+<U2D0E>     /x81/x38/xd8/x38 <UNASSIGNED>
-+<U2D0F>     /x81/x38/xd8/x39 <UNASSIGNED>
-+<U2D10>     /x81/x38/xd9/x30 <UNASSIGNED>
-+<U2D11>     /x81/x38/xd9/x31 <UNASSIGNED>
-+<U2D12>     /x81/x38/xd9/x32 <UNASSIGNED>
-+<U2D13>     /x81/x38/xd9/x33 <UNASSIGNED>
-+<U2D14>     /x81/x38/xd9/x34 <UNASSIGNED>
-+<U2D15>     /x81/x38/xd9/x35 <UNASSIGNED>
-+<U2D16>     /x81/x38/xd9/x36 <UNASSIGNED>
-+<U2D17>     /x81/x38/xd9/x37 <UNASSIGNED>
-+<U2D18>     /x81/x38/xd9/x38 <UNASSIGNED>
-+<U2D19>     /x81/x38/xd9/x39 <UNASSIGNED>
-+<U2D1A>     /x81/x38/xda/x30 <UNASSIGNED>
-+<U2D1B>     /x81/x38/xda/x31 <UNASSIGNED>
-+<U2D1C>     /x81/x38/xda/x32 <UNASSIGNED>
-+<U2D1D>     /x81/x38/xda/x33 <UNASSIGNED>
-+<U2D1E>     /x81/x38/xda/x34 <UNASSIGNED>
-+<U2D1F>     /x81/x38/xda/x35 <UNASSIGNED>
-+<U2D20>     /x81/x38/xda/x36 <UNASSIGNED>
-+<U2D21>     /x81/x38/xda/x37 <UNASSIGNED>
-+<U2D22>     /x81/x38/xda/x38 <UNASSIGNED>
-+<U2D23>     /x81/x38/xda/x39 <UNASSIGNED>
-+<U2D24>     /x81/x38/xdb/x30 <UNASSIGNED>
-+<U2D25>     /x81/x38/xdb/x31 <UNASSIGNED>
-+<U2D26>     /x81/x38/xdb/x32 <UNASSIGNED>
-+<U2D27>     /x81/x38/xdb/x33 <UNASSIGNED>
-+<U2D28>     /x81/x38/xdb/x34 <UNASSIGNED>
-+<U2D29>     /x81/x38/xdb/x35 <UNASSIGNED>
-+<U2D2A>     /x81/x38/xdb/x36 <UNASSIGNED>
-+<U2D2B>     /x81/x38/xdb/x37 <UNASSIGNED>
-+<U2D2C>     /x81/x38/xdb/x38 <UNASSIGNED>
-+<U2D2D>     /x81/x38/xdb/x39 <UNASSIGNED>
-+<U2D2E>     /x81/x38/xdc/x30 <UNASSIGNED>
-+<U2D2F>     /x81/x38/xdc/x31 <UNASSIGNED>
-+<U2D30>     /x81/x38/xdc/x32 <UNASSIGNED>
-+<U2D31>     /x81/x38/xdc/x33 <UNASSIGNED>
-+<U2D32>     /x81/x38/xdc/x34 <UNASSIGNED>
-+<U2D33>     /x81/x38/xdc/x35 <UNASSIGNED>
-+<U2D34>     /x81/x38/xdc/x36 <UNASSIGNED>
-+<U2D35>     /x81/x38/xdc/x37 <UNASSIGNED>
-+<U2D36>     /x81/x38/xdc/x38 <UNASSIGNED>
-+<U2D37>     /x81/x38/xdc/x39 <UNASSIGNED>
-+<U2D38>     /x81/x38/xdd/x30 <UNASSIGNED>
-+<U2D39>     /x81/x38/xdd/x31 <UNASSIGNED>
-+<U2D3A>     /x81/x38/xdd/x32 <UNASSIGNED>
-+<U2D3B>     /x81/x38/xdd/x33 <UNASSIGNED>
-+<U2D3C>     /x81/x38/xdd/x34 <UNASSIGNED>
-+<U2D3D>     /x81/x38/xdd/x35 <UNASSIGNED>
-+<U2D3E>     /x81/x38/xdd/x36 <UNASSIGNED>
-+<U2D3F>     /x81/x38/xdd/x37 <UNASSIGNED>
-+<U2D40>     /x81/x38/xdd/x38 <UNASSIGNED>
-+<U2D41>     /x81/x38/xdd/x39 <UNASSIGNED>
-+<U2D42>     /x81/x38/xde/x30 <UNASSIGNED>
-+<U2D43>     /x81/x38/xde/x31 <UNASSIGNED>
-+<U2D44>     /x81/x38/xde/x32 <UNASSIGNED>
-+<U2D45>     /x81/x38/xde/x33 <UNASSIGNED>
-+<U2D46>     /x81/x38/xde/x34 <UNASSIGNED>
-+<U2D47>     /x81/x38/xde/x35 <UNASSIGNED>
-+<U2D48>     /x81/x38/xde/x36 <UNASSIGNED>
-+<U2D49>     /x81/x38/xde/x37 <UNASSIGNED>
-+<U2D4A>     /x81/x38/xde/x38 <UNASSIGNED>
-+<U2D4B>     /x81/x38/xde/x39 <UNASSIGNED>
-+<U2D4C>     /x81/x38/xdf/x30 <UNASSIGNED>
-+<U2D4D>     /x81/x38/xdf/x31 <UNASSIGNED>
-+<U2D4E>     /x81/x38/xdf/x32 <UNASSIGNED>
-+<U2D4F>     /x81/x38/xdf/x33 <UNASSIGNED>
-+<U2D50>     /x81/x38/xdf/x34 <UNASSIGNED>
-+<U2D51>     /x81/x38/xdf/x35 <UNASSIGNED>
-+<U2D52>     /x81/x38/xdf/x36 <UNASSIGNED>
-+<U2D53>     /x81/x38/xdf/x37 <UNASSIGNED>
-+<U2D54>     /x81/x38/xdf/x38 <UNASSIGNED>
-+<U2D55>     /x81/x38/xdf/x39 <UNASSIGNED>
-+<U2D56>     /x81/x38/xe0/x30 <UNASSIGNED>
-+<U2D57>     /x81/x38/xe0/x31 <UNASSIGNED>
-+<U2D58>     /x81/x38/xe0/x32 <UNASSIGNED>
-+<U2D59>     /x81/x38/xe0/x33 <UNASSIGNED>
-+<U2D5A>     /x81/x38/xe0/x34 <UNASSIGNED>
-+<U2D5B>     /x81/x38/xe0/x35 <UNASSIGNED>
-+<U2D5C>     /x81/x38/xe0/x36 <UNASSIGNED>
-+<U2D5D>     /x81/x38/xe0/x37 <UNASSIGNED>
-+<U2D5E>     /x81/x38/xe0/x38 <UNASSIGNED>
-+<U2D5F>     /x81/x38/xe0/x39 <UNASSIGNED>
-+<U2D60>     /x81/x38/xe1/x30 <UNASSIGNED>
-+<U2D61>     /x81/x38/xe1/x31 <UNASSIGNED>
-+<U2D62>     /x81/x38/xe1/x32 <UNASSIGNED>
-+<U2D63>     /x81/x38/xe1/x33 <UNASSIGNED>
-+<U2D64>     /x81/x38/xe1/x34 <UNASSIGNED>
-+<U2D65>     /x81/x38/xe1/x35 <UNASSIGNED>
-+<U2D66>     /x81/x38/xe1/x36 <UNASSIGNED>
-+<U2D67>     /x81/x38/xe1/x37 <UNASSIGNED>
-+<U2D68>     /x81/x38/xe1/x38 <UNASSIGNED>
-+<U2D69>     /x81/x38/xe1/x39 <UNASSIGNED>
-+<U2D6A>     /x81/x38/xe2/x30 <UNASSIGNED>
-+<U2D6B>     /x81/x38/xe2/x31 <UNASSIGNED>
-+<U2D6C>     /x81/x38/xe2/x32 <UNASSIGNED>
-+<U2D6D>     /x81/x38/xe2/x33 <UNASSIGNED>
-+<U2D6E>     /x81/x38/xe2/x34 <UNASSIGNED>
-+<U2D6F>     /x81/x38/xe2/x35 <UNASSIGNED>
-+<U2D70>     /x81/x38/xe2/x36 <UNASSIGNED>
-+<U2D71>     /x81/x38/xe2/x37 <UNASSIGNED>
-+<U2D72>     /x81/x38/xe2/x38 <UNASSIGNED>
-+<U2D73>     /x81/x38/xe2/x39 <UNASSIGNED>
-+<U2D74>     /x81/x38/xe3/x30 <UNASSIGNED>
-+<U2D75>     /x81/x38/xe3/x31 <UNASSIGNED>
-+<U2D76>     /x81/x38/xe3/x32 <UNASSIGNED>
-+<U2D77>     /x81/x38/xe3/x33 <UNASSIGNED>
-+<U2D78>     /x81/x38/xe3/x34 <UNASSIGNED>
-+<U2D79>     /x81/x38/xe3/x35 <UNASSIGNED>
-+<U2D7A>     /x81/x38/xe3/x36 <UNASSIGNED>
-+<U2D7B>     /x81/x38/xe3/x37 <UNASSIGNED>
-+<U2D7C>     /x81/x38/xe3/x38 <UNASSIGNED>
-+<U2D7D>     /x81/x38/xe3/x39 <UNASSIGNED>
-+<U2D7E>     /x81/x38/xe4/x30 <UNASSIGNED>
-+<U2D7F>     /x81/x38/xe4/x31 <UNASSIGNED>
-+<U2D80>     /x81/x38/xe4/x32 <UNASSIGNED>
-+<U2D81>     /x81/x38/xe4/x33 <UNASSIGNED>
-+<U2D82>     /x81/x38/xe4/x34 <UNASSIGNED>
-+<U2D83>     /x81/x38/xe4/x35 <UNASSIGNED>
-+<U2D84>     /x81/x38/xe4/x36 <UNASSIGNED>
-+<U2D85>     /x81/x38/xe4/x37 <UNASSIGNED>
-+<U2D86>     /x81/x38/xe4/x38 <UNASSIGNED>
-+<U2D87>     /x81/x38/xe4/x39 <UNASSIGNED>
-+<U2D88>     /x81/x38/xe5/x30 <UNASSIGNED>
-+<U2D89>     /x81/x38/xe5/x31 <UNASSIGNED>
-+<U2D8A>     /x81/x38/xe5/x32 <UNASSIGNED>
-+<U2D8B>     /x81/x38/xe5/x33 <UNASSIGNED>
-+<U2D8C>     /x81/x38/xe5/x34 <UNASSIGNED>
-+<U2D8D>     /x81/x38/xe5/x35 <UNASSIGNED>
-+<U2D8E>     /x81/x38/xe5/x36 <UNASSIGNED>
-+<U2D8F>     /x81/x38/xe5/x37 <UNASSIGNED>
-+<U2D90>     /x81/x38/xe5/x38 <UNASSIGNED>
-+<U2D91>     /x81/x38/xe5/x39 <UNASSIGNED>
-+<U2D92>     /x81/x38/xe6/x30 <UNASSIGNED>
-+<U2D93>     /x81/x38/xe6/x31 <UNASSIGNED>
-+<U2D94>     /x81/x38/xe6/x32 <UNASSIGNED>
-+<U2D95>     /x81/x38/xe6/x33 <UNASSIGNED>
-+<U2D96>     /x81/x38/xe6/x34 <UNASSIGNED>
-+<U2D97>     /x81/x38/xe6/x35 <UNASSIGNED>
-+<U2D98>     /x81/x38/xe6/x36 <UNASSIGNED>
-+<U2D99>     /x81/x38/xe6/x37 <UNASSIGNED>
-+<U2D9A>     /x81/x38/xe6/x38 <UNASSIGNED>
-+<U2D9B>     /x81/x38/xe6/x39 <UNASSIGNED>
-+<U2D9C>     /x81/x38/xe7/x30 <UNASSIGNED>
-+<U2D9D>     /x81/x38/xe7/x31 <UNASSIGNED>
-+<U2D9E>     /x81/x38/xe7/x32 <UNASSIGNED>
-+<U2D9F>     /x81/x38/xe7/x33 <UNASSIGNED>
-+<U2DA0>     /x81/x38/xe7/x34 <UNASSIGNED>
-+<U2DA1>     /x81/x38/xe7/x35 <UNASSIGNED>
-+<U2DA2>     /x81/x38/xe7/x36 <UNASSIGNED>
-+<U2DA3>     /x81/x38/xe7/x37 <UNASSIGNED>
-+<U2DA4>     /x81/x38/xe7/x38 <UNASSIGNED>
-+<U2DA5>     /x81/x38/xe7/x39 <UNASSIGNED>
-+<U2DA6>     /x81/x38/xe8/x30 <UNASSIGNED>
-+<U2DA7>     /x81/x38/xe8/x31 <UNASSIGNED>
-+<U2DA8>     /x81/x38/xe8/x32 <UNASSIGNED>
-+<U2DA9>     /x81/x38/xe8/x33 <UNASSIGNED>
-+<U2DAA>     /x81/x38/xe8/x34 <UNASSIGNED>
-+<U2DAB>     /x81/x38/xe8/x35 <UNASSIGNED>
-+<U2DAC>     /x81/x38/xe8/x36 <UNASSIGNED>
-+<U2DAD>     /x81/x38/xe8/x37 <UNASSIGNED>
-+<U2DAE>     /x81/x38/xe8/x38 <UNASSIGNED>
-+<U2DAF>     /x81/x38/xe8/x39 <UNASSIGNED>
-+<U2DB0>     /x81/x38/xe9/x30 <UNASSIGNED>
-+<U2DB1>     /x81/x38/xe9/x31 <UNASSIGNED>
-+<U2DB2>     /x81/x38/xe9/x32 <UNASSIGNED>
-+<U2DB3>     /x81/x38/xe9/x33 <UNASSIGNED>
-+<U2DB4>     /x81/x38/xe9/x34 <UNASSIGNED>
-+<U2DB5>     /x81/x38/xe9/x35 <UNASSIGNED>
-+<U2DB6>     /x81/x38/xe9/x36 <UNASSIGNED>
-+<U2DB7>     /x81/x38/xe9/x37 <UNASSIGNED>
-+<U2DB8>     /x81/x38/xe9/x38 <UNASSIGNED>
-+<U2DB9>     /x81/x38/xe9/x39 <UNASSIGNED>
-+<U2DBA>     /x81/x38/xea/x30 <UNASSIGNED>
-+<U2DBB>     /x81/x38/xea/x31 <UNASSIGNED>
-+<U2DBC>     /x81/x38/xea/x32 <UNASSIGNED>
-+<U2DBD>     /x81/x38/xea/x33 <UNASSIGNED>
-+<U2DBE>     /x81/x38/xea/x34 <UNASSIGNED>
-+<U2DBF>     /x81/x38/xea/x35 <UNASSIGNED>
-+<U2DC0>     /x81/x38/xea/x36 <UNASSIGNED>
-+<U2DC1>     /x81/x38/xea/x37 <UNASSIGNED>
-+<U2DC2>     /x81/x38/xea/x38 <UNASSIGNED>
-+<U2DC3>     /x81/x38/xea/x39 <UNASSIGNED>
-+<U2DC4>     /x81/x38/xeb/x30 <UNASSIGNED>
-+<U2DC5>     /x81/x38/xeb/x31 <UNASSIGNED>
-+<U2DC6>     /x81/x38/xeb/x32 <UNASSIGNED>
-+<U2DC7>     /x81/x38/xeb/x33 <UNASSIGNED>
-+<U2DC8>     /x81/x38/xeb/x34 <UNASSIGNED>
-+<U2DC9>     /x81/x38/xeb/x35 <UNASSIGNED>
-+<U2DCA>     /x81/x38/xeb/x36 <UNASSIGNED>
-+<U2DCB>     /x81/x38/xeb/x37 <UNASSIGNED>
-+<U2DCC>     /x81/x38/xeb/x38 <UNASSIGNED>
-+<U2DCD>     /x81/x38/xeb/x39 <UNASSIGNED>
-+<U2DCE>     /x81/x38/xec/x30 <UNASSIGNED>
-+<U2DCF>     /x81/x38/xec/x31 <UNASSIGNED>
-+<U2DD0>     /x81/x38/xec/x32 <UNASSIGNED>
-+<U2DD1>     /x81/x38/xec/x33 <UNASSIGNED>
-+<U2DD2>     /x81/x38/xec/x34 <UNASSIGNED>
-+<U2DD3>     /x81/x38/xec/x35 <UNASSIGNED>
-+<U2DD4>     /x81/x38/xec/x36 <UNASSIGNED>
-+<U2DD5>     /x81/x38/xec/x37 <UNASSIGNED>
-+<U2DD6>     /x81/x38/xec/x38 <UNASSIGNED>
-+<U2DD7>     /x81/x38/xec/x39 <UNASSIGNED>
-+<U2DD8>     /x81/x38/xed/x30 <UNASSIGNED>
-+<U2DD9>     /x81/x38/xed/x31 <UNASSIGNED>
-+<U2DDA>     /x81/x38/xed/x32 <UNASSIGNED>
-+<U2DDB>     /x81/x38/xed/x33 <UNASSIGNED>
-+<U2DDC>     /x81/x38/xed/x34 <UNASSIGNED>
-+<U2DDD>     /x81/x38/xed/x35 <UNASSIGNED>
-+<U2DDE>     /x81/x38/xed/x36 <UNASSIGNED>
-+<U2DDF>     /x81/x38/xed/x37 <UNASSIGNED>
-+<U2DE0>     /x81/x38/xed/x38 <UNASSIGNED>
-+<U2DE1>     /x81/x38/xed/x39 <UNASSIGNED>
-+<U2DE2>     /x81/x38/xee/x30 <UNASSIGNED>
-+<U2DE3>     /x81/x38/xee/x31 <UNASSIGNED>
-+<U2DE4>     /x81/x38/xee/x32 <UNASSIGNED>
-+<U2DE5>     /x81/x38/xee/x33 <UNASSIGNED>
-+<U2DE6>     /x81/x38/xee/x34 <UNASSIGNED>
-+<U2DE7>     /x81/x38/xee/x35 <UNASSIGNED>
-+<U2DE8>     /x81/x38/xee/x36 <UNASSIGNED>
-+<U2DE9>     /x81/x38/xee/x37 <UNASSIGNED>
-+<U2DEA>     /x81/x38/xee/x38 <UNASSIGNED>
-+<U2DEB>     /x81/x38/xee/x39 <UNASSIGNED>
-+<U2DEC>     /x81/x38/xef/x30 <UNASSIGNED>
-+<U2DED>     /x81/x38/xef/x31 <UNASSIGNED>
-+<U2DEE>     /x81/x38/xef/x32 <UNASSIGNED>
-+<U2DEF>     /x81/x38/xef/x33 <UNASSIGNED>
-+<U2DF0>     /x81/x38/xef/x34 <UNASSIGNED>
-+<U2DF1>     /x81/x38/xef/x35 <UNASSIGNED>
-+<U2DF2>     /x81/x38/xef/x36 <UNASSIGNED>
-+<U2DF3>     /x81/x38/xef/x37 <UNASSIGNED>
-+<U2DF4>     /x81/x38/xef/x38 <UNASSIGNED>
-+<U2DF5>     /x81/x38/xef/x39 <UNASSIGNED>
-+<U2DF6>     /x81/x38/xf0/x30 <UNASSIGNED>
-+<U2DF7>     /x81/x38/xf0/x31 <UNASSIGNED>
-+<U2DF8>     /x81/x38/xf0/x32 <UNASSIGNED>
-+<U2DF9>     /x81/x38/xf0/x33 <UNASSIGNED>
-+<U2DFA>     /x81/x38/xf0/x34 <UNASSIGNED>
-+<U2DFB>     /x81/x38/xf0/x35 <UNASSIGNED>
-+<U2DFC>     /x81/x38/xf0/x36 <UNASSIGNED>
-+<U2DFD>     /x81/x38/xf0/x37 <UNASSIGNED>
-+<U2DFE>     /x81/x38/xf0/x38 <UNASSIGNED>
-+<U2DFF>     /x81/x38/xf0/x39 <UNASSIGNED>
-+<U2E00>     /x81/x38/xf1/x30 <UNASSIGNED>
-+<U2E01>     /x81/x38/xf1/x31 <UNASSIGNED>
-+<U2E02>     /x81/x38/xf1/x32 <UNASSIGNED>
-+<U2E03>     /x81/x38/xf1/x33 <UNASSIGNED>
-+<U2E04>     /x81/x38/xf1/x34 <UNASSIGNED>
-+<U2E05>     /x81/x38/xf1/x35 <UNASSIGNED>
-+<U2E06>     /x81/x38/xf1/x36 <UNASSIGNED>
-+<U2E07>     /x81/x38/xf1/x37 <UNASSIGNED>
-+<U2E08>     /x81/x38/xf1/x38 <UNASSIGNED>
-+<U2E09>     /x81/x38/xf1/x39 <UNASSIGNED>
-+<U2E0A>     /x81/x38/xf2/x30 <UNASSIGNED>
-+<U2E0B>     /x81/x38/xf2/x31 <UNASSIGNED>
-+<U2E0C>     /x81/x38/xf2/x32 <UNASSIGNED>
-+<U2E0D>     /x81/x38/xf2/x33 <UNASSIGNED>
-+<U2E0E>     /x81/x38/xf2/x34 <UNASSIGNED>
-+<U2E0F>     /x81/x38/xf2/x35 <UNASSIGNED>
-+<U2E10>     /x81/x38/xf2/x36 <UNASSIGNED>
-+<U2E11>     /x81/x38/xf2/x37 <UNASSIGNED>
-+<U2E12>     /x81/x38/xf2/x38 <UNASSIGNED>
-+<U2E13>     /x81/x38/xf2/x39 <UNASSIGNED>
-+<U2E14>     /x81/x38/xf3/x30 <UNASSIGNED>
-+<U2E15>     /x81/x38/xf3/x31 <UNASSIGNED>
-+<U2E16>     /x81/x38/xf3/x32 <UNASSIGNED>
-+<U2E17>     /x81/x38/xf3/x33 <UNASSIGNED>
-+<U2E18>     /x81/x38/xf3/x34 <UNASSIGNED>
-+<U2E19>     /x81/x38/xf3/x35 <UNASSIGNED>
-+<U2E1A>     /x81/x38/xf3/x36 <UNASSIGNED>
-+<U2E1B>     /x81/x38/xf3/x37 <UNASSIGNED>
-+<U2E1C>     /x81/x38/xf3/x38 <UNASSIGNED>
-+<U2E1D>     /x81/x38/xf3/x39 <UNASSIGNED>
-+<U2E1E>     /x81/x38/xf4/x30 <UNASSIGNED>
-+<U2E1F>     /x81/x38/xf4/x31 <UNASSIGNED>
-+<U2E20>     /x81/x38/xf4/x32 <UNASSIGNED>
-+<U2E21>     /x81/x38/xf4/x33 <UNASSIGNED>
-+<U2E22>     /x81/x38/xf4/x34 <UNASSIGNED>
-+<U2E23>     /x81/x38/xf4/x35 <UNASSIGNED>
-+<U2E24>     /x81/x38/xf4/x36 <UNASSIGNED>
-+<U2E25>     /x81/x38/xf4/x37 <UNASSIGNED>
-+<U2E26>     /x81/x38/xf4/x38 <UNASSIGNED>
-+<U2E27>     /x81/x38/xf4/x39 <UNASSIGNED>
-+<U2E28>     /x81/x38/xf5/x30 <UNASSIGNED>
-+<U2E29>     /x81/x38/xf5/x31 <UNASSIGNED>
-+<U2E2A>     /x81/x38/xf5/x32 <UNASSIGNED>
-+<U2E2B>     /x81/x38/xf5/x33 <UNASSIGNED>
-+<U2E2C>     /x81/x38/xf5/x34 <UNASSIGNED>
-+<U2E2D>     /x81/x38/xf5/x35 <UNASSIGNED>
-+<U2E2E>     /x81/x38/xf5/x36 <UNASSIGNED>
-+<U2E2F>     /x81/x38/xf5/x37 <UNASSIGNED>
-+<U2E30>     /x81/x38/xf5/x38 <UNASSIGNED>
-+<U2E31>     /x81/x38/xf5/x39 <UNASSIGNED>
-+<U2E32>     /x81/x38/xf6/x30 <UNASSIGNED>
-+<U2E33>     /x81/x38/xf6/x31 <UNASSIGNED>
-+<U2E34>     /x81/x38/xf6/x32 <UNASSIGNED>
-+<U2E35>     /x81/x38/xf6/x33 <UNASSIGNED>
-+<U2E36>     /x81/x38/xf6/x34 <UNASSIGNED>
-+<U2E37>     /x81/x38/xf6/x35 <UNASSIGNED>
-+<U2E38>     /x81/x38/xf6/x36 <UNASSIGNED>
-+<U2E39>     /x81/x38/xf6/x37 <UNASSIGNED>
-+<U2E3A>     /x81/x38/xf6/x38 <UNASSIGNED>
-+<U2E3B>     /x81/x38/xf6/x39 <UNASSIGNED>
-+<U2E3C>     /x81/x38/xf7/x30 <UNASSIGNED>
-+<U2E3D>     /x81/x38/xf7/x31 <UNASSIGNED>
-+<U2E3E>     /x81/x38/xf7/x32 <UNASSIGNED>
-+<U2E3F>     /x81/x38/xf7/x33 <UNASSIGNED>
-+<U2E40>     /x81/x38/xf7/x34 <UNASSIGNED>
-+<U2E41>     /x81/x38/xf7/x35 <UNASSIGNED>
-+<U2E42>     /x81/x38/xf7/x36 <UNASSIGNED>
-+<U2E43>     /x81/x38/xf7/x37 <UNASSIGNED>
-+<U2E44>     /x81/x38/xf7/x38 <UNASSIGNED>
-+<U2E45>     /x81/x38/xf7/x39 <UNASSIGNED>
-+<U2E46>     /x81/x38/xf8/x30 <UNASSIGNED>
-+<U2E47>     /x81/x38/xf8/x31 <UNASSIGNED>
-+<U2E48>     /x81/x38/xf8/x32 <UNASSIGNED>
-+<U2E49>     /x81/x38/xf8/x33 <UNASSIGNED>
-+<U2E4A>     /x81/x38/xf8/x34 <UNASSIGNED>
-+<U2E4B>     /x81/x38/xf8/x35 <UNASSIGNED>
-+<U2E4C>     /x81/x38/xf8/x36 <UNASSIGNED>
-+<U2E4D>     /x81/x38/xf8/x37 <UNASSIGNED>
-+<U2E4E>     /x81/x38/xf8/x38 <UNASSIGNED>
-+<U2E4F>     /x81/x38/xf8/x39 <UNASSIGNED>
-+<U2E50>     /x81/x38/xf9/x30 <UNASSIGNED>
-+<U2E51>     /x81/x38/xf9/x31 <UNASSIGNED>
-+<U2E52>     /x81/x38/xf9/x32 <UNASSIGNED>
-+<U2E53>     /x81/x38/xf9/x33 <UNASSIGNED>
-+<U2E54>     /x81/x38/xf9/x34 <UNASSIGNED>
-+<U2E55>     /x81/x38/xf9/x35 <UNASSIGNED>
-+<U2E56>     /x81/x38/xf9/x36 <UNASSIGNED>
-+<U2E57>     /x81/x38/xf9/x37 <UNASSIGNED>
-+<U2E58>     /x81/x38/xf9/x38 <UNASSIGNED>
-+<U2E59>     /x81/x38/xf9/x39 <UNASSIGNED>
-+<U2E5A>     /x81/x38/xfa/x30 <UNASSIGNED>
-+<U2E5B>     /x81/x38/xfa/x31 <UNASSIGNED>
-+<U2E5C>     /x81/x38/xfa/x32 <UNASSIGNED>
-+<U2E5D>     /x81/x38/xfa/x33 <UNASSIGNED>
-+<U2E5E>     /x81/x38/xfa/x34 <UNASSIGNED>
-+<U2E5F>     /x81/x38/xfa/x35 <UNASSIGNED>
-+<U2E60>     /x81/x38/xfa/x36 <UNASSIGNED>
-+<U2E61>     /x81/x38/xfa/x37 <UNASSIGNED>
-+<U2E62>     /x81/x38/xfa/x38 <UNASSIGNED>
-+<U2E63>     /x81/x38/xfa/x39 <UNASSIGNED>
-+<U2E64>     /x81/x38/xfb/x30 <UNASSIGNED>
-+<U2E65>     /x81/x38/xfb/x31 <UNASSIGNED>
-+<U2E66>     /x81/x38/xfb/x32 <UNASSIGNED>
-+<U2E67>     /x81/x38/xfb/x33 <UNASSIGNED>
-+<U2E68>     /x81/x38/xfb/x34 <UNASSIGNED>
-+<U2E69>     /x81/x38/xfb/x35 <UNASSIGNED>
-+<U2E6A>     /x81/x38/xfb/x36 <UNASSIGNED>
-+<U2E6B>     /x81/x38/xfb/x37 <UNASSIGNED>
-+<U2E6C>     /x81/x38/xfb/x38 <UNASSIGNED>
-+<U2E6D>     /x81/x38/xfb/x39 <UNASSIGNED>
-+<U2E6E>     /x81/x38/xfc/x30 <UNASSIGNED>
-+<U2E6F>     /x81/x38/xfc/x31 <UNASSIGNED>
-+<U2E70>     /x81/x38/xfc/x32 <UNASSIGNED>
-+<U2E71>     /x81/x38/xfc/x33 <UNASSIGNED>
-+<U2E72>     /x81/x38/xfc/x34 <UNASSIGNED>
-+<U2E73>     /x81/x38/xfc/x35 <UNASSIGNED>
-+<U2E74>     /x81/x38/xfc/x36 <UNASSIGNED>
-+<U2E75>     /x81/x38/xfc/x37 <UNASSIGNED>
-+<U2E76>     /x81/x38/xfc/x38 <UNASSIGNED>
-+<U2E77>     /x81/x38/xfc/x39 <UNASSIGNED>
-+<U2E78>     /x81/x38/xfd/x30 <UNASSIGNED>
-+<U2E79>     /x81/x38/xfd/x31 <UNASSIGNED>
-+<U2E7A>     /x81/x38/xfd/x32 <UNASSIGNED>
-+<U2E7B>     /x81/x38/xfd/x33 <UNASSIGNED>
-+<U2E7C>     /x81/x38/xfd/x34 <UNASSIGNED>
-+<U2E7D>     /x81/x38/xfd/x35 <UNASSIGNED>
-+<U2E7E>     /x81/x38/xfd/x36 <UNASSIGNED>
-+<U2E7F>     /x81/x38/xfd/x37 <UNASSIGNED>
-+<U2E80>     /x81/x38/xfd/x38 CJK RADICAL REPEAT
- <U2E81>     /xfe/x50         CJK RADICAL CLIFF
- <U2E82>     /x81/x38/xfd/x39 CJK RADICAL SECOND ONE
- <U2E83>     /x81/x38/xfe/x30 CJK RADICAL SECOND TWO
-@@ -2601,6 +11935,7 @@ CHARMAP
- <U2E97>     /xfe/x5e         CJK RADICAL HEART TWO
- <U2E98>     /x81/x39/x81/x36 CJK RADICAL HAND
- <U2E99>     /x81/x39/x81/x37 CJK RADICAL RAP
-+<U2E9A>     /x81/x39/x81/x38 <UNASSIGNED>
- <U2E9B>     /x81/x39/x81/x39 CJK RADICAL CHOKE
- <U2E9C>     /x81/x39/x82/x30 CJK RADICAL SUN
- <U2E9D>     /x81/x39/x82/x31 CJK RADICAL MOON
-@@ -2690,6 +12025,18 @@ CHARMAP
- <U2EF1>     /x81/x39/x89/x37 CJK RADICAL TURTLE
- <U2EF2>     /x81/x39/x89/x38 CJK RADICAL J-SIMPLIFIED TURTLE
- <U2EF3>     /x81/x39/x89/x39 CJK RADICAL C-SIMPLIFIED TURTLE
-+<U2EF4>     /x81/x39/x8a/x30 <UNASSIGNED>
-+<U2EF5>     /x81/x39/x8a/x31 <UNASSIGNED>
-+<U2EF6>     /x81/x39/x8a/x32 <UNASSIGNED>
-+<U2EF7>     /x81/x39/x8a/x33 <UNASSIGNED>
-+<U2EF8>     /x81/x39/x8a/x34 <UNASSIGNED>
-+<U2EF9>     /x81/x39/x8a/x35 <UNASSIGNED>
-+<U2EFA>     /x81/x39/x8a/x36 <UNASSIGNED>
-+<U2EFB>     /x81/x39/x8a/x37 <UNASSIGNED>
-+<U2EFC>     /x81/x39/x8a/x38 <UNASSIGNED>
-+<U2EFD>     /x81/x39/x8a/x39 <UNASSIGNED>
-+<U2EFE>     /x81/x39/x8b/x30 <UNASSIGNED>
-+<U2EFF>     /x81/x39/x8b/x31 <UNASSIGNED>
- <U2F00>     /x81/x39/x8b/x32 KANGXI RADICAL ONE
- <U2F01>     /x81/x39/x8b/x33 KANGXI RADICAL LINE
- <U2F02>     /x81/x39/x8b/x34 KANGXI RADICAL DOT
-@@ -2904,6 +12251,32 @@ CHARMAP
- <U2FD3>     /x81/x39/xa0/x33 KANGXI RADICAL DRAGON
- <U2FD4>     /x81/x39/xa0/x34 KANGXI RADICAL TURTLE
- <U2FD5>     /x81/x39/xa0/x35 KANGXI RADICAL FLUTE
-+<U2FD6>     /x81/x39/xa0/x36 <UNASSIGNED>
-+<U2FD7>     /x81/x39/xa0/x37 <UNASSIGNED>
-+<U2FD8>     /x81/x39/xa0/x38 <UNASSIGNED>
-+<U2FD9>     /x81/x39/xa0/x39 <UNASSIGNED>
-+<U2FDA>     /x81/x39/xa1/x30 <UNASSIGNED>
-+<U2FDB>     /x81/x39/xa1/x31 <UNASSIGNED>
-+<U2FDC>     /x81/x39/xa1/x32 <UNASSIGNED>
-+<U2FDD>     /x81/x39/xa1/x33 <UNASSIGNED>
-+<U2FDE>     /x81/x39/xa1/x34 <UNASSIGNED>
-+<U2FDF>     /x81/x39/xa1/x35 <UNASSIGNED>
-+<U2FE0>     /x81/x39/xa1/x36 <UNASSIGNED>
-+<U2FE1>     /x81/x39/xa1/x37 <UNASSIGNED>
-+<U2FE2>     /x81/x39/xa1/x38 <UNASSIGNED>
-+<U2FE3>     /x81/x39/xa1/x39 <UNASSIGNED>
-+<U2FE4>     /x81/x39/xa2/x30 <UNASSIGNED>
-+<U2FE5>     /x81/x39/xa2/x31 <UNASSIGNED>
-+<U2FE6>     /x81/x39/xa2/x32 <UNASSIGNED>
-+<U2FE7>     /x81/x39/xa2/x33 <UNASSIGNED>
-+<U2FE8>     /x81/x39/xa2/x34 <UNASSIGNED>
-+<U2FE9>     /x81/x39/xa2/x35 <UNASSIGNED>
-+<U2FEA>     /x81/x39/xa2/x36 <UNASSIGNED>
-+<U2FEB>     /x81/x39/xa2/x37 <UNASSIGNED>
-+<U2FEC>     /x81/x39/xa2/x38 <UNASSIGNED>
-+<U2FED>     /x81/x39/xa2/x39 <UNASSIGNED>
-+<U2FEE>     /x81/x39/xa3/x30 <UNASSIGNED>
-+<U2FEF>     /x81/x39/xa3/x31 <UNASSIGNED>
- <U2FF0>     /xa9/x8a         IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO RIGHT
- <U2FF1>     /xa9/x8b         IDEOGRAPHIC DESCRIPTION CHARACTER ABOVE TO BELOW
- <U2FF2>     /xa9/x8c         IDEOGRAPHIC DESCRIPTION CHARACTER LEFT TO MIDDLE AND RIGHT
-@@ -2916,6 +12289,10 @@ CHARMAP
- <U2FF9>     /xa9/x93         IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM UPPER RIGHT
- <U2FFA>     /xa9/x94         IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT
- <U2FFB>     /xa9/x95         IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID
-+<U2FFC>     /x81/x39/xa3/x32 <UNASSIGNED>
-+<U2FFD>     /x81/x39/xa3/x33 <UNASSIGNED>
-+<U2FFE>     /x81/x39/xa3/x34 <UNASSIGNED>
-+<U2FFF>     /x81/x39/xa3/x35 <UNASSIGNED>
- <U3000>     /xa1/xa1         IDEOGRAPHIC SPACE
- <U3001>     /xa1/xa2         IDEOGRAPHIC COMMA
- <U3002>     /xa1/xa3         IDEOGRAPHIC FULL STOP
-@@ -2980,6 +12357,7 @@ CHARMAP
- <U303D>     /x81/x39/xa6/x33 PART ALTERNATION MARK
- <U303E>     /xa9/x89         IDEOGRAPHIC VARIATION INDICATOR
- <U303F>     /x81/x39/xa6/x34 IDEOGRAPHIC HALF FILL SPACE
-+<U3040>     /x81/x39/xa6/x35 <UNASSIGNED>
- <U3041>     /xa4/xa1         HIRAGANA LETTER SMALL A
- <U3042>     /xa4/xa2         HIRAGANA LETTER A
- <U3043>     /xa4/xa3         HIRAGANA LETTER SMALL I
-@@ -3066,6 +12444,8 @@ CHARMAP
- <U3094>     /x81/x39/xa6/x36 HIRAGANA LETTER VU
- <U3095>     /x81/x39/xa6/x37 HIRAGANA LETTER SMALL KA
- <U3096>     /x81/x39/xa6/x38 HIRAGANA LETTER SMALL KE
-+<U3097>     /x81/x39/xa6/x39 <UNASSIGNED>
-+<U3098>     /x81/x39/xa7/x30 <UNASSIGNED>
- <U3099>     /x81/x39/xa7/x31 COMBINING KATAKANA-HIRAGANA VOICED SOUND MARK
- <U309A>     /x81/x39/xa7/x32 COMBINING KATAKANA-HIRAGANA SEMI-VOICED SOUND MARK
- <U309B>     /xa9/x61         KATAKANA-HIRAGANA VOICED SOUND MARK
-@@ -3169,6 +12549,11 @@ CHARMAP
- <U30FD>     /xa9/x63         KATAKANA ITERATION MARK
- <U30FE>     /xa9/x64         KATAKANA VOICED ITERATION MARK
- <U30FF>     /x81/x39/xa8/x30 KATAKANA DIGRAPH KOTO
-+<U3100>     /x81/x39/xa8/x31 <UNASSIGNED>
-+<U3101>     /x81/x39/xa8/x32 <UNASSIGNED>
-+<U3102>     /x81/x39/xa8/x33 <UNASSIGNED>
-+<U3103>     /x81/x39/xa8/x34 <UNASSIGNED>
-+<U3104>     /x81/x39/xa8/x35 <UNASSIGNED>
- <U3105>     /xa8/xc5         BOPOMOFO LETTER B
- <U3106>     /xa8/xc6         BOPOMOFO LETTER P
- <U3107>     /xa8/xc7         BOPOMOFO LETTER M
-@@ -3210,6 +12595,9 @@ CHARMAP
- <U312B>     /x81/x39/xa8/x37 BOPOMOFO LETTER NG
- <U312C>     /x81/x39/xa8/x38 BOPOMOFO LETTER GN
- <U312D>     /x81/x39/xa8/x39 BOPOMOFO LETTER IH
-+<U312E>     /x81/x39/xa9/x30 <UNASSIGNED>
-+<U312F>     /x81/x39/xa9/x31 <UNASSIGNED>
-+<U3130>     /x81/x39/xa9/x32 <UNASSIGNED>
- <U3131>     /x81/x39/xa9/x33 HANGUL LETTER KIYEOK
- <U3132>     /x81/x39/xa9/x34 HANGUL LETTER SSANGKIYEOK
- <U3133>     /x81/x39/xa9/x35 HANGUL LETTER KIYEOK-SIOS
-@@ -3304,6 +12692,7 @@ CHARMAP
- <U318C>     /x81/x39/xb2/x34 HANGUL LETTER YU-I
- <U318D>     /x81/x39/xb2/x35 HANGUL LETTER ARAEA
- <U318E>     /x81/x39/xb2/x36 HANGUL LETTER ARAEAE
-+<U318F>     /x81/x39/xb2/x37 <UNASSIGNED>
- <U3190>     /x81/x39/xb2/x38 IDEOGRAPHIC ANNOTATION LINKING MARK
- <U3191>     /x81/x39/xb2/x39 IDEOGRAPHIC ANNOTATION REVERSE MARK
- <U3192>     /x81/x39/xb3/x30 IDEOGRAPHIC ANNOTATION ONE MARK
-@@ -3347,6 +12736,11 @@ CHARMAP
- <U31B8>     /x81/x39/xb6/x38 BOPOMOFO LETTER GH
- <U31B9>     /x81/x39/xb6/x39 BOPOMOFO LETTER LH
- <U31BA>     /x81/x39/xb7/x30 BOPOMOFO LETTER ZY
-+<U31BB>     /x81/x39/xb7/x31 <UNASSIGNED>
-+<U31BC>     /x81/x39/xb7/x32 <UNASSIGNED>
-+<U31BD>     /x81/x39/xb7/x33 <UNASSIGNED>
-+<U31BE>     /x81/x39/xb7/x34 <UNASSIGNED>
-+<U31BF>     /x81/x39/xb7/x35 <UNASSIGNED>
- <U31C0>     /x81/x39/xb7/x36 CJK STROKE T
- <U31C1>     /x81/x39/xb7/x37 CJK STROKE WG
- <U31C2>     /x81/x39/xb7/x38 CJK STROKE XG
-@@ -3383,6 +12777,18 @@ CHARMAP
- <U31E1>     /x81/x39/xba/x39 CJK STROKE HZZZG
- <U31E2>     /x81/x39/xbb/x30 CJK STROKE PG
- <U31E3>     /x81/x39/xbb/x31 CJK STROKE Q
-+<U31E4>     /x81/x39/xbb/x32 <UNASSIGNED>
-+<U31E5>     /x81/x39/xbb/x33 <UNASSIGNED>
-+<U31E6>     /x81/x39/xbb/x34 <UNASSIGNED>
-+<U31E7>     /x81/x39/xbb/x35 <UNASSIGNED>
-+<U31E8>     /x81/x39/xbb/x36 <UNASSIGNED>
-+<U31E9>     /x81/x39/xbb/x37 <UNASSIGNED>
-+<U31EA>     /x81/x39/xbb/x38 <UNASSIGNED>
-+<U31EB>     /x81/x39/xbb/x39 <UNASSIGNED>
-+<U31EC>     /x81/x39/xbc/x30 <UNASSIGNED>
-+<U31ED>     /x81/x39/xbc/x31 <UNASSIGNED>
-+<U31EE>     /x81/x39/xbc/x32 <UNASSIGNED>
-+<U31EF>     /x81/x39/xbc/x33 <UNASSIGNED>
- <U31F0>     /x81/x39/xbc/x34 KATAKANA LETTER SMALL KU
- <U31F1>     /x81/x39/xbc/x35 KATAKANA LETTER SMALL SI
- <U31F2>     /x81/x39/xbc/x36 KATAKANA LETTER SMALL SU
-@@ -3430,6 +12836,7 @@ CHARMAP
- <U321C>     /x81/x39/xc0/x38 PARENTHESIZED HANGUL CIEUC U
- <U321D>     /x81/x39/xc0/x39 PARENTHESIZED KOREAN CHARACTER OJEON
- <U321E>     /x81/x39/xc1/x30 PARENTHESIZED KOREAN CHARACTER O HU
-+<U321F>     /x81/x39/xc1/x31 <UNASSIGNED>
- <U3220>     /xa2/xe5         PARENTHESIZED IDEOGRAPH ONE
- <U3221>     /xa2/xe6         PARENTHESIZED IDEOGRAPH TWO
- <U3222>     /xa2/xe7         PARENTHESIZED IDEOGRAPH THREE
-@@ -3653,6 +13060,7 @@ CHARMAP
- <U32FC>     /x81/x39/xd6/x30 CIRCLED KATAKANA WI
- <U32FD>     /x81/x39/xd6/x31 CIRCLED KATAKANA WE
- <U32FE>     /x81/x39/xd6/x32 CIRCLED KATAKANA WO
-+<U32FF>     /x81/x39/xd6/x33 <UNASSIGNED>
- <U3300>     /x81/x39/xd6/x34 SQUARE APAATO
- <U3301>     /x81/x39/xd6/x35 SQUARE ARUHUA
- <U3302>     /x81/x39/xd6/x36 SQUARE ANPEA
-@@ -4448,6 +13856,771 @@ CHARMAP
- <U3618>     /x82/x30/xa6/x31 <CJK>
- <U3619>     /x82/x30/xa6/x32 <CJK>
- <U361A>     /xfe/x5b         <CJK>
-+<U361B>     /x82/x30/xa6/x33 <CJK>
-+<U361C>     /x82/x30/xa6/x34 <CJK>
-+<U361D>     /x82/x30/xa6/x35 <CJK>
-+<U361E>     /x82/x30/xa6/x36 <CJK>
-+<U361F>     /x82/x30/xa6/x37 <CJK>
-+<U3620>     /x82/x30/xa6/x38 <CJK>
-+<U3621>     /x82/x30/xa6/x39 <CJK>
-+<U3622>     /x82/x30/xa7/x30 <CJK>
-+<U3623>     /x82/x30/xa7/x31 <CJK>
-+<U3624>     /x82/x30/xa7/x32 <CJK>
-+<U3625>     /x82/x30/xa7/x33 <CJK>
-+<U3626>     /x82/x30/xa7/x34 <CJK>
-+<U3627>     /x82/x30/xa7/x35 <CJK>
-+<U3628>     /x82/x30/xa7/x36 <CJK>
-+<U3629>     /x82/x30/xa7/x37 <CJK>
-+<U362A>     /x82/x30/xa7/x38 <CJK>
-+<U362B>     /x82/x30/xa7/x39 <CJK>
-+<U362C>     /x82/x30/xa8/x30 <CJK>
-+<U362D>     /x82/x30/xa8/x31 <CJK>
-+<U362E>     /x82/x30/xa8/x32 <CJK>
-+<U362F>     /x82/x30/xa8/x33 <CJK>
-+<U3630>     /x82/x30/xa8/x34 <CJK>
-+<U3631>     /x82/x30/xa8/x35 <CJK>
-+<U3632>     /x82/x30/xa8/x36 <CJK>
-+<U3633>     /x82/x30/xa8/x37 <CJK>
-+<U3634>     /x82/x30/xa8/x38 <CJK>
-+<U3635>     /x82/x30/xa8/x39 <CJK>
-+<U3636>     /x82/x30/xa9/x30 <CJK>
-+<U3637>     /x82/x30/xa9/x31 <CJK>
-+<U3638>     /x82/x30/xa9/x32 <CJK>
-+<U3639>     /x82/x30/xa9/x33 <CJK>
-+<U363A>     /x82/x30/xa9/x34 <CJK>
-+<U363B>     /x82/x30/xa9/x35 <CJK>
-+<U363C>     /x82/x30/xa9/x36 <CJK>
-+<U363D>     /x82/x30/xa9/x37 <CJK>
-+<U363E>     /x82/x30/xa9/x38 <CJK>
-+<U363F>     /x82/x30/xa9/x39 <CJK>
-+<U3640>     /x82/x30/xaa/x30 <CJK>
-+<U3641>     /x82/x30/xaa/x31 <CJK>
-+<U3642>     /x82/x30/xaa/x32 <CJK>
-+<U3643>     /x82/x30/xaa/x33 <CJK>
-+<U3644>     /x82/x30/xaa/x34 <CJK>
-+<U3645>     /x82/x30/xaa/x35 <CJK>
-+<U3646>     /x82/x30/xaa/x36 <CJK>
-+<U3647>     /x82/x30/xaa/x37 <CJK>
-+<U3648>     /x82/x30/xaa/x38 <CJK>
-+<U3649>     /x82/x30/xaa/x39 <CJK>
-+<U364A>     /x82/x30/xab/x30 <CJK>
-+<U364B>     /x82/x30/xab/x31 <CJK>
-+<U364C>     /x82/x30/xab/x32 <CJK>
-+<U364D>     /x82/x30/xab/x33 <CJK>
-+<U364E>     /x82/x30/xab/x34 <CJK>
-+<U364F>     /x82/x30/xab/x35 <CJK>
-+<U3650>     /x82/x30/xab/x36 <CJK>
-+<U3651>     /x82/x30/xab/x37 <CJK>
-+<U3652>     /x82/x30/xab/x38 <CJK>
-+<U3653>     /x82/x30/xab/x39 <CJK>
-+<U3654>     /x82/x30/xac/x30 <CJK>
-+<U3655>     /x82/x30/xac/x31 <CJK>
-+<U3656>     /x82/x30/xac/x32 <CJK>
-+<U3657>     /x82/x30/xac/x33 <CJK>
-+<U3658>     /x82/x30/xac/x34 <CJK>
-+<U3659>     /x82/x30/xac/x35 <CJK>
-+<U365A>     /x82/x30/xac/x36 <CJK>
-+<U365B>     /x82/x30/xac/x37 <CJK>
-+<U365C>     /x82/x30/xac/x38 <CJK>
-+<U365D>     /x82/x30/xac/x39 <CJK>
-+<U365E>     /x82/x30/xad/x30 <CJK>
-+<U365F>     /x82/x30/xad/x31 <CJK>
-+<U3660>     /x82/x30/xad/x32 <CJK>
-+<U3661>     /x82/x30/xad/x33 <CJK>
-+<U3662>     /x82/x30/xad/x34 <CJK>
-+<U3663>     /x82/x30/xad/x35 <CJK>
-+<U3664>     /x82/x30/xad/x36 <CJK>
-+<U3665>     /x82/x30/xad/x37 <CJK>
-+<U3666>     /x82/x30/xad/x38 <CJK>
-+<U3667>     /x82/x30/xad/x39 <CJK>
-+<U3668>     /x82/x30/xae/x30 <CJK>
-+<U3669>     /x82/x30/xae/x31 <CJK>
-+<U366A>     /x82/x30/xae/x32 <CJK>
-+<U366B>     /x82/x30/xae/x33 <CJK>
-+<U366C>     /x82/x30/xae/x34 <CJK>
-+<U366D>     /x82/x30/xae/x35 <CJK>
-+<U366E>     /x82/x30/xae/x36 <CJK>
-+<U366F>     /x82/x30/xae/x37 <CJK>
-+<U3670>     /x82/x30/xae/x38 <CJK>
-+<U3671>     /x82/x30/xae/x39 <CJK>
-+<U3672>     /x82/x30/xaf/x30 <CJK>
-+<U3673>     /x82/x30/xaf/x31 <CJK>
-+<U3674>     /x82/x30/xaf/x32 <CJK>
-+<U3675>     /x82/x30/xaf/x33 <CJK>
-+<U3676>     /x82/x30/xaf/x34 <CJK>
-+<U3677>     /x82/x30/xaf/x35 <CJK>
-+<U3678>     /x82/x30/xaf/x36 <CJK>
-+<U3679>     /x82/x30/xaf/x37 <CJK>
-+<U367A>     /x82/x30/xaf/x38 <CJK>
-+<U367B>     /x82/x30/xaf/x39 <CJK>
-+<U367C>     /x82/x30/xb0/x30 <CJK>
-+<U367D>     /x82/x30/xb0/x31 <CJK>
-+<U367E>     /x82/x30/xb0/x32 <CJK>
-+<U367F>     /x82/x30/xb0/x33 <CJK>
-+<U3680>     /x82/x30/xb0/x34 <CJK>
-+<U3681>     /x82/x30/xb0/x35 <CJK>
-+<U3682>     /x82/x30/xb0/x36 <CJK>
-+<U3683>     /x82/x30/xb0/x37 <CJK>
-+<U3684>     /x82/x30/xb0/x38 <CJK>
-+<U3685>     /x82/x30/xb0/x39 <CJK>
-+<U3686>     /x82/x30/xb1/x30 <CJK>
-+<U3687>     /x82/x30/xb1/x31 <CJK>
-+<U3688>     /x82/x30/xb1/x32 <CJK>
-+<U3689>     /x82/x30/xb1/x33 <CJK>
-+<U368A>     /x82/x30/xb1/x34 <CJK>
-+<U368B>     /x82/x30/xb1/x35 <CJK>
-+<U368C>     /x82/x30/xb1/x36 <CJK>
-+<U368D>     /x82/x30/xb1/x37 <CJK>
-+<U368E>     /x82/x30/xb1/x38 <CJK>
-+<U368F>     /x82/x30/xb1/x39 <CJK>
-+<U3690>     /x82/x30/xb2/x30 <CJK>
-+<U3691>     /x82/x30/xb2/x31 <CJK>
-+<U3692>     /x82/x30/xb2/x32 <CJK>
-+<U3693>     /x82/x30/xb2/x33 <CJK>
-+<U3694>     /x82/x30/xb2/x34 <CJK>
-+<U3695>     /x82/x30/xb2/x35 <CJK>
-+<U3696>     /x82/x30/xb2/x36 <CJK>
-+<U3697>     /x82/x30/xb2/x37 <CJK>
-+<U3698>     /x82/x30/xb2/x38 <CJK>
-+<U3699>     /x82/x30/xb2/x39 <CJK>
-+<U369A>     /x82/x30/xb3/x30 <CJK>
-+<U369B>     /x82/x30/xb3/x31 <CJK>
-+<U369C>     /x82/x30/xb3/x32 <CJK>
-+<U369D>     /x82/x30/xb3/x33 <CJK>
-+<U369E>     /x82/x30/xb3/x34 <CJK>
-+<U369F>     /x82/x30/xb3/x35 <CJK>
-+<U36A0>     /x82/x30/xb3/x36 <CJK>
-+<U36A1>     /x82/x30/xb3/x37 <CJK>
-+<U36A2>     /x82/x30/xb3/x38 <CJK>
-+<U36A3>     /x82/x30/xb3/x39 <CJK>
-+<U36A4>     /x82/x30/xb4/x30 <CJK>
-+<U36A5>     /x82/x30/xb4/x31 <CJK>
-+<U36A6>     /x82/x30/xb4/x32 <CJK>
-+<U36A7>     /x82/x30/xb4/x33 <CJK>
-+<U36A8>     /x82/x30/xb4/x34 <CJK>
-+<U36A9>     /x82/x30/xb4/x35 <CJK>
-+<U36AA>     /x82/x30/xb4/x36 <CJK>
-+<U36AB>     /x82/x30/xb4/x37 <CJK>
-+<U36AC>     /x82/x30/xb4/x38 <CJK>
-+<U36AD>     /x82/x30/xb4/x39 <CJK>
-+<U36AE>     /x82/x30/xb5/x30 <CJK>
-+<U36AF>     /x82/x30/xb5/x31 <CJK>
-+<U36B0>     /x82/x30/xb5/x32 <CJK>
-+<U36B1>     /x82/x30/xb5/x33 <CJK>
-+<U36B2>     /x82/x30/xb5/x34 <CJK>
-+<U36B3>     /x82/x30/xb5/x35 <CJK>
-+<U36B4>     /x82/x30/xb5/x36 <CJK>
-+<U36B5>     /x82/x30/xb5/x37 <CJK>
-+<U36B6>     /x82/x30/xb5/x38 <CJK>
-+<U36B7>     /x82/x30/xb5/x39 <CJK>
-+<U36B8>     /x82/x30/xb6/x30 <CJK>
-+<U36B9>     /x82/x30/xb6/x31 <CJK>
-+<U36BA>     /x82/x30/xb6/x32 <CJK>
-+<U36BB>     /x82/x30/xb6/x33 <CJK>
-+<U36BC>     /x82/x30/xb6/x34 <CJK>
-+<U36BD>     /x82/x30/xb6/x35 <CJK>
-+<U36BE>     /x82/x30/xb6/x36 <CJK>
-+<U36BF>     /x82/x30/xb6/x37 <CJK>
-+<U36C0>     /x82/x30/xb6/x38 <CJK>
-+<U36C1>     /x82/x30/xb6/x39 <CJK>
-+<U36C2>     /x82/x30/xb7/x30 <CJK>
-+<U36C3>     /x82/x30/xb7/x31 <CJK>
-+<U36C4>     /x82/x30/xb7/x32 <CJK>
-+<U36C5>     /x82/x30/xb7/x33 <CJK>
-+<U36C6>     /x82/x30/xb7/x34 <CJK>
-+<U36C7>     /x82/x30/xb7/x35 <CJK>
-+<U36C8>     /x82/x30/xb7/x36 <CJK>
-+<U36C9>     /x82/x30/xb7/x37 <CJK>
-+<U36CA>     /x82/x30/xb7/x38 <CJK>
-+<U36CB>     /x82/x30/xb7/x39 <CJK>
-+<U36CC>     /x82/x30/xb8/x30 <CJK>
-+<U36CD>     /x82/x30/xb8/x31 <CJK>
-+<U36CE>     /x82/x30/xb8/x32 <CJK>
-+<U36CF>     /x82/x30/xb8/x33 <CJK>
-+<U36D0>     /x82/x30/xb8/x34 <CJK>
-+<U36D1>     /x82/x30/xb8/x35 <CJK>
-+<U36D2>     /x82/x30/xb8/x36 <CJK>
-+<U36D3>     /x82/x30/xb8/x37 <CJK>
-+<U36D4>     /x82/x30/xb8/x38 <CJK>
-+<U36D5>     /x82/x30/xb8/x39 <CJK>
-+<U36D6>     /x82/x30/xb9/x30 <CJK>
-+<U36D7>     /x82/x30/xb9/x31 <CJK>
-+<U36D8>     /x82/x30/xb9/x32 <CJK>
-+<U36D9>     /x82/x30/xb9/x33 <CJK>
-+<U36DA>     /x82/x30/xb9/x34 <CJK>
-+<U36DB>     /x82/x30/xb9/x35 <CJK>
-+<U36DC>     /x82/x30/xb9/x36 <CJK>
-+<U36DD>     /x82/x30/xb9/x37 <CJK>
-+<U36DE>     /x82/x30/xb9/x38 <CJK>
-+<U36DF>     /x82/x30/xb9/x39 <CJK>
-+<U36E0>     /x82/x30/xba/x30 <CJK>
-+<U36E1>     /x82/x30/xba/x31 <CJK>
-+<U36E2>     /x82/x30/xba/x32 <CJK>
-+<U36E3>     /x82/x30/xba/x33 <CJK>
-+<U36E4>     /x82/x30/xba/x34 <CJK>
-+<U36E5>     /x82/x30/xba/x35 <CJK>
-+<U36E6>     /x82/x30/xba/x36 <CJK>
-+<U36E7>     /x82/x30/xba/x37 <CJK>
-+<U36E8>     /x82/x30/xba/x38 <CJK>
-+<U36E9>     /x82/x30/xba/x39 <CJK>
-+<U36EA>     /x82/x30/xbb/x30 <CJK>
-+<U36EB>     /x82/x30/xbb/x31 <CJK>
-+<U36EC>     /x82/x30/xbb/x32 <CJK>
-+<U36ED>     /x82/x30/xbb/x33 <CJK>
-+<U36EE>     /x82/x30/xbb/x34 <CJK>
-+<U36EF>     /x82/x30/xbb/x35 <CJK>
-+<U36F0>     /x82/x30/xbb/x36 <CJK>
-+<U36F1>     /x82/x30/xbb/x37 <CJK>
-+<U36F2>     /x82/x30/xbb/x38 <CJK>
-+<U36F3>     /x82/x30/xbb/x39 <CJK>
-+<U36F4>     /x82/x30/xbc/x30 <CJK>
-+<U36F5>     /x82/x30/xbc/x31 <CJK>
-+<U36F6>     /x82/x30/xbc/x32 <CJK>
-+<U36F7>     /x82/x30/xbc/x33 <CJK>
-+<U36F8>     /x82/x30/xbc/x34 <CJK>
-+<U36F9>     /x82/x30/xbc/x35 <CJK>
-+<U36FA>     /x82/x30/xbc/x36 <CJK>
-+<U36FB>     /x82/x30/xbc/x37 <CJK>
-+<U36FC>     /x82/x30/xbc/x38 <CJK>
-+<U36FD>     /x82/x30/xbc/x39 <CJK>
-+<U36FE>     /x82/x30/xbd/x30 <CJK>
-+<U36FF>     /x82/x30/xbd/x31 <CJK>
-+<U3700>     /x82/x30/xbd/x32 <CJK>
-+<U3701>     /x82/x30/xbd/x33 <CJK>
-+<U3702>     /x82/x30/xbd/x34 <CJK>
-+<U3703>     /x82/x30/xbd/x35 <CJK>
-+<U3704>     /x82/x30/xbd/x36 <CJK>
-+<U3705>     /x82/x30/xbd/x37 <CJK>
-+<U3706>     /x82/x30/xbd/x38 <CJK>
-+<U3707>     /x82/x30/xbd/x39 <CJK>
-+<U3708>     /x82/x30/xbe/x30 <CJK>
-+<U3709>     /x82/x30/xbe/x31 <CJK>
-+<U370A>     /x82/x30/xbe/x32 <CJK>
-+<U370B>     /x82/x30/xbe/x33 <CJK>
-+<U370C>     /x82/x30/xbe/x34 <CJK>
-+<U370D>     /x82/x30/xbe/x35 <CJK>
-+<U370E>     /x82/x30/xbe/x36 <CJK>
-+<U370F>     /x82/x30/xbe/x37 <CJK>
-+<U3710>     /x82/x30/xbe/x38 <CJK>
-+<U3711>     /x82/x30/xbe/x39 <CJK>
-+<U3712>     /x82/x30/xbf/x30 <CJK>
-+<U3713>     /x82/x30/xbf/x31 <CJK>
-+<U3714>     /x82/x30/xbf/x32 <CJK>
-+<U3715>     /x82/x30/xbf/x33 <CJK>
-+<U3716>     /x82/x30/xbf/x34 <CJK>
-+<U3717>     /x82/x30/xbf/x35 <CJK>
-+<U3718>     /x82/x30/xbf/x36 <CJK>
-+<U3719>     /x82/x30/xbf/x37 <CJK>
-+<U371A>     /x82/x30/xbf/x38 <CJK>
-+<U371B>     /x82/x30/xbf/x39 <CJK>
-+<U371C>     /x82/x30/xc0/x30 <CJK>
-+<U371D>     /x82/x30/xc0/x31 <CJK>
-+<U371E>     /x82/x30/xc0/x32 <CJK>
-+<U371F>     /x82/x30/xc0/x33 <CJK>
-+<U3720>     /x82/x30/xc0/x34 <CJK>
-+<U3721>     /x82/x30/xc0/x35 <CJK>
-+<U3722>     /x82/x30/xc0/x36 <CJK>
-+<U3723>     /x82/x30/xc0/x37 <CJK>
-+<U3724>     /x82/x30/xc0/x38 <CJK>
-+<U3725>     /x82/x30/xc0/x39 <CJK>
-+<U3726>     /x82/x30/xc1/x30 <CJK>
-+<U3727>     /x82/x30/xc1/x31 <CJK>
-+<U3728>     /x82/x30/xc1/x32 <CJK>
-+<U3729>     /x82/x30/xc1/x33 <CJK>
-+<U372A>     /x82/x30/xc1/x34 <CJK>
-+<U372B>     /x82/x30/xc1/x35 <CJK>
-+<U372C>     /x82/x30/xc1/x36 <CJK>
-+<U372D>     /x82/x30/xc1/x37 <CJK>
-+<U372E>     /x82/x30/xc1/x38 <CJK>
-+<U372F>     /x82/x30/xc1/x39 <CJK>
-+<U3730>     /x82/x30/xc2/x30 <CJK>
-+<U3731>     /x82/x30/xc2/x31 <CJK>
-+<U3732>     /x82/x30/xc2/x32 <CJK>
-+<U3733>     /x82/x30/xc2/x33 <CJK>
-+<U3734>     /x82/x30/xc2/x34 <CJK>
-+<U3735>     /x82/x30/xc2/x35 <CJK>
-+<U3736>     /x82/x30/xc2/x36 <CJK>
-+<U3737>     /x82/x30/xc2/x37 <CJK>
-+<U3738>     /x82/x30/xc2/x38 <CJK>
-+<U3739>     /x82/x30/xc2/x39 <CJK>
-+<U373A>     /x82/x30/xc3/x30 <CJK>
-+<U373B>     /x82/x30/xc3/x31 <CJK>
-+<U373C>     /x82/x30/xc3/x32 <CJK>
-+<U373D>     /x82/x30/xc3/x33 <CJK>
-+<U373E>     /x82/x30/xc3/x34 <CJK>
-+<U373F>     /x82/x30/xc3/x35 <CJK>
-+<U3740>     /x82/x30/xc3/x36 <CJK>
-+<U3741>     /x82/x30/xc3/x37 <CJK>
-+<U3742>     /x82/x30/xc3/x38 <CJK>
-+<U3743>     /x82/x30/xc3/x39 <CJK>
-+<U3744>     /x82/x30/xc4/x30 <CJK>
-+<U3745>     /x82/x30/xc4/x31 <CJK>
-+<U3746>     /x82/x30/xc4/x32 <CJK>
-+<U3747>     /x82/x30/xc4/x33 <CJK>
-+<U3748>     /x82/x30/xc4/x34 <CJK>
-+<U3749>     /x82/x30/xc4/x35 <CJK>
-+<U374A>     /x82/x30/xc4/x36 <CJK>
-+<U374B>     /x82/x30/xc4/x37 <CJK>
-+<U374C>     /x82/x30/xc4/x38 <CJK>
-+<U374D>     /x82/x30/xc4/x39 <CJK>
-+<U374E>     /x82/x30/xc5/x30 <CJK>
-+<U374F>     /x82/x30/xc5/x31 <CJK>
-+<U3750>     /x82/x30/xc5/x32 <CJK>
-+<U3751>     /x82/x30/xc5/x33 <CJK>
-+<U3752>     /x82/x30/xc5/x34 <CJK>
-+<U3753>     /x82/x30/xc5/x35 <CJK>
-+<U3754>     /x82/x30/xc5/x36 <CJK>
-+<U3755>     /x82/x30/xc5/x37 <CJK>
-+<U3756>     /x82/x30/xc5/x38 <CJK>
-+<U3757>     /x82/x30/xc5/x39 <CJK>
-+<U3758>     /x82/x30/xc6/x30 <CJK>
-+<U3759>     /x82/x30/xc6/x31 <CJK>
-+<U375A>     /x82/x30/xc6/x32 <CJK>
-+<U375B>     /x82/x30/xc6/x33 <CJK>
-+<U375C>     /x82/x30/xc6/x34 <CJK>
-+<U375D>     /x82/x30/xc6/x35 <CJK>
-+<U375E>     /x82/x30/xc6/x36 <CJK>
-+<U375F>     /x82/x30/xc6/x37 <CJK>
-+<U3760>     /x82/x30/xc6/x38 <CJK>
-+<U3761>     /x82/x30/xc6/x39 <CJK>
-+<U3762>     /x82/x30/xc7/x30 <CJK>
-+<U3763>     /x82/x30/xc7/x31 <CJK>
-+<U3764>     /x82/x30/xc7/x32 <CJK>
-+<U3765>     /x82/x30/xc7/x33 <CJK>
-+<U3766>     /x82/x30/xc7/x34 <CJK>
-+<U3767>     /x82/x30/xc7/x35 <CJK>
-+<U3768>     /x82/x30/xc7/x36 <CJK>
-+<U3769>     /x82/x30/xc7/x37 <CJK>
-+<U376A>     /x82/x30/xc7/x38 <CJK>
-+<U376B>     /x82/x30/xc7/x39 <CJK>
-+<U376C>     /x82/x30/xc8/x30 <CJK>
-+<U376D>     /x82/x30/xc8/x31 <CJK>
-+<U376E>     /x82/x30/xc8/x32 <CJK>
-+<U376F>     /x82/x30/xc8/x33 <CJK>
-+<U3770>     /x82/x30/xc8/x34 <CJK>
-+<U3771>     /x82/x30/xc8/x35 <CJK>
-+<U3772>     /x82/x30/xc8/x36 <CJK>
-+<U3773>     /x82/x30/xc8/x37 <CJK>
-+<U3774>     /x82/x30/xc8/x38 <CJK>
-+<U3775>     /x82/x30/xc8/x39 <CJK>
-+<U3776>     /x82/x30/xc9/x30 <CJK>
-+<U3777>     /x82/x30/xc9/x31 <CJK>
-+<U3778>     /x82/x30/xc9/x32 <CJK>
-+<U3779>     /x82/x30/xc9/x33 <CJK>
-+<U377A>     /x82/x30/xc9/x34 <CJK>
-+<U377B>     /x82/x30/xc9/x35 <CJK>
-+<U377C>     /x82/x30/xc9/x36 <CJK>
-+<U377D>     /x82/x30/xc9/x37 <CJK>
-+<U377E>     /x82/x30/xc9/x38 <CJK>
-+<U377F>     /x82/x30/xc9/x39 <CJK>
-+<U3780>     /x82/x30/xca/x30 <CJK>
-+<U3781>     /x82/x30/xca/x31 <CJK>
-+<U3782>     /x82/x30/xca/x32 <CJK>
-+<U3783>     /x82/x30/xca/x33 <CJK>
-+<U3784>     /x82/x30/xca/x34 <CJK>
-+<U3785>     /x82/x30/xca/x35 <CJK>
-+<U3786>     /x82/x30/xca/x36 <CJK>
-+<U3787>     /x82/x30/xca/x37 <CJK>
-+<U3788>     /x82/x30/xca/x38 <CJK>
-+<U3789>     /x82/x30/xca/x39 <CJK>
-+<U378A>     /x82/x30/xcb/x30 <CJK>
-+<U378B>     /x82/x30/xcb/x31 <CJK>
-+<U378C>     /x82/x30/xcb/x32 <CJK>
-+<U378D>     /x82/x30/xcb/x33 <CJK>
-+<U378E>     /x82/x30/xcb/x34 <CJK>
-+<U378F>     /x82/x30/xcb/x35 <CJK>
-+<U3790>     /x82/x30/xcb/x36 <CJK>
-+<U3791>     /x82/x30/xcb/x37 <CJK>
-+<U3792>     /x82/x30/xcb/x38 <CJK>
-+<U3793>     /x82/x30/xcb/x39 <CJK>
-+<U3794>     /x82/x30/xcc/x30 <CJK>
-+<U3795>     /x82/x30/xcc/x31 <CJK>
-+<U3796>     /x82/x30/xcc/x32 <CJK>
-+<U3797>     /x82/x30/xcc/x33 <CJK>
-+<U3798>     /x82/x30/xcc/x34 <CJK>
-+<U3799>     /x82/x30/xcc/x35 <CJK>
-+<U379A>     /x82/x30/xcc/x36 <CJK>
-+<U379B>     /x82/x30/xcc/x37 <CJK>
-+<U379C>     /x82/x30/xcc/x38 <CJK>
-+<U379D>     /x82/x30/xcc/x39 <CJK>
-+<U379E>     /x82/x30/xcd/x30 <CJK>
-+<U379F>     /x82/x30/xcd/x31 <CJK>
-+<U37A0>     /x82/x30/xcd/x32 <CJK>
-+<U37A1>     /x82/x30/xcd/x33 <CJK>
-+<U37A2>     /x82/x30/xcd/x34 <CJK>
-+<U37A3>     /x82/x30/xcd/x35 <CJK>
-+<U37A4>     /x82/x30/xcd/x36 <CJK>
-+<U37A5>     /x82/x30/xcd/x37 <CJK>
-+<U37A6>     /x82/x30/xcd/x38 <CJK>
-+<U37A7>     /x82/x30/xcd/x39 <CJK>
-+<U37A8>     /x82/x30/xce/x30 <CJK>
-+<U37A9>     /x82/x30/xce/x31 <CJK>
-+<U37AA>     /x82/x30/xce/x32 <CJK>
-+<U37AB>     /x82/x30/xce/x33 <CJK>
-+<U37AC>     /x82/x30/xce/x34 <CJK>
-+<U37AD>     /x82/x30/xce/x35 <CJK>
-+<U37AE>     /x82/x30/xce/x36 <CJK>
-+<U37AF>     /x82/x30/xce/x37 <CJK>
-+<U37B0>     /x82/x30/xce/x38 <CJK>
-+<U37B1>     /x82/x30/xce/x39 <CJK>
-+<U37B2>     /x82/x30/xcf/x30 <CJK>
-+<U37B3>     /x82/x30/xcf/x31 <CJK>
-+<U37B4>     /x82/x30/xcf/x32 <CJK>
-+<U37B5>     /x82/x30/xcf/x33 <CJK>
-+<U37B6>     /x82/x30/xcf/x34 <CJK>
-+<U37B7>     /x82/x30/xcf/x35 <CJK>
-+<U37B8>     /x82/x30/xcf/x36 <CJK>
-+<U37B9>     /x82/x30/xcf/x37 <CJK>
-+<U37BA>     /x82/x30/xcf/x38 <CJK>
-+<U37BB>     /x82/x30/xcf/x39 <CJK>
-+<U37BC>     /x82/x30/xd0/x30 <CJK>
-+<U37BD>     /x82/x30/xd0/x31 <CJK>
-+<U37BE>     /x82/x30/xd0/x32 <CJK>
-+<U37BF>     /x82/x30/xd0/x33 <CJK>
-+<U37C0>     /x82/x30/xd0/x34 <CJK>
-+<U37C1>     /x82/x30/xd0/x35 <CJK>
-+<U37C2>     /x82/x30/xd0/x36 <CJK>
-+<U37C3>     /x82/x30/xd0/x37 <CJK>
-+<U37C4>     /x82/x30/xd0/x38 <CJK>
-+<U37C5>     /x82/x30/xd0/x39 <CJK>
-+<U37C6>     /x82/x30/xd1/x30 <CJK>
-+<U37C7>     /x82/x30/xd1/x31 <CJK>
-+<U37C8>     /x82/x30/xd1/x32 <CJK>
-+<U37C9>     /x82/x30/xd1/x33 <CJK>
-+<U37CA>     /x82/x30/xd1/x34 <CJK>
-+<U37CB>     /x82/x30/xd1/x35 <CJK>
-+<U37CC>     /x82/x30/xd1/x36 <CJK>
-+<U37CD>     /x82/x30/xd1/x37 <CJK>
-+<U37CE>     /x82/x30/xd1/x38 <CJK>
-+<U37CF>     /x82/x30/xd1/x39 <CJK>
-+<U37D0>     /x82/x30/xd2/x30 <CJK>
-+<U37D1>     /x82/x30/xd2/x31 <CJK>
-+<U37D2>     /x82/x30/xd2/x32 <CJK>
-+<U37D3>     /x82/x30/xd2/x33 <CJK>
-+<U37D4>     /x82/x30/xd2/x34 <CJK>
-+<U37D5>     /x82/x30/xd2/x35 <CJK>
-+<U37D6>     /x82/x30/xd2/x36 <CJK>
-+<U37D7>     /x82/x30/xd2/x37 <CJK>
-+<U37D8>     /x82/x30/xd2/x38 <CJK>
-+<U37D9>     /x82/x30/xd2/x39 <CJK>
-+<U37DA>     /x82/x30/xd3/x30 <CJK>
-+<U37DB>     /x82/x30/xd3/x31 <CJK>
-+<U37DC>     /x82/x30/xd3/x32 <CJK>
-+<U37DD>     /x82/x30/xd3/x33 <CJK>
-+<U37DE>     /x82/x30/xd3/x34 <CJK>
-+<U37DF>     /x82/x30/xd3/x35 <CJK>
-+<U37E0>     /x82/x30/xd3/x36 <CJK>
-+<U37E1>     /x82/x30/xd3/x37 <CJK>
-+<U37E2>     /x82/x30/xd3/x38 <CJK>
-+<U37E3>     /x82/x30/xd3/x39 <CJK>
-+<U37E4>     /x82/x30/xd4/x30 <CJK>
-+<U37E5>     /x82/x30/xd4/x31 <CJK>
-+<U37E6>     /x82/x30/xd4/x32 <CJK>
-+<U37E7>     /x82/x30/xd4/x33 <CJK>
-+<U37E8>     /x82/x30/xd4/x34 <CJK>
-+<U37E9>     /x82/x30/xd4/x35 <CJK>
-+<U37EA>     /x82/x30/xd4/x36 <CJK>
-+<U37EB>     /x82/x30/xd4/x37 <CJK>
-+<U37EC>     /x82/x30/xd4/x38 <CJK>
-+<U37ED>     /x82/x30/xd4/x39 <CJK>
-+<U37EE>     /x82/x30/xd5/x30 <CJK>
-+<U37EF>     /x82/x30/xd5/x31 <CJK>
-+<U37F0>     /x82/x30/xd5/x32 <CJK>
-+<U37F1>     /x82/x30/xd5/x33 <CJK>
-+<U37F2>     /x82/x30/xd5/x34 <CJK>
-+<U37F3>     /x82/x30/xd5/x35 <CJK>
-+<U37F4>     /x82/x30/xd5/x36 <CJK>
-+<U37F5>     /x82/x30/xd5/x37 <CJK>
-+<U37F6>     /x82/x30/xd5/x38 <CJK>
-+<U37F7>     /x82/x30/xd5/x39 <CJK>
-+<U37F8>     /x82/x30/xd6/x30 <CJK>
-+<U37F9>     /x82/x30/xd6/x31 <CJK>
-+<U37FA>     /x82/x30/xd6/x32 <CJK>
-+<U37FB>     /x82/x30/xd6/x33 <CJK>
-+<U37FC>     /x82/x30/xd6/x34 <CJK>
-+<U37FD>     /x82/x30/xd6/x35 <CJK>
-+<U37FE>     /x82/x30/xd6/x36 <CJK>
-+<U37FF>     /x82/x30/xd6/x37 <CJK>
-+<U3800>     /x82/x30/xd6/x38 <CJK>
-+<U3801>     /x82/x30/xd6/x39 <CJK>
-+<U3802>     /x82/x30/xd7/x30 <CJK>
-+<U3803>     /x82/x30/xd7/x31 <CJK>
-+<U3804>     /x82/x30/xd7/x32 <CJK>
-+<U3805>     /x82/x30/xd7/x33 <CJK>
-+<U3806>     /x82/x30/xd7/x34 <CJK>
-+<U3807>     /x82/x30/xd7/x35 <CJK>
-+<U3808>     /x82/x30/xd7/x36 <CJK>
-+<U3809>     /x82/x30/xd7/x37 <CJK>
-+<U380A>     /x82/x30/xd7/x38 <CJK>
-+<U380B>     /x82/x30/xd7/x39 <CJK>
-+<U380C>     /x82/x30/xd8/x30 <CJK>
-+<U380D>     /x82/x30/xd8/x31 <CJK>
-+<U380E>     /x82/x30/xd8/x32 <CJK>
-+<U380F>     /x82/x30/xd8/x33 <CJK>
-+<U3810>     /x82/x30/xd8/x34 <CJK>
-+<U3811>     /x82/x30/xd8/x35 <CJK>
-+<U3812>     /x82/x30/xd8/x36 <CJK>
-+<U3813>     /x82/x30/xd8/x37 <CJK>
-+<U3814>     /x82/x30/xd8/x38 <CJK>
-+<U3815>     /x82/x30/xd8/x39 <CJK>
-+<U3816>     /x82/x30/xd9/x30 <CJK>
-+<U3817>     /x82/x30/xd9/x31 <CJK>
-+<U3818>     /x82/x30/xd9/x32 <CJK>
-+<U3819>     /x82/x30/xd9/x33 <CJK>
-+<U381A>     /x82/x30/xd9/x34 <CJK>
-+<U381B>     /x82/x30/xd9/x35 <CJK>
-+<U381C>     /x82/x30/xd9/x36 <CJK>
-+<U381D>     /x82/x30/xd9/x37 <CJK>
-+<U381E>     /x82/x30/xd9/x38 <CJK>
-+<U381F>     /x82/x30/xd9/x39 <CJK>
-+<U3820>     /x82/x30/xda/x30 <CJK>
-+<U3821>     /x82/x30/xda/x31 <CJK>
-+<U3822>     /x82/x30/xda/x32 <CJK>
-+<U3823>     /x82/x30/xda/x33 <CJK>
-+<U3824>     /x82/x30/xda/x34 <CJK>
-+<U3825>     /x82/x30/xda/x35 <CJK>
-+<U3826>     /x82/x30/xda/x36 <CJK>
-+<U3827>     /x82/x30/xda/x37 <CJK>
-+<U3828>     /x82/x30/xda/x38 <CJK>
-+<U3829>     /x82/x30/xda/x39 <CJK>
-+<U382A>     /x82/x30/xdb/x30 <CJK>
-+<U382B>     /x82/x30/xdb/x31 <CJK>
-+<U382C>     /x82/x30/xdb/x32 <CJK>
-+<U382D>     /x82/x30/xdb/x33 <CJK>
-+<U382E>     /x82/x30/xdb/x34 <CJK>
-+<U382F>     /x82/x30/xdb/x35 <CJK>
-+<U3830>     /x82/x30/xdb/x36 <CJK>
-+<U3831>     /x82/x30/xdb/x37 <CJK>
-+<U3832>     /x82/x30/xdb/x38 <CJK>
-+<U3833>     /x82/x30/xdb/x39 <CJK>
-+<U3834>     /x82/x30/xdc/x30 <CJK>
-+<U3835>     /x82/x30/xdc/x31 <CJK>
-+<U3836>     /x82/x30/xdc/x32 <CJK>
-+<U3837>     /x82/x30/xdc/x33 <CJK>
-+<U3838>     /x82/x30/xdc/x34 <CJK>
-+<U3839>     /x82/x30/xdc/x35 <CJK>
-+<U383A>     /x82/x30/xdc/x36 <CJK>
-+<U383B>     /x82/x30/xdc/x37 <CJK>
-+<U383C>     /x82/x30/xdc/x38 <CJK>
-+<U383D>     /x82/x30/xdc/x39 <CJK>
-+<U383E>     /x82/x30/xdd/x30 <CJK>
-+<U383F>     /x82/x30/xdd/x31 <CJK>
-+<U3840>     /x82/x30/xdd/x32 <CJK>
-+<U3841>     /x82/x30/xdd/x33 <CJK>
-+<U3842>     /x82/x30/xdd/x34 <CJK>
-+<U3843>     /x82/x30/xdd/x35 <CJK>
-+<U3844>     /x82/x30/xdd/x36 <CJK>
-+<U3845>     /x82/x30/xdd/x37 <CJK>
-+<U3846>     /x82/x30/xdd/x38 <CJK>
-+<U3847>     /x82/x30/xdd/x39 <CJK>
-+<U3848>     /x82/x30/xde/x30 <CJK>
-+<U3849>     /x82/x30/xde/x31 <CJK>
-+<U384A>     /x82/x30/xde/x32 <CJK>
-+<U384B>     /x82/x30/xde/x33 <CJK>
-+<U384C>     /x82/x30/xde/x34 <CJK>
-+<U384D>     /x82/x30/xde/x35 <CJK>
-+<U384E>     /x82/x30/xde/x36 <CJK>
-+<U384F>     /x82/x30/xde/x37 <CJK>
-+<U3850>     /x82/x30/xde/x38 <CJK>
-+<U3851>     /x82/x30/xde/x39 <CJK>
-+<U3852>     /x82/x30/xdf/x30 <CJK>
-+<U3853>     /x82/x30/xdf/x31 <CJK>
-+<U3854>     /x82/x30/xdf/x32 <CJK>
-+<U3855>     /x82/x30/xdf/x33 <CJK>
-+<U3856>     /x82/x30/xdf/x34 <CJK>
-+<U3857>     /x82/x30/xdf/x35 <CJK>
-+<U3858>     /x82/x30/xdf/x36 <CJK>
-+<U3859>     /x82/x30/xdf/x37 <CJK>
-+<U385A>     /x82/x30/xdf/x38 <CJK>
-+<U385B>     /x82/x30/xdf/x39 <CJK>
-+<U385C>     /x82/x30/xe0/x30 <CJK>
-+<U385D>     /x82/x30/xe0/x31 <CJK>
-+<U385E>     /x82/x30/xe0/x32 <CJK>
-+<U385F>     /x82/x30/xe0/x33 <CJK>
-+<U3860>     /x82/x30/xe0/x34 <CJK>
-+<U3861>     /x82/x30/xe0/x35 <CJK>
-+<U3862>     /x82/x30/xe0/x36 <CJK>
-+<U3863>     /x82/x30/xe0/x37 <CJK>
-+<U3864>     /x82/x30/xe0/x38 <CJK>
-+<U3865>     /x82/x30/xe0/x39 <CJK>
-+<U3866>     /x82/x30/xe1/x30 <CJK>
-+<U3867>     /x82/x30/xe1/x31 <CJK>
-+<U3868>     /x82/x30/xe1/x32 <CJK>
-+<U3869>     /x82/x30/xe1/x33 <CJK>
-+<U386A>     /x82/x30/xe1/x34 <CJK>
-+<U386B>     /x82/x30/xe1/x35 <CJK>
-+<U386C>     /x82/x30/xe1/x36 <CJK>
-+<U386D>     /x82/x30/xe1/x37 <CJK>
-+<U386E>     /x82/x30/xe1/x38 <CJK>
-+<U386F>     /x82/x30/xe1/x39 <CJK>
-+<U3870>     /x82/x30/xe2/x30 <CJK>
-+<U3871>     /x82/x30/xe2/x31 <CJK>
-+<U3872>     /x82/x30/xe2/x32 <CJK>
-+<U3873>     /x82/x30/xe2/x33 <CJK>
-+<U3874>     /x82/x30/xe2/x34 <CJK>
-+<U3875>     /x82/x30/xe2/x35 <CJK>
-+<U3876>     /x82/x30/xe2/x36 <CJK>
-+<U3877>     /x82/x30/xe2/x37 <CJK>
-+<U3878>     /x82/x30/xe2/x38 <CJK>
-+<U3879>     /x82/x30/xe2/x39 <CJK>
-+<U387A>     /x82/x30/xe3/x30 <CJK>
-+<U387B>     /x82/x30/xe3/x31 <CJK>
-+<U387C>     /x82/x30/xe3/x32 <CJK>
-+<U387D>     /x82/x30/xe3/x33 <CJK>
-+<U387E>     /x82/x30/xe3/x34 <CJK>
-+<U387F>     /x82/x30/xe3/x35 <CJK>
-+<U3880>     /x82/x30/xe3/x36 <CJK>
-+<U3881>     /x82/x30/xe3/x37 <CJK>
-+<U3882>     /x82/x30/xe3/x38 <CJK>
-+<U3883>     /x82/x30/xe3/x39 <CJK>
-+<U3884>     /x82/x30/xe4/x30 <CJK>
-+<U3885>     /x82/x30/xe4/x31 <CJK>
-+<U3886>     /x82/x30/xe4/x32 <CJK>
-+<U3887>     /x82/x30/xe4/x33 <CJK>
-+<U3888>     /x82/x30/xe4/x34 <CJK>
-+<U3889>     /x82/x30/xe4/x35 <CJK>
-+<U388A>     /x82/x30/xe4/x36 <CJK>
-+<U388B>     /x82/x30/xe4/x37 <CJK>
-+<U388C>     /x82/x30/xe4/x38 <CJK>
-+<U388D>     /x82/x30/xe4/x39 <CJK>
-+<U388E>     /x82/x30/xe5/x30 <CJK>
-+<U388F>     /x82/x30/xe5/x31 <CJK>
-+<U3890>     /x82/x30/xe5/x32 <CJK>
-+<U3891>     /x82/x30/xe5/x33 <CJK>
-+<U3892>     /x82/x30/xe5/x34 <CJK>
-+<U3893>     /x82/x30/xe5/x35 <CJK>
-+<U3894>     /x82/x30/xe5/x36 <CJK>
-+<U3895>     /x82/x30/xe5/x37 <CJK>
-+<U3896>     /x82/x30/xe5/x38 <CJK>
-+<U3897>     /x82/x30/xe5/x39 <CJK>
-+<U3898>     /x82/x30/xe6/x30 <CJK>
-+<U3899>     /x82/x30/xe6/x31 <CJK>
-+<U389A>     /x82/x30/xe6/x32 <CJK>
-+<U389B>     /x82/x30/xe6/x33 <CJK>
-+<U389C>     /x82/x30/xe6/x34 <CJK>
-+<U389D>     /x82/x30/xe6/x35 <CJK>
-+<U389E>     /x82/x30/xe6/x36 <CJK>
-+<U389F>     /x82/x30/xe6/x37 <CJK>
-+<U38A0>     /x82/x30/xe6/x38 <CJK>
-+<U38A1>     /x82/x30/xe6/x39 <CJK>
-+<U38A2>     /x82/x30/xe7/x30 <CJK>
-+<U38A3>     /x82/x30/xe7/x31 <CJK>
-+<U38A4>     /x82/x30/xe7/x32 <CJK>
-+<U38A5>     /x82/x30/xe7/x33 <CJK>
-+<U38A6>     /x82/x30/xe7/x34 <CJK>
-+<U38A7>     /x82/x30/xe7/x35 <CJK>
-+<U38A8>     /x82/x30/xe7/x36 <CJK>
-+<U38A9>     /x82/x30/xe7/x37 <CJK>
-+<U38AA>     /x82/x30/xe7/x38 <CJK>
-+<U38AB>     /x82/x30/xe7/x39 <CJK>
-+<U38AC>     /x82/x30/xe8/x30 <CJK>
-+<U38AD>     /x82/x30/xe8/x31 <CJK>
-+<U38AE>     /x82/x30/xe8/x32 <CJK>
-+<U38AF>     /x82/x30/xe8/x33 <CJK>
-+<U38B0>     /x82/x30/xe8/x34 <CJK>
-+<U38B1>     /x82/x30/xe8/x35 <CJK>
-+<U38B2>     /x82/x30/xe8/x36 <CJK>
-+<U38B3>     /x82/x30/xe8/x37 <CJK>
-+<U38B4>     /x82/x30/xe8/x38 <CJK>
-+<U38B5>     /x82/x30/xe8/x39 <CJK>
-+<U38B6>     /x82/x30/xe9/x30 <CJK>
-+<U38B7>     /x82/x30/xe9/x31 <CJK>
-+<U38B8>     /x82/x30/xe9/x32 <CJK>
-+<U38B9>     /x82/x30/xe9/x33 <CJK>
-+<U38BA>     /x82/x30/xe9/x34 <CJK>
-+<U38BB>     /x82/x30/xe9/x35 <CJK>
-+<U38BC>     /x82/x30/xe9/x36 <CJK>
-+<U38BD>     /x82/x30/xe9/x37 <CJK>
-+<U38BE>     /x82/x30/xe9/x38 <CJK>
-+<U38BF>     /x82/x30/xe9/x39 <CJK>
-+<U38C0>     /x82/x30/xea/x30 <CJK>
-+<U38C1>     /x82/x30/xea/x31 <CJK>
-+<U38C2>     /x82/x30/xea/x32 <CJK>
-+<U38C3>     /x82/x30/xea/x33 <CJK>
-+<U38C4>     /x82/x30/xea/x34 <CJK>
-+<U38C5>     /x82/x30/xea/x35 <CJK>
-+<U38C6>     /x82/x30/xea/x36 <CJK>
-+<U38C7>     /x82/x30/xea/x37 <CJK>
-+<U38C8>     /x82/x30/xea/x38 <CJK>
-+<U38C9>     /x82/x30/xea/x39 <CJK>
-+<U38CA>     /x82/x30/xeb/x30 <CJK>
-+<U38CB>     /x82/x30/xeb/x31 <CJK>
-+<U38CC>     /x82/x30/xeb/x32 <CJK>
-+<U38CD>     /x82/x30/xeb/x33 <CJK>
-+<U38CE>     /x82/x30/xeb/x34 <CJK>
-+<U38CF>     /x82/x30/xeb/x35 <CJK>
-+<U38D0>     /x82/x30/xeb/x36 <CJK>
-+<U38D1>     /x82/x30/xeb/x37 <CJK>
-+<U38D2>     /x82/x30/xeb/x38 <CJK>
-+<U38D3>     /x82/x30/xeb/x39 <CJK>
-+<U38D4>     /x82/x30/xec/x30 <CJK>
-+<U38D5>     /x82/x30/xec/x31 <CJK>
-+<U38D6>     /x82/x30/xec/x32 <CJK>
-+<U38D7>     /x82/x30/xec/x33 <CJK>
-+<U38D8>     /x82/x30/xec/x34 <CJK>
-+<U38D9>     /x82/x30/xec/x35 <CJK>
-+<U38DA>     /x82/x30/xec/x36 <CJK>
-+<U38DB>     /x82/x30/xec/x37 <CJK>
-+<U38DC>     /x82/x30/xec/x38 <CJK>
-+<U38DD>     /x82/x30/xec/x39 <CJK>
-+<U38DE>     /x82/x30/xed/x30 <CJK>
-+<U38DF>     /x82/x30/xed/x31 <CJK>
-+<U38E0>     /x82/x30/xed/x32 <CJK>
-+<U38E1>     /x82/x30/xed/x33 <CJK>
-+<U38E2>     /x82/x30/xed/x34 <CJK>
-+<U38E3>     /x82/x30/xed/x35 <CJK>
-+<U38E4>     /x82/x30/xed/x36 <CJK>
-+<U38E5>     /x82/x30/xed/x37 <CJK>
-+<U38E6>     /x82/x30/xed/x38 <CJK>
-+<U38E7>     /x82/x30/xed/x39 <CJK>
-+<U38E8>     /x82/x30/xee/x30 <CJK>
-+<U38E9>     /x82/x30/xee/x31 <CJK>
-+<U38EA>     /x82/x30/xee/x32 <CJK>
-+<U38EB>     /x82/x30/xee/x33 <CJK>
-+<U38EC>     /x82/x30/xee/x34 <CJK>
-+<U38ED>     /x82/x30/xee/x35 <CJK>
-+<U38EE>     /x82/x30/xee/x36 <CJK>
-+<U38EF>     /x82/x30/xee/x37 <CJK>
-+<U38F0>     /x82/x30/xee/x38 <CJK>
-+<U38F1>     /x82/x30/xee/x39 <CJK>
-+<U38F2>     /x82/x30/xef/x30 <CJK>
-+<U38F3>     /x82/x30/xef/x31 <CJK>
-+<U38F4>     /x82/x30/xef/x32 <CJK>
-+<U38F5>     /x82/x30/xef/x33 <CJK>
-+<U38F6>     /x82/x30/xef/x34 <CJK>
-+<U38F7>     /x82/x30/xef/x35 <CJK>
-+<U38F8>     /x82/x30/xef/x36 <CJK>
-+<U38F9>     /x82/x30/xef/x37 <CJK>
-+<U38FA>     /x82/x30/xef/x38 <CJK>
-+<U38FB>     /x82/x30/xef/x39 <CJK>
-+<U38FC>     /x82/x30/xf0/x30 <CJK>
-+<U38FD>     /x82/x30/xf0/x31 <CJK>
-+<U38FE>     /x82/x30/xf0/x32 <CJK>
-+<U38FF>     /x82/x30/xf0/x33 <CJK>
-+<U3900>     /x82/x30/xf0/x34 <CJK>
-+<U3901>     /x82/x30/xf0/x35 <CJK>
-+<U3902>     /x82/x30/xf0/x36 <CJK>
-+<U3903>     /x82/x30/xf0/x37 <CJK>
-+<U3904>     /x82/x30/xf0/x38 <CJK>
-+<U3905>     /x82/x30/xf0/x39 <CJK>
-+<U3906>     /x82/x30/xf1/x30 <CJK>
-+<U3907>     /x82/x30/xf1/x31 <CJK>
-+<U3908>     /x82/x30/xf1/x32 <CJK>
-+<U3909>     /x82/x30/xf1/x33 <CJK>
-+<U390A>     /x82/x30/xf1/x34 <CJK>
-+<U390B>     /x82/x30/xf1/x35 <CJK>
-+<U390C>     /x82/x30/xf1/x36 <CJK>
-+<U390D>     /x82/x30/xf1/x37 <CJK>
-+<U390E>     /x82/x30/xf1/x38 <CJK>
-+<U390F>     /x82/x30/xf1/x39 <CJK>
-+<U3910>     /x82/x30/xf2/x30 <CJK>
-+<U3911>     /x82/x30/xf2/x31 <CJK>
-+<U3912>     /x82/x30/xf2/x32 <CJK>
-+<U3913>     /x82/x30/xf2/x33 <CJK>
-+<U3914>     /x82/x30/xf2/x34 <CJK>
-+<U3915>     /x82/x30/xf2/x35 <CJK>
-+<U3916>     /x82/x30/xf2/x36 <CJK>
-+<U3917>     /x82/x30/xf2/x37 <CJK>
- <U3918>     /xfe/x60         <CJK>
- <U3919>     /x82/x30/xf2/x38 <CJK>
- <U391A>     /x82/x30/xf2/x39 <CJK>
-@@ -5417,6 +15590,891 @@ CHARMAP
- <U3CDE>     /x82/x31/xd4/x36 <CJK>
- <U3CDF>     /x82/x31/xd4/x37 <CJK>
- <U3CE0>     /xfe/x6a         <CJK>
-+<U3CE1>     /x82/x31/xd4/x38 <CJK>
-+<U3CE2>     /x82/x31/xd4/x39 <CJK>
-+<U3CE3>     /x82/x31/xd5/x30 <CJK>
-+<U3CE4>     /x82/x31/xd5/x31 <CJK>
-+<U3CE5>     /x82/x31/xd5/x32 <CJK>
-+<U3CE6>     /x82/x31/xd5/x33 <CJK>
-+<U3CE7>     /x82/x31/xd5/x34 <CJK>
-+<U3CE8>     /x82/x31/xd5/x35 <CJK>
-+<U3CE9>     /x82/x31/xd5/x36 <CJK>
-+<U3CEA>     /x82/x31/xd5/x37 <CJK>
-+<U3CEB>     /x82/x31/xd5/x38 <CJK>
-+<U3CEC>     /x82/x31/xd5/x39 <CJK>
-+<U3CED>     /x82/x31/xd6/x30 <CJK>
-+<U3CEE>     /x82/x31/xd6/x31 <CJK>
-+<U3CEF>     /x82/x31/xd6/x32 <CJK>
-+<U3CF0>     /x82/x31/xd6/x33 <CJK>
-+<U3CF1>     /x82/x31/xd6/x34 <CJK>
-+<U3CF2>     /x82/x31/xd6/x35 <CJK>
-+<U3CF3>     /x82/x31/xd6/x36 <CJK>
-+<U3CF4>     /x82/x31/xd6/x37 <CJK>
-+<U3CF5>     /x82/x31/xd6/x38 <CJK>
-+<U3CF6>     /x82/x31/xd6/x39 <CJK>
-+<U3CF7>     /x82/x31/xd7/x30 <CJK>
-+<U3CF8>     /x82/x31/xd7/x31 <CJK>
-+<U3CF9>     /x82/x31/xd7/x32 <CJK>
-+<U3CFA>     /x82/x31/xd7/x33 <CJK>
-+<U3CFB>     /x82/x31/xd7/x34 <CJK>
-+<U3CFC>     /x82/x31/xd7/x35 <CJK>
-+<U3CFD>     /x82/x31/xd7/x36 <CJK>
-+<U3CFE>     /x82/x31/xd7/x37 <CJK>
-+<U3CFF>     /x82/x31/xd7/x38 <CJK>
-+<U3D00>     /x82/x31/xd7/x39 <CJK>
-+<U3D01>     /x82/x31/xd8/x30 <CJK>
-+<U3D02>     /x82/x31/xd8/x31 <CJK>
-+<U3D03>     /x82/x31/xd8/x32 <CJK>
-+<U3D04>     /x82/x31/xd8/x33 <CJK>
-+<U3D05>     /x82/x31/xd8/x34 <CJK>
-+<U3D06>     /x82/x31/xd8/x35 <CJK>
-+<U3D07>     /x82/x31/xd8/x36 <CJK>
-+<U3D08>     /x82/x31/xd8/x37 <CJK>
-+<U3D09>     /x82/x31/xd8/x38 <CJK>
-+<U3D0A>     /x82/x31/xd8/x39 <CJK>
-+<U3D0B>     /x82/x31/xd9/x30 <CJK>
-+<U3D0C>     /x82/x31/xd9/x31 <CJK>
-+<U3D0D>     /x82/x31/xd9/x32 <CJK>
-+<U3D0E>     /x82/x31/xd9/x33 <CJK>
-+<U3D0F>     /x82/x31/xd9/x34 <CJK>
-+<U3D10>     /x82/x31/xd9/x35 <CJK>
-+<U3D11>     /x82/x31/xd9/x36 <CJK>
-+<U3D12>     /x82/x31/xd9/x37 <CJK>
-+<U3D13>     /x82/x31/xd9/x38 <CJK>
-+<U3D14>     /x82/x31/xd9/x39 <CJK>
-+<U3D15>     /x82/x31/xda/x30 <CJK>
-+<U3D16>     /x82/x31/xda/x31 <CJK>
-+<U3D17>     /x82/x31/xda/x32 <CJK>
-+<U3D18>     /x82/x31/xda/x33 <CJK>
-+<U3D19>     /x82/x31/xda/x34 <CJK>
-+<U3D1A>     /x82/x31/xda/x35 <CJK>
-+<U3D1B>     /x82/x31/xda/x36 <CJK>
-+<U3D1C>     /x82/x31/xda/x37 <CJK>
-+<U3D1D>     /x82/x31/xda/x38 <CJK>
-+<U3D1E>     /x82/x31/xda/x39 <CJK>
-+<U3D1F>     /x82/x31/xdb/x30 <CJK>
-+<U3D20>     /x82/x31/xdb/x31 <CJK>
-+<U3D21>     /x82/x31/xdb/x32 <CJK>
-+<U3D22>     /x82/x31/xdb/x33 <CJK>
-+<U3D23>     /x82/x31/xdb/x34 <CJK>
-+<U3D24>     /x82/x31/xdb/x35 <CJK>
-+<U3D25>     /x82/x31/xdb/x36 <CJK>
-+<U3D26>     /x82/x31/xdb/x37 <CJK>
-+<U3D27>     /x82/x31/xdb/x38 <CJK>
-+<U3D28>     /x82/x31/xdb/x39 <CJK>
-+<U3D29>     /x82/x31/xdc/x30 <CJK>
-+<U3D2A>     /x82/x31/xdc/x31 <CJK>
-+<U3D2B>     /x82/x31/xdc/x32 <CJK>
-+<U3D2C>     /x82/x31/xdc/x33 <CJK>
-+<U3D2D>     /x82/x31/xdc/x34 <CJK>
-+<U3D2E>     /x82/x31/xdc/x35 <CJK>
-+<U3D2F>     /x82/x31/xdc/x36 <CJK>
-+<U3D30>     /x82/x31/xdc/x37 <CJK>
-+<U3D31>     /x82/x31/xdc/x38 <CJK>
-+<U3D32>     /x82/x31/xdc/x39 <CJK>
-+<U3D33>     /x82/x31/xdd/x30 <CJK>
-+<U3D34>     /x82/x31/xdd/x31 <CJK>
-+<U3D35>     /x82/x31/xdd/x32 <CJK>
-+<U3D36>     /x82/x31/xdd/x33 <CJK>
-+<U3D37>     /x82/x31/xdd/x34 <CJK>
-+<U3D38>     /x82/x31/xdd/x35 <CJK>
-+<U3D39>     /x82/x31/xdd/x36 <CJK>
-+<U3D3A>     /x82/x31/xdd/x37 <CJK>
-+<U3D3B>     /x82/x31/xdd/x38 <CJK>
-+<U3D3C>     /x82/x31/xdd/x39 <CJK>
-+<U3D3D>     /x82/x31/xde/x30 <CJK>
-+<U3D3E>     /x82/x31/xde/x31 <CJK>
-+<U3D3F>     /x82/x31/xde/x32 <CJK>
-+<U3D40>     /x82/x31/xde/x33 <CJK>
-+<U3D41>     /x82/x31/xde/x34 <CJK>
-+<U3D42>     /x82/x31/xde/x35 <CJK>
-+<U3D43>     /x82/x31/xde/x36 <CJK>
-+<U3D44>     /x82/x31/xde/x37 <CJK>
-+<U3D45>     /x82/x31/xde/x38 <CJK>
-+<U3D46>     /x82/x31/xde/x39 <CJK>
-+<U3D47>     /x82/x31/xdf/x30 <CJK>
-+<U3D48>     /x82/x31/xdf/x31 <CJK>
-+<U3D49>     /x82/x31/xdf/x32 <CJK>
-+<U3D4A>     /x82/x31/xdf/x33 <CJK>
-+<U3D4B>     /x82/x31/xdf/x34 <CJK>
-+<U3D4C>     /x82/x31/xdf/x35 <CJK>
-+<U3D4D>     /x82/x31/xdf/x36 <CJK>
-+<U3D4E>     /x82/x31/xdf/x37 <CJK>
-+<U3D4F>     /x82/x31/xdf/x38 <CJK>
-+<U3D50>     /x82/x31/xdf/x39 <CJK>
-+<U3D51>     /x82/x31/xe0/x30 <CJK>
-+<U3D52>     /x82/x31/xe0/x31 <CJK>
-+<U3D53>     /x82/x31/xe0/x32 <CJK>
-+<U3D54>     /x82/x31/xe0/x33 <CJK>
-+<U3D55>     /x82/x31/xe0/x34 <CJK>
-+<U3D56>     /x82/x31/xe0/x35 <CJK>
-+<U3D57>     /x82/x31/xe0/x36 <CJK>
-+<U3D58>     /x82/x31/xe0/x37 <CJK>
-+<U3D59>     /x82/x31/xe0/x38 <CJK>
-+<U3D5A>     /x82/x31/xe0/x39 <CJK>
-+<U3D5B>     /x82/x31/xe1/x30 <CJK>
-+<U3D5C>     /x82/x31/xe1/x31 <CJK>
-+<U3D5D>     /x82/x31/xe1/x32 <CJK>
-+<U3D5E>     /x82/x31/xe1/x33 <CJK>
-+<U3D5F>     /x82/x31/xe1/x34 <CJK>
-+<U3D60>     /x82/x31/xe1/x35 <CJK>
-+<U3D61>     /x82/x31/xe1/x36 <CJK>
-+<U3D62>     /x82/x31/xe1/x37 <CJK>
-+<U3D63>     /x82/x31/xe1/x38 <CJK>
-+<U3D64>     /x82/x31/xe1/x39 <CJK>
-+<U3D65>     /x82/x31/xe2/x30 <CJK>
-+<U3D66>     /x82/x31/xe2/x31 <CJK>
-+<U3D67>     /x82/x31/xe2/x32 <CJK>
-+<U3D68>     /x82/x31/xe2/x33 <CJK>
-+<U3D69>     /x82/x31/xe2/x34 <CJK>
-+<U3D6A>     /x82/x31/xe2/x35 <CJK>
-+<U3D6B>     /x82/x31/xe2/x36 <CJK>
-+<U3D6C>     /x82/x31/xe2/x37 <CJK>
-+<U3D6D>     /x82/x31/xe2/x38 <CJK>
-+<U3D6E>     /x82/x31/xe2/x39 <CJK>
-+<U3D6F>     /x82/x31/xe3/x30 <CJK>
-+<U3D70>     /x82/x31/xe3/x31 <CJK>
-+<U3D71>     /x82/x31/xe3/x32 <CJK>
-+<U3D72>     /x82/x31/xe3/x33 <CJK>
-+<U3D73>     /x82/x31/xe3/x34 <CJK>
-+<U3D74>     /x82/x31/xe3/x35 <CJK>
-+<U3D75>     /x82/x31/xe3/x36 <CJK>
-+<U3D76>     /x82/x31/xe3/x37 <CJK>
-+<U3D77>     /x82/x31/xe3/x38 <CJK>
-+<U3D78>     /x82/x31/xe3/x39 <CJK>
-+<U3D79>     /x82/x31/xe4/x30 <CJK>
-+<U3D7A>     /x82/x31/xe4/x31 <CJK>
-+<U3D7B>     /x82/x31/xe4/x32 <CJK>
-+<U3D7C>     /x82/x31/xe4/x33 <CJK>
-+<U3D7D>     /x82/x31/xe4/x34 <CJK>
-+<U3D7E>     /x82/x31/xe4/x35 <CJK>
-+<U3D7F>     /x82/x31/xe4/x36 <CJK>
-+<U3D80>     /x82/x31/xe4/x37 <CJK>
-+<U3D81>     /x82/x31/xe4/x38 <CJK>
-+<U3D82>     /x82/x31/xe4/x39 <CJK>
-+<U3D83>     /x82/x31/xe5/x30 <CJK>
-+<U3D84>     /x82/x31/xe5/x31 <CJK>
-+<U3D85>     /x82/x31/xe5/x32 <CJK>
-+<U3D86>     /x82/x31/xe5/x33 <CJK>
-+<U3D87>     /x82/x31/xe5/x34 <CJK>
-+<U3D88>     /x82/x31/xe5/x35 <CJK>
-+<U3D89>     /x82/x31/xe5/x36 <CJK>
-+<U3D8A>     /x82/x31/xe5/x37 <CJK>
-+<U3D8B>     /x82/x31/xe5/x38 <CJK>
-+<U3D8C>     /x82/x31/xe5/x39 <CJK>
-+<U3D8D>     /x82/x31/xe6/x30 <CJK>
-+<U3D8E>     /x82/x31/xe6/x31 <CJK>
-+<U3D8F>     /x82/x31/xe6/x32 <CJK>
-+<U3D90>     /x82/x31/xe6/x33 <CJK>
-+<U3D91>     /x82/x31/xe6/x34 <CJK>
-+<U3D92>     /x82/x31/xe6/x35 <CJK>
-+<U3D93>     /x82/x31/xe6/x36 <CJK>
-+<U3D94>     /x82/x31/xe6/x37 <CJK>
-+<U3D95>     /x82/x31/xe6/x38 <CJK>
-+<U3D96>     /x82/x31/xe6/x39 <CJK>
-+<U3D97>     /x82/x31/xe7/x30 <CJK>
-+<U3D98>     /x82/x31/xe7/x31 <CJK>
-+<U3D99>     /x82/x31/xe7/x32 <CJK>
-+<U3D9A>     /x82/x31/xe7/x33 <CJK>
-+<U3D9B>     /x82/x31/xe7/x34 <CJK>
-+<U3D9C>     /x82/x31/xe7/x35 <CJK>
-+<U3D9D>     /x82/x31/xe7/x36 <CJK>
-+<U3D9E>     /x82/x31/xe7/x37 <CJK>
-+<U3D9F>     /x82/x31/xe7/x38 <CJK>
-+<U3DA0>     /x82/x31/xe7/x39 <CJK>
-+<U3DA1>     /x82/x31/xe8/x30 <CJK>
-+<U3DA2>     /x82/x31/xe8/x31 <CJK>
-+<U3DA3>     /x82/x31/xe8/x32 <CJK>
-+<U3DA4>     /x82/x31/xe8/x33 <CJK>
-+<U3DA5>     /x82/x31/xe8/x34 <CJK>
-+<U3DA6>     /x82/x31/xe8/x35 <CJK>
-+<U3DA7>     /x82/x31/xe8/x36 <CJK>
-+<U3DA8>     /x82/x31/xe8/x37 <CJK>
-+<U3DA9>     /x82/x31/xe8/x38 <CJK>
-+<U3DAA>     /x82/x31/xe8/x39 <CJK>
-+<U3DAB>     /x82/x31/xe9/x30 <CJK>
-+<U3DAC>     /x82/x31/xe9/x31 <CJK>
-+<U3DAD>     /x82/x31/xe9/x32 <CJK>
-+<U3DAE>     /x82/x31/xe9/x33 <CJK>
-+<U3DAF>     /x82/x31/xe9/x34 <CJK>
-+<U3DB0>     /x82/x31/xe9/x35 <CJK>
-+<U3DB1>     /x82/x31/xe9/x36 <CJK>
-+<U3DB2>     /x82/x31/xe9/x37 <CJK>
-+<U3DB3>     /x82/x31/xe9/x38 <CJK>
-+<U3DB4>     /x82/x31/xe9/x39 <CJK>
-+<U3DB5>     /x82/x31/xea/x30 <CJK>
-+<U3DB6>     /x82/x31/xea/x31 <CJK>
-+<U3DB7>     /x82/x31/xea/x32 <CJK>
-+<U3DB8>     /x82/x31/xea/x33 <CJK>
-+<U3DB9>     /x82/x31/xea/x34 <CJK>
-+<U3DBA>     /x82/x31/xea/x35 <CJK>
-+<U3DBB>     /x82/x31/xea/x36 <CJK>
-+<U3DBC>     /x82/x31/xea/x37 <CJK>
-+<U3DBD>     /x82/x31/xea/x38 <CJK>
-+<U3DBE>     /x82/x31/xea/x39 <CJK>
-+<U3DBF>     /x82/x31/xeb/x30 <CJK>
-+<U3DC0>     /x82/x31/xeb/x31 <CJK>
-+<U3DC1>     /x82/x31/xeb/x32 <CJK>
-+<U3DC2>     /x82/x31/xeb/x33 <CJK>
-+<U3DC3>     /x82/x31/xeb/x34 <CJK>
-+<U3DC4>     /x82/x31/xeb/x35 <CJK>
-+<U3DC5>     /x82/x31/xeb/x36 <CJK>
-+<U3DC6>     /x82/x31/xeb/x37 <CJK>
-+<U3DC7>     /x82/x31/xeb/x38 <CJK>
-+<U3DC8>     /x82/x31/xeb/x39 <CJK>
-+<U3DC9>     /x82/x31/xec/x30 <CJK>
-+<U3DCA>     /x82/x31/xec/x31 <CJK>
-+<U3DCB>     /x82/x31/xec/x32 <CJK>
-+<U3DCC>     /x82/x31/xec/x33 <CJK>
-+<U3DCD>     /x82/x31/xec/x34 <CJK>
-+<U3DCE>     /x82/x31/xec/x35 <CJK>
-+<U3DCF>     /x82/x31/xec/x36 <CJK>
-+<U3DD0>     /x82/x31/xec/x37 <CJK>
-+<U3DD1>     /x82/x31/xec/x38 <CJK>
-+<U3DD2>     /x82/x31/xec/x39 <CJK>
-+<U3DD3>     /x82/x31/xed/x30 <CJK>
-+<U3DD4>     /x82/x31/xed/x31 <CJK>
-+<U3DD5>     /x82/x31/xed/x32 <CJK>
-+<U3DD6>     /x82/x31/xed/x33 <CJK>
-+<U3DD7>     /x82/x31/xed/x34 <CJK>
-+<U3DD8>     /x82/x31/xed/x35 <CJK>
-+<U3DD9>     /x82/x31/xed/x36 <CJK>
-+<U3DDA>     /x82/x31/xed/x37 <CJK>
-+<U3DDB>     /x82/x31/xed/x38 <CJK>
-+<U3DDC>     /x82/x31/xed/x39 <CJK>
-+<U3DDD>     /x82/x31/xee/x30 <CJK>
-+<U3DDE>     /x82/x31/xee/x31 <CJK>
-+<U3DDF>     /x82/x31/xee/x32 <CJK>
-+<U3DE0>     /x82/x31/xee/x33 <CJK>
-+<U3DE1>     /x82/x31/xee/x34 <CJK>
-+<U3DE2>     /x82/x31/xee/x35 <CJK>
-+<U3DE3>     /x82/x31/xee/x36 <CJK>
-+<U3DE4>     /x82/x31/xee/x37 <CJK>
-+<U3DE5>     /x82/x31/xee/x38 <CJK>
-+<U3DE6>     /x82/x31/xee/x39 <CJK>
-+<U3DE7>     /x82/x31/xef/x30 <CJK>
-+<U3DE8>     /x82/x31/xef/x31 <CJK>
-+<U3DE9>     /x82/x31/xef/x32 <CJK>
-+<U3DEA>     /x82/x31/xef/x33 <CJK>
-+<U3DEB>     /x82/x31/xef/x34 <CJK>
-+<U3DEC>     /x82/x31/xef/x35 <CJK>
-+<U3DED>     /x82/x31/xef/x36 <CJK>
-+<U3DEE>     /x82/x31/xef/x37 <CJK>
-+<U3DEF>     /x82/x31/xef/x38 <CJK>
-+<U3DF0>     /x82/x31/xef/x39 <CJK>
-+<U3DF1>     /x82/x31/xf0/x30 <CJK>
-+<U3DF2>     /x82/x31/xf0/x31 <CJK>
-+<U3DF3>     /x82/x31/xf0/x32 <CJK>
-+<U3DF4>     /x82/x31/xf0/x33 <CJK>
-+<U3DF5>     /x82/x31/xf0/x34 <CJK>
-+<U3DF6>     /x82/x31/xf0/x35 <CJK>
-+<U3DF7>     /x82/x31/xf0/x36 <CJK>
-+<U3DF8>     /x82/x31/xf0/x37 <CJK>
-+<U3DF9>     /x82/x31/xf0/x38 <CJK>
-+<U3DFA>     /x82/x31/xf0/x39 <CJK>
-+<U3DFB>     /x82/x31/xf1/x30 <CJK>
-+<U3DFC>     /x82/x31/xf1/x31 <CJK>
-+<U3DFD>     /x82/x31/xf1/x32 <CJK>
-+<U3DFE>     /x82/x31/xf1/x33 <CJK>
-+<U3DFF>     /x82/x31/xf1/x34 <CJK>
-+<U3E00>     /x82/x31/xf1/x35 <CJK>
-+<U3E01>     /x82/x31/xf1/x36 <CJK>
-+<U3E02>     /x82/x31/xf1/x37 <CJK>
-+<U3E03>     /x82/x31/xf1/x38 <CJK>
-+<U3E04>     /x82/x31/xf1/x39 <CJK>
-+<U3E05>     /x82/x31/xf2/x30 <CJK>
-+<U3E06>     /x82/x31/xf2/x31 <CJK>
-+<U3E07>     /x82/x31/xf2/x32 <CJK>
-+<U3E08>     /x82/x31/xf2/x33 <CJK>
-+<U3E09>     /x82/x31/xf2/x34 <CJK>
-+<U3E0A>     /x82/x31/xf2/x35 <CJK>
-+<U3E0B>     /x82/x31/xf2/x36 <CJK>
-+<U3E0C>     /x82/x31/xf2/x37 <CJK>
-+<U3E0D>     /x82/x31/xf2/x38 <CJK>
-+<U3E0E>     /x82/x31/xf2/x39 <CJK>
-+<U3E0F>     /x82/x31/xf3/x30 <CJK>
-+<U3E10>     /x82/x31/xf3/x31 <CJK>
-+<U3E11>     /x82/x31/xf3/x32 <CJK>
-+<U3E12>     /x82/x31/xf3/x33 <CJK>
-+<U3E13>     /x82/x31/xf3/x34 <CJK>
-+<U3E14>     /x82/x31/xf3/x35 <CJK>
-+<U3E15>     /x82/x31/xf3/x36 <CJK>
-+<U3E16>     /x82/x31/xf3/x37 <CJK>
-+<U3E17>     /x82/x31/xf3/x38 <CJK>
-+<U3E18>     /x82/x31/xf3/x39 <CJK>
-+<U3E19>     /x82/x31/xf4/x30 <CJK>
-+<U3E1A>     /x82/x31/xf4/x31 <CJK>
-+<U3E1B>     /x82/x31/xf4/x32 <CJK>
-+<U3E1C>     /x82/x31/xf4/x33 <CJK>
-+<U3E1D>     /x82/x31/xf4/x34 <CJK>
-+<U3E1E>     /x82/x31/xf4/x35 <CJK>
-+<U3E1F>     /x82/x31/xf4/x36 <CJK>
-+<U3E20>     /x82/x31/xf4/x37 <CJK>
-+<U3E21>     /x82/x31/xf4/x38 <CJK>
-+<U3E22>     /x82/x31/xf4/x39 <CJK>
-+<U3E23>     /x82/x31/xf5/x30 <CJK>
-+<U3E24>     /x82/x31/xf5/x31 <CJK>
-+<U3E25>     /x82/x31/xf5/x32 <CJK>
-+<U3E26>     /x82/x31/xf5/x33 <CJK>
-+<U3E27>     /x82/x31/xf5/x34 <CJK>
-+<U3E28>     /x82/x31/xf5/x35 <CJK>
-+<U3E29>     /x82/x31/xf5/x36 <CJK>
-+<U3E2A>     /x82/x31/xf5/x37 <CJK>
-+<U3E2B>     /x82/x31/xf5/x38 <CJK>
-+<U3E2C>     /x82/x31/xf5/x39 <CJK>
-+<U3E2D>     /x82/x31/xf6/x30 <CJK>
-+<U3E2E>     /x82/x31/xf6/x31 <CJK>
-+<U3E2F>     /x82/x31/xf6/x32 <CJK>
-+<U3E30>     /x82/x31/xf6/x33 <CJK>
-+<U3E31>     /x82/x31/xf6/x34 <CJK>
-+<U3E32>     /x82/x31/xf6/x35 <CJK>
-+<U3E33>     /x82/x31/xf6/x36 <CJK>
-+<U3E34>     /x82/x31/xf6/x37 <CJK>
-+<U3E35>     /x82/x31/xf6/x38 <CJK>
-+<U3E36>     /x82/x31/xf6/x39 <CJK>
-+<U3E37>     /x82/x31/xf7/x30 <CJK>
-+<U3E38>     /x82/x31/xf7/x31 <CJK>
-+<U3E39>     /x82/x31/xf7/x32 <CJK>
-+<U3E3A>     /x82/x31/xf7/x33 <CJK>
-+<U3E3B>     /x82/x31/xf7/x34 <CJK>
-+<U3E3C>     /x82/x31/xf7/x35 <CJK>
-+<U3E3D>     /x82/x31/xf7/x36 <CJK>
-+<U3E3E>     /x82/x31/xf7/x37 <CJK>
-+<U3E3F>     /x82/x31/xf7/x38 <CJK>
-+<U3E40>     /x82/x31/xf7/x39 <CJK>
-+<U3E41>     /x82/x31/xf8/x30 <CJK>
-+<U3E42>     /x82/x31/xf8/x31 <CJK>
-+<U3E43>     /x82/x31/xf8/x32 <CJK>
-+<U3E44>     /x82/x31/xf8/x33 <CJK>
-+<U3E45>     /x82/x31/xf8/x34 <CJK>
-+<U3E46>     /x82/x31/xf8/x35 <CJK>
-+<U3E47>     /x82/x31/xf8/x36 <CJK>
-+<U3E48>     /x82/x31/xf8/x37 <CJK>
-+<U3E49>     /x82/x31/xf8/x38 <CJK>
-+<U3E4A>     /x82/x31/xf8/x39 <CJK>
-+<U3E4B>     /x82/x31/xf9/x30 <CJK>
-+<U3E4C>     /x82/x31/xf9/x31 <CJK>
-+<U3E4D>     /x82/x31/xf9/x32 <CJK>
-+<U3E4E>     /x82/x31/xf9/x33 <CJK>
-+<U3E4F>     /x82/x31/xf9/x34 <CJK>
-+<U3E50>     /x82/x31/xf9/x35 <CJK>
-+<U3E51>     /x82/x31/xf9/x36 <CJK>
-+<U3E52>     /x82/x31/xf9/x37 <CJK>
-+<U3E53>     /x82/x31/xf9/x38 <CJK>
-+<U3E54>     /x82/x31/xf9/x39 <CJK>
-+<U3E55>     /x82/x31/xfa/x30 <CJK>
-+<U3E56>     /x82/x31/xfa/x31 <CJK>
-+<U3E57>     /x82/x31/xfa/x32 <CJK>
-+<U3E58>     /x82/x31/xfa/x33 <CJK>
-+<U3E59>     /x82/x31/xfa/x34 <CJK>
-+<U3E5A>     /x82/x31/xfa/x35 <CJK>
-+<U3E5B>     /x82/x31/xfa/x36 <CJK>
-+<U3E5C>     /x82/x31/xfa/x37 <CJK>
-+<U3E5D>     /x82/x31/xfa/x38 <CJK>
-+<U3E5E>     /x82/x31/xfa/x39 <CJK>
-+<U3E5F>     /x82/x31/xfb/x30 <CJK>
-+<U3E60>     /x82/x31/xfb/x31 <CJK>
-+<U3E61>     /x82/x31/xfb/x32 <CJK>
-+<U3E62>     /x82/x31/xfb/x33 <CJK>
-+<U3E63>     /x82/x31/xfb/x34 <CJK>
-+<U3E64>     /x82/x31/xfb/x35 <CJK>
-+<U3E65>     /x82/x31/xfb/x36 <CJK>
-+<U3E66>     /x82/x31/xfb/x37 <CJK>
-+<U3E67>     /x82/x31/xfb/x38 <CJK>
-+<U3E68>     /x82/x31/xfb/x39 <CJK>
-+<U3E69>     /x82/x31/xfc/x30 <CJK>
-+<U3E6A>     /x82/x31/xfc/x31 <CJK>
-+<U3E6B>     /x82/x31/xfc/x32 <CJK>
-+<U3E6C>     /x82/x31/xfc/x33 <CJK>
-+<U3E6D>     /x82/x31/xfc/x34 <CJK>
-+<U3E6E>     /x82/x31/xfc/x35 <CJK>
-+<U3E6F>     /x82/x31/xfc/x36 <CJK>
-+<U3E70>     /x82/x31/xfc/x37 <CJK>
-+<U3E71>     /x82/x31/xfc/x38 <CJK>
-+<U3E72>     /x82/x31/xfc/x39 <CJK>
-+<U3E73>     /x82/x31/xfd/x30 <CJK>
-+<U3E74>     /x82/x31/xfd/x31 <CJK>
-+<U3E75>     /x82/x31/xfd/x32 <CJK>
-+<U3E76>     /x82/x31/xfd/x33 <CJK>
-+<U3E77>     /x82/x31/xfd/x34 <CJK>
-+<U3E78>     /x82/x31/xfd/x35 <CJK>
-+<U3E79>     /x82/x31/xfd/x36 <CJK>
-+<U3E7A>     /x82/x31/xfd/x37 <CJK>
-+<U3E7B>     /x82/x31/xfd/x38 <CJK>
-+<U3E7C>     /x82/x31/xfd/x39 <CJK>
-+<U3E7D>     /x82/x31/xfe/x30 <CJK>
-+<U3E7E>     /x82/x31/xfe/x31 <CJK>
-+<U3E7F>     /x82/x31/xfe/x32 <CJK>
-+<U3E80>     /x82/x31/xfe/x33 <CJK>
-+<U3E81>     /x82/x31/xfe/x34 <CJK>
-+<U3E82>     /x82/x31/xfe/x35 <CJK>
-+<U3E83>     /x82/x31/xfe/x36 <CJK>
-+<U3E84>     /x82/x31/xfe/x37 <CJK>
-+<U3E85>     /x82/x31/xfe/x38 <CJK>
-+<U3E86>     /x82/x31/xfe/x39 <CJK>
-+<U3E87>     /x82/x32/x81/x30 <CJK>
-+<U3E88>     /x82/x32/x81/x31 <CJK>
-+<U3E89>     /x82/x32/x81/x32 <CJK>
-+<U3E8A>     /x82/x32/x81/x33 <CJK>
-+<U3E8B>     /x82/x32/x81/x34 <CJK>
-+<U3E8C>     /x82/x32/x81/x35 <CJK>
-+<U3E8D>     /x82/x32/x81/x36 <CJK>
-+<U3E8E>     /x82/x32/x81/x37 <CJK>
-+<U3E8F>     /x82/x32/x81/x38 <CJK>
-+<U3E90>     /x82/x32/x81/x39 <CJK>
-+<U3E91>     /x82/x32/x82/x30 <CJK>
-+<U3E92>     /x82/x32/x82/x31 <CJK>
-+<U3E93>     /x82/x32/x82/x32 <CJK>
-+<U3E94>     /x82/x32/x82/x33 <CJK>
-+<U3E95>     /x82/x32/x82/x34 <CJK>
-+<U3E96>     /x82/x32/x82/x35 <CJK>
-+<U3E97>     /x82/x32/x82/x36 <CJK>
-+<U3E98>     /x82/x32/x82/x37 <CJK>
-+<U3E99>     /x82/x32/x82/x38 <CJK>
-+<U3E9A>     /x82/x32/x82/x39 <CJK>
-+<U3E9B>     /x82/x32/x83/x30 <CJK>
-+<U3E9C>     /x82/x32/x83/x31 <CJK>
-+<U3E9D>     /x82/x32/x83/x32 <CJK>
-+<U3E9E>     /x82/x32/x83/x33 <CJK>
-+<U3E9F>     /x82/x32/x83/x34 <CJK>
-+<U3EA0>     /x82/x32/x83/x35 <CJK>
-+<U3EA1>     /x82/x32/x83/x36 <CJK>
-+<U3EA2>     /x82/x32/x83/x37 <CJK>
-+<U3EA3>     /x82/x32/x83/x38 <CJK>
-+<U3EA4>     /x82/x32/x83/x39 <CJK>
-+<U3EA5>     /x82/x32/x84/x30 <CJK>
-+<U3EA6>     /x82/x32/x84/x31 <CJK>
-+<U3EA7>     /x82/x32/x84/x32 <CJK>
-+<U3EA8>     /x82/x32/x84/x33 <CJK>
-+<U3EA9>     /x82/x32/x84/x34 <CJK>
-+<U3EAA>     /x82/x32/x84/x35 <CJK>
-+<U3EAB>     /x82/x32/x84/x36 <CJK>
-+<U3EAC>     /x82/x32/x84/x37 <CJK>
-+<U3EAD>     /x82/x32/x84/x38 <CJK>
-+<U3EAE>     /x82/x32/x84/x39 <CJK>
-+<U3EAF>     /x82/x32/x85/x30 <CJK>
-+<U3EB0>     /x82/x32/x85/x31 <CJK>
-+<U3EB1>     /x82/x32/x85/x32 <CJK>
-+<U3EB2>     /x82/x32/x85/x33 <CJK>
-+<U3EB3>     /x82/x32/x85/x34 <CJK>
-+<U3EB4>     /x82/x32/x85/x35 <CJK>
-+<U3EB5>     /x82/x32/x85/x36 <CJK>
-+<U3EB6>     /x82/x32/x85/x37 <CJK>
-+<U3EB7>     /x82/x32/x85/x38 <CJK>
-+<U3EB8>     /x82/x32/x85/x39 <CJK>
-+<U3EB9>     /x82/x32/x86/x30 <CJK>
-+<U3EBA>     /x82/x32/x86/x31 <CJK>
-+<U3EBB>     /x82/x32/x86/x32 <CJK>
-+<U3EBC>     /x82/x32/x86/x33 <CJK>
-+<U3EBD>     /x82/x32/x86/x34 <CJK>
-+<U3EBE>     /x82/x32/x86/x35 <CJK>
-+<U3EBF>     /x82/x32/x86/x36 <CJK>
-+<U3EC0>     /x82/x32/x86/x37 <CJK>
-+<U3EC1>     /x82/x32/x86/x38 <CJK>
-+<U3EC2>     /x82/x32/x86/x39 <CJK>
-+<U3EC3>     /x82/x32/x87/x30 <CJK>
-+<U3EC4>     /x82/x32/x87/x31 <CJK>
-+<U3EC5>     /x82/x32/x87/x32 <CJK>
-+<U3EC6>     /x82/x32/x87/x33 <CJK>
-+<U3EC7>     /x82/x32/x87/x34 <CJK>
-+<U3EC8>     /x82/x32/x87/x35 <CJK>
-+<U3EC9>     /x82/x32/x87/x36 <CJK>
-+<U3ECA>     /x82/x32/x87/x37 <CJK>
-+<U3ECB>     /x82/x32/x87/x38 <CJK>
-+<U3ECC>     /x82/x32/x87/x39 <CJK>
-+<U3ECD>     /x82/x32/x88/x30 <CJK>
-+<U3ECE>     /x82/x32/x88/x31 <CJK>
-+<U3ECF>     /x82/x32/x88/x32 <CJK>
-+<U3ED0>     /x82/x32/x88/x33 <CJK>
-+<U3ED1>     /x82/x32/x88/x34 <CJK>
-+<U3ED2>     /x82/x32/x88/x35 <CJK>
-+<U3ED3>     /x82/x32/x88/x36 <CJK>
-+<U3ED4>     /x82/x32/x88/x37 <CJK>
-+<U3ED5>     /x82/x32/x88/x38 <CJK>
-+<U3ED6>     /x82/x32/x88/x39 <CJK>
-+<U3ED7>     /x82/x32/x89/x30 <CJK>
-+<U3ED8>     /x82/x32/x89/x31 <CJK>
-+<U3ED9>     /x82/x32/x89/x32 <CJK>
-+<U3EDA>     /x82/x32/x89/x33 <CJK>
-+<U3EDB>     /x82/x32/x89/x34 <CJK>
-+<U3EDC>     /x82/x32/x89/x35 <CJK>
-+<U3EDD>     /x82/x32/x89/x36 <CJK>
-+<U3EDE>     /x82/x32/x89/x37 <CJK>
-+<U3EDF>     /x82/x32/x89/x38 <CJK>
-+<U3EE0>     /x82/x32/x89/x39 <CJK>
-+<U3EE1>     /x82/x32/x8a/x30 <CJK>
-+<U3EE2>     /x82/x32/x8a/x31 <CJK>
-+<U3EE3>     /x82/x32/x8a/x32 <CJK>
-+<U3EE4>     /x82/x32/x8a/x33 <CJK>
-+<U3EE5>     /x82/x32/x8a/x34 <CJK>
-+<U3EE6>     /x82/x32/x8a/x35 <CJK>
-+<U3EE7>     /x82/x32/x8a/x36 <CJK>
-+<U3EE8>     /x82/x32/x8a/x37 <CJK>
-+<U3EE9>     /x82/x32/x8a/x38 <CJK>
-+<U3EEA>     /x82/x32/x8a/x39 <CJK>
-+<U3EEB>     /x82/x32/x8b/x30 <CJK>
-+<U3EEC>     /x82/x32/x8b/x31 <CJK>
-+<U3EED>     /x82/x32/x8b/x32 <CJK>
-+<U3EEE>     /x82/x32/x8b/x33 <CJK>
-+<U3EEF>     /x82/x32/x8b/x34 <CJK>
-+<U3EF0>     /x82/x32/x8b/x35 <CJK>
-+<U3EF1>     /x82/x32/x8b/x36 <CJK>
-+<U3EF2>     /x82/x32/x8b/x37 <CJK>
-+<U3EF3>     /x82/x32/x8b/x38 <CJK>
-+<U3EF4>     /x82/x32/x8b/x39 <CJK>
-+<U3EF5>     /x82/x32/x8c/x30 <CJK>
-+<U3EF6>     /x82/x32/x8c/x31 <CJK>
-+<U3EF7>     /x82/x32/x8c/x32 <CJK>
-+<U3EF8>     /x82/x32/x8c/x33 <CJK>
-+<U3EF9>     /x82/x32/x8c/x34 <CJK>
-+<U3EFA>     /x82/x32/x8c/x35 <CJK>
-+<U3EFB>     /x82/x32/x8c/x36 <CJK>
-+<U3EFC>     /x82/x32/x8c/x37 <CJK>
-+<U3EFD>     /x82/x32/x8c/x38 <CJK>
-+<U3EFE>     /x82/x32/x8c/x39 <CJK>
-+<U3EFF>     /x82/x32/x8d/x30 <CJK>
-+<U3F00>     /x82/x32/x8d/x31 <CJK>
-+<U3F01>     /x82/x32/x8d/x32 <CJK>
-+<U3F02>     /x82/x32/x8d/x33 <CJK>
-+<U3F03>     /x82/x32/x8d/x34 <CJK>
-+<U3F04>     /x82/x32/x8d/x35 <CJK>
-+<U3F05>     /x82/x32/x8d/x36 <CJK>
-+<U3F06>     /x82/x32/x8d/x37 <CJK>
-+<U3F07>     /x82/x32/x8d/x38 <CJK>
-+<U3F08>     /x82/x32/x8d/x39 <CJK>
-+<U3F09>     /x82/x32/x8e/x30 <CJK>
-+<U3F0A>     /x82/x32/x8e/x31 <CJK>
-+<U3F0B>     /x82/x32/x8e/x32 <CJK>
-+<U3F0C>     /x82/x32/x8e/x33 <CJK>
-+<U3F0D>     /x82/x32/x8e/x34 <CJK>
-+<U3F0E>     /x82/x32/x8e/x35 <CJK>
-+<U3F0F>     /x82/x32/x8e/x36 <CJK>
-+<U3F10>     /x82/x32/x8e/x37 <CJK>
-+<U3F11>     /x82/x32/x8e/x38 <CJK>
-+<U3F12>     /x82/x32/x8e/x39 <CJK>
-+<U3F13>     /x82/x32/x8f/x30 <CJK>
-+<U3F14>     /x82/x32/x8f/x31 <CJK>
-+<U3F15>     /x82/x32/x8f/x32 <CJK>
-+<U3F16>     /x82/x32/x8f/x33 <CJK>
-+<U3F17>     /x82/x32/x8f/x34 <CJK>
-+<U3F18>     /x82/x32/x8f/x35 <CJK>
-+<U3F19>     /x82/x32/x8f/x36 <CJK>
-+<U3F1A>     /x82/x32/x8f/x37 <CJK>
-+<U3F1B>     /x82/x32/x8f/x38 <CJK>
-+<U3F1C>     /x82/x32/x8f/x39 <CJK>
-+<U3F1D>     /x82/x32/x90/x30 <CJK>
-+<U3F1E>     /x82/x32/x90/x31 <CJK>
-+<U3F1F>     /x82/x32/x90/x32 <CJK>
-+<U3F20>     /x82/x32/x90/x33 <CJK>
-+<U3F21>     /x82/x32/x90/x34 <CJK>
-+<U3F22>     /x82/x32/x90/x35 <CJK>
-+<U3F23>     /x82/x32/x90/x36 <CJK>
-+<U3F24>     /x82/x32/x90/x37 <CJK>
-+<U3F25>     /x82/x32/x90/x38 <CJK>
-+<U3F26>     /x82/x32/x90/x39 <CJK>
-+<U3F27>     /x82/x32/x91/x30 <CJK>
-+<U3F28>     /x82/x32/x91/x31 <CJK>
-+<U3F29>     /x82/x32/x91/x32 <CJK>
-+<U3F2A>     /x82/x32/x91/x33 <CJK>
-+<U3F2B>     /x82/x32/x91/x34 <CJK>
-+<U3F2C>     /x82/x32/x91/x35 <CJK>
-+<U3F2D>     /x82/x32/x91/x36 <CJK>
-+<U3F2E>     /x82/x32/x91/x37 <CJK>
-+<U3F2F>     /x82/x32/x91/x38 <CJK>
-+<U3F30>     /x82/x32/x91/x39 <CJK>
-+<U3F31>     /x82/x32/x92/x30 <CJK>
-+<U3F32>     /x82/x32/x92/x31 <CJK>
-+<U3F33>     /x82/x32/x92/x32 <CJK>
-+<U3F34>     /x82/x32/x92/x33 <CJK>
-+<U3F35>     /x82/x32/x92/x34 <CJK>
-+<U3F36>     /x82/x32/x92/x35 <CJK>
-+<U3F37>     /x82/x32/x92/x36 <CJK>
-+<U3F38>     /x82/x32/x92/x37 <CJK>
-+<U3F39>     /x82/x32/x92/x38 <CJK>
-+<U3F3A>     /x82/x32/x92/x39 <CJK>
-+<U3F3B>     /x82/x32/x93/x30 <CJK>
-+<U3F3C>     /x82/x32/x93/x31 <CJK>
-+<U3F3D>     /x82/x32/x93/x32 <CJK>
-+<U3F3E>     /x82/x32/x93/x33 <CJK>
-+<U3F3F>     /x82/x32/x93/x34 <CJK>
-+<U3F40>     /x82/x32/x93/x35 <CJK>
-+<U3F41>     /x82/x32/x93/x36 <CJK>
-+<U3F42>     /x82/x32/x93/x37 <CJK>
-+<U3F43>     /x82/x32/x93/x38 <CJK>
-+<U3F44>     /x82/x32/x93/x39 <CJK>
-+<U3F45>     /x82/x32/x94/x30 <CJK>
-+<U3F46>     /x82/x32/x94/x31 <CJK>
-+<U3F47>     /x82/x32/x94/x32 <CJK>
-+<U3F48>     /x82/x32/x94/x33 <CJK>
-+<U3F49>     /x82/x32/x94/x34 <CJK>
-+<U3F4A>     /x82/x32/x94/x35 <CJK>
-+<U3F4B>     /x82/x32/x94/x36 <CJK>
-+<U3F4C>     /x82/x32/x94/x37 <CJK>
-+<U3F4D>     /x82/x32/x94/x38 <CJK>
-+<U3F4E>     /x82/x32/x94/x39 <CJK>
-+<U3F4F>     /x82/x32/x95/x30 <CJK>
-+<U3F50>     /x82/x32/x95/x31 <CJK>
-+<U3F51>     /x82/x32/x95/x32 <CJK>
-+<U3F52>     /x82/x32/x95/x33 <CJK>
-+<U3F53>     /x82/x32/x95/x34 <CJK>
-+<U3F54>     /x82/x32/x95/x35 <CJK>
-+<U3F55>     /x82/x32/x95/x36 <CJK>
-+<U3F56>     /x82/x32/x95/x37 <CJK>
-+<U3F57>     /x82/x32/x95/x38 <CJK>
-+<U3F58>     /x82/x32/x95/x39 <CJK>
-+<U3F59>     /x82/x32/x96/x30 <CJK>
-+<U3F5A>     /x82/x32/x96/x31 <CJK>
-+<U3F5B>     /x82/x32/x96/x32 <CJK>
-+<U3F5C>     /x82/x32/x96/x33 <CJK>
-+<U3F5D>     /x82/x32/x96/x34 <CJK>
-+<U3F5E>     /x82/x32/x96/x35 <CJK>
-+<U3F5F>     /x82/x32/x96/x36 <CJK>
-+<U3F60>     /x82/x32/x96/x37 <CJK>
-+<U3F61>     /x82/x32/x96/x38 <CJK>
-+<U3F62>     /x82/x32/x96/x39 <CJK>
-+<U3F63>     /x82/x32/x97/x30 <CJK>
-+<U3F64>     /x82/x32/x97/x31 <CJK>
-+<U3F65>     /x82/x32/x97/x32 <CJK>
-+<U3F66>     /x82/x32/x97/x33 <CJK>
-+<U3F67>     /x82/x32/x97/x34 <CJK>
-+<U3F68>     /x82/x32/x97/x35 <CJK>
-+<U3F69>     /x82/x32/x97/x36 <CJK>
-+<U3F6A>     /x82/x32/x97/x37 <CJK>
-+<U3F6B>     /x82/x32/x97/x38 <CJK>
-+<U3F6C>     /x82/x32/x97/x39 <CJK>
-+<U3F6D>     /x82/x32/x98/x30 <CJK>
-+<U3F6E>     /x82/x32/x98/x31 <CJK>
-+<U3F6F>     /x82/x32/x98/x32 <CJK>
-+<U3F70>     /x82/x32/x98/x33 <CJK>
-+<U3F71>     /x82/x32/x98/x34 <CJK>
-+<U3F72>     /x82/x32/x98/x35 <CJK>
-+<U3F73>     /x82/x32/x98/x36 <CJK>
-+<U3F74>     /x82/x32/x98/x37 <CJK>
-+<U3F75>     /x82/x32/x98/x38 <CJK>
-+<U3F76>     /x82/x32/x98/x39 <CJK>
-+<U3F77>     /x82/x32/x99/x30 <CJK>
-+<U3F78>     /x82/x32/x99/x31 <CJK>
-+<U3F79>     /x82/x32/x99/x32 <CJK>
-+<U3F7A>     /x82/x32/x99/x33 <CJK>
-+<U3F7B>     /x82/x32/x99/x34 <CJK>
-+<U3F7C>     /x82/x32/x99/x35 <CJK>
-+<U3F7D>     /x82/x32/x99/x36 <CJK>
-+<U3F7E>     /x82/x32/x99/x37 <CJK>
-+<U3F7F>     /x82/x32/x99/x38 <CJK>
-+<U3F80>     /x82/x32/x99/x39 <CJK>
-+<U3F81>     /x82/x32/x9a/x30 <CJK>
-+<U3F82>     /x82/x32/x9a/x31 <CJK>
-+<U3F83>     /x82/x32/x9a/x32 <CJK>
-+<U3F84>     /x82/x32/x9a/x33 <CJK>
-+<U3F85>     /x82/x32/x9a/x34 <CJK>
-+<U3F86>     /x82/x32/x9a/x35 <CJK>
-+<U3F87>     /x82/x32/x9a/x36 <CJK>
-+<U3F88>     /x82/x32/x9a/x37 <CJK>
-+<U3F89>     /x82/x32/x9a/x38 <CJK>
-+<U3F8A>     /x82/x32/x9a/x39 <CJK>
-+<U3F8B>     /x82/x32/x9b/x30 <CJK>
-+<U3F8C>     /x82/x32/x9b/x31 <CJK>
-+<U3F8D>     /x82/x32/x9b/x32 <CJK>
-+<U3F8E>     /x82/x32/x9b/x33 <CJK>
-+<U3F8F>     /x82/x32/x9b/x34 <CJK>
-+<U3F90>     /x82/x32/x9b/x35 <CJK>
-+<U3F91>     /x82/x32/x9b/x36 <CJK>
-+<U3F92>     /x82/x32/x9b/x37 <CJK>
-+<U3F93>     /x82/x32/x9b/x38 <CJK>
-+<U3F94>     /x82/x32/x9b/x39 <CJK>
-+<U3F95>     /x82/x32/x9c/x30 <CJK>
-+<U3F96>     /x82/x32/x9c/x31 <CJK>
-+<U3F97>     /x82/x32/x9c/x32 <CJK>
-+<U3F98>     /x82/x32/x9c/x33 <CJK>
-+<U3F99>     /x82/x32/x9c/x34 <CJK>
-+<U3F9A>     /x82/x32/x9c/x35 <CJK>
-+<U3F9B>     /x82/x32/x9c/x36 <CJK>
-+<U3F9C>     /x82/x32/x9c/x37 <CJK>
-+<U3F9D>     /x82/x32/x9c/x38 <CJK>
-+<U3F9E>     /x82/x32/x9c/x39 <CJK>
-+<U3F9F>     /x82/x32/x9d/x30 <CJK>
-+<U3FA0>     /x82/x32/x9d/x31 <CJK>
-+<U3FA1>     /x82/x32/x9d/x32 <CJK>
-+<U3FA2>     /x82/x32/x9d/x33 <CJK>
-+<U3FA3>     /x82/x32/x9d/x34 <CJK>
-+<U3FA4>     /x82/x32/x9d/x35 <CJK>
-+<U3FA5>     /x82/x32/x9d/x36 <CJK>
-+<U3FA6>     /x82/x32/x9d/x37 <CJK>
-+<U3FA7>     /x82/x32/x9d/x38 <CJK>
-+<U3FA8>     /x82/x32/x9d/x39 <CJK>
-+<U3FA9>     /x82/x32/x9e/x30 <CJK>
-+<U3FAA>     /x82/x32/x9e/x31 <CJK>
-+<U3FAB>     /x82/x32/x9e/x32 <CJK>
-+<U3FAC>     /x82/x32/x9e/x33 <CJK>
-+<U3FAD>     /x82/x32/x9e/x34 <CJK>
-+<U3FAE>     /x82/x32/x9e/x35 <CJK>
-+<U3FAF>     /x82/x32/x9e/x36 <CJK>
-+<U3FB0>     /x82/x32/x9e/x37 <CJK>
-+<U3FB1>     /x82/x32/x9e/x38 <CJK>
-+<U3FB2>     /x82/x32/x9e/x39 <CJK>
-+<U3FB3>     /x82/x32/x9f/x30 <CJK>
-+<U3FB4>     /x82/x32/x9f/x31 <CJK>
-+<U3FB5>     /x82/x32/x9f/x32 <CJK>
-+<U3FB6>     /x82/x32/x9f/x33 <CJK>
-+<U3FB7>     /x82/x32/x9f/x34 <CJK>
-+<U3FB8>     /x82/x32/x9f/x35 <CJK>
-+<U3FB9>     /x82/x32/x9f/x36 <CJK>
-+<U3FBA>     /x82/x32/x9f/x37 <CJK>
-+<U3FBB>     /x82/x32/x9f/x38 <CJK>
-+<U3FBC>     /x82/x32/x9f/x39 <CJK>
-+<U3FBD>     /x82/x32/xa0/x30 <CJK>
-+<U3FBE>     /x82/x32/xa0/x31 <CJK>
-+<U3FBF>     /x82/x32/xa0/x32 <CJK>
-+<U3FC0>     /x82/x32/xa0/x33 <CJK>
-+<U3FC1>     /x82/x32/xa0/x34 <CJK>
-+<U3FC2>     /x82/x32/xa0/x35 <CJK>
-+<U3FC3>     /x82/x32/xa0/x36 <CJK>
-+<U3FC4>     /x82/x32/xa0/x37 <CJK>
-+<U3FC5>     /x82/x32/xa0/x38 <CJK>
-+<U3FC6>     /x82/x32/xa0/x39 <CJK>
-+<U3FC7>     /x82/x32/xa1/x30 <CJK>
-+<U3FC8>     /x82/x32/xa1/x31 <CJK>
-+<U3FC9>     /x82/x32/xa1/x32 <CJK>
-+<U3FCA>     /x82/x32/xa1/x33 <CJK>
-+<U3FCB>     /x82/x32/xa1/x34 <CJK>
-+<U3FCC>     /x82/x32/xa1/x35 <CJK>
-+<U3FCD>     /x82/x32/xa1/x36 <CJK>
-+<U3FCE>     /x82/x32/xa1/x37 <CJK>
-+<U3FCF>     /x82/x32/xa1/x38 <CJK>
-+<U3FD0>     /x82/x32/xa1/x39 <CJK>
-+<U3FD1>     /x82/x32/xa2/x30 <CJK>
-+<U3FD2>     /x82/x32/xa2/x31 <CJK>
-+<U3FD3>     /x82/x32/xa2/x32 <CJK>
-+<U3FD4>     /x82/x32/xa2/x33 <CJK>
-+<U3FD5>     /x82/x32/xa2/x34 <CJK>
-+<U3FD6>     /x82/x32/xa2/x35 <CJK>
-+<U3FD7>     /x82/x32/xa2/x36 <CJK>
-+<U3FD8>     /x82/x32/xa2/x37 <CJK>
-+<U3FD9>     /x82/x32/xa2/x38 <CJK>
-+<U3FDA>     /x82/x32/xa2/x39 <CJK>
-+<U3FDB>     /x82/x32/xa3/x30 <CJK>
-+<U3FDC>     /x82/x32/xa3/x31 <CJK>
-+<U3FDD>     /x82/x32/xa3/x32 <CJK>
-+<U3FDE>     /x82/x32/xa3/x33 <CJK>
-+<U3FDF>     /x82/x32/xa3/x34 <CJK>
-+<U3FE0>     /x82/x32/xa3/x35 <CJK>
-+<U3FE1>     /x82/x32/xa3/x36 <CJK>
-+<U3FE2>     /x82/x32/xa3/x37 <CJK>
-+<U3FE3>     /x82/x32/xa3/x38 <CJK>
-+<U3FE4>     /x82/x32/xa3/x39 <CJK>
-+<U3FE5>     /x82/x32/xa4/x30 <CJK>
-+<U3FE6>     /x82/x32/xa4/x31 <CJK>
-+<U3FE7>     /x82/x32/xa4/x32 <CJK>
-+<U3FE8>     /x82/x32/xa4/x33 <CJK>
-+<U3FE9>     /x82/x32/xa4/x34 <CJK>
-+<U3FEA>     /x82/x32/xa4/x35 <CJK>
-+<U3FEB>     /x82/x32/xa4/x36 <CJK>
-+<U3FEC>     /x82/x32/xa4/x37 <CJK>
-+<U3FED>     /x82/x32/xa4/x38 <CJK>
-+<U3FEE>     /x82/x32/xa4/x39 <CJK>
-+<U3FEF>     /x82/x32/xa5/x30 <CJK>
-+<U3FF0>     /x82/x32/xa5/x31 <CJK>
-+<U3FF1>     /x82/x32/xa5/x32 <CJK>
-+<U3FF2>     /x82/x32/xa5/x33 <CJK>
-+<U3FF3>     /x82/x32/xa5/x34 <CJK>
-+<U3FF4>     /x82/x32/xa5/x35 <CJK>
-+<U3FF5>     /x82/x32/xa5/x36 <CJK>
-+<U3FF6>     /x82/x32/xa5/x37 <CJK>
-+<U3FF7>     /x82/x32/xa5/x38 <CJK>
-+<U3FF8>     /x82/x32/xa5/x39 <CJK>
-+<U3FF9>     /x82/x32/xa6/x30 <CJK>
-+<U3FFA>     /x82/x32/xa6/x31 <CJK>
-+<U3FFB>     /x82/x32/xa6/x32 <CJK>
-+<U3FFC>     /x82/x32/xa6/x33 <CJK>
-+<U3FFD>     /x82/x32/xa6/x34 <CJK>
-+<U3FFE>     /x82/x32/xa6/x35 <CJK>
-+<U3FFF>     /x82/x32/xa6/x36 <CJK>
-+<U4000>     /x82/x32/xa6/x37 <CJK>
-+<U4001>     /x82/x32/xa6/x38 <CJK>
-+<U4002>     /x82/x32/xa6/x39 <CJK>
-+<U4003>     /x82/x32/xa7/x30 <CJK>
-+<U4004>     /x82/x32/xa7/x31 <CJK>
-+<U4005>     /x82/x32/xa7/x32 <CJK>
-+<U4006>     /x82/x32/xa7/x33 <CJK>
-+<U4007>     /x82/x32/xa7/x34 <CJK>
-+<U4008>     /x82/x32/xa7/x35 <CJK>
-+<U4009>     /x82/x32/xa7/x36 <CJK>
-+<U400A>     /x82/x32/xa7/x37 <CJK>
-+<U400B>     /x82/x32/xa7/x38 <CJK>
-+<U400C>     /x82/x32/xa7/x39 <CJK>
-+<U400D>     /x82/x32/xa8/x30 <CJK>
-+<U400E>     /x82/x32/xa8/x31 <CJK>
-+<U400F>     /x82/x32/xa8/x32 <CJK>
-+<U4010>     /x82/x32/xa8/x33 <CJK>
-+<U4011>     /x82/x32/xa8/x34 <CJK>
-+<U4012>     /x82/x32/xa8/x35 <CJK>
-+<U4013>     /x82/x32/xa8/x36 <CJK>
-+<U4014>     /x82/x32/xa8/x37 <CJK>
-+<U4015>     /x82/x32/xa8/x38 <CJK>
-+<U4016>     /x82/x32/xa8/x39 <CJK>
-+<U4017>     /x82/x32/xa9/x30 <CJK>
-+<U4018>     /x82/x32/xa9/x31 <CJK>
-+<U4019>     /x82/x32/xa9/x32 <CJK>
-+<U401A>     /x82/x32/xa9/x33 <CJK>
-+<U401B>     /x82/x32/xa9/x34 <CJK>
-+<U401C>     /x82/x32/xa9/x35 <CJK>
-+<U401D>     /x82/x32/xa9/x36 <CJK>
-+<U401E>     /x82/x32/xa9/x37 <CJK>
-+<U401F>     /x82/x32/xa9/x38 <CJK>
-+<U4020>     /x82/x32/xa9/x39 <CJK>
-+<U4021>     /x82/x32/xaa/x30 <CJK>
-+<U4022>     /x82/x32/xaa/x31 <CJK>
-+<U4023>     /x82/x32/xaa/x32 <CJK>
-+<U4024>     /x82/x32/xaa/x33 <CJK>
-+<U4025>     /x82/x32/xaa/x34 <CJK>
-+<U4026>     /x82/x32/xaa/x35 <CJK>
-+<U4027>     /x82/x32/xaa/x36 <CJK>
-+<U4028>     /x82/x32/xaa/x37 <CJK>
-+<U4029>     /x82/x32/xaa/x38 <CJK>
-+<U402A>     /x82/x32/xaa/x39 <CJK>
-+<U402B>     /x82/x32/xab/x30 <CJK>
-+<U402C>     /x82/x32/xab/x31 <CJK>
-+<U402D>     /x82/x32/xab/x32 <CJK>
-+<U402E>     /x82/x32/xab/x33 <CJK>
-+<U402F>     /x82/x32/xab/x34 <CJK>
-+<U4030>     /x82/x32/xab/x35 <CJK>
-+<U4031>     /x82/x32/xab/x36 <CJK>
-+<U4032>     /x82/x32/xab/x37 <CJK>
-+<U4033>     /x82/x32/xab/x38 <CJK>
-+<U4034>     /x82/x32/xab/x39 <CJK>
-+<U4035>     /x82/x32/xac/x30 <CJK>
-+<U4036>     /x82/x32/xac/x31 <CJK>
-+<U4037>     /x82/x32/xac/x32 <CJK>
-+<U4038>     /x82/x32/xac/x33 <CJK>
-+<U4039>     /x82/x32/xac/x34 <CJK>
-+<U403A>     /x82/x32/xac/x35 <CJK>
-+<U403B>     /x82/x32/xac/x36 <CJK>
-+<U403C>     /x82/x32/xac/x37 <CJK>
-+<U403D>     /x82/x32/xac/x38 <CJK>
-+<U403E>     /x82/x32/xac/x39 <CJK>
-+<U403F>     /x82/x32/xad/x30 <CJK>
-+<U4040>     /x82/x32/xad/x31 <CJK>
-+<U4041>     /x82/x32/xad/x32 <CJK>
-+<U4042>     /x82/x32/xad/x33 <CJK>
-+<U4043>     /x82/x32/xad/x34 <CJK>
-+<U4044>     /x82/x32/xad/x35 <CJK>
-+<U4045>     /x82/x32/xad/x36 <CJK>
-+<U4046>     /x82/x32/xad/x37 <CJK>
-+<U4047>     /x82/x32/xad/x38 <CJK>
-+<U4048>     /x82/x32/xad/x39 <CJK>
-+<U4049>     /x82/x32/xae/x30 <CJK>
-+<U404A>     /x82/x32/xae/x31 <CJK>
-+<U404B>     /x82/x32/xae/x32 <CJK>
-+<U404C>     /x82/x32/xae/x33 <CJK>
-+<U404D>     /x82/x32/xae/x34 <CJK>
-+<U404E>     /x82/x32/xae/x35 <CJK>
-+<U404F>     /x82/x32/xae/x36 <CJK>
-+<U4050>     /x82/x32/xae/x37 <CJK>
-+<U4051>     /x82/x32/xae/x38 <CJK>
-+<U4052>     /x82/x32/xae/x39 <CJK>
-+<U4053>     /x82/x32/xaf/x30 <CJK>
-+<U4054>     /x82/x32/xaf/x31 <CJK>
-+<U4055>     /x82/x32/xaf/x32 <CJK>
- <U4056>     /xfe/x6f         <CJK>
- <U4057>     /x82/x32/xaf/x33 <CJK>
- <U4058>     /x82/x32/xaf/x34 <CJK>
-@@ -5683,6 +16741,477 @@ CHARMAP
- <U415D>     /x82/x32/xc9/x35 <CJK>
- <U415E>     /x82/x32/xc9/x36 <CJK>
- <U415F>     /xfe/x70         <CJK>
-+<U4160>     /x82/x32/xc9/x37 <CJK>
-+<U4161>     /x82/x32/xc9/x38 <CJK>
-+<U4162>     /x82/x32/xc9/x39 <CJK>
-+<U4163>     /x82/x32/xca/x30 <CJK>
-+<U4164>     /x82/x32/xca/x31 <CJK>
-+<U4165>     /x82/x32/xca/x32 <CJK>
-+<U4166>     /x82/x32/xca/x33 <CJK>
-+<U4167>     /x82/x32/xca/x34 <CJK>
-+<U4168>     /x82/x32/xca/x35 <CJK>
-+<U4169>     /x82/x32/xca/x36 <CJK>
-+<U416A>     /x82/x32/xca/x37 <CJK>
-+<U416B>     /x82/x32/xca/x38 <CJK>
-+<U416C>     /x82/x32/xca/x39 <CJK>
-+<U416D>     /x82/x32/xcb/x30 <CJK>
-+<U416E>     /x82/x32/xcb/x31 <CJK>
-+<U416F>     /x82/x32/xcb/x32 <CJK>
-+<U4170>     /x82/x32/xcb/x33 <CJK>
-+<U4171>     /x82/x32/xcb/x34 <CJK>
-+<U4172>     /x82/x32/xcb/x35 <CJK>
-+<U4173>     /x82/x32/xcb/x36 <CJK>
-+<U4174>     /x82/x32/xcb/x37 <CJK>
-+<U4175>     /x82/x32/xcb/x38 <CJK>
-+<U4176>     /x82/x32/xcb/x39 <CJK>
-+<U4177>     /x82/x32/xcc/x30 <CJK>
-+<U4178>     /x82/x32/xcc/x31 <CJK>
-+<U4179>     /x82/x32/xcc/x32 <CJK>
-+<U417A>     /x82/x32/xcc/x33 <CJK>
-+<U417B>     /x82/x32/xcc/x34 <CJK>
-+<U417C>     /x82/x32/xcc/x35 <CJK>
-+<U417D>     /x82/x32/xcc/x36 <CJK>
-+<U417E>     /x82/x32/xcc/x37 <CJK>
-+<U417F>     /x82/x32/xcc/x38 <CJK>
-+<U4180>     /x82/x32/xcc/x39 <CJK>
-+<U4181>     /x82/x32/xcd/x30 <CJK>
-+<U4182>     /x82/x32/xcd/x31 <CJK>
-+<U4183>     /x82/x32/xcd/x32 <CJK>
-+<U4184>     /x82/x32/xcd/x33 <CJK>
-+<U4185>     /x82/x32/xcd/x34 <CJK>
-+<U4186>     /x82/x32/xcd/x35 <CJK>
-+<U4187>     /x82/x32/xcd/x36 <CJK>
-+<U4188>     /x82/x32/xcd/x37 <CJK>
-+<U4189>     /x82/x32/xcd/x38 <CJK>
-+<U418A>     /x82/x32/xcd/x39 <CJK>
-+<U418B>     /x82/x32/xce/x30 <CJK>
-+<U418C>     /x82/x32/xce/x31 <CJK>
-+<U418D>     /x82/x32/xce/x32 <CJK>
-+<U418E>     /x82/x32/xce/x33 <CJK>
-+<U418F>     /x82/x32/xce/x34 <CJK>
-+<U4190>     /x82/x32/xce/x35 <CJK>
-+<U4191>     /x82/x32/xce/x36 <CJK>
-+<U4192>     /x82/x32/xce/x37 <CJK>
-+<U4193>     /x82/x32/xce/x38 <CJK>
-+<U4194>     /x82/x32/xce/x39 <CJK>
-+<U4195>     /x82/x32/xcf/x30 <CJK>
-+<U4196>     /x82/x32/xcf/x31 <CJK>
-+<U4197>     /x82/x32/xcf/x32 <CJK>
-+<U4198>     /x82/x32/xcf/x33 <CJK>
-+<U4199>     /x82/x32/xcf/x34 <CJK>
-+<U419A>     /x82/x32/xcf/x35 <CJK>
-+<U419B>     /x82/x32/xcf/x36 <CJK>
-+<U419C>     /x82/x32/xcf/x37 <CJK>
-+<U419D>     /x82/x32/xcf/x38 <CJK>
-+<U419E>     /x82/x32/xcf/x39 <CJK>
-+<U419F>     /x82/x32/xd0/x30 <CJK>
-+<U41A0>     /x82/x32/xd0/x31 <CJK>
-+<U41A1>     /x82/x32/xd0/x32 <CJK>
-+<U41A2>     /x82/x32/xd0/x33 <CJK>
-+<U41A3>     /x82/x32/xd0/x34 <CJK>
-+<U41A4>     /x82/x32/xd0/x35 <CJK>
-+<U41A5>     /x82/x32/xd0/x36 <CJK>
-+<U41A6>     /x82/x32/xd0/x37 <CJK>
-+<U41A7>     /x82/x32/xd0/x38 <CJK>
-+<U41A8>     /x82/x32/xd0/x39 <CJK>
-+<U41A9>     /x82/x32/xd1/x30 <CJK>
-+<U41AA>     /x82/x32/xd1/x31 <CJK>
-+<U41AB>     /x82/x32/xd1/x32 <CJK>
-+<U41AC>     /x82/x32/xd1/x33 <CJK>
-+<U41AD>     /x82/x32/xd1/x34 <CJK>
-+<U41AE>     /x82/x32/xd1/x35 <CJK>
-+<U41AF>     /x82/x32/xd1/x36 <CJK>
-+<U41B0>     /x82/x32/xd1/x37 <CJK>
-+<U41B1>     /x82/x32/xd1/x38 <CJK>
-+<U41B2>     /x82/x32/xd1/x39 <CJK>
-+<U41B3>     /x82/x32/xd2/x30 <CJK>
-+<U41B4>     /x82/x32/xd2/x31 <CJK>
-+<U41B5>     /x82/x32/xd2/x32 <CJK>
-+<U41B6>     /x82/x32/xd2/x33 <CJK>
-+<U41B7>     /x82/x32/xd2/x34 <CJK>
-+<U41B8>     /x82/x32/xd2/x35 <CJK>
-+<U41B9>     /x82/x32/xd2/x36 <CJK>
-+<U41BA>     /x82/x32/xd2/x37 <CJK>
-+<U41BB>     /x82/x32/xd2/x38 <CJK>
-+<U41BC>     /x82/x32/xd2/x39 <CJK>
-+<U41BD>     /x82/x32/xd3/x30 <CJK>
-+<U41BE>     /x82/x32/xd3/x31 <CJK>
-+<U41BF>     /x82/x32/xd3/x32 <CJK>
-+<U41C0>     /x82/x32/xd3/x33 <CJK>
-+<U41C1>     /x82/x32/xd3/x34 <CJK>
-+<U41C2>     /x82/x32/xd3/x35 <CJK>
-+<U41C3>     /x82/x32/xd3/x36 <CJK>
-+<U41C4>     /x82/x32/xd3/x37 <CJK>
-+<U41C5>     /x82/x32/xd3/x38 <CJK>
-+<U41C6>     /x82/x32/xd3/x39 <CJK>
-+<U41C7>     /x82/x32/xd4/x30 <CJK>
-+<U41C8>     /x82/x32/xd4/x31 <CJK>
-+<U41C9>     /x82/x32/xd4/x32 <CJK>
-+<U41CA>     /x82/x32/xd4/x33 <CJK>
-+<U41CB>     /x82/x32/xd4/x34 <CJK>
-+<U41CC>     /x82/x32/xd4/x35 <CJK>
-+<U41CD>     /x82/x32/xd4/x36 <CJK>
-+<U41CE>     /x82/x32/xd4/x37 <CJK>
-+<U41CF>     /x82/x32/xd4/x38 <CJK>
-+<U41D0>     /x82/x32/xd4/x39 <CJK>
-+<U41D1>     /x82/x32/xd5/x30 <CJK>
-+<U41D2>     /x82/x32/xd5/x31 <CJK>
-+<U41D3>     /x82/x32/xd5/x32 <CJK>
-+<U41D4>     /x82/x32/xd5/x33 <CJK>
-+<U41D5>     /x82/x32/xd5/x34 <CJK>
-+<U41D6>     /x82/x32/xd5/x35 <CJK>
-+<U41D7>     /x82/x32/xd5/x36 <CJK>
-+<U41D8>     /x82/x32/xd5/x37 <CJK>
-+<U41D9>     /x82/x32/xd5/x38 <CJK>
-+<U41DA>     /x82/x32/xd5/x39 <CJK>
-+<U41DB>     /x82/x32/xd6/x30 <CJK>
-+<U41DC>     /x82/x32/xd6/x31 <CJK>
-+<U41DD>     /x82/x32/xd6/x32 <CJK>
-+<U41DE>     /x82/x32/xd6/x33 <CJK>
-+<U41DF>     /x82/x32/xd6/x34 <CJK>
-+<U41E0>     /x82/x32/xd6/x35 <CJK>
-+<U41E1>     /x82/x32/xd6/x36 <CJK>
-+<U41E2>     /x82/x32/xd6/x37 <CJK>
-+<U41E3>     /x82/x32/xd6/x38 <CJK>
-+<U41E4>     /x82/x32/xd6/x39 <CJK>
-+<U41E5>     /x82/x32/xd7/x30 <CJK>
-+<U41E6>     /x82/x32/xd7/x31 <CJK>
-+<U41E7>     /x82/x32/xd7/x32 <CJK>
-+<U41E8>     /x82/x32/xd7/x33 <CJK>
-+<U41E9>     /x82/x32/xd7/x34 <CJK>
-+<U41EA>     /x82/x32/xd7/x35 <CJK>
-+<U41EB>     /x82/x32/xd7/x36 <CJK>
-+<U41EC>     /x82/x32/xd7/x37 <CJK>
-+<U41ED>     /x82/x32/xd7/x38 <CJK>
-+<U41EE>     /x82/x32/xd7/x39 <CJK>
-+<U41EF>     /x82/x32/xd8/x30 <CJK>
-+<U41F0>     /x82/x32/xd8/x31 <CJK>
-+<U41F1>     /x82/x32/xd8/x32 <CJK>
-+<U41F2>     /x82/x32/xd8/x33 <CJK>
-+<U41F3>     /x82/x32/xd8/x34 <CJK>
-+<U41F4>     /x82/x32/xd8/x35 <CJK>
-+<U41F5>     /x82/x32/xd8/x36 <CJK>
-+<U41F6>     /x82/x32/xd8/x37 <CJK>
-+<U41F7>     /x82/x32/xd8/x38 <CJK>
-+<U41F8>     /x82/x32/xd8/x39 <CJK>
-+<U41F9>     /x82/x32/xd9/x30 <CJK>
-+<U41FA>     /x82/x32/xd9/x31 <CJK>
-+<U41FB>     /x82/x32/xd9/x32 <CJK>
-+<U41FC>     /x82/x32/xd9/x33 <CJK>
-+<U41FD>     /x82/x32/xd9/x34 <CJK>
-+<U41FE>     /x82/x32/xd9/x35 <CJK>
-+<U41FF>     /x82/x32/xd9/x36 <CJK>
-+<U4200>     /x82/x32/xd9/x37 <CJK>
-+<U4201>     /x82/x32/xd9/x38 <CJK>
-+<U4202>     /x82/x32/xd9/x39 <CJK>
-+<U4203>     /x82/x32/xda/x30 <CJK>
-+<U4204>     /x82/x32/xda/x31 <CJK>
-+<U4205>     /x82/x32/xda/x32 <CJK>
-+<U4206>     /x82/x32/xda/x33 <CJK>
-+<U4207>     /x82/x32/xda/x34 <CJK>
-+<U4208>     /x82/x32/xda/x35 <CJK>
-+<U4209>     /x82/x32/xda/x36 <CJK>
-+<U420A>     /x82/x32/xda/x37 <CJK>
-+<U420B>     /x82/x32/xda/x38 <CJK>
-+<U420C>     /x82/x32/xda/x39 <CJK>
-+<U420D>     /x82/x32/xdb/x30 <CJK>
-+<U420E>     /x82/x32/xdb/x31 <CJK>
-+<U420F>     /x82/x32/xdb/x32 <CJK>
-+<U4210>     /x82/x32/xdb/x33 <CJK>
-+<U4211>     /x82/x32/xdb/x34 <CJK>
-+<U4212>     /x82/x32/xdb/x35 <CJK>
-+<U4213>     /x82/x32/xdb/x36 <CJK>
-+<U4214>     /x82/x32/xdb/x37 <CJK>
-+<U4215>     /x82/x32/xdb/x38 <CJK>
-+<U4216>     /x82/x32/xdb/x39 <CJK>
-+<U4217>     /x82/x32/xdc/x30 <CJK>
-+<U4218>     /x82/x32/xdc/x31 <CJK>
-+<U4219>     /x82/x32/xdc/x32 <CJK>
-+<U421A>     /x82/x32/xdc/x33 <CJK>
-+<U421B>     /x82/x32/xdc/x34 <CJK>
-+<U421C>     /x82/x32/xdc/x35 <CJK>
-+<U421D>     /x82/x32/xdc/x36 <CJK>
-+<U421E>     /x82/x32/xdc/x37 <CJK>
-+<U421F>     /x82/x32/xdc/x38 <CJK>
-+<U4220>     /x82/x32/xdc/x39 <CJK>
-+<U4221>     /x82/x32/xdd/x30 <CJK>
-+<U4222>     /x82/x32/xdd/x31 <CJK>
-+<U4223>     /x82/x32/xdd/x32 <CJK>
-+<U4224>     /x82/x32/xdd/x33 <CJK>
-+<U4225>     /x82/x32/xdd/x34 <CJK>
-+<U4226>     /x82/x32/xdd/x35 <CJK>
-+<U4227>     /x82/x32/xdd/x36 <CJK>
-+<U4228>     /x82/x32/xdd/x37 <CJK>
-+<U4229>     /x82/x32/xdd/x38 <CJK>
-+<U422A>     /x82/x32/xdd/x39 <CJK>
-+<U422B>     /x82/x32/xde/x30 <CJK>
-+<U422C>     /x82/x32/xde/x31 <CJK>
-+<U422D>     /x82/x32/xde/x32 <CJK>
-+<U422E>     /x82/x32/xde/x33 <CJK>
-+<U422F>     /x82/x32/xde/x34 <CJK>
-+<U4230>     /x82/x32/xde/x35 <CJK>
-+<U4231>     /x82/x32/xde/x36 <CJK>
-+<U4232>     /x82/x32/xde/x37 <CJK>
-+<U4233>     /x82/x32/xde/x38 <CJK>
-+<U4234>     /x82/x32/xde/x39 <CJK>
-+<U4235>     /x82/x32/xdf/x30 <CJK>
-+<U4236>     /x82/x32/xdf/x31 <CJK>
-+<U4237>     /x82/x32/xdf/x32 <CJK>
-+<U4238>     /x82/x32/xdf/x33 <CJK>
-+<U4239>     /x82/x32/xdf/x34 <CJK>
-+<U423A>     /x82/x32/xdf/x35 <CJK>
-+<U423B>     /x82/x32/xdf/x36 <CJK>
-+<U423C>     /x82/x32/xdf/x37 <CJK>
-+<U423D>     /x82/x32/xdf/x38 <CJK>
-+<U423E>     /x82/x32/xdf/x39 <CJK>
-+<U423F>     /x82/x32/xe0/x30 <CJK>
-+<U4240>     /x82/x32/xe0/x31 <CJK>
-+<U4241>     /x82/x32/xe0/x32 <CJK>
-+<U4242>     /x82/x32/xe0/x33 <CJK>
-+<U4243>     /x82/x32/xe0/x34 <CJK>
-+<U4244>     /x82/x32/xe0/x35 <CJK>
-+<U4245>     /x82/x32/xe0/x36 <CJK>
-+<U4246>     /x82/x32/xe0/x37 <CJK>
-+<U4247>     /x82/x32/xe0/x38 <CJK>
-+<U4248>     /x82/x32/xe0/x39 <CJK>
-+<U4249>     /x82/x32/xe1/x30 <CJK>
-+<U424A>     /x82/x32/xe1/x31 <CJK>
-+<U424B>     /x82/x32/xe1/x32 <CJK>
-+<U424C>     /x82/x32/xe1/x33 <CJK>
-+<U424D>     /x82/x32/xe1/x34 <CJK>
-+<U424E>     /x82/x32/xe1/x35 <CJK>
-+<U424F>     /x82/x32/xe1/x36 <CJK>
-+<U4250>     /x82/x32/xe1/x37 <CJK>
-+<U4251>     /x82/x32/xe1/x38 <CJK>
-+<U4252>     /x82/x32/xe1/x39 <CJK>
-+<U4253>     /x82/x32/xe2/x30 <CJK>
-+<U4254>     /x82/x32/xe2/x31 <CJK>
-+<U4255>     /x82/x32/xe2/x32 <CJK>
-+<U4256>     /x82/x32/xe2/x33 <CJK>
-+<U4257>     /x82/x32/xe2/x34 <CJK>
-+<U4258>     /x82/x32/xe2/x35 <CJK>
-+<U4259>     /x82/x32/xe2/x36 <CJK>
-+<U425A>     /x82/x32/xe2/x37 <CJK>
-+<U425B>     /x82/x32/xe2/x38 <CJK>
-+<U425C>     /x82/x32/xe2/x39 <CJK>
-+<U425D>     /x82/x32/xe3/x30 <CJK>
-+<U425E>     /x82/x32/xe3/x31 <CJK>
-+<U425F>     /x82/x32/xe3/x32 <CJK>
-+<U4260>     /x82/x32/xe3/x33 <CJK>
-+<U4261>     /x82/x32/xe3/x34 <CJK>
-+<U4262>     /x82/x32/xe3/x35 <CJK>
-+<U4263>     /x82/x32/xe3/x36 <CJK>
-+<U4264>     /x82/x32/xe3/x37 <CJK>
-+<U4265>     /x82/x32/xe3/x38 <CJK>
-+<U4266>     /x82/x32/xe3/x39 <CJK>
-+<U4267>     /x82/x32/xe4/x30 <CJK>
-+<U4268>     /x82/x32/xe4/x31 <CJK>
-+<U4269>     /x82/x32/xe4/x32 <CJK>
-+<U426A>     /x82/x32/xe4/x33 <CJK>
-+<U426B>     /x82/x32/xe4/x34 <CJK>
-+<U426C>     /x82/x32/xe4/x35 <CJK>
-+<U426D>     /x82/x32/xe4/x36 <CJK>
-+<U426E>     /x82/x32/xe4/x37 <CJK>
-+<U426F>     /x82/x32/xe4/x38 <CJK>
-+<U4270>     /x82/x32/xe4/x39 <CJK>
-+<U4271>     /x82/x32/xe5/x30 <CJK>
-+<U4272>     /x82/x32/xe5/x31 <CJK>
-+<U4273>     /x82/x32/xe5/x32 <CJK>
-+<U4274>     /x82/x32/xe5/x33 <CJK>
-+<U4275>     /x82/x32/xe5/x34 <CJK>
-+<U4276>     /x82/x32/xe5/x35 <CJK>
-+<U4277>     /x82/x32/xe5/x36 <CJK>
-+<U4278>     /x82/x32/xe5/x37 <CJK>
-+<U4279>     /x82/x32/xe5/x38 <CJK>
-+<U427A>     /x82/x32/xe5/x39 <CJK>
-+<U427B>     /x82/x32/xe6/x30 <CJK>
-+<U427C>     /x82/x32/xe6/x31 <CJK>
-+<U427D>     /x82/x32/xe6/x32 <CJK>
-+<U427E>     /x82/x32/xe6/x33 <CJK>
-+<U427F>     /x82/x32/xe6/x34 <CJK>
-+<U4280>     /x82/x32/xe6/x35 <CJK>
-+<U4281>     /x82/x32/xe6/x36 <CJK>
-+<U4282>     /x82/x32/xe6/x37 <CJK>
-+<U4283>     /x82/x32/xe6/x38 <CJK>
-+<U4284>     /x82/x32/xe6/x39 <CJK>
-+<U4285>     /x82/x32/xe7/x30 <CJK>
-+<U4286>     /x82/x32/xe7/x31 <CJK>
-+<U4287>     /x82/x32/xe7/x32 <CJK>
-+<U4288>     /x82/x32/xe7/x33 <CJK>
-+<U4289>     /x82/x32/xe7/x34 <CJK>
-+<U428A>     /x82/x32/xe7/x35 <CJK>
-+<U428B>     /x82/x32/xe7/x36 <CJK>
-+<U428C>     /x82/x32/xe7/x37 <CJK>
-+<U428D>     /x82/x32/xe7/x38 <CJK>
-+<U428E>     /x82/x32/xe7/x39 <CJK>
-+<U428F>     /x82/x32/xe8/x30 <CJK>
-+<U4290>     /x82/x32/xe8/x31 <CJK>
-+<U4291>     /x82/x32/xe8/x32 <CJK>
-+<U4292>     /x82/x32/xe8/x33 <CJK>
-+<U4293>     /x82/x32/xe8/x34 <CJK>
-+<U4294>     /x82/x32/xe8/x35 <CJK>
-+<U4295>     /x82/x32/xe8/x36 <CJK>
-+<U4296>     /x82/x32/xe8/x37 <CJK>
-+<U4297>     /x82/x32/xe8/x38 <CJK>
-+<U4298>     /x82/x32/xe8/x39 <CJK>
-+<U4299>     /x82/x32/xe9/x30 <CJK>
-+<U429A>     /x82/x32/xe9/x31 <CJK>
-+<U429B>     /x82/x32/xe9/x32 <CJK>
-+<U429C>     /x82/x32/xe9/x33 <CJK>
-+<U429D>     /x82/x32/xe9/x34 <CJK>
-+<U429E>     /x82/x32/xe9/x35 <CJK>
-+<U429F>     /x82/x32/xe9/x36 <CJK>
-+<U42A0>     /x82/x32/xe9/x37 <CJK>
-+<U42A1>     /x82/x32/xe9/x38 <CJK>
-+<U42A2>     /x82/x32/xe9/x39 <CJK>
-+<U42A3>     /x82/x32/xea/x30 <CJK>
-+<U42A4>     /x82/x32/xea/x31 <CJK>
-+<U42A5>     /x82/x32/xea/x32 <CJK>
-+<U42A6>     /x82/x32/xea/x33 <CJK>
-+<U42A7>     /x82/x32/xea/x34 <CJK>
-+<U42A8>     /x82/x32/xea/x35 <CJK>
-+<U42A9>     /x82/x32/xea/x36 <CJK>
-+<U42AA>     /x82/x32/xea/x37 <CJK>
-+<U42AB>     /x82/x32/xea/x38 <CJK>
-+<U42AC>     /x82/x32/xea/x39 <CJK>
-+<U42AD>     /x82/x32/xeb/x30 <CJK>
-+<U42AE>     /x82/x32/xeb/x31 <CJK>
-+<U42AF>     /x82/x32/xeb/x32 <CJK>
-+<U42B0>     /x82/x32/xeb/x33 <CJK>
-+<U42B1>     /x82/x32/xeb/x34 <CJK>
-+<U42B2>     /x82/x32/xeb/x35 <CJK>
-+<U42B3>     /x82/x32/xeb/x36 <CJK>
-+<U42B4>     /x82/x32/xeb/x37 <CJK>
-+<U42B5>     /x82/x32/xeb/x38 <CJK>
-+<U42B6>     /x82/x32/xeb/x39 <CJK>
-+<U42B7>     /x82/x32/xec/x30 <CJK>
-+<U42B8>     /x82/x32/xec/x31 <CJK>
-+<U42B9>     /x82/x32/xec/x32 <CJK>
-+<U42BA>     /x82/x32/xec/x33 <CJK>
-+<U42BB>     /x82/x32/xec/x34 <CJK>
-+<U42BC>     /x82/x32/xec/x35 <CJK>
-+<U42BD>     /x82/x32/xec/x36 <CJK>
-+<U42BE>     /x82/x32/xec/x37 <CJK>
-+<U42BF>     /x82/x32/xec/x38 <CJK>
-+<U42C0>     /x82/x32/xec/x39 <CJK>
-+<U42C1>     /x82/x32/xed/x30 <CJK>
-+<U42C2>     /x82/x32/xed/x31 <CJK>
-+<U42C3>     /x82/x32/xed/x32 <CJK>
-+<U42C4>     /x82/x32/xed/x33 <CJK>
-+<U42C5>     /x82/x32/xed/x34 <CJK>
-+<U42C6>     /x82/x32/xed/x35 <CJK>
-+<U42C7>     /x82/x32/xed/x36 <CJK>
-+<U42C8>     /x82/x32/xed/x37 <CJK>
-+<U42C9>     /x82/x32/xed/x38 <CJK>
-+<U42CA>     /x82/x32/xed/x39 <CJK>
-+<U42CB>     /x82/x32/xee/x30 <CJK>
-+<U42CC>     /x82/x32/xee/x31 <CJK>
-+<U42CD>     /x82/x32/xee/x32 <CJK>
-+<U42CE>     /x82/x32/xee/x33 <CJK>
-+<U42CF>     /x82/x32/xee/x34 <CJK>
-+<U42D0>     /x82/x32/xee/x35 <CJK>
-+<U42D1>     /x82/x32/xee/x36 <CJK>
-+<U42D2>     /x82/x32/xee/x37 <CJK>
-+<U42D3>     /x82/x32/xee/x38 <CJK>
-+<U42D4>     /x82/x32/xee/x39 <CJK>
-+<U42D5>     /x82/x32/xef/x30 <CJK>
-+<U42D6>     /x82/x32/xef/x31 <CJK>
-+<U42D7>     /x82/x32/xef/x32 <CJK>
-+<U42D8>     /x82/x32/xef/x33 <CJK>
-+<U42D9>     /x82/x32/xef/x34 <CJK>
-+<U42DA>     /x82/x32/xef/x35 <CJK>
-+<U42DB>     /x82/x32/xef/x36 <CJK>
-+<U42DC>     /x82/x32/xef/x37 <CJK>
-+<U42DD>     /x82/x32/xef/x38 <CJK>
-+<U42DE>     /x82/x32/xef/x39 <CJK>
-+<U42DF>     /x82/x32/xf0/x30 <CJK>
-+<U42E0>     /x82/x32/xf0/x31 <CJK>
-+<U42E1>     /x82/x32/xf0/x32 <CJK>
-+<U42E2>     /x82/x32/xf0/x33 <CJK>
-+<U42E3>     /x82/x32/xf0/x34 <CJK>
-+<U42E4>     /x82/x32/xf0/x35 <CJK>
-+<U42E5>     /x82/x32/xf0/x36 <CJK>
-+<U42E6>     /x82/x32/xf0/x37 <CJK>
-+<U42E7>     /x82/x32/xf0/x38 <CJK>
-+<U42E8>     /x82/x32/xf0/x39 <CJK>
-+<U42E9>     /x82/x32/xf1/x30 <CJK>
-+<U42EA>     /x82/x32/xf1/x31 <CJK>
-+<U42EB>     /x82/x32/xf1/x32 <CJK>
-+<U42EC>     /x82/x32/xf1/x33 <CJK>
-+<U42ED>     /x82/x32/xf1/x34 <CJK>
-+<U42EE>     /x82/x32/xf1/x35 <CJK>
-+<U42EF>     /x82/x32/xf1/x36 <CJK>
-+<U42F0>     /x82/x32/xf1/x37 <CJK>
-+<U42F1>     /x82/x32/xf1/x38 <CJK>
-+<U42F2>     /x82/x32/xf1/x39 <CJK>
-+<U42F3>     /x82/x32/xf2/x30 <CJK>
-+<U42F4>     /x82/x32/xf2/x31 <CJK>
-+<U42F5>     /x82/x32/xf2/x32 <CJK>
-+<U42F6>     /x82/x32/xf2/x33 <CJK>
-+<U42F7>     /x82/x32/xf2/x34 <CJK>
-+<U42F8>     /x82/x32/xf2/x35 <CJK>
-+<U42F9>     /x82/x32/xf2/x36 <CJK>
-+<U42FA>     /x82/x32/xf2/x37 <CJK>
-+<U42FB>     /x82/x32/xf2/x38 <CJK>
-+<U42FC>     /x82/x32/xf2/x39 <CJK>
-+<U42FD>     /x82/x32/xf3/x30 <CJK>
-+<U42FE>     /x82/x32/xf3/x31 <CJK>
-+<U42FF>     /x82/x32/xf3/x32 <CJK>
-+<U4300>     /x82/x32/xf3/x33 <CJK>
-+<U4301>     /x82/x32/xf3/x34 <CJK>
-+<U4302>     /x82/x32/xf3/x35 <CJK>
-+<U4303>     /x82/x32/xf3/x36 <CJK>
-+<U4304>     /x82/x32/xf3/x37 <CJK>
-+<U4305>     /x82/x32/xf3/x38 <CJK>
-+<U4306>     /x82/x32/xf3/x39 <CJK>
-+<U4307>     /x82/x32/xf4/x30 <CJK>
-+<U4308>     /x82/x32/xf4/x31 <CJK>
-+<U4309>     /x82/x32/xf4/x32 <CJK>
-+<U430A>     /x82/x32/xf4/x33 <CJK>
-+<U430B>     /x82/x32/xf4/x34 <CJK>
-+<U430C>     /x82/x32/xf4/x35 <CJK>
-+<U430D>     /x82/x32/xf4/x36 <CJK>
-+<U430E>     /x82/x32/xf4/x37 <CJK>
-+<U430F>     /x82/x32/xf4/x38 <CJK>
-+<U4310>     /x82/x32/xf4/x39 <CJK>
-+<U4311>     /x82/x32/xf5/x30 <CJK>
-+<U4312>     /x82/x32/xf5/x31 <CJK>
-+<U4313>     /x82/x32/xf5/x32 <CJK>
-+<U4314>     /x82/x32/xf5/x33 <CJK>
-+<U4315>     /x82/x32/xf5/x34 <CJK>
-+<U4316>     /x82/x32/xf5/x35 <CJK>
-+<U4317>     /x82/x32/xf5/x36 <CJK>
-+<U4318>     /x82/x32/xf5/x37 <CJK>
-+<U4319>     /x82/x32/xf5/x38 <CJK>
-+<U431A>     /x82/x32/xf5/x39 <CJK>
-+<U431B>     /x82/x32/xf6/x30 <CJK>
-+<U431C>     /x82/x32/xf6/x31 <CJK>
-+<U431D>     /x82/x32/xf6/x32 <CJK>
-+<U431E>     /x82/x32/xf6/x33 <CJK>
-+<U431F>     /x82/x32/xf6/x34 <CJK>
-+<U4320>     /x82/x32/xf6/x35 <CJK>
-+<U4321>     /x82/x32/xf6/x36 <CJK>
-+<U4322>     /x82/x32/xf6/x37 <CJK>
-+<U4323>     /x82/x32/xf6/x38 <CJK>
-+<U4324>     /x82/x32/xf6/x39 <CJK>
-+<U4325>     /x82/x32/xf7/x30 <CJK>
-+<U4326>     /x82/x32/xf7/x31 <CJK>
-+<U4327>     /x82/x32/xf7/x32 <CJK>
-+<U4328>     /x82/x32/xf7/x33 <CJK>
-+<U4329>     /x82/x32/xf7/x34 <CJK>
-+<U432A>     /x82/x32/xf7/x35 <CJK>
-+<U432B>     /x82/x32/xf7/x36 <CJK>
-+<U432C>     /x82/x32/xf7/x37 <CJK>
-+<U432D>     /x82/x32/xf7/x38 <CJK>
-+<U432E>     /x82/x32/xf7/x39 <CJK>
-+<U432F>     /x82/x32/xf8/x30 <CJK>
-+<U4330>     /x82/x32/xf8/x31 <CJK>
-+<U4331>     /x82/x32/xf8/x32 <CJK>
-+<U4332>     /x82/x32/xf8/x33 <CJK>
-+<U4333>     /x82/x32/xf8/x34 <CJK>
-+<U4334>     /x82/x32/xf8/x35 <CJK>
-+<U4335>     /x82/x32/xf8/x36 <CJK>
-+<U4336>     /x82/x32/xf8/x37 <CJK>
- <U4337>     /xfe/x72         <CJK>
- <U4338>     /x82/x32/xf8/x38 <CJK>
- <U4339>     /x82/x32/xf8/x39 <CJK>
-@@ -6099,6 +17628,379 @@ CHARMAP
- <U44D4>     /x82/x33/xa3/x37 <CJK>
- <U44D5>     /x82/x33/xa3/x38 <CJK>
- <U44D6>     /xfe/x7b         <CJK>
-+<U44D7>     /x82/x33/xa3/x39 <CJK>
-+<U44D8>     /x82/x33/xa4/x30 <CJK>
-+<U44D9>     /x82/x33/xa4/x31 <CJK>
-+<U44DA>     /x82/x33/xa4/x32 <CJK>
-+<U44DB>     /x82/x33/xa4/x33 <CJK>
-+<U44DC>     /x82/x33/xa4/x34 <CJK>
-+<U44DD>     /x82/x33/xa4/x35 <CJK>
-+<U44DE>     /x82/x33/xa4/x36 <CJK>
-+<U44DF>     /x82/x33/xa4/x37 <CJK>
-+<U44E0>     /x82/x33/xa4/x38 <CJK>
-+<U44E1>     /x82/x33/xa4/x39 <CJK>
-+<U44E2>     /x82/x33/xa5/x30 <CJK>
-+<U44E3>     /x82/x33/xa5/x31 <CJK>
-+<U44E4>     /x82/x33/xa5/x32 <CJK>
-+<U44E5>     /x82/x33/xa5/x33 <CJK>
-+<U44E6>     /x82/x33/xa5/x34 <CJK>
-+<U44E7>     /x82/x33/xa5/x35 <CJK>
-+<U44E8>     /x82/x33/xa5/x36 <CJK>
-+<U44E9>     /x82/x33/xa5/x37 <CJK>
-+<U44EA>     /x82/x33/xa5/x38 <CJK>
-+<U44EB>     /x82/x33/xa5/x39 <CJK>
-+<U44EC>     /x82/x33/xa6/x30 <CJK>
-+<U44ED>     /x82/x33/xa6/x31 <CJK>
-+<U44EE>     /x82/x33/xa6/x32 <CJK>
-+<U44EF>     /x82/x33/xa6/x33 <CJK>
-+<U44F0>     /x82/x33/xa6/x34 <CJK>
-+<U44F1>     /x82/x33/xa6/x35 <CJK>
-+<U44F2>     /x82/x33/xa6/x36 <CJK>
-+<U44F3>     /x82/x33/xa6/x37 <CJK>
-+<U44F4>     /x82/x33/xa6/x38 <CJK>
-+<U44F5>     /x82/x33/xa6/x39 <CJK>
-+<U44F6>     /x82/x33/xa7/x30 <CJK>
-+<U44F7>     /x82/x33/xa7/x31 <CJK>
-+<U44F8>     /x82/x33/xa7/x32 <CJK>
-+<U44F9>     /x82/x33/xa7/x33 <CJK>
-+<U44FA>     /x82/x33/xa7/x34 <CJK>
-+<U44FB>     /x82/x33/xa7/x35 <CJK>
-+<U44FC>     /x82/x33/xa7/x36 <CJK>
-+<U44FD>     /x82/x33/xa7/x37 <CJK>
-+<U44FE>     /x82/x33/xa7/x38 <CJK>
-+<U44FF>     /x82/x33/xa7/x39 <CJK>
-+<U4500>     /x82/x33/xa8/x30 <CJK>
-+<U4501>     /x82/x33/xa8/x31 <CJK>
-+<U4502>     /x82/x33/xa8/x32 <CJK>
-+<U4503>     /x82/x33/xa8/x33 <CJK>
-+<U4504>     /x82/x33/xa8/x34 <CJK>
-+<U4505>     /x82/x33/xa8/x35 <CJK>
-+<U4506>     /x82/x33/xa8/x36 <CJK>
-+<U4507>     /x82/x33/xa8/x37 <CJK>
-+<U4508>     /x82/x33/xa8/x38 <CJK>
-+<U4509>     /x82/x33/xa8/x39 <CJK>
-+<U450A>     /x82/x33/xa9/x30 <CJK>
-+<U450B>     /x82/x33/xa9/x31 <CJK>
-+<U450C>     /x82/x33/xa9/x32 <CJK>
-+<U450D>     /x82/x33/xa9/x33 <CJK>
-+<U450E>     /x82/x33/xa9/x34 <CJK>
-+<U450F>     /x82/x33/xa9/x35 <CJK>
-+<U4510>     /x82/x33/xa9/x36 <CJK>
-+<U4511>     /x82/x33/xa9/x37 <CJK>
-+<U4512>     /x82/x33/xa9/x38 <CJK>
-+<U4513>     /x82/x33/xa9/x39 <CJK>
-+<U4514>     /x82/x33/xaa/x30 <CJK>
-+<U4515>     /x82/x33/xaa/x31 <CJK>
-+<U4516>     /x82/x33/xaa/x32 <CJK>
-+<U4517>     /x82/x33/xaa/x33 <CJK>
-+<U4518>     /x82/x33/xaa/x34 <CJK>
-+<U4519>     /x82/x33/xaa/x35 <CJK>
-+<U451A>     /x82/x33/xaa/x36 <CJK>
-+<U451B>     /x82/x33/xaa/x37 <CJK>
-+<U451C>     /x82/x33/xaa/x38 <CJK>
-+<U451D>     /x82/x33/xaa/x39 <CJK>
-+<U451E>     /x82/x33/xab/x30 <CJK>
-+<U451F>     /x82/x33/xab/x31 <CJK>
-+<U4520>     /x82/x33/xab/x32 <CJK>
-+<U4521>     /x82/x33/xab/x33 <CJK>
-+<U4522>     /x82/x33/xab/x34 <CJK>
-+<U4523>     /x82/x33/xab/x35 <CJK>
-+<U4524>     /x82/x33/xab/x36 <CJK>
-+<U4525>     /x82/x33/xab/x37 <CJK>
-+<U4526>     /x82/x33/xab/x38 <CJK>
-+<U4527>     /x82/x33/xab/x39 <CJK>
-+<U4528>     /x82/x33/xac/x30 <CJK>
-+<U4529>     /x82/x33/xac/x31 <CJK>
-+<U452A>     /x82/x33/xac/x32 <CJK>
-+<U452B>     /x82/x33/xac/x33 <CJK>
-+<U452C>     /x82/x33/xac/x34 <CJK>
-+<U452D>     /x82/x33/xac/x35 <CJK>
-+<U452E>     /x82/x33/xac/x36 <CJK>
-+<U452F>     /x82/x33/xac/x37 <CJK>
-+<U4530>     /x82/x33/xac/x38 <CJK>
-+<U4531>     /x82/x33/xac/x39 <CJK>
-+<U4532>     /x82/x33/xad/x30 <CJK>
-+<U4533>     /x82/x33/xad/x31 <CJK>
-+<U4534>     /x82/x33/xad/x32 <CJK>
-+<U4535>     /x82/x33/xad/x33 <CJK>
-+<U4536>     /x82/x33/xad/x34 <CJK>
-+<U4537>     /x82/x33/xad/x35 <CJK>
-+<U4538>     /x82/x33/xad/x36 <CJK>
-+<U4539>     /x82/x33/xad/x37 <CJK>
-+<U453A>     /x82/x33/xad/x38 <CJK>
-+<U453B>     /x82/x33/xad/x39 <CJK>
-+<U453C>     /x82/x33/xae/x30 <CJK>
-+<U453D>     /x82/x33/xae/x31 <CJK>
-+<U453E>     /x82/x33/xae/x32 <CJK>
-+<U453F>     /x82/x33/xae/x33 <CJK>
-+<U4540>     /x82/x33/xae/x34 <CJK>
-+<U4541>     /x82/x33/xae/x35 <CJK>
-+<U4542>     /x82/x33/xae/x36 <CJK>
-+<U4543>     /x82/x33/xae/x37 <CJK>
-+<U4544>     /x82/x33/xae/x38 <CJK>
-+<U4545>     /x82/x33/xae/x39 <CJK>
-+<U4546>     /x82/x33/xaf/x30 <CJK>
-+<U4547>     /x82/x33/xaf/x31 <CJK>
-+<U4548>     /x82/x33/xaf/x32 <CJK>
-+<U4549>     /x82/x33/xaf/x33 <CJK>
-+<U454A>     /x82/x33/xaf/x34 <CJK>
-+<U454B>     /x82/x33/xaf/x35 <CJK>
-+<U454C>     /x82/x33/xaf/x36 <CJK>
-+<U454D>     /x82/x33/xaf/x37 <CJK>
-+<U454E>     /x82/x33/xaf/x38 <CJK>
-+<U454F>     /x82/x33/xaf/x39 <CJK>
-+<U4550>     /x82/x33/xb0/x30 <CJK>
-+<U4551>     /x82/x33/xb0/x31 <CJK>
-+<U4552>     /x82/x33/xb0/x32 <CJK>
-+<U4553>     /x82/x33/xb0/x33 <CJK>
-+<U4554>     /x82/x33/xb0/x34 <CJK>
-+<U4555>     /x82/x33/xb0/x35 <CJK>
-+<U4556>     /x82/x33/xb0/x36 <CJK>
-+<U4557>     /x82/x33/xb0/x37 <CJK>
-+<U4558>     /x82/x33/xb0/x38 <CJK>
-+<U4559>     /x82/x33/xb0/x39 <CJK>
-+<U455A>     /x82/x33/xb1/x30 <CJK>
-+<U455B>     /x82/x33/xb1/x31 <CJK>
-+<U455C>     /x82/x33/xb1/x32 <CJK>
-+<U455D>     /x82/x33/xb1/x33 <CJK>
-+<U455E>     /x82/x33/xb1/x34 <CJK>
-+<U455F>     /x82/x33/xb1/x35 <CJK>
-+<U4560>     /x82/x33/xb1/x36 <CJK>
-+<U4561>     /x82/x33/xb1/x37 <CJK>
-+<U4562>     /x82/x33/xb1/x38 <CJK>
-+<U4563>     /x82/x33/xb1/x39 <CJK>
-+<U4564>     /x82/x33/xb2/x30 <CJK>
-+<U4565>     /x82/x33/xb2/x31 <CJK>
-+<U4566>     /x82/x33/xb2/x32 <CJK>
-+<U4567>     /x82/x33/xb2/x33 <CJK>
-+<U4568>     /x82/x33/xb2/x34 <CJK>
-+<U4569>     /x82/x33/xb2/x35 <CJK>
-+<U456A>     /x82/x33/xb2/x36 <CJK>
-+<U456B>     /x82/x33/xb2/x37 <CJK>
-+<U456C>     /x82/x33/xb2/x38 <CJK>
-+<U456D>     /x82/x33/xb2/x39 <CJK>
-+<U456E>     /x82/x33/xb3/x30 <CJK>
-+<U456F>     /x82/x33/xb3/x31 <CJK>
-+<U4570>     /x82/x33/xb3/x32 <CJK>
-+<U4571>     /x82/x33/xb3/x33 <CJK>
-+<U4572>     /x82/x33/xb3/x34 <CJK>
-+<U4573>     /x82/x33/xb3/x35 <CJK>
-+<U4574>     /x82/x33/xb3/x36 <CJK>
-+<U4575>     /x82/x33/xb3/x37 <CJK>
-+<U4576>     /x82/x33/xb3/x38 <CJK>
-+<U4577>     /x82/x33/xb3/x39 <CJK>
-+<U4578>     /x82/x33/xb4/x30 <CJK>
-+<U4579>     /x82/x33/xb4/x31 <CJK>
-+<U457A>     /x82/x33/xb4/x32 <CJK>
-+<U457B>     /x82/x33/xb4/x33 <CJK>
-+<U457C>     /x82/x33/xb4/x34 <CJK>
-+<U457D>     /x82/x33/xb4/x35 <CJK>
-+<U457E>     /x82/x33/xb4/x36 <CJK>
-+<U457F>     /x82/x33/xb4/x37 <CJK>
-+<U4580>     /x82/x33/xb4/x38 <CJK>
-+<U4581>     /x82/x33/xb4/x39 <CJK>
-+<U4582>     /x82/x33/xb5/x30 <CJK>
-+<U4583>     /x82/x33/xb5/x31 <CJK>
-+<U4584>     /x82/x33/xb5/x32 <CJK>
-+<U4585>     /x82/x33/xb5/x33 <CJK>
-+<U4586>     /x82/x33/xb5/x34 <CJK>
-+<U4587>     /x82/x33/xb5/x35 <CJK>
-+<U4588>     /x82/x33/xb5/x36 <CJK>
-+<U4589>     /x82/x33/xb5/x37 <CJK>
-+<U458A>     /x82/x33/xb5/x38 <CJK>
-+<U458B>     /x82/x33/xb5/x39 <CJK>
-+<U458C>     /x82/x33/xb6/x30 <CJK>
-+<U458D>     /x82/x33/xb6/x31 <CJK>
-+<U458E>     /x82/x33/xb6/x32 <CJK>
-+<U458F>     /x82/x33/xb6/x33 <CJK>
-+<U4590>     /x82/x33/xb6/x34 <CJK>
-+<U4591>     /x82/x33/xb6/x35 <CJK>
-+<U4592>     /x82/x33/xb6/x36 <CJK>
-+<U4593>     /x82/x33/xb6/x37 <CJK>
-+<U4594>     /x82/x33/xb6/x38 <CJK>
-+<U4595>     /x82/x33/xb6/x39 <CJK>
-+<U4596>     /x82/x33/xb7/x30 <CJK>
-+<U4597>     /x82/x33/xb7/x31 <CJK>
-+<U4598>     /x82/x33/xb7/x32 <CJK>
-+<U4599>     /x82/x33/xb7/x33 <CJK>
-+<U459A>     /x82/x33/xb7/x34 <CJK>
-+<U459B>     /x82/x33/xb7/x35 <CJK>
-+<U459C>     /x82/x33/xb7/x36 <CJK>
-+<U459D>     /x82/x33/xb7/x37 <CJK>
-+<U459E>     /x82/x33/xb7/x38 <CJK>
-+<U459F>     /x82/x33/xb7/x39 <CJK>
-+<U45A0>     /x82/x33/xb8/x30 <CJK>
-+<U45A1>     /x82/x33/xb8/x31 <CJK>
-+<U45A2>     /x82/x33/xb8/x32 <CJK>
-+<U45A3>     /x82/x33/xb8/x33 <CJK>
-+<U45A4>     /x82/x33/xb8/x34 <CJK>
-+<U45A5>     /x82/x33/xb8/x35 <CJK>
-+<U45A6>     /x82/x33/xb8/x36 <CJK>
-+<U45A7>     /x82/x33/xb8/x37 <CJK>
-+<U45A8>     /x82/x33/xb8/x38 <CJK>
-+<U45A9>     /x82/x33/xb8/x39 <CJK>
-+<U45AA>     /x82/x33/xb9/x30 <CJK>
-+<U45AB>     /x82/x33/xb9/x31 <CJK>
-+<U45AC>     /x82/x33/xb9/x32 <CJK>
-+<U45AD>     /x82/x33/xb9/x33 <CJK>
-+<U45AE>     /x82/x33/xb9/x34 <CJK>
-+<U45AF>     /x82/x33/xb9/x35 <CJK>
-+<U45B0>     /x82/x33/xb9/x36 <CJK>
-+<U45B1>     /x82/x33/xb9/x37 <CJK>
-+<U45B2>     /x82/x33/xb9/x38 <CJK>
-+<U45B3>     /x82/x33/xb9/x39 <CJK>
-+<U45B4>     /x82/x33/xba/x30 <CJK>
-+<U45B5>     /x82/x33/xba/x31 <CJK>
-+<U45B6>     /x82/x33/xba/x32 <CJK>
-+<U45B7>     /x82/x33/xba/x33 <CJK>
-+<U45B8>     /x82/x33/xba/x34 <CJK>
-+<U45B9>     /x82/x33/xba/x35 <CJK>
-+<U45BA>     /x82/x33/xba/x36 <CJK>
-+<U45BB>     /x82/x33/xba/x37 <CJK>
-+<U45BC>     /x82/x33/xba/x38 <CJK>
-+<U45BD>     /x82/x33/xba/x39 <CJK>
-+<U45BE>     /x82/x33/xbb/x30 <CJK>
-+<U45BF>     /x82/x33/xbb/x31 <CJK>
-+<U45C0>     /x82/x33/xbb/x32 <CJK>
-+<U45C1>     /x82/x33/xbb/x33 <CJK>
-+<U45C2>     /x82/x33/xbb/x34 <CJK>
-+<U45C3>     /x82/x33/xbb/x35 <CJK>
-+<U45C4>     /x82/x33/xbb/x36 <CJK>
-+<U45C5>     /x82/x33/xbb/x37 <CJK>
-+<U45C6>     /x82/x33/xbb/x38 <CJK>
-+<U45C7>     /x82/x33/xbb/x39 <CJK>
-+<U45C8>     /x82/x33/xbc/x30 <CJK>
-+<U45C9>     /x82/x33/xbc/x31 <CJK>
-+<U45CA>     /x82/x33/xbc/x32 <CJK>
-+<U45CB>     /x82/x33/xbc/x33 <CJK>
-+<U45CC>     /x82/x33/xbc/x34 <CJK>
-+<U45CD>     /x82/x33/xbc/x35 <CJK>
-+<U45CE>     /x82/x33/xbc/x36 <CJK>
-+<U45CF>     /x82/x33/xbc/x37 <CJK>
-+<U45D0>     /x82/x33/xbc/x38 <CJK>
-+<U45D1>     /x82/x33/xbc/x39 <CJK>
-+<U45D2>     /x82/x33/xbd/x30 <CJK>
-+<U45D3>     /x82/x33/xbd/x31 <CJK>
-+<U45D4>     /x82/x33/xbd/x32 <CJK>
-+<U45D5>     /x82/x33/xbd/x33 <CJK>
-+<U45D6>     /x82/x33/xbd/x34 <CJK>
-+<U45D7>     /x82/x33/xbd/x35 <CJK>
-+<U45D8>     /x82/x33/xbd/x36 <CJK>
-+<U45D9>     /x82/x33/xbd/x37 <CJK>
-+<U45DA>     /x82/x33/xbd/x38 <CJK>
-+<U45DB>     /x82/x33/xbd/x39 <CJK>
-+<U45DC>     /x82/x33/xbe/x30 <CJK>
-+<U45DD>     /x82/x33/xbe/x31 <CJK>
-+<U45DE>     /x82/x33/xbe/x32 <CJK>
-+<U45DF>     /x82/x33/xbe/x33 <CJK>
-+<U45E0>     /x82/x33/xbe/x34 <CJK>
-+<U45E1>     /x82/x33/xbe/x35 <CJK>
-+<U45E2>     /x82/x33/xbe/x36 <CJK>
-+<U45E3>     /x82/x33/xbe/x37 <CJK>
-+<U45E4>     /x82/x33/xbe/x38 <CJK>
-+<U45E5>     /x82/x33/xbe/x39 <CJK>
-+<U45E6>     /x82/x33/xbf/x30 <CJK>
-+<U45E7>     /x82/x33/xbf/x31 <CJK>
-+<U45E8>     /x82/x33/xbf/x32 <CJK>
-+<U45E9>     /x82/x33/xbf/x33 <CJK>
-+<U45EA>     /x82/x33/xbf/x34 <CJK>
-+<U45EB>     /x82/x33/xbf/x35 <CJK>
-+<U45EC>     /x82/x33/xbf/x36 <CJK>
-+<U45ED>     /x82/x33/xbf/x37 <CJK>
-+<U45EE>     /x82/x33/xbf/x38 <CJK>
-+<U45EF>     /x82/x33/xbf/x39 <CJK>
-+<U45F0>     /x82/x33/xc0/x30 <CJK>
-+<U45F1>     /x82/x33/xc0/x31 <CJK>
-+<U45F2>     /x82/x33/xc0/x32 <CJK>
-+<U45F3>     /x82/x33/xc0/x33 <CJK>
-+<U45F4>     /x82/x33/xc0/x34 <CJK>
-+<U45F5>     /x82/x33/xc0/x35 <CJK>
-+<U45F6>     /x82/x33/xc0/x36 <CJK>
-+<U45F7>     /x82/x33/xc0/x37 <CJK>
-+<U45F8>     /x82/x33/xc0/x38 <CJK>
-+<U45F9>     /x82/x33/xc0/x39 <CJK>
-+<U45FA>     /x82/x33/xc1/x30 <CJK>
-+<U45FB>     /x82/x33/xc1/x31 <CJK>
-+<U45FC>     /x82/x33/xc1/x32 <CJK>
-+<U45FD>     /x82/x33/xc1/x33 <CJK>
-+<U45FE>     /x82/x33/xc1/x34 <CJK>
-+<U45FF>     /x82/x33/xc1/x35 <CJK>
-+<U4600>     /x82/x33/xc1/x36 <CJK>
-+<U4601>     /x82/x33/xc1/x37 <CJK>
-+<U4602>     /x82/x33/xc1/x38 <CJK>
-+<U4603>     /x82/x33/xc1/x39 <CJK>
-+<U4604>     /x82/x33/xc2/x30 <CJK>
-+<U4605>     /x82/x33/xc2/x31 <CJK>
-+<U4606>     /x82/x33/xc2/x32 <CJK>
-+<U4607>     /x82/x33/xc2/x33 <CJK>
-+<U4608>     /x82/x33/xc2/x34 <CJK>
-+<U4609>     /x82/x33/xc2/x35 <CJK>
-+<U460A>     /x82/x33/xc2/x36 <CJK>
-+<U460B>     /x82/x33/xc2/x37 <CJK>
-+<U460C>     /x82/x33/xc2/x38 <CJK>
-+<U460D>     /x82/x33/xc2/x39 <CJK>
-+<U460E>     /x82/x33/xc3/x30 <CJK>
-+<U460F>     /x82/x33/xc3/x31 <CJK>
-+<U4610>     /x82/x33/xc3/x32 <CJK>
-+<U4611>     /x82/x33/xc3/x33 <CJK>
-+<U4612>     /x82/x33/xc3/x34 <CJK>
-+<U4613>     /x82/x33/xc3/x35 <CJK>
-+<U4614>     /x82/x33/xc3/x36 <CJK>
-+<U4615>     /x82/x33/xc3/x37 <CJK>
-+<U4616>     /x82/x33/xc3/x38 <CJK>
-+<U4617>     /x82/x33/xc3/x39 <CJK>
-+<U4618>     /x82/x33/xc4/x30 <CJK>
-+<U4619>     /x82/x33/xc4/x31 <CJK>
-+<U461A>     /x82/x33/xc4/x32 <CJK>
-+<U461B>     /x82/x33/xc4/x33 <CJK>
-+<U461C>     /x82/x33/xc4/x34 <CJK>
-+<U461D>     /x82/x33/xc4/x35 <CJK>
-+<U461E>     /x82/x33/xc4/x36 <CJK>
-+<U461F>     /x82/x33/xc4/x37 <CJK>
-+<U4620>     /x82/x33/xc4/x38 <CJK>
-+<U4621>     /x82/x33/xc4/x39 <CJK>
-+<U4622>     /x82/x33/xc5/x30 <CJK>
-+<U4623>     /x82/x33/xc5/x31 <CJK>
-+<U4624>     /x82/x33/xc5/x32 <CJK>
-+<U4625>     /x82/x33/xc5/x33 <CJK>
-+<U4626>     /x82/x33/xc5/x34 <CJK>
-+<U4627>     /x82/x33/xc5/x35 <CJK>
-+<U4628>     /x82/x33/xc5/x36 <CJK>
-+<U4629>     /x82/x33/xc5/x37 <CJK>
-+<U462A>     /x82/x33/xc5/x38 <CJK>
-+<U462B>     /x82/x33/xc5/x39 <CJK>
-+<U462C>     /x82/x33/xc6/x30 <CJK>
-+<U462D>     /x82/x33/xc6/x31 <CJK>
-+<U462E>     /x82/x33/xc6/x32 <CJK>
-+<U462F>     /x82/x33/xc6/x33 <CJK>
-+<U4630>     /x82/x33/xc6/x34 <CJK>
-+<U4631>     /x82/x33/xc6/x35 <CJK>
-+<U4632>     /x82/x33/xc6/x36 <CJK>
-+<U4633>     /x82/x33/xc6/x37 <CJK>
-+<U4634>     /x82/x33/xc6/x38 <CJK>
-+<U4635>     /x82/x33/xc6/x39 <CJK>
-+<U4636>     /x82/x33/xc7/x30 <CJK>
-+<U4637>     /x82/x33/xc7/x31 <CJK>
-+<U4638>     /x82/x33/xc7/x32 <CJK>
-+<U4639>     /x82/x33/xc7/x33 <CJK>
-+<U463A>     /x82/x33/xc7/x34 <CJK>
-+<U463B>     /x82/x33/xc7/x35 <CJK>
-+<U463C>     /x82/x33/xc7/x36 <CJK>
-+<U463D>     /x82/x33/xc7/x37 <CJK>
-+<U463E>     /x82/x33/xc7/x38 <CJK>
-+<U463F>     /x82/x33/xc7/x39 <CJK>
-+<U4640>     /x82/x33/xc8/x30 <CJK>
-+<U4641>     /x82/x33/xc8/x31 <CJK>
-+<U4642>     /x82/x33/xc8/x32 <CJK>
-+<U4643>     /x82/x33/xc8/x33 <CJK>
-+<U4644>     /x82/x33/xc8/x34 <CJK>
-+<U4645>     /x82/x33/xc8/x35 <CJK>
-+<U4646>     /x82/x33/xc8/x36 <CJK>
-+<U4647>     /x82/x33/xc8/x37 <CJK>
-+<U4648>     /x82/x33/xc8/x38 <CJK>
-+<U4649>     /x82/x33/xc8/x39 <CJK>
-+<U464A>     /x82/x33/xc9/x30 <CJK>
-+<U464B>     /x82/x33/xc9/x31 <CJK>
- <U464C>     /xfe/x7d         <CJK>
- <U464D>     /x82/x33/xc9/x32 <CJK>
- <U464E>     /x82/x33/xc9/x33 <CJK>
-@@ -6421,6 +18323,447 @@ CHARMAP
- <U478B>     /x82/x33/xe8/x36 <CJK>
- <U478C>     /x82/x33/xe8/x37 <CJK>
- <U478D>     /xfe/x83         <CJK>
-+<U478E>     /x82/x33/xe8/x38 <CJK>
-+<U478F>     /x82/x33/xe8/x39 <CJK>
-+<U4790>     /x82/x33/xe9/x30 <CJK>
-+<U4791>     /x82/x33/xe9/x31 <CJK>
-+<U4792>     /x82/x33/xe9/x32 <CJK>
-+<U4793>     /x82/x33/xe9/x33 <CJK>
-+<U4794>     /x82/x33/xe9/x34 <CJK>
-+<U4795>     /x82/x33/xe9/x35 <CJK>
-+<U4796>     /x82/x33/xe9/x36 <CJK>
-+<U4797>     /x82/x33/xe9/x37 <CJK>
-+<U4798>     /x82/x33/xe9/x38 <CJK>
-+<U4799>     /x82/x33/xe9/x39 <CJK>
-+<U479A>     /x82/x33/xea/x30 <CJK>
-+<U479B>     /x82/x33/xea/x31 <CJK>
-+<U479C>     /x82/x33/xea/x32 <CJK>
-+<U479D>     /x82/x33/xea/x33 <CJK>
-+<U479E>     /x82/x33/xea/x34 <CJK>
-+<U479F>     /x82/x33/xea/x35 <CJK>
-+<U47A0>     /x82/x33/xea/x36 <CJK>
-+<U47A1>     /x82/x33/xea/x37 <CJK>
-+<U47A2>     /x82/x33/xea/x38 <CJK>
-+<U47A3>     /x82/x33/xea/x39 <CJK>
-+<U47A4>     /x82/x33/xeb/x30 <CJK>
-+<U47A5>     /x82/x33/xeb/x31 <CJK>
-+<U47A6>     /x82/x33/xeb/x32 <CJK>
-+<U47A7>     /x82/x33/xeb/x33 <CJK>
-+<U47A8>     /x82/x33/xeb/x34 <CJK>
-+<U47A9>     /x82/x33/xeb/x35 <CJK>
-+<U47AA>     /x82/x33/xeb/x36 <CJK>
-+<U47AB>     /x82/x33/xeb/x37 <CJK>
-+<U47AC>     /x82/x33/xeb/x38 <CJK>
-+<U47AD>     /x82/x33/xeb/x39 <CJK>
-+<U47AE>     /x82/x33/xec/x30 <CJK>
-+<U47AF>     /x82/x33/xec/x31 <CJK>
-+<U47B0>     /x82/x33/xec/x32 <CJK>
-+<U47B1>     /x82/x33/xec/x33 <CJK>
-+<U47B2>     /x82/x33/xec/x34 <CJK>
-+<U47B3>     /x82/x33/xec/x35 <CJK>
-+<U47B4>     /x82/x33/xec/x36 <CJK>
-+<U47B5>     /x82/x33/xec/x37 <CJK>
-+<U47B6>     /x82/x33/xec/x38 <CJK>
-+<U47B7>     /x82/x33/xec/x39 <CJK>
-+<U47B8>     /x82/x33/xed/x30 <CJK>
-+<U47B9>     /x82/x33/xed/x31 <CJK>
-+<U47BA>     /x82/x33/xed/x32 <CJK>
-+<U47BB>     /x82/x33/xed/x33 <CJK>
-+<U47BC>     /x82/x33/xed/x34 <CJK>
-+<U47BD>     /x82/x33/xed/x35 <CJK>
-+<U47BE>     /x82/x33/xed/x36 <CJK>
-+<U47BF>     /x82/x33/xed/x37 <CJK>
-+<U47C0>     /x82/x33/xed/x38 <CJK>
-+<U47C1>     /x82/x33/xed/x39 <CJK>
-+<U47C2>     /x82/x33/xee/x30 <CJK>
-+<U47C3>     /x82/x33/xee/x31 <CJK>
-+<U47C4>     /x82/x33/xee/x32 <CJK>
-+<U47C5>     /x82/x33/xee/x33 <CJK>
-+<U47C6>     /x82/x33/xee/x34 <CJK>
-+<U47C7>     /x82/x33/xee/x35 <CJK>
-+<U47C8>     /x82/x33/xee/x36 <CJK>
-+<U47C9>     /x82/x33/xee/x37 <CJK>
-+<U47CA>     /x82/x33/xee/x38 <CJK>
-+<U47CB>     /x82/x33/xee/x39 <CJK>
-+<U47CC>     /x82/x33/xef/x30 <CJK>
-+<U47CD>     /x82/x33/xef/x31 <CJK>
-+<U47CE>     /x82/x33/xef/x32 <CJK>
-+<U47CF>     /x82/x33/xef/x33 <CJK>
-+<U47D0>     /x82/x33/xef/x34 <CJK>
-+<U47D1>     /x82/x33/xef/x35 <CJK>
-+<U47D2>     /x82/x33/xef/x36 <CJK>
-+<U47D3>     /x82/x33/xef/x37 <CJK>
-+<U47D4>     /x82/x33/xef/x38 <CJK>
-+<U47D5>     /x82/x33/xef/x39 <CJK>
-+<U47D6>     /x82/x33/xf0/x30 <CJK>
-+<U47D7>     /x82/x33/xf0/x31 <CJK>
-+<U47D8>     /x82/x33/xf0/x32 <CJK>
-+<U47D9>     /x82/x33/xf0/x33 <CJK>
-+<U47DA>     /x82/x33/xf0/x34 <CJK>
-+<U47DB>     /x82/x33/xf0/x35 <CJK>
-+<U47DC>     /x82/x33/xf0/x36 <CJK>
-+<U47DD>     /x82/x33/xf0/x37 <CJK>
-+<U47DE>     /x82/x33/xf0/x38 <CJK>
-+<U47DF>     /x82/x33/xf0/x39 <CJK>
-+<U47E0>     /x82/x33/xf1/x30 <CJK>
-+<U47E1>     /x82/x33/xf1/x31 <CJK>
-+<U47E2>     /x82/x33/xf1/x32 <CJK>
-+<U47E3>     /x82/x33/xf1/x33 <CJK>
-+<U47E4>     /x82/x33/xf1/x34 <CJK>
-+<U47E5>     /x82/x33/xf1/x35 <CJK>
-+<U47E6>     /x82/x33/xf1/x36 <CJK>
-+<U47E7>     /x82/x33/xf1/x37 <CJK>
-+<U47E8>     /x82/x33/xf1/x38 <CJK>
-+<U47E9>     /x82/x33/xf1/x39 <CJK>
-+<U47EA>     /x82/x33/xf2/x30 <CJK>
-+<U47EB>     /x82/x33/xf2/x31 <CJK>
-+<U47EC>     /x82/x33/xf2/x32 <CJK>
-+<U47ED>     /x82/x33/xf2/x33 <CJK>
-+<U47EE>     /x82/x33/xf2/x34 <CJK>
-+<U47EF>     /x82/x33/xf2/x35 <CJK>
-+<U47F0>     /x82/x33/xf2/x36 <CJK>
-+<U47F1>     /x82/x33/xf2/x37 <CJK>
-+<U47F2>     /x82/x33/xf2/x38 <CJK>
-+<U47F3>     /x82/x33/xf2/x39 <CJK>
-+<U47F4>     /x82/x33/xf3/x30 <CJK>
-+<U47F5>     /x82/x33/xf3/x31 <CJK>
-+<U47F6>     /x82/x33/xf3/x32 <CJK>
-+<U47F7>     /x82/x33/xf3/x33 <CJK>
-+<U47F8>     /x82/x33/xf3/x34 <CJK>
-+<U47F9>     /x82/x33/xf3/x35 <CJK>
-+<U47FA>     /x82/x33/xf3/x36 <CJK>
-+<U47FB>     /x82/x33/xf3/x37 <CJK>
-+<U47FC>     /x82/x33/xf3/x38 <CJK>
-+<U47FD>     /x82/x33/xf3/x39 <CJK>
-+<U47FE>     /x82/x33/xf4/x30 <CJK>
-+<U47FF>     /x82/x33/xf4/x31 <CJK>
-+<U4800>     /x82/x33/xf4/x32 <CJK>
-+<U4801>     /x82/x33/xf4/x33 <CJK>
-+<U4802>     /x82/x33/xf4/x34 <CJK>
-+<U4803>     /x82/x33/xf4/x35 <CJK>
-+<U4804>     /x82/x33/xf4/x36 <CJK>
-+<U4805>     /x82/x33/xf4/x37 <CJK>
-+<U4806>     /x82/x33/xf4/x38 <CJK>
-+<U4807>     /x82/x33/xf4/x39 <CJK>
-+<U4808>     /x82/x33/xf5/x30 <CJK>
-+<U4809>     /x82/x33/xf5/x31 <CJK>
-+<U480A>     /x82/x33/xf5/x32 <CJK>
-+<U480B>     /x82/x33/xf5/x33 <CJK>
-+<U480C>     /x82/x33/xf5/x34 <CJK>
-+<U480D>     /x82/x33/xf5/x35 <CJK>
-+<U480E>     /x82/x33/xf5/x36 <CJK>
-+<U480F>     /x82/x33/xf5/x37 <CJK>
-+<U4810>     /x82/x33/xf5/x38 <CJK>
-+<U4811>     /x82/x33/xf5/x39 <CJK>
-+<U4812>     /x82/x33/xf6/x30 <CJK>
-+<U4813>     /x82/x33/xf6/x31 <CJK>
-+<U4814>     /x82/x33/xf6/x32 <CJK>
-+<U4815>     /x82/x33/xf6/x33 <CJK>
-+<U4816>     /x82/x33/xf6/x34 <CJK>
-+<U4817>     /x82/x33/xf6/x35 <CJK>
-+<U4818>     /x82/x33/xf6/x36 <CJK>
-+<U4819>     /x82/x33/xf6/x37 <CJK>
-+<U481A>     /x82/x33/xf6/x38 <CJK>
-+<U481B>     /x82/x33/xf6/x39 <CJK>
-+<U481C>     /x82/x33/xf7/x30 <CJK>
-+<U481D>     /x82/x33/xf7/x31 <CJK>
-+<U481E>     /x82/x33/xf7/x32 <CJK>
-+<U481F>     /x82/x33/xf7/x33 <CJK>
-+<U4820>     /x82/x33/xf7/x34 <CJK>
-+<U4821>     /x82/x33/xf7/x35 <CJK>
-+<U4822>     /x82/x33/xf7/x36 <CJK>
-+<U4823>     /x82/x33/xf7/x37 <CJK>
-+<U4824>     /x82/x33/xf7/x38 <CJK>
-+<U4825>     /x82/x33/xf7/x39 <CJK>
-+<U4826>     /x82/x33/xf8/x30 <CJK>
-+<U4827>     /x82/x33/xf8/x31 <CJK>
-+<U4828>     /x82/x33/xf8/x32 <CJK>
-+<U4829>     /x82/x33/xf8/x33 <CJK>
-+<U482A>     /x82/x33/xf8/x34 <CJK>
-+<U482B>     /x82/x33/xf8/x35 <CJK>
-+<U482C>     /x82/x33/xf8/x36 <CJK>
-+<U482D>     /x82/x33/xf8/x37 <CJK>
-+<U482E>     /x82/x33/xf8/x38 <CJK>
-+<U482F>     /x82/x33/xf8/x39 <CJK>
-+<U4830>     /x82/x33/xf9/x30 <CJK>
-+<U4831>     /x82/x33/xf9/x31 <CJK>
-+<U4832>     /x82/x33/xf9/x32 <CJK>
-+<U4833>     /x82/x33/xf9/x33 <CJK>
-+<U4834>     /x82/x33/xf9/x34 <CJK>
-+<U4835>     /x82/x33/xf9/x35 <CJK>
-+<U4836>     /x82/x33/xf9/x36 <CJK>
-+<U4837>     /x82/x33/xf9/x37 <CJK>
-+<U4838>     /x82/x33/xf9/x38 <CJK>
-+<U4839>     /x82/x33/xf9/x39 <CJK>
-+<U483A>     /x82/x33/xfa/x30 <CJK>
-+<U483B>     /x82/x33/xfa/x31 <CJK>
-+<U483C>     /x82/x33/xfa/x32 <CJK>
-+<U483D>     /x82/x33/xfa/x33 <CJK>
-+<U483E>     /x82/x33/xfa/x34 <CJK>
-+<U483F>     /x82/x33/xfa/x35 <CJK>
-+<U4840>     /x82/x33/xfa/x36 <CJK>
-+<U4841>     /x82/x33/xfa/x37 <CJK>
-+<U4842>     /x82/x33/xfa/x38 <CJK>
-+<U4843>     /x82/x33/xfa/x39 <CJK>
-+<U4844>     /x82/x33/xfb/x30 <CJK>
-+<U4845>     /x82/x33/xfb/x31 <CJK>
-+<U4846>     /x82/x33/xfb/x32 <CJK>
-+<U4847>     /x82/x33/xfb/x33 <CJK>
-+<U4848>     /x82/x33/xfb/x34 <CJK>
-+<U4849>     /x82/x33/xfb/x35 <CJK>
-+<U484A>     /x82/x33/xfb/x36 <CJK>
-+<U484B>     /x82/x33/xfb/x37 <CJK>
-+<U484C>     /x82/x33/xfb/x38 <CJK>
-+<U484D>     /x82/x33/xfb/x39 <CJK>
-+<U484E>     /x82/x33/xfc/x30 <CJK>
-+<U484F>     /x82/x33/xfc/x31 <CJK>
-+<U4850>     /x82/x33/xfc/x32 <CJK>
-+<U4851>     /x82/x33/xfc/x33 <CJK>
-+<U4852>     /x82/x33/xfc/x34 <CJK>
-+<U4853>     /x82/x33/xfc/x35 <CJK>
-+<U4854>     /x82/x33/xfc/x36 <CJK>
-+<U4855>     /x82/x33/xfc/x37 <CJK>
-+<U4856>     /x82/x33/xfc/x38 <CJK>
-+<U4857>     /x82/x33/xfc/x39 <CJK>
-+<U4858>     /x82/x33/xfd/x30 <CJK>
-+<U4859>     /x82/x33/xfd/x31 <CJK>
-+<U485A>     /x82/x33/xfd/x32 <CJK>
-+<U485B>     /x82/x33/xfd/x33 <CJK>
-+<U485C>     /x82/x33/xfd/x34 <CJK>
-+<U485D>     /x82/x33/xfd/x35 <CJK>
-+<U485E>     /x82/x33/xfd/x36 <CJK>
-+<U485F>     /x82/x33/xfd/x37 <CJK>
-+<U4860>     /x82/x33/xfd/x38 <CJK>
-+<U4861>     /x82/x33/xfd/x39 <CJK>
-+<U4862>     /x82/x33/xfe/x30 <CJK>
-+<U4863>     /x82/x33/xfe/x31 <CJK>
-+<U4864>     /x82/x33/xfe/x32 <CJK>
-+<U4865>     /x82/x33/xfe/x33 <CJK>
-+<U4866>     /x82/x33/xfe/x34 <CJK>
-+<U4867>     /x82/x33/xfe/x35 <CJK>
-+<U4868>     /x82/x33/xfe/x36 <CJK>
-+<U4869>     /x82/x33/xfe/x37 <CJK>
-+<U486A>     /x82/x33/xfe/x38 <CJK>
-+<U486B>     /x82/x33/xfe/x39 <CJK>
-+<U486C>     /x82/x34/x81/x30 <CJK>
-+<U486D>     /x82/x34/x81/x31 <CJK>
-+<U486E>     /x82/x34/x81/x32 <CJK>
-+<U486F>     /x82/x34/x81/x33 <CJK>
-+<U4870>     /x82/x34/x81/x34 <CJK>
-+<U4871>     /x82/x34/x81/x35 <CJK>
-+<U4872>     /x82/x34/x81/x36 <CJK>
-+<U4873>     /x82/x34/x81/x37 <CJK>
-+<U4874>     /x82/x34/x81/x38 <CJK>
-+<U4875>     /x82/x34/x81/x39 <CJK>
-+<U4876>     /x82/x34/x82/x30 <CJK>
-+<U4877>     /x82/x34/x82/x31 <CJK>
-+<U4878>     /x82/x34/x82/x32 <CJK>
-+<U4879>     /x82/x34/x82/x33 <CJK>
-+<U487A>     /x82/x34/x82/x34 <CJK>
-+<U487B>     /x82/x34/x82/x35 <CJK>
-+<U487C>     /x82/x34/x82/x36 <CJK>
-+<U487D>     /x82/x34/x82/x37 <CJK>
-+<U487E>     /x82/x34/x82/x38 <CJK>
-+<U487F>     /x82/x34/x82/x39 <CJK>
-+<U4880>     /x82/x34/x83/x30 <CJK>
-+<U4881>     /x82/x34/x83/x31 <CJK>
-+<U4882>     /x82/x34/x83/x32 <CJK>
-+<U4883>     /x82/x34/x83/x33 <CJK>
-+<U4884>     /x82/x34/x83/x34 <CJK>
-+<U4885>     /x82/x34/x83/x35 <CJK>
-+<U4886>     /x82/x34/x83/x36 <CJK>
-+<U4887>     /x82/x34/x83/x37 <CJK>
-+<U4888>     /x82/x34/x83/x38 <CJK>
-+<U4889>     /x82/x34/x83/x39 <CJK>
-+<U488A>     /x82/x34/x84/x30 <CJK>
-+<U488B>     /x82/x34/x84/x31 <CJK>
-+<U488C>     /x82/x34/x84/x32 <CJK>
-+<U488D>     /x82/x34/x84/x33 <CJK>
-+<U488E>     /x82/x34/x84/x34 <CJK>
-+<U488F>     /x82/x34/x84/x35 <CJK>
-+<U4890>     /x82/x34/x84/x36 <CJK>
-+<U4891>     /x82/x34/x84/x37 <CJK>
-+<U4892>     /x82/x34/x84/x38 <CJK>
-+<U4893>     /x82/x34/x84/x39 <CJK>
-+<U4894>     /x82/x34/x85/x30 <CJK>
-+<U4895>     /x82/x34/x85/x31 <CJK>
-+<U4896>     /x82/x34/x85/x32 <CJK>
-+<U4897>     /x82/x34/x85/x33 <CJK>
-+<U4898>     /x82/x34/x85/x34 <CJK>
-+<U4899>     /x82/x34/x85/x35 <CJK>
-+<U489A>     /x82/x34/x85/x36 <CJK>
-+<U489B>     /x82/x34/x85/x37 <CJK>
-+<U489C>     /x82/x34/x85/x38 <CJK>
-+<U489D>     /x82/x34/x85/x39 <CJK>
-+<U489E>     /x82/x34/x86/x30 <CJK>
-+<U489F>     /x82/x34/x86/x31 <CJK>
-+<U48A0>     /x82/x34/x86/x32 <CJK>
-+<U48A1>     /x82/x34/x86/x33 <CJK>
-+<U48A2>     /x82/x34/x86/x34 <CJK>
-+<U48A3>     /x82/x34/x86/x35 <CJK>
-+<U48A4>     /x82/x34/x86/x36 <CJK>
-+<U48A5>     /x82/x34/x86/x37 <CJK>
-+<U48A6>     /x82/x34/x86/x38 <CJK>
-+<U48A7>     /x82/x34/x86/x39 <CJK>
-+<U48A8>     /x82/x34/x87/x30 <CJK>
-+<U48A9>     /x82/x34/x87/x31 <CJK>
-+<U48AA>     /x82/x34/x87/x32 <CJK>
-+<U48AB>     /x82/x34/x87/x33 <CJK>
-+<U48AC>     /x82/x34/x87/x34 <CJK>
-+<U48AD>     /x82/x34/x87/x35 <CJK>
-+<U48AE>     /x82/x34/x87/x36 <CJK>
-+<U48AF>     /x82/x34/x87/x37 <CJK>
-+<U48B0>     /x82/x34/x87/x38 <CJK>
-+<U48B1>     /x82/x34/x87/x39 <CJK>
-+<U48B2>     /x82/x34/x88/x30 <CJK>
-+<U48B3>     /x82/x34/x88/x31 <CJK>
-+<U48B4>     /x82/x34/x88/x32 <CJK>
-+<U48B5>     /x82/x34/x88/x33 <CJK>
-+<U48B6>     /x82/x34/x88/x34 <CJK>
-+<U48B7>     /x82/x34/x88/x35 <CJK>
-+<U48B8>     /x82/x34/x88/x36 <CJK>
-+<U48B9>     /x82/x34/x88/x37 <CJK>
-+<U48BA>     /x82/x34/x88/x38 <CJK>
-+<U48BB>     /x82/x34/x88/x39 <CJK>
-+<U48BC>     /x82/x34/x89/x30 <CJK>
-+<U48BD>     /x82/x34/x89/x31 <CJK>
-+<U48BE>     /x82/x34/x89/x32 <CJK>
-+<U48BF>     /x82/x34/x89/x33 <CJK>
-+<U48C0>     /x82/x34/x89/x34 <CJK>
-+<U48C1>     /x82/x34/x89/x35 <CJK>
-+<U48C2>     /x82/x34/x89/x36 <CJK>
-+<U48C3>     /x82/x34/x89/x37 <CJK>
-+<U48C4>     /x82/x34/x89/x38 <CJK>
-+<U48C5>     /x82/x34/x89/x39 <CJK>
-+<U48C6>     /x82/x34/x8a/x30 <CJK>
-+<U48C7>     /x82/x34/x8a/x31 <CJK>
-+<U48C8>     /x82/x34/x8a/x32 <CJK>
-+<U48C9>     /x82/x34/x8a/x33 <CJK>
-+<U48CA>     /x82/x34/x8a/x34 <CJK>
-+<U48CB>     /x82/x34/x8a/x35 <CJK>
-+<U48CC>     /x82/x34/x8a/x36 <CJK>
-+<U48CD>     /x82/x34/x8a/x37 <CJK>
-+<U48CE>     /x82/x34/x8a/x38 <CJK>
-+<U48CF>     /x82/x34/x8a/x39 <CJK>
-+<U48D0>     /x82/x34/x8b/x30 <CJK>
-+<U48D1>     /x82/x34/x8b/x31 <CJK>
-+<U48D2>     /x82/x34/x8b/x32 <CJK>
-+<U48D3>     /x82/x34/x8b/x33 <CJK>
-+<U48D4>     /x82/x34/x8b/x34 <CJK>
-+<U48D5>     /x82/x34/x8b/x35 <CJK>
-+<U48D6>     /x82/x34/x8b/x36 <CJK>
-+<U48D7>     /x82/x34/x8b/x37 <CJK>
-+<U48D8>     /x82/x34/x8b/x38 <CJK>
-+<U48D9>     /x82/x34/x8b/x39 <CJK>
-+<U48DA>     /x82/x34/x8c/x30 <CJK>
-+<U48DB>     /x82/x34/x8c/x31 <CJK>
-+<U48DC>     /x82/x34/x8c/x32 <CJK>
-+<U48DD>     /x82/x34/x8c/x33 <CJK>
-+<U48DE>     /x82/x34/x8c/x34 <CJK>
-+<U48DF>     /x82/x34/x8c/x35 <CJK>
-+<U48E0>     /x82/x34/x8c/x36 <CJK>
-+<U48E1>     /x82/x34/x8c/x37 <CJK>
-+<U48E2>     /x82/x34/x8c/x38 <CJK>
-+<U48E3>     /x82/x34/x8c/x39 <CJK>
-+<U48E4>     /x82/x34/x8d/x30 <CJK>
-+<U48E5>     /x82/x34/x8d/x31 <CJK>
-+<U48E6>     /x82/x34/x8d/x32 <CJK>
-+<U48E7>     /x82/x34/x8d/x33 <CJK>
-+<U48E8>     /x82/x34/x8d/x34 <CJK>
-+<U48E9>     /x82/x34/x8d/x35 <CJK>
-+<U48EA>     /x82/x34/x8d/x36 <CJK>
-+<U48EB>     /x82/x34/x8d/x37 <CJK>
-+<U48EC>     /x82/x34/x8d/x38 <CJK>
-+<U48ED>     /x82/x34/x8d/x39 <CJK>
-+<U48EE>     /x82/x34/x8e/x30 <CJK>
-+<U48EF>     /x82/x34/x8e/x31 <CJK>
-+<U48F0>     /x82/x34/x8e/x32 <CJK>
-+<U48F1>     /x82/x34/x8e/x33 <CJK>
-+<U48F2>     /x82/x34/x8e/x34 <CJK>
-+<U48F3>     /x82/x34/x8e/x35 <CJK>
-+<U48F4>     /x82/x34/x8e/x36 <CJK>
-+<U48F5>     /x82/x34/x8e/x37 <CJK>
-+<U48F6>     /x82/x34/x8e/x38 <CJK>
-+<U48F7>     /x82/x34/x8e/x39 <CJK>
-+<U48F8>     /x82/x34/x8f/x30 <CJK>
-+<U48F9>     /x82/x34/x8f/x31 <CJK>
-+<U48FA>     /x82/x34/x8f/x32 <CJK>
-+<U48FB>     /x82/x34/x8f/x33 <CJK>
-+<U48FC>     /x82/x34/x8f/x34 <CJK>
-+<U48FD>     /x82/x34/x8f/x35 <CJK>
-+<U48FE>     /x82/x34/x8f/x36 <CJK>
-+<U48FF>     /x82/x34/x8f/x37 <CJK>
-+<U4900>     /x82/x34/x8f/x38 <CJK>
-+<U4901>     /x82/x34/x8f/x39 <CJK>
-+<U4902>     /x82/x34/x90/x30 <CJK>
-+<U4903>     /x82/x34/x90/x31 <CJK>
-+<U4904>     /x82/x34/x90/x32 <CJK>
-+<U4905>     /x82/x34/x90/x33 <CJK>
-+<U4906>     /x82/x34/x90/x34 <CJK>
-+<U4907>     /x82/x34/x90/x35 <CJK>
-+<U4908>     /x82/x34/x90/x36 <CJK>
-+<U4909>     /x82/x34/x90/x37 <CJK>
-+<U490A>     /x82/x34/x90/x38 <CJK>
-+<U490B>     /x82/x34/x90/x39 <CJK>
-+<U490C>     /x82/x34/x91/x30 <CJK>
-+<U490D>     /x82/x34/x91/x31 <CJK>
-+<U490E>     /x82/x34/x91/x32 <CJK>
-+<U490F>     /x82/x34/x91/x33 <CJK>
-+<U4910>     /x82/x34/x91/x34 <CJK>
-+<U4911>     /x82/x34/x91/x35 <CJK>
-+<U4912>     /x82/x34/x91/x36 <CJK>
-+<U4913>     /x82/x34/x91/x37 <CJK>
-+<U4914>     /x82/x34/x91/x38 <CJK>
-+<U4915>     /x82/x34/x91/x39 <CJK>
-+<U4916>     /x82/x34/x92/x30 <CJK>
-+<U4917>     /x82/x34/x92/x31 <CJK>
-+<U4918>     /x82/x34/x92/x32 <CJK>
-+<U4919>     /x82/x34/x92/x33 <CJK>
-+<U491A>     /x82/x34/x92/x34 <CJK>
-+<U491B>     /x82/x34/x92/x35 <CJK>
-+<U491C>     /x82/x34/x92/x36 <CJK>
-+<U491D>     /x82/x34/x92/x37 <CJK>
-+<U491E>     /x82/x34/x92/x38 <CJK>
-+<U491F>     /x82/x34/x92/x39 <CJK>
-+<U4920>     /x82/x34/x93/x30 <CJK>
-+<U4921>     /x82/x34/x93/x31 <CJK>
-+<U4922>     /x82/x34/x93/x32 <CJK>
-+<U4923>     /x82/x34/x93/x33 <CJK>
-+<U4924>     /x82/x34/x93/x34 <CJK>
-+<U4925>     /x82/x34/x93/x35 <CJK>
-+<U4926>     /x82/x34/x93/x36 <CJK>
-+<U4927>     /x82/x34/x93/x37 <CJK>
-+<U4928>     /x82/x34/x93/x38 <CJK>
-+<U4929>     /x82/x34/x93/x39 <CJK>
-+<U492A>     /x82/x34/x94/x30 <CJK>
-+<U492B>     /x82/x34/x94/x31 <CJK>
-+<U492C>     /x82/x34/x94/x32 <CJK>
-+<U492D>     /x82/x34/x94/x33 <CJK>
-+<U492E>     /x82/x34/x94/x34 <CJK>
-+<U492F>     /x82/x34/x94/x35 <CJK>
-+<U4930>     /x82/x34/x94/x36 <CJK>
-+<U4931>     /x82/x34/x94/x37 <CJK>
-+<U4932>     /x82/x34/x94/x38 <CJK>
-+<U4933>     /x82/x34/x94/x39 <CJK>
-+<U4934>     /x82/x34/x95/x30 <CJK>
-+<U4935>     /x82/x34/x95/x31 <CJK>
-+<U4936>     /x82/x34/x95/x32 <CJK>
-+<U4937>     /x82/x34/x95/x33 <CJK>
-+<U4938>     /x82/x34/x95/x34 <CJK>
-+<U4939>     /x82/x34/x95/x35 <CJK>
-+<U493A>     /x82/x34/x95/x36 <CJK>
-+<U493B>     /x82/x34/x95/x37 <CJK>
-+<U493C>     /x82/x34/x95/x38 <CJK>
-+<U493D>     /x82/x34/x95/x39 <CJK>
-+<U493E>     /x82/x34/x96/x30 <CJK>
-+<U493F>     /x82/x34/x96/x31 <CJK>
-+<U4940>     /x82/x34/x96/x32 <CJK>
-+<U4941>     /x82/x34/x96/x33 <CJK>
-+<U4942>     /x82/x34/x96/x34 <CJK>
-+<U4943>     /x82/x34/x96/x35 <CJK>
-+<U4944>     /x82/x34/x96/x36 <CJK>
-+<U4945>     /x82/x34/x96/x37 <CJK>
-+<U4946>     /x82/x34/x96/x38 <CJK>
- <U4947>     /xfe/x85         <CJK>
- <U4948>     /x82/x34/x96/x39 <CJK>
- <U4949>     /x82/x34/x97/x30 <CJK>
-@@ -6534,6 +18877,709 @@ CHARMAP
- <U49B5>     /x82/x34/xa1/x30 <CJK>
- <U49B6>     /xfe/x8f         <CJK>
- <U49B7>     /xfe/x8e         <CJK>
-+<U49B8>     /x82/x34/xa1/x31 <CJK>
-+<U49B9>     /x82/x34/xa1/x32 <CJK>
-+<U49BA>     /x82/x34/xa1/x33 <CJK>
-+<U49BB>     /x82/x34/xa1/x34 <CJK>
-+<U49BC>     /x82/x34/xa1/x35 <CJK>
-+<U49BD>     /x82/x34/xa1/x36 <CJK>
-+<U49BE>     /x82/x34/xa1/x37 <CJK>
-+<U49BF>     /x82/x34/xa1/x38 <CJK>
-+<U49C0>     /x82/x34/xa1/x39 <CJK>
-+<U49C1>     /x82/x34/xa2/x30 <CJK>
-+<U49C2>     /x82/x34/xa2/x31 <CJK>
-+<U49C3>     /x82/x34/xa2/x32 <CJK>
-+<U49C4>     /x82/x34/xa2/x33 <CJK>
-+<U49C5>     /x82/x34/xa2/x34 <CJK>
-+<U49C6>     /x82/x34/xa2/x35 <CJK>
-+<U49C7>     /x82/x34/xa2/x36 <CJK>
-+<U49C8>     /x82/x34/xa2/x37 <CJK>
-+<U49C9>     /x82/x34/xa2/x38 <CJK>
-+<U49CA>     /x82/x34/xa2/x39 <CJK>
-+<U49CB>     /x82/x34/xa3/x30 <CJK>
-+<U49CC>     /x82/x34/xa3/x31 <CJK>
-+<U49CD>     /x82/x34/xa3/x32 <CJK>
-+<U49CE>     /x82/x34/xa3/x33 <CJK>
-+<U49CF>     /x82/x34/xa3/x34 <CJK>
-+<U49D0>     /x82/x34/xa3/x35 <CJK>
-+<U49D1>     /x82/x34/xa3/x36 <CJK>
-+<U49D2>     /x82/x34/xa3/x37 <CJK>
-+<U49D3>     /x82/x34/xa3/x38 <CJK>
-+<U49D4>     /x82/x34/xa3/x39 <CJK>
-+<U49D5>     /x82/x34/xa4/x30 <CJK>
-+<U49D6>     /x82/x34/xa4/x31 <CJK>
-+<U49D7>     /x82/x34/xa4/x32 <CJK>
-+<U49D8>     /x82/x34/xa4/x33 <CJK>
-+<U49D9>     /x82/x34/xa4/x34 <CJK>
-+<U49DA>     /x82/x34/xa4/x35 <CJK>
-+<U49DB>     /x82/x34/xa4/x36 <CJK>
-+<U49DC>     /x82/x34/xa4/x37 <CJK>
-+<U49DD>     /x82/x34/xa4/x38 <CJK>
-+<U49DE>     /x82/x34/xa4/x39 <CJK>
-+<U49DF>     /x82/x34/xa5/x30 <CJK>
-+<U49E0>     /x82/x34/xa5/x31 <CJK>
-+<U49E1>     /x82/x34/xa5/x32 <CJK>
-+<U49E2>     /x82/x34/xa5/x33 <CJK>
-+<U49E3>     /x82/x34/xa5/x34 <CJK>
-+<U49E4>     /x82/x34/xa5/x35 <CJK>
-+<U49E5>     /x82/x34/xa5/x36 <CJK>
-+<U49E6>     /x82/x34/xa5/x37 <CJK>
-+<U49E7>     /x82/x34/xa5/x38 <CJK>
-+<U49E8>     /x82/x34/xa5/x39 <CJK>
-+<U49E9>     /x82/x34/xa6/x30 <CJK>
-+<U49EA>     /x82/x34/xa6/x31 <CJK>
-+<U49EB>     /x82/x34/xa6/x32 <CJK>
-+<U49EC>     /x82/x34/xa6/x33 <CJK>
-+<U49ED>     /x82/x34/xa6/x34 <CJK>
-+<U49EE>     /x82/x34/xa6/x35 <CJK>
-+<U49EF>     /x82/x34/xa6/x36 <CJK>
-+<U49F0>     /x82/x34/xa6/x37 <CJK>
-+<U49F1>     /x82/x34/xa6/x38 <CJK>
-+<U49F2>     /x82/x34/xa6/x39 <CJK>
-+<U49F3>     /x82/x34/xa7/x30 <CJK>
-+<U49F4>     /x82/x34/xa7/x31 <CJK>
-+<U49F5>     /x82/x34/xa7/x32 <CJK>
-+<U49F6>     /x82/x34/xa7/x33 <CJK>
-+<U49F7>     /x82/x34/xa7/x34 <CJK>
-+<U49F8>     /x82/x34/xa7/x35 <CJK>
-+<U49F9>     /x82/x34/xa7/x36 <CJK>
-+<U49FA>     /x82/x34/xa7/x37 <CJK>
-+<U49FB>     /x82/x34/xa7/x38 <CJK>
-+<U49FC>     /x82/x34/xa7/x39 <CJK>
-+<U49FD>     /x82/x34/xa8/x30 <CJK>
-+<U49FE>     /x82/x34/xa8/x31 <CJK>
-+<U49FF>     /x82/x34/xa8/x32 <CJK>
-+<U4A00>     /x82/x34/xa8/x33 <CJK>
-+<U4A01>     /x82/x34/xa8/x34 <CJK>
-+<U4A02>     /x82/x34/xa8/x35 <CJK>
-+<U4A03>     /x82/x34/xa8/x36 <CJK>
-+<U4A04>     /x82/x34/xa8/x37 <CJK>
-+<U4A05>     /x82/x34/xa8/x38 <CJK>
-+<U4A06>     /x82/x34/xa8/x39 <CJK>
-+<U4A07>     /x82/x34/xa9/x30 <CJK>
-+<U4A08>     /x82/x34/xa9/x31 <CJK>
-+<U4A09>     /x82/x34/xa9/x32 <CJK>
-+<U4A0A>     /x82/x34/xa9/x33 <CJK>
-+<U4A0B>     /x82/x34/xa9/x34 <CJK>
-+<U4A0C>     /x82/x34/xa9/x35 <CJK>
-+<U4A0D>     /x82/x34/xa9/x36 <CJK>
-+<U4A0E>     /x82/x34/xa9/x37 <CJK>
-+<U4A0F>     /x82/x34/xa9/x38 <CJK>
-+<U4A10>     /x82/x34/xa9/x39 <CJK>
-+<U4A11>     /x82/x34/xaa/x30 <CJK>
-+<U4A12>     /x82/x34/xaa/x31 <CJK>
-+<U4A13>     /x82/x34/xaa/x32 <CJK>
-+<U4A14>     /x82/x34/xaa/x33 <CJK>
-+<U4A15>     /x82/x34/xaa/x34 <CJK>
-+<U4A16>     /x82/x34/xaa/x35 <CJK>
-+<U4A17>     /x82/x34/xaa/x36 <CJK>
-+<U4A18>     /x82/x34/xaa/x37 <CJK>
-+<U4A19>     /x82/x34/xaa/x38 <CJK>
-+<U4A1A>     /x82/x34/xaa/x39 <CJK>
-+<U4A1B>     /x82/x34/xab/x30 <CJK>
-+<U4A1C>     /x82/x34/xab/x31 <CJK>
-+<U4A1D>     /x82/x34/xab/x32 <CJK>
-+<U4A1E>     /x82/x34/xab/x33 <CJK>
-+<U4A1F>     /x82/x34/xab/x34 <CJK>
-+<U4A20>     /x82/x34/xab/x35 <CJK>
-+<U4A21>     /x82/x34/xab/x36 <CJK>
-+<U4A22>     /x82/x34/xab/x37 <CJK>
-+<U4A23>     /x82/x34/xab/x38 <CJK>
-+<U4A24>     /x82/x34/xab/x39 <CJK>
-+<U4A25>     /x82/x34/xac/x30 <CJK>
-+<U4A26>     /x82/x34/xac/x31 <CJK>
-+<U4A27>     /x82/x34/xac/x32 <CJK>
-+<U4A28>     /x82/x34/xac/x33 <CJK>
-+<U4A29>     /x82/x34/xac/x34 <CJK>
-+<U4A2A>     /x82/x34/xac/x35 <CJK>
-+<U4A2B>     /x82/x34/xac/x36 <CJK>
-+<U4A2C>     /x82/x34/xac/x37 <CJK>
-+<U4A2D>     /x82/x34/xac/x38 <CJK>
-+<U4A2E>     /x82/x34/xac/x39 <CJK>
-+<U4A2F>     /x82/x34/xad/x30 <CJK>
-+<U4A30>     /x82/x34/xad/x31 <CJK>
-+<U4A31>     /x82/x34/xad/x32 <CJK>
-+<U4A32>     /x82/x34/xad/x33 <CJK>
-+<U4A33>     /x82/x34/xad/x34 <CJK>
-+<U4A34>     /x82/x34/xad/x35 <CJK>
-+<U4A35>     /x82/x34/xad/x36 <CJK>
-+<U4A36>     /x82/x34/xad/x37 <CJK>
-+<U4A37>     /x82/x34/xad/x38 <CJK>
-+<U4A38>     /x82/x34/xad/x39 <CJK>
-+<U4A39>     /x82/x34/xae/x30 <CJK>
-+<U4A3A>     /x82/x34/xae/x31 <CJK>
-+<U4A3B>     /x82/x34/xae/x32 <CJK>
-+<U4A3C>     /x82/x34/xae/x33 <CJK>
-+<U4A3D>     /x82/x34/xae/x34 <CJK>
-+<U4A3E>     /x82/x34/xae/x35 <CJK>
-+<U4A3F>     /x82/x34/xae/x36 <CJK>
-+<U4A40>     /x82/x34/xae/x37 <CJK>
-+<U4A41>     /x82/x34/xae/x38 <CJK>
-+<U4A42>     /x82/x34/xae/x39 <CJK>
-+<U4A43>     /x82/x34/xaf/x30 <CJK>
-+<U4A44>     /x82/x34/xaf/x31 <CJK>
-+<U4A45>     /x82/x34/xaf/x32 <CJK>
-+<U4A46>     /x82/x34/xaf/x33 <CJK>
-+<U4A47>     /x82/x34/xaf/x34 <CJK>
-+<U4A48>     /x82/x34/xaf/x35 <CJK>
-+<U4A49>     /x82/x34/xaf/x36 <CJK>
-+<U4A4A>     /x82/x34/xaf/x37 <CJK>
-+<U4A4B>     /x82/x34/xaf/x38 <CJK>
-+<U4A4C>     /x82/x34/xaf/x39 <CJK>
-+<U4A4D>     /x82/x34/xb0/x30 <CJK>
-+<U4A4E>     /x82/x34/xb0/x31 <CJK>
-+<U4A4F>     /x82/x34/xb0/x32 <CJK>
-+<U4A50>     /x82/x34/xb0/x33 <CJK>
-+<U4A51>     /x82/x34/xb0/x34 <CJK>
-+<U4A52>     /x82/x34/xb0/x35 <CJK>
-+<U4A53>     /x82/x34/xb0/x36 <CJK>
-+<U4A54>     /x82/x34/xb0/x37 <CJK>
-+<U4A55>     /x82/x34/xb0/x38 <CJK>
-+<U4A56>     /x82/x34/xb0/x39 <CJK>
-+<U4A57>     /x82/x34/xb1/x30 <CJK>
-+<U4A58>     /x82/x34/xb1/x31 <CJK>
-+<U4A59>     /x82/x34/xb1/x32 <CJK>
-+<U4A5A>     /x82/x34/xb1/x33 <CJK>
-+<U4A5B>     /x82/x34/xb1/x34 <CJK>
-+<U4A5C>     /x82/x34/xb1/x35 <CJK>
-+<U4A5D>     /x82/x34/xb1/x36 <CJK>
-+<U4A5E>     /x82/x34/xb1/x37 <CJK>
-+<U4A5F>     /x82/x34/xb1/x38 <CJK>
-+<U4A60>     /x82/x34/xb1/x39 <CJK>
-+<U4A61>     /x82/x34/xb2/x30 <CJK>
-+<U4A62>     /x82/x34/xb2/x31 <CJK>
-+<U4A63>     /x82/x34/xb2/x32 <CJK>
-+<U4A64>     /x82/x34/xb2/x33 <CJK>
-+<U4A65>     /x82/x34/xb2/x34 <CJK>
-+<U4A66>     /x82/x34/xb2/x35 <CJK>
-+<U4A67>     /x82/x34/xb2/x36 <CJK>
-+<U4A68>     /x82/x34/xb2/x37 <CJK>
-+<U4A69>     /x82/x34/xb2/x38 <CJK>
-+<U4A6A>     /x82/x34/xb2/x39 <CJK>
-+<U4A6B>     /x82/x34/xb3/x30 <CJK>
-+<U4A6C>     /x82/x34/xb3/x31 <CJK>
-+<U4A6D>     /x82/x34/xb3/x32 <CJK>
-+<U4A6E>     /x82/x34/xb3/x33 <CJK>
-+<U4A6F>     /x82/x34/xb3/x34 <CJK>
-+<U4A70>     /x82/x34/xb3/x35 <CJK>
-+<U4A71>     /x82/x34/xb3/x36 <CJK>
-+<U4A72>     /x82/x34/xb3/x37 <CJK>
-+<U4A73>     /x82/x34/xb3/x38 <CJK>
-+<U4A74>     /x82/x34/xb3/x39 <CJK>
-+<U4A75>     /x82/x34/xb4/x30 <CJK>
-+<U4A76>     /x82/x34/xb4/x31 <CJK>
-+<U4A77>     /x82/x34/xb4/x32 <CJK>
-+<U4A78>     /x82/x34/xb4/x33 <CJK>
-+<U4A79>     /x82/x34/xb4/x34 <CJK>
-+<U4A7A>     /x82/x34/xb4/x35 <CJK>
-+<U4A7B>     /x82/x34/xb4/x36 <CJK>
-+<U4A7C>     /x82/x34/xb4/x37 <CJK>
-+<U4A7D>     /x82/x34/xb4/x38 <CJK>
-+<U4A7E>     /x82/x34/xb4/x39 <CJK>
-+<U4A7F>     /x82/x34/xb5/x30 <CJK>
-+<U4A80>     /x82/x34/xb5/x31 <CJK>
-+<U4A81>     /x82/x34/xb5/x32 <CJK>
-+<U4A82>     /x82/x34/xb5/x33 <CJK>
-+<U4A83>     /x82/x34/xb5/x34 <CJK>
-+<U4A84>     /x82/x34/xb5/x35 <CJK>
-+<U4A85>     /x82/x34/xb5/x36 <CJK>
-+<U4A86>     /x82/x34/xb5/x37 <CJK>
-+<U4A87>     /x82/x34/xb5/x38 <CJK>
-+<U4A88>     /x82/x34/xb5/x39 <CJK>
-+<U4A89>     /x82/x34/xb6/x30 <CJK>
-+<U4A8A>     /x82/x34/xb6/x31 <CJK>
-+<U4A8B>     /x82/x34/xb6/x32 <CJK>
-+<U4A8C>     /x82/x34/xb6/x33 <CJK>
-+<U4A8D>     /x82/x34/xb6/x34 <CJK>
-+<U4A8E>     /x82/x34/xb6/x35 <CJK>
-+<U4A8F>     /x82/x34/xb6/x36 <CJK>
-+<U4A90>     /x82/x34/xb6/x37 <CJK>
-+<U4A91>     /x82/x34/xb6/x38 <CJK>
-+<U4A92>     /x82/x34/xb6/x39 <CJK>
-+<U4A93>     /x82/x34/xb7/x30 <CJK>
-+<U4A94>     /x82/x34/xb7/x31 <CJK>
-+<U4A95>     /x82/x34/xb7/x32 <CJK>
-+<U4A96>     /x82/x34/xb7/x33 <CJK>
-+<U4A97>     /x82/x34/xb7/x34 <CJK>
-+<U4A98>     /x82/x34/xb7/x35 <CJK>
-+<U4A99>     /x82/x34/xb7/x36 <CJK>
-+<U4A9A>     /x82/x34/xb7/x37 <CJK>
-+<U4A9B>     /x82/x34/xb7/x38 <CJK>
-+<U4A9C>     /x82/x34/xb7/x39 <CJK>
-+<U4A9D>     /x82/x34/xb8/x30 <CJK>
-+<U4A9E>     /x82/x34/xb8/x31 <CJK>
-+<U4A9F>     /x82/x34/xb8/x32 <CJK>
-+<U4AA0>     /x82/x34/xb8/x33 <CJK>
-+<U4AA1>     /x82/x34/xb8/x34 <CJK>
-+<U4AA2>     /x82/x34/xb8/x35 <CJK>
-+<U4AA3>     /x82/x34/xb8/x36 <CJK>
-+<U4AA4>     /x82/x34/xb8/x37 <CJK>
-+<U4AA5>     /x82/x34/xb8/x38 <CJK>
-+<U4AA6>     /x82/x34/xb8/x39 <CJK>
-+<U4AA7>     /x82/x34/xb9/x30 <CJK>
-+<U4AA8>     /x82/x34/xb9/x31 <CJK>
-+<U4AA9>     /x82/x34/xb9/x32 <CJK>
-+<U4AAA>     /x82/x34/xb9/x33 <CJK>
-+<U4AAB>     /x82/x34/xb9/x34 <CJK>
-+<U4AAC>     /x82/x34/xb9/x35 <CJK>
-+<U4AAD>     /x82/x34/xb9/x36 <CJK>
-+<U4AAE>     /x82/x34/xb9/x37 <CJK>
-+<U4AAF>     /x82/x34/xb9/x38 <CJK>
-+<U4AB0>     /x82/x34/xb9/x39 <CJK>
-+<U4AB1>     /x82/x34/xba/x30 <CJK>
-+<U4AB2>     /x82/x34/xba/x31 <CJK>
-+<U4AB3>     /x82/x34/xba/x32 <CJK>
-+<U4AB4>     /x82/x34/xba/x33 <CJK>
-+<U4AB5>     /x82/x34/xba/x34 <CJK>
-+<U4AB6>     /x82/x34/xba/x35 <CJK>
-+<U4AB7>     /x82/x34/xba/x36 <CJK>
-+<U4AB8>     /x82/x34/xba/x37 <CJK>
-+<U4AB9>     /x82/x34/xba/x38 <CJK>
-+<U4ABA>     /x82/x34/xba/x39 <CJK>
-+<U4ABB>     /x82/x34/xbb/x30 <CJK>
-+<U4ABC>     /x82/x34/xbb/x31 <CJK>
-+<U4ABD>     /x82/x34/xbb/x32 <CJK>
-+<U4ABE>     /x82/x34/xbb/x33 <CJK>
-+<U4ABF>     /x82/x34/xbb/x34 <CJK>
-+<U4AC0>     /x82/x34/xbb/x35 <CJK>
-+<U4AC1>     /x82/x34/xbb/x36 <CJK>
-+<U4AC2>     /x82/x34/xbb/x37 <CJK>
-+<U4AC3>     /x82/x34/xbb/x38 <CJK>
-+<U4AC4>     /x82/x34/xbb/x39 <CJK>
-+<U4AC5>     /x82/x34/xbc/x30 <CJK>
-+<U4AC6>     /x82/x34/xbc/x31 <CJK>
-+<U4AC7>     /x82/x34/xbc/x32 <CJK>
-+<U4AC8>     /x82/x34/xbc/x33 <CJK>
-+<U4AC9>     /x82/x34/xbc/x34 <CJK>
-+<U4ACA>     /x82/x34/xbc/x35 <CJK>
-+<U4ACB>     /x82/x34/xbc/x36 <CJK>
-+<U4ACC>     /x82/x34/xbc/x37 <CJK>
-+<U4ACD>     /x82/x34/xbc/x38 <CJK>
-+<U4ACE>     /x82/x34/xbc/x39 <CJK>
-+<U4ACF>     /x82/x34/xbd/x30 <CJK>
-+<U4AD0>     /x82/x34/xbd/x31 <CJK>
-+<U4AD1>     /x82/x34/xbd/x32 <CJK>
-+<U4AD2>     /x82/x34/xbd/x33 <CJK>
-+<U4AD3>     /x82/x34/xbd/x34 <CJK>
-+<U4AD4>     /x82/x34/xbd/x35 <CJK>
-+<U4AD5>     /x82/x34/xbd/x36 <CJK>
-+<U4AD6>     /x82/x34/xbd/x37 <CJK>
-+<U4AD7>     /x82/x34/xbd/x38 <CJK>
-+<U4AD8>     /x82/x34/xbd/x39 <CJK>
-+<U4AD9>     /x82/x34/xbe/x30 <CJK>
-+<U4ADA>     /x82/x34/xbe/x31 <CJK>
-+<U4ADB>     /x82/x34/xbe/x32 <CJK>
-+<U4ADC>     /x82/x34/xbe/x33 <CJK>
-+<U4ADD>     /x82/x34/xbe/x34 <CJK>
-+<U4ADE>     /x82/x34/xbe/x35 <CJK>
-+<U4ADF>     /x82/x34/xbe/x36 <CJK>
-+<U4AE0>     /x82/x34/xbe/x37 <CJK>
-+<U4AE1>     /x82/x34/xbe/x38 <CJK>
-+<U4AE2>     /x82/x34/xbe/x39 <CJK>
-+<U4AE3>     /x82/x34/xbf/x30 <CJK>
-+<U4AE4>     /x82/x34/xbf/x31 <CJK>
-+<U4AE5>     /x82/x34/xbf/x32 <CJK>
-+<U4AE6>     /x82/x34/xbf/x33 <CJK>
-+<U4AE7>     /x82/x34/xbf/x34 <CJK>
-+<U4AE8>     /x82/x34/xbf/x35 <CJK>
-+<U4AE9>     /x82/x34/xbf/x36 <CJK>
-+<U4AEA>     /x82/x34/xbf/x37 <CJK>
-+<U4AEB>     /x82/x34/xbf/x38 <CJK>
-+<U4AEC>     /x82/x34/xbf/x39 <CJK>
-+<U4AED>     /x82/x34/xc0/x30 <CJK>
-+<U4AEE>     /x82/x34/xc0/x31 <CJK>
-+<U4AEF>     /x82/x34/xc0/x32 <CJK>
-+<U4AF0>     /x82/x34/xc0/x33 <CJK>
-+<U4AF1>     /x82/x34/xc0/x34 <CJK>
-+<U4AF2>     /x82/x34/xc0/x35 <CJK>
-+<U4AF3>     /x82/x34/xc0/x36 <CJK>
-+<U4AF4>     /x82/x34/xc0/x37 <CJK>
-+<U4AF5>     /x82/x34/xc0/x38 <CJK>
-+<U4AF6>     /x82/x34/xc0/x39 <CJK>
-+<U4AF7>     /x82/x34/xc1/x30 <CJK>
-+<U4AF8>     /x82/x34/xc1/x31 <CJK>
-+<U4AF9>     /x82/x34/xc1/x32 <CJK>
-+<U4AFA>     /x82/x34/xc1/x33 <CJK>
-+<U4AFB>     /x82/x34/xc1/x34 <CJK>
-+<U4AFC>     /x82/x34/xc1/x35 <CJK>
-+<U4AFD>     /x82/x34/xc1/x36 <CJK>
-+<U4AFE>     /x82/x34/xc1/x37 <CJK>
-+<U4AFF>     /x82/x34/xc1/x38 <CJK>
-+<U4B00>     /x82/x34/xc1/x39 <CJK>
-+<U4B01>     /x82/x34/xc2/x30 <CJK>
-+<U4B02>     /x82/x34/xc2/x31 <CJK>
-+<U4B03>     /x82/x34/xc2/x32 <CJK>
-+<U4B04>     /x82/x34/xc2/x33 <CJK>
-+<U4B05>     /x82/x34/xc2/x34 <CJK>
-+<U4B06>     /x82/x34/xc2/x35 <CJK>
-+<U4B07>     /x82/x34/xc2/x36 <CJK>
-+<U4B08>     /x82/x34/xc2/x37 <CJK>
-+<U4B09>     /x82/x34/xc2/x38 <CJK>
-+<U4B0A>     /x82/x34/xc2/x39 <CJK>
-+<U4B0B>     /x82/x34/xc3/x30 <CJK>
-+<U4B0C>     /x82/x34/xc3/x31 <CJK>
-+<U4B0D>     /x82/x34/xc3/x32 <CJK>
-+<U4B0E>     /x82/x34/xc3/x33 <CJK>
-+<U4B0F>     /x82/x34/xc3/x34 <CJK>
-+<U4B10>     /x82/x34/xc3/x35 <CJK>
-+<U4B11>     /x82/x34/xc3/x36 <CJK>
-+<U4B12>     /x82/x34/xc3/x37 <CJK>
-+<U4B13>     /x82/x34/xc3/x38 <CJK>
-+<U4B14>     /x82/x34/xc3/x39 <CJK>
-+<U4B15>     /x82/x34/xc4/x30 <CJK>
-+<U4B16>     /x82/x34/xc4/x31 <CJK>
-+<U4B17>     /x82/x34/xc4/x32 <CJK>
-+<U4B18>     /x82/x34/xc4/x33 <CJK>
-+<U4B19>     /x82/x34/xc4/x34 <CJK>
-+<U4B1A>     /x82/x34/xc4/x35 <CJK>
-+<U4B1B>     /x82/x34/xc4/x36 <CJK>
-+<U4B1C>     /x82/x34/xc4/x37 <CJK>
-+<U4B1D>     /x82/x34/xc4/x38 <CJK>
-+<U4B1E>     /x82/x34/xc4/x39 <CJK>
-+<U4B1F>     /x82/x34/xc5/x30 <CJK>
-+<U4B20>     /x82/x34/xc5/x31 <CJK>
-+<U4B21>     /x82/x34/xc5/x32 <CJK>
-+<U4B22>     /x82/x34/xc5/x33 <CJK>
-+<U4B23>     /x82/x34/xc5/x34 <CJK>
-+<U4B24>     /x82/x34/xc5/x35 <CJK>
-+<U4B25>     /x82/x34/xc5/x36 <CJK>
-+<U4B26>     /x82/x34/xc5/x37 <CJK>
-+<U4B27>     /x82/x34/xc5/x38 <CJK>
-+<U4B28>     /x82/x34/xc5/x39 <CJK>
-+<U4B29>     /x82/x34/xc6/x30 <CJK>
-+<U4B2A>     /x82/x34/xc6/x31 <CJK>
-+<U4B2B>     /x82/x34/xc6/x32 <CJK>
-+<U4B2C>     /x82/x34/xc6/x33 <CJK>
-+<U4B2D>     /x82/x34/xc6/x34 <CJK>
-+<U4B2E>     /x82/x34/xc6/x35 <CJK>
-+<U4B2F>     /x82/x34/xc6/x36 <CJK>
-+<U4B30>     /x82/x34/xc6/x37 <CJK>
-+<U4B31>     /x82/x34/xc6/x38 <CJK>
-+<U4B32>     /x82/x34/xc6/x39 <CJK>
-+<U4B33>     /x82/x34/xc7/x30 <CJK>
-+<U4B34>     /x82/x34/xc7/x31 <CJK>
-+<U4B35>     /x82/x34/xc7/x32 <CJK>
-+<U4B36>     /x82/x34/xc7/x33 <CJK>
-+<U4B37>     /x82/x34/xc7/x34 <CJK>
-+<U4B38>     /x82/x34/xc7/x35 <CJK>
-+<U4B39>     /x82/x34/xc7/x36 <CJK>
-+<U4B3A>     /x82/x34/xc7/x37 <CJK>
-+<U4B3B>     /x82/x34/xc7/x38 <CJK>
-+<U4B3C>     /x82/x34/xc7/x39 <CJK>
-+<U4B3D>     /x82/x34/xc8/x30 <CJK>
-+<U4B3E>     /x82/x34/xc8/x31 <CJK>
-+<U4B3F>     /x82/x34/xc8/x32 <CJK>
-+<U4B40>     /x82/x34/xc8/x33 <CJK>
-+<U4B41>     /x82/x34/xc8/x34 <CJK>
-+<U4B42>     /x82/x34/xc8/x35 <CJK>
-+<U4B43>     /x82/x34/xc8/x36 <CJK>
-+<U4B44>     /x82/x34/xc8/x37 <CJK>
-+<U4B45>     /x82/x34/xc8/x38 <CJK>
-+<U4B46>     /x82/x34/xc8/x39 <CJK>
-+<U4B47>     /x82/x34/xc9/x30 <CJK>
-+<U4B48>     /x82/x34/xc9/x31 <CJK>
-+<U4B49>     /x82/x34/xc9/x32 <CJK>
-+<U4B4A>     /x82/x34/xc9/x33 <CJK>
-+<U4B4B>     /x82/x34/xc9/x34 <CJK>
-+<U4B4C>     /x82/x34/xc9/x35 <CJK>
-+<U4B4D>     /x82/x34/xc9/x36 <CJK>
-+<U4B4E>     /x82/x34/xc9/x37 <CJK>
-+<U4B4F>     /x82/x34/xc9/x38 <CJK>
-+<U4B50>     /x82/x34/xc9/x39 <CJK>
-+<U4B51>     /x82/x34/xca/x30 <CJK>
-+<U4B52>     /x82/x34/xca/x31 <CJK>
-+<U4B53>     /x82/x34/xca/x32 <CJK>
-+<U4B54>     /x82/x34/xca/x33 <CJK>
-+<U4B55>     /x82/x34/xca/x34 <CJK>
-+<U4B56>     /x82/x34/xca/x35 <CJK>
-+<U4B57>     /x82/x34/xca/x36 <CJK>
-+<U4B58>     /x82/x34/xca/x37 <CJK>
-+<U4B59>     /x82/x34/xca/x38 <CJK>
-+<U4B5A>     /x82/x34/xca/x39 <CJK>
-+<U4B5B>     /x82/x34/xcb/x30 <CJK>
-+<U4B5C>     /x82/x34/xcb/x31 <CJK>
-+<U4B5D>     /x82/x34/xcb/x32 <CJK>
-+<U4B5E>     /x82/x34/xcb/x33 <CJK>
-+<U4B5F>     /x82/x34/xcb/x34 <CJK>
-+<U4B60>     /x82/x34/xcb/x35 <CJK>
-+<U4B61>     /x82/x34/xcb/x36 <CJK>
-+<U4B62>     /x82/x34/xcb/x37 <CJK>
-+<U4B63>     /x82/x34/xcb/x38 <CJK>
-+<U4B64>     /x82/x34/xcb/x39 <CJK>
-+<U4B65>     /x82/x34/xcc/x30 <CJK>
-+<U4B66>     /x82/x34/xcc/x31 <CJK>
-+<U4B67>     /x82/x34/xcc/x32 <CJK>
-+<U4B68>     /x82/x34/xcc/x33 <CJK>
-+<U4B69>     /x82/x34/xcc/x34 <CJK>
-+<U4B6A>     /x82/x34/xcc/x35 <CJK>
-+<U4B6B>     /x82/x34/xcc/x36 <CJK>
-+<U4B6C>     /x82/x34/xcc/x37 <CJK>
-+<U4B6D>     /x82/x34/xcc/x38 <CJK>
-+<U4B6E>     /x82/x34/xcc/x39 <CJK>
-+<U4B6F>     /x82/x34/xcd/x30 <CJK>
-+<U4B70>     /x82/x34/xcd/x31 <CJK>
-+<U4B71>     /x82/x34/xcd/x32 <CJK>
-+<U4B72>     /x82/x34/xcd/x33 <CJK>
-+<U4B73>     /x82/x34/xcd/x34 <CJK>
-+<U4B74>     /x82/x34/xcd/x35 <CJK>
-+<U4B75>     /x82/x34/xcd/x36 <CJK>
-+<U4B76>     /x82/x34/xcd/x37 <CJK>
-+<U4B77>     /x82/x34/xcd/x38 <CJK>
-+<U4B78>     /x82/x34/xcd/x39 <CJK>
-+<U4B79>     /x82/x34/xce/x30 <CJK>
-+<U4B7A>     /x82/x34/xce/x31 <CJK>
-+<U4B7B>     /x82/x34/xce/x32 <CJK>
-+<U4B7C>     /x82/x34/xce/x33 <CJK>
-+<U4B7D>     /x82/x34/xce/x34 <CJK>
-+<U4B7E>     /x82/x34/xce/x35 <CJK>
-+<U4B7F>     /x82/x34/xce/x36 <CJK>
-+<U4B80>     /x82/x34/xce/x37 <CJK>
-+<U4B81>     /x82/x34/xce/x38 <CJK>
-+<U4B82>     /x82/x34/xce/x39 <CJK>
-+<U4B83>     /x82/x34/xcf/x30 <CJK>
-+<U4B84>     /x82/x34/xcf/x31 <CJK>
-+<U4B85>     /x82/x34/xcf/x32 <CJK>
-+<U4B86>     /x82/x34/xcf/x33 <CJK>
-+<U4B87>     /x82/x34/xcf/x34 <CJK>
-+<U4B88>     /x82/x34/xcf/x35 <CJK>
-+<U4B89>     /x82/x34/xcf/x36 <CJK>
-+<U4B8A>     /x82/x34/xcf/x37 <CJK>
-+<U4B8B>     /x82/x34/xcf/x38 <CJK>
-+<U4B8C>     /x82/x34/xcf/x39 <CJK>
-+<U4B8D>     /x82/x34/xd0/x30 <CJK>
-+<U4B8E>     /x82/x34/xd0/x31 <CJK>
-+<U4B8F>     /x82/x34/xd0/x32 <CJK>
-+<U4B90>     /x82/x34/xd0/x33 <CJK>
-+<U4B91>     /x82/x34/xd0/x34 <CJK>
-+<U4B92>     /x82/x34/xd0/x35 <CJK>
-+<U4B93>     /x82/x34/xd0/x36 <CJK>
-+<U4B94>     /x82/x34/xd0/x37 <CJK>
-+<U4B95>     /x82/x34/xd0/x38 <CJK>
-+<U4B96>     /x82/x34/xd0/x39 <CJK>
-+<U4B97>     /x82/x34/xd1/x30 <CJK>
-+<U4B98>     /x82/x34/xd1/x31 <CJK>
-+<U4B99>     /x82/x34/xd1/x32 <CJK>
-+<U4B9A>     /x82/x34/xd1/x33 <CJK>
-+<U4B9B>     /x82/x34/xd1/x34 <CJK>
-+<U4B9C>     /x82/x34/xd1/x35 <CJK>
-+<U4B9D>     /x82/x34/xd1/x36 <CJK>
-+<U4B9E>     /x82/x34/xd1/x37 <CJK>
-+<U4B9F>     /x82/x34/xd1/x38 <CJK>
-+<U4BA0>     /x82/x34/xd1/x39 <CJK>
-+<U4BA1>     /x82/x34/xd2/x30 <CJK>
-+<U4BA2>     /x82/x34/xd2/x31 <CJK>
-+<U4BA3>     /x82/x34/xd2/x32 <CJK>
-+<U4BA4>     /x82/x34/xd2/x33 <CJK>
-+<U4BA5>     /x82/x34/xd2/x34 <CJK>
-+<U4BA6>     /x82/x34/xd2/x35 <CJK>
-+<U4BA7>     /x82/x34/xd2/x36 <CJK>
-+<U4BA8>     /x82/x34/xd2/x37 <CJK>
-+<U4BA9>     /x82/x34/xd2/x38 <CJK>
-+<U4BAA>     /x82/x34/xd2/x39 <CJK>
-+<U4BAB>     /x82/x34/xd3/x30 <CJK>
-+<U4BAC>     /x82/x34/xd3/x31 <CJK>
-+<U4BAD>     /x82/x34/xd3/x32 <CJK>
-+<U4BAE>     /x82/x34/xd3/x33 <CJK>
-+<U4BAF>     /x82/x34/xd3/x34 <CJK>
-+<U4BB0>     /x82/x34/xd3/x35 <CJK>
-+<U4BB1>     /x82/x34/xd3/x36 <CJK>
-+<U4BB2>     /x82/x34/xd3/x37 <CJK>
-+<U4BB3>     /x82/x34/xd3/x38 <CJK>
-+<U4BB4>     /x82/x34/xd3/x39 <CJK>
-+<U4BB5>     /x82/x34/xd4/x30 <CJK>
-+<U4BB6>     /x82/x34/xd4/x31 <CJK>
-+<U4BB7>     /x82/x34/xd4/x32 <CJK>
-+<U4BB8>     /x82/x34/xd4/x33 <CJK>
-+<U4BB9>     /x82/x34/xd4/x34 <CJK>
-+<U4BBA>     /x82/x34/xd4/x35 <CJK>
-+<U4BBB>     /x82/x34/xd4/x36 <CJK>
-+<U4BBC>     /x82/x34/xd4/x37 <CJK>
-+<U4BBD>     /x82/x34/xd4/x38 <CJK>
-+<U4BBE>     /x82/x34/xd4/x39 <CJK>
-+<U4BBF>     /x82/x34/xd5/x30 <CJK>
-+<U4BC0>     /x82/x34/xd5/x31 <CJK>
-+<U4BC1>     /x82/x34/xd5/x32 <CJK>
-+<U4BC2>     /x82/x34/xd5/x33 <CJK>
-+<U4BC3>     /x82/x34/xd5/x34 <CJK>
-+<U4BC4>     /x82/x34/xd5/x35 <CJK>
-+<U4BC5>     /x82/x34/xd5/x36 <CJK>
-+<U4BC6>     /x82/x34/xd5/x37 <CJK>
-+<U4BC7>     /x82/x34/xd5/x38 <CJK>
-+<U4BC8>     /x82/x34/xd5/x39 <CJK>
-+<U4BC9>     /x82/x34/xd6/x30 <CJK>
-+<U4BCA>     /x82/x34/xd6/x31 <CJK>
-+<U4BCB>     /x82/x34/xd6/x32 <CJK>
-+<U4BCC>     /x82/x34/xd6/x33 <CJK>
-+<U4BCD>     /x82/x34/xd6/x34 <CJK>
-+<U4BCE>     /x82/x34/xd6/x35 <CJK>
-+<U4BCF>     /x82/x34/xd6/x36 <CJK>
-+<U4BD0>     /x82/x34/xd6/x37 <CJK>
-+<U4BD1>     /x82/x34/xd6/x38 <CJK>
-+<U4BD2>     /x82/x34/xd6/x39 <CJK>
-+<U4BD3>     /x82/x34/xd7/x30 <CJK>
-+<U4BD4>     /x82/x34/xd7/x31 <CJK>
-+<U4BD5>     /x82/x34/xd7/x32 <CJK>
-+<U4BD6>     /x82/x34/xd7/x33 <CJK>
-+<U4BD7>     /x82/x34/xd7/x34 <CJK>
-+<U4BD8>     /x82/x34/xd7/x35 <CJK>
-+<U4BD9>     /x82/x34/xd7/x36 <CJK>
-+<U4BDA>     /x82/x34/xd7/x37 <CJK>
-+<U4BDB>     /x82/x34/xd7/x38 <CJK>
-+<U4BDC>     /x82/x34/xd7/x39 <CJK>
-+<U4BDD>     /x82/x34/xd8/x30 <CJK>
-+<U4BDE>     /x82/x34/xd8/x31 <CJK>
-+<U4BDF>     /x82/x34/xd8/x32 <CJK>
-+<U4BE0>     /x82/x34/xd8/x33 <CJK>
-+<U4BE1>     /x82/x34/xd8/x34 <CJK>
-+<U4BE2>     /x82/x34/xd8/x35 <CJK>
-+<U4BE3>     /x82/x34/xd8/x36 <CJK>
-+<U4BE4>     /x82/x34/xd8/x37 <CJK>
-+<U4BE5>     /x82/x34/xd8/x38 <CJK>
-+<U4BE6>     /x82/x34/xd8/x39 <CJK>
-+<U4BE7>     /x82/x34/xd9/x30 <CJK>
-+<U4BE8>     /x82/x34/xd9/x31 <CJK>
-+<U4BE9>     /x82/x34/xd9/x32 <CJK>
-+<U4BEA>     /x82/x34/xd9/x33 <CJK>
-+<U4BEB>     /x82/x34/xd9/x34 <CJK>
-+<U4BEC>     /x82/x34/xd9/x35 <CJK>
-+<U4BED>     /x82/x34/xd9/x36 <CJK>
-+<U4BEE>     /x82/x34/xd9/x37 <CJK>
-+<U4BEF>     /x82/x34/xd9/x38 <CJK>
-+<U4BF0>     /x82/x34/xd9/x39 <CJK>
-+<U4BF1>     /x82/x34/xda/x30 <CJK>
-+<U4BF2>     /x82/x34/xda/x31 <CJK>
-+<U4BF3>     /x82/x34/xda/x32 <CJK>
-+<U4BF4>     /x82/x34/xda/x33 <CJK>
-+<U4BF5>     /x82/x34/xda/x34 <CJK>
-+<U4BF6>     /x82/x34/xda/x35 <CJK>
-+<U4BF7>     /x82/x34/xda/x36 <CJK>
-+<U4BF8>     /x82/x34/xda/x37 <CJK>
-+<U4BF9>     /x82/x34/xda/x38 <CJK>
-+<U4BFA>     /x82/x34/xda/x39 <CJK>
-+<U4BFB>     /x82/x34/xdb/x30 <CJK>
-+<U4BFC>     /x82/x34/xdb/x31 <CJK>
-+<U4BFD>     /x82/x34/xdb/x32 <CJK>
-+<U4BFE>     /x82/x34/xdb/x33 <CJK>
-+<U4BFF>     /x82/x34/xdb/x34 <CJK>
-+<U4C00>     /x82/x34/xdb/x35 <CJK>
-+<U4C01>     /x82/x34/xdb/x36 <CJK>
-+<U4C02>     /x82/x34/xdb/x37 <CJK>
-+<U4C03>     /x82/x34/xdb/x38 <CJK>
-+<U4C04>     /x82/x34/xdb/x39 <CJK>
-+<U4C05>     /x82/x34/xdc/x30 <CJK>
-+<U4C06>     /x82/x34/xdc/x31 <CJK>
-+<U4C07>     /x82/x34/xdc/x32 <CJK>
-+<U4C08>     /x82/x34/xdc/x33 <CJK>
-+<U4C09>     /x82/x34/xdc/x34 <CJK>
-+<U4C0A>     /x82/x34/xdc/x35 <CJK>
-+<U4C0B>     /x82/x34/xdc/x36 <CJK>
-+<U4C0C>     /x82/x34/xdc/x37 <CJK>
-+<U4C0D>     /x82/x34/xdc/x38 <CJK>
-+<U4C0E>     /x82/x34/xdc/x39 <CJK>
-+<U4C0F>     /x82/x34/xdd/x30 <CJK>
-+<U4C10>     /x82/x34/xdd/x31 <CJK>
-+<U4C11>     /x82/x34/xdd/x32 <CJK>
-+<U4C12>     /x82/x34/xdd/x33 <CJK>
-+<U4C13>     /x82/x34/xdd/x34 <CJK>
-+<U4C14>     /x82/x34/xdd/x35 <CJK>
-+<U4C15>     /x82/x34/xdd/x36 <CJK>
-+<U4C16>     /x82/x34/xdd/x37 <CJK>
-+<U4C17>     /x82/x34/xdd/x38 <CJK>
-+<U4C18>     /x82/x34/xdd/x39 <CJK>
-+<U4C19>     /x82/x34/xde/x30 <CJK>
-+<U4C1A>     /x82/x34/xde/x31 <CJK>
-+<U4C1B>     /x82/x34/xde/x32 <CJK>
-+<U4C1C>     /x82/x34/xde/x33 <CJK>
-+<U4C1D>     /x82/x34/xde/x34 <CJK>
-+<U4C1E>     /x82/x34/xde/x35 <CJK>
-+<U4C1F>     /x82/x34/xde/x36 <CJK>
-+<U4C20>     /x82/x34/xde/x37 <CJK>
-+<U4C21>     /x82/x34/xde/x38 <CJK>
-+<U4C22>     /x82/x34/xde/x39 <CJK>
-+<U4C23>     /x82/x34/xdf/x30 <CJK>
-+<U4C24>     /x82/x34/xdf/x31 <CJK>
-+<U4C25>     /x82/x34/xdf/x32 <CJK>
-+<U4C26>     /x82/x34/xdf/x33 <CJK>
-+<U4C27>     /x82/x34/xdf/x34 <CJK>
-+<U4C28>     /x82/x34/xdf/x35 <CJK>
-+<U4C29>     /x82/x34/xdf/x36 <CJK>
-+<U4C2A>     /x82/x34/xdf/x37 <CJK>
-+<U4C2B>     /x82/x34/xdf/x38 <CJK>
-+<U4C2C>     /x82/x34/xdf/x39 <CJK>
-+<U4C2D>     /x82/x34/xe0/x30 <CJK>
-+<U4C2E>     /x82/x34/xe0/x31 <CJK>
-+<U4C2F>     /x82/x34/xe0/x32 <CJK>
-+<U4C30>     /x82/x34/xe0/x33 <CJK>
-+<U4C31>     /x82/x34/xe0/x34 <CJK>
-+<U4C32>     /x82/x34/xe0/x35 <CJK>
-+<U4C33>     /x82/x34/xe0/x36 <CJK>
-+<U4C34>     /x82/x34/xe0/x37 <CJK>
-+<U4C35>     /x82/x34/xe0/x38 <CJK>
-+<U4C36>     /x82/x34/xe0/x39 <CJK>
-+<U4C37>     /x82/x34/xe1/x30 <CJK>
-+<U4C38>     /x82/x34/xe1/x31 <CJK>
-+<U4C39>     /x82/x34/xe1/x32 <CJK>
-+<U4C3A>     /x82/x34/xe1/x33 <CJK>
-+<U4C3B>     /x82/x34/xe1/x34 <CJK>
-+<U4C3C>     /x82/x34/xe1/x35 <CJK>
-+<U4C3D>     /x82/x34/xe1/x36 <CJK>
-+<U4C3E>     /x82/x34/xe1/x37 <CJK>
-+<U4C3F>     /x82/x34/xe1/x38 <CJK>
-+<U4C40>     /x82/x34/xe1/x39 <CJK>
-+<U4C41>     /x82/x34/xe2/x30 <CJK>
-+<U4C42>     /x82/x34/xe2/x31 <CJK>
-+<U4C43>     /x82/x34/xe2/x32 <CJK>
-+<U4C44>     /x82/x34/xe2/x33 <CJK>
-+<U4C45>     /x82/x34/xe2/x34 <CJK>
-+<U4C46>     /x82/x34/xe2/x35 <CJK>
-+<U4C47>     /x82/x34/xe2/x36 <CJK>
-+<U4C48>     /x82/x34/xe2/x37 <CJK>
-+<U4C49>     /x82/x34/xe2/x38 <CJK>
-+<U4C4A>     /x82/x34/xe2/x39 <CJK>
-+<U4C4B>     /x82/x34/xe3/x30 <CJK>
-+<U4C4C>     /x82/x34/xe3/x31 <CJK>
-+<U4C4D>     /x82/x34/xe3/x32 <CJK>
-+<U4C4E>     /x82/x34/xe3/x33 <CJK>
-+<U4C4F>     /x82/x34/xe3/x34 <CJK>
-+<U4C50>     /x82/x34/xe3/x35 <CJK>
-+<U4C51>     /x82/x34/xe3/x36 <CJK>
-+<U4C52>     /x82/x34/xe3/x37 <CJK>
-+<U4C53>     /x82/x34/xe3/x38 <CJK>
-+<U4C54>     /x82/x34/xe3/x39 <CJK>
-+<U4C55>     /x82/x34/xe4/x30 <CJK>
-+<U4C56>     /x82/x34/xe4/x31 <CJK>
-+<U4C57>     /x82/x34/xe4/x32 <CJK>
-+<U4C58>     /x82/x34/xe4/x33 <CJK>
-+<U4C59>     /x82/x34/xe4/x34 <CJK>
-+<U4C5A>     /x82/x34/xe4/x35 <CJK>
-+<U4C5B>     /x82/x34/xe4/x36 <CJK>
-+<U4C5C>     /x82/x34/xe4/x37 <CJK>
-+<U4C5D>     /x82/x34/xe4/x38 <CJK>
-+<U4C5E>     /x82/x34/xe4/x39 <CJK>
-+<U4C5F>     /x82/x34/xe5/x30 <CJK>
-+<U4C60>     /x82/x34/xe5/x31 <CJK>
-+<U4C61>     /x82/x34/xe5/x32 <CJK>
-+<U4C62>     /x82/x34/xe5/x33 <CJK>
-+<U4C63>     /x82/x34/xe5/x34 <CJK>
-+<U4C64>     /x82/x34/xe5/x35 <CJK>
-+<U4C65>     /x82/x34/xe5/x36 <CJK>
-+<U4C66>     /x82/x34/xe5/x37 <CJK>
-+<U4C67>     /x82/x34/xe5/x38 <CJK>
-+<U4C68>     /x82/x34/xe5/x39 <CJK>
-+<U4C69>     /x82/x34/xe6/x30 <CJK>
-+<U4C6A>     /x82/x34/xe6/x31 <CJK>
-+<U4C6B>     /x82/x34/xe6/x32 <CJK>
-+<U4C6C>     /x82/x34/xe6/x33 <CJK>
-+<U4C6D>     /x82/x34/xe6/x34 <CJK>
-+<U4C6E>     /x82/x34/xe6/x35 <CJK>
-+<U4C6F>     /x82/x34/xe6/x36 <CJK>
-+<U4C70>     /x82/x34/xe6/x37 <CJK>
-+<U4C71>     /x82/x34/xe6/x38 <CJK>
-+<U4C72>     /x82/x34/xe6/x39 <CJK>
-+<U4C73>     /x82/x34/xe7/x30 <CJK>
-+<U4C74>     /x82/x34/xe7/x31 <CJK>
-+<U4C75>     /x82/x34/xe7/x32 <CJK>
-+<U4C76>     /x82/x34/xe7/x33 <CJK>
- <U4C77>     /xfe/x96         <CJK>
- <U4C78>     /x82/x34/xe7/x34 <CJK>
- <U4C79>     /x82/x34/xe7/x35 <CJK>
-@@ -6853,6 +19899,16 @@ CHARMAP
- <U4DB3>     /x82/x35/x87/x36 <CJK>
- <U4DB4>     /x82/x35/x87/x37 <CJK>
- <U4DB5>     /x82/x35/x87/x38 <CJK>
-+<U4DB6>     /x82/x35/x87/x39 <UNASSIGNED>
-+<U4DB7>     /x82/x35/x88/x30 <UNASSIGNED>
-+<U4DB8>     /x82/x35/x88/x31 <UNASSIGNED>
-+<U4DB9>     /x82/x35/x88/x32 <UNASSIGNED>
-+<U4DBA>     /x82/x35/x88/x33 <UNASSIGNED>
-+<U4DBB>     /x82/x35/x88/x34 <UNASSIGNED>
-+<U4DBC>     /x82/x35/x88/x35 <UNASSIGNED>
-+<U4DBD>     /x82/x35/x88/x36 <UNASSIGNED>
-+<U4DBE>     /x82/x35/x88/x37 <UNASSIGNED>
-+<U4DBF>     /x82/x35/x88/x38 <UNASSIGNED>
- <U4DC0>     /x82/x35/x88/x39 HEXAGRAM FOR THE CREATIVE HEAVEN
- <U4DC1>     /x82/x35/x89/x30 HEXAGRAM FOR THE RECEPTIVE EARTH
- <U4DC2>     /x82/x35/x89/x31 HEXAGRAM FOR DIFFICULTY AT THE BEGINNING
-@@ -27819,2155 +40875,20876 @@ CHARMAP
- <U9FA3>     /xfd/x99         <CJK>
- <U9FA4>     /xfd/x9a         <CJK>
- <U9FA5>     /xfd/x9b         <CJK>
--<UE000>     /xaa/xa1         <CJK>
--<UE001>     /xaa/xa2         <CJK>
--<UE002>     /xaa/xa3         <CJK>
--<UE003>     /xaa/xa4         <CJK>
--<UE004>     /xaa/xa5         <CJK>
--<UE005>     /xaa/xa6         <CJK>
--<UE006>     /xaa/xa7         <CJK>
--<UE007>     /xaa/xa8         <CJK>
--<UE008>     /xaa/xa9         <CJK>
--<UE009>     /xaa/xaa         <CJK>
--<UE00A>     /xaa/xab         <CJK>
--<UE00B>     /xaa/xac         <CJK>
--<UE00C>     /xaa/xad         <CJK>
--<UE00D>     /xaa/xae         <CJK>
--<UE00E>     /xaa/xaf         <CJK>
--<UE00F>     /xaa/xb0         <CJK>
--<UE010>     /xaa/xb1         <CJK>
--<UE011>     /xaa/xb2         <CJK>
--<UE012>     /xaa/xb3         <CJK>
--<UE013>     /xaa/xb4         <CJK>
--<UE014>     /xaa/xb5         <CJK>
--<UE015>     /xaa/xb6         <CJK>
--<UE016>     /xaa/xb7         <CJK>
--<UE017>     /xaa/xb8         <CJK>
--<UE018>     /xaa/xb9         <CJK>
--<UE019>     /xaa/xba         <CJK>
--<UE01A>     /xaa/xbb         <CJK>
--<UE01B>     /xaa/xbc         <CJK>
--<UE01C>     /xaa/xbd         <CJK>
--<UE01D>     /xaa/xbe         <CJK>
--<UE01E>     /xaa/xbf         <CJK>
--<UE01F>     /xaa/xc0         <CJK>
--<UE020>     /xaa/xc1         <CJK>
--<UE021>     /xaa/xc2         <CJK>
--<UE022>     /xaa/xc3         <CJK>
--<UE023>     /xaa/xc4         <CJK>
--<UE024>     /xaa/xc5         <CJK>
--<UE025>     /xaa/xc6         <CJK>
--<UE026>     /xaa/xc7         <CJK>
--<UE027>     /xaa/xc8         <CJK>
--<UE028>     /xaa/xc9         <CJK>
--<UE029>     /xaa/xca         <CJK>
--<UE02A>     /xaa/xcb         <CJK>
--<UE02B>     /xaa/xcc         <CJK>
--<UE02C>     /xaa/xcd         <CJK>
--<UE02D>     /xaa/xce         <CJK>
--<UE02E>     /xaa/xcf         <CJK>
--<UE02F>     /xaa/xd0         <CJK>
--<UE030>     /xaa/xd1         <CJK>
--<UE031>     /xaa/xd2         <CJK>
--<UE032>     /xaa/xd3         <CJK>
--<UE033>     /xaa/xd4         <CJK>
--<UE034>     /xaa/xd5         <CJK>
--<UE035>     /xaa/xd6         <CJK>
--<UE036>     /xaa/xd7         <CJK>
--<UE037>     /xaa/xd8         <CJK>
--<UE038>     /xaa/xd9         <CJK>
--<UE039>     /xaa/xda         <CJK>
--<UE03A>     /xaa/xdb         <CJK>
--<UE03B>     /xaa/xdc         <CJK>
--<UE03C>     /xaa/xdd         <CJK>
--<UE03D>     /xaa/xde         <CJK>
--<UE03E>     /xaa/xdf         <CJK>
--<UE03F>     /xaa/xe0         <CJK>
--<UE040>     /xaa/xe1         <CJK>
--<UE041>     /xaa/xe2         <CJK>
--<UE042>     /xaa/xe3         <CJK>
--<UE043>     /xaa/xe4         <CJK>
--<UE044>     /xaa/xe5         <CJK>
--<UE045>     /xaa/xe6         <CJK>
--<UE046>     /xaa/xe7         <CJK>
--<UE047>     /xaa/xe8         <CJK>
--<UE048>     /xaa/xe9         <CJK>
--<UE049>     /xaa/xea         <CJK>
--<UE04A>     /xaa/xeb         <CJK>
--<UE04B>     /xaa/xec         <CJK>
--<UE04C>     /xaa/xed         <CJK>
--<UE04D>     /xaa/xee         <CJK>
--<UE04E>     /xaa/xef         <CJK>
--<UE04F>     /xaa/xf0         <CJK>
--<UE050>     /xaa/xf1         <CJK>
--<UE051>     /xaa/xf2         <CJK>
--<UE052>     /xaa/xf3         <CJK>
--<UE053>     /xaa/xf4         <CJK>
--<UE054>     /xaa/xf5         <CJK>
--<UE055>     /xaa/xf6         <CJK>
--<UE056>     /xaa/xf7         <CJK>
--<UE057>     /xaa/xf8         <CJK>
--<UE058>     /xaa/xf9         <CJK>
--<UE059>     /xaa/xfa         <CJK>
--<UE05A>     /xaa/xfb         <CJK>
--<UE05B>     /xaa/xfc         <CJK>
--<UE05C>     /xaa/xfd         <CJK>
--<UE05D>     /xaa/xfe         <CJK>
--<UE05E>     /xab/xa1         <CJK>
--<UE05F>     /xab/xa2         <CJK>
--<UE060>     /xab/xa3         <CJK>
--<UE061>     /xab/xa4         <CJK>
--<UE062>     /xab/xa5         <CJK>
--<UE063>     /xab/xa6         <CJK>
--<UE064>     /xab/xa7         <CJK>
--<UE065>     /xab/xa8         <CJK>
--<UE066>     /xab/xa9         <CJK>
--<UE067>     /xab/xaa         <CJK>
--<UE068>     /xab/xab         <CJK>
--<UE069>     /xab/xac         <CJK>
--<UE06A>     /xab/xad         <CJK>
--<UE06B>     /xab/xae         <CJK>
--<UE06C>     /xab/xaf         <CJK>
--<UE06D>     /xab/xb0         <CJK>
--<UE06E>     /xab/xb1         <CJK>
--<UE06F>     /xab/xb2         <CJK>
--<UE070>     /xab/xb3         <CJK>
--<UE071>     /xab/xb4         <CJK>
--<UE072>     /xab/xb5         <CJK>
--<UE073>     /xab/xb6         <CJK>
--<UE074>     /xab/xb7         <CJK>
--<UE075>     /xab/xb8         <CJK>
--<UE076>     /xab/xb9         <CJK>
--<UE077>     /xab/xba         <CJK>
--<UE078>     /xab/xbb         <CJK>
--<UE079>     /xab/xbc         <CJK>
--<UE07A>     /xab/xbd         <CJK>
--<UE07B>     /xab/xbe         <CJK>
--<UE07C>     /xab/xbf         <CJK>
--<UE07D>     /xab/xc0         <CJK>
--<UE07E>     /xab/xc1         <CJK>
--<UE07F>     /xab/xc2         <CJK>
--<UE080>     /xab/xc3         <CJK>
--<UE081>     /xab/xc4         <CJK>
--<UE082>     /xab/xc5         <CJK>
--<UE083>     /xab/xc6         <CJK>
--<UE084>     /xab/xc7         <CJK>
--<UE085>     /xab/xc8         <CJK>
--<UE086>     /xab/xc9         <CJK>
--<UE087>     /xab/xca         <CJK>
--<UE088>     /xab/xcb         <CJK>
--<UE089>     /xab/xcc         <CJK>
--<UE08A>     /xab/xcd         <CJK>
--<UE08B>     /xab/xce         <CJK>
--<UE08C>     /xab/xcf         <CJK>
--<UE08D>     /xab/xd0         <CJK>
--<UE08E>     /xab/xd1         <CJK>
--<UE08F>     /xab/xd2         <CJK>
--<UE090>     /xab/xd3         <CJK>
--<UE091>     /xab/xd4         <CJK>
--<UE092>     /xab/xd5         <CJK>
--<UE093>     /xab/xd6         <CJK>
--<UE094>     /xab/xd7         <CJK>
--<UE095>     /xab/xd8         <CJK>
--<UE096>     /xab/xd9         <CJK>
--<UE097>     /xab/xda         <CJK>
--<UE098>     /xab/xdb         <CJK>
--<UE099>     /xab/xdc         <CJK>
--<UE09A>     /xab/xdd         <CJK>
--<UE09B>     /xab/xde         <CJK>
--<UE09C>     /xab/xdf         <CJK>
--<UE09D>     /xab/xe0         <CJK>
--<UE09E>     /xab/xe1         <CJK>
--<UE09F>     /xab/xe2         <CJK>
--<UE0A0>     /xab/xe3         <CJK>
--<UE0A1>     /xab/xe4         <CJK>
--<UE0A2>     /xab/xe5         <CJK>
--<UE0A3>     /xab/xe6         <CJK>
--<UE0A4>     /xab/xe7         <CJK>
--<UE0A5>     /xab/xe8         <CJK>
--<UE0A6>     /xab/xe9         <CJK>
--<UE0A7>     /xab/xea         <CJK>
--<UE0A8>     /xab/xeb         <CJK>
--<UE0A9>     /xab/xec         <CJK>
--<UE0AA>     /xab/xed         <CJK>
--<UE0AB>     /xab/xee         <CJK>
--<UE0AC>     /xab/xef         <CJK>
--<UE0AD>     /xab/xf0         <CJK>
--<UE0AE>     /xab/xf1         <CJK>
--<UE0AF>     /xab/xf2         <CJK>
--<UE0B0>     /xab/xf3         <CJK>
--<UE0B1>     /xab/xf4         <CJK>
--<UE0B2>     /xab/xf5         <CJK>
--<UE0B3>     /xab/xf6         <CJK>
--<UE0B4>     /xab/xf7         <CJK>
--<UE0B5>     /xab/xf8         <CJK>
--<UE0B6>     /xab/xf9         <CJK>
--<UE0B7>     /xab/xfa         <CJK>
--<UE0B8>     /xab/xfb         <CJK>
--<UE0B9>     /xab/xfc         <CJK>
--<UE0BA>     /xab/xfd         <CJK>
--<UE0BB>     /xab/xfe         <CJK>
--<UE0BC>     /xac/xa1         <CJK>
--<UE0BD>     /xac/xa2         <CJK>
--<UE0BE>     /xac/xa3         <CJK>
--<UE0BF>     /xac/xa4         <CJK>
--<UE0C0>     /xac/xa5         <CJK>
--<UE0C1>     /xac/xa6         <CJK>
--<UE0C2>     /xac/xa7         <CJK>
--<UE0C3>     /xac/xa8         <CJK>
--<UE0C4>     /xac/xa9         <CJK>
--<UE0C5>     /xac/xaa         <CJK>
--<UE0C6>     /xac/xab         <CJK>
--<UE0C7>     /xac/xac         <CJK>
--<UE0C8>     /xac/xad         <CJK>
--<UE0C9>     /xac/xae         <CJK>
--<UE0CA>     /xac/xaf         <CJK>
--<UE0CB>     /xac/xb0         <CJK>
--<UE0CC>     /xac/xb1         <CJK>
--<UE0CD>     /xac/xb2         <CJK>
--<UE0CE>     /xac/xb3         <CJK>
--<UE0CF>     /xac/xb4         <CJK>
--<UE0D0>     /xac/xb5         <CJK>
--<UE0D1>     /xac/xb6         <CJK>
--<UE0D2>     /xac/xb7         <CJK>
--<UE0D3>     /xac/xb8         <CJK>
--<UE0D4>     /xac/xb9         <CJK>
--<UE0D5>     /xac/xba         <CJK>
--<UE0D6>     /xac/xbb         <CJK>
--<UE0D7>     /xac/xbc         <CJK>
--<UE0D8>     /xac/xbd         <CJK>
--<UE0D9>     /xac/xbe         <CJK>
--<UE0DA>     /xac/xbf         <CJK>
--<UE0DB>     /xac/xc0         <CJK>
--<UE0DC>     /xac/xc1         <CJK>
--<UE0DD>     /xac/xc2         <CJK>
--<UE0DE>     /xac/xc3         <CJK>
--<UE0DF>     /xac/xc4         <CJK>
--<UE0E0>     /xac/xc5         <CJK>
--<UE0E1>     /xac/xc6         <CJK>
--<UE0E2>     /xac/xc7         <CJK>
--<UE0E3>     /xac/xc8         <CJK>
--<UE0E4>     /xac/xc9         <CJK>
--<UE0E5>     /xac/xca         <CJK>
--<UE0E6>     /xac/xcb         <CJK>
--<UE0E7>     /xac/xcc         <CJK>
--<UE0E8>     /xac/xcd         <CJK>
--<UE0E9>     /xac/xce         <CJK>
--<UE0EA>     /xac/xcf         <CJK>
--<UE0EB>     /xac/xd0         <CJK>
--<UE0EC>     /xac/xd1         <CJK>
--<UE0ED>     /xac/xd2         <CJK>
--<UE0EE>     /xac/xd3         <CJK>
--<UE0EF>     /xac/xd4         <CJK>
--<UE0F0>     /xac/xd5         <CJK>
--<UE0F1>     /xac/xd6         <CJK>
--<UE0F2>     /xac/xd7         <CJK>
--<UE0F3>     /xac/xd8         <CJK>
--<UE0F4>     /xac/xd9         <CJK>
--<UE0F5>     /xac/xda         <CJK>
--<UE0F6>     /xac/xdb         <CJK>
--<UE0F7>     /xac/xdc         <CJK>
--<UE0F8>     /xac/xdd         <CJK>
--<UE0F9>     /xac/xde         <CJK>
--<UE0FA>     /xac/xdf         <CJK>
--<UE0FB>     /xac/xe0         <CJK>
--<UE0FC>     /xac/xe1         <CJK>
--<UE0FD>     /xac/xe2         <CJK>
--<UE0FE>     /xac/xe3         <CJK>
--<UE0FF>     /xac/xe4         <CJK>
--<UE100>     /xac/xe5         <CJK>
--<UE101>     /xac/xe6         <CJK>
--<UE102>     /xac/xe7         <CJK>
--<UE103>     /xac/xe8         <CJK>
--<UE104>     /xac/xe9         <CJK>
--<UE105>     /xac/xea         <CJK>
--<UE106>     /xac/xeb         <CJK>
--<UE107>     /xac/xec         <CJK>
--<UE108>     /xac/xed         <CJK>
--<UE109>     /xac/xee         <CJK>
--<UE10A>     /xac/xef         <CJK>
--<UE10B>     /xac/xf0         <CJK>
--<UE10C>     /xac/xf1         <CJK>
--<UE10D>     /xac/xf2         <CJK>
--<UE10E>     /xac/xf3         <CJK>
--<UE10F>     /xac/xf4         <CJK>
--<UE110>     /xac/xf5         <CJK>
--<UE111>     /xac/xf6         <CJK>
--<UE112>     /xac/xf7         <CJK>
--<UE113>     /xac/xf8         <CJK>
--<UE114>     /xac/xf9         <CJK>
--<UE115>     /xac/xfa         <CJK>
--<UE116>     /xac/xfb         <CJK>
--<UE117>     /xac/xfc         <CJK>
--<UE118>     /xac/xfd         <CJK>
--<UE119>     /xac/xfe         <CJK>
--<UE11A>     /xad/xa1         <CJK>
--<UE11B>     /xad/xa2         <CJK>
--<UE11C>     /xad/xa3         <CJK>
--<UE11D>     /xad/xa4         <CJK>
--<UE11E>     /xad/xa5         <CJK>
--<UE11F>     /xad/xa6         <CJK>
--<UE120>     /xad/xa7         <CJK>
--<UE121>     /xad/xa8         <CJK>
--<UE122>     /xad/xa9         <CJK>
--<UE123>     /xad/xaa         <CJK>
--<UE124>     /xad/xab         <CJK>
--<UE125>     /xad/xac         <CJK>
--<UE126>     /xad/xad         <CJK>
--<UE127>     /xad/xae         <CJK>
--<UE128>     /xad/xaf         <CJK>
--<UE129>     /xad/xb0         <CJK>
--<UE12A>     /xad/xb1         <CJK>
--<UE12B>     /xad/xb2         <CJK>
--<UE12C>     /xad/xb3         <CJK>
--<UE12D>     /xad/xb4         <CJK>
--<UE12E>     /xad/xb5         <CJK>
--<UE12F>     /xad/xb6         <CJK>
--<UE130>     /xad/xb7         <CJK>
--<UE131>     /xad/xb8         <CJK>
--<UE132>     /xad/xb9         <CJK>
--<UE133>     /xad/xba         <CJK>
--<UE134>     /xad/xbb         <CJK>
--<UE135>     /xad/xbc         <CJK>
--<UE136>     /xad/xbd         <CJK>
--<UE137>     /xad/xbe         <CJK>
--<UE138>     /xad/xbf         <CJK>
--<UE139>     /xad/xc0         <CJK>
--<UE13A>     /xad/xc1         <CJK>
--<UE13B>     /xad/xc2         <CJK>
--<UE13C>     /xad/xc3         <CJK>
--<UE13D>     /xad/xc4         <CJK>
--<UE13E>     /xad/xc5         <CJK>
--<UE13F>     /xad/xc6         <CJK>
--<UE140>     /xad/xc7         <CJK>
--<UE141>     /xad/xc8         <CJK>
--<UE142>     /xad/xc9         <CJK>
--<UE143>     /xad/xca         <CJK>
--<UE144>     /xad/xcb         <CJK>
--<UE145>     /xad/xcc         <CJK>
--<UE146>     /xad/xcd         <CJK>
--<UE147>     /xad/xce         <CJK>
--<UE148>     /xad/xcf         <CJK>
--<UE149>     /xad/xd0         <CJK>
--<UE14A>     /xad/xd1         <CJK>
--<UE14B>     /xad/xd2         <CJK>
--<UE14C>     /xad/xd3         <CJK>
--<UE14D>     /xad/xd4         <CJK>
--<UE14E>     /xad/xd5         <CJK>
--<UE14F>     /xad/xd6         <CJK>
--<UE150>     /xad/xd7         <CJK>
--<UE151>     /xad/xd8         <CJK>
--<UE152>     /xad/xd9         <CJK>
--<UE153>     /xad/xda         <CJK>
--<UE154>     /xad/xdb         <CJK>
--<UE155>     /xad/xdc         <CJK>
--<UE156>     /xad/xdd         <CJK>
--<UE157>     /xad/xde         <CJK>
--<UE158>     /xad/xdf         <CJK>
--<UE159>     /xad/xe0         <CJK>
--<UE15A>     /xad/xe1         <CJK>
--<UE15B>     /xad/xe2         <CJK>
--<UE15C>     /xad/xe3         <CJK>
--<UE15D>     /xad/xe4         <CJK>
--<UE15E>     /xad/xe5         <CJK>
--<UE15F>     /xad/xe6         <CJK>
--<UE160>     /xad/xe7         <CJK>
--<UE161>     /xad/xe8         <CJK>
--<UE162>     /xad/xe9         <CJK>
--<UE163>     /xad/xea         <CJK>
--<UE164>     /xad/xeb         <CJK>
--<UE165>     /xad/xec         <CJK>
--<UE166>     /xad/xed         <CJK>
--<UE167>     /xad/xee         <CJK>
--<UE168>     /xad/xef         <CJK>
--<UE169>     /xad/xf0         <CJK>
--<UE16A>     /xad/xf1         <CJK>
--<UE16B>     /xad/xf2         <CJK>
--<UE16C>     /xad/xf3         <CJK>
--<UE16D>     /xad/xf4         <CJK>
--<UE16E>     /xad/xf5         <CJK>
--<UE16F>     /xad/xf6         <CJK>
--<UE170>     /xad/xf7         <CJK>
--<UE171>     /xad/xf8         <CJK>
--<UE172>     /xad/xf9         <CJK>
--<UE173>     /xad/xfa         <CJK>
--<UE174>     /xad/xfb         <CJK>
--<UE175>     /xad/xfc         <CJK>
--<UE176>     /xad/xfd         <CJK>
--<UE177>     /xad/xfe         <CJK>
--<UE178>     /xae/xa1         <CJK>
--<UE179>     /xae/xa2         <CJK>
--<UE17A>     /xae/xa3         <CJK>
--<UE17B>     /xae/xa4         <CJK>
--<UE17C>     /xae/xa5         <CJK>
--<UE17D>     /xae/xa6         <CJK>
--<UE17E>     /xae/xa7         <CJK>
--<UE17F>     /xae/xa8         <CJK>
--<UE180>     /xae/xa9         <CJK>
--<UE181>     /xae/xaa         <CJK>
--<UE182>     /xae/xab         <CJK>
--<UE183>     /xae/xac         <CJK>
--<UE184>     /xae/xad         <CJK>
--<UE185>     /xae/xae         <CJK>
--<UE186>     /xae/xaf         <CJK>
--<UE187>     /xae/xb0         <CJK>
--<UE188>     /xae/xb1         <CJK>
--<UE189>     /xae/xb2         <CJK>
--<UE18A>     /xae/xb3         <CJK>
--<UE18B>     /xae/xb4         <CJK>
--<UE18C>     /xae/xb5         <CJK>
--<UE18D>     /xae/xb6         <CJK>
--<UE18E>     /xae/xb7         <CJK>
--<UE18F>     /xae/xb8         <CJK>
--<UE190>     /xae/xb9         <CJK>
--<UE191>     /xae/xba         <CJK>
--<UE192>     /xae/xbb         <CJK>
--<UE193>     /xae/xbc         <CJK>
--<UE194>     /xae/xbd         <CJK>
--<UE195>     /xae/xbe         <CJK>
--<UE196>     /xae/xbf         <CJK>
--<UE197>     /xae/xc0         <CJK>
--<UE198>     /xae/xc1         <CJK>
--<UE199>     /xae/xc2         <CJK>
--<UE19A>     /xae/xc3         <CJK>
--<UE19B>     /xae/xc4         <CJK>
--<UE19C>     /xae/xc5         <CJK>
--<UE19D>     /xae/xc6         <CJK>
--<UE19E>     /xae/xc7         <CJK>
--<UE19F>     /xae/xc8         <CJK>
--<UE1A0>     /xae/xc9         <CJK>
--<UE1A1>     /xae/xca         <CJK>
--<UE1A2>     /xae/xcb         <CJK>
--<UE1A3>     /xae/xcc         <CJK>
--<UE1A4>     /xae/xcd         <CJK>
--<UE1A5>     /xae/xce         <CJK>
--<UE1A6>     /xae/xcf         <CJK>
--<UE1A7>     /xae/xd0         <CJK>
--<UE1A8>     /xae/xd1         <CJK>
--<UE1A9>     /xae/xd2         <CJK>
--<UE1AA>     /xae/xd3         <CJK>
--<UE1AB>     /xae/xd4         <CJK>
--<UE1AC>     /xae/xd5         <CJK>
--<UE1AD>     /xae/xd6         <CJK>
--<UE1AE>     /xae/xd7         <CJK>
--<UE1AF>     /xae/xd8         <CJK>
--<UE1B0>     /xae/xd9         <CJK>
--<UE1B1>     /xae/xda         <CJK>
--<UE1B2>     /xae/xdb         <CJK>
--<UE1B3>     /xae/xdc         <CJK>
--<UE1B4>     /xae/xdd         <CJK>
--<UE1B5>     /xae/xde         <CJK>
--<UE1B6>     /xae/xdf         <CJK>
--<UE1B7>     /xae/xe0         <CJK>
--<UE1B8>     /xae/xe1         <CJK>
--<UE1B9>     /xae/xe2         <CJK>
--<UE1BA>     /xae/xe3         <CJK>
--<UE1BB>     /xae/xe4         <CJK>
--<UE1BC>     /xae/xe5         <CJK>
--<UE1BD>     /xae/xe6         <CJK>
--<UE1BE>     /xae/xe7         <CJK>
--<UE1BF>     /xae/xe8         <CJK>
--<UE1C0>     /xae/xe9         <CJK>
--<UE1C1>     /xae/xea         <CJK>
--<UE1C2>     /xae/xeb         <CJK>
--<UE1C3>     /xae/xec         <CJK>
--<UE1C4>     /xae/xed         <CJK>
--<UE1C5>     /xae/xee         <CJK>
--<UE1C6>     /xae/xef         <CJK>
--<UE1C7>     /xae/xf0         <CJK>
--<UE1C8>     /xae/xf1         <CJK>
--<UE1C9>     /xae/xf2         <CJK>
--<UE1CA>     /xae/xf3         <CJK>
--<UE1CB>     /xae/xf4         <CJK>
--<UE1CC>     /xae/xf5         <CJK>
--<UE1CD>     /xae/xf6         <CJK>
--<UE1CE>     /xae/xf7         <CJK>
--<UE1CF>     /xae/xf8         <CJK>
--<UE1D0>     /xae/xf9         <CJK>
--<UE1D1>     /xae/xfa         <CJK>
--<UE1D2>     /xae/xfb         <CJK>
--<UE1D3>     /xae/xfc         <CJK>
--<UE1D4>     /xae/xfd         <CJK>
--<UE1D5>     /xae/xfe         <CJK>
--<UE1D6>     /xaf/xa1         <CJK>
--<UE1D7>     /xaf/xa2         <CJK>
--<UE1D8>     /xaf/xa3         <CJK>
--<UE1D9>     /xaf/xa4         <CJK>
--<UE1DA>     /xaf/xa5         <CJK>
--<UE1DB>     /xaf/xa6         <CJK>
--<UE1DC>     /xaf/xa7         <CJK>
--<UE1DD>     /xaf/xa8         <CJK>
--<UE1DE>     /xaf/xa9         <CJK>
--<UE1DF>     /xaf/xaa         <CJK>
--<UE1E0>     /xaf/xab         <CJK>
--<UE1E1>     /xaf/xac         <CJK>
--<UE1E2>     /xaf/xad         <CJK>
--<UE1E3>     /xaf/xae         <CJK>
--<UE1E4>     /xaf/xaf         <CJK>
--<UE1E5>     /xaf/xb0         <CJK>
--<UE1E6>     /xaf/xb1         <CJK>
--<UE1E7>     /xaf/xb2         <CJK>
--<UE1E8>     /xaf/xb3         <CJK>
--<UE1E9>     /xaf/xb4         <CJK>
--<UE1EA>     /xaf/xb5         <CJK>
--<UE1EB>     /xaf/xb6         <CJK>
--<UE1EC>     /xaf/xb7         <CJK>
--<UE1ED>     /xaf/xb8         <CJK>
--<UE1EE>     /xaf/xb9         <CJK>
--<UE1EF>     /xaf/xba         <CJK>
--<UE1F0>     /xaf/xbb         <CJK>
--<UE1F1>     /xaf/xbc         <CJK>
--<UE1F2>     /xaf/xbd         <CJK>
--<UE1F3>     /xaf/xbe         <CJK>
--<UE1F4>     /xaf/xbf         <CJK>
--<UE1F5>     /xaf/xc0         <CJK>
--<UE1F6>     /xaf/xc1         <CJK>
--<UE1F7>     /xaf/xc2         <CJK>
--<UE1F8>     /xaf/xc3         <CJK>
--<UE1F9>     /xaf/xc4         <CJK>
--<UE1FA>     /xaf/xc5         <CJK>
--<UE1FB>     /xaf/xc6         <CJK>
--<UE1FC>     /xaf/xc7         <CJK>
--<UE1FD>     /xaf/xc8         <CJK>
--<UE1FE>     /xaf/xc9         <CJK>
--<UE1FF>     /xaf/xca         <CJK>
--<UE200>     /xaf/xcb         <CJK>
--<UE201>     /xaf/xcc         <CJK>
--<UE202>     /xaf/xcd         <CJK>
--<UE203>     /xaf/xce         <CJK>
--<UE204>     /xaf/xcf         <CJK>
--<UE205>     /xaf/xd0         <CJK>
--<UE206>     /xaf/xd1         <CJK>
--<UE207>     /xaf/xd2         <CJK>
--<UE208>     /xaf/xd3         <CJK>
--<UE209>     /xaf/xd4         <CJK>
--<UE20A>     /xaf/xd5         <CJK>
--<UE20B>     /xaf/xd6         <CJK>
--<UE20C>     /xaf/xd7         <CJK>
--<UE20D>     /xaf/xd8         <CJK>
--<UE20E>     /xaf/xd9         <CJK>
--<UE20F>     /xaf/xda         <CJK>
--<UE210>     /xaf/xdb         <CJK>
--<UE211>     /xaf/xdc         <CJK>
--<UE212>     /xaf/xdd         <CJK>
--<UE213>     /xaf/xde         <CJK>
--<UE214>     /xaf/xdf         <CJK>
--<UE215>     /xaf/xe0         <CJK>
--<UE216>     /xaf/xe1         <CJK>
--<UE217>     /xaf/xe2         <CJK>
--<UE218>     /xaf/xe3         <CJK>
--<UE219>     /xaf/xe4         <CJK>
--<UE21A>     /xaf/xe5         <CJK>
--<UE21B>     /xaf/xe6         <CJK>
--<UE21C>     /xaf/xe7         <CJK>
--<UE21D>     /xaf/xe8         <CJK>
--<UE21E>     /xaf/xe9         <CJK>
--<UE21F>     /xaf/xea         <CJK>
--<UE220>     /xaf/xeb         <CJK>
--<UE221>     /xaf/xec         <CJK>
--<UE222>     /xaf/xed         <CJK>
--<UE223>     /xaf/xee         <CJK>
--<UE224>     /xaf/xef         <CJK>
--<UE225>     /xaf/xf0         <CJK>
--<UE226>     /xaf/xf1         <CJK>
--<UE227>     /xaf/xf2         <CJK>
--<UE228>     /xaf/xf3         <CJK>
--<UE229>     /xaf/xf4         <CJK>
--<UE22A>     /xaf/xf5         <CJK>
--<UE22B>     /xaf/xf6         <CJK>
--<UE22C>     /xaf/xf7         <CJK>
--<UE22D>     /xaf/xf8         <CJK>
--<UE22E>     /xaf/xf9         <CJK>
--<UE22F>     /xaf/xfa         <CJK>
--<UE230>     /xaf/xfb         <CJK>
--<UE231>     /xaf/xfc         <CJK>
--<UE232>     /xaf/xfd         <CJK>
--<UE233>     /xaf/xfe         <CJK>
--<UE234>     /xf8/xa1         <CJK>
--<UE235>     /xf8/xa2         <CJK>
--<UE236>     /xf8/xa3         <CJK>
--<UE237>     /xf8/xa4         <CJK>
--<UE238>     /xf8/xa5         <CJK>
--<UE239>     /xf8/xa6         <CJK>
--<UE23A>     /xf8/xa7         <CJK>
--<UE23B>     /xf8/xa8         <CJK>
--<UE23C>     /xf8/xa9         <CJK>
--<UE23D>     /xf8/xaa         <CJK>
--<UE23E>     /xf8/xab         <CJK>
--<UE23F>     /xf8/xac         <CJK>
--<UE240>     /xf8/xad         <CJK>
--<UE241>     /xf8/xae         <CJK>
--<UE242>     /xf8/xaf         <CJK>
--<UE243>     /xf8/xb0         <CJK>
--<UE244>     /xf8/xb1         <CJK>
--<UE245>     /xf8/xb2         <CJK>
--<UE246>     /xf8/xb3         <CJK>
--<UE247>     /xf8/xb4         <CJK>
--<UE248>     /xf8/xb5         <CJK>
--<UE249>     /xf8/xb6         <CJK>
--<UE24A>     /xf8/xb7         <CJK>
--<UE24B>     /xf8/xb8         <CJK>
--<UE24C>     /xf8/xb9         <CJK>
--<UE24D>     /xf8/xba         <CJK>
--<UE24E>     /xf8/xbb         <CJK>
--<UE24F>     /xf8/xbc         <CJK>
--<UE250>     /xf8/xbd         <CJK>
--<UE251>     /xf8/xbe         <CJK>
--<UE252>     /xf8/xbf         <CJK>
--<UE253>     /xf8/xc0         <CJK>
--<UE254>     /xf8/xc1         <CJK>
--<UE255>     /xf8/xc2         <CJK>
--<UE256>     /xf8/xc3         <CJK>
--<UE257>     /xf8/xc4         <CJK>
--<UE258>     /xf8/xc5         <CJK>
--<UE259>     /xf8/xc6         <CJK>
--<UE25A>     /xf8/xc7         <CJK>
--<UE25B>     /xf8/xc8         <CJK>
--<UE25C>     /xf8/xc9         <CJK>
--<UE25D>     /xf8/xca         <CJK>
--<UE25E>     /xf8/xcb         <CJK>
--<UE25F>     /xf8/xcc         <CJK>
--<UE260>     /xf8/xcd         <CJK>
--<UE261>     /xf8/xce         <CJK>
--<UE262>     /xf8/xcf         <CJK>
--<UE263>     /xf8/xd0         <CJK>
--<UE264>     /xf8/xd1         <CJK>
--<UE265>     /xf8/xd2         <CJK>
--<UE266>     /xf8/xd3         <CJK>
--<UE267>     /xf8/xd4         <CJK>
--<UE268>     /xf8/xd5         <CJK>
--<UE269>     /xf8/xd6         <CJK>
--<UE26A>     /xf8/xd7         <CJK>
--<UE26B>     /xf8/xd8         <CJK>
--<UE26C>     /xf8/xd9         <CJK>
--<UE26D>     /xf8/xda         <CJK>
--<UE26E>     /xf8/xdb         <CJK>
--<UE26F>     /xf8/xdc         <CJK>
--<UE270>     /xf8/xdd         <CJK>
--<UE271>     /xf8/xde         <CJK>
--<UE272>     /xf8/xdf         <CJK>
--<UE273>     /xf8/xe0         <CJK>
--<UE274>     /xf8/xe1         <CJK>
--<UE275>     /xf8/xe2         <CJK>
--<UE276>     /xf8/xe3         <CJK>
--<UE277>     /xf8/xe4         <CJK>
--<UE278>     /xf8/xe5         <CJK>
--<UE279>     /xf8/xe6         <CJK>
--<UE27A>     /xf8/xe7         <CJK>
--<UE27B>     /xf8/xe8         <CJK>
--<UE27C>     /xf8/xe9         <CJK>
--<UE27D>     /xf8/xea         <CJK>
--<UE27E>     /xf8/xeb         <CJK>
--<UE27F>     /xf8/xec         <CJK>
--<UE280>     /xf8/xed         <CJK>
--<UE281>     /xf8/xee         <CJK>
--<UE282>     /xf8/xef         <CJK>
--<UE283>     /xf8/xf0         <CJK>
--<UE284>     /xf8/xf1         <CJK>
--<UE285>     /xf8/xf2         <CJK>
--<UE286>     /xf8/xf3         <CJK>
--<UE287>     /xf8/xf4         <CJK>
--<UE288>     /xf8/xf5         <CJK>
--<UE289>     /xf8/xf6         <CJK>
--<UE28A>     /xf8/xf7         <CJK>
--<UE28B>     /xf8/xf8         <CJK>
--<UE28C>     /xf8/xf9         <CJK>
--<UE28D>     /xf8/xfa         <CJK>
--<UE28E>     /xf8/xfb         <CJK>
--<UE28F>     /xf8/xfc         <CJK>
--<UE290>     /xf8/xfd         <CJK>
--<UE291>     /xf8/xfe         <CJK>
--<UE292>     /xf9/xa1         <CJK>
--<UE293>     /xf9/xa2         <CJK>
--<UE294>     /xf9/xa3         <CJK>
--<UE295>     /xf9/xa4         <CJK>
--<UE296>     /xf9/xa5         <CJK>
--<UE297>     /xf9/xa6         <CJK>
--<UE298>     /xf9/xa7         <CJK>
--<UE299>     /xf9/xa8         <CJK>
--<UE29A>     /xf9/xa9         <CJK>
--<UE29B>     /xf9/xaa         <CJK>
--<UE29C>     /xf9/xab         <CJK>
--<UE29D>     /xf9/xac         <CJK>
--<UE29E>     /xf9/xad         <CJK>
--<UE29F>     /xf9/xae         <CJK>
--<UE2A0>     /xf9/xaf         <CJK>
--<UE2A1>     /xf9/xb0         <CJK>
--<UE2A2>     /xf9/xb1         <CJK>
--<UE2A3>     /xf9/xb2         <CJK>
--<UE2A4>     /xf9/xb3         <CJK>
--<UE2A5>     /xf9/xb4         <CJK>
--<UE2A6>     /xf9/xb5         <CJK>
--<UE2A7>     /xf9/xb6         <CJK>
--<UE2A8>     /xf9/xb7         <CJK>
--<UE2A9>     /xf9/xb8         <CJK>
--<UE2AA>     /xf9/xb9         <CJK>
--<UE2AB>     /xf9/xba         <CJK>
--<UE2AC>     /xf9/xbb         <CJK>
--<UE2AD>     /xf9/xbc         <CJK>
--<UE2AE>     /xf9/xbd         <CJK>
--<UE2AF>     /xf9/xbe         <CJK>
--<UE2B0>     /xf9/xbf         <CJK>
--<UE2B1>     /xf9/xc0         <CJK>
--<UE2B2>     /xf9/xc1         <CJK>
--<UE2B3>     /xf9/xc2         <CJK>
--<UE2B4>     /xf9/xc3         <CJK>
--<UE2B5>     /xf9/xc4         <CJK>
--<UE2B6>     /xf9/xc5         <CJK>
--<UE2B7>     /xf9/xc6         <CJK>
--<UE2B8>     /xf9/xc7         <CJK>
--<UE2B9>     /xf9/xc8         <CJK>
--<UE2BA>     /xf9/xc9         <CJK>
--<UE2BB>     /xf9/xca         <CJK>
--<UE2BC>     /xf9/xcb         <CJK>
--<UE2BD>     /xf9/xcc         <CJK>
--<UE2BE>     /xf9/xcd         <CJK>
--<UE2BF>     /xf9/xce         <CJK>
--<UE2C0>     /xf9/xcf         <CJK>
--<UE2C1>     /xf9/xd0         <CJK>
--<UE2C2>     /xf9/xd1         <CJK>
--<UE2C3>     /xf9/xd2         <CJK>
--<UE2C4>     /xf9/xd3         <CJK>
--<UE2C5>     /xf9/xd4         <CJK>
--<UE2C6>     /xf9/xd5         <CJK>
--<UE2C7>     /xf9/xd6         <CJK>
--<UE2C8>     /xf9/xd7         <CJK>
--<UE2C9>     /xf9/xd8         <CJK>
--<UE2CA>     /xf9/xd9         <CJK>
--<UE2CB>     /xf9/xda         <CJK>
--<UE2CC>     /xf9/xdb         <CJK>
--<UE2CD>     /xf9/xdc         <CJK>
--<UE2CE>     /xf9/xdd         <CJK>
--<UE2CF>     /xf9/xde         <CJK>
--<UE2D0>     /xf9/xdf         <CJK>
--<UE2D1>     /xf9/xe0         <CJK>
--<UE2D2>     /xf9/xe1         <CJK>
--<UE2D3>     /xf9/xe2         <CJK>
--<UE2D4>     /xf9/xe3         <CJK>
--<UE2D5>     /xf9/xe4         <CJK>
--<UE2D6>     /xf9/xe5         <CJK>
--<UE2D7>     /xf9/xe6         <CJK>
--<UE2D8>     /xf9/xe7         <CJK>
--<UE2D9>     /xf9/xe8         <CJK>
--<UE2DA>     /xf9/xe9         <CJK>
--<UE2DB>     /xf9/xea         <CJK>
--<UE2DC>     /xf9/xeb         <CJK>
--<UE2DD>     /xf9/xec         <CJK>
--<UE2DE>     /xf9/xed         <CJK>
--<UE2DF>     /xf9/xee         <CJK>
--<UE2E0>     /xf9/xef         <CJK>
--<UE2E1>     /xf9/xf0         <CJK>
--<UE2E2>     /xf9/xf1         <CJK>
--<UE2E3>     /xf9/xf2         <CJK>
--<UE2E4>     /xf9/xf3         <CJK>
--<UE2E5>     /xf9/xf4         <CJK>
--<UE2E6>     /xf9/xf5         <CJK>
--<UE2E7>     /xf9/xf6         <CJK>
--<UE2E8>     /xf9/xf7         <CJK>
--<UE2E9>     /xf9/xf8         <CJK>
--<UE2EA>     /xf9/xf9         <CJK>
--<UE2EB>     /xf9/xfa         <CJK>
--<UE2EC>     /xf9/xfb         <CJK>
--<UE2ED>     /xf9/xfc         <CJK>
--<UE2EE>     /xf9/xfd         <CJK>
--<UE2EF>     /xf9/xfe         <CJK>
--<UE2F0>     /xfa/xa1         <CJK>
--<UE2F1>     /xfa/xa2         <CJK>
--<UE2F2>     /xfa/xa3         <CJK>
--<UE2F3>     /xfa/xa4         <CJK>
--<UE2F4>     /xfa/xa5         <CJK>
--<UE2F5>     /xfa/xa6         <CJK>
--<UE2F6>     /xfa/xa7         <CJK>
--<UE2F7>     /xfa/xa8         <CJK>
--<UE2F8>     /xfa/xa9         <CJK>
--<UE2F9>     /xfa/xaa         <CJK>
--<UE2FA>     /xfa/xab         <CJK>
--<UE2FB>     /xfa/xac         <CJK>
--<UE2FC>     /xfa/xad         <CJK>
--<UE2FD>     /xfa/xae         <CJK>
--<UE2FE>     /xfa/xaf         <CJK>
--<UE2FF>     /xfa/xb0         <CJK>
--<UE300>     /xfa/xb1         <CJK>
--<UE301>     /xfa/xb2         <CJK>
--<UE302>     /xfa/xb3         <CJK>
--<UE303>     /xfa/xb4         <CJK>
--<UE304>     /xfa/xb5         <CJK>
--<UE305>     /xfa/xb6         <CJK>
--<UE306>     /xfa/xb7         <CJK>
--<UE307>     /xfa/xb8         <CJK>
--<UE308>     /xfa/xb9         <CJK>
--<UE309>     /xfa/xba         <CJK>
--<UE30A>     /xfa/xbb         <CJK>
--<UE30B>     /xfa/xbc         <CJK>
--<UE30C>     /xfa/xbd         <CJK>
--<UE30D>     /xfa/xbe         <CJK>
--<UE30E>     /xfa/xbf         <CJK>
--<UE30F>     /xfa/xc0         <CJK>
--<UE310>     /xfa/xc1         <CJK>
--<UE311>     /xfa/xc2         <CJK>
--<UE312>     /xfa/xc3         <CJK>
--<UE313>     /xfa/xc4         <CJK>
--<UE314>     /xfa/xc5         <CJK>
--<UE315>     /xfa/xc6         <CJK>
--<UE316>     /xfa/xc7         <CJK>
--<UE317>     /xfa/xc8         <CJK>
--<UE318>     /xfa/xc9         <CJK>
--<UE319>     /xfa/xca         <CJK>
--<UE31A>     /xfa/xcb         <CJK>
--<UE31B>     /xfa/xcc         <CJK>
--<UE31C>     /xfa/xcd         <CJK>
--<UE31D>     /xfa/xce         <CJK>
--<UE31E>     /xfa/xcf         <CJK>
--<UE31F>     /xfa/xd0         <CJK>
--<UE320>     /xfa/xd1         <CJK>
--<UE321>     /xfa/xd2         <CJK>
--<UE322>     /xfa/xd3         <CJK>
--<UE323>     /xfa/xd4         <CJK>
--<UE324>     /xfa/xd5         <CJK>
--<UE325>     /xfa/xd6         <CJK>
--<UE326>     /xfa/xd7         <CJK>
--<UE327>     /xfa/xd8         <CJK>
--<UE328>     /xfa/xd9         <CJK>
--<UE329>     /xfa/xda         <CJK>
--<UE32A>     /xfa/xdb         <CJK>
--<UE32B>     /xfa/xdc         <CJK>
--<UE32C>     /xfa/xdd         <CJK>
--<UE32D>     /xfa/xde         <CJK>
--<UE32E>     /xfa/xdf         <CJK>
--<UE32F>     /xfa/xe0         <CJK>
--<UE330>     /xfa/xe1         <CJK>
--<UE331>     /xfa/xe2         <CJK>
--<UE332>     /xfa/xe3         <CJK>
--<UE333>     /xfa/xe4         <CJK>
--<UE334>     /xfa/xe5         <CJK>
--<UE335>     /xfa/xe6         <CJK>
--<UE336>     /xfa/xe7         <CJK>
--<UE337>     /xfa/xe8         <CJK>
--<UE338>     /xfa/xe9         <CJK>
--<UE339>     /xfa/xea         <CJK>
--<UE33A>     /xfa/xeb         <CJK>
--<UE33B>     /xfa/xec         <CJK>
--<UE33C>     /xfa/xed         <CJK>
--<UE33D>     /xfa/xee         <CJK>
--<UE33E>     /xfa/xef         <CJK>
--<UE33F>     /xfa/xf0         <CJK>
--<UE340>     /xfa/xf1         <CJK>
--<UE341>     /xfa/xf2         <CJK>
--<UE342>     /xfa/xf3         <CJK>
--<UE343>     /xfa/xf4         <CJK>
--<UE344>     /xfa/xf5         <CJK>
--<UE345>     /xfa/xf6         <CJK>
--<UE346>     /xfa/xf7         <CJK>
--<UE347>     /xfa/xf8         <CJK>
--<UE348>     /xfa/xf9         <CJK>
--<UE349>     /xfa/xfa         <CJK>
--<UE34A>     /xfa/xfb         <CJK>
--<UE34B>     /xfa/xfc         <CJK>
--<UE34C>     /xfa/xfd         <CJK>
--<UE34D>     /xfa/xfe         <CJK>
--<UE34E>     /xfb/xa1         <CJK>
--<UE34F>     /xfb/xa2         <CJK>
--<UE350>     /xfb/xa3         <CJK>
--<UE351>     /xfb/xa4         <CJK>
--<UE352>     /xfb/xa5         <CJK>
--<UE353>     /xfb/xa6         <CJK>
--<UE354>     /xfb/xa7         <CJK>
--<UE355>     /xfb/xa8         <CJK>
--<UE356>     /xfb/xa9         <CJK>
--<UE357>     /xfb/xaa         <CJK>
--<UE358>     /xfb/xab         <CJK>
--<UE359>     /xfb/xac         <CJK>
--<UE35A>     /xfb/xad         <CJK>
--<UE35B>     /xfb/xae         <CJK>
--<UE35C>     /xfb/xaf         <CJK>
--<UE35D>     /xfb/xb0         <CJK>
--<UE35E>     /xfb/xb1         <CJK>
--<UE35F>     /xfb/xb2         <CJK>
--<UE360>     /xfb/xb3         <CJK>
--<UE361>     /xfb/xb4         <CJK>
--<UE362>     /xfb/xb5         <CJK>
--<UE363>     /xfb/xb6         <CJK>
--<UE364>     /xfb/xb7         <CJK>
--<UE365>     /xfb/xb8         <CJK>
--<UE366>     /xfb/xb9         <CJK>
--<UE367>     /xfb/xba         <CJK>
--<UE368>     /xfb/xbb         <CJK>
--<UE369>     /xfb/xbc         <CJK>
--<UE36A>     /xfb/xbd         <CJK>
--<UE36B>     /xfb/xbe         <CJK>
--<UE36C>     /xfb/xbf         <CJK>
--<UE36D>     /xfb/xc0         <CJK>
--<UE36E>     /xfb/xc1         <CJK>
--<UE36F>     /xfb/xc2         <CJK>
--<UE370>     /xfb/xc3         <CJK>
--<UE371>     /xfb/xc4         <CJK>
--<UE372>     /xfb/xc5         <CJK>
--<UE373>     /xfb/xc6         <CJK>
--<UE374>     /xfb/xc7         <CJK>
--<UE375>     /xfb/xc8         <CJK>
--<UE376>     /xfb/xc9         <CJK>
--<UE377>     /xfb/xca         <CJK>
--<UE378>     /xfb/xcb         <CJK>
--<UE379>     /xfb/xcc         <CJK>
--<UE37A>     /xfb/xcd         <CJK>
--<UE37B>     /xfb/xce         <CJK>
--<UE37C>     /xfb/xcf         <CJK>
--<UE37D>     /xfb/xd0         <CJK>
--<UE37E>     /xfb/xd1         <CJK>
--<UE37F>     /xfb/xd2         <CJK>
--<UE380>     /xfb/xd3         <CJK>
--<UE381>     /xfb/xd4         <CJK>
--<UE382>     /xfb/xd5         <CJK>
--<UE383>     /xfb/xd6         <CJK>
--<UE384>     /xfb/xd7         <CJK>
--<UE385>     /xfb/xd8         <CJK>
--<UE386>     /xfb/xd9         <CJK>
--<UE387>     /xfb/xda         <CJK>
--<UE388>     /xfb/xdb         <CJK>
--<UE389>     /xfb/xdc         <CJK>
--<UE38A>     /xfb/xdd         <CJK>
--<UE38B>     /xfb/xde         <CJK>
--<UE38C>     /xfb/xdf         <CJK>
--<UE38D>     /xfb/xe0         <CJK>
--<UE38E>     /xfb/xe1         <CJK>
--<UE38F>     /xfb/xe2         <CJK>
--<UE390>     /xfb/xe3         <CJK>
--<UE391>     /xfb/xe4         <CJK>
--<UE392>     /xfb/xe5         <CJK>
--<UE393>     /xfb/xe6         <CJK>
--<UE394>     /xfb/xe7         <CJK>
--<UE395>     /xfb/xe8         <CJK>
--<UE396>     /xfb/xe9         <CJK>
--<UE397>     /xfb/xea         <CJK>
--<UE398>     /xfb/xeb         <CJK>
--<UE399>     /xfb/xec         <CJK>
--<UE39A>     /xfb/xed         <CJK>
--<UE39B>     /xfb/xee         <CJK>
--<UE39C>     /xfb/xef         <CJK>
--<UE39D>     /xfb/xf0         <CJK>
--<UE39E>     /xfb/xf1         <CJK>
--<UE39F>     /xfb/xf2         <CJK>
--<UE3A0>     /xfb/xf3         <CJK>
--<UE3A1>     /xfb/xf4         <CJK>
--<UE3A2>     /xfb/xf5         <CJK>
--<UE3A3>     /xfb/xf6         <CJK>
--<UE3A4>     /xfb/xf7         <CJK>
--<UE3A5>     /xfb/xf8         <CJK>
--<UE3A6>     /xfb/xf9         <CJK>
--<UE3A7>     /xfb/xfa         <CJK>
--<UE3A8>     /xfb/xfb         <CJK>
--<UE3A9>     /xfb/xfc         <CJK>
--<UE3AA>     /xfb/xfd         <CJK>
--<UE3AB>     /xfb/xfe         <CJK>
--<UE3AC>     /xfc/xa1         <CJK>
--<UE3AD>     /xfc/xa2         <CJK>
--<UE3AE>     /xfc/xa3         <CJK>
--<UE3AF>     /xfc/xa4         <CJK>
--<UE3B0>     /xfc/xa5         <CJK>
--<UE3B1>     /xfc/xa6         <CJK>
--<UE3B2>     /xfc/xa7         <CJK>
--<UE3B3>     /xfc/xa8         <CJK>
--<UE3B4>     /xfc/xa9         <CJK>
--<UE3B5>     /xfc/xaa         <CJK>
--<UE3B6>     /xfc/xab         <CJK>
--<UE3B7>     /xfc/xac         <CJK>
--<UE3B8>     /xfc/xad         <CJK>
--<UE3B9>     /xfc/xae         <CJK>
--<UE3BA>     /xfc/xaf         <CJK>
--<UE3BB>     /xfc/xb0         <CJK>
--<UE3BC>     /xfc/xb1         <CJK>
--<UE3BD>     /xfc/xb2         <CJK>
--<UE3BE>     /xfc/xb3         <CJK>
--<UE3BF>     /xfc/xb4         <CJK>
--<UE3C0>     /xfc/xb5         <CJK>
--<UE3C1>     /xfc/xb6         <CJK>
--<UE3C2>     /xfc/xb7         <CJK>
--<UE3C3>     /xfc/xb8         <CJK>
--<UE3C4>     /xfc/xb9         <CJK>
--<UE3C5>     /xfc/xba         <CJK>
--<UE3C6>     /xfc/xbb         <CJK>
--<UE3C7>     /xfc/xbc         <CJK>
--<UE3C8>     /xfc/xbd         <CJK>
--<UE3C9>     /xfc/xbe         <CJK>
--<UE3CA>     /xfc/xbf         <CJK>
--<UE3CB>     /xfc/xc0         <CJK>
--<UE3CC>     /xfc/xc1         <CJK>
--<UE3CD>     /xfc/xc2         <CJK>
--<UE3CE>     /xfc/xc3         <CJK>
--<UE3CF>     /xfc/xc4         <CJK>
--<UE3D0>     /xfc/xc5         <CJK>
--<UE3D1>     /xfc/xc6         <CJK>
--<UE3D2>     /xfc/xc7         <CJK>
--<UE3D3>     /xfc/xc8         <CJK>
--<UE3D4>     /xfc/xc9         <CJK>
--<UE3D5>     /xfc/xca         <CJK>
--<UE3D6>     /xfc/xcb         <CJK>
--<UE3D7>     /xfc/xcc         <CJK>
--<UE3D8>     /xfc/xcd         <CJK>
--<UE3D9>     /xfc/xce         <CJK>
--<UE3DA>     /xfc/xcf         <CJK>
--<UE3DB>     /xfc/xd0         <CJK>
--<UE3DC>     /xfc/xd1         <CJK>
--<UE3DD>     /xfc/xd2         <CJK>
--<UE3DE>     /xfc/xd3         <CJK>
--<UE3DF>     /xfc/xd4         <CJK>
--<UE3E0>     /xfc/xd5         <CJK>
--<UE3E1>     /xfc/xd6         <CJK>
--<UE3E2>     /xfc/xd7         <CJK>
--<UE3E3>     /xfc/xd8         <CJK>
--<UE3E4>     /xfc/xd9         <CJK>
--<UE3E5>     /xfc/xda         <CJK>
--<UE3E6>     /xfc/xdb         <CJK>
--<UE3E7>     /xfc/xdc         <CJK>
--<UE3E8>     /xfc/xdd         <CJK>
--<UE3E9>     /xfc/xde         <CJK>
--<UE3EA>     /xfc/xdf         <CJK>
--<UE3EB>     /xfc/xe0         <CJK>
--<UE3EC>     /xfc/xe1         <CJK>
--<UE3ED>     /xfc/xe2         <CJK>
--<UE3EE>     /xfc/xe3         <CJK>
--<UE3EF>     /xfc/xe4         <CJK>
--<UE3F0>     /xfc/xe5         <CJK>
--<UE3F1>     /xfc/xe6         <CJK>
--<UE3F2>     /xfc/xe7         <CJK>
--<UE3F3>     /xfc/xe8         <CJK>
--<UE3F4>     /xfc/xe9         <CJK>
--<UE3F5>     /xfc/xea         <CJK>
--<UE3F6>     /xfc/xeb         <CJK>
--<UE3F7>     /xfc/xec         <CJK>
--<UE3F8>     /xfc/xed         <CJK>
--<UE3F9>     /xfc/xee         <CJK>
--<UE3FA>     /xfc/xef         <CJK>
--<UE3FB>     /xfc/xf0         <CJK>
--<UE3FC>     /xfc/xf1         <CJK>
--<UE3FD>     /xfc/xf2         <CJK>
--<UE3FE>     /xfc/xf3         <CJK>
--<UE3FF>     /xfc/xf4         <CJK>
--<UE400>     /xfc/xf5         <CJK>
--<UE401>     /xfc/xf6         <CJK>
--<UE402>     /xfc/xf7         <CJK>
--<UE403>     /xfc/xf8         <CJK>
--<UE404>     /xfc/xf9         <CJK>
--<UE405>     /xfc/xfa         <CJK>
--<UE406>     /xfc/xfb         <CJK>
--<UE407>     /xfc/xfc         <CJK>
--<UE408>     /xfc/xfd         <CJK>
--<UE409>     /xfc/xfe         <CJK>
--<UE40A>     /xfd/xa1         <CJK>
--<UE40B>     /xfd/xa2         <CJK>
--<UE40C>     /xfd/xa3         <CJK>
--<UE40D>     /xfd/xa4         <CJK>
--<UE40E>     /xfd/xa5         <CJK>
--<UE40F>     /xfd/xa6         <CJK>
--<UE410>     /xfd/xa7         <CJK>
--<UE411>     /xfd/xa8         <CJK>
--<UE412>     /xfd/xa9         <CJK>
--<UE413>     /xfd/xaa         <CJK>
--<UE414>     /xfd/xab         <CJK>
--<UE415>     /xfd/xac         <CJK>
--<UE416>     /xfd/xad         <CJK>
--<UE417>     /xfd/xae         <CJK>
--<UE418>     /xfd/xaf         <CJK>
--<UE419>     /xfd/xb0         <CJK>
--<UE41A>     /xfd/xb1         <CJK>
--<UE41B>     /xfd/xb2         <CJK>
--<UE41C>     /xfd/xb3         <CJK>
--<UE41D>     /xfd/xb4         <CJK>
--<UE41E>     /xfd/xb5         <CJK>
--<UE41F>     /xfd/xb6         <CJK>
--<UE420>     /xfd/xb7         <CJK>
--<UE421>     /xfd/xb8         <CJK>
--<UE422>     /xfd/xb9         <CJK>
--<UE423>     /xfd/xba         <CJK>
--<UE424>     /xfd/xbb         <CJK>
--<UE425>     /xfd/xbc         <CJK>
--<UE426>     /xfd/xbd         <CJK>
--<UE427>     /xfd/xbe         <CJK>
--<UE428>     /xfd/xbf         <CJK>
--<UE429>     /xfd/xc0         <CJK>
--<UE42A>     /xfd/xc1         <CJK>
--<UE42B>     /xfd/xc2         <CJK>
--<UE42C>     /xfd/xc3         <CJK>
--<UE42D>     /xfd/xc4         <CJK>
--<UE42E>     /xfd/xc5         <CJK>
--<UE42F>     /xfd/xc6         <CJK>
--<UE430>     /xfd/xc7         <CJK>
--<UE431>     /xfd/xc8         <CJK>
--<UE432>     /xfd/xc9         <CJK>
--<UE433>     /xfd/xca         <CJK>
--<UE434>     /xfd/xcb         <CJK>
--<UE435>     /xfd/xcc         <CJK>
--<UE436>     /xfd/xcd         <CJK>
--<UE437>     /xfd/xce         <CJK>
--<UE438>     /xfd/xcf         <CJK>
--<UE439>     /xfd/xd0         <CJK>
--<UE43A>     /xfd/xd1         <CJK>
--<UE43B>     /xfd/xd2         <CJK>
--<UE43C>     /xfd/xd3         <CJK>
--<UE43D>     /xfd/xd4         <CJK>
--<UE43E>     /xfd/xd5         <CJK>
--<UE43F>     /xfd/xd6         <CJK>
--<UE440>     /xfd/xd7         <CJK>
--<UE441>     /xfd/xd8         <CJK>
--<UE442>     /xfd/xd9         <CJK>
--<UE443>     /xfd/xda         <CJK>
--<UE444>     /xfd/xdb         <CJK>
--<UE445>     /xfd/xdc         <CJK>
--<UE446>     /xfd/xdd         <CJK>
--<UE447>     /xfd/xde         <CJK>
--<UE448>     /xfd/xdf         <CJK>
--<UE449>     /xfd/xe0         <CJK>
--<UE44A>     /xfd/xe1         <CJK>
--<UE44B>     /xfd/xe2         <CJK>
--<UE44C>     /xfd/xe3         <CJK>
--<UE44D>     /xfd/xe4         <CJK>
--<UE44E>     /xfd/xe5         <CJK>
--<UE44F>     /xfd/xe6         <CJK>
--<UE450>     /xfd/xe7         <CJK>
--<UE451>     /xfd/xe8         <CJK>
--<UE452>     /xfd/xe9         <CJK>
--<UE453>     /xfd/xea         <CJK>
--<UE454>     /xfd/xeb         <CJK>
--<UE455>     /xfd/xec         <CJK>
--<UE456>     /xfd/xed         <CJK>
--<UE457>     /xfd/xee         <CJK>
--<UE458>     /xfd/xef         <CJK>
--<UE459>     /xfd/xf0         <CJK>
--<UE45A>     /xfd/xf1         <CJK>
--<UE45B>     /xfd/xf2         <CJK>
--<UE45C>     /xfd/xf3         <CJK>
--<UE45D>     /xfd/xf4         <CJK>
--<UE45E>     /xfd/xf5         <CJK>
--<UE45F>     /xfd/xf6         <CJK>
--<UE460>     /xfd/xf7         <CJK>
--<UE461>     /xfd/xf8         <CJK>
--<UE462>     /xfd/xf9         <CJK>
--<UE463>     /xfd/xfa         <CJK>
--<UE464>     /xfd/xfb         <CJK>
--<UE465>     /xfd/xfc         <CJK>
--<UE466>     /xfd/xfd         <CJK>
--<UE467>     /xfd/xfe         <CJK>
--<UE468>     /xfe/xa1         <CJK>
--<UE469>     /xfe/xa2         <CJK>
--<UE46A>     /xfe/xa3         <CJK>
--<UE46B>     /xfe/xa4         <CJK>
--<UE46C>     /xfe/xa5         <CJK>
--<UE46D>     /xfe/xa6         <CJK>
--<UE46E>     /xfe/xa7         <CJK>
--<UE46F>     /xfe/xa8         <CJK>
--<UE470>     /xfe/xa9         <CJK>
--<UE471>     /xfe/xaa         <CJK>
--<UE472>     /xfe/xab         <CJK>
--<UE473>     /xfe/xac         <CJK>
--<UE474>     /xfe/xad         <CJK>
--<UE475>     /xfe/xae         <CJK>
--<UE476>     /xfe/xaf         <CJK>
--<UE477>     /xfe/xb0         <CJK>
--<UE478>     /xfe/xb1         <CJK>
--<UE479>     /xfe/xb2         <CJK>
--<UE47A>     /xfe/xb3         <CJK>
--<UE47B>     /xfe/xb4         <CJK>
--<UE47C>     /xfe/xb5         <CJK>
--<UE47D>     /xfe/xb6         <CJK>
--<UE47E>     /xfe/xb7         <CJK>
--<UE47F>     /xfe/xb8         <CJK>
--<UE480>     /xfe/xb9         <CJK>
--<UE481>     /xfe/xba         <CJK>
--<UE482>     /xfe/xbb         <CJK>
--<UE483>     /xfe/xbc         <CJK>
--<UE484>     /xfe/xbd         <CJK>
--<UE485>     /xfe/xbe         <CJK>
--<UE486>     /xfe/xbf         <CJK>
--<UE487>     /xfe/xc0         <CJK>
--<UE488>     /xfe/xc1         <CJK>
--<UE489>     /xfe/xc2         <CJK>
--<UE48A>     /xfe/xc3         <CJK>
--<UE48B>     /xfe/xc4         <CJK>
--<UE48C>     /xfe/xc5         <CJK>
--<UE48D>     /xfe/xc6         <CJK>
--<UE48E>     /xfe/xc7         <CJK>
--<UE48F>     /xfe/xc8         <CJK>
--<UE490>     /xfe/xc9         <CJK>
--<UE491>     /xfe/xca         <CJK>
--<UE492>     /xfe/xcb         <CJK>
--<UE493>     /xfe/xcc         <CJK>
--<UE494>     /xfe/xcd         <CJK>
--<UE495>     /xfe/xce         <CJK>
--<UE496>     /xfe/xcf         <CJK>
--<UE497>     /xfe/xd0         <CJK>
--<UE498>     /xfe/xd1         <CJK>
--<UE499>     /xfe/xd2         <CJK>
--<UE49A>     /xfe/xd3         <CJK>
--<UE49B>     /xfe/xd4         <CJK>
--<UE49C>     /xfe/xd5         <CJK>
--<UE49D>     /xfe/xd6         <CJK>
--<UE49E>     /xfe/xd7         <CJK>
--<UE49F>     /xfe/xd8         <CJK>
--<UE4A0>     /xfe/xd9         <CJK>
--<UE4A1>     /xfe/xda         <CJK>
--<UE4A2>     /xfe/xdb         <CJK>
--<UE4A3>     /xfe/xdc         <CJK>
--<UE4A4>     /xfe/xdd         <CJK>
--<UE4A5>     /xfe/xde         <CJK>
--<UE4A6>     /xfe/xdf         <CJK>
--<UE4A7>     /xfe/xe0         <CJK>
--<UE4A8>     /xfe/xe1         <CJK>
--<UE4A9>     /xfe/xe2         <CJK>
--<UE4AA>     /xfe/xe3         <CJK>
--<UE4AB>     /xfe/xe4         <CJK>
--<UE4AC>     /xfe/xe5         <CJK>
--<UE4AD>     /xfe/xe6         <CJK>
--<UE4AE>     /xfe/xe7         <CJK>
--<UE4AF>     /xfe/xe8         <CJK>
--<UE4B0>     /xfe/xe9         <CJK>
--<UE4B1>     /xfe/xea         <CJK>
--<UE4B2>     /xfe/xeb         <CJK>
--<UE4B3>     /xfe/xec         <CJK>
--<UE4B4>     /xfe/xed         <CJK>
--<UE4B5>     /xfe/xee         <CJK>
--<UE4B6>     /xfe/xef         <CJK>
--<UE4B7>     /xfe/xf0         <CJK>
--<UE4B8>     /xfe/xf1         <CJK>
--<UE4B9>     /xfe/xf2         <CJK>
--<UE4BA>     /xfe/xf3         <CJK>
--<UE4BB>     /xfe/xf4         <CJK>
--<UE4BC>     /xfe/xf5         <CJK>
--<UE4BD>     /xfe/xf6         <CJK>
--<UE4BE>     /xfe/xf7         <CJK>
--<UE4BF>     /xfe/xf8         <CJK>
--<UE4C0>     /xfe/xf9         <CJK>
--<UE4C1>     /xfe/xfa         <CJK>
--<UE4C2>     /xfe/xfb         <CJK>
--<UE4C3>     /xfe/xfc         <CJK>
--<UE4C4>     /xfe/xfd         <CJK>
--<UE4C5>     /xfe/xfe         <CJK>
--<UE4C6>     /xa1/x40         <CJK>
--<UE4C7>     /xa1/x41         <CJK>
--<UE4C8>     /xa1/x42         <CJK>
--<UE4C9>     /xa1/x43         <CJK>
--<UE4CA>     /xa1/x44         <CJK>
--<UE4CB>     /xa1/x45         <CJK>
--<UE4CC>     /xa1/x46         <CJK>
--<UE4CD>     /xa1/x47         <CJK>
--<UE4CE>     /xa1/x48         <CJK>
--<UE4CF>     /xa1/x49         <CJK>
--<UE4D0>     /xa1/x4a         <CJK>
--<UE4D1>     /xa1/x4b         <CJK>
--<UE4D2>     /xa1/x4c         <CJK>
--<UE4D3>     /xa1/x4d         <CJK>
--<UE4D4>     /xa1/x4e         <CJK>
--<UE4D5>     /xa1/x4f         <CJK>
--<UE4D6>     /xa1/x50         <CJK>
--<UE4D7>     /xa1/x51         <CJK>
--<UE4D8>     /xa1/x52         <CJK>
--<UE4D9>     /xa1/x53         <CJK>
--<UE4DA>     /xa1/x54         <CJK>
--<UE4DB>     /xa1/x55         <CJK>
--<UE4DC>     /xa1/x56         <CJK>
--<UE4DD>     /xa1/x57         <CJK>
--<UE4DE>     /xa1/x58         <CJK>
--<UE4DF>     /xa1/x59         <CJK>
--<UE4E0>     /xa1/x5a         <CJK>
--<UE4E1>     /xa1/x5b         <CJK>
--<UE4E2>     /xa1/x5c         <CJK>
--<UE4E3>     /xa1/x5d         <CJK>
--<UE4E4>     /xa1/x5e         <CJK>
--<UE4E5>     /xa1/x5f         <CJK>
--<UE4E6>     /xa1/x60         <CJK>
--<UE4E7>     /xa1/x61         <CJK>
--<UE4E8>     /xa1/x62         <CJK>
--<UE4E9>     /xa1/x63         <CJK>
--<UE4EA>     /xa1/x64         <CJK>
--<UE4EB>     /xa1/x65         <CJK>
--<UE4EC>     /xa1/x66         <CJK>
--<UE4ED>     /xa1/x67         <CJK>
--<UE4EE>     /xa1/x68         <CJK>
--<UE4EF>     /xa1/x69         <CJK>
--<UE4F0>     /xa1/x6a         <CJK>
--<UE4F1>     /xa1/x6b         <CJK>
--<UE4F2>     /xa1/x6c         <CJK>
--<UE4F3>     /xa1/x6d         <CJK>
--<UE4F4>     /xa1/x6e         <CJK>
--<UE4F5>     /xa1/x6f         <CJK>
--<UE4F6>     /xa1/x70         <CJK>
--<UE4F7>     /xa1/x71         <CJK>
--<UE4F8>     /xa1/x72         <CJK>
--<UE4F9>     /xa1/x73         <CJK>
--<UE4FA>     /xa1/x74         <CJK>
--<UE4FB>     /xa1/x75         <CJK>
--<UE4FC>     /xa1/x76         <CJK>
--<UE4FD>     /xa1/x77         <CJK>
--<UE4FE>     /xa1/x78         <CJK>
--<UE4FF>     /xa1/x79         <CJK>
--<UE500>     /xa1/x7a         <CJK>
--<UE501>     /xa1/x7b         <CJK>
--<UE502>     /xa1/x7c         <CJK>
--<UE503>     /xa1/x7d         <CJK>
--<UE504>     /xa1/x7e         <CJK>
--<UE505>     /xa1/x80         <CJK>
--<UE506>     /xa1/x81         <CJK>
--<UE507>     /xa1/x82         <CJK>
--<UE508>     /xa1/x83         <CJK>
--<UE509>     /xa1/x84         <CJK>
--<UE50A>     /xa1/x85         <CJK>
--<UE50B>     /xa1/x86         <CJK>
--<UE50C>     /xa1/x87         <CJK>
--<UE50D>     /xa1/x88         <CJK>
--<UE50E>     /xa1/x89         <CJK>
--<UE50F>     /xa1/x8a         <CJK>
--<UE510>     /xa1/x8b         <CJK>
--<UE511>     /xa1/x8c         <CJK>
--<UE512>     /xa1/x8d         <CJK>
--<UE513>     /xa1/x8e         <CJK>
--<UE514>     /xa1/x8f         <CJK>
--<UE515>     /xa1/x90         <CJK>
--<UE516>     /xa1/x91         <CJK>
--<UE517>     /xa1/x92         <CJK>
--<UE518>     /xa1/x93         <CJK>
--<UE519>     /xa1/x94         <CJK>
--<UE51A>     /xa1/x95         <CJK>
--<UE51B>     /xa1/x96         <CJK>
--<UE51C>     /xa1/x97         <CJK>
--<UE51D>     /xa1/x98         <CJK>
--<UE51E>     /xa1/x99         <CJK>
--<UE51F>     /xa1/x9a         <CJK>
--<UE520>     /xa1/x9b         <CJK>
--<UE521>     /xa1/x9c         <CJK>
--<UE522>     /xa1/x9d         <CJK>
--<UE523>     /xa1/x9e         <CJK>
--<UE524>     /xa1/x9f         <CJK>
--<UE525>     /xa1/xa0         <CJK>
--<UE526>     /xa2/x40         <CJK>
--<UE527>     /xa2/x41         <CJK>
--<UE528>     /xa2/x42         <CJK>
--<UE529>     /xa2/x43         <CJK>
--<UE52A>     /xa2/x44         <CJK>
--<UE52B>     /xa2/x45         <CJK>
--<UE52C>     /xa2/x46         <CJK>
--<UE52D>     /xa2/x47         <CJK>
--<UE52E>     /xa2/x48         <CJK>
--<UE52F>     /xa2/x49         <CJK>
--<UE530>     /xa2/x4a         <CJK>
--<UE531>     /xa2/x4b         <CJK>
--<UE532>     /xa2/x4c         <CJK>
--<UE533>     /xa2/x4d         <CJK>
--<UE534>     /xa2/x4e         <CJK>
--<UE535>     /xa2/x4f         <CJK>
--<UE536>     /xa2/x50         <CJK>
--<UE537>     /xa2/x51         <CJK>
--<UE538>     /xa2/x52         <CJK>
--<UE539>     /xa2/x53         <CJK>
--<UE53A>     /xa2/x54         <CJK>
--<UE53B>     /xa2/x55         <CJK>
--<UE53C>     /xa2/x56         <CJK>
--<UE53D>     /xa2/x57         <CJK>
--<UE53E>     /xa2/x58         <CJK>
--<UE53F>     /xa2/x59         <CJK>
--<UE540>     /xa2/x5a         <CJK>
--<UE541>     /xa2/x5b         <CJK>
--<UE542>     /xa2/x5c         <CJK>
--<UE543>     /xa2/x5d         <CJK>
--<UE544>     /xa2/x5e         <CJK>
--<UE545>     /xa2/x5f         <CJK>
--<UE546>     /xa2/x60         <CJK>
--<UE547>     /xa2/x61         <CJK>
--<UE548>     /xa2/x62         <CJK>
--<UE549>     /xa2/x63         <CJK>
--<UE54A>     /xa2/x64         <CJK>
--<UE54B>     /xa2/x65         <CJK>
--<UE54C>     /xa2/x66         <CJK>
--<UE54D>     /xa2/x67         <CJK>
--<UE54E>     /xa2/x68         <CJK>
--<UE54F>     /xa2/x69         <CJK>
--<UE550>     /xa2/x6a         <CJK>
--<UE551>     /xa2/x6b         <CJK>
--<UE552>     /xa2/x6c         <CJK>
--<UE553>     /xa2/x6d         <CJK>
--<UE554>     /xa2/x6e         <CJK>
--<UE555>     /xa2/x6f         <CJK>
--<UE556>     /xa2/x70         <CJK>
--<UE557>     /xa2/x71         <CJK>
--<UE558>     /xa2/x72         <CJK>
--<UE559>     /xa2/x73         <CJK>
--<UE55A>     /xa2/x74         <CJK>
--<UE55B>     /xa2/x75         <CJK>
--<UE55C>     /xa2/x76         <CJK>
--<UE55D>     /xa2/x77         <CJK>
--<UE55E>     /xa2/x78         <CJK>
--<UE55F>     /xa2/x79         <CJK>
--<UE560>     /xa2/x7a         <CJK>
--<UE561>     /xa2/x7b         <CJK>
--<UE562>     /xa2/x7c         <CJK>
--<UE563>     /xa2/x7d         <CJK>
--<UE564>     /xa2/x7e         <CJK>
--<UE565>     /xa2/x80         <CJK>
--<UE566>     /xa2/x81         <CJK>
--<UE567>     /xa2/x82         <CJK>
--<UE568>     /xa2/x83         <CJK>
--<UE569>     /xa2/x84         <CJK>
--<UE56A>     /xa2/x85         <CJK>
--<UE56B>     /xa2/x86         <CJK>
--<UE56C>     /xa2/x87         <CJK>
--<UE56D>     /xa2/x88         <CJK>
--<UE56E>     /xa2/x89         <CJK>
--<UE56F>     /xa2/x8a         <CJK>
--<UE570>     /xa2/x8b         <CJK>
--<UE571>     /xa2/x8c         <CJK>
--<UE572>     /xa2/x8d         <CJK>
--<UE573>     /xa2/x8e         <CJK>
--<UE574>     /xa2/x8f         <CJK>
--<UE575>     /xa2/x90         <CJK>
--<UE576>     /xa2/x91         <CJK>
--<UE577>     /xa2/x92         <CJK>
--<UE578>     /xa2/x93         <CJK>
--<UE579>     /xa2/x94         <CJK>
--<UE57A>     /xa2/x95         <CJK>
--<UE57B>     /xa2/x96         <CJK>
--<UE57C>     /xa2/x97         <CJK>
--<UE57D>     /xa2/x98         <CJK>
--<UE57E>     /xa2/x99         <CJK>
--<UE57F>     /xa2/x9a         <CJK>
--<UE580>     /xa2/x9b         <CJK>
--<UE581>     /xa2/x9c         <CJK>
--<UE582>     /xa2/x9d         <CJK>
--<UE583>     /xa2/x9e         <CJK>
--<UE584>     /xa2/x9f         <CJK>
--<UE585>     /xa2/xa0         <CJK>
--<UE586>     /xa3/x40         <CJK>
--<UE587>     /xa3/x41         <CJK>
--<UE588>     /xa3/x42         <CJK>
--<UE589>     /xa3/x43         <CJK>
--<UE58A>     /xa3/x44         <CJK>
--<UE58B>     /xa3/x45         <CJK>
--<UE58C>     /xa3/x46         <CJK>
--<UE58D>     /xa3/x47         <CJK>
--<UE58E>     /xa3/x48         <CJK>
--<UE58F>     /xa3/x49         <CJK>
--<UE590>     /xa3/x4a         <CJK>
--<UE591>     /xa3/x4b         <CJK>
--<UE592>     /xa3/x4c         <CJK>
--<UE593>     /xa3/x4d         <CJK>
--<UE594>     /xa3/x4e         <CJK>
--<UE595>     /xa3/x4f         <CJK>
--<UE596>     /xa3/x50         <CJK>
--<UE597>     /xa3/x51         <CJK>
--<UE598>     /xa3/x52         <CJK>
--<UE599>     /xa3/x53         <CJK>
--<UE59A>     /xa3/x54         <CJK>
--<UE59B>     /xa3/x55         <CJK>
--<UE59C>     /xa3/x56         <CJK>
--<UE59D>     /xa3/x57         <CJK>
--<UE59E>     /xa3/x58         <CJK>
--<UE59F>     /xa3/x59         <CJK>
--<UE5A0>     /xa3/x5a         <CJK>
--<UE5A1>     /xa3/x5b         <CJK>
--<UE5A2>     /xa3/x5c         <CJK>
--<UE5A3>     /xa3/x5d         <CJK>
--<UE5A4>     /xa3/x5e         <CJK>
--<UE5A5>     /xa3/x5f         <CJK>
--<UE5A6>     /xa3/x60         <CJK>
--<UE5A7>     /xa3/x61         <CJK>
--<UE5A8>     /xa3/x62         <CJK>
--<UE5A9>     /xa3/x63         <CJK>
--<UE5AA>     /xa3/x64         <CJK>
--<UE5AB>     /xa3/x65         <CJK>
--<UE5AC>     /xa3/x66         <CJK>
--<UE5AD>     /xa3/x67         <CJK>
--<UE5AE>     /xa3/x68         <CJK>
--<UE5AF>     /xa3/x69         <CJK>
--<UE5B0>     /xa3/x6a         <CJK>
--<UE5B1>     /xa3/x6b         <CJK>
--<UE5B2>     /xa3/x6c         <CJK>
--<UE5B3>     /xa3/x6d         <CJK>
--<UE5B4>     /xa3/x6e         <CJK>
--<UE5B5>     /xa3/x6f         <CJK>
--<UE5B6>     /xa3/x70         <CJK>
--<UE5B7>     /xa3/x71         <CJK>
--<UE5B8>     /xa3/x72         <CJK>
--<UE5B9>     /xa3/x73         <CJK>
--<UE5BA>     /xa3/x74         <CJK>
--<UE5BB>     /xa3/x75         <CJK>
--<UE5BC>     /xa3/x76         <CJK>
--<UE5BD>     /xa3/x77         <CJK>
--<UE5BE>     /xa3/x78         <CJK>
--<UE5BF>     /xa3/x79         <CJK>
--<UE5C0>     /xa3/x7a         <CJK>
--<UE5C1>     /xa3/x7b         <CJK>
--<UE5C2>     /xa3/x7c         <CJK>
--<UE5C3>     /xa3/x7d         <CJK>
--<UE5C4>     /xa3/x7e         <CJK>
--<UE5C5>     /xa3/x80         <CJK>
--<UE5C6>     /xa3/x81         <CJK>
--<UE5C7>     /xa3/x82         <CJK>
--<UE5C8>     /xa3/x83         <CJK>
--<UE5C9>     /xa3/x84         <CJK>
--<UE5CA>     /xa3/x85         <CJK>
--<UE5CB>     /xa3/x86         <CJK>
--<UE5CC>     /xa3/x87         <CJK>
--<UE5CD>     /xa3/x88         <CJK>
--<UE5CE>     /xa3/x89         <CJK>
--<UE5CF>     /xa3/x8a         <CJK>
--<UE5D0>     /xa3/x8b         <CJK>
--<UE5D1>     /xa3/x8c         <CJK>
--<UE5D2>     /xa3/x8d         <CJK>
--<UE5D3>     /xa3/x8e         <CJK>
--<UE5D4>     /xa3/x8f         <CJK>
--<UE5D5>     /xa3/x90         <CJK>
--<UE5D6>     /xa3/x91         <CJK>
--<UE5D7>     /xa3/x92         <CJK>
--<UE5D8>     /xa3/x93         <CJK>
--<UE5D9>     /xa3/x94         <CJK>
--<UE5DA>     /xa3/x95         <CJK>
--<UE5DB>     /xa3/x96         <CJK>
--<UE5DC>     /xa3/x97         <CJK>
--<UE5DD>     /xa3/x98         <CJK>
--<UE5DE>     /xa3/x99         <CJK>
--<UE5DF>     /xa3/x9a         <CJK>
--<UE5E0>     /xa3/x9b         <CJK>
--<UE5E1>     /xa3/x9c         <CJK>
--<UE5E2>     /xa3/x9d         <CJK>
--<UE5E3>     /xa3/x9e         <CJK>
--<UE5E4>     /xa3/x9f         <CJK>
--<UE5E5>     /xa3/xa0         <CJK>
--<UE5E6>     /xa4/x40         <CJK>
--<UE5E7>     /xa4/x41         <CJK>
--<UE5E8>     /xa4/x42         <CJK>
--<UE5E9>     /xa4/x43         <CJK>
--<UE5EA>     /xa4/x44         <CJK>
--<UE5EB>     /xa4/x45         <CJK>
--<UE5EC>     /xa4/x46         <CJK>
--<UE5ED>     /xa4/x47         <CJK>
--<UE5EE>     /xa4/x48         <CJK>
--<UE5EF>     /xa4/x49         <CJK>
--<UE5F0>     /xa4/x4a         <CJK>
--<UE5F1>     /xa4/x4b         <CJK>
--<UE5F2>     /xa4/x4c         <CJK>
--<UE5F3>     /xa4/x4d         <CJK>
--<UE5F4>     /xa4/x4e         <CJK>
--<UE5F5>     /xa4/x4f         <CJK>
--<UE5F6>     /xa4/x50         <CJK>
--<UE5F7>     /xa4/x51         <CJK>
--<UE5F8>     /xa4/x52         <CJK>
--<UE5F9>     /xa4/x53         <CJK>
--<UE5FA>     /xa4/x54         <CJK>
--<UE5FB>     /xa4/x55         <CJK>
--<UE5FC>     /xa4/x56         <CJK>
--<UE5FD>     /xa4/x57         <CJK>
--<UE5FE>     /xa4/x58         <CJK>
--<UE5FF>     /xa4/x59         <CJK>
--<UE600>     /xa4/x5a         <CJK>
--<UE601>     /xa4/x5b         <CJK>
--<UE602>     /xa4/x5c         <CJK>
--<UE603>     /xa4/x5d         <CJK>
--<UE604>     /xa4/x5e         <CJK>
--<UE605>     /xa4/x5f         <CJK>
--<UE606>     /xa4/x60         <CJK>
--<UE607>     /xa4/x61         <CJK>
--<UE608>     /xa4/x62         <CJK>
--<UE609>     /xa4/x63         <CJK>
--<UE60A>     /xa4/x64         <CJK>
--<UE60B>     /xa4/x65         <CJK>
--<UE60C>     /xa4/x66         <CJK>
--<UE60D>     /xa4/x67         <CJK>
--<UE60E>     /xa4/x68         <CJK>
--<UE60F>     /xa4/x69         <CJK>
--<UE610>     /xa4/x6a         <CJK>
--<UE611>     /xa4/x6b         <CJK>
--<UE612>     /xa4/x6c         <CJK>
--<UE613>     /xa4/x6d         <CJK>
--<UE614>     /xa4/x6e         <CJK>
--<UE615>     /xa4/x6f         <CJK>
--<UE616>     /xa4/x70         <CJK>
--<UE617>     /xa4/x71         <CJK>
--<UE618>     /xa4/x72         <CJK>
--<UE619>     /xa4/x73         <CJK>
--<UE61A>     /xa4/x74         <CJK>
--<UE61B>     /xa4/x75         <CJK>
--<UE61C>     /xa4/x76         <CJK>
--<UE61D>     /xa4/x77         <CJK>
--<UE61E>     /xa4/x78         <CJK>
--<UE61F>     /xa4/x79         <CJK>
--<UE620>     /xa4/x7a         <CJK>
--<UE621>     /xa4/x7b         <CJK>
--<UE622>     /xa4/x7c         <CJK>
--<UE623>     /xa4/x7d         <CJK>
--<UE624>     /xa4/x7e         <CJK>
--<UE625>     /xa4/x80         <CJK>
--<UE626>     /xa4/x81         <CJK>
--<UE627>     /xa4/x82         <CJK>
--<UE628>     /xa4/x83         <CJK>
--<UE629>     /xa4/x84         <CJK>
--<UE62A>     /xa4/x85         <CJK>
--<UE62B>     /xa4/x86         <CJK>
--<UE62C>     /xa4/x87         <CJK>
--<UE62D>     /xa4/x88         <CJK>
--<UE62E>     /xa4/x89         <CJK>
--<UE62F>     /xa4/x8a         <CJK>
--<UE630>     /xa4/x8b         <CJK>
--<UE631>     /xa4/x8c         <CJK>
--<UE632>     /xa4/x8d         <CJK>
--<UE633>     /xa4/x8e         <CJK>
--<UE634>     /xa4/x8f         <CJK>
--<UE635>     /xa4/x90         <CJK>
--<UE636>     /xa4/x91         <CJK>
--<UE637>     /xa4/x92         <CJK>
--<UE638>     /xa4/x93         <CJK>
--<UE639>     /xa4/x94         <CJK>
--<UE63A>     /xa4/x95         <CJK>
--<UE63B>     /xa4/x96         <CJK>
--<UE63C>     /xa4/x97         <CJK>
--<UE63D>     /xa4/x98         <CJK>
--<UE63E>     /xa4/x99         <CJK>
--<UE63F>     /xa4/x9a         <CJK>
--<UE640>     /xa4/x9b         <CJK>
--<UE641>     /xa4/x9c         <CJK>
--<UE642>     /xa4/x9d         <CJK>
--<UE643>     /xa4/x9e         <CJK>
--<UE644>     /xa4/x9f         <CJK>
--<UE645>     /xa4/xa0         <CJK>
--<UE646>     /xa5/x40         <CJK>
--<UE647>     /xa5/x41         <CJK>
--<UE648>     /xa5/x42         <CJK>
--<UE649>     /xa5/x43         <CJK>
--<UE64A>     /xa5/x44         <CJK>
--<UE64B>     /xa5/x45         <CJK>
--<UE64C>     /xa5/x46         <CJK>
--<UE64D>     /xa5/x47         <CJK>
--<UE64E>     /xa5/x48         <CJK>
--<UE64F>     /xa5/x49         <CJK>
--<UE650>     /xa5/x4a         <CJK>
--<UE651>     /xa5/x4b         <CJK>
--<UE652>     /xa5/x4c         <CJK>
--<UE653>     /xa5/x4d         <CJK>
--<UE654>     /xa5/x4e         <CJK>
--<UE655>     /xa5/x4f         <CJK>
--<UE656>     /xa5/x50         <CJK>
--<UE657>     /xa5/x51         <CJK>
--<UE658>     /xa5/x52         <CJK>
--<UE659>     /xa5/x53         <CJK>
--<UE65A>     /xa5/x54         <CJK>
--<UE65B>     /xa5/x55         <CJK>
--<UE65C>     /xa5/x56         <CJK>
--<UE65D>     /xa5/x57         <CJK>
--<UE65E>     /xa5/x58         <CJK>
--<UE65F>     /xa5/x59         <CJK>
--<UE660>     /xa5/x5a         <CJK>
--<UE661>     /xa5/x5b         <CJK>
--<UE662>     /xa5/x5c         <CJK>
--<UE663>     /xa5/x5d         <CJK>
--<UE664>     /xa5/x5e         <CJK>
--<UE665>     /xa5/x5f         <CJK>
--<UE666>     /xa5/x60         <CJK>
--<UE667>     /xa5/x61         <CJK>
--<UE668>     /xa5/x62         <CJK>
--<UE669>     /xa5/x63         <CJK>
--<UE66A>     /xa5/x64         <CJK>
--<UE66B>     /xa5/x65         <CJK>
--<UE66C>     /xa5/x66         <CJK>
--<UE66D>     /xa5/x67         <CJK>
--<UE66E>     /xa5/x68         <CJK>
--<UE66F>     /xa5/x69         <CJK>
--<UE670>     /xa5/x6a         <CJK>
--<UE671>     /xa5/x6b         <CJK>
--<UE672>     /xa5/x6c         <CJK>
--<UE673>     /xa5/x6d         <CJK>
--<UE674>     /xa5/x6e         <CJK>
--<UE675>     /xa5/x6f         <CJK>
--<UE676>     /xa5/x70         <CJK>
--<UE677>     /xa5/x71         <CJK>
--<UE678>     /xa5/x72         <CJK>
--<UE679>     /xa5/x73         <CJK>
--<UE67A>     /xa5/x74         <CJK>
--<UE67B>     /xa5/x75         <CJK>
--<UE67C>     /xa5/x76         <CJK>
--<UE67D>     /xa5/x77         <CJK>
--<UE67E>     /xa5/x78         <CJK>
--<UE67F>     /xa5/x79         <CJK>
--<UE680>     /xa5/x7a         <CJK>
--<UE681>     /xa5/x7b         <CJK>
--<UE682>     /xa5/x7c         <CJK>
--<UE683>     /xa5/x7d         <CJK>
--<UE684>     /xa5/x7e         <CJK>
--<UE685>     /xa5/x80         <CJK>
--<UE686>     /xa5/x81         <CJK>
--<UE687>     /xa5/x82         <CJK>
--<UE688>     /xa5/x83         <CJK>
--<UE689>     /xa5/x84         <CJK>
--<UE68A>     /xa5/x85         <CJK>
--<UE68B>     /xa5/x86         <CJK>
--<UE68C>     /xa5/x87         <CJK>
--<UE68D>     /xa5/x88         <CJK>
--<UE68E>     /xa5/x89         <CJK>
--<UE68F>     /xa5/x8a         <CJK>
--<UE690>     /xa5/x8b         <CJK>
--<UE691>     /xa5/x8c         <CJK>
--<UE692>     /xa5/x8d         <CJK>
--<UE693>     /xa5/x8e         <CJK>
--<UE694>     /xa5/x8f         <CJK>
--<UE695>     /xa5/x90         <CJK>
--<UE696>     /xa5/x91         <CJK>
--<UE697>     /xa5/x92         <CJK>
--<UE698>     /xa5/x93         <CJK>
--<UE699>     /xa5/x94         <CJK>
--<UE69A>     /xa5/x95         <CJK>
--<UE69B>     /xa5/x96         <CJK>
--<UE69C>     /xa5/x97         <CJK>
--<UE69D>     /xa5/x98         <CJK>
--<UE69E>     /xa5/x99         <CJK>
--<UE69F>     /xa5/x9a         <CJK>
--<UE6A0>     /xa5/x9b         <CJK>
--<UE6A1>     /xa5/x9c         <CJK>
--<UE6A2>     /xa5/x9d         <CJK>
--<UE6A3>     /xa5/x9e         <CJK>
--<UE6A4>     /xa5/x9f         <CJK>
--<UE6A5>     /xa5/xa0         <CJK>
--<UE6A6>     /xa6/x40         <CJK>
--<UE6A7>     /xa6/x41         <CJK>
--<UE6A8>     /xa6/x42         <CJK>
--<UE6A9>     /xa6/x43         <CJK>
--<UE6AA>     /xa6/x44         <CJK>
--<UE6AB>     /xa6/x45         <CJK>
--<UE6AC>     /xa6/x46         <CJK>
--<UE6AD>     /xa6/x47         <CJK>
--<UE6AE>     /xa6/x48         <CJK>
--<UE6AF>     /xa6/x49         <CJK>
--<UE6B0>     /xa6/x4a         <CJK>
--<UE6B1>     /xa6/x4b         <CJK>
--<UE6B2>     /xa6/x4c         <CJK>
--<UE6B3>     /xa6/x4d         <CJK>
--<UE6B4>     /xa6/x4e         <CJK>
--<UE6B5>     /xa6/x4f         <CJK>
--<UE6B6>     /xa6/x50         <CJK>
--<UE6B7>     /xa6/x51         <CJK>
--<UE6B8>     /xa6/x52         <CJK>
--<UE6B9>     /xa6/x53         <CJK>
--<UE6BA>     /xa6/x54         <CJK>
--<UE6BB>     /xa6/x55         <CJK>
--<UE6BC>     /xa6/x56         <CJK>
--<UE6BD>     /xa6/x57         <CJK>
--<UE6BE>     /xa6/x58         <CJK>
--<UE6BF>     /xa6/x59         <CJK>
--<UE6C0>     /xa6/x5a         <CJK>
--<UE6C1>     /xa6/x5b         <CJK>
--<UE6C2>     /xa6/x5c         <CJK>
--<UE6C3>     /xa6/x5d         <CJK>
--<UE6C4>     /xa6/x5e         <CJK>
--<UE6C5>     /xa6/x5f         <CJK>
--<UE6C6>     /xa6/x60         <CJK>
--<UE6C7>     /xa6/x61         <CJK>
--<UE6C8>     /xa6/x62         <CJK>
--<UE6C9>     /xa6/x63         <CJK>
--<UE6CA>     /xa6/x64         <CJK>
--<UE6CB>     /xa6/x65         <CJK>
--<UE6CC>     /xa6/x66         <CJK>
--<UE6CD>     /xa6/x67         <CJK>
--<UE6CE>     /xa6/x68         <CJK>
--<UE6CF>     /xa6/x69         <CJK>
--<UE6D0>     /xa6/x6a         <CJK>
--<UE6D1>     /xa6/x6b         <CJK>
--<UE6D2>     /xa6/x6c         <CJK>
--<UE6D3>     /xa6/x6d         <CJK>
--<UE6D4>     /xa6/x6e         <CJK>
--<UE6D5>     /xa6/x6f         <CJK>
--<UE6D6>     /xa6/x70         <CJK>
--<UE6D7>     /xa6/x71         <CJK>
--<UE6D8>     /xa6/x72         <CJK>
--<UE6D9>     /xa6/x73         <CJK>
--<UE6DA>     /xa6/x74         <CJK>
--<UE6DB>     /xa6/x75         <CJK>
--<UE6DC>     /xa6/x76         <CJK>
--<UE6DD>     /xa6/x77         <CJK>
--<UE6DE>     /xa6/x78         <CJK>
--<UE6DF>     /xa6/x79         <CJK>
--<UE6E0>     /xa6/x7a         <CJK>
--<UE6E1>     /xa6/x7b         <CJK>
--<UE6E2>     /xa6/x7c         <CJK>
--<UE6E3>     /xa6/x7d         <CJK>
--<UE6E4>     /xa6/x7e         <CJK>
--<UE6E5>     /xa6/x80         <CJK>
--<UE6E6>     /xa6/x81         <CJK>
--<UE6E7>     /xa6/x82         <CJK>
--<UE6E8>     /xa6/x83         <CJK>
--<UE6E9>     /xa6/x84         <CJK>
--<UE6EA>     /xa6/x85         <CJK>
--<UE6EB>     /xa6/x86         <CJK>
--<UE6EC>     /xa6/x87         <CJK>
--<UE6ED>     /xa6/x88         <CJK>
--<UE6EE>     /xa6/x89         <CJK>
--<UE6EF>     /xa6/x8a         <CJK>
--<UE6F0>     /xa6/x8b         <CJK>
--<UE6F1>     /xa6/x8c         <CJK>
--<UE6F2>     /xa6/x8d         <CJK>
--<UE6F3>     /xa6/x8e         <CJK>
--<UE6F4>     /xa6/x8f         <CJK>
--<UE6F5>     /xa6/x90         <CJK>
--<UE6F6>     /xa6/x91         <CJK>
--<UE6F7>     /xa6/x92         <CJK>
--<UE6F8>     /xa6/x93         <CJK>
--<UE6F9>     /xa6/x94         <CJK>
--<UE6FA>     /xa6/x95         <CJK>
--<UE6FB>     /xa6/x96         <CJK>
--<UE6FC>     /xa6/x97         <CJK>
--<UE6FD>     /xa6/x98         <CJK>
--<UE6FE>     /xa6/x99         <CJK>
--<UE6FF>     /xa6/x9a         <CJK>
--<UE700>     /xa6/x9b         <CJK>
--<UE701>     /xa6/x9c         <CJK>
--<UE702>     /xa6/x9d         <CJK>
--<UE703>     /xa6/x9e         <CJK>
--<UE704>     /xa6/x9f         <CJK>
--<UE705>     /xa6/xa0         <CJK>
--<UE706>     /xa7/x40         <CJK>
--<UE707>     /xa7/x41         <CJK>
--<UE708>     /xa7/x42         <CJK>
--<UE709>     /xa7/x43         <CJK>
--<UE70A>     /xa7/x44         <CJK>
--<UE70B>     /xa7/x45         <CJK>
--<UE70C>     /xa7/x46         <CJK>
--<UE70D>     /xa7/x47         <CJK>
--<UE70E>     /xa7/x48         <CJK>
--<UE70F>     /xa7/x49         <CJK>
--<UE710>     /xa7/x4a         <CJK>
--<UE711>     /xa7/x4b         <CJK>
--<UE712>     /xa7/x4c         <CJK>
--<UE713>     /xa7/x4d         <CJK>
--<UE714>     /xa7/x4e         <CJK>
--<UE715>     /xa7/x4f         <CJK>
--<UE716>     /xa7/x50         <CJK>
--<UE717>     /xa7/x51         <CJK>
--<UE718>     /xa7/x52         <CJK>
--<UE719>     /xa7/x53         <CJK>
--<UE71A>     /xa7/x54         <CJK>
--<UE71B>     /xa7/x55         <CJK>
--<UE71C>     /xa7/x56         <CJK>
--<UE71D>     /xa7/x57         <CJK>
--<UE71E>     /xa7/x58         <CJK>
--<UE71F>     /xa7/x59         <CJK>
--<UE720>     /xa7/x5a         <CJK>
--<UE721>     /xa7/x5b         <CJK>
--<UE722>     /xa7/x5c         <CJK>
--<UE723>     /xa7/x5d         <CJK>
--<UE724>     /xa7/x5e         <CJK>
--<UE725>     /xa7/x5f         <CJK>
--<UE726>     /xa7/x60         <CJK>
--<UE727>     /xa7/x61         <CJK>
--<UE728>     /xa7/x62         <CJK>
--<UE729>     /xa7/x63         <CJK>
--<UE72A>     /xa7/x64         <CJK>
--<UE72B>     /xa7/x65         <CJK>
--<UE72C>     /xa7/x66         <CJK>
--<UE72D>     /xa7/x67         <CJK>
--<UE72E>     /xa7/x68         <CJK>
--<UE72F>     /xa7/x69         <CJK>
--<UE730>     /xa7/x6a         <CJK>
--<UE731>     /xa7/x6b         <CJK>
--<UE732>     /xa7/x6c         <CJK>
--<UE733>     /xa7/x6d         <CJK>
--<UE734>     /xa7/x6e         <CJK>
--<UE735>     /xa7/x6f         <CJK>
--<UE736>     /xa7/x70         <CJK>
--<UE737>     /xa7/x71         <CJK>
--<UE738>     /xa7/x72         <CJK>
--<UE739>     /xa7/x73         <CJK>
--<UE73A>     /xa7/x74         <CJK>
--<UE73B>     /xa7/x75         <CJK>
--<UE73C>     /xa7/x76         <CJK>
--<UE73D>     /xa7/x77         <CJK>
--<UE73E>     /xa7/x78         <CJK>
--<UE73F>     /xa7/x79         <CJK>
--<UE740>     /xa7/x7a         <CJK>
--<UE741>     /xa7/x7b         <CJK>
--<UE742>     /xa7/x7c         <CJK>
--<UE743>     /xa7/x7d         <CJK>
--<UE744>     /xa7/x7e         <CJK>
--<UE745>     /xa7/x80         <CJK>
--<UE746>     /xa7/x81         <CJK>
--<UE747>     /xa7/x82         <CJK>
--<UE748>     /xa7/x83         <CJK>
--<UE749>     /xa7/x84         <CJK>
--<UE74A>     /xa7/x85         <CJK>
--<UE74B>     /xa7/x86         <CJK>
--<UE74C>     /xa7/x87         <CJK>
--<UE74D>     /xa7/x88         <CJK>
--<UE74E>     /xa7/x89         <CJK>
--<UE74F>     /xa7/x8a         <CJK>
--<UE750>     /xa7/x8b         <CJK>
--<UE751>     /xa7/x8c         <CJK>
--<UE752>     /xa7/x8d         <CJK>
--<UE753>     /xa7/x8e         <CJK>
--<UE754>     /xa7/x8f         <CJK>
--<UE755>     /xa7/x90         <CJK>
--<UE756>     /xa7/x91         <CJK>
--<UE757>     /xa7/x92         <CJK>
--<UE758>     /xa7/x93         <CJK>
--<UE759>     /xa7/x94         <CJK>
--<UE75A>     /xa7/x95         <CJK>
--<UE75B>     /xa7/x96         <CJK>
--<UE75C>     /xa7/x97         <CJK>
--<UE75D>     /xa7/x98         <CJK>
--<UE75E>     /xa7/x99         <CJK>
--<UE75F>     /xa7/x9a         <CJK>
--<UE760>     /xa7/x9b         <CJK>
--<UE761>     /xa7/x9c         <CJK>
--<UE762>     /xa7/x9d         <CJK>
--<UE763>     /xa7/x9e         <CJK>
--<UE764>     /xa7/x9f         <CJK>
--<UE765>     /xa7/xa0         <CJK>
--<UE766>     /xa2/xab         <CJK>
--<UE767>     /xa2/xac         <CJK>
--<UE768>     /xa2/xad         <CJK>
--<UE769>     /xa2/xae         <CJK>
--<UE76A>     /xa2/xaf         <CJK>
--<UE76B>     /xa2/xb0         <CJK>
--<UE76C>     /x83/x36/xc7/x39 <CJK>
--<UE76D>     /xa2/xe4         <CJK>
--<UE76E>     /xa2/xef         <CJK>
--<UE76F>     /xa2/xf0         <CJK>
--<UE770>     /xa2/xfd         <CJK>
--<UE771>     /xa2/xfe         <CJK>
--<UE772>     /xa4/xf4         <CJK>
--<UE773>     /xa4/xf5         <CJK>
--<UE774>     /xa4/xf6         <CJK>
--<UE775>     /xa4/xf7         <CJK>
--<UE776>     /xa4/xf8         <CJK>
--<UE777>     /xa4/xf9         <CJK>
--<UE778>     /xa4/xfa         <CJK>
--<UE779>     /xa4/xfb         <CJK>
--<UE77A>     /xa4/xfc         <CJK>
--<UE77B>     /xa4/xfd         <CJK>
--<UE77C>     /xa4/xfe         <CJK>
--<UE77D>     /xa5/xf7         <CJK>
--<UE77E>     /xa5/xf8         <CJK>
--<UE77F>     /xa5/xf9         <CJK>
--<UE780>     /xa5/xfa         <CJK>
--<UE781>     /xa5/xfb         <CJK>
--<UE782>     /xa5/xfc         <CJK>
--<UE783>     /xa5/xfd         <CJK>
--<UE784>     /xa5/xfe         <CJK>
--<UE785>     /xa6/xb9         <CJK>
--<UE786>     /xa6/xba         <CJK>
--<UE787>     /xa6/xbb         <CJK>
--<UE788>     /xa6/xbc         <CJK>
--<UE789>     /xa6/xbd         <CJK>
--<UE78A>     /xa6/xbe         <CJK>
--<UE78B>     /xa6/xbf         <CJK>
--<UE78C>     /xa6/xc0         <CJK>
--<UE78D>     /xa6/xd9         <CJK>
--<UE78E>     /xa6/xda         <CJK>
--<UE78F>     /xa6/xdb         <CJK>
--<UE790>     /xa6/xdc         <CJK>
--<UE791>     /xa6/xdd         <CJK>
--<UE792>     /xa6/xde         <CJK>
--<UE793>     /xa6/xdf         <CJK>
--<UE794>     /xa6/xec         <CJK>
--<UE795>     /xa6/xed         <CJK>
--<UE796>     /xa6/xf3         <CJK>
--<UE797>     /xa6/xf6         <CJK>
--<UE798>     /xa6/xf7         <CJK>
--<UE799>     /xa6/xf8         <CJK>
--<UE79A>     /xa6/xf9         <CJK>
--<UE79B>     /xa6/xfa         <CJK>
--<UE79C>     /xa6/xfb         <CJK>
--<UE79D>     /xa6/xfc         <CJK>
--<UE79E>     /xa6/xfd         <CJK>
--<UE79F>     /xa6/xfe         <CJK>
--<UE7A0>     /xa7/xc2         <CJK>
--<UE7A1>     /xa7/xc3         <CJK>
--<UE7A2>     /xa7/xc4         <CJK>
--<UE7A3>     /xa7/xc5         <CJK>
--<UE7A4>     /xa7/xc6         <CJK>
--<UE7A5>     /xa7/xc7         <CJK>
--<UE7A6>     /xa7/xc8         <CJK>
--<UE7A7>     /xa7/xc9         <CJK>
--<UE7A8>     /xa7/xca         <CJK>
--<UE7A9>     /xa7/xcb         <CJK>
--<UE7AA>     /xa7/xcc         <CJK>
--<UE7AB>     /xa7/xcd         <CJK>
--<UE7AC>     /xa7/xce         <CJK>
--<UE7AD>     /xa7/xcf         <CJK>
--<UE7AE>     /xa7/xd0         <CJK>
--<UE7AF>     /xa7/xf2         <CJK>
--<UE7B0>     /xa7/xf3         <CJK>
--<UE7B1>     /xa7/xf4         <CJK>
--<UE7B2>     /xa7/xf5         <CJK>
--<UE7B3>     /xa7/xf6         <CJK>
--<UE7B4>     /xa7/xf7         <CJK>
--<UE7B5>     /xa7/xf8         <CJK>
--<UE7B6>     /xa7/xf9         <CJK>
--<UE7B7>     /xa7/xfa         <CJK>
--<UE7B8>     /xa7/xfb         <CJK>
--<UE7B9>     /xa7/xfc         <CJK>
--<UE7BA>     /xa7/xfd         <CJK>
--<UE7BB>     /xa7/xfe         <CJK>
--<UE7BC>     /xa8/x96         <CJK>
--<UE7BD>     /xa8/x97         <CJK>
--<UE7BE>     /xa8/x98         <CJK>
--<UE7BF>     /xa8/x99         <CJK>
--<UE7C0>     /xa8/x9a         <CJK>
--<UE7C1>     /xa8/x9b         <CJK>
--<UE7C2>     /xa8/x9c         <CJK>
--<UE7C3>     /xa8/x9d         <CJK>
--<UE7C4>     /xa8/x9e         <CJK>
--<UE7C5>     /xa8/x9f         <CJK>
--<UE7C6>     /xa8/xa0         <CJK>
--<UE7C7>     /x81/x35/xf4/x37 <CJK>
--<UE7C8>     /x83/x36/xc8/x30 <CJK>
--<UE7C9>     /xa8/xc1         <CJK>
--<UE7CA>     /xa8/xc2         <CJK>
--<UE7CB>     /xa8/xc3         <CJK>
--<UE7CC>     /xa8/xc4         <CJK>
--<UE7CD>     /xa8/xea         <CJK>
--<UE7CE>     /xa8/xeb         <CJK>
--<UE7CF>     /xa8/xec         <CJK>
--<UE7D0>     /xa8/xed         <CJK>
--<UE7D1>     /xa8/xee         <CJK>
--<UE7D2>     /xa8/xef         <CJK>
--<UE7D3>     /xa8/xf0         <CJK>
--<UE7D4>     /xa8/xf1         <CJK>
--<UE7D5>     /xa8/xf2         <CJK>
--<UE7D6>     /xa8/xf3         <CJK>
--<UE7D7>     /xa8/xf4         <CJK>
--<UE7D8>     /xa8/xf5         <CJK>
--<UE7D9>     /xa8/xf6         <CJK>
--<UE7DA>     /xa8/xf7         <CJK>
--<UE7DB>     /xa8/xf8         <CJK>
--<UE7DC>     /xa8/xf9         <CJK>
--<UE7DD>     /xa8/xfa         <CJK>
--<UE7DE>     /xa8/xfb         <CJK>
--<UE7DF>     /xa8/xfc         <CJK>
--<UE7E0>     /xa8/xfd         <CJK>
--<UE7E1>     /xa8/xfe         <CJK>
--<UE7E2>     /xa9/x58         <CJK>
--<UE7E3>     /xa9/x5b         <CJK>
--<UE7E4>     /xa9/x5d         <CJK>
--<UE7E5>     /xa9/x5e         <CJK>
--<UE7E6>     /xa9/x5f         <CJK>
--<UE7E7>     /x83/x36/xc8/x31 <CJK>
--<UE7E8>     /x83/x36/xc8/x32 <CJK>
--<UE7E9>     /x83/x36/xc8/x33 <CJK>
--<UE7EA>     /x83/x36/xc8/x34 <CJK>
--<UE7EB>     /x83/x36/xc8/x35 <CJK>
--<UE7EC>     /x83/x36/xc8/x36 <CJK>
--<UE7ED>     /x83/x36/xc8/x37 <CJK>
--<UE7EE>     /x83/x36/xc8/x38 <CJK>
--<UE7EF>     /x83/x36/xc8/x39 <CJK>
--<UE7F0>     /x83/x36/xc9/x30 <CJK>
--<UE7F1>     /x83/x36/xc9/x31 <CJK>
--<UE7F2>     /x83/x36/xc9/x32 <CJK>
--<UE7F3>     /x83/x36/xc9/x33 <CJK>
--<UE7F4>     /xa9/x97         <CJK>
--<UE7F5>     /xa9/x98         <CJK>
--<UE7F6>     /xa9/x99         <CJK>
--<UE7F7>     /xa9/x9a         <CJK>
--<UE7F8>     /xa9/x9b         <CJK>
--<UE7F9>     /xa9/x9c         <CJK>
--<UE7FA>     /xa9/x9d         <CJK>
--<UE7FB>     /xa9/x9e         <CJK>
--<UE7FC>     /xa9/x9f         <CJK>
--<UE7FD>     /xa9/xa0         <CJK>
--<UE7FE>     /xa9/xa1         <CJK>
--<UE7FF>     /xa9/xa2         <CJK>
--<UE800>     /xa9/xa3         <CJK>
--<UE801>     /xa9/xf0         <CJK>
--<UE802>     /xa9/xf1         <CJK>
--<UE803>     /xa9/xf2         <CJK>
--<UE804>     /xa9/xf3         <CJK>
--<UE805>     /xa9/xf4         <CJK>
--<UE806>     /xa9/xf5         <CJK>
--<UE807>     /xa9/xf6         <CJK>
--<UE808>     /xa9/xf7         <CJK>
--<UE809>     /xa9/xf8         <CJK>
--<UE80A>     /xa9/xf9         <CJK>
--<UE80B>     /xa9/xfa         <CJK>
--<UE80C>     /xa9/xfb         <CJK>
--<UE80D>     /xa9/xfc         <CJK>
--<UE80E>     /xa9/xfd         <CJK>
--<UE80F>     /xa9/xfe         <CJK>
--<UE810>     /xd7/xfa         <CJK>
--<UE811>     /xd7/xfb         <CJK>
--<UE812>     /xd7/xfc         <CJK>
--<UE813>     /xd7/xfd         <CJK>
--<UE814>     /xd7/xfe         <CJK>
--<UE815>     /x83/x36/xc9/x34 <CJK>
--<UE816>     /xfe/x51         <CJK>
--<UE817>     /xfe/x52         <CJK>
--<UE818>     /xfe/x53         <CJK>
--<UE819>     /x83/x36/xc9/x35 <CJK>
--<UE81A>     /x83/x36/xc9/x36 <CJK>
--<UE81B>     /x83/x36/xc9/x37 <CJK>
--<UE81C>     /x83/x36/xc9/x38 <CJK>
--<UE81D>     /x83/x36/xc9/x39 <CJK>
--<UE81E>     /xfe/x59         <CJK>
--<UE81F>     /x83/x36/xca/x30 <CJK>
--<UE820>     /x83/x36/xca/x31 <CJK>
--<UE821>     /x83/x36/xca/x32 <CJK>
--<UE822>     /x83/x36/xca/x33 <CJK>
--<UE823>     /x83/x36/xca/x34 <CJK>
--<UE824>     /x83/x36/xca/x35 <CJK>
--<UE825>     /x83/x36/xca/x36 <CJK>
--<UE826>     /xfe/x61         <CJK>
--<UE827>     /x83/x36/xca/x37 <CJK>
--<UE828>     /x83/x36/xca/x38 <CJK>
--<UE829>     /x83/x36/xca/x39 <CJK>
--<UE82A>     /x83/x36/xcb/x30 <CJK>
--<UE82B>     /xfe/x66         <CJK>
--<UE82C>     /xfe/x67         <CJK>
--<UE82D>     /x83/x36/xcb/x31 <CJK>
--<UE82E>     /x83/x36/xcb/x32 <CJK>
--<UE82F>     /x83/x36/xcb/x33 <CJK>
--<UE830>     /x83/x36/xcb/x34 <CJK>
--<UE831>     /xfe/x6c         <CJK>
--<UE832>     /xfe/x6d         <CJK>
--<UE833>     /x83/x36/xcb/x35 <CJK>
--<UE834>     /x83/x36/xcb/x36 <CJK>
--<UE835>     /x83/x36/xcb/x37 <CJK>
--<UE836>     /x83/x36/xcb/x38 <CJK>
--<UE837>     /x83/x36/xcb/x39 <CJK>
--<UE838>     /x83/x36/xcc/x30 <CJK>
--<UE839>     /x83/x36/xcc/x31 <CJK>
--<UE83A>     /x83/x36/xcc/x32 <CJK>
--<UE83B>     /xfe/x76         <CJK>
--<UE83C>     /x83/x36/xcc/x33 <CJK>
--<UE83D>     /x83/x36/xcc/x34 <CJK>
--<UE83E>     /x83/x36/xcc/x35 <CJK>
--<UE83F>     /x83/x36/xcc/x36 <CJK>
--<UE840>     /x83/x36/xcc/x37 <CJK>
--<UE841>     /x83/x36/xcc/x38 <CJK>
--<UE842>     /x83/x36/xcc/x39 <CJK>
--<UE843>     /xfe/x7e         <CJK>
--<UE844>     /x83/x36/xcd/x30 <CJK>
--<UE845>     /x83/x36/xcd/x31 <CJK>
--<UE846>     /x83/x36/xcd/x32 <CJK>
--<UE847>     /x83/x36/xcd/x33 <CJK>
--<UE848>     /x83/x36/xcd/x34 <CJK>
--<UE849>     /x83/x36/xcd/x35 <CJK>
--<UE84A>     /x83/x36/xcd/x36 <CJK>
--<UE84B>     /x83/x36/xcd/x37 <CJK>
--<UE84C>     /x83/x36/xcd/x38 <CJK>
--<UE84D>     /x83/x36/xcd/x39 <CJK>
--<UE84E>     /x83/x36/xce/x30 <CJK>
--<UE84F>     /x83/x36/xce/x31 <CJK>
--<UE850>     /x83/x36/xce/x32 <CJK>
--<UE851>     /x83/x36/xce/x33 <CJK>
--<UE852>     /x83/x36/xce/x34 <CJK>
--<UE853>     /x83/x36/xce/x35 <CJK>
--<UE854>     /xfe/x90         <CJK>
--<UE855>     /xfe/x91         <CJK>
--<UE856>     /x83/x36/xce/x36 <CJK>
--<UE857>     /x83/x36/xce/x37 <CJK>
--<UE858>     /x83/x36/xce/x38 <CJK>
--<UE859>     /x83/x36/xce/x39 <CJK>
--<UE85A>     /x83/x36/xcf/x30 <CJK>
--<UE85B>     /x83/x36/xcf/x31 <CJK>
--<UE85C>     /x83/x36/xcf/x32 <CJK>
--<UE85D>     /x83/x36/xcf/x33 <CJK>
--<UE85E>     /x83/x36/xcf/x34 <CJK>
--<UE85F>     /x83/x36/xcf/x35 <CJK>
--<UE860>     /x83/x36/xcf/x36 <CJK>
--<UE861>     /x83/x36/xcf/x37 <CJK>
--<UE862>     /x83/x36/xcf/x38 <CJK>
--<UE863>     /x83/x36/xcf/x39 <CJK>
--<UE864>     /xfe/xa0         <CJK>
-+<U9FA6>     /x82/x35/x8f/x33 <CJK>
-+<U9FA7>     /x82/x35/x8f/x34 <CJK>
-+<U9FA8>     /x82/x35/x8f/x35 <CJK>
-+<U9FA9>     /x82/x35/x8f/x36 <CJK>
-+<U9FAA>     /x82/x35/x8f/x37 <CJK>
-+<U9FAB>     /x82/x35/x8f/x38 <CJK>
-+<U9FAC>     /x82/x35/x8f/x39 <CJK>
-+<U9FAD>     /x82/x35/x90/x30 <CJK>
-+<U9FAE>     /x82/x35/x90/x31 <CJK>
-+<U9FAF>     /x82/x35/x90/x32 <CJK>
-+<U9FB0>     /x82/x35/x90/x33 <CJK>
-+<U9FB1>     /x82/x35/x90/x34 <CJK>
-+<U9FB2>     /x82/x35/x90/x35 <CJK>
-+<U9FB3>     /x82/x35/x90/x36 <CJK>
-+<U9FB4>     /xfe/x59         <CJK>
-+<U9FB5>     /xfe/x61         <CJK>
-+<U9FB6>     /xfe/x66         <CJK>
-+<U9FB7>     /xfe/x67         <CJK>
-+<U9FB8>     /xfe/x6d         <CJK>
-+<U9FB9>     /xfe/x7e         <CJK>
-+<U9FBA>     /xfe/x90         <CJK>
-+<U9FBB>     /xfe/xa0         <CJK>
-+<U9FBC>     /x82/x35/x91/x35 <CJK>
-+<U9FBD>     /x82/x35/x91/x36 <CJK>
-+<U9FBE>     /x82/x35/x91/x37 <CJK>
-+<U9FBF>     /x82/x35/x91/x38 <CJK>
-+<U9FC0>     /x82/x35/x91/x39 <CJK>
-+<U9FC1>     /x82/x35/x92/x30 <CJK>
-+<U9FC2>     /x82/x35/x92/x31 <CJK>
-+<U9FC3>     /x82/x35/x92/x32 <CJK>
-+<U9FC4>     /x82/x35/x92/x33 <CJK>
-+<U9FC5>     /x82/x35/x92/x34 <CJK>
-+<U9FC6>     /x82/x35/x92/x35 <CJK>
-+<U9FC7>     /x82/x35/x92/x36 <CJK>
-+<U9FC8>     /x82/x35/x92/x37 <CJK>
-+<U9FC9>     /x82/x35/x92/x38 <CJK>
-+<U9FCA>     /x82/x35/x92/x39 <CJK>
-+<U9FCB>     /x82/x35/x93/x30 <CJK>
-+<U9FCC>     /x82/x35/x93/x31 <UNASSIGNED>
-+<U9FCD>     /x82/x35/x93/x32 <UNASSIGNED>
-+<U9FCE>     /x82/x35/x93/x33 <UNASSIGNED>
-+<U9FCF>     /x82/x35/x93/x34 <UNASSIGNED>
-+<U9FD0>     /x82/x35/x93/x35 <UNASSIGNED>
-+<U9FD1>     /x82/x35/x93/x36 <UNASSIGNED>
-+<U9FD2>     /x82/x35/x93/x37 <UNASSIGNED>
-+<U9FD3>     /x82/x35/x93/x38 <UNASSIGNED>
-+<U9FD4>     /x82/x35/x93/x39 <UNASSIGNED>
-+<U9FD5>     /x82/x35/x94/x30 <UNASSIGNED>
-+<U9FD6>     /x82/x35/x94/x31 <UNASSIGNED>
-+<U9FD7>     /x82/x35/x94/x32 <UNASSIGNED>
-+<U9FD8>     /x82/x35/x94/x33 <UNASSIGNED>
-+<U9FD9>     /x82/x35/x94/x34 <UNASSIGNED>
-+<U9FDA>     /x82/x35/x94/x35 <UNASSIGNED>
-+<U9FDB>     /x82/x35/x94/x36 <UNASSIGNED>
-+<U9FDC>     /x82/x35/x94/x37 <UNASSIGNED>
-+<U9FDD>     /x82/x35/x94/x38 <UNASSIGNED>
-+<U9FDE>     /x82/x35/x94/x39 <UNASSIGNED>
-+<U9FDF>     /x82/x35/x95/x30 <UNASSIGNED>
-+<U9FE0>     /x82/x35/x95/x31 <UNASSIGNED>
-+<U9FE1>     /x82/x35/x95/x32 <UNASSIGNED>
-+<U9FE2>     /x82/x35/x95/x33 <UNASSIGNED>
-+<U9FE3>     /x82/x35/x95/x34 <UNASSIGNED>
-+<U9FE4>     /x82/x35/x95/x35 <UNASSIGNED>
-+<U9FE5>     /x82/x35/x95/x36 <UNASSIGNED>
-+<U9FE6>     /x82/x35/x95/x37 <UNASSIGNED>
-+<U9FE7>     /x82/x35/x95/x38 <UNASSIGNED>
-+<U9FE8>     /x82/x35/x95/x39 <UNASSIGNED>
-+<U9FE9>     /x82/x35/x96/x30 <UNASSIGNED>
-+<U9FEA>     /x82/x35/x96/x31 <UNASSIGNED>
-+<U9FEB>     /x82/x35/x96/x32 <UNASSIGNED>
-+<U9FEC>     /x82/x35/x96/x33 <UNASSIGNED>
-+<U9FED>     /x82/x35/x96/x34 <UNASSIGNED>
-+<U9FEE>     /x82/x35/x96/x35 <UNASSIGNED>
-+<U9FEF>     /x82/x35/x96/x36 <UNASSIGNED>
-+<U9FF0>     /x82/x35/x96/x37 <UNASSIGNED>
-+<U9FF1>     /x82/x35/x96/x38 <UNASSIGNED>
-+<U9FF2>     /x82/x35/x96/x39 <UNASSIGNED>
-+<U9FF3>     /x82/x35/x97/x30 <UNASSIGNED>
-+<U9FF4>     /x82/x35/x97/x31 <UNASSIGNED>
-+<U9FF5>     /x82/x35/x97/x32 <UNASSIGNED>
-+<U9FF6>     /x82/x35/x97/x33 <UNASSIGNED>
-+<U9FF7>     /x82/x35/x97/x34 <UNASSIGNED>
-+<U9FF8>     /x82/x35/x97/x35 <UNASSIGNED>
-+<U9FF9>     /x82/x35/x97/x36 <UNASSIGNED>
-+<U9FFA>     /x82/x35/x97/x37 <UNASSIGNED>
-+<U9FFB>     /x82/x35/x97/x38 <UNASSIGNED>
-+<U9FFC>     /x82/x35/x97/x39 <UNASSIGNED>
-+<U9FFD>     /x82/x35/x98/x30 <UNASSIGNED>
-+<U9FFE>     /x82/x35/x98/x31 <UNASSIGNED>
-+<U9FFF>     /x82/x35/x98/x32 <UNASSIGNED>
-+<UA000>     /x82/x35/x98/x33 YI SYLLABLE IT
-+<UA001>     /x82/x35/x98/x34 YI SYLLABLE IX
-+<UA002>     /x82/x35/x98/x35 YI SYLLABLE I
-+<UA003>     /x82/x35/x98/x36 YI SYLLABLE IP
-+<UA004>     /x82/x35/x98/x37 YI SYLLABLE IET
-+<UA005>     /x82/x35/x98/x38 YI SYLLABLE IEX
-+<UA006>     /x82/x35/x98/x39 YI SYLLABLE IE
-+<UA007>     /x82/x35/x99/x30 YI SYLLABLE IEP
-+<UA008>     /x82/x35/x99/x31 YI SYLLABLE AT
-+<UA009>     /x82/x35/x99/x32 YI SYLLABLE AX
-+<UA00A>     /x82/x35/x99/x33 YI SYLLABLE A
-+<UA00B>     /x82/x35/x99/x34 YI SYLLABLE AP
-+<UA00C>     /x82/x35/x99/x35 YI SYLLABLE UOX
-+<UA00D>     /x82/x35/x99/x36 YI SYLLABLE UO
-+<UA00E>     /x82/x35/x99/x37 YI SYLLABLE UOP
-+<UA00F>     /x82/x35/x99/x38 YI SYLLABLE OT
-+<UA010>     /x82/x35/x99/x39 YI SYLLABLE OX
-+<UA011>     /x82/x35/x9a/x30 YI SYLLABLE O
-+<UA012>     /x82/x35/x9a/x31 YI SYLLABLE OP
-+<UA013>     /x82/x35/x9a/x32 YI SYLLABLE EX
-+<UA014>     /x82/x35/x9a/x33 YI SYLLABLE E
-+<UA015>     /x82/x35/x9a/x34 YI SYLLABLE WU
-+<UA016>     /x82/x35/x9a/x35 YI SYLLABLE BIT
-+<UA017>     /x82/x35/x9a/x36 YI SYLLABLE BIX
-+<UA018>     /x82/x35/x9a/x37 YI SYLLABLE BI
-+<UA019>     /x82/x35/x9a/x38 YI SYLLABLE BIP
-+<UA01A>     /x82/x35/x9a/x39 YI SYLLABLE BIET
-+<UA01B>     /x82/x35/x9b/x30 YI SYLLABLE BIEX
-+<UA01C>     /x82/x35/x9b/x31 YI SYLLABLE BIE
-+<UA01D>     /x82/x35/x9b/x32 YI SYLLABLE BIEP
-+<UA01E>     /x82/x35/x9b/x33 YI SYLLABLE BAT
-+<UA01F>     /x82/x35/x9b/x34 YI SYLLABLE BAX
-+<UA020>     /x82/x35/x9b/x35 YI SYLLABLE BA
-+<UA021>     /x82/x35/x9b/x36 YI SYLLABLE BAP
-+<UA022>     /x82/x35/x9b/x37 YI SYLLABLE BUOX
-+<UA023>     /x82/x35/x9b/x38 YI SYLLABLE BUO
-+<UA024>     /x82/x35/x9b/x39 YI SYLLABLE BUOP
-+<UA025>     /x82/x35/x9c/x30 YI SYLLABLE BOT
-+<UA026>     /x82/x35/x9c/x31 YI SYLLABLE BOX
-+<UA027>     /x82/x35/x9c/x32 YI SYLLABLE BO
-+<UA028>     /x82/x35/x9c/x33 YI SYLLABLE BOP
-+<UA029>     /x82/x35/x9c/x34 YI SYLLABLE BEX
-+<UA02A>     /x82/x35/x9c/x35 YI SYLLABLE BE
-+<UA02B>     /x82/x35/x9c/x36 YI SYLLABLE BEP
-+<UA02C>     /x82/x35/x9c/x37 YI SYLLABLE BUT
-+<UA02D>     /x82/x35/x9c/x38 YI SYLLABLE BUX
-+<UA02E>     /x82/x35/x9c/x39 YI SYLLABLE BU
-+<UA02F>     /x82/x35/x9d/x30 YI SYLLABLE BUP
-+<UA030>     /x82/x35/x9d/x31 YI SYLLABLE BURX
-+<UA031>     /x82/x35/x9d/x32 YI SYLLABLE BUR
-+<UA032>     /x82/x35/x9d/x33 YI SYLLABLE BYT
-+<UA033>     /x82/x35/x9d/x34 YI SYLLABLE BYX
-+<UA034>     /x82/x35/x9d/x35 YI SYLLABLE BY
-+<UA035>     /x82/x35/x9d/x36 YI SYLLABLE BYP
-+<UA036>     /x82/x35/x9d/x37 YI SYLLABLE BYRX
-+<UA037>     /x82/x35/x9d/x38 YI SYLLABLE BYR
-+<UA038>     /x82/x35/x9d/x39 YI SYLLABLE PIT
-+<UA039>     /x82/x35/x9e/x30 YI SYLLABLE PIX
-+<UA03A>     /x82/x35/x9e/x31 YI SYLLABLE PI
-+<UA03B>     /x82/x35/x9e/x32 YI SYLLABLE PIP
-+<UA03C>     /x82/x35/x9e/x33 YI SYLLABLE PIEX
-+<UA03D>     /x82/x35/x9e/x34 YI SYLLABLE PIE
-+<UA03E>     /x82/x35/x9e/x35 YI SYLLABLE PIEP
-+<UA03F>     /x82/x35/x9e/x36 YI SYLLABLE PAT
-+<UA040>     /x82/x35/x9e/x37 YI SYLLABLE PAX
-+<UA041>     /x82/x35/x9e/x38 YI SYLLABLE PA
-+<UA042>     /x82/x35/x9e/x39 YI SYLLABLE PAP
-+<UA043>     /x82/x35/x9f/x30 YI SYLLABLE PUOX
-+<UA044>     /x82/x35/x9f/x31 YI SYLLABLE PUO
-+<UA045>     /x82/x35/x9f/x32 YI SYLLABLE PUOP
-+<UA046>     /x82/x35/x9f/x33 YI SYLLABLE POT
-+<UA047>     /x82/x35/x9f/x34 YI SYLLABLE POX
-+<UA048>     /x82/x35/x9f/x35 YI SYLLABLE PO
-+<UA049>     /x82/x35/x9f/x36 YI SYLLABLE POP
-+<UA04A>     /x82/x35/x9f/x37 YI SYLLABLE PUT
-+<UA04B>     /x82/x35/x9f/x38 YI SYLLABLE PUX
-+<UA04C>     /x82/x35/x9f/x39 YI SYLLABLE PU
-+<UA04D>     /x82/x35/xa0/x30 YI SYLLABLE PUP
-+<UA04E>     /x82/x35/xa0/x31 YI SYLLABLE PURX
-+<UA04F>     /x82/x35/xa0/x32 YI SYLLABLE PUR
-+<UA050>     /x82/x35/xa0/x33 YI SYLLABLE PYT
-+<UA051>     /x82/x35/xa0/x34 YI SYLLABLE PYX
-+<UA052>     /x82/x35/xa0/x35 YI SYLLABLE PY
-+<UA053>     /x82/x35/xa0/x36 YI SYLLABLE PYP
-+<UA054>     /x82/x35/xa0/x37 YI SYLLABLE PYRX
-+<UA055>     /x82/x35/xa0/x38 YI SYLLABLE PYR
-+<UA056>     /x82/x35/xa0/x39 YI SYLLABLE BBIT
-+<UA057>     /x82/x35/xa1/x30 YI SYLLABLE BBIX
-+<UA058>     /x82/x35/xa1/x31 YI SYLLABLE BBI
-+<UA059>     /x82/x35/xa1/x32 YI SYLLABLE BBIP
-+<UA05A>     /x82/x35/xa1/x33 YI SYLLABLE BBIET
-+<UA05B>     /x82/x35/xa1/x34 YI SYLLABLE BBIEX
-+<UA05C>     /x82/x35/xa1/x35 YI SYLLABLE BBIE
-+<UA05D>     /x82/x35/xa1/x36 YI SYLLABLE BBIEP
-+<UA05E>     /x82/x35/xa1/x37 YI SYLLABLE BBAT
-+<UA05F>     /x82/x35/xa1/x38 YI SYLLABLE BBAX
-+<UA060>     /x82/x35/xa1/x39 YI SYLLABLE BBA
-+<UA061>     /x82/x35/xa2/x30 YI SYLLABLE BBAP
-+<UA062>     /x82/x35/xa2/x31 YI SYLLABLE BBUOX
-+<UA063>     /x82/x35/xa2/x32 YI SYLLABLE BBUO
-+<UA064>     /x82/x35/xa2/x33 YI SYLLABLE BBUOP
-+<UA065>     /x82/x35/xa2/x34 YI SYLLABLE BBOT
-+<UA066>     /x82/x35/xa2/x35 YI SYLLABLE BBOX
-+<UA067>     /x82/x35/xa2/x36 YI SYLLABLE BBO
-+<UA068>     /x82/x35/xa2/x37 YI SYLLABLE BBOP
-+<UA069>     /x82/x35/xa2/x38 YI SYLLABLE BBEX
-+<UA06A>     /x82/x35/xa2/x39 YI SYLLABLE BBE
-+<UA06B>     /x82/x35/xa3/x30 YI SYLLABLE BBEP
-+<UA06C>     /x82/x35/xa3/x31 YI SYLLABLE BBUT
-+<UA06D>     /x82/x35/xa3/x32 YI SYLLABLE BBUX
-+<UA06E>     /x82/x35/xa3/x33 YI SYLLABLE BBU
-+<UA06F>     /x82/x35/xa3/x34 YI SYLLABLE BBUP
-+<UA070>     /x82/x35/xa3/x35 YI SYLLABLE BBURX
-+<UA071>     /x82/x35/xa3/x36 YI SYLLABLE BBUR
-+<UA072>     /x82/x35/xa3/x37 YI SYLLABLE BBYT
-+<UA073>     /x82/x35/xa3/x38 YI SYLLABLE BBYX
-+<UA074>     /x82/x35/xa3/x39 YI SYLLABLE BBY
-+<UA075>     /x82/x35/xa4/x30 YI SYLLABLE BBYP
-+<UA076>     /x82/x35/xa4/x31 YI SYLLABLE NBIT
-+<UA077>     /x82/x35/xa4/x32 YI SYLLABLE NBIX
-+<UA078>     /x82/x35/xa4/x33 YI SYLLABLE NBI
-+<UA079>     /x82/x35/xa4/x34 YI SYLLABLE NBIP
-+<UA07A>     /x82/x35/xa4/x35 YI SYLLABLE NBIEX
-+<UA07B>     /x82/x35/xa4/x36 YI SYLLABLE NBIE
-+<UA07C>     /x82/x35/xa4/x37 YI SYLLABLE NBIEP
-+<UA07D>     /x82/x35/xa4/x38 YI SYLLABLE NBAT
-+<UA07E>     /x82/x35/xa4/x39 YI SYLLABLE NBAX
-+<UA07F>     /x82/x35/xa5/x30 YI SYLLABLE NBA
-+<UA080>     /x82/x35/xa5/x31 YI SYLLABLE NBAP
-+<UA081>     /x82/x35/xa5/x32 YI SYLLABLE NBOT
-+<UA082>     /x82/x35/xa5/x33 YI SYLLABLE NBOX
-+<UA083>     /x82/x35/xa5/x34 YI SYLLABLE NBO
-+<UA084>     /x82/x35/xa5/x35 YI SYLLABLE NBOP
-+<UA085>     /x82/x35/xa5/x36 YI SYLLABLE NBUT
-+<UA086>     /x82/x35/xa5/x37 YI SYLLABLE NBUX
-+<UA087>     /x82/x35/xa5/x38 YI SYLLABLE NBU
-+<UA088>     /x82/x35/xa5/x39 YI SYLLABLE NBUP
-+<UA089>     /x82/x35/xa6/x30 YI SYLLABLE NBURX
-+<UA08A>     /x82/x35/xa6/x31 YI SYLLABLE NBUR
-+<UA08B>     /x82/x35/xa6/x32 YI SYLLABLE NBYT
-+<UA08C>     /x82/x35/xa6/x33 YI SYLLABLE NBYX
-+<UA08D>     /x82/x35/xa6/x34 YI SYLLABLE NBY
-+<UA08E>     /x82/x35/xa6/x35 YI SYLLABLE NBYP
-+<UA08F>     /x82/x35/xa6/x36 YI SYLLABLE NBYRX
-+<UA090>     /x82/x35/xa6/x37 YI SYLLABLE NBYR
-+<UA091>     /x82/x35/xa6/x38 YI SYLLABLE HMIT
-+<UA092>     /x82/x35/xa6/x39 YI SYLLABLE HMIX
-+<UA093>     /x82/x35/xa7/x30 YI SYLLABLE HMI
-+<UA094>     /x82/x35/xa7/x31 YI SYLLABLE HMIP
-+<UA095>     /x82/x35/xa7/x32 YI SYLLABLE HMIEX
-+<UA096>     /x82/x35/xa7/x33 YI SYLLABLE HMIE
-+<UA097>     /x82/x35/xa7/x34 YI SYLLABLE HMIEP
-+<UA098>     /x82/x35/xa7/x35 YI SYLLABLE HMAT
-+<UA099>     /x82/x35/xa7/x36 YI SYLLABLE HMAX
-+<UA09A>     /x82/x35/xa7/x37 YI SYLLABLE HMA
-+<UA09B>     /x82/x35/xa7/x38 YI SYLLABLE HMAP
-+<UA09C>     /x82/x35/xa7/x39 YI SYLLABLE HMUOX
-+<UA09D>     /x82/x35/xa8/x30 YI SYLLABLE HMUO
-+<UA09E>     /x82/x35/xa8/x31 YI SYLLABLE HMUOP
-+<UA09F>     /x82/x35/xa8/x32 YI SYLLABLE HMOT
-+<UA0A0>     /x82/x35/xa8/x33 YI SYLLABLE HMOX
-+<UA0A1>     /x82/x35/xa8/x34 YI SYLLABLE HMO
-+<UA0A2>     /x82/x35/xa8/x35 YI SYLLABLE HMOP
-+<UA0A3>     /x82/x35/xa8/x36 YI SYLLABLE HMUT
-+<UA0A4>     /x82/x35/xa8/x37 YI SYLLABLE HMUX
-+<UA0A5>     /x82/x35/xa8/x38 YI SYLLABLE HMU
-+<UA0A6>     /x82/x35/xa8/x39 YI SYLLABLE HMUP
-+<UA0A7>     /x82/x35/xa9/x30 YI SYLLABLE HMURX
-+<UA0A8>     /x82/x35/xa9/x31 YI SYLLABLE HMUR
-+<UA0A9>     /x82/x35/xa9/x32 YI SYLLABLE HMYX
-+<UA0AA>     /x82/x35/xa9/x33 YI SYLLABLE HMY
-+<UA0AB>     /x82/x35/xa9/x34 YI SYLLABLE HMYP
-+<UA0AC>     /x82/x35/xa9/x35 YI SYLLABLE HMYRX
-+<UA0AD>     /x82/x35/xa9/x36 YI SYLLABLE HMYR
-+<UA0AE>     /x82/x35/xa9/x37 YI SYLLABLE MIT
-+<UA0AF>     /x82/x35/xa9/x38 YI SYLLABLE MIX
-+<UA0B0>     /x82/x35/xa9/x39 YI SYLLABLE MI
-+<UA0B1>     /x82/x35/xaa/x30 YI SYLLABLE MIP
-+<UA0B2>     /x82/x35/xaa/x31 YI SYLLABLE MIEX
-+<UA0B3>     /x82/x35/xaa/x32 YI SYLLABLE MIE
-+<UA0B4>     /x82/x35/xaa/x33 YI SYLLABLE MIEP
-+<UA0B5>     /x82/x35/xaa/x34 YI SYLLABLE MAT
-+<UA0B6>     /x82/x35/xaa/x35 YI SYLLABLE MAX
-+<UA0B7>     /x82/x35/xaa/x36 YI SYLLABLE MA
-+<UA0B8>     /x82/x35/xaa/x37 YI SYLLABLE MAP
-+<UA0B9>     /x82/x35/xaa/x38 YI SYLLABLE MUOT
-+<UA0BA>     /x82/x35/xaa/x39 YI SYLLABLE MUOX
-+<UA0BB>     /x82/x35/xab/x30 YI SYLLABLE MUO
-+<UA0BC>     /x82/x35/xab/x31 YI SYLLABLE MUOP
-+<UA0BD>     /x82/x35/xab/x32 YI SYLLABLE MOT
-+<UA0BE>     /x82/x35/xab/x33 YI SYLLABLE MOX
-+<UA0BF>     /x82/x35/xab/x34 YI SYLLABLE MO
-+<UA0C0>     /x82/x35/xab/x35 YI SYLLABLE MOP
-+<UA0C1>     /x82/x35/xab/x36 YI SYLLABLE MEX
-+<UA0C2>     /x82/x35/xab/x37 YI SYLLABLE ME
-+<UA0C3>     /x82/x35/xab/x38 YI SYLLABLE MUT
-+<UA0C4>     /x82/x35/xab/x39 YI SYLLABLE MUX
-+<UA0C5>     /x82/x35/xac/x30 YI SYLLABLE MU
-+<UA0C6>     /x82/x35/xac/x31 YI SYLLABLE MUP
-+<UA0C7>     /x82/x35/xac/x32 YI SYLLABLE MURX
-+<UA0C8>     /x82/x35/xac/x33 YI SYLLABLE MUR
-+<UA0C9>     /x82/x35/xac/x34 YI SYLLABLE MYT
-+<UA0CA>     /x82/x35/xac/x35 YI SYLLABLE MYX
-+<UA0CB>     /x82/x35/xac/x36 YI SYLLABLE MY
-+<UA0CC>     /x82/x35/xac/x37 YI SYLLABLE MYP
-+<UA0CD>     /x82/x35/xac/x38 YI SYLLABLE FIT
-+<UA0CE>     /x82/x35/xac/x39 YI SYLLABLE FIX
-+<UA0CF>     /x82/x35/xad/x30 YI SYLLABLE FI
-+<UA0D0>     /x82/x35/xad/x31 YI SYLLABLE FIP
-+<UA0D1>     /x82/x35/xad/x32 YI SYLLABLE FAT
-+<UA0D2>     /x82/x35/xad/x33 YI SYLLABLE FAX
-+<UA0D3>     /x82/x35/xad/x34 YI SYLLABLE FA
-+<UA0D4>     /x82/x35/xad/x35 YI SYLLABLE FAP
-+<UA0D5>     /x82/x35/xad/x36 YI SYLLABLE FOX
-+<UA0D6>     /x82/x35/xad/x37 YI SYLLABLE FO
-+<UA0D7>     /x82/x35/xad/x38 YI SYLLABLE FOP
-+<UA0D8>     /x82/x35/xad/x39 YI SYLLABLE FUT
-+<UA0D9>     /x82/x35/xae/x30 YI SYLLABLE FUX
-+<UA0DA>     /x82/x35/xae/x31 YI SYLLABLE FU
-+<UA0DB>     /x82/x35/xae/x32 YI SYLLABLE FUP
-+<UA0DC>     /x82/x35/xae/x33 YI SYLLABLE FURX
-+<UA0DD>     /x82/x35/xae/x34 YI SYLLABLE FUR
-+<UA0DE>     /x82/x35/xae/x35 YI SYLLABLE FYT
-+<UA0DF>     /x82/x35/xae/x36 YI SYLLABLE FYX
-+<UA0E0>     /x82/x35/xae/x37 YI SYLLABLE FY
-+<UA0E1>     /x82/x35/xae/x38 YI SYLLABLE FYP
-+<UA0E2>     /x82/x35/xae/x39 YI SYLLABLE VIT
-+<UA0E3>     /x82/x35/xaf/x30 YI SYLLABLE VIX
-+<UA0E4>     /x82/x35/xaf/x31 YI SYLLABLE VI
-+<UA0E5>     /x82/x35/xaf/x32 YI SYLLABLE VIP
-+<UA0E6>     /x82/x35/xaf/x33 YI SYLLABLE VIET
-+<UA0E7>     /x82/x35/xaf/x34 YI SYLLABLE VIEX
-+<UA0E8>     /x82/x35/xaf/x35 YI SYLLABLE VIE
-+<UA0E9>     /x82/x35/xaf/x36 YI SYLLABLE VIEP
-+<UA0EA>     /x82/x35/xaf/x37 YI SYLLABLE VAT
-+<UA0EB>     /x82/x35/xaf/x38 YI SYLLABLE VAX
-+<UA0EC>     /x82/x35/xaf/x39 YI SYLLABLE VA
-+<UA0ED>     /x82/x35/xb0/x30 YI SYLLABLE VAP
-+<UA0EE>     /x82/x35/xb0/x31 YI SYLLABLE VOT
-+<UA0EF>     /x82/x35/xb0/x32 YI SYLLABLE VOX
-+<UA0F0>     /x82/x35/xb0/x33 YI SYLLABLE VO
-+<UA0F1>     /x82/x35/xb0/x34 YI SYLLABLE VOP
-+<UA0F2>     /x82/x35/xb0/x35 YI SYLLABLE VEX
-+<UA0F3>     /x82/x35/xb0/x36 YI SYLLABLE VEP
-+<UA0F4>     /x82/x35/xb0/x37 YI SYLLABLE VUT
-+<UA0F5>     /x82/x35/xb0/x38 YI SYLLABLE VUX
-+<UA0F6>     /x82/x35/xb0/x39 YI SYLLABLE VU
-+<UA0F7>     /x82/x35/xb1/x30 YI SYLLABLE VUP
-+<UA0F8>     /x82/x35/xb1/x31 YI SYLLABLE VURX
-+<UA0F9>     /x82/x35/xb1/x32 YI SYLLABLE VUR
-+<UA0FA>     /x82/x35/xb1/x33 YI SYLLABLE VYT
-+<UA0FB>     /x82/x35/xb1/x34 YI SYLLABLE VYX
-+<UA0FC>     /x82/x35/xb1/x35 YI SYLLABLE VY
-+<UA0FD>     /x82/x35/xb1/x36 YI SYLLABLE VYP
-+<UA0FE>     /x82/x35/xb1/x37 YI SYLLABLE VYRX
-+<UA0FF>     /x82/x35/xb1/x38 YI SYLLABLE VYR
-+<UA100>     /x82/x35/xb1/x39 YI SYLLABLE DIT
-+<UA101>     /x82/x35/xb2/x30 YI SYLLABLE DIX
-+<UA102>     /x82/x35/xb2/x31 YI SYLLABLE DI
-+<UA103>     /x82/x35/xb2/x32 YI SYLLABLE DIP
-+<UA104>     /x82/x35/xb2/x33 YI SYLLABLE DIEX
-+<UA105>     /x82/x35/xb2/x34 YI SYLLABLE DIE
-+<UA106>     /x82/x35/xb2/x35 YI SYLLABLE DIEP
-+<UA107>     /x82/x35/xb2/x36 YI SYLLABLE DAT
-+<UA108>     /x82/x35/xb2/x37 YI SYLLABLE DAX
-+<UA109>     /x82/x35/xb2/x38 YI SYLLABLE DA
-+<UA10A>     /x82/x35/xb2/x39 YI SYLLABLE DAP
-+<UA10B>     /x82/x35/xb3/x30 YI SYLLABLE DUOX
-+<UA10C>     /x82/x35/xb3/x31 YI SYLLABLE DUO
-+<UA10D>     /x82/x35/xb3/x32 YI SYLLABLE DOT
-+<UA10E>     /x82/x35/xb3/x33 YI SYLLABLE DOX
-+<UA10F>     /x82/x35/xb3/x34 YI SYLLABLE DO
-+<UA110>     /x82/x35/xb3/x35 YI SYLLABLE DOP
-+<UA111>     /x82/x35/xb3/x36 YI SYLLABLE DEX
-+<UA112>     /x82/x35/xb3/x37 YI SYLLABLE DE
-+<UA113>     /x82/x35/xb3/x38 YI SYLLABLE DEP
-+<UA114>     /x82/x35/xb3/x39 YI SYLLABLE DUT
-+<UA115>     /x82/x35/xb4/x30 YI SYLLABLE DUX
-+<UA116>     /x82/x35/xb4/x31 YI SYLLABLE DU
-+<UA117>     /x82/x35/xb4/x32 YI SYLLABLE DUP
-+<UA118>     /x82/x35/xb4/x33 YI SYLLABLE DURX
-+<UA119>     /x82/x35/xb4/x34 YI SYLLABLE DUR
-+<UA11A>     /x82/x35/xb4/x35 YI SYLLABLE TIT
-+<UA11B>     /x82/x35/xb4/x36 YI SYLLABLE TIX
-+<UA11C>     /x82/x35/xb4/x37 YI SYLLABLE TI
-+<UA11D>     /x82/x35/xb4/x38 YI SYLLABLE TIP
-+<UA11E>     /x82/x35/xb4/x39 YI SYLLABLE TIEX
-+<UA11F>     /x82/x35/xb5/x30 YI SYLLABLE TIE
-+<UA120>     /x82/x35/xb5/x31 YI SYLLABLE TIEP
-+<UA121>     /x82/x35/xb5/x32 YI SYLLABLE TAT
-+<UA122>     /x82/x35/xb5/x33 YI SYLLABLE TAX
-+<UA123>     /x82/x35/xb5/x34 YI SYLLABLE TA
-+<UA124>     /x82/x35/xb5/x35 YI SYLLABLE TAP
-+<UA125>     /x82/x35/xb5/x36 YI SYLLABLE TUOT
-+<UA126>     /x82/x35/xb5/x37 YI SYLLABLE TUOX
-+<UA127>     /x82/x35/xb5/x38 YI SYLLABLE TUO
-+<UA128>     /x82/x35/xb5/x39 YI SYLLABLE TUOP
-+<UA129>     /x82/x35/xb6/x30 YI SYLLABLE TOT
-+<UA12A>     /x82/x35/xb6/x31 YI SYLLABLE TOX
-+<UA12B>     /x82/x35/xb6/x32 YI SYLLABLE TO
-+<UA12C>     /x82/x35/xb6/x33 YI SYLLABLE TOP
-+<UA12D>     /x82/x35/xb6/x34 YI SYLLABLE TEX
-+<UA12E>     /x82/x35/xb6/x35 YI SYLLABLE TE
-+<UA12F>     /x82/x35/xb6/x36 YI SYLLABLE TEP
-+<UA130>     /x82/x35/xb6/x37 YI SYLLABLE TUT
-+<UA131>     /x82/x35/xb6/x38 YI SYLLABLE TUX
-+<UA132>     /x82/x35/xb6/x39 YI SYLLABLE TU
-+<UA133>     /x82/x35/xb7/x30 YI SYLLABLE TUP
-+<UA134>     /x82/x35/xb7/x31 YI SYLLABLE TURX
-+<UA135>     /x82/x35/xb7/x32 YI SYLLABLE TUR
-+<UA136>     /x82/x35/xb7/x33 YI SYLLABLE DDIT
-+<UA137>     /x82/x35/xb7/x34 YI SYLLABLE DDIX
-+<UA138>     /x82/x35/xb7/x35 YI SYLLABLE DDI
-+<UA139>     /x82/x35/xb7/x36 YI SYLLABLE DDIP
-+<UA13A>     /x82/x35/xb7/x37 YI SYLLABLE DDIEX
-+<UA13B>     /x82/x35/xb7/x38 YI SYLLABLE DDIE
-+<UA13C>     /x82/x35/xb7/x39 YI SYLLABLE DDIEP
-+<UA13D>     /x82/x35/xb8/x30 YI SYLLABLE DDAT
-+<UA13E>     /x82/x35/xb8/x31 YI SYLLABLE DDAX
-+<UA13F>     /x82/x35/xb8/x32 YI SYLLABLE DDA
-+<UA140>     /x82/x35/xb8/x33 YI SYLLABLE DDAP
-+<UA141>     /x82/x35/xb8/x34 YI SYLLABLE DDUOX
-+<UA142>     /x82/x35/xb8/x35 YI SYLLABLE DDUO
-+<UA143>     /x82/x35/xb8/x36 YI SYLLABLE DDUOP
-+<UA144>     /x82/x35/xb8/x37 YI SYLLABLE DDOT
-+<UA145>     /x82/x35/xb8/x38 YI SYLLABLE DDOX
-+<UA146>     /x82/x35/xb8/x39 YI SYLLABLE DDO
-+<UA147>     /x82/x35/xb9/x30 YI SYLLABLE DDOP
-+<UA148>     /x82/x35/xb9/x31 YI SYLLABLE DDEX
-+<UA149>     /x82/x35/xb9/x32 YI SYLLABLE DDE
-+<UA14A>     /x82/x35/xb9/x33 YI SYLLABLE DDEP
-+<UA14B>     /x82/x35/xb9/x34 YI SYLLABLE DDUT
-+<UA14C>     /x82/x35/xb9/x35 YI SYLLABLE DDUX
-+<UA14D>     /x82/x35/xb9/x36 YI SYLLABLE DDU
-+<UA14E>     /x82/x35/xb9/x37 YI SYLLABLE DDUP
-+<UA14F>     /x82/x35/xb9/x38 YI SYLLABLE DDURX
-+<UA150>     /x82/x35/xb9/x39 YI SYLLABLE DDUR
-+<UA151>     /x82/x35/xba/x30 YI SYLLABLE NDIT
-+<UA152>     /x82/x35/xba/x31 YI SYLLABLE NDIX
-+<UA153>     /x82/x35/xba/x32 YI SYLLABLE NDI
-+<UA154>     /x82/x35/xba/x33 YI SYLLABLE NDIP
-+<UA155>     /x82/x35/xba/x34 YI SYLLABLE NDIEX
-+<UA156>     /x82/x35/xba/x35 YI SYLLABLE NDIE
-+<UA157>     /x82/x35/xba/x36 YI SYLLABLE NDAT
-+<UA158>     /x82/x35/xba/x37 YI SYLLABLE NDAX
-+<UA159>     /x82/x35/xba/x38 YI SYLLABLE NDA
-+<UA15A>     /x82/x35/xba/x39 YI SYLLABLE NDAP
-+<UA15B>     /x82/x35/xbb/x30 YI SYLLABLE NDOT
-+<UA15C>     /x82/x35/xbb/x31 YI SYLLABLE NDOX
-+<UA15D>     /x82/x35/xbb/x32 YI SYLLABLE NDO
-+<UA15E>     /x82/x35/xbb/x33 YI SYLLABLE NDOP
-+<UA15F>     /x82/x35/xbb/x34 YI SYLLABLE NDEX
-+<UA160>     /x82/x35/xbb/x35 YI SYLLABLE NDE
-+<UA161>     /x82/x35/xbb/x36 YI SYLLABLE NDEP
-+<UA162>     /x82/x35/xbb/x37 YI SYLLABLE NDUT
-+<UA163>     /x82/x35/xbb/x38 YI SYLLABLE NDUX
-+<UA164>     /x82/x35/xbb/x39 YI SYLLABLE NDU
-+<UA165>     /x82/x35/xbc/x30 YI SYLLABLE NDUP
-+<UA166>     /x82/x35/xbc/x31 YI SYLLABLE NDURX
-+<UA167>     /x82/x35/xbc/x32 YI SYLLABLE NDUR
-+<UA168>     /x82/x35/xbc/x33 YI SYLLABLE HNIT
-+<UA169>     /x82/x35/xbc/x34 YI SYLLABLE HNIX
-+<UA16A>     /x82/x35/xbc/x35 YI SYLLABLE HNI
-+<UA16B>     /x82/x35/xbc/x36 YI SYLLABLE HNIP
-+<UA16C>     /x82/x35/xbc/x37 YI SYLLABLE HNIET
-+<UA16D>     /x82/x35/xbc/x38 YI SYLLABLE HNIEX
-+<UA16E>     /x82/x35/xbc/x39 YI SYLLABLE HNIE
-+<UA16F>     /x82/x35/xbd/x30 YI SYLLABLE HNIEP
-+<UA170>     /x82/x35/xbd/x31 YI SYLLABLE HNAT
-+<UA171>     /x82/x35/xbd/x32 YI SYLLABLE HNAX
-+<UA172>     /x82/x35/xbd/x33 YI SYLLABLE HNA
-+<UA173>     /x82/x35/xbd/x34 YI SYLLABLE HNAP
-+<UA174>     /x82/x35/xbd/x35 YI SYLLABLE HNUOX
-+<UA175>     /x82/x35/xbd/x36 YI SYLLABLE HNUO
-+<UA176>     /x82/x35/xbd/x37 YI SYLLABLE HNOT
-+<UA177>     /x82/x35/xbd/x38 YI SYLLABLE HNOX
-+<UA178>     /x82/x35/xbd/x39 YI SYLLABLE HNOP
-+<UA179>     /x82/x35/xbe/x30 YI SYLLABLE HNEX
-+<UA17A>     /x82/x35/xbe/x31 YI SYLLABLE HNE
-+<UA17B>     /x82/x35/xbe/x32 YI SYLLABLE HNEP
-+<UA17C>     /x82/x35/xbe/x33 YI SYLLABLE HNUT
-+<UA17D>     /x82/x35/xbe/x34 YI SYLLABLE NIT
-+<UA17E>     /x82/x35/xbe/x35 YI SYLLABLE NIX
-+<UA17F>     /x82/x35/xbe/x36 YI SYLLABLE NI
-+<UA180>     /x82/x35/xbe/x37 YI SYLLABLE NIP
-+<UA181>     /x82/x35/xbe/x38 YI SYLLABLE NIEX
-+<UA182>     /x82/x35/xbe/x39 YI SYLLABLE NIE
-+<UA183>     /x82/x35/xbf/x30 YI SYLLABLE NIEP
-+<UA184>     /x82/x35/xbf/x31 YI SYLLABLE NAX
-+<UA185>     /x82/x35/xbf/x32 YI SYLLABLE NA
-+<UA186>     /x82/x35/xbf/x33 YI SYLLABLE NAP
-+<UA187>     /x82/x35/xbf/x34 YI SYLLABLE NUOX
-+<UA188>     /x82/x35/xbf/x35 YI SYLLABLE NUO
-+<UA189>     /x82/x35/xbf/x36 YI SYLLABLE NUOP
-+<UA18A>     /x82/x35/xbf/x37 YI SYLLABLE NOT
-+<UA18B>     /x82/x35/xbf/x38 YI SYLLABLE NOX
-+<UA18C>     /x82/x35/xbf/x39 YI SYLLABLE NO
-+<UA18D>     /x82/x35/xc0/x30 YI SYLLABLE NOP
-+<UA18E>     /x82/x35/xc0/x31 YI SYLLABLE NEX
-+<UA18F>     /x82/x35/xc0/x32 YI SYLLABLE NE
-+<UA190>     /x82/x35/xc0/x33 YI SYLLABLE NEP
-+<UA191>     /x82/x35/xc0/x34 YI SYLLABLE NUT
-+<UA192>     /x82/x35/xc0/x35 YI SYLLABLE NUX
-+<UA193>     /x82/x35/xc0/x36 YI SYLLABLE NU
-+<UA194>     /x82/x35/xc0/x37 YI SYLLABLE NUP
-+<UA195>     /x82/x35/xc0/x38 YI SYLLABLE NURX
-+<UA196>     /x82/x35/xc0/x39 YI SYLLABLE NUR
-+<UA197>     /x82/x35/xc1/x30 YI SYLLABLE HLIT
-+<UA198>     /x82/x35/xc1/x31 YI SYLLABLE HLIX
-+<UA199>     /x82/x35/xc1/x32 YI SYLLABLE HLI
-+<UA19A>     /x82/x35/xc1/x33 YI SYLLABLE HLIP
-+<UA19B>     /x82/x35/xc1/x34 YI SYLLABLE HLIEX
-+<UA19C>     /x82/x35/xc1/x35 YI SYLLABLE HLIE
-+<UA19D>     /x82/x35/xc1/x36 YI SYLLABLE HLIEP
-+<UA19E>     /x82/x35/xc1/x37 YI SYLLABLE HLAT
-+<UA19F>     /x82/x35/xc1/x38 YI SYLLABLE HLAX
-+<UA1A0>     /x82/x35/xc1/x39 YI SYLLABLE HLA
-+<UA1A1>     /x82/x35/xc2/x30 YI SYLLABLE HLAP
-+<UA1A2>     /x82/x35/xc2/x31 YI SYLLABLE HLUOX
-+<UA1A3>     /x82/x35/xc2/x32 YI SYLLABLE HLUO
-+<UA1A4>     /x82/x35/xc2/x33 YI SYLLABLE HLUOP
-+<UA1A5>     /x82/x35/xc2/x34 YI SYLLABLE HLOX
-+<UA1A6>     /x82/x35/xc2/x35 YI SYLLABLE HLO
-+<UA1A7>     /x82/x35/xc2/x36 YI SYLLABLE HLOP
-+<UA1A8>     /x82/x35/xc2/x37 YI SYLLABLE HLEX
-+<UA1A9>     /x82/x35/xc2/x38 YI SYLLABLE HLE
-+<UA1AA>     /x82/x35/xc2/x39 YI SYLLABLE HLEP
-+<UA1AB>     /x82/x35/xc3/x30 YI SYLLABLE HLUT
-+<UA1AC>     /x82/x35/xc3/x31 YI SYLLABLE HLUX
-+<UA1AD>     /x82/x35/xc3/x32 YI SYLLABLE HLU
-+<UA1AE>     /x82/x35/xc3/x33 YI SYLLABLE HLUP
-+<UA1AF>     /x82/x35/xc3/x34 YI SYLLABLE HLURX
-+<UA1B0>     /x82/x35/xc3/x35 YI SYLLABLE HLUR
-+<UA1B1>     /x82/x35/xc3/x36 YI SYLLABLE HLYT
-+<UA1B2>     /x82/x35/xc3/x37 YI SYLLABLE HLYX
-+<UA1B3>     /x82/x35/xc3/x38 YI SYLLABLE HLY
-+<UA1B4>     /x82/x35/xc3/x39 YI SYLLABLE HLYP
-+<UA1B5>     /x82/x35/xc4/x30 YI SYLLABLE HLYRX
-+<UA1B6>     /x82/x35/xc4/x31 YI SYLLABLE HLYR
-+<UA1B7>     /x82/x35/xc4/x32 YI SYLLABLE LIT
-+<UA1B8>     /x82/x35/xc4/x33 YI SYLLABLE LIX
-+<UA1B9>     /x82/x35/xc4/x34 YI SYLLABLE LI
-+<UA1BA>     /x82/x35/xc4/x35 YI SYLLABLE LIP
-+<UA1BB>     /x82/x35/xc4/x36 YI SYLLABLE LIET
-+<UA1BC>     /x82/x35/xc4/x37 YI SYLLABLE LIEX
-+<UA1BD>     /x82/x35/xc4/x38 YI SYLLABLE LIE
-+<UA1BE>     /x82/x35/xc4/x39 YI SYLLABLE LIEP
-+<UA1BF>     /x82/x35/xc5/x30 YI SYLLABLE LAT
-+<UA1C0>     /x82/x35/xc5/x31 YI SYLLABLE LAX
-+<UA1C1>     /x82/x35/xc5/x32 YI SYLLABLE LA
-+<UA1C2>     /x82/x35/xc5/x33 YI SYLLABLE LAP
-+<UA1C3>     /x82/x35/xc5/x34 YI SYLLABLE LUOT
-+<UA1C4>     /x82/x35/xc5/x35 YI SYLLABLE LUOX
-+<UA1C5>     /x82/x35/xc5/x36 YI SYLLABLE LUO
-+<UA1C6>     /x82/x35/xc5/x37 YI SYLLABLE LUOP
-+<UA1C7>     /x82/x35/xc5/x38 YI SYLLABLE LOT
-+<UA1C8>     /x82/x35/xc5/x39 YI SYLLABLE LOX
-+<UA1C9>     /x82/x35/xc6/x30 YI SYLLABLE LO
-+<UA1CA>     /x82/x35/xc6/x31 YI SYLLABLE LOP
-+<UA1CB>     /x82/x35/xc6/x32 YI SYLLABLE LEX
-+<UA1CC>     /x82/x35/xc6/x33 YI SYLLABLE LE
-+<UA1CD>     /x82/x35/xc6/x34 YI SYLLABLE LEP
-+<UA1CE>     /x82/x35/xc6/x35 YI SYLLABLE LUT
-+<UA1CF>     /x82/x35/xc6/x36 YI SYLLABLE LUX
-+<UA1D0>     /x82/x35/xc6/x37 YI SYLLABLE LU
-+<UA1D1>     /x82/x35/xc6/x38 YI SYLLABLE LUP
-+<UA1D2>     /x82/x35/xc6/x39 YI SYLLABLE LURX
-+<UA1D3>     /x82/x35/xc7/x30 YI SYLLABLE LUR
-+<UA1D4>     /x82/x35/xc7/x31 YI SYLLABLE LYT
-+<UA1D5>     /x82/x35/xc7/x32 YI SYLLABLE LYX
-+<UA1D6>     /x82/x35/xc7/x33 YI SYLLABLE LY
-+<UA1D7>     /x82/x35/xc7/x34 YI SYLLABLE LYP
-+<UA1D8>     /x82/x35/xc7/x35 YI SYLLABLE LYRX
-+<UA1D9>     /x82/x35/xc7/x36 YI SYLLABLE LYR
-+<UA1DA>     /x82/x35/xc7/x37 YI SYLLABLE GIT
-+<UA1DB>     /x82/x35/xc7/x38 YI SYLLABLE GIX
-+<UA1DC>     /x82/x35/xc7/x39 YI SYLLABLE GI
-+<UA1DD>     /x82/x35/xc8/x30 YI SYLLABLE GIP
-+<UA1DE>     /x82/x35/xc8/x31 YI SYLLABLE GIET
-+<UA1DF>     /x82/x35/xc8/x32 YI SYLLABLE GIEX
-+<UA1E0>     /x82/x35/xc8/x33 YI SYLLABLE GIE
-+<UA1E1>     /x82/x35/xc8/x34 YI SYLLABLE GIEP
-+<UA1E2>     /x82/x35/xc8/x35 YI SYLLABLE GAT
-+<UA1E3>     /x82/x35/xc8/x36 YI SYLLABLE GAX
-+<UA1E4>     /x82/x35/xc8/x37 YI SYLLABLE GA
-+<UA1E5>     /x82/x35/xc8/x38 YI SYLLABLE GAP
-+<UA1E6>     /x82/x35/xc8/x39 YI SYLLABLE GUOT
-+<UA1E7>     /x82/x35/xc9/x30 YI SYLLABLE GUOX
-+<UA1E8>     /x82/x35/xc9/x31 YI SYLLABLE GUO
-+<UA1E9>     /x82/x35/xc9/x32 YI SYLLABLE GUOP
-+<UA1EA>     /x82/x35/xc9/x33 YI SYLLABLE GOT
-+<UA1EB>     /x82/x35/xc9/x34 YI SYLLABLE GOX
-+<UA1EC>     /x82/x35/xc9/x35 YI SYLLABLE GO
-+<UA1ED>     /x82/x35/xc9/x36 YI SYLLABLE GOP
-+<UA1EE>     /x82/x35/xc9/x37 YI SYLLABLE GET
-+<UA1EF>     /x82/x35/xc9/x38 YI SYLLABLE GEX
-+<UA1F0>     /x82/x35/xc9/x39 YI SYLLABLE GE
-+<UA1F1>     /x82/x35/xca/x30 YI SYLLABLE GEP
-+<UA1F2>     /x82/x35/xca/x31 YI SYLLABLE GUT
-+<UA1F3>     /x82/x35/xca/x32 YI SYLLABLE GUX
-+<UA1F4>     /x82/x35/xca/x33 YI SYLLABLE GU
-+<UA1F5>     /x82/x35/xca/x34 YI SYLLABLE GUP
-+<UA1F6>     /x82/x35/xca/x35 YI SYLLABLE GURX
-+<UA1F7>     /x82/x35/xca/x36 YI SYLLABLE GUR
-+<UA1F8>     /x82/x35/xca/x37 YI SYLLABLE KIT
-+<UA1F9>     /x82/x35/xca/x38 YI SYLLABLE KIX
-+<UA1FA>     /x82/x35/xca/x39 YI SYLLABLE KI
-+<UA1FB>     /x82/x35/xcb/x30 YI SYLLABLE KIP
-+<UA1FC>     /x82/x35/xcb/x31 YI SYLLABLE KIEX
-+<UA1FD>     /x82/x35/xcb/x32 YI SYLLABLE KIE
-+<UA1FE>     /x82/x35/xcb/x33 YI SYLLABLE KIEP
-+<UA1FF>     /x82/x35/xcb/x34 YI SYLLABLE KAT
-+<UA200>     /x82/x35/xcb/x35 YI SYLLABLE KAX
-+<UA201>     /x82/x35/xcb/x36 YI SYLLABLE KA
-+<UA202>     /x82/x35/xcb/x37 YI SYLLABLE KAP
-+<UA203>     /x82/x35/xcb/x38 YI SYLLABLE KUOX
-+<UA204>     /x82/x35/xcb/x39 YI SYLLABLE KUO
-+<UA205>     /x82/x35/xcc/x30 YI SYLLABLE KUOP
-+<UA206>     /x82/x35/xcc/x31 YI SYLLABLE KOT
-+<UA207>     /x82/x35/xcc/x32 YI SYLLABLE KOX
-+<UA208>     /x82/x35/xcc/x33 YI SYLLABLE KO
-+<UA209>     /x82/x35/xcc/x34 YI SYLLABLE KOP
-+<UA20A>     /x82/x35/xcc/x35 YI SYLLABLE KET
-+<UA20B>     /x82/x35/xcc/x36 YI SYLLABLE KEX
-+<UA20C>     /x82/x35/xcc/x37 YI SYLLABLE KE
-+<UA20D>     /x82/x35/xcc/x38 YI SYLLABLE KEP
-+<UA20E>     /x82/x35/xcc/x39 YI SYLLABLE KUT
-+<UA20F>     /x82/x35/xcd/x30 YI SYLLABLE KUX
-+<UA210>     /x82/x35/xcd/x31 YI SYLLABLE KU
-+<UA211>     /x82/x35/xcd/x32 YI SYLLABLE KUP
-+<UA212>     /x82/x35/xcd/x33 YI SYLLABLE KURX
-+<UA213>     /x82/x35/xcd/x34 YI SYLLABLE KUR
-+<UA214>     /x82/x35/xcd/x35 YI SYLLABLE GGIT
-+<UA215>     /x82/x35/xcd/x36 YI SYLLABLE GGIX
-+<UA216>     /x82/x35/xcd/x37 YI SYLLABLE GGI
-+<UA217>     /x82/x35/xcd/x38 YI SYLLABLE GGIEX
-+<UA218>     /x82/x35/xcd/x39 YI SYLLABLE GGIE
-+<UA219>     /x82/x35/xce/x30 YI SYLLABLE GGIEP
-+<UA21A>     /x82/x35/xce/x31 YI SYLLABLE GGAT
-+<UA21B>     /x82/x35/xce/x32 YI SYLLABLE GGAX
-+<UA21C>     /x82/x35/xce/x33 YI SYLLABLE GGA
-+<UA21D>     /x82/x35/xce/x34 YI SYLLABLE GGAP
-+<UA21E>     /x82/x35/xce/x35 YI SYLLABLE GGUOT
-+<UA21F>     /x82/x35/xce/x36 YI SYLLABLE GGUOX
-+<UA220>     /x82/x35/xce/x37 YI SYLLABLE GGUO
-+<UA221>     /x82/x35/xce/x38 YI SYLLABLE GGUOP
-+<UA222>     /x82/x35/xce/x39 YI SYLLABLE GGOT
-+<UA223>     /x82/x35/xcf/x30 YI SYLLABLE GGOX
-+<UA224>     /x82/x35/xcf/x31 YI SYLLABLE GGO
-+<UA225>     /x82/x35/xcf/x32 YI SYLLABLE GGOP
-+<UA226>     /x82/x35/xcf/x33 YI SYLLABLE GGET
-+<UA227>     /x82/x35/xcf/x34 YI SYLLABLE GGEX
-+<UA228>     /x82/x35/xcf/x35 YI SYLLABLE GGE
-+<UA229>     /x82/x35/xcf/x36 YI SYLLABLE GGEP
-+<UA22A>     /x82/x35/xcf/x37 YI SYLLABLE GGUT
-+<UA22B>     /x82/x35/xcf/x38 YI SYLLABLE GGUX
-+<UA22C>     /x82/x35/xcf/x39 YI SYLLABLE GGU
-+<UA22D>     /x82/x35/xd0/x30 YI SYLLABLE GGUP
-+<UA22E>     /x82/x35/xd0/x31 YI SYLLABLE GGURX
-+<UA22F>     /x82/x35/xd0/x32 YI SYLLABLE GGUR
-+<UA230>     /x82/x35/xd0/x33 YI SYLLABLE MGIEX
-+<UA231>     /x82/x35/xd0/x34 YI SYLLABLE MGIE
-+<UA232>     /x82/x35/xd0/x35 YI SYLLABLE MGAT
-+<UA233>     /x82/x35/xd0/x36 YI SYLLABLE MGAX
-+<UA234>     /x82/x35/xd0/x37 YI SYLLABLE MGA
-+<UA235>     /x82/x35/xd0/x38 YI SYLLABLE MGAP
-+<UA236>     /x82/x35/xd0/x39 YI SYLLABLE MGUOX
-+<UA237>     /x82/x35/xd1/x30 YI SYLLABLE MGUO
-+<UA238>     /x82/x35/xd1/x31 YI SYLLABLE MGUOP
-+<UA239>     /x82/x35/xd1/x32 YI SYLLABLE MGOT
-+<UA23A>     /x82/x35/xd1/x33 YI SYLLABLE MGOX
-+<UA23B>     /x82/x35/xd1/x34 YI SYLLABLE MGO
-+<UA23C>     /x82/x35/xd1/x35 YI SYLLABLE MGOP
-+<UA23D>     /x82/x35/xd1/x36 YI SYLLABLE MGEX
-+<UA23E>     /x82/x35/xd1/x37 YI SYLLABLE MGE
-+<UA23F>     /x82/x35/xd1/x38 YI SYLLABLE MGEP
-+<UA240>     /x82/x35/xd1/x39 YI SYLLABLE MGUT
-+<UA241>     /x82/x35/xd2/x30 YI SYLLABLE MGUX
-+<UA242>     /x82/x35/xd2/x31 YI SYLLABLE MGU
-+<UA243>     /x82/x35/xd2/x32 YI SYLLABLE MGUP
-+<UA244>     /x82/x35/xd2/x33 YI SYLLABLE MGURX
-+<UA245>     /x82/x35/xd2/x34 YI SYLLABLE MGUR
-+<UA246>     /x82/x35/xd2/x35 YI SYLLABLE HXIT
-+<UA247>     /x82/x35/xd2/x36 YI SYLLABLE HXIX
-+<UA248>     /x82/x35/xd2/x37 YI SYLLABLE HXI
-+<UA249>     /x82/x35/xd2/x38 YI SYLLABLE HXIP
-+<UA24A>     /x82/x35/xd2/x39 YI SYLLABLE HXIET
-+<UA24B>     /x82/x35/xd3/x30 YI SYLLABLE HXIEX
-+<UA24C>     /x82/x35/xd3/x31 YI SYLLABLE HXIE
-+<UA24D>     /x82/x35/xd3/x32 YI SYLLABLE HXIEP
-+<UA24E>     /x82/x35/xd3/x33 YI SYLLABLE HXAT
-+<UA24F>     /x82/x35/xd3/x34 YI SYLLABLE HXAX
-+<UA250>     /x82/x35/xd3/x35 YI SYLLABLE HXA
-+<UA251>     /x82/x35/xd3/x36 YI SYLLABLE HXAP
-+<UA252>     /x82/x35/xd3/x37 YI SYLLABLE HXUOT
-+<UA253>     /x82/x35/xd3/x38 YI SYLLABLE HXUOX
-+<UA254>     /x82/x35/xd3/x39 YI SYLLABLE HXUO
-+<UA255>     /x82/x35/xd4/x30 YI SYLLABLE HXUOP
-+<UA256>     /x82/x35/xd4/x31 YI SYLLABLE HXOT
-+<UA257>     /x82/x35/xd4/x32 YI SYLLABLE HXOX
-+<UA258>     /x82/x35/xd4/x33 YI SYLLABLE HXO
-+<UA259>     /x82/x35/xd4/x34 YI SYLLABLE HXOP
-+<UA25A>     /x82/x35/xd4/x35 YI SYLLABLE HXEX
-+<UA25B>     /x82/x35/xd4/x36 YI SYLLABLE HXE
-+<UA25C>     /x82/x35/xd4/x37 YI SYLLABLE HXEP
-+<UA25D>     /x82/x35/xd4/x38 YI SYLLABLE NGIEX
-+<UA25E>     /x82/x35/xd4/x39 YI SYLLABLE NGIE
-+<UA25F>     /x82/x35/xd5/x30 YI SYLLABLE NGIEP
-+<UA260>     /x82/x35/xd5/x31 YI SYLLABLE NGAT
-+<UA261>     /x82/x35/xd5/x32 YI SYLLABLE NGAX
-+<UA262>     /x82/x35/xd5/x33 YI SYLLABLE NGA
-+<UA263>     /x82/x35/xd5/x34 YI SYLLABLE NGAP
-+<UA264>     /x82/x35/xd5/x35 YI SYLLABLE NGUOT
-+<UA265>     /x82/x35/xd5/x36 YI SYLLABLE NGUOX
-+<UA266>     /x82/x35/xd5/x37 YI SYLLABLE NGUO
-+<UA267>     /x82/x35/xd5/x38 YI SYLLABLE NGOT
-+<UA268>     /x82/x35/xd5/x39 YI SYLLABLE NGOX
-+<UA269>     /x82/x35/xd6/x30 YI SYLLABLE NGO
-+<UA26A>     /x82/x35/xd6/x31 YI SYLLABLE NGOP
-+<UA26B>     /x82/x35/xd6/x32 YI SYLLABLE NGEX
-+<UA26C>     /x82/x35/xd6/x33 YI SYLLABLE NGE
-+<UA26D>     /x82/x35/xd6/x34 YI SYLLABLE NGEP
-+<UA26E>     /x82/x35/xd6/x35 YI SYLLABLE HIT
-+<UA26F>     /x82/x35/xd6/x36 YI SYLLABLE HIEX
-+<UA270>     /x82/x35/xd6/x37 YI SYLLABLE HIE
-+<UA271>     /x82/x35/xd6/x38 YI SYLLABLE HAT
-+<UA272>     /x82/x35/xd6/x39 YI SYLLABLE HAX
-+<UA273>     /x82/x35/xd7/x30 YI SYLLABLE HA
-+<UA274>     /x82/x35/xd7/x31 YI SYLLABLE HAP
-+<UA275>     /x82/x35/xd7/x32 YI SYLLABLE HUOT
-+<UA276>     /x82/x35/xd7/x33 YI SYLLABLE HUOX
-+<UA277>     /x82/x35/xd7/x34 YI SYLLABLE HUO
-+<UA278>     /x82/x35/xd7/x35 YI SYLLABLE HUOP
-+<UA279>     /x82/x35/xd7/x36 YI SYLLABLE HOT
-+<UA27A>     /x82/x35/xd7/x37 YI SYLLABLE HOX
-+<UA27B>     /x82/x35/xd7/x38 YI SYLLABLE HO
-+<UA27C>     /x82/x35/xd7/x39 YI SYLLABLE HOP
-+<UA27D>     /x82/x35/xd8/x30 YI SYLLABLE HEX
-+<UA27E>     /x82/x35/xd8/x31 YI SYLLABLE HE
-+<UA27F>     /x82/x35/xd8/x32 YI SYLLABLE HEP
-+<UA280>     /x82/x35/xd8/x33 YI SYLLABLE WAT
-+<UA281>     /x82/x35/xd8/x34 YI SYLLABLE WAX
-+<UA282>     /x82/x35/xd8/x35 YI SYLLABLE WA
-+<UA283>     /x82/x35/xd8/x36 YI SYLLABLE WAP
-+<UA284>     /x82/x35/xd8/x37 YI SYLLABLE WUOX
-+<UA285>     /x82/x35/xd8/x38 YI SYLLABLE WUO
-+<UA286>     /x82/x35/xd8/x39 YI SYLLABLE WUOP
-+<UA287>     /x82/x35/xd9/x30 YI SYLLABLE WOX
-+<UA288>     /x82/x35/xd9/x31 YI SYLLABLE WO
-+<UA289>     /x82/x35/xd9/x32 YI SYLLABLE WOP
-+<UA28A>     /x82/x35/xd9/x33 YI SYLLABLE WEX
-+<UA28B>     /x82/x35/xd9/x34 YI SYLLABLE WE
-+<UA28C>     /x82/x35/xd9/x35 YI SYLLABLE WEP
-+<UA28D>     /x82/x35/xd9/x36 YI SYLLABLE ZIT
-+<UA28E>     /x82/x35/xd9/x37 YI SYLLABLE ZIX
-+<UA28F>     /x82/x35/xd9/x38 YI SYLLABLE ZI
-+<UA290>     /x82/x35/xd9/x39 YI SYLLABLE ZIP
-+<UA291>     /x82/x35/xda/x30 YI SYLLABLE ZIEX
-+<UA292>     /x82/x35/xda/x31 YI SYLLABLE ZIE
-+<UA293>     /x82/x35/xda/x32 YI SYLLABLE ZIEP
-+<UA294>     /x82/x35/xda/x33 YI SYLLABLE ZAT
-+<UA295>     /x82/x35/xda/x34 YI SYLLABLE ZAX
-+<UA296>     /x82/x35/xda/x35 YI SYLLABLE ZA
-+<UA297>     /x82/x35/xda/x36 YI SYLLABLE ZAP
-+<UA298>     /x82/x35/xda/x37 YI SYLLABLE ZUOX
-+<UA299>     /x82/x35/xda/x38 YI SYLLABLE ZUO
-+<UA29A>     /x82/x35/xda/x39 YI SYLLABLE ZUOP
-+<UA29B>     /x82/x35/xdb/x30 YI SYLLABLE ZOT
-+<UA29C>     /x82/x35/xdb/x31 YI SYLLABLE ZOX
-+<UA29D>     /x82/x35/xdb/x32 YI SYLLABLE ZO
-+<UA29E>     /x82/x35/xdb/x33 YI SYLLABLE ZOP
-+<UA29F>     /x82/x35/xdb/x34 YI SYLLABLE ZEX
-+<UA2A0>     /x82/x35/xdb/x35 YI SYLLABLE ZE
-+<UA2A1>     /x82/x35/xdb/x36 YI SYLLABLE ZEP
-+<UA2A2>     /x82/x35/xdb/x37 YI SYLLABLE ZUT
-+<UA2A3>     /x82/x35/xdb/x38 YI SYLLABLE ZUX
-+<UA2A4>     /x82/x35/xdb/x39 YI SYLLABLE ZU
-+<UA2A5>     /x82/x35/xdc/x30 YI SYLLABLE ZUP
-+<UA2A6>     /x82/x35/xdc/x31 YI SYLLABLE ZURX
-+<UA2A7>     /x82/x35/xdc/x32 YI SYLLABLE ZUR
-+<UA2A8>     /x82/x35/xdc/x33 YI SYLLABLE ZYT
-+<UA2A9>     /x82/x35/xdc/x34 YI SYLLABLE ZYX
-+<UA2AA>     /x82/x35/xdc/x35 YI SYLLABLE ZY
-+<UA2AB>     /x82/x35/xdc/x36 YI SYLLABLE ZYP
-+<UA2AC>     /x82/x35/xdc/x37 YI SYLLABLE ZYRX
-+<UA2AD>     /x82/x35/xdc/x38 YI SYLLABLE ZYR
-+<UA2AE>     /x82/x35/xdc/x39 YI SYLLABLE CIT
-+<UA2AF>     /x82/x35/xdd/x30 YI SYLLABLE CIX
-+<UA2B0>     /x82/x35/xdd/x31 YI SYLLABLE CI
-+<UA2B1>     /x82/x35/xdd/x32 YI SYLLABLE CIP
-+<UA2B2>     /x82/x35/xdd/x33 YI SYLLABLE CIET
-+<UA2B3>     /x82/x35/xdd/x34 YI SYLLABLE CIEX
-+<UA2B4>     /x82/x35/xdd/x35 YI SYLLABLE CIE
-+<UA2B5>     /x82/x35/xdd/x36 YI SYLLABLE CIEP
-+<UA2B6>     /x82/x35/xdd/x37 YI SYLLABLE CAT
-+<UA2B7>     /x82/x35/xdd/x38 YI SYLLABLE CAX
-+<UA2B8>     /x82/x35/xdd/x39 YI SYLLABLE CA
-+<UA2B9>     /x82/x35/xde/x30 YI SYLLABLE CAP
-+<UA2BA>     /x82/x35/xde/x31 YI SYLLABLE CUOX
-+<UA2BB>     /x82/x35/xde/x32 YI SYLLABLE CUO
-+<UA2BC>     /x82/x35/xde/x33 YI SYLLABLE CUOP
-+<UA2BD>     /x82/x35/xde/x34 YI SYLLABLE COT
-+<UA2BE>     /x82/x35/xde/x35 YI SYLLABLE COX
-+<UA2BF>     /x82/x35/xde/x36 YI SYLLABLE CO
-+<UA2C0>     /x82/x35/xde/x37 YI SYLLABLE COP
-+<UA2C1>     /x82/x35/xde/x38 YI SYLLABLE CEX
-+<UA2C2>     /x82/x35/xde/x39 YI SYLLABLE CE
-+<UA2C3>     /x82/x35/xdf/x30 YI SYLLABLE CEP
-+<UA2C4>     /x82/x35/xdf/x31 YI SYLLABLE CUT
-+<UA2C5>     /x82/x35/xdf/x32 YI SYLLABLE CUX
-+<UA2C6>     /x82/x35/xdf/x33 YI SYLLABLE CU
-+<UA2C7>     /x82/x35/xdf/x34 YI SYLLABLE CUP
-+<UA2C8>     /x82/x35/xdf/x35 YI SYLLABLE CURX
-+<UA2C9>     /x82/x35/xdf/x36 YI SYLLABLE CUR
-+<UA2CA>     /x82/x35/xdf/x37 YI SYLLABLE CYT
-+<UA2CB>     /x82/x35/xdf/x38 YI SYLLABLE CYX
-+<UA2CC>     /x82/x35/xdf/x39 YI SYLLABLE CY
-+<UA2CD>     /x82/x35/xe0/x30 YI SYLLABLE CYP
-+<UA2CE>     /x82/x35/xe0/x31 YI SYLLABLE CYRX
-+<UA2CF>     /x82/x35/xe0/x32 YI SYLLABLE CYR
-+<UA2D0>     /x82/x35/xe0/x33 YI SYLLABLE ZZIT
-+<UA2D1>     /x82/x35/xe0/x34 YI SYLLABLE ZZIX
-+<UA2D2>     /x82/x35/xe0/x35 YI SYLLABLE ZZI
-+<UA2D3>     /x82/x35/xe0/x36 YI SYLLABLE ZZIP
-+<UA2D4>     /x82/x35/xe0/x37 YI SYLLABLE ZZIET
-+<UA2D5>     /x82/x35/xe0/x38 YI SYLLABLE ZZIEX
-+<UA2D6>     /x82/x35/xe0/x39 YI SYLLABLE ZZIE
-+<UA2D7>     /x82/x35/xe1/x30 YI SYLLABLE ZZIEP
-+<UA2D8>     /x82/x35/xe1/x31 YI SYLLABLE ZZAT
-+<UA2D9>     /x82/x35/xe1/x32 YI SYLLABLE ZZAX
-+<UA2DA>     /x82/x35/xe1/x33 YI SYLLABLE ZZA
-+<UA2DB>     /x82/x35/xe1/x34 YI SYLLABLE ZZAP
-+<UA2DC>     /x82/x35/xe1/x35 YI SYLLABLE ZZOX
-+<UA2DD>     /x82/x35/xe1/x36 YI SYLLABLE ZZO
-+<UA2DE>     /x82/x35/xe1/x37 YI SYLLABLE ZZOP
-+<UA2DF>     /x82/x35/xe1/x38 YI SYLLABLE ZZEX
-+<UA2E0>     /x82/x35/xe1/x39 YI SYLLABLE ZZE
-+<UA2E1>     /x82/x35/xe2/x30 YI SYLLABLE ZZEP
-+<UA2E2>     /x82/x35/xe2/x31 YI SYLLABLE ZZUX
-+<UA2E3>     /x82/x35/xe2/x32 YI SYLLABLE ZZU
-+<UA2E4>     /x82/x35/xe2/x33 YI SYLLABLE ZZUP
-+<UA2E5>     /x82/x35/xe2/x34 YI SYLLABLE ZZURX
-+<UA2E6>     /x82/x35/xe2/x35 YI SYLLABLE ZZUR
-+<UA2E7>     /x82/x35/xe2/x36 YI SYLLABLE ZZYT
-+<UA2E8>     /x82/x35/xe2/x37 YI SYLLABLE ZZYX
-+<UA2E9>     /x82/x35/xe2/x38 YI SYLLABLE ZZY
-+<UA2EA>     /x82/x35/xe2/x39 YI SYLLABLE ZZYP
-+<UA2EB>     /x82/x35/xe3/x30 YI SYLLABLE ZZYRX
-+<UA2EC>     /x82/x35/xe3/x31 YI SYLLABLE ZZYR
-+<UA2ED>     /x82/x35/xe3/x32 YI SYLLABLE NZIT
-+<UA2EE>     /x82/x35/xe3/x33 YI SYLLABLE NZIX
-+<UA2EF>     /x82/x35/xe3/x34 YI SYLLABLE NZI
-+<UA2F0>     /x82/x35/xe3/x35 YI SYLLABLE NZIP
-+<UA2F1>     /x82/x35/xe3/x36 YI SYLLABLE NZIEX
-+<UA2F2>     /x82/x35/xe3/x37 YI SYLLABLE NZIE
-+<UA2F3>     /x82/x35/xe3/x38 YI SYLLABLE NZIEP
-+<UA2F4>     /x82/x35/xe3/x39 YI SYLLABLE NZAT
-+<UA2F5>     /x82/x35/xe4/x30 YI SYLLABLE NZAX
-+<UA2F6>     /x82/x35/xe4/x31 YI SYLLABLE NZA
-+<UA2F7>     /x82/x35/xe4/x32 YI SYLLABLE NZAP
-+<UA2F8>     /x82/x35/xe4/x33 YI SYLLABLE NZUOX
-+<UA2F9>     /x82/x35/xe4/x34 YI SYLLABLE NZUO
-+<UA2FA>     /x82/x35/xe4/x35 YI SYLLABLE NZOX
-+<UA2FB>     /x82/x35/xe4/x36 YI SYLLABLE NZOP
-+<UA2FC>     /x82/x35/xe4/x37 YI SYLLABLE NZEX
-+<UA2FD>     /x82/x35/xe4/x38 YI SYLLABLE NZE
-+<UA2FE>     /x82/x35/xe4/x39 YI SYLLABLE NZUX
-+<UA2FF>     /x82/x35/xe5/x30 YI SYLLABLE NZU
-+<UA300>     /x82/x35/xe5/x31 YI SYLLABLE NZUP
-+<UA301>     /x82/x35/xe5/x32 YI SYLLABLE NZURX
-+<UA302>     /x82/x35/xe5/x33 YI SYLLABLE NZUR
-+<UA303>     /x82/x35/xe5/x34 YI SYLLABLE NZYT
-+<UA304>     /x82/x35/xe5/x35 YI SYLLABLE NZYX
-+<UA305>     /x82/x35/xe5/x36 YI SYLLABLE NZY
-+<UA306>     /x82/x35/xe5/x37 YI SYLLABLE NZYP
-+<UA307>     /x82/x35/xe5/x38 YI SYLLABLE NZYRX
-+<UA308>     /x82/x35/xe5/x39 YI SYLLABLE NZYR
-+<UA309>     /x82/x35/xe6/x30 YI SYLLABLE SIT
-+<UA30A>     /x82/x35/xe6/x31 YI SYLLABLE SIX
-+<UA30B>     /x82/x35/xe6/x32 YI SYLLABLE SI
-+<UA30C>     /x82/x35/xe6/x33 YI SYLLABLE SIP
-+<UA30D>     /x82/x35/xe6/x34 YI SYLLABLE SIEX
-+<UA30E>     /x82/x35/xe6/x35 YI SYLLABLE SIE
-+<UA30F>     /x82/x35/xe6/x36 YI SYLLABLE SIEP
-+<UA310>     /x82/x35/xe6/x37 YI SYLLABLE SAT
-+<UA311>     /x82/x35/xe6/x38 YI SYLLABLE SAX
-+<UA312>     /x82/x35/xe6/x39 YI SYLLABLE SA
-+<UA313>     /x82/x35/xe7/x30 YI SYLLABLE SAP
-+<UA314>     /x82/x35/xe7/x31 YI SYLLABLE SUOX
-+<UA315>     /x82/x35/xe7/x32 YI SYLLABLE SUO
-+<UA316>     /x82/x35/xe7/x33 YI SYLLABLE SUOP
-+<UA317>     /x82/x35/xe7/x34 YI SYLLABLE SOT
-+<UA318>     /x82/x35/xe7/x35 YI SYLLABLE SOX
-+<UA319>     /x82/x35/xe7/x36 YI SYLLABLE SO
-+<UA31A>     /x82/x35/xe7/x37 YI SYLLABLE SOP
-+<UA31B>     /x82/x35/xe7/x38 YI SYLLABLE SEX
-+<UA31C>     /x82/x35/xe7/x39 YI SYLLABLE SE
-+<UA31D>     /x82/x35/xe8/x30 YI SYLLABLE SEP
-+<UA31E>     /x82/x35/xe8/x31 YI SYLLABLE SUT
-+<UA31F>     /x82/x35/xe8/x32 YI SYLLABLE SUX
-+<UA320>     /x82/x35/xe8/x33 YI SYLLABLE SU
-+<UA321>     /x82/x35/xe8/x34 YI SYLLABLE SUP
-+<UA322>     /x82/x35/xe8/x35 YI SYLLABLE SURX
-+<UA323>     /x82/x35/xe8/x36 YI SYLLABLE SUR
-+<UA324>     /x82/x35/xe8/x37 YI SYLLABLE SYT
-+<UA325>     /x82/x35/xe8/x38 YI SYLLABLE SYX
-+<UA326>     /x82/x35/xe8/x39 YI SYLLABLE SY
-+<UA327>     /x82/x35/xe9/x30 YI SYLLABLE SYP
-+<UA328>     /x82/x35/xe9/x31 YI SYLLABLE SYRX
-+<UA329>     /x82/x35/xe9/x32 YI SYLLABLE SYR
-+<UA32A>     /x82/x35/xe9/x33 YI SYLLABLE SSIT
-+<UA32B>     /x82/x35/xe9/x34 YI SYLLABLE SSIX
-+<UA32C>     /x82/x35/xe9/x35 YI SYLLABLE SSI
-+<UA32D>     /x82/x35/xe9/x36 YI SYLLABLE SSIP
-+<UA32E>     /x82/x35/xe9/x37 YI SYLLABLE SSIEX
-+<UA32F>     /x82/x35/xe9/x38 YI SYLLABLE SSIE
-+<UA330>     /x82/x35/xe9/x39 YI SYLLABLE SSIEP
-+<UA331>     /x82/x35/xea/x30 YI SYLLABLE SSAT
-+<UA332>     /x82/x35/xea/x31 YI SYLLABLE SSAX
-+<UA333>     /x82/x35/xea/x32 YI SYLLABLE SSA
-+<UA334>     /x82/x35/xea/x33 YI SYLLABLE SSAP
-+<UA335>     /x82/x35/xea/x34 YI SYLLABLE SSOT
-+<UA336>     /x82/x35/xea/x35 YI SYLLABLE SSOX
-+<UA337>     /x82/x35/xea/x36 YI SYLLABLE SSO
-+<UA338>     /x82/x35/xea/x37 YI SYLLABLE SSOP
-+<UA339>     /x82/x35/xea/x38 YI SYLLABLE SSEX
-+<UA33A>     /x82/x35/xea/x39 YI SYLLABLE SSE
-+<UA33B>     /x82/x35/xeb/x30 YI SYLLABLE SSEP
-+<UA33C>     /x82/x35/xeb/x31 YI SYLLABLE SSUT
-+<UA33D>     /x82/x35/xeb/x32 YI SYLLABLE SSUX
-+<UA33E>     /x82/x35/xeb/x33 YI SYLLABLE SSU
-+<UA33F>     /x82/x35/xeb/x34 YI SYLLABLE SSUP
-+<UA340>     /x82/x35/xeb/x35 YI SYLLABLE SSYT
-+<UA341>     /x82/x35/xeb/x36 YI SYLLABLE SSYX
-+<UA342>     /x82/x35/xeb/x37 YI SYLLABLE SSY
-+<UA343>     /x82/x35/xeb/x38 YI SYLLABLE SSYP
-+<UA344>     /x82/x35/xeb/x39 YI SYLLABLE SSYRX
-+<UA345>     /x82/x35/xec/x30 YI SYLLABLE SSYR
-+<UA346>     /x82/x35/xec/x31 YI SYLLABLE ZHAT
-+<UA347>     /x82/x35/xec/x32 YI SYLLABLE ZHAX
-+<UA348>     /x82/x35/xec/x33 YI SYLLABLE ZHA
-+<UA349>     /x82/x35/xec/x34 YI SYLLABLE ZHAP
-+<UA34A>     /x82/x35/xec/x35 YI SYLLABLE ZHUOX
-+<UA34B>     /x82/x35/xec/x36 YI SYLLABLE ZHUO
-+<UA34C>     /x82/x35/xec/x37 YI SYLLABLE ZHUOP
-+<UA34D>     /x82/x35/xec/x38 YI SYLLABLE ZHOT
-+<UA34E>     /x82/x35/xec/x39 YI SYLLABLE ZHOX
-+<UA34F>     /x82/x35/xed/x30 YI SYLLABLE ZHO
-+<UA350>     /x82/x35/xed/x31 YI SYLLABLE ZHOP
-+<UA351>     /x82/x35/xed/x32 YI SYLLABLE ZHET
-+<UA352>     /x82/x35/xed/x33 YI SYLLABLE ZHEX
-+<UA353>     /x82/x35/xed/x34 YI SYLLABLE ZHE
-+<UA354>     /x82/x35/xed/x35 YI SYLLABLE ZHEP
-+<UA355>     /x82/x35/xed/x36 YI SYLLABLE ZHUT
-+<UA356>     /x82/x35/xed/x37 YI SYLLABLE ZHUX
-+<UA357>     /x82/x35/xed/x38 YI SYLLABLE ZHU
-+<UA358>     /x82/x35/xed/x39 YI SYLLABLE ZHUP
-+<UA359>     /x82/x35/xee/x30 YI SYLLABLE ZHURX
-+<UA35A>     /x82/x35/xee/x31 YI SYLLABLE ZHUR
-+<UA35B>     /x82/x35/xee/x32 YI SYLLABLE ZHYT
-+<UA35C>     /x82/x35/xee/x33 YI SYLLABLE ZHYX
-+<UA35D>     /x82/x35/xee/x34 YI SYLLABLE ZHY
-+<UA35E>     /x82/x35/xee/x35 YI SYLLABLE ZHYP
-+<UA35F>     /x82/x35/xee/x36 YI SYLLABLE ZHYRX
-+<UA360>     /x82/x35/xee/x37 YI SYLLABLE ZHYR
-+<UA361>     /x82/x35/xee/x38 YI SYLLABLE CHAT
-+<UA362>     /x82/x35/xee/x39 YI SYLLABLE CHAX
-+<UA363>     /x82/x35/xef/x30 YI SYLLABLE CHA
-+<UA364>     /x82/x35/xef/x31 YI SYLLABLE CHAP
-+<UA365>     /x82/x35/xef/x32 YI SYLLABLE CHUOT
-+<UA366>     /x82/x35/xef/x33 YI SYLLABLE CHUOX
-+<UA367>     /x82/x35/xef/x34 YI SYLLABLE CHUO
-+<UA368>     /x82/x35/xef/x35 YI SYLLABLE CHUOP
-+<UA369>     /x82/x35/xef/x36 YI SYLLABLE CHOT
-+<UA36A>     /x82/x35/xef/x37 YI SYLLABLE CHOX
-+<UA36B>     /x82/x35/xef/x38 YI SYLLABLE CHO
-+<UA36C>     /x82/x35/xef/x39 YI SYLLABLE CHOP
-+<UA36D>     /x82/x35/xf0/x30 YI SYLLABLE CHET
-+<UA36E>     /x82/x35/xf0/x31 YI SYLLABLE CHEX
-+<UA36F>     /x82/x35/xf0/x32 YI SYLLABLE CHE
-+<UA370>     /x82/x35/xf0/x33 YI SYLLABLE CHEP
-+<UA371>     /x82/x35/xf0/x34 YI SYLLABLE CHUX
-+<UA372>     /x82/x35/xf0/x35 YI SYLLABLE CHU
-+<UA373>     /x82/x35/xf0/x36 YI SYLLABLE CHUP
-+<UA374>     /x82/x35/xf0/x37 YI SYLLABLE CHURX
-+<UA375>     /x82/x35/xf0/x38 YI SYLLABLE CHUR
-+<UA376>     /x82/x35/xf0/x39 YI SYLLABLE CHYT
-+<UA377>     /x82/x35/xf1/x30 YI SYLLABLE CHYX
-+<UA378>     /x82/x35/xf1/x31 YI SYLLABLE CHY
-+<UA379>     /x82/x35/xf1/x32 YI SYLLABLE CHYP
-+<UA37A>     /x82/x35/xf1/x33 YI SYLLABLE CHYRX
-+<UA37B>     /x82/x35/xf1/x34 YI SYLLABLE CHYR
-+<UA37C>     /x82/x35/xf1/x35 YI SYLLABLE RRAX
-+<UA37D>     /x82/x35/xf1/x36 YI SYLLABLE RRA
-+<UA37E>     /x82/x35/xf1/x37 YI SYLLABLE RRUOX
-+<UA37F>     /x82/x35/xf1/x38 YI SYLLABLE RRUO
-+<UA380>     /x82/x35/xf1/x39 YI SYLLABLE RROT
-+<UA381>     /x82/x35/xf2/x30 YI SYLLABLE RROX
-+<UA382>     /x82/x35/xf2/x31 YI SYLLABLE RRO
-+<UA383>     /x82/x35/xf2/x32 YI SYLLABLE RROP
-+<UA384>     /x82/x35/xf2/x33 YI SYLLABLE RRET
-+<UA385>     /x82/x35/xf2/x34 YI SYLLABLE RREX
-+<UA386>     /x82/x35/xf2/x35 YI SYLLABLE RRE
-+<UA387>     /x82/x35/xf2/x36 YI SYLLABLE RREP
-+<UA388>     /x82/x35/xf2/x37 YI SYLLABLE RRUT
-+<UA389>     /x82/x35/xf2/x38 YI SYLLABLE RRUX
-+<UA38A>     /x82/x35/xf2/x39 YI SYLLABLE RRU
-+<UA38B>     /x82/x35/xf3/x30 YI SYLLABLE RRUP
-+<UA38C>     /x82/x35/xf3/x31 YI SYLLABLE RRURX
-+<UA38D>     /x82/x35/xf3/x32 YI SYLLABLE RRUR
-+<UA38E>     /x82/x35/xf3/x33 YI SYLLABLE RRYT
-+<UA38F>     /x82/x35/xf3/x34 YI SYLLABLE RRYX
-+<UA390>     /x82/x35/xf3/x35 YI SYLLABLE RRY
-+<UA391>     /x82/x35/xf3/x36 YI SYLLABLE RRYP
-+<UA392>     /x82/x35/xf3/x37 YI SYLLABLE RRYRX
-+<UA393>     /x82/x35/xf3/x38 YI SYLLABLE RRYR
-+<UA394>     /x82/x35/xf3/x39 YI SYLLABLE NRAT
-+<UA395>     /x82/x35/xf4/x30 YI SYLLABLE NRAX
-+<UA396>     /x82/x35/xf4/x31 YI SYLLABLE NRA
-+<UA397>     /x82/x35/xf4/x32 YI SYLLABLE NRAP
-+<UA398>     /x82/x35/xf4/x33 YI SYLLABLE NROX
-+<UA399>     /x82/x35/xf4/x34 YI SYLLABLE NRO
-+<UA39A>     /x82/x35/xf4/x35 YI SYLLABLE NROP
-+<UA39B>     /x82/x35/xf4/x36 YI SYLLABLE NRET
-+<UA39C>     /x82/x35/xf4/x37 YI SYLLABLE NREX
-+<UA39D>     /x82/x35/xf4/x38 YI SYLLABLE NRE
-+<UA39E>     /x82/x35/xf4/x39 YI SYLLABLE NREP
-+<UA39F>     /x82/x35/xf5/x30 YI SYLLABLE NRUT
-+<UA3A0>     /x82/x35/xf5/x31 YI SYLLABLE NRUX
-+<UA3A1>     /x82/x35/xf5/x32 YI SYLLABLE NRU
-+<UA3A2>     /x82/x35/xf5/x33 YI SYLLABLE NRUP
-+<UA3A3>     /x82/x35/xf5/x34 YI SYLLABLE NRURX
-+<UA3A4>     /x82/x35/xf5/x35 YI SYLLABLE NRUR
-+<UA3A5>     /x82/x35/xf5/x36 YI SYLLABLE NRYT
-+<UA3A6>     /x82/x35/xf5/x37 YI SYLLABLE NRYX
-+<UA3A7>     /x82/x35/xf5/x38 YI SYLLABLE NRY
-+<UA3A8>     /x82/x35/xf5/x39 YI SYLLABLE NRYP
-+<UA3A9>     /x82/x35/xf6/x30 YI SYLLABLE NRYRX
-+<UA3AA>     /x82/x35/xf6/x31 YI SYLLABLE NRYR
-+<UA3AB>     /x82/x35/xf6/x32 YI SYLLABLE SHAT
-+<UA3AC>     /x82/x35/xf6/x33 YI SYLLABLE SHAX
-+<UA3AD>     /x82/x35/xf6/x34 YI SYLLABLE SHA
-+<UA3AE>     /x82/x35/xf6/x35 YI SYLLABLE SHAP
-+<UA3AF>     /x82/x35/xf6/x36 YI SYLLABLE SHUOX
-+<UA3B0>     /x82/x35/xf6/x37 YI SYLLABLE SHUO
-+<UA3B1>     /x82/x35/xf6/x38 YI SYLLABLE SHUOP
-+<UA3B2>     /x82/x35/xf6/x39 YI SYLLABLE SHOT
-+<UA3B3>     /x82/x35/xf7/x30 YI SYLLABLE SHOX
-+<UA3B4>     /x82/x35/xf7/x31 YI SYLLABLE SHO
-+<UA3B5>     /x82/x35/xf7/x32 YI SYLLABLE SHOP
-+<UA3B6>     /x82/x35/xf7/x33 YI SYLLABLE SHET
-+<UA3B7>     /x82/x35/xf7/x34 YI SYLLABLE SHEX
-+<UA3B8>     /x82/x35/xf7/x35 YI SYLLABLE SHE
-+<UA3B9>     /x82/x35/xf7/x36 YI SYLLABLE SHEP
-+<UA3BA>     /x82/x35/xf7/x37 YI SYLLABLE SHUT
-+<UA3BB>     /x82/x35/xf7/x38 YI SYLLABLE SHUX
-+<UA3BC>     /x82/x35/xf7/x39 YI SYLLABLE SHU
-+<UA3BD>     /x82/x35/xf8/x30 YI SYLLABLE SHUP
-+<UA3BE>     /x82/x35/xf8/x31 YI SYLLABLE SHURX
-+<UA3BF>     /x82/x35/xf8/x32 YI SYLLABLE SHUR
-+<UA3C0>     /x82/x35/xf8/x33 YI SYLLABLE SHYT
-+<UA3C1>     /x82/x35/xf8/x34 YI SYLLABLE SHYX
-+<UA3C2>     /x82/x35/xf8/x35 YI SYLLABLE SHY
-+<UA3C3>     /x82/x35/xf8/x36 YI SYLLABLE SHYP
-+<UA3C4>     /x82/x35/xf8/x37 YI SYLLABLE SHYRX
-+<UA3C5>     /x82/x35/xf8/x38 YI SYLLABLE SHYR
-+<UA3C6>     /x82/x35/xf8/x39 YI SYLLABLE RAT
-+<UA3C7>     /x82/x35/xf9/x30 YI SYLLABLE RAX
-+<UA3C8>     /x82/x35/xf9/x31 YI SYLLABLE RA
-+<UA3C9>     /x82/x35/xf9/x32 YI SYLLABLE RAP
-+<UA3CA>     /x82/x35/xf9/x33 YI SYLLABLE RUOX
-+<UA3CB>     /x82/x35/xf9/x34 YI SYLLABLE RUO
-+<UA3CC>     /x82/x35/xf9/x35 YI SYLLABLE RUOP
-+<UA3CD>     /x82/x35/xf9/x36 YI SYLLABLE ROT
-+<UA3CE>     /x82/x35/xf9/x37 YI SYLLABLE ROX
-+<UA3CF>     /x82/x35/xf9/x38 YI SYLLABLE RO
-+<UA3D0>     /x82/x35/xf9/x39 YI SYLLABLE ROP
-+<UA3D1>     /x82/x35/xfa/x30 YI SYLLABLE REX
-+<UA3D2>     /x82/x35/xfa/x31 YI SYLLABLE RE
-+<UA3D3>     /x82/x35/xfa/x32 YI SYLLABLE REP
-+<UA3D4>     /x82/x35/xfa/x33 YI SYLLABLE RUT
-+<UA3D5>     /x82/x35/xfa/x34 YI SYLLABLE RUX
-+<UA3D6>     /x82/x35/xfa/x35 YI SYLLABLE RU
-+<UA3D7>     /x82/x35/xfa/x36 YI SYLLABLE RUP
-+<UA3D8>     /x82/x35/xfa/x37 YI SYLLABLE RURX
-+<UA3D9>     /x82/x35/xfa/x38 YI SYLLABLE RUR
-+<UA3DA>     /x82/x35/xfa/x39 YI SYLLABLE RYT
-+<UA3DB>     /x82/x35/xfb/x30 YI SYLLABLE RYX
-+<UA3DC>     /x82/x35/xfb/x31 YI SYLLABLE RY
-+<UA3DD>     /x82/x35/xfb/x32 YI SYLLABLE RYP
-+<UA3DE>     /x82/x35/xfb/x33 YI SYLLABLE RYRX
-+<UA3DF>     /x82/x35/xfb/x34 YI SYLLABLE RYR
-+<UA3E0>     /x82/x35/xfb/x35 YI SYLLABLE JIT
-+<UA3E1>     /x82/x35/xfb/x36 YI SYLLABLE JIX
-+<UA3E2>     /x82/x35/xfb/x37 YI SYLLABLE JI
-+<UA3E3>     /x82/x35/xfb/x38 YI SYLLABLE JIP
-+<UA3E4>     /x82/x35/xfb/x39 YI SYLLABLE JIET
-+<UA3E5>     /x82/x35/xfc/x30 YI SYLLABLE JIEX
-+<UA3E6>     /x82/x35/xfc/x31 YI SYLLABLE JIE
-+<UA3E7>     /x82/x35/xfc/x32 YI SYLLABLE JIEP
-+<UA3E8>     /x82/x35/xfc/x33 YI SYLLABLE JUOT
-+<UA3E9>     /x82/x35/xfc/x34 YI SYLLABLE JUOX
-+<UA3EA>     /x82/x35/xfc/x35 YI SYLLABLE JUO
-+<UA3EB>     /x82/x35/xfc/x36 YI SYLLABLE JUOP
-+<UA3EC>     /x82/x35/xfc/x37 YI SYLLABLE JOT
-+<UA3ED>     /x82/x35/xfc/x38 YI SYLLABLE JOX
-+<UA3EE>     /x82/x35/xfc/x39 YI SYLLABLE JO
-+<UA3EF>     /x82/x35/xfd/x30 YI SYLLABLE JOP
-+<UA3F0>     /x82/x35/xfd/x31 YI SYLLABLE JUT
-+<UA3F1>     /x82/x35/xfd/x32 YI SYLLABLE JUX
-+<UA3F2>     /x82/x35/xfd/x33 YI SYLLABLE JU
-+<UA3F3>     /x82/x35/xfd/x34 YI SYLLABLE JUP
-+<UA3F4>     /x82/x35/xfd/x35 YI SYLLABLE JURX
-+<UA3F5>     /x82/x35/xfd/x36 YI SYLLABLE JUR
-+<UA3F6>     /x82/x35/xfd/x37 YI SYLLABLE JYT
-+<UA3F7>     /x82/x35/xfd/x38 YI SYLLABLE JYX
-+<UA3F8>     /x82/x35/xfd/x39 YI SYLLABLE JY
-+<UA3F9>     /x82/x35/xfe/x30 YI SYLLABLE JYP
-+<UA3FA>     /x82/x35/xfe/x31 YI SYLLABLE JYRX
-+<UA3FB>     /x82/x35/xfe/x32 YI SYLLABLE JYR
-+<UA3FC>     /x82/x35/xfe/x33 YI SYLLABLE QIT
-+<UA3FD>     /x82/x35/xfe/x34 YI SYLLABLE QIX
-+<UA3FE>     /x82/x35/xfe/x35 YI SYLLABLE QI
-+<UA3FF>     /x82/x35/xfe/x36 YI SYLLABLE QIP
-+<UA400>     /x82/x35/xfe/x37 YI SYLLABLE QIET
-+<UA401>     /x82/x35/xfe/x38 YI SYLLABLE QIEX
-+<UA402>     /x82/x35/xfe/x39 YI SYLLABLE QIE
-+<UA403>     /x82/x36/x81/x30 YI SYLLABLE QIEP
-+<UA404>     /x82/x36/x81/x31 YI SYLLABLE QUOT
-+<UA405>     /x82/x36/x81/x32 YI SYLLABLE QUOX
-+<UA406>     /x82/x36/x81/x33 YI SYLLABLE QUO
-+<UA407>     /x82/x36/x81/x34 YI SYLLABLE QUOP
-+<UA408>     /x82/x36/x81/x35 YI SYLLABLE QOT
-+<UA409>     /x82/x36/x81/x36 YI SYLLABLE QOX
-+<UA40A>     /x82/x36/x81/x37 YI SYLLABLE QO
-+<UA40B>     /x82/x36/x81/x38 YI SYLLABLE QOP
-+<UA40C>     /x82/x36/x81/x39 YI SYLLABLE QUT
-+<UA40D>     /x82/x36/x82/x30 YI SYLLABLE QUX
-+<UA40E>     /x82/x36/x82/x31 YI SYLLABLE QU
-+<UA40F>     /x82/x36/x82/x32 YI SYLLABLE QUP
-+<UA410>     /x82/x36/x82/x33 YI SYLLABLE QURX
-+<UA411>     /x82/x36/x82/x34 YI SYLLABLE QUR
-+<UA412>     /x82/x36/x82/x35 YI SYLLABLE QYT
-+<UA413>     /x82/x36/x82/x36 YI SYLLABLE QYX
-+<UA414>     /x82/x36/x82/x37 YI SYLLABLE QY
-+<UA415>     /x82/x36/x82/x38 YI SYLLABLE QYP
-+<UA416>     /x82/x36/x82/x39 YI SYLLABLE QYRX
-+<UA417>     /x82/x36/x83/x30 YI SYLLABLE QYR
-+<UA418>     /x82/x36/x83/x31 YI SYLLABLE JJIT
-+<UA419>     /x82/x36/x83/x32 YI SYLLABLE JJIX
-+<UA41A>     /x82/x36/x83/x33 YI SYLLABLE JJI
-+<UA41B>     /x82/x36/x83/x34 YI SYLLABLE JJIP
-+<UA41C>     /x82/x36/x83/x35 YI SYLLABLE JJIET
-+<UA41D>     /x82/x36/x83/x36 YI SYLLABLE JJIEX
-+<UA41E>     /x82/x36/x83/x37 YI SYLLABLE JJIE
-+<UA41F>     /x82/x36/x83/x38 YI SYLLABLE JJIEP
-+<UA420>     /x82/x36/x83/x39 YI SYLLABLE JJUOX
-+<UA421>     /x82/x36/x84/x30 YI SYLLABLE JJUO
-+<UA422>     /x82/x36/x84/x31 YI SYLLABLE JJUOP
-+<UA423>     /x82/x36/x84/x32 YI SYLLABLE JJOT
-+<UA424>     /x82/x36/x84/x33 YI SYLLABLE JJOX
-+<UA425>     /x82/x36/x84/x34 YI SYLLABLE JJO
-+<UA426>     /x82/x36/x84/x35 YI SYLLABLE JJOP
-+<UA427>     /x82/x36/x84/x36 YI SYLLABLE JJUT
-+<UA428>     /x82/x36/x84/x37 YI SYLLABLE JJUX
-+<UA429>     /x82/x36/x84/x38 YI SYLLABLE JJU
-+<UA42A>     /x82/x36/x84/x39 YI SYLLABLE JJUP
-+<UA42B>     /x82/x36/x85/x30 YI SYLLABLE JJURX
-+<UA42C>     /x82/x36/x85/x31 YI SYLLABLE JJUR
-+<UA42D>     /x82/x36/x85/x32 YI SYLLABLE JJYT
-+<UA42E>     /x82/x36/x85/x33 YI SYLLABLE JJYX
-+<UA42F>     /x82/x36/x85/x34 YI SYLLABLE JJY
-+<UA430>     /x82/x36/x85/x35 YI SYLLABLE JJYP
-+<UA431>     /x82/x36/x85/x36 YI SYLLABLE NJIT
-+<UA432>     /x82/x36/x85/x37 YI SYLLABLE NJIX
-+<UA433>     /x82/x36/x85/x38 YI SYLLABLE NJI
-+<UA434>     /x82/x36/x85/x39 YI SYLLABLE NJIP
-+<UA435>     /x82/x36/x86/x30 YI SYLLABLE NJIET
-+<UA436>     /x82/x36/x86/x31 YI SYLLABLE NJIEX
-+<UA437>     /x82/x36/x86/x32 YI SYLLABLE NJIE
-+<UA438>     /x82/x36/x86/x33 YI SYLLABLE NJIEP
-+<UA439>     /x82/x36/x86/x34 YI SYLLABLE NJUOX
-+<UA43A>     /x82/x36/x86/x35 YI SYLLABLE NJUO
-+<UA43B>     /x82/x36/x86/x36 YI SYLLABLE NJOT
-+<UA43C>     /x82/x36/x86/x37 YI SYLLABLE NJOX
-+<UA43D>     /x82/x36/x86/x38 YI SYLLABLE NJO
-+<UA43E>     /x82/x36/x86/x39 YI SYLLABLE NJOP
-+<UA43F>     /x82/x36/x87/x30 YI SYLLABLE NJUX
-+<UA440>     /x82/x36/x87/x31 YI SYLLABLE NJU
-+<UA441>     /x82/x36/x87/x32 YI SYLLABLE NJUP
-+<UA442>     /x82/x36/x87/x33 YI SYLLABLE NJURX
-+<UA443>     /x82/x36/x87/x34 YI SYLLABLE NJUR
-+<UA444>     /x82/x36/x87/x35 YI SYLLABLE NJYT
-+<UA445>     /x82/x36/x87/x36 YI SYLLABLE NJYX
-+<UA446>     /x82/x36/x87/x37 YI SYLLABLE NJY
-+<UA447>     /x82/x36/x87/x38 YI SYLLABLE NJYP
-+<UA448>     /x82/x36/x87/x39 YI SYLLABLE NJYRX
-+<UA449>     /x82/x36/x88/x30 YI SYLLABLE NJYR
-+<UA44A>     /x82/x36/x88/x31 YI SYLLABLE NYIT
-+<UA44B>     /x82/x36/x88/x32 YI SYLLABLE NYIX
-+<UA44C>     /x82/x36/x88/x33 YI SYLLABLE NYI
-+<UA44D>     /x82/x36/x88/x34 YI SYLLABLE NYIP
-+<UA44E>     /x82/x36/x88/x35 YI SYLLABLE NYIET
-+<UA44F>     /x82/x36/x88/x36 YI SYLLABLE NYIEX
-+<UA450>     /x82/x36/x88/x37 YI SYLLABLE NYIE
-+<UA451>     /x82/x36/x88/x38 YI SYLLABLE NYIEP
-+<UA452>     /x82/x36/x88/x39 YI SYLLABLE NYUOX
-+<UA453>     /x82/x36/x89/x30 YI SYLLABLE NYUO
-+<UA454>     /x82/x36/x89/x31 YI SYLLABLE NYUOP
-+<UA455>     /x82/x36/x89/x32 YI SYLLABLE NYOT
-+<UA456>     /x82/x36/x89/x33 YI SYLLABLE NYOX
-+<UA457>     /x82/x36/x89/x34 YI SYLLABLE NYO
-+<UA458>     /x82/x36/x89/x35 YI SYLLABLE NYOP
-+<UA459>     /x82/x36/x89/x36 YI SYLLABLE NYUT
-+<UA45A>     /x82/x36/x89/x37 YI SYLLABLE NYUX
-+<UA45B>     /x82/x36/x89/x38 YI SYLLABLE NYU
-+<UA45C>     /x82/x36/x89/x39 YI SYLLABLE NYUP
-+<UA45D>     /x82/x36/x8a/x30 YI SYLLABLE XIT
-+<UA45E>     /x82/x36/x8a/x31 YI SYLLABLE XIX
-+<UA45F>     /x82/x36/x8a/x32 YI SYLLABLE XI
-+<UA460>     /x82/x36/x8a/x33 YI SYLLABLE XIP
-+<UA461>     /x82/x36/x8a/x34 YI SYLLABLE XIET
-+<UA462>     /x82/x36/x8a/x35 YI SYLLABLE XIEX
-+<UA463>     /x82/x36/x8a/x36 YI SYLLABLE XIE
-+<UA464>     /x82/x36/x8a/x37 YI SYLLABLE XIEP
-+<UA465>     /x82/x36/x8a/x38 YI SYLLABLE XUOX
-+<UA466>     /x82/x36/x8a/x39 YI SYLLABLE XUO
-+<UA467>     /x82/x36/x8b/x30 YI SYLLABLE XOT
-+<UA468>     /x82/x36/x8b/x31 YI SYLLABLE XOX
-+<UA469>     /x82/x36/x8b/x32 YI SYLLABLE XO
-+<UA46A>     /x82/x36/x8b/x33 YI SYLLABLE XOP
-+<UA46B>     /x82/x36/x8b/x34 YI SYLLABLE XYT
-+<UA46C>     /x82/x36/x8b/x35 YI SYLLABLE XYX
-+<UA46D>     /x82/x36/x8b/x36 YI SYLLABLE XY
-+<UA46E>     /x82/x36/x8b/x37 YI SYLLABLE XYP
-+<UA46F>     /x82/x36/x8b/x38 YI SYLLABLE XYRX
-+<UA470>     /x82/x36/x8b/x39 YI SYLLABLE XYR
-+<UA471>     /x82/x36/x8c/x30 YI SYLLABLE YIT
-+<UA472>     /x82/x36/x8c/x31 YI SYLLABLE YIX
-+<UA473>     /x82/x36/x8c/x32 YI SYLLABLE YI
-+<UA474>     /x82/x36/x8c/x33 YI SYLLABLE YIP
-+<UA475>     /x82/x36/x8c/x34 YI SYLLABLE YIET
-+<UA476>     /x82/x36/x8c/x35 YI SYLLABLE YIEX
-+<UA477>     /x82/x36/x8c/x36 YI SYLLABLE YIE
-+<UA478>     /x82/x36/x8c/x37 YI SYLLABLE YIEP
-+<UA479>     /x82/x36/x8c/x38 YI SYLLABLE YUOT
-+<UA47A>     /x82/x36/x8c/x39 YI SYLLABLE YUOX
-+<UA47B>     /x82/x36/x8d/x30 YI SYLLABLE YUO
-+<UA47C>     /x82/x36/x8d/x31 YI SYLLABLE YUOP
-+<UA47D>     /x82/x36/x8d/x32 YI SYLLABLE YOT
-+<UA47E>     /x82/x36/x8d/x33 YI SYLLABLE YOX
-+<UA47F>     /x82/x36/x8d/x34 YI SYLLABLE YO
-+<UA480>     /x82/x36/x8d/x35 YI SYLLABLE YOP
-+<UA481>     /x82/x36/x8d/x36 YI SYLLABLE YUT
-+<UA482>     /x82/x36/x8d/x37 YI SYLLABLE YUX
-+<UA483>     /x82/x36/x8d/x38 YI SYLLABLE YU
-+<UA484>     /x82/x36/x8d/x39 YI SYLLABLE YUP
-+<UA485>     /x82/x36/x8e/x30 YI SYLLABLE YURX
-+<UA486>     /x82/x36/x8e/x31 YI SYLLABLE YUR
-+<UA487>     /x82/x36/x8e/x32 YI SYLLABLE YYT
-+<UA488>     /x82/x36/x8e/x33 YI SYLLABLE YYX
-+<UA489>     /x82/x36/x8e/x34 YI SYLLABLE YY
-+<UA48A>     /x82/x36/x8e/x35 YI SYLLABLE YYP
-+<UA48B>     /x82/x36/x8e/x36 YI SYLLABLE YYRX
-+<UA48C>     /x82/x36/x8e/x37 YI SYLLABLE YYR
-+<UA48D>     /x82/x36/x8e/x38 <UNASSIGNED>
-+<UA48E>     /x82/x36/x8e/x39 <UNASSIGNED>
-+<UA48F>     /x82/x36/x8f/x30 <UNASSIGNED>
-+<UA490>     /x82/x36/x8f/x31 YI RADICAL QOT
-+<UA491>     /x82/x36/x8f/x32 YI RADICAL LI
-+<UA492>     /x82/x36/x8f/x33 YI RADICAL KIT
-+<UA493>     /x82/x36/x8f/x34 YI RADICAL NYIP
-+<UA494>     /x82/x36/x8f/x35 YI RADICAL CYP
-+<UA495>     /x82/x36/x8f/x36 YI RADICAL SSI
-+<UA496>     /x82/x36/x8f/x37 YI RADICAL GGOP
-+<UA497>     /x82/x36/x8f/x38 YI RADICAL GEP
-+<UA498>     /x82/x36/x8f/x39 YI RADICAL MI
-+<UA499>     /x82/x36/x90/x30 YI RADICAL HXIT
-+<UA49A>     /x82/x36/x90/x31 YI RADICAL LYR
-+<UA49B>     /x82/x36/x90/x32 YI RADICAL BBUT
-+<UA49C>     /x82/x36/x90/x33 YI RADICAL MOP
-+<UA49D>     /x82/x36/x90/x34 YI RADICAL YO
-+<UA49E>     /x82/x36/x90/x35 YI RADICAL PUT
-+<UA49F>     /x82/x36/x90/x36 YI RADICAL HXUO
-+<UA4A0>     /x82/x36/x90/x37 YI RADICAL TAT
-+<UA4A1>     /x82/x36/x90/x38 YI RADICAL GA
-+<UA4A2>     /x82/x36/x90/x39 YI RADICAL ZUP
-+<UA4A3>     /x82/x36/x91/x30 YI RADICAL CYT
-+<UA4A4>     /x82/x36/x91/x31 YI RADICAL DDUR
-+<UA4A5>     /x82/x36/x91/x32 YI RADICAL BUR
-+<UA4A6>     /x82/x36/x91/x33 YI RADICAL GGUO
-+<UA4A7>     /x82/x36/x91/x34 YI RADICAL NYOP
-+<UA4A8>     /x82/x36/x91/x35 YI RADICAL TU
-+<UA4A9>     /x82/x36/x91/x36 YI RADICAL OP
-+<UA4AA>     /x82/x36/x91/x37 YI RADICAL JJUT
-+<UA4AB>     /x82/x36/x91/x38 YI RADICAL ZOT
-+<UA4AC>     /x82/x36/x91/x39 YI RADICAL PYT
-+<UA4AD>     /x82/x36/x92/x30 YI RADICAL HMO
-+<UA4AE>     /x82/x36/x92/x31 YI RADICAL YIT
-+<UA4AF>     /x82/x36/x92/x32 YI RADICAL VUR
-+<UA4B0>     /x82/x36/x92/x33 YI RADICAL SHY
-+<UA4B1>     /x82/x36/x92/x34 YI RADICAL VEP
-+<UA4B2>     /x82/x36/x92/x35 YI RADICAL ZA
-+<UA4B3>     /x82/x36/x92/x36 YI RADICAL JO
-+<UA4B4>     /x82/x36/x92/x37 YI RADICAL NZUP
-+<UA4B5>     /x82/x36/x92/x38 YI RADICAL JJY
-+<UA4B6>     /x82/x36/x92/x39 YI RADICAL GOT
-+<UA4B7>     /x82/x36/x93/x30 YI RADICAL JJIE
-+<UA4B8>     /x82/x36/x93/x31 YI RADICAL WO
-+<UA4B9>     /x82/x36/x93/x32 YI RADICAL DU
-+<UA4BA>     /x82/x36/x93/x33 YI RADICAL SHUR
-+<UA4BB>     /x82/x36/x93/x34 YI RADICAL LIE
-+<UA4BC>     /x82/x36/x93/x35 YI RADICAL CY
-+<UA4BD>     /x82/x36/x93/x36 YI RADICAL CUOP
-+<UA4BE>     /x82/x36/x93/x37 YI RADICAL CIP
-+<UA4BF>     /x82/x36/x93/x38 YI RADICAL HXOP
-+<UA4C0>     /x82/x36/x93/x39 YI RADICAL SHAT
-+<UA4C1>     /x82/x36/x94/x30 YI RADICAL ZUR
-+<UA4C2>     /x82/x36/x94/x31 YI RADICAL SHOP
-+<UA4C3>     /x82/x36/x94/x32 YI RADICAL CHE
-+<UA4C4>     /x82/x36/x94/x33 YI RADICAL ZZIET
-+<UA4C5>     /x82/x36/x94/x34 YI RADICAL NBIE
-+<UA4C6>     /x82/x36/x94/x35 YI RADICAL KE
-+<UA4C7>     /x82/x36/x94/x36 <UNASSIGNED>
-+<UA4C8>     /x82/x36/x94/x37 <UNASSIGNED>
-+<UA4C9>     /x82/x36/x94/x38 <UNASSIGNED>
-+<UA4CA>     /x82/x36/x94/x39 <UNASSIGNED>
-+<UA4CB>     /x82/x36/x95/x30 <UNASSIGNED>
-+<UA4CC>     /x82/x36/x95/x31 <UNASSIGNED>
-+<UA4CD>     /x82/x36/x95/x32 <UNASSIGNED>
-+<UA4CE>     /x82/x36/x95/x33 <UNASSIGNED>
-+<UA4CF>     /x82/x36/x95/x34 <UNASSIGNED>
-+<UA4D0>     /x82/x36/x95/x35 <UNASSIGNED>
-+<UA4D1>     /x82/x36/x95/x36 <UNASSIGNED>
-+<UA4D2>     /x82/x36/x95/x37 <UNASSIGNED>
-+<UA4D3>     /x82/x36/x95/x38 <UNASSIGNED>
-+<UA4D4>     /x82/x36/x95/x39 <UNASSIGNED>
-+<UA4D5>     /x82/x36/x96/x30 <UNASSIGNED>
-+<UA4D6>     /x82/x36/x96/x31 <UNASSIGNED>
-+<UA4D7>     /x82/x36/x96/x32 <UNASSIGNED>
-+<UA4D8>     /x82/x36/x96/x33 <UNASSIGNED>
-+<UA4D9>     /x82/x36/x96/x34 <UNASSIGNED>
-+<UA4DA>     /x82/x36/x96/x35 <UNASSIGNED>
-+<UA4DB>     /x82/x36/x96/x36 <UNASSIGNED>
-+<UA4DC>     /x82/x36/x96/x37 <UNASSIGNED>
-+<UA4DD>     /x82/x36/x96/x38 <UNASSIGNED>
-+<UA4DE>     /x82/x36/x96/x39 <UNASSIGNED>
-+<UA4DF>     /x82/x36/x97/x30 <UNASSIGNED>
-+<UA4E0>     /x82/x36/x97/x31 <UNASSIGNED>
-+<UA4E1>     /x82/x36/x97/x32 <UNASSIGNED>
-+<UA4E2>     /x82/x36/x97/x33 <UNASSIGNED>
-+<UA4E3>     /x82/x36/x97/x34 <UNASSIGNED>
-+<UA4E4>     /x82/x36/x97/x35 <UNASSIGNED>
-+<UA4E5>     /x82/x36/x97/x36 <UNASSIGNED>
-+<UA4E6>     /x82/x36/x97/x37 <UNASSIGNED>
-+<UA4E7>     /x82/x36/x97/x38 <UNASSIGNED>
-+<UA4E8>     /x82/x36/x97/x39 <UNASSIGNED>
-+<UA4E9>     /x82/x36/x98/x30 <UNASSIGNED>
-+<UA4EA>     /x82/x36/x98/x31 <UNASSIGNED>
-+<UA4EB>     /x82/x36/x98/x32 <UNASSIGNED>
-+<UA4EC>     /x82/x36/x98/x33 <UNASSIGNED>
-+<UA4ED>     /x82/x36/x98/x34 <UNASSIGNED>
-+<UA4EE>     /x82/x36/x98/x35 <UNASSIGNED>
-+<UA4EF>     /x82/x36/x98/x36 <UNASSIGNED>
-+<UA4F0>     /x82/x36/x98/x37 <UNASSIGNED>
-+<UA4F1>     /x82/x36/x98/x38 <UNASSIGNED>
-+<UA4F2>     /x82/x36/x98/x39 <UNASSIGNED>
-+<UA4F3>     /x82/x36/x99/x30 <UNASSIGNED>
-+<UA4F4>     /x82/x36/x99/x31 <UNASSIGNED>
-+<UA4F5>     /x82/x36/x99/x32 <UNASSIGNED>
-+<UA4F6>     /x82/x36/x99/x33 <UNASSIGNED>
-+<UA4F7>     /x82/x36/x99/x34 <UNASSIGNED>
-+<UA4F8>     /x82/x36/x99/x35 <UNASSIGNED>
-+<UA4F9>     /x82/x36/x99/x36 <UNASSIGNED>
-+<UA4FA>     /x82/x36/x99/x37 <UNASSIGNED>
-+<UA4FB>     /x82/x36/x99/x38 <UNASSIGNED>
-+<UA4FC>     /x82/x36/x99/x39 <UNASSIGNED>
-+<UA4FD>     /x82/x36/x9a/x30 <UNASSIGNED>
-+<UA4FE>     /x82/x36/x9a/x31 <UNASSIGNED>
-+<UA4FF>     /x82/x36/x9a/x32 <UNASSIGNED>
-+<UA500>     /x82/x36/x9a/x33 <UNASSIGNED>
-+<UA501>     /x82/x36/x9a/x34 <UNASSIGNED>
-+<UA502>     /x82/x36/x9a/x35 <UNASSIGNED>
-+<UA503>     /x82/x36/x9a/x36 <UNASSIGNED>
-+<UA504>     /x82/x36/x9a/x37 <UNASSIGNED>
-+<UA505>     /x82/x36/x9a/x38 <UNASSIGNED>
-+<UA506>     /x82/x36/x9a/x39 <UNASSIGNED>
-+<UA507>     /x82/x36/x9b/x30 <UNASSIGNED>
-+<UA508>     /x82/x36/x9b/x31 <UNASSIGNED>
-+<UA509>     /x82/x36/x9b/x32 <UNASSIGNED>
-+<UA50A>     /x82/x36/x9b/x33 <UNASSIGNED>
-+<UA50B>     /x82/x36/x9b/x34 <UNASSIGNED>
-+<UA50C>     /x82/x36/x9b/x35 <UNASSIGNED>
-+<UA50D>     /x82/x36/x9b/x36 <UNASSIGNED>
-+<UA50E>     /x82/x36/x9b/x37 <UNASSIGNED>
-+<UA50F>     /x82/x36/x9b/x38 <UNASSIGNED>
-+<UA510>     /x82/x36/x9b/x39 <UNASSIGNED>
-+<UA511>     /x82/x36/x9c/x30 <UNASSIGNED>
-+<UA512>     /x82/x36/x9c/x31 <UNASSIGNED>
-+<UA513>     /x82/x36/x9c/x32 <UNASSIGNED>
-+<UA514>     /x82/x36/x9c/x33 <UNASSIGNED>
-+<UA515>     /x82/x36/x9c/x34 <UNASSIGNED>
-+<UA516>     /x82/x36/x9c/x35 <UNASSIGNED>
-+<UA517>     /x82/x36/x9c/x36 <UNASSIGNED>
-+<UA518>     /x82/x36/x9c/x37 <UNASSIGNED>
-+<UA519>     /x82/x36/x9c/x38 <UNASSIGNED>
-+<UA51A>     /x82/x36/x9c/x39 <UNASSIGNED>
-+<UA51B>     /x82/x36/x9d/x30 <UNASSIGNED>
-+<UA51C>     /x82/x36/x9d/x31 <UNASSIGNED>
-+<UA51D>     /x82/x36/x9d/x32 <UNASSIGNED>
-+<UA51E>     /x82/x36/x9d/x33 <UNASSIGNED>
-+<UA51F>     /x82/x36/x9d/x34 <UNASSIGNED>
-+<UA520>     /x82/x36/x9d/x35 <UNASSIGNED>
-+<UA521>     /x82/x36/x9d/x36 <UNASSIGNED>
-+<UA522>     /x82/x36/x9d/x37 <UNASSIGNED>
-+<UA523>     /x82/x36/x9d/x38 <UNASSIGNED>
-+<UA524>     /x82/x36/x9d/x39 <UNASSIGNED>
-+<UA525>     /x82/x36/x9e/x30 <UNASSIGNED>
-+<UA526>     /x82/x36/x9e/x31 <UNASSIGNED>
-+<UA527>     /x82/x36/x9e/x32 <UNASSIGNED>
-+<UA528>     /x82/x36/x9e/x33 <UNASSIGNED>
-+<UA529>     /x82/x36/x9e/x34 <UNASSIGNED>
-+<UA52A>     /x82/x36/x9e/x35 <UNASSIGNED>
-+<UA52B>     /x82/x36/x9e/x36 <UNASSIGNED>
-+<UA52C>     /x82/x36/x9e/x37 <UNASSIGNED>
-+<UA52D>     /x82/x36/x9e/x38 <UNASSIGNED>
-+<UA52E>     /x82/x36/x9e/x39 <UNASSIGNED>
-+<UA52F>     /x82/x36/x9f/x30 <UNASSIGNED>
-+<UA530>     /x82/x36/x9f/x31 <UNASSIGNED>
-+<UA531>     /x82/x36/x9f/x32 <UNASSIGNED>
-+<UA532>     /x82/x36/x9f/x33 <UNASSIGNED>
-+<UA533>     /x82/x36/x9f/x34 <UNASSIGNED>
-+<UA534>     /x82/x36/x9f/x35 <UNASSIGNED>
-+<UA535>     /x82/x36/x9f/x36 <UNASSIGNED>
-+<UA536>     /x82/x36/x9f/x37 <UNASSIGNED>
-+<UA537>     /x82/x36/x9f/x38 <UNASSIGNED>
-+<UA538>     /x82/x36/x9f/x39 <UNASSIGNED>
-+<UA539>     /x82/x36/xa0/x30 <UNASSIGNED>
-+<UA53A>     /x82/x36/xa0/x31 <UNASSIGNED>
-+<UA53B>     /x82/x36/xa0/x32 <UNASSIGNED>
-+<UA53C>     /x82/x36/xa0/x33 <UNASSIGNED>
-+<UA53D>     /x82/x36/xa0/x34 <UNASSIGNED>
-+<UA53E>     /x82/x36/xa0/x35 <UNASSIGNED>
-+<UA53F>     /x82/x36/xa0/x36 <UNASSIGNED>
-+<UA540>     /x82/x36/xa0/x37 <UNASSIGNED>
-+<UA541>     /x82/x36/xa0/x38 <UNASSIGNED>
-+<UA542>     /x82/x36/xa0/x39 <UNASSIGNED>
-+<UA543>     /x82/x36/xa1/x30 <UNASSIGNED>
-+<UA544>     /x82/x36/xa1/x31 <UNASSIGNED>
-+<UA545>     /x82/x36/xa1/x32 <UNASSIGNED>
-+<UA546>     /x82/x36/xa1/x33 <UNASSIGNED>
-+<UA547>     /x82/x36/xa1/x34 <UNASSIGNED>
-+<UA548>     /x82/x36/xa1/x35 <UNASSIGNED>
-+<UA549>     /x82/x36/xa1/x36 <UNASSIGNED>
-+<UA54A>     /x82/x36/xa1/x37 <UNASSIGNED>
-+<UA54B>     /x82/x36/xa1/x38 <UNASSIGNED>
-+<UA54C>     /x82/x36/xa1/x39 <UNASSIGNED>
-+<UA54D>     /x82/x36/xa2/x30 <UNASSIGNED>
-+<UA54E>     /x82/x36/xa2/x31 <UNASSIGNED>
-+<UA54F>     /x82/x36/xa2/x32 <UNASSIGNED>
-+<UA550>     /x82/x36/xa2/x33 <UNASSIGNED>
-+<UA551>     /x82/x36/xa2/x34 <UNASSIGNED>
-+<UA552>     /x82/x36/xa2/x35 <UNASSIGNED>
-+<UA553>     /x82/x36/xa2/x36 <UNASSIGNED>
-+<UA554>     /x82/x36/xa2/x37 <UNASSIGNED>
-+<UA555>     /x82/x36/xa2/x38 <UNASSIGNED>
-+<UA556>     /x82/x36/xa2/x39 <UNASSIGNED>
-+<UA557>     /x82/x36/xa3/x30 <UNASSIGNED>
-+<UA558>     /x82/x36/xa3/x31 <UNASSIGNED>
-+<UA559>     /x82/x36/xa3/x32 <UNASSIGNED>
-+<UA55A>     /x82/x36/xa3/x33 <UNASSIGNED>
-+<UA55B>     /x82/x36/xa3/x34 <UNASSIGNED>
-+<UA55C>     /x82/x36/xa3/x35 <UNASSIGNED>
-+<UA55D>     /x82/x36/xa3/x36 <UNASSIGNED>
-+<UA55E>     /x82/x36/xa3/x37 <UNASSIGNED>
-+<UA55F>     /x82/x36/xa3/x38 <UNASSIGNED>
-+<UA560>     /x82/x36/xa3/x39 <UNASSIGNED>
-+<UA561>     /x82/x36/xa4/x30 <UNASSIGNED>
-+<UA562>     /x82/x36/xa4/x31 <UNASSIGNED>
-+<UA563>     /x82/x36/xa4/x32 <UNASSIGNED>
-+<UA564>     /x82/x36/xa4/x33 <UNASSIGNED>
-+<UA565>     /x82/x36/xa4/x34 <UNASSIGNED>
-+<UA566>     /x82/x36/xa4/x35 <UNASSIGNED>
-+<UA567>     /x82/x36/xa4/x36 <UNASSIGNED>
-+<UA568>     /x82/x36/xa4/x37 <UNASSIGNED>
-+<UA569>     /x82/x36/xa4/x38 <UNASSIGNED>
-+<UA56A>     /x82/x36/xa4/x39 <UNASSIGNED>
-+<UA56B>     /x82/x36/xa5/x30 <UNASSIGNED>
-+<UA56C>     /x82/x36/xa5/x31 <UNASSIGNED>
-+<UA56D>     /x82/x36/xa5/x32 <UNASSIGNED>
-+<UA56E>     /x82/x36/xa5/x33 <UNASSIGNED>
-+<UA56F>     /x82/x36/xa5/x34 <UNASSIGNED>
-+<UA570>     /x82/x36/xa5/x35 <UNASSIGNED>
-+<UA571>     /x82/x36/xa5/x36 <UNASSIGNED>
-+<UA572>     /x82/x36/xa5/x37 <UNASSIGNED>
-+<UA573>     /x82/x36/xa5/x38 <UNASSIGNED>
-+<UA574>     /x82/x36/xa5/x39 <UNASSIGNED>
-+<UA575>     /x82/x36/xa6/x30 <UNASSIGNED>
-+<UA576>     /x82/x36/xa6/x31 <UNASSIGNED>
-+<UA577>     /x82/x36/xa6/x32 <UNASSIGNED>
-+<UA578>     /x82/x36/xa6/x33 <UNASSIGNED>
-+<UA579>     /x82/x36/xa6/x34 <UNASSIGNED>
-+<UA57A>     /x82/x36/xa6/x35 <UNASSIGNED>
-+<UA57B>     /x82/x36/xa6/x36 <UNASSIGNED>
-+<UA57C>     /x82/x36/xa6/x37 <UNASSIGNED>
-+<UA57D>     /x82/x36/xa6/x38 <UNASSIGNED>
-+<UA57E>     /x82/x36/xa6/x39 <UNASSIGNED>
-+<UA57F>     /x82/x36/xa7/x30 <UNASSIGNED>
-+<UA580>     /x82/x36/xa7/x31 <UNASSIGNED>
-+<UA581>     /x82/x36/xa7/x32 <UNASSIGNED>
-+<UA582>     /x82/x36/xa7/x33 <UNASSIGNED>
-+<UA583>     /x82/x36/xa7/x34 <UNASSIGNED>
-+<UA584>     /x82/x36/xa7/x35 <UNASSIGNED>
-+<UA585>     /x82/x36/xa7/x36 <UNASSIGNED>
-+<UA586>     /x82/x36/xa7/x37 <UNASSIGNED>
-+<UA587>     /x82/x36/xa7/x38 <UNASSIGNED>
-+<UA588>     /x82/x36/xa7/x39 <UNASSIGNED>
-+<UA589>     /x82/x36/xa8/x30 <UNASSIGNED>
-+<UA58A>     /x82/x36/xa8/x31 <UNASSIGNED>
-+<UA58B>     /x82/x36/xa8/x32 <UNASSIGNED>
-+<UA58C>     /x82/x36/xa8/x33 <UNASSIGNED>
-+<UA58D>     /x82/x36/xa8/x34 <UNASSIGNED>
-+<UA58E>     /x82/x36/xa8/x35 <UNASSIGNED>
-+<UA58F>     /x82/x36/xa8/x36 <UNASSIGNED>
-+<UA590>     /x82/x36/xa8/x37 <UNASSIGNED>
-+<UA591>     /x82/x36/xa8/x38 <UNASSIGNED>
-+<UA592>     /x82/x36/xa8/x39 <UNASSIGNED>
-+<UA593>     /x82/x36/xa9/x30 <UNASSIGNED>
-+<UA594>     /x82/x36/xa9/x31 <UNASSIGNED>
-+<UA595>     /x82/x36/xa9/x32 <UNASSIGNED>
-+<UA596>     /x82/x36/xa9/x33 <UNASSIGNED>
-+<UA597>     /x82/x36/xa9/x34 <UNASSIGNED>
-+<UA598>     /x82/x36/xa9/x35 <UNASSIGNED>
-+<UA599>     /x82/x36/xa9/x36 <UNASSIGNED>
-+<UA59A>     /x82/x36/xa9/x37 <UNASSIGNED>
-+<UA59B>     /x82/x36/xa9/x38 <UNASSIGNED>
-+<UA59C>     /x82/x36/xa9/x39 <UNASSIGNED>
-+<UA59D>     /x82/x36/xaa/x30 <UNASSIGNED>
-+<UA59E>     /x82/x36/xaa/x31 <UNASSIGNED>
-+<UA59F>     /x82/x36/xaa/x32 <UNASSIGNED>
-+<UA5A0>     /x82/x36/xaa/x33 <UNASSIGNED>
-+<UA5A1>     /x82/x36/xaa/x34 <UNASSIGNED>
-+<UA5A2>     /x82/x36/xaa/x35 <UNASSIGNED>
-+<UA5A3>     /x82/x36/xaa/x36 <UNASSIGNED>
-+<UA5A4>     /x82/x36/xaa/x37 <UNASSIGNED>
-+<UA5A5>     /x82/x36/xaa/x38 <UNASSIGNED>
-+<UA5A6>     /x82/x36/xaa/x39 <UNASSIGNED>
-+<UA5A7>     /x82/x36/xab/x30 <UNASSIGNED>
-+<UA5A8>     /x82/x36/xab/x31 <UNASSIGNED>
-+<UA5A9>     /x82/x36/xab/x32 <UNASSIGNED>
-+<UA5AA>     /x82/x36/xab/x33 <UNASSIGNED>
-+<UA5AB>     /x82/x36/xab/x34 <UNASSIGNED>
-+<UA5AC>     /x82/x36/xab/x35 <UNASSIGNED>
-+<UA5AD>     /x82/x36/xab/x36 <UNASSIGNED>
-+<UA5AE>     /x82/x36/xab/x37 <UNASSIGNED>
-+<UA5AF>     /x82/x36/xab/x38 <UNASSIGNED>
-+<UA5B0>     /x82/x36/xab/x39 <UNASSIGNED>
-+<UA5B1>     /x82/x36/xac/x30 <UNASSIGNED>
-+<UA5B2>     /x82/x36/xac/x31 <UNASSIGNED>
-+<UA5B3>     /x82/x36/xac/x32 <UNASSIGNED>
-+<UA5B4>     /x82/x36/xac/x33 <UNASSIGNED>
-+<UA5B5>     /x82/x36/xac/x34 <UNASSIGNED>
-+<UA5B6>     /x82/x36/xac/x35 <UNASSIGNED>
-+<UA5B7>     /x82/x36/xac/x36 <UNASSIGNED>
-+<UA5B8>     /x82/x36/xac/x37 <UNASSIGNED>
-+<UA5B9>     /x82/x36/xac/x38 <UNASSIGNED>
-+<UA5BA>     /x82/x36/xac/x39 <UNASSIGNED>
-+<UA5BB>     /x82/x36/xad/x30 <UNASSIGNED>
-+<UA5BC>     /x82/x36/xad/x31 <UNASSIGNED>
-+<UA5BD>     /x82/x36/xad/x32 <UNASSIGNED>
-+<UA5BE>     /x82/x36/xad/x33 <UNASSIGNED>
-+<UA5BF>     /x82/x36/xad/x34 <UNASSIGNED>
-+<UA5C0>     /x82/x36/xad/x35 <UNASSIGNED>
-+<UA5C1>     /x82/x36/xad/x36 <UNASSIGNED>
-+<UA5C2>     /x82/x36/xad/x37 <UNASSIGNED>
-+<UA5C3>     /x82/x36/xad/x38 <UNASSIGNED>
-+<UA5C4>     /x82/x36/xad/x39 <UNASSIGNED>
-+<UA5C5>     /x82/x36/xae/x30 <UNASSIGNED>
-+<UA5C6>     /x82/x36/xae/x31 <UNASSIGNED>
-+<UA5C7>     /x82/x36/xae/x32 <UNASSIGNED>
-+<UA5C8>     /x82/x36/xae/x33 <UNASSIGNED>
-+<UA5C9>     /x82/x36/xae/x34 <UNASSIGNED>
-+<UA5CA>     /x82/x36/xae/x35 <UNASSIGNED>
-+<UA5CB>     /x82/x36/xae/x36 <UNASSIGNED>
-+<UA5CC>     /x82/x36/xae/x37 <UNASSIGNED>
-+<UA5CD>     /x82/x36/xae/x38 <UNASSIGNED>
-+<UA5CE>     /x82/x36/xae/x39 <UNASSIGNED>
-+<UA5CF>     /x82/x36/xaf/x30 <UNASSIGNED>
-+<UA5D0>     /x82/x36/xaf/x31 <UNASSIGNED>
-+<UA5D1>     /x82/x36/xaf/x32 <UNASSIGNED>
-+<UA5D2>     /x82/x36/xaf/x33 <UNASSIGNED>
-+<UA5D3>     /x82/x36/xaf/x34 <UNASSIGNED>
-+<UA5D4>     /x82/x36/xaf/x35 <UNASSIGNED>
-+<UA5D5>     /x82/x36/xaf/x36 <UNASSIGNED>
-+<UA5D6>     /x82/x36/xaf/x37 <UNASSIGNED>
-+<UA5D7>     /x82/x36/xaf/x38 <UNASSIGNED>
-+<UA5D8>     /x82/x36/xaf/x39 <UNASSIGNED>
-+<UA5D9>     /x82/x36/xb0/x30 <UNASSIGNED>
-+<UA5DA>     /x82/x36/xb0/x31 <UNASSIGNED>
-+<UA5DB>     /x82/x36/xb0/x32 <UNASSIGNED>
-+<UA5DC>     /x82/x36/xb0/x33 <UNASSIGNED>
-+<UA5DD>     /x82/x36/xb0/x34 <UNASSIGNED>
-+<UA5DE>     /x82/x36/xb0/x35 <UNASSIGNED>
-+<UA5DF>     /x82/x36/xb0/x36 <UNASSIGNED>
-+<UA5E0>     /x82/x36/xb0/x37 <UNASSIGNED>
-+<UA5E1>     /x82/x36/xb0/x38 <UNASSIGNED>
-+<UA5E2>     /x82/x36/xb0/x39 <UNASSIGNED>
-+<UA5E3>     /x82/x36/xb1/x30 <UNASSIGNED>
-+<UA5E4>     /x82/x36/xb1/x31 <UNASSIGNED>
-+<UA5E5>     /x82/x36/xb1/x32 <UNASSIGNED>
-+<UA5E6>     /x82/x36/xb1/x33 <UNASSIGNED>
-+<UA5E7>     /x82/x36/xb1/x34 <UNASSIGNED>
-+<UA5E8>     /x82/x36/xb1/x35 <UNASSIGNED>
-+<UA5E9>     /x82/x36/xb1/x36 <UNASSIGNED>
-+<UA5EA>     /x82/x36/xb1/x37 <UNASSIGNED>
-+<UA5EB>     /x82/x36/xb1/x38 <UNASSIGNED>
-+<UA5EC>     /x82/x36/xb1/x39 <UNASSIGNED>
-+<UA5ED>     /x82/x36/xb2/x30 <UNASSIGNED>
-+<UA5EE>     /x82/x36/xb2/x31 <UNASSIGNED>
-+<UA5EF>     /x82/x36/xb2/x32 <UNASSIGNED>
-+<UA5F0>     /x82/x36/xb2/x33 <UNASSIGNED>
-+<UA5F1>     /x82/x36/xb2/x34 <UNASSIGNED>
-+<UA5F2>     /x82/x36/xb2/x35 <UNASSIGNED>
-+<UA5F3>     /x82/x36/xb2/x36 <UNASSIGNED>
-+<UA5F4>     /x82/x36/xb2/x37 <UNASSIGNED>
-+<UA5F5>     /x82/x36/xb2/x38 <UNASSIGNED>
-+<UA5F6>     /x82/x36/xb2/x39 <UNASSIGNED>
-+<UA5F7>     /x82/x36/xb3/x30 <UNASSIGNED>
-+<UA5F8>     /x82/x36/xb3/x31 <UNASSIGNED>
-+<UA5F9>     /x82/x36/xb3/x32 <UNASSIGNED>
-+<UA5FA>     /x82/x36/xb3/x33 <UNASSIGNED>
-+<UA5FB>     /x82/x36/xb3/x34 <UNASSIGNED>
-+<UA5FC>     /x82/x36/xb3/x35 <UNASSIGNED>
-+<UA5FD>     /x82/x36/xb3/x36 <UNASSIGNED>
-+<UA5FE>     /x82/x36/xb3/x37 <UNASSIGNED>
-+<UA5FF>     /x82/x36/xb3/x38 <UNASSIGNED>
-+<UA600>     /x82/x36/xb3/x39 <UNASSIGNED>
-+<UA601>     /x82/x36/xb4/x30 <UNASSIGNED>
-+<UA602>     /x82/x36/xb4/x31 <UNASSIGNED>
-+<UA603>     /x82/x36/xb4/x32 <UNASSIGNED>
-+<UA604>     /x82/x36/xb4/x33 <UNASSIGNED>
-+<UA605>     /x82/x36/xb4/x34 <UNASSIGNED>
-+<UA606>     /x82/x36/xb4/x35 <UNASSIGNED>
-+<UA607>     /x82/x36/xb4/x36 <UNASSIGNED>
-+<UA608>     /x82/x36/xb4/x37 <UNASSIGNED>
-+<UA609>     /x82/x36/xb4/x38 <UNASSIGNED>
-+<UA60A>     /x82/x36/xb4/x39 <UNASSIGNED>
-+<UA60B>     /x82/x36/xb5/x30 <UNASSIGNED>
-+<UA60C>     /x82/x36/xb5/x31 <UNASSIGNED>
-+<UA60D>     /x82/x36/xb5/x32 <UNASSIGNED>
-+<UA60E>     /x82/x36/xb5/x33 <UNASSIGNED>
-+<UA60F>     /x82/x36/xb5/x34 <UNASSIGNED>
-+<UA610>     /x82/x36/xb5/x35 <UNASSIGNED>
-+<UA611>     /x82/x36/xb5/x36 <UNASSIGNED>
-+<UA612>     /x82/x36/xb5/x37 <UNASSIGNED>
-+<UA613>     /x82/x36/xb5/x38 <UNASSIGNED>
-+<UA614>     /x82/x36/xb5/x39 <UNASSIGNED>
-+<UA615>     /x82/x36/xb6/x30 <UNASSIGNED>
-+<UA616>     /x82/x36/xb6/x31 <UNASSIGNED>
-+<UA617>     /x82/x36/xb6/x32 <UNASSIGNED>
-+<UA618>     /x82/x36/xb6/x33 <UNASSIGNED>
-+<UA619>     /x82/x36/xb6/x34 <UNASSIGNED>
-+<UA61A>     /x82/x36/xb6/x35 <UNASSIGNED>
-+<UA61B>     /x82/x36/xb6/x36 <UNASSIGNED>
-+<UA61C>     /x82/x36/xb6/x37 <UNASSIGNED>
-+<UA61D>     /x82/x36/xb6/x38 <UNASSIGNED>
-+<UA61E>     /x82/x36/xb6/x39 <UNASSIGNED>
-+<UA61F>     /x82/x36/xb7/x30 <UNASSIGNED>
-+<UA620>     /x82/x36/xb7/x31 <UNASSIGNED>
-+<UA621>     /x82/x36/xb7/x32 <UNASSIGNED>
-+<UA622>     /x82/x36/xb7/x33 <UNASSIGNED>
-+<UA623>     /x82/x36/xb7/x34 <UNASSIGNED>
-+<UA624>     /x82/x36/xb7/x35 <UNASSIGNED>
-+<UA625>     /x82/x36/xb7/x36 <UNASSIGNED>
-+<UA626>     /x82/x36/xb7/x37 <UNASSIGNED>
-+<UA627>     /x82/x36/xb7/x38 <UNASSIGNED>
-+<UA628>     /x82/x36/xb7/x39 <UNASSIGNED>
-+<UA629>     /x82/x36/xb8/x30 <UNASSIGNED>
-+<UA62A>     /x82/x36/xb8/x31 <UNASSIGNED>
-+<UA62B>     /x82/x36/xb8/x32 <UNASSIGNED>
-+<UA62C>     /x82/x36/xb8/x33 <UNASSIGNED>
-+<UA62D>     /x82/x36/xb8/x34 <UNASSIGNED>
-+<UA62E>     /x82/x36/xb8/x35 <UNASSIGNED>
-+<UA62F>     /x82/x36/xb8/x36 <UNASSIGNED>
-+<UA630>     /x82/x36/xb8/x37 <UNASSIGNED>
-+<UA631>     /x82/x36/xb8/x38 <UNASSIGNED>
-+<UA632>     /x82/x36/xb8/x39 <UNASSIGNED>
-+<UA633>     /x82/x36/xb9/x30 <UNASSIGNED>
-+<UA634>     /x82/x36/xb9/x31 <UNASSIGNED>
-+<UA635>     /x82/x36/xb9/x32 <UNASSIGNED>
-+<UA636>     /x82/x36/xb9/x33 <UNASSIGNED>
-+<UA637>     /x82/x36/xb9/x34 <UNASSIGNED>
-+<UA638>     /x82/x36/xb9/x35 <UNASSIGNED>
-+<UA639>     /x82/x36/xb9/x36 <UNASSIGNED>
-+<UA63A>     /x82/x36/xb9/x37 <UNASSIGNED>
-+<UA63B>     /x82/x36/xb9/x38 <UNASSIGNED>
-+<UA63C>     /x82/x36/xb9/x39 <UNASSIGNED>
-+<UA63D>     /x82/x36/xba/x30 <UNASSIGNED>
-+<UA63E>     /x82/x36/xba/x31 <UNASSIGNED>
-+<UA63F>     /x82/x36/xba/x32 <UNASSIGNED>
-+<UA640>     /x82/x36/xba/x33 <UNASSIGNED>
-+<UA641>     /x82/x36/xba/x34 <UNASSIGNED>
-+<UA642>     /x82/x36/xba/x35 <UNASSIGNED>
-+<UA643>     /x82/x36/xba/x36 <UNASSIGNED>
-+<UA644>     /x82/x36/xba/x37 <UNASSIGNED>
-+<UA645>     /x82/x36/xba/x38 <UNASSIGNED>
-+<UA646>     /x82/x36/xba/x39 <UNASSIGNED>
-+<UA647>     /x82/x36/xbb/x30 <UNASSIGNED>
-+<UA648>     /x82/x36/xbb/x31 <UNASSIGNED>
-+<UA649>     /x82/x36/xbb/x32 <UNASSIGNED>
-+<UA64A>     /x82/x36/xbb/x33 <UNASSIGNED>
-+<UA64B>     /x82/x36/xbb/x34 <UNASSIGNED>
-+<UA64C>     /x82/x36/xbb/x35 <UNASSIGNED>
-+<UA64D>     /x82/x36/xbb/x36 <UNASSIGNED>
-+<UA64E>     /x82/x36/xbb/x37 <UNASSIGNED>
-+<UA64F>     /x82/x36/xbb/x38 <UNASSIGNED>
-+<UA650>     /x82/x36/xbb/x39 <UNASSIGNED>
-+<UA651>     /x82/x36/xbc/x30 <UNASSIGNED>
-+<UA652>     /x82/x36/xbc/x31 <UNASSIGNED>
-+<UA653>     /x82/x36/xbc/x32 <UNASSIGNED>
-+<UA654>     /x82/x36/xbc/x33 <UNASSIGNED>
-+<UA655>     /x82/x36/xbc/x34 <UNASSIGNED>
-+<UA656>     /x82/x36/xbc/x35 <UNASSIGNED>
-+<UA657>     /x82/x36/xbc/x36 <UNASSIGNED>
-+<UA658>     /x82/x36/xbc/x37 <UNASSIGNED>
-+<UA659>     /x82/x36/xbc/x38 <UNASSIGNED>
-+<UA65A>     /x82/x36/xbc/x39 <UNASSIGNED>
-+<UA65B>     /x82/x36/xbd/x30 <UNASSIGNED>
-+<UA65C>     /x82/x36/xbd/x31 <UNASSIGNED>
-+<UA65D>     /x82/x36/xbd/x32 <UNASSIGNED>
-+<UA65E>     /x82/x36/xbd/x33 <UNASSIGNED>
-+<UA65F>     /x82/x36/xbd/x34 <UNASSIGNED>
-+<UA660>     /x82/x36/xbd/x35 <UNASSIGNED>
-+<UA661>     /x82/x36/xbd/x36 <UNASSIGNED>
-+<UA662>     /x82/x36/xbd/x37 <UNASSIGNED>
-+<UA663>     /x82/x36/xbd/x38 <UNASSIGNED>
-+<UA664>     /x82/x36/xbd/x39 <UNASSIGNED>
-+<UA665>     /x82/x36/xbe/x30 <UNASSIGNED>
-+<UA666>     /x82/x36/xbe/x31 <UNASSIGNED>
-+<UA667>     /x82/x36/xbe/x32 <UNASSIGNED>
-+<UA668>     /x82/x36/xbe/x33 <UNASSIGNED>
-+<UA669>     /x82/x36/xbe/x34 <UNASSIGNED>
-+<UA66A>     /x82/x36/xbe/x35 <UNASSIGNED>
-+<UA66B>     /x82/x36/xbe/x36 <UNASSIGNED>
-+<UA66C>     /x82/x36/xbe/x37 <UNASSIGNED>
-+<UA66D>     /x82/x36/xbe/x38 <UNASSIGNED>
-+<UA66E>     /x82/x36/xbe/x39 <UNASSIGNED>
-+<UA66F>     /x82/x36/xbf/x30 <UNASSIGNED>
-+<UA670>     /x82/x36/xbf/x31 <UNASSIGNED>
-+<UA671>     /x82/x36/xbf/x32 <UNASSIGNED>
-+<UA672>     /x82/x36/xbf/x33 <UNASSIGNED>
-+<UA673>     /x82/x36/xbf/x34 <UNASSIGNED>
-+<UA674>     /x82/x36/xbf/x35 <UNASSIGNED>
-+<UA675>     /x82/x36/xbf/x36 <UNASSIGNED>
-+<UA676>     /x82/x36/xbf/x37 <UNASSIGNED>
-+<UA677>     /x82/x36/xbf/x38 <UNASSIGNED>
-+<UA678>     /x82/x36/xbf/x39 <UNASSIGNED>
-+<UA679>     /x82/x36/xc0/x30 <UNASSIGNED>
-+<UA67A>     /x82/x36/xc0/x31 <UNASSIGNED>
-+<UA67B>     /x82/x36/xc0/x32 <UNASSIGNED>
-+<UA67C>     /x82/x36/xc0/x33 <UNASSIGNED>
-+<UA67D>     /x82/x36/xc0/x34 <UNASSIGNED>
-+<UA67E>     /x82/x36/xc0/x35 <UNASSIGNED>
-+<UA67F>     /x82/x36/xc0/x36 <UNASSIGNED>
-+<UA680>     /x82/x36/xc0/x37 <UNASSIGNED>
-+<UA681>     /x82/x36/xc0/x38 <UNASSIGNED>
-+<UA682>     /x82/x36/xc0/x39 <UNASSIGNED>
-+<UA683>     /x82/x36/xc1/x30 <UNASSIGNED>
-+<UA684>     /x82/x36/xc1/x31 <UNASSIGNED>
-+<UA685>     /x82/x36/xc1/x32 <UNASSIGNED>
-+<UA686>     /x82/x36/xc1/x33 <UNASSIGNED>
-+<UA687>     /x82/x36/xc1/x34 <UNASSIGNED>
-+<UA688>     /x82/x36/xc1/x35 <UNASSIGNED>
-+<UA689>     /x82/x36/xc1/x36 <UNASSIGNED>
-+<UA68A>     /x82/x36/xc1/x37 <UNASSIGNED>
-+<UA68B>     /x82/x36/xc1/x38 <UNASSIGNED>
-+<UA68C>     /x82/x36/xc1/x39 <UNASSIGNED>
-+<UA68D>     /x82/x36/xc2/x30 <UNASSIGNED>
-+<UA68E>     /x82/x36/xc2/x31 <UNASSIGNED>
-+<UA68F>     /x82/x36/xc2/x32 <UNASSIGNED>
-+<UA690>     /x82/x36/xc2/x33 <UNASSIGNED>
-+<UA691>     /x82/x36/xc2/x34 <UNASSIGNED>
-+<UA692>     /x82/x36/xc2/x35 <UNASSIGNED>
-+<UA693>     /x82/x36/xc2/x36 <UNASSIGNED>
-+<UA694>     /x82/x36/xc2/x37 <UNASSIGNED>
-+<UA695>     /x82/x36/xc2/x38 <UNASSIGNED>
-+<UA696>     /x82/x36/xc2/x39 <UNASSIGNED>
-+<UA697>     /x82/x36/xc3/x30 <UNASSIGNED>
-+<UA698>     /x82/x36/xc3/x31 <UNASSIGNED>
-+<UA699>     /x82/x36/xc3/x32 <UNASSIGNED>
-+<UA69A>     /x82/x36/xc3/x33 <UNASSIGNED>
-+<UA69B>     /x82/x36/xc3/x34 <UNASSIGNED>
-+<UA69C>     /x82/x36/xc3/x35 <UNASSIGNED>
-+<UA69D>     /x82/x36/xc3/x36 <UNASSIGNED>
-+<UA69E>     /x82/x36/xc3/x37 <UNASSIGNED>
-+<UA69F>     /x82/x36/xc3/x38 <UNASSIGNED>
-+<UA6A0>     /x82/x36/xc3/x39 <UNASSIGNED>
-+<UA6A1>     /x82/x36/xc4/x30 <UNASSIGNED>
-+<UA6A2>     /x82/x36/xc4/x31 <UNASSIGNED>
-+<UA6A3>     /x82/x36/xc4/x32 <UNASSIGNED>
-+<UA6A4>     /x82/x36/xc4/x33 <UNASSIGNED>
-+<UA6A5>     /x82/x36/xc4/x34 <UNASSIGNED>
-+<UA6A6>     /x82/x36/xc4/x35 <UNASSIGNED>
-+<UA6A7>     /x82/x36/xc4/x36 <UNASSIGNED>
-+<UA6A8>     /x82/x36/xc4/x37 <UNASSIGNED>
-+<UA6A9>     /x82/x36/xc4/x38 <UNASSIGNED>
-+<UA6AA>     /x82/x36/xc4/x39 <UNASSIGNED>
-+<UA6AB>     /x82/x36/xc5/x30 <UNASSIGNED>
-+<UA6AC>     /x82/x36/xc5/x31 <UNASSIGNED>
-+<UA6AD>     /x82/x36/xc5/x32 <UNASSIGNED>
-+<UA6AE>     /x82/x36/xc5/x33 <UNASSIGNED>
-+<UA6AF>     /x82/x36/xc5/x34 <UNASSIGNED>
-+<UA6B0>     /x82/x36/xc5/x35 <UNASSIGNED>
-+<UA6B1>     /x82/x36/xc5/x36 <UNASSIGNED>
-+<UA6B2>     /x82/x36/xc5/x37 <UNASSIGNED>
-+<UA6B3>     /x82/x36/xc5/x38 <UNASSIGNED>
-+<UA6B4>     /x82/x36/xc5/x39 <UNASSIGNED>
-+<UA6B5>     /x82/x36/xc6/x30 <UNASSIGNED>
-+<UA6B6>     /x82/x36/xc6/x31 <UNASSIGNED>
-+<UA6B7>     /x82/x36/xc6/x32 <UNASSIGNED>
-+<UA6B8>     /x82/x36/xc6/x33 <UNASSIGNED>
-+<UA6B9>     /x82/x36/xc6/x34 <UNASSIGNED>
-+<UA6BA>     /x82/x36/xc6/x35 <UNASSIGNED>
-+<UA6BB>     /x82/x36/xc6/x36 <UNASSIGNED>
-+<UA6BC>     /x82/x36/xc6/x37 <UNASSIGNED>
-+<UA6BD>     /x82/x36/xc6/x38 <UNASSIGNED>
-+<UA6BE>     /x82/x36/xc6/x39 <UNASSIGNED>
-+<UA6BF>     /x82/x36/xc7/x30 <UNASSIGNED>
-+<UA6C0>     /x82/x36/xc7/x31 <UNASSIGNED>
-+<UA6C1>     /x82/x36/xc7/x32 <UNASSIGNED>
-+<UA6C2>     /x82/x36/xc7/x33 <UNASSIGNED>
-+<UA6C3>     /x82/x36/xc7/x34 <UNASSIGNED>
-+<UA6C4>     /x82/x36/xc7/x35 <UNASSIGNED>
-+<UA6C5>     /x82/x36/xc7/x36 <UNASSIGNED>
-+<UA6C6>     /x82/x36/xc7/x37 <UNASSIGNED>
-+<UA6C7>     /x82/x36/xc7/x38 <UNASSIGNED>
-+<UA6C8>     /x82/x36/xc7/x39 <UNASSIGNED>
-+<UA6C9>     /x82/x36/xc8/x30 <UNASSIGNED>
-+<UA6CA>     /x82/x36/xc8/x31 <UNASSIGNED>
-+<UA6CB>     /x82/x36/xc8/x32 <UNASSIGNED>
-+<UA6CC>     /x82/x36/xc8/x33 <UNASSIGNED>
-+<UA6CD>     /x82/x36/xc8/x34 <UNASSIGNED>
-+<UA6CE>     /x82/x36/xc8/x35 <UNASSIGNED>
-+<UA6CF>     /x82/x36/xc8/x36 <UNASSIGNED>
-+<UA6D0>     /x82/x36/xc8/x37 <UNASSIGNED>
-+<UA6D1>     /x82/x36/xc8/x38 <UNASSIGNED>
-+<UA6D2>     /x82/x36/xc8/x39 <UNASSIGNED>
-+<UA6D3>     /x82/x36/xc9/x30 <UNASSIGNED>
-+<UA6D4>     /x82/x36/xc9/x31 <UNASSIGNED>
-+<UA6D5>     /x82/x36/xc9/x32 <UNASSIGNED>
-+<UA6D6>     /x82/x36/xc9/x33 <UNASSIGNED>
-+<UA6D7>     /x82/x36/xc9/x34 <UNASSIGNED>
-+<UA6D8>     /x82/x36/xc9/x35 <UNASSIGNED>
-+<UA6D9>     /x82/x36/xc9/x36 <UNASSIGNED>
-+<UA6DA>     /x82/x36/xc9/x37 <UNASSIGNED>
-+<UA6DB>     /x82/x36/xc9/x38 <UNASSIGNED>
-+<UA6DC>     /x82/x36/xc9/x39 <UNASSIGNED>
-+<UA6DD>     /x82/x36/xca/x30 <UNASSIGNED>
-+<UA6DE>     /x82/x36/xca/x31 <UNASSIGNED>
-+<UA6DF>     /x82/x36/xca/x32 <UNASSIGNED>
-+<UA6E0>     /x82/x36/xca/x33 <UNASSIGNED>
-+<UA6E1>     /x82/x36/xca/x34 <UNASSIGNED>
-+<UA6E2>     /x82/x36/xca/x35 <UNASSIGNED>
-+<UA6E3>     /x82/x36/xca/x36 <UNASSIGNED>
-+<UA6E4>     /x82/x36/xca/x37 <UNASSIGNED>
-+<UA6E5>     /x82/x36/xca/x38 <UNASSIGNED>
-+<UA6E6>     /x82/x36/xca/x39 <UNASSIGNED>
-+<UA6E7>     /x82/x36/xcb/x30 <UNASSIGNED>
-+<UA6E8>     /x82/x36/xcb/x31 <UNASSIGNED>
-+<UA6E9>     /x82/x36/xcb/x32 <UNASSIGNED>
-+<UA6EA>     /x82/x36/xcb/x33 <UNASSIGNED>
-+<UA6EB>     /x82/x36/xcb/x34 <UNASSIGNED>
-+<UA6EC>     /x82/x36/xcb/x35 <UNASSIGNED>
-+<UA6ED>     /x82/x36/xcb/x36 <UNASSIGNED>
-+<UA6EE>     /x82/x36/xcb/x37 <UNASSIGNED>
-+<UA6EF>     /x82/x36/xcb/x38 <UNASSIGNED>
-+<UA6F0>     /x82/x36/xcb/x39 <UNASSIGNED>
-+<UA6F1>     /x82/x36/xcc/x30 <UNASSIGNED>
-+<UA6F2>     /x82/x36/xcc/x31 <UNASSIGNED>
-+<UA6F3>     /x82/x36/xcc/x32 <UNASSIGNED>
-+<UA6F4>     /x82/x36/xcc/x33 <UNASSIGNED>
-+<UA6F5>     /x82/x36/xcc/x34 <UNASSIGNED>
-+<UA6F6>     /x82/x36/xcc/x35 <UNASSIGNED>
-+<UA6F7>     /x82/x36/xcc/x36 <UNASSIGNED>
-+<UA6F8>     /x82/x36/xcc/x37 <UNASSIGNED>
-+<UA6F9>     /x82/x36/xcc/x38 <UNASSIGNED>
-+<UA6FA>     /x82/x36/xcc/x39 <UNASSIGNED>
-+<UA6FB>     /x82/x36/xcd/x30 <UNASSIGNED>
-+<UA6FC>     /x82/x36/xcd/x31 <UNASSIGNED>
-+<UA6FD>     /x82/x36/xcd/x32 <UNASSIGNED>
-+<UA6FE>     /x82/x36/xcd/x33 <UNASSIGNED>
-+<UA6FF>     /x82/x36/xcd/x34 <UNASSIGNED>
-+<UA700>     /x82/x36/xcd/x35 <UNASSIGNED>
-+<UA701>     /x82/x36/xcd/x36 <UNASSIGNED>
-+<UA702>     /x82/x36/xcd/x37 <UNASSIGNED>
-+<UA703>     /x82/x36/xcd/x38 <UNASSIGNED>
-+<UA704>     /x82/x36/xcd/x39 <UNASSIGNED>
-+<UA705>     /x82/x36/xce/x30 <UNASSIGNED>
-+<UA706>     /x82/x36/xce/x31 <UNASSIGNED>
-+<UA707>     /x82/x36/xce/x32 <UNASSIGNED>
-+<UA708>     /x82/x36/xce/x33 <UNASSIGNED>
-+<UA709>     /x82/x36/xce/x34 <UNASSIGNED>
-+<UA70A>     /x82/x36/xce/x35 <UNASSIGNED>
-+<UA70B>     /x82/x36/xce/x36 <UNASSIGNED>
-+<UA70C>     /x82/x36/xce/x37 <UNASSIGNED>
-+<UA70D>     /x82/x36/xce/x38 <UNASSIGNED>
-+<UA70E>     /x82/x36/xce/x39 <UNASSIGNED>
-+<UA70F>     /x82/x36/xcf/x30 <UNASSIGNED>
-+<UA710>     /x82/x36/xcf/x31 <UNASSIGNED>
-+<UA711>     /x82/x36/xcf/x32 <UNASSIGNED>
-+<UA712>     /x82/x36/xcf/x33 <UNASSIGNED>
-+<UA713>     /x82/x36/xcf/x34 <UNASSIGNED>
-+<UA714>     /x82/x36/xcf/x35 <UNASSIGNED>
-+<UA715>     /x82/x36/xcf/x36 <UNASSIGNED>
-+<UA716>     /x82/x36/xcf/x37 <UNASSIGNED>
-+<UA717>     /x82/x36/xcf/x38 <UNASSIGNED>
-+<UA718>     /x82/x36/xcf/x39 <UNASSIGNED>
-+<UA719>     /x82/x36/xd0/x30 <UNASSIGNED>
-+<UA71A>     /x82/x36/xd0/x31 <UNASSIGNED>
-+<UA71B>     /x82/x36/xd0/x32 <UNASSIGNED>
-+<UA71C>     /x82/x36/xd0/x33 <UNASSIGNED>
-+<UA71D>     /x82/x36/xd0/x34 <UNASSIGNED>
-+<UA71E>     /x82/x36/xd0/x35 <UNASSIGNED>
-+<UA71F>     /x82/x36/xd0/x36 <UNASSIGNED>
-+<UA720>     /x82/x36/xd0/x37 <UNASSIGNED>
-+<UA721>     /x82/x36/xd0/x38 <UNASSIGNED>
-+<UA722>     /x82/x36/xd0/x39 <UNASSIGNED>
-+<UA723>     /x82/x36/xd1/x30 <UNASSIGNED>
-+<UA724>     /x82/x36/xd1/x31 <UNASSIGNED>
-+<UA725>     /x82/x36/xd1/x32 <UNASSIGNED>
-+<UA726>     /x82/x36/xd1/x33 <UNASSIGNED>
-+<UA727>     /x82/x36/xd1/x34 <UNASSIGNED>
-+<UA728>     /x82/x36/xd1/x35 <UNASSIGNED>
-+<UA729>     /x82/x36/xd1/x36 <UNASSIGNED>
-+<UA72A>     /x82/x36/xd1/x37 <UNASSIGNED>
-+<UA72B>     /x82/x36/xd1/x38 <UNASSIGNED>
-+<UA72C>     /x82/x36/xd1/x39 <UNASSIGNED>
-+<UA72D>     /x82/x36/xd2/x30 <UNASSIGNED>
-+<UA72E>     /x82/x36/xd2/x31 <UNASSIGNED>
-+<UA72F>     /x82/x36/xd2/x32 <UNASSIGNED>
-+<UA730>     /x82/x36/xd2/x33 <UNASSIGNED>
-+<UA731>     /x82/x36/xd2/x34 <UNASSIGNED>
-+<UA732>     /x82/x36/xd2/x35 <UNASSIGNED>
-+<UA733>     /x82/x36/xd2/x36 <UNASSIGNED>
-+<UA734>     /x82/x36/xd2/x37 <UNASSIGNED>
-+<UA735>     /x82/x36/xd2/x38 <UNASSIGNED>
-+<UA736>     /x82/x36/xd2/x39 <UNASSIGNED>
-+<UA737>     /x82/x36/xd3/x30 <UNASSIGNED>
-+<UA738>     /x82/x36/xd3/x31 <UNASSIGNED>
-+<UA739>     /x82/x36/xd3/x32 <UNASSIGNED>
-+<UA73A>     /x82/x36/xd3/x33 <UNASSIGNED>
-+<UA73B>     /x82/x36/xd3/x34 <UNASSIGNED>
-+<UA73C>     /x82/x36/xd3/x35 <UNASSIGNED>
-+<UA73D>     /x82/x36/xd3/x36 <UNASSIGNED>
-+<UA73E>     /x82/x36/xd3/x37 <UNASSIGNED>
-+<UA73F>     /x82/x36/xd3/x38 <UNASSIGNED>
-+<UA740>     /x82/x36/xd3/x39 <UNASSIGNED>
-+<UA741>     /x82/x36/xd4/x30 <UNASSIGNED>
-+<UA742>     /x82/x36/xd4/x31 <UNASSIGNED>
-+<UA743>     /x82/x36/xd4/x32 <UNASSIGNED>
-+<UA744>     /x82/x36/xd4/x33 <UNASSIGNED>
-+<UA745>     /x82/x36/xd4/x34 <UNASSIGNED>
-+<UA746>     /x82/x36/xd4/x35 <UNASSIGNED>
-+<UA747>     /x82/x36/xd4/x36 <UNASSIGNED>
-+<UA748>     /x82/x36/xd4/x37 <UNASSIGNED>
-+<UA749>     /x82/x36/xd4/x38 <UNASSIGNED>
-+<UA74A>     /x82/x36/xd4/x39 <UNASSIGNED>
-+<UA74B>     /x82/x36/xd5/x30 <UNASSIGNED>
-+<UA74C>     /x82/x36/xd5/x31 <UNASSIGNED>
-+<UA74D>     /x82/x36/xd5/x32 <UNASSIGNED>
-+<UA74E>     /x82/x36/xd5/x33 <UNASSIGNED>
-+<UA74F>     /x82/x36/xd5/x34 <UNASSIGNED>
-+<UA750>     /x82/x36/xd5/x35 <UNASSIGNED>
-+<UA751>     /x82/x36/xd5/x36 <UNASSIGNED>
-+<UA752>     /x82/x36/xd5/x37 <UNASSIGNED>
-+<UA753>     /x82/x36/xd5/x38 <UNASSIGNED>
-+<UA754>     /x82/x36/xd5/x39 <UNASSIGNED>
-+<UA755>     /x82/x36/xd6/x30 <UNASSIGNED>
-+<UA756>     /x82/x36/xd6/x31 <UNASSIGNED>
-+<UA757>     /x82/x36/xd6/x32 <UNASSIGNED>
-+<UA758>     /x82/x36/xd6/x33 <UNASSIGNED>
-+<UA759>     /x82/x36/xd6/x34 <UNASSIGNED>
-+<UA75A>     /x82/x36/xd6/x35 <UNASSIGNED>
-+<UA75B>     /x82/x36/xd6/x36 <UNASSIGNED>
-+<UA75C>     /x82/x36/xd6/x37 <UNASSIGNED>
-+<UA75D>     /x82/x36/xd6/x38 <UNASSIGNED>
-+<UA75E>     /x82/x36/xd6/x39 <UNASSIGNED>
-+<UA75F>     /x82/x36/xd7/x30 <UNASSIGNED>
-+<UA760>     /x82/x36/xd7/x31 <UNASSIGNED>
-+<UA761>     /x82/x36/xd7/x32 <UNASSIGNED>
-+<UA762>     /x82/x36/xd7/x33 <UNASSIGNED>
-+<UA763>     /x82/x36/xd7/x34 <UNASSIGNED>
-+<UA764>     /x82/x36/xd7/x35 <UNASSIGNED>
-+<UA765>     /x82/x36/xd7/x36 <UNASSIGNED>
-+<UA766>     /x82/x36/xd7/x37 <UNASSIGNED>
-+<UA767>     /x82/x36/xd7/x38 <UNASSIGNED>
-+<UA768>     /x82/x36/xd7/x39 <UNASSIGNED>
-+<UA769>     /x82/x36/xd8/x30 <UNASSIGNED>
-+<UA76A>     /x82/x36/xd8/x31 <UNASSIGNED>
-+<UA76B>     /x82/x36/xd8/x32 <UNASSIGNED>
-+<UA76C>     /x82/x36/xd8/x33 <UNASSIGNED>
-+<UA76D>     /x82/x36/xd8/x34 <UNASSIGNED>
-+<UA76E>     /x82/x36/xd8/x35 <UNASSIGNED>
-+<UA76F>     /x82/x36/xd8/x36 <UNASSIGNED>
-+<UA770>     /x82/x36/xd8/x37 <UNASSIGNED>
-+<UA771>     /x82/x36/xd8/x38 <UNASSIGNED>
-+<UA772>     /x82/x36/xd8/x39 <UNASSIGNED>
-+<UA773>     /x82/x36/xd9/x30 <UNASSIGNED>
-+<UA774>     /x82/x36/xd9/x31 <UNASSIGNED>
-+<UA775>     /x82/x36/xd9/x32 <UNASSIGNED>
-+<UA776>     /x82/x36/xd9/x33 <UNASSIGNED>
-+<UA777>     /x82/x36/xd9/x34 <UNASSIGNED>
-+<UA778>     /x82/x36/xd9/x35 <UNASSIGNED>
-+<UA779>     /x82/x36/xd9/x36 <UNASSIGNED>
-+<UA77A>     /x82/x36/xd9/x37 <UNASSIGNED>
-+<UA77B>     /x82/x36/xd9/x38 <UNASSIGNED>
-+<UA77C>     /x82/x36/xd9/x39 <UNASSIGNED>
-+<UA77D>     /x82/x36/xda/x30 <UNASSIGNED>
-+<UA77E>     /x82/x36/xda/x31 <UNASSIGNED>
-+<UA77F>     /x82/x36/xda/x32 <UNASSIGNED>
-+<UA780>     /x82/x36/xda/x33 <UNASSIGNED>
-+<UA781>     /x82/x36/xda/x34 <UNASSIGNED>
-+<UA782>     /x82/x36/xda/x35 <UNASSIGNED>
-+<UA783>     /x82/x36/xda/x36 <UNASSIGNED>
-+<UA784>     /x82/x36/xda/x37 <UNASSIGNED>
-+<UA785>     /x82/x36/xda/x38 <UNASSIGNED>
-+<UA786>     /x82/x36/xda/x39 <UNASSIGNED>
-+<UA787>     /x82/x36/xdb/x30 <UNASSIGNED>
-+<UA788>     /x82/x36/xdb/x31 <UNASSIGNED>
-+<UA789>     /x82/x36/xdb/x32 <UNASSIGNED>
-+<UA78A>     /x82/x36/xdb/x33 <UNASSIGNED>
-+<UA78B>     /x82/x36/xdb/x34 <UNASSIGNED>
-+<UA78C>     /x82/x36/xdb/x35 <UNASSIGNED>
-+<UA78D>     /x82/x36/xdb/x36 <UNASSIGNED>
-+<UA78E>     /x82/x36/xdb/x37 <UNASSIGNED>
-+<UA78F>     /x82/x36/xdb/x38 <UNASSIGNED>
-+<UA790>     /x82/x36/xdb/x39 <UNASSIGNED>
-+<UA791>     /x82/x36/xdc/x30 <UNASSIGNED>
-+<UA792>     /x82/x36/xdc/x31 <UNASSIGNED>
-+<UA793>     /x82/x36/xdc/x32 <UNASSIGNED>
-+<UA794>     /x82/x36/xdc/x33 <UNASSIGNED>
-+<UA795>     /x82/x36/xdc/x34 <UNASSIGNED>
-+<UA796>     /x82/x36/xdc/x35 <UNASSIGNED>
-+<UA797>     /x82/x36/xdc/x36 <UNASSIGNED>
-+<UA798>     /x82/x36/xdc/x37 <UNASSIGNED>
-+<UA799>     /x82/x36/xdc/x38 <UNASSIGNED>
-+<UA79A>     /x82/x36/xdc/x39 <UNASSIGNED>
-+<UA79B>     /x82/x36/xdd/x30 <UNASSIGNED>
-+<UA79C>     /x82/x36/xdd/x31 <UNASSIGNED>
-+<UA79D>     /x82/x36/xdd/x32 <UNASSIGNED>
-+<UA79E>     /x82/x36/xdd/x33 <UNASSIGNED>
-+<UA79F>     /x82/x36/xdd/x34 <UNASSIGNED>
-+<UA7A0>     /x82/x36/xdd/x35 <UNASSIGNED>
-+<UA7A1>     /x82/x36/xdd/x36 <UNASSIGNED>
-+<UA7A2>     /x82/x36/xdd/x37 <UNASSIGNED>
-+<UA7A3>     /x82/x36/xdd/x38 <UNASSIGNED>
-+<UA7A4>     /x82/x36/xdd/x39 <UNASSIGNED>
-+<UA7A5>     /x82/x36/xde/x30 <UNASSIGNED>
-+<UA7A6>     /x82/x36/xde/x31 <UNASSIGNED>
-+<UA7A7>     /x82/x36/xde/x32 <UNASSIGNED>
-+<UA7A8>     /x82/x36/xde/x33 <UNASSIGNED>
-+<UA7A9>     /x82/x36/xde/x34 <UNASSIGNED>
-+<UA7AA>     /x82/x36/xde/x35 <UNASSIGNED>
-+<UA7AB>     /x82/x36/xde/x36 <UNASSIGNED>
-+<UA7AC>     /x82/x36/xde/x37 <UNASSIGNED>
-+<UA7AD>     /x82/x36/xde/x38 <UNASSIGNED>
-+<UA7AE>     /x82/x36/xde/x39 <UNASSIGNED>
-+<UA7AF>     /x82/x36/xdf/x30 <UNASSIGNED>
-+<UA7B0>     /x82/x36/xdf/x31 <UNASSIGNED>
-+<UA7B1>     /x82/x36/xdf/x32 <UNASSIGNED>
-+<UA7B2>     /x82/x36/xdf/x33 <UNASSIGNED>
-+<UA7B3>     /x82/x36/xdf/x34 <UNASSIGNED>
-+<UA7B4>     /x82/x36/xdf/x35 <UNASSIGNED>
-+<UA7B5>     /x82/x36/xdf/x36 <UNASSIGNED>
-+<UA7B6>     /x82/x36/xdf/x37 <UNASSIGNED>
-+<UA7B7>     /x82/x36/xdf/x38 <UNASSIGNED>
-+<UA7B8>     /x82/x36/xdf/x39 <UNASSIGNED>
-+<UA7B9>     /x82/x36/xe0/x30 <UNASSIGNED>
-+<UA7BA>     /x82/x36/xe0/x31 <UNASSIGNED>
-+<UA7BB>     /x82/x36/xe0/x32 <UNASSIGNED>
-+<UA7BC>     /x82/x36/xe0/x33 <UNASSIGNED>
-+<UA7BD>     /x82/x36/xe0/x34 <UNASSIGNED>
-+<UA7BE>     /x82/x36/xe0/x35 <UNASSIGNED>
-+<UA7BF>     /x82/x36/xe0/x36 <UNASSIGNED>
-+<UA7C0>     /x82/x36/xe0/x37 <UNASSIGNED>
-+<UA7C1>     /x82/x36/xe0/x38 <UNASSIGNED>
-+<UA7C2>     /x82/x36/xe0/x39 <UNASSIGNED>
-+<UA7C3>     /x82/x36/xe1/x30 <UNASSIGNED>
-+<UA7C4>     /x82/x36/xe1/x31 <UNASSIGNED>
-+<UA7C5>     /x82/x36/xe1/x32 <UNASSIGNED>
-+<UA7C6>     /x82/x36/xe1/x33 <UNASSIGNED>
-+<UA7C7>     /x82/x36/xe1/x34 <UNASSIGNED>
-+<UA7C8>     /x82/x36/xe1/x35 <UNASSIGNED>
-+<UA7C9>     /x82/x36/xe1/x36 <UNASSIGNED>
-+<UA7CA>     /x82/x36/xe1/x37 <UNASSIGNED>
-+<UA7CB>     /x82/x36/xe1/x38 <UNASSIGNED>
-+<UA7CC>     /x82/x36/xe1/x39 <UNASSIGNED>
-+<UA7CD>     /x82/x36/xe2/x30 <UNASSIGNED>
-+<UA7CE>     /x82/x36/xe2/x31 <UNASSIGNED>
-+<UA7CF>     /x82/x36/xe2/x32 <UNASSIGNED>
-+<UA7D0>     /x82/x36/xe2/x33 <UNASSIGNED>
-+<UA7D1>     /x82/x36/xe2/x34 <UNASSIGNED>
-+<UA7D2>     /x82/x36/xe2/x35 <UNASSIGNED>
-+<UA7D3>     /x82/x36/xe2/x36 <UNASSIGNED>
-+<UA7D4>     /x82/x36/xe2/x37 <UNASSIGNED>
-+<UA7D5>     /x82/x36/xe2/x38 <UNASSIGNED>
-+<UA7D6>     /x82/x36/xe2/x39 <UNASSIGNED>
-+<UA7D7>     /x82/x36/xe3/x30 <UNASSIGNED>
-+<UA7D8>     /x82/x36/xe3/x31 <UNASSIGNED>
-+<UA7D9>     /x82/x36/xe3/x32 <UNASSIGNED>
-+<UA7DA>     /x82/x36/xe3/x33 <UNASSIGNED>
-+<UA7DB>     /x82/x36/xe3/x34 <UNASSIGNED>
-+<UA7DC>     /x82/x36/xe3/x35 <UNASSIGNED>
-+<UA7DD>     /x82/x36/xe3/x36 <UNASSIGNED>
-+<UA7DE>     /x82/x36/xe3/x37 <UNASSIGNED>
-+<UA7DF>     /x82/x36/xe3/x38 <UNASSIGNED>
-+<UA7E0>     /x82/x36/xe3/x39 <UNASSIGNED>
-+<UA7E1>     /x82/x36/xe4/x30 <UNASSIGNED>
-+<UA7E2>     /x82/x36/xe4/x31 <UNASSIGNED>
-+<UA7E3>     /x82/x36/xe4/x32 <UNASSIGNED>
-+<UA7E4>     /x82/x36/xe4/x33 <UNASSIGNED>
-+<UA7E5>     /x82/x36/xe4/x34 <UNASSIGNED>
-+<UA7E6>     /x82/x36/xe4/x35 <UNASSIGNED>
-+<UA7E7>     /x82/x36/xe4/x36 <UNASSIGNED>
-+<UA7E8>     /x82/x36/xe4/x37 <UNASSIGNED>
-+<UA7E9>     /x82/x36/xe4/x38 <UNASSIGNED>
-+<UA7EA>     /x82/x36/xe4/x39 <UNASSIGNED>
-+<UA7EB>     /x82/x36/xe5/x30 <UNASSIGNED>
-+<UA7EC>     /x82/x36/xe5/x31 <UNASSIGNED>
-+<UA7ED>     /x82/x36/xe5/x32 <UNASSIGNED>
-+<UA7EE>     /x82/x36/xe5/x33 <UNASSIGNED>
-+<UA7EF>     /x82/x36/xe5/x34 <UNASSIGNED>
-+<UA7F0>     /x82/x36/xe5/x35 <UNASSIGNED>
-+<UA7F1>     /x82/x36/xe5/x36 <UNASSIGNED>
-+<UA7F2>     /x82/x36/xe5/x37 <UNASSIGNED>
-+<UA7F3>     /x82/x36/xe5/x38 <UNASSIGNED>
-+<UA7F4>     /x82/x36/xe5/x39 <UNASSIGNED>
-+<UA7F5>     /x82/x36/xe6/x30 <UNASSIGNED>
-+<UA7F6>     /x82/x36/xe6/x31 <UNASSIGNED>
-+<UA7F7>     /x82/x36/xe6/x32 <UNASSIGNED>
-+<UA7F8>     /x82/x36/xe6/x33 <UNASSIGNED>
-+<UA7F9>     /x82/x36/xe6/x34 <UNASSIGNED>
-+<UA7FA>     /x82/x36/xe6/x35 <UNASSIGNED>
-+<UA7FB>     /x82/x36/xe6/x36 <UNASSIGNED>
-+<UA7FC>     /x82/x36/xe6/x37 <UNASSIGNED>
-+<UA7FD>     /x82/x36/xe6/x38 <UNASSIGNED>
-+<UA7FE>     /x82/x36/xe6/x39 <UNASSIGNED>
-+<UA7FF>     /x82/x36/xe7/x30 <UNASSIGNED>
-+<UA800>     /x82/x36/xe7/x31 <UNASSIGNED>
-+<UA801>     /x82/x36/xe7/x32 <UNASSIGNED>
-+<UA802>     /x82/x36/xe7/x33 <UNASSIGNED>
-+<UA803>     /x82/x36/xe7/x34 <UNASSIGNED>
-+<UA804>     /x82/x36/xe7/x35 <UNASSIGNED>
-+<UA805>     /x82/x36/xe7/x36 <UNASSIGNED>
-+<UA806>     /x82/x36/xe7/x37 <UNASSIGNED>
-+<UA807>     /x82/x36/xe7/x38 <UNASSIGNED>
-+<UA808>     /x82/x36/xe7/x39 <UNASSIGNED>
-+<UA809>     /x82/x36/xe8/x30 <UNASSIGNED>
-+<UA80A>     /x82/x36/xe8/x31 <UNASSIGNED>
-+<UA80B>     /x82/x36/xe8/x32 <UNASSIGNED>
-+<UA80C>     /x82/x36/xe8/x33 <UNASSIGNED>
-+<UA80D>     /x82/x36/xe8/x34 <UNASSIGNED>
-+<UA80E>     /x82/x36/xe8/x35 <UNASSIGNED>
-+<UA80F>     /x82/x36/xe8/x36 <UNASSIGNED>
-+<UA810>     /x82/x36/xe8/x37 <UNASSIGNED>
-+<UA811>     /x82/x36/xe8/x38 <UNASSIGNED>
-+<UA812>     /x82/x36/xe8/x39 <UNASSIGNED>
-+<UA813>     /x82/x36/xe9/x30 <UNASSIGNED>
-+<UA814>     /x82/x36/xe9/x31 <UNASSIGNED>
-+<UA815>     /x82/x36/xe9/x32 <UNASSIGNED>
-+<UA816>     /x82/x36/xe9/x33 <UNASSIGNED>
-+<UA817>     /x82/x36/xe9/x34 <UNASSIGNED>
-+<UA818>     /x82/x36/xe9/x35 <UNASSIGNED>
-+<UA819>     /x82/x36/xe9/x36 <UNASSIGNED>
-+<UA81A>     /x82/x36/xe9/x37 <UNASSIGNED>
-+<UA81B>     /x82/x36/xe9/x38 <UNASSIGNED>
-+<UA81C>     /x82/x36/xe9/x39 <UNASSIGNED>
-+<UA81D>     /x82/x36/xea/x30 <UNASSIGNED>
-+<UA81E>     /x82/x36/xea/x31 <UNASSIGNED>
-+<UA81F>     /x82/x36/xea/x32 <UNASSIGNED>
-+<UA820>     /x82/x36/xea/x33 <UNASSIGNED>
-+<UA821>     /x82/x36/xea/x34 <UNASSIGNED>
-+<UA822>     /x82/x36/xea/x35 <UNASSIGNED>
-+<UA823>     /x82/x36/xea/x36 <UNASSIGNED>
-+<UA824>     /x82/x36/xea/x37 <UNASSIGNED>
-+<UA825>     /x82/x36/xea/x38 <UNASSIGNED>
-+<UA826>     /x82/x36/xea/x39 <UNASSIGNED>
-+<UA827>     /x82/x36/xeb/x30 <UNASSIGNED>
-+<UA828>     /x82/x36/xeb/x31 <UNASSIGNED>
-+<UA829>     /x82/x36/xeb/x32 <UNASSIGNED>
-+<UA82A>     /x82/x36/xeb/x33 <UNASSIGNED>
-+<UA82B>     /x82/x36/xeb/x34 <UNASSIGNED>
-+<UA82C>     /x82/x36/xeb/x35 <UNASSIGNED>
-+<UA82D>     /x82/x36/xeb/x36 <UNASSIGNED>
-+<UA82E>     /x82/x36/xeb/x37 <UNASSIGNED>
-+<UA82F>     /x82/x36/xeb/x38 <UNASSIGNED>
-+<UA830>     /x82/x36/xeb/x39 <UNASSIGNED>
-+<UA831>     /x82/x36/xec/x30 <UNASSIGNED>
-+<UA832>     /x82/x36/xec/x31 <UNASSIGNED>
-+<UA833>     /x82/x36/xec/x32 <UNASSIGNED>
-+<UA834>     /x82/x36/xec/x33 <UNASSIGNED>
-+<UA835>     /x82/x36/xec/x34 <UNASSIGNED>
-+<UA836>     /x82/x36/xec/x35 <UNASSIGNED>
-+<UA837>     /x82/x36/xec/x36 <UNASSIGNED>
-+<UA838>     /x82/x36/xec/x37 <UNASSIGNED>
-+<UA839>     /x82/x36/xec/x38 <UNASSIGNED>
-+<UA83A>     /x82/x36/xec/x39 <UNASSIGNED>
-+<UA83B>     /x82/x36/xed/x30 <UNASSIGNED>
-+<UA83C>     /x82/x36/xed/x31 <UNASSIGNED>
-+<UA83D>     /x82/x36/xed/x32 <UNASSIGNED>
-+<UA83E>     /x82/x36/xed/x33 <UNASSIGNED>
-+<UA83F>     /x82/x36/xed/x34 <UNASSIGNED>
-+<UA840>     /x82/x36/xed/x35 <UNASSIGNED>
-+<UA841>     /x82/x36/xed/x36 <UNASSIGNED>
-+<UA842>     /x82/x36/xed/x37 <UNASSIGNED>
-+<UA843>     /x82/x36/xed/x38 <UNASSIGNED>
-+<UA844>     /x82/x36/xed/x39 <UNASSIGNED>
-+<UA845>     /x82/x36/xee/x30 <UNASSIGNED>
-+<UA846>     /x82/x36/xee/x31 <UNASSIGNED>
-+<UA847>     /x82/x36/xee/x32 <UNASSIGNED>
-+<UA848>     /x82/x36/xee/x33 <UNASSIGNED>
-+<UA849>     /x82/x36/xee/x34 <UNASSIGNED>
-+<UA84A>     /x82/x36/xee/x35 <UNASSIGNED>
-+<UA84B>     /x82/x36/xee/x36 <UNASSIGNED>
-+<UA84C>     /x82/x36/xee/x37 <UNASSIGNED>
-+<UA84D>     /x82/x36/xee/x38 <UNASSIGNED>
-+<UA84E>     /x82/x36/xee/x39 <UNASSIGNED>
-+<UA84F>     /x82/x36/xef/x30 <UNASSIGNED>
-+<UA850>     /x82/x36/xef/x31 <UNASSIGNED>
-+<UA851>     /x82/x36/xef/x32 <UNASSIGNED>
-+<UA852>     /x82/x36/xef/x33 <UNASSIGNED>
-+<UA853>     /x82/x36/xef/x34 <UNASSIGNED>
-+<UA854>     /x82/x36/xef/x35 <UNASSIGNED>
-+<UA855>     /x82/x36/xef/x36 <UNASSIGNED>
-+<UA856>     /x82/x36/xef/x37 <UNASSIGNED>
-+<UA857>     /x82/x36/xef/x38 <UNASSIGNED>
-+<UA858>     /x82/x36/xef/x39 <UNASSIGNED>
-+<UA859>     /x82/x36/xf0/x30 <UNASSIGNED>
-+<UA85A>     /x82/x36/xf0/x31 <UNASSIGNED>
-+<UA85B>     /x82/x36/xf0/x32 <UNASSIGNED>
-+<UA85C>     /x82/x36/xf0/x33 <UNASSIGNED>
-+<UA85D>     /x82/x36/xf0/x34 <UNASSIGNED>
-+<UA85E>     /x82/x36/xf0/x35 <UNASSIGNED>
-+<UA85F>     /x82/x36/xf0/x36 <UNASSIGNED>
-+<UA860>     /x82/x36/xf0/x37 <UNASSIGNED>
-+<UA861>     /x82/x36/xf0/x38 <UNASSIGNED>
-+<UA862>     /x82/x36/xf0/x39 <UNASSIGNED>
-+<UA863>     /x82/x36/xf1/x30 <UNASSIGNED>
-+<UA864>     /x82/x36/xf1/x31 <UNASSIGNED>
-+<UA865>     /x82/x36/xf1/x32 <UNASSIGNED>
-+<UA866>     /x82/x36/xf1/x33 <UNASSIGNED>
-+<UA867>     /x82/x36/xf1/x34 <UNASSIGNED>
-+<UA868>     /x82/x36/xf1/x35 <UNASSIGNED>
-+<UA869>     /x82/x36/xf1/x36 <UNASSIGNED>
-+<UA86A>     /x82/x36/xf1/x37 <UNASSIGNED>
-+<UA86B>     /x82/x36/xf1/x38 <UNASSIGNED>
-+<UA86C>     /x82/x36/xf1/x39 <UNASSIGNED>
-+<UA86D>     /x82/x36/xf2/x30 <UNASSIGNED>
-+<UA86E>     /x82/x36/xf2/x31 <UNASSIGNED>
-+<UA86F>     /x82/x36/xf2/x32 <UNASSIGNED>
-+<UA870>     /x82/x36/xf2/x33 <UNASSIGNED>
-+<UA871>     /x82/x36/xf2/x34 <UNASSIGNED>
-+<UA872>     /x82/x36/xf2/x35 <UNASSIGNED>
-+<UA873>     /x82/x36/xf2/x36 <UNASSIGNED>
-+<UA874>     /x82/x36/xf2/x37 <UNASSIGNED>
-+<UA875>     /x82/x36/xf2/x38 <UNASSIGNED>
-+<UA876>     /x82/x36/xf2/x39 <UNASSIGNED>
-+<UA877>     /x82/x36/xf3/x30 <UNASSIGNED>
-+<UA878>     /x82/x36/xf3/x31 <UNASSIGNED>
-+<UA879>     /x82/x36/xf3/x32 <UNASSIGNED>
-+<UA87A>     /x82/x36/xf3/x33 <UNASSIGNED>
-+<UA87B>     /x82/x36/xf3/x34 <UNASSIGNED>
-+<UA87C>     /x82/x36/xf3/x35 <UNASSIGNED>
-+<UA87D>     /x82/x36/xf3/x36 <UNASSIGNED>
-+<UA87E>     /x82/x36/xf3/x37 <UNASSIGNED>
-+<UA87F>     /x82/x36/xf3/x38 <UNASSIGNED>
-+<UA880>     /x82/x36/xf3/x39 <UNASSIGNED>
-+<UA881>     /x82/x36/xf4/x30 <UNASSIGNED>
-+<UA882>     /x82/x36/xf4/x31 <UNASSIGNED>
-+<UA883>     /x82/x36/xf4/x32 <UNASSIGNED>
-+<UA884>     /x82/x36/xf4/x33 <UNASSIGNED>
-+<UA885>     /x82/x36/xf4/x34 <UNASSIGNED>
-+<UA886>     /x82/x36/xf4/x35 <UNASSIGNED>
-+<UA887>     /x82/x36/xf4/x36 <UNASSIGNED>
-+<UA888>     /x82/x36/xf4/x37 <UNASSIGNED>
-+<UA889>     /x82/x36/xf4/x38 <UNASSIGNED>
-+<UA88A>     /x82/x36/xf4/x39 <UNASSIGNED>
-+<UA88B>     /x82/x36/xf5/x30 <UNASSIGNED>
-+<UA88C>     /x82/x36/xf5/x31 <UNASSIGNED>
-+<UA88D>     /x82/x36/xf5/x32 <UNASSIGNED>
-+<UA88E>     /x82/x36/xf5/x33 <UNASSIGNED>
-+<UA88F>     /x82/x36/xf5/x34 <UNASSIGNED>
-+<UA890>     /x82/x36/xf5/x35 <UNASSIGNED>
-+<UA891>     /x82/x36/xf5/x36 <UNASSIGNED>
-+<UA892>     /x82/x36/xf5/x37 <UNASSIGNED>
-+<UA893>     /x82/x36/xf5/x38 <UNASSIGNED>
-+<UA894>     /x82/x36/xf5/x39 <UNASSIGNED>
-+<UA895>     /x82/x36/xf6/x30 <UNASSIGNED>
-+<UA896>     /x82/x36/xf6/x31 <UNASSIGNED>
-+<UA897>     /x82/x36/xf6/x32 <UNASSIGNED>
-+<UA898>     /x82/x36/xf6/x33 <UNASSIGNED>
-+<UA899>     /x82/x36/xf6/x34 <UNASSIGNED>
-+<UA89A>     /x82/x36/xf6/x35 <UNASSIGNED>
-+<UA89B>     /x82/x36/xf6/x36 <UNASSIGNED>
-+<UA89C>     /x82/x36/xf6/x37 <UNASSIGNED>
-+<UA89D>     /x82/x36/xf6/x38 <UNASSIGNED>
-+<UA89E>     /x82/x36/xf6/x39 <UNASSIGNED>
-+<UA89F>     /x82/x36/xf7/x30 <UNASSIGNED>
-+<UA8A0>     /x82/x36/xf7/x31 <UNASSIGNED>
-+<UA8A1>     /x82/x36/xf7/x32 <UNASSIGNED>
-+<UA8A2>     /x82/x36/xf7/x33 <UNASSIGNED>
-+<UA8A3>     /x82/x36/xf7/x34 <UNASSIGNED>
-+<UA8A4>     /x82/x36/xf7/x35 <UNASSIGNED>
-+<UA8A5>     /x82/x36/xf7/x36 <UNASSIGNED>
-+<UA8A6>     /x82/x36/xf7/x37 <UNASSIGNED>
-+<UA8A7>     /x82/x36/xf7/x38 <UNASSIGNED>
-+<UA8A8>     /x82/x36/xf7/x39 <UNASSIGNED>
-+<UA8A9>     /x82/x36/xf8/x30 <UNASSIGNED>
-+<UA8AA>     /x82/x36/xf8/x31 <UNASSIGNED>
-+<UA8AB>     /x82/x36/xf8/x32 <UNASSIGNED>
-+<UA8AC>     /x82/x36/xf8/x33 <UNASSIGNED>
-+<UA8AD>     /x82/x36/xf8/x34 <UNASSIGNED>
-+<UA8AE>     /x82/x36/xf8/x35 <UNASSIGNED>
-+<UA8AF>     /x82/x36/xf8/x36 <UNASSIGNED>
-+<UA8B0>     /x82/x36/xf8/x37 <UNASSIGNED>
-+<UA8B1>     /x82/x36/xf8/x38 <UNASSIGNED>
-+<UA8B2>     /x82/x36/xf8/x39 <UNASSIGNED>
-+<UA8B3>     /x82/x36/xf9/x30 <UNASSIGNED>
-+<UA8B4>     /x82/x36/xf9/x31 <UNASSIGNED>
-+<UA8B5>     /x82/x36/xf9/x32 <UNASSIGNED>
-+<UA8B6>     /x82/x36/xf9/x33 <UNASSIGNED>
-+<UA8B7>     /x82/x36/xf9/x34 <UNASSIGNED>
-+<UA8B8>     /x82/x36/xf9/x35 <UNASSIGNED>
-+<UA8B9>     /x82/x36/xf9/x36 <UNASSIGNED>
-+<UA8BA>     /x82/x36/xf9/x37 <UNASSIGNED>
-+<UA8BB>     /x82/x36/xf9/x38 <UNASSIGNED>
-+<UA8BC>     /x82/x36/xf9/x39 <UNASSIGNED>
-+<UA8BD>     /x82/x36/xfa/x30 <UNASSIGNED>
-+<UA8BE>     /x82/x36/xfa/x31 <UNASSIGNED>
-+<UA8BF>     /x82/x36/xfa/x32 <UNASSIGNED>
-+<UA8C0>     /x82/x36/xfa/x33 <UNASSIGNED>
-+<UA8C1>     /x82/x36/xfa/x34 <UNASSIGNED>
-+<UA8C2>     /x82/x36/xfa/x35 <UNASSIGNED>
-+<UA8C3>     /x82/x36/xfa/x36 <UNASSIGNED>
-+<UA8C4>     /x82/x36/xfa/x37 <UNASSIGNED>
-+<UA8C5>     /x82/x36/xfa/x38 <UNASSIGNED>
-+<UA8C6>     /x82/x36/xfa/x39 <UNASSIGNED>
-+<UA8C7>     /x82/x36/xfb/x30 <UNASSIGNED>
-+<UA8C8>     /x82/x36/xfb/x31 <UNASSIGNED>
-+<UA8C9>     /x82/x36/xfb/x32 <UNASSIGNED>
-+<UA8CA>     /x82/x36/xfb/x33 <UNASSIGNED>
-+<UA8CB>     /x82/x36/xfb/x34 <UNASSIGNED>
-+<UA8CC>     /x82/x36/xfb/x35 <UNASSIGNED>
-+<UA8CD>     /x82/x36/xfb/x36 <UNASSIGNED>
-+<UA8CE>     /x82/x36/xfb/x37 <UNASSIGNED>
-+<UA8CF>     /x82/x36/xfb/x38 <UNASSIGNED>
-+<UA8D0>     /x82/x36/xfb/x39 <UNASSIGNED>
-+<UA8D1>     /x82/x36/xfc/x30 <UNASSIGNED>
-+<UA8D2>     /x82/x36/xfc/x31 <UNASSIGNED>
-+<UA8D3>     /x82/x36/xfc/x32 <UNASSIGNED>
-+<UA8D4>     /x82/x36/xfc/x33 <UNASSIGNED>
-+<UA8D5>     /x82/x36/xfc/x34 <UNASSIGNED>
-+<UA8D6>     /x82/x36/xfc/x35 <UNASSIGNED>
-+<UA8D7>     /x82/x36/xfc/x36 <UNASSIGNED>
-+<UA8D8>     /x82/x36/xfc/x37 <UNASSIGNED>
-+<UA8D9>     /x82/x36/xfc/x38 <UNASSIGNED>
-+<UA8DA>     /x82/x36/xfc/x39 <UNASSIGNED>
-+<UA8DB>     /x82/x36/xfd/x30 <UNASSIGNED>
-+<UA8DC>     /x82/x36/xfd/x31 <UNASSIGNED>
-+<UA8DD>     /x82/x36/xfd/x32 <UNASSIGNED>
-+<UA8DE>     /x82/x36/xfd/x33 <UNASSIGNED>
-+<UA8DF>     /x82/x36/xfd/x34 <UNASSIGNED>
-+<UA8E0>     /x82/x36/xfd/x35 <UNASSIGNED>
-+<UA8E1>     /x82/x36/xfd/x36 <UNASSIGNED>
-+<UA8E2>     /x82/x36/xfd/x37 <UNASSIGNED>
-+<UA8E3>     /x82/x36/xfd/x38 <UNASSIGNED>
-+<UA8E4>     /x82/x36/xfd/x39 <UNASSIGNED>
-+<UA8E5>     /x82/x36/xfe/x30 <UNASSIGNED>
-+<UA8E6>     /x82/x36/xfe/x31 <UNASSIGNED>
-+<UA8E7>     /x82/x36/xfe/x32 <UNASSIGNED>
-+<UA8E8>     /x82/x36/xfe/x33 <UNASSIGNED>
-+<UA8E9>     /x82/x36/xfe/x34 <UNASSIGNED>
-+<UA8EA>     /x82/x36/xfe/x35 <UNASSIGNED>
-+<UA8EB>     /x82/x36/xfe/x36 <UNASSIGNED>
-+<UA8EC>     /x82/x36/xfe/x37 <UNASSIGNED>
-+<UA8ED>     /x82/x36/xfe/x38 <UNASSIGNED>
-+<UA8EE>     /x82/x36/xfe/x39 <UNASSIGNED>
-+<UA8EF>     /x82/x37/x81/x30 <UNASSIGNED>
-+<UA8F0>     /x82/x37/x81/x31 <UNASSIGNED>
-+<UA8F1>     /x82/x37/x81/x32 <UNASSIGNED>
-+<UA8F2>     /x82/x37/x81/x33 <UNASSIGNED>
-+<UA8F3>     /x82/x37/x81/x34 <UNASSIGNED>
-+<UA8F4>     /x82/x37/x81/x35 <UNASSIGNED>
-+<UA8F5>     /x82/x37/x81/x36 <UNASSIGNED>
-+<UA8F6>     /x82/x37/x81/x37 <UNASSIGNED>
-+<UA8F7>     /x82/x37/x81/x38 <UNASSIGNED>
-+<UA8F8>     /x82/x37/x81/x39 <UNASSIGNED>
-+<UA8F9>     /x82/x37/x82/x30 <UNASSIGNED>
-+<UA8FA>     /x82/x37/x82/x31 <UNASSIGNED>
-+<UA8FB>     /x82/x37/x82/x32 <UNASSIGNED>
-+<UA8FC>     /x82/x37/x82/x33 <UNASSIGNED>
-+<UA8FD>     /x82/x37/x82/x34 <UNASSIGNED>
-+<UA8FE>     /x82/x37/x82/x35 <UNASSIGNED>
-+<UA8FF>     /x82/x37/x82/x36 <UNASSIGNED>
-+<UA900>     /x82/x37/x82/x37 <UNASSIGNED>
-+<UA901>     /x82/x37/x82/x38 <UNASSIGNED>
-+<UA902>     /x82/x37/x82/x39 <UNASSIGNED>
-+<UA903>     /x82/x37/x83/x30 <UNASSIGNED>
-+<UA904>     /x82/x37/x83/x31 <UNASSIGNED>
-+<UA905>     /x82/x37/x83/x32 <UNASSIGNED>
-+<UA906>     /x82/x37/x83/x33 <UNASSIGNED>
-+<UA907>     /x82/x37/x83/x34 <UNASSIGNED>
-+<UA908>     /x82/x37/x83/x35 <UNASSIGNED>
-+<UA909>     /x82/x37/x83/x36 <UNASSIGNED>
-+<UA90A>     /x82/x37/x83/x37 <UNASSIGNED>
-+<UA90B>     /x82/x37/x83/x38 <UNASSIGNED>
-+<UA90C>     /x82/x37/x83/x39 <UNASSIGNED>
-+<UA90D>     /x82/x37/x84/x30 <UNASSIGNED>
-+<UA90E>     /x82/x37/x84/x31 <UNASSIGNED>
-+<UA90F>     /x82/x37/x84/x32 <UNASSIGNED>
-+<UA910>     /x82/x37/x84/x33 <UNASSIGNED>
-+<UA911>     /x82/x37/x84/x34 <UNASSIGNED>
-+<UA912>     /x82/x37/x84/x35 <UNASSIGNED>
-+<UA913>     /x82/x37/x84/x36 <UNASSIGNED>
-+<UA914>     /x82/x37/x84/x37 <UNASSIGNED>
-+<UA915>     /x82/x37/x84/x38 <UNASSIGNED>
-+<UA916>     /x82/x37/x84/x39 <UNASSIGNED>
-+<UA917>     /x82/x37/x85/x30 <UNASSIGNED>
-+<UA918>     /x82/x37/x85/x31 <UNASSIGNED>
-+<UA919>     /x82/x37/x85/x32 <UNASSIGNED>
-+<UA91A>     /x82/x37/x85/x33 <UNASSIGNED>
-+<UA91B>     /x82/x37/x85/x34 <UNASSIGNED>
-+<UA91C>     /x82/x37/x85/x35 <UNASSIGNED>
-+<UA91D>     /x82/x37/x85/x36 <UNASSIGNED>
-+<UA91E>     /x82/x37/x85/x37 <UNASSIGNED>
-+<UA91F>     /x82/x37/x85/x38 <UNASSIGNED>
-+<UA920>     /x82/x37/x85/x39 <UNASSIGNED>
-+<UA921>     /x82/x37/x86/x30 <UNASSIGNED>
-+<UA922>     /x82/x37/x86/x31 <UNASSIGNED>
-+<UA923>     /x82/x37/x86/x32 <UNASSIGNED>
-+<UA924>     /x82/x37/x86/x33 <UNASSIGNED>
-+<UA925>     /x82/x37/x86/x34 <UNASSIGNED>
-+<UA926>     /x82/x37/x86/x35 <UNASSIGNED>
-+<UA927>     /x82/x37/x86/x36 <UNASSIGNED>
-+<UA928>     /x82/x37/x86/x37 <UNASSIGNED>
-+<UA929>     /x82/x37/x86/x38 <UNASSIGNED>
-+<UA92A>     /x82/x37/x86/x39 <UNASSIGNED>
-+<UA92B>     /x82/x37/x87/x30 <UNASSIGNED>
-+<UA92C>     /x82/x37/x87/x31 <UNASSIGNED>
-+<UA92D>     /x82/x37/x87/x32 <UNASSIGNED>
-+<UA92E>     /x82/x37/x87/x33 <UNASSIGNED>
-+<UA92F>     /x82/x37/x87/x34 <UNASSIGNED>
-+<UA930>     /x82/x37/x87/x35 <UNASSIGNED>
-+<UA931>     /x82/x37/x87/x36 <UNASSIGNED>
-+<UA932>     /x82/x37/x87/x37 <UNASSIGNED>
-+<UA933>     /x82/x37/x87/x38 <UNASSIGNED>
-+<UA934>     /x82/x37/x87/x39 <UNASSIGNED>
-+<UA935>     /x82/x37/x88/x30 <UNASSIGNED>
-+<UA936>     /x82/x37/x88/x31 <UNASSIGNED>
-+<UA937>     /x82/x37/x88/x32 <UNASSIGNED>
-+<UA938>     /x82/x37/x88/x33 <UNASSIGNED>
-+<UA939>     /x82/x37/x88/x34 <UNASSIGNED>
-+<UA93A>     /x82/x37/x88/x35 <UNASSIGNED>
-+<UA93B>     /x82/x37/x88/x36 <UNASSIGNED>
-+<UA93C>     /x82/x37/x88/x37 <UNASSIGNED>
-+<UA93D>     /x82/x37/x88/x38 <UNASSIGNED>
-+<UA93E>     /x82/x37/x88/x39 <UNASSIGNED>
-+<UA93F>     /x82/x37/x89/x30 <UNASSIGNED>
-+<UA940>     /x82/x37/x89/x31 <UNASSIGNED>
-+<UA941>     /x82/x37/x89/x32 <UNASSIGNED>
-+<UA942>     /x82/x37/x89/x33 <UNASSIGNED>
-+<UA943>     /x82/x37/x89/x34 <UNASSIGNED>
-+<UA944>     /x82/x37/x89/x35 <UNASSIGNED>
-+<UA945>     /x82/x37/x89/x36 <UNASSIGNED>
-+<UA946>     /x82/x37/x89/x37 <UNASSIGNED>
-+<UA947>     /x82/x37/x89/x38 <UNASSIGNED>
-+<UA948>     /x82/x37/x89/x39 <UNASSIGNED>
-+<UA949>     /x82/x37/x8a/x30 <UNASSIGNED>
-+<UA94A>     /x82/x37/x8a/x31 <UNASSIGNED>
-+<UA94B>     /x82/x37/x8a/x32 <UNASSIGNED>
-+<UA94C>     /x82/x37/x8a/x33 <UNASSIGNED>
-+<UA94D>     /x82/x37/x8a/x34 <UNASSIGNED>
-+<UA94E>     /x82/x37/x8a/x35 <UNASSIGNED>
-+<UA94F>     /x82/x37/x8a/x36 <UNASSIGNED>
-+<UA950>     /x82/x37/x8a/x37 <UNASSIGNED>
-+<UA951>     /x82/x37/x8a/x38 <UNASSIGNED>
-+<UA952>     /x82/x37/x8a/x39 <UNASSIGNED>
-+<UA953>     /x82/x37/x8b/x30 <UNASSIGNED>
-+<UA954>     /x82/x37/x8b/x31 <UNASSIGNED>
-+<UA955>     /x82/x37/x8b/x32 <UNASSIGNED>
-+<UA956>     /x82/x37/x8b/x33 <UNASSIGNED>
-+<UA957>     /x82/x37/x8b/x34 <UNASSIGNED>
-+<UA958>     /x82/x37/x8b/x35 <UNASSIGNED>
-+<UA959>     /x82/x37/x8b/x36 <UNASSIGNED>
-+<UA95A>     /x82/x37/x8b/x37 <UNASSIGNED>
-+<UA95B>     /x82/x37/x8b/x38 <UNASSIGNED>
-+<UA95C>     /x82/x37/x8b/x39 <UNASSIGNED>
-+<UA95D>     /x82/x37/x8c/x30 <UNASSIGNED>
-+<UA95E>     /x82/x37/x8c/x31 <UNASSIGNED>
-+<UA95F>     /x82/x37/x8c/x32 <UNASSIGNED>
-+<UA960>     /x82/x37/x8c/x33 <UNASSIGNED>
-+<UA961>     /x82/x37/x8c/x34 <UNASSIGNED>
-+<UA962>     /x82/x37/x8c/x35 <UNASSIGNED>
-+<UA963>     /x82/x37/x8c/x36 <UNASSIGNED>
-+<UA964>     /x82/x37/x8c/x37 <UNASSIGNED>
-+<UA965>     /x82/x37/x8c/x38 <UNASSIGNED>
-+<UA966>     /x82/x37/x8c/x39 <UNASSIGNED>
-+<UA967>     /x82/x37/x8d/x30 <UNASSIGNED>
-+<UA968>     /x82/x37/x8d/x31 <UNASSIGNED>
-+<UA969>     /x82/x37/x8d/x32 <UNASSIGNED>
-+<UA96A>     /x82/x37/x8d/x33 <UNASSIGNED>
-+<UA96B>     /x82/x37/x8d/x34 <UNASSIGNED>
-+<UA96C>     /x82/x37/x8d/x35 <UNASSIGNED>
-+<UA96D>     /x82/x37/x8d/x36 <UNASSIGNED>
-+<UA96E>     /x82/x37/x8d/x37 <UNASSIGNED>
-+<UA96F>     /x82/x37/x8d/x38 <UNASSIGNED>
-+<UA970>     /x82/x37/x8d/x39 <UNASSIGNED>
-+<UA971>     /x82/x37/x8e/x30 <UNASSIGNED>
-+<UA972>     /x82/x37/x8e/x31 <UNASSIGNED>
-+<UA973>     /x82/x37/x8e/x32 <UNASSIGNED>
-+<UA974>     /x82/x37/x8e/x33 <UNASSIGNED>
-+<UA975>     /x82/x37/x8e/x34 <UNASSIGNED>
-+<UA976>     /x82/x37/x8e/x35 <UNASSIGNED>
-+<UA977>     /x82/x37/x8e/x36 <UNASSIGNED>
-+<UA978>     /x82/x37/x8e/x37 <UNASSIGNED>
-+<UA979>     /x82/x37/x8e/x38 <UNASSIGNED>
-+<UA97A>     /x82/x37/x8e/x39 <UNASSIGNED>
-+<UA97B>     /x82/x37/x8f/x30 <UNASSIGNED>
-+<UA97C>     /x82/x37/x8f/x31 <UNASSIGNED>
-+<UA97D>     /x82/x37/x8f/x32 <UNASSIGNED>
-+<UA97E>     /x82/x37/x8f/x33 <UNASSIGNED>
-+<UA97F>     /x82/x37/x8f/x34 <UNASSIGNED>
-+<UA980>     /x82/x37/x8f/x35 <UNASSIGNED>
-+<UA981>     /x82/x37/x8f/x36 <UNASSIGNED>
-+<UA982>     /x82/x37/x8f/x37 <UNASSIGNED>
-+<UA983>     /x82/x37/x8f/x38 <UNASSIGNED>
-+<UA984>     /x82/x37/x8f/x39 <UNASSIGNED>
-+<UA985>     /x82/x37/x90/x30 <UNASSIGNED>
-+<UA986>     /x82/x37/x90/x31 <UNASSIGNED>
-+<UA987>     /x82/x37/x90/x32 <UNASSIGNED>
-+<UA988>     /x82/x37/x90/x33 <UNASSIGNED>
-+<UA989>     /x82/x37/x90/x34 <UNASSIGNED>
-+<UA98A>     /x82/x37/x90/x35 <UNASSIGNED>
-+<UA98B>     /x82/x37/x90/x36 <UNASSIGNED>
-+<UA98C>     /x82/x37/x90/x37 <UNASSIGNED>
-+<UA98D>     /x82/x37/x90/x38 <UNASSIGNED>
-+<UA98E>     /x82/x37/x90/x39 <UNASSIGNED>
-+<UA98F>     /x82/x37/x91/x30 <UNASSIGNED>
-+<UA990>     /x82/x37/x91/x31 <UNASSIGNED>
-+<UA991>     /x82/x37/x91/x32 <UNASSIGNED>
-+<UA992>     /x82/x37/x91/x33 <UNASSIGNED>
-+<UA993>     /x82/x37/x91/x34 <UNASSIGNED>
-+<UA994>     /x82/x37/x91/x35 <UNASSIGNED>
-+<UA995>     /x82/x37/x91/x36 <UNASSIGNED>
-+<UA996>     /x82/x37/x91/x37 <UNASSIGNED>
-+<UA997>     /x82/x37/x91/x38 <UNASSIGNED>
-+<UA998>     /x82/x37/x91/x39 <UNASSIGNED>
-+<UA999>     /x82/x37/x92/x30 <UNASSIGNED>
-+<UA99A>     /x82/x37/x92/x31 <UNASSIGNED>
-+<UA99B>     /x82/x37/x92/x32 <UNASSIGNED>
-+<UA99C>     /x82/x37/x92/x33 <UNASSIGNED>
-+<UA99D>     /x82/x37/x92/x34 <UNASSIGNED>
-+<UA99E>     /x82/x37/x92/x35 <UNASSIGNED>
-+<UA99F>     /x82/x37/x92/x36 <UNASSIGNED>
-+<UA9A0>     /x82/x37/x92/x37 <UNASSIGNED>
-+<UA9A1>     /x82/x37/x92/x38 <UNASSIGNED>
-+<UA9A2>     /x82/x37/x92/x39 <UNASSIGNED>
-+<UA9A3>     /x82/x37/x93/x30 <UNASSIGNED>
-+<UA9A4>     /x82/x37/x93/x31 <UNASSIGNED>
-+<UA9A5>     /x82/x37/x93/x32 <UNASSIGNED>
-+<UA9A6>     /x82/x37/x93/x33 <UNASSIGNED>
-+<UA9A7>     /x82/x37/x93/x34 <UNASSIGNED>
-+<UA9A8>     /x82/x37/x93/x35 <UNASSIGNED>
-+<UA9A9>     /x82/x37/x93/x36 <UNASSIGNED>
-+<UA9AA>     /x82/x37/x93/x37 <UNASSIGNED>
-+<UA9AB>     /x82/x37/x93/x38 <UNASSIGNED>
-+<UA9AC>     /x82/x37/x93/x39 <UNASSIGNED>
-+<UA9AD>     /x82/x37/x94/x30 <UNASSIGNED>
-+<UA9AE>     /x82/x37/x94/x31 <UNASSIGNED>
-+<UA9AF>     /x82/x37/x94/x32 <UNASSIGNED>
-+<UA9B0>     /x82/x37/x94/x33 <UNASSIGNED>
-+<UA9B1>     /x82/x37/x94/x34 <UNASSIGNED>
-+<UA9B2>     /x82/x37/x94/x35 <UNASSIGNED>
-+<UA9B3>     /x82/x37/x94/x36 <UNASSIGNED>
-+<UA9B4>     /x82/x37/x94/x37 <UNASSIGNED>
-+<UA9B5>     /x82/x37/x94/x38 <UNASSIGNED>
-+<UA9B6>     /x82/x37/x94/x39 <UNASSIGNED>
-+<UA9B7>     /x82/x37/x95/x30 <UNASSIGNED>
-+<UA9B8>     /x82/x37/x95/x31 <UNASSIGNED>
-+<UA9B9>     /x82/x37/x95/x32 <UNASSIGNED>
-+<UA9BA>     /x82/x37/x95/x33 <UNASSIGNED>
-+<UA9BB>     /x82/x37/x95/x34 <UNASSIGNED>
-+<UA9BC>     /x82/x37/x95/x35 <UNASSIGNED>
-+<UA9BD>     /x82/x37/x95/x36 <UNASSIGNED>
-+<UA9BE>     /x82/x37/x95/x37 <UNASSIGNED>
-+<UA9BF>     /x82/x37/x95/x38 <UNASSIGNED>
-+<UA9C0>     /x82/x37/x95/x39 <UNASSIGNED>
-+<UA9C1>     /x82/x37/x96/x30 <UNASSIGNED>
-+<UA9C2>     /x82/x37/x96/x31 <UNASSIGNED>
-+<UA9C3>     /x82/x37/x96/x32 <UNASSIGNED>
-+<UA9C4>     /x82/x37/x96/x33 <UNASSIGNED>
-+<UA9C5>     /x82/x37/x96/x34 <UNASSIGNED>
-+<UA9C6>     /x82/x37/x96/x35 <UNASSIGNED>
-+<UA9C7>     /x82/x37/x96/x36 <UNASSIGNED>
-+<UA9C8>     /x82/x37/x96/x37 <UNASSIGNED>
-+<UA9C9>     /x82/x37/x96/x38 <UNASSIGNED>
-+<UA9CA>     /x82/x37/x96/x39 <UNASSIGNED>
-+<UA9CB>     /x82/x37/x97/x30 <UNASSIGNED>
-+<UA9CC>     /x82/x37/x97/x31 <UNASSIGNED>
-+<UA9CD>     /x82/x37/x97/x32 <UNASSIGNED>
-+<UA9CE>     /x82/x37/x97/x33 <UNASSIGNED>
-+<UA9CF>     /x82/x37/x97/x34 <UNASSIGNED>
-+<UA9D0>     /x82/x37/x97/x35 <UNASSIGNED>
-+<UA9D1>     /x82/x37/x97/x36 <UNASSIGNED>
-+<UA9D2>     /x82/x37/x97/x37 <UNASSIGNED>
-+<UA9D3>     /x82/x37/x97/x38 <UNASSIGNED>
-+<UA9D4>     /x82/x37/x97/x39 <UNASSIGNED>
-+<UA9D5>     /x82/x37/x98/x30 <UNASSIGNED>
-+<UA9D6>     /x82/x37/x98/x31 <UNASSIGNED>
-+<UA9D7>     /x82/x37/x98/x32 <UNASSIGNED>
-+<UA9D8>     /x82/x37/x98/x33 <UNASSIGNED>
-+<UA9D9>     /x82/x37/x98/x34 <UNASSIGNED>
-+<UA9DA>     /x82/x37/x98/x35 <UNASSIGNED>
-+<UA9DB>     /x82/x37/x98/x36 <UNASSIGNED>
-+<UA9DC>     /x82/x37/x98/x37 <UNASSIGNED>
-+<UA9DD>     /x82/x37/x98/x38 <UNASSIGNED>
-+<UA9DE>     /x82/x37/x98/x39 <UNASSIGNED>
-+<UA9DF>     /x82/x37/x99/x30 <UNASSIGNED>
-+<UA9E0>     /x82/x37/x99/x31 <UNASSIGNED>
-+<UA9E1>     /x82/x37/x99/x32 <UNASSIGNED>
-+<UA9E2>     /x82/x37/x99/x33 <UNASSIGNED>
-+<UA9E3>     /x82/x37/x99/x34 <UNASSIGNED>
-+<UA9E4>     /x82/x37/x99/x35 <UNASSIGNED>
-+<UA9E5>     /x82/x37/x99/x36 <UNASSIGNED>
-+<UA9E6>     /x82/x37/x99/x37 <UNASSIGNED>
-+<UA9E7>     /x82/x37/x99/x38 <UNASSIGNED>
-+<UA9E8>     /x82/x37/x99/x39 <UNASSIGNED>
-+<UA9E9>     /x82/x37/x9a/x30 <UNASSIGNED>
-+<UA9EA>     /x82/x37/x9a/x31 <UNASSIGNED>
-+<UA9EB>     /x82/x37/x9a/x32 <UNASSIGNED>
-+<UA9EC>     /x82/x37/x9a/x33 <UNASSIGNED>
-+<UA9ED>     /x82/x37/x9a/x34 <UNASSIGNED>
-+<UA9EE>     /x82/x37/x9a/x35 <UNASSIGNED>
-+<UA9EF>     /x82/x37/x9a/x36 <UNASSIGNED>
-+<UA9F0>     /x82/x37/x9a/x37 <UNASSIGNED>
-+<UA9F1>     /x82/x37/x9a/x38 <UNASSIGNED>
-+<UA9F2>     /x82/x37/x9a/x39 <UNASSIGNED>
-+<UA9F3>     /x82/x37/x9b/x30 <UNASSIGNED>
-+<UA9F4>     /x82/x37/x9b/x31 <UNASSIGNED>
-+<UA9F5>     /x82/x37/x9b/x32 <UNASSIGNED>
-+<UA9F6>     /x82/x37/x9b/x33 <UNASSIGNED>
-+<UA9F7>     /x82/x37/x9b/x34 <UNASSIGNED>
-+<UA9F8>     /x82/x37/x9b/x35 <UNASSIGNED>
-+<UA9F9>     /x82/x37/x9b/x36 <UNASSIGNED>
-+<UA9FA>     /x82/x37/x9b/x37 <UNASSIGNED>
-+<UA9FB>     /x82/x37/x9b/x38 <UNASSIGNED>
-+<UA9FC>     /x82/x37/x9b/x39 <UNASSIGNED>
-+<UA9FD>     /x82/x37/x9c/x30 <UNASSIGNED>
-+<UA9FE>     /x82/x37/x9c/x31 <UNASSIGNED>
-+<UA9FF>     /x82/x37/x9c/x32 <UNASSIGNED>
-+<UAA00>     /x82/x37/x9c/x33 <UNASSIGNED>
-+<UAA01>     /x82/x37/x9c/x34 <UNASSIGNED>
-+<UAA02>     /x82/x37/x9c/x35 <UNASSIGNED>
-+<UAA03>     /x82/x37/x9c/x36 <UNASSIGNED>
-+<UAA04>     /x82/x37/x9c/x37 <UNASSIGNED>
-+<UAA05>     /x82/x37/x9c/x38 <UNASSIGNED>
-+<UAA06>     /x82/x37/x9c/x39 <UNASSIGNED>
-+<UAA07>     /x82/x37/x9d/x30 <UNASSIGNED>
-+<UAA08>     /x82/x37/x9d/x31 <UNASSIGNED>
-+<UAA09>     /x82/x37/x9d/x32 <UNASSIGNED>
-+<UAA0A>     /x82/x37/x9d/x33 <UNASSIGNED>
-+<UAA0B>     /x82/x37/x9d/x34 <UNASSIGNED>
-+<UAA0C>     /x82/x37/x9d/x35 <UNASSIGNED>
-+<UAA0D>     /x82/x37/x9d/x36 <UNASSIGNED>
-+<UAA0E>     /x82/x37/x9d/x37 <UNASSIGNED>
-+<UAA0F>     /x82/x37/x9d/x38 <UNASSIGNED>
-+<UAA10>     /x82/x37/x9d/x39 <UNASSIGNED>
-+<UAA11>     /x82/x37/x9e/x30 <UNASSIGNED>
-+<UAA12>     /x82/x37/x9e/x31 <UNASSIGNED>
-+<UAA13>     /x82/x37/x9e/x32 <UNASSIGNED>
-+<UAA14>     /x82/x37/x9e/x33 <UNASSIGNED>
-+<UAA15>     /x82/x37/x9e/x34 <UNASSIGNED>
-+<UAA16>     /x82/x37/x9e/x35 <UNASSIGNED>
-+<UAA17>     /x82/x37/x9e/x36 <UNASSIGNED>
-+<UAA18>     /x82/x37/x9e/x37 <UNASSIGNED>
-+<UAA19>     /x82/x37/x9e/x38 <UNASSIGNED>
-+<UAA1A>     /x82/x37/x9e/x39 <UNASSIGNED>
-+<UAA1B>     /x82/x37/x9f/x30 <UNASSIGNED>
-+<UAA1C>     /x82/x37/x9f/x31 <UNASSIGNED>
-+<UAA1D>     /x82/x37/x9f/x32 <UNASSIGNED>
-+<UAA1E>     /x82/x37/x9f/x33 <UNASSIGNED>
-+<UAA1F>     /x82/x37/x9f/x34 <UNASSIGNED>
-+<UAA20>     /x82/x37/x9f/x35 <UNASSIGNED>
-+<UAA21>     /x82/x37/x9f/x36 <UNASSIGNED>
-+<UAA22>     /x82/x37/x9f/x37 <UNASSIGNED>
-+<UAA23>     /x82/x37/x9f/x38 <UNASSIGNED>
-+<UAA24>     /x82/x37/x9f/x39 <UNASSIGNED>
-+<UAA25>     /x82/x37/xa0/x30 <UNASSIGNED>
-+<UAA26>     /x82/x37/xa0/x31 <UNASSIGNED>
-+<UAA27>     /x82/x37/xa0/x32 <UNASSIGNED>
-+<UAA28>     /x82/x37/xa0/x33 <UNASSIGNED>
-+<UAA29>     /x82/x37/xa0/x34 <UNASSIGNED>
-+<UAA2A>     /x82/x37/xa0/x35 <UNASSIGNED>
-+<UAA2B>     /x82/x37/xa0/x36 <UNASSIGNED>
-+<UAA2C>     /x82/x37/xa0/x37 <UNASSIGNED>
-+<UAA2D>     /x82/x37/xa0/x38 <UNASSIGNED>
-+<UAA2E>     /x82/x37/xa0/x39 <UNASSIGNED>
-+<UAA2F>     /x82/x37/xa1/x30 <UNASSIGNED>
-+<UAA30>     /x82/x37/xa1/x31 <UNASSIGNED>
-+<UAA31>     /x82/x37/xa1/x32 <UNASSIGNED>
-+<UAA32>     /x82/x37/xa1/x33 <UNASSIGNED>
-+<UAA33>     /x82/x37/xa1/x34 <UNASSIGNED>
-+<UAA34>     /x82/x37/xa1/x35 <UNASSIGNED>
-+<UAA35>     /x82/x37/xa1/x36 <UNASSIGNED>
-+<UAA36>     /x82/x37/xa1/x37 <UNASSIGNED>
-+<UAA37>     /x82/x37/xa1/x38 <UNASSIGNED>
-+<UAA38>     /x82/x37/xa1/x39 <UNASSIGNED>
-+<UAA39>     /x82/x37/xa2/x30 <UNASSIGNED>
-+<UAA3A>     /x82/x37/xa2/x31 <UNASSIGNED>
-+<UAA3B>     /x82/x37/xa2/x32 <UNASSIGNED>
-+<UAA3C>     /x82/x37/xa2/x33 <UNASSIGNED>
-+<UAA3D>     /x82/x37/xa2/x34 <UNASSIGNED>
-+<UAA3E>     /x82/x37/xa2/x35 <UNASSIGNED>
-+<UAA3F>     /x82/x37/xa2/x36 <UNASSIGNED>
-+<UAA40>     /x82/x37/xa2/x37 <UNASSIGNED>
-+<UAA41>     /x82/x37/xa2/x38 <UNASSIGNED>
-+<UAA42>     /x82/x37/xa2/x39 <UNASSIGNED>
-+<UAA43>     /x82/x37/xa3/x30 <UNASSIGNED>
-+<UAA44>     /x82/x37/xa3/x31 <UNASSIGNED>
-+<UAA45>     /x82/x37/xa3/x32 <UNASSIGNED>
-+<UAA46>     /x82/x37/xa3/x33 <UNASSIGNED>
-+<UAA47>     /x82/x37/xa3/x34 <UNASSIGNED>
-+<UAA48>     /x82/x37/xa3/x35 <UNASSIGNED>
-+<UAA49>     /x82/x37/xa3/x36 <UNASSIGNED>
-+<UAA4A>     /x82/x37/xa3/x37 <UNASSIGNED>
-+<UAA4B>     /x82/x37/xa3/x38 <UNASSIGNED>
-+<UAA4C>     /x82/x37/xa3/x39 <UNASSIGNED>
-+<UAA4D>     /x82/x37/xa4/x30 <UNASSIGNED>
-+<UAA4E>     /x82/x37/xa4/x31 <UNASSIGNED>
-+<UAA4F>     /x82/x37/xa4/x32 <UNASSIGNED>
-+<UAA50>     /x82/x37/xa4/x33 <UNASSIGNED>
-+<UAA51>     /x82/x37/xa4/x34 <UNASSIGNED>
-+<UAA52>     /x82/x37/xa4/x35 <UNASSIGNED>
-+<UAA53>     /x82/x37/xa4/x36 <UNASSIGNED>
-+<UAA54>     /x82/x37/xa4/x37 <UNASSIGNED>
-+<UAA55>     /x82/x37/xa4/x38 <UNASSIGNED>
-+<UAA56>     /x82/x37/xa4/x39 <UNASSIGNED>
-+<UAA57>     /x82/x37/xa5/x30 <UNASSIGNED>
-+<UAA58>     /x82/x37/xa5/x31 <UNASSIGNED>
-+<UAA59>     /x82/x37/xa5/x32 <UNASSIGNED>
-+<UAA5A>     /x82/x37/xa5/x33 <UNASSIGNED>
-+<UAA5B>     /x82/x37/xa5/x34 <UNASSIGNED>
-+<UAA5C>     /x82/x37/xa5/x35 <UNASSIGNED>
-+<UAA5D>     /x82/x37/xa5/x36 <UNASSIGNED>
-+<UAA5E>     /x82/x37/xa5/x37 <UNASSIGNED>
-+<UAA5F>     /x82/x37/xa5/x38 <UNASSIGNED>
-+<UAA60>     /x82/x37/xa5/x39 <UNASSIGNED>
-+<UAA61>     /x82/x37/xa6/x30 <UNASSIGNED>
-+<UAA62>     /x82/x37/xa6/x31 <UNASSIGNED>
-+<UAA63>     /x82/x37/xa6/x32 <UNASSIGNED>
-+<UAA64>     /x82/x37/xa6/x33 <UNASSIGNED>
-+<UAA65>     /x82/x37/xa6/x34 <UNASSIGNED>
-+<UAA66>     /x82/x37/xa6/x35 <UNASSIGNED>
-+<UAA67>     /x82/x37/xa6/x36 <UNASSIGNED>
-+<UAA68>     /x82/x37/xa6/x37 <UNASSIGNED>
-+<UAA69>     /x82/x37/xa6/x38 <UNASSIGNED>
-+<UAA6A>     /x82/x37/xa6/x39 <UNASSIGNED>
-+<UAA6B>     /x82/x37/xa7/x30 <UNASSIGNED>
-+<UAA6C>     /x82/x37/xa7/x31 <UNASSIGNED>
-+<UAA6D>     /x82/x37/xa7/x32 <UNASSIGNED>
-+<UAA6E>     /x82/x37/xa7/x33 <UNASSIGNED>
-+<UAA6F>     /x82/x37/xa7/x34 <UNASSIGNED>
-+<UAA70>     /x82/x37/xa7/x35 <UNASSIGNED>
-+<UAA71>     /x82/x37/xa7/x36 <UNASSIGNED>
-+<UAA72>     /x82/x37/xa7/x37 <UNASSIGNED>
-+<UAA73>     /x82/x37/xa7/x38 <UNASSIGNED>
-+<UAA74>     /x82/x37/xa7/x39 <UNASSIGNED>
-+<UAA75>     /x82/x37/xa8/x30 <UNASSIGNED>
-+<UAA76>     /x82/x37/xa8/x31 <UNASSIGNED>
-+<UAA77>     /x82/x37/xa8/x32 <UNASSIGNED>
-+<UAA78>     /x82/x37/xa8/x33 <UNASSIGNED>
-+<UAA79>     /x82/x37/xa8/x34 <UNASSIGNED>
-+<UAA7A>     /x82/x37/xa8/x35 <UNASSIGNED>
-+<UAA7B>     /x82/x37/xa8/x36 <UNASSIGNED>
-+<UAA7C>     /x82/x37/xa8/x37 <UNASSIGNED>
-+<UAA7D>     /x82/x37/xa8/x38 <UNASSIGNED>
-+<UAA7E>     /x82/x37/xa8/x39 <UNASSIGNED>
-+<UAA7F>     /x82/x37/xa9/x30 <UNASSIGNED>
-+<UAA80>     /x82/x37/xa9/x31 <UNASSIGNED>
-+<UAA81>     /x82/x37/xa9/x32 <UNASSIGNED>
-+<UAA82>     /x82/x37/xa9/x33 <UNASSIGNED>
-+<UAA83>     /x82/x37/xa9/x34 <UNASSIGNED>
-+<UAA84>     /x82/x37/xa9/x35 <UNASSIGNED>
-+<UAA85>     /x82/x37/xa9/x36 <UNASSIGNED>
-+<UAA86>     /x82/x37/xa9/x37 <UNASSIGNED>
-+<UAA87>     /x82/x37/xa9/x38 <UNASSIGNED>
-+<UAA88>     /x82/x37/xa9/x39 <UNASSIGNED>
-+<UAA89>     /x82/x37/xaa/x30 <UNASSIGNED>
-+<UAA8A>     /x82/x37/xaa/x31 <UNASSIGNED>
-+<UAA8B>     /x82/x37/xaa/x32 <UNASSIGNED>
-+<UAA8C>     /x82/x37/xaa/x33 <UNASSIGNED>
-+<UAA8D>     /x82/x37/xaa/x34 <UNASSIGNED>
-+<UAA8E>     /x82/x37/xaa/x35 <UNASSIGNED>
-+<UAA8F>     /x82/x37/xaa/x36 <UNASSIGNED>
-+<UAA90>     /x82/x37/xaa/x37 <UNASSIGNED>
-+<UAA91>     /x82/x37/xaa/x38 <UNASSIGNED>
-+<UAA92>     /x82/x37/xaa/x39 <UNASSIGNED>
-+<UAA93>     /x82/x37/xab/x30 <UNASSIGNED>
-+<UAA94>     /x82/x37/xab/x31 <UNASSIGNED>
-+<UAA95>     /x82/x37/xab/x32 <UNASSIGNED>
-+<UAA96>     /x82/x37/xab/x33 <UNASSIGNED>
-+<UAA97>     /x82/x37/xab/x34 <UNASSIGNED>
-+<UAA98>     /x82/x37/xab/x35 <UNASSIGNED>
-+<UAA99>     /x82/x37/xab/x36 <UNASSIGNED>
-+<UAA9A>     /x82/x37/xab/x37 <UNASSIGNED>
-+<UAA9B>     /x82/x37/xab/x38 <UNASSIGNED>
-+<UAA9C>     /x82/x37/xab/x39 <UNASSIGNED>
-+<UAA9D>     /x82/x37/xac/x30 <UNASSIGNED>
-+<UAA9E>     /x82/x37/xac/x31 <UNASSIGNED>
-+<UAA9F>     /x82/x37/xac/x32 <UNASSIGNED>
-+<UAAA0>     /x82/x37/xac/x33 <UNASSIGNED>
-+<UAAA1>     /x82/x37/xac/x34 <UNASSIGNED>
-+<UAAA2>     /x82/x37/xac/x35 <UNASSIGNED>
-+<UAAA3>     /x82/x37/xac/x36 <UNASSIGNED>
-+<UAAA4>     /x82/x37/xac/x37 <UNASSIGNED>
-+<UAAA5>     /x82/x37/xac/x38 <UNASSIGNED>
-+<UAAA6>     /x82/x37/xac/x39 <UNASSIGNED>
-+<UAAA7>     /x82/x37/xad/x30 <UNASSIGNED>
-+<UAAA8>     /x82/x37/xad/x31 <UNASSIGNED>
-+<UAAA9>     /x82/x37/xad/x32 <UNASSIGNED>
-+<UAAAA>     /x82/x37/xad/x33 <UNASSIGNED>
-+<UAAAB>     /x82/x37/xad/x34 <UNASSIGNED>
-+<UAAAC>     /x82/x37/xad/x35 <UNASSIGNED>
-+<UAAAD>     /x82/x37/xad/x36 <UNASSIGNED>
-+<UAAAE>     /x82/x37/xad/x37 <UNASSIGNED>
-+<UAAAF>     /x82/x37/xad/x38 <UNASSIGNED>
-+<UAAB0>     /x82/x37/xad/x39 <UNASSIGNED>
-+<UAAB1>     /x82/x37/xae/x30 <UNASSIGNED>
-+<UAAB2>     /x82/x37/xae/x31 <UNASSIGNED>
-+<UAAB3>     /x82/x37/xae/x32 <UNASSIGNED>
-+<UAAB4>     /x82/x37/xae/x33 <UNASSIGNED>
-+<UAAB5>     /x82/x37/xae/x34 <UNASSIGNED>
-+<UAAB6>     /x82/x37/xae/x35 <UNASSIGNED>
-+<UAAB7>     /x82/x37/xae/x36 <UNASSIGNED>
-+<UAAB8>     /x82/x37/xae/x37 <UNASSIGNED>
-+<UAAB9>     /x82/x37/xae/x38 <UNASSIGNED>
-+<UAABA>     /x82/x37/xae/x39 <UNASSIGNED>
-+<UAABB>     /x82/x37/xaf/x30 <UNASSIGNED>
-+<UAABC>     /x82/x37/xaf/x31 <UNASSIGNED>
-+<UAABD>     /x82/x37/xaf/x32 <UNASSIGNED>
-+<UAABE>     /x82/x37/xaf/x33 <UNASSIGNED>
-+<UAABF>     /x82/x37/xaf/x34 <UNASSIGNED>
-+<UAAC0>     /x82/x37/xaf/x35 <UNASSIGNED>
-+<UAAC1>     /x82/x37/xaf/x36 <UNASSIGNED>
-+<UAAC2>     /x82/x37/xaf/x37 <UNASSIGNED>
-+<UAAC3>     /x82/x37/xaf/x38 <UNASSIGNED>
-+<UAAC4>     /x82/x37/xaf/x39 <UNASSIGNED>
-+<UAAC5>     /x82/x37/xb0/x30 <UNASSIGNED>
-+<UAAC6>     /x82/x37/xb0/x31 <UNASSIGNED>
-+<UAAC7>     /x82/x37/xb0/x32 <UNASSIGNED>
-+<UAAC8>     /x82/x37/xb0/x33 <UNASSIGNED>
-+<UAAC9>     /x82/x37/xb0/x34 <UNASSIGNED>
-+<UAACA>     /x82/x37/xb0/x35 <UNASSIGNED>
-+<UAACB>     /x82/x37/xb0/x36 <UNASSIGNED>
-+<UAACC>     /x82/x37/xb0/x37 <UNASSIGNED>
-+<UAACD>     /x82/x37/xb0/x38 <UNASSIGNED>
-+<UAACE>     /x82/x37/xb0/x39 <UNASSIGNED>
-+<UAACF>     /x82/x37/xb1/x30 <UNASSIGNED>
-+<UAAD0>     /x82/x37/xb1/x31 <UNASSIGNED>
-+<UAAD1>     /x82/x37/xb1/x32 <UNASSIGNED>
-+<UAAD2>     /x82/x37/xb1/x33 <UNASSIGNED>
-+<UAAD3>     /x82/x37/xb1/x34 <UNASSIGNED>
-+<UAAD4>     /x82/x37/xb1/x35 <UNASSIGNED>
-+<UAAD5>     /x82/x37/xb1/x36 <UNASSIGNED>
-+<UAAD6>     /x82/x37/xb1/x37 <UNASSIGNED>
-+<UAAD7>     /x82/x37/xb1/x38 <UNASSIGNED>
-+<UAAD8>     /x82/x37/xb1/x39 <UNASSIGNED>
-+<UAAD9>     /x82/x37/xb2/x30 <UNASSIGNED>
-+<UAADA>     /x82/x37/xb2/x31 <UNASSIGNED>
-+<UAADB>     /x82/x37/xb2/x32 <UNASSIGNED>
-+<UAADC>     /x82/x37/xb2/x33 <UNASSIGNED>
-+<UAADD>     /x82/x37/xb2/x34 <UNASSIGNED>
-+<UAADE>     /x82/x37/xb2/x35 <UNASSIGNED>
-+<UAADF>     /x82/x37/xb2/x36 <UNASSIGNED>
-+<UAAE0>     /x82/x37/xb2/x37 <UNASSIGNED>
-+<UAAE1>     /x82/x37/xb2/x38 <UNASSIGNED>
-+<UAAE2>     /x82/x37/xb2/x39 <UNASSIGNED>
-+<UAAE3>     /x82/x37/xb3/x30 <UNASSIGNED>
-+<UAAE4>     /x82/x37/xb3/x31 <UNASSIGNED>
-+<UAAE5>     /x82/x37/xb3/x32 <UNASSIGNED>
-+<UAAE6>     /x82/x37/xb3/x33 <UNASSIGNED>
-+<UAAE7>     /x82/x37/xb3/x34 <UNASSIGNED>
-+<UAAE8>     /x82/x37/xb3/x35 <UNASSIGNED>
-+<UAAE9>     /x82/x37/xb3/x36 <UNASSIGNED>
-+<UAAEA>     /x82/x37/xb3/x37 <UNASSIGNED>
-+<UAAEB>     /x82/x37/xb3/x38 <UNASSIGNED>
-+<UAAEC>     /x82/x37/xb3/x39 <UNASSIGNED>
-+<UAAED>     /x82/x37/xb4/x30 <UNASSIGNED>
-+<UAAEE>     /x82/x37/xb4/x31 <UNASSIGNED>
-+<UAAEF>     /x82/x37/xb4/x32 <UNASSIGNED>
-+<UAAF0>     /x82/x37/xb4/x33 <UNASSIGNED>
-+<UAAF1>     /x82/x37/xb4/x34 <UNASSIGNED>
-+<UAAF2>     /x82/x37/xb4/x35 <UNASSIGNED>
-+<UAAF3>     /x82/x37/xb4/x36 <UNASSIGNED>
-+<UAAF4>     /x82/x37/xb4/x37 <UNASSIGNED>
-+<UAAF5>     /x82/x37/xb4/x38 <UNASSIGNED>
-+<UAAF6>     /x82/x37/xb4/x39 <UNASSIGNED>
-+<UAAF7>     /x82/x37/xb5/x30 <UNASSIGNED>
-+<UAAF8>     /x82/x37/xb5/x31 <UNASSIGNED>
-+<UAAF9>     /x82/x37/xb5/x32 <UNASSIGNED>
-+<UAAFA>     /x82/x37/xb5/x33 <UNASSIGNED>
-+<UAAFB>     /x82/x37/xb5/x34 <UNASSIGNED>
-+<UAAFC>     /x82/x37/xb5/x35 <UNASSIGNED>
-+<UAAFD>     /x82/x37/xb5/x36 <UNASSIGNED>
-+<UAAFE>     /x82/x37/xb5/x37 <UNASSIGNED>
-+<UAAFF>     /x82/x37/xb5/x38 <UNASSIGNED>
-+<UAB00>     /x82/x37/xb5/x39 <UNASSIGNED>
-+<UAB01>     /x82/x37/xb6/x30 <UNASSIGNED>
-+<UAB02>     /x82/x37/xb6/x31 <UNASSIGNED>
-+<UAB03>     /x82/x37/xb6/x32 <UNASSIGNED>
-+<UAB04>     /x82/x37/xb6/x33 <UNASSIGNED>
-+<UAB05>     /x82/x37/xb6/x34 <UNASSIGNED>
-+<UAB06>     /x82/x37/xb6/x35 <UNASSIGNED>
-+<UAB07>     /x82/x37/xb6/x36 <UNASSIGNED>
-+<UAB08>     /x82/x37/xb6/x37 <UNASSIGNED>
-+<UAB09>     /x82/x37/xb6/x38 <UNASSIGNED>
-+<UAB0A>     /x82/x37/xb6/x39 <UNASSIGNED>
-+<UAB0B>     /x82/x37/xb7/x30 <UNASSIGNED>
-+<UAB0C>     /x82/x37/xb7/x31 <UNASSIGNED>
-+<UAB0D>     /x82/x37/xb7/x32 <UNASSIGNED>
-+<UAB0E>     /x82/x37/xb7/x33 <UNASSIGNED>
-+<UAB0F>     /x82/x37/xb7/x34 <UNASSIGNED>
-+<UAB10>     /x82/x37/xb7/x35 <UNASSIGNED>
-+<UAB11>     /x82/x37/xb7/x36 <UNASSIGNED>
-+<UAB12>     /x82/x37/xb7/x37 <UNASSIGNED>
-+<UAB13>     /x82/x37/xb7/x38 <UNASSIGNED>
-+<UAB14>     /x82/x37/xb7/x39 <UNASSIGNED>
-+<UAB15>     /x82/x37/xb8/x30 <UNASSIGNED>
-+<UAB16>     /x82/x37/xb8/x31 <UNASSIGNED>
-+<UAB17>     /x82/x37/xb8/x32 <UNASSIGNED>
-+<UAB18>     /x82/x37/xb8/x33 <UNASSIGNED>
-+<UAB19>     /x82/x37/xb8/x34 <UNASSIGNED>
-+<UAB1A>     /x82/x37/xb8/x35 <UNASSIGNED>
-+<UAB1B>     /x82/x37/xb8/x36 <UNASSIGNED>
-+<UAB1C>     /x82/x37/xb8/x37 <UNASSIGNED>
-+<UAB1D>     /x82/x37/xb8/x38 <UNASSIGNED>
-+<UAB1E>     /x82/x37/xb8/x39 <UNASSIGNED>
-+<UAB1F>     /x82/x37/xb9/x30 <UNASSIGNED>
-+<UAB20>     /x82/x37/xb9/x31 <UNASSIGNED>
-+<UAB21>     /x82/x37/xb9/x32 <UNASSIGNED>
-+<UAB22>     /x82/x37/xb9/x33 <UNASSIGNED>
-+<UAB23>     /x82/x37/xb9/x34 <UNASSIGNED>
-+<UAB24>     /x82/x37/xb9/x35 <UNASSIGNED>
-+<UAB25>     /x82/x37/xb9/x36 <UNASSIGNED>
-+<UAB26>     /x82/x37/xb9/x37 <UNASSIGNED>
-+<UAB27>     /x82/x37/xb9/x38 <UNASSIGNED>
-+<UAB28>     /x82/x37/xb9/x39 <UNASSIGNED>
-+<UAB29>     /x82/x37/xba/x30 <UNASSIGNED>
-+<UAB2A>     /x82/x37/xba/x31 <UNASSIGNED>
-+<UAB2B>     /x82/x37/xba/x32 <UNASSIGNED>
-+<UAB2C>     /x82/x37/xba/x33 <UNASSIGNED>
-+<UAB2D>     /x82/x37/xba/x34 <UNASSIGNED>
-+<UAB2E>     /x82/x37/xba/x35 <UNASSIGNED>
-+<UAB2F>     /x82/x37/xba/x36 <UNASSIGNED>
-+<UAB30>     /x82/x37/xba/x37 <UNASSIGNED>
-+<UAB31>     /x82/x37/xba/x38 <UNASSIGNED>
-+<UAB32>     /x82/x37/xba/x39 <UNASSIGNED>
-+<UAB33>     /x82/x37/xbb/x30 <UNASSIGNED>
-+<UAB34>     /x82/x37/xbb/x31 <UNASSIGNED>
-+<UAB35>     /x82/x37/xbb/x32 <UNASSIGNED>
-+<UAB36>     /x82/x37/xbb/x33 <UNASSIGNED>
-+<UAB37>     /x82/x37/xbb/x34 <UNASSIGNED>
-+<UAB38>     /x82/x37/xbb/x35 <UNASSIGNED>
-+<UAB39>     /x82/x37/xbb/x36 <UNASSIGNED>
-+<UAB3A>     /x82/x37/xbb/x37 <UNASSIGNED>
-+<UAB3B>     /x82/x37/xbb/x38 <UNASSIGNED>
-+<UAB3C>     /x82/x37/xbb/x39 <UNASSIGNED>
-+<UAB3D>     /x82/x37/xbc/x30 <UNASSIGNED>
-+<UAB3E>     /x82/x37/xbc/x31 <UNASSIGNED>
-+<UAB3F>     /x82/x37/xbc/x32 <UNASSIGNED>
-+<UAB40>     /x82/x37/xbc/x33 <UNASSIGNED>
-+<UAB41>     /x82/x37/xbc/x34 <UNASSIGNED>
-+<UAB42>     /x82/x37/xbc/x35 <UNASSIGNED>
-+<UAB43>     /x82/x37/xbc/x36 <UNASSIGNED>
-+<UAB44>     /x82/x37/xbc/x37 <UNASSIGNED>
-+<UAB45>     /x82/x37/xbc/x38 <UNASSIGNED>
-+<UAB46>     /x82/x37/xbc/x39 <UNASSIGNED>
-+<UAB47>     /x82/x37/xbd/x30 <UNASSIGNED>
-+<UAB48>     /x82/x37/xbd/x31 <UNASSIGNED>
-+<UAB49>     /x82/x37/xbd/x32 <UNASSIGNED>
-+<UAB4A>     /x82/x37/xbd/x33 <UNASSIGNED>
-+<UAB4B>     /x82/x37/xbd/x34 <UNASSIGNED>
-+<UAB4C>     /x82/x37/xbd/x35 <UNASSIGNED>
-+<UAB4D>     /x82/x37/xbd/x36 <UNASSIGNED>
-+<UAB4E>     /x82/x37/xbd/x37 <UNASSIGNED>
-+<UAB4F>     /x82/x37/xbd/x38 <UNASSIGNED>
-+<UAB50>     /x82/x37/xbd/x39 <UNASSIGNED>
-+<UAB51>     /x82/x37/xbe/x30 <UNASSIGNED>
-+<UAB52>     /x82/x37/xbe/x31 <UNASSIGNED>
-+<UAB53>     /x82/x37/xbe/x32 <UNASSIGNED>
-+<UAB54>     /x82/x37/xbe/x33 <UNASSIGNED>
-+<UAB55>     /x82/x37/xbe/x34 <UNASSIGNED>
-+<UAB56>     /x82/x37/xbe/x35 <UNASSIGNED>
-+<UAB57>     /x82/x37/xbe/x36 <UNASSIGNED>
-+<UAB58>     /x82/x37/xbe/x37 <UNASSIGNED>
-+<UAB59>     /x82/x37/xbe/x38 <UNASSIGNED>
-+<UAB5A>     /x82/x37/xbe/x39 <UNASSIGNED>
-+<UAB5B>     /x82/x37/xbf/x30 <UNASSIGNED>
-+<UAB5C>     /x82/x37/xbf/x31 <UNASSIGNED>
-+<UAB5D>     /x82/x37/xbf/x32 <UNASSIGNED>
-+<UAB5E>     /x82/x37/xbf/x33 <UNASSIGNED>
-+<UAB5F>     /x82/x37/xbf/x34 <UNASSIGNED>
-+<UAB60>     /x82/x37/xbf/x35 <UNASSIGNED>
-+<UAB61>     /x82/x37/xbf/x36 <UNASSIGNED>
-+<UAB62>     /x82/x37/xbf/x37 <UNASSIGNED>
-+<UAB63>     /x82/x37/xbf/x38 <UNASSIGNED>
-+<UAB64>     /x82/x37/xbf/x39 <UNASSIGNED>
-+<UAB65>     /x82/x37/xc0/x30 <UNASSIGNED>
-+<UAB66>     /x82/x37/xc0/x31 <UNASSIGNED>
-+<UAB67>     /x82/x37/xc0/x32 <UNASSIGNED>
-+<UAB68>     /x82/x37/xc0/x33 <UNASSIGNED>
-+<UAB69>     /x82/x37/xc0/x34 <UNASSIGNED>
-+<UAB6A>     /x82/x37/xc0/x35 <UNASSIGNED>
-+<UAB6B>     /x82/x37/xc0/x36 <UNASSIGNED>
-+<UAB6C>     /x82/x37/xc0/x37 <UNASSIGNED>
-+<UAB6D>     /x82/x37/xc0/x38 <UNASSIGNED>
-+<UAB6E>     /x82/x37/xc0/x39 <UNASSIGNED>
-+<UAB6F>     /x82/x37/xc1/x30 <UNASSIGNED>
-+<UAB70>     /x82/x37/xc1/x31 <UNASSIGNED>
-+<UAB71>     /x82/x37/xc1/x32 <UNASSIGNED>
-+<UAB72>     /x82/x37/xc1/x33 <UNASSIGNED>
-+<UAB73>     /x82/x37/xc1/x34 <UNASSIGNED>
-+<UAB74>     /x82/x37/xc1/x35 <UNASSIGNED>
-+<UAB75>     /x82/x37/xc1/x36 <UNASSIGNED>
-+<UAB76>     /x82/x37/xc1/x37 <UNASSIGNED>
-+<UAB77>     /x82/x37/xc1/x38 <UNASSIGNED>
-+<UAB78>     /x82/x37/xc1/x39 <UNASSIGNED>
-+<UAB79>     /x82/x37/xc2/x30 <UNASSIGNED>
-+<UAB7A>     /x82/x37/xc2/x31 <UNASSIGNED>
-+<UAB7B>     /x82/x37/xc2/x32 <UNASSIGNED>
-+<UAB7C>     /x82/x37/xc2/x33 <UNASSIGNED>
-+<UAB7D>     /x82/x37/xc2/x34 <UNASSIGNED>
-+<UAB7E>     /x82/x37/xc2/x35 <UNASSIGNED>
-+<UAB7F>     /x82/x37/xc2/x36 <UNASSIGNED>
-+<UAB80>     /x82/x37/xc2/x37 <UNASSIGNED>
-+<UAB81>     /x82/x37/xc2/x38 <UNASSIGNED>
-+<UAB82>     /x82/x37/xc2/x39 <UNASSIGNED>
-+<UAB83>     /x82/x37/xc3/x30 <UNASSIGNED>
-+<UAB84>     /x82/x37/xc3/x31 <UNASSIGNED>
-+<UAB85>     /x82/x37/xc3/x32 <UNASSIGNED>
-+<UAB86>     /x82/x37/xc3/x33 <UNASSIGNED>
-+<UAB87>     /x82/x37/xc3/x34 <UNASSIGNED>
-+<UAB88>     /x82/x37/xc3/x35 <UNASSIGNED>
-+<UAB89>     /x82/x37/xc3/x36 <UNASSIGNED>
-+<UAB8A>     /x82/x37/xc3/x37 <UNASSIGNED>
-+<UAB8B>     /x82/x37/xc3/x38 <UNASSIGNED>
-+<UAB8C>     /x82/x37/xc3/x39 <UNASSIGNED>
-+<UAB8D>     /x82/x37/xc4/x30 <UNASSIGNED>
-+<UAB8E>     /x82/x37/xc4/x31 <UNASSIGNED>
-+<UAB8F>     /x82/x37/xc4/x32 <UNASSIGNED>
-+<UAB90>     /x82/x37/xc4/x33 <UNASSIGNED>
-+<UAB91>     /x82/x37/xc4/x34 <UNASSIGNED>
-+<UAB92>     /x82/x37/xc4/x35 <UNASSIGNED>
-+<UAB93>     /x82/x37/xc4/x36 <UNASSIGNED>
-+<UAB94>     /x82/x37/xc4/x37 <UNASSIGNED>
-+<UAB95>     /x82/x37/xc4/x38 <UNASSIGNED>
-+<UAB96>     /x82/x37/xc4/x39 <UNASSIGNED>
-+<UAB97>     /x82/x37/xc5/x30 <UNASSIGNED>
-+<UAB98>     /x82/x37/xc5/x31 <UNASSIGNED>
-+<UAB99>     /x82/x37/xc5/x32 <UNASSIGNED>
-+<UAB9A>     /x82/x37/xc5/x33 <UNASSIGNED>
-+<UAB9B>     /x82/x37/xc5/x34 <UNASSIGNED>
-+<UAB9C>     /x82/x37/xc5/x35 <UNASSIGNED>
-+<UAB9D>     /x82/x37/xc5/x36 <UNASSIGNED>
-+<UAB9E>     /x82/x37/xc5/x37 <UNASSIGNED>
-+<UAB9F>     /x82/x37/xc5/x38 <UNASSIGNED>
-+<UABA0>     /x82/x37/xc5/x39 <UNASSIGNED>
-+<UABA1>     /x82/x37/xc6/x30 <UNASSIGNED>
-+<UABA2>     /x82/x37/xc6/x31 <UNASSIGNED>
-+<UABA3>     /x82/x37/xc6/x32 <UNASSIGNED>
-+<UABA4>     /x82/x37/xc6/x33 <UNASSIGNED>
-+<UABA5>     /x82/x37/xc6/x34 <UNASSIGNED>
-+<UABA6>     /x82/x37/xc6/x35 <UNASSIGNED>
-+<UABA7>     /x82/x37/xc6/x36 <UNASSIGNED>
-+<UABA8>     /x82/x37/xc6/x37 <UNASSIGNED>
-+<UABA9>     /x82/x37/xc6/x38 <UNASSIGNED>
-+<UABAA>     /x82/x37/xc6/x39 <UNASSIGNED>
-+<UABAB>     /x82/x37/xc7/x30 <UNASSIGNED>
-+<UABAC>     /x82/x37/xc7/x31 <UNASSIGNED>
-+<UABAD>     /x82/x37/xc7/x32 <UNASSIGNED>
-+<UABAE>     /x82/x37/xc7/x33 <UNASSIGNED>
-+<UABAF>     /x82/x37/xc7/x34 <UNASSIGNED>
-+<UABB0>     /x82/x37/xc7/x35 <UNASSIGNED>
-+<UABB1>     /x82/x37/xc7/x36 <UNASSIGNED>
-+<UABB2>     /x82/x37/xc7/x37 <UNASSIGNED>
-+<UABB3>     /x82/x37/xc7/x38 <UNASSIGNED>
-+<UABB4>     /x82/x37/xc7/x39 <UNASSIGNED>
-+<UABB5>     /x82/x37/xc8/x30 <UNASSIGNED>
-+<UABB6>     /x82/x37/xc8/x31 <UNASSIGNED>
-+<UABB7>     /x82/x37/xc8/x32 <UNASSIGNED>
-+<UABB8>     /x82/x37/xc8/x33 <UNASSIGNED>
-+<UABB9>     /x82/x37/xc8/x34 <UNASSIGNED>
-+<UABBA>     /x82/x37/xc8/x35 <UNASSIGNED>
-+<UABBB>     /x82/x37/xc8/x36 <UNASSIGNED>
-+<UABBC>     /x82/x37/xc8/x37 <UNASSIGNED>
-+<UABBD>     /x82/x37/xc8/x38 <UNASSIGNED>
-+<UABBE>     /x82/x37/xc8/x39 <UNASSIGNED>
-+<UABBF>     /x82/x37/xc9/x30 <UNASSIGNED>
-+<UABC0>     /x82/x37/xc9/x31 <UNASSIGNED>
-+<UABC1>     /x82/x37/xc9/x32 <UNASSIGNED>
-+<UABC2>     /x82/x37/xc9/x33 <UNASSIGNED>
-+<UABC3>     /x82/x37/xc9/x34 <UNASSIGNED>
-+<UABC4>     /x82/x37/xc9/x35 <UNASSIGNED>
-+<UABC5>     /x82/x37/xc9/x36 <UNASSIGNED>
-+<UABC6>     /x82/x37/xc9/x37 <UNASSIGNED>
-+<UABC7>     /x82/x37/xc9/x38 <UNASSIGNED>
-+<UABC8>     /x82/x37/xc9/x39 <UNASSIGNED>
-+<UABC9>     /x82/x37/xca/x30 <UNASSIGNED>
-+<UABCA>     /x82/x37/xca/x31 <UNASSIGNED>
-+<UABCB>     /x82/x37/xca/x32 <UNASSIGNED>
-+<UABCC>     /x82/x37/xca/x33 <UNASSIGNED>
-+<UABCD>     /x82/x37/xca/x34 <UNASSIGNED>
-+<UABCE>     /x82/x37/xca/x35 <UNASSIGNED>
-+<UABCF>     /x82/x37/xca/x36 <UNASSIGNED>
-+<UABD0>     /x82/x37/xca/x37 <UNASSIGNED>
-+<UABD1>     /x82/x37/xca/x38 <UNASSIGNED>
-+<UABD2>     /x82/x37/xca/x39 <UNASSIGNED>
-+<UABD3>     /x82/x37/xcb/x30 <UNASSIGNED>
-+<UABD4>     /x82/x37/xcb/x31 <UNASSIGNED>
-+<UABD5>     /x82/x37/xcb/x32 <UNASSIGNED>
-+<UABD6>     /x82/x37/xcb/x33 <UNASSIGNED>
-+<UABD7>     /x82/x37/xcb/x34 <UNASSIGNED>
-+<UABD8>     /x82/x37/xcb/x35 <UNASSIGNED>
-+<UABD9>     /x82/x37/xcb/x36 <UNASSIGNED>
-+<UABDA>     /x82/x37/xcb/x37 <UNASSIGNED>
-+<UABDB>     /x82/x37/xcb/x38 <UNASSIGNED>
-+<UABDC>     /x82/x37/xcb/x39 <UNASSIGNED>
-+<UABDD>     /x82/x37/xcc/x30 <UNASSIGNED>
-+<UABDE>     /x82/x37/xcc/x31 <UNASSIGNED>
-+<UABDF>     /x82/x37/xcc/x32 <UNASSIGNED>
-+<UABE0>     /x82/x37/xcc/x33 <UNASSIGNED>
-+<UABE1>     /x82/x37/xcc/x34 <UNASSIGNED>
-+<UABE2>     /x82/x37/xcc/x35 <UNASSIGNED>
-+<UABE3>     /x82/x37/xcc/x36 <UNASSIGNED>
-+<UABE4>     /x82/x37/xcc/x37 <UNASSIGNED>
-+<UABE5>     /x82/x37/xcc/x38 <UNASSIGNED>
-+<UABE6>     /x82/x37/xcc/x39 <UNASSIGNED>
-+<UABE7>     /x82/x37/xcd/x30 <UNASSIGNED>
-+<UABE8>     /x82/x37/xcd/x31 <UNASSIGNED>
-+<UABE9>     /x82/x37/xcd/x32 <UNASSIGNED>
-+<UABEA>     /x82/x37/xcd/x33 <UNASSIGNED>
-+<UABEB>     /x82/x37/xcd/x34 <UNASSIGNED>
-+<UABEC>     /x82/x37/xcd/x35 <UNASSIGNED>
-+<UABED>     /x82/x37/xcd/x36 <UNASSIGNED>
-+<UABEE>     /x82/x37/xcd/x37 <UNASSIGNED>
-+<UABEF>     /x82/x37/xcd/x38 <UNASSIGNED>
-+<UABF0>     /x82/x37/xcd/x39 <UNASSIGNED>
-+<UABF1>     /x82/x37/xce/x30 <UNASSIGNED>
-+<UABF2>     /x82/x37/xce/x31 <UNASSIGNED>
-+<UABF3>     /x82/x37/xce/x32 <UNASSIGNED>
-+<UABF4>     /x82/x37/xce/x33 <UNASSIGNED>
-+<UABF5>     /x82/x37/xce/x34 <UNASSIGNED>
-+<UABF6>     /x82/x37/xce/x35 <UNASSIGNED>
-+<UABF7>     /x82/x37/xce/x36 <UNASSIGNED>
-+<UABF8>     /x82/x37/xce/x37 <UNASSIGNED>
-+<UABF9>     /x82/x37/xce/x38 <UNASSIGNED>
-+<UABFA>     /x82/x37/xce/x39 <UNASSIGNED>
-+<UABFB>     /x82/x37/xcf/x30 <UNASSIGNED>
-+<UABFC>     /x82/x37/xcf/x31 <UNASSIGNED>
-+<UABFD>     /x82/x37/xcf/x32 <UNASSIGNED>
-+<UABFE>     /x82/x37/xcf/x33 <UNASSIGNED>
-+<UABFF>     /x82/x37/xcf/x34 <UNASSIGNED>
-+<UAC00>     /x82/x37/xcf/x35 HANGUL SYLLABLE GA
-+<UAC01>     /x82/x37/xcf/x36 HANGUL SYLLABLE GAG
-+<UAC02>     /x82/x37/xcf/x37 HANGUL SYLLABLE GAGG
-+<UAC03>     /x82/x37/xcf/x38 HANGUL SYLLABLE GAGS
-+<UAC04>     /x82/x37/xcf/x39 HANGUL SYLLABLE GAN
-+<UAC05>     /x82/x37/xd0/x30 HANGUL SYLLABLE GANI
-+<UAC06>     /x82/x37/xd0/x31 HANGUL SYLLABLE GANH
-+<UAC07>     /x82/x37/xd0/x32 HANGUL SYLLABLE GAD
-+<UAC08>     /x82/x37/xd0/x33 HANGUL SYLLABLE GAL
-+<UAC09>     /x82/x37/xd0/x34 HANGUL SYLLABLE GALG
-+<UAC0A>     /x82/x37/xd0/x35 HANGUL SYLLABLE GALM
-+<UAC0B>     /x82/x37/xd0/x36 HANGUL SYLLABLE GALB
-+<UAC0C>     /x82/x37/xd0/x37 HANGUL SYLLABLE GALS
-+<UAC0D>     /x82/x37/xd0/x38 HANGUL SYLLABLE GALT
-+<UAC0E>     /x82/x37/xd0/x39 HANGUL SYLLABLE GALP
-+<UAC0F>     /x82/x37/xd1/x30 HANGUL SYLLABLE GALH
-+<UAC10>     /x82/x37/xd1/x31 HANGUL SYLLABLE GAM
-+<UAC11>     /x82/x37/xd1/x32 HANGUL SYLLABLE GAB
-+<UAC12>     /x82/x37/xd1/x33 HANGUL SYLLABLE GABS
-+<UAC13>     /x82/x37/xd1/x34 HANGUL SYLLABLE GAS
-+<UAC14>     /x82/x37/xd1/x35 HANGUL SYLLABLE GASS
-+<UAC15>     /x82/x37/xd1/x36 HANGUL SYLLABLE GANG
-+<UAC16>     /x82/x37/xd1/x37 HANGUL SYLLABLE GAJ
-+<UAC17>     /x82/x37/xd1/x38 HANGUL SYLLABLE GAC
-+<UAC18>     /x82/x37/xd1/x39 HANGUL SYLLABLE GAK
-+<UAC19>     /x82/x37/xd2/x30 HANGUL SYLLABLE GAT
-+<UAC1A>     /x82/x37/xd2/x31 HANGUL SYLLABLE GAP
-+<UAC1B>     /x82/x37/xd2/x32 HANGUL SYLLABLE GAH
-+<UAC1C>     /x82/x37/xd2/x33 HANGUL SYLLABLE GAE
-+<UAC1D>     /x82/x37/xd2/x34 HANGUL SYLLABLE GAEG
-+<UAC1E>     /x82/x37/xd2/x35 HANGUL SYLLABLE GAEGG
-+<UAC1F>     /x82/x37/xd2/x36 HANGUL SYLLABLE GAEGS
-+<UAC20>     /x82/x37/xd2/x37 HANGUL SYLLABLE GAEN
-+<UAC21>     /x82/x37/xd2/x38 HANGUL SYLLABLE GAENI
-+<UAC22>     /x82/x37/xd2/x39 HANGUL SYLLABLE GAENH
-+<UAC23>     /x82/x37/xd3/x30 HANGUL SYLLABLE GAED
-+<UAC24>     /x82/x37/xd3/x31 HANGUL SYLLABLE GAEL
-+<UAC25>     /x82/x37/xd3/x32 HANGUL SYLLABLE GAELG
-+<UAC26>     /x82/x37/xd3/x33 HANGUL SYLLABLE GAELM
-+<UAC27>     /x82/x37/xd3/x34 HANGUL SYLLABLE GAELB
-+<UAC28>     /x82/x37/xd3/x35 HANGUL SYLLABLE GAELS
-+<UAC29>     /x82/x37/xd3/x36 HANGUL SYLLABLE GAELT
-+<UAC2A>     /x82/x37/xd3/x37 HANGUL SYLLABLE GAELP
-+<UAC2B>     /x82/x37/xd3/x38 HANGUL SYLLABLE GAELH
-+<UAC2C>     /x82/x37/xd3/x39 HANGUL SYLLABLE GAEM
-+<UAC2D>     /x82/x37/xd4/x30 HANGUL SYLLABLE GAEB
-+<UAC2E>     /x82/x37/xd4/x31 HANGUL SYLLABLE GAEBS
-+<UAC2F>     /x82/x37/xd4/x32 HANGUL SYLLABLE GAES
-+<UAC30>     /x82/x37/xd4/x33 HANGUL SYLLABLE GAESS
-+<UAC31>     /x82/x37/xd4/x34 HANGUL SYLLABLE GAENG
-+<UAC32>     /x82/x37/xd4/x35 HANGUL SYLLABLE GAEJ
-+<UAC33>     /x82/x37/xd4/x36 HANGUL SYLLABLE GAEC
-+<UAC34>     /x82/x37/xd4/x37 HANGUL SYLLABLE GAEK
-+<UAC35>     /x82/x37/xd4/x38 HANGUL SYLLABLE GAET
-+<UAC36>     /x82/x37/xd4/x39 HANGUL SYLLABLE GAEP
-+<UAC37>     /x82/x37/xd5/x30 HANGUL SYLLABLE GAEH
-+<UAC38>     /x82/x37/xd5/x31 HANGUL SYLLABLE GYA
-+<UAC39>     /x82/x37/xd5/x32 HANGUL SYLLABLE GYAG
-+<UAC3A>     /x82/x37/xd5/x33 HANGUL SYLLABLE GYAGG
-+<UAC3B>     /x82/x37/xd5/x34 HANGUL SYLLABLE GYAGS
-+<UAC3C>     /x82/x37/xd5/x35 HANGUL SYLLABLE GYAN
-+<UAC3D>     /x82/x37/xd5/x36 HANGUL SYLLABLE GYANI
-+<UAC3E>     /x82/x37/xd5/x37 HANGUL SYLLABLE GYANH
-+<UAC3F>     /x82/x37/xd5/x38 HANGUL SYLLABLE GYAD
-+<UAC40>     /x82/x37/xd5/x39 HANGUL SYLLABLE GYAL
-+<UAC41>     /x82/x37/xd6/x30 HANGUL SYLLABLE GYALG
-+<UAC42>     /x82/x37/xd6/x31 HANGUL SYLLABLE GYALM
-+<UAC43>     /x82/x37/xd6/x32 HANGUL SYLLABLE GYALB
-+<UAC44>     /x82/x37/xd6/x33 HANGUL SYLLABLE GYALS
-+<UAC45>     /x82/x37/xd6/x34 HANGUL SYLLABLE GYALT
-+<UAC46>     /x82/x37/xd6/x35 HANGUL SYLLABLE GYALP
-+<UAC47>     /x82/x37/xd6/x36 HANGUL SYLLABLE GYALH
-+<UAC48>     /x82/x37/xd6/x37 HANGUL SYLLABLE GYAM
-+<UAC49>     /x82/x37/xd6/x38 HANGUL SYLLABLE GYAB
-+<UAC4A>     /x82/x37/xd6/x39 HANGUL SYLLABLE GYABS
-+<UAC4B>     /x82/x37/xd7/x30 HANGUL SYLLABLE GYAS
-+<UAC4C>     /x82/x37/xd7/x31 HANGUL SYLLABLE GYASS
-+<UAC4D>     /x82/x37/xd7/x32 HANGUL SYLLABLE GYANG
-+<UAC4E>     /x82/x37/xd7/x33 HANGUL SYLLABLE GYAJ
-+<UAC4F>     /x82/x37/xd7/x34 HANGUL SYLLABLE GYAC
-+<UAC50>     /x82/x37/xd7/x35 HANGUL SYLLABLE GYAK
-+<UAC51>     /x82/x37/xd7/x36 HANGUL SYLLABLE GYAT
-+<UAC52>     /x82/x37/xd7/x37 HANGUL SYLLABLE GYAP
-+<UAC53>     /x82/x37/xd7/x38 HANGUL SYLLABLE GYAH
-+<UAC54>     /x82/x37/xd7/x39 HANGUL SYLLABLE GYAE
-+<UAC55>     /x82/x37/xd8/x30 HANGUL SYLLABLE GYAEG
-+<UAC56>     /x82/x37/xd8/x31 HANGUL SYLLABLE GYAEGG
-+<UAC57>     /x82/x37/xd8/x32 HANGUL SYLLABLE GYAEGS
-+<UAC58>     /x82/x37/xd8/x33 HANGUL SYLLABLE GYAEN
-+<UAC59>     /x82/x37/xd8/x34 HANGUL SYLLABLE GYAENI
-+<UAC5A>     /x82/x37/xd8/x35 HANGUL SYLLABLE GYAENH
-+<UAC5B>     /x82/x37/xd8/x36 HANGUL SYLLABLE GYAED
-+<UAC5C>     /x82/x37/xd8/x37 HANGUL SYLLABLE GYAEL
-+<UAC5D>     /x82/x37/xd8/x38 HANGUL SYLLABLE GYAELG
-+<UAC5E>     /x82/x37/xd8/x39 HANGUL SYLLABLE GYAELM
-+<UAC5F>     /x82/x37/xd9/x30 HANGUL SYLLABLE GYAELB
-+<UAC60>     /x82/x37/xd9/x31 HANGUL SYLLABLE GYAELS
-+<UAC61>     /x82/x37/xd9/x32 HANGUL SYLLABLE GYAELT
-+<UAC62>     /x82/x37/xd9/x33 HANGUL SYLLABLE GYAELP
-+<UAC63>     /x82/x37/xd9/x34 HANGUL SYLLABLE GYAELH
-+<UAC64>     /x82/x37/xd9/x35 HANGUL SYLLABLE GYAEM
-+<UAC65>     /x82/x37/xd9/x36 HANGUL SYLLABLE GYAEB
-+<UAC66>     /x82/x37/xd9/x37 HANGUL SYLLABLE GYAEBS
-+<UAC67>     /x82/x37/xd9/x38 HANGUL SYLLABLE GYAES
-+<UAC68>     /x82/x37/xd9/x39 HANGUL SYLLABLE GYAESS
-+<UAC69>     /x82/x37/xda/x30 HANGUL SYLLABLE GYAENG
-+<UAC6A>     /x82/x37/xda/x31 HANGUL SYLLABLE GYAEJ
-+<UAC6B>     /x82/x37/xda/x32 HANGUL SYLLABLE GYAEC
-+<UAC6C>     /x82/x37/xda/x33 HANGUL SYLLABLE GYAEK
-+<UAC6D>     /x82/x37/xda/x34 HANGUL SYLLABLE GYAET
-+<UAC6E>     /x82/x37/xda/x35 HANGUL SYLLABLE GYAEP
-+<UAC6F>     /x82/x37/xda/x36 HANGUL SYLLABLE GYAEH
-+<UAC70>     /x82/x37/xda/x37 HANGUL SYLLABLE GEO
-+<UAC71>     /x82/x37/xda/x38 HANGUL SYLLABLE GEOG
-+<UAC72>     /x82/x37/xda/x39 HANGUL SYLLABLE GEOGG
-+<UAC73>     /x82/x37/xdb/x30 HANGUL SYLLABLE GEOGS
-+<UAC74>     /x82/x37/xdb/x31 HANGUL SYLLABLE GEON
-+<UAC75>     /x82/x37/xdb/x32 HANGUL SYLLABLE GEONI
-+<UAC76>     /x82/x37/xdb/x33 HANGUL SYLLABLE GEONH
-+<UAC77>     /x82/x37/xdb/x34 HANGUL SYLLABLE GEOD
-+<UAC78>     /x82/x37/xdb/x35 HANGUL SYLLABLE GEOL
-+<UAC79>     /x82/x37/xdb/x36 HANGUL SYLLABLE GEOLG
-+<UAC7A>     /x82/x37/xdb/x37 HANGUL SYLLABLE GEOLM
-+<UAC7B>     /x82/x37/xdb/x38 HANGUL SYLLABLE GEOLB
-+<UAC7C>     /x82/x37/xdb/x39 HANGUL SYLLABLE GEOLS
-+<UAC7D>     /x82/x37/xdc/x30 HANGUL SYLLABLE GEOLT
-+<UAC7E>     /x82/x37/xdc/x31 HANGUL SYLLABLE GEOLP
-+<UAC7F>     /x82/x37/xdc/x32 HANGUL SYLLABLE GEOLH
-+<UAC80>     /x82/x37/xdc/x33 HANGUL SYLLABLE GEOM
-+<UAC81>     /x82/x37/xdc/x34 HANGUL SYLLABLE GEOB
-+<UAC82>     /x82/x37/xdc/x35 HANGUL SYLLABLE GEOBS
-+<UAC83>     /x82/x37/xdc/x36 HANGUL SYLLABLE GEOS
-+<UAC84>     /x82/x37/xdc/x37 HANGUL SYLLABLE GEOSS
-+<UAC85>     /x82/x37/xdc/x38 HANGUL SYLLABLE GEONG
-+<UAC86>     /x82/x37/xdc/x39 HANGUL SYLLABLE GEOJ
-+<UAC87>     /x82/x37/xdd/x30 HANGUL SYLLABLE GEOC
-+<UAC88>     /x82/x37/xdd/x31 HANGUL SYLLABLE GEOK
-+<UAC89>     /x82/x37/xdd/x32 HANGUL SYLLABLE GEOT
-+<UAC8A>     /x82/x37/xdd/x33 HANGUL SYLLABLE GEOP
-+<UAC8B>     /x82/x37/xdd/x34 HANGUL SYLLABLE GEOH
-+<UAC8C>     /x82/x37/xdd/x35 HANGUL SYLLABLE GE
-+<UAC8D>     /x82/x37/xdd/x36 HANGUL SYLLABLE GEG
-+<UAC8E>     /x82/x37/xdd/x37 HANGUL SYLLABLE GEGG
-+<UAC8F>     /x82/x37/xdd/x38 HANGUL SYLLABLE GEGS
-+<UAC90>     /x82/x37/xdd/x39 HANGUL SYLLABLE GEN
-+<UAC91>     /x82/x37/xde/x30 HANGUL SYLLABLE GENI
-+<UAC92>     /x82/x37/xde/x31 HANGUL SYLLABLE GENH
-+<UAC93>     /x82/x37/xde/x32 HANGUL SYLLABLE GED
-+<UAC94>     /x82/x37/xde/x33 HANGUL SYLLABLE GEL
-+<UAC95>     /x82/x37/xde/x34 HANGUL SYLLABLE GELG
-+<UAC96>     /x82/x37/xde/x35 HANGUL SYLLABLE GELM
-+<UAC97>     /x82/x37/xde/x36 HANGUL SYLLABLE GELB
-+<UAC98>     /x82/x37/xde/x37 HANGUL SYLLABLE GELS
-+<UAC99>     /x82/x37/xde/x38 HANGUL SYLLABLE GELT
-+<UAC9A>     /x82/x37/xde/x39 HANGUL SYLLABLE GELP
-+<UAC9B>     /x82/x37/xdf/x30 HANGUL SYLLABLE GELH
-+<UAC9C>     /x82/x37/xdf/x31 HANGUL SYLLABLE GEM
-+<UAC9D>     /x82/x37/xdf/x32 HANGUL SYLLABLE GEB
-+<UAC9E>     /x82/x37/xdf/x33 HANGUL SYLLABLE GEBS
-+<UAC9F>     /x82/x37/xdf/x34 HANGUL SYLLABLE GES
-+<UACA0>     /x82/x37/xdf/x35 HANGUL SYLLABLE GESS
-+<UACA1>     /x82/x37/xdf/x36 HANGUL SYLLABLE GENG
-+<UACA2>     /x82/x37/xdf/x37 HANGUL SYLLABLE GEJ
-+<UACA3>     /x82/x37/xdf/x38 HANGUL SYLLABLE GEC
-+<UACA4>     /x82/x37/xdf/x39 HANGUL SYLLABLE GEK
-+<UACA5>     /x82/x37/xe0/x30 HANGUL SYLLABLE GET
-+<UACA6>     /x82/x37/xe0/x31 HANGUL SYLLABLE GEP
-+<UACA7>     /x82/x37/xe0/x32 HANGUL SYLLABLE GEH
-+<UACA8>     /x82/x37/xe0/x33 HANGUL SYLLABLE GYEO
-+<UACA9>     /x82/x37/xe0/x34 HANGUL SYLLABLE GYEOG
-+<UACAA>     /x82/x37/xe0/x35 HANGUL SYLLABLE GYEOGG
-+<UACAB>     /x82/x37/xe0/x36 HANGUL SYLLABLE GYEOGS
-+<UACAC>     /x82/x37/xe0/x37 HANGUL SYLLABLE GYEON
-+<UACAD>     /x82/x37/xe0/x38 HANGUL SYLLABLE GYEONI
-+<UACAE>     /x82/x37/xe0/x39 HANGUL SYLLABLE GYEONH
-+<UACAF>     /x82/x37/xe1/x30 HANGUL SYLLABLE GYEOD
-+<UACB0>     /x82/x37/xe1/x31 HANGUL SYLLABLE GYEOL
-+<UACB1>     /x82/x37/xe1/x32 HANGUL SYLLABLE GYEOLG
-+<UACB2>     /x82/x37/xe1/x33 HANGUL SYLLABLE GYEOLM
-+<UACB3>     /x82/x37/xe1/x34 HANGUL SYLLABLE GYEOLB
-+<UACB4>     /x82/x37/xe1/x35 HANGUL SYLLABLE GYEOLS
-+<UACB5>     /x82/x37/xe1/x36 HANGUL SYLLABLE GYEOLT
-+<UACB6>     /x82/x37/xe1/x37 HANGUL SYLLABLE GYEOLP
-+<UACB7>     /x82/x37/xe1/x38 HANGUL SYLLABLE GYEOLH
-+<UACB8>     /x82/x37/xe1/x39 HANGUL SYLLABLE GYEOM
-+<UACB9>     /x82/x37/xe2/x30 HANGUL SYLLABLE GYEOB
-+<UACBA>     /x82/x37/xe2/x31 HANGUL SYLLABLE GYEOBS
-+<UACBB>     /x82/x37/xe2/x32 HANGUL SYLLABLE GYEOS
-+<UACBC>     /x82/x37/xe2/x33 HANGUL SYLLABLE GYEOSS
-+<UACBD>     /x82/x37/xe2/x34 HANGUL SYLLABLE GYEONG
-+<UACBE>     /x82/x37/xe2/x35 HANGUL SYLLABLE GYEOJ
-+<UACBF>     /x82/x37/xe2/x36 HANGUL SYLLABLE GYEOC
-+<UACC0>     /x82/x37/xe2/x37 HANGUL SYLLABLE GYEOK
-+<UACC1>     /x82/x37/xe2/x38 HANGUL SYLLABLE GYEOT
-+<UACC2>     /x82/x37/xe2/x39 HANGUL SYLLABLE GYEOP
-+<UACC3>     /x82/x37/xe3/x30 HANGUL SYLLABLE GYEOH
-+<UACC4>     /x82/x37/xe3/x31 HANGUL SYLLABLE GYE
-+<UACC5>     /x82/x37/xe3/x32 HANGUL SYLLABLE GYEG
-+<UACC6>     /x82/x37/xe3/x33 HANGUL SYLLABLE GYEGG
-+<UACC7>     /x82/x37/xe3/x34 HANGUL SYLLABLE GYEGS
-+<UACC8>     /x82/x37/xe3/x35 HANGUL SYLLABLE GYEN
-+<UACC9>     /x82/x37/xe3/x36 HANGUL SYLLABLE GYENI
-+<UACCA>     /x82/x37/xe3/x37 HANGUL SYLLABLE GYENH
-+<UACCB>     /x82/x37/xe3/x38 HANGUL SYLLABLE GYED
-+<UACCC>     /x82/x37/xe3/x39 HANGUL SYLLABLE GYEL
-+<UACCD>     /x82/x37/xe4/x30 HANGUL SYLLABLE GYELG
-+<UACCE>     /x82/x37/xe4/x31 HANGUL SYLLABLE GYELM
-+<UACCF>     /x82/x37/xe4/x32 HANGUL SYLLABLE GYELB
-+<UACD0>     /x82/x37/xe4/x33 HANGUL SYLLABLE GYELS
-+<UACD1>     /x82/x37/xe4/x34 HANGUL SYLLABLE GYELT
-+<UACD2>     /x82/x37/xe4/x35 HANGUL SYLLABLE GYELP
-+<UACD3>     /x82/x37/xe4/x36 HANGUL SYLLABLE GYELH
-+<UACD4>     /x82/x37/xe4/x37 HANGUL SYLLABLE GYEM
-+<UACD5>     /x82/x37/xe4/x38 HANGUL SYLLABLE GYEB
-+<UACD6>     /x82/x37/xe4/x39 HANGUL SYLLABLE GYEBS
-+<UACD7>     /x82/x37/xe5/x30 HANGUL SYLLABLE GYES
-+<UACD8>     /x82/x37/xe5/x31 HANGUL SYLLABLE GYESS
-+<UACD9>     /x82/x37/xe5/x32 HANGUL SYLLABLE GYENG
-+<UACDA>     /x82/x37/xe5/x33 HANGUL SYLLABLE GYEJ
-+<UACDB>     /x82/x37/xe5/x34 HANGUL SYLLABLE GYEC
-+<UACDC>     /x82/x37/xe5/x35 HANGUL SYLLABLE GYEK
-+<UACDD>     /x82/x37/xe5/x36 HANGUL SYLLABLE GYET
-+<UACDE>     /x82/x37/xe5/x37 HANGUL SYLLABLE GYEP
-+<UACDF>     /x82/x37/xe5/x38 HANGUL SYLLABLE GYEH
-+<UACE0>     /x82/x37/xe5/x39 HANGUL SYLLABLE GO
-+<UACE1>     /x82/x37/xe6/x30 HANGUL SYLLABLE GOG
-+<UACE2>     /x82/x37/xe6/x31 HANGUL SYLLABLE GOGG
-+<UACE3>     /x82/x37/xe6/x32 HANGUL SYLLABLE GOGS
-+<UACE4>     /x82/x37/xe6/x33 HANGUL SYLLABLE GON
-+<UACE5>     /x82/x37/xe6/x34 HANGUL SYLLABLE GONI
-+<UACE6>     /x82/x37/xe6/x35 HANGUL SYLLABLE GONH
-+<UACE7>     /x82/x37/xe6/x36 HANGUL SYLLABLE GOD
-+<UACE8>     /x82/x37/xe6/x37 HANGUL SYLLABLE GOL
-+<UACE9>     /x82/x37/xe6/x38 HANGUL SYLLABLE GOLG
-+<UACEA>     /x82/x37/xe6/x39 HANGUL SYLLABLE GOLM
-+<UACEB>     /x82/x37/xe7/x30 HANGUL SYLLABLE GOLB
-+<UACEC>     /x82/x37/xe7/x31 HANGUL SYLLABLE GOLS
-+<UACED>     /x82/x37/xe7/x32 HANGUL SYLLABLE GOLT
-+<UACEE>     /x82/x37/xe7/x33 HANGUL SYLLABLE GOLP
-+<UACEF>     /x82/x37/xe7/x34 HANGUL SYLLABLE GOLH
-+<UACF0>     /x82/x37/xe7/x35 HANGUL SYLLABLE GOM
-+<UACF1>     /x82/x37/xe7/x36 HANGUL SYLLABLE GOB
-+<UACF2>     /x82/x37/xe7/x37 HANGUL SYLLABLE GOBS
-+<UACF3>     /x82/x37/xe7/x38 HANGUL SYLLABLE GOS
-+<UACF4>     /x82/x37/xe7/x39 HANGUL SYLLABLE GOSS
-+<UACF5>     /x82/x37/xe8/x30 HANGUL SYLLABLE GONG
-+<UACF6>     /x82/x37/xe8/x31 HANGUL SYLLABLE GOJ
-+<UACF7>     /x82/x37/xe8/x32 HANGUL SYLLABLE GOC
-+<UACF8>     /x82/x37/xe8/x33 HANGUL SYLLABLE GOK
-+<UACF9>     /x82/x37/xe8/x34 HANGUL SYLLABLE GOT
-+<UACFA>     /x82/x37/xe8/x35 HANGUL SYLLABLE GOP
-+<UACFB>     /x82/x37/xe8/x36 HANGUL SYLLABLE GOH
-+<UACFC>     /x82/x37/xe8/x37 HANGUL SYLLABLE GWA
-+<UACFD>     /x82/x37/xe8/x38 HANGUL SYLLABLE GWAG
-+<UACFE>     /x82/x37/xe8/x39 HANGUL SYLLABLE GWAGG
-+<UACFF>     /x82/x37/xe9/x30 HANGUL SYLLABLE GWAGS
-+<UAD00>     /x82/x37/xe9/x31 HANGUL SYLLABLE GWAN
-+<UAD01>     /x82/x37/xe9/x32 HANGUL SYLLABLE GWANI
-+<UAD02>     /x82/x37/xe9/x33 HANGUL SYLLABLE GWANH
-+<UAD03>     /x82/x37/xe9/x34 HANGUL SYLLABLE GWAD
-+<UAD04>     /x82/x37/xe9/x35 HANGUL SYLLABLE GWAL
-+<UAD05>     /x82/x37/xe9/x36 HANGUL SYLLABLE GWALG
-+<UAD06>     /x82/x37/xe9/x37 HANGUL SYLLABLE GWALM
-+<UAD07>     /x82/x37/xe9/x38 HANGUL SYLLABLE GWALB
-+<UAD08>     /x82/x37/xe9/x39 HANGUL SYLLABLE GWALS
-+<UAD09>     /x82/x37/xea/x30 HANGUL SYLLABLE GWALT
-+<UAD0A>     /x82/x37/xea/x31 HANGUL SYLLABLE GWALP
-+<UAD0B>     /x82/x37/xea/x32 HANGUL SYLLABLE GWALH
-+<UAD0C>     /x82/x37/xea/x33 HANGUL SYLLABLE GWAM
-+<UAD0D>     /x82/x37/xea/x34 HANGUL SYLLABLE GWAB
-+<UAD0E>     /x82/x37/xea/x35 HANGUL SYLLABLE GWABS
-+<UAD0F>     /x82/x37/xea/x36 HANGUL SYLLABLE GWAS
-+<UAD10>     /x82/x37/xea/x37 HANGUL SYLLABLE GWASS
-+<UAD11>     /x82/x37/xea/x38 HANGUL SYLLABLE GWANG
-+<UAD12>     /x82/x37/xea/x39 HANGUL SYLLABLE GWAJ
-+<UAD13>     /x82/x37/xeb/x30 HANGUL SYLLABLE GWAC
-+<UAD14>     /x82/x37/xeb/x31 HANGUL SYLLABLE GWAK
-+<UAD15>     /x82/x37/xeb/x32 HANGUL SYLLABLE GWAT
-+<UAD16>     /x82/x37/xeb/x33 HANGUL SYLLABLE GWAP
-+<UAD17>     /x82/x37/xeb/x34 HANGUL SYLLABLE GWAH
-+<UAD18>     /x82/x37/xeb/x35 HANGUL SYLLABLE GWAE
-+<UAD19>     /x82/x37/xeb/x36 HANGUL SYLLABLE GWAEG
-+<UAD1A>     /x82/x37/xeb/x37 HANGUL SYLLABLE GWAEGG
-+<UAD1B>     /x82/x37/xeb/x38 HANGUL SYLLABLE GWAEGS
-+<UAD1C>     /x82/x37/xeb/x39 HANGUL SYLLABLE GWAEN
-+<UAD1D>     /x82/x37/xec/x30 HANGUL SYLLABLE GWAENI
-+<UAD1E>     /x82/x37/xec/x31 HANGUL SYLLABLE GWAENH
-+<UAD1F>     /x82/x37/xec/x32 HANGUL SYLLABLE GWAED
-+<UAD20>     /x82/x37/xec/x33 HANGUL SYLLABLE GWAEL
-+<UAD21>     /x82/x37/xec/x34 HANGUL SYLLABLE GWAELG
-+<UAD22>     /x82/x37/xec/x35 HANGUL SYLLABLE GWAELM
-+<UAD23>     /x82/x37/xec/x36 HANGUL SYLLABLE GWAELB
-+<UAD24>     /x82/x37/xec/x37 HANGUL SYLLABLE GWAELS
-+<UAD25>     /x82/x37/xec/x38 HANGUL SYLLABLE GWAELT
-+<UAD26>     /x82/x37/xec/x39 HANGUL SYLLABLE GWAELP
-+<UAD27>     /x82/x37/xed/x30 HANGUL SYLLABLE GWAELH
-+<UAD28>     /x82/x37/xed/x31 HANGUL SYLLABLE GWAEM
-+<UAD29>     /x82/x37/xed/x32 HANGUL SYLLABLE GWAEB
-+<UAD2A>     /x82/x37/xed/x33 HANGUL SYLLABLE GWAEBS
-+<UAD2B>     /x82/x37/xed/x34 HANGUL SYLLABLE GWAES
-+<UAD2C>     /x82/x37/xed/x35 HANGUL SYLLABLE GWAESS
-+<UAD2D>     /x82/x37/xed/x36 HANGUL SYLLABLE GWAENG
-+<UAD2E>     /x82/x37/xed/x37 HANGUL SYLLABLE GWAEJ
-+<UAD2F>     /x82/x37/xed/x38 HANGUL SYLLABLE GWAEC
-+<UAD30>     /x82/x37/xed/x39 HANGUL SYLLABLE GWAEK
-+<UAD31>     /x82/x37/xee/x30 HANGUL SYLLABLE GWAET
-+<UAD32>     /x82/x37/xee/x31 HANGUL SYLLABLE GWAEP
-+<UAD33>     /x82/x37/xee/x32 HANGUL SYLLABLE GWAEH
-+<UAD34>     /x82/x37/xee/x33 HANGUL SYLLABLE GOE
-+<UAD35>     /x82/x37/xee/x34 HANGUL SYLLABLE GOEG
-+<UAD36>     /x82/x37/xee/x35 HANGUL SYLLABLE GOEGG
-+<UAD37>     /x82/x37/xee/x36 HANGUL SYLLABLE GOEGS
-+<UAD38>     /x82/x37/xee/x37 HANGUL SYLLABLE GOEN
-+<UAD39>     /x82/x37/xee/x38 HANGUL SYLLABLE GOENI
-+<UAD3A>     /x82/x37/xee/x39 HANGUL SYLLABLE GOENH
-+<UAD3B>     /x82/x37/xef/x30 HANGUL SYLLABLE GOED
-+<UAD3C>     /x82/x37/xef/x31 HANGUL SYLLABLE GOEL
-+<UAD3D>     /x82/x37/xef/x32 HANGUL SYLLABLE GOELG
-+<UAD3E>     /x82/x37/xef/x33 HANGUL SYLLABLE GOELM
-+<UAD3F>     /x82/x37/xef/x34 HANGUL SYLLABLE GOELB
-+<UAD40>     /x82/x37/xef/x35 HANGUL SYLLABLE GOELS
-+<UAD41>     /x82/x37/xef/x36 HANGUL SYLLABLE GOELT
-+<UAD42>     /x82/x37/xef/x37 HANGUL SYLLABLE GOELP
-+<UAD43>     /x82/x37/xef/x38 HANGUL SYLLABLE GOELH
-+<UAD44>     /x82/x37/xef/x39 HANGUL SYLLABLE GOEM
-+<UAD45>     /x82/x37/xf0/x30 HANGUL SYLLABLE GOEB
-+<UAD46>     /x82/x37/xf0/x31 HANGUL SYLLABLE GOEBS
-+<UAD47>     /x82/x37/xf0/x32 HANGUL SYLLABLE GOES
-+<UAD48>     /x82/x37/xf0/x33 HANGUL SYLLABLE GOESS
-+<UAD49>     /x82/x37/xf0/x34 HANGUL SYLLABLE GOENG
-+<UAD4A>     /x82/x37/xf0/x35 HANGUL SYLLABLE GOEJ
-+<UAD4B>     /x82/x37/xf0/x36 HANGUL SYLLABLE GOEC
-+<UAD4C>     /x82/x37/xf0/x37 HANGUL SYLLABLE GOEK
-+<UAD4D>     /x82/x37/xf0/x38 HANGUL SYLLABLE GOET
-+<UAD4E>     /x82/x37/xf0/x39 HANGUL SYLLABLE GOEP
-+<UAD4F>     /x82/x37/xf1/x30 HANGUL SYLLABLE GOEH
-+<UAD50>     /x82/x37/xf1/x31 HANGUL SYLLABLE GYO
-+<UAD51>     /x82/x37/xf1/x32 HANGUL SYLLABLE GYOG
-+<UAD52>     /x82/x37/xf1/x33 HANGUL SYLLABLE GYOGG
-+<UAD53>     /x82/x37/xf1/x34 HANGUL SYLLABLE GYOGS
-+<UAD54>     /x82/x37/xf1/x35 HANGUL SYLLABLE GYON
-+<UAD55>     /x82/x37/xf1/x36 HANGUL SYLLABLE GYONI
-+<UAD56>     /x82/x37/xf1/x37 HANGUL SYLLABLE GYONH
-+<UAD57>     /x82/x37/xf1/x38 HANGUL SYLLABLE GYOD
-+<UAD58>     /x82/x37/xf1/x39 HANGUL SYLLABLE GYOL
-+<UAD59>     /x82/x37/xf2/x30 HANGUL SYLLABLE GYOLG
-+<UAD5A>     /x82/x37/xf2/x31 HANGUL SYLLABLE GYOLM
-+<UAD5B>     /x82/x37/xf2/x32 HANGUL SYLLABLE GYOLB
-+<UAD5C>     /x82/x37/xf2/x33 HANGUL SYLLABLE GYOLS
-+<UAD5D>     /x82/x37/xf2/x34 HANGUL SYLLABLE GYOLT
-+<UAD5E>     /x82/x37/xf2/x35 HANGUL SYLLABLE GYOLP
-+<UAD5F>     /x82/x37/xf2/x36 HANGUL SYLLABLE GYOLH
-+<UAD60>     /x82/x37/xf2/x37 HANGUL SYLLABLE GYOM
-+<UAD61>     /x82/x37/xf2/x38 HANGUL SYLLABLE GYOB
-+<UAD62>     /x82/x37/xf2/x39 HANGUL SYLLABLE GYOBS
-+<UAD63>     /x82/x37/xf3/x30 HANGUL SYLLABLE GYOS
-+<UAD64>     /x82/x37/xf3/x31 HANGUL SYLLABLE GYOSS
-+<UAD65>     /x82/x37/xf3/x32 HANGUL SYLLABLE GYONG
-+<UAD66>     /x82/x37/xf3/x33 HANGUL SYLLABLE GYOJ
-+<UAD67>     /x82/x37/xf3/x34 HANGUL SYLLABLE GYOC
-+<UAD68>     /x82/x37/xf3/x35 HANGUL SYLLABLE GYOK
-+<UAD69>     /x82/x37/xf3/x36 HANGUL SYLLABLE GYOT
-+<UAD6A>     /x82/x37/xf3/x37 HANGUL SYLLABLE GYOP
-+<UAD6B>     /x82/x37/xf3/x38 HANGUL SYLLABLE GYOH
-+<UAD6C>     /x82/x37/xf3/x39 HANGUL SYLLABLE GU
-+<UAD6D>     /x82/x37/xf4/x30 HANGUL SYLLABLE GUG
-+<UAD6E>     /x82/x37/xf4/x31 HANGUL SYLLABLE GUGG
-+<UAD6F>     /x82/x37/xf4/x32 HANGUL SYLLABLE GUGS
-+<UAD70>     /x82/x37/xf4/x33 HANGUL SYLLABLE GUN
-+<UAD71>     /x82/x37/xf4/x34 HANGUL SYLLABLE GUNI
-+<UAD72>     /x82/x37/xf4/x35 HANGUL SYLLABLE GUNH
-+<UAD73>     /x82/x37/xf4/x36 HANGUL SYLLABLE GUD
-+<UAD74>     /x82/x37/xf4/x37 HANGUL SYLLABLE GUL
-+<UAD75>     /x82/x37/xf4/x38 HANGUL SYLLABLE GULG
-+<UAD76>     /x82/x37/xf4/x39 HANGUL SYLLABLE GULM
-+<UAD77>     /x82/x37/xf5/x30 HANGUL SYLLABLE GULB
-+<UAD78>     /x82/x37/xf5/x31 HANGUL SYLLABLE GULS
-+<UAD79>     /x82/x37/xf5/x32 HANGUL SYLLABLE GULT
-+<UAD7A>     /x82/x37/xf5/x33 HANGUL SYLLABLE GULP
-+<UAD7B>     /x82/x37/xf5/x34 HANGUL SYLLABLE GULH
-+<UAD7C>     /x82/x37/xf5/x35 HANGUL SYLLABLE GUM
-+<UAD7D>     /x82/x37/xf5/x36 HANGUL SYLLABLE GUB
-+<UAD7E>     /x82/x37/xf5/x37 HANGUL SYLLABLE GUBS
-+<UAD7F>     /x82/x37/xf5/x38 HANGUL SYLLABLE GUS
-+<UAD80>     /x82/x37/xf5/x39 HANGUL SYLLABLE GUSS
-+<UAD81>     /x82/x37/xf6/x30 HANGUL SYLLABLE GUNG
-+<UAD82>     /x82/x37/xf6/x31 HANGUL SYLLABLE GUJ
-+<UAD83>     /x82/x37/xf6/x32 HANGUL SYLLABLE GUC
-+<UAD84>     /x82/x37/xf6/x33 HANGUL SYLLABLE GUK
-+<UAD85>     /x82/x37/xf6/x34 HANGUL SYLLABLE GUT
-+<UAD86>     /x82/x37/xf6/x35 HANGUL SYLLABLE GUP
-+<UAD87>     /x82/x37/xf6/x36 HANGUL SYLLABLE GUH
-+<UAD88>     /x82/x37/xf6/x37 HANGUL SYLLABLE GWEO
-+<UAD89>     /x82/x37/xf6/x38 HANGUL SYLLABLE GWEOG
-+<UAD8A>     /x82/x37/xf6/x39 HANGUL SYLLABLE GWEOGG
-+<UAD8B>     /x82/x37/xf7/x30 HANGUL SYLLABLE GWEOGS
-+<UAD8C>     /x82/x37/xf7/x31 HANGUL SYLLABLE GWEON
-+<UAD8D>     /x82/x37/xf7/x32 HANGUL SYLLABLE GWEONI
-+<UAD8E>     /x82/x37/xf7/x33 HANGUL SYLLABLE GWEONH
-+<UAD8F>     /x82/x37/xf7/x34 HANGUL SYLLABLE GWEOD
-+<UAD90>     /x82/x37/xf7/x35 HANGUL SYLLABLE GWEOL
-+<UAD91>     /x82/x37/xf7/x36 HANGUL SYLLABLE GWEOLG
-+<UAD92>     /x82/x37/xf7/x37 HANGUL SYLLABLE GWEOLM
-+<UAD93>     /x82/x37/xf7/x38 HANGUL SYLLABLE GWEOLB
-+<UAD94>     /x82/x37/xf7/x39 HANGUL SYLLABLE GWEOLS
-+<UAD95>     /x82/x37/xf8/x30 HANGUL SYLLABLE GWEOLT
-+<UAD96>     /x82/x37/xf8/x31 HANGUL SYLLABLE GWEOLP
-+<UAD97>     /x82/x37/xf8/x32 HANGUL SYLLABLE GWEOLH
-+<UAD98>     /x82/x37/xf8/x33 HANGUL SYLLABLE GWEOM
-+<UAD99>     /x82/x37/xf8/x34 HANGUL SYLLABLE GWEOB
-+<UAD9A>     /x82/x37/xf8/x35 HANGUL SYLLABLE GWEOBS
-+<UAD9B>     /x82/x37/xf8/x36 HANGUL SYLLABLE GWEOS
-+<UAD9C>     /x82/x37/xf8/x37 HANGUL SYLLABLE GWEOSS
-+<UAD9D>     /x82/x37/xf8/x38 HANGUL SYLLABLE GWEONG
-+<UAD9E>     /x82/x37/xf8/x39 HANGUL SYLLABLE GWEOJ
-+<UAD9F>     /x82/x37/xf9/x30 HANGUL SYLLABLE GWEOC
-+<UADA0>     /x82/x37/xf9/x31 HANGUL SYLLABLE GWEOK
-+<UADA1>     /x82/x37/xf9/x32 HANGUL SYLLABLE GWEOT
-+<UADA2>     /x82/x37/xf9/x33 HANGUL SYLLABLE GWEOP
-+<UADA3>     /x82/x37/xf9/x34 HANGUL SYLLABLE GWEOH
-+<UADA4>     /x82/x37/xf9/x35 HANGUL SYLLABLE GWE
-+<UADA5>     /x82/x37/xf9/x36 HANGUL SYLLABLE GWEG
-+<UADA6>     /x82/x37/xf9/x37 HANGUL SYLLABLE GWEGG
-+<UADA7>     /x82/x37/xf9/x38 HANGUL SYLLABLE GWEGS
-+<UADA8>     /x82/x37/xf9/x39 HANGUL SYLLABLE GWEN
-+<UADA9>     /x82/x37/xfa/x30 HANGUL SYLLABLE GWENI
-+<UADAA>     /x82/x37/xfa/x31 HANGUL SYLLABLE GWENH
-+<UADAB>     /x82/x37/xfa/x32 HANGUL SYLLABLE GWED
-+<UADAC>     /x82/x37/xfa/x33 HANGUL SYLLABLE GWEL
-+<UADAD>     /x82/x37/xfa/x34 HANGUL SYLLABLE GWELG
-+<UADAE>     /x82/x37/xfa/x35 HANGUL SYLLABLE GWELM
-+<UADAF>     /x82/x37/xfa/x36 HANGUL SYLLABLE GWELB
-+<UADB0>     /x82/x37/xfa/x37 HANGUL SYLLABLE GWELS
-+<UADB1>     /x82/x37/xfa/x38 HANGUL SYLLABLE GWELT
-+<UADB2>     /x82/x37/xfa/x39 HANGUL SYLLABLE GWELP
-+<UADB3>     /x82/x37/xfb/x30 HANGUL SYLLABLE GWELH
-+<UADB4>     /x82/x37/xfb/x31 HANGUL SYLLABLE GWEM
-+<UADB5>     /x82/x37/xfb/x32 HANGUL SYLLABLE GWEB
-+<UADB6>     /x82/x37/xfb/x33 HANGUL SYLLABLE GWEBS
-+<UADB7>     /x82/x37/xfb/x34 HANGUL SYLLABLE GWES
-+<UADB8>     /x82/x37/xfb/x35 HANGUL SYLLABLE GWESS
-+<UADB9>     /x82/x37/xfb/x36 HANGUL SYLLABLE GWENG
-+<UADBA>     /x82/x37/xfb/x37 HANGUL SYLLABLE GWEJ
-+<UADBB>     /x82/x37/xfb/x38 HANGUL SYLLABLE GWEC
-+<UADBC>     /x82/x37/xfb/x39 HANGUL SYLLABLE GWEK
-+<UADBD>     /x82/x37/xfc/x30 HANGUL SYLLABLE GWET
-+<UADBE>     /x82/x37/xfc/x31 HANGUL SYLLABLE GWEP
-+<UADBF>     /x82/x37/xfc/x32 HANGUL SYLLABLE GWEH
-+<UADC0>     /x82/x37/xfc/x33 HANGUL SYLLABLE GWI
-+<UADC1>     /x82/x37/xfc/x34 HANGUL SYLLABLE GWIG
-+<UADC2>     /x82/x37/xfc/x35 HANGUL SYLLABLE GWIGG
-+<UADC3>     /x82/x37/xfc/x36 HANGUL SYLLABLE GWIGS
-+<UADC4>     /x82/x37/xfc/x37 HANGUL SYLLABLE GWIN
-+<UADC5>     /x82/x37/xfc/x38 HANGUL SYLLABLE GWINI
-+<UADC6>     /x82/x37/xfc/x39 HANGUL SYLLABLE GWINH
-+<UADC7>     /x82/x37/xfd/x30 HANGUL SYLLABLE GWID
-+<UADC8>     /x82/x37/xfd/x31 HANGUL SYLLABLE GWIL
-+<UADC9>     /x82/x37/xfd/x32 HANGUL SYLLABLE GWILG
-+<UADCA>     /x82/x37/xfd/x33 HANGUL SYLLABLE GWILM
-+<UADCB>     /x82/x37/xfd/x34 HANGUL SYLLABLE GWILB
-+<UADCC>     /x82/x37/xfd/x35 HANGUL SYLLABLE GWILS
-+<UADCD>     /x82/x37/xfd/x36 HANGUL SYLLABLE GWILT
-+<UADCE>     /x82/x37/xfd/x37 HANGUL SYLLABLE GWILP
-+<UADCF>     /x82/x37/xfd/x38 HANGUL SYLLABLE GWILH
-+<UADD0>     /x82/x37/xfd/x39 HANGUL SYLLABLE GWIM
-+<UADD1>     /x82/x37/xfe/x30 HANGUL SYLLABLE GWIB
-+<UADD2>     /x82/x37/xfe/x31 HANGUL SYLLABLE GWIBS
-+<UADD3>     /x82/x37/xfe/x32 HANGUL SYLLABLE GWIS
-+<UADD4>     /x82/x37/xfe/x33 HANGUL SYLLABLE GWISS
-+<UADD5>     /x82/x37/xfe/x34 HANGUL SYLLABLE GWING
-+<UADD6>     /x82/x37/xfe/x35 HANGUL SYLLABLE GWIJ
-+<UADD7>     /x82/x37/xfe/x36 HANGUL SYLLABLE GWIC
-+<UADD8>     /x82/x37/xfe/x37 HANGUL SYLLABLE GWIK
-+<UADD9>     /x82/x37/xfe/x38 HANGUL SYLLABLE GWIT
-+<UADDA>     /x82/x37/xfe/x39 HANGUL SYLLABLE GWIP
-+<UADDB>     /x82/x38/x81/x30 HANGUL SYLLABLE GWIH
-+<UADDC>     /x82/x38/x81/x31 HANGUL SYLLABLE GYU
-+<UADDD>     /x82/x38/x81/x32 HANGUL SYLLABLE GYUG
-+<UADDE>     /x82/x38/x81/x33 HANGUL SYLLABLE GYUGG
-+<UADDF>     /x82/x38/x81/x34 HANGUL SYLLABLE GYUGS
-+<UADE0>     /x82/x38/x81/x35 HANGUL SYLLABLE GYUN
-+<UADE1>     /x82/x38/x81/x36 HANGUL SYLLABLE GYUNI
-+<UADE2>     /x82/x38/x81/x37 HANGUL SYLLABLE GYUNH
-+<UADE3>     /x82/x38/x81/x38 HANGUL SYLLABLE GYUD
-+<UADE4>     /x82/x38/x81/x39 HANGUL SYLLABLE GYUL
-+<UADE5>     /x82/x38/x82/x30 HANGUL SYLLABLE GYULG
-+<UADE6>     /x82/x38/x82/x31 HANGUL SYLLABLE GYULM
-+<UADE7>     /x82/x38/x82/x32 HANGUL SYLLABLE GYULB
-+<UADE8>     /x82/x38/x82/x33 HANGUL SYLLABLE GYULS
-+<UADE9>     /x82/x38/x82/x34 HANGUL SYLLABLE GYULT
-+<UADEA>     /x82/x38/x82/x35 HANGUL SYLLABLE GYULP
-+<UADEB>     /x82/x38/x82/x36 HANGUL SYLLABLE GYULH
-+<UADEC>     /x82/x38/x82/x37 HANGUL SYLLABLE GYUM
-+<UADED>     /x82/x38/x82/x38 HANGUL SYLLABLE GYUB
-+<UADEE>     /x82/x38/x82/x39 HANGUL SYLLABLE GYUBS
-+<UADEF>     /x82/x38/x83/x30 HANGUL SYLLABLE GYUS
-+<UADF0>     /x82/x38/x83/x31 HANGUL SYLLABLE GYUSS
-+<UADF1>     /x82/x38/x83/x32 HANGUL SYLLABLE GYUNG
-+<UADF2>     /x82/x38/x83/x33 HANGUL SYLLABLE GYUJ
-+<UADF3>     /x82/x38/x83/x34 HANGUL SYLLABLE GYUC
-+<UADF4>     /x82/x38/x83/x35 HANGUL SYLLABLE GYUK
-+<UADF5>     /x82/x38/x83/x36 HANGUL SYLLABLE GYUT
-+<UADF6>     /x82/x38/x83/x37 HANGUL SYLLABLE GYUP
-+<UADF7>     /x82/x38/x83/x38 HANGUL SYLLABLE GYUH
-+<UADF8>     /x82/x38/x83/x39 HANGUL SYLLABLE GEU
-+<UADF9>     /x82/x38/x84/x30 HANGUL SYLLABLE GEUG
-+<UADFA>     /x82/x38/x84/x31 HANGUL SYLLABLE GEUGG
-+<UADFB>     /x82/x38/x84/x32 HANGUL SYLLABLE GEUGS
-+<UADFC>     /x82/x38/x84/x33 HANGUL SYLLABLE GEUN
-+<UADFD>     /x82/x38/x84/x34 HANGUL SYLLABLE GEUNI
-+<UADFE>     /x82/x38/x84/x35 HANGUL SYLLABLE GEUNH
-+<UADFF>     /x82/x38/x84/x36 HANGUL SYLLABLE GEUD
-+<UAE00>     /x82/x38/x84/x37 HANGUL SYLLABLE GEUL
-+<UAE01>     /x82/x38/x84/x38 HANGUL SYLLABLE GEULG
-+<UAE02>     /x82/x38/x84/x39 HANGUL SYLLABLE GEULM
-+<UAE03>     /x82/x38/x85/x30 HANGUL SYLLABLE GEULB
-+<UAE04>     /x82/x38/x85/x31 HANGUL SYLLABLE GEULS
-+<UAE05>     /x82/x38/x85/x32 HANGUL SYLLABLE GEULT
-+<UAE06>     /x82/x38/x85/x33 HANGUL SYLLABLE GEULP
-+<UAE07>     /x82/x38/x85/x34 HANGUL SYLLABLE GEULH
-+<UAE08>     /x82/x38/x85/x35 HANGUL SYLLABLE GEUM
-+<UAE09>     /x82/x38/x85/x36 HANGUL SYLLABLE GEUB
-+<UAE0A>     /x82/x38/x85/x37 HANGUL SYLLABLE GEUBS
-+<UAE0B>     /x82/x38/x85/x38 HANGUL SYLLABLE GEUS
-+<UAE0C>     /x82/x38/x85/x39 HANGUL SYLLABLE GEUSS
-+<UAE0D>     /x82/x38/x86/x30 HANGUL SYLLABLE GEUNG
-+<UAE0E>     /x82/x38/x86/x31 HANGUL SYLLABLE GEUJ
-+<UAE0F>     /x82/x38/x86/x32 HANGUL SYLLABLE GEUC
-+<UAE10>     /x82/x38/x86/x33 HANGUL SYLLABLE GEUK
-+<UAE11>     /x82/x38/x86/x34 HANGUL SYLLABLE GEUT
-+<UAE12>     /x82/x38/x86/x35 HANGUL SYLLABLE GEUP
-+<UAE13>     /x82/x38/x86/x36 HANGUL SYLLABLE GEUH
-+<UAE14>     /x82/x38/x86/x37 HANGUL SYLLABLE GYI
-+<UAE15>     /x82/x38/x86/x38 HANGUL SYLLABLE GYIG
-+<UAE16>     /x82/x38/x86/x39 HANGUL SYLLABLE GYIGG
-+<UAE17>     /x82/x38/x87/x30 HANGUL SYLLABLE GYIGS
-+<UAE18>     /x82/x38/x87/x31 HANGUL SYLLABLE GYIN
-+<UAE19>     /x82/x38/x87/x32 HANGUL SYLLABLE GYINI
-+<UAE1A>     /x82/x38/x87/x33 HANGUL SYLLABLE GYINH
-+<UAE1B>     /x82/x38/x87/x34 HANGUL SYLLABLE GYID
-+<UAE1C>     /x82/x38/x87/x35 HANGUL SYLLABLE GYIL
-+<UAE1D>     /x82/x38/x87/x36 HANGUL SYLLABLE GYILG
-+<UAE1E>     /x82/x38/x87/x37 HANGUL SYLLABLE GYILM
-+<UAE1F>     /x82/x38/x87/x38 HANGUL SYLLABLE GYILB
-+<UAE20>     /x82/x38/x87/x39 HANGUL SYLLABLE GYILS
-+<UAE21>     /x82/x38/x88/x30 HANGUL SYLLABLE GYILT
-+<UAE22>     /x82/x38/x88/x31 HANGUL SYLLABLE GYILP
-+<UAE23>     /x82/x38/x88/x32 HANGUL SYLLABLE GYILH
-+<UAE24>     /x82/x38/x88/x33 HANGUL SYLLABLE GYIM
-+<UAE25>     /x82/x38/x88/x34 HANGUL SYLLABLE GYIB
-+<UAE26>     /x82/x38/x88/x35 HANGUL SYLLABLE GYIBS
-+<UAE27>     /x82/x38/x88/x36 HANGUL SYLLABLE GYIS
-+<UAE28>     /x82/x38/x88/x37 HANGUL SYLLABLE GYISS
-+<UAE29>     /x82/x38/x88/x38 HANGUL SYLLABLE GYING
-+<UAE2A>     /x82/x38/x88/x39 HANGUL SYLLABLE GYIJ
-+<UAE2B>     /x82/x38/x89/x30 HANGUL SYLLABLE GYIC
-+<UAE2C>     /x82/x38/x89/x31 HANGUL SYLLABLE GYIK
-+<UAE2D>     /x82/x38/x89/x32 HANGUL SYLLABLE GYIT
-+<UAE2E>     /x82/x38/x89/x33 HANGUL SYLLABLE GYIP
-+<UAE2F>     /x82/x38/x89/x34 HANGUL SYLLABLE GYIH
-+<UAE30>     /x82/x38/x89/x35 HANGUL SYLLABLE GI
-+<UAE31>     /x82/x38/x89/x36 HANGUL SYLLABLE GIG
-+<UAE32>     /x82/x38/x89/x37 HANGUL SYLLABLE GIGG
-+<UAE33>     /x82/x38/x89/x38 HANGUL SYLLABLE GIGS
-+<UAE34>     /x82/x38/x89/x39 HANGUL SYLLABLE GIN
-+<UAE35>     /x82/x38/x8a/x30 HANGUL SYLLABLE GINI
-+<UAE36>     /x82/x38/x8a/x31 HANGUL SYLLABLE GINH
-+<UAE37>     /x82/x38/x8a/x32 HANGUL SYLLABLE GID
-+<UAE38>     /x82/x38/x8a/x33 HANGUL SYLLABLE GIL
-+<UAE39>     /x82/x38/x8a/x34 HANGUL SYLLABLE GILG
-+<UAE3A>     /x82/x38/x8a/x35 HANGUL SYLLABLE GILM
-+<UAE3B>     /x82/x38/x8a/x36 HANGUL SYLLABLE GILB
-+<UAE3C>     /x82/x38/x8a/x37 HANGUL SYLLABLE GILS
-+<UAE3D>     /x82/x38/x8a/x38 HANGUL SYLLABLE GILT
-+<UAE3E>     /x82/x38/x8a/x39 HANGUL SYLLABLE GILP
-+<UAE3F>     /x82/x38/x8b/x30 HANGUL SYLLABLE GILH
-+<UAE40>     /x82/x38/x8b/x31 HANGUL SYLLABLE GIM
-+<UAE41>     /x82/x38/x8b/x32 HANGUL SYLLABLE GIB
-+<UAE42>     /x82/x38/x8b/x33 HANGUL SYLLABLE GIBS
-+<UAE43>     /x82/x38/x8b/x34 HANGUL SYLLABLE GIS
-+<UAE44>     /x82/x38/x8b/x35 HANGUL SYLLABLE GISS
-+<UAE45>     /x82/x38/x8b/x36 HANGUL SYLLABLE GING
-+<UAE46>     /x82/x38/x8b/x37 HANGUL SYLLABLE GIJ
-+<UAE47>     /x82/x38/x8b/x38 HANGUL SYLLABLE GIC
-+<UAE48>     /x82/x38/x8b/x39 HANGUL SYLLABLE GIK
-+<UAE49>     /x82/x38/x8c/x30 HANGUL SYLLABLE GIT
-+<UAE4A>     /x82/x38/x8c/x31 HANGUL SYLLABLE GIP
-+<UAE4B>     /x82/x38/x8c/x32 HANGUL SYLLABLE GIH
-+<UAE4C>     /x82/x38/x8c/x33 HANGUL SYLLABLE GGA
-+<UAE4D>     /x82/x38/x8c/x34 HANGUL SYLLABLE GGAG
-+<UAE4E>     /x82/x38/x8c/x35 HANGUL SYLLABLE GGAGG
-+<UAE4F>     /x82/x38/x8c/x36 HANGUL SYLLABLE GGAGS
-+<UAE50>     /x82/x38/x8c/x37 HANGUL SYLLABLE GGAN
-+<UAE51>     /x82/x38/x8c/x38 HANGUL SYLLABLE GGANI
-+<UAE52>     /x82/x38/x8c/x39 HANGUL SYLLABLE GGANH
-+<UAE53>     /x82/x38/x8d/x30 HANGUL SYLLABLE GGAD
-+<UAE54>     /x82/x38/x8d/x31 HANGUL SYLLABLE GGAL
-+<UAE55>     /x82/x38/x8d/x32 HANGUL SYLLABLE GGALG
-+<UAE56>     /x82/x38/x8d/x33 HANGUL SYLLABLE GGALM
-+<UAE57>     /x82/x38/x8d/x34 HANGUL SYLLABLE GGALB
-+<UAE58>     /x82/x38/x8d/x35 HANGUL SYLLABLE GGALS
-+<UAE59>     /x82/x38/x8d/x36 HANGUL SYLLABLE GGALT
-+<UAE5A>     /x82/x38/x8d/x37 HANGUL SYLLABLE GGALP
-+<UAE5B>     /x82/x38/x8d/x38 HANGUL SYLLABLE GGALH
-+<UAE5C>     /x82/x38/x8d/x39 HANGUL SYLLABLE GGAM
-+<UAE5D>     /x82/x38/x8e/x30 HANGUL SYLLABLE GGAB
-+<UAE5E>     /x82/x38/x8e/x31 HANGUL SYLLABLE GGABS
-+<UAE5F>     /x82/x38/x8e/x32 HANGUL SYLLABLE GGAS
-+<UAE60>     /x82/x38/x8e/x33 HANGUL SYLLABLE GGASS
-+<UAE61>     /x82/x38/x8e/x34 HANGUL SYLLABLE GGANG
-+<UAE62>     /x82/x38/x8e/x35 HANGUL SYLLABLE GGAJ
-+<UAE63>     /x82/x38/x8e/x36 HANGUL SYLLABLE GGAC
-+<UAE64>     /x82/x38/x8e/x37 HANGUL SYLLABLE GGAK
-+<UAE65>     /x82/x38/x8e/x38 HANGUL SYLLABLE GGAT
-+<UAE66>     /x82/x38/x8e/x39 HANGUL SYLLABLE GGAP
-+<UAE67>     /x82/x38/x8f/x30 HANGUL SYLLABLE GGAH
-+<UAE68>     /x82/x38/x8f/x31 HANGUL SYLLABLE GGAE
-+<UAE69>     /x82/x38/x8f/x32 HANGUL SYLLABLE GGAEG
-+<UAE6A>     /x82/x38/x8f/x33 HANGUL SYLLABLE GGAEGG
-+<UAE6B>     /x82/x38/x8f/x34 HANGUL SYLLABLE GGAEGS
-+<UAE6C>     /x82/x38/x8f/x35 HANGUL SYLLABLE GGAEN
-+<UAE6D>     /x82/x38/x8f/x36 HANGUL SYLLABLE GGAENI
-+<UAE6E>     /x82/x38/x8f/x37 HANGUL SYLLABLE GGAENH
-+<UAE6F>     /x82/x38/x8f/x38 HANGUL SYLLABLE GGAED
-+<UAE70>     /x82/x38/x8f/x39 HANGUL SYLLABLE GGAEL
-+<UAE71>     /x82/x38/x90/x30 HANGUL SYLLABLE GGAELG
-+<UAE72>     /x82/x38/x90/x31 HANGUL SYLLABLE GGAELM
-+<UAE73>     /x82/x38/x90/x32 HANGUL SYLLABLE GGAELB
-+<UAE74>     /x82/x38/x90/x33 HANGUL SYLLABLE GGAELS
-+<UAE75>     /x82/x38/x90/x34 HANGUL SYLLABLE GGAELT
-+<UAE76>     /x82/x38/x90/x35 HANGUL SYLLABLE GGAELP
-+<UAE77>     /x82/x38/x90/x36 HANGUL SYLLABLE GGAELH
-+<UAE78>     /x82/x38/x90/x37 HANGUL SYLLABLE GGAEM
-+<UAE79>     /x82/x38/x90/x38 HANGUL SYLLABLE GGAEB
-+<UAE7A>     /x82/x38/x90/x39 HANGUL SYLLABLE GGAEBS
-+<UAE7B>     /x82/x38/x91/x30 HANGUL SYLLABLE GGAES
-+<UAE7C>     /x82/x38/x91/x31 HANGUL SYLLABLE GGAESS
-+<UAE7D>     /x82/x38/x91/x32 HANGUL SYLLABLE GGAENG
-+<UAE7E>     /x82/x38/x91/x33 HANGUL SYLLABLE GGAEJ
-+<UAE7F>     /x82/x38/x91/x34 HANGUL SYLLABLE GGAEC
-+<UAE80>     /x82/x38/x91/x35 HANGUL SYLLABLE GGAEK
-+<UAE81>     /x82/x38/x91/x36 HANGUL SYLLABLE GGAET
-+<UAE82>     /x82/x38/x91/x37 HANGUL SYLLABLE GGAEP
-+<UAE83>     /x82/x38/x91/x38 HANGUL SYLLABLE GGAEH
-+<UAE84>     /x82/x38/x91/x39 HANGUL SYLLABLE GGYA
-+<UAE85>     /x82/x38/x92/x30 HANGUL SYLLABLE GGYAG
-+<UAE86>     /x82/x38/x92/x31 HANGUL SYLLABLE GGYAGG
-+<UAE87>     /x82/x38/x92/x32 HANGUL SYLLABLE GGYAGS
-+<UAE88>     /x82/x38/x92/x33 HANGUL SYLLABLE GGYAN
-+<UAE89>     /x82/x38/x92/x34 HANGUL SYLLABLE GGYANI
-+<UAE8A>     /x82/x38/x92/x35 HANGUL SYLLABLE GGYANH
-+<UAE8B>     /x82/x38/x92/x36 HANGUL SYLLABLE GGYAD
-+<UAE8C>     /x82/x38/x92/x37 HANGUL SYLLABLE GGYAL
-+<UAE8D>     /x82/x38/x92/x38 HANGUL SYLLABLE GGYALG
-+<UAE8E>     /x82/x38/x92/x39 HANGUL SYLLABLE GGYALM
-+<UAE8F>     /x82/x38/x93/x30 HANGUL SYLLABLE GGYALB
-+<UAE90>     /x82/x38/x93/x31 HANGUL SYLLABLE GGYALS
-+<UAE91>     /x82/x38/x93/x32 HANGUL SYLLABLE GGYALT
-+<UAE92>     /x82/x38/x93/x33 HANGUL SYLLABLE GGYALP
-+<UAE93>     /x82/x38/x93/x34 HANGUL SYLLABLE GGYALH
-+<UAE94>     /x82/x38/x93/x35 HANGUL SYLLABLE GGYAM
-+<UAE95>     /x82/x38/x93/x36 HANGUL SYLLABLE GGYAB
-+<UAE96>     /x82/x38/x93/x37 HANGUL SYLLABLE GGYABS
-+<UAE97>     /x82/x38/x93/x38 HANGUL SYLLABLE GGYAS
-+<UAE98>     /x82/x38/x93/x39 HANGUL SYLLABLE GGYASS
-+<UAE99>     /x82/x38/x94/x30 HANGUL SYLLABLE GGYANG
-+<UAE9A>     /x82/x38/x94/x31 HANGUL SYLLABLE GGYAJ
-+<UAE9B>     /x82/x38/x94/x32 HANGUL SYLLABLE GGYAC
-+<UAE9C>     /x82/x38/x94/x33 HANGUL SYLLABLE GGYAK
-+<UAE9D>     /x82/x38/x94/x34 HANGUL SYLLABLE GGYAT
-+<UAE9E>     /x82/x38/x94/x35 HANGUL SYLLABLE GGYAP
-+<UAE9F>     /x82/x38/x94/x36 HANGUL SYLLABLE GGYAH
-+<UAEA0>     /x82/x38/x94/x37 HANGUL SYLLABLE GGYAE
-+<UAEA1>     /x82/x38/x94/x38 HANGUL SYLLABLE GGYAEG
-+<UAEA2>     /x82/x38/x94/x39 HANGUL SYLLABLE GGYAEGG
-+<UAEA3>     /x82/x38/x95/x30 HANGUL SYLLABLE GGYAEGS
-+<UAEA4>     /x82/x38/x95/x31 HANGUL SYLLABLE GGYAEN
-+<UAEA5>     /x82/x38/x95/x32 HANGUL SYLLABLE GGYAENI
-+<UAEA6>     /x82/x38/x95/x33 HANGUL SYLLABLE GGYAENH
-+<UAEA7>     /x82/x38/x95/x34 HANGUL SYLLABLE GGYAED
-+<UAEA8>     /x82/x38/x95/x35 HANGUL SYLLABLE GGYAEL
-+<UAEA9>     /x82/x38/x95/x36 HANGUL SYLLABLE GGYAELG
-+<UAEAA>     /x82/x38/x95/x37 HANGUL SYLLABLE GGYAELM
-+<UAEAB>     /x82/x38/x95/x38 HANGUL SYLLABLE GGYAELB
-+<UAEAC>     /x82/x38/x95/x39 HANGUL SYLLABLE GGYAELS
-+<UAEAD>     /x82/x38/x96/x30 HANGUL SYLLABLE GGYAELT
-+<UAEAE>     /x82/x38/x96/x31 HANGUL SYLLABLE GGYAELP
-+<UAEAF>     /x82/x38/x96/x32 HANGUL SYLLABLE GGYAELH
-+<UAEB0>     /x82/x38/x96/x33 HANGUL SYLLABLE GGYAEM
-+<UAEB1>     /x82/x38/x96/x34 HANGUL SYLLABLE GGYAEB
-+<UAEB2>     /x82/x38/x96/x35 HANGUL SYLLABLE GGYAEBS
-+<UAEB3>     /x82/x38/x96/x36 HANGUL SYLLABLE GGYAES
-+<UAEB4>     /x82/x38/x96/x37 HANGUL SYLLABLE GGYAESS
-+<UAEB5>     /x82/x38/x96/x38 HANGUL SYLLABLE GGYAENG
-+<UAEB6>     /x82/x38/x96/x39 HANGUL SYLLABLE GGYAEJ
-+<UAEB7>     /x82/x38/x97/x30 HANGUL SYLLABLE GGYAEC
-+<UAEB8>     /x82/x38/x97/x31 HANGUL SYLLABLE GGYAEK
-+<UAEB9>     /x82/x38/x97/x32 HANGUL SYLLABLE GGYAET
-+<UAEBA>     /x82/x38/x97/x33 HANGUL SYLLABLE GGYAEP
-+<UAEBB>     /x82/x38/x97/x34 HANGUL SYLLABLE GGYAEH
-+<UAEBC>     /x82/x38/x97/x35 HANGUL SYLLABLE GGEO
-+<UAEBD>     /x82/x38/x97/x36 HANGUL SYLLABLE GGEOG
-+<UAEBE>     /x82/x38/x97/x37 HANGUL SYLLABLE GGEOGG
-+<UAEBF>     /x82/x38/x97/x38 HANGUL SYLLABLE GGEOGS
-+<UAEC0>     /x82/x38/x97/x39 HANGUL SYLLABLE GGEON
-+<UAEC1>     /x82/x38/x98/x30 HANGUL SYLLABLE GGEONI
-+<UAEC2>     /x82/x38/x98/x31 HANGUL SYLLABLE GGEONH
-+<UAEC3>     /x82/x38/x98/x32 HANGUL SYLLABLE GGEOD
-+<UAEC4>     /x82/x38/x98/x33 HANGUL SYLLABLE GGEOL
-+<UAEC5>     /x82/x38/x98/x34 HANGUL SYLLABLE GGEOLG
-+<UAEC6>     /x82/x38/x98/x35 HANGUL SYLLABLE GGEOLM
-+<UAEC7>     /x82/x38/x98/x36 HANGUL SYLLABLE GGEOLB
-+<UAEC8>     /x82/x38/x98/x37 HANGUL SYLLABLE GGEOLS
-+<UAEC9>     /x82/x38/x98/x38 HANGUL SYLLABLE GGEOLT
-+<UAECA>     /x82/x38/x98/x39 HANGUL SYLLABLE GGEOLP
-+<UAECB>     /x82/x38/x99/x30 HANGUL SYLLABLE GGEOLH
-+<UAECC>     /x82/x38/x99/x31 HANGUL SYLLABLE GGEOM
-+<UAECD>     /x82/x38/x99/x32 HANGUL SYLLABLE GGEOB
-+<UAECE>     /x82/x38/x99/x33 HANGUL SYLLABLE GGEOBS
-+<UAECF>     /x82/x38/x99/x34 HANGUL SYLLABLE GGEOS
-+<UAED0>     /x82/x38/x99/x35 HANGUL SYLLABLE GGEOSS
-+<UAED1>     /x82/x38/x99/x36 HANGUL SYLLABLE GGEONG
-+<UAED2>     /x82/x38/x99/x37 HANGUL SYLLABLE GGEOJ
-+<UAED3>     /x82/x38/x99/x38 HANGUL SYLLABLE GGEOC
-+<UAED4>     /x82/x38/x99/x39 HANGUL SYLLABLE GGEOK
-+<UAED5>     /x82/x38/x9a/x30 HANGUL SYLLABLE GGEOT
-+<UAED6>     /x82/x38/x9a/x31 HANGUL SYLLABLE GGEOP
-+<UAED7>     /x82/x38/x9a/x32 HANGUL SYLLABLE GGEOH
-+<UAED8>     /x82/x38/x9a/x33 HANGUL SYLLABLE GGE
-+<UAED9>     /x82/x38/x9a/x34 HANGUL SYLLABLE GGEG
-+<UAEDA>     /x82/x38/x9a/x35 HANGUL SYLLABLE GGEGG
-+<UAEDB>     /x82/x38/x9a/x36 HANGUL SYLLABLE GGEGS
-+<UAEDC>     /x82/x38/x9a/x37 HANGUL SYLLABLE GGEN
-+<UAEDD>     /x82/x38/x9a/x38 HANGUL SYLLABLE GGENI
-+<UAEDE>     /x82/x38/x9a/x39 HANGUL SYLLABLE GGENH
-+<UAEDF>     /x82/x38/x9b/x30 HANGUL SYLLABLE GGED
-+<UAEE0>     /x82/x38/x9b/x31 HANGUL SYLLABLE GGEL
-+<UAEE1>     /x82/x38/x9b/x32 HANGUL SYLLABLE GGELG
-+<UAEE2>     /x82/x38/x9b/x33 HANGUL SYLLABLE GGELM
-+<UAEE3>     /x82/x38/x9b/x34 HANGUL SYLLABLE GGELB
-+<UAEE4>     /x82/x38/x9b/x35 HANGUL SYLLABLE GGELS
-+<UAEE5>     /x82/x38/x9b/x36 HANGUL SYLLABLE GGELT
-+<UAEE6>     /x82/x38/x9b/x37 HANGUL SYLLABLE GGELP
-+<UAEE7>     /x82/x38/x9b/x38 HANGUL SYLLABLE GGELH
-+<UAEE8>     /x82/x38/x9b/x39 HANGUL SYLLABLE GGEM
-+<UAEE9>     /x82/x38/x9c/x30 HANGUL SYLLABLE GGEB
-+<UAEEA>     /x82/x38/x9c/x31 HANGUL SYLLABLE GGEBS
-+<UAEEB>     /x82/x38/x9c/x32 HANGUL SYLLABLE GGES
-+<UAEEC>     /x82/x38/x9c/x33 HANGUL SYLLABLE GGESS
-+<UAEED>     /x82/x38/x9c/x34 HANGUL SYLLABLE GGENG
-+<UAEEE>     /x82/x38/x9c/x35 HANGUL SYLLABLE GGEJ
-+<UAEEF>     /x82/x38/x9c/x36 HANGUL SYLLABLE GGEC
-+<UAEF0>     /x82/x38/x9c/x37 HANGUL SYLLABLE GGEK
-+<UAEF1>     /x82/x38/x9c/x38 HANGUL SYLLABLE GGET
-+<UAEF2>     /x82/x38/x9c/x39 HANGUL SYLLABLE GGEP
-+<UAEF3>     /x82/x38/x9d/x30 HANGUL SYLLABLE GGEH
-+<UAEF4>     /x82/x38/x9d/x31 HANGUL SYLLABLE GGYEO
-+<UAEF5>     /x82/x38/x9d/x32 HANGUL SYLLABLE GGYEOG
-+<UAEF6>     /x82/x38/x9d/x33 HANGUL SYLLABLE GGYEOGG
-+<UAEF7>     /x82/x38/x9d/x34 HANGUL SYLLABLE GGYEOGS
-+<UAEF8>     /x82/x38/x9d/x35 HANGUL SYLLABLE GGYEON
-+<UAEF9>     /x82/x38/x9d/x36 HANGUL SYLLABLE GGYEONI
-+<UAEFA>     /x82/x38/x9d/x37 HANGUL SYLLABLE GGYEONH
-+<UAEFB>     /x82/x38/x9d/x38 HANGUL SYLLABLE GGYEOD
-+<UAEFC>     /x82/x38/x9d/x39 HANGUL SYLLABLE GGYEOL
-+<UAEFD>     /x82/x38/x9e/x30 HANGUL SYLLABLE GGYEOLG
-+<UAEFE>     /x82/x38/x9e/x31 HANGUL SYLLABLE GGYEOLM
-+<UAEFF>     /x82/x38/x9e/x32 HANGUL SYLLABLE GGYEOLB
-+<UAF00>     /x82/x38/x9e/x33 HANGUL SYLLABLE GGYEOLS
-+<UAF01>     /x82/x38/x9e/x34 HANGUL SYLLABLE GGYEOLT
-+<UAF02>     /x82/x38/x9e/x35 HANGUL SYLLABLE GGYEOLP
-+<UAF03>     /x82/x38/x9e/x36 HANGUL SYLLABLE GGYEOLH
-+<UAF04>     /x82/x38/x9e/x37 HANGUL SYLLABLE GGYEOM
-+<UAF05>     /x82/x38/x9e/x38 HANGUL SYLLABLE GGYEOB
-+<UAF06>     /x82/x38/x9e/x39 HANGUL SYLLABLE GGYEOBS
-+<UAF07>     /x82/x38/x9f/x30 HANGUL SYLLABLE GGYEOS
-+<UAF08>     /x82/x38/x9f/x31 HANGUL SYLLABLE GGYEOSS
-+<UAF09>     /x82/x38/x9f/x32 HANGUL SYLLABLE GGYEONG
-+<UAF0A>     /x82/x38/x9f/x33 HANGUL SYLLABLE GGYEOJ
-+<UAF0B>     /x82/x38/x9f/x34 HANGUL SYLLABLE GGYEOC
-+<UAF0C>     /x82/x38/x9f/x35 HANGUL SYLLABLE GGYEOK
-+<UAF0D>     /x82/x38/x9f/x36 HANGUL SYLLABLE GGYEOT
-+<UAF0E>     /x82/x38/x9f/x37 HANGUL SYLLABLE GGYEOP
-+<UAF0F>     /x82/x38/x9f/x38 HANGUL SYLLABLE GGYEOH
-+<UAF10>     /x82/x38/x9f/x39 HANGUL SYLLABLE GGYE
-+<UAF11>     /x82/x38/xa0/x30 HANGUL SYLLABLE GGYEG
-+<UAF12>     /x82/x38/xa0/x31 HANGUL SYLLABLE GGYEGG
-+<UAF13>     /x82/x38/xa0/x32 HANGUL SYLLABLE GGYEGS
-+<UAF14>     /x82/x38/xa0/x33 HANGUL SYLLABLE GGYEN
-+<UAF15>     /x82/x38/xa0/x34 HANGUL SYLLABLE GGYENI
-+<UAF16>     /x82/x38/xa0/x35 HANGUL SYLLABLE GGYENH
-+<UAF17>     /x82/x38/xa0/x36 HANGUL SYLLABLE GGYED
-+<UAF18>     /x82/x38/xa0/x37 HANGUL SYLLABLE GGYEL
-+<UAF19>     /x82/x38/xa0/x38 HANGUL SYLLABLE GGYELG
-+<UAF1A>     /x82/x38/xa0/x39 HANGUL SYLLABLE GGYELM
-+<UAF1B>     /x82/x38/xa1/x30 HANGUL SYLLABLE GGYELB
-+<UAF1C>     /x82/x38/xa1/x31 HANGUL SYLLABLE GGYELS
-+<UAF1D>     /x82/x38/xa1/x32 HANGUL SYLLABLE GGYELT
-+<UAF1E>     /x82/x38/xa1/x33 HANGUL SYLLABLE GGYELP
-+<UAF1F>     /x82/x38/xa1/x34 HANGUL SYLLABLE GGYELH
-+<UAF20>     /x82/x38/xa1/x35 HANGUL SYLLABLE GGYEM
-+<UAF21>     /x82/x38/xa1/x36 HANGUL SYLLABLE GGYEB
-+<UAF22>     /x82/x38/xa1/x37 HANGUL SYLLABLE GGYEBS
-+<UAF23>     /x82/x38/xa1/x38 HANGUL SYLLABLE GGYES
-+<UAF24>     /x82/x38/xa1/x39 HANGUL SYLLABLE GGYESS
-+<UAF25>     /x82/x38/xa2/x30 HANGUL SYLLABLE GGYENG
-+<UAF26>     /x82/x38/xa2/x31 HANGUL SYLLABLE GGYEJ
-+<UAF27>     /x82/x38/xa2/x32 HANGUL SYLLABLE GGYEC
-+<UAF28>     /x82/x38/xa2/x33 HANGUL SYLLABLE GGYEK
-+<UAF29>     /x82/x38/xa2/x34 HANGUL SYLLABLE GGYET
-+<UAF2A>     /x82/x38/xa2/x35 HANGUL SYLLABLE GGYEP
-+<UAF2B>     /x82/x38/xa2/x36 HANGUL SYLLABLE GGYEH
-+<UAF2C>     /x82/x38/xa2/x37 HANGUL SYLLABLE GGO
-+<UAF2D>     /x82/x38/xa2/x38 HANGUL SYLLABLE GGOG
-+<UAF2E>     /x82/x38/xa2/x39 HANGUL SYLLABLE GGOGG
-+<UAF2F>     /x82/x38/xa3/x30 HANGUL SYLLABLE GGOGS
-+<UAF30>     /x82/x38/xa3/x31 HANGUL SYLLABLE GGON
-+<UAF31>     /x82/x38/xa3/x32 HANGUL SYLLABLE GGONI
-+<UAF32>     /x82/x38/xa3/x33 HANGUL SYLLABLE GGONH
-+<UAF33>     /x82/x38/xa3/x34 HANGUL SYLLABLE GGOD
-+<UAF34>     /x82/x38/xa3/x35 HANGUL SYLLABLE GGOL
-+<UAF35>     /x82/x38/xa3/x36 HANGUL SYLLABLE GGOLG
-+<UAF36>     /x82/x38/xa3/x37 HANGUL SYLLABLE GGOLM
-+<UAF37>     /x82/x38/xa3/x38 HANGUL SYLLABLE GGOLB
-+<UAF38>     /x82/x38/xa3/x39 HANGUL SYLLABLE GGOLS
-+<UAF39>     /x82/x38/xa4/x30 HANGUL SYLLABLE GGOLT
-+<UAF3A>     /x82/x38/xa4/x31 HANGUL SYLLABLE GGOLP
-+<UAF3B>     /x82/x38/xa4/x32 HANGUL SYLLABLE GGOLH
-+<UAF3C>     /x82/x38/xa4/x33 HANGUL SYLLABLE GGOM
-+<UAF3D>     /x82/x38/xa4/x34 HANGUL SYLLABLE GGOB
-+<UAF3E>     /x82/x38/xa4/x35 HANGUL SYLLABLE GGOBS
-+<UAF3F>     /x82/x38/xa4/x36 HANGUL SYLLABLE GGOS
-+<UAF40>     /x82/x38/xa4/x37 HANGUL SYLLABLE GGOSS
-+<UAF41>     /x82/x38/xa4/x38 HANGUL SYLLABLE GGONG
-+<UAF42>     /x82/x38/xa4/x39 HANGUL SYLLABLE GGOJ
-+<UAF43>     /x82/x38/xa5/x30 HANGUL SYLLABLE GGOC
-+<UAF44>     /x82/x38/xa5/x31 HANGUL SYLLABLE GGOK
-+<UAF45>     /x82/x38/xa5/x32 HANGUL SYLLABLE GGOT
-+<UAF46>     /x82/x38/xa5/x33 HANGUL SYLLABLE GGOP
-+<UAF47>     /x82/x38/xa5/x34 HANGUL SYLLABLE GGOH
-+<UAF48>     /x82/x38/xa5/x35 HANGUL SYLLABLE GGWA
-+<UAF49>     /x82/x38/xa5/x36 HANGUL SYLLABLE GGWAG
-+<UAF4A>     /x82/x38/xa5/x37 HANGUL SYLLABLE GGWAGG
-+<UAF4B>     /x82/x38/xa5/x38 HANGUL SYLLABLE GGWAGS
-+<UAF4C>     /x82/x38/xa5/x39 HANGUL SYLLABLE GGWAN
-+<UAF4D>     /x82/x38/xa6/x30 HANGUL SYLLABLE GGWANI
-+<UAF4E>     /x82/x38/xa6/x31 HANGUL SYLLABLE GGWANH
-+<UAF4F>     /x82/x38/xa6/x32 HANGUL SYLLABLE GGWAD
-+<UAF50>     /x82/x38/xa6/x33 HANGUL SYLLABLE GGWAL
-+<UAF51>     /x82/x38/xa6/x34 HANGUL SYLLABLE GGWALG
-+<UAF52>     /x82/x38/xa6/x35 HANGUL SYLLABLE GGWALM
-+<UAF53>     /x82/x38/xa6/x36 HANGUL SYLLABLE GGWALB
-+<UAF54>     /x82/x38/xa6/x37 HANGUL SYLLABLE GGWALS
-+<UAF55>     /x82/x38/xa6/x38 HANGUL SYLLABLE GGWALT
-+<UAF56>     /x82/x38/xa6/x39 HANGUL SYLLABLE GGWALP
-+<UAF57>     /x82/x38/xa7/x30 HANGUL SYLLABLE GGWALH
-+<UAF58>     /x82/x38/xa7/x31 HANGUL SYLLABLE GGWAM
-+<UAF59>     /x82/x38/xa7/x32 HANGUL SYLLABLE GGWAB
-+<UAF5A>     /x82/x38/xa7/x33 HANGUL SYLLABLE GGWABS
-+<UAF5B>     /x82/x38/xa7/x34 HANGUL SYLLABLE GGWAS
-+<UAF5C>     /x82/x38/xa7/x35 HANGUL SYLLABLE GGWASS
-+<UAF5D>     /x82/x38/xa7/x36 HANGUL SYLLABLE GGWANG
-+<UAF5E>     /x82/x38/xa7/x37 HANGUL SYLLABLE GGWAJ
-+<UAF5F>     /x82/x38/xa7/x38 HANGUL SYLLABLE GGWAC
-+<UAF60>     /x82/x38/xa7/x39 HANGUL SYLLABLE GGWAK
-+<UAF61>     /x82/x38/xa8/x30 HANGUL SYLLABLE GGWAT
-+<UAF62>     /x82/x38/xa8/x31 HANGUL SYLLABLE GGWAP
-+<UAF63>     /x82/x38/xa8/x32 HANGUL SYLLABLE GGWAH
-+<UAF64>     /x82/x38/xa8/x33 HANGUL SYLLABLE GGWAE
-+<UAF65>     /x82/x38/xa8/x34 HANGUL SYLLABLE GGWAEG
-+<UAF66>     /x82/x38/xa8/x35 HANGUL SYLLABLE GGWAEGG
-+<UAF67>     /x82/x38/xa8/x36 HANGUL SYLLABLE GGWAEGS
-+<UAF68>     /x82/x38/xa8/x37 HANGUL SYLLABLE GGWAEN
-+<UAF69>     /x82/x38/xa8/x38 HANGUL SYLLABLE GGWAENI
-+<UAF6A>     /x82/x38/xa8/x39 HANGUL SYLLABLE GGWAENH
-+<UAF6B>     /x82/x38/xa9/x30 HANGUL SYLLABLE GGWAED
-+<UAF6C>     /x82/x38/xa9/x31 HANGUL SYLLABLE GGWAEL
-+<UAF6D>     /x82/x38/xa9/x32 HANGUL SYLLABLE GGWAELG
-+<UAF6E>     /x82/x38/xa9/x33 HANGUL SYLLABLE GGWAELM
-+<UAF6F>     /x82/x38/xa9/x34 HANGUL SYLLABLE GGWAELB
-+<UAF70>     /x82/x38/xa9/x35 HANGUL SYLLABLE GGWAELS
-+<UAF71>     /x82/x38/xa9/x36 HANGUL SYLLABLE GGWAELT
-+<UAF72>     /x82/x38/xa9/x37 HANGUL SYLLABLE GGWAELP
-+<UAF73>     /x82/x38/xa9/x38 HANGUL SYLLABLE GGWAELH
-+<UAF74>     /x82/x38/xa9/x39 HANGUL SYLLABLE GGWAEM
-+<UAF75>     /x82/x38/xaa/x30 HANGUL SYLLABLE GGWAEB
-+<UAF76>     /x82/x38/xaa/x31 HANGUL SYLLABLE GGWAEBS
-+<UAF77>     /x82/x38/xaa/x32 HANGUL SYLLABLE GGWAES
-+<UAF78>     /x82/x38/xaa/x33 HANGUL SYLLABLE GGWAESS
-+<UAF79>     /x82/x38/xaa/x34 HANGUL SYLLABLE GGWAENG
-+<UAF7A>     /x82/x38/xaa/x35 HANGUL SYLLABLE GGWAEJ
-+<UAF7B>     /x82/x38/xaa/x36 HANGUL SYLLABLE GGWAEC
-+<UAF7C>     /x82/x38/xaa/x37 HANGUL SYLLABLE GGWAEK
-+<UAF7D>     /x82/x38/xaa/x38 HANGUL SYLLABLE GGWAET
-+<UAF7E>     /x82/x38/xaa/x39 HANGUL SYLLABLE GGWAEP
-+<UAF7F>     /x82/x38/xab/x30 HANGUL SYLLABLE GGWAEH
-+<UAF80>     /x82/x38/xab/x31 HANGUL SYLLABLE GGOE
-+<UAF81>     /x82/x38/xab/x32 HANGUL SYLLABLE GGOEG
-+<UAF82>     /x82/x38/xab/x33 HANGUL SYLLABLE GGOEGG
-+<UAF83>     /x82/x38/xab/x34 HANGUL SYLLABLE GGOEGS
-+<UAF84>     /x82/x38/xab/x35 HANGUL SYLLABLE GGOEN
-+<UAF85>     /x82/x38/xab/x36 HANGUL SYLLABLE GGOENI
-+<UAF86>     /x82/x38/xab/x37 HANGUL SYLLABLE GGOENH
-+<UAF87>     /x82/x38/xab/x38 HANGUL SYLLABLE GGOED
-+<UAF88>     /x82/x38/xab/x39 HANGUL SYLLABLE GGOEL
-+<UAF89>     /x82/x38/xac/x30 HANGUL SYLLABLE GGOELG
-+<UAF8A>     /x82/x38/xac/x31 HANGUL SYLLABLE GGOELM
-+<UAF8B>     /x82/x38/xac/x32 HANGUL SYLLABLE GGOELB
-+<UAF8C>     /x82/x38/xac/x33 HANGUL SYLLABLE GGOELS
-+<UAF8D>     /x82/x38/xac/x34 HANGUL SYLLABLE GGOELT
-+<UAF8E>     /x82/x38/xac/x35 HANGUL SYLLABLE GGOELP
-+<UAF8F>     /x82/x38/xac/x36 HANGUL SYLLABLE GGOELH
-+<UAF90>     /x82/x38/xac/x37 HANGUL SYLLABLE GGOEM
-+<UAF91>     /x82/x38/xac/x38 HANGUL SYLLABLE GGOEB
-+<UAF92>     /x82/x38/xac/x39 HANGUL SYLLABLE GGOEBS
-+<UAF93>     /x82/x38/xad/x30 HANGUL SYLLABLE GGOES
-+<UAF94>     /x82/x38/xad/x31 HANGUL SYLLABLE GGOESS
-+<UAF95>     /x82/x38/xad/x32 HANGUL SYLLABLE GGOENG
-+<UAF96>     /x82/x38/xad/x33 HANGUL SYLLABLE GGOEJ
-+<UAF97>     /x82/x38/xad/x34 HANGUL SYLLABLE GGOEC
-+<UAF98>     /x82/x38/xad/x35 HANGUL SYLLABLE GGOEK
-+<UAF99>     /x82/x38/xad/x36 HANGUL SYLLABLE GGOET
-+<UAF9A>     /x82/x38/xad/x37 HANGUL SYLLABLE GGOEP
-+<UAF9B>     /x82/x38/xad/x38 HANGUL SYLLABLE GGOEH
-+<UAF9C>     /x82/x38/xad/x39 HANGUL SYLLABLE GGYO
-+<UAF9D>     /x82/x38/xae/x30 HANGUL SYLLABLE GGYOG
-+<UAF9E>     /x82/x38/xae/x31 HANGUL SYLLABLE GGYOGG
-+<UAF9F>     /x82/x38/xae/x32 HANGUL SYLLABLE GGYOGS
-+<UAFA0>     /x82/x38/xae/x33 HANGUL SYLLABLE GGYON
-+<UAFA1>     /x82/x38/xae/x34 HANGUL SYLLABLE GGYONI
-+<UAFA2>     /x82/x38/xae/x35 HANGUL SYLLABLE GGYONH
-+<UAFA3>     /x82/x38/xae/x36 HANGUL SYLLABLE GGYOD
-+<UAFA4>     /x82/x38/xae/x37 HANGUL SYLLABLE GGYOL
-+<UAFA5>     /x82/x38/xae/x38 HANGUL SYLLABLE GGYOLG
-+<UAFA6>     /x82/x38/xae/x39 HANGUL SYLLABLE GGYOLM
-+<UAFA7>     /x82/x38/xaf/x30 HANGUL SYLLABLE GGYOLB
-+<UAFA8>     /x82/x38/xaf/x31 HANGUL SYLLABLE GGYOLS
-+<UAFA9>     /x82/x38/xaf/x32 HANGUL SYLLABLE GGYOLT
-+<UAFAA>     /x82/x38/xaf/x33 HANGUL SYLLABLE GGYOLP
-+<UAFAB>     /x82/x38/xaf/x34 HANGUL SYLLABLE GGYOLH
-+<UAFAC>     /x82/x38/xaf/x35 HANGUL SYLLABLE GGYOM
-+<UAFAD>     /x82/x38/xaf/x36 HANGUL SYLLABLE GGYOB
-+<UAFAE>     /x82/x38/xaf/x37 HANGUL SYLLABLE GGYOBS
-+<UAFAF>     /x82/x38/xaf/x38 HANGUL SYLLABLE GGYOS
-+<UAFB0>     /x82/x38/xaf/x39 HANGUL SYLLABLE GGYOSS
-+<UAFB1>     /x82/x38/xb0/x30 HANGUL SYLLABLE GGYONG
-+<UAFB2>     /x82/x38/xb0/x31 HANGUL SYLLABLE GGYOJ
-+<UAFB3>     /x82/x38/xb0/x32 HANGUL SYLLABLE GGYOC
-+<UAFB4>     /x82/x38/xb0/x33 HANGUL SYLLABLE GGYOK
-+<UAFB5>     /x82/x38/xb0/x34 HANGUL SYLLABLE GGYOT
-+<UAFB6>     /x82/x38/xb0/x35 HANGUL SYLLABLE GGYOP
-+<UAFB7>     /x82/x38/xb0/x36 HANGUL SYLLABLE GGYOH
-+<UAFB8>     /x82/x38/xb0/x37 HANGUL SYLLABLE GGU
-+<UAFB9>     /x82/x38/xb0/x38 HANGUL SYLLABLE GGUG
-+<UAFBA>     /x82/x38/xb0/x39 HANGUL SYLLABLE GGUGG
-+<UAFBB>     /x82/x38/xb1/x30 HANGUL SYLLABLE GGUGS
-+<UAFBC>     /x82/x38/xb1/x31 HANGUL SYLLABLE GGUN
-+<UAFBD>     /x82/x38/xb1/x32 HANGUL SYLLABLE GGUNI
-+<UAFBE>     /x82/x38/xb1/x33 HANGUL SYLLABLE GGUNH
-+<UAFBF>     /x82/x38/xb1/x34 HANGUL SYLLABLE GGUD
-+<UAFC0>     /x82/x38/xb1/x35 HANGUL SYLLABLE GGUL
-+<UAFC1>     /x82/x38/xb1/x36 HANGUL SYLLABLE GGULG
-+<UAFC2>     /x82/x38/xb1/x37 HANGUL SYLLABLE GGULM
-+<UAFC3>     /x82/x38/xb1/x38 HANGUL SYLLABLE GGULB
-+<UAFC4>     /x82/x38/xb1/x39 HANGUL SYLLABLE GGULS
-+<UAFC5>     /x82/x38/xb2/x30 HANGUL SYLLABLE GGULT
-+<UAFC6>     /x82/x38/xb2/x31 HANGUL SYLLABLE GGULP
-+<UAFC7>     /x82/x38/xb2/x32 HANGUL SYLLABLE GGULH
-+<UAFC8>     /x82/x38/xb2/x33 HANGUL SYLLABLE GGUM
-+<UAFC9>     /x82/x38/xb2/x34 HANGUL SYLLABLE GGUB
-+<UAFCA>     /x82/x38/xb2/x35 HANGUL SYLLABLE GGUBS
-+<UAFCB>     /x82/x38/xb2/x36 HANGUL SYLLABLE GGUS
-+<UAFCC>     /x82/x38/xb2/x37 HANGUL SYLLABLE GGUSS
-+<UAFCD>     /x82/x38/xb2/x38 HANGUL SYLLABLE GGUNG
-+<UAFCE>     /x82/x38/xb2/x39 HANGUL SYLLABLE GGUJ
-+<UAFCF>     /x82/x38/xb3/x30 HANGUL SYLLABLE GGUC
-+<UAFD0>     /x82/x38/xb3/x31 HANGUL SYLLABLE GGUK
-+<UAFD1>     /x82/x38/xb3/x32 HANGUL SYLLABLE GGUT
-+<UAFD2>     /x82/x38/xb3/x33 HANGUL SYLLABLE GGUP
-+<UAFD3>     /x82/x38/xb3/x34 HANGUL SYLLABLE GGUH
-+<UAFD4>     /x82/x38/xb3/x35 HANGUL SYLLABLE GGWEO
-+<UAFD5>     /x82/x38/xb3/x36 HANGUL SYLLABLE GGWEOG
-+<UAFD6>     /x82/x38/xb3/x37 HANGUL SYLLABLE GGWEOGG
-+<UAFD7>     /x82/x38/xb3/x38 HANGUL SYLLABLE GGWEOGS
-+<UAFD8>     /x82/x38/xb3/x39 HANGUL SYLLABLE GGWEON
-+<UAFD9>     /x82/x38/xb4/x30 HANGUL SYLLABLE GGWEONI
-+<UAFDA>     /x82/x38/xb4/x31 HANGUL SYLLABLE GGWEONH
-+<UAFDB>     /x82/x38/xb4/x32 HANGUL SYLLABLE GGWEOD
-+<UAFDC>     /x82/x38/xb4/x33 HANGUL SYLLABLE GGWEOL
-+<UAFDD>     /x82/x38/xb4/x34 HANGUL SYLLABLE GGWEOLG
-+<UAFDE>     /x82/x38/xb4/x35 HANGUL SYLLABLE GGWEOLM
-+<UAFDF>     /x82/x38/xb4/x36 HANGUL SYLLABLE GGWEOLB
-+<UAFE0>     /x82/x38/xb4/x37 HANGUL SYLLABLE GGWEOLS
-+<UAFE1>     /x82/x38/xb4/x38 HANGUL SYLLABLE GGWEOLT
-+<UAFE2>     /x82/x38/xb4/x39 HANGUL SYLLABLE GGWEOLP
-+<UAFE3>     /x82/x38/xb5/x30 HANGUL SYLLABLE GGWEOLH
-+<UAFE4>     /x82/x38/xb5/x31 HANGUL SYLLABLE GGWEOM
-+<UAFE5>     /x82/x38/xb5/x32 HANGUL SYLLABLE GGWEOB
-+<UAFE6>     /x82/x38/xb5/x33 HANGUL SYLLABLE GGWEOBS
-+<UAFE7>     /x82/x38/xb5/x34 HANGUL SYLLABLE GGWEOS
-+<UAFE8>     /x82/x38/xb5/x35 HANGUL SYLLABLE GGWEOSS
-+<UAFE9>     /x82/x38/xb5/x36 HANGUL SYLLABLE GGWEONG
-+<UAFEA>     /x82/x38/xb5/x37 HANGUL SYLLABLE GGWEOJ
-+<UAFEB>     /x82/x38/xb5/x38 HANGUL SYLLABLE GGWEOC
-+<UAFEC>     /x82/x38/xb5/x39 HANGUL SYLLABLE GGWEOK
-+<UAFED>     /x82/x38/xb6/x30 HANGUL SYLLABLE GGWEOT
-+<UAFEE>     /x82/x38/xb6/x31 HANGUL SYLLABLE GGWEOP
-+<UAFEF>     /x82/x38/xb6/x32 HANGUL SYLLABLE GGWEOH
-+<UAFF0>     /x82/x38/xb6/x33 HANGUL SYLLABLE GGWE
-+<UAFF1>     /x82/x38/xb6/x34 HANGUL SYLLABLE GGWEG
-+<UAFF2>     /x82/x38/xb6/x35 HANGUL SYLLABLE GGWEGG
-+<UAFF3>     /x82/x38/xb6/x36 HANGUL SYLLABLE GGWEGS
-+<UAFF4>     /x82/x38/xb6/x37 HANGUL SYLLABLE GGWEN
-+<UAFF5>     /x82/x38/xb6/x38 HANGUL SYLLABLE GGWENI
-+<UAFF6>     /x82/x38/xb6/x39 HANGUL SYLLABLE GGWENH
-+<UAFF7>     /x82/x38/xb7/x30 HANGUL SYLLABLE GGWED
-+<UAFF8>     /x82/x38/xb7/x31 HANGUL SYLLABLE GGWEL
-+<UAFF9>     /x82/x38/xb7/x32 HANGUL SYLLABLE GGWELG
-+<UAFFA>     /x82/x38/xb7/x33 HANGUL SYLLABLE GGWELM
-+<UAFFB>     /x82/x38/xb7/x34 HANGUL SYLLABLE GGWELB
-+<UAFFC>     /x82/x38/xb7/x35 HANGUL SYLLABLE GGWELS
-+<UAFFD>     /x82/x38/xb7/x36 HANGUL SYLLABLE GGWELT
-+<UAFFE>     /x82/x38/xb7/x37 HANGUL SYLLABLE GGWELP
-+<UAFFF>     /x82/x38/xb7/x38 HANGUL SYLLABLE GGWELH
-+<UB000>     /x82/x38/xb7/x39 HANGUL SYLLABLE GGWEM
-+<UB001>     /x82/x38/xb8/x30 HANGUL SYLLABLE GGWEB
-+<UB002>     /x82/x38/xb8/x31 HANGUL SYLLABLE GGWEBS
-+<UB003>     /x82/x38/xb8/x32 HANGUL SYLLABLE GGWES
-+<UB004>     /x82/x38/xb8/x33 HANGUL SYLLABLE GGWESS
-+<UB005>     /x82/x38/xb8/x34 HANGUL SYLLABLE GGWENG
-+<UB006>     /x82/x38/xb8/x35 HANGUL SYLLABLE GGWEJ
-+<UB007>     /x82/x38/xb8/x36 HANGUL SYLLABLE GGWEC
-+<UB008>     /x82/x38/xb8/x37 HANGUL SYLLABLE GGWEK
-+<UB009>     /x82/x38/xb8/x38 HANGUL SYLLABLE GGWET
-+<UB00A>     /x82/x38/xb8/x39 HANGUL SYLLABLE GGWEP
-+<UB00B>     /x82/x38/xb9/x30 HANGUL SYLLABLE GGWEH
-+<UB00C>     /x82/x38/xb9/x31 HANGUL SYLLABLE GGWI
-+<UB00D>     /x82/x38/xb9/x32 HANGUL SYLLABLE GGWIG
-+<UB00E>     /x82/x38/xb9/x33 HANGUL SYLLABLE GGWIGG
-+<UB00F>     /x82/x38/xb9/x34 HANGUL SYLLABLE GGWIGS
-+<UB010>     /x82/x38/xb9/x35 HANGUL SYLLABLE GGWIN
-+<UB011>     /x82/x38/xb9/x36 HANGUL SYLLABLE GGWINI
-+<UB012>     /x82/x38/xb9/x37 HANGUL SYLLABLE GGWINH
-+<UB013>     /x82/x38/xb9/x38 HANGUL SYLLABLE GGWID
-+<UB014>     /x82/x38/xb9/x39 HANGUL SYLLABLE GGWIL
-+<UB015>     /x82/x38/xba/x30 HANGUL SYLLABLE GGWILG
-+<UB016>     /x82/x38/xba/x31 HANGUL SYLLABLE GGWILM
-+<UB017>     /x82/x38/xba/x32 HANGUL SYLLABLE GGWILB
-+<UB018>     /x82/x38/xba/x33 HANGUL SYLLABLE GGWILS
-+<UB019>     /x82/x38/xba/x34 HANGUL SYLLABLE GGWILT
-+<UB01A>     /x82/x38/xba/x35 HANGUL SYLLABLE GGWILP
-+<UB01B>     /x82/x38/xba/x36 HANGUL SYLLABLE GGWILH
-+<UB01C>     /x82/x38/xba/x37 HANGUL SYLLABLE GGWIM
-+<UB01D>     /x82/x38/xba/x38 HANGUL SYLLABLE GGWIB
-+<UB01E>     /x82/x38/xba/x39 HANGUL SYLLABLE GGWIBS
-+<UB01F>     /x82/x38/xbb/x30 HANGUL SYLLABLE GGWIS
-+<UB020>     /x82/x38/xbb/x31 HANGUL SYLLABLE GGWISS
-+<UB021>     /x82/x38/xbb/x32 HANGUL SYLLABLE GGWING
-+<UB022>     /x82/x38/xbb/x33 HANGUL SYLLABLE GGWIJ
-+<UB023>     /x82/x38/xbb/x34 HANGUL SYLLABLE GGWIC
-+<UB024>     /x82/x38/xbb/x35 HANGUL SYLLABLE GGWIK
-+<UB025>     /x82/x38/xbb/x36 HANGUL SYLLABLE GGWIT
-+<UB026>     /x82/x38/xbb/x37 HANGUL SYLLABLE GGWIP
-+<UB027>     /x82/x38/xbb/x38 HANGUL SYLLABLE GGWIH
-+<UB028>     /x82/x38/xbb/x39 HANGUL SYLLABLE GGYU
-+<UB029>     /x82/x38/xbc/x30 HANGUL SYLLABLE GGYUG
-+<UB02A>     /x82/x38/xbc/x31 HANGUL SYLLABLE GGYUGG
-+<UB02B>     /x82/x38/xbc/x32 HANGUL SYLLABLE GGYUGS
-+<UB02C>     /x82/x38/xbc/x33 HANGUL SYLLABLE GGYUN
-+<UB02D>     /x82/x38/xbc/x34 HANGUL SYLLABLE GGYUNI
-+<UB02E>     /x82/x38/xbc/x35 HANGUL SYLLABLE GGYUNH
-+<UB02F>     /x82/x38/xbc/x36 HANGUL SYLLABLE GGYUD
-+<UB030>     /x82/x38/xbc/x37 HANGUL SYLLABLE GGYUL
-+<UB031>     /x82/x38/xbc/x38 HANGUL SYLLABLE GGYULG
-+<UB032>     /x82/x38/xbc/x39 HANGUL SYLLABLE GGYULM
-+<UB033>     /x82/x38/xbd/x30 HANGUL SYLLABLE GGYULB
-+<UB034>     /x82/x38/xbd/x31 HANGUL SYLLABLE GGYULS
-+<UB035>     /x82/x38/xbd/x32 HANGUL SYLLABLE GGYULT
-+<UB036>     /x82/x38/xbd/x33 HANGUL SYLLABLE GGYULP
-+<UB037>     /x82/x38/xbd/x34 HANGUL SYLLABLE GGYULH
-+<UB038>     /x82/x38/xbd/x35 HANGUL SYLLABLE GGYUM
-+<UB039>     /x82/x38/xbd/x36 HANGUL SYLLABLE GGYUB
-+<UB03A>     /x82/x38/xbd/x37 HANGUL SYLLABLE GGYUBS
-+<UB03B>     /x82/x38/xbd/x38 HANGUL SYLLABLE GGYUS
-+<UB03C>     /x82/x38/xbd/x39 HANGUL SYLLABLE GGYUSS
-+<UB03D>     /x82/x38/xbe/x30 HANGUL SYLLABLE GGYUNG
-+<UB03E>     /x82/x38/xbe/x31 HANGUL SYLLABLE GGYUJ
-+<UB03F>     /x82/x38/xbe/x32 HANGUL SYLLABLE GGYUC
-+<UB040>     /x82/x38/xbe/x33 HANGUL SYLLABLE GGYUK
-+<UB041>     /x82/x38/xbe/x34 HANGUL SYLLABLE GGYUT
-+<UB042>     /x82/x38/xbe/x35 HANGUL SYLLABLE GGYUP
-+<UB043>     /x82/x38/xbe/x36 HANGUL SYLLABLE GGYUH
-+<UB044>     /x82/x38/xbe/x37 HANGUL SYLLABLE GGEU
-+<UB045>     /x82/x38/xbe/x38 HANGUL SYLLABLE GGEUG
-+<UB046>     /x82/x38/xbe/x39 HANGUL SYLLABLE GGEUGG
-+<UB047>     /x82/x38/xbf/x30 HANGUL SYLLABLE GGEUGS
-+<UB048>     /x82/x38/xbf/x31 HANGUL SYLLABLE GGEUN
-+<UB049>     /x82/x38/xbf/x32 HANGUL SYLLABLE GGEUNI
-+<UB04A>     /x82/x38/xbf/x33 HANGUL SYLLABLE GGEUNH
-+<UB04B>     /x82/x38/xbf/x34 HANGUL SYLLABLE GGEUD
-+<UB04C>     /x82/x38/xbf/x35 HANGUL SYLLABLE GGEUL
-+<UB04D>     /x82/x38/xbf/x36 HANGUL SYLLABLE GGEULG
-+<UB04E>     /x82/x38/xbf/x37 HANGUL SYLLABLE GGEULM
-+<UB04F>     /x82/x38/xbf/x38 HANGUL SYLLABLE GGEULB
-+<UB050>     /x82/x38/xbf/x39 HANGUL SYLLABLE GGEULS
-+<UB051>     /x82/x38/xc0/x30 HANGUL SYLLABLE GGEULT
-+<UB052>     /x82/x38/xc0/x31 HANGUL SYLLABLE GGEULP
-+<UB053>     /x82/x38/xc0/x32 HANGUL SYLLABLE GGEULH
-+<UB054>     /x82/x38/xc0/x33 HANGUL SYLLABLE GGEUM
-+<UB055>     /x82/x38/xc0/x34 HANGUL SYLLABLE GGEUB
-+<UB056>     /x82/x38/xc0/x35 HANGUL SYLLABLE GGEUBS
-+<UB057>     /x82/x38/xc0/x36 HANGUL SYLLABLE GGEUS
-+<UB058>     /x82/x38/xc0/x37 HANGUL SYLLABLE GGEUSS
-+<UB059>     /x82/x38/xc0/x38 HANGUL SYLLABLE GGEUNG
-+<UB05A>     /x82/x38/xc0/x39 HANGUL SYLLABLE GGEUJ
-+<UB05B>     /x82/x38/xc1/x30 HANGUL SYLLABLE GGEUC
-+<UB05C>     /x82/x38/xc1/x31 HANGUL SYLLABLE GGEUK
-+<UB05D>     /x82/x38/xc1/x32 HANGUL SYLLABLE GGEUT
-+<UB05E>     /x82/x38/xc1/x33 HANGUL SYLLABLE GGEUP
-+<UB05F>     /x82/x38/xc1/x34 HANGUL SYLLABLE GGEUH
-+<UB060>     /x82/x38/xc1/x35 HANGUL SYLLABLE GGYI
-+<UB061>     /x82/x38/xc1/x36 HANGUL SYLLABLE GGYIG
-+<UB062>     /x82/x38/xc1/x37 HANGUL SYLLABLE GGYIGG
-+<UB063>     /x82/x38/xc1/x38 HANGUL SYLLABLE GGYIGS
-+<UB064>     /x82/x38/xc1/x39 HANGUL SYLLABLE GGYIN
-+<UB065>     /x82/x38/xc2/x30 HANGUL SYLLABLE GGYINI
-+<UB066>     /x82/x38/xc2/x31 HANGUL SYLLABLE GGYINH
-+<UB067>     /x82/x38/xc2/x32 HANGUL SYLLABLE GGYID
-+<UB068>     /x82/x38/xc2/x33 HANGUL SYLLABLE GGYIL
-+<UB069>     /x82/x38/xc2/x34 HANGUL SYLLABLE GGYILG
-+<UB06A>     /x82/x38/xc2/x35 HANGUL SYLLABLE GGYILM
-+<UB06B>     /x82/x38/xc2/x36 HANGUL SYLLABLE GGYILB
-+<UB06C>     /x82/x38/xc2/x37 HANGUL SYLLABLE GGYILS
-+<UB06D>     /x82/x38/xc2/x38 HANGUL SYLLABLE GGYILT
-+<UB06E>     /x82/x38/xc2/x39 HANGUL SYLLABLE GGYILP
-+<UB06F>     /x82/x38/xc3/x30 HANGUL SYLLABLE GGYILH
-+<UB070>     /x82/x38/xc3/x31 HANGUL SYLLABLE GGYIM
-+<UB071>     /x82/x38/xc3/x32 HANGUL SYLLABLE GGYIB
-+<UB072>     /x82/x38/xc3/x33 HANGUL SYLLABLE GGYIBS
-+<UB073>     /x82/x38/xc3/x34 HANGUL SYLLABLE GGYIS
-+<UB074>     /x82/x38/xc3/x35 HANGUL SYLLABLE GGYISS
-+<UB075>     /x82/x38/xc3/x36 HANGUL SYLLABLE GGYING
-+<UB076>     /x82/x38/xc3/x37 HANGUL SYLLABLE GGYIJ
-+<UB077>     /x82/x38/xc3/x38 HANGUL SYLLABLE GGYIC
-+<UB078>     /x82/x38/xc3/x39 HANGUL SYLLABLE GGYIK
-+<UB079>     /x82/x38/xc4/x30 HANGUL SYLLABLE GGYIT
-+<UB07A>     /x82/x38/xc4/x31 HANGUL SYLLABLE GGYIP
-+<UB07B>     /x82/x38/xc4/x32 HANGUL SYLLABLE GGYIH
-+<UB07C>     /x82/x38/xc4/x33 HANGUL SYLLABLE GGI
-+<UB07D>     /x82/x38/xc4/x34 HANGUL SYLLABLE GGIG
-+<UB07E>     /x82/x38/xc4/x35 HANGUL SYLLABLE GGIGG
-+<UB07F>     /x82/x38/xc4/x36 HANGUL SYLLABLE GGIGS
-+<UB080>     /x82/x38/xc4/x37 HANGUL SYLLABLE GGIN
-+<UB081>     /x82/x38/xc4/x38 HANGUL SYLLABLE GGINI
-+<UB082>     /x82/x38/xc4/x39 HANGUL SYLLABLE GGINH
-+<UB083>     /x82/x38/xc5/x30 HANGUL SYLLABLE GGID
-+<UB084>     /x82/x38/xc5/x31 HANGUL SYLLABLE GGIL
-+<UB085>     /x82/x38/xc5/x32 HANGUL SYLLABLE GGILG
-+<UB086>     /x82/x38/xc5/x33 HANGUL SYLLABLE GGILM
-+<UB087>     /x82/x38/xc5/x34 HANGUL SYLLABLE GGILB
-+<UB088>     /x82/x38/xc5/x35 HANGUL SYLLABLE GGILS
-+<UB089>     /x82/x38/xc5/x36 HANGUL SYLLABLE GGILT
-+<UB08A>     /x82/x38/xc5/x37 HANGUL SYLLABLE GGILP
-+<UB08B>     /x82/x38/xc5/x38 HANGUL SYLLABLE GGILH
-+<UB08C>     /x82/x38/xc5/x39 HANGUL SYLLABLE GGIM
-+<UB08D>     /x82/x38/xc6/x30 HANGUL SYLLABLE GGIB
-+<UB08E>     /x82/x38/xc6/x31 HANGUL SYLLABLE GGIBS
-+<UB08F>     /x82/x38/xc6/x32 HANGUL SYLLABLE GGIS
-+<UB090>     /x82/x38/xc6/x33 HANGUL SYLLABLE GGISS
-+<UB091>     /x82/x38/xc6/x34 HANGUL SYLLABLE GGING
-+<UB092>     /x82/x38/xc6/x35 HANGUL SYLLABLE GGIJ
-+<UB093>     /x82/x38/xc6/x36 HANGUL SYLLABLE GGIC
-+<UB094>     /x82/x38/xc6/x37 HANGUL SYLLABLE GGIK
-+<UB095>     /x82/x38/xc6/x38 HANGUL SYLLABLE GGIT
-+<UB096>     /x82/x38/xc6/x39 HANGUL SYLLABLE GGIP
-+<UB097>     /x82/x38/xc7/x30 HANGUL SYLLABLE GGIH
-+<UB098>     /x82/x38/xc7/x31 HANGUL SYLLABLE NA
-+<UB099>     /x82/x38/xc7/x32 HANGUL SYLLABLE NAG
-+<UB09A>     /x82/x38/xc7/x33 HANGUL SYLLABLE NAGG
-+<UB09B>     /x82/x38/xc7/x34 HANGUL SYLLABLE NAGS
-+<UB09C>     /x82/x38/xc7/x35 HANGUL SYLLABLE NAN
-+<UB09D>     /x82/x38/xc7/x36 HANGUL SYLLABLE NANI
-+<UB09E>     /x82/x38/xc7/x37 HANGUL SYLLABLE NANH
-+<UB09F>     /x82/x38/xc7/x38 HANGUL SYLLABLE NAD
-+<UB0A0>     /x82/x38/xc7/x39 HANGUL SYLLABLE NAL
-+<UB0A1>     /x82/x38/xc8/x30 HANGUL SYLLABLE NALG
-+<UB0A2>     /x82/x38/xc8/x31 HANGUL SYLLABLE NALM
-+<UB0A3>     /x82/x38/xc8/x32 HANGUL SYLLABLE NALB
-+<UB0A4>     /x82/x38/xc8/x33 HANGUL SYLLABLE NALS
-+<UB0A5>     /x82/x38/xc8/x34 HANGUL SYLLABLE NALT
-+<UB0A6>     /x82/x38/xc8/x35 HANGUL SYLLABLE NALP
-+<UB0A7>     /x82/x38/xc8/x36 HANGUL SYLLABLE NALH
-+<UB0A8>     /x82/x38/xc8/x37 HANGUL SYLLABLE NAM
-+<UB0A9>     /x82/x38/xc8/x38 HANGUL SYLLABLE NAB
-+<UB0AA>     /x82/x38/xc8/x39 HANGUL SYLLABLE NABS
-+<UB0AB>     /x82/x38/xc9/x30 HANGUL SYLLABLE NAS
-+<UB0AC>     /x82/x38/xc9/x31 HANGUL SYLLABLE NASS
-+<UB0AD>     /x82/x38/xc9/x32 HANGUL SYLLABLE NANG
-+<UB0AE>     /x82/x38/xc9/x33 HANGUL SYLLABLE NAJ
-+<UB0AF>     /x82/x38/xc9/x34 HANGUL SYLLABLE NAC
-+<UB0B0>     /x82/x38/xc9/x35 HANGUL SYLLABLE NAK
-+<UB0B1>     /x82/x38/xc9/x36 HANGUL SYLLABLE NAT
-+<UB0B2>     /x82/x38/xc9/x37 HANGUL SYLLABLE NAP
-+<UB0B3>     /x82/x38/xc9/x38 HANGUL SYLLABLE NAH
-+<UB0B4>     /x82/x38/xc9/x39 HANGUL SYLLABLE NAE
-+<UB0B5>     /x82/x38/xca/x30 HANGUL SYLLABLE NAEG
-+<UB0B6>     /x82/x38/xca/x31 HANGUL SYLLABLE NAEGG
-+<UB0B7>     /x82/x38/xca/x32 HANGUL SYLLABLE NAEGS
-+<UB0B8>     /x82/x38/xca/x33 HANGUL SYLLABLE NAEN
-+<UB0B9>     /x82/x38/xca/x34 HANGUL SYLLABLE NAENI
-+<UB0BA>     /x82/x38/xca/x35 HANGUL SYLLABLE NAENH
-+<UB0BB>     /x82/x38/xca/x36 HANGUL SYLLABLE NAED
-+<UB0BC>     /x82/x38/xca/x37 HANGUL SYLLABLE NAEL
-+<UB0BD>     /x82/x38/xca/x38 HANGUL SYLLABLE NAELG
-+<UB0BE>     /x82/x38/xca/x39 HANGUL SYLLABLE NAELM
-+<UB0BF>     /x82/x38/xcb/x30 HANGUL SYLLABLE NAELB
-+<UB0C0>     /x82/x38/xcb/x31 HANGUL SYLLABLE NAELS
-+<UB0C1>     /x82/x38/xcb/x32 HANGUL SYLLABLE NAELT
-+<UB0C2>     /x82/x38/xcb/x33 HANGUL SYLLABLE NAELP
-+<UB0C3>     /x82/x38/xcb/x34 HANGUL SYLLABLE NAELH
-+<UB0C4>     /x82/x38/xcb/x35 HANGUL SYLLABLE NAEM
-+<UB0C5>     /x82/x38/xcb/x36 HANGUL SYLLABLE NAEB
-+<UB0C6>     /x82/x38/xcb/x37 HANGUL SYLLABLE NAEBS
-+<UB0C7>     /x82/x38/xcb/x38 HANGUL SYLLABLE NAES
-+<UB0C8>     /x82/x38/xcb/x39 HANGUL SYLLABLE NAESS
-+<UB0C9>     /x82/x38/xcc/x30 HANGUL SYLLABLE NAENG
-+<UB0CA>     /x82/x38/xcc/x31 HANGUL SYLLABLE NAEJ
-+<UB0CB>     /x82/x38/xcc/x32 HANGUL SYLLABLE NAEC
-+<UB0CC>     /x82/x38/xcc/x33 HANGUL SYLLABLE NAEK
-+<UB0CD>     /x82/x38/xcc/x34 HANGUL SYLLABLE NAET
-+<UB0CE>     /x82/x38/xcc/x35 HANGUL SYLLABLE NAEP
-+<UB0CF>     /x82/x38/xcc/x36 HANGUL SYLLABLE NAEH
-+<UB0D0>     /x82/x38/xcc/x37 HANGUL SYLLABLE NYA
-+<UB0D1>     /x82/x38/xcc/x38 HANGUL SYLLABLE NYAG
-+<UB0D2>     /x82/x38/xcc/x39 HANGUL SYLLABLE NYAGG
-+<UB0D3>     /x82/x38/xcd/x30 HANGUL SYLLABLE NYAGS
-+<UB0D4>     /x82/x38/xcd/x31 HANGUL SYLLABLE NYAN
-+<UB0D5>     /x82/x38/xcd/x32 HANGUL SYLLABLE NYANI
-+<UB0D6>     /x82/x38/xcd/x33 HANGUL SYLLABLE NYANH
-+<UB0D7>     /x82/x38/xcd/x34 HANGUL SYLLABLE NYAD
-+<UB0D8>     /x82/x38/xcd/x35 HANGUL SYLLABLE NYAL
-+<UB0D9>     /x82/x38/xcd/x36 HANGUL SYLLABLE NYALG
-+<UB0DA>     /x82/x38/xcd/x37 HANGUL SYLLABLE NYALM
-+<UB0DB>     /x82/x38/xcd/x38 HANGUL SYLLABLE NYALB
-+<UB0DC>     /x82/x38/xcd/x39 HANGUL SYLLABLE NYALS
-+<UB0DD>     /x82/x38/xce/x30 HANGUL SYLLABLE NYALT
-+<UB0DE>     /x82/x38/xce/x31 HANGUL SYLLABLE NYALP
-+<UB0DF>     /x82/x38/xce/x32 HANGUL SYLLABLE NYALH
-+<UB0E0>     /x82/x38/xce/x33 HANGUL SYLLABLE NYAM
-+<UB0E1>     /x82/x38/xce/x34 HANGUL SYLLABLE NYAB
-+<UB0E2>     /x82/x38/xce/x35 HANGUL SYLLABLE NYABS
-+<UB0E3>     /x82/x38/xce/x36 HANGUL SYLLABLE NYAS
-+<UB0E4>     /x82/x38/xce/x37 HANGUL SYLLABLE NYASS
-+<UB0E5>     /x82/x38/xce/x38 HANGUL SYLLABLE NYANG
-+<UB0E6>     /x82/x38/xce/x39 HANGUL SYLLABLE NYAJ
-+<UB0E7>     /x82/x38/xcf/x30 HANGUL SYLLABLE NYAC
-+<UB0E8>     /x82/x38/xcf/x31 HANGUL SYLLABLE NYAK
-+<UB0E9>     /x82/x38/xcf/x32 HANGUL SYLLABLE NYAT
-+<UB0EA>     /x82/x38/xcf/x33 HANGUL SYLLABLE NYAP
-+<UB0EB>     /x82/x38/xcf/x34 HANGUL SYLLABLE NYAH
-+<UB0EC>     /x82/x38/xcf/x35 HANGUL SYLLABLE NYAE
-+<UB0ED>     /x82/x38/xcf/x36 HANGUL SYLLABLE NYAEG
-+<UB0EE>     /x82/x38/xcf/x37 HANGUL SYLLABLE NYAEGG
-+<UB0EF>     /x82/x38/xcf/x38 HANGUL SYLLABLE NYAEGS
-+<UB0F0>     /x82/x38/xcf/x39 HANGUL SYLLABLE NYAEN
-+<UB0F1>     /x82/x38/xd0/x30 HANGUL SYLLABLE NYAENI
-+<UB0F2>     /x82/x38/xd0/x31 HANGUL SYLLABLE NYAENH
-+<UB0F3>     /x82/x38/xd0/x32 HANGUL SYLLABLE NYAED
-+<UB0F4>     /x82/x38/xd0/x33 HANGUL SYLLABLE NYAEL
-+<UB0F5>     /x82/x38/xd0/x34 HANGUL SYLLABLE NYAELG
-+<UB0F6>     /x82/x38/xd0/x35 HANGUL SYLLABLE NYAELM
-+<UB0F7>     /x82/x38/xd0/x36 HANGUL SYLLABLE NYAELB
-+<UB0F8>     /x82/x38/xd0/x37 HANGUL SYLLABLE NYAELS
-+<UB0F9>     /x82/x38/xd0/x38 HANGUL SYLLABLE NYAELT
-+<UB0FA>     /x82/x38/xd0/x39 HANGUL SYLLABLE NYAELP
-+<UB0FB>     /x82/x38/xd1/x30 HANGUL SYLLABLE NYAELH
-+<UB0FC>     /x82/x38/xd1/x31 HANGUL SYLLABLE NYAEM
-+<UB0FD>     /x82/x38/xd1/x32 HANGUL SYLLABLE NYAEB
-+<UB0FE>     /x82/x38/xd1/x33 HANGUL SYLLABLE NYAEBS
-+<UB0FF>     /x82/x38/xd1/x34 HANGUL SYLLABLE NYAES
-+<UB100>     /x82/x38/xd1/x35 HANGUL SYLLABLE NYAESS
-+<UB101>     /x82/x38/xd1/x36 HANGUL SYLLABLE NYAENG
-+<UB102>     /x82/x38/xd1/x37 HANGUL SYLLABLE NYAEJ
-+<UB103>     /x82/x38/xd1/x38 HANGUL SYLLABLE NYAEC
-+<UB104>     /x82/x38/xd1/x39 HANGUL SYLLABLE NYAEK
-+<UB105>     /x82/x38/xd2/x30 HANGUL SYLLABLE NYAET
-+<UB106>     /x82/x38/xd2/x31 HANGUL SYLLABLE NYAEP
-+<UB107>     /x82/x38/xd2/x32 HANGUL SYLLABLE NYAEH
-+<UB108>     /x82/x38/xd2/x33 HANGUL SYLLABLE NEO
-+<UB109>     /x82/x38/xd2/x34 HANGUL SYLLABLE NEOG
-+<UB10A>     /x82/x38/xd2/x35 HANGUL SYLLABLE NEOGG
-+<UB10B>     /x82/x38/xd2/x36 HANGUL SYLLABLE NEOGS
-+<UB10C>     /x82/x38/xd2/x37 HANGUL SYLLABLE NEON
-+<UB10D>     /x82/x38/xd2/x38 HANGUL SYLLABLE NEONI
-+<UB10E>     /x82/x38/xd2/x39 HANGUL SYLLABLE NEONH
-+<UB10F>     /x82/x38/xd3/x30 HANGUL SYLLABLE NEOD
-+<UB110>     /x82/x38/xd3/x31 HANGUL SYLLABLE NEOL
-+<UB111>     /x82/x38/xd3/x32 HANGUL SYLLABLE NEOLG
-+<UB112>     /x82/x38/xd3/x33 HANGUL SYLLABLE NEOLM
-+<UB113>     /x82/x38/xd3/x34 HANGUL SYLLABLE NEOLB
-+<UB114>     /x82/x38/xd3/x35 HANGUL SYLLABLE NEOLS
-+<UB115>     /x82/x38/xd3/x36 HANGUL SYLLABLE NEOLT
-+<UB116>     /x82/x38/xd3/x37 HANGUL SYLLABLE NEOLP
-+<UB117>     /x82/x38/xd3/x38 HANGUL SYLLABLE NEOLH
-+<UB118>     /x82/x38/xd3/x39 HANGUL SYLLABLE NEOM
-+<UB119>     /x82/x38/xd4/x30 HANGUL SYLLABLE NEOB
-+<UB11A>     /x82/x38/xd4/x31 HANGUL SYLLABLE NEOBS
-+<UB11B>     /x82/x38/xd4/x32 HANGUL SYLLABLE NEOS
-+<UB11C>     /x82/x38/xd4/x33 HANGUL SYLLABLE NEOSS
-+<UB11D>     /x82/x38/xd4/x34 HANGUL SYLLABLE NEONG
-+<UB11E>     /x82/x38/xd4/x35 HANGUL SYLLABLE NEOJ
-+<UB11F>     /x82/x38/xd4/x36 HANGUL SYLLABLE NEOC
-+<UB120>     /x82/x38/xd4/x37 HANGUL SYLLABLE NEOK
-+<UB121>     /x82/x38/xd4/x38 HANGUL SYLLABLE NEOT
-+<UB122>     /x82/x38/xd4/x39 HANGUL SYLLABLE NEOP
-+<UB123>     /x82/x38/xd5/x30 HANGUL SYLLABLE NEOH
-+<UB124>     /x82/x38/xd5/x31 HANGUL SYLLABLE NE
-+<UB125>     /x82/x38/xd5/x32 HANGUL SYLLABLE NEG
-+<UB126>     /x82/x38/xd5/x33 HANGUL SYLLABLE NEGG
-+<UB127>     /x82/x38/xd5/x34 HANGUL SYLLABLE NEGS
-+<UB128>     /x82/x38/xd5/x35 HANGUL SYLLABLE NEN
-+<UB129>     /x82/x38/xd5/x36 HANGUL SYLLABLE NENI
-+<UB12A>     /x82/x38/xd5/x37 HANGUL SYLLABLE NENH
-+<UB12B>     /x82/x38/xd5/x38 HANGUL SYLLABLE NED
-+<UB12C>     /x82/x38/xd5/x39 HANGUL SYLLABLE NEL
-+<UB12D>     /x82/x38/xd6/x30 HANGUL SYLLABLE NELG
-+<UB12E>     /x82/x38/xd6/x31 HANGUL SYLLABLE NELM
-+<UB12F>     /x82/x38/xd6/x32 HANGUL SYLLABLE NELB
-+<UB130>     /x82/x38/xd6/x33 HANGUL SYLLABLE NELS
-+<UB131>     /x82/x38/xd6/x34 HANGUL SYLLABLE NELT
-+<UB132>     /x82/x38/xd6/x35 HANGUL SYLLABLE NELP
-+<UB133>     /x82/x38/xd6/x36 HANGUL SYLLABLE NELH
-+<UB134>     /x82/x38/xd6/x37 HANGUL SYLLABLE NEM
-+<UB135>     /x82/x38/xd6/x38 HANGUL SYLLABLE NEB
-+<UB136>     /x82/x38/xd6/x39 HANGUL SYLLABLE NEBS
-+<UB137>     /x82/x38/xd7/x30 HANGUL SYLLABLE NES
-+<UB138>     /x82/x38/xd7/x31 HANGUL SYLLABLE NESS
-+<UB139>     /x82/x38/xd7/x32 HANGUL SYLLABLE NENG
-+<UB13A>     /x82/x38/xd7/x33 HANGUL SYLLABLE NEJ
-+<UB13B>     /x82/x38/xd7/x34 HANGUL SYLLABLE NEC
-+<UB13C>     /x82/x38/xd7/x35 HANGUL SYLLABLE NEK
-+<UB13D>     /x82/x38/xd7/x36 HANGUL SYLLABLE NET
-+<UB13E>     /x82/x38/xd7/x37 HANGUL SYLLABLE NEP
-+<UB13F>     /x82/x38/xd7/x38 HANGUL SYLLABLE NEH
-+<UB140>     /x82/x38/xd7/x39 HANGUL SYLLABLE NYEO
-+<UB141>     /x82/x38/xd8/x30 HANGUL SYLLABLE NYEOG
-+<UB142>     /x82/x38/xd8/x31 HANGUL SYLLABLE NYEOGG
-+<UB143>     /x82/x38/xd8/x32 HANGUL SYLLABLE NYEOGS
-+<UB144>     /x82/x38/xd8/x33 HANGUL SYLLABLE NYEON
-+<UB145>     /x82/x38/xd8/x34 HANGUL SYLLABLE NYEONI
-+<UB146>     /x82/x38/xd8/x35 HANGUL SYLLABLE NYEONH
-+<UB147>     /x82/x38/xd8/x36 HANGUL SYLLABLE NYEOD
-+<UB148>     /x82/x38/xd8/x37 HANGUL SYLLABLE NYEOL
-+<UB149>     /x82/x38/xd8/x38 HANGUL SYLLABLE NYEOLG
-+<UB14A>     /x82/x38/xd8/x39 HANGUL SYLLABLE NYEOLM
-+<UB14B>     /x82/x38/xd9/x30 HANGUL SYLLABLE NYEOLB
-+<UB14C>     /x82/x38/xd9/x31 HANGUL SYLLABLE NYEOLS
-+<UB14D>     /x82/x38/xd9/x32 HANGUL SYLLABLE NYEOLT
-+<UB14E>     /x82/x38/xd9/x33 HANGUL SYLLABLE NYEOLP
-+<UB14F>     /x82/x38/xd9/x34 HANGUL SYLLABLE NYEOLH
-+<UB150>     /x82/x38/xd9/x35 HANGUL SYLLABLE NYEOM
-+<UB151>     /x82/x38/xd9/x36 HANGUL SYLLABLE NYEOB
-+<UB152>     /x82/x38/xd9/x37 HANGUL SYLLABLE NYEOBS
-+<UB153>     /x82/x38/xd9/x38 HANGUL SYLLABLE NYEOS
-+<UB154>     /x82/x38/xd9/x39 HANGUL SYLLABLE NYEOSS
-+<UB155>     /x82/x38/xda/x30 HANGUL SYLLABLE NYEONG
-+<UB156>     /x82/x38/xda/x31 HANGUL SYLLABLE NYEOJ
-+<UB157>     /x82/x38/xda/x32 HANGUL SYLLABLE NYEOC
-+<UB158>     /x82/x38/xda/x33 HANGUL SYLLABLE NYEOK
-+<UB159>     /x82/x38/xda/x34 HANGUL SYLLABLE NYEOT
-+<UB15A>     /x82/x38/xda/x35 HANGUL SYLLABLE NYEOP
-+<UB15B>     /x82/x38/xda/x36 HANGUL SYLLABLE NYEOH
-+<UB15C>     /x82/x38/xda/x37 HANGUL SYLLABLE NYE
-+<UB15D>     /x82/x38/xda/x38 HANGUL SYLLABLE NYEG
-+<UB15E>     /x82/x38/xda/x39 HANGUL SYLLABLE NYEGG
-+<UB15F>     /x82/x38/xdb/x30 HANGUL SYLLABLE NYEGS
-+<UB160>     /x82/x38/xdb/x31 HANGUL SYLLABLE NYEN
-+<UB161>     /x82/x38/xdb/x32 HANGUL SYLLABLE NYENI
-+<UB162>     /x82/x38/xdb/x33 HANGUL SYLLABLE NYENH
-+<UB163>     /x82/x38/xdb/x34 HANGUL SYLLABLE NYED
-+<UB164>     /x82/x38/xdb/x35 HANGUL SYLLABLE NYEL
-+<UB165>     /x82/x38/xdb/x36 HANGUL SYLLABLE NYELG
-+<UB166>     /x82/x38/xdb/x37 HANGUL SYLLABLE NYELM
-+<UB167>     /x82/x38/xdb/x38 HANGUL SYLLABLE NYELB
-+<UB168>     /x82/x38/xdb/x39 HANGUL SYLLABLE NYELS
-+<UB169>     /x82/x38/xdc/x30 HANGUL SYLLABLE NYELT
-+<UB16A>     /x82/x38/xdc/x31 HANGUL SYLLABLE NYELP
-+<UB16B>     /x82/x38/xdc/x32 HANGUL SYLLABLE NYELH
-+<UB16C>     /x82/x38/xdc/x33 HANGUL SYLLABLE NYEM
-+<UB16D>     /x82/x38/xdc/x34 HANGUL SYLLABLE NYEB
-+<UB16E>     /x82/x38/xdc/x35 HANGUL SYLLABLE NYEBS
-+<UB16F>     /x82/x38/xdc/x36 HANGUL SYLLABLE NYES
-+<UB170>     /x82/x38/xdc/x37 HANGUL SYLLABLE NYESS
-+<UB171>     /x82/x38/xdc/x38 HANGUL SYLLABLE NYENG
-+<UB172>     /x82/x38/xdc/x39 HANGUL SYLLABLE NYEJ
-+<UB173>     /x82/x38/xdd/x30 HANGUL SYLLABLE NYEC
-+<UB174>     /x82/x38/xdd/x31 HANGUL SYLLABLE NYEK
-+<UB175>     /x82/x38/xdd/x32 HANGUL SYLLABLE NYET
-+<UB176>     /x82/x38/xdd/x33 HANGUL SYLLABLE NYEP
-+<UB177>     /x82/x38/xdd/x34 HANGUL SYLLABLE NYEH
-+<UB178>     /x82/x38/xdd/x35 HANGUL SYLLABLE NO
-+<UB179>     /x82/x38/xdd/x36 HANGUL SYLLABLE NOG
-+<UB17A>     /x82/x38/xdd/x37 HANGUL SYLLABLE NOGG
-+<UB17B>     /x82/x38/xdd/x38 HANGUL SYLLABLE NOGS
-+<UB17C>     /x82/x38/xdd/x39 HANGUL SYLLABLE NON
-+<UB17D>     /x82/x38/xde/x30 HANGUL SYLLABLE NONI
-+<UB17E>     /x82/x38/xde/x31 HANGUL SYLLABLE NONH
-+<UB17F>     /x82/x38/xde/x32 HANGUL SYLLABLE NOD
-+<UB180>     /x82/x38/xde/x33 HANGUL SYLLABLE NOL
-+<UB181>     /x82/x38/xde/x34 HANGUL SYLLABLE NOLG
-+<UB182>     /x82/x38/xde/x35 HANGUL SYLLABLE NOLM
-+<UB183>     /x82/x38/xde/x36 HANGUL SYLLABLE NOLB
-+<UB184>     /x82/x38/xde/x37 HANGUL SYLLABLE NOLS
-+<UB185>     /x82/x38/xde/x38 HANGUL SYLLABLE NOLT
-+<UB186>     /x82/x38/xde/x39 HANGUL SYLLABLE NOLP
-+<UB187>     /x82/x38/xdf/x30 HANGUL SYLLABLE NOLH
-+<UB188>     /x82/x38/xdf/x31 HANGUL SYLLABLE NOM
-+<UB189>     /x82/x38/xdf/x32 HANGUL SYLLABLE NOB
-+<UB18A>     /x82/x38/xdf/x33 HANGUL SYLLABLE NOBS
-+<UB18B>     /x82/x38/xdf/x34 HANGUL SYLLABLE NOS
-+<UB18C>     /x82/x38/xdf/x35 HANGUL SYLLABLE NOSS
-+<UB18D>     /x82/x38/xdf/x36 HANGUL SYLLABLE NONG
-+<UB18E>     /x82/x38/xdf/x37 HANGUL SYLLABLE NOJ
-+<UB18F>     /x82/x38/xdf/x38 HANGUL SYLLABLE NOC
-+<UB190>     /x82/x38/xdf/x39 HANGUL SYLLABLE NOK
-+<UB191>     /x82/x38/xe0/x30 HANGUL SYLLABLE NOT
-+<UB192>     /x82/x38/xe0/x31 HANGUL SYLLABLE NOP
-+<UB193>     /x82/x38/xe0/x32 HANGUL SYLLABLE NOH
-+<UB194>     /x82/x38/xe0/x33 HANGUL SYLLABLE NWA
-+<UB195>     /x82/x38/xe0/x34 HANGUL SYLLABLE NWAG
-+<UB196>     /x82/x38/xe0/x35 HANGUL SYLLABLE NWAGG
-+<UB197>     /x82/x38/xe0/x36 HANGUL SYLLABLE NWAGS
-+<UB198>     /x82/x38/xe0/x37 HANGUL SYLLABLE NWAN
-+<UB199>     /x82/x38/xe0/x38 HANGUL SYLLABLE NWANI
-+<UB19A>     /x82/x38/xe0/x39 HANGUL SYLLABLE NWANH
-+<UB19B>     /x82/x38/xe1/x30 HANGUL SYLLABLE NWAD
-+<UB19C>     /x82/x38/xe1/x31 HANGUL SYLLABLE NWAL
-+<UB19D>     /x82/x38/xe1/x32 HANGUL SYLLABLE NWALG
-+<UB19E>     /x82/x38/xe1/x33 HANGUL SYLLABLE NWALM
-+<UB19F>     /x82/x38/xe1/x34 HANGUL SYLLABLE NWALB
-+<UB1A0>     /x82/x38/xe1/x35 HANGUL SYLLABLE NWALS
-+<UB1A1>     /x82/x38/xe1/x36 HANGUL SYLLABLE NWALT
-+<UB1A2>     /x82/x38/xe1/x37 HANGUL SYLLABLE NWALP
-+<UB1A3>     /x82/x38/xe1/x38 HANGUL SYLLABLE NWALH
-+<UB1A4>     /x82/x38/xe1/x39 HANGUL SYLLABLE NWAM
-+<UB1A5>     /x82/x38/xe2/x30 HANGUL SYLLABLE NWAB
-+<UB1A6>     /x82/x38/xe2/x31 HANGUL SYLLABLE NWABS
-+<UB1A7>     /x82/x38/xe2/x32 HANGUL SYLLABLE NWAS
-+<UB1A8>     /x82/x38/xe2/x33 HANGUL SYLLABLE NWASS
-+<UB1A9>     /x82/x38/xe2/x34 HANGUL SYLLABLE NWANG
-+<UB1AA>     /x82/x38/xe2/x35 HANGUL SYLLABLE NWAJ
-+<UB1AB>     /x82/x38/xe2/x36 HANGUL SYLLABLE NWAC
-+<UB1AC>     /x82/x38/xe2/x37 HANGUL SYLLABLE NWAK
-+<UB1AD>     /x82/x38/xe2/x38 HANGUL SYLLABLE NWAT
-+<UB1AE>     /x82/x38/xe2/x39 HANGUL SYLLABLE NWAP
-+<UB1AF>     /x82/x38/xe3/x30 HANGUL SYLLABLE NWAH
-+<UB1B0>     /x82/x38/xe3/x31 HANGUL SYLLABLE NWAE
-+<UB1B1>     /x82/x38/xe3/x32 HANGUL SYLLABLE NWAEG
-+<UB1B2>     /x82/x38/xe3/x33 HANGUL SYLLABLE NWAEGG
-+<UB1B3>     /x82/x38/xe3/x34 HANGUL SYLLABLE NWAEGS
-+<UB1B4>     /x82/x38/xe3/x35 HANGUL SYLLABLE NWAEN
-+<UB1B5>     /x82/x38/xe3/x36 HANGUL SYLLABLE NWAENI
-+<UB1B6>     /x82/x38/xe3/x37 HANGUL SYLLABLE NWAENH
-+<UB1B7>     /x82/x38/xe3/x38 HANGUL SYLLABLE NWAED
-+<UB1B8>     /x82/x38/xe3/x39 HANGUL SYLLABLE NWAEL
-+<UB1B9>     /x82/x38/xe4/x30 HANGUL SYLLABLE NWAELG
-+<UB1BA>     /x82/x38/xe4/x31 HANGUL SYLLABLE NWAELM
-+<UB1BB>     /x82/x38/xe4/x32 HANGUL SYLLABLE NWAELB
-+<UB1BC>     /x82/x38/xe4/x33 HANGUL SYLLABLE NWAELS
-+<UB1BD>     /x82/x38/xe4/x34 HANGUL SYLLABLE NWAELT
-+<UB1BE>     /x82/x38/xe4/x35 HANGUL SYLLABLE NWAELP
-+<UB1BF>     /x82/x38/xe4/x36 HANGUL SYLLABLE NWAELH
-+<UB1C0>     /x82/x38/xe4/x37 HANGUL SYLLABLE NWAEM
-+<UB1C1>     /x82/x38/xe4/x38 HANGUL SYLLABLE NWAEB
-+<UB1C2>     /x82/x38/xe4/x39 HANGUL SYLLABLE NWAEBS
-+<UB1C3>     /x82/x38/xe5/x30 HANGUL SYLLABLE NWAES
-+<UB1C4>     /x82/x38/xe5/x31 HANGUL SYLLABLE NWAESS
-+<UB1C5>     /x82/x38/xe5/x32 HANGUL SYLLABLE NWAENG
-+<UB1C6>     /x82/x38/xe5/x33 HANGUL SYLLABLE NWAEJ
-+<UB1C7>     /x82/x38/xe5/x34 HANGUL SYLLABLE NWAEC
-+<UB1C8>     /x82/x38/xe5/x35 HANGUL SYLLABLE NWAEK
-+<UB1C9>     /x82/x38/xe5/x36 HANGUL SYLLABLE NWAET
-+<UB1CA>     /x82/x38/xe5/x37 HANGUL SYLLABLE NWAEP
-+<UB1CB>     /x82/x38/xe5/x38 HANGUL SYLLABLE NWAEH
-+<UB1CC>     /x82/x38/xe5/x39 HANGUL SYLLABLE NOE
-+<UB1CD>     /x82/x38/xe6/x30 HANGUL SYLLABLE NOEG
-+<UB1CE>     /x82/x38/xe6/x31 HANGUL SYLLABLE NOEGG
-+<UB1CF>     /x82/x38/xe6/x32 HANGUL SYLLABLE NOEGS
-+<UB1D0>     /x82/x38/xe6/x33 HANGUL SYLLABLE NOEN
-+<UB1D1>     /x82/x38/xe6/x34 HANGUL SYLLABLE NOENI
-+<UB1D2>     /x82/x38/xe6/x35 HANGUL SYLLABLE NOENH
-+<UB1D3>     /x82/x38/xe6/x36 HANGUL SYLLABLE NOED
-+<UB1D4>     /x82/x38/xe6/x37 HANGUL SYLLABLE NOEL
-+<UB1D5>     /x82/x38/xe6/x38 HANGUL SYLLABLE NOELG
-+<UB1D6>     /x82/x38/xe6/x39 HANGUL SYLLABLE NOELM
-+<UB1D7>     /x82/x38/xe7/x30 HANGUL SYLLABLE NOELB
-+<UB1D8>     /x82/x38/xe7/x31 HANGUL SYLLABLE NOELS
-+<UB1D9>     /x82/x38/xe7/x32 HANGUL SYLLABLE NOELT
-+<UB1DA>     /x82/x38/xe7/x33 HANGUL SYLLABLE NOELP
-+<UB1DB>     /x82/x38/xe7/x34 HANGUL SYLLABLE NOELH
-+<UB1DC>     /x82/x38/xe7/x35 HANGUL SYLLABLE NOEM
-+<UB1DD>     /x82/x38/xe7/x36 HANGUL SYLLABLE NOEB
-+<UB1DE>     /x82/x38/xe7/x37 HANGUL SYLLABLE NOEBS
-+<UB1DF>     /x82/x38/xe7/x38 HANGUL SYLLABLE NOES
-+<UB1E0>     /x82/x38/xe7/x39 HANGUL SYLLABLE NOESS
-+<UB1E1>     /x82/x38/xe8/x30 HANGUL SYLLABLE NOENG
-+<UB1E2>     /x82/x38/xe8/x31 HANGUL SYLLABLE NOEJ
-+<UB1E3>     /x82/x38/xe8/x32 HANGUL SYLLABLE NOEC
-+<UB1E4>     /x82/x38/xe8/x33 HANGUL SYLLABLE NOEK
-+<UB1E5>     /x82/x38/xe8/x34 HANGUL SYLLABLE NOET
-+<UB1E6>     /x82/x38/xe8/x35 HANGUL SYLLABLE NOEP
-+<UB1E7>     /x82/x38/xe8/x36 HANGUL SYLLABLE NOEH
-+<UB1E8>     /x82/x38/xe8/x37 HANGUL SYLLABLE NYO
-+<UB1E9>     /x82/x38/xe8/x38 HANGUL SYLLABLE NYOG
-+<UB1EA>     /x82/x38/xe8/x39 HANGUL SYLLABLE NYOGG
-+<UB1EB>     /x82/x38/xe9/x30 HANGUL SYLLABLE NYOGS
-+<UB1EC>     /x82/x38/xe9/x31 HANGUL SYLLABLE NYON
-+<UB1ED>     /x82/x38/xe9/x32 HANGUL SYLLABLE NYONI
-+<UB1EE>     /x82/x38/xe9/x33 HANGUL SYLLABLE NYONH
-+<UB1EF>     /x82/x38/xe9/x34 HANGUL SYLLABLE NYOD
-+<UB1F0>     /x82/x38/xe9/x35 HANGUL SYLLABLE NYOL
-+<UB1F1>     /x82/x38/xe9/x36 HANGUL SYLLABLE NYOLG
-+<UB1F2>     /x82/x38/xe9/x37 HANGUL SYLLABLE NYOLM
-+<UB1F3>     /x82/x38/xe9/x38 HANGUL SYLLABLE NYOLB
-+<UB1F4>     /x82/x38/xe9/x39 HANGUL SYLLABLE NYOLS
-+<UB1F5>     /x82/x38/xea/x30 HANGUL SYLLABLE NYOLT
-+<UB1F6>     /x82/x38/xea/x31 HANGUL SYLLABLE NYOLP
-+<UB1F7>     /x82/x38/xea/x32 HANGUL SYLLABLE NYOLH
-+<UB1F8>     /x82/x38/xea/x33 HANGUL SYLLABLE NYOM
-+<UB1F9>     /x82/x38/xea/x34 HANGUL SYLLABLE NYOB
-+<UB1FA>     /x82/x38/xea/x35 HANGUL SYLLABLE NYOBS
-+<UB1FB>     /x82/x38/xea/x36 HANGUL SYLLABLE NYOS
-+<UB1FC>     /x82/x38/xea/x37 HANGUL SYLLABLE NYOSS
-+<UB1FD>     /x82/x38/xea/x38 HANGUL SYLLABLE NYONG
-+<UB1FE>     /x82/x38/xea/x39 HANGUL SYLLABLE NYOJ
-+<UB1FF>     /x82/x38/xeb/x30 HANGUL SYLLABLE NYOC
-+<UB200>     /x82/x38/xeb/x31 HANGUL SYLLABLE NYOK
-+<UB201>     /x82/x38/xeb/x32 HANGUL SYLLABLE NYOT
-+<UB202>     /x82/x38/xeb/x33 HANGUL SYLLABLE NYOP
-+<UB203>     /x82/x38/xeb/x34 HANGUL SYLLABLE NYOH
-+<UB204>     /x82/x38/xeb/x35 HANGUL SYLLABLE NU
-+<UB205>     /x82/x38/xeb/x36 HANGUL SYLLABLE NUG
-+<UB206>     /x82/x38/xeb/x37 HANGUL SYLLABLE NUGG
-+<UB207>     /x82/x38/xeb/x38 HANGUL SYLLABLE NUGS
-+<UB208>     /x82/x38/xeb/x39 HANGUL SYLLABLE NUN
-+<UB209>     /x82/x38/xec/x30 HANGUL SYLLABLE NUNI
-+<UB20A>     /x82/x38/xec/x31 HANGUL SYLLABLE NUNH
-+<UB20B>     /x82/x38/xec/x32 HANGUL SYLLABLE NUD
-+<UB20C>     /x82/x38/xec/x33 HANGUL SYLLABLE NUL
-+<UB20D>     /x82/x38/xec/x34 HANGUL SYLLABLE NULG
-+<UB20E>     /x82/x38/xec/x35 HANGUL SYLLABLE NULM
-+<UB20F>     /x82/x38/xec/x36 HANGUL SYLLABLE NULB
-+<UB210>     /x82/x38/xec/x37 HANGUL SYLLABLE NULS
-+<UB211>     /x82/x38/xec/x38 HANGUL SYLLABLE NULT
-+<UB212>     /x82/x38/xec/x39 HANGUL SYLLABLE NULP
-+<UB213>     /x82/x38/xed/x30 HANGUL SYLLABLE NULH
-+<UB214>     /x82/x38/xed/x31 HANGUL SYLLABLE NUM
-+<UB215>     /x82/x38/xed/x32 HANGUL SYLLABLE NUB
-+<UB216>     /x82/x38/xed/x33 HANGUL SYLLABLE NUBS
-+<UB217>     /x82/x38/xed/x34 HANGUL SYLLABLE NUS
-+<UB218>     /x82/x38/xed/x35 HANGUL SYLLABLE NUSS
-+<UB219>     /x82/x38/xed/x36 HANGUL SYLLABLE NUNG
-+<UB21A>     /x82/x38/xed/x37 HANGUL SYLLABLE NUJ
-+<UB21B>     /x82/x38/xed/x38 HANGUL SYLLABLE NUC
-+<UB21C>     /x82/x38/xed/x39 HANGUL SYLLABLE NUK
-+<UB21D>     /x82/x38/xee/x30 HANGUL SYLLABLE NUT
-+<UB21E>     /x82/x38/xee/x31 HANGUL SYLLABLE NUP
-+<UB21F>     /x82/x38/xee/x32 HANGUL SYLLABLE NUH
-+<UB220>     /x82/x38/xee/x33 HANGUL SYLLABLE NWEO
-+<UB221>     /x82/x38/xee/x34 HANGUL SYLLABLE NWEOG
-+<UB222>     /x82/x38/xee/x35 HANGUL SYLLABLE NWEOGG
-+<UB223>     /x82/x38/xee/x36 HANGUL SYLLABLE NWEOGS
-+<UB224>     /x82/x38/xee/x37 HANGUL SYLLABLE NWEON
-+<UB225>     /x82/x38/xee/x38 HANGUL SYLLABLE NWEONI
-+<UB226>     /x82/x38/xee/x39 HANGUL SYLLABLE NWEONH
-+<UB227>     /x82/x38/xef/x30 HANGUL SYLLABLE NWEOD
-+<UB228>     /x82/x38/xef/x31 HANGUL SYLLABLE NWEOL
-+<UB229>     /x82/x38/xef/x32 HANGUL SYLLABLE NWEOLG
-+<UB22A>     /x82/x38/xef/x33 HANGUL SYLLABLE NWEOLM
-+<UB22B>     /x82/x38/xef/x34 HANGUL SYLLABLE NWEOLB
-+<UB22C>     /x82/x38/xef/x35 HANGUL SYLLABLE NWEOLS
-+<UB22D>     /x82/x38/xef/x36 HANGUL SYLLABLE NWEOLT
-+<UB22E>     /x82/x38/xef/x37 HANGUL SYLLABLE NWEOLP
-+<UB22F>     /x82/x38/xef/x38 HANGUL SYLLABLE NWEOLH
-+<UB230>     /x82/x38/xef/x39 HANGUL SYLLABLE NWEOM
-+<UB231>     /x82/x38/xf0/x30 HANGUL SYLLABLE NWEOB
-+<UB232>     /x82/x38/xf0/x31 HANGUL SYLLABLE NWEOBS
-+<UB233>     /x82/x38/xf0/x32 HANGUL SYLLABLE NWEOS
-+<UB234>     /x82/x38/xf0/x33 HANGUL SYLLABLE NWEOSS
-+<UB235>     /x82/x38/xf0/x34 HANGUL SYLLABLE NWEONG
-+<UB236>     /x82/x38/xf0/x35 HANGUL SYLLABLE NWEOJ
-+<UB237>     /x82/x38/xf0/x36 HANGUL SYLLABLE NWEOC
-+<UB238>     /x82/x38/xf0/x37 HANGUL SYLLABLE NWEOK
-+<UB239>     /x82/x38/xf0/x38 HANGUL SYLLABLE NWEOT
-+<UB23A>     /x82/x38/xf0/x39 HANGUL SYLLABLE NWEOP
-+<UB23B>     /x82/x38/xf1/x30 HANGUL SYLLABLE NWEOH
-+<UB23C>     /x82/x38/xf1/x31 HANGUL SYLLABLE NWE
-+<UB23D>     /x82/x38/xf1/x32 HANGUL SYLLABLE NWEG
-+<UB23E>     /x82/x38/xf1/x33 HANGUL SYLLABLE NWEGG
-+<UB23F>     /x82/x38/xf1/x34 HANGUL SYLLABLE NWEGS
-+<UB240>     /x82/x38/xf1/x35 HANGUL SYLLABLE NWEN
-+<UB241>     /x82/x38/xf1/x36 HANGUL SYLLABLE NWENI
-+<UB242>     /x82/x38/xf1/x37 HANGUL SYLLABLE NWENH
-+<UB243>     /x82/x38/xf1/x38 HANGUL SYLLABLE NWED
-+<UB244>     /x82/x38/xf1/x39 HANGUL SYLLABLE NWEL
-+<UB245>     /x82/x38/xf2/x30 HANGUL SYLLABLE NWELG
-+<UB246>     /x82/x38/xf2/x31 HANGUL SYLLABLE NWELM
-+<UB247>     /x82/x38/xf2/x32 HANGUL SYLLABLE NWELB
-+<UB248>     /x82/x38/xf2/x33 HANGUL SYLLABLE NWELS
-+<UB249>     /x82/x38/xf2/x34 HANGUL SYLLABLE NWELT
-+<UB24A>     /x82/x38/xf2/x35 HANGUL SYLLABLE NWELP
-+<UB24B>     /x82/x38/xf2/x36 HANGUL SYLLABLE NWELH
-+<UB24C>     /x82/x38/xf2/x37 HANGUL SYLLABLE NWEM
-+<UB24D>     /x82/x38/xf2/x38 HANGUL SYLLABLE NWEB
-+<UB24E>     /x82/x38/xf2/x39 HANGUL SYLLABLE NWEBS
-+<UB24F>     /x82/x38/xf3/x30 HANGUL SYLLABLE NWES
-+<UB250>     /x82/x38/xf3/x31 HANGUL SYLLABLE NWESS
-+<UB251>     /x82/x38/xf3/x32 HANGUL SYLLABLE NWENG
-+<UB252>     /x82/x38/xf3/x33 HANGUL SYLLABLE NWEJ
-+<UB253>     /x82/x38/xf3/x34 HANGUL SYLLABLE NWEC
-+<UB254>     /x82/x38/xf3/x35 HANGUL SYLLABLE NWEK
-+<UB255>     /x82/x38/xf3/x36 HANGUL SYLLABLE NWET
-+<UB256>     /x82/x38/xf3/x37 HANGUL SYLLABLE NWEP
-+<UB257>     /x82/x38/xf3/x38 HANGUL SYLLABLE NWEH
-+<UB258>     /x82/x38/xf3/x39 HANGUL SYLLABLE NWI
-+<UB259>     /x82/x38/xf4/x30 HANGUL SYLLABLE NWIG
-+<UB25A>     /x82/x38/xf4/x31 HANGUL SYLLABLE NWIGG
-+<UB25B>     /x82/x38/xf4/x32 HANGUL SYLLABLE NWIGS
-+<UB25C>     /x82/x38/xf4/x33 HANGUL SYLLABLE NWIN
-+<UB25D>     /x82/x38/xf4/x34 HANGUL SYLLABLE NWINI
-+<UB25E>     /x82/x38/xf4/x35 HANGUL SYLLABLE NWINH
-+<UB25F>     /x82/x38/xf4/x36 HANGUL SYLLABLE NWID
-+<UB260>     /x82/x38/xf4/x37 HANGUL SYLLABLE NWIL
-+<UB261>     /x82/x38/xf4/x38 HANGUL SYLLABLE NWILG
-+<UB262>     /x82/x38/xf4/x39 HANGUL SYLLABLE NWILM
-+<UB263>     /x82/x38/xf5/x30 HANGUL SYLLABLE NWILB
-+<UB264>     /x82/x38/xf5/x31 HANGUL SYLLABLE NWILS
-+<UB265>     /x82/x38/xf5/x32 HANGUL SYLLABLE NWILT
-+<UB266>     /x82/x38/xf5/x33 HANGUL SYLLABLE NWILP
-+<UB267>     /x82/x38/xf5/x34 HANGUL SYLLABLE NWILH
-+<UB268>     /x82/x38/xf5/x35 HANGUL SYLLABLE NWIM
-+<UB269>     /x82/x38/xf5/x36 HANGUL SYLLABLE NWIB
-+<UB26A>     /x82/x38/xf5/x37 HANGUL SYLLABLE NWIBS
-+<UB26B>     /x82/x38/xf5/x38 HANGUL SYLLABLE NWIS
-+<UB26C>     /x82/x38/xf5/x39 HANGUL SYLLABLE NWISS
-+<UB26D>     /x82/x38/xf6/x30 HANGUL SYLLABLE NWING
-+<UB26E>     /x82/x38/xf6/x31 HANGUL SYLLABLE NWIJ
-+<UB26F>     /x82/x38/xf6/x32 HANGUL SYLLABLE NWIC
-+<UB270>     /x82/x38/xf6/x33 HANGUL SYLLABLE NWIK
-+<UB271>     /x82/x38/xf6/x34 HANGUL SYLLABLE NWIT
-+<UB272>     /x82/x38/xf6/x35 HANGUL SYLLABLE NWIP
-+<UB273>     /x82/x38/xf6/x36 HANGUL SYLLABLE NWIH
-+<UB274>     /x82/x38/xf6/x37 HANGUL SYLLABLE NYU
-+<UB275>     /x82/x38/xf6/x38 HANGUL SYLLABLE NYUG
-+<UB276>     /x82/x38/xf6/x39 HANGUL SYLLABLE NYUGG
-+<UB277>     /x82/x38/xf7/x30 HANGUL SYLLABLE NYUGS
-+<UB278>     /x82/x38/xf7/x31 HANGUL SYLLABLE NYUN
-+<UB279>     /x82/x38/xf7/x32 HANGUL SYLLABLE NYUNI
-+<UB27A>     /x82/x38/xf7/x33 HANGUL SYLLABLE NYUNH
-+<UB27B>     /x82/x38/xf7/x34 HANGUL SYLLABLE NYUD
-+<UB27C>     /x82/x38/xf7/x35 HANGUL SYLLABLE NYUL
-+<UB27D>     /x82/x38/xf7/x36 HANGUL SYLLABLE NYULG
-+<UB27E>     /x82/x38/xf7/x37 HANGUL SYLLABLE NYULM
-+<UB27F>     /x82/x38/xf7/x38 HANGUL SYLLABLE NYULB
-+<UB280>     /x82/x38/xf7/x39 HANGUL SYLLABLE NYULS
-+<UB281>     /x82/x38/xf8/x30 HANGUL SYLLABLE NYULT
-+<UB282>     /x82/x38/xf8/x31 HANGUL SYLLABLE NYULP
-+<UB283>     /x82/x38/xf8/x32 HANGUL SYLLABLE NYULH
-+<UB284>     /x82/x38/xf8/x33 HANGUL SYLLABLE NYUM
-+<UB285>     /x82/x38/xf8/x34 HANGUL SYLLABLE NYUB
-+<UB286>     /x82/x38/xf8/x35 HANGUL SYLLABLE NYUBS
-+<UB287>     /x82/x38/xf8/x36 HANGUL SYLLABLE NYUS
-+<UB288>     /x82/x38/xf8/x37 HANGUL SYLLABLE NYUSS
-+<UB289>     /x82/x38/xf8/x38 HANGUL SYLLABLE NYUNG
-+<UB28A>     /x82/x38/xf8/x39 HANGUL SYLLABLE NYUJ
-+<UB28B>     /x82/x38/xf9/x30 HANGUL SYLLABLE NYUC
-+<UB28C>     /x82/x38/xf9/x31 HANGUL SYLLABLE NYUK
-+<UB28D>     /x82/x38/xf9/x32 HANGUL SYLLABLE NYUT
-+<UB28E>     /x82/x38/xf9/x33 HANGUL SYLLABLE NYUP
-+<UB28F>     /x82/x38/xf9/x34 HANGUL SYLLABLE NYUH
-+<UB290>     /x82/x38/xf9/x35 HANGUL SYLLABLE NEU
-+<UB291>     /x82/x38/xf9/x36 HANGUL SYLLABLE NEUG
-+<UB292>     /x82/x38/xf9/x37 HANGUL SYLLABLE NEUGG
-+<UB293>     /x82/x38/xf9/x38 HANGUL SYLLABLE NEUGS
-+<UB294>     /x82/x38/xf9/x39 HANGUL SYLLABLE NEUN
-+<UB295>     /x82/x38/xfa/x30 HANGUL SYLLABLE NEUNI
-+<UB296>     /x82/x38/xfa/x31 HANGUL SYLLABLE NEUNH
-+<UB297>     /x82/x38/xfa/x32 HANGUL SYLLABLE NEUD
-+<UB298>     /x82/x38/xfa/x33 HANGUL SYLLABLE NEUL
-+<UB299>     /x82/x38/xfa/x34 HANGUL SYLLABLE NEULG
-+<UB29A>     /x82/x38/xfa/x35 HANGUL SYLLABLE NEULM
-+<UB29B>     /x82/x38/xfa/x36 HANGUL SYLLABLE NEULB
-+<UB29C>     /x82/x38/xfa/x37 HANGUL SYLLABLE NEULS
-+<UB29D>     /x82/x38/xfa/x38 HANGUL SYLLABLE NEULT
-+<UB29E>     /x82/x38/xfa/x39 HANGUL SYLLABLE NEULP
-+<UB29F>     /x82/x38/xfb/x30 HANGUL SYLLABLE NEULH
-+<UB2A0>     /x82/x38/xfb/x31 HANGUL SYLLABLE NEUM
-+<UB2A1>     /x82/x38/xfb/x32 HANGUL SYLLABLE NEUB
-+<UB2A2>     /x82/x38/xfb/x33 HANGUL SYLLABLE NEUBS
-+<UB2A3>     /x82/x38/xfb/x34 HANGUL SYLLABLE NEUS
-+<UB2A4>     /x82/x38/xfb/x35 HANGUL SYLLABLE NEUSS
-+<UB2A5>     /x82/x38/xfb/x36 HANGUL SYLLABLE NEUNG
-+<UB2A6>     /x82/x38/xfb/x37 HANGUL SYLLABLE NEUJ
-+<UB2A7>     /x82/x38/xfb/x38 HANGUL SYLLABLE NEUC
-+<UB2A8>     /x82/x38/xfb/x39 HANGUL SYLLABLE NEUK
-+<UB2A9>     /x82/x38/xfc/x30 HANGUL SYLLABLE NEUT
-+<UB2AA>     /x82/x38/xfc/x31 HANGUL SYLLABLE NEUP
-+<UB2AB>     /x82/x38/xfc/x32 HANGUL SYLLABLE NEUH
-+<UB2AC>     /x82/x38/xfc/x33 HANGUL SYLLABLE NYI
-+<UB2AD>     /x82/x38/xfc/x34 HANGUL SYLLABLE NYIG
-+<UB2AE>     /x82/x38/xfc/x35 HANGUL SYLLABLE NYIGG
-+<UB2AF>     /x82/x38/xfc/x36 HANGUL SYLLABLE NYIGS
-+<UB2B0>     /x82/x38/xfc/x37 HANGUL SYLLABLE NYIN
-+<UB2B1>     /x82/x38/xfc/x38 HANGUL SYLLABLE NYINI
-+<UB2B2>     /x82/x38/xfc/x39 HANGUL SYLLABLE NYINH
-+<UB2B3>     /x82/x38/xfd/x30 HANGUL SYLLABLE NYID
-+<UB2B4>     /x82/x38/xfd/x31 HANGUL SYLLABLE NYIL
-+<UB2B5>     /x82/x38/xfd/x32 HANGUL SYLLABLE NYILG
-+<UB2B6>     /x82/x38/xfd/x33 HANGUL SYLLABLE NYILM
-+<UB2B7>     /x82/x38/xfd/x34 HANGUL SYLLABLE NYILB
-+<UB2B8>     /x82/x38/xfd/x35 HANGUL SYLLABLE NYILS
-+<UB2B9>     /x82/x38/xfd/x36 HANGUL SYLLABLE NYILT
-+<UB2BA>     /x82/x38/xfd/x37 HANGUL SYLLABLE NYILP
-+<UB2BB>     /x82/x38/xfd/x38 HANGUL SYLLABLE NYILH
-+<UB2BC>     /x82/x38/xfd/x39 HANGUL SYLLABLE NYIM
-+<UB2BD>     /x82/x38/xfe/x30 HANGUL SYLLABLE NYIB
-+<UB2BE>     /x82/x38/xfe/x31 HANGUL SYLLABLE NYIBS
-+<UB2BF>     /x82/x38/xfe/x32 HANGUL SYLLABLE NYIS
-+<UB2C0>     /x82/x38/xfe/x33 HANGUL SYLLABLE NYISS
-+<UB2C1>     /x82/x38/xfe/x34 HANGUL SYLLABLE NYING
-+<UB2C2>     /x82/x38/xfe/x35 HANGUL SYLLABLE NYIJ
-+<UB2C3>     /x82/x38/xfe/x36 HANGUL SYLLABLE NYIC
-+<UB2C4>     /x82/x38/xfe/x37 HANGUL SYLLABLE NYIK
-+<UB2C5>     /x82/x38/xfe/x38 HANGUL SYLLABLE NYIT
-+<UB2C6>     /x82/x38/xfe/x39 HANGUL SYLLABLE NYIP
-+<UB2C7>     /x82/x39/x81/x30 HANGUL SYLLABLE NYIH
-+<UB2C8>     /x82/x39/x81/x31 HANGUL SYLLABLE NI
-+<UB2C9>     /x82/x39/x81/x32 HANGUL SYLLABLE NIG
-+<UB2CA>     /x82/x39/x81/x33 HANGUL SYLLABLE NIGG
-+<UB2CB>     /x82/x39/x81/x34 HANGUL SYLLABLE NIGS
-+<UB2CC>     /x82/x39/x81/x35 HANGUL SYLLABLE NIN
-+<UB2CD>     /x82/x39/x81/x36 HANGUL SYLLABLE NINI
-+<UB2CE>     /x82/x39/x81/x37 HANGUL SYLLABLE NINH
-+<UB2CF>     /x82/x39/x81/x38 HANGUL SYLLABLE NID
-+<UB2D0>     /x82/x39/x81/x39 HANGUL SYLLABLE NIL
-+<UB2D1>     /x82/x39/x82/x30 HANGUL SYLLABLE NILG
-+<UB2D2>     /x82/x39/x82/x31 HANGUL SYLLABLE NILM
-+<UB2D3>     /x82/x39/x82/x32 HANGUL SYLLABLE NILB
-+<UB2D4>     /x82/x39/x82/x33 HANGUL SYLLABLE NILS
-+<UB2D5>     /x82/x39/x82/x34 HANGUL SYLLABLE NILT
-+<UB2D6>     /x82/x39/x82/x35 HANGUL SYLLABLE NILP
-+<UB2D7>     /x82/x39/x82/x36 HANGUL SYLLABLE NILH
-+<UB2D8>     /x82/x39/x82/x37 HANGUL SYLLABLE NIM
-+<UB2D9>     /x82/x39/x82/x38 HANGUL SYLLABLE NIB
-+<UB2DA>     /x82/x39/x82/x39 HANGUL SYLLABLE NIBS
-+<UB2DB>     /x82/x39/x83/x30 HANGUL SYLLABLE NIS
-+<UB2DC>     /x82/x39/x83/x31 HANGUL SYLLABLE NISS
-+<UB2DD>     /x82/x39/x83/x32 HANGUL SYLLABLE NING
-+<UB2DE>     /x82/x39/x83/x33 HANGUL SYLLABLE NIJ
-+<UB2DF>     /x82/x39/x83/x34 HANGUL SYLLABLE NIC
-+<UB2E0>     /x82/x39/x83/x35 HANGUL SYLLABLE NIK
-+<UB2E1>     /x82/x39/x83/x36 HANGUL SYLLABLE NIT
-+<UB2E2>     /x82/x39/x83/x37 HANGUL SYLLABLE NIP
-+<UB2E3>     /x82/x39/x83/x38 HANGUL SYLLABLE NIH
-+<UB2E4>     /x82/x39/x83/x39 HANGUL SYLLABLE DA
-+<UB2E5>     /x82/x39/x84/x30 HANGUL SYLLABLE DAG
-+<UB2E6>     /x82/x39/x84/x31 HANGUL SYLLABLE DAGG
-+<UB2E7>     /x82/x39/x84/x32 HANGUL SYLLABLE DAGS
-+<UB2E8>     /x82/x39/x84/x33 HANGUL SYLLABLE DAN
-+<UB2E9>     /x82/x39/x84/x34 HANGUL SYLLABLE DANI
-+<UB2EA>     /x82/x39/x84/x35 HANGUL SYLLABLE DANH
-+<UB2EB>     /x82/x39/x84/x36 HANGUL SYLLABLE DAD
-+<UB2EC>     /x82/x39/x84/x37 HANGUL SYLLABLE DAL
-+<UB2ED>     /x82/x39/x84/x38 HANGUL SYLLABLE DALG
-+<UB2EE>     /x82/x39/x84/x39 HANGUL SYLLABLE DALM
-+<UB2EF>     /x82/x39/x85/x30 HANGUL SYLLABLE DALB
-+<UB2F0>     /x82/x39/x85/x31 HANGUL SYLLABLE DALS
-+<UB2F1>     /x82/x39/x85/x32 HANGUL SYLLABLE DALT
-+<UB2F2>     /x82/x39/x85/x33 HANGUL SYLLABLE DALP
-+<UB2F3>     /x82/x39/x85/x34 HANGUL SYLLABLE DALH
-+<UB2F4>     /x82/x39/x85/x35 HANGUL SYLLABLE DAM
-+<UB2F5>     /x82/x39/x85/x36 HANGUL SYLLABLE DAB
-+<UB2F6>     /x82/x39/x85/x37 HANGUL SYLLABLE DABS
-+<UB2F7>     /x82/x39/x85/x38 HANGUL SYLLABLE DAS
-+<UB2F8>     /x82/x39/x85/x39 HANGUL SYLLABLE DASS
-+<UB2F9>     /x82/x39/x86/x30 HANGUL SYLLABLE DANG
-+<UB2FA>     /x82/x39/x86/x31 HANGUL SYLLABLE DAJ
-+<UB2FB>     /x82/x39/x86/x32 HANGUL SYLLABLE DAC
-+<UB2FC>     /x82/x39/x86/x33 HANGUL SYLLABLE DAK
-+<UB2FD>     /x82/x39/x86/x34 HANGUL SYLLABLE DAT
-+<UB2FE>     /x82/x39/x86/x35 HANGUL SYLLABLE DAP
-+<UB2FF>     /x82/x39/x86/x36 HANGUL SYLLABLE DAH
-+<UB300>     /x82/x39/x86/x37 HANGUL SYLLABLE DAE
-+<UB301>     /x82/x39/x86/x38 HANGUL SYLLABLE DAEG
-+<UB302>     /x82/x39/x86/x39 HANGUL SYLLABLE DAEGG
-+<UB303>     /x82/x39/x87/x30 HANGUL SYLLABLE DAEGS
-+<UB304>     /x82/x39/x87/x31 HANGUL SYLLABLE DAEN
-+<UB305>     /x82/x39/x87/x32 HANGUL SYLLABLE DAENI
-+<UB306>     /x82/x39/x87/x33 HANGUL SYLLABLE DAENH
-+<UB307>     /x82/x39/x87/x34 HANGUL SYLLABLE DAED
-+<UB308>     /x82/x39/x87/x35 HANGUL SYLLABLE DAEL
-+<UB309>     /x82/x39/x87/x36 HANGUL SYLLABLE DAELG
-+<UB30A>     /x82/x39/x87/x37 HANGUL SYLLABLE DAELM
-+<UB30B>     /x82/x39/x87/x38 HANGUL SYLLABLE DAELB
-+<UB30C>     /x82/x39/x87/x39 HANGUL SYLLABLE DAELS
-+<UB30D>     /x82/x39/x88/x30 HANGUL SYLLABLE DAELT
-+<UB30E>     /x82/x39/x88/x31 HANGUL SYLLABLE DAELP
-+<UB30F>     /x82/x39/x88/x32 HANGUL SYLLABLE DAELH
-+<UB310>     /x82/x39/x88/x33 HANGUL SYLLABLE DAEM
-+<UB311>     /x82/x39/x88/x34 HANGUL SYLLABLE DAEB
-+<UB312>     /x82/x39/x88/x35 HANGUL SYLLABLE DAEBS
-+<UB313>     /x82/x39/x88/x36 HANGUL SYLLABLE DAES
-+<UB314>     /x82/x39/x88/x37 HANGUL SYLLABLE DAESS
-+<UB315>     /x82/x39/x88/x38 HANGUL SYLLABLE DAENG
-+<UB316>     /x82/x39/x88/x39 HANGUL SYLLABLE DAEJ
-+<UB317>     /x82/x39/x89/x30 HANGUL SYLLABLE DAEC
-+<UB318>     /x82/x39/x89/x31 HANGUL SYLLABLE DAEK
-+<UB319>     /x82/x39/x89/x32 HANGUL SYLLABLE DAET
-+<UB31A>     /x82/x39/x89/x33 HANGUL SYLLABLE DAEP
-+<UB31B>     /x82/x39/x89/x34 HANGUL SYLLABLE DAEH
-+<UB31C>     /x82/x39/x89/x35 HANGUL SYLLABLE DYA
-+<UB31D>     /x82/x39/x89/x36 HANGUL SYLLABLE DYAG
-+<UB31E>     /x82/x39/x89/x37 HANGUL SYLLABLE DYAGG
-+<UB31F>     /x82/x39/x89/x38 HANGUL SYLLABLE DYAGS
-+<UB320>     /x82/x39/x89/x39 HANGUL SYLLABLE DYAN
-+<UB321>     /x82/x39/x8a/x30 HANGUL SYLLABLE DYANI
-+<UB322>     /x82/x39/x8a/x31 HANGUL SYLLABLE DYANH
-+<UB323>     /x82/x39/x8a/x32 HANGUL SYLLABLE DYAD
-+<UB324>     /x82/x39/x8a/x33 HANGUL SYLLABLE DYAL
-+<UB325>     /x82/x39/x8a/x34 HANGUL SYLLABLE DYALG
-+<UB326>     /x82/x39/x8a/x35 HANGUL SYLLABLE DYALM
-+<UB327>     /x82/x39/x8a/x36 HANGUL SYLLABLE DYALB
-+<UB328>     /x82/x39/x8a/x37 HANGUL SYLLABLE DYALS
-+<UB329>     /x82/x39/x8a/x38 HANGUL SYLLABLE DYALT
-+<UB32A>     /x82/x39/x8a/x39 HANGUL SYLLABLE DYALP
-+<UB32B>     /x82/x39/x8b/x30 HANGUL SYLLABLE DYALH
-+<UB32C>     /x82/x39/x8b/x31 HANGUL SYLLABLE DYAM
-+<UB32D>     /x82/x39/x8b/x32 HANGUL SYLLABLE DYAB
-+<UB32E>     /x82/x39/x8b/x33 HANGUL SYLLABLE DYABS
-+<UB32F>     /x82/x39/x8b/x34 HANGUL SYLLABLE DYAS
-+<UB330>     /x82/x39/x8b/x35 HANGUL SYLLABLE DYASS
-+<UB331>     /x82/x39/x8b/x36 HANGUL SYLLABLE DYANG
-+<UB332>     /x82/x39/x8b/x37 HANGUL SYLLABLE DYAJ
-+<UB333>     /x82/x39/x8b/x38 HANGUL SYLLABLE DYAC
-+<UB334>     /x82/x39/x8b/x39 HANGUL SYLLABLE DYAK
-+<UB335>     /x82/x39/x8c/x30 HANGUL SYLLABLE DYAT
-+<UB336>     /x82/x39/x8c/x31 HANGUL SYLLABLE DYAP
-+<UB337>     /x82/x39/x8c/x32 HANGUL SYLLABLE DYAH
-+<UB338>     /x82/x39/x8c/x33 HANGUL SYLLABLE DYAE
-+<UB339>     /x82/x39/x8c/x34 HANGUL SYLLABLE DYAEG
-+<UB33A>     /x82/x39/x8c/x35 HANGUL SYLLABLE DYAEGG
-+<UB33B>     /x82/x39/x8c/x36 HANGUL SYLLABLE DYAEGS
-+<UB33C>     /x82/x39/x8c/x37 HANGUL SYLLABLE DYAEN
-+<UB33D>     /x82/x39/x8c/x38 HANGUL SYLLABLE DYAENI
-+<UB33E>     /x82/x39/x8c/x39 HANGUL SYLLABLE DYAENH
-+<UB33F>     /x82/x39/x8d/x30 HANGUL SYLLABLE DYAED
-+<UB340>     /x82/x39/x8d/x31 HANGUL SYLLABLE DYAEL
-+<UB341>     /x82/x39/x8d/x32 HANGUL SYLLABLE DYAELG
-+<UB342>     /x82/x39/x8d/x33 HANGUL SYLLABLE DYAELM
-+<UB343>     /x82/x39/x8d/x34 HANGUL SYLLABLE DYAELB
-+<UB344>     /x82/x39/x8d/x35 HANGUL SYLLABLE DYAELS
-+<UB345>     /x82/x39/x8d/x36 HANGUL SYLLABLE DYAELT
-+<UB346>     /x82/x39/x8d/x37 HANGUL SYLLABLE DYAELP
-+<UB347>     /x82/x39/x8d/x38 HANGUL SYLLABLE DYAELH
-+<UB348>     /x82/x39/x8d/x39 HANGUL SYLLABLE DYAEM
-+<UB349>     /x82/x39/x8e/x30 HANGUL SYLLABLE DYAEB
-+<UB34A>     /x82/x39/x8e/x31 HANGUL SYLLABLE DYAEBS
-+<UB34B>     /x82/x39/x8e/x32 HANGUL SYLLABLE DYAES
-+<UB34C>     /x82/x39/x8e/x33 HANGUL SYLLABLE DYAESS
-+<UB34D>     /x82/x39/x8e/x34 HANGUL SYLLABLE DYAENG
-+<UB34E>     /x82/x39/x8e/x35 HANGUL SYLLABLE DYAEJ
-+<UB34F>     /x82/x39/x8e/x36 HANGUL SYLLABLE DYAEC
-+<UB350>     /x82/x39/x8e/x37 HANGUL SYLLABLE DYAEK
-+<UB351>     /x82/x39/x8e/x38 HANGUL SYLLABLE DYAET
-+<UB352>     /x82/x39/x8e/x39 HANGUL SYLLABLE DYAEP
-+<UB353>     /x82/x39/x8f/x30 HANGUL SYLLABLE DYAEH
-+<UB354>     /x82/x39/x8f/x31 HANGUL SYLLABLE DEO
-+<UB355>     /x82/x39/x8f/x32 HANGUL SYLLABLE DEOG
-+<UB356>     /x82/x39/x8f/x33 HANGUL SYLLABLE DEOGG
-+<UB357>     /x82/x39/x8f/x34 HANGUL SYLLABLE DEOGS
-+<UB358>     /x82/x39/x8f/x35 HANGUL SYLLABLE DEON
-+<UB359>     /x82/x39/x8f/x36 HANGUL SYLLABLE DEONI
-+<UB35A>     /x82/x39/x8f/x37 HANGUL SYLLABLE DEONH
-+<UB35B>     /x82/x39/x8f/x38 HANGUL SYLLABLE DEOD
-+<UB35C>     /x82/x39/x8f/x39 HANGUL SYLLABLE DEOL
-+<UB35D>     /x82/x39/x90/x30 HANGUL SYLLABLE DEOLG
-+<UB35E>     /x82/x39/x90/x31 HANGUL SYLLABLE DEOLM
-+<UB35F>     /x82/x39/x90/x32 HANGUL SYLLABLE DEOLB
-+<UB360>     /x82/x39/x90/x33 HANGUL SYLLABLE DEOLS
-+<UB361>     /x82/x39/x90/x34 HANGUL SYLLABLE DEOLT
-+<UB362>     /x82/x39/x90/x35 HANGUL SYLLABLE DEOLP
-+<UB363>     /x82/x39/x90/x36 HANGUL SYLLABLE DEOLH
-+<UB364>     /x82/x39/x90/x37 HANGUL SYLLABLE DEOM
-+<UB365>     /x82/x39/x90/x38 HANGUL SYLLABLE DEOB
-+<UB366>     /x82/x39/x90/x39 HANGUL SYLLABLE DEOBS
-+<UB367>     /x82/x39/x91/x30 HANGUL SYLLABLE DEOS
-+<UB368>     /x82/x39/x91/x31 HANGUL SYLLABLE DEOSS
-+<UB369>     /x82/x39/x91/x32 HANGUL SYLLABLE DEONG
-+<UB36A>     /x82/x39/x91/x33 HANGUL SYLLABLE DEOJ
-+<UB36B>     /x82/x39/x91/x34 HANGUL SYLLABLE DEOC
-+<UB36C>     /x82/x39/x91/x35 HANGUL SYLLABLE DEOK
-+<UB36D>     /x82/x39/x91/x36 HANGUL SYLLABLE DEOT
-+<UB36E>     /x82/x39/x91/x37 HANGUL SYLLABLE DEOP
-+<UB36F>     /x82/x39/x91/x38 HANGUL SYLLABLE DEOH
-+<UB370>     /x82/x39/x91/x39 HANGUL SYLLABLE DE
-+<UB371>     /x82/x39/x92/x30 HANGUL SYLLABLE DEG
-+<UB372>     /x82/x39/x92/x31 HANGUL SYLLABLE DEGG
-+<UB373>     /x82/x39/x92/x32 HANGUL SYLLABLE DEGS
-+<UB374>     /x82/x39/x92/x33 HANGUL SYLLABLE DEN
-+<UB375>     /x82/x39/x92/x34 HANGUL SYLLABLE DENI
-+<UB376>     /x82/x39/x92/x35 HANGUL SYLLABLE DENH
-+<UB377>     /x82/x39/x92/x36 HANGUL SYLLABLE DED
-+<UB378>     /x82/x39/x92/x37 HANGUL SYLLABLE DEL
-+<UB379>     /x82/x39/x92/x38 HANGUL SYLLABLE DELG
-+<UB37A>     /x82/x39/x92/x39 HANGUL SYLLABLE DELM
-+<UB37B>     /x82/x39/x93/x30 HANGUL SYLLABLE DELB
-+<UB37C>     /x82/x39/x93/x31 HANGUL SYLLABLE DELS
-+<UB37D>     /x82/x39/x93/x32 HANGUL SYLLABLE DELT
-+<UB37E>     /x82/x39/x93/x33 HANGUL SYLLABLE DELP
-+<UB37F>     /x82/x39/x93/x34 HANGUL SYLLABLE DELH
-+<UB380>     /x82/x39/x93/x35 HANGUL SYLLABLE DEM
-+<UB381>     /x82/x39/x93/x36 HANGUL SYLLABLE DEB
-+<UB382>     /x82/x39/x93/x37 HANGUL SYLLABLE DEBS
-+<UB383>     /x82/x39/x93/x38 HANGUL SYLLABLE DES
-+<UB384>     /x82/x39/x93/x39 HANGUL SYLLABLE DESS
-+<UB385>     /x82/x39/x94/x30 HANGUL SYLLABLE DENG
-+<UB386>     /x82/x39/x94/x31 HANGUL SYLLABLE DEJ
-+<UB387>     /x82/x39/x94/x32 HANGUL SYLLABLE DEC
-+<UB388>     /x82/x39/x94/x33 HANGUL SYLLABLE DEK
-+<UB389>     /x82/x39/x94/x34 HANGUL SYLLABLE DET
-+<UB38A>     /x82/x39/x94/x35 HANGUL SYLLABLE DEP
-+<UB38B>     /x82/x39/x94/x36 HANGUL SYLLABLE DEH
-+<UB38C>     /x82/x39/x94/x37 HANGUL SYLLABLE DYEO
-+<UB38D>     /x82/x39/x94/x38 HANGUL SYLLABLE DYEOG
-+<UB38E>     /x82/x39/x94/x39 HANGUL SYLLABLE DYEOGG
-+<UB38F>     /x82/x39/x95/x30 HANGUL SYLLABLE DYEOGS
-+<UB390>     /x82/x39/x95/x31 HANGUL SYLLABLE DYEON
-+<UB391>     /x82/x39/x95/x32 HANGUL SYLLABLE DYEONI
-+<UB392>     /x82/x39/x95/x33 HANGUL SYLLABLE DYEONH
-+<UB393>     /x82/x39/x95/x34 HANGUL SYLLABLE DYEOD
-+<UB394>     /x82/x39/x95/x35 HANGUL SYLLABLE DYEOL
-+<UB395>     /x82/x39/x95/x36 HANGUL SYLLABLE DYEOLG
-+<UB396>     /x82/x39/x95/x37 HANGUL SYLLABLE DYEOLM
-+<UB397>     /x82/x39/x95/x38 HANGUL SYLLABLE DYEOLB
-+<UB398>     /x82/x39/x95/x39 HANGUL SYLLABLE DYEOLS
-+<UB399>     /x82/x39/x96/x30 HANGUL SYLLABLE DYEOLT
-+<UB39A>     /x82/x39/x96/x31 HANGUL SYLLABLE DYEOLP
-+<UB39B>     /x82/x39/x96/x32 HANGUL SYLLABLE DYEOLH
-+<UB39C>     /x82/x39/x96/x33 HANGUL SYLLABLE DYEOM
-+<UB39D>     /x82/x39/x96/x34 HANGUL SYLLABLE DYEOB
-+<UB39E>     /x82/x39/x96/x35 HANGUL SYLLABLE DYEOBS
-+<UB39F>     /x82/x39/x96/x36 HANGUL SYLLABLE DYEOS
-+<UB3A0>     /x82/x39/x96/x37 HANGUL SYLLABLE DYEOSS
-+<UB3A1>     /x82/x39/x96/x38 HANGUL SYLLABLE DYEONG
-+<UB3A2>     /x82/x39/x96/x39 HANGUL SYLLABLE DYEOJ
-+<UB3A3>     /x82/x39/x97/x30 HANGUL SYLLABLE DYEOC
-+<UB3A4>     /x82/x39/x97/x31 HANGUL SYLLABLE DYEOK
-+<UB3A5>     /x82/x39/x97/x32 HANGUL SYLLABLE DYEOT
-+<UB3A6>     /x82/x39/x97/x33 HANGUL SYLLABLE DYEOP
-+<UB3A7>     /x82/x39/x97/x34 HANGUL SYLLABLE DYEOH
-+<UB3A8>     /x82/x39/x97/x35 HANGUL SYLLABLE DYE
-+<UB3A9>     /x82/x39/x97/x36 HANGUL SYLLABLE DYEG
-+<UB3AA>     /x82/x39/x97/x37 HANGUL SYLLABLE DYEGG
-+<UB3AB>     /x82/x39/x97/x38 HANGUL SYLLABLE DYEGS
-+<UB3AC>     /x82/x39/x97/x39 HANGUL SYLLABLE DYEN
-+<UB3AD>     /x82/x39/x98/x30 HANGUL SYLLABLE DYENI
-+<UB3AE>     /x82/x39/x98/x31 HANGUL SYLLABLE DYENH
-+<UB3AF>     /x82/x39/x98/x32 HANGUL SYLLABLE DYED
-+<UB3B0>     /x82/x39/x98/x33 HANGUL SYLLABLE DYEL
-+<UB3B1>     /x82/x39/x98/x34 HANGUL SYLLABLE DYELG
-+<UB3B2>     /x82/x39/x98/x35 HANGUL SYLLABLE DYELM
-+<UB3B3>     /x82/x39/x98/x36 HANGUL SYLLABLE DYELB
-+<UB3B4>     /x82/x39/x98/x37 HANGUL SYLLABLE DYELS
-+<UB3B5>     /x82/x39/x98/x38 HANGUL SYLLABLE DYELT
-+<UB3B6>     /x82/x39/x98/x39 HANGUL SYLLABLE DYELP
-+<UB3B7>     /x82/x39/x99/x30 HANGUL SYLLABLE DYELH
-+<UB3B8>     /x82/x39/x99/x31 HANGUL SYLLABLE DYEM
-+<UB3B9>     /x82/x39/x99/x32 HANGUL SYLLABLE DYEB
-+<UB3BA>     /x82/x39/x99/x33 HANGUL SYLLABLE DYEBS
-+<UB3BB>     /x82/x39/x99/x34 HANGUL SYLLABLE DYES
-+<UB3BC>     /x82/x39/x99/x35 HANGUL SYLLABLE DYESS
-+<UB3BD>     /x82/x39/x99/x36 HANGUL SYLLABLE DYENG
-+<UB3BE>     /x82/x39/x99/x37 HANGUL SYLLABLE DYEJ
-+<UB3BF>     /x82/x39/x99/x38 HANGUL SYLLABLE DYEC
-+<UB3C0>     /x82/x39/x99/x39 HANGUL SYLLABLE DYEK
-+<UB3C1>     /x82/x39/x9a/x30 HANGUL SYLLABLE DYET
-+<UB3C2>     /x82/x39/x9a/x31 HANGUL SYLLABLE DYEP
-+<UB3C3>     /x82/x39/x9a/x32 HANGUL SYLLABLE DYEH
-+<UB3C4>     /x82/x39/x9a/x33 HANGUL SYLLABLE DO
-+<UB3C5>     /x82/x39/x9a/x34 HANGUL SYLLABLE DOG
-+<UB3C6>     /x82/x39/x9a/x35 HANGUL SYLLABLE DOGG
-+<UB3C7>     /x82/x39/x9a/x36 HANGUL SYLLABLE DOGS
-+<UB3C8>     /x82/x39/x9a/x37 HANGUL SYLLABLE DON
-+<UB3C9>     /x82/x39/x9a/x38 HANGUL SYLLABLE DONI
-+<UB3CA>     /x82/x39/x9a/x39 HANGUL SYLLABLE DONH
-+<UB3CB>     /x82/x39/x9b/x30 HANGUL SYLLABLE DOD
-+<UB3CC>     /x82/x39/x9b/x31 HANGUL SYLLABLE DOL
-+<UB3CD>     /x82/x39/x9b/x32 HANGUL SYLLABLE DOLG
-+<UB3CE>     /x82/x39/x9b/x33 HANGUL SYLLABLE DOLM
-+<UB3CF>     /x82/x39/x9b/x34 HANGUL SYLLABLE DOLB
-+<UB3D0>     /x82/x39/x9b/x35 HANGUL SYLLABLE DOLS
-+<UB3D1>     /x82/x39/x9b/x36 HANGUL SYLLABLE DOLT
-+<UB3D2>     /x82/x39/x9b/x37 HANGUL SYLLABLE DOLP
-+<UB3D3>     /x82/x39/x9b/x38 HANGUL SYLLABLE DOLH
-+<UB3D4>     /x82/x39/x9b/x39 HANGUL SYLLABLE DOM
-+<UB3D5>     /x82/x39/x9c/x30 HANGUL SYLLABLE DOB
-+<UB3D6>     /x82/x39/x9c/x31 HANGUL SYLLABLE DOBS
-+<UB3D7>     /x82/x39/x9c/x32 HANGUL SYLLABLE DOS
-+<UB3D8>     /x82/x39/x9c/x33 HANGUL SYLLABLE DOSS
-+<UB3D9>     /x82/x39/x9c/x34 HANGUL SYLLABLE DONG
-+<UB3DA>     /x82/x39/x9c/x35 HANGUL SYLLABLE DOJ
-+<UB3DB>     /x82/x39/x9c/x36 HANGUL SYLLABLE DOC
-+<UB3DC>     /x82/x39/x9c/x37 HANGUL SYLLABLE DOK
-+<UB3DD>     /x82/x39/x9c/x38 HANGUL SYLLABLE DOT
-+<UB3DE>     /x82/x39/x9c/x39 HANGUL SYLLABLE DOP
-+<UB3DF>     /x82/x39/x9d/x30 HANGUL SYLLABLE DOH
-+<UB3E0>     /x82/x39/x9d/x31 HANGUL SYLLABLE DWA
-+<UB3E1>     /x82/x39/x9d/x32 HANGUL SYLLABLE DWAG
-+<UB3E2>     /x82/x39/x9d/x33 HANGUL SYLLABLE DWAGG
-+<UB3E3>     /x82/x39/x9d/x34 HANGUL SYLLABLE DWAGS
-+<UB3E4>     /x82/x39/x9d/x35 HANGUL SYLLABLE DWAN
-+<UB3E5>     /x82/x39/x9d/x36 HANGUL SYLLABLE DWANI
-+<UB3E6>     /x82/x39/x9d/x37 HANGUL SYLLABLE DWANH
-+<UB3E7>     /x82/x39/x9d/x38 HANGUL SYLLABLE DWAD
-+<UB3E8>     /x82/x39/x9d/x39 HANGUL SYLLABLE DWAL
-+<UB3E9>     /x82/x39/x9e/x30 HANGUL SYLLABLE DWALG
-+<UB3EA>     /x82/x39/x9e/x31 HANGUL SYLLABLE DWALM
-+<UB3EB>     /x82/x39/x9e/x32 HANGUL SYLLABLE DWALB
-+<UB3EC>     /x82/x39/x9e/x33 HANGUL SYLLABLE DWALS
-+<UB3ED>     /x82/x39/x9e/x34 HANGUL SYLLABLE DWALT
-+<UB3EE>     /x82/x39/x9e/x35 HANGUL SYLLABLE DWALP
-+<UB3EF>     /x82/x39/x9e/x36 HANGUL SYLLABLE DWALH
-+<UB3F0>     /x82/x39/x9e/x37 HANGUL SYLLABLE DWAM
-+<UB3F1>     /x82/x39/x9e/x38 HANGUL SYLLABLE DWAB
-+<UB3F2>     /x82/x39/x9e/x39 HANGUL SYLLABLE DWABS
-+<UB3F3>     /x82/x39/x9f/x30 HANGUL SYLLABLE DWAS
-+<UB3F4>     /x82/x39/x9f/x31 HANGUL SYLLABLE DWASS
-+<UB3F5>     /x82/x39/x9f/x32 HANGUL SYLLABLE DWANG
-+<UB3F6>     /x82/x39/x9f/x33 HANGUL SYLLABLE DWAJ
-+<UB3F7>     /x82/x39/x9f/x34 HANGUL SYLLABLE DWAC
-+<UB3F8>     /x82/x39/x9f/x35 HANGUL SYLLABLE DWAK
-+<UB3F9>     /x82/x39/x9f/x36 HANGUL SYLLABLE DWAT
-+<UB3FA>     /x82/x39/x9f/x37 HANGUL SYLLABLE DWAP
-+<UB3FB>     /x82/x39/x9f/x38 HANGUL SYLLABLE DWAH
-+<UB3FC>     /x82/x39/x9f/x39 HANGUL SYLLABLE DWAE
-+<UB3FD>     /x82/x39/xa0/x30 HANGUL SYLLABLE DWAEG
-+<UB3FE>     /x82/x39/xa0/x31 HANGUL SYLLABLE DWAEGG
-+<UB3FF>     /x82/x39/xa0/x32 HANGUL SYLLABLE DWAEGS
-+<UB400>     /x82/x39/xa0/x33 HANGUL SYLLABLE DWAEN
-+<UB401>     /x82/x39/xa0/x34 HANGUL SYLLABLE DWAENI
-+<UB402>     /x82/x39/xa0/x35 HANGUL SYLLABLE DWAENH
-+<UB403>     /x82/x39/xa0/x36 HANGUL SYLLABLE DWAED
-+<UB404>     /x82/x39/xa0/x37 HANGUL SYLLABLE DWAEL
-+<UB405>     /x82/x39/xa0/x38 HANGUL SYLLABLE DWAELG
-+<UB406>     /x82/x39/xa0/x39 HANGUL SYLLABLE DWAELM
-+<UB407>     /x82/x39/xa1/x30 HANGUL SYLLABLE DWAELB
-+<UB408>     /x82/x39/xa1/x31 HANGUL SYLLABLE DWAELS
-+<UB409>     /x82/x39/xa1/x32 HANGUL SYLLABLE DWAELT
-+<UB40A>     /x82/x39/xa1/x33 HANGUL SYLLABLE DWAELP
-+<UB40B>     /x82/x39/xa1/x34 HANGUL SYLLABLE DWAELH
-+<UB40C>     /x82/x39/xa1/x35 HANGUL SYLLABLE DWAEM
-+<UB40D>     /x82/x39/xa1/x36 HANGUL SYLLABLE DWAEB
-+<UB40E>     /x82/x39/xa1/x37 HANGUL SYLLABLE DWAEBS
-+<UB40F>     /x82/x39/xa1/x38 HANGUL SYLLABLE DWAES
-+<UB410>     /x82/x39/xa1/x39 HANGUL SYLLABLE DWAESS
-+<UB411>     /x82/x39/xa2/x30 HANGUL SYLLABLE DWAENG
-+<UB412>     /x82/x39/xa2/x31 HANGUL SYLLABLE DWAEJ
-+<UB413>     /x82/x39/xa2/x32 HANGUL SYLLABLE DWAEC
-+<UB414>     /x82/x39/xa2/x33 HANGUL SYLLABLE DWAEK
-+<UB415>     /x82/x39/xa2/x34 HANGUL SYLLABLE DWAET
-+<UB416>     /x82/x39/xa2/x35 HANGUL SYLLABLE DWAEP
-+<UB417>     /x82/x39/xa2/x36 HANGUL SYLLABLE DWAEH
-+<UB418>     /x82/x39/xa2/x37 HANGUL SYLLABLE DOE
-+<UB419>     /x82/x39/xa2/x38 HANGUL SYLLABLE DOEG
-+<UB41A>     /x82/x39/xa2/x39 HANGUL SYLLABLE DOEGG
-+<UB41B>     /x82/x39/xa3/x30 HANGUL SYLLABLE DOEGS
-+<UB41C>     /x82/x39/xa3/x31 HANGUL SYLLABLE DOEN
-+<UB41D>     /x82/x39/xa3/x32 HANGUL SYLLABLE DOENI
-+<UB41E>     /x82/x39/xa3/x33 HANGUL SYLLABLE DOENH
-+<UB41F>     /x82/x39/xa3/x34 HANGUL SYLLABLE DOED
-+<UB420>     /x82/x39/xa3/x35 HANGUL SYLLABLE DOEL
-+<UB421>     /x82/x39/xa3/x36 HANGUL SYLLABLE DOELG
-+<UB422>     /x82/x39/xa3/x37 HANGUL SYLLABLE DOELM
-+<UB423>     /x82/x39/xa3/x38 HANGUL SYLLABLE DOELB
-+<UB424>     /x82/x39/xa3/x39 HANGUL SYLLABLE DOELS
-+<UB425>     /x82/x39/xa4/x30 HANGUL SYLLABLE DOELT
-+<UB426>     /x82/x39/xa4/x31 HANGUL SYLLABLE DOELP
-+<UB427>     /x82/x39/xa4/x32 HANGUL SYLLABLE DOELH
-+<UB428>     /x82/x39/xa4/x33 HANGUL SYLLABLE DOEM
-+<UB429>     /x82/x39/xa4/x34 HANGUL SYLLABLE DOEB
-+<UB42A>     /x82/x39/xa4/x35 HANGUL SYLLABLE DOEBS
-+<UB42B>     /x82/x39/xa4/x36 HANGUL SYLLABLE DOES
-+<UB42C>     /x82/x39/xa4/x37 HANGUL SYLLABLE DOESS
-+<UB42D>     /x82/x39/xa4/x38 HANGUL SYLLABLE DOENG
-+<UB42E>     /x82/x39/xa4/x39 HANGUL SYLLABLE DOEJ
-+<UB42F>     /x82/x39/xa5/x30 HANGUL SYLLABLE DOEC
-+<UB430>     /x82/x39/xa5/x31 HANGUL SYLLABLE DOEK
-+<UB431>     /x82/x39/xa5/x32 HANGUL SYLLABLE DOET
-+<UB432>     /x82/x39/xa5/x33 HANGUL SYLLABLE DOEP
-+<UB433>     /x82/x39/xa5/x34 HANGUL SYLLABLE DOEH
-+<UB434>     /x82/x39/xa5/x35 HANGUL SYLLABLE DYO
-+<UB435>     /x82/x39/xa5/x36 HANGUL SYLLABLE DYOG
-+<UB436>     /x82/x39/xa5/x37 HANGUL SYLLABLE DYOGG
-+<UB437>     /x82/x39/xa5/x38 HANGUL SYLLABLE DYOGS
-+<UB438>     /x82/x39/xa5/x39 HANGUL SYLLABLE DYON
-+<UB439>     /x82/x39/xa6/x30 HANGUL SYLLABLE DYONI
-+<UB43A>     /x82/x39/xa6/x31 HANGUL SYLLABLE DYONH
-+<UB43B>     /x82/x39/xa6/x32 HANGUL SYLLABLE DYOD
-+<UB43C>     /x82/x39/xa6/x33 HANGUL SYLLABLE DYOL
-+<UB43D>     /x82/x39/xa6/x34 HANGUL SYLLABLE DYOLG
-+<UB43E>     /x82/x39/xa6/x35 HANGUL SYLLABLE DYOLM
-+<UB43F>     /x82/x39/xa6/x36 HANGUL SYLLABLE DYOLB
-+<UB440>     /x82/x39/xa6/x37 HANGUL SYLLABLE DYOLS
-+<UB441>     /x82/x39/xa6/x38 HANGUL SYLLABLE DYOLT
-+<UB442>     /x82/x39/xa6/x39 HANGUL SYLLABLE DYOLP
-+<UB443>     /x82/x39/xa7/x30 HANGUL SYLLABLE DYOLH
-+<UB444>     /x82/x39/xa7/x31 HANGUL SYLLABLE DYOM
-+<UB445>     /x82/x39/xa7/x32 HANGUL SYLLABLE DYOB
-+<UB446>     /x82/x39/xa7/x33 HANGUL SYLLABLE DYOBS
-+<UB447>     /x82/x39/xa7/x34 HANGUL SYLLABLE DYOS
-+<UB448>     /x82/x39/xa7/x35 HANGUL SYLLABLE DYOSS
-+<UB449>     /x82/x39/xa7/x36 HANGUL SYLLABLE DYONG
-+<UB44A>     /x82/x39/xa7/x37 HANGUL SYLLABLE DYOJ
-+<UB44B>     /x82/x39/xa7/x38 HANGUL SYLLABLE DYOC
-+<UB44C>     /x82/x39/xa7/x39 HANGUL SYLLABLE DYOK
-+<UB44D>     /x82/x39/xa8/x30 HANGUL SYLLABLE DYOT
-+<UB44E>     /x82/x39/xa8/x31 HANGUL SYLLABLE DYOP
-+<UB44F>     /x82/x39/xa8/x32 HANGUL SYLLABLE DYOH
-+<UB450>     /x82/x39/xa8/x33 HANGUL SYLLABLE DU
-+<UB451>     /x82/x39/xa8/x34 HANGUL SYLLABLE DUG
-+<UB452>     /x82/x39/xa8/x35 HANGUL SYLLABLE DUGG
-+<UB453>     /x82/x39/xa8/x36 HANGUL SYLLABLE DUGS
-+<UB454>     /x82/x39/xa8/x37 HANGUL SYLLABLE DUN
-+<UB455>     /x82/x39/xa8/x38 HANGUL SYLLABLE DUNI
-+<UB456>     /x82/x39/xa8/x39 HANGUL SYLLABLE DUNH
-+<UB457>     /x82/x39/xa9/x30 HANGUL SYLLABLE DUD
-+<UB458>     /x82/x39/xa9/x31 HANGUL SYLLABLE DUL
-+<UB459>     /x82/x39/xa9/x32 HANGUL SYLLABLE DULG
-+<UB45A>     /x82/x39/xa9/x33 HANGUL SYLLABLE DULM
-+<UB45B>     /x82/x39/xa9/x34 HANGUL SYLLABLE DULB
-+<UB45C>     /x82/x39/xa9/x35 HANGUL SYLLABLE DULS
-+<UB45D>     /x82/x39/xa9/x36 HANGUL SYLLABLE DULT
-+<UB45E>     /x82/x39/xa9/x37 HANGUL SYLLABLE DULP
-+<UB45F>     /x82/x39/xa9/x38 HANGUL SYLLABLE DULH
-+<UB460>     /x82/x39/xa9/x39 HANGUL SYLLABLE DUM
-+<UB461>     /x82/x39/xaa/x30 HANGUL SYLLABLE DUB
-+<UB462>     /x82/x39/xaa/x31 HANGUL SYLLABLE DUBS
-+<UB463>     /x82/x39/xaa/x32 HANGUL SYLLABLE DUS
-+<UB464>     /x82/x39/xaa/x33 HANGUL SYLLABLE DUSS
-+<UB465>     /x82/x39/xaa/x34 HANGUL SYLLABLE DUNG
-+<UB466>     /x82/x39/xaa/x35 HANGUL SYLLABLE DUJ
-+<UB467>     /x82/x39/xaa/x36 HANGUL SYLLABLE DUC
-+<UB468>     /x82/x39/xaa/x37 HANGUL SYLLABLE DUK
-+<UB469>     /x82/x39/xaa/x38 HANGUL SYLLABLE DUT
-+<UB46A>     /x82/x39/xaa/x39 HANGUL SYLLABLE DUP
-+<UB46B>     /x82/x39/xab/x30 HANGUL SYLLABLE DUH
-+<UB46C>     /x82/x39/xab/x31 HANGUL SYLLABLE DWEO
-+<UB46D>     /x82/x39/xab/x32 HANGUL SYLLABLE DWEOG
-+<UB46E>     /x82/x39/xab/x33 HANGUL SYLLABLE DWEOGG
-+<UB46F>     /x82/x39/xab/x34 HANGUL SYLLABLE DWEOGS
-+<UB470>     /x82/x39/xab/x35 HANGUL SYLLABLE DWEON
-+<UB471>     /x82/x39/xab/x36 HANGUL SYLLABLE DWEONI
-+<UB472>     /x82/x39/xab/x37 HANGUL SYLLABLE DWEONH
-+<UB473>     /x82/x39/xab/x38 HANGUL SYLLABLE DWEOD
-+<UB474>     /x82/x39/xab/x39 HANGUL SYLLABLE DWEOL
-+<UB475>     /x82/x39/xac/x30 HANGUL SYLLABLE DWEOLG
-+<UB476>     /x82/x39/xac/x31 HANGUL SYLLABLE DWEOLM
-+<UB477>     /x82/x39/xac/x32 HANGUL SYLLABLE DWEOLB
-+<UB478>     /x82/x39/xac/x33 HANGUL SYLLABLE DWEOLS
-+<UB479>     /x82/x39/xac/x34 HANGUL SYLLABLE DWEOLT
-+<UB47A>     /x82/x39/xac/x35 HANGUL SYLLABLE DWEOLP
-+<UB47B>     /x82/x39/xac/x36 HANGUL SYLLABLE DWEOLH
-+<UB47C>     /x82/x39/xac/x37 HANGUL SYLLABLE DWEOM
-+<UB47D>     /x82/x39/xac/x38 HANGUL SYLLABLE DWEOB
-+<UB47E>     /x82/x39/xac/x39 HANGUL SYLLABLE DWEOBS
-+<UB47F>     /x82/x39/xad/x30 HANGUL SYLLABLE DWEOS
-+<UB480>     /x82/x39/xad/x31 HANGUL SYLLABLE DWEOSS
-+<UB481>     /x82/x39/xad/x32 HANGUL SYLLABLE DWEONG
-+<UB482>     /x82/x39/xad/x33 HANGUL SYLLABLE DWEOJ
-+<UB483>     /x82/x39/xad/x34 HANGUL SYLLABLE DWEOC
-+<UB484>     /x82/x39/xad/x35 HANGUL SYLLABLE DWEOK
-+<UB485>     /x82/x39/xad/x36 HANGUL SYLLABLE DWEOT
-+<UB486>     /x82/x39/xad/x37 HANGUL SYLLABLE DWEOP
-+<UB487>     /x82/x39/xad/x38 HANGUL SYLLABLE DWEOH
-+<UB488>     /x82/x39/xad/x39 HANGUL SYLLABLE DWE
-+<UB489>     /x82/x39/xae/x30 HANGUL SYLLABLE DWEG
-+<UB48A>     /x82/x39/xae/x31 HANGUL SYLLABLE DWEGG
-+<UB48B>     /x82/x39/xae/x32 HANGUL SYLLABLE DWEGS
-+<UB48C>     /x82/x39/xae/x33 HANGUL SYLLABLE DWEN
-+<UB48D>     /x82/x39/xae/x34 HANGUL SYLLABLE DWENI
-+<UB48E>     /x82/x39/xae/x35 HANGUL SYLLABLE DWENH
-+<UB48F>     /x82/x39/xae/x36 HANGUL SYLLABLE DWED
-+<UB490>     /x82/x39/xae/x37 HANGUL SYLLABLE DWEL
-+<UB491>     /x82/x39/xae/x38 HANGUL SYLLABLE DWELG
-+<UB492>     /x82/x39/xae/x39 HANGUL SYLLABLE DWELM
-+<UB493>     /x82/x39/xaf/x30 HANGUL SYLLABLE DWELB
-+<UB494>     /x82/x39/xaf/x31 HANGUL SYLLABLE DWELS
-+<UB495>     /x82/x39/xaf/x32 HANGUL SYLLABLE DWELT
-+<UB496>     /x82/x39/xaf/x33 HANGUL SYLLABLE DWELP
-+<UB497>     /x82/x39/xaf/x34 HANGUL SYLLABLE DWELH
-+<UB498>     /x82/x39/xaf/x35 HANGUL SYLLABLE DWEM
-+<UB499>     /x82/x39/xaf/x36 HANGUL SYLLABLE DWEB
-+<UB49A>     /x82/x39/xaf/x37 HANGUL SYLLABLE DWEBS
-+<UB49B>     /x82/x39/xaf/x38 HANGUL SYLLABLE DWES
-+<UB49C>     /x82/x39/xaf/x39 HANGUL SYLLABLE DWESS
-+<UB49D>     /x82/x39/xb0/x30 HANGUL SYLLABLE DWENG
-+<UB49E>     /x82/x39/xb0/x31 HANGUL SYLLABLE DWEJ
-+<UB49F>     /x82/x39/xb0/x32 HANGUL SYLLABLE DWEC
-+<UB4A0>     /x82/x39/xb0/x33 HANGUL SYLLABLE DWEK
-+<UB4A1>     /x82/x39/xb0/x34 HANGUL SYLLABLE DWET
-+<UB4A2>     /x82/x39/xb0/x35 HANGUL SYLLABLE DWEP
-+<UB4A3>     /x82/x39/xb0/x36 HANGUL SYLLABLE DWEH
-+<UB4A4>     /x82/x39/xb0/x37 HANGUL SYLLABLE DWI
-+<UB4A5>     /x82/x39/xb0/x38 HANGUL SYLLABLE DWIG
-+<UB4A6>     /x82/x39/xb0/x39 HANGUL SYLLABLE DWIGG
-+<UB4A7>     /x82/x39/xb1/x30 HANGUL SYLLABLE DWIGS
-+<UB4A8>     /x82/x39/xb1/x31 HANGUL SYLLABLE DWIN
-+<UB4A9>     /x82/x39/xb1/x32 HANGUL SYLLABLE DWINI
-+<UB4AA>     /x82/x39/xb1/x33 HANGUL SYLLABLE DWINH
-+<UB4AB>     /x82/x39/xb1/x34 HANGUL SYLLABLE DWID
-+<UB4AC>     /x82/x39/xb1/x35 HANGUL SYLLABLE DWIL
-+<UB4AD>     /x82/x39/xb1/x36 HANGUL SYLLABLE DWILG
-+<UB4AE>     /x82/x39/xb1/x37 HANGUL SYLLABLE DWILM
-+<UB4AF>     /x82/x39/xb1/x38 HANGUL SYLLABLE DWILB
-+<UB4B0>     /x82/x39/xb1/x39 HANGUL SYLLABLE DWILS
-+<UB4B1>     /x82/x39/xb2/x30 HANGUL SYLLABLE DWILT
-+<UB4B2>     /x82/x39/xb2/x31 HANGUL SYLLABLE DWILP
-+<UB4B3>     /x82/x39/xb2/x32 HANGUL SYLLABLE DWILH
-+<UB4B4>     /x82/x39/xb2/x33 HANGUL SYLLABLE DWIM
-+<UB4B5>     /x82/x39/xb2/x34 HANGUL SYLLABLE DWIB
-+<UB4B6>     /x82/x39/xb2/x35 HANGUL SYLLABLE DWIBS
-+<UB4B7>     /x82/x39/xb2/x36 HANGUL SYLLABLE DWIS
-+<UB4B8>     /x82/x39/xb2/x37 HANGUL SYLLABLE DWISS
-+<UB4B9>     /x82/x39/xb2/x38 HANGUL SYLLABLE DWING
-+<UB4BA>     /x82/x39/xb2/x39 HANGUL SYLLABLE DWIJ
-+<UB4BB>     /x82/x39/xb3/x30 HANGUL SYLLABLE DWIC
-+<UB4BC>     /x82/x39/xb3/x31 HANGUL SYLLABLE DWIK
-+<UB4BD>     /x82/x39/xb3/x32 HANGUL SYLLABLE DWIT
-+<UB4BE>     /x82/x39/xb3/x33 HANGUL SYLLABLE DWIP
-+<UB4BF>     /x82/x39/xb3/x34 HANGUL SYLLABLE DWIH
-+<UB4C0>     /x82/x39/xb3/x35 HANGUL SYLLABLE DYU
-+<UB4C1>     /x82/x39/xb3/x36 HANGUL SYLLABLE DYUG
-+<UB4C2>     /x82/x39/xb3/x37 HANGUL SYLLABLE DYUGG
-+<UB4C3>     /x82/x39/xb3/x38 HANGUL SYLLABLE DYUGS
-+<UB4C4>     /x82/x39/xb3/x39 HANGUL SYLLABLE DYUN
-+<UB4C5>     /x82/x39/xb4/x30 HANGUL SYLLABLE DYUNI
-+<UB4C6>     /x82/x39/xb4/x31 HANGUL SYLLABLE DYUNH
-+<UB4C7>     /x82/x39/xb4/x32 HANGUL SYLLABLE DYUD
-+<UB4C8>     /x82/x39/xb4/x33 HANGUL SYLLABLE DYUL
-+<UB4C9>     /x82/x39/xb4/x34 HANGUL SYLLABLE DYULG
-+<UB4CA>     /x82/x39/xb4/x35 HANGUL SYLLABLE DYULM
-+<UB4CB>     /x82/x39/xb4/x36 HANGUL SYLLABLE DYULB
-+<UB4CC>     /x82/x39/xb4/x37 HANGUL SYLLABLE DYULS
-+<UB4CD>     /x82/x39/xb4/x38 HANGUL SYLLABLE DYULT
-+<UB4CE>     /x82/x39/xb4/x39 HANGUL SYLLABLE DYULP
-+<UB4CF>     /x82/x39/xb5/x30 HANGUL SYLLABLE DYULH
-+<UB4D0>     /x82/x39/xb5/x31 HANGUL SYLLABLE DYUM
-+<UB4D1>     /x82/x39/xb5/x32 HANGUL SYLLABLE DYUB
-+<UB4D2>     /x82/x39/xb5/x33 HANGUL SYLLABLE DYUBS
-+<UB4D3>     /x82/x39/xb5/x34 HANGUL SYLLABLE DYUS
-+<UB4D4>     /x82/x39/xb5/x35 HANGUL SYLLABLE DYUSS
-+<UB4D5>     /x82/x39/xb5/x36 HANGUL SYLLABLE DYUNG
-+<UB4D6>     /x82/x39/xb5/x37 HANGUL SYLLABLE DYUJ
-+<UB4D7>     /x82/x39/xb5/x38 HANGUL SYLLABLE DYUC
-+<UB4D8>     /x82/x39/xb5/x39 HANGUL SYLLABLE DYUK
-+<UB4D9>     /x82/x39/xb6/x30 HANGUL SYLLABLE DYUT
-+<UB4DA>     /x82/x39/xb6/x31 HANGUL SYLLABLE DYUP
-+<UB4DB>     /x82/x39/xb6/x32 HANGUL SYLLABLE DYUH
-+<UB4DC>     /x82/x39/xb6/x33 HANGUL SYLLABLE DEU
-+<UB4DD>     /x82/x39/xb6/x34 HANGUL SYLLABLE DEUG
-+<UB4DE>     /x82/x39/xb6/x35 HANGUL SYLLABLE DEUGG
-+<UB4DF>     /x82/x39/xb6/x36 HANGUL SYLLABLE DEUGS
-+<UB4E0>     /x82/x39/xb6/x37 HANGUL SYLLABLE DEUN
-+<UB4E1>     /x82/x39/xb6/x38 HANGUL SYLLABLE DEUNI
-+<UB4E2>     /x82/x39/xb6/x39 HANGUL SYLLABLE DEUNH
-+<UB4E3>     /x82/x39/xb7/x30 HANGUL SYLLABLE DEUD
-+<UB4E4>     /x82/x39/xb7/x31 HANGUL SYLLABLE DEUL
-+<UB4E5>     /x82/x39/xb7/x32 HANGUL SYLLABLE DEULG
-+<UB4E6>     /x82/x39/xb7/x33 HANGUL SYLLABLE DEULM
-+<UB4E7>     /x82/x39/xb7/x34 HANGUL SYLLABLE DEULB
-+<UB4E8>     /x82/x39/xb7/x35 HANGUL SYLLABLE DEULS
-+<UB4E9>     /x82/x39/xb7/x36 HANGUL SYLLABLE DEULT
-+<UB4EA>     /x82/x39/xb7/x37 HANGUL SYLLABLE DEULP
-+<UB4EB>     /x82/x39/xb7/x38 HANGUL SYLLABLE DEULH
-+<UB4EC>     /x82/x39/xb7/x39 HANGUL SYLLABLE DEUM
-+<UB4ED>     /x82/x39/xb8/x30 HANGUL SYLLABLE DEUB
-+<UB4EE>     /x82/x39/xb8/x31 HANGUL SYLLABLE DEUBS
-+<UB4EF>     /x82/x39/xb8/x32 HANGUL SYLLABLE DEUS
-+<UB4F0>     /x82/x39/xb8/x33 HANGUL SYLLABLE DEUSS
-+<UB4F1>     /x82/x39/xb8/x34 HANGUL SYLLABLE DEUNG
-+<UB4F2>     /x82/x39/xb8/x35 HANGUL SYLLABLE DEUJ
-+<UB4F3>     /x82/x39/xb8/x36 HANGUL SYLLABLE DEUC
-+<UB4F4>     /x82/x39/xb8/x37 HANGUL SYLLABLE DEUK
-+<UB4F5>     /x82/x39/xb8/x38 HANGUL SYLLABLE DEUT
-+<UB4F6>     /x82/x39/xb8/x39 HANGUL SYLLABLE DEUP
-+<UB4F7>     /x82/x39/xb9/x30 HANGUL SYLLABLE DEUH
-+<UB4F8>     /x82/x39/xb9/x31 HANGUL SYLLABLE DYI
-+<UB4F9>     /x82/x39/xb9/x32 HANGUL SYLLABLE DYIG
-+<UB4FA>     /x82/x39/xb9/x33 HANGUL SYLLABLE DYIGG
-+<UB4FB>     /x82/x39/xb9/x34 HANGUL SYLLABLE DYIGS
-+<UB4FC>     /x82/x39/xb9/x35 HANGUL SYLLABLE DYIN
-+<UB4FD>     /x82/x39/xb9/x36 HANGUL SYLLABLE DYINI
-+<UB4FE>     /x82/x39/xb9/x37 HANGUL SYLLABLE DYINH
-+<UB4FF>     /x82/x39/xb9/x38 HANGUL SYLLABLE DYID
-+<UB500>     /x82/x39/xb9/x39 HANGUL SYLLABLE DYIL
-+<UB501>     /x82/x39/xba/x30 HANGUL SYLLABLE DYILG
-+<UB502>     /x82/x39/xba/x31 HANGUL SYLLABLE DYILM
-+<UB503>     /x82/x39/xba/x32 HANGUL SYLLABLE DYILB
-+<UB504>     /x82/x39/xba/x33 HANGUL SYLLABLE DYILS
-+<UB505>     /x82/x39/xba/x34 HANGUL SYLLABLE DYILT
-+<UB506>     /x82/x39/xba/x35 HANGUL SYLLABLE DYILP
-+<UB507>     /x82/x39/xba/x36 HANGUL SYLLABLE DYILH
-+<UB508>     /x82/x39/xba/x37 HANGUL SYLLABLE DYIM
-+<UB509>     /x82/x39/xba/x38 HANGUL SYLLABLE DYIB
-+<UB50A>     /x82/x39/xba/x39 HANGUL SYLLABLE DYIBS
-+<UB50B>     /x82/x39/xbb/x30 HANGUL SYLLABLE DYIS
-+<UB50C>     /x82/x39/xbb/x31 HANGUL SYLLABLE DYISS
-+<UB50D>     /x82/x39/xbb/x32 HANGUL SYLLABLE DYING
-+<UB50E>     /x82/x39/xbb/x33 HANGUL SYLLABLE DYIJ
-+<UB50F>     /x82/x39/xbb/x34 HANGUL SYLLABLE DYIC
-+<UB510>     /x82/x39/xbb/x35 HANGUL SYLLABLE DYIK
-+<UB511>     /x82/x39/xbb/x36 HANGUL SYLLABLE DYIT
-+<UB512>     /x82/x39/xbb/x37 HANGUL SYLLABLE DYIP
-+<UB513>     /x82/x39/xbb/x38 HANGUL SYLLABLE DYIH
-+<UB514>     /x82/x39/xbb/x39 HANGUL SYLLABLE DI
-+<UB515>     /x82/x39/xbc/x30 HANGUL SYLLABLE DIG
-+<UB516>     /x82/x39/xbc/x31 HANGUL SYLLABLE DIGG
-+<UB517>     /x82/x39/xbc/x32 HANGUL SYLLABLE DIGS
-+<UB518>     /x82/x39/xbc/x33 HANGUL SYLLABLE DIN
-+<UB519>     /x82/x39/xbc/x34 HANGUL SYLLABLE DINI
-+<UB51A>     /x82/x39/xbc/x35 HANGUL SYLLABLE DINH
-+<UB51B>     /x82/x39/xbc/x36 HANGUL SYLLABLE DID
-+<UB51C>     /x82/x39/xbc/x37 HANGUL SYLLABLE DIL
-+<UB51D>     /x82/x39/xbc/x38 HANGUL SYLLABLE DILG
-+<UB51E>     /x82/x39/xbc/x39 HANGUL SYLLABLE DILM
-+<UB51F>     /x82/x39/xbd/x30 HANGUL SYLLABLE DILB
-+<UB520>     /x82/x39/xbd/x31 HANGUL SYLLABLE DILS
-+<UB521>     /x82/x39/xbd/x32 HANGUL SYLLABLE DILT
-+<UB522>     /x82/x39/xbd/x33 HANGUL SYLLABLE DILP
-+<UB523>     /x82/x39/xbd/x34 HANGUL SYLLABLE DILH
-+<UB524>     /x82/x39/xbd/x35 HANGUL SYLLABLE DIM
-+<UB525>     /x82/x39/xbd/x36 HANGUL SYLLABLE DIB
-+<UB526>     /x82/x39/xbd/x37 HANGUL SYLLABLE DIBS
-+<UB527>     /x82/x39/xbd/x38 HANGUL SYLLABLE DIS
-+<UB528>     /x82/x39/xbd/x39 HANGUL SYLLABLE DISS
-+<UB529>     /x82/x39/xbe/x30 HANGUL SYLLABLE DING
-+<UB52A>     /x82/x39/xbe/x31 HANGUL SYLLABLE DIJ
-+<UB52B>     /x82/x39/xbe/x32 HANGUL SYLLABLE DIC
-+<UB52C>     /x82/x39/xbe/x33 HANGUL SYLLABLE DIK
-+<UB52D>     /x82/x39/xbe/x34 HANGUL SYLLABLE DIT
-+<UB52E>     /x82/x39/xbe/x35 HANGUL SYLLABLE DIP
-+<UB52F>     /x82/x39/xbe/x36 HANGUL SYLLABLE DIH
-+<UB530>     /x82/x39/xbe/x37 HANGUL SYLLABLE DDA
-+<UB531>     /x82/x39/xbe/x38 HANGUL SYLLABLE DDAG
-+<UB532>     /x82/x39/xbe/x39 HANGUL SYLLABLE DDAGG
-+<UB533>     /x82/x39/xbf/x30 HANGUL SYLLABLE DDAGS
-+<UB534>     /x82/x39/xbf/x31 HANGUL SYLLABLE DDAN
-+<UB535>     /x82/x39/xbf/x32 HANGUL SYLLABLE DDANI
-+<UB536>     /x82/x39/xbf/x33 HANGUL SYLLABLE DDANH
-+<UB537>     /x82/x39/xbf/x34 HANGUL SYLLABLE DDAD
-+<UB538>     /x82/x39/xbf/x35 HANGUL SYLLABLE DDAL
-+<UB539>     /x82/x39/xbf/x36 HANGUL SYLLABLE DDALG
-+<UB53A>     /x82/x39/xbf/x37 HANGUL SYLLABLE DDALM
-+<UB53B>     /x82/x39/xbf/x38 HANGUL SYLLABLE DDALB
-+<UB53C>     /x82/x39/xbf/x39 HANGUL SYLLABLE DDALS
-+<UB53D>     /x82/x39/xc0/x30 HANGUL SYLLABLE DDALT
-+<UB53E>     /x82/x39/xc0/x31 HANGUL SYLLABLE DDALP
-+<UB53F>     /x82/x39/xc0/x32 HANGUL SYLLABLE DDALH
-+<UB540>     /x82/x39/xc0/x33 HANGUL SYLLABLE DDAM
-+<UB541>     /x82/x39/xc0/x34 HANGUL SYLLABLE DDAB
-+<UB542>     /x82/x39/xc0/x35 HANGUL SYLLABLE DDABS
-+<UB543>     /x82/x39/xc0/x36 HANGUL SYLLABLE DDAS
-+<UB544>     /x82/x39/xc0/x37 HANGUL SYLLABLE DDASS
-+<UB545>     /x82/x39/xc0/x38 HANGUL SYLLABLE DDANG
-+<UB546>     /x82/x39/xc0/x39 HANGUL SYLLABLE DDAJ
-+<UB547>     /x82/x39/xc1/x30 HANGUL SYLLABLE DDAC
-+<UB548>     /x82/x39/xc1/x31 HANGUL SYLLABLE DDAK
-+<UB549>     /x82/x39/xc1/x32 HANGUL SYLLABLE DDAT
-+<UB54A>     /x82/x39/xc1/x33 HANGUL SYLLABLE DDAP
-+<UB54B>     /x82/x39/xc1/x34 HANGUL SYLLABLE DDAH
-+<UB54C>     /x82/x39/xc1/x35 HANGUL SYLLABLE DDAE
-+<UB54D>     /x82/x39/xc1/x36 HANGUL SYLLABLE DDAEG
-+<UB54E>     /x82/x39/xc1/x37 HANGUL SYLLABLE DDAEGG
-+<UB54F>     /x82/x39/xc1/x38 HANGUL SYLLABLE DDAEGS
-+<UB550>     /x82/x39/xc1/x39 HANGUL SYLLABLE DDAEN
-+<UB551>     /x82/x39/xc2/x30 HANGUL SYLLABLE DDAENI
-+<UB552>     /x82/x39/xc2/x31 HANGUL SYLLABLE DDAENH
-+<UB553>     /x82/x39/xc2/x32 HANGUL SYLLABLE DDAED
-+<UB554>     /x82/x39/xc2/x33 HANGUL SYLLABLE DDAEL
-+<UB555>     /x82/x39/xc2/x34 HANGUL SYLLABLE DDAELG
-+<UB556>     /x82/x39/xc2/x35 HANGUL SYLLABLE DDAELM
-+<UB557>     /x82/x39/xc2/x36 HANGUL SYLLABLE DDAELB
-+<UB558>     /x82/x39/xc2/x37 HANGUL SYLLABLE DDAELS
-+<UB559>     /x82/x39/xc2/x38 HANGUL SYLLABLE DDAELT
-+<UB55A>     /x82/x39/xc2/x39 HANGUL SYLLABLE DDAELP
-+<UB55B>     /x82/x39/xc3/x30 HANGUL SYLLABLE DDAELH
-+<UB55C>     /x82/x39/xc3/x31 HANGUL SYLLABLE DDAEM
-+<UB55D>     /x82/x39/xc3/x32 HANGUL SYLLABLE DDAEB
-+<UB55E>     /x82/x39/xc3/x33 HANGUL SYLLABLE DDAEBS
-+<UB55F>     /x82/x39/xc3/x34 HANGUL SYLLABLE DDAES
-+<UB560>     /x82/x39/xc3/x35 HANGUL SYLLABLE DDAESS
-+<UB561>     /x82/x39/xc3/x36 HANGUL SYLLABLE DDAENG
-+<UB562>     /x82/x39/xc3/x37 HANGUL SYLLABLE DDAEJ
-+<UB563>     /x82/x39/xc3/x38 HANGUL SYLLABLE DDAEC
-+<UB564>     /x82/x39/xc3/x39 HANGUL SYLLABLE DDAEK
-+<UB565>     /x82/x39/xc4/x30 HANGUL SYLLABLE DDAET
-+<UB566>     /x82/x39/xc4/x31 HANGUL SYLLABLE DDAEP
-+<UB567>     /x82/x39/xc4/x32 HANGUL SYLLABLE DDAEH
-+<UB568>     /x82/x39/xc4/x33 HANGUL SYLLABLE DDYA
-+<UB569>     /x82/x39/xc4/x34 HANGUL SYLLABLE DDYAG
-+<UB56A>     /x82/x39/xc4/x35 HANGUL SYLLABLE DDYAGG
-+<UB56B>     /x82/x39/xc4/x36 HANGUL SYLLABLE DDYAGS
-+<UB56C>     /x82/x39/xc4/x37 HANGUL SYLLABLE DDYAN
-+<UB56D>     /x82/x39/xc4/x38 HANGUL SYLLABLE DDYANI
-+<UB56E>     /x82/x39/xc4/x39 HANGUL SYLLABLE DDYANH
-+<UB56F>     /x82/x39/xc5/x30 HANGUL SYLLABLE DDYAD
-+<UB570>     /x82/x39/xc5/x31 HANGUL SYLLABLE DDYAL
-+<UB571>     /x82/x39/xc5/x32 HANGUL SYLLABLE DDYALG
-+<UB572>     /x82/x39/xc5/x33 HANGUL SYLLABLE DDYALM
-+<UB573>     /x82/x39/xc5/x34 HANGUL SYLLABLE DDYALB
-+<UB574>     /x82/x39/xc5/x35 HANGUL SYLLABLE DDYALS
-+<UB575>     /x82/x39/xc5/x36 HANGUL SYLLABLE DDYALT
-+<UB576>     /x82/x39/xc5/x37 HANGUL SYLLABLE DDYALP
-+<UB577>     /x82/x39/xc5/x38 HANGUL SYLLABLE DDYALH
-+<UB578>     /x82/x39/xc5/x39 HANGUL SYLLABLE DDYAM
-+<UB579>     /x82/x39/xc6/x30 HANGUL SYLLABLE DDYAB
-+<UB57A>     /x82/x39/xc6/x31 HANGUL SYLLABLE DDYABS
-+<UB57B>     /x82/x39/xc6/x32 HANGUL SYLLABLE DDYAS
-+<UB57C>     /x82/x39/xc6/x33 HANGUL SYLLABLE DDYASS
-+<UB57D>     /x82/x39/xc6/x34 HANGUL SYLLABLE DDYANG
-+<UB57E>     /x82/x39/xc6/x35 HANGUL SYLLABLE DDYAJ
-+<UB57F>     /x82/x39/xc6/x36 HANGUL SYLLABLE DDYAC
-+<UB580>     /x82/x39/xc6/x37 HANGUL SYLLABLE DDYAK
-+<UB581>     /x82/x39/xc6/x38 HANGUL SYLLABLE DDYAT
-+<UB582>     /x82/x39/xc6/x39 HANGUL SYLLABLE DDYAP
-+<UB583>     /x82/x39/xc7/x30 HANGUL SYLLABLE DDYAH
-+<UB584>     /x82/x39/xc7/x31 HANGUL SYLLABLE DDYAE
-+<UB585>     /x82/x39/xc7/x32 HANGUL SYLLABLE DDYAEG
-+<UB586>     /x82/x39/xc7/x33 HANGUL SYLLABLE DDYAEGG
-+<UB587>     /x82/x39/xc7/x34 HANGUL SYLLABLE DDYAEGS
-+<UB588>     /x82/x39/xc7/x35 HANGUL SYLLABLE DDYAEN
-+<UB589>     /x82/x39/xc7/x36 HANGUL SYLLABLE DDYAENI
-+<UB58A>     /x82/x39/xc7/x37 HANGUL SYLLABLE DDYAENH
-+<UB58B>     /x82/x39/xc7/x38 HANGUL SYLLABLE DDYAED
-+<UB58C>     /x82/x39/xc7/x39 HANGUL SYLLABLE DDYAEL
-+<UB58D>     /x82/x39/xc8/x30 HANGUL SYLLABLE DDYAELG
-+<UB58E>     /x82/x39/xc8/x31 HANGUL SYLLABLE DDYAELM
-+<UB58F>     /x82/x39/xc8/x32 HANGUL SYLLABLE DDYAELB
-+<UB590>     /x82/x39/xc8/x33 HANGUL SYLLABLE DDYAELS
-+<UB591>     /x82/x39/xc8/x34 HANGUL SYLLABLE DDYAELT
-+<UB592>     /x82/x39/xc8/x35 HANGUL SYLLABLE DDYAELP
-+<UB593>     /x82/x39/xc8/x36 HANGUL SYLLABLE DDYAELH
-+<UB594>     /x82/x39/xc8/x37 HANGUL SYLLABLE DDYAEM
-+<UB595>     /x82/x39/xc8/x38 HANGUL SYLLABLE DDYAEB
-+<UB596>     /x82/x39/xc8/x39 HANGUL SYLLABLE DDYAEBS
-+<UB597>     /x82/x39/xc9/x30 HANGUL SYLLABLE DDYAES
-+<UB598>     /x82/x39/xc9/x31 HANGUL SYLLABLE DDYAESS
-+<UB599>     /x82/x39/xc9/x32 HANGUL SYLLABLE DDYAENG
-+<UB59A>     /x82/x39/xc9/x33 HANGUL SYLLABLE DDYAEJ
-+<UB59B>     /x82/x39/xc9/x34 HANGUL SYLLABLE DDYAEC
-+<UB59C>     /x82/x39/xc9/x35 HANGUL SYLLABLE DDYAEK
-+<UB59D>     /x82/x39/xc9/x36 HANGUL SYLLABLE DDYAET
-+<UB59E>     /x82/x39/xc9/x37 HANGUL SYLLABLE DDYAEP
-+<UB59F>     /x82/x39/xc9/x38 HANGUL SYLLABLE DDYAEH
-+<UB5A0>     /x82/x39/xc9/x39 HANGUL SYLLABLE DDEO
-+<UB5A1>     /x82/x39/xca/x30 HANGUL SYLLABLE DDEOG
-+<UB5A2>     /x82/x39/xca/x31 HANGUL SYLLABLE DDEOGG
-+<UB5A3>     /x82/x39/xca/x32 HANGUL SYLLABLE DDEOGS
-+<UB5A4>     /x82/x39/xca/x33 HANGUL SYLLABLE DDEON
-+<UB5A5>     /x82/x39/xca/x34 HANGUL SYLLABLE DDEONI
-+<UB5A6>     /x82/x39/xca/x35 HANGUL SYLLABLE DDEONH
-+<UB5A7>     /x82/x39/xca/x36 HANGUL SYLLABLE DDEOD
-+<UB5A8>     /x82/x39/xca/x37 HANGUL SYLLABLE DDEOL
-+<UB5A9>     /x82/x39/xca/x38 HANGUL SYLLABLE DDEOLG
-+<UB5AA>     /x82/x39/xca/x39 HANGUL SYLLABLE DDEOLM
-+<UB5AB>     /x82/x39/xcb/x30 HANGUL SYLLABLE DDEOLB
-+<UB5AC>     /x82/x39/xcb/x31 HANGUL SYLLABLE DDEOLS
-+<UB5AD>     /x82/x39/xcb/x32 HANGUL SYLLABLE DDEOLT
-+<UB5AE>     /x82/x39/xcb/x33 HANGUL SYLLABLE DDEOLP
-+<UB5AF>     /x82/x39/xcb/x34 HANGUL SYLLABLE DDEOLH
-+<UB5B0>     /x82/x39/xcb/x35 HANGUL SYLLABLE DDEOM
-+<UB5B1>     /x82/x39/xcb/x36 HANGUL SYLLABLE DDEOB
-+<UB5B2>     /x82/x39/xcb/x37 HANGUL SYLLABLE DDEOBS
-+<UB5B3>     /x82/x39/xcb/x38 HANGUL SYLLABLE DDEOS
-+<UB5B4>     /x82/x39/xcb/x39 HANGUL SYLLABLE DDEOSS
-+<UB5B5>     /x82/x39/xcc/x30 HANGUL SYLLABLE DDEONG
-+<UB5B6>     /x82/x39/xcc/x31 HANGUL SYLLABLE DDEOJ
-+<UB5B7>     /x82/x39/xcc/x32 HANGUL SYLLABLE DDEOC
-+<UB5B8>     /x82/x39/xcc/x33 HANGUL SYLLABLE DDEOK
-+<UB5B9>     /x82/x39/xcc/x34 HANGUL SYLLABLE DDEOT
-+<UB5BA>     /x82/x39/xcc/x35 HANGUL SYLLABLE DDEOP
-+<UB5BB>     /x82/x39/xcc/x36 HANGUL SYLLABLE DDEOH
-+<UB5BC>     /x82/x39/xcc/x37 HANGUL SYLLABLE DDE
-+<UB5BD>     /x82/x39/xcc/x38 HANGUL SYLLABLE DDEG
-+<UB5BE>     /x82/x39/xcc/x39 HANGUL SYLLABLE DDEGG
-+<UB5BF>     /x82/x39/xcd/x30 HANGUL SYLLABLE DDEGS
-+<UB5C0>     /x82/x39/xcd/x31 HANGUL SYLLABLE DDEN
-+<UB5C1>     /x82/x39/xcd/x32 HANGUL SYLLABLE DDENI
-+<UB5C2>     /x82/x39/xcd/x33 HANGUL SYLLABLE DDENH
-+<UB5C3>     /x82/x39/xcd/x34 HANGUL SYLLABLE DDED
-+<UB5C4>     /x82/x39/xcd/x35 HANGUL SYLLABLE DDEL
-+<UB5C5>     /x82/x39/xcd/x36 HANGUL SYLLABLE DDELG
-+<UB5C6>     /x82/x39/xcd/x37 HANGUL SYLLABLE DDELM
-+<UB5C7>     /x82/x39/xcd/x38 HANGUL SYLLABLE DDELB
-+<UB5C8>     /x82/x39/xcd/x39 HANGUL SYLLABLE DDELS
-+<UB5C9>     /x82/x39/xce/x30 HANGUL SYLLABLE DDELT
-+<UB5CA>     /x82/x39/xce/x31 HANGUL SYLLABLE DDELP
-+<UB5CB>     /x82/x39/xce/x32 HANGUL SYLLABLE DDELH
-+<UB5CC>     /x82/x39/xce/x33 HANGUL SYLLABLE DDEM
-+<UB5CD>     /x82/x39/xce/x34 HANGUL SYLLABLE DDEB
-+<UB5CE>     /x82/x39/xce/x35 HANGUL SYLLABLE DDEBS
-+<UB5CF>     /x82/x39/xce/x36 HANGUL SYLLABLE DDES
-+<UB5D0>     /x82/x39/xce/x37 HANGUL SYLLABLE DDESS
-+<UB5D1>     /x82/x39/xce/x38 HANGUL SYLLABLE DDENG
-+<UB5D2>     /x82/x39/xce/x39 HANGUL SYLLABLE DDEJ
-+<UB5D3>     /x82/x39/xcf/x30 HANGUL SYLLABLE DDEC
-+<UB5D4>     /x82/x39/xcf/x31 HANGUL SYLLABLE DDEK
-+<UB5D5>     /x82/x39/xcf/x32 HANGUL SYLLABLE DDET
-+<UB5D6>     /x82/x39/xcf/x33 HANGUL SYLLABLE DDEP
-+<UB5D7>     /x82/x39/xcf/x34 HANGUL SYLLABLE DDEH
-+<UB5D8>     /x82/x39/xcf/x35 HANGUL SYLLABLE DDYEO
-+<UB5D9>     /x82/x39/xcf/x36 HANGUL SYLLABLE DDYEOG
-+<UB5DA>     /x82/x39/xcf/x37 HANGUL SYLLABLE DDYEOGG
-+<UB5DB>     /x82/x39/xcf/x38 HANGUL SYLLABLE DDYEOGS
-+<UB5DC>     /x82/x39/xcf/x39 HANGUL SYLLABLE DDYEON
-+<UB5DD>     /x82/x39/xd0/x30 HANGUL SYLLABLE DDYEONI
-+<UB5DE>     /x82/x39/xd0/x31 HANGUL SYLLABLE DDYEONH
-+<UB5DF>     /x82/x39/xd0/x32 HANGUL SYLLABLE DDYEOD
-+<UB5E0>     /x82/x39/xd0/x33 HANGUL SYLLABLE DDYEOL
-+<UB5E1>     /x82/x39/xd0/x34 HANGUL SYLLABLE DDYEOLG
-+<UB5E2>     /x82/x39/xd0/x35 HANGUL SYLLABLE DDYEOLM
-+<UB5E3>     /x82/x39/xd0/x36 HANGUL SYLLABLE DDYEOLB
-+<UB5E4>     /x82/x39/xd0/x37 HANGUL SYLLABLE DDYEOLS
-+<UB5E5>     /x82/x39/xd0/x38 HANGUL SYLLABLE DDYEOLT
-+<UB5E6>     /x82/x39/xd0/x39 HANGUL SYLLABLE DDYEOLP
-+<UB5E7>     /x82/x39/xd1/x30 HANGUL SYLLABLE DDYEOLH
-+<UB5E8>     /x82/x39/xd1/x31 HANGUL SYLLABLE DDYEOM
-+<UB5E9>     /x82/x39/xd1/x32 HANGUL SYLLABLE DDYEOB
-+<UB5EA>     /x82/x39/xd1/x33 HANGUL SYLLABLE DDYEOBS
-+<UB5EB>     /x82/x39/xd1/x34 HANGUL SYLLABLE DDYEOS
-+<UB5EC>     /x82/x39/xd1/x35 HANGUL SYLLABLE DDYEOSS
-+<UB5ED>     /x82/x39/xd1/x36 HANGUL SYLLABLE DDYEONG
-+<UB5EE>     /x82/x39/xd1/x37 HANGUL SYLLABLE DDYEOJ
-+<UB5EF>     /x82/x39/xd1/x38 HANGUL SYLLABLE DDYEOC
-+<UB5F0>     /x82/x39/xd1/x39 HANGUL SYLLABLE DDYEOK
-+<UB5F1>     /x82/x39/xd2/x30 HANGUL SYLLABLE DDYEOT
-+<UB5F2>     /x82/x39/xd2/x31 HANGUL SYLLABLE DDYEOP
-+<UB5F3>     /x82/x39/xd2/x32 HANGUL SYLLABLE DDYEOH
-+<UB5F4>     /x82/x39/xd2/x33 HANGUL SYLLABLE DDYE
-+<UB5F5>     /x82/x39/xd2/x34 HANGUL SYLLABLE DDYEG
-+<UB5F6>     /x82/x39/xd2/x35 HANGUL SYLLABLE DDYEGG
-+<UB5F7>     /x82/x39/xd2/x36 HANGUL SYLLABLE DDYEGS
-+<UB5F8>     /x82/x39/xd2/x37 HANGUL SYLLABLE DDYEN
-+<UB5F9>     /x82/x39/xd2/x38 HANGUL SYLLABLE DDYENI
-+<UB5FA>     /x82/x39/xd2/x39 HANGUL SYLLABLE DDYENH
-+<UB5FB>     /x82/x39/xd3/x30 HANGUL SYLLABLE DDYED
-+<UB5FC>     /x82/x39/xd3/x31 HANGUL SYLLABLE DDYEL
-+<UB5FD>     /x82/x39/xd3/x32 HANGUL SYLLABLE DDYELG
-+<UB5FE>     /x82/x39/xd3/x33 HANGUL SYLLABLE DDYELM
-+<UB5FF>     /x82/x39/xd3/x34 HANGUL SYLLABLE DDYELB
-+<UB600>     /x82/x39/xd3/x35 HANGUL SYLLABLE DDYELS
-+<UB601>     /x82/x39/xd3/x36 HANGUL SYLLABLE DDYELT
-+<UB602>     /x82/x39/xd3/x37 HANGUL SYLLABLE DDYELP
-+<UB603>     /x82/x39/xd3/x38 HANGUL SYLLABLE DDYELH
-+<UB604>     /x82/x39/xd3/x39 HANGUL SYLLABLE DDYEM
-+<UB605>     /x82/x39/xd4/x30 HANGUL SYLLABLE DDYEB
-+<UB606>     /x82/x39/xd4/x31 HANGUL SYLLABLE DDYEBS
-+<UB607>     /x82/x39/xd4/x32 HANGUL SYLLABLE DDYES
-+<UB608>     /x82/x39/xd4/x33 HANGUL SYLLABLE DDYESS
-+<UB609>     /x82/x39/xd4/x34 HANGUL SYLLABLE DDYENG
-+<UB60A>     /x82/x39/xd4/x35 HANGUL SYLLABLE DDYEJ
-+<UB60B>     /x82/x39/xd4/x36 HANGUL SYLLABLE DDYEC
-+<UB60C>     /x82/x39/xd4/x37 HANGUL SYLLABLE DDYEK
-+<UB60D>     /x82/x39/xd4/x38 HANGUL SYLLABLE DDYET
-+<UB60E>     /x82/x39/xd4/x39 HANGUL SYLLABLE DDYEP
-+<UB60F>     /x82/x39/xd5/x30 HANGUL SYLLABLE DDYEH
-+<UB610>     /x82/x39/xd5/x31 HANGUL SYLLABLE DDO
-+<UB611>     /x82/x39/xd5/x32 HANGUL SYLLABLE DDOG
-+<UB612>     /x82/x39/xd5/x33 HANGUL SYLLABLE DDOGG
-+<UB613>     /x82/x39/xd5/x34 HANGUL SYLLABLE DDOGS
-+<UB614>     /x82/x39/xd5/x35 HANGUL SYLLABLE DDON
-+<UB615>     /x82/x39/xd5/x36 HANGUL SYLLABLE DDONI
-+<UB616>     /x82/x39/xd5/x37 HANGUL SYLLABLE DDONH
-+<UB617>     /x82/x39/xd5/x38 HANGUL SYLLABLE DDOD
-+<UB618>     /x82/x39/xd5/x39 HANGUL SYLLABLE DDOL
-+<UB619>     /x82/x39/xd6/x30 HANGUL SYLLABLE DDOLG
-+<UB61A>     /x82/x39/xd6/x31 HANGUL SYLLABLE DDOLM
-+<UB61B>     /x82/x39/xd6/x32 HANGUL SYLLABLE DDOLB
-+<UB61C>     /x82/x39/xd6/x33 HANGUL SYLLABLE DDOLS
-+<UB61D>     /x82/x39/xd6/x34 HANGUL SYLLABLE DDOLT
-+<UB61E>     /x82/x39/xd6/x35 HANGUL SYLLABLE DDOLP
-+<UB61F>     /x82/x39/xd6/x36 HANGUL SYLLABLE DDOLH
-+<UB620>     /x82/x39/xd6/x37 HANGUL SYLLABLE DDOM
-+<UB621>     /x82/x39/xd6/x38 HANGUL SYLLABLE DDOB
-+<UB622>     /x82/x39/xd6/x39 HANGUL SYLLABLE DDOBS
-+<UB623>     /x82/x39/xd7/x30 HANGUL SYLLABLE DDOS
-+<UB624>     /x82/x39/xd7/x31 HANGUL SYLLABLE DDOSS
-+<UB625>     /x82/x39/xd7/x32 HANGUL SYLLABLE DDONG
-+<UB626>     /x82/x39/xd7/x33 HANGUL SYLLABLE DDOJ
-+<UB627>     /x82/x39/xd7/x34 HANGUL SYLLABLE DDOC
-+<UB628>     /x82/x39/xd7/x35 HANGUL SYLLABLE DDOK
-+<UB629>     /x82/x39/xd7/x36 HANGUL SYLLABLE DDOT
-+<UB62A>     /x82/x39/xd7/x37 HANGUL SYLLABLE DDOP
-+<UB62B>     /x82/x39/xd7/x38 HANGUL SYLLABLE DDOH
-+<UB62C>     /x82/x39/xd7/x39 HANGUL SYLLABLE DDWA
-+<UB62D>     /x82/x39/xd8/x30 HANGUL SYLLABLE DDWAG
-+<UB62E>     /x82/x39/xd8/x31 HANGUL SYLLABLE DDWAGG
-+<UB62F>     /x82/x39/xd8/x32 HANGUL SYLLABLE DDWAGS
-+<UB630>     /x82/x39/xd8/x33 HANGUL SYLLABLE DDWAN
-+<UB631>     /x82/x39/xd8/x34 HANGUL SYLLABLE DDWANI
-+<UB632>     /x82/x39/xd8/x35 HANGUL SYLLABLE DDWANH
-+<UB633>     /x82/x39/xd8/x36 HANGUL SYLLABLE DDWAD
-+<UB634>     /x82/x39/xd8/x37 HANGUL SYLLABLE DDWAL
-+<UB635>     /x82/x39/xd8/x38 HANGUL SYLLABLE DDWALG
-+<UB636>     /x82/x39/xd8/x39 HANGUL SYLLABLE DDWALM
-+<UB637>     /x82/x39/xd9/x30 HANGUL SYLLABLE DDWALB
-+<UB638>     /x82/x39/xd9/x31 HANGUL SYLLABLE DDWALS
-+<UB639>     /x82/x39/xd9/x32 HANGUL SYLLABLE DDWALT
-+<UB63A>     /x82/x39/xd9/x33 HANGUL SYLLABLE DDWALP
-+<UB63B>     /x82/x39/xd9/x34 HANGUL SYLLABLE DDWALH
-+<UB63C>     /x82/x39/xd9/x35 HANGUL SYLLABLE DDWAM
-+<UB63D>     /x82/x39/xd9/x36 HANGUL SYLLABLE DDWAB
-+<UB63E>     /x82/x39/xd9/x37 HANGUL SYLLABLE DDWABS
-+<UB63F>     /x82/x39/xd9/x38 HANGUL SYLLABLE DDWAS
-+<UB640>     /x82/x39/xd9/x39 HANGUL SYLLABLE DDWASS
-+<UB641>     /x82/x39/xda/x30 HANGUL SYLLABLE DDWANG
-+<UB642>     /x82/x39/xda/x31 HANGUL SYLLABLE DDWAJ
-+<UB643>     /x82/x39/xda/x32 HANGUL SYLLABLE DDWAC
-+<UB644>     /x82/x39/xda/x33 HANGUL SYLLABLE DDWAK
-+<UB645>     /x82/x39/xda/x34 HANGUL SYLLABLE DDWAT
-+<UB646>     /x82/x39/xda/x35 HANGUL SYLLABLE DDWAP
-+<UB647>     /x82/x39/xda/x36 HANGUL SYLLABLE DDWAH
-+<UB648>     /x82/x39/xda/x37 HANGUL SYLLABLE DDWAE
-+<UB649>     /x82/x39/xda/x38 HANGUL SYLLABLE DDWAEG
-+<UB64A>     /x82/x39/xda/x39 HANGUL SYLLABLE DDWAEGG
-+<UB64B>     /x82/x39/xdb/x30 HANGUL SYLLABLE DDWAEGS
-+<UB64C>     /x82/x39/xdb/x31 HANGUL SYLLABLE DDWAEN
-+<UB64D>     /x82/x39/xdb/x32 HANGUL SYLLABLE DDWAENI
-+<UB64E>     /x82/x39/xdb/x33 HANGUL SYLLABLE DDWAENH
-+<UB64F>     /x82/x39/xdb/x34 HANGUL SYLLABLE DDWAED
-+<UB650>     /x82/x39/xdb/x35 HANGUL SYLLABLE DDWAEL
-+<UB651>     /x82/x39/xdb/x36 HANGUL SYLLABLE DDWAELG
-+<UB652>     /x82/x39/xdb/x37 HANGUL SYLLABLE DDWAELM
-+<UB653>     /x82/x39/xdb/x38 HANGUL SYLLABLE DDWAELB
-+<UB654>     /x82/x39/xdb/x39 HANGUL SYLLABLE DDWAELS
-+<UB655>     /x82/x39/xdc/x30 HANGUL SYLLABLE DDWAELT
-+<UB656>     /x82/x39/xdc/x31 HANGUL SYLLABLE DDWAELP
-+<UB657>     /x82/x39/xdc/x32 HANGUL SYLLABLE DDWAELH
-+<UB658>     /x82/x39/xdc/x33 HANGUL SYLLABLE DDWAEM
-+<UB659>     /x82/x39/xdc/x34 HANGUL SYLLABLE DDWAEB
-+<UB65A>     /x82/x39/xdc/x35 HANGUL SYLLABLE DDWAEBS
-+<UB65B>     /x82/x39/xdc/x36 HANGUL SYLLABLE DDWAES
-+<UB65C>     /x82/x39/xdc/x37 HANGUL SYLLABLE DDWAESS
-+<UB65D>     /x82/x39/xdc/x38 HANGUL SYLLABLE DDWAENG
-+<UB65E>     /x82/x39/xdc/x39 HANGUL SYLLABLE DDWAEJ
-+<UB65F>     /x82/x39/xdd/x30 HANGUL SYLLABLE DDWAEC
-+<UB660>     /x82/x39/xdd/x31 HANGUL SYLLABLE DDWAEK
-+<UB661>     /x82/x39/xdd/x32 HANGUL SYLLABLE DDWAET
-+<UB662>     /x82/x39/xdd/x33 HANGUL SYLLABLE DDWAEP
-+<UB663>     /x82/x39/xdd/x34 HANGUL SYLLABLE DDWAEH
-+<UB664>     /x82/x39/xdd/x35 HANGUL SYLLABLE DDOE
-+<UB665>     /x82/x39/xdd/x36 HANGUL SYLLABLE DDOEG
-+<UB666>     /x82/x39/xdd/x37 HANGUL SYLLABLE DDOEGG
-+<UB667>     /x82/x39/xdd/x38 HANGUL SYLLABLE DDOEGS
-+<UB668>     /x82/x39/xdd/x39 HANGUL SYLLABLE DDOEN
-+<UB669>     /x82/x39/xde/x30 HANGUL SYLLABLE DDOENI
-+<UB66A>     /x82/x39/xde/x31 HANGUL SYLLABLE DDOENH
-+<UB66B>     /x82/x39/xde/x32 HANGUL SYLLABLE DDOED
-+<UB66C>     /x82/x39/xde/x33 HANGUL SYLLABLE DDOEL
-+<UB66D>     /x82/x39/xde/x34 HANGUL SYLLABLE DDOELG
-+<UB66E>     /x82/x39/xde/x35 HANGUL SYLLABLE DDOELM
-+<UB66F>     /x82/x39/xde/x36 HANGUL SYLLABLE DDOELB
-+<UB670>     /x82/x39/xde/x37 HANGUL SYLLABLE DDOELS
-+<UB671>     /x82/x39/xde/x38 HANGUL SYLLABLE DDOELT
-+<UB672>     /x82/x39/xde/x39 HANGUL SYLLABLE DDOELP
-+<UB673>     /x82/x39/xdf/x30 HANGUL SYLLABLE DDOELH
-+<UB674>     /x82/x39/xdf/x31 HANGUL SYLLABLE DDOEM
-+<UB675>     /x82/x39/xdf/x32 HANGUL SYLLABLE DDOEB
-+<UB676>     /x82/x39/xdf/x33 HANGUL SYLLABLE DDOEBS
-+<UB677>     /x82/x39/xdf/x34 HANGUL SYLLABLE DDOES
-+<UB678>     /x82/x39/xdf/x35 HANGUL SYLLABLE DDOESS
-+<UB679>     /x82/x39/xdf/x36 HANGUL SYLLABLE DDOENG
-+<UB67A>     /x82/x39/xdf/x37 HANGUL SYLLABLE DDOEJ
-+<UB67B>     /x82/x39/xdf/x38 HANGUL SYLLABLE DDOEC
-+<UB67C>     /x82/x39/xdf/x39 HANGUL SYLLABLE DDOEK
-+<UB67D>     /x82/x39/xe0/x30 HANGUL SYLLABLE DDOET
-+<UB67E>     /x82/x39/xe0/x31 HANGUL SYLLABLE DDOEP
-+<UB67F>     /x82/x39/xe0/x32 HANGUL SYLLABLE DDOEH
-+<UB680>     /x82/x39/xe0/x33 HANGUL SYLLABLE DDYO
-+<UB681>     /x82/x39/xe0/x34 HANGUL SYLLABLE DDYOG
-+<UB682>     /x82/x39/xe0/x35 HANGUL SYLLABLE DDYOGG
-+<UB683>     /x82/x39/xe0/x36 HANGUL SYLLABLE DDYOGS
-+<UB684>     /x82/x39/xe0/x37 HANGUL SYLLABLE DDYON
-+<UB685>     /x82/x39/xe0/x38 HANGUL SYLLABLE DDYONI
-+<UB686>     /x82/x39/xe0/x39 HANGUL SYLLABLE DDYONH
-+<UB687>     /x82/x39/xe1/x30 HANGUL SYLLABLE DDYOD
-+<UB688>     /x82/x39/xe1/x31 HANGUL SYLLABLE DDYOL
-+<UB689>     /x82/x39/xe1/x32 HANGUL SYLLABLE DDYOLG
-+<UB68A>     /x82/x39/xe1/x33 HANGUL SYLLABLE DDYOLM
-+<UB68B>     /x82/x39/xe1/x34 HANGUL SYLLABLE DDYOLB
-+<UB68C>     /x82/x39/xe1/x35 HANGUL SYLLABLE DDYOLS
-+<UB68D>     /x82/x39/xe1/x36 HANGUL SYLLABLE DDYOLT
-+<UB68E>     /x82/x39/xe1/x37 HANGUL SYLLABLE DDYOLP
-+<UB68F>     /x82/x39/xe1/x38 HANGUL SYLLABLE DDYOLH
-+<UB690>     /x82/x39/xe1/x39 HANGUL SYLLABLE DDYOM
-+<UB691>     /x82/x39/xe2/x30 HANGUL SYLLABLE DDYOB
-+<UB692>     /x82/x39/xe2/x31 HANGUL SYLLABLE DDYOBS
-+<UB693>     /x82/x39/xe2/x32 HANGUL SYLLABLE DDYOS
-+<UB694>     /x82/x39/xe2/x33 HANGUL SYLLABLE DDYOSS
-+<UB695>     /x82/x39/xe2/x34 HANGUL SYLLABLE DDYONG
-+<UB696>     /x82/x39/xe2/x35 HANGUL SYLLABLE DDYOJ
-+<UB697>     /x82/x39/xe2/x36 HANGUL SYLLABLE DDYOC
-+<UB698>     /x82/x39/xe2/x37 HANGUL SYLLABLE DDYOK
-+<UB699>     /x82/x39/xe2/x38 HANGUL SYLLABLE DDYOT
-+<UB69A>     /x82/x39/xe2/x39 HANGUL SYLLABLE DDYOP
-+<UB69B>     /x82/x39/xe3/x30 HANGUL SYLLABLE DDYOH
-+<UB69C>     /x82/x39/xe3/x31 HANGUL SYLLABLE DDU
-+<UB69D>     /x82/x39/xe3/x32 HANGUL SYLLABLE DDUG
-+<UB69E>     /x82/x39/xe3/x33 HANGUL SYLLABLE DDUGG
-+<UB69F>     /x82/x39/xe3/x34 HANGUL SYLLABLE DDUGS
-+<UB6A0>     /x82/x39/xe3/x35 HANGUL SYLLABLE DDUN
-+<UB6A1>     /x82/x39/xe3/x36 HANGUL SYLLABLE DDUNI
-+<UB6A2>     /x82/x39/xe3/x37 HANGUL SYLLABLE DDUNH
-+<UB6A3>     /x82/x39/xe3/x38 HANGUL SYLLABLE DDUD
-+<UB6A4>     /x82/x39/xe3/x39 HANGUL SYLLABLE DDUL
-+<UB6A5>     /x82/x39/xe4/x30 HANGUL SYLLABLE DDULG
-+<UB6A6>     /x82/x39/xe4/x31 HANGUL SYLLABLE DDULM
-+<UB6A7>     /x82/x39/xe4/x32 HANGUL SYLLABLE DDULB
-+<UB6A8>     /x82/x39/xe4/x33 HANGUL SYLLABLE DDULS
-+<UB6A9>     /x82/x39/xe4/x34 HANGUL SYLLABLE DDULT
-+<UB6AA>     /x82/x39/xe4/x35 HANGUL SYLLABLE DDULP
-+<UB6AB>     /x82/x39/xe4/x36 HANGUL SYLLABLE DDULH
-+<UB6AC>     /x82/x39/xe4/x37 HANGUL SYLLABLE DDUM
-+<UB6AD>     /x82/x39/xe4/x38 HANGUL SYLLABLE DDUB
-+<UB6AE>     /x82/x39/xe4/x39 HANGUL SYLLABLE DDUBS
-+<UB6AF>     /x82/x39/xe5/x30 HANGUL SYLLABLE DDUS
-+<UB6B0>     /x82/x39/xe5/x31 HANGUL SYLLABLE DDUSS
-+<UB6B1>     /x82/x39/xe5/x32 HANGUL SYLLABLE DDUNG
-+<UB6B2>     /x82/x39/xe5/x33 HANGUL SYLLABLE DDUJ
-+<UB6B3>     /x82/x39/xe5/x34 HANGUL SYLLABLE DDUC
-+<UB6B4>     /x82/x39/xe5/x35 HANGUL SYLLABLE DDUK
-+<UB6B5>     /x82/x39/xe5/x36 HANGUL SYLLABLE DDUT
-+<UB6B6>     /x82/x39/xe5/x37 HANGUL SYLLABLE DDUP
-+<UB6B7>     /x82/x39/xe5/x38 HANGUL SYLLABLE DDUH
-+<UB6B8>     /x82/x39/xe5/x39 HANGUL SYLLABLE DDWEO
-+<UB6B9>     /x82/x39/xe6/x30 HANGUL SYLLABLE DDWEOG
-+<UB6BA>     /x82/x39/xe6/x31 HANGUL SYLLABLE DDWEOGG
-+<UB6BB>     /x82/x39/xe6/x32 HANGUL SYLLABLE DDWEOGS
-+<UB6BC>     /x82/x39/xe6/x33 HANGUL SYLLABLE DDWEON
-+<UB6BD>     /x82/x39/xe6/x34 HANGUL SYLLABLE DDWEONI
-+<UB6BE>     /x82/x39/xe6/x35 HANGUL SYLLABLE DDWEONH
-+<UB6BF>     /x82/x39/xe6/x36 HANGUL SYLLABLE DDWEOD
-+<UB6C0>     /x82/x39/xe6/x37 HANGUL SYLLABLE DDWEOL
-+<UB6C1>     /x82/x39/xe6/x38 HANGUL SYLLABLE DDWEOLG
-+<UB6C2>     /x82/x39/xe6/x39 HANGUL SYLLABLE DDWEOLM
-+<UB6C3>     /x82/x39/xe7/x30 HANGUL SYLLABLE DDWEOLB
-+<UB6C4>     /x82/x39/xe7/x31 HANGUL SYLLABLE DDWEOLS
-+<UB6C5>     /x82/x39/xe7/x32 HANGUL SYLLABLE DDWEOLT
-+<UB6C6>     /x82/x39/xe7/x33 HANGUL SYLLABLE DDWEOLP
-+<UB6C7>     /x82/x39/xe7/x34 HANGUL SYLLABLE DDWEOLH
-+<UB6C8>     /x82/x39/xe7/x35 HANGUL SYLLABLE DDWEOM
-+<UB6C9>     /x82/x39/xe7/x36 HANGUL SYLLABLE DDWEOB
-+<UB6CA>     /x82/x39/xe7/x37 HANGUL SYLLABLE DDWEOBS
-+<UB6CB>     /x82/x39/xe7/x38 HANGUL SYLLABLE DDWEOS
-+<UB6CC>     /x82/x39/xe7/x39 HANGUL SYLLABLE DDWEOSS
-+<UB6CD>     /x82/x39/xe8/x30 HANGUL SYLLABLE DDWEONG
-+<UB6CE>     /x82/x39/xe8/x31 HANGUL SYLLABLE DDWEOJ
-+<UB6CF>     /x82/x39/xe8/x32 HANGUL SYLLABLE DDWEOC
-+<UB6D0>     /x82/x39/xe8/x33 HANGUL SYLLABLE DDWEOK
-+<UB6D1>     /x82/x39/xe8/x34 HANGUL SYLLABLE DDWEOT
-+<UB6D2>     /x82/x39/xe8/x35 HANGUL SYLLABLE DDWEOP
-+<UB6D3>     /x82/x39/xe8/x36 HANGUL SYLLABLE DDWEOH
-+<UB6D4>     /x82/x39/xe8/x37 HANGUL SYLLABLE DDWE
-+<UB6D5>     /x82/x39/xe8/x38 HANGUL SYLLABLE DDWEG
-+<UB6D6>     /x82/x39/xe8/x39 HANGUL SYLLABLE DDWEGG
-+<UB6D7>     /x82/x39/xe9/x30 HANGUL SYLLABLE DDWEGS
-+<UB6D8>     /x82/x39/xe9/x31 HANGUL SYLLABLE DDWEN
-+<UB6D9>     /x82/x39/xe9/x32 HANGUL SYLLABLE DDWENI
-+<UB6DA>     /x82/x39/xe9/x33 HANGUL SYLLABLE DDWENH
-+<UB6DB>     /x82/x39/xe9/x34 HANGUL SYLLABLE DDWED
-+<UB6DC>     /x82/x39/xe9/x35 HANGUL SYLLABLE DDWEL
-+<UB6DD>     /x82/x39/xe9/x36 HANGUL SYLLABLE DDWELG
-+<UB6DE>     /x82/x39/xe9/x37 HANGUL SYLLABLE DDWELM
-+<UB6DF>     /x82/x39/xe9/x38 HANGUL SYLLABLE DDWELB
-+<UB6E0>     /x82/x39/xe9/x39 HANGUL SYLLABLE DDWELS
-+<UB6E1>     /x82/x39/xea/x30 HANGUL SYLLABLE DDWELT
-+<UB6E2>     /x82/x39/xea/x31 HANGUL SYLLABLE DDWELP
-+<UB6E3>     /x82/x39/xea/x32 HANGUL SYLLABLE DDWELH
-+<UB6E4>     /x82/x39/xea/x33 HANGUL SYLLABLE DDWEM
-+<UB6E5>     /x82/x39/xea/x34 HANGUL SYLLABLE DDWEB
-+<UB6E6>     /x82/x39/xea/x35 HANGUL SYLLABLE DDWEBS
-+<UB6E7>     /x82/x39/xea/x36 HANGUL SYLLABLE DDWES
-+<UB6E8>     /x82/x39/xea/x37 HANGUL SYLLABLE DDWESS
-+<UB6E9>     /x82/x39/xea/x38 HANGUL SYLLABLE DDWENG
-+<UB6EA>     /x82/x39/xea/x39 HANGUL SYLLABLE DDWEJ
-+<UB6EB>     /x82/x39/xeb/x30 HANGUL SYLLABLE DDWEC
-+<UB6EC>     /x82/x39/xeb/x31 HANGUL SYLLABLE DDWEK
-+<UB6ED>     /x82/x39/xeb/x32 HANGUL SYLLABLE DDWET
-+<UB6EE>     /x82/x39/xeb/x33 HANGUL SYLLABLE DDWEP
-+<UB6EF>     /x82/x39/xeb/x34 HANGUL SYLLABLE DDWEH
-+<UB6F0>     /x82/x39/xeb/x35 HANGUL SYLLABLE DDWI
-+<UB6F1>     /x82/x39/xeb/x36 HANGUL SYLLABLE DDWIG
-+<UB6F2>     /x82/x39/xeb/x37 HANGUL SYLLABLE DDWIGG
-+<UB6F3>     /x82/x39/xeb/x38 HANGUL SYLLABLE DDWIGS
-+<UB6F4>     /x82/x39/xeb/x39 HANGUL SYLLABLE DDWIN
-+<UB6F5>     /x82/x39/xec/x30 HANGUL SYLLABLE DDWINI
-+<UB6F6>     /x82/x39/xec/x31 HANGUL SYLLABLE DDWINH
-+<UB6F7>     /x82/x39/xec/x32 HANGUL SYLLABLE DDWID
-+<UB6F8>     /x82/x39/xec/x33 HANGUL SYLLABLE DDWIL
-+<UB6F9>     /x82/x39/xec/x34 HANGUL SYLLABLE DDWILG
-+<UB6FA>     /x82/x39/xec/x35 HANGUL SYLLABLE DDWILM
-+<UB6FB>     /x82/x39/xec/x36 HANGUL SYLLABLE DDWILB
-+<UB6FC>     /x82/x39/xec/x37 HANGUL SYLLABLE DDWILS
-+<UB6FD>     /x82/x39/xec/x38 HANGUL SYLLABLE DDWILT
-+<UB6FE>     /x82/x39/xec/x39 HANGUL SYLLABLE DDWILP
-+<UB6FF>     /x82/x39/xed/x30 HANGUL SYLLABLE DDWILH
-+<UB700>     /x82/x39/xed/x31 HANGUL SYLLABLE DDWIM
-+<UB701>     /x82/x39/xed/x32 HANGUL SYLLABLE DDWIB
-+<UB702>     /x82/x39/xed/x33 HANGUL SYLLABLE DDWIBS
-+<UB703>     /x82/x39/xed/x34 HANGUL SYLLABLE DDWIS
-+<UB704>     /x82/x39/xed/x35 HANGUL SYLLABLE DDWISS
-+<UB705>     /x82/x39/xed/x36 HANGUL SYLLABLE DDWING
-+<UB706>     /x82/x39/xed/x37 HANGUL SYLLABLE DDWIJ
-+<UB707>     /x82/x39/xed/x38 HANGUL SYLLABLE DDWIC
-+<UB708>     /x82/x39/xed/x39 HANGUL SYLLABLE DDWIK
-+<UB709>     /x82/x39/xee/x30 HANGUL SYLLABLE DDWIT
-+<UB70A>     /x82/x39/xee/x31 HANGUL SYLLABLE DDWIP
-+<UB70B>     /x82/x39/xee/x32 HANGUL SYLLABLE DDWIH
-+<UB70C>     /x82/x39/xee/x33 HANGUL SYLLABLE DDYU
-+<UB70D>     /x82/x39/xee/x34 HANGUL SYLLABLE DDYUG
-+<UB70E>     /x82/x39/xee/x35 HANGUL SYLLABLE DDYUGG
-+<UB70F>     /x82/x39/xee/x36 HANGUL SYLLABLE DDYUGS
-+<UB710>     /x82/x39/xee/x37 HANGUL SYLLABLE DDYUN
-+<UB711>     /x82/x39/xee/x38 HANGUL SYLLABLE DDYUNI
-+<UB712>     /x82/x39/xee/x39 HANGUL SYLLABLE DDYUNH
-+<UB713>     /x82/x39/xef/x30 HANGUL SYLLABLE DDYUD
-+<UB714>     /x82/x39/xef/x31 HANGUL SYLLABLE DDYUL
-+<UB715>     /x82/x39/xef/x32 HANGUL SYLLABLE DDYULG
-+<UB716>     /x82/x39/xef/x33 HANGUL SYLLABLE DDYULM
-+<UB717>     /x82/x39/xef/x34 HANGUL SYLLABLE DDYULB
-+<UB718>     /x82/x39/xef/x35 HANGUL SYLLABLE DDYULS
-+<UB719>     /x82/x39/xef/x36 HANGUL SYLLABLE DDYULT
-+<UB71A>     /x82/x39/xef/x37 HANGUL SYLLABLE DDYULP
-+<UB71B>     /x82/x39/xef/x38 HANGUL SYLLABLE DDYULH
-+<UB71C>     /x82/x39/xef/x39 HANGUL SYLLABLE DDYUM
-+<UB71D>     /x82/x39/xf0/x30 HANGUL SYLLABLE DDYUB
-+<UB71E>     /x82/x39/xf0/x31 HANGUL SYLLABLE DDYUBS
-+<UB71F>     /x82/x39/xf0/x32 HANGUL SYLLABLE DDYUS
-+<UB720>     /x82/x39/xf0/x33 HANGUL SYLLABLE DDYUSS
-+<UB721>     /x82/x39/xf0/x34 HANGUL SYLLABLE DDYUNG
-+<UB722>     /x82/x39/xf0/x35 HANGUL SYLLABLE DDYUJ
-+<UB723>     /x82/x39/xf0/x36 HANGUL SYLLABLE DDYUC
-+<UB724>     /x82/x39/xf0/x37 HANGUL SYLLABLE DDYUK
-+<UB725>     /x82/x39/xf0/x38 HANGUL SYLLABLE DDYUT
-+<UB726>     /x82/x39/xf0/x39 HANGUL SYLLABLE DDYUP
-+<UB727>     /x82/x39/xf1/x30 HANGUL SYLLABLE DDYUH
-+<UB728>     /x82/x39/xf1/x31 HANGUL SYLLABLE DDEU
-+<UB729>     /x82/x39/xf1/x32 HANGUL SYLLABLE DDEUG
-+<UB72A>     /x82/x39/xf1/x33 HANGUL SYLLABLE DDEUGG
-+<UB72B>     /x82/x39/xf1/x34 HANGUL SYLLABLE DDEUGS
-+<UB72C>     /x82/x39/xf1/x35 HANGUL SYLLABLE DDEUN
-+<UB72D>     /x82/x39/xf1/x36 HANGUL SYLLABLE DDEUNI
-+<UB72E>     /x82/x39/xf1/x37 HANGUL SYLLABLE DDEUNH
-+<UB72F>     /x82/x39/xf1/x38 HANGUL SYLLABLE DDEUD
-+<UB730>     /x82/x39/xf1/x39 HANGUL SYLLABLE DDEUL
-+<UB731>     /x82/x39/xf2/x30 HANGUL SYLLABLE DDEULG
-+<UB732>     /x82/x39/xf2/x31 HANGUL SYLLABLE DDEULM
-+<UB733>     /x82/x39/xf2/x32 HANGUL SYLLABLE DDEULB
-+<UB734>     /x82/x39/xf2/x33 HANGUL SYLLABLE DDEULS
-+<UB735>     /x82/x39/xf2/x34 HANGUL SYLLABLE DDEULT
-+<UB736>     /x82/x39/xf2/x35 HANGUL SYLLABLE DDEULP
-+<UB737>     /x82/x39/xf2/x36 HANGUL SYLLABLE DDEULH
-+<UB738>     /x82/x39/xf2/x37 HANGUL SYLLABLE DDEUM
-+<UB739>     /x82/x39/xf2/x38 HANGUL SYLLABLE DDEUB
-+<UB73A>     /x82/x39/xf2/x39 HANGUL SYLLABLE DDEUBS
-+<UB73B>     /x82/x39/xf3/x30 HANGUL SYLLABLE DDEUS
-+<UB73C>     /x82/x39/xf3/x31 HANGUL SYLLABLE DDEUSS
-+<UB73D>     /x82/x39/xf3/x32 HANGUL SYLLABLE DDEUNG
-+<UB73E>     /x82/x39/xf3/x33 HANGUL SYLLABLE DDEUJ
-+<UB73F>     /x82/x39/xf3/x34 HANGUL SYLLABLE DDEUC
-+<UB740>     /x82/x39/xf3/x35 HANGUL SYLLABLE DDEUK
-+<UB741>     /x82/x39/xf3/x36 HANGUL SYLLABLE DDEUT
-+<UB742>     /x82/x39/xf3/x37 HANGUL SYLLABLE DDEUP
-+<UB743>     /x82/x39/xf3/x38 HANGUL SYLLABLE DDEUH
-+<UB744>     /x82/x39/xf3/x39 HANGUL SYLLABLE DDYI
-+<UB745>     /x82/x39/xf4/x30 HANGUL SYLLABLE DDYIG
-+<UB746>     /x82/x39/xf4/x31 HANGUL SYLLABLE DDYIGG
-+<UB747>     /x82/x39/xf4/x32 HANGUL SYLLABLE DDYIGS
-+<UB748>     /x82/x39/xf4/x33 HANGUL SYLLABLE DDYIN
-+<UB749>     /x82/x39/xf4/x34 HANGUL SYLLABLE DDYINI
-+<UB74A>     /x82/x39/xf4/x35 HANGUL SYLLABLE DDYINH
-+<UB74B>     /x82/x39/xf4/x36 HANGUL SYLLABLE DDYID
-+<UB74C>     /x82/x39/xf4/x37 HANGUL SYLLABLE DDYIL
-+<UB74D>     /x82/x39/xf4/x38 HANGUL SYLLABLE DDYILG
-+<UB74E>     /x82/x39/xf4/x39 HANGUL SYLLABLE DDYILM
-+<UB74F>     /x82/x39/xf5/x30 HANGUL SYLLABLE DDYILB
-+<UB750>     /x82/x39/xf5/x31 HANGUL SYLLABLE DDYILS
-+<UB751>     /x82/x39/xf5/x32 HANGUL SYLLABLE DDYILT
-+<UB752>     /x82/x39/xf5/x33 HANGUL SYLLABLE DDYILP
-+<UB753>     /x82/x39/xf5/x34 HANGUL SYLLABLE DDYILH
-+<UB754>     /x82/x39/xf5/x35 HANGUL SYLLABLE DDYIM
-+<UB755>     /x82/x39/xf5/x36 HANGUL SYLLABLE DDYIB
-+<UB756>     /x82/x39/xf5/x37 HANGUL SYLLABLE DDYIBS
-+<UB757>     /x82/x39/xf5/x38 HANGUL SYLLABLE DDYIS
-+<UB758>     /x82/x39/xf5/x39 HANGUL SYLLABLE DDYISS
-+<UB759>     /x82/x39/xf6/x30 HANGUL SYLLABLE DDYING
-+<UB75A>     /x82/x39/xf6/x31 HANGUL SYLLABLE DDYIJ
-+<UB75B>     /x82/x39/xf6/x32 HANGUL SYLLABLE DDYIC
-+<UB75C>     /x82/x39/xf6/x33 HANGUL SYLLABLE DDYIK
-+<UB75D>     /x82/x39/xf6/x34 HANGUL SYLLABLE DDYIT
-+<UB75E>     /x82/x39/xf6/x35 HANGUL SYLLABLE DDYIP
-+<UB75F>     /x82/x39/xf6/x36 HANGUL SYLLABLE DDYIH
-+<UB760>     /x82/x39/xf6/x37 HANGUL SYLLABLE DDI
-+<UB761>     /x82/x39/xf6/x38 HANGUL SYLLABLE DDIG
-+<UB762>     /x82/x39/xf6/x39 HANGUL SYLLABLE DDIGG
-+<UB763>     /x82/x39/xf7/x30 HANGUL SYLLABLE DDIGS
-+<UB764>     /x82/x39/xf7/x31 HANGUL SYLLABLE DDIN
-+<UB765>     /x82/x39/xf7/x32 HANGUL SYLLABLE DDINI
-+<UB766>     /x82/x39/xf7/x33 HANGUL SYLLABLE DDINH
-+<UB767>     /x82/x39/xf7/x34 HANGUL SYLLABLE DDID
-+<UB768>     /x82/x39/xf7/x35 HANGUL SYLLABLE DDIL
-+<UB769>     /x82/x39/xf7/x36 HANGUL SYLLABLE DDILG
-+<UB76A>     /x82/x39/xf7/x37 HANGUL SYLLABLE DDILM
-+<UB76B>     /x82/x39/xf7/x38 HANGUL SYLLABLE DDILB
-+<UB76C>     /x82/x39/xf7/x39 HANGUL SYLLABLE DDILS
-+<UB76D>     /x82/x39/xf8/x30 HANGUL SYLLABLE DDILT
-+<UB76E>     /x82/x39/xf8/x31 HANGUL SYLLABLE DDILP
-+<UB76F>     /x82/x39/xf8/x32 HANGUL SYLLABLE DDILH
-+<UB770>     /x82/x39/xf8/x33 HANGUL SYLLABLE DDIM
-+<UB771>     /x82/x39/xf8/x34 HANGUL SYLLABLE DDIB
-+<UB772>     /x82/x39/xf8/x35 HANGUL SYLLABLE DDIBS
-+<UB773>     /x82/x39/xf8/x36 HANGUL SYLLABLE DDIS
-+<UB774>     /x82/x39/xf8/x37 HANGUL SYLLABLE DDISS
-+<UB775>     /x82/x39/xf8/x38 HANGUL SYLLABLE DDING
-+<UB776>     /x82/x39/xf8/x39 HANGUL SYLLABLE DDIJ
-+<UB777>     /x82/x39/xf9/x30 HANGUL SYLLABLE DDIC
-+<UB778>     /x82/x39/xf9/x31 HANGUL SYLLABLE DDIK
-+<UB779>     /x82/x39/xf9/x32 HANGUL SYLLABLE DDIT
-+<UB77A>     /x82/x39/xf9/x33 HANGUL SYLLABLE DDIP
-+<UB77B>     /x82/x39/xf9/x34 HANGUL SYLLABLE DDIH
-+<UB77C>     /x82/x39/xf9/x35 HANGUL SYLLABLE RA
-+<UB77D>     /x82/x39/xf9/x36 HANGUL SYLLABLE RAG
-+<UB77E>     /x82/x39/xf9/x37 HANGUL SYLLABLE RAGG
-+<UB77F>     /x82/x39/xf9/x38 HANGUL SYLLABLE RAGS
-+<UB780>     /x82/x39/xf9/x39 HANGUL SYLLABLE RAN
-+<UB781>     /x82/x39/xfa/x30 HANGUL SYLLABLE RANI
-+<UB782>     /x82/x39/xfa/x31 HANGUL SYLLABLE RANH
-+<UB783>     /x82/x39/xfa/x32 HANGUL SYLLABLE RAD
-+<UB784>     /x82/x39/xfa/x33 HANGUL SYLLABLE RAL
-+<UB785>     /x82/x39/xfa/x34 HANGUL SYLLABLE RALG
-+<UB786>     /x82/x39/xfa/x35 HANGUL SYLLABLE RALM
-+<UB787>     /x82/x39/xfa/x36 HANGUL SYLLABLE RALB
-+<UB788>     /x82/x39/xfa/x37 HANGUL SYLLABLE RALS
-+<UB789>     /x82/x39/xfa/x38 HANGUL SYLLABLE RALT
-+<UB78A>     /x82/x39/xfa/x39 HANGUL SYLLABLE RALP
-+<UB78B>     /x82/x39/xfb/x30 HANGUL SYLLABLE RALH
-+<UB78C>     /x82/x39/xfb/x31 HANGUL SYLLABLE RAM
-+<UB78D>     /x82/x39/xfb/x32 HANGUL SYLLABLE RAB
-+<UB78E>     /x82/x39/xfb/x33 HANGUL SYLLABLE RABS
-+<UB78F>     /x82/x39/xfb/x34 HANGUL SYLLABLE RAS
-+<UB790>     /x82/x39/xfb/x35 HANGUL SYLLABLE RASS
-+<UB791>     /x82/x39/xfb/x36 HANGUL SYLLABLE RANG
-+<UB792>     /x82/x39/xfb/x37 HANGUL SYLLABLE RAJ
-+<UB793>     /x82/x39/xfb/x38 HANGUL SYLLABLE RAC
-+<UB794>     /x82/x39/xfb/x39 HANGUL SYLLABLE RAK
-+<UB795>     /x82/x39/xfc/x30 HANGUL SYLLABLE RAT
-+<UB796>     /x82/x39/xfc/x31 HANGUL SYLLABLE RAP
-+<UB797>     /x82/x39/xfc/x32 HANGUL SYLLABLE RAH
-+<UB798>     /x82/x39/xfc/x33 HANGUL SYLLABLE RAE
-+<UB799>     /x82/x39/xfc/x34 HANGUL SYLLABLE RAEG
-+<UB79A>     /x82/x39/xfc/x35 HANGUL SYLLABLE RAEGG
-+<UB79B>     /x82/x39/xfc/x36 HANGUL SYLLABLE RAEGS
-+<UB79C>     /x82/x39/xfc/x37 HANGUL SYLLABLE RAEN
-+<UB79D>     /x82/x39/xfc/x38 HANGUL SYLLABLE RAENI
-+<UB79E>     /x82/x39/xfc/x39 HANGUL SYLLABLE RAENH
-+<UB79F>     /x82/x39/xfd/x30 HANGUL SYLLABLE RAED
-+<UB7A0>     /x82/x39/xfd/x31 HANGUL SYLLABLE RAEL
-+<UB7A1>     /x82/x39/xfd/x32 HANGUL SYLLABLE RAELG
-+<UB7A2>     /x82/x39/xfd/x33 HANGUL SYLLABLE RAELM
-+<UB7A3>     /x82/x39/xfd/x34 HANGUL SYLLABLE RAELB
-+<UB7A4>     /x82/x39/xfd/x35 HANGUL SYLLABLE RAELS
-+<UB7A5>     /x82/x39/xfd/x36 HANGUL SYLLABLE RAELT
-+<UB7A6>     /x82/x39/xfd/x37 HANGUL SYLLABLE RAELP
-+<UB7A7>     /x82/x39/xfd/x38 HANGUL SYLLABLE RAELH
-+<UB7A8>     /x82/x39/xfd/x39 HANGUL SYLLABLE RAEM
-+<UB7A9>     /x82/x39/xfe/x30 HANGUL SYLLABLE RAEB
-+<UB7AA>     /x82/x39/xfe/x31 HANGUL SYLLABLE RAEBS
-+<UB7AB>     /x82/x39/xfe/x32 HANGUL SYLLABLE RAES
-+<UB7AC>     /x82/x39/xfe/x33 HANGUL SYLLABLE RAESS
-+<UB7AD>     /x82/x39/xfe/x34 HANGUL SYLLABLE RAENG
-+<UB7AE>     /x82/x39/xfe/x35 HANGUL SYLLABLE RAEJ
-+<UB7AF>     /x82/x39/xfe/x36 HANGUL SYLLABLE RAEC
-+<UB7B0>     /x82/x39/xfe/x37 HANGUL SYLLABLE RAEK
-+<UB7B1>     /x82/x39/xfe/x38 HANGUL SYLLABLE RAET
-+<UB7B2>     /x82/x39/xfe/x39 HANGUL SYLLABLE RAEP
-+<UB7B3>     /x83/x30/x81/x30 HANGUL SYLLABLE RAEH
-+<UB7B4>     /x83/x30/x81/x31 HANGUL SYLLABLE RYA
-+<UB7B5>     /x83/x30/x81/x32 HANGUL SYLLABLE RYAG
-+<UB7B6>     /x83/x30/x81/x33 HANGUL SYLLABLE RYAGG
-+<UB7B7>     /x83/x30/x81/x34 HANGUL SYLLABLE RYAGS
-+<UB7B8>     /x83/x30/x81/x35 HANGUL SYLLABLE RYAN
-+<UB7B9>     /x83/x30/x81/x36 HANGUL SYLLABLE RYANI
-+<UB7BA>     /x83/x30/x81/x37 HANGUL SYLLABLE RYANH
-+<UB7BB>     /x83/x30/x81/x38 HANGUL SYLLABLE RYAD
-+<UB7BC>     /x83/x30/x81/x39 HANGUL SYLLABLE RYAL
-+<UB7BD>     /x83/x30/x82/x30 HANGUL SYLLABLE RYALG
-+<UB7BE>     /x83/x30/x82/x31 HANGUL SYLLABLE RYALM
-+<UB7BF>     /x83/x30/x82/x32 HANGUL SYLLABLE RYALB
-+<UB7C0>     /x83/x30/x82/x33 HANGUL SYLLABLE RYALS
-+<UB7C1>     /x83/x30/x82/x34 HANGUL SYLLABLE RYALT
-+<UB7C2>     /x83/x30/x82/x35 HANGUL SYLLABLE RYALP
-+<UB7C3>     /x83/x30/x82/x36 HANGUL SYLLABLE RYALH
-+<UB7C4>     /x83/x30/x82/x37 HANGUL SYLLABLE RYAM
-+<UB7C5>     /x83/x30/x82/x38 HANGUL SYLLABLE RYAB
-+<UB7C6>     /x83/x30/x82/x39 HANGUL SYLLABLE RYABS
-+<UB7C7>     /x83/x30/x83/x30 HANGUL SYLLABLE RYAS
-+<UB7C8>     /x83/x30/x83/x31 HANGUL SYLLABLE RYASS
-+<UB7C9>     /x83/x30/x83/x32 HANGUL SYLLABLE RYANG
-+<UB7CA>     /x83/x30/x83/x33 HANGUL SYLLABLE RYAJ
-+<UB7CB>     /x83/x30/x83/x34 HANGUL SYLLABLE RYAC
-+<UB7CC>     /x83/x30/x83/x35 HANGUL SYLLABLE RYAK
-+<UB7CD>     /x83/x30/x83/x36 HANGUL SYLLABLE RYAT
-+<UB7CE>     /x83/x30/x83/x37 HANGUL SYLLABLE RYAP
-+<UB7CF>     /x83/x30/x83/x38 HANGUL SYLLABLE RYAH
-+<UB7D0>     /x83/x30/x83/x39 HANGUL SYLLABLE RYAE
-+<UB7D1>     /x83/x30/x84/x30 HANGUL SYLLABLE RYAEG
-+<UB7D2>     /x83/x30/x84/x31 HANGUL SYLLABLE RYAEGG
-+<UB7D3>     /x83/x30/x84/x32 HANGUL SYLLABLE RYAEGS
-+<UB7D4>     /x83/x30/x84/x33 HANGUL SYLLABLE RYAEN
-+<UB7D5>     /x83/x30/x84/x34 HANGUL SYLLABLE RYAENI
-+<UB7D6>     /x83/x30/x84/x35 HANGUL SYLLABLE RYAENH
-+<UB7D7>     /x83/x30/x84/x36 HANGUL SYLLABLE RYAED
-+<UB7D8>     /x83/x30/x84/x37 HANGUL SYLLABLE RYAEL
-+<UB7D9>     /x83/x30/x84/x38 HANGUL SYLLABLE RYAELG
-+<UB7DA>     /x83/x30/x84/x39 HANGUL SYLLABLE RYAELM
-+<UB7DB>     /x83/x30/x85/x30 HANGUL SYLLABLE RYAELB
-+<UB7DC>     /x83/x30/x85/x31 HANGUL SYLLABLE RYAELS
-+<UB7DD>     /x83/x30/x85/x32 HANGUL SYLLABLE RYAELT
-+<UB7DE>     /x83/x30/x85/x33 HANGUL SYLLABLE RYAELP
-+<UB7DF>     /x83/x30/x85/x34 HANGUL SYLLABLE RYAELH
-+<UB7E0>     /x83/x30/x85/x35 HANGUL SYLLABLE RYAEM
-+<UB7E1>     /x83/x30/x85/x36 HANGUL SYLLABLE RYAEB
-+<UB7E2>     /x83/x30/x85/x37 HANGUL SYLLABLE RYAEBS
-+<UB7E3>     /x83/x30/x85/x38 HANGUL SYLLABLE RYAES
-+<UB7E4>     /x83/x30/x85/x39 HANGUL SYLLABLE RYAESS
-+<UB7E5>     /x83/x30/x86/x30 HANGUL SYLLABLE RYAENG
-+<UB7E6>     /x83/x30/x86/x31 HANGUL SYLLABLE RYAEJ
-+<UB7E7>     /x83/x30/x86/x32 HANGUL SYLLABLE RYAEC
-+<UB7E8>     /x83/x30/x86/x33 HANGUL SYLLABLE RYAEK
-+<UB7E9>     /x83/x30/x86/x34 HANGUL SYLLABLE RYAET
-+<UB7EA>     /x83/x30/x86/x35 HANGUL SYLLABLE RYAEP
-+<UB7EB>     /x83/x30/x86/x36 HANGUL SYLLABLE RYAEH
-+<UB7EC>     /x83/x30/x86/x37 HANGUL SYLLABLE REO
-+<UB7ED>     /x83/x30/x86/x38 HANGUL SYLLABLE REOG
-+<UB7EE>     /x83/x30/x86/x39 HANGUL SYLLABLE REOGG
-+<UB7EF>     /x83/x30/x87/x30 HANGUL SYLLABLE REOGS
-+<UB7F0>     /x83/x30/x87/x31 HANGUL SYLLABLE REON
-+<UB7F1>     /x83/x30/x87/x32 HANGUL SYLLABLE REONI
-+<UB7F2>     /x83/x30/x87/x33 HANGUL SYLLABLE REONH
-+<UB7F3>     /x83/x30/x87/x34 HANGUL SYLLABLE REOD
-+<UB7F4>     /x83/x30/x87/x35 HANGUL SYLLABLE REOL
-+<UB7F5>     /x83/x30/x87/x36 HANGUL SYLLABLE REOLG
-+<UB7F6>     /x83/x30/x87/x37 HANGUL SYLLABLE REOLM
-+<UB7F7>     /x83/x30/x87/x38 HANGUL SYLLABLE REOLB
-+<UB7F8>     /x83/x30/x87/x39 HANGUL SYLLABLE REOLS
-+<UB7F9>     /x83/x30/x88/x30 HANGUL SYLLABLE REOLT
-+<UB7FA>     /x83/x30/x88/x31 HANGUL SYLLABLE REOLP
-+<UB7FB>     /x83/x30/x88/x32 HANGUL SYLLABLE REOLH
-+<UB7FC>     /x83/x30/x88/x33 HANGUL SYLLABLE REOM
-+<UB7FD>     /x83/x30/x88/x34 HANGUL SYLLABLE REOB
-+<UB7FE>     /x83/x30/x88/x35 HANGUL SYLLABLE REOBS
-+<UB7FF>     /x83/x30/x88/x36 HANGUL SYLLABLE REOS
-+<UB800>     /x83/x30/x88/x37 HANGUL SYLLABLE REOSS
-+<UB801>     /x83/x30/x88/x38 HANGUL SYLLABLE REONG
-+<UB802>     /x83/x30/x88/x39 HANGUL SYLLABLE REOJ
-+<UB803>     /x83/x30/x89/x30 HANGUL SYLLABLE REOC
-+<UB804>     /x83/x30/x89/x31 HANGUL SYLLABLE REOK
-+<UB805>     /x83/x30/x89/x32 HANGUL SYLLABLE REOT
-+<UB806>     /x83/x30/x89/x33 HANGUL SYLLABLE REOP
-+<UB807>     /x83/x30/x89/x34 HANGUL SYLLABLE REOH
-+<UB808>     /x83/x30/x89/x35 HANGUL SYLLABLE RE
-+<UB809>     /x83/x30/x89/x36 HANGUL SYLLABLE REG
-+<UB80A>     /x83/x30/x89/x37 HANGUL SYLLABLE REGG
-+<UB80B>     /x83/x30/x89/x38 HANGUL SYLLABLE REGS
-+<UB80C>     /x83/x30/x89/x39 HANGUL SYLLABLE REN
-+<UB80D>     /x83/x30/x8a/x30 HANGUL SYLLABLE RENI
-+<UB80E>     /x83/x30/x8a/x31 HANGUL SYLLABLE RENH
-+<UB80F>     /x83/x30/x8a/x32 HANGUL SYLLABLE RED
-+<UB810>     /x83/x30/x8a/x33 HANGUL SYLLABLE REL
-+<UB811>     /x83/x30/x8a/x34 HANGUL SYLLABLE RELG
-+<UB812>     /x83/x30/x8a/x35 HANGUL SYLLABLE RELM
-+<UB813>     /x83/x30/x8a/x36 HANGUL SYLLABLE RELB
-+<UB814>     /x83/x30/x8a/x37 HANGUL SYLLABLE RELS
-+<UB815>     /x83/x30/x8a/x38 HANGUL SYLLABLE RELT
-+<UB816>     /x83/x30/x8a/x39 HANGUL SYLLABLE RELP
-+<UB817>     /x83/x30/x8b/x30 HANGUL SYLLABLE RELH
-+<UB818>     /x83/x30/x8b/x31 HANGUL SYLLABLE REM
-+<UB819>     /x83/x30/x8b/x32 HANGUL SYLLABLE REB
-+<UB81A>     /x83/x30/x8b/x33 HANGUL SYLLABLE REBS
-+<UB81B>     /x83/x30/x8b/x34 HANGUL SYLLABLE RES
-+<UB81C>     /x83/x30/x8b/x35 HANGUL SYLLABLE RESS
-+<UB81D>     /x83/x30/x8b/x36 HANGUL SYLLABLE RENG
-+<UB81E>     /x83/x30/x8b/x37 HANGUL SYLLABLE REJ
-+<UB81F>     /x83/x30/x8b/x38 HANGUL SYLLABLE REC
-+<UB820>     /x83/x30/x8b/x39 HANGUL SYLLABLE REK
-+<UB821>     /x83/x30/x8c/x30 HANGUL SYLLABLE RET
-+<UB822>     /x83/x30/x8c/x31 HANGUL SYLLABLE REP
-+<UB823>     /x83/x30/x8c/x32 HANGUL SYLLABLE REH
-+<UB824>     /x83/x30/x8c/x33 HANGUL SYLLABLE RYEO
-+<UB825>     /x83/x30/x8c/x34 HANGUL SYLLABLE RYEOG
-+<UB826>     /x83/x30/x8c/x35 HANGUL SYLLABLE RYEOGG
-+<UB827>     /x83/x30/x8c/x36 HANGUL SYLLABLE RYEOGS
-+<UB828>     /x83/x30/x8c/x37 HANGUL SYLLABLE RYEON
-+<UB829>     /x83/x30/x8c/x38 HANGUL SYLLABLE RYEONI
-+<UB82A>     /x83/x30/x8c/x39 HANGUL SYLLABLE RYEONH
-+<UB82B>     /x83/x30/x8d/x30 HANGUL SYLLABLE RYEOD
-+<UB82C>     /x83/x30/x8d/x31 HANGUL SYLLABLE RYEOL
-+<UB82D>     /x83/x30/x8d/x32 HANGUL SYLLABLE RYEOLG
-+<UB82E>     /x83/x30/x8d/x33 HANGUL SYLLABLE RYEOLM
-+<UB82F>     /x83/x30/x8d/x34 HANGUL SYLLABLE RYEOLB
-+<UB830>     /x83/x30/x8d/x35 HANGUL SYLLABLE RYEOLS
-+<UB831>     /x83/x30/x8d/x36 HANGUL SYLLABLE RYEOLT
-+<UB832>     /x83/x30/x8d/x37 HANGUL SYLLABLE RYEOLP
-+<UB833>     /x83/x30/x8d/x38 HANGUL SYLLABLE RYEOLH
-+<UB834>     /x83/x30/x8d/x39 HANGUL SYLLABLE RYEOM
-+<UB835>     /x83/x30/x8e/x30 HANGUL SYLLABLE RYEOB
-+<UB836>     /x83/x30/x8e/x31 HANGUL SYLLABLE RYEOBS
-+<UB837>     /x83/x30/x8e/x32 HANGUL SYLLABLE RYEOS
-+<UB838>     /x83/x30/x8e/x33 HANGUL SYLLABLE RYEOSS
-+<UB839>     /x83/x30/x8e/x34 HANGUL SYLLABLE RYEONG
-+<UB83A>     /x83/x30/x8e/x35 HANGUL SYLLABLE RYEOJ
-+<UB83B>     /x83/x30/x8e/x36 HANGUL SYLLABLE RYEOC
-+<UB83C>     /x83/x30/x8e/x37 HANGUL SYLLABLE RYEOK
-+<UB83D>     /x83/x30/x8e/x38 HANGUL SYLLABLE RYEOT
-+<UB83E>     /x83/x30/x8e/x39 HANGUL SYLLABLE RYEOP
-+<UB83F>     /x83/x30/x8f/x30 HANGUL SYLLABLE RYEOH
-+<UB840>     /x83/x30/x8f/x31 HANGUL SYLLABLE RYE
-+<UB841>     /x83/x30/x8f/x32 HANGUL SYLLABLE RYEG
-+<UB842>     /x83/x30/x8f/x33 HANGUL SYLLABLE RYEGG
-+<UB843>     /x83/x30/x8f/x34 HANGUL SYLLABLE RYEGS
-+<UB844>     /x83/x30/x8f/x35 HANGUL SYLLABLE RYEN
-+<UB845>     /x83/x30/x8f/x36 HANGUL SYLLABLE RYENI
-+<UB846>     /x83/x30/x8f/x37 HANGUL SYLLABLE RYENH
-+<UB847>     /x83/x30/x8f/x38 HANGUL SYLLABLE RYED
-+<UB848>     /x83/x30/x8f/x39 HANGUL SYLLABLE RYEL
-+<UB849>     /x83/x30/x90/x30 HANGUL SYLLABLE RYELG
-+<UB84A>     /x83/x30/x90/x31 HANGUL SYLLABLE RYELM
-+<UB84B>     /x83/x30/x90/x32 HANGUL SYLLABLE RYELB
-+<UB84C>     /x83/x30/x90/x33 HANGUL SYLLABLE RYELS
-+<UB84D>     /x83/x30/x90/x34 HANGUL SYLLABLE RYELT
-+<UB84E>     /x83/x30/x90/x35 HANGUL SYLLABLE RYELP
-+<UB84F>     /x83/x30/x90/x36 HANGUL SYLLABLE RYELH
-+<UB850>     /x83/x30/x90/x37 HANGUL SYLLABLE RYEM
-+<UB851>     /x83/x30/x90/x38 HANGUL SYLLABLE RYEB
-+<UB852>     /x83/x30/x90/x39 HANGUL SYLLABLE RYEBS
-+<UB853>     /x83/x30/x91/x30 HANGUL SYLLABLE RYES
-+<UB854>     /x83/x30/x91/x31 HANGUL SYLLABLE RYESS
-+<UB855>     /x83/x30/x91/x32 HANGUL SYLLABLE RYENG
-+<UB856>     /x83/x30/x91/x33 HANGUL SYLLABLE RYEJ
-+<UB857>     /x83/x30/x91/x34 HANGUL SYLLABLE RYEC
-+<UB858>     /x83/x30/x91/x35 HANGUL SYLLABLE RYEK
-+<UB859>     /x83/x30/x91/x36 HANGUL SYLLABLE RYET
-+<UB85A>     /x83/x30/x91/x37 HANGUL SYLLABLE RYEP
-+<UB85B>     /x83/x30/x91/x38 HANGUL SYLLABLE RYEH
-+<UB85C>     /x83/x30/x91/x39 HANGUL SYLLABLE RO
-+<UB85D>     /x83/x30/x92/x30 HANGUL SYLLABLE ROG
-+<UB85E>     /x83/x30/x92/x31 HANGUL SYLLABLE ROGG
-+<UB85F>     /x83/x30/x92/x32 HANGUL SYLLABLE ROGS
-+<UB860>     /x83/x30/x92/x33 HANGUL SYLLABLE RON
-+<UB861>     /x83/x30/x92/x34 HANGUL SYLLABLE RONI
-+<UB862>     /x83/x30/x92/x35 HANGUL SYLLABLE RONH
-+<UB863>     /x83/x30/x92/x36 HANGUL SYLLABLE ROD
-+<UB864>     /x83/x30/x92/x37 HANGUL SYLLABLE ROL
-+<UB865>     /x83/x30/x92/x38 HANGUL SYLLABLE ROLG
-+<UB866>     /x83/x30/x92/x39 HANGUL SYLLABLE ROLM
-+<UB867>     /x83/x30/x93/x30 HANGUL SYLLABLE ROLB
-+<UB868>     /x83/x30/x93/x31 HANGUL SYLLABLE ROLS
-+<UB869>     /x83/x30/x93/x32 HANGUL SYLLABLE ROLT
-+<UB86A>     /x83/x30/x93/x33 HANGUL SYLLABLE ROLP
-+<UB86B>     /x83/x30/x93/x34 HANGUL SYLLABLE ROLH
-+<UB86C>     /x83/x30/x93/x35 HANGUL SYLLABLE ROM
-+<UB86D>     /x83/x30/x93/x36 HANGUL SYLLABLE ROB
-+<UB86E>     /x83/x30/x93/x37 HANGUL SYLLABLE ROBS
-+<UB86F>     /x83/x30/x93/x38 HANGUL SYLLABLE ROS
-+<UB870>     /x83/x30/x93/x39 HANGUL SYLLABLE ROSS
-+<UB871>     /x83/x30/x94/x30 HANGUL SYLLABLE RONG
-+<UB872>     /x83/x30/x94/x31 HANGUL SYLLABLE ROJ
-+<UB873>     /x83/x30/x94/x32 HANGUL SYLLABLE ROC
-+<UB874>     /x83/x30/x94/x33 HANGUL SYLLABLE ROK
-+<UB875>     /x83/x30/x94/x34 HANGUL SYLLABLE ROT
-+<UB876>     /x83/x30/x94/x35 HANGUL SYLLABLE ROP
-+<UB877>     /x83/x30/x94/x36 HANGUL SYLLABLE ROH
-+<UB878>     /x83/x30/x94/x37 HANGUL SYLLABLE RWA
-+<UB879>     /x83/x30/x94/x38 HANGUL SYLLABLE RWAG
-+<UB87A>     /x83/x30/x94/x39 HANGUL SYLLABLE RWAGG
-+<UB87B>     /x83/x30/x95/x30 HANGUL SYLLABLE RWAGS
-+<UB87C>     /x83/x30/x95/x31 HANGUL SYLLABLE RWAN
-+<UB87D>     /x83/x30/x95/x32 HANGUL SYLLABLE RWANI
-+<UB87E>     /x83/x30/x95/x33 HANGUL SYLLABLE RWANH
-+<UB87F>     /x83/x30/x95/x34 HANGUL SYLLABLE RWAD
-+<UB880>     /x83/x30/x95/x35 HANGUL SYLLABLE RWAL
-+<UB881>     /x83/x30/x95/x36 HANGUL SYLLABLE RWALG
-+<UB882>     /x83/x30/x95/x37 HANGUL SYLLABLE RWALM
-+<UB883>     /x83/x30/x95/x38 HANGUL SYLLABLE RWALB
-+<UB884>     /x83/x30/x95/x39 HANGUL SYLLABLE RWALS
-+<UB885>     /x83/x30/x96/x30 HANGUL SYLLABLE RWALT
-+<UB886>     /x83/x30/x96/x31 HANGUL SYLLABLE RWALP
-+<UB887>     /x83/x30/x96/x32 HANGUL SYLLABLE RWALH
-+<UB888>     /x83/x30/x96/x33 HANGUL SYLLABLE RWAM
-+<UB889>     /x83/x30/x96/x34 HANGUL SYLLABLE RWAB
-+<UB88A>     /x83/x30/x96/x35 HANGUL SYLLABLE RWABS
-+<UB88B>     /x83/x30/x96/x36 HANGUL SYLLABLE RWAS
-+<UB88C>     /x83/x30/x96/x37 HANGUL SYLLABLE RWASS
-+<UB88D>     /x83/x30/x96/x38 HANGUL SYLLABLE RWANG
-+<UB88E>     /x83/x30/x96/x39 HANGUL SYLLABLE RWAJ
-+<UB88F>     /x83/x30/x97/x30 HANGUL SYLLABLE RWAC
-+<UB890>     /x83/x30/x97/x31 HANGUL SYLLABLE RWAK
-+<UB891>     /x83/x30/x97/x32 HANGUL SYLLABLE RWAT
-+<UB892>     /x83/x30/x97/x33 HANGUL SYLLABLE RWAP
-+<UB893>     /x83/x30/x97/x34 HANGUL SYLLABLE RWAH
-+<UB894>     /x83/x30/x97/x35 HANGUL SYLLABLE RWAE
-+<UB895>     /x83/x30/x97/x36 HANGUL SYLLABLE RWAEG
-+<UB896>     /x83/x30/x97/x37 HANGUL SYLLABLE RWAEGG
-+<UB897>     /x83/x30/x97/x38 HANGUL SYLLABLE RWAEGS
-+<UB898>     /x83/x30/x97/x39 HANGUL SYLLABLE RWAEN
-+<UB899>     /x83/x30/x98/x30 HANGUL SYLLABLE RWAENI
-+<UB89A>     /x83/x30/x98/x31 HANGUL SYLLABLE RWAENH
-+<UB89B>     /x83/x30/x98/x32 HANGUL SYLLABLE RWAED
-+<UB89C>     /x83/x30/x98/x33 HANGUL SYLLABLE RWAEL
-+<UB89D>     /x83/x30/x98/x34 HANGUL SYLLABLE RWAELG
-+<UB89E>     /x83/x30/x98/x35 HANGUL SYLLABLE RWAELM
-+<UB89F>     /x83/x30/x98/x36 HANGUL SYLLABLE RWAELB
-+<UB8A0>     /x83/x30/x98/x37 HANGUL SYLLABLE RWAELS
-+<UB8A1>     /x83/x30/x98/x38 HANGUL SYLLABLE RWAELT
-+<UB8A2>     /x83/x30/x98/x39 HANGUL SYLLABLE RWAELP
-+<UB8A3>     /x83/x30/x99/x30 HANGUL SYLLABLE RWAELH
-+<UB8A4>     /x83/x30/x99/x31 HANGUL SYLLABLE RWAEM
-+<UB8A5>     /x83/x30/x99/x32 HANGUL SYLLABLE RWAEB
-+<UB8A6>     /x83/x30/x99/x33 HANGUL SYLLABLE RWAEBS
-+<UB8A7>     /x83/x30/x99/x34 HANGUL SYLLABLE RWAES
-+<UB8A8>     /x83/x30/x99/x35 HANGUL SYLLABLE RWAESS
-+<UB8A9>     /x83/x30/x99/x36 HANGUL SYLLABLE RWAENG
-+<UB8AA>     /x83/x30/x99/x37 HANGUL SYLLABLE RWAEJ
-+<UB8AB>     /x83/x30/x99/x38 HANGUL SYLLABLE RWAEC
-+<UB8AC>     /x83/x30/x99/x39 HANGUL SYLLABLE RWAEK
-+<UB8AD>     /x83/x30/x9a/x30 HANGUL SYLLABLE RWAET
-+<UB8AE>     /x83/x30/x9a/x31 HANGUL SYLLABLE RWAEP
-+<UB8AF>     /x83/x30/x9a/x32 HANGUL SYLLABLE RWAEH
-+<UB8B0>     /x83/x30/x9a/x33 HANGUL SYLLABLE ROE
-+<UB8B1>     /x83/x30/x9a/x34 HANGUL SYLLABLE ROEG
-+<UB8B2>     /x83/x30/x9a/x35 HANGUL SYLLABLE ROEGG
-+<UB8B3>     /x83/x30/x9a/x36 HANGUL SYLLABLE ROEGS
-+<UB8B4>     /x83/x30/x9a/x37 HANGUL SYLLABLE ROEN
-+<UB8B5>     /x83/x30/x9a/x38 HANGUL SYLLABLE ROENI
-+<UB8B6>     /x83/x30/x9a/x39 HANGUL SYLLABLE ROENH
-+<UB8B7>     /x83/x30/x9b/x30 HANGUL SYLLABLE ROED
-+<UB8B8>     /x83/x30/x9b/x31 HANGUL SYLLABLE ROEL
-+<UB8B9>     /x83/x30/x9b/x32 HANGUL SYLLABLE ROELG
-+<UB8BA>     /x83/x30/x9b/x33 HANGUL SYLLABLE ROELM
-+<UB8BB>     /x83/x30/x9b/x34 HANGUL SYLLABLE ROELB
-+<UB8BC>     /x83/x30/x9b/x35 HANGUL SYLLABLE ROELS
-+<UB8BD>     /x83/x30/x9b/x36 HANGUL SYLLABLE ROELT
-+<UB8BE>     /x83/x30/x9b/x37 HANGUL SYLLABLE ROELP
-+<UB8BF>     /x83/x30/x9b/x38 HANGUL SYLLABLE ROELH
-+<UB8C0>     /x83/x30/x9b/x39 HANGUL SYLLABLE ROEM
-+<UB8C1>     /x83/x30/x9c/x30 HANGUL SYLLABLE ROEB
-+<UB8C2>     /x83/x30/x9c/x31 HANGUL SYLLABLE ROEBS
-+<UB8C3>     /x83/x30/x9c/x32 HANGUL SYLLABLE ROES
-+<UB8C4>     /x83/x30/x9c/x33 HANGUL SYLLABLE ROESS
-+<UB8C5>     /x83/x30/x9c/x34 HANGUL SYLLABLE ROENG
-+<UB8C6>     /x83/x30/x9c/x35 HANGUL SYLLABLE ROEJ
-+<UB8C7>     /x83/x30/x9c/x36 HANGUL SYLLABLE ROEC
-+<UB8C8>     /x83/x30/x9c/x37 HANGUL SYLLABLE ROEK
-+<UB8C9>     /x83/x30/x9c/x38 HANGUL SYLLABLE ROET
-+<UB8CA>     /x83/x30/x9c/x39 HANGUL SYLLABLE ROEP
-+<UB8CB>     /x83/x30/x9d/x30 HANGUL SYLLABLE ROEH
-+<UB8CC>     /x83/x30/x9d/x31 HANGUL SYLLABLE RYO
-+<UB8CD>     /x83/x30/x9d/x32 HANGUL SYLLABLE RYOG
-+<UB8CE>     /x83/x30/x9d/x33 HANGUL SYLLABLE RYOGG
-+<UB8CF>     /x83/x30/x9d/x34 HANGUL SYLLABLE RYOGS
-+<UB8D0>     /x83/x30/x9d/x35 HANGUL SYLLABLE RYON
-+<UB8D1>     /x83/x30/x9d/x36 HANGUL SYLLABLE RYONI
-+<UB8D2>     /x83/x30/x9d/x37 HANGUL SYLLABLE RYONH
-+<UB8D3>     /x83/x30/x9d/x38 HANGUL SYLLABLE RYOD
-+<UB8D4>     /x83/x30/x9d/x39 HANGUL SYLLABLE RYOL
-+<UB8D5>     /x83/x30/x9e/x30 HANGUL SYLLABLE RYOLG
-+<UB8D6>     /x83/x30/x9e/x31 HANGUL SYLLABLE RYOLM
-+<UB8D7>     /x83/x30/x9e/x32 HANGUL SYLLABLE RYOLB
-+<UB8D8>     /x83/x30/x9e/x33 HANGUL SYLLABLE RYOLS
-+<UB8D9>     /x83/x30/x9e/x34 HANGUL SYLLABLE RYOLT
-+<UB8DA>     /x83/x30/x9e/x35 HANGUL SYLLABLE RYOLP
-+<UB8DB>     /x83/x30/x9e/x36 HANGUL SYLLABLE RYOLH
-+<UB8DC>     /x83/x30/x9e/x37 HANGUL SYLLABLE RYOM
-+<UB8DD>     /x83/x30/x9e/x38 HANGUL SYLLABLE RYOB
-+<UB8DE>     /x83/x30/x9e/x39 HANGUL SYLLABLE RYOBS
-+<UB8DF>     /x83/x30/x9f/x30 HANGUL SYLLABLE RYOS
-+<UB8E0>     /x83/x30/x9f/x31 HANGUL SYLLABLE RYOSS
-+<UB8E1>     /x83/x30/x9f/x32 HANGUL SYLLABLE RYONG
-+<UB8E2>     /x83/x30/x9f/x33 HANGUL SYLLABLE RYOJ
-+<UB8E3>     /x83/x30/x9f/x34 HANGUL SYLLABLE RYOC
-+<UB8E4>     /x83/x30/x9f/x35 HANGUL SYLLABLE RYOK
-+<UB8E5>     /x83/x30/x9f/x36 HANGUL SYLLABLE RYOT
-+<UB8E6>     /x83/x30/x9f/x37 HANGUL SYLLABLE RYOP
-+<UB8E7>     /x83/x30/x9f/x38 HANGUL SYLLABLE RYOH
-+<UB8E8>     /x83/x30/x9f/x39 HANGUL SYLLABLE RU
-+<UB8E9>     /x83/x30/xa0/x30 HANGUL SYLLABLE RUG
-+<UB8EA>     /x83/x30/xa0/x31 HANGUL SYLLABLE RUGG
-+<UB8EB>     /x83/x30/xa0/x32 HANGUL SYLLABLE RUGS
-+<UB8EC>     /x83/x30/xa0/x33 HANGUL SYLLABLE RUN
-+<UB8ED>     /x83/x30/xa0/x34 HANGUL SYLLABLE RUNI
-+<UB8EE>     /x83/x30/xa0/x35 HANGUL SYLLABLE RUNH
-+<UB8EF>     /x83/x30/xa0/x36 HANGUL SYLLABLE RUD
-+<UB8F0>     /x83/x30/xa0/x37 HANGUL SYLLABLE RUL
-+<UB8F1>     /x83/x30/xa0/x38 HANGUL SYLLABLE RULG
-+<UB8F2>     /x83/x30/xa0/x39 HANGUL SYLLABLE RULM
-+<UB8F3>     /x83/x30/xa1/x30 HANGUL SYLLABLE RULB
-+<UB8F4>     /x83/x30/xa1/x31 HANGUL SYLLABLE RULS
-+<UB8F5>     /x83/x30/xa1/x32 HANGUL SYLLABLE RULT
-+<UB8F6>     /x83/x30/xa1/x33 HANGUL SYLLABLE RULP
-+<UB8F7>     /x83/x30/xa1/x34 HANGUL SYLLABLE RULH
-+<UB8F8>     /x83/x30/xa1/x35 HANGUL SYLLABLE RUM
-+<UB8F9>     /x83/x30/xa1/x36 HANGUL SYLLABLE RUB
-+<UB8FA>     /x83/x30/xa1/x37 HANGUL SYLLABLE RUBS
-+<UB8FB>     /x83/x30/xa1/x38 HANGUL SYLLABLE RUS
-+<UB8FC>     /x83/x30/xa1/x39 HANGUL SYLLABLE RUSS
-+<UB8FD>     /x83/x30/xa2/x30 HANGUL SYLLABLE RUNG
-+<UB8FE>     /x83/x30/xa2/x31 HANGUL SYLLABLE RUJ
-+<UB8FF>     /x83/x30/xa2/x32 HANGUL SYLLABLE RUC
-+<UB900>     /x83/x30/xa2/x33 HANGUL SYLLABLE RUK
-+<UB901>     /x83/x30/xa2/x34 HANGUL SYLLABLE RUT
-+<UB902>     /x83/x30/xa2/x35 HANGUL SYLLABLE RUP
-+<UB903>     /x83/x30/xa2/x36 HANGUL SYLLABLE RUH
-+<UB904>     /x83/x30/xa2/x37 HANGUL SYLLABLE RWEO
-+<UB905>     /x83/x30/xa2/x38 HANGUL SYLLABLE RWEOG
-+<UB906>     /x83/x30/xa2/x39 HANGUL SYLLABLE RWEOGG
-+<UB907>     /x83/x30/xa3/x30 HANGUL SYLLABLE RWEOGS
-+<UB908>     /x83/x30/xa3/x31 HANGUL SYLLABLE RWEON
-+<UB909>     /x83/x30/xa3/x32 HANGUL SYLLABLE RWEONI
-+<UB90A>     /x83/x30/xa3/x33 HANGUL SYLLABLE RWEONH
-+<UB90B>     /x83/x30/xa3/x34 HANGUL SYLLABLE RWEOD
-+<UB90C>     /x83/x30/xa3/x35 HANGUL SYLLABLE RWEOL
-+<UB90D>     /x83/x30/xa3/x36 HANGUL SYLLABLE RWEOLG
-+<UB90E>     /x83/x30/xa3/x37 HANGUL SYLLABLE RWEOLM
-+<UB90F>     /x83/x30/xa3/x38 HANGUL SYLLABLE RWEOLB
-+<UB910>     /x83/x30/xa3/x39 HANGUL SYLLABLE RWEOLS
-+<UB911>     /x83/x30/xa4/x30 HANGUL SYLLABLE RWEOLT
-+<UB912>     /x83/x30/xa4/x31 HANGUL SYLLABLE RWEOLP
-+<UB913>     /x83/x30/xa4/x32 HANGUL SYLLABLE RWEOLH
-+<UB914>     /x83/x30/xa4/x33 HANGUL SYLLABLE RWEOM
-+<UB915>     /x83/x30/xa4/x34 HANGUL SYLLABLE RWEOB
-+<UB916>     /x83/x30/xa4/x35 HANGUL SYLLABLE RWEOBS
-+<UB917>     /x83/x30/xa4/x36 HANGUL SYLLABLE RWEOS
-+<UB918>     /x83/x30/xa4/x37 HANGUL SYLLABLE RWEOSS
-+<UB919>     /x83/x30/xa4/x38 HANGUL SYLLABLE RWEONG
-+<UB91A>     /x83/x30/xa4/x39 HANGUL SYLLABLE RWEOJ
-+<UB91B>     /x83/x30/xa5/x30 HANGUL SYLLABLE RWEOC
-+<UB91C>     /x83/x30/xa5/x31 HANGUL SYLLABLE RWEOK
-+<UB91D>     /x83/x30/xa5/x32 HANGUL SYLLABLE RWEOT
-+<UB91E>     /x83/x30/xa5/x33 HANGUL SYLLABLE RWEOP
-+<UB91F>     /x83/x30/xa5/x34 HANGUL SYLLABLE RWEOH
-+<UB920>     /x83/x30/xa5/x35 HANGUL SYLLABLE RWE
-+<UB921>     /x83/x30/xa5/x36 HANGUL SYLLABLE RWEG
-+<UB922>     /x83/x30/xa5/x37 HANGUL SYLLABLE RWEGG
-+<UB923>     /x83/x30/xa5/x38 HANGUL SYLLABLE RWEGS
-+<UB924>     /x83/x30/xa5/x39 HANGUL SYLLABLE RWEN
-+<UB925>     /x83/x30/xa6/x30 HANGUL SYLLABLE RWENI
-+<UB926>     /x83/x30/xa6/x31 HANGUL SYLLABLE RWENH
-+<UB927>     /x83/x30/xa6/x32 HANGUL SYLLABLE RWED
-+<UB928>     /x83/x30/xa6/x33 HANGUL SYLLABLE RWEL
-+<UB929>     /x83/x30/xa6/x34 HANGUL SYLLABLE RWELG
-+<UB92A>     /x83/x30/xa6/x35 HANGUL SYLLABLE RWELM
-+<UB92B>     /x83/x30/xa6/x36 HANGUL SYLLABLE RWELB
-+<UB92C>     /x83/x30/xa6/x37 HANGUL SYLLABLE RWELS
-+<UB92D>     /x83/x30/xa6/x38 HANGUL SYLLABLE RWELT
-+<UB92E>     /x83/x30/xa6/x39 HANGUL SYLLABLE RWELP
-+<UB92F>     /x83/x30/xa7/x30 HANGUL SYLLABLE RWELH
-+<UB930>     /x83/x30/xa7/x31 HANGUL SYLLABLE RWEM
-+<UB931>     /x83/x30/xa7/x32 HANGUL SYLLABLE RWEB
-+<UB932>     /x83/x30/xa7/x33 HANGUL SYLLABLE RWEBS
-+<UB933>     /x83/x30/xa7/x34 HANGUL SYLLABLE RWES
-+<UB934>     /x83/x30/xa7/x35 HANGUL SYLLABLE RWESS
-+<UB935>     /x83/x30/xa7/x36 HANGUL SYLLABLE RWENG
-+<UB936>     /x83/x30/xa7/x37 HANGUL SYLLABLE RWEJ
-+<UB937>     /x83/x30/xa7/x38 HANGUL SYLLABLE RWEC
-+<UB938>     /x83/x30/xa7/x39 HANGUL SYLLABLE RWEK
-+<UB939>     /x83/x30/xa8/x30 HANGUL SYLLABLE RWET
-+<UB93A>     /x83/x30/xa8/x31 HANGUL SYLLABLE RWEP
-+<UB93B>     /x83/x30/xa8/x32 HANGUL SYLLABLE RWEH
-+<UB93C>     /x83/x30/xa8/x33 HANGUL SYLLABLE RWI
-+<UB93D>     /x83/x30/xa8/x34 HANGUL SYLLABLE RWIG
-+<UB93E>     /x83/x30/xa8/x35 HANGUL SYLLABLE RWIGG
-+<UB93F>     /x83/x30/xa8/x36 HANGUL SYLLABLE RWIGS
-+<UB940>     /x83/x30/xa8/x37 HANGUL SYLLABLE RWIN
-+<UB941>     /x83/x30/xa8/x38 HANGUL SYLLABLE RWINI
-+<UB942>     /x83/x30/xa8/x39 HANGUL SYLLABLE RWINH
-+<UB943>     /x83/x30/xa9/x30 HANGUL SYLLABLE RWID
-+<UB944>     /x83/x30/xa9/x31 HANGUL SYLLABLE RWIL
-+<UB945>     /x83/x30/xa9/x32 HANGUL SYLLABLE RWILG
-+<UB946>     /x83/x30/xa9/x33 HANGUL SYLLABLE RWILM
-+<UB947>     /x83/x30/xa9/x34 HANGUL SYLLABLE RWILB
-+<UB948>     /x83/x30/xa9/x35 HANGUL SYLLABLE RWILS
-+<UB949>     /x83/x30/xa9/x36 HANGUL SYLLABLE RWILT
-+<UB94A>     /x83/x30/xa9/x37 HANGUL SYLLABLE RWILP
-+<UB94B>     /x83/x30/xa9/x38 HANGUL SYLLABLE RWILH
-+<UB94C>     /x83/x30/xa9/x39 HANGUL SYLLABLE RWIM
-+<UB94D>     /x83/x30/xaa/x30 HANGUL SYLLABLE RWIB
-+<UB94E>     /x83/x30/xaa/x31 HANGUL SYLLABLE RWIBS
-+<UB94F>     /x83/x30/xaa/x32 HANGUL SYLLABLE RWIS
-+<UB950>     /x83/x30/xaa/x33 HANGUL SYLLABLE RWISS
-+<UB951>     /x83/x30/xaa/x34 HANGUL SYLLABLE RWING
-+<UB952>     /x83/x30/xaa/x35 HANGUL SYLLABLE RWIJ
-+<UB953>     /x83/x30/xaa/x36 HANGUL SYLLABLE RWIC
-+<UB954>     /x83/x30/xaa/x37 HANGUL SYLLABLE RWIK
-+<UB955>     /x83/x30/xaa/x38 HANGUL SYLLABLE RWIT
-+<UB956>     /x83/x30/xaa/x39 HANGUL SYLLABLE RWIP
-+<UB957>     /x83/x30/xab/x30 HANGUL SYLLABLE RWIH
-+<UB958>     /x83/x30/xab/x31 HANGUL SYLLABLE RYU
-+<UB959>     /x83/x30/xab/x32 HANGUL SYLLABLE RYUG
-+<UB95A>     /x83/x30/xab/x33 HANGUL SYLLABLE RYUGG
-+<UB95B>     /x83/x30/xab/x34 HANGUL SYLLABLE RYUGS
-+<UB95C>     /x83/x30/xab/x35 HANGUL SYLLABLE RYUN
-+<UB95D>     /x83/x30/xab/x36 HANGUL SYLLABLE RYUNI
-+<UB95E>     /x83/x30/xab/x37 HANGUL SYLLABLE RYUNH
-+<UB95F>     /x83/x30/xab/x38 HANGUL SYLLABLE RYUD
-+<UB960>     /x83/x30/xab/x39 HANGUL SYLLABLE RYUL
-+<UB961>     /x83/x30/xac/x30 HANGUL SYLLABLE RYULG
-+<UB962>     /x83/x30/xac/x31 HANGUL SYLLABLE RYULM
-+<UB963>     /x83/x30/xac/x32 HANGUL SYLLABLE RYULB
-+<UB964>     /x83/x30/xac/x33 HANGUL SYLLABLE RYULS
-+<UB965>     /x83/x30/xac/x34 HANGUL SYLLABLE RYULT
-+<UB966>     /x83/x30/xac/x35 HANGUL SYLLABLE RYULP
-+<UB967>     /x83/x30/xac/x36 HANGUL SYLLABLE RYULH
-+<UB968>     /x83/x30/xac/x37 HANGUL SYLLABLE RYUM
-+<UB969>     /x83/x30/xac/x38 HANGUL SYLLABLE RYUB
-+<UB96A>     /x83/x30/xac/x39 HANGUL SYLLABLE RYUBS
-+<UB96B>     /x83/x30/xad/x30 HANGUL SYLLABLE RYUS
-+<UB96C>     /x83/x30/xad/x31 HANGUL SYLLABLE RYUSS
-+<UB96D>     /x83/x30/xad/x32 HANGUL SYLLABLE RYUNG
-+<UB96E>     /x83/x30/xad/x33 HANGUL SYLLABLE RYUJ
-+<UB96F>     /x83/x30/xad/x34 HANGUL SYLLABLE RYUC
-+<UB970>     /x83/x30/xad/x35 HANGUL SYLLABLE RYUK
-+<UB971>     /x83/x30/xad/x36 HANGUL SYLLABLE RYUT
-+<UB972>     /x83/x30/xad/x37 HANGUL SYLLABLE RYUP
-+<UB973>     /x83/x30/xad/x38 HANGUL SYLLABLE RYUH
-+<UB974>     /x83/x30/xad/x39 HANGUL SYLLABLE REU
-+<UB975>     /x83/x30/xae/x30 HANGUL SYLLABLE REUG
-+<UB976>     /x83/x30/xae/x31 HANGUL SYLLABLE REUGG
-+<UB977>     /x83/x30/xae/x32 HANGUL SYLLABLE REUGS
-+<UB978>     /x83/x30/xae/x33 HANGUL SYLLABLE REUN
-+<UB979>     /x83/x30/xae/x34 HANGUL SYLLABLE REUNI
-+<UB97A>     /x83/x30/xae/x35 HANGUL SYLLABLE REUNH
-+<UB97B>     /x83/x30/xae/x36 HANGUL SYLLABLE REUD
-+<UB97C>     /x83/x30/xae/x37 HANGUL SYLLABLE REUL
-+<UB97D>     /x83/x30/xae/x38 HANGUL SYLLABLE REULG
-+<UB97E>     /x83/x30/xae/x39 HANGUL SYLLABLE REULM
-+<UB97F>     /x83/x30/xaf/x30 HANGUL SYLLABLE REULB
-+<UB980>     /x83/x30/xaf/x31 HANGUL SYLLABLE REULS
-+<UB981>     /x83/x30/xaf/x32 HANGUL SYLLABLE REULT
-+<UB982>     /x83/x30/xaf/x33 HANGUL SYLLABLE REULP
-+<UB983>     /x83/x30/xaf/x34 HANGUL SYLLABLE REULH
-+<UB984>     /x83/x30/xaf/x35 HANGUL SYLLABLE REUM
-+<UB985>     /x83/x30/xaf/x36 HANGUL SYLLABLE REUB
-+<UB986>     /x83/x30/xaf/x37 HANGUL SYLLABLE REUBS
-+<UB987>     /x83/x30/xaf/x38 HANGUL SYLLABLE REUS
-+<UB988>     /x83/x30/xaf/x39 HANGUL SYLLABLE REUSS
-+<UB989>     /x83/x30/xb0/x30 HANGUL SYLLABLE REUNG
-+<UB98A>     /x83/x30/xb0/x31 HANGUL SYLLABLE REUJ
-+<UB98B>     /x83/x30/xb0/x32 HANGUL SYLLABLE REUC
-+<UB98C>     /x83/x30/xb0/x33 HANGUL SYLLABLE REUK
-+<UB98D>     /x83/x30/xb0/x34 HANGUL SYLLABLE REUT
-+<UB98E>     /x83/x30/xb0/x35 HANGUL SYLLABLE REUP
-+<UB98F>     /x83/x30/xb0/x36 HANGUL SYLLABLE REUH
-+<UB990>     /x83/x30/xb0/x37 HANGUL SYLLABLE RYI
-+<UB991>     /x83/x30/xb0/x38 HANGUL SYLLABLE RYIG
-+<UB992>     /x83/x30/xb0/x39 HANGUL SYLLABLE RYIGG
-+<UB993>     /x83/x30/xb1/x30 HANGUL SYLLABLE RYIGS
-+<UB994>     /x83/x30/xb1/x31 HANGUL SYLLABLE RYIN
-+<UB995>     /x83/x30/xb1/x32 HANGUL SYLLABLE RYINI
-+<UB996>     /x83/x30/xb1/x33 HANGUL SYLLABLE RYINH
-+<UB997>     /x83/x30/xb1/x34 HANGUL SYLLABLE RYID
-+<UB998>     /x83/x30/xb1/x35 HANGUL SYLLABLE RYIL
-+<UB999>     /x83/x30/xb1/x36 HANGUL SYLLABLE RYILG
-+<UB99A>     /x83/x30/xb1/x37 HANGUL SYLLABLE RYILM
-+<UB99B>     /x83/x30/xb1/x38 HANGUL SYLLABLE RYILB
-+<UB99C>     /x83/x30/xb1/x39 HANGUL SYLLABLE RYILS
-+<UB99D>     /x83/x30/xb2/x30 HANGUL SYLLABLE RYILT
-+<UB99E>     /x83/x30/xb2/x31 HANGUL SYLLABLE RYILP
-+<UB99F>     /x83/x30/xb2/x32 HANGUL SYLLABLE RYILH
-+<UB9A0>     /x83/x30/xb2/x33 HANGUL SYLLABLE RYIM
-+<UB9A1>     /x83/x30/xb2/x34 HANGUL SYLLABLE RYIB
-+<UB9A2>     /x83/x30/xb2/x35 HANGUL SYLLABLE RYIBS
-+<UB9A3>     /x83/x30/xb2/x36 HANGUL SYLLABLE RYIS
-+<UB9A4>     /x83/x30/xb2/x37 HANGUL SYLLABLE RYISS
-+<UB9A5>     /x83/x30/xb2/x38 HANGUL SYLLABLE RYING
-+<UB9A6>     /x83/x30/xb2/x39 HANGUL SYLLABLE RYIJ
-+<UB9A7>     /x83/x30/xb3/x30 HANGUL SYLLABLE RYIC
-+<UB9A8>     /x83/x30/xb3/x31 HANGUL SYLLABLE RYIK
-+<UB9A9>     /x83/x30/xb3/x32 HANGUL SYLLABLE RYIT
-+<UB9AA>     /x83/x30/xb3/x33 HANGUL SYLLABLE RYIP
-+<UB9AB>     /x83/x30/xb3/x34 HANGUL SYLLABLE RYIH
-+<UB9AC>     /x83/x30/xb3/x35 HANGUL SYLLABLE RI
-+<UB9AD>     /x83/x30/xb3/x36 HANGUL SYLLABLE RIG
-+<UB9AE>     /x83/x30/xb3/x37 HANGUL SYLLABLE RIGG
-+<UB9AF>     /x83/x30/xb3/x38 HANGUL SYLLABLE RIGS
-+<UB9B0>     /x83/x30/xb3/x39 HANGUL SYLLABLE RIN
-+<UB9B1>     /x83/x30/xb4/x30 HANGUL SYLLABLE RINI
-+<UB9B2>     /x83/x30/xb4/x31 HANGUL SYLLABLE RINH
-+<UB9B3>     /x83/x30/xb4/x32 HANGUL SYLLABLE RID
-+<UB9B4>     /x83/x30/xb4/x33 HANGUL SYLLABLE RIL
-+<UB9B5>     /x83/x30/xb4/x34 HANGUL SYLLABLE RILG
-+<UB9B6>     /x83/x30/xb4/x35 HANGUL SYLLABLE RILM
-+<UB9B7>     /x83/x30/xb4/x36 HANGUL SYLLABLE RILB
-+<UB9B8>     /x83/x30/xb4/x37 HANGUL SYLLABLE RILS
-+<UB9B9>     /x83/x30/xb4/x38 HANGUL SYLLABLE RILT
-+<UB9BA>     /x83/x30/xb4/x39 HANGUL SYLLABLE RILP
-+<UB9BB>     /x83/x30/xb5/x30 HANGUL SYLLABLE RILH
-+<UB9BC>     /x83/x30/xb5/x31 HANGUL SYLLABLE RIM
-+<UB9BD>     /x83/x30/xb5/x32 HANGUL SYLLABLE RIB
-+<UB9BE>     /x83/x30/xb5/x33 HANGUL SYLLABLE RIBS
-+<UB9BF>     /x83/x30/xb5/x34 HANGUL SYLLABLE RIS
-+<UB9C0>     /x83/x30/xb5/x35 HANGUL SYLLABLE RISS
-+<UB9C1>     /x83/x30/xb5/x36 HANGUL SYLLABLE RING
-+<UB9C2>     /x83/x30/xb5/x37 HANGUL SYLLABLE RIJ
-+<UB9C3>     /x83/x30/xb5/x38 HANGUL SYLLABLE RIC
-+<UB9C4>     /x83/x30/xb5/x39 HANGUL SYLLABLE RIK
-+<UB9C5>     /x83/x30/xb6/x30 HANGUL SYLLABLE RIT
-+<UB9C6>     /x83/x30/xb6/x31 HANGUL SYLLABLE RIP
-+<UB9C7>     /x83/x30/xb6/x32 HANGUL SYLLABLE RIH
-+<UB9C8>     /x83/x30/xb6/x33 HANGUL SYLLABLE MA
-+<UB9C9>     /x83/x30/xb6/x34 HANGUL SYLLABLE MAG
-+<UB9CA>     /x83/x30/xb6/x35 HANGUL SYLLABLE MAGG
-+<UB9CB>     /x83/x30/xb6/x36 HANGUL SYLLABLE MAGS
-+<UB9CC>     /x83/x30/xb6/x37 HANGUL SYLLABLE MAN
-+<UB9CD>     /x83/x30/xb6/x38 HANGUL SYLLABLE MANI
-+<UB9CE>     /x83/x30/xb6/x39 HANGUL SYLLABLE MANH
-+<UB9CF>     /x83/x30/xb7/x30 HANGUL SYLLABLE MAD
-+<UB9D0>     /x83/x30/xb7/x31 HANGUL SYLLABLE MAL
-+<UB9D1>     /x83/x30/xb7/x32 HANGUL SYLLABLE MALG
-+<UB9D2>     /x83/x30/xb7/x33 HANGUL SYLLABLE MALM
-+<UB9D3>     /x83/x30/xb7/x34 HANGUL SYLLABLE MALB
-+<UB9D4>     /x83/x30/xb7/x35 HANGUL SYLLABLE MALS
-+<UB9D5>     /x83/x30/xb7/x36 HANGUL SYLLABLE MALT
-+<UB9D6>     /x83/x30/xb7/x37 HANGUL SYLLABLE MALP
-+<UB9D7>     /x83/x30/xb7/x38 HANGUL SYLLABLE MALH
-+<UB9D8>     /x83/x30/xb7/x39 HANGUL SYLLABLE MAM
-+<UB9D9>     /x83/x30/xb8/x30 HANGUL SYLLABLE MAB
-+<UB9DA>     /x83/x30/xb8/x31 HANGUL SYLLABLE MABS
-+<UB9DB>     /x83/x30/xb8/x32 HANGUL SYLLABLE MAS
-+<UB9DC>     /x83/x30/xb8/x33 HANGUL SYLLABLE MASS
-+<UB9DD>     /x83/x30/xb8/x34 HANGUL SYLLABLE MANG
-+<UB9DE>     /x83/x30/xb8/x35 HANGUL SYLLABLE MAJ
-+<UB9DF>     /x83/x30/xb8/x36 HANGUL SYLLABLE MAC
-+<UB9E0>     /x83/x30/xb8/x37 HANGUL SYLLABLE MAK
-+<UB9E1>     /x83/x30/xb8/x38 HANGUL SYLLABLE MAT
-+<UB9E2>     /x83/x30/xb8/x39 HANGUL SYLLABLE MAP
-+<UB9E3>     /x83/x30/xb9/x30 HANGUL SYLLABLE MAH
-+<UB9E4>     /x83/x30/xb9/x31 HANGUL SYLLABLE MAE
-+<UB9E5>     /x83/x30/xb9/x32 HANGUL SYLLABLE MAEG
-+<UB9E6>     /x83/x30/xb9/x33 HANGUL SYLLABLE MAEGG
-+<UB9E7>     /x83/x30/xb9/x34 HANGUL SYLLABLE MAEGS
-+<UB9E8>     /x83/x30/xb9/x35 HANGUL SYLLABLE MAEN
-+<UB9E9>     /x83/x30/xb9/x36 HANGUL SYLLABLE MAENI
-+<UB9EA>     /x83/x30/xb9/x37 HANGUL SYLLABLE MAENH
-+<UB9EB>     /x83/x30/xb9/x38 HANGUL SYLLABLE MAED
-+<UB9EC>     /x83/x30/xb9/x39 HANGUL SYLLABLE MAEL
-+<UB9ED>     /x83/x30/xba/x30 HANGUL SYLLABLE MAELG
-+<UB9EE>     /x83/x30/xba/x31 HANGUL SYLLABLE MAELM
-+<UB9EF>     /x83/x30/xba/x32 HANGUL SYLLABLE MAELB
-+<UB9F0>     /x83/x30/xba/x33 HANGUL SYLLABLE MAELS
-+<UB9F1>     /x83/x30/xba/x34 HANGUL SYLLABLE MAELT
-+<UB9F2>     /x83/x30/xba/x35 HANGUL SYLLABLE MAELP
-+<UB9F3>     /x83/x30/xba/x36 HANGUL SYLLABLE MAELH
-+<UB9F4>     /x83/x30/xba/x37 HANGUL SYLLABLE MAEM
-+<UB9F5>     /x83/x30/xba/x38 HANGUL SYLLABLE MAEB
-+<UB9F6>     /x83/x30/xba/x39 HANGUL SYLLABLE MAEBS
-+<UB9F7>     /x83/x30/xbb/x30 HANGUL SYLLABLE MAES
-+<UB9F8>     /x83/x30/xbb/x31 HANGUL SYLLABLE MAESS
-+<UB9F9>     /x83/x30/xbb/x32 HANGUL SYLLABLE MAENG
-+<UB9FA>     /x83/x30/xbb/x33 HANGUL SYLLABLE MAEJ
-+<UB9FB>     /x83/x30/xbb/x34 HANGUL SYLLABLE MAEC
-+<UB9FC>     /x83/x30/xbb/x35 HANGUL SYLLABLE MAEK
-+<UB9FD>     /x83/x30/xbb/x36 HANGUL SYLLABLE MAET
-+<UB9FE>     /x83/x30/xbb/x37 HANGUL SYLLABLE MAEP
-+<UB9FF>     /x83/x30/xbb/x38 HANGUL SYLLABLE MAEH
-+<UBA00>     /x83/x30/xbb/x39 HANGUL SYLLABLE MYA
-+<UBA01>     /x83/x30/xbc/x30 HANGUL SYLLABLE MYAG
-+<UBA02>     /x83/x30/xbc/x31 HANGUL SYLLABLE MYAGG
-+<UBA03>     /x83/x30/xbc/x32 HANGUL SYLLABLE MYAGS
-+<UBA04>     /x83/x30/xbc/x33 HANGUL SYLLABLE MYAN
-+<UBA05>     /x83/x30/xbc/x34 HANGUL SYLLABLE MYANI
-+<UBA06>     /x83/x30/xbc/x35 HANGUL SYLLABLE MYANH
-+<UBA07>     /x83/x30/xbc/x36 HANGUL SYLLABLE MYAD
-+<UBA08>     /x83/x30/xbc/x37 HANGUL SYLLABLE MYAL
-+<UBA09>     /x83/x30/xbc/x38 HANGUL SYLLABLE MYALG
-+<UBA0A>     /x83/x30/xbc/x39 HANGUL SYLLABLE MYALM
-+<UBA0B>     /x83/x30/xbd/x30 HANGUL SYLLABLE MYALB
-+<UBA0C>     /x83/x30/xbd/x31 HANGUL SYLLABLE MYALS
-+<UBA0D>     /x83/x30/xbd/x32 HANGUL SYLLABLE MYALT
-+<UBA0E>     /x83/x30/xbd/x33 HANGUL SYLLABLE MYALP
-+<UBA0F>     /x83/x30/xbd/x34 HANGUL SYLLABLE MYALH
-+<UBA10>     /x83/x30/xbd/x35 HANGUL SYLLABLE MYAM
-+<UBA11>     /x83/x30/xbd/x36 HANGUL SYLLABLE MYAB
-+<UBA12>     /x83/x30/xbd/x37 HANGUL SYLLABLE MYABS
-+<UBA13>     /x83/x30/xbd/x38 HANGUL SYLLABLE MYAS
-+<UBA14>     /x83/x30/xbd/x39 HANGUL SYLLABLE MYASS
-+<UBA15>     /x83/x30/xbe/x30 HANGUL SYLLABLE MYANG
-+<UBA16>     /x83/x30/xbe/x31 HANGUL SYLLABLE MYAJ
-+<UBA17>     /x83/x30/xbe/x32 HANGUL SYLLABLE MYAC
-+<UBA18>     /x83/x30/xbe/x33 HANGUL SYLLABLE MYAK
-+<UBA19>     /x83/x30/xbe/x34 HANGUL SYLLABLE MYAT
-+<UBA1A>     /x83/x30/xbe/x35 HANGUL SYLLABLE MYAP
-+<UBA1B>     /x83/x30/xbe/x36 HANGUL SYLLABLE MYAH
-+<UBA1C>     /x83/x30/xbe/x37 HANGUL SYLLABLE MYAE
-+<UBA1D>     /x83/x30/xbe/x38 HANGUL SYLLABLE MYAEG
-+<UBA1E>     /x83/x30/xbe/x39 HANGUL SYLLABLE MYAEGG
-+<UBA1F>     /x83/x30/xbf/x30 HANGUL SYLLABLE MYAEGS
-+<UBA20>     /x83/x30/xbf/x31 HANGUL SYLLABLE MYAEN
-+<UBA21>     /x83/x30/xbf/x32 HANGUL SYLLABLE MYAENI
-+<UBA22>     /x83/x30/xbf/x33 HANGUL SYLLABLE MYAENH
-+<UBA23>     /x83/x30/xbf/x34 HANGUL SYLLABLE MYAED
-+<UBA24>     /x83/x30/xbf/x35 HANGUL SYLLABLE MYAEL
-+<UBA25>     /x83/x30/xbf/x36 HANGUL SYLLABLE MYAELG
-+<UBA26>     /x83/x30/xbf/x37 HANGUL SYLLABLE MYAELM
-+<UBA27>     /x83/x30/xbf/x38 HANGUL SYLLABLE MYAELB
-+<UBA28>     /x83/x30/xbf/x39 HANGUL SYLLABLE MYAELS
-+<UBA29>     /x83/x30/xc0/x30 HANGUL SYLLABLE MYAELT
-+<UBA2A>     /x83/x30/xc0/x31 HANGUL SYLLABLE MYAELP
-+<UBA2B>     /x83/x30/xc0/x32 HANGUL SYLLABLE MYAELH
-+<UBA2C>     /x83/x30/xc0/x33 HANGUL SYLLABLE MYAEM
-+<UBA2D>     /x83/x30/xc0/x34 HANGUL SYLLABLE MYAEB
-+<UBA2E>     /x83/x30/xc0/x35 HANGUL SYLLABLE MYAEBS
-+<UBA2F>     /x83/x30/xc0/x36 HANGUL SYLLABLE MYAES
-+<UBA30>     /x83/x30/xc0/x37 HANGUL SYLLABLE MYAESS
-+<UBA31>     /x83/x30/xc0/x38 HANGUL SYLLABLE MYAENG
-+<UBA32>     /x83/x30/xc0/x39 HANGUL SYLLABLE MYAEJ
-+<UBA33>     /x83/x30/xc1/x30 HANGUL SYLLABLE MYAEC
-+<UBA34>     /x83/x30/xc1/x31 HANGUL SYLLABLE MYAEK
-+<UBA35>     /x83/x30/xc1/x32 HANGUL SYLLABLE MYAET
-+<UBA36>     /x83/x30/xc1/x33 HANGUL SYLLABLE MYAEP
-+<UBA37>     /x83/x30/xc1/x34 HANGUL SYLLABLE MYAEH
-+<UBA38>     /x83/x30/xc1/x35 HANGUL SYLLABLE MEO
-+<UBA39>     /x83/x30/xc1/x36 HANGUL SYLLABLE MEOG
-+<UBA3A>     /x83/x30/xc1/x37 HANGUL SYLLABLE MEOGG
-+<UBA3B>     /x83/x30/xc1/x38 HANGUL SYLLABLE MEOGS
-+<UBA3C>     /x83/x30/xc1/x39 HANGUL SYLLABLE MEON
-+<UBA3D>     /x83/x30/xc2/x30 HANGUL SYLLABLE MEONI
-+<UBA3E>     /x83/x30/xc2/x31 HANGUL SYLLABLE MEONH
-+<UBA3F>     /x83/x30/xc2/x32 HANGUL SYLLABLE MEOD
-+<UBA40>     /x83/x30/xc2/x33 HANGUL SYLLABLE MEOL
-+<UBA41>     /x83/x30/xc2/x34 HANGUL SYLLABLE MEOLG
-+<UBA42>     /x83/x30/xc2/x35 HANGUL SYLLABLE MEOLM
-+<UBA43>     /x83/x30/xc2/x36 HANGUL SYLLABLE MEOLB
-+<UBA44>     /x83/x30/xc2/x37 HANGUL SYLLABLE MEOLS
-+<UBA45>     /x83/x30/xc2/x38 HANGUL SYLLABLE MEOLT
-+<UBA46>     /x83/x30/xc2/x39 HANGUL SYLLABLE MEOLP
-+<UBA47>     /x83/x30/xc3/x30 HANGUL SYLLABLE MEOLH
-+<UBA48>     /x83/x30/xc3/x31 HANGUL SYLLABLE MEOM
-+<UBA49>     /x83/x30/xc3/x32 HANGUL SYLLABLE MEOB
-+<UBA4A>     /x83/x30/xc3/x33 HANGUL SYLLABLE MEOBS
-+<UBA4B>     /x83/x30/xc3/x34 HANGUL SYLLABLE MEOS
-+<UBA4C>     /x83/x30/xc3/x35 HANGUL SYLLABLE MEOSS
-+<UBA4D>     /x83/x30/xc3/x36 HANGUL SYLLABLE MEONG
-+<UBA4E>     /x83/x30/xc3/x37 HANGUL SYLLABLE MEOJ
-+<UBA4F>     /x83/x30/xc3/x38 HANGUL SYLLABLE MEOC
-+<UBA50>     /x83/x30/xc3/x39 HANGUL SYLLABLE MEOK
-+<UBA51>     /x83/x30/xc4/x30 HANGUL SYLLABLE MEOT
-+<UBA52>     /x83/x30/xc4/x31 HANGUL SYLLABLE MEOP
-+<UBA53>     /x83/x30/xc4/x32 HANGUL SYLLABLE MEOH
-+<UBA54>     /x83/x30/xc4/x33 HANGUL SYLLABLE ME
-+<UBA55>     /x83/x30/xc4/x34 HANGUL SYLLABLE MEG
-+<UBA56>     /x83/x30/xc4/x35 HANGUL SYLLABLE MEGG
-+<UBA57>     /x83/x30/xc4/x36 HANGUL SYLLABLE MEGS
-+<UBA58>     /x83/x30/xc4/x37 HANGUL SYLLABLE MEN
-+<UBA59>     /x83/x30/xc4/x38 HANGUL SYLLABLE MENI
-+<UBA5A>     /x83/x30/xc4/x39 HANGUL SYLLABLE MENH
-+<UBA5B>     /x83/x30/xc5/x30 HANGUL SYLLABLE MED
-+<UBA5C>     /x83/x30/xc5/x31 HANGUL SYLLABLE MEL
-+<UBA5D>     /x83/x30/xc5/x32 HANGUL SYLLABLE MELG
-+<UBA5E>     /x83/x30/xc5/x33 HANGUL SYLLABLE MELM
-+<UBA5F>     /x83/x30/xc5/x34 HANGUL SYLLABLE MELB
-+<UBA60>     /x83/x30/xc5/x35 HANGUL SYLLABLE MELS
-+<UBA61>     /x83/x30/xc5/x36 HANGUL SYLLABLE MELT
-+<UBA62>     /x83/x30/xc5/x37 HANGUL SYLLABLE MELP
-+<UBA63>     /x83/x30/xc5/x38 HANGUL SYLLABLE MELH
-+<UBA64>     /x83/x30/xc5/x39 HANGUL SYLLABLE MEM
-+<UBA65>     /x83/x30/xc6/x30 HANGUL SYLLABLE MEB
-+<UBA66>     /x83/x30/xc6/x31 HANGUL SYLLABLE MEBS
-+<UBA67>     /x83/x30/xc6/x32 HANGUL SYLLABLE MES
-+<UBA68>     /x83/x30/xc6/x33 HANGUL SYLLABLE MESS
-+<UBA69>     /x83/x30/xc6/x34 HANGUL SYLLABLE MENG
-+<UBA6A>     /x83/x30/xc6/x35 HANGUL SYLLABLE MEJ
-+<UBA6B>     /x83/x30/xc6/x36 HANGUL SYLLABLE MEC
-+<UBA6C>     /x83/x30/xc6/x37 HANGUL SYLLABLE MEK
-+<UBA6D>     /x83/x30/xc6/x38 HANGUL SYLLABLE MET
-+<UBA6E>     /x83/x30/xc6/x39 HANGUL SYLLABLE MEP
-+<UBA6F>     /x83/x30/xc7/x30 HANGUL SYLLABLE MEH
-+<UBA70>     /x83/x30/xc7/x31 HANGUL SYLLABLE MYEO
-+<UBA71>     /x83/x30/xc7/x32 HANGUL SYLLABLE MYEOG
-+<UBA72>     /x83/x30/xc7/x33 HANGUL SYLLABLE MYEOGG
-+<UBA73>     /x83/x30/xc7/x34 HANGUL SYLLABLE MYEOGS
-+<UBA74>     /x83/x30/xc7/x35 HANGUL SYLLABLE MYEON
-+<UBA75>     /x83/x30/xc7/x36 HANGUL SYLLABLE MYEONI
-+<UBA76>     /x83/x30/xc7/x37 HANGUL SYLLABLE MYEONH
-+<UBA77>     /x83/x30/xc7/x38 HANGUL SYLLABLE MYEOD
-+<UBA78>     /x83/x30/xc7/x39 HANGUL SYLLABLE MYEOL
-+<UBA79>     /x83/x30/xc8/x30 HANGUL SYLLABLE MYEOLG
-+<UBA7A>     /x83/x30/xc8/x31 HANGUL SYLLABLE MYEOLM
-+<UBA7B>     /x83/x30/xc8/x32 HANGUL SYLLABLE MYEOLB
-+<UBA7C>     /x83/x30/xc8/x33 HANGUL SYLLABLE MYEOLS
-+<UBA7D>     /x83/x30/xc8/x34 HANGUL SYLLABLE MYEOLT
-+<UBA7E>     /x83/x30/xc8/x35 HANGUL SYLLABLE MYEOLP
-+<UBA7F>     /x83/x30/xc8/x36 HANGUL SYLLABLE MYEOLH
-+<UBA80>     /x83/x30/xc8/x37 HANGUL SYLLABLE MYEOM
-+<UBA81>     /x83/x30/xc8/x38 HANGUL SYLLABLE MYEOB
-+<UBA82>     /x83/x30/xc8/x39 HANGUL SYLLABLE MYEOBS
-+<UBA83>     /x83/x30/xc9/x30 HANGUL SYLLABLE MYEOS
-+<UBA84>     /x83/x30/xc9/x31 HANGUL SYLLABLE MYEOSS
-+<UBA85>     /x83/x30/xc9/x32 HANGUL SYLLABLE MYEONG
-+<UBA86>     /x83/x30/xc9/x33 HANGUL SYLLABLE MYEOJ
-+<UBA87>     /x83/x30/xc9/x34 HANGUL SYLLABLE MYEOC
-+<UBA88>     /x83/x30/xc9/x35 HANGUL SYLLABLE MYEOK
-+<UBA89>     /x83/x30/xc9/x36 HANGUL SYLLABLE MYEOT
-+<UBA8A>     /x83/x30/xc9/x37 HANGUL SYLLABLE MYEOP
-+<UBA8B>     /x83/x30/xc9/x38 HANGUL SYLLABLE MYEOH
-+<UBA8C>     /x83/x30/xc9/x39 HANGUL SYLLABLE MYE
-+<UBA8D>     /x83/x30/xca/x30 HANGUL SYLLABLE MYEG
-+<UBA8E>     /x83/x30/xca/x31 HANGUL SYLLABLE MYEGG
-+<UBA8F>     /x83/x30/xca/x32 HANGUL SYLLABLE MYEGS
-+<UBA90>     /x83/x30/xca/x33 HANGUL SYLLABLE MYEN
-+<UBA91>     /x83/x30/xca/x34 HANGUL SYLLABLE MYENI
-+<UBA92>     /x83/x30/xca/x35 HANGUL SYLLABLE MYENH
-+<UBA93>     /x83/x30/xca/x36 HANGUL SYLLABLE MYED
-+<UBA94>     /x83/x30/xca/x37 HANGUL SYLLABLE MYEL
-+<UBA95>     /x83/x30/xca/x38 HANGUL SYLLABLE MYELG
-+<UBA96>     /x83/x30/xca/x39 HANGUL SYLLABLE MYELM
-+<UBA97>     /x83/x30/xcb/x30 HANGUL SYLLABLE MYELB
-+<UBA98>     /x83/x30/xcb/x31 HANGUL SYLLABLE MYELS
-+<UBA99>     /x83/x30/xcb/x32 HANGUL SYLLABLE MYELT
-+<UBA9A>     /x83/x30/xcb/x33 HANGUL SYLLABLE MYELP
-+<UBA9B>     /x83/x30/xcb/x34 HANGUL SYLLABLE MYELH
-+<UBA9C>     /x83/x30/xcb/x35 HANGUL SYLLABLE MYEM
-+<UBA9D>     /x83/x30/xcb/x36 HANGUL SYLLABLE MYEB
-+<UBA9E>     /x83/x30/xcb/x37 HANGUL SYLLABLE MYEBS
-+<UBA9F>     /x83/x30/xcb/x38 HANGUL SYLLABLE MYES
-+<UBAA0>     /x83/x30/xcb/x39 HANGUL SYLLABLE MYESS
-+<UBAA1>     /x83/x30/xcc/x30 HANGUL SYLLABLE MYENG
-+<UBAA2>     /x83/x30/xcc/x31 HANGUL SYLLABLE MYEJ
-+<UBAA3>     /x83/x30/xcc/x32 HANGUL SYLLABLE MYEC
-+<UBAA4>     /x83/x30/xcc/x33 HANGUL SYLLABLE MYEK
-+<UBAA5>     /x83/x30/xcc/x34 HANGUL SYLLABLE MYET
-+<UBAA6>     /x83/x30/xcc/x35 HANGUL SYLLABLE MYEP
-+<UBAA7>     /x83/x30/xcc/x36 HANGUL SYLLABLE MYEH
-+<UBAA8>     /x83/x30/xcc/x37 HANGUL SYLLABLE MO
-+<UBAA9>     /x83/x30/xcc/x38 HANGUL SYLLABLE MOG
-+<UBAAA>     /x83/x30/xcc/x39 HANGUL SYLLABLE MOGG
-+<UBAAB>     /x83/x30/xcd/x30 HANGUL SYLLABLE MOGS
-+<UBAAC>     /x83/x30/xcd/x31 HANGUL SYLLABLE MON
-+<UBAAD>     /x83/x30/xcd/x32 HANGUL SYLLABLE MONI
-+<UBAAE>     /x83/x30/xcd/x33 HANGUL SYLLABLE MONH
-+<UBAAF>     /x83/x30/xcd/x34 HANGUL SYLLABLE MOD
-+<UBAB0>     /x83/x30/xcd/x35 HANGUL SYLLABLE MOL
-+<UBAB1>     /x83/x30/xcd/x36 HANGUL SYLLABLE MOLG
-+<UBAB2>     /x83/x30/xcd/x37 HANGUL SYLLABLE MOLM
-+<UBAB3>     /x83/x30/xcd/x38 HANGUL SYLLABLE MOLB
-+<UBAB4>     /x83/x30/xcd/x39 HANGUL SYLLABLE MOLS
-+<UBAB5>     /x83/x30/xce/x30 HANGUL SYLLABLE MOLT
-+<UBAB6>     /x83/x30/xce/x31 HANGUL SYLLABLE MOLP
-+<UBAB7>     /x83/x30/xce/x32 HANGUL SYLLABLE MOLH
-+<UBAB8>     /x83/x30/xce/x33 HANGUL SYLLABLE MOM
-+<UBAB9>     /x83/x30/xce/x34 HANGUL SYLLABLE MOB
-+<UBABA>     /x83/x30/xce/x35 HANGUL SYLLABLE MOBS
-+<UBABB>     /x83/x30/xce/x36 HANGUL SYLLABLE MOS
-+<UBABC>     /x83/x30/xce/x37 HANGUL SYLLABLE MOSS
-+<UBABD>     /x83/x30/xce/x38 HANGUL SYLLABLE MONG
-+<UBABE>     /x83/x30/xce/x39 HANGUL SYLLABLE MOJ
-+<UBABF>     /x83/x30/xcf/x30 HANGUL SYLLABLE MOC
-+<UBAC0>     /x83/x30/xcf/x31 HANGUL SYLLABLE MOK
-+<UBAC1>     /x83/x30/xcf/x32 HANGUL SYLLABLE MOT
-+<UBAC2>     /x83/x30/xcf/x33 HANGUL SYLLABLE MOP
-+<UBAC3>     /x83/x30/xcf/x34 HANGUL SYLLABLE MOH
-+<UBAC4>     /x83/x30/xcf/x35 HANGUL SYLLABLE MWA
-+<UBAC5>     /x83/x30/xcf/x36 HANGUL SYLLABLE MWAG
-+<UBAC6>     /x83/x30/xcf/x37 HANGUL SYLLABLE MWAGG
-+<UBAC7>     /x83/x30/xcf/x38 HANGUL SYLLABLE MWAGS
-+<UBAC8>     /x83/x30/xcf/x39 HANGUL SYLLABLE MWAN
-+<UBAC9>     /x83/x30/xd0/x30 HANGUL SYLLABLE MWANI
-+<UBACA>     /x83/x30/xd0/x31 HANGUL SYLLABLE MWANH
-+<UBACB>     /x83/x30/xd0/x32 HANGUL SYLLABLE MWAD
-+<UBACC>     /x83/x30/xd0/x33 HANGUL SYLLABLE MWAL
-+<UBACD>     /x83/x30/xd0/x34 HANGUL SYLLABLE MWALG
-+<UBACE>     /x83/x30/xd0/x35 HANGUL SYLLABLE MWALM
-+<UBACF>     /x83/x30/xd0/x36 HANGUL SYLLABLE MWALB
-+<UBAD0>     /x83/x30/xd0/x37 HANGUL SYLLABLE MWALS
-+<UBAD1>     /x83/x30/xd0/x38 HANGUL SYLLABLE MWALT
-+<UBAD2>     /x83/x30/xd0/x39 HANGUL SYLLABLE MWALP
-+<UBAD3>     /x83/x30/xd1/x30 HANGUL SYLLABLE MWALH
-+<UBAD4>     /x83/x30/xd1/x31 HANGUL SYLLABLE MWAM
-+<UBAD5>     /x83/x30/xd1/x32 HANGUL SYLLABLE MWAB
-+<UBAD6>     /x83/x30/xd1/x33 HANGUL SYLLABLE MWABS
-+<UBAD7>     /x83/x30/xd1/x34 HANGUL SYLLABLE MWAS
-+<UBAD8>     /x83/x30/xd1/x35 HANGUL SYLLABLE MWASS
-+<UBAD9>     /x83/x30/xd1/x36 HANGUL SYLLABLE MWANG
-+<UBADA>     /x83/x30/xd1/x37 HANGUL SYLLABLE MWAJ
-+<UBADB>     /x83/x30/xd1/x38 HANGUL SYLLABLE MWAC
-+<UBADC>     /x83/x30/xd1/x39 HANGUL SYLLABLE MWAK
-+<UBADD>     /x83/x30/xd2/x30 HANGUL SYLLABLE MWAT
-+<UBADE>     /x83/x30/xd2/x31 HANGUL SYLLABLE MWAP
-+<UBADF>     /x83/x30/xd2/x32 HANGUL SYLLABLE MWAH
-+<UBAE0>     /x83/x30/xd2/x33 HANGUL SYLLABLE MWAE
-+<UBAE1>     /x83/x30/xd2/x34 HANGUL SYLLABLE MWAEG
-+<UBAE2>     /x83/x30/xd2/x35 HANGUL SYLLABLE MWAEGG
-+<UBAE3>     /x83/x30/xd2/x36 HANGUL SYLLABLE MWAEGS
-+<UBAE4>     /x83/x30/xd2/x37 HANGUL SYLLABLE MWAEN
-+<UBAE5>     /x83/x30/xd2/x38 HANGUL SYLLABLE MWAENI
-+<UBAE6>     /x83/x30/xd2/x39 HANGUL SYLLABLE MWAENH
-+<UBAE7>     /x83/x30/xd3/x30 HANGUL SYLLABLE MWAED
-+<UBAE8>     /x83/x30/xd3/x31 HANGUL SYLLABLE MWAEL
-+<UBAE9>     /x83/x30/xd3/x32 HANGUL SYLLABLE MWAELG
-+<UBAEA>     /x83/x30/xd3/x33 HANGUL SYLLABLE MWAELM
-+<UBAEB>     /x83/x30/xd3/x34 HANGUL SYLLABLE MWAELB
-+<UBAEC>     /x83/x30/xd3/x35 HANGUL SYLLABLE MWAELS
-+<UBAED>     /x83/x30/xd3/x36 HANGUL SYLLABLE MWAELT
-+<UBAEE>     /x83/x30/xd3/x37 HANGUL SYLLABLE MWAELP
-+<UBAEF>     /x83/x30/xd3/x38 HANGUL SYLLABLE MWAELH
-+<UBAF0>     /x83/x30/xd3/x39 HANGUL SYLLABLE MWAEM
-+<UBAF1>     /x83/x30/xd4/x30 HANGUL SYLLABLE MWAEB
-+<UBAF2>     /x83/x30/xd4/x31 HANGUL SYLLABLE MWAEBS
-+<UBAF3>     /x83/x30/xd4/x32 HANGUL SYLLABLE MWAES
-+<UBAF4>     /x83/x30/xd4/x33 HANGUL SYLLABLE MWAESS
-+<UBAF5>     /x83/x30/xd4/x34 HANGUL SYLLABLE MWAENG
-+<UBAF6>     /x83/x30/xd4/x35 HANGUL SYLLABLE MWAEJ
-+<UBAF7>     /x83/x30/xd4/x36 HANGUL SYLLABLE MWAEC
-+<UBAF8>     /x83/x30/xd4/x37 HANGUL SYLLABLE MWAEK
-+<UBAF9>     /x83/x30/xd4/x38 HANGUL SYLLABLE MWAET
-+<UBAFA>     /x83/x30/xd4/x39 HANGUL SYLLABLE MWAEP
-+<UBAFB>     /x83/x30/xd5/x30 HANGUL SYLLABLE MWAEH
-+<UBAFC>     /x83/x30/xd5/x31 HANGUL SYLLABLE MOE
-+<UBAFD>     /x83/x30/xd5/x32 HANGUL SYLLABLE MOEG
-+<UBAFE>     /x83/x30/xd5/x33 HANGUL SYLLABLE MOEGG
-+<UBAFF>     /x83/x30/xd5/x34 HANGUL SYLLABLE MOEGS
-+<UBB00>     /x83/x30/xd5/x35 HANGUL SYLLABLE MOEN
-+<UBB01>     /x83/x30/xd5/x36 HANGUL SYLLABLE MOENI
-+<UBB02>     /x83/x30/xd5/x37 HANGUL SYLLABLE MOENH
-+<UBB03>     /x83/x30/xd5/x38 HANGUL SYLLABLE MOED
-+<UBB04>     /x83/x30/xd5/x39 HANGUL SYLLABLE MOEL
-+<UBB05>     /x83/x30/xd6/x30 HANGUL SYLLABLE MOELG
-+<UBB06>     /x83/x30/xd6/x31 HANGUL SYLLABLE MOELM
-+<UBB07>     /x83/x30/xd6/x32 HANGUL SYLLABLE MOELB
-+<UBB08>     /x83/x30/xd6/x33 HANGUL SYLLABLE MOELS
-+<UBB09>     /x83/x30/xd6/x34 HANGUL SYLLABLE MOELT
-+<UBB0A>     /x83/x30/xd6/x35 HANGUL SYLLABLE MOELP
-+<UBB0B>     /x83/x30/xd6/x36 HANGUL SYLLABLE MOELH
-+<UBB0C>     /x83/x30/xd6/x37 HANGUL SYLLABLE MOEM
-+<UBB0D>     /x83/x30/xd6/x38 HANGUL SYLLABLE MOEB
-+<UBB0E>     /x83/x30/xd6/x39 HANGUL SYLLABLE MOEBS
-+<UBB0F>     /x83/x30/xd7/x30 HANGUL SYLLABLE MOES
-+<UBB10>     /x83/x30/xd7/x31 HANGUL SYLLABLE MOESS
-+<UBB11>     /x83/x30/xd7/x32 HANGUL SYLLABLE MOENG
-+<UBB12>     /x83/x30/xd7/x33 HANGUL SYLLABLE MOEJ
-+<UBB13>     /x83/x30/xd7/x34 HANGUL SYLLABLE MOEC
-+<UBB14>     /x83/x30/xd7/x35 HANGUL SYLLABLE MOEK
-+<UBB15>     /x83/x30/xd7/x36 HANGUL SYLLABLE MOET
-+<UBB16>     /x83/x30/xd7/x37 HANGUL SYLLABLE MOEP
-+<UBB17>     /x83/x30/xd7/x38 HANGUL SYLLABLE MOEH
-+<UBB18>     /x83/x30/xd7/x39 HANGUL SYLLABLE MYO
-+<UBB19>     /x83/x30/xd8/x30 HANGUL SYLLABLE MYOG
-+<UBB1A>     /x83/x30/xd8/x31 HANGUL SYLLABLE MYOGG
-+<UBB1B>     /x83/x30/xd8/x32 HANGUL SYLLABLE MYOGS
-+<UBB1C>     /x83/x30/xd8/x33 HANGUL SYLLABLE MYON
-+<UBB1D>     /x83/x30/xd8/x34 HANGUL SYLLABLE MYONI
-+<UBB1E>     /x83/x30/xd8/x35 HANGUL SYLLABLE MYONH
-+<UBB1F>     /x83/x30/xd8/x36 HANGUL SYLLABLE MYOD
-+<UBB20>     /x83/x30/xd8/x37 HANGUL SYLLABLE MYOL
-+<UBB21>     /x83/x30/xd8/x38 HANGUL SYLLABLE MYOLG
-+<UBB22>     /x83/x30/xd8/x39 HANGUL SYLLABLE MYOLM
-+<UBB23>     /x83/x30/xd9/x30 HANGUL SYLLABLE MYOLB
-+<UBB24>     /x83/x30/xd9/x31 HANGUL SYLLABLE MYOLS
-+<UBB25>     /x83/x30/xd9/x32 HANGUL SYLLABLE MYOLT
-+<UBB26>     /x83/x30/xd9/x33 HANGUL SYLLABLE MYOLP
-+<UBB27>     /x83/x30/xd9/x34 HANGUL SYLLABLE MYOLH
-+<UBB28>     /x83/x30/xd9/x35 HANGUL SYLLABLE MYOM
-+<UBB29>     /x83/x30/xd9/x36 HANGUL SYLLABLE MYOB
-+<UBB2A>     /x83/x30/xd9/x37 HANGUL SYLLABLE MYOBS
-+<UBB2B>     /x83/x30/xd9/x38 HANGUL SYLLABLE MYOS
-+<UBB2C>     /x83/x30/xd9/x39 HANGUL SYLLABLE MYOSS
-+<UBB2D>     /x83/x30/xda/x30 HANGUL SYLLABLE MYONG
-+<UBB2E>     /x83/x30/xda/x31 HANGUL SYLLABLE MYOJ
-+<UBB2F>     /x83/x30/xda/x32 HANGUL SYLLABLE MYOC
-+<UBB30>     /x83/x30/xda/x33 HANGUL SYLLABLE MYOK
-+<UBB31>     /x83/x30/xda/x34 HANGUL SYLLABLE MYOT
-+<UBB32>     /x83/x30/xda/x35 HANGUL SYLLABLE MYOP
-+<UBB33>     /x83/x30/xda/x36 HANGUL SYLLABLE MYOH
-+<UBB34>     /x83/x30/xda/x37 HANGUL SYLLABLE MU
-+<UBB35>     /x83/x30/xda/x38 HANGUL SYLLABLE MUG
-+<UBB36>     /x83/x30/xda/x39 HANGUL SYLLABLE MUGG
-+<UBB37>     /x83/x30/xdb/x30 HANGUL SYLLABLE MUGS
-+<UBB38>     /x83/x30/xdb/x31 HANGUL SYLLABLE MUN
-+<UBB39>     /x83/x30/xdb/x32 HANGUL SYLLABLE MUNI
-+<UBB3A>     /x83/x30/xdb/x33 HANGUL SYLLABLE MUNH
-+<UBB3B>     /x83/x30/xdb/x34 HANGUL SYLLABLE MUD
-+<UBB3C>     /x83/x30/xdb/x35 HANGUL SYLLABLE MUL
-+<UBB3D>     /x83/x30/xdb/x36 HANGUL SYLLABLE MULG
-+<UBB3E>     /x83/x30/xdb/x37 HANGUL SYLLABLE MULM
-+<UBB3F>     /x83/x30/xdb/x38 HANGUL SYLLABLE MULB
-+<UBB40>     /x83/x30/xdb/x39 HANGUL SYLLABLE MULS
-+<UBB41>     /x83/x30/xdc/x30 HANGUL SYLLABLE MULT
-+<UBB42>     /x83/x30/xdc/x31 HANGUL SYLLABLE MULP
-+<UBB43>     /x83/x30/xdc/x32 HANGUL SYLLABLE MULH
-+<UBB44>     /x83/x30/xdc/x33 HANGUL SYLLABLE MUM
-+<UBB45>     /x83/x30/xdc/x34 HANGUL SYLLABLE MUB
-+<UBB46>     /x83/x30/xdc/x35 HANGUL SYLLABLE MUBS
-+<UBB47>     /x83/x30/xdc/x36 HANGUL SYLLABLE MUS
-+<UBB48>     /x83/x30/xdc/x37 HANGUL SYLLABLE MUSS
-+<UBB49>     /x83/x30/xdc/x38 HANGUL SYLLABLE MUNG
-+<UBB4A>     /x83/x30/xdc/x39 HANGUL SYLLABLE MUJ
-+<UBB4B>     /x83/x30/xdd/x30 HANGUL SYLLABLE MUC
-+<UBB4C>     /x83/x30/xdd/x31 HANGUL SYLLABLE MUK
-+<UBB4D>     /x83/x30/xdd/x32 HANGUL SYLLABLE MUT
-+<UBB4E>     /x83/x30/xdd/x33 HANGUL SYLLABLE MUP
-+<UBB4F>     /x83/x30/xdd/x34 HANGUL SYLLABLE MUH
-+<UBB50>     /x83/x30/xdd/x35 HANGUL SYLLABLE MWEO
-+<UBB51>     /x83/x30/xdd/x36 HANGUL SYLLABLE MWEOG
-+<UBB52>     /x83/x30/xdd/x37 HANGUL SYLLABLE MWEOGG
-+<UBB53>     /x83/x30/xdd/x38 HANGUL SYLLABLE MWEOGS
-+<UBB54>     /x83/x30/xdd/x39 HANGUL SYLLABLE MWEON
-+<UBB55>     /x83/x30/xde/x30 HANGUL SYLLABLE MWEONI
-+<UBB56>     /x83/x30/xde/x31 HANGUL SYLLABLE MWEONH
-+<UBB57>     /x83/x30/xde/x32 HANGUL SYLLABLE MWEOD
-+<UBB58>     /x83/x30/xde/x33 HANGUL SYLLABLE MWEOL
-+<UBB59>     /x83/x30/xde/x34 HANGUL SYLLABLE MWEOLG
-+<UBB5A>     /x83/x30/xde/x35 HANGUL SYLLABLE MWEOLM
-+<UBB5B>     /x83/x30/xde/x36 HANGUL SYLLABLE MWEOLB
-+<UBB5C>     /x83/x30/xde/x37 HANGUL SYLLABLE MWEOLS
-+<UBB5D>     /x83/x30/xde/x38 HANGUL SYLLABLE MWEOLT
-+<UBB5E>     /x83/x30/xde/x39 HANGUL SYLLABLE MWEOLP
-+<UBB5F>     /x83/x30/xdf/x30 HANGUL SYLLABLE MWEOLH
-+<UBB60>     /x83/x30/xdf/x31 HANGUL SYLLABLE MWEOM
-+<UBB61>     /x83/x30/xdf/x32 HANGUL SYLLABLE MWEOB
-+<UBB62>     /x83/x30/xdf/x33 HANGUL SYLLABLE MWEOBS
-+<UBB63>     /x83/x30/xdf/x34 HANGUL SYLLABLE MWEOS
-+<UBB64>     /x83/x30/xdf/x35 HANGUL SYLLABLE MWEOSS
-+<UBB65>     /x83/x30/xdf/x36 HANGUL SYLLABLE MWEONG
-+<UBB66>     /x83/x30/xdf/x37 HANGUL SYLLABLE MWEOJ
-+<UBB67>     /x83/x30/xdf/x38 HANGUL SYLLABLE MWEOC
-+<UBB68>     /x83/x30/xdf/x39 HANGUL SYLLABLE MWEOK
-+<UBB69>     /x83/x30/xe0/x30 HANGUL SYLLABLE MWEOT
-+<UBB6A>     /x83/x30/xe0/x31 HANGUL SYLLABLE MWEOP
-+<UBB6B>     /x83/x30/xe0/x32 HANGUL SYLLABLE MWEOH
-+<UBB6C>     /x83/x30/xe0/x33 HANGUL SYLLABLE MWE
-+<UBB6D>     /x83/x30/xe0/x34 HANGUL SYLLABLE MWEG
-+<UBB6E>     /x83/x30/xe0/x35 HANGUL SYLLABLE MWEGG
-+<UBB6F>     /x83/x30/xe0/x36 HANGUL SYLLABLE MWEGS
-+<UBB70>     /x83/x30/xe0/x37 HANGUL SYLLABLE MWEN
-+<UBB71>     /x83/x30/xe0/x38 HANGUL SYLLABLE MWENI
-+<UBB72>     /x83/x30/xe0/x39 HANGUL SYLLABLE MWENH
-+<UBB73>     /x83/x30/xe1/x30 HANGUL SYLLABLE MWED
-+<UBB74>     /x83/x30/xe1/x31 HANGUL SYLLABLE MWEL
-+<UBB75>     /x83/x30/xe1/x32 HANGUL SYLLABLE MWELG
-+<UBB76>     /x83/x30/xe1/x33 HANGUL SYLLABLE MWELM
-+<UBB77>     /x83/x30/xe1/x34 HANGUL SYLLABLE MWELB
-+<UBB78>     /x83/x30/xe1/x35 HANGUL SYLLABLE MWELS
-+<UBB79>     /x83/x30/xe1/x36 HANGUL SYLLABLE MWELT
-+<UBB7A>     /x83/x30/xe1/x37 HANGUL SYLLABLE MWELP
-+<UBB7B>     /x83/x30/xe1/x38 HANGUL SYLLABLE MWELH
-+<UBB7C>     /x83/x30/xe1/x39 HANGUL SYLLABLE MWEM
-+<UBB7D>     /x83/x30/xe2/x30 HANGUL SYLLABLE MWEB
-+<UBB7E>     /x83/x30/xe2/x31 HANGUL SYLLABLE MWEBS
-+<UBB7F>     /x83/x30/xe2/x32 HANGUL SYLLABLE MWES
-+<UBB80>     /x83/x30/xe2/x33 HANGUL SYLLABLE MWESS
-+<UBB81>     /x83/x30/xe2/x34 HANGUL SYLLABLE MWENG
-+<UBB82>     /x83/x30/xe2/x35 HANGUL SYLLABLE MWEJ
-+<UBB83>     /x83/x30/xe2/x36 HANGUL SYLLABLE MWEC
-+<UBB84>     /x83/x30/xe2/x37 HANGUL SYLLABLE MWEK
-+<UBB85>     /x83/x30/xe2/x38 HANGUL SYLLABLE MWET
-+<UBB86>     /x83/x30/xe2/x39 HANGUL SYLLABLE MWEP
-+<UBB87>     /x83/x30/xe3/x30 HANGUL SYLLABLE MWEH
-+<UBB88>     /x83/x30/xe3/x31 HANGUL SYLLABLE MWI
-+<UBB89>     /x83/x30/xe3/x32 HANGUL SYLLABLE MWIG
-+<UBB8A>     /x83/x30/xe3/x33 HANGUL SYLLABLE MWIGG
-+<UBB8B>     /x83/x30/xe3/x34 HANGUL SYLLABLE MWIGS
-+<UBB8C>     /x83/x30/xe3/x35 HANGUL SYLLABLE MWIN
-+<UBB8D>     /x83/x30/xe3/x36 HANGUL SYLLABLE MWINI
-+<UBB8E>     /x83/x30/xe3/x37 HANGUL SYLLABLE MWINH
-+<UBB8F>     /x83/x30/xe3/x38 HANGUL SYLLABLE MWID
-+<UBB90>     /x83/x30/xe3/x39 HANGUL SYLLABLE MWIL
-+<UBB91>     /x83/x30/xe4/x30 HANGUL SYLLABLE MWILG
-+<UBB92>     /x83/x30/xe4/x31 HANGUL SYLLABLE MWILM
-+<UBB93>     /x83/x30/xe4/x32 HANGUL SYLLABLE MWILB
-+<UBB94>     /x83/x30/xe4/x33 HANGUL SYLLABLE MWILS
-+<UBB95>     /x83/x30/xe4/x34 HANGUL SYLLABLE MWILT
-+<UBB96>     /x83/x30/xe4/x35 HANGUL SYLLABLE MWILP
-+<UBB97>     /x83/x30/xe4/x36 HANGUL SYLLABLE MWILH
-+<UBB98>     /x83/x30/xe4/x37 HANGUL SYLLABLE MWIM
-+<UBB99>     /x83/x30/xe4/x38 HANGUL SYLLABLE MWIB
-+<UBB9A>     /x83/x30/xe4/x39 HANGUL SYLLABLE MWIBS
-+<UBB9B>     /x83/x30/xe5/x30 HANGUL SYLLABLE MWIS
-+<UBB9C>     /x83/x30/xe5/x31 HANGUL SYLLABLE MWISS
-+<UBB9D>     /x83/x30/xe5/x32 HANGUL SYLLABLE MWING
-+<UBB9E>     /x83/x30/xe5/x33 HANGUL SYLLABLE MWIJ
-+<UBB9F>     /x83/x30/xe5/x34 HANGUL SYLLABLE MWIC
-+<UBBA0>     /x83/x30/xe5/x35 HANGUL SYLLABLE MWIK
-+<UBBA1>     /x83/x30/xe5/x36 HANGUL SYLLABLE MWIT
-+<UBBA2>     /x83/x30/xe5/x37 HANGUL SYLLABLE MWIP
-+<UBBA3>     /x83/x30/xe5/x38 HANGUL SYLLABLE MWIH
-+<UBBA4>     /x83/x30/xe5/x39 HANGUL SYLLABLE MYU
-+<UBBA5>     /x83/x30/xe6/x30 HANGUL SYLLABLE MYUG
-+<UBBA6>     /x83/x30/xe6/x31 HANGUL SYLLABLE MYUGG
-+<UBBA7>     /x83/x30/xe6/x32 HANGUL SYLLABLE MYUGS
-+<UBBA8>     /x83/x30/xe6/x33 HANGUL SYLLABLE MYUN
-+<UBBA9>     /x83/x30/xe6/x34 HANGUL SYLLABLE MYUNI
-+<UBBAA>     /x83/x30/xe6/x35 HANGUL SYLLABLE MYUNH
-+<UBBAB>     /x83/x30/xe6/x36 HANGUL SYLLABLE MYUD
-+<UBBAC>     /x83/x30/xe6/x37 HANGUL SYLLABLE MYUL
-+<UBBAD>     /x83/x30/xe6/x38 HANGUL SYLLABLE MYULG
-+<UBBAE>     /x83/x30/xe6/x39 HANGUL SYLLABLE MYULM
-+<UBBAF>     /x83/x30/xe7/x30 HANGUL SYLLABLE MYULB
-+<UBBB0>     /x83/x30/xe7/x31 HANGUL SYLLABLE MYULS
-+<UBBB1>     /x83/x30/xe7/x32 HANGUL SYLLABLE MYULT
-+<UBBB2>     /x83/x30/xe7/x33 HANGUL SYLLABLE MYULP
-+<UBBB3>     /x83/x30/xe7/x34 HANGUL SYLLABLE MYULH
-+<UBBB4>     /x83/x30/xe7/x35 HANGUL SYLLABLE MYUM
-+<UBBB5>     /x83/x30/xe7/x36 HANGUL SYLLABLE MYUB
-+<UBBB6>     /x83/x30/xe7/x37 HANGUL SYLLABLE MYUBS
-+<UBBB7>     /x83/x30/xe7/x38 HANGUL SYLLABLE MYUS
-+<UBBB8>     /x83/x30/xe7/x39 HANGUL SYLLABLE MYUSS
-+<UBBB9>     /x83/x30/xe8/x30 HANGUL SYLLABLE MYUNG
-+<UBBBA>     /x83/x30/xe8/x31 HANGUL SYLLABLE MYUJ
-+<UBBBB>     /x83/x30/xe8/x32 HANGUL SYLLABLE MYUC
-+<UBBBC>     /x83/x30/xe8/x33 HANGUL SYLLABLE MYUK
-+<UBBBD>     /x83/x30/xe8/x34 HANGUL SYLLABLE MYUT
-+<UBBBE>     /x83/x30/xe8/x35 HANGUL SYLLABLE MYUP
-+<UBBBF>     /x83/x30/xe8/x36 HANGUL SYLLABLE MYUH
-+<UBBC0>     /x83/x30/xe8/x37 HANGUL SYLLABLE MEU
-+<UBBC1>     /x83/x30/xe8/x38 HANGUL SYLLABLE MEUG
-+<UBBC2>     /x83/x30/xe8/x39 HANGUL SYLLABLE MEUGG
-+<UBBC3>     /x83/x30/xe9/x30 HANGUL SYLLABLE MEUGS
-+<UBBC4>     /x83/x30/xe9/x31 HANGUL SYLLABLE MEUN
-+<UBBC5>     /x83/x30/xe9/x32 HANGUL SYLLABLE MEUNI
-+<UBBC6>     /x83/x30/xe9/x33 HANGUL SYLLABLE MEUNH
-+<UBBC7>     /x83/x30/xe9/x34 HANGUL SYLLABLE MEUD
-+<UBBC8>     /x83/x30/xe9/x35 HANGUL SYLLABLE MEUL
-+<UBBC9>     /x83/x30/xe9/x36 HANGUL SYLLABLE MEULG
-+<UBBCA>     /x83/x30/xe9/x37 HANGUL SYLLABLE MEULM
-+<UBBCB>     /x83/x30/xe9/x38 HANGUL SYLLABLE MEULB
-+<UBBCC>     /x83/x30/xe9/x39 HANGUL SYLLABLE MEULS
-+<UBBCD>     /x83/x30/xea/x30 HANGUL SYLLABLE MEULT
-+<UBBCE>     /x83/x30/xea/x31 HANGUL SYLLABLE MEULP
-+<UBBCF>     /x83/x30/xea/x32 HANGUL SYLLABLE MEULH
-+<UBBD0>     /x83/x30/xea/x33 HANGUL SYLLABLE MEUM
-+<UBBD1>     /x83/x30/xea/x34 HANGUL SYLLABLE MEUB
-+<UBBD2>     /x83/x30/xea/x35 HANGUL SYLLABLE MEUBS
-+<UBBD3>     /x83/x30/xea/x36 HANGUL SYLLABLE MEUS
-+<UBBD4>     /x83/x30/xea/x37 HANGUL SYLLABLE MEUSS
-+<UBBD5>     /x83/x30/xea/x38 HANGUL SYLLABLE MEUNG
-+<UBBD6>     /x83/x30/xea/x39 HANGUL SYLLABLE MEUJ
-+<UBBD7>     /x83/x30/xeb/x30 HANGUL SYLLABLE MEUC
-+<UBBD8>     /x83/x30/xeb/x31 HANGUL SYLLABLE MEUK
-+<UBBD9>     /x83/x30/xeb/x32 HANGUL SYLLABLE MEUT
-+<UBBDA>     /x83/x30/xeb/x33 HANGUL SYLLABLE MEUP
-+<UBBDB>     /x83/x30/xeb/x34 HANGUL SYLLABLE MEUH
-+<UBBDC>     /x83/x30/xeb/x35 HANGUL SYLLABLE MYI
-+<UBBDD>     /x83/x30/xeb/x36 HANGUL SYLLABLE MYIG
-+<UBBDE>     /x83/x30/xeb/x37 HANGUL SYLLABLE MYIGG
-+<UBBDF>     /x83/x30/xeb/x38 HANGUL SYLLABLE MYIGS
-+<UBBE0>     /x83/x30/xeb/x39 HANGUL SYLLABLE MYIN
-+<UBBE1>     /x83/x30/xec/x30 HANGUL SYLLABLE MYINI
-+<UBBE2>     /x83/x30/xec/x31 HANGUL SYLLABLE MYINH
-+<UBBE3>     /x83/x30/xec/x32 HANGUL SYLLABLE MYID
-+<UBBE4>     /x83/x30/xec/x33 HANGUL SYLLABLE MYIL
-+<UBBE5>     /x83/x30/xec/x34 HANGUL SYLLABLE MYILG
-+<UBBE6>     /x83/x30/xec/x35 HANGUL SYLLABLE MYILM
-+<UBBE7>     /x83/x30/xec/x36 HANGUL SYLLABLE MYILB
-+<UBBE8>     /x83/x30/xec/x37 HANGUL SYLLABLE MYILS
-+<UBBE9>     /x83/x30/xec/x38 HANGUL SYLLABLE MYILT
-+<UBBEA>     /x83/x30/xec/x39 HANGUL SYLLABLE MYILP
-+<UBBEB>     /x83/x30/xed/x30 HANGUL SYLLABLE MYILH
-+<UBBEC>     /x83/x30/xed/x31 HANGUL SYLLABLE MYIM
-+<UBBED>     /x83/x30/xed/x32 HANGUL SYLLABLE MYIB
-+<UBBEE>     /x83/x30/xed/x33 HANGUL SYLLABLE MYIBS
-+<UBBEF>     /x83/x30/xed/x34 HANGUL SYLLABLE MYIS
-+<UBBF0>     /x83/x30/xed/x35 HANGUL SYLLABLE MYISS
-+<UBBF1>     /x83/x30/xed/x36 HANGUL SYLLABLE MYING
-+<UBBF2>     /x83/x30/xed/x37 HANGUL SYLLABLE MYIJ
-+<UBBF3>     /x83/x30/xed/x38 HANGUL SYLLABLE MYIC
-+<UBBF4>     /x83/x30/xed/x39 HANGUL SYLLABLE MYIK
-+<UBBF5>     /x83/x30/xee/x30 HANGUL SYLLABLE MYIT
-+<UBBF6>     /x83/x30/xee/x31 HANGUL SYLLABLE MYIP
-+<UBBF7>     /x83/x30/xee/x32 HANGUL SYLLABLE MYIH
-+<UBBF8>     /x83/x30/xee/x33 HANGUL SYLLABLE MI
-+<UBBF9>     /x83/x30/xee/x34 HANGUL SYLLABLE MIG
-+<UBBFA>     /x83/x30/xee/x35 HANGUL SYLLABLE MIGG
-+<UBBFB>     /x83/x30/xee/x36 HANGUL SYLLABLE MIGS
-+<UBBFC>     /x83/x30/xee/x37 HANGUL SYLLABLE MIN
-+<UBBFD>     /x83/x30/xee/x38 HANGUL SYLLABLE MINI
-+<UBBFE>     /x83/x30/xee/x39 HANGUL SYLLABLE MINH
-+<UBBFF>     /x83/x30/xef/x30 HANGUL SYLLABLE MID
-+<UBC00>     /x83/x30/xef/x31 HANGUL SYLLABLE MIL
-+<UBC01>     /x83/x30/xef/x32 HANGUL SYLLABLE MILG
-+<UBC02>     /x83/x30/xef/x33 HANGUL SYLLABLE MILM
-+<UBC03>     /x83/x30/xef/x34 HANGUL SYLLABLE MILB
-+<UBC04>     /x83/x30/xef/x35 HANGUL SYLLABLE MILS
-+<UBC05>     /x83/x30/xef/x36 HANGUL SYLLABLE MILT
-+<UBC06>     /x83/x30/xef/x37 HANGUL SYLLABLE MILP
-+<UBC07>     /x83/x30/xef/x38 HANGUL SYLLABLE MILH
-+<UBC08>     /x83/x30/xef/x39 HANGUL SYLLABLE MIM
-+<UBC09>     /x83/x30/xf0/x30 HANGUL SYLLABLE MIB
-+<UBC0A>     /x83/x30/xf0/x31 HANGUL SYLLABLE MIBS
-+<UBC0B>     /x83/x30/xf0/x32 HANGUL SYLLABLE MIS
-+<UBC0C>     /x83/x30/xf0/x33 HANGUL SYLLABLE MISS
-+<UBC0D>     /x83/x30/xf0/x34 HANGUL SYLLABLE MING
-+<UBC0E>     /x83/x30/xf0/x35 HANGUL SYLLABLE MIJ
-+<UBC0F>     /x83/x30/xf0/x36 HANGUL SYLLABLE MIC
-+<UBC10>     /x83/x30/xf0/x37 HANGUL SYLLABLE MIK
-+<UBC11>     /x83/x30/xf0/x38 HANGUL SYLLABLE MIT
-+<UBC12>     /x83/x30/xf0/x39 HANGUL SYLLABLE MIP
-+<UBC13>     /x83/x30/xf1/x30 HANGUL SYLLABLE MIH
-+<UBC14>     /x83/x30/xf1/x31 HANGUL SYLLABLE BA
-+<UBC15>     /x83/x30/xf1/x32 HANGUL SYLLABLE BAG
-+<UBC16>     /x83/x30/xf1/x33 HANGUL SYLLABLE BAGG
-+<UBC17>     /x83/x30/xf1/x34 HANGUL SYLLABLE BAGS
-+<UBC18>     /x83/x30/xf1/x35 HANGUL SYLLABLE BAN
-+<UBC19>     /x83/x30/xf1/x36 HANGUL SYLLABLE BANI
-+<UBC1A>     /x83/x30/xf1/x37 HANGUL SYLLABLE BANH
-+<UBC1B>     /x83/x30/xf1/x38 HANGUL SYLLABLE BAD
-+<UBC1C>     /x83/x30/xf1/x39 HANGUL SYLLABLE BAL
-+<UBC1D>     /x83/x30/xf2/x30 HANGUL SYLLABLE BALG
-+<UBC1E>     /x83/x30/xf2/x31 HANGUL SYLLABLE BALM
-+<UBC1F>     /x83/x30/xf2/x32 HANGUL SYLLABLE BALB
-+<UBC20>     /x83/x30/xf2/x33 HANGUL SYLLABLE BALS
-+<UBC21>     /x83/x30/xf2/x34 HANGUL SYLLABLE BALT
-+<UBC22>     /x83/x30/xf2/x35 HANGUL SYLLABLE BALP
-+<UBC23>     /x83/x30/xf2/x36 HANGUL SYLLABLE BALH
-+<UBC24>     /x83/x30/xf2/x37 HANGUL SYLLABLE BAM
-+<UBC25>     /x83/x30/xf2/x38 HANGUL SYLLABLE BAB
-+<UBC26>     /x83/x30/xf2/x39 HANGUL SYLLABLE BABS
-+<UBC27>     /x83/x30/xf3/x30 HANGUL SYLLABLE BAS
-+<UBC28>     /x83/x30/xf3/x31 HANGUL SYLLABLE BASS
-+<UBC29>     /x83/x30/xf3/x32 HANGUL SYLLABLE BANG
-+<UBC2A>     /x83/x30/xf3/x33 HANGUL SYLLABLE BAJ
-+<UBC2B>     /x83/x30/xf3/x34 HANGUL SYLLABLE BAC
-+<UBC2C>     /x83/x30/xf3/x35 HANGUL SYLLABLE BAK
-+<UBC2D>     /x83/x30/xf3/x36 HANGUL SYLLABLE BAT
-+<UBC2E>     /x83/x30/xf3/x37 HANGUL SYLLABLE BAP
-+<UBC2F>     /x83/x30/xf3/x38 HANGUL SYLLABLE BAH
-+<UBC30>     /x83/x30/xf3/x39 HANGUL SYLLABLE BAE
-+<UBC31>     /x83/x30/xf4/x30 HANGUL SYLLABLE BAEG
-+<UBC32>     /x83/x30/xf4/x31 HANGUL SYLLABLE BAEGG
-+<UBC33>     /x83/x30/xf4/x32 HANGUL SYLLABLE BAEGS
-+<UBC34>     /x83/x30/xf4/x33 HANGUL SYLLABLE BAEN
-+<UBC35>     /x83/x30/xf4/x34 HANGUL SYLLABLE BAENI
-+<UBC36>     /x83/x30/xf4/x35 HANGUL SYLLABLE BAENH
-+<UBC37>     /x83/x30/xf4/x36 HANGUL SYLLABLE BAED
-+<UBC38>     /x83/x30/xf4/x37 HANGUL SYLLABLE BAEL
-+<UBC39>     /x83/x30/xf4/x38 HANGUL SYLLABLE BAELG
-+<UBC3A>     /x83/x30/xf4/x39 HANGUL SYLLABLE BAELM
-+<UBC3B>     /x83/x30/xf5/x30 HANGUL SYLLABLE BAELB
-+<UBC3C>     /x83/x30/xf5/x31 HANGUL SYLLABLE BAELS
-+<UBC3D>     /x83/x30/xf5/x32 HANGUL SYLLABLE BAELT
-+<UBC3E>     /x83/x30/xf5/x33 HANGUL SYLLABLE BAELP
-+<UBC3F>     /x83/x30/xf5/x34 HANGUL SYLLABLE BAELH
-+<UBC40>     /x83/x30/xf5/x35 HANGUL SYLLABLE BAEM
-+<UBC41>     /x83/x30/xf5/x36 HANGUL SYLLABLE BAEB
-+<UBC42>     /x83/x30/xf5/x37 HANGUL SYLLABLE BAEBS
-+<UBC43>     /x83/x30/xf5/x38 HANGUL SYLLABLE BAES
-+<UBC44>     /x83/x30/xf5/x39 HANGUL SYLLABLE BAESS
-+<UBC45>     /x83/x30/xf6/x30 HANGUL SYLLABLE BAENG
-+<UBC46>     /x83/x30/xf6/x31 HANGUL SYLLABLE BAEJ
-+<UBC47>     /x83/x30/xf6/x32 HANGUL SYLLABLE BAEC
-+<UBC48>     /x83/x30/xf6/x33 HANGUL SYLLABLE BAEK
-+<UBC49>     /x83/x30/xf6/x34 HANGUL SYLLABLE BAET
-+<UBC4A>     /x83/x30/xf6/x35 HANGUL SYLLABLE BAEP
-+<UBC4B>     /x83/x30/xf6/x36 HANGUL SYLLABLE BAEH
-+<UBC4C>     /x83/x30/xf6/x37 HANGUL SYLLABLE BYA
-+<UBC4D>     /x83/x30/xf6/x38 HANGUL SYLLABLE BYAG
-+<UBC4E>     /x83/x30/xf6/x39 HANGUL SYLLABLE BYAGG
-+<UBC4F>     /x83/x30/xf7/x30 HANGUL SYLLABLE BYAGS
-+<UBC50>     /x83/x30/xf7/x31 HANGUL SYLLABLE BYAN
-+<UBC51>     /x83/x30/xf7/x32 HANGUL SYLLABLE BYANI
-+<UBC52>     /x83/x30/xf7/x33 HANGUL SYLLABLE BYANH
-+<UBC53>     /x83/x30/xf7/x34 HANGUL SYLLABLE BYAD
-+<UBC54>     /x83/x30/xf7/x35 HANGUL SYLLABLE BYAL
-+<UBC55>     /x83/x30/xf7/x36 HANGUL SYLLABLE BYALG
-+<UBC56>     /x83/x30/xf7/x37 HANGUL SYLLABLE BYALM
-+<UBC57>     /x83/x30/xf7/x38 HANGUL SYLLABLE BYALB
-+<UBC58>     /x83/x30/xf7/x39 HANGUL SYLLABLE BYALS
-+<UBC59>     /x83/x30/xf8/x30 HANGUL SYLLABLE BYALT
-+<UBC5A>     /x83/x30/xf8/x31 HANGUL SYLLABLE BYALP
-+<UBC5B>     /x83/x30/xf8/x32 HANGUL SYLLABLE BYALH
-+<UBC5C>     /x83/x30/xf8/x33 HANGUL SYLLABLE BYAM
-+<UBC5D>     /x83/x30/xf8/x34 HANGUL SYLLABLE BYAB
-+<UBC5E>     /x83/x30/xf8/x35 HANGUL SYLLABLE BYABS
-+<UBC5F>     /x83/x30/xf8/x36 HANGUL SYLLABLE BYAS
-+<UBC60>     /x83/x30/xf8/x37 HANGUL SYLLABLE BYASS
-+<UBC61>     /x83/x30/xf8/x38 HANGUL SYLLABLE BYANG
-+<UBC62>     /x83/x30/xf8/x39 HANGUL SYLLABLE BYAJ
-+<UBC63>     /x83/x30/xf9/x30 HANGUL SYLLABLE BYAC
-+<UBC64>     /x83/x30/xf9/x31 HANGUL SYLLABLE BYAK
-+<UBC65>     /x83/x30/xf9/x32 HANGUL SYLLABLE BYAT
-+<UBC66>     /x83/x30/xf9/x33 HANGUL SYLLABLE BYAP
-+<UBC67>     /x83/x30/xf9/x34 HANGUL SYLLABLE BYAH
-+<UBC68>     /x83/x30/xf9/x35 HANGUL SYLLABLE BYAE
-+<UBC69>     /x83/x30/xf9/x36 HANGUL SYLLABLE BYAEG
-+<UBC6A>     /x83/x30/xf9/x37 HANGUL SYLLABLE BYAEGG
-+<UBC6B>     /x83/x30/xf9/x38 HANGUL SYLLABLE BYAEGS
-+<UBC6C>     /x83/x30/xf9/x39 HANGUL SYLLABLE BYAEN
-+<UBC6D>     /x83/x30/xfa/x30 HANGUL SYLLABLE BYAENI
-+<UBC6E>     /x83/x30/xfa/x31 HANGUL SYLLABLE BYAENH
-+<UBC6F>     /x83/x30/xfa/x32 HANGUL SYLLABLE BYAED
-+<UBC70>     /x83/x30/xfa/x33 HANGUL SYLLABLE BYAEL
-+<UBC71>     /x83/x30/xfa/x34 HANGUL SYLLABLE BYAELG
-+<UBC72>     /x83/x30/xfa/x35 HANGUL SYLLABLE BYAELM
-+<UBC73>     /x83/x30/xfa/x36 HANGUL SYLLABLE BYAELB
-+<UBC74>     /x83/x30/xfa/x37 HANGUL SYLLABLE BYAELS
-+<UBC75>     /x83/x30/xfa/x38 HANGUL SYLLABLE BYAELT
-+<UBC76>     /x83/x30/xfa/x39 HANGUL SYLLABLE BYAELP
-+<UBC77>     /x83/x30/xfb/x30 HANGUL SYLLABLE BYAELH
-+<UBC78>     /x83/x30/xfb/x31 HANGUL SYLLABLE BYAEM
-+<UBC79>     /x83/x30/xfb/x32 HANGUL SYLLABLE BYAEB
-+<UBC7A>     /x83/x30/xfb/x33 HANGUL SYLLABLE BYAEBS
-+<UBC7B>     /x83/x30/xfb/x34 HANGUL SYLLABLE BYAES
-+<UBC7C>     /x83/x30/xfb/x35 HANGUL SYLLABLE BYAESS
-+<UBC7D>     /x83/x30/xfb/x36 HANGUL SYLLABLE BYAENG
-+<UBC7E>     /x83/x30/xfb/x37 HANGUL SYLLABLE BYAEJ
-+<UBC7F>     /x83/x30/xfb/x38 HANGUL SYLLABLE BYAEC
-+<UBC80>     /x83/x30/xfb/x39 HANGUL SYLLABLE BYAEK
-+<UBC81>     /x83/x30/xfc/x30 HANGUL SYLLABLE BYAET
-+<UBC82>     /x83/x30/xfc/x31 HANGUL SYLLABLE BYAEP
-+<UBC83>     /x83/x30/xfc/x32 HANGUL SYLLABLE BYAEH
-+<UBC84>     /x83/x30/xfc/x33 HANGUL SYLLABLE BEO
-+<UBC85>     /x83/x30/xfc/x34 HANGUL SYLLABLE BEOG
-+<UBC86>     /x83/x30/xfc/x35 HANGUL SYLLABLE BEOGG
-+<UBC87>     /x83/x30/xfc/x36 HANGUL SYLLABLE BEOGS
-+<UBC88>     /x83/x30/xfc/x37 HANGUL SYLLABLE BEON
-+<UBC89>     /x83/x30/xfc/x38 HANGUL SYLLABLE BEONI
-+<UBC8A>     /x83/x30/xfc/x39 HANGUL SYLLABLE BEONH
-+<UBC8B>     /x83/x30/xfd/x30 HANGUL SYLLABLE BEOD
-+<UBC8C>     /x83/x30/xfd/x31 HANGUL SYLLABLE BEOL
-+<UBC8D>     /x83/x30/xfd/x32 HANGUL SYLLABLE BEOLG
-+<UBC8E>     /x83/x30/xfd/x33 HANGUL SYLLABLE BEOLM
-+<UBC8F>     /x83/x30/xfd/x34 HANGUL SYLLABLE BEOLB
-+<UBC90>     /x83/x30/xfd/x35 HANGUL SYLLABLE BEOLS
-+<UBC91>     /x83/x30/xfd/x36 HANGUL SYLLABLE BEOLT
-+<UBC92>     /x83/x30/xfd/x37 HANGUL SYLLABLE BEOLP
-+<UBC93>     /x83/x30/xfd/x38 HANGUL SYLLABLE BEOLH
-+<UBC94>     /x83/x30/xfd/x39 HANGUL SYLLABLE BEOM
-+<UBC95>     /x83/x30/xfe/x30 HANGUL SYLLABLE BEOB
-+<UBC96>     /x83/x30/xfe/x31 HANGUL SYLLABLE BEOBS
-+<UBC97>     /x83/x30/xfe/x32 HANGUL SYLLABLE BEOS
-+<UBC98>     /x83/x30/xfe/x33 HANGUL SYLLABLE BEOSS
-+<UBC99>     /x83/x30/xfe/x34 HANGUL SYLLABLE BEONG
-+<UBC9A>     /x83/x30/xfe/x35 HANGUL SYLLABLE BEOJ
-+<UBC9B>     /x83/x30/xfe/x36 HANGUL SYLLABLE BEOC
-+<UBC9C>     /x83/x30/xfe/x37 HANGUL SYLLABLE BEOK
-+<UBC9D>     /x83/x30/xfe/x38 HANGUL SYLLABLE BEOT
-+<UBC9E>     /x83/x30/xfe/x39 HANGUL SYLLABLE BEOP
-+<UBC9F>     /x83/x31/x81/x30 HANGUL SYLLABLE BEOH
-+<UBCA0>     /x83/x31/x81/x31 HANGUL SYLLABLE BE
-+<UBCA1>     /x83/x31/x81/x32 HANGUL SYLLABLE BEG
-+<UBCA2>     /x83/x31/x81/x33 HANGUL SYLLABLE BEGG
-+<UBCA3>     /x83/x31/x81/x34 HANGUL SYLLABLE BEGS
-+<UBCA4>     /x83/x31/x81/x35 HANGUL SYLLABLE BEN
-+<UBCA5>     /x83/x31/x81/x36 HANGUL SYLLABLE BENI
-+<UBCA6>     /x83/x31/x81/x37 HANGUL SYLLABLE BENH
-+<UBCA7>     /x83/x31/x81/x38 HANGUL SYLLABLE BED
-+<UBCA8>     /x83/x31/x81/x39 HANGUL SYLLABLE BEL
-+<UBCA9>     /x83/x31/x82/x30 HANGUL SYLLABLE BELG
-+<UBCAA>     /x83/x31/x82/x31 HANGUL SYLLABLE BELM
-+<UBCAB>     /x83/x31/x82/x32 HANGUL SYLLABLE BELB
-+<UBCAC>     /x83/x31/x82/x33 HANGUL SYLLABLE BELS
-+<UBCAD>     /x83/x31/x82/x34 HANGUL SYLLABLE BELT
-+<UBCAE>     /x83/x31/x82/x35 HANGUL SYLLABLE BELP
-+<UBCAF>     /x83/x31/x82/x36 HANGUL SYLLABLE BELH
-+<UBCB0>     /x83/x31/x82/x37 HANGUL SYLLABLE BEM
-+<UBCB1>     /x83/x31/x82/x38 HANGUL SYLLABLE BEB
-+<UBCB2>     /x83/x31/x82/x39 HANGUL SYLLABLE BEBS
-+<UBCB3>     /x83/x31/x83/x30 HANGUL SYLLABLE BES
-+<UBCB4>     /x83/x31/x83/x31 HANGUL SYLLABLE BESS
-+<UBCB5>     /x83/x31/x83/x32 HANGUL SYLLABLE BENG
-+<UBCB6>     /x83/x31/x83/x33 HANGUL SYLLABLE BEJ
-+<UBCB7>     /x83/x31/x83/x34 HANGUL SYLLABLE BEC
-+<UBCB8>     /x83/x31/x83/x35 HANGUL SYLLABLE BEK
-+<UBCB9>     /x83/x31/x83/x36 HANGUL SYLLABLE BET
-+<UBCBA>     /x83/x31/x83/x37 HANGUL SYLLABLE BEP
-+<UBCBB>     /x83/x31/x83/x38 HANGUL SYLLABLE BEH
-+<UBCBC>     /x83/x31/x83/x39 HANGUL SYLLABLE BYEO
-+<UBCBD>     /x83/x31/x84/x30 HANGUL SYLLABLE BYEOG
-+<UBCBE>     /x83/x31/x84/x31 HANGUL SYLLABLE BYEOGG
-+<UBCBF>     /x83/x31/x84/x32 HANGUL SYLLABLE BYEOGS
-+<UBCC0>     /x83/x31/x84/x33 HANGUL SYLLABLE BYEON
-+<UBCC1>     /x83/x31/x84/x34 HANGUL SYLLABLE BYEONI
-+<UBCC2>     /x83/x31/x84/x35 HANGUL SYLLABLE BYEONH
-+<UBCC3>     /x83/x31/x84/x36 HANGUL SYLLABLE BYEOD
-+<UBCC4>     /x83/x31/x84/x37 HANGUL SYLLABLE BYEOL
-+<UBCC5>     /x83/x31/x84/x38 HANGUL SYLLABLE BYEOLG
-+<UBCC6>     /x83/x31/x84/x39 HANGUL SYLLABLE BYEOLM
-+<UBCC7>     /x83/x31/x85/x30 HANGUL SYLLABLE BYEOLB
-+<UBCC8>     /x83/x31/x85/x31 HANGUL SYLLABLE BYEOLS
-+<UBCC9>     /x83/x31/x85/x32 HANGUL SYLLABLE BYEOLT
-+<UBCCA>     /x83/x31/x85/x33 HANGUL SYLLABLE BYEOLP
-+<UBCCB>     /x83/x31/x85/x34 HANGUL SYLLABLE BYEOLH
-+<UBCCC>     /x83/x31/x85/x35 HANGUL SYLLABLE BYEOM
-+<UBCCD>     /x83/x31/x85/x36 HANGUL SYLLABLE BYEOB
-+<UBCCE>     /x83/x31/x85/x37 HANGUL SYLLABLE BYEOBS
-+<UBCCF>     /x83/x31/x85/x38 HANGUL SYLLABLE BYEOS
-+<UBCD0>     /x83/x31/x85/x39 HANGUL SYLLABLE BYEOSS
-+<UBCD1>     /x83/x31/x86/x30 HANGUL SYLLABLE BYEONG
-+<UBCD2>     /x83/x31/x86/x31 HANGUL SYLLABLE BYEOJ
-+<UBCD3>     /x83/x31/x86/x32 HANGUL SYLLABLE BYEOC
-+<UBCD4>     /x83/x31/x86/x33 HANGUL SYLLABLE BYEOK
-+<UBCD5>     /x83/x31/x86/x34 HANGUL SYLLABLE BYEOT
-+<UBCD6>     /x83/x31/x86/x35 HANGUL SYLLABLE BYEOP
-+<UBCD7>     /x83/x31/x86/x36 HANGUL SYLLABLE BYEOH
-+<UBCD8>     /x83/x31/x86/x37 HANGUL SYLLABLE BYE
-+<UBCD9>     /x83/x31/x86/x38 HANGUL SYLLABLE BYEG
-+<UBCDA>     /x83/x31/x86/x39 HANGUL SYLLABLE BYEGG
-+<UBCDB>     /x83/x31/x87/x30 HANGUL SYLLABLE BYEGS
-+<UBCDC>     /x83/x31/x87/x31 HANGUL SYLLABLE BYEN
-+<UBCDD>     /x83/x31/x87/x32 HANGUL SYLLABLE BYENI
-+<UBCDE>     /x83/x31/x87/x33 HANGUL SYLLABLE BYENH
-+<UBCDF>     /x83/x31/x87/x34 HANGUL SYLLABLE BYED
-+<UBCE0>     /x83/x31/x87/x35 HANGUL SYLLABLE BYEL
-+<UBCE1>     /x83/x31/x87/x36 HANGUL SYLLABLE BYELG
-+<UBCE2>     /x83/x31/x87/x37 HANGUL SYLLABLE BYELM
-+<UBCE3>     /x83/x31/x87/x38 HANGUL SYLLABLE BYELB
-+<UBCE4>     /x83/x31/x87/x39 HANGUL SYLLABLE BYELS
-+<UBCE5>     /x83/x31/x88/x30 HANGUL SYLLABLE BYELT
-+<UBCE6>     /x83/x31/x88/x31 HANGUL SYLLABLE BYELP
-+<UBCE7>     /x83/x31/x88/x32 HANGUL SYLLABLE BYELH
-+<UBCE8>     /x83/x31/x88/x33 HANGUL SYLLABLE BYEM
-+<UBCE9>     /x83/x31/x88/x34 HANGUL SYLLABLE BYEB
-+<UBCEA>     /x83/x31/x88/x35 HANGUL SYLLABLE BYEBS
-+<UBCEB>     /x83/x31/x88/x36 HANGUL SYLLABLE BYES
-+<UBCEC>     /x83/x31/x88/x37 HANGUL SYLLABLE BYESS
-+<UBCED>     /x83/x31/x88/x38 HANGUL SYLLABLE BYENG
-+<UBCEE>     /x83/x31/x88/x39 HANGUL SYLLABLE BYEJ
-+<UBCEF>     /x83/x31/x89/x30 HANGUL SYLLABLE BYEC
-+<UBCF0>     /x83/x31/x89/x31 HANGUL SYLLABLE BYEK
-+<UBCF1>     /x83/x31/x89/x32 HANGUL SYLLABLE BYET
-+<UBCF2>     /x83/x31/x89/x33 HANGUL SYLLABLE BYEP
-+<UBCF3>     /x83/x31/x89/x34 HANGUL SYLLABLE BYEH
-+<UBCF4>     /x83/x31/x89/x35 HANGUL SYLLABLE BO
-+<UBCF5>     /x83/x31/x89/x36 HANGUL SYLLABLE BOG
-+<UBCF6>     /x83/x31/x89/x37 HANGUL SYLLABLE BOGG
-+<UBCF7>     /x83/x31/x89/x38 HANGUL SYLLABLE BOGS
-+<UBCF8>     /x83/x31/x89/x39 HANGUL SYLLABLE BON
-+<UBCF9>     /x83/x31/x8a/x30 HANGUL SYLLABLE BONI
-+<UBCFA>     /x83/x31/x8a/x31 HANGUL SYLLABLE BONH
-+<UBCFB>     /x83/x31/x8a/x32 HANGUL SYLLABLE BOD
-+<UBCFC>     /x83/x31/x8a/x33 HANGUL SYLLABLE BOL
-+<UBCFD>     /x83/x31/x8a/x34 HANGUL SYLLABLE BOLG
-+<UBCFE>     /x83/x31/x8a/x35 HANGUL SYLLABLE BOLM
-+<UBCFF>     /x83/x31/x8a/x36 HANGUL SYLLABLE BOLB
-+<UBD00>     /x83/x31/x8a/x37 HANGUL SYLLABLE BOLS
-+<UBD01>     /x83/x31/x8a/x38 HANGUL SYLLABLE BOLT
-+<UBD02>     /x83/x31/x8a/x39 HANGUL SYLLABLE BOLP
-+<UBD03>     /x83/x31/x8b/x30 HANGUL SYLLABLE BOLH
-+<UBD04>     /x83/x31/x8b/x31 HANGUL SYLLABLE BOM
-+<UBD05>     /x83/x31/x8b/x32 HANGUL SYLLABLE BOB
-+<UBD06>     /x83/x31/x8b/x33 HANGUL SYLLABLE BOBS
-+<UBD07>     /x83/x31/x8b/x34 HANGUL SYLLABLE BOS
-+<UBD08>     /x83/x31/x8b/x35 HANGUL SYLLABLE BOSS
-+<UBD09>     /x83/x31/x8b/x36 HANGUL SYLLABLE BONG
-+<UBD0A>     /x83/x31/x8b/x37 HANGUL SYLLABLE BOJ
-+<UBD0B>     /x83/x31/x8b/x38 HANGUL SYLLABLE BOC
-+<UBD0C>     /x83/x31/x8b/x39 HANGUL SYLLABLE BOK
-+<UBD0D>     /x83/x31/x8c/x30 HANGUL SYLLABLE BOT
-+<UBD0E>     /x83/x31/x8c/x31 HANGUL SYLLABLE BOP
-+<UBD0F>     /x83/x31/x8c/x32 HANGUL SYLLABLE BOH
-+<UBD10>     /x83/x31/x8c/x33 HANGUL SYLLABLE BWA
-+<UBD11>     /x83/x31/x8c/x34 HANGUL SYLLABLE BWAG
-+<UBD12>     /x83/x31/x8c/x35 HANGUL SYLLABLE BWAGG
-+<UBD13>     /x83/x31/x8c/x36 HANGUL SYLLABLE BWAGS
-+<UBD14>     /x83/x31/x8c/x37 HANGUL SYLLABLE BWAN
-+<UBD15>     /x83/x31/x8c/x38 HANGUL SYLLABLE BWANI
-+<UBD16>     /x83/x31/x8c/x39 HANGUL SYLLABLE BWANH
-+<UBD17>     /x83/x31/x8d/x30 HANGUL SYLLABLE BWAD
-+<UBD18>     /x83/x31/x8d/x31 HANGUL SYLLABLE BWAL
-+<UBD19>     /x83/x31/x8d/x32 HANGUL SYLLABLE BWALG
-+<UBD1A>     /x83/x31/x8d/x33 HANGUL SYLLABLE BWALM
-+<UBD1B>     /x83/x31/x8d/x34 HANGUL SYLLABLE BWALB
-+<UBD1C>     /x83/x31/x8d/x35 HANGUL SYLLABLE BWALS
-+<UBD1D>     /x83/x31/x8d/x36 HANGUL SYLLABLE BWALT
-+<UBD1E>     /x83/x31/x8d/x37 HANGUL SYLLABLE BWALP
-+<UBD1F>     /x83/x31/x8d/x38 HANGUL SYLLABLE BWALH
-+<UBD20>     /x83/x31/x8d/x39 HANGUL SYLLABLE BWAM
-+<UBD21>     /x83/x31/x8e/x30 HANGUL SYLLABLE BWAB
-+<UBD22>     /x83/x31/x8e/x31 HANGUL SYLLABLE BWABS
-+<UBD23>     /x83/x31/x8e/x32 HANGUL SYLLABLE BWAS
-+<UBD24>     /x83/x31/x8e/x33 HANGUL SYLLABLE BWASS
-+<UBD25>     /x83/x31/x8e/x34 HANGUL SYLLABLE BWANG
-+<UBD26>     /x83/x31/x8e/x35 HANGUL SYLLABLE BWAJ
-+<UBD27>     /x83/x31/x8e/x36 HANGUL SYLLABLE BWAC
-+<UBD28>     /x83/x31/x8e/x37 HANGUL SYLLABLE BWAK
-+<UBD29>     /x83/x31/x8e/x38 HANGUL SYLLABLE BWAT
-+<UBD2A>     /x83/x31/x8e/x39 HANGUL SYLLABLE BWAP
-+<UBD2B>     /x83/x31/x8f/x30 HANGUL SYLLABLE BWAH
-+<UBD2C>     /x83/x31/x8f/x31 HANGUL SYLLABLE BWAE
-+<UBD2D>     /x83/x31/x8f/x32 HANGUL SYLLABLE BWAEG
-+<UBD2E>     /x83/x31/x8f/x33 HANGUL SYLLABLE BWAEGG
-+<UBD2F>     /x83/x31/x8f/x34 HANGUL SYLLABLE BWAEGS
-+<UBD30>     /x83/x31/x8f/x35 HANGUL SYLLABLE BWAEN
-+<UBD31>     /x83/x31/x8f/x36 HANGUL SYLLABLE BWAENI
-+<UBD32>     /x83/x31/x8f/x37 HANGUL SYLLABLE BWAENH
-+<UBD33>     /x83/x31/x8f/x38 HANGUL SYLLABLE BWAED
-+<UBD34>     /x83/x31/x8f/x39 HANGUL SYLLABLE BWAEL
-+<UBD35>     /x83/x31/x90/x30 HANGUL SYLLABLE BWAELG
-+<UBD36>     /x83/x31/x90/x31 HANGUL SYLLABLE BWAELM
-+<UBD37>     /x83/x31/x90/x32 HANGUL SYLLABLE BWAELB
-+<UBD38>     /x83/x31/x90/x33 HANGUL SYLLABLE BWAELS
-+<UBD39>     /x83/x31/x90/x34 HANGUL SYLLABLE BWAELT
-+<UBD3A>     /x83/x31/x90/x35 HANGUL SYLLABLE BWAELP
-+<UBD3B>     /x83/x31/x90/x36 HANGUL SYLLABLE BWAELH
-+<UBD3C>     /x83/x31/x90/x37 HANGUL SYLLABLE BWAEM
-+<UBD3D>     /x83/x31/x90/x38 HANGUL SYLLABLE BWAEB
-+<UBD3E>     /x83/x31/x90/x39 HANGUL SYLLABLE BWAEBS
-+<UBD3F>     /x83/x31/x91/x30 HANGUL SYLLABLE BWAES
-+<UBD40>     /x83/x31/x91/x31 HANGUL SYLLABLE BWAESS
-+<UBD41>     /x83/x31/x91/x32 HANGUL SYLLABLE BWAENG
-+<UBD42>     /x83/x31/x91/x33 HANGUL SYLLABLE BWAEJ
-+<UBD43>     /x83/x31/x91/x34 HANGUL SYLLABLE BWAEC
-+<UBD44>     /x83/x31/x91/x35 HANGUL SYLLABLE BWAEK
-+<UBD45>     /x83/x31/x91/x36 HANGUL SYLLABLE BWAET
-+<UBD46>     /x83/x31/x91/x37 HANGUL SYLLABLE BWAEP
-+<UBD47>     /x83/x31/x91/x38 HANGUL SYLLABLE BWAEH
-+<UBD48>     /x83/x31/x91/x39 HANGUL SYLLABLE BOE
-+<UBD49>     /x83/x31/x92/x30 HANGUL SYLLABLE BOEG
-+<UBD4A>     /x83/x31/x92/x31 HANGUL SYLLABLE BOEGG
-+<UBD4B>     /x83/x31/x92/x32 HANGUL SYLLABLE BOEGS
-+<UBD4C>     /x83/x31/x92/x33 HANGUL SYLLABLE BOEN
-+<UBD4D>     /x83/x31/x92/x34 HANGUL SYLLABLE BOENI
-+<UBD4E>     /x83/x31/x92/x35 HANGUL SYLLABLE BOENH
-+<UBD4F>     /x83/x31/x92/x36 HANGUL SYLLABLE BOED
-+<UBD50>     /x83/x31/x92/x37 HANGUL SYLLABLE BOEL
-+<UBD51>     /x83/x31/x92/x38 HANGUL SYLLABLE BOELG
-+<UBD52>     /x83/x31/x92/x39 HANGUL SYLLABLE BOELM
-+<UBD53>     /x83/x31/x93/x30 HANGUL SYLLABLE BOELB
-+<UBD54>     /x83/x31/x93/x31 HANGUL SYLLABLE BOELS
-+<UBD55>     /x83/x31/x93/x32 HANGUL SYLLABLE BOELT
-+<UBD56>     /x83/x31/x93/x33 HANGUL SYLLABLE BOELP
-+<UBD57>     /x83/x31/x93/x34 HANGUL SYLLABLE BOELH
-+<UBD58>     /x83/x31/x93/x35 HANGUL SYLLABLE BOEM
-+<UBD59>     /x83/x31/x93/x36 HANGUL SYLLABLE BOEB
-+<UBD5A>     /x83/x31/x93/x37 HANGUL SYLLABLE BOEBS
-+<UBD5B>     /x83/x31/x93/x38 HANGUL SYLLABLE BOES
-+<UBD5C>     /x83/x31/x93/x39 HANGUL SYLLABLE BOESS
-+<UBD5D>     /x83/x31/x94/x30 HANGUL SYLLABLE BOENG
-+<UBD5E>     /x83/x31/x94/x31 HANGUL SYLLABLE BOEJ
-+<UBD5F>     /x83/x31/x94/x32 HANGUL SYLLABLE BOEC
-+<UBD60>     /x83/x31/x94/x33 HANGUL SYLLABLE BOEK
-+<UBD61>     /x83/x31/x94/x34 HANGUL SYLLABLE BOET
-+<UBD62>     /x83/x31/x94/x35 HANGUL SYLLABLE BOEP
-+<UBD63>     /x83/x31/x94/x36 HANGUL SYLLABLE BOEH
-+<UBD64>     /x83/x31/x94/x37 HANGUL SYLLABLE BYO
-+<UBD65>     /x83/x31/x94/x38 HANGUL SYLLABLE BYOG
-+<UBD66>     /x83/x31/x94/x39 HANGUL SYLLABLE BYOGG
-+<UBD67>     /x83/x31/x95/x30 HANGUL SYLLABLE BYOGS
-+<UBD68>     /x83/x31/x95/x31 HANGUL SYLLABLE BYON
-+<UBD69>     /x83/x31/x95/x32 HANGUL SYLLABLE BYONI
-+<UBD6A>     /x83/x31/x95/x33 HANGUL SYLLABLE BYONH
-+<UBD6B>     /x83/x31/x95/x34 HANGUL SYLLABLE BYOD
-+<UBD6C>     /x83/x31/x95/x35 HANGUL SYLLABLE BYOL
-+<UBD6D>     /x83/x31/x95/x36 HANGUL SYLLABLE BYOLG
-+<UBD6E>     /x83/x31/x95/x37 HANGUL SYLLABLE BYOLM
-+<UBD6F>     /x83/x31/x95/x38 HANGUL SYLLABLE BYOLB
-+<UBD70>     /x83/x31/x95/x39 HANGUL SYLLABLE BYOLS
-+<UBD71>     /x83/x31/x96/x30 HANGUL SYLLABLE BYOLT
-+<UBD72>     /x83/x31/x96/x31 HANGUL SYLLABLE BYOLP
-+<UBD73>     /x83/x31/x96/x32 HANGUL SYLLABLE BYOLH
-+<UBD74>     /x83/x31/x96/x33 HANGUL SYLLABLE BYOM
-+<UBD75>     /x83/x31/x96/x34 HANGUL SYLLABLE BYOB
-+<UBD76>     /x83/x31/x96/x35 HANGUL SYLLABLE BYOBS
-+<UBD77>     /x83/x31/x96/x36 HANGUL SYLLABLE BYOS
-+<UBD78>     /x83/x31/x96/x37 HANGUL SYLLABLE BYOSS
-+<UBD79>     /x83/x31/x96/x38 HANGUL SYLLABLE BYONG
-+<UBD7A>     /x83/x31/x96/x39 HANGUL SYLLABLE BYOJ
-+<UBD7B>     /x83/x31/x97/x30 HANGUL SYLLABLE BYOC
-+<UBD7C>     /x83/x31/x97/x31 HANGUL SYLLABLE BYOK
-+<UBD7D>     /x83/x31/x97/x32 HANGUL SYLLABLE BYOT
-+<UBD7E>     /x83/x31/x97/x33 HANGUL SYLLABLE BYOP
-+<UBD7F>     /x83/x31/x97/x34 HANGUL SYLLABLE BYOH
-+<UBD80>     /x83/x31/x97/x35 HANGUL SYLLABLE BU
-+<UBD81>     /x83/x31/x97/x36 HANGUL SYLLABLE BUG
-+<UBD82>     /x83/x31/x97/x37 HANGUL SYLLABLE BUGG
-+<UBD83>     /x83/x31/x97/x38 HANGUL SYLLABLE BUGS
-+<UBD84>     /x83/x31/x97/x39 HANGUL SYLLABLE BUN
-+<UBD85>     /x83/x31/x98/x30 HANGUL SYLLABLE BUNI
-+<UBD86>     /x83/x31/x98/x31 HANGUL SYLLABLE BUNH
-+<UBD87>     /x83/x31/x98/x32 HANGUL SYLLABLE BUD
-+<UBD88>     /x83/x31/x98/x33 HANGUL SYLLABLE BUL
-+<UBD89>     /x83/x31/x98/x34 HANGUL SYLLABLE BULG
-+<UBD8A>     /x83/x31/x98/x35 HANGUL SYLLABLE BULM
-+<UBD8B>     /x83/x31/x98/x36 HANGUL SYLLABLE BULB
-+<UBD8C>     /x83/x31/x98/x37 HANGUL SYLLABLE BULS
-+<UBD8D>     /x83/x31/x98/x38 HANGUL SYLLABLE BULT
-+<UBD8E>     /x83/x31/x98/x39 HANGUL SYLLABLE BULP
-+<UBD8F>     /x83/x31/x99/x30 HANGUL SYLLABLE BULH
-+<UBD90>     /x83/x31/x99/x31 HANGUL SYLLABLE BUM
-+<UBD91>     /x83/x31/x99/x32 HANGUL SYLLABLE BUB
-+<UBD92>     /x83/x31/x99/x33 HANGUL SYLLABLE BUBS
-+<UBD93>     /x83/x31/x99/x34 HANGUL SYLLABLE BUS
-+<UBD94>     /x83/x31/x99/x35 HANGUL SYLLABLE BUSS
-+<UBD95>     /x83/x31/x99/x36 HANGUL SYLLABLE BUNG
-+<UBD96>     /x83/x31/x99/x37 HANGUL SYLLABLE BUJ
-+<UBD97>     /x83/x31/x99/x38 HANGUL SYLLABLE BUC
-+<UBD98>     /x83/x31/x99/x39 HANGUL SYLLABLE BUK
-+<UBD99>     /x83/x31/x9a/x30 HANGUL SYLLABLE BUT
-+<UBD9A>     /x83/x31/x9a/x31 HANGUL SYLLABLE BUP
-+<UBD9B>     /x83/x31/x9a/x32 HANGUL SYLLABLE BUH
-+<UBD9C>     /x83/x31/x9a/x33 HANGUL SYLLABLE BWEO
-+<UBD9D>     /x83/x31/x9a/x34 HANGUL SYLLABLE BWEOG
-+<UBD9E>     /x83/x31/x9a/x35 HANGUL SYLLABLE BWEOGG
-+<UBD9F>     /x83/x31/x9a/x36 HANGUL SYLLABLE BWEOGS
-+<UBDA0>     /x83/x31/x9a/x37 HANGUL SYLLABLE BWEON
-+<UBDA1>     /x83/x31/x9a/x38 HANGUL SYLLABLE BWEONI
-+<UBDA2>     /x83/x31/x9a/x39 HANGUL SYLLABLE BWEONH
-+<UBDA3>     /x83/x31/x9b/x30 HANGUL SYLLABLE BWEOD
-+<UBDA4>     /x83/x31/x9b/x31 HANGUL SYLLABLE BWEOL
-+<UBDA5>     /x83/x31/x9b/x32 HANGUL SYLLABLE BWEOLG
-+<UBDA6>     /x83/x31/x9b/x33 HANGUL SYLLABLE BWEOLM
-+<UBDA7>     /x83/x31/x9b/x34 HANGUL SYLLABLE BWEOLB
-+<UBDA8>     /x83/x31/x9b/x35 HANGUL SYLLABLE BWEOLS
-+<UBDA9>     /x83/x31/x9b/x36 HANGUL SYLLABLE BWEOLT
-+<UBDAA>     /x83/x31/x9b/x37 HANGUL SYLLABLE BWEOLP
-+<UBDAB>     /x83/x31/x9b/x38 HANGUL SYLLABLE BWEOLH
-+<UBDAC>     /x83/x31/x9b/x39 HANGUL SYLLABLE BWEOM
-+<UBDAD>     /x83/x31/x9c/x30 HANGUL SYLLABLE BWEOB
-+<UBDAE>     /x83/x31/x9c/x31 HANGUL SYLLABLE BWEOBS
-+<UBDAF>     /x83/x31/x9c/x32 HANGUL SYLLABLE BWEOS
-+<UBDB0>     /x83/x31/x9c/x33 HANGUL SYLLABLE BWEOSS
-+<UBDB1>     /x83/x31/x9c/x34 HANGUL SYLLABLE BWEONG
-+<UBDB2>     /x83/x31/x9c/x35 HANGUL SYLLABLE BWEOJ
-+<UBDB3>     /x83/x31/x9c/x36 HANGUL SYLLABLE BWEOC
-+<UBDB4>     /x83/x31/x9c/x37 HANGUL SYLLABLE BWEOK
-+<UBDB5>     /x83/x31/x9c/x38 HANGUL SYLLABLE BWEOT
-+<UBDB6>     /x83/x31/x9c/x39 HANGUL SYLLABLE BWEOP
-+<UBDB7>     /x83/x31/x9d/x30 HANGUL SYLLABLE BWEOH
-+<UBDB8>     /x83/x31/x9d/x31 HANGUL SYLLABLE BWE
-+<UBDB9>     /x83/x31/x9d/x32 HANGUL SYLLABLE BWEG
-+<UBDBA>     /x83/x31/x9d/x33 HANGUL SYLLABLE BWEGG
-+<UBDBB>     /x83/x31/x9d/x34 HANGUL SYLLABLE BWEGS
-+<UBDBC>     /x83/x31/x9d/x35 HANGUL SYLLABLE BWEN
-+<UBDBD>     /x83/x31/x9d/x36 HANGUL SYLLABLE BWENI
-+<UBDBE>     /x83/x31/x9d/x37 HANGUL SYLLABLE BWENH
-+<UBDBF>     /x83/x31/x9d/x38 HANGUL SYLLABLE BWED
-+<UBDC0>     /x83/x31/x9d/x39 HANGUL SYLLABLE BWEL
-+<UBDC1>     /x83/x31/x9e/x30 HANGUL SYLLABLE BWELG
-+<UBDC2>     /x83/x31/x9e/x31 HANGUL SYLLABLE BWELM
-+<UBDC3>     /x83/x31/x9e/x32 HANGUL SYLLABLE BWELB
-+<UBDC4>     /x83/x31/x9e/x33 HANGUL SYLLABLE BWELS
-+<UBDC5>     /x83/x31/x9e/x34 HANGUL SYLLABLE BWELT
-+<UBDC6>     /x83/x31/x9e/x35 HANGUL SYLLABLE BWELP
-+<UBDC7>     /x83/x31/x9e/x36 HANGUL SYLLABLE BWELH
-+<UBDC8>     /x83/x31/x9e/x37 HANGUL SYLLABLE BWEM
-+<UBDC9>     /x83/x31/x9e/x38 HANGUL SYLLABLE BWEB
-+<UBDCA>     /x83/x31/x9e/x39 HANGUL SYLLABLE BWEBS
-+<UBDCB>     /x83/x31/x9f/x30 HANGUL SYLLABLE BWES
-+<UBDCC>     /x83/x31/x9f/x31 HANGUL SYLLABLE BWESS
-+<UBDCD>     /x83/x31/x9f/x32 HANGUL SYLLABLE BWENG
-+<UBDCE>     /x83/x31/x9f/x33 HANGUL SYLLABLE BWEJ
-+<UBDCF>     /x83/x31/x9f/x34 HANGUL SYLLABLE BWEC
-+<UBDD0>     /x83/x31/x9f/x35 HANGUL SYLLABLE BWEK
-+<UBDD1>     /x83/x31/x9f/x36 HANGUL SYLLABLE BWET
-+<UBDD2>     /x83/x31/x9f/x37 HANGUL SYLLABLE BWEP
-+<UBDD3>     /x83/x31/x9f/x38 HANGUL SYLLABLE BWEH
-+<UBDD4>     /x83/x31/x9f/x39 HANGUL SYLLABLE BWI
-+<UBDD5>     /x83/x31/xa0/x30 HANGUL SYLLABLE BWIG
-+<UBDD6>     /x83/x31/xa0/x31 HANGUL SYLLABLE BWIGG
-+<UBDD7>     /x83/x31/xa0/x32 HANGUL SYLLABLE BWIGS
-+<UBDD8>     /x83/x31/xa0/x33 HANGUL SYLLABLE BWIN
-+<UBDD9>     /x83/x31/xa0/x34 HANGUL SYLLABLE BWINI
-+<UBDDA>     /x83/x31/xa0/x35 HANGUL SYLLABLE BWINH
-+<UBDDB>     /x83/x31/xa0/x36 HANGUL SYLLABLE BWID
-+<UBDDC>     /x83/x31/xa0/x37 HANGUL SYLLABLE BWIL
-+<UBDDD>     /x83/x31/xa0/x38 HANGUL SYLLABLE BWILG
-+<UBDDE>     /x83/x31/xa0/x39 HANGUL SYLLABLE BWILM
-+<UBDDF>     /x83/x31/xa1/x30 HANGUL SYLLABLE BWILB
-+<UBDE0>     /x83/x31/xa1/x31 HANGUL SYLLABLE BWILS
-+<UBDE1>     /x83/x31/xa1/x32 HANGUL SYLLABLE BWILT
-+<UBDE2>     /x83/x31/xa1/x33 HANGUL SYLLABLE BWILP
-+<UBDE3>     /x83/x31/xa1/x34 HANGUL SYLLABLE BWILH
-+<UBDE4>     /x83/x31/xa1/x35 HANGUL SYLLABLE BWIM
-+<UBDE5>     /x83/x31/xa1/x36 HANGUL SYLLABLE BWIB
-+<UBDE6>     /x83/x31/xa1/x37 HANGUL SYLLABLE BWIBS
-+<UBDE7>     /x83/x31/xa1/x38 HANGUL SYLLABLE BWIS
-+<UBDE8>     /x83/x31/xa1/x39 HANGUL SYLLABLE BWISS
-+<UBDE9>     /x83/x31/xa2/x30 HANGUL SYLLABLE BWING
-+<UBDEA>     /x83/x31/xa2/x31 HANGUL SYLLABLE BWIJ
-+<UBDEB>     /x83/x31/xa2/x32 HANGUL SYLLABLE BWIC
-+<UBDEC>     /x83/x31/xa2/x33 HANGUL SYLLABLE BWIK
-+<UBDED>     /x83/x31/xa2/x34 HANGUL SYLLABLE BWIT
-+<UBDEE>     /x83/x31/xa2/x35 HANGUL SYLLABLE BWIP
-+<UBDEF>     /x83/x31/xa2/x36 HANGUL SYLLABLE BWIH
-+<UBDF0>     /x83/x31/xa2/x37 HANGUL SYLLABLE BYU
-+<UBDF1>     /x83/x31/xa2/x38 HANGUL SYLLABLE BYUG
-+<UBDF2>     /x83/x31/xa2/x39 HANGUL SYLLABLE BYUGG
-+<UBDF3>     /x83/x31/xa3/x30 HANGUL SYLLABLE BYUGS
-+<UBDF4>     /x83/x31/xa3/x31 HANGUL SYLLABLE BYUN
-+<UBDF5>     /x83/x31/xa3/x32 HANGUL SYLLABLE BYUNI
-+<UBDF6>     /x83/x31/xa3/x33 HANGUL SYLLABLE BYUNH
-+<UBDF7>     /x83/x31/xa3/x34 HANGUL SYLLABLE BYUD
-+<UBDF8>     /x83/x31/xa3/x35 HANGUL SYLLABLE BYUL
-+<UBDF9>     /x83/x31/xa3/x36 HANGUL SYLLABLE BYULG
-+<UBDFA>     /x83/x31/xa3/x37 HANGUL SYLLABLE BYULM
-+<UBDFB>     /x83/x31/xa3/x38 HANGUL SYLLABLE BYULB
-+<UBDFC>     /x83/x31/xa3/x39 HANGUL SYLLABLE BYULS
-+<UBDFD>     /x83/x31/xa4/x30 HANGUL SYLLABLE BYULT
-+<UBDFE>     /x83/x31/xa4/x31 HANGUL SYLLABLE BYULP
-+<UBDFF>     /x83/x31/xa4/x32 HANGUL SYLLABLE BYULH
-+<UBE00>     /x83/x31/xa4/x33 HANGUL SYLLABLE BYUM
-+<UBE01>     /x83/x31/xa4/x34 HANGUL SYLLABLE BYUB
-+<UBE02>     /x83/x31/xa4/x35 HANGUL SYLLABLE BYUBS
-+<UBE03>     /x83/x31/xa4/x36 HANGUL SYLLABLE BYUS
-+<UBE04>     /x83/x31/xa4/x37 HANGUL SYLLABLE BYUSS
-+<UBE05>     /x83/x31/xa4/x38 HANGUL SYLLABLE BYUNG
-+<UBE06>     /x83/x31/xa4/x39 HANGUL SYLLABLE BYUJ
-+<UBE07>     /x83/x31/xa5/x30 HANGUL SYLLABLE BYUC
-+<UBE08>     /x83/x31/xa5/x31 HANGUL SYLLABLE BYUK
-+<UBE09>     /x83/x31/xa5/x32 HANGUL SYLLABLE BYUT
-+<UBE0A>     /x83/x31/xa5/x33 HANGUL SYLLABLE BYUP
-+<UBE0B>     /x83/x31/xa5/x34 HANGUL SYLLABLE BYUH
-+<UBE0C>     /x83/x31/xa5/x35 HANGUL SYLLABLE BEU
-+<UBE0D>     /x83/x31/xa5/x36 HANGUL SYLLABLE BEUG
-+<UBE0E>     /x83/x31/xa5/x37 HANGUL SYLLABLE BEUGG
-+<UBE0F>     /x83/x31/xa5/x38 HANGUL SYLLABLE BEUGS
-+<UBE10>     /x83/x31/xa5/x39 HANGUL SYLLABLE BEUN
-+<UBE11>     /x83/x31/xa6/x30 HANGUL SYLLABLE BEUNI
-+<UBE12>     /x83/x31/xa6/x31 HANGUL SYLLABLE BEUNH
-+<UBE13>     /x83/x31/xa6/x32 HANGUL SYLLABLE BEUD
-+<UBE14>     /x83/x31/xa6/x33 HANGUL SYLLABLE BEUL
-+<UBE15>     /x83/x31/xa6/x34 HANGUL SYLLABLE BEULG
-+<UBE16>     /x83/x31/xa6/x35 HANGUL SYLLABLE BEULM
-+<UBE17>     /x83/x31/xa6/x36 HANGUL SYLLABLE BEULB
-+<UBE18>     /x83/x31/xa6/x37 HANGUL SYLLABLE BEULS
-+<UBE19>     /x83/x31/xa6/x38 HANGUL SYLLABLE BEULT
-+<UBE1A>     /x83/x31/xa6/x39 HANGUL SYLLABLE BEULP
-+<UBE1B>     /x83/x31/xa7/x30 HANGUL SYLLABLE BEULH
-+<UBE1C>     /x83/x31/xa7/x31 HANGUL SYLLABLE BEUM
-+<UBE1D>     /x83/x31/xa7/x32 HANGUL SYLLABLE BEUB
-+<UBE1E>     /x83/x31/xa7/x33 HANGUL SYLLABLE BEUBS
-+<UBE1F>     /x83/x31/xa7/x34 HANGUL SYLLABLE BEUS
-+<UBE20>     /x83/x31/xa7/x35 HANGUL SYLLABLE BEUSS
-+<UBE21>     /x83/x31/xa7/x36 HANGUL SYLLABLE BEUNG
-+<UBE22>     /x83/x31/xa7/x37 HANGUL SYLLABLE BEUJ
-+<UBE23>     /x83/x31/xa7/x38 HANGUL SYLLABLE BEUC
-+<UBE24>     /x83/x31/xa7/x39 HANGUL SYLLABLE BEUK
-+<UBE25>     /x83/x31/xa8/x30 HANGUL SYLLABLE BEUT
-+<UBE26>     /x83/x31/xa8/x31 HANGUL SYLLABLE BEUP
-+<UBE27>     /x83/x31/xa8/x32 HANGUL SYLLABLE BEUH
-+<UBE28>     /x83/x31/xa8/x33 HANGUL SYLLABLE BYI
-+<UBE29>     /x83/x31/xa8/x34 HANGUL SYLLABLE BYIG
-+<UBE2A>     /x83/x31/xa8/x35 HANGUL SYLLABLE BYIGG
-+<UBE2B>     /x83/x31/xa8/x36 HANGUL SYLLABLE BYIGS
-+<UBE2C>     /x83/x31/xa8/x37 HANGUL SYLLABLE BYIN
-+<UBE2D>     /x83/x31/xa8/x38 HANGUL SYLLABLE BYINI
-+<UBE2E>     /x83/x31/xa8/x39 HANGUL SYLLABLE BYINH
-+<UBE2F>     /x83/x31/xa9/x30 HANGUL SYLLABLE BYID
-+<UBE30>     /x83/x31/xa9/x31 HANGUL SYLLABLE BYIL
-+<UBE31>     /x83/x31/xa9/x32 HANGUL SYLLABLE BYILG
-+<UBE32>     /x83/x31/xa9/x33 HANGUL SYLLABLE BYILM
-+<UBE33>     /x83/x31/xa9/x34 HANGUL SYLLABLE BYILB
-+<UBE34>     /x83/x31/xa9/x35 HANGUL SYLLABLE BYILS
-+<UBE35>     /x83/x31/xa9/x36 HANGUL SYLLABLE BYILT
-+<UBE36>     /x83/x31/xa9/x37 HANGUL SYLLABLE BYILP
-+<UBE37>     /x83/x31/xa9/x38 HANGUL SYLLABLE BYILH
-+<UBE38>     /x83/x31/xa9/x39 HANGUL SYLLABLE BYIM
-+<UBE39>     /x83/x31/xaa/x30 HANGUL SYLLABLE BYIB
-+<UBE3A>     /x83/x31/xaa/x31 HANGUL SYLLABLE BYIBS
-+<UBE3B>     /x83/x31/xaa/x32 HANGUL SYLLABLE BYIS
-+<UBE3C>     /x83/x31/xaa/x33 HANGUL SYLLABLE BYISS
-+<UBE3D>     /x83/x31/xaa/x34 HANGUL SYLLABLE BYING
-+<UBE3E>     /x83/x31/xaa/x35 HANGUL SYLLABLE BYIJ
-+<UBE3F>     /x83/x31/xaa/x36 HANGUL SYLLABLE BYIC
-+<UBE40>     /x83/x31/xaa/x37 HANGUL SYLLABLE BYIK
-+<UBE41>     /x83/x31/xaa/x38 HANGUL SYLLABLE BYIT
-+<UBE42>     /x83/x31/xaa/x39 HANGUL SYLLABLE BYIP
-+<UBE43>     /x83/x31/xab/x30 HANGUL SYLLABLE BYIH
-+<UBE44>     /x83/x31/xab/x31 HANGUL SYLLABLE BI
-+<UBE45>     /x83/x31/xab/x32 HANGUL SYLLABLE BIG
-+<UBE46>     /x83/x31/xab/x33 HANGUL SYLLABLE BIGG
-+<UBE47>     /x83/x31/xab/x34 HANGUL SYLLABLE BIGS
-+<UBE48>     /x83/x31/xab/x35 HANGUL SYLLABLE BIN
-+<UBE49>     /x83/x31/xab/x36 HANGUL SYLLABLE BINI
-+<UBE4A>     /x83/x31/xab/x37 HANGUL SYLLABLE BINH
-+<UBE4B>     /x83/x31/xab/x38 HANGUL SYLLABLE BID
-+<UBE4C>     /x83/x31/xab/x39 HANGUL SYLLABLE BIL
-+<UBE4D>     /x83/x31/xac/x30 HANGUL SYLLABLE BILG
-+<UBE4E>     /x83/x31/xac/x31 HANGUL SYLLABLE BILM
-+<UBE4F>     /x83/x31/xac/x32 HANGUL SYLLABLE BILB
-+<UBE50>     /x83/x31/xac/x33 HANGUL SYLLABLE BILS
-+<UBE51>     /x83/x31/xac/x34 HANGUL SYLLABLE BILT
-+<UBE52>     /x83/x31/xac/x35 HANGUL SYLLABLE BILP
-+<UBE53>     /x83/x31/xac/x36 HANGUL SYLLABLE BILH
-+<UBE54>     /x83/x31/xac/x37 HANGUL SYLLABLE BIM
-+<UBE55>     /x83/x31/xac/x38 HANGUL SYLLABLE BIB
-+<UBE56>     /x83/x31/xac/x39 HANGUL SYLLABLE BIBS
-+<UBE57>     /x83/x31/xad/x30 HANGUL SYLLABLE BIS
-+<UBE58>     /x83/x31/xad/x31 HANGUL SYLLABLE BISS
-+<UBE59>     /x83/x31/xad/x32 HANGUL SYLLABLE BING
-+<UBE5A>     /x83/x31/xad/x33 HANGUL SYLLABLE BIJ
-+<UBE5B>     /x83/x31/xad/x34 HANGUL SYLLABLE BIC
-+<UBE5C>     /x83/x31/xad/x35 HANGUL SYLLABLE BIK
-+<UBE5D>     /x83/x31/xad/x36 HANGUL SYLLABLE BIT
-+<UBE5E>     /x83/x31/xad/x37 HANGUL SYLLABLE BIP
-+<UBE5F>     /x83/x31/xad/x38 HANGUL SYLLABLE BIH
-+<UBE60>     /x83/x31/xad/x39 HANGUL SYLLABLE BBA
-+<UBE61>     /x83/x31/xae/x30 HANGUL SYLLABLE BBAG
-+<UBE62>     /x83/x31/xae/x31 HANGUL SYLLABLE BBAGG
-+<UBE63>     /x83/x31/xae/x32 HANGUL SYLLABLE BBAGS
-+<UBE64>     /x83/x31/xae/x33 HANGUL SYLLABLE BBAN
-+<UBE65>     /x83/x31/xae/x34 HANGUL SYLLABLE BBANI
-+<UBE66>     /x83/x31/xae/x35 HANGUL SYLLABLE BBANH
-+<UBE67>     /x83/x31/xae/x36 HANGUL SYLLABLE BBAD
-+<UBE68>     /x83/x31/xae/x37 HANGUL SYLLABLE BBAL
-+<UBE69>     /x83/x31/xae/x38 HANGUL SYLLABLE BBALG
-+<UBE6A>     /x83/x31/xae/x39 HANGUL SYLLABLE BBALM
-+<UBE6B>     /x83/x31/xaf/x30 HANGUL SYLLABLE BBALB
-+<UBE6C>     /x83/x31/xaf/x31 HANGUL SYLLABLE BBALS
-+<UBE6D>     /x83/x31/xaf/x32 HANGUL SYLLABLE BBALT
-+<UBE6E>     /x83/x31/xaf/x33 HANGUL SYLLABLE BBALP
-+<UBE6F>     /x83/x31/xaf/x34 HANGUL SYLLABLE BBALH
-+<UBE70>     /x83/x31/xaf/x35 HANGUL SYLLABLE BBAM
-+<UBE71>     /x83/x31/xaf/x36 HANGUL SYLLABLE BBAB
-+<UBE72>     /x83/x31/xaf/x37 HANGUL SYLLABLE BBABS
-+<UBE73>     /x83/x31/xaf/x38 HANGUL SYLLABLE BBAS
-+<UBE74>     /x83/x31/xaf/x39 HANGUL SYLLABLE BBASS
-+<UBE75>     /x83/x31/xb0/x30 HANGUL SYLLABLE BBANG
-+<UBE76>     /x83/x31/xb0/x31 HANGUL SYLLABLE BBAJ
-+<UBE77>     /x83/x31/xb0/x32 HANGUL SYLLABLE BBAC
-+<UBE78>     /x83/x31/xb0/x33 HANGUL SYLLABLE BBAK
-+<UBE79>     /x83/x31/xb0/x34 HANGUL SYLLABLE BBAT
-+<UBE7A>     /x83/x31/xb0/x35 HANGUL SYLLABLE BBAP
-+<UBE7B>     /x83/x31/xb0/x36 HANGUL SYLLABLE BBAH
-+<UBE7C>     /x83/x31/xb0/x37 HANGUL SYLLABLE BBAE
-+<UBE7D>     /x83/x31/xb0/x38 HANGUL SYLLABLE BBAEG
-+<UBE7E>     /x83/x31/xb0/x39 HANGUL SYLLABLE BBAEGG
-+<UBE7F>     /x83/x31/xb1/x30 HANGUL SYLLABLE BBAEGS
-+<UBE80>     /x83/x31/xb1/x31 HANGUL SYLLABLE BBAEN
-+<UBE81>     /x83/x31/xb1/x32 HANGUL SYLLABLE BBAENI
-+<UBE82>     /x83/x31/xb1/x33 HANGUL SYLLABLE BBAENH
-+<UBE83>     /x83/x31/xb1/x34 HANGUL SYLLABLE BBAED
-+<UBE84>     /x83/x31/xb1/x35 HANGUL SYLLABLE BBAEL
-+<UBE85>     /x83/x31/xb1/x36 HANGUL SYLLABLE BBAELG
-+<UBE86>     /x83/x31/xb1/x37 HANGUL SYLLABLE BBAELM
-+<UBE87>     /x83/x31/xb1/x38 HANGUL SYLLABLE BBAELB
-+<UBE88>     /x83/x31/xb1/x39 HANGUL SYLLABLE BBAELS
-+<UBE89>     /x83/x31/xb2/x30 HANGUL SYLLABLE BBAELT
-+<UBE8A>     /x83/x31/xb2/x31 HANGUL SYLLABLE BBAELP
-+<UBE8B>     /x83/x31/xb2/x32 HANGUL SYLLABLE BBAELH
-+<UBE8C>     /x83/x31/xb2/x33 HANGUL SYLLABLE BBAEM
-+<UBE8D>     /x83/x31/xb2/x34 HANGUL SYLLABLE BBAEB
-+<UBE8E>     /x83/x31/xb2/x35 HANGUL SYLLABLE BBAEBS
-+<UBE8F>     /x83/x31/xb2/x36 HANGUL SYLLABLE BBAES
-+<UBE90>     /x83/x31/xb2/x37 HANGUL SYLLABLE BBAESS
-+<UBE91>     /x83/x31/xb2/x38 HANGUL SYLLABLE BBAENG
-+<UBE92>     /x83/x31/xb2/x39 HANGUL SYLLABLE BBAEJ
-+<UBE93>     /x83/x31/xb3/x30 HANGUL SYLLABLE BBAEC
-+<UBE94>     /x83/x31/xb3/x31 HANGUL SYLLABLE BBAEK
-+<UBE95>     /x83/x31/xb3/x32 HANGUL SYLLABLE BBAET
-+<UBE96>     /x83/x31/xb3/x33 HANGUL SYLLABLE BBAEP
-+<UBE97>     /x83/x31/xb3/x34 HANGUL SYLLABLE BBAEH
-+<UBE98>     /x83/x31/xb3/x35 HANGUL SYLLABLE BBYA
-+<UBE99>     /x83/x31/xb3/x36 HANGUL SYLLABLE BBYAG
-+<UBE9A>     /x83/x31/xb3/x37 HANGUL SYLLABLE BBYAGG
-+<UBE9B>     /x83/x31/xb3/x38 HANGUL SYLLABLE BBYAGS
-+<UBE9C>     /x83/x31/xb3/x39 HANGUL SYLLABLE BBYAN
-+<UBE9D>     /x83/x31/xb4/x30 HANGUL SYLLABLE BBYANI
-+<UBE9E>     /x83/x31/xb4/x31 HANGUL SYLLABLE BBYANH
-+<UBE9F>     /x83/x31/xb4/x32 HANGUL SYLLABLE BBYAD
-+<UBEA0>     /x83/x31/xb4/x33 HANGUL SYLLABLE BBYAL
-+<UBEA1>     /x83/x31/xb4/x34 HANGUL SYLLABLE BBYALG
-+<UBEA2>     /x83/x31/xb4/x35 HANGUL SYLLABLE BBYALM
-+<UBEA3>     /x83/x31/xb4/x36 HANGUL SYLLABLE BBYALB
-+<UBEA4>     /x83/x31/xb4/x37 HANGUL SYLLABLE BBYALS
-+<UBEA5>     /x83/x31/xb4/x38 HANGUL SYLLABLE BBYALT
-+<UBEA6>     /x83/x31/xb4/x39 HANGUL SYLLABLE BBYALP
-+<UBEA7>     /x83/x31/xb5/x30 HANGUL SYLLABLE BBYALH
-+<UBEA8>     /x83/x31/xb5/x31 HANGUL SYLLABLE BBYAM
-+<UBEA9>     /x83/x31/xb5/x32 HANGUL SYLLABLE BBYAB
-+<UBEAA>     /x83/x31/xb5/x33 HANGUL SYLLABLE BBYABS
-+<UBEAB>     /x83/x31/xb5/x34 HANGUL SYLLABLE BBYAS
-+<UBEAC>     /x83/x31/xb5/x35 HANGUL SYLLABLE BBYASS
-+<UBEAD>     /x83/x31/xb5/x36 HANGUL SYLLABLE BBYANG
-+<UBEAE>     /x83/x31/xb5/x37 HANGUL SYLLABLE BBYAJ
-+<UBEAF>     /x83/x31/xb5/x38 HANGUL SYLLABLE BBYAC
-+<UBEB0>     /x83/x31/xb5/x39 HANGUL SYLLABLE BBYAK
-+<UBEB1>     /x83/x31/xb6/x30 HANGUL SYLLABLE BBYAT
-+<UBEB2>     /x83/x31/xb6/x31 HANGUL SYLLABLE BBYAP
-+<UBEB3>     /x83/x31/xb6/x32 HANGUL SYLLABLE BBYAH
-+<UBEB4>     /x83/x31/xb6/x33 HANGUL SYLLABLE BBYAE
-+<UBEB5>     /x83/x31/xb6/x34 HANGUL SYLLABLE BBYAEG
-+<UBEB6>     /x83/x31/xb6/x35 HANGUL SYLLABLE BBYAEGG
-+<UBEB7>     /x83/x31/xb6/x36 HANGUL SYLLABLE BBYAEGS
-+<UBEB8>     /x83/x31/xb6/x37 HANGUL SYLLABLE BBYAEN
-+<UBEB9>     /x83/x31/xb6/x38 HANGUL SYLLABLE BBYAENI
-+<UBEBA>     /x83/x31/xb6/x39 HANGUL SYLLABLE BBYAENH
-+<UBEBB>     /x83/x31/xb7/x30 HANGUL SYLLABLE BBYAED
-+<UBEBC>     /x83/x31/xb7/x31 HANGUL SYLLABLE BBYAEL
-+<UBEBD>     /x83/x31/xb7/x32 HANGUL SYLLABLE BBYAELG
-+<UBEBE>     /x83/x31/xb7/x33 HANGUL SYLLABLE BBYAELM
-+<UBEBF>     /x83/x31/xb7/x34 HANGUL SYLLABLE BBYAELB
-+<UBEC0>     /x83/x31/xb7/x35 HANGUL SYLLABLE BBYAELS
-+<UBEC1>     /x83/x31/xb7/x36 HANGUL SYLLABLE BBYAELT
-+<UBEC2>     /x83/x31/xb7/x37 HANGUL SYLLABLE BBYAELP
-+<UBEC3>     /x83/x31/xb7/x38 HANGUL SYLLABLE BBYAELH
-+<UBEC4>     /x83/x31/xb7/x39 HANGUL SYLLABLE BBYAEM
-+<UBEC5>     /x83/x31/xb8/x30 HANGUL SYLLABLE BBYAEB
-+<UBEC6>     /x83/x31/xb8/x31 HANGUL SYLLABLE BBYAEBS
-+<UBEC7>     /x83/x31/xb8/x32 HANGUL SYLLABLE BBYAES
-+<UBEC8>     /x83/x31/xb8/x33 HANGUL SYLLABLE BBYAESS
-+<UBEC9>     /x83/x31/xb8/x34 HANGUL SYLLABLE BBYAENG
-+<UBECA>     /x83/x31/xb8/x35 HANGUL SYLLABLE BBYAEJ
-+<UBECB>     /x83/x31/xb8/x36 HANGUL SYLLABLE BBYAEC
-+<UBECC>     /x83/x31/xb8/x37 HANGUL SYLLABLE BBYAEK
-+<UBECD>     /x83/x31/xb8/x38 HANGUL SYLLABLE BBYAET
-+<UBECE>     /x83/x31/xb8/x39 HANGUL SYLLABLE BBYAEP
-+<UBECF>     /x83/x31/xb9/x30 HANGUL SYLLABLE BBYAEH
-+<UBED0>     /x83/x31/xb9/x31 HANGUL SYLLABLE BBEO
-+<UBED1>     /x83/x31/xb9/x32 HANGUL SYLLABLE BBEOG
-+<UBED2>     /x83/x31/xb9/x33 HANGUL SYLLABLE BBEOGG
-+<UBED3>     /x83/x31/xb9/x34 HANGUL SYLLABLE BBEOGS
-+<UBED4>     /x83/x31/xb9/x35 HANGUL SYLLABLE BBEON
-+<UBED5>     /x83/x31/xb9/x36 HANGUL SYLLABLE BBEONI
-+<UBED6>     /x83/x31/xb9/x37 HANGUL SYLLABLE BBEONH
-+<UBED7>     /x83/x31/xb9/x38 HANGUL SYLLABLE BBEOD
-+<UBED8>     /x83/x31/xb9/x39 HANGUL SYLLABLE BBEOL
-+<UBED9>     /x83/x31/xba/x30 HANGUL SYLLABLE BBEOLG
-+<UBEDA>     /x83/x31/xba/x31 HANGUL SYLLABLE BBEOLM
-+<UBEDB>     /x83/x31/xba/x32 HANGUL SYLLABLE BBEOLB
-+<UBEDC>     /x83/x31/xba/x33 HANGUL SYLLABLE BBEOLS
-+<UBEDD>     /x83/x31/xba/x34 HANGUL SYLLABLE BBEOLT
-+<UBEDE>     /x83/x31/xba/x35 HANGUL SYLLABLE BBEOLP
-+<UBEDF>     /x83/x31/xba/x36 HANGUL SYLLABLE BBEOLH
-+<UBEE0>     /x83/x31/xba/x37 HANGUL SYLLABLE BBEOM
-+<UBEE1>     /x83/x31/xba/x38 HANGUL SYLLABLE BBEOB
-+<UBEE2>     /x83/x31/xba/x39 HANGUL SYLLABLE BBEOBS
-+<UBEE3>     /x83/x31/xbb/x30 HANGUL SYLLABLE BBEOS
-+<UBEE4>     /x83/x31/xbb/x31 HANGUL SYLLABLE BBEOSS
-+<UBEE5>     /x83/x31/xbb/x32 HANGUL SYLLABLE BBEONG
-+<UBEE6>     /x83/x31/xbb/x33 HANGUL SYLLABLE BBEOJ
-+<UBEE7>     /x83/x31/xbb/x34 HANGUL SYLLABLE BBEOC
-+<UBEE8>     /x83/x31/xbb/x35 HANGUL SYLLABLE BBEOK
-+<UBEE9>     /x83/x31/xbb/x36 HANGUL SYLLABLE BBEOT
-+<UBEEA>     /x83/x31/xbb/x37 HANGUL SYLLABLE BBEOP
-+<UBEEB>     /x83/x31/xbb/x38 HANGUL SYLLABLE BBEOH
-+<UBEEC>     /x83/x31/xbb/x39 HANGUL SYLLABLE BBE
-+<UBEED>     /x83/x31/xbc/x30 HANGUL SYLLABLE BBEG
-+<UBEEE>     /x83/x31/xbc/x31 HANGUL SYLLABLE BBEGG
-+<UBEEF>     /x83/x31/xbc/x32 HANGUL SYLLABLE BBEGS
-+<UBEF0>     /x83/x31/xbc/x33 HANGUL SYLLABLE BBEN
-+<UBEF1>     /x83/x31/xbc/x34 HANGUL SYLLABLE BBENI
-+<UBEF2>     /x83/x31/xbc/x35 HANGUL SYLLABLE BBENH
-+<UBEF3>     /x83/x31/xbc/x36 HANGUL SYLLABLE BBED
-+<UBEF4>     /x83/x31/xbc/x37 HANGUL SYLLABLE BBEL
-+<UBEF5>     /x83/x31/xbc/x38 HANGUL SYLLABLE BBELG
-+<UBEF6>     /x83/x31/xbc/x39 HANGUL SYLLABLE BBELM
-+<UBEF7>     /x83/x31/xbd/x30 HANGUL SYLLABLE BBELB
-+<UBEF8>     /x83/x31/xbd/x31 HANGUL SYLLABLE BBELS
-+<UBEF9>     /x83/x31/xbd/x32 HANGUL SYLLABLE BBELT
-+<UBEFA>     /x83/x31/xbd/x33 HANGUL SYLLABLE BBELP
-+<UBEFB>     /x83/x31/xbd/x34 HANGUL SYLLABLE BBELH
-+<UBEFC>     /x83/x31/xbd/x35 HANGUL SYLLABLE BBEM
-+<UBEFD>     /x83/x31/xbd/x36 HANGUL SYLLABLE BBEB
-+<UBEFE>     /x83/x31/xbd/x37 HANGUL SYLLABLE BBEBS
-+<UBEFF>     /x83/x31/xbd/x38 HANGUL SYLLABLE BBES
-+<UBF00>     /x83/x31/xbd/x39 HANGUL SYLLABLE BBESS
-+<UBF01>     /x83/x31/xbe/x30 HANGUL SYLLABLE BBENG
-+<UBF02>     /x83/x31/xbe/x31 HANGUL SYLLABLE BBEJ
-+<UBF03>     /x83/x31/xbe/x32 HANGUL SYLLABLE BBEC
-+<UBF04>     /x83/x31/xbe/x33 HANGUL SYLLABLE BBEK
-+<UBF05>     /x83/x31/xbe/x34 HANGUL SYLLABLE BBET
-+<UBF06>     /x83/x31/xbe/x35 HANGUL SYLLABLE BBEP
-+<UBF07>     /x83/x31/xbe/x36 HANGUL SYLLABLE BBEH
-+<UBF08>     /x83/x31/xbe/x37 HANGUL SYLLABLE BBYEO
-+<UBF09>     /x83/x31/xbe/x38 HANGUL SYLLABLE BBYEOG
-+<UBF0A>     /x83/x31/xbe/x39 HANGUL SYLLABLE BBYEOGG
-+<UBF0B>     /x83/x31/xbf/x30 HANGUL SYLLABLE BBYEOGS
-+<UBF0C>     /x83/x31/xbf/x31 HANGUL SYLLABLE BBYEON
-+<UBF0D>     /x83/x31/xbf/x32 HANGUL SYLLABLE BBYEONI
-+<UBF0E>     /x83/x31/xbf/x33 HANGUL SYLLABLE BBYEONH
-+<UBF0F>     /x83/x31/xbf/x34 HANGUL SYLLABLE BBYEOD
-+<UBF10>     /x83/x31/xbf/x35 HANGUL SYLLABLE BBYEOL
-+<UBF11>     /x83/x31/xbf/x36 HANGUL SYLLABLE BBYEOLG
-+<UBF12>     /x83/x31/xbf/x37 HANGUL SYLLABLE BBYEOLM
-+<UBF13>     /x83/x31/xbf/x38 HANGUL SYLLABLE BBYEOLB
-+<UBF14>     /x83/x31/xbf/x39 HANGUL SYLLABLE BBYEOLS
-+<UBF15>     /x83/x31/xc0/x30 HANGUL SYLLABLE BBYEOLT
-+<UBF16>     /x83/x31/xc0/x31 HANGUL SYLLABLE BBYEOLP
-+<UBF17>     /x83/x31/xc0/x32 HANGUL SYLLABLE BBYEOLH
-+<UBF18>     /x83/x31/xc0/x33 HANGUL SYLLABLE BBYEOM
-+<UBF19>     /x83/x31/xc0/x34 HANGUL SYLLABLE BBYEOB
-+<UBF1A>     /x83/x31/xc0/x35 HANGUL SYLLABLE BBYEOBS
-+<UBF1B>     /x83/x31/xc0/x36 HANGUL SYLLABLE BBYEOS
-+<UBF1C>     /x83/x31/xc0/x37 HANGUL SYLLABLE BBYEOSS
-+<UBF1D>     /x83/x31/xc0/x38 HANGUL SYLLABLE BBYEONG
-+<UBF1E>     /x83/x31/xc0/x39 HANGUL SYLLABLE BBYEOJ
-+<UBF1F>     /x83/x31/xc1/x30 HANGUL SYLLABLE BBYEOC
-+<UBF20>     /x83/x31/xc1/x31 HANGUL SYLLABLE BBYEOK
-+<UBF21>     /x83/x31/xc1/x32 HANGUL SYLLABLE BBYEOT
-+<UBF22>     /x83/x31/xc1/x33 HANGUL SYLLABLE BBYEOP
-+<UBF23>     /x83/x31/xc1/x34 HANGUL SYLLABLE BBYEOH
-+<UBF24>     /x83/x31/xc1/x35 HANGUL SYLLABLE BBYE
-+<UBF25>     /x83/x31/xc1/x36 HANGUL SYLLABLE BBYEG
-+<UBF26>     /x83/x31/xc1/x37 HANGUL SYLLABLE BBYEGG
-+<UBF27>     /x83/x31/xc1/x38 HANGUL SYLLABLE BBYEGS
-+<UBF28>     /x83/x31/xc1/x39 HANGUL SYLLABLE BBYEN
-+<UBF29>     /x83/x31/xc2/x30 HANGUL SYLLABLE BBYENI
-+<UBF2A>     /x83/x31/xc2/x31 HANGUL SYLLABLE BBYENH
-+<UBF2B>     /x83/x31/xc2/x32 HANGUL SYLLABLE BBYED
-+<UBF2C>     /x83/x31/xc2/x33 HANGUL SYLLABLE BBYEL
-+<UBF2D>     /x83/x31/xc2/x34 HANGUL SYLLABLE BBYELG
-+<UBF2E>     /x83/x31/xc2/x35 HANGUL SYLLABLE BBYELM
-+<UBF2F>     /x83/x31/xc2/x36 HANGUL SYLLABLE BBYELB
-+<UBF30>     /x83/x31/xc2/x37 HANGUL SYLLABLE BBYELS
-+<UBF31>     /x83/x31/xc2/x38 HANGUL SYLLABLE BBYELT
-+<UBF32>     /x83/x31/xc2/x39 HANGUL SYLLABLE BBYELP
-+<UBF33>     /x83/x31/xc3/x30 HANGUL SYLLABLE BBYELH
-+<UBF34>     /x83/x31/xc3/x31 HANGUL SYLLABLE BBYEM
-+<UBF35>     /x83/x31/xc3/x32 HANGUL SYLLABLE BBYEB
-+<UBF36>     /x83/x31/xc3/x33 HANGUL SYLLABLE BBYEBS
-+<UBF37>     /x83/x31/xc3/x34 HANGUL SYLLABLE BBYES
-+<UBF38>     /x83/x31/xc3/x35 HANGUL SYLLABLE BBYESS
-+<UBF39>     /x83/x31/xc3/x36 HANGUL SYLLABLE BBYENG
-+<UBF3A>     /x83/x31/xc3/x37 HANGUL SYLLABLE BBYEJ
-+<UBF3B>     /x83/x31/xc3/x38 HANGUL SYLLABLE BBYEC
-+<UBF3C>     /x83/x31/xc3/x39 HANGUL SYLLABLE BBYEK
-+<UBF3D>     /x83/x31/xc4/x30 HANGUL SYLLABLE BBYET
-+<UBF3E>     /x83/x31/xc4/x31 HANGUL SYLLABLE BBYEP
-+<UBF3F>     /x83/x31/xc4/x32 HANGUL SYLLABLE BBYEH
-+<UBF40>     /x83/x31/xc4/x33 HANGUL SYLLABLE BBO
-+<UBF41>     /x83/x31/xc4/x34 HANGUL SYLLABLE BBOG
-+<UBF42>     /x83/x31/xc4/x35 HANGUL SYLLABLE BBOGG
-+<UBF43>     /x83/x31/xc4/x36 HANGUL SYLLABLE BBOGS
-+<UBF44>     /x83/x31/xc4/x37 HANGUL SYLLABLE BBON
-+<UBF45>     /x83/x31/xc4/x38 HANGUL SYLLABLE BBONI
-+<UBF46>     /x83/x31/xc4/x39 HANGUL SYLLABLE BBONH
-+<UBF47>     /x83/x31/xc5/x30 HANGUL SYLLABLE BBOD
-+<UBF48>     /x83/x31/xc5/x31 HANGUL SYLLABLE BBOL
-+<UBF49>     /x83/x31/xc5/x32 HANGUL SYLLABLE BBOLG
-+<UBF4A>     /x83/x31/xc5/x33 HANGUL SYLLABLE BBOLM
-+<UBF4B>     /x83/x31/xc5/x34 HANGUL SYLLABLE BBOLB
-+<UBF4C>     /x83/x31/xc5/x35 HANGUL SYLLABLE BBOLS
-+<UBF4D>     /x83/x31/xc5/x36 HANGUL SYLLABLE BBOLT
-+<UBF4E>     /x83/x31/xc5/x37 HANGUL SYLLABLE BBOLP
-+<UBF4F>     /x83/x31/xc5/x38 HANGUL SYLLABLE BBOLH
-+<UBF50>     /x83/x31/xc5/x39 HANGUL SYLLABLE BBOM
-+<UBF51>     /x83/x31/xc6/x30 HANGUL SYLLABLE BBOB
-+<UBF52>     /x83/x31/xc6/x31 HANGUL SYLLABLE BBOBS
-+<UBF53>     /x83/x31/xc6/x32 HANGUL SYLLABLE BBOS
-+<UBF54>     /x83/x31/xc6/x33 HANGUL SYLLABLE BBOSS
-+<UBF55>     /x83/x31/xc6/x34 HANGUL SYLLABLE BBONG
-+<UBF56>     /x83/x31/xc6/x35 HANGUL SYLLABLE BBOJ
-+<UBF57>     /x83/x31/xc6/x36 HANGUL SYLLABLE BBOC
-+<UBF58>     /x83/x31/xc6/x37 HANGUL SYLLABLE BBOK
-+<UBF59>     /x83/x31/xc6/x38 HANGUL SYLLABLE BBOT
-+<UBF5A>     /x83/x31/xc6/x39 HANGUL SYLLABLE BBOP
-+<UBF5B>     /x83/x31/xc7/x30 HANGUL SYLLABLE BBOH
-+<UBF5C>     /x83/x31/xc7/x31 HANGUL SYLLABLE BBWA
-+<UBF5D>     /x83/x31/xc7/x32 HANGUL SYLLABLE BBWAG
-+<UBF5E>     /x83/x31/xc7/x33 HANGUL SYLLABLE BBWAGG
-+<UBF5F>     /x83/x31/xc7/x34 HANGUL SYLLABLE BBWAGS
-+<UBF60>     /x83/x31/xc7/x35 HANGUL SYLLABLE BBWAN
-+<UBF61>     /x83/x31/xc7/x36 HANGUL SYLLABLE BBWANI
-+<UBF62>     /x83/x31/xc7/x37 HANGUL SYLLABLE BBWANH
-+<UBF63>     /x83/x31/xc7/x38 HANGUL SYLLABLE BBWAD
-+<UBF64>     /x83/x31/xc7/x39 HANGUL SYLLABLE BBWAL
-+<UBF65>     /x83/x31/xc8/x30 HANGUL SYLLABLE BBWALG
-+<UBF66>     /x83/x31/xc8/x31 HANGUL SYLLABLE BBWALM
-+<UBF67>     /x83/x31/xc8/x32 HANGUL SYLLABLE BBWALB
-+<UBF68>     /x83/x31/xc8/x33 HANGUL SYLLABLE BBWALS
-+<UBF69>     /x83/x31/xc8/x34 HANGUL SYLLABLE BBWALT
-+<UBF6A>     /x83/x31/xc8/x35 HANGUL SYLLABLE BBWALP
-+<UBF6B>     /x83/x31/xc8/x36 HANGUL SYLLABLE BBWALH
-+<UBF6C>     /x83/x31/xc8/x37 HANGUL SYLLABLE BBWAM
-+<UBF6D>     /x83/x31/xc8/x38 HANGUL SYLLABLE BBWAB
-+<UBF6E>     /x83/x31/xc8/x39 HANGUL SYLLABLE BBWABS
-+<UBF6F>     /x83/x31/xc9/x30 HANGUL SYLLABLE BBWAS
-+<UBF70>     /x83/x31/xc9/x31 HANGUL SYLLABLE BBWASS
-+<UBF71>     /x83/x31/xc9/x32 HANGUL SYLLABLE BBWANG
-+<UBF72>     /x83/x31/xc9/x33 HANGUL SYLLABLE BBWAJ
-+<UBF73>     /x83/x31/xc9/x34 HANGUL SYLLABLE BBWAC
-+<UBF74>     /x83/x31/xc9/x35 HANGUL SYLLABLE BBWAK
-+<UBF75>     /x83/x31/xc9/x36 HANGUL SYLLABLE BBWAT
-+<UBF76>     /x83/x31/xc9/x37 HANGUL SYLLABLE BBWAP
-+<UBF77>     /x83/x31/xc9/x38 HANGUL SYLLABLE BBWAH
-+<UBF78>     /x83/x31/xc9/x39 HANGUL SYLLABLE BBWAE
-+<UBF79>     /x83/x31/xca/x30 HANGUL SYLLABLE BBWAEG
-+<UBF7A>     /x83/x31/xca/x31 HANGUL SYLLABLE BBWAEGG
-+<UBF7B>     /x83/x31/xca/x32 HANGUL SYLLABLE BBWAEGS
-+<UBF7C>     /x83/x31/xca/x33 HANGUL SYLLABLE BBWAEN
-+<UBF7D>     /x83/x31/xca/x34 HANGUL SYLLABLE BBWAENI
-+<UBF7E>     /x83/x31/xca/x35 HANGUL SYLLABLE BBWAENH
-+<UBF7F>     /x83/x31/xca/x36 HANGUL SYLLABLE BBWAED
-+<UBF80>     /x83/x31/xca/x37 HANGUL SYLLABLE BBWAEL
-+<UBF81>     /x83/x31/xca/x38 HANGUL SYLLABLE BBWAELG
-+<UBF82>     /x83/x31/xca/x39 HANGUL SYLLABLE BBWAELM
-+<UBF83>     /x83/x31/xcb/x30 HANGUL SYLLABLE BBWAELB
-+<UBF84>     /x83/x31/xcb/x31 HANGUL SYLLABLE BBWAELS
-+<UBF85>     /x83/x31/xcb/x32 HANGUL SYLLABLE BBWAELT
-+<UBF86>     /x83/x31/xcb/x33 HANGUL SYLLABLE BBWAELP
-+<UBF87>     /x83/x31/xcb/x34 HANGUL SYLLABLE BBWAELH
-+<UBF88>     /x83/x31/xcb/x35 HANGUL SYLLABLE BBWAEM
-+<UBF89>     /x83/x31/xcb/x36 HANGUL SYLLABLE BBWAEB
-+<UBF8A>     /x83/x31/xcb/x37 HANGUL SYLLABLE BBWAEBS
-+<UBF8B>     /x83/x31/xcb/x38 HANGUL SYLLABLE BBWAES
-+<UBF8C>     /x83/x31/xcb/x39 HANGUL SYLLABLE BBWAESS
-+<UBF8D>     /x83/x31/xcc/x30 HANGUL SYLLABLE BBWAENG
-+<UBF8E>     /x83/x31/xcc/x31 HANGUL SYLLABLE BBWAEJ
-+<UBF8F>     /x83/x31/xcc/x32 HANGUL SYLLABLE BBWAEC
-+<UBF90>     /x83/x31/xcc/x33 HANGUL SYLLABLE BBWAEK
-+<UBF91>     /x83/x31/xcc/x34 HANGUL SYLLABLE BBWAET
-+<UBF92>     /x83/x31/xcc/x35 HANGUL SYLLABLE BBWAEP
-+<UBF93>     /x83/x31/xcc/x36 HANGUL SYLLABLE BBWAEH
-+<UBF94>     /x83/x31/xcc/x37 HANGUL SYLLABLE BBOE
-+<UBF95>     /x83/x31/xcc/x38 HANGUL SYLLABLE BBOEG
-+<UBF96>     /x83/x31/xcc/x39 HANGUL SYLLABLE BBOEGG
-+<UBF97>     /x83/x31/xcd/x30 HANGUL SYLLABLE BBOEGS
-+<UBF98>     /x83/x31/xcd/x31 HANGUL SYLLABLE BBOEN
-+<UBF99>     /x83/x31/xcd/x32 HANGUL SYLLABLE BBOENI
-+<UBF9A>     /x83/x31/xcd/x33 HANGUL SYLLABLE BBOENH
-+<UBF9B>     /x83/x31/xcd/x34 HANGUL SYLLABLE BBOED
-+<UBF9C>     /x83/x31/xcd/x35 HANGUL SYLLABLE BBOEL
-+<UBF9D>     /x83/x31/xcd/x36 HANGUL SYLLABLE BBOELG
-+<UBF9E>     /x83/x31/xcd/x37 HANGUL SYLLABLE BBOELM
-+<UBF9F>     /x83/x31/xcd/x38 HANGUL SYLLABLE BBOELB
-+<UBFA0>     /x83/x31/xcd/x39 HANGUL SYLLABLE BBOELS
-+<UBFA1>     /x83/x31/xce/x30 HANGUL SYLLABLE BBOELT
-+<UBFA2>     /x83/x31/xce/x31 HANGUL SYLLABLE BBOELP
-+<UBFA3>     /x83/x31/xce/x32 HANGUL SYLLABLE BBOELH
-+<UBFA4>     /x83/x31/xce/x33 HANGUL SYLLABLE BBOEM
-+<UBFA5>     /x83/x31/xce/x34 HANGUL SYLLABLE BBOEB
-+<UBFA6>     /x83/x31/xce/x35 HANGUL SYLLABLE BBOEBS
-+<UBFA7>     /x83/x31/xce/x36 HANGUL SYLLABLE BBOES
-+<UBFA8>     /x83/x31/xce/x37 HANGUL SYLLABLE BBOESS
-+<UBFA9>     /x83/x31/xce/x38 HANGUL SYLLABLE BBOENG
-+<UBFAA>     /x83/x31/xce/x39 HANGUL SYLLABLE BBOEJ
-+<UBFAB>     /x83/x31/xcf/x30 HANGUL SYLLABLE BBOEC
-+<UBFAC>     /x83/x31/xcf/x31 HANGUL SYLLABLE BBOEK
-+<UBFAD>     /x83/x31/xcf/x32 HANGUL SYLLABLE BBOET
-+<UBFAE>     /x83/x31/xcf/x33 HANGUL SYLLABLE BBOEP
-+<UBFAF>     /x83/x31/xcf/x34 HANGUL SYLLABLE BBOEH
-+<UBFB0>     /x83/x31/xcf/x35 HANGUL SYLLABLE BBYO
-+<UBFB1>     /x83/x31/xcf/x36 HANGUL SYLLABLE BBYOG
-+<UBFB2>     /x83/x31/xcf/x37 HANGUL SYLLABLE BBYOGG
-+<UBFB3>     /x83/x31/xcf/x38 HANGUL SYLLABLE BBYOGS
-+<UBFB4>     /x83/x31/xcf/x39 HANGUL SYLLABLE BBYON
-+<UBFB5>     /x83/x31/xd0/x30 HANGUL SYLLABLE BBYONI
-+<UBFB6>     /x83/x31/xd0/x31 HANGUL SYLLABLE BBYONH
-+<UBFB7>     /x83/x31/xd0/x32 HANGUL SYLLABLE BBYOD
-+<UBFB8>     /x83/x31/xd0/x33 HANGUL SYLLABLE BBYOL
-+<UBFB9>     /x83/x31/xd0/x34 HANGUL SYLLABLE BBYOLG
-+<UBFBA>     /x83/x31/xd0/x35 HANGUL SYLLABLE BBYOLM
-+<UBFBB>     /x83/x31/xd0/x36 HANGUL SYLLABLE BBYOLB
-+<UBFBC>     /x83/x31/xd0/x37 HANGUL SYLLABLE BBYOLS
-+<UBFBD>     /x83/x31/xd0/x38 HANGUL SYLLABLE BBYOLT
-+<UBFBE>     /x83/x31/xd0/x39 HANGUL SYLLABLE BBYOLP
-+<UBFBF>     /x83/x31/xd1/x30 HANGUL SYLLABLE BBYOLH
-+<UBFC0>     /x83/x31/xd1/x31 HANGUL SYLLABLE BBYOM
-+<UBFC1>     /x83/x31/xd1/x32 HANGUL SYLLABLE BBYOB
-+<UBFC2>     /x83/x31/xd1/x33 HANGUL SYLLABLE BBYOBS
-+<UBFC3>     /x83/x31/xd1/x34 HANGUL SYLLABLE BBYOS
-+<UBFC4>     /x83/x31/xd1/x35 HANGUL SYLLABLE BBYOSS
-+<UBFC5>     /x83/x31/xd1/x36 HANGUL SYLLABLE BBYONG
-+<UBFC6>     /x83/x31/xd1/x37 HANGUL SYLLABLE BBYOJ
-+<UBFC7>     /x83/x31/xd1/x38 HANGUL SYLLABLE BBYOC
-+<UBFC8>     /x83/x31/xd1/x39 HANGUL SYLLABLE BBYOK
-+<UBFC9>     /x83/x31/xd2/x30 HANGUL SYLLABLE BBYOT
-+<UBFCA>     /x83/x31/xd2/x31 HANGUL SYLLABLE BBYOP
-+<UBFCB>     /x83/x31/xd2/x32 HANGUL SYLLABLE BBYOH
-+<UBFCC>     /x83/x31/xd2/x33 HANGUL SYLLABLE BBU
-+<UBFCD>     /x83/x31/xd2/x34 HANGUL SYLLABLE BBUG
-+<UBFCE>     /x83/x31/xd2/x35 HANGUL SYLLABLE BBUGG
-+<UBFCF>     /x83/x31/xd2/x36 HANGUL SYLLABLE BBUGS
-+<UBFD0>     /x83/x31/xd2/x37 HANGUL SYLLABLE BBUN
-+<UBFD1>     /x83/x31/xd2/x38 HANGUL SYLLABLE BBUNI
-+<UBFD2>     /x83/x31/xd2/x39 HANGUL SYLLABLE BBUNH
-+<UBFD3>     /x83/x31/xd3/x30 HANGUL SYLLABLE BBUD
-+<UBFD4>     /x83/x31/xd3/x31 HANGUL SYLLABLE BBUL
-+<UBFD5>     /x83/x31/xd3/x32 HANGUL SYLLABLE BBULG
-+<UBFD6>     /x83/x31/xd3/x33 HANGUL SYLLABLE BBULM
-+<UBFD7>     /x83/x31/xd3/x34 HANGUL SYLLABLE BBULB
-+<UBFD8>     /x83/x31/xd3/x35 HANGUL SYLLABLE BBULS
-+<UBFD9>     /x83/x31/xd3/x36 HANGUL SYLLABLE BBULT
-+<UBFDA>     /x83/x31/xd3/x37 HANGUL SYLLABLE BBULP
-+<UBFDB>     /x83/x31/xd3/x38 HANGUL SYLLABLE BBULH
-+<UBFDC>     /x83/x31/xd3/x39 HANGUL SYLLABLE BBUM
-+<UBFDD>     /x83/x31/xd4/x30 HANGUL SYLLABLE BBUB
-+<UBFDE>     /x83/x31/xd4/x31 HANGUL SYLLABLE BBUBS
-+<UBFDF>     /x83/x31/xd4/x32 HANGUL SYLLABLE BBUS
-+<UBFE0>     /x83/x31/xd4/x33 HANGUL SYLLABLE BBUSS
-+<UBFE1>     /x83/x31/xd4/x34 HANGUL SYLLABLE BBUNG
-+<UBFE2>     /x83/x31/xd4/x35 HANGUL SYLLABLE BBUJ
-+<UBFE3>     /x83/x31/xd4/x36 HANGUL SYLLABLE BBUC
-+<UBFE4>     /x83/x31/xd4/x37 HANGUL SYLLABLE BBUK
-+<UBFE5>     /x83/x31/xd4/x38 HANGUL SYLLABLE BBUT
-+<UBFE6>     /x83/x31/xd4/x39 HANGUL SYLLABLE BBUP
-+<UBFE7>     /x83/x31/xd5/x30 HANGUL SYLLABLE BBUH
-+<UBFE8>     /x83/x31/xd5/x31 HANGUL SYLLABLE BBWEO
-+<UBFE9>     /x83/x31/xd5/x32 HANGUL SYLLABLE BBWEOG
-+<UBFEA>     /x83/x31/xd5/x33 HANGUL SYLLABLE BBWEOGG
-+<UBFEB>     /x83/x31/xd5/x34 HANGUL SYLLABLE BBWEOGS
-+<UBFEC>     /x83/x31/xd5/x35 HANGUL SYLLABLE BBWEON
-+<UBFED>     /x83/x31/xd5/x36 HANGUL SYLLABLE BBWEONI
-+<UBFEE>     /x83/x31/xd5/x37 HANGUL SYLLABLE BBWEONH
-+<UBFEF>     /x83/x31/xd5/x38 HANGUL SYLLABLE BBWEOD
-+<UBFF0>     /x83/x31/xd5/x39 HANGUL SYLLABLE BBWEOL
-+<UBFF1>     /x83/x31/xd6/x30 HANGUL SYLLABLE BBWEOLG
-+<UBFF2>     /x83/x31/xd6/x31 HANGUL SYLLABLE BBWEOLM
-+<UBFF3>     /x83/x31/xd6/x32 HANGUL SYLLABLE BBWEOLB
-+<UBFF4>     /x83/x31/xd6/x33 HANGUL SYLLABLE BBWEOLS
-+<UBFF5>     /x83/x31/xd6/x34 HANGUL SYLLABLE BBWEOLT
-+<UBFF6>     /x83/x31/xd6/x35 HANGUL SYLLABLE BBWEOLP
-+<UBFF7>     /x83/x31/xd6/x36 HANGUL SYLLABLE BBWEOLH
-+<UBFF8>     /x83/x31/xd6/x37 HANGUL SYLLABLE BBWEOM
-+<UBFF9>     /x83/x31/xd6/x38 HANGUL SYLLABLE BBWEOB
-+<UBFFA>     /x83/x31/xd6/x39 HANGUL SYLLABLE BBWEOBS
-+<UBFFB>     /x83/x31/xd7/x30 HANGUL SYLLABLE BBWEOS
-+<UBFFC>     /x83/x31/xd7/x31 HANGUL SYLLABLE BBWEOSS
-+<UBFFD>     /x83/x31/xd7/x32 HANGUL SYLLABLE BBWEONG
-+<UBFFE>     /x83/x31/xd7/x33 HANGUL SYLLABLE BBWEOJ
-+<UBFFF>     /x83/x31/xd7/x34 HANGUL SYLLABLE BBWEOC
-+<UC000>     /x83/x31/xd7/x35 HANGUL SYLLABLE BBWEOK
-+<UC001>     /x83/x31/xd7/x36 HANGUL SYLLABLE BBWEOT
-+<UC002>     /x83/x31/xd7/x37 HANGUL SYLLABLE BBWEOP
-+<UC003>     /x83/x31/xd7/x38 HANGUL SYLLABLE BBWEOH
-+<UC004>     /x83/x31/xd7/x39 HANGUL SYLLABLE BBWE
-+<UC005>     /x83/x31/xd8/x30 HANGUL SYLLABLE BBWEG
-+<UC006>     /x83/x31/xd8/x31 HANGUL SYLLABLE BBWEGG
-+<UC007>     /x83/x31/xd8/x32 HANGUL SYLLABLE BBWEGS
-+<UC008>     /x83/x31/xd8/x33 HANGUL SYLLABLE BBWEN
-+<UC009>     /x83/x31/xd8/x34 HANGUL SYLLABLE BBWENI
-+<UC00A>     /x83/x31/xd8/x35 HANGUL SYLLABLE BBWENH
-+<UC00B>     /x83/x31/xd8/x36 HANGUL SYLLABLE BBWED
-+<UC00C>     /x83/x31/xd8/x37 HANGUL SYLLABLE BBWEL
-+<UC00D>     /x83/x31/xd8/x38 HANGUL SYLLABLE BBWELG
-+<UC00E>     /x83/x31/xd8/x39 HANGUL SYLLABLE BBWELM
-+<UC00F>     /x83/x31/xd9/x30 HANGUL SYLLABLE BBWELB
-+<UC010>     /x83/x31/xd9/x31 HANGUL SYLLABLE BBWELS
-+<UC011>     /x83/x31/xd9/x32 HANGUL SYLLABLE BBWELT
-+<UC012>     /x83/x31/xd9/x33 HANGUL SYLLABLE BBWELP
-+<UC013>     /x83/x31/xd9/x34 HANGUL SYLLABLE BBWELH
-+<UC014>     /x83/x31/xd9/x35 HANGUL SYLLABLE BBWEM
-+<UC015>     /x83/x31/xd9/x36 HANGUL SYLLABLE BBWEB
-+<UC016>     /x83/x31/xd9/x37 HANGUL SYLLABLE BBWEBS
-+<UC017>     /x83/x31/xd9/x38 HANGUL SYLLABLE BBWES
-+<UC018>     /x83/x31/xd9/x39 HANGUL SYLLABLE BBWESS
-+<UC019>     /x83/x31/xda/x30 HANGUL SYLLABLE BBWENG
-+<UC01A>     /x83/x31/xda/x31 HANGUL SYLLABLE BBWEJ
-+<UC01B>     /x83/x31/xda/x32 HANGUL SYLLABLE BBWEC
-+<UC01C>     /x83/x31/xda/x33 HANGUL SYLLABLE BBWEK
-+<UC01D>     /x83/x31/xda/x34 HANGUL SYLLABLE BBWET
-+<UC01E>     /x83/x31/xda/x35 HANGUL SYLLABLE BBWEP
-+<UC01F>     /x83/x31/xda/x36 HANGUL SYLLABLE BBWEH
-+<UC020>     /x83/x31/xda/x37 HANGUL SYLLABLE BBWI
-+<UC021>     /x83/x31/xda/x38 HANGUL SYLLABLE BBWIG
-+<UC022>     /x83/x31/xda/x39 HANGUL SYLLABLE BBWIGG
-+<UC023>     /x83/x31/xdb/x30 HANGUL SYLLABLE BBWIGS
-+<UC024>     /x83/x31/xdb/x31 HANGUL SYLLABLE BBWIN
-+<UC025>     /x83/x31/xdb/x32 HANGUL SYLLABLE BBWINI
-+<UC026>     /x83/x31/xdb/x33 HANGUL SYLLABLE BBWINH
-+<UC027>     /x83/x31/xdb/x34 HANGUL SYLLABLE BBWID
-+<UC028>     /x83/x31/xdb/x35 HANGUL SYLLABLE BBWIL
-+<UC029>     /x83/x31/xdb/x36 HANGUL SYLLABLE BBWILG
-+<UC02A>     /x83/x31/xdb/x37 HANGUL SYLLABLE BBWILM
-+<UC02B>     /x83/x31/xdb/x38 HANGUL SYLLABLE BBWILB
-+<UC02C>     /x83/x31/xdb/x39 HANGUL SYLLABLE BBWILS
-+<UC02D>     /x83/x31/xdc/x30 HANGUL SYLLABLE BBWILT
-+<UC02E>     /x83/x31/xdc/x31 HANGUL SYLLABLE BBWILP
-+<UC02F>     /x83/x31/xdc/x32 HANGUL SYLLABLE BBWILH
-+<UC030>     /x83/x31/xdc/x33 HANGUL SYLLABLE BBWIM
-+<UC031>     /x83/x31/xdc/x34 HANGUL SYLLABLE BBWIB
-+<UC032>     /x83/x31/xdc/x35 HANGUL SYLLABLE BBWIBS
-+<UC033>     /x83/x31/xdc/x36 HANGUL SYLLABLE BBWIS
-+<UC034>     /x83/x31/xdc/x37 HANGUL SYLLABLE BBWISS
-+<UC035>     /x83/x31/xdc/x38 HANGUL SYLLABLE BBWING
-+<UC036>     /x83/x31/xdc/x39 HANGUL SYLLABLE BBWIJ
-+<UC037>     /x83/x31/xdd/x30 HANGUL SYLLABLE BBWIC
-+<UC038>     /x83/x31/xdd/x31 HANGUL SYLLABLE BBWIK
-+<UC039>     /x83/x31/xdd/x32 HANGUL SYLLABLE BBWIT
-+<UC03A>     /x83/x31/xdd/x33 HANGUL SYLLABLE BBWIP
-+<UC03B>     /x83/x31/xdd/x34 HANGUL SYLLABLE BBWIH
-+<UC03C>     /x83/x31/xdd/x35 HANGUL SYLLABLE BBYU
-+<UC03D>     /x83/x31/xdd/x36 HANGUL SYLLABLE BBYUG
-+<UC03E>     /x83/x31/xdd/x37 HANGUL SYLLABLE BBYUGG
-+<UC03F>     /x83/x31/xdd/x38 HANGUL SYLLABLE BBYUGS
-+<UC040>     /x83/x31/xdd/x39 HANGUL SYLLABLE BBYUN
-+<UC041>     /x83/x31/xde/x30 HANGUL SYLLABLE BBYUNI
-+<UC042>     /x83/x31/xde/x31 HANGUL SYLLABLE BBYUNH
-+<UC043>     /x83/x31/xde/x32 HANGUL SYLLABLE BBYUD
-+<UC044>     /x83/x31/xde/x33 HANGUL SYLLABLE BBYUL
-+<UC045>     /x83/x31/xde/x34 HANGUL SYLLABLE BBYULG
-+<UC046>     /x83/x31/xde/x35 HANGUL SYLLABLE BBYULM
-+<UC047>     /x83/x31/xde/x36 HANGUL SYLLABLE BBYULB
-+<UC048>     /x83/x31/xde/x37 HANGUL SYLLABLE BBYULS
-+<UC049>     /x83/x31/xde/x38 HANGUL SYLLABLE BBYULT
-+<UC04A>     /x83/x31/xde/x39 HANGUL SYLLABLE BBYULP
-+<UC04B>     /x83/x31/xdf/x30 HANGUL SYLLABLE BBYULH
-+<UC04C>     /x83/x31/xdf/x31 HANGUL SYLLABLE BBYUM
-+<UC04D>     /x83/x31/xdf/x32 HANGUL SYLLABLE BBYUB
-+<UC04E>     /x83/x31/xdf/x33 HANGUL SYLLABLE BBYUBS
-+<UC04F>     /x83/x31/xdf/x34 HANGUL SYLLABLE BBYUS
-+<UC050>     /x83/x31/xdf/x35 HANGUL SYLLABLE BBYUSS
-+<UC051>     /x83/x31/xdf/x36 HANGUL SYLLABLE BBYUNG
-+<UC052>     /x83/x31/xdf/x37 HANGUL SYLLABLE BBYUJ
-+<UC053>     /x83/x31/xdf/x38 HANGUL SYLLABLE BBYUC
-+<UC054>     /x83/x31/xdf/x39 HANGUL SYLLABLE BBYUK
-+<UC055>     /x83/x31/xe0/x30 HANGUL SYLLABLE BBYUT
-+<UC056>     /x83/x31/xe0/x31 HANGUL SYLLABLE BBYUP
-+<UC057>     /x83/x31/xe0/x32 HANGUL SYLLABLE BBYUH
-+<UC058>     /x83/x31/xe0/x33 HANGUL SYLLABLE BBEU
-+<UC059>     /x83/x31/xe0/x34 HANGUL SYLLABLE BBEUG
-+<UC05A>     /x83/x31/xe0/x35 HANGUL SYLLABLE BBEUGG
-+<UC05B>     /x83/x31/xe0/x36 HANGUL SYLLABLE BBEUGS
-+<UC05C>     /x83/x31/xe0/x37 HANGUL SYLLABLE BBEUN
-+<UC05D>     /x83/x31/xe0/x38 HANGUL SYLLABLE BBEUNI
-+<UC05E>     /x83/x31/xe0/x39 HANGUL SYLLABLE BBEUNH
-+<UC05F>     /x83/x31/xe1/x30 HANGUL SYLLABLE BBEUD
-+<UC060>     /x83/x31/xe1/x31 HANGUL SYLLABLE BBEUL
-+<UC061>     /x83/x31/xe1/x32 HANGUL SYLLABLE BBEULG
-+<UC062>     /x83/x31/xe1/x33 HANGUL SYLLABLE BBEULM
-+<UC063>     /x83/x31/xe1/x34 HANGUL SYLLABLE BBEULB
-+<UC064>     /x83/x31/xe1/x35 HANGUL SYLLABLE BBEULS
-+<UC065>     /x83/x31/xe1/x36 HANGUL SYLLABLE BBEULT
-+<UC066>     /x83/x31/xe1/x37 HANGUL SYLLABLE BBEULP
-+<UC067>     /x83/x31/xe1/x38 HANGUL SYLLABLE BBEULH
-+<UC068>     /x83/x31/xe1/x39 HANGUL SYLLABLE BBEUM
-+<UC069>     /x83/x31/xe2/x30 HANGUL SYLLABLE BBEUB
-+<UC06A>     /x83/x31/xe2/x31 HANGUL SYLLABLE BBEUBS
-+<UC06B>     /x83/x31/xe2/x32 HANGUL SYLLABLE BBEUS
-+<UC06C>     /x83/x31/xe2/x33 HANGUL SYLLABLE BBEUSS
-+<UC06D>     /x83/x31/xe2/x34 HANGUL SYLLABLE BBEUNG
-+<UC06E>     /x83/x31/xe2/x35 HANGUL SYLLABLE BBEUJ
-+<UC06F>     /x83/x31/xe2/x36 HANGUL SYLLABLE BBEUC
-+<UC070>     /x83/x31/xe2/x37 HANGUL SYLLABLE BBEUK
-+<UC071>     /x83/x31/xe2/x38 HANGUL SYLLABLE BBEUT
-+<UC072>     /x83/x31/xe2/x39 HANGUL SYLLABLE BBEUP
-+<UC073>     /x83/x31/xe3/x30 HANGUL SYLLABLE BBEUH
-+<UC074>     /x83/x31/xe3/x31 HANGUL SYLLABLE BBYI
-+<UC075>     /x83/x31/xe3/x32 HANGUL SYLLABLE BBYIG
-+<UC076>     /x83/x31/xe3/x33 HANGUL SYLLABLE BBYIGG
-+<UC077>     /x83/x31/xe3/x34 HANGUL SYLLABLE BBYIGS
-+<UC078>     /x83/x31/xe3/x35 HANGUL SYLLABLE BBYIN
-+<UC079>     /x83/x31/xe3/x36 HANGUL SYLLABLE BBYINI
-+<UC07A>     /x83/x31/xe3/x37 HANGUL SYLLABLE BBYINH
-+<UC07B>     /x83/x31/xe3/x38 HANGUL SYLLABLE BBYID
-+<UC07C>     /x83/x31/xe3/x39 HANGUL SYLLABLE BBYIL
-+<UC07D>     /x83/x31/xe4/x30 HANGUL SYLLABLE BBYILG
-+<UC07E>     /x83/x31/xe4/x31 HANGUL SYLLABLE BBYILM
-+<UC07F>     /x83/x31/xe4/x32 HANGUL SYLLABLE BBYILB
-+<UC080>     /x83/x31/xe4/x33 HANGUL SYLLABLE BBYILS
-+<UC081>     /x83/x31/xe4/x34 HANGUL SYLLABLE BBYILT
-+<UC082>     /x83/x31/xe4/x35 HANGUL SYLLABLE BBYILP
-+<UC083>     /x83/x31/xe4/x36 HANGUL SYLLABLE BBYILH
-+<UC084>     /x83/x31/xe4/x37 HANGUL SYLLABLE BBYIM
-+<UC085>     /x83/x31/xe4/x38 HANGUL SYLLABLE BBYIB
-+<UC086>     /x83/x31/xe4/x39 HANGUL SYLLABLE BBYIBS
-+<UC087>     /x83/x31/xe5/x30 HANGUL SYLLABLE BBYIS
-+<UC088>     /x83/x31/xe5/x31 HANGUL SYLLABLE BBYISS
-+<UC089>     /x83/x31/xe5/x32 HANGUL SYLLABLE BBYING
-+<UC08A>     /x83/x31/xe5/x33 HANGUL SYLLABLE BBYIJ
-+<UC08B>     /x83/x31/xe5/x34 HANGUL SYLLABLE BBYIC
-+<UC08C>     /x83/x31/xe5/x35 HANGUL SYLLABLE BBYIK
-+<UC08D>     /x83/x31/xe5/x36 HANGUL SYLLABLE BBYIT
-+<UC08E>     /x83/x31/xe5/x37 HANGUL SYLLABLE BBYIP
-+<UC08F>     /x83/x31/xe5/x38 HANGUL SYLLABLE BBYIH
-+<UC090>     /x83/x31/xe5/x39 HANGUL SYLLABLE BBI
-+<UC091>     /x83/x31/xe6/x30 HANGUL SYLLABLE BBIG
-+<UC092>     /x83/x31/xe6/x31 HANGUL SYLLABLE BBIGG
-+<UC093>     /x83/x31/xe6/x32 HANGUL SYLLABLE BBIGS
-+<UC094>     /x83/x31/xe6/x33 HANGUL SYLLABLE BBIN
-+<UC095>     /x83/x31/xe6/x34 HANGUL SYLLABLE BBINI
-+<UC096>     /x83/x31/xe6/x35 HANGUL SYLLABLE BBINH
-+<UC097>     /x83/x31/xe6/x36 HANGUL SYLLABLE BBID
-+<UC098>     /x83/x31/xe6/x37 HANGUL SYLLABLE BBIL
-+<UC099>     /x83/x31/xe6/x38 HANGUL SYLLABLE BBILG
-+<UC09A>     /x83/x31/xe6/x39 HANGUL SYLLABLE BBILM
-+<UC09B>     /x83/x31/xe7/x30 HANGUL SYLLABLE BBILB
-+<UC09C>     /x83/x31/xe7/x31 HANGUL SYLLABLE BBILS
-+<UC09D>     /x83/x31/xe7/x32 HANGUL SYLLABLE BBILT
-+<UC09E>     /x83/x31/xe7/x33 HANGUL SYLLABLE BBILP
-+<UC09F>     /x83/x31/xe7/x34 HANGUL SYLLABLE BBILH
-+<UC0A0>     /x83/x31/xe7/x35 HANGUL SYLLABLE BBIM
-+<UC0A1>     /x83/x31/xe7/x36 HANGUL SYLLABLE BBIB
-+<UC0A2>     /x83/x31/xe7/x37 HANGUL SYLLABLE BBIBS
-+<UC0A3>     /x83/x31/xe7/x38 HANGUL SYLLABLE BBIS
-+<UC0A4>     /x83/x31/xe7/x39 HANGUL SYLLABLE BBISS
-+<UC0A5>     /x83/x31/xe8/x30 HANGUL SYLLABLE BBING
-+<UC0A6>     /x83/x31/xe8/x31 HANGUL SYLLABLE BBIJ
-+<UC0A7>     /x83/x31/xe8/x32 HANGUL SYLLABLE BBIC
-+<UC0A8>     /x83/x31/xe8/x33 HANGUL SYLLABLE BBIK
-+<UC0A9>     /x83/x31/xe8/x34 HANGUL SYLLABLE BBIT
-+<UC0AA>     /x83/x31/xe8/x35 HANGUL SYLLABLE BBIP
-+<UC0AB>     /x83/x31/xe8/x36 HANGUL SYLLABLE BBIH
-+<UC0AC>     /x83/x31/xe8/x37 HANGUL SYLLABLE SA
-+<UC0AD>     /x83/x31/xe8/x38 HANGUL SYLLABLE SAG
-+<UC0AE>     /x83/x31/xe8/x39 HANGUL SYLLABLE SAGG
-+<UC0AF>     /x83/x31/xe9/x30 HANGUL SYLLABLE SAGS
-+<UC0B0>     /x83/x31/xe9/x31 HANGUL SYLLABLE SAN
-+<UC0B1>     /x83/x31/xe9/x32 HANGUL SYLLABLE SANI
-+<UC0B2>     /x83/x31/xe9/x33 HANGUL SYLLABLE SANH
-+<UC0B3>     /x83/x31/xe9/x34 HANGUL SYLLABLE SAD
-+<UC0B4>     /x83/x31/xe9/x35 HANGUL SYLLABLE SAL
-+<UC0B5>     /x83/x31/xe9/x36 HANGUL SYLLABLE SALG
-+<UC0B6>     /x83/x31/xe9/x37 HANGUL SYLLABLE SALM
-+<UC0B7>     /x83/x31/xe9/x38 HANGUL SYLLABLE SALB
-+<UC0B8>     /x83/x31/xe9/x39 HANGUL SYLLABLE SALS
-+<UC0B9>     /x83/x31/xea/x30 HANGUL SYLLABLE SALT
-+<UC0BA>     /x83/x31/xea/x31 HANGUL SYLLABLE SALP
-+<UC0BB>     /x83/x31/xea/x32 HANGUL SYLLABLE SALH
-+<UC0BC>     /x83/x31/xea/x33 HANGUL SYLLABLE SAM
-+<UC0BD>     /x83/x31/xea/x34 HANGUL SYLLABLE SAB
-+<UC0BE>     /x83/x31/xea/x35 HANGUL SYLLABLE SABS
-+<UC0BF>     /x83/x31/xea/x36 HANGUL SYLLABLE SAS
-+<UC0C0>     /x83/x31/xea/x37 HANGUL SYLLABLE SASS
-+<UC0C1>     /x83/x31/xea/x38 HANGUL SYLLABLE SANG
-+<UC0C2>     /x83/x31/xea/x39 HANGUL SYLLABLE SAJ
-+<UC0C3>     /x83/x31/xeb/x30 HANGUL SYLLABLE SAC
-+<UC0C4>     /x83/x31/xeb/x31 HANGUL SYLLABLE SAK
-+<UC0C5>     /x83/x31/xeb/x32 HANGUL SYLLABLE SAT
-+<UC0C6>     /x83/x31/xeb/x33 HANGUL SYLLABLE SAP
-+<UC0C7>     /x83/x31/xeb/x34 HANGUL SYLLABLE SAH
-+<UC0C8>     /x83/x31/xeb/x35 HANGUL SYLLABLE SAE
-+<UC0C9>     /x83/x31/xeb/x36 HANGUL SYLLABLE SAEG
-+<UC0CA>     /x83/x31/xeb/x37 HANGUL SYLLABLE SAEGG
-+<UC0CB>     /x83/x31/xeb/x38 HANGUL SYLLABLE SAEGS
-+<UC0CC>     /x83/x31/xeb/x39 HANGUL SYLLABLE SAEN
-+<UC0CD>     /x83/x31/xec/x30 HANGUL SYLLABLE SAENI
-+<UC0CE>     /x83/x31/xec/x31 HANGUL SYLLABLE SAENH
-+<UC0CF>     /x83/x31/xec/x32 HANGUL SYLLABLE SAED
-+<UC0D0>     /x83/x31/xec/x33 HANGUL SYLLABLE SAEL
-+<UC0D1>     /x83/x31/xec/x34 HANGUL SYLLABLE SAELG
-+<UC0D2>     /x83/x31/xec/x35 HANGUL SYLLABLE SAELM
-+<UC0D3>     /x83/x31/xec/x36 HANGUL SYLLABLE SAELB
-+<UC0D4>     /x83/x31/xec/x37 HANGUL SYLLABLE SAELS
-+<UC0D5>     /x83/x31/xec/x38 HANGUL SYLLABLE SAELT
-+<UC0D6>     /x83/x31/xec/x39 HANGUL SYLLABLE SAELP
-+<UC0D7>     /x83/x31/xed/x30 HANGUL SYLLABLE SAELH
-+<UC0D8>     /x83/x31/xed/x31 HANGUL SYLLABLE SAEM
-+<UC0D9>     /x83/x31/xed/x32 HANGUL SYLLABLE SAEB
-+<UC0DA>     /x83/x31/xed/x33 HANGUL SYLLABLE SAEBS
-+<UC0DB>     /x83/x31/xed/x34 HANGUL SYLLABLE SAES
-+<UC0DC>     /x83/x31/xed/x35 HANGUL SYLLABLE SAESS
-+<UC0DD>     /x83/x31/xed/x36 HANGUL SYLLABLE SAENG
-+<UC0DE>     /x83/x31/xed/x37 HANGUL SYLLABLE SAEJ
-+<UC0DF>     /x83/x31/xed/x38 HANGUL SYLLABLE SAEC
-+<UC0E0>     /x83/x31/xed/x39 HANGUL SYLLABLE SAEK
-+<UC0E1>     /x83/x31/xee/x30 HANGUL SYLLABLE SAET
-+<UC0E2>     /x83/x31/xee/x31 HANGUL SYLLABLE SAEP
-+<UC0E3>     /x83/x31/xee/x32 HANGUL SYLLABLE SAEH
-+<UC0E4>     /x83/x31/xee/x33 HANGUL SYLLABLE SYA
-+<UC0E5>     /x83/x31/xee/x34 HANGUL SYLLABLE SYAG
-+<UC0E6>     /x83/x31/xee/x35 HANGUL SYLLABLE SYAGG
-+<UC0E7>     /x83/x31/xee/x36 HANGUL SYLLABLE SYAGS
-+<UC0E8>     /x83/x31/xee/x37 HANGUL SYLLABLE SYAN
-+<UC0E9>     /x83/x31/xee/x38 HANGUL SYLLABLE SYANI
-+<UC0EA>     /x83/x31/xee/x39 HANGUL SYLLABLE SYANH
-+<UC0EB>     /x83/x31/xef/x30 HANGUL SYLLABLE SYAD
-+<UC0EC>     /x83/x31/xef/x31 HANGUL SYLLABLE SYAL
-+<UC0ED>     /x83/x31/xef/x32 HANGUL SYLLABLE SYALG
-+<UC0EE>     /x83/x31/xef/x33 HANGUL SYLLABLE SYALM
-+<UC0EF>     /x83/x31/xef/x34 HANGUL SYLLABLE SYALB
-+<UC0F0>     /x83/x31/xef/x35 HANGUL SYLLABLE SYALS
-+<UC0F1>     /x83/x31/xef/x36 HANGUL SYLLABLE SYALT
-+<UC0F2>     /x83/x31/xef/x37 HANGUL SYLLABLE SYALP
-+<UC0F3>     /x83/x31/xef/x38 HANGUL SYLLABLE SYALH
-+<UC0F4>     /x83/x31/xef/x39 HANGUL SYLLABLE SYAM
-+<UC0F5>     /x83/x31/xf0/x30 HANGUL SYLLABLE SYAB
-+<UC0F6>     /x83/x31/xf0/x31 HANGUL SYLLABLE SYABS
-+<UC0F7>     /x83/x31/xf0/x32 HANGUL SYLLABLE SYAS
-+<UC0F8>     /x83/x31/xf0/x33 HANGUL SYLLABLE SYASS
-+<UC0F9>     /x83/x31/xf0/x34 HANGUL SYLLABLE SYANG
-+<UC0FA>     /x83/x31/xf0/x35 HANGUL SYLLABLE SYAJ
-+<UC0FB>     /x83/x31/xf0/x36 HANGUL SYLLABLE SYAC
-+<UC0FC>     /x83/x31/xf0/x37 HANGUL SYLLABLE SYAK
-+<UC0FD>     /x83/x31/xf0/x38 HANGUL SYLLABLE SYAT
-+<UC0FE>     /x83/x31/xf0/x39 HANGUL SYLLABLE SYAP
-+<UC0FF>     /x83/x31/xf1/x30 HANGUL SYLLABLE SYAH
-+<UC100>     /x83/x31/xf1/x31 HANGUL SYLLABLE SYAE
-+<UC101>     /x83/x31/xf1/x32 HANGUL SYLLABLE SYAEG
-+<UC102>     /x83/x31/xf1/x33 HANGUL SYLLABLE SYAEGG
-+<UC103>     /x83/x31/xf1/x34 HANGUL SYLLABLE SYAEGS
-+<UC104>     /x83/x31/xf1/x35 HANGUL SYLLABLE SYAEN
-+<UC105>     /x83/x31/xf1/x36 HANGUL SYLLABLE SYAENI
-+<UC106>     /x83/x31/xf1/x37 HANGUL SYLLABLE SYAENH
-+<UC107>     /x83/x31/xf1/x38 HANGUL SYLLABLE SYAED
-+<UC108>     /x83/x31/xf1/x39 HANGUL SYLLABLE SYAEL
-+<UC109>     /x83/x31/xf2/x30 HANGUL SYLLABLE SYAELG
-+<UC10A>     /x83/x31/xf2/x31 HANGUL SYLLABLE SYAELM
-+<UC10B>     /x83/x31/xf2/x32 HANGUL SYLLABLE SYAELB
-+<UC10C>     /x83/x31/xf2/x33 HANGUL SYLLABLE SYAELS
-+<UC10D>     /x83/x31/xf2/x34 HANGUL SYLLABLE SYAELT
-+<UC10E>     /x83/x31/xf2/x35 HANGUL SYLLABLE SYAELP
-+<UC10F>     /x83/x31/xf2/x36 HANGUL SYLLABLE SYAELH
-+<UC110>     /x83/x31/xf2/x37 HANGUL SYLLABLE SYAEM
-+<UC111>     /x83/x31/xf2/x38 HANGUL SYLLABLE SYAEB
-+<UC112>     /x83/x31/xf2/x39 HANGUL SYLLABLE SYAEBS
-+<UC113>     /x83/x31/xf3/x30 HANGUL SYLLABLE SYAES
-+<UC114>     /x83/x31/xf3/x31 HANGUL SYLLABLE SYAESS
-+<UC115>     /x83/x31/xf3/x32 HANGUL SYLLABLE SYAENG
-+<UC116>     /x83/x31/xf3/x33 HANGUL SYLLABLE SYAEJ
-+<UC117>     /x83/x31/xf3/x34 HANGUL SYLLABLE SYAEC
-+<UC118>     /x83/x31/xf3/x35 HANGUL SYLLABLE SYAEK
-+<UC119>     /x83/x31/xf3/x36 HANGUL SYLLABLE SYAET
-+<UC11A>     /x83/x31/xf3/x37 HANGUL SYLLABLE SYAEP
-+<UC11B>     /x83/x31/xf3/x38 HANGUL SYLLABLE SYAEH
-+<UC11C>     /x83/x31/xf3/x39 HANGUL SYLLABLE SEO
-+<UC11D>     /x83/x31/xf4/x30 HANGUL SYLLABLE SEOG
-+<UC11E>     /x83/x31/xf4/x31 HANGUL SYLLABLE SEOGG
-+<UC11F>     /x83/x31/xf4/x32 HANGUL SYLLABLE SEOGS
-+<UC120>     /x83/x31/xf4/x33 HANGUL SYLLABLE SEON
-+<UC121>     /x83/x31/xf4/x34 HANGUL SYLLABLE SEONI
-+<UC122>     /x83/x31/xf4/x35 HANGUL SYLLABLE SEONH
-+<UC123>     /x83/x31/xf4/x36 HANGUL SYLLABLE SEOD
-+<UC124>     /x83/x31/xf4/x37 HANGUL SYLLABLE SEOL
-+<UC125>     /x83/x31/xf4/x38 HANGUL SYLLABLE SEOLG
-+<UC126>     /x83/x31/xf4/x39 HANGUL SYLLABLE SEOLM
-+<UC127>     /x83/x31/xf5/x30 HANGUL SYLLABLE SEOLB
-+<UC128>     /x83/x31/xf5/x31 HANGUL SYLLABLE SEOLS
-+<UC129>     /x83/x31/xf5/x32 HANGUL SYLLABLE SEOLT
-+<UC12A>     /x83/x31/xf5/x33 HANGUL SYLLABLE SEOLP
-+<UC12B>     /x83/x31/xf5/x34 HANGUL SYLLABLE SEOLH
-+<UC12C>     /x83/x31/xf5/x35 HANGUL SYLLABLE SEOM
-+<UC12D>     /x83/x31/xf5/x36 HANGUL SYLLABLE SEOB
-+<UC12E>     /x83/x31/xf5/x37 HANGUL SYLLABLE SEOBS
-+<UC12F>     /x83/x31/xf5/x38 HANGUL SYLLABLE SEOS
-+<UC130>     /x83/x31/xf5/x39 HANGUL SYLLABLE SEOSS
-+<UC131>     /x83/x31/xf6/x30 HANGUL SYLLABLE SEONG
-+<UC132>     /x83/x31/xf6/x31 HANGUL SYLLABLE SEOJ
-+<UC133>     /x83/x31/xf6/x32 HANGUL SYLLABLE SEOC
-+<UC134>     /x83/x31/xf6/x33 HANGUL SYLLABLE SEOK
-+<UC135>     /x83/x31/xf6/x34 HANGUL SYLLABLE SEOT
-+<UC136>     /x83/x31/xf6/x35 HANGUL SYLLABLE SEOP
-+<UC137>     /x83/x31/xf6/x36 HANGUL SYLLABLE SEOH
-+<UC138>     /x83/x31/xf6/x37 HANGUL SYLLABLE SE
-+<UC139>     /x83/x31/xf6/x38 HANGUL SYLLABLE SEG
-+<UC13A>     /x83/x31/xf6/x39 HANGUL SYLLABLE SEGG
-+<UC13B>     /x83/x31/xf7/x30 HANGUL SYLLABLE SEGS
-+<UC13C>     /x83/x31/xf7/x31 HANGUL SYLLABLE SEN
-+<UC13D>     /x83/x31/xf7/x32 HANGUL SYLLABLE SENI
-+<UC13E>     /x83/x31/xf7/x33 HANGUL SYLLABLE SENH
-+<UC13F>     /x83/x31/xf7/x34 HANGUL SYLLABLE SED
-+<UC140>     /x83/x31/xf7/x35 HANGUL SYLLABLE SEL
-+<UC141>     /x83/x31/xf7/x36 HANGUL SYLLABLE SELG
-+<UC142>     /x83/x31/xf7/x37 HANGUL SYLLABLE SELM
-+<UC143>     /x83/x31/xf7/x38 HANGUL SYLLABLE SELB
-+<UC144>     /x83/x31/xf7/x39 HANGUL SYLLABLE SELS
-+<UC145>     /x83/x31/xf8/x30 HANGUL SYLLABLE SELT
-+<UC146>     /x83/x31/xf8/x31 HANGUL SYLLABLE SELP
-+<UC147>     /x83/x31/xf8/x32 HANGUL SYLLABLE SELH
-+<UC148>     /x83/x31/xf8/x33 HANGUL SYLLABLE SEM
-+<UC149>     /x83/x31/xf8/x34 HANGUL SYLLABLE SEB
-+<UC14A>     /x83/x31/xf8/x35 HANGUL SYLLABLE SEBS
-+<UC14B>     /x83/x31/xf8/x36 HANGUL SYLLABLE SES
-+<UC14C>     /x83/x31/xf8/x37 HANGUL SYLLABLE SESS
-+<UC14D>     /x83/x31/xf8/x38 HANGUL SYLLABLE SENG
-+<UC14E>     /x83/x31/xf8/x39 HANGUL SYLLABLE SEJ
-+<UC14F>     /x83/x31/xf9/x30 HANGUL SYLLABLE SEC
-+<UC150>     /x83/x31/xf9/x31 HANGUL SYLLABLE SEK
-+<UC151>     /x83/x31/xf9/x32 HANGUL SYLLABLE SET
-+<UC152>     /x83/x31/xf9/x33 HANGUL SYLLABLE SEP
-+<UC153>     /x83/x31/xf9/x34 HANGUL SYLLABLE SEH
-+<UC154>     /x83/x31/xf9/x35 HANGUL SYLLABLE SYEO
-+<UC155>     /x83/x31/xf9/x36 HANGUL SYLLABLE SYEOG
-+<UC156>     /x83/x31/xf9/x37 HANGUL SYLLABLE SYEOGG
-+<UC157>     /x83/x31/xf9/x38 HANGUL SYLLABLE SYEOGS
-+<UC158>     /x83/x31/xf9/x39 HANGUL SYLLABLE SYEON
-+<UC159>     /x83/x31/xfa/x30 HANGUL SYLLABLE SYEONI
-+<UC15A>     /x83/x31/xfa/x31 HANGUL SYLLABLE SYEONH
-+<UC15B>     /x83/x31/xfa/x32 HANGUL SYLLABLE SYEOD
-+<UC15C>     /x83/x31/xfa/x33 HANGUL SYLLABLE SYEOL
-+<UC15D>     /x83/x31/xfa/x34 HANGUL SYLLABLE SYEOLG
-+<UC15E>     /x83/x31/xfa/x35 HANGUL SYLLABLE SYEOLM
-+<UC15F>     /x83/x31/xfa/x36 HANGUL SYLLABLE SYEOLB
-+<UC160>     /x83/x31/xfa/x37 HANGUL SYLLABLE SYEOLS
-+<UC161>     /x83/x31/xfa/x38 HANGUL SYLLABLE SYEOLT
-+<UC162>     /x83/x31/xfa/x39 HANGUL SYLLABLE SYEOLP
-+<UC163>     /x83/x31/xfb/x30 HANGUL SYLLABLE SYEOLH
-+<UC164>     /x83/x31/xfb/x31 HANGUL SYLLABLE SYEOM
-+<UC165>     /x83/x31/xfb/x32 HANGUL SYLLABLE SYEOB
-+<UC166>     /x83/x31/xfb/x33 HANGUL SYLLABLE SYEOBS
-+<UC167>     /x83/x31/xfb/x34 HANGUL SYLLABLE SYEOS
-+<UC168>     /x83/x31/xfb/x35 HANGUL SYLLABLE SYEOSS
-+<UC169>     /x83/x31/xfb/x36 HANGUL SYLLABLE SYEONG
-+<UC16A>     /x83/x31/xfb/x37 HANGUL SYLLABLE SYEOJ
-+<UC16B>     /x83/x31/xfb/x38 HANGUL SYLLABLE SYEOC
-+<UC16C>     /x83/x31/xfb/x39 HANGUL SYLLABLE SYEOK
-+<UC16D>     /x83/x31/xfc/x30 HANGUL SYLLABLE SYEOT
-+<UC16E>     /x83/x31/xfc/x31 HANGUL SYLLABLE SYEOP
-+<UC16F>     /x83/x31/xfc/x32 HANGUL SYLLABLE SYEOH
-+<UC170>     /x83/x31/xfc/x33 HANGUL SYLLABLE SYE
-+<UC171>     /x83/x31/xfc/x34 HANGUL SYLLABLE SYEG
-+<UC172>     /x83/x31/xfc/x35 HANGUL SYLLABLE SYEGG
-+<UC173>     /x83/x31/xfc/x36 HANGUL SYLLABLE SYEGS
-+<UC174>     /x83/x31/xfc/x37 HANGUL SYLLABLE SYEN
-+<UC175>     /x83/x31/xfc/x38 HANGUL SYLLABLE SYENI
-+<UC176>     /x83/x31/xfc/x39 HANGUL SYLLABLE SYENH
-+<UC177>     /x83/x31/xfd/x30 HANGUL SYLLABLE SYED
-+<UC178>     /x83/x31/xfd/x31 HANGUL SYLLABLE SYEL
-+<UC179>     /x83/x31/xfd/x32 HANGUL SYLLABLE SYELG
-+<UC17A>     /x83/x31/xfd/x33 HANGUL SYLLABLE SYELM
-+<UC17B>     /x83/x31/xfd/x34 HANGUL SYLLABLE SYELB
-+<UC17C>     /x83/x31/xfd/x35 HANGUL SYLLABLE SYELS
-+<UC17D>     /x83/x31/xfd/x36 HANGUL SYLLABLE SYELT
-+<UC17E>     /x83/x31/xfd/x37 HANGUL SYLLABLE SYELP
-+<UC17F>     /x83/x31/xfd/x38 HANGUL SYLLABLE SYELH
-+<UC180>     /x83/x31/xfd/x39 HANGUL SYLLABLE SYEM
-+<UC181>     /x83/x31/xfe/x30 HANGUL SYLLABLE SYEB
-+<UC182>     /x83/x31/xfe/x31 HANGUL SYLLABLE SYEBS
-+<UC183>     /x83/x31/xfe/x32 HANGUL SYLLABLE SYES
-+<UC184>     /x83/x31/xfe/x33 HANGUL SYLLABLE SYESS
-+<UC185>     /x83/x31/xfe/x34 HANGUL SYLLABLE SYENG
-+<UC186>     /x83/x31/xfe/x35 HANGUL SYLLABLE SYEJ
-+<UC187>     /x83/x31/xfe/x36 HANGUL SYLLABLE SYEC
-+<UC188>     /x83/x31/xfe/x37 HANGUL SYLLABLE SYEK
-+<UC189>     /x83/x31/xfe/x38 HANGUL SYLLABLE SYET
-+<UC18A>     /x83/x31/xfe/x39 HANGUL SYLLABLE SYEP
-+<UC18B>     /x83/x32/x81/x30 HANGUL SYLLABLE SYEH
-+<UC18C>     /x83/x32/x81/x31 HANGUL SYLLABLE SO
-+<UC18D>     /x83/x32/x81/x32 HANGUL SYLLABLE SOG
-+<UC18E>     /x83/x32/x81/x33 HANGUL SYLLABLE SOGG
-+<UC18F>     /x83/x32/x81/x34 HANGUL SYLLABLE SOGS
-+<UC190>     /x83/x32/x81/x35 HANGUL SYLLABLE SON
-+<UC191>     /x83/x32/x81/x36 HANGUL SYLLABLE SONI
-+<UC192>     /x83/x32/x81/x37 HANGUL SYLLABLE SONH
-+<UC193>     /x83/x32/x81/x38 HANGUL SYLLABLE SOD
-+<UC194>     /x83/x32/x81/x39 HANGUL SYLLABLE SOL
-+<UC195>     /x83/x32/x82/x30 HANGUL SYLLABLE SOLG
-+<UC196>     /x83/x32/x82/x31 HANGUL SYLLABLE SOLM
-+<UC197>     /x83/x32/x82/x32 HANGUL SYLLABLE SOLB
-+<UC198>     /x83/x32/x82/x33 HANGUL SYLLABLE SOLS
-+<UC199>     /x83/x32/x82/x34 HANGUL SYLLABLE SOLT
-+<UC19A>     /x83/x32/x82/x35 HANGUL SYLLABLE SOLP
-+<UC19B>     /x83/x32/x82/x36 HANGUL SYLLABLE SOLH
-+<UC19C>     /x83/x32/x82/x37 HANGUL SYLLABLE SOM
-+<UC19D>     /x83/x32/x82/x38 HANGUL SYLLABLE SOB
-+<UC19E>     /x83/x32/x82/x39 HANGUL SYLLABLE SOBS
-+<UC19F>     /x83/x32/x83/x30 HANGUL SYLLABLE SOS
-+<UC1A0>     /x83/x32/x83/x31 HANGUL SYLLABLE SOSS
-+<UC1A1>     /x83/x32/x83/x32 HANGUL SYLLABLE SONG
-+<UC1A2>     /x83/x32/x83/x33 HANGUL SYLLABLE SOJ
-+<UC1A3>     /x83/x32/x83/x34 HANGUL SYLLABLE SOC
-+<UC1A4>     /x83/x32/x83/x35 HANGUL SYLLABLE SOK
-+<UC1A5>     /x83/x32/x83/x36 HANGUL SYLLABLE SOT
-+<UC1A6>     /x83/x32/x83/x37 HANGUL SYLLABLE SOP
-+<UC1A7>     /x83/x32/x83/x38 HANGUL SYLLABLE SOH
-+<UC1A8>     /x83/x32/x83/x39 HANGUL SYLLABLE SWA
-+<UC1A9>     /x83/x32/x84/x30 HANGUL SYLLABLE SWAG
-+<UC1AA>     /x83/x32/x84/x31 HANGUL SYLLABLE SWAGG
-+<UC1AB>     /x83/x32/x84/x32 HANGUL SYLLABLE SWAGS
-+<UC1AC>     /x83/x32/x84/x33 HANGUL SYLLABLE SWAN
-+<UC1AD>     /x83/x32/x84/x34 HANGUL SYLLABLE SWANI
-+<UC1AE>     /x83/x32/x84/x35 HANGUL SYLLABLE SWANH
-+<UC1AF>     /x83/x32/x84/x36 HANGUL SYLLABLE SWAD
-+<UC1B0>     /x83/x32/x84/x37 HANGUL SYLLABLE SWAL
-+<UC1B1>     /x83/x32/x84/x38 HANGUL SYLLABLE SWALG
-+<UC1B2>     /x83/x32/x84/x39 HANGUL SYLLABLE SWALM
-+<UC1B3>     /x83/x32/x85/x30 HANGUL SYLLABLE SWALB
-+<UC1B4>     /x83/x32/x85/x31 HANGUL SYLLABLE SWALS
-+<UC1B5>     /x83/x32/x85/x32 HANGUL SYLLABLE SWALT
-+<UC1B6>     /x83/x32/x85/x33 HANGUL SYLLABLE SWALP
-+<UC1B7>     /x83/x32/x85/x34 HANGUL SYLLABLE SWALH
-+<UC1B8>     /x83/x32/x85/x35 HANGUL SYLLABLE SWAM
-+<UC1B9>     /x83/x32/x85/x36 HANGUL SYLLABLE SWAB
-+<UC1BA>     /x83/x32/x85/x37 HANGUL SYLLABLE SWABS
-+<UC1BB>     /x83/x32/x85/x38 HANGUL SYLLABLE SWAS
-+<UC1BC>     /x83/x32/x85/x39 HANGUL SYLLABLE SWASS
-+<UC1BD>     /x83/x32/x86/x30 HANGUL SYLLABLE SWANG
-+<UC1BE>     /x83/x32/x86/x31 HANGUL SYLLABLE SWAJ
-+<UC1BF>     /x83/x32/x86/x32 HANGUL SYLLABLE SWAC
-+<UC1C0>     /x83/x32/x86/x33 HANGUL SYLLABLE SWAK
-+<UC1C1>     /x83/x32/x86/x34 HANGUL SYLLABLE SWAT
-+<UC1C2>     /x83/x32/x86/x35 HANGUL SYLLABLE SWAP
-+<UC1C3>     /x83/x32/x86/x36 HANGUL SYLLABLE SWAH
-+<UC1C4>     /x83/x32/x86/x37 HANGUL SYLLABLE SWAE
-+<UC1C5>     /x83/x32/x86/x38 HANGUL SYLLABLE SWAEG
-+<UC1C6>     /x83/x32/x86/x39 HANGUL SYLLABLE SWAEGG
-+<UC1C7>     /x83/x32/x87/x30 HANGUL SYLLABLE SWAEGS
-+<UC1C8>     /x83/x32/x87/x31 HANGUL SYLLABLE SWAEN
-+<UC1C9>     /x83/x32/x87/x32 HANGUL SYLLABLE SWAENI
-+<UC1CA>     /x83/x32/x87/x33 HANGUL SYLLABLE SWAENH
-+<UC1CB>     /x83/x32/x87/x34 HANGUL SYLLABLE SWAED
-+<UC1CC>     /x83/x32/x87/x35 HANGUL SYLLABLE SWAEL
-+<UC1CD>     /x83/x32/x87/x36 HANGUL SYLLABLE SWAELG
-+<UC1CE>     /x83/x32/x87/x37 HANGUL SYLLABLE SWAELM
-+<UC1CF>     /x83/x32/x87/x38 HANGUL SYLLABLE SWAELB
-+<UC1D0>     /x83/x32/x87/x39 HANGUL SYLLABLE SWAELS
-+<UC1D1>     /x83/x32/x88/x30 HANGUL SYLLABLE SWAELT
-+<UC1D2>     /x83/x32/x88/x31 HANGUL SYLLABLE SWAELP
-+<UC1D3>     /x83/x32/x88/x32 HANGUL SYLLABLE SWAELH
-+<UC1D4>     /x83/x32/x88/x33 HANGUL SYLLABLE SWAEM
-+<UC1D5>     /x83/x32/x88/x34 HANGUL SYLLABLE SWAEB
-+<UC1D6>     /x83/x32/x88/x35 HANGUL SYLLABLE SWAEBS
-+<UC1D7>     /x83/x32/x88/x36 HANGUL SYLLABLE SWAES
-+<UC1D8>     /x83/x32/x88/x37 HANGUL SYLLABLE SWAESS
-+<UC1D9>     /x83/x32/x88/x38 HANGUL SYLLABLE SWAENG
-+<UC1DA>     /x83/x32/x88/x39 HANGUL SYLLABLE SWAEJ
-+<UC1DB>     /x83/x32/x89/x30 HANGUL SYLLABLE SWAEC
-+<UC1DC>     /x83/x32/x89/x31 HANGUL SYLLABLE SWAEK
-+<UC1DD>     /x83/x32/x89/x32 HANGUL SYLLABLE SWAET
-+<UC1DE>     /x83/x32/x89/x33 HANGUL SYLLABLE SWAEP
-+<UC1DF>     /x83/x32/x89/x34 HANGUL SYLLABLE SWAEH
-+<UC1E0>     /x83/x32/x89/x35 HANGUL SYLLABLE SOE
-+<UC1E1>     /x83/x32/x89/x36 HANGUL SYLLABLE SOEG
-+<UC1E2>     /x83/x32/x89/x37 HANGUL SYLLABLE SOEGG
-+<UC1E3>     /x83/x32/x89/x38 HANGUL SYLLABLE SOEGS
-+<UC1E4>     /x83/x32/x89/x39 HANGUL SYLLABLE SOEN
-+<UC1E5>     /x83/x32/x8a/x30 HANGUL SYLLABLE SOENI
-+<UC1E6>     /x83/x32/x8a/x31 HANGUL SYLLABLE SOENH
-+<UC1E7>     /x83/x32/x8a/x32 HANGUL SYLLABLE SOED
-+<UC1E8>     /x83/x32/x8a/x33 HANGUL SYLLABLE SOEL
-+<UC1E9>     /x83/x32/x8a/x34 HANGUL SYLLABLE SOELG
-+<UC1EA>     /x83/x32/x8a/x35 HANGUL SYLLABLE SOELM
-+<UC1EB>     /x83/x32/x8a/x36 HANGUL SYLLABLE SOELB
-+<UC1EC>     /x83/x32/x8a/x37 HANGUL SYLLABLE SOELS
-+<UC1ED>     /x83/x32/x8a/x38 HANGUL SYLLABLE SOELT
-+<UC1EE>     /x83/x32/x8a/x39 HANGUL SYLLABLE SOELP
-+<UC1EF>     /x83/x32/x8b/x30 HANGUL SYLLABLE SOELH
-+<UC1F0>     /x83/x32/x8b/x31 HANGUL SYLLABLE SOEM
-+<UC1F1>     /x83/x32/x8b/x32 HANGUL SYLLABLE SOEB
-+<UC1F2>     /x83/x32/x8b/x33 HANGUL SYLLABLE SOEBS
-+<UC1F3>     /x83/x32/x8b/x34 HANGUL SYLLABLE SOES
-+<UC1F4>     /x83/x32/x8b/x35 HANGUL SYLLABLE SOESS
-+<UC1F5>     /x83/x32/x8b/x36 HANGUL SYLLABLE SOENG
-+<UC1F6>     /x83/x32/x8b/x37 HANGUL SYLLABLE SOEJ
-+<UC1F7>     /x83/x32/x8b/x38 HANGUL SYLLABLE SOEC
-+<UC1F8>     /x83/x32/x8b/x39 HANGUL SYLLABLE SOEK
-+<UC1F9>     /x83/x32/x8c/x30 HANGUL SYLLABLE SOET
-+<UC1FA>     /x83/x32/x8c/x31 HANGUL SYLLABLE SOEP
-+<UC1FB>     /x83/x32/x8c/x32 HANGUL SYLLABLE SOEH
-+<UC1FC>     /x83/x32/x8c/x33 HANGUL SYLLABLE SYO
-+<UC1FD>     /x83/x32/x8c/x34 HANGUL SYLLABLE SYOG
-+<UC1FE>     /x83/x32/x8c/x35 HANGUL SYLLABLE SYOGG
-+<UC1FF>     /x83/x32/x8c/x36 HANGUL SYLLABLE SYOGS
-+<UC200>     /x83/x32/x8c/x37 HANGUL SYLLABLE SYON
-+<UC201>     /x83/x32/x8c/x38 HANGUL SYLLABLE SYONI
-+<UC202>     /x83/x32/x8c/x39 HANGUL SYLLABLE SYONH
-+<UC203>     /x83/x32/x8d/x30 HANGUL SYLLABLE SYOD
-+<UC204>     /x83/x32/x8d/x31 HANGUL SYLLABLE SYOL
-+<UC205>     /x83/x32/x8d/x32 HANGUL SYLLABLE SYOLG
-+<UC206>     /x83/x32/x8d/x33 HANGUL SYLLABLE SYOLM
-+<UC207>     /x83/x32/x8d/x34 HANGUL SYLLABLE SYOLB
-+<UC208>     /x83/x32/x8d/x35 HANGUL SYLLABLE SYOLS
-+<UC209>     /x83/x32/x8d/x36 HANGUL SYLLABLE SYOLT
-+<UC20A>     /x83/x32/x8d/x37 HANGUL SYLLABLE SYOLP
-+<UC20B>     /x83/x32/x8d/x38 HANGUL SYLLABLE SYOLH
-+<UC20C>     /x83/x32/x8d/x39 HANGUL SYLLABLE SYOM
-+<UC20D>     /x83/x32/x8e/x30 HANGUL SYLLABLE SYOB
-+<UC20E>     /x83/x32/x8e/x31 HANGUL SYLLABLE SYOBS
-+<UC20F>     /x83/x32/x8e/x32 HANGUL SYLLABLE SYOS
-+<UC210>     /x83/x32/x8e/x33 HANGUL SYLLABLE SYOSS
-+<UC211>     /x83/x32/x8e/x34 HANGUL SYLLABLE SYONG
-+<UC212>     /x83/x32/x8e/x35 HANGUL SYLLABLE SYOJ
-+<UC213>     /x83/x32/x8e/x36 HANGUL SYLLABLE SYOC
-+<UC214>     /x83/x32/x8e/x37 HANGUL SYLLABLE SYOK
-+<UC215>     /x83/x32/x8e/x38 HANGUL SYLLABLE SYOT
-+<UC216>     /x83/x32/x8e/x39 HANGUL SYLLABLE SYOP
-+<UC217>     /x83/x32/x8f/x30 HANGUL SYLLABLE SYOH
-+<UC218>     /x83/x32/x8f/x31 HANGUL SYLLABLE SU
-+<UC219>     /x83/x32/x8f/x32 HANGUL SYLLABLE SUG
-+<UC21A>     /x83/x32/x8f/x33 HANGUL SYLLABLE SUGG
-+<UC21B>     /x83/x32/x8f/x34 HANGUL SYLLABLE SUGS
-+<UC21C>     /x83/x32/x8f/x35 HANGUL SYLLABLE SUN
-+<UC21D>     /x83/x32/x8f/x36 HANGUL SYLLABLE SUNI
-+<UC21E>     /x83/x32/x8f/x37 HANGUL SYLLABLE SUNH
-+<UC21F>     /x83/x32/x8f/x38 HANGUL SYLLABLE SUD
-+<UC220>     /x83/x32/x8f/x39 HANGUL SYLLABLE SUL
-+<UC221>     /x83/x32/x90/x30 HANGUL SYLLABLE SULG
-+<UC222>     /x83/x32/x90/x31 HANGUL SYLLABLE SULM
-+<UC223>     /x83/x32/x90/x32 HANGUL SYLLABLE SULB
-+<UC224>     /x83/x32/x90/x33 HANGUL SYLLABLE SULS
-+<UC225>     /x83/x32/x90/x34 HANGUL SYLLABLE SULT
-+<UC226>     /x83/x32/x90/x35 HANGUL SYLLABLE SULP
-+<UC227>     /x83/x32/x90/x36 HANGUL SYLLABLE SULH
-+<UC228>     /x83/x32/x90/x37 HANGUL SYLLABLE SUM
-+<UC229>     /x83/x32/x90/x38 HANGUL SYLLABLE SUB
-+<UC22A>     /x83/x32/x90/x39 HANGUL SYLLABLE SUBS
-+<UC22B>     /x83/x32/x91/x30 HANGUL SYLLABLE SUS
-+<UC22C>     /x83/x32/x91/x31 HANGUL SYLLABLE SUSS
-+<UC22D>     /x83/x32/x91/x32 HANGUL SYLLABLE SUNG
-+<UC22E>     /x83/x32/x91/x33 HANGUL SYLLABLE SUJ
-+<UC22F>     /x83/x32/x91/x34 HANGUL SYLLABLE SUC
-+<UC230>     /x83/x32/x91/x35 HANGUL SYLLABLE SUK
-+<UC231>     /x83/x32/x91/x36 HANGUL SYLLABLE SUT
-+<UC232>     /x83/x32/x91/x37 HANGUL SYLLABLE SUP
-+<UC233>     /x83/x32/x91/x38 HANGUL SYLLABLE SUH
-+<UC234>     /x83/x32/x91/x39 HANGUL SYLLABLE SWEO
-+<UC235>     /x83/x32/x92/x30 HANGUL SYLLABLE SWEOG
-+<UC236>     /x83/x32/x92/x31 HANGUL SYLLABLE SWEOGG
-+<UC237>     /x83/x32/x92/x32 HANGUL SYLLABLE SWEOGS
-+<UC238>     /x83/x32/x92/x33 HANGUL SYLLABLE SWEON
-+<UC239>     /x83/x32/x92/x34 HANGUL SYLLABLE SWEONI
-+<UC23A>     /x83/x32/x92/x35 HANGUL SYLLABLE SWEONH
-+<UC23B>     /x83/x32/x92/x36 HANGUL SYLLABLE SWEOD
-+<UC23C>     /x83/x32/x92/x37 HANGUL SYLLABLE SWEOL
-+<UC23D>     /x83/x32/x92/x38 HANGUL SYLLABLE SWEOLG
-+<UC23E>     /x83/x32/x92/x39 HANGUL SYLLABLE SWEOLM
-+<UC23F>     /x83/x32/x93/x30 HANGUL SYLLABLE SWEOLB
-+<UC240>     /x83/x32/x93/x31 HANGUL SYLLABLE SWEOLS
-+<UC241>     /x83/x32/x93/x32 HANGUL SYLLABLE SWEOLT
-+<UC242>     /x83/x32/x93/x33 HANGUL SYLLABLE SWEOLP
-+<UC243>     /x83/x32/x93/x34 HANGUL SYLLABLE SWEOLH
-+<UC244>     /x83/x32/x93/x35 HANGUL SYLLABLE SWEOM
-+<UC245>     /x83/x32/x93/x36 HANGUL SYLLABLE SWEOB
-+<UC246>     /x83/x32/x93/x37 HANGUL SYLLABLE SWEOBS
-+<UC247>     /x83/x32/x93/x38 HANGUL SYLLABLE SWEOS
-+<UC248>     /x83/x32/x93/x39 HANGUL SYLLABLE SWEOSS
-+<UC249>     /x83/x32/x94/x30 HANGUL SYLLABLE SWEONG
-+<UC24A>     /x83/x32/x94/x31 HANGUL SYLLABLE SWEOJ
-+<UC24B>     /x83/x32/x94/x32 HANGUL SYLLABLE SWEOC
-+<UC24C>     /x83/x32/x94/x33 HANGUL SYLLABLE SWEOK
-+<UC24D>     /x83/x32/x94/x34 HANGUL SYLLABLE SWEOT
-+<UC24E>     /x83/x32/x94/x35 HANGUL SYLLABLE SWEOP
-+<UC24F>     /x83/x32/x94/x36 HANGUL SYLLABLE SWEOH
-+<UC250>     /x83/x32/x94/x37 HANGUL SYLLABLE SWE
-+<UC251>     /x83/x32/x94/x38 HANGUL SYLLABLE SWEG
-+<UC252>     /x83/x32/x94/x39 HANGUL SYLLABLE SWEGG
-+<UC253>     /x83/x32/x95/x30 HANGUL SYLLABLE SWEGS
-+<UC254>     /x83/x32/x95/x31 HANGUL SYLLABLE SWEN
-+<UC255>     /x83/x32/x95/x32 HANGUL SYLLABLE SWENI
-+<UC256>     /x83/x32/x95/x33 HANGUL SYLLABLE SWENH
-+<UC257>     /x83/x32/x95/x34 HANGUL SYLLABLE SWED
-+<UC258>     /x83/x32/x95/x35 HANGUL SYLLABLE SWEL
-+<UC259>     /x83/x32/x95/x36 HANGUL SYLLABLE SWELG
-+<UC25A>     /x83/x32/x95/x37 HANGUL SYLLABLE SWELM
-+<UC25B>     /x83/x32/x95/x38 HANGUL SYLLABLE SWELB
-+<UC25C>     /x83/x32/x95/x39 HANGUL SYLLABLE SWELS
-+<UC25D>     /x83/x32/x96/x30 HANGUL SYLLABLE SWELT
-+<UC25E>     /x83/x32/x96/x31 HANGUL SYLLABLE SWELP
-+<UC25F>     /x83/x32/x96/x32 HANGUL SYLLABLE SWELH
-+<UC260>     /x83/x32/x96/x33 HANGUL SYLLABLE SWEM
-+<UC261>     /x83/x32/x96/x34 HANGUL SYLLABLE SWEB
-+<UC262>     /x83/x32/x96/x35 HANGUL SYLLABLE SWEBS
-+<UC263>     /x83/x32/x96/x36 HANGUL SYLLABLE SWES
-+<UC264>     /x83/x32/x96/x37 HANGUL SYLLABLE SWESS
-+<UC265>     /x83/x32/x96/x38 HANGUL SYLLABLE SWENG
-+<UC266>     /x83/x32/x96/x39 HANGUL SYLLABLE SWEJ
-+<UC267>     /x83/x32/x97/x30 HANGUL SYLLABLE SWEC
-+<UC268>     /x83/x32/x97/x31 HANGUL SYLLABLE SWEK
-+<UC269>     /x83/x32/x97/x32 HANGUL SYLLABLE SWET
-+<UC26A>     /x83/x32/x97/x33 HANGUL SYLLABLE SWEP
-+<UC26B>     /x83/x32/x97/x34 HANGUL SYLLABLE SWEH
-+<UC26C>     /x83/x32/x97/x35 HANGUL SYLLABLE SWI
-+<UC26D>     /x83/x32/x97/x36 HANGUL SYLLABLE SWIG
-+<UC26E>     /x83/x32/x97/x37 HANGUL SYLLABLE SWIGG
-+<UC26F>     /x83/x32/x97/x38 HANGUL SYLLABLE SWIGS
-+<UC270>     /x83/x32/x97/x39 HANGUL SYLLABLE SWIN
-+<UC271>     /x83/x32/x98/x30 HANGUL SYLLABLE SWINI
-+<UC272>     /x83/x32/x98/x31 HANGUL SYLLABLE SWINH
-+<UC273>     /x83/x32/x98/x32 HANGUL SYLLABLE SWID
-+<UC274>     /x83/x32/x98/x33 HANGUL SYLLABLE SWIL
-+<UC275>     /x83/x32/x98/x34 HANGUL SYLLABLE SWILG
-+<UC276>     /x83/x32/x98/x35 HANGUL SYLLABLE SWILM
-+<UC277>     /x83/x32/x98/x36 HANGUL SYLLABLE SWILB
-+<UC278>     /x83/x32/x98/x37 HANGUL SYLLABLE SWILS
-+<UC279>     /x83/x32/x98/x38 HANGUL SYLLABLE SWILT
-+<UC27A>     /x83/x32/x98/x39 HANGUL SYLLABLE SWILP
-+<UC27B>     /x83/x32/x99/x30 HANGUL SYLLABLE SWILH
-+<UC27C>     /x83/x32/x99/x31 HANGUL SYLLABLE SWIM
-+<UC27D>     /x83/x32/x99/x32 HANGUL SYLLABLE SWIB
-+<UC27E>     /x83/x32/x99/x33 HANGUL SYLLABLE SWIBS
-+<UC27F>     /x83/x32/x99/x34 HANGUL SYLLABLE SWIS
-+<UC280>     /x83/x32/x99/x35 HANGUL SYLLABLE SWISS
-+<UC281>     /x83/x32/x99/x36 HANGUL SYLLABLE SWING
-+<UC282>     /x83/x32/x99/x37 HANGUL SYLLABLE SWIJ
-+<UC283>     /x83/x32/x99/x38 HANGUL SYLLABLE SWIC
-+<UC284>     /x83/x32/x99/x39 HANGUL SYLLABLE SWIK
-+<UC285>     /x83/x32/x9a/x30 HANGUL SYLLABLE SWIT
-+<UC286>     /x83/x32/x9a/x31 HANGUL SYLLABLE SWIP
-+<UC287>     /x83/x32/x9a/x32 HANGUL SYLLABLE SWIH
-+<UC288>     /x83/x32/x9a/x33 HANGUL SYLLABLE SYU
-+<UC289>     /x83/x32/x9a/x34 HANGUL SYLLABLE SYUG
-+<UC28A>     /x83/x32/x9a/x35 HANGUL SYLLABLE SYUGG
-+<UC28B>     /x83/x32/x9a/x36 HANGUL SYLLABLE SYUGS
-+<UC28C>     /x83/x32/x9a/x37 HANGUL SYLLABLE SYUN
-+<UC28D>     /x83/x32/x9a/x38 HANGUL SYLLABLE SYUNI
-+<UC28E>     /x83/x32/x9a/x39 HANGUL SYLLABLE SYUNH
-+<UC28F>     /x83/x32/x9b/x30 HANGUL SYLLABLE SYUD
-+<UC290>     /x83/x32/x9b/x31 HANGUL SYLLABLE SYUL
-+<UC291>     /x83/x32/x9b/x32 HANGUL SYLLABLE SYULG
-+<UC292>     /x83/x32/x9b/x33 HANGUL SYLLABLE SYULM
-+<UC293>     /x83/x32/x9b/x34 HANGUL SYLLABLE SYULB
-+<UC294>     /x83/x32/x9b/x35 HANGUL SYLLABLE SYULS
-+<UC295>     /x83/x32/x9b/x36 HANGUL SYLLABLE SYULT
-+<UC296>     /x83/x32/x9b/x37 HANGUL SYLLABLE SYULP
-+<UC297>     /x83/x32/x9b/x38 HANGUL SYLLABLE SYULH
-+<UC298>     /x83/x32/x9b/x39 HANGUL SYLLABLE SYUM
-+<UC299>     /x83/x32/x9c/x30 HANGUL SYLLABLE SYUB
-+<UC29A>     /x83/x32/x9c/x31 HANGUL SYLLABLE SYUBS
-+<UC29B>     /x83/x32/x9c/x32 HANGUL SYLLABLE SYUS
-+<UC29C>     /x83/x32/x9c/x33 HANGUL SYLLABLE SYUSS
-+<UC29D>     /x83/x32/x9c/x34 HANGUL SYLLABLE SYUNG
-+<UC29E>     /x83/x32/x9c/x35 HANGUL SYLLABLE SYUJ
-+<UC29F>     /x83/x32/x9c/x36 HANGUL SYLLABLE SYUC
-+<UC2A0>     /x83/x32/x9c/x37 HANGUL SYLLABLE SYUK
-+<UC2A1>     /x83/x32/x9c/x38 HANGUL SYLLABLE SYUT
-+<UC2A2>     /x83/x32/x9c/x39 HANGUL SYLLABLE SYUP
-+<UC2A3>     /x83/x32/x9d/x30 HANGUL SYLLABLE SYUH
-+<UC2A4>     /x83/x32/x9d/x31 HANGUL SYLLABLE SEU
-+<UC2A5>     /x83/x32/x9d/x32 HANGUL SYLLABLE SEUG
-+<UC2A6>     /x83/x32/x9d/x33 HANGUL SYLLABLE SEUGG
-+<UC2A7>     /x83/x32/x9d/x34 HANGUL SYLLABLE SEUGS
-+<UC2A8>     /x83/x32/x9d/x35 HANGUL SYLLABLE SEUN
-+<UC2A9>     /x83/x32/x9d/x36 HANGUL SYLLABLE SEUNI
-+<UC2AA>     /x83/x32/x9d/x37 HANGUL SYLLABLE SEUNH
-+<UC2AB>     /x83/x32/x9d/x38 HANGUL SYLLABLE SEUD
-+<UC2AC>     /x83/x32/x9d/x39 HANGUL SYLLABLE SEUL
-+<UC2AD>     /x83/x32/x9e/x30 HANGUL SYLLABLE SEULG
-+<UC2AE>     /x83/x32/x9e/x31 HANGUL SYLLABLE SEULM
-+<UC2AF>     /x83/x32/x9e/x32 HANGUL SYLLABLE SEULB
-+<UC2B0>     /x83/x32/x9e/x33 HANGUL SYLLABLE SEULS
-+<UC2B1>     /x83/x32/x9e/x34 HANGUL SYLLABLE SEULT
-+<UC2B2>     /x83/x32/x9e/x35 HANGUL SYLLABLE SEULP
-+<UC2B3>     /x83/x32/x9e/x36 HANGUL SYLLABLE SEULH
-+<UC2B4>     /x83/x32/x9e/x37 HANGUL SYLLABLE SEUM
-+<UC2B5>     /x83/x32/x9e/x38 HANGUL SYLLABLE SEUB
-+<UC2B6>     /x83/x32/x9e/x39 HANGUL SYLLABLE SEUBS
-+<UC2B7>     /x83/x32/x9f/x30 HANGUL SYLLABLE SEUS
-+<UC2B8>     /x83/x32/x9f/x31 HANGUL SYLLABLE SEUSS
-+<UC2B9>     /x83/x32/x9f/x32 HANGUL SYLLABLE SEUNG
-+<UC2BA>     /x83/x32/x9f/x33 HANGUL SYLLABLE SEUJ
-+<UC2BB>     /x83/x32/x9f/x34 HANGUL SYLLABLE SEUC
-+<UC2BC>     /x83/x32/x9f/x35 HANGUL SYLLABLE SEUK
-+<UC2BD>     /x83/x32/x9f/x36 HANGUL SYLLABLE SEUT
-+<UC2BE>     /x83/x32/x9f/x37 HANGUL SYLLABLE SEUP
-+<UC2BF>     /x83/x32/x9f/x38 HANGUL SYLLABLE SEUH
-+<UC2C0>     /x83/x32/x9f/x39 HANGUL SYLLABLE SYI
-+<UC2C1>     /x83/x32/xa0/x30 HANGUL SYLLABLE SYIG
-+<UC2C2>     /x83/x32/xa0/x31 HANGUL SYLLABLE SYIGG
-+<UC2C3>     /x83/x32/xa0/x32 HANGUL SYLLABLE SYIGS
-+<UC2C4>     /x83/x32/xa0/x33 HANGUL SYLLABLE SYIN
-+<UC2C5>     /x83/x32/xa0/x34 HANGUL SYLLABLE SYINI
-+<UC2C6>     /x83/x32/xa0/x35 HANGUL SYLLABLE SYINH
-+<UC2C7>     /x83/x32/xa0/x36 HANGUL SYLLABLE SYID
-+<UC2C8>     /x83/x32/xa0/x37 HANGUL SYLLABLE SYIL
-+<UC2C9>     /x83/x32/xa0/x38 HANGUL SYLLABLE SYILG
-+<UC2CA>     /x83/x32/xa0/x39 HANGUL SYLLABLE SYILM
-+<UC2CB>     /x83/x32/xa1/x30 HANGUL SYLLABLE SYILB
-+<UC2CC>     /x83/x32/xa1/x31 HANGUL SYLLABLE SYILS
-+<UC2CD>     /x83/x32/xa1/x32 HANGUL SYLLABLE SYILT
-+<UC2CE>     /x83/x32/xa1/x33 HANGUL SYLLABLE SYILP
-+<UC2CF>     /x83/x32/xa1/x34 HANGUL SYLLABLE SYILH
-+<UC2D0>     /x83/x32/xa1/x35 HANGUL SYLLABLE SYIM
-+<UC2D1>     /x83/x32/xa1/x36 HANGUL SYLLABLE SYIB
-+<UC2D2>     /x83/x32/xa1/x37 HANGUL SYLLABLE SYIBS
-+<UC2D3>     /x83/x32/xa1/x38 HANGUL SYLLABLE SYIS
-+<UC2D4>     /x83/x32/xa1/x39 HANGUL SYLLABLE SYISS
-+<UC2D5>     /x83/x32/xa2/x30 HANGUL SYLLABLE SYING
-+<UC2D6>     /x83/x32/xa2/x31 HANGUL SYLLABLE SYIJ
-+<UC2D7>     /x83/x32/xa2/x32 HANGUL SYLLABLE SYIC
-+<UC2D8>     /x83/x32/xa2/x33 HANGUL SYLLABLE SYIK
-+<UC2D9>     /x83/x32/xa2/x34 HANGUL SYLLABLE SYIT
-+<UC2DA>     /x83/x32/xa2/x35 HANGUL SYLLABLE SYIP
-+<UC2DB>     /x83/x32/xa2/x36 HANGUL SYLLABLE SYIH
-+<UC2DC>     /x83/x32/xa2/x37 HANGUL SYLLABLE SI
-+<UC2DD>     /x83/x32/xa2/x38 HANGUL SYLLABLE SIG
-+<UC2DE>     /x83/x32/xa2/x39 HANGUL SYLLABLE SIGG
-+<UC2DF>     /x83/x32/xa3/x30 HANGUL SYLLABLE SIGS
-+<UC2E0>     /x83/x32/xa3/x31 HANGUL SYLLABLE SIN
-+<UC2E1>     /x83/x32/xa3/x32 HANGUL SYLLABLE SINI
-+<UC2E2>     /x83/x32/xa3/x33 HANGUL SYLLABLE SINH
-+<UC2E3>     /x83/x32/xa3/x34 HANGUL SYLLABLE SID
-+<UC2E4>     /x83/x32/xa3/x35 HANGUL SYLLABLE SIL
-+<UC2E5>     /x83/x32/xa3/x36 HANGUL SYLLABLE SILG
-+<UC2E6>     /x83/x32/xa3/x37 HANGUL SYLLABLE SILM
-+<UC2E7>     /x83/x32/xa3/x38 HANGUL SYLLABLE SILB
-+<UC2E8>     /x83/x32/xa3/x39 HANGUL SYLLABLE SILS
-+<UC2E9>     /x83/x32/xa4/x30 HANGUL SYLLABLE SILT
-+<UC2EA>     /x83/x32/xa4/x31 HANGUL SYLLABLE SILP
-+<UC2EB>     /x83/x32/xa4/x32 HANGUL SYLLABLE SILH
-+<UC2EC>     /x83/x32/xa4/x33 HANGUL SYLLABLE SIM
-+<UC2ED>     /x83/x32/xa4/x34 HANGUL SYLLABLE SIB
-+<UC2EE>     /x83/x32/xa4/x35 HANGUL SYLLABLE SIBS
-+<UC2EF>     /x83/x32/xa4/x36 HANGUL SYLLABLE SIS
-+<UC2F0>     /x83/x32/xa4/x37 HANGUL SYLLABLE SISS
-+<UC2F1>     /x83/x32/xa4/x38 HANGUL SYLLABLE SING
-+<UC2F2>     /x83/x32/xa4/x39 HANGUL SYLLABLE SIJ
-+<UC2F3>     /x83/x32/xa5/x30 HANGUL SYLLABLE SIC
-+<UC2F4>     /x83/x32/xa5/x31 HANGUL SYLLABLE SIK
-+<UC2F5>     /x83/x32/xa5/x32 HANGUL SYLLABLE SIT
-+<UC2F6>     /x83/x32/xa5/x33 HANGUL SYLLABLE SIP
-+<UC2F7>     /x83/x32/xa5/x34 HANGUL SYLLABLE SIH
-+<UC2F8>     /x83/x32/xa5/x35 HANGUL SYLLABLE SSA
-+<UC2F9>     /x83/x32/xa5/x36 HANGUL SYLLABLE SSAG
-+<UC2FA>     /x83/x32/xa5/x37 HANGUL SYLLABLE SSAGG
-+<UC2FB>     /x83/x32/xa5/x38 HANGUL SYLLABLE SSAGS
-+<UC2FC>     /x83/x32/xa5/x39 HANGUL SYLLABLE SSAN
-+<UC2FD>     /x83/x32/xa6/x30 HANGUL SYLLABLE SSANI
-+<UC2FE>     /x83/x32/xa6/x31 HANGUL SYLLABLE SSANH
-+<UC2FF>     /x83/x32/xa6/x32 HANGUL SYLLABLE SSAD
-+<UC300>     /x83/x32/xa6/x33 HANGUL SYLLABLE SSAL
-+<UC301>     /x83/x32/xa6/x34 HANGUL SYLLABLE SSALG
-+<UC302>     /x83/x32/xa6/x35 HANGUL SYLLABLE SSALM
-+<UC303>     /x83/x32/xa6/x36 HANGUL SYLLABLE SSALB
-+<UC304>     /x83/x32/xa6/x37 HANGUL SYLLABLE SSALS
-+<UC305>     /x83/x32/xa6/x38 HANGUL SYLLABLE SSALT
-+<UC306>     /x83/x32/xa6/x39 HANGUL SYLLABLE SSALP
-+<UC307>     /x83/x32/xa7/x30 HANGUL SYLLABLE SSALH
-+<UC308>     /x83/x32/xa7/x31 HANGUL SYLLABLE SSAM
-+<UC309>     /x83/x32/xa7/x32 HANGUL SYLLABLE SSAB
-+<UC30A>     /x83/x32/xa7/x33 HANGUL SYLLABLE SSABS
-+<UC30B>     /x83/x32/xa7/x34 HANGUL SYLLABLE SSAS
-+<UC30C>     /x83/x32/xa7/x35 HANGUL SYLLABLE SSASS
-+<UC30D>     /x83/x32/xa7/x36 HANGUL SYLLABLE SSANG
-+<UC30E>     /x83/x32/xa7/x37 HANGUL SYLLABLE SSAJ
-+<UC30F>     /x83/x32/xa7/x38 HANGUL SYLLABLE SSAC
-+<UC310>     /x83/x32/xa7/x39 HANGUL SYLLABLE SSAK
-+<UC311>     /x83/x32/xa8/x30 HANGUL SYLLABLE SSAT
-+<UC312>     /x83/x32/xa8/x31 HANGUL SYLLABLE SSAP
-+<UC313>     /x83/x32/xa8/x32 HANGUL SYLLABLE SSAH
-+<UC314>     /x83/x32/xa8/x33 HANGUL SYLLABLE SSAE
-+<UC315>     /x83/x32/xa8/x34 HANGUL SYLLABLE SSAEG
-+<UC316>     /x83/x32/xa8/x35 HANGUL SYLLABLE SSAEGG
-+<UC317>     /x83/x32/xa8/x36 HANGUL SYLLABLE SSAEGS
-+<UC318>     /x83/x32/xa8/x37 HANGUL SYLLABLE SSAEN
-+<UC319>     /x83/x32/xa8/x38 HANGUL SYLLABLE SSAENI
-+<UC31A>     /x83/x32/xa8/x39 HANGUL SYLLABLE SSAENH
-+<UC31B>     /x83/x32/xa9/x30 HANGUL SYLLABLE SSAED
-+<UC31C>     /x83/x32/xa9/x31 HANGUL SYLLABLE SSAEL
-+<UC31D>     /x83/x32/xa9/x32 HANGUL SYLLABLE SSAELG
-+<UC31E>     /x83/x32/xa9/x33 HANGUL SYLLABLE SSAELM
-+<UC31F>     /x83/x32/xa9/x34 HANGUL SYLLABLE SSAELB
-+<UC320>     /x83/x32/xa9/x35 HANGUL SYLLABLE SSAELS
-+<UC321>     /x83/x32/xa9/x36 HANGUL SYLLABLE SSAELT
-+<UC322>     /x83/x32/xa9/x37 HANGUL SYLLABLE SSAELP
-+<UC323>     /x83/x32/xa9/x38 HANGUL SYLLABLE SSAELH
-+<UC324>     /x83/x32/xa9/x39 HANGUL SYLLABLE SSAEM
-+<UC325>     /x83/x32/xaa/x30 HANGUL SYLLABLE SSAEB
-+<UC326>     /x83/x32/xaa/x31 HANGUL SYLLABLE SSAEBS
-+<UC327>     /x83/x32/xaa/x32 HANGUL SYLLABLE SSAES
-+<UC328>     /x83/x32/xaa/x33 HANGUL SYLLABLE SSAESS
-+<UC329>     /x83/x32/xaa/x34 HANGUL SYLLABLE SSAENG
-+<UC32A>     /x83/x32/xaa/x35 HANGUL SYLLABLE SSAEJ
-+<UC32B>     /x83/x32/xaa/x36 HANGUL SYLLABLE SSAEC
-+<UC32C>     /x83/x32/xaa/x37 HANGUL SYLLABLE SSAEK
-+<UC32D>     /x83/x32/xaa/x38 HANGUL SYLLABLE SSAET
-+<UC32E>     /x83/x32/xaa/x39 HANGUL SYLLABLE SSAEP
-+<UC32F>     /x83/x32/xab/x30 HANGUL SYLLABLE SSAEH
-+<UC330>     /x83/x32/xab/x31 HANGUL SYLLABLE SSYA
-+<UC331>     /x83/x32/xab/x32 HANGUL SYLLABLE SSYAG
-+<UC332>     /x83/x32/xab/x33 HANGUL SYLLABLE SSYAGG
-+<UC333>     /x83/x32/xab/x34 HANGUL SYLLABLE SSYAGS
-+<UC334>     /x83/x32/xab/x35 HANGUL SYLLABLE SSYAN
-+<UC335>     /x83/x32/xab/x36 HANGUL SYLLABLE SSYANI
-+<UC336>     /x83/x32/xab/x37 HANGUL SYLLABLE SSYANH
-+<UC337>     /x83/x32/xab/x38 HANGUL SYLLABLE SSYAD
-+<UC338>     /x83/x32/xab/x39 HANGUL SYLLABLE SSYAL
-+<UC339>     /x83/x32/xac/x30 HANGUL SYLLABLE SSYALG
-+<UC33A>     /x83/x32/xac/x31 HANGUL SYLLABLE SSYALM
-+<UC33B>     /x83/x32/xac/x32 HANGUL SYLLABLE SSYALB
-+<UC33C>     /x83/x32/xac/x33 HANGUL SYLLABLE SSYALS
-+<UC33D>     /x83/x32/xac/x34 HANGUL SYLLABLE SSYALT
-+<UC33E>     /x83/x32/xac/x35 HANGUL SYLLABLE SSYALP
-+<UC33F>     /x83/x32/xac/x36 HANGUL SYLLABLE SSYALH
-+<UC340>     /x83/x32/xac/x37 HANGUL SYLLABLE SSYAM
-+<UC341>     /x83/x32/xac/x38 HANGUL SYLLABLE SSYAB
-+<UC342>     /x83/x32/xac/x39 HANGUL SYLLABLE SSYABS
-+<UC343>     /x83/x32/xad/x30 HANGUL SYLLABLE SSYAS
-+<UC344>     /x83/x32/xad/x31 HANGUL SYLLABLE SSYASS
-+<UC345>     /x83/x32/xad/x32 HANGUL SYLLABLE SSYANG
-+<UC346>     /x83/x32/xad/x33 HANGUL SYLLABLE SSYAJ
-+<UC347>     /x83/x32/xad/x34 HANGUL SYLLABLE SSYAC
-+<UC348>     /x83/x32/xad/x35 HANGUL SYLLABLE SSYAK
-+<UC349>     /x83/x32/xad/x36 HANGUL SYLLABLE SSYAT
-+<UC34A>     /x83/x32/xad/x37 HANGUL SYLLABLE SSYAP
-+<UC34B>     /x83/x32/xad/x38 HANGUL SYLLABLE SSYAH
-+<UC34C>     /x83/x32/xad/x39 HANGUL SYLLABLE SSYAE
-+<UC34D>     /x83/x32/xae/x30 HANGUL SYLLABLE SSYAEG
-+<UC34E>     /x83/x32/xae/x31 HANGUL SYLLABLE SSYAEGG
-+<UC34F>     /x83/x32/xae/x32 HANGUL SYLLABLE SSYAEGS
-+<UC350>     /x83/x32/xae/x33 HANGUL SYLLABLE SSYAEN
-+<UC351>     /x83/x32/xae/x34 HANGUL SYLLABLE SSYAENI
-+<UC352>     /x83/x32/xae/x35 HANGUL SYLLABLE SSYAENH
-+<UC353>     /x83/x32/xae/x36 HANGUL SYLLABLE SSYAED
-+<UC354>     /x83/x32/xae/x37 HANGUL SYLLABLE SSYAEL
-+<UC355>     /x83/x32/xae/x38 HANGUL SYLLABLE SSYAELG
-+<UC356>     /x83/x32/xae/x39 HANGUL SYLLABLE SSYAELM
-+<UC357>     /x83/x32/xaf/x30 HANGUL SYLLABLE SSYAELB
-+<UC358>     /x83/x32/xaf/x31 HANGUL SYLLABLE SSYAELS
-+<UC359>     /x83/x32/xaf/x32 HANGUL SYLLABLE SSYAELT
-+<UC35A>     /x83/x32/xaf/x33 HANGUL SYLLABLE SSYAELP
-+<UC35B>     /x83/x32/xaf/x34 HANGUL SYLLABLE SSYAELH
-+<UC35C>     /x83/x32/xaf/x35 HANGUL SYLLABLE SSYAEM
-+<UC35D>     /x83/x32/xaf/x36 HANGUL SYLLABLE SSYAEB
-+<UC35E>     /x83/x32/xaf/x37 HANGUL SYLLABLE SSYAEBS
-+<UC35F>     /x83/x32/xaf/x38 HANGUL SYLLABLE SSYAES
-+<UC360>     /x83/x32/xaf/x39 HANGUL SYLLABLE SSYAESS
-+<UC361>     /x83/x32/xb0/x30 HANGUL SYLLABLE SSYAENG
-+<UC362>     /x83/x32/xb0/x31 HANGUL SYLLABLE SSYAEJ
-+<UC363>     /x83/x32/xb0/x32 HANGUL SYLLABLE SSYAEC
-+<UC364>     /x83/x32/xb0/x33 HANGUL SYLLABLE SSYAEK
-+<UC365>     /x83/x32/xb0/x34 HANGUL SYLLABLE SSYAET
-+<UC366>     /x83/x32/xb0/x35 HANGUL SYLLABLE SSYAEP
-+<UC367>     /x83/x32/xb0/x36 HANGUL SYLLABLE SSYAEH
-+<UC368>     /x83/x32/xb0/x37 HANGUL SYLLABLE SSEO
-+<UC369>     /x83/x32/xb0/x38 HANGUL SYLLABLE SSEOG
-+<UC36A>     /x83/x32/xb0/x39 HANGUL SYLLABLE SSEOGG
-+<UC36B>     /x83/x32/xb1/x30 HANGUL SYLLABLE SSEOGS
-+<UC36C>     /x83/x32/xb1/x31 HANGUL SYLLABLE SSEON
-+<UC36D>     /x83/x32/xb1/x32 HANGUL SYLLABLE SSEONI
-+<UC36E>     /x83/x32/xb1/x33 HANGUL SYLLABLE SSEONH
-+<UC36F>     /x83/x32/xb1/x34 HANGUL SYLLABLE SSEOD
-+<UC370>     /x83/x32/xb1/x35 HANGUL SYLLABLE SSEOL
-+<UC371>     /x83/x32/xb1/x36 HANGUL SYLLABLE SSEOLG
-+<UC372>     /x83/x32/xb1/x37 HANGUL SYLLABLE SSEOLM
-+<UC373>     /x83/x32/xb1/x38 HANGUL SYLLABLE SSEOLB
-+<UC374>     /x83/x32/xb1/x39 HANGUL SYLLABLE SSEOLS
-+<UC375>     /x83/x32/xb2/x30 HANGUL SYLLABLE SSEOLT
-+<UC376>     /x83/x32/xb2/x31 HANGUL SYLLABLE SSEOLP
-+<UC377>     /x83/x32/xb2/x32 HANGUL SYLLABLE SSEOLH
-+<UC378>     /x83/x32/xb2/x33 HANGUL SYLLABLE SSEOM
-+<UC379>     /x83/x32/xb2/x34 HANGUL SYLLABLE SSEOB
-+<UC37A>     /x83/x32/xb2/x35 HANGUL SYLLABLE SSEOBS
-+<UC37B>     /x83/x32/xb2/x36 HANGUL SYLLABLE SSEOS
-+<UC37C>     /x83/x32/xb2/x37 HANGUL SYLLABLE SSEOSS
-+<UC37D>     /x83/x32/xb2/x38 HANGUL SYLLABLE SSEONG
-+<UC37E>     /x83/x32/xb2/x39 HANGUL SYLLABLE SSEOJ
-+<UC37F>     /x83/x32/xb3/x30 HANGUL SYLLABLE SSEOC
-+<UC380>     /x83/x32/xb3/x31 HANGUL SYLLABLE SSEOK
-+<UC381>     /x83/x32/xb3/x32 HANGUL SYLLABLE SSEOT
-+<UC382>     /x83/x32/xb3/x33 HANGUL SYLLABLE SSEOP
-+<UC383>     /x83/x32/xb3/x34 HANGUL SYLLABLE SSEOH
-+<UC384>     /x83/x32/xb3/x35 HANGUL SYLLABLE SSE
-+<UC385>     /x83/x32/xb3/x36 HANGUL SYLLABLE SSEG
-+<UC386>     /x83/x32/xb3/x37 HANGUL SYLLABLE SSEGG
-+<UC387>     /x83/x32/xb3/x38 HANGUL SYLLABLE SSEGS
-+<UC388>     /x83/x32/xb3/x39 HANGUL SYLLABLE SSEN
-+<UC389>     /x83/x32/xb4/x30 HANGUL SYLLABLE SSENI
-+<UC38A>     /x83/x32/xb4/x31 HANGUL SYLLABLE SSENH
-+<UC38B>     /x83/x32/xb4/x32 HANGUL SYLLABLE SSED
-+<UC38C>     /x83/x32/xb4/x33 HANGUL SYLLABLE SSEL
-+<UC38D>     /x83/x32/xb4/x34 HANGUL SYLLABLE SSELG
-+<UC38E>     /x83/x32/xb4/x35 HANGUL SYLLABLE SSELM
-+<UC38F>     /x83/x32/xb4/x36 HANGUL SYLLABLE SSELB
-+<UC390>     /x83/x32/xb4/x37 HANGUL SYLLABLE SSELS
-+<UC391>     /x83/x32/xb4/x38 HANGUL SYLLABLE SSELT
-+<UC392>     /x83/x32/xb4/x39 HANGUL SYLLABLE SSELP
-+<UC393>     /x83/x32/xb5/x30 HANGUL SYLLABLE SSELH
-+<UC394>     /x83/x32/xb5/x31 HANGUL SYLLABLE SSEM
-+<UC395>     /x83/x32/xb5/x32 HANGUL SYLLABLE SSEB
-+<UC396>     /x83/x32/xb5/x33 HANGUL SYLLABLE SSEBS
-+<UC397>     /x83/x32/xb5/x34 HANGUL SYLLABLE SSES
-+<UC398>     /x83/x32/xb5/x35 HANGUL SYLLABLE SSESS
-+<UC399>     /x83/x32/xb5/x36 HANGUL SYLLABLE SSENG
-+<UC39A>     /x83/x32/xb5/x37 HANGUL SYLLABLE SSEJ
-+<UC39B>     /x83/x32/xb5/x38 HANGUL SYLLABLE SSEC
-+<UC39C>     /x83/x32/xb5/x39 HANGUL SYLLABLE SSEK
-+<UC39D>     /x83/x32/xb6/x30 HANGUL SYLLABLE SSET
-+<UC39E>     /x83/x32/xb6/x31 HANGUL SYLLABLE SSEP
-+<UC39F>     /x83/x32/xb6/x32 HANGUL SYLLABLE SSEH
-+<UC3A0>     /x83/x32/xb6/x33 HANGUL SYLLABLE SSYEO
-+<UC3A1>     /x83/x32/xb6/x34 HANGUL SYLLABLE SSYEOG
-+<UC3A2>     /x83/x32/xb6/x35 HANGUL SYLLABLE SSYEOGG
-+<UC3A3>     /x83/x32/xb6/x36 HANGUL SYLLABLE SSYEOGS
-+<UC3A4>     /x83/x32/xb6/x37 HANGUL SYLLABLE SSYEON
-+<UC3A5>     /x83/x32/xb6/x38 HANGUL SYLLABLE SSYEONI
-+<UC3A6>     /x83/x32/xb6/x39 HANGUL SYLLABLE SSYEONH
-+<UC3A7>     /x83/x32/xb7/x30 HANGUL SYLLABLE SSYEOD
-+<UC3A8>     /x83/x32/xb7/x31 HANGUL SYLLABLE SSYEOL
-+<UC3A9>     /x83/x32/xb7/x32 HANGUL SYLLABLE SSYEOLG
-+<UC3AA>     /x83/x32/xb7/x33 HANGUL SYLLABLE SSYEOLM
-+<UC3AB>     /x83/x32/xb7/x34 HANGUL SYLLABLE SSYEOLB
-+<UC3AC>     /x83/x32/xb7/x35 HANGUL SYLLABLE SSYEOLS
-+<UC3AD>     /x83/x32/xb7/x36 HANGUL SYLLABLE SSYEOLT
-+<UC3AE>     /x83/x32/xb7/x37 HANGUL SYLLABLE SSYEOLP
-+<UC3AF>     /x83/x32/xb7/x38 HANGUL SYLLABLE SSYEOLH
-+<UC3B0>     /x83/x32/xb7/x39 HANGUL SYLLABLE SSYEOM
-+<UC3B1>     /x83/x32/xb8/x30 HANGUL SYLLABLE SSYEOB
-+<UC3B2>     /x83/x32/xb8/x31 HANGUL SYLLABLE SSYEOBS
-+<UC3B3>     /x83/x32/xb8/x32 HANGUL SYLLABLE SSYEOS
-+<UC3B4>     /x83/x32/xb8/x33 HANGUL SYLLABLE SSYEOSS
-+<UC3B5>     /x83/x32/xb8/x34 HANGUL SYLLABLE SSYEONG
-+<UC3B6>     /x83/x32/xb8/x35 HANGUL SYLLABLE SSYEOJ
-+<UC3B7>     /x83/x32/xb8/x36 HANGUL SYLLABLE SSYEOC
-+<UC3B8>     /x83/x32/xb8/x37 HANGUL SYLLABLE SSYEOK
-+<UC3B9>     /x83/x32/xb8/x38 HANGUL SYLLABLE SSYEOT
-+<UC3BA>     /x83/x32/xb8/x39 HANGUL SYLLABLE SSYEOP
-+<UC3BB>     /x83/x32/xb9/x30 HANGUL SYLLABLE SSYEOH
-+<UC3BC>     /x83/x32/xb9/x31 HANGUL SYLLABLE SSYE
-+<UC3BD>     /x83/x32/xb9/x32 HANGUL SYLLABLE SSYEG
-+<UC3BE>     /x83/x32/xb9/x33 HANGUL SYLLABLE SSYEGG
-+<UC3BF>     /x83/x32/xb9/x34 HANGUL SYLLABLE SSYEGS
-+<UC3C0>     /x83/x32/xb9/x35 HANGUL SYLLABLE SSYEN
-+<UC3C1>     /x83/x32/xb9/x36 HANGUL SYLLABLE SSYENI
-+<UC3C2>     /x83/x32/xb9/x37 HANGUL SYLLABLE SSYENH
-+<UC3C3>     /x83/x32/xb9/x38 HANGUL SYLLABLE SSYED
-+<UC3C4>     /x83/x32/xb9/x39 HANGUL SYLLABLE SSYEL
-+<UC3C5>     /x83/x32/xba/x30 HANGUL SYLLABLE SSYELG
-+<UC3C6>     /x83/x32/xba/x31 HANGUL SYLLABLE SSYELM
-+<UC3C7>     /x83/x32/xba/x32 HANGUL SYLLABLE SSYELB
-+<UC3C8>     /x83/x32/xba/x33 HANGUL SYLLABLE SSYELS
-+<UC3C9>     /x83/x32/xba/x34 HANGUL SYLLABLE SSYELT
-+<UC3CA>     /x83/x32/xba/x35 HANGUL SYLLABLE SSYELP
-+<UC3CB>     /x83/x32/xba/x36 HANGUL SYLLABLE SSYELH
-+<UC3CC>     /x83/x32/xba/x37 HANGUL SYLLABLE SSYEM
-+<UC3CD>     /x83/x32/xba/x38 HANGUL SYLLABLE SSYEB
-+<UC3CE>     /x83/x32/xba/x39 HANGUL SYLLABLE SSYEBS
-+<UC3CF>     /x83/x32/xbb/x30 HANGUL SYLLABLE SSYES
-+<UC3D0>     /x83/x32/xbb/x31 HANGUL SYLLABLE SSYESS
-+<UC3D1>     /x83/x32/xbb/x32 HANGUL SYLLABLE SSYENG
-+<UC3D2>     /x83/x32/xbb/x33 HANGUL SYLLABLE SSYEJ
-+<UC3D3>     /x83/x32/xbb/x34 HANGUL SYLLABLE SSYEC
-+<UC3D4>     /x83/x32/xbb/x35 HANGUL SYLLABLE SSYEK
-+<UC3D5>     /x83/x32/xbb/x36 HANGUL SYLLABLE SSYET
-+<UC3D6>     /x83/x32/xbb/x37 HANGUL SYLLABLE SSYEP
-+<UC3D7>     /x83/x32/xbb/x38 HANGUL SYLLABLE SSYEH
-+<UC3D8>     /x83/x32/xbb/x39 HANGUL SYLLABLE SSO
-+<UC3D9>     /x83/x32/xbc/x30 HANGUL SYLLABLE SSOG
-+<UC3DA>     /x83/x32/xbc/x31 HANGUL SYLLABLE SSOGG
-+<UC3DB>     /x83/x32/xbc/x32 HANGUL SYLLABLE SSOGS
-+<UC3DC>     /x83/x32/xbc/x33 HANGUL SYLLABLE SSON
-+<UC3DD>     /x83/x32/xbc/x34 HANGUL SYLLABLE SSONI
-+<UC3DE>     /x83/x32/xbc/x35 HANGUL SYLLABLE SSONH
-+<UC3DF>     /x83/x32/xbc/x36 HANGUL SYLLABLE SSOD
-+<UC3E0>     /x83/x32/xbc/x37 HANGUL SYLLABLE SSOL
-+<UC3E1>     /x83/x32/xbc/x38 HANGUL SYLLABLE SSOLG
-+<UC3E2>     /x83/x32/xbc/x39 HANGUL SYLLABLE SSOLM
-+<UC3E3>     /x83/x32/xbd/x30 HANGUL SYLLABLE SSOLB
-+<UC3E4>     /x83/x32/xbd/x31 HANGUL SYLLABLE SSOLS
-+<UC3E5>     /x83/x32/xbd/x32 HANGUL SYLLABLE SSOLT
-+<UC3E6>     /x83/x32/xbd/x33 HANGUL SYLLABLE SSOLP
-+<UC3E7>     /x83/x32/xbd/x34 HANGUL SYLLABLE SSOLH
-+<UC3E8>     /x83/x32/xbd/x35 HANGUL SYLLABLE SSOM
-+<UC3E9>     /x83/x32/xbd/x36 HANGUL SYLLABLE SSOB
-+<UC3EA>     /x83/x32/xbd/x37 HANGUL SYLLABLE SSOBS
-+<UC3EB>     /x83/x32/xbd/x38 HANGUL SYLLABLE SSOS
-+<UC3EC>     /x83/x32/xbd/x39 HANGUL SYLLABLE SSOSS
-+<UC3ED>     /x83/x32/xbe/x30 HANGUL SYLLABLE SSONG
-+<UC3EE>     /x83/x32/xbe/x31 HANGUL SYLLABLE SSOJ
-+<UC3EF>     /x83/x32/xbe/x32 HANGUL SYLLABLE SSOC
-+<UC3F0>     /x83/x32/xbe/x33 HANGUL SYLLABLE SSOK
-+<UC3F1>     /x83/x32/xbe/x34 HANGUL SYLLABLE SSOT
-+<UC3F2>     /x83/x32/xbe/x35 HANGUL SYLLABLE SSOP
-+<UC3F3>     /x83/x32/xbe/x36 HANGUL SYLLABLE SSOH
-+<UC3F4>     /x83/x32/xbe/x37 HANGUL SYLLABLE SSWA
-+<UC3F5>     /x83/x32/xbe/x38 HANGUL SYLLABLE SSWAG
-+<UC3F6>     /x83/x32/xbe/x39 HANGUL SYLLABLE SSWAGG
-+<UC3F7>     /x83/x32/xbf/x30 HANGUL SYLLABLE SSWAGS
-+<UC3F8>     /x83/x32/xbf/x31 HANGUL SYLLABLE SSWAN
-+<UC3F9>     /x83/x32/xbf/x32 HANGUL SYLLABLE SSWANI
-+<UC3FA>     /x83/x32/xbf/x33 HANGUL SYLLABLE SSWANH
-+<UC3FB>     /x83/x32/xbf/x34 HANGUL SYLLABLE SSWAD
-+<UC3FC>     /x83/x32/xbf/x35 HANGUL SYLLABLE SSWAL
-+<UC3FD>     /x83/x32/xbf/x36 HANGUL SYLLABLE SSWALG
-+<UC3FE>     /x83/x32/xbf/x37 HANGUL SYLLABLE SSWALM
-+<UC3FF>     /x83/x32/xbf/x38 HANGUL SYLLABLE SSWALB
-+<UC400>     /x83/x32/xbf/x39 HANGUL SYLLABLE SSWALS
-+<UC401>     /x83/x32/xc0/x30 HANGUL SYLLABLE SSWALT
-+<UC402>     /x83/x32/xc0/x31 HANGUL SYLLABLE SSWALP
-+<UC403>     /x83/x32/xc0/x32 HANGUL SYLLABLE SSWALH
-+<UC404>     /x83/x32/xc0/x33 HANGUL SYLLABLE SSWAM
-+<UC405>     /x83/x32/xc0/x34 HANGUL SYLLABLE SSWAB
-+<UC406>     /x83/x32/xc0/x35 HANGUL SYLLABLE SSWABS
-+<UC407>     /x83/x32/xc0/x36 HANGUL SYLLABLE SSWAS
-+<UC408>     /x83/x32/xc0/x37 HANGUL SYLLABLE SSWASS
-+<UC409>     /x83/x32/xc0/x38 HANGUL SYLLABLE SSWANG
-+<UC40A>     /x83/x32/xc0/x39 HANGUL SYLLABLE SSWAJ
-+<UC40B>     /x83/x32/xc1/x30 HANGUL SYLLABLE SSWAC
-+<UC40C>     /x83/x32/xc1/x31 HANGUL SYLLABLE SSWAK
-+<UC40D>     /x83/x32/xc1/x32 HANGUL SYLLABLE SSWAT
-+<UC40E>     /x83/x32/xc1/x33 HANGUL SYLLABLE SSWAP
-+<UC40F>     /x83/x32/xc1/x34 HANGUL SYLLABLE SSWAH
-+<UC410>     /x83/x32/xc1/x35 HANGUL SYLLABLE SSWAE
-+<UC411>     /x83/x32/xc1/x36 HANGUL SYLLABLE SSWAEG
-+<UC412>     /x83/x32/xc1/x37 HANGUL SYLLABLE SSWAEGG
-+<UC413>     /x83/x32/xc1/x38 HANGUL SYLLABLE SSWAEGS
-+<UC414>     /x83/x32/xc1/x39 HANGUL SYLLABLE SSWAEN
-+<UC415>     /x83/x32/xc2/x30 HANGUL SYLLABLE SSWAENI
-+<UC416>     /x83/x32/xc2/x31 HANGUL SYLLABLE SSWAENH
-+<UC417>     /x83/x32/xc2/x32 HANGUL SYLLABLE SSWAED
-+<UC418>     /x83/x32/xc2/x33 HANGUL SYLLABLE SSWAEL
-+<UC419>     /x83/x32/xc2/x34 HANGUL SYLLABLE SSWAELG
-+<UC41A>     /x83/x32/xc2/x35 HANGUL SYLLABLE SSWAELM
-+<UC41B>     /x83/x32/xc2/x36 HANGUL SYLLABLE SSWAELB
-+<UC41C>     /x83/x32/xc2/x37 HANGUL SYLLABLE SSWAELS
-+<UC41D>     /x83/x32/xc2/x38 HANGUL SYLLABLE SSWAELT
-+<UC41E>     /x83/x32/xc2/x39 HANGUL SYLLABLE SSWAELP
-+<UC41F>     /x83/x32/xc3/x30 HANGUL SYLLABLE SSWAELH
-+<UC420>     /x83/x32/xc3/x31 HANGUL SYLLABLE SSWAEM
-+<UC421>     /x83/x32/xc3/x32 HANGUL SYLLABLE SSWAEB
-+<UC422>     /x83/x32/xc3/x33 HANGUL SYLLABLE SSWAEBS
-+<UC423>     /x83/x32/xc3/x34 HANGUL SYLLABLE SSWAES
-+<UC424>     /x83/x32/xc3/x35 HANGUL SYLLABLE SSWAESS
-+<UC425>     /x83/x32/xc3/x36 HANGUL SYLLABLE SSWAENG
-+<UC426>     /x83/x32/xc3/x37 HANGUL SYLLABLE SSWAEJ
-+<UC427>     /x83/x32/xc3/x38 HANGUL SYLLABLE SSWAEC
-+<UC428>     /x83/x32/xc3/x39 HANGUL SYLLABLE SSWAEK
-+<UC429>     /x83/x32/xc4/x30 HANGUL SYLLABLE SSWAET
-+<UC42A>     /x83/x32/xc4/x31 HANGUL SYLLABLE SSWAEP
-+<UC42B>     /x83/x32/xc4/x32 HANGUL SYLLABLE SSWAEH
-+<UC42C>     /x83/x32/xc4/x33 HANGUL SYLLABLE SSOE
-+<UC42D>     /x83/x32/xc4/x34 HANGUL SYLLABLE SSOEG
-+<UC42E>     /x83/x32/xc4/x35 HANGUL SYLLABLE SSOEGG
-+<UC42F>     /x83/x32/xc4/x36 HANGUL SYLLABLE SSOEGS
-+<UC430>     /x83/x32/xc4/x37 HANGUL SYLLABLE SSOEN
-+<UC431>     /x83/x32/xc4/x38 HANGUL SYLLABLE SSOENI
-+<UC432>     /x83/x32/xc4/x39 HANGUL SYLLABLE SSOENH
-+<UC433>     /x83/x32/xc5/x30 HANGUL SYLLABLE SSOED
-+<UC434>     /x83/x32/xc5/x31 HANGUL SYLLABLE SSOEL
-+<UC435>     /x83/x32/xc5/x32 HANGUL SYLLABLE SSOELG
-+<UC436>     /x83/x32/xc5/x33 HANGUL SYLLABLE SSOELM
-+<UC437>     /x83/x32/xc5/x34 HANGUL SYLLABLE SSOELB
-+<UC438>     /x83/x32/xc5/x35 HANGUL SYLLABLE SSOELS
-+<UC439>     /x83/x32/xc5/x36 HANGUL SYLLABLE SSOELT
-+<UC43A>     /x83/x32/xc5/x37 HANGUL SYLLABLE SSOELP
-+<UC43B>     /x83/x32/xc5/x38 HANGUL SYLLABLE SSOELH
-+<UC43C>     /x83/x32/xc5/x39 HANGUL SYLLABLE SSOEM
-+<UC43D>     /x83/x32/xc6/x30 HANGUL SYLLABLE SSOEB
-+<UC43E>     /x83/x32/xc6/x31 HANGUL SYLLABLE SSOEBS
-+<UC43F>     /x83/x32/xc6/x32 HANGUL SYLLABLE SSOES
-+<UC440>     /x83/x32/xc6/x33 HANGUL SYLLABLE SSOESS
-+<UC441>     /x83/x32/xc6/x34 HANGUL SYLLABLE SSOENG
-+<UC442>     /x83/x32/xc6/x35 HANGUL SYLLABLE SSOEJ
-+<UC443>     /x83/x32/xc6/x36 HANGUL SYLLABLE SSOEC
-+<UC444>     /x83/x32/xc6/x37 HANGUL SYLLABLE SSOEK
-+<UC445>     /x83/x32/xc6/x38 HANGUL SYLLABLE SSOET
-+<UC446>     /x83/x32/xc6/x39 HANGUL SYLLABLE SSOEP
-+<UC447>     /x83/x32/xc7/x30 HANGUL SYLLABLE SSOEH
-+<UC448>     /x83/x32/xc7/x31 HANGUL SYLLABLE SSYO
-+<UC449>     /x83/x32/xc7/x32 HANGUL SYLLABLE SSYOG
-+<UC44A>     /x83/x32/xc7/x33 HANGUL SYLLABLE SSYOGG
-+<UC44B>     /x83/x32/xc7/x34 HANGUL SYLLABLE SSYOGS
-+<UC44C>     /x83/x32/xc7/x35 HANGUL SYLLABLE SSYON
-+<UC44D>     /x83/x32/xc7/x36 HANGUL SYLLABLE SSYONI
-+<UC44E>     /x83/x32/xc7/x37 HANGUL SYLLABLE SSYONH
-+<UC44F>     /x83/x32/xc7/x38 HANGUL SYLLABLE SSYOD
-+<UC450>     /x83/x32/xc7/x39 HANGUL SYLLABLE SSYOL
-+<UC451>     /x83/x32/xc8/x30 HANGUL SYLLABLE SSYOLG
-+<UC452>     /x83/x32/xc8/x31 HANGUL SYLLABLE SSYOLM
-+<UC453>     /x83/x32/xc8/x32 HANGUL SYLLABLE SSYOLB
-+<UC454>     /x83/x32/xc8/x33 HANGUL SYLLABLE SSYOLS
-+<UC455>     /x83/x32/xc8/x34 HANGUL SYLLABLE SSYOLT
-+<UC456>     /x83/x32/xc8/x35 HANGUL SYLLABLE SSYOLP
-+<UC457>     /x83/x32/xc8/x36 HANGUL SYLLABLE SSYOLH
-+<UC458>     /x83/x32/xc8/x37 HANGUL SYLLABLE SSYOM
-+<UC459>     /x83/x32/xc8/x38 HANGUL SYLLABLE SSYOB
-+<UC45A>     /x83/x32/xc8/x39 HANGUL SYLLABLE SSYOBS
-+<UC45B>     /x83/x32/xc9/x30 HANGUL SYLLABLE SSYOS
-+<UC45C>     /x83/x32/xc9/x31 HANGUL SYLLABLE SSYOSS
-+<UC45D>     /x83/x32/xc9/x32 HANGUL SYLLABLE SSYONG
-+<UC45E>     /x83/x32/xc9/x33 HANGUL SYLLABLE SSYOJ
-+<UC45F>     /x83/x32/xc9/x34 HANGUL SYLLABLE SSYOC
-+<UC460>     /x83/x32/xc9/x35 HANGUL SYLLABLE SSYOK
-+<UC461>     /x83/x32/xc9/x36 HANGUL SYLLABLE SSYOT
-+<UC462>     /x83/x32/xc9/x37 HANGUL SYLLABLE SSYOP
-+<UC463>     /x83/x32/xc9/x38 HANGUL SYLLABLE SSYOH
-+<UC464>     /x83/x32/xc9/x39 HANGUL SYLLABLE SSU
-+<UC465>     /x83/x32/xca/x30 HANGUL SYLLABLE SSUG
-+<UC466>     /x83/x32/xca/x31 HANGUL SYLLABLE SSUGG
-+<UC467>     /x83/x32/xca/x32 HANGUL SYLLABLE SSUGS
-+<UC468>     /x83/x32/xca/x33 HANGUL SYLLABLE SSUN
-+<UC469>     /x83/x32/xca/x34 HANGUL SYLLABLE SSUNI
-+<UC46A>     /x83/x32/xca/x35 HANGUL SYLLABLE SSUNH
-+<UC46B>     /x83/x32/xca/x36 HANGUL SYLLABLE SSUD
-+<UC46C>     /x83/x32/xca/x37 HANGUL SYLLABLE SSUL
-+<UC46D>     /x83/x32/xca/x38 HANGUL SYLLABLE SSULG
-+<UC46E>     /x83/x32/xca/x39 HANGUL SYLLABLE SSULM
-+<UC46F>     /x83/x32/xcb/x30 HANGUL SYLLABLE SSULB
-+<UC470>     /x83/x32/xcb/x31 HANGUL SYLLABLE SSULS
-+<UC471>     /x83/x32/xcb/x32 HANGUL SYLLABLE SSULT
-+<UC472>     /x83/x32/xcb/x33 HANGUL SYLLABLE SSULP
-+<UC473>     /x83/x32/xcb/x34 HANGUL SYLLABLE SSULH
-+<UC474>     /x83/x32/xcb/x35 HANGUL SYLLABLE SSUM
-+<UC475>     /x83/x32/xcb/x36 HANGUL SYLLABLE SSUB
-+<UC476>     /x83/x32/xcb/x37 HANGUL SYLLABLE SSUBS
-+<UC477>     /x83/x32/xcb/x38 HANGUL SYLLABLE SSUS
-+<UC478>     /x83/x32/xcb/x39 HANGUL SYLLABLE SSUSS
-+<UC479>     /x83/x32/xcc/x30 HANGUL SYLLABLE SSUNG
-+<UC47A>     /x83/x32/xcc/x31 HANGUL SYLLABLE SSUJ
-+<UC47B>     /x83/x32/xcc/x32 HANGUL SYLLABLE SSUC
-+<UC47C>     /x83/x32/xcc/x33 HANGUL SYLLABLE SSUK
-+<UC47D>     /x83/x32/xcc/x34 HANGUL SYLLABLE SSUT
-+<UC47E>     /x83/x32/xcc/x35 HANGUL SYLLABLE SSUP
-+<UC47F>     /x83/x32/xcc/x36 HANGUL SYLLABLE SSUH
-+<UC480>     /x83/x32/xcc/x37 HANGUL SYLLABLE SSWEO
-+<UC481>     /x83/x32/xcc/x38 HANGUL SYLLABLE SSWEOG
-+<UC482>     /x83/x32/xcc/x39 HANGUL SYLLABLE SSWEOGG
-+<UC483>     /x83/x32/xcd/x30 HANGUL SYLLABLE SSWEOGS
-+<UC484>     /x83/x32/xcd/x31 HANGUL SYLLABLE SSWEON
-+<UC485>     /x83/x32/xcd/x32 HANGUL SYLLABLE SSWEONI
-+<UC486>     /x83/x32/xcd/x33 HANGUL SYLLABLE SSWEONH
-+<UC487>     /x83/x32/xcd/x34 HANGUL SYLLABLE SSWEOD
-+<UC488>     /x83/x32/xcd/x35 HANGUL SYLLABLE SSWEOL
-+<UC489>     /x83/x32/xcd/x36 HANGUL SYLLABLE SSWEOLG
-+<UC48A>     /x83/x32/xcd/x37 HANGUL SYLLABLE SSWEOLM
-+<UC48B>     /x83/x32/xcd/x38 HANGUL SYLLABLE SSWEOLB
-+<UC48C>     /x83/x32/xcd/x39 HANGUL SYLLABLE SSWEOLS
-+<UC48D>     /x83/x32/xce/x30 HANGUL SYLLABLE SSWEOLT
-+<UC48E>     /x83/x32/xce/x31 HANGUL SYLLABLE SSWEOLP
-+<UC48F>     /x83/x32/xce/x32 HANGUL SYLLABLE SSWEOLH
-+<UC490>     /x83/x32/xce/x33 HANGUL SYLLABLE SSWEOM
-+<UC491>     /x83/x32/xce/x34 HANGUL SYLLABLE SSWEOB
-+<UC492>     /x83/x32/xce/x35 HANGUL SYLLABLE SSWEOBS
-+<UC493>     /x83/x32/xce/x36 HANGUL SYLLABLE SSWEOS
-+<UC494>     /x83/x32/xce/x37 HANGUL SYLLABLE SSWEOSS
-+<UC495>     /x83/x32/xce/x38 HANGUL SYLLABLE SSWEONG
-+<UC496>     /x83/x32/xce/x39 HANGUL SYLLABLE SSWEOJ
-+<UC497>     /x83/x32/xcf/x30 HANGUL SYLLABLE SSWEOC
-+<UC498>     /x83/x32/xcf/x31 HANGUL SYLLABLE SSWEOK
-+<UC499>     /x83/x32/xcf/x32 HANGUL SYLLABLE SSWEOT
-+<UC49A>     /x83/x32/xcf/x33 HANGUL SYLLABLE SSWEOP
-+<UC49B>     /x83/x32/xcf/x34 HANGUL SYLLABLE SSWEOH
-+<UC49C>     /x83/x32/xcf/x35 HANGUL SYLLABLE SSWE
-+<UC49D>     /x83/x32/xcf/x36 HANGUL SYLLABLE SSWEG
-+<UC49E>     /x83/x32/xcf/x37 HANGUL SYLLABLE SSWEGG
-+<UC49F>     /x83/x32/xcf/x38 HANGUL SYLLABLE SSWEGS
-+<UC4A0>     /x83/x32/xcf/x39 HANGUL SYLLABLE SSWEN
-+<UC4A1>     /x83/x32/xd0/x30 HANGUL SYLLABLE SSWENI
-+<UC4A2>     /x83/x32/xd0/x31 HANGUL SYLLABLE SSWENH
-+<UC4A3>     /x83/x32/xd0/x32 HANGUL SYLLABLE SSWED
-+<UC4A4>     /x83/x32/xd0/x33 HANGUL SYLLABLE SSWEL
-+<UC4A5>     /x83/x32/xd0/x34 HANGUL SYLLABLE SSWELG
-+<UC4A6>     /x83/x32/xd0/x35 HANGUL SYLLABLE SSWELM
-+<UC4A7>     /x83/x32/xd0/x36 HANGUL SYLLABLE SSWELB
-+<UC4A8>     /x83/x32/xd0/x37 HANGUL SYLLABLE SSWELS
-+<UC4A9>     /x83/x32/xd0/x38 HANGUL SYLLABLE SSWELT
-+<UC4AA>     /x83/x32/xd0/x39 HANGUL SYLLABLE SSWELP
-+<UC4AB>     /x83/x32/xd1/x30 HANGUL SYLLABLE SSWELH
-+<UC4AC>     /x83/x32/xd1/x31 HANGUL SYLLABLE SSWEM
-+<UC4AD>     /x83/x32/xd1/x32 HANGUL SYLLABLE SSWEB
-+<UC4AE>     /x83/x32/xd1/x33 HANGUL SYLLABLE SSWEBS
-+<UC4AF>     /x83/x32/xd1/x34 HANGUL SYLLABLE SSWES
-+<UC4B0>     /x83/x32/xd1/x35 HANGUL SYLLABLE SSWESS
-+<UC4B1>     /x83/x32/xd1/x36 HANGUL SYLLABLE SSWENG
-+<UC4B2>     /x83/x32/xd1/x37 HANGUL SYLLABLE SSWEJ
-+<UC4B3>     /x83/x32/xd1/x38 HANGUL SYLLABLE SSWEC
-+<UC4B4>     /x83/x32/xd1/x39 HANGUL SYLLABLE SSWEK
-+<UC4B5>     /x83/x32/xd2/x30 HANGUL SYLLABLE SSWET
-+<UC4B6>     /x83/x32/xd2/x31 HANGUL SYLLABLE SSWEP
-+<UC4B7>     /x83/x32/xd2/x32 HANGUL SYLLABLE SSWEH
-+<UC4B8>     /x83/x32/xd2/x33 HANGUL SYLLABLE SSWI
-+<UC4B9>     /x83/x32/xd2/x34 HANGUL SYLLABLE SSWIG
-+<UC4BA>     /x83/x32/xd2/x35 HANGUL SYLLABLE SSWIGG
-+<UC4BB>     /x83/x32/xd2/x36 HANGUL SYLLABLE SSWIGS
-+<UC4BC>     /x83/x32/xd2/x37 HANGUL SYLLABLE SSWIN
-+<UC4BD>     /x83/x32/xd2/x38 HANGUL SYLLABLE SSWINI
-+<UC4BE>     /x83/x32/xd2/x39 HANGUL SYLLABLE SSWINH
-+<UC4BF>     /x83/x32/xd3/x30 HANGUL SYLLABLE SSWID
-+<UC4C0>     /x83/x32/xd3/x31 HANGUL SYLLABLE SSWIL
-+<UC4C1>     /x83/x32/xd3/x32 HANGUL SYLLABLE SSWILG
-+<UC4C2>     /x83/x32/xd3/x33 HANGUL SYLLABLE SSWILM
-+<UC4C3>     /x83/x32/xd3/x34 HANGUL SYLLABLE SSWILB
-+<UC4C4>     /x83/x32/xd3/x35 HANGUL SYLLABLE SSWILS
-+<UC4C5>     /x83/x32/xd3/x36 HANGUL SYLLABLE SSWILT
-+<UC4C6>     /x83/x32/xd3/x37 HANGUL SYLLABLE SSWILP
-+<UC4C7>     /x83/x32/xd3/x38 HANGUL SYLLABLE SSWILH
-+<UC4C8>     /x83/x32/xd3/x39 HANGUL SYLLABLE SSWIM
-+<UC4C9>     /x83/x32/xd4/x30 HANGUL SYLLABLE SSWIB
-+<UC4CA>     /x83/x32/xd4/x31 HANGUL SYLLABLE SSWIBS
-+<UC4CB>     /x83/x32/xd4/x32 HANGUL SYLLABLE SSWIS
-+<UC4CC>     /x83/x32/xd4/x33 HANGUL SYLLABLE SSWISS
-+<UC4CD>     /x83/x32/xd4/x34 HANGUL SYLLABLE SSWING
-+<UC4CE>     /x83/x32/xd4/x35 HANGUL SYLLABLE SSWIJ
-+<UC4CF>     /x83/x32/xd4/x36 HANGUL SYLLABLE SSWIC
-+<UC4D0>     /x83/x32/xd4/x37 HANGUL SYLLABLE SSWIK
-+<UC4D1>     /x83/x32/xd4/x38 HANGUL SYLLABLE SSWIT
-+<UC4D2>     /x83/x32/xd4/x39 HANGUL SYLLABLE SSWIP
-+<UC4D3>     /x83/x32/xd5/x30 HANGUL SYLLABLE SSWIH
-+<UC4D4>     /x83/x32/xd5/x31 HANGUL SYLLABLE SSYU
-+<UC4D5>     /x83/x32/xd5/x32 HANGUL SYLLABLE SSYUG
-+<UC4D6>     /x83/x32/xd5/x33 HANGUL SYLLABLE SSYUGG
-+<UC4D7>     /x83/x32/xd5/x34 HANGUL SYLLABLE SSYUGS
-+<UC4D8>     /x83/x32/xd5/x35 HANGUL SYLLABLE SSYUN
-+<UC4D9>     /x83/x32/xd5/x36 HANGUL SYLLABLE SSYUNI
-+<UC4DA>     /x83/x32/xd5/x37 HANGUL SYLLABLE SSYUNH
-+<UC4DB>     /x83/x32/xd5/x38 HANGUL SYLLABLE SSYUD
-+<UC4DC>     /x83/x32/xd5/x39 HANGUL SYLLABLE SSYUL
-+<UC4DD>     /x83/x32/xd6/x30 HANGUL SYLLABLE SSYULG
-+<UC4DE>     /x83/x32/xd6/x31 HANGUL SYLLABLE SSYULM
-+<UC4DF>     /x83/x32/xd6/x32 HANGUL SYLLABLE SSYULB
-+<UC4E0>     /x83/x32/xd6/x33 HANGUL SYLLABLE SSYULS
-+<UC4E1>     /x83/x32/xd6/x34 HANGUL SYLLABLE SSYULT
-+<UC4E2>     /x83/x32/xd6/x35 HANGUL SYLLABLE SSYULP
-+<UC4E3>     /x83/x32/xd6/x36 HANGUL SYLLABLE SSYULH
-+<UC4E4>     /x83/x32/xd6/x37 HANGUL SYLLABLE SSYUM
-+<UC4E5>     /x83/x32/xd6/x38 HANGUL SYLLABLE SSYUB
-+<UC4E6>     /x83/x32/xd6/x39 HANGUL SYLLABLE SSYUBS
-+<UC4E7>     /x83/x32/xd7/x30 HANGUL SYLLABLE SSYUS
-+<UC4E8>     /x83/x32/xd7/x31 HANGUL SYLLABLE SSYUSS
-+<UC4E9>     /x83/x32/xd7/x32 HANGUL SYLLABLE SSYUNG
-+<UC4EA>     /x83/x32/xd7/x33 HANGUL SYLLABLE SSYUJ
-+<UC4EB>     /x83/x32/xd7/x34 HANGUL SYLLABLE SSYUC
-+<UC4EC>     /x83/x32/xd7/x35 HANGUL SYLLABLE SSYUK
-+<UC4ED>     /x83/x32/xd7/x36 HANGUL SYLLABLE SSYUT
-+<UC4EE>     /x83/x32/xd7/x37 HANGUL SYLLABLE SSYUP
-+<UC4EF>     /x83/x32/xd7/x38 HANGUL SYLLABLE SSYUH
-+<UC4F0>     /x83/x32/xd7/x39 HANGUL SYLLABLE SSEU
-+<UC4F1>     /x83/x32/xd8/x30 HANGUL SYLLABLE SSEUG
-+<UC4F2>     /x83/x32/xd8/x31 HANGUL SYLLABLE SSEUGG
-+<UC4F3>     /x83/x32/xd8/x32 HANGUL SYLLABLE SSEUGS
-+<UC4F4>     /x83/x32/xd8/x33 HANGUL SYLLABLE SSEUN
-+<UC4F5>     /x83/x32/xd8/x34 HANGUL SYLLABLE SSEUNI
-+<UC4F6>     /x83/x32/xd8/x35 HANGUL SYLLABLE SSEUNH
-+<UC4F7>     /x83/x32/xd8/x36 HANGUL SYLLABLE SSEUD
-+<UC4F8>     /x83/x32/xd8/x37 HANGUL SYLLABLE SSEUL
-+<UC4F9>     /x83/x32/xd8/x38 HANGUL SYLLABLE SSEULG
-+<UC4FA>     /x83/x32/xd8/x39 HANGUL SYLLABLE SSEULM
-+<UC4FB>     /x83/x32/xd9/x30 HANGUL SYLLABLE SSEULB
-+<UC4FC>     /x83/x32/xd9/x31 HANGUL SYLLABLE SSEULS
-+<UC4FD>     /x83/x32/xd9/x32 HANGUL SYLLABLE SSEULT
-+<UC4FE>     /x83/x32/xd9/x33 HANGUL SYLLABLE SSEULP
-+<UC4FF>     /x83/x32/xd9/x34 HANGUL SYLLABLE SSEULH
-+<UC500>     /x83/x32/xd9/x35 HANGUL SYLLABLE SSEUM
-+<UC501>     /x83/x32/xd9/x36 HANGUL SYLLABLE SSEUB
-+<UC502>     /x83/x32/xd9/x37 HANGUL SYLLABLE SSEUBS
-+<UC503>     /x83/x32/xd9/x38 HANGUL SYLLABLE SSEUS
-+<UC504>     /x83/x32/xd9/x39 HANGUL SYLLABLE SSEUSS
-+<UC505>     /x83/x32/xda/x30 HANGUL SYLLABLE SSEUNG
-+<UC506>     /x83/x32/xda/x31 HANGUL SYLLABLE SSEUJ
-+<UC507>     /x83/x32/xda/x32 HANGUL SYLLABLE SSEUC
-+<UC508>     /x83/x32/xda/x33 HANGUL SYLLABLE SSEUK
-+<UC509>     /x83/x32/xda/x34 HANGUL SYLLABLE SSEUT
-+<UC50A>     /x83/x32/xda/x35 HANGUL SYLLABLE SSEUP
-+<UC50B>     /x83/x32/xda/x36 HANGUL SYLLABLE SSEUH
-+<UC50C>     /x83/x32/xda/x37 HANGUL SYLLABLE SSYI
-+<UC50D>     /x83/x32/xda/x38 HANGUL SYLLABLE SSYIG
-+<UC50E>     /x83/x32/xda/x39 HANGUL SYLLABLE SSYIGG
-+<UC50F>     /x83/x32/xdb/x30 HANGUL SYLLABLE SSYIGS
-+<UC510>     /x83/x32/xdb/x31 HANGUL SYLLABLE SSYIN
-+<UC511>     /x83/x32/xdb/x32 HANGUL SYLLABLE SSYINI
-+<UC512>     /x83/x32/xdb/x33 HANGUL SYLLABLE SSYINH
-+<UC513>     /x83/x32/xdb/x34 HANGUL SYLLABLE SSYID
-+<UC514>     /x83/x32/xdb/x35 HANGUL SYLLABLE SSYIL
-+<UC515>     /x83/x32/xdb/x36 HANGUL SYLLABLE SSYILG
-+<UC516>     /x83/x32/xdb/x37 HANGUL SYLLABLE SSYILM
-+<UC517>     /x83/x32/xdb/x38 HANGUL SYLLABLE SSYILB
-+<UC518>     /x83/x32/xdb/x39 HANGUL SYLLABLE SSYILS
-+<UC519>     /x83/x32/xdc/x30 HANGUL SYLLABLE SSYILT
-+<UC51A>     /x83/x32/xdc/x31 HANGUL SYLLABLE SSYILP
-+<UC51B>     /x83/x32/xdc/x32 HANGUL SYLLABLE SSYILH
-+<UC51C>     /x83/x32/xdc/x33 HANGUL SYLLABLE SSYIM
-+<UC51D>     /x83/x32/xdc/x34 HANGUL SYLLABLE SSYIB
-+<UC51E>     /x83/x32/xdc/x35 HANGUL SYLLABLE SSYIBS
-+<UC51F>     /x83/x32/xdc/x36 HANGUL SYLLABLE SSYIS
-+<UC520>     /x83/x32/xdc/x37 HANGUL SYLLABLE SSYISS
-+<UC521>     /x83/x32/xdc/x38 HANGUL SYLLABLE SSYING
-+<UC522>     /x83/x32/xdc/x39 HANGUL SYLLABLE SSYIJ
-+<UC523>     /x83/x32/xdd/x30 HANGUL SYLLABLE SSYIC
-+<UC524>     /x83/x32/xdd/x31 HANGUL SYLLABLE SSYIK
-+<UC525>     /x83/x32/xdd/x32 HANGUL SYLLABLE SSYIT
-+<UC526>     /x83/x32/xdd/x33 HANGUL SYLLABLE SSYIP
-+<UC527>     /x83/x32/xdd/x34 HANGUL SYLLABLE SSYIH
-+<UC528>     /x83/x32/xdd/x35 HANGUL SYLLABLE SSI
-+<UC529>     /x83/x32/xdd/x36 HANGUL SYLLABLE SSIG
-+<UC52A>     /x83/x32/xdd/x37 HANGUL SYLLABLE SSIGG
-+<UC52B>     /x83/x32/xdd/x38 HANGUL SYLLABLE SSIGS
-+<UC52C>     /x83/x32/xdd/x39 HANGUL SYLLABLE SSIN
-+<UC52D>     /x83/x32/xde/x30 HANGUL SYLLABLE SSINI
-+<UC52E>     /x83/x32/xde/x31 HANGUL SYLLABLE SSINH
-+<UC52F>     /x83/x32/xde/x32 HANGUL SYLLABLE SSID
-+<UC530>     /x83/x32/xde/x33 HANGUL SYLLABLE SSIL
-+<UC531>     /x83/x32/xde/x34 HANGUL SYLLABLE SSILG
-+<UC532>     /x83/x32/xde/x35 HANGUL SYLLABLE SSILM
-+<UC533>     /x83/x32/xde/x36 HANGUL SYLLABLE SSILB
-+<UC534>     /x83/x32/xde/x37 HANGUL SYLLABLE SSILS
-+<UC535>     /x83/x32/xde/x38 HANGUL SYLLABLE SSILT
-+<UC536>     /x83/x32/xde/x39 HANGUL SYLLABLE SSILP
-+<UC537>     /x83/x32/xdf/x30 HANGUL SYLLABLE SSILH
-+<UC538>     /x83/x32/xdf/x31 HANGUL SYLLABLE SSIM
-+<UC539>     /x83/x32/xdf/x32 HANGUL SYLLABLE SSIB
-+<UC53A>     /x83/x32/xdf/x33 HANGUL SYLLABLE SSIBS
-+<UC53B>     /x83/x32/xdf/x34 HANGUL SYLLABLE SSIS
-+<UC53C>     /x83/x32/xdf/x35 HANGUL SYLLABLE SSISS
-+<UC53D>     /x83/x32/xdf/x36 HANGUL SYLLABLE SSING
-+<UC53E>     /x83/x32/xdf/x37 HANGUL SYLLABLE SSIJ
-+<UC53F>     /x83/x32/xdf/x38 HANGUL SYLLABLE SSIC
-+<UC540>     /x83/x32/xdf/x39 HANGUL SYLLABLE SSIK
-+<UC541>     /x83/x32/xe0/x30 HANGUL SYLLABLE SSIT
-+<UC542>     /x83/x32/xe0/x31 HANGUL SYLLABLE SSIP
-+<UC543>     /x83/x32/xe0/x32 HANGUL SYLLABLE SSIH
-+<UC544>     /x83/x32/xe0/x33 HANGUL SYLLABLE A
-+<UC545>     /x83/x32/xe0/x34 HANGUL SYLLABLE AG
-+<UC546>     /x83/x32/xe0/x35 HANGUL SYLLABLE AGG
-+<UC547>     /x83/x32/xe0/x36 HANGUL SYLLABLE AGS
-+<UC548>     /x83/x32/xe0/x37 HANGUL SYLLABLE AN
-+<UC549>     /x83/x32/xe0/x38 HANGUL SYLLABLE ANI
-+<UC54A>     /x83/x32/xe0/x39 HANGUL SYLLABLE ANH
-+<UC54B>     /x83/x32/xe1/x30 HANGUL SYLLABLE AD
-+<UC54C>     /x83/x32/xe1/x31 HANGUL SYLLABLE AL
-+<UC54D>     /x83/x32/xe1/x32 HANGUL SYLLABLE ALG
-+<UC54E>     /x83/x32/xe1/x33 HANGUL SYLLABLE ALM
-+<UC54F>     /x83/x32/xe1/x34 HANGUL SYLLABLE ALB
-+<UC550>     /x83/x32/xe1/x35 HANGUL SYLLABLE ALS
-+<UC551>     /x83/x32/xe1/x36 HANGUL SYLLABLE ALT
-+<UC552>     /x83/x32/xe1/x37 HANGUL SYLLABLE ALP
-+<UC553>     /x83/x32/xe1/x38 HANGUL SYLLABLE ALH
-+<UC554>     /x83/x32/xe1/x39 HANGUL SYLLABLE AM
-+<UC555>     /x83/x32/xe2/x30 HANGUL SYLLABLE AB
-+<UC556>     /x83/x32/xe2/x31 HANGUL SYLLABLE ABS
-+<UC557>     /x83/x32/xe2/x32 HANGUL SYLLABLE AS
-+<UC558>     /x83/x32/xe2/x33 HANGUL SYLLABLE ASS
-+<UC559>     /x83/x32/xe2/x34 HANGUL SYLLABLE ANG
-+<UC55A>     /x83/x32/xe2/x35 HANGUL SYLLABLE AJ
-+<UC55B>     /x83/x32/xe2/x36 HANGUL SYLLABLE AC
-+<UC55C>     /x83/x32/xe2/x37 HANGUL SYLLABLE AK
-+<UC55D>     /x83/x32/xe2/x38 HANGUL SYLLABLE AT
-+<UC55E>     /x83/x32/xe2/x39 HANGUL SYLLABLE AP
-+<UC55F>     /x83/x32/xe3/x30 HANGUL SYLLABLE AH
-+<UC560>     /x83/x32/xe3/x31 HANGUL SYLLABLE AE
-+<UC561>     /x83/x32/xe3/x32 HANGUL SYLLABLE AEG
-+<UC562>     /x83/x32/xe3/x33 HANGUL SYLLABLE AEGG
-+<UC563>     /x83/x32/xe3/x34 HANGUL SYLLABLE AEGS
-+<UC564>     /x83/x32/xe3/x35 HANGUL SYLLABLE AEN
-+<UC565>     /x83/x32/xe3/x36 HANGUL SYLLABLE AENI
-+<UC566>     /x83/x32/xe3/x37 HANGUL SYLLABLE AENH
-+<UC567>     /x83/x32/xe3/x38 HANGUL SYLLABLE AED
-+<UC568>     /x83/x32/xe3/x39 HANGUL SYLLABLE AEL
-+<UC569>     /x83/x32/xe4/x30 HANGUL SYLLABLE AELG
-+<UC56A>     /x83/x32/xe4/x31 HANGUL SYLLABLE AELM
-+<UC56B>     /x83/x32/xe4/x32 HANGUL SYLLABLE AELB
-+<UC56C>     /x83/x32/xe4/x33 HANGUL SYLLABLE AELS
-+<UC56D>     /x83/x32/xe4/x34 HANGUL SYLLABLE AELT
-+<UC56E>     /x83/x32/xe4/x35 HANGUL SYLLABLE AELP
-+<UC56F>     /x83/x32/xe4/x36 HANGUL SYLLABLE AELH
-+<UC570>     /x83/x32/xe4/x37 HANGUL SYLLABLE AEM
-+<UC571>     /x83/x32/xe4/x38 HANGUL SYLLABLE AEB
-+<UC572>     /x83/x32/xe4/x39 HANGUL SYLLABLE AEBS
-+<UC573>     /x83/x32/xe5/x30 HANGUL SYLLABLE AES
-+<UC574>     /x83/x32/xe5/x31 HANGUL SYLLABLE AESS
-+<UC575>     /x83/x32/xe5/x32 HANGUL SYLLABLE AENG
-+<UC576>     /x83/x32/xe5/x33 HANGUL SYLLABLE AEJ
-+<UC577>     /x83/x32/xe5/x34 HANGUL SYLLABLE AEC
-+<UC578>     /x83/x32/xe5/x35 HANGUL SYLLABLE AEK
-+<UC579>     /x83/x32/xe5/x36 HANGUL SYLLABLE AET
-+<UC57A>     /x83/x32/xe5/x37 HANGUL SYLLABLE AEP
-+<UC57B>     /x83/x32/xe5/x38 HANGUL SYLLABLE AEH
-+<UC57C>     /x83/x32/xe5/x39 HANGUL SYLLABLE YA
-+<UC57D>     /x83/x32/xe6/x30 HANGUL SYLLABLE YAG
-+<UC57E>     /x83/x32/xe6/x31 HANGUL SYLLABLE YAGG
-+<UC57F>     /x83/x32/xe6/x32 HANGUL SYLLABLE YAGS
-+<UC580>     /x83/x32/xe6/x33 HANGUL SYLLABLE YAN
-+<UC581>     /x83/x32/xe6/x34 HANGUL SYLLABLE YANI
-+<UC582>     /x83/x32/xe6/x35 HANGUL SYLLABLE YANH
-+<UC583>     /x83/x32/xe6/x36 HANGUL SYLLABLE YAD
-+<UC584>     /x83/x32/xe6/x37 HANGUL SYLLABLE YAL
-+<UC585>     /x83/x32/xe6/x38 HANGUL SYLLABLE YALG
-+<UC586>     /x83/x32/xe6/x39 HANGUL SYLLABLE YALM
-+<UC587>     /x83/x32/xe7/x30 HANGUL SYLLABLE YALB
-+<UC588>     /x83/x32/xe7/x31 HANGUL SYLLABLE YALS
-+<UC589>     /x83/x32/xe7/x32 HANGUL SYLLABLE YALT
-+<UC58A>     /x83/x32/xe7/x33 HANGUL SYLLABLE YALP
-+<UC58B>     /x83/x32/xe7/x34 HANGUL SYLLABLE YALH
-+<UC58C>     /x83/x32/xe7/x35 HANGUL SYLLABLE YAM
-+<UC58D>     /x83/x32/xe7/x36 HANGUL SYLLABLE YAB
-+<UC58E>     /x83/x32/xe7/x37 HANGUL SYLLABLE YABS
-+<UC58F>     /x83/x32/xe7/x38 HANGUL SYLLABLE YAS
-+<UC590>     /x83/x32/xe7/x39 HANGUL SYLLABLE YASS
-+<UC591>     /x83/x32/xe8/x30 HANGUL SYLLABLE YANG
-+<UC592>     /x83/x32/xe8/x31 HANGUL SYLLABLE YAJ
-+<UC593>     /x83/x32/xe8/x32 HANGUL SYLLABLE YAC
-+<UC594>     /x83/x32/xe8/x33 HANGUL SYLLABLE YAK
-+<UC595>     /x83/x32/xe8/x34 HANGUL SYLLABLE YAT
-+<UC596>     /x83/x32/xe8/x35 HANGUL SYLLABLE YAP
-+<UC597>     /x83/x32/xe8/x36 HANGUL SYLLABLE YAH
-+<UC598>     /x83/x32/xe8/x37 HANGUL SYLLABLE YAE
-+<UC599>     /x83/x32/xe8/x38 HANGUL SYLLABLE YAEG
-+<UC59A>     /x83/x32/xe8/x39 HANGUL SYLLABLE YAEGG
-+<UC59B>     /x83/x32/xe9/x30 HANGUL SYLLABLE YAEGS
-+<UC59C>     /x83/x32/xe9/x31 HANGUL SYLLABLE YAEN
-+<UC59D>     /x83/x32/xe9/x32 HANGUL SYLLABLE YAENI
-+<UC59E>     /x83/x32/xe9/x33 HANGUL SYLLABLE YAENH
-+<UC59F>     /x83/x32/xe9/x34 HANGUL SYLLABLE YAED
-+<UC5A0>     /x83/x32/xe9/x35 HANGUL SYLLABLE YAEL
-+<UC5A1>     /x83/x32/xe9/x36 HANGUL SYLLABLE YAELG
-+<UC5A2>     /x83/x32/xe9/x37 HANGUL SYLLABLE YAELM
-+<UC5A3>     /x83/x32/xe9/x38 HANGUL SYLLABLE YAELB
-+<UC5A4>     /x83/x32/xe9/x39 HANGUL SYLLABLE YAELS
-+<UC5A5>     /x83/x32/xea/x30 HANGUL SYLLABLE YAELT
-+<UC5A6>     /x83/x32/xea/x31 HANGUL SYLLABLE YAELP
-+<UC5A7>     /x83/x32/xea/x32 HANGUL SYLLABLE YAELH
-+<UC5A8>     /x83/x32/xea/x33 HANGUL SYLLABLE YAEM
-+<UC5A9>     /x83/x32/xea/x34 HANGUL SYLLABLE YAEB
-+<UC5AA>     /x83/x32/xea/x35 HANGUL SYLLABLE YAEBS
-+<UC5AB>     /x83/x32/xea/x36 HANGUL SYLLABLE YAES
-+<UC5AC>     /x83/x32/xea/x37 HANGUL SYLLABLE YAESS
-+<UC5AD>     /x83/x32/xea/x38 HANGUL SYLLABLE YAENG
-+<UC5AE>     /x83/x32/xea/x39 HANGUL SYLLABLE YAEJ
-+<UC5AF>     /x83/x32/xeb/x30 HANGUL SYLLABLE YAEC
-+<UC5B0>     /x83/x32/xeb/x31 HANGUL SYLLABLE YAEK
-+<UC5B1>     /x83/x32/xeb/x32 HANGUL SYLLABLE YAET
-+<UC5B2>     /x83/x32/xeb/x33 HANGUL SYLLABLE YAEP
-+<UC5B3>     /x83/x32/xeb/x34 HANGUL SYLLABLE YAEH
-+<UC5B4>     /x83/x32/xeb/x35 HANGUL SYLLABLE EO
-+<UC5B5>     /x83/x32/xeb/x36 HANGUL SYLLABLE EOG
-+<UC5B6>     /x83/x32/xeb/x37 HANGUL SYLLABLE EOGG
-+<UC5B7>     /x83/x32/xeb/x38 HANGUL SYLLABLE EOGS
-+<UC5B8>     /x83/x32/xeb/x39 HANGUL SYLLABLE EON
-+<UC5B9>     /x83/x32/xec/x30 HANGUL SYLLABLE EONI
-+<UC5BA>     /x83/x32/xec/x31 HANGUL SYLLABLE EONH
-+<UC5BB>     /x83/x32/xec/x32 HANGUL SYLLABLE EOD
-+<UC5BC>     /x83/x32/xec/x33 HANGUL SYLLABLE EOL
-+<UC5BD>     /x83/x32/xec/x34 HANGUL SYLLABLE EOLG
-+<UC5BE>     /x83/x32/xec/x35 HANGUL SYLLABLE EOLM
-+<UC5BF>     /x83/x32/xec/x36 HANGUL SYLLABLE EOLB
-+<UC5C0>     /x83/x32/xec/x37 HANGUL SYLLABLE EOLS
-+<UC5C1>     /x83/x32/xec/x38 HANGUL SYLLABLE EOLT
-+<UC5C2>     /x83/x32/xec/x39 HANGUL SYLLABLE EOLP
-+<UC5C3>     /x83/x32/xed/x30 HANGUL SYLLABLE EOLH
-+<UC5C4>     /x83/x32/xed/x31 HANGUL SYLLABLE EOM
-+<UC5C5>     /x83/x32/xed/x32 HANGUL SYLLABLE EOB
-+<UC5C6>     /x83/x32/xed/x33 HANGUL SYLLABLE EOBS
-+<UC5C7>     /x83/x32/xed/x34 HANGUL SYLLABLE EOS
-+<UC5C8>     /x83/x32/xed/x35 HANGUL SYLLABLE EOSS
-+<UC5C9>     /x83/x32/xed/x36 HANGUL SYLLABLE EONG
-+<UC5CA>     /x83/x32/xed/x37 HANGUL SYLLABLE EOJ
-+<UC5CB>     /x83/x32/xed/x38 HANGUL SYLLABLE EOC
-+<UC5CC>     /x83/x32/xed/x39 HANGUL SYLLABLE EOK
-+<UC5CD>     /x83/x32/xee/x30 HANGUL SYLLABLE EOT
-+<UC5CE>     /x83/x32/xee/x31 HANGUL SYLLABLE EOP
-+<UC5CF>     /x83/x32/xee/x32 HANGUL SYLLABLE EOH
-+<UC5D0>     /x83/x32/xee/x33 HANGUL SYLLABLE E
-+<UC5D1>     /x83/x32/xee/x34 HANGUL SYLLABLE EG
-+<UC5D2>     /x83/x32/xee/x35 HANGUL SYLLABLE EGG
-+<UC5D3>     /x83/x32/xee/x36 HANGUL SYLLABLE EGS
-+<UC5D4>     /x83/x32/xee/x37 HANGUL SYLLABLE EN
-+<UC5D5>     /x83/x32/xee/x38 HANGUL SYLLABLE ENI
-+<UC5D6>     /x83/x32/xee/x39 HANGUL SYLLABLE ENH
-+<UC5D7>     /x83/x32/xef/x30 HANGUL SYLLABLE ED
-+<UC5D8>     /x83/x32/xef/x31 HANGUL SYLLABLE EL
-+<UC5D9>     /x83/x32/xef/x32 HANGUL SYLLABLE ELG
-+<UC5DA>     /x83/x32/xef/x33 HANGUL SYLLABLE ELM
-+<UC5DB>     /x83/x32/xef/x34 HANGUL SYLLABLE ELB
-+<UC5DC>     /x83/x32/xef/x35 HANGUL SYLLABLE ELS
-+<UC5DD>     /x83/x32/xef/x36 HANGUL SYLLABLE ELT
-+<UC5DE>     /x83/x32/xef/x37 HANGUL SYLLABLE ELP
-+<UC5DF>     /x83/x32/xef/x38 HANGUL SYLLABLE ELH
-+<UC5E0>     /x83/x32/xef/x39 HANGUL SYLLABLE EM
-+<UC5E1>     /x83/x32/xf0/x30 HANGUL SYLLABLE EB
-+<UC5E2>     /x83/x32/xf0/x31 HANGUL SYLLABLE EBS
-+<UC5E3>     /x83/x32/xf0/x32 HANGUL SYLLABLE ES
-+<UC5E4>     /x83/x32/xf0/x33 HANGUL SYLLABLE ESS
-+<UC5E5>     /x83/x32/xf0/x34 HANGUL SYLLABLE ENG
-+<UC5E6>     /x83/x32/xf0/x35 HANGUL SYLLABLE EJ
-+<UC5E7>     /x83/x32/xf0/x36 HANGUL SYLLABLE EC
-+<UC5E8>     /x83/x32/xf0/x37 HANGUL SYLLABLE EK
-+<UC5E9>     /x83/x32/xf0/x38 HANGUL SYLLABLE ET
-+<UC5EA>     /x83/x32/xf0/x39 HANGUL SYLLABLE EP
-+<UC5EB>     /x83/x32/xf1/x30 HANGUL SYLLABLE EH
-+<UC5EC>     /x83/x32/xf1/x31 HANGUL SYLLABLE YEO
-+<UC5ED>     /x83/x32/xf1/x32 HANGUL SYLLABLE YEOG
-+<UC5EE>     /x83/x32/xf1/x33 HANGUL SYLLABLE YEOGG
-+<UC5EF>     /x83/x32/xf1/x34 HANGUL SYLLABLE YEOGS
-+<UC5F0>     /x83/x32/xf1/x35 HANGUL SYLLABLE YEON
-+<UC5F1>     /x83/x32/xf1/x36 HANGUL SYLLABLE YEONI
-+<UC5F2>     /x83/x32/xf1/x37 HANGUL SYLLABLE YEONH
-+<UC5F3>     /x83/x32/xf1/x38 HANGUL SYLLABLE YEOD
-+<UC5F4>     /x83/x32/xf1/x39 HANGUL SYLLABLE YEOL
-+<UC5F5>     /x83/x32/xf2/x30 HANGUL SYLLABLE YEOLG
-+<UC5F6>     /x83/x32/xf2/x31 HANGUL SYLLABLE YEOLM
-+<UC5F7>     /x83/x32/xf2/x32 HANGUL SYLLABLE YEOLB
-+<UC5F8>     /x83/x32/xf2/x33 HANGUL SYLLABLE YEOLS
-+<UC5F9>     /x83/x32/xf2/x34 HANGUL SYLLABLE YEOLT
-+<UC5FA>     /x83/x32/xf2/x35 HANGUL SYLLABLE YEOLP
-+<UC5FB>     /x83/x32/xf2/x36 HANGUL SYLLABLE YEOLH
-+<UC5FC>     /x83/x32/xf2/x37 HANGUL SYLLABLE YEOM
-+<UC5FD>     /x83/x32/xf2/x38 HANGUL SYLLABLE YEOB
-+<UC5FE>     /x83/x32/xf2/x39 HANGUL SYLLABLE YEOBS
-+<UC5FF>     /x83/x32/xf3/x30 HANGUL SYLLABLE YEOS
-+<UC600>     /x83/x32/xf3/x31 HANGUL SYLLABLE YEOSS
-+<UC601>     /x83/x32/xf3/x32 HANGUL SYLLABLE YEONG
-+<UC602>     /x83/x32/xf3/x33 HANGUL SYLLABLE YEOJ
-+<UC603>     /x83/x32/xf3/x34 HANGUL SYLLABLE YEOC
-+<UC604>     /x83/x32/xf3/x35 HANGUL SYLLABLE YEOK
-+<UC605>     /x83/x32/xf3/x36 HANGUL SYLLABLE YEOT
-+<UC606>     /x83/x32/xf3/x37 HANGUL SYLLABLE YEOP
-+<UC607>     /x83/x32/xf3/x38 HANGUL SYLLABLE YEOH
-+<UC608>     /x83/x32/xf3/x39 HANGUL SYLLABLE YE
-+<UC609>     /x83/x32/xf4/x30 HANGUL SYLLABLE YEG
-+<UC60A>     /x83/x32/xf4/x31 HANGUL SYLLABLE YEGG
-+<UC60B>     /x83/x32/xf4/x32 HANGUL SYLLABLE YEGS
-+<UC60C>     /x83/x32/xf4/x33 HANGUL SYLLABLE YEN
-+<UC60D>     /x83/x32/xf4/x34 HANGUL SYLLABLE YENI
-+<UC60E>     /x83/x32/xf4/x35 HANGUL SYLLABLE YENH
-+<UC60F>     /x83/x32/xf4/x36 HANGUL SYLLABLE YED
-+<UC610>     /x83/x32/xf4/x37 HANGUL SYLLABLE YEL
-+<UC611>     /x83/x32/xf4/x38 HANGUL SYLLABLE YELG
-+<UC612>     /x83/x32/xf4/x39 HANGUL SYLLABLE YELM
-+<UC613>     /x83/x32/xf5/x30 HANGUL SYLLABLE YELB
-+<UC614>     /x83/x32/xf5/x31 HANGUL SYLLABLE YELS
-+<UC615>     /x83/x32/xf5/x32 HANGUL SYLLABLE YELT
-+<UC616>     /x83/x32/xf5/x33 HANGUL SYLLABLE YELP
-+<UC617>     /x83/x32/xf5/x34 HANGUL SYLLABLE YELH
-+<UC618>     /x83/x32/xf5/x35 HANGUL SYLLABLE YEM
-+<UC619>     /x83/x32/xf5/x36 HANGUL SYLLABLE YEB
-+<UC61A>     /x83/x32/xf5/x37 HANGUL SYLLABLE YEBS
-+<UC61B>     /x83/x32/xf5/x38 HANGUL SYLLABLE YES
-+<UC61C>     /x83/x32/xf5/x39 HANGUL SYLLABLE YESS
-+<UC61D>     /x83/x32/xf6/x30 HANGUL SYLLABLE YENG
-+<UC61E>     /x83/x32/xf6/x31 HANGUL SYLLABLE YEJ
-+<UC61F>     /x83/x32/xf6/x32 HANGUL SYLLABLE YEC
-+<UC620>     /x83/x32/xf6/x33 HANGUL SYLLABLE YEK
-+<UC621>     /x83/x32/xf6/x34 HANGUL SYLLABLE YET
-+<UC622>     /x83/x32/xf6/x35 HANGUL SYLLABLE YEP
-+<UC623>     /x83/x32/xf6/x36 HANGUL SYLLABLE YEH
-+<UC624>     /x83/x32/xf6/x37 HANGUL SYLLABLE O
-+<UC625>     /x83/x32/xf6/x38 HANGUL SYLLABLE OG
-+<UC626>     /x83/x32/xf6/x39 HANGUL SYLLABLE OGG
-+<UC627>     /x83/x32/xf7/x30 HANGUL SYLLABLE OGS
-+<UC628>     /x83/x32/xf7/x31 HANGUL SYLLABLE ON
-+<UC629>     /x83/x32/xf7/x32 HANGUL SYLLABLE ONI
-+<UC62A>     /x83/x32/xf7/x33 HANGUL SYLLABLE ONH
-+<UC62B>     /x83/x32/xf7/x34 HANGUL SYLLABLE OD
-+<UC62C>     /x83/x32/xf7/x35 HANGUL SYLLABLE OL
-+<UC62D>     /x83/x32/xf7/x36 HANGUL SYLLABLE OLG
-+<UC62E>     /x83/x32/xf7/x37 HANGUL SYLLABLE OLM
-+<UC62F>     /x83/x32/xf7/x38 HANGUL SYLLABLE OLB
-+<UC630>     /x83/x32/xf7/x39 HANGUL SYLLABLE OLS
-+<UC631>     /x83/x32/xf8/x30 HANGUL SYLLABLE OLT
-+<UC632>     /x83/x32/xf8/x31 HANGUL SYLLABLE OLP
-+<UC633>     /x83/x32/xf8/x32 HANGUL SYLLABLE OLH
-+<UC634>     /x83/x32/xf8/x33 HANGUL SYLLABLE OM
-+<UC635>     /x83/x32/xf8/x34 HANGUL SYLLABLE OB
-+<UC636>     /x83/x32/xf8/x35 HANGUL SYLLABLE OBS
-+<UC637>     /x83/x32/xf8/x36 HANGUL SYLLABLE OS
-+<UC638>     /x83/x32/xf8/x37 HANGUL SYLLABLE OSS
-+<UC639>     /x83/x32/xf8/x38 HANGUL SYLLABLE ONG
-+<UC63A>     /x83/x32/xf8/x39 HANGUL SYLLABLE OJ
-+<UC63B>     /x83/x32/xf9/x30 HANGUL SYLLABLE OC
-+<UC63C>     /x83/x32/xf9/x31 HANGUL SYLLABLE OK
-+<UC63D>     /x83/x32/xf9/x32 HANGUL SYLLABLE OT
-+<UC63E>     /x83/x32/xf9/x33 HANGUL SYLLABLE OP
-+<UC63F>     /x83/x32/xf9/x34 HANGUL SYLLABLE OH
-+<UC640>     /x83/x32/xf9/x35 HANGUL SYLLABLE WA
-+<UC641>     /x83/x32/xf9/x36 HANGUL SYLLABLE WAG
-+<UC642>     /x83/x32/xf9/x37 HANGUL SYLLABLE WAGG
-+<UC643>     /x83/x32/xf9/x38 HANGUL SYLLABLE WAGS
-+<UC644>     /x83/x32/xf9/x39 HANGUL SYLLABLE WAN
-+<UC645>     /x83/x32/xfa/x30 HANGUL SYLLABLE WANI
-+<UC646>     /x83/x32/xfa/x31 HANGUL SYLLABLE WANH
-+<UC647>     /x83/x32/xfa/x32 HANGUL SYLLABLE WAD
-+<UC648>     /x83/x32/xfa/x33 HANGUL SYLLABLE WAL
-+<UC649>     /x83/x32/xfa/x34 HANGUL SYLLABLE WALG
-+<UC64A>     /x83/x32/xfa/x35 HANGUL SYLLABLE WALM
-+<UC64B>     /x83/x32/xfa/x36 HANGUL SYLLABLE WALB
-+<UC64C>     /x83/x32/xfa/x37 HANGUL SYLLABLE WALS
-+<UC64D>     /x83/x32/xfa/x38 HANGUL SYLLABLE WALT
-+<UC64E>     /x83/x32/xfa/x39 HANGUL SYLLABLE WALP
-+<UC64F>     /x83/x32/xfb/x30 HANGUL SYLLABLE WALH
-+<UC650>     /x83/x32/xfb/x31 HANGUL SYLLABLE WAM
-+<UC651>     /x83/x32/xfb/x32 HANGUL SYLLABLE WAB
-+<UC652>     /x83/x32/xfb/x33 HANGUL SYLLABLE WABS
-+<UC653>     /x83/x32/xfb/x34 HANGUL SYLLABLE WAS
-+<UC654>     /x83/x32/xfb/x35 HANGUL SYLLABLE WASS
-+<UC655>     /x83/x32/xfb/x36 HANGUL SYLLABLE WANG
-+<UC656>     /x83/x32/xfb/x37 HANGUL SYLLABLE WAJ
-+<UC657>     /x83/x32/xfb/x38 HANGUL SYLLABLE WAC
-+<UC658>     /x83/x32/xfb/x39 HANGUL SYLLABLE WAK
-+<UC659>     /x83/x32/xfc/x30 HANGUL SYLLABLE WAT
-+<UC65A>     /x83/x32/xfc/x31 HANGUL SYLLABLE WAP
-+<UC65B>     /x83/x32/xfc/x32 HANGUL SYLLABLE WAH
-+<UC65C>     /x83/x32/xfc/x33 HANGUL SYLLABLE WAE
-+<UC65D>     /x83/x32/xfc/x34 HANGUL SYLLABLE WAEG
-+<UC65E>     /x83/x32/xfc/x35 HANGUL SYLLABLE WAEGG
-+<UC65F>     /x83/x32/xfc/x36 HANGUL SYLLABLE WAEGS
-+<UC660>     /x83/x32/xfc/x37 HANGUL SYLLABLE WAEN
-+<UC661>     /x83/x32/xfc/x38 HANGUL SYLLABLE WAENI
-+<UC662>     /x83/x32/xfc/x39 HANGUL SYLLABLE WAENH
-+<UC663>     /x83/x32/xfd/x30 HANGUL SYLLABLE WAED
-+<UC664>     /x83/x32/xfd/x31 HANGUL SYLLABLE WAEL
-+<UC665>     /x83/x32/xfd/x32 HANGUL SYLLABLE WAELG
-+<UC666>     /x83/x32/xfd/x33 HANGUL SYLLABLE WAELM
-+<UC667>     /x83/x32/xfd/x34 HANGUL SYLLABLE WAELB
-+<UC668>     /x83/x32/xfd/x35 HANGUL SYLLABLE WAELS
-+<UC669>     /x83/x32/xfd/x36 HANGUL SYLLABLE WAELT
-+<UC66A>     /x83/x32/xfd/x37 HANGUL SYLLABLE WAELP
-+<UC66B>     /x83/x32/xfd/x38 HANGUL SYLLABLE WAELH
-+<UC66C>     /x83/x32/xfd/x39 HANGUL SYLLABLE WAEM
-+<UC66D>     /x83/x32/xfe/x30 HANGUL SYLLABLE WAEB
-+<UC66E>     /x83/x32/xfe/x31 HANGUL SYLLABLE WAEBS
-+<UC66F>     /x83/x32/xfe/x32 HANGUL SYLLABLE WAES
-+<UC670>     /x83/x32/xfe/x33 HANGUL SYLLABLE WAESS
-+<UC671>     /x83/x32/xfe/x34 HANGUL SYLLABLE WAENG
-+<UC672>     /x83/x32/xfe/x35 HANGUL SYLLABLE WAEJ
-+<UC673>     /x83/x32/xfe/x36 HANGUL SYLLABLE WAEC
-+<UC674>     /x83/x32/xfe/x37 HANGUL SYLLABLE WAEK
-+<UC675>     /x83/x32/xfe/x38 HANGUL SYLLABLE WAET
-+<UC676>     /x83/x32/xfe/x39 HANGUL SYLLABLE WAEP
-+<UC677>     /x83/x33/x81/x30 HANGUL SYLLABLE WAEH
-+<UC678>     /x83/x33/x81/x31 HANGUL SYLLABLE OE
-+<UC679>     /x83/x33/x81/x32 HANGUL SYLLABLE OEG
-+<UC67A>     /x83/x33/x81/x33 HANGUL SYLLABLE OEGG
-+<UC67B>     /x83/x33/x81/x34 HANGUL SYLLABLE OEGS
-+<UC67C>     /x83/x33/x81/x35 HANGUL SYLLABLE OEN
-+<UC67D>     /x83/x33/x81/x36 HANGUL SYLLABLE OENI
-+<UC67E>     /x83/x33/x81/x37 HANGUL SYLLABLE OENH
-+<UC67F>     /x83/x33/x81/x38 HANGUL SYLLABLE OED
-+<UC680>     /x83/x33/x81/x39 HANGUL SYLLABLE OEL
-+<UC681>     /x83/x33/x82/x30 HANGUL SYLLABLE OELG
-+<UC682>     /x83/x33/x82/x31 HANGUL SYLLABLE OELM
-+<UC683>     /x83/x33/x82/x32 HANGUL SYLLABLE OELB
-+<UC684>     /x83/x33/x82/x33 HANGUL SYLLABLE OELS
-+<UC685>     /x83/x33/x82/x34 HANGUL SYLLABLE OELT
-+<UC686>     /x83/x33/x82/x35 HANGUL SYLLABLE OELP
-+<UC687>     /x83/x33/x82/x36 HANGUL SYLLABLE OELH
-+<UC688>     /x83/x33/x82/x37 HANGUL SYLLABLE OEM
-+<UC689>     /x83/x33/x82/x38 HANGUL SYLLABLE OEB
-+<UC68A>     /x83/x33/x82/x39 HANGUL SYLLABLE OEBS
-+<UC68B>     /x83/x33/x83/x30 HANGUL SYLLABLE OES
-+<UC68C>     /x83/x33/x83/x31 HANGUL SYLLABLE OESS
-+<UC68D>     /x83/x33/x83/x32 HANGUL SYLLABLE OENG
-+<UC68E>     /x83/x33/x83/x33 HANGUL SYLLABLE OEJ
-+<UC68F>     /x83/x33/x83/x34 HANGUL SYLLABLE OEC
-+<UC690>     /x83/x33/x83/x35 HANGUL SYLLABLE OEK
-+<UC691>     /x83/x33/x83/x36 HANGUL SYLLABLE OET
-+<UC692>     /x83/x33/x83/x37 HANGUL SYLLABLE OEP
-+<UC693>     /x83/x33/x83/x38 HANGUL SYLLABLE OEH
-+<UC694>     /x83/x33/x83/x39 HANGUL SYLLABLE YO
-+<UC695>     /x83/x33/x84/x30 HANGUL SYLLABLE YOG
-+<UC696>     /x83/x33/x84/x31 HANGUL SYLLABLE YOGG
-+<UC697>     /x83/x33/x84/x32 HANGUL SYLLABLE YOGS
-+<UC698>     /x83/x33/x84/x33 HANGUL SYLLABLE YON
-+<UC699>     /x83/x33/x84/x34 HANGUL SYLLABLE YONI
-+<UC69A>     /x83/x33/x84/x35 HANGUL SYLLABLE YONH
-+<UC69B>     /x83/x33/x84/x36 HANGUL SYLLABLE YOD
-+<UC69C>     /x83/x33/x84/x37 HANGUL SYLLABLE YOL
-+<UC69D>     /x83/x33/x84/x38 HANGUL SYLLABLE YOLG
-+<UC69E>     /x83/x33/x84/x39 HANGUL SYLLABLE YOLM
-+<UC69F>     /x83/x33/x85/x30 HANGUL SYLLABLE YOLB
-+<UC6A0>     /x83/x33/x85/x31 HANGUL SYLLABLE YOLS
-+<UC6A1>     /x83/x33/x85/x32 HANGUL SYLLABLE YOLT
-+<UC6A2>     /x83/x33/x85/x33 HANGUL SYLLABLE YOLP
-+<UC6A3>     /x83/x33/x85/x34 HANGUL SYLLABLE YOLH
-+<UC6A4>     /x83/x33/x85/x35 HANGUL SYLLABLE YOM
-+<UC6A5>     /x83/x33/x85/x36 HANGUL SYLLABLE YOB
-+<UC6A6>     /x83/x33/x85/x37 HANGUL SYLLABLE YOBS
-+<UC6A7>     /x83/x33/x85/x38 HANGUL SYLLABLE YOS
-+<UC6A8>     /x83/x33/x85/x39 HANGUL SYLLABLE YOSS
-+<UC6A9>     /x83/x33/x86/x30 HANGUL SYLLABLE YONG
-+<UC6AA>     /x83/x33/x86/x31 HANGUL SYLLABLE YOJ
-+<UC6AB>     /x83/x33/x86/x32 HANGUL SYLLABLE YOC
-+<UC6AC>     /x83/x33/x86/x33 HANGUL SYLLABLE YOK
-+<UC6AD>     /x83/x33/x86/x34 HANGUL SYLLABLE YOT
-+<UC6AE>     /x83/x33/x86/x35 HANGUL SYLLABLE YOP
-+<UC6AF>     /x83/x33/x86/x36 HANGUL SYLLABLE YOH
-+<UC6B0>     /x83/x33/x86/x37 HANGUL SYLLABLE U
-+<UC6B1>     /x83/x33/x86/x38 HANGUL SYLLABLE UG
-+<UC6B2>     /x83/x33/x86/x39 HANGUL SYLLABLE UGG
-+<UC6B3>     /x83/x33/x87/x30 HANGUL SYLLABLE UGS
-+<UC6B4>     /x83/x33/x87/x31 HANGUL SYLLABLE UN
-+<UC6B5>     /x83/x33/x87/x32 HANGUL SYLLABLE UNI
-+<UC6B6>     /x83/x33/x87/x33 HANGUL SYLLABLE UNH
-+<UC6B7>     /x83/x33/x87/x34 HANGUL SYLLABLE UD
-+<UC6B8>     /x83/x33/x87/x35 HANGUL SYLLABLE UL
-+<UC6B9>     /x83/x33/x87/x36 HANGUL SYLLABLE ULG
-+<UC6BA>     /x83/x33/x87/x37 HANGUL SYLLABLE ULM
-+<UC6BB>     /x83/x33/x87/x38 HANGUL SYLLABLE ULB
-+<UC6BC>     /x83/x33/x87/x39 HANGUL SYLLABLE ULS
-+<UC6BD>     /x83/x33/x88/x30 HANGUL SYLLABLE ULT
-+<UC6BE>     /x83/x33/x88/x31 HANGUL SYLLABLE ULP
-+<UC6BF>     /x83/x33/x88/x32 HANGUL SYLLABLE ULH
-+<UC6C0>     /x83/x33/x88/x33 HANGUL SYLLABLE UM
-+<UC6C1>     /x83/x33/x88/x34 HANGUL SYLLABLE UB
-+<UC6C2>     /x83/x33/x88/x35 HANGUL SYLLABLE UBS
-+<UC6C3>     /x83/x33/x88/x36 HANGUL SYLLABLE US
-+<UC6C4>     /x83/x33/x88/x37 HANGUL SYLLABLE USS
-+<UC6C5>     /x83/x33/x88/x38 HANGUL SYLLABLE UNG
-+<UC6C6>     /x83/x33/x88/x39 HANGUL SYLLABLE UJ
-+<UC6C7>     /x83/x33/x89/x30 HANGUL SYLLABLE UC
-+<UC6C8>     /x83/x33/x89/x31 HANGUL SYLLABLE UK
-+<UC6C9>     /x83/x33/x89/x32 HANGUL SYLLABLE UT
-+<UC6CA>     /x83/x33/x89/x33 HANGUL SYLLABLE UP
-+<UC6CB>     /x83/x33/x89/x34 HANGUL SYLLABLE UH
-+<UC6CC>     /x83/x33/x89/x35 HANGUL SYLLABLE WEO
-+<UC6CD>     /x83/x33/x89/x36 HANGUL SYLLABLE WEOG
-+<UC6CE>     /x83/x33/x89/x37 HANGUL SYLLABLE WEOGG
-+<UC6CF>     /x83/x33/x89/x38 HANGUL SYLLABLE WEOGS
-+<UC6D0>     /x83/x33/x89/x39 HANGUL SYLLABLE WEON
-+<UC6D1>     /x83/x33/x8a/x30 HANGUL SYLLABLE WEONI
-+<UC6D2>     /x83/x33/x8a/x31 HANGUL SYLLABLE WEONH
-+<UC6D3>     /x83/x33/x8a/x32 HANGUL SYLLABLE WEOD
-+<UC6D4>     /x83/x33/x8a/x33 HANGUL SYLLABLE WEOL
-+<UC6D5>     /x83/x33/x8a/x34 HANGUL SYLLABLE WEOLG
-+<UC6D6>     /x83/x33/x8a/x35 HANGUL SYLLABLE WEOLM
-+<UC6D7>     /x83/x33/x8a/x36 HANGUL SYLLABLE WEOLB
-+<UC6D8>     /x83/x33/x8a/x37 HANGUL SYLLABLE WEOLS
-+<UC6D9>     /x83/x33/x8a/x38 HANGUL SYLLABLE WEOLT
-+<UC6DA>     /x83/x33/x8a/x39 HANGUL SYLLABLE WEOLP
-+<UC6DB>     /x83/x33/x8b/x30 HANGUL SYLLABLE WEOLH
-+<UC6DC>     /x83/x33/x8b/x31 HANGUL SYLLABLE WEOM
-+<UC6DD>     /x83/x33/x8b/x32 HANGUL SYLLABLE WEOB
-+<UC6DE>     /x83/x33/x8b/x33 HANGUL SYLLABLE WEOBS
-+<UC6DF>     /x83/x33/x8b/x34 HANGUL SYLLABLE WEOS
-+<UC6E0>     /x83/x33/x8b/x35 HANGUL SYLLABLE WEOSS
-+<UC6E1>     /x83/x33/x8b/x36 HANGUL SYLLABLE WEONG
-+<UC6E2>     /x83/x33/x8b/x37 HANGUL SYLLABLE WEOJ
-+<UC6E3>     /x83/x33/x8b/x38 HANGUL SYLLABLE WEOC
-+<UC6E4>     /x83/x33/x8b/x39 HANGUL SYLLABLE WEOK
-+<UC6E5>     /x83/x33/x8c/x30 HANGUL SYLLABLE WEOT
-+<UC6E6>     /x83/x33/x8c/x31 HANGUL SYLLABLE WEOP
-+<UC6E7>     /x83/x33/x8c/x32 HANGUL SYLLABLE WEOH
-+<UC6E8>     /x83/x33/x8c/x33 HANGUL SYLLABLE WE
-+<UC6E9>     /x83/x33/x8c/x34 HANGUL SYLLABLE WEG
-+<UC6EA>     /x83/x33/x8c/x35 HANGUL SYLLABLE WEGG
-+<UC6EB>     /x83/x33/x8c/x36 HANGUL SYLLABLE WEGS
-+<UC6EC>     /x83/x33/x8c/x37 HANGUL SYLLABLE WEN
-+<UC6ED>     /x83/x33/x8c/x38 HANGUL SYLLABLE WENI
-+<UC6EE>     /x83/x33/x8c/x39 HANGUL SYLLABLE WENH
-+<UC6EF>     /x83/x33/x8d/x30 HANGUL SYLLABLE WED
-+<UC6F0>     /x83/x33/x8d/x31 HANGUL SYLLABLE WEL
-+<UC6F1>     /x83/x33/x8d/x32 HANGUL SYLLABLE WELG
-+<UC6F2>     /x83/x33/x8d/x33 HANGUL SYLLABLE WELM
-+<UC6F3>     /x83/x33/x8d/x34 HANGUL SYLLABLE WELB
-+<UC6F4>     /x83/x33/x8d/x35 HANGUL SYLLABLE WELS
-+<UC6F5>     /x83/x33/x8d/x36 HANGUL SYLLABLE WELT
-+<UC6F6>     /x83/x33/x8d/x37 HANGUL SYLLABLE WELP
-+<UC6F7>     /x83/x33/x8d/x38 HANGUL SYLLABLE WELH
-+<UC6F8>     /x83/x33/x8d/x39 HANGUL SYLLABLE WEM
-+<UC6F9>     /x83/x33/x8e/x30 HANGUL SYLLABLE WEB
-+<UC6FA>     /x83/x33/x8e/x31 HANGUL SYLLABLE WEBS
-+<UC6FB>     /x83/x33/x8e/x32 HANGUL SYLLABLE WES
-+<UC6FC>     /x83/x33/x8e/x33 HANGUL SYLLABLE WESS
-+<UC6FD>     /x83/x33/x8e/x34 HANGUL SYLLABLE WENG
-+<UC6FE>     /x83/x33/x8e/x35 HANGUL SYLLABLE WEJ
-+<UC6FF>     /x83/x33/x8e/x36 HANGUL SYLLABLE WEC
-+<UC700>     /x83/x33/x8e/x37 HANGUL SYLLABLE WEK
-+<UC701>     /x83/x33/x8e/x38 HANGUL SYLLABLE WET
-+<UC702>     /x83/x33/x8e/x39 HANGUL SYLLABLE WEP
-+<UC703>     /x83/x33/x8f/x30 HANGUL SYLLABLE WEH
-+<UC704>     /x83/x33/x8f/x31 HANGUL SYLLABLE WI
-+<UC705>     /x83/x33/x8f/x32 HANGUL SYLLABLE WIG
-+<UC706>     /x83/x33/x8f/x33 HANGUL SYLLABLE WIGG
-+<UC707>     /x83/x33/x8f/x34 HANGUL SYLLABLE WIGS
-+<UC708>     /x83/x33/x8f/x35 HANGUL SYLLABLE WIN
-+<UC709>     /x83/x33/x8f/x36 HANGUL SYLLABLE WINI
-+<UC70A>     /x83/x33/x8f/x37 HANGUL SYLLABLE WINH
-+<UC70B>     /x83/x33/x8f/x38 HANGUL SYLLABLE WID
-+<UC70C>     /x83/x33/x8f/x39 HANGUL SYLLABLE WIL
-+<UC70D>     /x83/x33/x90/x30 HANGUL SYLLABLE WILG
-+<UC70E>     /x83/x33/x90/x31 HANGUL SYLLABLE WILM
-+<UC70F>     /x83/x33/x90/x32 HANGUL SYLLABLE WILB
-+<UC710>     /x83/x33/x90/x33 HANGUL SYLLABLE WILS
-+<UC711>     /x83/x33/x90/x34 HANGUL SYLLABLE WILT
-+<UC712>     /x83/x33/x90/x35 HANGUL SYLLABLE WILP
-+<UC713>     /x83/x33/x90/x36 HANGUL SYLLABLE WILH
-+<UC714>     /x83/x33/x90/x37 HANGUL SYLLABLE WIM
-+<UC715>     /x83/x33/x90/x38 HANGUL SYLLABLE WIB
-+<UC716>     /x83/x33/x90/x39 HANGUL SYLLABLE WIBS
-+<UC717>     /x83/x33/x91/x30 HANGUL SYLLABLE WIS
-+<UC718>     /x83/x33/x91/x31 HANGUL SYLLABLE WISS
-+<UC719>     /x83/x33/x91/x32 HANGUL SYLLABLE WING
-+<UC71A>     /x83/x33/x91/x33 HANGUL SYLLABLE WIJ
-+<UC71B>     /x83/x33/x91/x34 HANGUL SYLLABLE WIC
-+<UC71C>     /x83/x33/x91/x35 HANGUL SYLLABLE WIK
-+<UC71D>     /x83/x33/x91/x36 HANGUL SYLLABLE WIT
-+<UC71E>     /x83/x33/x91/x37 HANGUL SYLLABLE WIP
-+<UC71F>     /x83/x33/x91/x38 HANGUL SYLLABLE WIH
-+<UC720>     /x83/x33/x91/x39 HANGUL SYLLABLE YU
-+<UC721>     /x83/x33/x92/x30 HANGUL SYLLABLE YUG
-+<UC722>     /x83/x33/x92/x31 HANGUL SYLLABLE YUGG
-+<UC723>     /x83/x33/x92/x32 HANGUL SYLLABLE YUGS
-+<UC724>     /x83/x33/x92/x33 HANGUL SYLLABLE YUN
-+<UC725>     /x83/x33/x92/x34 HANGUL SYLLABLE YUNI
-+<UC726>     /x83/x33/x92/x35 HANGUL SYLLABLE YUNH
-+<UC727>     /x83/x33/x92/x36 HANGUL SYLLABLE YUD
-+<UC728>     /x83/x33/x92/x37 HANGUL SYLLABLE YUL
-+<UC729>     /x83/x33/x92/x38 HANGUL SYLLABLE YULG
-+<UC72A>     /x83/x33/x92/x39 HANGUL SYLLABLE YULM
-+<UC72B>     /x83/x33/x93/x30 HANGUL SYLLABLE YULB
-+<UC72C>     /x83/x33/x93/x31 HANGUL SYLLABLE YULS
-+<UC72D>     /x83/x33/x93/x32 HANGUL SYLLABLE YULT
-+<UC72E>     /x83/x33/x93/x33 HANGUL SYLLABLE YULP
-+<UC72F>     /x83/x33/x93/x34 HANGUL SYLLABLE YULH
-+<UC730>     /x83/x33/x93/x35 HANGUL SYLLABLE YUM
-+<UC731>     /x83/x33/x93/x36 HANGUL SYLLABLE YUB
-+<UC732>     /x83/x33/x93/x37 HANGUL SYLLABLE YUBS
-+<UC733>     /x83/x33/x93/x38 HANGUL SYLLABLE YUS
-+<UC734>     /x83/x33/x93/x39 HANGUL SYLLABLE YUSS
-+<UC735>     /x83/x33/x94/x30 HANGUL SYLLABLE YUNG
-+<UC736>     /x83/x33/x94/x31 HANGUL SYLLABLE YUJ
-+<UC737>     /x83/x33/x94/x32 HANGUL SYLLABLE YUC
-+<UC738>     /x83/x33/x94/x33 HANGUL SYLLABLE YUK
-+<UC739>     /x83/x33/x94/x34 HANGUL SYLLABLE YUT
-+<UC73A>     /x83/x33/x94/x35 HANGUL SYLLABLE YUP
-+<UC73B>     /x83/x33/x94/x36 HANGUL SYLLABLE YUH
-+<UC73C>     /x83/x33/x94/x37 HANGUL SYLLABLE EU
-+<UC73D>     /x83/x33/x94/x38 HANGUL SYLLABLE EUG
-+<UC73E>     /x83/x33/x94/x39 HANGUL SYLLABLE EUGG
-+<UC73F>     /x83/x33/x95/x30 HANGUL SYLLABLE EUGS
-+<UC740>     /x83/x33/x95/x31 HANGUL SYLLABLE EUN
-+<UC741>     /x83/x33/x95/x32 HANGUL SYLLABLE EUNI
-+<UC742>     /x83/x33/x95/x33 HANGUL SYLLABLE EUNH
-+<UC743>     /x83/x33/x95/x34 HANGUL SYLLABLE EUD
-+<UC744>     /x83/x33/x95/x35 HANGUL SYLLABLE EUL
-+<UC745>     /x83/x33/x95/x36 HANGUL SYLLABLE EULG
-+<UC746>     /x83/x33/x95/x37 HANGUL SYLLABLE EULM
-+<UC747>     /x83/x33/x95/x38 HANGUL SYLLABLE EULB
-+<UC748>     /x83/x33/x95/x39 HANGUL SYLLABLE EULS
-+<UC749>     /x83/x33/x96/x30 HANGUL SYLLABLE EULT
-+<UC74A>     /x83/x33/x96/x31 HANGUL SYLLABLE EULP
-+<UC74B>     /x83/x33/x96/x32 HANGUL SYLLABLE EULH
-+<UC74C>     /x83/x33/x96/x33 HANGUL SYLLABLE EUM
-+<UC74D>     /x83/x33/x96/x34 HANGUL SYLLABLE EUB
-+<UC74E>     /x83/x33/x96/x35 HANGUL SYLLABLE EUBS
-+<UC74F>     /x83/x33/x96/x36 HANGUL SYLLABLE EUS
-+<UC750>     /x83/x33/x96/x37 HANGUL SYLLABLE EUSS
-+<UC751>     /x83/x33/x96/x38 HANGUL SYLLABLE EUNG
-+<UC752>     /x83/x33/x96/x39 HANGUL SYLLABLE EUJ
-+<UC753>     /x83/x33/x97/x30 HANGUL SYLLABLE EUC
-+<UC754>     /x83/x33/x97/x31 HANGUL SYLLABLE EUK
-+<UC755>     /x83/x33/x97/x32 HANGUL SYLLABLE EUT
-+<UC756>     /x83/x33/x97/x33 HANGUL SYLLABLE EUP
-+<UC757>     /x83/x33/x97/x34 HANGUL SYLLABLE EUH
-+<UC758>     /x83/x33/x97/x35 HANGUL SYLLABLE YI
-+<UC759>     /x83/x33/x97/x36 HANGUL SYLLABLE YIG
-+<UC75A>     /x83/x33/x97/x37 HANGUL SYLLABLE YIGG
-+<UC75B>     /x83/x33/x97/x38 HANGUL SYLLABLE YIGS
-+<UC75C>     /x83/x33/x97/x39 HANGUL SYLLABLE YIN
-+<UC75D>     /x83/x33/x98/x30 HANGUL SYLLABLE YINI
-+<UC75E>     /x83/x33/x98/x31 HANGUL SYLLABLE YINH
-+<UC75F>     /x83/x33/x98/x32 HANGUL SYLLABLE YID
-+<UC760>     /x83/x33/x98/x33 HANGUL SYLLABLE YIL
-+<UC761>     /x83/x33/x98/x34 HANGUL SYLLABLE YILG
-+<UC762>     /x83/x33/x98/x35 HANGUL SYLLABLE YILM
-+<UC763>     /x83/x33/x98/x36 HANGUL SYLLABLE YILB
-+<UC764>     /x83/x33/x98/x37 HANGUL SYLLABLE YILS
-+<UC765>     /x83/x33/x98/x38 HANGUL SYLLABLE YILT
-+<UC766>     /x83/x33/x98/x39 HANGUL SYLLABLE YILP
-+<UC767>     /x83/x33/x99/x30 HANGUL SYLLABLE YILH
-+<UC768>     /x83/x33/x99/x31 HANGUL SYLLABLE YIM
-+<UC769>     /x83/x33/x99/x32 HANGUL SYLLABLE YIB
-+<UC76A>     /x83/x33/x99/x33 HANGUL SYLLABLE YIBS
-+<UC76B>     /x83/x33/x99/x34 HANGUL SYLLABLE YIS
-+<UC76C>     /x83/x33/x99/x35 HANGUL SYLLABLE YISS
-+<UC76D>     /x83/x33/x99/x36 HANGUL SYLLABLE YING
-+<UC76E>     /x83/x33/x99/x37 HANGUL SYLLABLE YIJ
-+<UC76F>     /x83/x33/x99/x38 HANGUL SYLLABLE YIC
-+<UC770>     /x83/x33/x99/x39 HANGUL SYLLABLE YIK
-+<UC771>     /x83/x33/x9a/x30 HANGUL SYLLABLE YIT
-+<UC772>     /x83/x33/x9a/x31 HANGUL SYLLABLE YIP
-+<UC773>     /x83/x33/x9a/x32 HANGUL SYLLABLE YIH
-+<UC774>     /x83/x33/x9a/x33 HANGUL SYLLABLE I
-+<UC775>     /x83/x33/x9a/x34 HANGUL SYLLABLE IG
-+<UC776>     /x83/x33/x9a/x35 HANGUL SYLLABLE IGG
-+<UC777>     /x83/x33/x9a/x36 HANGUL SYLLABLE IGS
-+<UC778>     /x83/x33/x9a/x37 HANGUL SYLLABLE IN
-+<UC779>     /x83/x33/x9a/x38 HANGUL SYLLABLE INI
-+<UC77A>     /x83/x33/x9a/x39 HANGUL SYLLABLE INH
-+<UC77B>     /x83/x33/x9b/x30 HANGUL SYLLABLE ID
-+<UC77C>     /x83/x33/x9b/x31 HANGUL SYLLABLE IL
-+<UC77D>     /x83/x33/x9b/x32 HANGUL SYLLABLE ILG
-+<UC77E>     /x83/x33/x9b/x33 HANGUL SYLLABLE ILM
-+<UC77F>     /x83/x33/x9b/x34 HANGUL SYLLABLE ILB
-+<UC780>     /x83/x33/x9b/x35 HANGUL SYLLABLE ILS
-+<UC781>     /x83/x33/x9b/x36 HANGUL SYLLABLE ILT
-+<UC782>     /x83/x33/x9b/x37 HANGUL SYLLABLE ILP
-+<UC783>     /x83/x33/x9b/x38 HANGUL SYLLABLE ILH
-+<UC784>     /x83/x33/x9b/x39 HANGUL SYLLABLE IM
-+<UC785>     /x83/x33/x9c/x30 HANGUL SYLLABLE IB
-+<UC786>     /x83/x33/x9c/x31 HANGUL SYLLABLE IBS
-+<UC787>     /x83/x33/x9c/x32 HANGUL SYLLABLE IS
-+<UC788>     /x83/x33/x9c/x33 HANGUL SYLLABLE ISS
-+<UC789>     /x83/x33/x9c/x34 HANGUL SYLLABLE ING
-+<UC78A>     /x83/x33/x9c/x35 HANGUL SYLLABLE IJ
-+<UC78B>     /x83/x33/x9c/x36 HANGUL SYLLABLE IC
-+<UC78C>     /x83/x33/x9c/x37 HANGUL SYLLABLE IK
-+<UC78D>     /x83/x33/x9c/x38 HANGUL SYLLABLE IT
-+<UC78E>     /x83/x33/x9c/x39 HANGUL SYLLABLE IP
-+<UC78F>     /x83/x33/x9d/x30 HANGUL SYLLABLE IH
-+<UC790>     /x83/x33/x9d/x31 HANGUL SYLLABLE JA
-+<UC791>     /x83/x33/x9d/x32 HANGUL SYLLABLE JAG
-+<UC792>     /x83/x33/x9d/x33 HANGUL SYLLABLE JAGG
-+<UC793>     /x83/x33/x9d/x34 HANGUL SYLLABLE JAGS
-+<UC794>     /x83/x33/x9d/x35 HANGUL SYLLABLE JAN
-+<UC795>     /x83/x33/x9d/x36 HANGUL SYLLABLE JANI
-+<UC796>     /x83/x33/x9d/x37 HANGUL SYLLABLE JANH
-+<UC797>     /x83/x33/x9d/x38 HANGUL SYLLABLE JAD
-+<UC798>     /x83/x33/x9d/x39 HANGUL SYLLABLE JAL
-+<UC799>     /x83/x33/x9e/x30 HANGUL SYLLABLE JALG
-+<UC79A>     /x83/x33/x9e/x31 HANGUL SYLLABLE JALM
-+<UC79B>     /x83/x33/x9e/x32 HANGUL SYLLABLE JALB
-+<UC79C>     /x83/x33/x9e/x33 HANGUL SYLLABLE JALS
-+<UC79D>     /x83/x33/x9e/x34 HANGUL SYLLABLE JALT
-+<UC79E>     /x83/x33/x9e/x35 HANGUL SYLLABLE JALP
-+<UC79F>     /x83/x33/x9e/x36 HANGUL SYLLABLE JALH
-+<UC7A0>     /x83/x33/x9e/x37 HANGUL SYLLABLE JAM
-+<UC7A1>     /x83/x33/x9e/x38 HANGUL SYLLABLE JAB
-+<UC7A2>     /x83/x33/x9e/x39 HANGUL SYLLABLE JABS
-+<UC7A3>     /x83/x33/x9f/x30 HANGUL SYLLABLE JAS
-+<UC7A4>     /x83/x33/x9f/x31 HANGUL SYLLABLE JASS
-+<UC7A5>     /x83/x33/x9f/x32 HANGUL SYLLABLE JANG
-+<UC7A6>     /x83/x33/x9f/x33 HANGUL SYLLABLE JAJ
-+<UC7A7>     /x83/x33/x9f/x34 HANGUL SYLLABLE JAC
-+<UC7A8>     /x83/x33/x9f/x35 HANGUL SYLLABLE JAK
-+<UC7A9>     /x83/x33/x9f/x36 HANGUL SYLLABLE JAT
-+<UC7AA>     /x83/x33/x9f/x37 HANGUL SYLLABLE JAP
-+<UC7AB>     /x83/x33/x9f/x38 HANGUL SYLLABLE JAH
-+<UC7AC>     /x83/x33/x9f/x39 HANGUL SYLLABLE JAE
-+<UC7AD>     /x83/x33/xa0/x30 HANGUL SYLLABLE JAEG
-+<UC7AE>     /x83/x33/xa0/x31 HANGUL SYLLABLE JAEGG
-+<UC7AF>     /x83/x33/xa0/x32 HANGUL SYLLABLE JAEGS
-+<UC7B0>     /x83/x33/xa0/x33 HANGUL SYLLABLE JAEN
-+<UC7B1>     /x83/x33/xa0/x34 HANGUL SYLLABLE JAENI
-+<UC7B2>     /x83/x33/xa0/x35 HANGUL SYLLABLE JAENH
-+<UC7B3>     /x83/x33/xa0/x36 HANGUL SYLLABLE JAED
-+<UC7B4>     /x83/x33/xa0/x37 HANGUL SYLLABLE JAEL
-+<UC7B5>     /x83/x33/xa0/x38 HANGUL SYLLABLE JAELG
-+<UC7B6>     /x83/x33/xa0/x39 HANGUL SYLLABLE JAELM
-+<UC7B7>     /x83/x33/xa1/x30 HANGUL SYLLABLE JAELB
-+<UC7B8>     /x83/x33/xa1/x31 HANGUL SYLLABLE JAELS
-+<UC7B9>     /x83/x33/xa1/x32 HANGUL SYLLABLE JAELT
-+<UC7BA>     /x83/x33/xa1/x33 HANGUL SYLLABLE JAELP
-+<UC7BB>     /x83/x33/xa1/x34 HANGUL SYLLABLE JAELH
-+<UC7BC>     /x83/x33/xa1/x35 HANGUL SYLLABLE JAEM
-+<UC7BD>     /x83/x33/xa1/x36 HANGUL SYLLABLE JAEB
-+<UC7BE>     /x83/x33/xa1/x37 HANGUL SYLLABLE JAEBS
-+<UC7BF>     /x83/x33/xa1/x38 HANGUL SYLLABLE JAES
-+<UC7C0>     /x83/x33/xa1/x39 HANGUL SYLLABLE JAESS
-+<UC7C1>     /x83/x33/xa2/x30 HANGUL SYLLABLE JAENG
-+<UC7C2>     /x83/x33/xa2/x31 HANGUL SYLLABLE JAEJ
-+<UC7C3>     /x83/x33/xa2/x32 HANGUL SYLLABLE JAEC
-+<UC7C4>     /x83/x33/xa2/x33 HANGUL SYLLABLE JAEK
-+<UC7C5>     /x83/x33/xa2/x34 HANGUL SYLLABLE JAET
-+<UC7C6>     /x83/x33/xa2/x35 HANGUL SYLLABLE JAEP
-+<UC7C7>     /x83/x33/xa2/x36 HANGUL SYLLABLE JAEH
-+<UC7C8>     /x83/x33/xa2/x37 HANGUL SYLLABLE JYA
-+<UC7C9>     /x83/x33/xa2/x38 HANGUL SYLLABLE JYAG
-+<UC7CA>     /x83/x33/xa2/x39 HANGUL SYLLABLE JYAGG
-+<UC7CB>     /x83/x33/xa3/x30 HANGUL SYLLABLE JYAGS
-+<UC7CC>     /x83/x33/xa3/x31 HANGUL SYLLABLE JYAN
-+<UC7CD>     /x83/x33/xa3/x32 HANGUL SYLLABLE JYANI
-+<UC7CE>     /x83/x33/xa3/x33 HANGUL SYLLABLE JYANH
-+<UC7CF>     /x83/x33/xa3/x34 HANGUL SYLLABLE JYAD
-+<UC7D0>     /x83/x33/xa3/x35 HANGUL SYLLABLE JYAL
-+<UC7D1>     /x83/x33/xa3/x36 HANGUL SYLLABLE JYALG
-+<UC7D2>     /x83/x33/xa3/x37 HANGUL SYLLABLE JYALM
-+<UC7D3>     /x83/x33/xa3/x38 HANGUL SYLLABLE JYALB
-+<UC7D4>     /x83/x33/xa3/x39 HANGUL SYLLABLE JYALS
-+<UC7D5>     /x83/x33/xa4/x30 HANGUL SYLLABLE JYALT
-+<UC7D6>     /x83/x33/xa4/x31 HANGUL SYLLABLE JYALP
-+<UC7D7>     /x83/x33/xa4/x32 HANGUL SYLLABLE JYALH
-+<UC7D8>     /x83/x33/xa4/x33 HANGUL SYLLABLE JYAM
-+<UC7D9>     /x83/x33/xa4/x34 HANGUL SYLLABLE JYAB
-+<UC7DA>     /x83/x33/xa4/x35 HANGUL SYLLABLE JYABS
-+<UC7DB>     /x83/x33/xa4/x36 HANGUL SYLLABLE JYAS
-+<UC7DC>     /x83/x33/xa4/x37 HANGUL SYLLABLE JYASS
-+<UC7DD>     /x83/x33/xa4/x38 HANGUL SYLLABLE JYANG
-+<UC7DE>     /x83/x33/xa4/x39 HANGUL SYLLABLE JYAJ
-+<UC7DF>     /x83/x33/xa5/x30 HANGUL SYLLABLE JYAC
-+<UC7E0>     /x83/x33/xa5/x31 HANGUL SYLLABLE JYAK
-+<UC7E1>     /x83/x33/xa5/x32 HANGUL SYLLABLE JYAT
-+<UC7E2>     /x83/x33/xa5/x33 HANGUL SYLLABLE JYAP
-+<UC7E3>     /x83/x33/xa5/x34 HANGUL SYLLABLE JYAH
-+<UC7E4>     /x83/x33/xa5/x35 HANGUL SYLLABLE JYAE
-+<UC7E5>     /x83/x33/xa5/x36 HANGUL SYLLABLE JYAEG
-+<UC7E6>     /x83/x33/xa5/x37 HANGUL SYLLABLE JYAEGG
-+<UC7E7>     /x83/x33/xa5/x38 HANGUL SYLLABLE JYAEGS
-+<UC7E8>     /x83/x33/xa5/x39 HANGUL SYLLABLE JYAEN
-+<UC7E9>     /x83/x33/xa6/x30 HANGUL SYLLABLE JYAENI
-+<UC7EA>     /x83/x33/xa6/x31 HANGUL SYLLABLE JYAENH
-+<UC7EB>     /x83/x33/xa6/x32 HANGUL SYLLABLE JYAED
-+<UC7EC>     /x83/x33/xa6/x33 HANGUL SYLLABLE JYAEL
-+<UC7ED>     /x83/x33/xa6/x34 HANGUL SYLLABLE JYAELG
-+<UC7EE>     /x83/x33/xa6/x35 HANGUL SYLLABLE JYAELM
-+<UC7EF>     /x83/x33/xa6/x36 HANGUL SYLLABLE JYAELB
-+<UC7F0>     /x83/x33/xa6/x37 HANGUL SYLLABLE JYAELS
-+<UC7F1>     /x83/x33/xa6/x38 HANGUL SYLLABLE JYAELT
-+<UC7F2>     /x83/x33/xa6/x39 HANGUL SYLLABLE JYAELP
-+<UC7F3>     /x83/x33/xa7/x30 HANGUL SYLLABLE JYAELH
-+<UC7F4>     /x83/x33/xa7/x31 HANGUL SYLLABLE JYAEM
-+<UC7F5>     /x83/x33/xa7/x32 HANGUL SYLLABLE JYAEB
-+<UC7F6>     /x83/x33/xa7/x33 HANGUL SYLLABLE JYAEBS
-+<UC7F7>     /x83/x33/xa7/x34 HANGUL SYLLABLE JYAES
-+<UC7F8>     /x83/x33/xa7/x35 HANGUL SYLLABLE JYAESS
-+<UC7F9>     /x83/x33/xa7/x36 HANGUL SYLLABLE JYAENG
-+<UC7FA>     /x83/x33/xa7/x37 HANGUL SYLLABLE JYAEJ
-+<UC7FB>     /x83/x33/xa7/x38 HANGUL SYLLABLE JYAEC
-+<UC7FC>     /x83/x33/xa7/x39 HANGUL SYLLABLE JYAEK
-+<UC7FD>     /x83/x33/xa8/x30 HANGUL SYLLABLE JYAET
-+<UC7FE>     /x83/x33/xa8/x31 HANGUL SYLLABLE JYAEP
-+<UC7FF>     /x83/x33/xa8/x32 HANGUL SYLLABLE JYAEH
-+<UC800>     /x83/x33/xa8/x33 HANGUL SYLLABLE JEO
-+<UC801>     /x83/x33/xa8/x34 HANGUL SYLLABLE JEOG
-+<UC802>     /x83/x33/xa8/x35 HANGUL SYLLABLE JEOGG
-+<UC803>     /x83/x33/xa8/x36 HANGUL SYLLABLE JEOGS
-+<UC804>     /x83/x33/xa8/x37 HANGUL SYLLABLE JEON
-+<UC805>     /x83/x33/xa8/x38 HANGUL SYLLABLE JEONI
-+<UC806>     /x83/x33/xa8/x39 HANGUL SYLLABLE JEONH
-+<UC807>     /x83/x33/xa9/x30 HANGUL SYLLABLE JEOD
-+<UC808>     /x83/x33/xa9/x31 HANGUL SYLLABLE JEOL
-+<UC809>     /x83/x33/xa9/x32 HANGUL SYLLABLE JEOLG
-+<UC80A>     /x83/x33/xa9/x33 HANGUL SYLLABLE JEOLM
-+<UC80B>     /x83/x33/xa9/x34 HANGUL SYLLABLE JEOLB
-+<UC80C>     /x83/x33/xa9/x35 HANGUL SYLLABLE JEOLS
-+<UC80D>     /x83/x33/xa9/x36 HANGUL SYLLABLE JEOLT
-+<UC80E>     /x83/x33/xa9/x37 HANGUL SYLLABLE JEOLP
-+<UC80F>     /x83/x33/xa9/x38 HANGUL SYLLABLE JEOLH
-+<UC810>     /x83/x33/xa9/x39 HANGUL SYLLABLE JEOM
-+<UC811>     /x83/x33/xaa/x30 HANGUL SYLLABLE JEOB
-+<UC812>     /x83/x33/xaa/x31 HANGUL SYLLABLE JEOBS
-+<UC813>     /x83/x33/xaa/x32 HANGUL SYLLABLE JEOS
-+<UC814>     /x83/x33/xaa/x33 HANGUL SYLLABLE JEOSS
-+<UC815>     /x83/x33/xaa/x34 HANGUL SYLLABLE JEONG
-+<UC816>     /x83/x33/xaa/x35 HANGUL SYLLABLE JEOJ
-+<UC817>     /x83/x33/xaa/x36 HANGUL SYLLABLE JEOC
-+<UC818>     /x83/x33/xaa/x37 HANGUL SYLLABLE JEOK
-+<UC819>     /x83/x33/xaa/x38 HANGUL SYLLABLE JEOT
-+<UC81A>     /x83/x33/xaa/x39 HANGUL SYLLABLE JEOP
-+<UC81B>     /x83/x33/xab/x30 HANGUL SYLLABLE JEOH
-+<UC81C>     /x83/x33/xab/x31 HANGUL SYLLABLE JE
-+<UC81D>     /x83/x33/xab/x32 HANGUL SYLLABLE JEG
-+<UC81E>     /x83/x33/xab/x33 HANGUL SYLLABLE JEGG
-+<UC81F>     /x83/x33/xab/x34 HANGUL SYLLABLE JEGS
-+<UC820>     /x83/x33/xab/x35 HANGUL SYLLABLE JEN
-+<UC821>     /x83/x33/xab/x36 HANGUL SYLLABLE JENI
-+<UC822>     /x83/x33/xab/x37 HANGUL SYLLABLE JENH
-+<UC823>     /x83/x33/xab/x38 HANGUL SYLLABLE JED
-+<UC824>     /x83/x33/xab/x39 HANGUL SYLLABLE JEL
-+<UC825>     /x83/x33/xac/x30 HANGUL SYLLABLE JELG
-+<UC826>     /x83/x33/xac/x31 HANGUL SYLLABLE JELM
-+<UC827>     /x83/x33/xac/x32 HANGUL SYLLABLE JELB
-+<UC828>     /x83/x33/xac/x33 HANGUL SYLLABLE JELS
-+<UC829>     /x83/x33/xac/x34 HANGUL SYLLABLE JELT
-+<UC82A>     /x83/x33/xac/x35 HANGUL SYLLABLE JELP
-+<UC82B>     /x83/x33/xac/x36 HANGUL SYLLABLE JELH
-+<UC82C>     /x83/x33/xac/x37 HANGUL SYLLABLE JEM
-+<UC82D>     /x83/x33/xac/x38 HANGUL SYLLABLE JEB
-+<UC82E>     /x83/x33/xac/x39 HANGUL SYLLABLE JEBS
-+<UC82F>     /x83/x33/xad/x30 HANGUL SYLLABLE JES
-+<UC830>     /x83/x33/xad/x31 HANGUL SYLLABLE JESS
-+<UC831>     /x83/x33/xad/x32 HANGUL SYLLABLE JENG
-+<UC832>     /x83/x33/xad/x33 HANGUL SYLLABLE JEJ
-+<UC833>     /x83/x33/xad/x34 HANGUL SYLLABLE JEC
-+<UC834>     /x83/x33/xad/x35 HANGUL SYLLABLE JEK
-+<UC835>     /x83/x33/xad/x36 HANGUL SYLLABLE JET
-+<UC836>     /x83/x33/xad/x37 HANGUL SYLLABLE JEP
-+<UC837>     /x83/x33/xad/x38 HANGUL SYLLABLE JEH
-+<UC838>     /x83/x33/xad/x39 HANGUL SYLLABLE JYEO
-+<UC839>     /x83/x33/xae/x30 HANGUL SYLLABLE JYEOG
-+<UC83A>     /x83/x33/xae/x31 HANGUL SYLLABLE JYEOGG
-+<UC83B>     /x83/x33/xae/x32 HANGUL SYLLABLE JYEOGS
-+<UC83C>     /x83/x33/xae/x33 HANGUL SYLLABLE JYEON
-+<UC83D>     /x83/x33/xae/x34 HANGUL SYLLABLE JYEONI
-+<UC83E>     /x83/x33/xae/x35 HANGUL SYLLABLE JYEONH
-+<UC83F>     /x83/x33/xae/x36 HANGUL SYLLABLE JYEOD
-+<UC840>     /x83/x33/xae/x37 HANGUL SYLLABLE JYEOL
-+<UC841>     /x83/x33/xae/x38 HANGUL SYLLABLE JYEOLG
-+<UC842>     /x83/x33/xae/x39 HANGUL SYLLABLE JYEOLM
-+<UC843>     /x83/x33/xaf/x30 HANGUL SYLLABLE JYEOLB
-+<UC844>     /x83/x33/xaf/x31 HANGUL SYLLABLE JYEOLS
-+<UC845>     /x83/x33/xaf/x32 HANGUL SYLLABLE JYEOLT
-+<UC846>     /x83/x33/xaf/x33 HANGUL SYLLABLE JYEOLP
-+<UC847>     /x83/x33/xaf/x34 HANGUL SYLLABLE JYEOLH
-+<UC848>     /x83/x33/xaf/x35 HANGUL SYLLABLE JYEOM
-+<UC849>     /x83/x33/xaf/x36 HANGUL SYLLABLE JYEOB
-+<UC84A>     /x83/x33/xaf/x37 HANGUL SYLLABLE JYEOBS
-+<UC84B>     /x83/x33/xaf/x38 HANGUL SYLLABLE JYEOS
-+<UC84C>     /x83/x33/xaf/x39 HANGUL SYLLABLE JYEOSS
-+<UC84D>     /x83/x33/xb0/x30 HANGUL SYLLABLE JYEONG
-+<UC84E>     /x83/x33/xb0/x31 HANGUL SYLLABLE JYEOJ
-+<UC84F>     /x83/x33/xb0/x32 HANGUL SYLLABLE JYEOC
-+<UC850>     /x83/x33/xb0/x33 HANGUL SYLLABLE JYEOK
-+<UC851>     /x83/x33/xb0/x34 HANGUL SYLLABLE JYEOT
-+<UC852>     /x83/x33/xb0/x35 HANGUL SYLLABLE JYEOP
-+<UC853>     /x83/x33/xb0/x36 HANGUL SYLLABLE JYEOH
-+<UC854>     /x83/x33/xb0/x37 HANGUL SYLLABLE JYE
-+<UC855>     /x83/x33/xb0/x38 HANGUL SYLLABLE JYEG
-+<UC856>     /x83/x33/xb0/x39 HANGUL SYLLABLE JYEGG
-+<UC857>     /x83/x33/xb1/x30 HANGUL SYLLABLE JYEGS
-+<UC858>     /x83/x33/xb1/x31 HANGUL SYLLABLE JYEN
-+<UC859>     /x83/x33/xb1/x32 HANGUL SYLLABLE JYENI
-+<UC85A>     /x83/x33/xb1/x33 HANGUL SYLLABLE JYENH
-+<UC85B>     /x83/x33/xb1/x34 HANGUL SYLLABLE JYED
-+<UC85C>     /x83/x33/xb1/x35 HANGUL SYLLABLE JYEL
-+<UC85D>     /x83/x33/xb1/x36 HANGUL SYLLABLE JYELG
-+<UC85E>     /x83/x33/xb1/x37 HANGUL SYLLABLE JYELM
-+<UC85F>     /x83/x33/xb1/x38 HANGUL SYLLABLE JYELB
-+<UC860>     /x83/x33/xb1/x39 HANGUL SYLLABLE JYELS
-+<UC861>     /x83/x33/xb2/x30 HANGUL SYLLABLE JYELT
-+<UC862>     /x83/x33/xb2/x31 HANGUL SYLLABLE JYELP
-+<UC863>     /x83/x33/xb2/x32 HANGUL SYLLABLE JYELH
-+<UC864>     /x83/x33/xb2/x33 HANGUL SYLLABLE JYEM
-+<UC865>     /x83/x33/xb2/x34 HANGUL SYLLABLE JYEB
-+<UC866>     /x83/x33/xb2/x35 HANGUL SYLLABLE JYEBS
-+<UC867>     /x83/x33/xb2/x36 HANGUL SYLLABLE JYES
-+<UC868>     /x83/x33/xb2/x37 HANGUL SYLLABLE JYESS
-+<UC869>     /x83/x33/xb2/x38 HANGUL SYLLABLE JYENG
-+<UC86A>     /x83/x33/xb2/x39 HANGUL SYLLABLE JYEJ
-+<UC86B>     /x83/x33/xb3/x30 HANGUL SYLLABLE JYEC
-+<UC86C>     /x83/x33/xb3/x31 HANGUL SYLLABLE JYEK
-+<UC86D>     /x83/x33/xb3/x32 HANGUL SYLLABLE JYET
-+<UC86E>     /x83/x33/xb3/x33 HANGUL SYLLABLE JYEP
-+<UC86F>     /x83/x33/xb3/x34 HANGUL SYLLABLE JYEH
-+<UC870>     /x83/x33/xb3/x35 HANGUL SYLLABLE JO
-+<UC871>     /x83/x33/xb3/x36 HANGUL SYLLABLE JOG
-+<UC872>     /x83/x33/xb3/x37 HANGUL SYLLABLE JOGG
-+<UC873>     /x83/x33/xb3/x38 HANGUL SYLLABLE JOGS
-+<UC874>     /x83/x33/xb3/x39 HANGUL SYLLABLE JON
-+<UC875>     /x83/x33/xb4/x30 HANGUL SYLLABLE JONI
-+<UC876>     /x83/x33/xb4/x31 HANGUL SYLLABLE JONH
-+<UC877>     /x83/x33/xb4/x32 HANGUL SYLLABLE JOD
-+<UC878>     /x83/x33/xb4/x33 HANGUL SYLLABLE JOL
-+<UC879>     /x83/x33/xb4/x34 HANGUL SYLLABLE JOLG
-+<UC87A>     /x83/x33/xb4/x35 HANGUL SYLLABLE JOLM
-+<UC87B>     /x83/x33/xb4/x36 HANGUL SYLLABLE JOLB
-+<UC87C>     /x83/x33/xb4/x37 HANGUL SYLLABLE JOLS
-+<UC87D>     /x83/x33/xb4/x38 HANGUL SYLLABLE JOLT
-+<UC87E>     /x83/x33/xb4/x39 HANGUL SYLLABLE JOLP
-+<UC87F>     /x83/x33/xb5/x30 HANGUL SYLLABLE JOLH
-+<UC880>     /x83/x33/xb5/x31 HANGUL SYLLABLE JOM
-+<UC881>     /x83/x33/xb5/x32 HANGUL SYLLABLE JOB
-+<UC882>     /x83/x33/xb5/x33 HANGUL SYLLABLE JOBS
-+<UC883>     /x83/x33/xb5/x34 HANGUL SYLLABLE JOS
-+<UC884>     /x83/x33/xb5/x35 HANGUL SYLLABLE JOSS
-+<UC885>     /x83/x33/xb5/x36 HANGUL SYLLABLE JONG
-+<UC886>     /x83/x33/xb5/x37 HANGUL SYLLABLE JOJ
-+<UC887>     /x83/x33/xb5/x38 HANGUL SYLLABLE JOC
-+<UC888>     /x83/x33/xb5/x39 HANGUL SYLLABLE JOK
-+<UC889>     /x83/x33/xb6/x30 HANGUL SYLLABLE JOT
-+<UC88A>     /x83/x33/xb6/x31 HANGUL SYLLABLE JOP
-+<UC88B>     /x83/x33/xb6/x32 HANGUL SYLLABLE JOH
-+<UC88C>     /x83/x33/xb6/x33 HANGUL SYLLABLE JWA
-+<UC88D>     /x83/x33/xb6/x34 HANGUL SYLLABLE JWAG
-+<UC88E>     /x83/x33/xb6/x35 HANGUL SYLLABLE JWAGG
-+<UC88F>     /x83/x33/xb6/x36 HANGUL SYLLABLE JWAGS
-+<UC890>     /x83/x33/xb6/x37 HANGUL SYLLABLE JWAN
-+<UC891>     /x83/x33/xb6/x38 HANGUL SYLLABLE JWANI
-+<UC892>     /x83/x33/xb6/x39 HANGUL SYLLABLE JWANH
-+<UC893>     /x83/x33/xb7/x30 HANGUL SYLLABLE JWAD
-+<UC894>     /x83/x33/xb7/x31 HANGUL SYLLABLE JWAL
-+<UC895>     /x83/x33/xb7/x32 HANGUL SYLLABLE JWALG
-+<UC896>     /x83/x33/xb7/x33 HANGUL SYLLABLE JWALM
-+<UC897>     /x83/x33/xb7/x34 HANGUL SYLLABLE JWALB
-+<UC898>     /x83/x33/xb7/x35 HANGUL SYLLABLE JWALS
-+<UC899>     /x83/x33/xb7/x36 HANGUL SYLLABLE JWALT
-+<UC89A>     /x83/x33/xb7/x37 HANGUL SYLLABLE JWALP
-+<UC89B>     /x83/x33/xb7/x38 HANGUL SYLLABLE JWALH
-+<UC89C>     /x83/x33/xb7/x39 HANGUL SYLLABLE JWAM
-+<UC89D>     /x83/x33/xb8/x30 HANGUL SYLLABLE JWAB
-+<UC89E>     /x83/x33/xb8/x31 HANGUL SYLLABLE JWABS
-+<UC89F>     /x83/x33/xb8/x32 HANGUL SYLLABLE JWAS
-+<UC8A0>     /x83/x33/xb8/x33 HANGUL SYLLABLE JWASS
-+<UC8A1>     /x83/x33/xb8/x34 HANGUL SYLLABLE JWANG
-+<UC8A2>     /x83/x33/xb8/x35 HANGUL SYLLABLE JWAJ
-+<UC8A3>     /x83/x33/xb8/x36 HANGUL SYLLABLE JWAC
-+<UC8A4>     /x83/x33/xb8/x37 HANGUL SYLLABLE JWAK
-+<UC8A5>     /x83/x33/xb8/x38 HANGUL SYLLABLE JWAT
-+<UC8A6>     /x83/x33/xb8/x39 HANGUL SYLLABLE JWAP
-+<UC8A7>     /x83/x33/xb9/x30 HANGUL SYLLABLE JWAH
-+<UC8A8>     /x83/x33/xb9/x31 HANGUL SYLLABLE JWAE
-+<UC8A9>     /x83/x33/xb9/x32 HANGUL SYLLABLE JWAEG
-+<UC8AA>     /x83/x33/xb9/x33 HANGUL SYLLABLE JWAEGG
-+<UC8AB>     /x83/x33/xb9/x34 HANGUL SYLLABLE JWAEGS
-+<UC8AC>     /x83/x33/xb9/x35 HANGUL SYLLABLE JWAEN
-+<UC8AD>     /x83/x33/xb9/x36 HANGUL SYLLABLE JWAENI
-+<UC8AE>     /x83/x33/xb9/x37 HANGUL SYLLABLE JWAENH
-+<UC8AF>     /x83/x33/xb9/x38 HANGUL SYLLABLE JWAED
-+<UC8B0>     /x83/x33/xb9/x39 HANGUL SYLLABLE JWAEL
-+<UC8B1>     /x83/x33/xba/x30 HANGUL SYLLABLE JWAELG
-+<UC8B2>     /x83/x33/xba/x31 HANGUL SYLLABLE JWAELM
-+<UC8B3>     /x83/x33/xba/x32 HANGUL SYLLABLE JWAELB
-+<UC8B4>     /x83/x33/xba/x33 HANGUL SYLLABLE JWAELS
-+<UC8B5>     /x83/x33/xba/x34 HANGUL SYLLABLE JWAELT
-+<UC8B6>     /x83/x33/xba/x35 HANGUL SYLLABLE JWAELP
-+<UC8B7>     /x83/x33/xba/x36 HANGUL SYLLABLE JWAELH
-+<UC8B8>     /x83/x33/xba/x37 HANGUL SYLLABLE JWAEM
-+<UC8B9>     /x83/x33/xba/x38 HANGUL SYLLABLE JWAEB
-+<UC8BA>     /x83/x33/xba/x39 HANGUL SYLLABLE JWAEBS
-+<UC8BB>     /x83/x33/xbb/x30 HANGUL SYLLABLE JWAES
-+<UC8BC>     /x83/x33/xbb/x31 HANGUL SYLLABLE JWAESS
-+<UC8BD>     /x83/x33/xbb/x32 HANGUL SYLLABLE JWAENG
-+<UC8BE>     /x83/x33/xbb/x33 HANGUL SYLLABLE JWAEJ
-+<UC8BF>     /x83/x33/xbb/x34 HANGUL SYLLABLE JWAEC
-+<UC8C0>     /x83/x33/xbb/x35 HANGUL SYLLABLE JWAEK
-+<UC8C1>     /x83/x33/xbb/x36 HANGUL SYLLABLE JWAET
-+<UC8C2>     /x83/x33/xbb/x37 HANGUL SYLLABLE JWAEP
-+<UC8C3>     /x83/x33/xbb/x38 HANGUL SYLLABLE JWAEH
-+<UC8C4>     /x83/x33/xbb/x39 HANGUL SYLLABLE JOE
-+<UC8C5>     /x83/x33/xbc/x30 HANGUL SYLLABLE JOEG
-+<UC8C6>     /x83/x33/xbc/x31 HANGUL SYLLABLE JOEGG
-+<UC8C7>     /x83/x33/xbc/x32 HANGUL SYLLABLE JOEGS
-+<UC8C8>     /x83/x33/xbc/x33 HANGUL SYLLABLE JOEN
-+<UC8C9>     /x83/x33/xbc/x34 HANGUL SYLLABLE JOENI
-+<UC8CA>     /x83/x33/xbc/x35 HANGUL SYLLABLE JOENH
-+<UC8CB>     /x83/x33/xbc/x36 HANGUL SYLLABLE JOED
-+<UC8CC>     /x83/x33/xbc/x37 HANGUL SYLLABLE JOEL
-+<UC8CD>     /x83/x33/xbc/x38 HANGUL SYLLABLE JOELG
-+<UC8CE>     /x83/x33/xbc/x39 HANGUL SYLLABLE JOELM
-+<UC8CF>     /x83/x33/xbd/x30 HANGUL SYLLABLE JOELB
-+<UC8D0>     /x83/x33/xbd/x31 HANGUL SYLLABLE JOELS
-+<UC8D1>     /x83/x33/xbd/x32 HANGUL SYLLABLE JOELT
-+<UC8D2>     /x83/x33/xbd/x33 HANGUL SYLLABLE JOELP
-+<UC8D3>     /x83/x33/xbd/x34 HANGUL SYLLABLE JOELH
-+<UC8D4>     /x83/x33/xbd/x35 HANGUL SYLLABLE JOEM
-+<UC8D5>     /x83/x33/xbd/x36 HANGUL SYLLABLE JOEB
-+<UC8D6>     /x83/x33/xbd/x37 HANGUL SYLLABLE JOEBS
-+<UC8D7>     /x83/x33/xbd/x38 HANGUL SYLLABLE JOES
-+<UC8D8>     /x83/x33/xbd/x39 HANGUL SYLLABLE JOESS
-+<UC8D9>     /x83/x33/xbe/x30 HANGUL SYLLABLE JOENG
-+<UC8DA>     /x83/x33/xbe/x31 HANGUL SYLLABLE JOEJ
-+<UC8DB>     /x83/x33/xbe/x32 HANGUL SYLLABLE JOEC
-+<UC8DC>     /x83/x33/xbe/x33 HANGUL SYLLABLE JOEK
-+<UC8DD>     /x83/x33/xbe/x34 HANGUL SYLLABLE JOET
-+<UC8DE>     /x83/x33/xbe/x35 HANGUL SYLLABLE JOEP
-+<UC8DF>     /x83/x33/xbe/x36 HANGUL SYLLABLE JOEH
-+<UC8E0>     /x83/x33/xbe/x37 HANGUL SYLLABLE JYO
-+<UC8E1>     /x83/x33/xbe/x38 HANGUL SYLLABLE JYOG
-+<UC8E2>     /x83/x33/xbe/x39 HANGUL SYLLABLE JYOGG
-+<UC8E3>     /x83/x33/xbf/x30 HANGUL SYLLABLE JYOGS
-+<UC8E4>     /x83/x33/xbf/x31 HANGUL SYLLABLE JYON
-+<UC8E5>     /x83/x33/xbf/x32 HANGUL SYLLABLE JYONI
-+<UC8E6>     /x83/x33/xbf/x33 HANGUL SYLLABLE JYONH
-+<UC8E7>     /x83/x33/xbf/x34 HANGUL SYLLABLE JYOD
-+<UC8E8>     /x83/x33/xbf/x35 HANGUL SYLLABLE JYOL
-+<UC8E9>     /x83/x33/xbf/x36 HANGUL SYLLABLE JYOLG
-+<UC8EA>     /x83/x33/xbf/x37 HANGUL SYLLABLE JYOLM
-+<UC8EB>     /x83/x33/xbf/x38 HANGUL SYLLABLE JYOLB
-+<UC8EC>     /x83/x33/xbf/x39 HANGUL SYLLABLE JYOLS
-+<UC8ED>     /x83/x33/xc0/x30 HANGUL SYLLABLE JYOLT
-+<UC8EE>     /x83/x33/xc0/x31 HANGUL SYLLABLE JYOLP
-+<UC8EF>     /x83/x33/xc0/x32 HANGUL SYLLABLE JYOLH
-+<UC8F0>     /x83/x33/xc0/x33 HANGUL SYLLABLE JYOM
-+<UC8F1>     /x83/x33/xc0/x34 HANGUL SYLLABLE JYOB
-+<UC8F2>     /x83/x33/xc0/x35 HANGUL SYLLABLE JYOBS
-+<UC8F3>     /x83/x33/xc0/x36 HANGUL SYLLABLE JYOS
-+<UC8F4>     /x83/x33/xc0/x37 HANGUL SYLLABLE JYOSS
-+<UC8F5>     /x83/x33/xc0/x38 HANGUL SYLLABLE JYONG
-+<UC8F6>     /x83/x33/xc0/x39 HANGUL SYLLABLE JYOJ
-+<UC8F7>     /x83/x33/xc1/x30 HANGUL SYLLABLE JYOC
-+<UC8F8>     /x83/x33/xc1/x31 HANGUL SYLLABLE JYOK
-+<UC8F9>     /x83/x33/xc1/x32 HANGUL SYLLABLE JYOT
-+<UC8FA>     /x83/x33/xc1/x33 HANGUL SYLLABLE JYOP
-+<UC8FB>     /x83/x33/xc1/x34 HANGUL SYLLABLE JYOH
-+<UC8FC>     /x83/x33/xc1/x35 HANGUL SYLLABLE JU
-+<UC8FD>     /x83/x33/xc1/x36 HANGUL SYLLABLE JUG
-+<UC8FE>     /x83/x33/xc1/x37 HANGUL SYLLABLE JUGG
-+<UC8FF>     /x83/x33/xc1/x38 HANGUL SYLLABLE JUGS
-+<UC900>     /x83/x33/xc1/x39 HANGUL SYLLABLE JUN
-+<UC901>     /x83/x33/xc2/x30 HANGUL SYLLABLE JUNI
-+<UC902>     /x83/x33/xc2/x31 HANGUL SYLLABLE JUNH
-+<UC903>     /x83/x33/xc2/x32 HANGUL SYLLABLE JUD
-+<UC904>     /x83/x33/xc2/x33 HANGUL SYLLABLE JUL
-+<UC905>     /x83/x33/xc2/x34 HANGUL SYLLABLE JULG
-+<UC906>     /x83/x33/xc2/x35 HANGUL SYLLABLE JULM
-+<UC907>     /x83/x33/xc2/x36 HANGUL SYLLABLE JULB
-+<UC908>     /x83/x33/xc2/x37 HANGUL SYLLABLE JULS
-+<UC909>     /x83/x33/xc2/x38 HANGUL SYLLABLE JULT
-+<UC90A>     /x83/x33/xc2/x39 HANGUL SYLLABLE JULP
-+<UC90B>     /x83/x33/xc3/x30 HANGUL SYLLABLE JULH
-+<UC90C>     /x83/x33/xc3/x31 HANGUL SYLLABLE JUM
-+<UC90D>     /x83/x33/xc3/x32 HANGUL SYLLABLE JUB
-+<UC90E>     /x83/x33/xc3/x33 HANGUL SYLLABLE JUBS
-+<UC90F>     /x83/x33/xc3/x34 HANGUL SYLLABLE JUS
-+<UC910>     /x83/x33/xc3/x35 HANGUL SYLLABLE JUSS
-+<UC911>     /x83/x33/xc3/x36 HANGUL SYLLABLE JUNG
-+<UC912>     /x83/x33/xc3/x37 HANGUL SYLLABLE JUJ
-+<UC913>     /x83/x33/xc3/x38 HANGUL SYLLABLE JUC
-+<UC914>     /x83/x33/xc3/x39 HANGUL SYLLABLE JUK
-+<UC915>     /x83/x33/xc4/x30 HANGUL SYLLABLE JUT
-+<UC916>     /x83/x33/xc4/x31 HANGUL SYLLABLE JUP
-+<UC917>     /x83/x33/xc4/x32 HANGUL SYLLABLE JUH
-+<UC918>     /x83/x33/xc4/x33 HANGUL SYLLABLE JWEO
-+<UC919>     /x83/x33/xc4/x34 HANGUL SYLLABLE JWEOG
-+<UC91A>     /x83/x33/xc4/x35 HANGUL SYLLABLE JWEOGG
-+<UC91B>     /x83/x33/xc4/x36 HANGUL SYLLABLE JWEOGS
-+<UC91C>     /x83/x33/xc4/x37 HANGUL SYLLABLE JWEON
-+<UC91D>     /x83/x33/xc4/x38 HANGUL SYLLABLE JWEONI
-+<UC91E>     /x83/x33/xc4/x39 HANGUL SYLLABLE JWEONH
-+<UC91F>     /x83/x33/xc5/x30 HANGUL SYLLABLE JWEOD
-+<UC920>     /x83/x33/xc5/x31 HANGUL SYLLABLE JWEOL
-+<UC921>     /x83/x33/xc5/x32 HANGUL SYLLABLE JWEOLG
-+<UC922>     /x83/x33/xc5/x33 HANGUL SYLLABLE JWEOLM
-+<UC923>     /x83/x33/xc5/x34 HANGUL SYLLABLE JWEOLB
-+<UC924>     /x83/x33/xc5/x35 HANGUL SYLLABLE JWEOLS
-+<UC925>     /x83/x33/xc5/x36 HANGUL SYLLABLE JWEOLT
-+<UC926>     /x83/x33/xc5/x37 HANGUL SYLLABLE JWEOLP
-+<UC927>     /x83/x33/xc5/x38 HANGUL SYLLABLE JWEOLH
-+<UC928>     /x83/x33/xc5/x39 HANGUL SYLLABLE JWEOM
-+<UC929>     /x83/x33/xc6/x30 HANGUL SYLLABLE JWEOB
-+<UC92A>     /x83/x33/xc6/x31 HANGUL SYLLABLE JWEOBS
-+<UC92B>     /x83/x33/xc6/x32 HANGUL SYLLABLE JWEOS
-+<UC92C>     /x83/x33/xc6/x33 HANGUL SYLLABLE JWEOSS
-+<UC92D>     /x83/x33/xc6/x34 HANGUL SYLLABLE JWEONG
-+<UC92E>     /x83/x33/xc6/x35 HANGUL SYLLABLE JWEOJ
-+<UC92F>     /x83/x33/xc6/x36 HANGUL SYLLABLE JWEOC
-+<UC930>     /x83/x33/xc6/x37 HANGUL SYLLABLE JWEOK
-+<UC931>     /x83/x33/xc6/x38 HANGUL SYLLABLE JWEOT
-+<UC932>     /x83/x33/xc6/x39 HANGUL SYLLABLE JWEOP
-+<UC933>     /x83/x33/xc7/x30 HANGUL SYLLABLE JWEOH
-+<UC934>     /x83/x33/xc7/x31 HANGUL SYLLABLE JWE
-+<UC935>     /x83/x33/xc7/x32 HANGUL SYLLABLE JWEG
-+<UC936>     /x83/x33/xc7/x33 HANGUL SYLLABLE JWEGG
-+<UC937>     /x83/x33/xc7/x34 HANGUL SYLLABLE JWEGS
-+<UC938>     /x83/x33/xc7/x35 HANGUL SYLLABLE JWEN
-+<UC939>     /x83/x33/xc7/x36 HANGUL SYLLABLE JWENI
-+<UC93A>     /x83/x33/xc7/x37 HANGUL SYLLABLE JWENH
-+<UC93B>     /x83/x33/xc7/x38 HANGUL SYLLABLE JWED
-+<UC93C>     /x83/x33/xc7/x39 HANGUL SYLLABLE JWEL
-+<UC93D>     /x83/x33/xc8/x30 HANGUL SYLLABLE JWELG
-+<UC93E>     /x83/x33/xc8/x31 HANGUL SYLLABLE JWELM
-+<UC93F>     /x83/x33/xc8/x32 HANGUL SYLLABLE JWELB
-+<UC940>     /x83/x33/xc8/x33 HANGUL SYLLABLE JWELS
-+<UC941>     /x83/x33/xc8/x34 HANGUL SYLLABLE JWELT
-+<UC942>     /x83/x33/xc8/x35 HANGUL SYLLABLE JWELP
-+<UC943>     /x83/x33/xc8/x36 HANGUL SYLLABLE JWELH
-+<UC944>     /x83/x33/xc8/x37 HANGUL SYLLABLE JWEM
-+<UC945>     /x83/x33/xc8/x38 HANGUL SYLLABLE JWEB
-+<UC946>     /x83/x33/xc8/x39 HANGUL SYLLABLE JWEBS
-+<UC947>     /x83/x33/xc9/x30 HANGUL SYLLABLE JWES
-+<UC948>     /x83/x33/xc9/x31 HANGUL SYLLABLE JWESS
-+<UC949>     /x83/x33/xc9/x32 HANGUL SYLLABLE JWENG
-+<UC94A>     /x83/x33/xc9/x33 HANGUL SYLLABLE JWEJ
-+<UC94B>     /x83/x33/xc9/x34 HANGUL SYLLABLE JWEC
-+<UC94C>     /x83/x33/xc9/x35 HANGUL SYLLABLE JWEK
-+<UC94D>     /x83/x33/xc9/x36 HANGUL SYLLABLE JWET
-+<UC94E>     /x83/x33/xc9/x37 HANGUL SYLLABLE JWEP
-+<UC94F>     /x83/x33/xc9/x38 HANGUL SYLLABLE JWEH
-+<UC950>     /x83/x33/xc9/x39 HANGUL SYLLABLE JWI
-+<UC951>     /x83/x33/xca/x30 HANGUL SYLLABLE JWIG
-+<UC952>     /x83/x33/xca/x31 HANGUL SYLLABLE JWIGG
-+<UC953>     /x83/x33/xca/x32 HANGUL SYLLABLE JWIGS
-+<UC954>     /x83/x33/xca/x33 HANGUL SYLLABLE JWIN
-+<UC955>     /x83/x33/xca/x34 HANGUL SYLLABLE JWINI
-+<UC956>     /x83/x33/xca/x35 HANGUL SYLLABLE JWINH
-+<UC957>     /x83/x33/xca/x36 HANGUL SYLLABLE JWID
-+<UC958>     /x83/x33/xca/x37 HANGUL SYLLABLE JWIL
-+<UC959>     /x83/x33/xca/x38 HANGUL SYLLABLE JWILG
-+<UC95A>     /x83/x33/xca/x39 HANGUL SYLLABLE JWILM
-+<UC95B>     /x83/x33/xcb/x30 HANGUL SYLLABLE JWILB
-+<UC95C>     /x83/x33/xcb/x31 HANGUL SYLLABLE JWILS
-+<UC95D>     /x83/x33/xcb/x32 HANGUL SYLLABLE JWILT
-+<UC95E>     /x83/x33/xcb/x33 HANGUL SYLLABLE JWILP
-+<UC95F>     /x83/x33/xcb/x34 HANGUL SYLLABLE JWILH
-+<UC960>     /x83/x33/xcb/x35 HANGUL SYLLABLE JWIM
-+<UC961>     /x83/x33/xcb/x36 HANGUL SYLLABLE JWIB
-+<UC962>     /x83/x33/xcb/x37 HANGUL SYLLABLE JWIBS
-+<UC963>     /x83/x33/xcb/x38 HANGUL SYLLABLE JWIS
-+<UC964>     /x83/x33/xcb/x39 HANGUL SYLLABLE JWISS
-+<UC965>     /x83/x33/xcc/x30 HANGUL SYLLABLE JWING
-+<UC966>     /x83/x33/xcc/x31 HANGUL SYLLABLE JWIJ
-+<UC967>     /x83/x33/xcc/x32 HANGUL SYLLABLE JWIC
-+<UC968>     /x83/x33/xcc/x33 HANGUL SYLLABLE JWIK
-+<UC969>     /x83/x33/xcc/x34 HANGUL SYLLABLE JWIT
-+<UC96A>     /x83/x33/xcc/x35 HANGUL SYLLABLE JWIP
-+<UC96B>     /x83/x33/xcc/x36 HANGUL SYLLABLE JWIH
-+<UC96C>     /x83/x33/xcc/x37 HANGUL SYLLABLE JYU
-+<UC96D>     /x83/x33/xcc/x38 HANGUL SYLLABLE JYUG
-+<UC96E>     /x83/x33/xcc/x39 HANGUL SYLLABLE JYUGG
-+<UC96F>     /x83/x33/xcd/x30 HANGUL SYLLABLE JYUGS
-+<UC970>     /x83/x33/xcd/x31 HANGUL SYLLABLE JYUN
-+<UC971>     /x83/x33/xcd/x32 HANGUL SYLLABLE JYUNI
-+<UC972>     /x83/x33/xcd/x33 HANGUL SYLLABLE JYUNH
-+<UC973>     /x83/x33/xcd/x34 HANGUL SYLLABLE JYUD
-+<UC974>     /x83/x33/xcd/x35 HANGUL SYLLABLE JYUL
-+<UC975>     /x83/x33/xcd/x36 HANGUL SYLLABLE JYULG
-+<UC976>     /x83/x33/xcd/x37 HANGUL SYLLABLE JYULM
-+<UC977>     /x83/x33/xcd/x38 HANGUL SYLLABLE JYULB
-+<UC978>     /x83/x33/xcd/x39 HANGUL SYLLABLE JYULS
-+<UC979>     /x83/x33/xce/x30 HANGUL SYLLABLE JYULT
-+<UC97A>     /x83/x33/xce/x31 HANGUL SYLLABLE JYULP
-+<UC97B>     /x83/x33/xce/x32 HANGUL SYLLABLE JYULH
-+<UC97C>     /x83/x33/xce/x33 HANGUL SYLLABLE JYUM
-+<UC97D>     /x83/x33/xce/x34 HANGUL SYLLABLE JYUB
-+<UC97E>     /x83/x33/xce/x35 HANGUL SYLLABLE JYUBS
-+<UC97F>     /x83/x33/xce/x36 HANGUL SYLLABLE JYUS
-+<UC980>     /x83/x33/xce/x37 HANGUL SYLLABLE JYUSS
-+<UC981>     /x83/x33/xce/x38 HANGUL SYLLABLE JYUNG
-+<UC982>     /x83/x33/xce/x39 HANGUL SYLLABLE JYUJ
-+<UC983>     /x83/x33/xcf/x30 HANGUL SYLLABLE JYUC
-+<UC984>     /x83/x33/xcf/x31 HANGUL SYLLABLE JYUK
-+<UC985>     /x83/x33/xcf/x32 HANGUL SYLLABLE JYUT
-+<UC986>     /x83/x33/xcf/x33 HANGUL SYLLABLE JYUP
-+<UC987>     /x83/x33/xcf/x34 HANGUL SYLLABLE JYUH
-+<UC988>     /x83/x33/xcf/x35 HANGUL SYLLABLE JEU
-+<UC989>     /x83/x33/xcf/x36 HANGUL SYLLABLE JEUG
-+<UC98A>     /x83/x33/xcf/x37 HANGUL SYLLABLE JEUGG
-+<UC98B>     /x83/x33/xcf/x38 HANGUL SYLLABLE JEUGS
-+<UC98C>     /x83/x33/xcf/x39 HANGUL SYLLABLE JEUN
-+<UC98D>     /x83/x33/xd0/x30 HANGUL SYLLABLE JEUNI
-+<UC98E>     /x83/x33/xd0/x31 HANGUL SYLLABLE JEUNH
-+<UC98F>     /x83/x33/xd0/x32 HANGUL SYLLABLE JEUD
-+<UC990>     /x83/x33/xd0/x33 HANGUL SYLLABLE JEUL
-+<UC991>     /x83/x33/xd0/x34 HANGUL SYLLABLE JEULG
-+<UC992>     /x83/x33/xd0/x35 HANGUL SYLLABLE JEULM
-+<UC993>     /x83/x33/xd0/x36 HANGUL SYLLABLE JEULB
-+<UC994>     /x83/x33/xd0/x37 HANGUL SYLLABLE JEULS
-+<UC995>     /x83/x33/xd0/x38 HANGUL SYLLABLE JEULT
-+<UC996>     /x83/x33/xd0/x39 HANGUL SYLLABLE JEULP
-+<UC997>     /x83/x33/xd1/x30 HANGUL SYLLABLE JEULH
-+<UC998>     /x83/x33/xd1/x31 HANGUL SYLLABLE JEUM
-+<UC999>     /x83/x33/xd1/x32 HANGUL SYLLABLE JEUB
-+<UC99A>     /x83/x33/xd1/x33 HANGUL SYLLABLE JEUBS
-+<UC99B>     /x83/x33/xd1/x34 HANGUL SYLLABLE JEUS
-+<UC99C>     /x83/x33/xd1/x35 HANGUL SYLLABLE JEUSS
-+<UC99D>     /x83/x33/xd1/x36 HANGUL SYLLABLE JEUNG
-+<UC99E>     /x83/x33/xd1/x37 HANGUL SYLLABLE JEUJ
-+<UC99F>     /x83/x33/xd1/x38 HANGUL SYLLABLE JEUC
-+<UC9A0>     /x83/x33/xd1/x39 HANGUL SYLLABLE JEUK
-+<UC9A1>     /x83/x33/xd2/x30 HANGUL SYLLABLE JEUT
-+<UC9A2>     /x83/x33/xd2/x31 HANGUL SYLLABLE JEUP
-+<UC9A3>     /x83/x33/xd2/x32 HANGUL SYLLABLE JEUH
-+<UC9A4>     /x83/x33/xd2/x33 HANGUL SYLLABLE JYI
-+<UC9A5>     /x83/x33/xd2/x34 HANGUL SYLLABLE JYIG
-+<UC9A6>     /x83/x33/xd2/x35 HANGUL SYLLABLE JYIGG
-+<UC9A7>     /x83/x33/xd2/x36 HANGUL SYLLABLE JYIGS
-+<UC9A8>     /x83/x33/xd2/x37 HANGUL SYLLABLE JYIN
-+<UC9A9>     /x83/x33/xd2/x38 HANGUL SYLLABLE JYINI
-+<UC9AA>     /x83/x33/xd2/x39 HANGUL SYLLABLE JYINH
-+<UC9AB>     /x83/x33/xd3/x30 HANGUL SYLLABLE JYID
-+<UC9AC>     /x83/x33/xd3/x31 HANGUL SYLLABLE JYIL
-+<UC9AD>     /x83/x33/xd3/x32 HANGUL SYLLABLE JYILG
-+<UC9AE>     /x83/x33/xd3/x33 HANGUL SYLLABLE JYILM
-+<UC9AF>     /x83/x33/xd3/x34 HANGUL SYLLABLE JYILB
-+<UC9B0>     /x83/x33/xd3/x35 HANGUL SYLLABLE JYILS
-+<UC9B1>     /x83/x33/xd3/x36 HANGUL SYLLABLE JYILT
-+<UC9B2>     /x83/x33/xd3/x37 HANGUL SYLLABLE JYILP
-+<UC9B3>     /x83/x33/xd3/x38 HANGUL SYLLABLE JYILH
-+<UC9B4>     /x83/x33/xd3/x39 HANGUL SYLLABLE JYIM
-+<UC9B5>     /x83/x33/xd4/x30 HANGUL SYLLABLE JYIB
-+<UC9B6>     /x83/x33/xd4/x31 HANGUL SYLLABLE JYIBS
-+<UC9B7>     /x83/x33/xd4/x32 HANGUL SYLLABLE JYIS
-+<UC9B8>     /x83/x33/xd4/x33 HANGUL SYLLABLE JYISS
-+<UC9B9>     /x83/x33/xd4/x34 HANGUL SYLLABLE JYING
-+<UC9BA>     /x83/x33/xd4/x35 HANGUL SYLLABLE JYIJ
-+<UC9BB>     /x83/x33/xd4/x36 HANGUL SYLLABLE JYIC
-+<UC9BC>     /x83/x33/xd4/x37 HANGUL SYLLABLE JYIK
-+<UC9BD>     /x83/x33/xd4/x38 HANGUL SYLLABLE JYIT
-+<UC9BE>     /x83/x33/xd4/x39 HANGUL SYLLABLE JYIP
-+<UC9BF>     /x83/x33/xd5/x30 HANGUL SYLLABLE JYIH
-+<UC9C0>     /x83/x33/xd5/x31 HANGUL SYLLABLE JI
-+<UC9C1>     /x83/x33/xd5/x32 HANGUL SYLLABLE JIG
-+<UC9C2>     /x83/x33/xd5/x33 HANGUL SYLLABLE JIGG
-+<UC9C3>     /x83/x33/xd5/x34 HANGUL SYLLABLE JIGS
-+<UC9C4>     /x83/x33/xd5/x35 HANGUL SYLLABLE JIN
-+<UC9C5>     /x83/x33/xd5/x36 HANGUL SYLLABLE JINI
-+<UC9C6>     /x83/x33/xd5/x37 HANGUL SYLLABLE JINH
-+<UC9C7>     /x83/x33/xd5/x38 HANGUL SYLLABLE JID
-+<UC9C8>     /x83/x33/xd5/x39 HANGUL SYLLABLE JIL
-+<UC9C9>     /x83/x33/xd6/x30 HANGUL SYLLABLE JILG
-+<UC9CA>     /x83/x33/xd6/x31 HANGUL SYLLABLE JILM
-+<UC9CB>     /x83/x33/xd6/x32 HANGUL SYLLABLE JILB
-+<UC9CC>     /x83/x33/xd6/x33 HANGUL SYLLABLE JILS
-+<UC9CD>     /x83/x33/xd6/x34 HANGUL SYLLABLE JILT
-+<UC9CE>     /x83/x33/xd6/x35 HANGUL SYLLABLE JILP
-+<UC9CF>     /x83/x33/xd6/x36 HANGUL SYLLABLE JILH
-+<UC9D0>     /x83/x33/xd6/x37 HANGUL SYLLABLE JIM
-+<UC9D1>     /x83/x33/xd6/x38 HANGUL SYLLABLE JIB
-+<UC9D2>     /x83/x33/xd6/x39 HANGUL SYLLABLE JIBS
-+<UC9D3>     /x83/x33/xd7/x30 HANGUL SYLLABLE JIS
-+<UC9D4>     /x83/x33/xd7/x31 HANGUL SYLLABLE JISS
-+<UC9D5>     /x83/x33/xd7/x32 HANGUL SYLLABLE JING
-+<UC9D6>     /x83/x33/xd7/x33 HANGUL SYLLABLE JIJ
-+<UC9D7>     /x83/x33/xd7/x34 HANGUL SYLLABLE JIC
-+<UC9D8>     /x83/x33/xd7/x35 HANGUL SYLLABLE JIK
-+<UC9D9>     /x83/x33/xd7/x36 HANGUL SYLLABLE JIT
-+<UC9DA>     /x83/x33/xd7/x37 HANGUL SYLLABLE JIP
-+<UC9DB>     /x83/x33/xd7/x38 HANGUL SYLLABLE JIH
-+<UC9DC>     /x83/x33/xd7/x39 HANGUL SYLLABLE JJA
-+<UC9DD>     /x83/x33/xd8/x30 HANGUL SYLLABLE JJAG
-+<UC9DE>     /x83/x33/xd8/x31 HANGUL SYLLABLE JJAGG
-+<UC9DF>     /x83/x33/xd8/x32 HANGUL SYLLABLE JJAGS
-+<UC9E0>     /x83/x33/xd8/x33 HANGUL SYLLABLE JJAN
-+<UC9E1>     /x83/x33/xd8/x34 HANGUL SYLLABLE JJANI
-+<UC9E2>     /x83/x33/xd8/x35 HANGUL SYLLABLE JJANH
-+<UC9E3>     /x83/x33/xd8/x36 HANGUL SYLLABLE JJAD
-+<UC9E4>     /x83/x33/xd8/x37 HANGUL SYLLABLE JJAL
-+<UC9E5>     /x83/x33/xd8/x38 HANGUL SYLLABLE JJALG
-+<UC9E6>     /x83/x33/xd8/x39 HANGUL SYLLABLE JJALM
-+<UC9E7>     /x83/x33/xd9/x30 HANGUL SYLLABLE JJALB
-+<UC9E8>     /x83/x33/xd9/x31 HANGUL SYLLABLE JJALS
-+<UC9E9>     /x83/x33/xd9/x32 HANGUL SYLLABLE JJALT
-+<UC9EA>     /x83/x33/xd9/x33 HANGUL SYLLABLE JJALP
-+<UC9EB>     /x83/x33/xd9/x34 HANGUL SYLLABLE JJALH
-+<UC9EC>     /x83/x33/xd9/x35 HANGUL SYLLABLE JJAM
-+<UC9ED>     /x83/x33/xd9/x36 HANGUL SYLLABLE JJAB
-+<UC9EE>     /x83/x33/xd9/x37 HANGUL SYLLABLE JJABS
-+<UC9EF>     /x83/x33/xd9/x38 HANGUL SYLLABLE JJAS
-+<UC9F0>     /x83/x33/xd9/x39 HANGUL SYLLABLE JJASS
-+<UC9F1>     /x83/x33/xda/x30 HANGUL SYLLABLE JJANG
-+<UC9F2>     /x83/x33/xda/x31 HANGUL SYLLABLE JJAJ
-+<UC9F3>     /x83/x33/xda/x32 HANGUL SYLLABLE JJAC
-+<UC9F4>     /x83/x33/xda/x33 HANGUL SYLLABLE JJAK
-+<UC9F5>     /x83/x33/xda/x34 HANGUL SYLLABLE JJAT
-+<UC9F6>     /x83/x33/xda/x35 HANGUL SYLLABLE JJAP
-+<UC9F7>     /x83/x33/xda/x36 HANGUL SYLLABLE JJAH
-+<UC9F8>     /x83/x33/xda/x37 HANGUL SYLLABLE JJAE
-+<UC9F9>     /x83/x33/xda/x38 HANGUL SYLLABLE JJAEG
-+<UC9FA>     /x83/x33/xda/x39 HANGUL SYLLABLE JJAEGG
-+<UC9FB>     /x83/x33/xdb/x30 HANGUL SYLLABLE JJAEGS
-+<UC9FC>     /x83/x33/xdb/x31 HANGUL SYLLABLE JJAEN
-+<UC9FD>     /x83/x33/xdb/x32 HANGUL SYLLABLE JJAENI
-+<UC9FE>     /x83/x33/xdb/x33 HANGUL SYLLABLE JJAENH
-+<UC9FF>     /x83/x33/xdb/x34 HANGUL SYLLABLE JJAED
-+<UCA00>     /x83/x33/xdb/x35 HANGUL SYLLABLE JJAEL
-+<UCA01>     /x83/x33/xdb/x36 HANGUL SYLLABLE JJAELG
-+<UCA02>     /x83/x33/xdb/x37 HANGUL SYLLABLE JJAELM
-+<UCA03>     /x83/x33/xdb/x38 HANGUL SYLLABLE JJAELB
-+<UCA04>     /x83/x33/xdb/x39 HANGUL SYLLABLE JJAELS
-+<UCA05>     /x83/x33/xdc/x30 HANGUL SYLLABLE JJAELT
-+<UCA06>     /x83/x33/xdc/x31 HANGUL SYLLABLE JJAELP
-+<UCA07>     /x83/x33/xdc/x32 HANGUL SYLLABLE JJAELH
-+<UCA08>     /x83/x33/xdc/x33 HANGUL SYLLABLE JJAEM
-+<UCA09>     /x83/x33/xdc/x34 HANGUL SYLLABLE JJAEB
-+<UCA0A>     /x83/x33/xdc/x35 HANGUL SYLLABLE JJAEBS
-+<UCA0B>     /x83/x33/xdc/x36 HANGUL SYLLABLE JJAES
-+<UCA0C>     /x83/x33/xdc/x37 HANGUL SYLLABLE JJAESS
-+<UCA0D>     /x83/x33/xdc/x38 HANGUL SYLLABLE JJAENG
-+<UCA0E>     /x83/x33/xdc/x39 HANGUL SYLLABLE JJAEJ
-+<UCA0F>     /x83/x33/xdd/x30 HANGUL SYLLABLE JJAEC
-+<UCA10>     /x83/x33/xdd/x31 HANGUL SYLLABLE JJAEK
-+<UCA11>     /x83/x33/xdd/x32 HANGUL SYLLABLE JJAET
-+<UCA12>     /x83/x33/xdd/x33 HANGUL SYLLABLE JJAEP
-+<UCA13>     /x83/x33/xdd/x34 HANGUL SYLLABLE JJAEH
-+<UCA14>     /x83/x33/xdd/x35 HANGUL SYLLABLE JJYA
-+<UCA15>     /x83/x33/xdd/x36 HANGUL SYLLABLE JJYAG
-+<UCA16>     /x83/x33/xdd/x37 HANGUL SYLLABLE JJYAGG
-+<UCA17>     /x83/x33/xdd/x38 HANGUL SYLLABLE JJYAGS
-+<UCA18>     /x83/x33/xdd/x39 HANGUL SYLLABLE JJYAN
-+<UCA19>     /x83/x33/xde/x30 HANGUL SYLLABLE JJYANI
-+<UCA1A>     /x83/x33/xde/x31 HANGUL SYLLABLE JJYANH
-+<UCA1B>     /x83/x33/xde/x32 HANGUL SYLLABLE JJYAD
-+<UCA1C>     /x83/x33/xde/x33 HANGUL SYLLABLE JJYAL
-+<UCA1D>     /x83/x33/xde/x34 HANGUL SYLLABLE JJYALG
-+<UCA1E>     /x83/x33/xde/x35 HANGUL SYLLABLE JJYALM
-+<UCA1F>     /x83/x33/xde/x36 HANGUL SYLLABLE JJYALB
-+<UCA20>     /x83/x33/xde/x37 HANGUL SYLLABLE JJYALS
-+<UCA21>     /x83/x33/xde/x38 HANGUL SYLLABLE JJYALT
-+<UCA22>     /x83/x33/xde/x39 HANGUL SYLLABLE JJYALP
-+<UCA23>     /x83/x33/xdf/x30 HANGUL SYLLABLE JJYALH
-+<UCA24>     /x83/x33/xdf/x31 HANGUL SYLLABLE JJYAM
-+<UCA25>     /x83/x33/xdf/x32 HANGUL SYLLABLE JJYAB
-+<UCA26>     /x83/x33/xdf/x33 HANGUL SYLLABLE JJYABS
-+<UCA27>     /x83/x33/xdf/x34 HANGUL SYLLABLE JJYAS
-+<UCA28>     /x83/x33/xdf/x35 HANGUL SYLLABLE JJYASS
-+<UCA29>     /x83/x33/xdf/x36 HANGUL SYLLABLE JJYANG
-+<UCA2A>     /x83/x33/xdf/x37 HANGUL SYLLABLE JJYAJ
-+<UCA2B>     /x83/x33/xdf/x38 HANGUL SYLLABLE JJYAC
-+<UCA2C>     /x83/x33/xdf/x39 HANGUL SYLLABLE JJYAK
-+<UCA2D>     /x83/x33/xe0/x30 HANGUL SYLLABLE JJYAT
-+<UCA2E>     /x83/x33/xe0/x31 HANGUL SYLLABLE JJYAP
-+<UCA2F>     /x83/x33/xe0/x32 HANGUL SYLLABLE JJYAH
-+<UCA30>     /x83/x33/xe0/x33 HANGUL SYLLABLE JJYAE
-+<UCA31>     /x83/x33/xe0/x34 HANGUL SYLLABLE JJYAEG
-+<UCA32>     /x83/x33/xe0/x35 HANGUL SYLLABLE JJYAEGG
-+<UCA33>     /x83/x33/xe0/x36 HANGUL SYLLABLE JJYAEGS
-+<UCA34>     /x83/x33/xe0/x37 HANGUL SYLLABLE JJYAEN
-+<UCA35>     /x83/x33/xe0/x38 HANGUL SYLLABLE JJYAENI
-+<UCA36>     /x83/x33/xe0/x39 HANGUL SYLLABLE JJYAENH
-+<UCA37>     /x83/x33/xe1/x30 HANGUL SYLLABLE JJYAED
-+<UCA38>     /x83/x33/xe1/x31 HANGUL SYLLABLE JJYAEL
-+<UCA39>     /x83/x33/xe1/x32 HANGUL SYLLABLE JJYAELG
-+<UCA3A>     /x83/x33/xe1/x33 HANGUL SYLLABLE JJYAELM
-+<UCA3B>     /x83/x33/xe1/x34 HANGUL SYLLABLE JJYAELB
-+<UCA3C>     /x83/x33/xe1/x35 HANGUL SYLLABLE JJYAELS
-+<UCA3D>     /x83/x33/xe1/x36 HANGUL SYLLABLE JJYAELT
-+<UCA3E>     /x83/x33/xe1/x37 HANGUL SYLLABLE JJYAELP
-+<UCA3F>     /x83/x33/xe1/x38 HANGUL SYLLABLE JJYAELH
-+<UCA40>     /x83/x33/xe1/x39 HANGUL SYLLABLE JJYAEM
-+<UCA41>     /x83/x33/xe2/x30 HANGUL SYLLABLE JJYAEB
-+<UCA42>     /x83/x33/xe2/x31 HANGUL SYLLABLE JJYAEBS
-+<UCA43>     /x83/x33/xe2/x32 HANGUL SYLLABLE JJYAES
-+<UCA44>     /x83/x33/xe2/x33 HANGUL SYLLABLE JJYAESS
-+<UCA45>     /x83/x33/xe2/x34 HANGUL SYLLABLE JJYAENG
-+<UCA46>     /x83/x33/xe2/x35 HANGUL SYLLABLE JJYAEJ
-+<UCA47>     /x83/x33/xe2/x36 HANGUL SYLLABLE JJYAEC
-+<UCA48>     /x83/x33/xe2/x37 HANGUL SYLLABLE JJYAEK
-+<UCA49>     /x83/x33/xe2/x38 HANGUL SYLLABLE JJYAET
-+<UCA4A>     /x83/x33/xe2/x39 HANGUL SYLLABLE JJYAEP
-+<UCA4B>     /x83/x33/xe3/x30 HANGUL SYLLABLE JJYAEH
-+<UCA4C>     /x83/x33/xe3/x31 HANGUL SYLLABLE JJEO
-+<UCA4D>     /x83/x33/xe3/x32 HANGUL SYLLABLE JJEOG
-+<UCA4E>     /x83/x33/xe3/x33 HANGUL SYLLABLE JJEOGG
-+<UCA4F>     /x83/x33/xe3/x34 HANGUL SYLLABLE JJEOGS
-+<UCA50>     /x83/x33/xe3/x35 HANGUL SYLLABLE JJEON
-+<UCA51>     /x83/x33/xe3/x36 HANGUL SYLLABLE JJEONI
-+<UCA52>     /x83/x33/xe3/x37 HANGUL SYLLABLE JJEONH
-+<UCA53>     /x83/x33/xe3/x38 HANGUL SYLLABLE JJEOD
-+<UCA54>     /x83/x33/xe3/x39 HANGUL SYLLABLE JJEOL
-+<UCA55>     /x83/x33/xe4/x30 HANGUL SYLLABLE JJEOLG
-+<UCA56>     /x83/x33/xe4/x31 HANGUL SYLLABLE JJEOLM
-+<UCA57>     /x83/x33/xe4/x32 HANGUL SYLLABLE JJEOLB
-+<UCA58>     /x83/x33/xe4/x33 HANGUL SYLLABLE JJEOLS
-+<UCA59>     /x83/x33/xe4/x34 HANGUL SYLLABLE JJEOLT
-+<UCA5A>     /x83/x33/xe4/x35 HANGUL SYLLABLE JJEOLP
-+<UCA5B>     /x83/x33/xe4/x36 HANGUL SYLLABLE JJEOLH
-+<UCA5C>     /x83/x33/xe4/x37 HANGUL SYLLABLE JJEOM
-+<UCA5D>     /x83/x33/xe4/x38 HANGUL SYLLABLE JJEOB
-+<UCA5E>     /x83/x33/xe4/x39 HANGUL SYLLABLE JJEOBS
-+<UCA5F>     /x83/x33/xe5/x30 HANGUL SYLLABLE JJEOS
-+<UCA60>     /x83/x33/xe5/x31 HANGUL SYLLABLE JJEOSS
-+<UCA61>     /x83/x33/xe5/x32 HANGUL SYLLABLE JJEONG
-+<UCA62>     /x83/x33/xe5/x33 HANGUL SYLLABLE JJEOJ
-+<UCA63>     /x83/x33/xe5/x34 HANGUL SYLLABLE JJEOC
-+<UCA64>     /x83/x33/xe5/x35 HANGUL SYLLABLE JJEOK
-+<UCA65>     /x83/x33/xe5/x36 HANGUL SYLLABLE JJEOT
-+<UCA66>     /x83/x33/xe5/x37 HANGUL SYLLABLE JJEOP
-+<UCA67>     /x83/x33/xe5/x38 HANGUL SYLLABLE JJEOH
-+<UCA68>     /x83/x33/xe5/x39 HANGUL SYLLABLE JJE
-+<UCA69>     /x83/x33/xe6/x30 HANGUL SYLLABLE JJEG
-+<UCA6A>     /x83/x33/xe6/x31 HANGUL SYLLABLE JJEGG
-+<UCA6B>     /x83/x33/xe6/x32 HANGUL SYLLABLE JJEGS
-+<UCA6C>     /x83/x33/xe6/x33 HANGUL SYLLABLE JJEN
-+<UCA6D>     /x83/x33/xe6/x34 HANGUL SYLLABLE JJENI
-+<UCA6E>     /x83/x33/xe6/x35 HANGUL SYLLABLE JJENH
-+<UCA6F>     /x83/x33/xe6/x36 HANGUL SYLLABLE JJED
-+<UCA70>     /x83/x33/xe6/x37 HANGUL SYLLABLE JJEL
-+<UCA71>     /x83/x33/xe6/x38 HANGUL SYLLABLE JJELG
-+<UCA72>     /x83/x33/xe6/x39 HANGUL SYLLABLE JJELM
-+<UCA73>     /x83/x33/xe7/x30 HANGUL SYLLABLE JJELB
-+<UCA74>     /x83/x33/xe7/x31 HANGUL SYLLABLE JJELS
-+<UCA75>     /x83/x33/xe7/x32 HANGUL SYLLABLE JJELT
-+<UCA76>     /x83/x33/xe7/x33 HANGUL SYLLABLE JJELP
-+<UCA77>     /x83/x33/xe7/x34 HANGUL SYLLABLE JJELH
-+<UCA78>     /x83/x33/xe7/x35 HANGUL SYLLABLE JJEM
-+<UCA79>     /x83/x33/xe7/x36 HANGUL SYLLABLE JJEB
-+<UCA7A>     /x83/x33/xe7/x37 HANGUL SYLLABLE JJEBS
-+<UCA7B>     /x83/x33/xe7/x38 HANGUL SYLLABLE JJES
-+<UCA7C>     /x83/x33/xe7/x39 HANGUL SYLLABLE JJESS
-+<UCA7D>     /x83/x33/xe8/x30 HANGUL SYLLABLE JJENG
-+<UCA7E>     /x83/x33/xe8/x31 HANGUL SYLLABLE JJEJ
-+<UCA7F>     /x83/x33/xe8/x32 HANGUL SYLLABLE JJEC
-+<UCA80>     /x83/x33/xe8/x33 HANGUL SYLLABLE JJEK
-+<UCA81>     /x83/x33/xe8/x34 HANGUL SYLLABLE JJET
-+<UCA82>     /x83/x33/xe8/x35 HANGUL SYLLABLE JJEP
-+<UCA83>     /x83/x33/xe8/x36 HANGUL SYLLABLE JJEH
-+<UCA84>     /x83/x33/xe8/x37 HANGUL SYLLABLE JJYEO
-+<UCA85>     /x83/x33/xe8/x38 HANGUL SYLLABLE JJYEOG
-+<UCA86>     /x83/x33/xe8/x39 HANGUL SYLLABLE JJYEOGG
-+<UCA87>     /x83/x33/xe9/x30 HANGUL SYLLABLE JJYEOGS
-+<UCA88>     /x83/x33/xe9/x31 HANGUL SYLLABLE JJYEON
-+<UCA89>     /x83/x33/xe9/x32 HANGUL SYLLABLE JJYEONI
-+<UCA8A>     /x83/x33/xe9/x33 HANGUL SYLLABLE JJYEONH
-+<UCA8B>     /x83/x33/xe9/x34 HANGUL SYLLABLE JJYEOD
-+<UCA8C>     /x83/x33/xe9/x35 HANGUL SYLLABLE JJYEOL
-+<UCA8D>     /x83/x33/xe9/x36 HANGUL SYLLABLE JJYEOLG
-+<UCA8E>     /x83/x33/xe9/x37 HANGUL SYLLABLE JJYEOLM
-+<UCA8F>     /x83/x33/xe9/x38 HANGUL SYLLABLE JJYEOLB
-+<UCA90>     /x83/x33/xe9/x39 HANGUL SYLLABLE JJYEOLS
-+<UCA91>     /x83/x33/xea/x30 HANGUL SYLLABLE JJYEOLT
-+<UCA92>     /x83/x33/xea/x31 HANGUL SYLLABLE JJYEOLP
-+<UCA93>     /x83/x33/xea/x32 HANGUL SYLLABLE JJYEOLH
-+<UCA94>     /x83/x33/xea/x33 HANGUL SYLLABLE JJYEOM
-+<UCA95>     /x83/x33/xea/x34 HANGUL SYLLABLE JJYEOB
-+<UCA96>     /x83/x33/xea/x35 HANGUL SYLLABLE JJYEOBS
-+<UCA97>     /x83/x33/xea/x36 HANGUL SYLLABLE JJYEOS
-+<UCA98>     /x83/x33/xea/x37 HANGUL SYLLABLE JJYEOSS
-+<UCA99>     /x83/x33/xea/x38 HANGUL SYLLABLE JJYEONG
-+<UCA9A>     /x83/x33/xea/x39 HANGUL SYLLABLE JJYEOJ
-+<UCA9B>     /x83/x33/xeb/x30 HANGUL SYLLABLE JJYEOC
-+<UCA9C>     /x83/x33/xeb/x31 HANGUL SYLLABLE JJYEOK
-+<UCA9D>     /x83/x33/xeb/x32 HANGUL SYLLABLE JJYEOT
-+<UCA9E>     /x83/x33/xeb/x33 HANGUL SYLLABLE JJYEOP
-+<UCA9F>     /x83/x33/xeb/x34 HANGUL SYLLABLE JJYEOH
-+<UCAA0>     /x83/x33/xeb/x35 HANGUL SYLLABLE JJYE
-+<UCAA1>     /x83/x33/xeb/x36 HANGUL SYLLABLE JJYEG
-+<UCAA2>     /x83/x33/xeb/x37 HANGUL SYLLABLE JJYEGG
-+<UCAA3>     /x83/x33/xeb/x38 HANGUL SYLLABLE JJYEGS
-+<UCAA4>     /x83/x33/xeb/x39 HANGUL SYLLABLE JJYEN
-+<UCAA5>     /x83/x33/xec/x30 HANGUL SYLLABLE JJYENI
-+<UCAA6>     /x83/x33/xec/x31 HANGUL SYLLABLE JJYENH
-+<UCAA7>     /x83/x33/xec/x32 HANGUL SYLLABLE JJYED
-+<UCAA8>     /x83/x33/xec/x33 HANGUL SYLLABLE JJYEL
-+<UCAA9>     /x83/x33/xec/x34 HANGUL SYLLABLE JJYELG
-+<UCAAA>     /x83/x33/xec/x35 HANGUL SYLLABLE JJYELM
-+<UCAAB>     /x83/x33/xec/x36 HANGUL SYLLABLE JJYELB
-+<UCAAC>     /x83/x33/xec/x37 HANGUL SYLLABLE JJYELS
-+<UCAAD>     /x83/x33/xec/x38 HANGUL SYLLABLE JJYELT
-+<UCAAE>     /x83/x33/xec/x39 HANGUL SYLLABLE JJYELP
-+<UCAAF>     /x83/x33/xed/x30 HANGUL SYLLABLE JJYELH
-+<UCAB0>     /x83/x33/xed/x31 HANGUL SYLLABLE JJYEM
-+<UCAB1>     /x83/x33/xed/x32 HANGUL SYLLABLE JJYEB
-+<UCAB2>     /x83/x33/xed/x33 HANGUL SYLLABLE JJYEBS
-+<UCAB3>     /x83/x33/xed/x34 HANGUL SYLLABLE JJYES
-+<UCAB4>     /x83/x33/xed/x35 HANGUL SYLLABLE JJYESS
-+<UCAB5>     /x83/x33/xed/x36 HANGUL SYLLABLE JJYENG
-+<UCAB6>     /x83/x33/xed/x37 HANGUL SYLLABLE JJYEJ
-+<UCAB7>     /x83/x33/xed/x38 HANGUL SYLLABLE JJYEC
-+<UCAB8>     /x83/x33/xed/x39 HANGUL SYLLABLE JJYEK
-+<UCAB9>     /x83/x33/xee/x30 HANGUL SYLLABLE JJYET
-+<UCABA>     /x83/x33/xee/x31 HANGUL SYLLABLE JJYEP
-+<UCABB>     /x83/x33/xee/x32 HANGUL SYLLABLE JJYEH
-+<UCABC>     /x83/x33/xee/x33 HANGUL SYLLABLE JJO
-+<UCABD>     /x83/x33/xee/x34 HANGUL SYLLABLE JJOG
-+<UCABE>     /x83/x33/xee/x35 HANGUL SYLLABLE JJOGG
-+<UCABF>     /x83/x33/xee/x36 HANGUL SYLLABLE JJOGS
-+<UCAC0>     /x83/x33/xee/x37 HANGUL SYLLABLE JJON
-+<UCAC1>     /x83/x33/xee/x38 HANGUL SYLLABLE JJONI
-+<UCAC2>     /x83/x33/xee/x39 HANGUL SYLLABLE JJONH
-+<UCAC3>     /x83/x33/xef/x30 HANGUL SYLLABLE JJOD
-+<UCAC4>     /x83/x33/xef/x31 HANGUL SYLLABLE JJOL
-+<UCAC5>     /x83/x33/xef/x32 HANGUL SYLLABLE JJOLG
-+<UCAC6>     /x83/x33/xef/x33 HANGUL SYLLABLE JJOLM
-+<UCAC7>     /x83/x33/xef/x34 HANGUL SYLLABLE JJOLB
-+<UCAC8>     /x83/x33/xef/x35 HANGUL SYLLABLE JJOLS
-+<UCAC9>     /x83/x33/xef/x36 HANGUL SYLLABLE JJOLT
-+<UCACA>     /x83/x33/xef/x37 HANGUL SYLLABLE JJOLP
-+<UCACB>     /x83/x33/xef/x38 HANGUL SYLLABLE JJOLH
-+<UCACC>     /x83/x33/xef/x39 HANGUL SYLLABLE JJOM
-+<UCACD>     /x83/x33/xf0/x30 HANGUL SYLLABLE JJOB
-+<UCACE>     /x83/x33/xf0/x31 HANGUL SYLLABLE JJOBS
-+<UCACF>     /x83/x33/xf0/x32 HANGUL SYLLABLE JJOS
-+<UCAD0>     /x83/x33/xf0/x33 HANGUL SYLLABLE JJOSS
-+<UCAD1>     /x83/x33/xf0/x34 HANGUL SYLLABLE JJONG
-+<UCAD2>     /x83/x33/xf0/x35 HANGUL SYLLABLE JJOJ
-+<UCAD3>     /x83/x33/xf0/x36 HANGUL SYLLABLE JJOC
-+<UCAD4>     /x83/x33/xf0/x37 HANGUL SYLLABLE JJOK
-+<UCAD5>     /x83/x33/xf0/x38 HANGUL SYLLABLE JJOT
-+<UCAD6>     /x83/x33/xf0/x39 HANGUL SYLLABLE JJOP
-+<UCAD7>     /x83/x33/xf1/x30 HANGUL SYLLABLE JJOH
-+<UCAD8>     /x83/x33/xf1/x31 HANGUL SYLLABLE JJWA
-+<UCAD9>     /x83/x33/xf1/x32 HANGUL SYLLABLE JJWAG
-+<UCADA>     /x83/x33/xf1/x33 HANGUL SYLLABLE JJWAGG
-+<UCADB>     /x83/x33/xf1/x34 HANGUL SYLLABLE JJWAGS
-+<UCADC>     /x83/x33/xf1/x35 HANGUL SYLLABLE JJWAN
-+<UCADD>     /x83/x33/xf1/x36 HANGUL SYLLABLE JJWANI
-+<UCADE>     /x83/x33/xf1/x37 HANGUL SYLLABLE JJWANH
-+<UCADF>     /x83/x33/xf1/x38 HANGUL SYLLABLE JJWAD
-+<UCAE0>     /x83/x33/xf1/x39 HANGUL SYLLABLE JJWAL
-+<UCAE1>     /x83/x33/xf2/x30 HANGUL SYLLABLE JJWALG
-+<UCAE2>     /x83/x33/xf2/x31 HANGUL SYLLABLE JJWALM
-+<UCAE3>     /x83/x33/xf2/x32 HANGUL SYLLABLE JJWALB
-+<UCAE4>     /x83/x33/xf2/x33 HANGUL SYLLABLE JJWALS
-+<UCAE5>     /x83/x33/xf2/x34 HANGUL SYLLABLE JJWALT
-+<UCAE6>     /x83/x33/xf2/x35 HANGUL SYLLABLE JJWALP
-+<UCAE7>     /x83/x33/xf2/x36 HANGUL SYLLABLE JJWALH
-+<UCAE8>     /x83/x33/xf2/x37 HANGUL SYLLABLE JJWAM
-+<UCAE9>     /x83/x33/xf2/x38 HANGUL SYLLABLE JJWAB
-+<UCAEA>     /x83/x33/xf2/x39 HANGUL SYLLABLE JJWABS
-+<UCAEB>     /x83/x33/xf3/x30 HANGUL SYLLABLE JJWAS
-+<UCAEC>     /x83/x33/xf3/x31 HANGUL SYLLABLE JJWASS
-+<UCAED>     /x83/x33/xf3/x32 HANGUL SYLLABLE JJWANG
-+<UCAEE>     /x83/x33/xf3/x33 HANGUL SYLLABLE JJWAJ
-+<UCAEF>     /x83/x33/xf3/x34 HANGUL SYLLABLE JJWAC
-+<UCAF0>     /x83/x33/xf3/x35 HANGUL SYLLABLE JJWAK
-+<UCAF1>     /x83/x33/xf3/x36 HANGUL SYLLABLE JJWAT
-+<UCAF2>     /x83/x33/xf3/x37 HANGUL SYLLABLE JJWAP
-+<UCAF3>     /x83/x33/xf3/x38 HANGUL SYLLABLE JJWAH
-+<UCAF4>     /x83/x33/xf3/x39 HANGUL SYLLABLE JJWAE
-+<UCAF5>     /x83/x33/xf4/x30 HANGUL SYLLABLE JJWAEG
-+<UCAF6>     /x83/x33/xf4/x31 HANGUL SYLLABLE JJWAEGG
-+<UCAF7>     /x83/x33/xf4/x32 HANGUL SYLLABLE JJWAEGS
-+<UCAF8>     /x83/x33/xf4/x33 HANGUL SYLLABLE JJWAEN
-+<UCAF9>     /x83/x33/xf4/x34 HANGUL SYLLABLE JJWAENI
-+<UCAFA>     /x83/x33/xf4/x35 HANGUL SYLLABLE JJWAENH
-+<UCAFB>     /x83/x33/xf4/x36 HANGUL SYLLABLE JJWAED
-+<UCAFC>     /x83/x33/xf4/x37 HANGUL SYLLABLE JJWAEL
-+<UCAFD>     /x83/x33/xf4/x38 HANGUL SYLLABLE JJWAELG
-+<UCAFE>     /x83/x33/xf4/x39 HANGUL SYLLABLE JJWAELM
-+<UCAFF>     /x83/x33/xf5/x30 HANGUL SYLLABLE JJWAELB
-+<UCB00>     /x83/x33/xf5/x31 HANGUL SYLLABLE JJWAELS
-+<UCB01>     /x83/x33/xf5/x32 HANGUL SYLLABLE JJWAELT
-+<UCB02>     /x83/x33/xf5/x33 HANGUL SYLLABLE JJWAELP
-+<UCB03>     /x83/x33/xf5/x34 HANGUL SYLLABLE JJWAELH
-+<UCB04>     /x83/x33/xf5/x35 HANGUL SYLLABLE JJWAEM
-+<UCB05>     /x83/x33/xf5/x36 HANGUL SYLLABLE JJWAEB
-+<UCB06>     /x83/x33/xf5/x37 HANGUL SYLLABLE JJWAEBS
-+<UCB07>     /x83/x33/xf5/x38 HANGUL SYLLABLE JJWAES
-+<UCB08>     /x83/x33/xf5/x39 HANGUL SYLLABLE JJWAESS
-+<UCB09>     /x83/x33/xf6/x30 HANGUL SYLLABLE JJWAENG
-+<UCB0A>     /x83/x33/xf6/x31 HANGUL SYLLABLE JJWAEJ
-+<UCB0B>     /x83/x33/xf6/x32 HANGUL SYLLABLE JJWAEC
-+<UCB0C>     /x83/x33/xf6/x33 HANGUL SYLLABLE JJWAEK
-+<UCB0D>     /x83/x33/xf6/x34 HANGUL SYLLABLE JJWAET
-+<UCB0E>     /x83/x33/xf6/x35 HANGUL SYLLABLE JJWAEP
-+<UCB0F>     /x83/x33/xf6/x36 HANGUL SYLLABLE JJWAEH
-+<UCB10>     /x83/x33/xf6/x37 HANGUL SYLLABLE JJOE
-+<UCB11>     /x83/x33/xf6/x38 HANGUL SYLLABLE JJOEG
-+<UCB12>     /x83/x33/xf6/x39 HANGUL SYLLABLE JJOEGG
-+<UCB13>     /x83/x33/xf7/x30 HANGUL SYLLABLE JJOEGS
-+<UCB14>     /x83/x33/xf7/x31 HANGUL SYLLABLE JJOEN
-+<UCB15>     /x83/x33/xf7/x32 HANGUL SYLLABLE JJOENI
-+<UCB16>     /x83/x33/xf7/x33 HANGUL SYLLABLE JJOENH
-+<UCB17>     /x83/x33/xf7/x34 HANGUL SYLLABLE JJOED
-+<UCB18>     /x83/x33/xf7/x35 HANGUL SYLLABLE JJOEL
-+<UCB19>     /x83/x33/xf7/x36 HANGUL SYLLABLE JJOELG
-+<UCB1A>     /x83/x33/xf7/x37 HANGUL SYLLABLE JJOELM
-+<UCB1B>     /x83/x33/xf7/x38 HANGUL SYLLABLE JJOELB
-+<UCB1C>     /x83/x33/xf7/x39 HANGUL SYLLABLE JJOELS
-+<UCB1D>     /x83/x33/xf8/x30 HANGUL SYLLABLE JJOELT
-+<UCB1E>     /x83/x33/xf8/x31 HANGUL SYLLABLE JJOELP
-+<UCB1F>     /x83/x33/xf8/x32 HANGUL SYLLABLE JJOELH
-+<UCB20>     /x83/x33/xf8/x33 HANGUL SYLLABLE JJOEM
-+<UCB21>     /x83/x33/xf8/x34 HANGUL SYLLABLE JJOEB
-+<UCB22>     /x83/x33/xf8/x35 HANGUL SYLLABLE JJOEBS
-+<UCB23>     /x83/x33/xf8/x36 HANGUL SYLLABLE JJOES
-+<UCB24>     /x83/x33/xf8/x37 HANGUL SYLLABLE JJOESS
-+<UCB25>     /x83/x33/xf8/x38 HANGUL SYLLABLE JJOENG
-+<UCB26>     /x83/x33/xf8/x39 HANGUL SYLLABLE JJOEJ
-+<UCB27>     /x83/x33/xf9/x30 HANGUL SYLLABLE JJOEC
-+<UCB28>     /x83/x33/xf9/x31 HANGUL SYLLABLE JJOEK
-+<UCB29>     /x83/x33/xf9/x32 HANGUL SYLLABLE JJOET
-+<UCB2A>     /x83/x33/xf9/x33 HANGUL SYLLABLE JJOEP
-+<UCB2B>     /x83/x33/xf9/x34 HANGUL SYLLABLE JJOEH
-+<UCB2C>     /x83/x33/xf9/x35 HANGUL SYLLABLE JJYO
-+<UCB2D>     /x83/x33/xf9/x36 HANGUL SYLLABLE JJYOG
-+<UCB2E>     /x83/x33/xf9/x37 HANGUL SYLLABLE JJYOGG
-+<UCB2F>     /x83/x33/xf9/x38 HANGUL SYLLABLE JJYOGS
-+<UCB30>     /x83/x33/xf9/x39 HANGUL SYLLABLE JJYON
-+<UCB31>     /x83/x33/xfa/x30 HANGUL SYLLABLE JJYONI
-+<UCB32>     /x83/x33/xfa/x31 HANGUL SYLLABLE JJYONH
-+<UCB33>     /x83/x33/xfa/x32 HANGUL SYLLABLE JJYOD
-+<UCB34>     /x83/x33/xfa/x33 HANGUL SYLLABLE JJYOL
-+<UCB35>     /x83/x33/xfa/x34 HANGUL SYLLABLE JJYOLG
-+<UCB36>     /x83/x33/xfa/x35 HANGUL SYLLABLE JJYOLM
-+<UCB37>     /x83/x33/xfa/x36 HANGUL SYLLABLE JJYOLB
-+<UCB38>     /x83/x33/xfa/x37 HANGUL SYLLABLE JJYOLS
-+<UCB39>     /x83/x33/xfa/x38 HANGUL SYLLABLE JJYOLT
-+<UCB3A>     /x83/x33/xfa/x39 HANGUL SYLLABLE JJYOLP
-+<UCB3B>     /x83/x33/xfb/x30 HANGUL SYLLABLE JJYOLH
-+<UCB3C>     /x83/x33/xfb/x31 HANGUL SYLLABLE JJYOM
-+<UCB3D>     /x83/x33/xfb/x32 HANGUL SYLLABLE JJYOB
-+<UCB3E>     /x83/x33/xfb/x33 HANGUL SYLLABLE JJYOBS
-+<UCB3F>     /x83/x33/xfb/x34 HANGUL SYLLABLE JJYOS
-+<UCB40>     /x83/x33/xfb/x35 HANGUL SYLLABLE JJYOSS
-+<UCB41>     /x83/x33/xfb/x36 HANGUL SYLLABLE JJYONG
-+<UCB42>     /x83/x33/xfb/x37 HANGUL SYLLABLE JJYOJ
-+<UCB43>     /x83/x33/xfb/x38 HANGUL SYLLABLE JJYOC
-+<UCB44>     /x83/x33/xfb/x39 HANGUL SYLLABLE JJYOK
-+<UCB45>     /x83/x33/xfc/x30 HANGUL SYLLABLE JJYOT
-+<UCB46>     /x83/x33/xfc/x31 HANGUL SYLLABLE JJYOP
-+<UCB47>     /x83/x33/xfc/x32 HANGUL SYLLABLE JJYOH
-+<UCB48>     /x83/x33/xfc/x33 HANGUL SYLLABLE JJU
-+<UCB49>     /x83/x33/xfc/x34 HANGUL SYLLABLE JJUG
-+<UCB4A>     /x83/x33/xfc/x35 HANGUL SYLLABLE JJUGG
-+<UCB4B>     /x83/x33/xfc/x36 HANGUL SYLLABLE JJUGS
-+<UCB4C>     /x83/x33/xfc/x37 HANGUL SYLLABLE JJUN
-+<UCB4D>     /x83/x33/xfc/x38 HANGUL SYLLABLE JJUNI
-+<UCB4E>     /x83/x33/xfc/x39 HANGUL SYLLABLE JJUNH
-+<UCB4F>     /x83/x33/xfd/x30 HANGUL SYLLABLE JJUD
-+<UCB50>     /x83/x33/xfd/x31 HANGUL SYLLABLE JJUL
-+<UCB51>     /x83/x33/xfd/x32 HANGUL SYLLABLE JJULG
-+<UCB52>     /x83/x33/xfd/x33 HANGUL SYLLABLE JJULM
-+<UCB53>     /x83/x33/xfd/x34 HANGUL SYLLABLE JJULB
-+<UCB54>     /x83/x33/xfd/x35 HANGUL SYLLABLE JJULS
-+<UCB55>     /x83/x33/xfd/x36 HANGUL SYLLABLE JJULT
-+<UCB56>     /x83/x33/xfd/x37 HANGUL SYLLABLE JJULP
-+<UCB57>     /x83/x33/xfd/x38 HANGUL SYLLABLE JJULH
-+<UCB58>     /x83/x33/xfd/x39 HANGUL SYLLABLE JJUM
-+<UCB59>     /x83/x33/xfe/x30 HANGUL SYLLABLE JJUB
-+<UCB5A>     /x83/x33/xfe/x31 HANGUL SYLLABLE JJUBS
-+<UCB5B>     /x83/x33/xfe/x32 HANGUL SYLLABLE JJUS
-+<UCB5C>     /x83/x33/xfe/x33 HANGUL SYLLABLE JJUSS
-+<UCB5D>     /x83/x33/xfe/x34 HANGUL SYLLABLE JJUNG
-+<UCB5E>     /x83/x33/xfe/x35 HANGUL SYLLABLE JJUJ
-+<UCB5F>     /x83/x33/xfe/x36 HANGUL SYLLABLE JJUC
-+<UCB60>     /x83/x33/xfe/x37 HANGUL SYLLABLE JJUK
-+<UCB61>     /x83/x33/xfe/x38 HANGUL SYLLABLE JJUT
-+<UCB62>     /x83/x33/xfe/x39 HANGUL SYLLABLE JJUP
-+<UCB63>     /x83/x34/x81/x30 HANGUL SYLLABLE JJUH
-+<UCB64>     /x83/x34/x81/x31 HANGUL SYLLABLE JJWEO
-+<UCB65>     /x83/x34/x81/x32 HANGUL SYLLABLE JJWEOG
-+<UCB66>     /x83/x34/x81/x33 HANGUL SYLLABLE JJWEOGG
-+<UCB67>     /x83/x34/x81/x34 HANGUL SYLLABLE JJWEOGS
-+<UCB68>     /x83/x34/x81/x35 HANGUL SYLLABLE JJWEON
-+<UCB69>     /x83/x34/x81/x36 HANGUL SYLLABLE JJWEONI
-+<UCB6A>     /x83/x34/x81/x37 HANGUL SYLLABLE JJWEONH
-+<UCB6B>     /x83/x34/x81/x38 HANGUL SYLLABLE JJWEOD
-+<UCB6C>     /x83/x34/x81/x39 HANGUL SYLLABLE JJWEOL
-+<UCB6D>     /x83/x34/x82/x30 HANGUL SYLLABLE JJWEOLG
-+<UCB6E>     /x83/x34/x82/x31 HANGUL SYLLABLE JJWEOLM
-+<UCB6F>     /x83/x34/x82/x32 HANGUL SYLLABLE JJWEOLB
-+<UCB70>     /x83/x34/x82/x33 HANGUL SYLLABLE JJWEOLS
-+<UCB71>     /x83/x34/x82/x34 HANGUL SYLLABLE JJWEOLT
-+<UCB72>     /x83/x34/x82/x35 HANGUL SYLLABLE JJWEOLP
-+<UCB73>     /x83/x34/x82/x36 HANGUL SYLLABLE JJWEOLH
-+<UCB74>     /x83/x34/x82/x37 HANGUL SYLLABLE JJWEOM
-+<UCB75>     /x83/x34/x82/x38 HANGUL SYLLABLE JJWEOB
-+<UCB76>     /x83/x34/x82/x39 HANGUL SYLLABLE JJWEOBS
-+<UCB77>     /x83/x34/x83/x30 HANGUL SYLLABLE JJWEOS
-+<UCB78>     /x83/x34/x83/x31 HANGUL SYLLABLE JJWEOSS
-+<UCB79>     /x83/x34/x83/x32 HANGUL SYLLABLE JJWEONG
-+<UCB7A>     /x83/x34/x83/x33 HANGUL SYLLABLE JJWEOJ
-+<UCB7B>     /x83/x34/x83/x34 HANGUL SYLLABLE JJWEOC
-+<UCB7C>     /x83/x34/x83/x35 HANGUL SYLLABLE JJWEOK
-+<UCB7D>     /x83/x34/x83/x36 HANGUL SYLLABLE JJWEOT
-+<UCB7E>     /x83/x34/x83/x37 HANGUL SYLLABLE JJWEOP
-+<UCB7F>     /x83/x34/x83/x38 HANGUL SYLLABLE JJWEOH
-+<UCB80>     /x83/x34/x83/x39 HANGUL SYLLABLE JJWE
-+<UCB81>     /x83/x34/x84/x30 HANGUL SYLLABLE JJWEG
-+<UCB82>     /x83/x34/x84/x31 HANGUL SYLLABLE JJWEGG
-+<UCB83>     /x83/x34/x84/x32 HANGUL SYLLABLE JJWEGS
-+<UCB84>     /x83/x34/x84/x33 HANGUL SYLLABLE JJWEN
-+<UCB85>     /x83/x34/x84/x34 HANGUL SYLLABLE JJWENI
-+<UCB86>     /x83/x34/x84/x35 HANGUL SYLLABLE JJWENH
-+<UCB87>     /x83/x34/x84/x36 HANGUL SYLLABLE JJWED
-+<UCB88>     /x83/x34/x84/x37 HANGUL SYLLABLE JJWEL
-+<UCB89>     /x83/x34/x84/x38 HANGUL SYLLABLE JJWELG
-+<UCB8A>     /x83/x34/x84/x39 HANGUL SYLLABLE JJWELM
-+<UCB8B>     /x83/x34/x85/x30 HANGUL SYLLABLE JJWELB
-+<UCB8C>     /x83/x34/x85/x31 HANGUL SYLLABLE JJWELS
-+<UCB8D>     /x83/x34/x85/x32 HANGUL SYLLABLE JJWELT
-+<UCB8E>     /x83/x34/x85/x33 HANGUL SYLLABLE JJWELP
-+<UCB8F>     /x83/x34/x85/x34 HANGUL SYLLABLE JJWELH
-+<UCB90>     /x83/x34/x85/x35 HANGUL SYLLABLE JJWEM
-+<UCB91>     /x83/x34/x85/x36 HANGUL SYLLABLE JJWEB
-+<UCB92>     /x83/x34/x85/x37 HANGUL SYLLABLE JJWEBS
-+<UCB93>     /x83/x34/x85/x38 HANGUL SYLLABLE JJWES
-+<UCB94>     /x83/x34/x85/x39 HANGUL SYLLABLE JJWESS
-+<UCB95>     /x83/x34/x86/x30 HANGUL SYLLABLE JJWENG
-+<UCB96>     /x83/x34/x86/x31 HANGUL SYLLABLE JJWEJ
-+<UCB97>     /x83/x34/x86/x32 HANGUL SYLLABLE JJWEC
-+<UCB98>     /x83/x34/x86/x33 HANGUL SYLLABLE JJWEK
-+<UCB99>     /x83/x34/x86/x34 HANGUL SYLLABLE JJWET
-+<UCB9A>     /x83/x34/x86/x35 HANGUL SYLLABLE JJWEP
-+<UCB9B>     /x83/x34/x86/x36 HANGUL SYLLABLE JJWEH
-+<UCB9C>     /x83/x34/x86/x37 HANGUL SYLLABLE JJWI
-+<UCB9D>     /x83/x34/x86/x38 HANGUL SYLLABLE JJWIG
-+<UCB9E>     /x83/x34/x86/x39 HANGUL SYLLABLE JJWIGG
-+<UCB9F>     /x83/x34/x87/x30 HANGUL SYLLABLE JJWIGS
-+<UCBA0>     /x83/x34/x87/x31 HANGUL SYLLABLE JJWIN
-+<UCBA1>     /x83/x34/x87/x32 HANGUL SYLLABLE JJWINI
-+<UCBA2>     /x83/x34/x87/x33 HANGUL SYLLABLE JJWINH
-+<UCBA3>     /x83/x34/x87/x34 HANGUL SYLLABLE JJWID
-+<UCBA4>     /x83/x34/x87/x35 HANGUL SYLLABLE JJWIL
-+<UCBA5>     /x83/x34/x87/x36 HANGUL SYLLABLE JJWILG
-+<UCBA6>     /x83/x34/x87/x37 HANGUL SYLLABLE JJWILM
-+<UCBA7>     /x83/x34/x87/x38 HANGUL SYLLABLE JJWILB
-+<UCBA8>     /x83/x34/x87/x39 HANGUL SYLLABLE JJWILS
-+<UCBA9>     /x83/x34/x88/x30 HANGUL SYLLABLE JJWILT
-+<UCBAA>     /x83/x34/x88/x31 HANGUL SYLLABLE JJWILP
-+<UCBAB>     /x83/x34/x88/x32 HANGUL SYLLABLE JJWILH
-+<UCBAC>     /x83/x34/x88/x33 HANGUL SYLLABLE JJWIM
-+<UCBAD>     /x83/x34/x88/x34 HANGUL SYLLABLE JJWIB
-+<UCBAE>     /x83/x34/x88/x35 HANGUL SYLLABLE JJWIBS
-+<UCBAF>     /x83/x34/x88/x36 HANGUL SYLLABLE JJWIS
-+<UCBB0>     /x83/x34/x88/x37 HANGUL SYLLABLE JJWISS
-+<UCBB1>     /x83/x34/x88/x38 HANGUL SYLLABLE JJWING
-+<UCBB2>     /x83/x34/x88/x39 HANGUL SYLLABLE JJWIJ
-+<UCBB3>     /x83/x34/x89/x30 HANGUL SYLLABLE JJWIC
-+<UCBB4>     /x83/x34/x89/x31 HANGUL SYLLABLE JJWIK
-+<UCBB5>     /x83/x34/x89/x32 HANGUL SYLLABLE JJWIT
-+<UCBB6>     /x83/x34/x89/x33 HANGUL SYLLABLE JJWIP
-+<UCBB7>     /x83/x34/x89/x34 HANGUL SYLLABLE JJWIH
-+<UCBB8>     /x83/x34/x89/x35 HANGUL SYLLABLE JJYU
-+<UCBB9>     /x83/x34/x89/x36 HANGUL SYLLABLE JJYUG
-+<UCBBA>     /x83/x34/x89/x37 HANGUL SYLLABLE JJYUGG
-+<UCBBB>     /x83/x34/x89/x38 HANGUL SYLLABLE JJYUGS
-+<UCBBC>     /x83/x34/x89/x39 HANGUL SYLLABLE JJYUN
-+<UCBBD>     /x83/x34/x8a/x30 HANGUL SYLLABLE JJYUNI
-+<UCBBE>     /x83/x34/x8a/x31 HANGUL SYLLABLE JJYUNH
-+<UCBBF>     /x83/x34/x8a/x32 HANGUL SYLLABLE JJYUD
-+<UCBC0>     /x83/x34/x8a/x33 HANGUL SYLLABLE JJYUL
-+<UCBC1>     /x83/x34/x8a/x34 HANGUL SYLLABLE JJYULG
-+<UCBC2>     /x83/x34/x8a/x35 HANGUL SYLLABLE JJYULM
-+<UCBC3>     /x83/x34/x8a/x36 HANGUL SYLLABLE JJYULB
-+<UCBC4>     /x83/x34/x8a/x37 HANGUL SYLLABLE JJYULS
-+<UCBC5>     /x83/x34/x8a/x38 HANGUL SYLLABLE JJYULT
-+<UCBC6>     /x83/x34/x8a/x39 HANGUL SYLLABLE JJYULP
-+<UCBC7>     /x83/x34/x8b/x30 HANGUL SYLLABLE JJYULH
-+<UCBC8>     /x83/x34/x8b/x31 HANGUL SYLLABLE JJYUM
-+<UCBC9>     /x83/x34/x8b/x32 HANGUL SYLLABLE JJYUB
-+<UCBCA>     /x83/x34/x8b/x33 HANGUL SYLLABLE JJYUBS
-+<UCBCB>     /x83/x34/x8b/x34 HANGUL SYLLABLE JJYUS
-+<UCBCC>     /x83/x34/x8b/x35 HANGUL SYLLABLE JJYUSS
-+<UCBCD>     /x83/x34/x8b/x36 HANGUL SYLLABLE JJYUNG
-+<UCBCE>     /x83/x34/x8b/x37 HANGUL SYLLABLE JJYUJ
-+<UCBCF>     /x83/x34/x8b/x38 HANGUL SYLLABLE JJYUC
-+<UCBD0>     /x83/x34/x8b/x39 HANGUL SYLLABLE JJYUK
-+<UCBD1>     /x83/x34/x8c/x30 HANGUL SYLLABLE JJYUT
-+<UCBD2>     /x83/x34/x8c/x31 HANGUL SYLLABLE JJYUP
-+<UCBD3>     /x83/x34/x8c/x32 HANGUL SYLLABLE JJYUH
-+<UCBD4>     /x83/x34/x8c/x33 HANGUL SYLLABLE JJEU
-+<UCBD5>     /x83/x34/x8c/x34 HANGUL SYLLABLE JJEUG
-+<UCBD6>     /x83/x34/x8c/x35 HANGUL SYLLABLE JJEUGG
-+<UCBD7>     /x83/x34/x8c/x36 HANGUL SYLLABLE JJEUGS
-+<UCBD8>     /x83/x34/x8c/x37 HANGUL SYLLABLE JJEUN
-+<UCBD9>     /x83/x34/x8c/x38 HANGUL SYLLABLE JJEUNI
-+<UCBDA>     /x83/x34/x8c/x39 HANGUL SYLLABLE JJEUNH
-+<UCBDB>     /x83/x34/x8d/x30 HANGUL SYLLABLE JJEUD
-+<UCBDC>     /x83/x34/x8d/x31 HANGUL SYLLABLE JJEUL
-+<UCBDD>     /x83/x34/x8d/x32 HANGUL SYLLABLE JJEULG
-+<UCBDE>     /x83/x34/x8d/x33 HANGUL SYLLABLE JJEULM
-+<UCBDF>     /x83/x34/x8d/x34 HANGUL SYLLABLE JJEULB
-+<UCBE0>     /x83/x34/x8d/x35 HANGUL SYLLABLE JJEULS
-+<UCBE1>     /x83/x34/x8d/x36 HANGUL SYLLABLE JJEULT
-+<UCBE2>     /x83/x34/x8d/x37 HANGUL SYLLABLE JJEULP
-+<UCBE3>     /x83/x34/x8d/x38 HANGUL SYLLABLE JJEULH
-+<UCBE4>     /x83/x34/x8d/x39 HANGUL SYLLABLE JJEUM
-+<UCBE5>     /x83/x34/x8e/x30 HANGUL SYLLABLE JJEUB
-+<UCBE6>     /x83/x34/x8e/x31 HANGUL SYLLABLE JJEUBS
-+<UCBE7>     /x83/x34/x8e/x32 HANGUL SYLLABLE JJEUS
-+<UCBE8>     /x83/x34/x8e/x33 HANGUL SYLLABLE JJEUSS
-+<UCBE9>     /x83/x34/x8e/x34 HANGUL SYLLABLE JJEUNG
-+<UCBEA>     /x83/x34/x8e/x35 HANGUL SYLLABLE JJEUJ
-+<UCBEB>     /x83/x34/x8e/x36 HANGUL SYLLABLE JJEUC
-+<UCBEC>     /x83/x34/x8e/x37 HANGUL SYLLABLE JJEUK
-+<UCBED>     /x83/x34/x8e/x38 HANGUL SYLLABLE JJEUT
-+<UCBEE>     /x83/x34/x8e/x39 HANGUL SYLLABLE JJEUP
-+<UCBEF>     /x83/x34/x8f/x30 HANGUL SYLLABLE JJEUH
-+<UCBF0>     /x83/x34/x8f/x31 HANGUL SYLLABLE JJYI
-+<UCBF1>     /x83/x34/x8f/x32 HANGUL SYLLABLE JJYIG
-+<UCBF2>     /x83/x34/x8f/x33 HANGUL SYLLABLE JJYIGG
-+<UCBF3>     /x83/x34/x8f/x34 HANGUL SYLLABLE JJYIGS
-+<UCBF4>     /x83/x34/x8f/x35 HANGUL SYLLABLE JJYIN
-+<UCBF5>     /x83/x34/x8f/x36 HANGUL SYLLABLE JJYINI
-+<UCBF6>     /x83/x34/x8f/x37 HANGUL SYLLABLE JJYINH
-+<UCBF7>     /x83/x34/x8f/x38 HANGUL SYLLABLE JJYID
-+<UCBF8>     /x83/x34/x8f/x39 HANGUL SYLLABLE JJYIL
-+<UCBF9>     /x83/x34/x90/x30 HANGUL SYLLABLE JJYILG
-+<UCBFA>     /x83/x34/x90/x31 HANGUL SYLLABLE JJYILM
-+<UCBFB>     /x83/x34/x90/x32 HANGUL SYLLABLE JJYILB
-+<UCBFC>     /x83/x34/x90/x33 HANGUL SYLLABLE JJYILS
-+<UCBFD>     /x83/x34/x90/x34 HANGUL SYLLABLE JJYILT
-+<UCBFE>     /x83/x34/x90/x35 HANGUL SYLLABLE JJYILP
-+<UCBFF>     /x83/x34/x90/x36 HANGUL SYLLABLE JJYILH
-+<UCC00>     /x83/x34/x90/x37 HANGUL SYLLABLE JJYIM
-+<UCC01>     /x83/x34/x90/x38 HANGUL SYLLABLE JJYIB
-+<UCC02>     /x83/x34/x90/x39 HANGUL SYLLABLE JJYIBS
-+<UCC03>     /x83/x34/x91/x30 HANGUL SYLLABLE JJYIS
-+<UCC04>     /x83/x34/x91/x31 HANGUL SYLLABLE JJYISS
-+<UCC05>     /x83/x34/x91/x32 HANGUL SYLLABLE JJYING
-+<UCC06>     /x83/x34/x91/x33 HANGUL SYLLABLE JJYIJ
-+<UCC07>     /x83/x34/x91/x34 HANGUL SYLLABLE JJYIC
-+<UCC08>     /x83/x34/x91/x35 HANGUL SYLLABLE JJYIK
-+<UCC09>     /x83/x34/x91/x36 HANGUL SYLLABLE JJYIT
-+<UCC0A>     /x83/x34/x91/x37 HANGUL SYLLABLE JJYIP
-+<UCC0B>     /x83/x34/x91/x38 HANGUL SYLLABLE JJYIH
-+<UCC0C>     /x83/x34/x91/x39 HANGUL SYLLABLE JJI
-+<UCC0D>     /x83/x34/x92/x30 HANGUL SYLLABLE JJIG
-+<UCC0E>     /x83/x34/x92/x31 HANGUL SYLLABLE JJIGG
-+<UCC0F>     /x83/x34/x92/x32 HANGUL SYLLABLE JJIGS
-+<UCC10>     /x83/x34/x92/x33 HANGUL SYLLABLE JJIN
-+<UCC11>     /x83/x34/x92/x34 HANGUL SYLLABLE JJINI
-+<UCC12>     /x83/x34/x92/x35 HANGUL SYLLABLE JJINH
-+<UCC13>     /x83/x34/x92/x36 HANGUL SYLLABLE JJID
-+<UCC14>     /x83/x34/x92/x37 HANGUL SYLLABLE JJIL
-+<UCC15>     /x83/x34/x92/x38 HANGUL SYLLABLE JJILG
-+<UCC16>     /x83/x34/x92/x39 HANGUL SYLLABLE JJILM
-+<UCC17>     /x83/x34/x93/x30 HANGUL SYLLABLE JJILB
-+<UCC18>     /x83/x34/x93/x31 HANGUL SYLLABLE JJILS
-+<UCC19>     /x83/x34/x93/x32 HANGUL SYLLABLE JJILT
-+<UCC1A>     /x83/x34/x93/x33 HANGUL SYLLABLE JJILP
-+<UCC1B>     /x83/x34/x93/x34 HANGUL SYLLABLE JJILH
-+<UCC1C>     /x83/x34/x93/x35 HANGUL SYLLABLE JJIM
-+<UCC1D>     /x83/x34/x93/x36 HANGUL SYLLABLE JJIB
-+<UCC1E>     /x83/x34/x93/x37 HANGUL SYLLABLE JJIBS
-+<UCC1F>     /x83/x34/x93/x38 HANGUL SYLLABLE JJIS
-+<UCC20>     /x83/x34/x93/x39 HANGUL SYLLABLE JJISS
-+<UCC21>     /x83/x34/x94/x30 HANGUL SYLLABLE JJING
-+<UCC22>     /x83/x34/x94/x31 HANGUL SYLLABLE JJIJ
-+<UCC23>     /x83/x34/x94/x32 HANGUL SYLLABLE JJIC
-+<UCC24>     /x83/x34/x94/x33 HANGUL SYLLABLE JJIK
-+<UCC25>     /x83/x34/x94/x34 HANGUL SYLLABLE JJIT
-+<UCC26>     /x83/x34/x94/x35 HANGUL SYLLABLE JJIP
-+<UCC27>     /x83/x34/x94/x36 HANGUL SYLLABLE JJIH
-+<UCC28>     /x83/x34/x94/x37 HANGUL SYLLABLE CA
-+<UCC29>     /x83/x34/x94/x38 HANGUL SYLLABLE CAG
-+<UCC2A>     /x83/x34/x94/x39 HANGUL SYLLABLE CAGG
-+<UCC2B>     /x83/x34/x95/x30 HANGUL SYLLABLE CAGS
-+<UCC2C>     /x83/x34/x95/x31 HANGUL SYLLABLE CAN
-+<UCC2D>     /x83/x34/x95/x32 HANGUL SYLLABLE CANI
-+<UCC2E>     /x83/x34/x95/x33 HANGUL SYLLABLE CANH
-+<UCC2F>     /x83/x34/x95/x34 HANGUL SYLLABLE CAD
-+<UCC30>     /x83/x34/x95/x35 HANGUL SYLLABLE CAL
-+<UCC31>     /x83/x34/x95/x36 HANGUL SYLLABLE CALG
-+<UCC32>     /x83/x34/x95/x37 HANGUL SYLLABLE CALM
-+<UCC33>     /x83/x34/x95/x38 HANGUL SYLLABLE CALB
-+<UCC34>     /x83/x34/x95/x39 HANGUL SYLLABLE CALS
-+<UCC35>     /x83/x34/x96/x30 HANGUL SYLLABLE CALT
-+<UCC36>     /x83/x34/x96/x31 HANGUL SYLLABLE CALP
-+<UCC37>     /x83/x34/x96/x32 HANGUL SYLLABLE CALH
-+<UCC38>     /x83/x34/x96/x33 HANGUL SYLLABLE CAM
-+<UCC39>     /x83/x34/x96/x34 HANGUL SYLLABLE CAB
-+<UCC3A>     /x83/x34/x96/x35 HANGUL SYLLABLE CABS
-+<UCC3B>     /x83/x34/x96/x36 HANGUL SYLLABLE CAS
-+<UCC3C>     /x83/x34/x96/x37 HANGUL SYLLABLE CASS
-+<UCC3D>     /x83/x34/x96/x38 HANGUL SYLLABLE CANG
-+<UCC3E>     /x83/x34/x96/x39 HANGUL SYLLABLE CAJ
-+<UCC3F>     /x83/x34/x97/x30 HANGUL SYLLABLE CAC
-+<UCC40>     /x83/x34/x97/x31 HANGUL SYLLABLE CAK
-+<UCC41>     /x83/x34/x97/x32 HANGUL SYLLABLE CAT
-+<UCC42>     /x83/x34/x97/x33 HANGUL SYLLABLE CAP
-+<UCC43>     /x83/x34/x97/x34 HANGUL SYLLABLE CAH
-+<UCC44>     /x83/x34/x97/x35 HANGUL SYLLABLE CAE
-+<UCC45>     /x83/x34/x97/x36 HANGUL SYLLABLE CAEG
-+<UCC46>     /x83/x34/x97/x37 HANGUL SYLLABLE CAEGG
-+<UCC47>     /x83/x34/x97/x38 HANGUL SYLLABLE CAEGS
-+<UCC48>     /x83/x34/x97/x39 HANGUL SYLLABLE CAEN
-+<UCC49>     /x83/x34/x98/x30 HANGUL SYLLABLE CAENI
-+<UCC4A>     /x83/x34/x98/x31 HANGUL SYLLABLE CAENH
-+<UCC4B>     /x83/x34/x98/x32 HANGUL SYLLABLE CAED
-+<UCC4C>     /x83/x34/x98/x33 HANGUL SYLLABLE CAEL
-+<UCC4D>     /x83/x34/x98/x34 HANGUL SYLLABLE CAELG
-+<UCC4E>     /x83/x34/x98/x35 HANGUL SYLLABLE CAELM
-+<UCC4F>     /x83/x34/x98/x36 HANGUL SYLLABLE CAELB
-+<UCC50>     /x83/x34/x98/x37 HANGUL SYLLABLE CAELS
-+<UCC51>     /x83/x34/x98/x38 HANGUL SYLLABLE CAELT
-+<UCC52>     /x83/x34/x98/x39 HANGUL SYLLABLE CAELP
-+<UCC53>     /x83/x34/x99/x30 HANGUL SYLLABLE CAELH
-+<UCC54>     /x83/x34/x99/x31 HANGUL SYLLABLE CAEM
-+<UCC55>     /x83/x34/x99/x32 HANGUL SYLLABLE CAEB
-+<UCC56>     /x83/x34/x99/x33 HANGUL SYLLABLE CAEBS
-+<UCC57>     /x83/x34/x99/x34 HANGUL SYLLABLE CAES
-+<UCC58>     /x83/x34/x99/x35 HANGUL SYLLABLE CAESS
-+<UCC59>     /x83/x34/x99/x36 HANGUL SYLLABLE CAENG
-+<UCC5A>     /x83/x34/x99/x37 HANGUL SYLLABLE CAEJ
-+<UCC5B>     /x83/x34/x99/x38 HANGUL SYLLABLE CAEC
-+<UCC5C>     /x83/x34/x99/x39 HANGUL SYLLABLE CAEK
-+<UCC5D>     /x83/x34/x9a/x30 HANGUL SYLLABLE CAET
-+<UCC5E>     /x83/x34/x9a/x31 HANGUL SYLLABLE CAEP
-+<UCC5F>     /x83/x34/x9a/x32 HANGUL SYLLABLE CAEH
-+<UCC60>     /x83/x34/x9a/x33 HANGUL SYLLABLE CYA
-+<UCC61>     /x83/x34/x9a/x34 HANGUL SYLLABLE CYAG
-+<UCC62>     /x83/x34/x9a/x35 HANGUL SYLLABLE CYAGG
-+<UCC63>     /x83/x34/x9a/x36 HANGUL SYLLABLE CYAGS
-+<UCC64>     /x83/x34/x9a/x37 HANGUL SYLLABLE CYAN
-+<UCC65>     /x83/x34/x9a/x38 HANGUL SYLLABLE CYANI
-+<UCC66>     /x83/x34/x9a/x39 HANGUL SYLLABLE CYANH
-+<UCC67>     /x83/x34/x9b/x30 HANGUL SYLLABLE CYAD
-+<UCC68>     /x83/x34/x9b/x31 HANGUL SYLLABLE CYAL
-+<UCC69>     /x83/x34/x9b/x32 HANGUL SYLLABLE CYALG
-+<UCC6A>     /x83/x34/x9b/x33 HANGUL SYLLABLE CYALM
-+<UCC6B>     /x83/x34/x9b/x34 HANGUL SYLLABLE CYALB
-+<UCC6C>     /x83/x34/x9b/x35 HANGUL SYLLABLE CYALS
-+<UCC6D>     /x83/x34/x9b/x36 HANGUL SYLLABLE CYALT
-+<UCC6E>     /x83/x34/x9b/x37 HANGUL SYLLABLE CYALP
-+<UCC6F>     /x83/x34/x9b/x38 HANGUL SYLLABLE CYALH
-+<UCC70>     /x83/x34/x9b/x39 HANGUL SYLLABLE CYAM
-+<UCC71>     /x83/x34/x9c/x30 HANGUL SYLLABLE CYAB
-+<UCC72>     /x83/x34/x9c/x31 HANGUL SYLLABLE CYABS
-+<UCC73>     /x83/x34/x9c/x32 HANGUL SYLLABLE CYAS
-+<UCC74>     /x83/x34/x9c/x33 HANGUL SYLLABLE CYASS
-+<UCC75>     /x83/x34/x9c/x34 HANGUL SYLLABLE CYANG
-+<UCC76>     /x83/x34/x9c/x35 HANGUL SYLLABLE CYAJ
-+<UCC77>     /x83/x34/x9c/x36 HANGUL SYLLABLE CYAC
-+<UCC78>     /x83/x34/x9c/x37 HANGUL SYLLABLE CYAK
-+<UCC79>     /x83/x34/x9c/x38 HANGUL SYLLABLE CYAT
-+<UCC7A>     /x83/x34/x9c/x39 HANGUL SYLLABLE CYAP
-+<UCC7B>     /x83/x34/x9d/x30 HANGUL SYLLABLE CYAH
-+<UCC7C>     /x83/x34/x9d/x31 HANGUL SYLLABLE CYAE
-+<UCC7D>     /x83/x34/x9d/x32 HANGUL SYLLABLE CYAEG
-+<UCC7E>     /x83/x34/x9d/x33 HANGUL SYLLABLE CYAEGG
-+<UCC7F>     /x83/x34/x9d/x34 HANGUL SYLLABLE CYAEGS
-+<UCC80>     /x83/x34/x9d/x35 HANGUL SYLLABLE CYAEN
-+<UCC81>     /x83/x34/x9d/x36 HANGUL SYLLABLE CYAENI
-+<UCC82>     /x83/x34/x9d/x37 HANGUL SYLLABLE CYAENH
-+<UCC83>     /x83/x34/x9d/x38 HANGUL SYLLABLE CYAED
-+<UCC84>     /x83/x34/x9d/x39 HANGUL SYLLABLE CYAEL
-+<UCC85>     /x83/x34/x9e/x30 HANGUL SYLLABLE CYAELG
-+<UCC86>     /x83/x34/x9e/x31 HANGUL SYLLABLE CYAELM
-+<UCC87>     /x83/x34/x9e/x32 HANGUL SYLLABLE CYAELB
-+<UCC88>     /x83/x34/x9e/x33 HANGUL SYLLABLE CYAELS
-+<UCC89>     /x83/x34/x9e/x34 HANGUL SYLLABLE CYAELT
-+<UCC8A>     /x83/x34/x9e/x35 HANGUL SYLLABLE CYAELP
-+<UCC8B>     /x83/x34/x9e/x36 HANGUL SYLLABLE CYAELH
-+<UCC8C>     /x83/x34/x9e/x37 HANGUL SYLLABLE CYAEM
-+<UCC8D>     /x83/x34/x9e/x38 HANGUL SYLLABLE CYAEB
-+<UCC8E>     /x83/x34/x9e/x39 HANGUL SYLLABLE CYAEBS
-+<UCC8F>     /x83/x34/x9f/x30 HANGUL SYLLABLE CYAES
-+<UCC90>     /x83/x34/x9f/x31 HANGUL SYLLABLE CYAESS
-+<UCC91>     /x83/x34/x9f/x32 HANGUL SYLLABLE CYAENG
-+<UCC92>     /x83/x34/x9f/x33 HANGUL SYLLABLE CYAEJ
-+<UCC93>     /x83/x34/x9f/x34 HANGUL SYLLABLE CYAEC
-+<UCC94>     /x83/x34/x9f/x35 HANGUL SYLLABLE CYAEK
-+<UCC95>     /x83/x34/x9f/x36 HANGUL SYLLABLE CYAET
-+<UCC96>     /x83/x34/x9f/x37 HANGUL SYLLABLE CYAEP
-+<UCC97>     /x83/x34/x9f/x38 HANGUL SYLLABLE CYAEH
-+<UCC98>     /x83/x34/x9f/x39 HANGUL SYLLABLE CEO
-+<UCC99>     /x83/x34/xa0/x30 HANGUL SYLLABLE CEOG
-+<UCC9A>     /x83/x34/xa0/x31 HANGUL SYLLABLE CEOGG
-+<UCC9B>     /x83/x34/xa0/x32 HANGUL SYLLABLE CEOGS
-+<UCC9C>     /x83/x34/xa0/x33 HANGUL SYLLABLE CEON
-+<UCC9D>     /x83/x34/xa0/x34 HANGUL SYLLABLE CEONI
-+<UCC9E>     /x83/x34/xa0/x35 HANGUL SYLLABLE CEONH
-+<UCC9F>     /x83/x34/xa0/x36 HANGUL SYLLABLE CEOD
-+<UCCA0>     /x83/x34/xa0/x37 HANGUL SYLLABLE CEOL
-+<UCCA1>     /x83/x34/xa0/x38 HANGUL SYLLABLE CEOLG
-+<UCCA2>     /x83/x34/xa0/x39 HANGUL SYLLABLE CEOLM
-+<UCCA3>     /x83/x34/xa1/x30 HANGUL SYLLABLE CEOLB
-+<UCCA4>     /x83/x34/xa1/x31 HANGUL SYLLABLE CEOLS
-+<UCCA5>     /x83/x34/xa1/x32 HANGUL SYLLABLE CEOLT
-+<UCCA6>     /x83/x34/xa1/x33 HANGUL SYLLABLE CEOLP
-+<UCCA7>     /x83/x34/xa1/x34 HANGUL SYLLABLE CEOLH
-+<UCCA8>     /x83/x34/xa1/x35 HANGUL SYLLABLE CEOM
-+<UCCA9>     /x83/x34/xa1/x36 HANGUL SYLLABLE CEOB
-+<UCCAA>     /x83/x34/xa1/x37 HANGUL SYLLABLE CEOBS
-+<UCCAB>     /x83/x34/xa1/x38 HANGUL SYLLABLE CEOS
-+<UCCAC>     /x83/x34/xa1/x39 HANGUL SYLLABLE CEOSS
-+<UCCAD>     /x83/x34/xa2/x30 HANGUL SYLLABLE CEONG
-+<UCCAE>     /x83/x34/xa2/x31 HANGUL SYLLABLE CEOJ
-+<UCCAF>     /x83/x34/xa2/x32 HANGUL SYLLABLE CEOC
-+<UCCB0>     /x83/x34/xa2/x33 HANGUL SYLLABLE CEOK
-+<UCCB1>     /x83/x34/xa2/x34 HANGUL SYLLABLE CEOT
-+<UCCB2>     /x83/x34/xa2/x35 HANGUL SYLLABLE CEOP
-+<UCCB3>     /x83/x34/xa2/x36 HANGUL SYLLABLE CEOH
-+<UCCB4>     /x83/x34/xa2/x37 HANGUL SYLLABLE CE
-+<UCCB5>     /x83/x34/xa2/x38 HANGUL SYLLABLE CEG
-+<UCCB6>     /x83/x34/xa2/x39 HANGUL SYLLABLE CEGG
-+<UCCB7>     /x83/x34/xa3/x30 HANGUL SYLLABLE CEGS
-+<UCCB8>     /x83/x34/xa3/x31 HANGUL SYLLABLE CEN
-+<UCCB9>     /x83/x34/xa3/x32 HANGUL SYLLABLE CENI
-+<UCCBA>     /x83/x34/xa3/x33 HANGUL SYLLABLE CENH
-+<UCCBB>     /x83/x34/xa3/x34 HANGUL SYLLABLE CED
-+<UCCBC>     /x83/x34/xa3/x35 HANGUL SYLLABLE CEL
-+<UCCBD>     /x83/x34/xa3/x36 HANGUL SYLLABLE CELG
-+<UCCBE>     /x83/x34/xa3/x37 HANGUL SYLLABLE CELM
-+<UCCBF>     /x83/x34/xa3/x38 HANGUL SYLLABLE CELB
-+<UCCC0>     /x83/x34/xa3/x39 HANGUL SYLLABLE CELS
-+<UCCC1>     /x83/x34/xa4/x30 HANGUL SYLLABLE CELT
-+<UCCC2>     /x83/x34/xa4/x31 HANGUL SYLLABLE CELP
-+<UCCC3>     /x83/x34/xa4/x32 HANGUL SYLLABLE CELH
-+<UCCC4>     /x83/x34/xa4/x33 HANGUL SYLLABLE CEM
-+<UCCC5>     /x83/x34/xa4/x34 HANGUL SYLLABLE CEB
-+<UCCC6>     /x83/x34/xa4/x35 HANGUL SYLLABLE CEBS
-+<UCCC7>     /x83/x34/xa4/x36 HANGUL SYLLABLE CES
-+<UCCC8>     /x83/x34/xa4/x37 HANGUL SYLLABLE CESS
-+<UCCC9>     /x83/x34/xa4/x38 HANGUL SYLLABLE CENG
-+<UCCCA>     /x83/x34/xa4/x39 HANGUL SYLLABLE CEJ
-+<UCCCB>     /x83/x34/xa5/x30 HANGUL SYLLABLE CEC
-+<UCCCC>     /x83/x34/xa5/x31 HANGUL SYLLABLE CEK
-+<UCCCD>     /x83/x34/xa5/x32 HANGUL SYLLABLE CET
-+<UCCCE>     /x83/x34/xa5/x33 HANGUL SYLLABLE CEP
-+<UCCCF>     /x83/x34/xa5/x34 HANGUL SYLLABLE CEH
-+<UCCD0>     /x83/x34/xa5/x35 HANGUL SYLLABLE CYEO
-+<UCCD1>     /x83/x34/xa5/x36 HANGUL SYLLABLE CYEOG
-+<UCCD2>     /x83/x34/xa5/x37 HANGUL SYLLABLE CYEOGG
-+<UCCD3>     /x83/x34/xa5/x38 HANGUL SYLLABLE CYEOGS
-+<UCCD4>     /x83/x34/xa5/x39 HANGUL SYLLABLE CYEON
-+<UCCD5>     /x83/x34/xa6/x30 HANGUL SYLLABLE CYEONI
-+<UCCD6>     /x83/x34/xa6/x31 HANGUL SYLLABLE CYEONH
-+<UCCD7>     /x83/x34/xa6/x32 HANGUL SYLLABLE CYEOD
-+<UCCD8>     /x83/x34/xa6/x33 HANGUL SYLLABLE CYEOL
-+<UCCD9>     /x83/x34/xa6/x34 HANGUL SYLLABLE CYEOLG
-+<UCCDA>     /x83/x34/xa6/x35 HANGUL SYLLABLE CYEOLM
-+<UCCDB>     /x83/x34/xa6/x36 HANGUL SYLLABLE CYEOLB
-+<UCCDC>     /x83/x34/xa6/x37 HANGUL SYLLABLE CYEOLS
-+<UCCDD>     /x83/x34/xa6/x38 HANGUL SYLLABLE CYEOLT
-+<UCCDE>     /x83/x34/xa6/x39 HANGUL SYLLABLE CYEOLP
-+<UCCDF>     /x83/x34/xa7/x30 HANGUL SYLLABLE CYEOLH
-+<UCCE0>     /x83/x34/xa7/x31 HANGUL SYLLABLE CYEOM
-+<UCCE1>     /x83/x34/xa7/x32 HANGUL SYLLABLE CYEOB
-+<UCCE2>     /x83/x34/xa7/x33 HANGUL SYLLABLE CYEOBS
-+<UCCE3>     /x83/x34/xa7/x34 HANGUL SYLLABLE CYEOS
-+<UCCE4>     /x83/x34/xa7/x35 HANGUL SYLLABLE CYEOSS
-+<UCCE5>     /x83/x34/xa7/x36 HANGUL SYLLABLE CYEONG
-+<UCCE6>     /x83/x34/xa7/x37 HANGUL SYLLABLE CYEOJ
-+<UCCE7>     /x83/x34/xa7/x38 HANGUL SYLLABLE CYEOC
-+<UCCE8>     /x83/x34/xa7/x39 HANGUL SYLLABLE CYEOK
-+<UCCE9>     /x83/x34/xa8/x30 HANGUL SYLLABLE CYEOT
-+<UCCEA>     /x83/x34/xa8/x31 HANGUL SYLLABLE CYEOP
-+<UCCEB>     /x83/x34/xa8/x32 HANGUL SYLLABLE CYEOH
-+<UCCEC>     /x83/x34/xa8/x33 HANGUL SYLLABLE CYE
-+<UCCED>     /x83/x34/xa8/x34 HANGUL SYLLABLE CYEG
-+<UCCEE>     /x83/x34/xa8/x35 HANGUL SYLLABLE CYEGG
-+<UCCEF>     /x83/x34/xa8/x36 HANGUL SYLLABLE CYEGS
-+<UCCF0>     /x83/x34/xa8/x37 HANGUL SYLLABLE CYEN
-+<UCCF1>     /x83/x34/xa8/x38 HANGUL SYLLABLE CYENI
-+<UCCF2>     /x83/x34/xa8/x39 HANGUL SYLLABLE CYENH
-+<UCCF3>     /x83/x34/xa9/x30 HANGUL SYLLABLE CYED
-+<UCCF4>     /x83/x34/xa9/x31 HANGUL SYLLABLE CYEL
-+<UCCF5>     /x83/x34/xa9/x32 HANGUL SYLLABLE CYELG
-+<UCCF6>     /x83/x34/xa9/x33 HANGUL SYLLABLE CYELM
-+<UCCF7>     /x83/x34/xa9/x34 HANGUL SYLLABLE CYELB
-+<UCCF8>     /x83/x34/xa9/x35 HANGUL SYLLABLE CYELS
-+<UCCF9>     /x83/x34/xa9/x36 HANGUL SYLLABLE CYELT
-+<UCCFA>     /x83/x34/xa9/x37 HANGUL SYLLABLE CYELP
-+<UCCFB>     /x83/x34/xa9/x38 HANGUL SYLLABLE CYELH
-+<UCCFC>     /x83/x34/xa9/x39 HANGUL SYLLABLE CYEM
-+<UCCFD>     /x83/x34/xaa/x30 HANGUL SYLLABLE CYEB
-+<UCCFE>     /x83/x34/xaa/x31 HANGUL SYLLABLE CYEBS
-+<UCCFF>     /x83/x34/xaa/x32 HANGUL SYLLABLE CYES
-+<UCD00>     /x83/x34/xaa/x33 HANGUL SYLLABLE CYESS
-+<UCD01>     /x83/x34/xaa/x34 HANGUL SYLLABLE CYENG
-+<UCD02>     /x83/x34/xaa/x35 HANGUL SYLLABLE CYEJ
-+<UCD03>     /x83/x34/xaa/x36 HANGUL SYLLABLE CYEC
-+<UCD04>     /x83/x34/xaa/x37 HANGUL SYLLABLE CYEK
-+<UCD05>     /x83/x34/xaa/x38 HANGUL SYLLABLE CYET
-+<UCD06>     /x83/x34/xaa/x39 HANGUL SYLLABLE CYEP
-+<UCD07>     /x83/x34/xab/x30 HANGUL SYLLABLE CYEH
-+<UCD08>     /x83/x34/xab/x31 HANGUL SYLLABLE CO
-+<UCD09>     /x83/x34/xab/x32 HANGUL SYLLABLE COG
-+<UCD0A>     /x83/x34/xab/x33 HANGUL SYLLABLE COGG
-+<UCD0B>     /x83/x34/xab/x34 HANGUL SYLLABLE COGS
-+<UCD0C>     /x83/x34/xab/x35 HANGUL SYLLABLE CON
-+<UCD0D>     /x83/x34/xab/x36 HANGUL SYLLABLE CONI
-+<UCD0E>     /x83/x34/xab/x37 HANGUL SYLLABLE CONH
-+<UCD0F>     /x83/x34/xab/x38 HANGUL SYLLABLE COD
-+<UCD10>     /x83/x34/xab/x39 HANGUL SYLLABLE COL
-+<UCD11>     /x83/x34/xac/x30 HANGUL SYLLABLE COLG
-+<UCD12>     /x83/x34/xac/x31 HANGUL SYLLABLE COLM
-+<UCD13>     /x83/x34/xac/x32 HANGUL SYLLABLE COLB
-+<UCD14>     /x83/x34/xac/x33 HANGUL SYLLABLE COLS
-+<UCD15>     /x83/x34/xac/x34 HANGUL SYLLABLE COLT
-+<UCD16>     /x83/x34/xac/x35 HANGUL SYLLABLE COLP
-+<UCD17>     /x83/x34/xac/x36 HANGUL SYLLABLE COLH
-+<UCD18>     /x83/x34/xac/x37 HANGUL SYLLABLE COM
-+<UCD19>     /x83/x34/xac/x38 HANGUL SYLLABLE COB
-+<UCD1A>     /x83/x34/xac/x39 HANGUL SYLLABLE COBS
-+<UCD1B>     /x83/x34/xad/x30 HANGUL SYLLABLE COS
-+<UCD1C>     /x83/x34/xad/x31 HANGUL SYLLABLE COSS
-+<UCD1D>     /x83/x34/xad/x32 HANGUL SYLLABLE CONG
-+<UCD1E>     /x83/x34/xad/x33 HANGUL SYLLABLE COJ
-+<UCD1F>     /x83/x34/xad/x34 HANGUL SYLLABLE COC
-+<UCD20>     /x83/x34/xad/x35 HANGUL SYLLABLE COK
-+<UCD21>     /x83/x34/xad/x36 HANGUL SYLLABLE COT
-+<UCD22>     /x83/x34/xad/x37 HANGUL SYLLABLE COP
-+<UCD23>     /x83/x34/xad/x38 HANGUL SYLLABLE COH
-+<UCD24>     /x83/x34/xad/x39 HANGUL SYLLABLE CWA
-+<UCD25>     /x83/x34/xae/x30 HANGUL SYLLABLE CWAG
-+<UCD26>     /x83/x34/xae/x31 HANGUL SYLLABLE CWAGG
-+<UCD27>     /x83/x34/xae/x32 HANGUL SYLLABLE CWAGS
-+<UCD28>     /x83/x34/xae/x33 HANGUL SYLLABLE CWAN
-+<UCD29>     /x83/x34/xae/x34 HANGUL SYLLABLE CWANI
-+<UCD2A>     /x83/x34/xae/x35 HANGUL SYLLABLE CWANH
-+<UCD2B>     /x83/x34/xae/x36 HANGUL SYLLABLE CWAD
-+<UCD2C>     /x83/x34/xae/x37 HANGUL SYLLABLE CWAL
-+<UCD2D>     /x83/x34/xae/x38 HANGUL SYLLABLE CWALG
-+<UCD2E>     /x83/x34/xae/x39 HANGUL SYLLABLE CWALM
-+<UCD2F>     /x83/x34/xaf/x30 HANGUL SYLLABLE CWALB
-+<UCD30>     /x83/x34/xaf/x31 HANGUL SYLLABLE CWALS
-+<UCD31>     /x83/x34/xaf/x32 HANGUL SYLLABLE CWALT
-+<UCD32>     /x83/x34/xaf/x33 HANGUL SYLLABLE CWALP
-+<UCD33>     /x83/x34/xaf/x34 HANGUL SYLLABLE CWALH
-+<UCD34>     /x83/x34/xaf/x35 HANGUL SYLLABLE CWAM
-+<UCD35>     /x83/x34/xaf/x36 HANGUL SYLLABLE CWAB
-+<UCD36>     /x83/x34/xaf/x37 HANGUL SYLLABLE CWABS
-+<UCD37>     /x83/x34/xaf/x38 HANGUL SYLLABLE CWAS
-+<UCD38>     /x83/x34/xaf/x39 HANGUL SYLLABLE CWASS
-+<UCD39>     /x83/x34/xb0/x30 HANGUL SYLLABLE CWANG
-+<UCD3A>     /x83/x34/xb0/x31 HANGUL SYLLABLE CWAJ
-+<UCD3B>     /x83/x34/xb0/x32 HANGUL SYLLABLE CWAC
-+<UCD3C>     /x83/x34/xb0/x33 HANGUL SYLLABLE CWAK
-+<UCD3D>     /x83/x34/xb0/x34 HANGUL SYLLABLE CWAT
-+<UCD3E>     /x83/x34/xb0/x35 HANGUL SYLLABLE CWAP
-+<UCD3F>     /x83/x34/xb0/x36 HANGUL SYLLABLE CWAH
-+<UCD40>     /x83/x34/xb0/x37 HANGUL SYLLABLE CWAE
-+<UCD41>     /x83/x34/xb0/x38 HANGUL SYLLABLE CWAEG
-+<UCD42>     /x83/x34/xb0/x39 HANGUL SYLLABLE CWAEGG
-+<UCD43>     /x83/x34/xb1/x30 HANGUL SYLLABLE CWAEGS
-+<UCD44>     /x83/x34/xb1/x31 HANGUL SYLLABLE CWAEN
-+<UCD45>     /x83/x34/xb1/x32 HANGUL SYLLABLE CWAENI
-+<UCD46>     /x83/x34/xb1/x33 HANGUL SYLLABLE CWAENH
-+<UCD47>     /x83/x34/xb1/x34 HANGUL SYLLABLE CWAED
-+<UCD48>     /x83/x34/xb1/x35 HANGUL SYLLABLE CWAEL
-+<UCD49>     /x83/x34/xb1/x36 HANGUL SYLLABLE CWAELG
-+<UCD4A>     /x83/x34/xb1/x37 HANGUL SYLLABLE CWAELM
-+<UCD4B>     /x83/x34/xb1/x38 HANGUL SYLLABLE CWAELB
-+<UCD4C>     /x83/x34/xb1/x39 HANGUL SYLLABLE CWAELS
-+<UCD4D>     /x83/x34/xb2/x30 HANGUL SYLLABLE CWAELT
-+<UCD4E>     /x83/x34/xb2/x31 HANGUL SYLLABLE CWAELP
-+<UCD4F>     /x83/x34/xb2/x32 HANGUL SYLLABLE CWAELH
-+<UCD50>     /x83/x34/xb2/x33 HANGUL SYLLABLE CWAEM
-+<UCD51>     /x83/x34/xb2/x34 HANGUL SYLLABLE CWAEB
-+<UCD52>     /x83/x34/xb2/x35 HANGUL SYLLABLE CWAEBS
-+<UCD53>     /x83/x34/xb2/x36 HANGUL SYLLABLE CWAES
-+<UCD54>     /x83/x34/xb2/x37 HANGUL SYLLABLE CWAESS
-+<UCD55>     /x83/x34/xb2/x38 HANGUL SYLLABLE CWAENG
-+<UCD56>     /x83/x34/xb2/x39 HANGUL SYLLABLE CWAEJ
-+<UCD57>     /x83/x34/xb3/x30 HANGUL SYLLABLE CWAEC
-+<UCD58>     /x83/x34/xb3/x31 HANGUL SYLLABLE CWAEK
-+<UCD59>     /x83/x34/xb3/x32 HANGUL SYLLABLE CWAET
-+<UCD5A>     /x83/x34/xb3/x33 HANGUL SYLLABLE CWAEP
-+<UCD5B>     /x83/x34/xb3/x34 HANGUL SYLLABLE CWAEH
-+<UCD5C>     /x83/x34/xb3/x35 HANGUL SYLLABLE COE
-+<UCD5D>     /x83/x34/xb3/x36 HANGUL SYLLABLE COEG
-+<UCD5E>     /x83/x34/xb3/x37 HANGUL SYLLABLE COEGG
-+<UCD5F>     /x83/x34/xb3/x38 HANGUL SYLLABLE COEGS
-+<UCD60>     /x83/x34/xb3/x39 HANGUL SYLLABLE COEN
-+<UCD61>     /x83/x34/xb4/x30 HANGUL SYLLABLE COENI
-+<UCD62>     /x83/x34/xb4/x31 HANGUL SYLLABLE COENH
-+<UCD63>     /x83/x34/xb4/x32 HANGUL SYLLABLE COED
-+<UCD64>     /x83/x34/xb4/x33 HANGUL SYLLABLE COEL
-+<UCD65>     /x83/x34/xb4/x34 HANGUL SYLLABLE COELG
-+<UCD66>     /x83/x34/xb4/x35 HANGUL SYLLABLE COELM
-+<UCD67>     /x83/x34/xb4/x36 HANGUL SYLLABLE COELB
-+<UCD68>     /x83/x34/xb4/x37 HANGUL SYLLABLE COELS
-+<UCD69>     /x83/x34/xb4/x38 HANGUL SYLLABLE COELT
-+<UCD6A>     /x83/x34/xb4/x39 HANGUL SYLLABLE COELP
-+<UCD6B>     /x83/x34/xb5/x30 HANGUL SYLLABLE COELH
-+<UCD6C>     /x83/x34/xb5/x31 HANGUL SYLLABLE COEM
-+<UCD6D>     /x83/x34/xb5/x32 HANGUL SYLLABLE COEB
-+<UCD6E>     /x83/x34/xb5/x33 HANGUL SYLLABLE COEBS
-+<UCD6F>     /x83/x34/xb5/x34 HANGUL SYLLABLE COES
-+<UCD70>     /x83/x34/xb5/x35 HANGUL SYLLABLE COESS
-+<UCD71>     /x83/x34/xb5/x36 HANGUL SYLLABLE COENG
-+<UCD72>     /x83/x34/xb5/x37 HANGUL SYLLABLE COEJ
-+<UCD73>     /x83/x34/xb5/x38 HANGUL SYLLABLE COEC
-+<UCD74>     /x83/x34/xb5/x39 HANGUL SYLLABLE COEK
-+<UCD75>     /x83/x34/xb6/x30 HANGUL SYLLABLE COET
-+<UCD76>     /x83/x34/xb6/x31 HANGUL SYLLABLE COEP
-+<UCD77>     /x83/x34/xb6/x32 HANGUL SYLLABLE COEH
-+<UCD78>     /x83/x34/xb6/x33 HANGUL SYLLABLE CYO
-+<UCD79>     /x83/x34/xb6/x34 HANGUL SYLLABLE CYOG
-+<UCD7A>     /x83/x34/xb6/x35 HANGUL SYLLABLE CYOGG
-+<UCD7B>     /x83/x34/xb6/x36 HANGUL SYLLABLE CYOGS
-+<UCD7C>     /x83/x34/xb6/x37 HANGUL SYLLABLE CYON
-+<UCD7D>     /x83/x34/xb6/x38 HANGUL SYLLABLE CYONI
-+<UCD7E>     /x83/x34/xb6/x39 HANGUL SYLLABLE CYONH
-+<UCD7F>     /x83/x34/xb7/x30 HANGUL SYLLABLE CYOD
-+<UCD80>     /x83/x34/xb7/x31 HANGUL SYLLABLE CYOL
-+<UCD81>     /x83/x34/xb7/x32 HANGUL SYLLABLE CYOLG
-+<UCD82>     /x83/x34/xb7/x33 HANGUL SYLLABLE CYOLM
-+<UCD83>     /x83/x34/xb7/x34 HANGUL SYLLABLE CYOLB
-+<UCD84>     /x83/x34/xb7/x35 HANGUL SYLLABLE CYOLS
-+<UCD85>     /x83/x34/xb7/x36 HANGUL SYLLABLE CYOLT
-+<UCD86>     /x83/x34/xb7/x37 HANGUL SYLLABLE CYOLP
-+<UCD87>     /x83/x34/xb7/x38 HANGUL SYLLABLE CYOLH
-+<UCD88>     /x83/x34/xb7/x39 HANGUL SYLLABLE CYOM
-+<UCD89>     /x83/x34/xb8/x30 HANGUL SYLLABLE CYOB
-+<UCD8A>     /x83/x34/xb8/x31 HANGUL SYLLABLE CYOBS
-+<UCD8B>     /x83/x34/xb8/x32 HANGUL SYLLABLE CYOS
-+<UCD8C>     /x83/x34/xb8/x33 HANGUL SYLLABLE CYOSS
-+<UCD8D>     /x83/x34/xb8/x34 HANGUL SYLLABLE CYONG
-+<UCD8E>     /x83/x34/xb8/x35 HANGUL SYLLABLE CYOJ
-+<UCD8F>     /x83/x34/xb8/x36 HANGUL SYLLABLE CYOC
-+<UCD90>     /x83/x34/xb8/x37 HANGUL SYLLABLE CYOK
-+<UCD91>     /x83/x34/xb8/x38 HANGUL SYLLABLE CYOT
-+<UCD92>     /x83/x34/xb8/x39 HANGUL SYLLABLE CYOP
-+<UCD93>     /x83/x34/xb9/x30 HANGUL SYLLABLE CYOH
-+<UCD94>     /x83/x34/xb9/x31 HANGUL SYLLABLE CU
-+<UCD95>     /x83/x34/xb9/x32 HANGUL SYLLABLE CUG
-+<UCD96>     /x83/x34/xb9/x33 HANGUL SYLLABLE CUGG
-+<UCD97>     /x83/x34/xb9/x34 HANGUL SYLLABLE CUGS
-+<UCD98>     /x83/x34/xb9/x35 HANGUL SYLLABLE CUN
-+<UCD99>     /x83/x34/xb9/x36 HANGUL SYLLABLE CUNI
-+<UCD9A>     /x83/x34/xb9/x37 HANGUL SYLLABLE CUNH
-+<UCD9B>     /x83/x34/xb9/x38 HANGUL SYLLABLE CUD
-+<UCD9C>     /x83/x34/xb9/x39 HANGUL SYLLABLE CUL
-+<UCD9D>     /x83/x34/xba/x30 HANGUL SYLLABLE CULG
-+<UCD9E>     /x83/x34/xba/x31 HANGUL SYLLABLE CULM
-+<UCD9F>     /x83/x34/xba/x32 HANGUL SYLLABLE CULB
-+<UCDA0>     /x83/x34/xba/x33 HANGUL SYLLABLE CULS
-+<UCDA1>     /x83/x34/xba/x34 HANGUL SYLLABLE CULT
-+<UCDA2>     /x83/x34/xba/x35 HANGUL SYLLABLE CULP
-+<UCDA3>     /x83/x34/xba/x36 HANGUL SYLLABLE CULH
-+<UCDA4>     /x83/x34/xba/x37 HANGUL SYLLABLE CUM
-+<UCDA5>     /x83/x34/xba/x38 HANGUL SYLLABLE CUB
-+<UCDA6>     /x83/x34/xba/x39 HANGUL SYLLABLE CUBS
-+<UCDA7>     /x83/x34/xbb/x30 HANGUL SYLLABLE CUS
-+<UCDA8>     /x83/x34/xbb/x31 HANGUL SYLLABLE CUSS
-+<UCDA9>     /x83/x34/xbb/x32 HANGUL SYLLABLE CUNG
-+<UCDAA>     /x83/x34/xbb/x33 HANGUL SYLLABLE CUJ
-+<UCDAB>     /x83/x34/xbb/x34 HANGUL SYLLABLE CUC
-+<UCDAC>     /x83/x34/xbb/x35 HANGUL SYLLABLE CUK
-+<UCDAD>     /x83/x34/xbb/x36 HANGUL SYLLABLE CUT
-+<UCDAE>     /x83/x34/xbb/x37 HANGUL SYLLABLE CUP
-+<UCDAF>     /x83/x34/xbb/x38 HANGUL SYLLABLE CUH
-+<UCDB0>     /x83/x34/xbb/x39 HANGUL SYLLABLE CWEO
-+<UCDB1>     /x83/x34/xbc/x30 HANGUL SYLLABLE CWEOG
-+<UCDB2>     /x83/x34/xbc/x31 HANGUL SYLLABLE CWEOGG
-+<UCDB3>     /x83/x34/xbc/x32 HANGUL SYLLABLE CWEOGS
-+<UCDB4>     /x83/x34/xbc/x33 HANGUL SYLLABLE CWEON
-+<UCDB5>     /x83/x34/xbc/x34 HANGUL SYLLABLE CWEONI
-+<UCDB6>     /x83/x34/xbc/x35 HANGUL SYLLABLE CWEONH
-+<UCDB7>     /x83/x34/xbc/x36 HANGUL SYLLABLE CWEOD
-+<UCDB8>     /x83/x34/xbc/x37 HANGUL SYLLABLE CWEOL
-+<UCDB9>     /x83/x34/xbc/x38 HANGUL SYLLABLE CWEOLG
-+<UCDBA>     /x83/x34/xbc/x39 HANGUL SYLLABLE CWEOLM
-+<UCDBB>     /x83/x34/xbd/x30 HANGUL SYLLABLE CWEOLB
-+<UCDBC>     /x83/x34/xbd/x31 HANGUL SYLLABLE CWEOLS
-+<UCDBD>     /x83/x34/xbd/x32 HANGUL SYLLABLE CWEOLT
-+<UCDBE>     /x83/x34/xbd/x33 HANGUL SYLLABLE CWEOLP
-+<UCDBF>     /x83/x34/xbd/x34 HANGUL SYLLABLE CWEOLH
-+<UCDC0>     /x83/x34/xbd/x35 HANGUL SYLLABLE CWEOM
-+<UCDC1>     /x83/x34/xbd/x36 HANGUL SYLLABLE CWEOB
-+<UCDC2>     /x83/x34/xbd/x37 HANGUL SYLLABLE CWEOBS
-+<UCDC3>     /x83/x34/xbd/x38 HANGUL SYLLABLE CWEOS
-+<UCDC4>     /x83/x34/xbd/x39 HANGUL SYLLABLE CWEOSS
-+<UCDC5>     /x83/x34/xbe/x30 HANGUL SYLLABLE CWEONG
-+<UCDC6>     /x83/x34/xbe/x31 HANGUL SYLLABLE CWEOJ
-+<UCDC7>     /x83/x34/xbe/x32 HANGUL SYLLABLE CWEOC
-+<UCDC8>     /x83/x34/xbe/x33 HANGUL SYLLABLE CWEOK
-+<UCDC9>     /x83/x34/xbe/x34 HANGUL SYLLABLE CWEOT
-+<UCDCA>     /x83/x34/xbe/x35 HANGUL SYLLABLE CWEOP
-+<UCDCB>     /x83/x34/xbe/x36 HANGUL SYLLABLE CWEOH
-+<UCDCC>     /x83/x34/xbe/x37 HANGUL SYLLABLE CWE
-+<UCDCD>     /x83/x34/xbe/x38 HANGUL SYLLABLE CWEG
-+<UCDCE>     /x83/x34/xbe/x39 HANGUL SYLLABLE CWEGG
-+<UCDCF>     /x83/x34/xbf/x30 HANGUL SYLLABLE CWEGS
-+<UCDD0>     /x83/x34/xbf/x31 HANGUL SYLLABLE CWEN
-+<UCDD1>     /x83/x34/xbf/x32 HANGUL SYLLABLE CWENI
-+<UCDD2>     /x83/x34/xbf/x33 HANGUL SYLLABLE CWENH
-+<UCDD3>     /x83/x34/xbf/x34 HANGUL SYLLABLE CWED
-+<UCDD4>     /x83/x34/xbf/x35 HANGUL SYLLABLE CWEL
-+<UCDD5>     /x83/x34/xbf/x36 HANGUL SYLLABLE CWELG
-+<UCDD6>     /x83/x34/xbf/x37 HANGUL SYLLABLE CWELM
-+<UCDD7>     /x83/x34/xbf/x38 HANGUL SYLLABLE CWELB
-+<UCDD8>     /x83/x34/xbf/x39 HANGUL SYLLABLE CWELS
-+<UCDD9>     /x83/x34/xc0/x30 HANGUL SYLLABLE CWELT
-+<UCDDA>     /x83/x34/xc0/x31 HANGUL SYLLABLE CWELP
-+<UCDDB>     /x83/x34/xc0/x32 HANGUL SYLLABLE CWELH
-+<UCDDC>     /x83/x34/xc0/x33 HANGUL SYLLABLE CWEM
-+<UCDDD>     /x83/x34/xc0/x34 HANGUL SYLLABLE CWEB
-+<UCDDE>     /x83/x34/xc0/x35 HANGUL SYLLABLE CWEBS
-+<UCDDF>     /x83/x34/xc0/x36 HANGUL SYLLABLE CWES
-+<UCDE0>     /x83/x34/xc0/x37 HANGUL SYLLABLE CWESS
-+<UCDE1>     /x83/x34/xc0/x38 HANGUL SYLLABLE CWENG
-+<UCDE2>     /x83/x34/xc0/x39 HANGUL SYLLABLE CWEJ
-+<UCDE3>     /x83/x34/xc1/x30 HANGUL SYLLABLE CWEC
-+<UCDE4>     /x83/x34/xc1/x31 HANGUL SYLLABLE CWEK
-+<UCDE5>     /x83/x34/xc1/x32 HANGUL SYLLABLE CWET
-+<UCDE6>     /x83/x34/xc1/x33 HANGUL SYLLABLE CWEP
-+<UCDE7>     /x83/x34/xc1/x34 HANGUL SYLLABLE CWEH
-+<UCDE8>     /x83/x34/xc1/x35 HANGUL SYLLABLE CWI
-+<UCDE9>     /x83/x34/xc1/x36 HANGUL SYLLABLE CWIG
-+<UCDEA>     /x83/x34/xc1/x37 HANGUL SYLLABLE CWIGG
-+<UCDEB>     /x83/x34/xc1/x38 HANGUL SYLLABLE CWIGS
-+<UCDEC>     /x83/x34/xc1/x39 HANGUL SYLLABLE CWIN
-+<UCDED>     /x83/x34/xc2/x30 HANGUL SYLLABLE CWINI
-+<UCDEE>     /x83/x34/xc2/x31 HANGUL SYLLABLE CWINH
-+<UCDEF>     /x83/x34/xc2/x32 HANGUL SYLLABLE CWID
-+<UCDF0>     /x83/x34/xc2/x33 HANGUL SYLLABLE CWIL
-+<UCDF1>     /x83/x34/xc2/x34 HANGUL SYLLABLE CWILG
-+<UCDF2>     /x83/x34/xc2/x35 HANGUL SYLLABLE CWILM
-+<UCDF3>     /x83/x34/xc2/x36 HANGUL SYLLABLE CWILB
-+<UCDF4>     /x83/x34/xc2/x37 HANGUL SYLLABLE CWILS
-+<UCDF5>     /x83/x34/xc2/x38 HANGUL SYLLABLE CWILT
-+<UCDF6>     /x83/x34/xc2/x39 HANGUL SYLLABLE CWILP
-+<UCDF7>     /x83/x34/xc3/x30 HANGUL SYLLABLE CWILH
-+<UCDF8>     /x83/x34/xc3/x31 HANGUL SYLLABLE CWIM
-+<UCDF9>     /x83/x34/xc3/x32 HANGUL SYLLABLE CWIB
-+<UCDFA>     /x83/x34/xc3/x33 HANGUL SYLLABLE CWIBS
-+<UCDFB>     /x83/x34/xc3/x34 HANGUL SYLLABLE CWIS
-+<UCDFC>     /x83/x34/xc3/x35 HANGUL SYLLABLE CWISS
-+<UCDFD>     /x83/x34/xc3/x36 HANGUL SYLLABLE CWING
-+<UCDFE>     /x83/x34/xc3/x37 HANGUL SYLLABLE CWIJ
-+<UCDFF>     /x83/x34/xc3/x38 HANGUL SYLLABLE CWIC
-+<UCE00>     /x83/x34/xc3/x39 HANGUL SYLLABLE CWIK
-+<UCE01>     /x83/x34/xc4/x30 HANGUL SYLLABLE CWIT
-+<UCE02>     /x83/x34/xc4/x31 HANGUL SYLLABLE CWIP
-+<UCE03>     /x83/x34/xc4/x32 HANGUL SYLLABLE CWIH
-+<UCE04>     /x83/x34/xc4/x33 HANGUL SYLLABLE CYU
-+<UCE05>     /x83/x34/xc4/x34 HANGUL SYLLABLE CYUG
-+<UCE06>     /x83/x34/xc4/x35 HANGUL SYLLABLE CYUGG
-+<UCE07>     /x83/x34/xc4/x36 HANGUL SYLLABLE CYUGS
-+<UCE08>     /x83/x34/xc4/x37 HANGUL SYLLABLE CYUN
-+<UCE09>     /x83/x34/xc4/x38 HANGUL SYLLABLE CYUNI
-+<UCE0A>     /x83/x34/xc4/x39 HANGUL SYLLABLE CYUNH
-+<UCE0B>     /x83/x34/xc5/x30 HANGUL SYLLABLE CYUD
-+<UCE0C>     /x83/x34/xc5/x31 HANGUL SYLLABLE CYUL
-+<UCE0D>     /x83/x34/xc5/x32 HANGUL SYLLABLE CYULG
-+<UCE0E>     /x83/x34/xc5/x33 HANGUL SYLLABLE CYULM
-+<UCE0F>     /x83/x34/xc5/x34 HANGUL SYLLABLE CYULB
-+<UCE10>     /x83/x34/xc5/x35 HANGUL SYLLABLE CYULS
-+<UCE11>     /x83/x34/xc5/x36 HANGUL SYLLABLE CYULT
-+<UCE12>     /x83/x34/xc5/x37 HANGUL SYLLABLE CYULP
-+<UCE13>     /x83/x34/xc5/x38 HANGUL SYLLABLE CYULH
-+<UCE14>     /x83/x34/xc5/x39 HANGUL SYLLABLE CYUM
-+<UCE15>     /x83/x34/xc6/x30 HANGUL SYLLABLE CYUB
-+<UCE16>     /x83/x34/xc6/x31 HANGUL SYLLABLE CYUBS
-+<UCE17>     /x83/x34/xc6/x32 HANGUL SYLLABLE CYUS
-+<UCE18>     /x83/x34/xc6/x33 HANGUL SYLLABLE CYUSS
-+<UCE19>     /x83/x34/xc6/x34 HANGUL SYLLABLE CYUNG
-+<UCE1A>     /x83/x34/xc6/x35 HANGUL SYLLABLE CYUJ
-+<UCE1B>     /x83/x34/xc6/x36 HANGUL SYLLABLE CYUC
-+<UCE1C>     /x83/x34/xc6/x37 HANGUL SYLLABLE CYUK
-+<UCE1D>     /x83/x34/xc6/x38 HANGUL SYLLABLE CYUT
-+<UCE1E>     /x83/x34/xc6/x39 HANGUL SYLLABLE CYUP
-+<UCE1F>     /x83/x34/xc7/x30 HANGUL SYLLABLE CYUH
-+<UCE20>     /x83/x34/xc7/x31 HANGUL SYLLABLE CEU
-+<UCE21>     /x83/x34/xc7/x32 HANGUL SYLLABLE CEUG
-+<UCE22>     /x83/x34/xc7/x33 HANGUL SYLLABLE CEUGG
-+<UCE23>     /x83/x34/xc7/x34 HANGUL SYLLABLE CEUGS
-+<UCE24>     /x83/x34/xc7/x35 HANGUL SYLLABLE CEUN
-+<UCE25>     /x83/x34/xc7/x36 HANGUL SYLLABLE CEUNI
-+<UCE26>     /x83/x34/xc7/x37 HANGUL SYLLABLE CEUNH
-+<UCE27>     /x83/x34/xc7/x38 HANGUL SYLLABLE CEUD
-+<UCE28>     /x83/x34/xc7/x39 HANGUL SYLLABLE CEUL
-+<UCE29>     /x83/x34/xc8/x30 HANGUL SYLLABLE CEULG
-+<UCE2A>     /x83/x34/xc8/x31 HANGUL SYLLABLE CEULM
-+<UCE2B>     /x83/x34/xc8/x32 HANGUL SYLLABLE CEULB
-+<UCE2C>     /x83/x34/xc8/x33 HANGUL SYLLABLE CEULS
-+<UCE2D>     /x83/x34/xc8/x34 HANGUL SYLLABLE CEULT
-+<UCE2E>     /x83/x34/xc8/x35 HANGUL SYLLABLE CEULP
-+<UCE2F>     /x83/x34/xc8/x36 HANGUL SYLLABLE CEULH
-+<UCE30>     /x83/x34/xc8/x37 HANGUL SYLLABLE CEUM
-+<UCE31>     /x83/x34/xc8/x38 HANGUL SYLLABLE CEUB
-+<UCE32>     /x83/x34/xc8/x39 HANGUL SYLLABLE CEUBS
-+<UCE33>     /x83/x34/xc9/x30 HANGUL SYLLABLE CEUS
-+<UCE34>     /x83/x34/xc9/x31 HANGUL SYLLABLE CEUSS
-+<UCE35>     /x83/x34/xc9/x32 HANGUL SYLLABLE CEUNG
-+<UCE36>     /x83/x34/xc9/x33 HANGUL SYLLABLE CEUJ
-+<UCE37>     /x83/x34/xc9/x34 HANGUL SYLLABLE CEUC
-+<UCE38>     /x83/x34/xc9/x35 HANGUL SYLLABLE CEUK
-+<UCE39>     /x83/x34/xc9/x36 HANGUL SYLLABLE CEUT
-+<UCE3A>     /x83/x34/xc9/x37 HANGUL SYLLABLE CEUP
-+<UCE3B>     /x83/x34/xc9/x38 HANGUL SYLLABLE CEUH
-+<UCE3C>     /x83/x34/xc9/x39 HANGUL SYLLABLE CYI
-+<UCE3D>     /x83/x34/xca/x30 HANGUL SYLLABLE CYIG
-+<UCE3E>     /x83/x34/xca/x31 HANGUL SYLLABLE CYIGG
-+<UCE3F>     /x83/x34/xca/x32 HANGUL SYLLABLE CYIGS
-+<UCE40>     /x83/x34/xca/x33 HANGUL SYLLABLE CYIN
-+<UCE41>     /x83/x34/xca/x34 HANGUL SYLLABLE CYINI
-+<UCE42>     /x83/x34/xca/x35 HANGUL SYLLABLE CYINH
-+<UCE43>     /x83/x34/xca/x36 HANGUL SYLLABLE CYID
-+<UCE44>     /x83/x34/xca/x37 HANGUL SYLLABLE CYIL
-+<UCE45>     /x83/x34/xca/x38 HANGUL SYLLABLE CYILG
-+<UCE46>     /x83/x34/xca/x39 HANGUL SYLLABLE CYILM
-+<UCE47>     /x83/x34/xcb/x30 HANGUL SYLLABLE CYILB
-+<UCE48>     /x83/x34/xcb/x31 HANGUL SYLLABLE CYILS
-+<UCE49>     /x83/x34/xcb/x32 HANGUL SYLLABLE CYILT
-+<UCE4A>     /x83/x34/xcb/x33 HANGUL SYLLABLE CYILP
-+<UCE4B>     /x83/x34/xcb/x34 HANGUL SYLLABLE CYILH
-+<UCE4C>     /x83/x34/xcb/x35 HANGUL SYLLABLE CYIM
-+<UCE4D>     /x83/x34/xcb/x36 HANGUL SYLLABLE CYIB
-+<UCE4E>     /x83/x34/xcb/x37 HANGUL SYLLABLE CYIBS
-+<UCE4F>     /x83/x34/xcb/x38 HANGUL SYLLABLE CYIS
-+<UCE50>     /x83/x34/xcb/x39 HANGUL SYLLABLE CYISS
-+<UCE51>     /x83/x34/xcc/x30 HANGUL SYLLABLE CYING
-+<UCE52>     /x83/x34/xcc/x31 HANGUL SYLLABLE CYIJ
-+<UCE53>     /x83/x34/xcc/x32 HANGUL SYLLABLE CYIC
-+<UCE54>     /x83/x34/xcc/x33 HANGUL SYLLABLE CYIK
-+<UCE55>     /x83/x34/xcc/x34 HANGUL SYLLABLE CYIT
-+<UCE56>     /x83/x34/xcc/x35 HANGUL SYLLABLE CYIP
-+<UCE57>     /x83/x34/xcc/x36 HANGUL SYLLABLE CYIH
-+<UCE58>     /x83/x34/xcc/x37 HANGUL SYLLABLE CI
-+<UCE59>     /x83/x34/xcc/x38 HANGUL SYLLABLE CIG
-+<UCE5A>     /x83/x34/xcc/x39 HANGUL SYLLABLE CIGG
-+<UCE5B>     /x83/x34/xcd/x30 HANGUL SYLLABLE CIGS
-+<UCE5C>     /x83/x34/xcd/x31 HANGUL SYLLABLE CIN
-+<UCE5D>     /x83/x34/xcd/x32 HANGUL SYLLABLE CINI
-+<UCE5E>     /x83/x34/xcd/x33 HANGUL SYLLABLE CINH
-+<UCE5F>     /x83/x34/xcd/x34 HANGUL SYLLABLE CID
-+<UCE60>     /x83/x34/xcd/x35 HANGUL SYLLABLE CIL
-+<UCE61>     /x83/x34/xcd/x36 HANGUL SYLLABLE CILG
-+<UCE62>     /x83/x34/xcd/x37 HANGUL SYLLABLE CILM
-+<UCE63>     /x83/x34/xcd/x38 HANGUL SYLLABLE CILB
-+<UCE64>     /x83/x34/xcd/x39 HANGUL SYLLABLE CILS
-+<UCE65>     /x83/x34/xce/x30 HANGUL SYLLABLE CILT
-+<UCE66>     /x83/x34/xce/x31 HANGUL SYLLABLE CILP
-+<UCE67>     /x83/x34/xce/x32 HANGUL SYLLABLE CILH
-+<UCE68>     /x83/x34/xce/x33 HANGUL SYLLABLE CIM
-+<UCE69>     /x83/x34/xce/x34 HANGUL SYLLABLE CIB
-+<UCE6A>     /x83/x34/xce/x35 HANGUL SYLLABLE CIBS
-+<UCE6B>     /x83/x34/xce/x36 HANGUL SYLLABLE CIS
-+<UCE6C>     /x83/x34/xce/x37 HANGUL SYLLABLE CISS
-+<UCE6D>     /x83/x34/xce/x38 HANGUL SYLLABLE CING
-+<UCE6E>     /x83/x34/xce/x39 HANGUL SYLLABLE CIJ
-+<UCE6F>     /x83/x34/xcf/x30 HANGUL SYLLABLE CIC
-+<UCE70>     /x83/x34/xcf/x31 HANGUL SYLLABLE CIK
-+<UCE71>     /x83/x34/xcf/x32 HANGUL SYLLABLE CIT
-+<UCE72>     /x83/x34/xcf/x33 HANGUL SYLLABLE CIP
-+<UCE73>     /x83/x34/xcf/x34 HANGUL SYLLABLE CIH
-+<UCE74>     /x83/x34/xcf/x35 HANGUL SYLLABLE KA
-+<UCE75>     /x83/x34/xcf/x36 HANGUL SYLLABLE KAG
-+<UCE76>     /x83/x34/xcf/x37 HANGUL SYLLABLE KAGG
-+<UCE77>     /x83/x34/xcf/x38 HANGUL SYLLABLE KAGS
-+<UCE78>     /x83/x34/xcf/x39 HANGUL SYLLABLE KAN
-+<UCE79>     /x83/x34/xd0/x30 HANGUL SYLLABLE KANI
-+<UCE7A>     /x83/x34/xd0/x31 HANGUL SYLLABLE KANH
-+<UCE7B>     /x83/x34/xd0/x32 HANGUL SYLLABLE KAD
-+<UCE7C>     /x83/x34/xd0/x33 HANGUL SYLLABLE KAL
-+<UCE7D>     /x83/x34/xd0/x34 HANGUL SYLLABLE KALG
-+<UCE7E>     /x83/x34/xd0/x35 HANGUL SYLLABLE KALM
-+<UCE7F>     /x83/x34/xd0/x36 HANGUL SYLLABLE KALB
-+<UCE80>     /x83/x34/xd0/x37 HANGUL SYLLABLE KALS
-+<UCE81>     /x83/x34/xd0/x38 HANGUL SYLLABLE KALT
-+<UCE82>     /x83/x34/xd0/x39 HANGUL SYLLABLE KALP
-+<UCE83>     /x83/x34/xd1/x30 HANGUL SYLLABLE KALH
-+<UCE84>     /x83/x34/xd1/x31 HANGUL SYLLABLE KAM
-+<UCE85>     /x83/x34/xd1/x32 HANGUL SYLLABLE KAB
-+<UCE86>     /x83/x34/xd1/x33 HANGUL SYLLABLE KABS
-+<UCE87>     /x83/x34/xd1/x34 HANGUL SYLLABLE KAS
-+<UCE88>     /x83/x34/xd1/x35 HANGUL SYLLABLE KASS
-+<UCE89>     /x83/x34/xd1/x36 HANGUL SYLLABLE KANG
-+<UCE8A>     /x83/x34/xd1/x37 HANGUL SYLLABLE KAJ
-+<UCE8B>     /x83/x34/xd1/x38 HANGUL SYLLABLE KAC
-+<UCE8C>     /x83/x34/xd1/x39 HANGUL SYLLABLE KAK
-+<UCE8D>     /x83/x34/xd2/x30 HANGUL SYLLABLE KAT
-+<UCE8E>     /x83/x34/xd2/x31 HANGUL SYLLABLE KAP
-+<UCE8F>     /x83/x34/xd2/x32 HANGUL SYLLABLE KAH
-+<UCE90>     /x83/x34/xd2/x33 HANGUL SYLLABLE KAE
-+<UCE91>     /x83/x34/xd2/x34 HANGUL SYLLABLE KAEG
-+<UCE92>     /x83/x34/xd2/x35 HANGUL SYLLABLE KAEGG
-+<UCE93>     /x83/x34/xd2/x36 HANGUL SYLLABLE KAEGS
-+<UCE94>     /x83/x34/xd2/x37 HANGUL SYLLABLE KAEN
-+<UCE95>     /x83/x34/xd2/x38 HANGUL SYLLABLE KAENI
-+<UCE96>     /x83/x34/xd2/x39 HANGUL SYLLABLE KAENH
-+<UCE97>     /x83/x34/xd3/x30 HANGUL SYLLABLE KAED
-+<UCE98>     /x83/x34/xd3/x31 HANGUL SYLLABLE KAEL
-+<UCE99>     /x83/x34/xd3/x32 HANGUL SYLLABLE KAELG
-+<UCE9A>     /x83/x34/xd3/x33 HANGUL SYLLABLE KAELM
-+<UCE9B>     /x83/x34/xd3/x34 HANGUL SYLLABLE KAELB
-+<UCE9C>     /x83/x34/xd3/x35 HANGUL SYLLABLE KAELS
-+<UCE9D>     /x83/x34/xd3/x36 HANGUL SYLLABLE KAELT
-+<UCE9E>     /x83/x34/xd3/x37 HANGUL SYLLABLE KAELP
-+<UCE9F>     /x83/x34/xd3/x38 HANGUL SYLLABLE KAELH
-+<UCEA0>     /x83/x34/xd3/x39 HANGUL SYLLABLE KAEM
-+<UCEA1>     /x83/x34/xd4/x30 HANGUL SYLLABLE KAEB
-+<UCEA2>     /x83/x34/xd4/x31 HANGUL SYLLABLE KAEBS
-+<UCEA3>     /x83/x34/xd4/x32 HANGUL SYLLABLE KAES
-+<UCEA4>     /x83/x34/xd4/x33 HANGUL SYLLABLE KAESS
-+<UCEA5>     /x83/x34/xd4/x34 HANGUL SYLLABLE KAENG
-+<UCEA6>     /x83/x34/xd4/x35 HANGUL SYLLABLE KAEJ
-+<UCEA7>     /x83/x34/xd4/x36 HANGUL SYLLABLE KAEC
-+<UCEA8>     /x83/x34/xd4/x37 HANGUL SYLLABLE KAEK
-+<UCEA9>     /x83/x34/xd4/x38 HANGUL SYLLABLE KAET
-+<UCEAA>     /x83/x34/xd4/x39 HANGUL SYLLABLE KAEP
-+<UCEAB>     /x83/x34/xd5/x30 HANGUL SYLLABLE KAEH
-+<UCEAC>     /x83/x34/xd5/x31 HANGUL SYLLABLE KYA
-+<UCEAD>     /x83/x34/xd5/x32 HANGUL SYLLABLE KYAG
-+<UCEAE>     /x83/x34/xd5/x33 HANGUL SYLLABLE KYAGG
-+<UCEAF>     /x83/x34/xd5/x34 HANGUL SYLLABLE KYAGS
-+<UCEB0>     /x83/x34/xd5/x35 HANGUL SYLLABLE KYAN
-+<UCEB1>     /x83/x34/xd5/x36 HANGUL SYLLABLE KYANI
-+<UCEB2>     /x83/x34/xd5/x37 HANGUL SYLLABLE KYANH
-+<UCEB3>     /x83/x34/xd5/x38 HANGUL SYLLABLE KYAD
-+<UCEB4>     /x83/x34/xd5/x39 HANGUL SYLLABLE KYAL
-+<UCEB5>     /x83/x34/xd6/x30 HANGUL SYLLABLE KYALG
-+<UCEB6>     /x83/x34/xd6/x31 HANGUL SYLLABLE KYALM
-+<UCEB7>     /x83/x34/xd6/x32 HANGUL SYLLABLE KYALB
-+<UCEB8>     /x83/x34/xd6/x33 HANGUL SYLLABLE KYALS
-+<UCEB9>     /x83/x34/xd6/x34 HANGUL SYLLABLE KYALT
-+<UCEBA>     /x83/x34/xd6/x35 HANGUL SYLLABLE KYALP
-+<UCEBB>     /x83/x34/xd6/x36 HANGUL SYLLABLE KYALH
-+<UCEBC>     /x83/x34/xd6/x37 HANGUL SYLLABLE KYAM
-+<UCEBD>     /x83/x34/xd6/x38 HANGUL SYLLABLE KYAB
-+<UCEBE>     /x83/x34/xd6/x39 HANGUL SYLLABLE KYABS
-+<UCEBF>     /x83/x34/xd7/x30 HANGUL SYLLABLE KYAS
-+<UCEC0>     /x83/x34/xd7/x31 HANGUL SYLLABLE KYASS
-+<UCEC1>     /x83/x34/xd7/x32 HANGUL SYLLABLE KYANG
-+<UCEC2>     /x83/x34/xd7/x33 HANGUL SYLLABLE KYAJ
-+<UCEC3>     /x83/x34/xd7/x34 HANGUL SYLLABLE KYAC
-+<UCEC4>     /x83/x34/xd7/x35 HANGUL SYLLABLE KYAK
-+<UCEC5>     /x83/x34/xd7/x36 HANGUL SYLLABLE KYAT
-+<UCEC6>     /x83/x34/xd7/x37 HANGUL SYLLABLE KYAP
-+<UCEC7>     /x83/x34/xd7/x38 HANGUL SYLLABLE KYAH
-+<UCEC8>     /x83/x34/xd7/x39 HANGUL SYLLABLE KYAE
-+<UCEC9>     /x83/x34/xd8/x30 HANGUL SYLLABLE KYAEG
-+<UCECA>     /x83/x34/xd8/x31 HANGUL SYLLABLE KYAEGG
-+<UCECB>     /x83/x34/xd8/x32 HANGUL SYLLABLE KYAEGS
-+<UCECC>     /x83/x34/xd8/x33 HANGUL SYLLABLE KYAEN
-+<UCECD>     /x83/x34/xd8/x34 HANGUL SYLLABLE KYAENI
-+<UCECE>     /x83/x34/xd8/x35 HANGUL SYLLABLE KYAENH
-+<UCECF>     /x83/x34/xd8/x36 HANGUL SYLLABLE KYAED
-+<UCED0>     /x83/x34/xd8/x37 HANGUL SYLLABLE KYAEL
-+<UCED1>     /x83/x34/xd8/x38 HANGUL SYLLABLE KYAELG
-+<UCED2>     /x83/x34/xd8/x39 HANGUL SYLLABLE KYAELM
-+<UCED3>     /x83/x34/xd9/x30 HANGUL SYLLABLE KYAELB
-+<UCED4>     /x83/x34/xd9/x31 HANGUL SYLLABLE KYAELS
-+<UCED5>     /x83/x34/xd9/x32 HANGUL SYLLABLE KYAELT
-+<UCED6>     /x83/x34/xd9/x33 HANGUL SYLLABLE KYAELP
-+<UCED7>     /x83/x34/xd9/x34 HANGUL SYLLABLE KYAELH
-+<UCED8>     /x83/x34/xd9/x35 HANGUL SYLLABLE KYAEM
-+<UCED9>     /x83/x34/xd9/x36 HANGUL SYLLABLE KYAEB
-+<UCEDA>     /x83/x34/xd9/x37 HANGUL SYLLABLE KYAEBS
-+<UCEDB>     /x83/x34/xd9/x38 HANGUL SYLLABLE KYAES
-+<UCEDC>     /x83/x34/xd9/x39 HANGUL SYLLABLE KYAESS
-+<UCEDD>     /x83/x34/xda/x30 HANGUL SYLLABLE KYAENG
-+<UCEDE>     /x83/x34/xda/x31 HANGUL SYLLABLE KYAEJ
-+<UCEDF>     /x83/x34/xda/x32 HANGUL SYLLABLE KYAEC
-+<UCEE0>     /x83/x34/xda/x33 HANGUL SYLLABLE KYAEK
-+<UCEE1>     /x83/x34/xda/x34 HANGUL SYLLABLE KYAET
-+<UCEE2>     /x83/x34/xda/x35 HANGUL SYLLABLE KYAEP
-+<UCEE3>     /x83/x34/xda/x36 HANGUL SYLLABLE KYAEH
-+<UCEE4>     /x83/x34/xda/x37 HANGUL SYLLABLE KEO
-+<UCEE5>     /x83/x34/xda/x38 HANGUL SYLLABLE KEOG
-+<UCEE6>     /x83/x34/xda/x39 HANGUL SYLLABLE KEOGG
-+<UCEE7>     /x83/x34/xdb/x30 HANGUL SYLLABLE KEOGS
-+<UCEE8>     /x83/x34/xdb/x31 HANGUL SYLLABLE KEON
-+<UCEE9>     /x83/x34/xdb/x32 HANGUL SYLLABLE KEONI
-+<UCEEA>     /x83/x34/xdb/x33 HANGUL SYLLABLE KEONH
-+<UCEEB>     /x83/x34/xdb/x34 HANGUL SYLLABLE KEOD
-+<UCEEC>     /x83/x34/xdb/x35 HANGUL SYLLABLE KEOL
-+<UCEED>     /x83/x34/xdb/x36 HANGUL SYLLABLE KEOLG
-+<UCEEE>     /x83/x34/xdb/x37 HANGUL SYLLABLE KEOLM
-+<UCEEF>     /x83/x34/xdb/x38 HANGUL SYLLABLE KEOLB
-+<UCEF0>     /x83/x34/xdb/x39 HANGUL SYLLABLE KEOLS
-+<UCEF1>     /x83/x34/xdc/x30 HANGUL SYLLABLE KEOLT
-+<UCEF2>     /x83/x34/xdc/x31 HANGUL SYLLABLE KEOLP
-+<UCEF3>     /x83/x34/xdc/x32 HANGUL SYLLABLE KEOLH
-+<UCEF4>     /x83/x34/xdc/x33 HANGUL SYLLABLE KEOM
-+<UCEF5>     /x83/x34/xdc/x34 HANGUL SYLLABLE KEOB
-+<UCEF6>     /x83/x34/xdc/x35 HANGUL SYLLABLE KEOBS
-+<UCEF7>     /x83/x34/xdc/x36 HANGUL SYLLABLE KEOS
-+<UCEF8>     /x83/x34/xdc/x37 HANGUL SYLLABLE KEOSS
-+<UCEF9>     /x83/x34/xdc/x38 HANGUL SYLLABLE KEONG
-+<UCEFA>     /x83/x34/xdc/x39 HANGUL SYLLABLE KEOJ
-+<UCEFB>     /x83/x34/xdd/x30 HANGUL SYLLABLE KEOC
-+<UCEFC>     /x83/x34/xdd/x31 HANGUL SYLLABLE KEOK
-+<UCEFD>     /x83/x34/xdd/x32 HANGUL SYLLABLE KEOT
-+<UCEFE>     /x83/x34/xdd/x33 HANGUL SYLLABLE KEOP
-+<UCEFF>     /x83/x34/xdd/x34 HANGUL SYLLABLE KEOH
-+<UCF00>     /x83/x34/xdd/x35 HANGUL SYLLABLE KE
-+<UCF01>     /x83/x34/xdd/x36 HANGUL SYLLABLE KEG
-+<UCF02>     /x83/x34/xdd/x37 HANGUL SYLLABLE KEGG
-+<UCF03>     /x83/x34/xdd/x38 HANGUL SYLLABLE KEGS
-+<UCF04>     /x83/x34/xdd/x39 HANGUL SYLLABLE KEN
-+<UCF05>     /x83/x34/xde/x30 HANGUL SYLLABLE KENI
-+<UCF06>     /x83/x34/xde/x31 HANGUL SYLLABLE KENH
-+<UCF07>     /x83/x34/xde/x32 HANGUL SYLLABLE KED
-+<UCF08>     /x83/x34/xde/x33 HANGUL SYLLABLE KEL
-+<UCF09>     /x83/x34/xde/x34 HANGUL SYLLABLE KELG
-+<UCF0A>     /x83/x34/xde/x35 HANGUL SYLLABLE KELM
-+<UCF0B>     /x83/x34/xde/x36 HANGUL SYLLABLE KELB
-+<UCF0C>     /x83/x34/xde/x37 HANGUL SYLLABLE KELS
-+<UCF0D>     /x83/x34/xde/x38 HANGUL SYLLABLE KELT
-+<UCF0E>     /x83/x34/xde/x39 HANGUL SYLLABLE KELP
-+<UCF0F>     /x83/x34/xdf/x30 HANGUL SYLLABLE KELH
-+<UCF10>     /x83/x34/xdf/x31 HANGUL SYLLABLE KEM
-+<UCF11>     /x83/x34/xdf/x32 HANGUL SYLLABLE KEB
-+<UCF12>     /x83/x34/xdf/x33 HANGUL SYLLABLE KEBS
-+<UCF13>     /x83/x34/xdf/x34 HANGUL SYLLABLE KES
-+<UCF14>     /x83/x34/xdf/x35 HANGUL SYLLABLE KESS
-+<UCF15>     /x83/x34/xdf/x36 HANGUL SYLLABLE KENG
-+<UCF16>     /x83/x34/xdf/x37 HANGUL SYLLABLE KEJ
-+<UCF17>     /x83/x34/xdf/x38 HANGUL SYLLABLE KEC
-+<UCF18>     /x83/x34/xdf/x39 HANGUL SYLLABLE KEK
-+<UCF19>     /x83/x34/xe0/x30 HANGUL SYLLABLE KET
-+<UCF1A>     /x83/x34/xe0/x31 HANGUL SYLLABLE KEP
-+<UCF1B>     /x83/x34/xe0/x32 HANGUL SYLLABLE KEH
-+<UCF1C>     /x83/x34/xe0/x33 HANGUL SYLLABLE KYEO
-+<UCF1D>     /x83/x34/xe0/x34 HANGUL SYLLABLE KYEOG
-+<UCF1E>     /x83/x34/xe0/x35 HANGUL SYLLABLE KYEOGG
-+<UCF1F>     /x83/x34/xe0/x36 HANGUL SYLLABLE KYEOGS
-+<UCF20>     /x83/x34/xe0/x37 HANGUL SYLLABLE KYEON
-+<UCF21>     /x83/x34/xe0/x38 HANGUL SYLLABLE KYEONI
-+<UCF22>     /x83/x34/xe0/x39 HANGUL SYLLABLE KYEONH
-+<UCF23>     /x83/x34/xe1/x30 HANGUL SYLLABLE KYEOD
-+<UCF24>     /x83/x34/xe1/x31 HANGUL SYLLABLE KYEOL
-+<UCF25>     /x83/x34/xe1/x32 HANGUL SYLLABLE KYEOLG
-+<UCF26>     /x83/x34/xe1/x33 HANGUL SYLLABLE KYEOLM
-+<UCF27>     /x83/x34/xe1/x34 HANGUL SYLLABLE KYEOLB
-+<UCF28>     /x83/x34/xe1/x35 HANGUL SYLLABLE KYEOLS
-+<UCF29>     /x83/x34/xe1/x36 HANGUL SYLLABLE KYEOLT
-+<UCF2A>     /x83/x34/xe1/x37 HANGUL SYLLABLE KYEOLP
-+<UCF2B>     /x83/x34/xe1/x38 HANGUL SYLLABLE KYEOLH
-+<UCF2C>     /x83/x34/xe1/x39 HANGUL SYLLABLE KYEOM
-+<UCF2D>     /x83/x34/xe2/x30 HANGUL SYLLABLE KYEOB
-+<UCF2E>     /x83/x34/xe2/x31 HANGUL SYLLABLE KYEOBS
-+<UCF2F>     /x83/x34/xe2/x32 HANGUL SYLLABLE KYEOS
-+<UCF30>     /x83/x34/xe2/x33 HANGUL SYLLABLE KYEOSS
-+<UCF31>     /x83/x34/xe2/x34 HANGUL SYLLABLE KYEONG
-+<UCF32>     /x83/x34/xe2/x35 HANGUL SYLLABLE KYEOJ
-+<UCF33>     /x83/x34/xe2/x36 HANGUL SYLLABLE KYEOC
-+<UCF34>     /x83/x34/xe2/x37 HANGUL SYLLABLE KYEOK
-+<UCF35>     /x83/x34/xe2/x38 HANGUL SYLLABLE KYEOT
-+<UCF36>     /x83/x34/xe2/x39 HANGUL SYLLABLE KYEOP
-+<UCF37>     /x83/x34/xe3/x30 HANGUL SYLLABLE KYEOH
-+<UCF38>     /x83/x34/xe3/x31 HANGUL SYLLABLE KYE
-+<UCF39>     /x83/x34/xe3/x32 HANGUL SYLLABLE KYEG
-+<UCF3A>     /x83/x34/xe3/x33 HANGUL SYLLABLE KYEGG
-+<UCF3B>     /x83/x34/xe3/x34 HANGUL SYLLABLE KYEGS
-+<UCF3C>     /x83/x34/xe3/x35 HANGUL SYLLABLE KYEN
-+<UCF3D>     /x83/x34/xe3/x36 HANGUL SYLLABLE KYENI
-+<UCF3E>     /x83/x34/xe3/x37 HANGUL SYLLABLE KYENH
-+<UCF3F>     /x83/x34/xe3/x38 HANGUL SYLLABLE KYED
-+<UCF40>     /x83/x34/xe3/x39 HANGUL SYLLABLE KYEL
-+<UCF41>     /x83/x34/xe4/x30 HANGUL SYLLABLE KYELG
-+<UCF42>     /x83/x34/xe4/x31 HANGUL SYLLABLE KYELM
-+<UCF43>     /x83/x34/xe4/x32 HANGUL SYLLABLE KYELB
-+<UCF44>     /x83/x34/xe4/x33 HANGUL SYLLABLE KYELS
-+<UCF45>     /x83/x34/xe4/x34 HANGUL SYLLABLE KYELT
-+<UCF46>     /x83/x34/xe4/x35 HANGUL SYLLABLE KYELP
-+<UCF47>     /x83/x34/xe4/x36 HANGUL SYLLABLE KYELH
-+<UCF48>     /x83/x34/xe4/x37 HANGUL SYLLABLE KYEM
-+<UCF49>     /x83/x34/xe4/x38 HANGUL SYLLABLE KYEB
-+<UCF4A>     /x83/x34/xe4/x39 HANGUL SYLLABLE KYEBS
-+<UCF4B>     /x83/x34/xe5/x30 HANGUL SYLLABLE KYES
-+<UCF4C>     /x83/x34/xe5/x31 HANGUL SYLLABLE KYESS
-+<UCF4D>     /x83/x34/xe5/x32 HANGUL SYLLABLE KYENG
-+<UCF4E>     /x83/x34/xe5/x33 HANGUL SYLLABLE KYEJ
-+<UCF4F>     /x83/x34/xe5/x34 HANGUL SYLLABLE KYEC
-+<UCF50>     /x83/x34/xe5/x35 HANGUL SYLLABLE KYEK
-+<UCF51>     /x83/x34/xe5/x36 HANGUL SYLLABLE KYET
-+<UCF52>     /x83/x34/xe5/x37 HANGUL SYLLABLE KYEP
-+<UCF53>     /x83/x34/xe5/x38 HANGUL SYLLABLE KYEH
-+<UCF54>     /x83/x34/xe5/x39 HANGUL SYLLABLE KO
-+<UCF55>     /x83/x34/xe6/x30 HANGUL SYLLABLE KOG
-+<UCF56>     /x83/x34/xe6/x31 HANGUL SYLLABLE KOGG
-+<UCF57>     /x83/x34/xe6/x32 HANGUL SYLLABLE KOGS
-+<UCF58>     /x83/x34/xe6/x33 HANGUL SYLLABLE KON
-+<UCF59>     /x83/x34/xe6/x34 HANGUL SYLLABLE KONI
-+<UCF5A>     /x83/x34/xe6/x35 HANGUL SYLLABLE KONH
-+<UCF5B>     /x83/x34/xe6/x36 HANGUL SYLLABLE KOD
-+<UCF5C>     /x83/x34/xe6/x37 HANGUL SYLLABLE KOL
-+<UCF5D>     /x83/x34/xe6/x38 HANGUL SYLLABLE KOLG
-+<UCF5E>     /x83/x34/xe6/x39 HANGUL SYLLABLE KOLM
-+<UCF5F>     /x83/x34/xe7/x30 HANGUL SYLLABLE KOLB
-+<UCF60>     /x83/x34/xe7/x31 HANGUL SYLLABLE KOLS
-+<UCF61>     /x83/x34/xe7/x32 HANGUL SYLLABLE KOLT
-+<UCF62>     /x83/x34/xe7/x33 HANGUL SYLLABLE KOLP
-+<UCF63>     /x83/x34/xe7/x34 HANGUL SYLLABLE KOLH
-+<UCF64>     /x83/x34/xe7/x35 HANGUL SYLLABLE KOM
-+<UCF65>     /x83/x34/xe7/x36 HANGUL SYLLABLE KOB
-+<UCF66>     /x83/x34/xe7/x37 HANGUL SYLLABLE KOBS
-+<UCF67>     /x83/x34/xe7/x38 HANGUL SYLLABLE KOS
-+<UCF68>     /x83/x34/xe7/x39 HANGUL SYLLABLE KOSS
-+<UCF69>     /x83/x34/xe8/x30 HANGUL SYLLABLE KONG
-+<UCF6A>     /x83/x34/xe8/x31 HANGUL SYLLABLE KOJ
-+<UCF6B>     /x83/x34/xe8/x32 HANGUL SYLLABLE KOC
-+<UCF6C>     /x83/x34/xe8/x33 HANGUL SYLLABLE KOK
-+<UCF6D>     /x83/x34/xe8/x34 HANGUL SYLLABLE KOT
-+<UCF6E>     /x83/x34/xe8/x35 HANGUL SYLLABLE KOP
-+<UCF6F>     /x83/x34/xe8/x36 HANGUL SYLLABLE KOH
-+<UCF70>     /x83/x34/xe8/x37 HANGUL SYLLABLE KWA
-+<UCF71>     /x83/x34/xe8/x38 HANGUL SYLLABLE KWAG
-+<UCF72>     /x83/x34/xe8/x39 HANGUL SYLLABLE KWAGG
-+<UCF73>     /x83/x34/xe9/x30 HANGUL SYLLABLE KWAGS
-+<UCF74>     /x83/x34/xe9/x31 HANGUL SYLLABLE KWAN
-+<UCF75>     /x83/x34/xe9/x32 HANGUL SYLLABLE KWANI
-+<UCF76>     /x83/x34/xe9/x33 HANGUL SYLLABLE KWANH
-+<UCF77>     /x83/x34/xe9/x34 HANGUL SYLLABLE KWAD
-+<UCF78>     /x83/x34/xe9/x35 HANGUL SYLLABLE KWAL
-+<UCF79>     /x83/x34/xe9/x36 HANGUL SYLLABLE KWALG
-+<UCF7A>     /x83/x34/xe9/x37 HANGUL SYLLABLE KWALM
-+<UCF7B>     /x83/x34/xe9/x38 HANGUL SYLLABLE KWALB
-+<UCF7C>     /x83/x34/xe9/x39 HANGUL SYLLABLE KWALS
-+<UCF7D>     /x83/x34/xea/x30 HANGUL SYLLABLE KWALT
-+<UCF7E>     /x83/x34/xea/x31 HANGUL SYLLABLE KWALP
-+<UCF7F>     /x83/x34/xea/x32 HANGUL SYLLABLE KWALH
-+<UCF80>     /x83/x34/xea/x33 HANGUL SYLLABLE KWAM
-+<UCF81>     /x83/x34/xea/x34 HANGUL SYLLABLE KWAB
-+<UCF82>     /x83/x34/xea/x35 HANGUL SYLLABLE KWABS
-+<UCF83>     /x83/x34/xea/x36 HANGUL SYLLABLE KWAS
-+<UCF84>     /x83/x34/xea/x37 HANGUL SYLLABLE KWASS
-+<UCF85>     /x83/x34/xea/x38 HANGUL SYLLABLE KWANG
-+<UCF86>     /x83/x34/xea/x39 HANGUL SYLLABLE KWAJ
-+<UCF87>     /x83/x34/xeb/x30 HANGUL SYLLABLE KWAC
-+<UCF88>     /x83/x34/xeb/x31 HANGUL SYLLABLE KWAK
-+<UCF89>     /x83/x34/xeb/x32 HANGUL SYLLABLE KWAT
-+<UCF8A>     /x83/x34/xeb/x33 HANGUL SYLLABLE KWAP
-+<UCF8B>     /x83/x34/xeb/x34 HANGUL SYLLABLE KWAH
-+<UCF8C>     /x83/x34/xeb/x35 HANGUL SYLLABLE KWAE
-+<UCF8D>     /x83/x34/xeb/x36 HANGUL SYLLABLE KWAEG
-+<UCF8E>     /x83/x34/xeb/x37 HANGUL SYLLABLE KWAEGG
-+<UCF8F>     /x83/x34/xeb/x38 HANGUL SYLLABLE KWAEGS
-+<UCF90>     /x83/x34/xeb/x39 HANGUL SYLLABLE KWAEN
-+<UCF91>     /x83/x34/xec/x30 HANGUL SYLLABLE KWAENI
-+<UCF92>     /x83/x34/xec/x31 HANGUL SYLLABLE KWAENH
-+<UCF93>     /x83/x34/xec/x32 HANGUL SYLLABLE KWAED
-+<UCF94>     /x83/x34/xec/x33 HANGUL SYLLABLE KWAEL
-+<UCF95>     /x83/x34/xec/x34 HANGUL SYLLABLE KWAELG
-+<UCF96>     /x83/x34/xec/x35 HANGUL SYLLABLE KWAELM
-+<UCF97>     /x83/x34/xec/x36 HANGUL SYLLABLE KWAELB
-+<UCF98>     /x83/x34/xec/x37 HANGUL SYLLABLE KWAELS
-+<UCF99>     /x83/x34/xec/x38 HANGUL SYLLABLE KWAELT
-+<UCF9A>     /x83/x34/xec/x39 HANGUL SYLLABLE KWAELP
-+<UCF9B>     /x83/x34/xed/x30 HANGUL SYLLABLE KWAELH
-+<UCF9C>     /x83/x34/xed/x31 HANGUL SYLLABLE KWAEM
-+<UCF9D>     /x83/x34/xed/x32 HANGUL SYLLABLE KWAEB
-+<UCF9E>     /x83/x34/xed/x33 HANGUL SYLLABLE KWAEBS
-+<UCF9F>     /x83/x34/xed/x34 HANGUL SYLLABLE KWAES
-+<UCFA0>     /x83/x34/xed/x35 HANGUL SYLLABLE KWAESS
-+<UCFA1>     /x83/x34/xed/x36 HANGUL SYLLABLE KWAENG
-+<UCFA2>     /x83/x34/xed/x37 HANGUL SYLLABLE KWAEJ
-+<UCFA3>     /x83/x34/xed/x38 HANGUL SYLLABLE KWAEC
-+<UCFA4>     /x83/x34/xed/x39 HANGUL SYLLABLE KWAEK
-+<UCFA5>     /x83/x34/xee/x30 HANGUL SYLLABLE KWAET
-+<UCFA6>     /x83/x34/xee/x31 HANGUL SYLLABLE KWAEP
-+<UCFA7>     /x83/x34/xee/x32 HANGUL SYLLABLE KWAEH
-+<UCFA8>     /x83/x34/xee/x33 HANGUL SYLLABLE KOE
-+<UCFA9>     /x83/x34/xee/x34 HANGUL SYLLABLE KOEG
-+<UCFAA>     /x83/x34/xee/x35 HANGUL SYLLABLE KOEGG
-+<UCFAB>     /x83/x34/xee/x36 HANGUL SYLLABLE KOEGS
-+<UCFAC>     /x83/x34/xee/x37 HANGUL SYLLABLE KOEN
-+<UCFAD>     /x83/x34/xee/x38 HANGUL SYLLABLE KOENI
-+<UCFAE>     /x83/x34/xee/x39 HANGUL SYLLABLE KOENH
-+<UCFAF>     /x83/x34/xef/x30 HANGUL SYLLABLE KOED
-+<UCFB0>     /x83/x34/xef/x31 HANGUL SYLLABLE KOEL
-+<UCFB1>     /x83/x34/xef/x32 HANGUL SYLLABLE KOELG
-+<UCFB2>     /x83/x34/xef/x33 HANGUL SYLLABLE KOELM
-+<UCFB3>     /x83/x34/xef/x34 HANGUL SYLLABLE KOELB
-+<UCFB4>     /x83/x34/xef/x35 HANGUL SYLLABLE KOELS
-+<UCFB5>     /x83/x34/xef/x36 HANGUL SYLLABLE KOELT
-+<UCFB6>     /x83/x34/xef/x37 HANGUL SYLLABLE KOELP
-+<UCFB7>     /x83/x34/xef/x38 HANGUL SYLLABLE KOELH
-+<UCFB8>     /x83/x34/xef/x39 HANGUL SYLLABLE KOEM
-+<UCFB9>     /x83/x34/xf0/x30 HANGUL SYLLABLE KOEB
-+<UCFBA>     /x83/x34/xf0/x31 HANGUL SYLLABLE KOEBS
-+<UCFBB>     /x83/x34/xf0/x32 HANGUL SYLLABLE KOES
-+<UCFBC>     /x83/x34/xf0/x33 HANGUL SYLLABLE KOESS
-+<UCFBD>     /x83/x34/xf0/x34 HANGUL SYLLABLE KOENG
-+<UCFBE>     /x83/x34/xf0/x35 HANGUL SYLLABLE KOEJ
-+<UCFBF>     /x83/x34/xf0/x36 HANGUL SYLLABLE KOEC
-+<UCFC0>     /x83/x34/xf0/x37 HANGUL SYLLABLE KOEK
-+<UCFC1>     /x83/x34/xf0/x38 HANGUL SYLLABLE KOET
-+<UCFC2>     /x83/x34/xf0/x39 HANGUL SYLLABLE KOEP
-+<UCFC3>     /x83/x34/xf1/x30 HANGUL SYLLABLE KOEH
-+<UCFC4>     /x83/x34/xf1/x31 HANGUL SYLLABLE KYO
-+<UCFC5>     /x83/x34/xf1/x32 HANGUL SYLLABLE KYOG
-+<UCFC6>     /x83/x34/xf1/x33 HANGUL SYLLABLE KYOGG
-+<UCFC7>     /x83/x34/xf1/x34 HANGUL SYLLABLE KYOGS
-+<UCFC8>     /x83/x34/xf1/x35 HANGUL SYLLABLE KYON
-+<UCFC9>     /x83/x34/xf1/x36 HANGUL SYLLABLE KYONI
-+<UCFCA>     /x83/x34/xf1/x37 HANGUL SYLLABLE KYONH
-+<UCFCB>     /x83/x34/xf1/x38 HANGUL SYLLABLE KYOD
-+<UCFCC>     /x83/x34/xf1/x39 HANGUL SYLLABLE KYOL
-+<UCFCD>     /x83/x34/xf2/x30 HANGUL SYLLABLE KYOLG
-+<UCFCE>     /x83/x34/xf2/x31 HANGUL SYLLABLE KYOLM
-+<UCFCF>     /x83/x34/xf2/x32 HANGUL SYLLABLE KYOLB
-+<UCFD0>     /x83/x34/xf2/x33 HANGUL SYLLABLE KYOLS
-+<UCFD1>     /x83/x34/xf2/x34 HANGUL SYLLABLE KYOLT
-+<UCFD2>     /x83/x34/xf2/x35 HANGUL SYLLABLE KYOLP
-+<UCFD3>     /x83/x34/xf2/x36 HANGUL SYLLABLE KYOLH
-+<UCFD4>     /x83/x34/xf2/x37 HANGUL SYLLABLE KYOM
-+<UCFD5>     /x83/x34/xf2/x38 HANGUL SYLLABLE KYOB
-+<UCFD6>     /x83/x34/xf2/x39 HANGUL SYLLABLE KYOBS
-+<UCFD7>     /x83/x34/xf3/x30 HANGUL SYLLABLE KYOS
-+<UCFD8>     /x83/x34/xf3/x31 HANGUL SYLLABLE KYOSS
-+<UCFD9>     /x83/x34/xf3/x32 HANGUL SYLLABLE KYONG
-+<UCFDA>     /x83/x34/xf3/x33 HANGUL SYLLABLE KYOJ
-+<UCFDB>     /x83/x34/xf3/x34 HANGUL SYLLABLE KYOC
-+<UCFDC>     /x83/x34/xf3/x35 HANGUL SYLLABLE KYOK
-+<UCFDD>     /x83/x34/xf3/x36 HANGUL SYLLABLE KYOT
-+<UCFDE>     /x83/x34/xf3/x37 HANGUL SYLLABLE KYOP
-+<UCFDF>     /x83/x34/xf3/x38 HANGUL SYLLABLE KYOH
-+<UCFE0>     /x83/x34/xf3/x39 HANGUL SYLLABLE KU
-+<UCFE1>     /x83/x34/xf4/x30 HANGUL SYLLABLE KUG
-+<UCFE2>     /x83/x34/xf4/x31 HANGUL SYLLABLE KUGG
-+<UCFE3>     /x83/x34/xf4/x32 HANGUL SYLLABLE KUGS
-+<UCFE4>     /x83/x34/xf4/x33 HANGUL SYLLABLE KUN
-+<UCFE5>     /x83/x34/xf4/x34 HANGUL SYLLABLE KUNI
-+<UCFE6>     /x83/x34/xf4/x35 HANGUL SYLLABLE KUNH
-+<UCFE7>     /x83/x34/xf4/x36 HANGUL SYLLABLE KUD
-+<UCFE8>     /x83/x34/xf4/x37 HANGUL SYLLABLE KUL
-+<UCFE9>     /x83/x34/xf4/x38 HANGUL SYLLABLE KULG
-+<UCFEA>     /x83/x34/xf4/x39 HANGUL SYLLABLE KULM
-+<UCFEB>     /x83/x34/xf5/x30 HANGUL SYLLABLE KULB
-+<UCFEC>     /x83/x34/xf5/x31 HANGUL SYLLABLE KULS
-+<UCFED>     /x83/x34/xf5/x32 HANGUL SYLLABLE KULT
-+<UCFEE>     /x83/x34/xf5/x33 HANGUL SYLLABLE KULP
-+<UCFEF>     /x83/x34/xf5/x34 HANGUL SYLLABLE KULH
-+<UCFF0>     /x83/x34/xf5/x35 HANGUL SYLLABLE KUM
-+<UCFF1>     /x83/x34/xf5/x36 HANGUL SYLLABLE KUB
-+<UCFF2>     /x83/x34/xf5/x37 HANGUL SYLLABLE KUBS
-+<UCFF3>     /x83/x34/xf5/x38 HANGUL SYLLABLE KUS
-+<UCFF4>     /x83/x34/xf5/x39 HANGUL SYLLABLE KUSS
-+<UCFF5>     /x83/x34/xf6/x30 HANGUL SYLLABLE KUNG
-+<UCFF6>     /x83/x34/xf6/x31 HANGUL SYLLABLE KUJ
-+<UCFF7>     /x83/x34/xf6/x32 HANGUL SYLLABLE KUC
-+<UCFF8>     /x83/x34/xf6/x33 HANGUL SYLLABLE KUK
-+<UCFF9>     /x83/x34/xf6/x34 HANGUL SYLLABLE KUT
-+<UCFFA>     /x83/x34/xf6/x35 HANGUL SYLLABLE KUP
-+<UCFFB>     /x83/x34/xf6/x36 HANGUL SYLLABLE KUH
-+<UCFFC>     /x83/x34/xf6/x37 HANGUL SYLLABLE KWEO
-+<UCFFD>     /x83/x34/xf6/x38 HANGUL SYLLABLE KWEOG
-+<UCFFE>     /x83/x34/xf6/x39 HANGUL SYLLABLE KWEOGG
-+<UCFFF>     /x83/x34/xf7/x30 HANGUL SYLLABLE KWEOGS
-+<UD000>     /x83/x34/xf7/x31 HANGUL SYLLABLE KWEON
-+<UD001>     /x83/x34/xf7/x32 HANGUL SYLLABLE KWEONI
-+<UD002>     /x83/x34/xf7/x33 HANGUL SYLLABLE KWEONH
-+<UD003>     /x83/x34/xf7/x34 HANGUL SYLLABLE KWEOD
-+<UD004>     /x83/x34/xf7/x35 HANGUL SYLLABLE KWEOL
-+<UD005>     /x83/x34/xf7/x36 HANGUL SYLLABLE KWEOLG
-+<UD006>     /x83/x34/xf7/x37 HANGUL SYLLABLE KWEOLM
-+<UD007>     /x83/x34/xf7/x38 HANGUL SYLLABLE KWEOLB
-+<UD008>     /x83/x34/xf7/x39 HANGUL SYLLABLE KWEOLS
-+<UD009>     /x83/x34/xf8/x30 HANGUL SYLLABLE KWEOLT
-+<UD00A>     /x83/x34/xf8/x31 HANGUL SYLLABLE KWEOLP
-+<UD00B>     /x83/x34/xf8/x32 HANGUL SYLLABLE KWEOLH
-+<UD00C>     /x83/x34/xf8/x33 HANGUL SYLLABLE KWEOM
-+<UD00D>     /x83/x34/xf8/x34 HANGUL SYLLABLE KWEOB
-+<UD00E>     /x83/x34/xf8/x35 HANGUL SYLLABLE KWEOBS
-+<UD00F>     /x83/x34/xf8/x36 HANGUL SYLLABLE KWEOS
-+<UD010>     /x83/x34/xf8/x37 HANGUL SYLLABLE KWEOSS
-+<UD011>     /x83/x34/xf8/x38 HANGUL SYLLABLE KWEONG
-+<UD012>     /x83/x34/xf8/x39 HANGUL SYLLABLE KWEOJ
-+<UD013>     /x83/x34/xf9/x30 HANGUL SYLLABLE KWEOC
-+<UD014>     /x83/x34/xf9/x31 HANGUL SYLLABLE KWEOK
-+<UD015>     /x83/x34/xf9/x32 HANGUL SYLLABLE KWEOT
-+<UD016>     /x83/x34/xf9/x33 HANGUL SYLLABLE KWEOP
-+<UD017>     /x83/x34/xf9/x34 HANGUL SYLLABLE KWEOH
-+<UD018>     /x83/x34/xf9/x35 HANGUL SYLLABLE KWE
-+<UD019>     /x83/x34/xf9/x36 HANGUL SYLLABLE KWEG
-+<UD01A>     /x83/x34/xf9/x37 HANGUL SYLLABLE KWEGG
-+<UD01B>     /x83/x34/xf9/x38 HANGUL SYLLABLE KWEGS
-+<UD01C>     /x83/x34/xf9/x39 HANGUL SYLLABLE KWEN
-+<UD01D>     /x83/x34/xfa/x30 HANGUL SYLLABLE KWENI
-+<UD01E>     /x83/x34/xfa/x31 HANGUL SYLLABLE KWENH
-+<UD01F>     /x83/x34/xfa/x32 HANGUL SYLLABLE KWED
-+<UD020>     /x83/x34/xfa/x33 HANGUL SYLLABLE KWEL
-+<UD021>     /x83/x34/xfa/x34 HANGUL SYLLABLE KWELG
-+<UD022>     /x83/x34/xfa/x35 HANGUL SYLLABLE KWELM
-+<UD023>     /x83/x34/xfa/x36 HANGUL SYLLABLE KWELB
-+<UD024>     /x83/x34/xfa/x37 HANGUL SYLLABLE KWELS
-+<UD025>     /x83/x34/xfa/x38 HANGUL SYLLABLE KWELT
-+<UD026>     /x83/x34/xfa/x39 HANGUL SYLLABLE KWELP
-+<UD027>     /x83/x34/xfb/x30 HANGUL SYLLABLE KWELH
-+<UD028>     /x83/x34/xfb/x31 HANGUL SYLLABLE KWEM
-+<UD029>     /x83/x34/xfb/x32 HANGUL SYLLABLE KWEB
-+<UD02A>     /x83/x34/xfb/x33 HANGUL SYLLABLE KWEBS
-+<UD02B>     /x83/x34/xfb/x34 HANGUL SYLLABLE KWES
-+<UD02C>     /x83/x34/xfb/x35 HANGUL SYLLABLE KWESS
-+<UD02D>     /x83/x34/xfb/x36 HANGUL SYLLABLE KWENG
-+<UD02E>     /x83/x34/xfb/x37 HANGUL SYLLABLE KWEJ
-+<UD02F>     /x83/x34/xfb/x38 HANGUL SYLLABLE KWEC
-+<UD030>     /x83/x34/xfb/x39 HANGUL SYLLABLE KWEK
-+<UD031>     /x83/x34/xfc/x30 HANGUL SYLLABLE KWET
-+<UD032>     /x83/x34/xfc/x31 HANGUL SYLLABLE KWEP
-+<UD033>     /x83/x34/xfc/x32 HANGUL SYLLABLE KWEH
-+<UD034>     /x83/x34/xfc/x33 HANGUL SYLLABLE KWI
-+<UD035>     /x83/x34/xfc/x34 HANGUL SYLLABLE KWIG
-+<UD036>     /x83/x34/xfc/x35 HANGUL SYLLABLE KWIGG
-+<UD037>     /x83/x34/xfc/x36 HANGUL SYLLABLE KWIGS
-+<UD038>     /x83/x34/xfc/x37 HANGUL SYLLABLE KWIN
-+<UD039>     /x83/x34/xfc/x38 HANGUL SYLLABLE KWINI
-+<UD03A>     /x83/x34/xfc/x39 HANGUL SYLLABLE KWINH
-+<UD03B>     /x83/x34/xfd/x30 HANGUL SYLLABLE KWID
-+<UD03C>     /x83/x34/xfd/x31 HANGUL SYLLABLE KWIL
-+<UD03D>     /x83/x34/xfd/x32 HANGUL SYLLABLE KWILG
-+<UD03E>     /x83/x34/xfd/x33 HANGUL SYLLABLE KWILM
-+<UD03F>     /x83/x34/xfd/x34 HANGUL SYLLABLE KWILB
-+<UD040>     /x83/x34/xfd/x35 HANGUL SYLLABLE KWILS
-+<UD041>     /x83/x34/xfd/x36 HANGUL SYLLABLE KWILT
-+<UD042>     /x83/x34/xfd/x37 HANGUL SYLLABLE KWILP
-+<UD043>     /x83/x34/xfd/x38 HANGUL SYLLABLE KWILH
-+<UD044>     /x83/x34/xfd/x39 HANGUL SYLLABLE KWIM
-+<UD045>     /x83/x34/xfe/x30 HANGUL SYLLABLE KWIB
-+<UD046>     /x83/x34/xfe/x31 HANGUL SYLLABLE KWIBS
-+<UD047>     /x83/x34/xfe/x32 HANGUL SYLLABLE KWIS
-+<UD048>     /x83/x34/xfe/x33 HANGUL SYLLABLE KWISS
-+<UD049>     /x83/x34/xfe/x34 HANGUL SYLLABLE KWING
-+<UD04A>     /x83/x34/xfe/x35 HANGUL SYLLABLE KWIJ
-+<UD04B>     /x83/x34/xfe/x36 HANGUL SYLLABLE KWIC
-+<UD04C>     /x83/x34/xfe/x37 HANGUL SYLLABLE KWIK
-+<UD04D>     /x83/x34/xfe/x38 HANGUL SYLLABLE KWIT
-+<UD04E>     /x83/x34/xfe/x39 HANGUL SYLLABLE KWIP
-+<UD04F>     /x83/x35/x81/x30 HANGUL SYLLABLE KWIH
-+<UD050>     /x83/x35/x81/x31 HANGUL SYLLABLE KYU
-+<UD051>     /x83/x35/x81/x32 HANGUL SYLLABLE KYUG
-+<UD052>     /x83/x35/x81/x33 HANGUL SYLLABLE KYUGG
-+<UD053>     /x83/x35/x81/x34 HANGUL SYLLABLE KYUGS
-+<UD054>     /x83/x35/x81/x35 HANGUL SYLLABLE KYUN
-+<UD055>     /x83/x35/x81/x36 HANGUL SYLLABLE KYUNI
-+<UD056>     /x83/x35/x81/x37 HANGUL SYLLABLE KYUNH
-+<UD057>     /x83/x35/x81/x38 HANGUL SYLLABLE KYUD
-+<UD058>     /x83/x35/x81/x39 HANGUL SYLLABLE KYUL
-+<UD059>     /x83/x35/x82/x30 HANGUL SYLLABLE KYULG
-+<UD05A>     /x83/x35/x82/x31 HANGUL SYLLABLE KYULM
-+<UD05B>     /x83/x35/x82/x32 HANGUL SYLLABLE KYULB
-+<UD05C>     /x83/x35/x82/x33 HANGUL SYLLABLE KYULS
-+<UD05D>     /x83/x35/x82/x34 HANGUL SYLLABLE KYULT
-+<UD05E>     /x83/x35/x82/x35 HANGUL SYLLABLE KYULP
-+<UD05F>     /x83/x35/x82/x36 HANGUL SYLLABLE KYULH
-+<UD060>     /x83/x35/x82/x37 HANGUL SYLLABLE KYUM
-+<UD061>     /x83/x35/x82/x38 HANGUL SYLLABLE KYUB
-+<UD062>     /x83/x35/x82/x39 HANGUL SYLLABLE KYUBS
-+<UD063>     /x83/x35/x83/x30 HANGUL SYLLABLE KYUS
-+<UD064>     /x83/x35/x83/x31 HANGUL SYLLABLE KYUSS
-+<UD065>     /x83/x35/x83/x32 HANGUL SYLLABLE KYUNG
-+<UD066>     /x83/x35/x83/x33 HANGUL SYLLABLE KYUJ
-+<UD067>     /x83/x35/x83/x34 HANGUL SYLLABLE KYUC
-+<UD068>     /x83/x35/x83/x35 HANGUL SYLLABLE KYUK
-+<UD069>     /x83/x35/x83/x36 HANGUL SYLLABLE KYUT
-+<UD06A>     /x83/x35/x83/x37 HANGUL SYLLABLE KYUP
-+<UD06B>     /x83/x35/x83/x38 HANGUL SYLLABLE KYUH
-+<UD06C>     /x83/x35/x83/x39 HANGUL SYLLABLE KEU
-+<UD06D>     /x83/x35/x84/x30 HANGUL SYLLABLE KEUG
-+<UD06E>     /x83/x35/x84/x31 HANGUL SYLLABLE KEUGG
-+<UD06F>     /x83/x35/x84/x32 HANGUL SYLLABLE KEUGS
-+<UD070>     /x83/x35/x84/x33 HANGUL SYLLABLE KEUN
-+<UD071>     /x83/x35/x84/x34 HANGUL SYLLABLE KEUNI
-+<UD072>     /x83/x35/x84/x35 HANGUL SYLLABLE KEUNH
-+<UD073>     /x83/x35/x84/x36 HANGUL SYLLABLE KEUD
-+<UD074>     /x83/x35/x84/x37 HANGUL SYLLABLE KEUL
-+<UD075>     /x83/x35/x84/x38 HANGUL SYLLABLE KEULG
-+<UD076>     /x83/x35/x84/x39 HANGUL SYLLABLE KEULM
-+<UD077>     /x83/x35/x85/x30 HANGUL SYLLABLE KEULB
-+<UD078>     /x83/x35/x85/x31 HANGUL SYLLABLE KEULS
-+<UD079>     /x83/x35/x85/x32 HANGUL SYLLABLE KEULT
-+<UD07A>     /x83/x35/x85/x33 HANGUL SYLLABLE KEULP
-+<UD07B>     /x83/x35/x85/x34 HANGUL SYLLABLE KEULH
-+<UD07C>     /x83/x35/x85/x35 HANGUL SYLLABLE KEUM
-+<UD07D>     /x83/x35/x85/x36 HANGUL SYLLABLE KEUB
-+<UD07E>     /x83/x35/x85/x37 HANGUL SYLLABLE KEUBS
-+<UD07F>     /x83/x35/x85/x38 HANGUL SYLLABLE KEUS
-+<UD080>     /x83/x35/x85/x39 HANGUL SYLLABLE KEUSS
-+<UD081>     /x83/x35/x86/x30 HANGUL SYLLABLE KEUNG
-+<UD082>     /x83/x35/x86/x31 HANGUL SYLLABLE KEUJ
-+<UD083>     /x83/x35/x86/x32 HANGUL SYLLABLE KEUC
-+<UD084>     /x83/x35/x86/x33 HANGUL SYLLABLE KEUK
-+<UD085>     /x83/x35/x86/x34 HANGUL SYLLABLE KEUT
-+<UD086>     /x83/x35/x86/x35 HANGUL SYLLABLE KEUP
-+<UD087>     /x83/x35/x86/x36 HANGUL SYLLABLE KEUH
-+<UD088>     /x83/x35/x86/x37 HANGUL SYLLABLE KYI
-+<UD089>     /x83/x35/x86/x38 HANGUL SYLLABLE KYIG
-+<UD08A>     /x83/x35/x86/x39 HANGUL SYLLABLE KYIGG
-+<UD08B>     /x83/x35/x87/x30 HANGUL SYLLABLE KYIGS
-+<UD08C>     /x83/x35/x87/x31 HANGUL SYLLABLE KYIN
-+<UD08D>     /x83/x35/x87/x32 HANGUL SYLLABLE KYINI
-+<UD08E>     /x83/x35/x87/x33 HANGUL SYLLABLE KYINH
-+<UD08F>     /x83/x35/x87/x34 HANGUL SYLLABLE KYID
-+<UD090>     /x83/x35/x87/x35 HANGUL SYLLABLE KYIL
-+<UD091>     /x83/x35/x87/x36 HANGUL SYLLABLE KYILG
-+<UD092>     /x83/x35/x87/x37 HANGUL SYLLABLE KYILM
-+<UD093>     /x83/x35/x87/x38 HANGUL SYLLABLE KYILB
-+<UD094>     /x83/x35/x87/x39 HANGUL SYLLABLE KYILS
-+<UD095>     /x83/x35/x88/x30 HANGUL SYLLABLE KYILT
-+<UD096>     /x83/x35/x88/x31 HANGUL SYLLABLE KYILP
-+<UD097>     /x83/x35/x88/x32 HANGUL SYLLABLE KYILH
-+<UD098>     /x83/x35/x88/x33 HANGUL SYLLABLE KYIM
-+<UD099>     /x83/x35/x88/x34 HANGUL SYLLABLE KYIB
-+<UD09A>     /x83/x35/x88/x35 HANGUL SYLLABLE KYIBS
-+<UD09B>     /x83/x35/x88/x36 HANGUL SYLLABLE KYIS
-+<UD09C>     /x83/x35/x88/x37 HANGUL SYLLABLE KYISS
-+<UD09D>     /x83/x35/x88/x38 HANGUL SYLLABLE KYING
-+<UD09E>     /x83/x35/x88/x39 HANGUL SYLLABLE KYIJ
-+<UD09F>     /x83/x35/x89/x30 HANGUL SYLLABLE KYIC
-+<UD0A0>     /x83/x35/x89/x31 HANGUL SYLLABLE KYIK
-+<UD0A1>     /x83/x35/x89/x32 HANGUL SYLLABLE KYIT
-+<UD0A2>     /x83/x35/x89/x33 HANGUL SYLLABLE KYIP
-+<UD0A3>     /x83/x35/x89/x34 HANGUL SYLLABLE KYIH
-+<UD0A4>     /x83/x35/x89/x35 HANGUL SYLLABLE KI
-+<UD0A5>     /x83/x35/x89/x36 HANGUL SYLLABLE KIG
-+<UD0A6>     /x83/x35/x89/x37 HANGUL SYLLABLE KIGG
-+<UD0A7>     /x83/x35/x89/x38 HANGUL SYLLABLE KIGS
-+<UD0A8>     /x83/x35/x89/x39 HANGUL SYLLABLE KIN
-+<UD0A9>     /x83/x35/x8a/x30 HANGUL SYLLABLE KINI
-+<UD0AA>     /x83/x35/x8a/x31 HANGUL SYLLABLE KINH
-+<UD0AB>     /x83/x35/x8a/x32 HANGUL SYLLABLE KID
-+<UD0AC>     /x83/x35/x8a/x33 HANGUL SYLLABLE KIL
-+<UD0AD>     /x83/x35/x8a/x34 HANGUL SYLLABLE KILG
-+<UD0AE>     /x83/x35/x8a/x35 HANGUL SYLLABLE KILM
-+<UD0AF>     /x83/x35/x8a/x36 HANGUL SYLLABLE KILB
-+<UD0B0>     /x83/x35/x8a/x37 HANGUL SYLLABLE KILS
-+<UD0B1>     /x83/x35/x8a/x38 HANGUL SYLLABLE KILT
-+<UD0B2>     /x83/x35/x8a/x39 HANGUL SYLLABLE KILP
-+<UD0B3>     /x83/x35/x8b/x30 HANGUL SYLLABLE KILH
-+<UD0B4>     /x83/x35/x8b/x31 HANGUL SYLLABLE KIM
-+<UD0B5>     /x83/x35/x8b/x32 HANGUL SYLLABLE KIB
-+<UD0B6>     /x83/x35/x8b/x33 HANGUL SYLLABLE KIBS
-+<UD0B7>     /x83/x35/x8b/x34 HANGUL SYLLABLE KIS
-+<UD0B8>     /x83/x35/x8b/x35 HANGUL SYLLABLE KISS
-+<UD0B9>     /x83/x35/x8b/x36 HANGUL SYLLABLE KING
-+<UD0BA>     /x83/x35/x8b/x37 HANGUL SYLLABLE KIJ
-+<UD0BB>     /x83/x35/x8b/x38 HANGUL SYLLABLE KIC
-+<UD0BC>     /x83/x35/x8b/x39 HANGUL SYLLABLE KIK
-+<UD0BD>     /x83/x35/x8c/x30 HANGUL SYLLABLE KIT
-+<UD0BE>     /x83/x35/x8c/x31 HANGUL SYLLABLE KIP
-+<UD0BF>     /x83/x35/x8c/x32 HANGUL SYLLABLE KIH
-+<UD0C0>     /x83/x35/x8c/x33 HANGUL SYLLABLE TA
-+<UD0C1>     /x83/x35/x8c/x34 HANGUL SYLLABLE TAG
-+<UD0C2>     /x83/x35/x8c/x35 HANGUL SYLLABLE TAGG
-+<UD0C3>     /x83/x35/x8c/x36 HANGUL SYLLABLE TAGS
-+<UD0C4>     /x83/x35/x8c/x37 HANGUL SYLLABLE TAN
-+<UD0C5>     /x83/x35/x8c/x38 HANGUL SYLLABLE TANI
-+<UD0C6>     /x83/x35/x8c/x39 HANGUL SYLLABLE TANH
-+<UD0C7>     /x83/x35/x8d/x30 HANGUL SYLLABLE TAD
-+<UD0C8>     /x83/x35/x8d/x31 HANGUL SYLLABLE TAL
-+<UD0C9>     /x83/x35/x8d/x32 HANGUL SYLLABLE TALG
-+<UD0CA>     /x83/x35/x8d/x33 HANGUL SYLLABLE TALM
-+<UD0CB>     /x83/x35/x8d/x34 HANGUL SYLLABLE TALB
-+<UD0CC>     /x83/x35/x8d/x35 HANGUL SYLLABLE TALS
-+<UD0CD>     /x83/x35/x8d/x36 HANGUL SYLLABLE TALT
-+<UD0CE>     /x83/x35/x8d/x37 HANGUL SYLLABLE TALP
-+<UD0CF>     /x83/x35/x8d/x38 HANGUL SYLLABLE TALH
-+<UD0D0>     /x83/x35/x8d/x39 HANGUL SYLLABLE TAM
-+<UD0D1>     /x83/x35/x8e/x30 HANGUL SYLLABLE TAB
-+<UD0D2>     /x83/x35/x8e/x31 HANGUL SYLLABLE TABS
-+<UD0D3>     /x83/x35/x8e/x32 HANGUL SYLLABLE TAS
-+<UD0D4>     /x83/x35/x8e/x33 HANGUL SYLLABLE TASS
-+<UD0D5>     /x83/x35/x8e/x34 HANGUL SYLLABLE TANG
-+<UD0D6>     /x83/x35/x8e/x35 HANGUL SYLLABLE TAJ
-+<UD0D7>     /x83/x35/x8e/x36 HANGUL SYLLABLE TAC
-+<UD0D8>     /x83/x35/x8e/x37 HANGUL SYLLABLE TAK
-+<UD0D9>     /x83/x35/x8e/x38 HANGUL SYLLABLE TAT
-+<UD0DA>     /x83/x35/x8e/x39 HANGUL SYLLABLE TAP
-+<UD0DB>     /x83/x35/x8f/x30 HANGUL SYLLABLE TAH
-+<UD0DC>     /x83/x35/x8f/x31 HANGUL SYLLABLE TAE
-+<UD0DD>     /x83/x35/x8f/x32 HANGUL SYLLABLE TAEG
-+<UD0DE>     /x83/x35/x8f/x33 HANGUL SYLLABLE TAEGG
-+<UD0DF>     /x83/x35/x8f/x34 HANGUL SYLLABLE TAEGS
-+<UD0E0>     /x83/x35/x8f/x35 HANGUL SYLLABLE TAEN
-+<UD0E1>     /x83/x35/x8f/x36 HANGUL SYLLABLE TAENI
-+<UD0E2>     /x83/x35/x8f/x37 HANGUL SYLLABLE TAENH
-+<UD0E3>     /x83/x35/x8f/x38 HANGUL SYLLABLE TAED
-+<UD0E4>     /x83/x35/x8f/x39 HANGUL SYLLABLE TAEL
-+<UD0E5>     /x83/x35/x90/x30 HANGUL SYLLABLE TAELG
-+<UD0E6>     /x83/x35/x90/x31 HANGUL SYLLABLE TAELM
-+<UD0E7>     /x83/x35/x90/x32 HANGUL SYLLABLE TAELB
-+<UD0E8>     /x83/x35/x90/x33 HANGUL SYLLABLE TAELS
-+<UD0E9>     /x83/x35/x90/x34 HANGUL SYLLABLE TAELT
-+<UD0EA>     /x83/x35/x90/x35 HANGUL SYLLABLE TAELP
-+<UD0EB>     /x83/x35/x90/x36 HANGUL SYLLABLE TAELH
-+<UD0EC>     /x83/x35/x90/x37 HANGUL SYLLABLE TAEM
-+<UD0ED>     /x83/x35/x90/x38 HANGUL SYLLABLE TAEB
-+<UD0EE>     /x83/x35/x90/x39 HANGUL SYLLABLE TAEBS
-+<UD0EF>     /x83/x35/x91/x30 HANGUL SYLLABLE TAES
-+<UD0F0>     /x83/x35/x91/x31 HANGUL SYLLABLE TAESS
-+<UD0F1>     /x83/x35/x91/x32 HANGUL SYLLABLE TAENG
-+<UD0F2>     /x83/x35/x91/x33 HANGUL SYLLABLE TAEJ
-+<UD0F3>     /x83/x35/x91/x34 HANGUL SYLLABLE TAEC
-+<UD0F4>     /x83/x35/x91/x35 HANGUL SYLLABLE TAEK
-+<UD0F5>     /x83/x35/x91/x36 HANGUL SYLLABLE TAET
-+<UD0F6>     /x83/x35/x91/x37 HANGUL SYLLABLE TAEP
-+<UD0F7>     /x83/x35/x91/x38 HANGUL SYLLABLE TAEH
-+<UD0F8>     /x83/x35/x91/x39 HANGUL SYLLABLE TYA
-+<UD0F9>     /x83/x35/x92/x30 HANGUL SYLLABLE TYAG
-+<UD0FA>     /x83/x35/x92/x31 HANGUL SYLLABLE TYAGG
-+<UD0FB>     /x83/x35/x92/x32 HANGUL SYLLABLE TYAGS
-+<UD0FC>     /x83/x35/x92/x33 HANGUL SYLLABLE TYAN
-+<UD0FD>     /x83/x35/x92/x34 HANGUL SYLLABLE TYANI
-+<UD0FE>     /x83/x35/x92/x35 HANGUL SYLLABLE TYANH
-+<UD0FF>     /x83/x35/x92/x36 HANGUL SYLLABLE TYAD
-+<UD100>     /x83/x35/x92/x37 HANGUL SYLLABLE TYAL
-+<UD101>     /x83/x35/x92/x38 HANGUL SYLLABLE TYALG
-+<UD102>     /x83/x35/x92/x39 HANGUL SYLLABLE TYALM
-+<UD103>     /x83/x35/x93/x30 HANGUL SYLLABLE TYALB
-+<UD104>     /x83/x35/x93/x31 HANGUL SYLLABLE TYALS
-+<UD105>     /x83/x35/x93/x32 HANGUL SYLLABLE TYALT
-+<UD106>     /x83/x35/x93/x33 HANGUL SYLLABLE TYALP
-+<UD107>     /x83/x35/x93/x34 HANGUL SYLLABLE TYALH
-+<UD108>     /x83/x35/x93/x35 HANGUL SYLLABLE TYAM
-+<UD109>     /x83/x35/x93/x36 HANGUL SYLLABLE TYAB
-+<UD10A>     /x83/x35/x93/x37 HANGUL SYLLABLE TYABS
-+<UD10B>     /x83/x35/x93/x38 HANGUL SYLLABLE TYAS
-+<UD10C>     /x83/x35/x93/x39 HANGUL SYLLABLE TYASS
-+<UD10D>     /x83/x35/x94/x30 HANGUL SYLLABLE TYANG
-+<UD10E>     /x83/x35/x94/x31 HANGUL SYLLABLE TYAJ
-+<UD10F>     /x83/x35/x94/x32 HANGUL SYLLABLE TYAC
-+<UD110>     /x83/x35/x94/x33 HANGUL SYLLABLE TYAK
-+<UD111>     /x83/x35/x94/x34 HANGUL SYLLABLE TYAT
-+<UD112>     /x83/x35/x94/x35 HANGUL SYLLABLE TYAP
-+<UD113>     /x83/x35/x94/x36 HANGUL SYLLABLE TYAH
-+<UD114>     /x83/x35/x94/x37 HANGUL SYLLABLE TYAE
-+<UD115>     /x83/x35/x94/x38 HANGUL SYLLABLE TYAEG
-+<UD116>     /x83/x35/x94/x39 HANGUL SYLLABLE TYAEGG
-+<UD117>     /x83/x35/x95/x30 HANGUL SYLLABLE TYAEGS
-+<UD118>     /x83/x35/x95/x31 HANGUL SYLLABLE TYAEN
-+<UD119>     /x83/x35/x95/x32 HANGUL SYLLABLE TYAENI
-+<UD11A>     /x83/x35/x95/x33 HANGUL SYLLABLE TYAENH
-+<UD11B>     /x83/x35/x95/x34 HANGUL SYLLABLE TYAED
-+<UD11C>     /x83/x35/x95/x35 HANGUL SYLLABLE TYAEL
-+<UD11D>     /x83/x35/x95/x36 HANGUL SYLLABLE TYAELG
-+<UD11E>     /x83/x35/x95/x37 HANGUL SYLLABLE TYAELM
-+<UD11F>     /x83/x35/x95/x38 HANGUL SYLLABLE TYAELB
-+<UD120>     /x83/x35/x95/x39 HANGUL SYLLABLE TYAELS
-+<UD121>     /x83/x35/x96/x30 HANGUL SYLLABLE TYAELT
-+<UD122>     /x83/x35/x96/x31 HANGUL SYLLABLE TYAELP
-+<UD123>     /x83/x35/x96/x32 HANGUL SYLLABLE TYAELH
-+<UD124>     /x83/x35/x96/x33 HANGUL SYLLABLE TYAEM
-+<UD125>     /x83/x35/x96/x34 HANGUL SYLLABLE TYAEB
-+<UD126>     /x83/x35/x96/x35 HANGUL SYLLABLE TYAEBS
-+<UD127>     /x83/x35/x96/x36 HANGUL SYLLABLE TYAES
-+<UD128>     /x83/x35/x96/x37 HANGUL SYLLABLE TYAESS
-+<UD129>     /x83/x35/x96/x38 HANGUL SYLLABLE TYAENG
-+<UD12A>     /x83/x35/x96/x39 HANGUL SYLLABLE TYAEJ
-+<UD12B>     /x83/x35/x97/x30 HANGUL SYLLABLE TYAEC
-+<UD12C>     /x83/x35/x97/x31 HANGUL SYLLABLE TYAEK
-+<UD12D>     /x83/x35/x97/x32 HANGUL SYLLABLE TYAET
-+<UD12E>     /x83/x35/x97/x33 HANGUL SYLLABLE TYAEP
-+<UD12F>     /x83/x35/x97/x34 HANGUL SYLLABLE TYAEH
-+<UD130>     /x83/x35/x97/x35 HANGUL SYLLABLE TEO
-+<UD131>     /x83/x35/x97/x36 HANGUL SYLLABLE TEOG
-+<UD132>     /x83/x35/x97/x37 HANGUL SYLLABLE TEOGG
-+<UD133>     /x83/x35/x97/x38 HANGUL SYLLABLE TEOGS
-+<UD134>     /x83/x35/x97/x39 HANGUL SYLLABLE TEON
-+<UD135>     /x83/x35/x98/x30 HANGUL SYLLABLE TEONI
-+<UD136>     /x83/x35/x98/x31 HANGUL SYLLABLE TEONH
-+<UD137>     /x83/x35/x98/x32 HANGUL SYLLABLE TEOD
-+<UD138>     /x83/x35/x98/x33 HANGUL SYLLABLE TEOL
-+<UD139>     /x83/x35/x98/x34 HANGUL SYLLABLE TEOLG
-+<UD13A>     /x83/x35/x98/x35 HANGUL SYLLABLE TEOLM
-+<UD13B>     /x83/x35/x98/x36 HANGUL SYLLABLE TEOLB
-+<UD13C>     /x83/x35/x98/x37 HANGUL SYLLABLE TEOLS
-+<UD13D>     /x83/x35/x98/x38 HANGUL SYLLABLE TEOLT
-+<UD13E>     /x83/x35/x98/x39 HANGUL SYLLABLE TEOLP
-+<UD13F>     /x83/x35/x99/x30 HANGUL SYLLABLE TEOLH
-+<UD140>     /x83/x35/x99/x31 HANGUL SYLLABLE TEOM
-+<UD141>     /x83/x35/x99/x32 HANGUL SYLLABLE TEOB
-+<UD142>     /x83/x35/x99/x33 HANGUL SYLLABLE TEOBS
-+<UD143>     /x83/x35/x99/x34 HANGUL SYLLABLE TEOS
-+<UD144>     /x83/x35/x99/x35 HANGUL SYLLABLE TEOSS
-+<UD145>     /x83/x35/x99/x36 HANGUL SYLLABLE TEONG
-+<UD146>     /x83/x35/x99/x37 HANGUL SYLLABLE TEOJ
-+<UD147>     /x83/x35/x99/x38 HANGUL SYLLABLE TEOC
-+<UD148>     /x83/x35/x99/x39 HANGUL SYLLABLE TEOK
-+<UD149>     /x83/x35/x9a/x30 HANGUL SYLLABLE TEOT
-+<UD14A>     /x83/x35/x9a/x31 HANGUL SYLLABLE TEOP
-+<UD14B>     /x83/x35/x9a/x32 HANGUL SYLLABLE TEOH
-+<UD14C>     /x83/x35/x9a/x33 HANGUL SYLLABLE TE
-+<UD14D>     /x83/x35/x9a/x34 HANGUL SYLLABLE TEG
-+<UD14E>     /x83/x35/x9a/x35 HANGUL SYLLABLE TEGG
-+<UD14F>     /x83/x35/x9a/x36 HANGUL SYLLABLE TEGS
-+<UD150>     /x83/x35/x9a/x37 HANGUL SYLLABLE TEN
-+<UD151>     /x83/x35/x9a/x38 HANGUL SYLLABLE TENI
-+<UD152>     /x83/x35/x9a/x39 HANGUL SYLLABLE TENH
-+<UD153>     /x83/x35/x9b/x30 HANGUL SYLLABLE TED
-+<UD154>     /x83/x35/x9b/x31 HANGUL SYLLABLE TEL
-+<UD155>     /x83/x35/x9b/x32 HANGUL SYLLABLE TELG
-+<UD156>     /x83/x35/x9b/x33 HANGUL SYLLABLE TELM
-+<UD157>     /x83/x35/x9b/x34 HANGUL SYLLABLE TELB
-+<UD158>     /x83/x35/x9b/x35 HANGUL SYLLABLE TELS
-+<UD159>     /x83/x35/x9b/x36 HANGUL SYLLABLE TELT
-+<UD15A>     /x83/x35/x9b/x37 HANGUL SYLLABLE TELP
-+<UD15B>     /x83/x35/x9b/x38 HANGUL SYLLABLE TELH
-+<UD15C>     /x83/x35/x9b/x39 HANGUL SYLLABLE TEM
-+<UD15D>     /x83/x35/x9c/x30 HANGUL SYLLABLE TEB
-+<UD15E>     /x83/x35/x9c/x31 HANGUL SYLLABLE TEBS
-+<UD15F>     /x83/x35/x9c/x32 HANGUL SYLLABLE TES
-+<UD160>     /x83/x35/x9c/x33 HANGUL SYLLABLE TESS
-+<UD161>     /x83/x35/x9c/x34 HANGUL SYLLABLE TENG
-+<UD162>     /x83/x35/x9c/x35 HANGUL SYLLABLE TEJ
-+<UD163>     /x83/x35/x9c/x36 HANGUL SYLLABLE TEC
-+<UD164>     /x83/x35/x9c/x37 HANGUL SYLLABLE TEK
-+<UD165>     /x83/x35/x9c/x38 HANGUL SYLLABLE TET
-+<UD166>     /x83/x35/x9c/x39 HANGUL SYLLABLE TEP
-+<UD167>     /x83/x35/x9d/x30 HANGUL SYLLABLE TEH
-+<UD168>     /x83/x35/x9d/x31 HANGUL SYLLABLE TYEO
-+<UD169>     /x83/x35/x9d/x32 HANGUL SYLLABLE TYEOG
-+<UD16A>     /x83/x35/x9d/x33 HANGUL SYLLABLE TYEOGG
-+<UD16B>     /x83/x35/x9d/x34 HANGUL SYLLABLE TYEOGS
-+<UD16C>     /x83/x35/x9d/x35 HANGUL SYLLABLE TYEON
-+<UD16D>     /x83/x35/x9d/x36 HANGUL SYLLABLE TYEONI
-+<UD16E>     /x83/x35/x9d/x37 HANGUL SYLLABLE TYEONH
-+<UD16F>     /x83/x35/x9d/x38 HANGUL SYLLABLE TYEOD
-+<UD170>     /x83/x35/x9d/x39 HANGUL SYLLABLE TYEOL
-+<UD171>     /x83/x35/x9e/x30 HANGUL SYLLABLE TYEOLG
-+<UD172>     /x83/x35/x9e/x31 HANGUL SYLLABLE TYEOLM
-+<UD173>     /x83/x35/x9e/x32 HANGUL SYLLABLE TYEOLB
-+<UD174>     /x83/x35/x9e/x33 HANGUL SYLLABLE TYEOLS
-+<UD175>     /x83/x35/x9e/x34 HANGUL SYLLABLE TYEOLT
-+<UD176>     /x83/x35/x9e/x35 HANGUL SYLLABLE TYEOLP
-+<UD177>     /x83/x35/x9e/x36 HANGUL SYLLABLE TYEOLH
-+<UD178>     /x83/x35/x9e/x37 HANGUL SYLLABLE TYEOM
-+<UD179>     /x83/x35/x9e/x38 HANGUL SYLLABLE TYEOB
-+<UD17A>     /x83/x35/x9e/x39 HANGUL SYLLABLE TYEOBS
-+<UD17B>     /x83/x35/x9f/x30 HANGUL SYLLABLE TYEOS
-+<UD17C>     /x83/x35/x9f/x31 HANGUL SYLLABLE TYEOSS
-+<UD17D>     /x83/x35/x9f/x32 HANGUL SYLLABLE TYEONG
-+<UD17E>     /x83/x35/x9f/x33 HANGUL SYLLABLE TYEOJ
-+<UD17F>     /x83/x35/x9f/x34 HANGUL SYLLABLE TYEOC
-+<UD180>     /x83/x35/x9f/x35 HANGUL SYLLABLE TYEOK
-+<UD181>     /x83/x35/x9f/x36 HANGUL SYLLABLE TYEOT
-+<UD182>     /x83/x35/x9f/x37 HANGUL SYLLABLE TYEOP
-+<UD183>     /x83/x35/x9f/x38 HANGUL SYLLABLE TYEOH
-+<UD184>     /x83/x35/x9f/x39 HANGUL SYLLABLE TYE
-+<UD185>     /x83/x35/xa0/x30 HANGUL SYLLABLE TYEG
-+<UD186>     /x83/x35/xa0/x31 HANGUL SYLLABLE TYEGG
-+<UD187>     /x83/x35/xa0/x32 HANGUL SYLLABLE TYEGS
-+<UD188>     /x83/x35/xa0/x33 HANGUL SYLLABLE TYEN
-+<UD189>     /x83/x35/xa0/x34 HANGUL SYLLABLE TYENI
-+<UD18A>     /x83/x35/xa0/x35 HANGUL SYLLABLE TYENH
-+<UD18B>     /x83/x35/xa0/x36 HANGUL SYLLABLE TYED
-+<UD18C>     /x83/x35/xa0/x37 HANGUL SYLLABLE TYEL
-+<UD18D>     /x83/x35/xa0/x38 HANGUL SYLLABLE TYELG
-+<UD18E>     /x83/x35/xa0/x39 HANGUL SYLLABLE TYELM
-+<UD18F>     /x83/x35/xa1/x30 HANGUL SYLLABLE TYELB
-+<UD190>     /x83/x35/xa1/x31 HANGUL SYLLABLE TYELS
-+<UD191>     /x83/x35/xa1/x32 HANGUL SYLLABLE TYELT
-+<UD192>     /x83/x35/xa1/x33 HANGUL SYLLABLE TYELP
-+<UD193>     /x83/x35/xa1/x34 HANGUL SYLLABLE TYELH
-+<UD194>     /x83/x35/xa1/x35 HANGUL SYLLABLE TYEM
-+<UD195>     /x83/x35/xa1/x36 HANGUL SYLLABLE TYEB
-+<UD196>     /x83/x35/xa1/x37 HANGUL SYLLABLE TYEBS
-+<UD197>     /x83/x35/xa1/x38 HANGUL SYLLABLE TYES
-+<UD198>     /x83/x35/xa1/x39 HANGUL SYLLABLE TYESS
-+<UD199>     /x83/x35/xa2/x30 HANGUL SYLLABLE TYENG
-+<UD19A>     /x83/x35/xa2/x31 HANGUL SYLLABLE TYEJ
-+<UD19B>     /x83/x35/xa2/x32 HANGUL SYLLABLE TYEC
-+<UD19C>     /x83/x35/xa2/x33 HANGUL SYLLABLE TYEK
-+<UD19D>     /x83/x35/xa2/x34 HANGUL SYLLABLE TYET
-+<UD19E>     /x83/x35/xa2/x35 HANGUL SYLLABLE TYEP
-+<UD19F>     /x83/x35/xa2/x36 HANGUL SYLLABLE TYEH
-+<UD1A0>     /x83/x35/xa2/x37 HANGUL SYLLABLE TO
-+<UD1A1>     /x83/x35/xa2/x38 HANGUL SYLLABLE TOG
-+<UD1A2>     /x83/x35/xa2/x39 HANGUL SYLLABLE TOGG
-+<UD1A3>     /x83/x35/xa3/x30 HANGUL SYLLABLE TOGS
-+<UD1A4>     /x83/x35/xa3/x31 HANGUL SYLLABLE TON
-+<UD1A5>     /x83/x35/xa3/x32 HANGUL SYLLABLE TONI
-+<UD1A6>     /x83/x35/xa3/x33 HANGUL SYLLABLE TONH
-+<UD1A7>     /x83/x35/xa3/x34 HANGUL SYLLABLE TOD
-+<UD1A8>     /x83/x35/xa3/x35 HANGUL SYLLABLE TOL
-+<UD1A9>     /x83/x35/xa3/x36 HANGUL SYLLABLE TOLG
-+<UD1AA>     /x83/x35/xa3/x37 HANGUL SYLLABLE TOLM
-+<UD1AB>     /x83/x35/xa3/x38 HANGUL SYLLABLE TOLB
-+<UD1AC>     /x83/x35/xa3/x39 HANGUL SYLLABLE TOLS
-+<UD1AD>     /x83/x35/xa4/x30 HANGUL SYLLABLE TOLT
-+<UD1AE>     /x83/x35/xa4/x31 HANGUL SYLLABLE TOLP
-+<UD1AF>     /x83/x35/xa4/x32 HANGUL SYLLABLE TOLH
-+<UD1B0>     /x83/x35/xa4/x33 HANGUL SYLLABLE TOM
-+<UD1B1>     /x83/x35/xa4/x34 HANGUL SYLLABLE TOB
-+<UD1B2>     /x83/x35/xa4/x35 HANGUL SYLLABLE TOBS
-+<UD1B3>     /x83/x35/xa4/x36 HANGUL SYLLABLE TOS
-+<UD1B4>     /x83/x35/xa4/x37 HANGUL SYLLABLE TOSS
-+<UD1B5>     /x83/x35/xa4/x38 HANGUL SYLLABLE TONG
-+<UD1B6>     /x83/x35/xa4/x39 HANGUL SYLLABLE TOJ
-+<UD1B7>     /x83/x35/xa5/x30 HANGUL SYLLABLE TOC
-+<UD1B8>     /x83/x35/xa5/x31 HANGUL SYLLABLE TOK
-+<UD1B9>     /x83/x35/xa5/x32 HANGUL SYLLABLE TOT
-+<UD1BA>     /x83/x35/xa5/x33 HANGUL SYLLABLE TOP
-+<UD1BB>     /x83/x35/xa5/x34 HANGUL SYLLABLE TOH
-+<UD1BC>     /x83/x35/xa5/x35 HANGUL SYLLABLE TWA
-+<UD1BD>     /x83/x35/xa5/x36 HANGUL SYLLABLE TWAG
-+<UD1BE>     /x83/x35/xa5/x37 HANGUL SYLLABLE TWAGG
-+<UD1BF>     /x83/x35/xa5/x38 HANGUL SYLLABLE TWAGS
-+<UD1C0>     /x83/x35/xa5/x39 HANGUL SYLLABLE TWAN
-+<UD1C1>     /x83/x35/xa6/x30 HANGUL SYLLABLE TWANI
-+<UD1C2>     /x83/x35/xa6/x31 HANGUL SYLLABLE TWANH
-+<UD1C3>     /x83/x35/xa6/x32 HANGUL SYLLABLE TWAD
-+<UD1C4>     /x83/x35/xa6/x33 HANGUL SYLLABLE TWAL
-+<UD1C5>     /x83/x35/xa6/x34 HANGUL SYLLABLE TWALG
-+<UD1C6>     /x83/x35/xa6/x35 HANGUL SYLLABLE TWALM
-+<UD1C7>     /x83/x35/xa6/x36 HANGUL SYLLABLE TWALB
-+<UD1C8>     /x83/x35/xa6/x37 HANGUL SYLLABLE TWALS
-+<UD1C9>     /x83/x35/xa6/x38 HANGUL SYLLABLE TWALT
-+<UD1CA>     /x83/x35/xa6/x39 HANGUL SYLLABLE TWALP
-+<UD1CB>     /x83/x35/xa7/x30 HANGUL SYLLABLE TWALH
-+<UD1CC>     /x83/x35/xa7/x31 HANGUL SYLLABLE TWAM
-+<UD1CD>     /x83/x35/xa7/x32 HANGUL SYLLABLE TWAB
-+<UD1CE>     /x83/x35/xa7/x33 HANGUL SYLLABLE TWABS
-+<UD1CF>     /x83/x35/xa7/x34 HANGUL SYLLABLE TWAS
-+<UD1D0>     /x83/x35/xa7/x35 HANGUL SYLLABLE TWASS
-+<UD1D1>     /x83/x35/xa7/x36 HANGUL SYLLABLE TWANG
-+<UD1D2>     /x83/x35/xa7/x37 HANGUL SYLLABLE TWAJ
-+<UD1D3>     /x83/x35/xa7/x38 HANGUL SYLLABLE TWAC
-+<UD1D4>     /x83/x35/xa7/x39 HANGUL SYLLABLE TWAK
-+<UD1D5>     /x83/x35/xa8/x30 HANGUL SYLLABLE TWAT
-+<UD1D6>     /x83/x35/xa8/x31 HANGUL SYLLABLE TWAP
-+<UD1D7>     /x83/x35/xa8/x32 HANGUL SYLLABLE TWAH
-+<UD1D8>     /x83/x35/xa8/x33 HANGUL SYLLABLE TWAE
-+<UD1D9>     /x83/x35/xa8/x34 HANGUL SYLLABLE TWAEG
-+<UD1DA>     /x83/x35/xa8/x35 HANGUL SYLLABLE TWAEGG
-+<UD1DB>     /x83/x35/xa8/x36 HANGUL SYLLABLE TWAEGS
-+<UD1DC>     /x83/x35/xa8/x37 HANGUL SYLLABLE TWAEN
-+<UD1DD>     /x83/x35/xa8/x38 HANGUL SYLLABLE TWAENI
-+<UD1DE>     /x83/x35/xa8/x39 HANGUL SYLLABLE TWAENH
-+<UD1DF>     /x83/x35/xa9/x30 HANGUL SYLLABLE TWAED
-+<UD1E0>     /x83/x35/xa9/x31 HANGUL SYLLABLE TWAEL
-+<UD1E1>     /x83/x35/xa9/x32 HANGUL SYLLABLE TWAELG
-+<UD1E2>     /x83/x35/xa9/x33 HANGUL SYLLABLE TWAELM
-+<UD1E3>     /x83/x35/xa9/x34 HANGUL SYLLABLE TWAELB
-+<UD1E4>     /x83/x35/xa9/x35 HANGUL SYLLABLE TWAELS
-+<UD1E5>     /x83/x35/xa9/x36 HANGUL SYLLABLE TWAELT
-+<UD1E6>     /x83/x35/xa9/x37 HANGUL SYLLABLE TWAELP
-+<UD1E7>     /x83/x35/xa9/x38 HANGUL SYLLABLE TWAELH
-+<UD1E8>     /x83/x35/xa9/x39 HANGUL SYLLABLE TWAEM
-+<UD1E9>     /x83/x35/xaa/x30 HANGUL SYLLABLE TWAEB
-+<UD1EA>     /x83/x35/xaa/x31 HANGUL SYLLABLE TWAEBS
-+<UD1EB>     /x83/x35/xaa/x32 HANGUL SYLLABLE TWAES
-+<UD1EC>     /x83/x35/xaa/x33 HANGUL SYLLABLE TWAESS
-+<UD1ED>     /x83/x35/xaa/x34 HANGUL SYLLABLE TWAENG
-+<UD1EE>     /x83/x35/xaa/x35 HANGUL SYLLABLE TWAEJ
-+<UD1EF>     /x83/x35/xaa/x36 HANGUL SYLLABLE TWAEC
-+<UD1F0>     /x83/x35/xaa/x37 HANGUL SYLLABLE TWAEK
-+<UD1F1>     /x83/x35/xaa/x38 HANGUL SYLLABLE TWAET
-+<UD1F2>     /x83/x35/xaa/x39 HANGUL SYLLABLE TWAEP
-+<UD1F3>     /x83/x35/xab/x30 HANGUL SYLLABLE TWAEH
-+<UD1F4>     /x83/x35/xab/x31 HANGUL SYLLABLE TOE
-+<UD1F5>     /x83/x35/xab/x32 HANGUL SYLLABLE TOEG
-+<UD1F6>     /x83/x35/xab/x33 HANGUL SYLLABLE TOEGG
-+<UD1F7>     /x83/x35/xab/x34 HANGUL SYLLABLE TOEGS
-+<UD1F8>     /x83/x35/xab/x35 HANGUL SYLLABLE TOEN
-+<UD1F9>     /x83/x35/xab/x36 HANGUL SYLLABLE TOENI
-+<UD1FA>     /x83/x35/xab/x37 HANGUL SYLLABLE TOENH
-+<UD1FB>     /x83/x35/xab/x38 HANGUL SYLLABLE TOED
-+<UD1FC>     /x83/x35/xab/x39 HANGUL SYLLABLE TOEL
-+<UD1FD>     /x83/x35/xac/x30 HANGUL SYLLABLE TOELG
-+<UD1FE>     /x83/x35/xac/x31 HANGUL SYLLABLE TOELM
-+<UD1FF>     /x83/x35/xac/x32 HANGUL SYLLABLE TOELB
-+<UD200>     /x83/x35/xac/x33 HANGUL SYLLABLE TOELS
-+<UD201>     /x83/x35/xac/x34 HANGUL SYLLABLE TOELT
-+<UD202>     /x83/x35/xac/x35 HANGUL SYLLABLE TOELP
-+<UD203>     /x83/x35/xac/x36 HANGUL SYLLABLE TOELH
-+<UD204>     /x83/x35/xac/x37 HANGUL SYLLABLE TOEM
-+<UD205>     /x83/x35/xac/x38 HANGUL SYLLABLE TOEB
-+<UD206>     /x83/x35/xac/x39 HANGUL SYLLABLE TOEBS
-+<UD207>     /x83/x35/xad/x30 HANGUL SYLLABLE TOES
-+<UD208>     /x83/x35/xad/x31 HANGUL SYLLABLE TOESS
-+<UD209>     /x83/x35/xad/x32 HANGUL SYLLABLE TOENG
-+<UD20A>     /x83/x35/xad/x33 HANGUL SYLLABLE TOEJ
-+<UD20B>     /x83/x35/xad/x34 HANGUL SYLLABLE TOEC
-+<UD20C>     /x83/x35/xad/x35 HANGUL SYLLABLE TOEK
-+<UD20D>     /x83/x35/xad/x36 HANGUL SYLLABLE TOET
-+<UD20E>     /x83/x35/xad/x37 HANGUL SYLLABLE TOEP
-+<UD20F>     /x83/x35/xad/x38 HANGUL SYLLABLE TOEH
-+<UD210>     /x83/x35/xad/x39 HANGUL SYLLABLE TYO
-+<UD211>     /x83/x35/xae/x30 HANGUL SYLLABLE TYOG
-+<UD212>     /x83/x35/xae/x31 HANGUL SYLLABLE TYOGG
-+<UD213>     /x83/x35/xae/x32 HANGUL SYLLABLE TYOGS
-+<UD214>     /x83/x35/xae/x33 HANGUL SYLLABLE TYON
-+<UD215>     /x83/x35/xae/x34 HANGUL SYLLABLE TYONI
-+<UD216>     /x83/x35/xae/x35 HANGUL SYLLABLE TYONH
-+<UD217>     /x83/x35/xae/x36 HANGUL SYLLABLE TYOD
-+<UD218>     /x83/x35/xae/x37 HANGUL SYLLABLE TYOL
-+<UD219>     /x83/x35/xae/x38 HANGUL SYLLABLE TYOLG
-+<UD21A>     /x83/x35/xae/x39 HANGUL SYLLABLE TYOLM
-+<UD21B>     /x83/x35/xaf/x30 HANGUL SYLLABLE TYOLB
-+<UD21C>     /x83/x35/xaf/x31 HANGUL SYLLABLE TYOLS
-+<UD21D>     /x83/x35/xaf/x32 HANGUL SYLLABLE TYOLT
-+<UD21E>     /x83/x35/xaf/x33 HANGUL SYLLABLE TYOLP
-+<UD21F>     /x83/x35/xaf/x34 HANGUL SYLLABLE TYOLH
-+<UD220>     /x83/x35/xaf/x35 HANGUL SYLLABLE TYOM
-+<UD221>     /x83/x35/xaf/x36 HANGUL SYLLABLE TYOB
-+<UD222>     /x83/x35/xaf/x37 HANGUL SYLLABLE TYOBS
-+<UD223>     /x83/x35/xaf/x38 HANGUL SYLLABLE TYOS
-+<UD224>     /x83/x35/xaf/x39 HANGUL SYLLABLE TYOSS
-+<UD225>     /x83/x35/xb0/x30 HANGUL SYLLABLE TYONG
-+<UD226>     /x83/x35/xb0/x31 HANGUL SYLLABLE TYOJ
-+<UD227>     /x83/x35/xb0/x32 HANGUL SYLLABLE TYOC
-+<UD228>     /x83/x35/xb0/x33 HANGUL SYLLABLE TYOK
-+<UD229>     /x83/x35/xb0/x34 HANGUL SYLLABLE TYOT
-+<UD22A>     /x83/x35/xb0/x35 HANGUL SYLLABLE TYOP
-+<UD22B>     /x83/x35/xb0/x36 HANGUL SYLLABLE TYOH
-+<UD22C>     /x83/x35/xb0/x37 HANGUL SYLLABLE TU
-+<UD22D>     /x83/x35/xb0/x38 HANGUL SYLLABLE TUG
-+<UD22E>     /x83/x35/xb0/x39 HANGUL SYLLABLE TUGG
-+<UD22F>     /x83/x35/xb1/x30 HANGUL SYLLABLE TUGS
-+<UD230>     /x83/x35/xb1/x31 HANGUL SYLLABLE TUN
-+<UD231>     /x83/x35/xb1/x32 HANGUL SYLLABLE TUNI
-+<UD232>     /x83/x35/xb1/x33 HANGUL SYLLABLE TUNH
-+<UD233>     /x83/x35/xb1/x34 HANGUL SYLLABLE TUD
-+<UD234>     /x83/x35/xb1/x35 HANGUL SYLLABLE TUL
-+<UD235>     /x83/x35/xb1/x36 HANGUL SYLLABLE TULG
-+<UD236>     /x83/x35/xb1/x37 HANGUL SYLLABLE TULM
-+<UD237>     /x83/x35/xb1/x38 HANGUL SYLLABLE TULB
-+<UD238>     /x83/x35/xb1/x39 HANGUL SYLLABLE TULS
-+<UD239>     /x83/x35/xb2/x30 HANGUL SYLLABLE TULT
-+<UD23A>     /x83/x35/xb2/x31 HANGUL SYLLABLE TULP
-+<UD23B>     /x83/x35/xb2/x32 HANGUL SYLLABLE TULH
-+<UD23C>     /x83/x35/xb2/x33 HANGUL SYLLABLE TUM
-+<UD23D>     /x83/x35/xb2/x34 HANGUL SYLLABLE TUB
-+<UD23E>     /x83/x35/xb2/x35 HANGUL SYLLABLE TUBS
-+<UD23F>     /x83/x35/xb2/x36 HANGUL SYLLABLE TUS
-+<UD240>     /x83/x35/xb2/x37 HANGUL SYLLABLE TUSS
-+<UD241>     /x83/x35/xb2/x38 HANGUL SYLLABLE TUNG
-+<UD242>     /x83/x35/xb2/x39 HANGUL SYLLABLE TUJ
-+<UD243>     /x83/x35/xb3/x30 HANGUL SYLLABLE TUC
-+<UD244>     /x83/x35/xb3/x31 HANGUL SYLLABLE TUK
-+<UD245>     /x83/x35/xb3/x32 HANGUL SYLLABLE TUT
-+<UD246>     /x83/x35/xb3/x33 HANGUL SYLLABLE TUP
-+<UD247>     /x83/x35/xb3/x34 HANGUL SYLLABLE TUH
-+<UD248>     /x83/x35/xb3/x35 HANGUL SYLLABLE TWEO
-+<UD249>     /x83/x35/xb3/x36 HANGUL SYLLABLE TWEOG
-+<UD24A>     /x83/x35/xb3/x37 HANGUL SYLLABLE TWEOGG
-+<UD24B>     /x83/x35/xb3/x38 HANGUL SYLLABLE TWEOGS
-+<UD24C>     /x83/x35/xb3/x39 HANGUL SYLLABLE TWEON
-+<UD24D>     /x83/x35/xb4/x30 HANGUL SYLLABLE TWEONI
-+<UD24E>     /x83/x35/xb4/x31 HANGUL SYLLABLE TWEONH
-+<UD24F>     /x83/x35/xb4/x32 HANGUL SYLLABLE TWEOD
-+<UD250>     /x83/x35/xb4/x33 HANGUL SYLLABLE TWEOL
-+<UD251>     /x83/x35/xb4/x34 HANGUL SYLLABLE TWEOLG
-+<UD252>     /x83/x35/xb4/x35 HANGUL SYLLABLE TWEOLM
-+<UD253>     /x83/x35/xb4/x36 HANGUL SYLLABLE TWEOLB
-+<UD254>     /x83/x35/xb4/x37 HANGUL SYLLABLE TWEOLS
-+<UD255>     /x83/x35/xb4/x38 HANGUL SYLLABLE TWEOLT
-+<UD256>     /x83/x35/xb4/x39 HANGUL SYLLABLE TWEOLP
-+<UD257>     /x83/x35/xb5/x30 HANGUL SYLLABLE TWEOLH
-+<UD258>     /x83/x35/xb5/x31 HANGUL SYLLABLE TWEOM
-+<UD259>     /x83/x35/xb5/x32 HANGUL SYLLABLE TWEOB
-+<UD25A>     /x83/x35/xb5/x33 HANGUL SYLLABLE TWEOBS
-+<UD25B>     /x83/x35/xb5/x34 HANGUL SYLLABLE TWEOS
-+<UD25C>     /x83/x35/xb5/x35 HANGUL SYLLABLE TWEOSS
-+<UD25D>     /x83/x35/xb5/x36 HANGUL SYLLABLE TWEONG
-+<UD25E>     /x83/x35/xb5/x37 HANGUL SYLLABLE TWEOJ
-+<UD25F>     /x83/x35/xb5/x38 HANGUL SYLLABLE TWEOC
-+<UD260>     /x83/x35/xb5/x39 HANGUL SYLLABLE TWEOK
-+<UD261>     /x83/x35/xb6/x30 HANGUL SYLLABLE TWEOT
-+<UD262>     /x83/x35/xb6/x31 HANGUL SYLLABLE TWEOP
-+<UD263>     /x83/x35/xb6/x32 HANGUL SYLLABLE TWEOH
-+<UD264>     /x83/x35/xb6/x33 HANGUL SYLLABLE TWE
-+<UD265>     /x83/x35/xb6/x34 HANGUL SYLLABLE TWEG
-+<UD266>     /x83/x35/xb6/x35 HANGUL SYLLABLE TWEGG
-+<UD267>     /x83/x35/xb6/x36 HANGUL SYLLABLE TWEGS
-+<UD268>     /x83/x35/xb6/x37 HANGUL SYLLABLE TWEN
-+<UD269>     /x83/x35/xb6/x38 HANGUL SYLLABLE TWENI
-+<UD26A>     /x83/x35/xb6/x39 HANGUL SYLLABLE TWENH
-+<UD26B>     /x83/x35/xb7/x30 HANGUL SYLLABLE TWED
-+<UD26C>     /x83/x35/xb7/x31 HANGUL SYLLABLE TWEL
-+<UD26D>     /x83/x35/xb7/x32 HANGUL SYLLABLE TWELG
-+<UD26E>     /x83/x35/xb7/x33 HANGUL SYLLABLE TWELM
-+<UD26F>     /x83/x35/xb7/x34 HANGUL SYLLABLE TWELB
-+<UD270>     /x83/x35/xb7/x35 HANGUL SYLLABLE TWELS
-+<UD271>     /x83/x35/xb7/x36 HANGUL SYLLABLE TWELT
-+<UD272>     /x83/x35/xb7/x37 HANGUL SYLLABLE TWELP
-+<UD273>     /x83/x35/xb7/x38 HANGUL SYLLABLE TWELH
-+<UD274>     /x83/x35/xb7/x39 HANGUL SYLLABLE TWEM
-+<UD275>     /x83/x35/xb8/x30 HANGUL SYLLABLE TWEB
-+<UD276>     /x83/x35/xb8/x31 HANGUL SYLLABLE TWEBS
-+<UD277>     /x83/x35/xb8/x32 HANGUL SYLLABLE TWES
-+<UD278>     /x83/x35/xb8/x33 HANGUL SYLLABLE TWESS
-+<UD279>     /x83/x35/xb8/x34 HANGUL SYLLABLE TWENG
-+<UD27A>     /x83/x35/xb8/x35 HANGUL SYLLABLE TWEJ
-+<UD27B>     /x83/x35/xb8/x36 HANGUL SYLLABLE TWEC
-+<UD27C>     /x83/x35/xb8/x37 HANGUL SYLLABLE TWEK
-+<UD27D>     /x83/x35/xb8/x38 HANGUL SYLLABLE TWET
-+<UD27E>     /x83/x35/xb8/x39 HANGUL SYLLABLE TWEP
-+<UD27F>     /x83/x35/xb9/x30 HANGUL SYLLABLE TWEH
-+<UD280>     /x83/x35/xb9/x31 HANGUL SYLLABLE TWI
-+<UD281>     /x83/x35/xb9/x32 HANGUL SYLLABLE TWIG
-+<UD282>     /x83/x35/xb9/x33 HANGUL SYLLABLE TWIGG
-+<UD283>     /x83/x35/xb9/x34 HANGUL SYLLABLE TWIGS
-+<UD284>     /x83/x35/xb9/x35 HANGUL SYLLABLE TWIN
-+<UD285>     /x83/x35/xb9/x36 HANGUL SYLLABLE TWINI
-+<UD286>     /x83/x35/xb9/x37 HANGUL SYLLABLE TWINH
-+<UD287>     /x83/x35/xb9/x38 HANGUL SYLLABLE TWID
-+<UD288>     /x83/x35/xb9/x39 HANGUL SYLLABLE TWIL
-+<UD289>     /x83/x35/xba/x30 HANGUL SYLLABLE TWILG
-+<UD28A>     /x83/x35/xba/x31 HANGUL SYLLABLE TWILM
-+<UD28B>     /x83/x35/xba/x32 HANGUL SYLLABLE TWILB
-+<UD28C>     /x83/x35/xba/x33 HANGUL SYLLABLE TWILS
-+<UD28D>     /x83/x35/xba/x34 HANGUL SYLLABLE TWILT
-+<UD28E>     /x83/x35/xba/x35 HANGUL SYLLABLE TWILP
-+<UD28F>     /x83/x35/xba/x36 HANGUL SYLLABLE TWILH
-+<UD290>     /x83/x35/xba/x37 HANGUL SYLLABLE TWIM
-+<UD291>     /x83/x35/xba/x38 HANGUL SYLLABLE TWIB
-+<UD292>     /x83/x35/xba/x39 HANGUL SYLLABLE TWIBS
-+<UD293>     /x83/x35/xbb/x30 HANGUL SYLLABLE TWIS
-+<UD294>     /x83/x35/xbb/x31 HANGUL SYLLABLE TWISS
-+<UD295>     /x83/x35/xbb/x32 HANGUL SYLLABLE TWING
-+<UD296>     /x83/x35/xbb/x33 HANGUL SYLLABLE TWIJ
-+<UD297>     /x83/x35/xbb/x34 HANGUL SYLLABLE TWIC
-+<UD298>     /x83/x35/xbb/x35 HANGUL SYLLABLE TWIK
-+<UD299>     /x83/x35/xbb/x36 HANGUL SYLLABLE TWIT
-+<UD29A>     /x83/x35/xbb/x37 HANGUL SYLLABLE TWIP
-+<UD29B>     /x83/x35/xbb/x38 HANGUL SYLLABLE TWIH
-+<UD29C>     /x83/x35/xbb/x39 HANGUL SYLLABLE TYU
-+<UD29D>     /x83/x35/xbc/x30 HANGUL SYLLABLE TYUG
-+<UD29E>     /x83/x35/xbc/x31 HANGUL SYLLABLE TYUGG
-+<UD29F>     /x83/x35/xbc/x32 HANGUL SYLLABLE TYUGS
-+<UD2A0>     /x83/x35/xbc/x33 HANGUL SYLLABLE TYUN
-+<UD2A1>     /x83/x35/xbc/x34 HANGUL SYLLABLE TYUNI
-+<UD2A2>     /x83/x35/xbc/x35 HANGUL SYLLABLE TYUNH
-+<UD2A3>     /x83/x35/xbc/x36 HANGUL SYLLABLE TYUD
-+<UD2A4>     /x83/x35/xbc/x37 HANGUL SYLLABLE TYUL
-+<UD2A5>     /x83/x35/xbc/x38 HANGUL SYLLABLE TYULG
-+<UD2A6>     /x83/x35/xbc/x39 HANGUL SYLLABLE TYULM
-+<UD2A7>     /x83/x35/xbd/x30 HANGUL SYLLABLE TYULB
-+<UD2A8>     /x83/x35/xbd/x31 HANGUL SYLLABLE TYULS
-+<UD2A9>     /x83/x35/xbd/x32 HANGUL SYLLABLE TYULT
-+<UD2AA>     /x83/x35/xbd/x33 HANGUL SYLLABLE TYULP
-+<UD2AB>     /x83/x35/xbd/x34 HANGUL SYLLABLE TYULH
-+<UD2AC>     /x83/x35/xbd/x35 HANGUL SYLLABLE TYUM
-+<UD2AD>     /x83/x35/xbd/x36 HANGUL SYLLABLE TYUB
-+<UD2AE>     /x83/x35/xbd/x37 HANGUL SYLLABLE TYUBS
-+<UD2AF>     /x83/x35/xbd/x38 HANGUL SYLLABLE TYUS
-+<UD2B0>     /x83/x35/xbd/x39 HANGUL SYLLABLE TYUSS
-+<UD2B1>     /x83/x35/xbe/x30 HANGUL SYLLABLE TYUNG
-+<UD2B2>     /x83/x35/xbe/x31 HANGUL SYLLABLE TYUJ
-+<UD2B3>     /x83/x35/xbe/x32 HANGUL SYLLABLE TYUC
-+<UD2B4>     /x83/x35/xbe/x33 HANGUL SYLLABLE TYUK
-+<UD2B5>     /x83/x35/xbe/x34 HANGUL SYLLABLE TYUT
-+<UD2B6>     /x83/x35/xbe/x35 HANGUL SYLLABLE TYUP
-+<UD2B7>     /x83/x35/xbe/x36 HANGUL SYLLABLE TYUH
-+<UD2B8>     /x83/x35/xbe/x37 HANGUL SYLLABLE TEU
-+<UD2B9>     /x83/x35/xbe/x38 HANGUL SYLLABLE TEUG
-+<UD2BA>     /x83/x35/xbe/x39 HANGUL SYLLABLE TEUGG
-+<UD2BB>     /x83/x35/xbf/x30 HANGUL SYLLABLE TEUGS
-+<UD2BC>     /x83/x35/xbf/x31 HANGUL SYLLABLE TEUN
-+<UD2BD>     /x83/x35/xbf/x32 HANGUL SYLLABLE TEUNI
-+<UD2BE>     /x83/x35/xbf/x33 HANGUL SYLLABLE TEUNH
-+<UD2BF>     /x83/x35/xbf/x34 HANGUL SYLLABLE TEUD
-+<UD2C0>     /x83/x35/xbf/x35 HANGUL SYLLABLE TEUL
-+<UD2C1>     /x83/x35/xbf/x36 HANGUL SYLLABLE TEULG
-+<UD2C2>     /x83/x35/xbf/x37 HANGUL SYLLABLE TEULM
-+<UD2C3>     /x83/x35/xbf/x38 HANGUL SYLLABLE TEULB
-+<UD2C4>     /x83/x35/xbf/x39 HANGUL SYLLABLE TEULS
-+<UD2C5>     /x83/x35/xc0/x30 HANGUL SYLLABLE TEULT
-+<UD2C6>     /x83/x35/xc0/x31 HANGUL SYLLABLE TEULP
-+<UD2C7>     /x83/x35/xc0/x32 HANGUL SYLLABLE TEULH
-+<UD2C8>     /x83/x35/xc0/x33 HANGUL SYLLABLE TEUM
-+<UD2C9>     /x83/x35/xc0/x34 HANGUL SYLLABLE TEUB
-+<UD2CA>     /x83/x35/xc0/x35 HANGUL SYLLABLE TEUBS
-+<UD2CB>     /x83/x35/xc0/x36 HANGUL SYLLABLE TEUS
-+<UD2CC>     /x83/x35/xc0/x37 HANGUL SYLLABLE TEUSS
-+<UD2CD>     /x83/x35/xc0/x38 HANGUL SYLLABLE TEUNG
-+<UD2CE>     /x83/x35/xc0/x39 HANGUL SYLLABLE TEUJ
-+<UD2CF>     /x83/x35/xc1/x30 HANGUL SYLLABLE TEUC
-+<UD2D0>     /x83/x35/xc1/x31 HANGUL SYLLABLE TEUK
-+<UD2D1>     /x83/x35/xc1/x32 HANGUL SYLLABLE TEUT
-+<UD2D2>     /x83/x35/xc1/x33 HANGUL SYLLABLE TEUP
-+<UD2D3>     /x83/x35/xc1/x34 HANGUL SYLLABLE TEUH
-+<UD2D4>     /x83/x35/xc1/x35 HANGUL SYLLABLE TYI
-+<UD2D5>     /x83/x35/xc1/x36 HANGUL SYLLABLE TYIG
-+<UD2D6>     /x83/x35/xc1/x37 HANGUL SYLLABLE TYIGG
-+<UD2D7>     /x83/x35/xc1/x38 HANGUL SYLLABLE TYIGS
-+<UD2D8>     /x83/x35/xc1/x39 HANGUL SYLLABLE TYIN
-+<UD2D9>     /x83/x35/xc2/x30 HANGUL SYLLABLE TYINI
-+<UD2DA>     /x83/x35/xc2/x31 HANGUL SYLLABLE TYINH
-+<UD2DB>     /x83/x35/xc2/x32 HANGUL SYLLABLE TYID
-+<UD2DC>     /x83/x35/xc2/x33 HANGUL SYLLABLE TYIL
-+<UD2DD>     /x83/x35/xc2/x34 HANGUL SYLLABLE TYILG
-+<UD2DE>     /x83/x35/xc2/x35 HANGUL SYLLABLE TYILM
-+<UD2DF>     /x83/x35/xc2/x36 HANGUL SYLLABLE TYILB
-+<UD2E0>     /x83/x35/xc2/x37 HANGUL SYLLABLE TYILS
-+<UD2E1>     /x83/x35/xc2/x38 HANGUL SYLLABLE TYILT
-+<UD2E2>     /x83/x35/xc2/x39 HANGUL SYLLABLE TYILP
-+<UD2E3>     /x83/x35/xc3/x30 HANGUL SYLLABLE TYILH
-+<UD2E4>     /x83/x35/xc3/x31 HANGUL SYLLABLE TYIM
-+<UD2E5>     /x83/x35/xc3/x32 HANGUL SYLLABLE TYIB
-+<UD2E6>     /x83/x35/xc3/x33 HANGUL SYLLABLE TYIBS
-+<UD2E7>     /x83/x35/xc3/x34 HANGUL SYLLABLE TYIS
-+<UD2E8>     /x83/x35/xc3/x35 HANGUL SYLLABLE TYISS
-+<UD2E9>     /x83/x35/xc3/x36 HANGUL SYLLABLE TYING
-+<UD2EA>     /x83/x35/xc3/x37 HANGUL SYLLABLE TYIJ
-+<UD2EB>     /x83/x35/xc3/x38 HANGUL SYLLABLE TYIC
-+<UD2EC>     /x83/x35/xc3/x39 HANGUL SYLLABLE TYIK
-+<UD2ED>     /x83/x35/xc4/x30 HANGUL SYLLABLE TYIT
-+<UD2EE>     /x83/x35/xc4/x31 HANGUL SYLLABLE TYIP
-+<UD2EF>     /x83/x35/xc4/x32 HANGUL SYLLABLE TYIH
-+<UD2F0>     /x83/x35/xc4/x33 HANGUL SYLLABLE TI
-+<UD2F1>     /x83/x35/xc4/x34 HANGUL SYLLABLE TIG
-+<UD2F2>     /x83/x35/xc4/x35 HANGUL SYLLABLE TIGG
-+<UD2F3>     /x83/x35/xc4/x36 HANGUL SYLLABLE TIGS
-+<UD2F4>     /x83/x35/xc4/x37 HANGUL SYLLABLE TIN
-+<UD2F5>     /x83/x35/xc4/x38 HANGUL SYLLABLE TINI
-+<UD2F6>     /x83/x35/xc4/x39 HANGUL SYLLABLE TINH
-+<UD2F7>     /x83/x35/xc5/x30 HANGUL SYLLABLE TID
-+<UD2F8>     /x83/x35/xc5/x31 HANGUL SYLLABLE TIL
-+<UD2F9>     /x83/x35/xc5/x32 HANGUL SYLLABLE TILG
-+<UD2FA>     /x83/x35/xc5/x33 HANGUL SYLLABLE TILM
-+<UD2FB>     /x83/x35/xc5/x34 HANGUL SYLLABLE TILB
-+<UD2FC>     /x83/x35/xc5/x35 HANGUL SYLLABLE TILS
-+<UD2FD>     /x83/x35/xc5/x36 HANGUL SYLLABLE TILT
-+<UD2FE>     /x83/x35/xc5/x37 HANGUL SYLLABLE TILP
-+<UD2FF>     /x83/x35/xc5/x38 HANGUL SYLLABLE TILH
-+<UD300>     /x83/x35/xc5/x39 HANGUL SYLLABLE TIM
-+<UD301>     /x83/x35/xc6/x30 HANGUL SYLLABLE TIB
-+<UD302>     /x83/x35/xc6/x31 HANGUL SYLLABLE TIBS
-+<UD303>     /x83/x35/xc6/x32 HANGUL SYLLABLE TIS
-+<UD304>     /x83/x35/xc6/x33 HANGUL SYLLABLE TISS
-+<UD305>     /x83/x35/xc6/x34 HANGUL SYLLABLE TING
-+<UD306>     /x83/x35/xc6/x35 HANGUL SYLLABLE TIJ
-+<UD307>     /x83/x35/xc6/x36 HANGUL SYLLABLE TIC
-+<UD308>     /x83/x35/xc6/x37 HANGUL SYLLABLE TIK
-+<UD309>     /x83/x35/xc6/x38 HANGUL SYLLABLE TIT
-+<UD30A>     /x83/x35/xc6/x39 HANGUL SYLLABLE TIP
-+<UD30B>     /x83/x35/xc7/x30 HANGUL SYLLABLE TIH
-+<UD30C>     /x83/x35/xc7/x31 HANGUL SYLLABLE PA
-+<UD30D>     /x83/x35/xc7/x32 HANGUL SYLLABLE PAG
-+<UD30E>     /x83/x35/xc7/x33 HANGUL SYLLABLE PAGG
-+<UD30F>     /x83/x35/xc7/x34 HANGUL SYLLABLE PAGS
-+<UD310>     /x83/x35/xc7/x35 HANGUL SYLLABLE PAN
-+<UD311>     /x83/x35/xc7/x36 HANGUL SYLLABLE PANI
-+<UD312>     /x83/x35/xc7/x37 HANGUL SYLLABLE PANH
-+<UD313>     /x83/x35/xc7/x38 HANGUL SYLLABLE PAD
-+<UD314>     /x83/x35/xc7/x39 HANGUL SYLLABLE PAL
-+<UD315>     /x83/x35/xc8/x30 HANGUL SYLLABLE PALG
-+<UD316>     /x83/x35/xc8/x31 HANGUL SYLLABLE PALM
-+<UD317>     /x83/x35/xc8/x32 HANGUL SYLLABLE PALB
-+<UD318>     /x83/x35/xc8/x33 HANGUL SYLLABLE PALS
-+<UD319>     /x83/x35/xc8/x34 HANGUL SYLLABLE PALT
-+<UD31A>     /x83/x35/xc8/x35 HANGUL SYLLABLE PALP
-+<UD31B>     /x83/x35/xc8/x36 HANGUL SYLLABLE PALH
-+<UD31C>     /x83/x35/xc8/x37 HANGUL SYLLABLE PAM
-+<UD31D>     /x83/x35/xc8/x38 HANGUL SYLLABLE PAB
-+<UD31E>     /x83/x35/xc8/x39 HANGUL SYLLABLE PABS
-+<UD31F>     /x83/x35/xc9/x30 HANGUL SYLLABLE PAS
-+<UD320>     /x83/x35/xc9/x31 HANGUL SYLLABLE PASS
-+<UD321>     /x83/x35/xc9/x32 HANGUL SYLLABLE PANG
-+<UD322>     /x83/x35/xc9/x33 HANGUL SYLLABLE PAJ
-+<UD323>     /x83/x35/xc9/x34 HANGUL SYLLABLE PAC
-+<UD324>     /x83/x35/xc9/x35 HANGUL SYLLABLE PAK
-+<UD325>     /x83/x35/xc9/x36 HANGUL SYLLABLE PAT
-+<UD326>     /x83/x35/xc9/x37 HANGUL SYLLABLE PAP
-+<UD327>     /x83/x35/xc9/x38 HANGUL SYLLABLE PAH
-+<UD328>     /x83/x35/xc9/x39 HANGUL SYLLABLE PAE
-+<UD329>     /x83/x35/xca/x30 HANGUL SYLLABLE PAEG
-+<UD32A>     /x83/x35/xca/x31 HANGUL SYLLABLE PAEGG
-+<UD32B>     /x83/x35/xca/x32 HANGUL SYLLABLE PAEGS
-+<UD32C>     /x83/x35/xca/x33 HANGUL SYLLABLE PAEN
-+<UD32D>     /x83/x35/xca/x34 HANGUL SYLLABLE PAENI
-+<UD32E>     /x83/x35/xca/x35 HANGUL SYLLABLE PAENH
-+<UD32F>     /x83/x35/xca/x36 HANGUL SYLLABLE PAED
-+<UD330>     /x83/x35/xca/x37 HANGUL SYLLABLE PAEL
-+<UD331>     /x83/x35/xca/x38 HANGUL SYLLABLE PAELG
-+<UD332>     /x83/x35/xca/x39 HANGUL SYLLABLE PAELM
-+<UD333>     /x83/x35/xcb/x30 HANGUL SYLLABLE PAELB
-+<UD334>     /x83/x35/xcb/x31 HANGUL SYLLABLE PAELS
-+<UD335>     /x83/x35/xcb/x32 HANGUL SYLLABLE PAELT
-+<UD336>     /x83/x35/xcb/x33 HANGUL SYLLABLE PAELP
-+<UD337>     /x83/x35/xcb/x34 HANGUL SYLLABLE PAELH
-+<UD338>     /x83/x35/xcb/x35 HANGUL SYLLABLE PAEM
-+<UD339>     /x83/x35/xcb/x36 HANGUL SYLLABLE PAEB
-+<UD33A>     /x83/x35/xcb/x37 HANGUL SYLLABLE PAEBS
-+<UD33B>     /x83/x35/xcb/x38 HANGUL SYLLABLE PAES
-+<UD33C>     /x83/x35/xcb/x39 HANGUL SYLLABLE PAESS
-+<UD33D>     /x83/x35/xcc/x30 HANGUL SYLLABLE PAENG
-+<UD33E>     /x83/x35/xcc/x31 HANGUL SYLLABLE PAEJ
-+<UD33F>     /x83/x35/xcc/x32 HANGUL SYLLABLE PAEC
-+<UD340>     /x83/x35/xcc/x33 HANGUL SYLLABLE PAEK
-+<UD341>     /x83/x35/xcc/x34 HANGUL SYLLABLE PAET
-+<UD342>     /x83/x35/xcc/x35 HANGUL SYLLABLE PAEP
-+<UD343>     /x83/x35/xcc/x36 HANGUL SYLLABLE PAEH
-+<UD344>     /x83/x35/xcc/x37 HANGUL SYLLABLE PYA
-+<UD345>     /x83/x35/xcc/x38 HANGUL SYLLABLE PYAG
-+<UD346>     /x83/x35/xcc/x39 HANGUL SYLLABLE PYAGG
-+<UD347>     /x83/x35/xcd/x30 HANGUL SYLLABLE PYAGS
-+<UD348>     /x83/x35/xcd/x31 HANGUL SYLLABLE PYAN
-+<UD349>     /x83/x35/xcd/x32 HANGUL SYLLABLE PYANI
-+<UD34A>     /x83/x35/xcd/x33 HANGUL SYLLABLE PYANH
-+<UD34B>     /x83/x35/xcd/x34 HANGUL SYLLABLE PYAD
-+<UD34C>     /x83/x35/xcd/x35 HANGUL SYLLABLE PYAL
-+<UD34D>     /x83/x35/xcd/x36 HANGUL SYLLABLE PYALG
-+<UD34E>     /x83/x35/xcd/x37 HANGUL SYLLABLE PYALM
-+<UD34F>     /x83/x35/xcd/x38 HANGUL SYLLABLE PYALB
-+<UD350>     /x83/x35/xcd/x39 HANGUL SYLLABLE PYALS
-+<UD351>     /x83/x35/xce/x30 HANGUL SYLLABLE PYALT
-+<UD352>     /x83/x35/xce/x31 HANGUL SYLLABLE PYALP
-+<UD353>     /x83/x35/xce/x32 HANGUL SYLLABLE PYALH
-+<UD354>     /x83/x35/xce/x33 HANGUL SYLLABLE PYAM
-+<UD355>     /x83/x35/xce/x34 HANGUL SYLLABLE PYAB
-+<UD356>     /x83/x35/xce/x35 HANGUL SYLLABLE PYABS
-+<UD357>     /x83/x35/xce/x36 HANGUL SYLLABLE PYAS
-+<UD358>     /x83/x35/xce/x37 HANGUL SYLLABLE PYASS
-+<UD359>     /x83/x35/xce/x38 HANGUL SYLLABLE PYANG
-+<UD35A>     /x83/x35/xce/x39 HANGUL SYLLABLE PYAJ
-+<UD35B>     /x83/x35/xcf/x30 HANGUL SYLLABLE PYAC
-+<UD35C>     /x83/x35/xcf/x31 HANGUL SYLLABLE PYAK
-+<UD35D>     /x83/x35/xcf/x32 HANGUL SYLLABLE PYAT
-+<UD35E>     /x83/x35/xcf/x33 HANGUL SYLLABLE PYAP
-+<UD35F>     /x83/x35/xcf/x34 HANGUL SYLLABLE PYAH
-+<UD360>     /x83/x35/xcf/x35 HANGUL SYLLABLE PYAE
-+<UD361>     /x83/x35/xcf/x36 HANGUL SYLLABLE PYAEG
-+<UD362>     /x83/x35/xcf/x37 HANGUL SYLLABLE PYAEGG
-+<UD363>     /x83/x35/xcf/x38 HANGUL SYLLABLE PYAEGS
-+<UD364>     /x83/x35/xcf/x39 HANGUL SYLLABLE PYAEN
-+<UD365>     /x83/x35/xd0/x30 HANGUL SYLLABLE PYAENI
-+<UD366>     /x83/x35/xd0/x31 HANGUL SYLLABLE PYAENH
-+<UD367>     /x83/x35/xd0/x32 HANGUL SYLLABLE PYAED
-+<UD368>     /x83/x35/xd0/x33 HANGUL SYLLABLE PYAEL
-+<UD369>     /x83/x35/xd0/x34 HANGUL SYLLABLE PYAELG
-+<UD36A>     /x83/x35/xd0/x35 HANGUL SYLLABLE PYAELM
-+<UD36B>     /x83/x35/xd0/x36 HANGUL SYLLABLE PYAELB
-+<UD36C>     /x83/x35/xd0/x37 HANGUL SYLLABLE PYAELS
-+<UD36D>     /x83/x35/xd0/x38 HANGUL SYLLABLE PYAELT
-+<UD36E>     /x83/x35/xd0/x39 HANGUL SYLLABLE PYAELP
-+<UD36F>     /x83/x35/xd1/x30 HANGUL SYLLABLE PYAELH
-+<UD370>     /x83/x35/xd1/x31 HANGUL SYLLABLE PYAEM
-+<UD371>     /x83/x35/xd1/x32 HANGUL SYLLABLE PYAEB
-+<UD372>     /x83/x35/xd1/x33 HANGUL SYLLABLE PYAEBS
-+<UD373>     /x83/x35/xd1/x34 HANGUL SYLLABLE PYAES
-+<UD374>     /x83/x35/xd1/x35 HANGUL SYLLABLE PYAESS
-+<UD375>     /x83/x35/xd1/x36 HANGUL SYLLABLE PYAENG
-+<UD376>     /x83/x35/xd1/x37 HANGUL SYLLABLE PYAEJ
-+<UD377>     /x83/x35/xd1/x38 HANGUL SYLLABLE PYAEC
-+<UD378>     /x83/x35/xd1/x39 HANGUL SYLLABLE PYAEK
-+<UD379>     /x83/x35/xd2/x30 HANGUL SYLLABLE PYAET
-+<UD37A>     /x83/x35/xd2/x31 HANGUL SYLLABLE PYAEP
-+<UD37B>     /x83/x35/xd2/x32 HANGUL SYLLABLE PYAEH
-+<UD37C>     /x83/x35/xd2/x33 HANGUL SYLLABLE PEO
-+<UD37D>     /x83/x35/xd2/x34 HANGUL SYLLABLE PEOG
-+<UD37E>     /x83/x35/xd2/x35 HANGUL SYLLABLE PEOGG
-+<UD37F>     /x83/x35/xd2/x36 HANGUL SYLLABLE PEOGS
-+<UD380>     /x83/x35/xd2/x37 HANGUL SYLLABLE PEON
-+<UD381>     /x83/x35/xd2/x38 HANGUL SYLLABLE PEONI
-+<UD382>     /x83/x35/xd2/x39 HANGUL SYLLABLE PEONH
-+<UD383>     /x83/x35/xd3/x30 HANGUL SYLLABLE PEOD
-+<UD384>     /x83/x35/xd3/x31 HANGUL SYLLABLE PEOL
-+<UD385>     /x83/x35/xd3/x32 HANGUL SYLLABLE PEOLG
-+<UD386>     /x83/x35/xd3/x33 HANGUL SYLLABLE PEOLM
-+<UD387>     /x83/x35/xd3/x34 HANGUL SYLLABLE PEOLB
-+<UD388>     /x83/x35/xd3/x35 HANGUL SYLLABLE PEOLS
-+<UD389>     /x83/x35/xd3/x36 HANGUL SYLLABLE PEOLT
-+<UD38A>     /x83/x35/xd3/x37 HANGUL SYLLABLE PEOLP
-+<UD38B>     /x83/x35/xd3/x38 HANGUL SYLLABLE PEOLH
-+<UD38C>     /x83/x35/xd3/x39 HANGUL SYLLABLE PEOM
-+<UD38D>     /x83/x35/xd4/x30 HANGUL SYLLABLE PEOB
-+<UD38E>     /x83/x35/xd4/x31 HANGUL SYLLABLE PEOBS
-+<UD38F>     /x83/x35/xd4/x32 HANGUL SYLLABLE PEOS
-+<UD390>     /x83/x35/xd4/x33 HANGUL SYLLABLE PEOSS
-+<UD391>     /x83/x35/xd4/x34 HANGUL SYLLABLE PEONG
-+<UD392>     /x83/x35/xd4/x35 HANGUL SYLLABLE PEOJ
-+<UD393>     /x83/x35/xd4/x36 HANGUL SYLLABLE PEOC
-+<UD394>     /x83/x35/xd4/x37 HANGUL SYLLABLE PEOK
-+<UD395>     /x83/x35/xd4/x38 HANGUL SYLLABLE PEOT
-+<UD396>     /x83/x35/xd4/x39 HANGUL SYLLABLE PEOP
-+<UD397>     /x83/x35/xd5/x30 HANGUL SYLLABLE PEOH
-+<UD398>     /x83/x35/xd5/x31 HANGUL SYLLABLE PE
-+<UD399>     /x83/x35/xd5/x32 HANGUL SYLLABLE PEG
-+<UD39A>     /x83/x35/xd5/x33 HANGUL SYLLABLE PEGG
-+<UD39B>     /x83/x35/xd5/x34 HANGUL SYLLABLE PEGS
-+<UD39C>     /x83/x35/xd5/x35 HANGUL SYLLABLE PEN
-+<UD39D>     /x83/x35/xd5/x36 HANGUL SYLLABLE PENI
-+<UD39E>     /x83/x35/xd5/x37 HANGUL SYLLABLE PENH
-+<UD39F>     /x83/x35/xd5/x38 HANGUL SYLLABLE PED
-+<UD3A0>     /x83/x35/xd5/x39 HANGUL SYLLABLE PEL
-+<UD3A1>     /x83/x35/xd6/x30 HANGUL SYLLABLE PELG
-+<UD3A2>     /x83/x35/xd6/x31 HANGUL SYLLABLE PELM
-+<UD3A3>     /x83/x35/xd6/x32 HANGUL SYLLABLE PELB
-+<UD3A4>     /x83/x35/xd6/x33 HANGUL SYLLABLE PELS
-+<UD3A5>     /x83/x35/xd6/x34 HANGUL SYLLABLE PELT
-+<UD3A6>     /x83/x35/xd6/x35 HANGUL SYLLABLE PELP
-+<UD3A7>     /x83/x35/xd6/x36 HANGUL SYLLABLE PELH
-+<UD3A8>     /x83/x35/xd6/x37 HANGUL SYLLABLE PEM
-+<UD3A9>     /x83/x35/xd6/x38 HANGUL SYLLABLE PEB
-+<UD3AA>     /x83/x35/xd6/x39 HANGUL SYLLABLE PEBS
-+<UD3AB>     /x83/x35/xd7/x30 HANGUL SYLLABLE PES
-+<UD3AC>     /x83/x35/xd7/x31 HANGUL SYLLABLE PESS
-+<UD3AD>     /x83/x35/xd7/x32 HANGUL SYLLABLE PENG
-+<UD3AE>     /x83/x35/xd7/x33 HANGUL SYLLABLE PEJ
-+<UD3AF>     /x83/x35/xd7/x34 HANGUL SYLLABLE PEC
-+<UD3B0>     /x83/x35/xd7/x35 HANGUL SYLLABLE PEK
-+<UD3B1>     /x83/x35/xd7/x36 HANGUL SYLLABLE PET
-+<UD3B2>     /x83/x35/xd7/x37 HANGUL SYLLABLE PEP
-+<UD3B3>     /x83/x35/xd7/x38 HANGUL SYLLABLE PEH
-+<UD3B4>     /x83/x35/xd7/x39 HANGUL SYLLABLE PYEO
-+<UD3B5>     /x83/x35/xd8/x30 HANGUL SYLLABLE PYEOG
-+<UD3B6>     /x83/x35/xd8/x31 HANGUL SYLLABLE PYEOGG
-+<UD3B7>     /x83/x35/xd8/x32 HANGUL SYLLABLE PYEOGS
-+<UD3B8>     /x83/x35/xd8/x33 HANGUL SYLLABLE PYEON
-+<UD3B9>     /x83/x35/xd8/x34 HANGUL SYLLABLE PYEONI
-+<UD3BA>     /x83/x35/xd8/x35 HANGUL SYLLABLE PYEONH
-+<UD3BB>     /x83/x35/xd8/x36 HANGUL SYLLABLE PYEOD
-+<UD3BC>     /x83/x35/xd8/x37 HANGUL SYLLABLE PYEOL
-+<UD3BD>     /x83/x35/xd8/x38 HANGUL SYLLABLE PYEOLG
-+<UD3BE>     /x83/x35/xd8/x39 HANGUL SYLLABLE PYEOLM
-+<UD3BF>     /x83/x35/xd9/x30 HANGUL SYLLABLE PYEOLB
-+<UD3C0>     /x83/x35/xd9/x31 HANGUL SYLLABLE PYEOLS
-+<UD3C1>     /x83/x35/xd9/x32 HANGUL SYLLABLE PYEOLT
-+<UD3C2>     /x83/x35/xd9/x33 HANGUL SYLLABLE PYEOLP
-+<UD3C3>     /x83/x35/xd9/x34 HANGUL SYLLABLE PYEOLH
-+<UD3C4>     /x83/x35/xd9/x35 HANGUL SYLLABLE PYEOM
-+<UD3C5>     /x83/x35/xd9/x36 HANGUL SYLLABLE PYEOB
-+<UD3C6>     /x83/x35/xd9/x37 HANGUL SYLLABLE PYEOBS
-+<UD3C7>     /x83/x35/xd9/x38 HANGUL SYLLABLE PYEOS
-+<UD3C8>     /x83/x35/xd9/x39 HANGUL SYLLABLE PYEOSS
-+<UD3C9>     /x83/x35/xda/x30 HANGUL SYLLABLE PYEONG
-+<UD3CA>     /x83/x35/xda/x31 HANGUL SYLLABLE PYEOJ
-+<UD3CB>     /x83/x35/xda/x32 HANGUL SYLLABLE PYEOC
-+<UD3CC>     /x83/x35/xda/x33 HANGUL SYLLABLE PYEOK
-+<UD3CD>     /x83/x35/xda/x34 HANGUL SYLLABLE PYEOT
-+<UD3CE>     /x83/x35/xda/x35 HANGUL SYLLABLE PYEOP
-+<UD3CF>     /x83/x35/xda/x36 HANGUL SYLLABLE PYEOH
-+<UD3D0>     /x83/x35/xda/x37 HANGUL SYLLABLE PYE
-+<UD3D1>     /x83/x35/xda/x38 HANGUL SYLLABLE PYEG
-+<UD3D2>     /x83/x35/xda/x39 HANGUL SYLLABLE PYEGG
-+<UD3D3>     /x83/x35/xdb/x30 HANGUL SYLLABLE PYEGS
-+<UD3D4>     /x83/x35/xdb/x31 HANGUL SYLLABLE PYEN
-+<UD3D5>     /x83/x35/xdb/x32 HANGUL SYLLABLE PYENI
-+<UD3D6>     /x83/x35/xdb/x33 HANGUL SYLLABLE PYENH
-+<UD3D7>     /x83/x35/xdb/x34 HANGUL SYLLABLE PYED
-+<UD3D8>     /x83/x35/xdb/x35 HANGUL SYLLABLE PYEL
-+<UD3D9>     /x83/x35/xdb/x36 HANGUL SYLLABLE PYELG
-+<UD3DA>     /x83/x35/xdb/x37 HANGUL SYLLABLE PYELM
-+<UD3DB>     /x83/x35/xdb/x38 HANGUL SYLLABLE PYELB
-+<UD3DC>     /x83/x35/xdb/x39 HANGUL SYLLABLE PYELS
-+<UD3DD>     /x83/x35/xdc/x30 HANGUL SYLLABLE PYELT
-+<UD3DE>     /x83/x35/xdc/x31 HANGUL SYLLABLE PYELP
-+<UD3DF>     /x83/x35/xdc/x32 HANGUL SYLLABLE PYELH
-+<UD3E0>     /x83/x35/xdc/x33 HANGUL SYLLABLE PYEM
-+<UD3E1>     /x83/x35/xdc/x34 HANGUL SYLLABLE PYEB
-+<UD3E2>     /x83/x35/xdc/x35 HANGUL SYLLABLE PYEBS
-+<UD3E3>     /x83/x35/xdc/x36 HANGUL SYLLABLE PYES
-+<UD3E4>     /x83/x35/xdc/x37 HANGUL SYLLABLE PYESS
-+<UD3E5>     /x83/x35/xdc/x38 HANGUL SYLLABLE PYENG
-+<UD3E6>     /x83/x35/xdc/x39 HANGUL SYLLABLE PYEJ
-+<UD3E7>     /x83/x35/xdd/x30 HANGUL SYLLABLE PYEC
-+<UD3E8>     /x83/x35/xdd/x31 HANGUL SYLLABLE PYEK
-+<UD3E9>     /x83/x35/xdd/x32 HANGUL SYLLABLE PYET
-+<UD3EA>     /x83/x35/xdd/x33 HANGUL SYLLABLE PYEP
-+<UD3EB>     /x83/x35/xdd/x34 HANGUL SYLLABLE PYEH
-+<UD3EC>     /x83/x35/xdd/x35 HANGUL SYLLABLE PO
-+<UD3ED>     /x83/x35/xdd/x36 HANGUL SYLLABLE POG
-+<UD3EE>     /x83/x35/xdd/x37 HANGUL SYLLABLE POGG
-+<UD3EF>     /x83/x35/xdd/x38 HANGUL SYLLABLE POGS
-+<UD3F0>     /x83/x35/xdd/x39 HANGUL SYLLABLE PON
-+<UD3F1>     /x83/x35/xde/x30 HANGUL SYLLABLE PONI
-+<UD3F2>     /x83/x35/xde/x31 HANGUL SYLLABLE PONH
-+<UD3F3>     /x83/x35/xde/x32 HANGUL SYLLABLE POD
-+<UD3F4>     /x83/x35/xde/x33 HANGUL SYLLABLE POL
-+<UD3F5>     /x83/x35/xde/x34 HANGUL SYLLABLE POLG
-+<UD3F6>     /x83/x35/xde/x35 HANGUL SYLLABLE POLM
-+<UD3F7>     /x83/x35/xde/x36 HANGUL SYLLABLE POLB
-+<UD3F8>     /x83/x35/xde/x37 HANGUL SYLLABLE POLS
-+<UD3F9>     /x83/x35/xde/x38 HANGUL SYLLABLE POLT
-+<UD3FA>     /x83/x35/xde/x39 HANGUL SYLLABLE POLP
-+<UD3FB>     /x83/x35/xdf/x30 HANGUL SYLLABLE POLH
-+<UD3FC>     /x83/x35/xdf/x31 HANGUL SYLLABLE POM
-+<UD3FD>     /x83/x35/xdf/x32 HANGUL SYLLABLE POB
-+<UD3FE>     /x83/x35/xdf/x33 HANGUL SYLLABLE POBS
-+<UD3FF>     /x83/x35/xdf/x34 HANGUL SYLLABLE POS
-+<UD400>     /x83/x35/xdf/x35 HANGUL SYLLABLE POSS
-+<UD401>     /x83/x35/xdf/x36 HANGUL SYLLABLE PONG
-+<UD402>     /x83/x35/xdf/x37 HANGUL SYLLABLE POJ
-+<UD403>     /x83/x35/xdf/x38 HANGUL SYLLABLE POC
-+<UD404>     /x83/x35/xdf/x39 HANGUL SYLLABLE POK
-+<UD405>     /x83/x35/xe0/x30 HANGUL SYLLABLE POT
-+<UD406>     /x83/x35/xe0/x31 HANGUL SYLLABLE POP
-+<UD407>     /x83/x35/xe0/x32 HANGUL SYLLABLE POH
-+<UD408>     /x83/x35/xe0/x33 HANGUL SYLLABLE PWA
-+<UD409>     /x83/x35/xe0/x34 HANGUL SYLLABLE PWAG
-+<UD40A>     /x83/x35/xe0/x35 HANGUL SYLLABLE PWAGG
-+<UD40B>     /x83/x35/xe0/x36 HANGUL SYLLABLE PWAGS
-+<UD40C>     /x83/x35/xe0/x37 HANGUL SYLLABLE PWAN
-+<UD40D>     /x83/x35/xe0/x38 HANGUL SYLLABLE PWANI
-+<UD40E>     /x83/x35/xe0/x39 HANGUL SYLLABLE PWANH
-+<UD40F>     /x83/x35/xe1/x30 HANGUL SYLLABLE PWAD
-+<UD410>     /x83/x35/xe1/x31 HANGUL SYLLABLE PWAL
-+<UD411>     /x83/x35/xe1/x32 HANGUL SYLLABLE PWALG
-+<UD412>     /x83/x35/xe1/x33 HANGUL SYLLABLE PWALM
-+<UD413>     /x83/x35/xe1/x34 HANGUL SYLLABLE PWALB
-+<UD414>     /x83/x35/xe1/x35 HANGUL SYLLABLE PWALS
-+<UD415>     /x83/x35/xe1/x36 HANGUL SYLLABLE PWALT
-+<UD416>     /x83/x35/xe1/x37 HANGUL SYLLABLE PWALP
-+<UD417>     /x83/x35/xe1/x38 HANGUL SYLLABLE PWALH
-+<UD418>     /x83/x35/xe1/x39 HANGUL SYLLABLE PWAM
-+<UD419>     /x83/x35/xe2/x30 HANGUL SYLLABLE PWAB
-+<UD41A>     /x83/x35/xe2/x31 HANGUL SYLLABLE PWABS
-+<UD41B>     /x83/x35/xe2/x32 HANGUL SYLLABLE PWAS
-+<UD41C>     /x83/x35/xe2/x33 HANGUL SYLLABLE PWASS
-+<UD41D>     /x83/x35/xe2/x34 HANGUL SYLLABLE PWANG
-+<UD41E>     /x83/x35/xe2/x35 HANGUL SYLLABLE PWAJ
-+<UD41F>     /x83/x35/xe2/x36 HANGUL SYLLABLE PWAC
-+<UD420>     /x83/x35/xe2/x37 HANGUL SYLLABLE PWAK
-+<UD421>     /x83/x35/xe2/x38 HANGUL SYLLABLE PWAT
-+<UD422>     /x83/x35/xe2/x39 HANGUL SYLLABLE PWAP
-+<UD423>     /x83/x35/xe3/x30 HANGUL SYLLABLE PWAH
-+<UD424>     /x83/x35/xe3/x31 HANGUL SYLLABLE PWAE
-+<UD425>     /x83/x35/xe3/x32 HANGUL SYLLABLE PWAEG
-+<UD426>     /x83/x35/xe3/x33 HANGUL SYLLABLE PWAEGG
-+<UD427>     /x83/x35/xe3/x34 HANGUL SYLLABLE PWAEGS
-+<UD428>     /x83/x35/xe3/x35 HANGUL SYLLABLE PWAEN
-+<UD429>     /x83/x35/xe3/x36 HANGUL SYLLABLE PWAENI
-+<UD42A>     /x83/x35/xe3/x37 HANGUL SYLLABLE PWAENH
-+<UD42B>     /x83/x35/xe3/x38 HANGUL SYLLABLE PWAED
-+<UD42C>     /x83/x35/xe3/x39 HANGUL SYLLABLE PWAEL
-+<UD42D>     /x83/x35/xe4/x30 HANGUL SYLLABLE PWAELG
-+<UD42E>     /x83/x35/xe4/x31 HANGUL SYLLABLE PWAELM
-+<UD42F>     /x83/x35/xe4/x32 HANGUL SYLLABLE PWAELB
-+<UD430>     /x83/x35/xe4/x33 HANGUL SYLLABLE PWAELS
-+<UD431>     /x83/x35/xe4/x34 HANGUL SYLLABLE PWAELT
-+<UD432>     /x83/x35/xe4/x35 HANGUL SYLLABLE PWAELP
-+<UD433>     /x83/x35/xe4/x36 HANGUL SYLLABLE PWAELH
-+<UD434>     /x83/x35/xe4/x37 HANGUL SYLLABLE PWAEM
-+<UD435>     /x83/x35/xe4/x38 HANGUL SYLLABLE PWAEB
-+<UD436>     /x83/x35/xe4/x39 HANGUL SYLLABLE PWAEBS
-+<UD437>     /x83/x35/xe5/x30 HANGUL SYLLABLE PWAES
-+<UD438>     /x83/x35/xe5/x31 HANGUL SYLLABLE PWAESS
-+<UD439>     /x83/x35/xe5/x32 HANGUL SYLLABLE PWAENG
-+<UD43A>     /x83/x35/xe5/x33 HANGUL SYLLABLE PWAEJ
-+<UD43B>     /x83/x35/xe5/x34 HANGUL SYLLABLE PWAEC
-+<UD43C>     /x83/x35/xe5/x35 HANGUL SYLLABLE PWAEK
-+<UD43D>     /x83/x35/xe5/x36 HANGUL SYLLABLE PWAET
-+<UD43E>     /x83/x35/xe5/x37 HANGUL SYLLABLE PWAEP
-+<UD43F>     /x83/x35/xe5/x38 HANGUL SYLLABLE PWAEH
-+<UD440>     /x83/x35/xe5/x39 HANGUL SYLLABLE POE
-+<UD441>     /x83/x35/xe6/x30 HANGUL SYLLABLE POEG
-+<UD442>     /x83/x35/xe6/x31 HANGUL SYLLABLE POEGG
-+<UD443>     /x83/x35/xe6/x32 HANGUL SYLLABLE POEGS
-+<UD444>     /x83/x35/xe6/x33 HANGUL SYLLABLE POEN
-+<UD445>     /x83/x35/xe6/x34 HANGUL SYLLABLE POENI
-+<UD446>     /x83/x35/xe6/x35 HANGUL SYLLABLE POENH
-+<UD447>     /x83/x35/xe6/x36 HANGUL SYLLABLE POED
-+<UD448>     /x83/x35/xe6/x37 HANGUL SYLLABLE POEL
-+<UD449>     /x83/x35/xe6/x38 HANGUL SYLLABLE POELG
-+<UD44A>     /x83/x35/xe6/x39 HANGUL SYLLABLE POELM
-+<UD44B>     /x83/x35/xe7/x30 HANGUL SYLLABLE POELB
-+<UD44C>     /x83/x35/xe7/x31 HANGUL SYLLABLE POELS
-+<UD44D>     /x83/x35/xe7/x32 HANGUL SYLLABLE POELT
-+<UD44E>     /x83/x35/xe7/x33 HANGUL SYLLABLE POELP
-+<UD44F>     /x83/x35/xe7/x34 HANGUL SYLLABLE POELH
-+<UD450>     /x83/x35/xe7/x35 HANGUL SYLLABLE POEM
-+<UD451>     /x83/x35/xe7/x36 HANGUL SYLLABLE POEB
-+<UD452>     /x83/x35/xe7/x37 HANGUL SYLLABLE POEBS
-+<UD453>     /x83/x35/xe7/x38 HANGUL SYLLABLE POES
-+<UD454>     /x83/x35/xe7/x39 HANGUL SYLLABLE POESS
-+<UD455>     /x83/x35/xe8/x30 HANGUL SYLLABLE POENG
-+<UD456>     /x83/x35/xe8/x31 HANGUL SYLLABLE POEJ
-+<UD457>     /x83/x35/xe8/x32 HANGUL SYLLABLE POEC
-+<UD458>     /x83/x35/xe8/x33 HANGUL SYLLABLE POEK
-+<UD459>     /x83/x35/xe8/x34 HANGUL SYLLABLE POET
-+<UD45A>     /x83/x35/xe8/x35 HANGUL SYLLABLE POEP
-+<UD45B>     /x83/x35/xe8/x36 HANGUL SYLLABLE POEH
-+<UD45C>     /x83/x35/xe8/x37 HANGUL SYLLABLE PYO
-+<UD45D>     /x83/x35/xe8/x38 HANGUL SYLLABLE PYOG
-+<UD45E>     /x83/x35/xe8/x39 HANGUL SYLLABLE PYOGG
-+<UD45F>     /x83/x35/xe9/x30 HANGUL SYLLABLE PYOGS
-+<UD460>     /x83/x35/xe9/x31 HANGUL SYLLABLE PYON
-+<UD461>     /x83/x35/xe9/x32 HANGUL SYLLABLE PYONI
-+<UD462>     /x83/x35/xe9/x33 HANGUL SYLLABLE PYONH
-+<UD463>     /x83/x35/xe9/x34 HANGUL SYLLABLE PYOD
-+<UD464>     /x83/x35/xe9/x35 HANGUL SYLLABLE PYOL
-+<UD465>     /x83/x35/xe9/x36 HANGUL SYLLABLE PYOLG
-+<UD466>     /x83/x35/xe9/x37 HANGUL SYLLABLE PYOLM
-+<UD467>     /x83/x35/xe9/x38 HANGUL SYLLABLE PYOLB
-+<UD468>     /x83/x35/xe9/x39 HANGUL SYLLABLE PYOLS
-+<UD469>     /x83/x35/xea/x30 HANGUL SYLLABLE PYOLT
-+<UD46A>     /x83/x35/xea/x31 HANGUL SYLLABLE PYOLP
-+<UD46B>     /x83/x35/xea/x32 HANGUL SYLLABLE PYOLH
-+<UD46C>     /x83/x35/xea/x33 HANGUL SYLLABLE PYOM
-+<UD46D>     /x83/x35/xea/x34 HANGUL SYLLABLE PYOB
-+<UD46E>     /x83/x35/xea/x35 HANGUL SYLLABLE PYOBS
-+<UD46F>     /x83/x35/xea/x36 HANGUL SYLLABLE PYOS
-+<UD470>     /x83/x35/xea/x37 HANGUL SYLLABLE PYOSS
-+<UD471>     /x83/x35/xea/x38 HANGUL SYLLABLE PYONG
-+<UD472>     /x83/x35/xea/x39 HANGUL SYLLABLE PYOJ
-+<UD473>     /x83/x35/xeb/x30 HANGUL SYLLABLE PYOC
-+<UD474>     /x83/x35/xeb/x31 HANGUL SYLLABLE PYOK
-+<UD475>     /x83/x35/xeb/x32 HANGUL SYLLABLE PYOT
-+<UD476>     /x83/x35/xeb/x33 HANGUL SYLLABLE PYOP
-+<UD477>     /x83/x35/xeb/x34 HANGUL SYLLABLE PYOH
-+<UD478>     /x83/x35/xeb/x35 HANGUL SYLLABLE PU
-+<UD479>     /x83/x35/xeb/x36 HANGUL SYLLABLE PUG
-+<UD47A>     /x83/x35/xeb/x37 HANGUL SYLLABLE PUGG
-+<UD47B>     /x83/x35/xeb/x38 HANGUL SYLLABLE PUGS
-+<UD47C>     /x83/x35/xeb/x39 HANGUL SYLLABLE PUN
-+<UD47D>     /x83/x35/xec/x30 HANGUL SYLLABLE PUNI
-+<UD47E>     /x83/x35/xec/x31 HANGUL SYLLABLE PUNH
-+<UD47F>     /x83/x35/xec/x32 HANGUL SYLLABLE PUD
-+<UD480>     /x83/x35/xec/x33 HANGUL SYLLABLE PUL
-+<UD481>     /x83/x35/xec/x34 HANGUL SYLLABLE PULG
-+<UD482>     /x83/x35/xec/x35 HANGUL SYLLABLE PULM
-+<UD483>     /x83/x35/xec/x36 HANGUL SYLLABLE PULB
-+<UD484>     /x83/x35/xec/x37 HANGUL SYLLABLE PULS
-+<UD485>     /x83/x35/xec/x38 HANGUL SYLLABLE PULT
-+<UD486>     /x83/x35/xec/x39 HANGUL SYLLABLE PULP
-+<UD487>     /x83/x35/xed/x30 HANGUL SYLLABLE PULH
-+<UD488>     /x83/x35/xed/x31 HANGUL SYLLABLE PUM
-+<UD489>     /x83/x35/xed/x32 HANGUL SYLLABLE PUB
-+<UD48A>     /x83/x35/xed/x33 HANGUL SYLLABLE PUBS
-+<UD48B>     /x83/x35/xed/x34 HANGUL SYLLABLE PUS
-+<UD48C>     /x83/x35/xed/x35 HANGUL SYLLABLE PUSS
-+<UD48D>     /x83/x35/xed/x36 HANGUL SYLLABLE PUNG
-+<UD48E>     /x83/x35/xed/x37 HANGUL SYLLABLE PUJ
-+<UD48F>     /x83/x35/xed/x38 HANGUL SYLLABLE PUC
-+<UD490>     /x83/x35/xed/x39 HANGUL SYLLABLE PUK
-+<UD491>     /x83/x35/xee/x30 HANGUL SYLLABLE PUT
-+<UD492>     /x83/x35/xee/x31 HANGUL SYLLABLE PUP
-+<UD493>     /x83/x35/xee/x32 HANGUL SYLLABLE PUH
-+<UD494>     /x83/x35/xee/x33 HANGUL SYLLABLE PWEO
-+<UD495>     /x83/x35/xee/x34 HANGUL SYLLABLE PWEOG
-+<UD496>     /x83/x35/xee/x35 HANGUL SYLLABLE PWEOGG
-+<UD497>     /x83/x35/xee/x36 HANGUL SYLLABLE PWEOGS
-+<UD498>     /x83/x35/xee/x37 HANGUL SYLLABLE PWEON
-+<UD499>     /x83/x35/xee/x38 HANGUL SYLLABLE PWEONI
-+<UD49A>     /x83/x35/xee/x39 HANGUL SYLLABLE PWEONH
-+<UD49B>     /x83/x35/xef/x30 HANGUL SYLLABLE PWEOD
-+<UD49C>     /x83/x35/xef/x31 HANGUL SYLLABLE PWEOL
-+<UD49D>     /x83/x35/xef/x32 HANGUL SYLLABLE PWEOLG
-+<UD49E>     /x83/x35/xef/x33 HANGUL SYLLABLE PWEOLM
-+<UD49F>     /x83/x35/xef/x34 HANGUL SYLLABLE PWEOLB
-+<UD4A0>     /x83/x35/xef/x35 HANGUL SYLLABLE PWEOLS
-+<UD4A1>     /x83/x35/xef/x36 HANGUL SYLLABLE PWEOLT
-+<UD4A2>     /x83/x35/xef/x37 HANGUL SYLLABLE PWEOLP
-+<UD4A3>     /x83/x35/xef/x38 HANGUL SYLLABLE PWEOLH
-+<UD4A4>     /x83/x35/xef/x39 HANGUL SYLLABLE PWEOM
-+<UD4A5>     /x83/x35/xf0/x30 HANGUL SYLLABLE PWEOB
-+<UD4A6>     /x83/x35/xf0/x31 HANGUL SYLLABLE PWEOBS
-+<UD4A7>     /x83/x35/xf0/x32 HANGUL SYLLABLE PWEOS
-+<UD4A8>     /x83/x35/xf0/x33 HANGUL SYLLABLE PWEOSS
-+<UD4A9>     /x83/x35/xf0/x34 HANGUL SYLLABLE PWEONG
-+<UD4AA>     /x83/x35/xf0/x35 HANGUL SYLLABLE PWEOJ
-+<UD4AB>     /x83/x35/xf0/x36 HANGUL SYLLABLE PWEOC
-+<UD4AC>     /x83/x35/xf0/x37 HANGUL SYLLABLE PWEOK
-+<UD4AD>     /x83/x35/xf0/x38 HANGUL SYLLABLE PWEOT
-+<UD4AE>     /x83/x35/xf0/x39 HANGUL SYLLABLE PWEOP
-+<UD4AF>     /x83/x35/xf1/x30 HANGUL SYLLABLE PWEOH
-+<UD4B0>     /x83/x35/xf1/x31 HANGUL SYLLABLE PWE
-+<UD4B1>     /x83/x35/xf1/x32 HANGUL SYLLABLE PWEG
-+<UD4B2>     /x83/x35/xf1/x33 HANGUL SYLLABLE PWEGG
-+<UD4B3>     /x83/x35/xf1/x34 HANGUL SYLLABLE PWEGS
-+<UD4B4>     /x83/x35/xf1/x35 HANGUL SYLLABLE PWEN
-+<UD4B5>     /x83/x35/xf1/x36 HANGUL SYLLABLE PWENI
-+<UD4B6>     /x83/x35/xf1/x37 HANGUL SYLLABLE PWENH
-+<UD4B7>     /x83/x35/xf1/x38 HANGUL SYLLABLE PWED
-+<UD4B8>     /x83/x35/xf1/x39 HANGUL SYLLABLE PWEL
-+<UD4B9>     /x83/x35/xf2/x30 HANGUL SYLLABLE PWELG
-+<UD4BA>     /x83/x35/xf2/x31 HANGUL SYLLABLE PWELM
-+<UD4BB>     /x83/x35/xf2/x32 HANGUL SYLLABLE PWELB
-+<UD4BC>     /x83/x35/xf2/x33 HANGUL SYLLABLE PWELS
-+<UD4BD>     /x83/x35/xf2/x34 HANGUL SYLLABLE PWELT
-+<UD4BE>     /x83/x35/xf2/x35 HANGUL SYLLABLE PWELP
-+<UD4BF>     /x83/x35/xf2/x36 HANGUL SYLLABLE PWELH
-+<UD4C0>     /x83/x35/xf2/x37 HANGUL SYLLABLE PWEM
-+<UD4C1>     /x83/x35/xf2/x38 HANGUL SYLLABLE PWEB
-+<UD4C2>     /x83/x35/xf2/x39 HANGUL SYLLABLE PWEBS
-+<UD4C3>     /x83/x35/xf3/x30 HANGUL SYLLABLE PWES
-+<UD4C4>     /x83/x35/xf3/x31 HANGUL SYLLABLE PWESS
-+<UD4C5>     /x83/x35/xf3/x32 HANGUL SYLLABLE PWENG
-+<UD4C6>     /x83/x35/xf3/x33 HANGUL SYLLABLE PWEJ
-+<UD4C7>     /x83/x35/xf3/x34 HANGUL SYLLABLE PWEC
-+<UD4C8>     /x83/x35/xf3/x35 HANGUL SYLLABLE PWEK
-+<UD4C9>     /x83/x35/xf3/x36 HANGUL SYLLABLE PWET
-+<UD4CA>     /x83/x35/xf3/x37 HANGUL SYLLABLE PWEP
-+<UD4CB>     /x83/x35/xf3/x38 HANGUL SYLLABLE PWEH
-+<UD4CC>     /x83/x35/xf3/x39 HANGUL SYLLABLE PWI
-+<UD4CD>     /x83/x35/xf4/x30 HANGUL SYLLABLE PWIG
-+<UD4CE>     /x83/x35/xf4/x31 HANGUL SYLLABLE PWIGG
-+<UD4CF>     /x83/x35/xf4/x32 HANGUL SYLLABLE PWIGS
-+<UD4D0>     /x83/x35/xf4/x33 HANGUL SYLLABLE PWIN
-+<UD4D1>     /x83/x35/xf4/x34 HANGUL SYLLABLE PWINI
-+<UD4D2>     /x83/x35/xf4/x35 HANGUL SYLLABLE PWINH
-+<UD4D3>     /x83/x35/xf4/x36 HANGUL SYLLABLE PWID
-+<UD4D4>     /x83/x35/xf4/x37 HANGUL SYLLABLE PWIL
-+<UD4D5>     /x83/x35/xf4/x38 HANGUL SYLLABLE PWILG
-+<UD4D6>     /x83/x35/xf4/x39 HANGUL SYLLABLE PWILM
-+<UD4D7>     /x83/x35/xf5/x30 HANGUL SYLLABLE PWILB
-+<UD4D8>     /x83/x35/xf5/x31 HANGUL SYLLABLE PWILS
-+<UD4D9>     /x83/x35/xf5/x32 HANGUL SYLLABLE PWILT
-+<UD4DA>     /x83/x35/xf5/x33 HANGUL SYLLABLE PWILP
-+<UD4DB>     /x83/x35/xf5/x34 HANGUL SYLLABLE PWILH
-+<UD4DC>     /x83/x35/xf5/x35 HANGUL SYLLABLE PWIM
-+<UD4DD>     /x83/x35/xf5/x36 HANGUL SYLLABLE PWIB
-+<UD4DE>     /x83/x35/xf5/x37 HANGUL SYLLABLE PWIBS
-+<UD4DF>     /x83/x35/xf5/x38 HANGUL SYLLABLE PWIS
-+<UD4E0>     /x83/x35/xf5/x39 HANGUL SYLLABLE PWISS
-+<UD4E1>     /x83/x35/xf6/x30 HANGUL SYLLABLE PWING
-+<UD4E2>     /x83/x35/xf6/x31 HANGUL SYLLABLE PWIJ
-+<UD4E3>     /x83/x35/xf6/x32 HANGUL SYLLABLE PWIC
-+<UD4E4>     /x83/x35/xf6/x33 HANGUL SYLLABLE PWIK
-+<UD4E5>     /x83/x35/xf6/x34 HANGUL SYLLABLE PWIT
-+<UD4E6>     /x83/x35/xf6/x35 HANGUL SYLLABLE PWIP
-+<UD4E7>     /x83/x35/xf6/x36 HANGUL SYLLABLE PWIH
-+<UD4E8>     /x83/x35/xf6/x37 HANGUL SYLLABLE PYU
-+<UD4E9>     /x83/x35/xf6/x38 HANGUL SYLLABLE PYUG
-+<UD4EA>     /x83/x35/xf6/x39 HANGUL SYLLABLE PYUGG
-+<UD4EB>     /x83/x35/xf7/x30 HANGUL SYLLABLE PYUGS
-+<UD4EC>     /x83/x35/xf7/x31 HANGUL SYLLABLE PYUN
-+<UD4ED>     /x83/x35/xf7/x32 HANGUL SYLLABLE PYUNI
-+<UD4EE>     /x83/x35/xf7/x33 HANGUL SYLLABLE PYUNH
-+<UD4EF>     /x83/x35/xf7/x34 HANGUL SYLLABLE PYUD
-+<UD4F0>     /x83/x35/xf7/x35 HANGUL SYLLABLE PYUL
-+<UD4F1>     /x83/x35/xf7/x36 HANGUL SYLLABLE PYULG
-+<UD4F2>     /x83/x35/xf7/x37 HANGUL SYLLABLE PYULM
-+<UD4F3>     /x83/x35/xf7/x38 HANGUL SYLLABLE PYULB
-+<UD4F4>     /x83/x35/xf7/x39 HANGUL SYLLABLE PYULS
-+<UD4F5>     /x83/x35/xf8/x30 HANGUL SYLLABLE PYULT
-+<UD4F6>     /x83/x35/xf8/x31 HANGUL SYLLABLE PYULP
-+<UD4F7>     /x83/x35/xf8/x32 HANGUL SYLLABLE PYULH
-+<UD4F8>     /x83/x35/xf8/x33 HANGUL SYLLABLE PYUM
-+<UD4F9>     /x83/x35/xf8/x34 HANGUL SYLLABLE PYUB
-+<UD4FA>     /x83/x35/xf8/x35 HANGUL SYLLABLE PYUBS
-+<UD4FB>     /x83/x35/xf8/x36 HANGUL SYLLABLE PYUS
-+<UD4FC>     /x83/x35/xf8/x37 HANGUL SYLLABLE PYUSS
-+<UD4FD>     /x83/x35/xf8/x38 HANGUL SYLLABLE PYUNG
-+<UD4FE>     /x83/x35/xf8/x39 HANGUL SYLLABLE PYUJ
-+<UD4FF>     /x83/x35/xf9/x30 HANGUL SYLLABLE PYUC
-+<UD500>     /x83/x35/xf9/x31 HANGUL SYLLABLE PYUK
-+<UD501>     /x83/x35/xf9/x32 HANGUL SYLLABLE PYUT
-+<UD502>     /x83/x35/xf9/x33 HANGUL SYLLABLE PYUP
-+<UD503>     /x83/x35/xf9/x34 HANGUL SYLLABLE PYUH
-+<UD504>     /x83/x35/xf9/x35 HANGUL SYLLABLE PEU
-+<UD505>     /x83/x35/xf9/x36 HANGUL SYLLABLE PEUG
-+<UD506>     /x83/x35/xf9/x37 HANGUL SYLLABLE PEUGG
-+<UD507>     /x83/x35/xf9/x38 HANGUL SYLLABLE PEUGS
-+<UD508>     /x83/x35/xf9/x39 HANGUL SYLLABLE PEUN
-+<UD509>     /x83/x35/xfa/x30 HANGUL SYLLABLE PEUNI
-+<UD50A>     /x83/x35/xfa/x31 HANGUL SYLLABLE PEUNH
-+<UD50B>     /x83/x35/xfa/x32 HANGUL SYLLABLE PEUD
-+<UD50C>     /x83/x35/xfa/x33 HANGUL SYLLABLE PEUL
-+<UD50D>     /x83/x35/xfa/x34 HANGUL SYLLABLE PEULG
-+<UD50E>     /x83/x35/xfa/x35 HANGUL SYLLABLE PEULM
-+<UD50F>     /x83/x35/xfa/x36 HANGUL SYLLABLE PEULB
-+<UD510>     /x83/x35/xfa/x37 HANGUL SYLLABLE PEULS
-+<UD511>     /x83/x35/xfa/x38 HANGUL SYLLABLE PEULT
-+<UD512>     /x83/x35/xfa/x39 HANGUL SYLLABLE PEULP
-+<UD513>     /x83/x35/xfb/x30 HANGUL SYLLABLE PEULH
-+<UD514>     /x83/x35/xfb/x31 HANGUL SYLLABLE PEUM
-+<UD515>     /x83/x35/xfb/x32 HANGUL SYLLABLE PEUB
-+<UD516>     /x83/x35/xfb/x33 HANGUL SYLLABLE PEUBS
-+<UD517>     /x83/x35/xfb/x34 HANGUL SYLLABLE PEUS
-+<UD518>     /x83/x35/xfb/x35 HANGUL SYLLABLE PEUSS
-+<UD519>     /x83/x35/xfb/x36 HANGUL SYLLABLE PEUNG
-+<UD51A>     /x83/x35/xfb/x37 HANGUL SYLLABLE PEUJ
-+<UD51B>     /x83/x35/xfb/x38 HANGUL SYLLABLE PEUC
-+<UD51C>     /x83/x35/xfb/x39 HANGUL SYLLABLE PEUK
-+<UD51D>     /x83/x35/xfc/x30 HANGUL SYLLABLE PEUT
-+<UD51E>     /x83/x35/xfc/x31 HANGUL SYLLABLE PEUP
-+<UD51F>     /x83/x35/xfc/x32 HANGUL SYLLABLE PEUH
-+<UD520>     /x83/x35/xfc/x33 HANGUL SYLLABLE PYI
-+<UD521>     /x83/x35/xfc/x34 HANGUL SYLLABLE PYIG
-+<UD522>     /x83/x35/xfc/x35 HANGUL SYLLABLE PYIGG
-+<UD523>     /x83/x35/xfc/x36 HANGUL SYLLABLE PYIGS
-+<UD524>     /x83/x35/xfc/x37 HANGUL SYLLABLE PYIN
-+<UD525>     /x83/x35/xfc/x38 HANGUL SYLLABLE PYINI
-+<UD526>     /x83/x35/xfc/x39 HANGUL SYLLABLE PYINH
-+<UD527>     /x83/x35/xfd/x30 HANGUL SYLLABLE PYID
-+<UD528>     /x83/x35/xfd/x31 HANGUL SYLLABLE PYIL
-+<UD529>     /x83/x35/xfd/x32 HANGUL SYLLABLE PYILG
-+<UD52A>     /x83/x35/xfd/x33 HANGUL SYLLABLE PYILM
-+<UD52B>     /x83/x35/xfd/x34 HANGUL SYLLABLE PYILB
-+<UD52C>     /x83/x35/xfd/x35 HANGUL SYLLABLE PYILS
-+<UD52D>     /x83/x35/xfd/x36 HANGUL SYLLABLE PYILT
-+<UD52E>     /x83/x35/xfd/x37 HANGUL SYLLABLE PYILP
-+<UD52F>     /x83/x35/xfd/x38 HANGUL SYLLABLE PYILH
-+<UD530>     /x83/x35/xfd/x39 HANGUL SYLLABLE PYIM
-+<UD531>     /x83/x35/xfe/x30 HANGUL SYLLABLE PYIB
-+<UD532>     /x83/x35/xfe/x31 HANGUL SYLLABLE PYIBS
-+<UD533>     /x83/x35/xfe/x32 HANGUL SYLLABLE PYIS
-+<UD534>     /x83/x35/xfe/x33 HANGUL SYLLABLE PYISS
-+<UD535>     /x83/x35/xfe/x34 HANGUL SYLLABLE PYING
-+<UD536>     /x83/x35/xfe/x35 HANGUL SYLLABLE PYIJ
-+<UD537>     /x83/x35/xfe/x36 HANGUL SYLLABLE PYIC
-+<UD538>     /x83/x35/xfe/x37 HANGUL SYLLABLE PYIK
-+<UD539>     /x83/x35/xfe/x38 HANGUL SYLLABLE PYIT
-+<UD53A>     /x83/x35/xfe/x39 HANGUL SYLLABLE PYIP
-+<UD53B>     /x83/x36/x81/x30 HANGUL SYLLABLE PYIH
-+<UD53C>     /x83/x36/x81/x31 HANGUL SYLLABLE PI
-+<UD53D>     /x83/x36/x81/x32 HANGUL SYLLABLE PIG
-+<UD53E>     /x83/x36/x81/x33 HANGUL SYLLABLE PIGG
-+<UD53F>     /x83/x36/x81/x34 HANGUL SYLLABLE PIGS
-+<UD540>     /x83/x36/x81/x35 HANGUL SYLLABLE PIN
-+<UD541>     /x83/x36/x81/x36 HANGUL SYLLABLE PINI
-+<UD542>     /x83/x36/x81/x37 HANGUL SYLLABLE PINH
-+<UD543>     /x83/x36/x81/x38 HANGUL SYLLABLE PID
-+<UD544>     /x83/x36/x81/x39 HANGUL SYLLABLE PIL
-+<UD545>     /x83/x36/x82/x30 HANGUL SYLLABLE PILG
-+<UD546>     /x83/x36/x82/x31 HANGUL SYLLABLE PILM
-+<UD547>     /x83/x36/x82/x32 HANGUL SYLLABLE PILB
-+<UD548>     /x83/x36/x82/x33 HANGUL SYLLABLE PILS
-+<UD549>     /x83/x36/x82/x34 HANGUL SYLLABLE PILT
-+<UD54A>     /x83/x36/x82/x35 HANGUL SYLLABLE PILP
-+<UD54B>     /x83/x36/x82/x36 HANGUL SYLLABLE PILH
-+<UD54C>     /x83/x36/x82/x37 HANGUL SYLLABLE PIM
-+<UD54D>     /x83/x36/x82/x38 HANGUL SYLLABLE PIB
-+<UD54E>     /x83/x36/x82/x39 HANGUL SYLLABLE PIBS
-+<UD54F>     /x83/x36/x83/x30 HANGUL SYLLABLE PIS
-+<UD550>     /x83/x36/x83/x31 HANGUL SYLLABLE PISS
-+<UD551>     /x83/x36/x83/x32 HANGUL SYLLABLE PING
-+<UD552>     /x83/x36/x83/x33 HANGUL SYLLABLE PIJ
-+<UD553>     /x83/x36/x83/x34 HANGUL SYLLABLE PIC
-+<UD554>     /x83/x36/x83/x35 HANGUL SYLLABLE PIK
-+<UD555>     /x83/x36/x83/x36 HANGUL SYLLABLE PIT
-+<UD556>     /x83/x36/x83/x37 HANGUL SYLLABLE PIP
-+<UD557>     /x83/x36/x83/x38 HANGUL SYLLABLE PIH
-+<UD558>     /x83/x36/x83/x39 HANGUL SYLLABLE HA
-+<UD559>     /x83/x36/x84/x30 HANGUL SYLLABLE HAG
-+<UD55A>     /x83/x36/x84/x31 HANGUL SYLLABLE HAGG
-+<UD55B>     /x83/x36/x84/x32 HANGUL SYLLABLE HAGS
-+<UD55C>     /x83/x36/x84/x33 HANGUL SYLLABLE HAN
-+<UD55D>     /x83/x36/x84/x34 HANGUL SYLLABLE HANI
-+<UD55E>     /x83/x36/x84/x35 HANGUL SYLLABLE HANH
-+<UD55F>     /x83/x36/x84/x36 HANGUL SYLLABLE HAD
-+<UD560>     /x83/x36/x84/x37 HANGUL SYLLABLE HAL
-+<UD561>     /x83/x36/x84/x38 HANGUL SYLLABLE HALG
-+<UD562>     /x83/x36/x84/x39 HANGUL SYLLABLE HALM
-+<UD563>     /x83/x36/x85/x30 HANGUL SYLLABLE HALB
-+<UD564>     /x83/x36/x85/x31 HANGUL SYLLABLE HALS
-+<UD565>     /x83/x36/x85/x32 HANGUL SYLLABLE HALT
-+<UD566>     /x83/x36/x85/x33 HANGUL SYLLABLE HALP
-+<UD567>     /x83/x36/x85/x34 HANGUL SYLLABLE HALH
-+<UD568>     /x83/x36/x85/x35 HANGUL SYLLABLE HAM
-+<UD569>     /x83/x36/x85/x36 HANGUL SYLLABLE HAB
-+<UD56A>     /x83/x36/x85/x37 HANGUL SYLLABLE HABS
-+<UD56B>     /x83/x36/x85/x38 HANGUL SYLLABLE HAS
-+<UD56C>     /x83/x36/x85/x39 HANGUL SYLLABLE HASS
-+<UD56D>     /x83/x36/x86/x30 HANGUL SYLLABLE HANG
-+<UD56E>     /x83/x36/x86/x31 HANGUL SYLLABLE HAJ
-+<UD56F>     /x83/x36/x86/x32 HANGUL SYLLABLE HAC
-+<UD570>     /x83/x36/x86/x33 HANGUL SYLLABLE HAK
-+<UD571>     /x83/x36/x86/x34 HANGUL SYLLABLE HAT
-+<UD572>     /x83/x36/x86/x35 HANGUL SYLLABLE HAP
-+<UD573>     /x83/x36/x86/x36 HANGUL SYLLABLE HAH
-+<UD574>     /x83/x36/x86/x37 HANGUL SYLLABLE HAE
-+<UD575>     /x83/x36/x86/x38 HANGUL SYLLABLE HAEG
-+<UD576>     /x83/x36/x86/x39 HANGUL SYLLABLE HAEGG
-+<UD577>     /x83/x36/x87/x30 HANGUL SYLLABLE HAEGS
-+<UD578>     /x83/x36/x87/x31 HANGUL SYLLABLE HAEN
-+<UD579>     /x83/x36/x87/x32 HANGUL SYLLABLE HAENI
-+<UD57A>     /x83/x36/x87/x33 HANGUL SYLLABLE HAENH
-+<UD57B>     /x83/x36/x87/x34 HANGUL SYLLABLE HAED
-+<UD57C>     /x83/x36/x87/x35 HANGUL SYLLABLE HAEL
-+<UD57D>     /x83/x36/x87/x36 HANGUL SYLLABLE HAELG
-+<UD57E>     /x83/x36/x87/x37 HANGUL SYLLABLE HAELM
-+<UD57F>     /x83/x36/x87/x38 HANGUL SYLLABLE HAELB
-+<UD580>     /x83/x36/x87/x39 HANGUL SYLLABLE HAELS
-+<UD581>     /x83/x36/x88/x30 HANGUL SYLLABLE HAELT
-+<UD582>     /x83/x36/x88/x31 HANGUL SYLLABLE HAELP
-+<UD583>     /x83/x36/x88/x32 HANGUL SYLLABLE HAELH
-+<UD584>     /x83/x36/x88/x33 HANGUL SYLLABLE HAEM
-+<UD585>     /x83/x36/x88/x34 HANGUL SYLLABLE HAEB
-+<UD586>     /x83/x36/x88/x35 HANGUL SYLLABLE HAEBS
-+<UD587>     /x83/x36/x88/x36 HANGUL SYLLABLE HAES
-+<UD588>     /x83/x36/x88/x37 HANGUL SYLLABLE HAESS
-+<UD589>     /x83/x36/x88/x38 HANGUL SYLLABLE HAENG
-+<UD58A>     /x83/x36/x88/x39 HANGUL SYLLABLE HAEJ
-+<UD58B>     /x83/x36/x89/x30 HANGUL SYLLABLE HAEC
-+<UD58C>     /x83/x36/x89/x31 HANGUL SYLLABLE HAEK
-+<UD58D>     /x83/x36/x89/x32 HANGUL SYLLABLE HAET
-+<UD58E>     /x83/x36/x89/x33 HANGUL SYLLABLE HAEP
-+<UD58F>     /x83/x36/x89/x34 HANGUL SYLLABLE HAEH
-+<UD590>     /x83/x36/x89/x35 HANGUL SYLLABLE HYA
-+<UD591>     /x83/x36/x89/x36 HANGUL SYLLABLE HYAG
-+<UD592>     /x83/x36/x89/x37 HANGUL SYLLABLE HYAGG
-+<UD593>     /x83/x36/x89/x38 HANGUL SYLLABLE HYAGS
-+<UD594>     /x83/x36/x89/x39 HANGUL SYLLABLE HYAN
-+<UD595>     /x83/x36/x8a/x30 HANGUL SYLLABLE HYANI
-+<UD596>     /x83/x36/x8a/x31 HANGUL SYLLABLE HYANH
-+<UD597>     /x83/x36/x8a/x32 HANGUL SYLLABLE HYAD
-+<UD598>     /x83/x36/x8a/x33 HANGUL SYLLABLE HYAL
-+<UD599>     /x83/x36/x8a/x34 HANGUL SYLLABLE HYALG
-+<UD59A>     /x83/x36/x8a/x35 HANGUL SYLLABLE HYALM
-+<UD59B>     /x83/x36/x8a/x36 HANGUL SYLLABLE HYALB
-+<UD59C>     /x83/x36/x8a/x37 HANGUL SYLLABLE HYALS
-+<UD59D>     /x83/x36/x8a/x38 HANGUL SYLLABLE HYALT
-+<UD59E>     /x83/x36/x8a/x39 HANGUL SYLLABLE HYALP
-+<UD59F>     /x83/x36/x8b/x30 HANGUL SYLLABLE HYALH
-+<UD5A0>     /x83/x36/x8b/x31 HANGUL SYLLABLE HYAM
-+<UD5A1>     /x83/x36/x8b/x32 HANGUL SYLLABLE HYAB
-+<UD5A2>     /x83/x36/x8b/x33 HANGUL SYLLABLE HYABS
-+<UD5A3>     /x83/x36/x8b/x34 HANGUL SYLLABLE HYAS
-+<UD5A4>     /x83/x36/x8b/x35 HANGUL SYLLABLE HYASS
-+<UD5A5>     /x83/x36/x8b/x36 HANGUL SYLLABLE HYANG
-+<UD5A6>     /x83/x36/x8b/x37 HANGUL SYLLABLE HYAJ
-+<UD5A7>     /x83/x36/x8b/x38 HANGUL SYLLABLE HYAC
-+<UD5A8>     /x83/x36/x8b/x39 HANGUL SYLLABLE HYAK
-+<UD5A9>     /x83/x36/x8c/x30 HANGUL SYLLABLE HYAT
-+<UD5AA>     /x83/x36/x8c/x31 HANGUL SYLLABLE HYAP
-+<UD5AB>     /x83/x36/x8c/x32 HANGUL SYLLABLE HYAH
-+<UD5AC>     /x83/x36/x8c/x33 HANGUL SYLLABLE HYAE
-+<UD5AD>     /x83/x36/x8c/x34 HANGUL SYLLABLE HYAEG
-+<UD5AE>     /x83/x36/x8c/x35 HANGUL SYLLABLE HYAEGG
-+<UD5AF>     /x83/x36/x8c/x36 HANGUL SYLLABLE HYAEGS
-+<UD5B0>     /x83/x36/x8c/x37 HANGUL SYLLABLE HYAEN
-+<UD5B1>     /x83/x36/x8c/x38 HANGUL SYLLABLE HYAENI
-+<UD5B2>     /x83/x36/x8c/x39 HANGUL SYLLABLE HYAENH
-+<UD5B3>     /x83/x36/x8d/x30 HANGUL SYLLABLE HYAED
-+<UD5B4>     /x83/x36/x8d/x31 HANGUL SYLLABLE HYAEL
-+<UD5B5>     /x83/x36/x8d/x32 HANGUL SYLLABLE HYAELG
-+<UD5B6>     /x83/x36/x8d/x33 HANGUL SYLLABLE HYAELM
-+<UD5B7>     /x83/x36/x8d/x34 HANGUL SYLLABLE HYAELB
-+<UD5B8>     /x83/x36/x8d/x35 HANGUL SYLLABLE HYAELS
-+<UD5B9>     /x83/x36/x8d/x36 HANGUL SYLLABLE HYAELT
-+<UD5BA>     /x83/x36/x8d/x37 HANGUL SYLLABLE HYAELP
-+<UD5BB>     /x83/x36/x8d/x38 HANGUL SYLLABLE HYAELH
-+<UD5BC>     /x83/x36/x8d/x39 HANGUL SYLLABLE HYAEM
-+<UD5BD>     /x83/x36/x8e/x30 HANGUL SYLLABLE HYAEB
-+<UD5BE>     /x83/x36/x8e/x31 HANGUL SYLLABLE HYAEBS
-+<UD5BF>     /x83/x36/x8e/x32 HANGUL SYLLABLE HYAES
-+<UD5C0>     /x83/x36/x8e/x33 HANGUL SYLLABLE HYAESS
-+<UD5C1>     /x83/x36/x8e/x34 HANGUL SYLLABLE HYAENG
-+<UD5C2>     /x83/x36/x8e/x35 HANGUL SYLLABLE HYAEJ
-+<UD5C3>     /x83/x36/x8e/x36 HANGUL SYLLABLE HYAEC
-+<UD5C4>     /x83/x36/x8e/x37 HANGUL SYLLABLE HYAEK
-+<UD5C5>     /x83/x36/x8e/x38 HANGUL SYLLABLE HYAET
-+<UD5C6>     /x83/x36/x8e/x39 HANGUL SYLLABLE HYAEP
-+<UD5C7>     /x83/x36/x8f/x30 HANGUL SYLLABLE HYAEH
-+<UD5C8>     /x83/x36/x8f/x31 HANGUL SYLLABLE HEO
-+<UD5C9>     /x83/x36/x8f/x32 HANGUL SYLLABLE HEOG
-+<UD5CA>     /x83/x36/x8f/x33 HANGUL SYLLABLE HEOGG
-+<UD5CB>     /x83/x36/x8f/x34 HANGUL SYLLABLE HEOGS
-+<UD5CC>     /x83/x36/x8f/x35 HANGUL SYLLABLE HEON
-+<UD5CD>     /x83/x36/x8f/x36 HANGUL SYLLABLE HEONI
-+<UD5CE>     /x83/x36/x8f/x37 HANGUL SYLLABLE HEONH
-+<UD5CF>     /x83/x36/x8f/x38 HANGUL SYLLABLE HEOD
-+<UD5D0>     /x83/x36/x8f/x39 HANGUL SYLLABLE HEOL
-+<UD5D1>     /x83/x36/x90/x30 HANGUL SYLLABLE HEOLG
-+<UD5D2>     /x83/x36/x90/x31 HANGUL SYLLABLE HEOLM
-+<UD5D3>     /x83/x36/x90/x32 HANGUL SYLLABLE HEOLB
-+<UD5D4>     /x83/x36/x90/x33 HANGUL SYLLABLE HEOLS
-+<UD5D5>     /x83/x36/x90/x34 HANGUL SYLLABLE HEOLT
-+<UD5D6>     /x83/x36/x90/x35 HANGUL SYLLABLE HEOLP
-+<UD5D7>     /x83/x36/x90/x36 HANGUL SYLLABLE HEOLH
-+<UD5D8>     /x83/x36/x90/x37 HANGUL SYLLABLE HEOM
-+<UD5D9>     /x83/x36/x90/x38 HANGUL SYLLABLE HEOB
-+<UD5DA>     /x83/x36/x90/x39 HANGUL SYLLABLE HEOBS
-+<UD5DB>     /x83/x36/x91/x30 HANGUL SYLLABLE HEOS
-+<UD5DC>     /x83/x36/x91/x31 HANGUL SYLLABLE HEOSS
-+<UD5DD>     /x83/x36/x91/x32 HANGUL SYLLABLE HEONG
-+<UD5DE>     /x83/x36/x91/x33 HANGUL SYLLABLE HEOJ
-+<UD5DF>     /x83/x36/x91/x34 HANGUL SYLLABLE HEOC
-+<UD5E0>     /x83/x36/x91/x35 HANGUL SYLLABLE HEOK
-+<UD5E1>     /x83/x36/x91/x36 HANGUL SYLLABLE HEOT
-+<UD5E2>     /x83/x36/x91/x37 HANGUL SYLLABLE HEOP
-+<UD5E3>     /x83/x36/x91/x38 HANGUL SYLLABLE HEOH
-+<UD5E4>     /x83/x36/x91/x39 HANGUL SYLLABLE HE
-+<UD5E5>     /x83/x36/x92/x30 HANGUL SYLLABLE HEG
-+<UD5E6>     /x83/x36/x92/x31 HANGUL SYLLABLE HEGG
-+<UD5E7>     /x83/x36/x92/x32 HANGUL SYLLABLE HEGS
-+<UD5E8>     /x83/x36/x92/x33 HANGUL SYLLABLE HEN
-+<UD5E9>     /x83/x36/x92/x34 HANGUL SYLLABLE HENI
-+<UD5EA>     /x83/x36/x92/x35 HANGUL SYLLABLE HENH
-+<UD5EB>     /x83/x36/x92/x36 HANGUL SYLLABLE HED
-+<UD5EC>     /x83/x36/x92/x37 HANGUL SYLLABLE HEL
-+<UD5ED>     /x83/x36/x92/x38 HANGUL SYLLABLE HELG
-+<UD5EE>     /x83/x36/x92/x39 HANGUL SYLLABLE HELM
-+<UD5EF>     /x83/x36/x93/x30 HANGUL SYLLABLE HELB
-+<UD5F0>     /x83/x36/x93/x31 HANGUL SYLLABLE HELS
-+<UD5F1>     /x83/x36/x93/x32 HANGUL SYLLABLE HELT
-+<UD5F2>     /x83/x36/x93/x33 HANGUL SYLLABLE HELP
-+<UD5F3>     /x83/x36/x93/x34 HANGUL SYLLABLE HELH
-+<UD5F4>     /x83/x36/x93/x35 HANGUL SYLLABLE HEM
-+<UD5F5>     /x83/x36/x93/x36 HANGUL SYLLABLE HEB
-+<UD5F6>     /x83/x36/x93/x37 HANGUL SYLLABLE HEBS
-+<UD5F7>     /x83/x36/x93/x38 HANGUL SYLLABLE HES
-+<UD5F8>     /x83/x36/x93/x39 HANGUL SYLLABLE HESS
-+<UD5F9>     /x83/x36/x94/x30 HANGUL SYLLABLE HENG
-+<UD5FA>     /x83/x36/x94/x31 HANGUL SYLLABLE HEJ
-+<UD5FB>     /x83/x36/x94/x32 HANGUL SYLLABLE HEC
-+<UD5FC>     /x83/x36/x94/x33 HANGUL SYLLABLE HEK
-+<UD5FD>     /x83/x36/x94/x34 HANGUL SYLLABLE HET
-+<UD5FE>     /x83/x36/x94/x35 HANGUL SYLLABLE HEP
-+<UD5FF>     /x83/x36/x94/x36 HANGUL SYLLABLE HEH
-+<UD600>     /x83/x36/x94/x37 HANGUL SYLLABLE HYEO
-+<UD601>     /x83/x36/x94/x38 HANGUL SYLLABLE HYEOG
-+<UD602>     /x83/x36/x94/x39 HANGUL SYLLABLE HYEOGG
-+<UD603>     /x83/x36/x95/x30 HANGUL SYLLABLE HYEOGS
-+<UD604>     /x83/x36/x95/x31 HANGUL SYLLABLE HYEON
-+<UD605>     /x83/x36/x95/x32 HANGUL SYLLABLE HYEONI
-+<UD606>     /x83/x36/x95/x33 HANGUL SYLLABLE HYEONH
-+<UD607>     /x83/x36/x95/x34 HANGUL SYLLABLE HYEOD
-+<UD608>     /x83/x36/x95/x35 HANGUL SYLLABLE HYEOL
-+<UD609>     /x83/x36/x95/x36 HANGUL SYLLABLE HYEOLG
-+<UD60A>     /x83/x36/x95/x37 HANGUL SYLLABLE HYEOLM
-+<UD60B>     /x83/x36/x95/x38 HANGUL SYLLABLE HYEOLB
-+<UD60C>     /x83/x36/x95/x39 HANGUL SYLLABLE HYEOLS
-+<UD60D>     /x83/x36/x96/x30 HANGUL SYLLABLE HYEOLT
-+<UD60E>     /x83/x36/x96/x31 HANGUL SYLLABLE HYEOLP
-+<UD60F>     /x83/x36/x96/x32 HANGUL SYLLABLE HYEOLH
-+<UD610>     /x83/x36/x96/x33 HANGUL SYLLABLE HYEOM
-+<UD611>     /x83/x36/x96/x34 HANGUL SYLLABLE HYEOB
-+<UD612>     /x83/x36/x96/x35 HANGUL SYLLABLE HYEOBS
-+<UD613>     /x83/x36/x96/x36 HANGUL SYLLABLE HYEOS
-+<UD614>     /x83/x36/x96/x37 HANGUL SYLLABLE HYEOSS
-+<UD615>     /x83/x36/x96/x38 HANGUL SYLLABLE HYEONG
-+<UD616>     /x83/x36/x96/x39 HANGUL SYLLABLE HYEOJ
-+<UD617>     /x83/x36/x97/x30 HANGUL SYLLABLE HYEOC
-+<UD618>     /x83/x36/x97/x31 HANGUL SYLLABLE HYEOK
-+<UD619>     /x83/x36/x97/x32 HANGUL SYLLABLE HYEOT
-+<UD61A>     /x83/x36/x97/x33 HANGUL SYLLABLE HYEOP
-+<UD61B>     /x83/x36/x97/x34 HANGUL SYLLABLE HYEOH
-+<UD61C>     /x83/x36/x97/x35 HANGUL SYLLABLE HYE
-+<UD61D>     /x83/x36/x97/x36 HANGUL SYLLABLE HYEG
-+<UD61E>     /x83/x36/x97/x37 HANGUL SYLLABLE HYEGG
-+<UD61F>     /x83/x36/x97/x38 HANGUL SYLLABLE HYEGS
-+<UD620>     /x83/x36/x97/x39 HANGUL SYLLABLE HYEN
-+<UD621>     /x83/x36/x98/x30 HANGUL SYLLABLE HYENI
-+<UD622>     /x83/x36/x98/x31 HANGUL SYLLABLE HYENH
-+<UD623>     /x83/x36/x98/x32 HANGUL SYLLABLE HYED
-+<UD624>     /x83/x36/x98/x33 HANGUL SYLLABLE HYEL
-+<UD625>     /x83/x36/x98/x34 HANGUL SYLLABLE HYELG
-+<UD626>     /x83/x36/x98/x35 HANGUL SYLLABLE HYELM
-+<UD627>     /x83/x36/x98/x36 HANGUL SYLLABLE HYELB
-+<UD628>     /x83/x36/x98/x37 HANGUL SYLLABLE HYELS
-+<UD629>     /x83/x36/x98/x38 HANGUL SYLLABLE HYELT
-+<UD62A>     /x83/x36/x98/x39 HANGUL SYLLABLE HYELP
-+<UD62B>     /x83/x36/x99/x30 HANGUL SYLLABLE HYELH
-+<UD62C>     /x83/x36/x99/x31 HANGUL SYLLABLE HYEM
-+<UD62D>     /x83/x36/x99/x32 HANGUL SYLLABLE HYEB
-+<UD62E>     /x83/x36/x99/x33 HANGUL SYLLABLE HYEBS
-+<UD62F>     /x83/x36/x99/x34 HANGUL SYLLABLE HYES
-+<UD630>     /x83/x36/x99/x35 HANGUL SYLLABLE HYESS
-+<UD631>     /x83/x36/x99/x36 HANGUL SYLLABLE HYENG
-+<UD632>     /x83/x36/x99/x37 HANGUL SYLLABLE HYEJ
-+<UD633>     /x83/x36/x99/x38 HANGUL SYLLABLE HYEC
-+<UD634>     /x83/x36/x99/x39 HANGUL SYLLABLE HYEK
-+<UD635>     /x83/x36/x9a/x30 HANGUL SYLLABLE HYET
-+<UD636>     /x83/x36/x9a/x31 HANGUL SYLLABLE HYEP
-+<UD637>     /x83/x36/x9a/x32 HANGUL SYLLABLE HYEH
-+<UD638>     /x83/x36/x9a/x33 HANGUL SYLLABLE HO
-+<UD639>     /x83/x36/x9a/x34 HANGUL SYLLABLE HOG
-+<UD63A>     /x83/x36/x9a/x35 HANGUL SYLLABLE HOGG
-+<UD63B>     /x83/x36/x9a/x36 HANGUL SYLLABLE HOGS
-+<UD63C>     /x83/x36/x9a/x37 HANGUL SYLLABLE HON
-+<UD63D>     /x83/x36/x9a/x38 HANGUL SYLLABLE HONI
-+<UD63E>     /x83/x36/x9a/x39 HANGUL SYLLABLE HONH
-+<UD63F>     /x83/x36/x9b/x30 HANGUL SYLLABLE HOD
-+<UD640>     /x83/x36/x9b/x31 HANGUL SYLLABLE HOL
-+<UD641>     /x83/x36/x9b/x32 HANGUL SYLLABLE HOLG
-+<UD642>     /x83/x36/x9b/x33 HANGUL SYLLABLE HOLM
-+<UD643>     /x83/x36/x9b/x34 HANGUL SYLLABLE HOLB
-+<UD644>     /x83/x36/x9b/x35 HANGUL SYLLABLE HOLS
-+<UD645>     /x83/x36/x9b/x36 HANGUL SYLLABLE HOLT
-+<UD646>     /x83/x36/x9b/x37 HANGUL SYLLABLE HOLP
-+<UD647>     /x83/x36/x9b/x38 HANGUL SYLLABLE HOLH
-+<UD648>     /x83/x36/x9b/x39 HANGUL SYLLABLE HOM
-+<UD649>     /x83/x36/x9c/x30 HANGUL SYLLABLE HOB
-+<UD64A>     /x83/x36/x9c/x31 HANGUL SYLLABLE HOBS
-+<UD64B>     /x83/x36/x9c/x32 HANGUL SYLLABLE HOS
-+<UD64C>     /x83/x36/x9c/x33 HANGUL SYLLABLE HOSS
-+<UD64D>     /x83/x36/x9c/x34 HANGUL SYLLABLE HONG
-+<UD64E>     /x83/x36/x9c/x35 HANGUL SYLLABLE HOJ
-+<UD64F>     /x83/x36/x9c/x36 HANGUL SYLLABLE HOC
-+<UD650>     /x83/x36/x9c/x37 HANGUL SYLLABLE HOK
-+<UD651>     /x83/x36/x9c/x38 HANGUL SYLLABLE HOT
-+<UD652>     /x83/x36/x9c/x39 HANGUL SYLLABLE HOP
-+<UD653>     /x83/x36/x9d/x30 HANGUL SYLLABLE HOH
-+<UD654>     /x83/x36/x9d/x31 HANGUL SYLLABLE HWA
-+<UD655>     /x83/x36/x9d/x32 HANGUL SYLLABLE HWAG
-+<UD656>     /x83/x36/x9d/x33 HANGUL SYLLABLE HWAGG
-+<UD657>     /x83/x36/x9d/x34 HANGUL SYLLABLE HWAGS
-+<UD658>     /x83/x36/x9d/x35 HANGUL SYLLABLE HWAN
-+<UD659>     /x83/x36/x9d/x36 HANGUL SYLLABLE HWANI
-+<UD65A>     /x83/x36/x9d/x37 HANGUL SYLLABLE HWANH
-+<UD65B>     /x83/x36/x9d/x38 HANGUL SYLLABLE HWAD
-+<UD65C>     /x83/x36/x9d/x39 HANGUL SYLLABLE HWAL
-+<UD65D>     /x83/x36/x9e/x30 HANGUL SYLLABLE HWALG
-+<UD65E>     /x83/x36/x9e/x31 HANGUL SYLLABLE HWALM
-+<UD65F>     /x83/x36/x9e/x32 HANGUL SYLLABLE HWALB
-+<UD660>     /x83/x36/x9e/x33 HANGUL SYLLABLE HWALS
-+<UD661>     /x83/x36/x9e/x34 HANGUL SYLLABLE HWALT
-+<UD662>     /x83/x36/x9e/x35 HANGUL SYLLABLE HWALP
-+<UD663>     /x83/x36/x9e/x36 HANGUL SYLLABLE HWALH
-+<UD664>     /x83/x36/x9e/x37 HANGUL SYLLABLE HWAM
-+<UD665>     /x83/x36/x9e/x38 HANGUL SYLLABLE HWAB
-+<UD666>     /x83/x36/x9e/x39 HANGUL SYLLABLE HWABS
-+<UD667>     /x83/x36/x9f/x30 HANGUL SYLLABLE HWAS
-+<UD668>     /x83/x36/x9f/x31 HANGUL SYLLABLE HWASS
-+<UD669>     /x83/x36/x9f/x32 HANGUL SYLLABLE HWANG
-+<UD66A>     /x83/x36/x9f/x33 HANGUL SYLLABLE HWAJ
-+<UD66B>     /x83/x36/x9f/x34 HANGUL SYLLABLE HWAC
-+<UD66C>     /x83/x36/x9f/x35 HANGUL SYLLABLE HWAK
-+<UD66D>     /x83/x36/x9f/x36 HANGUL SYLLABLE HWAT
-+<UD66E>     /x83/x36/x9f/x37 HANGUL SYLLABLE HWAP
-+<UD66F>     /x83/x36/x9f/x38 HANGUL SYLLABLE HWAH
-+<UD670>     /x83/x36/x9f/x39 HANGUL SYLLABLE HWAE
-+<UD671>     /x83/x36/xa0/x30 HANGUL SYLLABLE HWAEG
-+<UD672>     /x83/x36/xa0/x31 HANGUL SYLLABLE HWAEGG
-+<UD673>     /x83/x36/xa0/x32 HANGUL SYLLABLE HWAEGS
-+<UD674>     /x83/x36/xa0/x33 HANGUL SYLLABLE HWAEN
-+<UD675>     /x83/x36/xa0/x34 HANGUL SYLLABLE HWAENI
-+<UD676>     /x83/x36/xa0/x35 HANGUL SYLLABLE HWAENH
-+<UD677>     /x83/x36/xa0/x36 HANGUL SYLLABLE HWAED
-+<UD678>     /x83/x36/xa0/x37 HANGUL SYLLABLE HWAEL
-+<UD679>     /x83/x36/xa0/x38 HANGUL SYLLABLE HWAELG
-+<UD67A>     /x83/x36/xa0/x39 HANGUL SYLLABLE HWAELM
-+<UD67B>     /x83/x36/xa1/x30 HANGUL SYLLABLE HWAELB
-+<UD67C>     /x83/x36/xa1/x31 HANGUL SYLLABLE HWAELS
-+<UD67D>     /x83/x36/xa1/x32 HANGUL SYLLABLE HWAELT
-+<UD67E>     /x83/x36/xa1/x33 HANGUL SYLLABLE HWAELP
-+<UD67F>     /x83/x36/xa1/x34 HANGUL SYLLABLE HWAELH
-+<UD680>     /x83/x36/xa1/x35 HANGUL SYLLABLE HWAEM
-+<UD681>     /x83/x36/xa1/x36 HANGUL SYLLABLE HWAEB
-+<UD682>     /x83/x36/xa1/x37 HANGUL SYLLABLE HWAEBS
-+<UD683>     /x83/x36/xa1/x38 HANGUL SYLLABLE HWAES
-+<UD684>     /x83/x36/xa1/x39 HANGUL SYLLABLE HWAESS
-+<UD685>     /x83/x36/xa2/x30 HANGUL SYLLABLE HWAENG
-+<UD686>     /x83/x36/xa2/x31 HANGUL SYLLABLE HWAEJ
-+<UD687>     /x83/x36/xa2/x32 HANGUL SYLLABLE HWAEC
-+<UD688>     /x83/x36/xa2/x33 HANGUL SYLLABLE HWAEK
-+<UD689>     /x83/x36/xa2/x34 HANGUL SYLLABLE HWAET
-+<UD68A>     /x83/x36/xa2/x35 HANGUL SYLLABLE HWAEP
-+<UD68B>     /x83/x36/xa2/x36 HANGUL SYLLABLE HWAEH
-+<UD68C>     /x83/x36/xa2/x37 HANGUL SYLLABLE HOE
-+<UD68D>     /x83/x36/xa2/x38 HANGUL SYLLABLE HOEG
-+<UD68E>     /x83/x36/xa2/x39 HANGUL SYLLABLE HOEGG
-+<UD68F>     /x83/x36/xa3/x30 HANGUL SYLLABLE HOEGS
-+<UD690>     /x83/x36/xa3/x31 HANGUL SYLLABLE HOEN
-+<UD691>     /x83/x36/xa3/x32 HANGUL SYLLABLE HOENI
-+<UD692>     /x83/x36/xa3/x33 HANGUL SYLLABLE HOENH
-+<UD693>     /x83/x36/xa3/x34 HANGUL SYLLABLE HOED
-+<UD694>     /x83/x36/xa3/x35 HANGUL SYLLABLE HOEL
-+<UD695>     /x83/x36/xa3/x36 HANGUL SYLLABLE HOELG
-+<UD696>     /x83/x36/xa3/x37 HANGUL SYLLABLE HOELM
-+<UD697>     /x83/x36/xa3/x38 HANGUL SYLLABLE HOELB
-+<UD698>     /x83/x36/xa3/x39 HANGUL SYLLABLE HOELS
-+<UD699>     /x83/x36/xa4/x30 HANGUL SYLLABLE HOELT
-+<UD69A>     /x83/x36/xa4/x31 HANGUL SYLLABLE HOELP
-+<UD69B>     /x83/x36/xa4/x32 HANGUL SYLLABLE HOELH
-+<UD69C>     /x83/x36/xa4/x33 HANGUL SYLLABLE HOEM
-+<UD69D>     /x83/x36/xa4/x34 HANGUL SYLLABLE HOEB
-+<UD69E>     /x83/x36/xa4/x35 HANGUL SYLLABLE HOEBS
-+<UD69F>     /x83/x36/xa4/x36 HANGUL SYLLABLE HOES
-+<UD6A0>     /x83/x36/xa4/x37 HANGUL SYLLABLE HOESS
-+<UD6A1>     /x83/x36/xa4/x38 HANGUL SYLLABLE HOENG
-+<UD6A2>     /x83/x36/xa4/x39 HANGUL SYLLABLE HOEJ
-+<UD6A3>     /x83/x36/xa5/x30 HANGUL SYLLABLE HOEC
-+<UD6A4>     /x83/x36/xa5/x31 HANGUL SYLLABLE HOEK
-+<UD6A5>     /x83/x36/xa5/x32 HANGUL SYLLABLE HOET
-+<UD6A6>     /x83/x36/xa5/x33 HANGUL SYLLABLE HOEP
-+<UD6A7>     /x83/x36/xa5/x34 HANGUL SYLLABLE HOEH
-+<UD6A8>     /x83/x36/xa5/x35 HANGUL SYLLABLE HYO
-+<UD6A9>     /x83/x36/xa5/x36 HANGUL SYLLABLE HYOG
-+<UD6AA>     /x83/x36/xa5/x37 HANGUL SYLLABLE HYOGG
-+<UD6AB>     /x83/x36/xa5/x38 HANGUL SYLLABLE HYOGS
-+<UD6AC>     /x83/x36/xa5/x39 HANGUL SYLLABLE HYON
-+<UD6AD>     /x83/x36/xa6/x30 HANGUL SYLLABLE HYONI
-+<UD6AE>     /x83/x36/xa6/x31 HANGUL SYLLABLE HYONH
-+<UD6AF>     /x83/x36/xa6/x32 HANGUL SYLLABLE HYOD
-+<UD6B0>     /x83/x36/xa6/x33 HANGUL SYLLABLE HYOL
-+<UD6B1>     /x83/x36/xa6/x34 HANGUL SYLLABLE HYOLG
-+<UD6B2>     /x83/x36/xa6/x35 HANGUL SYLLABLE HYOLM
-+<UD6B3>     /x83/x36/xa6/x36 HANGUL SYLLABLE HYOLB
-+<UD6B4>     /x83/x36/xa6/x37 HANGUL SYLLABLE HYOLS
-+<UD6B5>     /x83/x36/xa6/x38 HANGUL SYLLABLE HYOLT
-+<UD6B6>     /x83/x36/xa6/x39 HANGUL SYLLABLE HYOLP
-+<UD6B7>     /x83/x36/xa7/x30 HANGUL SYLLABLE HYOLH
-+<UD6B8>     /x83/x36/xa7/x31 HANGUL SYLLABLE HYOM
-+<UD6B9>     /x83/x36/xa7/x32 HANGUL SYLLABLE HYOB
-+<UD6BA>     /x83/x36/xa7/x33 HANGUL SYLLABLE HYOBS
-+<UD6BB>     /x83/x36/xa7/x34 HANGUL SYLLABLE HYOS
-+<UD6BC>     /x83/x36/xa7/x35 HANGUL SYLLABLE HYOSS
-+<UD6BD>     /x83/x36/xa7/x36 HANGUL SYLLABLE HYONG
-+<UD6BE>     /x83/x36/xa7/x37 HANGUL SYLLABLE HYOJ
-+<UD6BF>     /x83/x36/xa7/x38 HANGUL SYLLABLE HYOC
-+<UD6C0>     /x83/x36/xa7/x39 HANGUL SYLLABLE HYOK
-+<UD6C1>     /x83/x36/xa8/x30 HANGUL SYLLABLE HYOT
-+<UD6C2>     /x83/x36/xa8/x31 HANGUL SYLLABLE HYOP
-+<UD6C3>     /x83/x36/xa8/x32 HANGUL SYLLABLE HYOH
-+<UD6C4>     /x83/x36/xa8/x33 HANGUL SYLLABLE HU
-+<UD6C5>     /x83/x36/xa8/x34 HANGUL SYLLABLE HUG
-+<UD6C6>     /x83/x36/xa8/x35 HANGUL SYLLABLE HUGG
-+<UD6C7>     /x83/x36/xa8/x36 HANGUL SYLLABLE HUGS
-+<UD6C8>     /x83/x36/xa8/x37 HANGUL SYLLABLE HUN
-+<UD6C9>     /x83/x36/xa8/x38 HANGUL SYLLABLE HUNI
-+<UD6CA>     /x83/x36/xa8/x39 HANGUL SYLLABLE HUNH
-+<UD6CB>     /x83/x36/xa9/x30 HANGUL SYLLABLE HUD
-+<UD6CC>     /x83/x36/xa9/x31 HANGUL SYLLABLE HUL
-+<UD6CD>     /x83/x36/xa9/x32 HANGUL SYLLABLE HULG
-+<UD6CE>     /x83/x36/xa9/x33 HANGUL SYLLABLE HULM
-+<UD6CF>     /x83/x36/xa9/x34 HANGUL SYLLABLE HULB
-+<UD6D0>     /x83/x36/xa9/x35 HANGUL SYLLABLE HULS
-+<UD6D1>     /x83/x36/xa9/x36 HANGUL SYLLABLE HULT
-+<UD6D2>     /x83/x36/xa9/x37 HANGUL SYLLABLE HULP
-+<UD6D3>     /x83/x36/xa9/x38 HANGUL SYLLABLE HULH
-+<UD6D4>     /x83/x36/xa9/x39 HANGUL SYLLABLE HUM
-+<UD6D5>     /x83/x36/xaa/x30 HANGUL SYLLABLE HUB
-+<UD6D6>     /x83/x36/xaa/x31 HANGUL SYLLABLE HUBS
-+<UD6D7>     /x83/x36/xaa/x32 HANGUL SYLLABLE HUS
-+<UD6D8>     /x83/x36/xaa/x33 HANGUL SYLLABLE HUSS
-+<UD6D9>     /x83/x36/xaa/x34 HANGUL SYLLABLE HUNG
-+<UD6DA>     /x83/x36/xaa/x35 HANGUL SYLLABLE HUJ
-+<UD6DB>     /x83/x36/xaa/x36 HANGUL SYLLABLE HUC
-+<UD6DC>     /x83/x36/xaa/x37 HANGUL SYLLABLE HUK
-+<UD6DD>     /x83/x36/xaa/x38 HANGUL SYLLABLE HUT
-+<UD6DE>     /x83/x36/xaa/x39 HANGUL SYLLABLE HUP
-+<UD6DF>     /x83/x36/xab/x30 HANGUL SYLLABLE HUH
-+<UD6E0>     /x83/x36/xab/x31 HANGUL SYLLABLE HWEO
-+<UD6E1>     /x83/x36/xab/x32 HANGUL SYLLABLE HWEOG
-+<UD6E2>     /x83/x36/xab/x33 HANGUL SYLLABLE HWEOGG
-+<UD6E3>     /x83/x36/xab/x34 HANGUL SYLLABLE HWEOGS
-+<UD6E4>     /x83/x36/xab/x35 HANGUL SYLLABLE HWEON
-+<UD6E5>     /x83/x36/xab/x36 HANGUL SYLLABLE HWEONI
-+<UD6E6>     /x83/x36/xab/x37 HANGUL SYLLABLE HWEONH
-+<UD6E7>     /x83/x36/xab/x38 HANGUL SYLLABLE HWEOD
-+<UD6E8>     /x83/x36/xab/x39 HANGUL SYLLABLE HWEOL
-+<UD6E9>     /x83/x36/xac/x30 HANGUL SYLLABLE HWEOLG
-+<UD6EA>     /x83/x36/xac/x31 HANGUL SYLLABLE HWEOLM
-+<UD6EB>     /x83/x36/xac/x32 HANGUL SYLLABLE HWEOLB
-+<UD6EC>     /x83/x36/xac/x33 HANGUL SYLLABLE HWEOLS
-+<UD6ED>     /x83/x36/xac/x34 HANGUL SYLLABLE HWEOLT
-+<UD6EE>     /x83/x36/xac/x35 HANGUL SYLLABLE HWEOLP
-+<UD6EF>     /x83/x36/xac/x36 HANGUL SYLLABLE HWEOLH
-+<UD6F0>     /x83/x36/xac/x37 HANGUL SYLLABLE HWEOM
-+<UD6F1>     /x83/x36/xac/x38 HANGUL SYLLABLE HWEOB
-+<UD6F2>     /x83/x36/xac/x39 HANGUL SYLLABLE HWEOBS
-+<UD6F3>     /x83/x36/xad/x30 HANGUL SYLLABLE HWEOS
-+<UD6F4>     /x83/x36/xad/x31 HANGUL SYLLABLE HWEOSS
-+<UD6F5>     /x83/x36/xad/x32 HANGUL SYLLABLE HWEONG
-+<UD6F6>     /x83/x36/xad/x33 HANGUL SYLLABLE HWEOJ
-+<UD6F7>     /x83/x36/xad/x34 HANGUL SYLLABLE HWEOC
-+<UD6F8>     /x83/x36/xad/x35 HANGUL SYLLABLE HWEOK
-+<UD6F9>     /x83/x36/xad/x36 HANGUL SYLLABLE HWEOT
-+<UD6FA>     /x83/x36/xad/x37 HANGUL SYLLABLE HWEOP
-+<UD6FB>     /x83/x36/xad/x38 HANGUL SYLLABLE HWEOH
-+<UD6FC>     /x83/x36/xad/x39 HANGUL SYLLABLE HWE
-+<UD6FD>     /x83/x36/xae/x30 HANGUL SYLLABLE HWEG
-+<UD6FE>     /x83/x36/xae/x31 HANGUL SYLLABLE HWEGG
-+<UD6FF>     /x83/x36/xae/x32 HANGUL SYLLABLE HWEGS
-+<UD700>     /x83/x36/xae/x33 HANGUL SYLLABLE HWEN
-+<UD701>     /x83/x36/xae/x34 HANGUL SYLLABLE HWENI
-+<UD702>     /x83/x36/xae/x35 HANGUL SYLLABLE HWENH
-+<UD703>     /x83/x36/xae/x36 HANGUL SYLLABLE HWED
-+<UD704>     /x83/x36/xae/x37 HANGUL SYLLABLE HWEL
-+<UD705>     /x83/x36/xae/x38 HANGUL SYLLABLE HWELG
-+<UD706>     /x83/x36/xae/x39 HANGUL SYLLABLE HWELM
-+<UD707>     /x83/x36/xaf/x30 HANGUL SYLLABLE HWELB
-+<UD708>     /x83/x36/xaf/x31 HANGUL SYLLABLE HWELS
-+<UD709>     /x83/x36/xaf/x32 HANGUL SYLLABLE HWELT
-+<UD70A>     /x83/x36/xaf/x33 HANGUL SYLLABLE HWELP
-+<UD70B>     /x83/x36/xaf/x34 HANGUL SYLLABLE HWELH
-+<UD70C>     /x83/x36/xaf/x35 HANGUL SYLLABLE HWEM
-+<UD70D>     /x83/x36/xaf/x36 HANGUL SYLLABLE HWEB
-+<UD70E>     /x83/x36/xaf/x37 HANGUL SYLLABLE HWEBS
-+<UD70F>     /x83/x36/xaf/x38 HANGUL SYLLABLE HWES
-+<UD710>     /x83/x36/xaf/x39 HANGUL SYLLABLE HWESS
-+<UD711>     /x83/x36/xb0/x30 HANGUL SYLLABLE HWENG
-+<UD712>     /x83/x36/xb0/x31 HANGUL SYLLABLE HWEJ
-+<UD713>     /x83/x36/xb0/x32 HANGUL SYLLABLE HWEC
-+<UD714>     /x83/x36/xb0/x33 HANGUL SYLLABLE HWEK
-+<UD715>     /x83/x36/xb0/x34 HANGUL SYLLABLE HWET
-+<UD716>     /x83/x36/xb0/x35 HANGUL SYLLABLE HWEP
-+<UD717>     /x83/x36/xb0/x36 HANGUL SYLLABLE HWEH
-+<UD718>     /x83/x36/xb0/x37 HANGUL SYLLABLE HWI
-+<UD719>     /x83/x36/xb0/x38 HANGUL SYLLABLE HWIG
-+<UD71A>     /x83/x36/xb0/x39 HANGUL SYLLABLE HWIGG
-+<UD71B>     /x83/x36/xb1/x30 HANGUL SYLLABLE HWIGS
-+<UD71C>     /x83/x36/xb1/x31 HANGUL SYLLABLE HWIN
-+<UD71D>     /x83/x36/xb1/x32 HANGUL SYLLABLE HWINI
-+<UD71E>     /x83/x36/xb1/x33 HANGUL SYLLABLE HWINH
-+<UD71F>     /x83/x36/xb1/x34 HANGUL SYLLABLE HWID
-+<UD720>     /x83/x36/xb1/x35 HANGUL SYLLABLE HWIL
-+<UD721>     /x83/x36/xb1/x36 HANGUL SYLLABLE HWILG
-+<UD722>     /x83/x36/xb1/x37 HANGUL SYLLABLE HWILM
-+<UD723>     /x83/x36/xb1/x38 HANGUL SYLLABLE HWILB
-+<UD724>     /x83/x36/xb1/x39 HANGUL SYLLABLE HWILS
-+<UD725>     /x83/x36/xb2/x30 HANGUL SYLLABLE HWILT
-+<UD726>     /x83/x36/xb2/x31 HANGUL SYLLABLE HWILP
-+<UD727>     /x83/x36/xb2/x32 HANGUL SYLLABLE HWILH
-+<UD728>     /x83/x36/xb2/x33 HANGUL SYLLABLE HWIM
-+<UD729>     /x83/x36/xb2/x34 HANGUL SYLLABLE HWIB
-+<UD72A>     /x83/x36/xb2/x35 HANGUL SYLLABLE HWIBS
-+<UD72B>     /x83/x36/xb2/x36 HANGUL SYLLABLE HWIS
-+<UD72C>     /x83/x36/xb2/x37 HANGUL SYLLABLE HWISS
-+<UD72D>     /x83/x36/xb2/x38 HANGUL SYLLABLE HWING
-+<UD72E>     /x83/x36/xb2/x39 HANGUL SYLLABLE HWIJ
-+<UD72F>     /x83/x36/xb3/x30 HANGUL SYLLABLE HWIC
-+<UD730>     /x83/x36/xb3/x31 HANGUL SYLLABLE HWIK
-+<UD731>     /x83/x36/xb3/x32 HANGUL SYLLABLE HWIT
-+<UD732>     /x83/x36/xb3/x33 HANGUL SYLLABLE HWIP
-+<UD733>     /x83/x36/xb3/x34 HANGUL SYLLABLE HWIH
-+<UD734>     /x83/x36/xb3/x35 HANGUL SYLLABLE HYU
-+<UD735>     /x83/x36/xb3/x36 HANGUL SYLLABLE HYUG
-+<UD736>     /x83/x36/xb3/x37 HANGUL SYLLABLE HYUGG
-+<UD737>     /x83/x36/xb3/x38 HANGUL SYLLABLE HYUGS
-+<UD738>     /x83/x36/xb3/x39 HANGUL SYLLABLE HYUN
-+<UD739>     /x83/x36/xb4/x30 HANGUL SYLLABLE HYUNI
-+<UD73A>     /x83/x36/xb4/x31 HANGUL SYLLABLE HYUNH
-+<UD73B>     /x83/x36/xb4/x32 HANGUL SYLLABLE HYUD
-+<UD73C>     /x83/x36/xb4/x33 HANGUL SYLLABLE HYUL
-+<UD73D>     /x83/x36/xb4/x34 HANGUL SYLLABLE HYULG
-+<UD73E>     /x83/x36/xb4/x35 HANGUL SYLLABLE HYULM
-+<UD73F>     /x83/x36/xb4/x36 HANGUL SYLLABLE HYULB
-+<UD740>     /x83/x36/xb4/x37 HANGUL SYLLABLE HYULS
-+<UD741>     /x83/x36/xb4/x38 HANGUL SYLLABLE HYULT
-+<UD742>     /x83/x36/xb4/x39 HANGUL SYLLABLE HYULP
-+<UD743>     /x83/x36/xb5/x30 HANGUL SYLLABLE HYULH
-+<UD744>     /x83/x36/xb5/x31 HANGUL SYLLABLE HYUM
-+<UD745>     /x83/x36/xb5/x32 HANGUL SYLLABLE HYUB
-+<UD746>     /x83/x36/xb5/x33 HANGUL SYLLABLE HYUBS
-+<UD747>     /x83/x36/xb5/x34 HANGUL SYLLABLE HYUS
-+<UD748>     /x83/x36/xb5/x35 HANGUL SYLLABLE HYUSS
-+<UD749>     /x83/x36/xb5/x36 HANGUL SYLLABLE HYUNG
-+<UD74A>     /x83/x36/xb5/x37 HANGUL SYLLABLE HYUJ
-+<UD74B>     /x83/x36/xb5/x38 HANGUL SYLLABLE HYUC
-+<UD74C>     /x83/x36/xb5/x39 HANGUL SYLLABLE HYUK
-+<UD74D>     /x83/x36/xb6/x30 HANGUL SYLLABLE HYUT
-+<UD74E>     /x83/x36/xb6/x31 HANGUL SYLLABLE HYUP
-+<UD74F>     /x83/x36/xb6/x32 HANGUL SYLLABLE HYUH
-+<UD750>     /x83/x36/xb6/x33 HANGUL SYLLABLE HEU
-+<UD751>     /x83/x36/xb6/x34 HANGUL SYLLABLE HEUG
-+<UD752>     /x83/x36/xb6/x35 HANGUL SYLLABLE HEUGG
-+<UD753>     /x83/x36/xb6/x36 HANGUL SYLLABLE HEUGS
-+<UD754>     /x83/x36/xb6/x37 HANGUL SYLLABLE HEUN
-+<UD755>     /x83/x36/xb6/x38 HANGUL SYLLABLE HEUNI
-+<UD756>     /x83/x36/xb6/x39 HANGUL SYLLABLE HEUNH
-+<UD757>     /x83/x36/xb7/x30 HANGUL SYLLABLE HEUD
-+<UD758>     /x83/x36/xb7/x31 HANGUL SYLLABLE HEUL
-+<UD759>     /x83/x36/xb7/x32 HANGUL SYLLABLE HEULG
-+<UD75A>     /x83/x36/xb7/x33 HANGUL SYLLABLE HEULM
-+<UD75B>     /x83/x36/xb7/x34 HANGUL SYLLABLE HEULB
-+<UD75C>     /x83/x36/xb7/x35 HANGUL SYLLABLE HEULS
-+<UD75D>     /x83/x36/xb7/x36 HANGUL SYLLABLE HEULT
-+<UD75E>     /x83/x36/xb7/x37 HANGUL SYLLABLE HEULP
-+<UD75F>     /x83/x36/xb7/x38 HANGUL SYLLABLE HEULH
-+<UD760>     /x83/x36/xb7/x39 HANGUL SYLLABLE HEUM
-+<UD761>     /x83/x36/xb8/x30 HANGUL SYLLABLE HEUB
-+<UD762>     /x83/x36/xb8/x31 HANGUL SYLLABLE HEUBS
-+<UD763>     /x83/x36/xb8/x32 HANGUL SYLLABLE HEUS
-+<UD764>     /x83/x36/xb8/x33 HANGUL SYLLABLE HEUSS
-+<UD765>     /x83/x36/xb8/x34 HANGUL SYLLABLE HEUNG
-+<UD766>     /x83/x36/xb8/x35 HANGUL SYLLABLE HEUJ
-+<UD767>     /x83/x36/xb8/x36 HANGUL SYLLABLE HEUC
-+<UD768>     /x83/x36/xb8/x37 HANGUL SYLLABLE HEUK
-+<UD769>     /x83/x36/xb8/x38 HANGUL SYLLABLE HEUT
-+<UD76A>     /x83/x36/xb8/x39 HANGUL SYLLABLE HEUP
-+<UD76B>     /x83/x36/xb9/x30 HANGUL SYLLABLE HEUH
-+<UD76C>     /x83/x36/xb9/x31 HANGUL SYLLABLE HYI
-+<UD76D>     /x83/x36/xb9/x32 HANGUL SYLLABLE HYIG
-+<UD76E>     /x83/x36/xb9/x33 HANGUL SYLLABLE HYIGG
-+<UD76F>     /x83/x36/xb9/x34 HANGUL SYLLABLE HYIGS
-+<UD770>     /x83/x36/xb9/x35 HANGUL SYLLABLE HYIN
-+<UD771>     /x83/x36/xb9/x36 HANGUL SYLLABLE HYINI
-+<UD772>     /x83/x36/xb9/x37 HANGUL SYLLABLE HYINH
-+<UD773>     /x83/x36/xb9/x38 HANGUL SYLLABLE HYID
-+<UD774>     /x83/x36/xb9/x39 HANGUL SYLLABLE HYIL
-+<UD775>     /x83/x36/xba/x30 HANGUL SYLLABLE HYILG
-+<UD776>     /x83/x36/xba/x31 HANGUL SYLLABLE HYILM
-+<UD777>     /x83/x36/xba/x32 HANGUL SYLLABLE HYILB
-+<UD778>     /x83/x36/xba/x33 HANGUL SYLLABLE HYILS
-+<UD779>     /x83/x36/xba/x34 HANGUL SYLLABLE HYILT
-+<UD77A>     /x83/x36/xba/x35 HANGUL SYLLABLE HYILP
-+<UD77B>     /x83/x36/xba/x36 HANGUL SYLLABLE HYILH
-+<UD77C>     /x83/x36/xba/x37 HANGUL SYLLABLE HYIM
-+<UD77D>     /x83/x36/xba/x38 HANGUL SYLLABLE HYIB
-+<UD77E>     /x83/x36/xba/x39 HANGUL SYLLABLE HYIBS
-+<UD77F>     /x83/x36/xbb/x30 HANGUL SYLLABLE HYIS
-+<UD780>     /x83/x36/xbb/x31 HANGUL SYLLABLE HYISS
-+<UD781>     /x83/x36/xbb/x32 HANGUL SYLLABLE HYING
-+<UD782>     /x83/x36/xbb/x33 HANGUL SYLLABLE HYIJ
-+<UD783>     /x83/x36/xbb/x34 HANGUL SYLLABLE HYIC
-+<UD784>     /x83/x36/xbb/x35 HANGUL SYLLABLE HYIK
-+<UD785>     /x83/x36/xbb/x36 HANGUL SYLLABLE HYIT
-+<UD786>     /x83/x36/xbb/x37 HANGUL SYLLABLE HYIP
-+<UD787>     /x83/x36/xbb/x38 HANGUL SYLLABLE HYIH
-+<UD788>     /x83/x36/xbb/x39 HANGUL SYLLABLE HI
-+<UD789>     /x83/x36/xbc/x30 HANGUL SYLLABLE HIG
-+<UD78A>     /x83/x36/xbc/x31 HANGUL SYLLABLE HIGG
-+<UD78B>     /x83/x36/xbc/x32 HANGUL SYLLABLE HIGS
-+<UD78C>     /x83/x36/xbc/x33 HANGUL SYLLABLE HIN
-+<UD78D>     /x83/x36/xbc/x34 HANGUL SYLLABLE HINI
-+<UD78E>     /x83/x36/xbc/x35 HANGUL SYLLABLE HINH
-+<UD78F>     /x83/x36/xbc/x36 HANGUL SYLLABLE HID
-+<UD790>     /x83/x36/xbc/x37 HANGUL SYLLABLE HIL
-+<UD791>     /x83/x36/xbc/x38 HANGUL SYLLABLE HILG
-+<UD792>     /x83/x36/xbc/x39 HANGUL SYLLABLE HILM
-+<UD793>     /x83/x36/xbd/x30 HANGUL SYLLABLE HILB
-+<UD794>     /x83/x36/xbd/x31 HANGUL SYLLABLE HILS
-+<UD795>     /x83/x36/xbd/x32 HANGUL SYLLABLE HILT
-+<UD796>     /x83/x36/xbd/x33 HANGUL SYLLABLE HILP
-+<UD797>     /x83/x36/xbd/x34 HANGUL SYLLABLE HILH
-+<UD798>     /x83/x36/xbd/x35 HANGUL SYLLABLE HIM
-+<UD799>     /x83/x36/xbd/x36 HANGUL SYLLABLE HIB
-+<UD79A>     /x83/x36/xbd/x37 HANGUL SYLLABLE HIBS
-+<UD79B>     /x83/x36/xbd/x38 HANGUL SYLLABLE HIS
-+<UD79C>     /x83/x36/xbd/x39 HANGUL SYLLABLE HISS
-+<UD79D>     /x83/x36/xbe/x30 HANGUL SYLLABLE HING
-+<UD79E>     /x83/x36/xbe/x31 HANGUL SYLLABLE HIJ
-+<UD79F>     /x83/x36/xbe/x32 HANGUL SYLLABLE HIC
-+<UD7A0>     /x83/x36/xbe/x33 HANGUL SYLLABLE HIK
-+<UD7A1>     /x83/x36/xbe/x34 HANGUL SYLLABLE HIT
-+<UD7A2>     /x83/x36/xbe/x35 HANGUL SYLLABLE HIP
-+<UD7A3>     /x83/x36/xbe/x36 HANGUL SYLLABLE HIH
-+<UD7A4>     /x83/x36/xbe/x37 <UNASSIGNED>
-+<UD7A5>     /x83/x36/xbe/x38 <UNASSIGNED>
-+<UD7A6>     /x83/x36/xbe/x39 <UNASSIGNED>
-+<UD7A7>     /x83/x36/xbf/x30 <UNASSIGNED>
-+<UD7A8>     /x83/x36/xbf/x31 <UNASSIGNED>
-+<UD7A9>     /x83/x36/xbf/x32 <UNASSIGNED>
-+<UD7AA>     /x83/x36/xbf/x33 <UNASSIGNED>
-+<UD7AB>     /x83/x36/xbf/x34 <UNASSIGNED>
-+<UD7AC>     /x83/x36/xbf/x35 <UNASSIGNED>
-+<UD7AD>     /x83/x36/xbf/x36 <UNASSIGNED>
-+<UD7AE>     /x83/x36/xbf/x37 <UNASSIGNED>
-+<UD7AF>     /x83/x36/xbf/x38 <UNASSIGNED>
-+<UD7B0>     /x83/x36/xbf/x39 <UNASSIGNED>
-+<UD7B1>     /x83/x36/xc0/x30 <UNASSIGNED>
-+<UD7B2>     /x83/x36/xc0/x31 <UNASSIGNED>
-+<UD7B3>     /x83/x36/xc0/x32 <UNASSIGNED>
-+<UD7B4>     /x83/x36/xc0/x33 <UNASSIGNED>
-+<UD7B5>     /x83/x36/xc0/x34 <UNASSIGNED>
-+<UD7B6>     /x83/x36/xc0/x35 <UNASSIGNED>
-+<UD7B7>     /x83/x36/xc0/x36 <UNASSIGNED>
-+<UD7B8>     /x83/x36/xc0/x37 <UNASSIGNED>
-+<UD7B9>     /x83/x36/xc0/x38 <UNASSIGNED>
-+<UD7BA>     /x83/x36/xc0/x39 <UNASSIGNED>
-+<UD7BB>     /x83/x36/xc1/x30 <UNASSIGNED>
-+<UD7BC>     /x83/x36/xc1/x31 <UNASSIGNED>
-+<UD7BD>     /x83/x36/xc1/x32 <UNASSIGNED>
-+<UD7BE>     /x83/x36/xc1/x33 <UNASSIGNED>
-+<UD7BF>     /x83/x36/xc1/x34 <UNASSIGNED>
-+<UD7C0>     /x83/x36/xc1/x35 <UNASSIGNED>
-+<UD7C1>     /x83/x36/xc1/x36 <UNASSIGNED>
-+<UD7C2>     /x83/x36/xc1/x37 <UNASSIGNED>
-+<UD7C3>     /x83/x36/xc1/x38 <UNASSIGNED>
-+<UD7C4>     /x83/x36/xc1/x39 <UNASSIGNED>
-+<UD7C5>     /x83/x36/xc2/x30 <UNASSIGNED>
-+<UD7C6>     /x83/x36/xc2/x31 <UNASSIGNED>
-+<UD7C7>     /x83/x36/xc2/x32 <UNASSIGNED>
-+<UD7C8>     /x83/x36/xc2/x33 <UNASSIGNED>
-+<UD7C9>     /x83/x36/xc2/x34 <UNASSIGNED>
-+<UD7CA>     /x83/x36/xc2/x35 <UNASSIGNED>
-+<UD7CB>     /x83/x36/xc2/x36 <UNASSIGNED>
-+<UD7CC>     /x83/x36/xc2/x37 <UNASSIGNED>
-+<UD7CD>     /x83/x36/xc2/x38 <UNASSIGNED>
-+<UD7CE>     /x83/x36/xc2/x39 <UNASSIGNED>
-+<UD7CF>     /x83/x36/xc3/x30 <UNASSIGNED>
-+<UD7D0>     /x83/x36/xc3/x31 <UNASSIGNED>
-+<UD7D1>     /x83/x36/xc3/x32 <UNASSIGNED>
-+<UD7D2>     /x83/x36/xc3/x33 <UNASSIGNED>
-+<UD7D3>     /x83/x36/xc3/x34 <UNASSIGNED>
-+<UD7D4>     /x83/x36/xc3/x35 <UNASSIGNED>
-+<UD7D5>     /x83/x36/xc3/x36 <UNASSIGNED>
-+<UD7D6>     /x83/x36/xc3/x37 <UNASSIGNED>
-+<UD7D7>     /x83/x36/xc3/x38 <UNASSIGNED>
-+<UD7D8>     /x83/x36/xc3/x39 <UNASSIGNED>
-+<UD7D9>     /x83/x36/xc4/x30 <UNASSIGNED>
-+<UD7DA>     /x83/x36/xc4/x31 <UNASSIGNED>
-+<UD7DB>     /x83/x36/xc4/x32 <UNASSIGNED>
-+<UD7DC>     /x83/x36/xc4/x33 <UNASSIGNED>
-+<UD7DD>     /x83/x36/xc4/x34 <UNASSIGNED>
-+<UD7DE>     /x83/x36/xc4/x35 <UNASSIGNED>
-+<UD7DF>     /x83/x36/xc4/x36 <UNASSIGNED>
-+<UD7E0>     /x83/x36/xc4/x37 <UNASSIGNED>
-+<UD7E1>     /x83/x36/xc4/x38 <UNASSIGNED>
-+<UD7E2>     /x83/x36/xc4/x39 <UNASSIGNED>
-+<UD7E3>     /x83/x36/xc5/x30 <UNASSIGNED>
-+<UD7E4>     /x83/x36/xc5/x31 <UNASSIGNED>
-+<UD7E5>     /x83/x36/xc5/x32 <UNASSIGNED>
-+<UD7E6>     /x83/x36/xc5/x33 <UNASSIGNED>
-+<UD7E7>     /x83/x36/xc5/x34 <UNASSIGNED>
-+<UD7E8>     /x83/x36/xc5/x35 <UNASSIGNED>
-+<UD7E9>     /x83/x36/xc5/x36 <UNASSIGNED>
-+<UD7EA>     /x83/x36/xc5/x37 <UNASSIGNED>
-+<UD7EB>     /x83/x36/xc5/x38 <UNASSIGNED>
-+<UD7EC>     /x83/x36/xc5/x39 <UNASSIGNED>
-+<UD7ED>     /x83/x36/xc6/x30 <UNASSIGNED>
-+<UD7EE>     /x83/x36/xc6/x31 <UNASSIGNED>
-+<UD7EF>     /x83/x36/xc6/x32 <UNASSIGNED>
-+<UD7F0>     /x83/x36/xc6/x33 <UNASSIGNED>
-+<UD7F1>     /x83/x36/xc6/x34 <UNASSIGNED>
-+<UD7F2>     /x83/x36/xc6/x35 <UNASSIGNED>
-+<UD7F3>     /x83/x36/xc6/x36 <UNASSIGNED>
-+<UD7F4>     /x83/x36/xc6/x37 <UNASSIGNED>
-+<UD7F5>     /x83/x36/xc6/x38 <UNASSIGNED>
-+<UD7F6>     /x83/x36/xc6/x39 <UNASSIGNED>
-+<UD7F7>     /x83/x36/xc7/x30 <UNASSIGNED>
-+<UD7F8>     /x83/x36/xc7/x31 <UNASSIGNED>
-+<UD7F9>     /x83/x36/xc7/x32 <UNASSIGNED>
-+<UD7FA>     /x83/x36/xc7/x33 <UNASSIGNED>
-+<UD7FB>     /x83/x36/xc7/x34 <UNASSIGNED>
-+<UD7FC>     /x83/x36/xc7/x35 <UNASSIGNED>
-+<UD7FD>     /x83/x36/xc7/x36 <UNASSIGNED>
-+<UD7FE>     /x83/x36/xc7/x37 <UNASSIGNED>
-+<UD7FF>     /x83/x36/xc7/x38 <UNASSIGNED>
-+<UE000>     /xaa/xa1         <Private Use>
-+<UE001>     /xaa/xa2         <Private Use>
-+<UE002>     /xaa/xa3         <Private Use>
-+<UE003>     /xaa/xa4         <Private Use>
-+<UE004>     /xaa/xa5         <Private Use>
-+<UE005>     /xaa/xa6         <Private Use>
-+<UE006>     /xaa/xa7         <Private Use>
-+<UE007>     /xaa/xa8         <Private Use>
-+<UE008>     /xaa/xa9         <Private Use>
-+<UE009>     /xaa/xaa         <Private Use>
-+<UE00A>     /xaa/xab         <Private Use>
-+<UE00B>     /xaa/xac         <Private Use>
-+<UE00C>     /xaa/xad         <Private Use>
-+<UE00D>     /xaa/xae         <Private Use>
-+<UE00E>     /xaa/xaf         <Private Use>
-+<UE00F>     /xaa/xb0         <Private Use>
-+<UE010>     /xaa/xb1         <Private Use>
-+<UE011>     /xaa/xb2         <Private Use>
-+<UE012>     /xaa/xb3         <Private Use>
-+<UE013>     /xaa/xb4         <Private Use>
-+<UE014>     /xaa/xb5         <Private Use>
-+<UE015>     /xaa/xb6         <Private Use>
-+<UE016>     /xaa/xb7         <Private Use>
-+<UE017>     /xaa/xb8         <Private Use>
-+<UE018>     /xaa/xb9         <Private Use>
-+<UE019>     /xaa/xba         <Private Use>
-+<UE01A>     /xaa/xbb         <Private Use>
-+<UE01B>     /xaa/xbc         <Private Use>
-+<UE01C>     /xaa/xbd         <Private Use>
-+<UE01D>     /xaa/xbe         <Private Use>
-+<UE01E>     /xaa/xbf         <Private Use>
-+<UE01F>     /xaa/xc0         <Private Use>
-+<UE020>     /xaa/xc1         <Private Use>
-+<UE021>     /xaa/xc2         <Private Use>
-+<UE022>     /xaa/xc3         <Private Use>
-+<UE023>     /xaa/xc4         <Private Use>
-+<UE024>     /xaa/xc5         <Private Use>
-+<UE025>     /xaa/xc6         <Private Use>
-+<UE026>     /xaa/xc7         <Private Use>
-+<UE027>     /xaa/xc8         <Private Use>
-+<UE028>     /xaa/xc9         <Private Use>
-+<UE029>     /xaa/xca         <Private Use>
-+<UE02A>     /xaa/xcb         <Private Use>
-+<UE02B>     /xaa/xcc         <Private Use>
-+<UE02C>     /xaa/xcd         <Private Use>
-+<UE02D>     /xaa/xce         <Private Use>
-+<UE02E>     /xaa/xcf         <Private Use>
-+<UE02F>     /xaa/xd0         <Private Use>
-+<UE030>     /xaa/xd1         <Private Use>
-+<UE031>     /xaa/xd2         <Private Use>
-+<UE032>     /xaa/xd3         <Private Use>
-+<UE033>     /xaa/xd4         <Private Use>
-+<UE034>     /xaa/xd5         <Private Use>
-+<UE035>     /xaa/xd6         <Private Use>
-+<UE036>     /xaa/xd7         <Private Use>
-+<UE037>     /xaa/xd8         <Private Use>
-+<UE038>     /xaa/xd9         <Private Use>
-+<UE039>     /xaa/xda         <Private Use>
-+<UE03A>     /xaa/xdb         <Private Use>
-+<UE03B>     /xaa/xdc         <Private Use>
-+<UE03C>     /xaa/xdd         <Private Use>
-+<UE03D>     /xaa/xde         <Private Use>
-+<UE03E>     /xaa/xdf         <Private Use>
-+<UE03F>     /xaa/xe0         <Private Use>
-+<UE040>     /xaa/xe1         <Private Use>
-+<UE041>     /xaa/xe2         <Private Use>
-+<UE042>     /xaa/xe3         <Private Use>
-+<UE043>     /xaa/xe4         <Private Use>
-+<UE044>     /xaa/xe5         <Private Use>
-+<UE045>     /xaa/xe6         <Private Use>
-+<UE046>     /xaa/xe7         <Private Use>
-+<UE047>     /xaa/xe8         <Private Use>
-+<UE048>     /xaa/xe9         <Private Use>
-+<UE049>     /xaa/xea         <Private Use>
-+<UE04A>     /xaa/xeb         <Private Use>
-+<UE04B>     /xaa/xec         <Private Use>
-+<UE04C>     /xaa/xed         <Private Use>
-+<UE04D>     /xaa/xee         <Private Use>
-+<UE04E>     /xaa/xef         <Private Use>
-+<UE04F>     /xaa/xf0         <Private Use>
-+<UE050>     /xaa/xf1         <Private Use>
-+<UE051>     /xaa/xf2         <Private Use>
-+<UE052>     /xaa/xf3         <Private Use>
-+<UE053>     /xaa/xf4         <Private Use>
-+<UE054>     /xaa/xf5         <Private Use>
-+<UE055>     /xaa/xf6         <Private Use>
-+<UE056>     /xaa/xf7         <Private Use>
-+<UE057>     /xaa/xf8         <Private Use>
-+<UE058>     /xaa/xf9         <Private Use>
-+<UE059>     /xaa/xfa         <Private Use>
-+<UE05A>     /xaa/xfb         <Private Use>
-+<UE05B>     /xaa/xfc         <Private Use>
-+<UE05C>     /xaa/xfd         <Private Use>
-+<UE05D>     /xaa/xfe         <Private Use>
-+<UE05E>     /xab/xa1         <Private Use>
-+<UE05F>     /xab/xa2         <Private Use>
-+<UE060>     /xab/xa3         <Private Use>
-+<UE061>     /xab/xa4         <Private Use>
-+<UE062>     /xab/xa5         <Private Use>
-+<UE063>     /xab/xa6         <Private Use>
-+<UE064>     /xab/xa7         <Private Use>
-+<UE065>     /xab/xa8         <Private Use>
-+<UE066>     /xab/xa9         <Private Use>
-+<UE067>     /xab/xaa         <Private Use>
-+<UE068>     /xab/xab         <Private Use>
-+<UE069>     /xab/xac         <Private Use>
-+<UE06A>     /xab/xad         <Private Use>
-+<UE06B>     /xab/xae         <Private Use>
-+<UE06C>     /xab/xaf         <Private Use>
-+<UE06D>     /xab/xb0         <Private Use>
-+<UE06E>     /xab/xb1         <Private Use>
-+<UE06F>     /xab/xb2         <Private Use>
-+<UE070>     /xab/xb3         <Private Use>
-+<UE071>     /xab/xb4         <Private Use>
-+<UE072>     /xab/xb5         <Private Use>
-+<UE073>     /xab/xb6         <Private Use>
-+<UE074>     /xab/xb7         <Private Use>
-+<UE075>     /xab/xb8         <Private Use>
-+<UE076>     /xab/xb9         <Private Use>
-+<UE077>     /xab/xba         <Private Use>
-+<UE078>     /xab/xbb         <Private Use>
-+<UE079>     /xab/xbc         <Private Use>
-+<UE07A>     /xab/xbd         <Private Use>
-+<UE07B>     /xab/xbe         <Private Use>
-+<UE07C>     /xab/xbf         <Private Use>
-+<UE07D>     /xab/xc0         <Private Use>
-+<UE07E>     /xab/xc1         <Private Use>
-+<UE07F>     /xab/xc2         <Private Use>
-+<UE080>     /xab/xc3         <Private Use>
-+<UE081>     /xab/xc4         <Private Use>
-+<UE082>     /xab/xc5         <Private Use>
-+<UE083>     /xab/xc6         <Private Use>
-+<UE084>     /xab/xc7         <Private Use>
-+<UE085>     /xab/xc8         <Private Use>
-+<UE086>     /xab/xc9         <Private Use>
-+<UE087>     /xab/xca         <Private Use>
-+<UE088>     /xab/xcb         <Private Use>
-+<UE089>     /xab/xcc         <Private Use>
-+<UE08A>     /xab/xcd         <Private Use>
-+<UE08B>     /xab/xce         <Private Use>
-+<UE08C>     /xab/xcf         <Private Use>
-+<UE08D>     /xab/xd0         <Private Use>
-+<UE08E>     /xab/xd1         <Private Use>
-+<UE08F>     /xab/xd2         <Private Use>
-+<UE090>     /xab/xd3         <Private Use>
-+<UE091>     /xab/xd4         <Private Use>
-+<UE092>     /xab/xd5         <Private Use>
-+<UE093>     /xab/xd6         <Private Use>
-+<UE094>     /xab/xd7         <Private Use>
-+<UE095>     /xab/xd8         <Private Use>
-+<UE096>     /xab/xd9         <Private Use>
-+<UE097>     /xab/xda         <Private Use>
-+<UE098>     /xab/xdb         <Private Use>
-+<UE099>     /xab/xdc         <Private Use>
-+<UE09A>     /xab/xdd         <Private Use>
-+<UE09B>     /xab/xde         <Private Use>
-+<UE09C>     /xab/xdf         <Private Use>
-+<UE09D>     /xab/xe0         <Private Use>
-+<UE09E>     /xab/xe1         <Private Use>
-+<UE09F>     /xab/xe2         <Private Use>
-+<UE0A0>     /xab/xe3         <Private Use>
-+<UE0A1>     /xab/xe4         <Private Use>
-+<UE0A2>     /xab/xe5         <Private Use>
-+<UE0A3>     /xab/xe6         <Private Use>
-+<UE0A4>     /xab/xe7         <Private Use>
-+<UE0A5>     /xab/xe8         <Private Use>
-+<UE0A6>     /xab/xe9         <Private Use>
-+<UE0A7>     /xab/xea         <Private Use>
-+<UE0A8>     /xab/xeb         <Private Use>
-+<UE0A9>     /xab/xec         <Private Use>
-+<UE0AA>     /xab/xed         <Private Use>
-+<UE0AB>     /xab/xee         <Private Use>
-+<UE0AC>     /xab/xef         <Private Use>
-+<UE0AD>     /xab/xf0         <Private Use>
-+<UE0AE>     /xab/xf1         <Private Use>
-+<UE0AF>     /xab/xf2         <Private Use>
-+<UE0B0>     /xab/xf3         <Private Use>
-+<UE0B1>     /xab/xf4         <Private Use>
-+<UE0B2>     /xab/xf5         <Private Use>
-+<UE0B3>     /xab/xf6         <Private Use>
-+<UE0B4>     /xab/xf7         <Private Use>
-+<UE0B5>     /xab/xf8         <Private Use>
-+<UE0B6>     /xab/xf9         <Private Use>
-+<UE0B7>     /xab/xfa         <Private Use>
-+<UE0B8>     /xab/xfb         <Private Use>
-+<UE0B9>     /xab/xfc         <Private Use>
-+<UE0BA>     /xab/xfd         <Private Use>
-+<UE0BB>     /xab/xfe         <Private Use>
-+<UE0BC>     /xac/xa1         <Private Use>
-+<UE0BD>     /xac/xa2         <Private Use>
-+<UE0BE>     /xac/xa3         <Private Use>
-+<UE0BF>     /xac/xa4         <Private Use>
-+<UE0C0>     /xac/xa5         <Private Use>
-+<UE0C1>     /xac/xa6         <Private Use>
-+<UE0C2>     /xac/xa7         <Private Use>
-+<UE0C3>     /xac/xa8         <Private Use>
-+<UE0C4>     /xac/xa9         <Private Use>
-+<UE0C5>     /xac/xaa         <Private Use>
-+<UE0C6>     /xac/xab         <Private Use>
-+<UE0C7>     /xac/xac         <Private Use>
-+<UE0C8>     /xac/xad         <Private Use>
-+<UE0C9>     /xac/xae         <Private Use>
-+<UE0CA>     /xac/xaf         <Private Use>
-+<UE0CB>     /xac/xb0         <Private Use>
-+<UE0CC>     /xac/xb1         <Private Use>
-+<UE0CD>     /xac/xb2         <Private Use>
-+<UE0CE>     /xac/xb3         <Private Use>
-+<UE0CF>     /xac/xb4         <Private Use>
-+<UE0D0>     /xac/xb5         <Private Use>
-+<UE0D1>     /xac/xb6         <Private Use>
-+<UE0D2>     /xac/xb7         <Private Use>
-+<UE0D3>     /xac/xb8         <Private Use>
-+<UE0D4>     /xac/xb9         <Private Use>
-+<UE0D5>     /xac/xba         <Private Use>
-+<UE0D6>     /xac/xbb         <Private Use>
-+<UE0D7>     /xac/xbc         <Private Use>
-+<UE0D8>     /xac/xbd         <Private Use>
-+<UE0D9>     /xac/xbe         <Private Use>
-+<UE0DA>     /xac/xbf         <Private Use>
-+<UE0DB>     /xac/xc0         <Private Use>
-+<UE0DC>     /xac/xc1         <Private Use>
-+<UE0DD>     /xac/xc2         <Private Use>
-+<UE0DE>     /xac/xc3         <Private Use>
-+<UE0DF>     /xac/xc4         <Private Use>
-+<UE0E0>     /xac/xc5         <Private Use>
-+<UE0E1>     /xac/xc6         <Private Use>
-+<UE0E2>     /xac/xc7         <Private Use>
-+<UE0E3>     /xac/xc8         <Private Use>
-+<UE0E4>     /xac/xc9         <Private Use>
-+<UE0E5>     /xac/xca         <Private Use>
-+<UE0E6>     /xac/xcb         <Private Use>
-+<UE0E7>     /xac/xcc         <Private Use>
-+<UE0E8>     /xac/xcd         <Private Use>
-+<UE0E9>     /xac/xce         <Private Use>
-+<UE0EA>     /xac/xcf         <Private Use>
-+<UE0EB>     /xac/xd0         <Private Use>
-+<UE0EC>     /xac/xd1         <Private Use>
-+<UE0ED>     /xac/xd2         <Private Use>
-+<UE0EE>     /xac/xd3         <Private Use>
-+<UE0EF>     /xac/xd4         <Private Use>
-+<UE0F0>     /xac/xd5         <Private Use>
-+<UE0F1>     /xac/xd6         <Private Use>
-+<UE0F2>     /xac/xd7         <Private Use>
-+<UE0F3>     /xac/xd8         <Private Use>
-+<UE0F4>     /xac/xd9         <Private Use>
-+<UE0F5>     /xac/xda         <Private Use>
-+<UE0F6>     /xac/xdb         <Private Use>
-+<UE0F7>     /xac/xdc         <Private Use>
-+<UE0F8>     /xac/xdd         <Private Use>
-+<UE0F9>     /xac/xde         <Private Use>
-+<UE0FA>     /xac/xdf         <Private Use>
-+<UE0FB>     /xac/xe0         <Private Use>
-+<UE0FC>     /xac/xe1         <Private Use>
-+<UE0FD>     /xac/xe2         <Private Use>
-+<UE0FE>     /xac/xe3         <Private Use>
-+<UE0FF>     /xac/xe4         <Private Use>
-+<UE100>     /xac/xe5         <Private Use>
-+<UE101>     /xac/xe6         <Private Use>
-+<UE102>     /xac/xe7         <Private Use>
-+<UE103>     /xac/xe8         <Private Use>
-+<UE104>     /xac/xe9         <Private Use>
-+<UE105>     /xac/xea         <Private Use>
-+<UE106>     /xac/xeb         <Private Use>
-+<UE107>     /xac/xec         <Private Use>
-+<UE108>     /xac/xed         <Private Use>
-+<UE109>     /xac/xee         <Private Use>
-+<UE10A>     /xac/xef         <Private Use>
-+<UE10B>     /xac/xf0         <Private Use>
-+<UE10C>     /xac/xf1         <Private Use>
-+<UE10D>     /xac/xf2         <Private Use>
-+<UE10E>     /xac/xf3         <Private Use>
-+<UE10F>     /xac/xf4         <Private Use>
-+<UE110>     /xac/xf5         <Private Use>
-+<UE111>     /xac/xf6         <Private Use>
-+<UE112>     /xac/xf7         <Private Use>
-+<UE113>     /xac/xf8         <Private Use>
-+<UE114>     /xac/xf9         <Private Use>
-+<UE115>     /xac/xfa         <Private Use>
-+<UE116>     /xac/xfb         <Private Use>
-+<UE117>     /xac/xfc         <Private Use>
-+<UE118>     /xac/xfd         <Private Use>
-+<UE119>     /xac/xfe         <Private Use>
-+<UE11A>     /xad/xa1         <Private Use>
-+<UE11B>     /xad/xa2         <Private Use>
-+<UE11C>     /xad/xa3         <Private Use>
-+<UE11D>     /xad/xa4         <Private Use>
-+<UE11E>     /xad/xa5         <Private Use>
-+<UE11F>     /xad/xa6         <Private Use>
-+<UE120>     /xad/xa7         <Private Use>
-+<UE121>     /xad/xa8         <Private Use>
-+<UE122>     /xad/xa9         <Private Use>
-+<UE123>     /xad/xaa         <Private Use>
-+<UE124>     /xad/xab         <Private Use>
-+<UE125>     /xad/xac         <Private Use>
-+<UE126>     /xad/xad         <Private Use>
-+<UE127>     /xad/xae         <Private Use>
-+<UE128>     /xad/xaf         <Private Use>
-+<UE129>     /xad/xb0         <Private Use>
-+<UE12A>     /xad/xb1         <Private Use>
-+<UE12B>     /xad/xb2         <Private Use>
-+<UE12C>     /xad/xb3         <Private Use>
-+<UE12D>     /xad/xb4         <Private Use>
-+<UE12E>     /xad/xb5         <Private Use>
-+<UE12F>     /xad/xb6         <Private Use>
-+<UE130>     /xad/xb7         <Private Use>
-+<UE131>     /xad/xb8         <Private Use>
-+<UE132>     /xad/xb9         <Private Use>
-+<UE133>     /xad/xba         <Private Use>
-+<UE134>     /xad/xbb         <Private Use>
-+<UE135>     /xad/xbc         <Private Use>
-+<UE136>     /xad/xbd         <Private Use>
-+<UE137>     /xad/xbe         <Private Use>
-+<UE138>     /xad/xbf         <Private Use>
-+<UE139>     /xad/xc0         <Private Use>
-+<UE13A>     /xad/xc1         <Private Use>
-+<UE13B>     /xad/xc2         <Private Use>
-+<UE13C>     /xad/xc3         <Private Use>
-+<UE13D>     /xad/xc4         <Private Use>
-+<UE13E>     /xad/xc5         <Private Use>
-+<UE13F>     /xad/xc6         <Private Use>
-+<UE140>     /xad/xc7         <Private Use>
-+<UE141>     /xad/xc8         <Private Use>
-+<UE142>     /xad/xc9         <Private Use>
-+<UE143>     /xad/xca         <Private Use>
-+<UE144>     /xad/xcb         <Private Use>
-+<UE145>     /xad/xcc         <Private Use>
-+<UE146>     /xad/xcd         <Private Use>
-+<UE147>     /xad/xce         <Private Use>
-+<UE148>     /xad/xcf         <Private Use>
-+<UE149>     /xad/xd0         <Private Use>
-+<UE14A>     /xad/xd1         <Private Use>
-+<UE14B>     /xad/xd2         <Private Use>
-+<UE14C>     /xad/xd3         <Private Use>
-+<UE14D>     /xad/xd4         <Private Use>
-+<UE14E>     /xad/xd5         <Private Use>
-+<UE14F>     /xad/xd6         <Private Use>
-+<UE150>     /xad/xd7         <Private Use>
-+<UE151>     /xad/xd8         <Private Use>
-+<UE152>     /xad/xd9         <Private Use>
-+<UE153>     /xad/xda         <Private Use>
-+<UE154>     /xad/xdb         <Private Use>
-+<UE155>     /xad/xdc         <Private Use>
-+<UE156>     /xad/xdd         <Private Use>
-+<UE157>     /xad/xde         <Private Use>
-+<UE158>     /xad/xdf         <Private Use>
-+<UE159>     /xad/xe0         <Private Use>
-+<UE15A>     /xad/xe1         <Private Use>
-+<UE15B>     /xad/xe2         <Private Use>
-+<UE15C>     /xad/xe3         <Private Use>
-+<UE15D>     /xad/xe4         <Private Use>
-+<UE15E>     /xad/xe5         <Private Use>
-+<UE15F>     /xad/xe6         <Private Use>
-+<UE160>     /xad/xe7         <Private Use>
-+<UE161>     /xad/xe8         <Private Use>
-+<UE162>     /xad/xe9         <Private Use>
-+<UE163>     /xad/xea         <Private Use>
-+<UE164>     /xad/xeb         <Private Use>
-+<UE165>     /xad/xec         <Private Use>
-+<UE166>     /xad/xed         <Private Use>
-+<UE167>     /xad/xee         <Private Use>
-+<UE168>     /xad/xef         <Private Use>
-+<UE169>     /xad/xf0         <Private Use>
-+<UE16A>     /xad/xf1         <Private Use>
-+<UE16B>     /xad/xf2         <Private Use>
-+<UE16C>     /xad/xf3         <Private Use>
-+<UE16D>     /xad/xf4         <Private Use>
-+<UE16E>     /xad/xf5         <Private Use>
-+<UE16F>     /xad/xf6         <Private Use>
-+<UE170>     /xad/xf7         <Private Use>
-+<UE171>     /xad/xf8         <Private Use>
-+<UE172>     /xad/xf9         <Private Use>
-+<UE173>     /xad/xfa         <Private Use>
-+<UE174>     /xad/xfb         <Private Use>
-+<UE175>     /xad/xfc         <Private Use>
-+<UE176>     /xad/xfd         <Private Use>
-+<UE177>     /xad/xfe         <Private Use>
-+<UE178>     /xae/xa1         <Private Use>
-+<UE179>     /xae/xa2         <Private Use>
-+<UE17A>     /xae/xa3         <Private Use>
-+<UE17B>     /xae/xa4         <Private Use>
-+<UE17C>     /xae/xa5         <Private Use>
-+<UE17D>     /xae/xa6         <Private Use>
-+<UE17E>     /xae/xa7         <Private Use>
-+<UE17F>     /xae/xa8         <Private Use>
-+<UE180>     /xae/xa9         <Private Use>
-+<UE181>     /xae/xaa         <Private Use>
-+<UE182>     /xae/xab         <Private Use>
-+<UE183>     /xae/xac         <Private Use>
-+<UE184>     /xae/xad         <Private Use>
-+<UE185>     /xae/xae         <Private Use>
-+<UE186>     /xae/xaf         <Private Use>
-+<UE187>     /xae/xb0         <Private Use>
-+<UE188>     /xae/xb1         <Private Use>
-+<UE189>     /xae/xb2         <Private Use>
-+<UE18A>     /xae/xb3         <Private Use>
-+<UE18B>     /xae/xb4         <Private Use>
-+<UE18C>     /xae/xb5         <Private Use>
-+<UE18D>     /xae/xb6         <Private Use>
-+<UE18E>     /xae/xb7         <Private Use>
-+<UE18F>     /xae/xb8         <Private Use>
-+<UE190>     /xae/xb9         <Private Use>
-+<UE191>     /xae/xba         <Private Use>
-+<UE192>     /xae/xbb         <Private Use>
-+<UE193>     /xae/xbc         <Private Use>
-+<UE194>     /xae/xbd         <Private Use>
-+<UE195>     /xae/xbe         <Private Use>
-+<UE196>     /xae/xbf         <Private Use>
-+<UE197>     /xae/xc0         <Private Use>
-+<UE198>     /xae/xc1         <Private Use>
-+<UE199>     /xae/xc2         <Private Use>
-+<UE19A>     /xae/xc3         <Private Use>
-+<UE19B>     /xae/xc4         <Private Use>
-+<UE19C>     /xae/xc5         <Private Use>
-+<UE19D>     /xae/xc6         <Private Use>
-+<UE19E>     /xae/xc7         <Private Use>
-+<UE19F>     /xae/xc8         <Private Use>
-+<UE1A0>     /xae/xc9         <Private Use>
-+<UE1A1>     /xae/xca         <Private Use>
-+<UE1A2>     /xae/xcb         <Private Use>
-+<UE1A3>     /xae/xcc         <Private Use>
-+<UE1A4>     /xae/xcd         <Private Use>
-+<UE1A5>     /xae/xce         <Private Use>
-+<UE1A6>     /xae/xcf         <Private Use>
-+<UE1A7>     /xae/xd0         <Private Use>
-+<UE1A8>     /xae/xd1         <Private Use>
-+<UE1A9>     /xae/xd2         <Private Use>
-+<UE1AA>     /xae/xd3         <Private Use>
-+<UE1AB>     /xae/xd4         <Private Use>
-+<UE1AC>     /xae/xd5         <Private Use>
-+<UE1AD>     /xae/xd6         <Private Use>
-+<UE1AE>     /xae/xd7         <Private Use>
-+<UE1AF>     /xae/xd8         <Private Use>
-+<UE1B0>     /xae/xd9         <Private Use>
-+<UE1B1>     /xae/xda         <Private Use>
-+<UE1B2>     /xae/xdb         <Private Use>
-+<UE1B3>     /xae/xdc         <Private Use>
-+<UE1B4>     /xae/xdd         <Private Use>
-+<UE1B5>     /xae/xde         <Private Use>
-+<UE1B6>     /xae/xdf         <Private Use>
-+<UE1B7>     /xae/xe0         <Private Use>
-+<UE1B8>     /xae/xe1         <Private Use>
-+<UE1B9>     /xae/xe2         <Private Use>
-+<UE1BA>     /xae/xe3         <Private Use>
-+<UE1BB>     /xae/xe4         <Private Use>
-+<UE1BC>     /xae/xe5         <Private Use>
-+<UE1BD>     /xae/xe6         <Private Use>
-+<UE1BE>     /xae/xe7         <Private Use>
-+<UE1BF>     /xae/xe8         <Private Use>
-+<UE1C0>     /xae/xe9         <Private Use>
-+<UE1C1>     /xae/xea         <Private Use>
-+<UE1C2>     /xae/xeb         <Private Use>
-+<UE1C3>     /xae/xec         <Private Use>
-+<UE1C4>     /xae/xed         <Private Use>
-+<UE1C5>     /xae/xee         <Private Use>
-+<UE1C6>     /xae/xef         <Private Use>
-+<UE1C7>     /xae/xf0         <Private Use>
-+<UE1C8>     /xae/xf1         <Private Use>
-+<UE1C9>     /xae/xf2         <Private Use>
-+<UE1CA>     /xae/xf3         <Private Use>
-+<UE1CB>     /xae/xf4         <Private Use>
-+<UE1CC>     /xae/xf5         <Private Use>
-+<UE1CD>     /xae/xf6         <Private Use>
-+<UE1CE>     /xae/xf7         <Private Use>
-+<UE1CF>     /xae/xf8         <Private Use>
-+<UE1D0>     /xae/xf9         <Private Use>
-+<UE1D1>     /xae/xfa         <Private Use>
-+<UE1D2>     /xae/xfb         <Private Use>
-+<UE1D3>     /xae/xfc         <Private Use>
-+<UE1D4>     /xae/xfd         <Private Use>
-+<UE1D5>     /xae/xfe         <Private Use>
-+<UE1D6>     /xaf/xa1         <Private Use>
-+<UE1D7>     /xaf/xa2         <Private Use>
-+<UE1D8>     /xaf/xa3         <Private Use>
-+<UE1D9>     /xaf/xa4         <Private Use>
-+<UE1DA>     /xaf/xa5         <Private Use>
-+<UE1DB>     /xaf/xa6         <Private Use>
-+<UE1DC>     /xaf/xa7         <Private Use>
-+<UE1DD>     /xaf/xa8         <Private Use>
-+<UE1DE>     /xaf/xa9         <Private Use>
-+<UE1DF>     /xaf/xaa         <Private Use>
-+<UE1E0>     /xaf/xab         <Private Use>
-+<UE1E1>     /xaf/xac         <Private Use>
-+<UE1E2>     /xaf/xad         <Private Use>
-+<UE1E3>     /xaf/xae         <Private Use>
-+<UE1E4>     /xaf/xaf         <Private Use>
-+<UE1E5>     /xaf/xb0         <Private Use>
-+<UE1E6>     /xaf/xb1         <Private Use>
-+<UE1E7>     /xaf/xb2         <Private Use>
-+<UE1E8>     /xaf/xb3         <Private Use>
-+<UE1E9>     /xaf/xb4         <Private Use>
-+<UE1EA>     /xaf/xb5         <Private Use>
-+<UE1EB>     /xaf/xb6         <Private Use>
-+<UE1EC>     /xaf/xb7         <Private Use>
-+<UE1ED>     /xaf/xb8         <Private Use>
-+<UE1EE>     /xaf/xb9         <Private Use>
-+<UE1EF>     /xaf/xba         <Private Use>
-+<UE1F0>     /xaf/xbb         <Private Use>
-+<UE1F1>     /xaf/xbc         <Private Use>
-+<UE1F2>     /xaf/xbd         <Private Use>
-+<UE1F3>     /xaf/xbe         <Private Use>
-+<UE1F4>     /xaf/xbf         <Private Use>
-+<UE1F5>     /xaf/xc0         <Private Use>
-+<UE1F6>     /xaf/xc1         <Private Use>
-+<UE1F7>     /xaf/xc2         <Private Use>
-+<UE1F8>     /xaf/xc3         <Private Use>
-+<UE1F9>     /xaf/xc4         <Private Use>
-+<UE1FA>     /xaf/xc5         <Private Use>
-+<UE1FB>     /xaf/xc6         <Private Use>
-+<UE1FC>     /xaf/xc7         <Private Use>
-+<UE1FD>     /xaf/xc8         <Private Use>
-+<UE1FE>     /xaf/xc9         <Private Use>
-+<UE1FF>     /xaf/xca         <Private Use>
-+<UE200>     /xaf/xcb         <Private Use>
-+<UE201>     /xaf/xcc         <Private Use>
-+<UE202>     /xaf/xcd         <Private Use>
-+<UE203>     /xaf/xce         <Private Use>
-+<UE204>     /xaf/xcf         <Private Use>
-+<UE205>     /xaf/xd0         <Private Use>
-+<UE206>     /xaf/xd1         <Private Use>
-+<UE207>     /xaf/xd2         <Private Use>
-+<UE208>     /xaf/xd3         <Private Use>
-+<UE209>     /xaf/xd4         <Private Use>
-+<UE20A>     /xaf/xd5         <Private Use>
-+<UE20B>     /xaf/xd6         <Private Use>
-+<UE20C>     /xaf/xd7         <Private Use>
-+<UE20D>     /xaf/xd8         <Private Use>
-+<UE20E>     /xaf/xd9         <Private Use>
-+<UE20F>     /xaf/xda         <Private Use>
-+<UE210>     /xaf/xdb         <Private Use>
-+<UE211>     /xaf/xdc         <Private Use>
-+<UE212>     /xaf/xdd         <Private Use>
-+<UE213>     /xaf/xde         <Private Use>
-+<UE214>     /xaf/xdf         <Private Use>
-+<UE215>     /xaf/xe0         <Private Use>
-+<UE216>     /xaf/xe1         <Private Use>
-+<UE217>     /xaf/xe2         <Private Use>
-+<UE218>     /xaf/xe3         <Private Use>
-+<UE219>     /xaf/xe4         <Private Use>
-+<UE21A>     /xaf/xe5         <Private Use>
-+<UE21B>     /xaf/xe6         <Private Use>
-+<UE21C>     /xaf/xe7         <Private Use>
-+<UE21D>     /xaf/xe8         <Private Use>
-+<UE21E>     /xaf/xe9         <Private Use>
-+<UE21F>     /xaf/xea         <Private Use>
-+<UE220>     /xaf/xeb         <Private Use>
-+<UE221>     /xaf/xec         <Private Use>
-+<UE222>     /xaf/xed         <Private Use>
-+<UE223>     /xaf/xee         <Private Use>
-+<UE224>     /xaf/xef         <Private Use>
-+<UE225>     /xaf/xf0         <Private Use>
-+<UE226>     /xaf/xf1         <Private Use>
-+<UE227>     /xaf/xf2         <Private Use>
-+<UE228>     /xaf/xf3         <Private Use>
-+<UE229>     /xaf/xf4         <Private Use>
-+<UE22A>     /xaf/xf5         <Private Use>
-+<UE22B>     /xaf/xf6         <Private Use>
-+<UE22C>     /xaf/xf7         <Private Use>
-+<UE22D>     /xaf/xf8         <Private Use>
-+<UE22E>     /xaf/xf9         <Private Use>
-+<UE22F>     /xaf/xfa         <Private Use>
-+<UE230>     /xaf/xfb         <Private Use>
-+<UE231>     /xaf/xfc         <Private Use>
-+<UE232>     /xaf/xfd         <Private Use>
-+<UE233>     /xaf/xfe         <Private Use>
-+<UE234>     /xf8/xa1         <Private Use>
-+<UE235>     /xf8/xa2         <Private Use>
-+<UE236>     /xf8/xa3         <Private Use>
-+<UE237>     /xf8/xa4         <Private Use>
-+<UE238>     /xf8/xa5         <Private Use>
-+<UE239>     /xf8/xa6         <Private Use>
-+<UE23A>     /xf8/xa7         <Private Use>
-+<UE23B>     /xf8/xa8         <Private Use>
-+<UE23C>     /xf8/xa9         <Private Use>
-+<UE23D>     /xf8/xaa         <Private Use>
-+<UE23E>     /xf8/xab         <Private Use>
-+<UE23F>     /xf8/xac         <Private Use>
-+<UE240>     /xf8/xad         <Private Use>
-+<UE241>     /xf8/xae         <Private Use>
-+<UE242>     /xf8/xaf         <Private Use>
-+<UE243>     /xf8/xb0         <Private Use>
-+<UE244>     /xf8/xb1         <Private Use>
-+<UE245>     /xf8/xb2         <Private Use>
-+<UE246>     /xf8/xb3         <Private Use>
-+<UE247>     /xf8/xb4         <Private Use>
-+<UE248>     /xf8/xb5         <Private Use>
-+<UE249>     /xf8/xb6         <Private Use>
-+<UE24A>     /xf8/xb7         <Private Use>
-+<UE24B>     /xf8/xb8         <Private Use>
-+<UE24C>     /xf8/xb9         <Private Use>
-+<UE24D>     /xf8/xba         <Private Use>
-+<UE24E>     /xf8/xbb         <Private Use>
-+<UE24F>     /xf8/xbc         <Private Use>
-+<UE250>     /xf8/xbd         <Private Use>
-+<UE251>     /xf8/xbe         <Private Use>
-+<UE252>     /xf8/xbf         <Private Use>
-+<UE253>     /xf8/xc0         <Private Use>
-+<UE254>     /xf8/xc1         <Private Use>
-+<UE255>     /xf8/xc2         <Private Use>
-+<UE256>     /xf8/xc3         <Private Use>
-+<UE257>     /xf8/xc4         <Private Use>
-+<UE258>     /xf8/xc5         <Private Use>
-+<UE259>     /xf8/xc6         <Private Use>
-+<UE25A>     /xf8/xc7         <Private Use>
-+<UE25B>     /xf8/xc8         <Private Use>
-+<UE25C>     /xf8/xc9         <Private Use>
-+<UE25D>     /xf8/xca         <Private Use>
-+<UE25E>     /xf8/xcb         <Private Use>
-+<UE25F>     /xf8/xcc         <Private Use>
-+<UE260>     /xf8/xcd         <Private Use>
-+<UE261>     /xf8/xce         <Private Use>
-+<UE262>     /xf8/xcf         <Private Use>
-+<UE263>     /xf8/xd0         <Private Use>
-+<UE264>     /xf8/xd1         <Private Use>
-+<UE265>     /xf8/xd2         <Private Use>
-+<UE266>     /xf8/xd3         <Private Use>
-+<UE267>     /xf8/xd4         <Private Use>
-+<UE268>     /xf8/xd5         <Private Use>
-+<UE269>     /xf8/xd6         <Private Use>
-+<UE26A>     /xf8/xd7         <Private Use>
-+<UE26B>     /xf8/xd8         <Private Use>
-+<UE26C>     /xf8/xd9         <Private Use>
-+<UE26D>     /xf8/xda         <Private Use>
-+<UE26E>     /xf8/xdb         <Private Use>
-+<UE26F>     /xf8/xdc         <Private Use>
-+<UE270>     /xf8/xdd         <Private Use>
-+<UE271>     /xf8/xde         <Private Use>
-+<UE272>     /xf8/xdf         <Private Use>
-+<UE273>     /xf8/xe0         <Private Use>
-+<UE274>     /xf8/xe1         <Private Use>
-+<UE275>     /xf8/xe2         <Private Use>
-+<UE276>     /xf8/xe3         <Private Use>
-+<UE277>     /xf8/xe4         <Private Use>
-+<UE278>     /xf8/xe5         <Private Use>
-+<UE279>     /xf8/xe6         <Private Use>
-+<UE27A>     /xf8/xe7         <Private Use>
-+<UE27B>     /xf8/xe8         <Private Use>
-+<UE27C>     /xf8/xe9         <Private Use>
-+<UE27D>     /xf8/xea         <Private Use>
-+<UE27E>     /xf8/xeb         <Private Use>
-+<UE27F>     /xf8/xec         <Private Use>
-+<UE280>     /xf8/xed         <Private Use>
-+<UE281>     /xf8/xee         <Private Use>
-+<UE282>     /xf8/xef         <Private Use>
-+<UE283>     /xf8/xf0         <Private Use>
-+<UE284>     /xf8/xf1         <Private Use>
-+<UE285>     /xf8/xf2         <Private Use>
-+<UE286>     /xf8/xf3         <Private Use>
-+<UE287>     /xf8/xf4         <Private Use>
-+<UE288>     /xf8/xf5         <Private Use>
-+<UE289>     /xf8/xf6         <Private Use>
-+<UE28A>     /xf8/xf7         <Private Use>
-+<UE28B>     /xf8/xf8         <Private Use>
-+<UE28C>     /xf8/xf9         <Private Use>
-+<UE28D>     /xf8/xfa         <Private Use>
-+<UE28E>     /xf8/xfb         <Private Use>
-+<UE28F>     /xf8/xfc         <Private Use>
-+<UE290>     /xf8/xfd         <Private Use>
-+<UE291>     /xf8/xfe         <Private Use>
-+<UE292>     /xf9/xa1         <Private Use>
-+<UE293>     /xf9/xa2         <Private Use>
-+<UE294>     /xf9/xa3         <Private Use>
-+<UE295>     /xf9/xa4         <Private Use>
-+<UE296>     /xf9/xa5         <Private Use>
-+<UE297>     /xf9/xa6         <Private Use>
-+<UE298>     /xf9/xa7         <Private Use>
-+<UE299>     /xf9/xa8         <Private Use>
-+<UE29A>     /xf9/xa9         <Private Use>
-+<UE29B>     /xf9/xaa         <Private Use>
-+<UE29C>     /xf9/xab         <Private Use>
-+<UE29D>     /xf9/xac         <Private Use>
-+<UE29E>     /xf9/xad         <Private Use>
-+<UE29F>     /xf9/xae         <Private Use>
-+<UE2A0>     /xf9/xaf         <Private Use>
-+<UE2A1>     /xf9/xb0         <Private Use>
-+<UE2A2>     /xf9/xb1         <Private Use>
-+<UE2A3>     /xf9/xb2         <Private Use>
-+<UE2A4>     /xf9/xb3         <Private Use>
-+<UE2A5>     /xf9/xb4         <Private Use>
-+<UE2A6>     /xf9/xb5         <Private Use>
-+<UE2A7>     /xf9/xb6         <Private Use>
-+<UE2A8>     /xf9/xb7         <Private Use>
-+<UE2A9>     /xf9/xb8         <Private Use>
-+<UE2AA>     /xf9/xb9         <Private Use>
-+<UE2AB>     /xf9/xba         <Private Use>
-+<UE2AC>     /xf9/xbb         <Private Use>
-+<UE2AD>     /xf9/xbc         <Private Use>
-+<UE2AE>     /xf9/xbd         <Private Use>
-+<UE2AF>     /xf9/xbe         <Private Use>
-+<UE2B0>     /xf9/xbf         <Private Use>
-+<UE2B1>     /xf9/xc0         <Private Use>
-+<UE2B2>     /xf9/xc1         <Private Use>
-+<UE2B3>     /xf9/xc2         <Private Use>
-+<UE2B4>     /xf9/xc3         <Private Use>
-+<UE2B5>     /xf9/xc4         <Private Use>
-+<UE2B6>     /xf9/xc5         <Private Use>
-+<UE2B7>     /xf9/xc6         <Private Use>
-+<UE2B8>     /xf9/xc7         <Private Use>
-+<UE2B9>     /xf9/xc8         <Private Use>
-+<UE2BA>     /xf9/xc9         <Private Use>
-+<UE2BB>     /xf9/xca         <Private Use>
-+<UE2BC>     /xf9/xcb         <Private Use>
-+<UE2BD>     /xf9/xcc         <Private Use>
-+<UE2BE>     /xf9/xcd         <Private Use>
-+<UE2BF>     /xf9/xce         <Private Use>
-+<UE2C0>     /xf9/xcf         <Private Use>
-+<UE2C1>     /xf9/xd0         <Private Use>
-+<UE2C2>     /xf9/xd1         <Private Use>
-+<UE2C3>     /xf9/xd2         <Private Use>
-+<UE2C4>     /xf9/xd3         <Private Use>
-+<UE2C5>     /xf9/xd4         <Private Use>
-+<UE2C6>     /xf9/xd5         <Private Use>
-+<UE2C7>     /xf9/xd6         <Private Use>
-+<UE2C8>     /xf9/xd7         <Private Use>
-+<UE2C9>     /xf9/xd8         <Private Use>
-+<UE2CA>     /xf9/xd9         <Private Use>
-+<UE2CB>     /xf9/xda         <Private Use>
-+<UE2CC>     /xf9/xdb         <Private Use>
-+<UE2CD>     /xf9/xdc         <Private Use>
-+<UE2CE>     /xf9/xdd         <Private Use>
-+<UE2CF>     /xf9/xde         <Private Use>
-+<UE2D0>     /xf9/xdf         <Private Use>
-+<UE2D1>     /xf9/xe0         <Private Use>
-+<UE2D2>     /xf9/xe1         <Private Use>
-+<UE2D3>     /xf9/xe2         <Private Use>
-+<UE2D4>     /xf9/xe3         <Private Use>
-+<UE2D5>     /xf9/xe4         <Private Use>
-+<UE2D6>     /xf9/xe5         <Private Use>
-+<UE2D7>     /xf9/xe6         <Private Use>
-+<UE2D8>     /xf9/xe7         <Private Use>
-+<UE2D9>     /xf9/xe8         <Private Use>
-+<UE2DA>     /xf9/xe9         <Private Use>
-+<UE2DB>     /xf9/xea         <Private Use>
-+<UE2DC>     /xf9/xeb         <Private Use>
-+<UE2DD>     /xf9/xec         <Private Use>
-+<UE2DE>     /xf9/xed         <Private Use>
-+<UE2DF>     /xf9/xee         <Private Use>
-+<UE2E0>     /xf9/xef         <Private Use>
-+<UE2E1>     /xf9/xf0         <Private Use>
-+<UE2E2>     /xf9/xf1         <Private Use>
-+<UE2E3>     /xf9/xf2         <Private Use>
-+<UE2E4>     /xf9/xf3         <Private Use>
-+<UE2E5>     /xf9/xf4         <Private Use>
-+<UE2E6>     /xf9/xf5         <Private Use>
-+<UE2E7>     /xf9/xf6         <Private Use>
-+<UE2E8>     /xf9/xf7         <Private Use>
-+<UE2E9>     /xf9/xf8         <Private Use>
-+<UE2EA>     /xf9/xf9         <Private Use>
-+<UE2EB>     /xf9/xfa         <Private Use>
-+<UE2EC>     /xf9/xfb         <Private Use>
-+<UE2ED>     /xf9/xfc         <Private Use>
-+<UE2EE>     /xf9/xfd         <Private Use>
-+<UE2EF>     /xf9/xfe         <Private Use>
-+<UE2F0>     /xfa/xa1         <Private Use>
-+<UE2F1>     /xfa/xa2         <Private Use>
-+<UE2F2>     /xfa/xa3         <Private Use>
-+<UE2F3>     /xfa/xa4         <Private Use>
-+<UE2F4>     /xfa/xa5         <Private Use>
-+<UE2F5>     /xfa/xa6         <Private Use>
-+<UE2F6>     /xfa/xa7         <Private Use>
-+<UE2F7>     /xfa/xa8         <Private Use>
-+<UE2F8>     /xfa/xa9         <Private Use>
-+<UE2F9>     /xfa/xaa         <Private Use>
-+<UE2FA>     /xfa/xab         <Private Use>
-+<UE2FB>     /xfa/xac         <Private Use>
-+<UE2FC>     /xfa/xad         <Private Use>
-+<UE2FD>     /xfa/xae         <Private Use>
-+<UE2FE>     /xfa/xaf         <Private Use>
-+<UE2FF>     /xfa/xb0         <Private Use>
-+<UE300>     /xfa/xb1         <Private Use>
-+<UE301>     /xfa/xb2         <Private Use>
-+<UE302>     /xfa/xb3         <Private Use>
-+<UE303>     /xfa/xb4         <Private Use>
-+<UE304>     /xfa/xb5         <Private Use>
-+<UE305>     /xfa/xb6         <Private Use>
-+<UE306>     /xfa/xb7         <Private Use>
-+<UE307>     /xfa/xb8         <Private Use>
-+<UE308>     /xfa/xb9         <Private Use>
-+<UE309>     /xfa/xba         <Private Use>
-+<UE30A>     /xfa/xbb         <Private Use>
-+<UE30B>     /xfa/xbc         <Private Use>
-+<UE30C>     /xfa/xbd         <Private Use>
-+<UE30D>     /xfa/xbe         <Private Use>
-+<UE30E>     /xfa/xbf         <Private Use>
-+<UE30F>     /xfa/xc0         <Private Use>
-+<UE310>     /xfa/xc1         <Private Use>
-+<UE311>     /xfa/xc2         <Private Use>
-+<UE312>     /xfa/xc3         <Private Use>
-+<UE313>     /xfa/xc4         <Private Use>
-+<UE314>     /xfa/xc5         <Private Use>
-+<UE315>     /xfa/xc6         <Private Use>
-+<UE316>     /xfa/xc7         <Private Use>
-+<UE317>     /xfa/xc8         <Private Use>
-+<UE318>     /xfa/xc9         <Private Use>
-+<UE319>     /xfa/xca         <Private Use>
-+<UE31A>     /xfa/xcb         <Private Use>
-+<UE31B>     /xfa/xcc         <Private Use>
-+<UE31C>     /xfa/xcd         <Private Use>
-+<UE31D>     /xfa/xce         <Private Use>
-+<UE31E>     /xfa/xcf         <Private Use>
-+<UE31F>     /xfa/xd0         <Private Use>
-+<UE320>     /xfa/xd1         <Private Use>
-+<UE321>     /xfa/xd2         <Private Use>
-+<UE322>     /xfa/xd3         <Private Use>
-+<UE323>     /xfa/xd4         <Private Use>
-+<UE324>     /xfa/xd5         <Private Use>
-+<UE325>     /xfa/xd6         <Private Use>
-+<UE326>     /xfa/xd7         <Private Use>
-+<UE327>     /xfa/xd8         <Private Use>
-+<UE328>     /xfa/xd9         <Private Use>
-+<UE329>     /xfa/xda         <Private Use>
-+<UE32A>     /xfa/xdb         <Private Use>
-+<UE32B>     /xfa/xdc         <Private Use>
-+<UE32C>     /xfa/xdd         <Private Use>
-+<UE32D>     /xfa/xde         <Private Use>
-+<UE32E>     /xfa/xdf         <Private Use>
-+<UE32F>     /xfa/xe0         <Private Use>
-+<UE330>     /xfa/xe1         <Private Use>
-+<UE331>     /xfa/xe2         <Private Use>
-+<UE332>     /xfa/xe3         <Private Use>
-+<UE333>     /xfa/xe4         <Private Use>
-+<UE334>     /xfa/xe5         <Private Use>
-+<UE335>     /xfa/xe6         <Private Use>
-+<UE336>     /xfa/xe7         <Private Use>
-+<UE337>     /xfa/xe8         <Private Use>
-+<UE338>     /xfa/xe9         <Private Use>
-+<UE339>     /xfa/xea         <Private Use>
-+<UE33A>     /xfa/xeb         <Private Use>
-+<UE33B>     /xfa/xec         <Private Use>
-+<UE33C>     /xfa/xed         <Private Use>
-+<UE33D>     /xfa/xee         <Private Use>
-+<UE33E>     /xfa/xef         <Private Use>
-+<UE33F>     /xfa/xf0         <Private Use>
-+<UE340>     /xfa/xf1         <Private Use>
-+<UE341>     /xfa/xf2         <Private Use>
-+<UE342>     /xfa/xf3         <Private Use>
-+<UE343>     /xfa/xf4         <Private Use>
-+<UE344>     /xfa/xf5         <Private Use>
-+<UE345>     /xfa/xf6         <Private Use>
-+<UE346>     /xfa/xf7         <Private Use>
-+<UE347>     /xfa/xf8         <Private Use>
-+<UE348>     /xfa/xf9         <Private Use>
-+<UE349>     /xfa/xfa         <Private Use>
-+<UE34A>     /xfa/xfb         <Private Use>
-+<UE34B>     /xfa/xfc         <Private Use>
-+<UE34C>     /xfa/xfd         <Private Use>
-+<UE34D>     /xfa/xfe         <Private Use>
-+<UE34E>     /xfb/xa1         <Private Use>
-+<UE34F>     /xfb/xa2         <Private Use>
-+<UE350>     /xfb/xa3         <Private Use>
-+<UE351>     /xfb/xa4         <Private Use>
-+<UE352>     /xfb/xa5         <Private Use>
-+<UE353>     /xfb/xa6         <Private Use>
-+<UE354>     /xfb/xa7         <Private Use>
-+<UE355>     /xfb/xa8         <Private Use>
-+<UE356>     /xfb/xa9         <Private Use>
-+<UE357>     /xfb/xaa         <Private Use>
-+<UE358>     /xfb/xab         <Private Use>
-+<UE359>     /xfb/xac         <Private Use>
-+<UE35A>     /xfb/xad         <Private Use>
-+<UE35B>     /xfb/xae         <Private Use>
-+<UE35C>     /xfb/xaf         <Private Use>
-+<UE35D>     /xfb/xb0         <Private Use>
-+<UE35E>     /xfb/xb1         <Private Use>
-+<UE35F>     /xfb/xb2         <Private Use>
-+<UE360>     /xfb/xb3         <Private Use>
-+<UE361>     /xfb/xb4         <Private Use>
-+<UE362>     /xfb/xb5         <Private Use>
-+<UE363>     /xfb/xb6         <Private Use>
-+<UE364>     /xfb/xb7         <Private Use>
-+<UE365>     /xfb/xb8         <Private Use>
-+<UE366>     /xfb/xb9         <Private Use>
-+<UE367>     /xfb/xba         <Private Use>
-+<UE368>     /xfb/xbb         <Private Use>
-+<UE369>     /xfb/xbc         <Private Use>
-+<UE36A>     /xfb/xbd         <Private Use>
-+<UE36B>     /xfb/xbe         <Private Use>
-+<UE36C>     /xfb/xbf         <Private Use>
-+<UE36D>     /xfb/xc0         <Private Use>
-+<UE36E>     /xfb/xc1         <Private Use>
-+<UE36F>     /xfb/xc2         <Private Use>
-+<UE370>     /xfb/xc3         <Private Use>
-+<UE371>     /xfb/xc4         <Private Use>
-+<UE372>     /xfb/xc5         <Private Use>
-+<UE373>     /xfb/xc6         <Private Use>
-+<UE374>     /xfb/xc7         <Private Use>
-+<UE375>     /xfb/xc8         <Private Use>
-+<UE376>     /xfb/xc9         <Private Use>
-+<UE377>     /xfb/xca         <Private Use>
-+<UE378>     /xfb/xcb         <Private Use>
-+<UE379>     /xfb/xcc         <Private Use>
-+<UE37A>     /xfb/xcd         <Private Use>
-+<UE37B>     /xfb/xce         <Private Use>
-+<UE37C>     /xfb/xcf         <Private Use>
-+<UE37D>     /xfb/xd0         <Private Use>
-+<UE37E>     /xfb/xd1         <Private Use>
-+<UE37F>     /xfb/xd2         <Private Use>
-+<UE380>     /xfb/xd3         <Private Use>
-+<UE381>     /xfb/xd4         <Private Use>
-+<UE382>     /xfb/xd5         <Private Use>
-+<UE383>     /xfb/xd6         <Private Use>
-+<UE384>     /xfb/xd7         <Private Use>
-+<UE385>     /xfb/xd8         <Private Use>
-+<UE386>     /xfb/xd9         <Private Use>
-+<UE387>     /xfb/xda         <Private Use>
-+<UE388>     /xfb/xdb         <Private Use>
-+<UE389>     /xfb/xdc         <Private Use>
-+<UE38A>     /xfb/xdd         <Private Use>
-+<UE38B>     /xfb/xde         <Private Use>
-+<UE38C>     /xfb/xdf         <Private Use>
-+<UE38D>     /xfb/xe0         <Private Use>
-+<UE38E>     /xfb/xe1         <Private Use>
-+<UE38F>     /xfb/xe2         <Private Use>
-+<UE390>     /xfb/xe3         <Private Use>
-+<UE391>     /xfb/xe4         <Private Use>
-+<UE392>     /xfb/xe5         <Private Use>
-+<UE393>     /xfb/xe6         <Private Use>
-+<UE394>     /xfb/xe7         <Private Use>
-+<UE395>     /xfb/xe8         <Private Use>
-+<UE396>     /xfb/xe9         <Private Use>
-+<UE397>     /xfb/xea         <Private Use>
-+<UE398>     /xfb/xeb         <Private Use>
-+<UE399>     /xfb/xec         <Private Use>
-+<UE39A>     /xfb/xed         <Private Use>
-+<UE39B>     /xfb/xee         <Private Use>
-+<UE39C>     /xfb/xef         <Private Use>
-+<UE39D>     /xfb/xf0         <Private Use>
-+<UE39E>     /xfb/xf1         <Private Use>
-+<UE39F>     /xfb/xf2         <Private Use>
-+<UE3A0>     /xfb/xf3         <Private Use>
-+<UE3A1>     /xfb/xf4         <Private Use>
-+<UE3A2>     /xfb/xf5         <Private Use>
-+<UE3A3>     /xfb/xf6         <Private Use>
-+<UE3A4>     /xfb/xf7         <Private Use>
-+<UE3A5>     /xfb/xf8         <Private Use>
-+<UE3A6>     /xfb/xf9         <Private Use>
-+<UE3A7>     /xfb/xfa         <Private Use>
-+<UE3A8>     /xfb/xfb         <Private Use>
-+<UE3A9>     /xfb/xfc         <Private Use>
-+<UE3AA>     /xfb/xfd         <Private Use>
-+<UE3AB>     /xfb/xfe         <Private Use>
-+<UE3AC>     /xfc/xa1         <Private Use>
-+<UE3AD>     /xfc/xa2         <Private Use>
-+<UE3AE>     /xfc/xa3         <Private Use>
-+<UE3AF>     /xfc/xa4         <Private Use>
-+<UE3B0>     /xfc/xa5         <Private Use>
-+<UE3B1>     /xfc/xa6         <Private Use>
-+<UE3B2>     /xfc/xa7         <Private Use>
-+<UE3B3>     /xfc/xa8         <Private Use>
-+<UE3B4>     /xfc/xa9         <Private Use>
-+<UE3B5>     /xfc/xaa         <Private Use>
-+<UE3B6>     /xfc/xab         <Private Use>
-+<UE3B7>     /xfc/xac         <Private Use>
-+<UE3B8>     /xfc/xad         <Private Use>
-+<UE3B9>     /xfc/xae         <Private Use>
-+<UE3BA>     /xfc/xaf         <Private Use>
-+<UE3BB>     /xfc/xb0         <Private Use>
-+<UE3BC>     /xfc/xb1         <Private Use>
-+<UE3BD>     /xfc/xb2         <Private Use>
-+<UE3BE>     /xfc/xb3         <Private Use>
-+<UE3BF>     /xfc/xb4         <Private Use>
-+<UE3C0>     /xfc/xb5         <Private Use>
-+<UE3C1>     /xfc/xb6         <Private Use>
-+<UE3C2>     /xfc/xb7         <Private Use>
-+<UE3C3>     /xfc/xb8         <Private Use>
-+<UE3C4>     /xfc/xb9         <Private Use>
-+<UE3C5>     /xfc/xba         <Private Use>
-+<UE3C6>     /xfc/xbb         <Private Use>
-+<UE3C7>     /xfc/xbc         <Private Use>
-+<UE3C8>     /xfc/xbd         <Private Use>
-+<UE3C9>     /xfc/xbe         <Private Use>
-+<UE3CA>     /xfc/xbf         <Private Use>
-+<UE3CB>     /xfc/xc0         <Private Use>
-+<UE3CC>     /xfc/xc1         <Private Use>
-+<UE3CD>     /xfc/xc2         <Private Use>
-+<UE3CE>     /xfc/xc3         <Private Use>
-+<UE3CF>     /xfc/xc4         <Private Use>
-+<UE3D0>     /xfc/xc5         <Private Use>
-+<UE3D1>     /xfc/xc6         <Private Use>
-+<UE3D2>     /xfc/xc7         <Private Use>
-+<UE3D3>     /xfc/xc8         <Private Use>
-+<UE3D4>     /xfc/xc9         <Private Use>
-+<UE3D5>     /xfc/xca         <Private Use>
-+<UE3D6>     /xfc/xcb         <Private Use>
-+<UE3D7>     /xfc/xcc         <Private Use>
-+<UE3D8>     /xfc/xcd         <Private Use>
-+<UE3D9>     /xfc/xce         <Private Use>
-+<UE3DA>     /xfc/xcf         <Private Use>
-+<UE3DB>     /xfc/xd0         <Private Use>
-+<UE3DC>     /xfc/xd1         <Private Use>
-+<UE3DD>     /xfc/xd2         <Private Use>
-+<UE3DE>     /xfc/xd3         <Private Use>
-+<UE3DF>     /xfc/xd4         <Private Use>
-+<UE3E0>     /xfc/xd5         <Private Use>
-+<UE3E1>     /xfc/xd6         <Private Use>
-+<UE3E2>     /xfc/xd7         <Private Use>
-+<UE3E3>     /xfc/xd8         <Private Use>
-+<UE3E4>     /xfc/xd9         <Private Use>
-+<UE3E5>     /xfc/xda         <Private Use>
-+<UE3E6>     /xfc/xdb         <Private Use>
-+<UE3E7>     /xfc/xdc         <Private Use>
-+<UE3E8>     /xfc/xdd         <Private Use>
-+<UE3E9>     /xfc/xde         <Private Use>
-+<UE3EA>     /xfc/xdf         <Private Use>
-+<UE3EB>     /xfc/xe0         <Private Use>
-+<UE3EC>     /xfc/xe1         <Private Use>
-+<UE3ED>     /xfc/xe2         <Private Use>
-+<UE3EE>     /xfc/xe3         <Private Use>
-+<UE3EF>     /xfc/xe4         <Private Use>
-+<UE3F0>     /xfc/xe5         <Private Use>
-+<UE3F1>     /xfc/xe6         <Private Use>
-+<UE3F2>     /xfc/xe7         <Private Use>
-+<UE3F3>     /xfc/xe8         <Private Use>
-+<UE3F4>     /xfc/xe9         <Private Use>
-+<UE3F5>     /xfc/xea         <Private Use>
-+<UE3F6>     /xfc/xeb         <Private Use>
-+<UE3F7>     /xfc/xec         <Private Use>
-+<UE3F8>     /xfc/xed         <Private Use>
-+<UE3F9>     /xfc/xee         <Private Use>
-+<UE3FA>     /xfc/xef         <Private Use>
-+<UE3FB>     /xfc/xf0         <Private Use>
-+<UE3FC>     /xfc/xf1         <Private Use>
-+<UE3FD>     /xfc/xf2         <Private Use>
-+<UE3FE>     /xfc/xf3         <Private Use>
-+<UE3FF>     /xfc/xf4         <Private Use>
-+<UE400>     /xfc/xf5         <Private Use>
-+<UE401>     /xfc/xf6         <Private Use>
-+<UE402>     /xfc/xf7         <Private Use>
-+<UE403>     /xfc/xf8         <Private Use>
-+<UE404>     /xfc/xf9         <Private Use>
-+<UE405>     /xfc/xfa         <Private Use>
-+<UE406>     /xfc/xfb         <Private Use>
-+<UE407>     /xfc/xfc         <Private Use>
-+<UE408>     /xfc/xfd         <Private Use>
-+<UE409>     /xfc/xfe         <Private Use>
-+<UE40A>     /xfd/xa1         <Private Use>
-+<UE40B>     /xfd/xa2         <Private Use>
-+<UE40C>     /xfd/xa3         <Private Use>
-+<UE40D>     /xfd/xa4         <Private Use>
-+<UE40E>     /xfd/xa5         <Private Use>
-+<UE40F>     /xfd/xa6         <Private Use>
-+<UE410>     /xfd/xa7         <Private Use>
-+<UE411>     /xfd/xa8         <Private Use>
-+<UE412>     /xfd/xa9         <Private Use>
-+<UE413>     /xfd/xaa         <Private Use>
-+<UE414>     /xfd/xab         <Private Use>
-+<UE415>     /xfd/xac         <Private Use>
-+<UE416>     /xfd/xad         <Private Use>
-+<UE417>     /xfd/xae         <Private Use>
-+<UE418>     /xfd/xaf         <Private Use>
-+<UE419>     /xfd/xb0         <Private Use>
-+<UE41A>     /xfd/xb1         <Private Use>
-+<UE41B>     /xfd/xb2         <Private Use>
-+<UE41C>     /xfd/xb3         <Private Use>
-+<UE41D>     /xfd/xb4         <Private Use>
-+<UE41E>     /xfd/xb5         <Private Use>
-+<UE41F>     /xfd/xb6         <Private Use>
-+<UE420>     /xfd/xb7         <Private Use>
-+<UE421>     /xfd/xb8         <Private Use>
-+<UE422>     /xfd/xb9         <Private Use>
-+<UE423>     /xfd/xba         <Private Use>
-+<UE424>     /xfd/xbb         <Private Use>
-+<UE425>     /xfd/xbc         <Private Use>
-+<UE426>     /xfd/xbd         <Private Use>
-+<UE427>     /xfd/xbe         <Private Use>
-+<UE428>     /xfd/xbf         <Private Use>
-+<UE429>     /xfd/xc0         <Private Use>
-+<UE42A>     /xfd/xc1         <Private Use>
-+<UE42B>     /xfd/xc2         <Private Use>
-+<UE42C>     /xfd/xc3         <Private Use>
-+<UE42D>     /xfd/xc4         <Private Use>
-+<UE42E>     /xfd/xc5         <Private Use>
-+<UE42F>     /xfd/xc6         <Private Use>
-+<UE430>     /xfd/xc7         <Private Use>
-+<UE431>     /xfd/xc8         <Private Use>
-+<UE432>     /xfd/xc9         <Private Use>
-+<UE433>     /xfd/xca         <Private Use>
-+<UE434>     /xfd/xcb         <Private Use>
-+<UE435>     /xfd/xcc         <Private Use>
-+<UE436>     /xfd/xcd         <Private Use>
-+<UE437>     /xfd/xce         <Private Use>
-+<UE438>     /xfd/xcf         <Private Use>
-+<UE439>     /xfd/xd0         <Private Use>
-+<UE43A>     /xfd/xd1         <Private Use>
-+<UE43B>     /xfd/xd2         <Private Use>
-+<UE43C>     /xfd/xd3         <Private Use>
-+<UE43D>     /xfd/xd4         <Private Use>
-+<UE43E>     /xfd/xd5         <Private Use>
-+<UE43F>     /xfd/xd6         <Private Use>
-+<UE440>     /xfd/xd7         <Private Use>
-+<UE441>     /xfd/xd8         <Private Use>
-+<UE442>     /xfd/xd9         <Private Use>
-+<UE443>     /xfd/xda         <Private Use>
-+<UE444>     /xfd/xdb         <Private Use>
-+<UE445>     /xfd/xdc         <Private Use>
-+<UE446>     /xfd/xdd         <Private Use>
-+<UE447>     /xfd/xde         <Private Use>
-+<UE448>     /xfd/xdf         <Private Use>
-+<UE449>     /xfd/xe0         <Private Use>
-+<UE44A>     /xfd/xe1         <Private Use>
-+<UE44B>     /xfd/xe2         <Private Use>
-+<UE44C>     /xfd/xe3         <Private Use>
-+<UE44D>     /xfd/xe4         <Private Use>
-+<UE44E>     /xfd/xe5         <Private Use>
-+<UE44F>     /xfd/xe6         <Private Use>
-+<UE450>     /xfd/xe7         <Private Use>
-+<UE451>     /xfd/xe8         <Private Use>
-+<UE452>     /xfd/xe9         <Private Use>
-+<UE453>     /xfd/xea         <Private Use>
-+<UE454>     /xfd/xeb         <Private Use>
-+<UE455>     /xfd/xec         <Private Use>
-+<UE456>     /xfd/xed         <Private Use>
-+<UE457>     /xfd/xee         <Private Use>
-+<UE458>     /xfd/xef         <Private Use>
-+<UE459>     /xfd/xf0         <Private Use>
-+<UE45A>     /xfd/xf1         <Private Use>
-+<UE45B>     /xfd/xf2         <Private Use>
-+<UE45C>     /xfd/xf3         <Private Use>
-+<UE45D>     /xfd/xf4         <Private Use>
-+<UE45E>     /xfd/xf5         <Private Use>
-+<UE45F>     /xfd/xf6         <Private Use>
-+<UE460>     /xfd/xf7         <Private Use>
-+<UE461>     /xfd/xf8         <Private Use>
-+<UE462>     /xfd/xf9         <Private Use>
-+<UE463>     /xfd/xfa         <Private Use>
-+<UE464>     /xfd/xfb         <Private Use>
-+<UE465>     /xfd/xfc         <Private Use>
-+<UE466>     /xfd/xfd         <Private Use>
-+<UE467>     /xfd/xfe         <Private Use>
-+<UE468>     /xfe/xa1         <Private Use>
-+<UE469>     /xfe/xa2         <Private Use>
-+<UE46A>     /xfe/xa3         <Private Use>
-+<UE46B>     /xfe/xa4         <Private Use>
-+<UE46C>     /xfe/xa5         <Private Use>
-+<UE46D>     /xfe/xa6         <Private Use>
-+<UE46E>     /xfe/xa7         <Private Use>
-+<UE46F>     /xfe/xa8         <Private Use>
-+<UE470>     /xfe/xa9         <Private Use>
-+<UE471>     /xfe/xaa         <Private Use>
-+<UE472>     /xfe/xab         <Private Use>
-+<UE473>     /xfe/xac         <Private Use>
-+<UE474>     /xfe/xad         <Private Use>
-+<UE475>     /xfe/xae         <Private Use>
-+<UE476>     /xfe/xaf         <Private Use>
-+<UE477>     /xfe/xb0         <Private Use>
-+<UE478>     /xfe/xb1         <Private Use>
-+<UE479>     /xfe/xb2         <Private Use>
-+<UE47A>     /xfe/xb3         <Private Use>
-+<UE47B>     /xfe/xb4         <Private Use>
-+<UE47C>     /xfe/xb5         <Private Use>
-+<UE47D>     /xfe/xb6         <Private Use>
-+<UE47E>     /xfe/xb7         <Private Use>
-+<UE47F>     /xfe/xb8         <Private Use>
-+<UE480>     /xfe/xb9         <Private Use>
-+<UE481>     /xfe/xba         <Private Use>
-+<UE482>     /xfe/xbb         <Private Use>
-+<UE483>     /xfe/xbc         <Private Use>
-+<UE484>     /xfe/xbd         <Private Use>
-+<UE485>     /xfe/xbe         <Private Use>
-+<UE486>     /xfe/xbf         <Private Use>
-+<UE487>     /xfe/xc0         <Private Use>
-+<UE488>     /xfe/xc1         <Private Use>
-+<UE489>     /xfe/xc2         <Private Use>
-+<UE48A>     /xfe/xc3         <Private Use>
-+<UE48B>     /xfe/xc4         <Private Use>
-+<UE48C>     /xfe/xc5         <Private Use>
-+<UE48D>     /xfe/xc6         <Private Use>
-+<UE48E>     /xfe/xc7         <Private Use>
-+<UE48F>     /xfe/xc8         <Private Use>
-+<UE490>     /xfe/xc9         <Private Use>
-+<UE491>     /xfe/xca         <Private Use>
-+<UE492>     /xfe/xcb         <Private Use>
-+<UE493>     /xfe/xcc         <Private Use>
-+<UE494>     /xfe/xcd         <Private Use>
-+<UE495>     /xfe/xce         <Private Use>
-+<UE496>     /xfe/xcf         <Private Use>
-+<UE497>     /xfe/xd0         <Private Use>
-+<UE498>     /xfe/xd1         <Private Use>
-+<UE499>     /xfe/xd2         <Private Use>
-+<UE49A>     /xfe/xd3         <Private Use>
-+<UE49B>     /xfe/xd4         <Private Use>
-+<UE49C>     /xfe/xd5         <Private Use>
-+<UE49D>     /xfe/xd6         <Private Use>
-+<UE49E>     /xfe/xd7         <Private Use>
-+<UE49F>     /xfe/xd8         <Private Use>
-+<UE4A0>     /xfe/xd9         <Private Use>
-+<UE4A1>     /xfe/xda         <Private Use>
-+<UE4A2>     /xfe/xdb         <Private Use>
-+<UE4A3>     /xfe/xdc         <Private Use>
-+<UE4A4>     /xfe/xdd         <Private Use>
-+<UE4A5>     /xfe/xde         <Private Use>
-+<UE4A6>     /xfe/xdf         <Private Use>
-+<UE4A7>     /xfe/xe0         <Private Use>
-+<UE4A8>     /xfe/xe1         <Private Use>
-+<UE4A9>     /xfe/xe2         <Private Use>
-+<UE4AA>     /xfe/xe3         <Private Use>
-+<UE4AB>     /xfe/xe4         <Private Use>
-+<UE4AC>     /xfe/xe5         <Private Use>
-+<UE4AD>     /xfe/xe6         <Private Use>
-+<UE4AE>     /xfe/xe7         <Private Use>
-+<UE4AF>     /xfe/xe8         <Private Use>
-+<UE4B0>     /xfe/xe9         <Private Use>
-+<UE4B1>     /xfe/xea         <Private Use>
-+<UE4B2>     /xfe/xeb         <Private Use>
-+<UE4B3>     /xfe/xec         <Private Use>
-+<UE4B4>     /xfe/xed         <Private Use>
-+<UE4B5>     /xfe/xee         <Private Use>
-+<UE4B6>     /xfe/xef         <Private Use>
-+<UE4B7>     /xfe/xf0         <Private Use>
-+<UE4B8>     /xfe/xf1         <Private Use>
-+<UE4B9>     /xfe/xf2         <Private Use>
-+<UE4BA>     /xfe/xf3         <Private Use>
-+<UE4BB>     /xfe/xf4         <Private Use>
-+<UE4BC>     /xfe/xf5         <Private Use>
-+<UE4BD>     /xfe/xf6         <Private Use>
-+<UE4BE>     /xfe/xf7         <Private Use>
-+<UE4BF>     /xfe/xf8         <Private Use>
-+<UE4C0>     /xfe/xf9         <Private Use>
-+<UE4C1>     /xfe/xfa         <Private Use>
-+<UE4C2>     /xfe/xfb         <Private Use>
-+<UE4C3>     /xfe/xfc         <Private Use>
-+<UE4C4>     /xfe/xfd         <Private Use>
-+<UE4C5>     /xfe/xfe         <Private Use>
-+<UE4C6>     /xa1/x40         <Private Use>
-+<UE4C7>     /xa1/x41         <Private Use>
-+<UE4C8>     /xa1/x42         <Private Use>
-+<UE4C9>     /xa1/x43         <Private Use>
-+<UE4CA>     /xa1/x44         <Private Use>
-+<UE4CB>     /xa1/x45         <Private Use>
-+<UE4CC>     /xa1/x46         <Private Use>
-+<UE4CD>     /xa1/x47         <Private Use>
-+<UE4CE>     /xa1/x48         <Private Use>
-+<UE4CF>     /xa1/x49         <Private Use>
-+<UE4D0>     /xa1/x4a         <Private Use>
-+<UE4D1>     /xa1/x4b         <Private Use>
-+<UE4D2>     /xa1/x4c         <Private Use>
-+<UE4D3>     /xa1/x4d         <Private Use>
-+<UE4D4>     /xa1/x4e         <Private Use>
-+<UE4D5>     /xa1/x4f         <Private Use>
-+<UE4D6>     /xa1/x50         <Private Use>
-+<UE4D7>     /xa1/x51         <Private Use>
-+<UE4D8>     /xa1/x52         <Private Use>
-+<UE4D9>     /xa1/x53         <Private Use>
-+<UE4DA>     /xa1/x54         <Private Use>
-+<UE4DB>     /xa1/x55         <Private Use>
-+<UE4DC>     /xa1/x56         <Private Use>
-+<UE4DD>     /xa1/x57         <Private Use>
-+<UE4DE>     /xa1/x58         <Private Use>
-+<UE4DF>     /xa1/x59         <Private Use>
-+<UE4E0>     /xa1/x5a         <Private Use>
-+<UE4E1>     /xa1/x5b         <Private Use>
-+<UE4E2>     /xa1/x5c         <Private Use>
-+<UE4E3>     /xa1/x5d         <Private Use>
-+<UE4E4>     /xa1/x5e         <Private Use>
-+<UE4E5>     /xa1/x5f         <Private Use>
-+<UE4E6>     /xa1/x60         <Private Use>
-+<UE4E7>     /xa1/x61         <Private Use>
-+<UE4E8>     /xa1/x62         <Private Use>
-+<UE4E9>     /xa1/x63         <Private Use>
-+<UE4EA>     /xa1/x64         <Private Use>
-+<UE4EB>     /xa1/x65         <Private Use>
-+<UE4EC>     /xa1/x66         <Private Use>
-+<UE4ED>     /xa1/x67         <Private Use>
-+<UE4EE>     /xa1/x68         <Private Use>
-+<UE4EF>     /xa1/x69         <Private Use>
-+<UE4F0>     /xa1/x6a         <Private Use>
-+<UE4F1>     /xa1/x6b         <Private Use>
-+<UE4F2>     /xa1/x6c         <Private Use>
-+<UE4F3>     /xa1/x6d         <Private Use>
-+<UE4F4>     /xa1/x6e         <Private Use>
-+<UE4F5>     /xa1/x6f         <Private Use>
-+<UE4F6>     /xa1/x70         <Private Use>
-+<UE4F7>     /xa1/x71         <Private Use>
-+<UE4F8>     /xa1/x72         <Private Use>
-+<UE4F9>     /xa1/x73         <Private Use>
-+<UE4FA>     /xa1/x74         <Private Use>
-+<UE4FB>     /xa1/x75         <Private Use>
-+<UE4FC>     /xa1/x76         <Private Use>
-+<UE4FD>     /xa1/x77         <Private Use>
-+<UE4FE>     /xa1/x78         <Private Use>
-+<UE4FF>     /xa1/x79         <Private Use>
-+<UE500>     /xa1/x7a         <Private Use>
-+<UE501>     /xa1/x7b         <Private Use>
-+<UE502>     /xa1/x7c         <Private Use>
-+<UE503>     /xa1/x7d         <Private Use>
-+<UE504>     /xa1/x7e         <Private Use>
-+<UE505>     /xa1/x80         <Private Use>
-+<UE506>     /xa1/x81         <Private Use>
-+<UE507>     /xa1/x82         <Private Use>
-+<UE508>     /xa1/x83         <Private Use>
-+<UE509>     /xa1/x84         <Private Use>
-+<UE50A>     /xa1/x85         <Private Use>
-+<UE50B>     /xa1/x86         <Private Use>
-+<UE50C>     /xa1/x87         <Private Use>
-+<UE50D>     /xa1/x88         <Private Use>
-+<UE50E>     /xa1/x89         <Private Use>
-+<UE50F>     /xa1/x8a         <Private Use>
-+<UE510>     /xa1/x8b         <Private Use>
-+<UE511>     /xa1/x8c         <Private Use>
-+<UE512>     /xa1/x8d         <Private Use>
-+<UE513>     /xa1/x8e         <Private Use>
-+<UE514>     /xa1/x8f         <Private Use>
-+<UE515>     /xa1/x90         <Private Use>
-+<UE516>     /xa1/x91         <Private Use>
-+<UE517>     /xa1/x92         <Private Use>
-+<UE518>     /xa1/x93         <Private Use>
-+<UE519>     /xa1/x94         <Private Use>
-+<UE51A>     /xa1/x95         <Private Use>
-+<UE51B>     /xa1/x96         <Private Use>
-+<UE51C>     /xa1/x97         <Private Use>
-+<UE51D>     /xa1/x98         <Private Use>
-+<UE51E>     /xa1/x99         <Private Use>
-+<UE51F>     /xa1/x9a         <Private Use>
-+<UE520>     /xa1/x9b         <Private Use>
-+<UE521>     /xa1/x9c         <Private Use>
-+<UE522>     /xa1/x9d         <Private Use>
-+<UE523>     /xa1/x9e         <Private Use>
-+<UE524>     /xa1/x9f         <Private Use>
-+<UE525>     /xa1/xa0         <Private Use>
-+<UE526>     /xa2/x40         <Private Use>
-+<UE527>     /xa2/x41         <Private Use>
-+<UE528>     /xa2/x42         <Private Use>
-+<UE529>     /xa2/x43         <Private Use>
-+<UE52A>     /xa2/x44         <Private Use>
-+<UE52B>     /xa2/x45         <Private Use>
-+<UE52C>     /xa2/x46         <Private Use>
-+<UE52D>     /xa2/x47         <Private Use>
-+<UE52E>     /xa2/x48         <Private Use>
-+<UE52F>     /xa2/x49         <Private Use>
-+<UE530>     /xa2/x4a         <Private Use>
-+<UE531>     /xa2/x4b         <Private Use>
-+<UE532>     /xa2/x4c         <Private Use>
-+<UE533>     /xa2/x4d         <Private Use>
-+<UE534>     /xa2/x4e         <Private Use>
-+<UE535>     /xa2/x4f         <Private Use>
-+<UE536>     /xa2/x50         <Private Use>
-+<UE537>     /xa2/x51         <Private Use>
-+<UE538>     /xa2/x52         <Private Use>
-+<UE539>     /xa2/x53         <Private Use>
-+<UE53A>     /xa2/x54         <Private Use>
-+<UE53B>     /xa2/x55         <Private Use>
-+<UE53C>     /xa2/x56         <Private Use>
-+<UE53D>     /xa2/x57         <Private Use>
-+<UE53E>     /xa2/x58         <Private Use>
-+<UE53F>     /xa2/x59         <Private Use>
-+<UE540>     /xa2/x5a         <Private Use>
-+<UE541>     /xa2/x5b         <Private Use>
-+<UE542>     /xa2/x5c         <Private Use>
-+<UE543>     /xa2/x5d         <Private Use>
-+<UE544>     /xa2/x5e         <Private Use>
-+<UE545>     /xa2/x5f         <Private Use>
-+<UE546>     /xa2/x60         <Private Use>
-+<UE547>     /xa2/x61         <Private Use>
-+<UE548>     /xa2/x62         <Private Use>
-+<UE549>     /xa2/x63         <Private Use>
-+<UE54A>     /xa2/x64         <Private Use>
-+<UE54B>     /xa2/x65         <Private Use>
-+<UE54C>     /xa2/x66         <Private Use>
-+<UE54D>     /xa2/x67         <Private Use>
-+<UE54E>     /xa2/x68         <Private Use>
-+<UE54F>     /xa2/x69         <Private Use>
-+<UE550>     /xa2/x6a         <Private Use>
-+<UE551>     /xa2/x6b         <Private Use>
-+<UE552>     /xa2/x6c         <Private Use>
-+<UE553>     /xa2/x6d         <Private Use>
-+<UE554>     /xa2/x6e         <Private Use>
-+<UE555>     /xa2/x6f         <Private Use>
-+<UE556>     /xa2/x70         <Private Use>
-+<UE557>     /xa2/x71         <Private Use>
-+<UE558>     /xa2/x72         <Private Use>
-+<UE559>     /xa2/x73         <Private Use>
-+<UE55A>     /xa2/x74         <Private Use>
-+<UE55B>     /xa2/x75         <Private Use>
-+<UE55C>     /xa2/x76         <Private Use>
-+<UE55D>     /xa2/x77         <Private Use>
-+<UE55E>     /xa2/x78         <Private Use>
-+<UE55F>     /xa2/x79         <Private Use>
-+<UE560>     /xa2/x7a         <Private Use>
-+<UE561>     /xa2/x7b         <Private Use>
-+<UE562>     /xa2/x7c         <Private Use>
-+<UE563>     /xa2/x7d         <Private Use>
-+<UE564>     /xa2/x7e         <Private Use>
-+<UE565>     /xa2/x80         <Private Use>
-+<UE566>     /xa2/x81         <Private Use>
-+<UE567>     /xa2/x82         <Private Use>
-+<UE568>     /xa2/x83         <Private Use>
-+<UE569>     /xa2/x84         <Private Use>
-+<UE56A>     /xa2/x85         <Private Use>
-+<UE56B>     /xa2/x86         <Private Use>
-+<UE56C>     /xa2/x87         <Private Use>
-+<UE56D>     /xa2/x88         <Private Use>
-+<UE56E>     /xa2/x89         <Private Use>
-+<UE56F>     /xa2/x8a         <Private Use>
-+<UE570>     /xa2/x8b         <Private Use>
-+<UE571>     /xa2/x8c         <Private Use>
-+<UE572>     /xa2/x8d         <Private Use>
-+<UE573>     /xa2/x8e         <Private Use>
-+<UE574>     /xa2/x8f         <Private Use>
-+<UE575>     /xa2/x90         <Private Use>
-+<UE576>     /xa2/x91         <Private Use>
-+<UE577>     /xa2/x92         <Private Use>
-+<UE578>     /xa2/x93         <Private Use>
-+<UE579>     /xa2/x94         <Private Use>
-+<UE57A>     /xa2/x95         <Private Use>
-+<UE57B>     /xa2/x96         <Private Use>
-+<UE57C>     /xa2/x97         <Private Use>
-+<UE57D>     /xa2/x98         <Private Use>
-+<UE57E>     /xa2/x99         <Private Use>
-+<UE57F>     /xa2/x9a         <Private Use>
-+<UE580>     /xa2/x9b         <Private Use>
-+<UE581>     /xa2/x9c         <Private Use>
-+<UE582>     /xa2/x9d         <Private Use>
-+<UE583>     /xa2/x9e         <Private Use>
-+<UE584>     /xa2/x9f         <Private Use>
-+<UE585>     /xa2/xa0         <Private Use>
-+<UE586>     /xa3/x40         <Private Use>
-+<UE587>     /xa3/x41         <Private Use>
-+<UE588>     /xa3/x42         <Private Use>
-+<UE589>     /xa3/x43         <Private Use>
-+<UE58A>     /xa3/x44         <Private Use>
-+<UE58B>     /xa3/x45         <Private Use>
-+<UE58C>     /xa3/x46         <Private Use>
-+<UE58D>     /xa3/x47         <Private Use>
-+<UE58E>     /xa3/x48         <Private Use>
-+<UE58F>     /xa3/x49         <Private Use>
-+<UE590>     /xa3/x4a         <Private Use>
-+<UE591>     /xa3/x4b         <Private Use>
-+<UE592>     /xa3/x4c         <Private Use>
-+<UE593>     /xa3/x4d         <Private Use>
-+<UE594>     /xa3/x4e         <Private Use>
-+<UE595>     /xa3/x4f         <Private Use>
-+<UE596>     /xa3/x50         <Private Use>
-+<UE597>     /xa3/x51         <Private Use>
-+<UE598>     /xa3/x52         <Private Use>
-+<UE599>     /xa3/x53         <Private Use>
-+<UE59A>     /xa3/x54         <Private Use>
-+<UE59B>     /xa3/x55         <Private Use>
-+<UE59C>     /xa3/x56         <Private Use>
-+<UE59D>     /xa3/x57         <Private Use>
-+<UE59E>     /xa3/x58         <Private Use>
-+<UE59F>     /xa3/x59         <Private Use>
-+<UE5A0>     /xa3/x5a         <Private Use>
-+<UE5A1>     /xa3/x5b         <Private Use>
-+<UE5A2>     /xa3/x5c         <Private Use>
-+<UE5A3>     /xa3/x5d         <Private Use>
-+<UE5A4>     /xa3/x5e         <Private Use>
-+<UE5A5>     /xa3/x5f         <Private Use>
-+<UE5A6>     /xa3/x60         <Private Use>
-+<UE5A7>     /xa3/x61         <Private Use>
-+<UE5A8>     /xa3/x62         <Private Use>
-+<UE5A9>     /xa3/x63         <Private Use>
-+<UE5AA>     /xa3/x64         <Private Use>
-+<UE5AB>     /xa3/x65         <Private Use>
-+<UE5AC>     /xa3/x66         <Private Use>
-+<UE5AD>     /xa3/x67         <Private Use>
-+<UE5AE>     /xa3/x68         <Private Use>
-+<UE5AF>     /xa3/x69         <Private Use>
-+<UE5B0>     /xa3/x6a         <Private Use>
-+<UE5B1>     /xa3/x6b         <Private Use>
-+<UE5B2>     /xa3/x6c         <Private Use>
-+<UE5B3>     /xa3/x6d         <Private Use>
-+<UE5B4>     /xa3/x6e         <Private Use>
-+<UE5B5>     /xa3/x6f         <Private Use>
-+<UE5B6>     /xa3/x70         <Private Use>
-+<UE5B7>     /xa3/x71         <Private Use>
-+<UE5B8>     /xa3/x72         <Private Use>
-+<UE5B9>     /xa3/x73         <Private Use>
-+<UE5BA>     /xa3/x74         <Private Use>
-+<UE5BB>     /xa3/x75         <Private Use>
-+<UE5BC>     /xa3/x76         <Private Use>
-+<UE5BD>     /xa3/x77         <Private Use>
-+<UE5BE>     /xa3/x78         <Private Use>
-+<UE5BF>     /xa3/x79         <Private Use>
-+<UE5C0>     /xa3/x7a         <Private Use>
-+<UE5C1>     /xa3/x7b         <Private Use>
-+<UE5C2>     /xa3/x7c         <Private Use>
-+<UE5C3>     /xa3/x7d         <Private Use>
-+<UE5C4>     /xa3/x7e         <Private Use>
-+<UE5C5>     /xa3/x80         <Private Use>
-+<UE5C6>     /xa3/x81         <Private Use>
-+<UE5C7>     /xa3/x82         <Private Use>
-+<UE5C8>     /xa3/x83         <Private Use>
-+<UE5C9>     /xa3/x84         <Private Use>
-+<UE5CA>     /xa3/x85         <Private Use>
-+<UE5CB>     /xa3/x86         <Private Use>
-+<UE5CC>     /xa3/x87         <Private Use>
-+<UE5CD>     /xa3/x88         <Private Use>
-+<UE5CE>     /xa3/x89         <Private Use>
-+<UE5CF>     /xa3/x8a         <Private Use>
-+<UE5D0>     /xa3/x8b         <Private Use>
-+<UE5D1>     /xa3/x8c         <Private Use>
-+<UE5D2>     /xa3/x8d         <Private Use>
-+<UE5D3>     /xa3/x8e         <Private Use>
-+<UE5D4>     /xa3/x8f         <Private Use>
-+<UE5D5>     /xa3/x90         <Private Use>
-+<UE5D6>     /xa3/x91         <Private Use>
-+<UE5D7>     /xa3/x92         <Private Use>
-+<UE5D8>     /xa3/x93         <Private Use>
-+<UE5D9>     /xa3/x94         <Private Use>
-+<UE5DA>     /xa3/x95         <Private Use>
-+<UE5DB>     /xa3/x96         <Private Use>
-+<UE5DC>     /xa3/x97         <Private Use>
-+<UE5DD>     /xa3/x98         <Private Use>
-+<UE5DE>     /xa3/x99         <Private Use>
-+<UE5DF>     /xa3/x9a         <Private Use>
-+<UE5E0>     /xa3/x9b         <Private Use>
-+<UE5E1>     /xa3/x9c         <Private Use>
-+<UE5E2>     /xa3/x9d         <Private Use>
-+<UE5E3>     /xa3/x9e         <Private Use>
-+<UE5E4>     /xa3/x9f         <Private Use>
-+<UE5E5>     /xa3/xa0         <Private Use>
-+<UE5E6>     /xa4/x40         <Private Use>
-+<UE5E7>     /xa4/x41         <Private Use>
-+<UE5E8>     /xa4/x42         <Private Use>
-+<UE5E9>     /xa4/x43         <Private Use>
-+<UE5EA>     /xa4/x44         <Private Use>
-+<UE5EB>     /xa4/x45         <Private Use>
-+<UE5EC>     /xa4/x46         <Private Use>
-+<UE5ED>     /xa4/x47         <Private Use>
-+<UE5EE>     /xa4/x48         <Private Use>
-+<UE5EF>     /xa4/x49         <Private Use>
-+<UE5F0>     /xa4/x4a         <Private Use>
-+<UE5F1>     /xa4/x4b         <Private Use>
-+<UE5F2>     /xa4/x4c         <Private Use>
-+<UE5F3>     /xa4/x4d         <Private Use>
-+<UE5F4>     /xa4/x4e         <Private Use>
-+<UE5F5>     /xa4/x4f         <Private Use>
-+<UE5F6>     /xa4/x50         <Private Use>
-+<UE5F7>     /xa4/x51         <Private Use>
-+<UE5F8>     /xa4/x52         <Private Use>
-+<UE5F9>     /xa4/x53         <Private Use>
-+<UE5FA>     /xa4/x54         <Private Use>
-+<UE5FB>     /xa4/x55         <Private Use>
-+<UE5FC>     /xa4/x56         <Private Use>
-+<UE5FD>     /xa4/x57         <Private Use>
-+<UE5FE>     /xa4/x58         <Private Use>
-+<UE5FF>     /xa4/x59         <Private Use>
-+<UE600>     /xa4/x5a         <Private Use>
-+<UE601>     /xa4/x5b         <Private Use>
-+<UE602>     /xa4/x5c         <Private Use>
-+<UE603>     /xa4/x5d         <Private Use>
-+<UE604>     /xa4/x5e         <Private Use>
-+<UE605>     /xa4/x5f         <Private Use>
-+<UE606>     /xa4/x60         <Private Use>
-+<UE607>     /xa4/x61         <Private Use>
-+<UE608>     /xa4/x62         <Private Use>
-+<UE609>     /xa4/x63         <Private Use>
-+<UE60A>     /xa4/x64         <Private Use>
-+<UE60B>     /xa4/x65         <Private Use>
-+<UE60C>     /xa4/x66         <Private Use>
-+<UE60D>     /xa4/x67         <Private Use>
-+<UE60E>     /xa4/x68         <Private Use>
-+<UE60F>     /xa4/x69         <Private Use>
-+<UE610>     /xa4/x6a         <Private Use>
-+<UE611>     /xa4/x6b         <Private Use>
-+<UE612>     /xa4/x6c         <Private Use>
-+<UE613>     /xa4/x6d         <Private Use>
-+<UE614>     /xa4/x6e         <Private Use>
-+<UE615>     /xa4/x6f         <Private Use>
-+<UE616>     /xa4/x70         <Private Use>
-+<UE617>     /xa4/x71         <Private Use>
-+<UE618>     /xa4/x72         <Private Use>
-+<UE619>     /xa4/x73         <Private Use>
-+<UE61A>     /xa4/x74         <Private Use>
-+<UE61B>     /xa4/x75         <Private Use>
-+<UE61C>     /xa4/x76         <Private Use>
-+<UE61D>     /xa4/x77         <Private Use>
-+<UE61E>     /xa4/x78         <Private Use>
-+<UE61F>     /xa4/x79         <Private Use>
-+<UE620>     /xa4/x7a         <Private Use>
-+<UE621>     /xa4/x7b         <Private Use>
-+<UE622>     /xa4/x7c         <Private Use>
-+<UE623>     /xa4/x7d         <Private Use>
-+<UE624>     /xa4/x7e         <Private Use>
-+<UE625>     /xa4/x80         <Private Use>
-+<UE626>     /xa4/x81         <Private Use>
-+<UE627>     /xa4/x82         <Private Use>
-+<UE628>     /xa4/x83         <Private Use>
-+<UE629>     /xa4/x84         <Private Use>
-+<UE62A>     /xa4/x85         <Private Use>
-+<UE62B>     /xa4/x86         <Private Use>
-+<UE62C>     /xa4/x87         <Private Use>
-+<UE62D>     /xa4/x88         <Private Use>
-+<UE62E>     /xa4/x89         <Private Use>
-+<UE62F>     /xa4/x8a         <Private Use>
-+<UE630>     /xa4/x8b         <Private Use>
-+<UE631>     /xa4/x8c         <Private Use>
-+<UE632>     /xa4/x8d         <Private Use>
-+<UE633>     /xa4/x8e         <Private Use>
-+<UE634>     /xa4/x8f         <Private Use>
-+<UE635>     /xa4/x90         <Private Use>
-+<UE636>     /xa4/x91         <Private Use>
-+<UE637>     /xa4/x92         <Private Use>
-+<UE638>     /xa4/x93         <Private Use>
-+<UE639>     /xa4/x94         <Private Use>
-+<UE63A>     /xa4/x95         <Private Use>
-+<UE63B>     /xa4/x96         <Private Use>
-+<UE63C>     /xa4/x97         <Private Use>
-+<UE63D>     /xa4/x98         <Private Use>
-+<UE63E>     /xa4/x99         <Private Use>
-+<UE63F>     /xa4/x9a         <Private Use>
-+<UE640>     /xa4/x9b         <Private Use>
-+<UE641>     /xa4/x9c         <Private Use>
-+<UE642>     /xa4/x9d         <Private Use>
-+<UE643>     /xa4/x9e         <Private Use>
-+<UE644>     /xa4/x9f         <Private Use>
-+<UE645>     /xa4/xa0         <Private Use>
-+<UE646>     /xa5/x40         <Private Use>
-+<UE647>     /xa5/x41         <Private Use>
-+<UE648>     /xa5/x42         <Private Use>
-+<UE649>     /xa5/x43         <Private Use>
-+<UE64A>     /xa5/x44         <Private Use>
-+<UE64B>     /xa5/x45         <Private Use>
-+<UE64C>     /xa5/x46         <Private Use>
-+<UE64D>     /xa5/x47         <Private Use>
-+<UE64E>     /xa5/x48         <Private Use>
-+<UE64F>     /xa5/x49         <Private Use>
-+<UE650>     /xa5/x4a         <Private Use>
-+<UE651>     /xa5/x4b         <Private Use>
-+<UE652>     /xa5/x4c         <Private Use>
-+<UE653>     /xa5/x4d         <Private Use>
-+<UE654>     /xa5/x4e         <Private Use>
-+<UE655>     /xa5/x4f         <Private Use>
-+<UE656>     /xa5/x50         <Private Use>
-+<UE657>     /xa5/x51         <Private Use>
-+<UE658>     /xa5/x52         <Private Use>
-+<UE659>     /xa5/x53         <Private Use>
-+<UE65A>     /xa5/x54         <Private Use>
-+<UE65B>     /xa5/x55         <Private Use>
-+<UE65C>     /xa5/x56         <Private Use>
-+<UE65D>     /xa5/x57         <Private Use>
-+<UE65E>     /xa5/x58         <Private Use>
-+<UE65F>     /xa5/x59         <Private Use>
-+<UE660>     /xa5/x5a         <Private Use>
-+<UE661>     /xa5/x5b         <Private Use>
-+<UE662>     /xa5/x5c         <Private Use>
-+<UE663>     /xa5/x5d         <Private Use>
-+<UE664>     /xa5/x5e         <Private Use>
-+<UE665>     /xa5/x5f         <Private Use>
-+<UE666>     /xa5/x60         <Private Use>
-+<UE667>     /xa5/x61         <Private Use>
-+<UE668>     /xa5/x62         <Private Use>
-+<UE669>     /xa5/x63         <Private Use>
-+<UE66A>     /xa5/x64         <Private Use>
-+<UE66B>     /xa5/x65         <Private Use>
-+<UE66C>     /xa5/x66         <Private Use>
-+<UE66D>     /xa5/x67         <Private Use>
-+<UE66E>     /xa5/x68         <Private Use>
-+<UE66F>     /xa5/x69         <Private Use>
-+<UE670>     /xa5/x6a         <Private Use>
-+<UE671>     /xa5/x6b         <Private Use>
-+<UE672>     /xa5/x6c         <Private Use>
-+<UE673>     /xa5/x6d         <Private Use>
-+<UE674>     /xa5/x6e         <Private Use>
-+<UE675>     /xa5/x6f         <Private Use>
-+<UE676>     /xa5/x70         <Private Use>
-+<UE677>     /xa5/x71         <Private Use>
-+<UE678>     /xa5/x72         <Private Use>
-+<UE679>     /xa5/x73         <Private Use>
-+<UE67A>     /xa5/x74         <Private Use>
-+<UE67B>     /xa5/x75         <Private Use>
-+<UE67C>     /xa5/x76         <Private Use>
-+<UE67D>     /xa5/x77         <Private Use>
-+<UE67E>     /xa5/x78         <Private Use>
-+<UE67F>     /xa5/x79         <Private Use>
-+<UE680>     /xa5/x7a         <Private Use>
-+<UE681>     /xa5/x7b         <Private Use>
-+<UE682>     /xa5/x7c         <Private Use>
-+<UE683>     /xa5/x7d         <Private Use>
-+<UE684>     /xa5/x7e         <Private Use>
-+<UE685>     /xa5/x80         <Private Use>
-+<UE686>     /xa5/x81         <Private Use>
-+<UE687>     /xa5/x82         <Private Use>
-+<UE688>     /xa5/x83         <Private Use>
-+<UE689>     /xa5/x84         <Private Use>
-+<UE68A>     /xa5/x85         <Private Use>
-+<UE68B>     /xa5/x86         <Private Use>
-+<UE68C>     /xa5/x87         <Private Use>
-+<UE68D>     /xa5/x88         <Private Use>
-+<UE68E>     /xa5/x89         <Private Use>
-+<UE68F>     /xa5/x8a         <Private Use>
-+<UE690>     /xa5/x8b         <Private Use>
-+<UE691>     /xa5/x8c         <Private Use>
-+<UE692>     /xa5/x8d         <Private Use>
-+<UE693>     /xa5/x8e         <Private Use>
-+<UE694>     /xa5/x8f         <Private Use>
-+<UE695>     /xa5/x90         <Private Use>
-+<UE696>     /xa5/x91         <Private Use>
-+<UE697>     /xa5/x92         <Private Use>
-+<UE698>     /xa5/x93         <Private Use>
-+<UE699>     /xa5/x94         <Private Use>
-+<UE69A>     /xa5/x95         <Private Use>
-+<UE69B>     /xa5/x96         <Private Use>
-+<UE69C>     /xa5/x97         <Private Use>
-+<UE69D>     /xa5/x98         <Private Use>
-+<UE69E>     /xa5/x99         <Private Use>
-+<UE69F>     /xa5/x9a         <Private Use>
-+<UE6A0>     /xa5/x9b         <Private Use>
-+<UE6A1>     /xa5/x9c         <Private Use>
-+<UE6A2>     /xa5/x9d         <Private Use>
-+<UE6A3>     /xa5/x9e         <Private Use>
-+<UE6A4>     /xa5/x9f         <Private Use>
-+<UE6A5>     /xa5/xa0         <Private Use>
-+<UE6A6>     /xa6/x40         <Private Use>
-+<UE6A7>     /xa6/x41         <Private Use>
-+<UE6A8>     /xa6/x42         <Private Use>
-+<UE6A9>     /xa6/x43         <Private Use>
-+<UE6AA>     /xa6/x44         <Private Use>
-+<UE6AB>     /xa6/x45         <Private Use>
-+<UE6AC>     /xa6/x46         <Private Use>
-+<UE6AD>     /xa6/x47         <Private Use>
-+<UE6AE>     /xa6/x48         <Private Use>
-+<UE6AF>     /xa6/x49         <Private Use>
-+<UE6B0>     /xa6/x4a         <Private Use>
-+<UE6B1>     /xa6/x4b         <Private Use>
-+<UE6B2>     /xa6/x4c         <Private Use>
-+<UE6B3>     /xa6/x4d         <Private Use>
-+<UE6B4>     /xa6/x4e         <Private Use>
-+<UE6B5>     /xa6/x4f         <Private Use>
-+<UE6B6>     /xa6/x50         <Private Use>
-+<UE6B7>     /xa6/x51         <Private Use>
-+<UE6B8>     /xa6/x52         <Private Use>
-+<UE6B9>     /xa6/x53         <Private Use>
-+<UE6BA>     /xa6/x54         <Private Use>
-+<UE6BB>     /xa6/x55         <Private Use>
-+<UE6BC>     /xa6/x56         <Private Use>
-+<UE6BD>     /xa6/x57         <Private Use>
-+<UE6BE>     /xa6/x58         <Private Use>
-+<UE6BF>     /xa6/x59         <Private Use>
-+<UE6C0>     /xa6/x5a         <Private Use>
-+<UE6C1>     /xa6/x5b         <Private Use>
-+<UE6C2>     /xa6/x5c         <Private Use>
-+<UE6C3>     /xa6/x5d         <Private Use>
-+<UE6C4>     /xa6/x5e         <Private Use>
-+<UE6C5>     /xa6/x5f         <Private Use>
-+<UE6C6>     /xa6/x60         <Private Use>
-+<UE6C7>     /xa6/x61         <Private Use>
-+<UE6C8>     /xa6/x62         <Private Use>
-+<UE6C9>     /xa6/x63         <Private Use>
-+<UE6CA>     /xa6/x64         <Private Use>
-+<UE6CB>     /xa6/x65         <Private Use>
-+<UE6CC>     /xa6/x66         <Private Use>
-+<UE6CD>     /xa6/x67         <Private Use>
-+<UE6CE>     /xa6/x68         <Private Use>
-+<UE6CF>     /xa6/x69         <Private Use>
-+<UE6D0>     /xa6/x6a         <Private Use>
-+<UE6D1>     /xa6/x6b         <Private Use>
-+<UE6D2>     /xa6/x6c         <Private Use>
-+<UE6D3>     /xa6/x6d         <Private Use>
-+<UE6D4>     /xa6/x6e         <Private Use>
-+<UE6D5>     /xa6/x6f         <Private Use>
-+<UE6D6>     /xa6/x70         <Private Use>
-+<UE6D7>     /xa6/x71         <Private Use>
-+<UE6D8>     /xa6/x72         <Private Use>
-+<UE6D9>     /xa6/x73         <Private Use>
-+<UE6DA>     /xa6/x74         <Private Use>
-+<UE6DB>     /xa6/x75         <Private Use>
-+<UE6DC>     /xa6/x76         <Private Use>
-+<UE6DD>     /xa6/x77         <Private Use>
-+<UE6DE>     /xa6/x78         <Private Use>
-+<UE6DF>     /xa6/x79         <Private Use>
-+<UE6E0>     /xa6/x7a         <Private Use>
-+<UE6E1>     /xa6/x7b         <Private Use>
-+<UE6E2>     /xa6/x7c         <Private Use>
-+<UE6E3>     /xa6/x7d         <Private Use>
-+<UE6E4>     /xa6/x7e         <Private Use>
-+<UE6E5>     /xa6/x80         <Private Use>
-+<UE6E6>     /xa6/x81         <Private Use>
-+<UE6E7>     /xa6/x82         <Private Use>
-+<UE6E8>     /xa6/x83         <Private Use>
-+<UE6E9>     /xa6/x84         <Private Use>
-+<UE6EA>     /xa6/x85         <Private Use>
-+<UE6EB>     /xa6/x86         <Private Use>
-+<UE6EC>     /xa6/x87         <Private Use>
-+<UE6ED>     /xa6/x88         <Private Use>
-+<UE6EE>     /xa6/x89         <Private Use>
-+<UE6EF>     /xa6/x8a         <Private Use>
-+<UE6F0>     /xa6/x8b         <Private Use>
-+<UE6F1>     /xa6/x8c         <Private Use>
-+<UE6F2>     /xa6/x8d         <Private Use>
-+<UE6F3>     /xa6/x8e         <Private Use>
-+<UE6F4>     /xa6/x8f         <Private Use>
-+<UE6F5>     /xa6/x90         <Private Use>
-+<UE6F6>     /xa6/x91         <Private Use>
-+<UE6F7>     /xa6/x92         <Private Use>
-+<UE6F8>     /xa6/x93         <Private Use>
-+<UE6F9>     /xa6/x94         <Private Use>
-+<UE6FA>     /xa6/x95         <Private Use>
-+<UE6FB>     /xa6/x96         <Private Use>
-+<UE6FC>     /xa6/x97         <Private Use>
-+<UE6FD>     /xa6/x98         <Private Use>
-+<UE6FE>     /xa6/x99         <Private Use>
-+<UE6FF>     /xa6/x9a         <Private Use>
-+<UE700>     /xa6/x9b         <Private Use>
-+<UE701>     /xa6/x9c         <Private Use>
-+<UE702>     /xa6/x9d         <Private Use>
-+<UE703>     /xa6/x9e         <Private Use>
-+<UE704>     /xa6/x9f         <Private Use>
-+<UE705>     /xa6/xa0         <Private Use>
-+<UE706>     /xa7/x40         <Private Use>
-+<UE707>     /xa7/x41         <Private Use>
-+<UE708>     /xa7/x42         <Private Use>
-+<UE709>     /xa7/x43         <Private Use>
-+<UE70A>     /xa7/x44         <Private Use>
-+<UE70B>     /xa7/x45         <Private Use>
-+<UE70C>     /xa7/x46         <Private Use>
-+<UE70D>     /xa7/x47         <Private Use>
-+<UE70E>     /xa7/x48         <Private Use>
-+<UE70F>     /xa7/x49         <Private Use>
-+<UE710>     /xa7/x4a         <Private Use>
-+<UE711>     /xa7/x4b         <Private Use>
-+<UE712>     /xa7/x4c         <Private Use>
-+<UE713>     /xa7/x4d         <Private Use>
-+<UE714>     /xa7/x4e         <Private Use>
-+<UE715>     /xa7/x4f         <Private Use>
-+<UE716>     /xa7/x50         <Private Use>
-+<UE717>     /xa7/x51         <Private Use>
-+<UE718>     /xa7/x52         <Private Use>
-+<UE719>     /xa7/x53         <Private Use>
-+<UE71A>     /xa7/x54         <Private Use>
-+<UE71B>     /xa7/x55         <Private Use>
-+<UE71C>     /xa7/x56         <Private Use>
-+<UE71D>     /xa7/x57         <Private Use>
-+<UE71E>     /xa7/x58         <Private Use>
-+<UE71F>     /xa7/x59         <Private Use>
-+<UE720>     /xa7/x5a         <Private Use>
-+<UE721>     /xa7/x5b         <Private Use>
-+<UE722>     /xa7/x5c         <Private Use>
-+<UE723>     /xa7/x5d         <Private Use>
-+<UE724>     /xa7/x5e         <Private Use>
-+<UE725>     /xa7/x5f         <Private Use>
-+<UE726>     /xa7/x60         <Private Use>
-+<UE727>     /xa7/x61         <Private Use>
-+<UE728>     /xa7/x62         <Private Use>
-+<UE729>     /xa7/x63         <Private Use>
-+<UE72A>     /xa7/x64         <Private Use>
-+<UE72B>     /xa7/x65         <Private Use>
-+<UE72C>     /xa7/x66         <Private Use>
-+<UE72D>     /xa7/x67         <Private Use>
-+<UE72E>     /xa7/x68         <Private Use>
-+<UE72F>     /xa7/x69         <Private Use>
-+<UE730>     /xa7/x6a         <Private Use>
-+<UE731>     /xa7/x6b         <Private Use>
-+<UE732>     /xa7/x6c         <Private Use>
-+<UE733>     /xa7/x6d         <Private Use>
-+<UE734>     /xa7/x6e         <Private Use>
-+<UE735>     /xa7/x6f         <Private Use>
-+<UE736>     /xa7/x70         <Private Use>
-+<UE737>     /xa7/x71         <Private Use>
-+<UE738>     /xa7/x72         <Private Use>
-+<UE739>     /xa7/x73         <Private Use>
-+<UE73A>     /xa7/x74         <Private Use>
-+<UE73B>     /xa7/x75         <Private Use>
-+<UE73C>     /xa7/x76         <Private Use>
-+<UE73D>     /xa7/x77         <Private Use>
-+<UE73E>     /xa7/x78         <Private Use>
-+<UE73F>     /xa7/x79         <Private Use>
-+<UE740>     /xa7/x7a         <Private Use>
-+<UE741>     /xa7/x7b         <Private Use>
-+<UE742>     /xa7/x7c         <Private Use>
-+<UE743>     /xa7/x7d         <Private Use>
-+<UE744>     /xa7/x7e         <Private Use>
-+<UE745>     /xa7/x80         <Private Use>
-+<UE746>     /xa7/x81         <Private Use>
-+<UE747>     /xa7/x82         <Private Use>
-+<UE748>     /xa7/x83         <Private Use>
-+<UE749>     /xa7/x84         <Private Use>
-+<UE74A>     /xa7/x85         <Private Use>
-+<UE74B>     /xa7/x86         <Private Use>
-+<UE74C>     /xa7/x87         <Private Use>
-+<UE74D>     /xa7/x88         <Private Use>
-+<UE74E>     /xa7/x89         <Private Use>
-+<UE74F>     /xa7/x8a         <Private Use>
-+<UE750>     /xa7/x8b         <Private Use>
-+<UE751>     /xa7/x8c         <Private Use>
-+<UE752>     /xa7/x8d         <Private Use>
-+<UE753>     /xa7/x8e         <Private Use>
-+<UE754>     /xa7/x8f         <Private Use>
-+<UE755>     /xa7/x90         <Private Use>
-+<UE756>     /xa7/x91         <Private Use>
-+<UE757>     /xa7/x92         <Private Use>
-+<UE758>     /xa7/x93         <Private Use>
-+<UE759>     /xa7/x94         <Private Use>
-+<UE75A>     /xa7/x95         <Private Use>
-+<UE75B>     /xa7/x96         <Private Use>
-+<UE75C>     /xa7/x97         <Private Use>
-+<UE75D>     /xa7/x98         <Private Use>
-+<UE75E>     /xa7/x99         <Private Use>
-+<UE75F>     /xa7/x9a         <Private Use>
-+<UE760>     /xa7/x9b         <Private Use>
-+<UE761>     /xa7/x9c         <Private Use>
-+<UE762>     /xa7/x9d         <Private Use>
-+<UE763>     /xa7/x9e         <Private Use>
-+<UE764>     /xa7/x9f         <Private Use>
-+<UE765>     /xa7/xa0         <Private Use>
-+<UE766>     /xa2/xab         <Private Use>
-+<UE767>     /xa2/xac         <Private Use>
-+<UE768>     /xa2/xad         <Private Use>
-+<UE769>     /xa2/xae         <Private Use>
-+<UE76A>     /xa2/xaf         <Private Use>
-+<UE76B>     /xa2/xb0         <Private Use>
-+<UE76C>     /x83/x36/xc7/x39 <Private Use>
-+<UE76D>     /xa2/xe4         <Private Use>
-+<UE76E>     /xa2/xef         <Private Use>
-+<UE76F>     /xa2/xf0         <Private Use>
-+<UE770>     /xa2/xfd         <Private Use>
-+<UE771>     /xa2/xfe         <Private Use>
-+<UE772>     /xa4/xf4         <Private Use>
-+<UE773>     /xa4/xf5         <Private Use>
-+<UE774>     /xa4/xf6         <Private Use>
-+<UE775>     /xa4/xf7         <Private Use>
-+<UE776>     /xa4/xf8         <Private Use>
-+<UE777>     /xa4/xf9         <Private Use>
-+<UE778>     /xa4/xfa         <Private Use>
-+<UE779>     /xa4/xfb         <Private Use>
-+<UE77A>     /xa4/xfc         <Private Use>
-+<UE77B>     /xa4/xfd         <Private Use>
-+<UE77C>     /xa4/xfe         <Private Use>
-+<UE77D>     /xa5/xf7         <Private Use>
-+<UE77E>     /xa5/xf8         <Private Use>
-+<UE77F>     /xa5/xf9         <Private Use>
-+<UE780>     /xa5/xfa         <Private Use>
-+<UE781>     /xa5/xfb         <Private Use>
-+<UE782>     /xa5/xfc         <Private Use>
-+<UE783>     /xa5/xfd         <Private Use>
-+<UE784>     /xa5/xfe         <Private Use>
-+<UE785>     /xa6/xb9         <Private Use>
-+<UE786>     /xa6/xba         <Private Use>
-+<UE787>     /xa6/xbb         <Private Use>
-+<UE788>     /xa6/xbc         <Private Use>
-+<UE789>     /xa6/xbd         <Private Use>
-+<UE78A>     /xa6/xbe         <Private Use>
-+<UE78B>     /xa6/xbf         <Private Use>
-+<UE78C>     /xa6/xc0         <Private Use>
-+% <UE78D>     /xa6/xd9         <Private Use>
-+% <UE78E>     /xa6/xda         <Private Use>
-+% <UE78F>     /xa6/xdb         <Private Use>
-+% <UE790>     /xa6/xdc         <Private Use>
-+% <UE791>     /xa6/xdd         <Private Use>
-+% <UE792>     /xa6/xde         <Private Use>
-+% <UE793>     /xa6/xdf         <Private Use>
-+% <UE794>     /xa6/xec         <Private Use>
-+% <UE795>     /xa6/xed         <Private Use>
-+% <UE796>     /xa6/xf3         <Private Use>
-+<UE797>     /xa6/xf6         <Private Use>
-+<UE798>     /xa6/xf7         <Private Use>
-+<UE799>     /xa6/xf8         <Private Use>
-+<UE79A>     /xa6/xf9         <Private Use>
-+<UE79B>     /xa6/xfa         <Private Use>
-+<UE79C>     /xa6/xfb         <Private Use>
-+<UE79D>     /xa6/xfc         <Private Use>
-+<UE79E>     /xa6/xfd         <Private Use>
-+<UE79F>     /xa6/xfe         <Private Use>
-+<UE7A0>     /xa7/xc2         <Private Use>
-+<UE7A1>     /xa7/xc3         <Private Use>
-+<UE7A2>     /xa7/xc4         <Private Use>
-+<UE7A3>     /xa7/xc5         <Private Use>
-+<UE7A4>     /xa7/xc6         <Private Use>
-+<UE7A5>     /xa7/xc7         <Private Use>
-+<UE7A6>     /xa7/xc8         <Private Use>
-+<UE7A7>     /xa7/xc9         <Private Use>
-+<UE7A8>     /xa7/xca         <Private Use>
-+<UE7A9>     /xa7/xcb         <Private Use>
-+<UE7AA>     /xa7/xcc         <Private Use>
-+<UE7AB>     /xa7/xcd         <Private Use>
-+<UE7AC>     /xa7/xce         <Private Use>
-+<UE7AD>     /xa7/xcf         <Private Use>
-+<UE7AE>     /xa7/xd0         <Private Use>
-+<UE7AF>     /xa7/xf2         <Private Use>
-+<UE7B0>     /xa7/xf3         <Private Use>
-+<UE7B1>     /xa7/xf4         <Private Use>
-+<UE7B2>     /xa7/xf5         <Private Use>
-+<UE7B3>     /xa7/xf6         <Private Use>
-+<UE7B4>     /xa7/xf7         <Private Use>
-+<UE7B5>     /xa7/xf8         <Private Use>
-+<UE7B6>     /xa7/xf9         <Private Use>
-+<UE7B7>     /xa7/xfa         <Private Use>
-+<UE7B8>     /xa7/xfb         <Private Use>
-+<UE7B9>     /xa7/xfc         <Private Use>
-+<UE7BA>     /xa7/xfd         <Private Use>
-+<UE7BB>     /xa7/xfe         <Private Use>
-+<UE7BC>     /xa8/x96         <Private Use>
-+<UE7BD>     /xa8/x97         <Private Use>
-+<UE7BE>     /xa8/x98         <Private Use>
-+<UE7BF>     /xa8/x99         <Private Use>
-+<UE7C0>     /xa8/x9a         <Private Use>
-+<UE7C1>     /xa8/x9b         <Private Use>
-+<UE7C2>     /xa8/x9c         <Private Use>
-+<UE7C3>     /xa8/x9d         <Private Use>
-+<UE7C4>     /xa8/x9e         <Private Use>
-+<UE7C5>     /xa8/x9f         <Private Use>
-+<UE7C6>     /xa8/xa0         <Private Use>
-+<UE7C7>     /x81/x35/xf4/x37 <Private Use>
-+<UE7C8>     /x83/x36/xc8/x30 <Private Use>
-+<UE7C9>     /xa8/xc1         <Private Use>
-+<UE7CA>     /xa8/xc2         <Private Use>
-+<UE7CB>     /xa8/xc3         <Private Use>
-+<UE7CC>     /xa8/xc4         <Private Use>
-+<UE7CD>     /xa8/xea         <Private Use>
-+<UE7CE>     /xa8/xeb         <Private Use>
-+<UE7CF>     /xa8/xec         <Private Use>
-+<UE7D0>     /xa8/xed         <Private Use>
-+<UE7D1>     /xa8/xee         <Private Use>
-+<UE7D2>     /xa8/xef         <Private Use>
-+<UE7D3>     /xa8/xf0         <Private Use>
-+<UE7D4>     /xa8/xf1         <Private Use>
-+<UE7D5>     /xa8/xf2         <Private Use>
-+<UE7D6>     /xa8/xf3         <Private Use>
-+<UE7D7>     /xa8/xf4         <Private Use>
-+<UE7D8>     /xa8/xf5         <Private Use>
-+<UE7D9>     /xa8/xf6         <Private Use>
-+<UE7DA>     /xa8/xf7         <Private Use>
-+<UE7DB>     /xa8/xf8         <Private Use>
-+<UE7DC>     /xa8/xf9         <Private Use>
-+<UE7DD>     /xa8/xfa         <Private Use>
-+<UE7DE>     /xa8/xfb         <Private Use>
-+<UE7DF>     /xa8/xfc         <Private Use>
-+<UE7E0>     /xa8/xfd         <Private Use>
-+<UE7E1>     /xa8/xfe         <Private Use>
-+<UE7E2>     /xa9/x58         <Private Use>
-+<UE7E3>     /xa9/x5b         <Private Use>
-+<UE7E4>     /xa9/x5d         <Private Use>
-+<UE7E5>     /xa9/x5e         <Private Use>
-+<UE7E6>     /xa9/x5f         <Private Use>
-+<UE7E7>     /x83/x36/xc8/x31 <Private Use>
-+<UE7E8>     /x83/x36/xc8/x32 <Private Use>
-+<UE7E9>     /x83/x36/xc8/x33 <Private Use>
-+<UE7EA>     /x83/x36/xc8/x34 <Private Use>
-+<UE7EB>     /x83/x36/xc8/x35 <Private Use>
-+<UE7EC>     /x83/x36/xc8/x36 <Private Use>
-+<UE7ED>     /x83/x36/xc8/x37 <Private Use>
-+<UE7EE>     /x83/x36/xc8/x38 <Private Use>
-+<UE7EF>     /x83/x36/xc8/x39 <Private Use>
-+<UE7F0>     /x83/x36/xc9/x30 <Private Use>
-+<UE7F1>     /x83/x36/xc9/x31 <Private Use>
-+<UE7F2>     /x83/x36/xc9/x32 <Private Use>
-+<UE7F3>     /x83/x36/xc9/x33 <Private Use>
-+<UE7F4>     /xa9/x97         <Private Use>
-+<UE7F5>     /xa9/x98         <Private Use>
-+<UE7F6>     /xa9/x99         <Private Use>
-+<UE7F7>     /xa9/x9a         <Private Use>
-+<UE7F8>     /xa9/x9b         <Private Use>
-+<UE7F9>     /xa9/x9c         <Private Use>
-+<UE7FA>     /xa9/x9d         <Private Use>
-+<UE7FB>     /xa9/x9e         <Private Use>
-+<UE7FC>     /xa9/x9f         <Private Use>
-+<UE7FD>     /xa9/xa0         <Private Use>
-+<UE7FE>     /xa9/xa1         <Private Use>
-+<UE7FF>     /xa9/xa2         <Private Use>
-+<UE800>     /xa9/xa3         <Private Use>
-+<UE801>     /xa9/xf0         <Private Use>
-+<UE802>     /xa9/xf1         <Private Use>
-+<UE803>     /xa9/xf2         <Private Use>
-+<UE804>     /xa9/xf3         <Private Use>
-+<UE805>     /xa9/xf4         <Private Use>
-+<UE806>     /xa9/xf5         <Private Use>
-+<UE807>     /xa9/xf6         <Private Use>
-+<UE808>     /xa9/xf7         <Private Use>
-+<UE809>     /xa9/xf8         <Private Use>
-+<UE80A>     /xa9/xf9         <Private Use>
-+<UE80B>     /xa9/xfa         <Private Use>
-+<UE80C>     /xa9/xfb         <Private Use>
-+<UE80D>     /xa9/xfc         <Private Use>
-+<UE80E>     /xa9/xfd         <Private Use>
-+<UE80F>     /xa9/xfe         <Private Use>
-+<UE810>     /xd7/xfa         <Private Use>
-+<UE811>     /xd7/xfb         <Private Use>
-+<UE812>     /xd7/xfc         <Private Use>
-+<UE813>     /xd7/xfd         <Private Use>
-+<UE814>     /xd7/xfe         <Private Use>
-+<UE815>     /x83/x36/xc9/x34 <Private Use>
-+% <UE816>     /xfe/x51         <Private Use>
-+% <UE817>     /xfe/x52         <Private Use>
-+% <UE818>     /xfe/x53         <Private Use>
-+<UE819>     /x83/x36/xc9/x35 <Private Use>
-+<UE81A>     /x83/x36/xc9/x36 <Private Use>
-+<UE81B>     /x83/x36/xc9/x37 <Private Use>
-+<UE81C>     /x83/x36/xc9/x38 <Private Use>
-+<UE81D>     /x83/x36/xc9/x39 <Private Use>
-+% <UE81E>     /xfe/x59         <Private Use>
-+<UE81F>     /x83/x36/xca/x30 <Private Use>
-+<UE820>     /x83/x36/xca/x31 <Private Use>
-+<UE821>     /x83/x36/xca/x32 <Private Use>
-+<UE822>     /x83/x36/xca/x33 <Private Use>
-+<UE823>     /x83/x36/xca/x34 <Private Use>
-+<UE824>     /x83/x36/xca/x35 <Private Use>
-+<UE825>     /x83/x36/xca/x36 <Private Use>
-+% <UE826>     /xfe/x61         <Private Use>
-+<UE827>     /x83/x36/xca/x37 <Private Use>
-+<UE828>     /x83/x36/xca/x38 <Private Use>
-+<UE829>     /x83/x36/xca/x39 <Private Use>
-+<UE82A>     /x83/x36/xcb/x30 <Private Use>
-+% <UE82B>     /xfe/x66         <Private Use>
-+% <UE82C>     /xfe/x67         <Private Use>
-+<UE82D>     /x83/x36/xcb/x31 <Private Use>
-+<UE82E>     /x83/x36/xcb/x32 <Private Use>
-+<UE82F>     /x83/x36/xcb/x33 <Private Use>
-+<UE830>     /x83/x36/xcb/x34 <Private Use>
-+% <UE831>     /xfe/x6c         <Private Use>
-+% <UE832>     /xfe/x6d         <Private Use>
-+<UE833>     /x83/x36/xcb/x35 <Private Use>
-+<UE834>     /x83/x36/xcb/x36 <Private Use>
-+<UE835>     /x83/x36/xcb/x37 <Private Use>
-+<UE836>     /x83/x36/xcb/x38 <Private Use>
-+<UE837>     /x83/x36/xcb/x39 <Private Use>
-+<UE838>     /x83/x36/xcc/x30 <Private Use>
-+<UE839>     /x83/x36/xcc/x31 <Private Use>
-+<UE83A>     /x83/x36/xcc/x32 <Private Use>
-+% <UE83B>     /xfe/x76         <Private Use>
-+<UE83C>     /x83/x36/xcc/x33 <Private Use>
-+<UE83D>     /x83/x36/xcc/x34 <Private Use>
-+<UE83E>     /x83/x36/xcc/x35 <Private Use>
-+<UE83F>     /x83/x36/xcc/x36 <Private Use>
-+<UE840>     /x83/x36/xcc/x37 <Private Use>
-+<UE841>     /x83/x36/xcc/x38 <Private Use>
-+<UE842>     /x83/x36/xcc/x39 <Private Use>
-+% <UE843>     /xfe/x7e         <Private Use>
-+<UE844>     /x83/x36/xcd/x30 <Private Use>
-+<UE845>     /x83/x36/xcd/x31 <Private Use>
-+<UE846>     /x83/x36/xcd/x32 <Private Use>
-+<UE847>     /x83/x36/xcd/x33 <Private Use>
-+<UE848>     /x83/x36/xcd/x34 <Private Use>
-+<UE849>     /x83/x36/xcd/x35 <Private Use>
-+<UE84A>     /x83/x36/xcd/x36 <Private Use>
-+<UE84B>     /x83/x36/xcd/x37 <Private Use>
-+<UE84C>     /x83/x36/xcd/x38 <Private Use>
-+<UE84D>     /x83/x36/xcd/x39 <Private Use>
-+<UE84E>     /x83/x36/xce/x30 <Private Use>
-+<UE84F>     /x83/x36/xce/x31 <Private Use>
-+<UE850>     /x83/x36/xce/x32 <Private Use>
-+<UE851>     /x83/x36/xce/x33 <Private Use>
-+<UE852>     /x83/x36/xce/x34 <Private Use>
-+<UE853>     /x83/x36/xce/x35 <Private Use>
-+% <UE854>     /xfe/x90         <Private Use>
-+% <UE855>     /xfe/x91         <Private Use>
-+<UE856>     /x83/x36/xce/x36 <Private Use>
-+<UE857>     /x83/x36/xce/x37 <Private Use>
-+<UE858>     /x83/x36/xce/x38 <Private Use>
-+<UE859>     /x83/x36/xce/x39 <Private Use>
-+<UE85A>     /x83/x36/xcf/x30 <Private Use>
-+<UE85B>     /x83/x36/xcf/x31 <Private Use>
-+<UE85C>     /x83/x36/xcf/x32 <Private Use>
-+<UE85D>     /x83/x36/xcf/x33 <Private Use>
-+<UE85E>     /x83/x36/xcf/x34 <Private Use>
-+<UE85F>     /x83/x36/xcf/x35 <Private Use>
-+<UE860>     /x83/x36/xcf/x36 <Private Use>
-+<UE861>     /x83/x36/xcf/x37 <Private Use>
-+<UE862>     /x83/x36/xcf/x38 <Private Use>
-+<UE863>     /x83/x36/xcf/x39 <Private Use>
-+% <UE864>     /xfe/xa0         <Private Use>
-+<UE865>     /x83/x36/xd0/x30 <Private Use>
-+<UE866>     /x83/x36/xd0/x31 <Private Use>
-+<UE867>     /x83/x36/xd0/x32 <Private Use>
-+<UE868>     /x83/x36/xd0/x33 <Private Use>
-+<UE869>     /x83/x36/xd0/x34 <Private Use>
-+<UE86A>     /x83/x36/xd0/x35 <Private Use>
-+<UE86B>     /x83/x36/xd0/x36 <Private Use>
-+<UE86C>     /x83/x36/xd0/x37 <Private Use>
-+<UE86D>     /x83/x36/xd0/x38 <Private Use>
-+<UE86E>     /x83/x36/xd0/x39 <Private Use>
-+<UE86F>     /x83/x36/xd1/x30 <Private Use>
-+<UE870>     /x83/x36/xd1/x31 <Private Use>
-+<UE871>     /x83/x36/xd1/x32 <Private Use>
-+<UE872>     /x83/x36/xd1/x33 <Private Use>
-+<UE873>     /x83/x36/xd1/x34 <Private Use>
-+<UE874>     /x83/x36/xd1/x35 <Private Use>
-+<UE875>     /x83/x36/xd1/x36 <Private Use>
-+<UE876>     /x83/x36/xd1/x37 <Private Use>
-+<UE877>     /x83/x36/xd1/x38 <Private Use>
-+<UE878>     /x83/x36/xd1/x39 <Private Use>
-+<UE879>     /x83/x36/xd2/x30 <Private Use>
-+<UE87A>     /x83/x36/xd2/x31 <Private Use>
-+<UE87B>     /x83/x36/xd2/x32 <Private Use>
-+<UE87C>     /x83/x36/xd2/x33 <Private Use>
-+<UE87D>     /x83/x36/xd2/x34 <Private Use>
-+<UE87E>     /x83/x36/xd2/x35 <Private Use>
-+<UE87F>     /x83/x36/xd2/x36 <Private Use>
-+<UE880>     /x83/x36/xd2/x37 <Private Use>
-+<UE881>     /x83/x36/xd2/x38 <Private Use>
-+<UE882>     /x83/x36/xd2/x39 <Private Use>
-+<UE883>     /x83/x36/xd3/x30 <Private Use>
-+<UE884>     /x83/x36/xd3/x31 <Private Use>
-+<UE885>     /x83/x36/xd3/x32 <Private Use>
-+<UE886>     /x83/x36/xd3/x33 <Private Use>
-+<UE887>     /x83/x36/xd3/x34 <Private Use>
-+<UE888>     /x83/x36/xd3/x35 <Private Use>
-+<UE889>     /x83/x36/xd3/x36 <Private Use>
-+<UE88A>     /x83/x36/xd3/x37 <Private Use>
-+<UE88B>     /x83/x36/xd3/x38 <Private Use>
-+<UE88C>     /x83/x36/xd3/x39 <Private Use>
-+<UE88D>     /x83/x36/xd4/x30 <Private Use>
-+<UE88E>     /x83/x36/xd4/x31 <Private Use>
-+<UE88F>     /x83/x36/xd4/x32 <Private Use>
-+<UE890>     /x83/x36/xd4/x33 <Private Use>
-+<UE891>     /x83/x36/xd4/x34 <Private Use>
-+<UE892>     /x83/x36/xd4/x35 <Private Use>
-+<UE893>     /x83/x36/xd4/x36 <Private Use>
-+<UE894>     /x83/x36/xd4/x37 <Private Use>
-+<UE895>     /x83/x36/xd4/x38 <Private Use>
-+<UE896>     /x83/x36/xd4/x39 <Private Use>
-+<UE897>     /x83/x36/xd5/x30 <Private Use>
-+<UE898>     /x83/x36/xd5/x31 <Private Use>
-+<UE899>     /x83/x36/xd5/x32 <Private Use>
-+<UE89A>     /x83/x36/xd5/x33 <Private Use>
-+<UE89B>     /x83/x36/xd5/x34 <Private Use>
-+<UE89C>     /x83/x36/xd5/x35 <Private Use>
-+<UE89D>     /x83/x36/xd5/x36 <Private Use>
-+<UE89E>     /x83/x36/xd5/x37 <Private Use>
-+<UE89F>     /x83/x36/xd5/x38 <Private Use>
-+<UE8A0>     /x83/x36/xd5/x39 <Private Use>
-+<UE8A1>     /x83/x36/xd6/x30 <Private Use>
-+<UE8A2>     /x83/x36/xd6/x31 <Private Use>
-+<UE8A3>     /x83/x36/xd6/x32 <Private Use>
-+<UE8A4>     /x83/x36/xd6/x33 <Private Use>
-+<UE8A5>     /x83/x36/xd6/x34 <Private Use>
-+<UE8A6>     /x83/x36/xd6/x35 <Private Use>
-+<UE8A7>     /x83/x36/xd6/x36 <Private Use>
-+<UE8A8>     /x83/x36/xd6/x37 <Private Use>
-+<UE8A9>     /x83/x36/xd6/x38 <Private Use>
-+<UE8AA>     /x83/x36/xd6/x39 <Private Use>
-+<UE8AB>     /x83/x36/xd7/x30 <Private Use>
-+<UE8AC>     /x83/x36/xd7/x31 <Private Use>
-+<UE8AD>     /x83/x36/xd7/x32 <Private Use>
-+<UE8AE>     /x83/x36/xd7/x33 <Private Use>
-+<UE8AF>     /x83/x36/xd7/x34 <Private Use>
-+<UE8B0>     /x83/x36/xd7/x35 <Private Use>
-+<UE8B1>     /x83/x36/xd7/x36 <Private Use>
-+<UE8B2>     /x83/x36/xd7/x37 <Private Use>
-+<UE8B3>     /x83/x36/xd7/x38 <Private Use>
-+<UE8B4>     /x83/x36/xd7/x39 <Private Use>
-+<UE8B5>     /x83/x36/xd8/x30 <Private Use>
-+<UE8B6>     /x83/x36/xd8/x31 <Private Use>
-+<UE8B7>     /x83/x36/xd8/x32 <Private Use>
-+<UE8B8>     /x83/x36/xd8/x33 <Private Use>
-+<UE8B9>     /x83/x36/xd8/x34 <Private Use>
-+<UE8BA>     /x83/x36/xd8/x35 <Private Use>
-+<UE8BB>     /x83/x36/xd8/x36 <Private Use>
-+<UE8BC>     /x83/x36/xd8/x37 <Private Use>
-+<UE8BD>     /x83/x36/xd8/x38 <Private Use>
-+<UE8BE>     /x83/x36/xd8/x39 <Private Use>
-+<UE8BF>     /x83/x36/xd9/x30 <Private Use>
-+<UE8C0>     /x83/x36/xd9/x31 <Private Use>
-+<UE8C1>     /x83/x36/xd9/x32 <Private Use>
-+<UE8C2>     /x83/x36/xd9/x33 <Private Use>
-+<UE8C3>     /x83/x36/xd9/x34 <Private Use>
-+<UE8C4>     /x83/x36/xd9/x35 <Private Use>
-+<UE8C5>     /x83/x36/xd9/x36 <Private Use>
-+<UE8C6>     /x83/x36/xd9/x37 <Private Use>
-+<UE8C7>     /x83/x36/xd9/x38 <Private Use>
-+<UE8C8>     /x83/x36/xd9/x39 <Private Use>
-+<UE8C9>     /x83/x36/xda/x30 <Private Use>
-+<UE8CA>     /x83/x36/xda/x31 <Private Use>
-+<UE8CB>     /x83/x36/xda/x32 <Private Use>
-+<UE8CC>     /x83/x36/xda/x33 <Private Use>
-+<UE8CD>     /x83/x36/xda/x34 <Private Use>
-+<UE8CE>     /x83/x36/xda/x35 <Private Use>
-+<UE8CF>     /x83/x36/xda/x36 <Private Use>
-+<UE8D0>     /x83/x36/xda/x37 <Private Use>
-+<UE8D1>     /x83/x36/xda/x38 <Private Use>
-+<UE8D2>     /x83/x36/xda/x39 <Private Use>
-+<UE8D3>     /x83/x36/xdb/x30 <Private Use>
-+<UE8D4>     /x83/x36/xdb/x31 <Private Use>
-+<UE8D5>     /x83/x36/xdb/x32 <Private Use>
-+<UE8D6>     /x83/x36/xdb/x33 <Private Use>
-+<UE8D7>     /x83/x36/xdb/x34 <Private Use>
-+<UE8D8>     /x83/x36/xdb/x35 <Private Use>
-+<UE8D9>     /x83/x36/xdb/x36 <Private Use>
-+<UE8DA>     /x83/x36/xdb/x37 <Private Use>
-+<UE8DB>     /x83/x36/xdb/x38 <Private Use>
-+<UE8DC>     /x83/x36/xdb/x39 <Private Use>
-+<UE8DD>     /x83/x36/xdc/x30 <Private Use>
-+<UE8DE>     /x83/x36/xdc/x31 <Private Use>
-+<UE8DF>     /x83/x36/xdc/x32 <Private Use>
-+<UE8E0>     /x83/x36/xdc/x33 <Private Use>
-+<UE8E1>     /x83/x36/xdc/x34 <Private Use>
-+<UE8E2>     /x83/x36/xdc/x35 <Private Use>
-+<UE8E3>     /x83/x36/xdc/x36 <Private Use>
-+<UE8E4>     /x83/x36/xdc/x37 <Private Use>
-+<UE8E5>     /x83/x36/xdc/x38 <Private Use>
-+<UE8E6>     /x83/x36/xdc/x39 <Private Use>
-+<UE8E7>     /x83/x36/xdd/x30 <Private Use>
-+<UE8E8>     /x83/x36/xdd/x31 <Private Use>
-+<UE8E9>     /x83/x36/xdd/x32 <Private Use>
-+<UE8EA>     /x83/x36/xdd/x33 <Private Use>
-+<UE8EB>     /x83/x36/xdd/x34 <Private Use>
-+<UE8EC>     /x83/x36/xdd/x35 <Private Use>
-+<UE8ED>     /x83/x36/xdd/x36 <Private Use>
-+<UE8EE>     /x83/x36/xdd/x37 <Private Use>
-+<UE8EF>     /x83/x36/xdd/x38 <Private Use>
-+<UE8F0>     /x83/x36/xdd/x39 <Private Use>
-+<UE8F1>     /x83/x36/xde/x30 <Private Use>
-+<UE8F2>     /x83/x36/xde/x31 <Private Use>
-+<UE8F3>     /x83/x36/xde/x32 <Private Use>
-+<UE8F4>     /x83/x36/xde/x33 <Private Use>
-+<UE8F5>     /x83/x36/xde/x34 <Private Use>
-+<UE8F6>     /x83/x36/xde/x35 <Private Use>
-+<UE8F7>     /x83/x36/xde/x36 <Private Use>
-+<UE8F8>     /x83/x36/xde/x37 <Private Use>
-+<UE8F9>     /x83/x36/xde/x38 <Private Use>
-+<UE8FA>     /x83/x36/xde/x39 <Private Use>
-+<UE8FB>     /x83/x36/xdf/x30 <Private Use>
-+<UE8FC>     /x83/x36/xdf/x31 <Private Use>
-+<UE8FD>     /x83/x36/xdf/x32 <Private Use>
-+<UE8FE>     /x83/x36/xdf/x33 <Private Use>
-+<UE8FF>     /x83/x36/xdf/x34 <Private Use>
-+<UE900>     /x83/x36/xdf/x35 <Private Use>
-+<UE901>     /x83/x36/xdf/x36 <Private Use>
-+<UE902>     /x83/x36/xdf/x37 <Private Use>
-+<UE903>     /x83/x36/xdf/x38 <Private Use>
-+<UE904>     /x83/x36/xdf/x39 <Private Use>
-+<UE905>     /x83/x36/xe0/x30 <Private Use>
-+<UE906>     /x83/x36/xe0/x31 <Private Use>
-+<UE907>     /x83/x36/xe0/x32 <Private Use>
-+<UE908>     /x83/x36/xe0/x33 <Private Use>
-+<UE909>     /x83/x36/xe0/x34 <Private Use>
-+<UE90A>     /x83/x36/xe0/x35 <Private Use>
-+<UE90B>     /x83/x36/xe0/x36 <Private Use>
-+<UE90C>     /x83/x36/xe0/x37 <Private Use>
-+<UE90D>     /x83/x36/xe0/x38 <Private Use>
-+<UE90E>     /x83/x36/xe0/x39 <Private Use>
-+<UE90F>     /x83/x36/xe1/x30 <Private Use>
-+<UE910>     /x83/x36/xe1/x31 <Private Use>
-+<UE911>     /x83/x36/xe1/x32 <Private Use>
-+<UE912>     /x83/x36/xe1/x33 <Private Use>
-+<UE913>     /x83/x36/xe1/x34 <Private Use>
-+<UE914>     /x83/x36/xe1/x35 <Private Use>
-+<UE915>     /x83/x36/xe1/x36 <Private Use>
-+<UE916>     /x83/x36/xe1/x37 <Private Use>
-+<UE917>     /x83/x36/xe1/x38 <Private Use>
-+<UE918>     /x83/x36/xe1/x39 <Private Use>
-+<UE919>     /x83/x36/xe2/x30 <Private Use>
-+<UE91A>     /x83/x36/xe2/x31 <Private Use>
-+<UE91B>     /x83/x36/xe2/x32 <Private Use>
-+<UE91C>     /x83/x36/xe2/x33 <Private Use>
-+<UE91D>     /x83/x36/xe2/x34 <Private Use>
-+<UE91E>     /x83/x36/xe2/x35 <Private Use>
-+<UE91F>     /x83/x36/xe2/x36 <Private Use>
-+<UE920>     /x83/x36/xe2/x37 <Private Use>
-+<UE921>     /x83/x36/xe2/x38 <Private Use>
-+<UE922>     /x83/x36/xe2/x39 <Private Use>
-+<UE923>     /x83/x36/xe3/x30 <Private Use>
-+<UE924>     /x83/x36/xe3/x31 <Private Use>
-+<UE925>     /x83/x36/xe3/x32 <Private Use>
-+<UE926>     /x83/x36/xe3/x33 <Private Use>
-+<UE927>     /x83/x36/xe3/x34 <Private Use>
-+<UE928>     /x83/x36/xe3/x35 <Private Use>
-+<UE929>     /x83/x36/xe3/x36 <Private Use>
-+<UE92A>     /x83/x36/xe3/x37 <Private Use>
-+<UE92B>     /x83/x36/xe3/x38 <Private Use>
-+<UE92C>     /x83/x36/xe3/x39 <Private Use>
-+<UE92D>     /x83/x36/xe4/x30 <Private Use>
-+<UE92E>     /x83/x36/xe4/x31 <Private Use>
-+<UE92F>     /x83/x36/xe4/x32 <Private Use>
-+<UE930>     /x83/x36/xe4/x33 <Private Use>
-+<UE931>     /x83/x36/xe4/x34 <Private Use>
-+<UE932>     /x83/x36/xe4/x35 <Private Use>
-+<UE933>     /x83/x36/xe4/x36 <Private Use>
-+<UE934>     /x83/x36/xe4/x37 <Private Use>
-+<UE935>     /x83/x36/xe4/x38 <Private Use>
-+<UE936>     /x83/x36/xe4/x39 <Private Use>
-+<UE937>     /x83/x36/xe5/x30 <Private Use>
-+<UE938>     /x83/x36/xe5/x31 <Private Use>
-+<UE939>     /x83/x36/xe5/x32 <Private Use>
-+<UE93A>     /x83/x36/xe5/x33 <Private Use>
-+<UE93B>     /x83/x36/xe5/x34 <Private Use>
-+<UE93C>     /x83/x36/xe5/x35 <Private Use>
-+<UE93D>     /x83/x36/xe5/x36 <Private Use>
-+<UE93E>     /x83/x36/xe5/x37 <Private Use>
-+<UE93F>     /x83/x36/xe5/x38 <Private Use>
-+<UE940>     /x83/x36/xe5/x39 <Private Use>
-+<UE941>     /x83/x36/xe6/x30 <Private Use>
-+<UE942>     /x83/x36/xe6/x31 <Private Use>
-+<UE943>     /x83/x36/xe6/x32 <Private Use>
-+<UE944>     /x83/x36/xe6/x33 <Private Use>
-+<UE945>     /x83/x36/xe6/x34 <Private Use>
-+<UE946>     /x83/x36/xe6/x35 <Private Use>
-+<UE947>     /x83/x36/xe6/x36 <Private Use>
-+<UE948>     /x83/x36/xe6/x37 <Private Use>
-+<UE949>     /x83/x36/xe6/x38 <Private Use>
-+<UE94A>     /x83/x36/xe6/x39 <Private Use>
-+<UE94B>     /x83/x36/xe7/x30 <Private Use>
-+<UE94C>     /x83/x36/xe7/x31 <Private Use>
-+<UE94D>     /x83/x36/xe7/x32 <Private Use>
-+<UE94E>     /x83/x36/xe7/x33 <Private Use>
-+<UE94F>     /x83/x36/xe7/x34 <Private Use>
-+<UE950>     /x83/x36/xe7/x35 <Private Use>
-+<UE951>     /x83/x36/xe7/x36 <Private Use>
-+<UE952>     /x83/x36/xe7/x37 <Private Use>
-+<UE953>     /x83/x36/xe7/x38 <Private Use>
-+<UE954>     /x83/x36/xe7/x39 <Private Use>
-+<UE955>     /x83/x36/xe8/x30 <Private Use>
-+<UE956>     /x83/x36/xe8/x31 <Private Use>
-+<UE957>     /x83/x36/xe8/x32 <Private Use>
-+<UE958>     /x83/x36/xe8/x33 <Private Use>
-+<UE959>     /x83/x36/xe8/x34 <Private Use>
-+<UE95A>     /x83/x36/xe8/x35 <Private Use>
-+<UE95B>     /x83/x36/xe8/x36 <Private Use>
-+<UE95C>     /x83/x36/xe8/x37 <Private Use>
-+<UE95D>     /x83/x36/xe8/x38 <Private Use>
-+<UE95E>     /x83/x36/xe8/x39 <Private Use>
-+<UE95F>     /x83/x36/xe9/x30 <Private Use>
-+<UE960>     /x83/x36/xe9/x31 <Private Use>
-+<UE961>     /x83/x36/xe9/x32 <Private Use>
-+<UE962>     /x83/x36/xe9/x33 <Private Use>
-+<UE963>     /x83/x36/xe9/x34 <Private Use>
-+<UE964>     /x83/x36/xe9/x35 <Private Use>
-+<UE965>     /x83/x36/xe9/x36 <Private Use>
-+<UE966>     /x83/x36/xe9/x37 <Private Use>
-+<UE967>     /x83/x36/xe9/x38 <Private Use>
-+<UE968>     /x83/x36/xe9/x39 <Private Use>
-+<UE969>     /x83/x36/xea/x30 <Private Use>
-+<UE96A>     /x83/x36/xea/x31 <Private Use>
-+<UE96B>     /x83/x36/xea/x32 <Private Use>
-+<UE96C>     /x83/x36/xea/x33 <Private Use>
-+<UE96D>     /x83/x36/xea/x34 <Private Use>
-+<UE96E>     /x83/x36/xea/x35 <Private Use>
-+<UE96F>     /x83/x36/xea/x36 <Private Use>
-+<UE970>     /x83/x36/xea/x37 <Private Use>
-+<UE971>     /x83/x36/xea/x38 <Private Use>
-+<UE972>     /x83/x36/xea/x39 <Private Use>
-+<UE973>     /x83/x36/xeb/x30 <Private Use>
-+<UE974>     /x83/x36/xeb/x31 <Private Use>
-+<UE975>     /x83/x36/xeb/x32 <Private Use>
-+<UE976>     /x83/x36/xeb/x33 <Private Use>
-+<UE977>     /x83/x36/xeb/x34 <Private Use>
-+<UE978>     /x83/x36/xeb/x35 <Private Use>
-+<UE979>     /x83/x36/xeb/x36 <Private Use>
-+<UE97A>     /x83/x36/xeb/x37 <Private Use>
-+<UE97B>     /x83/x36/xeb/x38 <Private Use>
-+<UE97C>     /x83/x36/xeb/x39 <Private Use>
-+<UE97D>     /x83/x36/xec/x30 <Private Use>
-+<UE97E>     /x83/x36/xec/x31 <Private Use>
-+<UE97F>     /x83/x36/xec/x32 <Private Use>
-+<UE980>     /x83/x36/xec/x33 <Private Use>
-+<UE981>     /x83/x36/xec/x34 <Private Use>
-+<UE982>     /x83/x36/xec/x35 <Private Use>
-+<UE983>     /x83/x36/xec/x36 <Private Use>
-+<UE984>     /x83/x36/xec/x37 <Private Use>
-+<UE985>     /x83/x36/xec/x38 <Private Use>
-+<UE986>     /x83/x36/xec/x39 <Private Use>
-+<UE987>     /x83/x36/xed/x30 <Private Use>
-+<UE988>     /x83/x36/xed/x31 <Private Use>
-+<UE989>     /x83/x36/xed/x32 <Private Use>
-+<UE98A>     /x83/x36/xed/x33 <Private Use>
-+<UE98B>     /x83/x36/xed/x34 <Private Use>
-+<UE98C>     /x83/x36/xed/x35 <Private Use>
-+<UE98D>     /x83/x36/xed/x36 <Private Use>
-+<UE98E>     /x83/x36/xed/x37 <Private Use>
-+<UE98F>     /x83/x36/xed/x38 <Private Use>
-+<UE990>     /x83/x36/xed/x39 <Private Use>
-+<UE991>     /x83/x36/xee/x30 <Private Use>
-+<UE992>     /x83/x36/xee/x31 <Private Use>
-+<UE993>     /x83/x36/xee/x32 <Private Use>
-+<UE994>     /x83/x36/xee/x33 <Private Use>
-+<UE995>     /x83/x36/xee/x34 <Private Use>
-+<UE996>     /x83/x36/xee/x35 <Private Use>
-+<UE997>     /x83/x36/xee/x36 <Private Use>
-+<UE998>     /x83/x36/xee/x37 <Private Use>
-+<UE999>     /x83/x36/xee/x38 <Private Use>
-+<UE99A>     /x83/x36/xee/x39 <Private Use>
-+<UE99B>     /x83/x36/xef/x30 <Private Use>
-+<UE99C>     /x83/x36/xef/x31 <Private Use>
-+<UE99D>     /x83/x36/xef/x32 <Private Use>
-+<UE99E>     /x83/x36/xef/x33 <Private Use>
-+<UE99F>     /x83/x36/xef/x34 <Private Use>
-+<UE9A0>     /x83/x36/xef/x35 <Private Use>
-+<UE9A1>     /x83/x36/xef/x36 <Private Use>
-+<UE9A2>     /x83/x36/xef/x37 <Private Use>
-+<UE9A3>     /x83/x36/xef/x38 <Private Use>
-+<UE9A4>     /x83/x36/xef/x39 <Private Use>
-+<UE9A5>     /x83/x36/xf0/x30 <Private Use>
-+<UE9A6>     /x83/x36/xf0/x31 <Private Use>
-+<UE9A7>     /x83/x36/xf0/x32 <Private Use>
-+<UE9A8>     /x83/x36/xf0/x33 <Private Use>
-+<UE9A9>     /x83/x36/xf0/x34 <Private Use>
-+<UE9AA>     /x83/x36/xf0/x35 <Private Use>
-+<UE9AB>     /x83/x36/xf0/x36 <Private Use>
-+<UE9AC>     /x83/x36/xf0/x37 <Private Use>
-+<UE9AD>     /x83/x36/xf0/x38 <Private Use>
-+<UE9AE>     /x83/x36/xf0/x39 <Private Use>
-+<UE9AF>     /x83/x36/xf1/x30 <Private Use>
-+<UE9B0>     /x83/x36/xf1/x31 <Private Use>
-+<UE9B1>     /x83/x36/xf1/x32 <Private Use>
-+<UE9B2>     /x83/x36/xf1/x33 <Private Use>
-+<UE9B3>     /x83/x36/xf1/x34 <Private Use>
-+<UE9B4>     /x83/x36/xf1/x35 <Private Use>
-+<UE9B5>     /x83/x36/xf1/x36 <Private Use>
-+<UE9B6>     /x83/x36/xf1/x37 <Private Use>
-+<UE9B7>     /x83/x36/xf1/x38 <Private Use>
-+<UE9B8>     /x83/x36/xf1/x39 <Private Use>
-+<UE9B9>     /x83/x36/xf2/x30 <Private Use>
-+<UE9BA>     /x83/x36/xf2/x31 <Private Use>
-+<UE9BB>     /x83/x36/xf2/x32 <Private Use>
-+<UE9BC>     /x83/x36/xf2/x33 <Private Use>
-+<UE9BD>     /x83/x36/xf2/x34 <Private Use>
-+<UE9BE>     /x83/x36/xf2/x35 <Private Use>
-+<UE9BF>     /x83/x36/xf2/x36 <Private Use>
-+<UE9C0>     /x83/x36/xf2/x37 <Private Use>
-+<UE9C1>     /x83/x36/xf2/x38 <Private Use>
-+<UE9C2>     /x83/x36/xf2/x39 <Private Use>
-+<UE9C3>     /x83/x36/xf3/x30 <Private Use>
-+<UE9C4>     /x83/x36/xf3/x31 <Private Use>
-+<UE9C5>     /x83/x36/xf3/x32 <Private Use>
-+<UE9C6>     /x83/x36/xf3/x33 <Private Use>
-+<UE9C7>     /x83/x36/xf3/x34 <Private Use>
-+<UE9C8>     /x83/x36/xf3/x35 <Private Use>
-+<UE9C9>     /x83/x36/xf3/x36 <Private Use>
-+<UE9CA>     /x83/x36/xf3/x37 <Private Use>
-+<UE9CB>     /x83/x36/xf3/x38 <Private Use>
-+<UE9CC>     /x83/x36/xf3/x39 <Private Use>
-+<UE9CD>     /x83/x36/xf4/x30 <Private Use>
-+<UE9CE>     /x83/x36/xf4/x31 <Private Use>
-+<UE9CF>     /x83/x36/xf4/x32 <Private Use>
-+<UE9D0>     /x83/x36/xf4/x33 <Private Use>
-+<UE9D1>     /x83/x36/xf4/x34 <Private Use>
-+<UE9D2>     /x83/x36/xf4/x35 <Private Use>
-+<UE9D3>     /x83/x36/xf4/x36 <Private Use>
-+<UE9D4>     /x83/x36/xf4/x37 <Private Use>
-+<UE9D5>     /x83/x36/xf4/x38 <Private Use>
-+<UE9D6>     /x83/x36/xf4/x39 <Private Use>
-+<UE9D7>     /x83/x36/xf5/x30 <Private Use>
-+<UE9D8>     /x83/x36/xf5/x31 <Private Use>
-+<UE9D9>     /x83/x36/xf5/x32 <Private Use>
-+<UE9DA>     /x83/x36/xf5/x33 <Private Use>
-+<UE9DB>     /x83/x36/xf5/x34 <Private Use>
-+<UE9DC>     /x83/x36/xf5/x35 <Private Use>
-+<UE9DD>     /x83/x36/xf5/x36 <Private Use>
-+<UE9DE>     /x83/x36/xf5/x37 <Private Use>
-+<UE9DF>     /x83/x36/xf5/x38 <Private Use>
-+<UE9E0>     /x83/x36/xf5/x39 <Private Use>
-+<UE9E1>     /x83/x36/xf6/x30 <Private Use>
-+<UE9E2>     /x83/x36/xf6/x31 <Private Use>
-+<UE9E3>     /x83/x36/xf6/x32 <Private Use>
-+<UE9E4>     /x83/x36/xf6/x33 <Private Use>
-+<UE9E5>     /x83/x36/xf6/x34 <Private Use>
-+<UE9E6>     /x83/x36/xf6/x35 <Private Use>
-+<UE9E7>     /x83/x36/xf6/x36 <Private Use>
-+<UE9E8>     /x83/x36/xf6/x37 <Private Use>
-+<UE9E9>     /x83/x36/xf6/x38 <Private Use>
-+<UE9EA>     /x83/x36/xf6/x39 <Private Use>
-+<UE9EB>     /x83/x36/xf7/x30 <Private Use>
-+<UE9EC>     /x83/x36/xf7/x31 <Private Use>
-+<UE9ED>     /x83/x36/xf7/x32 <Private Use>
-+<UE9EE>     /x83/x36/xf7/x33 <Private Use>
-+<UE9EF>     /x83/x36/xf7/x34 <Private Use>
-+<UE9F0>     /x83/x36/xf7/x35 <Private Use>
-+<UE9F1>     /x83/x36/xf7/x36 <Private Use>
-+<UE9F2>     /x83/x36/xf7/x37 <Private Use>
-+<UE9F3>     /x83/x36/xf7/x38 <Private Use>
-+<UE9F4>     /x83/x36/xf7/x39 <Private Use>
-+<UE9F5>     /x83/x36/xf8/x30 <Private Use>
-+<UE9F6>     /x83/x36/xf8/x31 <Private Use>
-+<UE9F7>     /x83/x36/xf8/x32 <Private Use>
-+<UE9F8>     /x83/x36/xf8/x33 <Private Use>
-+<UE9F9>     /x83/x36/xf8/x34 <Private Use>
-+<UE9FA>     /x83/x36/xf8/x35 <Private Use>
-+<UE9FB>     /x83/x36/xf8/x36 <Private Use>
-+<UE9FC>     /x83/x36/xf8/x37 <Private Use>
-+<UE9FD>     /x83/x36/xf8/x38 <Private Use>
-+<UE9FE>     /x83/x36/xf8/x39 <Private Use>
-+<UE9FF>     /x83/x36/xf9/x30 <Private Use>
-+<UEA00>     /x83/x36/xf9/x31 <Private Use>
-+<UEA01>     /x83/x36/xf9/x32 <Private Use>
-+<UEA02>     /x83/x36/xf9/x33 <Private Use>
-+<UEA03>     /x83/x36/xf9/x34 <Private Use>
-+<UEA04>     /x83/x36/xf9/x35 <Private Use>
-+<UEA05>     /x83/x36/xf9/x36 <Private Use>
-+<UEA06>     /x83/x36/xf9/x37 <Private Use>
-+<UEA07>     /x83/x36/xf9/x38 <Private Use>
-+<UEA08>     /x83/x36/xf9/x39 <Private Use>
-+<UEA09>     /x83/x36/xfa/x30 <Private Use>
-+<UEA0A>     /x83/x36/xfa/x31 <Private Use>
-+<UEA0B>     /x83/x36/xfa/x32 <Private Use>
-+<UEA0C>     /x83/x36/xfa/x33 <Private Use>
-+<UEA0D>     /x83/x36/xfa/x34 <Private Use>
-+<UEA0E>     /x83/x36/xfa/x35 <Private Use>
-+<UEA0F>     /x83/x36/xfa/x36 <Private Use>
-+<UEA10>     /x83/x36/xfa/x37 <Private Use>
-+<UEA11>     /x83/x36/xfa/x38 <Private Use>
-+<UEA12>     /x83/x36/xfa/x39 <Private Use>
-+<UEA13>     /x83/x36/xfb/x30 <Private Use>
-+<UEA14>     /x83/x36/xfb/x31 <Private Use>
-+<UEA15>     /x83/x36/xfb/x32 <Private Use>
-+<UEA16>     /x83/x36/xfb/x33 <Private Use>
-+<UEA17>     /x83/x36/xfb/x34 <Private Use>
-+<UEA18>     /x83/x36/xfb/x35 <Private Use>
-+<UEA19>     /x83/x36/xfb/x36 <Private Use>
-+<UEA1A>     /x83/x36/xfb/x37 <Private Use>
-+<UEA1B>     /x83/x36/xfb/x38 <Private Use>
-+<UEA1C>     /x83/x36/xfb/x39 <Private Use>
-+<UEA1D>     /x83/x36/xfc/x30 <Private Use>
-+<UEA1E>     /x83/x36/xfc/x31 <Private Use>
-+<UEA1F>     /x83/x36/xfc/x32 <Private Use>
-+<UEA20>     /x83/x36/xfc/x33 <Private Use>
-+<UEA21>     /x83/x36/xfc/x34 <Private Use>
-+<UEA22>     /x83/x36/xfc/x35 <Private Use>
-+<UEA23>     /x83/x36/xfc/x36 <Private Use>
-+<UEA24>     /x83/x36/xfc/x37 <Private Use>
-+<UEA25>     /x83/x36/xfc/x38 <Private Use>
-+<UEA26>     /x83/x36/xfc/x39 <Private Use>
-+<UEA27>     /x83/x36/xfd/x30 <Private Use>
-+<UEA28>     /x83/x36/xfd/x31 <Private Use>
-+<UEA29>     /x83/x36/xfd/x32 <Private Use>
-+<UEA2A>     /x83/x36/xfd/x33 <Private Use>
-+<UEA2B>     /x83/x36/xfd/x34 <Private Use>
-+<UEA2C>     /x83/x36/xfd/x35 <Private Use>
-+<UEA2D>     /x83/x36/xfd/x36 <Private Use>
-+<UEA2E>     /x83/x36/xfd/x37 <Private Use>
-+<UEA2F>     /x83/x36/xfd/x38 <Private Use>
-+<UEA30>     /x83/x36/xfd/x39 <Private Use>
-+<UEA31>     /x83/x36/xfe/x30 <Private Use>
-+<UEA32>     /x83/x36/xfe/x31 <Private Use>
-+<UEA33>     /x83/x36/xfe/x32 <Private Use>
-+<UEA34>     /x83/x36/xfe/x33 <Private Use>
-+<UEA35>     /x83/x36/xfe/x34 <Private Use>
-+<UEA36>     /x83/x36/xfe/x35 <Private Use>
-+<UEA37>     /x83/x36/xfe/x36 <Private Use>
-+<UEA38>     /x83/x36/xfe/x37 <Private Use>
-+<UEA39>     /x83/x36/xfe/x38 <Private Use>
-+<UEA3A>     /x83/x36/xfe/x39 <Private Use>
-+<UEA3B>     /x83/x37/x81/x30 <Private Use>
-+<UEA3C>     /x83/x37/x81/x31 <Private Use>
-+<UEA3D>     /x83/x37/x81/x32 <Private Use>
-+<UEA3E>     /x83/x37/x81/x33 <Private Use>
-+<UEA3F>     /x83/x37/x81/x34 <Private Use>
-+<UEA40>     /x83/x37/x81/x35 <Private Use>
-+<UEA41>     /x83/x37/x81/x36 <Private Use>
-+<UEA42>     /x83/x37/x81/x37 <Private Use>
-+<UEA43>     /x83/x37/x81/x38 <Private Use>
-+<UEA44>     /x83/x37/x81/x39 <Private Use>
-+<UEA45>     /x83/x37/x82/x30 <Private Use>
-+<UEA46>     /x83/x37/x82/x31 <Private Use>
-+<UEA47>     /x83/x37/x82/x32 <Private Use>
-+<UEA48>     /x83/x37/x82/x33 <Private Use>
-+<UEA49>     /x83/x37/x82/x34 <Private Use>
-+<UEA4A>     /x83/x37/x82/x35 <Private Use>
-+<UEA4B>     /x83/x37/x82/x36 <Private Use>
-+<UEA4C>     /x83/x37/x82/x37 <Private Use>
-+<UEA4D>     /x83/x37/x82/x38 <Private Use>
-+<UEA4E>     /x83/x37/x82/x39 <Private Use>
-+<UEA4F>     /x83/x37/x83/x30 <Private Use>
-+<UEA50>     /x83/x37/x83/x31 <Private Use>
-+<UEA51>     /x83/x37/x83/x32 <Private Use>
-+<UEA52>     /x83/x37/x83/x33 <Private Use>
-+<UEA53>     /x83/x37/x83/x34 <Private Use>
-+<UEA54>     /x83/x37/x83/x35 <Private Use>
-+<UEA55>     /x83/x37/x83/x36 <Private Use>
-+<UEA56>     /x83/x37/x83/x37 <Private Use>
-+<UEA57>     /x83/x37/x83/x38 <Private Use>
-+<UEA58>     /x83/x37/x83/x39 <Private Use>
-+<UEA59>     /x83/x37/x84/x30 <Private Use>
-+<UEA5A>     /x83/x37/x84/x31 <Private Use>
-+<UEA5B>     /x83/x37/x84/x32 <Private Use>
-+<UEA5C>     /x83/x37/x84/x33 <Private Use>
-+<UEA5D>     /x83/x37/x84/x34 <Private Use>
-+<UEA5E>     /x83/x37/x84/x35 <Private Use>
-+<UEA5F>     /x83/x37/x84/x36 <Private Use>
-+<UEA60>     /x83/x37/x84/x37 <Private Use>
-+<UEA61>     /x83/x37/x84/x38 <Private Use>
-+<UEA62>     /x83/x37/x84/x39 <Private Use>
-+<UEA63>     /x83/x37/x85/x30 <Private Use>
-+<UEA64>     /x83/x37/x85/x31 <Private Use>
-+<UEA65>     /x83/x37/x85/x32 <Private Use>
-+<UEA66>     /x83/x37/x85/x33 <Private Use>
-+<UEA67>     /x83/x37/x85/x34 <Private Use>
-+<UEA68>     /x83/x37/x85/x35 <Private Use>
-+<UEA69>     /x83/x37/x85/x36 <Private Use>
-+<UEA6A>     /x83/x37/x85/x37 <Private Use>
-+<UEA6B>     /x83/x37/x85/x38 <Private Use>
-+<UEA6C>     /x83/x37/x85/x39 <Private Use>
-+<UEA6D>     /x83/x37/x86/x30 <Private Use>
-+<UEA6E>     /x83/x37/x86/x31 <Private Use>
-+<UEA6F>     /x83/x37/x86/x32 <Private Use>
-+<UEA70>     /x83/x37/x86/x33 <Private Use>
-+<UEA71>     /x83/x37/x86/x34 <Private Use>
-+<UEA72>     /x83/x37/x86/x35 <Private Use>
-+<UEA73>     /x83/x37/x86/x36 <Private Use>
-+<UEA74>     /x83/x37/x86/x37 <Private Use>
-+<UEA75>     /x83/x37/x86/x38 <Private Use>
-+<UEA76>     /x83/x37/x86/x39 <Private Use>
-+<UEA77>     /x83/x37/x87/x30 <Private Use>
-+<UEA78>     /x83/x37/x87/x31 <Private Use>
-+<UEA79>     /x83/x37/x87/x32 <Private Use>
-+<UEA7A>     /x83/x37/x87/x33 <Private Use>
-+<UEA7B>     /x83/x37/x87/x34 <Private Use>
-+<UEA7C>     /x83/x37/x87/x35 <Private Use>
-+<UEA7D>     /x83/x37/x87/x36 <Private Use>
-+<UEA7E>     /x83/x37/x87/x37 <Private Use>
-+<UEA7F>     /x83/x37/x87/x38 <Private Use>
-+<UEA80>     /x83/x37/x87/x39 <Private Use>
-+<UEA81>     /x83/x37/x88/x30 <Private Use>
-+<UEA82>     /x83/x37/x88/x31 <Private Use>
-+<UEA83>     /x83/x37/x88/x32 <Private Use>
-+<UEA84>     /x83/x37/x88/x33 <Private Use>
-+<UEA85>     /x83/x37/x88/x34 <Private Use>
-+<UEA86>     /x83/x37/x88/x35 <Private Use>
-+<UEA87>     /x83/x37/x88/x36 <Private Use>
-+<UEA88>     /x83/x37/x88/x37 <Private Use>
-+<UEA89>     /x83/x37/x88/x38 <Private Use>
-+<UEA8A>     /x83/x37/x88/x39 <Private Use>
-+<UEA8B>     /x83/x37/x89/x30 <Private Use>
-+<UEA8C>     /x83/x37/x89/x31 <Private Use>
-+<UEA8D>     /x83/x37/x89/x32 <Private Use>
-+<UEA8E>     /x83/x37/x89/x33 <Private Use>
-+<UEA8F>     /x83/x37/x89/x34 <Private Use>
-+<UEA90>     /x83/x37/x89/x35 <Private Use>
-+<UEA91>     /x83/x37/x89/x36 <Private Use>
-+<UEA92>     /x83/x37/x89/x37 <Private Use>
-+<UEA93>     /x83/x37/x89/x38 <Private Use>
-+<UEA94>     /x83/x37/x89/x39 <Private Use>
-+<UEA95>     /x83/x37/x8a/x30 <Private Use>
-+<UEA96>     /x83/x37/x8a/x31 <Private Use>
-+<UEA97>     /x83/x37/x8a/x32 <Private Use>
-+<UEA98>     /x83/x37/x8a/x33 <Private Use>
-+<UEA99>     /x83/x37/x8a/x34 <Private Use>
-+<UEA9A>     /x83/x37/x8a/x35 <Private Use>
-+<UEA9B>     /x83/x37/x8a/x36 <Private Use>
-+<UEA9C>     /x83/x37/x8a/x37 <Private Use>
-+<UEA9D>     /x83/x37/x8a/x38 <Private Use>
-+<UEA9E>     /x83/x37/x8a/x39 <Private Use>
-+<UEA9F>     /x83/x37/x8b/x30 <Private Use>
-+<UEAA0>     /x83/x37/x8b/x31 <Private Use>
-+<UEAA1>     /x83/x37/x8b/x32 <Private Use>
-+<UEAA2>     /x83/x37/x8b/x33 <Private Use>
-+<UEAA3>     /x83/x37/x8b/x34 <Private Use>
-+<UEAA4>     /x83/x37/x8b/x35 <Private Use>
-+<UEAA5>     /x83/x37/x8b/x36 <Private Use>
-+<UEAA6>     /x83/x37/x8b/x37 <Private Use>
-+<UEAA7>     /x83/x37/x8b/x38 <Private Use>
-+<UEAA8>     /x83/x37/x8b/x39 <Private Use>
-+<UEAA9>     /x83/x37/x8c/x30 <Private Use>
-+<UEAAA>     /x83/x37/x8c/x31 <Private Use>
-+<UEAAB>     /x83/x37/x8c/x32 <Private Use>
-+<UEAAC>     /x83/x37/x8c/x33 <Private Use>
-+<UEAAD>     /x83/x37/x8c/x34 <Private Use>
-+<UEAAE>     /x83/x37/x8c/x35 <Private Use>
-+<UEAAF>     /x83/x37/x8c/x36 <Private Use>
-+<UEAB0>     /x83/x37/x8c/x37 <Private Use>
-+<UEAB1>     /x83/x37/x8c/x38 <Private Use>
-+<UEAB2>     /x83/x37/x8c/x39 <Private Use>
-+<UEAB3>     /x83/x37/x8d/x30 <Private Use>
-+<UEAB4>     /x83/x37/x8d/x31 <Private Use>
-+<UEAB5>     /x83/x37/x8d/x32 <Private Use>
-+<UEAB6>     /x83/x37/x8d/x33 <Private Use>
-+<UEAB7>     /x83/x37/x8d/x34 <Private Use>
-+<UEAB8>     /x83/x37/x8d/x35 <Private Use>
-+<UEAB9>     /x83/x37/x8d/x36 <Private Use>
-+<UEABA>     /x83/x37/x8d/x37 <Private Use>
-+<UEABB>     /x83/x37/x8d/x38 <Private Use>
-+<UEABC>     /x83/x37/x8d/x39 <Private Use>
-+<UEABD>     /x83/x37/x8e/x30 <Private Use>
-+<UEABE>     /x83/x37/x8e/x31 <Private Use>
-+<UEABF>     /x83/x37/x8e/x32 <Private Use>
-+<UEAC0>     /x83/x37/x8e/x33 <Private Use>
-+<UEAC1>     /x83/x37/x8e/x34 <Private Use>
-+<UEAC2>     /x83/x37/x8e/x35 <Private Use>
-+<UEAC3>     /x83/x37/x8e/x36 <Private Use>
-+<UEAC4>     /x83/x37/x8e/x37 <Private Use>
-+<UEAC5>     /x83/x37/x8e/x38 <Private Use>
-+<UEAC6>     /x83/x37/x8e/x39 <Private Use>
-+<UEAC7>     /x83/x37/x8f/x30 <Private Use>
-+<UEAC8>     /x83/x37/x8f/x31 <Private Use>
-+<UEAC9>     /x83/x37/x8f/x32 <Private Use>
-+<UEACA>     /x83/x37/x8f/x33 <Private Use>
-+<UEACB>     /x83/x37/x8f/x34 <Private Use>
-+<UEACC>     /x83/x37/x8f/x35 <Private Use>
-+<UEACD>     /x83/x37/x8f/x36 <Private Use>
-+<UEACE>     /x83/x37/x8f/x37 <Private Use>
-+<UEACF>     /x83/x37/x8f/x38 <Private Use>
-+<UEAD0>     /x83/x37/x8f/x39 <Private Use>
-+<UEAD1>     /x83/x37/x90/x30 <Private Use>
-+<UEAD2>     /x83/x37/x90/x31 <Private Use>
-+<UEAD3>     /x83/x37/x90/x32 <Private Use>
-+<UEAD4>     /x83/x37/x90/x33 <Private Use>
-+<UEAD5>     /x83/x37/x90/x34 <Private Use>
-+<UEAD6>     /x83/x37/x90/x35 <Private Use>
-+<UEAD7>     /x83/x37/x90/x36 <Private Use>
-+<UEAD8>     /x83/x37/x90/x37 <Private Use>
-+<UEAD9>     /x83/x37/x90/x38 <Private Use>
-+<UEADA>     /x83/x37/x90/x39 <Private Use>
-+<UEADB>     /x83/x37/x91/x30 <Private Use>
-+<UEADC>     /x83/x37/x91/x31 <Private Use>
-+<UEADD>     /x83/x37/x91/x32 <Private Use>
-+<UEADE>     /x83/x37/x91/x33 <Private Use>
-+<UEADF>     /x83/x37/x91/x34 <Private Use>
-+<UEAE0>     /x83/x37/x91/x35 <Private Use>
-+<UEAE1>     /x83/x37/x91/x36 <Private Use>
-+<UEAE2>     /x83/x37/x91/x37 <Private Use>
-+<UEAE3>     /x83/x37/x91/x38 <Private Use>
-+<UEAE4>     /x83/x37/x91/x39 <Private Use>
-+<UEAE5>     /x83/x37/x92/x30 <Private Use>
-+<UEAE6>     /x83/x37/x92/x31 <Private Use>
-+<UEAE7>     /x83/x37/x92/x32 <Private Use>
-+<UEAE8>     /x83/x37/x92/x33 <Private Use>
-+<UEAE9>     /x83/x37/x92/x34 <Private Use>
-+<UEAEA>     /x83/x37/x92/x35 <Private Use>
-+<UEAEB>     /x83/x37/x92/x36 <Private Use>
-+<UEAEC>     /x83/x37/x92/x37 <Private Use>
-+<UEAED>     /x83/x37/x92/x38 <Private Use>
-+<UEAEE>     /x83/x37/x92/x39 <Private Use>
-+<UEAEF>     /x83/x37/x93/x30 <Private Use>
-+<UEAF0>     /x83/x37/x93/x31 <Private Use>
-+<UEAF1>     /x83/x37/x93/x32 <Private Use>
-+<UEAF2>     /x83/x37/x93/x33 <Private Use>
-+<UEAF3>     /x83/x37/x93/x34 <Private Use>
-+<UEAF4>     /x83/x37/x93/x35 <Private Use>
-+<UEAF5>     /x83/x37/x93/x36 <Private Use>
-+<UEAF6>     /x83/x37/x93/x37 <Private Use>
-+<UEAF7>     /x83/x37/x93/x38 <Private Use>
-+<UEAF8>     /x83/x37/x93/x39 <Private Use>
-+<UEAF9>     /x83/x37/x94/x30 <Private Use>
-+<UEAFA>     /x83/x37/x94/x31 <Private Use>
-+<UEAFB>     /x83/x37/x94/x32 <Private Use>
-+<UEAFC>     /x83/x37/x94/x33 <Private Use>
-+<UEAFD>     /x83/x37/x94/x34 <Private Use>
-+<UEAFE>     /x83/x37/x94/x35 <Private Use>
-+<UEAFF>     /x83/x37/x94/x36 <Private Use>
-+<UEB00>     /x83/x37/x94/x37 <Private Use>
-+<UEB01>     /x83/x37/x94/x38 <Private Use>
-+<UEB02>     /x83/x37/x94/x39 <Private Use>
-+<UEB03>     /x83/x37/x95/x30 <Private Use>
-+<UEB04>     /x83/x37/x95/x31 <Private Use>
-+<UEB05>     /x83/x37/x95/x32 <Private Use>
-+<UEB06>     /x83/x37/x95/x33 <Private Use>
-+<UEB07>     /x83/x37/x95/x34 <Private Use>
-+<UEB08>     /x83/x37/x95/x35 <Private Use>
-+<UEB09>     /x83/x37/x95/x36 <Private Use>
-+<UEB0A>     /x83/x37/x95/x37 <Private Use>
-+<UEB0B>     /x83/x37/x95/x38 <Private Use>
-+<UEB0C>     /x83/x37/x95/x39 <Private Use>
-+<UEB0D>     /x83/x37/x96/x30 <Private Use>
-+<UEB0E>     /x83/x37/x96/x31 <Private Use>
-+<UEB0F>     /x83/x37/x96/x32 <Private Use>
-+<UEB10>     /x83/x37/x96/x33 <Private Use>
-+<UEB11>     /x83/x37/x96/x34 <Private Use>
-+<UEB12>     /x83/x37/x96/x35 <Private Use>
-+<UEB13>     /x83/x37/x96/x36 <Private Use>
-+<UEB14>     /x83/x37/x96/x37 <Private Use>
-+<UEB15>     /x83/x37/x96/x38 <Private Use>
-+<UEB16>     /x83/x37/x96/x39 <Private Use>
-+<UEB17>     /x83/x37/x97/x30 <Private Use>
-+<UEB18>     /x83/x37/x97/x31 <Private Use>
-+<UEB19>     /x83/x37/x97/x32 <Private Use>
-+<UEB1A>     /x83/x37/x97/x33 <Private Use>
-+<UEB1B>     /x83/x37/x97/x34 <Private Use>
-+<UEB1C>     /x83/x37/x97/x35 <Private Use>
-+<UEB1D>     /x83/x37/x97/x36 <Private Use>
-+<UEB1E>     /x83/x37/x97/x37 <Private Use>
-+<UEB1F>     /x83/x37/x97/x38 <Private Use>
-+<UEB20>     /x83/x37/x97/x39 <Private Use>
-+<UEB21>     /x83/x37/x98/x30 <Private Use>
-+<UEB22>     /x83/x37/x98/x31 <Private Use>
-+<UEB23>     /x83/x37/x98/x32 <Private Use>
-+<UEB24>     /x83/x37/x98/x33 <Private Use>
-+<UEB25>     /x83/x37/x98/x34 <Private Use>
-+<UEB26>     /x83/x37/x98/x35 <Private Use>
-+<UEB27>     /x83/x37/x98/x36 <Private Use>
-+<UEB28>     /x83/x37/x98/x37 <Private Use>
-+<UEB29>     /x83/x37/x98/x38 <Private Use>
-+<UEB2A>     /x83/x37/x98/x39 <Private Use>
-+<UEB2B>     /x83/x37/x99/x30 <Private Use>
-+<UEB2C>     /x83/x37/x99/x31 <Private Use>
-+<UEB2D>     /x83/x37/x99/x32 <Private Use>
-+<UEB2E>     /x83/x37/x99/x33 <Private Use>
-+<UEB2F>     /x83/x37/x99/x34 <Private Use>
-+<UEB30>     /x83/x37/x99/x35 <Private Use>
-+<UEB31>     /x83/x37/x99/x36 <Private Use>
-+<UEB32>     /x83/x37/x99/x37 <Private Use>
-+<UEB33>     /x83/x37/x99/x38 <Private Use>
-+<UEB34>     /x83/x37/x99/x39 <Private Use>
-+<UEB35>     /x83/x37/x9a/x30 <Private Use>
-+<UEB36>     /x83/x37/x9a/x31 <Private Use>
-+<UEB37>     /x83/x37/x9a/x32 <Private Use>
-+<UEB38>     /x83/x37/x9a/x33 <Private Use>
-+<UEB39>     /x83/x37/x9a/x34 <Private Use>
-+<UEB3A>     /x83/x37/x9a/x35 <Private Use>
-+<UEB3B>     /x83/x37/x9a/x36 <Private Use>
-+<UEB3C>     /x83/x37/x9a/x37 <Private Use>
-+<UEB3D>     /x83/x37/x9a/x38 <Private Use>
-+<UEB3E>     /x83/x37/x9a/x39 <Private Use>
-+<UEB3F>     /x83/x37/x9b/x30 <Private Use>
-+<UEB40>     /x83/x37/x9b/x31 <Private Use>
-+<UEB41>     /x83/x37/x9b/x32 <Private Use>
-+<UEB42>     /x83/x37/x9b/x33 <Private Use>
-+<UEB43>     /x83/x37/x9b/x34 <Private Use>
-+<UEB44>     /x83/x37/x9b/x35 <Private Use>
-+<UEB45>     /x83/x37/x9b/x36 <Private Use>
-+<UEB46>     /x83/x37/x9b/x37 <Private Use>
-+<UEB47>     /x83/x37/x9b/x38 <Private Use>
-+<UEB48>     /x83/x37/x9b/x39 <Private Use>
-+<UEB49>     /x83/x37/x9c/x30 <Private Use>
-+<UEB4A>     /x83/x37/x9c/x31 <Private Use>
-+<UEB4B>     /x83/x37/x9c/x32 <Private Use>
-+<UEB4C>     /x83/x37/x9c/x33 <Private Use>
-+<UEB4D>     /x83/x37/x9c/x34 <Private Use>
-+<UEB4E>     /x83/x37/x9c/x35 <Private Use>
-+<UEB4F>     /x83/x37/x9c/x36 <Private Use>
-+<UEB50>     /x83/x37/x9c/x37 <Private Use>
-+<UEB51>     /x83/x37/x9c/x38 <Private Use>
-+<UEB52>     /x83/x37/x9c/x39 <Private Use>
-+<UEB53>     /x83/x37/x9d/x30 <Private Use>
-+<UEB54>     /x83/x37/x9d/x31 <Private Use>
-+<UEB55>     /x83/x37/x9d/x32 <Private Use>
-+<UEB56>     /x83/x37/x9d/x33 <Private Use>
-+<UEB57>     /x83/x37/x9d/x34 <Private Use>
-+<UEB58>     /x83/x37/x9d/x35 <Private Use>
-+<UEB59>     /x83/x37/x9d/x36 <Private Use>
-+<UEB5A>     /x83/x37/x9d/x37 <Private Use>
-+<UEB5B>     /x83/x37/x9d/x38 <Private Use>
-+<UEB5C>     /x83/x37/x9d/x39 <Private Use>
-+<UEB5D>     /x83/x37/x9e/x30 <Private Use>
-+<UEB5E>     /x83/x37/x9e/x31 <Private Use>
-+<UEB5F>     /x83/x37/x9e/x32 <Private Use>
-+<UEB60>     /x83/x37/x9e/x33 <Private Use>
-+<UEB61>     /x83/x37/x9e/x34 <Private Use>
-+<UEB62>     /x83/x37/x9e/x35 <Private Use>
-+<UEB63>     /x83/x37/x9e/x36 <Private Use>
-+<UEB64>     /x83/x37/x9e/x37 <Private Use>
-+<UEB65>     /x83/x37/x9e/x38 <Private Use>
-+<UEB66>     /x83/x37/x9e/x39 <Private Use>
-+<UEB67>     /x83/x37/x9f/x30 <Private Use>
-+<UEB68>     /x83/x37/x9f/x31 <Private Use>
-+<UEB69>     /x83/x37/x9f/x32 <Private Use>
-+<UEB6A>     /x83/x37/x9f/x33 <Private Use>
-+<UEB6B>     /x83/x37/x9f/x34 <Private Use>
-+<UEB6C>     /x83/x37/x9f/x35 <Private Use>
-+<UEB6D>     /x83/x37/x9f/x36 <Private Use>
-+<UEB6E>     /x83/x37/x9f/x37 <Private Use>
-+<UEB6F>     /x83/x37/x9f/x38 <Private Use>
-+<UEB70>     /x83/x37/x9f/x39 <Private Use>
-+<UEB71>     /x83/x37/xa0/x30 <Private Use>
-+<UEB72>     /x83/x37/xa0/x31 <Private Use>
-+<UEB73>     /x83/x37/xa0/x32 <Private Use>
-+<UEB74>     /x83/x37/xa0/x33 <Private Use>
-+<UEB75>     /x83/x37/xa0/x34 <Private Use>
-+<UEB76>     /x83/x37/xa0/x35 <Private Use>
-+<UEB77>     /x83/x37/xa0/x36 <Private Use>
-+<UEB78>     /x83/x37/xa0/x37 <Private Use>
-+<UEB79>     /x83/x37/xa0/x38 <Private Use>
-+<UEB7A>     /x83/x37/xa0/x39 <Private Use>
-+<UEB7B>     /x83/x37/xa1/x30 <Private Use>
-+<UEB7C>     /x83/x37/xa1/x31 <Private Use>
-+<UEB7D>     /x83/x37/xa1/x32 <Private Use>
-+<UEB7E>     /x83/x37/xa1/x33 <Private Use>
-+<UEB7F>     /x83/x37/xa1/x34 <Private Use>
-+<UEB80>     /x83/x37/xa1/x35 <Private Use>
-+<UEB81>     /x83/x37/xa1/x36 <Private Use>
-+<UEB82>     /x83/x37/xa1/x37 <Private Use>
-+<UEB83>     /x83/x37/xa1/x38 <Private Use>
-+<UEB84>     /x83/x37/xa1/x39 <Private Use>
-+<UEB85>     /x83/x37/xa2/x30 <Private Use>
-+<UEB86>     /x83/x37/xa2/x31 <Private Use>
-+<UEB87>     /x83/x37/xa2/x32 <Private Use>
-+<UEB88>     /x83/x37/xa2/x33 <Private Use>
-+<UEB89>     /x83/x37/xa2/x34 <Private Use>
-+<UEB8A>     /x83/x37/xa2/x35 <Private Use>
-+<UEB8B>     /x83/x37/xa2/x36 <Private Use>
-+<UEB8C>     /x83/x37/xa2/x37 <Private Use>
-+<UEB8D>     /x83/x37/xa2/x38 <Private Use>
-+<UEB8E>     /x83/x37/xa2/x39 <Private Use>
-+<UEB8F>     /x83/x37/xa3/x30 <Private Use>
-+<UEB90>     /x83/x37/xa3/x31 <Private Use>
-+<UEB91>     /x83/x37/xa3/x32 <Private Use>
-+<UEB92>     /x83/x37/xa3/x33 <Private Use>
-+<UEB93>     /x83/x37/xa3/x34 <Private Use>
-+<UEB94>     /x83/x37/xa3/x35 <Private Use>
-+<UEB95>     /x83/x37/xa3/x36 <Private Use>
-+<UEB96>     /x83/x37/xa3/x37 <Private Use>
-+<UEB97>     /x83/x37/xa3/x38 <Private Use>
-+<UEB98>     /x83/x37/xa3/x39 <Private Use>
-+<UEB99>     /x83/x37/xa4/x30 <Private Use>
-+<UEB9A>     /x83/x37/xa4/x31 <Private Use>
-+<UEB9B>     /x83/x37/xa4/x32 <Private Use>
-+<UEB9C>     /x83/x37/xa4/x33 <Private Use>
-+<UEB9D>     /x83/x37/xa4/x34 <Private Use>
-+<UEB9E>     /x83/x37/xa4/x35 <Private Use>
-+<UEB9F>     /x83/x37/xa4/x36 <Private Use>
-+<UEBA0>     /x83/x37/xa4/x37 <Private Use>
-+<UEBA1>     /x83/x37/xa4/x38 <Private Use>
-+<UEBA2>     /x83/x37/xa4/x39 <Private Use>
-+<UEBA3>     /x83/x37/xa5/x30 <Private Use>
-+<UEBA4>     /x83/x37/xa5/x31 <Private Use>
-+<UEBA5>     /x83/x37/xa5/x32 <Private Use>
-+<UEBA6>     /x83/x37/xa5/x33 <Private Use>
-+<UEBA7>     /x83/x37/xa5/x34 <Private Use>
-+<UEBA8>     /x83/x37/xa5/x35 <Private Use>
-+<UEBA9>     /x83/x37/xa5/x36 <Private Use>
-+<UEBAA>     /x83/x37/xa5/x37 <Private Use>
-+<UEBAB>     /x83/x37/xa5/x38 <Private Use>
-+<UEBAC>     /x83/x37/xa5/x39 <Private Use>
-+<UEBAD>     /x83/x37/xa6/x30 <Private Use>
-+<UEBAE>     /x83/x37/xa6/x31 <Private Use>
-+<UEBAF>     /x83/x37/xa6/x32 <Private Use>
-+<UEBB0>     /x83/x37/xa6/x33 <Private Use>
-+<UEBB1>     /x83/x37/xa6/x34 <Private Use>
-+<UEBB2>     /x83/x37/xa6/x35 <Private Use>
-+<UEBB3>     /x83/x37/xa6/x36 <Private Use>
-+<UEBB4>     /x83/x37/xa6/x37 <Private Use>
-+<UEBB5>     /x83/x37/xa6/x38 <Private Use>
-+<UEBB6>     /x83/x37/xa6/x39 <Private Use>
-+<UEBB7>     /x83/x37/xa7/x30 <Private Use>
-+<UEBB8>     /x83/x37/xa7/x31 <Private Use>
-+<UEBB9>     /x83/x37/xa7/x32 <Private Use>
-+<UEBBA>     /x83/x37/xa7/x33 <Private Use>
-+<UEBBB>     /x83/x37/xa7/x34 <Private Use>
-+<UEBBC>     /x83/x37/xa7/x35 <Private Use>
-+<UEBBD>     /x83/x37/xa7/x36 <Private Use>
-+<UEBBE>     /x83/x37/xa7/x37 <Private Use>
-+<UEBBF>     /x83/x37/xa7/x38 <Private Use>
-+<UEBC0>     /x83/x37/xa7/x39 <Private Use>
-+<UEBC1>     /x83/x37/xa8/x30 <Private Use>
-+<UEBC2>     /x83/x37/xa8/x31 <Private Use>
-+<UEBC3>     /x83/x37/xa8/x32 <Private Use>
-+<UEBC4>     /x83/x37/xa8/x33 <Private Use>
-+<UEBC5>     /x83/x37/xa8/x34 <Private Use>
-+<UEBC6>     /x83/x37/xa8/x35 <Private Use>
-+<UEBC7>     /x83/x37/xa8/x36 <Private Use>
-+<UEBC8>     /x83/x37/xa8/x37 <Private Use>
-+<UEBC9>     /x83/x37/xa8/x38 <Private Use>
-+<UEBCA>     /x83/x37/xa8/x39 <Private Use>
-+<UEBCB>     /x83/x37/xa9/x30 <Private Use>
-+<UEBCC>     /x83/x37/xa9/x31 <Private Use>
-+<UEBCD>     /x83/x37/xa9/x32 <Private Use>
-+<UEBCE>     /x83/x37/xa9/x33 <Private Use>
-+<UEBCF>     /x83/x37/xa9/x34 <Private Use>
-+<UEBD0>     /x83/x37/xa9/x35 <Private Use>
-+<UEBD1>     /x83/x37/xa9/x36 <Private Use>
-+<UEBD2>     /x83/x37/xa9/x37 <Private Use>
-+<UEBD3>     /x83/x37/xa9/x38 <Private Use>
-+<UEBD4>     /x83/x37/xa9/x39 <Private Use>
-+<UEBD5>     /x83/x37/xaa/x30 <Private Use>
-+<UEBD6>     /x83/x37/xaa/x31 <Private Use>
-+<UEBD7>     /x83/x37/xaa/x32 <Private Use>
-+<UEBD8>     /x83/x37/xaa/x33 <Private Use>
-+<UEBD9>     /x83/x37/xaa/x34 <Private Use>
-+<UEBDA>     /x83/x37/xaa/x35 <Private Use>
-+<UEBDB>     /x83/x37/xaa/x36 <Private Use>
-+<UEBDC>     /x83/x37/xaa/x37 <Private Use>
-+<UEBDD>     /x83/x37/xaa/x38 <Private Use>
-+<UEBDE>     /x83/x37/xaa/x39 <Private Use>
-+<UEBDF>     /x83/x37/xab/x30 <Private Use>
-+<UEBE0>     /x83/x37/xab/x31 <Private Use>
-+<UEBE1>     /x83/x37/xab/x32 <Private Use>
-+<UEBE2>     /x83/x37/xab/x33 <Private Use>
-+<UEBE3>     /x83/x37/xab/x34 <Private Use>
-+<UEBE4>     /x83/x37/xab/x35 <Private Use>
-+<UEBE5>     /x83/x37/xab/x36 <Private Use>
-+<UEBE6>     /x83/x37/xab/x37 <Private Use>
-+<UEBE7>     /x83/x37/xab/x38 <Private Use>
-+<UEBE8>     /x83/x37/xab/x39 <Private Use>
-+<UEBE9>     /x83/x37/xac/x30 <Private Use>
-+<UEBEA>     /x83/x37/xac/x31 <Private Use>
-+<UEBEB>     /x83/x37/xac/x32 <Private Use>
-+<UEBEC>     /x83/x37/xac/x33 <Private Use>
-+<UEBED>     /x83/x37/xac/x34 <Private Use>
-+<UEBEE>     /x83/x37/xac/x35 <Private Use>
-+<UEBEF>     /x83/x37/xac/x36 <Private Use>
-+<UEBF0>     /x83/x37/xac/x37 <Private Use>
-+<UEBF1>     /x83/x37/xac/x38 <Private Use>
-+<UEBF2>     /x83/x37/xac/x39 <Private Use>
-+<UEBF3>     /x83/x37/xad/x30 <Private Use>
-+<UEBF4>     /x83/x37/xad/x31 <Private Use>
-+<UEBF5>     /x83/x37/xad/x32 <Private Use>
-+<UEBF6>     /x83/x37/xad/x33 <Private Use>
-+<UEBF7>     /x83/x37/xad/x34 <Private Use>
-+<UEBF8>     /x83/x37/xad/x35 <Private Use>
-+<UEBF9>     /x83/x37/xad/x36 <Private Use>
-+<UEBFA>     /x83/x37/xad/x37 <Private Use>
-+<UEBFB>     /x83/x37/xad/x38 <Private Use>
-+<UEBFC>     /x83/x37/xad/x39 <Private Use>
-+<UEBFD>     /x83/x37/xae/x30 <Private Use>
-+<UEBFE>     /x83/x37/xae/x31 <Private Use>
-+<UEBFF>     /x83/x37/xae/x32 <Private Use>
-+<UEC00>     /x83/x37/xae/x33 <Private Use>
-+<UEC01>     /x83/x37/xae/x34 <Private Use>
-+<UEC02>     /x83/x37/xae/x35 <Private Use>
-+<UEC03>     /x83/x37/xae/x36 <Private Use>
-+<UEC04>     /x83/x37/xae/x37 <Private Use>
-+<UEC05>     /x83/x37/xae/x38 <Private Use>
-+<UEC06>     /x83/x37/xae/x39 <Private Use>
-+<UEC07>     /x83/x37/xaf/x30 <Private Use>
-+<UEC08>     /x83/x37/xaf/x31 <Private Use>
-+<UEC09>     /x83/x37/xaf/x32 <Private Use>
-+<UEC0A>     /x83/x37/xaf/x33 <Private Use>
-+<UEC0B>     /x83/x37/xaf/x34 <Private Use>
-+<UEC0C>     /x83/x37/xaf/x35 <Private Use>
-+<UEC0D>     /x83/x37/xaf/x36 <Private Use>
-+<UEC0E>     /x83/x37/xaf/x37 <Private Use>
-+<UEC0F>     /x83/x37/xaf/x38 <Private Use>
-+<UEC10>     /x83/x37/xaf/x39 <Private Use>
-+<UEC11>     /x83/x37/xb0/x30 <Private Use>
-+<UEC12>     /x83/x37/xb0/x31 <Private Use>
-+<UEC13>     /x83/x37/xb0/x32 <Private Use>
-+<UEC14>     /x83/x37/xb0/x33 <Private Use>
-+<UEC15>     /x83/x37/xb0/x34 <Private Use>
-+<UEC16>     /x83/x37/xb0/x35 <Private Use>
-+<UEC17>     /x83/x37/xb0/x36 <Private Use>
-+<UEC18>     /x83/x37/xb0/x37 <Private Use>
-+<UEC19>     /x83/x37/xb0/x38 <Private Use>
-+<UEC1A>     /x83/x37/xb0/x39 <Private Use>
-+<UEC1B>     /x83/x37/xb1/x30 <Private Use>
-+<UEC1C>     /x83/x37/xb1/x31 <Private Use>
-+<UEC1D>     /x83/x37/xb1/x32 <Private Use>
-+<UEC1E>     /x83/x37/xb1/x33 <Private Use>
-+<UEC1F>     /x83/x37/xb1/x34 <Private Use>
-+<UEC20>     /x83/x37/xb1/x35 <Private Use>
-+<UEC21>     /x83/x37/xb1/x36 <Private Use>
-+<UEC22>     /x83/x37/xb1/x37 <Private Use>
-+<UEC23>     /x83/x37/xb1/x38 <Private Use>
-+<UEC24>     /x83/x37/xb1/x39 <Private Use>
-+<UEC25>     /x83/x37/xb2/x30 <Private Use>
-+<UEC26>     /x83/x37/xb2/x31 <Private Use>
-+<UEC27>     /x83/x37/xb2/x32 <Private Use>
-+<UEC28>     /x83/x37/xb2/x33 <Private Use>
-+<UEC29>     /x83/x37/xb2/x34 <Private Use>
-+<UEC2A>     /x83/x37/xb2/x35 <Private Use>
-+<UEC2B>     /x83/x37/xb2/x36 <Private Use>
-+<UEC2C>     /x83/x37/xb2/x37 <Private Use>
-+<UEC2D>     /x83/x37/xb2/x38 <Private Use>
-+<UEC2E>     /x83/x37/xb2/x39 <Private Use>
-+<UEC2F>     /x83/x37/xb3/x30 <Private Use>
-+<UEC30>     /x83/x37/xb3/x31 <Private Use>
-+<UEC31>     /x83/x37/xb3/x32 <Private Use>
-+<UEC32>     /x83/x37/xb3/x33 <Private Use>
-+<UEC33>     /x83/x37/xb3/x34 <Private Use>
-+<UEC34>     /x83/x37/xb3/x35 <Private Use>
-+<UEC35>     /x83/x37/xb3/x36 <Private Use>
-+<UEC36>     /x83/x37/xb3/x37 <Private Use>
-+<UEC37>     /x83/x37/xb3/x38 <Private Use>
-+<UEC38>     /x83/x37/xb3/x39 <Private Use>
-+<UEC39>     /x83/x37/xb4/x30 <Private Use>
-+<UEC3A>     /x83/x37/xb4/x31 <Private Use>
-+<UEC3B>     /x83/x37/xb4/x32 <Private Use>
-+<UEC3C>     /x83/x37/xb4/x33 <Private Use>
-+<UEC3D>     /x83/x37/xb4/x34 <Private Use>
-+<UEC3E>     /x83/x37/xb4/x35 <Private Use>
-+<UEC3F>     /x83/x37/xb4/x36 <Private Use>
-+<UEC40>     /x83/x37/xb4/x37 <Private Use>
-+<UEC41>     /x83/x37/xb4/x38 <Private Use>
-+<UEC42>     /x83/x37/xb4/x39 <Private Use>
-+<UEC43>     /x83/x37/xb5/x30 <Private Use>
-+<UEC44>     /x83/x37/xb5/x31 <Private Use>
-+<UEC45>     /x83/x37/xb5/x32 <Private Use>
-+<UEC46>     /x83/x37/xb5/x33 <Private Use>
-+<UEC47>     /x83/x37/xb5/x34 <Private Use>
-+<UEC48>     /x83/x37/xb5/x35 <Private Use>
-+<UEC49>     /x83/x37/xb5/x36 <Private Use>
-+<UEC4A>     /x83/x37/xb5/x37 <Private Use>
-+<UEC4B>     /x83/x37/xb5/x38 <Private Use>
-+<UEC4C>     /x83/x37/xb5/x39 <Private Use>
-+<UEC4D>     /x83/x37/xb6/x30 <Private Use>
-+<UEC4E>     /x83/x37/xb6/x31 <Private Use>
-+<UEC4F>     /x83/x37/xb6/x32 <Private Use>
-+<UEC50>     /x83/x37/xb6/x33 <Private Use>
-+<UEC51>     /x83/x37/xb6/x34 <Private Use>
-+<UEC52>     /x83/x37/xb6/x35 <Private Use>
-+<UEC53>     /x83/x37/xb6/x36 <Private Use>
-+<UEC54>     /x83/x37/xb6/x37 <Private Use>
-+<UEC55>     /x83/x37/xb6/x38 <Private Use>
-+<UEC56>     /x83/x37/xb6/x39 <Private Use>
-+<UEC57>     /x83/x37/xb7/x30 <Private Use>
-+<UEC58>     /x83/x37/xb7/x31 <Private Use>
-+<UEC59>     /x83/x37/xb7/x32 <Private Use>
-+<UEC5A>     /x83/x37/xb7/x33 <Private Use>
-+<UEC5B>     /x83/x37/xb7/x34 <Private Use>
-+<UEC5C>     /x83/x37/xb7/x35 <Private Use>
-+<UEC5D>     /x83/x37/xb7/x36 <Private Use>
-+<UEC5E>     /x83/x37/xb7/x37 <Private Use>
-+<UEC5F>     /x83/x37/xb7/x38 <Private Use>
-+<UEC60>     /x83/x37/xb7/x39 <Private Use>
-+<UEC61>     /x83/x37/xb8/x30 <Private Use>
-+<UEC62>     /x83/x37/xb8/x31 <Private Use>
-+<UEC63>     /x83/x37/xb8/x32 <Private Use>
-+<UEC64>     /x83/x37/xb8/x33 <Private Use>
-+<UEC65>     /x83/x37/xb8/x34 <Private Use>
-+<UEC66>     /x83/x37/xb8/x35 <Private Use>
-+<UEC67>     /x83/x37/xb8/x36 <Private Use>
-+<UEC68>     /x83/x37/xb8/x37 <Private Use>
-+<UEC69>     /x83/x37/xb8/x38 <Private Use>
-+<UEC6A>     /x83/x37/xb8/x39 <Private Use>
-+<UEC6B>     /x83/x37/xb9/x30 <Private Use>
-+<UEC6C>     /x83/x37/xb9/x31 <Private Use>
-+<UEC6D>     /x83/x37/xb9/x32 <Private Use>
-+<UEC6E>     /x83/x37/xb9/x33 <Private Use>
-+<UEC6F>     /x83/x37/xb9/x34 <Private Use>
-+<UEC70>     /x83/x37/xb9/x35 <Private Use>
-+<UEC71>     /x83/x37/xb9/x36 <Private Use>
-+<UEC72>     /x83/x37/xb9/x37 <Private Use>
-+<UEC73>     /x83/x37/xb9/x38 <Private Use>
-+<UEC74>     /x83/x37/xb9/x39 <Private Use>
-+<UEC75>     /x83/x37/xba/x30 <Private Use>
-+<UEC76>     /x83/x37/xba/x31 <Private Use>
-+<UEC77>     /x83/x37/xba/x32 <Private Use>
-+<UEC78>     /x83/x37/xba/x33 <Private Use>
-+<UEC79>     /x83/x37/xba/x34 <Private Use>
-+<UEC7A>     /x83/x37/xba/x35 <Private Use>
-+<UEC7B>     /x83/x37/xba/x36 <Private Use>
-+<UEC7C>     /x83/x37/xba/x37 <Private Use>
-+<UEC7D>     /x83/x37/xba/x38 <Private Use>
-+<UEC7E>     /x83/x37/xba/x39 <Private Use>
-+<UEC7F>     /x83/x37/xbb/x30 <Private Use>
-+<UEC80>     /x83/x37/xbb/x31 <Private Use>
-+<UEC81>     /x83/x37/xbb/x32 <Private Use>
-+<UEC82>     /x83/x37/xbb/x33 <Private Use>
-+<UEC83>     /x83/x37/xbb/x34 <Private Use>
-+<UEC84>     /x83/x37/xbb/x35 <Private Use>
-+<UEC85>     /x83/x37/xbb/x36 <Private Use>
-+<UEC86>     /x83/x37/xbb/x37 <Private Use>
-+<UEC87>     /x83/x37/xbb/x38 <Private Use>
-+<UEC88>     /x83/x37/xbb/x39 <Private Use>
-+<UEC89>     /x83/x37/xbc/x30 <Private Use>
-+<UEC8A>     /x83/x37/xbc/x31 <Private Use>
-+<UEC8B>     /x83/x37/xbc/x32 <Private Use>
-+<UEC8C>     /x83/x37/xbc/x33 <Private Use>
-+<UEC8D>     /x83/x37/xbc/x34 <Private Use>
-+<UEC8E>     /x83/x37/xbc/x35 <Private Use>
-+<UEC8F>     /x83/x37/xbc/x36 <Private Use>
-+<UEC90>     /x83/x37/xbc/x37 <Private Use>
-+<UEC91>     /x83/x37/xbc/x38 <Private Use>
-+<UEC92>     /x83/x37/xbc/x39 <Private Use>
-+<UEC93>     /x83/x37/xbd/x30 <Private Use>
-+<UEC94>     /x83/x37/xbd/x31 <Private Use>
-+<UEC95>     /x83/x37/xbd/x32 <Private Use>
-+<UEC96>     /x83/x37/xbd/x33 <Private Use>
-+<UEC97>     /x83/x37/xbd/x34 <Private Use>
-+<UEC98>     /x83/x37/xbd/x35 <Private Use>
-+<UEC99>     /x83/x37/xbd/x36 <Private Use>
-+<UEC9A>     /x83/x37/xbd/x37 <Private Use>
-+<UEC9B>     /x83/x37/xbd/x38 <Private Use>
-+<UEC9C>     /x83/x37/xbd/x39 <Private Use>
-+<UEC9D>     /x83/x37/xbe/x30 <Private Use>
-+<UEC9E>     /x83/x37/xbe/x31 <Private Use>
-+<UEC9F>     /x83/x37/xbe/x32 <Private Use>
-+<UECA0>     /x83/x37/xbe/x33 <Private Use>
-+<UECA1>     /x83/x37/xbe/x34 <Private Use>
-+<UECA2>     /x83/x37/xbe/x35 <Private Use>
-+<UECA3>     /x83/x37/xbe/x36 <Private Use>
-+<UECA4>     /x83/x37/xbe/x37 <Private Use>
-+<UECA5>     /x83/x37/xbe/x38 <Private Use>
-+<UECA6>     /x83/x37/xbe/x39 <Private Use>
-+<UECA7>     /x83/x37/xbf/x30 <Private Use>
-+<UECA8>     /x83/x37/xbf/x31 <Private Use>
-+<UECA9>     /x83/x37/xbf/x32 <Private Use>
-+<UECAA>     /x83/x37/xbf/x33 <Private Use>
-+<UECAB>     /x83/x37/xbf/x34 <Private Use>
-+<UECAC>     /x83/x37/xbf/x35 <Private Use>
-+<UECAD>     /x83/x37/xbf/x36 <Private Use>
-+<UECAE>     /x83/x37/xbf/x37 <Private Use>
-+<UECAF>     /x83/x37/xbf/x38 <Private Use>
-+<UECB0>     /x83/x37/xbf/x39 <Private Use>
-+<UECB1>     /x83/x37/xc0/x30 <Private Use>
-+<UECB2>     /x83/x37/xc0/x31 <Private Use>
-+<UECB3>     /x83/x37/xc0/x32 <Private Use>
-+<UECB4>     /x83/x37/xc0/x33 <Private Use>
-+<UECB5>     /x83/x37/xc0/x34 <Private Use>
-+<UECB6>     /x83/x37/xc0/x35 <Private Use>
-+<UECB7>     /x83/x37/xc0/x36 <Private Use>
-+<UECB8>     /x83/x37/xc0/x37 <Private Use>
-+<UECB9>     /x83/x37/xc0/x38 <Private Use>
-+<UECBA>     /x83/x37/xc0/x39 <Private Use>
-+<UECBB>     /x83/x37/xc1/x30 <Private Use>
-+<UECBC>     /x83/x37/xc1/x31 <Private Use>
-+<UECBD>     /x83/x37/xc1/x32 <Private Use>
-+<UECBE>     /x83/x37/xc1/x33 <Private Use>
-+<UECBF>     /x83/x37/xc1/x34 <Private Use>
-+<UECC0>     /x83/x37/xc1/x35 <Private Use>
-+<UECC1>     /x83/x37/xc1/x36 <Private Use>
-+<UECC2>     /x83/x37/xc1/x37 <Private Use>
-+<UECC3>     /x83/x37/xc1/x38 <Private Use>
-+<UECC4>     /x83/x37/xc1/x39 <Private Use>
-+<UECC5>     /x83/x37/xc2/x30 <Private Use>
-+<UECC6>     /x83/x37/xc2/x31 <Private Use>
-+<UECC7>     /x83/x37/xc2/x32 <Private Use>
-+<UECC8>     /x83/x37/xc2/x33 <Private Use>
-+<UECC9>     /x83/x37/xc2/x34 <Private Use>
-+<UECCA>     /x83/x37/xc2/x35 <Private Use>
-+<UECCB>     /x83/x37/xc2/x36 <Private Use>
-+<UECCC>     /x83/x37/xc2/x37 <Private Use>
-+<UECCD>     /x83/x37/xc2/x38 <Private Use>
-+<UECCE>     /x83/x37/xc2/x39 <Private Use>
-+<UECCF>     /x83/x37/xc3/x30 <Private Use>
-+<UECD0>     /x83/x37/xc3/x31 <Private Use>
-+<UECD1>     /x83/x37/xc3/x32 <Private Use>
-+<UECD2>     /x83/x37/xc3/x33 <Private Use>
-+<UECD3>     /x83/x37/xc3/x34 <Private Use>
-+<UECD4>     /x83/x37/xc3/x35 <Private Use>
-+<UECD5>     /x83/x37/xc3/x36 <Private Use>
-+<UECD6>     /x83/x37/xc3/x37 <Private Use>
-+<UECD7>     /x83/x37/xc3/x38 <Private Use>
-+<UECD8>     /x83/x37/xc3/x39 <Private Use>
-+<UECD9>     /x83/x37/xc4/x30 <Private Use>
-+<UECDA>     /x83/x37/xc4/x31 <Private Use>
-+<UECDB>     /x83/x37/xc4/x32 <Private Use>
-+<UECDC>     /x83/x37/xc4/x33 <Private Use>
-+<UECDD>     /x83/x37/xc4/x34 <Private Use>
-+<UECDE>     /x83/x37/xc4/x35 <Private Use>
-+<UECDF>     /x83/x37/xc4/x36 <Private Use>
-+<UECE0>     /x83/x37/xc4/x37 <Private Use>
-+<UECE1>     /x83/x37/xc4/x38 <Private Use>
-+<UECE2>     /x83/x37/xc4/x39 <Private Use>
-+<UECE3>     /x83/x37/xc5/x30 <Private Use>
-+<UECE4>     /x83/x37/xc5/x31 <Private Use>
-+<UECE5>     /x83/x37/xc5/x32 <Private Use>
-+<UECE6>     /x83/x37/xc5/x33 <Private Use>
-+<UECE7>     /x83/x37/xc5/x34 <Private Use>
-+<UECE8>     /x83/x37/xc5/x35 <Private Use>
-+<UECE9>     /x83/x37/xc5/x36 <Private Use>
-+<UECEA>     /x83/x37/xc5/x37 <Private Use>
-+<UECEB>     /x83/x37/xc5/x38 <Private Use>
-+<UECEC>     /x83/x37/xc5/x39 <Private Use>
-+<UECED>     /x83/x37/xc6/x30 <Private Use>
-+<UECEE>     /x83/x37/xc6/x31 <Private Use>
-+<UECEF>     /x83/x37/xc6/x32 <Private Use>
-+<UECF0>     /x83/x37/xc6/x33 <Private Use>
-+<UECF1>     /x83/x37/xc6/x34 <Private Use>
-+<UECF2>     /x83/x37/xc6/x35 <Private Use>
-+<UECF3>     /x83/x37/xc6/x36 <Private Use>
-+<UECF4>     /x83/x37/xc6/x37 <Private Use>
-+<UECF5>     /x83/x37/xc6/x38 <Private Use>
-+<UECF6>     /x83/x37/xc6/x39 <Private Use>
-+<UECF7>     /x83/x37/xc7/x30 <Private Use>
-+<UECF8>     /x83/x37/xc7/x31 <Private Use>
-+<UECF9>     /x83/x37/xc7/x32 <Private Use>
-+<UECFA>     /x83/x37/xc7/x33 <Private Use>
-+<UECFB>     /x83/x37/xc7/x34 <Private Use>
-+<UECFC>     /x83/x37/xc7/x35 <Private Use>
-+<UECFD>     /x83/x37/xc7/x36 <Private Use>
-+<UECFE>     /x83/x37/xc7/x37 <Private Use>
-+<UECFF>     /x83/x37/xc7/x38 <Private Use>
-+<UED00>     /x83/x37/xc7/x39 <Private Use>
-+<UED01>     /x83/x37/xc8/x30 <Private Use>
-+<UED02>     /x83/x37/xc8/x31 <Private Use>
-+<UED03>     /x83/x37/xc8/x32 <Private Use>
-+<UED04>     /x83/x37/xc8/x33 <Private Use>
-+<UED05>     /x83/x37/xc8/x34 <Private Use>
-+<UED06>     /x83/x37/xc8/x35 <Private Use>
-+<UED07>     /x83/x37/xc8/x36 <Private Use>
-+<UED08>     /x83/x37/xc8/x37 <Private Use>
-+<UED09>     /x83/x37/xc8/x38 <Private Use>
-+<UED0A>     /x83/x37/xc8/x39 <Private Use>
-+<UED0B>     /x83/x37/xc9/x30 <Private Use>
-+<UED0C>     /x83/x37/xc9/x31 <Private Use>
-+<UED0D>     /x83/x37/xc9/x32 <Private Use>
-+<UED0E>     /x83/x37/xc9/x33 <Private Use>
-+<UED0F>     /x83/x37/xc9/x34 <Private Use>
-+<UED10>     /x83/x37/xc9/x35 <Private Use>
-+<UED11>     /x83/x37/xc9/x36 <Private Use>
-+<UED12>     /x83/x37/xc9/x37 <Private Use>
-+<UED13>     /x83/x37/xc9/x38 <Private Use>
-+<UED14>     /x83/x37/xc9/x39 <Private Use>
-+<UED15>     /x83/x37/xca/x30 <Private Use>
-+<UED16>     /x83/x37/xca/x31 <Private Use>
-+<UED17>     /x83/x37/xca/x32 <Private Use>
-+<UED18>     /x83/x37/xca/x33 <Private Use>
-+<UED19>     /x83/x37/xca/x34 <Private Use>
-+<UED1A>     /x83/x37/xca/x35 <Private Use>
-+<UED1B>     /x83/x37/xca/x36 <Private Use>
-+<UED1C>     /x83/x37/xca/x37 <Private Use>
-+<UED1D>     /x83/x37/xca/x38 <Private Use>
-+<UED1E>     /x83/x37/xca/x39 <Private Use>
-+<UED1F>     /x83/x37/xcb/x30 <Private Use>
-+<UED20>     /x83/x37/xcb/x31 <Private Use>
-+<UED21>     /x83/x37/xcb/x32 <Private Use>
-+<UED22>     /x83/x37/xcb/x33 <Private Use>
-+<UED23>     /x83/x37/xcb/x34 <Private Use>
-+<UED24>     /x83/x37/xcb/x35 <Private Use>
-+<UED25>     /x83/x37/xcb/x36 <Private Use>
-+<UED26>     /x83/x37/xcb/x37 <Private Use>
-+<UED27>     /x83/x37/xcb/x38 <Private Use>
-+<UED28>     /x83/x37/xcb/x39 <Private Use>
-+<UED29>     /x83/x37/xcc/x30 <Private Use>
-+<UED2A>     /x83/x37/xcc/x31 <Private Use>
-+<UED2B>     /x83/x37/xcc/x32 <Private Use>
-+<UED2C>     /x83/x37/xcc/x33 <Private Use>
-+<UED2D>     /x83/x37/xcc/x34 <Private Use>
-+<UED2E>     /x83/x37/xcc/x35 <Private Use>
-+<UED2F>     /x83/x37/xcc/x36 <Private Use>
-+<UED30>     /x83/x37/xcc/x37 <Private Use>
-+<UED31>     /x83/x37/xcc/x38 <Private Use>
-+<UED32>     /x83/x37/xcc/x39 <Private Use>
-+<UED33>     /x83/x37/xcd/x30 <Private Use>
-+<UED34>     /x83/x37/xcd/x31 <Private Use>
-+<UED35>     /x83/x37/xcd/x32 <Private Use>
-+<UED36>     /x83/x37/xcd/x33 <Private Use>
-+<UED37>     /x83/x37/xcd/x34 <Private Use>
-+<UED38>     /x83/x37/xcd/x35 <Private Use>
-+<UED39>     /x83/x37/xcd/x36 <Private Use>
-+<UED3A>     /x83/x37/xcd/x37 <Private Use>
-+<UED3B>     /x83/x37/xcd/x38 <Private Use>
-+<UED3C>     /x83/x37/xcd/x39 <Private Use>
-+<UED3D>     /x83/x37/xce/x30 <Private Use>
-+<UED3E>     /x83/x37/xce/x31 <Private Use>
-+<UED3F>     /x83/x37/xce/x32 <Private Use>
-+<UED40>     /x83/x37/xce/x33 <Private Use>
-+<UED41>     /x83/x37/xce/x34 <Private Use>
-+<UED42>     /x83/x37/xce/x35 <Private Use>
-+<UED43>     /x83/x37/xce/x36 <Private Use>
-+<UED44>     /x83/x37/xce/x37 <Private Use>
-+<UED45>     /x83/x37/xce/x38 <Private Use>
-+<UED46>     /x83/x37/xce/x39 <Private Use>
-+<UED47>     /x83/x37/xcf/x30 <Private Use>
-+<UED48>     /x83/x37/xcf/x31 <Private Use>
-+<UED49>     /x83/x37/xcf/x32 <Private Use>
-+<UED4A>     /x83/x37/xcf/x33 <Private Use>
-+<UED4B>     /x83/x37/xcf/x34 <Private Use>
-+<UED4C>     /x83/x37/xcf/x35 <Private Use>
-+<UED4D>     /x83/x37/xcf/x36 <Private Use>
-+<UED4E>     /x83/x37/xcf/x37 <Private Use>
-+<UED4F>     /x83/x37/xcf/x38 <Private Use>
-+<UED50>     /x83/x37/xcf/x39 <Private Use>
-+<UED51>     /x83/x37/xd0/x30 <Private Use>
-+<UED52>     /x83/x37/xd0/x31 <Private Use>
-+<UED53>     /x83/x37/xd0/x32 <Private Use>
-+<UED54>     /x83/x37/xd0/x33 <Private Use>
-+<UED55>     /x83/x37/xd0/x34 <Private Use>
-+<UED56>     /x83/x37/xd0/x35 <Private Use>
-+<UED57>     /x83/x37/xd0/x36 <Private Use>
-+<UED58>     /x83/x37/xd0/x37 <Private Use>
-+<UED59>     /x83/x37/xd0/x38 <Private Use>
-+<UED5A>     /x83/x37/xd0/x39 <Private Use>
-+<UED5B>     /x83/x37/xd1/x30 <Private Use>
-+<UED5C>     /x83/x37/xd1/x31 <Private Use>
-+<UED5D>     /x83/x37/xd1/x32 <Private Use>
-+<UED5E>     /x83/x37/xd1/x33 <Private Use>
-+<UED5F>     /x83/x37/xd1/x34 <Private Use>
-+<UED60>     /x83/x37/xd1/x35 <Private Use>
-+<UED61>     /x83/x37/xd1/x36 <Private Use>
-+<UED62>     /x83/x37/xd1/x37 <Private Use>
-+<UED63>     /x83/x37/xd1/x38 <Private Use>
-+<UED64>     /x83/x37/xd1/x39 <Private Use>
-+<UED65>     /x83/x37/xd2/x30 <Private Use>
-+<UED66>     /x83/x37/xd2/x31 <Private Use>
-+<UED67>     /x83/x37/xd2/x32 <Private Use>
-+<UED68>     /x83/x37/xd2/x33 <Private Use>
-+<UED69>     /x83/x37/xd2/x34 <Private Use>
-+<UED6A>     /x83/x37/xd2/x35 <Private Use>
-+<UED6B>     /x83/x37/xd2/x36 <Private Use>
-+<UED6C>     /x83/x37/xd2/x37 <Private Use>
-+<UED6D>     /x83/x37/xd2/x38 <Private Use>
-+<UED6E>     /x83/x37/xd2/x39 <Private Use>
-+<UED6F>     /x83/x37/xd3/x30 <Private Use>
-+<UED70>     /x83/x37/xd3/x31 <Private Use>
-+<UED71>     /x83/x37/xd3/x32 <Private Use>
-+<UED72>     /x83/x37/xd3/x33 <Private Use>
-+<UED73>     /x83/x37/xd3/x34 <Private Use>
-+<UED74>     /x83/x37/xd3/x35 <Private Use>
-+<UED75>     /x83/x37/xd3/x36 <Private Use>
-+<UED76>     /x83/x37/xd3/x37 <Private Use>
-+<UED77>     /x83/x37/xd3/x38 <Private Use>
-+<UED78>     /x83/x37/xd3/x39 <Private Use>
-+<UED79>     /x83/x37/xd4/x30 <Private Use>
-+<UED7A>     /x83/x37/xd4/x31 <Private Use>
-+<UED7B>     /x83/x37/xd4/x32 <Private Use>
-+<UED7C>     /x83/x37/xd4/x33 <Private Use>
-+<UED7D>     /x83/x37/xd4/x34 <Private Use>
-+<UED7E>     /x83/x37/xd4/x35 <Private Use>
-+<UED7F>     /x83/x37/xd4/x36 <Private Use>
-+<UED80>     /x83/x37/xd4/x37 <Private Use>
-+<UED81>     /x83/x37/xd4/x38 <Private Use>
-+<UED82>     /x83/x37/xd4/x39 <Private Use>
-+<UED83>     /x83/x37/xd5/x30 <Private Use>
-+<UED84>     /x83/x37/xd5/x31 <Private Use>
-+<UED85>     /x83/x37/xd5/x32 <Private Use>
-+<UED86>     /x83/x37/xd5/x33 <Private Use>
-+<UED87>     /x83/x37/xd5/x34 <Private Use>
-+<UED88>     /x83/x37/xd5/x35 <Private Use>
-+<UED89>     /x83/x37/xd5/x36 <Private Use>
-+<UED8A>     /x83/x37/xd5/x37 <Private Use>
-+<UED8B>     /x83/x37/xd5/x38 <Private Use>
-+<UED8C>     /x83/x37/xd5/x39 <Private Use>
-+<UED8D>     /x83/x37/xd6/x30 <Private Use>
-+<UED8E>     /x83/x37/xd6/x31 <Private Use>
-+<UED8F>     /x83/x37/xd6/x32 <Private Use>
-+<UED90>     /x83/x37/xd6/x33 <Private Use>
-+<UED91>     /x83/x37/xd6/x34 <Private Use>
-+<UED92>     /x83/x37/xd6/x35 <Private Use>
-+<UED93>     /x83/x37/xd6/x36 <Private Use>
-+<UED94>     /x83/x37/xd6/x37 <Private Use>
-+<UED95>     /x83/x37/xd6/x38 <Private Use>
-+<UED96>     /x83/x37/xd6/x39 <Private Use>
-+<UED97>     /x83/x37/xd7/x30 <Private Use>
-+<UED98>     /x83/x37/xd7/x31 <Private Use>
-+<UED99>     /x83/x37/xd7/x32 <Private Use>
-+<UED9A>     /x83/x37/xd7/x33 <Private Use>
-+<UED9B>     /x83/x37/xd7/x34 <Private Use>
-+<UED9C>     /x83/x37/xd7/x35 <Private Use>
-+<UED9D>     /x83/x37/xd7/x36 <Private Use>
-+<UED9E>     /x83/x37/xd7/x37 <Private Use>
-+<UED9F>     /x83/x37/xd7/x38 <Private Use>
-+<UEDA0>     /x83/x37/xd7/x39 <Private Use>
-+<UEDA1>     /x83/x37/xd8/x30 <Private Use>
-+<UEDA2>     /x83/x37/xd8/x31 <Private Use>
-+<UEDA3>     /x83/x37/xd8/x32 <Private Use>
-+<UEDA4>     /x83/x37/xd8/x33 <Private Use>
-+<UEDA5>     /x83/x37/xd8/x34 <Private Use>
-+<UEDA6>     /x83/x37/xd8/x35 <Private Use>
-+<UEDA7>     /x83/x37/xd8/x36 <Private Use>
-+<UEDA8>     /x83/x37/xd8/x37 <Private Use>
-+<UEDA9>     /x83/x37/xd8/x38 <Private Use>
-+<UEDAA>     /x83/x37/xd8/x39 <Private Use>
-+<UEDAB>     /x83/x37/xd9/x30 <Private Use>
-+<UEDAC>     /x83/x37/xd9/x31 <Private Use>
-+<UEDAD>     /x83/x37/xd9/x32 <Private Use>
-+<UEDAE>     /x83/x37/xd9/x33 <Private Use>
-+<UEDAF>     /x83/x37/xd9/x34 <Private Use>
-+<UEDB0>     /x83/x37/xd9/x35 <Private Use>
-+<UEDB1>     /x83/x37/xd9/x36 <Private Use>
-+<UEDB2>     /x83/x37/xd9/x37 <Private Use>
-+<UEDB3>     /x83/x37/xd9/x38 <Private Use>
-+<UEDB4>     /x83/x37/xd9/x39 <Private Use>
-+<UEDB5>     /x83/x37/xda/x30 <Private Use>
-+<UEDB6>     /x83/x37/xda/x31 <Private Use>
-+<UEDB7>     /x83/x37/xda/x32 <Private Use>
-+<UEDB8>     /x83/x37/xda/x33 <Private Use>
-+<UEDB9>     /x83/x37/xda/x34 <Private Use>
-+<UEDBA>     /x83/x37/xda/x35 <Private Use>
-+<UEDBB>     /x83/x37/xda/x36 <Private Use>
-+<UEDBC>     /x83/x37/xda/x37 <Private Use>
-+<UEDBD>     /x83/x37/xda/x38 <Private Use>
-+<UEDBE>     /x83/x37/xda/x39 <Private Use>
-+<UEDBF>     /x83/x37/xdb/x30 <Private Use>
-+<UEDC0>     /x83/x37/xdb/x31 <Private Use>
-+<UEDC1>     /x83/x37/xdb/x32 <Private Use>
-+<UEDC2>     /x83/x37/xdb/x33 <Private Use>
-+<UEDC3>     /x83/x37/xdb/x34 <Private Use>
-+<UEDC4>     /x83/x37/xdb/x35 <Private Use>
-+<UEDC5>     /x83/x37/xdb/x36 <Private Use>
-+<UEDC6>     /x83/x37/xdb/x37 <Private Use>
-+<UEDC7>     /x83/x37/xdb/x38 <Private Use>
-+<UEDC8>     /x83/x37/xdb/x39 <Private Use>
-+<UEDC9>     /x83/x37/xdc/x30 <Private Use>
-+<UEDCA>     /x83/x37/xdc/x31 <Private Use>
-+<UEDCB>     /x83/x37/xdc/x32 <Private Use>
-+<UEDCC>     /x83/x37/xdc/x33 <Private Use>
-+<UEDCD>     /x83/x37/xdc/x34 <Private Use>
-+<UEDCE>     /x83/x37/xdc/x35 <Private Use>
-+<UEDCF>     /x83/x37/xdc/x36 <Private Use>
-+<UEDD0>     /x83/x37/xdc/x37 <Private Use>
-+<UEDD1>     /x83/x37/xdc/x38 <Private Use>
-+<UEDD2>     /x83/x37/xdc/x39 <Private Use>
-+<UEDD3>     /x83/x37/xdd/x30 <Private Use>
-+<UEDD4>     /x83/x37/xdd/x31 <Private Use>
-+<UEDD5>     /x83/x37/xdd/x32 <Private Use>
-+<UEDD6>     /x83/x37/xdd/x33 <Private Use>
-+<UEDD7>     /x83/x37/xdd/x34 <Private Use>
-+<UEDD8>     /x83/x37/xdd/x35 <Private Use>
-+<UEDD9>     /x83/x37/xdd/x36 <Private Use>
-+<UEDDA>     /x83/x37/xdd/x37 <Private Use>
-+<UEDDB>     /x83/x37/xdd/x38 <Private Use>
-+<UEDDC>     /x83/x37/xdd/x39 <Private Use>
-+<UEDDD>     /x83/x37/xde/x30 <Private Use>
-+<UEDDE>     /x83/x37/xde/x31 <Private Use>
-+<UEDDF>     /x83/x37/xde/x32 <Private Use>
-+<UEDE0>     /x83/x37/xde/x33 <Private Use>
-+<UEDE1>     /x83/x37/xde/x34 <Private Use>
-+<UEDE2>     /x83/x37/xde/x35 <Private Use>
-+<UEDE3>     /x83/x37/xde/x36 <Private Use>
-+<UEDE4>     /x83/x37/xde/x37 <Private Use>
-+<UEDE5>     /x83/x37/xde/x38 <Private Use>
-+<UEDE6>     /x83/x37/xde/x39 <Private Use>
-+<UEDE7>     /x83/x37/xdf/x30 <Private Use>
-+<UEDE8>     /x83/x37/xdf/x31 <Private Use>
-+<UEDE9>     /x83/x37/xdf/x32 <Private Use>
-+<UEDEA>     /x83/x37/xdf/x33 <Private Use>
-+<UEDEB>     /x83/x37/xdf/x34 <Private Use>
-+<UEDEC>     /x83/x37/xdf/x35 <Private Use>
-+<UEDED>     /x83/x37/xdf/x36 <Private Use>
-+<UEDEE>     /x83/x37/xdf/x37 <Private Use>
-+<UEDEF>     /x83/x37/xdf/x38 <Private Use>
-+<UEDF0>     /x83/x37/xdf/x39 <Private Use>
-+<UEDF1>     /x83/x37/xe0/x30 <Private Use>
-+<UEDF2>     /x83/x37/xe0/x31 <Private Use>
-+<UEDF3>     /x83/x37/xe0/x32 <Private Use>
-+<UEDF4>     /x83/x37/xe0/x33 <Private Use>
-+<UEDF5>     /x83/x37/xe0/x34 <Private Use>
-+<UEDF6>     /x83/x37/xe0/x35 <Private Use>
-+<UEDF7>     /x83/x37/xe0/x36 <Private Use>
-+<UEDF8>     /x83/x37/xe0/x37 <Private Use>
-+<UEDF9>     /x83/x37/xe0/x38 <Private Use>
-+<UEDFA>     /x83/x37/xe0/x39 <Private Use>
-+<UEDFB>     /x83/x37/xe1/x30 <Private Use>
-+<UEDFC>     /x83/x37/xe1/x31 <Private Use>
-+<UEDFD>     /x83/x37/xe1/x32 <Private Use>
-+<UEDFE>     /x83/x37/xe1/x33 <Private Use>
-+<UEDFF>     /x83/x37/xe1/x34 <Private Use>
-+<UEE00>     /x83/x37/xe1/x35 <Private Use>
-+<UEE01>     /x83/x37/xe1/x36 <Private Use>
-+<UEE02>     /x83/x37/xe1/x37 <Private Use>
-+<UEE03>     /x83/x37/xe1/x38 <Private Use>
-+<UEE04>     /x83/x37/xe1/x39 <Private Use>
-+<UEE05>     /x83/x37/xe2/x30 <Private Use>
-+<UEE06>     /x83/x37/xe2/x31 <Private Use>
-+<UEE07>     /x83/x37/xe2/x32 <Private Use>
-+<UEE08>     /x83/x37/xe2/x33 <Private Use>
-+<UEE09>     /x83/x37/xe2/x34 <Private Use>
-+<UEE0A>     /x83/x37/xe2/x35 <Private Use>
-+<UEE0B>     /x83/x37/xe2/x36 <Private Use>
-+<UEE0C>     /x83/x37/xe2/x37 <Private Use>
-+<UEE0D>     /x83/x37/xe2/x38 <Private Use>
-+<UEE0E>     /x83/x37/xe2/x39 <Private Use>
-+<UEE0F>     /x83/x37/xe3/x30 <Private Use>
-+<UEE10>     /x83/x37/xe3/x31 <Private Use>
-+<UEE11>     /x83/x37/xe3/x32 <Private Use>
-+<UEE12>     /x83/x37/xe3/x33 <Private Use>
-+<UEE13>     /x83/x37/xe3/x34 <Private Use>
-+<UEE14>     /x83/x37/xe3/x35 <Private Use>
-+<UEE15>     /x83/x37/xe3/x36 <Private Use>
-+<UEE16>     /x83/x37/xe3/x37 <Private Use>
-+<UEE17>     /x83/x37/xe3/x38 <Private Use>
-+<UEE18>     /x83/x37/xe3/x39 <Private Use>
-+<UEE19>     /x83/x37/xe4/x30 <Private Use>
-+<UEE1A>     /x83/x37/xe4/x31 <Private Use>
-+<UEE1B>     /x83/x37/xe4/x32 <Private Use>
-+<UEE1C>     /x83/x37/xe4/x33 <Private Use>
-+<UEE1D>     /x83/x37/xe4/x34 <Private Use>
-+<UEE1E>     /x83/x37/xe4/x35 <Private Use>
-+<UEE1F>     /x83/x37/xe4/x36 <Private Use>
-+<UEE20>     /x83/x37/xe4/x37 <Private Use>
-+<UEE21>     /x83/x37/xe4/x38 <Private Use>
-+<UEE22>     /x83/x37/xe4/x39 <Private Use>
-+<UEE23>     /x83/x37/xe5/x30 <Private Use>
-+<UEE24>     /x83/x37/xe5/x31 <Private Use>
-+<UEE25>     /x83/x37/xe5/x32 <Private Use>
-+<UEE26>     /x83/x37/xe5/x33 <Private Use>
-+<UEE27>     /x83/x37/xe5/x34 <Private Use>
-+<UEE28>     /x83/x37/xe5/x35 <Private Use>
-+<UEE29>     /x83/x37/xe5/x36 <Private Use>
-+<UEE2A>     /x83/x37/xe5/x37 <Private Use>
-+<UEE2B>     /x83/x37/xe5/x38 <Private Use>
-+<UEE2C>     /x83/x37/xe5/x39 <Private Use>
-+<UEE2D>     /x83/x37/xe6/x30 <Private Use>
-+<UEE2E>     /x83/x37/xe6/x31 <Private Use>
-+<UEE2F>     /x83/x37/xe6/x32 <Private Use>
-+<UEE30>     /x83/x37/xe6/x33 <Private Use>
-+<UEE31>     /x83/x37/xe6/x34 <Private Use>
-+<UEE32>     /x83/x37/xe6/x35 <Private Use>
-+<UEE33>     /x83/x37/xe6/x36 <Private Use>
-+<UEE34>     /x83/x37/xe6/x37 <Private Use>
-+<UEE35>     /x83/x37/xe6/x38 <Private Use>
-+<UEE36>     /x83/x37/xe6/x39 <Private Use>
-+<UEE37>     /x83/x37/xe7/x30 <Private Use>
-+<UEE38>     /x83/x37/xe7/x31 <Private Use>
-+<UEE39>     /x83/x37/xe7/x32 <Private Use>
-+<UEE3A>     /x83/x37/xe7/x33 <Private Use>
-+<UEE3B>     /x83/x37/xe7/x34 <Private Use>
-+<UEE3C>     /x83/x37/xe7/x35 <Private Use>
-+<UEE3D>     /x83/x37/xe7/x36 <Private Use>
-+<UEE3E>     /x83/x37/xe7/x37 <Private Use>
-+<UEE3F>     /x83/x37/xe7/x38 <Private Use>
-+<UEE40>     /x83/x37/xe7/x39 <Private Use>
-+<UEE41>     /x83/x37/xe8/x30 <Private Use>
-+<UEE42>     /x83/x37/xe8/x31 <Private Use>
-+<UEE43>     /x83/x37/xe8/x32 <Private Use>
-+<UEE44>     /x83/x37/xe8/x33 <Private Use>
-+<UEE45>     /x83/x37/xe8/x34 <Private Use>
-+<UEE46>     /x83/x37/xe8/x35 <Private Use>
-+<UEE47>     /x83/x37/xe8/x36 <Private Use>
-+<UEE48>     /x83/x37/xe8/x37 <Private Use>
-+<UEE49>     /x83/x37/xe8/x38 <Private Use>
-+<UEE4A>     /x83/x37/xe8/x39 <Private Use>
-+<UEE4B>     /x83/x37/xe9/x30 <Private Use>
-+<UEE4C>     /x83/x37/xe9/x31 <Private Use>
-+<UEE4D>     /x83/x37/xe9/x32 <Private Use>
-+<UEE4E>     /x83/x37/xe9/x33 <Private Use>
-+<UEE4F>     /x83/x37/xe9/x34 <Private Use>
-+<UEE50>     /x83/x37/xe9/x35 <Private Use>
-+<UEE51>     /x83/x37/xe9/x36 <Private Use>
-+<UEE52>     /x83/x37/xe9/x37 <Private Use>
-+<UEE53>     /x83/x37/xe9/x38 <Private Use>
-+<UEE54>     /x83/x37/xe9/x39 <Private Use>
-+<UEE55>     /x83/x37/xea/x30 <Private Use>
-+<UEE56>     /x83/x37/xea/x31 <Private Use>
-+<UEE57>     /x83/x37/xea/x32 <Private Use>
-+<UEE58>     /x83/x37/xea/x33 <Private Use>
-+<UEE59>     /x83/x37/xea/x34 <Private Use>
-+<UEE5A>     /x83/x37/xea/x35 <Private Use>
-+<UEE5B>     /x83/x37/xea/x36 <Private Use>
-+<UEE5C>     /x83/x37/xea/x37 <Private Use>
-+<UEE5D>     /x83/x37/xea/x38 <Private Use>
-+<UEE5E>     /x83/x37/xea/x39 <Private Use>
-+<UEE5F>     /x83/x37/xeb/x30 <Private Use>
-+<UEE60>     /x83/x37/xeb/x31 <Private Use>
-+<UEE61>     /x83/x37/xeb/x32 <Private Use>
-+<UEE62>     /x83/x37/xeb/x33 <Private Use>
-+<UEE63>     /x83/x37/xeb/x34 <Private Use>
-+<UEE64>     /x83/x37/xeb/x35 <Private Use>
-+<UEE65>     /x83/x37/xeb/x36 <Private Use>
-+<UEE66>     /x83/x37/xeb/x37 <Private Use>
-+<UEE67>     /x83/x37/xeb/x38 <Private Use>
-+<UEE68>     /x83/x37/xeb/x39 <Private Use>
-+<UEE69>     /x83/x37/xec/x30 <Private Use>
-+<UEE6A>     /x83/x37/xec/x31 <Private Use>
-+<UEE6B>     /x83/x37/xec/x32 <Private Use>
-+<UEE6C>     /x83/x37/xec/x33 <Private Use>
-+<UEE6D>     /x83/x37/xec/x34 <Private Use>
-+<UEE6E>     /x83/x37/xec/x35 <Private Use>
-+<UEE6F>     /x83/x37/xec/x36 <Private Use>
-+<UEE70>     /x83/x37/xec/x37 <Private Use>
-+<UEE71>     /x83/x37/xec/x38 <Private Use>
-+<UEE72>     /x83/x37/xec/x39 <Private Use>
-+<UEE73>     /x83/x37/xed/x30 <Private Use>
-+<UEE74>     /x83/x37/xed/x31 <Private Use>
-+<UEE75>     /x83/x37/xed/x32 <Private Use>
-+<UEE76>     /x83/x37/xed/x33 <Private Use>
-+<UEE77>     /x83/x37/xed/x34 <Private Use>
-+<UEE78>     /x83/x37/xed/x35 <Private Use>
-+<UEE79>     /x83/x37/xed/x36 <Private Use>
-+<UEE7A>     /x83/x37/xed/x37 <Private Use>
-+<UEE7B>     /x83/x37/xed/x38 <Private Use>
-+<UEE7C>     /x83/x37/xed/x39 <Private Use>
-+<UEE7D>     /x83/x37/xee/x30 <Private Use>
-+<UEE7E>     /x83/x37/xee/x31 <Private Use>
-+<UEE7F>     /x83/x37/xee/x32 <Private Use>
-+<UEE80>     /x83/x37/xee/x33 <Private Use>
-+<UEE81>     /x83/x37/xee/x34 <Private Use>
-+<UEE82>     /x83/x37/xee/x35 <Private Use>
-+<UEE83>     /x83/x37/xee/x36 <Private Use>
-+<UEE84>     /x83/x37/xee/x37 <Private Use>
-+<UEE85>     /x83/x37/xee/x38 <Private Use>
-+<UEE86>     /x83/x37/xee/x39 <Private Use>
-+<UEE87>     /x83/x37/xef/x30 <Private Use>
-+<UEE88>     /x83/x37/xef/x31 <Private Use>
-+<UEE89>     /x83/x37/xef/x32 <Private Use>
-+<UEE8A>     /x83/x37/xef/x33 <Private Use>
-+<UEE8B>     /x83/x37/xef/x34 <Private Use>
-+<UEE8C>     /x83/x37/xef/x35 <Private Use>
-+<UEE8D>     /x83/x37/xef/x36 <Private Use>
-+<UEE8E>     /x83/x37/xef/x37 <Private Use>
-+<UEE8F>     /x83/x37/xef/x38 <Private Use>
-+<UEE90>     /x83/x37/xef/x39 <Private Use>
-+<UEE91>     /x83/x37/xf0/x30 <Private Use>
-+<UEE92>     /x83/x37/xf0/x31 <Private Use>
-+<UEE93>     /x83/x37/xf0/x32 <Private Use>
-+<UEE94>     /x83/x37/xf0/x33 <Private Use>
-+<UEE95>     /x83/x37/xf0/x34 <Private Use>
-+<UEE96>     /x83/x37/xf0/x35 <Private Use>
-+<UEE97>     /x83/x37/xf0/x36 <Private Use>
-+<UEE98>     /x83/x37/xf0/x37 <Private Use>
-+<UEE99>     /x83/x37/xf0/x38 <Private Use>
-+<UEE9A>     /x83/x37/xf0/x39 <Private Use>
-+<UEE9B>     /x83/x37/xf1/x30 <Private Use>
-+<UEE9C>     /x83/x37/xf1/x31 <Private Use>
-+<UEE9D>     /x83/x37/xf1/x32 <Private Use>
-+<UEE9E>     /x83/x37/xf1/x33 <Private Use>
-+<UEE9F>     /x83/x37/xf1/x34 <Private Use>
-+<UEEA0>     /x83/x37/xf1/x35 <Private Use>
-+<UEEA1>     /x83/x37/xf1/x36 <Private Use>
-+<UEEA2>     /x83/x37/xf1/x37 <Private Use>
-+<UEEA3>     /x83/x37/xf1/x38 <Private Use>
-+<UEEA4>     /x83/x37/xf1/x39 <Private Use>
-+<UEEA5>     /x83/x37/xf2/x30 <Private Use>
-+<UEEA6>     /x83/x37/xf2/x31 <Private Use>
-+<UEEA7>     /x83/x37/xf2/x32 <Private Use>
-+<UEEA8>     /x83/x37/xf2/x33 <Private Use>
-+<UEEA9>     /x83/x37/xf2/x34 <Private Use>
-+<UEEAA>     /x83/x37/xf2/x35 <Private Use>
-+<UEEAB>     /x83/x37/xf2/x36 <Private Use>
-+<UEEAC>     /x83/x37/xf2/x37 <Private Use>
-+<UEEAD>     /x83/x37/xf2/x38 <Private Use>
-+<UEEAE>     /x83/x37/xf2/x39 <Private Use>
-+<UEEAF>     /x83/x37/xf3/x30 <Private Use>
-+<UEEB0>     /x83/x37/xf3/x31 <Private Use>
-+<UEEB1>     /x83/x37/xf3/x32 <Private Use>
-+<UEEB2>     /x83/x37/xf3/x33 <Private Use>
-+<UEEB3>     /x83/x37/xf3/x34 <Private Use>
-+<UEEB4>     /x83/x37/xf3/x35 <Private Use>
-+<UEEB5>     /x83/x37/xf3/x36 <Private Use>
-+<UEEB6>     /x83/x37/xf3/x37 <Private Use>
-+<UEEB7>     /x83/x37/xf3/x38 <Private Use>
-+<UEEB8>     /x83/x37/xf3/x39 <Private Use>
-+<UEEB9>     /x83/x37/xf4/x30 <Private Use>
-+<UEEBA>     /x83/x37/xf4/x31 <Private Use>
-+<UEEBB>     /x83/x37/xf4/x32 <Private Use>
-+<UEEBC>     /x83/x37/xf4/x33 <Private Use>
-+<UEEBD>     /x83/x37/xf4/x34 <Private Use>
-+<UEEBE>     /x83/x37/xf4/x35 <Private Use>
-+<UEEBF>     /x83/x37/xf4/x36 <Private Use>
-+<UEEC0>     /x83/x37/xf4/x37 <Private Use>
-+<UEEC1>     /x83/x37/xf4/x38 <Private Use>
-+<UEEC2>     /x83/x37/xf4/x39 <Private Use>
-+<UEEC3>     /x83/x37/xf5/x30 <Private Use>
-+<UEEC4>     /x83/x37/xf5/x31 <Private Use>
-+<UEEC5>     /x83/x37/xf5/x32 <Private Use>
-+<UEEC6>     /x83/x37/xf5/x33 <Private Use>
-+<UEEC7>     /x83/x37/xf5/x34 <Private Use>
-+<UEEC8>     /x83/x37/xf5/x35 <Private Use>
-+<UEEC9>     /x83/x37/xf5/x36 <Private Use>
-+<UEECA>     /x83/x37/xf5/x37 <Private Use>
-+<UEECB>     /x83/x37/xf5/x38 <Private Use>
-+<UEECC>     /x83/x37/xf5/x39 <Private Use>
-+<UEECD>     /x83/x37/xf6/x30 <Private Use>
-+<UEECE>     /x83/x37/xf6/x31 <Private Use>
-+<UEECF>     /x83/x37/xf6/x32 <Private Use>
-+<UEED0>     /x83/x37/xf6/x33 <Private Use>
-+<UEED1>     /x83/x37/xf6/x34 <Private Use>
-+<UEED2>     /x83/x37/xf6/x35 <Private Use>
-+<UEED3>     /x83/x37/xf6/x36 <Private Use>
-+<UEED4>     /x83/x37/xf6/x37 <Private Use>
-+<UEED5>     /x83/x37/xf6/x38 <Private Use>
-+<UEED6>     /x83/x37/xf6/x39 <Private Use>
-+<UEED7>     /x83/x37/xf7/x30 <Private Use>
-+<UEED8>     /x83/x37/xf7/x31 <Private Use>
-+<UEED9>     /x83/x37/xf7/x32 <Private Use>
-+<UEEDA>     /x83/x37/xf7/x33 <Private Use>
-+<UEEDB>     /x83/x37/xf7/x34 <Private Use>
-+<UEEDC>     /x83/x37/xf7/x35 <Private Use>
-+<UEEDD>     /x83/x37/xf7/x36 <Private Use>
-+<UEEDE>     /x83/x37/xf7/x37 <Private Use>
-+<UEEDF>     /x83/x37/xf7/x38 <Private Use>
-+<UEEE0>     /x83/x37/xf7/x39 <Private Use>
-+<UEEE1>     /x83/x37/xf8/x30 <Private Use>
-+<UEEE2>     /x83/x37/xf8/x31 <Private Use>
-+<UEEE3>     /x83/x37/xf8/x32 <Private Use>
-+<UEEE4>     /x83/x37/xf8/x33 <Private Use>
-+<UEEE5>     /x83/x37/xf8/x34 <Private Use>
-+<UEEE6>     /x83/x37/xf8/x35 <Private Use>
-+<UEEE7>     /x83/x37/xf8/x36 <Private Use>
-+<UEEE8>     /x83/x37/xf8/x37 <Private Use>
-+<UEEE9>     /x83/x37/xf8/x38 <Private Use>
-+<UEEEA>     /x83/x37/xf8/x39 <Private Use>
-+<UEEEB>     /x83/x37/xf9/x30 <Private Use>
-+<UEEEC>     /x83/x37/xf9/x31 <Private Use>
-+<UEEED>     /x83/x37/xf9/x32 <Private Use>
-+<UEEEE>     /x83/x37/xf9/x33 <Private Use>
-+<UEEEF>     /x83/x37/xf9/x34 <Private Use>
-+<UEEF0>     /x83/x37/xf9/x35 <Private Use>
-+<UEEF1>     /x83/x37/xf9/x36 <Private Use>
-+<UEEF2>     /x83/x37/xf9/x37 <Private Use>
-+<UEEF3>     /x83/x37/xf9/x38 <Private Use>
-+<UEEF4>     /x83/x37/xf9/x39 <Private Use>
-+<UEEF5>     /x83/x37/xfa/x30 <Private Use>
-+<UEEF6>     /x83/x37/xfa/x31 <Private Use>
-+<UEEF7>     /x83/x37/xfa/x32 <Private Use>
-+<UEEF8>     /x83/x37/xfa/x33 <Private Use>
-+<UEEF9>     /x83/x37/xfa/x34 <Private Use>
-+<UEEFA>     /x83/x37/xfa/x35 <Private Use>
-+<UEEFB>     /x83/x37/xfa/x36 <Private Use>
-+<UEEFC>     /x83/x37/xfa/x37 <Private Use>
-+<UEEFD>     /x83/x37/xfa/x38 <Private Use>
-+<UEEFE>     /x83/x37/xfa/x39 <Private Use>
-+<UEEFF>     /x83/x37/xfb/x30 <Private Use>
-+<UEF00>     /x83/x37/xfb/x31 <Private Use>
-+<UEF01>     /x83/x37/xfb/x32 <Private Use>
-+<UEF02>     /x83/x37/xfb/x33 <Private Use>
-+<UEF03>     /x83/x37/xfb/x34 <Private Use>
-+<UEF04>     /x83/x37/xfb/x35 <Private Use>
-+<UEF05>     /x83/x37/xfb/x36 <Private Use>
-+<UEF06>     /x83/x37/xfb/x37 <Private Use>
-+<UEF07>     /x83/x37/xfb/x38 <Private Use>
-+<UEF08>     /x83/x37/xfb/x39 <Private Use>
-+<UEF09>     /x83/x37/xfc/x30 <Private Use>
-+<UEF0A>     /x83/x37/xfc/x31 <Private Use>
-+<UEF0B>     /x83/x37/xfc/x32 <Private Use>
-+<UEF0C>     /x83/x37/xfc/x33 <Private Use>
-+<UEF0D>     /x83/x37/xfc/x34 <Private Use>
-+<UEF0E>     /x83/x37/xfc/x35 <Private Use>
-+<UEF0F>     /x83/x37/xfc/x36 <Private Use>
-+<UEF10>     /x83/x37/xfc/x37 <Private Use>
-+<UEF11>     /x83/x37/xfc/x38 <Private Use>
-+<UEF12>     /x83/x37/xfc/x39 <Private Use>
-+<UEF13>     /x83/x37/xfd/x30 <Private Use>
-+<UEF14>     /x83/x37/xfd/x31 <Private Use>
-+<UEF15>     /x83/x37/xfd/x32 <Private Use>
-+<UEF16>     /x83/x37/xfd/x33 <Private Use>
-+<UEF17>     /x83/x37/xfd/x34 <Private Use>
-+<UEF18>     /x83/x37/xfd/x35 <Private Use>
-+<UEF19>     /x83/x37/xfd/x36 <Private Use>
-+<UEF1A>     /x83/x37/xfd/x37 <Private Use>
-+<UEF1B>     /x83/x37/xfd/x38 <Private Use>
-+<UEF1C>     /x83/x37/xfd/x39 <Private Use>
-+<UEF1D>     /x83/x37/xfe/x30 <Private Use>
-+<UEF1E>     /x83/x37/xfe/x31 <Private Use>
-+<UEF1F>     /x83/x37/xfe/x32 <Private Use>
-+<UEF20>     /x83/x37/xfe/x33 <Private Use>
-+<UEF21>     /x83/x37/xfe/x34 <Private Use>
-+<UEF22>     /x83/x37/xfe/x35 <Private Use>
-+<UEF23>     /x83/x37/xfe/x36 <Private Use>
-+<UEF24>     /x83/x37/xfe/x37 <Private Use>
-+<UEF25>     /x83/x37/xfe/x38 <Private Use>
-+<UEF26>     /x83/x37/xfe/x39 <Private Use>
-+<UEF27>     /x83/x38/x81/x30 <Private Use>
-+<UEF28>     /x83/x38/x81/x31 <Private Use>
-+<UEF29>     /x83/x38/x81/x32 <Private Use>
-+<UEF2A>     /x83/x38/x81/x33 <Private Use>
-+<UEF2B>     /x83/x38/x81/x34 <Private Use>
-+<UEF2C>     /x83/x38/x81/x35 <Private Use>
-+<UEF2D>     /x83/x38/x81/x36 <Private Use>
-+<UEF2E>     /x83/x38/x81/x37 <Private Use>
-+<UEF2F>     /x83/x38/x81/x38 <Private Use>
-+<UEF30>     /x83/x38/x81/x39 <Private Use>
-+<UEF31>     /x83/x38/x82/x30 <Private Use>
-+<UEF32>     /x83/x38/x82/x31 <Private Use>
-+<UEF33>     /x83/x38/x82/x32 <Private Use>
-+<UEF34>     /x83/x38/x82/x33 <Private Use>
-+<UEF35>     /x83/x38/x82/x34 <Private Use>
-+<UEF36>     /x83/x38/x82/x35 <Private Use>
-+<UEF37>     /x83/x38/x82/x36 <Private Use>
-+<UEF38>     /x83/x38/x82/x37 <Private Use>
-+<UEF39>     /x83/x38/x82/x38 <Private Use>
-+<UEF3A>     /x83/x38/x82/x39 <Private Use>
-+<UEF3B>     /x83/x38/x83/x30 <Private Use>
-+<UEF3C>     /x83/x38/x83/x31 <Private Use>
-+<UEF3D>     /x83/x38/x83/x32 <Private Use>
-+<UEF3E>     /x83/x38/x83/x33 <Private Use>
-+<UEF3F>     /x83/x38/x83/x34 <Private Use>
-+<UEF40>     /x83/x38/x83/x35 <Private Use>
-+<UEF41>     /x83/x38/x83/x36 <Private Use>
-+<UEF42>     /x83/x38/x83/x37 <Private Use>
-+<UEF43>     /x83/x38/x83/x38 <Private Use>
-+<UEF44>     /x83/x38/x83/x39 <Private Use>
-+<UEF45>     /x83/x38/x84/x30 <Private Use>
-+<UEF46>     /x83/x38/x84/x31 <Private Use>
-+<UEF47>     /x83/x38/x84/x32 <Private Use>
-+<UEF48>     /x83/x38/x84/x33 <Private Use>
-+<UEF49>     /x83/x38/x84/x34 <Private Use>
-+<UEF4A>     /x83/x38/x84/x35 <Private Use>
-+<UEF4B>     /x83/x38/x84/x36 <Private Use>
-+<UEF4C>     /x83/x38/x84/x37 <Private Use>
-+<UEF4D>     /x83/x38/x84/x38 <Private Use>
-+<UEF4E>     /x83/x38/x84/x39 <Private Use>
-+<UEF4F>     /x83/x38/x85/x30 <Private Use>
-+<UEF50>     /x83/x38/x85/x31 <Private Use>
-+<UEF51>     /x83/x38/x85/x32 <Private Use>
-+<UEF52>     /x83/x38/x85/x33 <Private Use>
-+<UEF53>     /x83/x38/x85/x34 <Private Use>
-+<UEF54>     /x83/x38/x85/x35 <Private Use>
-+<UEF55>     /x83/x38/x85/x36 <Private Use>
-+<UEF56>     /x83/x38/x85/x37 <Private Use>
-+<UEF57>     /x83/x38/x85/x38 <Private Use>
-+<UEF58>     /x83/x38/x85/x39 <Private Use>
-+<UEF59>     /x83/x38/x86/x30 <Private Use>
-+<UEF5A>     /x83/x38/x86/x31 <Private Use>
-+<UEF5B>     /x83/x38/x86/x32 <Private Use>
-+<UEF5C>     /x83/x38/x86/x33 <Private Use>
-+<UEF5D>     /x83/x38/x86/x34 <Private Use>
-+<UEF5E>     /x83/x38/x86/x35 <Private Use>
-+<UEF5F>     /x83/x38/x86/x36 <Private Use>
-+<UEF60>     /x83/x38/x86/x37 <Private Use>
-+<UEF61>     /x83/x38/x86/x38 <Private Use>
-+<UEF62>     /x83/x38/x86/x39 <Private Use>
-+<UEF63>     /x83/x38/x87/x30 <Private Use>
-+<UEF64>     /x83/x38/x87/x31 <Private Use>
-+<UEF65>     /x83/x38/x87/x32 <Private Use>
-+<UEF66>     /x83/x38/x87/x33 <Private Use>
-+<UEF67>     /x83/x38/x87/x34 <Private Use>
-+<UEF68>     /x83/x38/x87/x35 <Private Use>
-+<UEF69>     /x83/x38/x87/x36 <Private Use>
-+<UEF6A>     /x83/x38/x87/x37 <Private Use>
-+<UEF6B>     /x83/x38/x87/x38 <Private Use>
-+<UEF6C>     /x83/x38/x87/x39 <Private Use>
-+<UEF6D>     /x83/x38/x88/x30 <Private Use>
-+<UEF6E>     /x83/x38/x88/x31 <Private Use>
-+<UEF6F>     /x83/x38/x88/x32 <Private Use>
-+<UEF70>     /x83/x38/x88/x33 <Private Use>
-+<UEF71>     /x83/x38/x88/x34 <Private Use>
-+<UEF72>     /x83/x38/x88/x35 <Private Use>
-+<UEF73>     /x83/x38/x88/x36 <Private Use>
-+<UEF74>     /x83/x38/x88/x37 <Private Use>
-+<UEF75>     /x83/x38/x88/x38 <Private Use>
-+<UEF76>     /x83/x38/x88/x39 <Private Use>
-+<UEF77>     /x83/x38/x89/x30 <Private Use>
-+<UEF78>     /x83/x38/x89/x31 <Private Use>
-+<UEF79>     /x83/x38/x89/x32 <Private Use>
-+<UEF7A>     /x83/x38/x89/x33 <Private Use>
-+<UEF7B>     /x83/x38/x89/x34 <Private Use>
-+<UEF7C>     /x83/x38/x89/x35 <Private Use>
-+<UEF7D>     /x83/x38/x89/x36 <Private Use>
-+<UEF7E>     /x83/x38/x89/x37 <Private Use>
-+<UEF7F>     /x83/x38/x89/x38 <Private Use>
-+<UEF80>     /x83/x38/x89/x39 <Private Use>
-+<UEF81>     /x83/x38/x8a/x30 <Private Use>
-+<UEF82>     /x83/x38/x8a/x31 <Private Use>
-+<UEF83>     /x83/x38/x8a/x32 <Private Use>
-+<UEF84>     /x83/x38/x8a/x33 <Private Use>
-+<UEF85>     /x83/x38/x8a/x34 <Private Use>
-+<UEF86>     /x83/x38/x8a/x35 <Private Use>
-+<UEF87>     /x83/x38/x8a/x36 <Private Use>
-+<UEF88>     /x83/x38/x8a/x37 <Private Use>
-+<UEF89>     /x83/x38/x8a/x38 <Private Use>
-+<UEF8A>     /x83/x38/x8a/x39 <Private Use>
-+<UEF8B>     /x83/x38/x8b/x30 <Private Use>
-+<UEF8C>     /x83/x38/x8b/x31 <Private Use>
-+<UEF8D>     /x83/x38/x8b/x32 <Private Use>
-+<UEF8E>     /x83/x38/x8b/x33 <Private Use>
-+<UEF8F>     /x83/x38/x8b/x34 <Private Use>
-+<UEF90>     /x83/x38/x8b/x35 <Private Use>
-+<UEF91>     /x83/x38/x8b/x36 <Private Use>
-+<UEF92>     /x83/x38/x8b/x37 <Private Use>
-+<UEF93>     /x83/x38/x8b/x38 <Private Use>
-+<UEF94>     /x83/x38/x8b/x39 <Private Use>
-+<UEF95>     /x83/x38/x8c/x30 <Private Use>
-+<UEF96>     /x83/x38/x8c/x31 <Private Use>
-+<UEF97>     /x83/x38/x8c/x32 <Private Use>
-+<UEF98>     /x83/x38/x8c/x33 <Private Use>
-+<UEF99>     /x83/x38/x8c/x34 <Private Use>
-+<UEF9A>     /x83/x38/x8c/x35 <Private Use>
-+<UEF9B>     /x83/x38/x8c/x36 <Private Use>
-+<UEF9C>     /x83/x38/x8c/x37 <Private Use>
-+<UEF9D>     /x83/x38/x8c/x38 <Private Use>
-+<UEF9E>     /x83/x38/x8c/x39 <Private Use>
-+<UEF9F>     /x83/x38/x8d/x30 <Private Use>
-+<UEFA0>     /x83/x38/x8d/x31 <Private Use>
-+<UEFA1>     /x83/x38/x8d/x32 <Private Use>
-+<UEFA2>     /x83/x38/x8d/x33 <Private Use>
-+<UEFA3>     /x83/x38/x8d/x34 <Private Use>
-+<UEFA4>     /x83/x38/x8d/x35 <Private Use>
-+<UEFA5>     /x83/x38/x8d/x36 <Private Use>
-+<UEFA6>     /x83/x38/x8d/x37 <Private Use>
-+<UEFA7>     /x83/x38/x8d/x38 <Private Use>
-+<UEFA8>     /x83/x38/x8d/x39 <Private Use>
-+<UEFA9>     /x83/x38/x8e/x30 <Private Use>
-+<UEFAA>     /x83/x38/x8e/x31 <Private Use>
-+<UEFAB>     /x83/x38/x8e/x32 <Private Use>
-+<UEFAC>     /x83/x38/x8e/x33 <Private Use>
-+<UEFAD>     /x83/x38/x8e/x34 <Private Use>
-+<UEFAE>     /x83/x38/x8e/x35 <Private Use>
-+<UEFAF>     /x83/x38/x8e/x36 <Private Use>
-+<UEFB0>     /x83/x38/x8e/x37 <Private Use>
-+<UEFB1>     /x83/x38/x8e/x38 <Private Use>
-+<UEFB2>     /x83/x38/x8e/x39 <Private Use>
-+<UEFB3>     /x83/x38/x8f/x30 <Private Use>
-+<UEFB4>     /x83/x38/x8f/x31 <Private Use>
-+<UEFB5>     /x83/x38/x8f/x32 <Private Use>
-+<UEFB6>     /x83/x38/x8f/x33 <Private Use>
-+<UEFB7>     /x83/x38/x8f/x34 <Private Use>
-+<UEFB8>     /x83/x38/x8f/x35 <Private Use>
-+<UEFB9>     /x83/x38/x8f/x36 <Private Use>
-+<UEFBA>     /x83/x38/x8f/x37 <Private Use>
-+<UEFBB>     /x83/x38/x8f/x38 <Private Use>
-+<UEFBC>     /x83/x38/x8f/x39 <Private Use>
-+<UEFBD>     /x83/x38/x90/x30 <Private Use>
-+<UEFBE>     /x83/x38/x90/x31 <Private Use>
-+<UEFBF>     /x83/x38/x90/x32 <Private Use>
-+<UEFC0>     /x83/x38/x90/x33 <Private Use>
-+<UEFC1>     /x83/x38/x90/x34 <Private Use>
-+<UEFC2>     /x83/x38/x90/x35 <Private Use>
-+<UEFC3>     /x83/x38/x90/x36 <Private Use>
-+<UEFC4>     /x83/x38/x90/x37 <Private Use>
-+<UEFC5>     /x83/x38/x90/x38 <Private Use>
-+<UEFC6>     /x83/x38/x90/x39 <Private Use>
-+<UEFC7>     /x83/x38/x91/x30 <Private Use>
-+<UEFC8>     /x83/x38/x91/x31 <Private Use>
-+<UEFC9>     /x83/x38/x91/x32 <Private Use>
-+<UEFCA>     /x83/x38/x91/x33 <Private Use>
-+<UEFCB>     /x83/x38/x91/x34 <Private Use>
-+<UEFCC>     /x83/x38/x91/x35 <Private Use>
-+<UEFCD>     /x83/x38/x91/x36 <Private Use>
-+<UEFCE>     /x83/x38/x91/x37 <Private Use>
-+<UEFCF>     /x83/x38/x91/x38 <Private Use>
-+<UEFD0>     /x83/x38/x91/x39 <Private Use>
-+<UEFD1>     /x83/x38/x92/x30 <Private Use>
-+<UEFD2>     /x83/x38/x92/x31 <Private Use>
-+<UEFD3>     /x83/x38/x92/x32 <Private Use>
-+<UEFD4>     /x83/x38/x92/x33 <Private Use>
-+<UEFD5>     /x83/x38/x92/x34 <Private Use>
-+<UEFD6>     /x83/x38/x92/x35 <Private Use>
-+<UEFD7>     /x83/x38/x92/x36 <Private Use>
-+<UEFD8>     /x83/x38/x92/x37 <Private Use>
-+<UEFD9>     /x83/x38/x92/x38 <Private Use>
-+<UEFDA>     /x83/x38/x92/x39 <Private Use>
-+<UEFDB>     /x83/x38/x93/x30 <Private Use>
-+<UEFDC>     /x83/x38/x93/x31 <Private Use>
-+<UEFDD>     /x83/x38/x93/x32 <Private Use>
-+<UEFDE>     /x83/x38/x93/x33 <Private Use>
-+<UEFDF>     /x83/x38/x93/x34 <Private Use>
-+<UEFE0>     /x83/x38/x93/x35 <Private Use>
-+<UEFE1>     /x83/x38/x93/x36 <Private Use>
-+<UEFE2>     /x83/x38/x93/x37 <Private Use>
-+<UEFE3>     /x83/x38/x93/x38 <Private Use>
-+<UEFE4>     /x83/x38/x93/x39 <Private Use>
-+<UEFE5>     /x83/x38/x94/x30 <Private Use>
-+<UEFE6>     /x83/x38/x94/x31 <Private Use>
-+<UEFE7>     /x83/x38/x94/x32 <Private Use>
-+<UEFE8>     /x83/x38/x94/x33 <Private Use>
-+<UEFE9>     /x83/x38/x94/x34 <Private Use>
-+<UEFEA>     /x83/x38/x94/x35 <Private Use>
-+<UEFEB>     /x83/x38/x94/x36 <Private Use>
-+<UEFEC>     /x83/x38/x94/x37 <Private Use>
-+<UEFED>     /x83/x38/x94/x38 <Private Use>
-+<UEFEE>     /x83/x38/x94/x39 <Private Use>
-+<UEFEF>     /x83/x38/x95/x30 <Private Use>
-+<UEFF0>     /x83/x38/x95/x31 <Private Use>
-+<UEFF1>     /x83/x38/x95/x32 <Private Use>
-+<UEFF2>     /x83/x38/x95/x33 <Private Use>
-+<UEFF3>     /x83/x38/x95/x34 <Private Use>
-+<UEFF4>     /x83/x38/x95/x35 <Private Use>
-+<UEFF5>     /x83/x38/x95/x36 <Private Use>
-+<UEFF6>     /x83/x38/x95/x37 <Private Use>
-+<UEFF7>     /x83/x38/x95/x38 <Private Use>
-+<UEFF8>     /x83/x38/x95/x39 <Private Use>
-+<UEFF9>     /x83/x38/x96/x30 <Private Use>
-+<UEFFA>     /x83/x38/x96/x31 <Private Use>
-+<UEFFB>     /x83/x38/x96/x32 <Private Use>
-+<UEFFC>     /x83/x38/x96/x33 <Private Use>
-+<UEFFD>     /x83/x38/x96/x34 <Private Use>
-+<UEFFE>     /x83/x38/x96/x35 <Private Use>
-+<UEFFF>     /x83/x38/x96/x36 <Private Use>
-+<UF000>     /x83/x38/x96/x37 <Private Use>
-+<UF001>     /x83/x38/x96/x38 <Private Use>
-+<UF002>     /x83/x38/x96/x39 <Private Use>
-+<UF003>     /x83/x38/x97/x30 <Private Use>
-+<UF004>     /x83/x38/x97/x31 <Private Use>
-+<UF005>     /x83/x38/x97/x32 <Private Use>
-+<UF006>     /x83/x38/x97/x33 <Private Use>
-+<UF007>     /x83/x38/x97/x34 <Private Use>
-+<UF008>     /x83/x38/x97/x35 <Private Use>
-+<UF009>     /x83/x38/x97/x36 <Private Use>
-+<UF00A>     /x83/x38/x97/x37 <Private Use>
-+<UF00B>     /x83/x38/x97/x38 <Private Use>
-+<UF00C>     /x83/x38/x97/x39 <Private Use>
-+<UF00D>     /x83/x38/x98/x30 <Private Use>
-+<UF00E>     /x83/x38/x98/x31 <Private Use>
-+<UF00F>     /x83/x38/x98/x32 <Private Use>
-+<UF010>     /x83/x38/x98/x33 <Private Use>
-+<UF011>     /x83/x38/x98/x34 <Private Use>
-+<UF012>     /x83/x38/x98/x35 <Private Use>
-+<UF013>     /x83/x38/x98/x36 <Private Use>
-+<UF014>     /x83/x38/x98/x37 <Private Use>
-+<UF015>     /x83/x38/x98/x38 <Private Use>
-+<UF016>     /x83/x38/x98/x39 <Private Use>
-+<UF017>     /x83/x38/x99/x30 <Private Use>
-+<UF018>     /x83/x38/x99/x31 <Private Use>
-+<UF019>     /x83/x38/x99/x32 <Private Use>
-+<UF01A>     /x83/x38/x99/x33 <Private Use>
-+<UF01B>     /x83/x38/x99/x34 <Private Use>
-+<UF01C>     /x83/x38/x99/x35 <Private Use>
-+<UF01D>     /x83/x38/x99/x36 <Private Use>
-+<UF01E>     /x83/x38/x99/x37 <Private Use>
-+<UF01F>     /x83/x38/x99/x38 <Private Use>
-+<UF020>     /x83/x38/x99/x39 <Private Use>
-+<UF021>     /x83/x38/x9a/x30 <Private Use>
-+<UF022>     /x83/x38/x9a/x31 <Private Use>
-+<UF023>     /x83/x38/x9a/x32 <Private Use>
-+<UF024>     /x83/x38/x9a/x33 <Private Use>
-+<UF025>     /x83/x38/x9a/x34 <Private Use>
-+<UF026>     /x83/x38/x9a/x35 <Private Use>
-+<UF027>     /x83/x38/x9a/x36 <Private Use>
-+<UF028>     /x83/x38/x9a/x37 <Private Use>
-+<UF029>     /x83/x38/x9a/x38 <Private Use>
-+<UF02A>     /x83/x38/x9a/x39 <Private Use>
-+<UF02B>     /x83/x38/x9b/x30 <Private Use>
-+<UF02C>     /x83/x38/x9b/x31 <Private Use>
-+<UF02D>     /x83/x38/x9b/x32 <Private Use>
-+<UF02E>     /x83/x38/x9b/x33 <Private Use>
-+<UF02F>     /x83/x38/x9b/x34 <Private Use>
-+<UF030>     /x83/x38/x9b/x35 <Private Use>
-+<UF031>     /x83/x38/x9b/x36 <Private Use>
-+<UF032>     /x83/x38/x9b/x37 <Private Use>
-+<UF033>     /x83/x38/x9b/x38 <Private Use>
-+<UF034>     /x83/x38/x9b/x39 <Private Use>
-+<UF035>     /x83/x38/x9c/x30 <Private Use>
-+<UF036>     /x83/x38/x9c/x31 <Private Use>
-+<UF037>     /x83/x38/x9c/x32 <Private Use>
-+<UF038>     /x83/x38/x9c/x33 <Private Use>
-+<UF039>     /x83/x38/x9c/x34 <Private Use>
-+<UF03A>     /x83/x38/x9c/x35 <Private Use>
-+<UF03B>     /x83/x38/x9c/x36 <Private Use>
-+<UF03C>     /x83/x38/x9c/x37 <Private Use>
-+<UF03D>     /x83/x38/x9c/x38 <Private Use>
-+<UF03E>     /x83/x38/x9c/x39 <Private Use>
-+<UF03F>     /x83/x38/x9d/x30 <Private Use>
-+<UF040>     /x83/x38/x9d/x31 <Private Use>
-+<UF041>     /x83/x38/x9d/x32 <Private Use>
-+<UF042>     /x83/x38/x9d/x33 <Private Use>
-+<UF043>     /x83/x38/x9d/x34 <Private Use>
-+<UF044>     /x83/x38/x9d/x35 <Private Use>
-+<UF045>     /x83/x38/x9d/x36 <Private Use>
-+<UF046>     /x83/x38/x9d/x37 <Private Use>
-+<UF047>     /x83/x38/x9d/x38 <Private Use>
-+<UF048>     /x83/x38/x9d/x39 <Private Use>
-+<UF049>     /x83/x38/x9e/x30 <Private Use>
-+<UF04A>     /x83/x38/x9e/x31 <Private Use>
-+<UF04B>     /x83/x38/x9e/x32 <Private Use>
-+<UF04C>     /x83/x38/x9e/x33 <Private Use>
-+<UF04D>     /x83/x38/x9e/x34 <Private Use>
-+<UF04E>     /x83/x38/x9e/x35 <Private Use>
-+<UF04F>     /x83/x38/x9e/x36 <Private Use>
-+<UF050>     /x83/x38/x9e/x37 <Private Use>
-+<UF051>     /x83/x38/x9e/x38 <Private Use>
-+<UF052>     /x83/x38/x9e/x39 <Private Use>
-+<UF053>     /x83/x38/x9f/x30 <Private Use>
-+<UF054>     /x83/x38/x9f/x31 <Private Use>
-+<UF055>     /x83/x38/x9f/x32 <Private Use>
-+<UF056>     /x83/x38/x9f/x33 <Private Use>
-+<UF057>     /x83/x38/x9f/x34 <Private Use>
-+<UF058>     /x83/x38/x9f/x35 <Private Use>
-+<UF059>     /x83/x38/x9f/x36 <Private Use>
-+<UF05A>     /x83/x38/x9f/x37 <Private Use>
-+<UF05B>     /x83/x38/x9f/x38 <Private Use>
-+<UF05C>     /x83/x38/x9f/x39 <Private Use>
-+<UF05D>     /x83/x38/xa0/x30 <Private Use>
-+<UF05E>     /x83/x38/xa0/x31 <Private Use>
-+<UF05F>     /x83/x38/xa0/x32 <Private Use>
-+<UF060>     /x83/x38/xa0/x33 <Private Use>
-+<UF061>     /x83/x38/xa0/x34 <Private Use>
-+<UF062>     /x83/x38/xa0/x35 <Private Use>
-+<UF063>     /x83/x38/xa0/x36 <Private Use>
-+<UF064>     /x83/x38/xa0/x37 <Private Use>
-+<UF065>     /x83/x38/xa0/x38 <Private Use>
-+<UF066>     /x83/x38/xa0/x39 <Private Use>
-+<UF067>     /x83/x38/xa1/x30 <Private Use>
-+<UF068>     /x83/x38/xa1/x31 <Private Use>
-+<UF069>     /x83/x38/xa1/x32 <Private Use>
-+<UF06A>     /x83/x38/xa1/x33 <Private Use>
-+<UF06B>     /x83/x38/xa1/x34 <Private Use>
-+<UF06C>     /x83/x38/xa1/x35 <Private Use>
-+<UF06D>     /x83/x38/xa1/x36 <Private Use>
-+<UF06E>     /x83/x38/xa1/x37 <Private Use>
-+<UF06F>     /x83/x38/xa1/x38 <Private Use>
-+<UF070>     /x83/x38/xa1/x39 <Private Use>
-+<UF071>     /x83/x38/xa2/x30 <Private Use>
-+<UF072>     /x83/x38/xa2/x31 <Private Use>
-+<UF073>     /x83/x38/xa2/x32 <Private Use>
-+<UF074>     /x83/x38/xa2/x33 <Private Use>
-+<UF075>     /x83/x38/xa2/x34 <Private Use>
-+<UF076>     /x83/x38/xa2/x35 <Private Use>
-+<UF077>     /x83/x38/xa2/x36 <Private Use>
-+<UF078>     /x83/x38/xa2/x37 <Private Use>
-+<UF079>     /x83/x38/xa2/x38 <Private Use>
-+<UF07A>     /x83/x38/xa2/x39 <Private Use>
-+<UF07B>     /x83/x38/xa3/x30 <Private Use>
-+<UF07C>     /x83/x38/xa3/x31 <Private Use>
-+<UF07D>     /x83/x38/xa3/x32 <Private Use>
-+<UF07E>     /x83/x38/xa3/x33 <Private Use>
-+<UF07F>     /x83/x38/xa3/x34 <Private Use>
-+<UF080>     /x83/x38/xa3/x35 <Private Use>
-+<UF081>     /x83/x38/xa3/x36 <Private Use>
-+<UF082>     /x83/x38/xa3/x37 <Private Use>
-+<UF083>     /x83/x38/xa3/x38 <Private Use>
-+<UF084>     /x83/x38/xa3/x39 <Private Use>
-+<UF085>     /x83/x38/xa4/x30 <Private Use>
-+<UF086>     /x83/x38/xa4/x31 <Private Use>
-+<UF087>     /x83/x38/xa4/x32 <Private Use>
-+<UF088>     /x83/x38/xa4/x33 <Private Use>
-+<UF089>     /x83/x38/xa4/x34 <Private Use>
-+<UF08A>     /x83/x38/xa4/x35 <Private Use>
-+<UF08B>     /x83/x38/xa4/x36 <Private Use>
-+<UF08C>     /x83/x38/xa4/x37 <Private Use>
-+<UF08D>     /x83/x38/xa4/x38 <Private Use>
-+<UF08E>     /x83/x38/xa4/x39 <Private Use>
-+<UF08F>     /x83/x38/xa5/x30 <Private Use>
-+<UF090>     /x83/x38/xa5/x31 <Private Use>
-+<UF091>     /x83/x38/xa5/x32 <Private Use>
-+<UF092>     /x83/x38/xa5/x33 <Private Use>
-+<UF093>     /x83/x38/xa5/x34 <Private Use>
-+<UF094>     /x83/x38/xa5/x35 <Private Use>
-+<UF095>     /x83/x38/xa5/x36 <Private Use>
-+<UF096>     /x83/x38/xa5/x37 <Private Use>
-+<UF097>     /x83/x38/xa5/x38 <Private Use>
-+<UF098>     /x83/x38/xa5/x39 <Private Use>
-+<UF099>     /x83/x38/xa6/x30 <Private Use>
-+<UF09A>     /x83/x38/xa6/x31 <Private Use>
-+<UF09B>     /x83/x38/xa6/x32 <Private Use>
-+<UF09C>     /x83/x38/xa6/x33 <Private Use>
-+<UF09D>     /x83/x38/xa6/x34 <Private Use>
-+<UF09E>     /x83/x38/xa6/x35 <Private Use>
-+<UF09F>     /x83/x38/xa6/x36 <Private Use>
-+<UF0A0>     /x83/x38/xa6/x37 <Private Use>
-+<UF0A1>     /x83/x38/xa6/x38 <Private Use>
-+<UF0A2>     /x83/x38/xa6/x39 <Private Use>
-+<UF0A3>     /x83/x38/xa7/x30 <Private Use>
-+<UF0A4>     /x83/x38/xa7/x31 <Private Use>
-+<UF0A5>     /x83/x38/xa7/x32 <Private Use>
-+<UF0A6>     /x83/x38/xa7/x33 <Private Use>
-+<UF0A7>     /x83/x38/xa7/x34 <Private Use>
-+<UF0A8>     /x83/x38/xa7/x35 <Private Use>
-+<UF0A9>     /x83/x38/xa7/x36 <Private Use>
-+<UF0AA>     /x83/x38/xa7/x37 <Private Use>
-+<UF0AB>     /x83/x38/xa7/x38 <Private Use>
-+<UF0AC>     /x83/x38/xa7/x39 <Private Use>
-+<UF0AD>     /x83/x38/xa8/x30 <Private Use>
-+<UF0AE>     /x83/x38/xa8/x31 <Private Use>
-+<UF0AF>     /x83/x38/xa8/x32 <Private Use>
-+<UF0B0>     /x83/x38/xa8/x33 <Private Use>
-+<UF0B1>     /x83/x38/xa8/x34 <Private Use>
-+<UF0B2>     /x83/x38/xa8/x35 <Private Use>
-+<UF0B3>     /x83/x38/xa8/x36 <Private Use>
-+<UF0B4>     /x83/x38/xa8/x37 <Private Use>
-+<UF0B5>     /x83/x38/xa8/x38 <Private Use>
-+<UF0B6>     /x83/x38/xa8/x39 <Private Use>
-+<UF0B7>     /x83/x38/xa9/x30 <Private Use>
-+<UF0B8>     /x83/x38/xa9/x31 <Private Use>
-+<UF0B9>     /x83/x38/xa9/x32 <Private Use>
-+<UF0BA>     /x83/x38/xa9/x33 <Private Use>
-+<UF0BB>     /x83/x38/xa9/x34 <Private Use>
-+<UF0BC>     /x83/x38/xa9/x35 <Private Use>
-+<UF0BD>     /x83/x38/xa9/x36 <Private Use>
-+<UF0BE>     /x83/x38/xa9/x37 <Private Use>
-+<UF0BF>     /x83/x38/xa9/x38 <Private Use>
-+<UF0C0>     /x83/x38/xa9/x39 <Private Use>
-+<UF0C1>     /x83/x38/xaa/x30 <Private Use>
-+<UF0C2>     /x83/x38/xaa/x31 <Private Use>
-+<UF0C3>     /x83/x38/xaa/x32 <Private Use>
-+<UF0C4>     /x83/x38/xaa/x33 <Private Use>
-+<UF0C5>     /x83/x38/xaa/x34 <Private Use>
-+<UF0C6>     /x83/x38/xaa/x35 <Private Use>
-+<UF0C7>     /x83/x38/xaa/x36 <Private Use>
-+<UF0C8>     /x83/x38/xaa/x37 <Private Use>
-+<UF0C9>     /x83/x38/xaa/x38 <Private Use>
-+<UF0CA>     /x83/x38/xaa/x39 <Private Use>
-+<UF0CB>     /x83/x38/xab/x30 <Private Use>
-+<UF0CC>     /x83/x38/xab/x31 <Private Use>
-+<UF0CD>     /x83/x38/xab/x32 <Private Use>
-+<UF0CE>     /x83/x38/xab/x33 <Private Use>
-+<UF0CF>     /x83/x38/xab/x34 <Private Use>
-+<UF0D0>     /x83/x38/xab/x35 <Private Use>
-+<UF0D1>     /x83/x38/xab/x36 <Private Use>
-+<UF0D2>     /x83/x38/xab/x37 <Private Use>
-+<UF0D3>     /x83/x38/xab/x38 <Private Use>
-+<UF0D4>     /x83/x38/xab/x39 <Private Use>
-+<UF0D5>     /x83/x38/xac/x30 <Private Use>
-+<UF0D6>     /x83/x38/xac/x31 <Private Use>
-+<UF0D7>     /x83/x38/xac/x32 <Private Use>
-+<UF0D8>     /x83/x38/xac/x33 <Private Use>
-+<UF0D9>     /x83/x38/xac/x34 <Private Use>
-+<UF0DA>     /x83/x38/xac/x35 <Private Use>
-+<UF0DB>     /x83/x38/xac/x36 <Private Use>
-+<UF0DC>     /x83/x38/xac/x37 <Private Use>
-+<UF0DD>     /x83/x38/xac/x38 <Private Use>
-+<UF0DE>     /x83/x38/xac/x39 <Private Use>
-+<UF0DF>     /x83/x38/xad/x30 <Private Use>
-+<UF0E0>     /x83/x38/xad/x31 <Private Use>
-+<UF0E1>     /x83/x38/xad/x32 <Private Use>
-+<UF0E2>     /x83/x38/xad/x33 <Private Use>
-+<UF0E3>     /x83/x38/xad/x34 <Private Use>
-+<UF0E4>     /x83/x38/xad/x35 <Private Use>
-+<UF0E5>     /x83/x38/xad/x36 <Private Use>
-+<UF0E6>     /x83/x38/xad/x37 <Private Use>
-+<UF0E7>     /x83/x38/xad/x38 <Private Use>
-+<UF0E8>     /x83/x38/xad/x39 <Private Use>
-+<UF0E9>     /x83/x38/xae/x30 <Private Use>
-+<UF0EA>     /x83/x38/xae/x31 <Private Use>
-+<UF0EB>     /x83/x38/xae/x32 <Private Use>
-+<UF0EC>     /x83/x38/xae/x33 <Private Use>
-+<UF0ED>     /x83/x38/xae/x34 <Private Use>
-+<UF0EE>     /x83/x38/xae/x35 <Private Use>
-+<UF0EF>     /x83/x38/xae/x36 <Private Use>
-+<UF0F0>     /x83/x38/xae/x37 <Private Use>
-+<UF0F1>     /x83/x38/xae/x38 <Private Use>
-+<UF0F2>     /x83/x38/xae/x39 <Private Use>
-+<UF0F3>     /x83/x38/xaf/x30 <Private Use>
-+<UF0F4>     /x83/x38/xaf/x31 <Private Use>
-+<UF0F5>     /x83/x38/xaf/x32 <Private Use>
-+<UF0F6>     /x83/x38/xaf/x33 <Private Use>
-+<UF0F7>     /x83/x38/xaf/x34 <Private Use>
-+<UF0F8>     /x83/x38/xaf/x35 <Private Use>
-+<UF0F9>     /x83/x38/xaf/x36 <Private Use>
-+<UF0FA>     /x83/x38/xaf/x37 <Private Use>
-+<UF0FB>     /x83/x38/xaf/x38 <Private Use>
-+<UF0FC>     /x83/x38/xaf/x39 <Private Use>
-+<UF0FD>     /x83/x38/xb0/x30 <Private Use>
-+<UF0FE>     /x83/x38/xb0/x31 <Private Use>
-+<UF0FF>     /x83/x38/xb0/x32 <Private Use>
-+<UF100>     /x83/x38/xb0/x33 <Private Use>
-+<UF101>     /x83/x38/xb0/x34 <Private Use>
-+<UF102>     /x83/x38/xb0/x35 <Private Use>
-+<UF103>     /x83/x38/xb0/x36 <Private Use>
-+<UF104>     /x83/x38/xb0/x37 <Private Use>
-+<UF105>     /x83/x38/xb0/x38 <Private Use>
-+<UF106>     /x83/x38/xb0/x39 <Private Use>
-+<UF107>     /x83/x38/xb1/x30 <Private Use>
-+<UF108>     /x83/x38/xb1/x31 <Private Use>
-+<UF109>     /x83/x38/xb1/x32 <Private Use>
-+<UF10A>     /x83/x38/xb1/x33 <Private Use>
-+<UF10B>     /x83/x38/xb1/x34 <Private Use>
-+<UF10C>     /x83/x38/xb1/x35 <Private Use>
-+<UF10D>     /x83/x38/xb1/x36 <Private Use>
-+<UF10E>     /x83/x38/xb1/x37 <Private Use>
-+<UF10F>     /x83/x38/xb1/x38 <Private Use>
-+<UF110>     /x83/x38/xb1/x39 <Private Use>
-+<UF111>     /x83/x38/xb2/x30 <Private Use>
-+<UF112>     /x83/x38/xb2/x31 <Private Use>
-+<UF113>     /x83/x38/xb2/x32 <Private Use>
-+<UF114>     /x83/x38/xb2/x33 <Private Use>
-+<UF115>     /x83/x38/xb2/x34 <Private Use>
-+<UF116>     /x83/x38/xb2/x35 <Private Use>
-+<UF117>     /x83/x38/xb2/x36 <Private Use>
-+<UF118>     /x83/x38/xb2/x37 <Private Use>
-+<UF119>     /x83/x38/xb2/x38 <Private Use>
-+<UF11A>     /x83/x38/xb2/x39 <Private Use>
-+<UF11B>     /x83/x38/xb3/x30 <Private Use>
-+<UF11C>     /x83/x38/xb3/x31 <Private Use>
-+<UF11D>     /x83/x38/xb3/x32 <Private Use>
-+<UF11E>     /x83/x38/xb3/x33 <Private Use>
-+<UF11F>     /x83/x38/xb3/x34 <Private Use>
-+<UF120>     /x83/x38/xb3/x35 <Private Use>
-+<UF121>     /x83/x38/xb3/x36 <Private Use>
-+<UF122>     /x83/x38/xb3/x37 <Private Use>
-+<UF123>     /x83/x38/xb3/x38 <Private Use>
-+<UF124>     /x83/x38/xb3/x39 <Private Use>
-+<UF125>     /x83/x38/xb4/x30 <Private Use>
-+<UF126>     /x83/x38/xb4/x31 <Private Use>
-+<UF127>     /x83/x38/xb4/x32 <Private Use>
-+<UF128>     /x83/x38/xb4/x33 <Private Use>
-+<UF129>     /x83/x38/xb4/x34 <Private Use>
-+<UF12A>     /x83/x38/xb4/x35 <Private Use>
-+<UF12B>     /x83/x38/xb4/x36 <Private Use>
-+<UF12C>     /x83/x38/xb4/x37 <Private Use>
-+<UF12D>     /x83/x38/xb4/x38 <Private Use>
-+<UF12E>     /x83/x38/xb4/x39 <Private Use>
-+<UF12F>     /x83/x38/xb5/x30 <Private Use>
-+<UF130>     /x83/x38/xb5/x31 <Private Use>
-+<UF131>     /x83/x38/xb5/x32 <Private Use>
-+<UF132>     /x83/x38/xb5/x33 <Private Use>
-+<UF133>     /x83/x38/xb5/x34 <Private Use>
-+<UF134>     /x83/x38/xb5/x35 <Private Use>
-+<UF135>     /x83/x38/xb5/x36 <Private Use>
-+<UF136>     /x83/x38/xb5/x37 <Private Use>
-+<UF137>     /x83/x38/xb5/x38 <Private Use>
-+<UF138>     /x83/x38/xb5/x39 <Private Use>
-+<UF139>     /x83/x38/xb6/x30 <Private Use>
-+<UF13A>     /x83/x38/xb6/x31 <Private Use>
-+<UF13B>     /x83/x38/xb6/x32 <Private Use>
-+<UF13C>     /x83/x38/xb6/x33 <Private Use>
-+<UF13D>     /x83/x38/xb6/x34 <Private Use>
-+<UF13E>     /x83/x38/xb6/x35 <Private Use>
-+<UF13F>     /x83/x38/xb6/x36 <Private Use>
-+<UF140>     /x83/x38/xb6/x37 <Private Use>
-+<UF141>     /x83/x38/xb6/x38 <Private Use>
-+<UF142>     /x83/x38/xb6/x39 <Private Use>
-+<UF143>     /x83/x38/xb7/x30 <Private Use>
-+<UF144>     /x83/x38/xb7/x31 <Private Use>
-+<UF145>     /x83/x38/xb7/x32 <Private Use>
-+<UF146>     /x83/x38/xb7/x33 <Private Use>
-+<UF147>     /x83/x38/xb7/x34 <Private Use>
-+<UF148>     /x83/x38/xb7/x35 <Private Use>
-+<UF149>     /x83/x38/xb7/x36 <Private Use>
-+<UF14A>     /x83/x38/xb7/x37 <Private Use>
-+<UF14B>     /x83/x38/xb7/x38 <Private Use>
-+<UF14C>     /x83/x38/xb7/x39 <Private Use>
-+<UF14D>     /x83/x38/xb8/x30 <Private Use>
-+<UF14E>     /x83/x38/xb8/x31 <Private Use>
-+<UF14F>     /x83/x38/xb8/x32 <Private Use>
-+<UF150>     /x83/x38/xb8/x33 <Private Use>
-+<UF151>     /x83/x38/xb8/x34 <Private Use>
-+<UF152>     /x83/x38/xb8/x35 <Private Use>
-+<UF153>     /x83/x38/xb8/x36 <Private Use>
-+<UF154>     /x83/x38/xb8/x37 <Private Use>
-+<UF155>     /x83/x38/xb8/x38 <Private Use>
-+<UF156>     /x83/x38/xb8/x39 <Private Use>
-+<UF157>     /x83/x38/xb9/x30 <Private Use>
-+<UF158>     /x83/x38/xb9/x31 <Private Use>
-+<UF159>     /x83/x38/xb9/x32 <Private Use>
-+<UF15A>     /x83/x38/xb9/x33 <Private Use>
-+<UF15B>     /x83/x38/xb9/x34 <Private Use>
-+<UF15C>     /x83/x38/xb9/x35 <Private Use>
-+<UF15D>     /x83/x38/xb9/x36 <Private Use>
-+<UF15E>     /x83/x38/xb9/x37 <Private Use>
-+<UF15F>     /x83/x38/xb9/x38 <Private Use>
-+<UF160>     /x83/x38/xb9/x39 <Private Use>
-+<UF161>     /x83/x38/xba/x30 <Private Use>
-+<UF162>     /x83/x38/xba/x31 <Private Use>
-+<UF163>     /x83/x38/xba/x32 <Private Use>
-+<UF164>     /x83/x38/xba/x33 <Private Use>
-+<UF165>     /x83/x38/xba/x34 <Private Use>
-+<UF166>     /x83/x38/xba/x35 <Private Use>
-+<UF167>     /x83/x38/xba/x36 <Private Use>
-+<UF168>     /x83/x38/xba/x37 <Private Use>
-+<UF169>     /x83/x38/xba/x38 <Private Use>
-+<UF16A>     /x83/x38/xba/x39 <Private Use>
-+<UF16B>     /x83/x38/xbb/x30 <Private Use>
-+<UF16C>     /x83/x38/xbb/x31 <Private Use>
-+<UF16D>     /x83/x38/xbb/x32 <Private Use>
-+<UF16E>     /x83/x38/xbb/x33 <Private Use>
-+<UF16F>     /x83/x38/xbb/x34 <Private Use>
-+<UF170>     /x83/x38/xbb/x35 <Private Use>
-+<UF171>     /x83/x38/xbb/x36 <Private Use>
-+<UF172>     /x83/x38/xbb/x37 <Private Use>
-+<UF173>     /x83/x38/xbb/x38 <Private Use>
-+<UF174>     /x83/x38/xbb/x39 <Private Use>
-+<UF175>     /x83/x38/xbc/x30 <Private Use>
-+<UF176>     /x83/x38/xbc/x31 <Private Use>
-+<UF177>     /x83/x38/xbc/x32 <Private Use>
-+<UF178>     /x83/x38/xbc/x33 <Private Use>
-+<UF179>     /x83/x38/xbc/x34 <Private Use>
-+<UF17A>     /x83/x38/xbc/x35 <Private Use>
-+<UF17B>     /x83/x38/xbc/x36 <Private Use>
-+<UF17C>     /x83/x38/xbc/x37 <Private Use>
-+<UF17D>     /x83/x38/xbc/x38 <Private Use>
-+<UF17E>     /x83/x38/xbc/x39 <Private Use>
-+<UF17F>     /x83/x38/xbd/x30 <Private Use>
-+<UF180>     /x83/x38/xbd/x31 <Private Use>
-+<UF181>     /x83/x38/xbd/x32 <Private Use>
-+<UF182>     /x83/x38/xbd/x33 <Private Use>
-+<UF183>     /x83/x38/xbd/x34 <Private Use>
-+<UF184>     /x83/x38/xbd/x35 <Private Use>
-+<UF185>     /x83/x38/xbd/x36 <Private Use>
-+<UF186>     /x83/x38/xbd/x37 <Private Use>
-+<UF187>     /x83/x38/xbd/x38 <Private Use>
-+<UF188>     /x83/x38/xbd/x39 <Private Use>
-+<UF189>     /x83/x38/xbe/x30 <Private Use>
-+<UF18A>     /x83/x38/xbe/x31 <Private Use>
-+<UF18B>     /x83/x38/xbe/x32 <Private Use>
-+<UF18C>     /x83/x38/xbe/x33 <Private Use>
-+<UF18D>     /x83/x38/xbe/x34 <Private Use>
-+<UF18E>     /x83/x38/xbe/x35 <Private Use>
-+<UF18F>     /x83/x38/xbe/x36 <Private Use>
-+<UF190>     /x83/x38/xbe/x37 <Private Use>
-+<UF191>     /x83/x38/xbe/x38 <Private Use>
-+<UF192>     /x83/x38/xbe/x39 <Private Use>
-+<UF193>     /x83/x38/xbf/x30 <Private Use>
-+<UF194>     /x83/x38/xbf/x31 <Private Use>
-+<UF195>     /x83/x38/xbf/x32 <Private Use>
-+<UF196>     /x83/x38/xbf/x33 <Private Use>
-+<UF197>     /x83/x38/xbf/x34 <Private Use>
-+<UF198>     /x83/x38/xbf/x35 <Private Use>
-+<UF199>     /x83/x38/xbf/x36 <Private Use>
-+<UF19A>     /x83/x38/xbf/x37 <Private Use>
-+<UF19B>     /x83/x38/xbf/x38 <Private Use>
-+<UF19C>     /x83/x38/xbf/x39 <Private Use>
-+<UF19D>     /x83/x38/xc0/x30 <Private Use>
-+<UF19E>     /x83/x38/xc0/x31 <Private Use>
-+<UF19F>     /x83/x38/xc0/x32 <Private Use>
-+<UF1A0>     /x83/x38/xc0/x33 <Private Use>
-+<UF1A1>     /x83/x38/xc0/x34 <Private Use>
-+<UF1A2>     /x83/x38/xc0/x35 <Private Use>
-+<UF1A3>     /x83/x38/xc0/x36 <Private Use>
-+<UF1A4>     /x83/x38/xc0/x37 <Private Use>
-+<UF1A5>     /x83/x38/xc0/x38 <Private Use>
-+<UF1A6>     /x83/x38/xc0/x39 <Private Use>
-+<UF1A7>     /x83/x38/xc1/x30 <Private Use>
-+<UF1A8>     /x83/x38/xc1/x31 <Private Use>
-+<UF1A9>     /x83/x38/xc1/x32 <Private Use>
-+<UF1AA>     /x83/x38/xc1/x33 <Private Use>
-+<UF1AB>     /x83/x38/xc1/x34 <Private Use>
-+<UF1AC>     /x83/x38/xc1/x35 <Private Use>
-+<UF1AD>     /x83/x38/xc1/x36 <Private Use>
-+<UF1AE>     /x83/x38/xc1/x37 <Private Use>
-+<UF1AF>     /x83/x38/xc1/x38 <Private Use>
-+<UF1B0>     /x83/x38/xc1/x39 <Private Use>
-+<UF1B1>     /x83/x38/xc2/x30 <Private Use>
-+<UF1B2>     /x83/x38/xc2/x31 <Private Use>
-+<UF1B3>     /x83/x38/xc2/x32 <Private Use>
-+<UF1B4>     /x83/x38/xc2/x33 <Private Use>
-+<UF1B5>     /x83/x38/xc2/x34 <Private Use>
-+<UF1B6>     /x83/x38/xc2/x35 <Private Use>
-+<UF1B7>     /x83/x38/xc2/x36 <Private Use>
-+<UF1B8>     /x83/x38/xc2/x37 <Private Use>
-+<UF1B9>     /x83/x38/xc2/x38 <Private Use>
-+<UF1BA>     /x83/x38/xc2/x39 <Private Use>
-+<UF1BB>     /x83/x38/xc3/x30 <Private Use>
-+<UF1BC>     /x83/x38/xc3/x31 <Private Use>
-+<UF1BD>     /x83/x38/xc3/x32 <Private Use>
-+<UF1BE>     /x83/x38/xc3/x33 <Private Use>
-+<UF1BF>     /x83/x38/xc3/x34 <Private Use>
-+<UF1C0>     /x83/x38/xc3/x35 <Private Use>
-+<UF1C1>     /x83/x38/xc3/x36 <Private Use>
-+<UF1C2>     /x83/x38/xc3/x37 <Private Use>
-+<UF1C3>     /x83/x38/xc3/x38 <Private Use>
-+<UF1C4>     /x83/x38/xc3/x39 <Private Use>
-+<UF1C5>     /x83/x38/xc4/x30 <Private Use>
-+<UF1C6>     /x83/x38/xc4/x31 <Private Use>
-+<UF1C7>     /x83/x38/xc4/x32 <Private Use>
-+<UF1C8>     /x83/x38/xc4/x33 <Private Use>
-+<UF1C9>     /x83/x38/xc4/x34 <Private Use>
-+<UF1CA>     /x83/x38/xc4/x35 <Private Use>
-+<UF1CB>     /x83/x38/xc4/x36 <Private Use>
-+<UF1CC>     /x83/x38/xc4/x37 <Private Use>
-+<UF1CD>     /x83/x38/xc4/x38 <Private Use>
-+<UF1CE>     /x83/x38/xc4/x39 <Private Use>
-+<UF1CF>     /x83/x38/xc5/x30 <Private Use>
-+<UF1D0>     /x83/x38/xc5/x31 <Private Use>
-+<UF1D1>     /x83/x38/xc5/x32 <Private Use>
-+<UF1D2>     /x83/x38/xc5/x33 <Private Use>
-+<UF1D3>     /x83/x38/xc5/x34 <Private Use>
-+<UF1D4>     /x83/x38/xc5/x35 <Private Use>
-+<UF1D5>     /x83/x38/xc5/x36 <Private Use>
-+<UF1D6>     /x83/x38/xc5/x37 <Private Use>
-+<UF1D7>     /x83/x38/xc5/x38 <Private Use>
-+<UF1D8>     /x83/x38/xc5/x39 <Private Use>
-+<UF1D9>     /x83/x38/xc6/x30 <Private Use>
-+<UF1DA>     /x83/x38/xc6/x31 <Private Use>
-+<UF1DB>     /x83/x38/xc6/x32 <Private Use>
-+<UF1DC>     /x83/x38/xc6/x33 <Private Use>
-+<UF1DD>     /x83/x38/xc6/x34 <Private Use>
-+<UF1DE>     /x83/x38/xc6/x35 <Private Use>
-+<UF1DF>     /x83/x38/xc6/x36 <Private Use>
-+<UF1E0>     /x83/x38/xc6/x37 <Private Use>
-+<UF1E1>     /x83/x38/xc6/x38 <Private Use>
-+<UF1E2>     /x83/x38/xc6/x39 <Private Use>
-+<UF1E3>     /x83/x38/xc7/x30 <Private Use>
-+<UF1E4>     /x83/x38/xc7/x31 <Private Use>
-+<UF1E5>     /x83/x38/xc7/x32 <Private Use>
-+<UF1E6>     /x83/x38/xc7/x33 <Private Use>
-+<UF1E7>     /x83/x38/xc7/x34 <Private Use>
-+<UF1E8>     /x83/x38/xc7/x35 <Private Use>
-+<UF1E9>     /x83/x38/xc7/x36 <Private Use>
-+<UF1EA>     /x83/x38/xc7/x37 <Private Use>
-+<UF1EB>     /x83/x38/xc7/x38 <Private Use>
-+<UF1EC>     /x83/x38/xc7/x39 <Private Use>
-+<UF1ED>     /x83/x38/xc8/x30 <Private Use>
-+<UF1EE>     /x83/x38/xc8/x31 <Private Use>
-+<UF1EF>     /x83/x38/xc8/x32 <Private Use>
-+<UF1F0>     /x83/x38/xc8/x33 <Private Use>
-+<UF1F1>     /x83/x38/xc8/x34 <Private Use>
-+<UF1F2>     /x83/x38/xc8/x35 <Private Use>
-+<UF1F3>     /x83/x38/xc8/x36 <Private Use>
-+<UF1F4>     /x83/x38/xc8/x37 <Private Use>
-+<UF1F5>     /x83/x38/xc8/x38 <Private Use>
-+<UF1F6>     /x83/x38/xc8/x39 <Private Use>
-+<UF1F7>     /x83/x38/xc9/x30 <Private Use>
-+<UF1F8>     /x83/x38/xc9/x31 <Private Use>
-+<UF1F9>     /x83/x38/xc9/x32 <Private Use>
-+<UF1FA>     /x83/x38/xc9/x33 <Private Use>
-+<UF1FB>     /x83/x38/xc9/x34 <Private Use>
-+<UF1FC>     /x83/x38/xc9/x35 <Private Use>
-+<UF1FD>     /x83/x38/xc9/x36 <Private Use>
-+<UF1FE>     /x83/x38/xc9/x37 <Private Use>
-+<UF1FF>     /x83/x38/xc9/x38 <Private Use>
-+<UF200>     /x83/x38/xc9/x39 <Private Use>
-+<UF201>     /x83/x38/xca/x30 <Private Use>
-+<UF202>     /x83/x38/xca/x31 <Private Use>
-+<UF203>     /x83/x38/xca/x32 <Private Use>
-+<UF204>     /x83/x38/xca/x33 <Private Use>
-+<UF205>     /x83/x38/xca/x34 <Private Use>
-+<UF206>     /x83/x38/xca/x35 <Private Use>
-+<UF207>     /x83/x38/xca/x36 <Private Use>
-+<UF208>     /x83/x38/xca/x37 <Private Use>
-+<UF209>     /x83/x38/xca/x38 <Private Use>
-+<UF20A>     /x83/x38/xca/x39 <Private Use>
-+<UF20B>     /x83/x38/xcb/x30 <Private Use>
-+<UF20C>     /x83/x38/xcb/x31 <Private Use>
-+<UF20D>     /x83/x38/xcb/x32 <Private Use>
-+<UF20E>     /x83/x38/xcb/x33 <Private Use>
-+<UF20F>     /x83/x38/xcb/x34 <Private Use>
-+<UF210>     /x83/x38/xcb/x35 <Private Use>
-+<UF211>     /x83/x38/xcb/x36 <Private Use>
-+<UF212>     /x83/x38/xcb/x37 <Private Use>
-+<UF213>     /x83/x38/xcb/x38 <Private Use>
-+<UF214>     /x83/x38/xcb/x39 <Private Use>
-+<UF215>     /x83/x38/xcc/x30 <Private Use>
-+<UF216>     /x83/x38/xcc/x31 <Private Use>
-+<UF217>     /x83/x38/xcc/x32 <Private Use>
-+<UF218>     /x83/x38/xcc/x33 <Private Use>
-+<UF219>     /x83/x38/xcc/x34 <Private Use>
-+<UF21A>     /x83/x38/xcc/x35 <Private Use>
-+<UF21B>     /x83/x38/xcc/x36 <Private Use>
-+<UF21C>     /x83/x38/xcc/x37 <Private Use>
-+<UF21D>     /x83/x38/xcc/x38 <Private Use>
-+<UF21E>     /x83/x38/xcc/x39 <Private Use>
-+<UF21F>     /x83/x38/xcd/x30 <Private Use>
-+<UF220>     /x83/x38/xcd/x31 <Private Use>
-+<UF221>     /x83/x38/xcd/x32 <Private Use>
-+<UF222>     /x83/x38/xcd/x33 <Private Use>
-+<UF223>     /x83/x38/xcd/x34 <Private Use>
-+<UF224>     /x83/x38/xcd/x35 <Private Use>
-+<UF225>     /x83/x38/xcd/x36 <Private Use>
-+<UF226>     /x83/x38/xcd/x37 <Private Use>
-+<UF227>     /x83/x38/xcd/x38 <Private Use>
-+<UF228>     /x83/x38/xcd/x39 <Private Use>
-+<UF229>     /x83/x38/xce/x30 <Private Use>
-+<UF22A>     /x83/x38/xce/x31 <Private Use>
-+<UF22B>     /x83/x38/xce/x32 <Private Use>
-+<UF22C>     /x83/x38/xce/x33 <Private Use>
-+<UF22D>     /x83/x38/xce/x34 <Private Use>
-+<UF22E>     /x83/x38/xce/x35 <Private Use>
-+<UF22F>     /x83/x38/xce/x36 <Private Use>
-+<UF230>     /x83/x38/xce/x37 <Private Use>
-+<UF231>     /x83/x38/xce/x38 <Private Use>
-+<UF232>     /x83/x38/xce/x39 <Private Use>
-+<UF233>     /x83/x38/xcf/x30 <Private Use>
-+<UF234>     /x83/x38/xcf/x31 <Private Use>
-+<UF235>     /x83/x38/xcf/x32 <Private Use>
-+<UF236>     /x83/x38/xcf/x33 <Private Use>
-+<UF237>     /x83/x38/xcf/x34 <Private Use>
-+<UF238>     /x83/x38/xcf/x35 <Private Use>
-+<UF239>     /x83/x38/xcf/x36 <Private Use>
-+<UF23A>     /x83/x38/xcf/x37 <Private Use>
-+<UF23B>     /x83/x38/xcf/x38 <Private Use>
-+<UF23C>     /x83/x38/xcf/x39 <Private Use>
-+<UF23D>     /x83/x38/xd0/x30 <Private Use>
-+<UF23E>     /x83/x38/xd0/x31 <Private Use>
-+<UF23F>     /x83/x38/xd0/x32 <Private Use>
-+<UF240>     /x83/x38/xd0/x33 <Private Use>
-+<UF241>     /x83/x38/xd0/x34 <Private Use>
-+<UF242>     /x83/x38/xd0/x35 <Private Use>
-+<UF243>     /x83/x38/xd0/x36 <Private Use>
-+<UF244>     /x83/x38/xd0/x37 <Private Use>
-+<UF245>     /x83/x38/xd0/x38 <Private Use>
-+<UF246>     /x83/x38/xd0/x39 <Private Use>
-+<UF247>     /x83/x38/xd1/x30 <Private Use>
-+<UF248>     /x83/x38/xd1/x31 <Private Use>
-+<UF249>     /x83/x38/xd1/x32 <Private Use>
-+<UF24A>     /x83/x38/xd1/x33 <Private Use>
-+<UF24B>     /x83/x38/xd1/x34 <Private Use>
-+<UF24C>     /x83/x38/xd1/x35 <Private Use>
-+<UF24D>     /x83/x38/xd1/x36 <Private Use>
-+<UF24E>     /x83/x38/xd1/x37 <Private Use>
-+<UF24F>     /x83/x38/xd1/x38 <Private Use>
-+<UF250>     /x83/x38/xd1/x39 <Private Use>
-+<UF251>     /x83/x38/xd2/x30 <Private Use>
-+<UF252>     /x83/x38/xd2/x31 <Private Use>
-+<UF253>     /x83/x38/xd2/x32 <Private Use>
-+<UF254>     /x83/x38/xd2/x33 <Private Use>
-+<UF255>     /x83/x38/xd2/x34 <Private Use>
-+<UF256>     /x83/x38/xd2/x35 <Private Use>
-+<UF257>     /x83/x38/xd2/x36 <Private Use>
-+<UF258>     /x83/x38/xd2/x37 <Private Use>
-+<UF259>     /x83/x38/xd2/x38 <Private Use>
-+<UF25A>     /x83/x38/xd2/x39 <Private Use>
-+<UF25B>     /x83/x38/xd3/x30 <Private Use>
-+<UF25C>     /x83/x38/xd3/x31 <Private Use>
-+<UF25D>     /x83/x38/xd3/x32 <Private Use>
-+<UF25E>     /x83/x38/xd3/x33 <Private Use>
-+<UF25F>     /x83/x38/xd3/x34 <Private Use>
-+<UF260>     /x83/x38/xd3/x35 <Private Use>
-+<UF261>     /x83/x38/xd3/x36 <Private Use>
-+<UF262>     /x83/x38/xd3/x37 <Private Use>
-+<UF263>     /x83/x38/xd3/x38 <Private Use>
-+<UF264>     /x83/x38/xd3/x39 <Private Use>
-+<UF265>     /x83/x38/xd4/x30 <Private Use>
-+<UF266>     /x83/x38/xd4/x31 <Private Use>
-+<UF267>     /x83/x38/xd4/x32 <Private Use>
-+<UF268>     /x83/x38/xd4/x33 <Private Use>
-+<UF269>     /x83/x38/xd4/x34 <Private Use>
-+<UF26A>     /x83/x38/xd4/x35 <Private Use>
-+<UF26B>     /x83/x38/xd4/x36 <Private Use>
-+<UF26C>     /x83/x38/xd4/x37 <Private Use>
-+<UF26D>     /x83/x38/xd4/x38 <Private Use>
-+<UF26E>     /x83/x38/xd4/x39 <Private Use>
-+<UF26F>     /x83/x38/xd5/x30 <Private Use>
-+<UF270>     /x83/x38/xd5/x31 <Private Use>
-+<UF271>     /x83/x38/xd5/x32 <Private Use>
-+<UF272>     /x83/x38/xd5/x33 <Private Use>
-+<UF273>     /x83/x38/xd5/x34 <Private Use>
-+<UF274>     /x83/x38/xd5/x35 <Private Use>
-+<UF275>     /x83/x38/xd5/x36 <Private Use>
-+<UF276>     /x83/x38/xd5/x37 <Private Use>
-+<UF277>     /x83/x38/xd5/x38 <Private Use>
-+<UF278>     /x83/x38/xd5/x39 <Private Use>
-+<UF279>     /x83/x38/xd6/x30 <Private Use>
-+<UF27A>     /x83/x38/xd6/x31 <Private Use>
-+<UF27B>     /x83/x38/xd6/x32 <Private Use>
-+<UF27C>     /x83/x38/xd6/x33 <Private Use>
-+<UF27D>     /x83/x38/xd6/x34 <Private Use>
-+<UF27E>     /x83/x38/xd6/x35 <Private Use>
-+<UF27F>     /x83/x38/xd6/x36 <Private Use>
-+<UF280>     /x83/x38/xd6/x37 <Private Use>
-+<UF281>     /x83/x38/xd6/x38 <Private Use>
-+<UF282>     /x83/x38/xd6/x39 <Private Use>
-+<UF283>     /x83/x38/xd7/x30 <Private Use>
-+<UF284>     /x83/x38/xd7/x31 <Private Use>
-+<UF285>     /x83/x38/xd7/x32 <Private Use>
-+<UF286>     /x83/x38/xd7/x33 <Private Use>
-+<UF287>     /x83/x38/xd7/x34 <Private Use>
-+<UF288>     /x83/x38/xd7/x35 <Private Use>
-+<UF289>     /x83/x38/xd7/x36 <Private Use>
-+<UF28A>     /x83/x38/xd7/x37 <Private Use>
-+<UF28B>     /x83/x38/xd7/x38 <Private Use>
-+<UF28C>     /x83/x38/xd7/x39 <Private Use>
-+<UF28D>     /x83/x38/xd8/x30 <Private Use>
-+<UF28E>     /x83/x38/xd8/x31 <Private Use>
-+<UF28F>     /x83/x38/xd8/x32 <Private Use>
-+<UF290>     /x83/x38/xd8/x33 <Private Use>
-+<UF291>     /x83/x38/xd8/x34 <Private Use>
-+<UF292>     /x83/x38/xd8/x35 <Private Use>
-+<UF293>     /x83/x38/xd8/x36 <Private Use>
-+<UF294>     /x83/x38/xd8/x37 <Private Use>
-+<UF295>     /x83/x38/xd8/x38 <Private Use>
-+<UF296>     /x83/x38/xd8/x39 <Private Use>
-+<UF297>     /x83/x38/xd9/x30 <Private Use>
-+<UF298>     /x83/x38/xd9/x31 <Private Use>
-+<UF299>     /x83/x38/xd9/x32 <Private Use>
-+<UF29A>     /x83/x38/xd9/x33 <Private Use>
-+<UF29B>     /x83/x38/xd9/x34 <Private Use>
-+<UF29C>     /x83/x38/xd9/x35 <Private Use>
-+<UF29D>     /x83/x38/xd9/x36 <Private Use>
-+<UF29E>     /x83/x38/xd9/x37 <Private Use>
-+<UF29F>     /x83/x38/xd9/x38 <Private Use>
-+<UF2A0>     /x83/x38/xd9/x39 <Private Use>
-+<UF2A1>     /x83/x38/xda/x30 <Private Use>
-+<UF2A2>     /x83/x38/xda/x31 <Private Use>
-+<UF2A3>     /x83/x38/xda/x32 <Private Use>
-+<UF2A4>     /x83/x38/xda/x33 <Private Use>
-+<UF2A5>     /x83/x38/xda/x34 <Private Use>
-+<UF2A6>     /x83/x38/xda/x35 <Private Use>
-+<UF2A7>     /x83/x38/xda/x36 <Private Use>
-+<UF2A8>     /x83/x38/xda/x37 <Private Use>
-+<UF2A9>     /x83/x38/xda/x38 <Private Use>
-+<UF2AA>     /x83/x38/xda/x39 <Private Use>
-+<UF2AB>     /x83/x38/xdb/x30 <Private Use>
-+<UF2AC>     /x83/x38/xdb/x31 <Private Use>
-+<UF2AD>     /x83/x38/xdb/x32 <Private Use>
-+<UF2AE>     /x83/x38/xdb/x33 <Private Use>
-+<UF2AF>     /x83/x38/xdb/x34 <Private Use>
-+<UF2B0>     /x83/x38/xdb/x35 <Private Use>
-+<UF2B1>     /x83/x38/xdb/x36 <Private Use>
-+<UF2B2>     /x83/x38/xdb/x37 <Private Use>
-+<UF2B3>     /x83/x38/xdb/x38 <Private Use>
-+<UF2B4>     /x83/x38/xdb/x39 <Private Use>
-+<UF2B5>     /x83/x38/xdc/x30 <Private Use>
-+<UF2B6>     /x83/x38/xdc/x31 <Private Use>
-+<UF2B7>     /x83/x38/xdc/x32 <Private Use>
-+<UF2B8>     /x83/x38/xdc/x33 <Private Use>
-+<UF2B9>     /x83/x38/xdc/x34 <Private Use>
-+<UF2BA>     /x83/x38/xdc/x35 <Private Use>
-+<UF2BB>     /x83/x38/xdc/x36 <Private Use>
-+<UF2BC>     /x83/x38/xdc/x37 <Private Use>
-+<UF2BD>     /x83/x38/xdc/x38 <Private Use>
-+<UF2BE>     /x83/x38/xdc/x39 <Private Use>
-+<UF2BF>     /x83/x38/xdd/x30 <Private Use>
-+<UF2C0>     /x83/x38/xdd/x31 <Private Use>
-+<UF2C1>     /x83/x38/xdd/x32 <Private Use>
-+<UF2C2>     /x83/x38/xdd/x33 <Private Use>
-+<UF2C3>     /x83/x38/xdd/x34 <Private Use>
-+<UF2C4>     /x83/x38/xdd/x35 <Private Use>
-+<UF2C5>     /x83/x38/xdd/x36 <Private Use>
-+<UF2C6>     /x83/x38/xdd/x37 <Private Use>
-+<UF2C7>     /x83/x38/xdd/x38 <Private Use>
-+<UF2C8>     /x83/x38/xdd/x39 <Private Use>
-+<UF2C9>     /x83/x38/xde/x30 <Private Use>
-+<UF2CA>     /x83/x38/xde/x31 <Private Use>
-+<UF2CB>     /x83/x38/xde/x32 <Private Use>
-+<UF2CC>     /x83/x38/xde/x33 <Private Use>
-+<UF2CD>     /x83/x38/xde/x34 <Private Use>
-+<UF2CE>     /x83/x38/xde/x35 <Private Use>
-+<UF2CF>     /x83/x38/xde/x36 <Private Use>
-+<UF2D0>     /x83/x38/xde/x37 <Private Use>
-+<UF2D1>     /x83/x38/xde/x38 <Private Use>
-+<UF2D2>     /x83/x38/xde/x39 <Private Use>
-+<UF2D3>     /x83/x38/xdf/x30 <Private Use>
-+<UF2D4>     /x83/x38/xdf/x31 <Private Use>
-+<UF2D5>     /x83/x38/xdf/x32 <Private Use>
-+<UF2D6>     /x83/x38/xdf/x33 <Private Use>
-+<UF2D7>     /x83/x38/xdf/x34 <Private Use>
-+<UF2D8>     /x83/x38/xdf/x35 <Private Use>
-+<UF2D9>     /x83/x38/xdf/x36 <Private Use>
-+<UF2DA>     /x83/x38/xdf/x37 <Private Use>
-+<UF2DB>     /x83/x38/xdf/x38 <Private Use>
-+<UF2DC>     /x83/x38/xdf/x39 <Private Use>
-+<UF2DD>     /x83/x38/xe0/x30 <Private Use>
-+<UF2DE>     /x83/x38/xe0/x31 <Private Use>
-+<UF2DF>     /x83/x38/xe0/x32 <Private Use>
-+<UF2E0>     /x83/x38/xe0/x33 <Private Use>
-+<UF2E1>     /x83/x38/xe0/x34 <Private Use>
-+<UF2E2>     /x83/x38/xe0/x35 <Private Use>
-+<UF2E3>     /x83/x38/xe0/x36 <Private Use>
-+<UF2E4>     /x83/x38/xe0/x37 <Private Use>
-+<UF2E5>     /x83/x38/xe0/x38 <Private Use>
-+<UF2E6>     /x83/x38/xe0/x39 <Private Use>
-+<UF2E7>     /x83/x38/xe1/x30 <Private Use>
-+<UF2E8>     /x83/x38/xe1/x31 <Private Use>
-+<UF2E9>     /x83/x38/xe1/x32 <Private Use>
-+<UF2EA>     /x83/x38/xe1/x33 <Private Use>
-+<UF2EB>     /x83/x38/xe1/x34 <Private Use>
-+<UF2EC>     /x83/x38/xe1/x35 <Private Use>
-+<UF2ED>     /x83/x38/xe1/x36 <Private Use>
-+<UF2EE>     /x83/x38/xe1/x37 <Private Use>
-+<UF2EF>     /x83/x38/xe1/x38 <Private Use>
-+<UF2F0>     /x83/x38/xe1/x39 <Private Use>
-+<UF2F1>     /x83/x38/xe2/x30 <Private Use>
-+<UF2F2>     /x83/x38/xe2/x31 <Private Use>
-+<UF2F3>     /x83/x38/xe2/x32 <Private Use>
-+<UF2F4>     /x83/x38/xe2/x33 <Private Use>
-+<UF2F5>     /x83/x38/xe2/x34 <Private Use>
-+<UF2F6>     /x83/x38/xe2/x35 <Private Use>
-+<UF2F7>     /x83/x38/xe2/x36 <Private Use>
-+<UF2F8>     /x83/x38/xe2/x37 <Private Use>
-+<UF2F9>     /x83/x38/xe2/x38 <Private Use>
-+<UF2FA>     /x83/x38/xe2/x39 <Private Use>
-+<UF2FB>     /x83/x38/xe3/x30 <Private Use>
-+<UF2FC>     /x83/x38/xe3/x31 <Private Use>
-+<UF2FD>     /x83/x38/xe3/x32 <Private Use>
-+<UF2FE>     /x83/x38/xe3/x33 <Private Use>
-+<UF2FF>     /x83/x38/xe3/x34 <Private Use>
-+<UF300>     /x83/x38/xe3/x35 <Private Use>
-+<UF301>     /x83/x38/xe3/x36 <Private Use>
-+<UF302>     /x83/x38/xe3/x37 <Private Use>
-+<UF303>     /x83/x38/xe3/x38 <Private Use>
-+<UF304>     /x83/x38/xe3/x39 <Private Use>
-+<UF305>     /x83/x38/xe4/x30 <Private Use>
-+<UF306>     /x83/x38/xe4/x31 <Private Use>
-+<UF307>     /x83/x38/xe4/x32 <Private Use>
-+<UF308>     /x83/x38/xe4/x33 <Private Use>
-+<UF309>     /x83/x38/xe4/x34 <Private Use>
-+<UF30A>     /x83/x38/xe4/x35 <Private Use>
-+<UF30B>     /x83/x38/xe4/x36 <Private Use>
-+<UF30C>     /x83/x38/xe4/x37 <Private Use>
-+<UF30D>     /x83/x38/xe4/x38 <Private Use>
-+<UF30E>     /x83/x38/xe4/x39 <Private Use>
-+<UF30F>     /x83/x38/xe5/x30 <Private Use>
-+<UF310>     /x83/x38/xe5/x31 <Private Use>
-+<UF311>     /x83/x38/xe5/x32 <Private Use>
-+<UF312>     /x83/x38/xe5/x33 <Private Use>
-+<UF313>     /x83/x38/xe5/x34 <Private Use>
-+<UF314>     /x83/x38/xe5/x35 <Private Use>
-+<UF315>     /x83/x38/xe5/x36 <Private Use>
-+<UF316>     /x83/x38/xe5/x37 <Private Use>
-+<UF317>     /x83/x38/xe5/x38 <Private Use>
-+<UF318>     /x83/x38/xe5/x39 <Private Use>
-+<UF319>     /x83/x38/xe6/x30 <Private Use>
-+<UF31A>     /x83/x38/xe6/x31 <Private Use>
-+<UF31B>     /x83/x38/xe6/x32 <Private Use>
-+<UF31C>     /x83/x38/xe6/x33 <Private Use>
-+<UF31D>     /x83/x38/xe6/x34 <Private Use>
-+<UF31E>     /x83/x38/xe6/x35 <Private Use>
-+<UF31F>     /x83/x38/xe6/x36 <Private Use>
-+<UF320>     /x83/x38/xe6/x37 <Private Use>
-+<UF321>     /x83/x38/xe6/x38 <Private Use>
-+<UF322>     /x83/x38/xe6/x39 <Private Use>
-+<UF323>     /x83/x38/xe7/x30 <Private Use>
-+<UF324>     /x83/x38/xe7/x31 <Private Use>
-+<UF325>     /x83/x38/xe7/x32 <Private Use>
-+<UF326>     /x83/x38/xe7/x33 <Private Use>
-+<UF327>     /x83/x38/xe7/x34 <Private Use>
-+<UF328>     /x83/x38/xe7/x35 <Private Use>
-+<UF329>     /x83/x38/xe7/x36 <Private Use>
-+<UF32A>     /x83/x38/xe7/x37 <Private Use>
-+<UF32B>     /x83/x38/xe7/x38 <Private Use>
-+<UF32C>     /x83/x38/xe7/x39 <Private Use>
-+<UF32D>     /x83/x38/xe8/x30 <Private Use>
-+<UF32E>     /x83/x38/xe8/x31 <Private Use>
-+<UF32F>     /x83/x38/xe8/x32 <Private Use>
-+<UF330>     /x83/x38/xe8/x33 <Private Use>
-+<UF331>     /x83/x38/xe8/x34 <Private Use>
-+<UF332>     /x83/x38/xe8/x35 <Private Use>
-+<UF333>     /x83/x38/xe8/x36 <Private Use>
-+<UF334>     /x83/x38/xe8/x37 <Private Use>
-+<UF335>     /x83/x38/xe8/x38 <Private Use>
-+<UF336>     /x83/x38/xe8/x39 <Private Use>
-+<UF337>     /x83/x38/xe9/x30 <Private Use>
-+<UF338>     /x83/x38/xe9/x31 <Private Use>
-+<UF339>     /x83/x38/xe9/x32 <Private Use>
-+<UF33A>     /x83/x38/xe9/x33 <Private Use>
-+<UF33B>     /x83/x38/xe9/x34 <Private Use>
-+<UF33C>     /x83/x38/xe9/x35 <Private Use>
-+<UF33D>     /x83/x38/xe9/x36 <Private Use>
-+<UF33E>     /x83/x38/xe9/x37 <Private Use>
-+<UF33F>     /x83/x38/xe9/x38 <Private Use>
-+<UF340>     /x83/x38/xe9/x39 <Private Use>
-+<UF341>     /x83/x38/xea/x30 <Private Use>
-+<UF342>     /x83/x38/xea/x31 <Private Use>
-+<UF343>     /x83/x38/xea/x32 <Private Use>
-+<UF344>     /x83/x38/xea/x33 <Private Use>
-+<UF345>     /x83/x38/xea/x34 <Private Use>
-+<UF346>     /x83/x38/xea/x35 <Private Use>
-+<UF347>     /x83/x38/xea/x36 <Private Use>
-+<UF348>     /x83/x38/xea/x37 <Private Use>
-+<UF349>     /x83/x38/xea/x38 <Private Use>
-+<UF34A>     /x83/x38/xea/x39 <Private Use>
-+<UF34B>     /x83/x38/xeb/x30 <Private Use>
-+<UF34C>     /x83/x38/xeb/x31 <Private Use>
-+<UF34D>     /x83/x38/xeb/x32 <Private Use>
-+<UF34E>     /x83/x38/xeb/x33 <Private Use>
-+<UF34F>     /x83/x38/xeb/x34 <Private Use>
-+<UF350>     /x83/x38/xeb/x35 <Private Use>
-+<UF351>     /x83/x38/xeb/x36 <Private Use>
-+<UF352>     /x83/x38/xeb/x37 <Private Use>
-+<UF353>     /x83/x38/xeb/x38 <Private Use>
-+<UF354>     /x83/x38/xeb/x39 <Private Use>
-+<UF355>     /x83/x38/xec/x30 <Private Use>
-+<UF356>     /x83/x38/xec/x31 <Private Use>
-+<UF357>     /x83/x38/xec/x32 <Private Use>
-+<UF358>     /x83/x38/xec/x33 <Private Use>
-+<UF359>     /x83/x38/xec/x34 <Private Use>
-+<UF35A>     /x83/x38/xec/x35 <Private Use>
-+<UF35B>     /x83/x38/xec/x36 <Private Use>
-+<UF35C>     /x83/x38/xec/x37 <Private Use>
-+<UF35D>     /x83/x38/xec/x38 <Private Use>
-+<UF35E>     /x83/x38/xec/x39 <Private Use>
-+<UF35F>     /x83/x38/xed/x30 <Private Use>
-+<UF360>     /x83/x38/xed/x31 <Private Use>
-+<UF361>     /x83/x38/xed/x32 <Private Use>
-+<UF362>     /x83/x38/xed/x33 <Private Use>
-+<UF363>     /x83/x38/xed/x34 <Private Use>
-+<UF364>     /x83/x38/xed/x35 <Private Use>
-+<UF365>     /x83/x38/xed/x36 <Private Use>
-+<UF366>     /x83/x38/xed/x37 <Private Use>
-+<UF367>     /x83/x38/xed/x38 <Private Use>
-+<UF368>     /x83/x38/xed/x39 <Private Use>
-+<UF369>     /x83/x38/xee/x30 <Private Use>
-+<UF36A>     /x83/x38/xee/x31 <Private Use>
-+<UF36B>     /x83/x38/xee/x32 <Private Use>
-+<UF36C>     /x83/x38/xee/x33 <Private Use>
-+<UF36D>     /x83/x38/xee/x34 <Private Use>
-+<UF36E>     /x83/x38/xee/x35 <Private Use>
-+<UF36F>     /x83/x38/xee/x36 <Private Use>
-+<UF370>     /x83/x38/xee/x37 <Private Use>
-+<UF371>     /x83/x38/xee/x38 <Private Use>
-+<UF372>     /x83/x38/xee/x39 <Private Use>
-+<UF373>     /x83/x38/xef/x30 <Private Use>
-+<UF374>     /x83/x38/xef/x31 <Private Use>
-+<UF375>     /x83/x38/xef/x32 <Private Use>
-+<UF376>     /x83/x38/xef/x33 <Private Use>
-+<UF377>     /x83/x38/xef/x34 <Private Use>
-+<UF378>     /x83/x38/xef/x35 <Private Use>
-+<UF379>     /x83/x38/xef/x36 <Private Use>
-+<UF37A>     /x83/x38/xef/x37 <Private Use>
-+<UF37B>     /x83/x38/xef/x38 <Private Use>
-+<UF37C>     /x83/x38/xef/x39 <Private Use>
-+<UF37D>     /x83/x38/xf0/x30 <Private Use>
-+<UF37E>     /x83/x38/xf0/x31 <Private Use>
-+<UF37F>     /x83/x38/xf0/x32 <Private Use>
-+<UF380>     /x83/x38/xf0/x33 <Private Use>
-+<UF381>     /x83/x38/xf0/x34 <Private Use>
-+<UF382>     /x83/x38/xf0/x35 <Private Use>
-+<UF383>     /x83/x38/xf0/x36 <Private Use>
-+<UF384>     /x83/x38/xf0/x37 <Private Use>
-+<UF385>     /x83/x38/xf0/x38 <Private Use>
-+<UF386>     /x83/x38/xf0/x39 <Private Use>
-+<UF387>     /x83/x38/xf1/x30 <Private Use>
-+<UF388>     /x83/x38/xf1/x31 <Private Use>
-+<UF389>     /x83/x38/xf1/x32 <Private Use>
-+<UF38A>     /x83/x38/xf1/x33 <Private Use>
-+<UF38B>     /x83/x38/xf1/x34 <Private Use>
-+<UF38C>     /x83/x38/xf1/x35 <Private Use>
-+<UF38D>     /x83/x38/xf1/x36 <Private Use>
-+<UF38E>     /x83/x38/xf1/x37 <Private Use>
-+<UF38F>     /x83/x38/xf1/x38 <Private Use>
-+<UF390>     /x83/x38/xf1/x39 <Private Use>
-+<UF391>     /x83/x38/xf2/x30 <Private Use>
-+<UF392>     /x83/x38/xf2/x31 <Private Use>
-+<UF393>     /x83/x38/xf2/x32 <Private Use>
-+<UF394>     /x83/x38/xf2/x33 <Private Use>
-+<UF395>     /x83/x38/xf2/x34 <Private Use>
-+<UF396>     /x83/x38/xf2/x35 <Private Use>
-+<UF397>     /x83/x38/xf2/x36 <Private Use>
-+<UF398>     /x83/x38/xf2/x37 <Private Use>
-+<UF399>     /x83/x38/xf2/x38 <Private Use>
-+<UF39A>     /x83/x38/xf2/x39 <Private Use>
-+<UF39B>     /x83/x38/xf3/x30 <Private Use>
-+<UF39C>     /x83/x38/xf3/x31 <Private Use>
-+<UF39D>     /x83/x38/xf3/x32 <Private Use>
-+<UF39E>     /x83/x38/xf3/x33 <Private Use>
-+<UF39F>     /x83/x38/xf3/x34 <Private Use>
-+<UF3A0>     /x83/x38/xf3/x35 <Private Use>
-+<UF3A1>     /x83/x38/xf3/x36 <Private Use>
-+<UF3A2>     /x83/x38/xf3/x37 <Private Use>
-+<UF3A3>     /x83/x38/xf3/x38 <Private Use>
-+<UF3A4>     /x83/x38/xf3/x39 <Private Use>
-+<UF3A5>     /x83/x38/xf4/x30 <Private Use>
-+<UF3A6>     /x83/x38/xf4/x31 <Private Use>
-+<UF3A7>     /x83/x38/xf4/x32 <Private Use>
-+<UF3A8>     /x83/x38/xf4/x33 <Private Use>
-+<UF3A9>     /x83/x38/xf4/x34 <Private Use>
-+<UF3AA>     /x83/x38/xf4/x35 <Private Use>
-+<UF3AB>     /x83/x38/xf4/x36 <Private Use>
-+<UF3AC>     /x83/x38/xf4/x37 <Private Use>
-+<UF3AD>     /x83/x38/xf4/x38 <Private Use>
-+<UF3AE>     /x83/x38/xf4/x39 <Private Use>
-+<UF3AF>     /x83/x38/xf5/x30 <Private Use>
-+<UF3B0>     /x83/x38/xf5/x31 <Private Use>
-+<UF3B1>     /x83/x38/xf5/x32 <Private Use>
-+<UF3B2>     /x83/x38/xf5/x33 <Private Use>
-+<UF3B3>     /x83/x38/xf5/x34 <Private Use>
-+<UF3B4>     /x83/x38/xf5/x35 <Private Use>
-+<UF3B5>     /x83/x38/xf5/x36 <Private Use>
-+<UF3B6>     /x83/x38/xf5/x37 <Private Use>
-+<UF3B7>     /x83/x38/xf5/x38 <Private Use>
-+<UF3B8>     /x83/x38/xf5/x39 <Private Use>
-+<UF3B9>     /x83/x38/xf6/x30 <Private Use>
-+<UF3BA>     /x83/x38/xf6/x31 <Private Use>
-+<UF3BB>     /x83/x38/xf6/x32 <Private Use>
-+<UF3BC>     /x83/x38/xf6/x33 <Private Use>
-+<UF3BD>     /x83/x38/xf6/x34 <Private Use>
-+<UF3BE>     /x83/x38/xf6/x35 <Private Use>
-+<UF3BF>     /x83/x38/xf6/x36 <Private Use>
-+<UF3C0>     /x83/x38/xf6/x37 <Private Use>
-+<UF3C1>     /x83/x38/xf6/x38 <Private Use>
-+<UF3C2>     /x83/x38/xf6/x39 <Private Use>
-+<UF3C3>     /x83/x38/xf7/x30 <Private Use>
-+<UF3C4>     /x83/x38/xf7/x31 <Private Use>
-+<UF3C5>     /x83/x38/xf7/x32 <Private Use>
-+<UF3C6>     /x83/x38/xf7/x33 <Private Use>
-+<UF3C7>     /x83/x38/xf7/x34 <Private Use>
-+<UF3C8>     /x83/x38/xf7/x35 <Private Use>
-+<UF3C9>     /x83/x38/xf7/x36 <Private Use>
-+<UF3CA>     /x83/x38/xf7/x37 <Private Use>
-+<UF3CB>     /x83/x38/xf7/x38 <Private Use>
-+<UF3CC>     /x83/x38/xf7/x39 <Private Use>
-+<UF3CD>     /x83/x38/xf8/x30 <Private Use>
-+<UF3CE>     /x83/x38/xf8/x31 <Private Use>
-+<UF3CF>     /x83/x38/xf8/x32 <Private Use>
-+<UF3D0>     /x83/x38/xf8/x33 <Private Use>
-+<UF3D1>     /x83/x38/xf8/x34 <Private Use>
-+<UF3D2>     /x83/x38/xf8/x35 <Private Use>
-+<UF3D3>     /x83/x38/xf8/x36 <Private Use>
-+<UF3D4>     /x83/x38/xf8/x37 <Private Use>
-+<UF3D5>     /x83/x38/xf8/x38 <Private Use>
-+<UF3D6>     /x83/x38/xf8/x39 <Private Use>
-+<UF3D7>     /x83/x38/xf9/x30 <Private Use>
-+<UF3D8>     /x83/x38/xf9/x31 <Private Use>
-+<UF3D9>     /x83/x38/xf9/x32 <Private Use>
-+<UF3DA>     /x83/x38/xf9/x33 <Private Use>
-+<UF3DB>     /x83/x38/xf9/x34 <Private Use>
-+<UF3DC>     /x83/x38/xf9/x35 <Private Use>
-+<UF3DD>     /x83/x38/xf9/x36 <Private Use>
-+<UF3DE>     /x83/x38/xf9/x37 <Private Use>
-+<UF3DF>     /x83/x38/xf9/x38 <Private Use>
-+<UF3E0>     /x83/x38/xf9/x39 <Private Use>
-+<UF3E1>     /x83/x38/xfa/x30 <Private Use>
-+<UF3E2>     /x83/x38/xfa/x31 <Private Use>
-+<UF3E3>     /x83/x38/xfa/x32 <Private Use>
-+<UF3E4>     /x83/x38/xfa/x33 <Private Use>
-+<UF3E5>     /x83/x38/xfa/x34 <Private Use>
-+<UF3E6>     /x83/x38/xfa/x35 <Private Use>
-+<UF3E7>     /x83/x38/xfa/x36 <Private Use>
-+<UF3E8>     /x83/x38/xfa/x37 <Private Use>
-+<UF3E9>     /x83/x38/xfa/x38 <Private Use>
-+<UF3EA>     /x83/x38/xfa/x39 <Private Use>
-+<UF3EB>     /x83/x38/xfb/x30 <Private Use>
-+<UF3EC>     /x83/x38/xfb/x31 <Private Use>
-+<UF3ED>     /x83/x38/xfb/x32 <Private Use>
-+<UF3EE>     /x83/x38/xfb/x33 <Private Use>
-+<UF3EF>     /x83/x38/xfb/x34 <Private Use>
-+<UF3F0>     /x83/x38/xfb/x35 <Private Use>
-+<UF3F1>     /x83/x38/xfb/x36 <Private Use>
-+<UF3F2>     /x83/x38/xfb/x37 <Private Use>
-+<UF3F3>     /x83/x38/xfb/x38 <Private Use>
-+<UF3F4>     /x83/x38/xfb/x39 <Private Use>
-+<UF3F5>     /x83/x38/xfc/x30 <Private Use>
-+<UF3F6>     /x83/x38/xfc/x31 <Private Use>
-+<UF3F7>     /x83/x38/xfc/x32 <Private Use>
-+<UF3F8>     /x83/x38/xfc/x33 <Private Use>
-+<UF3F9>     /x83/x38/xfc/x34 <Private Use>
-+<UF3FA>     /x83/x38/xfc/x35 <Private Use>
-+<UF3FB>     /x83/x38/xfc/x36 <Private Use>
-+<UF3FC>     /x83/x38/xfc/x37 <Private Use>
-+<UF3FD>     /x83/x38/xfc/x38 <Private Use>
-+<UF3FE>     /x83/x38/xfc/x39 <Private Use>
-+<UF3FF>     /x83/x38/xfd/x30 <Private Use>
-+<UF400>     /x83/x38/xfd/x31 <Private Use>
-+<UF401>     /x83/x38/xfd/x32 <Private Use>
-+<UF402>     /x83/x38/xfd/x33 <Private Use>
-+<UF403>     /x83/x38/xfd/x34 <Private Use>
-+<UF404>     /x83/x38/xfd/x35 <Private Use>
-+<UF405>     /x83/x38/xfd/x36 <Private Use>
-+<UF406>     /x83/x38/xfd/x37 <Private Use>
-+<UF407>     /x83/x38/xfd/x38 <Private Use>
-+<UF408>     /x83/x38/xfd/x39 <Private Use>
-+<UF409>     /x83/x38/xfe/x30 <Private Use>
-+<UF40A>     /x83/x38/xfe/x31 <Private Use>
-+<UF40B>     /x83/x38/xfe/x32 <Private Use>
-+<UF40C>     /x83/x38/xfe/x33 <Private Use>
-+<UF40D>     /x83/x38/xfe/x34 <Private Use>
-+<UF40E>     /x83/x38/xfe/x35 <Private Use>
-+<UF40F>     /x83/x38/xfe/x36 <Private Use>
-+<UF410>     /x83/x38/xfe/x37 <Private Use>
-+<UF411>     /x83/x38/xfe/x38 <Private Use>
-+<UF412>     /x83/x38/xfe/x39 <Private Use>
-+<UF413>     /x83/x39/x81/x30 <Private Use>
-+<UF414>     /x83/x39/x81/x31 <Private Use>
-+<UF415>     /x83/x39/x81/x32 <Private Use>
-+<UF416>     /x83/x39/x81/x33 <Private Use>
-+<UF417>     /x83/x39/x81/x34 <Private Use>
-+<UF418>     /x83/x39/x81/x35 <Private Use>
-+<UF419>     /x83/x39/x81/x36 <Private Use>
-+<UF41A>     /x83/x39/x81/x37 <Private Use>
-+<UF41B>     /x83/x39/x81/x38 <Private Use>
-+<UF41C>     /x83/x39/x81/x39 <Private Use>
-+<UF41D>     /x83/x39/x82/x30 <Private Use>
-+<UF41E>     /x83/x39/x82/x31 <Private Use>
-+<UF41F>     /x83/x39/x82/x32 <Private Use>
-+<UF420>     /x83/x39/x82/x33 <Private Use>
-+<UF421>     /x83/x39/x82/x34 <Private Use>
-+<UF422>     /x83/x39/x82/x35 <Private Use>
-+<UF423>     /x83/x39/x82/x36 <Private Use>
-+<UF424>     /x83/x39/x82/x37 <Private Use>
-+<UF425>     /x83/x39/x82/x38 <Private Use>
-+<UF426>     /x83/x39/x82/x39 <Private Use>
-+<UF427>     /x83/x39/x83/x30 <Private Use>
-+<UF428>     /x83/x39/x83/x31 <Private Use>
-+<UF429>     /x83/x39/x83/x32 <Private Use>
-+<UF42A>     /x83/x39/x83/x33 <Private Use>
-+<UF42B>     /x83/x39/x83/x34 <Private Use>
-+<UF42C>     /x83/x39/x83/x35 <Private Use>
-+<UF42D>     /x83/x39/x83/x36 <Private Use>
-+<UF42E>     /x83/x39/x83/x37 <Private Use>
-+<UF42F>     /x83/x39/x83/x38 <Private Use>
-+<UF430>     /x83/x39/x83/x39 <Private Use>
-+<UF431>     /x83/x39/x84/x30 <Private Use>
-+<UF432>     /x83/x39/x84/x31 <Private Use>
-+<UF433>     /x83/x39/x84/x32 <Private Use>
-+<UF434>     /x83/x39/x84/x33 <Private Use>
-+<UF435>     /x83/x39/x84/x34 <Private Use>
-+<UF436>     /x83/x39/x84/x35 <Private Use>
-+<UF437>     /x83/x39/x84/x36 <Private Use>
-+<UF438>     /x83/x39/x84/x37 <Private Use>
-+<UF439>     /x83/x39/x84/x38 <Private Use>
-+<UF43A>     /x83/x39/x84/x39 <Private Use>
-+<UF43B>     /x83/x39/x85/x30 <Private Use>
-+<UF43C>     /x83/x39/x85/x31 <Private Use>
-+<UF43D>     /x83/x39/x85/x32 <Private Use>
-+<UF43E>     /x83/x39/x85/x33 <Private Use>
-+<UF43F>     /x83/x39/x85/x34 <Private Use>
-+<UF440>     /x83/x39/x85/x35 <Private Use>
-+<UF441>     /x83/x39/x85/x36 <Private Use>
-+<UF442>     /x83/x39/x85/x37 <Private Use>
-+<UF443>     /x83/x39/x85/x38 <Private Use>
-+<UF444>     /x83/x39/x85/x39 <Private Use>
-+<UF445>     /x83/x39/x86/x30 <Private Use>
-+<UF446>     /x83/x39/x86/x31 <Private Use>
-+<UF447>     /x83/x39/x86/x32 <Private Use>
-+<UF448>     /x83/x39/x86/x33 <Private Use>
-+<UF449>     /x83/x39/x86/x34 <Private Use>
-+<UF44A>     /x83/x39/x86/x35 <Private Use>
-+<UF44B>     /x83/x39/x86/x36 <Private Use>
-+<UF44C>     /x83/x39/x86/x37 <Private Use>
-+<UF44D>     /x83/x39/x86/x38 <Private Use>
-+<UF44E>     /x83/x39/x86/x39 <Private Use>
-+<UF44F>     /x83/x39/x87/x30 <Private Use>
-+<UF450>     /x83/x39/x87/x31 <Private Use>
-+<UF451>     /x83/x39/x87/x32 <Private Use>
-+<UF452>     /x83/x39/x87/x33 <Private Use>
-+<UF453>     /x83/x39/x87/x34 <Private Use>
-+<UF454>     /x83/x39/x87/x35 <Private Use>
-+<UF455>     /x83/x39/x87/x36 <Private Use>
-+<UF456>     /x83/x39/x87/x37 <Private Use>
-+<UF457>     /x83/x39/x87/x38 <Private Use>
-+<UF458>     /x83/x39/x87/x39 <Private Use>
-+<UF459>     /x83/x39/x88/x30 <Private Use>
-+<UF45A>     /x83/x39/x88/x31 <Private Use>
-+<UF45B>     /x83/x39/x88/x32 <Private Use>
-+<UF45C>     /x83/x39/x88/x33 <Private Use>
-+<UF45D>     /x83/x39/x88/x34 <Private Use>
-+<UF45E>     /x83/x39/x88/x35 <Private Use>
-+<UF45F>     /x83/x39/x88/x36 <Private Use>
-+<UF460>     /x83/x39/x88/x37 <Private Use>
-+<UF461>     /x83/x39/x88/x38 <Private Use>
-+<UF462>     /x83/x39/x88/x39 <Private Use>
-+<UF463>     /x83/x39/x89/x30 <Private Use>
-+<UF464>     /x83/x39/x89/x31 <Private Use>
-+<UF465>     /x83/x39/x89/x32 <Private Use>
-+<UF466>     /x83/x39/x89/x33 <Private Use>
-+<UF467>     /x83/x39/x89/x34 <Private Use>
-+<UF468>     /x83/x39/x89/x35 <Private Use>
-+<UF469>     /x83/x39/x89/x36 <Private Use>
-+<UF46A>     /x83/x39/x89/x37 <Private Use>
-+<UF46B>     /x83/x39/x89/x38 <Private Use>
-+<UF46C>     /x83/x39/x89/x39 <Private Use>
-+<UF46D>     /x83/x39/x8a/x30 <Private Use>
-+<UF46E>     /x83/x39/x8a/x31 <Private Use>
-+<UF46F>     /x83/x39/x8a/x32 <Private Use>
-+<UF470>     /x83/x39/x8a/x33 <Private Use>
-+<UF471>     /x83/x39/x8a/x34 <Private Use>
-+<UF472>     /x83/x39/x8a/x35 <Private Use>
-+<UF473>     /x83/x39/x8a/x36 <Private Use>
-+<UF474>     /x83/x39/x8a/x37 <Private Use>
-+<UF475>     /x83/x39/x8a/x38 <Private Use>
-+<UF476>     /x83/x39/x8a/x39 <Private Use>
-+<UF477>     /x83/x39/x8b/x30 <Private Use>
-+<UF478>     /x83/x39/x8b/x31 <Private Use>
-+<UF479>     /x83/x39/x8b/x32 <Private Use>
-+<UF47A>     /x83/x39/x8b/x33 <Private Use>
-+<UF47B>     /x83/x39/x8b/x34 <Private Use>
-+<UF47C>     /x83/x39/x8b/x35 <Private Use>
-+<UF47D>     /x83/x39/x8b/x36 <Private Use>
-+<UF47E>     /x83/x39/x8b/x37 <Private Use>
-+<UF47F>     /x83/x39/x8b/x38 <Private Use>
-+<UF480>     /x83/x39/x8b/x39 <Private Use>
-+<UF481>     /x83/x39/x8c/x30 <Private Use>
-+<UF482>     /x83/x39/x8c/x31 <Private Use>
-+<UF483>     /x83/x39/x8c/x32 <Private Use>
-+<UF484>     /x83/x39/x8c/x33 <Private Use>
-+<UF485>     /x83/x39/x8c/x34 <Private Use>
-+<UF486>     /x83/x39/x8c/x35 <Private Use>
-+<UF487>     /x83/x39/x8c/x36 <Private Use>
-+<UF488>     /x83/x39/x8c/x37 <Private Use>
-+<UF489>     /x83/x39/x8c/x38 <Private Use>
-+<UF48A>     /x83/x39/x8c/x39 <Private Use>
-+<UF48B>     /x83/x39/x8d/x30 <Private Use>
-+<UF48C>     /x83/x39/x8d/x31 <Private Use>
-+<UF48D>     /x83/x39/x8d/x32 <Private Use>
-+<UF48E>     /x83/x39/x8d/x33 <Private Use>
-+<UF48F>     /x83/x39/x8d/x34 <Private Use>
-+<UF490>     /x83/x39/x8d/x35 <Private Use>
-+<UF491>     /x83/x39/x8d/x36 <Private Use>
-+<UF492>     /x83/x39/x8d/x37 <Private Use>
-+<UF493>     /x83/x39/x8d/x38 <Private Use>
-+<UF494>     /x83/x39/x8d/x39 <Private Use>
-+<UF495>     /x83/x39/x8e/x30 <Private Use>
-+<UF496>     /x83/x39/x8e/x31 <Private Use>
-+<UF497>     /x83/x39/x8e/x32 <Private Use>
-+<UF498>     /x83/x39/x8e/x33 <Private Use>
-+<UF499>     /x83/x39/x8e/x34 <Private Use>
-+<UF49A>     /x83/x39/x8e/x35 <Private Use>
-+<UF49B>     /x83/x39/x8e/x36 <Private Use>
-+<UF49C>     /x83/x39/x8e/x37 <Private Use>
-+<UF49D>     /x83/x39/x8e/x38 <Private Use>
-+<UF49E>     /x83/x39/x8e/x39 <Private Use>
-+<UF49F>     /x83/x39/x8f/x30 <Private Use>
-+<UF4A0>     /x83/x39/x8f/x31 <Private Use>
-+<UF4A1>     /x83/x39/x8f/x32 <Private Use>
-+<UF4A2>     /x83/x39/x8f/x33 <Private Use>
-+<UF4A3>     /x83/x39/x8f/x34 <Private Use>
-+<UF4A4>     /x83/x39/x8f/x35 <Private Use>
-+<UF4A5>     /x83/x39/x8f/x36 <Private Use>
-+<UF4A6>     /x83/x39/x8f/x37 <Private Use>
-+<UF4A7>     /x83/x39/x8f/x38 <Private Use>
-+<UF4A8>     /x83/x39/x8f/x39 <Private Use>
-+<UF4A9>     /x83/x39/x90/x30 <Private Use>
-+<UF4AA>     /x83/x39/x90/x31 <Private Use>
-+<UF4AB>     /x83/x39/x90/x32 <Private Use>
-+<UF4AC>     /x83/x39/x90/x33 <Private Use>
-+<UF4AD>     /x83/x39/x90/x34 <Private Use>
-+<UF4AE>     /x83/x39/x90/x35 <Private Use>
-+<UF4AF>     /x83/x39/x90/x36 <Private Use>
-+<UF4B0>     /x83/x39/x90/x37 <Private Use>
-+<UF4B1>     /x83/x39/x90/x38 <Private Use>
-+<UF4B2>     /x83/x39/x90/x39 <Private Use>
-+<UF4B3>     /x83/x39/x91/x30 <Private Use>
-+<UF4B4>     /x83/x39/x91/x31 <Private Use>
-+<UF4B5>     /x83/x39/x91/x32 <Private Use>
-+<UF4B6>     /x83/x39/x91/x33 <Private Use>
-+<UF4B7>     /x83/x39/x91/x34 <Private Use>
-+<UF4B8>     /x83/x39/x91/x35 <Private Use>
-+<UF4B9>     /x83/x39/x91/x36 <Private Use>
-+<UF4BA>     /x83/x39/x91/x37 <Private Use>
-+<UF4BB>     /x83/x39/x91/x38 <Private Use>
-+<UF4BC>     /x83/x39/x91/x39 <Private Use>
-+<UF4BD>     /x83/x39/x92/x30 <Private Use>
-+<UF4BE>     /x83/x39/x92/x31 <Private Use>
-+<UF4BF>     /x83/x39/x92/x32 <Private Use>
-+<UF4C0>     /x83/x39/x92/x33 <Private Use>
-+<UF4C1>     /x83/x39/x92/x34 <Private Use>
-+<UF4C2>     /x83/x39/x92/x35 <Private Use>
-+<UF4C3>     /x83/x39/x92/x36 <Private Use>
-+<UF4C4>     /x83/x39/x92/x37 <Private Use>
-+<UF4C5>     /x83/x39/x92/x38 <Private Use>
-+<UF4C6>     /x83/x39/x92/x39 <Private Use>
-+<UF4C7>     /x83/x39/x93/x30 <Private Use>
-+<UF4C8>     /x83/x39/x93/x31 <Private Use>
-+<UF4C9>     /x83/x39/x93/x32 <Private Use>
-+<UF4CA>     /x83/x39/x93/x33 <Private Use>
-+<UF4CB>     /x83/x39/x93/x34 <Private Use>
-+<UF4CC>     /x83/x39/x93/x35 <Private Use>
-+<UF4CD>     /x83/x39/x93/x36 <Private Use>
-+<UF4CE>     /x83/x39/x93/x37 <Private Use>
-+<UF4CF>     /x83/x39/x93/x38 <Private Use>
-+<UF4D0>     /x83/x39/x93/x39 <Private Use>
-+<UF4D1>     /x83/x39/x94/x30 <Private Use>
-+<UF4D2>     /x83/x39/x94/x31 <Private Use>
-+<UF4D3>     /x83/x39/x94/x32 <Private Use>
-+<UF4D4>     /x83/x39/x94/x33 <Private Use>
-+<UF4D5>     /x83/x39/x94/x34 <Private Use>
-+<UF4D6>     /x83/x39/x94/x35 <Private Use>
-+<UF4D7>     /x83/x39/x94/x36 <Private Use>
-+<UF4D8>     /x83/x39/x94/x37 <Private Use>
-+<UF4D9>     /x83/x39/x94/x38 <Private Use>
-+<UF4DA>     /x83/x39/x94/x39 <Private Use>
-+<UF4DB>     /x83/x39/x95/x30 <Private Use>
-+<UF4DC>     /x83/x39/x95/x31 <Private Use>
-+<UF4DD>     /x83/x39/x95/x32 <Private Use>
-+<UF4DE>     /x83/x39/x95/x33 <Private Use>
-+<UF4DF>     /x83/x39/x95/x34 <Private Use>
-+<UF4E0>     /x83/x39/x95/x35 <Private Use>
-+<UF4E1>     /x83/x39/x95/x36 <Private Use>
-+<UF4E2>     /x83/x39/x95/x37 <Private Use>
-+<UF4E3>     /x83/x39/x95/x38 <Private Use>
-+<UF4E4>     /x83/x39/x95/x39 <Private Use>
-+<UF4E5>     /x83/x39/x96/x30 <Private Use>
-+<UF4E6>     /x83/x39/x96/x31 <Private Use>
-+<UF4E7>     /x83/x39/x96/x32 <Private Use>
-+<UF4E8>     /x83/x39/x96/x33 <Private Use>
-+<UF4E9>     /x83/x39/x96/x34 <Private Use>
-+<UF4EA>     /x83/x39/x96/x35 <Private Use>
-+<UF4EB>     /x83/x39/x96/x36 <Private Use>
-+<UF4EC>     /x83/x39/x96/x37 <Private Use>
-+<UF4ED>     /x83/x39/x96/x38 <Private Use>
-+<UF4EE>     /x83/x39/x96/x39 <Private Use>
-+<UF4EF>     /x83/x39/x97/x30 <Private Use>
-+<UF4F0>     /x83/x39/x97/x31 <Private Use>
-+<UF4F1>     /x83/x39/x97/x32 <Private Use>
-+<UF4F2>     /x83/x39/x97/x33 <Private Use>
-+<UF4F3>     /x83/x39/x97/x34 <Private Use>
-+<UF4F4>     /x83/x39/x97/x35 <Private Use>
-+<UF4F5>     /x83/x39/x97/x36 <Private Use>
-+<UF4F6>     /x83/x39/x97/x37 <Private Use>
-+<UF4F7>     /x83/x39/x97/x38 <Private Use>
-+<UF4F8>     /x83/x39/x97/x39 <Private Use>
-+<UF4F9>     /x83/x39/x98/x30 <Private Use>
-+<UF4FA>     /x83/x39/x98/x31 <Private Use>
-+<UF4FB>     /x83/x39/x98/x32 <Private Use>
-+<UF4FC>     /x83/x39/x98/x33 <Private Use>
-+<UF4FD>     /x83/x39/x98/x34 <Private Use>
-+<UF4FE>     /x83/x39/x98/x35 <Private Use>
-+<UF4FF>     /x83/x39/x98/x36 <Private Use>
-+<UF500>     /x83/x39/x98/x37 <Private Use>
-+<UF501>     /x83/x39/x98/x38 <Private Use>
-+<UF502>     /x83/x39/x98/x39 <Private Use>
-+<UF503>     /x83/x39/x99/x30 <Private Use>
-+<UF504>     /x83/x39/x99/x31 <Private Use>
-+<UF505>     /x83/x39/x99/x32 <Private Use>
-+<UF506>     /x83/x39/x99/x33 <Private Use>
-+<UF507>     /x83/x39/x99/x34 <Private Use>
-+<UF508>     /x83/x39/x99/x35 <Private Use>
-+<UF509>     /x83/x39/x99/x36 <Private Use>
-+<UF50A>     /x83/x39/x99/x37 <Private Use>
-+<UF50B>     /x83/x39/x99/x38 <Private Use>
-+<UF50C>     /x83/x39/x99/x39 <Private Use>
-+<UF50D>     /x83/x39/x9a/x30 <Private Use>
-+<UF50E>     /x83/x39/x9a/x31 <Private Use>
-+<UF50F>     /x83/x39/x9a/x32 <Private Use>
-+<UF510>     /x83/x39/x9a/x33 <Private Use>
-+<UF511>     /x83/x39/x9a/x34 <Private Use>
-+<UF512>     /x83/x39/x9a/x35 <Private Use>
-+<UF513>     /x83/x39/x9a/x36 <Private Use>
-+<UF514>     /x83/x39/x9a/x37 <Private Use>
-+<UF515>     /x83/x39/x9a/x38 <Private Use>
-+<UF516>     /x83/x39/x9a/x39 <Private Use>
-+<UF517>     /x83/x39/x9b/x30 <Private Use>
-+<UF518>     /x83/x39/x9b/x31 <Private Use>
-+<UF519>     /x83/x39/x9b/x32 <Private Use>
-+<UF51A>     /x83/x39/x9b/x33 <Private Use>
-+<UF51B>     /x83/x39/x9b/x34 <Private Use>
-+<UF51C>     /x83/x39/x9b/x35 <Private Use>
-+<UF51D>     /x83/x39/x9b/x36 <Private Use>
-+<UF51E>     /x83/x39/x9b/x37 <Private Use>
-+<UF51F>     /x83/x39/x9b/x38 <Private Use>
-+<UF520>     /x83/x39/x9b/x39 <Private Use>
-+<UF521>     /x83/x39/x9c/x30 <Private Use>
-+<UF522>     /x83/x39/x9c/x31 <Private Use>
-+<UF523>     /x83/x39/x9c/x32 <Private Use>
-+<UF524>     /x83/x39/x9c/x33 <Private Use>
-+<UF525>     /x83/x39/x9c/x34 <Private Use>
-+<UF526>     /x83/x39/x9c/x35 <Private Use>
-+<UF527>     /x83/x39/x9c/x36 <Private Use>
-+<UF528>     /x83/x39/x9c/x37 <Private Use>
-+<UF529>     /x83/x39/x9c/x38 <Private Use>
-+<UF52A>     /x83/x39/x9c/x39 <Private Use>
-+<UF52B>     /x83/x39/x9d/x30 <Private Use>
-+<UF52C>     /x83/x39/x9d/x31 <Private Use>
-+<UF52D>     /x83/x39/x9d/x32 <Private Use>
-+<UF52E>     /x83/x39/x9d/x33 <Private Use>
-+<UF52F>     /x83/x39/x9d/x34 <Private Use>
-+<UF530>     /x83/x39/x9d/x35 <Private Use>
-+<UF531>     /x83/x39/x9d/x36 <Private Use>
-+<UF532>     /x83/x39/x9d/x37 <Private Use>
-+<UF533>     /x83/x39/x9d/x38 <Private Use>
-+<UF534>     /x83/x39/x9d/x39 <Private Use>
-+<UF535>     /x83/x39/x9e/x30 <Private Use>
-+<UF536>     /x83/x39/x9e/x31 <Private Use>
-+<UF537>     /x83/x39/x9e/x32 <Private Use>
-+<UF538>     /x83/x39/x9e/x33 <Private Use>
-+<UF539>     /x83/x39/x9e/x34 <Private Use>
-+<UF53A>     /x83/x39/x9e/x35 <Private Use>
-+<UF53B>     /x83/x39/x9e/x36 <Private Use>
-+<UF53C>     /x83/x39/x9e/x37 <Private Use>
-+<UF53D>     /x83/x39/x9e/x38 <Private Use>
-+<UF53E>     /x83/x39/x9e/x39 <Private Use>
-+<UF53F>     /x83/x39/x9f/x30 <Private Use>
-+<UF540>     /x83/x39/x9f/x31 <Private Use>
-+<UF541>     /x83/x39/x9f/x32 <Private Use>
-+<UF542>     /x83/x39/x9f/x33 <Private Use>
-+<UF543>     /x83/x39/x9f/x34 <Private Use>
-+<UF544>     /x83/x39/x9f/x35 <Private Use>
-+<UF545>     /x83/x39/x9f/x36 <Private Use>
-+<UF546>     /x83/x39/x9f/x37 <Private Use>
-+<UF547>     /x83/x39/x9f/x38 <Private Use>
-+<UF548>     /x83/x39/x9f/x39 <Private Use>
-+<UF549>     /x83/x39/xa0/x30 <Private Use>
-+<UF54A>     /x83/x39/xa0/x31 <Private Use>
-+<UF54B>     /x83/x39/xa0/x32 <Private Use>
-+<UF54C>     /x83/x39/xa0/x33 <Private Use>
-+<UF54D>     /x83/x39/xa0/x34 <Private Use>
-+<UF54E>     /x83/x39/xa0/x35 <Private Use>
-+<UF54F>     /x83/x39/xa0/x36 <Private Use>
-+<UF550>     /x83/x39/xa0/x37 <Private Use>
-+<UF551>     /x83/x39/xa0/x38 <Private Use>
-+<UF552>     /x83/x39/xa0/x39 <Private Use>
-+<UF553>     /x83/x39/xa1/x30 <Private Use>
-+<UF554>     /x83/x39/xa1/x31 <Private Use>
-+<UF555>     /x83/x39/xa1/x32 <Private Use>
-+<UF556>     /x83/x39/xa1/x33 <Private Use>
-+<UF557>     /x83/x39/xa1/x34 <Private Use>
-+<UF558>     /x83/x39/xa1/x35 <Private Use>
-+<UF559>     /x83/x39/xa1/x36 <Private Use>
-+<UF55A>     /x83/x39/xa1/x37 <Private Use>
-+<UF55B>     /x83/x39/xa1/x38 <Private Use>
-+<UF55C>     /x83/x39/xa1/x39 <Private Use>
-+<UF55D>     /x83/x39/xa2/x30 <Private Use>
-+<UF55E>     /x83/x39/xa2/x31 <Private Use>
-+<UF55F>     /x83/x39/xa2/x32 <Private Use>
-+<UF560>     /x83/x39/xa2/x33 <Private Use>
-+<UF561>     /x83/x39/xa2/x34 <Private Use>
-+<UF562>     /x83/x39/xa2/x35 <Private Use>
-+<UF563>     /x83/x39/xa2/x36 <Private Use>
-+<UF564>     /x83/x39/xa2/x37 <Private Use>
-+<UF565>     /x83/x39/xa2/x38 <Private Use>
-+<UF566>     /x83/x39/xa2/x39 <Private Use>
-+<UF567>     /x83/x39/xa3/x30 <Private Use>
-+<UF568>     /x83/x39/xa3/x31 <Private Use>
-+<UF569>     /x83/x39/xa3/x32 <Private Use>
-+<UF56A>     /x83/x39/xa3/x33 <Private Use>
-+<UF56B>     /x83/x39/xa3/x34 <Private Use>
-+<UF56C>     /x83/x39/xa3/x35 <Private Use>
-+<UF56D>     /x83/x39/xa3/x36 <Private Use>
-+<UF56E>     /x83/x39/xa3/x37 <Private Use>
-+<UF56F>     /x83/x39/xa3/x38 <Private Use>
-+<UF570>     /x83/x39/xa3/x39 <Private Use>
-+<UF571>     /x83/x39/xa4/x30 <Private Use>
-+<UF572>     /x83/x39/xa4/x31 <Private Use>
-+<UF573>     /x83/x39/xa4/x32 <Private Use>
-+<UF574>     /x83/x39/xa4/x33 <Private Use>
-+<UF575>     /x83/x39/xa4/x34 <Private Use>
-+<UF576>     /x83/x39/xa4/x35 <Private Use>
-+<UF577>     /x83/x39/xa4/x36 <Private Use>
-+<UF578>     /x83/x39/xa4/x37 <Private Use>
-+<UF579>     /x83/x39/xa4/x38 <Private Use>
-+<UF57A>     /x83/x39/xa4/x39 <Private Use>
-+<UF57B>     /x83/x39/xa5/x30 <Private Use>
-+<UF57C>     /x83/x39/xa5/x31 <Private Use>
-+<UF57D>     /x83/x39/xa5/x32 <Private Use>
-+<UF57E>     /x83/x39/xa5/x33 <Private Use>
-+<UF57F>     /x83/x39/xa5/x34 <Private Use>
-+<UF580>     /x83/x39/xa5/x35 <Private Use>
-+<UF581>     /x83/x39/xa5/x36 <Private Use>
-+<UF582>     /x83/x39/xa5/x37 <Private Use>
-+<UF583>     /x83/x39/xa5/x38 <Private Use>
-+<UF584>     /x83/x39/xa5/x39 <Private Use>
-+<UF585>     /x83/x39/xa6/x30 <Private Use>
-+<UF586>     /x83/x39/xa6/x31 <Private Use>
-+<UF587>     /x83/x39/xa6/x32 <Private Use>
-+<UF588>     /x83/x39/xa6/x33 <Private Use>
-+<UF589>     /x83/x39/xa6/x34 <Private Use>
-+<UF58A>     /x83/x39/xa6/x35 <Private Use>
-+<UF58B>     /x83/x39/xa6/x36 <Private Use>
-+<UF58C>     /x83/x39/xa6/x37 <Private Use>
-+<UF58D>     /x83/x39/xa6/x38 <Private Use>
-+<UF58E>     /x83/x39/xa6/x39 <Private Use>
-+<UF58F>     /x83/x39/xa7/x30 <Private Use>
-+<UF590>     /x83/x39/xa7/x31 <Private Use>
-+<UF591>     /x83/x39/xa7/x32 <Private Use>
-+<UF592>     /x83/x39/xa7/x33 <Private Use>
-+<UF593>     /x83/x39/xa7/x34 <Private Use>
-+<UF594>     /x83/x39/xa7/x35 <Private Use>
-+<UF595>     /x83/x39/xa7/x36 <Private Use>
-+<UF596>     /x83/x39/xa7/x37 <Private Use>
-+<UF597>     /x83/x39/xa7/x38 <Private Use>
-+<UF598>     /x83/x39/xa7/x39 <Private Use>
-+<UF599>     /x83/x39/xa8/x30 <Private Use>
-+<UF59A>     /x83/x39/xa8/x31 <Private Use>
-+<UF59B>     /x83/x39/xa8/x32 <Private Use>
-+<UF59C>     /x83/x39/xa8/x33 <Private Use>
-+<UF59D>     /x83/x39/xa8/x34 <Private Use>
-+<UF59E>     /x83/x39/xa8/x35 <Private Use>
-+<UF59F>     /x83/x39/xa8/x36 <Private Use>
-+<UF5A0>     /x83/x39/xa8/x37 <Private Use>
-+<UF5A1>     /x83/x39/xa8/x38 <Private Use>
-+<UF5A2>     /x83/x39/xa8/x39 <Private Use>
-+<UF5A3>     /x83/x39/xa9/x30 <Private Use>
-+<UF5A4>     /x83/x39/xa9/x31 <Private Use>
-+<UF5A5>     /x83/x39/xa9/x32 <Private Use>
-+<UF5A6>     /x83/x39/xa9/x33 <Private Use>
-+<UF5A7>     /x83/x39/xa9/x34 <Private Use>
-+<UF5A8>     /x83/x39/xa9/x35 <Private Use>
-+<UF5A9>     /x83/x39/xa9/x36 <Private Use>
-+<UF5AA>     /x83/x39/xa9/x37 <Private Use>
-+<UF5AB>     /x83/x39/xa9/x38 <Private Use>
-+<UF5AC>     /x83/x39/xa9/x39 <Private Use>
-+<UF5AD>     /x83/x39/xaa/x30 <Private Use>
-+<UF5AE>     /x83/x39/xaa/x31 <Private Use>
-+<UF5AF>     /x83/x39/xaa/x32 <Private Use>
-+<UF5B0>     /x83/x39/xaa/x33 <Private Use>
-+<UF5B1>     /x83/x39/xaa/x34 <Private Use>
-+<UF5B2>     /x83/x39/xaa/x35 <Private Use>
-+<UF5B3>     /x83/x39/xaa/x36 <Private Use>
-+<UF5B4>     /x83/x39/xaa/x37 <Private Use>
-+<UF5B5>     /x83/x39/xaa/x38 <Private Use>
-+<UF5B6>     /x83/x39/xaa/x39 <Private Use>
-+<UF5B7>     /x83/x39/xab/x30 <Private Use>
-+<UF5B8>     /x83/x39/xab/x31 <Private Use>
-+<UF5B9>     /x83/x39/xab/x32 <Private Use>
-+<UF5BA>     /x83/x39/xab/x33 <Private Use>
-+<UF5BB>     /x83/x39/xab/x34 <Private Use>
-+<UF5BC>     /x83/x39/xab/x35 <Private Use>
-+<UF5BD>     /x83/x39/xab/x36 <Private Use>
-+<UF5BE>     /x83/x39/xab/x37 <Private Use>
-+<UF5BF>     /x83/x39/xab/x38 <Private Use>
-+<UF5C0>     /x83/x39/xab/x39 <Private Use>
-+<UF5C1>     /x83/x39/xac/x30 <Private Use>
-+<UF5C2>     /x83/x39/xac/x31 <Private Use>
-+<UF5C3>     /x83/x39/xac/x32 <Private Use>
-+<UF5C4>     /x83/x39/xac/x33 <Private Use>
-+<UF5C5>     /x83/x39/xac/x34 <Private Use>
-+<UF5C6>     /x83/x39/xac/x35 <Private Use>
-+<UF5C7>     /x83/x39/xac/x36 <Private Use>
-+<UF5C8>     /x83/x39/xac/x37 <Private Use>
-+<UF5C9>     /x83/x39/xac/x38 <Private Use>
-+<UF5CA>     /x83/x39/xac/x39 <Private Use>
-+<UF5CB>     /x83/x39/xad/x30 <Private Use>
-+<UF5CC>     /x83/x39/xad/x31 <Private Use>
-+<UF5CD>     /x83/x39/xad/x32 <Private Use>
-+<UF5CE>     /x83/x39/xad/x33 <Private Use>
-+<UF5CF>     /x83/x39/xad/x34 <Private Use>
-+<UF5D0>     /x83/x39/xad/x35 <Private Use>
-+<UF5D1>     /x83/x39/xad/x36 <Private Use>
-+<UF5D2>     /x83/x39/xad/x37 <Private Use>
-+<UF5D3>     /x83/x39/xad/x38 <Private Use>
-+<UF5D4>     /x83/x39/xad/x39 <Private Use>
-+<UF5D5>     /x83/x39/xae/x30 <Private Use>
-+<UF5D6>     /x83/x39/xae/x31 <Private Use>
-+<UF5D7>     /x83/x39/xae/x32 <Private Use>
-+<UF5D8>     /x83/x39/xae/x33 <Private Use>
-+<UF5D9>     /x83/x39/xae/x34 <Private Use>
-+<UF5DA>     /x83/x39/xae/x35 <Private Use>
-+<UF5DB>     /x83/x39/xae/x36 <Private Use>
-+<UF5DC>     /x83/x39/xae/x37 <Private Use>
-+<UF5DD>     /x83/x39/xae/x38 <Private Use>
-+<UF5DE>     /x83/x39/xae/x39 <Private Use>
-+<UF5DF>     /x83/x39/xaf/x30 <Private Use>
-+<UF5E0>     /x83/x39/xaf/x31 <Private Use>
-+<UF5E1>     /x83/x39/xaf/x32 <Private Use>
-+<UF5E2>     /x83/x39/xaf/x33 <Private Use>
-+<UF5E3>     /x83/x39/xaf/x34 <Private Use>
-+<UF5E4>     /x83/x39/xaf/x35 <Private Use>
-+<UF5E5>     /x83/x39/xaf/x36 <Private Use>
-+<UF5E6>     /x83/x39/xaf/x37 <Private Use>
-+<UF5E7>     /x83/x39/xaf/x38 <Private Use>
-+<UF5E8>     /x83/x39/xaf/x39 <Private Use>
-+<UF5E9>     /x83/x39/xb0/x30 <Private Use>
-+<UF5EA>     /x83/x39/xb0/x31 <Private Use>
-+<UF5EB>     /x83/x39/xb0/x32 <Private Use>
-+<UF5EC>     /x83/x39/xb0/x33 <Private Use>
-+<UF5ED>     /x83/x39/xb0/x34 <Private Use>
-+<UF5EE>     /x83/x39/xb0/x35 <Private Use>
-+<UF5EF>     /x83/x39/xb0/x36 <Private Use>
-+<UF5F0>     /x83/x39/xb0/x37 <Private Use>
-+<UF5F1>     /x83/x39/xb0/x38 <Private Use>
-+<UF5F2>     /x83/x39/xb0/x39 <Private Use>
-+<UF5F3>     /x83/x39/xb1/x30 <Private Use>
-+<UF5F4>     /x83/x39/xb1/x31 <Private Use>
-+<UF5F5>     /x83/x39/xb1/x32 <Private Use>
-+<UF5F6>     /x83/x39/xb1/x33 <Private Use>
-+<UF5F7>     /x83/x39/xb1/x34 <Private Use>
-+<UF5F8>     /x83/x39/xb1/x35 <Private Use>
-+<UF5F9>     /x83/x39/xb1/x36 <Private Use>
-+<UF5FA>     /x83/x39/xb1/x37 <Private Use>
-+<UF5FB>     /x83/x39/xb1/x38 <Private Use>
-+<UF5FC>     /x83/x39/xb1/x39 <Private Use>
-+<UF5FD>     /x83/x39/xb2/x30 <Private Use>
-+<UF5FE>     /x83/x39/xb2/x31 <Private Use>
-+<UF5FF>     /x83/x39/xb2/x32 <Private Use>
-+<UF600>     /x83/x39/xb2/x33 <Private Use>
-+<UF601>     /x83/x39/xb2/x34 <Private Use>
-+<UF602>     /x83/x39/xb2/x35 <Private Use>
-+<UF603>     /x83/x39/xb2/x36 <Private Use>
-+<UF604>     /x83/x39/xb2/x37 <Private Use>
-+<UF605>     /x83/x39/xb2/x38 <Private Use>
-+<UF606>     /x83/x39/xb2/x39 <Private Use>
-+<UF607>     /x83/x39/xb3/x30 <Private Use>
-+<UF608>     /x83/x39/xb3/x31 <Private Use>
-+<UF609>     /x83/x39/xb3/x32 <Private Use>
-+<UF60A>     /x83/x39/xb3/x33 <Private Use>
-+<UF60B>     /x83/x39/xb3/x34 <Private Use>
-+<UF60C>     /x83/x39/xb3/x35 <Private Use>
-+<UF60D>     /x83/x39/xb3/x36 <Private Use>
-+<UF60E>     /x83/x39/xb3/x37 <Private Use>
-+<UF60F>     /x83/x39/xb3/x38 <Private Use>
-+<UF610>     /x83/x39/xb3/x39 <Private Use>
-+<UF611>     /x83/x39/xb4/x30 <Private Use>
-+<UF612>     /x83/x39/xb4/x31 <Private Use>
-+<UF613>     /x83/x39/xb4/x32 <Private Use>
-+<UF614>     /x83/x39/xb4/x33 <Private Use>
-+<UF615>     /x83/x39/xb4/x34 <Private Use>
-+<UF616>     /x83/x39/xb4/x35 <Private Use>
-+<UF617>     /x83/x39/xb4/x36 <Private Use>
-+<UF618>     /x83/x39/xb4/x37 <Private Use>
-+<UF619>     /x83/x39/xb4/x38 <Private Use>
-+<UF61A>     /x83/x39/xb4/x39 <Private Use>
-+<UF61B>     /x83/x39/xb5/x30 <Private Use>
-+<UF61C>     /x83/x39/xb5/x31 <Private Use>
-+<UF61D>     /x83/x39/xb5/x32 <Private Use>
-+<UF61E>     /x83/x39/xb5/x33 <Private Use>
-+<UF61F>     /x83/x39/xb5/x34 <Private Use>
-+<UF620>     /x83/x39/xb5/x35 <Private Use>
-+<UF621>     /x83/x39/xb5/x36 <Private Use>
-+<UF622>     /x83/x39/xb5/x37 <Private Use>
-+<UF623>     /x83/x39/xb5/x38 <Private Use>
-+<UF624>     /x83/x39/xb5/x39 <Private Use>
-+<UF625>     /x83/x39/xb6/x30 <Private Use>
-+<UF626>     /x83/x39/xb6/x31 <Private Use>
-+<UF627>     /x83/x39/xb6/x32 <Private Use>
-+<UF628>     /x83/x39/xb6/x33 <Private Use>
-+<UF629>     /x83/x39/xb6/x34 <Private Use>
-+<UF62A>     /x83/x39/xb6/x35 <Private Use>
-+<UF62B>     /x83/x39/xb6/x36 <Private Use>
-+<UF62C>     /x83/x39/xb6/x37 <Private Use>
-+<UF62D>     /x83/x39/xb6/x38 <Private Use>
-+<UF62E>     /x83/x39/xb6/x39 <Private Use>
-+<UF62F>     /x83/x39/xb7/x30 <Private Use>
-+<UF630>     /x83/x39/xb7/x31 <Private Use>
-+<UF631>     /x83/x39/xb7/x32 <Private Use>
-+<UF632>     /x83/x39/xb7/x33 <Private Use>
-+<UF633>     /x83/x39/xb7/x34 <Private Use>
-+<UF634>     /x83/x39/xb7/x35 <Private Use>
-+<UF635>     /x83/x39/xb7/x36 <Private Use>
-+<UF636>     /x83/x39/xb7/x37 <Private Use>
-+<UF637>     /x83/x39/xb7/x38 <Private Use>
-+<UF638>     /x83/x39/xb7/x39 <Private Use>
-+<UF639>     /x83/x39/xb8/x30 <Private Use>
-+<UF63A>     /x83/x39/xb8/x31 <Private Use>
-+<UF63B>     /x83/x39/xb8/x32 <Private Use>
-+<UF63C>     /x83/x39/xb8/x33 <Private Use>
-+<UF63D>     /x83/x39/xb8/x34 <Private Use>
-+<UF63E>     /x83/x39/xb8/x35 <Private Use>
-+<UF63F>     /x83/x39/xb8/x36 <Private Use>
-+<UF640>     /x83/x39/xb8/x37 <Private Use>
-+<UF641>     /x83/x39/xb8/x38 <Private Use>
-+<UF642>     /x83/x39/xb8/x39 <Private Use>
-+<UF643>     /x83/x39/xb9/x30 <Private Use>
-+<UF644>     /x83/x39/xb9/x31 <Private Use>
-+<UF645>     /x83/x39/xb9/x32 <Private Use>
-+<UF646>     /x83/x39/xb9/x33 <Private Use>
-+<UF647>     /x83/x39/xb9/x34 <Private Use>
-+<UF648>     /x83/x39/xb9/x35 <Private Use>
-+<UF649>     /x83/x39/xb9/x36 <Private Use>
-+<UF64A>     /x83/x39/xb9/x37 <Private Use>
-+<UF64B>     /x83/x39/xb9/x38 <Private Use>
-+<UF64C>     /x83/x39/xb9/x39 <Private Use>
-+<UF64D>     /x83/x39/xba/x30 <Private Use>
-+<UF64E>     /x83/x39/xba/x31 <Private Use>
-+<UF64F>     /x83/x39/xba/x32 <Private Use>
-+<UF650>     /x83/x39/xba/x33 <Private Use>
-+<UF651>     /x83/x39/xba/x34 <Private Use>
-+<UF652>     /x83/x39/xba/x35 <Private Use>
-+<UF653>     /x83/x39/xba/x36 <Private Use>
-+<UF654>     /x83/x39/xba/x37 <Private Use>
-+<UF655>     /x83/x39/xba/x38 <Private Use>
-+<UF656>     /x83/x39/xba/x39 <Private Use>
-+<UF657>     /x83/x39/xbb/x30 <Private Use>
-+<UF658>     /x83/x39/xbb/x31 <Private Use>
-+<UF659>     /x83/x39/xbb/x32 <Private Use>
-+<UF65A>     /x83/x39/xbb/x33 <Private Use>
-+<UF65B>     /x83/x39/xbb/x34 <Private Use>
-+<UF65C>     /x83/x39/xbb/x35 <Private Use>
-+<UF65D>     /x83/x39/xbb/x36 <Private Use>
-+<UF65E>     /x83/x39/xbb/x37 <Private Use>
-+<UF65F>     /x83/x39/xbb/x38 <Private Use>
-+<UF660>     /x83/x39/xbb/x39 <Private Use>
-+<UF661>     /x83/x39/xbc/x30 <Private Use>
-+<UF662>     /x83/x39/xbc/x31 <Private Use>
-+<UF663>     /x83/x39/xbc/x32 <Private Use>
-+<UF664>     /x83/x39/xbc/x33 <Private Use>
-+<UF665>     /x83/x39/xbc/x34 <Private Use>
-+<UF666>     /x83/x39/xbc/x35 <Private Use>
-+<UF667>     /x83/x39/xbc/x36 <Private Use>
-+<UF668>     /x83/x39/xbc/x37 <Private Use>
-+<UF669>     /x83/x39/xbc/x38 <Private Use>
-+<UF66A>     /x83/x39/xbc/x39 <Private Use>
-+<UF66B>     /x83/x39/xbd/x30 <Private Use>
-+<UF66C>     /x83/x39/xbd/x31 <Private Use>
-+<UF66D>     /x83/x39/xbd/x32 <Private Use>
-+<UF66E>     /x83/x39/xbd/x33 <Private Use>
-+<UF66F>     /x83/x39/xbd/x34 <Private Use>
-+<UF670>     /x83/x39/xbd/x35 <Private Use>
-+<UF671>     /x83/x39/xbd/x36 <Private Use>
-+<UF672>     /x83/x39/xbd/x37 <Private Use>
-+<UF673>     /x83/x39/xbd/x38 <Private Use>
-+<UF674>     /x83/x39/xbd/x39 <Private Use>
-+<UF675>     /x83/x39/xbe/x30 <Private Use>
-+<UF676>     /x83/x39/xbe/x31 <Private Use>
-+<UF677>     /x83/x39/xbe/x32 <Private Use>
-+<UF678>     /x83/x39/xbe/x33 <Private Use>
-+<UF679>     /x83/x39/xbe/x34 <Private Use>
-+<UF67A>     /x83/x39/xbe/x35 <Private Use>
-+<UF67B>     /x83/x39/xbe/x36 <Private Use>
-+<UF67C>     /x83/x39/xbe/x37 <Private Use>
-+<UF67D>     /x83/x39/xbe/x38 <Private Use>
-+<UF67E>     /x83/x39/xbe/x39 <Private Use>
-+<UF67F>     /x83/x39/xbf/x30 <Private Use>
-+<UF680>     /x83/x39/xbf/x31 <Private Use>
-+<UF681>     /x83/x39/xbf/x32 <Private Use>
-+<UF682>     /x83/x39/xbf/x33 <Private Use>
-+<UF683>     /x83/x39/xbf/x34 <Private Use>
-+<UF684>     /x83/x39/xbf/x35 <Private Use>
-+<UF685>     /x83/x39/xbf/x36 <Private Use>
-+<UF686>     /x83/x39/xbf/x37 <Private Use>
-+<UF687>     /x83/x39/xbf/x38 <Private Use>
-+<UF688>     /x83/x39/xbf/x39 <Private Use>
-+<UF689>     /x83/x39/xc0/x30 <Private Use>
-+<UF68A>     /x83/x39/xc0/x31 <Private Use>
-+<UF68B>     /x83/x39/xc0/x32 <Private Use>
-+<UF68C>     /x83/x39/xc0/x33 <Private Use>
-+<UF68D>     /x83/x39/xc0/x34 <Private Use>
-+<UF68E>     /x83/x39/xc0/x35 <Private Use>
-+<UF68F>     /x83/x39/xc0/x36 <Private Use>
-+<UF690>     /x83/x39/xc0/x37 <Private Use>
-+<UF691>     /x83/x39/xc0/x38 <Private Use>
-+<UF692>     /x83/x39/xc0/x39 <Private Use>
-+<UF693>     /x83/x39/xc1/x30 <Private Use>
-+<UF694>     /x83/x39/xc1/x31 <Private Use>
-+<UF695>     /x83/x39/xc1/x32 <Private Use>
-+<UF696>     /x83/x39/xc1/x33 <Private Use>
-+<UF697>     /x83/x39/xc1/x34 <Private Use>
-+<UF698>     /x83/x39/xc1/x35 <Private Use>
-+<UF699>     /x83/x39/xc1/x36 <Private Use>
-+<UF69A>     /x83/x39/xc1/x37 <Private Use>
-+<UF69B>     /x83/x39/xc1/x38 <Private Use>
-+<UF69C>     /x83/x39/xc1/x39 <Private Use>
-+<UF69D>     /x83/x39/xc2/x30 <Private Use>
-+<UF69E>     /x83/x39/xc2/x31 <Private Use>
-+<UF69F>     /x83/x39/xc2/x32 <Private Use>
-+<UF6A0>     /x83/x39/xc2/x33 <Private Use>
-+<UF6A1>     /x83/x39/xc2/x34 <Private Use>
-+<UF6A2>     /x83/x39/xc2/x35 <Private Use>
-+<UF6A3>     /x83/x39/xc2/x36 <Private Use>
-+<UF6A4>     /x83/x39/xc2/x37 <Private Use>
-+<UF6A5>     /x83/x39/xc2/x38 <Private Use>
-+<UF6A6>     /x83/x39/xc2/x39 <Private Use>
-+<UF6A7>     /x83/x39/xc3/x30 <Private Use>
-+<UF6A8>     /x83/x39/xc3/x31 <Private Use>
-+<UF6A9>     /x83/x39/xc3/x32 <Private Use>
-+<UF6AA>     /x83/x39/xc3/x33 <Private Use>
-+<UF6AB>     /x83/x39/xc3/x34 <Private Use>
-+<UF6AC>     /x83/x39/xc3/x35 <Private Use>
-+<UF6AD>     /x83/x39/xc3/x36 <Private Use>
-+<UF6AE>     /x83/x39/xc3/x37 <Private Use>
-+<UF6AF>     /x83/x39/xc3/x38 <Private Use>
-+<UF6B0>     /x83/x39/xc3/x39 <Private Use>
-+<UF6B1>     /x83/x39/xc4/x30 <Private Use>
-+<UF6B2>     /x83/x39/xc4/x31 <Private Use>
-+<UF6B3>     /x83/x39/xc4/x32 <Private Use>
-+<UF6B4>     /x83/x39/xc4/x33 <Private Use>
-+<UF6B5>     /x83/x39/xc4/x34 <Private Use>
-+<UF6B6>     /x83/x39/xc4/x35 <Private Use>
-+<UF6B7>     /x83/x39/xc4/x36 <Private Use>
-+<UF6B8>     /x83/x39/xc4/x37 <Private Use>
-+<UF6B9>     /x83/x39/xc4/x38 <Private Use>
-+<UF6BA>     /x83/x39/xc4/x39 <Private Use>
-+<UF6BB>     /x83/x39/xc5/x30 <Private Use>
-+<UF6BC>     /x83/x39/xc5/x31 <Private Use>
-+<UF6BD>     /x83/x39/xc5/x32 <Private Use>
-+<UF6BE>     /x83/x39/xc5/x33 <Private Use>
-+<UF6BF>     /x83/x39/xc5/x34 <Private Use>
-+<UF6C0>     /x83/x39/xc5/x35 <Private Use>
-+<UF6C1>     /x83/x39/xc5/x36 <Private Use>
-+<UF6C2>     /x83/x39/xc5/x37 <Private Use>
-+<UF6C3>     /x83/x39/xc5/x38 <Private Use>
-+<UF6C4>     /x83/x39/xc5/x39 <Private Use>
-+<UF6C5>     /x83/x39/xc6/x30 <Private Use>
-+<UF6C6>     /x83/x39/xc6/x31 <Private Use>
-+<UF6C7>     /x83/x39/xc6/x32 <Private Use>
-+<UF6C8>     /x83/x39/xc6/x33 <Private Use>
-+<UF6C9>     /x83/x39/xc6/x34 <Private Use>
-+<UF6CA>     /x83/x39/xc6/x35 <Private Use>
-+<UF6CB>     /x83/x39/xc6/x36 <Private Use>
-+<UF6CC>     /x83/x39/xc6/x37 <Private Use>
-+<UF6CD>     /x83/x39/xc6/x38 <Private Use>
-+<UF6CE>     /x83/x39/xc6/x39 <Private Use>
-+<UF6CF>     /x83/x39/xc7/x30 <Private Use>
-+<UF6D0>     /x83/x39/xc7/x31 <Private Use>
-+<UF6D1>     /x83/x39/xc7/x32 <Private Use>
-+<UF6D2>     /x83/x39/xc7/x33 <Private Use>
-+<UF6D3>     /x83/x39/xc7/x34 <Private Use>
-+<UF6D4>     /x83/x39/xc7/x35 <Private Use>
-+<UF6D5>     /x83/x39/xc7/x36 <Private Use>
-+<UF6D6>     /x83/x39/xc7/x37 <Private Use>
-+<UF6D7>     /x83/x39/xc7/x38 <Private Use>
-+<UF6D8>     /x83/x39/xc7/x39 <Private Use>
-+<UF6D9>     /x83/x39/xc8/x30 <Private Use>
-+<UF6DA>     /x83/x39/xc8/x31 <Private Use>
-+<UF6DB>     /x83/x39/xc8/x32 <Private Use>
-+<UF6DC>     /x83/x39/xc8/x33 <Private Use>
-+<UF6DD>     /x83/x39/xc8/x34 <Private Use>
-+<UF6DE>     /x83/x39/xc8/x35 <Private Use>
-+<UF6DF>     /x83/x39/xc8/x36 <Private Use>
-+<UF6E0>     /x83/x39/xc8/x37 <Private Use>
-+<UF6E1>     /x83/x39/xc8/x38 <Private Use>
-+<UF6E2>     /x83/x39/xc8/x39 <Private Use>
-+<UF6E3>     /x83/x39/xc9/x30 <Private Use>
-+<UF6E4>     /x83/x39/xc9/x31 <Private Use>
-+<UF6E5>     /x83/x39/xc9/x32 <Private Use>
-+<UF6E6>     /x83/x39/xc9/x33 <Private Use>
-+<UF6E7>     /x83/x39/xc9/x34 <Private Use>
-+<UF6E8>     /x83/x39/xc9/x35 <Private Use>
-+<UF6E9>     /x83/x39/xc9/x36 <Private Use>
-+<UF6EA>     /x83/x39/xc9/x37 <Private Use>
-+<UF6EB>     /x83/x39/xc9/x38 <Private Use>
-+<UF6EC>     /x83/x39/xc9/x39 <Private Use>
-+<UF6ED>     /x83/x39/xca/x30 <Private Use>
-+<UF6EE>     /x83/x39/xca/x31 <Private Use>
-+<UF6EF>     /x83/x39/xca/x32 <Private Use>
-+<UF6F0>     /x83/x39/xca/x33 <Private Use>
-+<UF6F1>     /x83/x39/xca/x34 <Private Use>
-+<UF6F2>     /x83/x39/xca/x35 <Private Use>
-+<UF6F3>     /x83/x39/xca/x36 <Private Use>
-+<UF6F4>     /x83/x39/xca/x37 <Private Use>
-+<UF6F5>     /x83/x39/xca/x38 <Private Use>
-+<UF6F6>     /x83/x39/xca/x39 <Private Use>
-+<UF6F7>     /x83/x39/xcb/x30 <Private Use>
-+<UF6F8>     /x83/x39/xcb/x31 <Private Use>
-+<UF6F9>     /x83/x39/xcb/x32 <Private Use>
-+<UF6FA>     /x83/x39/xcb/x33 <Private Use>
-+<UF6FB>     /x83/x39/xcb/x34 <Private Use>
-+<UF6FC>     /x83/x39/xcb/x35 <Private Use>
-+<UF6FD>     /x83/x39/xcb/x36 <Private Use>
-+<UF6FE>     /x83/x39/xcb/x37 <Private Use>
-+<UF6FF>     /x83/x39/xcb/x38 <Private Use>
-+<UF700>     /x83/x39/xcb/x39 <Private Use>
-+<UF701>     /x83/x39/xcc/x30 <Private Use>
-+<UF702>     /x83/x39/xcc/x31 <Private Use>
-+<UF703>     /x83/x39/xcc/x32 <Private Use>
-+<UF704>     /x83/x39/xcc/x33 <Private Use>
-+<UF705>     /x83/x39/xcc/x34 <Private Use>
-+<UF706>     /x83/x39/xcc/x35 <Private Use>
-+<UF707>     /x83/x39/xcc/x36 <Private Use>
-+<UF708>     /x83/x39/xcc/x37 <Private Use>
-+<UF709>     /x83/x39/xcc/x38 <Private Use>
-+<UF70A>     /x83/x39/xcc/x39 <Private Use>
-+<UF70B>     /x83/x39/xcd/x30 <Private Use>
-+<UF70C>     /x83/x39/xcd/x31 <Private Use>
-+<UF70D>     /x83/x39/xcd/x32 <Private Use>
-+<UF70E>     /x83/x39/xcd/x33 <Private Use>
-+<UF70F>     /x83/x39/xcd/x34 <Private Use>
-+<UF710>     /x83/x39/xcd/x35 <Private Use>
-+<UF711>     /x83/x39/xcd/x36 <Private Use>
-+<UF712>     /x83/x39/xcd/x37 <Private Use>
-+<UF713>     /x83/x39/xcd/x38 <Private Use>
-+<UF714>     /x83/x39/xcd/x39 <Private Use>
-+<UF715>     /x83/x39/xce/x30 <Private Use>
-+<UF716>     /x83/x39/xce/x31 <Private Use>
-+<UF717>     /x83/x39/xce/x32 <Private Use>
-+<UF718>     /x83/x39/xce/x33 <Private Use>
-+<UF719>     /x83/x39/xce/x34 <Private Use>
-+<UF71A>     /x83/x39/xce/x35 <Private Use>
-+<UF71B>     /x83/x39/xce/x36 <Private Use>
-+<UF71C>     /x83/x39/xce/x37 <Private Use>
-+<UF71D>     /x83/x39/xce/x38 <Private Use>
-+<UF71E>     /x83/x39/xce/x39 <Private Use>
-+<UF71F>     /x83/x39/xcf/x30 <Private Use>
-+<UF720>     /x83/x39/xcf/x31 <Private Use>
-+<UF721>     /x83/x39/xcf/x32 <Private Use>
-+<UF722>     /x83/x39/xcf/x33 <Private Use>
-+<UF723>     /x83/x39/xcf/x34 <Private Use>
-+<UF724>     /x83/x39/xcf/x35 <Private Use>
-+<UF725>     /x83/x39/xcf/x36 <Private Use>
-+<UF726>     /x83/x39/xcf/x37 <Private Use>
-+<UF727>     /x83/x39/xcf/x38 <Private Use>
-+<UF728>     /x83/x39/xcf/x39 <Private Use>
-+<UF729>     /x83/x39/xd0/x30 <Private Use>
-+<UF72A>     /x83/x39/xd0/x31 <Private Use>
-+<UF72B>     /x83/x39/xd0/x32 <Private Use>
-+<UF72C>     /x83/x39/xd0/x33 <Private Use>
-+<UF72D>     /x83/x39/xd0/x34 <Private Use>
-+<UF72E>     /x83/x39/xd0/x35 <Private Use>
-+<UF72F>     /x83/x39/xd0/x36 <Private Use>
-+<UF730>     /x83/x39/xd0/x37 <Private Use>
-+<UF731>     /x83/x39/xd0/x38 <Private Use>
-+<UF732>     /x83/x39/xd0/x39 <Private Use>
-+<UF733>     /x83/x39/xd1/x30 <Private Use>
-+<UF734>     /x83/x39/xd1/x31 <Private Use>
-+<UF735>     /x83/x39/xd1/x32 <Private Use>
-+<UF736>     /x83/x39/xd1/x33 <Private Use>
-+<UF737>     /x83/x39/xd1/x34 <Private Use>
-+<UF738>     /x83/x39/xd1/x35 <Private Use>
-+<UF739>     /x83/x39/xd1/x36 <Private Use>
-+<UF73A>     /x83/x39/xd1/x37 <Private Use>
-+<UF73B>     /x83/x39/xd1/x38 <Private Use>
-+<UF73C>     /x83/x39/xd1/x39 <Private Use>
-+<UF73D>     /x83/x39/xd2/x30 <Private Use>
-+<UF73E>     /x83/x39/xd2/x31 <Private Use>
-+<UF73F>     /x83/x39/xd2/x32 <Private Use>
-+<UF740>     /x83/x39/xd2/x33 <Private Use>
-+<UF741>     /x83/x39/xd2/x34 <Private Use>
-+<UF742>     /x83/x39/xd2/x35 <Private Use>
-+<UF743>     /x83/x39/xd2/x36 <Private Use>
-+<UF744>     /x83/x39/xd2/x37 <Private Use>
-+<UF745>     /x83/x39/xd2/x38 <Private Use>
-+<UF746>     /x83/x39/xd2/x39 <Private Use>
-+<UF747>     /x83/x39/xd3/x30 <Private Use>
-+<UF748>     /x83/x39/xd3/x31 <Private Use>
-+<UF749>     /x83/x39/xd3/x32 <Private Use>
-+<UF74A>     /x83/x39/xd3/x33 <Private Use>
-+<UF74B>     /x83/x39/xd3/x34 <Private Use>
-+<UF74C>     /x83/x39/xd3/x35 <Private Use>
-+<UF74D>     /x83/x39/xd3/x36 <Private Use>
-+<UF74E>     /x83/x39/xd3/x37 <Private Use>
-+<UF74F>     /x83/x39/xd3/x38 <Private Use>
-+<UF750>     /x83/x39/xd3/x39 <Private Use>
-+<UF751>     /x83/x39/xd4/x30 <Private Use>
-+<UF752>     /x83/x39/xd4/x31 <Private Use>
-+<UF753>     /x83/x39/xd4/x32 <Private Use>
-+<UF754>     /x83/x39/xd4/x33 <Private Use>
-+<UF755>     /x83/x39/xd4/x34 <Private Use>
-+<UF756>     /x83/x39/xd4/x35 <Private Use>
-+<UF757>     /x83/x39/xd4/x36 <Private Use>
-+<UF758>     /x83/x39/xd4/x37 <Private Use>
-+<UF759>     /x83/x39/xd4/x38 <Private Use>
-+<UF75A>     /x83/x39/xd4/x39 <Private Use>
-+<UF75B>     /x83/x39/xd5/x30 <Private Use>
-+<UF75C>     /x83/x39/xd5/x31 <Private Use>
-+<UF75D>     /x83/x39/xd5/x32 <Private Use>
-+<UF75E>     /x83/x39/xd5/x33 <Private Use>
-+<UF75F>     /x83/x39/xd5/x34 <Private Use>
-+<UF760>     /x83/x39/xd5/x35 <Private Use>
-+<UF761>     /x83/x39/xd5/x36 <Private Use>
-+<UF762>     /x83/x39/xd5/x37 <Private Use>
-+<UF763>     /x83/x39/xd5/x38 <Private Use>
-+<UF764>     /x83/x39/xd5/x39 <Private Use>
-+<UF765>     /x83/x39/xd6/x30 <Private Use>
-+<UF766>     /x83/x39/xd6/x31 <Private Use>
-+<UF767>     /x83/x39/xd6/x32 <Private Use>
-+<UF768>     /x83/x39/xd6/x33 <Private Use>
-+<UF769>     /x83/x39/xd6/x34 <Private Use>
-+<UF76A>     /x83/x39/xd6/x35 <Private Use>
-+<UF76B>     /x83/x39/xd6/x36 <Private Use>
-+<UF76C>     /x83/x39/xd6/x37 <Private Use>
-+<UF76D>     /x83/x39/xd6/x38 <Private Use>
-+<UF76E>     /x83/x39/xd6/x39 <Private Use>
-+<UF76F>     /x83/x39/xd7/x30 <Private Use>
-+<UF770>     /x83/x39/xd7/x31 <Private Use>
-+<UF771>     /x83/x39/xd7/x32 <Private Use>
-+<UF772>     /x83/x39/xd7/x33 <Private Use>
-+<UF773>     /x83/x39/xd7/x34 <Private Use>
-+<UF774>     /x83/x39/xd7/x35 <Private Use>
-+<UF775>     /x83/x39/xd7/x36 <Private Use>
-+<UF776>     /x83/x39/xd7/x37 <Private Use>
-+<UF777>     /x83/x39/xd7/x38 <Private Use>
-+<UF778>     /x83/x39/xd7/x39 <Private Use>
-+<UF779>     /x83/x39/xd8/x30 <Private Use>
-+<UF77A>     /x83/x39/xd8/x31 <Private Use>
-+<UF77B>     /x83/x39/xd8/x32 <Private Use>
-+<UF77C>     /x83/x39/xd8/x33 <Private Use>
-+<UF77D>     /x83/x39/xd8/x34 <Private Use>
-+<UF77E>     /x83/x39/xd8/x35 <Private Use>
-+<UF77F>     /x83/x39/xd8/x36 <Private Use>
-+<UF780>     /x83/x39/xd8/x37 <Private Use>
-+<UF781>     /x83/x39/xd8/x38 <Private Use>
-+<UF782>     /x83/x39/xd8/x39 <Private Use>
-+<UF783>     /x83/x39/xd9/x30 <Private Use>
-+<UF784>     /x83/x39/xd9/x31 <Private Use>
-+<UF785>     /x83/x39/xd9/x32 <Private Use>
-+<UF786>     /x83/x39/xd9/x33 <Private Use>
-+<UF787>     /x83/x39/xd9/x34 <Private Use>
-+<UF788>     /x83/x39/xd9/x35 <Private Use>
-+<UF789>     /x83/x39/xd9/x36 <Private Use>
-+<UF78A>     /x83/x39/xd9/x37 <Private Use>
-+<UF78B>     /x83/x39/xd9/x38 <Private Use>
-+<UF78C>     /x83/x39/xd9/x39 <Private Use>
-+<UF78D>     /x83/x39/xda/x30 <Private Use>
-+<UF78E>     /x83/x39/xda/x31 <Private Use>
-+<UF78F>     /x83/x39/xda/x32 <Private Use>
-+<UF790>     /x83/x39/xda/x33 <Private Use>
-+<UF791>     /x83/x39/xda/x34 <Private Use>
-+<UF792>     /x83/x39/xda/x35 <Private Use>
-+<UF793>     /x83/x39/xda/x36 <Private Use>
-+<UF794>     /x83/x39/xda/x37 <Private Use>
-+<UF795>     /x83/x39/xda/x38 <Private Use>
-+<UF796>     /x83/x39/xda/x39 <Private Use>
-+<UF797>     /x83/x39/xdb/x30 <Private Use>
-+<UF798>     /x83/x39/xdb/x31 <Private Use>
-+<UF799>     /x83/x39/xdb/x32 <Private Use>
-+<UF79A>     /x83/x39/xdb/x33 <Private Use>
-+<UF79B>     /x83/x39/xdb/x34 <Private Use>
-+<UF79C>     /x83/x39/xdb/x35 <Private Use>
-+<UF79D>     /x83/x39/xdb/x36 <Private Use>
-+<UF79E>     /x83/x39/xdb/x37 <Private Use>
-+<UF79F>     /x83/x39/xdb/x38 <Private Use>
-+<UF7A0>     /x83/x39/xdb/x39 <Private Use>
-+<UF7A1>     /x83/x39/xdc/x30 <Private Use>
-+<UF7A2>     /x83/x39/xdc/x31 <Private Use>
-+<UF7A3>     /x83/x39/xdc/x32 <Private Use>
-+<UF7A4>     /x83/x39/xdc/x33 <Private Use>
-+<UF7A5>     /x83/x39/xdc/x34 <Private Use>
-+<UF7A6>     /x83/x39/xdc/x35 <Private Use>
-+<UF7A7>     /x83/x39/xdc/x36 <Private Use>
-+<UF7A8>     /x83/x39/xdc/x37 <Private Use>
-+<UF7A9>     /x83/x39/xdc/x38 <Private Use>
-+<UF7AA>     /x83/x39/xdc/x39 <Private Use>
-+<UF7AB>     /x83/x39/xdd/x30 <Private Use>
-+<UF7AC>     /x83/x39/xdd/x31 <Private Use>
-+<UF7AD>     /x83/x39/xdd/x32 <Private Use>
-+<UF7AE>     /x83/x39/xdd/x33 <Private Use>
-+<UF7AF>     /x83/x39/xdd/x34 <Private Use>
-+<UF7B0>     /x83/x39/xdd/x35 <Private Use>
-+<UF7B1>     /x83/x39/xdd/x36 <Private Use>
-+<UF7B2>     /x83/x39/xdd/x37 <Private Use>
-+<UF7B3>     /x83/x39/xdd/x38 <Private Use>
-+<UF7B4>     /x83/x39/xdd/x39 <Private Use>
-+<UF7B5>     /x83/x39/xde/x30 <Private Use>
-+<UF7B6>     /x83/x39/xde/x31 <Private Use>
-+<UF7B7>     /x83/x39/xde/x32 <Private Use>
-+<UF7B8>     /x83/x39/xde/x33 <Private Use>
-+<UF7B9>     /x83/x39/xde/x34 <Private Use>
-+<UF7BA>     /x83/x39/xde/x35 <Private Use>
-+<UF7BB>     /x83/x39/xde/x36 <Private Use>
-+<UF7BC>     /x83/x39/xde/x37 <Private Use>
-+<UF7BD>     /x83/x39/xde/x38 <Private Use>
-+<UF7BE>     /x83/x39/xde/x39 <Private Use>
-+<UF7BF>     /x83/x39/xdf/x30 <Private Use>
-+<UF7C0>     /x83/x39/xdf/x31 <Private Use>
-+<UF7C1>     /x83/x39/xdf/x32 <Private Use>
-+<UF7C2>     /x83/x39/xdf/x33 <Private Use>
-+<UF7C3>     /x83/x39/xdf/x34 <Private Use>
-+<UF7C4>     /x83/x39/xdf/x35 <Private Use>
-+<UF7C5>     /x83/x39/xdf/x36 <Private Use>
-+<UF7C6>     /x83/x39/xdf/x37 <Private Use>
-+<UF7C7>     /x83/x39/xdf/x38 <Private Use>
-+<UF7C8>     /x83/x39/xdf/x39 <Private Use>
-+<UF7C9>     /x83/x39/xe0/x30 <Private Use>
-+<UF7CA>     /x83/x39/xe0/x31 <Private Use>
-+<UF7CB>     /x83/x39/xe0/x32 <Private Use>
-+<UF7CC>     /x83/x39/xe0/x33 <Private Use>
-+<UF7CD>     /x83/x39/xe0/x34 <Private Use>
-+<UF7CE>     /x83/x39/xe0/x35 <Private Use>
-+<UF7CF>     /x83/x39/xe0/x36 <Private Use>
-+<UF7D0>     /x83/x39/xe0/x37 <Private Use>
-+<UF7D1>     /x83/x39/xe0/x38 <Private Use>
-+<UF7D2>     /x83/x39/xe0/x39 <Private Use>
-+<UF7D3>     /x83/x39/xe1/x30 <Private Use>
-+<UF7D4>     /x83/x39/xe1/x31 <Private Use>
-+<UF7D5>     /x83/x39/xe1/x32 <Private Use>
-+<UF7D6>     /x83/x39/xe1/x33 <Private Use>
-+<UF7D7>     /x83/x39/xe1/x34 <Private Use>
-+<UF7D8>     /x83/x39/xe1/x35 <Private Use>
-+<UF7D9>     /x83/x39/xe1/x36 <Private Use>
-+<UF7DA>     /x83/x39/xe1/x37 <Private Use>
-+<UF7DB>     /x83/x39/xe1/x38 <Private Use>
-+<UF7DC>     /x83/x39/xe1/x39 <Private Use>
-+<UF7DD>     /x83/x39/xe2/x30 <Private Use>
-+<UF7DE>     /x83/x39/xe2/x31 <Private Use>
-+<UF7DF>     /x83/x39/xe2/x32 <Private Use>
-+<UF7E0>     /x83/x39/xe2/x33 <Private Use>
-+<UF7E1>     /x83/x39/xe2/x34 <Private Use>
-+<UF7E2>     /x83/x39/xe2/x35 <Private Use>
-+<UF7E3>     /x83/x39/xe2/x36 <Private Use>
-+<UF7E4>     /x83/x39/xe2/x37 <Private Use>
-+<UF7E5>     /x83/x39/xe2/x38 <Private Use>
-+<UF7E6>     /x83/x39/xe2/x39 <Private Use>
-+<UF7E7>     /x83/x39/xe3/x30 <Private Use>
-+<UF7E8>     /x83/x39/xe3/x31 <Private Use>
-+<UF7E9>     /x83/x39/xe3/x32 <Private Use>
-+<UF7EA>     /x83/x39/xe3/x33 <Private Use>
-+<UF7EB>     /x83/x39/xe3/x34 <Private Use>
-+<UF7EC>     /x83/x39/xe3/x35 <Private Use>
-+<UF7ED>     /x83/x39/xe3/x36 <Private Use>
-+<UF7EE>     /x83/x39/xe3/x37 <Private Use>
-+<UF7EF>     /x83/x39/xe3/x38 <Private Use>
-+<UF7F0>     /x83/x39/xe3/x39 <Private Use>
-+<UF7F1>     /x83/x39/xe4/x30 <Private Use>
-+<UF7F2>     /x83/x39/xe4/x31 <Private Use>
-+<UF7F3>     /x83/x39/xe4/x32 <Private Use>
-+<UF7F4>     /x83/x39/xe4/x33 <Private Use>
-+<UF7F5>     /x83/x39/xe4/x34 <Private Use>
-+<UF7F6>     /x83/x39/xe4/x35 <Private Use>
-+<UF7F7>     /x83/x39/xe4/x36 <Private Use>
-+<UF7F8>     /x83/x39/xe4/x37 <Private Use>
-+<UF7F9>     /x83/x39/xe4/x38 <Private Use>
-+<UF7FA>     /x83/x39/xe4/x39 <Private Use>
-+<UF7FB>     /x83/x39/xe5/x30 <Private Use>
-+<UF7FC>     /x83/x39/xe5/x31 <Private Use>
-+<UF7FD>     /x83/x39/xe5/x32 <Private Use>
-+<UF7FE>     /x83/x39/xe5/x33 <Private Use>
-+<UF7FF>     /x83/x39/xe5/x34 <Private Use>
-+<UF800>     /x83/x39/xe5/x35 <Private Use>
-+<UF801>     /x83/x39/xe5/x36 <Private Use>
-+<UF802>     /x83/x39/xe5/x37 <Private Use>
-+<UF803>     /x83/x39/xe5/x38 <Private Use>
-+<UF804>     /x83/x39/xe5/x39 <Private Use>
-+<UF805>     /x83/x39/xe6/x30 <Private Use>
-+<UF806>     /x83/x39/xe6/x31 <Private Use>
-+<UF807>     /x83/x39/xe6/x32 <Private Use>
-+<UF808>     /x83/x39/xe6/x33 <Private Use>
-+<UF809>     /x83/x39/xe6/x34 <Private Use>
-+<UF80A>     /x83/x39/xe6/x35 <Private Use>
-+<UF80B>     /x83/x39/xe6/x36 <Private Use>
-+<UF80C>     /x83/x39/xe6/x37 <Private Use>
-+<UF80D>     /x83/x39/xe6/x38 <Private Use>
-+<UF80E>     /x83/x39/xe6/x39 <Private Use>
-+<UF80F>     /x83/x39/xe7/x30 <Private Use>
-+<UF810>     /x83/x39/xe7/x31 <Private Use>
-+<UF811>     /x83/x39/xe7/x32 <Private Use>
-+<UF812>     /x83/x39/xe7/x33 <Private Use>
-+<UF813>     /x83/x39/xe7/x34 <Private Use>
-+<UF814>     /x83/x39/xe7/x35 <Private Use>
-+<UF815>     /x83/x39/xe7/x36 <Private Use>
-+<UF816>     /x83/x39/xe7/x37 <Private Use>
-+<UF817>     /x83/x39/xe7/x38 <Private Use>
-+<UF818>     /x83/x39/xe7/x39 <Private Use>
-+<UF819>     /x83/x39/xe8/x30 <Private Use>
-+<UF81A>     /x83/x39/xe8/x31 <Private Use>
-+<UF81B>     /x83/x39/xe8/x32 <Private Use>
-+<UF81C>     /x83/x39/xe8/x33 <Private Use>
-+<UF81D>     /x83/x39/xe8/x34 <Private Use>
-+<UF81E>     /x83/x39/xe8/x35 <Private Use>
-+<UF81F>     /x83/x39/xe8/x36 <Private Use>
-+<UF820>     /x83/x39/xe8/x37 <Private Use>
-+<UF821>     /x83/x39/xe8/x38 <Private Use>
-+<UF822>     /x83/x39/xe8/x39 <Private Use>
-+<UF823>     /x83/x39/xe9/x30 <Private Use>
-+<UF824>     /x83/x39/xe9/x31 <Private Use>
-+<UF825>     /x83/x39/xe9/x32 <Private Use>
-+<UF826>     /x83/x39/xe9/x33 <Private Use>
-+<UF827>     /x83/x39/xe9/x34 <Private Use>
-+<UF828>     /x83/x39/xe9/x35 <Private Use>
-+<UF829>     /x83/x39/xe9/x36 <Private Use>
-+<UF82A>     /x83/x39/xe9/x37 <Private Use>
-+<UF82B>     /x83/x39/xe9/x38 <Private Use>
-+<UF82C>     /x83/x39/xe9/x39 <Private Use>
-+<UF82D>     /x83/x39/xea/x30 <Private Use>
-+<UF82E>     /x83/x39/xea/x31 <Private Use>
-+<UF82F>     /x83/x39/xea/x32 <Private Use>
-+<UF830>     /x83/x39/xea/x33 <Private Use>
-+<UF831>     /x83/x39/xea/x34 <Private Use>
-+<UF832>     /x83/x39/xea/x35 <Private Use>
-+<UF833>     /x83/x39/xea/x36 <Private Use>
-+<UF834>     /x83/x39/xea/x37 <Private Use>
-+<UF835>     /x83/x39/xea/x38 <Private Use>
-+<UF836>     /x83/x39/xea/x39 <Private Use>
-+<UF837>     /x83/x39/xeb/x30 <Private Use>
-+<UF838>     /x83/x39/xeb/x31 <Private Use>
-+<UF839>     /x83/x39/xeb/x32 <Private Use>
-+<UF83A>     /x83/x39/xeb/x33 <Private Use>
-+<UF83B>     /x83/x39/xeb/x34 <Private Use>
-+<UF83C>     /x83/x39/xeb/x35 <Private Use>
-+<UF83D>     /x83/x39/xeb/x36 <Private Use>
-+<UF83E>     /x83/x39/xeb/x37 <Private Use>
-+<UF83F>     /x83/x39/xeb/x38 <Private Use>
-+<UF840>     /x83/x39/xeb/x39 <Private Use>
-+<UF841>     /x83/x39/xec/x30 <Private Use>
-+<UF842>     /x83/x39/xec/x31 <Private Use>
-+<UF843>     /x83/x39/xec/x32 <Private Use>
-+<UF844>     /x83/x39/xec/x33 <Private Use>
-+<UF845>     /x83/x39/xec/x34 <Private Use>
-+<UF846>     /x83/x39/xec/x35 <Private Use>
-+<UF847>     /x83/x39/xec/x36 <Private Use>
-+<UF848>     /x83/x39/xec/x37 <Private Use>
-+<UF849>     /x83/x39/xec/x38 <Private Use>
-+<UF84A>     /x83/x39/xec/x39 <Private Use>
-+<UF84B>     /x83/x39/xed/x30 <Private Use>
-+<UF84C>     /x83/x39/xed/x31 <Private Use>
-+<UF84D>     /x83/x39/xed/x32 <Private Use>
-+<UF84E>     /x83/x39/xed/x33 <Private Use>
-+<UF84F>     /x83/x39/xed/x34 <Private Use>
-+<UF850>     /x83/x39/xed/x35 <Private Use>
-+<UF851>     /x83/x39/xed/x36 <Private Use>
-+<UF852>     /x83/x39/xed/x37 <Private Use>
-+<UF853>     /x83/x39/xed/x38 <Private Use>
-+<UF854>     /x83/x39/xed/x39 <Private Use>
-+<UF855>     /x83/x39/xee/x30 <Private Use>
-+<UF856>     /x83/x39/xee/x31 <Private Use>
-+<UF857>     /x83/x39/xee/x32 <Private Use>
-+<UF858>     /x83/x39/xee/x33 <Private Use>
-+<UF859>     /x83/x39/xee/x34 <Private Use>
-+<UF85A>     /x83/x39/xee/x35 <Private Use>
-+<UF85B>     /x83/x39/xee/x36 <Private Use>
-+<UF85C>     /x83/x39/xee/x37 <Private Use>
-+<UF85D>     /x83/x39/xee/x38 <Private Use>
-+<UF85E>     /x83/x39/xee/x39 <Private Use>
-+<UF85F>     /x83/x39/xef/x30 <Private Use>
-+<UF860>     /x83/x39/xef/x31 <Private Use>
-+<UF861>     /x83/x39/xef/x32 <Private Use>
-+<UF862>     /x83/x39/xef/x33 <Private Use>
-+<UF863>     /x83/x39/xef/x34 <Private Use>
-+<UF864>     /x83/x39/xef/x35 <Private Use>
-+<UF865>     /x83/x39/xef/x36 <Private Use>
-+<UF866>     /x83/x39/xef/x37 <Private Use>
-+<UF867>     /x83/x39/xef/x38 <Private Use>
-+<UF868>     /x83/x39/xef/x39 <Private Use>
-+<UF869>     /x83/x39/xf0/x30 <Private Use>
-+<UF86A>     /x83/x39/xf0/x31 <Private Use>
-+<UF86B>     /x83/x39/xf0/x32 <Private Use>
-+<UF86C>     /x83/x39/xf0/x33 <Private Use>
-+<UF86D>     /x83/x39/xf0/x34 <Private Use>
-+<UF86E>     /x83/x39/xf0/x35 <Private Use>
-+<UF86F>     /x83/x39/xf0/x36 <Private Use>
-+<UF870>     /x83/x39/xf0/x37 <Private Use>
-+<UF871>     /x83/x39/xf0/x38 <Private Use>
-+<UF872>     /x83/x39/xf0/x39 <Private Use>
-+<UF873>     /x83/x39/xf1/x30 <Private Use>
-+<UF874>     /x83/x39/xf1/x31 <Private Use>
-+<UF875>     /x83/x39/xf1/x32 <Private Use>
-+<UF876>     /x83/x39/xf1/x33 <Private Use>
-+<UF877>     /x83/x39/xf1/x34 <Private Use>
-+<UF878>     /x83/x39/xf1/x35 <Private Use>
-+<UF879>     /x83/x39/xf1/x36 <Private Use>
-+<UF87A>     /x83/x39/xf1/x37 <Private Use>
-+<UF87B>     /x83/x39/xf1/x38 <Private Use>
-+<UF87C>     /x83/x39/xf1/x39 <Private Use>
-+<UF87D>     /x83/x39/xf2/x30 <Private Use>
-+<UF87E>     /x83/x39/xf2/x31 <Private Use>
-+<UF87F>     /x83/x39/xf2/x32 <Private Use>
-+<UF880>     /x83/x39/xf2/x33 <Private Use>
-+<UF881>     /x83/x39/xf2/x34 <Private Use>
-+<UF882>     /x83/x39/xf2/x35 <Private Use>
-+<UF883>     /x83/x39/xf2/x36 <Private Use>
-+<UF884>     /x83/x39/xf2/x37 <Private Use>
-+<UF885>     /x83/x39/xf2/x38 <Private Use>
-+<UF886>     /x83/x39/xf2/x39 <Private Use>
-+<UF887>     /x83/x39/xf3/x30 <Private Use>
-+<UF888>     /x83/x39/xf3/x31 <Private Use>
-+<UF889>     /x83/x39/xf3/x32 <Private Use>
-+<UF88A>     /x83/x39/xf3/x33 <Private Use>
-+<UF88B>     /x83/x39/xf3/x34 <Private Use>
-+<UF88C>     /x83/x39/xf3/x35 <Private Use>
-+<UF88D>     /x83/x39/xf3/x36 <Private Use>
-+<UF88E>     /x83/x39/xf3/x37 <Private Use>
-+<UF88F>     /x83/x39/xf3/x38 <Private Use>
-+<UF890>     /x83/x39/xf3/x39 <Private Use>
-+<UF891>     /x83/x39/xf4/x30 <Private Use>
-+<UF892>     /x83/x39/xf4/x31 <Private Use>
-+<UF893>     /x83/x39/xf4/x32 <Private Use>
-+<UF894>     /x83/x39/xf4/x33 <Private Use>
-+<UF895>     /x83/x39/xf4/x34 <Private Use>
-+<UF896>     /x83/x39/xf4/x35 <Private Use>
-+<UF897>     /x83/x39/xf4/x36 <Private Use>
-+<UF898>     /x83/x39/xf4/x37 <Private Use>
-+<UF899>     /x83/x39/xf4/x38 <Private Use>
-+<UF89A>     /x83/x39/xf4/x39 <Private Use>
-+<UF89B>     /x83/x39/xf5/x30 <Private Use>
-+<UF89C>     /x83/x39/xf5/x31 <Private Use>
-+<UF89D>     /x83/x39/xf5/x32 <Private Use>
-+<UF89E>     /x83/x39/xf5/x33 <Private Use>
-+<UF89F>     /x83/x39/xf5/x34 <Private Use>
-+<UF8A0>     /x83/x39/xf5/x35 <Private Use>
-+<UF8A1>     /x83/x39/xf5/x36 <Private Use>
-+<UF8A2>     /x83/x39/xf5/x37 <Private Use>
-+<UF8A3>     /x83/x39/xf5/x38 <Private Use>
-+<UF8A4>     /x83/x39/xf5/x39 <Private Use>
-+<UF8A5>     /x83/x39/xf6/x30 <Private Use>
-+<UF8A6>     /x83/x39/xf6/x31 <Private Use>
-+<UF8A7>     /x83/x39/xf6/x32 <Private Use>
-+<UF8A8>     /x83/x39/xf6/x33 <Private Use>
-+<UF8A9>     /x83/x39/xf6/x34 <Private Use>
-+<UF8AA>     /x83/x39/xf6/x35 <Private Use>
-+<UF8AB>     /x83/x39/xf6/x36 <Private Use>
-+<UF8AC>     /x83/x39/xf6/x37 <Private Use>
-+<UF8AD>     /x83/x39/xf6/x38 <Private Use>
-+<UF8AE>     /x83/x39/xf6/x39 <Private Use>
-+<UF8AF>     /x83/x39/xf7/x30 <Private Use>
-+<UF8B0>     /x83/x39/xf7/x31 <Private Use>
-+<UF8B1>     /x83/x39/xf7/x32 <Private Use>
-+<UF8B2>     /x83/x39/xf7/x33 <Private Use>
-+<UF8B3>     /x83/x39/xf7/x34 <Private Use>
-+<UF8B4>     /x83/x39/xf7/x35 <Private Use>
-+<UF8B5>     /x83/x39/xf7/x36 <Private Use>
-+<UF8B6>     /x83/x39/xf7/x37 <Private Use>
-+<UF8B7>     /x83/x39/xf7/x38 <Private Use>
-+<UF8B8>     /x83/x39/xf7/x39 <Private Use>
-+<UF8B9>     /x83/x39/xf8/x30 <Private Use>
-+<UF8BA>     /x83/x39/xf8/x31 <Private Use>
-+<UF8BB>     /x83/x39/xf8/x32 <Private Use>
-+<UF8BC>     /x83/x39/xf8/x33 <Private Use>
-+<UF8BD>     /x83/x39/xf8/x34 <Private Use>
-+<UF8BE>     /x83/x39/xf8/x35 <Private Use>
-+<UF8BF>     /x83/x39/xf8/x36 <Private Use>
-+<UF8C0>     /x83/x39/xf8/x37 <Private Use>
-+<UF8C1>     /x83/x39/xf8/x38 <Private Use>
-+<UF8C2>     /x83/x39/xf8/x39 <Private Use>
-+<UF8C3>     /x83/x39/xf9/x30 <Private Use>
-+<UF8C4>     /x83/x39/xf9/x31 <Private Use>
-+<UF8C5>     /x83/x39/xf9/x32 <Private Use>
-+<UF8C6>     /x83/x39/xf9/x33 <Private Use>
-+<UF8C7>     /x83/x39/xf9/x34 <Private Use>
-+<UF8C8>     /x83/x39/xf9/x35 <Private Use>
-+<UF8C9>     /x83/x39/xf9/x36 <Private Use>
-+<UF8CA>     /x83/x39/xf9/x37 <Private Use>
-+<UF8CB>     /x83/x39/xf9/x38 <Private Use>
-+<UF8CC>     /x83/x39/xf9/x39 <Private Use>
-+<UF8CD>     /x83/x39/xfa/x30 <Private Use>
-+<UF8CE>     /x83/x39/xfa/x31 <Private Use>
-+<UF8CF>     /x83/x39/xfa/x32 <Private Use>
-+<UF8D0>     /x83/x39/xfa/x33 <Private Use>
-+<UF8D1>     /x83/x39/xfa/x34 <Private Use>
-+<UF8D2>     /x83/x39/xfa/x35 <Private Use>
-+<UF8D3>     /x83/x39/xfa/x36 <Private Use>
-+<UF8D4>     /x83/x39/xfa/x37 <Private Use>
-+<UF8D5>     /x83/x39/xfa/x38 <Private Use>
-+<UF8D6>     /x83/x39/xfa/x39 <Private Use>
-+<UF8D7>     /x83/x39/xfb/x30 <Private Use>
-+<UF8D8>     /x83/x39/xfb/x31 <Private Use>
-+<UF8D9>     /x83/x39/xfb/x32 <Private Use>
-+<UF8DA>     /x83/x39/xfb/x33 <Private Use>
-+<UF8DB>     /x83/x39/xfb/x34 <Private Use>
-+<UF8DC>     /x83/x39/xfb/x35 <Private Use>
-+<UF8DD>     /x83/x39/xfb/x36 <Private Use>
-+<UF8DE>     /x83/x39/xfb/x37 <Private Use>
-+<UF8DF>     /x83/x39/xfb/x38 <Private Use>
-+<UF8E0>     /x83/x39/xfb/x39 <Private Use>
-+<UF8E1>     /x83/x39/xfc/x30 <Private Use>
-+<UF8E2>     /x83/x39/xfc/x31 <Private Use>
-+<UF8E3>     /x83/x39/xfc/x32 <Private Use>
-+<UF8E4>     /x83/x39/xfc/x33 <Private Use>
-+<UF8E5>     /x83/x39/xfc/x34 <Private Use>
-+<UF8E6>     /x83/x39/xfc/x35 <Private Use>
-+<UF8E7>     /x83/x39/xfc/x36 <Private Use>
-+<UF8E8>     /x83/x39/xfc/x37 <Private Use>
-+<UF8E9>     /x83/x39/xfc/x38 <Private Use>
-+<UF8EA>     /x83/x39/xfc/x39 <Private Use>
-+<UF8EB>     /x83/x39/xfd/x30 <Private Use>
-+<UF8EC>     /x83/x39/xfd/x31 <Private Use>
-+<UF8ED>     /x83/x39/xfd/x32 <Private Use>
-+<UF8EE>     /x83/x39/xfd/x33 <Private Use>
-+<UF8EF>     /x83/x39/xfd/x34 <Private Use>
-+<UF8F0>     /x83/x39/xfd/x35 <Private Use>
-+<UF8F1>     /x83/x39/xfd/x36 <Private Use>
-+<UF8F2>     /x83/x39/xfd/x37 <Private Use>
-+<UF8F3>     /x83/x39/xfd/x38 <Private Use>
-+<UF8F4>     /x83/x39/xfd/x39 <Private Use>
-+<UF8F5>     /x83/x39/xfe/x30 <Private Use>
-+<UF8F6>     /x83/x39/xfe/x31 <Private Use>
-+<UF8F7>     /x83/x39/xfe/x32 <Private Use>
-+<UF8F8>     /x83/x39/xfe/x33 <Private Use>
-+<UF8F9>     /x83/x39/xfe/x34 <Private Use>
-+<UF8FA>     /x83/x39/xfe/x35 <Private Use>
-+<UF8FB>     /x83/x39/xfe/x36 <Private Use>
-+<UF8FC>     /x83/x39/xfe/x37 <Private Use>
-+<UF8FD>     /x83/x39/xfe/x38 <Private Use>
-+<UF8FE>     /x83/x39/xfe/x39 <Private Use>
-+<UF8FF>     /x84/x30/x81/x30 <Private Use>
-+<UF900>     /x84/x30/x81/x31 CJK COMPATIBILITY IDEOGRAPH-F900
-+<UF901>     /x84/x30/x81/x32 CJK COMPATIBILITY IDEOGRAPH-F901
-+<UF902>     /x84/x30/x81/x33 CJK COMPATIBILITY IDEOGRAPH-F902
-+<UF903>     /x84/x30/x81/x34 CJK COMPATIBILITY IDEOGRAPH-F903
-+<UF904>     /x84/x30/x81/x35 CJK COMPATIBILITY IDEOGRAPH-F904
-+<UF905>     /x84/x30/x81/x36 CJK COMPATIBILITY IDEOGRAPH-F905
-+<UF906>     /x84/x30/x81/x37 CJK COMPATIBILITY IDEOGRAPH-F906
-+<UF907>     /x84/x30/x81/x38 CJK COMPATIBILITY IDEOGRAPH-F907
-+<UF908>     /x84/x30/x81/x39 CJK COMPATIBILITY IDEOGRAPH-F908
-+<UF909>     /x84/x30/x82/x30 CJK COMPATIBILITY IDEOGRAPH-F909
-+<UF90A>     /x84/x30/x82/x31 CJK COMPATIBILITY IDEOGRAPH-F90A
-+<UF90B>     /x84/x30/x82/x32 CJK COMPATIBILITY IDEOGRAPH-F90B
-+<UF90C>     /x84/x30/x82/x33 CJK COMPATIBILITY IDEOGRAPH-F90C
-+<UF90D>     /x84/x30/x82/x34 CJK COMPATIBILITY IDEOGRAPH-F90D
-+<UF90E>     /x84/x30/x82/x35 CJK COMPATIBILITY IDEOGRAPH-F90E
-+<UF90F>     /x84/x30/x82/x36 CJK COMPATIBILITY IDEOGRAPH-F90F
-+<UF910>     /x84/x30/x82/x37 CJK COMPATIBILITY IDEOGRAPH-F910
-+<UF911>     /x84/x30/x82/x38 CJK COMPATIBILITY IDEOGRAPH-F911
-+<UF912>     /x84/x30/x82/x39 CJK COMPATIBILITY IDEOGRAPH-F912
-+<UF913>     /x84/x30/x83/x30 CJK COMPATIBILITY IDEOGRAPH-F913
-+<UF914>     /x84/x30/x83/x31 CJK COMPATIBILITY IDEOGRAPH-F914
-+<UF915>     /x84/x30/x83/x32 CJK COMPATIBILITY IDEOGRAPH-F915
-+<UF916>     /x84/x30/x83/x33 CJK COMPATIBILITY IDEOGRAPH-F916
-+<UF917>     /x84/x30/x83/x34 CJK COMPATIBILITY IDEOGRAPH-F917
-+<UF918>     /x84/x30/x83/x35 CJK COMPATIBILITY IDEOGRAPH-F918
-+<UF919>     /x84/x30/x83/x36 CJK COMPATIBILITY IDEOGRAPH-F919
-+<UF91A>     /x84/x30/x83/x37 CJK COMPATIBILITY IDEOGRAPH-F91A
-+<UF91B>     /x84/x30/x83/x38 CJK COMPATIBILITY IDEOGRAPH-F91B
-+<UF91C>     /x84/x30/x83/x39 CJK COMPATIBILITY IDEOGRAPH-F91C
-+<UF91D>     /x84/x30/x84/x30 CJK COMPATIBILITY IDEOGRAPH-F91D
-+<UF91E>     /x84/x30/x84/x31 CJK COMPATIBILITY IDEOGRAPH-F91E
-+<UF91F>     /x84/x30/x84/x32 CJK COMPATIBILITY IDEOGRAPH-F91F
-+<UF920>     /x84/x30/x84/x33 CJK COMPATIBILITY IDEOGRAPH-F920
-+<UF921>     /x84/x30/x84/x34 CJK COMPATIBILITY IDEOGRAPH-F921
-+<UF922>     /x84/x30/x84/x35 CJK COMPATIBILITY IDEOGRAPH-F922
-+<UF923>     /x84/x30/x84/x36 CJK COMPATIBILITY IDEOGRAPH-F923
-+<UF924>     /x84/x30/x84/x37 CJK COMPATIBILITY IDEOGRAPH-F924
-+<UF925>     /x84/x30/x84/x38 CJK COMPATIBILITY IDEOGRAPH-F925
-+<UF926>     /x84/x30/x84/x39 CJK COMPATIBILITY IDEOGRAPH-F926
-+<UF927>     /x84/x30/x85/x30 CJK COMPATIBILITY IDEOGRAPH-F927
-+<UF928>     /x84/x30/x85/x31 CJK COMPATIBILITY IDEOGRAPH-F928
-+<UF929>     /x84/x30/x85/x32 CJK COMPATIBILITY IDEOGRAPH-F929
-+<UF92A>     /x84/x30/x85/x33 CJK COMPATIBILITY IDEOGRAPH-F92A
-+<UF92B>     /x84/x30/x85/x34 CJK COMPATIBILITY IDEOGRAPH-F92B
- <UF92C>     /xfd/x9c         CJK COMPATIBILITY IDEOGRAPH-F92C
- <UF92D>     /x84/x30/x85/x35 CJK COMPATIBILITY IDEOGRAPH-F92D
- <UF92E>     /x84/x30/x85/x36 CJK COMPATIBILITY IDEOGRAPH-F92E
-@@ -30222,6 +61999,1036 @@ CHARMAP
- <UFA27>     /xfe/x4d         CJK COMPATIBILITY IDEOGRAPH-FA27
- <UFA28>     /xfe/x4e         CJK COMPATIBILITY IDEOGRAPH-FA28
- <UFA29>     /xfe/x4f         CJK COMPATIBILITY IDEOGRAPH-FA29
-+<UFA2A>     /x84/x30/x9c/x38 CJK COMPATIBILITY IDEOGRAPH-FA2A
-+<UFA2B>     /x84/x30/x9c/x39 CJK COMPATIBILITY IDEOGRAPH-FA2B
-+<UFA2C>     /x84/x30/x9d/x30 CJK COMPATIBILITY IDEOGRAPH-FA2C
-+<UFA2D>     /x84/x30/x9d/x31 CJK COMPATIBILITY IDEOGRAPH-FA2D
-+<UFA2E>     /x84/x30/x9d/x32 <UNASSIGNED>
-+<UFA2F>     /x84/x30/x9d/x33 <UNASSIGNED>
-+<UFA30>     /x84/x30/x9d/x34 CJK COMPATIBILITY IDEOGRAPH-FA30
-+<UFA31>     /x84/x30/x9d/x35 CJK COMPATIBILITY IDEOGRAPH-FA31
-+<UFA32>     /x84/x30/x9d/x36 CJK COMPATIBILITY IDEOGRAPH-FA32
-+<UFA33>     /x84/x30/x9d/x37 CJK COMPATIBILITY IDEOGRAPH-FA33
-+<UFA34>     /x84/x30/x9d/x38 CJK COMPATIBILITY IDEOGRAPH-FA34
-+<UFA35>     /x84/x30/x9d/x39 CJK COMPATIBILITY IDEOGRAPH-FA35
-+<UFA36>     /x84/x30/x9e/x30 CJK COMPATIBILITY IDEOGRAPH-FA36
-+<UFA37>     /x84/x30/x9e/x31 CJK COMPATIBILITY IDEOGRAPH-FA37
-+<UFA38>     /x84/x30/x9e/x32 CJK COMPATIBILITY IDEOGRAPH-FA38
-+<UFA39>     /x84/x30/x9e/x33 CJK COMPATIBILITY IDEOGRAPH-FA39
-+<UFA3A>     /x84/x30/x9e/x34 CJK COMPATIBILITY IDEOGRAPH-FA3A
-+<UFA3B>     /x84/x30/x9e/x35 CJK COMPATIBILITY IDEOGRAPH-FA3B
-+<UFA3C>     /x84/x30/x9e/x36 CJK COMPATIBILITY IDEOGRAPH-FA3C
-+<UFA3D>     /x84/x30/x9e/x37 CJK COMPATIBILITY IDEOGRAPH-FA3D
-+<UFA3E>     /x84/x30/x9e/x38 CJK COMPATIBILITY IDEOGRAPH-FA3E
-+<UFA3F>     /x84/x30/x9e/x39 CJK COMPATIBILITY IDEOGRAPH-FA3F
-+<UFA40>     /x84/x30/x9f/x30 CJK COMPATIBILITY IDEOGRAPH-FA40
-+<UFA41>     /x84/x30/x9f/x31 CJK COMPATIBILITY IDEOGRAPH-FA41
-+<UFA42>     /x84/x30/x9f/x32 CJK COMPATIBILITY IDEOGRAPH-FA42
-+<UFA43>     /x84/x30/x9f/x33 CJK COMPATIBILITY IDEOGRAPH-FA43
-+<UFA44>     /x84/x30/x9f/x34 CJK COMPATIBILITY IDEOGRAPH-FA44
-+<UFA45>     /x84/x30/x9f/x35 CJK COMPATIBILITY IDEOGRAPH-FA45
-+<UFA46>     /x84/x30/x9f/x36 CJK COMPATIBILITY IDEOGRAPH-FA46
-+<UFA47>     /x84/x30/x9f/x37 CJK COMPATIBILITY IDEOGRAPH-FA47
-+<UFA48>     /x84/x30/x9f/x38 CJK COMPATIBILITY IDEOGRAPH-FA48
-+<UFA49>     /x84/x30/x9f/x39 CJK COMPATIBILITY IDEOGRAPH-FA49
-+<UFA4A>     /x84/x30/xa0/x30 CJK COMPATIBILITY IDEOGRAPH-FA4A
-+<UFA4B>     /x84/x30/xa0/x31 CJK COMPATIBILITY IDEOGRAPH-FA4B
-+<UFA4C>     /x84/x30/xa0/x32 CJK COMPATIBILITY IDEOGRAPH-FA4C
-+<UFA4D>     /x84/x30/xa0/x33 CJK COMPATIBILITY IDEOGRAPH-FA4D
-+<UFA4E>     /x84/x30/xa0/x34 CJK COMPATIBILITY IDEOGRAPH-FA4E
-+<UFA4F>     /x84/x30/xa0/x35 CJK COMPATIBILITY IDEOGRAPH-FA4F
-+<UFA50>     /x84/x30/xa0/x36 CJK COMPATIBILITY IDEOGRAPH-FA50
-+<UFA51>     /x84/x30/xa0/x37 CJK COMPATIBILITY IDEOGRAPH-FA51
-+<UFA52>     /x84/x30/xa0/x38 CJK COMPATIBILITY IDEOGRAPH-FA52
-+<UFA53>     /x84/x30/xa0/x39 CJK COMPATIBILITY IDEOGRAPH-FA53
-+<UFA54>     /x84/x30/xa1/x30 CJK COMPATIBILITY IDEOGRAPH-FA54
-+<UFA55>     /x84/x30/xa1/x31 CJK COMPATIBILITY IDEOGRAPH-FA55
-+<UFA56>     /x84/x30/xa1/x32 CJK COMPATIBILITY IDEOGRAPH-FA56
-+<UFA57>     /x84/x30/xa1/x33 CJK COMPATIBILITY IDEOGRAPH-FA57
-+<UFA58>     /x84/x30/xa1/x34 CJK COMPATIBILITY IDEOGRAPH-FA58
-+<UFA59>     /x84/x30/xa1/x35 CJK COMPATIBILITY IDEOGRAPH-FA59
-+<UFA5A>     /x84/x30/xa1/x36 CJK COMPATIBILITY IDEOGRAPH-FA5A
-+<UFA5B>     /x84/x30/xa1/x37 CJK COMPATIBILITY IDEOGRAPH-FA5B
-+<UFA5C>     /x84/x30/xa1/x38 CJK COMPATIBILITY IDEOGRAPH-FA5C
-+<UFA5D>     /x84/x30/xa1/x39 CJK COMPATIBILITY IDEOGRAPH-FA5D
-+<UFA5E>     /x84/x30/xa2/x30 CJK COMPATIBILITY IDEOGRAPH-FA5E
-+<UFA5F>     /x84/x30/xa2/x31 CJK COMPATIBILITY IDEOGRAPH-FA5F
-+<UFA60>     /x84/x30/xa2/x32 CJK COMPATIBILITY IDEOGRAPH-FA60
-+<UFA61>     /x84/x30/xa2/x33 CJK COMPATIBILITY IDEOGRAPH-FA61
-+<UFA62>     /x84/x30/xa2/x34 CJK COMPATIBILITY IDEOGRAPH-FA62
-+<UFA63>     /x84/x30/xa2/x35 CJK COMPATIBILITY IDEOGRAPH-FA63
-+<UFA64>     /x84/x30/xa2/x36 CJK COMPATIBILITY IDEOGRAPH-FA64
-+<UFA65>     /x84/x30/xa2/x37 CJK COMPATIBILITY IDEOGRAPH-FA65
-+<UFA66>     /x84/x30/xa2/x38 CJK COMPATIBILITY IDEOGRAPH-FA66
-+<UFA67>     /x84/x30/xa2/x39 CJK COMPATIBILITY IDEOGRAPH-FA67
-+<UFA68>     /x84/x30/xa3/x30 CJK COMPATIBILITY IDEOGRAPH-FA68
-+<UFA69>     /x84/x30/xa3/x31 CJK COMPATIBILITY IDEOGRAPH-FA69
-+<UFA6A>     /x84/x30/xa3/x32 CJK COMPATIBILITY IDEOGRAPH-FA6A
-+<UFA6B>     /x84/x30/xa3/x33 <UNASSIGNED>
-+<UFA6C>     /x84/x30/xa3/x34 <UNASSIGNED>
-+<UFA6D>     /x84/x30/xa3/x35 <UNASSIGNED>
-+<UFA6E>     /x84/x30/xa3/x36 <UNASSIGNED>
-+<UFA6F>     /x84/x30/xa3/x37 <UNASSIGNED>
-+<UFA70>     /x84/x30/xa3/x38 <UNASSIGNED>
-+<UFA71>     /x84/x30/xa3/x39 <UNASSIGNED>
-+<UFA72>     /x84/x30/xa4/x30 <UNASSIGNED>
-+<UFA73>     /x84/x30/xa4/x31 <UNASSIGNED>
-+<UFA74>     /x84/x30/xa4/x32 <UNASSIGNED>
-+<UFA75>     /x84/x30/xa4/x33 <UNASSIGNED>
-+<UFA76>     /x84/x30/xa4/x34 <UNASSIGNED>
-+<UFA77>     /x84/x30/xa4/x35 <UNASSIGNED>
-+<UFA78>     /x84/x30/xa4/x36 <UNASSIGNED>
-+<UFA79>     /x84/x30/xa4/x37 <UNASSIGNED>
-+<UFA7A>     /x84/x30/xa4/x38 <UNASSIGNED>
-+<UFA7B>     /x84/x30/xa4/x39 <UNASSIGNED>
-+<UFA7C>     /x84/x30/xa5/x30 <UNASSIGNED>
-+<UFA7D>     /x84/x30/xa5/x31 <UNASSIGNED>
-+<UFA7E>     /x84/x30/xa5/x32 <UNASSIGNED>
-+<UFA7F>     /x84/x30/xa5/x33 <UNASSIGNED>
-+<UFA80>     /x84/x30/xa5/x34 <UNASSIGNED>
-+<UFA81>     /x84/x30/xa5/x35 <UNASSIGNED>
-+<UFA82>     /x84/x30/xa5/x36 <UNASSIGNED>
-+<UFA83>     /x84/x30/xa5/x37 <UNASSIGNED>
-+<UFA84>     /x84/x30/xa5/x38 <UNASSIGNED>
-+<UFA85>     /x84/x30/xa5/x39 <UNASSIGNED>
-+<UFA86>     /x84/x30/xa6/x30 <UNASSIGNED>
-+<UFA87>     /x84/x30/xa6/x31 <UNASSIGNED>
-+<UFA88>     /x84/x30/xa6/x32 <UNASSIGNED>
-+<UFA89>     /x84/x30/xa6/x33 <UNASSIGNED>
-+<UFA8A>     /x84/x30/xa6/x34 <UNASSIGNED>
-+<UFA8B>     /x84/x30/xa6/x35 <UNASSIGNED>
-+<UFA8C>     /x84/x30/xa6/x36 <UNASSIGNED>
-+<UFA8D>     /x84/x30/xa6/x37 <UNASSIGNED>
-+<UFA8E>     /x84/x30/xa6/x38 <UNASSIGNED>
-+<UFA8F>     /x84/x30/xa6/x39 <UNASSIGNED>
-+<UFA90>     /x84/x30/xa7/x30 <UNASSIGNED>
-+<UFA91>     /x84/x30/xa7/x31 <UNASSIGNED>
-+<UFA92>     /x84/x30/xa7/x32 <UNASSIGNED>
-+<UFA93>     /x84/x30/xa7/x33 <UNASSIGNED>
-+<UFA94>     /x84/x30/xa7/x34 <UNASSIGNED>
-+<UFA95>     /x84/x30/xa7/x35 <UNASSIGNED>
-+<UFA96>     /x84/x30/xa7/x36 <UNASSIGNED>
-+<UFA97>     /x84/x30/xa7/x37 <UNASSIGNED>
-+<UFA98>     /x84/x30/xa7/x38 <UNASSIGNED>
-+<UFA99>     /x84/x30/xa7/x39 <UNASSIGNED>
-+<UFA9A>     /x84/x30/xa8/x30 <UNASSIGNED>
-+<UFA9B>     /x84/x30/xa8/x31 <UNASSIGNED>
-+<UFA9C>     /x84/x30/xa8/x32 <UNASSIGNED>
-+<UFA9D>     /x84/x30/xa8/x33 <UNASSIGNED>
-+<UFA9E>     /x84/x30/xa8/x34 <UNASSIGNED>
-+<UFA9F>     /x84/x30/xa8/x35 <UNASSIGNED>
-+<UFAA0>     /x84/x30/xa8/x36 <UNASSIGNED>
-+<UFAA1>     /x84/x30/xa8/x37 <UNASSIGNED>
-+<UFAA2>     /x84/x30/xa8/x38 <UNASSIGNED>
-+<UFAA3>     /x84/x30/xa8/x39 <UNASSIGNED>
-+<UFAA4>     /x84/x30/xa9/x30 <UNASSIGNED>
-+<UFAA5>     /x84/x30/xa9/x31 <UNASSIGNED>
-+<UFAA6>     /x84/x30/xa9/x32 <UNASSIGNED>
-+<UFAA7>     /x84/x30/xa9/x33 <UNASSIGNED>
-+<UFAA8>     /x84/x30/xa9/x34 <UNASSIGNED>
-+<UFAA9>     /x84/x30/xa9/x35 <UNASSIGNED>
-+<UFAAA>     /x84/x30/xa9/x36 <UNASSIGNED>
-+<UFAAB>     /x84/x30/xa9/x37 <UNASSIGNED>
-+<UFAAC>     /x84/x30/xa9/x38 <UNASSIGNED>
-+<UFAAD>     /x84/x30/xa9/x39 <UNASSIGNED>
-+<UFAAE>     /x84/x30/xaa/x30 <UNASSIGNED>
-+<UFAAF>     /x84/x30/xaa/x31 <UNASSIGNED>
-+<UFAB0>     /x84/x30/xaa/x32 <UNASSIGNED>
-+<UFAB1>     /x84/x30/xaa/x33 <UNASSIGNED>
-+<UFAB2>     /x84/x30/xaa/x34 <UNASSIGNED>
-+<UFAB3>     /x84/x30/xaa/x35 <UNASSIGNED>
-+<UFAB4>     /x84/x30/xaa/x36 <UNASSIGNED>
-+<UFAB5>     /x84/x30/xaa/x37 <UNASSIGNED>
-+<UFAB6>     /x84/x30/xaa/x38 <UNASSIGNED>
-+<UFAB7>     /x84/x30/xaa/x39 <UNASSIGNED>
-+<UFAB8>     /x84/x30/xab/x30 <UNASSIGNED>
-+<UFAB9>     /x84/x30/xab/x31 <UNASSIGNED>
-+<UFABA>     /x84/x30/xab/x32 <UNASSIGNED>
-+<UFABB>     /x84/x30/xab/x33 <UNASSIGNED>
-+<UFABC>     /x84/x30/xab/x34 <UNASSIGNED>
-+<UFABD>     /x84/x30/xab/x35 <UNASSIGNED>
-+<UFABE>     /x84/x30/xab/x36 <UNASSIGNED>
-+<UFABF>     /x84/x30/xab/x37 <UNASSIGNED>
-+<UFAC0>     /x84/x30/xab/x38 <UNASSIGNED>
-+<UFAC1>     /x84/x30/xab/x39 <UNASSIGNED>
-+<UFAC2>     /x84/x30/xac/x30 <UNASSIGNED>
-+<UFAC3>     /x84/x30/xac/x31 <UNASSIGNED>
-+<UFAC4>     /x84/x30/xac/x32 <UNASSIGNED>
-+<UFAC5>     /x84/x30/xac/x33 <UNASSIGNED>
-+<UFAC6>     /x84/x30/xac/x34 <UNASSIGNED>
-+<UFAC7>     /x84/x30/xac/x35 <UNASSIGNED>
-+<UFAC8>     /x84/x30/xac/x36 <UNASSIGNED>
-+<UFAC9>     /x84/x30/xac/x37 <UNASSIGNED>
-+<UFACA>     /x84/x30/xac/x38 <UNASSIGNED>
-+<UFACB>     /x84/x30/xac/x39 <UNASSIGNED>
-+<UFACC>     /x84/x30/xad/x30 <UNASSIGNED>
-+<UFACD>     /x84/x30/xad/x31 <UNASSIGNED>
-+<UFACE>     /x84/x30/xad/x32 <UNASSIGNED>
-+<UFACF>     /x84/x30/xad/x33 <UNASSIGNED>
-+<UFAD0>     /x84/x30/xad/x34 <UNASSIGNED>
-+<UFAD1>     /x84/x30/xad/x35 <UNASSIGNED>
-+<UFAD2>     /x84/x30/xad/x36 <UNASSIGNED>
-+<UFAD3>     /x84/x30/xad/x37 <UNASSIGNED>
-+<UFAD4>     /x84/x30/xad/x38 <UNASSIGNED>
-+<UFAD5>     /x84/x30/xad/x39 <UNASSIGNED>
-+<UFAD6>     /x84/x30/xae/x30 <UNASSIGNED>
-+<UFAD7>     /x84/x30/xae/x31 <UNASSIGNED>
-+<UFAD8>     /x84/x30/xae/x32 <UNASSIGNED>
-+<UFAD9>     /x84/x30/xae/x33 <UNASSIGNED>
-+<UFADA>     /x84/x30/xae/x34 <UNASSIGNED>
-+<UFADB>     /x84/x30/xae/x35 <UNASSIGNED>
-+<UFADC>     /x84/x30/xae/x36 <UNASSIGNED>
-+<UFADD>     /x84/x30/xae/x37 <UNASSIGNED>
-+<UFADE>     /x84/x30/xae/x38 <UNASSIGNED>
-+<UFADF>     /x84/x30/xae/x39 <UNASSIGNED>
-+<UFAE0>     /x84/x30/xaf/x30 <UNASSIGNED>
-+<UFAE1>     /x84/x30/xaf/x31 <UNASSIGNED>
-+<UFAE2>     /x84/x30/xaf/x32 <UNASSIGNED>
-+<UFAE3>     /x84/x30/xaf/x33 <UNASSIGNED>
-+<UFAE4>     /x84/x30/xaf/x34 <UNASSIGNED>
-+<UFAE5>     /x84/x30/xaf/x35 <UNASSIGNED>
-+<UFAE6>     /x84/x30/xaf/x36 <UNASSIGNED>
-+<UFAE7>     /x84/x30/xaf/x37 <UNASSIGNED>
-+<UFAE8>     /x84/x30/xaf/x38 <UNASSIGNED>
-+<UFAE9>     /x84/x30/xaf/x39 <UNASSIGNED>
-+<UFAEA>     /x84/x30/xb0/x30 <UNASSIGNED>
-+<UFAEB>     /x84/x30/xb0/x31 <UNASSIGNED>
-+<UFAEC>     /x84/x30/xb0/x32 <UNASSIGNED>
-+<UFAED>     /x84/x30/xb0/x33 <UNASSIGNED>
-+<UFAEE>     /x84/x30/xb0/x34 <UNASSIGNED>
-+<UFAEF>     /x84/x30/xb0/x35 <UNASSIGNED>
-+<UFAF0>     /x84/x30/xb0/x36 <UNASSIGNED>
-+<UFAF1>     /x84/x30/xb0/x37 <UNASSIGNED>
-+<UFAF2>     /x84/x30/xb0/x38 <UNASSIGNED>
-+<UFAF3>     /x84/x30/xb0/x39 <UNASSIGNED>
-+<UFAF4>     /x84/x30/xb1/x30 <UNASSIGNED>
-+<UFAF5>     /x84/x30/xb1/x31 <UNASSIGNED>
-+<UFAF6>     /x84/x30/xb1/x32 <UNASSIGNED>
-+<UFAF7>     /x84/x30/xb1/x33 <UNASSIGNED>
-+<UFAF8>     /x84/x30/xb1/x34 <UNASSIGNED>
-+<UFAF9>     /x84/x30/xb1/x35 <UNASSIGNED>
-+<UFAFA>     /x84/x30/xb1/x36 <UNASSIGNED>
-+<UFAFB>     /x84/x30/xb1/x37 <UNASSIGNED>
-+<UFAFC>     /x84/x30/xb1/x38 <UNASSIGNED>
-+<UFAFD>     /x84/x30/xb1/x39 <UNASSIGNED>
-+<UFAFE>     /x84/x30/xb2/x30 <UNASSIGNED>
-+<UFAFF>     /x84/x30/xb2/x31 <UNASSIGNED>
-+<UFB00>     /x84/x30/xb2/x32 LATIN SMALL LIGATURE FF
-+<UFB01>     /x84/x30/xb2/x33 LATIN SMALL LIGATURE FI
-+<UFB02>     /x84/x30/xb2/x34 LATIN SMALL LIGATURE FL
-+<UFB03>     /x84/x30/xb2/x35 LATIN SMALL LIGATURE FFI
-+<UFB04>     /x84/x30/xb2/x36 LATIN SMALL LIGATURE FFL
-+<UFB05>     /x84/x30/xb2/x37 LATIN SMALL LIGATURE LONG S T
-+<UFB06>     /x84/x30/xb2/x38 LATIN SMALL LIGATURE ST
-+<UFB07>     /x84/x30/xb2/x39 <UNASSIGNED>
-+<UFB08>     /x84/x30/xb3/x30 <UNASSIGNED>
-+<UFB09>     /x84/x30/xb3/x31 <UNASSIGNED>
-+<UFB0A>     /x84/x30/xb3/x32 <UNASSIGNED>
-+<UFB0B>     /x84/x30/xb3/x33 <UNASSIGNED>
-+<UFB0C>     /x84/x30/xb3/x34 <UNASSIGNED>
-+<UFB0D>     /x84/x30/xb3/x35 <UNASSIGNED>
-+<UFB0E>     /x84/x30/xb3/x36 <UNASSIGNED>
-+<UFB0F>     /x84/x30/xb3/x37 <UNASSIGNED>
-+<UFB10>     /x84/x30/xb3/x38 <UNASSIGNED>
-+<UFB11>     /x84/x30/xb3/x39 <UNASSIGNED>
-+<UFB12>     /x84/x30/xb4/x30 <UNASSIGNED>
-+<UFB13>     /x84/x30/xb4/x31 ARMENIAN SMALL LIGATURE MEN NOW
-+<UFB14>     /x84/x30/xb4/x32 ARMENIAN SMALL LIGATURE MEN ECH
-+<UFB15>     /x84/x30/xb4/x33 ARMENIAN SMALL LIGATURE MEN INI
-+<UFB16>     /x84/x30/xb4/x34 ARMENIAN SMALL LIGATURE VEW NOW
-+<UFB17>     /x84/x30/xb4/x35 ARMENIAN SMALL LIGATURE MEN XEH
-+<UFB18>     /x84/x30/xb4/x36 <UNASSIGNED>
-+<UFB19>     /x84/x30/xb4/x37 <UNASSIGNED>
-+<UFB1A>     /x84/x30/xb4/x38 <UNASSIGNED>
-+<UFB1B>     /x84/x30/xb4/x39 <UNASSIGNED>
-+<UFB1C>     /x84/x30/xb5/x30 <UNASSIGNED>
-+<UFB1D>     /x84/x30/xb5/x31 HEBREW LETTER YOD WITH HIRIQ
-+<UFB1E>     /x84/x30/xb5/x32 HEBREW POINT JUDEO-SPANISH VARIKA
-+<UFB1F>     /x84/x30/xb5/x33 HEBREW LIGATURE YIDDISH YOD YOD PATAH
-+<UFB20>     /x84/x30/xb5/x34 HEBREW LETTER ALTERNATIVE AYIN
-+<UFB21>     /x84/x30/xb5/x35 HEBREW LETTER WIDE ALEF
-+<UFB22>     /x84/x30/xb5/x36 HEBREW LETTER WIDE DALET
-+<UFB23>     /x84/x30/xb5/x37 HEBREW LETTER WIDE HE
-+<UFB24>     /x84/x30/xb5/x38 HEBREW LETTER WIDE KAF
-+<UFB25>     /x84/x30/xb5/x39 HEBREW LETTER WIDE LAMED
-+<UFB26>     /x84/x30/xb6/x30 HEBREW LETTER WIDE FINAL MEM
-+<UFB27>     /x84/x30/xb6/x31 HEBREW LETTER WIDE RESH
-+<UFB28>     /x84/x30/xb6/x32 HEBREW LETTER WIDE TAV
-+<UFB29>     /x84/x30/xb6/x33 HEBREW LETTER ALTERNATIVE PLUS SIGN
-+<UFB2A>     /x84/x30/xb6/x34 HEBREW LETTER SHIN WITH SHIN DOT
-+<UFB2B>     /x84/x30/xb6/x35 HEBREW LETTER SHIN WITH SIN DOT
-+<UFB2C>     /x84/x30/xb6/x36 HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
-+<UFB2D>     /x84/x30/xb6/x37 HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
-+<UFB2E>     /x84/x30/xb6/x38 HEBREW LETTER ALEF WITH PATAH
-+<UFB2F>     /x84/x30/xb6/x39 HEBREW LETTER ALEF WITH QAMATS
-+<UFB30>     /x84/x30/xb7/x30 HEBREW LETTER ALEF WITH MAPIQ
-+<UFB31>     /x84/x30/xb7/x31 HEBREW LETTER BET WITH DAGESH
-+<UFB32>     /x84/x30/xb7/x32 HEBREW LETTER GIMEL WITH DAGESH
-+<UFB33>     /x84/x30/xb7/x33 HEBREW LETTER DALET WITH DAGESH
-+<UFB34>     /x84/x30/xb7/x34 HEBREW LETTER HE WITH MAPIQ
-+<UFB35>     /x84/x30/xb7/x35 HEBREW LETTER VAV WITH DAGESH
-+<UFB36>     /x84/x30/xb7/x36 HEBREW LETTER ZAYIN WITH DAGESH
-+<UFB37>     /x84/x30/xb7/x37 <UNASSIGNED>
-+<UFB38>     /x84/x30/xb7/x38 HEBREW LETTER TET WITH DAGESH
-+<UFB39>     /x84/x30/xb7/x39 HEBREW LETTER YOD WITH DAGESH
-+<UFB3A>     /x84/x30/xb8/x30 HEBREW LETTER FINAL KAF WITH DAGESH
-+<UFB3B>     /x84/x30/xb8/x31 HEBREW LETTER KAF WITH DAGESH
-+<UFB3C>     /x84/x30/xb8/x32 HEBREW LETTER LAMED WITH DAGESH
-+<UFB3D>     /x84/x30/xb8/x33 <UNASSIGNED>
-+<UFB3E>     /x84/x30/xb8/x34 HEBREW LETTER MEM WITH DAGESH
-+<UFB3F>     /x84/x30/xb8/x35 <UNASSIGNED>
-+<UFB40>     /x84/x30/xb8/x36 HEBREW LETTER NUN WITH DAGESH
-+<UFB41>     /x84/x30/xb8/x37 HEBREW LETTER SAMEKH WITH DAGESH
-+<UFB42>     /x84/x30/xb8/x38 <UNASSIGNED>
-+<UFB43>     /x84/x30/xb8/x39 HEBREW LETTER FINAL PE WITH DAGESH
-+<UFB44>     /x84/x30/xb9/x30 HEBREW LETTER PE WITH DAGESH
-+<UFB45>     /x84/x30/xb9/x31 <UNASSIGNED>
-+<UFB46>     /x84/x30/xb9/x32 HEBREW LETTER TSADI WITH DAGESH
-+<UFB47>     /x84/x30/xb9/x33 HEBREW LETTER QOF WITH DAGESH
-+<UFB48>     /x84/x30/xb9/x34 HEBREW LETTER RESH WITH DAGESH
-+<UFB49>     /x84/x30/xb9/x35 HEBREW LETTER SHIN WITH DAGESH
-+<UFB4A>     /x84/x30/xb9/x36 HEBREW LETTER TAV WITH DAGESH
-+<UFB4B>     /x84/x30/xb9/x37 HEBREW LETTER VAV WITH HOLAM
-+<UFB4C>     /x84/x30/xb9/x38 HEBREW LETTER BET WITH RAFE
-+<UFB4D>     /x84/x30/xb9/x39 HEBREW LETTER KAF WITH RAFE
-+<UFB4E>     /x84/x30/xba/x30 HEBREW LETTER PE WITH RAFE
-+<UFB4F>     /x84/x30/xba/x31 HEBREW LIGATURE ALEF LAMED
-+<UFB50>     /x84/x30/xba/x32 ARABIC LETTER ALEF WASLA ISOLATED FORM
-+<UFB51>     /x84/x30/xba/x33 ARABIC LETTER ALEF WASLA FINAL FORM
-+<UFB52>     /x84/x30/xba/x34 ARABIC LETTER BEEH ISOLATED FORM
-+<UFB53>     /x84/x30/xba/x35 ARABIC LETTER BEEH FINAL FORM
-+<UFB54>     /x84/x30/xba/x36 ARABIC LETTER BEEH INITIAL FORM
-+<UFB55>     /x84/x30/xba/x37 ARABIC LETTER BEEH MEDIAL FORM
-+<UFB56>     /x84/x30/xba/x38 ARABIC LETTER PEH ISOLATED FORM
-+<UFB57>     /x84/x30/xba/x39 ARABIC LETTER PEH FINAL FORM
-+<UFB58>     /x84/x30/xbb/x30 ARABIC LETTER PEH INITIAL FORM
-+<UFB59>     /x84/x30/xbb/x31 ARABIC LETTER PEH MEDIAL FORM
-+<UFB5A>     /x84/x30/xbb/x32 ARABIC LETTER BEHEH ISOLATED FORM
-+<UFB5B>     /x84/x30/xbb/x33 ARABIC LETTER BEHEH FINAL FORM
-+<UFB5C>     /x84/x30/xbb/x34 ARABIC LETTER BEHEH INITIAL FORM
-+<UFB5D>     /x84/x30/xbb/x35 ARABIC LETTER BEHEH MEDIAL FORM
-+<UFB5E>     /x84/x30/xbb/x36 ARABIC LETTER TTEHEH ISOLATED FORM
-+<UFB5F>     /x84/x30/xbb/x37 ARABIC LETTER TTEHEH FINAL FORM
-+<UFB60>     /x84/x30/xbb/x38 ARABIC LETTER TTEHEH INITIAL FORM
-+<UFB61>     /x84/x30/xbb/x39 ARABIC LETTER TTEHEH MEDIAL FORM
-+<UFB62>     /x84/x30/xbc/x30 ARABIC LETTER TEHEH ISOLATED FORM
-+<UFB63>     /x84/x30/xbc/x31 ARABIC LETTER TEHEH FINAL FORM
-+<UFB64>     /x84/x30/xbc/x32 ARABIC LETTER TEHEH INITIAL FORM
-+<UFB65>     /x84/x30/xbc/x33 ARABIC LETTER TEHEH MEDIAL FORM
-+<UFB66>     /x84/x30/xbc/x34 ARABIC LETTER TTEH ISOLATED FORM
-+<UFB67>     /x84/x30/xbc/x35 ARABIC LETTER TTEH FINAL FORM
-+<UFB68>     /x84/x30/xbc/x36 ARABIC LETTER TTEH INITIAL FORM
-+<UFB69>     /x84/x30/xbc/x37 ARABIC LETTER TTEH MEDIAL FORM
-+<UFB6A>     /x84/x30/xbc/x38 ARABIC LETTER VEH ISOLATED FORM
-+<UFB6B>     /x84/x30/xbc/x39 ARABIC LETTER VEH FINAL FORM
-+<UFB6C>     /x84/x30/xbd/x30 ARABIC LETTER VEH INITIAL FORM
-+<UFB6D>     /x84/x30/xbd/x31 ARABIC LETTER VEH MEDIAL FORM
-+<UFB6E>     /x84/x30/xbd/x32 ARABIC LETTER PEHEH ISOLATED FORM
-+<UFB6F>     /x84/x30/xbd/x33 ARABIC LETTER PEHEH FINAL FORM
-+<UFB70>     /x84/x30/xbd/x34 ARABIC LETTER PEHEH INITIAL FORM
-+<UFB71>     /x84/x30/xbd/x35 ARABIC LETTER PEHEH MEDIAL FORM
-+<UFB72>     /x84/x30/xbd/x36 ARABIC LETTER DYEH ISOLATED FORM
-+<UFB73>     /x84/x30/xbd/x37 ARABIC LETTER DYEH FINAL FORM
-+<UFB74>     /x84/x30/xbd/x38 ARABIC LETTER DYEH INITIAL FORM
-+<UFB75>     /x84/x30/xbd/x39 ARABIC LETTER DYEH MEDIAL FORM
-+<UFB76>     /x84/x30/xbe/x30 ARABIC LETTER NYEH ISOLATED FORM
-+<UFB77>     /x84/x30/xbe/x31 ARABIC LETTER NYEH FINAL FORM
-+<UFB78>     /x84/x30/xbe/x32 ARABIC LETTER NYEH INITIAL FORM
-+<UFB79>     /x84/x30/xbe/x33 ARABIC LETTER NYEH MEDIAL FORM
-+<UFB7A>     /x84/x30/xbe/x34 ARABIC LETTER TCHEH ISOLATED FORM
-+<UFB7B>     /x84/x30/xbe/x35 ARABIC LETTER TCHEH FINAL FORM
-+<UFB7C>     /x84/x30/xbe/x36 ARABIC LETTER TCHEH INITIAL FORM
-+<UFB7D>     /x84/x30/xbe/x37 ARABIC LETTER TCHEH MEDIAL FORM
-+<UFB7E>     /x84/x30/xbe/x38 ARABIC LETTER TCHEHEH ISOLATED FORM
-+<UFB7F>     /x84/x30/xbe/x39 ARABIC LETTER TCHEHEH FINAL FORM
-+<UFB80>     /x84/x30/xbf/x30 ARABIC LETTER TCHEHEH INITIAL FORM
-+<UFB81>     /x84/x30/xbf/x31 ARABIC LETTER TCHEHEH MEDIAL FORM
-+<UFB82>     /x84/x30/xbf/x32 ARABIC LETTER DDAHAL ISOLATED FORM
-+<UFB83>     /x84/x30/xbf/x33 ARABIC LETTER DDAHAL FINAL FORM
-+<UFB84>     /x84/x30/xbf/x34 ARABIC LETTER DAHAL ISOLATED FORM
-+<UFB85>     /x84/x30/xbf/x35 ARABIC LETTER DAHAL FINAL FORM
-+<UFB86>     /x84/x30/xbf/x36 ARABIC LETTER DUL ISOLATED FORM
-+<UFB87>     /x84/x30/xbf/x37 ARABIC LETTER DUL FINAL FORM
-+<UFB88>     /x84/x30/xbf/x38 ARABIC LETTER DDAL ISOLATED FORM
-+<UFB89>     /x84/x30/xbf/x39 ARABIC LETTER DDAL FINAL FORM
-+<UFB8A>     /x84/x30/xc0/x30 ARABIC LETTER JEH ISOLATED FORM
-+<UFB8B>     /x84/x30/xc0/x31 ARABIC LETTER JEH FINAL FORM
-+<UFB8C>     /x84/x30/xc0/x32 ARABIC LETTER RREH ISOLATED FORM
-+<UFB8D>     /x84/x30/xc0/x33 ARABIC LETTER RREH FINAL FORM
-+<UFB8E>     /x84/x30/xc0/x34 ARABIC LETTER KEHEH ISOLATED FORM
-+<UFB8F>     /x84/x30/xc0/x35 ARABIC LETTER KEHEH FINAL FORM
-+<UFB90>     /x84/x30/xc0/x36 ARABIC LETTER KEHEH INITIAL FORM
-+<UFB91>     /x84/x30/xc0/x37 ARABIC LETTER KEHEH MEDIAL FORM
-+<UFB92>     /x84/x30/xc0/x38 ARABIC LETTER GAF ISOLATED FORM
-+<UFB93>     /x84/x30/xc0/x39 ARABIC LETTER GAF FINAL FORM
-+<UFB94>     /x84/x30/xc1/x30 ARABIC LETTER GAF INITIAL FORM
-+<UFB95>     /x84/x30/xc1/x31 ARABIC LETTER GAF MEDIAL FORM
-+<UFB96>     /x84/x30/xc1/x32 ARABIC LETTER GUEH ISOLATED FORM
-+<UFB97>     /x84/x30/xc1/x33 ARABIC LETTER GUEH FINAL FORM
-+<UFB98>     /x84/x30/xc1/x34 ARABIC LETTER GUEH INITIAL FORM
-+<UFB99>     /x84/x30/xc1/x35 ARABIC LETTER GUEH MEDIAL FORM
-+<UFB9A>     /x84/x30/xc1/x36 ARABIC LETTER NGOEH ISOLATED FORM
-+<UFB9B>     /x84/x30/xc1/x37 ARABIC LETTER NGOEH FINAL FORM
-+<UFB9C>     /x84/x30/xc1/x38 ARABIC LETTER NGOEH INITIAL FORM
-+<UFB9D>     /x84/x30/xc1/x39 ARABIC LETTER NGOEH MEDIAL FORM
-+<UFB9E>     /x84/x30/xc2/x30 ARABIC LETTER NOON GHUNNA ISOLATED FORM
-+<UFB9F>     /x84/x30/xc2/x31 ARABIC LETTER NOON GHUNNA FINAL FORM
-+<UFBA0>     /x84/x30/xc2/x32 ARABIC LETTER RNOON ISOLATED FORM
-+<UFBA1>     /x84/x30/xc2/x33 ARABIC LETTER RNOON FINAL FORM
-+<UFBA2>     /x84/x30/xc2/x34 ARABIC LETTER RNOON INITIAL FORM
-+<UFBA3>     /x84/x30/xc2/x35 ARABIC LETTER RNOON MEDIAL FORM
-+<UFBA4>     /x84/x30/xc2/x36 ARABIC LETTER HEH WITH YEH ABOVE ISOLATED FORM
-+<UFBA5>     /x84/x30/xc2/x37 ARABIC LETTER HEH WITH YEH ABOVE FINAL FORM
-+<UFBA6>     /x84/x30/xc2/x38 ARABIC LETTER HEH GOAL ISOLATED FORM
-+<UFBA7>     /x84/x30/xc2/x39 ARABIC LETTER HEH GOAL FINAL FORM
-+<UFBA8>     /x84/x30/xc3/x30 ARABIC LETTER HEH GOAL INITIAL FORM
-+<UFBA9>     /x84/x30/xc3/x31 ARABIC LETTER HEH GOAL MEDIAL FORM
-+<UFBAA>     /x84/x30/xc3/x32 ARABIC LETTER HEH DOACHASHMEE ISOLATED FORM
-+<UFBAB>     /x84/x30/xc3/x33 ARABIC LETTER HEH DOACHASHMEE FINAL FORM
-+<UFBAC>     /x84/x30/xc3/x34 ARABIC LETTER HEH DOACHASHMEE INITIAL FORM
-+<UFBAD>     /x84/x30/xc3/x35 ARABIC LETTER HEH DOACHASHMEE MEDIAL FORM
-+<UFBAE>     /x84/x30/xc3/x36 ARABIC LETTER YEH BARREE ISOLATED FORM
-+<UFBAF>     /x84/x30/xc3/x37 ARABIC LETTER YEH BARREE FINAL FORM
-+<UFBB0>     /x84/x30/xc3/x38 ARABIC LETTER YEH BARREE WITH HAMZA ABOVE ISOLATED FORM
-+<UFBB1>     /x84/x30/xc3/x39 ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM
-+<UFBB2>     /x84/x30/xc4/x30 <UNASSIGNED>
-+<UFBB3>     /x84/x30/xc4/x31 <UNASSIGNED>
-+<UFBB4>     /x84/x30/xc4/x32 <UNASSIGNED>
-+<UFBB5>     /x84/x30/xc4/x33 <UNASSIGNED>
-+<UFBB6>     /x84/x30/xc4/x34 <UNASSIGNED>
-+<UFBB7>     /x84/x30/xc4/x35 <UNASSIGNED>
-+<UFBB8>     /x84/x30/xc4/x36 <UNASSIGNED>
-+<UFBB9>     /x84/x30/xc4/x37 <UNASSIGNED>
-+<UFBBA>     /x84/x30/xc4/x38 <UNASSIGNED>
-+<UFBBB>     /x84/x30/xc4/x39 <UNASSIGNED>
-+<UFBBC>     /x84/x30/xc5/x30 <UNASSIGNED>
-+<UFBBD>     /x84/x30/xc5/x31 <UNASSIGNED>
-+<UFBBE>     /x84/x30/xc5/x32 <UNASSIGNED>
-+<UFBBF>     /x84/x30/xc5/x33 <UNASSIGNED>
-+<UFBC0>     /x84/x30/xc5/x34 <UNASSIGNED>
-+<UFBC1>     /x84/x30/xc5/x35 <UNASSIGNED>
-+<UFBC2>     /x84/x30/xc5/x36 <UNASSIGNED>
-+<UFBC3>     /x84/x30/xc5/x37 <UNASSIGNED>
-+<UFBC4>     /x84/x30/xc5/x38 <UNASSIGNED>
-+<UFBC5>     /x84/x30/xc5/x39 <UNASSIGNED>
-+<UFBC6>     /x84/x30/xc6/x30 <UNASSIGNED>
-+<UFBC7>     /x84/x30/xc6/x31 <UNASSIGNED>
-+<UFBC8>     /x84/x30/xc6/x32 <UNASSIGNED>
-+<UFBC9>     /x84/x30/xc6/x33 <UNASSIGNED>
-+<UFBCA>     /x84/x30/xc6/x34 <UNASSIGNED>
-+<UFBCB>     /x84/x30/xc6/x35 <UNASSIGNED>
-+<UFBCC>     /x84/x30/xc6/x36 <UNASSIGNED>
-+<UFBCD>     /x84/x30/xc6/x37 <UNASSIGNED>
-+<UFBCE>     /x84/x30/xc6/x38 <UNASSIGNED>
-+<UFBCF>     /x84/x30/xc6/x39 <UNASSIGNED>
-+<UFBD0>     /x84/x30/xc7/x30 <UNASSIGNED>
-+<UFBD1>     /x84/x30/xc7/x31 <UNASSIGNED>
-+<UFBD2>     /x84/x30/xc7/x32 <UNASSIGNED>
-+<UFBD3>     /x84/x30/xc7/x33 ARABIC LETTER NG ISOLATED FORM
-+<UFBD4>     /x84/x30/xc7/x34 ARABIC LETTER NG FINAL FORM
-+<UFBD5>     /x84/x30/xc7/x35 ARABIC LETTER NG INITIAL FORM
-+<UFBD6>     /x84/x30/xc7/x36 ARABIC LETTER NG MEDIAL FORM
-+<UFBD7>     /x84/x30/xc7/x37 ARABIC LETTER U ISOLATED FORM
-+<UFBD8>     /x84/x30/xc7/x38 ARABIC LETTER U FINAL FORM
-+<UFBD9>     /x84/x30/xc7/x39 ARABIC LETTER OE ISOLATED FORM
-+<UFBDA>     /x84/x30/xc8/x30 ARABIC LETTER OE FINAL FORM
-+<UFBDB>     /x84/x30/xc8/x31 ARABIC LETTER YU ISOLATED FORM
-+<UFBDC>     /x84/x30/xc8/x32 ARABIC LETTER YU FINAL FORM
-+<UFBDD>     /x84/x30/xc8/x33 ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM
-+<UFBDE>     /x84/x30/xc8/x34 ARABIC LETTER VE ISOLATED FORM
-+<UFBDF>     /x84/x30/xc8/x35 ARABIC LETTER VE FINAL FORM
-+<UFBE0>     /x84/x30/xc8/x36 ARABIC LETTER KIRGHIZ OE ISOLATED FORM
-+<UFBE1>     /x84/x30/xc8/x37 ARABIC LETTER KIRGHIZ OE FINAL FORM
-+<UFBE2>     /x84/x30/xc8/x38 ARABIC LETTER KIRGHIZ YU ISOLATED FORM
-+<UFBE3>     /x84/x30/xc8/x39 ARABIC LETTER KIRGHIZ YU FINAL FORM
-+<UFBE4>     /x84/x30/xc9/x30 ARABIC LETTER E ISOLATED FORM
-+<UFBE5>     /x84/x30/xc9/x31 ARABIC LETTER E FINAL FORM
-+<UFBE6>     /x84/x30/xc9/x32 ARABIC LETTER E INITIAL FORM
-+<UFBE7>     /x84/x30/xc9/x33 ARABIC LETTER E MEDIAL FORM
-+<UFBE8>     /x84/x30/xc9/x34 ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA INITIAL FORM
-+<UFBE9>     /x84/x30/xc9/x35 ARABIC LETTER UIGHUR KAZAKH KIRGHIZ ALEF MAKSURA MEDIAL FORM
-+<UFBEA>     /x84/x30/xc9/x36 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF ISOLATED FORM
-+<UFBEB>     /x84/x30/xc9/x37 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF FINAL FORM
-+<UFBEC>     /x84/x30/xc9/x38 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE ISOLATED FORM
-+<UFBED>     /x84/x30/xc9/x39 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH AE FINAL FORM
-+<UFBEE>     /x84/x30/xca/x30 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW ISOLATED FORM
-+<UFBEF>     /x84/x30/xca/x31 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH WAW FINAL FORM
-+<UFBF0>     /x84/x30/xca/x32 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U ISOLATED FORM
-+<UFBF1>     /x84/x30/xca/x33 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH U FINAL FORM
-+<UFBF2>     /x84/x30/xca/x34 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE ISOLATED FORM
-+<UFBF3>     /x84/x30/xca/x35 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH OE FINAL FORM
-+<UFBF4>     /x84/x30/xca/x36 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU ISOLATED FORM
-+<UFBF5>     /x84/x30/xca/x37 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YU FINAL FORM
-+<UFBF6>     /x84/x30/xca/x38 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E ISOLATED FORM
-+<UFBF7>     /x84/x30/xca/x39 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E FINAL FORM
-+<UFBF8>     /x84/x30/xcb/x30 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH E INITIAL FORM
-+<UFBF9>     /x84/x30/xcb/x31 ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM
-+<UFBFA>     /x84/x30/xcb/x32 ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM
-+<UFBFB>     /x84/x30/xcb/x33 ARABIC LIGATURE UIGHUR KIRGHIZ YEH WITH HAMZA ABOVE WITH ALEF MAKSURA INITIAL FORM
-+<UFBFC>     /x84/x30/xcb/x34 ARABIC LETTER FARSI YEH ISOLATED FORM
-+<UFBFD>     /x84/x30/xcb/x35 ARABIC LETTER FARSI YEH FINAL FORM
-+<UFBFE>     /x84/x30/xcb/x36 ARABIC LETTER FARSI YEH INITIAL FORM
-+<UFBFF>     /x84/x30/xcb/x37 ARABIC LETTER FARSI YEH MEDIAL FORM
-+<UFC00>     /x84/x30/xcb/x38 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM ISOLATED FORM
-+<UFC01>     /x84/x30/xcb/x39 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH ISOLATED FORM
-+<UFC02>     /x84/x30/xcc/x30 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM ISOLATED FORM
-+<UFC03>     /x84/x30/xcc/x31 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA ISOLATED FORM
-+<UFC04>     /x84/x30/xcc/x32 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH ISOLATED FORM
-+<UFC05>     /x84/x30/xcc/x33 ARABIC LIGATURE BEH WITH JEEM ISOLATED FORM
-+<UFC06>     /x84/x30/xcc/x34 ARABIC LIGATURE BEH WITH HAH ISOLATED FORM
-+<UFC07>     /x84/x30/xcc/x35 ARABIC LIGATURE BEH WITH KHAH ISOLATED FORM
-+<UFC08>     /x84/x30/xcc/x36 ARABIC LIGATURE BEH WITH MEEM ISOLATED FORM
-+<UFC09>     /x84/x30/xcc/x37 ARABIC LIGATURE BEH WITH ALEF MAKSURA ISOLATED FORM
-+<UFC0A>     /x84/x30/xcc/x38 ARABIC LIGATURE BEH WITH YEH ISOLATED FORM
-+<UFC0B>     /x84/x30/xcc/x39 ARABIC LIGATURE TEH WITH JEEM ISOLATED FORM
-+<UFC0C>     /x84/x30/xcd/x30 ARABIC LIGATURE TEH WITH HAH ISOLATED FORM
-+<UFC0D>     /x84/x30/xcd/x31 ARABIC LIGATURE TEH WITH KHAH ISOLATED FORM
-+<UFC0E>     /x84/x30/xcd/x32 ARABIC LIGATURE TEH WITH MEEM ISOLATED FORM
-+<UFC0F>     /x84/x30/xcd/x33 ARABIC LIGATURE TEH WITH ALEF MAKSURA ISOLATED FORM
-+<UFC10>     /x84/x30/xcd/x34 ARABIC LIGATURE TEH WITH YEH ISOLATED FORM
-+<UFC11>     /x84/x30/xcd/x35 ARABIC LIGATURE THEH WITH JEEM ISOLATED FORM
-+<UFC12>     /x84/x30/xcd/x36 ARABIC LIGATURE THEH WITH MEEM ISOLATED FORM
-+<UFC13>     /x84/x30/xcd/x37 ARABIC LIGATURE THEH WITH ALEF MAKSURA ISOLATED FORM
-+<UFC14>     /x84/x30/xcd/x38 ARABIC LIGATURE THEH WITH YEH ISOLATED FORM
-+<UFC15>     /x84/x30/xcd/x39 ARABIC LIGATURE JEEM WITH HAH ISOLATED FORM
-+<UFC16>     /x84/x30/xce/x30 ARABIC LIGATURE JEEM WITH MEEM ISOLATED FORM
-+<UFC17>     /x84/x30/xce/x31 ARABIC LIGATURE HAH WITH JEEM ISOLATED FORM
-+<UFC18>     /x84/x30/xce/x32 ARABIC LIGATURE HAH WITH MEEM ISOLATED FORM
-+<UFC19>     /x84/x30/xce/x33 ARABIC LIGATURE KHAH WITH JEEM ISOLATED FORM
-+<UFC1A>     /x84/x30/xce/x34 ARABIC LIGATURE KHAH WITH HAH ISOLATED FORM
-+<UFC1B>     /x84/x30/xce/x35 ARABIC LIGATURE KHAH WITH MEEM ISOLATED FORM
-+<UFC1C>     /x84/x30/xce/x36 ARABIC LIGATURE SEEN WITH JEEM ISOLATED FORM
-+<UFC1D>     /x84/x30/xce/x37 ARABIC LIGATURE SEEN WITH HAH ISOLATED FORM
-+<UFC1E>     /x84/x30/xce/x38 ARABIC LIGATURE SEEN WITH KHAH ISOLATED FORM
-+<UFC1F>     /x84/x30/xce/x39 ARABIC LIGATURE SEEN WITH MEEM ISOLATED FORM
-+<UFC20>     /x84/x30/xcf/x30 ARABIC LIGATURE SAD WITH HAH ISOLATED FORM
-+<UFC21>     /x84/x30/xcf/x31 ARABIC LIGATURE SAD WITH MEEM ISOLATED FORM
-+<UFC22>     /x84/x30/xcf/x32 ARABIC LIGATURE DAD WITH JEEM ISOLATED FORM
-+<UFC23>     /x84/x30/xcf/x33 ARABIC LIGATURE DAD WITH HAH ISOLATED FORM
-+<UFC24>     /x84/x30/xcf/x34 ARABIC LIGATURE DAD WITH KHAH ISOLATED FORM
-+<UFC25>     /x84/x30/xcf/x35 ARABIC LIGATURE DAD WITH MEEM ISOLATED FORM
-+<UFC26>     /x84/x30/xcf/x36 ARABIC LIGATURE TAH WITH HAH ISOLATED FORM
-+<UFC27>     /x84/x30/xcf/x37 ARABIC LIGATURE TAH WITH MEEM ISOLATED FORM
-+<UFC28>     /x84/x30/xcf/x38 ARABIC LIGATURE ZAH WITH MEEM ISOLATED FORM
-+<UFC29>     /x84/x30/xcf/x39 ARABIC LIGATURE AIN WITH JEEM ISOLATED FORM
-+<UFC2A>     /x84/x30/xd0/x30 ARABIC LIGATURE AIN WITH MEEM ISOLATED FORM
-+<UFC2B>     /x84/x30/xd0/x31 ARABIC LIGATURE GHAIN WITH JEEM ISOLATED FORM
-+<UFC2C>     /x84/x30/xd0/x32 ARABIC LIGATURE GHAIN WITH MEEM ISOLATED FORM
-+<UFC2D>     /x84/x30/xd0/x33 ARABIC LIGATURE FEH WITH JEEM ISOLATED FORM
-+<UFC2E>     /x84/x30/xd0/x34 ARABIC LIGATURE FEH WITH HAH ISOLATED FORM
-+<UFC2F>     /x84/x30/xd0/x35 ARABIC LIGATURE FEH WITH KHAH ISOLATED FORM
-+<UFC30>     /x84/x30/xd0/x36 ARABIC LIGATURE FEH WITH MEEM ISOLATED FORM
-+<UFC31>     /x84/x30/xd0/x37 ARABIC LIGATURE FEH WITH ALEF MAKSURA ISOLATED FORM
-+<UFC32>     /x84/x30/xd0/x38 ARABIC LIGATURE FEH WITH YEH ISOLATED FORM
-+<UFC33>     /x84/x30/xd0/x39 ARABIC LIGATURE QAF WITH HAH ISOLATED FORM
-+<UFC34>     /x84/x30/xd1/x30 ARABIC LIGATURE QAF WITH MEEM ISOLATED FORM
-+<UFC35>     /x84/x30/xd1/x31 ARABIC LIGATURE QAF WITH ALEF MAKSURA ISOLATED FORM
-+<UFC36>     /x84/x30/xd1/x32 ARABIC LIGATURE QAF WITH YEH ISOLATED FORM
-+<UFC37>     /x84/x30/xd1/x33 ARABIC LIGATURE KAF WITH ALEF ISOLATED FORM
-+<UFC38>     /x84/x30/xd1/x34 ARABIC LIGATURE KAF WITH JEEM ISOLATED FORM
-+<UFC39>     /x84/x30/xd1/x35 ARABIC LIGATURE KAF WITH HAH ISOLATED FORM
-+<UFC3A>     /x84/x30/xd1/x36 ARABIC LIGATURE KAF WITH KHAH ISOLATED FORM
-+<UFC3B>     /x84/x30/xd1/x37 ARABIC LIGATURE KAF WITH LAM ISOLATED FORM
-+<UFC3C>     /x84/x30/xd1/x38 ARABIC LIGATURE KAF WITH MEEM ISOLATED FORM
-+<UFC3D>     /x84/x30/xd1/x39 ARABIC LIGATURE KAF WITH ALEF MAKSURA ISOLATED FORM
-+<UFC3E>     /x84/x30/xd2/x30 ARABIC LIGATURE KAF WITH YEH ISOLATED FORM
-+<UFC3F>     /x84/x30/xd2/x31 ARABIC LIGATURE LAM WITH JEEM ISOLATED FORM
-+<UFC40>     /x84/x30/xd2/x32 ARABIC LIGATURE LAM WITH HAH ISOLATED FORM
-+<UFC41>     /x84/x30/xd2/x33 ARABIC LIGATURE LAM WITH KHAH ISOLATED FORM
-+<UFC42>     /x84/x30/xd2/x34 ARABIC LIGATURE LAM WITH MEEM ISOLATED FORM
-+<UFC43>     /x84/x30/xd2/x35 ARABIC LIGATURE LAM WITH ALEF MAKSURA ISOLATED FORM
-+<UFC44>     /x84/x30/xd2/x36 ARABIC LIGATURE LAM WITH YEH ISOLATED FORM
-+<UFC45>     /x84/x30/xd2/x37 ARABIC LIGATURE MEEM WITH JEEM ISOLATED FORM
-+<UFC46>     /x84/x30/xd2/x38 ARABIC LIGATURE MEEM WITH HAH ISOLATED FORM
-+<UFC47>     /x84/x30/xd2/x39 ARABIC LIGATURE MEEM WITH KHAH ISOLATED FORM
-+<UFC48>     /x84/x30/xd3/x30 ARABIC LIGATURE MEEM WITH MEEM ISOLATED FORM
-+<UFC49>     /x84/x30/xd3/x31 ARABIC LIGATURE MEEM WITH ALEF MAKSURA ISOLATED FORM
-+<UFC4A>     /x84/x30/xd3/x32 ARABIC LIGATURE MEEM WITH YEH ISOLATED FORM
-+<UFC4B>     /x84/x30/xd3/x33 ARABIC LIGATURE NOON WITH JEEM ISOLATED FORM
-+<UFC4C>     /x84/x30/xd3/x34 ARABIC LIGATURE NOON WITH HAH ISOLATED FORM
-+<UFC4D>     /x84/x30/xd3/x35 ARABIC LIGATURE NOON WITH KHAH ISOLATED FORM
-+<UFC4E>     /x84/x30/xd3/x36 ARABIC LIGATURE NOON WITH MEEM ISOLATED FORM
-+<UFC4F>     /x84/x30/xd3/x37 ARABIC LIGATURE NOON WITH ALEF MAKSURA ISOLATED FORM
-+<UFC50>     /x84/x30/xd3/x38 ARABIC LIGATURE NOON WITH YEH ISOLATED FORM
-+<UFC51>     /x84/x30/xd3/x39 ARABIC LIGATURE HEH WITH JEEM ISOLATED FORM
-+<UFC52>     /x84/x30/xd4/x30 ARABIC LIGATURE HEH WITH MEEM ISOLATED FORM
-+<UFC53>     /x84/x30/xd4/x31 ARABIC LIGATURE HEH WITH ALEF MAKSURA ISOLATED FORM
-+<UFC54>     /x84/x30/xd4/x32 ARABIC LIGATURE HEH WITH YEH ISOLATED FORM
-+<UFC55>     /x84/x30/xd4/x33 ARABIC LIGATURE YEH WITH JEEM ISOLATED FORM
-+<UFC56>     /x84/x30/xd4/x34 ARABIC LIGATURE YEH WITH HAH ISOLATED FORM
-+<UFC57>     /x84/x30/xd4/x35 ARABIC LIGATURE YEH WITH KHAH ISOLATED FORM
-+<UFC58>     /x84/x30/xd4/x36 ARABIC LIGATURE YEH WITH MEEM ISOLATED FORM
-+<UFC59>     /x84/x30/xd4/x37 ARABIC LIGATURE YEH WITH ALEF MAKSURA ISOLATED FORM
-+<UFC5A>     /x84/x30/xd4/x38 ARABIC LIGATURE YEH WITH YEH ISOLATED FORM
-+<UFC5B>     /x84/x30/xd4/x39 ARABIC LIGATURE THAL WITH SUPERSCRIPT ALEF ISOLATED FORM
-+<UFC5C>     /x84/x30/xd5/x30 ARABIC LIGATURE REH WITH SUPERSCRIPT ALEF ISOLATED FORM
-+<UFC5D>     /x84/x30/xd5/x31 ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF ISOLATED FORM
-+<UFC5E>     /x84/x30/xd5/x32 ARABIC LIGATURE SHADDA WITH DAMMATAN ISOLATED FORM
-+<UFC5F>     /x84/x30/xd5/x33 ARABIC LIGATURE SHADDA WITH KASRATAN ISOLATED FORM
-+<UFC60>     /x84/x30/xd5/x34 ARABIC LIGATURE SHADDA WITH FATHA ISOLATED FORM
-+<UFC61>     /x84/x30/xd5/x35 ARABIC LIGATURE SHADDA WITH DAMMA ISOLATED FORM
-+<UFC62>     /x84/x30/xd5/x36 ARABIC LIGATURE SHADDA WITH KASRA ISOLATED FORM
-+<UFC63>     /x84/x30/xd5/x37 ARABIC LIGATURE SHADDA WITH SUPERSCRIPT ALEF ISOLATED FORM
-+<UFC64>     /x84/x30/xd5/x38 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH REH FINAL FORM
-+<UFC65>     /x84/x30/xd5/x39 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ZAIN FINAL FORM
-+<UFC66>     /x84/x30/xd6/x30 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM FINAL FORM
-+<UFC67>     /x84/x30/xd6/x31 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH NOON FINAL FORM
-+<UFC68>     /x84/x30/xd6/x32 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH ALEF MAKSURA FINAL FORM
-+<UFC69>     /x84/x30/xd6/x33 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH YEH FINAL FORM
-+<UFC6A>     /x84/x30/xd6/x34 ARABIC LIGATURE BEH WITH REH FINAL FORM
-+<UFC6B>     /x84/x30/xd6/x35 ARABIC LIGATURE BEH WITH ZAIN FINAL FORM
-+<UFC6C>     /x84/x30/xd6/x36 ARABIC LIGATURE BEH WITH MEEM FINAL FORM
-+<UFC6D>     /x84/x30/xd6/x37 ARABIC LIGATURE BEH WITH NOON FINAL FORM
-+<UFC6E>     /x84/x30/xd6/x38 ARABIC LIGATURE BEH WITH ALEF MAKSURA FINAL FORM
-+<UFC6F>     /x84/x30/xd6/x39 ARABIC LIGATURE BEH WITH YEH FINAL FORM
-+<UFC70>     /x84/x30/xd7/x30 ARABIC LIGATURE TEH WITH REH FINAL FORM
-+<UFC71>     /x84/x30/xd7/x31 ARABIC LIGATURE TEH WITH ZAIN FINAL FORM
-+<UFC72>     /x84/x30/xd7/x32 ARABIC LIGATURE TEH WITH MEEM FINAL FORM
-+<UFC73>     /x84/x30/xd7/x33 ARABIC LIGATURE TEH WITH NOON FINAL FORM
-+<UFC74>     /x84/x30/xd7/x34 ARABIC LIGATURE TEH WITH ALEF MAKSURA FINAL FORM
-+<UFC75>     /x84/x30/xd7/x35 ARABIC LIGATURE TEH WITH YEH FINAL FORM
-+<UFC76>     /x84/x30/xd7/x36 ARABIC LIGATURE THEH WITH REH FINAL FORM
-+<UFC77>     /x84/x30/xd7/x37 ARABIC LIGATURE THEH WITH ZAIN FINAL FORM
-+<UFC78>     /x84/x30/xd7/x38 ARABIC LIGATURE THEH WITH MEEM FINAL FORM
-+<UFC79>     /x84/x30/xd7/x39 ARABIC LIGATURE THEH WITH NOON FINAL FORM
-+<UFC7A>     /x84/x30/xd8/x30 ARABIC LIGATURE THEH WITH ALEF MAKSURA FINAL FORM
-+<UFC7B>     /x84/x30/xd8/x31 ARABIC LIGATURE THEH WITH YEH FINAL FORM
-+<UFC7C>     /x84/x30/xd8/x32 ARABIC LIGATURE FEH WITH ALEF MAKSURA FINAL FORM
-+<UFC7D>     /x84/x30/xd8/x33 ARABIC LIGATURE FEH WITH YEH FINAL FORM
-+<UFC7E>     /x84/x30/xd8/x34 ARABIC LIGATURE QAF WITH ALEF MAKSURA FINAL FORM
-+<UFC7F>     /x84/x30/xd8/x35 ARABIC LIGATURE QAF WITH YEH FINAL FORM
-+<UFC80>     /x84/x30/xd8/x36 ARABIC LIGATURE KAF WITH ALEF FINAL FORM
-+<UFC81>     /x84/x30/xd8/x37 ARABIC LIGATURE KAF WITH LAM FINAL FORM
-+<UFC82>     /x84/x30/xd8/x38 ARABIC LIGATURE KAF WITH MEEM FINAL FORM
-+<UFC83>     /x84/x30/xd8/x39 ARABIC LIGATURE KAF WITH ALEF MAKSURA FINAL FORM
-+<UFC84>     /x84/x30/xd9/x30 ARABIC LIGATURE KAF WITH YEH FINAL FORM
-+<UFC85>     /x84/x30/xd9/x31 ARABIC LIGATURE LAM WITH MEEM FINAL FORM
-+<UFC86>     /x84/x30/xd9/x32 ARABIC LIGATURE LAM WITH ALEF MAKSURA FINAL FORM
-+<UFC87>     /x84/x30/xd9/x33 ARABIC LIGATURE LAM WITH YEH FINAL FORM
-+<UFC88>     /x84/x30/xd9/x34 ARABIC LIGATURE MEEM WITH ALEF FINAL FORM
-+<UFC89>     /x84/x30/xd9/x35 ARABIC LIGATURE MEEM WITH MEEM FINAL FORM
-+<UFC8A>     /x84/x30/xd9/x36 ARABIC LIGATURE NOON WITH REH FINAL FORM
-+<UFC8B>     /x84/x30/xd9/x37 ARABIC LIGATURE NOON WITH ZAIN FINAL FORM
-+<UFC8C>     /x84/x30/xd9/x38 ARABIC LIGATURE NOON WITH MEEM FINAL FORM
-+<UFC8D>     /x84/x30/xd9/x39 ARABIC LIGATURE NOON WITH NOON FINAL FORM
-+<UFC8E>     /x84/x30/xda/x30 ARABIC LIGATURE NOON WITH ALEF MAKSURA FINAL FORM
-+<UFC8F>     /x84/x30/xda/x31 ARABIC LIGATURE NOON WITH YEH FINAL FORM
-+<UFC90>     /x84/x30/xda/x32 ARABIC LIGATURE ALEF MAKSURA WITH SUPERSCRIPT ALEF FINAL FORM
-+<UFC91>     /x84/x30/xda/x33 ARABIC LIGATURE YEH WITH REH FINAL FORM
-+<UFC92>     /x84/x30/xda/x34 ARABIC LIGATURE YEH WITH ZAIN FINAL FORM
-+<UFC93>     /x84/x30/xda/x35 ARABIC LIGATURE YEH WITH MEEM FINAL FORM
-+<UFC94>     /x84/x30/xda/x36 ARABIC LIGATURE YEH WITH NOON FINAL FORM
-+<UFC95>     /x84/x30/xda/x37 ARABIC LIGATURE YEH WITH ALEF MAKSURA FINAL FORM
-+<UFC96>     /x84/x30/xda/x38 ARABIC LIGATURE YEH WITH YEH FINAL FORM
-+<UFC97>     /x84/x30/xda/x39 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH JEEM INITIAL FORM
-+<UFC98>     /x84/x30/xdb/x30 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HAH INITIAL FORM
-+<UFC99>     /x84/x30/xdb/x31 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH KHAH INITIAL FORM
-+<UFC9A>     /x84/x30/xdb/x32 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM INITIAL FORM
-+<UFC9B>     /x84/x30/xdb/x33 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH INITIAL FORM
-+<UFC9C>     /x84/x30/xdb/x34 ARABIC LIGATURE BEH WITH JEEM INITIAL FORM
-+<UFC9D>     /x84/x30/xdb/x35 ARABIC LIGATURE BEH WITH HAH INITIAL FORM
-+<UFC9E>     /x84/x30/xdb/x36 ARABIC LIGATURE BEH WITH KHAH INITIAL FORM
-+<UFC9F>     /x84/x30/xdb/x37 ARABIC LIGATURE BEH WITH MEEM INITIAL FORM
-+<UFCA0>     /x84/x30/xdb/x38 ARABIC LIGATURE BEH WITH HEH INITIAL FORM
-+<UFCA1>     /x84/x30/xdb/x39 ARABIC LIGATURE TEH WITH JEEM INITIAL FORM
-+<UFCA2>     /x84/x30/xdc/x30 ARABIC LIGATURE TEH WITH HAH INITIAL FORM
-+<UFCA3>     /x84/x30/xdc/x31 ARABIC LIGATURE TEH WITH KHAH INITIAL FORM
-+<UFCA4>     /x84/x30/xdc/x32 ARABIC LIGATURE TEH WITH MEEM INITIAL FORM
-+<UFCA5>     /x84/x30/xdc/x33 ARABIC LIGATURE TEH WITH HEH INITIAL FORM
-+<UFCA6>     /x84/x30/xdc/x34 ARABIC LIGATURE THEH WITH MEEM INITIAL FORM
-+<UFCA7>     /x84/x30/xdc/x35 ARABIC LIGATURE JEEM WITH HAH INITIAL FORM
-+<UFCA8>     /x84/x30/xdc/x36 ARABIC LIGATURE JEEM WITH MEEM INITIAL FORM
-+<UFCA9>     /x84/x30/xdc/x37 ARABIC LIGATURE HAH WITH JEEM INITIAL FORM
-+<UFCAA>     /x84/x30/xdc/x38 ARABIC LIGATURE HAH WITH MEEM INITIAL FORM
-+<UFCAB>     /x84/x30/xdc/x39 ARABIC LIGATURE KHAH WITH JEEM INITIAL FORM
-+<UFCAC>     /x84/x30/xdd/x30 ARABIC LIGATURE KHAH WITH MEEM INITIAL FORM
-+<UFCAD>     /x84/x30/xdd/x31 ARABIC LIGATURE SEEN WITH JEEM INITIAL FORM
-+<UFCAE>     /x84/x30/xdd/x32 ARABIC LIGATURE SEEN WITH HAH INITIAL FORM
-+<UFCAF>     /x84/x30/xdd/x33 ARABIC LIGATURE SEEN WITH KHAH INITIAL FORM
-+<UFCB0>     /x84/x30/xdd/x34 ARABIC LIGATURE SEEN WITH MEEM INITIAL FORM
-+<UFCB1>     /x84/x30/xdd/x35 ARABIC LIGATURE SAD WITH HAH INITIAL FORM
-+<UFCB2>     /x84/x30/xdd/x36 ARABIC LIGATURE SAD WITH KHAH INITIAL FORM
-+<UFCB3>     /x84/x30/xdd/x37 ARABIC LIGATURE SAD WITH MEEM INITIAL FORM
-+<UFCB4>     /x84/x30/xdd/x38 ARABIC LIGATURE DAD WITH JEEM INITIAL FORM
-+<UFCB5>     /x84/x30/xdd/x39 ARABIC LIGATURE DAD WITH HAH INITIAL FORM
-+<UFCB6>     /x84/x30/xde/x30 ARABIC LIGATURE DAD WITH KHAH INITIAL FORM
-+<UFCB7>     /x84/x30/xde/x31 ARABIC LIGATURE DAD WITH MEEM INITIAL FORM
-+<UFCB8>     /x84/x30/xde/x32 ARABIC LIGATURE TAH WITH HAH INITIAL FORM
-+<UFCB9>     /x84/x30/xde/x33 ARABIC LIGATURE ZAH WITH MEEM INITIAL FORM
-+<UFCBA>     /x84/x30/xde/x34 ARABIC LIGATURE AIN WITH JEEM INITIAL FORM
-+<UFCBB>     /x84/x30/xde/x35 ARABIC LIGATURE AIN WITH MEEM INITIAL FORM
-+<UFCBC>     /x84/x30/xde/x36 ARABIC LIGATURE GHAIN WITH JEEM INITIAL FORM
-+<UFCBD>     /x84/x30/xde/x37 ARABIC LIGATURE GHAIN WITH MEEM INITIAL FORM
-+<UFCBE>     /x84/x30/xde/x38 ARABIC LIGATURE FEH WITH JEEM INITIAL FORM
-+<UFCBF>     /x84/x30/xde/x39 ARABIC LIGATURE FEH WITH HAH INITIAL FORM
-+<UFCC0>     /x84/x30/xdf/x30 ARABIC LIGATURE FEH WITH KHAH INITIAL FORM
-+<UFCC1>     /x84/x30/xdf/x31 ARABIC LIGATURE FEH WITH MEEM INITIAL FORM
-+<UFCC2>     /x84/x30/xdf/x32 ARABIC LIGATURE QAF WITH HAH INITIAL FORM
-+<UFCC3>     /x84/x30/xdf/x33 ARABIC LIGATURE QAF WITH MEEM INITIAL FORM
-+<UFCC4>     /x84/x30/xdf/x34 ARABIC LIGATURE KAF WITH JEEM INITIAL FORM
-+<UFCC5>     /x84/x30/xdf/x35 ARABIC LIGATURE KAF WITH HAH INITIAL FORM
-+<UFCC6>     /x84/x30/xdf/x36 ARABIC LIGATURE KAF WITH KHAH INITIAL FORM
-+<UFCC7>     /x84/x30/xdf/x37 ARABIC LIGATURE KAF WITH LAM INITIAL FORM
-+<UFCC8>     /x84/x30/xdf/x38 ARABIC LIGATURE KAF WITH MEEM INITIAL FORM
-+<UFCC9>     /x84/x30/xdf/x39 ARABIC LIGATURE LAM WITH JEEM INITIAL FORM
-+<UFCCA>     /x84/x30/xe0/x30 ARABIC LIGATURE LAM WITH HAH INITIAL FORM
-+<UFCCB>     /x84/x30/xe0/x31 ARABIC LIGATURE LAM WITH KHAH INITIAL FORM
-+<UFCCC>     /x84/x30/xe0/x32 ARABIC LIGATURE LAM WITH MEEM INITIAL FORM
-+<UFCCD>     /x84/x30/xe0/x33 ARABIC LIGATURE LAM WITH HEH INITIAL FORM
-+<UFCCE>     /x84/x30/xe0/x34 ARABIC LIGATURE MEEM WITH JEEM INITIAL FORM
-+<UFCCF>     /x84/x30/xe0/x35 ARABIC LIGATURE MEEM WITH HAH INITIAL FORM
-+<UFCD0>     /x84/x30/xe0/x36 ARABIC LIGATURE MEEM WITH KHAH INITIAL FORM
-+<UFCD1>     /x84/x30/xe0/x37 ARABIC LIGATURE MEEM WITH MEEM INITIAL FORM
-+<UFCD2>     /x84/x30/xe0/x38 ARABIC LIGATURE NOON WITH JEEM INITIAL FORM
-+<UFCD3>     /x84/x30/xe0/x39 ARABIC LIGATURE NOON WITH HAH INITIAL FORM
-+<UFCD4>     /x84/x30/xe1/x30 ARABIC LIGATURE NOON WITH KHAH INITIAL FORM
-+<UFCD5>     /x84/x30/xe1/x31 ARABIC LIGATURE NOON WITH MEEM INITIAL FORM
-+<UFCD6>     /x84/x30/xe1/x32 ARABIC LIGATURE NOON WITH HEH INITIAL FORM
-+<UFCD7>     /x84/x30/xe1/x33 ARABIC LIGATURE HEH WITH JEEM INITIAL FORM
-+<UFCD8>     /x84/x30/xe1/x34 ARABIC LIGATURE HEH WITH MEEM INITIAL FORM
-+<UFCD9>     /x84/x30/xe1/x35 ARABIC LIGATURE HEH WITH SUPERSCRIPT ALEF INITIAL FORM
-+<UFCDA>     /x84/x30/xe1/x36 ARABIC LIGATURE YEH WITH JEEM INITIAL FORM
-+<UFCDB>     /x84/x30/xe1/x37 ARABIC LIGATURE YEH WITH HAH INITIAL FORM
-+<UFCDC>     /x84/x30/xe1/x38 ARABIC LIGATURE YEH WITH KHAH INITIAL FORM
-+<UFCDD>     /x84/x30/xe1/x39 ARABIC LIGATURE YEH WITH MEEM INITIAL FORM
-+<UFCDE>     /x84/x30/xe2/x30 ARABIC LIGATURE YEH WITH HEH INITIAL FORM
-+<UFCDF>     /x84/x30/xe2/x31 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH MEEM MEDIAL FORM
-+<UFCE0>     /x84/x30/xe2/x32 ARABIC LIGATURE YEH WITH HAMZA ABOVE WITH HEH MEDIAL FORM
-+<UFCE1>     /x84/x30/xe2/x33 ARABIC LIGATURE BEH WITH MEEM MEDIAL FORM
-+<UFCE2>     /x84/x30/xe2/x34 ARABIC LIGATURE BEH WITH HEH MEDIAL FORM
-+<UFCE3>     /x84/x30/xe2/x35 ARABIC LIGATURE TEH WITH MEEM MEDIAL FORM
-+<UFCE4>     /x84/x30/xe2/x36 ARABIC LIGATURE TEH WITH HEH MEDIAL FORM
-+<UFCE5>     /x84/x30/xe2/x37 ARABIC LIGATURE THEH WITH MEEM MEDIAL FORM
-+<UFCE6>     /x84/x30/xe2/x38 ARABIC LIGATURE THEH WITH HEH MEDIAL FORM
-+<UFCE7>     /x84/x30/xe2/x39 ARABIC LIGATURE SEEN WITH MEEM MEDIAL FORM
-+<UFCE8>     /x84/x30/xe3/x30 ARABIC LIGATURE SEEN WITH HEH MEDIAL FORM
-+<UFCE9>     /x84/x30/xe3/x31 ARABIC LIGATURE SHEEN WITH MEEM MEDIAL FORM
-+<UFCEA>     /x84/x30/xe3/x32 ARABIC LIGATURE SHEEN WITH HEH MEDIAL FORM
-+<UFCEB>     /x84/x30/xe3/x33 ARABIC LIGATURE KAF WITH LAM MEDIAL FORM
-+<UFCEC>     /x84/x30/xe3/x34 ARABIC LIGATURE KAF WITH MEEM MEDIAL FORM
-+<UFCED>     /x84/x30/xe3/x35 ARABIC LIGATURE LAM WITH MEEM MEDIAL FORM
-+<UFCEE>     /x84/x30/xe3/x36 ARABIC LIGATURE NOON WITH MEEM MEDIAL FORM
-+<UFCEF>     /x84/x30/xe3/x37 ARABIC LIGATURE NOON WITH HEH MEDIAL FORM
-+<UFCF0>     /x84/x30/xe3/x38 ARABIC LIGATURE YEH WITH MEEM MEDIAL FORM
-+<UFCF1>     /x84/x30/xe3/x39 ARABIC LIGATURE YEH WITH HEH MEDIAL FORM
-+<UFCF2>     /x84/x30/xe4/x30 ARABIC LIGATURE SHADDA WITH FATHA MEDIAL FORM
-+<UFCF3>     /x84/x30/xe4/x31 ARABIC LIGATURE SHADDA WITH DAMMA MEDIAL FORM
-+<UFCF4>     /x84/x30/xe4/x32 ARABIC LIGATURE SHADDA WITH KASRA MEDIAL FORM
-+<UFCF5>     /x84/x30/xe4/x33 ARABIC LIGATURE TAH WITH ALEF MAKSURA ISOLATED FORM
-+<UFCF6>     /x84/x30/xe4/x34 ARABIC LIGATURE TAH WITH YEH ISOLATED FORM
-+<UFCF7>     /x84/x30/xe4/x35 ARABIC LIGATURE AIN WITH ALEF MAKSURA ISOLATED FORM
-+<UFCF8>     /x84/x30/xe4/x36 ARABIC LIGATURE AIN WITH YEH ISOLATED FORM
-+<UFCF9>     /x84/x30/xe4/x37 ARABIC LIGATURE GHAIN WITH ALEF MAKSURA ISOLATED FORM
-+<UFCFA>     /x84/x30/xe4/x38 ARABIC LIGATURE GHAIN WITH YEH ISOLATED FORM
-+<UFCFB>     /x84/x30/xe4/x39 ARABIC LIGATURE SEEN WITH ALEF MAKSURA ISOLATED FORM
-+<UFCFC>     /x84/x30/xe5/x30 ARABIC LIGATURE SEEN WITH YEH ISOLATED FORM
-+<UFCFD>     /x84/x30/xe5/x31 ARABIC LIGATURE SHEEN WITH ALEF MAKSURA ISOLATED FORM
-+<UFCFE>     /x84/x30/xe5/x32 ARABIC LIGATURE SHEEN WITH YEH ISOLATED FORM
-+<UFCFF>     /x84/x30/xe5/x33 ARABIC LIGATURE HAH WITH ALEF MAKSURA ISOLATED FORM
-+<UFD00>     /x84/x30/xe5/x34 ARABIC LIGATURE HAH WITH YEH ISOLATED FORM
-+<UFD01>     /x84/x30/xe5/x35 ARABIC LIGATURE JEEM WITH ALEF MAKSURA ISOLATED FORM
-+<UFD02>     /x84/x30/xe5/x36 ARABIC LIGATURE JEEM WITH YEH ISOLATED FORM
-+<UFD03>     /x84/x30/xe5/x37 ARABIC LIGATURE KHAH WITH ALEF MAKSURA ISOLATED FORM
-+<UFD04>     /x84/x30/xe5/x38 ARABIC LIGATURE KHAH WITH YEH ISOLATED FORM
-+<UFD05>     /x84/x30/xe5/x39 ARABIC LIGATURE SAD WITH ALEF MAKSURA ISOLATED FORM
-+<UFD06>     /x84/x30/xe6/x30 ARABIC LIGATURE SAD WITH YEH ISOLATED FORM
-+<UFD07>     /x84/x30/xe6/x31 ARABIC LIGATURE DAD WITH ALEF MAKSURA ISOLATED FORM
-+<UFD08>     /x84/x30/xe6/x32 ARABIC LIGATURE DAD WITH YEH ISOLATED FORM
-+<UFD09>     /x84/x30/xe6/x33 ARABIC LIGATURE SHEEN WITH JEEM ISOLATED FORM
-+<UFD0A>     /x84/x30/xe6/x34 ARABIC LIGATURE SHEEN WITH HAH ISOLATED FORM
-+<UFD0B>     /x84/x30/xe6/x35 ARABIC LIGATURE SHEEN WITH KHAH ISOLATED FORM
-+<UFD0C>     /x84/x30/xe6/x36 ARABIC LIGATURE SHEEN WITH MEEM ISOLATED FORM
-+<UFD0D>     /x84/x30/xe6/x37 ARABIC LIGATURE SHEEN WITH REH ISOLATED FORM
-+<UFD0E>     /x84/x30/xe6/x38 ARABIC LIGATURE SEEN WITH REH ISOLATED FORM
-+<UFD0F>     /x84/x30/xe6/x39 ARABIC LIGATURE SAD WITH REH ISOLATED FORM
-+<UFD10>     /x84/x30/xe7/x30 ARABIC LIGATURE DAD WITH REH ISOLATED FORM
-+<UFD11>     /x84/x30/xe7/x31 ARABIC LIGATURE TAH WITH ALEF MAKSURA FINAL FORM
-+<UFD12>     /x84/x30/xe7/x32 ARABIC LIGATURE TAH WITH YEH FINAL FORM
-+<UFD13>     /x84/x30/xe7/x33 ARABIC LIGATURE AIN WITH ALEF MAKSURA FINAL FORM
-+<UFD14>     /x84/x30/xe7/x34 ARABIC LIGATURE AIN WITH YEH FINAL FORM
-+<UFD15>     /x84/x30/xe7/x35 ARABIC LIGATURE GHAIN WITH ALEF MAKSURA FINAL FORM
-+<UFD16>     /x84/x30/xe7/x36 ARABIC LIGATURE GHAIN WITH YEH FINAL FORM
-+<UFD17>     /x84/x30/xe7/x37 ARABIC LIGATURE SEEN WITH ALEF MAKSURA FINAL FORM
-+<UFD18>     /x84/x30/xe7/x38 ARABIC LIGATURE SEEN WITH YEH FINAL FORM
-+<UFD19>     /x84/x30/xe7/x39 ARABIC LIGATURE SHEEN WITH ALEF MAKSURA FINAL FORM
-+<UFD1A>     /x84/x30/xe8/x30 ARABIC LIGATURE SHEEN WITH YEH FINAL FORM
-+<UFD1B>     /x84/x30/xe8/x31 ARABIC LIGATURE HAH WITH ALEF MAKSURA FINAL FORM
-+<UFD1C>     /x84/x30/xe8/x32 ARABIC LIGATURE HAH WITH YEH FINAL FORM
-+<UFD1D>     /x84/x30/xe8/x33 ARABIC LIGATURE JEEM WITH ALEF MAKSURA FINAL FORM
-+<UFD1E>     /x84/x30/xe8/x34 ARABIC LIGATURE JEEM WITH YEH FINAL FORM
-+<UFD1F>     /x84/x30/xe8/x35 ARABIC LIGATURE KHAH WITH ALEF MAKSURA FINAL FORM
-+<UFD20>     /x84/x30/xe8/x36 ARABIC LIGATURE KHAH WITH YEH FINAL FORM
-+<UFD21>     /x84/x30/xe8/x37 ARABIC LIGATURE SAD WITH ALEF MAKSURA FINAL FORM
-+<UFD22>     /x84/x30/xe8/x38 ARABIC LIGATURE SAD WITH YEH FINAL FORM
-+<UFD23>     /x84/x30/xe8/x39 ARABIC LIGATURE DAD WITH ALEF MAKSURA FINAL FORM
-+<UFD24>     /x84/x30/xe9/x30 ARABIC LIGATURE DAD WITH YEH FINAL FORM
-+<UFD25>     /x84/x30/xe9/x31 ARABIC LIGATURE SHEEN WITH JEEM FINAL FORM
-+<UFD26>     /x84/x30/xe9/x32 ARABIC LIGATURE SHEEN WITH HAH FINAL FORM
-+<UFD27>     /x84/x30/xe9/x33 ARABIC LIGATURE SHEEN WITH KHAH FINAL FORM
-+<UFD28>     /x84/x30/xe9/x34 ARABIC LIGATURE SHEEN WITH MEEM FINAL FORM
-+<UFD29>     /x84/x30/xe9/x35 ARABIC LIGATURE SHEEN WITH REH FINAL FORM
-+<UFD2A>     /x84/x30/xe9/x36 ARABIC LIGATURE SEEN WITH REH FINAL FORM
-+<UFD2B>     /x84/x30/xe9/x37 ARABIC LIGATURE SAD WITH REH FINAL FORM
-+<UFD2C>     /x84/x30/xe9/x38 ARABIC LIGATURE DAD WITH REH FINAL FORM
-+<UFD2D>     /x84/x30/xe9/x39 ARABIC LIGATURE SHEEN WITH JEEM INITIAL FORM
-+<UFD2E>     /x84/x30/xea/x30 ARABIC LIGATURE SHEEN WITH HAH INITIAL FORM
-+<UFD2F>     /x84/x30/xea/x31 ARABIC LIGATURE SHEEN WITH KHAH INITIAL FORM
-+<UFD30>     /x84/x30/xea/x32 ARABIC LIGATURE SHEEN WITH MEEM INITIAL FORM
-+<UFD31>     /x84/x30/xea/x33 ARABIC LIGATURE SEEN WITH HEH INITIAL FORM
-+<UFD32>     /x84/x30/xea/x34 ARABIC LIGATURE SHEEN WITH HEH INITIAL FORM
-+<UFD33>     /x84/x30/xea/x35 ARABIC LIGATURE TAH WITH MEEM INITIAL FORM
-+<UFD34>     /x84/x30/xea/x36 ARABIC LIGATURE SEEN WITH JEEM MEDIAL FORM
-+<UFD35>     /x84/x30/xea/x37 ARABIC LIGATURE SEEN WITH HAH MEDIAL FORM
-+<UFD36>     /x84/x30/xea/x38 ARABIC LIGATURE SEEN WITH KHAH MEDIAL FORM
-+<UFD37>     /x84/x30/xea/x39 ARABIC LIGATURE SHEEN WITH JEEM MEDIAL FORM
-+<UFD38>     /x84/x30/xeb/x30 ARABIC LIGATURE SHEEN WITH HAH MEDIAL FORM
-+<UFD39>     /x84/x30/xeb/x31 ARABIC LIGATURE SHEEN WITH KHAH MEDIAL FORM
-+<UFD3A>     /x84/x30/xeb/x32 ARABIC LIGATURE TAH WITH MEEM MEDIAL FORM
-+<UFD3B>     /x84/x30/xeb/x33 ARABIC LIGATURE ZAH WITH MEEM MEDIAL FORM
-+<UFD3C>     /x84/x30/xeb/x34 ARABIC LIGATURE ALEF WITH FATHATAN FINAL FORM
-+<UFD3D>     /x84/x30/xeb/x35 ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM
-+<UFD3E>     /x84/x30/xeb/x36 ORNATE LEFT PARENTHESIS
-+<UFD3F>     /x84/x30/xeb/x37 ORNATE RIGHT PARENTHESIS
-+<UFD40>     /x84/x30/xeb/x38 <UNASSIGNED>
-+<UFD41>     /x84/x30/xeb/x39 <UNASSIGNED>
-+<UFD42>     /x84/x30/xec/x30 <UNASSIGNED>
-+<UFD43>     /x84/x30/xec/x31 <UNASSIGNED>
-+<UFD44>     /x84/x30/xec/x32 <UNASSIGNED>
-+<UFD45>     /x84/x30/xec/x33 <UNASSIGNED>
-+<UFD46>     /x84/x30/xec/x34 <UNASSIGNED>
-+<UFD47>     /x84/x30/xec/x35 <UNASSIGNED>
-+<UFD48>     /x84/x30/xec/x36 <UNASSIGNED>
-+<UFD49>     /x84/x30/xec/x37 <UNASSIGNED>
-+<UFD4A>     /x84/x30/xec/x38 <UNASSIGNED>
-+<UFD4B>     /x84/x30/xec/x39 <UNASSIGNED>
-+<UFD4C>     /x84/x30/xed/x30 <UNASSIGNED>
-+<UFD4D>     /x84/x30/xed/x31 <UNASSIGNED>
-+<UFD4E>     /x84/x30/xed/x32 <UNASSIGNED>
-+<UFD4F>     /x84/x30/xed/x33 <UNASSIGNED>
-+<UFD50>     /x84/x30/xed/x34 ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM
-+<UFD51>     /x84/x30/xed/x35 ARABIC LIGATURE TEH WITH HAH WITH JEEM FINAL FORM
-+<UFD52>     /x84/x30/xed/x36 ARABIC LIGATURE TEH WITH HAH WITH JEEM INITIAL FORM
-+<UFD53>     /x84/x30/xed/x37 ARABIC LIGATURE TEH WITH HAH WITH MEEM INITIAL FORM
-+<UFD54>     /x84/x30/xed/x38 ARABIC LIGATURE TEH WITH KHAH WITH MEEM INITIAL FORM
-+<UFD55>     /x84/x30/xed/x39 ARABIC LIGATURE TEH WITH MEEM WITH JEEM INITIAL FORM
-+<UFD56>     /x84/x30/xee/x30 ARABIC LIGATURE TEH WITH MEEM WITH HAH INITIAL FORM
-+<UFD57>     /x84/x30/xee/x31 ARABIC LIGATURE TEH WITH MEEM WITH KHAH INITIAL FORM
-+<UFD58>     /x84/x30/xee/x32 ARABIC LIGATURE JEEM WITH MEEM WITH HAH FINAL FORM
-+<UFD59>     /x84/x30/xee/x33 ARABIC LIGATURE JEEM WITH MEEM WITH HAH INITIAL FORM
-+<UFD5A>     /x84/x30/xee/x34 ARABIC LIGATURE HAH WITH MEEM WITH YEH FINAL FORM
-+<UFD5B>     /x84/x30/xee/x35 ARABIC LIGATURE HAH WITH MEEM WITH ALEF MAKSURA FINAL FORM
-+<UFD5C>     /x84/x30/xee/x36 ARABIC LIGATURE SEEN WITH HAH WITH JEEM INITIAL FORM
-+<UFD5D>     /x84/x30/xee/x37 ARABIC LIGATURE SEEN WITH JEEM WITH HAH INITIAL FORM
-+<UFD5E>     /x84/x30/xee/x38 ARABIC LIGATURE SEEN WITH JEEM WITH ALEF MAKSURA FINAL FORM
-+<UFD5F>     /x84/x30/xee/x39 ARABIC LIGATURE SEEN WITH MEEM WITH HAH FINAL FORM
-+<UFD60>     /x84/x30/xef/x30 ARABIC LIGATURE SEEN WITH MEEM WITH HAH INITIAL FORM
-+<UFD61>     /x84/x30/xef/x31 ARABIC LIGATURE SEEN WITH MEEM WITH JEEM INITIAL FORM
-+<UFD62>     /x84/x30/xef/x32 ARABIC LIGATURE SEEN WITH MEEM WITH MEEM FINAL FORM
-+<UFD63>     /x84/x30/xef/x33 ARABIC LIGATURE SEEN WITH MEEM WITH MEEM INITIAL FORM
-+<UFD64>     /x84/x30/xef/x34 ARABIC LIGATURE SAD WITH HAH WITH HAH FINAL FORM
-+<UFD65>     /x84/x30/xef/x35 ARABIC LIGATURE SAD WITH HAH WITH HAH INITIAL FORM
-+<UFD66>     /x84/x30/xef/x36 ARABIC LIGATURE SAD WITH MEEM WITH MEEM FINAL FORM
-+<UFD67>     /x84/x30/xef/x37 ARABIC LIGATURE SHEEN WITH HAH WITH MEEM FINAL FORM
-+<UFD68>     /x84/x30/xef/x38 ARABIC LIGATURE SHEEN WITH HAH WITH MEEM INITIAL FORM
-+<UFD69>     /x84/x30/xef/x39 ARABIC LIGATURE SHEEN WITH JEEM WITH YEH FINAL FORM
-+<UFD6A>     /x84/x30/xf0/x30 ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH FINAL FORM
-+<UFD6B>     /x84/x30/xf0/x31 ARABIC LIGATURE SHEEN WITH MEEM WITH KHAH INITIAL FORM
-+<UFD6C>     /x84/x30/xf0/x32 ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM FINAL FORM
-+<UFD6D>     /x84/x30/xf0/x33 ARABIC LIGATURE SHEEN WITH MEEM WITH MEEM INITIAL FORM
-+<UFD6E>     /x84/x30/xf0/x34 ARABIC LIGATURE DAD WITH HAH WITH ALEF MAKSURA FINAL FORM
-+<UFD6F>     /x84/x30/xf0/x35 ARABIC LIGATURE DAD WITH KHAH WITH MEEM FINAL FORM
-+<UFD70>     /x84/x30/xf0/x36 ARABIC LIGATURE DAD WITH KHAH WITH MEEM INITIAL FORM
-+<UFD71>     /x84/x30/xf0/x37 ARABIC LIGATURE TAH WITH MEEM WITH HAH FINAL FORM
-+<UFD72>     /x84/x30/xf0/x38 ARABIC LIGATURE TAH WITH MEEM WITH HAH INITIAL FORM
-+<UFD73>     /x84/x30/xf0/x39 ARABIC LIGATURE TAH WITH MEEM WITH MEEM INITIAL FORM
-+<UFD74>     /x84/x30/xf1/x30 ARABIC LIGATURE TAH WITH MEEM WITH YEH FINAL FORM
-+<UFD75>     /x84/x30/xf1/x31 ARABIC LIGATURE AIN WITH JEEM WITH MEEM FINAL FORM
-+<UFD76>     /x84/x30/xf1/x32 ARABIC LIGATURE AIN WITH MEEM WITH MEEM FINAL FORM
-+<UFD77>     /x84/x30/xf1/x33 ARABIC LIGATURE AIN WITH MEEM WITH MEEM INITIAL FORM
-+<UFD78>     /x84/x30/xf1/x34 ARABIC LIGATURE AIN WITH MEEM WITH ALEF MAKSURA FINAL FORM
-+<UFD79>     /x84/x30/xf1/x35 ARABIC LIGATURE GHAIN WITH MEEM WITH MEEM FINAL FORM
-+<UFD7A>     /x84/x30/xf1/x36 ARABIC LIGATURE GHAIN WITH MEEM WITH YEH FINAL FORM
-+<UFD7B>     /x84/x30/xf1/x37 ARABIC LIGATURE GHAIN WITH MEEM WITH ALEF MAKSURA FINAL FORM
-+<UFD7C>     /x84/x30/xf1/x38 ARABIC LIGATURE FEH WITH KHAH WITH MEEM FINAL FORM
-+<UFD7D>     /x84/x30/xf1/x39 ARABIC LIGATURE FEH WITH KHAH WITH MEEM INITIAL FORM
-+<UFD7E>     /x84/x30/xf2/x30 ARABIC LIGATURE QAF WITH MEEM WITH HAH FINAL FORM
-+<UFD7F>     /x84/x30/xf2/x31 ARABIC LIGATURE QAF WITH MEEM WITH MEEM FINAL FORM
-+<UFD80>     /x84/x30/xf2/x32 ARABIC LIGATURE LAM WITH HAH WITH MEEM FINAL FORM
-+<UFD81>     /x84/x30/xf2/x33 ARABIC LIGATURE LAM WITH HAH WITH YEH FINAL FORM
-+<UFD82>     /x84/x30/xf2/x34 ARABIC LIGATURE LAM WITH HAH WITH ALEF MAKSURA FINAL FORM
-+<UFD83>     /x84/x30/xf2/x35 ARABIC LIGATURE LAM WITH JEEM WITH JEEM INITIAL FORM
-+<UFD84>     /x84/x30/xf2/x36 ARABIC LIGATURE LAM WITH JEEM WITH JEEM FINAL FORM
-+<UFD85>     /x84/x30/xf2/x37 ARABIC LIGATURE LAM WITH KHAH WITH MEEM FINAL FORM
-+<UFD86>     /x84/x30/xf2/x38 ARABIC LIGATURE LAM WITH KHAH WITH MEEM INITIAL FORM
-+<UFD87>     /x84/x30/xf2/x39 ARABIC LIGATURE LAM WITH MEEM WITH HAH FINAL FORM
-+<UFD88>     /x84/x30/xf3/x30 ARABIC LIGATURE LAM WITH MEEM WITH HAH INITIAL FORM
-+<UFD89>     /x84/x30/xf3/x31 ARABIC LIGATURE MEEM WITH HAH WITH JEEM INITIAL FORM
-+<UFD8A>     /x84/x30/xf3/x32 ARABIC LIGATURE MEEM WITH HAH WITH MEEM INITIAL FORM
-+<UFD8B>     /x84/x30/xf3/x33 ARABIC LIGATURE MEEM WITH HAH WITH YEH FINAL FORM
-+<UFD8C>     /x84/x30/xf3/x34 ARABIC LIGATURE MEEM WITH JEEM WITH HAH INITIAL FORM
-+<UFD8D>     /x84/x30/xf3/x35 ARABIC LIGATURE MEEM WITH JEEM WITH MEEM INITIAL FORM
-+<UFD8E>     /x84/x30/xf3/x36 ARABIC LIGATURE MEEM WITH KHAH WITH JEEM INITIAL FORM
-+<UFD8F>     /x84/x30/xf3/x37 ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM
-+<UFD90>     /x84/x30/xf3/x38 <UNASSIGNED>
-+<UFD91>     /x84/x30/xf3/x39 <UNASSIGNED>
-+<UFD92>     /x84/x30/xf4/x30 ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM
-+<UFD93>     /x84/x30/xf4/x31 ARABIC LIGATURE HEH WITH MEEM WITH JEEM INITIAL FORM
-+<UFD94>     /x84/x30/xf4/x32 ARABIC LIGATURE HEH WITH MEEM WITH MEEM INITIAL FORM
-+<UFD95>     /x84/x30/xf4/x33 ARABIC LIGATURE NOON WITH HAH WITH MEEM INITIAL FORM
-+<UFD96>     /x84/x30/xf4/x34 ARABIC LIGATURE NOON WITH HAH WITH ALEF MAKSURA FINAL FORM
-+<UFD97>     /x84/x30/xf4/x35 ARABIC LIGATURE NOON WITH JEEM WITH MEEM FINAL FORM
-+<UFD98>     /x84/x30/xf4/x36 ARABIC LIGATURE NOON WITH JEEM WITH MEEM INITIAL FORM
-+<UFD99>     /x84/x30/xf4/x37 ARABIC LIGATURE NOON WITH JEEM WITH ALEF MAKSURA FINAL FORM
-+<UFD9A>     /x84/x30/xf4/x38 ARABIC LIGATURE NOON WITH MEEM WITH YEH FINAL FORM
-+<UFD9B>     /x84/x30/xf4/x39 ARABIC LIGATURE NOON WITH MEEM WITH ALEF MAKSURA FINAL FORM
-+<UFD9C>     /x84/x30/xf5/x30 ARABIC LIGATURE YEH WITH MEEM WITH MEEM FINAL FORM
-+<UFD9D>     /x84/x30/xf5/x31 ARABIC LIGATURE YEH WITH MEEM WITH MEEM INITIAL FORM
-+<UFD9E>     /x84/x30/xf5/x32 ARABIC LIGATURE BEH WITH KHAH WITH YEH FINAL FORM
-+<UFD9F>     /x84/x30/xf5/x33 ARABIC LIGATURE TEH WITH JEEM WITH YEH FINAL FORM
-+<UFDA0>     /x84/x30/xf5/x34 ARABIC LIGATURE TEH WITH JEEM WITH ALEF MAKSURA FINAL FORM
-+<UFDA1>     /x84/x30/xf5/x35 ARABIC LIGATURE TEH WITH KHAH WITH YEH FINAL FORM
-+<UFDA2>     /x84/x30/xf5/x36 ARABIC LIGATURE TEH WITH KHAH WITH ALEF MAKSURA FINAL FORM
-+<UFDA3>     /x84/x30/xf5/x37 ARABIC LIGATURE TEH WITH MEEM WITH YEH FINAL FORM
-+<UFDA4>     /x84/x30/xf5/x38 ARABIC LIGATURE TEH WITH MEEM WITH ALEF MAKSURA FINAL FORM
-+<UFDA5>     /x84/x30/xf5/x39 ARABIC LIGATURE JEEM WITH MEEM WITH YEH FINAL FORM
-+<UFDA6>     /x84/x30/xf6/x30 ARABIC LIGATURE JEEM WITH HAH WITH ALEF MAKSURA FINAL FORM
-+<UFDA7>     /x84/x30/xf6/x31 ARABIC LIGATURE JEEM WITH MEEM WITH ALEF MAKSURA FINAL FORM
-+<UFDA8>     /x84/x30/xf6/x32 ARABIC LIGATURE SEEN WITH KHAH WITH ALEF MAKSURA FINAL FORM
-+<UFDA9>     /x84/x30/xf6/x33 ARABIC LIGATURE SAD WITH HAH WITH YEH FINAL FORM
-+<UFDAA>     /x84/x30/xf6/x34 ARABIC LIGATURE SHEEN WITH HAH WITH YEH FINAL FORM
-+<UFDAB>     /x84/x30/xf6/x35 ARABIC LIGATURE DAD WITH HAH WITH YEH FINAL FORM
-+<UFDAC>     /x84/x30/xf6/x36 ARABIC LIGATURE LAM WITH JEEM WITH YEH FINAL FORM
-+<UFDAD>     /x84/x30/xf6/x37 ARABIC LIGATURE LAM WITH MEEM WITH YEH FINAL FORM
-+<UFDAE>     /x84/x30/xf6/x38 ARABIC LIGATURE YEH WITH HAH WITH YEH FINAL FORM
-+<UFDAF>     /x84/x30/xf6/x39 ARABIC LIGATURE YEH WITH JEEM WITH YEH FINAL FORM
-+<UFDB0>     /x84/x30/xf7/x30 ARABIC LIGATURE YEH WITH MEEM WITH YEH FINAL FORM
-+<UFDB1>     /x84/x30/xf7/x31 ARABIC LIGATURE MEEM WITH MEEM WITH YEH FINAL FORM
-+<UFDB2>     /x84/x30/xf7/x32 ARABIC LIGATURE QAF WITH MEEM WITH YEH FINAL FORM
-+<UFDB3>     /x84/x30/xf7/x33 ARABIC LIGATURE NOON WITH HAH WITH YEH FINAL FORM
-+<UFDB4>     /x84/x30/xf7/x34 ARABIC LIGATURE QAF WITH MEEM WITH HAH INITIAL FORM
-+<UFDB5>     /x84/x30/xf7/x35 ARABIC LIGATURE LAM WITH HAH WITH MEEM INITIAL FORM
-+<UFDB6>     /x84/x30/xf7/x36 ARABIC LIGATURE AIN WITH MEEM WITH YEH FINAL FORM
-+<UFDB7>     /x84/x30/xf7/x37 ARABIC LIGATURE KAF WITH MEEM WITH YEH FINAL FORM
-+<UFDB8>     /x84/x30/xf7/x38 ARABIC LIGATURE NOON WITH JEEM WITH HAH INITIAL FORM
-+<UFDB9>     /x84/x30/xf7/x39 ARABIC LIGATURE MEEM WITH KHAH WITH YEH FINAL FORM
-+<UFDBA>     /x84/x30/xf8/x30 ARABIC LIGATURE LAM WITH JEEM WITH MEEM INITIAL FORM
-+<UFDBB>     /x84/x30/xf8/x31 ARABIC LIGATURE KAF WITH MEEM WITH MEEM FINAL FORM
-+<UFDBC>     /x84/x30/xf8/x32 ARABIC LIGATURE LAM WITH JEEM WITH MEEM FINAL FORM
-+<UFDBD>     /x84/x30/xf8/x33 ARABIC LIGATURE NOON WITH JEEM WITH HAH FINAL FORM
-+<UFDBE>     /x84/x30/xf8/x34 ARABIC LIGATURE JEEM WITH HAH WITH YEH FINAL FORM
-+<UFDBF>     /x84/x30/xf8/x35 ARABIC LIGATURE HAH WITH JEEM WITH YEH FINAL FORM
-+<UFDC0>     /x84/x30/xf8/x36 ARABIC LIGATURE MEEM WITH JEEM WITH YEH FINAL FORM
-+<UFDC1>     /x84/x30/xf8/x37 ARABIC LIGATURE FEH WITH MEEM WITH YEH FINAL FORM
-+<UFDC2>     /x84/x30/xf8/x38 ARABIC LIGATURE BEH WITH HAH WITH YEH FINAL FORM
-+<UFDC3>     /x84/x30/xf8/x39 ARABIC LIGATURE KAF WITH MEEM WITH MEEM INITIAL FORM
-+<UFDC4>     /x84/x30/xf9/x30 ARABIC LIGATURE AIN WITH JEEM WITH MEEM INITIAL FORM
-+<UFDC5>     /x84/x30/xf9/x31 ARABIC LIGATURE SAD WITH MEEM WITH MEEM INITIAL FORM
-+<UFDC6>     /x84/x30/xf9/x32 ARABIC LIGATURE SEEN WITH KHAH WITH YEH FINAL FORM
-+<UFDC7>     /x84/x30/xf9/x33 ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM
-+<UFDC8>     /x84/x30/xf9/x34 <UNASSIGNED>
-+<UFDC9>     /x84/x30/xf9/x35 <UNASSIGNED>
-+<UFDCA>     /x84/x30/xf9/x36 <UNASSIGNED>
-+<UFDCB>     /x84/x30/xf9/x37 <UNASSIGNED>
-+<UFDCC>     /x84/x30/xf9/x38 <UNASSIGNED>
-+<UFDCD>     /x84/x30/xf9/x39 <UNASSIGNED>
-+<UFDCE>     /x84/x30/xfa/x30 <UNASSIGNED>
-+<UFDCF>     /x84/x30/xfa/x31 <UNASSIGNED>
-+<UFDD0>     /x84/x30/xfa/x32 <UNASSIGNED>
-+<UFDD1>     /x84/x30/xfa/x33 <UNASSIGNED>
-+<UFDD2>     /x84/x30/xfa/x34 <UNASSIGNED>
-+<UFDD3>     /x84/x30/xfa/x35 <UNASSIGNED>
-+<UFDD4>     /x84/x30/xfa/x36 <UNASSIGNED>
-+<UFDD5>     /x84/x30/xfa/x37 <UNASSIGNED>
-+<UFDD6>     /x84/x30/xfa/x38 <UNASSIGNED>
-+<UFDD7>     /x84/x30/xfa/x39 <UNASSIGNED>
-+<UFDD8>     /x84/x30/xfb/x30 <UNASSIGNED>
-+<UFDD9>     /x84/x30/xfb/x31 <UNASSIGNED>
-+<UFDDA>     /x84/x30/xfb/x32 <UNASSIGNED>
-+<UFDDB>     /x84/x30/xfb/x33 <UNASSIGNED>
-+<UFDDC>     /x84/x30/xfb/x34 <UNASSIGNED>
-+<UFDDD>     /x84/x30/xfb/x35 <UNASSIGNED>
-+<UFDDE>     /x84/x30/xfb/x36 <UNASSIGNED>
-+<UFDDF>     /x84/x30/xfb/x37 <UNASSIGNED>
-+<UFDE0>     /x84/x30/xfb/x38 <UNASSIGNED>
-+<UFDE1>     /x84/x30/xfb/x39 <UNASSIGNED>
-+<UFDE2>     /x84/x30/xfc/x30 <UNASSIGNED>
-+<UFDE3>     /x84/x30/xfc/x31 <UNASSIGNED>
-+<UFDE4>     /x84/x30/xfc/x32 <UNASSIGNED>
-+<UFDE5>     /x84/x30/xfc/x33 <UNASSIGNED>
-+<UFDE6>     /x84/x30/xfc/x34 <UNASSIGNED>
-+<UFDE7>     /x84/x30/xfc/x35 <UNASSIGNED>
-+<UFDE8>     /x84/x30/xfc/x36 <UNASSIGNED>
-+<UFDE9>     /x84/x30/xfc/x37 <UNASSIGNED>
-+<UFDEA>     /x84/x30/xfc/x38 <UNASSIGNED>
-+<UFDEB>     /x84/x30/xfc/x39 <UNASSIGNED>
-+<UFDEC>     /x84/x30/xfd/x30 <UNASSIGNED>
-+<UFDED>     /x84/x30/xfd/x31 <UNASSIGNED>
-+<UFDEE>     /x84/x30/xfd/x32 <UNASSIGNED>
-+<UFDEF>     /x84/x30/xfd/x33 <UNASSIGNED>
-+<UFDF0>     /x84/x30/xfd/x34 ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM
-+<UFDF1>     /x84/x30/xfd/x35 ARABIC LIGATURE QALA USED AS KORANIC STOP SIGN ISOLATED FORM
-+<UFDF2>     /x84/x30/xfd/x36 ARABIC LIGATURE ALLAH ISOLATED FORM
-+<UFDF3>     /x84/x30/xfd/x37 ARABIC LIGATURE AKBAR ISOLATED FORM
-+<UFDF4>     /x84/x30/xfd/x38 ARABIC LIGATURE MOHAMMAD ISOLATED FORM
-+<UFDF5>     /x84/x30/xfd/x39 ARABIC LIGATURE SALAM ISOLATED FORM
-+<UFDF6>     /x84/x30/xfe/x30 ARABIC LIGATURE RASOUL ISOLATED FORM
-+<UFDF7>     /x84/x30/xfe/x31 ARABIC LIGATURE ALAYHE ISOLATED FORM
-+<UFDF8>     /x84/x30/xfe/x32 ARABIC LIGATURE WASALLAM ISOLATED FORM
-+<UFDF9>     /x84/x30/xfe/x33 ARABIC LIGATURE SALLA ISOLATED FORM
-+<UFDFA>     /x84/x30/xfe/x34 ARABIC LIGATURE SALLALLAHOU ALAYHE WASALLAM
-+<UFDFB>     /x84/x30/xfe/x35 ARABIC LIGATURE JALLAJALALOUHOU
-+<UFDFC>     /x84/x30/xfe/x36 RIAL SIGN
-+<UFDFD>     /x84/x30/xfe/x37 <UNASSIGNED>
-+<UFDFE>     /x84/x30/xfe/x38 <UNASSIGNED>
-+<UFDFF>     /x84/x30/xfe/x39 <UNASSIGNED>
-+<UFE00>     /x84/x31/x81/x30 VARIATION SELECTOR-1
-+<UFE01>     /x84/x31/x81/x31 VARIATION SELECTOR-2
-+<UFE02>     /x84/x31/x81/x32 VARIATION SELECTOR-3
-+<UFE03>     /x84/x31/x81/x33 VARIATION SELECTOR-4
-+<UFE04>     /x84/x31/x81/x34 VARIATION SELECTOR-5
-+<UFE05>     /x84/x31/x81/x35 VARIATION SELECTOR-6
-+<UFE06>     /x84/x31/x81/x36 VARIATION SELECTOR-7
-+<UFE07>     /x84/x31/x81/x37 VARIATION SELECTOR-8
-+<UFE08>     /x84/x31/x81/x38 VARIATION SELECTOR-9
-+<UFE09>     /x84/x31/x81/x39 VARIATION SELECTOR-10
-+<UFE0A>     /x84/x31/x82/x30 VARIATION SELECTOR-11
-+<UFE0B>     /x84/x31/x82/x31 VARIATION SELECTOR-12
-+<UFE0C>     /x84/x31/x82/x32 VARIATION SELECTOR-13
-+<UFE0D>     /x84/x31/x82/x33 VARIATION SELECTOR-14
-+<UFE0E>     /x84/x31/x82/x34 VARIATION SELECTOR-15
-+<UFE0F>     /x84/x31/x82/x35 VARIATION SELECTOR-16
-+<UFE10>     /xa6/xd9         PRESENTATION FORM FOR VERTICAL COMMA
-+<UFE11>     /xa6/xdb         PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA
-+<UFE12>     /xa6/xda         PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC FULL STOP
-+<UFE13>     /xa6/xdc         PRESENTATION FORM FOR VERTICAL COLON
-+<UFE14>     /xa6/xdd         PRESENTATION FORM FOR VERTICAL SEMICOLON
-+<UFE15>     /xa6/xde         PRESENTATION FORM FOR VERTICAL EXCLAMATION MARK
-+<UFE16>     /xa6/xdf         PRESENTATION FORM FOR VERTICAL QUESTION MARK
-+<UFE17>     /xa6/xec         PRESENTATION FORM FOR VERTICAL LEFT WHITE LENTICULAR BRACKET
-+<UFE18>     /xa6/xed         PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET
-+<UFE19>     /xa6/xf3         PRESENTATION FORM FOR VERTICAL HORIZONTAL ELLIPSIS
-+<UFE1A>     /x84/x31/x83/x36 <UNASSIGNED>
-+<UFE1B>     /x84/x31/x83/x37 <UNASSIGNED>
-+<UFE1C>     /x84/x31/x83/x38 <UNASSIGNED>
-+<UFE1D>     /x84/x31/x83/x39 <UNASSIGNED>
-+<UFE1E>     /x84/x31/x84/x30 <UNASSIGNED>
-+<UFE1F>     /x84/x31/x84/x31 <UNASSIGNED>
-+<UFE20>     /x84/x31/x84/x32 COMBINING LIGATURE LEFT HALF
-+<UFE21>     /x84/x31/x84/x33 COMBINING LIGATURE RIGHT HALF
-+<UFE22>     /x84/x31/x84/x34 COMBINING DOUBLE TILDE LEFT HALF
-+<UFE23>     /x84/x31/x84/x35 COMBINING DOUBLE TILDE RIGHT HALF
-+<UFE24>     /x84/x31/x84/x36 COMBINING MACRON LEFT HALF
-+<UFE25>     /x84/x31/x84/x37 COMBINING MACRON RIGHT HALF
-+<UFE26>     /x84/x31/x84/x38 COMBINING CONJOINING MACRON
-+<UFE27>     /x84/x31/x84/x39 <UNASSIGNED>
-+<UFE28>     /x84/x31/x85/x30 <UNASSIGNED>
-+<UFE29>     /x84/x31/x85/x31 <UNASSIGNED>
-+<UFE2A>     /x84/x31/x85/x32 <UNASSIGNED>
-+<UFE2B>     /x84/x31/x85/x33 <UNASSIGNED>
-+<UFE2C>     /x84/x31/x85/x34 <UNASSIGNED>
-+<UFE2D>     /x84/x31/x85/x35 <UNASSIGNED>
-+<UFE2E>     /x84/x31/x85/x36 <UNASSIGNED>
-+<UFE2F>     /x84/x31/x85/x37 <UNASSIGNED>
- <UFE30>     /xa9/x55         PRESENTATION FORM FOR VERTICAL TWO DOT LEADER
- <UFE31>     /xa6/xf2         PRESENTATION FORM FOR VERTICAL EM DASH
- <UFE32>     /x84/x31/x85/x38 PRESENTATION FORM FOR VERTICAL EN DASH
-@@ -30257,6 +63064,7 @@ CHARMAP
- <UFE50>     /xa9/x6f         SMALL COMMA
- <UFE51>     /xa9/x70         SMALL IDEOGRAPHIC COMMA
- <UFE52>     /xa9/x71         SMALL FULL STOP
-+<UFE53>     /x84/x31/x86/x33 <UNASSIGNED>
- <UFE54>     /xa9/x72         SMALL SEMICOLON
- <UFE55>     /xa9/x73         SMALL COLON
- <UFE56>     /xa9/x74         SMALL QUESTION MARK
-@@ -30276,15 +63084,21 @@ CHARMAP
- <UFE64>     /xa9/x82         SMALL LESS-THAN SIGN
- <UFE65>     /xa9/x83         SMALL GREATER-THAN SIGN
- <UFE66>     /xa9/x84         SMALL EQUALS SIGN
-+<UFE67>     /x84/x31/x86/x35 <UNASSIGNED>
- <UFE68>     /xa9/x85         SMALL REVERSE SOLIDUS
- <UFE69>     /xa9/x86         SMALL DOLLAR SIGN
- <UFE6A>     /xa9/x87         SMALL PERCENT SIGN
- <UFE6B>     /xa9/x88         SMALL COMMERCIAL AT
-+<UFE6C>     /x84/x31/x86/x36 <UNASSIGNED>
-+<UFE6D>     /x84/x31/x86/x37 <UNASSIGNED>
-+<UFE6E>     /x84/x31/x86/x38 <UNASSIGNED>
-+<UFE6F>     /x84/x31/x86/x39 <UNASSIGNED>
- <UFE70>     /x84/x31/x87/x30 ARABIC FATHATAN ISOLATED FORM
- <UFE71>     /x84/x31/x87/x31 ARABIC TATWEEL WITH FATHATAN ABOVE
- <UFE72>     /x84/x31/x87/x32 ARABIC DAMMATAN ISOLATED FORM
- <UFE73>     /x84/x31/x87/x33 ARABIC TAIL FRAGMENT
- <UFE74>     /x84/x31/x87/x34 ARABIC KASRATAN ISOLATED FORM
-+<UFE75>     /x84/x31/x87/x35 <UNASSIGNED>
- <UFE76>     /x84/x31/x87/x36 ARABIC FATHA ISOLATED FORM
- <UFE77>     /x84/x31/x87/x37 ARABIC FATHA MEDIAL FORM
- <UFE78>     /x84/x31/x87/x38 ARABIC DAMMA ISOLATED FORM
-@@ -30420,7 +63234,10 @@ CHARMAP
- <UFEFA>     /x84/x31/x94/x38 ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM
- <UFEFB>     /x84/x31/x94/x39 ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM
- <UFEFC>     /x84/x31/x95/x30 ARABIC LIGATURE LAM WITH ALEF FINAL FORM
-+<UFEFD>     /x84/x31/x95/x31 <UNASSIGNED>
-+<UFEFE>     /x84/x31/x95/x32 <UNASSIGNED>
- <UFEFF>     /x84/x31/x95/x33 ZERO WIDTH NO-BREAK SPACE
-+<UFF00>     /x84/x31/x95/x34 <UNASSIGNED>
- <UFF01>     /xa3/xa1         FULLWIDTH EXCLAMATION MARK
- <UFF02>     /xa3/xa2         FULLWIDTH QUOTATION MARK
- <UFF03>     /xa3/xa3         FULLWIDTH NUMBER SIGN
-@@ -30611,33 +63428,71 @@ CHARMAP
- <UFFBC>     /x84/x31/x9e/x38 HALFWIDTH HANGUL LETTER THIEUTH
- <UFFBD>     /x84/x31/x9e/x39 HALFWIDTH HANGUL LETTER PHIEUPH
- <UFFBE>     /x84/x31/x9f/x30 HALFWIDTH HANGUL LETTER HIEUH
-+<UFFBF>     /x84/x31/x9f/x31 <UNASSIGNED>
-+<UFFC0>     /x84/x31/x9f/x32 <UNASSIGNED>
-+<UFFC1>     /x84/x31/x9f/x33 <UNASSIGNED>
- <UFFC2>     /x84/x31/x9f/x34 HALFWIDTH HANGUL LETTER A
- <UFFC3>     /x84/x31/x9f/x35 HALFWIDTH HANGUL LETTER AE
- <UFFC4>     /x84/x31/x9f/x36 HALFWIDTH HANGUL LETTER YA
- <UFFC5>     /x84/x31/x9f/x37 HALFWIDTH HANGUL LETTER YAE
- <UFFC6>     /x84/x31/x9f/x38 HALFWIDTH HANGUL LETTER EO
- <UFFC7>     /x84/x31/x9f/x39 HALFWIDTH HANGUL LETTER E
-+<UFFC8>     /x84/x31/xa0/x30 <UNASSIGNED>
-+<UFFC9>     /x84/x31/xa0/x31 <UNASSIGNED>
- <UFFCA>     /x84/x31/xa0/x32 HALFWIDTH HANGUL LETTER YEO
- <UFFCB>     /x84/x31/xa0/x33 HALFWIDTH HANGUL LETTER YE
- <UFFCC>     /x84/x31/xa0/x34 HALFWIDTH HANGUL LETTER O
- <UFFCD>     /x84/x31/xa0/x35 HALFWIDTH HANGUL LETTER WA
- <UFFCE>     /x84/x31/xa0/x36 HALFWIDTH HANGUL LETTER WAE
- <UFFCF>     /x84/x31/xa0/x37 HALFWIDTH HANGUL LETTER OE
-+<UFFD0>     /x84/x31/xa0/x38 <UNASSIGNED>
-+<UFFD1>     /x84/x31/xa0/x39 <UNASSIGNED>
- <UFFD2>     /x84/x31/xa1/x30 HALFWIDTH HANGUL LETTER YO
- <UFFD3>     /x84/x31/xa1/x31 HALFWIDTH HANGUL LETTER U
- <UFFD4>     /x84/x31/xa1/x32 HALFWIDTH HANGUL LETTER WEO
- <UFFD5>     /x84/x31/xa1/x33 HALFWIDTH HANGUL LETTER WE
- <UFFD6>     /x84/x31/xa1/x34 HALFWIDTH HANGUL LETTER WI
- <UFFD7>     /x84/x31/xa1/x35 HALFWIDTH HANGUL LETTER YU
-+<UFFD8>     /x84/x31/xa1/x36 <UNASSIGNED>
-+<UFFD9>     /x84/x31/xa1/x37 <UNASSIGNED>
- <UFFDA>     /x84/x31/xa1/x38 HALFWIDTH HANGUL LETTER EU
- <UFFDB>     /x84/x31/xa1/x39 HALFWIDTH HANGUL LETTER YI
- <UFFDC>     /x84/x31/xa2/x30 HALFWIDTH HANGUL LETTER I
-+<UFFDD>     /x84/x31/xa2/x31 <UNASSIGNED>
-+<UFFDE>     /x84/x31/xa2/x32 <UNASSIGNED>
-+<UFFDF>     /x84/x31/xa2/x33 <UNASSIGNED>
- <UFFE0>     /xa1/xe9         FULLWIDTH CENT SIGN
- <UFFE1>     /xa1/xea         FULLWIDTH POUND SIGN
- <UFFE2>     /xa9/x56         FULLWIDTH NOT SIGN
- <UFFE3>     /xa3/xfe         FULLWIDTH MACRON
- <UFFE4>     /xa9/x57         FULLWIDTH BROKEN BAR
- <UFFE5>     /xa3/xa4         FULLWIDTH YEN SIGN
-+<UFFE6>     /x84/x31/xa2/x34 FULLWIDTH WON SIGN
-+<UFFE7>     /x84/x31/xa2/x35 <UNASSIGNED>
-+<UFFE8>     /x84/x31/xa2/x36 HALFWIDTH FORMS LIGHT VERTICAL
-+<UFFE9>     /x84/x31/xa2/x37 HALFWIDTH LEFTWARDS ARROW
-+<UFFEA>     /x84/x31/xa2/x38 HALFWIDTH UPWARDS ARROW
-+<UFFEB>     /x84/x31/xa2/x39 HALFWIDTH RIGHTWARDS ARROW
-+<UFFEC>     /x84/x31/xa3/x30 HALFWIDTH DOWNWARDS ARROW
-+<UFFED>     /x84/x31/xa3/x31 HALFWIDTH BLACK SQUARE
-+<UFFEE>     /x84/x31/xa3/x32 HALFWIDTH WHITE CIRCLE
-+<UFFEF>     /x84/x31/xa3/x33 <UNASSIGNED>
-+<UFFF0>     /x84/x31/xa3/x34 <UNASSIGNED>
-+<UFFF1>     /x84/x31/xa3/x35 <UNASSIGNED>
-+<UFFF2>     /x84/x31/xa3/x36 <UNASSIGNED>
-+<UFFF3>     /x84/x31/xa3/x37 <UNASSIGNED>
-+<UFFF4>     /x84/x31/xa3/x38 <UNASSIGNED>
-+<UFFF5>     /x84/x31/xa3/x39 <UNASSIGNED>
-+<UFFF6>     /x84/x31/xa4/x30 <UNASSIGNED>
-+<UFFF7>     /x84/x31/xa4/x31 <UNASSIGNED>
-+<UFFF8>     /x84/x31/xa4/x32 <UNASSIGNED>
-+<UFFF9>     /x84/x31/xa4/x33 INTERLINEAR ANNOTATION ANCHOR
-+<UFFFA>     /x84/x31/xa4/x34 INTERLINEAR ANNOTATION SEPARATOR
-+<UFFFB>     /x84/x31/xa4/x35 INTERLINEAR ANNOTATION TERMINATOR
-+<UFFFC>     /x84/x31/xa4/x36 OBJECT REPLACEMENT CHARACTER
-+<UFFFD>     /x84/x31/xa4/x37 REPLACEMENT CHARACTER
-+<UFFFE>     /x84/x31/xa4/x38 <UNASSIGNED>
-+<UFFFF>     /x84/x31/xa4/x39 <UNASSIGNED>
- <U00020087> /xfe/x51         <CJK>
- <U00020089> /xfe/x52         <CJK>
- <U000200CC> /xfe/x53         <CJK>
-@@ -30697,6 +63552,88 @@ WIDTH
- <U02DD>                   2
- <U02DF>                   2
- <U0300>...<U036F>         0
-+<U0483>...<U0489>         0
-+<U0591>...<U05BD>         0
-+<U05BF>                   0
-+<U05C1>...<U05C2>         0
-+<U05C4>                   0
-+<U064B>...<U0655>         0
-+<U0670>                   0
-+<U06D6>...<U06E4>         0
-+<U06E7>...<U06E8>         0
-+<U06EA>...<U06ED>         0
-+<U070F>                   0
-+<U0711>                   0
-+<U0730>...<U074A>         0
-+<U07A6>...<U07B0>         0
-+<U0901>...<U0902>         0
-+<U093C>                   0
-+<U0941>...<U0948>         0
-+<U094D>                   0
-+<U0951>...<U0954>         0
-+<U0962>...<U0963>         0
-+<U0981>                   0
-+<U09BC>                   0
-+<U09C1>...<U09C4>         0
-+<U09CD>                   0
-+<U09E2>...<U09E3>         0
-+<U0A02>                   0
-+<U0A3C>                   0
-+<U0A41>...<U0A4D>         0
-+<U0A70>...<U0A71>         0
-+<U0A81>...<U0A82>         0
-+<U0ABC>                   0
-+<U0AC1>...<U0AC8>         0
-+<U0ACD>                   0
-+<U0B01>                   0
-+<U0B3C>                   0
-+<U0B3F>                   0
-+<U0B41>...<U0B43>         0
-+<U0B4D>...<U0B56>         0
-+<U0B82>                   0
-+<U0BC0>                   0
-+<U0BCD>                   0
-+<U0C3E>...<U0C40>         0
-+<U0C46>...<U0C56>         0
-+<U0CBF>                   0
-+<U0CC6>                   0
-+<U0CCC>...<U0CCD>         0
-+<U0D41>...<U0D43>         0
-+<U0D4D>                   0
-+<U0DCA>                   0
-+<U0DD2>...<U0DD6>         0
-+<U0E31>                   0
-+<U0E34>...<U0E3A>         0
-+<U0E47>...<U0E4E>         0
-+<U0EB1>                   0
-+<U0EB4>...<U0EBC>         0
-+<U0EC8>...<U0ECD>         0
-+<U0F18>...<U0F19>         0
-+<U0F35>                   0
-+<U0F37>                   0
-+<U0F39>                   0
-+<U0F71>...<U0F7E>         0
-+<U0F80>...<U0F84>         0
-+<U0F86>...<U0F87>         0
-+<U0F90>...<U0FBC>         0
-+<U0FC6>                   0
-+<U102D>...<U1030>         0
-+<U1032>...<U1037>         0
-+<U1039>                   0
-+<U1058>...<U1059>         0
-+<U1100>...<U115F>         2
-+<U1160>...<U11A2>         0
-+<U11A8>...<U11F9>         0
-+<U1712>...<U1714>         0
-+<U1732>...<U1734>         0
-+<U1752>...<U1753>         0
-+<U1772>...<U1773>         0
-+<U17B7>...<U17BD>         0
-+<U17C6>                   0
-+<U17C9>...<U17D3>         0
-+<U180B>...<U180E>         0
-+<U18A9>                   0
-+<U200B>...<U200F>         0
- <U2020>...<U2022>         2
- <U2024>...<U2027>         2
- <U202A>...<U202E>         0
-@@ -30740,10 +63677,23 @@ WIDTH
- <U260E>...<U260F>         2
- <U261C>                   2
- <U261E>                   2
-+<U2660>...<U2661>         2
-+<U2663>...<U2665>         2
-+<U2667>...<U266A>         2
-+<U266C>...<U266D>         2
-+<U266F>                   2
-+<U273D>                   2
-+<U2776>...<U277F>         2
-+<U2E80>...<U3020>         2
- <U302A>...<U302F>         0
- <U3030>...<U303D>         2
- <U3094>...<U3096>         2
- <U3099>...<U309A>         0
-+<U309F>...<UF8EF>         2
-+<UF8F0>...<UF8FF>         0
-+<UF900>...<UFA6A>         2
-+<UFB1E>                   0
-+<UFE00>...<UFE23>         0
- <UFE32>...<UFE58>         2
- <UFEFF>                   0
- <UFF5F>...<UFF60>         2
--- 
-1.7.9
-
diff --git a/multilib/lib32-glibc/glibc-2.15-gb18030.patch.gz b/multilib/lib32-glibc/glibc-2.15-gb18030.patch.gz
deleted file mode 100644
index dde59c056..000000000
--- a/multilib/lib32-glibc/glibc-2.15-gb18030.patch.gz
+++ /dev/null
diff --git a/multilib/lib32-glibc/glibc-2.15-ifunc.patch b/multilib/lib32-glibc/glibc-2.15-ifunc.patch
deleted file mode 100644
index 115afa02a..000000000
--- a/multilib/lib32-glibc/glibc-2.15-ifunc.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff --git a/Makeconfig b/Makeconfig
-index 2db2821..68547b2 100644
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -900,6 +900,12 @@ else
- libdl = $(common-objpfx)dlfcn/libdl.a
- endif
- 
-+ifeq ($(build-shared),yes)
-+libm = $(common-objpfx)math/libm.so$(libm.so-version)
-+else
-+libm = $(common-objpfx)math/libm.a
-+endif
-+
- # These are the subdirectories containing the library source.  The order
- # is more or less arbitrary.  The sorting step will take care of the
- # dependencies.
-diff --git a/elf/Makefile b/elf/Makefile
-index 052e763..3f1772a 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -124,7 +124,8 @@ distribute	:= rtld-Rules \
- 		   tst-initordera1.c tst-initordera2.c tst-initorderb1.c \
- 		   tst-initorderb2.c tst-initordera3.c tst-initordera4.c \
- 		   tst-initorder.c \
--		   tst-initorder2.c
-+		   tst-initorder2.c \
-+		   tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c
- 
- CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
- CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
-@@ -227,7 +228,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- 	 tst-audit1 tst-audit2 \
- 	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
--	 tst-initorder tst-initorder2
-+	 tst-initorder tst-initorder2 tst-relsort1
- #	 reldep9
- test-srcs = tst-pathopt
- selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
-@@ -290,7 +291,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
- 		tst-initordera1 tst-initorderb1 \
- 		tst-initordera2 tst-initorderb2 \
- 		tst-initordera3 tst-initordera4 \
--		tst-initorder2a tst-initorder2b tst-initorder2c tst-initorder2d
-+		tst-initorder2a tst-initorder2b tst-initorder2c \
-+		tst-initorder2d \
-+		tst-relsort1mod1 tst-relsort1mod2
- ifeq (yes,$(have-initfini-array))
- modules-names += tst-array2dep tst-array5dep
- endif
-@@ -1195,3 +1198,9 @@ CFLAGS-tst-auditmod6b.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod6c.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod7b.c += $(AVX-CFLAGS)
- endif
-+
-+$(objpfx)tst-relsort1: $(libdl)
-+$(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
-+$(objpfx)tst-relsort1mod2.so: $(libm)
-+$(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
-+			   $(objpfx)tst-relsort1mod2.so
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index a0b5c50..a56bdc1 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -1,5 +1,5 @@
- /* Load a shared object at runtime, relocate it, and run its initializer.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 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
-@@ -302,45 +302,109 @@ dl_open_worker (void *a)
-   if (GLRO(dl_lazy))
-     reloc_mode |= mode & RTLD_LAZY;
- 
--  /* Relocate the objects loaded.  We do this in reverse order so that copy
--     relocs of earlier objects overwrite the data written by later objects.  */
--
-+  /* Sort the objects by dependency for the relocation process.  This
-+     allows IFUNC relocations to work and it also means copy
-+     relocation of dependencies are if necessary overwritten.  */
-+  size_t nmaps = 0;
-   struct link_map *l = new;
--  while (l->l_next)
--    l = l->l_next;
--  while (1)
-+  do
-+    {
-+      if (! l->l_real->l_relocated)
-+	++nmaps;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  struct link_map *maps[nmaps];
-+  nmaps = 0;
-+  l = new;
-+  do
-     {
-       if (! l->l_real->l_relocated)
-+	maps[nmaps++] = l;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  if (nmaps > 1)
-+    {
-+      char seen[nmaps];
-+      memset (seen, '\0', nmaps);
-+      size_t i = 0;
-+      while (1)
- 	{
--#ifdef SHARED
--	  if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	  ++seen[i];
-+	  struct link_map *thisp = maps[i];
-+
-+	  /* Find the last object in the list for which the current one is
-+	     a dependency and move the current object behind the object
-+	     with the dependency.  */
-+	  size_t k = nmaps - 1;
-+	  while (k > i)
- 	    {
--	      /* If this here is the shared object which we want to profile
--		 make sure the profile is started.  We can find out whether
--		 this is necessary or not by observing the `_dl_profile_map'
--		 variable.  If was NULL but is not NULL afterwars we must
--		 start the profiling.  */
--	      struct link_map *old_profile_map = GL(dl_profile_map);
-+	      struct link_map **runp = maps[k]->l_initfini;
-+	      if (runp != NULL)
-+		/* Look through the dependencies of the object.  */
-+		while (*runp != NULL)
-+		  if (__builtin_expect (*runp++ == thisp, 0))
-+		    {
-+		      /* Move the current object to the back past the last
-+			 object with it as the dependency.  */
-+		      memmove (&maps[i], &maps[i + 1],
-+			       (k - i) * sizeof (maps[0]));
-+		      maps[k] = thisp;
-+
-+		      if (seen[i + 1] > 1)
-+			{
-+			  ++i;
-+			  goto next_clear;
-+			}
-+
-+		      char this_seen = seen[i];
-+		      memmove (&seen[i], &seen[i + 1],
-+			       (k - i) * sizeof (seen[0]));
-+		      seen[k] = this_seen;
-+
-+		      goto next;
-+		    }
-+
-+	      --k;
-+	    }
- 
--	      _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+	  if (++i == nmaps)
-+	    break;
-+	next_clear:
-+	  memset (&seen[i], 0, (nmaps - i) * sizeof (seen[0]));
-+	next:;
-+	}
-+    }
- 
--	      if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
--		{
--		  /* We must prepare the profiling.  */
--		  _dl_start_profile ();
-+  for (size_t i = nmaps; i-- > 0; )
-+    {
-+      l = maps[i];
- 
--		  /* Prevent unloading the object.  */
--		  GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
--		}
-+#ifdef SHARED
-+      if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	{
-+	  /* If this here is the shared object which we want to profile
-+	     make sure the profile is started.  We can find out whether
-+	     this is necessary or not by observing the `_dl_profile_map'
-+	     variable.  If it was NULL but is not NULL afterwars we must
-+	     start the profiling.  */
-+	  struct link_map *old_profile_map = GL(dl_profile_map);
-+
-+	  _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+
-+	  if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
-+	    {
-+	      /* We must prepare the profiling.  */
-+	      _dl_start_profile ();
-+
-+	      /* Prevent unloading the object.  */
-+	      GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
- 	    }
--	  else
--#endif
--	    _dl_relocate_object (l, l->l_scope, reloc_mode, 0);
- 	}
--
--      if (l == new)
--	break;
--      l = l->l_prev;
-+      else
-+#endif
-+	_dl_relocate_object (l, l->l_scope, reloc_mode, 0);
-     }
- 
-   /* If the file is not loaded now as a dependency, add the search
-diff --git a/elf/tst-relsort1.c b/elf/tst-relsort1.c
-new file mode 100644
-index 0000000..972100c
---- /dev/null
-+++ b/elf/tst-relsort1.c
-@@ -0,0 +1,19 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+
-+
-+static int
-+do_test ()
-+{
-+  const char lib[] = "$ORIGIN/tst-relsort1mod1.so";
-+  void *h = dlopen (lib, RTLD_NOW);
-+  if (h == NULL)
-+    {
-+      puts (dlerror ());
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/elf/tst-relsort1mod1.c b/elf/tst-relsort1mod1.c
-new file mode 100644
-index 0000000..9e4a943
---- /dev/null
-+++ b/elf/tst-relsort1mod1.c
-@@ -0,0 +1,7 @@
-+extern int foo (double);
-+
-+int
-+bar (void)
-+{
-+  return foo (1.2);
-+}
-diff --git a/elf/tst-relsort1mod2.c b/elf/tst-relsort1mod2.c
-new file mode 100644
-index 0000000..a2c3e55
---- /dev/null
-+++ b/elf/tst-relsort1mod2.c
-@@ -0,0 +1,7 @@
-+#include <math.h>
-+
-+int
-+foo (double d)
-+{
-+  return floor (d) != 0.0;
-+}
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-multiarch-x86-strcmp.patch b/multilib/lib32-glibc/glibc-2.15-multiarch-x86-strcmp.patch
deleted file mode 100644
index 38c9e617f..000000000
--- a/multilib/lib32-glibc/glibc-2.15-multiarch-x86-strcmp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-index d10e872..d4fcd2b 100644
---- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strcasecmp.c>
- 
-+strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
-index 5410d17..b3b9eb8 100644
---- a/sysdeps/i386/i686/multiarch/strcmp.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp.S
-@@ -111,6 +111,7 @@ END(STRCMP)
- # endif
- #endif
- 
--#ifndef USE_AS_STRNCMP
-+#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
-+    && !defined USE_AS_STRNCASECMP_L
- # include "../strcmp.S"
- #endif
-diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-index 0c68b8d..7e601af 100644
---- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strncase.c>
- 
-+strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
diff --git a/multilib/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch b/multilib/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch
deleted file mode 100644
index b2bb9caac..000000000
--- a/multilib/lib32-glibc/glibc-2.15-nearbyintf-rounding.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index c8186c8..1016753 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -4632,6 +4632,29 @@ nearbyint_test (void)
-   TEST_f_f (nearbyint, 524286.75, 524287.0);
-   TEST_f_f (nearbyint, 524288.75, 524289.0);
- 
-+  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
-+  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
-+  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
-+  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
-+  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
-+  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
-+  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
-+  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
-+  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
-+  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
-+#endif
-+
-   END (nearbyint);
- }
- 
-diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-index 04ef9ab..a6d602b 100644
---- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
-+++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-@@ -30,18 +30,12 @@ __nearbyintf(float x)
- {
- 	fenv_t env;
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		libc_feholdexceptf (&env);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
-@@ -49,17 +43,11 @@ __nearbyintf(float x)
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	libc_feholdexceptf (&env);
- 	w = TWO23[sx]+x;
- 	t = w-TWO23[sx];
diff --git a/multilib/lib32-glibc/glibc-2.15-negative-result-cache.patch b/multilib/lib32-glibc/glibc-2.15-negative-result-cache.patch
deleted file mode 100644
index c09e79a17..000000000
--- a/multilib/lib32-glibc/glibc-2.15-negative-result-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/nscd/aicache.c b/nscd/aicache.c
-index aaaf80d..e1f1244 100644
---- a/nscd/aicache.c
-+++ b/nscd/aicache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -514,8 +514,9 @@ next_nip:
-       if (fd != -1)
- 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
- 
--      /* If we cannot permanently store the result, so be it.  */
--      if (__builtin_expect (db->negtimeout == 0, 0))
-+      /* If we have a transient error or cannot permanently store the
-+	 result, so be it.  */
-+      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	{
- 	  /* Mark the old entry as obsolete.  */
- 	  if (dh != NULL)
-diff --git a/nscd/grpcache.c b/nscd/grpcache.c
-index e9607c6..a698f36 100644
---- a/nscd/grpcache.c
-+++ b/nscd/grpcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for group lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
- 	  else
- 	    written = total;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (db->negtimeout == 0)
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/hstcache.c b/nscd/hstcache.c
-index 4d68ade..c72feaa 100644
---- a/nscd/hstcache.c
-+++ b/nscd/hstcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
- 					MSG_NOSIGNAL)) != total)
- 	    all_written = false;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
-index 4ac9942..2019991 100644
---- a/nscd/initgrcache.c
-+++ b/nscd/initgrcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
-index 49e130c..e2ba09d 100644
---- a/nscd/pwdcache.c
-+++ b/nscd/pwdcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for passwd lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/servicescache.c b/nscd/servicescache.c
-index d3d5dce..a6337e3 100644
---- a/nscd/servicescache.c
-+++ b/nscd/servicescache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for services lookup.
--   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
- 
-@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
diff --git a/multilib/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch b/multilib/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch
deleted file mode 100644
index 874f8b4cb..000000000
--- a/multilib/lib32-glibc/glibc-2.15-non-signalling-comparisons.patch
+++ /dev/null
@@ -1,886 +0,0 @@
-diff --git a/math/w_acos.c b/math/w_acos.c
-index 3138408..0490933 100644
---- a/math/w_acos.c
-+++ b/math/w_acos.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __acos (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosf.c b/math/w_acosf.c
-index 0e41a2c..2500a7d 100644
---- a/math/w_acosf.c
-+++ b/math/w_acosf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __acosf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosh.c b/math/w_acosh.c
-index 0bd2686..d632987 100644
---- a/math/w_acosh.c
-+++ b/math/w_acosh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __acosh (double x)
- {
--  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 29);
- 
-diff --git a/math/w_acoshf.c b/math/w_acoshf.c
-index c59bf94..f77df2b 100644
---- a/math/w_acoshf.c
-+++ b/math/w_acoshf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __acoshf (float x)
- {
--  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard_f (x, x, 129);
- 
-diff --git a/math/w_acoshl.c b/math/w_acoshl.c
-index 819bdfc..cc823b8 100644
---- a/math/w_acoshl.c
-+++ b/math/w_acoshl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __acoshl (long double x)
- {
--  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 229);
- 
-diff --git a/math/w_acosl.c b/math/w_acosl.c
-index 6417068..05023b4 100644
---- a/math/w_acosl.c
-+++ b/math/w_acosl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __acosl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asin.c b/math/w_asin.c
-index d4e89ce..0fa9487 100644
---- a/math/w_asin.c
-+++ b/math/w_asin.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __asin (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinf.c b/math/w_asinf.c
-index 270961f..c28edab 100644
---- a/math/w_asinf.c
-+++ b/math/w_asinf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __asinf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinl.c b/math/w_asinl.c
-index 32e5273..e4036d8 100644
---- a/math/w_asinl.c
-+++ b/math/w_asinl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __asinl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_atanh.c b/math/w_atanh.c
-index 1022bd5..190d2e9 100644
---- a/math/w_atanh.c
-+++ b/math/w_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- double
- __atanh (double x)
- {
--  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabs (x) > 1.0
- 			      ? 30		/* atanh(|x|>1) */
-diff --git a/math/w_atanhf.c b/math/w_atanhf.c
-index 3c8cf83..e0c5dc3 100644
---- a/math/w_atanhf.c
-+++ b/math/w_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- float
- __atanhf (float x)
- {
--  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x,
- 				fabsf (x) > 1.0f
- 				? 130		/* atanh(|x|>1) */
-diff --git a/math/w_atanhl.c b/math/w_atanhl.c
-index f582acf..319535d 100644
---- a/math/w_atanhl.c
-+++ b/math/w_atanhl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- long double
- __atanhl (long double x)
- {
--  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabsl (x) > 1.0L
- 			      ? 230		/* atanh(|x|>1) */
-diff --git a/math/w_exp2.c b/math/w_exp2.c
-index bf22326..7a3b0af 100644
---- a/math/w_exp2.c
-+++ b/math/w_exp2.c
-@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
- double
- __exp2 (double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finite (x))
-     /* exp2 overflow: 44, exp2 underflow: 45 */
-     return __kernel_standard (x, x, 44 + (x <= o_threshold));
-diff --git a/math/w_exp2f.c b/math/w_exp2f.c
-index 7215fca..c4e9e94 100644
---- a/math/w_exp2f.c
-+++ b/math/w_exp2f.c
-@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
- float
- __exp2f (float x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitef (x))
-     /* exp2 overflow: 144, exp2 underflow: 145 */
-     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
-diff --git a/math/w_exp2l.c b/math/w_exp2l.c
-index ac8d231..442a637 100644
---- a/math/w_exp2l.c
-+++ b/math/w_exp2l.c
-@@ -13,7 +13,8 @@ static const long double u_threshold
- long double
- __exp2l (long double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitel (x))
-     /* exp2 overflow: 244, exp2 underflow: 245 */
-     return __kernel_standard (x, x, 244 + (x <= o_threshold));
-diff --git a/math/w_j0.c b/math/w_j0.c
-index 1dff8b4..f8d3724 100644
---- a/math/w_j0.c
-+++ b/math/w_j0.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j0 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 34);
- 
-@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
- double
- y0 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j0f.c b/math/w_j0f.c
-index fc52f26..cef36aa 100644
---- a/math/w_j0f.c
-+++ b/math/w_j0f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- j0f (float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 134);
-@@ -38,7 +38,8 @@ j0f (float x)
- float
- y0f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+                        || isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j0l.c b/math/w_j0l.c
-index 8d72d50..144f33c 100644
---- a/math/w_j0l.c
-+++ b/math/w_j0l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j0l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 234);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
- long double
- __y0l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_j1.c b/math/w_j1.c
-index 358e0e1..e9a5357 100644
---- a/math/w_j1.c
-+++ b/math/w_j1.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j1 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 36);
- 
-@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
- double
- y1 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j1f.c b/math/w_j1f.c
-index 096fdf5..29bd949 100644
---- a/math/w_j1f.c
-+++ b/math/w_j1f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- j1f (float x)
- {
--  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 136);
- 
-@@ -37,7 +38,8 @@ j1f (float x)
- float
- y1f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j1l.c b/math/w_j1l.c
-index 93e4ee4..01b8551 100644
---- a/math/w_j1l.c
-+++ b/math/w_j1l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j1l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 236);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
- long double
- __y1l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_jn.c b/math/w_jn.c
-index f0dd8c6..fd3fb16 100644
---- a/math/w_jn.c
-+++ b/math/w_jn.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- jn (int n, double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard (n, x, 38);
- 
-@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
- double
- yn (int n, double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_jnf.c b/math/w_jnf.c
-index ef29eb4..36d6f6d 100644
---- a/math/w_jnf.c
-+++ b/math/w_jnf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- jnf (int n, float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard_f (n, x, 138);
-@@ -38,7 +38,8 @@ jnf (int n, float x)
- float
- ynf (int n, float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_log.c b/math/w_log.c
-index efc1c4c..ec33605 100644
---- a/math/w_log.c
-+++ b/math/w_log.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10.c b/math/w_log10.c
-index 2717ade..fe799ad 100644
---- a/math/w_log10.c
-+++ b/math/w_log10.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log10 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10f.c b/math/w_log10f.c
-index 60737ca..4b821f7 100644
---- a/math/w_log10f.c
-+++ b/math/w_log10f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log10f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_log10l.c b/math/w_log10l.c
-index b26f18c..0e5a137 100644
---- a/math/w_log10l.c
-+++ b/math/w_log10l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log10l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_log2.c b/math/w_log2.c
-index 998e5d9..e58e109 100644
---- a/math/w_log2.c
-+++ b/math/w_log2.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log2 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2f.c b/math/w_log2f.c
-index 6d91bf4..6963ed2 100644
---- a/math/w_log2f.c
-+++ b/math/w_log2f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log2f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2l.c b/math/w_log2l.c
-index e51c1bc..eed04ff6c 100644
---- a/math/w_log2l.c
-+++ b/math/w_log2l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log2l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_logf.c b/math/w_logf.c
-index 8aa27c8..38d408f 100644
---- a/math/w_logf.c
-+++ b/math/w_logf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __logf (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_logl.c b/math/w_logl.c
-index a3139ff..593b37d 100644
---- a/math/w_logl.c
-+++ b/math/w_logl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __logl (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_sqrt.c b/math/w_sqrt.c
-index 409a6df..f6ba542 100644
---- a/math/w_sqrt.c
-+++ b/math/w_sqrt.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __sqrt (double x)
- {
--  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 26); /* sqrt(negative) */
- 
-   return __ieee754_sqrt (x);
-diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
-index 3c3d2f8..c128e9b 100644
---- a/math/w_sqrtf.c
-+++ b/math/w_sqrtf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __sqrtf (float x)
- {
--  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
- 
-   return __ieee754_sqrtf (x);
-diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
-index 5e18f44..2a4a048 100644
---- a/math/w_sqrtl.c
-+++ b/math/w_sqrtl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __sqrtl (long double x)
- {
--  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 226); /* sqrt(negative) */
- 
-   return __ieee754_sqrtl (x);
-diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
-index 9fc21ab..5f471b1 100644
---- a/sysdeps/ieee754/dbl-64/e_atanh.c
-+++ b/sysdeps/ieee754/dbl-64/e_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
- {
-   double xa = fabs (x);
-   double t;
--  if (xa < 0.5)
-+  if (isless (xa, 0.5))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
-       t = xa + xa;
-       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
-     }
--  else if (__builtin_expect (xa < 1.0, 1))
-+  else if (__builtin_expect (isless (xa, 1.0), 1))
-     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
-   else
-     {
--      if (xa > 1.0)
-+      if (isgreater (xa, 1.0))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0;
-diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
-index ee42587..b584ed8 100644
---- a/sysdeps/ieee754/dbl-64/w_exp.c
-+++ b/sysdeps/ieee754/dbl-64/w_exp.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
- double
- __exp (double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 6);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 7);
-diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
-index 75ed691..7af2f6c 100644
---- a/sysdeps/ieee754/flt-32/e_atanhf.c
-+++ b/sysdeps/ieee754/flt-32/e_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
- {
-   float xa = fabsf (x);
-   float t;
--  if (xa < 0.5f)
-+  if (isless (xa, 0.5f))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28f, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
-       t = xa + xa;
-       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
-     }
--  else if (__builtin_expect (xa < 1.0f, 1))
-+  else if (__builtin_expect (isless (xa, 1.0f), 1))
-     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
-   else
-     {
--      if (xa > 1.0f)
-+      if (isgreater (xa, 1.0f))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0f;
-diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
-index 5500872..bc3b2f6 100644
---- a/sysdeps/ieee754/flt-32/w_expf.c
-+++ b/sysdeps/ieee754/flt-32/w_expf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
- float
- __expf (float x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 106);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 107);
-diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
-index ec9d8a7..d61c0a3 100644
---- a/sysdeps/ieee754/ldbl-96/w_expl.c
-+++ b/sysdeps/ieee754/ldbl-96/w_expl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
- long double
- __expl (long double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 206);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 207);
diff --git a/multilib/lib32-glibc/glibc-2.15-regex.patch b/multilib/lib32-glibc/glibc-2.15-regex.patch
deleted file mode 100644
index 6385f2c08..000000000
--- a/multilib/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/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index d8894723a..000000000
--- a/multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,226 +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 <stap-probe.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
--	LP_OP(cmp) $-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
--	LP_OP(cmp) $-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
--	mov	dep_mutex(%rdi), %R8_LP
--	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:
- 
diff --git a/multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch b/multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
deleted file mode 100644
index 87d04c794..000000000
--- a/multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
+++ /dev/null
@@ -1,680 +0,0 @@
-diff --git a/include/ifaddrs.h b/include/ifaddrs.h
-index e1c6cac..50e4c48 100644
---- a/include/ifaddrs.h
-+++ b/include/ifaddrs.h
-@@ -21,13 +21,8 @@ struct in6addrinfo
- extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 			struct in6addrinfo **in6ai, size_t *in6ailen)
-   attribute_hidden;
--extern void __free_in6ai (struct in6addrinfo *in6ai) attribute_hidden;
- extern void __check_native (uint32_t a1_index, int *a1_native,
- 			    uint32_t a2_index, int *a2_native)
-   attribute_hidden;
- 
--#ifdef IS_IN_nscd
--extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
--#endif
--
- #endif	/* ifaddrs.h */
-diff --git a/inet/check_pf.c b/inet/check_pf.c
-index 0fa34cc..b015432 100644
---- a/inet/check_pf.c
-+++ b/inet/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Generic version.
--   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006 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
-@@ -54,19 +54,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   (void) freeifaddrs (ifa);
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *in6ai)
--{
--  /* Nothing to do.  */
--}
--
--
--#ifdef IS_IN_nscd
--uint32_t
--__bump_nl_timestamp (void)
--{
--  return 0;
--}
--#endif
-diff --git a/nscd/connections.c b/nscd/connections.c
-index c741996..2b5c7ef 100644
---- a/nscd/connections.c
-+++ b/nscd/connections.c
-@@ -24,7 +24,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <grp.h>
--#include <ifaddrs.h>
- #include <libintl.h>
- #include <pthread.h>
- #include <pwd.h>
-@@ -33,10 +32,6 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <arpa/inet.h>
--#ifdef HAVE_NETLINK
--# include <linux/netlink.h>
--# include <linux/rtnetlink.h>
--#endif
- #ifdef HAVE_EPOLL
- # include <sys/epoll.h>
- #endif
-@@ -252,11 +247,6 @@ static int sock;
- int inotify_fd = -1;
- #endif
- 
--#ifdef HAVE_NETLINK
--/* Descriptor for netlink status updates.  */
--static int nl_status_fd = -1;
--#endif
--
- #ifndef __ASSUME_SOCK_CLOEXEC
- /* Negative if SOCK_CLOEXEC is not supported, positive if it is, zero
-    before be know the result.  */
-@@ -913,65 +903,6 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
-       exit (1);
-     }
- 
--#ifdef HAVE_NETLINK
--  if (dbs[hstdb].enabled)
--    {
--      /* Try to open netlink socket to monitor network setting changes.  */
--      nl_status_fd = socket (AF_NETLINK,
--			     SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK,
--			     NETLINK_ROUTE);
--      if (nl_status_fd != -1)
--	{
--	  struct sockaddr_nl snl;
--	  memset (&snl, '\0', sizeof (snl));
--	  snl.nl_family = AF_NETLINK;
--	  /* XXX Is this the best set to use?  */
--	  snl.nl_groups = (RTMGRP_IPV4_IFADDR | RTMGRP_TC | RTMGRP_IPV4_MROUTE
--			   | RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_RULE
--			   | RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_MROUTE
--			   | RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFINFO
--			   | RTMGRP_IPV6_PREFIX);
--
--	  if (bind (nl_status_fd, (struct sockaddr *) &snl, sizeof (snl)) != 0)
--	    {
--	      close (nl_status_fd);
--	      nl_status_fd = -1;
--	    }
--	  else
--	    {
--	      /* Start the timestamp process.  */
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--
--# ifndef __ASSUME_SOCK_CLOEXEC
--	      if (have_sock_cloexec < 0)
--		{
--		  /* We don't want to get stuck on accept.  */
--		  int fl = fcntl (nl_status_fd, F_GETFL);
--		  if (fl == -1
--		      || fcntl (nl_status_fd, F_SETFL, fl | O_NONBLOCK) == -1)
--		    {
--		      dbg_log (_("\
--cannot change socket to nonblocking mode: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--
--		  /* The descriptor needs to be closed on exec.  */
--		  if (paranoia
--		      && fcntl (nl_status_fd, F_SETFD, FD_CLOEXEC) == -1)
--		    {
--		      dbg_log (_("cannot set socket to close on exec: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--		}
--# endif
--	    }
--	}
--    }
--#endif
--
-   /* Change to unprivileged uid/gid/groups if specified in config file */
-   if (server_user != NULL)
-     finish_drop_privileges ();
-@@ -1895,18 +1826,6 @@ main_loop_poll (void)
-     }
- #endif
- 
--#ifdef HAVE_NETLINK
--  size_t idx_nl_status_fd = 0;
--  if (nl_status_fd != -1)
--    {
--      idx_nl_status_fd = nused;
--      conns[nused].fd = nl_status_fd;
--      conns[nused].events = POLLRDNORM;
--      ++nused;
--      firstfree = nused;
--    }
--#endif
--
-   while (1)
-     {
-       /* Wait for any event.  We wait at most a couple of seconds so
-@@ -2049,20 +1968,6 @@ disabled inotify after read error %d"),
- 	    }
- #endif
- 
--#ifdef HAVE_NETLINK
--	  if (idx_nl_status_fd != 0 && conns[idx_nl_status_fd].revents != 0)
--	    {
--	      char buf[4096];
--	      /* Read all the data.  We do not interpret it here.  */
--	      while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					       sizeof (buf))) != -1)
--		;
--
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--	    }
--#endif
--
- 	  for (size_t cnt = first; cnt < nused && n > 0; ++cnt)
- 	    if (conns[cnt].revents != 0)
- 	      {
-@@ -2141,17 +2046,6 @@ main_loop_epoll (int efd)
-     }
- # endif
- 
--# ifdef HAVE_NETLINK
--  if (nl_status_fd != -1)
--    {
--      ev.events = EPOLLRDNORM;
--      ev.data.fd = nl_status_fd;
--      if (epoll_ctl (efd, EPOLL_CTL_ADD, nl_status_fd, &ev) == -1)
--	/* We cannot use epoll.  */
--	return;
--    }
--# endif
--
-   while (1)
-     {
-       struct epoll_event revs[100];
-@@ -2268,18 +2162,6 @@ main_loop_epoll (int efd)
- 		}
- 	  }
- # endif
--# ifdef HAVE_NETLINK
--	else if (revs[cnt].data.fd == nl_status_fd)
--	  {
--	    char buf[4096];
--	    /* Read all the data.  We do not interpret it here.  */
--	    while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					     sizeof (buf))) != -1)
--	      ;
--
--	    __bump_nl_timestamp ();
--	  }
--# endif
- 	else
- 	  {
- 	    /* Remove the descriptor from the epoll descriptor.  */
-@@ -2303,7 +2185,6 @@ main_loop_epoll (int efd)
-       time_t laststart = now - ACCEPT_TIMEOUT;
-       assert (starttime[sock] == 0);
-       assert (inotify_fd == -1 || starttime[inotify_fd] == 0);
--      assert (nl_status_fd == -1 || starttime[nl_status_fd] == 0);
-       for (int cnt = highest; cnt > STDERR_FILENO; --cnt)
- 	if (starttime[cnt] != 0 && starttime[cnt] < laststart)
- 	  {
-diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
-index b5cd2d2..caad26a 100644
---- a/nscd/nscd-client.h
-+++ b/nscd/nscd-client.h
-@@ -260,17 +260,12 @@ struct hashentry
- 
- 
- /* Current persistent database version.  */
--#define DB_VERSION	2
-+#define DB_VERSION	1
- 
- /* Maximum time allowed between updates of the timestamp.  */
- #define MAPPING_TIMEOUT (5 * 60)
- 
- 
--/* Used indices for the EXTRA_DATA element of 'database_pers_head'.
--   Each database has its own indices.  */
--#define NSCD_HST_IDX_CONF_TIMESTAMP	0
--
--
- /* Header of persistent database file.  */
- struct database_pers_head
- {
-@@ -279,8 +274,6 @@ struct database_pers_head
-   volatile int32_t gc_cycle;
-   volatile int32_t nscd_certainly_running;
-   volatile nscd_time_t timestamp;
--  /* Room for extensions.  */
--  volatile uint32_t extra_data[4];
- 
-   nscd_ssize_t module;
-   nscd_ssize_t data_size;
-@@ -329,12 +322,6 @@ extern int __nscd_open_socket (const char *key, size_t keylen,
- 			       request_type type, void *response,
- 			       size_t responselen) attribute_hidden;
- 
--/* Try to get a file descriptor for the shared meory segment
--   containing the database.  */
--extern struct mapped_database *__nscd_get_mapping (request_type type,
--						   const char *key,
--						   struct mapped_database **mappedp) attribute_hidden;
--
- /* Get reference of mapping.  */
- extern struct mapped_database *__nscd_get_map_ref (request_type type,
- 						   const char *name,
-@@ -384,7 +371,4 @@ extern ssize_t writeall (int fd, const void *buf, size_t len)
- extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len)
-   attribute_hidden;
- 
--/* Get netlink timestamp counter from mapped area or zero.  */
--extern uint32_t __nscd_get_nl_timestamp (void);
--
- #endif /* nscd.h */
-diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
-index 6ee142d..70631fa 100644
---- a/nscd/nscd_gethst_r.c
-+++ b/nscd/nscd_gethst_r.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009, 2011
-+/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-@@ -98,27 +98,6 @@ libc_freeres_fn (hst_map_free)
- }
- 
- 
--uint32_t
--__nscd_get_nl_timestamp (void)
--{
--  if (__nss_not_use_nscd_hosts != 0)
--    return 0;
--
--  struct mapped_database *map = __hst_map_handle.mapped;
--
--  if (map == NULL
--      || (map != NO_MAPPING
--	  && map->head->nscd_certainly_running == 0
--	  && map->head->timestamp + MAPPING_TIMEOUT < time (NULL)))
--    map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped);
--
--  if (map == NO_MAPPING)
--    return 0;
--
--  return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP];
--}
--
--
- int __nss_have_localdomain attribute_hidden;
- 
- static int
-diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
-index 365b599..fe63f9a 100644
---- a/nscd/nscd_helper.c
-+++ b/nscd/nscd_helper.c
-@@ -277,9 +277,9 @@ __nscd_unmap (struct mapped_database *mapped)
- 
- /* Try to get a file descriptor for the shared meory segment
-    containing the database.  */
--struct mapped_database *
--__nscd_get_mapping (request_type type, const char *key,
--		    struct mapped_database **mappedp)
-+static struct mapped_database *
-+get_mapping (request_type type, const char *key,
-+	     struct mapped_database **mappedp)
- {
-   struct mapped_database *result = NO_MAPPING;
- #ifdef SCM_RIGHTS
-@@ -449,8 +449,8 @@ __nscd_get_map_ref (request_type type, const char *name,
- 	  || (cur->head->nscd_certainly_running == 0
- 	      && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))
- 	  || cur->head->data_size > cur->datasize)
--	cur = __nscd_get_mapping (type, name,
--				  (struct mapped_database **) &mapptr->mapped);
-+	cur = get_mapping (type, name,
-+			   (struct mapped_database **) &mapptr->mapped);
- 
-       if (__builtin_expect (cur != NO_MAPPING, 1))
- 	{
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index 1a023f9..4979805 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2386,7 +2386,7 @@ getaddrinfo (const char *name, const char *service,
- 	       || (hints->ai_family == PF_INET6 && ! seen_ipv6))
- 	{
- 	  /* We cannot possibly return a valid answer.  */
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 	  return EAI_NONAME;
- 	}
-     }
-@@ -2400,7 +2400,7 @@ getaddrinfo (const char *name, const char *service,
- 	{
- 	  if (hints->ai_flags & AI_NUMERICSERV)
- 	    {
--	      __free_in6ai (in6ai);
-+	      free (in6ai);
- 	      return EAI_NONAME;
- 	    }
- 
-@@ -2422,7 +2422,7 @@ getaddrinfo (const char *name, const char *service,
-       if (last_i != 0)
- 	{
- 	  freeaddrinfo (p);
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 
- 	  return -(last_i & GAIH_EAI);
- 	}
-@@ -2434,7 +2434,7 @@ getaddrinfo (const char *name, const char *service,
-     }
-   else
-     {
--      __free_in6ai (in6ai);
-+      free (in6ai);
-       return EAI_FAMILY;
-     }
- 
-@@ -2622,7 +2622,7 @@ getaddrinfo (const char *name, const char *service,
-       p->ai_canonname = canonname;
-     }
- 
--  __free_in6ai (in6ai);
-+  free (in6ai);
- 
-   if (p)
-     {
-diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
-index e684b16..c907af4 100644
---- a/sysdeps/unix/sysv/linux/Makefile
-+++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -173,6 +173,6 @@ CFLAGS-mq_receive.c += -fexceptions
- endif
- 
- ifeq ($(subdir),nscd)
--sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY -DHAVE_NETLINK
-+sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY
- CFLAGS-gai.c += -DNEED_NETLINK
- endif
-diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
-index 0738a70..d5ad7ea 100644
---- a/sysdeps/unix/sysv/linux/check_pf.c
-+++ b/sysdeps/unix/sysv/linux/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Linux version.
--   Copyright (C) 2003, 2006-2008, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006, 2007, 2008, 2010, 2011 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
-@@ -33,9 +33,6 @@
- 
- #include <not-cancel.h>
- #include <kernel-features.h>
--#include <bits/libc-lock.h>
--#include <atomic.h>
--#include <nscd/nscd-client.h>
- 
- 
- #ifndef IFA_F_HOMEADDRESS
-@@ -46,42 +43,9 @@
- #endif
- 
- 
--struct cached_data
--{
--  uint32_t timestamp;
--  uint32_t usecnt;
--  bool seen_ipv4;
--  bool seen_ipv6;
--  size_t in6ailen;
--  struct in6addrinfo in6ai[0];
--};
--
--static struct cached_data noai6ai_cached =
--  {
--    .usecnt = 1,	/* Make sure we never try to delete this entry.  */
--    .in6ailen = 0
--  };
--
--static struct cached_data *cache;
--__libc_lock_define_initialized (static, lock);
--
--
--#ifdef IS_IN_nscd
--static uint32_t nl_timestamp;
--
--uint32_t
--__bump_nl_timestamp (void)
--{
--  if (atomic_increment_val (&nl_timestamp) == 0)
--    atomic_increment (&nl_timestamp);
--
--  return nl_timestamp;
--}
--#endif
--
--
--static struct cached_data *
--make_request (int fd, pid_t pid)
-+static int
-+make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
-+	      struct in6addrinfo **in6ai, size_t *in6ailen)
- {
-   struct req
-   {
-@@ -135,6 +99,9 @@ make_request (int fd, pid_t pid)
- 				    sizeof (nladdr))) < 0)
-     goto out_fail;
- 
-+  *seen_ipv4 = false;
-+  *seen_ipv6 = false;
-+
-   bool done = false;
-   struct in6ailist
-   {
-@@ -142,8 +109,6 @@ make_request (int fd, pid_t pid)
-     struct in6ailist *next;
-   } *in6ailist = NULL;
-   size_t in6ailistlen = 0;
--  bool seen_ipv4 = false;
--  bool seen_ipv6 = false;
- 
-   do
-     {
-@@ -207,12 +172,12 @@ make_request (int fd, pid_t pid)
- 		    {
- 		      if (*(const in_addr_t *) address
- 			  != htonl (INADDR_LOOPBACK))
--			seen_ipv4 = true;
-+			*seen_ipv4 = true;
- 		    }
- 		  else
- 		    {
- 		      if (!IN6_IS_ADDR_LOOPBACK (address))
--			seen_ipv6 = true;
-+			*seen_ipv6 = true;
- 		    }
- 		}
- 
-@@ -246,47 +211,30 @@ make_request (int fd, pid_t pid)
-     }
-   while (! done);
- 
--  struct cached_data *result;
--  if (seen_ipv6 && in6ailist != NULL)
-+  if (*seen_ipv6 && in6ailist != NULL)
-     {
--      result = malloc (sizeof (*result)
--		       + in6ailistlen * sizeof (struct in6addrinfo));
--      if (result == NULL)
-+      *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
-+      if (*in6ai == NULL)
- 	goto out_fail;
- 
--#ifdef IS_IN_nscd
--      result->timestamp = nl_timestamp;
--#else
--      result->timestamp = __nscd_get_nl_timestamp ();
--#endif
--      result->usecnt = 2;
--      result->seen_ipv4 = seen_ipv4;
--      result->seen_ipv6 = true;
--      result->in6ailen = in6ailistlen;
-+      *in6ailen = in6ailistlen;
- 
-       do
- 	{
--	  result->in6ai[--in6ailistlen] = in6ailist->info;
-+	  (*in6ai)[--in6ailistlen] = in6ailist->info;
- 	  in6ailist = in6ailist->next;
- 	}
-       while (in6ailist != NULL);
-     }
--  else
--    {
--      atomic_add (&noai6ai_cached.usecnt, 2);
--      noai6ai_cached.seen_ipv4 = seen_ipv4;
--      noai6ai_cached.seen_ipv6 = seen_ipv6;
--      result = &noai6ai_cached;
--    }
- 
-   if (use_malloc)
-     free (buf);
--  return result;
-+  return 0;
- 
- out_fail:
-   if (use_malloc)
-     free (buf);
--  return NULL;
-+  return -1;
- }
- 
- 
-@@ -310,65 +258,28 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   if (! __no_netlink_support)
-     {
--      struct cached_data *olddata = NULL;
--      struct cached_data *data = NULL;
-+      int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- 
--      __libc_lock_lock (lock);
--
--#ifdef IS_IN_nscd
--# define cache_valid() nl_timestamp != 0 && cache->timestamp == nl_timestamp
--#else
--# define cache_valid() \
--      ({ uint32_t val = __nscd_get_nl_timestamp ();			      \
--	 val != 0 && cache->timestamp == val; })
--#endif
--      if (cache != NULL && cache_valid ())
--	{
--	  data = cache;
--	  atomic_increment (&cache->usecnt);
--	}
--      else
-+      if (__builtin_expect (fd >= 0, 1))
- 	{
--	  int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-+	  struct sockaddr_nl nladdr;
-+	  memset (&nladdr, '\0', sizeof (nladdr));
-+	  nladdr.nl_family = AF_NETLINK;
- 
--	  if (__builtin_expect (fd >= 0, 1))
--	    {
--	      struct sockaddr_nl nladdr;
--	      memset (&nladdr, '\0', sizeof (nladdr));
--	      nladdr.nl_family = AF_NETLINK;
--
--	      socklen_t addr_len = sizeof (nladdr);
--
--	      if(__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
--		 && __getsockname (fd, (struct sockaddr *) &nladdr,
--				   &addr_len) == 0)
--		data = make_request (fd, nladdr.nl_pid);
--
--	      close_not_cancel_no_status (fd);
--	    }
--
--	  if (data != NULL)
--	    {
--	      olddata = cache;
--	      cache = data;
--	    }
--	}
-+	  socklen_t addr_len = sizeof (nladdr);
- 
--      __libc_lock_unlock (lock);
-+	  bool success
-+	    = (__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
-+	       && __getsockname (fd, (struct sockaddr *) &nladdr,
-+				 &addr_len) == 0
-+	       && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
-+				in6ai, in6ailen) == 0);
- 
--      if (data != NULL)
--	{
--	  /* It worked.  */
--	  *seen_ipv4 = data->seen_ipv4;
--	  *seen_ipv6 = data->seen_ipv6;
--	  *in6ailen = data->in6ailen;
--	  *in6ai = data->in6ai;
--
--	  if (olddata != NULL && olddata->usecnt > 0
--	      && atomic_add_zero (&olddata->usecnt, -1))
--	    free (olddata);
-+	  close_not_cancel_no_status (fd);
- 
--	  return;
-+	  if (success)
-+	    /* It worked.  */
-+	    return;
- 	}
- 
- #if __ASSUME_NETLINK_SUPPORT == 0
-@@ -407,26 +318,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
-   (void) freeifaddrs (ifa);
- #endif
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *ai)
--{
--  if (ai != NULL)
--    {
--      struct cached_data *data =
--	(struct cached_data *) ((char *) ai
--				- offsetof (struct cached_data, in6ai));
--
--      if (atomic_add_zero (&data->usecnt, -1))
--	{
--	  __libc_lock_lock (lock);
--
--	  if (data->usecnt == 0)
--	    /* Still unused.  */
--	    free (data);
--
--	  __libc_lock_unlock (lock);
--	}
--    }
--}
diff --git a/multilib/lib32-glibc/glibc-2.15-rintf-rounding.patch b/multilib/lib32-glibc/glibc-2.15-rintf-rounding.patch
deleted file mode 100644
index e0240ac6c..000000000
--- a/multilib/lib32-glibc/glibc-2.15-rintf-rounding.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index 6243e1e..c8186c8 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -5037,6 +5037,22 @@ rint_test (void)
-   TEST_f_f (rint, 262142.75, 262143.0);
-   TEST_f_f (rint, 524286.75, 524287.0);
-   TEST_f_f (rint, 524288.75, 524289.0);
-+  TEST_f_f (rint, 1048576.75, 1048577.0);
-+  TEST_f_f (rint, 2097152.75, 2097153.0);
-+  TEST_f_f (rint, -1048576.75, -1048577.0);
-+  TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-   /* The result can only be represented in long double.  */
-   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5277,6 +5325,22 @@ rint_test_downward (void)
-       TEST_f_f (rint, -0.1, -1.0);
-       TEST_f_f (rint, -0.25, -1.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5347,6 +5411,22 @@ rint_test_upward (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
-index 9ea9b6f..9ba6b57 100644
---- a/sysdeps/ieee754/flt-32/s_rintf.c
-+++ b/sysdeps/ieee754/flt-32/s_rintf.c
-@@ -26,34 +26,22 @@ float
- __rintf(float x)
- {
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(j0==0x80) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	w = TWO23[sx]+x;
- 	return w-TWO23[sx];
- }
diff --git a/multilib/lib32-glibc/glibc-2.15-scanf.patch b/multilib/lib32-glibc/glibc-2.15-scanf.patch
deleted file mode 100644
index a2561b232..000000000
--- a/multilib/lib32-glibc/glibc-2.15-scanf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
-index 0e71deb..e18a6c3 100644
---- a/stdio-common/vfscanf.c
-+++ b/stdio-common/vfscanf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 1991-2007, 2010, 2011, 2012 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
-@@ -274,7 +274,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
- 	  CHAR_T *old = wp;						    \
- 	  size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax			    \
- 			    ? UCHAR_MAX + 1 : 2 * wpmax);		    \
--	  if (use_malloc || __libc_use_alloca (newsize))		    \
-+	  if (use_malloc || !__libc_use_alloca (newsize))		    \
- 	    {								    \
- 	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
- 	      if (wp == NULL)						    \
diff --git a/multilib/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch b/multilib/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
deleted file mode 100644
index 4c104fa55..000000000
--- a/multilib/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
-index f93c83d..d8aa889 100644
---- a/sysdeps/x86_64/multiarch/strcmp.S
-+++ b/sysdeps/x86_64/multiarch/strcmp.S
-@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
-	jne	1f
-	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strcasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
-	leaq	__strcasecmp_sse42(%rip), %rax
-	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
-	jnz	2f
-@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
-	jne	1f
-	call	__init_cpu_features
- 1:
--#  ifdef HAVE_AVX_SUPPORT
--	leaq	__strncasecmp_avx(%rip), %rax
--	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
--	jnz	2f
--#  endif
-	leaq	__strncasecmp_sse42(%rip), %rax
-	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
-	jnz	2f
-@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
- # include "strcmp-sse42.S"
-
-
--# ifdef HAVE_AVX_SUPPORT
--#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
--#   define LABEL(l) .L##l##_avx
--#   define GLABEL(l) l##_avx
--#   define USE_AVX 1
--#   undef STRCMP_SSE42
--#   define STRCMP_SSE42 STRCMP_AVX
--#   define SECTION avx
--#   include "strcmp-sse42.S"
--#  endif
--# endif
--
--
- # undef ENTRY
- # define ENTRY(name) \
-	.type STRCMP_SSE2, @function; \
diff --git a/multilib/lib32-glibc/glibc-2.15-testsuite.patch b/multilib/lib32-glibc/glibc-2.15-testsuite.patch
deleted file mode 100644
index 7eaeaed65..000000000
--- a/multilib/lib32-glibc/glibc-2.15-testsuite.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Mon, 16 Apr 2012 14:06:47 +1000
-Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
----
- ChangeLog       |   24 ++++++++++++++++++++++++
- elf/Makefile    |   21 ++++++++++++++++++++-
- nptl/ChangeLog  |    5 +++++
- nptl/Makefile   |    3 ++-
- stdlib/Makefile |    1 +
- 5 files changed, 52 insertions(+), 2 deletions(-)
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 57dcab0..47729c3 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb
- $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so
- $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so
- 
-+LDFLAGS-nodel2mod3.so = $(no-as-needed)
-+LDFLAGS-reldepmod5.so = $(no-as-needed)
-+LDFLAGS-reldep6mod1.so = $(no-as-needed)
-+LDFLAGS-reldep6mod4.so = $(no-as-needed)
-+LDFLAGS-reldep8mod3.so = $(no-as-needed)
-+LDFLAGS-unload4mod1.so = $(no-as-needed)
-+LDFLAGS-unload4mod2.so = $(no-as-needed)
-+LDFLAGS-tst-initorder = $(no-as-needed)
-+LDFLAGS-tst-initordera2.so = $(no-as-needed)
-+LDFLAGS-tst-initordera3.so = $(no-as-needed)
-+LDFLAGS-tst-initordera4.so = $(no-as-needed)
-+LDFLAGS-tst-initorderb2.so = $(no-as-needed)
- LDFLAGS-tst-tlsmod5.so = -nostdlib
- LDFLAGS-tst-tlsmod6.so = -nostdlib
- 
-@@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so)
- vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so)
- 
- $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so
--LDFLAGS-noload = -rdynamic
-+LDFLAGS-noload = -rdynamic $(no-as-needed)
- $(objpfx)noload.out: $(objpfx)testobj5.so
- 
- $(objpfx)noload-mem: $(objpfx)noload.out
-@@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl)
- $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so
- 
- $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl)
-+LDFLAGS-next = $(no-as-needed)
- 
- $(objpfx)unload2: $(libdl)
- $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so
-@@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so
- $(objpfx)order2mod4.so: $(objpfx)order2mod3.so
- $(objpfx)order2mod2.so: $(objpfx)order2mod3.so
- order2mod2.so-no-z-defs = yes
-+LDFLAGS-order2mod1.so = $(no-as-needed)
-+LDFLAGS-order2mod2.so = $(no-as-needed)
- 
- tst-stackguard1-ARGS = --command "$(built-program-cmd) --child"
- tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
-@@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so
- $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so
- $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so
- $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so
-+LDFLAGS-tst-initorder2 = $(no-as-needed)
-+LDFLAGS-tst-initorder2a.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2b.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2c.so = $(no-as-needed)
- define o-iterator-doit
- $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \
- $$(compile-command.c) -DNAME=\"$o\"
-diff --git a/nptl/Makefile b/nptl/Makefile
-index 09acd8a..07a1022 100644
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library)
- $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so
- 
- $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library)
-+LDFLAGS-tst-tls5 = $(no-as-needed)
- LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so
- 
- ifeq ($(build-shared),yes)
-@@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a
- $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a
- endif
- 
--LDFLAGS-tst-cancel24 = -lstdc++
-+LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++
- 
- extra-B-pthread.so = -B$(common-objpfx)nptl/
- $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index 44eb20d..f7811c5 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
- 	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/
- 
- $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so
-+LDFLAGS-tst-putenv = $(no-as-needed)
- 
- $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os
- 	$(build-module)
--- 
-1.7.3.4
-
diff --git a/multilib/lib32-glibc/glibc-2.15-vdso.patch b/multilib/lib32-glibc/glibc-2.15-vdso.patch
deleted file mode 100644
index 7fd394f90..000000000
--- a/multilib/lib32-glibc/glibc-2.15-vdso.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/elf/Makefile b/elf/Makefile
-index 8234ba7..25ffc57 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
- $(objpfx)tst-relsort1mod2.so: $(libm)
- $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
- 			   $(objpfx)tst-relsort1mod2.so
-+
-+tests: $(objpfx)tst-unused-dep.out
-+
-+$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
-+	LD_TRACE_LOADED_OBJECTS=1 \
-+	LD_DEBUG=unused \
-+	LD_PRELOAD= \
-+	$(elf-objpfx)${rtld-installed-name} \
-+	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
-+	  $< > $@
-+	cmp $@ /dev/null > /dev/null
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2e4f97f..3e15447 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1,5 +1,5 @@
- /* Run time dynamic linker.
--   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2012 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
-@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	  _dl_setup_hash (l);
- 	  l->l_relocated = 1;
- 
-+	  /* The vDSO is always used.  */
-+	  l->l_used = 1;
-+
- 	  /* Initialize l_local_scope to contain just this map.  This allows
- 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
- 	     So we create a single entry list pointing to l_real as its only
diff --git a/multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch b/multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
deleted file mode 100644
index f8dde53f5..000000000
--- a/multilib/lib32-glibc/glibc-2.15-vfprintf-nargs.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/stdio-common/Makefile b/stdio-common/Makefile
-index a847b28..080badc 100644
---- a/stdio-common/Makefile
-+++ b/stdio-common/Makefile
-@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
- 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
- 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
- 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
--	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
-+	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
-+	 bug-vfprintf-nargs
- 
- test-srcs = tst-unbputc tst-printf
- 
-diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
-new file mode 100644
-index 0000000..13c66c0
---- /dev/null
-+++ b/stdio-common/bug-vfprintf-nargs.c
-@@ -0,0 +1,78 @@
-+/* Test for vfprintf nargs allocation overflow (BZ #13656).
-+   Copyright (C) 2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Kees Cook <keescook@chromium.org>, 2012.
-+
-+   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 <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <unistd.h>
-+#include <inttypes.h>
-+#include <string.h>
-+#include <signal.h>
-+
-+static int
-+format_failed (const char *fmt, const char *expected)
-+{
-+  char output[80];
-+
-+  printf ("%s : ", fmt);
-+
-+  memset (output, 0, sizeof output);
-+  /* Having sprintf itself detect a failure is good.  */
-+  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
-+      && strcmp (output, expected) != 0)
-+    {
-+      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
-+      return 1;
-+    }
-+  puts ("ok");
-+  return 0;
-+}
-+
-+static int
-+do_test (void)
-+{
-+  int rc = 0;
-+  char buf[64];
-+
-+  /* Regular positionals work.  */
-+  if (format_failed ("%1$d", "1") != 0)
-+    rc = 1;
-+
-+  /* Regular width positionals work.  */
-+  if (format_failed ("%1$*2$d", " 1") != 0)
-+    rc = 1;
-+
-+  /* Positional arguments are constructed via read_int, so nargs can only
-+     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
-+     allocate a giant amount of memory and possibly crash, which is the
-+     expected situation.  Since the 64-bit behavior is arch-specific, only
-+     test this on 32-bit systems.  */
-+  if (sizeof (long int) == 4)
-+    {
-+      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
-+      if (format_failed (buf, "1 %$d") != 0)
-+        rc = 1;
-+    }
-+
-+  return rc;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
-index 863cd5d..c802e46 100644
---- a/stdio-common/vfprintf.c
-+++ b/stdio-common/vfprintf.c
-@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
-      0 if unknown.  */
-   int readonly_format = 0;
- 
-+  /* For the argument descriptions, which may be allocated on the heap.  */
-+  void *args_malloced = NULL;
-+
-   /* This table maps a character into a number representing a
-      class.  In each step there is a destination label for each
-      class.  */
-@@ -1647,9 +1650,10 @@ do_positional:
-        determine the size of the array needed to store the argument
-        attributes.  */
-     size_t nargs = 0;
--    int *args_type;
--    union printf_arg *args_value = NULL;
-+    size_t bytes_per_arg;
-+    union printf_arg *args_value;
-     int *args_size;
-+    int *args_type;
- 
-     /* Positional parameters refer to arguments directly.  This could
-        also determine the maximum number of arguments.  Track the
-@@ -1698,13 +1702,38 @@ do_positional:
- 
-     /* Determine the number of arguments the format string consumes.  */
-     nargs = MAX (nargs, max_ref_arg);
-+    /* Calculate total size needed to represent a single argument across
-+       all three argument-related arrays.  */
-+    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
-+                    + sizeof (*args_type);
-+
-+    /* Check for potential integer overflow.  */
-+    if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0))
-+      {
-+         __set_errno (ERANGE);
-+         done = -1;
-+         goto all_done;
-+      }
- 
--    /* Allocate memory for the argument descriptions.  */
--    args_type = alloca (nargs * sizeof (int));
-+    /* Allocate memory for all three argument arrays.  */
-+    if (__libc_use_alloca (nargs * bytes_per_arg))
-+        args_value = alloca (nargs * bytes_per_arg);
-+    else
-+      {
-+        args_value = args_malloced = malloc (nargs * bytes_per_arg);
-+        if (args_value == NULL)
-+          {
-+            done = -1;
-+            goto all_done;
-+          }
-+      }
-+
-+    /* Set up the remaining two arrays to each point past the end of the
-+       prior array, since space for all three has been allocated now.  */
-+    args_size = &args_value[nargs].pa_int;
-+    args_type = &args_size[nargs];
-     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
--	    nargs * sizeof (int));
--    args_value = alloca (nargs * sizeof (union printf_arg));
--    args_size = alloca (nargs * sizeof (int));
-+	    nargs * sizeof (*args_type));
- 
-     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
-        still zero after this loop, format is invalid.  For now we
-@@ -1973,8 +2002,8 @@ do_positional:
-   }
- 
- all_done:
--  if (__builtin_expect (workstart != NULL, 0))
--    free (workstart);
-+  free (args_malloced);
-+  free (workstart);
-   /* Unlock the stream.  */
-   _IO_funlockfile (s);
-   _IO_cleanup_region_end (0);
diff --git a/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch b/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch
deleted file mode 100644
index 822b57294..000000000
--- a/multilib/lib32-glibc/glibc-2.16-rpcgen-cpp-path.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
-index 06d951a..2103b10 100644
---- a/sunrpc/rpc_main.c
-+++ b/sunrpc/rpc_main.c
-@@ -75,12 +75,9 @@ struct commandline
- 
- static const char *cmdname;
- 
--#define SVR4_CPP "/usr/ccs/lib/cpp"
--#define SUNOS_CPP "/lib/cpp"
--
- static const char *svcclosetime = "120";
- static int cppDefined;	/* explicit path for C preprocessor */
--static const char *CPP = SUNOS_CPP;
-+static const char *CPP = "/lib/cpp";
- static const char CPPFLAGS[] = "-C";
- static char *pathbuf;
- static int cpp_pid;
-@@ -327,23 +324,17 @@ find_cpp (void)
- {
-   struct stat buf;
- 
--  if (stat (CPP, &buf) < 0)
--    {				/* /lib/cpp or explicit cpp does not exist */
--      if (cppDefined)
--	{
--	  fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
--	  crash ();
--	}
--      else
--	{			/* try the other one */
--	  CPP = SVR4_CPP;
--	  if (stat (CPP, &buf) < 0)
--	    {			/* can't find any cpp */
--	      fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
--	      crash ();
--	    }
--	}
-+  if (stat (CPP, &buf) == 0)
-+    return;
-+
-+  if (cppDefined) /* user specified cpp but it does not exist */
-+    {
-+      fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+      crash ();
-     }
-+
-+  /* fall back to system CPP */
-+  CPP = "cpp";
- }
- 
- /*
-@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define)
-       close (1);
-       dup2 (pd[1], 1);
-       close (pd[0]);
--      execv (arglist[0], (char **) arglist);
--      perror ("execv");
-+      execvp (arglist[0], (char **) arglist);
-+      if (errno == ENOENT)
-+        {
-+          fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+          exit (1);
-+        }
-+      perror ("execvp");
-       exit (1);
-     case -1:
-       perror ("fork");
diff --git a/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch b/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch
deleted file mode 100644
index ce91bbe82..000000000
--- a/multilib/lib32-glibc/glibc-2.16-strncasecmp-segfault.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c
-index 6c17530..acfe668 100644
---- a/string/test-strncasecmp.c
-+++ b/string/test-strncasecmp.c
-@@ -1,5 +1,5 @@
- /* Test and measure strncasecmp functions.
--   Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc.
-+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
- 
-@@ -251,9 +251,9 @@ do_random_tests (void)
-     }
- }
- 
--
-+/* Regression test for BZ #12205 */
- static void
--check1 (void)
-+bz12205 (void)
- {
-   static char cp [4096+16] __attribute__ ((aligned(4096)));
-   static char gotrel[4096] __attribute__ ((aligned(4096)));
-@@ -270,6 +270,15 @@ check1 (void)
-     check_result (impl, s1, s2, n, exp_result);
- }
- 
-+/* Regression test for BZ #14195 */
-+static void
-+bz14195 (void)
-+{
-+  const char *empty_string  = "";
-+  FOR_EACH_IMPL (impl, 0)
-+    check_result (impl, empty_string, "", 5, 0);
-+}
-+
- int
- test_main (void)
- {
-@@ -277,7 +286,8 @@ test_main (void)
- 
-   test_init ();
- 
--  check1 ();
-+  bz12205 ();
-+  bz14195 ();
- 
-   printf ("%23s", "");
-   FOR_EACH_IMPL (impl, 0)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-index 5e6321e..9735ad0 100644
---- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-@@ -2445,7 +2445,7 @@ L(less16bytes_sncmp):
- # endif
- 	jne	L(neq_sncmp)
- 	test	%cl, %cl
--	je	L(eq)
-+	je	L(eq_sncmp)
- 
- 	cmp	$1, REM
- 	je	L(eq_sncmp)
--- 
-1.7.3.4
-
diff --git a/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch b/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch
deleted file mode 100644
index 526296325..000000000
--- a/multilib/lib32-glibc/glibc-2.16-strtod-overflow.patch
+++ /dev/null
@@ -1,389 +0,0 @@
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index f7811c5..79c9acb 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -68,7 +68,8 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
- 		   tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
- 		   tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2	    \
- 		   tst-makecontext2 tst-strtod6 tst-unsetenv1		    \
--		   tst-makecontext3 bug-getcontext bug-fmtmsg1
-+		   tst-makecontext3 bug-getcontext bug-fmtmsg1		    \
-+		   tst-strtod-overflow
- 
- include ../Makeconfig
- 
-diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
-index 2166a08..a8a7ea8 100644
---- a/stdlib/strtod_l.c
-+++ b/stdlib/strtod_l.c
-@@ -60,6 +60,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
- #include <math.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /* The gmp headers need some configuration frobs.  */
- #define HAVE_ALLOCA 1
-@@ -72,7 +73,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
- #include "longlong.h"
- #include "fpioconst.h"
- 
--#define NDEBUG 1
- #include <assert.h>
- 
- 
-@@ -174,19 +174,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1];
- /* Return a floating point number of the needed type according to the given
-    multi-precision number after possible rounding.  */
- static FLOAT
--round_and_return (mp_limb_t *retval, int exponent, int negative,
-+round_and_return (mp_limb_t *retval, intmax_t exponent, int negative,
- 		  mp_limb_t round_limb, mp_size_t round_bit, int more_bits)
- {
-   if (exponent < MIN_EXP - 1)
-     {
--      mp_size_t shift = MIN_EXP - 1 - exponent;
--
--      if (shift > MANT_DIG)
-+      if (exponent < MIN_EXP - 1 - MANT_DIG)
- 	{
- 	  __set_errno (ERANGE);
- 	  return 0.0;
- 	}
- 
-+      mp_size_t shift = MIN_EXP - 1 - exponent;
-+
-       more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0;
-       if (shift == MANT_DIG)
- 	/* This is a special case to handle the very seldom case where
-@@ -233,6 +233,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-       __set_errno (ERANGE);
-     }
- 
-+  if (exponent > MAX_EXP)
-+    goto overflow;
-+
-   if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0
-       && (more_bits || (retval[0] & 1) != 0
- 	  || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0))
-@@ -258,6 +261,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-     }
- 
-   if (exponent > MAX_EXP)
-+  overflow:
-     return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
- 
-   return MPN2FLOAT (retval, exponent, negative);
-@@ -271,7 +275,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-    factor for the resulting number (see code) multiply by it.  */
- static const STRING_TYPE *
- str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
--	    int *exponent
-+	    intmax_t *exponent
- #ifndef USE_WIDE_CHAR
- 	    , const char *decimal, size_t decimal_len, const char *thousands
- #endif
-@@ -301,6 +305,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
- 	      cy += __mpn_add_1 (n, n, *nsize, low);
- 	      if (cy != 0)
- 		{
-+		  assert (*nsize < MPNSIZE);
- 		  n[*nsize] = cy;
- 		  ++(*nsize);
- 		}
-@@ -335,7 +340,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
-     }
-   while (--digcnt > 0);
- 
--  if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB)
-+  if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt)
-     {
-       low *= _tens_in_limb[*exponent];
-       start = _tens_in_limb[cnt + *exponent];
-@@ -355,7 +360,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
-       cy = __mpn_mul_1 (n, n, *nsize, start);
-       cy += __mpn_add_1 (n, n, *nsize, low);
-       if (cy != 0)
--	n[(*nsize)++] = cy;
-+	{
-+	  assert (*nsize < MPNSIZE);
-+	  n[(*nsize)++] = cy;
-+	}
-     }
- 
-   return str;
-@@ -413,7 +421,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- {
-   int negative;			/* The sign of the number.  */
-   MPN_VAR (num);		/* MP representation of the number.  */
--  int exponent;			/* Exponent of the number.  */
-+  intmax_t exponent;		/* Exponent of the number.  */
- 
-   /* Numbers starting `0X' or `0x' have to be processed with base 16.  */
-   int base = 10;
-@@ -435,7 +443,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-   /* Points at the character following the integer and fractional digits.  */
-   const STRING_TYPE *expp;
-   /* Total number of digit and number of digits in integer part.  */
--  int dig_no, int_no, lead_zero;
-+  size_t dig_no, int_no, lead_zero;
-   /* Contains the last character read.  */
-   CHAR_TYPE c;
- 
-@@ -767,7 +775,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-      are all or any is really a fractional digit will be decided
-      later.  */
-   int_no = dig_no;
--  lead_zero = int_no == 0 ? -1 : 0;
-+  lead_zero = int_no == 0 ? (size_t) -1 : 0;
- 
-   /* Read the fractional digits.  A special case are the 'american
-      style' numbers like `16.' i.e. with decimal point but without
-@@ -789,12 +797,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	     (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c);
- 			       lo >= L_('a') && lo <= L_('f'); })))
- 	{
--	  if (c != L_('0') && lead_zero == -1)
-+	  if (c != L_('0') && lead_zero == (size_t) -1)
- 	    lead_zero = dig_no - int_no;
- 	  ++dig_no;
- 	  c = *++cp;
- 	}
-     }
-+  assert (dig_no <= (uintmax_t) INTMAX_MAX);
- 
-   /* Remember start of exponent (if any).  */
-   expp = cp;
-@@ -817,24 +826,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 
-       if (c >= L_('0') && c <= L_('9'))
- 	{
--	  int exp_limit;
-+	  intmax_t exp_limit;
- 
- 	  /* Get the exponent limit. */
- 	  if (base == 16)
--	    exp_limit = (exp_negative ?
--			 -MIN_EXP + MANT_DIG + 4 * int_no :
--			 MAX_EXP - 4 * int_no + 4 * lead_zero + 3);
-+	    {
-+	      if (exp_negative)
-+		{
-+		  assert (int_no <= (uintmax_t) (INTMAX_MAX
-+						 + MIN_EXP - MANT_DIG) / 4);
-+		  exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no;
-+		}
-+	      else
-+		{
-+		  if (int_no)
-+		    {
-+		      assert (lead_zero == 0
-+			      && int_no <= (uintmax_t) INTMAX_MAX / 4);
-+		      exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3;
-+		    }
-+		  else if (lead_zero == (size_t) -1)
-+		    {
-+		      /* The number is zero and this limit is
-+			 arbitrary.  */
-+		      exp_limit = MAX_EXP + 3;
-+		    }
-+		  else
-+		    {
-+		      assert (lead_zero
-+			      <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4);
-+		      exp_limit = (MAX_EXP
-+				   + 4 * (intmax_t) lead_zero
-+				   + 3);
-+		    }
-+		}
-+	    }
- 	  else
--	    exp_limit = (exp_negative ?
--			 -MIN_10_EXP + MANT_DIG + int_no :
--			 MAX_10_EXP - int_no + lead_zero + 1);
-+	    {
-+	      if (exp_negative)
-+		{
-+		  assert (int_no
-+			  <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG));
-+		  exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no;
-+		}
-+	      else
-+		{
-+		  if (int_no)
-+		    {
-+		      assert (lead_zero == 0
-+			      && int_no <= (uintmax_t) INTMAX_MAX);
-+		      exp_limit = MAX_10_EXP - (intmax_t) int_no + 1;
-+		    }
-+		  else if (lead_zero == (size_t) -1)
-+		    {
-+		      /* The number is zero and this limit is
-+			 arbitrary.  */
-+		      exp_limit = MAX_10_EXP + 1;
-+		    }
-+		  else
-+		    {
-+		      assert (lead_zero
-+			      <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1));
-+		      exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1;
-+		    }
-+		}
-+	    }
-+
-+	  if (exp_limit < 0)
-+	    exp_limit = 0;
- 
- 	  do
- 	    {
--	      exponent *= 10;
--	      exponent += c - L_('0');
--
--	      if (__builtin_expect (exponent > exp_limit, 0))
-+	      if (__builtin_expect ((exponent > exp_limit / 10
-+				     || (exponent == exp_limit / 10
-+					 && c - L_('0') > exp_limit % 10)), 0))
- 		/* The exponent is too large/small to represent a valid
- 		   number.  */
- 		{
-@@ -843,7 +908,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 		  /* We have to take care for special situation: a joker
- 		     might have written "0.0e100000" which is in fact
- 		     zero.  */
--		  if (lead_zero == -1)
-+		  if (lead_zero == (size_t) -1)
- 		    result = negative ? -0.0 : 0.0;
- 		  else
- 		    {
-@@ -862,6 +927,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 		  /* NOTREACHED */
- 		}
- 
-+	      exponent *= 10;
-+	      exponent += c - L_('0');
-+
- 	      c = *++cp;
- 	    }
- 	  while (c >= L_('0') && c <= L_('9'));
-@@ -930,7 +998,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	}
- #endif
-       startp += lead_zero + decimal_len;
--      exponent -= base == 16 ? 4 * lead_zero : lead_zero;
-+      assert (lead_zero <= (base == 16
-+			    ? (uintmax_t) INTMAX_MAX / 4
-+			    : (uintmax_t) INTMAX_MAX));
-+      assert (lead_zero <= (base == 16
-+			    ? ((uintmax_t) exponent
-+			       - (uintmax_t) INTMAX_MIN) / 4
-+			    : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN)));
-+      exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero;
-       dig_no -= lead_zero;
-     }
- 
-@@ -972,7 +1047,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	}
- 
-       /* Adjust the exponent for the bits we are shifting in.  */
--      exponent += bits - 1 + (int_no - 1) * 4;
-+      assert (int_no <= (uintmax_t) (exponent < 0
-+				     ? (INTMAX_MAX - bits + 1) / 4
-+				     : (INTMAX_MAX - exponent - bits + 1) / 4));
-+      exponent += bits - 1 + ((intmax_t) int_no - 1) * 4;
- 
-       while (--dig_no > 0 && idx >= 0)
- 	{
-@@ -1024,13 +1102,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-      really integer digits or belong to the fractional part; i.e. we normalize
-      123e-2 to 1.23.  */
-   {
--    register int incr = (exponent < 0 ? MAX (-int_no, exponent)
--			 : MIN (dig_no - int_no, exponent));
-+    register intmax_t incr = (exponent < 0
-+			      ? MAX (-(intmax_t) int_no, exponent)
-+			      : MIN ((intmax_t) dig_no - (intmax_t) int_no,
-+				     exponent));
-     int_no += incr;
-     exponent -= incr;
-   }
- 
--  if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0))
-+  if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0))
-     {
-       __set_errno (ERANGE);
-       return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
-@@ -1215,7 +1295,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-        digits we should have enough bits for the result.  The remaining
-        decimal digits give us the information that more bits are following.
-        This can be used while rounding.  (Two added as a safety margin.)  */
--    if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2)
-+    if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2)
-       {
- 	dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2;
- 	more_bits = 1;
-@@ -1223,7 +1303,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-     else
-       more_bits = 0;
- 
--    neg_exp = dig_no - int_no - exponent;
-+    neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent;
- 
-     /* Construct the denominator.  */
-     densize = 0;
-diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c
-new file mode 100644
-index 0000000..668d55b
---- /dev/null
-+++ b/stdlib/tst-strtod-overflow.c
-@@ -0,0 +1,48 @@
-+/* Test for integer/buffer overflow in strtod.
-+   Copyright (C) 2012 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
-+   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, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#define EXPONENT "e-2147483649"
-+#define SIZE 214748364
-+
-+static int
-+do_test (void)
-+{
-+  char *p = malloc (1 + SIZE + sizeof (EXPONENT));
-+  if (p == NULL)
-+    {
-+      puts ("malloc failed, cannot test for overflow");
-+      return 0;
-+    }
-+  p[0] = '1';
-+  memset (p + 1, '0', SIZE);
-+  memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT));
-+  double d = strtod (p, NULL);
-+  if (d != 0)
-+    {
-+      printf ("strtod returned wrong value: %a\n", d);
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
--- 
-1.7.3.4
-
diff --git a/multilib/lib32-glibc/glibc-__i686.patch b/multilib/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 16f84c536..000000000
--- a/multilib/lib32-glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c
-index 9c00dc0..f5d4df8 100644
---- a/nptl/sysdeps/pthread/pt-initfini.c
-+++ b/nptl/sysdeps/pthread/pt-initfini.c
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
-
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
-diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
-index 64ef400..726b1df 100644
---- a/sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
-
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
-
- /* For Linux we can use the system call table in the header file
-        /usr/include/asm/unistd.h
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-glu/PKGBUILD b/multilib/lib32-glu/PKGBUILD
deleted file mode 100644
index dcf535b67..000000000
--- a/multilib/lib32-glu/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 77675 2012-10-13 12:37:35Z bluewind $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=lib32-glu
-pkgver=9.0.0
-pkgrel=1
-pkgdesc="Mesa OpenGL utility library (32 bits)"
-arch=('x86_64')
-url="http://mesa.freedesktop.org/"
-license=('LGPL')
-depends=('lib32-libgl')
-makedepends=('gcc-multilib' 'lib32-mesa')
-options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.bz2)
-sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
-
-build() {
-  cd ${srcdir}/glu-$pkgver
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --disable-static \
-    --libdir=/usr/lib32 
-  make
-}
-
-check() {
-  cd "$srcdir/glu-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  make -k check
-}
-
-package() {
-  cd ${srcdir}/glu-$pkgver
-
-  make DESTDIR=${pkgdir} install
-  
-  rm -rf ${pkgdir}/usr/include
-}
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 8b23b1cc0..000000000
--- a/multilib/lib32-gmp/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 70673 2012-05-14 16:08:09Z bluewind $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: josephgbr <rafael.f.f1@gmail.com>
-
-_pkgbasename=gmp
-pkgname=lib32-$_pkgbasename
-pkgver=5.0.5
-pkgrel=1
-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.xz{,.sig})
-md5sums=('8aef50959acec2a1ad41d144ffe0f3b5'
-         '406e8878aadc51b134d1b3dd845261ee')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  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 dde7c6c56..000000000
--- a/multilib/lib32-gnutls/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 77613 2012-10-13 10:53:28Z bluewind $
-# 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.1.3
-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')
-depends=('lib32-zlib' 'lib32-nettle>=2.4' 'lib32-p11-kit>=0.12' 'lib32-libtasn1' $_pkgbasename)
-makedepends=('gcc-multilib' 'lib32-libidn')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${_pkgbasename}-${pkgver}.tar.xz{,.sig})
-md5sums=('8a7b47456f65ffa8c01c58461fed1388'
-         'ecd7bfe70612f88afd117124e18444df')
-
-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 56e68297d..000000000
--- a/multilib/lib32-gtk2/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 76654 2012-09-25 20:31:20Z 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.13
-pkgrel=1
-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=('35e1a01e46b02970b02ee9f299390d0aa57c1215ad2667bcd584b72f4ea6513d'
-            '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 350498187..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=2
-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 77d9d066e..000000000
--- a/multilib/lib32-keyutils/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 72487 2012-06-15 13:25:43Z bluewind $
-# 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=('d759680b2f23c99af95938f5026f25fb')
-
-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-krb5/PKGBUILD b/multilib/lib32-krb5/PKGBUILD
deleted file mode 100644
index fca3cecca..000000000
--- a/multilib/lib32-krb5/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 75216 2012-08-16 11:05:27Z bluewind $
-# Maintainer: Florian Pritz <flo@xinu.at>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-
-_pkgbasename=krb5
-pkgname=lib32-$_pkgbasename
-pkgver=1.10.3
-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')
-source=("http://web.mit.edu/kerberos/dist/${_pkgbasename}/1.10/${_pkgbasename}-${pkgver}-signed.tar"
-        'krb5-1.10.1-gcc47.patch')
-sha1sums=('04ab9837e5d1958158bcb30bd6480201089a0cbb'
-          '78b759d566b1fdefd9bbcd06df14f07f12effe96')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${_pkgbasename}-${pkgver}.tar.gz
-   cd "${srcdir}/${_pkgbasename}-${pkgver}/src"
-
-   # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized
-   # in this function [-Werror=maybe-uninitialized]
-   # As this is generated code, just ignore the complaint.
-   patch -Np2 -i ../../krb5-1.10.1-gcc47.patch
-   rm lib/krb5/krb/deltat.c
-
-   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/lib \
-               --libdir=/usr/lib32 \
-               --enable-shared \
-               --with-system-et \
-               --with-system-ss \
-               --disable-rpath \
-               --without-tcl \
-               --enable-dns-for-realm \
-               --with-ldap \
-               --without-system-verto
-
-   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.10.1-gcc47.patch b/multilib/lib32-krb5/krb5-1.10.1-gcc47.patch
deleted file mode 100644
index ffd01c2a3..000000000
--- a/multilib/lib32-krb5/krb5-1.10.1-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
---- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y	2011-09-06 07:34:32.000000000 -0400
-+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y	2012-03-24 13:15:11.543551318 -0400
-@@ -44,6 +44,7 @@
- #ifdef __GNUC__
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wuninitialized"
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- #endif
- 
- #include <ctype.h>
diff --git a/multilib/lib32-lcms/PKGBUILD b/multilib/lib32-lcms/PKGBUILD
deleted file mode 100644
index 676e6b541..000000000
--- a/multilib/lib32-lcms/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 63984 2012-02-08 18:50:52Z pschmitz $
-# Maintainer: Tobias Kieslich <neri@archlinux.org>
-# Contributor: Ben <contrasutra@myrealbox.com>
-
-_pkgbasename=lcms
-pkgname=lib32-$_pkgbasename
-pkgver=1.19
-pkgrel=4
-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 06d3ab5c9..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=3
-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 0031cdae6..000000000
--- a/multilib/lib32-libasyncns/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 63988 2012-02-08 18:51:39Z pschmitz $
-# 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=6
-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 e72787f26..000000000
--- a/multilib/lib32-libcanberra/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 63487 2012-02-05 11:45:14Z ibiru $
-# Maintainer: Florian Pritz <flo@xssn.at>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libcanberra
-pkgbase=lib32-$_pkgbasename
-pkgname=(lib32-libcanberra lib32-libcanberra-pulse)
-pkgver=0.28
-pkgrel=2
-pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification (32-bit)"
-arch=(x86_64)
-license=('LGPL')
-depends=('lib32-libvorbis' 'lib32-libtool' 'lib32-gtk2' 'lib32-alsa-lib' 'lib32-tdb'
-         $_pkgbasename)
-makedepends=('gtk-doc' lib32-libpulse gcc-multilib libtool-multilib)
-options=(!emptydirs)
-url=http://0pointer.de/lennart/projects/libcanberra
-source=("$url/$_pkgbasename-$pkgver.tar.gz")
-md5sums=('c198b4811598c4c161ff505e4531b02c')
-
-build() {
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
-      --disable-static --with-builtin=dso --enable-null --disable-oss \
-      --enable-alsa --disable-gstreamer --enable-pulse --disable-udev \
-      --libdir=/usr/lib32
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_lib32-libcanberra() {
-  optdepends=("$pkgbase-pulse: PulseAudio driver")
-
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/lib32/libcanberra-gtk.la"
-  rm -f "${pkgdir}/usr/lib32/gtk-2.0/modules/"*.la
-
-
-  # Split libcanberra-pulse
-  mkdir pulse-plugin
-  mv "${pkgdir}"/usr/lib32/${_pkgbasename}-${pkgver}/${_pkgbasename}-pulse.* pulse-plugin
-
-  rm -rf "${pkgdir}"/{etc,usr/{include,share,bin,lib32/gnome-settings-daemon-3.0}}
-}
-
-package_lib32-libcanberra-pulse() {
-  pkgdesc="PulseAudio plugin for libcanberra (32-bit)"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'lib32-libpulse')
-
-  cd "$srcdir/$_pkgbasename-$pkgver"
-
-  mkdir -p "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib32/${_pkgbasename}-${pkgver}" 
-}
diff --git a/multilib/lib32-libcap/PKGBUILD b/multilib/lib32-libcap/PKGBUILD
deleted file mode 100644
index 1cd23832f..000000000
--- a/multilib/lib32-libcap/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-#$Id: PKGBUILD 66705 2012-02-27 17:13:42Z ibiru $
-# 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=(ftp://ftp.archlinux.org/other/${_pkgbasename}/${_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 f7cfc6c50..000000000
--- a/multilib/lib32-libcups/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 74676 2012-08-01 19:35:45Z bluewind $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-_pkgbasename=libcups
-pkgname=lib32-$_pkgbasename
-pkgver=1.6.1
-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 fix-libusb-configure.patch)
-md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
-         '9cf39a66f21d1208a585367b25cf117b')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/cups-${pkgver}
-
-  patch -p1 -i "$srcdir/fix-libusb-configure.patch"
-  
-  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 --enable-libusb=no \
-	 --disable-avahi \
-     --with-optim="$CFLAGS" --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/cups-${pkgver}
-  make BUILDROOT=${pkgdir} install-libs
-}
-
diff --git a/multilib/lib32-libcups/fix-libusb-configure.patch b/multilib/lib32-libcups/fix-libusb-configure.patch
deleted file mode 100644
index 02476c0b8..000000000
--- a/multilib/lib32-libcups/fix-libusb-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4 cups-1.5.3/config-scripts/cups-common.m4
---- cups-1.5_2012-05-20_223115.3/config-scripts/cups-common.m4	2012-05-20 22:31:15.702071734 +0200
-+++ cups-1.5.3/config-scripts/cups-common.m4	2012-05-20 22:31:29.395622693 +0200
-@@ -216,7 +216,7 @@
- AC_SUBST(LIBUSB)
- 
- if test "x$PKGCONFIG" != x; then
--	if test x$enable_libusb = xyes -o $uname != Darwin; then
-+	if test x$enable_libusb = xyes -a $uname != Darwin; then
- 		AC_MSG_CHECKING(for libusb-1.0)
- 		if $PKGCONFIG --exists libusb-1.0; then
- 			AC_MSG_RESULT(yes)
diff --git a/multilib/lib32-libdrm-old/COPYING b/multilib/lib32-libdrm-old/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/multilib/lib32-libdrm-old/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/multilib/lib32-libdrm-old/PKGBUILD b/multilib/lib32-libdrm-old/PKGBUILD
deleted file mode 100644
index 3524bf0c6..000000000
--- a/multilib/lib32-libdrm-old/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 72575 2012-06-16 19:14:42Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=lib32-libdrm-old
-pkgname=(lib32-libdrm-old lib32-libdrm-nouveau1)
-pkgver=2.4.33
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services (32 bits)"
-arch=('x86_64')
-license=('custom')
-depends=('lib32-libpciaccess' 'lib32-glibc')
-makedepends=('gcc-multilib')
-options=('!libtool' '!emptydirs')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-)
-sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
-          '825ff5e0c4238b31bdea52f104bfec8949270e25'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-build() {
-  cd "libdrm-$pkgver"
- 
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" 
-
-  patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-      --disable-libkms \
-      --disable-intel \
-      --disable-radeon \
-      --enable-nouveau-experimental-api
-  make
-}
-
-package_lib32-libdrm-old() {
-  pkgdesc="Userspace interface to kernel DRM services - used as makedepends for nouveau-dri (32 bits)"
-  conflicts=('lib32-libdrm')
-  provides=("lib32-libdrm=$pkgver")
-
-  cd "libdrm-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib32/libdrm_nouveau.so.1*
-}
-
-package_lib32-libdrm-nouveau1() {
-  pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for nouveau-dri (32 bits)"
-  depends=('lib32-libdrm')
-
-  cd "libdrm-$pkgver"
-
-  make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
-  make -C nouveau DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
-  rm -rf "$pkgdir"/usr/include/  "$pkgdir"/usr/lib32/pkgconfig/libdrm_nouveau.pc  "$pkgdir"/usr/lib32/libdrm_nouveau.so
-}
diff --git a/multilib/lib32-libdrm-old/no-pthread-stubs.patch b/multilib/lib32-libdrm-old/no-pthread-stubs.patch
deleted file mode 100644
index 5430244f9..000000000
--- a/multilib/lib32-libdrm-old/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/multilib/lib32-libdrm/PKGBUILD b/multilib/lib32-libdrm/PKGBUILD
deleted file mode 100644
index 457ad9066..000000000
--- a/multilib/lib32-libdrm/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 75816 2012-09-01 16:40:55Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libdrm
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.39
-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)
-sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d'
-            '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930')
-
-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-vmwgfx-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 a8de91d9d..000000000
--- a/multilib/lib32-libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,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@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +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:1 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
diff --git a/multilib/lib32-libffi/PKGBUILD b/multilib/lib32-libffi/PKGBUILD
deleted file mode 100644
index 8714dbdf8..000000000
--- a/multilib/lib32-libffi/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 70523 2012-05-10 14:59:20Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=lib32-libffi
-pkgver=3.0.11
-pkgrel=1
-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')
-checkdepends=('dejagnu')
-options=('!libtool')
-source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz)
-md5sums=('f69b9693227d976835b4857b1ba7d0e3')
-
-build() {
-  cd "${srcdir}/libffi-${pkgver}"
-
-  export CC="gcc -m32"
-
-  ./configure --prefix=/usr \
-    --libdir=/usr/lib32 --libexecdir=/usr/lib32
-
-  make
-}
-
-check() {
-  cd "${srcdir}/libffi-${pkgver}"
-
-  make check
-}
-
-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 ebea314ea..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=5
-pkgdesc="Allows you to load glade interface files in a program at runtime (32-bit)"
-arch=('x86_64')
-license=('LGPL')
-depends=('lib32-gtk2' 'lib32-libxml2' "${_pkgbasename}")
-makedepends=('python2' 'pkgconfig' 'gcc-multilib')
-options=('!libtool')
-source=("http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/2.6/${_pkgbasename}-${pkgver}.tar.bz2"
-        'libglade-2.0.1-nowarning.patch')
-url='http://www.gnome.org'
-md5sums=('d1776b40f4e166b5e9c107f1c8fe4139'
-         '4f879c0ce550004905aa0fb24f25c353')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd "${srcdir}/${_pkgbasename}-${pkgver}"
-	patch -Np1 -i "${srcdir}/libglade-2.0.1-nowarning.patch"
-	PYTHON=python2 ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var --libdir=/usr/lib32
-	make
-}
-
-package() {
-	cd "${srcdir}/${_pkgbasename}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	rm -rf ${pkgdir}/usr/{bin,include,share}
-}
diff --git a/multilib/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 fa5c71c52..000000000
--- a/multilib/lib32-libice/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 68122 2012-03-18 14:15:01Z lcarlier $
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libice
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.8
-pkgrel=1
-pkgdesc="X11 Inter-Client Exchange library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('pkgconfig' 'xtrans>=1.2.5' 'gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libICE-${pkgver}.tar.bz2)
-license=('custom')
-sha1sums=('ddb14df8bbc43df7322978f5f9f802936e2a7324')
-
-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 1671a6d8d..000000000
--- a/multilib/lib32-libidn/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 73346 2012-07-06 15:32:51Z bluewind $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-_pkgbasename=libidn
-pkgname=lib32-$_pkgbasename
-pkgver=1.25
-pkgrel=1
-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)
-sha1sums=('92e64fd5a6428bda6ade2c3cde475b76455cd7dd')
-
-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 cd8b3bd19..000000000
--- a/multilib/lib32-libjpeg-turbo/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 73348 2012-07-06 15:36:04Z bluewind $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
-
-_pkgbasename=libjpeg-turbo
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.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)
-sha1sums=('a4992e102c6d88146709e8e6ce5896d5d0b5a361')
-
-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
-
-  # do not distributre libturbojpeg as it is unversioned
-  rm "$pkgdir"/usr/lib32/libturbojpeg.{so,a}
-
-  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 48f35c5bb..000000000
--- a/multilib/lib32-libldap/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 78742 2012-10-23 21:46:20Z bluewind $
-# Maintainer:
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-_pkgbasename=libldap
-pkgname=lib32-$_pkgbasename
-pkgver=2.4.33
-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=('5adae44897647c15ce5abbff313bc85a'
-         '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 26406b63a..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=6
-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 5367bfa70..000000000
--- a/multilib/lib32-libpciaccess/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 69230 2012-04-10 16:20:33Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-_pkgbasename=libpciaccess
-pkgname=lib32-${_pkgbasename}
-pkgver=0.13.1
-pkgrel=1
-pkgdesc="X11 PCI access library (32-bit"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-glibc' ${_pkgbasename})
-makedepends=('gcc-multilib' 'pkgconfig' 'xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/${_pkgbasename}-${pkgver}.tar.bz2)
-sha1sums=('ae4dcf27a1b52c6a1fd90b21165fbaecae34e8ac')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/include
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libphobos-ldc/PKGBUILD b/multilib/lib32-libphobos-ldc/PKGBUILD
deleted file mode 100644
index 4e2383460..000000000
--- a/multilib/lib32-libphobos-ldc/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 72029 2012-06-06 11:58:40Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-pkgname=lib32-libphobos-ldc
-pkgver=20121001
-pkgrel=1
-pkgdesc="libphobos for ldc (32-bit)"
-arch=('x86_64')
-url="http://www.dsource.org/projects/ldc"
-license=('BSD')
-depends=('llvm' 'libconfig')
-makedepends=('git' 'cmake')
-source=()
-md5sums=()
-
-_gitroot=git://github.com/ldc-developers/ldc.git
-_gitname=ldc
-_gitbranch=master
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [[ -d "$_gitname" ]]; then
-    cd "$_gitname" && git pull origin
-    msg "The local files are updated."
-  else
-    git clone --branch "$_gitbranch" "$_gitroot" "$_gitname"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone --recursive "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-	
-  mkdir build && cd build
-  cmake \
-      -DCMAKE_INSTALL_PREFIX=/usr \
-      -DINCLUDE_INSTALL_DIR=/usr/include/d/std-ldc \
-      -DMULTILIB=ON \
-      ..
-  make
-}
-
-package() {
-  cd "$srcdir/$_gitname-build"
-  
-  cd build
-  make DESTDIR=$pkgdir install
-  cd ..
-
-  # We don't want anything but the 32-bit libs
-  rm -rf $pkgdir/usr/{share,lib,include,bin} $pkgdir/etc
-
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/multilib/lib32-libphobos/PKGBUILD b/multilib/lib32-libphobos/PKGBUILD
deleted file mode 100644
index 3b2604c00..000000000
--- a/multilib/lib32-libphobos/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 72006 2012-06-05 14:34:01Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Anders Bergh <anders1@gmail.com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgname=('lib32-libphobos')
-_pkgname=dmd
-pkgver=2.060
-pkgrel=1
-pkgdesc="The phobos D standard library for DMD (32-bit)"
-arch=('x86_64')
-url="http://www.digitalmars.com/d/2.0/"
-source=(http://ftp.digitalmars.com/$_pkgname.$pkgver.zip)
-makedepends=('dmd')
-license=('custom')
-md5sums=('6cf237d16625bf37a757a413963fa999')
-
-build() {
-    cd $srcdir/dmd2/src/
-
-    cd druntime
-    make -f posix.mak MODEL=32
-
-    cd ../phobos
-    make -f posix.mak MODEL=32
-}
-
-package() {
-  install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime-linux32.a $pkgdir/usr/lib32/libdruntime.a
-  install -Dm644 $srcdir/dmd2/src/phobos/generated/linux/release/32/libphobos2.a $pkgdir/usr/lib32/libphobos2.a
-
-  install -Dm644 $srcdir/dmd2/src/druntime/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/multilib/lib32-libpng/PKGBUILD b/multilib/lib32-libpng/PKGBUILD
deleted file mode 100644
index fd551c764..000000000
--- a/multilib/lib32-libpng/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 78580 2012-10-21 10:51:35Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Travis Willard <travis@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-_pkgbasename=libpng
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.13
-_apngver=1.5.13
-_libversion=15
-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=('0b607a685da977f1bfc96e1c47055183'
-         '23c8765aa6ca188c0575386d5ea8fe70')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i "${srcdir}/libpng-${_apngver}-apng.patch"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 --program-suffix=-32
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L${pkgdir}/usr/lib32 -lpng" -f makefile.std png2pnm pnm2png
-
-  rm -rf "${pkgdir}"/usr/{include,share}
-
-  rm "$pkgdir/usr/bin/libpng-config"
-  ln -s "libpng${_libversion}-config-32" "$pkgdir/usr/bin/libpng-config-32"
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libpulse/PKGBUILD b/multilib/lib32-libpulse/PKGBUILD
deleted file mode 100644
index 39c398c93..000000000
--- a/multilib/lib32-libpulse/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 74083 2012-07-19 19:41:16Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <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=2.1
-pkgrel=1
-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=('ef6b347bf47abfb98080795f1583018ac959b4aeb4df916b879f9e1eaba0ca7f')
-
-_libs="libpulse.la libpulse-simple.la libpulse-mainloop-glib.la"
-_pkglibs="libpulsecommon-$pkgver.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 $_pkglibs
-}
-
-package() {
-  cd "$srcdir/pulseaudio-$pkgver"
-  make -j1 -C src DESTDIR="$pkgdir" \
-    lib_LTLIBRARIES="$_libs" pkglib_LTLIBRARIES="$_pkglibs" \
-    install-libLTLIBRARIES install-pkglibLTLIBRARIES
-  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 c339bc2df..000000000
--- a/multilib/lib32-libsm/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 68519 2012-03-26 10:02:01Z pschmitz $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libsm
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.1
-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=('8d354a165e330022ffd3606aba562b8c8154213d')
-
-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 ee8923b49..000000000
--- a/multilib/lib32-libsndfile/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 63998 2012-02-08 18:53:40Z pschmitz $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=libsndfile
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.25
-pkgrel=2
-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 66bd0c40e..000000000
--- a/multilib/lib32-libssh2/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Florian Pritz <flo@xssn.at>
-# $Id: PKGBUILD 71573 2012-05-29 20:53:52Z 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.4.2
-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)
-provides=('libssh2.so')
-makedepends=('zlib' "gcc-multilib")
-options=('!libtool')
-source=("http://www.libssh2.org/download/${_pkgbasename}-${pkgver}.tar.gz")
-md5sums=('42e2b3796ac07fc1dbafc7abcc002cd3')
-
-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 8d46308f9..000000000
--- a/multilib/lib32-libstdc++5/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 64034 2012-02-08 19:14:10Z pschmitz $
-
-pkgname=lib32-libstdc++5
-pkgver=3.3.6
-pkgrel=6
-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="-march=${CARCH/_/-} -O2 -pipe"
-  export CXXFLAGS="-march=${CARCH/_/-} -O2 -pipe"
-  cd ${srcdir}/gcc-${pkgver}
-
-  patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch
-
-  # fix build issue with recent gcc
-  sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c
-  # 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-libtasn1/PKGBUILD b/multilib/lib32-libtasn1/PKGBUILD
deleted file mode 100644
index 0020a2816..000000000
--- a/multilib/lib32-libtasn1/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: josephgbr <rafael.f.f1 at gmail.com>
-
-_pkgbase=libtasn1
-pkgname=lib32-${_pkgbase}
-pkgver=2.14
-pkgrel=1
-pkgdesc="The ASN.1 library used in GNUTLS (32 bit)"
-arch=('x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/libtasn1/"
-depends=('lib32-glibc' ${_pkgbase})
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=("http://ftp.gnu.org/gnu/libtasn1/${_pkgbase}-${pkgver}.tar.gz")
-sha1sums=('22f9e0b15f870c8e03ac9cc1ead969d4d84eb931')
-
-build() {
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-  cd ${_pkgbase}-${pkgver}
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${_pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}/usr/"{bin,include,share}
-}
diff --git a/multilib/lib32-libtiff/PKGBUILD b/multilib/lib32-libtiff/PKGBUILD
deleted file mode 100644
index d4df377fa..000000000
--- a/multilib/lib32-libtiff/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 77412 2012-10-09 17:13:39Z bluewind $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-_pkgbasename=libtiff
-pkgname=lib32-$_pkgbasename
-pkgver=4.0.3
-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=('652e97b78f1444237a82cbcfe014310e776eb6f0')
-
-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/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-libvorbis/PKGBUILD b/multilib/lib32-libvorbis/PKGBUILD
deleted file mode 100644
index 90f2a51de..000000000
--- a/multilib/lib32-libvorbis/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63966 2012-02-08 18:15:30Z pschmitz $
-
-_pkgbasename=libvorbis
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.3
-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=('6b1a36f0d72332fae5130688e65efe1f')
-
-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 22dfd8467..000000000
--- a/multilib/lib32-libx11/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 71890 2012-06-02 22:15:54Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libx11
-pkgname=lib32-$_pkgbasename
-pkgver=1.5.0
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxcb' $_pkgbasename)
-makedepends=('xorg-util-macros' 'xextproto' 'xtrans' 'inputproto' 'gcc-multilib')
-options=('!libtool')
-license=('custom:XFREE86')
-source=(${url}/releases/individual/lib/libX11-${pkgver}.tar.bz2)
-sha256sums=('c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86')
-
-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
-}
-
-check() {
-  cd "${srcdir}/libX11-${pkgver}"
-
-  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 639982b3e..000000000
--- a/multilib/lib32-libxau/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 67296 2012-03-07 21:48:41Z lcarlier $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxau
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.7
-pkgrel=1
-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=('29c47207fd246425b906f525b2220235ce4cd0f6')
-
-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 667ce6442..000000000
--- a/multilib/lib32-libxcb/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 77408 2012-10-09 17:00:03Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.9
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('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=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
-
-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 \
-	  --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-libxcb/libxcb-1.1-no-pthread-stubs.patch b/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index 8e8162f0a..000000000
--- a/multilib/lib32-libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/multilib/lib32-libxcomposite/PKGBUILD b/multilib/lib32-libxcomposite/PKGBUILD
deleted file mode 100644
index 00f738746..000000000
--- a/multilib/lib32-libxcomposite/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 68124 2012-03-18 14:19:25Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxcomposite
-pkgname=lib32-$_pkgbasename
-pkgver=0.4.3
-pkgrel=3
-pkgdesc="X11 Composite extension library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxfixes' $_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 3eddfe8f3..000000000
--- a/multilib/lib32-libxcursor/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 68501 2012-03-26 09:34:47Z pschmitz $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-_pkgbasename=libxcursor
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.13
-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=('4e461d9e4324689ca8a84706926a8c0fe9470e47')
-
-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 f2e14db63..000000000
--- a/multilib/lib32-libxdamage/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 64004 2012-02-08 18:54:49Z pschmitz $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxdamage
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.3
-pkgrel=4
-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 e752e47e3..000000000
--- a/multilib/lib32-libxdmcp/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 68119 2012-03-18 14:10:22Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxdmcp
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="X11 Display Manager Control Protocol library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('xorg-util-macros' 'gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXdmcp-${pkgver}.tar.bz2)
-sha1sums=('3b63e8fc1600c51d9897d017da190fc6c16245b6')
-
-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 62a2f33fb..000000000
--- a/multilib/lib32-libxext/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 68130 2012-03-18 14:30:49Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxext
-pkgname=lib32-$_pkgbasename
-pkgver=1.3.1
-pkgrel=1
-pkgdesc="X11 miscellaneous extensions library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libx11' $_pkgbasename)
-makedepends=('xorg-util-macros' 'gcc-multilib')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXext-${pkgver}.tar.bz2)
-sha1sums=('764ac472ae19a0faade193717a9e0938d3430aaa')
-
-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 8437fd608..000000000
--- a/multilib/lib32-libxft/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 71892 2012-06-02 22:18:20Z lcarlier $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=libxft
-pkgname=lib32-$_pkgbasename
-pkgver=2.3.1
-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)
-sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd')
-
-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 491eb7f7a..000000000
--- a/multilib/lib32-libxi/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 70677 2012-05-14 16:09:29Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxi
-pkgname=lib32-$_pkgbasename
-pkgver=1.6.1
-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=('4b53b41fdaa3acc86606c696c68d5eed11454612')
-
-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 1866d37bf..000000000
--- a/multilib/lib32-libxinerama/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 68126 2012-03-18 14:24:08Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-_pkgbasename=libxinerama
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.2
-pkgrel=1
-pkgdesc="X11 Xinerama extension library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxext' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=(!libtool)
-source=(${url}/releases/individual/lib/libXinerama-${pkgver}.tar.bz2)
-sha1sums=('06a5b636305725ce09f6c3a4d5a15f2f188b5afd')
-
-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 df40bd417..000000000
--- a/multilib/lib32-libxml2/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 75224 2012-08-16 11:15:20Z bluewind $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-_pkgbasename=libxml2
-pkgname=lib32-$_pkgbasename
-pkgver=2.8.0
-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)
-md5sums=('c62106f02ee00b6437f0fb9d370c1093')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  autoreconf -fi
-  ./configure --prefix=/usr --with-threads --with-history --libdir=/usr/lib32 --without-lzma
-  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 1e93066c8..000000000
--- a/multilib/lib32-libxmu/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 68508 2012-03-26 09:56:19Z pschmitz $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxmu
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.1
-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=('3e280aa927d78c05f94db6c7ae606f7ad132b495')
-
-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 52775b592..000000000
--- a/multilib/lib32-libxrandr/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 75218 2012-08-16 11:10:49Z bluewind $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxrandr
-pkgname=lib32-$_pkgbasename
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="X11 RandR extension library (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' 'lib32-libxrender' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
-sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3')
-
-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 0cefc7049..000000000
--- a/multilib/lib32-libxrender/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 68515 2012-03-26 09:59:41Z pschmitz $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxrender
-pkgname=lib32-$_pkgbasename
-pkgver=0.9.7
-pkgrel=1
-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=('6e4d75d8316d5217324258f555eba3a5d383feb2')
-
-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 ccbe68da4..000000000
--- a/multilib/lib32-libxss/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 68133 2012-03-18 14:34:31Z lcarlier $
-# 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.2
-pkgrel=1
-pkgdesc="X11 Screen Saver extension library (32-bit)"
-arch=(x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXScrnSaver-${pkgver}.tar.bz2)
-sha1sums=('7b8298eec371c33a71232e3653370a98f03c6c88')
-
-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 db1f91cfb..000000000
--- a/multilib/lib32-libxt/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 68521 2012-03-26 10:02:30Z pschmitz $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxt
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.3
-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=('2cef068bc4d7170e31b89b5c06aeaf4451a7699a')
-
-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 c134a9cc8..000000000
--- a/multilib/lib32-libxtst/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 68135 2012-03-18 14:37:45Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxtst
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.1
-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' $_pkgbasename)
-makedepends=('gcc-multilib' 'xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXtst-${pkgver}.tar.bz2)
-sha1sums=('44e19899f9938d3db5546e51c338d6f86d88cfe2')
-
-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 93ca968ba..000000000
--- a/multilib/lib32-libxv/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 68517 2012-03-26 10:00:00Z pschmitz $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxv
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.7
-pkgrel=1
-pkgdesc="X11 Video extension library (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' $_pkgbasename)
-makedepends=('pkgconfig' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2)
-sha1sums=('49c87e0ccb999966b7b1b4e72cb927f05e0835bd')
-
-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 ea18b6cd4..000000000
--- a/multilib/lib32-libxvmc/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 68513 2012-03-26 09:57:55Z pschmitz $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxvmc
-pkgname=lib32-$_pkgbasename
-pkgver=1.0.7
-pkgrel=1
-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=('b8ee482514dfdf226694c830bdf292cc14e1cb91')
-
-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 e28a04cc4..000000000
--- a/multilib/lib32-libxxf86vm/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 68128 2012-03-18 14:27:44Z lcarlier $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-_pkgbasename=libxxf86vm
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.2
-pkgrel=1
-pkgdesc="X11 XFree86 video mode extension library (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxext' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXxf86vm-${pkgver}.tar.bz2)
-sha1sums=('57bbf3bb69a49f6a6dec515813394a383f85502f')
-
-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 3c2c123a8..000000000
--- a/multilib/lib32-llvm/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 74497 2012-07-29 17:55:12Z 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.1
-pkgrel=2
-arch=('x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('lib32-libffi' 'python2' 'gcc-multilib')
-source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz)
-sha256sums=('1ea05135197b5400c1f88d00ff280d775ce778f8f9ea042e25a1e1e734a4b9ab')
-
-build() {
-  cd "$srcdir/llvm-$pkgver.src"
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  rm -rf tools/clang
-  rm -rf projects/compiler-rt
-
-  # 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
-  sed -i '/ActiveLibDir = ActivePrefix/s:lib:lib32/llvm:' \
-    tools/llvm-config/llvm-config.cpp
-  sed -i 's:LLVM_LIBDIR="${prefix}/lib":LLVM_LIBDIR="${prefix}/lib32/llvm":' \
-    autoconf/configure.ac \
-    configure
-
-  # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
-  sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
-  # Apply strip option to configure
-  _optimized_switch="enable"
-  [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
-  # Include location of libffi headers in CPPFLAGS
-  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
-  # Use Python 2
-  mkdir "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
-  export PATH="$srcdir/python2-path:$PATH"
-
-  # We had to force host and target to get
-  # a proper triplet reported by llvm
-
-  ./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 \
-    --host=i386-pc-linux-gnu \
-    --target=i386-pc-linux-gnu \
-    --$_optimized_switch-optimized
-
-
-#    --with-cxx-include-arch=$CHOST \
-
-  make REQUIRES_RTTI=1
-}
-
-package() {
-  pkgdesc="Low Level Virtual Machine (32 bits version)"
-  depends=('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
-
-  mv "$pkgdir/usr/bin/llvm-config" "$pkgdir/usr/lib32/llvm-config"
-
-  # Get rid of example Hello transformation
-  rm "$pkgdir"/usr/lib32/llvm/*LLVMHello.*
-
-  # Symlink the gold plugin where clang expects it
-  ln -s llvm/LLVMgold.so "$pkgdir/usr/lib32/LLVMgold.so"
-
-  # Add ld.so.conf.d entry
-  install -d "$pkgdir/etc/ld.so.conf.d"
-  echo /usr/lib32/llvm >"$pkgdir/etc/ld.so.conf.d/llvm32.conf"
-
-  install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  mv "$pkgdir"/usr/include/llvm/Config/*config.h "$pkgdir/"
-  rm -r "$pkgdir"/usr/{bin,include,share/{doc,man}}
-  install -d "$pkgdir/usr/include/llvm/Config"
-  mv "$pkgdir/config.h" "$pkgdir/usr/include/llvm/Config/config-32.h"
-  mv "$pkgdir/llvm-config.h" "$pkgdir/usr/include/llvm/Config/llvm-config-32.h"
-
-  mkdir "$pkgdir"/usr/bin
-  mv "$pkgdir/usr/lib32/llvm-config" "$pkgdir/usr/bin/llvm-config32"
-}
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 284026eef..000000000
--- a/multilib/lib32-mesa/PKGBUILD
+++ /dev/null
@@ -1,257 +0,0 @@
-# $Id: PKGBUILD 77676 2012-10-13 12:39:51Z bluewind $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri'
-         'lib32-nouveau-dri') # lib32-libgbm needs udev
-#_git=true
-#_gitdate=20121005
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=8.99.git_$_gitdate
-  else
-    pkgver=9.0
-fi
-
-pkgrel=1
-arch=('x86_64')
-makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0'
-             'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2'
-             'gcc-multilib' 'imake' 'lib32-llvm')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-options=('!libtool')
-source=(git_fixes.diff)
-if [ "${_git}" = "true" ]; then
-  # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
-  #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-  source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz")
-else
-  source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2")
-fi
-md5sums=('2ebce12196dbb7b69bdf7ef53b8afdee'
-         '60e557ce407be3732711da484ab3db6c')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  # for our llvm-config for 32 bit
-  export LLVM_CONFIG=/usr/bin/llvm-config32
-
-  # fix segfault with gfx cards > Ati R700
-  export CFLAGS="${CFLAGS} -O1"
-  export CXXFLAGS="${CXXFLAGS} -O1"
-
-  cd ${srcdir}/?esa-*
-
-  # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-
-  COMMONOPTS="--prefix=/usr \
-    --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
-    --enable-gallium-llvm \
-    --disable-gallium-egl --enable-shared-glapi \
-    --enable-shared-glapi \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-gles1 \
-    --enable-gles2 \
-    --disable-egl \
-    --enable-texture-float \
-    --enable-osmesa \
-    --enable-32-bit \
-    --libdir=/usr/lib32 "
-    # --enable-gbm disabled because it needs udev
-
-  if [ "${_git}" = "true" ]; then
-    ./autogen.sh \
-      $COMMONOPTS
-  else
-    autoreconf -vfi
-    ./configure \
-      $COMMONOPTS
-  fi
-
-  make
-}
-
-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-*   
-
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi"
-}
-
-package_lib32-libgl() {
-  depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libglapi'
-           'libgl')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)"
-  # currently disabled so force the remove
-  conflicts=('lib32-libgbm')
-  replace=('lib32-libgbm')
-
-  cd ${srcdir}/?esa-*
-
-  # fix linking because of splitted package
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # libGL & libdricore
-  make -C src/glx DESTDIR="${pkgdir}" install
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-  
-  # --with-gallium-drivers=swrast
-  make -C src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  ln -s libgl "${pkgdir}/usr/share/licenses/libgl/lib32-libgl"
-}
-
-package_lib32-mesa() {
-  # check also gl.pc
-  depends=('lib32-libgl' 'lib32-libx11>=1.5.0' 'lib32-libxext>=1.3.1' 'lib32-libxdamage' 'lib32-libxfixes' 'lib32-libxcb'
-           'lib32-libxxf86vm' 'mesa')
-  pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)"
-
-  cd ${srcdir}/?esa-*
-
-  # .pc files
-  make -C src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
-  make -C src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa"
-}
-
-package_lib32-osmesa() {
-  depends=('lib32-libglapi' 'lib32-gcc-libs' 'osmesa')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library (32-bits)"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-}
-
-# package_lib32-libgbm() {
-#   depends=('lib32-libglapi' 'lib32-libdrm' 'libgbm')
-#   pkgdesc="Mesa gbm library (32-bit)"
-# 
-#   cd ${srcdir}/?esa-*
-# 
-#   # fix linking because of splitted package
-#   make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-# 
-#   make -C src/gbm DESTDIR="${pkgdir}" install
-# 
-#   # fix linking because of splitted package - cleanup
-#   make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-# 
-#   install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-#   ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm"
-# }
-
-package_lib32-libgles() {
-  depends=('lib32-libglapi' 'lib32-libdrm' 'libgles')
-  pkgdesc="Mesa GLES libraries (32-bit)"
-
-  cd ${srcdir}/?esa-*
-
-  # fix linking because of splitted package
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # --enable-gles1 --enable-gles2
-  make -C src/mapi/es1api DESTDIR="${pkgdir}" install
-  make -C src/mapi/es2api DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-  
-  rm -r "${pkgdir}"/usr/include
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles"
-}
-
-package_lib32-ati-dri() {
-  depends=("lib32-libgl=${pkgver}" 'ati-dri')
-  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-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # classic mesa drivers for radeon,r200
-  make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600
-  make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  make -C src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
-  ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri"
-}
-
-package_lib32-intel-dri() {
-  depends=("lib32-libgl=${pkgver}" 'intel-dri')
-  pkgdesc="Mesa DRI drivers for Intel (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  make -C src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
-  ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri"
-}
-
-package_lib32-nouveau-dri() {
-  depends=("lib32-libgl=${pkgver}" 'nouveau-dri')
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)"
-
-  cd ${srcdir}/?esa-*
-  
-  # fix linking because of splitted package
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
-  ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri"
-}
-
diff --git a/multilib/lib32-mesa/git_fixes.diff b/multilib/lib32-mesa/git_fixes.diff
deleted file mode 100644
index 8132d1d10..000000000
--- a/multilib/lib32-mesa/git_fixes.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
-From: Ian Romanick <ian.d.romanick@intel.com>
-Date: Mon, 08 Oct 2012 22:07:10 +0000
-Subject: docs: Add 9.0 release md5sums
-
-Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
----
-diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
-index d72c5bb..02b7324 100644
---- a/docs/relnotes-9.0.html
-+++ b/docs/relnotes-9.0.html
-@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
- 
- <h2>MD5 checksums</h2>
- <pre>
--tbd
-+be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
-+60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
-+16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
- </pre>
- 
- 
---
-cgit v0.9.0.2-2-gbebe
-From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:47:40 +0000
-Subject: mesa: don't call TexImage driver hooks for zero-sized images
-
-This simply avoids some failed assertions but there's no reason to
-call the driver hooks for storing a tex image if its size is zero.
-
-Note: This is a candidate for the stable branches.
-(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 21646cc..8004876 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
-                                           border, internalFormat, texFormat);
- 
-                /* Give the texture to the driver.  <pixels> may be null. */
--               if (compressed) {
--                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
--                                                 imageSize, pixels);
--               }
--               else {
--                  ctx->Driver.TexImage(ctx, dims, texImage, format,
--                                       type, pixels, unpack);
-+               if (width > 0 && height > 0 && depth > 0) {
-+                  if (compressed) {
-+                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
-+                                                    imageSize, pixels);
-+                  }
-+                  else {
-+                     ctx->Driver.TexImage(ctx, dims, texImage, format,
-+                                          type, pixels, unpack);
-+                  }
-                }
- 
-                check_gen_mipmap(ctx, target, texObj, level);
---
-cgit v0.9.0.2-2-gbebe
-From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:59:27 +0000
-Subject: mesa: fix error check for zero-sized compressed subtexture
-
-For glCompressedTexSubImage, width or height = 0 is legal.
-Fixes a failure in piglit's s3tc-errors test.
-
-This is for the 9.0 and 8.0 branches.  Already fixed on master.
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 8004876..38fa9fa 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
-    if (!_mesa_is_compressed_format(ctx, format))
-       return GL_INVALID_ENUM;
- 
--   if (width < 1 || width > maxTextureSize)
-+   if (width < 0 || width > maxTextureSize)
-       return GL_INVALID_VALUE;
- 
--   if ((height < 1 || height > maxTextureSize)
-+   if ((height < 0 || height > maxTextureSize)
-        && dimensions > 1)
-       return GL_INVALID_VALUE;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index 922577aef..000000000
--- a/multilib/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
diff --git a/multilib/lib32-mpg123/PKGBUILD b/multilib/lib32-mpg123/PKGBUILD
deleted file mode 100644
index 3d229a1ee..000000000
--- a/multilib/lib32-mpg123/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 74443 2012-07-28 15:07:49Z bluewind $
-# Maintainer: Hugo Doria <hugo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-_pkgbasename=mpg123
-pkgname=lib32-$_pkgbasename
-pkgver=1.14.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=('a72d0c60a1d7dbec7cfe966bc11672bf')
-
-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 1da03abb6..000000000
--- a/multilib/lib32-nettle/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 73784 2012-07-15 14:03:44Z bluewind $
-# 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.5
-pkgrel=1
-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=('d66882e6ad31a9f651b73d7a1a93bd4c')
-
-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-nouveau-dri/LICENSE b/multilib/lib32-nouveau-dri/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/multilib/lib32-nouveau-dri/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/multilib/lib32-nouveau-dri/PKGBUILD b/multilib/lib32-nouveau-dri/PKGBUILD
deleted file mode 100644
index 376e6d827..000000000
--- a/multilib/lib32-nouveau-dri/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 73674 2012-07-13 07:40:10Z lcarlier $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=lib32-nouveau-dri
-pkgver=8.0.4
-pkgrel=1
-arch=('x86_64')
-makedepends=('glproto>=1.4.15' 'lib32-libdrm-old' 'lib32-libdrm-nouveau1' 'lib32-libxxf86vm>=1.1.1' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.0.1' 'lib32-libx11>=1.4.99.1'
-  'lib32-libxt>=1.1.1' 'lib32-gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm' 'namcap')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(LICENSE
-        mesa-8.0.3-llvm-3.1-fixes.patch
-        ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-)
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'c452ed3392468170726c004c2f4e02ca'
-         'd546f988adfdf986cff45b1efa2d8a46')
-
-build() {
-  cd ${srcdir}/?esa-*
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  # for our llvm-config for 32 bit
-  export LLVM_CONFIG=/usr/bin/llvm-config32
-
-  patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
-
-   autoreconf -vfi
-  ./configure --prefix=/usr \
-  --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
-  --with-gallium-drivers=nouveau \
-  --with-dri-drivers=nouveau \
-  --enable-gallium-llvm \
-  --disable-gallium-egl \
-  --enable-shared-glapi \
-  --enable-gbm \
-  --enable-glx-tls \
-  --enable-dri \
-  --enable-glx \
-  --enable-osmesa \
-  --enable-gles1 \
-  --enable-gles2 \
-  --disable-egl \
-  --enable-texture-float \
-  --enable-xa \
-  --enable-shared-dricore \
-  --enable-32-bit \
-  --libdir=/usr/lib32
-
-  make
-}
-
-package() {
-  depends=("lib32-libgl=${pkgver}" 'lib32-libdrm-nouveau1')
-  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-nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch b/multilib/lib32-nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/multilib/lib32-nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/multilib/lib32-openal/PKGBUILD b/multilib/lib32-openal/PKGBUILD
deleted file mode 100644
index 28dc67ad3..000000000
--- a/multilib/lib32-openal/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 68880 2012-04-04 16:57:37Z bluewind $
-# 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.14
-pkgrel=1
-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=('3d8b86c21a2f87a2a5e60f78f3b3f03d')
-
-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 0d40ef4e2..000000000
--- a/multilib/lib32-openssl/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 70629 2012-05-13 11:43:00Z bluewind $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-_pkgbasename=openssl
-pkgname=lib32-$_pkgbasename
-_ver=1.0.1c
-# use a pacman compatible version scheme
-pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
-#pkgver=$_ver
-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')
-makedepends=('gcc-multilib')
-options=('!makeflags')
-source=("https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz"
-        "https://www.openssl.org/source/${_pkgbasename}-${_ver}.tar.gz.asc"
-        'no-rpath.patch'
-        'ca-dir.patch')
-md5sums=('ae412727c8c15b67880aef7bd2999b2e'
-         'a3d90bc42253def61cd1c4237f1ce5f7'
-         'dc78d3d06baffc16217519242ce92478'
-         '3bf51be3a1bbd262be46dc619f92aa90')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	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
-	# workaround for PR#2771: OPENSSL_NO_TLS1_2_CLIENT
-	./Configure --prefix=/usr --openssldir=/etc/ssl --libdir=lib32 \
-		shared zlib enable-md2 \
-		linux-elf \
-		-Wa,--noexecstack "${CFLAGS}" "${LDFLAGS}" \
-		-DOPENSSL_NO_TLS1_2_CLIENT
-
-	make MAKEDEPPROG="${CC}" depend
-	make
-}
-
-check() {
-	cd $srcdir/$_pkgbasename-$_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/$_pkgbasename-$_ver
-	make INSTALL_PREFIX=$pkgdir install
-
-	rm -rf ${pkgdir}/{usr/{include,share,bin},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 dbba642ba..000000000
--- a/multilib/lib32-p11-kit/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 75220 2012-08-16 11:11:53Z bluewind $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Christoph Vigano <mail@cvigano.de>
-
-_pkgbasename=p11-kit
-pkgname=lib32-$_pkgbasename
-pkgver=0.13
-pkgrel=1
-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=('3892bc07ff54b1b391aad4628911801d')
-
-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 e9636f9d3..000000000
--- a/multilib/lib32-pango/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 72530 2012-06-16 10:19:20Z bluewind $
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-# Maintainer: Biru Ionut <ionut@archlinux.ro>
-_pkgbasename=pango
-pkgname=lib32-$_pkgbasename
-pkgver=1.30.1
-pkgrel=1
-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}/${pkgver:0:4}/${_pkgbasename}-${pkgver}.tar.xz
-        pango-modules-conffile.patch)
-url="http://www.pango.org/"
-sha256sums=('3a8c061e143c272ddcd5467b3567e970cfbb64d1d1600a8f8e62435556220cbe'
-            '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 c374f6f6f..000000000
--- a/multilib/lib32-pcre/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 73786 2012-07-15 14:05:24Z bluewind $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=pcre
-pkgname=lib32-$_pkgbasename
-pkgver=8.31
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions (32-bit)"
-arch=('x86_64')
-url="http://pcre.sourceforge.net"
-license=('custom')
-depends=('lib32-gcc-libs' $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${_pkgbasename}-${pkgver}.tar.bz2{,.sig})
-md5sums=('1c9a276af932b5599157f96e945391f0'
-         '873bcd2cd9f1e0aa1e28e256b3e31506')
-
-build() {
-  cd "${srcdir}"/${_pkgbasename}-${pkgver}
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-utf8 --enable-unicode-properties --enable-pcre16 --enable-jit
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-pixman/PKGBUILD b/multilib/lib32-pixman/PKGBUILD
deleted file mode 100644
index 21710eba8..000000000
--- a/multilib/lib32-pixman/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 73350 2012-07-06 15:37:13Z bluewind $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-_pkgbasename=pixman
-pkgname=lib32-$_pkgbasename
-pkgver=0.26.2
-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=('1daf014714cc29147726abada12359345d156705')
-
-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 8eb2a911a..000000000
--- a/multilib/lib32-qt/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 76658 2012-09-25 20:46:48Z 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.3
-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=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz")
-md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b')
-
-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 ee1681416..000000000
--- a/multilib/lib32-readline/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 74445 2012-07-28 15:15:50Z bluewind $
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-_pkgbasename=readline
-pkgname=lib32-$_pkgbasename
-_basever=6.2
-_patchlevel=004 #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'
-         'c9d5d79718856e711667dede87cb7622'
-         '4437205bb1462f5f32e4812b8292c675'
-         'c08e787f50579ce301075c523fa660a4'
-         '7e39cad1d349b8ae789e4fc33dbb235f')
-
-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 41cb29714..000000000
--- a/multilib/lib32-sdl/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 76262 2012-09-15 09:41:41Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <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=3
-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)
-optdepends=('lib32-alsa-lib: ALSA audio driver'
-            'lib32-libpulse: PulseAudio audio driver')
-options=('!libtool')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
-        sdl-1.2.14-fix-mouse-clicking.patch
-        sdl-1.2.14-disable-mmx.patch
-        fix_joystick_misc_axes.diff
-        libsdl-1.2.15-resizing.patch)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
-         '04d8c179f125e04bcd4c9d60e013c2d7'
-         'e5c16b7611f62c7cb25f0534eff68852'
-         '687586a108b597a2a6b73070c1d37e51'
-         '3dd50347d8856160a9cbd7f80383a1f8')
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd SDL-$pkgver
-  patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
-  patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
-  patch -Np1 -i ../fix_joystick_misc_axes.diff
-  patch -Np1 -i ../libsdl-1.2.15-resizing.patch
-  ./configure --prefix=/usr --disable-nasm --enable-alsa \
-              --with-x --disable-rpath --disable-static --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd SDL-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/{include,share}
-
-  cd "$pkgdir/usr/bin"
-  mv sdl-config sdl-config-32
-}
diff --git a/multilib/lib32-sdl/fix_joystick_misc_axes.diff b/multilib/lib32-sdl/fix_joystick_misc_axes.diff
deleted file mode 100644
index 75e3755c9..000000000
--- a/multilib/lib32-sdl/fix_joystick_misc_axes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/joystick/linux/SDL_sysjoystick.c b/src/joystick/linux/SDL_sysjoystick.c
-index ee43974..80e46e4 100644
---- a/src/joystick/linux/SDL_sysjoystick.c
-+++ b/src/joystick/linux/SDL_sysjoystick.c
-@@ -702,7 +702,7 @@ static SDL_bool EV_ConfigJoystick(SDL_Joystick *joystick, int fd)
- 				++joystick->nbuttons;
- 			}
- 		}
--		for ( i=0; i<ABS_MISC; ++i ) {
-+		for ( i=0; i<ABS_MAX; ++i ) {
- 			/* Skip hats */
- 			if ( i == ABS_HAT0X ) {
- 				i = ABS_HAT3Y;
diff --git a/multilib/lib32-sdl/libsdl-1.2.15-resizing.patch b/multilib/lib32-sdl/libsdl-1.2.15-resizing.patch
deleted file mode 100644
index 0655a13e1..000000000
--- a/multilib/lib32-sdl/libsdl-1.2.15-resizing.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: Revert change that breaks window corner resizing
- http://bugzilla.libsdl.org/show_bug.cgi?id=1430
-Author: Andrew Caudwell <acaudwell@gmail.com>
-Last-Update: 2012-04-10
-Bug-Debian: http://bugs.debian.org/665779
-
-diff -r c787fb1b5699 src/video/x11/SDL_x11events.c
---- a/src/video/x11/SDL_x11events.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -57,12 +57,6 @@
- static SDLKey MISC_keymap[256];
- SDLKey X11_TranslateKeycode(Display *display, KeyCode kc);
- 
--/*
-- Pending resize target for ConfigureNotify (so outdated events don't
-- cause inappropriate resize events)
--*/
--int X11_PendingConfigureNotifyWidth = -1;
--int X11_PendingConfigureNotifyHeight = -1;
- 
- #ifdef X_HAVE_UTF8_STRING
- Uint32 Utf8ToUcs4(const Uint8 *utf8)
-@@ -825,16 +819,6 @@
- #ifdef DEBUG_XEVENTS
- printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height);
- #endif
--		if ((X11_PendingConfigureNotifyWidth != -1) &&
--		    (X11_PendingConfigureNotifyHeight != -1)) {
--		    if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) &&
--			(xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) {
--			    /* Event is from before the resize, so ignore. */
--			    break;
--		    }
--		    X11_PendingConfigureNotifyWidth = -1;
--		    X11_PendingConfigureNotifyHeight = -1;
--		}
- 		if ( SDL_VideoSurface ) {
- 		    if ((xevent.xconfigure.width != SDL_VideoSurface->w) ||
- 		        (xevent.xconfigure.height != SDL_VideoSurface->h)) {
-diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h
---- a/src/video/x11/SDL_x11events_c.h	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11events_c.h	Mon Mar 26 12:26:52 2012 +1300
-@@ -27,8 +27,3 @@
- extern void X11_InitOSKeymap(_THIS);
- extern void X11_PumpEvents(_THIS);
- extern void X11_SetKeyboardState(Display *display, const char *key_vec);
--
--/* Variables to be exported */
--extern int X11_PendingConfigureNotifyWidth;
--extern int X11_PendingConfigureNotifyHeight;
--
-diff -r c787fb1b5699 src/video/x11/SDL_x11video.c
---- a/src/video/x11/SDL_x11video.c	Mon Feb 20 23:51:08 2012 -0500
-+++ b/src/video/x11/SDL_x11video.c	Mon Mar 26 12:26:52 2012 +1300
-@@ -1182,8 +1182,6 @@
- 			current = NULL;
- 			goto done;
- 		}
--		X11_PendingConfigureNotifyWidth = width;
--		X11_PendingConfigureNotifyHeight = height;
- 	} else {
- 		if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) {
- 			current = NULL;
diff --git a/multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch b/multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch
deleted file mode 100644
index 1bb6e0e47..000000000
--- a/multilib/lib32-sdl/sdl-1.2.14-disable-mmx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# and another one from FS#26020
-
---- a/src/video/SDL_yuv_sw.c    2009-10-13 06:07:15.000000000 +0700
-+++ b/src/video/SDL_yuv_sw.c    2011-09-20 19:26:30.247742620 +0700
-@@ -89,6 +89,8 @@
- #include "SDL_yuvfuncs.h"
- #include "SDL_yuv_sw_c.h"
- 
-+#undef __OPTIMIZE__
-+
- /* The functions used to manipulate software video overlays */
- static struct private_yuvhwfuncs sw_yuvfuncs = {
- 	SDL_LockYUV_SW,
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_image/PKGBUILD b/multilib/lib32-sdl_image/PKGBUILD
deleted file mode 100644
index 9acf0ed8d..000000000
--- a/multilib/lib32-sdl_image/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 63483 2012-02-05 11:45:03Z ibiru $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-_pkgbasename=sdl_image
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.12
-pkgrel=2
-pkgdesc="A simple library to load images of various formats as SDL surfaces (32-bit)"
-arch=('x86_64')
-url="http://www.libsdl.org/projects/SDL_image/"
-license=('LGPL')
-depends=('lib32-sdl' 'lib32-libpng' 'lib32-libjpeg' 'lib32-libtiff' 'lib32-zlib' "$_pkgbasename")
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(http://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.tar.gz)
-md5sums=('a0f9098ebe5400f0bdc9b62e60797ecb')
-
-build() {
-  export CC='gcc -m32'
-  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
-  cd ${srcdir}/SDL_image-${pkgver}
-
-  ./configure --prefix=/usr --libdir=/usr/lib32
-  make
-}
-
-package() {
-  cd ${srcdir}/SDL_image-${pkgver}
-
-  make DESTDIR=$pkgdir install
-  rm -rf $pkgdir/usr/include
-}
-
-# vim: sw=2:ts=2 et:
diff --git a/multilib/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 a3167bc5d..000000000
--- a/multilib/lib32-speex/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 64032 2012-02-08 19:00:07Z pschmitz $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-_pkgbasename=speex
-pkgname=lib32-$_pkgbasename
-pkgver=1.2rc1
-pkgrel=4
-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-sqlite/PKGBUILD b/multilib/lib32-sqlite/PKGBUILD
deleted file mode 100644
index 33f846a88..000000000
--- a/multilib/lib32-sqlite/PKGBUILD
+++ /dev/null
@@ -1,52 +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=sqlite
-pkgname=lib32-sqlite
-_amalgamationver=3071401
-#_docver=${_amalgamationver}
-_docver=3071400
-pkgver=3.7.14.1
-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-autoconf-${_amalgamationver}.tar.gz)
-options=(!libtool)
-md5sums=('4cf3fd434bbb6e50777019ff3507bfa5')
-provides=("lib32-sqlite3=$pkgver")
-replaces=("lib32-sqlite3")
-conflicts=("lib32-sqlite3")
-
-build() {
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  cd ${srcdir}/sqlite-autoconf-${_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 \
-    --disable-static
-
-  # 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-autoconf-${_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-sqlite3/PKGBUILD b/multilib/lib32-sqlite3/PKGBUILD
deleted file mode 100644
index cf29253da..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=3071300
-pkgver=3.7.13
-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=('13bb3eaae94592ef3220ea23582763f5')
-
-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-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD
deleted file mode 100644
index ef31d5ee2..000000000
--- a/multilib/lib32-util-linux/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 78568 2012-10-21 05:11:47Z ebelanger $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-_pkgbasename=util-linux
-pkgname=lib32-$_pkgbasename
-pkgver=2.22.1
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
-url='http://www.kernel.org/pub/linux/utils/util-linux/'
-arch=('x86_64')
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
-provides=('lib32-util-linux-ng')
-conflicts=('lib32-util-linux-ng')
-replaces=('lib32-util-linux-ng')
-license=('GPL2')
-options=('!libtool' '!emptydirs')
-source=("ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.22/util-linux-$pkgver.tar.xz")
-md5sums=('730cf9932531ed09b53a04ca30fcb4c9')
-
-shopt -s extglob
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  ./configure --without-ncurses --libdir=/usr/lib32
-
-  make lib{uuid,blkid,mount}.la
-}
-
-package() {
-  make -C "$_pkgbasename-$pkgver" \
-    DESTDIR="$pkgdir" \
-    install-usrlib_execLTLIBRARIES \
-    install-pkgconfigDATA
-}
diff --git a/multilib/lib32-v4l-utils/PKGBUILD b/multilib/lib32-v4l-utils/PKGBUILD
deleted file mode 100644
index 955b64ca0..000000000
--- a/multilib/lib32-v4l-utils/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 70671 2012-05-14 16:05:07Z bluewind $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-_pkgbasename=v4l-utils
-pkgname=lib32-$_pkgbasename
-pkgver=0.8.8
-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
-        http://linuxtv.org/downloads/v4l-utils/${_pkgbasename}-${pkgver}.tar.bz2.asc)
-sha256sums=('5fa4c6f4b6f5410de57271a03cc9a15f15195ef3fc05a8e42ecf507d6d70a87f'
-            'ed281f57f1c8528eabd4be3475c0044d7a979447b9adb8fe7af1e9e147e00e8f')
-
-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 -C lib PREFIX=/usr LIBDIR=/usr/lib32
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make -C lib 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 3b46d134d..000000000
--- a/multilib/lib32-xcb-util/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 71888 2012-06-02 21:25:02Z lcarlier $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=xcb-util
-pkgname=lib32-xcb-util
-pkgver=0.3.9
-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)
-sha256sums=('c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4')
-
-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 8c508d486..000000000
--- a/multilib/lib32-zlib/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 70252 2012-05-03 08:40:30Z pschmitz $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-_pkgbasename=zlib
-pkgname=lib32-$_pkgbasename
-pkgver=1.2.7
-pkgrel=1
-pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP (32-bit)'
-arch=('x86_64')
-license=('custom')
-url="http://www.zlib.net/"
-depends=('lib32-glibc' "$_pkgbasename")
-makedepends=('gcc-multilib')
-source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
-md5sums=('60df6a37c56e7c1366cca812414f7b85')
-
-build() {
-	export CC="gcc -m32"
-	export CXX="g++ -m32"
-	export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-	cd ${srcdir}/zlib-$pkgver
-	./configure --prefix=/usr \
-		--libdir=/usr/lib32
-	make
-}
-
-check() {
-	cd ${srcdir}/zlib-$pkgver
-	make test
-}
-
-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/libtool-multilib/PKGBUILD b/multilib/libtool-multilib/PKGBUILD
deleted file mode 100644
index 92af7538f..000000000
--- a/multilib/libtool-multilib/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 77390 2012-10-09 14:32:58Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <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=7
-pkgdesc="A generic library support script for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-_gccver=4.7.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 f4f700705..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 1e6e7c2b4..000000000
--- a/multilib/q4wine/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 66267 2012-02-23 06:02:23Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
-
-pkgname=q4wine
-pkgver=0.121
-pkgrel=4
-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 7abeae26c..000000000
--- a/multilib/wine/PKGBUILD
+++ /dev/null
@@ -1,154 +0,0 @@
-# $Id: PKGBUILD 77690 2012-10-13 14:39:25Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=wine
-pkgver=1.5.15
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign})
-md5sums=('41728374d14d0f13552250c70c0d40d2'
-         '6d8a5749f3f7d45340fc9e43e906c238')
-
-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
-  glu             lib32-glu
-  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
-  libxcomposite   lib32-libxcomposite
-  oss
-  samba
-)
-  
-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
-  libjpeg-turbo   lib32-libjpeg-turbo
-  libxcomposite   lib32-libxcomposite
-  oss             cups
-  samba
-)
-
-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="${CXXFLAGS/-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 and FS#23277
-  make CFLAGS+="-mstackrealign -mincoming-stack-boundary=2" CXXFLAGS+="-mstackrealign -mincoming-stack-boundary=2"
-}
-
-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 5ad2678e6..000000000
--- a/multilib/wine_gecko/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 77615 2012-10-13 10:57:22Z bluewind $
-# 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.8
-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.5')
-source=(http://downloads.sourceforge.net/project/wine/Wine%20Gecko/$pkgver/$pkgname-$pkgver-x86{,_64}.msi)
-md5sums=('c2f19f07e399d8b9d75a14f37fdddca7'
-         '5ce40ef8e3fd56d2c8c4e8d938f10f7b')
-
-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/multilib/winegame/PKGBUILD b/multilib/winegame/PKGBUILD
deleted file mode 100644
index b1e038d18..000000000
--- a/multilib/winegame/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 66338 2012-02-23 16:33:57Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=winegame
-pkgver=0.2.0
-pkgrel=2
-pkgdesc="An interface to install windows programs in Wine"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/winegame/"
-license=('GPL3')
-depends=('libnotify' 'winestuff')
-makedepends=('cmake')
-source=(http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('631dd218707c6efb2901ef1206092538')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver/build"
-
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/multilib/winestuff/PKGBUILD b/multilib/winestuff/PKGBUILD
deleted file mode 100644
index bdb5cb568..000000000
--- a/multilib/winestuff/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 66336 2012-02-23 16:29:35Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=winestuff
-pkgver=0.2.0
-pkgrel=2
-pkgdesc="Library utility for winegame"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/winegame/"
-license=('LGPL2.1')
-makedepends=('qt' 'cmake')
-source=(http://winegame.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-md5sums=('a01f55d30bd0e1dcee3a44aa0fa5369d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  mkdir -p build
-  cd build
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr ..
-
-  make translations
-  make
-}
-
-package() {
-  depends=('qt' 'fuseiso' 'winetricks')
-
-  cd "$srcdir/$pkgname-$pkgver/build"
-
-  make DESTDIR="$pkgdir/" install
-}
-
diff --git a/multilib/zsnes/PKGBUILD b/multilib/zsnes/PKGBUILD
deleted file mode 100644
index 5e9e758bb..000000000
--- a/multilib/zsnes/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 76172 2012-09-12 13:46:03Z lcarlier $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Frank Tetzel <frank.tetzel@mailbox.tu-dresden.de>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=zsnes
-pkgver=1.51
-pkgrel=16
-pkgdesc="Super Nintendo emulator"
-url="http://www.zsnes.com/"
-arch=('i686' 'x86_64')
-license=('GPL')
-options=(!buildflags)
-
-if [[ $CARCH == "x86_64" ]]; then
-  depends=('lib32-gcc-libs' 'lib32-sdl' 'lib32-libpng>=1.5.0' 'lib32-libgl' 'lib32-ncurses' 'lib32-mesa')
-  optdepends=('lib32-alsa-lib: sound support')
-  makedepends=('nasm' 'gcc-multilib' 'gendesk')
-else
-  depends=('gcc-libs' 'sdl' 'libpng>=1.5.0' 'libgl' 'ncurses' 'mesa')
-  optdepends=('alsa-lib: sound support')
-  makedepends=('nasm' 'gcc' 'gendesk')
-fi
-
-source=(http://downloads.sourceforge.net/${pkgname}/zsnes151src.tar.bz2
-        zsnes.patch
-        zsnes-1.51-libpng15.patch
-        zsnes.png)
-md5sums=('7071186bf80632ae88a153239498d8c9'
-         'fd13769c13de49601a234b46fb802a75'
-         'ea82b4dbf31c87dbcc6c67d02ddfb299'
-         'b5260c02adfc3b7ff725041214b00bfd')
-
-build() {
-  cd "$srcdir/${pkgname}_1_51"
-
-  patch -p1 -i ../zsnes.patch
-  patch -p0 -i ../zsnes-1.51-libpng15.patch
-  
-  cd src
-  if [ $CARCH == "x86_64" ]; then
-    export CC="gcc -m32"
-    export CXX="g++ -m32"
-  fi
-  ./autogen.sh --prefix=/usr \
-    x_libraries=/usr/lib \
-    force_arch=i686 \
-    --enable-release
-  
-  make
-}
-
-package() {
-  cd "$srcdir"
-
-  gendesk
-
-  cd "${pkgname}_1_51/src"
-
-  make DESTDIR=${pkgdir} install
-  
-  # adding --mandir= to autoconf line fails
-  install -dm755 ${pkgdir}/usr/share
-
-  install -Dm644 ${srcdir}/zsnes.desktop ${pkgdir}/usr/share/applications/zsnes.desktop
-  install -Dm644 ${srcdir}/zsnes.png ${pkgdir}/usr/share/pixmaps/zsnes.png
-
-  mv ${pkgdir}/usr/man ${pkgdir}/usr/share
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/multilib/zsnes/zsnes-1.51-libpng15.patch b/multilib/zsnes/zsnes-1.51-libpng15.patch
deleted file mode 100644
index b32c30967..000000000
--- a/multilib/zsnes/zsnes-1.51-libpng15.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Use existing png_set_IHDR() and stop accessing PNG structure members directly
-
---- src/zip/zpng.c
-+++ src/zip/zpng.c
-@@ -129,7 +129,6 @@
-         png_set_IHDR(png_ptr, info_ptr, width, height, 8,
-                      PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
-                      PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
--        info_ptr->color_type = PNG_COLOR_TYPE_RGB;
- 
-         //Allocate an array of scanline pointers
-         row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep));
diff --git a/multilib/zsnes/zsnes.desktop b/multilib/zsnes/zsnes.desktop
deleted file mode 100644
index db13ada4c..000000000
--- a/multilib/zsnes/zsnes.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Zsnes
-Comment=Super Nintendo emulator
-Exec=/usr/bin/zsnes
-Icon=/usr/share/pixmaps/zsnes_icon.png
-Terminal=false
-Type=Application
-Categories=Application;Game
-StartupNotify=false
diff --git a/multilib/zsnes/zsnes.patch b/multilib/zsnes/zsnes.patch
deleted file mode 100644
index d5d681ae6..000000000
--- a/multilib/zsnes/zsnes.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -aur zsnes_1_51//src/Makefile.in zsnes_1_51_new//src/Makefile.in
---- zsnes_1_51//src/Makefile.in	2007-01-24 21:54:12.000000000 +0100
-+++ zsnes_1_51_new//src/Makefile.in	2010-09-06 00:03:04.715810431 +0200
-@@ -95,7 +95,7 @@
- %.o: %.cpp
- 	@CXX@ @CXXFLAGS@ -o $@ -c $<
- %.o %.h: %.psr $(PSR)
--	./$(PSR) @PSRFLAGS@ -gcc @CC@ -compile -flags "@CFLAGS@ -O1" -cheader $*.h -fname $* $*.o $<
-+	./$(PSR) @PSRFLAGS@ -gcc "@CC@" -compile -flags "@CFLAGS@ -O1 -D_FORTIFY_SOURCE=0" -cheader $*.h -fname $* $*.o $<
- 
- default: main
- all: main tools
-@@ -133,7 +133,7 @@
- 
- include makefile.dep
- makefile.dep: $(TOOL_D)/depbuild Makefile
--	$(TOOL_D)/depbuild @CC@ "@CFLAGS@" @NASMPATH@ "@NFLAGS@" $(Z_OBJS) > makefile.dep
-+	$(TOOL_D)/depbuild "@CC@" "@CFLAGS@" "@NASMPATH@" "@NFLAGS@" $(Z_OBJS) > makefile.dep
- 
- Makefile: Makefile.in config.status
- 	./config.status
-diff -aur zsnes_1_51//src/parsegen.cpp zsnes_1_51_new//src/parsegen.cpp
---- zsnes_1_51//src/parsegen.cpp	2007-10-31 05:30:26.000000000 +0100
-+++ zsnes_1_51_new//src/parsegen.cpp	2010-09-05 15:48:36.903333444 +0200
-@@ -19,6 +19,9 @@
- Config file handler creator by Nach (C) 2005-2007
- */
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- #if !defined(__GNUC__) && !defined(_MSC_VER)
- #error You are using an unsupported compiler
- #endif
-@@ -1822,7 +1825,7 @@
-   }
- }
- 
--int main(size_t argc, const char *const *const argv)
-+int main(int argc, const char *const *const argv)
- {
-   const char *cheader_file = 0;
-   bool compile = false;
-diff -aur zsnes_1_51//src/tools/depbuild.cpp zsnes_1_51_new//src/tools/depbuild.cpp
---- zsnes_1_51//src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
-+++ zsnes_1_51_new//src/tools/depbuild.cpp	2010-09-05 15:48:36.903333444 +0200
-@@ -183,7 +183,7 @@
-   }
- }
- 
--int main(size_t argc, const char *const *const argv)
-+int main(int argc, const char *const *const argv)
- {
-   if (argc < 5)
-   {
-diff -aur zsnes_1_51//src/tools/strutil.h zsnes_1_51_new//src/tools/strutil.h
---- zsnes_1_51//src/tools/strutil.h	2006-12-27 12:04:05.000000000 +0100
-+++ zsnes_1_51_new//src/tools/strutil.h	2010-09-05 15:48:36.903333444 +0200
-@@ -15,6 +15,9 @@
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
-+#include <cstring>
-+#include <cstdlib>
-+
- /*
- This is part of a toolkit used to assist in ZSNES development
- */
-diff -u -r zsnes_1_51/src/tools/depbuild.cpp zsnes_1_51-fix/src/tools/depbuild.cpp
---- zsnes_1_51/src/tools/depbuild.cpp	2006-12-27 12:04:05.000000000 +0100
-+++ zsnes_1_51-fix/src/tools/depbuild.cpp	2012-07-14 16:20:17.759886250 +0200
-@@ -26,6 +26,8 @@
- #include <cstdio>
- using namespace std;
- 
-+#include <unistd.h>
-+
- #include "fileutil.h"
- #include "strutil.h"
- 
diff --git a/multilib/zsnes/zsnes.png b/multilib/zsnes/zsnes.png
deleted file mode 100644
index 31608ba06..000000000
--- a/multilib/zsnes/zsnes.png
+++ /dev/null
diff --git a/multilib/zsnes/zsnes_icon.png b/multilib/zsnes/zsnes_icon.png
deleted file mode 100644
index 31608ba06..000000000
--- a/multilib/zsnes/zsnes_icon.png
+++ /dev/null
diff --git a/pcr/swig1/PKGBUILD b/pcr/swig1/PKGBUILD
index 4cb83afd2..2bd0d6af1 100644
--- a/pcr/swig1/PKGBUILD
+++ b/pcr/swig1/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=swig
 pkgver=1.3.40
 pkgrel=1
 pkgdesc="A compiler that integrates C and C++ code with scripting languages (legacy version)"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.swig.org/"
 license=('custom')
 depends=('gcc-libs' 'zlib')
@@ -27,3 +27,4 @@ package() {
   make DESTDIR="${pkgdir}" install
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+md5sums=('2df766c9e03e02811b1ab4bba1c7b9cc')
diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD
deleted file mode 100644
index 26571d1a8..000000000
--- a/staging/akonadi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 163118 2012-07-07 15:44:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=akonadi
-pkgver=1.7.2
-pkgrel=2
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('c73bb835057a3ee07d37a4f7daaf7ecf')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/akonadi/akonadi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/alsa-plugins/PKGBUILD b/staging/alsa-plugins/PKGBUILD
deleted file mode 100644
index 3f11bce25..000000000
--- a/staging/alsa-plugins/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 161283 2012-06-08 22:45:29Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Daniel Ehlers <danielehlers@mindeye.net>
-
-pkgname=alsa-plugins
-pkgver=1.0.25
-pkgrel=2
-pkgdesc="Extra alsa plugins"
-arch=(i686 x86_64)
-url="http://www.alsa-project.org"
-license=(GPL)
-depends=(alsa-lib)
-makedepends=(libpulse jack ffmpeg)
-optdepends=('libpulse: PulseAudio plugin'
-            'jack: Jack plugin'
-            'ffmpeg: libavcodec resampling plugin'
-            'libsamplerate: libsamplerate resampling plugin'
-            'speex: libspeexdsp resampling plugin')
-options=('!libtool')
-source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2"
-        alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
-        alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch)
-md5sums=('038c023eaa51171f018fbf7141255185'
-         '50d9adcda20756d063e676a563c201d9'
-         '697c6275f678d86ded2e5092d8a154c9')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
-  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
-}
diff --git a/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
deleted file mode 100644
index cce4f7e7e..000000000
--- a/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c
---- alsa-plugins-1.0.25/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
-+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c	2012-06-09 00:42:52.177219012 +0200
-@@ -702,7 +702,6 @@
- 	rec->channels = channels;
- 	rec->format = format;
- 
--	avcodec_init();
- 	avcodec_register_all();
- 
- 	rec->codec = avcodec_find_encoder_by_name("ac3_fixed");
diff --git a/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
deleted file mode 100644
index f4ebbf466..000000000
--- a/staging/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for 
-the AV_CH_LAYOUT_* defines.
-
-diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c
---- alsa-plugins-1.0.25-original/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
-+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c	2012-06-01 14:59:47.096671464 +0200
-@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t
- #else
-   rec->avctx->sample_fmt = SAMPLE_FMT_S16;
- #endif
--#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
-+#if (LIBAVCODEC_VERSION_MAJOR >= 54)
-+	switch (io->channels) {
-+	case 2:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
-+		break;
-+	case 4:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
-+		break;
-+	case 6:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
-+		break;
-+	default:
-+		break;
-+	}
-+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
-	switch (io->channels) {
- 	case 2:
- 		rec->avctx->channel_layout = CH_LAYOUT_STEREO;
diff --git a/staging/amarok/PKGBUILD b/staging/amarok/PKGBUILD
deleted file mode 100644
index 707ab7bc4..000000000
--- a/staging/amarok/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 160958 2012-06-07 13:34:21Z foutrelis $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.5.0
-pkgrel=3
-pkgdesc="The powerful music player for KDE"
-arch=("i686" "x86_64")
-url="http://amarok.kde.org"
-license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-             'libmygpo-qt')
-optdepends=("libgpod: support for Apple iPod audio devices"
-	        "libmtp: support for portable media devices"
-        	"loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service")
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-	"toolbarfix.patch"
-	"amarok-2.5.0-ffmpeg-fixes.patch")
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
-          'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
-          '61193ccc48e9f99b4856eef27fe7a4aaf465feec')
-
-build() {
-  cd "${srcdir}"
-
-  patch -Np0 -i "${srcdir}"/toolbarfix.patch
-  patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch
-
-  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/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/staging/amarok/amarok-2.5.0-ffmpeg-fixes.patch
deleted file mode 100644
index 602fe47f5..000000000
--- a/staging/amarok/amarok-2.5.0-ffmpeg-fixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
---- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:12:22.000000000 +0300
-+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:14:56.000000000 +0300
-@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run()
-     foreach( Meta::TrackPtr track, m_tracks )
-     {
-         //TODO replace with "avformat_open_input" since av_open_input_file is deprecated
--        if( av_open_input_file( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) )
-+        if( avformat_open_input( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) )
-         {
-             warning() << QLatin1String( "Unable to open input file: " ) + track->playableUrl().toLocalFile();
-             continue;
-@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run()
- }
- 
- 
--#include "MusicDNSAudioDecoder.moc"
-\ No newline at end of file
-+#include "MusicDNSAudioDecoder.moc"
diff --git a/staging/amarok/amarok.install b/staging/amarok/amarok.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/amarok/amarok.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/amarok/toolbarfix.patch b/staging/amarok/toolbarfix.patch
deleted file mode 100644
index ec012ca74..000000000
--- a/staging/amarok/toolbarfix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp	2012-01-29 20:20:01.901360205 +0100
-@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P
-     }
- }
- 
-+void Context::AppletToolbar::setContainment( Containment * containment )
-+{
-+    m_cont = containment;
-+}
-+
-+Context::Containment *
-+Context::AppletToolbar::containment() const
-+{
-+    return m_cont;
-+}
-+
- QSizeF
- Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
- {
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.h	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h	2012-01-29 20:17:52.414686784 +0100
-@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
-         
-         void appletRemoved( Plasma::Applet* applet );
- 
-+        void setContainment( Containment * containment );
-+        Containment* containment() const;
-+
-     signals:
-         void showApplet( Plasma::Applet* );
-         void appletAddedToToolbar( Plasma::Applet* applet, int loc );
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig
-diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp
---- amarok-2.5.0/src/context/ToolbarView.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/ToolbarView.cpp	2012-01-29 20:17:52.394686782 +0100
-@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
-     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
- 
-     // now we create the toolbar
--    m_toolbar = new AppletToolbar( containment );
-+    m_toolbar = new AppletToolbar(0);
-+    scene->addItem(m_toolbar.data());
-+    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
-     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
-     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
- 
-@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm
- 
- Context::ToolbarView::~ToolbarView()
- {
--
-+    delete m_toolbar.data();
- }
- 
- void
-Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig
diff --git a/staging/avidemux/PKGBUILD b/staging/avidemux/PKGBUILD
deleted file mode 100644
index bd131f484..000000000
--- a/staging/avidemux/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 160694 2012-06-03 22:00:36Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.6
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
-
-build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
-  make
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-  mkdir -p lib
-  cd lib
-  find ../avidemux -name '*.so*' | xargs ln -sft .
-  cd ../../plugins
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
-    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
-    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
-    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
-  make
-}
-
-package_avidemux-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faac: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux')
-  conflicts=('avidemux')
-  replaces=('avidemux')
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/avidemux
-  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
-  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
-
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
-
-  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
-
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-}
-
-package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -d "${pkgdir}/usr/share/avidemux/i18n"
-  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-}
diff --git a/staging/avidemux/avidemux.install b/staging/avidemux/avidemux.install
deleted file mode 100644
index e111ef946..000000000
--- a/staging/avidemux/avidemux.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD
deleted file mode 100644
index cf03f9277..000000000
--- a/staging/avogadro/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 163125 2012-07-07 16:07:39Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.0.3
-pkgrel=6
-pkgdesc="An advanced molecular editor based on Qt"
-arch=('i686' 'x86_64')
-url="http://avogadro.openmolecules.net/wiki/Main_Page"
-license=('GPL2')
-depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost')
-install=avogadro.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch'
-        'fix-opengl-headers.patch')
-md5sums=('92c2702c1980f70fb6d87a1a58147911'
-         'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec'
-         'f420bfd22e3d5d8fcddc625cf5e711f6')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
-  patch -p1 -i "${srcdir}"/fix-boost.patch
-  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/avogadro/avogadro.install b/staging/avogadro/avogadro.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/staging/avogadro/avogadro.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/staging/avogadro/fix-boost.patch b/staging/avogadro/fix-boost.patch
deleted file mode 100644
index 8fb53ef12..000000000
--- a/staging/avogadro/fix-boost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
-+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
-@@ -149,7 +149,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
-+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
-@@ -11,7 +11,7 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
---- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
-+++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
-@@ -18,7 +18,7 @@
-   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
-   # We should probably scan the header to verify the Q_OBJECT macro is used
-   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
--  qt4_wrap_cpp(moc_files ${hdr_list})
-+  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-   # Now sort out the ui and qrc files, process them as appropriate
-   set(ui_plugin_files)
-   set(qrc_plugin_files)
diff --git a/staging/avogadro/fix-opengl-headers.patch b/staging/avogadro/fix-opengl-headers.patch
deleted file mode 100644
index e6e8bc3b5..000000000
--- a/staging/avogadro/fix-opengl-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
-+++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
-@@ -25,6 +25,8 @@
- #include "camera.h"
- #include "glwidget.h"
- #include <avogadro/molecule.h>
-+#include <Eigen/LU>
-+#include <GL/glu.h>
- 
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
-+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
-@@ -42,6 +42,7 @@
- #include <QColor>
- #include <QVarLengthArray>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
-+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
-@@ -70,6 +70,8 @@
- 
- #include <openbabel/mol.h>
- 
-+#include <GL/glu.h>
-+
- using namespace OpenBabel;
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
-+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
-@@ -36,6 +36,7 @@
- #include <QFile>
- #include <QDebug>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
-+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
-@@ -44,6 +44,8 @@
- #include <QComboBox>
- #include <QDebug>
- 
-+#include <GL/glu.h>
-+
- using namespace std;
- using namespace OpenBabel;
- using namespace Eigen;
diff --git a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
deleted file mode 100644
index 11f58a505..000000000
--- a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
-@@ -75,6 +75,42 @@
-   zmatrix.h
- )
- 
-+SET(libavogadro_MOC_HDRS
-+  animation.h
-+  atom.h
-+  bond.h
-+  color.h
-+  colorbutton.h
-+  colors/elementcolor.h
-+  cube.h
-+  elementdetail_p.h
-+  elementtranslator.h
-+  engine.h
-+  engines/bsdyengine.h
-+  extension.h
-+  fragment.h
-+  glwidget.h
-+  mesh.h
-+  molecule.h
-+  moleculefile.h
-+  moleculefile_p.h
-+  periodictablescene_p.h
-+  periodictableview.h
-+  plotwidget.h
-+  plugin.h
-+  pluginmanager.h
-+  primitive.h
-+  protein.h
-+  pythonengine_p.h
-+  pythonerror.h
-+  pythonextension_p.h
-+  pythontool_p.h
-+  residue.h
-+  tool.h
-+  toolgroup.h
-+  zmatrix.h
-+)
-+
- set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
- # Also add in the qtiocompressor class
- #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
-@@ -113,7 +148,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--qt4_automoc(${libavogadro_SRCS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
-@@ -149,7 +184,7 @@
-     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
- endforeach(headerFile ${libavogadro_HDRS})
- 
--add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
-+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
- target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
---- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
-@@ -224,5 +224,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "animation.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
---- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
-@@ -293,5 +293,3 @@
-    }
- 
-  } // End namespace Avogadro
--
--#include "atom.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
---- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
-@@ -166,5 +166,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "bond.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
---- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
-@@ -152,5 +152,3 @@
-     return "Generic Color";
-   }
- }
--
--#include "color.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
-@@ -94,5 +94,3 @@
-   }
- 
- } // end namespace
--
--#include "colorbutton.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
-@@ -63,7 +63,5 @@
- 
- }
- 
--#include "elementcolor.moc"
- //this is a static color plugin...
- //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
---- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
-@@ -322,5 +322,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "cube.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
-@@ -132,5 +132,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementdetail_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
-@@ -401,5 +401,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementtranslator.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
---- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
-@@ -377,5 +377,3 @@
-       return m_molecule->bonds();
-   }
- }
--
--#include "engine.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
-@@ -442,7 +442,5 @@
-   }
- 
- }
--
--#include "bsdyengine.moc"
- // This is a static engine...
- // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
---- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
-@@ -80,5 +80,3 @@
-   }
- 
- }
--
--#include "extension.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
---- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
-@@ -82,5 +82,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "fragment.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
-@@ -1966,5 +1966,3 @@
-     d->updateCache = true;
-   }
- }
--
--#include "glwidget.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
---- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
-@@ -231,5 +231,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "mesh.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
---- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
-@@ -1575,5 +1575,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "molecule.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
-@@ -22,23 +22,14 @@
-   02110-1301, USA.
-  **********************************************************************/
- 
--#include "moleculefile.h"
-+#include "moleculefile_p.h"
- 
- #include <avogadro/molecule.h>
- 
--#include <QFile>
- #include <QFileInfo>
--#include <QStringList>
--#include <QThread>
- #include <QDebug>
- #include <QPointer>
- 
--#include <openbabel/mol.h>
--#include <openbabel/obconversion.h>
--
--// Included in obconversion.h
--//#include <iostream>
--
- namespace Avogadro {
- 
-   using OpenBabel::OBConversion;
-@@ -578,164 +569,6 @@
-     return false;
-   }
- 
--  class ReadFileThread : public QThread
--  {
--    //    Q_OBJECT 
--
--    public:
--      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
--      {
--      }
--      
--      void addConformer(const OpenBabel::OBMol &conformer)
--      {
--        unsigned int numAtoms = conformer.NumAtoms();
--        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
--        for (unsigned int i = 0; i < numAtoms; ++i)
--          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
--        m_moleculeFile->m_conformers.push_back(coords);
--      }
--
--      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
--      {
--        if (!c) {
--          // this is the first molecule read
--          m_moleculeFile->setConformerFile(true);
--          addConformer(current);
--          return;
--        }
--
--        if (!m_moleculeFile->isConformerFile())
--          return;
--
--        // as long as we are not sure if this really is a 
--        // conformer/trajectory file, add the conformers
--        addConformer(current);
--
--        // performance: check only certain molecule 1-10,20,50
--        switch (c) {
--          case 1:
--          case 2:
--          case 3:
--          case 4:
--          case 5:
--          case 6:
--          case 7:
--          case 8:
--          case 9:
--          case 10:
--          case 20:
--          case 50:
--            break;
--          default:
--            return;
--        }
--
--        if (first.NumAtoms() != current.NumAtoms()) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--          return;
--        }
--
--        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
--          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
--          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
--          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
--            m_moleculeFile->setConformerFile(false);
--            m_moleculeFile->m_conformers.clear();
--            return;
--          }    
--        }
--      }
--
--      void run()
--      {
--        // Check that the file can be read from disk
--        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
--          // Cannot read the file
--          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
--                                         .arg(m_moleculeFile->m_fileName));
--          return;
--        }
-- 
--        // Construct the OpenBabel objects, set the file type
--        OpenBabel::OBConversion conv;
--        OpenBabel::OBFormat *inFormat;
--        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
--          // Input format not supported
--          m_moleculeFile->m_error.append(
--              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
--          return;
--        } else {
--          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
--          if (!inFormat || !conv.SetInFormat(inFormat)) {
--            // Input format not supported
--            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
--                                           .arg(m_moleculeFile->m_fileName));
--            return;
--          }
--        }
--
--        // set any options
--        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
--          foreach(const QString &option,
--              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
--            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
--          }
--        }
--
--        // Now attempt to read the molecule in
--        ifstream ifs;
--        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
--        if (!ifs) // Should not happen, already checked file could be opened
--          return;
--      
--        // read all molecules
--        OpenBabel::OBMol firstOBMol, currentOBMol;
--        unsigned int c = 0;
--        conv.SetInStream(&ifs);
--        m_moleculeFile->streamposRef().push_back(ifs.tellg());
--        while (ifs.good() && conv.Read(&currentOBMol)) {
--          if (!c)
--            firstOBMol = currentOBMol;
--
--          if (c > 20 && !m_moleculeFile->isConformerFile())
--            m_moleculeFile->setFirstReady(true);
--
--          // detect conformer/trajectory files
--          detectConformers(c, firstOBMol, currentOBMol);
--          // store information about molecule
--          m_moleculeFile->streamposRef().push_back(ifs.tellg());
--          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
--          // increment count
--          ++c;
--        }
--        m_moleculeFile->streamposRef().pop_back();
--
--        // signle molecule files are not conformer files
--        if (c == 1) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--        }
--
--        // check for empty titles
--        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
--          if (!m_moleculeFile->titlesRef()[i].isEmpty())
--            continue;
--
--          QString title;
--          if (m_moleculeFile->isConformerFile())
--            title = tr("Conformer %1").arg(i+1);
--          else
--            title = tr("Molecule %1").arg(i+1);
--        
--          m_moleculeFile->titlesRef()[i] = title;
--        }
--      }
--
--      MoleculeFile *m_moleculeFile;
--  }; // end ReadFileThread class
--
-   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
-       const QString &fileType, const QString &fileOptions, bool wait)
-   {
-@@ -794,6 +627,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "moleculefile.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
-@@ -0,0 +1,202 @@
-+/**********************************************************************
-+  MoleculeFile - Class representing molecule file.
-+
-+  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
-+
-+  This file is part of the Avogadro molecular editor project.
-+  For more information, see <http://avogadro.openmolecules.net/>
-+
-+  Avogadro is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License as published by
-+  the Free Software Foundation; either version 2 of the License, or
-+  (at your option) any later version.
-+
-+  Avogadro is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+  02110-1301, USA.
-+ **********************************************************************/
-+
-+#ifndef MOLECULEFILE_P_H
-+#define MOLECULEFILE_P_H
-+
-+#include "moleculefile.h"
-+
-+#include <openbabel/mol.h>
-+#include <openbabel/obconversion.h>
-+
-+#include <QFile>
-+#include <QStringList>
-+#include <QThread>
-+
-+namespace Avogadro {
-+
-+  using OpenBabel::OBConversion;
-+  using std::ifstream;
-+
-+class ReadFileThread : public QThread
-+{
-+      Q_OBJECT
-+
-+  public:
-+    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
-+    {
-+    }
-+
-+    void addConformer(const OpenBabel::OBMol &conformer)
-+    {
-+      unsigned int numAtoms = conformer.NumAtoms();
-+      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
-+      for (unsigned int i = 0; i < numAtoms; ++i)
-+        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
-+      m_moleculeFile->m_conformers.push_back(coords);
-+    }
-+
-+    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
-+    {
-+      if (!c) {
-+        // this is the first molecule read
-+        m_moleculeFile->setConformerFile(true);
-+        addConformer(current);
-+        return;
-+      }
-+
-+      if (!m_moleculeFile->isConformerFile())
-+        return;
-+
-+      // as long as we are not sure if this really is a
-+      // conformer/trajectory file, add the conformers
-+      addConformer(current);
-+
-+      // performance: check only certain molecule 1-10,20,50
-+      switch (c) {
-+        case 1:
-+        case 2:
-+        case 3:
-+        case 4:
-+        case 5:
-+        case 6:
-+        case 7:
-+        case 8:
-+        case 9:
-+        case 10:
-+        case 20:
-+        case 50:
-+          break;
-+        default:
-+          return;
-+      }
-+
-+      if (first.NumAtoms() != current.NumAtoms()) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+        return;
-+      }
-+
-+      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
-+        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
-+        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
-+        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
-+          m_moleculeFile->setConformerFile(false);
-+          m_moleculeFile->m_conformers.clear();
-+          return;
-+        }
-+      }
-+    }
-+
-+    void run()
-+    {
-+      // Check that the file can be read from disk
-+      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
-+        // Cannot read the file
-+        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
-+                                       .arg(m_moleculeFile->m_fileName));
-+        return;
-+      }
-+
-+      // Construct the OpenBabel objects, set the file type
-+      OpenBabel::OBConversion conv;
-+      OpenBabel::OBFormat *inFormat;
-+      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
-+        // Input format not supported
-+        m_moleculeFile->m_error.append(
-+            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
-+        return;
-+      } else {
-+        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
-+        if (!inFormat || !conv.SetInFormat(inFormat)) {
-+          // Input format not supported
-+          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
-+                                         .arg(m_moleculeFile->m_fileName));
-+          return;
-+        }
-+      }
-+
-+      // set any options
-+      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
-+        foreach(const QString &option,
-+            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
-+          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
-+        }
-+      }
-+
-+      // Now attempt to read the molecule in
-+      ifstream ifs;
-+      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
-+      if (!ifs) // Should not happen, already checked file could be opened
-+        return;
-+
-+      // read all molecules
-+      OpenBabel::OBMol firstOBMol, currentOBMol;
-+      unsigned int c = 0;
-+      conv.SetInStream(&ifs);
-+      m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+      while (ifs.good() && conv.Read(&currentOBMol)) {
-+        if (!c)
-+          firstOBMol = currentOBMol;
-+
-+        if (c > 20 && !m_moleculeFile->isConformerFile())
-+          m_moleculeFile->setFirstReady(true);
-+
-+        // detect conformer/trajectory files
-+        detectConformers(c, firstOBMol, currentOBMol);
-+        // store information about molecule
-+        m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
-+        // increment count
-+        ++c;
-+      }
-+      m_moleculeFile->streamposRef().pop_back();
-+
-+      // signle molecule files are not conformer files
-+      if (c == 1) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+      }
-+
-+      // check for empty titles
-+      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
-+        if (!m_moleculeFile->titlesRef()[i].isEmpty())
-+          continue;
-+
-+        QString title;
-+        if (m_moleculeFile->isConformerFile())
-+          title = tr("Conformer %1").arg(i+1);
-+        else
-+          title = tr("Molecule %1").arg(i+1);
-+
-+        m_moleculeFile->titlesRef()[i] = title;
-+      }
-+    }
-+
-+    MoleculeFile *m_moleculeFile;
-+};
-+
-+} // end namespace Avogadro
-+
-+#endif // MOLECULEFILE_P_H
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
-@@ -213,5 +213,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "periodictablescene_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
-@@ -69,4 +69,3 @@
- 
- } // End namespace Avogadro
- 
--#include "periodictableview.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
-@@ -27,7 +27,6 @@
-  **********************************************************************/
- 
- #include "plotwidget.h"
--#include "plotwidget.moc"
- 
- #include <math.h>
- #include <QDebug>
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
---- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
-@@ -65,5 +65,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "plugin.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
-@@ -784,5 +784,3 @@
-   }
- 
- }
--
--#include "pluginmanager.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
---- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
-@@ -77,5 +77,3 @@
-   }
- 
- }
--
--#include "primitive.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
---- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
-@@ -978,5 +978,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "protein.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
-@@ -11,9 +11,9 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--qt4_automoc(moleculelist.cpp)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
- 
--ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
-+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
- SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
- if (WIN32)
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
-@@ -70,4 +70,3 @@
- 
- }
- 
--#include "moleculelist.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
-@@ -289,5 +289,3 @@
- 
- 
- }
--
--#include "pythonengine_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
-@@ -112,4 +112,3 @@
- 
- } // namespace
- 
--#include "pythonerror.moc"
-
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
-@@ -340,5 +340,3 @@
-   }
- 
- }
--
--#include "pythonextension_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
-@@ -344,5 +344,3 @@
-   }
- 
- }
--
--#include "pythontool_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
---- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
-@@ -160,6 +160,3 @@
-   }
- 
- } // End namespace Avogadro
--
-- #include "residue.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
---- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
-@@ -117,5 +117,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "tool.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
-@@ -206,5 +206,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "toolgroup.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
-@@ -149,5 +149,3 @@
- 
- 
- } // End namespace Avogadro
--
--#include "zmatrix.moc"
diff --git a/staging/bind/127.0.0.zone b/staging/bind/127.0.0.zone
deleted file mode 100644
index 509c311f6..000000000
--- a/staging/bind/127.0.0.zone
+++ /dev/null
@@ -1,11 +0,0 @@
-$ORIGIN 0.0.127.in-addr.arpa.
-
-@			1D IN SOA	localhost. root.localhost. (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	localhost.
-1			1D IN PTR	localhost.
diff --git a/staging/bind/PKGBUILD b/staging/bind/PKGBUILD
deleted file mode 100644
index 99bbd00d4..000000000
--- a/staging/bind/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 161312 2012-06-09 06:22:34Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
-
-pkgname=bind
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.1.P1
-_pkgver=9.9.1-P1
-pkgrel=2
-
-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')
-options=('!makeflags' '!libtool')
-depends=('openssl' 'krb5' 'libxml2')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'root.hint::http://www.internic.net/zones/named.root'
-        'remove-tools.patch'
-        'named'
-        'named.conf'
-        'named.conf.d'
-        'named.service'
-        'named.logrotate'
-        'localhost.zone'
-        '127.0.0.zone')
-sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8'
-          'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
-          '18f477f510df31e6c6f547ee2d5fc46e973479bf'
-          '46232e9db243c6c05e170a1781d7a7f413be5d03'
-          '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
-          '7848edbfb9a848843f57c11c02b0289eefd42d00'
-          '05fb2346a30dee2f99c40914dd23708729839b64'
-          '9ffb5c3f72390a517aeae557e32349d5d278cb63'
-          '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9')
-
-provides=('dns-server')
-
-install=install
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-tools.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-libxml2 \
-		--with-libtool \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	make DESTDIR="${pkgdir}" install
-
-	rmdir "${pkgdir}/var/run"
-	install -d "${pkgdir}"/usr/share/doc/bind
-	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
-
-	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
-	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
-	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
-	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
-	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
-
-	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
-}
diff --git a/staging/bind/install b/staging/bind/install
deleted file mode 100644
index 287d0e05b..000000000
--- a/staging/bind/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-	getent group named &>/dev/null || groupadd -g 40 named
-	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
-	passwd -l named &>/dev/null
-
-	touch var/log/named.log
-	chown named:named var/log/named.log
-
-	# create an rndc.key if it doesn't already exist
-	if [[ ! -s etc/rndc.key ]]; then
-		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
-		chown root:named etc/rndc.key
-		chmod 640 etc/rndc.key
-	fi
-}
-
-pre_remove() {
-	getent passwd named &>/dev/null && userdel named >/dev/null
-	getent group named &>/dev/null && groupdel named >/dev/null
-	return 0
-}
diff --git a/staging/bind/localhost.zone b/staging/bind/localhost.zone
deleted file mode 100644
index e3ff9641c..000000000
--- a/staging/bind/localhost.zone
+++ /dev/null
@@ -1,10 +0,0 @@
-$ORIGIN localhost.
-@			1D IN SOA	@ root (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	@
-			1D IN A		127.0.0.1
diff --git a/staging/bind/named b/staging/bind/named
deleted file mode 100755
index 7907f9983..000000000
--- a/staging/bind/named
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-[[ -d /var/run/named ]] || mkdir -p /var/run/named
-chown named:named /var/run/named
-
-PIDFILE=/var/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
-  start)
-    stat_busy "Starting BIND"
-    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon named
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping BIND"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon named
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading BIND"
-    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
diff --git a/staging/bind/named.conf b/staging/bind/named.conf
deleted file mode 100644
index 38fb12cbe..000000000
--- a/staging/bind/named.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-// 
-// /etc/named.conf
-//
-
-options {
-	directory "/var/named";
-	pid-file "/var/run/named/named.pid";
-	auth-nxdomain yes;
-	datasize default;
-// Uncomment these to enable IPv6 connections support
-// IPv4 will still work:
-//	listen-on-v6 { any; };
-// Add this for no IPv4:
-//	listen-on { none; };
-
-	// Default security settings.
-	allow-recursion { 127.0.0.1; };
-	allow-transfer { none; };
-	allow-update { none; };
-    version none;
-    hostname none;
-    server-id none;
-};
-
-zone "localhost" IN {
-	type master;
-	file "localhost.zone";
-	allow-transfer { any; };
-};
-
-zone "0.0.127.in-addr.arpa" IN {
-	type master;
-	file "127.0.0.zone";
-	allow-transfer { any; };
-};
-
-zone "." IN {
-	type hint;
-	file "root.hint";
-};
-
-//zone "example.org" IN {
-//	type slave;
-//	file "example.zone";
-//	masters {
-//		192.168.1.100; 
-//	};
-//	allow-query { any; };
-//	allow-transfer { any; };
-//};
-
-logging {
-        channel xfer-log {
-                file "/var/log/named.log";
-                print-category yes;
-                print-severity yes;
-                print-time yes;
-                severity info;
-        };
-        category xfer-in { xfer-log; };
-        category xfer-out { xfer-log; };
-        category notify { xfer-log; };
-};
-
diff --git a/staging/bind/named.conf.d b/staging/bind/named.conf.d
deleted file mode 100644
index aecbd2307..000000000
--- a/staging/bind/named.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
diff --git a/staging/bind/named.logrotate b/staging/bind/named.logrotate
deleted file mode 100644
index ef1a2d032..000000000
--- a/staging/bind/named.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/named.log {
-   missingok
-   postrotate
-      /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/staging/bind/named.service b/staging/bind/named.service
deleted file mode 100644
index 77196f785..000000000
--- a/staging/bind/named.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Internet domain name server
-
-[Service]
-ExecStart=/usr/sbin/named -f -u named
-ExecReload=/usr/sbin/rndc reload
-ExecStop=/usr/sbin/rndc stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/bind/remove-tools.patch b/staging/bind/remove-tools.patch
deleted file mode 100644
index cbd1c53ad..000000000
--- a/staging/bind/remove-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PKCS11_TOOLS@
- TARGETS =
- 
diff --git a/staging/binutils/PKGBUILD b/staging/binutils/PKGBUILD
deleted file mode 100644
index fc28ad232..000000000
--- a/staging/binutils/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 165120 2012-08-11 08:23:19Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils
-pkgver=2.22
-pkgrel=10
-_date=20120323
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('base-devel')
-depends=('glibc>=2.16' 'zlib')
-checkdepends=('dejagnu')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('de2ac4298732827f8af706fc24020330')
-
-mksource() {
-  mkdir ${pkgname}-${_date}
-  cd ${pkgname}-${_date}
-  export _TAG=binutils-2_22-branch
-  export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src'
-  cvs -z9 co -r $_TAG binutils || return 1
-  mv src binutils
-  tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/*
-}
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
-
-  ${srcdir}/binutils/configure --prefix=/usr \
-    --with-lib-path=/usr/lib:/usr/local/lib \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads \
-    --enable-shared $CONFIGFLAG
-
-  # 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
-
-  # Rebuild libopcodes.a with -fPIC
-  cp -a opcodes opcodes-pic
-  make -C opcodes-pic clean 
-  make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-
-  # do not abort on errors - manually check log files
-  # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror)
-  make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \
-       CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k 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
-  install -m644 opcodes/libopcodes.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/staging/binutils/binutils.install b/staging/binutils/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/staging/binutils/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/staging/boost/PKGBUILD b/staging/boost/PKGBUILD
deleted file mode 100644
index 0b6dc502c..000000000
--- a/staging/boost/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 163072 2012-07-06 15:51:12Z ibiru $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
-
-pkgbase=boost
-pkgname=('boost-libs' 'boost')
-pkgver=1.50.0
-_boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
-license=('custom')
-md5sums=('dbc07ab0254df3dda6300fd737b3f264')
-
-_stagedir="${srcdir}/stagedir"
-
-build() {
-  # set python path for bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
-  echo "using mpi ;" >> build/v2/user-config.jam
-
-  cd "${srcdir}"/${pkgbase}_${_boostver}
-
-  # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
-  ./build.sh cc
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
-  install -d "${_stagedir}"/usr/bin
-  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
-  # build tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
-  "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
-  # copy the tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
-  for i in *;do
-      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
-  done
-
-  #boostbook needed by quickbook
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
-  cp -r share "${_stagedir}"
-
-  # build libs
-  cd "${srcdir}/${pkgbase}_${_boostver}"
-
-  # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=single,multi"
-  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
-  # and installs includes in /usr/include/boost.
-  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
-  # install to ${_stagedir} in preparation for split packaging
-
-  "${_stagedir}"/usr/bin/bjam \
-      release debug-symbols=off threading=multi \
-      runtime-link=shared link=shared,static \
-      cflags=-fno-strict-aliasing \
-      toolset=gcc \
-      --prefix="${_stagedir}" \
-      -sTOOLS=gcc \
-      --layout=system \
-      ${MAKEFLAGS} \
-      install
-}
-
-package_boost() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
-    depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python bindings'
-                'python2: for python2 bindings'
-		'boost-build: to use boost jam for building your project.')
-
-    install -d "${pkgdir}"/usr/{include,lib,share}
-    # headers/source files
-    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
-    # static libs
-    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
-    # utilities (bjam, bcp, pyste)
-    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
-
-    #boostbook
-    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
-}
-
-package_boost-libs() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
-    optdepends=('openmpi: for mpi support')
-
-    install -d "${pkgdir}/usr/lib"
-    #shared libs
-    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
-}
diff --git a/staging/bzflag/PKGBUILD b/staging/bzflag/PKGBUILD
deleted file mode 100644
index f85dd2996..000000000
--- a/staging/bzflag/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169489 2012-10-22 02:45:00Z bisson $
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=bzflag
-pkgver=2.4.2
-pkgrel=2
-pkgdesc='Multiplayer 3D tank battle game'
-url='http://bzflag.org/'
-license=('LGPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('curl' 'glew' 'glu' 'sdl')
-makedepends=('mesa') # glu requires <GL/gl.h>
-source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
-sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure --prefix=/usr
-	make
-
-	cd misc
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop
-	install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png
-}
diff --git a/staging/bzr/PKGBUILD b/staging/bzr/PKGBUILD
deleted file mode 100644
index 22244baf0..000000000
--- a/staging/bzr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168772 2012-10-15 21:04:59Z eric $
-# Maintainer :
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=bzr
-pkgver=2.5.1
-pkgrel=2
-pkgdesc="A decentralized revision control system (bazaar)"
-arch=('i686' 'x86_64')
-url="http://bazaar.canonical.com/en/"
-license=('GPL')
-depends=('python2')
-optdepends=('python2-paramiko: for sftp support')
-source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('ac5079858364a046071000d5cdccb67b'
-         'c83dd08dd2c3e27edbab873500d7d6eb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|man/man1|share/man/man1|' setup.py
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-    bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-
-  # bash-completion
-  install -D -m644 contrib/bash/bzr \
-    "${pkgdir}/usr/share/bash-completion/completions/bzr"
-}
diff --git a/staging/cabal-install/PKGBUILD b/staging/cabal-install/PKGBUILD
deleted file mode 100644
index 30bffb560..000000000
--- a/staging/cabal-install/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=cabal-install
-pkgver=0.14.0
-pkgrel=2
-pkgdesc="The command-line interface for Cabal and Hackage."
-url="http://hackage.haskell.org/package/cabal-install"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-makedepends=('haskell-http=4000.2.3-1' 'haskell-zlib=0.5.3.3-4' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1' 'haskell-random=1.0.1.1-2')
-depends=('ghc' 'gmp' 'zlib')
-source=(http://hackage.haskell.org/packages/archive/cabal-install/$pkgver/cabal-install-$pkgver.tar.gz)
-md5sums=('638514bd1a5792d75866481852148ae5')
-
-build() {
-    cd cabal-install-${pkgver}
-    runhaskell Setup configure --enable-shared --enable-split-objs --enable-executable-stripping --prefix=/usr
-    runhaskell Setup build
-}
-
-package() {
-    cd cabal-install-${pkgver}
-    runhaskell Setup copy --destdir=$pkgdir
-
-    # rm license installed to wrong location
-    rm -rf ${pkgdir}/usr/share/doc
-
-    install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-    
-    # add bash completion
-    install -d ${pkgdir}/usr/share/bash-completion/completions
-    install -m644 bash-completion/cabal \
-        ${pkgdir}/usr/share/bash-completion/completions
-}
diff --git a/staging/calligra/PKGBUILD b/staging/calligra/PKGBUILD
deleted file mode 100644
index 85b4826c3..000000000
--- a/staging/calligra/PKGBUILD
+++ /dev/null
@@ -1,221 +0,0 @@
-# $Id: PKGBUILD 169379 2012-10-20 09:05:17Z andrea $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=calligra
-pkgname=('calligra-filters'
-         'calligra-libs'
-         'calligra-plugins'
-         'calligra-tools'
-         'calligra-karbon'
-         'calligra-kexi'
-         'calligra-plan'
-         'calligra-stage'
-         'calligra-krita'
-         'calligra-sheets'
-         'calligra-words'
-         'calligra-handbook'
-         'calligra-braindump'
-         'calligra-flow')
-pkgver=2.5.3
-pkgrel=6
-arch=('i686' 'x86_64')
-url='http://www.calligra-suite.org/'
-license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
-             'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg'
-             'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
-groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('83e2679b7ecb923b953ace06db7ca4c2')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_active=OFF
-  make
-}
-
-package_calligra-filters() {
-  pkgdesc="Filters for the Calligra office suite"
-  optdepends=('libwpg: Corel WordPerfect Graphics image importer'
-              'libwps: Microsoft Works file word processor format import')
-  conflicts=('koffice-filters')
-  replaces=('koffice-filters')
-  install=calligra-filters.install
-
-  cd "${srcdir}"/build/filters
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-libs() {
-  pkgdesc="Libraries for the Calligra office suite"
-  depends=('kdepimlibs' 'lcms2')
-  conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
-             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
-             'calligra-templates')
-  replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
-             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
-             'calligra-templates')
-
-  for d in interfaces libs pics servicetypes templates; do
-    cd "${srcdir}"/build/${d}
-    make DESTDIR="${pkgdir}" install
-  done
-}
-
-package_calligra-plugins() {
-  pkgdesc="Plugins for the Calligra office suite"
-  depends=('calligra-libs' 'calligra-filters')
-  optdepends=('kdeedu-marble: map shape for Calligra')
-  conflicts=('koffice-plugins' 'koffice-kchart')
-  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
-
-  cd "${srcdir}"/build/plugins
-  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_calligra-karbon() {
-  pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs' 'kdebase-runtime' 'pstoedit')
-  optdepends=('calligra-filters: import/export filters'
-              'calligra-tools: extra calligra tools')
-  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' 'glew' 'fftw')
-  optdepends=('libmysqlclient: MySQL driver'
-              'libpqxx: PostgreSQL driver'
-              'freetds: Sybase & MS SQL driver'
-              'xbase: XBase driver'
-              'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
-              'kdeedu-marble: map form widget'
-              'calligra-plugins: extra calligra plugins')
-  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
-  cd "${srcdir}"/build/doc/kexi
-  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' 'kdebase-runtime')
-  optdepends=('calligra-plugins: extra calligra plugins')
-  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
-  cd "${srcdir}"/build/doc/stage
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-krita() {
-  pkgdesc="Edit and paint images"
-  depends=('calligra-plugins' 'kdebase-runtime' 'eigen2'
-           'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl')
-  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-sheets() {
-  pkgdesc="Write spreadsheet documents"
-  depends=('calligra-libs' 'gsl' 'kdebase-runtime')
-  optdepends=('calligra-filters: import/export filters'
-              'calligra-plugins: extra calligra plugins'
-              'calligra-tools: extra calligra tools')
-  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  install=calligra-sheets.install
-
-  cd "${srcdir}"/build/sheets
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc/sheets
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-words() {
-  pkgdesc="Word Processor"
-  depends=('calligra-libs' 'kdegraphics-okular')
-  optdepends=('calligra-tools: extra calligra tools')
-  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')
-  options=('docs')
-
-  cd "${srcdir}"/build/doc/calligra
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-braindump() {
-  pkgdesc="Notes and idea gathering"
-  depends=('calligra-libs' 'kdebase-runtime')
-  install=calligra-braindump.install
-
-  cd "${srcdir}"/build/braindump
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-flow() {
-  pkgdesc="Flowchart & Diagram Editing"
-  depends=('calligra-words')
-  conflicts=('calligra-flow-doc')
-  replaces=('calligra-flow-doc')
-  install=calligra-flow.install
-
-  cd "${srcdir}"/build/flow
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/calligra/calligra-braindump.install b/staging/calligra/calligra-braindump.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/staging/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/staging/calligra/calligra-filters.install b/staging/calligra/calligra-filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/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/staging/calligra/calligra-flow.install b/staging/calligra/calligra-flow.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/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/staging/calligra/calligra-karbon.install b/staging/calligra/calligra-karbon.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/staging/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/staging/calligra/calligra-kexi.install b/staging/calligra/calligra-kexi.install
deleted file mode 100644
index b8c7ebf27..000000000
--- a/staging/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/staging/calligra/calligra-krita.install b/staging/calligra/calligra-krita.install
deleted file mode 100644
index 33d234a02..000000000
--- a/staging/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/staging/calligra/calligra-plan.install b/staging/calligra/calligra-plan.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/staging/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/staging/calligra/calligra-sheets.install b/staging/calligra/calligra-sheets.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/calligra/calligra-sheets.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/calligra/calligra-stage.install b/staging/calligra/calligra-stage.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/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/staging/calligra/calligra-tools.install b/staging/calligra/calligra-tools.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/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/staging/calligra/calligra-words.install b/staging/calligra/calligra-words.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/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/staging/calligra/calligra.install b/staging/calligra/calligra.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/cinepaint/LICENSE b/staging/cinepaint/LICENSE
deleted file mode 100644
index 746207229..000000000
--- a/staging/cinepaint/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2005, Kai-Uwe Behrmann
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.ntributors may be used to endorse or promote
-    products derived from this software without specific prior written
-    permission. 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/staging/cinepaint/PKGBUILD b/staging/cinepaint/PKGBUILD
deleted file mode 100644
index d8d5e0195..000000000
--- a/staging/cinepaint/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 169355 2012-10-20 02:54:29Z eric $
-# Maintainer: tobias [tobias.archlinux.org]
-# Contributor: tobias [tobias.justdreams.de]
-
-pkgname=cinepaint
-pkgver=1.3
-pkgrel=5
-pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
-arch=('i686' 'x86_64')
-license=('LGPL' 'GPL' 'MIT')
-url="http://www.cinepaint.org"
-depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
-makedepends=('python2' 'gutenprint>=5.2.9')
-optdepends=('python2: for python plug-ins' 
-            'gutenprint: for print plug-ins'
-            'ghostscript: for pdf plug-ins')
-options=('!libtool')
-install=cinepaint.install
-source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz
-        LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch)
-sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b'
-          'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e'
-          '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5'
-          'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p1 -i ../cinepaint-libpng15.patch
-  patch -p1 -i ../cinepaint-missing-include.patch
-  find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
-
-#  aclocal -I aclocal
-#  autoconf
-  sh autogen.sh
-  
-  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
-    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
-  sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
-    plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install
-  sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
-    -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
-  sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/cinepaint/cinepaint-libpng15.patch b/staging/cinepaint/cinepaint-libpng15.patch
deleted file mode 100644
index e22edafae..000000000
--- a/staging/cinepaint/cinepaint-libpng15.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
---- cinepaint.old/plug-ins/png/png.c	2012-01-23 12:39:42.000000000 -0500
-+++ cinepaint/plug-ins/png/png.c	2012-01-23 12:39:50.000000000 -0500
-@@ -390,6 +390,16 @@
-   gchar		*progress;	/* Title for progress display... */
-   guchar	alpha[256],	/* Index -> Alpha */
-   		*alpha_ptr;	/* Temporary pointer */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  int compression_type;
-+  png_bytepp iccp_profile;
-+  png_uint_32 iccp_proflen;
-+  png_uint_32 width, height;
-+  png_byte channels;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -405,7 +415,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. File corrupted?", filename);
-     return image;
-@@ -442,21 +452,26 @@
-   */
- 
-   png_read_info(pp, info);
-+  color_type = png_get_color_type(pp, info);
-+  width=png_get_image_width(pp, info);
-+  height=png_get_image_height(pp, info);
- 
-  /*
-   * Latest attempt, this should be my best yet :)
-   */
- 
-+  bit_depth = png_get_bit_depth(pp, info);
-+
- #ifndef WORDS_BIGENDIAN
--  if(info->bit_depth == 16)
-+  if(bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
- 
--  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-     png_set_expand(pp);
-   }
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
-     png_set_packing(pp);
-   }
- 
-@@ -464,8 +479,8 @@
-   * Expand G+tRNS to GA, RGB+tRNS to RGBA
-   */
- 
--  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
--                       (info->valid & PNG_INFO_tRNS)) {
-+  if (color_type != PNG_COLOR_TYPE_PALETTE &&
-+      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
-     png_set_expand(pp);
-   }
- 
-@@ -482,7 +497,7 @@
- 
- #if PNG_LIBPNG_VER > 99
-   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
--      info->color_type == PNG_COLOR_TYPE_PALETTE)
-+      color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
-     /* Copy the existing alpha values from the tRNS chunk */
-@@ -505,9 +520,9 @@
- 
-   png_read_update_info(pp, info);
-   
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 6;
-@@ -545,7 +560,7 @@
-   }
-   else
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 3;
-@@ -582,7 +597,7 @@
- 	  };
-   }
- 
--  image = gimp_image_new(info->width, info->height, image_type);
-+  image = gimp_image_new(width, height, image_type);
-   if (image == -1)
-   {
-     g_message("Can't allocate new image\n%s", filename);
-@@ -595,7 +610,7 @@
-   * Create the "background" layer to hold the image...
-   */
- 
--  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
-+  layer = gimp_layer_new(image, _("Background"), width, height,
-                          layer_type, 100, NORMAL_MODE);
-   gimp_image_add_layer(image, layer, 0);
- 
-@@ -627,20 +642,21 @@
- 
-   empty= 0; /* by default assume no full transparent palette entries */
- 
--  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
-+  if (color_type & PNG_COLOR_MASK_PALETTE) {
- 
- #if PNG_LIBPNG_VER > 99
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
-         /* Calculates number of fully transparent "empty" entries */
- 
--      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
--                          info->num_palette - empty);
-+      gimp_image_set_cmap(image, (guchar *) (palette + empty),
-+                          num_palette - empty);
-     } else {
--      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
-     }
- #else
--    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
- #endif /* PNG_LIBPNG_VER > 99 */
- 
-   }
-@@ -659,18 +675,19 @@
-   */
- 
-   tile_height = gimp_tile_height ();
--  pixel       = g_new(guchar, tile_height * info->width * bpp);
-+  pixel       = g_new(guchar, tile_height * width * bpp);
-   pixels      = g_new(guchar *, tile_height);
-+  channels=png_get_channels(pp, info);
- 
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i * 2;
-+		  pixels[i] = pixel + width * channels * i * 2;
-   }
-   else
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i;
-+		  pixels[i] = pixel + width * channels * i;
-   }
- 
-   for (pass = 0; pass < num_passes; pass ++)
-@@ -680,11 +697,11 @@
- 	   */
- 
- 	  for (begin = 0, end = tile_height;
--			  begin < info->height;
-+			  begin < height;
- 			  begin += tile_height, end += tile_height)
- 	  {
--		  if (end > info->height)
--			  end = info->height;
-+		  if (end > height)
-+			  end = height;
- 
- 		  num = end - begin;
- 
-@@ -697,20 +714,21 @@
- 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
- 				  drawable->width, num);
- 
--		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
-+		  gimp_progress_update(((double)pass + (double)end / (double)height) /
- 				  (double)num_passes);
- 	  };
-   };
- 
- #if defined(PNG_iCCP_SUPPORTED)
-   /* set icc profile */
--  if (info->iccp_proflen > 0) {
--    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
--                                              info->iccp_profile,
--                                              ICC_IMAGE_PROFILE);
-+  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
-+  if (iccp_proflen > 0) {
-+    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
-+				       (gchar *)iccp_profile,
-+				       ICC_IMAGE_PROFILE);
-     printf ("%s:%d %s() set embedded profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -808,6 +826,14 @@
-                 blue;           /* Used for palette background */
-   time_t	cutime;         /* Time since epoch */
-   struct tm	*gmt;		/* GMT broken down */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  int filter_method=0;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  png_uint_32 height;
-+  int compression_type;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -824,7 +849,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. Couldn't save image", filename);
-     return 0;
-@@ -857,15 +882,6 @@
-   drawable = gimp_drawable_get (drawable_ID);
-   type     = gimp_drawable_type (drawable_ID);
- 
-- /*
--  * Set the image dimensions, bit depth, interlacing and compression
--  */
--
--  png_set_compression_level (pp, pngvals.compression_level);
--
--  info->width          = drawable->width;
--  info->height         = drawable->height;
--  info->interlace_type = pngvals.interlaced;
- 
-  /*
-   * Set color type and remember bytes per pixel count 
-@@ -874,71 +890,69 @@
-   switch (type)
-   {
-     case RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 8;
-         bpp              = 3;
-         break;
-     case RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 4;
-         break;
-     case GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 8;
-         bpp              = 1;
-         break;
-     case GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 2;
-         break;
-     case INDEXED_IMAGE :
- 	bpp		 = 1;
--	info->bit_depth      = 8;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case INDEXEDA_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 8;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 8;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     case U16_RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 16;
-         bpp              = 6;
-         break;
-     case U16_RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 8;
-         break;
-     case U16_GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 16;
-         bpp              = 2;
-         break;
-     case U16_GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 4;
-         break;
-     case U16_INDEXED_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 16;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case U16_INDEXEDA_IMAGE :
- 	bpp		 = 4;
--	info->bit_depth      = 16;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 16;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     default:
-@@ -950,30 +964,36 @@
-   * Fix bit depths for (possibly) smaller colormap images
-   */
-   
--  if (info->valid & PNG_INFO_PLTE) {
--    if (info->num_palette <= 2)
--      info->bit_depth= 1;
--    else if (info->num_palette <= 4)
--      info->bit_depth= 2;
--    else if (info->num_palette <= 16)
--      info->bit_depth= 4;
-+  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-+    if (num_palette <= 2)
-+      bit_depth= 1;
-+    else if (num_palette <= 4)
-+      bit_depth= 2;
-+    else if (num_palette <= 16)
-+      bit_depth= 4;
-     /* otherwise the default is fine */
-   }
- 
-+ png_set_compression_level (pp, pngvals.compression_level);
-+ png_set_IHDR(pp, info, drawable->width, drawable->height,
-+	      bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
-+
-+
-   // write icc profile
- #if defined(PNG_iCCP_SUPPORTED)
-   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
--    int size;
-+    int  size;
-     char *buffer;
-     
-     buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
-                                                 ICC_IMAGE_PROFILE);
-     png_set_iCCP (pp, info,
-            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
--                  0, buffer, size);
-+                  0, (png_const_bytep)buffer, size);
-     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -1039,13 +1059,13 @@
-   * Convert unpacked pixels to packed if necessary
-   */
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
-     png_set_packing(pp);
- 
-   /* Set swapping for 16 bit per sample images */
-   
- #ifndef WORDS_BIGENDIAN
--  if (info->bit_depth == 16)
-+  if (bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
-   
-@@ -1063,6 +1083,7 @@
- 
-   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
-                       drawable->height, FALSE, FALSE);
-+  height=png_get_image_height(pp, info);
- 
-   for (pass = 0; pass < num_passes; pass ++)
-   {
-@@ -1077,7 +1098,7 @@
- 	num = end - begin;
- 	
- 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
--        if (info->valid & PNG_INFO_tRNS) {
-+        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1085,7 +1106,7 @@
-             }
-           }
-        /* Forgot this case before, what if there are too many colors? */
--        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
-+        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1095,9 +1116,8 @@
-         }
- 	
- 	png_write_rows (pp, pixels, num);
--	
- 	gimp_progress_update (((double)pass + (double)end /
--                    (double)info->height) / (double)num_passes);
-+                    (double)height) / (double)num_passes);
-       };
-   };
- 
diff --git a/staging/cinepaint/cinepaint-missing-include.patch b/staging/cinepaint/cinepaint-missing-include.patch
deleted file mode 100644
index ed159213a..000000000
--- a/staging/cinepaint/cinepaint-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
---- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:51:10.625503826 -0400
-+++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:52:04.478835055 -0400
-@@ -32,6 +32,7 @@
- 
- #include <list>
- #include <string>
-+#include <unistd.h>
- 
- #include "icc_modell_beobachter.h"
- 
diff --git a/staging/cinepaint/cinepaint.install b/staging/cinepaint/cinepaint.install
deleted file mode 100644
index 5e5cfef4d..000000000
--- a/staging/cinepaint/cinepaint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/staging/clamav/PKGBUILD b/staging/clamav/PKGBUILD
deleted file mode 100644
index e9603a4ff..000000000
--- a/staging/clamav/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 161850 2012-06-15 15:33:18Z bisson $
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=clamav
-pkgver=0.97.5
-pkgrel=1
-pkgdesc='Anti-virus toolkit for Unix'
-url='http://www.clamav.net/'
-license=('GPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('bzip2' 'libltdl')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'conf.d'
-        'service'
-        'service.fresh'
-        'logrotate'
-        'tmpfiles.d'
-        'config.patch')
-sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9'
-          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
-          'cb116cdab49a810381a515cbcfb6a6c148547f07'
-          'df522b0488f3901e491f148c9300f6bae348c605'
-          'cda9a087e5593992150cb456e34c5f6f589aca82'
-          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
-          'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '1c8ef193919b041135115170acd6313f008de808')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../config.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/clamav \
-		--with-dbdir=/var/lib/clamav \
-		--disable-clamav \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# Make sure conf files get installed, because make install
-	# doesn't do that if clamav is already installed upon building.
-	install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
-	install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
-
-	install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
-	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
-	install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav
-}
diff --git a/staging/clamav/conf.d b/staging/clamav/conf.d
deleted file mode 100644
index 9cd44d9f8..000000000
--- a/staging/clamav/conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# clamav startup script config options
-
-# change these to "yes" to start 
-START_FRESHCLAM="no"
-START_CLAMD="no"
-
-# Options to pass to freshclam (man freshclam for more info).
-FRESHCLAM_OPTS="-c 12"
diff --git a/staging/clamav/config.patch b/staging/clamav/config.patch
deleted file mode 100644
index 0640df2c3..000000000
--- a/staging/clamav/config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf
---- old/etc/clamd.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/clamd.conf	2010-12-02 19:31:45.873357389 +0100
-@@ -14 +14 @@
--#LogFile /tmp/clamd.log
-+LogFile /var/log/clamav/clamd.log
-@@ -34 +34 @@
--#LogTime yes
-+LogTime yes
-@@ -61 +61 @@
--#PidFile /var/run/clamd.pid
-+PidFile /run/clamav/clamd.pid
-@@ -65 +65 @@
--#TemporaryDirectory /var/tmp
-+TemporaryDirectory /tmp
-@@ -80 +80 @@
--#LocalSocket /tmp/clamd.socket
-+LocalSocket /var/lib/clamav/clamd.sock
-@@ -190 +190 @@
--#User clamav
-+User clamav
-diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf
---- old/etc/freshclam.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/freshclam.conf	2010-12-02 19:31:51.190024057 +0100
-@@ -17 +17 @@
--#UpdateLogFile /var/log/freshclam.log
-+UpdateLogFile /var/log/clamav/freshclam.log
-@@ -121 +121 @@
--#NotifyClamd /path/to/clamd.conf
-+NotifyClamd /etc/clamav/clamd.conf
diff --git a/staging/clamav/gcc47.patch b/staging/clamav/gcc47.patch
deleted file mode 100644
index 17fc924d9..000000000
--- a/staging/clamav/gcc47.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8b6757e866d1480c997d5ae497e0512000d82b35 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net>
-Date: Mon, 14 May 2012 20:13:21 +0300
-Subject: [PATCH 1/2] Fix build with gcc-4.7
-
----
- .../c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-index 274f816..a4e7eee 100644
---- a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-+++ b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-@@ -19,6 +19,7 @@
- #include "llvm/Support/ErrorHandling.h"
- #include "llvm/System/DynamicLibrary.h"
- #include "llvm/Config/config.h"
-+#include <unistd.h>
- using namespace llvm;
- 
- // AtExitHandlers - List of functions to call when the program exits,
--- 
-1.7.2.3
-
-
-From c609c8ea0409b2882aa3e6ef4dc48c210cf2d292 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?T=C3=B6r=C3=B6k=20Edvin?= <edwin@clamav.net>
-Date: Tue, 15 May 2012 23:36:29 +0300
-Subject: [PATCH 2/2] wrap unistd in ifdef
-
----
- .../c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-index a4e7eee..c1cd5e8 100644
---- a/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-+++ b/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
-@@ -19,7 +19,9 @@
- #include "llvm/Support/ErrorHandling.h"
- #include "llvm/System/DynamicLibrary.h"
- #include "llvm/Config/config.h"
-+#ifdef HAVE_UNISTD_H
- #include <unistd.h>
-+#endif
- using namespace llvm;
- 
- // AtExitHandlers - List of functions to call when the program exits,
--- 
-1.7.2.3
-
diff --git a/staging/clamav/install b/staging/clamav/install
deleted file mode 100644
index a2092e815..000000000
--- a/staging/clamav/install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-	getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
-	getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
-
-	chown -R clamav:clamav /var/lib/clamav
-	install -o clamav -g clamav -d /run/clamav
-	install -o clamav -g clamav -d /var/log/clamav
-}
-
-post_remove() {
-	getent passwd clamav &>/dev/null && userdel clamav >/dev/null
-	getent group clamav &>/dev/null && groupdel clamav >/dev/null
-	return 0
-}
diff --git a/staging/clamav/logrotate b/staging/clamav/logrotate
deleted file mode 100644
index 6a9051bed..000000000
--- a/staging/clamav/logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
-    create 644 clamav clamav
-    sharedscripts
-    postrotate
-            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
-            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
-    endscript
-}
diff --git a/staging/clamav/rc.d b/staging/clamav/rc.d
deleted file mode 100644
index 127c86c0f..000000000
--- a/staging/clamav/rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
-
-PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
-PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
-
-case "$1" in
-	start)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Starting ClamD"
-			[[ -z $PID_CD ]] && /usr/sbin/clamd
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-		sleep 1
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Starting FreshClam"
-			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	stop)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Stopping ClamD"
-			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
-				if [[ $? -gt 0 ]]; then
-					stat_fail
-				else
-					rm_daemon clamav
-					stat_done
-				fi
-		fi
-
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Stopping FreshClam"
-			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					rm_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"	
-esac
-exit 0
diff --git a/staging/clamav/service b/staging/clamav/service
deleted file mode 100644
index 5bf9eb14e..000000000
--- a/staging/clamav/service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav daemon
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/clamd.pid
-ExecStart=/usr/sbin/clamd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/clamav/service.fresh b/staging/clamav/service.fresh
deleted file mode 100644
index a0a72c2e6..000000000
--- a/staging/clamav/service.fresh
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav updater
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/freshclam.pid
-ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/clamav/tmpfiles.d b/staging/clamav/tmpfiles.d
deleted file mode 100644
index 22d29941e..000000000
--- a/staging/clamav/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/clamav 0755 clamav clamav
diff --git a/staging/cloog/PKGBUILD b/staging/cloog/PKGBUILD
deleted file mode 100644
index 68d83c76a..000000000
--- a/staging/cloog/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161822 2012-06-15 04:19:17Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=cloog
-pkgver=0.17.0
-pkgrel=2
-pkgdesc="Library that generates loops for scanning polyhedra"
-arch=('i686' 'x86_64')
-url="http://www.bastoul.net/cloog/"
-license=('GPL')
-depends=('isl' 'gmp')
-conflicts=('cloog-ppl<0.15.10-2')
-options=('!libtool')
-source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
-md5sums=('0aa3302c81f65ca62c114e5264f8a802')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-isl=system --with-gmp=system
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/staging/cronie/PKGBUILD b/staging/cronie/PKGBUILD
deleted file mode 100644
index 65386def0..000000000
--- a/staging/cronie/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname='cronie'
-pkgver=1.4.8
-pkgrel=2
-pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
-url='https://fedorahosted.org/cronie/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-depends=('pam' 'bash' 'run-parts')
-optdepends=('smtp-server: sending cron job output via email')
-
-source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'cron.deny'
-	'service'
-        'pam.d'
-        'rc.d')
-sha1sums=('1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3'
-          '0f279b8fb820340267d578dc85511c980715f91e'
-          '3038a05476829f72fc4918bee9176b273ce10340'
-          '5eff7fb31f6bc0a924243ff046704726cf20c221'
-          'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
-
-backup=('etc/anacrontab'
-        'etc/conf.d/crond'
-        'etc/pam.d/crond'
-        'etc/cron.deny')
-
-conflicts=('cron')
-provides=('cron')
-groups=('base')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-anacron \
-		--with-inotify \
-		--with-pam \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	chmod u+s "${pkgdir}"/usr/bin/crontab
-	install -d "${pkgdir}"/var/spool/{ana,}cron
-	install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
-	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
-	install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service
-
-	install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond
-	install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab
-	install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly
-	install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
-
-	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING
-}
diff --git a/staging/cronie/cron.deny b/staging/cronie/cron.deny
deleted file mode 100644
index 06e685cc8..000000000
--- a/staging/cronie/cron.deny
+++ /dev/null
@@ -1 +0,0 @@
-# without this file, only users listed in /etc/cron.allow can use crontab
diff --git a/staging/cronie/pam.d b/staging/cronie/pam.d
deleted file mode 100644
index 9a254ebc0..000000000
--- a/staging/cronie/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-auth      required    pam_unix.so
-auth      required    pam_env.so
-
-account   required    pam_access.so
-account   required    pam_unix.so
-account   required    pam_time.so
-
-session    required   pam_loginuid.so
-session   required    pam_limits.so
-session   required    pam_unix.so
diff --git a/staging/cronie/rc.d b/staging/cronie/rc.d
deleted file mode 100755
index d0659685c..000000000
--- a/staging/cronie/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=crond
-. /etc/conf.d/crond
-PID=$(pidof -o %PPID /usr/sbin/crond)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/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/cronie/service b/staging/cronie/service
deleted file mode 100644
index 5ae193bfc..000000000
--- a/staging/cronie/service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Periodic Command Scheduler
-
-[Service]
-ExecStart=/usr/sbin/crond -n
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/dbus-python/PKGBUILD b/staging/dbus-python/PKGBUILD
deleted file mode 100644
index b6b1bc24f..000000000
--- a/staging/dbus-python/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 168669 2012-10-13 22:15:37Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=dbus-python
-pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="Python bindings for DBUS"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-makedepends=('docutils' 'dbus-glib' 'python' 'python2')
-options=('!libtool')
-source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('742c7432ad0f7c3f98291d58fa2e35dc')
-
-build() {
-  cd "${srcdir}"
-  mkdir build-python2 build-python3
-  cd "${srcdir}/build-python2"
-  PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  make
-
-
-  cd "${srcdir}/build-python3"
-  ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  make
-}
-
-package_python-dbus-common() {
-  pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus"
-  conflicts=('dbus-python<1.1.0')
-
-  cd "${srcdir}/build-python3"
-  make DESTDIR="${pkgdir}" install-data
-  rm -rf "${pkgdir}"/usr/lib/python*
-}
-
-package_python-dbus() {
-  depends=('python-dbus-common' 'python' 'dbus-core')
-  optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 3.3 bindings for DBUS"
-
-  cd "${srcdir}/build-python3"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-}
-
-package_python2-dbus() {
-  depends=('python-dbus-common' 'python2' 'dbus-core')
-  optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 2.7 bindings for DBUS"
-  replaces=('dbus-python')
-  conflicts=('dbus-python')
-  provides=("dbus-python=$pkgver")
-
-  cd "${srcdir}/build-python2"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-}
diff --git a/staging/dmraid/PKGBUILD b/staging/dmraid/PKGBUILD
deleted file mode 100644
index f50754782..000000000
--- a/staging/dmraid/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 161388 2012-06-10 18:50:00Z dreisner $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
-
-pkgname=dmraid
-pkgver=1.0.0.rc16.3
-pkgrel=6
-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')
-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
-        dmraid_install
-        dmraid_hook
-        dmraid_tmpfiles
-        dmraid.service)
-install=dmraid.install
-md5sums=('819338fcef98e8e25819f0516722beeb'
-         '2297d23cee1aef23ec6ad8d6d1870356'
-         'faec669dc85f87187b45b5d3968efe2c'
-         '56a8bb0ece8d206cd8efb504ee072ddd'
-         'de0af1fdb9ed4c109b8119160167d2e9')
-
-build() {
-  cd "$pkgname/1.0.0.rc16-3/$pkgname"
-  ./configure --enable-led --enable-intel_led
-  make
-}
-
-package() {
-  cd "$pkgname/1.0.0.rc16-3/$pkgname"
-  make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
-  install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid
-  install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid
-  install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf
-
-  # fix permissions
-  chmod 644 "$pkgdir"/usr/include/dmraid/* "$pkgdir"/usr/lib/libdmraid.a
-
-  install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service"
-}
diff --git a/staging/dmraid/dmraid.install b/staging/dmraid/dmraid.install
deleted file mode 100644
index 64899e785..000000000
--- a/staging/dmraid/dmraid.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then
-    # important upgrade notice
-    echo ">>>"
-    echo ">>> IMPORTANT DMRAID UPGRADE NOTICE"
-    echo ">>> -------------------------------"
-    echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:"
-    echo ">>> You need to add an additional 'p' in front of your number."
-    echo ">>> e.g. <yourname><number> --> <yourname>p<number>"
-    echo ">>>      firsthd1           --> firsthdp1"
-    echo ">>> Please change your bootloader and fstab accordingly."
-    echo ">>>"
-  fi
-}
diff --git a/staging/dmraid/dmraid.service b/staging/dmraid/dmraid.service
deleted file mode 100644
index 1fd142ff2..000000000
--- a/staging/dmraid/dmraid.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Assemble FakeRAID arrays
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service
-Before=basic.target shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/dmraid --ignorelocking --activate y -Z
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=true
-
-[Install]
-WantedBy=basic.target
diff --git a/staging/dmraid/dmraid_hook b/staging/dmraid/dmraid_hook
deleted file mode 100644
index 37283e83e..000000000
--- a/staging/dmraid/dmraid_hook
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1
-    msg ":: Activating dmraid arrays..."
-    # prevent any event monitoring calls with -I
-    if [ "$quiet" = "y" ]; then
-        dmraid -ay -I -Z >/dev/null
-    else
-        dmraid -ay -I -Z
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/dmraid/dmraid_install b/staging/dmraid/dmraid_install
deleted file mode 100644
index d3238c1f7..000000000
--- a/staging/dmraid/dmraid_install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module 'dm-mod'
-    add_module 'dm-mirror'
-
-    add_binary 'dmraid'
-    add_binary 'dmsetup'
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook loads the necessary modules for a dmraid root device.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/dmraid/dmraid_tmpfiles b/staging/dmraid/dmraid_tmpfiles
deleted file mode 100644
index 4f21ac1fc..000000000
--- a/staging/dmraid/dmraid_tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/lock/dmraid 1777 root root
diff --git a/staging/dvdauthor/PKGBUILD b/staging/dvdauthor/PKGBUILD
deleted file mode 100644
index 1a5f8b6c4..000000000
--- a/staging/dvdauthor/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169519 2012-10-23 00:56:41Z eric $
-# 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.1
-pkgrel=2
-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")
-md5sums=('2694a5a3ef460106ea3caf0f7f60ff80')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  ./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/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD
deleted file mode 100644
index 9ec154322..000000000
--- a/staging/ekiga/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 163123 2012-07-07 16:03:55Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=ekiga
-pkgver=3.3.2
-pkgrel=6
-pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
-url="http://www.ekiga.org"
-license=(GPL)
-arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
-optdepends=('evolution-data-server: Evolution integration')
-options=(!emptydirs)
-groups=('gnome-extra')
-install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gcc47.patch)
-sha256sums=('d4dd47a47696c53e6f3839eef6e0e896dd3d07babb2e68ff8fe994d67ba8807a'
-            '9e3000016e1174be5d6cc60c89abeaeb61a98eb163a38abf11f4af4f2d6363ec')
-
-build() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/gcc47.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-install \
-      --disable-scrollkeeper --enable-dbus
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/ekiga/ekiga.install b/staging/ekiga/ekiga.install
deleted file mode 100644
index 91f3a57a0..000000000
--- a/staging/ekiga/ekiga.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ekiga
-
-post_install() {
-  gconfpkg --install $pkgname
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/staging/ekiga/gcc47.patch b/staging/ekiga/gcc47.patch
deleted file mode 100644
index f12c37524..000000000
--- a/staging/ekiga/gcc47.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
-From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
-Date: Sat, 24 Mar 2012 09:17:40 +0000
-Subject: Fix compile error with gcc 4.7
-
----
-diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
-index e16848e..b0a8775 100644
---- a/lib/engine/account/bank-impl.h
-+++ b/lib/engine/account/bank-impl.h
-@@ -203,7 +203,7 @@ template<typename AccountType>
- void
- Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
- {
--  add_object (account);
-+  this->add_object (account);
- 
-   account->questions.connect (boost::ref (questions));
- }
-@@ -213,7 +213,7 @@ template<typename AccountType>
- void
- Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
- {
--  remove_object (account);
-+  this->remove_object (account);
- }
- 
- #endif
-diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
-index 711d8d9..4fea7d5 100644
---- a/lib/engine/addressbook/book-impl.h
-+++ b/lib/engine/addressbook/book-impl.h
-@@ -204,7 +204,7 @@ void
- Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
- {
-   contact->questions.connect (boost::ref (questions));
--  add_object (contact);
-+  this->add_object (contact);
- }
- 
- 
-@@ -212,7 +212,7 @@ template<typename ContactType>
- void
- Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
- {
--  remove_object (contact);
-+  this->remove_object (contact);
- }
- 
- #endif
-diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
-index a30cd03..630236f 100644
---- a/lib/engine/addressbook/source-impl.h
-+++ b/lib/engine/addressbook/source-impl.h
-@@ -206,7 +206,7 @@ template<typename BookType>
- void
- Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
- {
--  add_object (book);
-+  this->add_object (book);
- 
-   add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
- 
-diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
-index 245a7c6..92074a8 100644
---- a/lib/engine/presence/cluster-impl.h
-+++ b/lib/engine/presence/cluster-impl.h
-@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
- 
-   add_connection (heap, heap->questions.connect (boost::ref (questions)));
- 
--  add_object (heap);
-+  this->add_object (heap);
- }
- 
- template<typename HeapType>
-diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
-index d63c491..15fe86f 100644
---- a/lib/engine/presence/heap-impl.h
-+++ b/lib/engine/presence/heap-impl.h
-@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
- {
-   presentity->questions.connect (boost::ref (questions));
- 
--  add_object (presentity);
-+  this->add_object (presentity);
- }
- 
- template<typename PresentityType>
- void
- Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
- {
--  remove_object (presentity);
-+  this->remove_object (presentity);
- }
- 
- #endif
---
-cgit v0.9.0.2
diff --git a/staging/emacs/PKGBUILD b/staging/emacs/PKGBUILD
deleted file mode 100644
index 3fa2f0677..000000000
--- a/staging/emacs/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 169485 2012-10-22 00:40:50Z eric $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
-
-pkgname=emacs
-pkgver=24.2
-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' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
-install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
-
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # remove conflict with ctags package
-  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,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.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 376b0ddb8..000000000
--- a/staging/enblend-enfuse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169359 2012-10-20 04:34:58Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=8
-pkgdesc="Intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
-makedepends=('boost' 'mesa')
-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
-  LIBS="-lboost_system" ./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/exiv2/PKGBUILD b/staging/exiv2/PKGBUILD
deleted file mode 100644
index 499ace7a9..000000000
--- a/staging/exiv2/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-#$Id: PKGBUILD 164301 2012-07-30 00:12:14Z eric $
-# Maintainer: tobias <tobias@arhlinux.org>
-
-pkgname=exiv2
-pkgver=0.23
-pkgrel=1
-pkgdesc="Exif and Iptc metadata manipulation library and tools"
-arch=('i686' 'x86_64')
-url="http://exiv2.org"
-license=('GPL')
-depends=('gcc-libs' 'zlib' 'expat')
-options=('!libtool')
-source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5f342bf642477526f41add11d6ee7787cdcd639f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/ffmpeg/PKGBUILD b/staging/ffmpeg/PKGBUILD
deleted file mode 100644
index 1021dc3ab..000000000
--- a/staging/ffmpeg/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 161328 2012-06-09 17:10:50Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg
-pkgver=0.11.1
-pkgrel=1
-epoch=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('ff8cb914f657e164dd60ea1008b555a8')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-libv4l2 \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --disable-static
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/ffmpegthumbnailer/PKGBUILD b/staging/ffmpegthumbnailer/PKGBUILD
deleted file mode 100644
index f9afaf39a..000000000
--- a/staging/ffmpegthumbnailer/PKGBUILD
+++ /dev/null
@@ -1,39 +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=5
-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' 'ffmpegapi_fix_r241.patch')
-options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
-          '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Don't use deprecated (removed?) ffmpeg api
-  patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
-
-  ./configure --prefix=/usr --enable-gio
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # FS#24105: Generate thumbnails in nautilus
-  # FS#26540: Rename to .thumbnailer for nautilus
-  install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
-    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
-}
diff --git a/staging/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/staging/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
deleted file mode 100644
index 37e65b059..000000000
--- a/staging/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libffmpegthumbnailer/moviedecoder.cpp.old	2012-05-20 11:57:04.503450287 +0200
-+++ libffmpegthumbnailer/moviedecoder.cpp	2012-05-20 11:57:14.633450566 +0200
-@@ -58,19 +58,26 @@
- void MovieDecoder::initialize(const string& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     string inputFile = filename == "-" ? "pipe:" : filename;
-     m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
--
-+    
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0)
-+#else
-+	if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
-+#endif
-     {
- 		destroy();
-         throw logic_error(string("Could not open input file: ") + filename);
-     }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if (av_find_stream_info(m_pFormatContext) < 0)
-+#else
-+	if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
-+#endif
-     {
- 		destroy();
-         throw logic_error(string("Could not find stream information"));
-@@ -90,8 +97,12 @@
- 
-     if ((!m_FormatContextWasGiven) && m_pFormatContext)
-     {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         av_close_input_file(m_pFormatContext);
-         m_pFormatContext = NULL;
-+#else
-+        avformat_close_input(&m_pFormatContext);
-+#endif
-     }
- 
-     if (m_pPacket)
-@@ -159,7 +170,11 @@
- 
-     m_pVideoCodecContext->workaround_bugs = 1;
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
-+#else
-+	if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
-+#endif
-     {
-         throw logic_error("Could not open video codec");
-     }
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/fyre/PKGBUILD b/staging/fyre/PKGBUILD
deleted file mode 100644
index db81bc725..000000000
--- a/staging/fyre/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169349 2012-10-20 00:55:07Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=fyre
-pkgver=1.0.1
-pkgrel=6
-pkgdesc="Rendering of the Peter de Jong map"
-arch=('i686' 'x86_64')
-url="http://fyre.navi.cx/"
-license=('GPL')
-depends=('openexr' 'libglade' 'gnet' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
-install=fyre.install
-source=(http://releases.navi.cx/fyre/fyre-${pkgver}.tar.bz2)
-sha1sums=('41c0ec45eff16cc1bba081c5c855a3980e404835')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make update_xdgmime=/bin/false update_fdodesktop=/bin/false gtk_update_icon_cache=/bin/false \
-    prefix="${pkgdir}/usr" install
-}
diff --git a/staging/fyre/fyre.install b/staging/fyre/fyre.install
deleted file mode 100644
index 388efbb11..000000000
--- a/staging/fyre/fyre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD
deleted file mode 100644
index d047ccc8c..000000000
--- a/staging/gcc/PKGBUILD
+++ /dev/null
@@ -1,270 +0,0 @@
-# $Id: PKGBUILD 165125 2012-08-11 08:33:21Z 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.7.1
-pkgrel=6
-_snapshot=4.7-20120721
-_libstdcppmanver=20120725		# 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++-api.${_libstdcppmanver}.man.tar.bz2
-	gcc_pure64.patch
-	gcc-4.7.1-libada-pic.patch
-	gcc-4.7.1-libgo-write.patch)
-md5sums=('a1a53fda426bc6809cede8e85bbaf2a3'
-         '79c4381f983b71868c02da3379e1e8a2'
-         'ced48436c1b3c981d721a829f1094de1'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c')
-
-
-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 -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
-
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-  
-  # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.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 \
-      --disable-ppl-version-check --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu \
-      --disable-multilib --disable-libssp \
-      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
-      --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.16')
-  install=gcc-libs.install
-
-  cd gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src libitm; 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 -C $CHOST/libitm 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 -r ${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
-  
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
-  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
-
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  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}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
-  rm -r $pkgdir/usr/lib/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.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 expect this symlinks
-  ln -s gcc ${pkgdir}/usr/bin/cc
-
-  # 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}/libstdc++-api.${_libstdcppmanver}.man/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
-
-  ln -s gfortran ${pkgdir}/usr/bin/f95
-
-  # 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
-
-  ln -s gcc ${pkgdir}/usr/bin/gnatgcc
-  
-  # 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/staging/gcc/gcc-4.7.0-cloog-0.17.patch b/staging/gcc/gcc-4.7.0-cloog-0.17.patch
deleted file mode 100644
index c7146fa04..000000000
--- a/staging/gcc/gcc-4.7.0-cloog-0.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
diff --git a/staging/gcc/gcc-4.7.1-libada-pic.patch b/staging/gcc/gcc-4.7.1-libada-pic.patch
deleted file mode 100644
index 591da1e4a..000000000
--- a/staging/gcc/gcc-4.7.1-libada-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- 	-fexceptions -DIN_RTS @have_getipinfo@
- 
- host_subdir = @host_subdir@
diff --git a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch
deleted file mode 100644
index 427efe8a6..000000000
--- a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
--  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
--  rusage=`echo $rusage | sed -e 's/^ *//'`
-   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
-   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+  rusage=`echo $rusage | sed -e 's/^ *//'`
-   nrusage=
-   while test -n "$rusage"; do
-     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/staging/gcc/gcc-4.7.1-libgo-write.patch b/staging/gcc/gcc-4.7.1-libgo-write.patch
deleted file mode 100644
index a7be83fda..000000000
--- a/staging/gcc/gcc-4.7.1-libgo-write.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
---- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
-+++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
-@@ -17,7 +17,8 @@
- 	G* g = runtime_g();
- 
- 	if(g == nil || g->writebuf == nil) {
--		runtime_write(2, v, n);
-+		ssize_t bytesWritten = runtime_write(2, v, n);
-+		(void)bytesWritten;
- 		return;
- 	}
- 	
diff --git a/staging/gcc/gcc-ada.install b/staging/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/staging/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/staging/gcc/gcc-fortran.install b/staging/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/staging/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/staging/gcc/gcc-go.install b/staging/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/staging/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/staging/gcc/gcc-libs.install b/staging/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/staging/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/staging/gcc/gcc.install b/staging/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/staging/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/staging/gcc/gcc_pure64.patch b/staging/gcc/gcc_pure64.patch
deleted file mode 100644
index a9b09bbcf..000000000
--- a/staging/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
---- gcc-orig/gcc/config/i386/linux64.h	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/linux64.h	2011-07-24 19:48:05.000000000 +1000
-@@ -28,6 +28,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
--#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"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
---- gcc-orig/gcc/config/i386/t-linux64	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/t-linux64	2011-07-24 19:49:41.000000000 +1000
-@@ -34,8 +34,8 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
- 
- LIBGCC = stmp-multilib
diff --git a/staging/geeqie/PKGBUILD b/staging/geeqie/PKGBUILD
deleted file mode 100644
index 53fdb8a31..000000000
--- a/staging/geeqie/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 164303 2012-07-30 00:23:10Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=geeqie
-pkgver=1.0
-pkgrel=7
-pkgdesc="A lightweight image browser and viewer (fork of GQview)"
-arch=('i686' 'x86_64')
-url="http://geeqie.sourceforge.net/"
-license=('GPL3')
-depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
-makedepends=('intltool' 'doxygen' 'gnome-doc-utils')
-optdepends=('librsvg: SVG rendering')
-replaces=('gqview-devel')
-install=geeqie.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('8494a557d67d20e6ad720645ec789dd2b33a3266')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/geeqie/geeqie.install b/staging/geeqie/geeqie.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/staging/geeqie/geeqie.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/gegl/PKGBUILD b/staging/gegl/PKGBUILD
deleted file mode 100644
index e6b74a230..000000000
--- a/staging/gegl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169363 2012-10-20 05:42:33Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=gegl
-pkgver=0.2.0
-pkgrel=5
-pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
-url="http://www.gegl.org/"
-license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
-makedepends=('intltool' '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 gegl-0.2.0-ffmpeg-0.11.diff)
-sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
-          'c10fd988c634fcf0948cc91a51d6528f6f1704ba')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
-  ./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/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff
deleted file mode 100644
index a33ec6f7f..000000000
--- a/staging/gegl/gegl-0.2.0-ffmpeg-0.11.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
---- gegl-0.2.0/operations/external/ff-load.c	2012-04-01 13:17:57.000000000 +0200
-+++ gegl-0.2.0-1/operations/external/ff-load.c	2012-07-11 12:42:05.174756560 +0200
-@@ -271,7 +271,7 @@
-       gint err;
- 
-       ff_cleanup (o);
--      err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+err = avformat_open_input (&p->ic, o->path, NULL, NULL);
-       if (err < 0)
-         {
-           print_error (o->path, err);
diff --git a/staging/ghc/PKGBUILD b/staging/ghc/PKGBUILD
deleted file mode 100644
index b2d0b96e9..000000000
--- a/staging/ghc/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 166459 2012-09-08 06:24:57Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Special note for devs looking to upgrade this package:
-#   ghc places a unique hash for each library when it is built.
-#   Libraries depend on versions specified by those hashes.
-#   This implies that all libraries need to be rebuilt when ghc is rebuilt.
-
-pkgname=ghc
-pkgver=7.6.1
-pkgrel=1
-pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/ghc/'
-license=('custom')
-# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496
-depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi')
-makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
-checkdepends=('python2')
-install='ghc.install'
-# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-#options=('!makeflags')
-# missing rtl?
-provides=('haskell-array=0.4.0.1'
-          'haskell-base=4.6.0.0'
-          'haskell-binary=0.5.1.1'
-          'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.10.0.0'
-          'haskell-containers=0.5.0.0'
-          'haskell-deepseq=1.3.0.1'
-          'haskell-directory=1.2.0.0'
-          'haskell-filepath=1.3.0.1'
-          'haskell-ghc-prim=0.3.0.0'
-          'haskell-haskell2010=1.1.1.0'
-          'haskell-haskell98=2.0.0.2'
-          'haskell-hoopl=3.9.0.0'
-          'haskell-hpc=0.6.0.0'
-          'haskell-integer-gmp=0.5.0.0'
-          'haskell-old-locale=1.0.0.5'
-          'haskell-old-time=1.1.0.1'
-          'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.2'
-          'haskell-template-haskell=2.8.0.0'
-          'haskell-time=1.4.0.1'
-          'haskell-unix=2.6.0.0'
-          'haskell-cabal=1.16.0')
-replaces=('haskell-array<0.4.0.1'
-          'haskell-base<4.6.0.0'
-          'haskell-binary<0.5.1.1'
-          'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.10.0.0'
-          'haskell-containers<0.5.0.0'
-          'haskell-deepseq<1.3.0.1'
-          'haskell-directory<1.2.0.0'
-          'haskell-filepath<1.3.0.1'
-          'haskell-ghc-prim<0.3.0.0'
-          'haskell-haskell2010<1.1.1.0'
-          'haskell-haskell98<2.0.0.2'
-          'haskell-hoopl<3.9.0.0'
-          'haskell-hpc<0.6.0.0'
-          'haskell-integer-gmp<0.5.0.0'
-          'haskell-old-locale<1.0.0.5'
-          'haskell-old-time<1.1.0.1'
-          'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.2'
-          'haskell-template-haskell<2.8.0.0'
-          'haskell-time<1.4.0.1'
-          'haskell-unix<2.6.0.0'
-          'haskell-cabal<1.16.0')
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
-        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('e9d892d2970550ec5e70130b3621f6b6'
-         '0d93c458e3b445a7e524ef6ae459ce11'
-         'c367ef26300648ee9b8aca3dee5c9669')
-
-build() {
-  cd ghc-${pkgver}
-
-  cp ${srcdir}/build.mk mk/build.mk
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-check() {
-  # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-  unset MAKEFLAGS
-
-  cd ghc-${pkgver}
-
-  # python2 rename
-  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
-  sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
-
-  # upstream known failures on both i686 and x86_64:
-  #    ghci.debugger/scripts     break011 [bad stderr] (ghci)
-  #    perf/compiler             parsing001 [stat not good enough] (normal)
-  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
-  # upstream known failures on i686 only:
-  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
-  make test
-
-  # enabling threads to speed up
-  # causes more failures than make test, need to investigate
-  # upstream known failures on both i686 and x86_64:
-  #    perf/compiler             parsing001 [stat not good enough] (normal)
-  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
-  # upstream known failures on i686 only:
-  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
-  #make THREADS=9 test
-
-  # will most likely cause lots of failures
-  # enable this when upstream has 0 test failures from a simple 'make test'
-  # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757
-  #make fulltest
-}
-
-package() {
-  cd ghc-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/licenses/ghc
-  install -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/ghc
-}
diff --git a/staging/ghc/build.mk b/staging/ghc/build.mk
deleted file mode 100644
index bb57594bf..000000000
--- a/staging/ghc/build.mk
+++ /dev/null
@@ -1,200 +0,0 @@
-# -----------------------------------------------------------------------------
-# A Sample build.mk
-#
-# Uncomment one of the following BuildFlavour settings to get the desired
-# overall build type, and then tweak the options in the relevant section
-# below.
-
-# Uncomment one of these to select a build profile below:
-
-# Full build with max optimisation and everything enabled (very slow build)
-BuildFlavour = perf
-
-# As above but build GHC using the LLVM backend
-#BuildFlavour = perf-llvm
-
-# Fast build with optimised libraries, no profiling (RECOMMENDED):
-#BuildFlavour = quick
-
-# Even faster build.  NOT RECOMMENDED: the libraries will be
-# completely unoptimised, so any code built with this compiler
-# (including stage2) will run very slowly:
-#BuildFlavour = quickest
-
-# Profile the stage2 compiler:
-#BuildFlavour = prof
-
-# A development build, working on the stage 1 compiler:
-#BuildFlavour = devel1
-
-# A development build, working on the stage 2 compiler:
-#BuildFlavour = devel2
-
-# An unregisterised, optimised build of ghc, for porting:
-#BuildFlavour = unreg
-
-GhcLibWays = v
-
-# -------- 1. A Performance/Distribution build--------------------------------
-
-ifeq "$(BuildFlavour)" "perf"
-
-# perf matches the default settings, repeated here for comparison:
-
-SRC_HC_OPTS     = -O -H64m
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O2 -fasm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# ---------------- Perf build using LLVM -------------------------------------
-
-ifeq "$(BuildFlavour)" "perf-llvm"
-
-SRC_HC_OPTS     = -O -H64m -fllvm
-GhcStage1HcOpts = -O -fllvm
-GhcStage2HcOpts = -O2 -fllvm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# -------- A Fast build ------------------------------------------------------
-
-ifeq "$(BuildFlavour)" "quickest"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O0 -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- A Fast build with optimised libs ----------------------------------
-
-ifeq "$(BuildFlavour)" "quick"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- Profile the stage2 compiler ---------------------------------------
-
-ifeq "$(BuildFlavour)" "prof"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O -fasm
-GhcLibHcOpts       = -O -fasm
-
-GhcLibWays         += p
-GhcProfiled        = YES
-
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-
-# -------- A Development build (stage 1) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel1"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts    = -Rghc-timing -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = YES
-
-endif
-
-# -------- A Development build (stage 2) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel2"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O -fasm
-GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = YES
-
-# After stage 1 and the libraries have been built, you can uncomment this line:
-
-# stage=2
-
-# Then stage 1 will not be touched by the build system, until
-# you comment the line again.  This is a useful trick for when you're
-# working on stage 2 and want to freeze stage 1 and the libraries for
-# a while.
-
-endif
-
-# -------- A Unregisterised build) -------------------------------------------
-
-ifeq "$(BuildFlavour)" "unreg"
-
-# Note that the LLVM backend works in unregisterised mode as well as
-# registerised mode. This often makes it a good choice for porting
-# GHC.
-
-GhcUnregisterised    = YES
-GhcWithNativeCodeGen = NO
-
-SRC_HC_OPTS          = -O -H64m # -fllvm
-GhcStage1HcOpts      = -O
-GhcStage2HcOpts      = -O2
-GhcHcOpts            = -Rghc-timing
-GhcLibHcOpts         = -O2
-SplitObjs            = NO
-HADDOCK_DOCS         = NO
-BUILD_DOCBOOK_HTML   = NO
-BUILD_DOCBOOK_PS     = NO
-BUILD_DOCBOOK_PDF    = NO
-
-endif
-
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
-
-# NoFib settings
-NoFibWays =
-STRIP_CMD = :
-
diff --git a/staging/ghc/ghc.install b/staging/ghc/ghc.install
deleted file mode 100644
index c0200e4a6..000000000
--- a/staging/ghc/ghc.install
+++ /dev/null
@@ -1,10 +0,0 @@
-pre_upgrade() {
-  echo '==> Unregistering cabalized packages...'
-  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
-  echo '==> Done.'
-}
-
-post_upgrade() {
-  echo '==> All cabalized packages need to be reinstalled now.'
-  echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
-}
diff --git a/staging/ghc/print-provides-replaces.sh b/staging/ghc/print-provides-replaces.sh
deleted file mode 100755
index 33d1da051..000000000
--- a/staging/ghc/print-provides-replaces.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. PKGBUILD
-
-if [[ ! -d src/ghc-${pkgver}/libraries ]]; then
-  echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/"
-  exit 1
-fi
-
-declare -A exclude
-# no Win32 cause we're not building on windows
-exclude['Win32']=1
-# no integer-simple because we use integer-gmp
-exclude['integer-simple']=1
-# extract excluded libraries from ghc.mk
-for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
-  exclude[${exclude_pkg}]=1
-done
-
-cd src/ghc-${pkgver}/libraries
-
-# $1 is the name of the variable
-# $2 is the string for the test, either '=' or '<'
-print_var() {
-  printf "$1=("
-  for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
-    [[ ${exclude[${pkg}]} ]] && continue
-    version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
-    printf "'haskell-$pkg$2$version'\n          "
-  done
-  # also add cabal
-  version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
-  printf "'haskell-cabal$2$version'\n          "
-  echo -e '\b)'
-}
-
-print_var 'provides' '='
-print_var 'replaces' '<'
diff --git a/staging/ghc/silence-gen_contents_index.diff b/staging/ghc/silence-gen_contents_index.diff
deleted file mode 100644
index 6d835f8fb..000000000
--- a/staging/ghc/silence-gen_contents_index.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ghc-7.4.2/libraries/gen_contents_index.original	2012-06-10 22:23:28.810059378 +0000
-+++ ghc-7.4.2/libraries/gen_contents_index	2012-06-10 22:24:00.289814576 +0000
-@@ -47,7 +47,6 @@
- esac
- 
- # Now create the combined contents and index pages
--echo $HADDOCK_ARGS
- $HADDOCK --gen-index --gen-contents -o . \
-          -t "Haskell Hierarchical Libraries" \
-          -p "prologue.txt" \
diff --git a/staging/gimp-ufraw/PKGBUILD b/staging/gimp-ufraw/PKGBUILD
deleted file mode 100644
index 037d2b52c..000000000
--- a/staging/gimp-ufraw/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 164305 2012-07-30 00:32:08Z eric $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=gimp-ufraw
-pkgver=0.18
-pkgrel=5
-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/glew/PKGBUILD b/staging/glew/PKGBUILD
deleted file mode 100644
index 4cc448ce2..000000000
--- a/staging/glew/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169341 2012-10-19 22:31:09Z eric $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: SleepyDog
-
-pkgname=glew
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="The OpenGL Extension Wrangler Library"
-arch=('i686' 'x86_64')
-url="http://glew.sourceforge.net"
-license=('BSD' 'MIT' 'GPL')
-depends=('libxmu' 'libxi' 'glu')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|lib64|lib|' config/Makefile.linux
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GLEW_DEST="${pkgdir}/usr" install.all
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a
-  chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver}
-}
diff --git a/staging/glibc/PKGBUILD b/staging/glibc/PKGBUILD
deleted file mode 100644
index 4331b76b5..000000000
--- a/staging/glibc/PKGBUILD
+++ /dev/null
@@ -1,159 +0,0 @@
-# $Id: PKGBUILD 165122 2012-08-11 08:27:45Z 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.16.0
-pkgrel=3
-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.5' 'tzdata')
-makedepends=('gcc>=4.7')
-backup=(etc/gai.conf
-        etc/locale.gen
-        etc/nscd.conf)
-options=('!strip')
-install=glibc.install
-source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-        glibc-2.15-fix-res_query-assert.patch
-        glibc-2.15-revert-c5a0802a.patch
-        glibc-2.16-rpcgen-cpp-path.patch
-        nscd.rcd
-        nscd.service
-        nscd.tmpfiles
-        locale.gen.txt
-        locale-gen)
-md5sums=('80b181b02ab249524ec92822c0174cf7'
-         '2a1221a15575820751c325ef4d2fbb90'
-         '31f415b41197d85d3bbee3d1eecd06a3'
-         '0a0383d50d63f1c02919fe9943b82014'
-         'ea6a43915474e8276e9361eed6a01280'
-         '589d79041aa767a5179eaa4e2737dd3f'
-         'ad8a9af15ab7eeaa23dc7ee85024af9f'
-         'bccbe5619e75cf1d97312ec3681c605c'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # fix res_query assertion
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
-
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=552960
-  patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
-  # prevent need for /lib/cpp symlink
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
-  patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  if [[ ${CARCH} = "i686" ]]; then
-    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-    # TODO: make separate glibc-xen package for i686
-    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}/${pkgname}-${pkgver}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
-      --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization \
-      --enable-multi-arch
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "/build-programs=/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
-  make -k check
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-
-  ln -s usr/lib ${pkgdir}/lib
-
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
-
-  make install_root=${pkgdir} install
-
-  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
-
-  install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
-
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
-  install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd
-  install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
-
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
-
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
-
-  # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
-    ${srcdir}/glibc-2.16.0/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
-
-  if [[ ${CARCH} = "x86_64" ]]; then
-    # fix paths and compliance with binary blobs...
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-    ln -s usr/lib ${pkgdir}/lib64
-  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 usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
-                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib/{pt_chown,{audit,gconv}/*.so}
-}
diff --git a/staging/glibc/glibc-2.14-libdl-crash.patch b/staging/glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/staging/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/staging/glibc/glibc-2.14-reexport-rpc-interface.patch b/staging/glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/staging/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/staging/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/staging/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/staging/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/staging/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch b/staging/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
deleted file mode 100644
index 6f0a0398f..000000000
--- a/staging/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 947c651..abccd4a 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
- 		 * copy without '.' if present.
- 		 */
- 		n = strlen(name);
--		if (n >= MAXDNAME) {
-+
-+		/* Decrement N prior to checking it against MAXDNAME
-+		   so that we detect a wrap to SIZE_MAX and return
-+		   a reasonable error.  */
-+		n--;
-+		if (n >= MAXDNAME - 1) {
- 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
- 			return (-1);
- 		}
--		n--;
--		if (n >= 0 && name[n] == '.') {
-+		if (name[n] == '.') {
- 			strncpy(nbuf, name, n);
- 			nbuf[n] = '\0';
- 		} else
diff --git a/staging/glibc/glibc-2.15-arena.patch b/staging/glibc/glibc-2.15-arena.patch
deleted file mode 100644
index 46f52e98d..000000000
--- a/staging/glibc/glibc-2.15-arena.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/malloc/arena.c b/malloc/arena.c
-index d3cf4b9..b1c9469 100644
---- a/malloc/arena.c
-+++ b/malloc/arena.c
-@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
- 	{
- 	  if (mp_.arena_max != 0)
- 	    narenas_limit = mp_.arena_max;
--	  else
-+	  else if (narenas > mp_.arena_test)
- 	    {
- 	      int n  = __get_nprocs ();
- 
-@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
- 	}
-     repeat:;
-       size_t n = narenas;
--      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
-+      /* NB: the following depends on the fact that (size_t)0 - 1 is a
-+	 very large number and that the underflow is OK.  If arena_max
-+	 is set the value of arena_test is irrelevant.  If arena_test
-+	 is set but narenas is not yet larger or equal to arena_test
-+	 narenas_limit is 0.  There is no possibility for narenas to
-+	 be too big for the test to always fail since there is not
-+	 enough address space to create that many arenas.  */
-+      if (__builtin_expect (n <= narenas_limit - 1, 0))
- 	{
- 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
- 	    goto repeat;
diff --git a/staging/glibc/glibc-2.15-avx.patch b/staging/glibc/glibc-2.15-avx.patch
deleted file mode 100644
index 5439da8d0..000000000
--- a/staging/glibc/glibc-2.15-avx.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-index 6867c6e..3a615fc 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-@@ -14,7 +14,7 @@ extern double __ieee754_atan2_fma4 (double, double);
- 
- libm_ifunc (__ieee754_atan2,
- 	    HAS_FMA4 ? __ieee754_atan2_fma4
--	    : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
- strong_alias (__ieee754_atan2, __atan2_finite)
- 
- # define __ieee754_atan2 __ieee754_atan2_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-index 3c65028..7b2320a 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_exp.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-@@ -14,7 +14,7 @@ extern double __ieee754_exp_fma4 (double);
- 
- libm_ifunc (__ieee754_exp,
- 	    HAS_FMA4 ? __ieee754_exp_fma4
--	    : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2));
- strong_alias (__ieee754_exp, __exp_finite)
- 
- # define __ieee754_exp __ieee754_exp_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c
-index 3b468d0..ab277d6 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_log.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_log.c
-@@ -14,7 +14,7 @@ extern double __ieee754_log_fma4 (double);
- 
- libm_ifunc (__ieee754_log,
- 	    HAS_FMA4 ? __ieee754_log_fma4
--	    : (HAS_AVX ? __ieee754_log_avx
-+	    : (HAS_YMM_USABLE ? __ieee754_log_avx
- 	       : __ieee754_log_sse2));
- strong_alias (__ieee754_log, __log_finite)
- 
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-index 3160201..78c7e09 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_atan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-@@ -12,7 +12,8 @@ extern double __atan_fma4 (double);
- #  define __atan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (atan, HAS_FMA4 ? __atan_fma4 : HAS_AVX ? __atan_avx : __atan_sse2);
-+libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 :
-+		   HAS_YMM_USABLE ? __atan_avx : __atan_sse2));
- 
- # define atan __atan_sse2
- #endif
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-index 1ba9dbc..417acd0 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-@@ -17,10 +17,12 @@ extern double __sin_fma4 (double);
- #  define __sin_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
-+libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 :
-+		    HAS_YMM_USABLE ? __cos_avx : __cos_sse2));
- weak_alias (__cos, cos)
- 
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
-+libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 :
-+		    HAS_YMM_USABLE ? __sin_avx : __sin_sse2));
- weak_alias (__sin, sin)
- 
- # define __cos __cos_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-index 8f6601e..3047155 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-@@ -12,7 +12,8 @@ extern double __tan_fma4 (double);
- #  define __tan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
-+libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 :
-+		  HAS_YMM_USABLE ? __tan_avx : __tan_sse2));
- 
- # define tan __tan_sse2
- #endif
-diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
-index 65b0ee9..76d146c 100644
---- a/sysdeps/x86_64/multiarch/init-arch.c
-+++ b/sysdeps/x86_64/multiarch/init-arch.c
-@@ -1,6 +1,6 @@
- /* Initialize CPU feature data.
-    This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    Contributed by Ulrich Drepper <drepper@redhat.com>.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -144,6 +144,18 @@ __init_cpu_features (void)
-   else
-     kind = arch_kind_other;
- 
-+  if (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_AVX)
-+    {
-+      /* Reset the AVX bit in case OSXSAVE is disabled.  */
-+      if ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_OSXSAVE) != 0
-+	  && ({ unsigned int xcrlow;
-+		unsigned int xcrhigh;
-+		asm ("xgetbv"
-+		     : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
-+		(xcrlow & 6) == 6; }))
-+	__cpu_features.feature[index_YMM_Usable] |= bit_YMM_Usable;
-+    }
-+
-   __cpu_features.family = family;
-   __cpu_features.model = model;
-   atomic_write_barrier ();
-diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
-index 2a1df39..2dc75ab 100644
---- a/sysdeps/x86_64/multiarch/init-arch.h
-+++ b/sysdeps/x86_64/multiarch/init-arch.h
-@@ -1,5 +1,5 @@
- /* This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-@@ -22,11 +22,13 @@
- #define bit_Prefer_SSE_for_memop	(1 << 3)
- #define bit_Fast_Unaligned_Load		(1 << 4)
- #define bit_Prefer_PMINUB_for_stringop	(1 << 5)
-+#define bit_YMM_Usable			(1 << 6)
- 
- #define bit_SSE2	(1 << 26)
- #define bit_SSSE3	(1 << 9)
- #define bit_SSE4_1	(1 << 19)
- #define bit_SSE4_2	(1 << 20)
-+#define bit_OSXSAVE	(1 << 27)
- #define bit_AVX		(1 << 28)
- #define bit_POPCOUNT	(1 << 23)
- #define bit_FMA		(1 << 12)
-@@ -48,6 +50,7 @@
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
-+# define index_YMM_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- 
- #else	/* __ASSEMBLER__ */
- 
-@@ -92,7 +95,7 @@ extern struct cpu_features
- 
- 
- extern void __init_cpu_features (void) attribute_hidden;
--#define INIT_ARCH()\
-+# define INIT_ARCH() \
-   do							\
-     if (__cpu_features.kind == arch_kind_unknown)	\
-       __init_cpu_features ();				\
-@@ -125,23 +128,21 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define index_Slow_BSF			FEATURE_INDEX_1
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1
-+# define index_YMM_Usable		FEATURE_INDEX_1
- 
--#define HAS_ARCH_FEATURE(idx, bit) \
--  ((__get_cpu_features ()->feature[idx] & (bit)) != 0)
-+# define HAS_ARCH_FEATURE(name) \
-+  ((__get_cpu_features ()->feature[index_##name] & (bit_##name)) != 0)
- 
--#define HAS_FAST_REP_STRING \
--  HAS_ARCH_FEATURE (index_Fast_Rep_String, bit_Fast_Rep_String)
-+# define HAS_FAST_REP_STRING	HAS_ARCH_FEATURE (Fast_Rep_String)
- 
--#define HAS_FAST_COPY_BACKWARD \
--  HAS_ARCH_FEATURE (index_Fast_Copy_Backward, bit_Fast_Copy_Backward)
-+# define HAS_FAST_COPY_BACKWARD	HAS_ARCH_FEATURE (Fast_Copy_Backward)
- 
--#define HAS_SLOW_BSF \
--  HAS_ARCH_FEATURE (index_Slow_BSF, bit_Slow_BSF)
-+# define HAS_SLOW_BSF		HAS_ARCH_FEATURE (Slow_BSF)
- 
--#define HAS_PREFER_SSE_FOR_MEMOP \
--  HAS_ARCH_FEATURE (index_Prefer_SSE_for_memop, bit_Prefer_SSE_for_memop)
-+# define HAS_PREFER_SSE_FOR_MEMOP HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
- 
--#define HAS_FAST_UNALIGNED_LOAD \
--  HAS_ARCH_FEATURE (index_Fast_Unaligned_Load, bit_Fast_Unaligned_Load)
-+# define HAS_FAST_UNALIGNED_LOAD HAS_ARCH_FEATURE (Fast_Unaligned_Load)
-+
-+# define HAS_YMM_USABLE		HAS_ARCH_FEATURE (YMM_Usable)
- 
- #endif	/* __ASSEMBLER__ */
--- 
-1.7.9
-
diff --git a/staging/glibc/glibc-2.15-confstr-local-buffer-extent.patch b/staging/glibc/glibc-2.15-confstr-local-buffer-extent.patch
deleted file mode 100644
index 483b28532..000000000
--- a/staging/glibc/glibc-2.15-confstr-local-buffer-extent.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff --git a/posix/confstr.c b/posix/confstr.c
-index 3c9566d..cad6561 100644
---- a/posix/confstr.c
-+++ b/posix/confstr.c
-@@ -35,6 +34,10 @@ confstr (name, buf, len)
-   const char *string = "";
-   size_t string_len = 1;
- 
-+  /* Note that this buffer must be large enough for the longest strings
-+     used below.  */
-+  char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
-+
-   switch (name)
-     {
-     case _CS_PATH:
-@@ -53,59 +56,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V7_ILP32_OFF32
--	if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
--		    sizeof "POSIX_V7_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
-+		  sizeof "POSIX_V7_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_ILP32_OFFBIG
--	if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
--		    sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
-+		  sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LP64_OFF64
--	if (__sysconf (_SC_V7_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V7_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
--		    sizeof "POSIX_V7_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
-+		  sizeof "POSIX_V7_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LPBIG_OFFBIG
--	if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
--		    sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V6_WIDTH_RESTRICTED_ENVS:
-@@ -116,59 +115,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V6_ILP32_OFF32
--	if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
--		    sizeof "POSIX_V6_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
-+		  sizeof "POSIX_V6_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_ILP32_OFFBIG
--	if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
--		    sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
-+		  sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LP64_OFF64
--	if (__sysconf (_SC_V6_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V6_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
--		    sizeof "POSIX_V6_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
-+		  sizeof "POSIX_V6_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LPBIG_OFFBIG
--	if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
--		    sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V5_WIDTH_RESTRICTED_ENVS:
-@@ -179,59 +174,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _XBS5_ILP32_OFF32
--	if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
--		    sizeof "XBS5_ILP32_OFF32" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
-+		  sizeof "XBS5_ILP32_OFF32" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _XBS5_ILP32_OFFBIG
--	if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
--		    sizeof "XBS5_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
-+		  sizeof "XBS5_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _XBS5_LP64_OFF64
--	if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
- #endif
- #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
--		    sizeof "XBS5_LP64_OFF64" - 1);
--	    string_len += sizeof "XBS5_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
-+		  sizeof "XBS5_LP64_OFF64" - 1);
-+	  string_len += sizeof "XBS5_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _XBS5_LPBIG_OFFBIG
--	if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
--		    sizeof "XBS5_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
-+		  sizeof "XBS5_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_XBS5_ILP32_OFF32_CFLAGS:
diff --git a/staging/glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/staging/glibc/glibc-2.15-do-not-install-timezone-files-2.patch
deleted file mode 100644
index d28237f85..000000000
--- a/staging/glibc/glibc-2.15-do-not-install-timezone-files-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index 00bfba6..9e55a6a 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -45,7 +45,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- CPPFLAGS-zic = -DNOT_IN_libc
- 
- ifeq ($(have-ksh),yes)
--install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
- generated += tzselect
- endif
-@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- 	    -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
- 	chmod 555 $@.new
- 	mv -f $@.new $@
--
--$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \
--    $(inst_zonedir)/%: % $(+force)
--	$(do-install)
diff --git a/staging/glibc/glibc-2.15-do-not-install-timezone-files.patch b/staging/glibc/glibc-2.15-do-not-install-timezone-files.patch
deleted file mode 100644
index e4f29bc1a..000000000
--- a/staging/glibc/glibc-2.15-do-not-install-timezone-files.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index e8fb716..d5ea538 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -1,4 +1,4 @@
--# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2000,2002,2005,2007,2012 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
-@@ -49,33 +49,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- 
- CPPFLAGS-zic = -DNOT_IN_libc
- 
--# z.* use this variable.
--define nl
--
--
--endef
--ifndef avoid-generated
--ifndef inhibit_timezone_rules
---include $(addprefix $(objpfx)z.,$(tzfiles))
--endif
--endif
--
--# Make these absolute file names.
--installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \
--					$(addprefix $(inst_zonedir)/, \
--						    $(localtime-file)))
--installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \
--					 $(addprefix $(inst_zonedir)/, \
--						     $(posixrules-file)))
--
--ifeq ($(cross-compiling),no)
--# Don't try to install the zoneinfo files since we can't run zic.
--install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
--					      $(zonenames:%=posix/%) \
--					      $(zonenames:%=right/%)) \
--		 $(installed-localtime-file) $(installed-posixrules-file)
--endif
--
- ifeq ($(have-ksh),yes)
- install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
-@@ -85,79 +58,6 @@ endif
- include ../Rules
- 
- 
--$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
--# Kludge alert: we use an implicit rule (in what we are generating here)
--# because that is the only way to tell Make that the one command builds all
--# the files.
--# The extra kludge for the $(tzlinks) files is necessary since running zic
--# this file requires all other files to exist.  Blech!
--	$(make-target-directory)
--	(echo 'define $*-zones'						    ;\
--	 $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\
--	 echo 'endef'							    ;\
--	 echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))'		    ;\
--	 echo 'ifdef $*-zones'						    ;\
--	 if test x$(findstring $*, $(tzlinks)) != x; then		     \
--	   echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \'	    ;\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\
--	 fi								    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic leapseconds yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic /dev/null yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic $$(leapseconds) yearistype'		    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo 'endif'							    ;\
--	 echo 'zonenames := $$(zonenames) $$($*-zones)'			    ;\
--	) > $@.new
--	mv $@.new $@
--
--.PHONY: echo-zonenames
--echo-zonenames:
--	@echo 'Known zones: $(zonenames)'
--
--
--# We have to use `-d $(inst_zonedir)' to explictly tell zic where to
--# place the output files although $(zonedir) is compiled in.  But the
--# user might have set $(install_root) on the command line of `make install'.
--zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
--tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
--	    -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
--
--# The source files specify the zone names relative to the -d directory,
--# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix
--# and the like.  This magic extracts /posix or /right if it's the first
--# component after $(inst_zonedir) in the target name $@.
--target-zone-flavor = $(filter /posix /right, \
--			      /$(firstword $(subst /, , \
--					  $(patsubst $(inst_zonedir)/%,%,$@))))
--
--ifdef localtime
--$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \
--			     $(+force)
--	$(make-target-directory)
--	if test -r $@; then \
--	  echo Site timezone NOT reset to Factory.; \
--	else \
--	  rm -f $@T; \
--	  $(SHELL) $(..)scripts/rellns-sh $< $@T; \
--	  mv -f $@T $@; \
--	fi
--endif
--ifdef posixrules
--$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \
--			      $(+force)
--	$(zic-cmd) -p $(posixrules)
--endif
--
--
- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
- 
- tz-cflags = -DTZDIR='"$(zonedir)"' \
diff --git a/staging/glibc/glibc-2.15-feraiseexcept-plt.patch b/staging/glibc/glibc-2.15-feraiseexcept-plt.patch
deleted file mode 100644
index c41acc169..000000000
--- a/staging/glibc/glibc-2.15-feraiseexcept-plt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
-index 70f9ee2..6e2ce35 100644
---- a/sysdeps/i386/fpu/feupdateenv.c
-+++ b/sysdeps/i386/fpu/feupdateenv.c
-@@ -1,5 +1,5 @@
- /* Install given floating-point environment and raise exceptions.
--   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
-+   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
- 
-@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
-   /* Raise the saved exception.  Incidently for us the implementation
-      defined format of the values in objects of type fexcept_t is the
-      same as the ones specified using the FE_* constants.  */
--  feraiseexcept ((int) temp);
-+  __feraiseexcept ((int) temp);
- 
-   /* Success.  */
-   return 0;
diff --git a/staging/glibc/glibc-2.15-fix-res_query-assert.patch b/staging/glibc/glibc-2.15-fix-res_query-assert.patch
deleted file mode 100644
index a894da9c7..000000000
--- a/staging/glibc/glibc-2.15-fix-res_query-assert.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/resolv/res_query.c	
-+++ a/resolv/res_query.c	
-@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
- 		  int *resplen2)
- {
- 	HEADER *hp = (HEADER *) answer;
-+	HEADER *hp2;
- 	int n, use_malloc = 0;
- 	u_int oflags = statp->_flags;
- 
-@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
- 	  /* __libc_res_nsend might have reallocated the buffer.  */
- 	  hp = (HEADER *) *answerp;
- 
--	/* We simplify the following tests by assigning HP to HP2.  It
--	   is easy to verify that this is the same as ignoring all
--	   tests of HP2.  */
--	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
--
--	if (n < (int) sizeof (HEADER) && answerp2 != NULL
--	    && *resplen2 > (int) sizeof (HEADER))
-+	/* We simplify the following tests by assigning HP to HP2 or
-+	   vice versa.  It is easy to verify that this is the same as
-+	   ignoring all tests of HP or HP2.  */
-+	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp = hp2;
-+	    hp2 = hp;
- 	  }
--	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
--		 && n > (int) sizeof (HEADER))
-+	else
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp2 = hp;
-+	    hp2 = (HEADER *) *answerp2;
-+	    if (n < (int) sizeof (HEADER))
-+	      {
-+	        hp = hp2;
-+	      }
- 	  }
- 
-+	/* Make sure both hp and hp2 are defined */
-+	assert((hp != NULL) && (hp2 != NULL));
-+
- 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
- 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
- #ifdef DEBUG
diff --git a/staging/glibc/glibc-2.15-fmtmsg-locking.patch b/staging/glibc/glibc-2.15-fmtmsg-locking.patch
deleted file mode 100644
index f5976abd9..000000000
--- a/staging/glibc/glibc-2.15-fmtmsg-locking.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
-index 9203317..4c02302 100644
---- a/stdlib/fmtmsg.c
-+++ b/stdlib/fmtmsg.c
-@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	const char *text, const char *action, const char *tag)
- {
-   __libc_once_define (static, once);
--  int result = MM_OK;
-   struct severity_info *severity_rec;
- 
-   /* Make sure everything is initialized.  */
-@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	return MM_NOTOK;
-     }
- 
--  for (severity_rec = severity_list; severity_rec != NULL;
--       severity_rec = severity_rec->next)
--    if (severity == severity_rec->severity)
--      /* Bingo.  */
--      break;
--
--  /* If we don't know anything about the severity level return an error.  */
--  if (severity_rec == NULL)
--    return MM_NOTOK;
--
--
- #ifdef __libc_ptf_call
-   /* We do not want this call to be cut short by a thread
-      cancellation.  Therefore disable cancellation for now.  */
-@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
- 		   0);
- #endif
- 
--  /* Now we can print.  */
--  if (classification & MM_PRINT)
--    {
--      int do_label = (print & label_mask) && label != MM_NULLLBL;
--      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
--      int do_text = (print & text_mask) && text != MM_NULLTXT;
--      int do_action = (print & action_mask) && action != MM_NULLACT;
--      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
--
--      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
--		      do_label ? label : "",
--		      do_label && (do_severity | do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_severity ? severity_rec->string : "",
--		      do_severity && (do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_text ? text : "",
--		      do_text && (do_action | do_tag) ? "\n" : "",
--		      do_action ? "TO FIX: " : "",
--		      do_action ? action : "",
--		      do_action && do_tag ? "  " : "",
--		      do_tag ? tag : "") < 0)
--	/* Oh, oh.  An error occurred during the output.  */
--	result = MM_NOMSG;
--    }
-+  __libc_lock_lock (lock);
- 
--  if (classification & MM_CONSOLE)
-+  for (severity_rec = severity_list; severity_rec != NULL;
-+       severity_rec = severity_rec->next)
-+    if (severity == severity_rec->severity)
-+      /* Bingo.  */
-+      break;
-+
-+  /* If we don't know anything about the severity level return an error.  */
-+  int result = MM_NOTOK;
-+  if (severity_rec != NULL)
-     {
--      int do_label = label != MM_NULLLBL;
--      int do_severity = severity != MM_NULLSEV;
--      int do_text = text != MM_NULLTXT;
--      int do_action = action != MM_NULLACT;
--      int do_tag = tag != MM_NULLTAG;
--
--      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
--	      do_label ? label : "",
--	      do_label && (do_severity | do_text | do_action | do_tag)
--	      ? ": " : "",
--	      do_severity ? severity_rec->string : "",
--	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
--	      do_text ? text : "",
--	      do_text && (do_action | do_tag) ? "\n" : "",
--	      do_action ? "TO FIX: " : "",
--	      do_action ? action : "",
--	      do_action && do_tag ? "  " : "",
--	      do_tag ? tag : "");
-+      result = MM_OK;
-+
-+      /* Now we can print.  */
-+      if (classification & MM_PRINT)
-+	{
-+	  int do_label = (print & label_mask) && label != MM_NULLLBL;
-+	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
-+	  int do_text = (print & text_mask) && text != MM_NULLTXT;
-+	  int do_action = (print & action_mask) && action != MM_NULLACT;
-+	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
-+			  do_label ? label : "",
-+			  need_colon ? ": " : "",
-+			  do_severity ? severity_rec->string : "",
-+			  do_severity && (do_text | do_action | do_tag)
-+			  ? ": " : "",
-+			  do_text ? text : "",
-+			  do_text && (do_action | do_tag) ? "\n" : "",
-+			  do_action ? "TO FIX: " : "",
-+			  do_action ? action : "",
-+			  do_action && do_tag ? "  " : "",
-+			  do_tag ? tag : "") < 0)
-+	    /* Oh, oh.  An error occurred during the output.  */
-+	    result = MM_NOMSG;
-+	}
-+
-+      if (classification & MM_CONSOLE)
-+	{
-+	  int do_label = label != MM_NULLLBL;
-+	  int do_severity = severity != MM_NULLSEV;
-+	  int do_text = text != MM_NULLTXT;
-+	  int do_action = action != MM_NULLACT;
-+	  int do_tag = tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
-+		  do_label ? label : "",
-+		  need_colon ? ": " : "",
-+		  do_severity ? severity_rec->string : "",
-+		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
-+		  do_text ? text : "",
-+		  do_text && (do_action | do_tag) ? "\n" : "",
-+		  do_action ? "TO FIX: " : "",
-+		  do_action ? action : "",
-+		  do_action && do_tag ? "  " : "",
-+		  do_tag ? tag : "");
-+	}
-     }
- 
-+  __libc_lock_unlock (lock);
-+
- #ifdef __libc_ptf_call
-   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
- #endif
diff --git a/staging/glibc/glibc-2.15-gb18030.patch.gz b/staging/glibc/glibc-2.15-gb18030.patch.gz
deleted file mode 100644
index dde59c056..000000000
--- a/staging/glibc/glibc-2.15-gb18030.patch.gz
+++ /dev/null
diff --git a/staging/glibc/glibc-2.15-ifunc.patch b/staging/glibc/glibc-2.15-ifunc.patch
deleted file mode 100644
index 115afa02a..000000000
--- a/staging/glibc/glibc-2.15-ifunc.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff --git a/Makeconfig b/Makeconfig
-index 2db2821..68547b2 100644
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -900,6 +900,12 @@ else
- libdl = $(common-objpfx)dlfcn/libdl.a
- endif
- 
-+ifeq ($(build-shared),yes)
-+libm = $(common-objpfx)math/libm.so$(libm.so-version)
-+else
-+libm = $(common-objpfx)math/libm.a
-+endif
-+
- # These are the subdirectories containing the library source.  The order
- # is more or less arbitrary.  The sorting step will take care of the
- # dependencies.
-diff --git a/elf/Makefile b/elf/Makefile
-index 052e763..3f1772a 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -124,7 +124,8 @@ distribute	:= rtld-Rules \
- 		   tst-initordera1.c tst-initordera2.c tst-initorderb1.c \
- 		   tst-initorderb2.c tst-initordera3.c tst-initordera4.c \
- 		   tst-initorder.c \
--		   tst-initorder2.c
-+		   tst-initorder2.c \
-+		   tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c
- 
- CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
- CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
-@@ -227,7 +228,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- 	 tst-audit1 tst-audit2 \
- 	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
--	 tst-initorder tst-initorder2
-+	 tst-initorder tst-initorder2 tst-relsort1
- #	 reldep9
- test-srcs = tst-pathopt
- selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
-@@ -290,7 +291,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
- 		tst-initordera1 tst-initorderb1 \
- 		tst-initordera2 tst-initorderb2 \
- 		tst-initordera3 tst-initordera4 \
--		tst-initorder2a tst-initorder2b tst-initorder2c tst-initorder2d
-+		tst-initorder2a tst-initorder2b tst-initorder2c \
-+		tst-initorder2d \
-+		tst-relsort1mod1 tst-relsort1mod2
- ifeq (yes,$(have-initfini-array))
- modules-names += tst-array2dep tst-array5dep
- endif
-@@ -1195,3 +1198,9 @@ CFLAGS-tst-auditmod6b.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod6c.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod7b.c += $(AVX-CFLAGS)
- endif
-+
-+$(objpfx)tst-relsort1: $(libdl)
-+$(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
-+$(objpfx)tst-relsort1mod2.so: $(libm)
-+$(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
-+			   $(objpfx)tst-relsort1mod2.so
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index a0b5c50..a56bdc1 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -1,5 +1,5 @@
- /* Load a shared object at runtime, relocate it, and run its initializer.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 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
-@@ -302,45 +302,109 @@ dl_open_worker (void *a)
-   if (GLRO(dl_lazy))
-     reloc_mode |= mode & RTLD_LAZY;
- 
--  /* Relocate the objects loaded.  We do this in reverse order so that copy
--     relocs of earlier objects overwrite the data written by later objects.  */
--
-+  /* Sort the objects by dependency for the relocation process.  This
-+     allows IFUNC relocations to work and it also means copy
-+     relocation of dependencies are if necessary overwritten.  */
-+  size_t nmaps = 0;
-   struct link_map *l = new;
--  while (l->l_next)
--    l = l->l_next;
--  while (1)
-+  do
-+    {
-+      if (! l->l_real->l_relocated)
-+	++nmaps;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  struct link_map *maps[nmaps];
-+  nmaps = 0;
-+  l = new;
-+  do
-     {
-       if (! l->l_real->l_relocated)
-+	maps[nmaps++] = l;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  if (nmaps > 1)
-+    {
-+      char seen[nmaps];
-+      memset (seen, '\0', nmaps);
-+      size_t i = 0;
-+      while (1)
- 	{
--#ifdef SHARED
--	  if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	  ++seen[i];
-+	  struct link_map *thisp = maps[i];
-+
-+	  /* Find the last object in the list for which the current one is
-+	     a dependency and move the current object behind the object
-+	     with the dependency.  */
-+	  size_t k = nmaps - 1;
-+	  while (k > i)
- 	    {
--	      /* If this here is the shared object which we want to profile
--		 make sure the profile is started.  We can find out whether
--		 this is necessary or not by observing the `_dl_profile_map'
--		 variable.  If was NULL but is not NULL afterwars we must
--		 start the profiling.  */
--	      struct link_map *old_profile_map = GL(dl_profile_map);
-+	      struct link_map **runp = maps[k]->l_initfini;
-+	      if (runp != NULL)
-+		/* Look through the dependencies of the object.  */
-+		while (*runp != NULL)
-+		  if (__builtin_expect (*runp++ == thisp, 0))
-+		    {
-+		      /* Move the current object to the back past the last
-+			 object with it as the dependency.  */
-+		      memmove (&maps[i], &maps[i + 1],
-+			       (k - i) * sizeof (maps[0]));
-+		      maps[k] = thisp;
-+
-+		      if (seen[i + 1] > 1)
-+			{
-+			  ++i;
-+			  goto next_clear;
-+			}
-+
-+		      char this_seen = seen[i];
-+		      memmove (&seen[i], &seen[i + 1],
-+			       (k - i) * sizeof (seen[0]));
-+		      seen[k] = this_seen;
-+
-+		      goto next;
-+		    }
-+
-+	      --k;
-+	    }
- 
--	      _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+	  if (++i == nmaps)
-+	    break;
-+	next_clear:
-+	  memset (&seen[i], 0, (nmaps - i) * sizeof (seen[0]));
-+	next:;
-+	}
-+    }
- 
--	      if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
--		{
--		  /* We must prepare the profiling.  */
--		  _dl_start_profile ();
-+  for (size_t i = nmaps; i-- > 0; )
-+    {
-+      l = maps[i];
- 
--		  /* Prevent unloading the object.  */
--		  GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
--		}
-+#ifdef SHARED
-+      if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	{
-+	  /* If this here is the shared object which we want to profile
-+	     make sure the profile is started.  We can find out whether
-+	     this is necessary or not by observing the `_dl_profile_map'
-+	     variable.  If it was NULL but is not NULL afterwars we must
-+	     start the profiling.  */
-+	  struct link_map *old_profile_map = GL(dl_profile_map);
-+
-+	  _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+
-+	  if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
-+	    {
-+	      /* We must prepare the profiling.  */
-+	      _dl_start_profile ();
-+
-+	      /* Prevent unloading the object.  */
-+	      GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
- 	    }
--	  else
--#endif
--	    _dl_relocate_object (l, l->l_scope, reloc_mode, 0);
- 	}
--
--      if (l == new)
--	break;
--      l = l->l_prev;
-+      else
-+#endif
-+	_dl_relocate_object (l, l->l_scope, reloc_mode, 0);
-     }
- 
-   /* If the file is not loaded now as a dependency, add the search
-diff --git a/elf/tst-relsort1.c b/elf/tst-relsort1.c
-new file mode 100644
-index 0000000..972100c
---- /dev/null
-+++ b/elf/tst-relsort1.c
-@@ -0,0 +1,19 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+
-+
-+static int
-+do_test ()
-+{
-+  const char lib[] = "$ORIGIN/tst-relsort1mod1.so";
-+  void *h = dlopen (lib, RTLD_NOW);
-+  if (h == NULL)
-+    {
-+      puts (dlerror ());
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/elf/tst-relsort1mod1.c b/elf/tst-relsort1mod1.c
-new file mode 100644
-index 0000000..9e4a943
---- /dev/null
-+++ b/elf/tst-relsort1mod1.c
-@@ -0,0 +1,7 @@
-+extern int foo (double);
-+
-+int
-+bar (void)
-+{
-+  return foo (1.2);
-+}
-diff --git a/elf/tst-relsort1mod2.c b/elf/tst-relsort1mod2.c
-new file mode 100644
-index 0000000..a2c3e55
---- /dev/null
-+++ b/elf/tst-relsort1mod2.c
-@@ -0,0 +1,7 @@
-+#include <math.h>
-+
-+int
-+foo (double d)
-+{
-+  return floor (d) != 0.0;
-+}
diff --git a/staging/glibc/glibc-2.15-lddebug-scopes.patch b/staging/glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/staging/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/staging/glibc/glibc-2.15-multiarch-x86-strcmp.patch b/staging/glibc/glibc-2.15-multiarch-x86-strcmp.patch
deleted file mode 100644
index 38c9e617f..000000000
--- a/staging/glibc/glibc-2.15-multiarch-x86-strcmp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-index d10e872..d4fcd2b 100644
---- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strcasecmp.c>
- 
-+strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
-index 5410d17..b3b9eb8 100644
---- a/sysdeps/i386/i686/multiarch/strcmp.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp.S
-@@ -111,6 +111,7 @@ END(STRCMP)
- # endif
- #endif
- 
--#ifndef USE_AS_STRNCMP
-+#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
-+    && !defined USE_AS_STRNCASECMP_L
- # include "../strcmp.S"
- #endif
-diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-index 0c68b8d..7e601af 100644
---- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strncase.c>
- 
-+strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
diff --git a/staging/glibc/glibc-2.15-nearbyintf-rounding.patch b/staging/glibc/glibc-2.15-nearbyintf-rounding.patch
deleted file mode 100644
index b2bb9caac..000000000
--- a/staging/glibc/glibc-2.15-nearbyintf-rounding.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index c8186c8..1016753 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -4632,6 +4632,29 @@ nearbyint_test (void)
-   TEST_f_f (nearbyint, 524286.75, 524287.0);
-   TEST_f_f (nearbyint, 524288.75, 524289.0);
- 
-+  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
-+  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
-+  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
-+  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
-+  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
-+  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
-+  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
-+  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
-+  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
-+  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
-+#endif
-+
-   END (nearbyint);
- }
- 
-diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-index 04ef9ab..a6d602b 100644
---- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
-+++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-@@ -30,18 +30,12 @@ __nearbyintf(float x)
- {
- 	fenv_t env;
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		libc_feholdexceptf (&env);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
-@@ -49,17 +43,11 @@ __nearbyintf(float x)
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	libc_feholdexceptf (&env);
- 	w = TWO23[sx]+x;
- 	t = w-TWO23[sx];
diff --git a/staging/glibc/glibc-2.15-negative-result-cache.patch b/staging/glibc/glibc-2.15-negative-result-cache.patch
deleted file mode 100644
index c09e79a17..000000000
--- a/staging/glibc/glibc-2.15-negative-result-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/nscd/aicache.c b/nscd/aicache.c
-index aaaf80d..e1f1244 100644
---- a/nscd/aicache.c
-+++ b/nscd/aicache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -514,8 +514,9 @@ next_nip:
-       if (fd != -1)
- 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
- 
--      /* If we cannot permanently store the result, so be it.  */
--      if (__builtin_expect (db->negtimeout == 0, 0))
-+      /* If we have a transient error or cannot permanently store the
-+	 result, so be it.  */
-+      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	{
- 	  /* Mark the old entry as obsolete.  */
- 	  if (dh != NULL)
-diff --git a/nscd/grpcache.c b/nscd/grpcache.c
-index e9607c6..a698f36 100644
---- a/nscd/grpcache.c
-+++ b/nscd/grpcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for group lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
- 	  else
- 	    written = total;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (db->negtimeout == 0)
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/hstcache.c b/nscd/hstcache.c
-index 4d68ade..c72feaa 100644
---- a/nscd/hstcache.c
-+++ b/nscd/hstcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
- 					MSG_NOSIGNAL)) != total)
- 	    all_written = false;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
-index 4ac9942..2019991 100644
---- a/nscd/initgrcache.c
-+++ b/nscd/initgrcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
-index 49e130c..e2ba09d 100644
---- a/nscd/pwdcache.c
-+++ b/nscd/pwdcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for passwd lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/servicescache.c b/nscd/servicescache.c
-index d3d5dce..a6337e3 100644
---- a/nscd/servicescache.c
-+++ b/nscd/servicescache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for services lookup.
--   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
- 
-@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
diff --git a/staging/glibc/glibc-2.15-non-signalling-comparisons.patch b/staging/glibc/glibc-2.15-non-signalling-comparisons.patch
deleted file mode 100644
index 874f8b4cb..000000000
--- a/staging/glibc/glibc-2.15-non-signalling-comparisons.patch
+++ /dev/null
@@ -1,886 +0,0 @@
-diff --git a/math/w_acos.c b/math/w_acos.c
-index 3138408..0490933 100644
---- a/math/w_acos.c
-+++ b/math/w_acos.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __acos (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosf.c b/math/w_acosf.c
-index 0e41a2c..2500a7d 100644
---- a/math/w_acosf.c
-+++ b/math/w_acosf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __acosf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosh.c b/math/w_acosh.c
-index 0bd2686..d632987 100644
---- a/math/w_acosh.c
-+++ b/math/w_acosh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __acosh (double x)
- {
--  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 29);
- 
-diff --git a/math/w_acoshf.c b/math/w_acoshf.c
-index c59bf94..f77df2b 100644
---- a/math/w_acoshf.c
-+++ b/math/w_acoshf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __acoshf (float x)
- {
--  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard_f (x, x, 129);
- 
-diff --git a/math/w_acoshl.c b/math/w_acoshl.c
-index 819bdfc..cc823b8 100644
---- a/math/w_acoshl.c
-+++ b/math/w_acoshl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __acoshl (long double x)
- {
--  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 229);
- 
-diff --git a/math/w_acosl.c b/math/w_acosl.c
-index 6417068..05023b4 100644
---- a/math/w_acosl.c
-+++ b/math/w_acosl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __acosl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asin.c b/math/w_asin.c
-index d4e89ce..0fa9487 100644
---- a/math/w_asin.c
-+++ b/math/w_asin.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __asin (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinf.c b/math/w_asinf.c
-index 270961f..c28edab 100644
---- a/math/w_asinf.c
-+++ b/math/w_asinf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __asinf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinl.c b/math/w_asinl.c
-index 32e5273..e4036d8 100644
---- a/math/w_asinl.c
-+++ b/math/w_asinl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __asinl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_atanh.c b/math/w_atanh.c
-index 1022bd5..190d2e9 100644
---- a/math/w_atanh.c
-+++ b/math/w_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- double
- __atanh (double x)
- {
--  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabs (x) > 1.0
- 			      ? 30		/* atanh(|x|>1) */
-diff --git a/math/w_atanhf.c b/math/w_atanhf.c
-index 3c8cf83..e0c5dc3 100644
---- a/math/w_atanhf.c
-+++ b/math/w_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- float
- __atanhf (float x)
- {
--  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x,
- 				fabsf (x) > 1.0f
- 				? 130		/* atanh(|x|>1) */
-diff --git a/math/w_atanhl.c b/math/w_atanhl.c
-index f582acf..319535d 100644
---- a/math/w_atanhl.c
-+++ b/math/w_atanhl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- long double
- __atanhl (long double x)
- {
--  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabsl (x) > 1.0L
- 			      ? 230		/* atanh(|x|>1) */
-diff --git a/math/w_exp2.c b/math/w_exp2.c
-index bf22326..7a3b0af 100644
---- a/math/w_exp2.c
-+++ b/math/w_exp2.c
-@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
- double
- __exp2 (double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finite (x))
-     /* exp2 overflow: 44, exp2 underflow: 45 */
-     return __kernel_standard (x, x, 44 + (x <= o_threshold));
-diff --git a/math/w_exp2f.c b/math/w_exp2f.c
-index 7215fca..c4e9e94 100644
---- a/math/w_exp2f.c
-+++ b/math/w_exp2f.c
-@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
- float
- __exp2f (float x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitef (x))
-     /* exp2 overflow: 144, exp2 underflow: 145 */
-     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
-diff --git a/math/w_exp2l.c b/math/w_exp2l.c
-index ac8d231..442a637 100644
---- a/math/w_exp2l.c
-+++ b/math/w_exp2l.c
-@@ -13,7 +13,8 @@ static const long double u_threshold
- long double
- __exp2l (long double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitel (x))
-     /* exp2 overflow: 244, exp2 underflow: 245 */
-     return __kernel_standard (x, x, 244 + (x <= o_threshold));
-diff --git a/math/w_j0.c b/math/w_j0.c
-index 1dff8b4..f8d3724 100644
---- a/math/w_j0.c
-+++ b/math/w_j0.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j0 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 34);
- 
-@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
- double
- y0 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j0f.c b/math/w_j0f.c
-index fc52f26..cef36aa 100644
---- a/math/w_j0f.c
-+++ b/math/w_j0f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- j0f (float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 134);
-@@ -38,7 +38,8 @@ j0f (float x)
- float
- y0f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+                        || isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j0l.c b/math/w_j0l.c
-index 8d72d50..144f33c 100644
---- a/math/w_j0l.c
-+++ b/math/w_j0l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j0l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 234);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
- long double
- __y0l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_j1.c b/math/w_j1.c
-index 358e0e1..e9a5357 100644
---- a/math/w_j1.c
-+++ b/math/w_j1.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j1 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 36);
- 
-@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
- double
- y1 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j1f.c b/math/w_j1f.c
-index 096fdf5..29bd949 100644
---- a/math/w_j1f.c
-+++ b/math/w_j1f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- j1f (float x)
- {
--  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 136);
- 
-@@ -37,7 +38,8 @@ j1f (float x)
- float
- y1f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j1l.c b/math/w_j1l.c
-index 93e4ee4..01b8551 100644
---- a/math/w_j1l.c
-+++ b/math/w_j1l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j1l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 236);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
- long double
- __y1l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_jn.c b/math/w_jn.c
-index f0dd8c6..fd3fb16 100644
---- a/math/w_jn.c
-+++ b/math/w_jn.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- jn (int n, double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard (n, x, 38);
- 
-@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
- double
- yn (int n, double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_jnf.c b/math/w_jnf.c
-index ef29eb4..36d6f6d 100644
---- a/math/w_jnf.c
-+++ b/math/w_jnf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- jnf (int n, float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard_f (n, x, 138);
-@@ -38,7 +38,8 @@ jnf (int n, float x)
- float
- ynf (int n, float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_log.c b/math/w_log.c
-index efc1c4c..ec33605 100644
---- a/math/w_log.c
-+++ b/math/w_log.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10.c b/math/w_log10.c
-index 2717ade..fe799ad 100644
---- a/math/w_log10.c
-+++ b/math/w_log10.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log10 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10f.c b/math/w_log10f.c
-index 60737ca..4b821f7 100644
---- a/math/w_log10f.c
-+++ b/math/w_log10f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log10f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_log10l.c b/math/w_log10l.c
-index b26f18c..0e5a137 100644
---- a/math/w_log10l.c
-+++ b/math/w_log10l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log10l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_log2.c b/math/w_log2.c
-index 998e5d9..e58e109 100644
---- a/math/w_log2.c
-+++ b/math/w_log2.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log2 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2f.c b/math/w_log2f.c
-index 6d91bf4..6963ed2 100644
---- a/math/w_log2f.c
-+++ b/math/w_log2f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log2f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2l.c b/math/w_log2l.c
-index e51c1bc..eed04ff6c 100644
---- a/math/w_log2l.c
-+++ b/math/w_log2l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log2l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_logf.c b/math/w_logf.c
-index 8aa27c8..38d408f 100644
---- a/math/w_logf.c
-+++ b/math/w_logf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __logf (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_logl.c b/math/w_logl.c
-index a3139ff..593b37d 100644
---- a/math/w_logl.c
-+++ b/math/w_logl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __logl (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_sqrt.c b/math/w_sqrt.c
-index 409a6df..f6ba542 100644
---- a/math/w_sqrt.c
-+++ b/math/w_sqrt.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __sqrt (double x)
- {
--  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 26); /* sqrt(negative) */
- 
-   return __ieee754_sqrt (x);
-diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
-index 3c3d2f8..c128e9b 100644
---- a/math/w_sqrtf.c
-+++ b/math/w_sqrtf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __sqrtf (float x)
- {
--  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
- 
-   return __ieee754_sqrtf (x);
-diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
-index 5e18f44..2a4a048 100644
---- a/math/w_sqrtl.c
-+++ b/math/w_sqrtl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __sqrtl (long double x)
- {
--  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 226); /* sqrt(negative) */
- 
-   return __ieee754_sqrtl (x);
-diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
-index 9fc21ab..5f471b1 100644
---- a/sysdeps/ieee754/dbl-64/e_atanh.c
-+++ b/sysdeps/ieee754/dbl-64/e_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
- {
-   double xa = fabs (x);
-   double t;
--  if (xa < 0.5)
-+  if (isless (xa, 0.5))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
-       t = xa + xa;
-       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
-     }
--  else if (__builtin_expect (xa < 1.0, 1))
-+  else if (__builtin_expect (isless (xa, 1.0), 1))
-     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
-   else
-     {
--      if (xa > 1.0)
-+      if (isgreater (xa, 1.0))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0;
-diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
-index ee42587..b584ed8 100644
---- a/sysdeps/ieee754/dbl-64/w_exp.c
-+++ b/sysdeps/ieee754/dbl-64/w_exp.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
- double
- __exp (double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 6);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 7);
-diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
-index 75ed691..7af2f6c 100644
---- a/sysdeps/ieee754/flt-32/e_atanhf.c
-+++ b/sysdeps/ieee754/flt-32/e_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
- {
-   float xa = fabsf (x);
-   float t;
--  if (xa < 0.5f)
-+  if (isless (xa, 0.5f))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28f, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
-       t = xa + xa;
-       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
-     }
--  else if (__builtin_expect (xa < 1.0f, 1))
-+  else if (__builtin_expect (isless (xa, 1.0f), 1))
-     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
-   else
-     {
--      if (xa > 1.0f)
-+      if (isgreater (xa, 1.0f))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0f;
-diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
-index 5500872..bc3b2f6 100644
---- a/sysdeps/ieee754/flt-32/w_expf.c
-+++ b/sysdeps/ieee754/flt-32/w_expf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
- float
- __expf (float x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 106);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 107);
-diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
-index ec9d8a7..d61c0a3 100644
---- a/sysdeps/ieee754/ldbl-96/w_expl.c
-+++ b/sysdeps/ieee754/ldbl-96/w_expl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
- long double
- __expl (long double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 206);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 207);
diff --git a/staging/glibc/glibc-2.15-regex.patch b/staging/glibc/glibc-2.15-regex.patch
deleted file mode 100644
index 6385f2c08..000000000
--- a/staging/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/staging/glibc/glibc-2.15-revert-c5a0802a.patch b/staging/glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index d8894723a..000000000
--- a/staging/glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,226 +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 <stap-probe.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
--	LP_OP(cmp) $-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
--	LP_OP(cmp) $-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
--	mov	dep_mutex(%rdi), %R8_LP
--	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:
- 
diff --git a/staging/glibc/glibc-2.15-revert-netlink-cache.patch b/staging/glibc/glibc-2.15-revert-netlink-cache.patch
deleted file mode 100644
index 87d04c794..000000000
--- a/staging/glibc/glibc-2.15-revert-netlink-cache.patch
+++ /dev/null
@@ -1,680 +0,0 @@
-diff --git a/include/ifaddrs.h b/include/ifaddrs.h
-index e1c6cac..50e4c48 100644
---- a/include/ifaddrs.h
-+++ b/include/ifaddrs.h
-@@ -21,13 +21,8 @@ struct in6addrinfo
- extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 			struct in6addrinfo **in6ai, size_t *in6ailen)
-   attribute_hidden;
--extern void __free_in6ai (struct in6addrinfo *in6ai) attribute_hidden;
- extern void __check_native (uint32_t a1_index, int *a1_native,
- 			    uint32_t a2_index, int *a2_native)
-   attribute_hidden;
- 
--#ifdef IS_IN_nscd
--extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
--#endif
--
- #endif	/* ifaddrs.h */
-diff --git a/inet/check_pf.c b/inet/check_pf.c
-index 0fa34cc..b015432 100644
---- a/inet/check_pf.c
-+++ b/inet/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Generic version.
--   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006 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
-@@ -54,19 +54,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   (void) freeifaddrs (ifa);
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *in6ai)
--{
--  /* Nothing to do.  */
--}
--
--
--#ifdef IS_IN_nscd
--uint32_t
--__bump_nl_timestamp (void)
--{
--  return 0;
--}
--#endif
-diff --git a/nscd/connections.c b/nscd/connections.c
-index c741996..2b5c7ef 100644
---- a/nscd/connections.c
-+++ b/nscd/connections.c
-@@ -24,7 +24,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <grp.h>
--#include <ifaddrs.h>
- #include <libintl.h>
- #include <pthread.h>
- #include <pwd.h>
-@@ -33,10 +32,6 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <arpa/inet.h>
--#ifdef HAVE_NETLINK
--# include <linux/netlink.h>
--# include <linux/rtnetlink.h>
--#endif
- #ifdef HAVE_EPOLL
- # include <sys/epoll.h>
- #endif
-@@ -252,11 +247,6 @@ static int sock;
- int inotify_fd = -1;
- #endif
- 
--#ifdef HAVE_NETLINK
--/* Descriptor for netlink status updates.  */
--static int nl_status_fd = -1;
--#endif
--
- #ifndef __ASSUME_SOCK_CLOEXEC
- /* Negative if SOCK_CLOEXEC is not supported, positive if it is, zero
-    before be know the result.  */
-@@ -913,65 +903,6 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
-       exit (1);
-     }
- 
--#ifdef HAVE_NETLINK
--  if (dbs[hstdb].enabled)
--    {
--      /* Try to open netlink socket to monitor network setting changes.  */
--      nl_status_fd = socket (AF_NETLINK,
--			     SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK,
--			     NETLINK_ROUTE);
--      if (nl_status_fd != -1)
--	{
--	  struct sockaddr_nl snl;
--	  memset (&snl, '\0', sizeof (snl));
--	  snl.nl_family = AF_NETLINK;
--	  /* XXX Is this the best set to use?  */
--	  snl.nl_groups = (RTMGRP_IPV4_IFADDR | RTMGRP_TC | RTMGRP_IPV4_MROUTE
--			   | RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_RULE
--			   | RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_MROUTE
--			   | RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFINFO
--			   | RTMGRP_IPV6_PREFIX);
--
--	  if (bind (nl_status_fd, (struct sockaddr *) &snl, sizeof (snl)) != 0)
--	    {
--	      close (nl_status_fd);
--	      nl_status_fd = -1;
--	    }
--	  else
--	    {
--	      /* Start the timestamp process.  */
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--
--# ifndef __ASSUME_SOCK_CLOEXEC
--	      if (have_sock_cloexec < 0)
--		{
--		  /* We don't want to get stuck on accept.  */
--		  int fl = fcntl (nl_status_fd, F_GETFL);
--		  if (fl == -1
--		      || fcntl (nl_status_fd, F_SETFL, fl | O_NONBLOCK) == -1)
--		    {
--		      dbg_log (_("\
--cannot change socket to nonblocking mode: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--
--		  /* The descriptor needs to be closed on exec.  */
--		  if (paranoia
--		      && fcntl (nl_status_fd, F_SETFD, FD_CLOEXEC) == -1)
--		    {
--		      dbg_log (_("cannot set socket to close on exec: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--		}
--# endif
--	    }
--	}
--    }
--#endif
--
-   /* Change to unprivileged uid/gid/groups if specified in config file */
-   if (server_user != NULL)
-     finish_drop_privileges ();
-@@ -1895,18 +1826,6 @@ main_loop_poll (void)
-     }
- #endif
- 
--#ifdef HAVE_NETLINK
--  size_t idx_nl_status_fd = 0;
--  if (nl_status_fd != -1)
--    {
--      idx_nl_status_fd = nused;
--      conns[nused].fd = nl_status_fd;
--      conns[nused].events = POLLRDNORM;
--      ++nused;
--      firstfree = nused;
--    }
--#endif
--
-   while (1)
-     {
-       /* Wait for any event.  We wait at most a couple of seconds so
-@@ -2049,20 +1968,6 @@ disabled inotify after read error %d"),
- 	    }
- #endif
- 
--#ifdef HAVE_NETLINK
--	  if (idx_nl_status_fd != 0 && conns[idx_nl_status_fd].revents != 0)
--	    {
--	      char buf[4096];
--	      /* Read all the data.  We do not interpret it here.  */
--	      while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					       sizeof (buf))) != -1)
--		;
--
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--	    }
--#endif
--
- 	  for (size_t cnt = first; cnt < nused && n > 0; ++cnt)
- 	    if (conns[cnt].revents != 0)
- 	      {
-@@ -2141,17 +2046,6 @@ main_loop_epoll (int efd)
-     }
- # endif
- 
--# ifdef HAVE_NETLINK
--  if (nl_status_fd != -1)
--    {
--      ev.events = EPOLLRDNORM;
--      ev.data.fd = nl_status_fd;
--      if (epoll_ctl (efd, EPOLL_CTL_ADD, nl_status_fd, &ev) == -1)
--	/* We cannot use epoll.  */
--	return;
--    }
--# endif
--
-   while (1)
-     {
-       struct epoll_event revs[100];
-@@ -2268,18 +2162,6 @@ main_loop_epoll (int efd)
- 		}
- 	  }
- # endif
--# ifdef HAVE_NETLINK
--	else if (revs[cnt].data.fd == nl_status_fd)
--	  {
--	    char buf[4096];
--	    /* Read all the data.  We do not interpret it here.  */
--	    while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					     sizeof (buf))) != -1)
--	      ;
--
--	    __bump_nl_timestamp ();
--	  }
--# endif
- 	else
- 	  {
- 	    /* Remove the descriptor from the epoll descriptor.  */
-@@ -2303,7 +2185,6 @@ main_loop_epoll (int efd)
-       time_t laststart = now - ACCEPT_TIMEOUT;
-       assert (starttime[sock] == 0);
-       assert (inotify_fd == -1 || starttime[inotify_fd] == 0);
--      assert (nl_status_fd == -1 || starttime[nl_status_fd] == 0);
-       for (int cnt = highest; cnt > STDERR_FILENO; --cnt)
- 	if (starttime[cnt] != 0 && starttime[cnt] < laststart)
- 	  {
-diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
-index b5cd2d2..caad26a 100644
---- a/nscd/nscd-client.h
-+++ b/nscd/nscd-client.h
-@@ -260,17 +260,12 @@ struct hashentry
- 
- 
- /* Current persistent database version.  */
--#define DB_VERSION	2
-+#define DB_VERSION	1
- 
- /* Maximum time allowed between updates of the timestamp.  */
- #define MAPPING_TIMEOUT (5 * 60)
- 
- 
--/* Used indices for the EXTRA_DATA element of 'database_pers_head'.
--   Each database has its own indices.  */
--#define NSCD_HST_IDX_CONF_TIMESTAMP	0
--
--
- /* Header of persistent database file.  */
- struct database_pers_head
- {
-@@ -279,8 +274,6 @@ struct database_pers_head
-   volatile int32_t gc_cycle;
-   volatile int32_t nscd_certainly_running;
-   volatile nscd_time_t timestamp;
--  /* Room for extensions.  */
--  volatile uint32_t extra_data[4];
- 
-   nscd_ssize_t module;
-   nscd_ssize_t data_size;
-@@ -329,12 +322,6 @@ extern int __nscd_open_socket (const char *key, size_t keylen,
- 			       request_type type, void *response,
- 			       size_t responselen) attribute_hidden;
- 
--/* Try to get a file descriptor for the shared meory segment
--   containing the database.  */
--extern struct mapped_database *__nscd_get_mapping (request_type type,
--						   const char *key,
--						   struct mapped_database **mappedp) attribute_hidden;
--
- /* Get reference of mapping.  */
- extern struct mapped_database *__nscd_get_map_ref (request_type type,
- 						   const char *name,
-@@ -384,7 +371,4 @@ extern ssize_t writeall (int fd, const void *buf, size_t len)
- extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len)
-   attribute_hidden;
- 
--/* Get netlink timestamp counter from mapped area or zero.  */
--extern uint32_t __nscd_get_nl_timestamp (void);
--
- #endif /* nscd.h */
-diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
-index 6ee142d..70631fa 100644
---- a/nscd/nscd_gethst_r.c
-+++ b/nscd/nscd_gethst_r.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009, 2011
-+/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-@@ -98,27 +98,6 @@ libc_freeres_fn (hst_map_free)
- }
- 
- 
--uint32_t
--__nscd_get_nl_timestamp (void)
--{
--  if (__nss_not_use_nscd_hosts != 0)
--    return 0;
--
--  struct mapped_database *map = __hst_map_handle.mapped;
--
--  if (map == NULL
--      || (map != NO_MAPPING
--	  && map->head->nscd_certainly_running == 0
--	  && map->head->timestamp + MAPPING_TIMEOUT < time (NULL)))
--    map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped);
--
--  if (map == NO_MAPPING)
--    return 0;
--
--  return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP];
--}
--
--
- int __nss_have_localdomain attribute_hidden;
- 
- static int
-diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
-index 365b599..fe63f9a 100644
---- a/nscd/nscd_helper.c
-+++ b/nscd/nscd_helper.c
-@@ -277,9 +277,9 @@ __nscd_unmap (struct mapped_database *mapped)
- 
- /* Try to get a file descriptor for the shared meory segment
-    containing the database.  */
--struct mapped_database *
--__nscd_get_mapping (request_type type, const char *key,
--		    struct mapped_database **mappedp)
-+static struct mapped_database *
-+get_mapping (request_type type, const char *key,
-+	     struct mapped_database **mappedp)
- {
-   struct mapped_database *result = NO_MAPPING;
- #ifdef SCM_RIGHTS
-@@ -449,8 +449,8 @@ __nscd_get_map_ref (request_type type, const char *name,
- 	  || (cur->head->nscd_certainly_running == 0
- 	      && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))
- 	  || cur->head->data_size > cur->datasize)
--	cur = __nscd_get_mapping (type, name,
--				  (struct mapped_database **) &mapptr->mapped);
-+	cur = get_mapping (type, name,
-+			   (struct mapped_database **) &mapptr->mapped);
- 
-       if (__builtin_expect (cur != NO_MAPPING, 1))
- 	{
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index 1a023f9..4979805 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2386,7 +2386,7 @@ getaddrinfo (const char *name, const char *service,
- 	       || (hints->ai_family == PF_INET6 && ! seen_ipv6))
- 	{
- 	  /* We cannot possibly return a valid answer.  */
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 	  return EAI_NONAME;
- 	}
-     }
-@@ -2400,7 +2400,7 @@ getaddrinfo (const char *name, const char *service,
- 	{
- 	  if (hints->ai_flags & AI_NUMERICSERV)
- 	    {
--	      __free_in6ai (in6ai);
-+	      free (in6ai);
- 	      return EAI_NONAME;
- 	    }
- 
-@@ -2422,7 +2422,7 @@ getaddrinfo (const char *name, const char *service,
-       if (last_i != 0)
- 	{
- 	  freeaddrinfo (p);
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 
- 	  return -(last_i & GAIH_EAI);
- 	}
-@@ -2434,7 +2434,7 @@ getaddrinfo (const char *name, const char *service,
-     }
-   else
-     {
--      __free_in6ai (in6ai);
-+      free (in6ai);
-       return EAI_FAMILY;
-     }
- 
-@@ -2622,7 +2622,7 @@ getaddrinfo (const char *name, const char *service,
-       p->ai_canonname = canonname;
-     }
- 
--  __free_in6ai (in6ai);
-+  free (in6ai);
- 
-   if (p)
-     {
-diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
-index e684b16..c907af4 100644
---- a/sysdeps/unix/sysv/linux/Makefile
-+++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -173,6 +173,6 @@ CFLAGS-mq_receive.c += -fexceptions
- endif
- 
- ifeq ($(subdir),nscd)
--sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY -DHAVE_NETLINK
-+sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY
- CFLAGS-gai.c += -DNEED_NETLINK
- endif
-diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
-index 0738a70..d5ad7ea 100644
---- a/sysdeps/unix/sysv/linux/check_pf.c
-+++ b/sysdeps/unix/sysv/linux/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Linux version.
--   Copyright (C) 2003, 2006-2008, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006, 2007, 2008, 2010, 2011 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
-@@ -33,9 +33,6 @@
- 
- #include <not-cancel.h>
- #include <kernel-features.h>
--#include <bits/libc-lock.h>
--#include <atomic.h>
--#include <nscd/nscd-client.h>
- 
- 
- #ifndef IFA_F_HOMEADDRESS
-@@ -46,42 +43,9 @@
- #endif
- 
- 
--struct cached_data
--{
--  uint32_t timestamp;
--  uint32_t usecnt;
--  bool seen_ipv4;
--  bool seen_ipv6;
--  size_t in6ailen;
--  struct in6addrinfo in6ai[0];
--};
--
--static struct cached_data noai6ai_cached =
--  {
--    .usecnt = 1,	/* Make sure we never try to delete this entry.  */
--    .in6ailen = 0
--  };
--
--static struct cached_data *cache;
--__libc_lock_define_initialized (static, lock);
--
--
--#ifdef IS_IN_nscd
--static uint32_t nl_timestamp;
--
--uint32_t
--__bump_nl_timestamp (void)
--{
--  if (atomic_increment_val (&nl_timestamp) == 0)
--    atomic_increment (&nl_timestamp);
--
--  return nl_timestamp;
--}
--#endif
--
--
--static struct cached_data *
--make_request (int fd, pid_t pid)
-+static int
-+make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
-+	      struct in6addrinfo **in6ai, size_t *in6ailen)
- {
-   struct req
-   {
-@@ -135,6 +99,9 @@ make_request (int fd, pid_t pid)
- 				    sizeof (nladdr))) < 0)
-     goto out_fail;
- 
-+  *seen_ipv4 = false;
-+  *seen_ipv6 = false;
-+
-   bool done = false;
-   struct in6ailist
-   {
-@@ -142,8 +109,6 @@ make_request (int fd, pid_t pid)
-     struct in6ailist *next;
-   } *in6ailist = NULL;
-   size_t in6ailistlen = 0;
--  bool seen_ipv4 = false;
--  bool seen_ipv6 = false;
- 
-   do
-     {
-@@ -207,12 +172,12 @@ make_request (int fd, pid_t pid)
- 		    {
- 		      if (*(const in_addr_t *) address
- 			  != htonl (INADDR_LOOPBACK))
--			seen_ipv4 = true;
-+			*seen_ipv4 = true;
- 		    }
- 		  else
- 		    {
- 		      if (!IN6_IS_ADDR_LOOPBACK (address))
--			seen_ipv6 = true;
-+			*seen_ipv6 = true;
- 		    }
- 		}
- 
-@@ -246,47 +211,30 @@ make_request (int fd, pid_t pid)
-     }
-   while (! done);
- 
--  struct cached_data *result;
--  if (seen_ipv6 && in6ailist != NULL)
-+  if (*seen_ipv6 && in6ailist != NULL)
-     {
--      result = malloc (sizeof (*result)
--		       + in6ailistlen * sizeof (struct in6addrinfo));
--      if (result == NULL)
-+      *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
-+      if (*in6ai == NULL)
- 	goto out_fail;
- 
--#ifdef IS_IN_nscd
--      result->timestamp = nl_timestamp;
--#else
--      result->timestamp = __nscd_get_nl_timestamp ();
--#endif
--      result->usecnt = 2;
--      result->seen_ipv4 = seen_ipv4;
--      result->seen_ipv6 = true;
--      result->in6ailen = in6ailistlen;
-+      *in6ailen = in6ailistlen;
- 
-       do
- 	{
--	  result->in6ai[--in6ailistlen] = in6ailist->info;
-+	  (*in6ai)[--in6ailistlen] = in6ailist->info;
- 	  in6ailist = in6ailist->next;
- 	}
-       while (in6ailist != NULL);
-     }
--  else
--    {
--      atomic_add (&noai6ai_cached.usecnt, 2);
--      noai6ai_cached.seen_ipv4 = seen_ipv4;
--      noai6ai_cached.seen_ipv6 = seen_ipv6;
--      result = &noai6ai_cached;
--    }
- 
-   if (use_malloc)
-     free (buf);
--  return result;
-+  return 0;
- 
- out_fail:
-   if (use_malloc)
-     free (buf);
--  return NULL;
-+  return -1;
- }
- 
- 
-@@ -310,65 +258,28 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   if (! __no_netlink_support)
-     {
--      struct cached_data *olddata = NULL;
--      struct cached_data *data = NULL;
-+      int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- 
--      __libc_lock_lock (lock);
--
--#ifdef IS_IN_nscd
--# define cache_valid() nl_timestamp != 0 && cache->timestamp == nl_timestamp
--#else
--# define cache_valid() \
--      ({ uint32_t val = __nscd_get_nl_timestamp ();			      \
--	 val != 0 && cache->timestamp == val; })
--#endif
--      if (cache != NULL && cache_valid ())
--	{
--	  data = cache;
--	  atomic_increment (&cache->usecnt);
--	}
--      else
-+      if (__builtin_expect (fd >= 0, 1))
- 	{
--	  int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-+	  struct sockaddr_nl nladdr;
-+	  memset (&nladdr, '\0', sizeof (nladdr));
-+	  nladdr.nl_family = AF_NETLINK;
- 
--	  if (__builtin_expect (fd >= 0, 1))
--	    {
--	      struct sockaddr_nl nladdr;
--	      memset (&nladdr, '\0', sizeof (nladdr));
--	      nladdr.nl_family = AF_NETLINK;
--
--	      socklen_t addr_len = sizeof (nladdr);
--
--	      if(__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
--		 && __getsockname (fd, (struct sockaddr *) &nladdr,
--				   &addr_len) == 0)
--		data = make_request (fd, nladdr.nl_pid);
--
--	      close_not_cancel_no_status (fd);
--	    }
--
--	  if (data != NULL)
--	    {
--	      olddata = cache;
--	      cache = data;
--	    }
--	}
-+	  socklen_t addr_len = sizeof (nladdr);
- 
--      __libc_lock_unlock (lock);
-+	  bool success
-+	    = (__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
-+	       && __getsockname (fd, (struct sockaddr *) &nladdr,
-+				 &addr_len) == 0
-+	       && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
-+				in6ai, in6ailen) == 0);
- 
--      if (data != NULL)
--	{
--	  /* It worked.  */
--	  *seen_ipv4 = data->seen_ipv4;
--	  *seen_ipv6 = data->seen_ipv6;
--	  *in6ailen = data->in6ailen;
--	  *in6ai = data->in6ai;
--
--	  if (olddata != NULL && olddata->usecnt > 0
--	      && atomic_add_zero (&olddata->usecnt, -1))
--	    free (olddata);
-+	  close_not_cancel_no_status (fd);
- 
--	  return;
-+	  if (success)
-+	    /* It worked.  */
-+	    return;
- 	}
- 
- #if __ASSUME_NETLINK_SUPPORT == 0
-@@ -407,26 +318,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
-   (void) freeifaddrs (ifa);
- #endif
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *ai)
--{
--  if (ai != NULL)
--    {
--      struct cached_data *data =
--	(struct cached_data *) ((char *) ai
--				- offsetof (struct cached_data, in6ai));
--
--      if (atomic_add_zero (&data->usecnt, -1))
--	{
--	  __libc_lock_lock (lock);
--
--	  if (data->usecnt == 0)
--	    /* Still unused.  */
--	    free (data);
--
--	  __libc_lock_unlock (lock);
--	}
--    }
--}
diff --git a/staging/glibc/glibc-2.15-rintf-rounding.patch b/staging/glibc/glibc-2.15-rintf-rounding.patch
deleted file mode 100644
index e0240ac6c..000000000
--- a/staging/glibc/glibc-2.15-rintf-rounding.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index 6243e1e..c8186c8 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -5037,6 +5037,22 @@ rint_test (void)
-   TEST_f_f (rint, 262142.75, 262143.0);
-   TEST_f_f (rint, 524286.75, 524287.0);
-   TEST_f_f (rint, 524288.75, 524289.0);
-+  TEST_f_f (rint, 1048576.75, 1048577.0);
-+  TEST_f_f (rint, 2097152.75, 2097153.0);
-+  TEST_f_f (rint, -1048576.75, -1048577.0);
-+  TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-   /* The result can only be represented in long double.  */
-   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5277,6 +5325,22 @@ rint_test_downward (void)
-       TEST_f_f (rint, -0.1, -1.0);
-       TEST_f_f (rint, -0.25, -1.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5347,6 +5411,22 @@ rint_test_upward (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
-index 9ea9b6f..9ba6b57 100644
---- a/sysdeps/ieee754/flt-32/s_rintf.c
-+++ b/sysdeps/ieee754/flt-32/s_rintf.c
-@@ -26,34 +26,22 @@ float
- __rintf(float x)
- {
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(j0==0x80) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	w = TWO23[sx]+x;
- 	return w-TWO23[sx];
- }
diff --git a/staging/glibc/glibc-2.15-scanf.patch b/staging/glibc/glibc-2.15-scanf.patch
deleted file mode 100644
index a2561b232..000000000
--- a/staging/glibc/glibc-2.15-scanf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
-index 0e71deb..e18a6c3 100644
---- a/stdio-common/vfscanf.c
-+++ b/stdio-common/vfscanf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 1991-2007, 2010, 2011, 2012 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
-@@ -274,7 +274,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
- 	  CHAR_T *old = wp;						    \
- 	  size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax			    \
- 			    ? UCHAR_MAX + 1 : 2 * wpmax);		    \
--	  if (use_malloc || __libc_use_alloca (newsize))		    \
-+	  if (use_malloc || !__libc_use_alloca (newsize))		    \
- 	    {								    \
- 	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
- 	      if (wp == NULL)						    \
diff --git a/staging/glibc/glibc-2.15-strcasecmp-disable-avx.patch b/staging/glibc/glibc-2.15-strcasecmp-disable-avx.patch
deleted file mode 100644
index 4c104fa55..000000000
--- a/staging/glibc/glibc-2.15-strcasecmp-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/staging/glibc/glibc-2.15-testsuite.patch b/staging/glibc/glibc-2.15-testsuite.patch
deleted file mode 100644
index 7eaeaed65..000000000
--- a/staging/glibc/glibc-2.15-testsuite.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Mon, 16 Apr 2012 14:06:47 +1000
-Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
----
- ChangeLog       |   24 ++++++++++++++++++++++++
- elf/Makefile    |   21 ++++++++++++++++++++-
- nptl/ChangeLog  |    5 +++++
- nptl/Makefile   |    3 ++-
- stdlib/Makefile |    1 +
- 5 files changed, 52 insertions(+), 2 deletions(-)
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 57dcab0..47729c3 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb
- $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so
- $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so
- 
-+LDFLAGS-nodel2mod3.so = $(no-as-needed)
-+LDFLAGS-reldepmod5.so = $(no-as-needed)
-+LDFLAGS-reldep6mod1.so = $(no-as-needed)
-+LDFLAGS-reldep6mod4.so = $(no-as-needed)
-+LDFLAGS-reldep8mod3.so = $(no-as-needed)
-+LDFLAGS-unload4mod1.so = $(no-as-needed)
-+LDFLAGS-unload4mod2.so = $(no-as-needed)
-+LDFLAGS-tst-initorder = $(no-as-needed)
-+LDFLAGS-tst-initordera2.so = $(no-as-needed)
-+LDFLAGS-tst-initordera3.so = $(no-as-needed)
-+LDFLAGS-tst-initordera4.so = $(no-as-needed)
-+LDFLAGS-tst-initorderb2.so = $(no-as-needed)
- LDFLAGS-tst-tlsmod5.so = -nostdlib
- LDFLAGS-tst-tlsmod6.so = -nostdlib
- 
-@@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so)
- vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so)
- 
- $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so
--LDFLAGS-noload = -rdynamic
-+LDFLAGS-noload = -rdynamic $(no-as-needed)
- $(objpfx)noload.out: $(objpfx)testobj5.so
- 
- $(objpfx)noload-mem: $(objpfx)noload.out
-@@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl)
- $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so
- 
- $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl)
-+LDFLAGS-next = $(no-as-needed)
- 
- $(objpfx)unload2: $(libdl)
- $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so
-@@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so
- $(objpfx)order2mod4.so: $(objpfx)order2mod3.so
- $(objpfx)order2mod2.so: $(objpfx)order2mod3.so
- order2mod2.so-no-z-defs = yes
-+LDFLAGS-order2mod1.so = $(no-as-needed)
-+LDFLAGS-order2mod2.so = $(no-as-needed)
- 
- tst-stackguard1-ARGS = --command "$(built-program-cmd) --child"
- tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
-@@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so
- $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so
- $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so
- $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so
-+LDFLAGS-tst-initorder2 = $(no-as-needed)
-+LDFLAGS-tst-initorder2a.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2b.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2c.so = $(no-as-needed)
- define o-iterator-doit
- $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \
- $$(compile-command.c) -DNAME=\"$o\"
-diff --git a/nptl/Makefile b/nptl/Makefile
-index 09acd8a..07a1022 100644
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library)
- $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so
- 
- $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library)
-+LDFLAGS-tst-tls5 = $(no-as-needed)
- LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so
- 
- ifeq ($(build-shared),yes)
-@@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a
- $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a
- endif
- 
--LDFLAGS-tst-cancel24 = -lstdc++
-+LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++
- 
- extra-B-pthread.so = -B$(common-objpfx)nptl/
- $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index 44eb20d..f7811c5 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
- 	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/
- 
- $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so
-+LDFLAGS-tst-putenv = $(no-as-needed)
- 
- $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os
- 	$(build-module)
--- 
-1.7.3.4
-
diff --git a/staging/glibc/glibc-2.15-vdso.patch b/staging/glibc/glibc-2.15-vdso.patch
deleted file mode 100644
index 7fd394f90..000000000
--- a/staging/glibc/glibc-2.15-vdso.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/elf/Makefile b/elf/Makefile
-index 8234ba7..25ffc57 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
- $(objpfx)tst-relsort1mod2.so: $(libm)
- $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
- 			   $(objpfx)tst-relsort1mod2.so
-+
-+tests: $(objpfx)tst-unused-dep.out
-+
-+$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
-+	LD_TRACE_LOADED_OBJECTS=1 \
-+	LD_DEBUG=unused \
-+	LD_PRELOAD= \
-+	$(elf-objpfx)${rtld-installed-name} \
-+	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
-+	  $< > $@
-+	cmp $@ /dev/null > /dev/null
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2e4f97f..3e15447 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1,5 +1,5 @@
- /* Run time dynamic linker.
--   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2012 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
-@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	  _dl_setup_hash (l);
- 	  l->l_relocated = 1;
- 
-+	  /* The vDSO is always used.  */
-+	  l->l_used = 1;
-+
- 	  /* Initialize l_local_scope to contain just this map.  This allows
- 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
- 	     So we create a single entry list pointing to l_real as its only
diff --git a/staging/glibc/glibc-2.15-vfprintf-nargs.patch b/staging/glibc/glibc-2.15-vfprintf-nargs.patch
deleted file mode 100644
index f8dde53f5..000000000
--- a/staging/glibc/glibc-2.15-vfprintf-nargs.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/stdio-common/Makefile b/stdio-common/Makefile
-index a847b28..080badc 100644
---- a/stdio-common/Makefile
-+++ b/stdio-common/Makefile
-@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
- 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
- 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
- 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
--	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
-+	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
-+	 bug-vfprintf-nargs
- 
- test-srcs = tst-unbputc tst-printf
- 
-diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
-new file mode 100644
-index 0000000..13c66c0
---- /dev/null
-+++ b/stdio-common/bug-vfprintf-nargs.c
-@@ -0,0 +1,78 @@
-+/* Test for vfprintf nargs allocation overflow (BZ #13656).
-+   Copyright (C) 2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Kees Cook <keescook@chromium.org>, 2012.
-+
-+   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 <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <unistd.h>
-+#include <inttypes.h>
-+#include <string.h>
-+#include <signal.h>
-+
-+static int
-+format_failed (const char *fmt, const char *expected)
-+{
-+  char output[80];
-+
-+  printf ("%s : ", fmt);
-+
-+  memset (output, 0, sizeof output);
-+  /* Having sprintf itself detect a failure is good.  */
-+  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
-+      && strcmp (output, expected) != 0)
-+    {
-+      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
-+      return 1;
-+    }
-+  puts ("ok");
-+  return 0;
-+}
-+
-+static int
-+do_test (void)
-+{
-+  int rc = 0;
-+  char buf[64];
-+
-+  /* Regular positionals work.  */
-+  if (format_failed ("%1$d", "1") != 0)
-+    rc = 1;
-+
-+  /* Regular width positionals work.  */
-+  if (format_failed ("%1$*2$d", " 1") != 0)
-+    rc = 1;
-+
-+  /* Positional arguments are constructed via read_int, so nargs can only
-+     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
-+     allocate a giant amount of memory and possibly crash, which is the
-+     expected situation.  Since the 64-bit behavior is arch-specific, only
-+     test this on 32-bit systems.  */
-+  if (sizeof (long int) == 4)
-+    {
-+      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
-+      if (format_failed (buf, "1 %$d") != 0)
-+        rc = 1;
-+    }
-+
-+  return rc;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
-index 863cd5d..c802e46 100644
---- a/stdio-common/vfprintf.c
-+++ b/stdio-common/vfprintf.c
-@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
-      0 if unknown.  */
-   int readonly_format = 0;
- 
-+  /* For the argument descriptions, which may be allocated on the heap.  */
-+  void *args_malloced = NULL;
-+
-   /* This table maps a character into a number representing a
-      class.  In each step there is a destination label for each
-      class.  */
-@@ -1647,9 +1650,10 @@ do_positional:
-        determine the size of the array needed to store the argument
-        attributes.  */
-     size_t nargs = 0;
--    int *args_type;
--    union printf_arg *args_value = NULL;
-+    size_t bytes_per_arg;
-+    union printf_arg *args_value;
-     int *args_size;
-+    int *args_type;
- 
-     /* Positional parameters refer to arguments directly.  This could
-        also determine the maximum number of arguments.  Track the
-@@ -1698,13 +1702,38 @@ do_positional:
- 
-     /* Determine the number of arguments the format string consumes.  */
-     nargs = MAX (nargs, max_ref_arg);
-+    /* Calculate total size needed to represent a single argument across
-+       all three argument-related arrays.  */
-+    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
-+                    + sizeof (*args_type);
-+
-+    /* Check for potential integer overflow.  */
-+    if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0))
-+      {
-+         __set_errno (ERANGE);
-+         done = -1;
-+         goto all_done;
-+      }
- 
--    /* Allocate memory for the argument descriptions.  */
--    args_type = alloca (nargs * sizeof (int));
-+    /* Allocate memory for all three argument arrays.  */
-+    if (__libc_use_alloca (nargs * bytes_per_arg))
-+        args_value = alloca (nargs * bytes_per_arg);
-+    else
-+      {
-+        args_value = args_malloced = malloc (nargs * bytes_per_arg);
-+        if (args_value == NULL)
-+          {
-+            done = -1;
-+            goto all_done;
-+          }
-+      }
-+
-+    /* Set up the remaining two arrays to each point past the end of the
-+       prior array, since space for all three has been allocated now.  */
-+    args_size = &args_value[nargs].pa_int;
-+    args_type = &args_size[nargs];
-     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
--	    nargs * sizeof (int));
--    args_value = alloca (nargs * sizeof (union printf_arg));
--    args_size = alloca (nargs * sizeof (int));
-+	    nargs * sizeof (*args_type));
- 
-     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
-        still zero after this loop, format is invalid.  For now we
-@@ -1973,8 +2002,8 @@ do_positional:
-   }
- 
- all_done:
--  if (__builtin_expect (workstart != NULL, 0))
--    free (workstart);
-+  free (args_malloced);
-+  free (workstart);
-   /* Unlock the stream.  */
-   _IO_funlockfile (s);
-   _IO_cleanup_region_end (0);
diff --git a/staging/glibc/glibc-2.16-rpcgen-cpp-path.patch b/staging/glibc/glibc-2.16-rpcgen-cpp-path.patch
deleted file mode 100644
index 822b57294..000000000
--- a/staging/glibc/glibc-2.16-rpcgen-cpp-path.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
-index 06d951a..2103b10 100644
---- a/sunrpc/rpc_main.c
-+++ b/sunrpc/rpc_main.c
-@@ -75,12 +75,9 @@ struct commandline
- 
- static const char *cmdname;
- 
--#define SVR4_CPP "/usr/ccs/lib/cpp"
--#define SUNOS_CPP "/lib/cpp"
--
- static const char *svcclosetime = "120";
- static int cppDefined;	/* explicit path for C preprocessor */
--static const char *CPP = SUNOS_CPP;
-+static const char *CPP = "/lib/cpp";
- static const char CPPFLAGS[] = "-C";
- static char *pathbuf;
- static int cpp_pid;
-@@ -327,23 +324,17 @@ find_cpp (void)
- {
-   struct stat buf;
- 
--  if (stat (CPP, &buf) < 0)
--    {				/* /lib/cpp or explicit cpp does not exist */
--      if (cppDefined)
--	{
--	  fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
--	  crash ();
--	}
--      else
--	{			/* try the other one */
--	  CPP = SVR4_CPP;
--	  if (stat (CPP, &buf) < 0)
--	    {			/* can't find any cpp */
--	      fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
--	      crash ();
--	    }
--	}
-+  if (stat (CPP, &buf) == 0)
-+    return;
-+
-+  if (cppDefined) /* user specified cpp but it does not exist */
-+    {
-+      fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+      crash ();
-     }
-+
-+  /* fall back to system CPP */
-+  CPP = "cpp";
- }
- 
- /*
-@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define)
-       close (1);
-       dup2 (pd[1], 1);
-       close (pd[0]);
--      execv (arglist[0], (char **) arglist);
--      perror ("execv");
-+      execvp (arglist[0], (char **) arglist);
-+      if (errno == ENOENT)
-+        {
-+          fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+          exit (1);
-+        }
-+      perror ("execvp");
-       exit (1);
-     case -1:
-       perror ("fork");
diff --git a/staging/glibc/glibc-__i686.patch b/staging/glibc/glibc-__i686.patch
deleted file mode 100644
index 16f84c536..000000000
--- a/staging/glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c
-index 9c00dc0..f5d4df8 100644
---- a/nptl/sysdeps/pthread/pt-initfini.c
-+++ b/nptl/sysdeps/pthread/pt-initfini.c
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
-
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
-diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
-index 64ef400..726b1df 100644
---- a/sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
-
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
-
- /* For Linux we can use the system call table in the header file
-        /usr/include/asm/unistd.h
diff --git a/staging/glibc/glibc.install b/staging/glibc/glibc.install
deleted file mode 100644
index 7f85ade96..000000000
--- a/staging/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/staging/glibc/locale-gen b/staging/glibc/locale-gen
deleted file mode 100755
index 5aff344c4..000000000
--- a/staging/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/staging/glibc/locale.gen.txt b/staging/glibc/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/staging/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/staging/glibc/nscd.rcd b/staging/glibc/nscd.rcd
deleted file mode 100755
index 4b48ab002..000000000
--- a/staging/glibc/nscd.rcd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name="nscd"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-	start)
-		stat_busy "Starting $daemon_name daemon"
-		PID=$(get_pid)
-		if [[ -z $PID ]]; then
-			rm -f /run/$daemon_name.pid
-			mkdir -p /run/nscd /var/db/nscd
-			rm -f /run/nscd/* /var/db/nscd/*
-			$daemon_name
-			if (( $? > 0 )); then
-				stat_fail
-				exit 1
-			else
-				echo $(get_pid) > /var/run/$daemon_name.pid
-				add_daemon $daemon_name
-				stat_done
-			fi
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-
-	stop)
-		stat_busy "Stopping $daemon_name daemon"
-		PID=$(get_pid)
-		[[ -n $PID ]] && nscd --shutdown &> /dev/null
-		if (( $? > 0 )); then
-			stat_fail
-			exit 1
-		else
-			rm -f /run/$daemon_name.pid &> /dev/null
-			rm_daemon $daemon_name
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 3
-		$0 start
-		;;
-
-	status)
-		stat_busy "Checking $daemon_name status";
-		ck_status $daemon_name
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/staging/glibc/nscd.service b/staging/glibc/nscd.service
deleted file mode 100644
index de5315e9b..000000000
--- a/staging/glibc/nscd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-After=syslog.target
- 
-[Service]
-Type=forking
-ExecStart=/usr/sbin/nscd
-ExecStop=/usr/sbin/nscd --shutdown
-ExecReload=/usr/sbin/nscd -i passwd
-ExecReload=/usr/sbin/nscd -i group
-ExecReload=/usr/sbin/nscd -i hosts
-ExecReload=/usr/sbin/nscd -i service
-Restart=always
-PIDFile=/run/nscd/nscd.pid
- 
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/glibc/nscd.tmpfiles b/staging/glibc/nscd.tmpfiles
deleted file mode 100644
index 8a24a785e..000000000
--- a/staging/glibc/nscd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/nscd 0755 root root
diff --git a/staging/glu/PKGBUILD b/staging/glu/PKGBUILD
deleted file mode 100644
index 1aadbccb1..000000000
--- a/staging/glu/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 166931 2012-09-22 12:55:01Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=glu
-pkgver=9.0.0
-pkgrel=1
-pkgdesc="Mesa OpenGL Utility library"
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/mesa/glu/"
-license=('LGPL')
-depends=('libgl')
-makedepends=('mesa')
-options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/staging/gnome-color-manager/PKGBUILD b/staging/gnome-color-manager/PKGBUILD
deleted file mode 100644
index eb07f67d8..000000000
--- a/staging/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 164427 2012-08-01 05:12:33Z eric $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.4.2
-pkgrel=2
-pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/gnome-color-manager/"
-license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk'
-         'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop')
-makedepends=('intltool' 'gtk-doc')
-install=gnome-color-manager.install
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ad69ac0ac242be0ad5b7966e0c2978a9a1440e52ee816993e4a8eb2cf6f0c922')
-
-build(){
-  cd $pkgname-$pkgver
-
-  # man pages need docbook-sgml, which we don't have
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/gnome-color-manager/gnome-color-manager.install b/staging/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/staging/gnome-color-manager/gnome-color-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-color-manager
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/gnome-python-desktop/PKGBUILD b/staging/gnome-python-desktop/PKGBUILD
deleted file mode 100644
index 4788632d1..000000000
--- a/staging/gnome-python-desktop/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id: PKGBUILD 168784 2012-10-16 00:01:27Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@soulfly.nl>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-
-pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
-pkgver=2.32.0
-pkgrel=11
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
-        gnome-python-desktop-2.32.0-metacity-build.patch)
-sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
-            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
-  make
-}
-
-package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome2-python')
-  pkgdesc="Python bindings for the GNOME desktop environment"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make install-pkgconfigDATA DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomedesktop() {
-  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
-  pkgdesc="Python bindings for gnome-desktop 2.x"
-  conflicts=('python-gnomedesktop<=2.32.0-10')
-  replaces=('python-gnomedesktop<=2.32.0-10')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomedesktop install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomekeyring() {
-  depends=('pygtk' 'libgnome-keyring')
-  pkgdesc="Python bindings for libgnome-keyring"
-  conflicts=('python-gnomekeyring<=2.32.0-10')
-  replaces=('python-gnomekeyring<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomekeyring install DESTDIR="${pkgdir}"
-}
-
-package_python2-gtop() {
-  depends=('pygtk' 'libgtop')
-  pkgdesc="Python bindings for libgtop"
-  conflicts=('python-gtop<=2.32.0-10')
-  replaces=('python-gtop<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gtop install DESTDIR="${pkgdir}"
-}
-
-package_python2-metacity() {
-  depends=('pygtk' 'metacity')
-  pkgdesc="Python bindings for metacity"
-  conflicts=('python-metacity<=2.32.0-10')
-  replaces=('python-metacity<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C metacity install DESTDIR="${pkgdir}"
-}
-
-package_python2-rsvg() {
-  depends=('pygtk' 'librsvg')
-  pkgdesc="Python bindings for librsvg"
-  conflicts=('python-rsvg<=2.32.0-10')
-  replaces=('python-rsvg<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C rsvg install DESTDIR="${pkgdir}"
-  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
-  install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
-package_python2-totem-plparser() {
-  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
-  pkgdesc="Python bindings for totem-plparser"
-  conflicts=('python-totem-plparser<=2.32.0-10')
-  replaces=('python-totem-plparser<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C totem install DESTDIR="${pkgdir}"
-  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
-  install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
-package_python2-wnck() {
-  depends=('pygtk' 'libwnck')
-  pkgdesc="Python bindings for libwnck"
-  conflicts=('python-wnck<=2.32.0-10')
-  replaces=('python-wnck<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C wnck install DESTDIR="${pkgdir}"
-}
diff --git a/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
deleted file mode 100644
index 5054dd2bd..000000000
--- a/staging/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Daniel Drake <dsd@laptop.org>
-
-Fix build against metacity-2.34.2. The port to GSettings
-removed these constants from the codebase.
-
-Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
-===================================================================
---- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
-+++ gnome-python-desktop-2.32.0/metacity/metacity.defs
-@@ -120,32 +120,6 @@
-   )
- )
- 
--(define-enum FocusMode
--  (in-module "Meta")
--  (c-name "MetaFocusMode")
--;   (gtype-id "META_TYPE_FOCUS_MODE")
--  (values
--    '("click" "META_FOCUS_MODE_CLICK")
--    '("sloppy" "META_FOCUS_MODE_SLOPPY")
--    '("mouse" "META_FOCUS_MODE_MOUSE")
--  )
--)
--
--(define-enum ActionTitlebar
--  (in-module "Meta")
--  (c-name "MetaActionTitlebar")
--;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
--  (values
--    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
--    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
--    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
--    '("none" "META_ACTION_TITLEBAR_NONE")
--    '("lower" "META_ACTION_TITLEBAR_LOWER")
--    '("menu" "META_ACTION_TITLEBAR_MENU")
--    '("last" "META_ACTION_TITLEBAR_LAST")
--  )
--)
--
- (define-enum FrameType
-   (in-module "Meta")
-   (c-name "MetaFrameType")
diff --git a/staging/gnucash/PKGBUILD b/staging/gnucash/PKGBUILD
deleted file mode 100644
index 829e4439e..000000000
--- a/staging/gnucash/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165077 2012-08-10 00:52:20Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Mark Schneider <queueRAM@gmail.com>
-
-pkgname=gnucash
-pkgver=2.4.11
-pkgrel=1
-pkgdesc="A personal and small-business financial-accounting application"
-arch=('i686' 'x86_64')
-url="http://www.gnucash.org"
-license=("GPL")
-depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
-makedepends=('intltool')
-optdepends=('evince: for print preview'
-            'perl-finance-quote: for stock information lookups'
-            'perl-date-manip: for stock information lookups')
-options=('!libtool' '!makeflags' '!emptydirs')
-install=gnucash.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c157ad7ea0960c71966f5071acd9018580ece538')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
-    --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  cd src/doc/design
-  make DESTDIR="${pkgdir}" install-info
-
-  install -dm755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnucash "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/staging/gnucash/gnucash.install b/staging/gnucash/gnucash.install
deleted file mode 100644
index d6a48c31b..000000000
--- a/staging/gnucash/gnucash.install
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=gnucash
-info_dir=usr/share/info
-info_files=(gnucash-design.info)
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/staging/gpsd/PKGBUILD b/staging/gpsd/PKGBUILD
deleted file mode 100644
index 0bdb7e748..000000000
--- a/staging/gpsd/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 161333 2012-06-09 19:56:32Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Giacomo Rizzo <alt@free-os.it>
-
-pkgname=gpsd
-pkgver=3.6
-pkgrel=1
-pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
-url="http://catb.org/gpsd/"
-license=('BSD')
-depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
-optdepends=('php: generate a PHP status page for your GPS'
-            'php-gd: image support for the PHP status page'
-            'pygtk: GUI frontends')
-makedepends=('scons' 'docbook-xsl' 'chrpath')
-backup=('etc/conf.d/gpsd')
-options=('!libtool')
-install="${pkgname}.install"
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd' 'gpsd.conf.d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # fix python 2.7 path
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py')
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \
-    gpscat gpsfake gpsprof xgps xgpsspeed
-
-  scons prefix=/usr \
-    systemd=yes \
-    libQgpsmm=no \
-    PYTHONPATH=/usr/bin/python2
-  scons build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Fix man pages path (FS#21715)
-  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
-
-  export DESTDIR="${pkgdir}"
-  scons install
-
-  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
-
-  sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules
-
-  install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
-
-  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
-  install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
-
-  # GPSD needs RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so
-
-  install -D -m644 packaging/X11/xgps.desktop \
-    "${pkgdir}/usr/share/applications/xgps.desktop"
-  install -D -m644 packaging/X11/xgpsspeed.desktop \
-    "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
-  install -D -m644 packaging/X11/gpsd-logo.png \
-    "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
-
-  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
-
-  install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service"
-  install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket"
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-md5sums=('064a5ad75593f8c3ea3fe85010647832'
-         '6473da46f6bad52d38f88670f84cd92b'
-         '6602d04bb037bc500424f00f24f58837'
-         '3e963df3f9f7ef3572ecc648ae829315')
diff --git a/staging/gpsd/gpsd b/staging/gpsd/gpsd
deleted file mode 100755
index 2ca7efe26..000000000
--- a/staging/gpsd/gpsd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd
-
-NAME=gpsd
-DAEMON=/usr/sbin/gpsd
-PIDFILE=/run/gpsd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-
-case "$1" in
-   start)
-	stat_busy "Starting gpsd"
-	[ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /run/gpsd.sock ${GPSD_OPTIONS} ${DEVICES}
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon $NAME
-		stat_done
-	fi
-   ;;
-   stop)
-	stat_busy "Stopping $NAME"
-	[ ! -z "$PID" ]  && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-	    rm -f $PIDFILE &>/dev/null
-	    rm_daemon $NAME
-	    stat_done
-	fi
-   ;;
-
-   restart)
-	$0 stop
-	sleep 2
-	$0 start
-   ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/gpsd/gpsd.conf.d b/staging/gpsd/gpsd.conf.d
deleted file mode 100644
index 9fef72cb9..000000000
--- a/staging/gpsd/gpsd.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default settings for gpsd.
-START_DAEMON="true"
-GPSD_OPTIONS=""
-DEVICES=""
-USBAUTO="true"
diff --git a/staging/gpsd/gpsd.install b/staging/gpsd/gpsd.install
deleted file mode 100644
index 8f20cf484..000000000
--- a/staging/gpsd/gpsd.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/gstreamer0.10-ugly/PKGBUILD b/staging/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index a93aea115..000000000
--- a/staging/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 160680 2012-06-03 16:55:40Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-ugly
-pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.19
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz
-        opencore-amr.patch)
-md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c'
-         'd8feb6c99bfaff8be6b2c48ea4e98e47')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  patch -Np0 -i "${srcdir}/opencore-amr.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
-}
-
-check() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make check
-}
-
-package_gstreamer0.10-ugly() {
-  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.34')
-  
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-ugly-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make -C ext DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gstreamer0.10-ugly/opencore-amr.patch b/staging/gstreamer0.10-ugly/opencore-amr.patch
deleted file mode 100644
index 0a350dc46..000000000
--- a/staging/gstreamer0.10-ugly/opencore-amr.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ext/amrnb/amrnbdec.h.orig	2012-03-12 16:49:14.417405139 +0000
-+++ ext/amrnb/amrnbdec.h	2012-03-12 16:49:35.393899419 +0000
-@@ -22,7 +22,7 @@
- 
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
--#include <interf_dec.h>
-+#include <opencore-amrnb/interf_dec.h>
- 
- G_BEGIN_DECLS
- 
---- ext/amrnb/amrnbenc.h.orig	2012-03-12 16:49:23.833996062 +0000
-+++ ext/amrnb/amrnbenc.h	2012-03-12 16:49:46.597141876 +0000
-@@ -21,7 +21,7 @@
- #define __GST_AMRNBENC_H__
- 
- #include <gst/gst.h>
--#include <interf_enc.h>
-+#include <opencore-amrnb/interf_enc.h>
- #include <gst/audio/gstaudioencoder.h>
- 
- G_BEGIN_DECLS
---- ext/amrwbdec/amrwbdec.h.orig	2012-03-12 16:47:48.658100992 +0000
-+++ ext/amrwbdec/amrwbdec.h	2012-03-12 16:48:12.177910733 +0000
-@@ -22,8 +22,8 @@
- 
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
--#include <dec_if.h>
--#include <if_rom.h>
-+#include <opencore-amrwb/dec_if.h>
-+#include <opencore-amrwb/if_rom.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/staging/gthumb/PKGBUILD b/staging/gthumb/PKGBUILD
deleted file mode 100644
index 1dce3cd09..000000000
--- a/staging/gthumb/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164309 2012-07-30 03:08:17Z eric $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/gthumb"
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base' 'gsettings-desktop-schemas')
-makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
-             'brasero' 'librsvg' 'libopenraw' 'liboauth')
-optdepends=('libopenraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'libsoup-gnome: web albums'
-            'liboauth: web albums')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1fb2939e4896a012c7d0320a31e3c6139214218e9f6ec39c6370febeda94725c')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-libchamplain --enable-libopenraw
-  
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/gthumb/gthumb.install b/staging/gthumb/gthumb.install
deleted file mode 100644
index 9d4e7822f..000000000
--- a/staging/gthumb/gthumb.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.1) < 0 )); then
-    gconfpkg --uninstall gthumb
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/haskell-http/PKGBUILD b/staging/haskell-http/PKGBUILD
deleted file mode 100644
index 5eb7da013..000000000
--- a/staging/haskell-http/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=HTTP
-pkgname=haskell-http
-pkgver=4000.2.4
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('5edcd9fd16a9cb72a140a29442d514b7')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-http/haskell-http.install b/staging/haskell-http/haskell-http.install
deleted file mode 100644
index fdebb1cb8..000000000
--- a/staging/haskell-http/haskell-http.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-http
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-mtl/PKGBUILD b/staging/haskell-mtl/PKGBUILD
deleted file mode 100644
index f1fa7c286..000000000
--- a/staging/haskell-mtl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=mtl
-pkgname=haskell-mtl
-pkgver=2.1.2
-pkgrel=1
-pkgdesc="Monad transformer library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('943c110524d96126bfa0e61f7df1ebcd')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-mtl/haskell-mtl.install b/staging/haskell-mtl/haskell-mtl.install
deleted file mode 100644
index 9325811e8..000000000
--- a/staging/haskell-mtl/haskell-mtl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mtl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-network/PKGBUILD b/staging/haskell-network/PKGBUILD
deleted file mode 100644
index 7f5d13fc1..000000000
--- a/staging/haskell-network/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=network
-pkgname=haskell-network
-pkgver=2.3.1.0
-pkgrel=1
-pkgdesc="Networking-related facilities"
-url="http://hackage.haskell.org/package/network"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d824db8fc068cab60fa178ab330a57a2')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-network/haskell-network.install b/staging/haskell-network/haskell-network.install
deleted file mode 100644
index a56c31d0a..000000000
--- a/staging/haskell-network/haskell-network.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-network
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-parsec/PKGBUILD b/staging/haskell-parsec/PKGBUILD
deleted file mode 100644
index 9c7c1aafb..000000000
--- a/staging/haskell-parsec/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
-
-_hkgname=parsec
-pkgname=haskell-parsec
-pkgver=3.1.3
-pkgrel=1
-pkgdesc="Monadic parser combinators"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d72fc94b81153132c61125a1ec52a4a5')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-parsec/haskell-parsec.install b/staging/haskell-parsec/haskell-parsec.install
deleted file mode 100644
index dfa0701b9..000000000
--- a/staging/haskell-parsec/haskell-parsec.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-parsec
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-random/PKGBUILD b/staging/haskell-random/PKGBUILD
deleted file mode 100644
index 07cc5e2c2..000000000
--- a/staging/haskell-random/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=random
-pkgname=haskell-random
-pkgver=1.0.1.1
-pkgrel=3
-pkgdesc="A basic random number generation library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/staging/haskell-random/haskell-random.install b/staging/haskell-random/haskell-random.install
deleted file mode 100644
index b6d807e1a..000000000
--- a/staging/haskell-random/haskell-random.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-random
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-text/PKGBUILD b/staging/haskell-text/PKGBUILD
deleted file mode 100644
index 5a23030d5..000000000
--- a/staging/haskell-text/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=text
-pkgname=haskell-text
-pkgver=0.11.2.3
-pkgrel=1
-pkgdesc="An efficient packed Unicode text type."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-text/haskell-text.install b/staging/haskell-text/haskell-text.install
deleted file mode 100644
index 620db3921..000000000
--- a/staging/haskell-text/haskell-text.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-text
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-transformers/PKGBUILD b/staging/haskell-transformers/PKGBUILD
deleted file mode 100644
index 51822a8ad..000000000
--- a/staging/haskell-transformers/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 166465 2012-09-08 07:26:25Z tdziedzic $
-
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Rémy Oudompheng <remy@archlinux.org>
-
-_hkgname=transformers
-pkgname=haskell-transformers
-pkgver=0.3.0.0
-pkgrel=2
-pkgdesc="Concrete functor and monad transformers"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
-install=${pkgname}.install
-md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-transformers/haskell-transformers.install b/staging/haskell-transformers/haskell-transformers.install
deleted file mode 100644
index eec2af6e1..000000000
--- a/staging/haskell-transformers/haskell-transformers.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-transformers
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/haskell-zlib/PKGBUILD b/staging/haskell-zlib/PKGBUILD
deleted file mode 100644
index 30834b3c1..000000000
--- a/staging/haskell-zlib/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package originally generated by cabal2arch 0.7.6
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.3.3
-pkgrel=5
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'zlib' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    # ghc 7.6 includes bytestring 0.10
-    sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/staging/haskell-zlib/haskell-zlib.install b/staging/haskell-zlib/haskell-zlib.install
deleted file mode 100644
index d387b7b65..000000000
--- a/staging/haskell-zlib/haskell-zlib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD
deleted file mode 100644
index ce710b619..000000000
--- a/staging/hugin/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169361 2012-10-20 05:11:16Z 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=7
-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' 'mesa')
-install=hugin.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        gcc47.patch)
-sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b'
-          'aa0fc9425bd7a4b5e270412f4ca72258fac77298')
-
-build() {
-  cd "${srcdir}"
-  patch -Np0 -i gcc47.patch
-  mkdir build
-  cd build
-  export CXXFLAGS+=" -fpermissive" 
-  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/gcc47.patch b/staging/hugin/gcc47.patch
deleted file mode 100644
index 3814b871c..000000000
--- a/staging/hugin/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp
---- hugin-2011.4.0.orig/src/celeste/Utilities.cpp	2012-07-08 15:18:16.864454043 +0000
-+++ hugin-2011.4.0/src/celeste/Utilities.cpp	2012-07-08 15:18:20.341089422 +0000
-@@ -27,6 +27,7 @@
- 
- #include <math.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include "Utilities.h"
- 
- using namespace std; 
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/ifuse/PKGBUILD b/staging/ifuse/PKGBUILD
deleted file mode 100644
index 6ee370576..000000000
--- a/staging/ifuse/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 74529 2012-07-29 23:09:58Z tomegun $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=ifuse
-pkgver=1.1.2
-pkgrel=2
-pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
-url='http://libimobiledevice.org/'
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-depends=('libimobiledevice' 'fuse')
-source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('4152526b2ac3c505cb41797d997be14d')
-
-build() {
-  cd "${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/ilmbase/PKGBUILD b/staging/ilmbase/PKGBUILD
deleted file mode 100644
index fe1618f48..000000000
--- a/staging/ilmbase/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=ilmbase
-pkgver=1.0.3
-pkgrel=1
-depends=('gcc-libs')
-pkgdesc="Base libraries from ILM for OpenEXR"
-arch=(i686 x86_64)
-url="http://www.openexr.com"
-license=('custom')
-options=('!libtool')
-source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz 
-        ilmbase-IexMath.patch)
-md5sums=('d99962ec7e2bfac0647aaabf6b91d5de'
-         '9c8efaf15f60bccf79749ec879657962')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  patch -p0 -i "${srcdir}/ilmbase-IexMath.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  # one of the tests fails randomly for an unknown reason
-  make check || true
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/staging/ilmbase/ilmbase-IexMath.patch b/staging/ilmbase/ilmbase-IexMath.patch
deleted file mode 100644
index 546034966..000000000
--- a/staging/ilmbase/ilmbase-IexMath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
-+++ IexMath/IexMathFpu.cpp	2012-10-04 15:30:47.000000000 +0200
-@@ -27,8 +27,7 @@
- #endif
- 
- 
--#ifdef HAVE_UCONTEXT_H
--
-+#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
- 
- #include <ucontext.h>
- #include <signal.h>
diff --git a/staging/imagemagick/PKGBUILD b/staging/imagemagick/PKGBUILD
deleted file mode 100644
index 04ce425a9..000000000
--- a/staging/imagemagick/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 169345 2012-10-20 00:21:55Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.0.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
-source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-        perlmagick.rpath.patch)
-sha1sums=('47926535dd68b38f5ae8a01e470cebf671018831'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
-
-build() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf --force --install
-  patch -p0 -i ../perlmagick.rpath.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --disable-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" --with-lqr --with-rsvg \
-    --without-gvc --without-djvu --without-autotrace --without-webp \
-    --without-jbig --without-fpx --without-dps --without-fftw
-  make
-}
-
-check() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-#  make check
-}
-
-package_imagemagick() {
-  pkgdesc="An image viewing/manipulation program"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr')
-  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/quantization-table.xml'
-          'etc/ImageMagick/thresholds.xml'
-          'etc/ImageMagick/type.xml'
-          'etc/ImageMagick/type-dejavu.xml'
-          'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml')
-  options=('!docs' 'libtool' '!emptydirs')
-
-  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)"
-
-  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/inkscape/PKGBUILD b/staging/inkscape/PKGBUILD
deleted file mode 100644
index 2dfb0e8c7..000000000
--- a/staging/inkscape/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 169480 2012-10-21 23:53:47Z bisson $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.3.1
-pkgrel=7
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
-         'python2' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('pstoedit: latex formulas'
-            'texlive-core: latex formulas'
-            'python2-numpy: some extensions'
-            'python2-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"
-        'poppler20.patch'
-        'libpng15.patch')
-sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
-          '7316c2903c157781838cce289a709d100dc40fec'
-          '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 ../poppler20.patch
-	patch -p1 -i ../libpng15.patch
-
-	./configure \
-		--prefix=/usr \
-		--with-python \
-		--with-perl \
-		--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/inkscape/poppler20.patch b/staging/inkscape/poppler20.patch
deleted file mode 100644
index ecb74603f..000000000
--- a/staging/inkscape/poppler20.patch
+++ /dev/null
@@ -1,642 +0,0 @@
-diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp
---- old/src/extension/internal/pdfinput/pdf-parser.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/pdf-parser.cpp	2012-05-13 21:07:11.334781215 +0200
-@@ -367,14 +367,14 @@
-     for (i = 0; i < obj->arrayGetLength(); ++i) {
-       obj->arrayGet(i, &obj2);
-       if (!obj2.isStream()) {
--	error(-1, const_cast<char*>("Weird page contents"));
-+	error(errInternal, -1, const_cast<char*>("Weird page contents"));
- 	obj2.free();
- 	return;
-       }
-       obj2.free();
-     }
-   } else if (!obj->isStream()) {
--    error(-1, const_cast<char*>("Weird page contents"));
-+    error(errInternal, -1, const_cast<char*>("Weird page contents"));
-     return;
-   }
-   parser = new Parser(xref, new Lexer(xref, obj), gFalse);
-@@ -419,7 +419,7 @@
- 
-     // too many arguments - something is wrong
-     } else {
--      error(getPos(), const_cast<char*>("Too many args in content stream"));
-+      error(errInternal, getPos(), const_cast<char*>("Too many args in content stream"));
-       if (printCommands) {
- 	printf("throwing away arg: ");
- 	obj.print(stdout);
-@@ -436,7 +436,7 @@
- 
-   // args at end with no command
-   if (numArgs > 0) {
--    error(getPos(), const_cast<char*>("Leftover args in content stream"));
-+    error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream"));
-     if (printCommands) {
-       printf("%d leftovers:", numArgs);
-       for (i = 0; i < numArgs; ++i) {
-@@ -502,7 +502,7 @@
-   name = cmd->getCmd();
-   if (!(op = findOp(name))) {
-     if (ignoreUndef == 0)
--      error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-+      error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-     return;
-   }
- 
-@@ -510,26 +510,26 @@
-   argPtr = args;
-   if (op->numArgs >= 0) {
-     if (numArgs < op->numArgs) {
--      error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-+      error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-       return;
-     }
-     if (numArgs > op->numArgs) {
- #if 0
--      error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
-+      error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
- #endif
-       argPtr += numArgs - op->numArgs;
-       numArgs = op->numArgs;
-     }
-   } else {
-     if (numArgs > -op->numArgs) {
--      error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
-+      error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
- 	    numArgs, name);
-       return;
-     }
-   }
-   for (i = 0; i < numArgs; ++i) {
-     if (!checkArg(&argPtr[i], op->tchk[i])) {
--      error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
-+      error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
- 	    i, name, argPtr[i].getTypeName());
-       return;
-     }
-@@ -690,7 +690,7 @@
-     return;
-   }
-   if (!obj1.isDict()) {
--    error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-+    error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-     obj1.free();
-     return;
-   }
-@@ -705,7 +705,7 @@
-     if (state->parseBlendMode(&obj2, &mode)) {
-       state->setBlendMode(mode);
-     } else {
--      error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -764,7 +764,7 @@
-       state->setTransfer(funcs);
-     }
-   } else if (!obj2.isNull()) {
--    error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-+    error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-   }
-   obj2.free();
- 
-@@ -784,7 +784,7 @@
- 	funcs[0] = Function::parse(&obj3);
- 	if (funcs[0]->getInputSize() != 1 ||
- 	    funcs[0]->getOutputSize() != 1) {
--	  error(getPos(),
-+	  error(errInternal, getPos(),
- 		const_cast<char*>("Invalid transfer function in soft mask in ExtGState"));
- 	  delete funcs[0];
- 	  funcs[0] = NULL;
-@@ -809,11 +809,7 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
--#else
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
--#endif
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -840,15 +836,15 @@
- 	    delete funcs[0];
- 	  }
- 	} else {
--	  error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	  error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
- 	}
- 	obj4.free();
-       } else {
--	error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-       }
-       obj3.free();
-     } else if (!obj2.isNull()) {
--      error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -876,7 +872,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -884,7 +880,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &obj1);
-   if (!obj1.isArray()) {
-     obj1.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -1012,19 +1008,11 @@
- 
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setFillColorSpace(colorSpace);
-@@ -1032,7 +1020,7 @@
-     state->setFillColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (fill)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)"));
-   }
- }
- 
-@@ -1043,19 +1031,11 @@
- 
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setStrokeColorSpace(colorSpace);
-@@ -1063,7 +1043,7 @@
-     state->setStrokeColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (stroke)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)"));
-   }
- }
- 
-@@ -1072,7 +1052,7 @@
-   int i;
- 
-   if (numArgs != state->getFillColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-     return;
-   }
-   state->setFillPattern(NULL);
-@@ -1088,7 +1068,7 @@
-   int i;
- 
-   if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-     return;
-   }
-   state->setStrokePattern(NULL);
-@@ -1109,7 +1089,7 @@
-       if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1120,23 +1100,15 @@
-       state->setFillColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setFillPattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getFillColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-       return;
-     }
-     state->setFillPattern(NULL);
-@@ -1161,7 +1133,7 @@
- 	       ->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1172,23 +1144,15 @@
-       state->setStrokeColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setStrokePattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-       return;
-     }
-     state->setStrokePattern(NULL);
-@@ -1212,7 +1176,7 @@
- 
- void PdfParser::opLineTo(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in lineto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in lineto"));
-     return;
-   }
-   state->lineTo(args[0].getNum(), args[1].getNum());
-@@ -1222,7 +1186,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1238,7 +1202,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto1"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto1"));
-     return;
-   }
-   x1 = state->getCurX();
-@@ -1254,7 +1218,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto2"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto2"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1282,7 +1246,7 @@
- 
- void PdfParser::opClosePath(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in closepath"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in closepath"));
-     return;
-   }
-   state->closePath();
-@@ -1298,7 +1262,7 @@
- 
- void PdfParser::opStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1314,7 +1278,7 @@
- 
- void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke"));
-     return;
-   }
-   state->closePath();
-@@ -1331,7 +1295,7 @@
- 
- void PdfParser::opFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1347,7 +1311,7 @@
- 
- void PdfParser::opEOFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1363,7 +1327,7 @@
- 
- void PdfParser::opFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1376,7 +1340,7 @@
- 
- void PdfParser::opCloseFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1388,7 +1352,7 @@
- 
- void PdfParser::opEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1399,7 +1363,7 @@
- 
- void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1440,7 +1404,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1459,7 +1423,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1579,15 +1543,9 @@
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-     return;
-   }
--#else
--  if (!(shading = res->lookupShading(args[0].getName()))) {
--    return;
--  }
--#endif
- 
-   // save current graphics state
-   if (shading->getType() != 2 && shading->getType() != 3) {
-@@ -2156,7 +2114,7 @@
- 
- void PdfParser::opShowText(Object args[], int numArgs) {
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2170,7 +2128,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2188,7 +2146,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/set/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/set/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2211,7 +2169,7 @@
-   int i;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show/space"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show/space"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2236,7 +2194,7 @@
-     } else if (obj.isString()) {
-       doShowText(obj.getString());
-     } else {
--      error(getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-+      error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-     }
-     obj.free();
-   }
-@@ -2334,7 +2292,7 @@
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
--	  error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
-+	  error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
- 	}
- 	//out->endType3Char(state);
- 	if (resDict) {
-@@ -2410,7 +2368,7 @@
-     return;
-   }
-   if (!obj1.isStream()) {
--    error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-+    error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-     obj1.free();
-     return;
-   }
-@@ -2426,9 +2384,9 @@
- /*    out->psXObject(obj1.getStream(),
-     		   obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
-   } else if (obj2.isName()) {
--    error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-+    error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-   } else {
--    error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-+    error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-   }
-   obj2.free();
-   obj1.free();
-@@ -2559,11 +2517,7 @@
-       }
-     }
-     if (!obj1.isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       colorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      colorSpace = GfxColorSpace::parse(&obj1);
--#endif
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2648,11 +2602,7 @@
- 	  obj2.free();
- 	}
-       }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      maskColorSpace = GfxColorSpace::parse(&obj1);
--#endif
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2758,7 +2708,7 @@
-  err2:
-   obj1.free();
-  err1:
--  error(getPos(), const_cast<char*>("Bad image parameters"));
-+  error(errInternal, getPos(), const_cast<char*>("Bad image parameters"));
- }
- 
- void PdfParser::doForm(Object *str) {
-@@ -2783,7 +2733,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -2791,7 +2741,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &bboxObj);
-   if (!bboxObj.isArray()) {
-     bboxObj.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -2827,11 +2777,7 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
--#else
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
--#endif
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
-@@ -2990,7 +2936,7 @@
-   parser->getObj(&obj);
-   while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
-     if (!obj.isName()) {
--      error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-+      error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-       obj.free();
-     } else {
-       key = copyString(obj.getName());
-@@ -3005,7 +2951,7 @@
-     parser->getObj(&obj);
-   }
-   if (obj.isEOF()) {
--    error(getPos(), const_cast<char*>("End of file in inline image"));
-+    error(errInternal, getPos(), const_cast<char*>("End of file in inline image"));
-     obj.free();
-     dict.free();
-     return NULL;
-@@ -3020,11 +2966,11 @@
- }
- 
- void PdfParser::opImageData(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'ID' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator"));
- }
- 
- void PdfParser::opEndImage(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'EI' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator"));
- }
- 
- //------------------------------------------------------------------------
-diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp
---- old/src/extension/internal/pdfinput/svg-builder.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/svg-builder.cpp	2012-05-13 20:45:22.303804308 +0200
-@@ -961,9 +961,7 @@
-     _font_style = sp_repr_css_attr_new();
-     GfxFont *font = state->getFont();
-     // Store original name
--    if (font->getOrigName()) {
--        _font_specification = font->getOrigName()->getCString();
--    } else if (font->getName()) {
-+    if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-     } else {
-         _font_specification = (char*) "Arial";
diff --git a/staging/isl/PKGBUILD b/staging/isl/PKGBUILD
deleted file mode 100644
index 0f946e67b..000000000
--- a/staging/isl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161820 2012-06-15 04:14:28Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=isl
-pkgver=0.10
-pkgrel=1
-pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
-arch=('i686' 'x86_64')
-url="http://www.kotnet.org/~skimo/isl/"
-license=('LGPL2.1')
-options=('!libtool')
-source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('c1ece653891bb2a5f55ca25e3f4e8f35')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 DESTDIR="$pkgdir/" install
-
-  install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/
-  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.0.0-gdb.py
-}
diff --git a/staging/k3b/PKGBUILD b/staging/k3b/PKGBUILD
deleted file mode 100644
index e22f80e9d..000000000
--- a/staging/k3b/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 160702 2012-06-04 03:41:19Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=k3b
-pkgver=2.0.2
-pkgrel=5
-pkgdesc="Feature-rich and easy to handle CD burning application"
-arch=('i686' 'x86_64')
-url="http://k3b.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'kdemultimedia-kioslave' 'libsamplerate' 'libmad'
-         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft')
-makedepends=('cmake' 'automoc4' 'docbook-xml')
-optdepends=('dvd+rw-tools: for dvd burning support'
-            'vcdimager: for vcd burning support'
-            'transcode: for advanced mpeg conversion support'
-            'emovix: for bootable multimedia cd/dvd support'
-            'cdrdao: for disk-at-once (DAO) mode support')
-options=('!libtool')
-install=k3b.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch)
-sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
-          '8120c0e22e6c41ea285ca6060be13723ed91c52b'
-          '5b35bff3f7670686a32bd71afea2deaca4331631')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch"
-  patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch"
-  cd ..
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/k3b/k3b-2.0.2-ffmpeg.patch b/staging/k3b/k3b-2.0.2-ffmpeg.patch
deleted file mode 100644
index 2878b1edc..000000000
--- a/staging/k3b/k3b-2.0.2-ffmpeg.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-commit 61ca30beb978f68e72257408777c6433f33129bd
-Author: Michal Malek <michalm@jabster.pl>
-Date:   Sun Aug 28 20:18:53 2011 +0200
-
-    Fixed compilation with new FFMPEG
-    
-    BUG: 274817
-    FIXED-IN: 2.0.3
-
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-index 0ad59fc..0c5f366 100644
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
- #else
-     ::AVCodecContext* codecContext =  d->formatContext->streams[0]->codec;
- #endif
--    if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
-+    if( codecContext->codec_type != 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+        AVMEDIA_TYPE_AUDIO)
-+#else
-+        CODEC_TYPE_AUDIO)
-+#endif
-+    {
-         kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
-         return false;
-     }
-@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
- QString K3bFFMpegFile::title() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->title[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->title );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
- QString K3bFFMpegFile::author() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->author[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->author );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
- QString K3bFFMpegFile::comment() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->comment[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->comment );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
- #if LIBAVCODEC_VERSION_MAJOR < 52
-         int len = ::avcodec_decode_audio(
- #else
-+   #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+        int len = ::avcodec_decode_audio3(
-+   #else
-         int len = ::avcodec_decode_audio2(
-+   #endif
- #endif
-+
- #ifdef FFMPEG_BUILD_PRE_4629
-             &d->formatContext->streams[0]->codec,
- #else
-@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
- #endif
-             (short*)d->alignedOutputBuffer,
-             &d->outputBufferSize,
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            &d->packet );
-+#else
-             d->packetData, d->packetSize );
-+#endif
- 
-         if( d->packetSize <= 0 || len < 0 )
-             ::av_free_packet( &d->packet );
diff --git a/staging/k3b/k3b-2.0.2-libavformat54.patch b/staging/k3b/k3b-2.0.2-libavformat54.patch
deleted file mode 100644
index 174a776b8..000000000
--- a/staging/k3b/k3b-2.0.2-libavformat54.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-===================================================================
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
-     close();
- 
-     // open the file
--    int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
-+    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
-     if( err < 0 ) {
-         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
-         return false;
-@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
-     }
- 
-     // dump some debugging info
--    ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-+    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
- 
-     return true;
- }
diff --git a/staging/k3b/k3b.install b/staging/k3b/k3b.install
deleted file mode 100644
index 413ad60f7..000000000
--- a/staging/k3b/k3b.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-mime-database usr/share/mime  &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/kactivities/PKGBUILD b/staging/kactivities/PKGBUILD
deleted file mode 100644
index 6e12edcc9..000000000
--- a/staging/kactivities/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 160981 2012-06-07 20:18:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kactivities
-pkgver=4.8.4
-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.xz")
-sha1sums=('3f42c18bae5a1d6bbd7fca471d8b4f9755875e06')
-
-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/kdeaccessibility-jovie/PKGBUILD b/staging/kdeaccessibility-jovie/PKGBUILD
deleted file mode 100644
index 3916ba424..000000000
--- a/staging/kdeaccessibility-jovie/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 161001 2012-06-07 20:31:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-jovie
-pkgver=4.8.4
-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.xz")
-sha1sums=('d9d829c09312bc6f962c36521629ba1bee8f1431')
-
-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/staging/kdeaccessibility-jovie/kdeaccessibility-jovie.install b/staging/kdeaccessibility-jovie/kdeaccessibility-jovie.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeaccessibility-kaccessible/PKGBUILD b/staging/kdeaccessibility-kaccessible/PKGBUILD
deleted file mode 100644
index 3d60899b7..000000000
--- a/staging/kdeaccessibility-kaccessible/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 161002 2012-06-07 20:32:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kaccessible
-pkgver=4.8.4
-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.xz")
-sha1sums=('d467fa3857b2c5a2aa3a5421b5d7c74fe3c7f981')
-
-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/staging/kdeaccessibility-kmag/PKGBUILD b/staging/kdeaccessibility-kmag/PKGBUILD
deleted file mode 100644
index d57d99c8b..000000000
--- a/staging/kdeaccessibility-kmag/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161003 2012-06-07 20:32:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmag
-pkgver=4.8.4
-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.xz")
-sha1sums=('7b5b51422d4241d6303841805a04b2eace0c7a2d')
-
-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/staging/kdeaccessibility-kmag/kdeaccessibility-kmag.install b/staging/kdeaccessibility-kmag/kdeaccessibility-kmag.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeaccessibility-kmousetool/PKGBUILD b/staging/kdeaccessibility-kmousetool/PKGBUILD
deleted file mode 100644
index 46e295f53..000000000
--- a/staging/kdeaccessibility-kmousetool/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161004 2012-06-07 20:32:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmousetool
-pkgver=4.8.4
-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.xz")
-sha1sums=('6667336267a3a65bf0b33a8454299558ad458108')
-
-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/staging/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install b/staging/kdeaccessibility-kmousetool/kdeaccessibility-kmousetool.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeaccessibility-kmouth/PKGBUILD b/staging/kdeaccessibility-kmouth/PKGBUILD
deleted file mode 100644
index 07523ee30..000000000
--- a/staging/kdeaccessibility-kmouth/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161005 2012-06-07 20:33:11Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmouth
-pkgver=4.8.4
-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.xz")
-sha1sums=('104bb2c434deabbaa57326fe567fc90c4067f36c')
-
-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/staging/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install b/staging/kdeaccessibility-kmouth/kdeaccessibility-kmouth.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD
deleted file mode 100644
index 20da86dd5..000000000
--- a/staging/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 161006 2012-06-07 20:33:40Z 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.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'syslog-path.patch')
-sha1sums=('b825e40b29b4ae684265cb13b7935737d7ae6d68'
-          '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=('kdebase-runtime' 'kdepimlibs')
-	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-python2' 'system-config-printer-common' '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/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeadmin/kdeadmin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/staging/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~	2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h	2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- 		SystemConfiguration() :
- 			GenericLogModeConfiguration(
- 					QLatin1String( SYSTEM_LOG_MODE_ID ),
--					QStringList() << QLatin1String( "/var/log/syslog" ),
-+					QStringList() << QLatin1String( "/var/log/messages.log" ),
- 					QList<int>() << INFORMATION_LOG_LEVEL_ID
- 			) {
- 
diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD
deleted file mode 100644
index 721a2c411..000000000
--- a/staging/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 161007 2012-06-07 20:34:11Z 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.4
-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.xz")
-sha1sums=('c7e15538d3141af8673d16f498c6af7bff62a87f')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeartwork-aurorae() {
-	pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
-	cd $srcdir/build/aurorae
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
-	pkgdesc='KDE color schemes'
-    replaces=('kdeaccessibility-colorschemes')
-	cd $srcdir/build/ColorSchemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
-	pkgdesc='KDE desktop themes'
-	cd $srcdir/build/desktopthemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
-	pkgdesc='KDE emoticons'
-	cd $srcdir/build/emoticons
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
-	pkgdesc='KDE icon themes'
-    replaces=('kdeaccessibility-iconthemes')
-	cd $srcdir/build/IconThemes
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
-	pkgdesc='KDE screensaver'
-	depends=('kdebase-workspace' 'libkexiv2')
-	cd $srcdir/build/kscreensaver
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
-	pkgdesc='KDE sounds'
-	cd $srcdir/build/sounds
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
-	pkgdesc='KDE styles'
-	depends=('kdebase-workspace')
-	cd $srcdir/build/styles
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kwin-styles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
-	pkgdesc='KDE wallpapers'
-	cd $srcdir/build/wallpapers
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/HighResolutionWallpapers
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
-	pkgdesc='KDE weather wallpapers'
-	cd $srcdir/build/WeatherWallpapers
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD
deleted file mode 100644
index d6694aca5..000000000
--- a/staging/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 161008 2012-06-07 20:38:54Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.8.4
-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' 'kdebase-lib')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('a5900aa089a28fcaa69b45cfc7b46f556a38bd11')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../konsole-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
deleted file mode 100644
index 3bb05e66b..000000000
--- a/staging/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 164640 2012-08-01 17:28:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.9.0
-pkgrel=2
-pkgdesc="Plugins and applications necessary for the running of KDE applications"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-runtime'
-license=('GPL' 'LGPL')
-depends=('kdepimlibs' 'nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
-'xorg-xauth' 'kactivities')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'openslp' 'doxygen' 'networkmanager')
-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.xz")
-sha1sums=('89a9e5c7e52cb925217b45a568a354cc041bc28d')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_QNtrack=OFF \
-        -DWITH_Xine=OFF
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-
-    ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdebase-runtime/kdebase-runtime.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/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
deleted file mode 100644
index 23b69758b..000000000
--- a/staging/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 169062 2012-10-17 16:13:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.9.2
-pkgrel=5
-pkgdesc="Provides the interface and basic tools for the KDE workspace"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-workspace'
-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' 'xorg-xprop' 'libxdamage'
-         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
-         'xorg-xmessage' 'libusb-compat' 'kde-base-artwork')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'logind-support.patch')
-sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          '660eae40a707d2711d8d7f32a93214865506b795'
-          'b7980f2e199963caf8e92b499042d244ece2fca0'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
-          'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
-          'c079ebd157c836ba996190f0d2bcea1a7828d02c'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
-          'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
-
-build() {
-	cd ${_pkgname}-${pkgver}
-
-    # reads the shell scripts in /etc/kde/
-    patch -p0 -i "${srcdir}"/etc-scripts.patch
-    # FS#26120
-	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-
-    # KDEBUG#202629
-	patch -p0 -i "${srcdir}"/terminate-server.patch
-    # KDEBUG#307412 (fixed upstream)
-    patch -p1 -i "${srcdir}"/logind-support.patch
-
-    cd ../
-
-	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 \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DWITH_CkConnector=OFF
-	make
-}
-
-package() {
-	cd build
-	make DESTDIR="${pkgdir}" install
-
-	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
-    install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
-    install -D -m644 "${srcdir}"/kdm.service \
-      "${pkgdir}"/usr/lib/systemd/system/kdm.service
-    install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
-}
diff --git a/staging/kdebase-workspace/etc-scripts.patch b/staging/kdebase-workspace/etc-scripts.patch
deleted file mode 100644
index 903a90a53..000000000
--- a/staging/kdebase-workspace/etc-scripts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/staging/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2 
- export MALLOC_CHECK_
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`$bindir/kde4-config --qt-binaries`
--  if [ -n "$qbindir" ]; then
--    case $PATH in
--      $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
--      *) PATH=$qbindir:$PATH; export PATH;;
--    esac
--  fi
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
- 
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
-   for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
deleted file mode 100644
index eccaa08f4..000000000
--- a/staging/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
-auth		required	pam_shells.so
-auth		requisite	pam_nologin.so
-auth		required	pam_env.so
-auth		optional	pam_permit.s
-
-account		include      system-login
-
-password	include      system-login
-
-session		include      system-login
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
deleted file mode 100644
index a0a29483d..000000000
--- a/staging/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		include		system-login
-
-account		include		system-login
-
-password	include		system-login
-
-session		include		system-login
diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/staging/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-	groupadd -g 135 kdm &>/dev/null
-	useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &>/dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
-	getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
-	chown -R 135:135 var/lib/kdm &>/dev/null
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_remove() {
-	if getent passwd kdm >/dev/null 2>&1; then
-	  userdel kdm
-	fi
-	if getent group kdm >/dev/null 2>&1; then
-	  groupdel kdm
-	fi
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/staging/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
-  start)
-    stat_busy "Starting KDE Desktop Manager"
-    [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon kdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping KDE Desktop Manager"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon kdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch
deleted file mode 100644
index f5fc0e571..000000000
--- a/staging/kdebase-workspace/kdm-xinitrd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~	2011-10-04 22:11:24.787771512 +0000
-+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c	2011-10-04 22:13:58.612702824 +0000
-@@ -742,6 +742,15 @@
- "[ -f /etc/xprofile ] && . /etc/xprofile\n"
- "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
- "\n"
-+"# run all system xinitrc shell scripts.\n"
-+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
-+"  for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
-+"  if [ -x \"$i\" ]; then\n"
-+"    . \"$i\"\n"
-+"  fi\n"
-+"  done\n"
-+"fi\n"
-+"\n"
- "if [ -d /etc/X11/Xresources ]; then\n"
- "  for i in /etc/X11/Xresources/*; do\n"
- "    [ -f $i ] && xrdb -merge $i\n"
diff --git a/staging/kdebase-workspace/kdm.logrotate b/staging/kdebase-workspace/kdm.logrotate
deleted file mode 100644
index 34331feae..000000000
--- a/staging/kdebase-workspace/kdm.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/kdm.log {
-    maxage 365
-    size=+1024k
-    notifempty
-    missingok
-}
diff --git a/staging/kdebase-workspace/kdm.service b/staging/kdebase-workspace/kdm.service
deleted file mode 100644
index c57aba920..000000000
--- a/staging/kdebase-workspace/kdm.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=K Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/kdm -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/staging/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix_auth.so
diff --git a/staging/kdebase-workspace/logind-support.patch b/staging/kdebase-workspace/logind-support.patch
deleted file mode 100644
index 9de205400..000000000
--- a/staging/kdebase-workspace/logind-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Lukas Tinkl <lukas@kde.org>
-Date: Fri, 05 Oct 2012 09:57:13 +0000
-Subject: store the filedescriptor in a member variable
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1
----
-store the filedescriptor in a member variable
-
-make systemd-inhibit work as intended, PowerDevil now handles
-power/sleep/lid buttons as intended
-
-BUG: 307412
----
-
-
---- a/powerdevil/daemon/powerdevilpolicyagent.cpp
-+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
-@@ -29,7 +29,6 @@
- #include <QtDBus/QDBusPendingReply>
- #include <QtDBus/QDBusConnectionInterface>
- #include <QtDBus/QDBusServiceWatcher>
--#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <KGlobal>
- #include <KDebug>
-@@ -225,6 +224,9 @@
-         onActiveSessionChanged(m_activeSessionPath);
- 
-         // inhibit systemd handling of power/sleep/lid buttons
-+        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
-+        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
-+
-         QVariantList args;
-         args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
-         args << "PowerDevil"; // who
-@@ -232,8 +234,9 @@
-         args << "block"; // mode
-         QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
-         desc.waitForFinished();
--        if (desc.isValid() && desc.value().isValid()) {
--            kDebug() << "systemd powersave events handling inhibited";
-+        if (desc.isValid()) {
-+            m_systemdInhibitFd = desc.value();
-+            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
-         }
-         else
-             kWarning() << "failed to inhibit systemd powersave handling";
-
---- a/powerdevil/daemon/powerdevilpolicyagent.h
-+++ b/powerdevil/daemon/powerdevilpolicyagent.h
-@@ -27,6 +27,7 @@
- #include <QtCore/QWeakPointer>
- 
- #include <QtDBus/QDBusContext>
-+#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <kdemacros.h>
- 
-@@ -108,6 +109,7 @@
-     QString m_activeSessionPath;
-     QWeakPointer< QDBusInterface > m_sdSessionInterface;
-     QWeakPointer< QDBusInterface > m_sdSeatInterface;
-+    QDBusUnixFileDescriptor m_systemdInhibitFd;
- 
-     // ConsoleKit support
-     bool m_ckAvailable;
-
diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/staging/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def	2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def	2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
- 
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD
deleted file mode 100644
index 68efa7ac1..000000000
--- a/staging/kdebase/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 160993 2012-06-07 20:27:36Z 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.4
-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.xz")
-sha1sums=('a1d6951b27c868c738a36dbd21702b658f3d6245')
-
-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/staging/kdebase/kdebase-dolphin.install b/staging/kdebase/kdebase-dolphin.install
deleted file mode 100644
index 660593cf5..000000000
--- a/staging/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/staging/kdebase/kdebase-konqueror.install b/staging/kdebase/kdebase-konqueror.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdebase/kdebase.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdebindings-kimono/PKGBUILD b/staging/kdebindings-kimono/PKGBUILD
deleted file mode 100644
index 5ac4fb7a7..000000000
--- a/staging/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161009 2012-06-07 20:39:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.8.4
-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.xz")
-sha1sums=('9c8e41ebcec01cede7987958bb4d7ce775587e45')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kimono-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Soprano=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-korundum/PKGBUILD b/staging/kdebindings-korundum/PKGBUILD
deleted file mode 100644
index 154443486..000000000
--- a/staging/kdebindings-korundum/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 161010 2012-06-07 20:39:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-korundum
-pkgver=4.8.4
-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')
-options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz"
-        'korundum-4.8.0-ruby19.patch')
-sha1sums=('ce722ea7c64ce90d11370e393a87cb067962853e'
-          '73299f56a891d8a5475ac07dd485619859312f70')
-
-build() {
-  cd "${srcdir}/korundum-${pkgver}"
-  patch -p1 -i "${srcdir}/korundum-4.8.0-ruby19.patch"
-  cd ..
-  mkdir build
-  cd build
-
-  cmake ../korundum-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCUSTOM_RUBY_SITE_LIB_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]') \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]')
-
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-korundum/korundum-4.8.0-ruby19.patch b/staging/kdebindings-korundum/korundum-4.8.0-ruby19.patch
deleted file mode 100644
index ac4d32ae9..000000000
--- a/staging/kdebindings-korundum/korundum-4.8.0-ruby19.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up korundum-4.8.0/src/krubypluginfactory.cpp.ruby19 korundum-4.8.0/src/krubypluginfactory.cpp
---- korundum-4.8.0/src/krubypluginfactory.cpp.ruby19	2011-07-27 13:37:29.000000000 -0500
-+++ korundum-4.8.0/src/krubypluginfactory.cpp	2012-02-17 08:30:38.785635819 -0600
-@@ -39,7 +39,7 @@
- extern "C" {
- extern VALUE rb_load_path;
- extern VALUE qt_internal_module;
--void Init_prelude(void);
-+// void Init_prelude(void);
- }
- 
- //
-@@ -165,7 +165,7 @@ QObject *KRubyPluginFactory::create(cons
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude(); 
-+//    Init_prelude(); 
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
-@@ -342,7 +342,7 @@ int kdemain(int argc, char **argv)
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude();                                             
-+//    Init_prelude();                                             
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
diff --git a/staging/kdebindings-kross/PKGBUILD b/staging/kdebindings-kross/PKGBUILD
deleted file mode 100644
index 836a60020..000000000
--- a/staging/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 161011 2012-06-07 20:40:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-#         'kdebindings-kross-ruby'
-         'kdebindings-kross-java')
-pkgver=4.8.4
-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.xz")
-sha1sums=('b5b73e10aa51377abe4da74eb98589fcc7eb83c4')
-
-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/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD
deleted file mode 100644
index 7122b3f4b..000000000
--- a/staging/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161070 2012-06-07 23:17:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.8.4
-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.xz")
-sha1sums=('5d94e2f4d6a32cf4cc7ff1d577d925de53ec8dee')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../perlkde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD
deleted file mode 100644
index ac2a4f463..000000000
--- a/staging/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161072 2012-06-07 23:20:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.8.4
-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.xz")
-sha1sums=('86a7706bff687f1721d0b17e9bde3aa36e0970fb')
-
-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/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD
deleted file mode 100644
index f7a8b2651..000000000
--- a/staging/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 168462 2012-10-12 06:36:34Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
-         'kdebindings-python2')
-pkgver=4.9.2
-pkgrel=2
-url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        'pyqt495.patch')
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '0935c32e55806873f2d088613594559285da7e9c')
-
-build() {
-  export PYTHONDONTWRITEBYTECODE="TRUE"
-
-  cd pykde4-${pkgver}
-  patch -p1 -i "${srcdir}"/pyqt495.patch
-  cd ../ 
-
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
-  make
-  cd ..
-
-  mkdir build-python2
-  cd build-python2
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-python() {
-  pkgdesc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
-  pkgdesc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-  conflicts=('kdebindings-python<4.8.1-2')
- 
-  cd "${srcdir}"/build-python2
-  make DESTDIR="${pkgdir}" install
-
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/pykdeuic4
-  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
-    "${pkgdir}"/usr/bin/python2-pykdeuic4
-
-  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
-    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
-
-  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
-    "${pkgdir}"/usr/share/sip/python2-PyKDE4
-
-  # Use the python2 executable
-  find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdebindings-python/pyqt495.patch b/staging/kdebindings-python/pyqt495.patch
deleted file mode 100644
index b8a9df258..000000000
--- a/staging/kdebindings-python/pyqt495.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Mon, 01 Oct 2012 18:47:56 +0000
-Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
-X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&amp;a=commitdiff&amp;h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
----
-Remove duplicated QVector<int> definition, since it's in PyQt now.
-Simon, if you have time, please review if everything is OK.
-
-CCMAIL: simon@simonzone.com
----
-
-
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,78 +951,4 @@
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
-+
-
diff --git a/staging/kdebindings-qtruby/PKGBUILD b/staging/kdebindings-qtruby/PKGBUILD
deleted file mode 100644
index 922fb2a4f..000000000
--- a/staging/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 160991 2012-06-07 20:25:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.8.4
-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.xz")
-sha1sums=('ce9f9b45d7e9edc839257a1f1c53b1e699503b47')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qtruby-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCUSTOM_RUBY_SITE_LIB_DIR=`ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]'`
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-qyoto/PKGBUILD b/staging/kdebindings-qyoto/PKGBUILD
deleted file mode 100644
index cc8bcde15..000000000
--- a/staging/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 160990 2012-06-07 20:24:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.8.4
-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.xz")
-sha1sums=('8df3ad9630e8435e6af5af5809520662c95ee516')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qyoto-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-smokegen/PKGBUILD b/staging/kdebindings-smokegen/PKGBUILD
deleted file mode 100644
index b695b529d..000000000
--- a/staging/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 160984 2012-06-07 20:20:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.8.4
-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.xz")
-sha1sums=('5ff7d15ed1cdea07f455fbf1189885518cf43cb6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokegen-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-smokekde/PKGBUILD b/staging/kdebindings-smokekde/PKGBUILD
deleted file mode 100644
index 2493b0d80..000000000
--- a/staging/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 160988 2012-06-07 20:22:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.8.4
-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.xz")
-sha1sums=('d028d68485bc32cfe6bc60dbd597d8f72c9e70ef')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokekde-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-smokeqt/PKGBUILD b/staging/kdebindings-smokeqt/PKGBUILD
deleted file mode 100644
index d33d69b83..000000000
--- a/staging/kdebindings-smokeqt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 160985 2012-06-07 20:20:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokeqt
-pkgver=4.8.4
-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.xz")
-sha1sums=('bf2be3e7ccf8d451f001fd2f08c306fb7f72169a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../smokeqt-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Qwt5=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-analitza/PKGBUILD b/staging/kdeedu-analitza/PKGBUILD
deleted file mode 100644
index eaabf93f9..000000000
--- a/staging/kdeedu-analitza/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 161000 2012-06-07 20:31:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-analitza
-pkgver=4.8.4
-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=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('d3b831730408078c31b686bc49c1d465de5e80da')
-
-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/staging/kdeedu-blinken/PKGBUILD b/staging/kdeedu-blinken/PKGBUILD
deleted file mode 100644
index 79dcf306a..000000000
--- a/staging/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161012 2012-06-07 20:41:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.8.4
-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.xz")
-sha1sums=('571e1f06270d38e56149a8770517bf892859e2eb')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../blinken-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-blinken/kdeedu-blinken.install b/staging/kdeedu-blinken/kdeedu-blinken.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-blinken/kdeedu-blinken.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD
deleted file mode 100644
index 09149811a..000000000
--- a/staging/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 161013 2012-06-07 20:41:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.8.4
-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' 'libqalculate')
-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.xz")
-sha1sums=('8e284e632144a92f503092738d19843272d0412e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../cantor-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-cantor/kdeedu-cantor.install b/staging/kdeedu-cantor/kdeedu-cantor.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-cantor/kdeedu-cantor.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kalgebra/PKGBUILD b/staging/kdeedu-kalgebra/PKGBUILD
deleted file mode 100644
index e58035821..000000000
--- a/staging/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161014 2012-06-07 20:41:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.8.4
-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.xz")
-sha1sums=('be0bcd290c61713a0365e9eab2ddc8d58f447f34')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kalgebra-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kalgebra/kdeedu-kalgebra.install b/staging/kdeedu-kalgebra/kdeedu-kalgebra.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kalgebra/kdeedu-kalgebra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kalzium/PKGBUILD b/staging/kdeedu-kalzium/PKGBUILD
deleted file mode 100644
index 552153632..000000000
--- a/staging/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161015 2012-06-07 20:42:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.8.4
-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.xz")
-sha1sums=('28ed27164680a28e478cc6e0a13c918bc2119dc2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kalzium-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kalzium/kdeedu-kalzium.install b/staging/kdeedu-kalzium/kdeedu-kalzium.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kalzium/kdeedu-kalzium.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kanagram/PKGBUILD b/staging/kdeedu-kanagram/PKGBUILD
deleted file mode 100644
index b03e2e501..000000000
--- a/staging/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161016 2012-06-07 20:42:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.8.4
-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.xz")
-sha1sums=('e897cc67ae046a4d7580f22a0ace534525fa6f1b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kanagram-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kanagram/kdeedu-kanagram.install b/staging/kdeedu-kanagram/kdeedu-kanagram.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kanagram/kdeedu-kanagram.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kbruch/PKGBUILD b/staging/kdeedu-kbruch/PKGBUILD
deleted file mode 100644
index 29383f7c1..000000000
--- a/staging/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161017 2012-06-07 20:43:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.8.4
-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.xz")
-sha1sums=('40c24efddc30441a8de2ec315e1933ca429da14b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kbruch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kbruch/kdeedu-kbruch.install b/staging/kdeedu-kbruch/kdeedu-kbruch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kbruch/kdeedu-kbruch.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kgeography/PKGBUILD b/staging/kdeedu-kgeography/PKGBUILD
deleted file mode 100644
index d8e46ddc4..000000000
--- a/staging/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161018 2012-06-07 20:43:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.8.4
-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.xz")
-sha1sums=('4637c5a792164d083f0ea05e6733160922d8c73b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgeography-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kgeography/kdeedu-kgeography.install b/staging/kdeedu-kgeography/kdeedu-kgeography.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kgeography/kdeedu-kgeography.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-khangman/PKGBUILD b/staging/kdeedu-khangman/PKGBUILD
deleted file mode 100644
index 44e83bed2..000000000
--- a/staging/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161019 2012-06-07 20:44:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.8.4
-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.xz")
-sha1sums=('aa544ba55833983bd21ebf594f2003a66b251901')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../khangman-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-khangman/kdeedu-khangman.install b/staging/kdeedu-khangman/kdeedu-khangman.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-khangman/kdeedu-khangman.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD
deleted file mode 100644
index 25cb8dbe1..000000000
--- a/staging/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 163120 2012-07-07 15:50:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.8.4
-pkgrel=2
-pkgdesc="Interactive Geometry"
-url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('dcbde5fbb34e0c569a2ef95a328cf69a924cd38e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kig-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Use the python2 executable
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
-}
diff --git a/staging/kdeedu-kig/kdeedu-kig.install b/staging/kdeedu-kig/kdeedu-kig.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kig/kdeedu-kig.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kiten/PKGBUILD b/staging/kdeedu-kiten/PKGBUILD
deleted file mode 100644
index 8f6a77a42..000000000
--- a/staging/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161021 2012-06-07 20:45:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.8.4
-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.xz")
-sha1sums=('f7b5f9b6cbbda37c539f1ffce9bd905f0be3658e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kiten-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kiten/kdeedu-kiten.install b/staging/kdeedu-kiten/kdeedu-kiten.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kiten/kdeedu-kiten.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-klettres/PKGBUILD b/staging/kdeedu-klettres/PKGBUILD
deleted file mode 100644
index d6f3cf26e..000000000
--- a/staging/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161022 2012-06-07 20:46:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.8.4
-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.xz")
-sha1sums=('b5dc64cdd09f265cd7a84d0ee14a93ea4ae067be')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../klettres-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-klettres/kdeedu-klettres.install b/staging/kdeedu-klettres/kdeedu-klettres.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-klettres/kdeedu-klettres.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kmplot/PKGBUILD b/staging/kdeedu-kmplot/PKGBUILD
deleted file mode 100644
index 4184aa4c9..000000000
--- a/staging/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161023 2012-06-07 20:46:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.8.4
-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.xz")
-sha1sums=('07ada013e1a046afe3bb3542a2485b1ec0d4736e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmplot-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kmplot/kdeedu-kmplot.install b/staging/kdeedu-kmplot/kdeedu-kmplot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kmplot/kdeedu-kmplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD
deleted file mode 100644
index 791efc270..000000000
--- a/staging/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161024 2012-06-07 20:46:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.8.4
-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' 'libindi')
-makedepends=('cmake' 'automoc4' 'eigen')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('579cec66cfb172258d2967872a2b9c32d4514c75')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kstars-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_Xplanet=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kstars/kdeedu-kstars.install b/staging/kdeedu-kstars/kdeedu-kstars.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kstars/kdeedu-kstars.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-ktouch/PKGBUILD b/staging/kdeedu-ktouch/PKGBUILD
deleted file mode 100644
index dd8bbe762..000000000
--- a/staging/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161025 2012-06-07 20:47:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.8.4
-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.xz")
-sha1sums=('95e7712b9644d1b3491c988bc591d7c5b4e4d3b7')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ktouch-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-ktouch/kdeedu-ktouch.install b/staging/kdeedu-ktouch/kdeedu-ktouch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-ktouch/kdeedu-ktouch.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kturtle/PKGBUILD b/staging/kdeedu-kturtle/PKGBUILD
deleted file mode 100644
index b9eead881..000000000
--- a/staging/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161026 2012-06-07 20:48:11Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.8.4
-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.xz")
-sha1sums=('160972878f61c37575fb5953b88354fe174fe8ab')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kturtle-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kturtle/kdeedu-kturtle.install b/staging/kdeedu-kturtle/kdeedu-kturtle.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kturtle/kdeedu-kturtle.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-kwordquiz/PKGBUILD b/staging/kdeedu-kwordquiz/PKGBUILD
deleted file mode 100644
index 819e9cfa4..000000000
--- a/staging/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161027 2012-06-07 20:48:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.8.4
-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.xz")
-sha1sums=('ab6cf92bbedef4115951d3cc53a9f3b91ac11875')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kwordquiz-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-marble/PKGBUILD b/staging/kdeedu-marble/PKGBUILD
deleted file mode 100644
index 31eb0e03f..000000000
--- a/staging/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 160995 2012-06-07 20:28:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.8.4
-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.xz")
-sha1sums=('ec3cd41a1d333e9e3b34595adf6e4859315159b9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../marble-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-marble/kdeedu-marble.install b/staging/kdeedu-marble/kdeedu-marble.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-marble/kdeedu-marble.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD
deleted file mode 100644
index c0232b9d5..000000000
--- a/staging/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161028 2012-06-07 20:49:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.8.4
-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.xz")
-sha1sums=('bfc361363fa0cb866fd1d704b86d71401c1c4ea6')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../parley-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-parley/kdeedu-parley.install b/staging/kdeedu-parley/kdeedu-parley.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-parley/kdeedu-parley.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index 2d3dd044a..000000000
--- a/staging/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163122 2012-07-07 16:00:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.8.4
-pkgrel=2
-pkgdesc="Rocs Graph Theory"
-url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('991e5aa15e59cc432a9c9f140fe90bd47f8f8e15')
-options=('!makeflags')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../rocs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD
deleted file mode 100644
index 81f82038e..000000000
--- a/staging/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161030 2012-06-07 20:50:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.8.4
-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')
-makedepends=('cmake' 'automoc4' 'eigen')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('498d8243309388fa8b59cd968c0c92fc588eda11')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../step-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-step/kdeedu-step.install b/staging/kdeedu-step/kdeedu-step.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-step/kdeedu-step.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
deleted file mode 100644
index e0659a661..000000000
--- a/staging/kdegames/PKGBUILD
+++ /dev/null
@@ -1,518 +0,0 @@
-# $Id: PKGBUILD 161031 2012-06-07 20:51:29Z 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.4
-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-python2'
-             'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('00a68215c3e8b41ec8b7949c5d82af8e54766e97')
-
-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-python2' '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
-	install -D -m644 $srcdir/${pkgbase}-${pkgver}/kigo/src/module.dsc \
-		$pkgdir/usr/share/ggz/kigo.dsc
-}
-
-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/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ac4516ed0..000000000
--- a/staging/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-	ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kbattleship.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/staging/kdegames/kdegames-kfourinline.install b/staging/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kfourinline.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/kdegames/kdegames-kigo.install b/staging/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kigo.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/kdegames/kdegames-kolf.install b/staging/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kolf.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/kdegames/kdegames-kpatience.install b/staging/kdegames/kdegames-kpatience.install
deleted file mode 100644
index 3af34a012..000000000
--- a/staging/kdegames/kdegames-kpatience.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/staging/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/kreversi.dsc ]; then
-		ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-kspaceduel.install b/staging/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kspaceduel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/staging/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
-	if [ -f usr/share/ggz/ksquares.dsc ]; then
-		ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
-	fi
-}
-
-pre_upgrade() {
-	pre_remove
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-ktuberling.install b/staging/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-ktuberling.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/kdegames/kdegames-lskat.install b/staging/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-lskat.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegames/kdegames.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD
deleted file mode 100644
index c91a7ce44..000000000
--- a/staging/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 164642 2012-08-01 17:29:10Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.9.0
-pkgrel=2
-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.xz")
-sha1sums=('df2f8cba8de3f5afbbe65ba70faee46a30945283')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../gwenview-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-kamera/PKGBUILD b/staging/kdegraphics-kamera/PKGBUILD
deleted file mode 100644
index 0d257b72c..000000000
--- a/staging/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 161033 2012-06-07 20:54:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.8.4
-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.xz")
-sha1sums=('fc92327482bf1cd9b067667285ede00e3e464653')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kamera-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kcolorchooser/PKGBUILD b/staging/kdegraphics-kcolorchooser/PKGBUILD
deleted file mode 100644
index ab3ca314f..000000000
--- a/staging/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161034 2012-06-07 20:54:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.8.4
-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.xz")
-sha1sums=('2f5ee55c86a503e458b1884939a62408bedbfc70')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kcolorchooser-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-kgamma/PKGBUILD b/staging/kdegraphics-kgamma/PKGBUILD
deleted file mode 100644
index a486f8b03..000000000
--- a/staging/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161035 2012-06-07 20:55:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.8.4
-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.xz")
-sha1sums=('812a84564db52fb6a8b8e0e829eb762d479092ec')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kgamma-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kolourpaint/PKGBUILD b/staging/kdegraphics-kolourpaint/PKGBUILD
deleted file mode 100644
index edb3a98d0..000000000
--- a/staging/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161036 2012-06-07 20:55:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.8.4
-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.xz")
-sha1sums=('1dc706ed29339df9fcc68ee606588941319bbf09')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kolourpaint-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-kruler/PKGBUILD b/staging/kdegraphics-kruler/PKGBUILD
deleted file mode 100644
index d01237f4d..000000000
--- a/staging/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161037 2012-06-07 20:56:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.8.4
-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.xz")
-sha1sums=('b3fb40888f6cf2ad419e1f30a97c2052ffbae1d7')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kruler-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kruler/kdegraphics-kruler.install b/staging/kdegraphics-kruler/kdegraphics-kruler.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-kruler/kdegraphics-kruler.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-ksaneplugin/PKGBUILD b/staging/kdegraphics-ksaneplugin/PKGBUILD
deleted file mode 100644
index 5ef15e0a0..000000000
--- a/staging/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161038 2012-06-07 20:56:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.8.4
-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.xz")
-sha1sums=('b7a3204ef27f04bffca0fd77d84bd46b236687b7')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksaneplugin-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-ksnapshot/PKGBUILD b/staging/kdegraphics-ksnapshot/PKGBUILD
deleted file mode 100644
index de5685030..000000000
--- a/staging/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161039 2012-06-07 20:56:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.8.4
-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.xz")
-sha1sums=('1cbd1ea468e7722feb8c96dd5f1f3a18bb91d4ef')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ksnapshot-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-mobipocket/PKGBUILD b/staging/kdegraphics-mobipocket/PKGBUILD
deleted file mode 100644
index f6a042f16..000000000
--- a/staging/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161040 2012-06-07 20:57:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.8.4
-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.xz")
-sha1sums=('0c38ef851c054b0ee3689d41ff5f7f6fb3d83f67')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-mobipocket/kdegraphics-mobipocket.install b/staging/kdegraphics-mobipocket/kdegraphics-mobipocket.install
deleted file mode 100644
index 660593cf5..000000000
--- a/staging/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/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index 3cd282c26..000000000
--- a/staging/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 160986 2012-06-07 20:21:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.8.4
-pkgrel=1
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
-         'ebook-tools' 'libspectre')
-makedepends=('cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('34ff243a4fa77400631aa44b31cbe54910f8091e')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index 0ec15a35d..000000000
--- a/staging/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161041 2012-06-07 20:57:42Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.8.4
-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.xz")
-sha1sums=('208dd945c1ecfaee97457585dc7a52916dd2318f')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-svgpart/PKGBUILD b/staging/kdegraphics-svgpart/PKGBUILD
deleted file mode 100644
index 5efd04dba..000000000
--- a/staging/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161042 2012-06-07 20:58:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.8.4
-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.xz")
-sha1sums=('3c202f0a58035c56e7e46a983c254a6284b97ee9')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../svgpart-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-thumbnailers/PKGBUILD b/staging/kdegraphics-thumbnailers/PKGBUILD
deleted file mode 100644
index 4f5a55b41..000000000
--- a/staging/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161043 2012-06-07 20:58:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.8.4
-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.xz")
-sha1sums=('57e753881f9ca78c4c188c49a3a1b258b92adb83')
-
-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/kdelibs3/PKGBUILD b/staging/kdelibs3/PKGBUILD
deleted file mode 100644
index 107727721..000000000
--- a/staging/kdelibs3/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# $Id: PKGBUILD 169353 2012-10-20 02:30:14Z 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=15
-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' '!makeflags')
-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'
-	'kdelibs3-cups16.patch')
-sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
-          'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
-          '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
-          'fbd6e773edf3e8bb8e1272629984025e041da2ca'
-          '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
-          '35e56fe4c5f71685e64b13f448dcacc620166e06'
-          '50e92950498463defb9149ffcf8cbc2e8cd1063b'
-          'e5f5b8c060a2db9cedb82bf18caadfa869921779'
-          '6a6c544b3336bfe89bb17ef737d783a7ec006c6c')
-
-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
-	patch -p1 -i "${srcdir}"/kdelibs3-cups16.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-cups16.patch b/staging/kdelibs3/kdelibs3-cups16.patch
deleted file mode 100644
index 6736d49d3..000000000
--- a/staging/kdelibs3/kdelibs3-cups16.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2012-10-06 15:08:17.460612585 -0400
-@@ -629,26 +629,26 @@
- 	cups_lang_t*	lang = cupsLangDefault();
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang));
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language);
--	request_->request.op.operation_id = CUPS_GET_PRINTERS;
-+	ippSetOperation(request_, CUPS_GET_PRINTERS);
- 	request_ = cupsDoRequest(http_, request_, "/printers/");
- 	if (request_)
- 	{
- 		QString	name;
- 		int	type(0);
--		ipp_attribute_t	*attr = request_->attrs;
-+		ipp_attribute_t	*attr = ippFirstAttribute(request_);
- 		while (attr)
- 		{
- 			// check new printer (keep only local non-implicit printers)
--			if (!attr->name)
-+			if (!ippGetName(attr))
- 			{
- 				if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty())
- 					resources_.append(new CupsResource("/printers/"+name));
- 				name = "";
- 				type = 0;
- 			}
--			else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text;
--			else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer;
--			attr = attr->next;
-+			else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL);
-+			else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0);
-+			attr = ippNextAttribute(request_);
- 		}
- 		if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty())
- 			resources_.append(new CupsResource("/printers/"+name));
-@@ -658,26 +658,26 @@
- 	request_ = ippNew();
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang));
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language);
--	request_->request.op.operation_id = CUPS_GET_CLASSES;
-+	ippSetOperation(request_, CUPS_GET_CLASSES);
- 	request_ = cupsDoRequest(http_, request_, "/classes/");
- 	if (request_)
- 	{
- 		QString	name;
- 		int	type(0);
--		ipp_attribute_t	*attr = request_->attrs;
-+		ipp_attribute_t	*attr = ippFirstAttribute(request_);
- 		while (attr)
- 		{
- 			// check new class (keep only local classes)
--			if (!attr->name)
-+			if (!ippGetName(attr))
- 			{
- 				if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty())
- 					resources_.append(new CupsResource("/classes/"+name));
- 				name = "";
- 				type = 0;
- 			}
--			else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text;
--			else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer;
--			attr = attr->next;
-+			else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL);
-+			else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0);
-+			attr = ippNextAttribute(request_);
- 		}
- 		if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty())
- 			resources_.append(new CupsResource("/classes/"+name));
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp	2012-10-06 15:12:00.919127451 -0400
-@@ -51,32 +51,34 @@
- 		kdDebug(500) << "Null request" << endl;
- 		return;
- 	}
--	kdDebug(500) << "State = 0x" << QString::number(req->state, 16) << endl;
--	kdDebug(500) << "ID = 0x" << QString::number(req->request.status.request_id, 16) << endl;
-+	kdDebug(500) << "State = 0x" << QString::number(ippGetState(req), 16) << endl;
-+	kdDebug(500) << "ID = 0x" << QString::number(ippGetRequestId(req), 16) << endl;
- 	if (answer)
- 	{
--		kdDebug(500) << "Status = 0x" << QString::number(req->request.status.status_code, 16) << endl;
--		kdDebug(500) << "Status message = " << ippErrorString(req->request.status.status_code) << endl;
-+		kdDebug(500) << "Status = 0x" << QString::number(ippGetStatusCode(req), 16) << endl;
-+		kdDebug(500) << "Status message = " << ippErrorString(ippGetStatusCode(req)) << endl;
- 	}
- 	else
--		kdDebug(500) << "Operation = 0x" << QString::number(req->request.op.operation_id, 16) << endl;
--	kdDebug(500) << "Version = " << (int)(req->request.status.version[0]) << "." << (int)(req->request.status.version[1]) << endl;
-+		kdDebug(500) << "Operation = 0x" << QString::number(ippGetOperation(req), 16) << endl;
-+	int minorVersion;
-+	int majorVersion = ippGetVersion(req, &minorVersion);
-+	kdDebug(500) << "Version = " << (int)(majorVersion) << "." << (int)(minorVersion) << endl;
- 	kdDebug(500) << endl;
- 
--	ipp_attribute_t *attr = req->attrs;
-+	ipp_attribute_t *attr = ippFirstAttribute(req);
- 	while (attr)
- 	{
--		QString s = QString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16);
--		for (int i=0;i<attr->num_values;i++)
-+		QString s = QString::fromLatin1("%1 (0x%2) = ").arg(ippGetName(attr)).arg(ippGetValueTag(attr), 0, 16);
-+		for (int i=0;i<ippGetCount(attr);i++)
- 		{
--			switch (attr->value_tag)
-+			switch (ippGetValueTag(attr))
- 			{
- 				case IPP_TAG_INTEGER:
- 				case IPP_TAG_ENUM:
--					s += ("0x"+QString::number(attr->values[i].integer, 16));
-+					s += ("0x"+QString::number(ippGetInteger(attr, i), 16));
- 					break;
- 				case IPP_TAG_BOOLEAN:
--					s += (attr->values[i].boolean ? "true" : "false");
-+					s += (ippGetBoolean(attr, i) ? "true" : "false");
- 					break;
- 				case IPP_TAG_STRING:
- 				case IPP_TAG_TEXT:
-@@ -88,16 +90,16 @@
- 				case IPP_TAG_TEXTLANG:
- 				case IPP_TAG_CHARSET:
- 				case IPP_TAG_LANGUAGE:
--					s += attr->values[i].string.text;
-+					s += ippGetString(attr, i, NULL);
- 					break;
- 				default:
- 					break;
- 			}
--			if (i != (attr->num_values-1))
-+			if (i != (ippGetCount(attr)-1))
- 				s += ", ";
- 		}
- 		kdDebug(500) << s << endl;
--		attr = attr->next;
-+		attr = ippNextAttribute(req);
- 	}
- }
- 
-@@ -177,7 +179,7 @@
- 		ipp_attribute_t	*attr = ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,NULL);
- 		int	i(0);
- 		for (QStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].string.text = strdup((*it).local8Bit());
-+			ippSetString(request_, &attr, i, strdup((*it).local8Bit()));
- 	}
- }
- 
-@@ -193,7 +195,7 @@
- 		ipp_attribute_t	*attr = ippAddIntegers(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL);
- 		int	i(0);
- 		for (QValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].integer = *it;
-+			ippSetInteger(request_, &attr, i, *it);
- 	}
- }
- 
-@@ -209,19 +211,19 @@
- 		ipp_attribute_t	*attr = ippAddBooleans(request_,(ipp_tag_t)group,name.latin1(),(int)(values.count()),NULL);
- 		int	i(0);
- 		for (QValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].boolean = (char)(*it);
-+			ippSetBoolean(request_, &attr, i, (char)(*it));
- 	}
- }
- 
- void IppRequest::setOperation(int op)
- {
--	request_->request.op.operation_id = (ipp_op_t)op;
--	request_->request.op.request_id = 1;	// 0 is not RFC-compliant, should be at least 1
-+	ippSetOperation(request_, (ipp_op_t)op);
-+	ippSetRequestId(request_, 1);		// 0 is not RFC-compliant, should be at least 1
- }
- 
- int IppRequest::status()
- {
--	return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2));
-+	return (request_ ? ippGetStatusCode(request_) : (connect_ ? cupsLastError() : -2));
- }
- 
- QString IppRequest::statusMessage()
-@@ -248,7 +250,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type);
- 	if (attr)
- 	{
--		value = attr->values[0].integer;
-+		value = ippGetInteger(attr, 0);
- 		return true;
- 	}
- 	else return false;
-@@ -260,7 +262,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type);
- 	if (attr)
- 	{
--		value = QString::fromLocal8Bit(attr->values[0].string.text);
-+		value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL));
- 		return true;
- 	}
- 	else return false;
-@@ -273,8 +275,8 @@
- 	values.clear();
- 	if (attr)
- 	{
--		for (int i=0;i<attr->num_values;i++)
--			values.append(QString::fromLocal8Bit(attr->values[i].string.text));
-+		for (int i=0;i<ippGetCount(attr);i++)
-+			values.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL)));
- 		return true;
- 	}
- 	else return false;
-@@ -286,7 +288,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), IPP_TAG_BOOLEAN);
- 	if (attr)
- 	{
--		value = (bool)attr->values[0].boolean;
-+		value = (bool)ippGetBoolean(attr, 0);
- 		return true;
- 	}
- 	else return false;
-@@ -338,10 +340,10 @@
- 	}
- 
- 	/* No printers found */
--	if ( request_ && request_->request.status.status_code == 0x406 )
-+	if ( request_ && ippGetStatusCode(request_) == 0x406 )
- 		return true;
- 
--	if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00))
-+	if (!request_ || ippGetState(request_) == IPP_ERROR || (ippGetStatusCode(request_) & 0x0F00))
- 		return false;
- 
- 
-@@ -356,36 +358,36 @@
- 	output << "<tr><th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Attribute") << "</font></th>" << endl;
- 	output << "<th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Values") << "</font></th></tr>" << endl;
- 	// go to the first attribute of the specified group
--	ipp_attribute_t	*attr = request_->attrs;
--	while (attr && attr->group_tag != group)
--		attr = attr->next;
-+	ipp_attribute_t	*attr = ippFirstAttribute(request_);
-+	while (attr && ippGetGroupTag(attr) != group)
-+		attr = ippNextAttribute(request_);
- 	// print each attribute
--	ipp_uchar_t	*d;
--	QCString	dateStr;
--	QDateTime	dt;
--	bool	bg(false);
--	while (attr && attr->group_tag == group)
-+	const ipp_uchar_t	*d;
-+	QCString		dateStr;
-+	QDateTime		dt;
-+	bool			bg(false);
-+	while (attr && ippGetGroupTag(attr) == group)
- 	{
--		output << "  <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n    <td><b>" << attr->name << "</b></td>\n    <td>" << endl;
-+		output << "  <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n    <td><b>" << ippGetName(attr) << "</b></td>\n    <td>" << endl;
- 		bg = !bg;
--		for (int i=0; i<attr->num_values; i++)
-+		for (int i=0; i<ippGetCount(attr); i++)
- 		{
--			switch (attr->value_tag)
-+			switch (ippGetValueTag(attr))
- 			{
- 				case IPP_TAG_INTEGER:
--					if (attr->name && strstr(attr->name, "time"))
-+					if (ippGetName(attr) && strstr(ippGetName(attr), "time"))
- 					{
--						dt.setTime_t((unsigned int)(attr->values[i].integer));
-+						dt.setTime_t((unsigned int)(ippGetInteger(attr, i)));
- 						output << dt.toString();
- 					}
- 					else
--						output << attr->values[i].integer;
-+						output << ippGetInteger(attr, i);
- 					break;
- 				case IPP_TAG_ENUM:
--					output << "0x" << hex << attr->values[i].integer << dec;
-+					output << "0x" << hex << ippGetInteger(attr, i) << dec;
- 					break;
- 				case IPP_TAG_BOOLEAN:
--					output << (attr->values[i].boolean ? i18n("True") : i18n("False"));
-+					output << (ippGetBoolean(attr, i) ? i18n("True") : i18n("False"));
- 					break;
- 				case IPP_TAG_STRING:
- 				case IPP_TAG_TEXTLANG:
-@@ -397,18 +399,25 @@
- 				case IPP_TAG_CHARSET:
- 				case IPP_TAG_LANGUAGE:
- 				case IPP_TAG_MIMETYPE:
--					output << attr->values[i].string.text;
-+					output << ippGetString(attr, i, NULL);
- 					break;
- 				case IPP_TAG_RESOLUTION:
--					output << "( " << attr->values[i].resolution.xres
--					       << ", " << attr->values[i].resolution.yres << " )";
-+					int xres;
-+					int yres;
-+					ipp_res_t units;
-+					xres = ippGetResolution(attr, i, &yres, &units);
-+					output << "( " << xres
-+					       << ", " << yres << " )";
- 					break;
- 				case IPP_TAG_RANGE:
--					output << "[ " << (attr->values[i].range.lower > 0 ? attr->values[i].range.lower : 1)
--					       << ", " << (attr->values[i].range.upper > 0 ? attr->values[i].range.upper : 65535) << " ]";
-+					int lowervalue;
-+					int uppervalue;
-+					lowervalue = ippGetRange(attr, i, &uppervalue);
-+					output << "[ " << (lowervalue > 0 ? lowervalue : 1)
-+					       << ", " << (uppervalue > 0 ? uppervalue : 65535) << " ]";
- 					break;
- 				case IPP_TAG_DATE:
--					d = attr->values[i].date;
-+					d = ippGetDate(attr, i);
- 					dateStr.sprintf("%.4d-%.2d-%.2d, %.2d:%.2d:%.2d %c%.2d%.2d",
- 							d[0]*256+d[1], d[2], d[3],
- 							d[4], d[5], d[6],
-@@ -418,11 +427,11 @@
- 				default:
- 					continue;
- 			}
--			if (i < attr->num_values-1)
-+			if (i < ippGetCount(attr)-1)
- 				output << "<br>";
- 		}
- 		output << "</td>\n  </tr>" << endl;
--		attr = attr->next;
-+		attr = ippNextAttribute(request_);
- 	}
- 	// end table
- 	output << "</table>" << endl;
-@@ -438,31 +447,34 @@
- 		ipp_attribute_t	*attr = first();
- 		while (attr)
- 		{
--			if (group != -1 && attr->group_tag != group)
-+			if (group != -1 && ippGetGroupTag(attr) != group)
- 			{
--				attr = attr->next;
-+				attr = ippNextAttribute(request_);
- 				continue;
- 			}
- 			QString	value;
--			for (int i=0; i<attr->num_values; i++)
-+			for (int i=0; i<ippGetCount(attr); i++)
- 			{
--				switch (attr->value_tag)
-+				switch (ippGetValueTag(attr))
- 				{
- 					case IPP_TAG_INTEGER:
- 					case IPP_TAG_ENUM:
--						value.append(QString::number(attr->values[i].integer)).append(",");
-+						value.append(QString::number(ippGetInteger(attr, i))).append(",");
- 						break;
- 					case IPP_TAG_BOOLEAN:
--						value.append((attr->values[i].boolean ? "true" : "false")).append(",");
-+						value.append((ippGetBoolean(attr, i) ? "true" : "false")).append(",");
- 						break;
- 					case IPP_TAG_RANGE:
--						if (attr->values[i].range.lower > 0)
--							value.append(QString::number(attr->values[i].range.lower));
--						if (attr->values[i].range.lower != attr->values[i].range.upper)
-+						int lowervalue;
-+						int uppervalue;
-+						lowervalue = ippGetRange(attr, i, &uppervalue);
-+						if (lowervalue > 0)
-+							value.append(QString::number(lowervalue));
-+						if (lowervalue != uppervalue)
- 						{
- 							value.append("-");
--							if (attr->values[i].range.upper > 0)
--								value.append(QString::number(attr->values[i].range.upper));
-+							if (uppervalue > 0)
-+								value.append(QString::number(uppervalue));
- 						}
- 						value.append(",");
- 						break;
-@@ -476,7 +488,7 @@
- 					case IPP_TAG_TEXTLANG:
- 					case IPP_TAG_CHARSET:
- 					case IPP_TAG_LANGUAGE:
--						value.append(QString::fromLocal8Bit(attr->values[i].string.text)).append(",");
-+						value.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL))).append(",");
- 						break;
- 					default:
- 						break;
-@@ -484,8 +496,8 @@
- 			}
- 			if (!value.isEmpty())
- 				value.truncate(value.length()-1);
--			opts[QString::fromLocal8Bit(attr->name)] = value;
--			attr = attr->next;
-+			opts[QString::fromLocal8Bit(ippGetName(attr))] = value;
-+			attr = ippNextAttribute(request_);
- 		}
- 	}
- 	return opts;
-@@ -542,3 +554,7 @@
- 	}
- #endif
- }
-+
-+
-+ipp_attribute_t* IppRequest::first()
-+{ return (request_ ? ippFirstAttribute(request_) : NULL); }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h kdelibs-3.5.10/kdeprint/cups/ipprequest.h
---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.h	2012-10-06 15:06:05.581489574 -0400
-@@ -72,7 +72,7 @@
- 	bool keyword(const QString& name, QStringList& value);
- 	bool mime(const QString& name, QString& value);
- 	ipp_attribute_t* first();
--	ipp_attribute_t* last();
-+	ipp_t* request();
- 	QMap<QString,QString> toMap(int group = -1);
- 	void setMap(const QMap<QString,QString>& opts);
- 
-@@ -178,12 +178,6 @@
- inline bool IppRequest::doRequest(const QString& res)
- { return doFileRequest(res); }
- 
--inline ipp_attribute_t* IppRequest::first()
--{ return (request_ ? request_->attrs : NULL); }
--
--inline ipp_attribute_t* IppRequest::last()
--{ return (request_ ? request_->last : NULL); }
--
- inline void IppRequest::setHost(const QString& host)
- { host_ = host; }
- 
-@@ -193,4 +187,7 @@
- inline void IppRequest::dump(int state)
- { dump_ = state; }
- 
-+inline ipp_t* IppRequest::request()
-+{ return request_; }
-+
- #endif
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp	2012-10-06 15:13:31.451859386 -0400
-@@ -36,6 +36,8 @@
- #include <kdebug.h>
- #include <kurl.h>
- 
-+#include "config.h"
-+
- KMCupsJobManager::KMCupsJobManager(QObject *parent, const char *name, const QStringList & /*args*/)
- : KMJobManager(parent,name)
- {
-@@ -166,17 +168,18 @@
- void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr)
- {
- 	ipp_attribute_t	*attr = req.first();
-+	ipp_attribute_t	*nextAttr;
- 	KMJob		*job = new KMJob();
- 	QString		uri;
- 	while (attr)
- 	{
--		QString	name(attr->name);
--		if (name == "job-id") job->setId(attr->values[0].integer);
--		else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(attr->values[0].string.text));
--		else if (name == "job-name") job->setName(QString::fromLocal8Bit(attr->values[0].string.text));
-+		QString	name(ippGetName(attr));
-+		if (name == "job-id") job->setId(ippGetInteger(attr, 0));
-+		else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
-+		else if (name == "job-name") job->setName(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		else if (name == "job-state")
- 		{
--			switch (attr->values[0].integer)
-+			switch (ippGetInteger(attr, 0))
- 			{
- 				case IPP_JOB_PENDING:
- 					job->setState(KMJob::Queued);
-@@ -204,29 +207,30 @@
- 					break;
- 			}
- 		}
--		else if (name == "job-k-octets") job->setSize(attr->values[0].integer);
--		else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(attr->values[0].string.text));
--		else if (name == "job-k-octets-completed") job->setProcessedSize(attr->values[0].integer);
--		else if (name == "job-media-sheets") job->setPages(attr->values[0].integer);
--		else if (name == "job-media-sheets-completed") job->setProcessedPages(attr->values[0].integer);
-+		else if (name == "job-k-octets") job->setSize(ippGetInteger(attr, 0));
-+		else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
-+		else if (name == "job-k-octets-completed") job->setProcessedSize(ippGetInteger(attr, 0));
-+		else if (name == "job-media-sheets") job->setPages(ippGetInteger(attr, 0));
-+		else if (name == "job-media-sheets-completed") job->setProcessedPages(ippGetInteger(attr, 0));
- 		else if (name == "job-printer-uri" && !pr->isRemote())
- 		{
--			QString	str(attr->values[0].string.text);
-+			QString	str(ippGetString(attr, 0, NULL));
- 			int	p = str.findRev('/');
- 			if (p != -1)
- 				job->setPrinter(str.mid(p+1));
- 		}
- 		else if (name == "job-priority")
- 		{
--			job->setAttribute(0, QString::fromLatin1("%1").arg(attr->values[0].integer, 3));
-+			job->setAttribute(0, QString::fromLatin1("%1").arg(ippGetInteger(attr, 0), 3));
- 		}
- 		else if (name == "job-billing")
- 		{
- 			job->setAttributeCount(2);
--			job->setAttribute(1, QString::fromLocal8Bit(attr->values[0].string.text));
-+			job->setAttribute(1, QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		}
- 
--		if (name.isEmpty() || attr == req.last())
-+		nextAttr = ippNextAttribute(req.request());
-+		if (name.isEmpty() || (!nextAttr))
- 		{
- 			if (job->printer().isEmpty())
- 				job->setPrinter(pr->printerName());
-@@ -234,8 +238,7 @@
- 			addJob(job);	// don't use job after this call !!!
- 			job = new KMJob();
- 		}
--
--		attr = attr->next;
-+		attr = nextAttr;
- 	}
- 	delete job;
- }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp	2012-10-06 15:14:22.311521604 -0400
-@@ -476,19 +476,20 @@
- void KMCupsManager::processRequest(IppRequest* req)
- {
- 	ipp_attribute_t	*attr = req->first();
-+	ipp_attribute_t	*nextAttr;
- 	KMPrinter	*printer = new KMPrinter();
- 	while (attr)
- 	{
--		QString	attrname(attr->name);
-+		QString	attrname(ippGetName(attr));
- 		if (attrname == "printer-name")
- 		{
--			QString	value = QString::fromLocal8Bit(attr->values[0].string.text);
-+			QString	value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL));
- 			printer->setName(value);
- 			printer->setPrinterName(value);
- 		}
- 		else if (attrname == "printer-type")
- 		{
--			int	value = attr->values[0].integer;
-+			int	value = ippGetInteger(attr, 0);
- 			printer->setType(0);
- 			printer->addType(((value & CUPS_PRINTER_CLASS) || (value & CUPS_PRINTER_IMPLICIT) ? KMPrinter::Class : KMPrinter::Printer));
- 			if ((value & CUPS_PRINTER_REMOTE)) printer->addType(KMPrinter::Remote);
-@@ -499,7 +500,7 @@
- 		}
- 		else if (attrname == "printer-state")
- 		{
--			switch (attr->values[0].integer)
-+			switch (ippGetInteger(attr, 0))
- 			{
- 				case IPP_PRINTER_IDLE: printer->setState(KMPrinter::Idle); break;
- 				case IPP_PRINTER_PROCESSING: printer->setState(KMPrinter::Processing); break;
-@@ -508,22 +509,24 @@
- 		}
- 		else if (attrname == "printer-uri-supported")
- 		{
--			printer->setUri(KURL(attr->values[0].string.text));
-+			printer->setUri(KURL(ippGetString(attr, 0, NULL)));
- 		}
- 		else if (attrname == "printer-location")
- 		{
--			printer->setLocation(QString::fromLocal8Bit(attr->values[0].string.text));
-+			printer->setLocation(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		}
- 		else if (attrname == "printer-is-accepting-jobs")
- 		{
--			printer->setAcceptJobs(attr->values[0].boolean);
-+			printer->setAcceptJobs(ippGetBoolean(attr, 0));
- 		}
--		if (attrname.isEmpty() || attr == req->last())
-+
-+		nextAttr = ippNextAttribute(req->request());
-+		if (attrname.isEmpty() || (!nextAttr))
- 		{
- 			addPrinter(printer);
- 			printer = new KMPrinter();
- 		}
--		attr = attr->next;
-+		attr = nextAttr;
- 	}
- 	delete printer;
- }
-@@ -817,6 +820,7 @@
- {
- 	QStringList	list;
- 	IppRequest	req;
-+	ipp_attribute_t	*nextAttr;
- 	req.setOperation(CUPS_GET_DEVICES);
- 	if (req.doRequest("/"))
- 	{
-@@ -824,12 +828,13 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			QString	attrname(attr->name);
--			if (attrname == "device-info") desc = attr->values[0].string.text;
--			else if (attrname == "device-make-and-model") printer = attr->values[0].string.text;
--			else if (attrname == "device-uri") uri = attr->values[0].string.text;
--			else if ( attrname == "device-class" ) cl = attr->values[ 0 ].string.text;
--			if (attrname.isEmpty() || attr == req.last())
-+			QString	attrname(ippGetName(attr));
-+			if (attrname == "device-info") desc = ippGetString(attr, 0, NULL);
-+			else if (attrname == "device-make-and-model") printer = ippGetString(attr, 0, NULL);
-+			else if (attrname == "device-uri") uri = ippGetString(attr, 0, NULL);
-+			else if ( attrname == "device-class" ) cl = ippGetString(attr, 0, NULL);
-+			nextAttr = ippNextAttribute(req.request());
-+			if (attrname.isEmpty() || (!nextAttr))
- 			{
- 				if (!uri.isEmpty())
- 				{
-@@ -838,7 +843,7 @@
- 				}
- 				uri = desc = printer = cl = QString::null;
- 			}
--			attr = attr->next;
-+			attr = nextAttr;
- 		}
- 	}
- 	return list;
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp	2012-10-06 15:14:55.177970017 -0400
-@@ -60,6 +60,8 @@
- #include <kaction.h>
- #include <kmessagebox.h>
- 
-+#include "config.h"
-+
- KMCupsUiManager::KMCupsUiManager(QObject *parent, const char *name, const QStringList & /*args*/)
- : KMUiManager(parent,name)
- {
-@@ -143,22 +145,22 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"device-uri") == 0)
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0)
- 			{
--				if (strncmp(attr->values[0].string.text,"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true);
--				else if (strncmp(attr->values[0].string.text,"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"serial",6) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true);
--				else if (strncmp(attr->values[0].string.text,"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true);
--				else if (strncmp(attr->values[0].string.text,"usb",3) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"http",4) == 0 || strncmp(attr->values[0].string.text,"ipp",3) == 0)
-+				if (strncmp(ippGetString(attr, 0, NULL),"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"serial",6) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"usb",3) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"http",4) == 0 || strncmp(ippGetString(attr, 0, NULL),"ipp",3) == 0)
- 				{
- 					backend->enableBackend(KMWizard::IPP,true);
- 					backend->enableBackend(KMWizard::Custom+1,true);
- 				}
--				else if (strncmp(attr->values[0].string.text,"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true);
- 			}
--			attr = attr->next;
-+			attr = ippNextAttribute(req.request());
- 		}
- 		backend->enableBackend(KMWizard::Class, true);
- 		backend->enableBackend(KMWizard::Custom+5, true);
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp	2012-10-06 15:15:28.044418449 -0400
-@@ -30,6 +30,8 @@
- #include <kiconloader.h>
- #include <kurl.h>
- 
-+#include "config.h"
-+
- KMWFax::KMWFax(QWidget *parent, const char *name)
- : KMWizardPage(parent,name)
- {
-@@ -55,11 +57,11 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0)
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0 && strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0)
- 			{
--				m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(attr->values[0].string.text));
-+				m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(ippGetString(attr, 0, NULL)));
- 			}
--			attr = attr->next;
-+			attr = ippNextAttribute(req.request());
- 		}
- 	}
- }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp	2012-10-06 15:15:56.867560417 -0400
-@@ -29,6 +29,8 @@
- #include <kdebug.h>
- #include <kiconloader.h>
- 
-+#include "config.h"
-+
- KMWIppSelect::KMWIppSelect(QWidget *parent, const char *name)
- : KMWizardPage(parent,name)
- {
-@@ -83,9 +85,9 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"printer-name") == 0)
--				m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(attr->values[0].string.text));
--			attr = attr->next;
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"printer-name") == 0)
-+				m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(ippGetString(attr, 0, NULL)));
-+			attr = ippNextAttribute(req.request());
- 		}
- 		m_list->sort();
- 	}
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/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD
deleted file mode 100644
index 1cb3c9ee8..000000000
--- a/staging/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 161262 2012-06-08 07:13:37Z 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.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
-             'libmusicbrainz3' 'taglib' 'libcanberra')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'mplayerthumbs.config'
-        'ffmpeg0.11.patch')
-sha1sums=('dac721e82308a6347d578361e25da7c466a26ba7'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '48331f7e2dab760c20708b81fe6c4d47c83a63e7')
-
-build() {
-    cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs
-    patch -p1 -i ${srcdir}/ffmpeg0.11.patch
-
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_TunePimp=OFF
-	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/dragonplayer/doc
-    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' 'taglib')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/juk/doc
-    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 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/kmix/doc
-    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
-}
-
-package_kdemultimedia-mplayerthumbs() {
-	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=('kdebase-runtime' 'mplayer')
-	replaces=('mplayerthumbs')
-	conflicts=('mplayerthumbs')
-	cd $srcdir/build/mplayerthumbs
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/staging/kdemultimedia/ffmpeg0.11.patch b/staging/kdemultimedia/ffmpeg0.11.patch
deleted file mode 100644
index 527ac3992..000000000
--- a/staging/kdemultimedia/ffmpeg0.11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Christoph Feck <christoph@maxiom.de>
-Date: Tue, 29 May 2012 13:53:18 +0000
-Subject: Two deprecated calls have been removed from ffmpeg 0.11.
-X-Git-Tag: v4.8.80
-X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&amp;a=commitdiff&amp;h=4f03b20614c122e3e14473d42a000c0bffdce39c
----
-Two deprecated calls have been removed from ffmpeg 0.11.
-
-BUG:300732
----
-
-
---- a/ffmpegthumbnailer/moviedecoder.cpp
-+++ b/ffmpegthumbnailer/moviedecoder.cpp
-@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
- void MovieDecoder::initialize(const QString& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     QFileInfo fileInfo(filename);
- 
--    if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
-+    if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
-         kDebug() <<  "Could not open input file: " << fileInfo.absoluteFilePath();
-         return;
-     }
-
diff --git a/staging/kdemultimedia/kdemultimedia-dragonplayer.install b/staging/kdemultimedia/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdemultimedia/kdemultimedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/staging/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD
deleted file mode 100644
index c5c680d3c..000000000
--- a/staging/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 161045 2012-06-07 21:00:18Z 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.4
-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'
-    'libktorrent' 'libmms' 'mediastreamer')
-    source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b3926c5cd929cec209421c2f1cb8659cc1c82458')
-
-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 \
-        -DWITH_qq=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')
-    optdepends=('kdebase-keditbookmarks: to edit bookmarks')
-	url="http://kde.org/applications/internet/krdc/"
-	cd $srcdir/build/krdc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krdc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
-	pkgdesc='Desktop Sharing'
-	# note on libxdamage:
-	#       not detected by namcap because libgl depends on it
-	#       but nvidia providing libgl does not depend on libxdamage
-	depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
-	cd $srcdir/build/krfb
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/krfb
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdenetwork/kdenetwork-kget.install b/staging/kdenetwork/kdenetwork-kget.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdenetwork/kdenetwork-kopete.install b/staging/kdenetwork/kdenetwork-kopete.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdenetwork/kdenetwork-kppp.install b/staging/kdenetwork/kdenetwork-kppp.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdenetwork/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD
deleted file mode 100644
index c679d03e5..000000000
--- a/staging/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 160983 2012-06-07 20:19:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.8.4
-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.xz")
-sha1sums=('3a375afb62b4ee01d491c4787b559132317aa983')
-
-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/kdepim-runtime/kdepim-runtime.install b/staging/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdepim-runtime/kdepim-runtime.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/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD
deleted file mode 100644
index 0443acf50..000000000
--- a/staging/kdepim/PKGBUILD
+++ /dev/null
@@ -1,244 +0,0 @@
-# $Id: PKGBUILD 161046 2012-06-07 21:01:36Z 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.4
-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.xz")
-sha1sums=('aae8f027ab1ef75283d6e4b2bdf76c91d04087ea')
-
-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/staging/kdepim/kdepim-kleopatra.install b/staging/kdepim/kdepim-kleopatra.install
deleted file mode 100644
index 5787df72f..000000000
--- a/staging/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/staging/kdepim/kdepim-kmail.install b/staging/kdepim/kdepim-kmail.install
deleted file mode 100644
index 5787df72f..000000000
--- a/staging/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/staging/kdepim/kdepim-korganizer.install b/staging/kdepim/kdepim-korganizer.install
deleted file mode 100644
index 5787df72f..000000000
--- a/staging/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/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdepim/kdepim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD
deleted file mode 100644
index e106a1f2f..000000000
--- a/staging/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 160978 2012-06-07 20:13:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.8.4
-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')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('34f693ac71896d0d8653fc2a81323d1e91531bb2')
-
-build() {
-	cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgname}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd $srcdir/build
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/staging/kdepimlibs/kdepimlibs.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index 671925434..000000000
--- a/staging/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,619 +0,0 @@
-# $Id: PKGBUILD 161047 2012-06-07 21:02:44Z 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.4
-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.xz")
-sha1sums=('725d26e3aa59d02bc73a77b43e6aae92bc961254')
-
-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/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
\ No newline at end of file
diff --git a/staging/kdesdk-kate/PKGBUILD b/staging/kdesdk-kate/PKGBUILD
deleted file mode 100644
index 56fe82a45..000000000
--- a/staging/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 160987 2012-06-07 20:22:16Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-katepart'
-         'kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.8.4
-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.xz"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('5a70b64c92892781d50781fcaac81ff352ec3ed9'
-          '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
-  make
-}
-
-package_kdebase-katepart() {
-  pkgdesc="A fast and feature-rich text editor component"
-  depends=('kdelibs')
-  url="http://kate-editor.org/about-katepart/"
-  install='kdebase-katepart.install'
-
-  cd "${srcdir}"/build/part
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  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/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  groups=('kde' 'kdesdk')
-  url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-  optdepends=('kdebase-konsole: open a terminal in Kate')
-
-  cd "${srcdir}"/build/kate
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kate
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdesdk-kate/kdebase-katepart.install b/staging/kdesdk-kate/kdebase-katepart.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdesdk-kate/kdebase-katepart.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/kdesdk-kate/kdebase-kwrite.install b/staging/kdesdk-kate/kdebase-kwrite.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdesdk-kate/kdebase-kwrite.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdesdk-kate/kdesdk-kate.install b/staging/kdesdk-kate/kdesdk-kate.install
deleted file mode 100644
index 0446d161b..000000000
--- a/staging/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/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch b/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch
deleted file mode 100644
index 27729d1ad..000000000
--- a/staging/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/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD
deleted file mode 100644
index 8d1a4d2b8..000000000
--- a/staging/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,264 +0,0 @@
-# $Id: PKGBUILD 161048 2012-06-07 21:04:07Z 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.4
-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.xz"
-        'fix-python2-path.patch')
-sha1sums=('62c176ee3dda5bbc013db7d1033ff89c105e3fd1'
-          '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')
-    optdepends=('bzr: bazaar support'
-                'git: git support'
-                'mercurial: hg support'
-                'subversion: svn support')
-	install='kdesdk.install'
-    for i in bazaar git hg svn; do
-        cd $srcdir/build/dolphin-plugins/$i
-    	make DESTDIR=$pkgdir install
-    done
-}
-
-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=('kdebase-runtime' 'kdepimlibs')
-        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-kompare.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-python2')
-	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.py
-  sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{{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/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch
deleted file mode 100644
index 720487031..000000000
--- a/staging/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/staging/kdesdk/kdesdk-cervisia.install b/staging/kdesdk/kdesdk-cervisia.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdesdk/kdesdk-kcachegrind.install b/staging/kdesdk/kdesdk-kcachegrind.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdesdk/kdesdk-kompare.install b/staging/kdesdk/kdesdk-kompare.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdesdk/kdesdk-kuiviewer.install b/staging/kdesdk/kdesdk-kuiviewer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdesdk/kdesdk-lokalize.install b/staging/kdesdk/kdesdk-lokalize.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdesdk/kdesdk-okteta.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdesdk/kdesdk-umbrello.install b/staging/kdesdk/kdesdk-umbrello.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdesdk/kdesdk.install b/staging/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdesdk/kdesdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD
deleted file mode 100644
index bed520be2..000000000
--- a/staging/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 161049 2012-06-07 21:04:47Z 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.4
-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.xz")
-sha1sums=('dd5f63f0e833135bac73a2e12692b1e6dd412f67')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdetoys-amor() {
-	pkgdesc='On-Screen Creature'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/amor
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/amor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
-	pkgdesc='Tea Cooker'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/kteatime
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kteatime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
-	pkgdesc='KTux'
-	depends=('kdebase-workspace' )
-	install='kdetoys.install'
-	cd $srcdir/build/ktux
-	make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdetoys/kdetoys.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/kdeutils-filelight/PKGBUILD b/staging/kdeutils-filelight/PKGBUILD
deleted file mode 100644
index 1b7ab972c..000000000
--- a/staging/kdeutils-filelight/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 161051 2012-06-07 21:05:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-filelight
-pkgver=4.8.4
-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.xz")
-sha1sums=('3023e9daa8bc5271bed3f3c08076952bcaf75efd')
-
-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/staging/kdeutils-filelight/kdeutils-filelight.install b/staging/kdeutils-filelight/kdeutils-filelight.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeutils-kcalc/PKGBUILD b/staging/kdeutils-kcalc/PKGBUILD
deleted file mode 100644
index e913b2928..000000000
--- a/staging/kdeutils-kcalc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161052 2012-06-07 21:06:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcalc
-pkgver=4.8.4
-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.xz")
-sha1sums=('f1cb6cda210c67fd19eca387df2d2224393d45ef')
-
-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/staging/kdeutils-kcalc/kdeutils-kcalc.install b/staging/kdeutils-kcalc/kdeutils-kcalc.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeutils-kcharselect/PKGBUILD b/staging/kdeutils-kcharselect/PKGBUILD
deleted file mode 100644
index 9fa85d2a3..000000000
--- a/staging/kdeutils-kcharselect/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161053 2012-06-07 21:06:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcharselect
-pkgver=4.8.4
-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.xz")
-sha1sums=('0e00a25ca3c813ab335cd12ff0ec4b1f22c8076c')
-
-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/staging/kdeutils-kdf/PKGBUILD b/staging/kdeutils-kdf/PKGBUILD
deleted file mode 100644
index 3cfef1202..000000000
--- a/staging/kdeutils-kdf/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161054 2012-06-07 21:06:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kdf
-pkgver=4.8.4
-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.xz")
-sha1sums=('c83f9659d693f27166519969f85c630fdeaa3d9c')
-
-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/staging/kdeutils-kdf/kdeutils-kdf.install b/staging/kdeutils-kdf/kdeutils-kdf.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeutils-kfloppy/PKGBUILD b/staging/kdeutils-kfloppy/PKGBUILD
deleted file mode 100644
index d2ae2567e..000000000
--- a/staging/kdeutils-kfloppy/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161055 2012-06-07 21:07:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kfloppy
-pkgver=4.8.4
-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.xz")
-sha1sums=('597e7d1fa546a898b4e46a9750632be8dc8a01a7')
-
-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/staging/kdeutils-kfloppy/kdeutils-kfloppy.install b/staging/kdeutils-kfloppy/kdeutils-kfloppy.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeutils-kgpg/PKGBUILD b/staging/kdeutils-kgpg/PKGBUILD
deleted file mode 100644
index d2f0babf6..000000000
--- a/staging/kdeutils-kgpg/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161056 2012-06-07 21:07:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kgpg
-pkgver=4.8.4
-pkgrel=1
-pkgdesc='A GnuPG frontend'
-url='http://kde.org/applications/utilities/kgpg/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('4b201d0db0d97d258597b0b345848acec5bd0130')
-
-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/staging/kdeutils-kgpg/kdeutils-kgpg.install b/staging/kdeutils-kgpg/kdeutils-kgpg.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeutils-kremotecontrol/PKGBUILD b/staging/kdeutils-kremotecontrol/PKGBUILD
deleted file mode 100644
index c4603ff7a..000000000
--- a/staging/kdeutils-kremotecontrol/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kremotecontrol
-pkgver=4.8.4
-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.xz")
-sha1sums=('2c967b6d5738d3947401d9055f0956dfd16b2ec2')
-
-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/staging/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install b/staging/kdeutils-kremotecontrol/kdeutils-kremotecontrol.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeutils-ksecrets/PKGBUILD b/staging/kdeutils-ksecrets/PKGBUILD
deleted file mode 100644
index 1ebadf22d..000000000
--- a/staging/kdeutils-ksecrets/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161058 2012-06-07 21:12:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ksecrets
-pkgver=4.8.4
-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' 'qca-ossl')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksecrets-${pkgver}.tar.xz")
-sha1sums=('d0fd2c601833cf1ffe52760472e22d667a6a6408')
-
-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/staging/kdeutils-ksecrets/kdeutils-ksecrets.install b/staging/kdeutils-ksecrets/kdeutils-ksecrets.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdeutils-ktimer/PKGBUILD b/staging/kdeutils-ktimer/PKGBUILD
deleted file mode 100644
index 0b0024a7b..000000000
--- a/staging/kdeutils-ktimer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161059 2012-06-07 21:13:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ktimer
-pkgver=4.8.4
-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.xz")
-sha1sums=('39e117449beffa8e2a38f7b45f69965a71de3805')
-
-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/staging/kdeutils-ktimer/kdeutils-ktimer.install b/staging/kdeutils-ktimer/kdeutils-ktimer.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/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/staging/kdeutils-kwallet/PKGBUILD b/staging/kdeutils-kwallet/PKGBUILD
deleted file mode 100644
index ffdc2773b..000000000
--- a/staging/kdeutils-kwallet/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161060 2012-06-07 21:13:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kwallet
-pkgver=4.8.4
-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.xz")
-sha1sums=('8c85c9de379f0e8ad8a3dffc2136c6b25c0fa4a9')
-
-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/staging/kdeutils-kwallet/kdeutils-kwallet.install b/staging/kdeutils-kwallet/kdeutils-kwallet.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdeutils-superkaramba/PKGBUILD b/staging/kdeutils-superkaramba/PKGBUILD
deleted file mode 100644
index 75a276a5f..000000000
--- a/staging/kdeutils-superkaramba/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161062 2012-06-07 21:14:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-superkaramba
-pkgver=4.8.4
-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.xz")
-sha1sums=('b013e4bd063790e5970cf798f247edb87d576900')
-
-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/staging/kdeutils-superkaramba/kdeutils-superkaramba.install b/staging/kdeutils-superkaramba/kdeutils-superkaramba.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/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/staging/kdeutils-sweeper/PKGBUILD b/staging/kdeutils-sweeper/PKGBUILD
deleted file mode 100644
index 83403779c..000000000
--- a/staging/kdeutils-sweeper/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161063 2012-06-07 21:14:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-sweeper
-pkgver=4.8.4
-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.xz")
-sha1sums=('8a4dd11724ed14987981dfaa60e742cfd80ee6d9')
-
-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/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD
deleted file mode 100644
index 436307f25..000000000
--- a/staging/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 161064 2012-06-07 21:15:01Z 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.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('bab86ef6c04515a454298cee46eccb25e590f972')
-
-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=('kdebase-runtime' 'kdepimlibs' '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/staging/kdewebdev/kdewebdev-kimagemapeditor.install b/staging/kdewebdev/kdewebdev-kimagemapeditor.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/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/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdewebdev/kdewebdev.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/konversation/PKGBUILD b/staging/konversation/PKGBUILD
deleted file mode 100644
index ee8a55574..000000000
--- a/staging/konversation/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 168681 2012-10-14 00:39:34Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: James Rayner <iphitus@gmail.com>
-# Contributor: Sergio Jovani Guzman <moret@paretux.org>
-
-pkgname=konversation
-pkgver=1.4
-pkgrel=3
-pkgdesc="A user friendly IRC client for KDE"
-arch=('i686' 'x86_64')
-url="http://konversation.kde.org"
-depends=('kdebase-runtime' 'kdepimlibs')
-makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
-optdepends=('python: python scripting support')
-license=('GPL2' 'FDL')
-install=${pkgname}.install
-options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-  
-  # Remove a bunch of symlinks pointing to non-existant files
-  for _lang in pt_BR uk sv et de en nl; do
-     rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
-  done
-}
diff --git a/staging/konversation/konversation.install b/staging/konversation/konversation.install
deleted file mode 100644
index 8834e059a..000000000
--- a/staging/konversation/konversation.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/kradio/PKGBUILD b/staging/kradio/PKGBUILD
deleted file mode 100644
index 2071f88e9..000000000
--- a/staging/kradio/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 160707 2012-06-04 07:57:09Z eric $
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.4
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL2')
-pkgdesc="A comfortable KDE internet and AM/FM radio application"
-url="http://kradio.sourceforge.net/"
-depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
-makedepends=('automoc4' 'cmake')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc})
-md5sums=('4b5495a4f1dda21f7201bc8db0d4f95e'
-         '51c6d4ec0047d2df595b458bde285012')
-
-build() {
-  cd "$srcdir"
-  mkdir build
-  cd build
-  cmake ../${pkgname}4-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/kradio/kradio.install b/staging/kradio/kradio.install
deleted file mode 100644
index 460e85d7f..000000000
--- a/staging/kradio/kradio.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/staging/krb5/PKGBUILD b/staging/krb5/PKGBUILD
deleted file mode 100644
index 89899a36c..000000000
--- a/staging/krb5/PKGBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# $Id: PKGBUILD 161299 2012-06-09 01:56:21Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=krb5
-pkgver=1.10.2
-pkgrel=2
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url="http://web.mit.edu/kerberos/"
-license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar
-        krb5-1.10.1-gcc47.patch
-        krb5-kadmind
-        krb5-kadmind.service
-        krb5-kdc
-        krb5-kdc.service
-        krb5-kpropd
-        krb5-kpropd.service
-        krb5-kpropd@.service
-        krb5-kpropd.socket)
-sha1sums=('8b6e2c5bf0c65aacd368b3698add7888f2a7332d'
-          '78b759d566b1fdefd9bbcd06df14f07f12effe96'
-          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
-          'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
-          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e'
-          '7f402078fa65bb9ff1beb6cbbbb017450df78560'
-          '614401dd4ac18e310153240bb26eb32ff1e8cf5b'
-          '023a8164f8ee7066ac814486a68bc605e79f6101'
-          'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${pkgname}-${pkgver}.tar.gz
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-
-   # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized
-   # in this function [-Werror=maybe-uninitialized]
-   # As this is generated code, just ignore the complaint.
-   patch -Np2 -i ../../krb5-1.10.1-gcc47.patch
-   rm lib/krb5/krb/deltat.c
-
-   # FS#25384
-   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-
-   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
-   export CPPFLAGS+=" -I/usr/include/et"
-   ./configure --prefix=/usr \
-               --mandir=/usr/share/man \
-               --localstatedir=/var/lib \
-               --enable-shared \
-               --with-system-et \
-               --with-system-ss \
-               --disable-rpath \
-               --without-tcl \
-               --enable-dns-for-realm \
-               --with-ldap \
-               --without-system-verto
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install
-
-   # Fix FS#29889
-   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples
-
-   # Sample KDC config file
-   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
-   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
-
-   # Default configuration file
-   install -dm 755 "${pkgdir}"/etc
-   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
-
-   install -dm 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d
-
-   install -dm 755 "${pkgdir}"/usr/share/aclocal
-   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
-
-   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-   # systemd stuff
-   install -dm 755 "${pkgdir}"/usr/lib/systemd/system
-   install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \
-      "${pkgdir}"/usr/lib/systemd/system
-}
diff --git a/staging/krb5/krb5-1.10.1-gcc47.patch b/staging/krb5/krb5-1.10.1-gcc47.patch
deleted file mode 100644
index ffd01c2a3..000000000
--- a/staging/krb5/krb5-1.10.1-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
---- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y	2011-09-06 07:34:32.000000000 -0400
-+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y	2012-03-24 13:15:11.543551318 -0400
-@@ -44,6 +44,7 @@
- #ifdef __GNUC__
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wuninitialized"
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- #endif
- 
- #include <ctype.h>
diff --git a/staging/krb5/krb5-kadmind b/staging/krb5/krb5-kadmind
deleted file mode 100644
index 04df0dcff..000000000
--- a/staging/krb5/krb5-kadmind
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Admin Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kadmind
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Admin Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/staging/krb5/krb5-kadmind.service b/staging/krb5/krb5-kadmind.service
deleted file mode 100644
index f3836c898..000000000
--- a/staging/krb5/krb5-kadmind.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 administration server
-
-[Service]
-ExecStart=/usr/sbin/kadmind -nofork
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/krb5/krb5-kdc b/staging/krb5/krb5-kdc
deleted file mode 100644
index 05a03411e..000000000
--- a/staging/krb5/krb5-kdc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/krb5kdc`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Authentication"
-        if [ -z "$PID" ]; then
-           /usr/sbin/krb5kdc
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Authentication"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/staging/krb5/krb5-kdc.service b/staging/krb5/krb5-kdc.service
deleted file mode 100644
index 6ec93bb72..000000000
--- a/staging/krb5/krb5-kdc.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 KDC
-
-[Service]
-ExecStart=/usr/sbin/krb5kdc -n
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/krb5/krb5-kpropd b/staging/krb5/krb5-kpropd
deleted file mode 100644
index a0077d68e..000000000
--- a/staging/krb5/krb5-kpropd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kpropd`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Database Propagation Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kpropd -S
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon kpropd
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Database Propagation Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon kpropd
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/staging/krb5/krb5-kpropd.service b/staging/krb5/krb5-kpropd.service
deleted file mode 100644
index a7c5b579d..000000000
--- a/staging/krb5/krb5-kpropd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Service]
-ExecStart=/usr/sbin/kpropd -S
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/krb5/krb5-kpropd.socket b/staging/krb5/krb5-kpropd.socket
deleted file mode 100644
index 4389290c0..000000000
--- a/staging/krb5/krb5-kpropd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Socket]
-ListenStream=754
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/staging/libdrm/COPYING b/staging/libdrm/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/staging/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/staging/libdrm/PKGBUILD b/staging/libdrm/PKGBUILD
deleted file mode 100644
index af789e2a9..000000000
--- a/staging/libdrm/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 161498 2012-06-12 01:59:59Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libdrm
-pkgver=2.4.35
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-replaces=('libdrm-new' 'libdrm-nouveau')
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-)
-sha1sums=('a1d8d4945f782371d7855dbd693db885bd7e3d83'
-          '2a5410baa3e6e078f9378ce486a88f41d22fd838'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../no-pthread-stubs.patch
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-vmwgfx-experimental-api
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make -k check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 ../COPYING "$pkgdir/usr/share/licenses/$pkgname/"
-}
diff --git a/staging/libdrm/git_fixes.diff b/staging/libdrm/git_fixes.diff
deleted file mode 100644
index dc80155f2..000000000
--- a/staging/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/staging/libdrm/no-pthread-stubs.patch b/staging/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index 6745f4bc4..000000000
--- a/staging/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,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@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +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 \
diff --git a/staging/libimobiledevice/PKGBUILD b/staging/libimobiledevice/PKGBUILD
deleted file mode 100644
index 46ae8c1e2..000000000
--- a/staging/libimobiledevice/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 163816 2012-07-20 15:09:08Z tomegun $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libimobiledevice
-pkgver=1.1.4
-pkgrel=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')
-license=('GPL2' 'LGPL2.1')
-depends=('usbmuxd' 'gnutls' 'libgcrypt')
-options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('3f28cbc6a2e30d34685049c0abde5183')
diff --git a/staging/libimobiledevice/swig-version-check.patch b/staging/libimobiledevice/swig-version-check.patch
deleted file mode 100644
index c56b095db..000000000
--- a/staging/libimobiledevice/swig-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
---- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false
diff --git a/staging/libkdcraw/PKGBUILD b/staging/libkdcraw/PKGBUILD
deleted file mode 100644
index 5f6f4ec2e..000000000
--- a/staging/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 160996 2012-06-07 20:29:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.8.4
-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.xz")
-sha1sums=('ba67432cb3353a55d57ae749b42919399dfda3e2')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkdcraw/libkdcraw.install b/staging/libkdcraw/libkdcraw.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkdcraw/libkdcraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/libkdeedu/PKGBUILD b/staging/libkdeedu/PKGBUILD
deleted file mode 100644
index 1bd7cb89b..000000000
--- a/staging/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 160994 2012-06-07 20:28:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.8.4
-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.xz")
-sha1sums=('055fa35db3c482c61f8eab7d1912532823a88726')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkdeedu/libkdeedu.install b/staging/libkdeedu/libkdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkdeedu/libkdeedu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD
deleted file mode 100644
index c3c77a8f3..000000000
--- a/staging/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164638 2012-08-01 17:27:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.9.0
-pkgrel=3
-pkgdesc="A library to manipulate pictures metadata"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
-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.xz")
-sha1sums=('121c63ebf328ca87e67b7cf0cf72d0f276e4ae2c')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD
deleted file mode 100644
index 1714d1617..000000000
--- a/staging/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.4
-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.xz")
-sha1sums=('d30ef671be8caf8eb9ead68de53cf187f0fcf88b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkipi/libkipi.install b/staging/libkipi/libkipi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkipi/libkipi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/libksane/PKGBUILD b/staging/libksane/PKGBUILD
deleted file mode 100644
index b695d5cd8..000000000
--- a/staging/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 160999 2012-06-07 20:30:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.8.4
-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.xz")
-sha1sums=('5ac35d8478ccace1495ae42eb2169918cebc8d95')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libksane/libksane.install b/staging/libksane/libksane.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libksane/libksane.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/libmpc/PKGBUILD b/staging/libmpc/PKGBUILD
deleted file mode 100644
index 6a77bce43..000000000
--- a/staging/libmpc/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 165110 2012-08-11 08:18:39Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=libmpc
-pkgver=1.0
-pkgrel=1
-pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
-arch=('i686' 'x86_64')
-url="http://www.multiprecision.org/"
-license=('LGPL')
-depends=('mpfr>=3.0.0')
-options=('!libtool')
-install=libmpc.install
-source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz)
-md5sums=('13370ceb2e266c5eeb2f7e78c24b7858')
-
-build() {
-  cd "${srcdir}/mpc-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/mpc-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/mpc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info
-}
diff --git a/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
deleted file mode 100644
index 3bf324728..000000000
--- a/staging/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- trunk/configure.ac	2011/02/21 12:18:31	932
-+++ trunk/configure.ac	2011/02/21 16:41:09	936
-@@ -33,7 +33,7 @@
- AC_CANONICAL_HOST
- AC_CONFIG_MACRO_DIR([m4])
- 
--dnl Extra arguments to configure
-+# Extra arguments to configure
- AC_ARG_WITH([mpfr_include],
-             [AC_HELP_STRING([--with-mpfr-include=DIR],
-                             [MPFR include directory])],
-@@ -85,18 +85,19 @@
-              )
- 
- 
--dnl Setup CC and CFLAGS
-+# Setup CC and CFLAGS
-+AC_PROG_CC
-+AC_LANG(C)
- 
--dnl Check for user specification of CC or CFLAGS
-+# Set up LibTool
-+AC_PROG_LIBTOOL
-+
-+# Check for user specification of CC or CFLAGS
- if test -n "$CFLAGS" || test -n "$CC" ; then
-    user_redefine_cc=yes
- fi
- 
--# Check for programs
--AC_PROG_CC
--AC_LANG(C)
--
--dnl Check GMP Header
-+# Check GMP Header
- AC_MSG_CHECKING(for gmp.h)
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include "gmp.h"
-@@ -105,22 +106,19 @@
-  AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
- ])
- 
--dnl Check for GMP CFLAGS in gmp.h
-+# Check for GMP CFLAGS in gmp.h
- if test -z "$user_redefine_cc" ; then
-    MPC_GMP_CC_CFLAGS
- fi
- 
- 
--dnl Configs for Windows DLLs
-+# Configs for Windows DLLs
- case $host in
-   *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      MPC_WINDOWS
- esac
- 
- 
--dnl Finally set up LibTool
--AC_PROG_LIBTOOL
--
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
diff --git a/staging/libmpc/libmpc.install b/staging/libmpc/libmpc.install
deleted file mode 100644
index b0718c745..000000000
--- a/staging/libmpc/libmpc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libmpc.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/staging/libofx/PKGBUILD b/staging/libofx/PKGBUILD
deleted file mode 100644
index eeeca6a9e..000000000
--- a/staging/libofx/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 165073 2012-08-09 23:42:01Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgbase=libofx
-pkgname=('libofx' 'libofx-doc')
-pkgver=0.9.5
-pkgrel=1
-pkgdesc="API for the OFX banking standard"
-arch=('i686' 'x86_64')
-url="http://libofx.sourceforge.net"
-license=('GPL')
-depends=('opensp' 'curl' 'libxml++')
-checkdepends=('gnupg')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch)
-sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73'
-          '6c327e24543cb8ba901bfb204343a85c68264654')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  patch -p1 -i "$srcdir/libofx-gcc47.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  make check
-}
-
-package_libofx() {
-  options=('!libtool' '!docs')
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-package_libofx-doc() {
-  pkgdesc="Documention of the OFX banking standard API"
-  depends=()
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install-docDATA
-  make -C doc DESTDIR="$pkgdir" install
-}
diff --git a/staging/libofx/libofx-gcc47.patch b/staging/libofx/libofx-gcc47.patch
deleted file mode 100644
index 899fe09e0..000000000
--- a/staging/libofx/libofx-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff
---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp	2011-03-30 22:30:50.000000000 +0000
-+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp	2012-04-17 06:08:38.711940892 +0000
-@@ -37,6 +37,7 @@
- #include <vector>
- #include <algorithm>
- #include <string.h>
-+#include <unistd.h>
- 
- using std::string;
- using std::vector;
diff --git a/staging/libotr/PKGBUILD b/staging/libotr/PKGBUILD
deleted file mode 100644
index ebc81d058..000000000
--- a/staging/libotr/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 166024 2012-09-04 14:32:25Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Bug <Bug2000@gmail.com>
-
-pkgname=libotr
-pkgver=4.0.0
-pkgrel=1
-pkgdesc='Off-the-Record Messaging Library and Toolkit'
-url='http://www.cypherpunks.ca/otr/'
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-depends=('libgcrypt')
-options=('!libtool')
-source=("http://www.cypherpunks.ca/otr/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('8865e9011b8674290837afcf7caf90c492ae09cc')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --mandir=/usr/share/man --disable-static
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libpst/PKGBUILD b/staging/libpst/PKGBUILD
deleted file mode 100644
index ee01ca472..000000000
--- a/staging/libpst/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 163183 2012-07-08 14:59:15Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libpst
-pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.five-ten-sg.com/libpst/"
-license=('GPL')
-makedepends=('python2' 'boost')
-source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-      --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
-  make
-}
-
-package_libpst() {
-  pkgdesc="Outlook .pst file converter"
-  depends=('gcc-libs')
-  optdepends=('boost-libs: for libpst python interface')
-  options=('!libtool' '!docs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libpst-docs() {
-  pkgdesc="Documentation for Outlook .pst file converter"
-  options=('!libtool')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-htmlDATA
-  cd "${srcdir}/${pkgbase}-${pkgver}/html"
-  make DESTDIR="${pkgdir}" install-htmldevelDATA
-}
diff --git a/staging/libreoffice/PKGBUILD b/staging/libreoffice/PKGBUILD
deleted file mode 100644
index bdc003773..000000000
--- a/staging/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,711 +0,0 @@
-# $Id: PKGBUILD 168948 2012-10-16 19:11:51Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=3.6.2.2
-pkgver=3.6.2
-pkgrel=3
-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.20.5' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-             # 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' 'libxslt' 'librsvg' "icu>=49.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2'
-             '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"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.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}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	make-pyuno-work-with-system-wide-module-install.diff
-	buildfix.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	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
-	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.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
-	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('ae171ba4633cc72dba4451b1bdd3385e'
-         'cdad0734d247d91a79cb282fd851d2a7'
-         'e9a7e3d35432b72a4603ce094deb6a67'
-         '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '94e7f271e38c976462558b4278590178'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '6097739c841f671cb21332b9cc593ae7'
-         '0d2dcdfbf28d6208751b33057f5361f0'
-         'ce5a1def34578b75959ac31210f031f6'
-         '185d60944ea767075d27247c3162b3bc'
-         '97bf43dda273d79ff90c848ab53b0e3c'
-         '234e91ac65945ce1ab1e3839780e90f7'
-         'abcb1b0a7deaffe13ab3d7ca70becb49'
-         '72790a4103da259a55cadd66db931d00')
-
-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
-    patch -Np1 -i ${srcdir}/buildfix.diff	# leaves out a broken pdfimport test
-    
-    # fix not upstreamable pyuno paths - patch taken from Debian
-    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-    
-	#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" \
-
-	./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\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libexttextcat \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--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/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-clucene\
-		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
-}
-
-#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=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
- 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'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin')
- 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 .
- 
- # set python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- 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."
- install=libreoffice-draw.install
- 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."
- install=libreoffice-impress.install
- depends=('libreoffice-common')
- optdepends=('glu:             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 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/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 environment path to keep compatibility with openjdk6 and openjdk7
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-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 Application for LibreOffice."
- install=libreoffice-writer.install
- 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.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
-}
-
-package_libreoffice-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/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-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/program/{classes,services}
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-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}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-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}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/staging/libreoffice/PKGBUILD.36 b/staging/libreoffice/PKGBUILD.36
deleted file mode 100644
index 71ee72c1c..000000000
--- a/staging/libreoffice/PKGBUILD.36
+++ /dev/null
@@ -1,715 +0,0 @@
-# $Id: PKGBUILD 160067 2012-05-29 19:20:54Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
-_LOver=3.6.0.4
-pkgver=3.6.0
-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' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-              #'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' 'libxslt' 'librsvg' "icu>=49.1" 
-             '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"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.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}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	buildfix.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	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
-	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.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
-	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('67cf97e86c75363238a371f64ef5f606'
-         '8422b0c4c797abeefed3ee4490586dd2'
-         '6cc8fa86be8c657ba23434c6c8d99416'
-         '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         'a9a1db27688bad49418667b434d29c1f'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '6097739c841f671cb21332b9cc593ae7'
-         '0d2dcdfbf28d6208751b33057f5361f0'
-         'ce5a1def34578b75959ac31210f031f6'
-         '185d60944ea767075d27247c3162b3bc'
-         '234e91ac65945ce1ab1e3839780e90f7'
-         'f0e72d0e1bc93a50a3aa9d31350b156c'
-         '867c682b45f477f916786e00c45d7ab7')
-
-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
-    patch -Np1 -i ${srcdir}/buildfix.diff
-    
-	#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" \
-
-	./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\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libexttextcat \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--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/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-clucene\
-		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	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=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'clucene:          full-text search engine library 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 .
- 
- # set python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # no file-list so far
- install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
- 
- # create directories from *list.txt file
-# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   install -dm755 ${pkgdir}/${directory/\%dir/}
-# done
-# # install files into the pkg from fakeinstall dir
-# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   dirname=`dirname $file`
-#   # check if directory has been already been created - some are missing like manpages
-#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-#   # mv file from fakeinstall to pkgdir
-#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
-# done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- 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."
- install=libreoffice-draw.install
- 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."
- install=libreoffice-impress.install
- 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 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/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 environment path to keep compatibility with openjdk6 and openjdk7
-  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-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 Application for LibreOffice."
- install=libreoffice-writer.install
- 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.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
-}
-
-package_libreoffice-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/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-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/program/{classes,services}
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-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}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-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}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/staging/libreoffice/buildfix.diff b/staging/libreoffice/buildfix.diff
deleted file mode 100644
index 327b10bb1..000000000
--- a/staging/libreoffice/buildfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk	2012-06-07 13:57:10.000000000 +0200
-+++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new	2012-06-09 18:21:03.376024873 +0200
-@@ -49,9 +49,6 @@
-     StaticLibrary_pdfimport_s \
- ))
- 
--$(eval $(call gb_Module_add_check_targets,sdext,\
--    CppunitTest_pdfimport \
--))
- endif
- 
- ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
diff --git a/staging/libreoffice/buildfix_icu49.diff b/staging/libreoffice/buildfix_icu49.diff
deleted file mode 100644
index 7a774dee0..000000000
--- a/staging/libreoffice/buildfix_icu49.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=410307
-
---- i18npool/source/breakiterator/data/char_in.txt
-+++ i18npool/source/breakiterator/data/char_in.txt
-@@ -15,7 +15,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
-@@ -72,7 +72,7 @@
- [^$Control $CR $LF] $Extend;
- 
- [^$Control $CR $LF] $SpacingMark;
--$Prepend [^$Control $CR $LF];
-+# $Prepend [^$Control $CR $LF];
- 
- 
- ## -------------------------------------------------
-@@ -94,7 +94,7 @@
- 
- $Extend      [^$Control $CR $LF];
- $SpacingMark [^$Control $CR $LF];
--[^$Control $CR $LF] $Prepend;
-+# [^$Control $CR $LF] $Prepend;
- 
- 
- ## -------------------------------------------------
---- i18npool/source/breakiterator/data/char.txt
-+++ i18npool/source/breakiterator/data/char.txt
-@@ -16,7 +16,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
diff --git a/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff b/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff
deleted file mode 100644
index ba4850c77..000000000
--- a/staging/libreoffice/fix_broken_hebrew_wordwrapping.diff
+++ /dev/null
@@ -1,360 +0,0 @@
-From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Sun, 13 May 2012 21:41:30 +0000
-Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
-
-i.e.  sync with svn diff -c 31071
-http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
-
-Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
----
-diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
-index 14051d4..ffd590c 100644
---- a/i18npool/qa/cppunit/test_breakiterator.cxx
-+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
-@@ -42,6 +42,7 @@
- #include <unotest/bootstrapfixturebase.hxx>
- 
- #include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
- 
- #include <string.h>
- 
-@@ -58,6 +59,9 @@ public:
-     void testWeak();
-     void testAsian();
-     void testThai();
-+#if TODO
-+    void testNorthernThai();
-+#endif
- 
-     CPPUNIT_TEST_SUITE(TestBreakIterator);
-     CPPUNIT_TEST(testLineBreaking);
-@@ -71,6 +71,9 @@
-     CPPUNIT_TEST(testWeak);
-     CPPUNIT_TEST(testAsian);
-     CPPUNIT_TEST(testThai);
-+#if TODO
-+    CPPUNIT_TEST(testNorthernThai);
-+#endif
-     CPPUNIT_TEST_SUITE_END();
- 
- private:
-@@ -80,28 +83,46 @@
-     uno::Reference<i18n::XBreakIterator> m_xBreak;
- };
- 
--//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation
- void TestBreakIterator::testLineBreaking()
- {
--    ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
--
-     i18n::LineBreakHyphenationOptions aHyphOptions;
-     i18n::LineBreakUserOptions aUserOptions;
-     lang::Locale aLocale;
- 
--    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
--    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
--
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=31271
-     {
--        //Here we want the line break to leave text here) on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+         ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
-+
-+        {
-+            //Here we want the line break to leave text here) on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+        }
-+
-+        {
-+            //Here we want the line break to leave "here)" on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        }
-     }
- 
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=49849
-     {
--        //Here we want the line break to leave "here)" on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD };
-+        ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
-+        ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL"));
-+
-+        {
-+            //Here we want the line break to happen at the whitespace
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1);
-+        }
-     }
- }
- 
-@@ -295,27 +320,29 @@ void TestBreakIterator::testThai()
-     aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
-     aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
- 
--    i18n::Boundary aBounds;
--    {
--        const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
-+    const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
-+}
- 
--#ifdef TODO
--    {
--        const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
--#endif
-+#if TODO
-+void TestBreakIterator::testNorthernThai()
-+{
-+    lang::Locale aLocale;
-+    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod"));
-+    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
-+
-+    const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
- }
-+#endif
- 
- void TestBreakIterator::setUp()
- {
-diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
-new file mode 100644
-index 0000000..8d7598d
---- a/dev/null
-+++ b/i18npool/source/breakiterator/data/README
-@@ -0,0 +1,12 @@
-+The originals of these come from svn checkout
-+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no
-+longer appear in the icu tarballs, but are in icu's svn
-+
-+At various stages these copies have been customized and are not horribly out of
-+sync. It unclear which diffs from the base versions are deliberate and which
-+are now accidental :-(
-+
-+We need to review the various issues referenced in the commits that caused
-+custimizations and see if they're still relevant or not, write regression tests
-+for them, if any are still relavant then apply the changes back on top of the
-+latest versions.
-diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
-index cbabee6..91c8f3d 100644
---- a/i18npool/source/breakiterator/data/line.txt
-+++ b/i18npool/source/breakiterator/data/line.txt
-@@ -61,11 +61,13 @@ $BB = [:LineBreak =  Break_Before:];
- $BK = [:LineBreak =  Mandatory_Break:];
- $B2 = [:LineBreak =  Break_Both:];
- $CB = [:LineBreak =  Contingent_Break:];
-+$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
- $CL = [:LineBreak =  Close_Punctuation:] ;
- $CM = [:LineBreak =  Combining_Mark:];
- $CR = [:LineBreak =  Carriage_Return:];
- $EX = [:LineBreak =  Exclamation:];
- $GL = [:LineBreak =  Glue:];
-+$HL = [:LineBreak =  Hebrew_Letter:];
- $HY = [:LineBreak =  Hyphen:];
- $H2 = [:LineBreak =  H2:];
- $H3 = [:LineBreak =  H3:];
-@@ -77,7 +79,7 @@ $JV = [:LineBreak =  JV:];
- $JT = [:LineBreak =  JT:];
- $LF = [:LineBreak =  Line_Feed:];
- $NL = [:LineBreak =  Next_Line:];
--$NS = [:LineBreak =  Nonstarter:];
-+$NS = [[:LineBreak =  Nonstarter:] $CJ];
- $NU = [:LineBreak =  Numeric:];
- $OP = [[:LineBreak =  Open_Punctuation:] - $DG];
- $PO = [:LineBreak =  Postfix_Numeric:];
-@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
- $CLcm = $CL $CM*;
- $EXcm = $EX $CM*;
- $GLcm = $GL $CM*;
-+$HLcm = $HL $CM*;
- $HYcm = $HY $CM*;
- $H2cm = $H2 $CM*;
- $H3cm = $H3 $CM*;
-@@ -150,6 +153,7 @@ $B2 $CM+;
- $CL $CM+;
- $EX $CM+;
- $GL $CM+;
-+$HL $CM+;
- $HY $CM+;
- $H2 $CM+;
- $H3 $CM+;
-@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
- #            so for this one case we need to manually list out longer sequences.
- #
- $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
--$AL_FOLLOW_CM   = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
-+$AL_FOLLOW_CM   = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
- $AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
- 
- 
-@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
- $BBcm [^$CB];                                  #  $BB  x
- $BBcm $LB20NonBreaks $CM*;
- 
-+# LB 21a Don't break after Hebrew + Hyphen
-+#   HL (HY | BA) x
-+#  
-+$HLcm ($HYcm | $BAcm) [^$CB]?;
-+
- # LB 22
--$ALcm    $INcm;
-+($ALcm | $HLcm) $INcm;
- $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
- $IDcm    $INcm;
- $INcm    $INcm;
-@@ -331,16 +340,18 @@ $NUcm    $INcm;
- # $LB 23
- $IDcm  $POcm;
- $ALcm  $NUcm;       # includes $LB19
-+$HLcm  $NUcm;
- $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
- $NUcm  $ALcm;
-+$NUcm  $HLcm;
- 
- #
- # LB 24
- #
- $PRcm $IDcm;
- $ALcm $PRcm;
--$PRcm $ALcm;
--$POcm $ALcm;
-+$PRcm ($ALcm | $HLcm);
-+$POcm ($ALcm | $HLcm);
- 
- #
- # LB 25   Numbers.
-@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
- 
- # LB 28   Do not break between alphabetics
- #
--$ALcm $ALcm;
--$CM+ $ALcm;      # The $CM+ is from rule 10, and unattached CM is treated as AL
-+($ALcm | $HLcm) ($ALcm | $HLcm);
-+$CM+ ($ALcm | $HLcm);      # The $CM+ is from rule 10, an unattached CM is treated as AL
- 
- # LB 29
- $IScm ($ALcm | $NUcm);
-@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
- # Rule 30   Do not break between letters, numbers or ordinary symbols
- #           and opening or closing punctuation
- #
--($ALcm | $NUcm) $OPcm;
-+($ALcm | $HLcm | $NUcm) $OPcm;
- $CM+ $OPcm;
--$CLcm ($ALcm | $NUcm);
--
--
-+$CLcm ($ALcm | $HLcm | $NUcm);
- 
- #
- #  Reverse Rules.
-@@ -391,6 +400,7 @@ $CM+ $B2;
- $CM+ $CL;
- $CM+ $EX;
- $CM+ $GL;
-+$CM+ $HL;
- $CM+ $HY;
- $CM+ $H2;
- $CM+ $H3;
-@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
- $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
- [^$CB] $CM* $BB;                                      # 
- 
--
-+# LB21a
-+[^$CB] $CM* ($HY | $BA) $CM* $HL;
- 
- # LB 22
--$CM* $IN $CM* $ALPlus;
-+$CM* $IN $CM* ($ALPlus | $HL);
- $CM* $IN $CM* $ID;
- $CM* $IN $CM* $IN;
- $CM* $IN $CM* $NU;
- 
- # LB 23
- $CM* $PO $CM* $ID;
--$CM* $NU $CM* $ALPlus;
--$CM* $ALPlus $CM* $NU;
-+$CM* $NU $CM* ($ALPlus | $HL);
-+$CM* ($ALPlus | $HL) $CM* $NU;
- 
- # LB 24
- $CM* $ID $CM* $PR;
- $CM* $PR $CM* $ALPlus;
--$CM* $ALPlus $CM* $PR;
--$CM* $ALPlus $CM* $PO;
-+$CM* ($ALPlus | $HL) $CM* $PR;
-+$CM* ($ALPlus | $HL) $CM* $PO;
- 
- $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
- $CM* $NU+ $CM* $HY+ / $SP;
-@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
- $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
- 
- # LB 28
--$CM* $ALPlus $CM* $ALPlus;
--
-+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
- 
- # LB 29
- $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
- 
- # LB 30
--$CM* $OP $CM* ($NU | $ALPlus);
--$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
-+$CM* $OP $CM* ($ALPlus | $HL | $NU);
-+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
- 
- 
- ## -------------------------------------------------
-@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
- $SP+ $CM* $CL;
- $SP+ $CM* $B2;
- 
-+# LB 21
-+$CM* ($HY | $BA) $CM* $HL;
-+
- # LB 18
- ($CM* ($IS | $SY))+ $CM* $NU;
- $CL $CM* ($NU | $IS | $SY);
-@@ -629,6 +642,6 @@ $dictionary $dictionary;
- #  turn off rule chaining.  We don't want to move more
- #  than necessary.
- #
--[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
-+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
- $dictionary $dictionary;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/libreoffice/libreoffice-base.install b/staging/libreoffice/libreoffice-base.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-base.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/libreoffice/libreoffice-calc.install b/staging/libreoffice/libreoffice-calc.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-calc.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/libreoffice/libreoffice-common.csh b/staging/libreoffice/libreoffice-common.csh
deleted file mode 100644
index 5efa39404..000000000
--- a/staging/libreoffice/libreoffice-common.csh
+++ /dev/null
@@ -1,8 +0,0 @@
-#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
-
-# to force a certain look'n feel
-
-#setenv SAL_USE_VCLPLUGIN gen
-#setenv SAL_USE_VCLPLUGIN kde4
-#setenv SAL_USE_VCLPLUGIN gtk
-#setenv SAL_USE_VCLPLUGIN gtk3
diff --git a/staging/libreoffice/libreoffice-common.install b/staging/libreoffice/libreoffice-common.install
deleted file mode 100644
index e66b66f3d..000000000
--- a/staging/libreoffice/libreoffice-common.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-
-echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
-echo "-------------------------------------------------------------------"
-echo "LibreOffice has been split into several packages:"
-echo "- libreoffice-common"
-echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
-echo "-------------------------------------------------------------------"
-echo " * you need to install at least one libreoffice-langpack"
-echo " * you may want to pacman -Ss libreoffice-extensions"
-echo "   to see what additional extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
-         for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-#  post_install $1
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "LibreOffice has been split into several packages:"
-    echo "- libreoffice-common"
-    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
-    echo "Now you need to install at least one libreoffice-langpack!"
-  fi
-}
-
-post_remove() {
-update-desktop-database -q
-xdg-icon-resource forceupdate --theme hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/staging/libreoffice/libreoffice-common.sh b/staging/libreoffice/libreoffice-common.sh
deleted file mode 100644
index 795867125..000000000
--- a/staging/libreoffice/libreoffice-common.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
-
-# to force a certain look'n feel
-
-#export SAL_USE_VCLPLUGIN=gen
-#export SAL_USE_VCLPLUGIN=kde4
-#export SAL_USE_VCLPLUGIN=gtk
-#export SAL_USE_VCLPLUGIN=gtk3
diff --git a/staging/libreoffice/libreoffice-draw.install b/staging/libreoffice/libreoffice-draw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-draw.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/libreoffice/libreoffice-impress.install b/staging/libreoffice/libreoffice-impress.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-impress.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/libreoffice/libreoffice-writer.install b/staging/libreoffice/libreoffice-writer.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/staging/libreoffice/libreoffice-writer.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/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
deleted file mode 100644
index e86548136..000000000
--- a/staging/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index defd7b2..ea2a809 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index f93ac5e..92a2891 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
- #
- #*************************************************************************
-+import os
- import sys
- 
-+sys.path.append('/usr/lib/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc"
- import pyuno
- 
- try:
-diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
-index 610ac5f..df243d0 100755
---- a/scripting/source/pyprov/officehelper.py
-+++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
-         if "UNO_PATH" in os.environ:
-             sOffice = os.environ["UNO_PATH"]
-         else:
--            sOffice = "" # lets hope for the best
-+            sOffice = "/usr/lib/libreoffice/program"
-         sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"): 
-             sOffice += ".exe"
diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index a416c7110..000000000
--- a/staging/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163074 2012-07-06 16:12:17Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.16.1
-pkgrel=1
-epoch=1
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'geoip' 'python2')
-makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('798944301ee6ef8e0d8de3d944c59d184ef1a4d3')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \
-      --enable-python-binding \
-      --with-libgeoip=system
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/libxcb/PKGBUILD b/staging/libxcb/PKGBUILD
deleted file mode 100644
index 2ca76afe7..000000000
--- a/staging/libxcb/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 168070 2012-10-05 16:55:34Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxcb
-pkgver=1.9
-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=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 
-  ./autogen.sh --prefix=/usr \
-    --enable-xinput \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch b/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index 8e8162f0a..000000000
--- a/staging/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/staging/licq/PKGBUILD b/staging/licq/PKGBUILD
deleted file mode 100644
index f852cde06..000000000
--- a/staging/licq/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 163193 2012-07-08 16:00:41Z ibiru $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=licq
-pkgver=1.6.0
-pkgrel=5
-pkgdesc="Advanced graphical ICQ clone and more for Unix" 
-arch=('i686' 'x86_64')
-url="http://www.licq.org"
-license=('GPL')
-depends=('boost-libs' 'gpgme' 'libxss' 'qt')
-makedepends=('cmake' 'boost')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('383153697e281a0b1b4ff008936731b8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # licq
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
-  make
-
-  # qt4-gui
-  cd ../plugins/qt4-gui
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd ../plugins/qt4-gui/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/lm_sensors/PKGBUILD b/staging/lm_sensors/PKGBUILD
deleted file mode 100644
index 35a5292a2..000000000
--- a/staging/lm_sensors/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 161414 2012-06-11 02:28:41Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=lm_sensors
-pkgver=3.3.2
-pkgrel=3
-pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
-arch=('i686' 'x86_64')
-url="http://www.lm-sensors.org/"
-license=('GPL' 'LGPL')
-depends=('perl' 'sysfsutils')
-makedepends=('rrdtool')
-optdepends=('rrdtool: for logging with sensord')
-backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord')
-options=('!emptydirs')
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
-	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
-        sensord.rc fancontrol.service daemonarg.patch linux_3.0.patch)
-sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
-          'a486d9fb6c5b0aff4520f6312106c67f5163f1cf'
-          'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
-          'a068ac0a3115a6191a487e11422506baa922b40a'
-          '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8'
-          '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          'e662881f5d3f3f35a1bc97ba45d2c471dd28c37f'
-          'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
-          '72a60251d1d55a67307dab4105d9f3f01a080af4'
-          '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
-          '34241388c4001bfb6e49b7e10da1217e29a258d6'
-          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
-         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
-  sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
-  patch -p1 < ../daemonarg.patch
-  patch -p0 < ../linux_3.0.patch
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
-    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
-  install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
-  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
-  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
-  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd"
-  install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/conf.d/healthd"
-  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
-  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
-  install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
-}
diff --git a/staging/lm_sensors/daemonarg.patch b/staging/lm_sensors/daemonarg.patch
deleted file mode 100644
index 4b80cef19..000000000
--- a/staging/lm_sensors/daemonarg.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
---- lm_sensors-3.1.2-1/prog/pwm/fancontrol	2010-02-03 03:45:15.000000000 +0100
-+++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol	2010-03-07 01:37:09.000000000 +0100
-@@ -5,7 +5,9 @@
- #
- # Version 0.70
- #
--# Usage: fancontrol [CONFIGFILE]
-+# Usage: fancontrol [-D] [CONFIGFILE]
-+#
-+# (-D causes fancontrol to 'fork' to the background after some tests)
- #
- # Dependencies:
- #   bash, egrep, sed, cut, sleep, readlink, lm_sensors :)
-@@ -43,6 +45,12 @@
- #DEBUG=1
- MAX=255
- 
-+DAEMON=0
-+if [ "$1" = "-D" ]; then
-+	DAEMON=1
-+	shift
-+fi
-+
- declare -i pwmval
- 
- function LoadConfig {
-@@ -303,7 +311,6 @@
- 	echo "File $PIDFILE exists, is fancontrol already running?"
- 	exit 1
- fi
--echo $$ > "$PIDFILE"
- 
- # $1 = pwm file name
- function pwmdisable()
-@@ -475,6 +482,14 @@
- 	let fcvcount=$fcvcount+1
- done
- 
-+if [ "$DAEMON" -gt 0 ]; then
-+	echo "Forking..."
-+	$0 $* &> /dev/null &
-+	exit 0
-+fi
-+
-+echo $$ > "$PIDFILE"
-+
- echo 'Starting automatic fan control...'
- 
- # main loop calling the main function at specified intervals
diff --git a/staging/lm_sensors/fancontrol.rc b/staging/lm_sensors/fancontrol.rc
deleted file mode 100644
index 8e98d06f2..000000000
--- a/staging/lm_sensors/fancontrol.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
-case "$1" in
-  start)
-    stat_busy "Starting fancontrol"
-    [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
-    if [ $? -gt 0 -o -n "$PID" ]; then
-      stat_fail
-    else
-      add_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fancontrol"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/staging/lm_sensors/fancontrol.service b/staging/lm_sensors/fancontrol.service
deleted file mode 100644
index c86b498f8..000000000
--- a/staging/lm_sensors/fancontrol.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/lm_sensors/healthd b/staging/lm_sensors/healthd
deleted file mode 100644
index 0315dd788..000000000
--- a/staging/lm_sensors/healthd
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/sbin/healthd
-#
-
-. /etc/conf.d/healthd
-
-cmd="${ALARM_CMD}"
-addr="${ADMIN_EMAIL}"
-slp="${ALARM_SLEEP}"
-sensors="/usr/bin/sensors"
-
-
-while [ $# -gt 0 ] ; do
-	case "${1}" in
-		-c ) cmd="${2}" ; shift 2 ;;
-		-m ) addr="${2}" ; shift 2 ;;
-		-s ) slp="${2}" ; shift 2 ;;
-		*  ) shift 1 ;;
-	esac
-done
-
-[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
-	[ -n "${addr}" ] || exit 1
-
-[ "${slp}" -ge 2 ] || slp=600
-
-while true ; do
-	sleep 15
-	message="$( $sensors )"
-	case "$message" in
-		''      ) message='Could not get any sensor values !' ;;
-		*ALARM* ) : ;;
-		*       ) message='' ;;
-	esac
-	if [ -n "$message" ]; then
-		if [ -n "${addr}" ]; then
-			echo "$message" | mail -s \
-				"Sensors ALARM detected at host: $( hostname )" \
-				"${addr}"
-		fi
-		[ -z "${cmd}" ] || ${cmd} &
-		sleep ${slp}
-	fi
-done &
diff --git a/staging/lm_sensors/healthd.conf b/staging/lm_sensors/healthd.conf
deleted file mode 100644
index a8b2c3fa3..000000000
--- a/staging/lm_sensors/healthd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# /etc/conf.d/healthd
-#
-
-# reset any pending alarms on startup
-ALARM_RESET="yes"
-
-# where to sent mails on alarm
-ADMIN_EMAIL="root"
-
-# Seconds to sleep when alarm detected before checking again
-# If you want to fill up your mail inbox set this to 2. ;-)
-ALARM_SLEEP=600
-
-# command to run in background on each alarm
-# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
-ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
diff --git a/staging/lm_sensors/healthd.rc b/staging/lm_sensors/healthd.rc
deleted file mode 100644
index 7bb79519f..000000000
--- a/staging/lm_sensors/healthd.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-#
-# /etc/rc.d/healthd
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/healthd
-
-maybe_alarm_reset() {
-  case "${ALARM_RESET}" in
-    yes) /usr/bin/sensors > /dev/null
-    ;;
-    no) true
-    ;;
-    *) false
-    esac
-  return $?
-}
-
-PID=$(pidof -x -o %PPID /usr/sbin/healthd)
-case "${1}" in
-  start)
-    stat_busy "Starting Health Daemon"
-    [ -z "${PID}" ] && maybe_alarm_reset && /usr/sbin/healthd &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo "${PID}" > /var/run/healthd.pid
-      add_daemon healthd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Health Daemon"
-    [ ! -z "${PID}" ] && kill ${PID} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon healthd
-      stat_done
-    fi
-    ;;
-  restart) 
-    $0 stop 
-    sleep 2
-    $0 start 
-    ;;
-  *) echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/lm_sensors/linux_3.0.patch b/staging/lm_sensors/linux_3.0.patch
deleted file mode 100644
index da02a3d49..000000000
--- a/staging/lm_sensors/linux_3.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prog/detect/sensors-detect	2011-08-02 10:23:46.000000000 +0200
-+++ prog/detect/sensors-detect	2011-08-02 10:24:04.000000000 +0200
-@@ -2472,7 +2472,7 @@
- 
- sub initialize_kernel_version
- {
--	`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
-+	`uname -r` =~ /(\d+)\.(\d+)(.*)/;
- 	@kernel_version = ($1, $2, $3, $4);
- 	chomp($kernel_arch = `uname -m`);
- 
diff --git a/staging/lm_sensors/sensord.conf b/staging/lm_sensors/sensord.conf
deleted file mode 100644
index a1cf091c1..000000000
--- a/staging/lm_sensors/sensord.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sensord
-#
-SENSORD_ARGS=""
diff --git a/staging/lm_sensors/sensord.rc b/staging/lm_sensors/sensord.rc
deleted file mode 100644
index e3ef4d26d..000000000
--- a/staging/lm_sensors/sensord.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sensord
-
-PID=$(pidof -o %PPID /usr/sbin/sensord)
-case "$1" in
-  start)
-    stat_busy "Starting sensord"
-    [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensord
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping sensord"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensord
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/staging/lm_sensors/sensors.rc b/staging/lm_sensors/sensors.rc
deleted file mode 100644
index 4acde2202..000000000
--- a/staging/lm_sensors/sensors.rc
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# description: sensors is used for monitoring motherboard sensor values.
-# config: /etc/conf.d/lm_sensors
-
-# See also the lm_sensors homepage at:
-#     http://www2.lm-sensors.nu/~lm78/index.html
-
-# It uses a config file /etc/conf.d/lm_sensors that contains the modules to
-# be loaded/unloaded. That file is sourced into this one.
-
-# The format of that file a shell script that simply defines the modules
-# in order as normal shell variables with the special names:
-#    MODULE_1, MODULE_2, MODULE_3, etc.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PSENSORS=/usr/bin/sensors
-
-if $(grep -q sysfs /proc/mounts); then
-  WITHSYS=1
-else
-  WITHSYS=0
-fi
-
-if [ $WITHSYS == "0" ]; then
-  # If sensors isn't supported by the kernel, try loading the module...
-  [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
-
-  # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors.
-  if ! [ -e /proc/sys/dev/sensors ]; then
-    echo  "lm_sensors: kernel does not have sensors support"
-    stat_fail
-  fi
-
-  # If sensors was not already running, unload the module...
-  [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
-fi
-
-if [ -e /etc/conf.d/lm_sensors ]; then
-  CONFIG=/etc/conf.d/lm_sensors
-elif [ -e /etc/sysconfig/lm_sensors ]; then
-  # Moving config to new Arch-specific location
-  mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors
-  CONFIG=/etc/conf.d/lm_sensors
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Up Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=0
-      while [ $i -lt $modules ] ; do
-        module=$(eval echo '$'MODULE_$i)
-       # echo starting module __${module}__ #debug
-        /sbin/modprobe $module &>/dev/null
-        i=$(expr $i + 1)
-      done
-    fi
-
-    $PSENSORS -s
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensors
-      stat_done
-    fi	  
-    ;;
-
-  stop)
-    stat_busy "Shutting Down Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=$(expr $modules - 1)
-      while [ $i -ge 0 ] ; do
-        module=$(eval echo '$'MODULE_$i)
-      #  echo stoping module __${module}__ #debug
-        /sbin/modprobe -r $module &>/dev/null
-        i=$(expr $i - 1)
-      done
-    fi
-
-    if [ $WITHSYS == "0" ]; then
-      /sbin/modprobe -r i2c-proc &>/dev/null
-    fi
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensors
-      stat_done
-    fi
-    ;;
-    
-  status)
-    $PSENSORS
-    ;;
-    
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  condrestart)
-    [ -e /var/run/daemons/sensors ] && $0 restart || :
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart|status|condrestart}"
-esac
-exit 0
diff --git a/staging/lvm2/11-dm-initramfs.rules b/staging/lvm2/11-dm-initramfs.rules
deleted file mode 100644
index d2c167324..000000000
--- a/staging/lvm2/11-dm-initramfs.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# needed with new udev/mkinitcpio and as implemented in dracut:
-# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
-SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/staging/lvm2/PKGBUILD b/staging/lvm2/PKGBUILD
deleted file mode 100644
index 02e48d1aa..000000000
--- a/staging/lvm2/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 161875 2012-06-16 00:54:28Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.96
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://sourceware.org/lvm2/"
-license=('GPL2' 'LGPL2.1')
-groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
-        lvm2_install
-        lvm2_hook
-        11-dm-initramfs.rules
-        lvm.service)
-sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f'
-          '12e9016485c415c344524e6e75e23dfa6ca097ac'
-          '3e1680f9b76ce9150d08865d99db90fd15532271'
-          'cedc9948123c870f9c5aa3357d0075b41a9c8135'
-          'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          '17df8689630a77e46899a8bd56997d9db896d5af')
-
-build() {
-  cd "${srcdir}/LVM2.${pkgver}"
-  unset LDFLAGS
-
-  ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
-    --includedir=/usr/include --with-usrlibdir=/usr/lib  --libdir=/usr/lib --with-udev-prefix=/usr \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
-    --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules 
-  make
-}
-
-package_device-mapper() {
-  pkgdesc="Device mapper userspace library and tools"
-  url="http://sourceware.org/dm/"
-  depends=('glibc' 'udev')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_device-mapper
-  # extra udev rule for device-mapper in initramfs
-  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
-}
-
-package_lvm2() {
-  pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
-  conflicts=('lvm' 'mkinitcpio<0.7')
-  backup=('etc/lvm/lvm.conf')
-  options=('!makeflags')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_lvm2
-  # install applib
-  make -C liblvm DESTDIR="${pkgdir}" install
-  # /etc directories
-  install -d "${pkgdir}"/etc/lvm/{archive,backup}
-  # mkinitcpio hook
-  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
-  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
-  # systemd unit
-  install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service"
-}
diff --git a/staging/lvm2/lvm.service b/staging/lvm2/lvm.service
deleted file mode 100644
index 277d5a773..000000000
--- a/staging/lvm2/lvm.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service
-Before=basic.target shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --sysinit --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
diff --git a/staging/lvm2/lvm2_hook b/staging/lvm2/lvm2_hook
deleted file mode 100644
index e69b3349a..000000000
--- a/staging/lvm2/lvm2_hook
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    local pvdev
-
-    modprobe -q dm-mod >/dev/null 2>&1
-
-    # If the lvmwait= parameter has been specified on the command line
-    # wait for the device(s) before trying to activate the volume group(s)
-    for pvdev in ${lvmwait//,/ }; do
-        poll_device ${pvdev} ${rootdelay}
-    done
-
-    msg "Activating logical volumes..."
-    [ -d /etc/lvm ] && lvm vgscan
-
-    if [ -n "$quiet" ]; then
-      lvm vgchange --sysinit -a y >/dev/null
-    else
-      lvm vgchange --sysinit -a y
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/lvm2/lvm2_install b/staging/lvm2/lvm2_install
deleted file mode 100644
index 145ce49b2..000000000
--- a/staging/lvm2/lvm2_install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-build() {
-    local mod
-    for mod in dm-mod dm-snapshot dm-mirror; do
-        add_module "$mod"
-    done
-
-    add_binary "/sbin/lvm"
-    add_binary "/sbin/dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-
-    add_runscript
-}
-
-help() {
-  cat <<HELPEOF
-This hook loads the necessary modules for an LVM2 root device.
-
-The optional lvmwait= parameter followed by a comma-separated
-list of device names can be given on the command line.
-It will cause the hook to wait until all given devices exist
-before trying to scan and activate any volume groups.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/lyx/PKGBUILD b/staging/lyx/PKGBUILD
deleted file mode 100644
index e6341f0a0..000000000
--- a/staging/lyx/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 163195 2012-07-08 16:34:34Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=lyx
-pkgver=2.0.3
-pkgrel=4
-pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
-arch=('i686' 'x86_64')
-url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
-makedepends=('boost')
-optdepends=('rcs: built-in version control system'
-            'texlive-latexextra: float wrap support')
-license=('GPL')
-source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
-        lyx.desktop lyxrc.dist)
-backup=('etc/lyx/lyxrc.dist')
-install=lyx.install
-options=('emptydirs')
-sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
-          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
-          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
-  sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-  ./configure --prefix=/usr \
-    --with-frontend=qt4 --without-included-boost \
-    --without-included-mythes
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  # install desktop entry
-  install -Dm644 "${srcdir}/lyx.desktop" \
-    "${pkgdir}/usr/share/applications/lyx.desktop"
-  install -Dm644 "lib/images/lyx.png" \
-    "${pkgdir}/usr/share/pixmaps/lyx.png"
-
-  # install default config file
-  install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
-  ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
-}
diff --git a/staging/lyx/lyx.desktop b/staging/lyx/lyx.desktop
deleted file mode 100644
index 649b30c98..000000000
--- a/staging/lyx/lyx.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LyX Document Processor
-GenericName=Document Processor
-Comment=High level LaTeX frontend
-Exec=lyx %F
-TryExec=lyx
-Icon=lyx
-StartupNotify=false
-StartupWMClass=Lyx
-Terminal=false
-Categories=Office;WordProcessor;Qt;
-MimeType=text/x-lyx;application/x-lyx;
diff --git a/staging/lyx/lyx.install b/staging/lyx/lyx.install
deleted file mode 100644
index c15c17b3a..000000000
--- a/staging/lyx/lyx.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
-
-
diff --git a/staging/lyx/lyxrc.dist b/staging/lyx/lyxrc.dist
deleted file mode 100644
index dd18694f9..000000000
--- a/staging/lyx/lyxrc.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-### This file is part of
-### ========================================================
-###          LyX, The Document Processor
-###
-###          Copyright 1995 Matthias Ettrich
-###          Copyright 1995-2011 The LyX Team.
-###
-### ========================================================
-
-# The file lyxrc.dist gives initial global options for all LyX users.
-# Almost all settings here can be overridden through the preferences in LyX.
-
-\thesaurusdir_path "/usr/share/mythes"
-\hunspelldir_path "/usr/share/myspell"
diff --git a/staging/mediastreamer/PKGBUILD b/staging/mediastreamer/PKGBUILD
deleted file mode 100644
index 54da3e832..000000000
--- a/staging/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 160758 2012-06-05 07:24:49Z eric $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.8.2
-pkgrel=2
-pkgdesc="A library written in C that allows you to create and run audio and video streams"
-arch=('i686' 'x86_64')
-url="http://www.linphone.org/"
-license=('GPL')
-depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        mediastreamer-ffmpeg.patch)
-md5sums=('e51ea9d5fce1396b374d10473dfbadec'
-         '805da7def98f367e621363fa0c951fe8'
-         'f147546489a973f148ce3dd2dba36834')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/mediastreamer/mediastreamer-ffmpeg.patch b/staging/mediastreamer/mediastreamer-ffmpeg.patch
deleted file mode 100644
index 944d4b833..000000000
--- a/staging/mediastreamer/mediastreamer-ffmpeg.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h
-index 5ae8a63..86edf86 100644
---- mediastreamer2/include/mediastreamer2/msvideo.h
-+++ mediastreamer2/include/mediastreamer2/msvideo.h
-@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #define msvideo_h
- 
- #include <mediastreamer2/msfilter.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
- /* some global constants for video MSFilter(s) */
- #define MS_VIDEO_SIZE_SQCIF_W 128
-@@ -206,7 +212,9 @@ extern "C"{
- MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt);
- MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt);
- MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- MS2_PUBLIC void ms_ffmpeg_check_init(void);
-+#endif
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m);
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h);
- MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h);
-diff --git a/src/h264dec.c b/src/h264dec.c
-index 223de3d..8c40a7c 100644
---- mediastreamer2/src/h264dec.c
-+++ mediastreamer2/src/h264dec.c
-@@ -44,7 +44,9 @@ typedef struct _DecData{
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
-diff --git a/src/mscommon.c b/src/mscommon.c
-index 2cab005..bebb946 100644
---- mediastreamer2/src/mscommon.c
-+++ mediastreamer2/src/mscommon.c
-@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include "mediastreamer2/mscodecutils.h"
- #include "mediastreamer2/msfilter.h"
- #include <ortp/ortp_srtp.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
- extern void __register_ffmpeg_encoders_if_possible(void);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- extern bool_t libmsandroiddisplay_init(void);
- extern void libmsandroiddisplaybad_init(void);
- extern void libmsandroidopengldisplay_init(void);
-@@ -645,7 +653,9 @@ void ms_init(){
- 		}
- 	}
- #if !defined(NO_FFMPEG)
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	__register_ffmpeg_encoders_if_possible();
- #endif
- #endif
-diff --git a/src/videodec.c b/src/videodec.c
-index c04e1e9..a455075 100644
---- mediastreamer2/src/videodec.c
-+++ mediastreamer2/src/videodec.c
-@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include "mediastreamer2/msvideo.h"
- #include "mediastreamer2/msticker.h"
- #include "rfc2429.h"
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
--
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- 
- 
- typedef struct DecState{
-@@ -50,7 +57,9 @@ typedef struct DecState{
- 
- static void dec_init(MSFilter *f, enum CodecID cid){
- 	DecState *s=(DecState *)ms_new0(DecState,1);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	
- 	avcodec_get_context_defaults(&s->av_context);
- 	s->av_codec=NULL;
-diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..520f06a 100644
---- mediastreamer2/src/videoenc.c
-+++ mediastreamer2/src/videoenc.c
-@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- static bool_t avcodec_initialized=FALSE;
-+#endif
- 
- #ifdef ENABLE_LOG_FFMPEG
- 
-@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
- 
- #endif
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
- 		avcodec_init();
-@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){
- #endif
- 	}
- }
-+#endif
- 
- /* the goal of this small object is to tell when to send I frames at startup:
- at 2 and 4 seconds*/
-@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec)
- {
- 	EncState *s=(EncState *)ms_new(EncState,1);
- 	f->data=s;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	s->profile=0;/*always default to profile 0*/
- 	s->comp_buf=NULL;
- 	s->fps=15;
-@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){
- 	if (s->profile==0){
- 		s->codec=CODEC_ID_H263;
- 	}else{
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		c->flags|=CODEC_FLAG_H263P_UMV;
-+#endif
- 		c->flags|=CODEC_FLAG_AC_PRED;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+#endif
- 		/*
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
-@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){
- 	// assume video size is CIF or QCIF
- 	if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
- 	else header->b_wptr[1] = 0x40;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
-+#else
-+	if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
-+#endif
- 	header->b_wptr += 4;
- 	header->b_cont = *packet;
- 	*packet = header;
-@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- 		s->req_vfu=TRUE;
- 	}
- 	if (s->req_vfu){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		pict.pict_type=FF_I_TYPE;
-+#else
-+		pict.pict_type=AV_PICTURE_TYPE_I;
-+#endif
- 		s->req_vfu=FALSE;
- 	}
- 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
-@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- 		if (s->framenum==1){
- 			video_starter_first_frame (&s->starter,f->ticker->time);
- 		}
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		if (c->coded_frame->pict_type==FF_I_TYPE){
-+#else
-+		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
-+#endif
- 			ms_message("Emitting I-frame");
- 		}
- 		comp_buf->b_wptr+=error;
-@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={
- #endif
- 
- void __register_ffmpeg_encoders_if_possible(void){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	if (avcodec_find_encoder(CODEC_ID_MPEG4))
- 		ms_filter_register(&ms_mpeg4_enc_desc);
- 	if (avcodec_find_encoder(CODEC_ID_H263)){
diff --git a/staging/mesa/LICENSE b/staging/mesa/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/staging/mesa/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/staging/mesa/PKGBUILD b/staging/mesa/PKGBUILD
deleted file mode 100644
index 92e1705b6..000000000
--- a/staging/mesa/PKGBUILD
+++ /dev/null
@@ -1,297 +0,0 @@
-# $Id: PKGBUILD 168066 2012-10-05 15:41:36Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=mesa
-pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
-
-_git=true
-_gitdate=20121005
-#_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=8.99.git_$_gitdate
-  else
-    pkgver=8.0.4
-fi
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' 
-             'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-options=('!libtool')
-source=(LICENSE
-        pthread_fix.diff)
-if [ "${_git}" = "true" ]; then
-	# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
-	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz")
-  else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-	#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
-)
-fi
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '03956ac54a44467678120f485b626633'
-         '52760839a596df5058fcbb63a2bb10da')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-    # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
-    patch -Np1 -i ${srcdir}/pthread_fix.diff
-
-    COMMONOPTS="--prefix=/usr \
-    --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
-    --enable-gallium-llvm \
-    --enable-egl \
-    --enable-gallium-egl \
-    --with-egl-platforms=x11,drm \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-vdpau "
-
-# not default:
-#    --enable-gallium-egl enable optional EGL state tracker (not required for
-#                          EGL support in Gallium with OpenGL and OpenGL ES)
-#                          [default=disable]
-#    --enable-xa             enable build of the XA X Acceleration API                          [default=no]
-
-
-if [ "${_git}" = "true" ]; then
-    ./autogen.sh \
-      $COMMONOPTS
-  else
-    autoreconf -vfi
-    ./configure \
-      $COMMONOPTS
-fi
-
-    make
-}
-
-package_libglapi() {
-  depends=('glibc')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
-
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
-}
-
-package_libgl() {
-  depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # libGL & libdricore
-  make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  # See FS#26284
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_mesa() {
-  # check also gl.pc
-  depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3-D graphics libraries and include files"
-
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS  
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA  
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_osmesa() {
-  depends=('libglapi' 'gcc-libs')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/osmesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/"
-}
-
-package_libgbm() {
-  depends=('systemd' 'libglapi' 'libdrm')
-  pkgdesc="Mesa gbm library"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
-}
-
-package_libgles() {
-  depends=('libglapi' 'libdrm' 'khrplatform-devel')
-  pkgdesc="Mesa GLES libraries and headers"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
-}
-
-package_libegl() {
-  # check also egl.pc
-  depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel')
-  pkgdesc="Mesa EGL libraries and headers"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/doc/libegl"
-  install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
-  
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
-  
-  make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
-  
-  # fix file conflicts
-  rm -rf ${pkgdir}/usr/include/KHR
-}
-
-package_khrplatform-devel() {
-  pkgdesc="Khronos platform development package"
-
-  install -m755 -d "${pkgdir}/usr/include/KHR"
-  install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" 
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
-}
-
-package_ati-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-  
-  # classic mesa drivers for radeon,r200
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600,radeonsi
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
-  # vdpau driver
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
-}
-
-package_intel-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
-}
-
-package_nouveau-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # 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
-  # vdpau driver
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
-}
-
-package_svga-dri() {
-  depends=('gcc-libs' 'libdrm' 'expat')
-  pkgdesc="Gallium3D VMware guest GL driver"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/"
-}
diff --git a/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/staging/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/staging/mesa/mesa-radeon-parallel-make.diff b/staging/mesa/mesa-radeon-parallel-make.diff
deleted file mode 100644
index 2fc5a4793..000000000
--- a/staging/mesa/mesa-radeon-parallel-make.diff
+++ /dev/null
@@ -1,129 +0,0 @@
-From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Wed, 29 Aug 2012 13:01:15 +0000
-Subject: radeon/llvm: Cleanup makefile
-
-Hopefully, this will fix all the parallel make problems people have
-been having.
----
-diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
-index 43f668a..7f1c613 100644
---- a/src/gallium/drivers/radeon/Makefile
-+++ b/src/gallium/drivers/radeon/Makefile
-@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3
- 
- HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td)
- 
--gen: $(GENERATED_SOURCES)
--
- SIRegisterInfo.td: SIGenRegisterInfo.pl
- 	$(PERL) $^ > $@
- 
-@@ -38,37 +36,37 @@ endif
- R600RegisterInfo.td: R600GenRegisterInfo.pl
- 	$(PERL) $^ > $@
- 
--AMDGPUGenRegisterInfo.inc: *.td
-+AMDGPUGenRegisterInfo.inc: $(TD_FILES)
- 	$(call tablegen, -gen-register-info, AMDGPU.td, $@)
- 
--AMDGPUGenInstrInfo.inc: *.td
-+AMDGPUGenInstrInfo.inc: $(TD_FILES)
- 	$(call tablegen, -gen-instr-info, AMDGPU.td, $@)
- 
--AMDGPUGenAsmWriter.inc: *.td
-+AMDGPUGenAsmWriter.inc: $(TD_FILES)
- 	$(call tablegen, -gen-asm-writer, AMDGPU.td, $@)
- 
--AMDGPUGenDAGISel.inc: *.td
-+AMDGPUGenDAGISel.inc: $(TD_FILES)
- 	$(call tablegen, -gen-dag-isel, AMDGPU.td, $@)
- 
--AMDGPUGenCallingConv.inc: *.td
-+AMDGPUGenCallingConv.inc: $(TD_FILES)
- 	$(call tablegen, -gen-callingconv, AMDGPU.td, $@)
- 
--AMDGPUGenSubtargetInfo.inc: *.td
-+AMDGPUGenSubtargetInfo.inc: $(TD_FILES)
- 	$(call tablegen, -gen-subtarget, AMDGPU.td, $@)
- 
--AMDGPUGenEDInfo.inc: *.td
-+AMDGPUGenEDInfo.inc: $(TD_FILES)
- 	$(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@)
- 
--AMDGPUGenIntrinsics.inc: *.td
-+AMDGPUGenIntrinsics.inc: $(TD_FILES)
- 	$(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@)
- 
--AMDGPUGenCodeEmitter.inc: *.td
-+AMDGPUGenCodeEmitter.inc: $(TD_FILES)
- 	$(call tablegen, -gen-emitter, AMDGPU.td, $@)
- 
--AMDGPUGenMCCodeEmitter.inc: *.td
-+AMDGPUGenMCCodeEmitter.inc: $(TD_FILES)
- 	$(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@)
- 
--AMDGPUGenDFAPacketizer.inc: *.td
-+AMDGPUGenDFAPacketizer.inc: $(TD_FILES)
- 	$(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@)
- 
- LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser)
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 2eb1120..333dd03 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -1,4 +1,30 @@
- 
-+TD_FILES := \
-+	AMDGPU.td		\
-+	AMDGPUInstrInfo.td	\
-+	AMDGPUInstructions.td	\
-+	AMDGPUIntrinsics.td	\
-+	AMDGPURegisterInfo.td	\
-+	AMDILBase.td		\
-+	AMDILInstrInfo.td	\
-+	AMDILIntrinsics.td	\
-+	AMDILRegisterInfo.td	\
-+	Processors.td		\
-+	R600InstrInfo.td	\
-+	R600Instructions.td	\
-+	R600Intrinsics.td	\
-+	R600IntrinsicsNoOpenCL.td	\
-+	R600IntrinsicsOpenCL.td	\
-+	R600RegisterInfo.td	\
-+	R600Schedule.td		\
-+	SIInstrFormats.td	\
-+	SIInstrInfo.td		\
-+	SIInstructions.td	\
-+	SIIntrinsics.td		\
-+	SIRegisterInfo.td	\
-+	SISchedule.td
-+
-+
- GENERATED_SOURCES := \
- 	R600Intrinsics.td		\
- 	R600RegisterInfo.td		\
---
-cgit v0.9.0.2-2-gbebe
-From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Thu, 06 Sep 2012 14:05:22 +0000
-Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES
-
-Fixes build bug introduced by
-cebbdd4ac23725963207bf6f8fc7101150e6065f
----
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 333dd03..f387636 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -10,7 +10,6 @@ TD_FILES := \
- 	AMDILIntrinsics.td	\
- 	AMDILRegisterInfo.td	\
- 	Processors.td		\
--	R600InstrInfo.td	\
- 	R600Instructions.td	\
- 	R600Intrinsics.td	\
- 	R600IntrinsicsNoOpenCL.td	\
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/mesa/pthread_fix.diff b/staging/mesa/pthread_fix.diff
deleted file mode 100644
index bdfe2d865..000000000
--- a/staging/mesa/pthread_fix.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Thu, 27 Sep 2012 22:49:52 +0000
-Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty
-
----
-diff --git a/configure.ac b/configure.ac
-index 770df2f..dc2720d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[],
- 
- dnl Check for pthreads
- AX_PTHREAD
-+dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
-+dnl to -pthread, which causes problems if we need -lpthread to appear in
-+dnl pkgconfig files.
-+test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
- 
- dnl SELinux awareness.
- AC_ARG_ENABLE([selinux],
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/miro/PKGBUILD b/staging/miro/PKGBUILD
deleted file mode 100644
index 1b4c5711a..000000000
--- a/staging/miro/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168800 2012-10-16 01:40:22Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=5.0.4
-pkgrel=2
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
-         'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info'
-         'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
-         'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' 
-         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
-makedepends=('pkg-config' 'boost')
-install=miro.install
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
-        'ffmpeg.patch')
-sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
-          'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cd linux
-  patch -p2 -i "${srcdir}"/ffmpeg.patch
-
-  python2 setup.py install --root="${pkgdir}"
-
-  # fix miro startup script so --debug works with python2
-  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
-  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-
-  # fix python scripts for python2
-  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py
-  for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \
-    usr/share/miro/resources/testdata/7digital-replies/generate.py; do
-    sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} 
-  done
-
-  # Fakeroot segfaults on these; remove
-  if [ ${CARCH} == "i686" ]; then
-    rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true
-  else
-    rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true
-  fi
-}
diff --git a/staging/miro/ffmpeg.patch b/staging/miro/ffmpeg.patch
deleted file mode 100644
index 99c14107d..000000000
--- a/staging/miro/ffmpeg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- miro-5.0.1/linux/miro-segmenter.c~	2012-07-06 14:33:24.618082171 +0000
-+++ miro-5.0.1/linux/miro-segmenter.c	2012-07-06 15:10:19.564146117 +0000
-@@ -156,7 +156,7 @@
-         exit(1);
-     }
- 
--    ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
-+    ret = avformat_open_input(&ic, input, ifmt, 0);
-     if (ret != 0) {
-         fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret);
-         exit(1);
-@@ -215,12 +215,7 @@
-         }
-     }
- 
--    if (av_set_parameters(oc, NULL) < 0) {
--        fprintf(stderr, "Invalid output format parameters\n");
--        exit(1);
--    }
--
--    dump_format(oc, 0, input, 1);
-+    av_dump_format(oc, 0, input, 1);
- 
-     if (video_st) {
-         codec = avcodec_find_decoder(video_st->codec->codec_id);
-@@ -233,12 +228,12 @@
-         }
-     }
- 
--    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+    if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-         fprintf(stderr, "Could not open '%s'\n", output_filename);
-         exit(1);
-     }
- 
--    if (av_write_header(oc)) {
-+    if (avformat_write_header(oc, NULL)) {
-         fprintf(stderr, "Could not write mpegts header to first output file\n");
- 
-         exit(1);
-@@ -274,10 +269,10 @@
-         }
- 
-         if (segment_time - prev_segment_time >= segment_duration) {
--            put_flush_packet(oc->pb);
--            url_fclose(oc->pb);
-+            avio_flush(oc->pb);
-+            avio_close(oc->pb);
- 
--            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+            if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-                 fprintf(stderr, "Could not open '%s'\n", output_filename);
-                 break;
-             }
-@@ -307,7 +302,7 @@
-         av_freep(&oc->streams[i]);
-     }
- 
--    url_fclose(oc->pb);
-+    avio_close(oc->pb);
-     av_free(oc);
- 
-     /* End-of-transcode marker. */
diff --git a/staging/miro/miro.install b/staging/miro/miro.install
deleted file mode 100644
index a5ee228aa..000000000
--- a/staging/miro/miro.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-
diff --git a/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD
deleted file mode 100644
index 48bd96863..000000000
--- a/staging/mkvtoolnix/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 163225 2012-07-11 10:08:56Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: xduugu <xduugu@gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.7.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
-             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('99ea44be570412dadafe4ccaee0cfe6e')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Disable automagic curl dep used for online update checking
-  sed -i -e '/curl/d' configure.in
-  export CURL_CFLAGS="" CURL_LIBS=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
-  rake
-
-  mv src/mkvinfo{,-cli}
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  rake
-}
-
-package_mkvtoolnix-cli() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
-  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkvinfo
-  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
-  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
-  rm -rf "${pkgdir}"/usr/share/doc
-  rm -rf "${pkgdir}"/usr/share/locale
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}
diff --git a/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 74d9eb2ef..000000000
--- a/staging/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}
diff --git a/staging/moc/PKGBUILD b/staging/moc/PKGBUILD
deleted file mode 100644
index f8d55e21b..000000000
--- a/staging/moc/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 160696 2012-06-03 22:26:49Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=moc
-pkgver=20120224
-pkgrel=2
-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{,.sig})
-sha1sums=('8ad3521d99fe6f2514907088c70e50c84ec09b46'
-          'e8b2396d99692b0c4f85971d3fa6f5aecb1eb9d3')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=2412
-  _svntrunk="svn://daper.net/moc/trunk"
-  _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
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-# Disabling aac to use the external ffmpeg to play them (FS#13164)
-  autoreconf -i
-  ./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}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/mpd/PKGBUILD b/staging/mpd/PKGBUILD
deleted file mode 100644
index 64f1527fb..000000000
--- a/staging/mpd/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 162849 2012-07-01 23:58:44Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.17
-pkgrel=2
-pkgdesc='Flexible, powerful, server-side application for playing music'
-url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
-makedepends=('doxygen')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'tmpfiles.d'
-        'rc.d') 
-sha1sums=('36201f32ca5729b62b0e6cbddb19ade20ee3f7d7'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
-          '3470d489565f0ed479f1665dd2876f66acb5a585')
-
-backup=('etc/mpd.conf')
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-lastfm \
-		--enable-jack \
-		--enable-pulse \
-		--enable-documentation \
-		--disable-libwrap \
-		--disable-cue \
-		--disable-sidplay \
-		--disable-documentation \
-		--with-systemdsystemunitdir=/usr/lib/systemd/system
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i doc/mpdconf.example
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
-}
diff --git a/staging/mpd/install b/staging/mpd/install
deleted file mode 100644
index 261b8fd0d..000000000
--- a/staging/mpd/install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null
-	getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null
-	true
-}
-
-post_remove() {
-	getent passwd mpd &>/dev/null && userdel mpd >/dev/null
-	getent group mpd &>/dev/null && groupdel mpd >/dev/null
-	true
-}
diff --git a/staging/mpd/rc.d b/staging/mpd/rc.d
deleted file mode 100755
index f00e16067..000000000
--- a/staging/mpd/rc.d
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy 'Starting Music Player Daemon'
-		/usr/bin/mpd /etc/mpd.conf &> /dev/null &&
-		{ add_daemon mpd; stat_done; } || stat_fail
-		;;
-	stop)
-		stat_busy 'Stopping Music Player Daemon'
-		/usr/bin/mpd --kill /etc/mpd.conf &> /dev/null &&
-		{ rm_daemon mpd; stat_done; } || stat_fail
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/mpd/tmpfiles.d b/staging/mpd/tmpfiles.d
deleted file mode 100644
index 41c4e743a..000000000
--- a/staging/mpd/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mpd 0755 mpd mpd
diff --git a/staging/nmap/ChangeLog b/staging/nmap/ChangeLog
deleted file mode 100644
index f87ec482e..000000000
--- a/staging/nmap/ChangeLog
+++ /dev/null
@@ -1,19 +0,0 @@
-2012-02-22  Angel Velasquez <angvp@archlinux.org>
-	* Lua 5.2 rebuild
-
-2008-10-28  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Python 2.6 rebuild.
-
-2008-07-23  Hugo Doria  <hugo@archlinux.org>
-
-	* Added pygtk in optdepends: 4.68-3
-
-2008-07-09  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Fixing the pixmaps path for i686: 4.68
-
-2008-07-09  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 4.68
-
diff --git a/staging/nmap/PKGBUILD b/staging/nmap/PKGBUILD
deleted file mode 100644
index ceb05eae7..000000000
--- a/staging/nmap/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 150913 2012-02-23 15:15:39Z angvp $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=nmap
-pkgver=5.51
-pkgrel=4
-pkgdesc="A network exploration tool and security/port scanner"
-arch=('i686' 'x86_64')
-url="http://nmap.org"
-license=('GPL')
-depends=('pcre' 'openssl' 'libpcap' 'lua')
-# python is needed for zenmap
-makedepends=('python2')
-optdepends=('pygtk: gui for nmap')
-options=('!makeflags')
-source=(http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('0b80d2cb92ace5ebba8095a4c2850275')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap.desktop 
-  echo "TryExec=/usr/bin/pygtk-demo" >> zenmap/install_scripts/unix/zenmap-root.desktop 
-
-  # Force usage of external libpcap
-  # OSX bug check fails because of missing types
-  # autoreconf fails because our autotools are too new (?)
-  sed -i 's/have_libpcap=no/have_libpcap=yes/g' {.,ncat,nping}/configure
-
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-    --libexecdir=/usr/lib
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # remove zenmap uninstall script
-  rm "${pkgdir}/usr/bin/uninstall_zenmap"
-
-  # install custom GPL2 license
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/staging/ntp/PKGBUILD b/staging/ntp/PKGBUILD
deleted file mode 100644
index b758ce06d..000000000
--- a/staging/ntp/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 161303 2012-06-09 05:27:03Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-
-pkgname=ntp
-pkgver=4.2.6.p5
-_realver=4.2.6p5
-pkgrel=7
-pkgdesc='Network Time Protocol reference implementation'
-url='http://www.ntp.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-makedepends=('perl-html-parser')
-depends=('openssl' 'readline' 'libcap')
-backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf')
-source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
-        'ntpd'
-        'ntpdate'
-        'ntp.conf'
-        'ntpd.conf'
-        'logrotate.d'
-        'ntpd.service')
-sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
-          '4e324e625c1f080b5c028be5092aa71adbf9bd99'
-          '01394b8a952f5edc85d19df8335eeac3980320f4'
-          'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
-          '4537d1f58b299d463db5048129cb264511474b0b'
-          '4f76f7f9ffc8315ff9924f793f272d4f6939b816'
-          '81df5c4d51cb69bc29363625ff49e2bd388d1fa9')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${_realver}"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-linuxcaps \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-$_realver"
-
-	make DESTDIR="${pkgdir}" install
-
-	rmdir "${pkgdir}"/usr/{lib,sbin}
-	install -d -o 87 "${pkgdir}"/var/lib/ntp
-	install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
-	install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
-	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
-	install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf
-	install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd
-	install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	
-	cd html
-	../scripts/html2man
-	install -d "${pkgdir}"/usr/share/man
-	mv man/man* "${pkgdir}"/usr/share/man
-	mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
-}
diff --git a/staging/ntp/install b/staging/ntp/install
deleted file mode 100644
index e6eddf8a4..000000000
--- a/staging/ntp/install
+++ /dev/null
@@ -1,37 +0,0 @@
-post_install() {
-	getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
-	getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
-	true
-}
-
-post_upgrade() {
-	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
-		cat <<EOF
-
-==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
-==> If you made changes to the former, please update the latter.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
-		cat <<EOF
-
-==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
-==> and the new rc.d script only takes the latter into account.
-==> To stop your old ntpd process, please kill it manually.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
-		post_install
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
-		chown -R ntp /var/lib/ntp
-	fi
-}
-
-post_remove() {
-	getent passwd ntp &>/dev/null && userdel ntp >/dev/null
-	getent group ntp &>/dev/null && groupdel ntp >/dev/null
-	true
-}
diff --git a/staging/ntp/logrotate.d b/staging/ntp/logrotate.d
deleted file mode 100644
index 8a9f066c3..000000000
--- a/staging/ntp/logrotate.d
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/ntp.log {
-	missingok
-	copytruncate
-}
diff --git a/staging/ntp/ntp.conf b/staging/ntp/ntp.conf
deleted file mode 100644
index a27b22820..000000000
--- a/staging/ntp/ntp.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# With the default settings below, ntpd will only synchronize your clock.
-#
-# For details, see:
-# - the ntp.conf man page
-# - http://support.ntp.org/bin/view/Support/GettingStarted
-# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
-
-# Associate to public NTP pool servers; see http://www.pool.ntp.org/
-server 0.pool.ntp.org
-server 1.pool.ntp.org
-server 2.pool.ntp.org
-
-# Only allow read-only access from localhost
-restrict default noquery nopeer
-restrict 127.0.0.1
-restrict ::1
-
-# Location of drift and log files
-driftfile /var/lib/ntp/ntp.drift
-logfile /var/log/ntp.log
-
-# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing
-# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net
diff --git a/staging/ntp/ntpd b/staging/ntp/ntpd
deleted file mode 100755
index 480fa1088..000000000
--- a/staging/ntp/ntpd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-unset PID
-PIDFILE='/run/ntpd.pid'
-
-if [[ -r ${PIDFILE} ]]; then
-	read -r PID <"${PIDFILE}"
-	if [[ -n ${PID} && ! -d /proc/${PID} ]]; then
-		rm -f "${PIDFILE}"
-		unset PID
-	fi
-fi
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Daemon"
-		if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then 
-			add_daemon ntpd
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Daemon"
-		if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then
-			rm ${PIDFILE}
-			rm_daemon ntpd
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/staging/ntp/ntpd.conf b/staging/ntp/ntpd.conf
deleted file mode 100644
index 047961fde..000000000
--- a/staging/ntp/ntpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g -u ntp"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g -u ntp"
diff --git a/staging/ntp/ntpd.service b/staging/ntp/ntpd.service
deleted file mode 100644
index e0cbf879e..000000000
--- a/staging/ntp/ntpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Network Time Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/ntpd.pid
-EnvironmentFile=/etc/conf.d/ntpd.conf
-ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/ntp/ntpdate b/staging/ntp/ntpdate
deleted file mode 100755
index a8e746785..000000000
--- a/staging/ntp/ntpdate
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Client"
-		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
-			add_daemon ntpdate
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Client"
-		rm_daemon ntpdate
-		stat_done
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/staging/obex-data-server/PKGBUILD b/staging/obex-data-server/PKGBUILD
deleted file mode 100644
index 32d465533..000000000
--- a/staging/obex-data-server/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169396 2012-10-20 10:00:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Keerthi <keerthi.linux@gmail.com>
-
-pkgname=obex-data-server
-pkgver=0.4.6
-pkgrel=3
-pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
-arch=('i686' 'x86_64')
-url="http://wiki.muiline.com/obex-data-server"
-license=('GPL')
-depends=('dbus-glib' 'openobex' 'imagemagick')
-source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz")
-md5sums=('961ca5db6fe9c97024e133cc6203cc4d')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/opal/PKGBUILD b/staging/opal/PKGBUILD
deleted file mode 100644
index 7bc062dbe..000000000
--- a/staging/opal/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 161382 2012-06-10 15:56:57Z jgc $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-pkgname=opal
-pkgver=3.10.5
-pkgrel=1
-pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64)
-url="http://www.opalvoip.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm')
-makedepends=('ffmpeg')
-options=(!makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2
-        opal-ffmpeg.patch)
-md5sums=('22b0d716ed1cbc935245539e0bbab38f' '53bb06a376fb57a306522bfa6a573217')
-
-build() {
-  cd "${srcdir}/opal-${pkgver}"
-  patch -Np1 -i "${srcdir}/opal-ffmpeg.patch"
-  CXXFLAGS="$CXXFLAGS -fpermissive" \
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/opal-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  chmod 644 "${pkgdir}/usr/lib/libopal_s.a"
-}
diff --git a/staging/opal/opal-ffmpeg.patch b/staging/opal/opal-ffmpeg.patch
deleted file mode 100644
index ebfd1f037..000000000
--- a/staging/opal/opal-ffmpeg.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-diff -ru opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.5/plugins/video/H.263-1998/h263-1998.cxx	2012-04-26 06:56:01.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-06-10 16:39:35.447021150 +0200
-@@ -51,6 +51,7 @@
- #endif
- 
- #include "h263-1998.h"
-+#include <libavutil/opt.h>
- #include <limits>
- #include <iomanip>
- #include <stdio.h>
-@@ -324,9 +325,9 @@
-     // Level 2+ 
-     // works with eyeBeam, signaled via  non-standard "D"
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-     return;
-   }
- 
-@@ -335,9 +336,9 @@
-     // Annex F: Advanced Prediction Mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
-     return;
-   }
- #endif
-@@ -367,9 +368,9 @@
-     // Annex K: Slice Structure
-     // does not work with eyeBeam
-     if (atoi(value) != 0)
--      m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
-     return;
-   }
- 
-@@ -377,9 +378,9 @@
-     // Annex S: Alternative INTER VLC mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-     return;
-   }
- }
-@@ -445,15 +446,6 @@
-   PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
-   PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
- 
--  #define CODEC_TRACER_FLAG(tracer, flag) \
--    PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
--
-   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
- }
- 
-@@ -516,7 +508,7 @@
- 
-     // Need to copy to local buffer to guarantee 16 byte alignment
-     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
--    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-+    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
- 
-     /*
-     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -598,13 +590,13 @@
-   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
-   m_context->opaque = this; // used to separate out packets from different encode threads
- 
--  m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+  av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-   m_context->flags &= ~CODEC_FLAG_4MV;
- #if LIBAVCODEC_RTP_MODE
-   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
- #endif
--  m_context->flags &= ~CODEC_FLAG_H263P_AIV;
--  m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+  av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-+  av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
- 
-   return true;
- }
-diff -ru opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.5/plugins/video/H.264/gpl/h264_helper.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-06-10 16:49:11.210568639 +0200
-@@ -25,6 +25,7 @@
- #include <fstream>
- #include <stdlib.h> 
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- 
- #ifndef PLUGINCODEC_TRACING
-diff -ru opal-3.10.5/plugins/video/H.264/h264-x264.cxx opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.5/plugins/video/H.264/h264-x264.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/h264-x264.cxx	2012-06-10 17:04:19.695646950 +0200
-@@ -1035,13 +1035,10 @@
-         return false;
- 
-       m_context->workaround_bugs = FF_BUG_AUTODETECT;
--      m_context->error_recognition = FF_ER_AGGRESSIVE;
-       m_context->idct_algo = FF_IDCT_H264;
-       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
-       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
--      m_context->flags2 = CODEC_FLAG2_BRDO |
--                          CODEC_FLAG2_MEMC_ONLY |
--                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
-+      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
-                           CODEC_FLAG2_SKIP_RD |
-                           CODEC_FLAG2_CHUNKS;
- 
-diff -ru opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.5/plugins/video/H.264/shared/x264wrap.cxx	2012-04-26 06:56:00.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-06-10 17:04:46.012171051 +0200
-@@ -33,6 +33,7 @@
- 
- #include <codec/opalplugin.hpp>
- #include <stdio.h>
-+#include <unistd.h>
- 
- 
- #if defined(X264_LICENSED) || defined(GPL_HELPER_APP)
-diff -ru opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.5/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-04-26 06:56:02.000000000 +0200
-+++ opal-3.10.5.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-06-10 16:46:33.498089705 +0200
-@@ -101,8 +101,10 @@
- #include <libavutil/bswap.h>
- #include <libavcodec/mpegvideo.h>
- 
-+
- #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include LIBAVCODEC_HEADER
-+#include <libavutil/opt.h>
- #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
- }
- 
-@@ -589,17 +591,17 @@
-     m_avpicture->quality = m_videoQMin;
- 
- #ifdef USE_ORIG
--    m_avcontext->flags |= CODEC_FLAG_PART;   // data partitioning
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->flags |= CODEC_FLAG_4MV;    // 4 motion vectors
- #else
-     m_avcontext->max_b_frames=0; /*don't use b frames*/
-     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
--    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
-+    av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
-     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
-     m_avcontext->flags|=CODEC_FLAG_4MV;
-     m_avcontext->flags|=CODEC_FLAG_GMC;
-     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
--    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+    av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
- #endif
-     m_avcontext->opaque = this;              // for use in RTP callback
- }
-@@ -804,7 +806,7 @@
-         // Should the next frame be an I-Frame?
-         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
-         {
--            m_avpicture->pict_type = FF_I_TYPE;
-+            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
-         }
-         else // No IFrame requested, let avcodec decide what to do
-         {
-@@ -1325,7 +1327,7 @@
- 
- void MPEG4DecoderContext::SetStaticDecodingParams() {
-     m_avcontext->flags |= CODEC_FLAG_4MV; 
--    m_avcontext->flags |= CODEC_FLAG_PART;
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
- }
- 
diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD
deleted file mode 100644
index ed87a8d3d..000000000
--- a/staging/opencv/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 169516 2012-10-22 21:28:51Z 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.4.2
-pkgrel=5
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.org/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3')
-makedepends=('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-${pkgver}.tar.bz2")
-md5sums=('059ef86fc1724d69b75832a0d2929ff5')
-
-_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON'
-            '-D BUILD_TESTS=OFF'
-            '-D ENABLE_SSE=ON'
-            '-D ENABLE_SSE2=ON'
-            '-D ENABLE_SSE3=OFF'
-            '-D ENABLE_SSSE3=OFF'
-            '-D ENABLE_SSE41=OFF'
-            '-D ENABLE_SSE42=OFF'
-            '-D BUILD_EXAMPLES=ON'
-            '-D INSTALL_C_EXAMPLES=ON'
-            '-D INSTALL_PYTHON_EXAMPLES=ON'
-            '-D WITH_XINE=ON'
-            '-D WITH_QT=OFF'
-            '-D WITH_QT_OPENGL=OFF'
-            '-D WITH_UNICAP=OFF'
-            '-D WITH_PVAPI=OFF'
-            '-D WITH_OPENNI=OFF'
-            '-D WITH_TBB=OFF'
-            '-D WITH_IPP=OFF'
-            '-D WITH_CUDA=OFF'
-            '-D USE_FAST_MATH=ON')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # x64, i.e "Athlon64" and upwards, can use SSE3
-  [ $CARCH = x86_64 ] && \
-    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
-
-  cmake ${_cmakeopts[@]} .
-
-  make
-}
-
-package_opencv() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd "$pkgdir/usr/share"
-
-  # separate docs package; also be -R friendly
-  [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc"
-
-  # separate samples package
-  [ -d $_realname/samples ] && mv $_realname/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/$_realname"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/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/$_realname"
-  cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/openexr/PKGBUILD b/staging/openexr/PKGBUILD
deleted file mode 100644
index 9c9431644..000000000
--- a/staging/openexr/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169347 2012-10-20 00:48:45Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=openexr
-pkgver=1.7.1
-pkgrel=2
-pkgdesc="An high dynamic-range image file format library"
-url="http://www.openexr.com/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('zlib' 'ilmbase')
-options=('!libtool')
-source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'gcc43.patch')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/gcc43.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1'
-         'd91fae759053a70bcedcf02eb33ca4a2')
diff --git a/staging/openexr/gcc43.patch b/staging/openexr/gcc43.patch
deleted file mode 100644
index ab99eb9a1..000000000
--- a/staging/openexr/gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exrenvmap/blurImage.cpp
-+++ exrenvmap/blurImage.cpp
-@@ -39,6 +39,8 @@
- //
- //-----------------------------------------------------------------------------
- 
-+#include <cstring>
-+
- #include <blurImage.h>
- 
- #include <resizeImage.h>
diff --git a/staging/openssh/PKGBUILD b/staging/openssh/PKGBUILD
deleted file mode 100644
index a492d3cb0..000000000
--- a/staging/openssh/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 161379 2012-06-10 13:19:01Z bluewind $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=openssh
-pkgver=6.0p1
-pkgrel=3
-pkgdesc='Free version of the SSH connectivity tools'
-url='http://www.openssh.org/portable.html'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-depends=('krb5' 'openssl' 'libedit' 'ldns')
-optdepends=('xorg-xauth: X11 forwarding'
-            'x11-ssh-askpass: input passphrase in X')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.close-sessions'
-        'sshdgenkeys.service'
-        'sshd@.service'
-        'sshd.service'
-        'sshd.socket'
-        'tmpfiles.d'
-        'sshd.confd'
-        'sshd.pam'
-        'sshd')
-sha1sums=('f691e53ef83417031a2854b8b1b661c9c08e4422'
-          '954bf1660aa32620c37034320877f4511b767ccb'
-          '6c71de2c2ca9622aa8e863acd94b135555e11125'
-          'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          '83a257b8f6a62237383262cb0e2583e5609ddac0'
-          'a30fb5fda6d0143345bae47684edaffb8d0a92a7'
-          'b5cf44205e8f4365c00bfbee110d7c0e563627aa'
-          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          '659e3ee95c269014783ff8b318c6f50bf7496fbd'
-          'ed36e3a522f619ff6b13e253526596e4cca11e9f')
-
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/ssh \
-		--sysconfdir=/etc/ssh \
-		--with-ldns \
-		--with-libedit \
-		--with-ssl-engine \
-		--with-pam \
-		--with-privsep-user=nobody \
-		--with-kerberos5=/usr \
-		--with-xauth=/usr/bin/xauth \
-		--with-mantype=man \
-		--with-md5-passwords \
-		--with-pid-dir=/run \
-
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	# The connect.sh test must be run by a user with a decent login shell;
-	# chroot builds use nobody with /bin/false.
-	make tests || true
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
-	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-
-	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
-	install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
-	install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
-	install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/openssh.conf
-
-	install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
-	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
-	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
-
-	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
-	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
-	install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
-
-	sed \
-		-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
-		-e '/^#UsePAM no$/c UsePAM yes' \
-		-i "${pkgdir}"/etc/ssh/sshd_config
-}
diff --git a/staging/openssh/sshd b/staging/openssh/sshd
deleted file mode 100755
index 4bf4780f5..000000000
--- a/staging/openssh/sshd
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-	PID=
-	rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
-	start)
-		stat_busy 'Starting Secure Shell Daemon'
-		/usr/bin/ssh-keygen -A
-		[[ -d /var/empty ]] || mkdir -p /var/empty
-		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			add_daemon sshd
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Secure Shell Daemon'
-		[[ ! -z $PID ]] && kill $PID &> /dev/null
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			rm_daemon sshd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/openssh/sshd.close-sessions b/staging/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709fc..000000000
--- a/staging/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/staging/openssh/sshd.confd b/staging/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/staging/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/staging/openssh/sshd.pam b/staging/openssh/sshd.pam
deleted file mode 100644
index aeef8be27..000000000
--- a/staging/openssh/sshd.pam
+++ /dev/null
@@ -1,13 +0,0 @@
-#%PAM-1.0
-#auth		required	pam_securetty.so	#Disable remote root
-auth		required	pam_unix.so
-auth		required	pam_env.so
-account		required	pam_nologin.so
-account		required	pam_unix.so
-account		required	pam_time.so
-password	required	pam_unix.so
-session		required	pam_unix_session.so
-session		required	pam_limits.so
-session         optional        pam_loginuid.so
--session	optional	pam_ck_connector.so nox11
--session	optional	pam_systemd.so
diff --git a/staging/openssh/sshd.service b/staging/openssh/sshd.service
deleted file mode 100644
index 7c8f88372..000000000
--- a/staging/openssh/sshd.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=OpenSSH Daemon
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=/usr/sbin/sshd -D
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-Also=sshdgenkeys.service
-
-# Note that this is the service file for running a single SSH server for all
-# incoming connections, suitable only for systems with a large amount of SSH
-# traffic. In almost all other cases it is a better idea to use sshd.socket +
-# sshd@.service (i.e. the on-demand spawning version for one instance per
-# connection).
diff --git a/staging/openssh/sshd.socket b/staging/openssh/sshd.socket
deleted file mode 100644
index 6a67bfe86..000000000
--- a/staging/openssh/sshd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Conflicts=sshd.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
-Also=sshdgenkeys.service
diff --git a/staging/openssh/sshd@.service b/staging/openssh/sshd@.service
deleted file mode 100644
index 2fd9b0814..000000000
--- a/staging/openssh/sshd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=OpenSSH Per-Connection Daemon
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=-/usr/sbin/sshd -i
-StandardInput=socket
-StandardError=syslog
diff --git a/staging/openssh/sshdgenkeys.service b/staging/openssh/sshdgenkeys.service
deleted file mode 100644
index 47c1c3fd6..000000000
--- a/staging/openssh/sshdgenkeys.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=SSH Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_key
-ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
-
-[Service]
-ExecStart=/usr/bin/ssh-keygen -A
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/openssh/tmpfiles.d b/staging/openssh/tmpfiles.d
deleted file mode 100644
index 7c5b26100..000000000
--- a/staging/openssh/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /var/empty 0755 root root -
diff --git a/staging/pathological/PKGBUILD b/staging/pathological/PKGBUILD
deleted file mode 100644
index acf263add..000000000
--- a/staging/pathological/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 167400 2012-10-01 23:04:53Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=pathological
-pkgver=1.1.3
-pkgrel=8
-pkgdesc="A puzzle game with the same feel as frozen bubble"
-arch=('i686' 'x86_64')
-url="http://pathological.sourceforge.net/"
-license=('GPL')
-depends=('python2-pygame')
-makedepends=('netpbm')
-install=pathological.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        pathological.desktop pygame_181.patch encoding.patch)
-sha1sums=('70b1c9e12704c7fd3b301aa90bceee2e8373b7b9'
-          '9b57f854ce9621542d810a21c61325de343950d7'
-          '6f0aa0f74a87bd53771f2db6d3117981c4f070d3'
-          '7dbaa9ced7da0094280425a68b4c8db3382f230a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 < ../encoding.patch
-  patch -p1 < ../pygame_181.patch
-  sed -i 's|X11R6/include/X11|share|' Makefile
-  sed -i 's|usr/games|usr/bin|' Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' "${pkgdir}/usr/share/games/pathological/pathological.py"
-  install -D -m644 ../pathological.desktop "${pkgdir}/usr/share/applications/pathological.desktop"
-  chown root:games "${pkgdir}/var/games"
-  chmod 775 "${pkgdir}/var/games"
-  rm "${pkgdir}/var/games/pathological_scores"
-}
diff --git a/staging/pathological/encoding.patch b/staging/pathological/encoding.patch
deleted file mode 100644
index 394875809..000000000
--- a/staging/pathological/encoding.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- pathological.py.orig	2009-07-10 01:49:39.000000000 -0400
-+++ pathological.py	2009-07-10 01:49:53.000000000 -0400
-@@ -1,4 +1,5 @@
- #!/usr/bin/python
-+# -*- coding: utf-8 -*-
- """
- Copyright (C) 2003  John-Paul Gignac
- 
diff --git a/staging/pathological/pathological.desktop b/staging/pathological/pathological.desktop
deleted file mode 100644
index 54817684f..000000000
--- a/staging/pathological/pathological.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Pathological
-Comment=A puzzle game involving paths and marbles
-Exec=pathological
-Icon=pathological.xpm
-Terminal=false
-Type=Application
-Categories=Application;Game;
diff --git a/staging/pathological/pathological.install b/staging/pathological/pathological.install
deleted file mode 100644
index 4bc716839..000000000
--- a/staging/pathological/pathological.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
-if [ ! -e var/games/pathological_scores ]; then
-    cat << _EOF > var/games/pathological_scores
-0 all-boards 1 John-Paul
-0 all-boards 1 Kim
-0 all-boards 1 Matths
-0 all-boards 1 Carrie
-0 all-boards 1 Mike
-0 all-boards 1 Dale
-0 all-boards 1 Alesh
-0 all-boards 1 Thanks to
-0 all-boards 1 everyone who
-0 all-boards 1 contributed!
-_EOF
-fi
-  chown root:games var/games/pathological_scores
-  chmod 664 var/games/pathological_scores
-}
-
-pre_upgrade() {
-  if [ -e usr/share/games/pathological/pathological_scores ]; then
-    mv usr/share/games/pathological/pathological_scores var/games/
-  fi
-}
-
-post_upgrade() {
-  chown root:games var/games/pathological_scores
-  chmod 664 var/games/pathological_scores
-}
diff --git a/staging/pathological/pygame_181.patch b/staging/pathological/pygame_181.patch
deleted file mode 100644
index 4789f1519..000000000
--- a/staging/pathological/pygame_181.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- pathological-1.1.3.orig.orig/pathological.py	2009-04-15 10:50:11.000000000 -0400
-+++ pathological-1.1.3.orig/pathological.py	2009-04-15 10:50:56.000000000 -0400
-@@ -169,6 +169,7 @@
- 	if not pygame.mixer or not pygame.mixer.music:
- 		print "Background music not available."
- 		return
-+	pygame.mixer.music.stop()
- 	fullname = os.path.join('music', name)
- 	try:
- 		pygame.mixer.music.load(fullname)
diff --git a/staging/perl-sdl/PKGBUILD b/staging/perl-sdl/PKGBUILD
deleted file mode 100644
index 6b9965fb0..000000000
--- a/staging/perl-sdl/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 165571 2012-08-25 14:10:50Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=perl-sdl
-pkgver=2.540
-pkgrel=2
-pkgdesc="Simple DirectMedia Layer for Perl"
-arch=(i686 x86_64)
-license=(LGPL)
-url="http://sdl.perl.org"
-depends=(perl-alien-sdl perl-tie-simple
-         sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg)
-makedepends=('perl-module-build>=0.40')
-options=('!emptydirs')
-replaces=(sdl_perl)
-conflicts=(sdl_perl)
-provides=("sdl_perl=$pkgver")
-# http://search.cpan.org/dist/SDL/
-_author=JTPALMER
-source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz)
-md5sums=('1a5d7849cbdfde4982b28458e38ab172')
-
-build() {
-  cd SDL-$pkgver
-  # Perl selects the proper CFLAGS set for binary modules
-  unset CFLAGS
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor
-  perl Build
-}
-
-check() {
-  cd SDL-$pkgver
-  perl Build test || true
-}
-
-package() {
-  cd SDL-$pkgver
-  perl Build install destdir="$pkgdir"
-}
diff --git a/staging/poppler/PKGBUILD b/staging/poppler/PKGBUILD
deleted file mode 100644
index 9bf72ace2..000000000
--- a/staging/poppler/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 168910 2012-10-16 14:16:26Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.20.5
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu')
-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)
-md5sums=('8a80ae83eb7a327b031808d09ee1d54d'
-         '9dc64c254a31e570507bdd4ad4ba629a')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-
-  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 || /bin/true
-}
-
-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/pork/PKGBUILD b/staging/pork/PKGBUILD
deleted file mode 100644
index f927a6f45..000000000
--- a/staging/pork/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 71194 2012-05-24 17:29:40Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=pork
-pkgver=0.99.8.1
-pkgrel=6
-pkgdesc="Console-based AOL Instant Messenger & IRC client"
-arch=('i686' 'x86_64')
-url="http://dev.ojnk.net/"
-license=('GPL')
-depends=('ncurses' 'perl')
-source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz)
-sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/ppl/PKGBUILD b/staging/ppl/PKGBUILD
deleted file mode 100644
index 0e5798dcd..000000000
--- a/staging/ppl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 162774 2012-06-30 08:11:58Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: ezzetabi <ezzetabi at gawab dot com>
-
-pkgname=ppl
-pkgver=1.0
-pkgrel=1
-pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
-arch=('i686' 'x86_64')
-url="http://bugseng.com/products/ppl"
-license=('GPL3')
-depends=('gmp>=5.0')
-options=('!docs' '!libtool')
-source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
-md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c'
-         '5f490df826c76fed296060ca8fca4eb5')
-
-build() {
-  cd $srcdir/ppl-$pkgver
-  ./configure --prefix=/usr --enable-interfaces="c,cxx"
-  make
-}
-
-check() {
-  cd $srcdir/ppl-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/ppl-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/staging/psiconv/PKGBUILD b/staging/psiconv/PKGBUILD
deleted file mode 100644
index 6936b4b7f..000000000
--- a/staging/psiconv/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169523 2012-10-23 01:05:39Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=psiconv
-pkgver=0.9.8
-pkgrel=10
-pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
-arch=('i686' 'x86_64')
-url="http://software.frodo.looijaard.name/psiconv/"
-license=('GPL')
-depends=('imagemagick')
-makedepends=('bc')
-backup=('etc/psiconv/psiconv.conf')
-options=('!libtool')
-source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8d7548e3c6b9cd408544736133728acd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/pstoedit/PKGBUILD b/staging/pstoedit/PKGBUILD
deleted file mode 100644
index c8cfb6c43..000000000
--- a/staging/pstoedit/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169481 2012-10-21 23:53:55Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Tobias Powalowski <t.powa@gmx.de>
-
-pkgname=pstoedit
-pkgver=3.60
-pkgrel=3
-pkgdesc="Translates PostScript and PDF graphics into other vector formats"
-arch=('i686' 'x86_64')
-url="http://www.pstoedit.net/"
-license=('GPL')
-depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
-makedepends=('ghostscript')
-options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
-	'pstoedit-3.50-parallel.patch'	'pstoedit-3.50-plugin-close.patch')
-sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
-          '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
-          '54bbe019de66eb4cb8525371462595d21fbd074e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's/-pedantic//' configure
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/pstoedit/pstoedit-3.50-parallel.patch b/staging/pstoedit/pstoedit-3.50-parallel.patch
deleted file mode 100644
index 4f1f73b04..000000000
--- a/staging/pstoedit/pstoedit-3.50-parallel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
-         $(sample_drivers_src)                   
- libp2edrvstd_la_LIBADD=-L. libpstoedit.la
- libp2edrvstd_la_LDFLAGS=-no-undefined -module
-+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
- 
- #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
- #libp2edrvplugins_la_LIBADD=
-@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
- libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
- libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
- libp2edrvlplot_la_LDFLAGS=-no-undefined -module
-+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
- 
- libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
- libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
- libp2edrvswf_la_LDFLAGS=-no-undefined -module
-+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
- 
- # note the __ stand for ++ - automake treats all no alphanums chars as _
- libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
- libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
- libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS}  -module
-+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
- # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
- 
- if USE_EMFBYSOURCE
-@@ -113,6 +117,7 @@ else
- libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
- libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
- endif
-+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
- 
- libpstoedit_la_SOURCES =			\
- 	dynload.cpp dynload.h			\
-@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
- 
- pstoedit_SOURCES = cmdmain.cpp
- pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
-+pstoedit_DEPENDENCIES = libpstoedit.la
- 
- pkginclude_HEADERS =				\
- 	pstoedit.h				\
diff --git a/staging/pstoedit/pstoedit-3.50-plugin-close.patch b/staging/pstoedit/pstoedit-3.50-plugin-close.patch
deleted file mode 100644
index 6787d6aef..000000000
--- a/staging/pstoedit/pstoedit-3.50-plugin-close.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugzilla.redhat.com/507035
-
-diff --git a/src/dynload.cpp b/src/dynload.cpp
-index c0db355..7c073ef 100644
---- a/src/dynload.cpp
-+++ b/src/dynload.cpp
-@@ -147,7 +147,6 @@ void DynLoader::close()
- 
- DynLoader::~DynLoader()
- {
--	close();
- 	libname=0;
- }
- 
diff --git a/staging/ptlib/PKGBUILD b/staging/ptlib/PKGBUILD
deleted file mode 100644
index d2901620b..000000000
--- a/staging/ptlib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 161375 2012-06-10 12:11:23Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=ptlib
-pkgver=2.10.5
-pkgrel=1
-pkgdesc="Portable Windows Library"
-arch=('i686' 'x86_64')
-url="http://www.opalvoip.org"
-license=('GPL')
-depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
-replaces=('pwlib')
-conflicts=('pwlib')
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2)
-md5sums=('20e0bc3cc85affed55e1481bf96c8c6b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc --localstatedir=/var \
-      --enable-opal --enable-plugins \
-      --enable-oss --enable-v4l2 \
-      --disable-avc --enable-sdl \
-      --enable-ipv6 --enable-v4l \
-      --enable-dc --disable-odbc \
-      --enable-expat --enable-httpforms
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('a5a571457ff3a398995b34f66d6c3cbb')
diff --git a/staging/pyalpm/PKGBUILD b/staging/pyalpm/PKGBUILD
deleted file mode 100644
index c9d420471..000000000
--- a/staging/pyalpm/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
-
-pkgname=pyalpm
-pkgver=0.5.3
-pkgrel=2
-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/staging/pycrypto/PKGBUILD b/staging/pycrypto/PKGBUILD
deleted file mode 100644
index d4987b4b3..000000000
--- a/staging/pycrypto/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 168667 2012-10-13 21:58:25Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-
-pkgbase=pycrypto
-pkgname=('python2-crypto' 'python-crypto')
-pkgver=2.6
-pkgrel=3
-arch=('i686' 'x86_64')
-makedepends=('python2' 'python')
-url="http://www.dlitz.net/software/pycrypto/"
-license=('custom')
-source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz")
-sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8')
-
-build() {
-  cd "${srcdir}"
-  find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \;
-  find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \;
- 
-  cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python2 setup.py build
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
-  python setup.py build
-}
-
-package_python2-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2."
-  depends=('python2')
-  replaces=('pycrypto')
-  conflicts=('pycrypto')
-  provides=("pycrypto=${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_python-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3."
-  depends=('python')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
-  python setup.py install --root="${pkgdir}" --optimize=1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/pygobject/PKGBUILD b/staging/pygobject/PKGBUILD
deleted file mode 100644
index c5b861096..000000000
--- a/staging/pygobject/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 168794 2012-10-16 00:45:16Z allan $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.2.2
-pkgrel=2
-arch=('i686' 'x86_64')
-url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('4653790baaff0176fd814b88cfb5378c45906a120b25d01be2554f423b726eb0')
-
-build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
-}
-
-package_python2-gobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
-
-  cd "python2-build"
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
-}
-
-package_pygobject-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-  cd "devel"
-  mkdir -p "$pkgdir"/usr/{include,lib}
-  mv include "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-}
diff --git a/staging/pygobject2/PKGBUILD b/staging/pygobject2/PKGBUILD
deleted file mode 100644
index 4ba2bfa2a..000000000
--- a/staging/pygobject2/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 168792 2012-10-16 00:40:21Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=pygobject2
-pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
-pkgver=2.28.6
-pkgrel=7
-arch=('i686' 'x86_64')
-url="http://www.pygtk.org/"
-license=('LGPL')
-makedepends=('python' 'python2')
-source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
-        python2-fix-type.patch
-        python3-fix-build.patch
-        python3-fix-maketrans.patch)
-options=('!libtool')
-sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
-            'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
-            'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
-            '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
-
-build() {
-  cd "${srcdir}"
-  cp -a "pygobject-${pkgver}" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
-
-  (
-    cd "pygobject-${pkgver}"
-    #patches available in 2.28 branch but unreleased.
-    patch -Np1 -i "${srcdir}/python2-fix-type.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-build.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
-
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
-}
-
-package_python-gobject2() {
-  pkgdesc="Python 3 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python')
-  replaces=('py3gobject')
-  provides=("py3gobject=$pkgver")
-
-  cd "${srcdir}/pygobject-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Delete devel stuff
-  rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
-}
-
-package_python2-gobject2() {
-  pkgdesc="Python 2 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python2')
-  replaces=('pygobject')
-  provides=("pygobject=$pkgver")
-
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
-
-  find "$pkgdir"/usr/share/pygobject -name '*.py' | \
-    xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  # Split devel stuff
-  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
-    "$srcdir/devel/"
-}
-
-package_pygobject2-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-
-  cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
-
-  mv include   "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-  mv gtk-doc   "$pkgdir/usr/share/"
-  mv xsl       "$pkgdir/usr/share/pygobject/"
-}
diff --git a/staging/pygobject2/python2-fix-type.patch b/staging/pygobject2/python2-fix-type.patch
deleted file mode 100644
index 78e7ddfd5..000000000
--- a/staging/pygobject2/python2-fix-type.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Mon, 12 Mar 2012 16:44:14 -0400
-Subject: gio-types.defs: change some enums to flags
-
-These flags types were originally incorrectly handled in glib as being
-enums.  That bug was fixed, but they're still enums here, leading to
-warnings about the mismatch.
-
-Change them to flags.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668522
----
- gio/gio-types.defs |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gio/gio-types.defs b/gio/gio-types.defs
-index 331e0bc..7eee5c8 100644
---- a/gio/gio-types.defs
-+++ b/gio/gio-types.defs
-@@ -526,7 +526,7 @@
-   )
- )
- 
--(define-enum MountMountFlags
-+(define-flags MountMountFlags
-   (in-module "gio")
-   (c-name "GMountMountFlags")
-   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
-@@ -545,7 +545,7 @@
-   )
- )
- 
--(define-enum DriveStartFlags
-+(define-flags DriveStartFlags
-   (in-module "gio")
-   (c-name "GDriveStartFlags")
-   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
-@@ -770,7 +770,7 @@
-   )
- )
- 
--(define-enum SocketMsgFlags
-+(define-flags SocketMsgFlags
-   (in-module "gio")
-   (c-name "GSocketMsgFlags")
-   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
--- 
-1.7.9.1
-
diff --git a/staging/pygobject2/python3-fix-build.patch b/staging/pygobject2/python3-fix-build.patch
deleted file mode 100644
index 4cb8cfe57..000000000
--- a/staging/pygobject2/python3-fix-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001
-From: Ignacio Casal Quinteiro <icq@gnome.org>
-Date: Thu, 21 Apr 2011 14:52:20 +0000
-Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore
-
----
-diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c
-index 81b9865..edf52d7 100644
---- a/gi/pygi-foreign-cairo.c
-+++ b/gi/pygi-foreign-cairo.c
-@@ -30,7 +30,7 @@
- #include <pycairo/py3cairo.h>
- #endif
- 
--Pycairo_CAPI_t *Pycairo_CAPI;
-+static Pycairo_CAPI_t *Pycairo_CAPI;
- 
- #include "pygi-foreign.h"
- 
-@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info,
- static PyMethodDef _gi_cairo_functions[] = {0,};
- PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
- {
-+#if PY_VERSION_HEX < 0x03000000
-     Pycairo_IMPORT;
-+#else
-+    Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI");
-+#endif
-+
-     if (Pycairo_CAPI == NULL)
-         return PYGLIB_MODULE_ERROR_RETURN;
- 
---
-cgit v0.9
diff --git a/staging/pygobject2/python3-fix-maketrans.patch b/staging/pygobject2/python3-fix-maketrans.patch
deleted file mode 100644
index f5bc0e77c..000000000
--- a/staging/pygobject2/python3-fix-maketrans.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Wed, 13 Jul 2011 06:42:22 +0000
-Subject: [python3] Fix maketrans import
-
-Python3 moved the maketrans() function from the string module to a str method.
-This unbreaks gi/module.py for Python 3 again.
----
-diff --git a/gi/module.py b/gi/module.py
-index 70df76c..d56bdaf 100644
---- a/gi/module.py
-+++ b/gi/module.py
-@@ -24,7 +24,11 @@ from __future__ import absolute_import
- 
- import os
- import gobject
--import string
-+try:
-+    maketrans = ''.maketrans
-+except AttributeError:
-+    # fallback for Python 2
-+    from string import maketrans
- 
- import gi
- from .overrides import registry
-@@ -124,7 +128,7 @@ class IntrospectionModule(object):
-                 # Don't use upper() here to avoid locale specific
-                 # identifier conversion (e. g. in Turkish 'i'.upper() == 'i')
-                 # see https://bugzilla.gnome.org/show_bug.cgi?id=649165
--                ascii_upper_trans = string.maketrans(
-+                ascii_upper_trans = maketrans(
-                         'abcdefgjhijklmnopqrstuvwxyz', 
-                         'ABCDEFGJHIJKLMNOPQRSTUVWXYZ')
-                 for value_info in info.get_values():
---
-cgit v0.9
diff --git a/staging/pyopenssl/PKGBUILD b/staging/pyopenssl/PKGBUILD
deleted file mode 100644
index 12bf75be8..000000000
--- a/staging/pyopenssl/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 168651 2012-10-13 20:29:33Z eric $
-# Maintainer : Ionut Biru<ibiru@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgbase=pyopenssl
-pkgname=('python-pyopenssl' 'python2-pyopenssl')
-pkgver=0.13
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/pyOpenSSL"
-license=('LGPL2.1')
-makedepends=('python' 'python2' 'openssl')
-source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
-md5sums=('767bca18a71178ca353dff9e10941929')
-
-build() {
-    cd "${srcdir}"
-    cp -a "pyOpenSSL-${pkgver}"{,-python2}
-
-    #build python 3 module
-    cd "pyOpenSSL-${pkgver}"
-    python setup.py build
-
-    #build python 2 module
-    cd ../"pyOpenSSL-${pkgver}-python2"
-    python2 setup.py build
-}
-
-package_python-pyopenssl(){
-    pkgdesc="Python3 wrapper module around the OpenSSL library"
-    depends=('python>=3.3' 'openssl')
-    replaces=('pyopenssl')
-    provides=('pyopenssl')
-    conflicts=('pyopenssl')
-
-    cd "${srcdir}/pyOpenSSL-${pkgver}"
-    python setup.py install --root "${pkgdir}" --optimize=1
-}
-
-package_python2-pyopenssl(){
-    pkgdesc="Python2 wrapper module around the OpenSSL library"
-    depends=('python2>=2.7' 'openssl')
-
-    cd "${srcdir}/pyOpenSSL-${pkgver}-python2"
-    python2 setup.py install --root "${pkgdir}" --optimize=1
-}
diff --git a/staging/pyqt/PKGBUILD b/staging/pyqt/PKGBUILD
deleted file mode 100644
index 6f3b1a230..000000000
--- a/staging/pyqt/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 168744 2012-10-15 09:20:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.5
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
-             'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('e4cdd6619c63655f7510efb4df8462fb')
-
-build() {
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd PyQt-x11-gpl-${pkgver}
-  python configure.py \
-    --confirm-license \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd ../Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
-    --confirm-license \
-    -v /usr/share/sip \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
-  
-  cd PyQt-x11-gpl-${pkgver}
-  make -C pyrcc DESTDIR="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" install
-  
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-
-  cd PyQt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  provides=('python2-qt')
-
-  cd Py2Qt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Fix conflicts with pyqt
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
-  
-  # Provided by pyqt
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/staging/python-cairo/PKGBUILD b/staging/python-cairo/PKGBUILD
deleted file mode 100644
index 578fec081..000000000
--- a/staging/python-cairo/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167695 2012-10-03 01:10:24Z stephane $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>  
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=python-cairo
-pkgver=1.10.0
-pkgrel=2
-pkgdesc="Python bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
-license=('LGPL3')
-depends=('python' 'cairo')
-makedepends=('pkg-config')
-options=('!libtool')
-source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
-url="http://www.cairographics.org/pycairo"
-md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
-
-build() {
-  cd "${srcdir}/pycairo-${pkgver}"
-
-  # Ensure that ./waf has created the cached unpacked version
-  # of the wafadmin source tree.
-  # This will be created to a subdirectory like
-  #    .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
-  python3 ./waf --version
-
-  ./waf configure --prefix=/usr
-  ./waf build
-}
-
-package() {
-  cd "${srcdir}/pycairo-${pkgver}"
-  ./waf install --destdir="${pkgdir}"
-}
diff --git a/staging/python-egenix-mx-base/PKGBUILD b/staging/python-egenix-mx-base/PKGBUILD
deleted file mode 100644
index f48fd8fb8..000000000
--- a/staging/python-egenix-mx-base/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168671 2012-10-13 23:05:54Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=python-egenix-mx-base
-pkgname=('python2-egenix-mx-base')
-_origname=egenix-mx-base
-pkgver=3.2.4
-pkgrel=2
-pkgdesc="A collection of Python tools"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.egenix.com/products/python/mxBase/"
-makedepends=('python2')
-source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7')
-
-build() {
-  cd "${srcdir}/${_origname}-${pkgver}"
-
-  find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \;
-
-  python2 setup.py build
-}
-
-package_python2-egenix-mx-base() {
-  depends=('python2>=2.7')
-  cd "${srcdir}/${_origname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1
-  install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/staging/python-iwscan/PKGBUILD b/staging/python-iwscan/PKGBUILD
deleted file mode 100644
index 3abb6747e..000000000
--- a/staging/python-iwscan/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168715 2012-10-14 20:19:42Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgbase=python-iwscan
-pkgname=python2-iwscan
-pkgver=20090609
-pkgrel=4
-pkgdesc="A Python interface to iwlist, using the iwlib library"
-arch=('i686' 'x86_64')
-url="http://projects.otaku42.de/browser/python-iwscan"
-license=('LGPL')
-depends=('python2' 'wireless_tools')
-conflicts=('python-iwscan<=20090609-3')
-replaces=('python-iwscan<=20090609-3')
-source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz)
-md5sums=('30fbe8ad3b07e67c1c35db2de16077d8')
-
-build() {
-	cd "${srcdir}/${pkgbase}"
-	python2 setup.py build
-}
-
-package_python2-iwscan() {
-	cd "${srcdir}/${pkgbase}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/staging/python-lxml/PKGBUILD b/staging/python-lxml/PKGBUILD
deleted file mode 100644
index 33aa7dc70..000000000
--- a/staging/python-lxml/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168387 2012-10-09 21:43:30Z eric $
-# Maintainer:
-
-pkgname=('python-lxml' 'python2-lxml')
-pkgver=3.0
-pkgrel=1
-pkgdesc="Python binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64')
-license=('BSD' 'custom')
-url="http://lxml.de/"
-makedepends=('python2' 'python' 'libxslt')
-source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441'
-          'b38447fd3f9cfb30b4d56ffe3bec42739afb2947')
-
-check() {
-  cd "${srcdir}"/lxml-$pkgver
-  make PYTHON=python2 test
-  make PYTHON=python test
-}
-
-package_python2-lxml() {
-  depends=('python2' 'libxslt')
-  optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML')
-
-  cd "${srcdir}"/lxml-$pkgver
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}
-
-package_python-lxml() {
-  depends=('python' 'libxslt')
-
-  cd "${srcdir}"/lxml-$pkgver
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}
diff --git a/staging/python-markupsafe/PKGBUILD b/staging/python-markupsafe/PKGBUILD
deleted file mode 100644
index 0ead0adad..000000000
--- a/staging/python-markupsafe/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 168655 2012-10-13 20:45:16Z eric $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
-
-pkgname=('python-markupsafe' 'python2-markupsafe')
-pkgver=0.15
-pkgrel=2
-pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/MarkupSafe"
-license=('custom')
-makedepends=('python-distribute' 'python2-distribute')
-source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
-
-build() {
-  cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
-  cd "${srcdir}/MarkupSafe-${pkgver}"
-  python setup.py build
-
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
-  python2 setup.py build
-}
-
-package_python-markupsafe() {
-  depends=('python')
-
-  cd "${srcdir}/MarkupSafe-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
-}
-
-package_python2-markupsafe() {
-  depends=('python2')
-
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
-}
diff --git a/staging/python-notify/PKGBUILD b/staging/python-notify/PKGBUILD
deleted file mode 100644
index 6cf46c8dc..000000000
--- a/staging/python-notify/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168721 2012-10-14 20:45:08Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-
-pkgbase=python-notify
-pkgname=python2-notify
-pkgver=0.1.1
-pkgrel=12
-pkgdesc="Python bindings for libnotify"
-arch=('i686' 'x86_64')
-url="http://www.galago-project.org/"
-license=('GPL')
-depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
-makedepends=('python2')
-conflicts=('python-notify<=0.1.1-11')
-replaces=('python-notify<=0.1.1-11')
-options=(!libtool)
-source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
-        libnotify07.patch
-        notify-python-0.1.1-fix-GTK-symbols.patch)
-md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
-         'b40c4542575d5aef559908fe60a21634'
-         'c6922028da5951e69a6a0167bdb4461c')
-
-build() {
-    cd "${srcdir}/notify-python-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/libnotify07.patch"
-    patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch"
-
-    ./configure --prefix=/usr
-
-    # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c
-    # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed
-    touch src/pynotify.override
-
-    make clean
-    make
-}
-
-package_python2-notify() {
-    cd "${srcdir}/notify-python-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/python-notify/libnotify07.patch b/staging/python-notify/libnotify07.patch
deleted file mode 100644
index 289573d50..000000000
--- a/staging/python-notify/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070	2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs	2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
-     '("const-gchar*" "summary")
-     '("const-gchar*" "message" (null-ok) (default "NULL"))
-     '("const-gchar*" "icon" (null-ok) (default "NULL"))
--    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
-   )
- )
- 
-@@ -53,24 +52,6 @@
-   )
- )
- 
--(define-method attach_to_widget
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_widget")
--  (return-type "none")
--  (parameters
--    '("GtkWidget*" "attach")
--  )
--)
--
--(define-method attach_to_status_icon
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_status_icon")
--  (return-type "none")
--  (parameters
--    '("GtkStatusIcon*" "attach")
--  )
--)
--
- (define-method show
-   (of-object "NotifyNotification")
-   (c-name "notify_notification_show")
diff --git a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c0136..000000000
--- a/staging/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD	2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py	2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/staging/python-pygame/PKGBUILD b/staging/python-pygame/PKGBUILD
deleted file mode 100644
index 2cd71fc35..000000000
--- a/staging/python-pygame/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 167394 2012-10-01 22:41:51Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=python-pygame
-pkgname=python2-pygame
-pkgver=1.9.1
-pkgrel=6
-pkgdesc="Python game library"
-arch=('i686' 'x86_64')
-url="http://www.pygame.org/"
-license=('LGPL')
-depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
-source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
-        config.patch pygame-v4l.patch)
-sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
-          '285815e28705d5a2aea53c9d952d35fddf10dd13'
-          '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
-
-build() {
-  cd "${srcdir}/pygame-${pkgver}release"
-  patch -Np0 -i "${srcdir}/config.patch"
-  patch -Np1 -i "${srcdir}/pygame-v4l.patch"
-}
-
-package_python2-pygame() {
-  cd "${srcdir}/pygame-${pkgver}release"
-  python2 config.py -auto
-  python2 setup.py install --root="${pkgdir}" --prefix=/usr
-
-# Copying the examples and tests
-  cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
-  cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
-
-  find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
-
-# Fixing permissions
-  chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
-}
diff --git a/staging/python-pygame/config.patch b/staging/python-pygame/config.patch
deleted file mode 100644
index b3dab162c..000000000
--- a/staging/python-pygame/config.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: config_unix.py
-===================================================================
---- config_unix.py	(revision 2567)
-+++ config_unix.py	(working copy)
-@@ -174,7 +174,7 @@
- 
-     for d in DEPS[1:]:
-         if not d.found:
--            if not confirm("""
-+            if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
-Index: config_msys.py
-===================================================================
---- config_msys.py	(revision 2567)
-+++ config_msys.py	(working copy)
-@@ -283,7 +283,7 @@
-     
-     for d in DEPS[1:]:
-         if not d.found:
--            if not confirm("""
-+            if "-auto" not in sys.argv and not confirm("""
- Warning, some of the pygame dependencies were not found. Pygame can still
- compile and install, but games that depend on those missing dependencies
- will not run. Would you like to continue the configuration?"""):
diff --git a/staging/python-pygame/pygame-v4l.patch b/staging/python-pygame/pygame-v4l.patch
deleted file mode 100644
index 3b5a2b9d2..000000000
--- a/staging/python-pygame/pygame-v4l.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
-*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
---- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
-***************
-*** 34,40 ****
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
---- 34,40 ----
-  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
-  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
-  
-  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
-diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
-*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
---- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
-***************
-*** 160,179 ****
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-!         if (v4l_open_device(self) == 0) {
-!             v4l2_close_device(self);
-!             return NULL;
-!         } else {
-!             self->camera_type = CAM_V4L;
-!             if (v4l_init_device(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!             if (v4l_start_capturing(self) == 0) {
-!                 v4l2_close_device(self);
-!                 return NULL;
-!             }
-!         }
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
---- 160,167 ----
-  {
-  #if defined(__unix__)
-      if (v4l2_open_device(self) == 0) {
-! 	v4l2_close_device(self);
-!         return NULL;
-      } else {
-          self->camera_type = CAM_V4L2;
-          if (v4l2_init_device(self) == 0) {
-diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
-*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
---- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
-***************
-*** 39,45 ****
-  
-      #include <asm/types.h>          /* for videodev2.h */
-  
--     #include <linux/videodev.h>
-      #include <linux/videodev2.h>
-  #endif
-  
---- 39,44 ----
-***************
-*** 51,57 ****
-  #define RGB_OUT 1
-  #define YUV_OUT 2
-  #define HSV_OUT 4
-- #define CAM_V4L 1
-  #define CAM_V4L2 2
-  
-  struct buffer 
---- 50,55 ----
-***************
-*** 111,118 ****
-  int v4l2_close_device (PyCameraObject* self);
-  int v4l2_open_device (PyCameraObject* self);
-  
-- /* internal functions specific to v4l */
-- int v4l_open_device (PyCameraObject* self);
-- int v4l_init_device(PyCameraObject* self);
-- int v4l_start_capturing(PyCameraObject* self);
-  #endif
---- 109,112 ----
diff --git a/staging/python-pyspi/PKGBUILD b/staging/python-pyspi/PKGBUILD
deleted file mode 100644
index e230fd562..000000000
--- a/staging/python-pyspi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168788 2012-10-16 00:26:49Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-pyspi
-pkgname=python2-pyspi
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="Python AT-SPI bindings"
-arch=('i686' 'x86_64')
-url="http://people.redhat.com/zcerza/dogtail"
-license=('LGPL')
-depends=('python2' 'at-spi')
-makedepends=('pyrex')
-conflicts=('python-pyspi<=0.6.1-5')
-conflicts=('python-pyspi<=0.6.1-5')
-source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz"
-        'pyspi-build.patch')
-md5sums=('def336bd566ea688a06ec03db7ccf1f4'
-         '721f74cbae653a258c00b83acf7dd1da')
-
-build() {
-  cd ${srcdir}/pyspi-${pkgver}
-  patch -Np1 -i ${srcdir}/pyspi-build.patch
-  # Pyrex tells us to use __cinit__ instead of __new__
-  sed -i 's/__new__/__cinit__/' pyspi.pyx
-}
-
-package_python2-pyspi() {
-  cd ${srcdir}/pyspi-${pkgver}
-  python2 setup.py install --root=${pkgdir}
-}
diff --git a/staging/python-pyspi/pyspi-build.patch b/staging/python-pyspi/pyspi-build.patch
deleted file mode 100644
index 3d12c5ed5..000000000
--- a/staging/python-pyspi/pyspi-build.patch
+++ /dev/null
@@ -1,1693 +0,0 @@
-diff -Naur pyspi-0.6.1-old/cspi.pxd pyspi-0.6.1/cspi.pxd
---- pyspi-0.6.1-old/cspi.pxd	2006-08-04 06:27:10.000000000 +1000
-+++ pyspi-0.6.1/cspi.pxd	2009-05-09 15:24:31.000000000 +1000
-@@ -14,9 +14,7 @@
- 
- 	ctypedef struct AccessibleTextRange
- 	ctypedef struct AccessibleKeySet
--	ctypedef enum SPIBoolean:
--		FALSE = 0,
--		TRUE
-+	ctypedef unsigned int SPIBoolean
- 
- 	ctypedef struct AccessibleEvent:
- 		char  *type
-diff -Naur pyspi-0.6.1-old/pyspi.pyx pyspi-0.6.1/pyspi.pyx
---- pyspi-0.6.1-old/pyspi.pyx	2006-10-03 02:46:41.000000000 +1000
-+++ pyspi-0.6.1/pyspi.pyx	2009-05-09 15:24:31.000000000 +1000
-@@ -25,9 +25,15 @@
- cdef class Event (EventBase)
- cdef class DeviceEvent
- 
--ctypedef enum bool:
-+ctypedef unsigned int bool
-+
-+import __builtin__
-+try:
-+	False = __builtin__.False
-+	True = __builtin__.True
-+except AttributeError:
- 	False = 0
--	True
-+	True = 1
- 
- # SPIExceptionCode values:
- (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
-@@ -731,7 +737,7 @@
- 	Wrapper around the low-level cspi.AccessibleComponent_ functions,
- 	giving an OO-style API.
- 	"""
--	def getExtents (self, type=0):
-+	def getExtents (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleComponent_getExtents, returning an
- 		(x,y,w,h) tuple.
-@@ -741,7 +747,7 @@
- 		cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type)
- 		return (x, y, w, h)
- 
--	def getPosition (self, type = 0):
-+	def getPosition (self, key_type = 0):
- 		"""
- 		Wraps cspi.AccessibleComponent_getPosition, returning an
- 		(x,y) tuple.
-@@ -991,11 +997,11 @@
- 		Wraps cspi.AccessibleHyperlink_getObject
- 		"""
- 		self.__checkSelf ()
--		cdef Accessible object
--		object = Accessible ()
--		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
--		object.__checkSelf ()
--		return object
-+		cdef Accessible obj
-+		obj = Accessible ()
-+		obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-+		obj.__checkSelf ()
-+		return obj
- 
- 	def getURI (self, i):
- 		"""
-@@ -1032,7 +1038,7 @@
- 		cspi.AccessibleImage_getImageSize(self.__item, &w, &h);
- 		return [w, h]
- 
--	def getImagePosition (self, type=0):
-+	def getImagePosition (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y)
- 		pair
-@@ -1042,7 +1048,7 @@
- 		cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type)
- 		return [x, y]
- 
--	def getImageExtents (self, type=0):
-+	def getImageExtents (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleImage_getImageExtents, returning a
- 		(x,y,w,h) tuple
-@@ -1551,7 +1557,7 @@
- 	cdef cspi.AccessibleDeviceListener *__item
- 	cdef public object modMasks
- 
--	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
-+	def __init__ (self, callback, eventMask = <int> cspi.SPI_KEY_PRESSED | <int> cspi.SPI_KEY_RELEASED):
- 		"""
- 		Registers a python callback function to be called.
- 
-diff -Naur pyspi-0.6.1-old/pyspi.pyx.orig pyspi-0.6.1/pyspi.pyx.orig
---- pyspi-0.6.1-old/pyspi.pyx.orig	1970-01-01 10:00:00.000000000 +1000
-+++ pyspi-0.6.1/pyspi.pyx.orig	2006-10-03 02:46:41.000000000 +1000
-@@ -0,0 +1,1592 @@
-+# Authors:
-+#          Zack Cerza <zcerza@redhat.com>
-+#          Chris Lee <clee@redhat.com>
-+#          Lawrence Lim <llim@redhat.com>
-+#          David Malcolm <dmalcolm@redhat.com>
-+
-+cdef class Registry
-+
-+cdef class Base
-+cdef class EventBase
-+cdef class StateSet
-+cdef class Accessible (Base)
-+cdef class Desktop (Accessible)
-+cdef class Application (Accessible)
-+cdef class Component (Accessible)
-+cdef class Action (Base)
-+cdef class Text (Base)
-+cdef class EditableText (Text)
-+cdef class Hypertext (Text)
-+cdef class Hyperlink (Base)
-+cdef class Image (Base)
-+cdef class Value (Base)
-+cdef class Selection (Base)
-+cdef class Table (Base)
-+cdef class Event (EventBase)
-+cdef class DeviceEvent
-+
-+ctypedef enum bool:
-+	False = 0
-+	True
-+
-+# SPIExceptionCode values:
-+(SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
-+
-+# SPIExceptionType values:
-+(SPI_EXCEPTION_SOURCE_UNSPECIFIED, SPI_EXCEPTION_SOURCE_ACCESSIBLE, SPI_EXCEPTION_SOURCE_REGISTRY, SPI_EXCEPTION_SOURCE_DEVICE)=range(4)
-+
-+# Accessible roles
-+(SPI_ROLE_INVALID, SPI_ROLE_ACCEL_LABEL, SPI_ROLE_ALERT, SPI_ROLE_ANIMATION, SPI_ROLE_ARROW, SPI_ROLE_CALENDAR, SPI_ROLE_CANVAS, SPI_ROLE_CHECK_BOX, SPI_ROLE_CHECK_MENU_ITEM, SPI_ROLE_COLOR_CHOOSER, SPI_ROLE_COLUMN_HEADER, SPI_ROLE_COMBO_BOX, SPI_ROLE_DATE_EDITOR, SPI_ROLE_DESKTOP_ICON, SPI_ROLE_DESKTOP_FRAME, SPI_ROLE_DIAL, SPI_ROLE_DIALOG, SPI_ROLE_DIRECTORY_PANE, SPI_ROLE_DRAWING_AREA, SPI_ROLE_FILE_CHOOSER, SPI_ROLE_FILLER, SPI_ROLE_FONT_CHOOSER, SPI_ROLE_FRAME, SPI_ROLE_GLASS_PANE, SPI_ROLE_HTML_CONTAINER, SPI_ROLE_ICON, SPI_ROLE_IMAGE, SPI_ROLE_INTERNAL_FRAME, SPI_ROLE_LABEL, SPI_ROLE_LAYERED_PANE, SPI_ROLE_LIST, SPI_ROLE_LIST_ITEM, SPI_ROLE_MENU, SPI_ROLE_MENU_BAR, SPI_ROLE_MENU_ITEM, SPI_ROLE_OPTION_PANE, SPI_ROLE_PAGE_TAB, SPI_ROLE_PAGE_TAB_LIST, SPI_ROLE_PANEL, SPI_ROLE_PASSWORD_TEXT, SPI_ROLE_POPUP_MENU, SPI_ROLE_PROGRESS_BAR, SPI_ROLE_PUSH_BUTTON, SPI_ROLE_RADIO_BUTTON, SPI_ROLE_RADIO_MENU_ITEM, SPI_ROLE_ROOT_PANE, SPI_ROLE_ROW_HEADER, SPI_ROLE_SCROLL_BAR, SPI_ROLE_SCROLL_PANE, SPI_ROLE_SEPARATOR, SPI_ROLE_SLIDER, SPI_ROLE_SPIN_BUTTON, SPI_ROLE_SPLIT_PANE, SPI_ROLE_STATUS_BAR, SPI_ROLE_TABLE, SPI_ROLE_TABLE_CELL, SPI_ROLE_TABLE_COLUMN_HEADER, SPI_ROLE_TABLE_ROW_HEADER, SPI_ROLE_TEAROFF_MENU_ITEM, SPI_ROLE_TERMINAL, SPI_ROLE_TEXT, SPI_ROLE_TOGGLE_BUTTON, SPI_ROLE_TOOL_BAR, SPI_ROLE_TOOL_TIP, SPI_ROLE_TREE, SPI_ROLE_TREE_TABLE, SPI_ROLE_UNKNOWN, SPI_ROLE_VIEWPORT, SPI_ROLE_WINDOW, SPI_ROLE_EXTENDED, SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH, SPI_ROLE_RULER, SPI_ROLE_APPLICATION, SPI_ROLE_AUTOCOMPLETE, SPI_ROLE_EDITBAR, SPI_ROLE_EMBEDDED, SPI_ROLE_LAST_DEFINED)=range(79)
-+
-+# Accessible states
-+(SPI_STATE_INVALID, SPI_STATE_ACTIVE, SPI_STATE_ARMED, SPI_STATE_BUSY, SPI_STATE_CHECKED, SPI_STATE_COLLAPSED, SPI_STATE_DEFUNCT, SPI_STATE_EDITABLE, SPI_STATE_ENABLED, SPI_STATE_EXPANDABLE, SPI_STATE_EXPANDED, SPI_STATE_FOCUSABLE, SPI_STATE_FOCUSED, SPI_STATE_HORIZONTAL, SPI_STATE_ICONIFIED, SPI_STATE_MODAL, SPI_STATE_MULTI_LINE, SPI_STATE_MULTISELECTABLE, SPI_STATE_OPAQUE, SPI_STATE_PRESSED, SPI_STATE_RESIZABLE, SPI_STATE_SELECTABLE, SPI_STATE_SELECTED, SPI_STATE_SENSITIVE, SPI_STATE_SHOWING, SPI_STATE_SINGLE_LINE, SPI_STATE_STALE, SPI_STATE_TRANSIENT, SPI_STATE_VERTICAL, SPI_STATE_VISIBLE, SPI_STATE_MANAGES_DESCENDANTS, SPI_STATE_INDETERMINATE) = range(32);
-+
-+# Accessible relation types
-+(SPI_RELATION_NULL, SPI_RELATION_LABEL_FOR, SPI_RELATION_LABELED_BY, SPI_RELATION_CONTROLLER_FOR, SPI_RELATION_CONTROLLED_BY, SPI_RELATION_MEMBER_OF, SPI_RELATION_NODE_CHILD_OF, SPI_RELATION_EXTENDED, SPI_RELATION_FLOWS_TO, SPI_RELATION_FLOWS_FROM, SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY, SPI_RELATION_POPUP_FOR, SPI_RELATION_LAST_DEFINED) = range (15);
-+
-+# AccessibleComponent layers
-+(SPI_LAYER_INVALID, SPI_LAYER_BACKGROUND, SPI_LAYER_CANVAS, SPI_LAYER_WIDGET, SPI_LAYER_MDI, SPI_LAYER_POPUP, SPI_LAYER_OVERLAY, SPI_LAYER_WINDOW, SPI_LAYER_LAST_DEFINED) = range(9)
-+
-+#AccessibleKeySynthType
-+(SPI_KEY_PRESS, SPI_KEY_RELEASE, SPI_KEY_PRESSRELEASE, SPI_KEY_SYM, SPI_KEY_STRING) = range(5)
-+
-+# AccessibleKeyListenerSyncType
-+(SPI_KEYLISTENER_NOSYNC, SPI_KEYLISTENER_SYNCHRONOUS, SPI_KEYLISTENER_CANCONSUME, SPI_KEYLISTENER_ALL_WINDOWS) = range(4)
-+
-+# AccessibleDeviceEventType
-+SPI_KEY_PRESSED  = 1<<0
-+SPI_KEY_RELEASED = 1<<1
-+SPI_BUTTON_PRESSED = 1<<2
-+SPI_BUTTON_RELEASED = 1<<3
-+
-+cdef cspi.AccessibleKeySet *SPI_KEYSET_ALL_KEYS
-+SPI_KEYSET_ALL_KEYS = NULL
-+
-+Accessibility_MODIFIER_SHIFT = 1 << 0
-+Accessibility_MODIFIER_SHIFTLOCK = 1 << 1
-+Accessibility_MODIFIER_CONTROL = 1 << 2
-+Accessibility_MODIFIER_ALT = 1 << 3
-+Accessibility_MODIFIER_META = 1 << 4
-+Accessibility_MODIFIER_META2 = 1 << 5
-+Accessibility_MODIFIER_META3 = 1 << 6
-+Accessibility_MODIFIER_NUMLOCK = 1 << 7
-+
-+
-+cdef object string(char * string):
-+	cdef object pyString
-+	pyString = string
-+	cspi.SPI_freeString(string)
-+	return pyString
-+
-+import os
-+class X11Exception(Exception):
-+	def __init__(self, display = os.environ.get('DISPLAY', None)):
-+		self.display = display
-+	def __str__(self):
-+		msg = "Cannot open display"
-+		if self.display: return msg + ': ' + self.display
-+		else: return msg
-+
-+class AtspiException(Exception):
-+	"""
-+	Exceptions raised when calls to the AT-SPI C bindings return FALSE to
-+	indicate failure.
-+	"""
-+	def __init__(self, message):
-+		self.message = message
-+
-+	def __str__(self):
-+		return "AtspiException: %s"%self.message
-+
-+class SpiException(Exception):
-+	"""
-+	Exceptions to be raised in response to an installed
-+	SPIExceptionHandler, corresponding to a SPIException.  These appear to
-+	be short-lived structs, so we gather all applicable data immediately
-+	"""
-+	def __init__(self, is_fatal, sourceType, exceptionCode, description):
-+		# print "got to __init__"
-+		self.fatal = is_fatal
-+		self.sourceType = sourceType
-+		self.exceptionCode = exceptionCode
-+		self.description = description
-+		
-+		# print "leaving __init__"
-+		# print self.fatal
-+		# print self.sourceType
-+		# print self.exceptionCode
-+		# print self.description
-+
-+	def __str__(self):
-+		if self.fatal:
-+			fatalStr = "Fatal"
-+		else:
-+			fatalStr = "Non-fatal"
-+		result = '%s SPIException: type:%s source:%s "%s"'%(fatalStr, self.sourceType, self.exceptionCode, self.description)
-+		return result
-+
-+cdef make_exception(cspi.SPIException *err, cspi.SPIBoolean is_fatal):
-+	# Don't attempt to use SPIAccessibleException_getSource; this is error
-+	# handling code, we don't want to introduce further complications
-+	return SpiException(is_fatal,
-+			    cspi.SPIException_getSourceType (err),
-+			    cspi.SPIException_getExceptionCode (err),
-+			    cspi.SPIException_getDescription (err))
-+
-+	
-+def event_main():
-+	cspi.SPI_event_main()
-+
-+def event_quit():
-+	cspi.SPI_event_quit()
-+
-+cdef cspi.SPIBoolean exception_handler (cspi.SPIException *err, cspi.SPIBoolean is_fatal) except *:
-+	# print "got exception!!!"
-+	e = make_exception(err, is_fatal)
-+	raise e
-+
-+# at-spi-<version>/cpsi.h contains:
-+#   typedef SPIBoolean (*SPIExceptionHandler) (SPIException *err, SPIBoolean is_fatal);
-+# and
-+#   SPIBoolean SPI_exceptionHandlerPush (SPIExceptionHandler *handler);
-+# There's thus an extra unnecessary level of indirection.
-+# We have to jump through the following hoops to get pyrex to deal with this:
-+cdef cspi.SPIExceptionHandler exception_handler_as_type
-+cdef cspi.SPIExceptionHandler* exception_handler_ptr
-+exception_handler_as_type = exception_handler
-+exception_handler_ptr = &exception_handler_as_type
-+
-+global_exception = None
-+
-+cdef class Registry:
-+	def __init__ (self):
-+		cdef Xlib.Display *display
-+		display = Xlib.XOpenDisplay(NULL)
-+		if display == NULL:
-+			raise X11Exception
-+		else:
-+			Xlib.XCloseDisplay(display)
-+
-+		result = cspi.SPI_init ()
-+		#if result!=0:
-+		#	raise AtspiException("SPI_init: exit code %s" % str(result))
-+
-+		result = cspi.SPI_exceptionHandlerPush (exception_handler_ptr)
-+		if not result:
-+			raise AtspiException("Unable to install SPI exception handler")
-+
-+	def __dealloc (self):
-+		result = cspi.SPI_exit ()
-+		if result!=0:
-+			raise AtspiException("SPI_init: exit code %s" % str(result))
-+
-+	def getDesktopCount (self):
-+		return cspi.SPI_getDesktopCount()
-+
-+	def getDesktop (self, index = 0):
-+		cdef Desktop desktop
-+		desktop = Desktop ()
-+		if not desktop.__setItem (cspi.SPI_getDesktop (index)):
-+			return False
-+		return desktop
-+
-+	def getDesktopList (self):
-+		# Using the bonobo.activation bindings, getDesktopList() returns a 
-+		# Python list of Desktop objects. The C bindings seem to do it differently,
-+		# and Pyrex doesn't like that method. So we're re-implementing the function
-+		# using getDesktopCount() and getDesktop() to work around that.
-+		# Yay for Zack!
-+		#
-+		#	-Zack
-+		cdef Desktop desktop
-+		desktops = []
-+		desktop = Desktop ()
-+		for i in xrange (cspi.SPI_getDesktopCount ()):
-+			desktop.__setItem (cspi.SPI_getDesktop (i))
-+			desktops = desktops + [desktop]
-+		return desktops
-+
-+registry = Registry()
-+
-+cdef class Base:
-+	"""
-+	Wrapper around a cspi.Accessible
-+	"""
-+	
-+	cdef cspi.Accessible *__item
-+	
-+	def __new__ (self):
-+		self.__item = NULL
-+	
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.Accessible_unref (self.__item)
-+
-+	cdef bool __setItem (self, cspi.Accessible *obj):
-+		if self.__item != NULL:
-+			cspi.Accessible_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.Accessible_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+	
-+	def __checkSelf (self):
-+		assert self.__item != NULL
-+
-+# WHY OH WHY won't this work? :(
-+# I need to be able to find out of two Accessible classes contain
-+# the same cspi.Accessible objects.
-+#
-+#	def isSameAs (self, base):
-+#		cdef bool foo
-+#		foo = self.__item == base.__item
-+#		return foo
-+
-+cdef class EventBase:
-+	"""
-+	Wrapper around a cspi.AccessibleEvent
-+	"""
-+	cdef cspi.AccessibleEvent *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleEvent_unref (self.__item)
-+
-+	cdef bool __setItem (self, cspi.AccessibleEvent *obj):
-+		if self.__item != NULL: 
-+			cspi.AccessibleEvent_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleEvent_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	def __getattr__ (self, attrName):
-+		cdef cspi.Accessible* acc
-+		cdef Accessible result
-+		if attrName == "source":
-+			acc = self.__item.source
-+			if acc!=NULL:
-+				result = Accessible ()
-+				result.__setItem (acc)
-+				return result
-+		elif attrName == "detail1":
-+			detail1 = self.__item.detail1
-+			return detail1
-+		elif attrName == "detail2":
-+			detail1 = self.__item.detail2
-+			return detail1
-+		elif attrName == "type":
-+			return self.__item.type
-+
-+cdef class StateSet:
-+	"""
-+	Wrapper around a cspi.AccessibleStateSet
-+	"""
-+	cdef cspi.AccessibleStateSet *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleStateSet_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	cdef bool __setItem (self, cspi.AccessibleStateSet *obj):
-+		if self.__item != NULL:
-+			cspi.AccessibleStateSet_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleStateSet_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	cdef bool __contains (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		return cspi.AccessibleStateSet_contains (self.__item, s)
-+
-+	def contains (self, state):
-+		self.__checkSelf ()
-+		return self.__contains(state)
-+
-+	cdef void __add (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		cspi.AccessibleStateSet_add(self.__item, s)
-+
-+	def add (self, state):
-+		self.__checkSelf ()
-+		self.__add (state)
-+
-+	cdef void __remove (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		cspi.AccessibleStateSet_remove (self.__item, s)
-+
-+	def remove (self, state):
-+		self.__checkSelf ()
-+		self.__remove (state)
-+		
-+	def __str__ (self):
-+		self.__checkSelf ()
-+		return str(self.states)
-+
-+	def __getattr__(self, name):
-+		if name == "states":
-+			result = []
-+			for state in range(SPI_STATE_INVALID, SPI_STATE_INDETERMINATE):
-+				if self.contains(state):
-+					result.append(state)
-+			return result
-+		else:
-+			raise AttributeError, name
-+
-+cdef class Relation:
-+	"""
-+	Wrapper around a cspi.AccessibleRelation
-+	"""
-+	cdef cspi.AccessibleRelation *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleRelation_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	def __str__ (self):
-+		self.__checkSelf ()
-+		return "relation %s -> %s"%(self.getRelationType (), self.getTargets())
-+
-+	def __repr__ (self):
-+		self.__checkSelf ()
-+		return "relation %s -> %s"%(self.getRelationType (), self.getTargets())
-+
-+	cdef bool __setItem (self, cspi.AccessibleRelation *obj):
-+		if self.__item != NULL:
-+			cspi.AccessibleRelation_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleRelation_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	def getNTargets (self):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getNTargets
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleRelation_getNTargets (self.__item)
-+
-+	def getTarget (self, i):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getTarget
-+		"""
-+		self.__checkSelf ()
-+		cdef Accessible target
-+		target = Accessible ()
-+		target.__setItem (cspi.AccessibleRelation_getTarget (self.__item, i))
-+		target.__checkSelf ()
-+		return target
-+
-+	def getTargets (self):
-+		"""
-+		Gets the targets of this AccessibleRelation as a list of atspi.Accessible
-+		"""
-+		self.__checkSelf ()
-+		result = []
-+		count = self.getNTargets()
-+		for i in range(count):
-+			result.append(self.getTarget(i))
-+		return result
-+
-+	def getRelationType (self):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getRelationType
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleRelation_getRelationType (self.__item)
-+
-+cdef class Accessible (Base):
-+	"""
-+	Wrapper around cspi.Accessible
-+	"""
-+	def __getattr__ (self, name):
-+		if name == "name":
-+			return self.getName ()
-+		elif name == "role":
-+			return self.getRole ()
-+		elif name == "roleName":
-+			return self.getRoleName ()
-+		elif name == "description":
-+			return self.getDescription ()
-+		elif name == "parent":
-+			return self.getParent ()
-+		elif name == "childCount":
-+			return self.getChildCount ()
-+		elif name == "indexInParent":
-+			return self.getIndexInParent ()
-+		elif name == "stateSet":
-+			return self.getStateSet ()
-+		else:
-+			raise AttributeError, name
-+
-+	def getName (self):
-+		"""
-+		Wrapper around cspi.Accessible_getName
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getName(self.__item))
-+
-+	def getDescription (self):
-+		"""
-+		Wrapper around cspi.Accessible_getDescription
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getDescription(self.__item))
-+
-+	def getParent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getParent, returning an
-+		atspi.Accessible or None
-+		"""
-+		self.__checkSelf()
-+		cdef Accessible parent
-+		cdef cspi.Accessible* spiParent
-+		
-+		spiParent = cspi.Accessible_getParent (self.__item)
-+		if spiParent!=NULL:
-+			parent = Accessible ()
-+			parent.__setItem (spiParent)
-+			parent.__checkSelf ()
-+			return parent
-+		else:
-+			return None
-+
-+	def getChildAtIndex (self, index):
-+		"""
-+		Wrapper around cspi.Accessible_getChildAtIndex, returning an
-+		atspi.Accessible, atspi.Application, or None
-+		"""
-+		self.__checkSelf()
-+		cdef int i
-+		i = index
-+		
-+		# This hairiness is due to the fact that Pyrex doesn't allow cdefs 
-+		# inside if blocks.
-+		
-+		cdef cspi.Accessible* spiChild
-+		spiChild = cspi.Accessible_getChildAtIndex (self.__item, i)
-+		# Workaround for GNOME bug #321273
-+		# http://bugzilla.gnome.org/show_bug.cgi?id=321273
-+		if spiChild == NULL: return None
-+		
-+		cdef object child
-+		cdef Application app
-+		cdef Accessible acc
-+		cdef Text text
-+		
-+		if cspi.Accessible_isApplication (spiChild):
-+			app = Application ()
-+			app.__setItem (spiChild)
-+			child = app
-+		else:
-+			acc = Accessible ()
-+			acc.__setItem (spiChild)
-+			child = acc
-+
-+		return child
-+
-+	def getIndexInParent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getIndexInParent
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getIndexInParent (self.__item)
-+
-+	def getRole (self):
-+		"""
-+		Wrapper around cspi.Accessible_getRole
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getRole (self.__item)
-+
-+	def getRoleName (self):
-+		"""
-+		Wrapper around cspi.Accessible_getRoleName
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getRoleName (self.__item))
-+
-+	def getChildCount (self):
-+		"""
-+		Wrapper around cspi.Accessible_getChildCount
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getChildCount (self.__item)
-+
-+	def getStateSet (self):
-+		"""
-+		Wrapper around cspi.Accessible_getStateSet, returning an
-+		atspi.StateSet
-+		"""
-+		self.__checkSelf()
-+		cdef StateSet set
-+		set = StateSet()
-+		set.__setItem (cspi.Accessible_getStateSet (self.__item))
-+		return set
-+
-+	def getInterface (self, interface):
-+		"""
-+		This is NOT part of cspi, it is just for compatibility with
-+		the bonobo bindings and will probably go away soon.
-+		"""
-+		self.__checkSelf()
-+		return getattr(self, "get%s" % interface) ()
-+
-+	def getAction (self):
-+		"""
-+		Wrapper around cspi.Accessible_getAction, returning
-+		an atspi.Action or None
-+		"""
-+		self.__checkSelf()
-+		cdef Action action
-+		action = Action ()
-+		action.__setItem (cspi.Accessible_getAction (self.__item))
-+		if action.__item != NULL:
-+			return action
-+
-+	def getText (self):
-+		"""
-+		Wrapper around cspi.Accessible_getText, returning an atspi.Text
-+		or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Text text
-+		text = Text ()
-+		text.__setItem (cspi.Accessible_getText (self.__item))
-+		if text.__item != NULL:
-+			return text
-+			
-+	def getEditableText (self):
-+		"""
-+		Wrapper around cspi.Accessible_getText, returning an
-+		atspi.EditableText or None
-+		"""
-+		self.__checkSelf ()
-+		cdef EditableText etext
-+		etext = EditableText ()
-+		etext.__setItem (cspi.Accessible_getEditableText (self.__item))
-+		if etext.__item != NULL:
-+			return etext
-+
-+	def getHypertext (self):
-+		"""
-+		Wrapper around cspi.Accessible_getHypertext, returning an
-+		atspi.Hypertext or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Hypertext hypertext
-+		hypertext = Hypertext ()
-+		hypertext.__setItem (cspi.Accessible_getHypertext (self.__item))
-+		if hypertext.__item != NULL:
-+			return hypertext
-+
-+	def getImage (self):
-+		"""
-+		Wrapper around cspi.Accessible_getImage, returning an
-+		atspi.Image or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Image image
-+		image = Image ()
-+		image.__setItem (cspi.Accessible_getImage (self.__item))
-+		if image.__item != NULL:
-+			return image
-+
-+	def getValue (self):
-+		"""
-+		Wrapper around cspi.Accessible_getValue, returning an
-+		atspi.Value or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Value value
-+		value = Value ()
-+		value.__setItem (cspi.Accessible_getValue (self.__item))
-+		if value.__item != NULL:
-+			return value
-+
-+	def getSelection (self):
-+		"""
-+		Wrapper around cspi.Accessible_getSelection, returning an
-+		atspi.Selection or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Selection selection
-+		selection = Selection ()
-+		selection.__setItem (cspi.Accessible_getSelection (self.__item))
-+		if selection.__item != NULL:
-+			return selection 
-+
-+	def getComponent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getComponent, returning an
-+		atspi.Component or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Component component
-+		component = Component ()
-+		component.__setItem (cspi.Accessible_getComponent (self.__item))
-+		if component.__item != NULL:
-+			return component
-+
-+	def getRelationSet (self):
-+		"""
-+		Wraps Accessible_getRelationSet, returning a list
-+		of atspi.Relation
-+		"""
-+		# looking at at-poke, result from C API appears to be a NULL-terminated list of pointers, and that we should free the buffer
-+		self.__checkSelf ()
-+		cdef Relation relation
-+
-+		relations = []
-+		cdef cspi.AccessibleRelation **relationSet
-+		relationSet = cspi.Accessible_getRelationSet (self.__item)
-+
-+		i=0
-+		while relationSet[i]:
-+			relation = Relation ()
-+			relation.__setItem (relationSet[i])
-+			relations.append(relation)
-+			i=i+1
-+		cspi.free (relationSet)
-+
-+		return relations
-+
-+
-+cdef class Desktop (Accessible):
-+	pass
-+
-+
-+cdef class Application (Accessible):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleApplication_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getToolkit (self):
-+		"""
-+		Wraps AccessibleApplication_getToolkitName, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getToolkitName (self.__item)
-+
-+	def getVersion (self):
-+		"""
-+		Wraps AccessibleApplication_getVersion, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getVersion(self.__item)
-+
-+	def getID (self):
-+		"""
-+		Wraps AccessibleApplication_getID, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getID (self.__item)
-+
-+	def pause (self):
-+		"""
-+		Wraps AccessibleApplication_pause
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_pause (self.__item)
-+
-+	def resume (self):
-+		"""
-+		Wraps AccessibleApplication_resume
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_resume (self.__item)
-+
-+cdef class Component (Accessible):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleComponent_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getExtents (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleComponent_getExtents, returning an
-+		(x,y,w,h) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y, w, h
-+		cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type)
-+		return (x, y, w, h)
-+
-+	def getPosition (self, type = 0):
-+		"""
-+		Wraps cspi.AccessibleComponent_getPosition, returning an
-+		(x,y) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y
-+		cspi.AccessibleComponent_getPosition (self.__item, &x, &y, type)
-+		return (x, y)
-+
-+	def getSize (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getSize, returning a
-+		(w,h) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long w, h
-+		cspi.AccessibleComponent_getSize (self.__item, &w, &h)
-+		return (w, h)
-+
-+	def getLayer (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getLayer, returning an 
-+		AccessibleComponentLayer.
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleComponent_getLayer (self.__item)
-+
-+	def grabFocus (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_grabFocus, raising AtspiException
-+		if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleComponent_grabFocus (self.__item):
-+			raise AtspiException("AccessibleComponent_grabFocus")
-+	
-+	def getMDIZOrder (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getMDIZOrder, returning an integer.
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleComponent_getMDIZOrder(self.__item)
-+
-+cdef class Action (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleAction_ functions,
-+	giving an OO-style API.
-+	"""
-+	def __getattr__ (self, name):
-+		if name == "nActions":
-+			return self.getNActions ()
-+		else:
-+			raise AttributeError, name
-+
-+	def getNActions (self):
-+		"""
-+		Wraps cspi.AccessibleAction_getNActions
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_getNActions (self.__item)
-+
-+	def doAction (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_doAction
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_doAction (self.__item, index)
-+
-+	def getKeyBinding (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getKeyBinding
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_getKeyBinding (self.__item, index)
-+
-+	def getName (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getName
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleAction_getName (self.__item, index))
-+
-+	def getDescription (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getDescription
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleAction_getDescription (self.__item, index))
-+
-+
-+cdef class Text (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleText_ functions,
-+	giving an OO-style API.
-+	"""
-+	def addSelection (self, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_addSelection
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_addSelection (self.__item, startOffset, endOffset):
-+			raise AtspiException("AccessibleText_addSelection")
-+			
-+
-+	#def getAttributes (self, offset, startOffset, endOffset):
-+	#	self.__checkSelf ()
-+	#	return cspi.AccessibleText_getAttributes (self.__item, offset, startOffset, endOffset)
-+	def getCaretOffset (self):
-+		"""
-+		Wraps cspi.AccessibleText_getCaretOffset
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getCaretOffset (self.__item)
-+
-+	def getCharacterCount (self):
-+		"""
-+		Wraps cspi.AccessibleText_getCharacterCount
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getCharacterCount (self.__item)
-+
-+	def getNSelections (self):
-+		"""
-+		Wraps cspi.AccessibleText_getNSelections
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getNSelections (self.__item)
-+
-+	#def getSelection (self, selectionNum, startOffset, endOffset):
-+	#	self.__checkSelf ()
-+	#	return cspi.AccessibleText_getSelection (self.__item, selectionNum, startOffset, endOffset)
-+
-+	def getText (self, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_getText
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleText_getText (self.__item, startOffset, endOffset))
-+
-+	def removeSelection (self, selectionNum):
-+		"""
-+		Wraps cspi.AccessibleText_removeSelection, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_removeSelection (self.__item, selectionNum):
-+			raise AtspiException("AccessibleText_removeSelection")
-+
-+	def setSelection (self, selectionNum, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_setSelection, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_setSelection (self.__item, selectionNum, startOffset, endOffset):
-+			raise AtspiException("AccessibleText_setSelection")
-+
-+	def setCaretOffset (self, position):
-+		"""
-+		Wraps cspi.AccessibleText_setCaretOffset, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_setCaretOffset (self.__item, position):
-+			raise AtspiException("AccessibleText_setCaretOffset")
-+
-+cdef class EditableText (Text):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleEditableText_ functions,
-+	giving an OO-style API.
-+	"""
-+	def setTextContents (self, newContents):
-+		"""
-+		Wraps cspi.AccessibleEditableText_setTextContents, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_setTextContents (self.__item, newContents):
-+			raise AtspiException("AccessibleEditableText_setTextContents")
-+
-+	def setAttributes (self, attributes, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleEditableText_setAttributes, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_setAttributes (self.__item, attributes, startOffset, endOffset):
-+			raise AtspiException("AccessibleEditableText_setAttributes")
-+
-+	def insertText (self, position, text):
-+		"""
-+		Wraps cspi.AccessibleEditableText_insertText, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_insertText (self.__item, position, text, cspi.strlen(text)):
-+			raise AtspiException("AccessibleEditableText_insertText")
-+
-+cdef class Hypertext (Text):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleHypertext_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getNLinks (self):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getNLinks, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHypertext_getNLinks (self.__item)
-+
-+	def getLink (self, linkIndex):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getLink, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		cdef Hyperlink hyperlink
-+		hyperlink = Hyperlink ()
-+		hyperlink.__setItem (cspi.AccessibleHypertext_getLink (self.__item, linkIndex))
-+		if hyperlink.__item != NULL:
-+			return hyperlink
-+
-+	def getLinkIndex (self, characterOffset):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getLinkIndex, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHypertext_getLinkIndex (self.__item, characterOffset)
-+
-+cdef class Hyperlink (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleHyperlink_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getNAnchors (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getNAnchors, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_getNAnchors (self.__item)
-+
-+	def getIndexRange (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getIndexRange, returning [startIndex, endIndex] pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long startIndex, endIndex
-+		cspi.AccessibleHyperlink_getIndexRange(self.__item, &startIndex, &endIndex)
-+		return [startIndex, endIndex]
-+
-+
-+	def getObject (self, i):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getObject
-+		"""
-+		self.__checkSelf ()
-+		cdef Accessible object
-+		object = Accessible ()
-+		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-+		object.__checkSelf ()
-+		return object
-+
-+	def getURI (self, i):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getURI, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_getURI (self.__item, i)
-+
-+	def isValid (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_isValid, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_isValid (self.__item)
-+
-+cdef class Image (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleImage_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getImageDescription (self):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleImage_getImageDescription (self.__item)
-+
-+	def getImageSize (self):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageSize, returning a (w,h) pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long w, h
-+		cspi.AccessibleImage_getImageSize(self.__item, &w, &h);
-+		return [w, h]
-+
-+	def getImagePosition (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y)
-+		pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y
-+		cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type)
-+		return [x, y]
-+
-+	def getImageExtents (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageExtents, returning a
-+		(x,y,w,h) tuple
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y, w, h
-+		cspi.AccessibleImage_getImageExtents(self.__item, &x, &y, &w, &h, type)
-+		return [x, y, w, h]
-+
-+cdef class Value (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleValue_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getMinimumValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getMinimumValue(self.__item)
-+
-+	def getCurrentValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getCurrentValue(self.__item)
-+
-+	def getMaximumValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getMaximumValue(self.__item)
-+
-+	def setCurrentValue (self, newValue):
-+		"""
-+		Wraps cspi.AccessibleValue_setCurrentValue
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleValue_setCurrentValue (self.__item, newValue):
-+			raise AtspiException("AccessibleValue_setCurrentValue")
-+
-+cdef class Selection (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleSelection_ functions,
-+	giving an OO-style API.
-+	"""
-+
-+	def getNSelectedChildren (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_getNSelectedChildren
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_getNSelectedChildren (self.__item)
-+
-+	def getSelectedChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_getSelectedChild
-+		"""
-+		self.__checkSelf ()
-+
-+		cdef cspi.Accessible* spiChild
-+		spiChild = cspi.AccessibleSelection_getSelectedChild (self.__item, index)
-+
-+		assert spiChild != NULL
-+		
-+		cdef object child
-+		cdef Application app
-+		cdef Accessible acc
-+		cdef Text text
-+		
-+		if cspi.Accessible_isApplication (spiChild):
-+			app = Application ()
-+			app.__setItem (spiChild)
-+			child = app
-+		else:
-+			acc = Accessible ()
-+			acc.__setItem (spiChild)
-+			child = acc
-+
-+		return child
-+
-+	def selectChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_selectChild
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_selectChild (self.__item, index)
-+	
-+	def deselectSelectedChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_deselectSelectedChild
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_deselectSelectedChild (self.__item, index)
-+	
-+	def isChildSelected (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_isChildSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_isChildSelected (self.__item, index)
-+
-+	def selectAll (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_selectAll
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_selectAll( self.__item)
-+
-+	def clearSelection (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_clearSelection
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_clearSelection (self.__item)
-+	
-+cdef class Table (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleTable_ functions,
-+	giving an OO-style API.
-+	"""
-+
-+	# def getTableAccessibleAt (self, row, column):
-+	# def getTableCaption (self):
-+
-+	def getTableColumnAtIndex (self, index):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnAtIndex
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnAtIndex(self.__item, index)
-+					
-+	def getTableColumnDescription (self, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnDescription(self.__item, column)
-+
-+	def getTableColumnExtentAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnExtentAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnExtentAt(self.__item, row, column)
-+
-+	# def getTableColumnHeader (self, column):
-+
-+	def getTableIndexAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getIndexAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getIndexAt(self.__item, row, column)
-+
-+	def getTableNColumns (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNColumns
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNColumns(self.__item)
-+
-+	def getTableNRows (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNRows
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNRows(self.__item)
-+
-+	def getTableNSelectedColumns (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNSelectedColumns
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNSelectedColumns(self.__item)
-+
-+	def getTableNSelectedRows (self):
-+		"""
-+x		Wraps cspi.AccessibleTable_getNSelectedRows
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNSelectedRows(self.__item)
-+
-+	def getTableRowAtIndex (self, index):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowAtIndex
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowAtIndex(self.__item, index)
-+
-+	def getTableRowDescription (self, row):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowDescription(self.__item, row)
-+
-+	def getTableRowExtentAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowExtentAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowExtentAt(self.__item, row, column)
-+
-+	# def getTableRowHeader (self, row):
-+ 	# def getTableSelectedRows (self, **selectedRows): - Not sure if the variable which is a pointer to a pointer is acceptable
-+	# def getTableSelectedColumns (self, **selectedColumns): - Same issue as above
-+	# def getTableSummary (self):
-+
-+	def isTableColumnSelected (self, column):
-+		"""
-+		Wraps cspi.AccessibleTable_isColumnSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isColumnSelected(self.__item, column)
-+
-+	def isTableRowSelected (self, row):
-+		"""
-+		Wraps cspi.AccessibleTable_isRowSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isRowSelected(self.__item, row)
-+
-+	def isTableSelected (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_isSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isSelected(self.__item, row, column)
-+
-+
-+cdef class Event (EventBase):
-+	#def AccessibleEventListener* SPI_createAccessibleEventListener (AccessibleEventListenerCB callback, void *user_data)
-+	#void AccessibleEventListener_unref (AccessibleEventListener *listener)
-+	#SPIBoolean AccessibleEventListener_addCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback, void *user_data)
-+	#SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback)
-+
-+	#Accessible* AccessibleActiveDescendantChangedEvent_getActiveDescendant (AccessibleEvent *event)
-+	#Accessible* AccessibleChildChangedEvent_getChildAccessible (AccessibleEvent *event)
-+	
-+	def getDescriptionChangedEventDescriptionString (self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleDescriptionChangedEvent_getDescriptionString(self.__item))
-+
-+	def getNameChangedEventNameString (self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleNameChangedEvent_getNameString(self.__item))
-+
-+	# Accessible* AccessibleParentChangedEvent_getParentAccessible (AccessibleEvent *event)
-+
-+	def getTableCaptionChangedEventCaptionString(self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleTableCaptionChangedEvent_getCaptionString(self.__item))
-+
-+	def getTableColumnDescriptionChangedEventDescriptionString(self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTableColumnDescriptionChangedEvent_getDescriptionString(self.__item))
-+
-+	# Accessible* AccessibleTableHeaderChangedEvent_getHeaderAccessible (AccessibleEvent *event)
-+
-+	def getTableRowDescriptionChangedEventDescriptionString(self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTableRowDescriptionChangedEvent_getDescriptionString(self.__item))
-+	
-+	#Accessible* AccessibleTableSummaryChangedEvent_getSummaryAccessible (AccessibleEvent *event)
-+
-+	def getTextChangedEventChangeString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTextChangedEvent_getChangeString(self.__item))
-+
-+	def getTextSelectionChangedEventSelectionString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTextSelectionChangedEvent_getSelectionString(self.__item))
-+
-+	def getWindowEventTitleString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleWindowEvent_getTitleString(self.__item))
-+
-+class EventGenerator:
-+	"""
-+	Wrapper layer around SPI_generateKeyboardEvent and
-+	SPI_generateMouseEvent, used for generating input events.
-+
-+	Use AccessibleAction in preference to this.
-+	"""
-+	def injectKeyboardString (self, string):
-+		"""
-+		Inject a string as if it had been typed using an input method.
-+		"""
-+		# Seems to only work if you do it one character at a time...
-+		for char in string:
-+			self.__generateKeystringEvent (str(char), cspi.SPI_KEY_STRING)
-+
-+	def __keyStringToKeyCode(self, keyString):
-+		cdef Xlib.Display *display
-+		display = Xlib.XOpenDisplay(NULL)
-+
-+		cdef Xlib.KeySym sym
-+		sym = Xlib.XStringToKeysym(keyString)
-+		cdef Xlib.KeyCode code
-+		code = Xlib.XKeysymToKeycode(display, sym)
-+
-+		#print str(keyString), str(int(sym)), code
-+
-+		Xlib.XCloseDisplay(display)
-+		return int(code)
-+	
-+	def generateKeyCombo (self, keyStrings):
-+		modifiers = keyStrings[:-1]
-+		finalKey = keyStrings[-1]
-+
-+		for modifier in modifiers:
-+			code = self.__keyStringToKeyCode(modifier)
-+			self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESS)
-+
-+		code = self.__keyStringToKeyCode(finalKey)
-+		self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESSRELEASE)
-+
-+		for modifier in modifiers:
-+			code = self.__keyStringToKeyCode(modifier)
-+			self.generateKeyboardEvent(code, '', cspi.SPI_KEY_RELEASE)
-+
-+		
-+	def __generateKeyvalEvent (self, keyval, synthType):
-+		self.generateKeyboardEvent (keyval, None, synthType)
-+
-+	def __generateKeystringEvent (self, keystring, synthType):
-+		self.generateKeyboardEvent (0, keystring, synthType)
-+	
-+	def generateKeyboardEvent (self, keyval, keystring, synthType):
-+		if not cspi.SPI_generateKeyboardEvent (keyval, keystring, synthType):
-+			raise AtspiException("SPI_generateKeyboardEvent")
-+
-+	def click (self, x, y, button):
-+		"""
-+		Synthesize a mouse button click at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "c")
-+
-+	def doubleClick (self, x, y, button):
-+		"""
-+		Synthesize a mouse button double-click at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "d")
-+
-+	def press (self, x, y, button):
-+		"""
-+		Synthesize a mouse button press at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "p")
-+
-+	def release (self, x, y, button):
-+		"""
-+		Synthesize a mouse button release at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "r")
-+
-+	def absoluteMotion (self, x, y):
-+		"""
-+		Synthesize mouse absolute motion to (x,y)
-+		"""
-+		self.__generateEvent (x, y, "abs")
-+
-+	def relativeMotion (self, x, y):
-+		"""
-+		Synthesize mouse relative motion of (x,y)
-+		"""
-+		self.__generateEvent (x, y, "rel")
-+
-+	def drag (self, fromXY, toXY, button):
-+		"""
-+		Synthesize a drag (press, move and release) from (x,y) to (x,y).
-+
-+		These are absolute screen coordinates
-+		"""
-+		(x,y) = fromXY
-+		self.press (x, y, button)
-+
-+		(x,y) = toXY
-+		self.absoluteMotion(x,y)
-+
-+		self.release (x, y, button)
-+
-+	def __generateEvent (self, x, y, name):
-+		"""
-+		Thin wrapper around SPI_generateMouseEvent.
-+
-+		Event names: b1p = button 1 press; b2r = button 2 release;
-+		b3c = button 3 click; b2d = button 2 double-click;
-+		abs = absolute motion; rel = relative motion.
-+		"""
-+		if not cspi.SPI_generateMouseEvent (x, y, name):
-+			raise AtspiException("Error generating mouse event")
-+
-+	def __generateButtonEvent (self, x, y, button, suffix):
-+		self.__generateEvent (x, y, self.__generateButtonName(button)+suffix)
-+
-+	def __generateButtonName(self, button):
-+		if button==1:
-+			return "b1"
-+		elif button==2:
-+			return "b2"
-+		elif button==3:
-+			return "b3"
-+		else: raise ValueError, "Unknown button"
-+
-+# We use this C function to marshal a call to a python function.  The Python callback
-+# function is installed as the userdata of this C callback function.  See the
-+# "cheesefinder" demo in the Pyrex sources.
-+# We ignore the "const"ness of the AccessibleEvent
-+cdef void marshalAccessibleEventCallback (cspi.AccessibleEvent *event, void *python_fn) except *:
-+	e = Event()
-+	EventBase.__setItem(e, event)
-+	(<object>python_fn) (e)
-+
-+cdef class EventListener:
-+	"""
-+	Wrapper around the low-level cspi.AccessibleEventListener_ functions,
-+	giving an OO-style API.
-+	"""
-+	cdef cspi.AccessibleEventListener *__item
-+	cdef public object eventTypes
-+
-+	def __init__ (self, callback, eventTypes):
-+		"""
-+		Registers a python callback function to be called.
-+		The callback is expected to have one input, of type atspi.Event, and no return value.
-+		See documentation of SPI_registerGlobalEventListener for the event names
-+		"""
-+		self.eventTypes = eventTypes
-+		self.__item = cspi.SPI_createAccessibleEventListener (marshalAccessibleEventCallback, <void*>callback)
-+		for eventType in self.eventTypes:
-+			#char *e
-+			e = eventType
-+			if not cspi.SPI_registerGlobalEventListener (self.__item, e):
-+				raise AtspiException("Unable to register event listener")
-+
-+	def deregister(self):
-+		for eventType in self.eventTypes:
-+			cspi.SPI_deregisterGlobalEventListener(self.__item, eventType)
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			self.deregister()
-+			cspi.AccessibleEventListener_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+cdef class DeviceEvent:
-+	"""
-+	Wrapper around a cspi.AccessibleDeviceEvent
-+	"""
-+	cdef cspi.AccessibleDeviceEvent *__item
-+	cdef public object keyID
-+	cdef public object keyCode
-+	cdef public object keyString
-+	cdef public object timeStamp
-+	cdef public object type
-+	cdef public object modifiers
-+	cdef public object isText
-+
-+	def __new__ (self):
-+			self.__item = NULL
-+
-+	cdef bool __setItem (self, cspi.AccessibleDeviceEvent *obj):
-+			if obj != NULL:
-+					self.__item = obj
-+					self.keyID = self.__item.keyID
-+					self.keyCode = self.__item.keycode
-+					self.keyString = self.__item.keystring
-+					self.timeStamp = self.__item.timestamp
-+					self.type = self.__item.type
-+					self.modifiers = self.__item.modifiers
-+					if self.__item.is_text: self.isText = True
-+					else: self.isText = False
-+					return True
-+			else:
-+					return False
-+
-+	def __checkSelf (self):
-+			if self.__item == NULL:
-+					raise AttributeError, "__item must not be NULL"
-+
-+#	def __dealloc__ (self):
-+#			if self.__item != NULL:
-+#					cspi.AccessibleDeviceEvent_unref (self.__item)
-+
-+
-+cdef cspi.SPIBoolean marshalAccessibleDeviceEventCallback (cspi.AccessibleDeviceEvent *event, void *python_fn) except 1:
-+	k = DeviceEvent()
-+	#k.__setItem(event)
-+	DeviceEvent.__setItem(k, event)
-+	k.__checkSelf()
-+	(<object>python_fn) (k)
-+	return False
-+
-+cdef class DeviceListener:
-+	"""
-+	Wrapper around the low-level cspi.AccessibleDeviceListener_ functions,
-+	giving an OO-style API.
-+	"""
-+	cdef cspi.AccessibleDeviceListener *__item
-+	cdef public object modMasks
-+
-+	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
-+		"""
-+		Registers a python callback function to be called.
-+
-+		eventMask may be one of the following:
-+        key pressed: 1
-+		key released: 2
-+		key pressed or released (default): 3
-+		"""
-+		self.__item = cspi.SPI_createAccessibleDeviceListener (marshalAccessibleDeviceEventCallback, <void*>callback)
-+		cdef cspi.AccessibleKeySet *keySet
-+		keySet = SPI_KEYSET_ALL_KEYS
-+		self.modMasks = []
-+		cdef short int modMask
-+		syncType = SPI_KEYLISTENER_SYNCHRONOUS | SPI_KEYLISTENER_CANCONSUME
-+		#syncType = SPI_KEYLISTENER_NOSYNC
-+		for modMask from 0 <= modMask < (1 << 8):
-+			self.modMasks.append(modMask)
-+			desc = "keySet "+str(<int> keySet)+" modMask "+str(modMask)+" eventMask "+str(eventMask)+" syncType "+str(syncType)
-+			desc = str(desc)
-+			if not cspi.SPI_registerAccessibleKeystrokeListener (self.__item, keySet, modMask, eventMask, syncType):
-+				raise AtspiException("Unable to register keystroke listener", desc)
-+
-+	def deregister(self):
-+		if self.__item != NULL:
-+			for modMask in self.modMasks:
-+				cspi.SPI_deregisterAccessibleKeystrokeListener(self.__item, modMask)
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			self.deregister()
-+			cspi.AccessibleDeviceListener_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+
-+# vim: sw=4 ts=4 sts=4 noet ai
diff --git a/staging/python-pysqlite/PKGBUILD b/staging/python-pysqlite/PKGBUILD
deleted file mode 100644
index f5985ebca..000000000
--- a/staging/python-pysqlite/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 168723 2012-10-14 21:14:34Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=python-pysqlite
-pkgname=python2-pysqlite
-pkgver=2.6.3
-pkgrel=3
-pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pysqlite/"
-depends=('python2' 'sqlite')
-conflicts=('python-pysqlite<=2.6.3-2')
-replaces=('python-pysqlite<=2.6.3-2')
-source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
-        setup.cfg)
-md5sums=('711afa1062a1d2c4a67acdf02a33d86e'
-         '86dd356c65afd14a22f2f8f64a26441e')
-
-check() {
-    cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/
-    python2 -c "from pysqlite2 import test; test.test()"
-}
-
-build() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	cp "${srcdir}/setup.cfg" .
-	python2 setup.py build
-}
-
-package_python2-pysqlite() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	rm -r "${pkgdir}/usr/pysqlite2-doc"
-}
diff --git a/staging/python-pysqlite/setup.cfg b/staging/python-pysqlite/setup.cfg
deleted file mode 100644
index ba6c77075..000000000
--- a/staging/python-pysqlite/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[build_ext]
-define=
-include_dirs=/usr/include
-library_dirs=/usr/lib
-libraries=sqlite3
diff --git a/staging/python-urwid/PKGBUILD b/staging/python-urwid/PKGBUILD
deleted file mode 100644
index d1804969c..000000000
--- a/staging/python-urwid/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.2
-pkgrel=2
-pkgdesc="Urwid is a curses-based user interface library."
-license=('LGPL')
-arch=('i686' 'x86_64')
-makedepends=('python2-distribute' 'python-distribute')
-url="http://excess.org/urwid/"
-source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('00542bbd15fae7ea60b02a7570edee2b')
-
-build() {
-  cp -r urwid-$pkgver python2-urwid-$pkgver
-
-  cd "$srcdir/urwid-$pkgver"
-  python setup.py build
-
-  cd "$srcdir/python2-urwid-$pkgver"
-  sed -i 's#bin/python#bin/python2#' urwid/*.py
-  
-  python2 setup.py build
-}
-
-package_python-urwid() {
-  depends=('python')
-
-  cd "$srcdir/urwid-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
-package_python2-urwid() {
-  depends=('python2')
- 
-  cd "$srcdir/python2-urwid-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
diff --git a/staging/python-wpactrl/PKGBUILD b/staging/python-wpactrl/PKGBUILD
deleted file mode 100644
index 692b3e8c3..000000000
--- a/staging/python-wpactrl/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168717 2012-10-14 20:27:32Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgbase=python-wpactrl
-pkgname=python2-wpactrl
-pkgver=20090609
-pkgrel=4
-pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access"
-arch=('i686' 'x86_64')
-url="http://projects.otaku42.de/wiki/PythonWpaCtrl"
-license=('GPL2')
-depends=('python2')
-conflicts=('python-wpactrl<=20090609-3')
-replaces=('python-wpactrl<=20090609-3')
-source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz)
-md5sums=('8d45739aa9bfa1110a4570bb5ceda768')
-
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	python2 setup.py build
-}
-
-package_python2-wpactrl() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/staging/python/PKGBUILD b/staging/python/PKGBUILD
deleted file mode 100644
index ec300968b..000000000
--- a/staging/python/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 167272 2012-09-29 16:34:59Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=python
-pkgver=3.3.0
-pkgrel=1
-_pybasever=3.3
-pkgdesc="Next generation of the python high-level scripting language"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.python.org/"
-depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk' 'sqlite' 'valgrind')
-optdepends=('tk: for tkinter' 'sqlite')
-provides=('python3')
-replaces=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a')
-
-build() {
-  cd "${srcdir}/Python-${pkgver}"
-
-  # FS#23997
-  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  ./configure --prefix=/usr \
-              --enable-shared \
-              --with-threads \
-              --with-computed-gotos \
-              --enable-ipv6 \
-              --with-valgrind \
-              --with-system-expat \
-              --with-dbmliborder=gdbm:ndbm \
-              --with-system-ffi
-
-  make
-}
-
-check() {
-  cd "${srcdir}/Python-${pkgver}"
-  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \
-     test_urllib test_uuid test_pydoc
-}
-
-package() {
-  cd "${srcdir}/Python-${pkgver}"
-  make DESTDIR="${pkgdir}" install maninstall
-
-  # Why are these not done by default...
-  ln -sf python3               "${pkgdir}/usr/bin/python"
-  ln -sf python3-config        "${pkgdir}/usr/bin/python-config"
-  ln -sf idle3                 "${pkgdir}/usr/bin/idle"
-  ln -sf pydoc3                "${pkgdir}/usr/bin/pydoc"
-  ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
-
-  # Fix FS#22552
-  ln -sf ../../libpython${_pybasever}m.so \
-    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so"
-
-  # Clean-up reference to build directory
-  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile"
-
-  # License
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/qscintilla/PKGBUILD b/staging/qscintilla/PKGBUILD
deleted file mode 100644
index acb9eadfd..000000000
--- a/staging/qscintilla/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 167919 2012-10-03 20:22:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
-         'python-qscintilla-common')
-pkgver=2.6.2
-pkgrel=3
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'pyqt' 'chrpath')
-source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
-        'configure.py-objdir-support.diff')
-md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
-         '8cf9c06252e2f11ab00e62848e322fd3')
-
-build() {
-    cd "${srcdir}/QScintilla-gpl-${pkgver}" 
-    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-
-    cd Qt4Qt5
-    qmake qscintilla.pro
-    make
-    
-    cd ../designer-Qt4
-    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
-    make
-
-    cd ../
-    cp -rf Python Python2
-    cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
-    make
-
-    cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
-    make    
-}
-
-package_qscintilla() {
-    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
-    depends=('qscintilla')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-      
-    # Provided by python-qscintilla
-    rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
-}
-
-package_python-qscintilla() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'pyqt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
-    install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
-}
-
-package_python2-qscintilla() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python2-pyqt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
-    install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
-}
diff --git a/staging/qscintilla/configure.py-objdir-support.diff b/staging/qscintilla/configure.py-objdir-support.diff
deleted file mode 100644
index b595de18c..000000000
--- a/staging/qscintilla/configure.py-objdir-support.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
-@DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
- import glob
- import optparse
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
- 
- # Import SIP's configuration module so that we have access to the error
- # reporting.  Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
-     if os.access(sciglobal, os.F_OK):
-         # Get the QScintilla version string.
-         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+        return # Debian: do not check for the installed version, we're good this way.
-         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
-             # Because we include the Python bindings with the C++ code we can
-             # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
-     argv.append(buildfile)
- 
-     if pyqt.pyqt_version >= 0x040000:
--        argv.append("sip/qscimod4.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
-     else:
--        argv.append("sip/qscimod3.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
- 
-     os.system(" ".join(argv))
- 
diff --git a/staging/sane/PKGBUILD b/staging/sane/PKGBUILD
deleted file mode 100644
index f9f2742be..000000000
--- a/staging/sane/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 161619 2012-06-12 14:13:06Z tpowa $
-# 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=9
-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' 'libusb-compat' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
-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,mustek_usb2.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'
-        'saned.socket'
-        'saned.service')
-options=(!libtool)
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
-         'da946cc36fb83612162cf9505986d4b2'
-         'e645a8921cff9f18ffbdabb2ed885060'
-         'cfef73e7db7c28308914d3db6767d852'
-         'e57e9e15528f47f5f1b3f1411135ed5d'
-         'e44bd4c994a52d6f472463d1eb0a03be')
-
-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 \
-    --enable-pthread \
-    --disable-rpath \
-    --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}/usr/lib/udev/rules.d/53-sane.rules"
-  # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
-  
-  # install xinetd file
-  install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-  
-  # Install the pkg-config file
-  install -D -m644 tools/sane-backends.pc \
-     "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
-  # install systemd files
-  install -D -m644 ${srcdir}/saned.socket \
-      "${pkgdir}/usr/lib/systemd/system/saned.socket"
-  install -D -m644 ${srcdir}/saned.service \
-      "${pkgdir}/usr/lib/systemd/system/saned@.service"
-}
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/saned.service b/staging/sane/saned.service
deleted file mode 100644
index 69e833e7e..000000000
--- a/staging/sane/saned.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/sbin/saned
-StandardInput=socket
-StandardError=syslog
diff --git a/staging/sane/saned.socket b/staging/sane/saned.socket
deleted file mode 100644
index 66ef9c9c8..000000000
--- a/staging/sane/saned.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=saned incoming socket
-
-[Socket]
-ListenStream=6566
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
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/sdl_gfx/PKGBUILD b/staging/sdl_gfx/PKGBUILD
deleted file mode 100644
index 03d3302a0..000000000
--- a/staging/sdl_gfx/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 165570 2012-08-25 14:10:16Z 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_gfx
-pkgver=2.0.24
-pkgrel=1
-pkgdesc="SDL Graphic Primitives"
-arch=('i686' 'x86_64')
-license=('LGPL')
-options=(!libtool)
-url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx"
-source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz)
-depends=('sdl')
-md5sums=('838514185ff9a3b6377760aaa52fef8a')
-
-build() {
-  cd SDL_gfx-${pkgver}
-
-  if [ "${CARCH}" == "x86_64" ]; then
-    ./configure --prefix=/usr --disable-mmx
-  else
-    ./configure --prefix=/usr
-  fi
-
-  make
-}
-
-package() {
-  cd SDL_gfx-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/sip/PKGBUILD b/staging/sip/PKGBUILD
deleted file mode 100644
index b03e62351..000000000
--- a/staging/sip/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 167297 2012-09-30 16:56:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
-
-pkgbase=sip
-pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-makedepends=('python' 'python2')
-source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('9a48ad975e04ac824188840ea498ac32')
-
-build() {
-  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
-
-  cd ${pkgbase}-${pkgver}
-  python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-  
-  ### Python2 version ###
-  cd ../python2-${pkgbase}-${pkgver}
-  python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-}
-
-package_sip() {
-  pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
-  depends=('glibc')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C sipgen
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python-sip() {
-  pkgdesc="Python 3.x SIP bindings for C and C++ libraries"
-  depends=('sip' 'python')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C siplib
-  
-  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py
-  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py
-  
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-sip() {
-  pkgdesc="Python 2.x SIP bindings for C and C++ libraries"
-  depends=('sip' 'python2')
-
-  cd python2-${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C siplib
-  
-  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
-  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py
-  
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/staging/slim/PKGBUILD b/staging/slim/PKGBUILD
deleted file mode 100644
index a4580b756..000000000
--- a/staging/slim/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 168702 2012-10-14 15:17:29Z tomegun $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-
-pkgname=slim
-pkgver=1.3.4
-pkgrel=4
-pkgdesc='Desktop-independent graphical login manager for X11'
-arch=('i686' 'x86_64')
-url='http://slim.berlios.de/'
-license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
-makedepends=('cmake' 'freeglut')
-backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'pam.d'
-        'logrotate'
-        'slim.service'
-        'session-name.patch'
-        'libpng-1.4+-support.patch'
-        'fix-glibc-segfault-1.3.4.patch')
-
-build() {
-        cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-        patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
-        patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864
-        cd ${srcdir}
-        mkdir build
-        cd build
-        cmake ../${pkgbase}-${pkgver} \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_SKIP_RPATH=ON \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DUSE_PAM=yes -DUSE_CONSOLEKIT=no
-	make
-}
-
-package() {
-        cd  ${srcdir}/build/
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
-	install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
-	install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim
-
-	# Provide sane defaults
-	sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
-	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
-        # install systemd files
-        install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
-}
-md5sums=('51543533e492b41007811f7d880720fa'
-         'd8ea9c4dee2811524b67f4f666311a1f'
-         '37ef35079139544d04b8316c7f66f754'
-         '43da096480bf72c3ccec8ad8400f34f0'
-         'a5d6bde9e63899df7d2081e1585bbe54'
-         'ebcb6829028615686de7b64ceeaaf8ed'
-         '6d19bd7a91592ed2bb902b22b9594565'
-         '9efc4e0d82d354f0c578be7723870769')
diff --git a/staging/slim/fix-glibc-segfault-1.3.4.patch b/staging/slim/fix-glibc-segfault-1.3.4.patch
deleted file mode 100644
index b035f8a78..000000000
--- a/staging/slim/fix-glibc-segfault-1.3.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: app.cpp
-===================================================================
---- app.cpp	(revision 223)
-+++ app.cpp	(working copy)
-@@ -593,7 +593,7 @@
- 
-         n++;
- 
--        child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-+        child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
-         memcpy(child_env, old_env, sizeof(char*)*n);
-         child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
-         child_env[n] = NULL;
diff --git a/staging/slim/libpng-1.4+-support.patch b/staging/slim/libpng-1.4+-support.patch
deleted file mode 100644
index 57b39272b..000000000
--- a/staging/slim/libpng-1.4+-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
-                                 (png_infopp) NULL);
-     }
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
-     if (setjmp(png_ptr->jmpbuf)) {
-+#endif
-         goto png_destroy;
-     }
- 
diff --git a/staging/slim/logrotate b/staging/slim/logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/staging/slim/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/staging/slim/pam.d b/staging/slim/pam.d
deleted file mode 100644
index 59db5a8c5..000000000
--- a/staging/slim/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
--session	optional	pam_systemd.so
diff --git a/staging/slim/rc.d b/staging/slim/rc.d
deleted file mode 100755
index b0be7ffc5..000000000
--- a/staging/slim/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
-  start)
-    stat_busy "Starting Simple Login Manager"
-    [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon slim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Simple Login Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/slim/session-name.patch b/staging/slim/session-name.patch
deleted file mode 100644
index 8211c4f72..000000000
--- a/staging/slim/session-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp	2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp	2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
-     Root = root;
-     cfg = config;
- 
--    session = "";
-+    session = cfg->nextSession(session);
- 
-     // Init GC
-     XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
- 
- void Panel::ClearPanel() {
--    session = "";
-+    session = cfg->nextSession(session);
-     Reset();
-     XClearWindow(Dpy, Root);
-     XClearWindow(Dpy, Win);
diff --git a/staging/slim/slim.service b/staging/slim/slim.service
deleted file mode 100644
index b894085a0..000000000
--- a/staging/slim/slim.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/staging/slim/tty-slowness.patch b/staging/slim/tty-slowness.patch
deleted file mode 100644
index c590fbed8..000000000
--- a/staging/slim/tty-slowness.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp	2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
-         signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
--        OpenLog();
--        
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-             daemonmode = true;
-         }
- 
-         // Daemonize
-         if (daemonmode) {
--            if (daemon(0, 1) == -1) {
-+            if (daemon(0, 0) == -1) {
-                 cerr << APPNAME << ": " << strerror(errno) << endl;
-                 exit(ERR_EXIT);
-             }
--            UpdatePid();
-         }
- 
-+        OpenLog();
-+
-+        if (daemonmode) UpdatePid();
-+
-         CreateServerAuth();
-         StartServer();
-         alarm(2);
diff --git a/staging/smartmontools/PKGBUILD b/staging/smartmontools/PKGBUILD
deleted file mode 100644
index 3028de4ca..000000000
--- a/staging/smartmontools/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 161354 2012-06-10 07:33:44Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Jani Talikka <jani.talikka@gmail.com>
-# Contributor: Ralf Barth <archlinux.org@haggy.org>
-
-pkgname=smartmontools
-pkgver=5.42
-pkgrel=4
-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')
-depends=('gcc-libs' 'libcap-ng' 'bash')
-backup=('etc/smartd.conf'
-        'etc/conf.d/smartd')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'smartd.conf'
-        'smartd.rc')
-md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a'
-         '28c1b80c41dac52d433961dcfb4f70e0'
-         'fb30e07f87f2c1d99532e018291ad3e8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --enable-drivedb \
-              --with-libcap-ng=yes \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e "s:sysconfig/smartmontools:conf.d/smartd:g" smartd.service
-  sed -i -e "s:smartd_opts:SMARTD_ARGS:g" smartd.service
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf ${pkgdir}/etc/rc.d
-  install -Dm755 ${srcdir}/smartd.rc "${pkgdir}/etc/rc.d/smartd"
-  install -Dm644 ${srcdir}/smartd.conf "${pkgdir}/etc/conf.d/smartd"
-}
diff --git a/staging/smartmontools/smartd.conf b/staging/smartmontools/smartd.conf
deleted file mode 100644
index f14870abf..000000000
--- a/staging/smartmontools/smartd.conf
+++ /dev/null
@@ -1 +0,0 @@
-SMARTD_ARGS=""
diff --git a/staging/smartmontools/smartd.rc b/staging/smartmontools/smartd.rc
deleted file mode 100755
index 16920db12..000000000
--- a/staging/smartmontools/smartd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-SMARTD_ARGS=
-[ -f /etc/conf.d/smartd ] && . /etc/conf.d/smartd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-
-   start)
-     stat_busy "Starting smartd"
-     /usr/sbin/smartd ${SMARTD_ARGS} &>/dev/null
-     if [ $? -ne 0 ]; then
-       stat_fail
-     else
-       add_daemon smartd
-       stat_done
-     fi
-   ;;
-
-   stop)
-     stat_busy "Stopping smartd"
-     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
-     rm_daemon smartd
-     stat_done
-   ;;
-
-   restart)
-     stat_busy "Restarting smartd ..."
-     $0 stop
-     $0 start
-     stat_done
-   ;;
-
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/staging/sonata/PKGBUILD b/staging/sonata/PKGBUILD
deleted file mode 100644
index d2a3d8d71..000000000
--- a/staging/sonata/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168713 2012-10-14 19:47:10Z eric $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=sonata
-pkgver=1.6.2.1
-pkgrel=8
-pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
-url="http://sonata.berlios.de/"
-license=('GPL3')
-depends=('pygtk' 'python2-mpd')
-optdepends=('gnome-python-extras: Enhanced system tray support'
-            'tagpy: Metadata editing support'
-            'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
-        info.py.patch)
-md5sums=('0b912325e7175abad3bf6c0edc071e05'
-         '595fcf7615035829b264afecb5a1beeb')
-
-build() {
-  cd "$srcdir/${pkgname}-$pkgver"
-  patch -Np0 -i "$srcdir/info.py.patch"
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
-}
-
-package() {
-  cd "$srcdir/${pkgname}-$pkgver"
-  python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
-}
diff --git a/staging/sonata/info.py.patch b/staging/sonata/info.py.patch
deleted file mode 100644
index e95cc3a08..000000000
--- a/staging/sonata/info.py.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- sonata/info.py	2011-07-05 22:32:08.452556016 -0500
-+++ sonata/info.py	2011-07-05 22:45:50.849311466 -0500
-@@ -393,9 +393,9 @@
- 				if content.startswith("#REDIRECT [["):
- 					addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
- 					content = urllib.urlopen(addr).read()
--				lyrics = content.split("&lt;lyrics&gt;")[1].split("&lt;/lyrics&gt;")[0]
--				if lyrics.strip() != "&lt;!-- PUT LYRICS HERE (and delete this entire line) --&gt;":
--					lyrics = misc.unescape_html(lyrics)
-+				content = misc.unescape_html(content)
-+				lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
-+				if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
- 					lyrics = misc.wiki_to_html(lyrics)
- 					lyrics = lyrics.decode("utf-8")
- # Save lyrics to file:
diff --git a/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD
deleted file mode 100644
index e4c135217..000000000
--- a/staging/source-highlight/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 163141 2012-07-08 09:27:47Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=source-highlight
-pkgver=3.1.7
-pkgrel=2
-pkgdesc="Convert source code to syntax highlighted document"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/src-highlite/"
-license=('GPL')
-depends=('bash' 'boost-libs')
-makedepends=('ctags' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0ff81588d3536b4c4e571122ba940595')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-	      --with-bash-completion=${pkgdir}/usr/share/bash-completion/completions
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install
deleted file mode 100644
index 4fd1b3005..000000000
--- a/staging/source-highlight/source-highlight.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=usr/share/info
-info_files=(source-highlight.info source-highlight-lib.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/staging/sox/PKGBUILD b/staging/sox/PKGBUILD
deleted file mode 100644
index 0b370fe65..000000000
--- a/staging/sox/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 161504 2012-06-12 05:34:19Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sox
-pkgver=14.4.0
-pkgrel=3
-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' 'gsm')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
-checkdepends=('time')
-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_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch)
-sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
-          'ab304f1fc17269262dbc4977aa9b7e97ec805ae4'
-          '2f92bcaebcaf300782396f106cdd27c72048a851')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch"
-  patch -p1 -i "${srcdir}/sox-ffmpeg0.11.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
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make bindir=. installcheck
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/sox/sox-ffmpeg0.11.patch b/staging/sox/sox-ffmpeg0.11.patch
deleted file mode 100644
index 901c81582..000000000
--- a/staging/sox/sox-ffmpeg0.11.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure
---- sox-14.4.0-orig/configure	2012-06-12 00:35:53.462360803 -0400
-+++ sox-14.4.0/configure	2012-06-12 00:36:08.572361294 -0400
-@@ -15781,9 +15781,9 @@
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5
--$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
--if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5
-+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }
-+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -15797,27 +15797,27 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char av_open_input_file ();
-+char avformat_open_input ();
- int
- main ()
- {
--return av_open_input_file ();
-+return avformat_open_input ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_avformat_av_open_input_file=yes
-+  ac_cv_lib_avformat_avformat_open_input=yes
- else
--  ac_cv_lib_avformat_av_open_input_file=no
-+  ac_cv_lib_avformat_avformat_open_input=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5
--$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }
--if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5
-+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }
-+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :
-   for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
---- sox-14.4.0-orig/src/ffmpeg.c	2012-06-12 00:35:53.459027469 -0400
-+++ sox-14.4.0/src/ffmpeg.c	2012-06-12 00:36:26.539028545 -0400
-@@ -93,7 +93,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   enc->error_resilience = 1;
- #else
--  enc->error_recognition = 1;
-+  enc->err_recognition = 1;
- #endif
- 
-   if (!codec || avcodec_open(enc, codec) < 0)
-@@ -157,7 +157,7 @@
- static int startread(sox_format_t * ft)
- {
-   priv_t * ffmpeg = (priv_t *)ft->priv;
--  AVFormatParameters params;
-+  AVDictionary *params;
-   int ret;
-   int i;
- 
-@@ -172,7 +172,7 @@
- 
-   /* Open file and get format */
-   memset(&params, 0, sizeof(params));
--  if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, &params)) < 0) {
-+  if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, &params)) < 0) {
-     lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret);
-     return SOX_EOF;
-   }
-@@ -231,7 +231,7 @@
-     /* If input buffer empty, read more data */
-     if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
-       if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
--	  (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
-+	  (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))
- 	break;
-       ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
-       ffmpeg->audio_buf_index = 0;
-@@ -373,13 +373,6 @@
-       return SOX_EOF;
-   }
- 
--  /* set the output parameters (must be done even if no
--     parameters). */
--  if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
--    lsx_fail("ffmpeg invalid output format parameters");
--    return SOX_EOF;
--  }
--
-   /* Next line for debugging */
-   /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
- 
-@@ -391,14 +384,14 @@
- 
-   /* open the output file, if needed */
-   if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
--    if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
-+    if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
-       lsx_fail("ffmpeg could not open `%s'", ft->filename);
-       return SOX_EOF;
-     }
-   }
- 
-   /* write the stream header, if any */
--  av_write_header(ffmpeg->ctxt);
-+  avformat_write_header(ffmpeg->ctxt, NULL);
- 
-   return SOX_SUCCESS;
- }
-@@ -478,7 +471,7 @@
- #if (LIBAVFORMAT_VERSION_INT < 0x340000)
-     url_fclose(&ffmpeg->ctxt->pb);
- #else
--    url_fclose(ffmpeg->ctxt->pb);
-+    avio_close(ffmpeg->ctxt->pb);
- #endif
-   }
- 
diff --git a/staging/sox/sox_default_audio_driver_fallback.patch b/staging/sox/sox_default_audio_driver_fallback.patch
deleted file mode 100644
index 9f9060e17..000000000
--- a/staging/sox/sox_default_audio_driver_fallback.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/sox.c.old	2012-05-06 22:45:45.380564154 -0400
-+++ src/sox.c	2012-05-06 22:47:11.948248987 -0400
-@@ -2538,20 +2538,38 @@
-   return name? from_env? from_env : name : NULL;
- }
- 
-+static char const * try_device(char const * name)
-+{
-+  sox_format_handler_t const * handler = sox_find_format(name, sox_false);
-+  if (handler) {
-+    sox_format_t format, * ft = &format;
-+    memset(ft, 0, sizeof(*ft));
-+    ft->filename = (char *)device_name(name);
-+    ft->priv = lsx_calloc(1, handler->priv_size);
-+    if (handler->startwrite(ft) == SOX_SUCCESS) {
-+      handler->stopwrite(ft);
-+      free(ft->priv);
-+      return name;
-+    }
-+    free(ft->priv);
-+  }
-+  return NULL;
-+}
-+
- static char const * set_default_device(file_t * f)
- {
-   /* Default audio driver type in order of preference: */
-   if (!f->filetype) f->filetype = getenv("AUDIODRIVER");
--  if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = "coreaudio";
--  if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype = "pulseaudio";
--  if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = "alsa";
--  if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = "waveaudio";
--  if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = "sndio";
--  if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss";
--  if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = "sunau";
--  if (!f->filetype && sox_find_format("ao"  , sox_false) && file_count) /*!rec*/
--    f->filetype = "ao";
--
-+  if (!f->filetype) f->filetype = try_device("coreaudio");
-+  if (!f->filetype) f->filetype = try_device("pulseaudio");
-+  if (!f->filetype) f->filetype = try_device("alsa");
-+  if (!f->filetype) f->filetype = try_device("waveaudio");
-+  if (!f->filetype) f->filetype = try_device("sndio");
-+  if (!f->filetype) f->filetype = try_device("oss");
-+  if (!f->filetype) f->filetype = try_device("sunau");
-+  if (!f->filetype && file_count) /*!rec*/
-+    f->filetype = try_device("ao");
-+ 
-   if (!f->filetype) {
-     lsx_fail("Sorry, there is no default audio device configured");
-     exit(1);
diff --git a/staging/squid/PKGBUILD b/staging/squid/PKGBUILD
deleted file mode 100644
index 0741b7bb7..000000000
--- a/staging/squid/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 161335 2012-06-09 22:30:45Z dreisner $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=squid
-pkgver=3.1.20
-pkgrel=2
-pkgdesc="A full-featured Web proxy cache server."
-arch=('i686' 'x86_64')
-url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
-makedepends=('libcap')
-license=('GPL')
-backup=('etc/squid/squid.conf'
-        'etc/squid/mime.conf'
-        'etc/conf.d/squid')
-install=squid.install
-source=("http://www.squid-cache.org/Versions/v3/3.1/$pkgname-$pkgver.tar.bz2"
-        'squid'
-        'squid.conf.d'
-        'squid.pam'
-        'squid.cron'
-        'squid.service')
-md5sums=('c4d733a383c0508fd0746d64a2d7278a'
-         '02f7b5bd793f778e40834fd6457d2199'
-         '2383772ef94efddc7b920628bc7ac5b0'
-         '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # gcc 4.6 doesn't support -fhuge-objects.
-  sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
-
-  # fix cache_dir, cache_dir size, and effective group.
-  sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
-  sed '/^#cache_dir/ s/100/256/
-       /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
-
-  ./configure \
-      --prefix=/usr \
-      --datadir=/usr/share/squid \
-      --sysconfdir=/etc/squid \
-      --libexecdir=/usr/lib/squid \
-      --localstatedir=/var \
-      --with-logdir=/var/log/squid \
-      --with-pidfile=/run/squid.pid \
-      --enable-auth="basic,digest,ntlm" \
-      --enable-removal-policies="lru,heap" \
-      --enable-digest-auth-helpers="password" \
-      --enable-storeio="aufs,ufs,diskd" \
-      --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
-      --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
-      --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
-      --enable-delay-pools \
-      --enable-arp-acl \
-      --enable-ssl \
-      --enable-snmp \
-      --enable-linux-netfilter \
-      --enable-ident-lookups \
-      --enable-useragent-log \
-      --enable-cache-digests \
-      --enable-referer-log \
-      --enable-arp-acl \
-      --enable-htcp \
-      --enable-carp \
-      --enable-epoll \
-      --with-filedescriptors=4096 \
-      --with-large-files \
-      --enable-arp-acl \
-      --with-default-user=proxy \
-      --enable-async-io \
-      --enable-truncate
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid
-  install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid
-  install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid
-  install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid
-
-  install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service"
-
-  # random unneeded empty dir...
-  rmdir "$pkgdir/usr/include"
-}
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/staging/squid/squid b/staging/squid/squid
deleted file mode 100644
index da5534427..000000000
--- a/staging/squid/squid
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/squid.pid
-{ read -r PID </run/squid.pid; } 2>/dev/null
-if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then
-  rm /run/squid.pid
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting squid"
-    if [[ $PID ]] || ! squid $SQUID_ARGS; then
-      stat_fail
-    else
-      add_daemon squid
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping squid"
-    if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
-      stat_fail
-    else
-      # squid takes forever to shutdown all its listening FDs
-      while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
-        stat_append "."
-        sleep 3
-      done
-      rm_daemon squid
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/squid/squid.conf.d b/staging/squid/squid.conf.d
deleted file mode 100644
index ea248b76c..000000000
--- a/staging/squid/squid.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"
diff --git a/staging/squid/squid.cron b/staging/squid/squid.cron
deleted file mode 100644
index c78e51105..000000000
--- a/staging/squid/squid.cron
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# exit without error if no pidfile exists
-{ read pid </run/squid.pid; } 2>/dev/null || exit 0
-
-# make sure found PID really is a squid process
-if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
-  /usr/sbin/squid -k rotate
-fi
diff --git a/staging/squid/squid.install b/staging/squid/squid.install
deleted file mode 100644
index e7aa5ff68..000000000
--- a/staging/squid/squid.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupadd -g 15 proxy &>/dev/null
-  fi
-
-  id proxy &>/dev/null || \
-    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
-
-  chown proxy.proxy var/{cache,log}/squid
-
-#  cat << EOF
-#Release notes:  http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
-#EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/userdel proxy &> /dev/null
-  if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupdel proxy &>/dev/null
-  fi
-}
-
diff --git a/staging/squid/squid.pam b/staging/squid/squid.pam
deleted file mode 100644
index df8a8104f..000000000
--- a/staging/squid/squid.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#/etc/pam.d/squid
-#
-auth		required	pam_unix.so
-account		required	pam_unix.so
diff --git a/staging/squid/squid.service b/staging/squid/squid.service
deleted file mode 100644
index 9d41cc243..000000000
--- a/staging/squid/squid.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Web Proxy Cache Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/squid.pid
-ExecStart=/usr/sbin/squid -sYC
-ExecStop=/usr/sbin/squid -k shutdown
-ExecReload=/usr/sbin/squid -k reconfigure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/strigi/PKGBUILD b/staging/strigi/PKGBUILD
deleted file mode 100644
index 4ae50fa57..000000000
--- a/staging/strigi/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 164313 2012-07-30 07:25:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=strigi
-pkgver=0.7.7
-pkgrel=2
-pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
-arch=('i686' 'x86_64')
-url='http://strigi.sourceforge.net/'
-license=('GPL2')
-depends=('exiv2' 'libxml2' 'boost-libs')
-makedepends=('qt' 'cmake' 'pkg-config' 'boost')
-optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
-            'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
-#source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'gcc47.patch')
-md5sums=('ca0a0fd5c2b99879f6330837aeede996'
-         '1acb9b31a4859dc427fc4d387fd8aa2f')
-
-build() {
-  pushd ${pkgname}-${pkgver}/strigidaemon
-  patch -p1 -i "${srcdir}"/gcc47.patch
-  popd
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_INOTIFY=ON \
-    -DENABLE_LOG4CXX=OFF \
-    -DENABLE_FAM=OFF \
-    -DENABLE_CLUCENE=OFF \
-    -DENABLE_CLUCENE_NG=OFF \
-    -DENABLE_FFMPEG=OFF
-  make
-}
-
-package() {
-  pushd build/libstreams
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/libstreamanalyzer
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/strigiclient/lib/searchclient/qtdbus
-  make DESTDIR="${pkgdir}" install
-  popd
-  
-  pushd build/strigiutils
-  make DESTDIR="${pkgdir}" install
-  popd
-}
diff --git a/staging/strigi/gcc47.patch b/staging/strigi/gcc47.patch
deleted file mode 100644
index d99582563..000000000
--- a/staging/strigi/gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Rex Dieter <rdieter@fedoraproject.org>
-Date: Mon, 09 Jan 2012 17:13:25 +0000
-Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep'
-X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&amp;a=commitdiff&amp;h=a8e97f672325557b3fbc84b987299350ec5ac10b
----
-gcc47 fix, unistd.h header required unconditionally for 'sleep'
----
-
-
---- a/bin/daemon/eventlistener/eventlistenerqueue.cpp
-+++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp
-@@ -27,9 +27,7 @@
- #include <iostream>
- #include <stdio.h>
- 
--#if defined(__SUNPRO_CC)
- #include <unistd.h>
--#endif
- 
- using namespace std;
- 
-
diff --git a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch b/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 766dcb87f..000000000
--- a/staging/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 25 May 2012 19:43:24 -0400
-Subject: [PATCH] Reinstate TIMEOUT= handling
-
-This is mostly to deal with ipw2?00 drivers which have yet to be fixed
-in the kernel.
----
- src/libudev/libudev-device.c  |   19 +++++++++++++++++++
- src/libudev/libudev-private.h |    1 +
- src/udev/udevd.c              |   13 ++++++++++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a8277d1..5966189 100644
---- a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
-         struct udev_list tags_list;
-         unsigned long long int seqnum;
-         unsigned long long int usec_initialized;
-+        int timeout;
-         int devlink_priority;
-         int refcount;
-         dev_t devnum;
-@@ -89,6 +90,21 @@ struct udev_device {
-         bool db_persist;
- };
- 
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+        return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+        char num[32];
-+
-+        udev_device->timeout = timeout;
-+        snprintf(num, sizeof(num), "%u", timeout);
-+        udev_device_add_property(udev_device, "TIMEOUT", num);
-+        return 0;
-+}
-+
- /**
-  * udev_device_get_seqnum:
-  * @udev_device: udev device
-@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
- 
-                 util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
-                 udev_device_set_syspath(udev_device, path);
-+        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (startswith(property, "SUBSYSTEM=")) {
-                 udev_device_set_subsystem(udev_device, &property[10]);
-         } else if (startswith(property, "DEVTYPE=")) {
-@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
-         udev_list_init(udev, &udev_device->sysattr_value_list, true);
-         udev_list_init(udev, &udev_device->sysattr_list, false);
-         udev_list_init(udev, &udev_device->tags_list, true);
-+        udev_device->timeout = -1;
-         udev_device->watch_handle = -1;
-         /* copy global properties */
-         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
-index 4eb4a59..99aefeb 100644
---- a/src/libudev/libudev-private.h
-+++ b/src/libudev/libudev-private.h
-@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
-         }
- }
- 
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
-         struct udev_list_node *loop;
- 
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
-                 return;
-         }
- 
--        if (children >= children_max) {
-+        if (!force && children >= children_max) {
-                 if (children_max > 1)
-                         log_debug("maximum number (%i) of children reached\n", children);
-                 return;
-@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
- 
-         event->state = EVENT_QUEUED;
-         udev_list_node_append(&event->node, &event_list);
-+
-+        /* run all events with a timeout set immediately */
-+        if (udev_device_get_timeout(dev) > 0) {
-+                event_run(event, true);
-+                return 0;
-+        }
-+
-         return 0;
- }
- 
-@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
-                 if (is_devpath_busy(event))
-                         continue;
- 
--                event_run(event);
-+                event_run(event, false);
-         }
- }
- 
--- 
-1.7.10.2
-
diff --git a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
deleted file mode 100644
index 9be6ef28f..000000000
--- a/staging/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Thu, 27 Sep 2012 20:48:13 -0400
-Subject: [PATCH] tmpfiles: restore previous behavior for F/f
-
-d4e9eb91ea changed the behavior for the F and f actions, wrongly sending
-them to glob_item(). Restore the old behavior and shortcut straight to
-write_one_file().
----
- src/tmpfiles/tmpfiles.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index f10f908..bf900fa 100644
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -673,6 +673,10 @@ static int create_item(Item *i) {
- 
-         case CREATE_FILE:
-         case TRUNCATE_FILE:
-+                r = write_one_file(i, i->path);
-+                if (r < 0)
-+                        return r;
-+                break;
-         case WRITE_FILE:
-                 r = glob_item(i, write_one_file);
-                 if (r < 0)
--- 
-1.7.12.1
-
diff --git a/staging/systemd/PKGBUILD b/staging/systemd/PKGBUILD
deleted file mode 100644
index 18c285073..000000000
--- a/staging/systemd/PKGBUILD
+++ /dev/null
@@ -1,151 +0,0 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=194
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
-             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
-             'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        'initcpio-hook-udev'
-        'initcpio-install-udev'
-        'initcpio-install-timestamp'
-        '0001-Reinstate-TIMEOUT-handling.patch'
-        'use-split-usr-path.patch')
-md5sums=('0ebb73aea444693b9b86f7a76f5df23c'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         'fb37e34ea006c79be1c54cbb0f803414'
-         'df69615503ad293c9ddf9d8b7755282d'
-         '5543be25f205f853a21fa5ee68e03f0d'
-         'fd5b5f04ab0a847373d357555129d4c0')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # still waiting on ipw2x00, et al to get fixed...
-  patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
-  # hang onto this until we do the /{,s}bin merge
-  patch -Np1 <"$srcdir/use-split-usr-path.patch"
-
-  ./configure \
-      --libexecdir=/usr/lib \
-      --localstatedir=/var \
-      --sysconfdir=/etc \
-      --enable-introspection \
-      --enable-gtk-doc \
-      --disable-audit \
-      --disable-ima \
-      --with-distro=arch \
-      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-      --with-pci-ids-path=/usr/share/hwdata/pci.ids
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
-           'pam' 'util-linux' 'xz')
-  provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('libsystemd' 'systemd-tools' 'udev')
-  conflicts=('libsystemd' 'systemd-tools' 'udev')
-  optdepends=('initscripts: legacy support for /etc/rc.conf'
-              'python2-cairo: systemd-analyze'
-              'python2-dbus: systemd-analyze'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries'
-              'cryptsetup: required for encrypted block devices'
-              'quota-tools: kernel-level quota management')
-  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/logind.conf
-          etc/systemd/journald.conf
-          etc/udev/udev.conf)
-  install="systemd.install"
-
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # move bash-completion and symlink for loginctl
-  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
-    "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
-  rm -rf "$pkgdir/etc/bash_completion.d"
-
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
-
-  # get rid of RPM macros
-  rm -r "$pkgdir/etc/rpm"
-
-  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
-  # https://pokersource.info/show_bug.cgi?id=50989
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # the path to udevadm is hardcoded in some places
-  install -d "$pkgdir/sbin"
-  ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
-
-  # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
-  ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
-
-  # add back tmpfiles.d/legacy.conf
-  install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
-          s#GROUP="tape"#GROUP="storage"#g;
-          s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-
-  # add mkinitcpio hooks
-  install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
-  install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
-  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-
-  # XXX: kill off coredump rule until the journal can recover coredumps
-  rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
-
-  ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
-}
-
-package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
-  conflicts=('sysvinit')
-  depends=('sysvinit-tools')
-
-  mv "$srcdir/_sysvcompat"/* "$pkgdir"
-
-  install -dm755 "$pkgdir/sbin"
-  for tool in runlevel reboot shutdown poweroff halt telinit; do
-    ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
-  done
-
-  ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/staging/systemd/initcpio-hook-udev b/staging/systemd/initcpio-hook-udev
deleted file mode 100644
index 75da7e4a8..000000000
--- a/staging/systemd/initcpio-hook-udev
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    udevd --daemon --resolve-names=never
-    udevd_running=1
-}
-
-run_hook() {
-    msg ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-}
-
-run_cleanuphook() {
-    udevadm control --exit
-    udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/systemd/initcpio-install-timestamp b/staging/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/staging/systemd/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
-    cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/systemd/initcpio-install-udev b/staging/systemd/initcpio-install-udev
deleted file mode 100644
index 15124b8f7..000000000
--- a/staging/systemd/initcpio-install-udev
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    add_file "/etc/udev/udev.conf"
-    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
-    add_binary /usr/bin/udevadm
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
-    done
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/staging/systemd/systemd.install b/staging/systemd/systemd.install
deleted file mode 100644
index 784926e17..000000000
--- a/staging/systemd/systemd.install
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
-}
-
-post_install() {
-  # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@.service
-
-  systemd-machine-id-setup
-
-  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
-  echo "   bootloader to replace sysvinit with systemd"
-}
-
-post_upgrade() {
-  systemd-machine-id-setup
-
-  # getty@tty1.service is no longer enabled by default, but we don't want to break
-  # existing setups.
-  if [ "$(vercmp 183 "$2")" -eq 1 ]; then
-    # systemctl seems to be whiny on sysvinit. this will succeed unless something
-    # horrific happens, so just mask the error.
-    systemctl -q enable getty@.service || true
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/systemd/use-split-usr-path.patch b/staging/systemd/use-split-usr-path.patch
deleted file mode 100644
index 2fd32998d..000000000
--- a/staging/systemd/use-split-usr-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/core/main.c	2012-09-20 23:02:54.000000000 -0400
-+++ b/src/core/main.c	2012-09-20 23:03:13.000000000 -0400
-@@ -1455,11 +1455,7 @@
- 
-         /* Set up PATH unless it is already set */
-         setenv("PATH",
--#ifdef HAVE_SPLIT_USR
-                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
--#else
--               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
--#endif
-                arg_running_as == SYSTEMD_SYSTEM);
- 
-         if (arg_running_as == SYSTEMD_SYSTEM) {
diff --git a/staging/telepathy-kde-common-internals/PKGBUILD b/staging/telepathy-kde-common-internals/PKGBUILD
deleted file mode 100644
index 6759bd0ce..000000000
--- a/staging/telepathy-kde-common-internals/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 165596 2012-08-26 19:03:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=telepathy-kde-common-internals
-_pkgname=ktp-common-internals
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="Common components for KDE-Telepathy"
-arch=('i686' 'x86_64')
-url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
-license=('GPL')
-depends=('kdelibs' 'telepathy-qt' 'telepathy-mission-control')
-makedepends=('cmake' 'automoc4')
-groups=('kde-telepathy')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('34bac58049ede6df4fce1215fbc3b4ffc9671cba')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${_pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install b/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install
deleted file mode 100644
index 0b9f228a9..000000000
--- a/staging/telepathy-kde-common-internals/telepathy-kde-common-internals.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_update() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
\ No newline at end of file
diff --git a/staging/telepathy-logger-qt/PKGBUILD b/staging/telepathy-logger-qt/PKGBUILD
deleted file mode 100644
index 9a1a1900b..000000000
--- a/staging/telepathy-logger-qt/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 165594 2012-08-26 18:55:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: George Brooke <george+arch.aur@george-brooke.co.uk>
-
-pkgname=telepathy-logger-qt
-pkgver=0.5.0
-pkgrel=1
-pkgdesc="Qt bindings for telepathy logger"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/extragear/network/telepathy/telepathy-logger-qt'
-license=('GPL')
-depends=('telepathy-qt' 'telepathy-logger' 'qt-gstreamer' 'boost-libs')
-makedepends=('automoc4' 'cmake' 'python2' 'boost' 'doxygen')
-source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('09d949e60c5b140b20c61ec1d52830e7b98cd50e')
-
-build() {
-  cd "$srcdir"
-  mkdir build 
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/tellico/PKGBUILD b/staging/tellico/PKGBUILD
deleted file mode 100644
index c0945ceb4..000000000
--- a/staging/tellico/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 70650 2012-05-13 20:07:17Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Maintainer: Ray Rashif <schiv@archlinux.org
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgname=tellico
-pkgver=2.3.5
-pkgrel=2
-pkgdesc="A collection manager for KDE"
-arch=('i686' 'x86_64')
-url="http://tellico-project.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson')
-makedepends=('automoc4' 'cmake')
-install=$pkgname.install
-source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c')
-
-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
-
-# fix python 2.7 path
-  find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/tellico/tellico.install b/staging/tellico/tellico.install
deleted file mode 100644
index 3b3aff7d9..000000000
--- a/staging/tellico/tellico.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/transcode/PKGBUILD b/staging/transcode/PKGBUILD
deleted file mode 100644
index da28d1cba..000000000
--- a/staging/transcode/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 169357 2012-10-20 04:01:26Z eric $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.7
-pkgrel=6
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
-	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool')
-source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
-        ffmpeg-0.11.patch)
-sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae'
-          '3d2dcdc23f14938e87d14cfc03000bb3b649b85e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch"
-  ./configure --prefix=/usr \
-    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
-    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
-    --enable-libdv --enable-libxml2 --enable-v4l \
-    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
-    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
-    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
-  make
-
-  cd "${srcdir}/subtitleripper"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
-  sed -e 's|^\(.*lppm.*\)$|#\1|' \
-      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
-      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
-      -i Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/subtitleripper"
-  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
-  install -m 755 srttool "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
-  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}
diff --git a/staging/transcode/ffmpeg-0.11.patch b/staging/transcode/ffmpeg-0.11.patch
deleted file mode 100644
index b5601fe2f..000000000
--- a/staging/transcode/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c
---- transcode-1.1.7/export/export_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/export/export_ffmpeg.c	2012-07-05 16:22:41.095346080 -0400
-@@ -180,7 +180,7 @@
- 
- 
- /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
--#include <libavcodec/opt.h>
-+#include <libavutil/opt.h>
- #include <libavutil/avstring.h>
- #include <libswscale/swscale.h>
- 
-@@ -470,7 +470,6 @@
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    avcodec_init();
-     avcodec_register_all();
-     TC_UNLOCK_LIBAVCODEC;
- 
-@@ -634,7 +633,6 @@
-         lavc_param_rc_max_rate = 2516;
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
- 
-         break;
- 
-@@ -674,7 +673,6 @@
- 
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
- 
-         break;
- 
-diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c
---- transcode-1.1.7/export/ffmpeg_cfg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/export/ffmpeg_cfg.c	2012-07-05 15:26:29.112103273 -0400
-@@ -160,9 +160,7 @@
-     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
--    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
--    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
-     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -211,7 +211,6 @@
- #else
-     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
- #endif    
--    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
-     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-@@ -223,9 +223,6 @@
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
--    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
--    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
--    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
-     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
-     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c
---- transcode-1.1.7/filter/filter_pp.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/filter/filter_pp.c	2012-07-05 15:26:28.945436613 -0400
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 
-diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c
---- transcode-1.1.7/import/decode_lavc.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/decode_lavc.c	2012-07-05 15:26:28.842103278 -0400
-@@ -181,7 +181,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   lavc_dec_context->error_resilience  = 2;
- #else
--  lavc_dec_context->error_recognition = 2;
-+  lavc_dec_context->err_recognition = 2;
- #endif
-   lavc_dec_context->error_concealment = 3;
-   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c
---- transcode-1.1.7/import/import_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/import_ffmpeg.c	2012-07-05 15:26:28.848769946 -0400
-@@ -314,7 +314,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     lavc_dec_context->error_resilience  = 2;
- #else
--    lavc_dec_context->error_recognition = 2;
-+    lavc_dec_context->err_recognition = 2;
- #endif
-     lavc_dec_context->error_concealment = 3;
-     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c
---- transcode-1.1.7/import/probe_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/probe_ffmpeg.c	2012-07-05 15:26:28.838769947 -0400
-@@ -99,8 +99,8 @@
- 
-     TC_INIT_LIBAVCODEC;
- 
--    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
--                             NULL, 0, NULL);
-+    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
-+                             NULL, NULL);
-     if (ret != 0) {
-         tc_log_error(__FILE__, "unable to open '%s'"
-                                " (libavformat failure)",
-diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h
---- transcode-1.1.7/libtc/tcavcodec.h	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/libtc/tcavcodec.h	2012-07-05 15:26:28.828769951 -0400
-@@ -53,7 +53,6 @@
- 
- #define TC_INIT_LIBAVCODEC do { \
-     TC_LOCK_LIBAVCODEC; \
--    avcodec_init(); \
-     avcodec_register_all(); \
-     TC_UNLOCK_LIBAVCODEC; \
- } while (0)
---- transcode-1.1.7/export/export_ffmpeg.c.orig	2012-10-19 23:25:16.442303175 -0400
-+++ transcode-1.1.7/export/export_ffmpeg.c	2012-10-19 23:26:23.904268733 -0400
-@@ -1249,7 +1249,7 @@
-       return TC_EXPORT_ERROR;
-     }
- 
--    if (lavc_venc_context->codec->encode == NULL) {
-+    if (lavc_venc_context->codec->encode2 == NULL) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
-               "(lavc_venc_context->codec->encode == NULL)");
-       return TC_EXPORT_ERROR;
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/twisted/PKGBUILD b/staging/twisted/PKGBUILD
deleted file mode 100644
index 35bf73958..000000000
--- a/staging/twisted/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 168774 2012-10-15 21:19:51Z eric $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=twisted
-pkgver=12.2.0
-pkgrel=2
-pkgdesc="Asynchronous networking framework written in Python."
-arch=('i686' 'x86_64')
-url="http://twistedmatrix.com/"
-license=('MIT')
-depends=('python2-crypto' 'python2-zope-interface')
-optdepends=('python2-pyopenssl'
-            'python2-soappy: for twisted.web.soap'
-	    'python2-pyasn1: for using conch'
-	    'pygtk: for using manhole'
-	    'tk: for using tkconch')
-install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9')
-
-build() {
-    cd "$srcdir/Twisted-$pkgver"
-    python2 setup.py build
-}
-
-package() {
-    cd "$srcdir/Twisted-$pkgver"
-    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py
-}
diff --git a/staging/twisted/twisted.install b/staging/twisted/twisted.install
deleted file mode 100644
index 8e93ffd3c..000000000
--- a/staging/twisted/twisted.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-}
diff --git a/staging/usbmuxd/85-usbmuxd.rules b/staging/usbmuxd/85-usbmuxd.rules
deleted file mode 100644
index ec9f72501..000000000
--- a/staging/usbmuxd/85-usbmuxd.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
-
-# Forces iDevices to the last USB configuration and runs usbmuxd
-TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
-LABEL="usbmuxd_systemd_end"
-
-# Exit usbmuxd when the last device is removed
-ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/staging/usbmuxd/PKGBUILD b/staging/usbmuxd/PKGBUILD
deleted file mode 100644
index 0b8e9b84b..000000000
--- a/staging/usbmuxd/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 163814 2012-07-20 13:59:21Z tomegun $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=usbmuxd
-pkgver=1.0.8
-pkgrel=1
-pkgdesc="USB Multiplex Daemon"
-url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'GPL3' 'LGPL2.1')
-depends=('libusb' 'libplist')
-makedepends=('cmake')
-install=usbmuxd.install
-source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
-	'usbmuxd.service'
-	'85-usbmuxd.rules')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  echo "${pkgver}" > version.tag
-  mkdir build
-  cd build
-  cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  # fix udev dir being hardcoded
-  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
-  rmdir "${pkgdir}/lib"
-  # install systemd service file
-  install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
-  # use udev rule that works with systemd
-  install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
-}
-md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
-         'dae0660f972510a6483992b5b81e1b5a'
-         'dc4b2893651149eccbf7b2c8467cd288')
diff --git a/staging/usbmuxd/usbmuxd.install b/staging/usbmuxd/usbmuxd.install
deleted file mode 100644
index 1a4859674..000000000
--- a/staging/usbmuxd/usbmuxd.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-    groupadd -g 140 usbmux &>/dev/null
-    useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-    passwd -l usbmux &>/dev/null
-}
-
-post_upgrade() {
-    getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null
-    getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-}
-
-post_remove() {
-    if getent passwd usbmux >/dev/null 2>&1; then
-        userdel usbmux
-    fi
-    if getent group usbmux >/dev/null 2>&1; then
-        groupdel usbmux
-    fi
-}
diff --git a/staging/usbmuxd/usbmuxd.service b/staging/usbmuxd/usbmuxd.service
deleted file mode 100644
index fbebf65b9..000000000
--- a/staging/usbmuxd/usbmuxd.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=iOS USB Muxer
-
-[Service]
-ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux
diff --git a/staging/vde2/PKGBUILD b/staging/vde2/PKGBUILD
deleted file mode 100644
index b4646d06e..000000000
--- a/staging/vde2/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 168790 2012-10-16 00:34:59Z allan $
-# Contributor: Sergej Pupykin
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=vde2
-pkgver=2.3.2
-pkgrel=2
-pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
-url="http://sourceforge.net/projects/vde/"
-license=("GPL" "LGPL" "CUSTOM")
-arch=('i686' 'x86_64')
-depends=('bash' 'libpcap' 'openssl')
-makedepends=('python')
-backup=(etc/conf.d/vde)
-source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
-        dhcpd.conf.sample
-        iptables.rules.sample
-        vde-config.sample
-        vde-connection.sample
-        vde.conf
-        vde.rc)
-install=vde2.install
-options=(!libtool !makeflags)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
-             --enable-experimental
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver 
-  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install
-  install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde
-  install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde
-  install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample
-  install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample
-  install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample
-  install -D -m 644 ../iptables.rules.sample $pkgdir/usr/share/vde2/iptables.rules.sample
-  # install slirp license
-  install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde
-}
-
-md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
-         '7d9bc56d2e561d849e915000d1c0f269'
-         'a920123fc620bcedbccb703a8d1bdc55'
-         'cb8ace28e8efd4dad128be4be71b3b07'
-         '63033c33565e2030541c5e05e9d9b063'
-         'a22730f051f4840da4a3162a88ff8156'
-         '6c7dc01bc2f039f0ff1682ee70d3d1da')
diff --git a/staging/vde2/dhcpd.conf.sample b/staging/vde2/dhcpd.conf.sample
deleted file mode 100644
index 565a78b27..000000000
--- a/staging/vde2/dhcpd.conf.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-ddns-update-style none;
-
-subnet 192.168.254.0 netmask 255.255.255.0 {
-    range 192.168.254.1 192.168.254.253;
-    option routers 192.168.254.254;
-    option domain-name "virtual.example.com";
-    # find your DNS servers from /etc/resolv.conf
-    # otherwise only pure IP addresses will work
-    option domain-name-servers 192.168.254.254;
-    option broadcast-address 192.168.254.255;
-    default-lease-time 86400;
-}
diff --git a/staging/vde2/iptables.rules.sample b/staging/vde2/iptables.rules.sample
deleted file mode 100644
index ac712ee21..000000000
--- a/staging/vde2/iptables.rules.sample
+++ /dev/null
@@ -1,5 +0,0 @@
-*filter
--A INPUT -i tun -j ACCEPT
--A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT
-*nat
--A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE
diff --git a/staging/vde2/vde-config.sample b/staging/vde2/vde-config.sample
deleted file mode 100644
index c5a5b7d88..000000000
--- a/staging/vde2/vde-config.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# Set options vde_switch program
-# To activate this vde profile add it to /etc/conf.d/vde
-
-# Global options
-VDE_NUMPORTS="32"  # Number of ports (default 32)
-VDE_HUB="no"       # [yes|no] Make the switch act as a hub
-VDE_FSTP="no"      # [yes|no] Activate the fast spanning tree protocol
-VDE_MAC=""         # Set the Switch MAC address
-VDE_PRIOTIRY=""    # Set the priority for FST (MAC extension)
-VDE_HASHSIZE=""    # Hash table size
-
-# Options from datasock module
-VDE_SOCK="/var/run/vde/sample.sock"  # control directory pathname
-VDE_SOCK_MODE="660"                  # Standard access mode for comm sockets (octal)
-VDE_SOCK_GROUP="root"                # Group owner for comm sockets
-
-# Options from consmgmt module
-VDE_MANAGEMENT_SOCK="/var/run/vde/sample.mgmt"  # path of the management UNIX socket
-VDE_MANAGEMENT_SOCK_MODE="660"                  # management UNIX socket access mode (octal)
-
-# Other options to parse to vde_switch
-VDE_OPTIONS=""
-
-# VDE with internet support
-# You can use either tuntap method or slirpvde method.
-
-# Options from tuntap module
-VDE_TAP=""  # Enable routing through TAP tap interface (comma separated array eg.:"tap0,tap1").
-
-# slirpvde daemon support
-SLIRP="no"         # [yes|no] enable/disable SLIRP daemon support
-SLIRP_DHCP="no"    # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE
-SLIRP_NETWORK="" # specify the network address (default 10.0.2.0)
-# other options to parse to slirpvde
-SLIRP_OPTIONS=""
\ No newline at end of file
diff --git a/staging/vde2/vde-connection.sample b/staging/vde2/vde-connection.sample
deleted file mode 100644
index 4a75e1f52..000000000
--- a/staging/vde2/vde-connection.sample
+++ /dev/null
@@ -1,6 +0,0 @@
-# You can add vde switch connections below
-# just without the # at the beginning:
-# vde_plug /var/run/vde/sample.sock = vde_plug /var/run/vde/sample2.sock
-# or if hosts are different use this syntax:
-# vde_plug /var/run/vde/sample.sock = ssh host2 vde_plug /var/run/vde/sample.sock
-
diff --git a/staging/vde2/vde.conf b/staging/vde2/vde.conf
deleted file mode 100644
index bc61dceda..000000000
--- a/staging/vde2/vde.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set options for a vde daemon script
-#
-# Array for your vde config files, eg.: "internal-net external-net"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-config.sample
-VDE_CONFIG="" 
-
-# Array for your dpipe connections, eg.: "connect-switches"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-connection.sample
-VDE_CONNECTION=""
\ No newline at end of file
diff --git a/staging/vde2/vde.rc b/staging/vde2/vde.rc
deleted file mode 100755
index b368f9955..000000000
--- a/staging/vde2/vde.rc
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vde
-
-case "$1" in
-  start)
-    # bring up all defined profiles
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      stat_busy "Starting vde_switch $i"
-      # get options from profile
-      [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS"
-      [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x"
-      [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F"
-      [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC"
-      [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY"
-      [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH"
-      [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK"
-      [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE"
-      [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP"
-      [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK"
-      [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE"
-      [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP"
-      [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS"
-      vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null
-      [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK"
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Starting slirpvde for $i"
-        [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D"
-        [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK"
-        [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS"
-        [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK"
-        [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE"
-        [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP"
-        slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        unset OPTIONS
-        unset SP_OPTIONS
-      fi
-    done
-    for i in $VDE_CONNECTION; do
-      # connect specified vde_switches
-      if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then
-        stat_busy "Connecting VDE switches $i together..."
-        while read j; do
-          switch="$(echo $j | grep ^vde_plug)"
-          [ -n "$switch" ] && (dpipe $switch &)
-        done </etc/vde/$i
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      fi
-    done
-    add_daemon vde
-    ;;
-  stop)
-    # kill vde_plug if switches are connected
-    [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Stopping slirpvde for $i"
-        kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        rm /var/run/slirpvde-$i.pid &> /dev/null
-      fi
-      stat_busy "Stopping vde_switch $i"
-      kill $(cat /var/run/vde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      rm /var/run/vde-$i.pid &> /dev/null
-      stat_busy "Removing $i vde sockets"
-      rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-    done
-      unset OPTIONS
-      unset SP_OPTIONS
-      [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out
-      rm_daemon vde 
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-    *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/vde2/vde2.install b/staging/vde2/vde2.install
deleted file mode 100644
index 74e1710ff..000000000
--- a/staging/vde2/vde2.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  echo "Change /etc/conf.d/vde to your needs."
-  echo "vde config files should be placed in /etc/vde, sample files are provided."
-  echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'."
-  echo "Merge those examples, if needed to the according config files."
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/staging/vlc/PKGBUILD b/staging/vlc/PKGBUILD
deleted file mode 100644
index 00c32155b..000000000
--- a/staging/vlc/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 162783 2012-06-30 13:21:15Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=2.0.2
-pkgrel=2
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
-         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
-         'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 
-         'xcb-util-keysyms' 'ttf-freefont')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils'
-             'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
-             'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager')
-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'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards'
-            'libbluray: for Blu-Ray support'
-            'flac: for Free Lossless Audio Codec plugin'
-            'oss: for OSS audio support'
-            'portaudio: for portaudio support'
-            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'projectm: for ProjectM visualisation plugin'
-            'libcaca: for colored ASCII art video output'
-            'libgme: for libgme plugin'
-            'librsvg: for SVG plugin'
-            'gnome-vfs: for GNOME Virtual File System support'
-            'libgoom2: for libgoom plugin'
-            'vcdimager: navigate VCD with libvcdinfo'
-            'xosd: for xosd support'
-            'aalib: for ASCII art plugin'
-            'libmtp: for MTP devices support'
-            'fluidsynth: for synthesizer MIDI FluidSynth'
-            'smbclient: for SMB access plugin'
-            'libcdio: for audio CD playback support')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool' '!emptydirs')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('93e729cc970a4535b3213dbef0e69528')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-oss \
-              --enable-faad \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --enable-realrtsp \
-              --enable-xosd \
-              --enable-aa \
-              --enable-vcdx
-  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/x264/PKGBUILD b/staging/x264/PKGBUILD
deleted file mode 100644
index ace432d9a..000000000
--- a/staging/x264/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 160669 2012-06-03 15:05:06Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=x264
-pkgver=20120602
-pkgrel=1
-pkgdesc="free library for encoding H264/AVC video streams"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/x264.html"
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('50e6dc7a1031a19c710e912dffb19a7a')
-
-build() {
-    cd "$pkgname-snapshot-$pkgver-2245-stable"
-
-    ./configure --enable-shared
-
-    make
-}
-package() {
-    cd "$pkgname-snapshot-$pkgver-2245-stable"
-
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/xf86-input-acecad/PKGBUILD b/staging/xf86-input-acecad/PKGBUILD
deleted file mode 100644
index 0a20be8da..000000000
--- a/staging/xf86-input-acecad/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168078 2012-10-05 17:56:18Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-acecad
-pkgver=1.5.0
-pkgrel=5
-pkgdesc="X.Org acecad tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('sysfsutils')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        assign-local-private-after-allocating.patch)
-sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
-          '9301020b0ef3c6f2081e957481a88d2e187a7973')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch b/staging/xf86-input-acecad/assign-local-private-after-allocating.patch
deleted file mode 100644
index e3e635a6f..000000000
--- a/staging/xf86-input-acecad/assign-local-private-after-allocating.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 27 Jun 2011 03:13:54 +0000
-Subject: Assign local->private after allocating.
-
-It is detrimental to the user experience when the driver tries to derefernce
-null pointers.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/acecad.c b/src/acecad.c
-index ad6d793..604fe91 100644
---- a/src/acecad.c
-+++ b/src/acecad.c
-@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
-         return BadAlloc;
- 
-     memset(priv, 0, sizeof(AceCadPrivateRec));
-+    local->private = priv;
- 
-     local->device_control = DeviceControl;
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/staging/xf86-input-aiptek/PKGBUILD b/staging/xf86-input-aiptek/PKGBUILD
deleted file mode 100644
index b0c5ad004..000000000
--- a/staging/xf86-input-aiptek/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168080 2012-10-05 18:00:48Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-aiptek
-pkgver=1.4.1
-pkgrel=5
-pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-elographics/PKGBUILD b/staging/xf86-input-elographics/PKGBUILD
deleted file mode 100644
index ee6ad8451..000000000
--- a/staging/xf86-input-elographics/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 88566 2010-08-24 08:47:16Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-elographics
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="X.org Elographics TouchScreen input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-evdev/PKGBUILD b/staging/xf86-input-evdev/PKGBUILD
deleted file mode 100644
index b5ad96195..000000000
--- a/staging/xf86-input-evdev/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168082 2012-10-05 18:10:25Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <Alexander@archlinux.org
-
-pkgname=xf86-input-evdev
-pkgver=2.7.3
-pkgrel=2
-pkgdesc="X.org evdev input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'systemd-tools' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool' '!makeflags')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-joystick/50-joystick.conf b/staging/xf86-input-joystick/50-joystick.conf
deleted file mode 100644
index 95a295ab0..000000000
--- a/staging/xf86-input-joystick/50-joystick.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-	Identifier "joystick catchall"
-	MatchIsJoystick "on"
-	MatchDevicePath "/dev/input/event*"
-	Driver "joystick"
-EndSection
diff --git a/staging/xf86-input-joystick/PKGBUILD b/staging/xf86-input-joystick/PKGBUILD
deleted file mode 100644
index 77a304012..000000000
--- a/staging/xf86-input-joystick/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 168084 2012-10-05 18:31:52Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-joystick
-pkgver=1.6.1
-pkgrel=2
-pkgdesc="X.Org Joystick input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        #git-fixes.patch
-        50-joystick.conf)
-sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580'
-          'e1ff3699a0470c6bb78a53f718df9d8521621e11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-joystick/git-fixes.patch b/staging/xf86-input-joystick/git-fixes.patch
deleted file mode 100644
index b3afa06cc..000000000
--- a/staging/xf86-input-joystick/git-fixes.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
-From: Terry Lambert <tlambert@chromium.org>
-Date: Sat, 16 Jul 2011 00:23:22 +0000
-Subject: Return proper default for unknown values in pInfo->device_control.
-
-Signed-off-by: Terry Lambert <tlambert@chromium.org>
-Reviewed-by: Stephane Marchesin <marcheu@chromium.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/jstk.c b/src/jstk.c
-index ec6b79a..6db0e7c 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
- 
-     default:
-         ErrorF("unsupported mode=%d\n", what);
--        return !Success;
--        break;
-+        return BadValue;
-     } /* switch (what) */
-     return Success;
- }
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index 3c471ce..d699dcd 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
-         DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n"));
-         dev->public.on = FALSE;
-         break;
-+    default:
-+        return BadValue;
-     }
- 
-     return Success;
---
-cgit v0.9.0.2-2-gbebe
-From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
-From: Devin J. Pohly <djpohly+xorg@gmail.com>
-Date: Sat, 03 Sep 2011 23:00:07 +0000
-Subject: unify capitalization of joystick properties
-
-the axis keys high/low properties were inconsistently capitalized,
-leading to potential confusion as to why one works but not the other.
-
-Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/include/joystick-properties.h b/include/joystick-properties.h
-index 49ef800..36f4082 100644
---- a/include/joystick-properties.h
-+++ b/include/joystick-properties.h
-@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING {
- 
- /** Scancodes for axis in high position */
- /* 8 bit, 4 per axis */
--#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)"
-+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)"
- 
- /** Set the mapping of each button to
-     none, x, y, zx, zy, button, key, speed_multiply,
---
-cgit v0.9.0.2-2-gbebe
-From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sat, 15 Oct 2011 22:47:52 +0000
-Subject: label buttons and axes
-
-Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping.
-Mapping can be changed while running so the labels will be constant.
-
-Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator
-data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X"
-and "Rel Y", representing the aggregated post-calculation data from all axes.
-
-Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
----
-diff --git a/man/joystick.man b/man/joystick.man
-index da92ceb..b401de5 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -140,7 +140,11 @@ Neither
- .B mode
- nor
- .B axis
--needs to be set to generate extra valuator events.
-+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with 
-+.I 1
-+, i.e.
-+.I \*qAxis 1\*q
-+for the first axis (being the 3rd valuator).
- Default: not set.
- .TP 7
- .BI "\*qaxis="[<factor>]<axis> \*q
-@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys
- The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis.
- The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings.
- 
-+.SH "XI2 Events"
-+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons:
-+
-+.nf
-+.BI "  Option  \*qMapAxis1\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis2\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis3\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis4\*q      \*q" "mode=none valuator" \*q
-+\ \ ...
-+.BI "  Option  \*qMapButton1\*q      \*q" "button=1" \*q
-+.BI "  Option  \*qMapButton2\*q      \*q" "button=2" \*q
-+.BI "  Option  \*qMapButton3\*q      \*q" "button=3" \*q
-+.BI "  Option  \*qMapButton4\*q      \*q" "button=4" \*q
-+.BI "  Option  \*qMapButton5\*q      \*q" "button=5" \*q
-+\ \ ...
-+.fi
-+
-+You might also want to set the device "floating" to stop it from reporting core events:
-+.nf
-+.BI "  Option  \*qFloating\*q      \*q" "true" \*q
-+.fi
-+
- .SH "NOTES"
- Configuration through
- .I InputClass
-diff --git a/src/jstk.c b/src/jstk.c
-index 6db0e7c..772683f 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-  * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>       
-  *                                                                            
-  * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -21,7 +21,6 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-     switch (what) {
-     case DEVICE_INIT: {
-         int m;
-+        char str[32];
-         CARD8 buttonmap[BUTTONMAP_SIZE+1];
-         DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n"));
-         /* Probe device and return if error */
-@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-         }
- 
-         for (m=0; m<=BUTTONMAP_SIZE; m++) {
-+            sprintf(str, "Button %d", m);
-+
-             buttonmap[m] = m;
--	}
-+            btn_labels[m] = MakeAtom(str, strlen(str), TRUE);
-+        }
-+
-+
- 
--            
--            
-         if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, 
-             btn_labels,
-             buttonmap) == FALSE) {
-@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-             if (priv->axis[i].valuator != -1)
-         {
-             DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m));
-+            sprintf(str, "Axis %d", i + 1);
-             priv->axis[i].valuator = m++;
-+            axes_labels[i] = MakeAtom(str, strlen(str), TRUE);
-         }
- 
-         if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
-@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec =
-                    /* a tool */
- };
- 
--
- /*
-  ***************************************************************************
-  *
-@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = {
-     jstkDriverPlug,
-     jstkDriverUnplug
- };
-+
-+/* vim: set filetype=c.doxygen ts=4 et: */
-+
---
-cgit v0.9.0.2-2-gbebe
-From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:27:22 +0000
-Subject: Fix option type for option duplication
-
-xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption
-list.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index d699dcd..e842941 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *options;
-     InputOption *iopts = NULL, *tmp;
-     DeviceIntPtr dev;
-+    XF86OptionPtr opts;
- 
-     /* duplicate option list, append to name */
--    options = xf86OptionListDuplicate(pInfo->options);
-+    opts = xf86OptionListDuplicate(pInfo->options);
-     strcpy(name, pInfo->name);
-     strcat(name, " (keys)");
--    options = xf86ReplaceStrOption(options, "Name", name);
--    options = xf86ReplaceStrOption(options, "_source", "_driver/joystick");
-+    opts = xf86ReplaceStrOption(opts, "Name", name);
-+    opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
- 
--    while(options)
-+    while(opts)
-     {
-         tmp = calloc(1, sizeof(InputOption));
- 
--        tmp->key = xf86OptionName(options);
--        tmp->value = xf86OptionValue(options);
-+        tmp->key = xf86OptionName(opts);
-+        tmp->value = xf86OptionValue(opts);
-         tmp->next = iopts;
-         iopts = tmp;
--        options = xf86NextOption(options);
-+        opts = xf86NextOption(opts);
-     }
- 
-     /* duplicate attribute list */
---
-cgit v0.9.0.2-2-gbebe
-From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:33:08 +0000
-Subject: Deal with opaque input option types.
-
-ABI 14 made the InputOption type opaque, move the existing code to ifdefs
-and use the new function calls otherwise.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index e842941..a71275a 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-     return Success;
- }
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
-+static InputOption*
-+input_option_new(InputOption* list, char *key, char *value)
-+{
-+    InputOption *tmp;
-+
-+    tmp = calloc(1, sizeof(*tmp));
-+    tmp->key = key;
-+    tmp->value = value;
-+    tmp->next = list;
-+
-+    return tmp;
-+}
-+
-+static void
-+input_option_free_list(InputOption **list)
-+{
-+    InputOption *iopts = *list;
-+
-+    while(iopts)
-+    {
-+        InputOption *tmp = iopts->next;
-+        free(iopts->key);
-+        free(iopts->value);
-+        free(iopts);
-+        iopts = tmp;
-+    }
-+
-+    *list = NULL;
-+}
-+
-+#endif
-+
- InputInfoPtr
- jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- {
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *iopts = NULL, *tmp;
-+    InputOption *iopts = NULL;
-     DeviceIntPtr dev;
-     XF86OptionPtr opts;
- 
-@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     while(opts)
-     {
--        tmp = calloc(1, sizeof(InputOption));
--
--        tmp->key = xf86OptionName(opts);
--        tmp->value = xf86OptionValue(opts);
--        tmp->next = iopts;
--        iopts = tmp;
-+        iopts = input_option_new(iopts,
-+                                 xf86OptionName(opts),
-+                                 xf86OptionValue(opts));
-         opts = xf86NextOption(opts);
-     }
- 
-@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     rc = NewInputDeviceRequest(iopts, attrs, &dev);
- 
--    while(iopts)
--    {
--        tmp = iopts->next;
--        free(iopts->key);
--        free(iopts->value);
--        free(iopts);
--        iopts = tmp;
--    }
-+    input_option_free_list(&iopts);
- 
-     FreeInputAttributes(attrs);
- 
---
-cgit v0.9.0.2-2-gbebe
-From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 17:04:25 +0000
-Subject: man: valuators are not added automatically
-
----
-diff --git a/man/joystick.man b/man/joystick.man
-index b401de5..9f38ceb 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -129,9 +129,6 @@ can be one of:
- 
- .B none, relative, accelerated, absolute
- 
--Every axis which's mode is not
--.B none
--will be reported as an additional valuator.
- .TP 7
- .B \*qvaluator\*q
- Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always 
---
-cgit v0.9.0.2-2-gbebe
-From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 19:36:07 +0000
-Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device
-
-udev does copy the Driver line to the list of options, but when manually
-specifying the driver in xorg.conf, the option "Driver" is unset. Because we
-do hotplug a sub-device from within the core device, we need the "Driver"
-option to be present in the list.
-
-This should fix archlinux bug #23577:
-  https://bugs.archlinux.org/task/23577
-
-Thanks to Malek for coming up with a fix.
-
-Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index a71275a..241b15d 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     strcat(name, " (keys)");
-     opts = xf86ReplaceStrOption(opts, "Name", name);
-     opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
-+    opts = xf86AddNewOption(opts, "Driver", pInfo->driver);
- 
-     while(opts)
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xf86-input-keyboard/PKGBUILD b/staging/xf86-input-keyboard/PKGBUILD
deleted file mode 100644
index 478060eef..000000000
--- a/staging/xf86-input-keyboard/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168086 2012-10-05 18:41:11Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-keyboard
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="X.Org keyboard input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-mouse/PKGBUILD b/staging/xf86-input-mouse/PKGBUILD
deleted file mode 100644
index 0c075179b..000000000
--- a/staging/xf86-input-mouse/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168088 2012-10-05 18:46:31Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-mouse
-pkgver=1.8.1
-pkgrel=2
-pkgdesc="X.org mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-synaptics/10-synaptics.conf b/staging/xf86-input-synaptics/10-synaptics.conf
deleted file mode 100644
index 81a90fb81..000000000
--- a/staging/xf86-input-synaptics/10-synaptics.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Section "InputClass"
-        Identifier "touchpad catchall"
-        Driver "synaptics"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-EndSection
diff --git a/staging/xf86-input-synaptics/PKGBUILD b/staging/xf86-input-synaptics/PKGBUILD
deleted file mode 100644
index 24a48dcb1..000000000
--- a/staging/xf86-input-synaptics/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168090 2012-10-05 18:57:54Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski  <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-input-synaptics
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        10-synaptics.conf)
-sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
-            'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  rm -rf "${pkgdir}/usr/share/X11"
-}
diff --git a/staging/xf86-input-vmmouse/PKGBUILD b/staging/xf86-input-vmmouse/PKGBUILD
deleted file mode 100644
index 214429614..000000000
--- a/staging/xf86-input-vmmouse/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168092 2012-10-05 19:03:25Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-vmmouse
-pkgver=12.9.0
-pkgrel=2
-pkgdesc="X.org VMWare Mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc' 'sh')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('83500beddba2da390389705d482131872fe9be8b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-xorg-conf-dir=/etc/X11/xorg.conf.d \
-    --with-udev-rules-dir=/usr/lib/udev/rules.d
-  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}/"
-  rm -rfv ${pkgdir}/usr/{lib,share}/hal
-}
diff --git a/staging/xf86-input-void/PKGBUILD b/staging/xf86-input-void/PKGBUILD
deleted file mode 100644
index 0831ca3a0..000000000
--- a/staging/xf86-input-void/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168094 2012-10-05 19:07:17Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-void
-pkgver=1.4.0
-pkgrel=4
-pkgdesc="X.org void input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules
deleted file mode 100644
index f6aa20835..000000000
--- a/staging/xf86-input-wacom/70-wacom.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-ACTION!="add|change", GOTO="wacom_end"
-
-# Match all serial wacom tablets with a serial ID starting with WACf
-# Notes: We assign NAME though we shouldn't, but currently the server requires it
-#        We assign the lot to subsystem pnp too because server reads NAME from
-#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
-#        will do and the ENV{NAME} can be removed.
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-
-LABEL="wacom_end"
-
diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD
deleted file mode 100644
index 3e3a2acd4..000000000
--- a/staging/xf86-input-wacom/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168096 2012-10-05 19:11:14Z andyrtr $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: M Rawash <mrawash@gmail.com>
-
-pkgname=xf86-input-wacom
-pkgver=0.17.0
-pkgrel=2
-pkgdesc="X.Org Wacom tablet driver"
-arch=('i686' 'x86_64')
-url="http://linuxwacom.sourceforge.net/"
-license=('GPL')
-backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr' 'libxinerama')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
-        70-wacom.rules)
-md5sums=('92dffefc3bc30523463f2fa4bc753448'
-         '10db4f8272286690255c1bcc18bfdd92')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules"
-}
diff --git a/staging/xf86-video-apm/PKGBUILD b/staging/xf86-video-apm/PKGBUILD
deleted file mode 100644
index 6dc7c8dfa..000000000
--- a/staging/xf86-video-apm/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168102 2012-10-05 20:15:38Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="X.org Alliance ProMotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-ark/PKGBUILD b/staging/xf86-video-ark/PKGBUILD
deleted file mode 100644
index e4ab12bfe..000000000
--- a/staging/xf86-video-ark/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168104 2012-10-05 20:26:50Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ark
-pkgver=0.7.5
-pkgrel=2
-pkgdesc="X.org ark video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-ast/PKGBUILD b/staging/xf86-video-ast/PKGBUILD
deleted file mode 100644
index 448aa5d54..000000000
--- a/staging/xf86-video-ast/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168106 2012-10-05 20:30:31Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ast
-pkgver=0.97.0
-pkgrel=2
-pkgdesc="X.org ASPEED AST Graphics video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-ati/PKGBUILD b/staging/xf86-video-ati/PKGBUILD
deleted file mode 100644
index 4cafa5c9d..000000000
--- a/staging/xf86-video-ati/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161625 2012-06-12 15:45:26Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-ati
-pkgver=6.14.5
-epoch=1
-pkgrel=1
-pkgdesc="X.org ati video driver"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libdrm>=2.4.35' 'systemd-tools' 'ati-dri')
-makedepends=('xorg-server-devel>=1.11.99.902' 'xf86driproto' 'mesa')
-conflicts=('xorg-server<1.11.99.902')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ef879d2845de50cec1aa98e37185271e1d535c0009efd6713ec88206b7197d53')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr #--enable-dri --help
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make "DESTDIR=${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/staging/xf86-video-nouveau/PKGBUILD b/staging/xf86-video-nouveau/PKGBUILD
deleted file mode 100644
index c312798ed..000000000
--- a/staging/xf86-video-nouveau/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 161500 2012-06-12 02:04:01Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: buddabrod <buddabrod@gmail.com>
-
-pkgname=xf86-video-nouveau
-_gitdate=20120612
-pkgver=0.0.16_git${_gitdate} # see configure.ac
-pkgrel=1
-pkgdesc="Open Source 2D 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' 'xf86driproto')
-conflicts=('xorg-server<1.11.99.902')
-options=('!libtool')
-install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2)
-md5sums=('d72338b96fa4c8356f69f10692dbc6d9')
-
-# 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 xf86-video-nouveau-${_gitdate}
-  ./autogen.sh --prefix=/usr
-  make
-}
-
-package() {
-  cd xf86-video-nouveau-${_gitdate}
-  make DESTDIR="$pkgdir" install
-}
diff --git a/staging/xf86-video-nouveau/xf86-video-nouveau.install b/staging/xf86-video-nouveau/xf86-video-nouveau.install
deleted file mode 100644
index 027154ff3..000000000
--- a/staging/xf86-video-nouveau/xf86-video-nouveau.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install () {
-   cat << _EOF
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 0.0.15_git20100117-1`" -lt 0 ]; then
-    cat << _EOF
-  ==> ATTENTION: Usermode support has been dropped
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
- fi
-}
diff --git a/staging/xfce4-session/PKGBUILD b/staging/xfce4-session/PKGBUILD
deleted file mode 100644
index 1a320ff4a..000000000
--- a/staging/xfce4-session/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 168748 2012-10-15 13:21:21Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfce4-session
-pkgver=4.10.0
-pkgrel=6
-pkgdesc="A session manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit'
-          'hicolor-icon-theme')
-makedepends=('intltool' 'xfce4-dev-tools')
-optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled'
-            'xscreensaver: for locking screen with xflock4'
-            'gnome-screensaver: for locking screen with xflock4'
-            'xlockmore: for locking screen with xflock4')
-replaces=('xfce-utils')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-session-4.10.0-add-systemd-support.patch)
-sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce'
-            'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8729
-  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch"
-
-  xdt-autogen
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --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/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
deleted file mode 100644
index 7ab637b26..000000000
--- a/staging/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
-index 4076586..90e7873 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.c
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include <config.h>
-+
-+#include <gio/gio.h>
-+#include <polkit/polkit.h>
-+
-+#include "xfsm-systemd.h"
-+
-+#define SYSTEMD_DBUS_NAME       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE  "org.freedesktop.login1.Manager"
-+#define SYSTEMD_REBOOT_ACTION   "org.freedesktop.login1.reboot"
-+#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off"
-+
-+struct _SystemdProxy {
-+        PolkitAuthority *authority;
-+        PolkitSubject *subject;
-+};
-+
-+SystemdProxy *
-+systemd_proxy_new (void)
-+{
-+        SystemdProxy *proxy;
-+
-+        proxy = g_new0 (SystemdProxy, 1);
-+
-+        proxy->authority = polkit_authority_get_sync (NULL, NULL);
-+        proxy->subject = polkit_unix_process_new (getpid());
-+
-+        return proxy;
-+}
-+
-+void
-+systemd_proxy_free (SystemdProxy *proxy)
-+{
-+        g_object_unref (proxy->authority);
-+        g_object_unref (proxy->subject);
-+
-+        g_free (proxy);
-+}
-+
-+gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error)
-+{
-+        PolkitAuthorizationResult *res;
-+        GError *local_error = NULL;
-+
-+        *can_method = FALSE;
-+        res = polkit_authority_check_authorization_sync (proxy->authority,
-+                                                         proxy->subject,
-+                                                         method,
-+                                                         NULL,
-+                                                         POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
-+                                                         NULL,
-+                                                         &local_error);
-+        if (res == NULL) {
-+                g_propagate_error (error, local_error);
-+                return FALSE;
-+        }
-+
-+        *can_method = polkit_authorization_result_get_is_authorized (res) ||
-+                       polkit_authorization_result_get_is_challenge (res);
-+
-+        g_object_unref (res);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error)
-+{
-+        GDBusConnection *bus;
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+        g_dbus_connection_call_sync (bus,
-+                                     SYSTEMD_DBUS_NAME,
-+                                     SYSTEMD_DBUS_PATH,
-+                                     SYSTEMD_DBUS_INTERFACE,
-+                                     method,
-+                                     g_variant_new ("(b)", TRUE),
-+                                     NULL, 0, G_MAXINT, NULL, NULL);
-+        g_object_unref (bus);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "Reboot", error);
-+}
-+
-+gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "PowerOff", error);
-+}
-diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
-index 3fa8317..2c4d868 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.h
-@@ -0,0 +1,42 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __SYSTEMD_PROXY_H__
-+#define __SYSTEMD_PROXY_H__
-+
-+#include <glib.h>
-+
-+G_BEGIN_DECLS
-+
-+typedef struct _SystemdProxy SystemdProxy;
-+
-+SystemdProxy *systemd_proxy_new (void);
-+void          systemd_proxy_free (SystemdProxy *proxy);
-+gboolean      systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error);
-+gboolean      systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error);
-+gboolean      systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error);
-+gboolean      systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error);
-+gboolean      systemd_proxy_restart (SystemdProxy *proxy, GError **error);
-+gboolean      systemd_proxy_shutdown (SystemdProxy *proxy, GError **error);
-+
-+G_END_DECLS
-+
-+#endif  /* __SYSTEMD_PROXY_H__ */
-
-commit 518a28c23f110617aad36e64c02cdab6a36adf37
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:21:14 2012 +0200
-
-    ...
-
-diff --git a/configure.in.in b/configure.in.in
-index 9aa4f8f..aa0b8bb 100644
---- a/configure.in
-+++ b/configure.in
-@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
- XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
- 
-+dnl systemd integration
-+AC_ARG_ENABLE([systemd],
-+              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-+              [with_systemd=$enableval],
-+              [with_systemd=auto])
-+PKG_CHECK_MODULES(SYSTEMD,
-+                  [libsystemd-login polkit-gobject-1],
-+                  [have_systemd=yes], [have_systemd=no])
-+AC_MSG_CHECKING([whether to use systemd])
-+if test x$with_systemd = xauto ; then
-+        if test x$have_systemd = xno ; then
-+                with_systemd=no
-+        else
-+                with_systemd=yes
-+        fi
-+fi
-+AC_MSG_RESULT($with_systemd)
-+if test x$with_systemd = xyes; then
-+        if test x$have_systemd = xno; then
-+                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
-+        fi
-+        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-+fi
-+AC_SUBST(SYSTEMD_CFLAGS)
-+AC_SUBST(SYSTEMD_LIBS)
-+AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
-+
- dnl Check for debugging support
- XDT_FEATURE_DEBUG([xfsm_debug_default])
- 
-
-commit f1279eba9452f027a2037be77388767437161d51
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:18:16 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index 1429abd..077cdf3 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -96,7 +96,11 @@ struct _XfsmShutdown
- {
-   GObject __parent__;
- 
-+#ifdef HAVE_SYSTEMD
-+  SystemdProxy   *systemd_proxy;
-+#else
-   XfsmConsolekit *consolekit;
-+#endif
-   XfsmUPower     *upower;
- 
-   /* kiosk settings */
-@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
- {
-   XfceKiosk *kiosk;
- 
-+#ifdef HAVE_SYSTEMD
-+  shutdown->systemd_proxy = systemd_proxy_new ();
-+#else
-   shutdown->consolekit = xfsm_consolekit_get ();
-+#endif
-   shutdown->upower = xfsm_upower_get ();
-   shutdown->helper_state = SUDO_NOT_INITIAZED;
-   shutdown->helper_require_password = FALSE;
-@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object)
- {
-   XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
- 
-+#ifdef HAVE_SYSTEMD
-+  systemd_proxy_free (shutdown->systemd_proxy);
-+#else
-   g_object_unref (G_OBJECT (shutdown->consolekit));
-+#endif
-   g_object_unref (G_OBJECT (shutdown->upower));
- 
-   /* close down helper */
-@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_restart (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_restart (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_shutdown (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error))
-+#else
-   if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error))
-+#else
-   if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-
-commit 5aea3fb853683246a537a67423cf5b32076b8dfb
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:03:27 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
-index c015154..7e3b311 100644
---- a/xfce4-session/Makefile.am
-+++ b/xfce4-session/Makefile.am
-@@ -38,8 +38,6 @@ xfce4_session_SOURCES =							\
- 	xfsm-compat-gnome.h						\
- 	xfsm-compat-kde.c						\
- 	xfsm-compat-kde.h						\
--	xfsm-consolekit.c						\
--	xfsm-consolekit.h						\
- 	xfsm-dns.c							\
- 	xfsm-dns.h							\
- 	xfsm-error.c							\
-@@ -65,6 +63,16 @@ xfce4_session_SOURCES =							\
- 	xfsm-upower.c							\
- 	xfsm-upower.h
- 
-+if WITH_SYSTEMD
-+xfce4_session_SOURCES +=						\
-+	xfsm-systemd.c							\
-+	xfsm-systemd.h
-+else
-+xfce4_session_SOURCES +=						\
-+	xfsm-consolekit.c						\
-+	xfsm-consolekit.h
-+endif
-+
- xfce4_session_CFLAGS =							\
- 	$(LIBSM_CFLAGS)							\
- 	$(LIBX11_CFLAGS)						\
-@@ -72,6 +80,7 @@ xfce4_session_CFLAGS =							\
- 	$(DBUS_CFLAGS)							\
- 	$(DBUS_GLIB_CFLAGS)						\
- 	$(LIBWNCK_CFLAGS)						\
-+	$(SYSTEMD_CFLAGS)						\
- 	$(XFCONF_CFLAGS)						\
- 	$(GMODULE_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
-@@ -91,6 +100,7 @@ xfce4_session_LDADD =							\
- 	$(DBUS_LIBS)							\
- 	$(DBUS_GLIB_LIBS)						\
- 	$(LIBWNCK_LIBS)							\
-+	$(SYSTEMD_LIBS)							\
- 	$(XFCONF_LIBS)							\
- 	-lm
- 
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index d8757a8..1429abd 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -66,10 +66,13 @@
- #include <xfce4-session/xfsm-fadeout.h>
- #include <xfce4-session/xfsm-global.h>
- #include <xfce4-session/xfsm-legacy.h>
--#include <xfce4-session/xfsm-consolekit.h>
- #include <xfce4-session/xfsm-upower.h>
- 
--
-+#ifdef HAVE_SYSTEMD
-+#include <xfce4-session/xfsm-systemd.h>
-+#else
-+#include <xfce4-session/xfsm-consolekit.h>
-+#endif
- 
- static void xfsm_shutdown_finalize  (GObject      *object);
- static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
diff --git a/staging/xfce4-session/xfce4-session.install b/staging/xfce4-session/xfce4-session.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/staging/xfce4-session/xfce4-session.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD
deleted file mode 100644
index 2a0653191..000000000
--- a/staging/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 169351 2012-10-20 01:35:15Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.2.2
-pkgrel=3
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'ffmpeg' 'libxinerama')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
-             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu')
-optdepends=('imagemagick: for using the imagemagick plugin' \
-            'jack: for using the jack plugin' \
-            'vcdimager: for using the vcd plugin' \
-            'glu: for using the opengl plugin' \
-            'wavpack: for using the wavpack plugin' \
-            'faad2: for using the faad plugin' \
-            'libmng: for using the mng plugin' \
-            'aalib: for using the aalib plugin' \
-            'libmodplug: for using the modplug plugin' \
-            'libdca: for using the dca plugin' \
-            'a52dec: for using the a52 plugin' \
-            'libmad: for using the mp3 plugin' \
-            'libmpcdec: for using the musepack plugin' \
-            'libcaca: for using the caca plugin' \
-            'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin' \
-            'libvdpau: for using the VDPAU plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c')
-
-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/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch b/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch
deleted file mode 100644
index c036a0ec9..000000000
--- a/staging/xine-lib/xine-lib-1.2.1-ffmpeg.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-# HG changeset patch
-# User Edgar Hucek <ebsi4711@gmail.com>
-# Date 1327873178 -3600
-# Node ID 69983efb1c928e64cc1900579b98142cef0569c4
-# Parent  61f51ebc2659363e308bedb10b9fa4e71a60cedc
-fix compile against recent ffmpeg
-
-diff -r 61f51ebc2659 -r 69983efb1c92 src/combined/ffmpeg/ff_video_decoder.c
---- a/src/combined/ffmpeg/ff_video_decoder.c	Sat Feb 04 18:52:01 2012 +0000
-+++ b/src/combined/ffmpeg/ff_video_decoder.c	Sun Jan 29 22:39:38 2012 +0100
-@@ -130,7 +130,9 @@
- 
-   yuv_planes_t      yuv;
- 
-+#ifdef AVPaletteControl
-   AVPaletteControl  palette_control;
-+#endif
- 
- #ifdef LOG
-   enum PixelFormat  debug_fmt;
-@@ -218,7 +220,9 @@
-   /* We should really keep track of the ages of xine frames (see
-    * avcodec_default_get_buffer in libavcodec/utils.c)
-    * For the moment tell ffmpeg that every frame is new (age = bignumber) */
-+#ifdef AVFRAMEAGE
-   av_frame->age = 256*256*256*64;
-+#endif
- 
-   av_frame->type= FF_BUFFER_TYPE_USER;
- 
-@@ -1028,7 +1032,9 @@
-     memcpy(this->context->extradata, buf->decoder_info_ptr[2],
-       buf->decoder_info[2]);
- 
--  } else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
-+  }
-+#ifdef AVPaletteControl
-+  else if (buf->decoder_info[1] == BUF_SPECIAL_PALETTE) {
-     unsigned int i;
- 
-     palette_entry_t *demuxer_palette;
-@@ -1047,7 +1053,9 @@
-     }
-     decoder_palette->palette_changed = 1;
- 
--  } else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
-+  }
-+#endif
-+  else if (buf->decoder_info[1] == BUF_SPECIAL_RV_CHUNK_TABLE) {
-     int i;
- 
-     lprintf("BUF_SPECIAL_RV_CHUNK_TABLE\n");
-@@ -1794,7 +1802,9 @@
-   this->av_frame          = avcodec_alloc_frame();
-   this->context           = avcodec_alloc_context();
-   this->context->opaque   = this;
-+#ifdef AVPaletteControl
-   this->context->palctrl  = NULL;
-+#endif
- 
-   this->decoder_ok        = 0;
-   this->decoder_init_mode = 1;
-diff -r 61f51ebc2659 -r 69983efb1c92 src/combined/ffmpeg/ffmpeg_compat.h
---- a/src/combined/ffmpeg/ffmpeg_compat.h	Sat Feb 04 18:52:01 2012 +0000
-+++ b/src/combined/ffmpeg/ffmpeg_compat.h	Sun Jan 29 22:39:38 2012 +0100
-@@ -91,5 +91,9 @@
- #  define AVAUDIO 2
- #endif
- 
-+/* AVFrame.age */
-+#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1)
-+#  define AVFRAMEAGE 1
-+#endif
- 
- #endif /* XINE_AVCODEC_COMPAT_H */
diff --git a/staging/xorg-server/10-quirks.conf b/staging/xorg-server/10-quirks.conf
deleted file mode 100644
index 7afad22dc..000000000
--- a/staging/xorg-server/10-quirks.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Collection of quirks and blacklist/whitelists for specific devices.
-
-
-# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
-# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-Section "InputClass"
-        Identifier "ThinkPad HDAPS accelerometer blacklist"
-        MatchProduct "ThinkPad HDAPS accelerometer data"
-        Option "Ignore" "on"
-EndSection
diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD
deleted file mode 100644
index 03700888d..000000000
--- a/staging/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,196 +0,0 @@
-# $Id: PKGBUILD 168024 2012-10-05 12:03:57Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=xorg-server
-pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
-             'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
-             'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
-             'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt')
-options=('!libtool')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        autoconfig-nvidia.patch
-        autoconfig-sis.patch
-        xvfb-run
-        xvfb-run.1
-        10-quirks.conf)
-sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a'
-            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
-            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Use nouveau/nv/nvidia drivers for nvidia devices
-  patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
-
-  # Use unofficial imedia SiS driver for supported SiS devices
-  patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
-
-  autoreconf -fi
-  ./configure --prefix=/usr \
-      --enable-ipv6 \
-      --enable-dri \
-      --enable-dmx \
-      --enable-xvfb \
-      --enable-xnest \
-      --enable-composite \
-      --enable-xcsecurity \
-      --enable-xorg \
-      --enable-xephyr \
-      --enable-glx-tls \
-      --enable-kdrive \
-      --enable-kdrive-evdev \
-      --enable-kdrive-kbd \
-      --enable-kdrive-mouse \
-      --enable-install-setuid \
-      --enable-config-udev \
-      --disable-config-dbus \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --sysconfdir=/etc/X11 \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -i hw/Makefile
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev)
-  backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
-  # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
-  provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
-  groups=('xorg')
-  conflicts=('nvidia-utils<=290.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11"
-  mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/"
-  install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  rmdir "${pkgdir}/usr/share/X11"
-
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
-           xproto randrproto renderproto xextproto inputproto kbproto 
-           fontsproto pixman videoproto xf86driproto glproto 
-           mesa dri2proto xineramaproto libpciaccess
-           # not technically required but almost every Xorg pkg needs it to build
-           xorg-util-macros)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}
diff --git a/staging/xorg-server/autoconfig-nvidia.patch b/staging/xorg-server/autoconfig-nvidia.patch
deleted file mode 100644
index 6d5220ac7..000000000
--- a/staging/xorg-server/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1144,7 +1144,23 @@
-         int idx = 0;
- 
- #ifdef __linux__
--        driverList[idx++] = "nouveau";
-+	    switch (dev->device_id)
-+		{
-+		/* NV1 */
-+		case 0x0008:
-+		case 0x0009:
-+		    driverList[idx++] = "vesa";
-+		    break;
-+		/* NV3 */
-+		case 0x0018:
-+		case 0x0019:
-+		    driverList[idx++] = "nouveau";
-+		    break;
-+		default:
-+		    driverList[idx++] = "nouveau";
-+		    driverList[idx++] = "nvidia";
-+		    break;
-+		}
- #endif
-         driverList[idx++] = "nv";
-         break;
diff --git a/staging/xorg-server/autoconfig-sis.patch b/staging/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index 0b50049db..000000000
--- a/staging/xorg-server/autoconfig-sis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
-+++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
-@@ -1200,9 +1200,15 @@
-             break;
-         }
-         break;
--    case 0x1039:
--        driverList[0] = "sis";
--        break;
-+	case 0x1039:
-+	    switch (dev->device_id)
-+	    {
-+		case 0x6350: case 0x6351:
-+		    driverList[0] = "sisimedia"; driverList[1] = "sis"; break;
-+		default:
-+		    driverList[0] = "sis"; break;
-+	    }
-+	    break;
-     case 0x126f:
-         driverList[0] = "siliconmotion";
-         break;
diff --git a/staging/xorg-server/xvfb-run b/staging/xorg-server/xvfb-run
deleted file mode 100644
index 4c2f4e0d3..000000000
--- a/staging/xorg-server/xvfb-run
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Clean up files
-clean_up() {
-    if [ -e "$AUTHFILE" ]; then
-        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
-    fi
-    if [ -n "$XVFB_RUN_TMPDIR" ]; then
-        if ! rm -r "$XVFB_RUN_TMPDIR"; then
-            error "problem while cleaning up temporary directory"
-            exit 5
-        fi
-    fi
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! which xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
-    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-XVFBPID=$!
-sleep "$STARTWAIT"
-if ! kill -0 $XVFBPID 2>/dev/null; then
-  echo "Xvfb failed to start" >&2
-  exit 1
-fi
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/staging/xorg-server/xvfb-run.1 b/staging/xorg-server/xvfb-run.1
deleted file mode 100644
index 137d3a196..000000000
--- a/staging/xorg-server/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/staging/xorg-xdm/PKGBUILD b/staging/xorg-xdm/PKGBUILD
deleted file mode 100644
index 6da8b604c..000000000
--- a/staging/xorg-xdm/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 168625 2012-10-13 15:55:26Z andyrtr $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-xdm
-pkgver=1.1.11
-pkgrel=4
-pkgdesc="X Display Manager"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd')
-makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans')
-backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
-options=('!libtool')
-source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
-        Xsession-loginshell.patch
-        Xsession-xsm.patch
-        xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
-        xdm.pam
-        git_fixes.diff)
-sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
-            'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
-            '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
-            '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418'
-            '781b5577bb070220d018a11832d0d4a65fd16e130730ba26fb055c3aa68156b2')
-
-build() {
-  cd "${srcdir}/xdm-${pkgver}"
-  # upstream commits - Add some missing malloc failure checks 	2012-01-07
-  patch -Np1 -i "${srcdir}/git_fixes.diff"
-  
-  patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
-  patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
-  patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
-
-  autoreconf -fi
-  ./configure --prefix=/usr \
-      --disable-xdm-auth \
-      --disable-static \
-      --with-xdmconfigdir=/etc/X11/xdm \
-      --with-xdmscriptdir=/etc/X11/xdm \
-      --with-pixmapdir=/usr/share/xdm/pixmaps
-  make
-}
-
-package() {
-  cd "${srcdir}/xdm-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/var/lib/xdm"
-  install -m755 -d "${pkgdir}/etc/pam.d"
-  install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/*
-
-  sed -i 's|^Alias=.*|Alias=display-manager.service|' \
-    "$pkgdir/usr/lib/systemd/system/xdm.service"
-}
diff --git a/staging/xorg-xdm/Xsession-loginshell.patch b/staging/xorg-xdm/Xsession-loginshell.patch
deleted file mode 100644
index 3710752ef..000000000
--- a/staging/xorg-xdm/Xsession-loginshell.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/Xsession.cpp.orig	2008-06-21 13:57:36.000000000 +0000
-+++ config/Xsession.cpp	2008-06-21 14:01:25.000000000 +0000
-@@ -56,11 +56,7 @@
- resources=$HOME/.Xresources
- 
- if [ -s "$startup" ]; then
--	if [ -x "$startup" ]; then
--		exec "$startup"
--	else
--		exec /bin/sh "$startup"
--	fi
-+	exec /bin/sh -ls -c "$startup"
- else
- 	if [ -r "$resources" ]; then
- 		BINDIR/xrdb -load "$resources"
diff --git a/staging/xorg-xdm/Xsession-xsm.patch b/staging/xorg-xdm/Xsession-xsm.patch
deleted file mode 100644
index a2d4d6cc6..000000000
--- a/staging/xorg-xdm/Xsession-xsm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp
---- xdm-1.1.8-orig/config/Xsession.cpp	2008-05-21 14:08:45.000000000 -0400
-+++ xdm-1.1.8/config/Xsession.cpp	2009-04-28 02:56:11.000000000 -0400
-@@ -54,6 +54,7 @@
- 
- startup=$HOME/.xsession
- resources=$HOME/.Xresources
-+xinitrc=$HOME/.xinitrc
- 
- if [ -s "$startup" ]; then
- 	if [ -x "$startup" ]; then
-@@ -83,5 +84,9 @@
-                 exec `eval $XDESKTOP`
-         }
- #endif
--	exec BINDIR/xsm
-+	if [ -r "$xinitrc" ]; then
-+		exec /bin/sh -ls -c "$xinitrc"
-+	else
-+		exec /bin/sh -l /etc/X11/xinit/xinitrc
-+        fi
- fi
diff --git a/staging/xorg-xdm/git_fixes.diff b/staging/xorg-xdm/git_fixes.diff
deleted file mode 100644
index 69836d488..000000000
--- a/staging/xorg-xdm/git_fixes.diff
+++ /dev/null
@@ -1,673 +0,0 @@
-From 011a2710a69cd345a8ee3a6b2f15407b4c3b355a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sun, 25 Sep 2011 07:56:15 +0000
-Subject: Require xt >= 1.0 for appdefaultdir
-
-https://bugs.freedesktop.org/show_bug.cgi?id=7237
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/configure.ac b/configure.ac
-index b488f0c..a4222f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,7 +383,7 @@ PKG_CHECK_MODULES(AUTH, xau)
- # Greeter
- #
- 
--PKG_CHECK_MODULES(XDMGREET, xt x11 xext)
-+PKG_CHECK_MODULES(XDMGREET, xt >= 1.0 x11 xext)
- 
- GREETERLIB="${XDMLIBDIR}/libXdmGreet.so"
- AX_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library])
---
-cgit v0.9.0.2-2-gbebe
-From 618039261b0c7f14eb3b32c8f636464369724407 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 21 Sep 2011 02:11:20 +0000
-Subject: Mark some chars as const to fix gcc -Wwrite-strings warnings
-
-Can't fix all the warnings, due to the Xt API, but can fix a bunch.
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/greeter/greet.c b/greeter/greet.c
-index 539ce17..82e2c21 100644
---- a/greeter/greet.c
-+++ b/greeter/greet.c
-@@ -110,9 +110,9 @@ void    (*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NU
- void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL;
- int     (*__xdm_source)(char **environ, char *file) = NULL;
- char    **(*__xdm_defaultEnv)(void) = NULL;
--char    **(*__xdm_setEnv)(char **e, char *name, char *value) = NULL;
-+char    **(*__xdm_setEnv)(char **e, const char *name, const char *value) = NULL;
- char    **(*__xdm_putEnv)(const char *string, char **env) = NULL;
--char    **(*__xdm_parseArgs)(char **argv, char *string) = NULL;
-+char    **(*__xdm_parseArgs)(char **argv, const char *string) = NULL;
- void    (*__xdm_printEnv)(char **e) = NULL;
- char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL;
- void    (*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL;
-diff --git a/greeter/verify.c b/greeter/verify.c
-index ea62cd2..5d2ad17 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -61,7 +61,7 @@ from The Open Group.
- extern char *crypt(const char *, const char *);
- #endif
- 
--static char *envvars[] = {
-+static const char *envvars[] = {
-     "TZ",			/* SYSV and SVR4, but never hurts */
- #if defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)
-     "bootdev",
-@@ -94,8 +94,8 @@ static char **
- userEnv (struct display *d, int useSystemPath, char *user, char *home, char *shell)
- {
-     char	**env;
--    char	**envvar;
--    char	*str;
-+    const char	**envvar;
-+    const char	*str;
- 
-     env = defaultEnv ();
-     env = setEnv (env, "DISPLAY", d->name);
-diff --git a/include/dm.h b/include/dm.h
-index 316dd46..4085cae 100644
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -443,7 +443,7 @@ extern void UnsecureDisplay (struct display *d, Display *dpy);
- extern void execute(char **argv, char **environ);
- 
- /* server.c */
--extern char *_SysErrorMsg (int n);
-+extern const char *_SysErrorMsg (int n);
- extern int StartServer (struct display *d);
- extern int WaitForServer (struct display *d);
- extern void ResetServer (struct display *d);
-@@ -462,10 +462,10 @@ extern int Asprintf(char ** ret, const char *restrict format, ...)
-     _X_ATTRIBUTE_PRINTF(2,3);
- # endif
- extern char *localHostname (void);
--extern char **parseArgs (char **argv, char *string);
--extern char **setEnv (char **e, char *name, char *value);
-+extern char **parseArgs (char **argv, const char *string);
-+extern char **setEnv (char **e, const char *name, const char *value);
- extern char **putEnv(const char *string, char **env);
--extern char *getEnv (char **e, char *name);
-+extern char *getEnv (char **e, const char *name);
- extern void CleanUpChild (void);
- extern void freeArgs (char **argv);
- extern void freeEnv (char **env);
-@@ -478,7 +478,7 @@ extern int Verify (struct display *d, struct greet_info *greet, struct verify_in
- extern char *NetworkAddressToHostname (CARD16 connectionType, ARRAY8Ptr connectionAddress);
- extern int AnyWellKnownSockets (void);
- extern void DestroyWellKnownSockets (void);
--extern void SendFailed (struct display *d, char *reason);
-+extern void SendFailed (struct display *d, const char *reason);
- extern void StopDisplay (struct display *d);
- extern void WaitForChild (void);
- extern void WaitForSomething (void);
-diff --git a/include/greet.h b/include/greet.h
-index 6b6689e..0d607ba 100644
---- a/include/greet.h
-+++ b/include/greet.h
-@@ -65,9 +65,9 @@ struct dlfuncs {
-     void (*_DeleteXloginResources)(struct display *d, Display *dpy);
-     int (*_source)(char **environ, char *file);
-     char **(*_defaultEnv)(void);
--    char **(*_setEnv)(char **e, char *name, char *value);
-+    char **(*_setEnv)(char **e, const char *name, const char *value);
-     char **(*_putEnv)(const char *string, char **env);
--    char **(*_parseArgs)(char **argv, char *string);
-+    char **(*_parseArgs)(char **argv, const char *string);
-     void (*_printEnv)(char **e);
-     char **(*_systemEnv)(struct display *d, char *user, char *home);
-     void (*_LogOutOfMem)(const char * fmt, ...);
-@@ -149,9 +149,9 @@ extern	void    (*__xdm_SessionExit)(struct display *d, int status, int removeAut
- extern	void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy);
- extern	int     (*__xdm_source)(char **environ, char *file);
- extern	char    **(*__xdm_defaultEnv)(void);
--extern	char    **(*__xdm_setEnv)(char **e, char *name, char *value);
-+extern	char    **(*__xdm_setEnv)(char **e, const char *name, const char *value);
- extern	char    **(*__xdm_putEnv)(const char *string, char **env);
--extern	char    **(*__xdm_parseArgs)(char **argv, char *string);
-+extern	char    **(*__xdm_parseArgs)(char **argv, const char *string);
- extern	void    (*__xdm_printEnv)(char **e);
- extern	char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home);
- extern	void    (*__xdm_LogOutOfMem)(const char * fmt, ...);
-diff --git a/xdm/access.c b/xdm/access.c
-index d0850ad..7035375 100644
---- a/xdm/access.c
-+++ b/xdm/access.c
-@@ -667,7 +667,7 @@ scanHostlist (
- /* Returns non-0 iff string is matched by pattern.  Does case folding.
-  */
- static int
--patternMatch (char *string, char *pattern)
-+patternMatch (const char *string, char *pattern)
- {
-     int	    p, s;
- 
-diff --git a/xdm/auth.c b/xdm/auth.c
-index bbca167..9e5cba2 100644
---- a/xdm/auth.c
-+++ b/xdm/auth.c
-@@ -116,7 +116,7 @@ int chown(int a,int b,int c) {}
- 
- struct AuthProtocol {
-     unsigned short  name_length;
--    char	    *name;
-+    const char	    *name;
-     void	    (*InitAuth)(unsigned short len, char *name);
-     Xauth	    *(*GetAuth)(unsigned short len, char *name);
-     void	    (*GetXdmcpAuth)(
-diff --git a/xdm/file.c b/xdm/file.c
-index 6e929b8..7b7f3d3 100644
---- a/xdm/file.c
-+++ b/xdm/file.c
-@@ -225,7 +225,7 @@ ParseDisplay (char *source, DisplayType *acceptableTypes, int numAcceptable)
- }
- 
- static struct displayMatch {
--	char		*name;
-+	const char	*name;
- 	DisplayType	type;
- } displayTypes[] = {
- 	{ "local",		{ Local, Permanent, FromFile } },
-diff --git a/xdm/resource.c b/xdm/resource.c
-index ece4de3..83901a2 100644
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -145,10 +145,10 @@ int	choiceTimeout;	/* chooser choice timeout */
- #define DEF_UDP_PORT	"177"	    /* registered XDMCP port, dont change */
- 
- struct dmResources {
--	char	*name, *class;
--	int	type;
--	char	**dm_value;
--	char	*default_value;
-+	const char	*name, *class;
-+	int		type;
-+	char		**dm_value;
-+	const char	*default_value;
- } DmResources[] = {
- { "servers",	"Servers", 	DM_STRING,	&servers,
- 				DEF_SERVER_LINE} ,
-@@ -203,10 +203,10 @@ struct dmResources {
- #define boffset(f)	XtOffsetOf(struct display, f)
- 
- struct displayResource {
--	char	*name, *class;
--	int	type;
--	int	offset;
--	char	*default_value;
-+	const char	*name, *class;
-+	int		type;
-+	int		offset;
-+	const char	*default_value;
- };
- 
- /* resources for managing the server */
-@@ -289,15 +289,16 @@ XrmDatabase	DmResourceDB;
- 
- static void
- GetResource (
--    char    *name,
--    char    *class,
--    int	    valueType,
--    char    **valuep,
--    char    *default_value)
-+    const char    *name,
-+    const char    *class,
-+    int            valueType,
-+    char         **valuep,
-+    const char    *default_value)
- {
-     char	*type;
-     XrmValue	value;
--    char	*string, *new_string;
-+    const char	*string;
-+    char	*new_string;
-     char	str_buf[50];
-     int	len;
- 
-diff --git a/xdm/server.c b/xdm/server.c
-index 7fe55e6..1bb8873 100644
---- a/xdm/server.c
-+++ b/xdm/server.c
-@@ -62,9 +62,9 @@ CatchUsr1 (int n)
-     errno = olderrno;
- }
- 
--char *_SysErrorMsg (int n)
-+const char *_SysErrorMsg (int n)
- {
--    char *s = strerror(n);
-+    const char *s = strerror(n);
-     return (s ? s : "unknown error");
- }
- 
-diff --git a/xdm/util.c b/xdm/util.c
-index 033633a..60aab21 100644
---- a/xdm/util.c
-+++ b/xdm/util.c
-@@ -97,7 +97,7 @@ printEnv (char **e)
- }
- 
- static char *
--makeEnv (char *name, char *value)
-+makeEnv (const char *name, const char *value)
- {
- 	char	*result;
- 
-@@ -111,7 +111,7 @@ makeEnv (char *name, char *value)
- }
- 
- char *
--getEnv (char **e, char *name)
-+getEnv (char **e, const char *name)
- {
- 	int	l = strlen (name);
- 
-@@ -127,7 +127,7 @@ getEnv (char **e, char *name)
- }
- 
- char **
--setEnv (char **e, char *name, char *value)
-+setEnv (char **e, const char *name, const char *value)
- {
- 	char	**new, **old;
- 	char	*newe;
-@@ -207,9 +207,9 @@ freeEnv (char **env)
- #define isblank(c)	((c) == ' ' || c == '\t')
- 
- char **
--parseArgs (char **argv, char *string)
-+parseArgs (char **argv, const char *string)
- {
--	char	*word;
-+	const char *word;
- 	char	*save;
- 	char    **newargv;
- 	int	i;
-diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
-index 4b945cf..66804a4 100644
---- a/xdm/xdmauth.c
-+++ b/xdm/xdmauth.c
-@@ -44,7 +44,7 @@ static char	auth_name[256];
- static int	auth_name_len;
- 
- static void
--XdmPrintDataHex (char *s, char *a, int l)
-+XdmPrintDataHex (const char *s, const char *a, int l)
- {
-     int	i;
- 
-@@ -56,7 +56,7 @@ XdmPrintDataHex (char *s, char *a, int l)
- 
- # ifdef XDMCP
- static void
--XdmPrintArray8Hex (char *s, ARRAY8Ptr a)
-+XdmPrintArray8Hex (const char *s, ARRAY8Ptr a)
- {
-     XdmPrintDataHex (s, (char *) a->data, a->length);
- }
-diff --git a/xdm/xdmcp.c b/xdm/xdmcp.c
-index 5bc4716..1c34e7c 100644
---- a/xdm/xdmcp.c
-+++ b/xdm/xdmcp.c
-@@ -74,7 +74,7 @@ static void request_respond (struct sockaddr *from, int fromlen, int length, int
- static void send_accept (struct sockaddr *to, int tolen, CARD32 sessionID, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr authorizationName, ARRAY8Ptr authorizationData, int fd);
- static void send_alive (struct sockaddr *from, int fromlen, int length, int fd);
- static void send_decline (struct sockaddr *to, int tolen, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr status, int fd);
--static void send_failed (struct sockaddr *from, int fromlen, char *name, CARD32 sessionID, char *reason, int fd);
-+static void send_failed (struct sockaddr *from, int fromlen, const char *name, CARD32 sessionID, const char *reason, int fd);
- static void send_refuse (struct sockaddr *from, int fromlen, CARD32 sessionID, int fd);
- static void send_unwilling (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
- static void send_willing (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
-@@ -1300,7 +1300,7 @@ abort:
- void
- SendFailed (
-     struct display  *d,
--    char	    *reason)
-+    const char	    *reason)
- {
-     Debug ("Display start failed, sending Failed\n");
-     send_failed ((struct sockaddr *)(d->from), d->fromlen, d->name,
-@@ -1311,9 +1311,9 @@ static void
- send_failed (
-     struct sockaddr *from,
-     int		    fromlen,
--    char	    *name,
-+    const char	    *name,
-     CARD32	    sessionID,
--    char	    *reason,
-+    const char	    *reason,
-     int		    fd)
- {
-     static char	buf[256];
-@@ -1416,7 +1416,7 @@ NetworkAddressToHostname (
- # else
- 	    char dotted[20];
- # endif
--	    char *local_name = "";
-+	    const char *local_name = "";
- 	    int af_type;
- 
- # if defined(IPv6) && defined(AF_INET6)
---
-cgit v0.9.0.2-2-gbebe
-From c43eb799774743bc50233eff6643c51a5fbe6899 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 21 Sep 2011 02:22:48 +0000
-Subject: Fix warnings about printing longs with int type format strings
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/xdm/dm.c b/xdm/dm.c
-index cd0ee25..7bc2605 100644
---- a/xdm/dm.c
-+++ b/xdm/dm.c
-@@ -536,7 +536,7 @@ WaitForChild (void)
- 		  time(&now);
- 		  crash = d->lastReserv &&
- 		    ((now - d->lastReserv) < XDM_BROKEN_INTERVAL);
--		  Debug("time %i %i try %i of %i%s\n", now, d->lastReserv,
-+		  Debug("time %li %li try %i of %i%s\n", now, d->lastReserv,
- 			d->reservTries, d->reservAttempts,
- 			crash ? " crash" : "");
- 
-diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
-index 66804a4..b3c1c16 100644
---- a/xdm/xdmauth.c
-+++ b/xdm/xdmauth.c
-@@ -234,7 +234,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARRAY8Ptr displayID)
- 	if (line[0] == '#' || sscanf (line, "%s %s", id, key) != 2)
- 	    continue;
- 	bzero(line, sizeof(line));
--	Debug ("Key entry for \"%s\" %d bytes\n", id, strlen(key));
-+	Debug ("Key entry for \"%s\" %ld bytes\n", id, strlen(key));
- 	if (strlen (id) == displayID->length &&
- 	    !strncmp (id, (char *)displayID->data, displayID->length))
- 	{
---
-cgit v0.9.0.2-2-gbebe
-From 8eee942be0db913511b4c53f94829e1201dfdf00 Mon Sep 17 00:00:00 2001
-From: Michał Górny <mgorny@gentoo.org>
-Date: Wed, 28 Sep 2011 19:25:17 +0000
-Subject: Support systemd startup notification.
-
-If libsystemd-daemon support is enabled, xdm uses it to announce its
-startup as soon as the session is established. This gives the user
-opportunity to delay I/O-intensive operations until the X server is
-started so that they would not interfere with its loading while keeping
-the machine busy when user types in his/her login.
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/Makefile.am b/Makefile.am
-index e5f9f5c..bb6b51c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,8 +43,13 @@ endif LINT
- if HAVE_SYSTEMD
- systemdsystemunit_DATA = xdm.service
- 
--xdm.service: xdm.service.in
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < $< > $@
-+xdm.service: xdm.service.in Makefile
-+if USE_SYSTEMD_DAEMON
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
-+else !USE_SYSTEMD_DAEMON
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
-+endif !USE_SYSTEMD_DAEMON
-+
- endif HAVE_SYSTEMD
- CLEANFILES = xdm.service
- EXTRA_DIST = xdm.service.in
-diff --git a/configure.ac b/configure.ac
-index a4222f1..fcb37f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,6 +146,7 @@ if test "x$USE_SELINUX" != "xno" ; then
- fi
- 
- # Check whether to install systemd unit files, as suggested in daemon(7).
-+# When a full path is specified, this does not require systemd installed.
- AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
- 	[Directory for systemd service files (default from the System and Service Manager)]),,
- 	[with_systemdsystemunitdir=auto])
-@@ -166,6 +167,21 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
- ])
- AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
- 
-+# Check whether to enable systemd startup notification.
-+# This requires libsystemd-daemon.
-+AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
-+	[Add support for systemd startup notification (default is autodetected)]),
-+	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
-+AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-+	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
-+	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
-+	)]
-+    )
-+])
-+AM_CONDITIONAL(USE_SYSTEMD_DAEMON, [test "x$USE_SYSTEMD_DAEMON" != "xno"])
-+
- # FIXME: Find better test for which OS'es use su -m  - for now, just try to
- # mirror the Imakefile setting of:
- # if  defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
-diff --git a/xdm.service.in b/xdm.service.in
-index d15e072..e782dd9 100644
---- a/xdm.service.in
-+++ b/xdm.service.in
-@@ -4,6 +4,8 @@ After=systemd-user-sessions.service
- 
- [Service]
- ExecStart=BINDIR/xdm -nodaemon
-+Type=notify
-+NotifyAccess=all
- 
- [Install]
- Alias=graphical.target.wants/xdm.service
-diff --git a/xdm/Makefile.am b/xdm/Makefile.am
-index aa9765c..797b5c5 100644
---- a/xdm/Makefile.am
-+++ b/xdm/Makefile.am
-@@ -22,11 +22,11 @@
- bin_PROGRAMS = xdm
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include
--AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS)
-+AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
- 
- # The xdm binary needs to export symbols so that they can be used from
- # libXdmGreet.so loaded through a dlopen call from session.c
--AM_LDFLAGS = $(XDM_LIBS) -export-dynamic
-+AM_LDFLAGS = $(XDM_LIBS) $(SYSTEMD_DAEMON_LIBS) -export-dynamic
- 
- xdm_SOURCES =		\
-         access.c	\
-diff --git a/xdm/session.c b/xdm/session.c
-index 5fd47f0..573747d 100644
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -81,6 +81,10 @@ extern int key_setnet(struct key_netstarg *arg);
- #  define RTLD_NOW 1
- # endif
- 
-+#ifdef USE_SYSTEMD_DAEMON
-+#include <systemd/sd-daemon.h>
-+#endif
-+
- #ifdef USE_SELINUX
- /* This should be run just before we exec the user session. */
- static int
-@@ -349,6 +353,12 @@ ManageSession (struct display *d)
- 	exit(UNMANAGE_DISPLAY);
- 	}
- 
-+#ifdef USE_SYSTEMD_DAEMON
-+	/* Subsequent notifications will be ignored by systemd
-+	 * and calling this function will clean up the env */
-+	sd_notify(1, "READY=1");
-+#endif
-+
-     /* tell the possibly dynamically loaded greeter function
-      * what data structure formats to expect.
-      * These version numbers are registered with The Open Group. */
---
-cgit v0.9.0.2-2-gbebe
-From 284532c0884893728b75ca37f5d2a9a33f7bc8db Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sat, 22 Oct 2011 15:14:46 +0000
-Subject: greeter: link against -lXrender if xft is enabled
-
-XmuCvtStringToXftColor uses XRenderParseColor, so require xrender for
-the xft option, and link against it.
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/configure.ac b/configure.ac
-index fcb37f8..d20ae28 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -345,10 +345,10 @@ AC_ARG_WITH(xft,
- 	AS_HELP_STRING([--with-xft],
- 			[Use Xft to draw text (default is YES if installed)]),
- 	[USE_XFT="$withval"],
--	PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]))
-+	PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"]))
- 
- if test "x$USE_XFT" = "xyes" ; then
--	PKG_CHECK_MODULES(XFT, xft)
-+	PKG_CHECK_MODULES(XFT, xft xrender)
- 	GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
- 	GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
- 	AC_DEFINE([USE_XFT], 1,
-diff --git a/greeter/Login.c b/greeter/Login.c
-index 99a3932..d899376 100644
---- a/greeter/Login.c
-+++ b/greeter/Login.c
-@@ -86,6 +86,10 @@ from The Open Group.
- # include <X11/extensions/Xinerama.h>
- #endif
- 
-+#ifdef USE_XFT
-+# include <X11/extensions/Xrender.h>
-+#endif
-+
- #ifndef DEBUG
- # define XDM_ASSERT(a)	/* do nothing */
- #else
---
-cgit v0.9.0.2-2-gbebe
-From a02edebf21aae37f8564d7b9fad01d5d2942ad8d Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Mon, 07 Nov 2011 16:01:44 +0000
-Subject: Fix build outside of source dir. Fixes distcheck too.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/Makefile.am b/Makefile.am
-index bb6b51c..e9da40f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -45,9 +45,9 @@ systemdsystemunit_DATA = xdm.service
- 
- xdm.service: xdm.service.in Makefile
- if USE_SYSTEMD_DAEMON
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < ${srcdir}/xdm.service.in > $@
- else !USE_SYSTEMD_DAEMON
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < ${srcdir}/xdm.service.in > $@
- endif !USE_SYSTEMD_DAEMON
- 
- endif HAVE_SYSTEMD
---
-cgit v0.9.0.2-2-gbebe
-From ad7a54288f62c0266540279dac775ebee68f092e Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Thu, 15 Dec 2011 21:14:23 +0000
-Subject: replace <varargs.h> by <stdarg.h>. Spotted my Marco Peereboom with clang.
-
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
----
-diff --git a/greeter/verify.c b/greeter/verify.c
-index 5d2ad17..1221874 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -48,7 +48,7 @@ from The Open Group.
- # include	<errno.h>
- #elif defined(USE_BSDAUTH)
- # include	<login_cap.h>
--# include	<varargs.h>
-+# include	<stdarg.h>
- # include	<bsd_auth.h>
- #elif defined(USESECUREWARE)
- # include       <sys/types.h>
---
-cgit v0.9.0.2-2-gbebe
-From 78403f6a7420798bf24798811c8c6b936c9ccb34 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 07 Jan 2012 03:34:30 +0000
-Subject: Add some missing malloc failure checks
-
-Flagged by Solaris Studio 12.3 code analyzer
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/xdm/access.c b/xdm/access.c
-index 7035375..b16a066 100644
---- a/xdm/access.c
-+++ b/xdm/access.c
-@@ -304,6 +304,11 @@ tryagain:
-     if (!hostOrAlias)
- 	return NULL;
-     h = malloc (sizeof (DisplayEntry));
-+    if (!h)
-+    {
-+	LogOutOfMem ("ReadHostEntry: DisplayEntry\n");
-+	return NULL;
-+    }
-     h->hopCount = 1;
-     if (*hostOrAlias == ALIAS_CHARACTER)
-     {
-@@ -423,6 +428,11 @@ tryagain:
-     if (!displayOrAlias)
- 	return NULL;
-     d = malloc (sizeof (DisplayEntry));
-+    if (!d)
-+    {
-+	LogOutOfMem ("ReadDisplayEntry: DisplayEntry\n");
-+	return NULL;
-+    }
-     d->notAllowed = 0;
-     d->notBroadcast = 0;
-     d->chooser = 0;
-diff --git a/xdm/choose.c b/xdm/choose.c
-index 6f077eb..e5e003d 100644
---- a/xdm/choose.c
-+++ b/xdm/choose.c
-@@ -128,6 +128,11 @@ RememberIndirectClient (
- 	    connectionType == i->connectionType)
- 	    return 1;
-     i = malloc (sizeof (IndirectUsersRec));
-+    if (!i)
-+    {
-+	LogOutOfMem ("RememberIndirectClient\n");
-+	return 0;
-+    }
-     if (!XdmcpCopyARRAY8 (clientAddress, &i->client))
-     {
- 	free (i);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
deleted file mode 100644
index 195858883..000000000
--- a/staging/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- config/GiveConsole.sessreg-utmp-fix-bug177890	2006-07-24 04:20:10.000000000 -0400
-+++ config/GiveConsole	2006-07-24 04:21:16.000000000 -0400
-@@ -8,3 +8,5 @@
- # causing serious grief.
- #
- chown $USER /dev/console
-+exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
-+        -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/staging/xorg-xdm/xdm.pam b/staging/xorg-xdm/xdm.pam
deleted file mode 100644
index a0b601db6..000000000
--- a/staging/xorg-xdm/xdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-auth		required	pam_env.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
-session		required	pam_loginuid.so
--session	optional	pam_systemd.so
diff --git a/staging/xournal/PKGBUILD b/staging/xournal/PKGBUILD
deleted file mode 100644
index aa89c0c26..000000000
--- a/staging/xournal/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 162197 2012-06-23 11:44:10Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=xournal
-pkgver=0.4.6
-pkgrel=2
-pkgdesc='Notetaking and sketching application'
-url='http://xournal.sourceforge.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('4ebe79e3df7155d2a09c341537a639ac2332d4c8')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr LIBS='-lm -lz'
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install desktop-install
-}
diff --git a/staging/xournal/install b/staging/xournal/install
deleted file mode 100644
index dfcb68374..000000000
--- a/staging/xournal/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-mime-database usr/share/mime &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/staging/yp-tools/PKGBUILD b/staging/yp-tools/PKGBUILD
deleted file mode 100644
index 8fde2326b..000000000
--- a/staging/yp-tools/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161337 2012-06-10 01:13:12Z tomegun $
-# Mantainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=yp-tools
-pkgver=2.12
-pkgrel=3
-pkgdesc='Linux NIS Tools'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/yp-tools/'
-license=('GPL2')
-depends=('ypbind-mt')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'domainname.service')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/service/domainname.service"
-}
-md5sums=('ce1e06d86caa285fa8cd76fdf103f51e'
-         '8d354b76eb0df9a3b06637bfff87453b')
diff --git a/staging/yp-tools/domainname.service b/staging/yp-tools/domainname.service
deleted file mode 100644
index 035f767c8..000000000
--- a/staging/yp-tools/domainname.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=NIS Domainname
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nisdomainname
-ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME
-RemainAfterExit=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/staging/ypbind-mt/PKGBUILD b/staging/ypbind-mt/PKGBUILD
deleted file mode 100644
index 267ab3c3e..000000000
--- a/staging/ypbind-mt/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 161339 2012-06-10 01:25:30Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=5
-pkgdesc='Linux NIS daemon'
-url='http://www.linux-nis.org/nis/ypbind-mt/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'nisdomainname.conf'
-        'ypbind.conf'
-        'ypbind'
-	'ypbind.service')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--enable-dbus-nm \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
-	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
-	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
-	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
-	install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service
-	install -d -m755 "${pkgdir}"/var/yp/binding
-}
-md5sums=('692f68ed0476762be4228ce543a5b791'
-         'e83a85291ea2ee152a78f2c16b0b1185'
-         '229309a989abad27703ac2e6d07dc7ae'
-         '1f7a4c80414d580c9afb3a08267beed0'
-         '88a721095e334cd442f4649a151ba9be')
diff --git a/staging/ypbind-mt/nisdomainname.conf b/staging/ypbind-mt/nisdomainname.conf
deleted file mode 100644
index bbbbf8fc7..000000000
--- a/staging/ypbind-mt/nisdomainname.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# NIS domain to be set in /etc/rc.d/ypbind
-#
-NISDOMAINNAME=""
diff --git a/staging/ypbind-mt/ypbind b/staging/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/staging/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
-	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac
diff --git a/staging/ypbind-mt/ypbind.conf b/staging/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/staging/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""
diff --git a/staging/ypbind-mt/ypbind.service b/staging/ypbind-mt/ypbind.service
deleted file mode 100644
index c59231000..000000000
--- a/staging/ypbind-mt/ypbind.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=YP Bind
-Requires=rpcbind.service domainname.service
-After=rpcbind.service domainname.service network.target
-Before=systemd-user-sessions.service
-
-[Service]
-Type=forking
-PIDFile=/run/ypbind.pid
-ExecStart=/usr/sbin/ypbind
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/akonadi/PKGBUILD b/testing/akonadi/PKGBUILD
deleted file mode 100644
index b05aca121..000000000
--- a/testing/akonadi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 164624 2012-08-01 14:43:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=akonadi
-pkgver=1.8.0
-pkgrel=1
-pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
-arch=('i686' 'x86_64')
-url='http://pim.kde.org/akonadi'
-license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('81156d883b40241cfc0ddb885f55bcfe')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/akonadi/akonadi.install b/testing/akonadi/akonadi.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/testing/akonadi/akonadi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/alsa-plugins/PKGBUILD b/testing/alsa-plugins/PKGBUILD
deleted file mode 100644
index 7f27f3f21..000000000
--- a/testing/alsa-plugins/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 163052 2012-07-06 15:20:44Z ibiru $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Daniel Ehlers <danielehlers@mindeye.net>
-
-pkgname=alsa-plugins
-pkgver=1.0.25
-pkgrel=2
-pkgdesc="Extra alsa plugins"
-arch=(i686 x86_64)
-url="http://www.alsa-project.org"
-license=(GPL)
-depends=(alsa-lib)
-makedepends=(libpulse jack ffmpeg)
-optdepends=('libpulse: PulseAudio plugin'
-            'jack: Jack plugin'
-            'ffmpeg: libavcodec resampling plugin'
-            'libsamplerate: libsamplerate resampling plugin'
-            'speex: libspeexdsp resampling plugin')
-options=('!libtool')
-source=("ftp://ftp.alsa-project.org/pub/plugins/$pkgname-$pkgver.tar.bz2"
-        alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
-        alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch)
-md5sums=('038c023eaa51171f018fbf7141255185'
-         '50d9adcda20756d063e676a563c201d9'
-         '697c6275f678d86ded2e5092d8a154c9')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
-  patch -Np1 -i ../alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  install -m644 doc/README* doc/*.txt "$pkgdir/usr/share/doc/$pkgname/"
-}
diff --git a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch b/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
deleted file mode 100644
index cce4f7e7e..000000000
--- a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-obsolete-avcodec_init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r alsa-plugins-1.0.25/a52/pcm_a52.c alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c
---- alsa-plugins-1.0.25/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
-+++ alsa-plugins-1.0.25-ffmpeg/a52/pcm_a52.c	2012-06-09 00:42:52.177219012 +0200
-@@ -702,7 +702,6 @@
- 	rec->channels = channels;
- 	rec->format = format;
- 
--	avcodec_init();
- 	avcodec_register_all();
- 
- 	rec->codec = avcodec_find_encoder_by_name("ac3_fixed");
diff --git a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch b/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
deleted file mode 100644
index f4ebbf466..000000000
--- a/testing/alsa-plugins/alsa-plugins-1.0.25-ffmpeg-0.11-renamed-CH_LAYOUT-defs-v2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Ffmpeg 0.11 (LIBAVCODEC_VERSION_MAJOR = 54) removed the CH_LAYOUT_* aliases for 
-the AV_CH_LAYOUT_* defines.
-
-diff -pru alsa-plugins-1.0.25-original/a52/pcm_a52.c alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c
---- alsa-plugins-1.0.25-original/a52/pcm_a52.c	2012-01-25 08:57:07.000000000 +0100
-+++ alsa-plugins-1.0.25-for-ffmpeg-0.11/a52/pcm_a52.c	2012-06-01 14:59:47.096671464 +0200
-@@ -441,7 +441,21 @@ static int a52_prepare(snd_pcm_ioplug_t
- #else
-   rec->avctx->sample_fmt = SAMPLE_FMT_S16;
- #endif
--#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
-+#if (LIBAVCODEC_VERSION_MAJOR >= 54)
-+	switch (io->channels) {
-+	case 2:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
-+		break;
-+	case 4:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
-+		break;
-+	case 6:
-+		rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
-+		break;
-+	default:
-+		break;
-+	}
-+#elif (LIBAVCODEC_VERSION_MAJOR > 52 && LIBAVCODEC_VERSION_MAJOR < 54) || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
-	switch (io->channels) {
- 	case 2:
- 		rec->avctx->channel_layout = CH_LAYOUT_STEREO;
diff --git a/testing/amarok/PKGBUILD b/testing/amarok/PKGBUILD
deleted file mode 100644
index 214f7f200..000000000
--- a/testing/amarok/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 163053 2012-07-06 15:20:55Z ibiru $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=amarok
-replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
-pkgver=2.5.0
-pkgrel=5
-pkgdesc="The powerful music player for KDE"
-arch=("i686" "x86_64")
-url="http://amarok.kde.org"
-license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
-        'liblastfm' 'ffmpeg' 'libofa' 'qjson')
-makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
-             'libmygpo-qt')
-optdepends=("libgpod: support for Apple iPod audio devices"
-	        "libmtp: support for portable media devices"
-        	"loudmouth: backend needed by mp3tunes for syncing"
-            "ifuse: support for Apple iPod Touch and iPhone"
-            "libmygpo-qt: gpodder.net Internet Service")
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-	"toolbarfix.patch"
-	"amarok-2.5.0-ffmpeg-fixes.patch"
-	"contextviewfix.patch")
-sha1sums=('9849900d20225e703c43d242650a8fa211cf15f2'
-          'd22bc6a36a33ea12035ebbb8959d1fdfbb39275f'
-          '61193ccc48e9f99b4856eef27fe7a4aaf465feec'
-          'a95e3bfb177adacc268552ae479dd88b70f5f9e1')
-
-build() {
-  cd "${srcdir}"
-
-  patch -Np0 -i "${srcdir}"/toolbarfix.patch
-  patch -Np0 -i "${srcdir}"/amarok-2.5.0-ffmpeg-fixes.patch
-
-  pushd ${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}"/contextviewfix.patch # FS#30448
-  popd
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package(){
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch b/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch
deleted file mode 100644
index 602fe47f5..000000000
--- a/testing/amarok/amarok-2.5.0-ffmpeg-fixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -upr amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp
---- amarok-2.5.0.orig/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:12:22.000000000 +0300
-+++ amarok-2.5.0/src/musicbrainz/MusicDNSAudioDecoder.cpp	2012-06-07 16:14:56.000000000 +0300
-@@ -136,7 +136,7 @@ MusicDNSAudioDecoder::run()
-     foreach( Meta::TrackPtr track, m_tracks )
-     {
-         //TODO replace with "avformat_open_input" since av_open_input_file is deprecated
--        if( av_open_input_file( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, 0, NULL ) )
-+        if( avformat_open_input( &pFormatCtx, ( const char * )track->playableUrl().toLocalFile().toAscii(), NULL, NULL ) )
-         {
-             warning() << QLatin1String( "Unable to open input file: " ) + track->playableUrl().toLocalFile();
-             continue;
-@@ -259,4 +259,4 @@ MusicDNSAudioDecoder::run()
- }
- 
- 
--#include "MusicDNSAudioDecoder.moc"
-\ No newline at end of file
-+#include "MusicDNSAudioDecoder.moc"
diff --git a/testing/amarok/amarok.install b/testing/amarok/amarok.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/amarok/amarok.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/amarok/contextviewfix.patch b/testing/amarok/contextviewfix.patch
deleted file mode 100644
index 2363b623c..000000000
--- a/testing/amarok/contextviewfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-index a23305f..8fa6f9b 100644
---- a/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-+++ b/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
-@@ -129,7 +129,8 @@ Context::VerticalToolbarContainment::updateGeometry()
-     if(!view())
-         return;
- 
--    QRectF rect = view()->sceneRect();
-+    // mimic ContextView::resizeEvent(), nothing else seems to work, bug 292895
-+    QRectF rect( view()->pos(), view()->maximumViewportSize() );
-     setGeometry( rect );
-     m_applets->setGeometry( rect );
-     m_applets->refresh();
\ No newline at end of file
diff --git a/testing/amarok/toolbarfix.patch b/testing/amarok/toolbarfix.patch
deleted file mode 100644
index ec012ca74..000000000
--- a/testing/amarok/toolbarfix.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.cpp	2012-01-29 20:20:01.901360205 +0100
-@@ -108,6 +108,17 @@ Context::AppletToolbar::appletRemoved( P
-     }
- }
- 
-+void Context::AppletToolbar::setContainment( Containment * containment )
-+{
-+    m_cont = containment;
-+}
-+
-+Context::Containment *
-+Context::AppletToolbar::containment() const
-+{
-+    return m_cont;
-+}
-+
- QSizeF
- Context::AppletToolbar::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
- {
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.orig
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.cpp.rej
-diff -rup amarok-2.5.0/src/context/toolbar/AppletToolbar.h amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h
---- amarok-2.5.0/src/context/toolbar/AppletToolbar.h	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/toolbar/AppletToolbar.h	2012-01-29 20:17:52.414686784 +0100
-@@ -55,6 +55,9 @@ class AppletToolbar : public QGraphicsWi
-         
-         void appletRemoved( Plasma::Applet* applet );
- 
-+        void setContainment( Containment * containment );
-+        Containment* containment() const;
-+
-     signals:
-         void showApplet( Plasma::Applet* );
-         void appletAddedToToolbar( Plasma::Applet* applet, int loc );
-Only in amarok-2.5.0.new/src/context/toolbar: AppletToolbar.h.orig
-diff -rup amarok-2.5.0/src/context/ToolbarView.cpp amarok-2.5.0.new/src/context/ToolbarView.cpp
---- amarok-2.5.0/src/context/ToolbarView.cpp	2011-12-15 08:36:48.000000000 +0100
-+++ amarok-2.5.0.new/src/context/ToolbarView.cpp	2012-01-29 20:17:52.394686782 +0100
-@@ -74,7 +74,9 @@ Context::ToolbarView::ToolbarView( Plasm
-     setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
- 
-     // now we create the toolbar
--    m_toolbar = new AppletToolbar( containment );
-+    m_toolbar = new AppletToolbar(0);
-+    scene->addItem(m_toolbar.data());
-+    m_toolbar.data()->setContainment( qobject_cast<Context::Containment *>(containment) );
-     m_toolbar.data()->setZValue( m_toolbar.data()->zValue() + 1000 );
-     m_toolbar.data()->setPos( TOOLBAR_X_OFFSET, 0 );
- 
-@@ -96,7 +98,7 @@ Context::ToolbarView::ToolbarView( Plasm
- 
- Context::ToolbarView::~ToolbarView()
- {
--
-+    delete m_toolbar.data();
- }
- 
- void
-Only in amarok-2.5.0.new/src/context: ToolbarView.cpp.orig
diff --git a/testing/anjuta-extras/PKGBUILD b/testing/anjuta-extras/PKGBUILD
deleted file mode 100644
index 7789902d5..000000000
--- a/testing/anjuta-extras/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169278 2012-10-18 19:45:48Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=anjuta-extras
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Anjuta Integrated Development Environment extra plugins"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('anjuta')
-makedepends=('intltool' 'gnome-doc-utils')
-install=anjuta-extras.install
-url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('69df64e6e13a6e0683ebaee5a26ee9b9368eda9ed157607d1e6935b52d7f0b9c')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/anjuta-extras/anjuta-extras.install b/testing/anjuta-extras/anjuta-extras.install
deleted file mode 100644
index a96048c1d..000000000
--- a/testing/anjuta-extras/anjuta-extras.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/anjuta/PKGBUILD b/testing/anjuta/PKGBUILD
deleted file mode 100644
index 18dbfb6c4..000000000
--- a/testing/anjuta/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 169303 2012-10-18 23:51:08Z heftig $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Harley Laue <losinggeneration@yahoo.com>
-
-pkgbase=anjuta
-pkgname=('libanjuta' 'anjuta')
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GNOME Integrated Development Environment (IDE)"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
-url="http://www.anjuta.org/"
-source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('fd1e380f26bfdcf49661d6b8b2ab25eb3af44bca56aaa5f08c4d9af72cd9d98b')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package_libanjuta(){
-  pkgdesc="Anjuta runtime library"
-  depends=('gdl')
-  conflicts=('anjuta<3.4.4')
-
-  cd "$pkgbase-$pkgver/libanjuta"
-
-  # j1: Race during linking
-  make -j1 DESTDIR="$pkgdir" install
-}
-
-package_anjuta(){
-  pkgdesc="GNOME Integrated Development Environment (IDE)"
-  depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf')
-
-  install=anjuta.install
-
-  cd "$pkgbase-$pkgver"
-  make -j1 DESTDIR="$pkgdir" install
-
-  cd libanjuta
-  make -j1 DESTDIR="$pkgdir" uninstall
-  
-  sed -i "1s|#!/usr/bin/python$|&2|" \
-    $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py
-}
diff --git a/testing/anjuta/anjuta.install b/testing/anjuta/anjuta.install
deleted file mode 100644
index 5608d35be..000000000
--- a/testing/anjuta/anjuta.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/asymptote/PKGBUILD b/testing/asymptote/PKGBUILD
deleted file mode 100644
index 42ebbfb05..000000000
--- a/testing/asymptote/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168270 2012-10-07 11:20:35Z remy $
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Firmicus <francois.archlinux.org>
-# Contributor: bender02 at gmx dot com
-
-pkgname=asymptote
-pkgver=2.20
-pkgrel=1
-pkgdesc="A vector graphics language (like metapost)"
-arch=('i686' 'x86_64')
-url="http://asymptote.sourceforge.net/"
-license=("GPL3")
-depends=('texlive-core' 'gc' 'freeglut' 'glu' 'gsl' 'fftw' 'libsigsegv')
-makedepends=('ghostscript' 'imagemagick')
-optdepends=('python2:           for the xasy GUI'
-            'python-imaging:    for the xasy GUI'
-            'tix:               for the xasy GUI')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tgz)
-install=texlive.install
-sha1sums=('4c86ab71cff57a592944303b11d9bb6ec34f1cbd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --enable-gc=/usr \
-              --prefix=/usr \
-              --with-latex=/usr/share/texmf/tex/latex \
-              --with-context=/usr/share/texmf/tex/context
-  make all
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check-all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install-all
-  sed -i -e 's@env python@env python2@' ${pkgdir}/usr/share/asymptote/GUI/*.py
-  # this dir contains png files that are already embedded in the pdf documentation:
-  rm -rf ${pkgdir}/usr/share/info/asymptote
-}
diff --git a/testing/asymptote/texlive.install b/testing/asymptote/texlive.install
deleted file mode 100644
index a7e61f209..000000000
--- a/testing/asymptote/texlive.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-
-post_install() {
-  install-info ${info_dir}/asy-faq.info.gz ${info_dir}/dir
-  echo ">>> updating the filename database for texlive..."
-  mktexlsr --quiet usr/share/texmf
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  install-info --delete ${info_dir}/asy-faq.info.gz ${info_dir}/dir
-}
-
-post_remove() {
-  echo ">>> updating the filename database for texlive..."
-  mktexlsr --quiet usr/share/texmf
-}
diff --git a/testing/at-spi2-atk/PKGBUILD b/testing/at-spi2-atk/PKGBUILD
deleted file mode 100644
index e685a89d8..000000000
--- a/testing/at-spi2-atk/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169276 2012-10-18 19:29:51Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-atk
-pkgver=2.6.1
-pkgrel=1
-pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('at-spi2-core' 'libx11' 'atk' 'dconf')
-makedepends=('intltool')
-install=at-spi2-atk.install
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0a796c3635b23d094d488ac3aeee1bd785debfde433640687d4b17dfeaeb3398')
-
-build() {
-  cd $pkgname-$pkgver
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/at-spi2-atk/at-spi2-atk.install b/testing/at-spi2-atk/at-spi2-atk.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/at-spi2-atk/at-spi2-atk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/at-spi2-core/PKGBUILD b/testing/at-spi2-core/PKGBUILD
deleted file mode 100644
index 8318a2287..000000000
--- a/testing/at-spi2-core/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169275 2012-10-18 19:29:47Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=at-spi2-core
-pkgver=2.6.1
-pkgrel=1
-pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dbus-core' 'glib2' 'libxtst')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('cb087f0a9191422bc3f44c562a0dbfdf1c2266e45c267070aeb63b874e00f867')
-
-build() {
-  cd $pkgname-$pkgver
-
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force --install
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/at-spi2-core --disable-xevie
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/at/PKGBUILD b/testing/at/PKGBUILD
deleted file mode 100644
index cae92b487..000000000
--- a/testing/at/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168098 2012-10-05 19:23:53Z eric $
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Todd Musall <tmusall@comcast.net>
-
-pkgname=at
-pkgver=3.1.13
-pkgrel=2
-pkgdesc="AT and batch delayed command scheduling utility and daemon"
-arch=('i686' 'x86_64')
-url="http://packages.qa.debian.org/a/at.html"
-license=('GPL')
-depends=('pam')
-makedepends=('ssmtp')
-backup=('etc/at.deny')
-options=('!makeflags')
-source=(http://ftp.debian.org/debian/pool/main/a/at/at_${pkgver}.orig.tar.gz
-        atd atd.service)
-md5sums=('1da61af6c29e323abaaf13ee1a8dad79'
-         '35574e34829e7df07a3269d4ab646a29'
-         '33976a813f4fe7f5659354601044c6f8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --mandir=/usr/share/man  \
-              --with-jobdir=/var/spool/atd \
-              --with-atspool=/var/spool/atd
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make IROOT="${pkgdir}" docdir=/usr/share/doc install
-  install -D -m755 "${srcdir}/atd" "${pkgdir}/etc/rc.d/atd"
-  install -D -m644 "${srcdir}/atd.service" "${pkgdir}/usr/lib/systemd/system/atd.service"
-}
diff --git a/testing/at/atd b/testing/at/atd
deleted file mode 100644
index d10a46a3b..000000000
--- a/testing/at/atd
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/atd`
-case "$1" in
-  start)
-    stat_busy "Starting ATD Daemon"
-    [ -z "$PID" ] && /usr/sbin/atd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon atd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ATD Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon atd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/at/atd.service b/testing/at/atd.service
deleted file mode 100644
index ba359878c..000000000
--- a/testing/at/atd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=ATD daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/atd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/atk/PKGBUILD b/testing/atk/PKGBUILD
deleted file mode 100644
index 25686b87c..000000000
--- a/testing/atk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169279 2012-10-18 19:45:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=atk
-pkgver=2.6.0
-pkgrel=1
-pkgdesc="A library providing a set of interfaces for accessibility"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-url='http://www.gtk.org/'
-sha256sums=('eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/avidemux/PKGBUILD b/testing/avidemux/PKGBUILD
deleted file mode 100644
index 4f540d839..000000000
--- a/testing/avidemux/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 163075 2012-07-06 16:17:06Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=avidemux
-pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.5.6
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://fixounet.free.fr/avidemux/"
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack' 'libvorbis' 'sdl' 'libxv' \
-             'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
-             'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
-
-build() {
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON -D GTK=1 -D QT4=1 ..
-  make
-
-# plugin build expects libraries to be already installed; we fake a prefix
-# in build/ by symlinking all libraries to build/lib/
-  mkdir -p lib
-  cd lib
-  find ../avidemux -name '*.so*' | xargs ln -sft .
-  cd ../../plugins
-  mkdir build
-  cd build
-  cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR="${srcdir}/avidemux_${pkgver}" \
-    -D AVIDEMUX_CORECONFIG_DIR="${srcdir}/avidemux_${pkgver}/build/config" \
-    -D AVIDEMUX_INSTALL_PREFIX="${srcdir}/avidemux_${pkgver}/build" \
-    -D CMAKE_BUILD_TYPE=Release -D CMAKE_SKIP_RPATH=ON ..
-  make
-}
-
-package_avidemux-cli() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
-  depends=('libxml2' 'sdl' 'fontconfig' 'libvpx' 'libva')
-  optdepends=('lame: for the corresponding audio encoder plugin'
-              'faac: for the corresponding audio encoder plugin'
-              'faad2: for the corresponding audio decoder plugin'
-              'opencore-amr: for the corresponding audio decoder plugin'
-              'jack: for the corresponding audio device plugin'
-              'libpulse: for the corresponding audio device plugin'
-              'sdl: for the corresponding audio device plugin'
-              'x264: for the corresponding video encoder plugin'
-              'xvidcore: for the corresponding video encoder plugin')
-  provides=('avidemux')
-  conflicts=('avidemux')
-  replaces=('avidemux')
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
-  make DESTDIR="${pkgdir}" install
-  rm -r "${pkgdir}"/usr/share/avidemux
-  rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
-  rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/xvid/*{Gtk,Qt}.so
-  rm "${pkgdir}"/usr/lib/ADM_plugins/videoFilter/*{_gtk,_qt4}.so
-
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_xvid.so "${pkgdir}/usr/lib/libADM_vidEnc_xvid.so"
-  ln -s /usr/lib/ADM_plugins/videoEncoder/libADM_vidEnc_x264.so "${pkgdir}/usr/lib/libADM_vidEnc_x264.so"
-
-  install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png"
-  install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1"
-}
-
-package_avidemux-gtk() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - GTK GUI"
-  depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
-
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_gtk,Gtk}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/gtk/*Gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_gtk.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -D -m644 avidemux2-gtk.desktop "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-  sed -i "s|\[\$e\]||" "${pkgdir}/usr/share/applications/avidemux-gtk.desktop"
-}
-
-package_avidemux-qt() {
-  pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
-  depends=("avidemux-cli=${pkgver}" 'qt')
-  install=avidemux.install
-
-  cd "${srcdir}/${pkgbase}_${pkgver}"
-  install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
-  install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
-
-  install -D -m755 build/lib/*{_qt4,QT4}.so "${pkgdir}/usr/lib"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_x264/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/x264"
-  install -D -m755 plugins/build/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/*Qt.so "${pkgdir}/usr/lib/ADM_plugins/videoEncoder/xvid"
-  install -D -m755 plugins/build/ADM_videoFilters/*/*_qt4.so "${pkgdir}/usr/lib/ADM_plugins/videoFilter"
-
-  install -d "${pkgdir}/usr/share/avidemux/i18n"
-  install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
-
-  install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-  sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
-}
diff --git a/testing/avidemux/avidemux.install b/testing/avidemux/avidemux.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/avidemux/avidemux.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/avogadro/PKGBUILD b/testing/avogadro/PKGBUILD
deleted file mode 100644
index 9156d511d..000000000
--- a/testing/avogadro/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 163543 2012-07-15 13:16:32Z ibiru $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
-
-pkgname=avogadro
-pkgver=1.0.3
-pkgrel=6
-pkgdesc="An advanced molecular editor based on Qt"
-arch=('i686' 'x86_64')
-url="http://avogadro.openmolecules.net/wiki/Main_Page"
-license=('GPL2')
-depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost')
-install=avogadro.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'replace-qt4_automoc-with-qt4_wrap_cpp.patch'
-        'fix-boost.patch'
-        'fix-opengl-headers.patch')
-md5sums=('92c2702c1980f70fb6d87a1a58147911'
-         'aec516daab066c15326a9681f8f15abc'
-         '46282e4709429447e44a0a54d51ad2ec'
-         'f420bfd22e3d5d8fcddc625cf5e711f6')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch
-  patch -p1 -i "${srcdir}"/fix-boost.patch
-  patch -p1 -i "${srcdir}"/fix-opengl-headers.patch
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/avogadro/avogadro.install b/testing/avogadro/avogadro.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/testing/avogadro/avogadro.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/avogadro/fix-boost.patch b/testing/avogadro/fix-boost.patch
deleted file mode 100644
index 8fb53ef12..000000000
--- a/testing/avogadro/fix-boost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~	2011-11-29 18:33:01.777291627 +0000
-+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-11-29 18:33:23.480814612 +0000
-@@ -149,7 +149,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-11-29 18:37:15.449506548 +0000
-+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:37:52.729831744 +0000
-@@ -11,7 +11,7 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
- 
- ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
---- avogadro-1.0.3/libavogadro/CMakeLists.txt~	2011-11-29 19:41:34.066938217 +0000
-+++ avogadro-1.0.3/libavogadro/CMakeLists.txt	2011-11-29 19:42:53.084320315 +0000
-@@ -18,7 +18,7 @@
-   # Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
-   # We should probably scan the header to verify the Q_OBJECT macro is used
-   string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
--  qt4_wrap_cpp(moc_files ${hdr_list})
-+  qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
-   # Now sort out the ui and qrc files, process them as appropriate
-   set(ui_plugin_files)
-   set(qrc_plugin_files)
diff --git a/testing/avogadro/fix-opengl-headers.patch b/testing/avogadro/fix-opengl-headers.patch
deleted file mode 100644
index e6e8bc3b5..000000000
--- a/testing/avogadro/fix-opengl-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- avogadro-1.0.3/libavogadro/src/camera.cpp~	2012-02-27 18:35:52.109999585 +0000
-+++ avogadro-1.0.3/libavogadro/src/camera.cpp	2012-02-27 18:36:27.103053453 +0000
-@@ -25,6 +25,8 @@
- #include "camera.h"
- #include "glwidget.h"
- #include <avogadro/molecule.h>
-+#include <Eigen/LU>
-+#include <GL/glu.h>
- 
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~	2012-02-27 18:37:28.535894209 +0000
-+++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp	2012-02-27 18:37:46.912413557 +0000
-@@ -42,6 +42,7 @@
- #include <QColor>
- #include <QVarLengthArray>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp~	2012-02-27 18:37:55.099014598 +0000
-+++ avogadro-1.0.3/libavogadro/src/glwidget.cpp	2012-02-27 18:38:30.805395066 +0000
-@@ -70,6 +70,8 @@
- 
- #include <openbabel/mol.h>
- 
-+#include <GL/glu.h>
-+
- using namespace OpenBabel;
- using namespace Eigen;
- 
---- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~	2012-02-27 18:36:53.646173944 +0000
-+++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp	2012-02-27 18:37:10.739370227 +0000
-@@ -36,6 +36,7 @@
- #include <QFile>
- #include <QDebug>
- #include <Eigen/Geometry>
-+#include <GL/glu.h>
- 
- namespace Avogadro
- {
---- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~	2012-02-27 18:38:47.491928000 +0000
-+++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp	2012-02-27 18:39:05.735115136 +0000
-@@ -44,6 +44,8 @@
- #include <QComboBox>
- #include <QDebug>
- 
-+#include <GL/glu.h>
-+
- using namespace std;
- using namespace OpenBabel;
- using namespace Eigen;
diff --git a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
deleted file mode 100644
index 11f58a505..000000000
--- a/testing/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt	2011-11-29 18:49:58.520790652 +0100
-@@ -75,6 +75,42 @@
-   zmatrix.h
- )
- 
-+SET(libavogadro_MOC_HDRS
-+  animation.h
-+  atom.h
-+  bond.h
-+  color.h
-+  colorbutton.h
-+  colors/elementcolor.h
-+  cube.h
-+  elementdetail_p.h
-+  elementtranslator.h
-+  engine.h
-+  engines/bsdyengine.h
-+  extension.h
-+  fragment.h
-+  glwidget.h
-+  mesh.h
-+  molecule.h
-+  moleculefile.h
-+  moleculefile_p.h
-+  periodictablescene_p.h
-+  periodictableview.h
-+  plotwidget.h
-+  plugin.h
-+  pluginmanager.h
-+  primitive.h
-+  protein.h
-+  pythonengine_p.h
-+  pythonerror.h
-+  pythonextension_p.h
-+  pythontool_p.h
-+  residue.h
-+  tool.h
-+  toolgroup.h
-+  zmatrix.h
-+)
-+
- set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS})
- # Also add in the qtiocompressor class
- #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp)
-@@ -113,7 +148,7 @@
-   endforeach(P_ITEM ${PYTHON_SRCS})
- endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
- 
--qt4_automoc(${libavogadro_SRCS})
-+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
- 
- # you have to add link_directories before you add the target
- if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
-@@ -149,7 +184,7 @@
-     COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}")
- endforeach(headerFile ${libavogadro_HDRS})
- 
--add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
-+add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
- target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp
---- avogadro-1.0.3/libavogadro/src/animation.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp	2011-11-29 18:48:47.967839537 +0100
-@@ -224,5 +224,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "animation.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp
---- avogadro-1.0.3/libavogadro/src/atom.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp	2011-11-29 18:48:39.561218412 +0100
-@@ -293,5 +293,3 @@
-    }
- 
-  } // End namespace Avogadro
--
--#include "atom.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp
---- avogadro-1.0.3/libavogadro/src/bond.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp	2011-11-29 18:49:00.067773985 +0100
-@@ -166,5 +166,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "bond.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp
---- avogadro-1.0.3/libavogadro/src/color.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/color.cpp	2011-11-29 18:49:05.207746140 +0100
-@@ -152,5 +152,3 @@
-     return "Generic Color";
-   }
- }
--
--#include "color.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp
---- avogadro-1.0.3/libavogadro/src/colorbutton.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp	2011-11-29 18:49:11.987709410 +0100
-@@ -94,5 +94,3 @@
-   }
- 
- } // end namespace
--
--#include "colorbutton.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp
---- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp	2011-11-29 18:50:11.077389292 +0100
-@@ -63,7 +63,5 @@
- 
- }
- 
--#include "elementcolor.moc"
- //this is a static color plugin...
- //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory)
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp
---- avogadro-1.0.3/libavogadro/src/cube.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp	2011-11-29 18:50:26.357306516 +0100
-@@ -322,5 +322,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "cube.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp
---- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp	2011-11-29 18:50:37.680578505 +0100
-@@ -132,5 +132,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementdetail_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp
---- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp	2011-11-29 18:50:48.160521729 +0100
-@@ -401,5 +401,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "elementtranslator.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp
---- avogadro-1.0.3/libavogadro/src/engine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp	2011-11-29 18:50:54.397154610 +0100
-@@ -377,5 +377,3 @@
-       return m_molecule->bonds();
-   }
- }
--
--#include "engine.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp
---- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp	2011-11-29 18:51:18.733689435 +0100
-@@ -442,7 +442,5 @@
-   }
- 
- }
--
--#include "bsdyengine.moc"
- // This is a static engine...
- // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory )
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp
---- avogadro-1.0.3/libavogadro/src/extension.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp	2011-11-29 18:51:56.360152261 +0100
-@@ -80,5 +80,3 @@
-   }
- 
- }
--
--#include "extension.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp
---- avogadro-1.0.3/libavogadro/src/fragment.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp	2011-11-29 18:52:01.906788880 +0100
-@@ -82,5 +82,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "fragment.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp
---- avogadro-1.0.3/libavogadro/src/glwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp	2011-11-29 18:52:14.346721486 +0100
-@@ -1966,5 +1966,3 @@
-     d->updateCache = true;
-   }
- }
--
--#include "glwidget.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp
---- avogadro-1.0.3/libavogadro/src/mesh.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp	2011-11-29 18:52:23.033341093 +0100
-@@ -231,5 +231,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "mesh.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp
---- avogadro-1.0.3/libavogadro/src/molecule.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp	2011-11-29 18:52:33.573283993 +0100
-@@ -1575,5 +1575,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "molecule.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp
---- avogadro-1.0.3/libavogadro/src/moleculefile.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp	2011-11-29 18:56:26.728687548 +0100
-@@ -22,23 +22,14 @@
-   02110-1301, USA.
-  **********************************************************************/
- 
--#include "moleculefile.h"
-+#include "moleculefile_p.h"
- 
- #include <avogadro/molecule.h>
- 
--#include <QFile>
- #include <QFileInfo>
--#include <QStringList>
--#include <QThread>
- #include <QDebug>
- #include <QPointer>
- 
--#include <openbabel/mol.h>
--#include <openbabel/obconversion.h>
--
--// Included in obconversion.h
--//#include <iostream>
--
- namespace Avogadro {
- 
-   using OpenBabel::OBConversion;
-@@ -578,164 +569,6 @@
-     return false;
-   }
- 
--  class ReadFileThread : public QThread
--  {
--    //    Q_OBJECT 
--
--    public:
--      ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
--      {
--      }
--      
--      void addConformer(const OpenBabel::OBMol &conformer)
--      {
--        unsigned int numAtoms = conformer.NumAtoms();
--        std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
--        for (unsigned int i = 0; i < numAtoms; ++i)
--          coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
--        m_moleculeFile->m_conformers.push_back(coords);
--      }
--
--      void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
--      {
--        if (!c) {
--          // this is the first molecule read
--          m_moleculeFile->setConformerFile(true);
--          addConformer(current);
--          return;
--        }
--
--        if (!m_moleculeFile->isConformerFile())
--          return;
--
--        // as long as we are not sure if this really is a 
--        // conformer/trajectory file, add the conformers
--        addConformer(current);
--
--        // performance: check only certain molecule 1-10,20,50
--        switch (c) {
--          case 1:
--          case 2:
--          case 3:
--          case 4:
--          case 5:
--          case 6:
--          case 7:
--          case 8:
--          case 9:
--          case 10:
--          case 20:
--          case 50:
--            break;
--          default:
--            return;
--        }
--
--        if (first.NumAtoms() != current.NumAtoms()) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--          return;
--        }
--
--        for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
--          OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
--          OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
--          if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
--            m_moleculeFile->setConformerFile(false);
--            m_moleculeFile->m_conformers.clear();
--            return;
--          }    
--        }
--      }
--
--      void run()
--      {
--        // Check that the file can be read from disk
--        if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
--          // Cannot read the file
--          m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
--                                         .arg(m_moleculeFile->m_fileName));
--          return;
--        }
-- 
--        // Construct the OpenBabel objects, set the file type
--        OpenBabel::OBConversion conv;
--        OpenBabel::OBFormat *inFormat;
--        if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
--          // Input format not supported
--          m_moleculeFile->m_error.append(
--              QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
--          return;
--        } else {
--          inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
--          if (!inFormat || !conv.SetInFormat(inFormat)) {
--            // Input format not supported
--            m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
--                                           .arg(m_moleculeFile->m_fileName));
--            return;
--          }
--        }
--
--        // set any options
--        if (!m_moleculeFile->m_fileOptions.isEmpty()) {
--          foreach(const QString &option,
--              m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
--            conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
--          }
--        }
--
--        // Now attempt to read the molecule in
--        ifstream ifs;
--        ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
--        if (!ifs) // Should not happen, already checked file could be opened
--          return;
--      
--        // read all molecules
--        OpenBabel::OBMol firstOBMol, currentOBMol;
--        unsigned int c = 0;
--        conv.SetInStream(&ifs);
--        m_moleculeFile->streamposRef().push_back(ifs.tellg());
--        while (ifs.good() && conv.Read(&currentOBMol)) {
--          if (!c)
--            firstOBMol = currentOBMol;
--
--          if (c > 20 && !m_moleculeFile->isConformerFile())
--            m_moleculeFile->setFirstReady(true);
--
--          // detect conformer/trajectory files
--          detectConformers(c, firstOBMol, currentOBMol);
--          // store information about molecule
--          m_moleculeFile->streamposRef().push_back(ifs.tellg());
--          m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
--          // increment count
--          ++c;
--        }
--        m_moleculeFile->streamposRef().pop_back();
--
--        // signle molecule files are not conformer files
--        if (c == 1) {
--          m_moleculeFile->setConformerFile(false);
--          m_moleculeFile->m_conformers.clear();
--        }
--
--        // check for empty titles
--        for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
--          if (!m_moleculeFile->titlesRef()[i].isEmpty())
--            continue;
--
--          QString title;
--          if (m_moleculeFile->isConformerFile())
--            title = tr("Conformer %1").arg(i+1);
--          else
--            title = tr("Molecule %1").arg(i+1);
--        
--          m_moleculeFile->titlesRef()[i] = title;
--        }
--      }
--
--      MoleculeFile *m_moleculeFile;
--  }; // end ReadFileThread class
--
-   MoleculeFile* MoleculeFile::readFile(const QString &fileName,
-       const QString &fileType, const QString &fileOptions, bool wait)
-   {
-@@ -794,6 +627,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "moleculefile.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h
---- avogadro-1.0.3/libavogadro/src/moleculefile_p.h	1970-01-01 01:00:00.000000000 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h	2011-11-29 18:57:43.108273764 +0100
-@@ -0,0 +1,202 @@
-+/**********************************************************************
-+  MoleculeFile - Class representing molecule file.
-+
-+  Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch
-+
-+  This file is part of the Avogadro molecular editor project.
-+  For more information, see <http://avogadro.openmolecules.net/>
-+
-+  Avogadro is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License as published by
-+  the Free Software Foundation; either version 2 of the License, or
-+  (at your option) any later version.
-+
-+  Avogadro is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with this program; if not, write to the Free Software
-+  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-+  02110-1301, USA.
-+ **********************************************************************/
-+
-+#ifndef MOLECULEFILE_P_H
-+#define MOLECULEFILE_P_H
-+
-+#include "moleculefile.h"
-+
-+#include <openbabel/mol.h>
-+#include <openbabel/obconversion.h>
-+
-+#include <QFile>
-+#include <QStringList>
-+#include <QThread>
-+
-+namespace Avogadro {
-+
-+  using OpenBabel::OBConversion;
-+  using std::ifstream;
-+
-+class ReadFileThread : public QThread
-+{
-+      Q_OBJECT
-+
-+  public:
-+    ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile)
-+    {
-+    }
-+
-+    void addConformer(const OpenBabel::OBMol &conformer)
-+    {
-+      unsigned int numAtoms = conformer.NumAtoms();
-+      std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms);
-+      for (unsigned int i = 0; i < numAtoms; ++i)
-+        coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray()));
-+      m_moleculeFile->m_conformers.push_back(coords);
-+    }
-+
-+    void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol &current)
-+    {
-+      if (!c) {
-+        // this is the first molecule read
-+        m_moleculeFile->setConformerFile(true);
-+        addConformer(current);
-+        return;
-+      }
-+
-+      if (!m_moleculeFile->isConformerFile())
-+        return;
-+
-+      // as long as we are not sure if this really is a
-+      // conformer/trajectory file, add the conformers
-+      addConformer(current);
-+
-+      // performance: check only certain molecule 1-10,20,50
-+      switch (c) {
-+        case 1:
-+        case 2:
-+        case 3:
-+        case 4:
-+        case 5:
-+        case 6:
-+        case 7:
-+        case 8:
-+        case 9:
-+        case 10:
-+        case 20:
-+        case 50:
-+          break;
-+        default:
-+          return;
-+      }
-+
-+      if (first.NumAtoms() != current.NumAtoms()) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+        return;
-+      }
-+
-+      for (unsigned int i = 0; i < first.NumAtoms(); ++i) {
-+        OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1);
-+        OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1);
-+        if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) {
-+          m_moleculeFile->setConformerFile(false);
-+          m_moleculeFile->m_conformers.clear();
-+          return;
-+        }
-+      }
-+    }
-+
-+    void run()
-+    {
-+      // Check that the file can be read from disk
-+      if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) {
-+        // Cannot read the file
-+        m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.")
-+                                       .arg(m_moleculeFile->m_fileName));
-+        return;
-+      }
-+
-+      // Construct the OpenBabel objects, set the file type
-+      OpenBabel::OBConversion conv;
-+      OpenBabel::OBFormat *inFormat;
-+      if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) {
-+        // Input format not supported
-+        m_moleculeFile->m_error.append(
-+            QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType));
-+        return;
-+      } else {
-+        inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data());
-+        if (!inFormat || !conv.SetInFormat(inFormat)) {
-+          // Input format not supported
-+          m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.")
-+                                         .arg(m_moleculeFile->m_fileName));
-+          return;
-+        }
-+      }
-+
-+      // set any options
-+      if (!m_moleculeFile->m_fileOptions.isEmpty()) {
-+        foreach(const QString &option,
-+            m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) {
-+          conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS);
-+        }
-+      }
-+
-+      // Now attempt to read the molecule in
-+      ifstream ifs;
-+      ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc
-+      if (!ifs) // Should not happen, already checked file could be opened
-+        return;
-+
-+      // read all molecules
-+      OpenBabel::OBMol firstOBMol, currentOBMol;
-+      unsigned int c = 0;
-+      conv.SetInStream(&ifs);
-+      m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+      while (ifs.good() && conv.Read(&currentOBMol)) {
-+        if (!c)
-+          firstOBMol = currentOBMol;
-+
-+        if (c > 20 && !m_moleculeFile->isConformerFile())
-+          m_moleculeFile->setFirstReady(true);
-+
-+        // detect conformer/trajectory files
-+        detectConformers(c, firstOBMol, currentOBMol);
-+        // store information about molecule
-+        m_moleculeFile->streamposRef().push_back(ifs.tellg());
-+        m_moleculeFile->titlesRef().append(currentOBMol.GetTitle());
-+        // increment count
-+        ++c;
-+      }
-+      m_moleculeFile->streamposRef().pop_back();
-+
-+      // signle molecule files are not conformer files
-+      if (c == 1) {
-+        m_moleculeFile->setConformerFile(false);
-+        m_moleculeFile->m_conformers.clear();
-+      }
-+
-+      // check for empty titles
-+      for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) {
-+        if (!m_moleculeFile->titlesRef()[i].isEmpty())
-+          continue;
-+
-+        QString title;
-+        if (m_moleculeFile->isConformerFile())
-+          title = tr("Conformer %1").arg(i+1);
-+        else
-+          title = tr("Molecule %1").arg(i+1);
-+
-+        m_moleculeFile->titlesRef()[i] = title;
-+      }
-+    }
-+
-+    MoleculeFile *m_moleculeFile;
-+};
-+
-+} // end namespace Avogadro
-+
-+#endif // MOLECULEFILE_P_H
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp
---- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp	2011-11-29 18:52:50.259860261 +0100
-@@ -213,5 +213,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "periodictablescene_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp
---- avogadro-1.0.3/libavogadro/src/periodictableview.cpp     2011-11-29 19:30:25.130970122 +0000
-+++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp        2011-11-29 18:52:50.259860261 +0100
-@@ -69,4 +69,3 @@
- 
- } // End namespace Avogadro
- 
--#include "periodictableview.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp
---- avogadro-1.0.3/libavogadro/src/plotwidget.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp	2011-11-29 18:53:09.389756626 +0100
-@@ -27,7 +27,6 @@
-  **********************************************************************/
- 
- #include "plotwidget.h"
--#include "plotwidget.moc"
- 
- #include <math.h>
- #include <QDebug>
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp
---- avogadro-1.0.3/libavogadro/src/plugin.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp	2011-11-29 18:53:16.016387394 +0100
-@@ -65,5 +65,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "plugin.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp
---- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp	2011-11-29 18:53:23.569679807 +0100
-@@ -784,5 +784,3 @@
-   }
- 
- }
--
--#include "pluginmanager.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp
---- avogadro-1.0.3/libavogadro/src/primitive.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp	2011-11-29 18:53:29.139649631 +0100
-@@ -77,5 +77,3 @@
-   }
- 
- }
--
--#include "primitive.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp
---- avogadro-1.0.3/libavogadro/src/protein.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp	2011-11-29 18:53:37.952935219 +0100
-@@ -978,5 +978,3 @@
-   }
- 
- } // End namespace Avogadro
--
--#include "protein.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt
---- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt	2011-11-29 18:58:02.354836165 +0100
-@@ -11,9 +11,9 @@
- # use all cpp files in this directory
- FILE(GLOB wrapper_SRCS "*.cpp")
- 
--qt4_automoc(moleculelist.cpp)
-+QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
- 
--ADD_LIBRARY(python-module MODULE ${wrapper_SRCS})
-+ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
- SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
- SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "")
- if (WIN32)
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp
---- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp     2011-11-29 19:26:07.562214311 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp      2011-11-29 19:26:14.538843182 +0100
-@@ -70,4 +70,3 @@
- 
- }
- 
--#include "moleculelist.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp	2011-11-29 18:53:45.492894371 +0100
-@@ -289,5 +289,3 @@
- 
- 
- }
--
--#include "pythonengine_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp
---- avogadro-1.0.3/libavogadro/src/pythonerror.cpp     2011-11-29 19:24:26.949426045 +0100
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp      2011-11-29 19:24:41.176015640 +0100
-@@ -112,4 +112,3 @@
- 
- } // namespace
- 
--#include "pythonerror.moc"
-
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp	2011-11-29 18:53:54.082847836 +0100
-@@ -340,5 +340,3 @@
-   }
- 
- }
--
--#include "pythonextension_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp
---- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp	2011-11-29 18:54:02.269470152 +0100
-@@ -344,5 +344,3 @@
-   }
- 
- }
--
--#include "pythontool_p.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp
---- avogadro-1.0.3/libavogadro/src/residue.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp	2011-11-29 18:54:14.316071557 +0100
-@@ -160,6 +160,3 @@
-   }
- 
- } // End namespace Avogadro
--
-- #include "residue.moc"
--
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp
---- avogadro-1.0.3/libavogadro/src/tool.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp	2011-11-29 18:55:05.515794184 +0100
-@@ -117,5 +117,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "tool.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp
---- avogadro-1.0.3/libavogadro/src/toolgroup.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp	2011-11-29 18:55:11.699094018 +0100
-@@ -206,5 +206,3 @@
-   }
- 
- } // end namespace Avogadro
--
--#include "toolgroup.moc"
-diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp
---- avogadro-1.0.3/libavogadro/src/zmatrix.cpp	2011-04-25 07:22:18.000000000 +0200
-+++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp	2011-11-29 18:55:17.209064168 +0100
-@@ -149,5 +149,3 @@
- 
- 
- } // End namespace Avogadro
--
--#include "zmatrix.moc"
diff --git a/testing/banshee/PKGBUILD b/testing/banshee/PKGBUILD
deleted file mode 100644
index 0cce416cd..000000000
--- a/testing/banshee/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 141668 2011-11-02 03:17:12Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=banshee
-pkgver=2.6.0
-pkgrel=1
-pkgdesc="Music management and playback for GNOME"
-arch=('i686' 'x86_64')
-url="http://banshee.fm/"
-license=('MIT')
-depends=(libxxf86vm gst-plugins-base mono-addins dbus-sharp-glib boo libwebkit libsoup-gnome gdata-sharp taglib-sharp gudev-sharp gkeyfile-sharp gconf-sharp libmtp libgpod mono-zeroconf desktop-file-utils hicolor-icon-theme xdg-utils media-player-info gst-plugins-bad mono-upnp)
-makedepends=('intltool' 'gnome-doc-utils' 'gtk-sharp-beans' 'gnome-common')
-optdepends=('gst-plugins-good: Extra media codecs'
-            'gst-plugins-ugly: Extra media codecs'
-            'gst-libav: Extra media codecs'
-            'brasero: CD burning')
-options=('!libtool')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/2.6/$pkgname-$pkgver.tar.xz
-        gst-1.0.patch)
-sha256sums=('a47cc741f8ef2f81726ec4872e8179b17efa271c0c991e912e384fabf777394a'
-            'eddf696b0be91331fae8d63c23277a355e94539a3436a8619dab2d732b30234e')
-
-build() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  #https://bugzilla.gnome.org/show_bug.cgi?id=679433
-  patch -Np1 -i "${srcdir}/gst-1.0.patch"
-
-  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-docs \
-              --disable-static \
-              --disable-scrollkeeper \
-              --disable-schemas-install \
-              --with-vendor-build-id=ArchLinux
-  make
-}
-
-package() {
-  export MONO_SHARED_DIR="$srcdir/.wabi"
-  mkdir -p "$MONO_SHARED_DIR"
-
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/testing/banshee/banshee-recent-gpod.patch b/testing/banshee/banshee-recent-gpod.patch
deleted file mode 100644
index afb3a0fd1..000000000
--- a/testing/banshee/banshee-recent-gpod.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d4cd959c4a48ffc9da8fe0983bd31c4647669bf4 Mon Sep 17 00:00:00 2001
-From: William Witt <william@witt-family.net>
-Date: Sat, 30 Jul 2011 21:54:41 -0500
-Subject: [PATCH] - Changed typecast on FileSize to uint in AppleDeviceTrackInfo to comply with libgpod-sharp
-
----
- .../AppleDeviceTrackInfo.cs                        |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-index 178266d..b8549f7 100644
---- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice/AppleDeviceTrackInfo.cs
-@@ -215,7 +215,7 @@ namespace Banshee.Dap.AppleDevice
-             track.CDs = DiscCount;
-             track.CDNumber = DiscNumber;
-             track.TrackLength = (int) Duration.TotalMilliseconds;
--            track.Size = (int)FileSize;
-+            track.Size = (uint)FileSize;
-             track.Grouping = Grouping;
-             try {
-                 track.TimePlayed = LastPlayed;
--- 
-1.7.3.4
diff --git a/testing/banshee/banshee.install b/testing/banshee/banshee.install
deleted file mode 100644
index 1d0fd332b..000000000
--- a/testing/banshee/banshee.install
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgname=banshee
-
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/banshee/gst-1.0.patch b/testing/banshee/gst-1.0.patch
deleted file mode 100644
index f8fa7a7c2..000000000
--- a/testing/banshee/gst-1.0.patch
+++ /dev/null
@@ -1,1025 +0,0 @@
-From ec14625f10c26ae3646f382ffd804ee28c3d7334 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
-Date: Wed, 19 Sep 2012 11:34:06 +0200
-Subject: [PATCH] Initial port to GStreamer 1.0
-
----
- build/m4/banshee/gstreamer.m4                |   19 +++---
- data/audio-profiles/wav.xml.in               |    5 +-
- libbanshee/banshee-bpmdetector.c             |   11 ++--
- libbanshee/banshee-gst.h                     |    4 +-
- libbanshee/banshee-player-cdda.c             |    5 +-
- libbanshee/banshee-player-dvd.c              |    4 +-
- libbanshee/banshee-player-equalizer.c        |    4 +-
- libbanshee/banshee-player-missing-elements.c |    2 +-
- libbanshee/banshee-player-pipeline.c         |   37 ++++++-----
- libbanshee/banshee-player-private.h          |   13 ++--
- libbanshee/banshee-player-replaygain.c       |   29 ++++-----
- libbanshee/banshee-player-video.c            |   89 +++++++++++++-------------
- libbanshee/banshee-player-vis.c              |   88 ++++++++-----------------
- libbanshee/banshee-player.c                  |   11 ++--
- libbanshee/banshee-ripper.c                  |   16 ++---
- libbanshee/banshee-tagger.c                  |    2 +-
- libbanshee/banshee-transcoder.c              |   19 +++---
- 17 files changed, 156 insertions(+), 202 deletions(-)
-
-diff --git a/build/m4/banshee/gstreamer.m4 b/build/m4/banshee/gstreamer.m4
-index 6267cce..917cf58 100644
---- a/build/m4/banshee/gstreamer.m4
-+++ b/build/m4/banshee/gstreamer.m4
-@@ -1,17 +1,18 @@
- AC_DEFUN([BANSHEE_CHECK_GSTREAMER],
- [
--	GSTREAMER_REQUIRED_VERSION=0.10.26
-+	GSTREAMER_REQUIRED_VERSION=0.11.99
- 	AC_SUBST(GSTREAMER_REQUIRED_VERSION)
- 
- 	PKG_CHECK_MODULES(GST,
--		gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-controller-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-dataprotocol-0.10 >= $GSTREAMER_REQUIRED_VERSION
--		gstreamer-fft-0.10 >= $GSTREAMER_REQUIRED_VERSION)
--
--	GST_LIBS="$GST_LIBS -lgstvideo-0.10 -lgstinterfaces-0.10 -lgstcdda-0.10 -lgstpbutils-0.10 -lgsttag-0.10"
-+		gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-controller-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-audio-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-fft-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION
-+		gstreamer-video-1.0 >= $GSTREAMER_REQUIRED_VERSION)
- 
- 	AC_SUBST(GST_CFLAGS)
- 	AC_SUBST(GST_LIBS)
-diff --git a/data/audio-profiles/wav.xml.in b/data/audio-profiles/wav.xml.in
-index 35cd1d2..6dc1bab 100644
---- a/data/audio-profiles/wav.xml.in
-+++ b/data/audio-profiles/wav.xml.in
-@@ -14,10 +14,7 @@
-                 "audioresample"
-                 "audioconvert" 
-                 (+ "audio/x-raw-int, "
--                   "endianness=(int)1234, "
--                   "width=(int)16, "
--                   "depth=(int)16, "
--                   "signed=(boolean)true, "
-+                   "format=(string)S16LE, "
-                    "rate=(int)44100, "
-                    "channels=(int)2" )
-                 "wavenc")
-diff --git a/libbanshee/banshee-bpmdetector.c b/libbanshee/banshee-bpmdetector.c
-index c06ffcb..68b0419 100644
---- a/libbanshee/banshee-bpmdetector.c
-+++ b/libbanshee/banshee-bpmdetector.c
-@@ -30,6 +30,7 @@
- #  include "config.h"
- #endif
- 
-+#include <stdio.h>
- #include <string.h>
- #include <glib/gi18n.h>
- 
-@@ -50,7 +51,7 @@ struct BansheeBpmDetector {
- 
-     /*
-      * You can run this pipeline on the cmd line with:
--     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin2 ! \
-+     * gst-launch -m filesrc location=/path/to/my.mp3 ! decodebin ! \
-      *    audioconvert ! bpmdetect ! fakesink
-      */
- 
-@@ -168,14 +169,14 @@ bbd_new_decoded_pad(GstElement *decodebin, GstPad *pad,
- 
-     g_return_if_fail(detector != NULL);
- 
--    audiopad = gst_element_get_pad(detector->audioconvert, "sink");
-+    audiopad = gst_element_get_static_pad(detector->audioconvert, "sink");
-     
-     if(GST_PAD_IS_LINKED(audiopad)) {
-         g_object_unref(audiopad);
-         return;
-     }
- 
--    caps = gst_pad_get_caps(pad);
-+    caps = gst_pad_query_caps(pad, NULL);
-     str = gst_caps_get_structure(caps, 0);
-     
-     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
-@@ -209,9 +210,9 @@ bbd_pipeline_construct (BansheeBpmDetector *detector)
-         return FALSE;
-     }
-   
--    detector->decodebin = gst_element_factory_make ("decodebin2", "decodebin2");
-+    detector->decodebin = gst_element_factory_make ("decodebin", "decodebin");
-     if (detector->decodebin == NULL) {
--        bbd_raise_error (detector, _("Could not create decodebin2 plugin"), NULL);
-+        bbd_raise_error (detector, _("Could not create decodebin plugin"), NULL);
-         return FALSE;
-     }
- 
-diff --git a/libbanshee/banshee-gst.h b/libbanshee/banshee-gst.h
-index 85662cf..332f356 100644
---- a/libbanshee/banshee-gst.h
-+++ b/libbanshee/banshee-gst.h
-@@ -41,9 +41,11 @@
- #define BANSHEE_GST_ITERATOR_ITERATE(iter,child_type,child_name,free,block) { \
-     gboolean iter##_done = FALSE; \
-     while (!iter##_done) { \
-+        GValue child_value = {0, }; \
-         child_type child_name; \
--        switch (gst_iterator_next (iter, (gpointer)&child_name)) { \
-+        switch (gst_iterator_next (iter, &child_value)) { \
-             case GST_ITERATOR_OK: { \
-+                child_name = (child_type) g_value_get_object(&child_value); \
-                 { block; } \
-                 break; \
-             } \
-diff --git a/libbanshee/banshee-player-cdda.c b/libbanshee/banshee-player-cdda.c
-index 8be2bdd..401edf0 100644
---- a/libbanshee/banshee-player-cdda.c
-+++ b/libbanshee/banshee-player-cdda.c
-@@ -28,7 +28,8 @@
- // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- //
- 
--#include <gst/cdda/gstcddabasesrc.h>
-+#include <stdlib.h>
-+#include <gst/audio/gstaudiocdsrc.h>
- #include "banshee-player-cdda.h"
- 
- // ---------------------------------------------------------------------------
-@@ -46,7 +47,7 @@ bp_cdda_get_cdda_source (GstElement *playbin)
-     
-     g_object_get (playbin, "source", &source, NULL);
-     
--    if (source == NULL || !GST_IS_CDDA_BASE_SRC (source)) {
-+    if (source == NULL || !GST_IS_AUDIO_CD_SRC (source)) {
-         if (source != NULL) {
-             g_object_unref (source);
-         }
-diff --git a/libbanshee/banshee-player-dvd.c b/libbanshee/banshee-player-dvd.c
-index 55d499c..991b506 100644
---- a/libbanshee/banshee-player-dvd.c
-+++ b/libbanshee/banshee-player-dvd.c
-@@ -296,7 +296,7 @@ bp_dvd_go_to_next_chapter (BansheePlayer *player)
- {
-     gint64 index;
-     GstFormat format = gst_format_get_by_nick ("chapter");
--    gst_element_query_position (player->playbin, &format, &index);
-+    gst_element_query_position (player->playbin, format, &index);
-     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
-         GST_SEEK_TYPE_SET, index + 1, GST_SEEK_TYPE_NONE, 0);
- }
-@@ -306,7 +306,7 @@ bp_dvd_go_to_previous_chapter (BansheePlayer *player)
- {
-     gint64 index;
-     GstFormat format = gst_format_get_by_nick ("chapter");
--    gst_element_query_position (player->playbin, &format, &index);
-+    gst_element_query_position (player->playbin, format, &index);
-     gst_element_seek (player->playbin, 1.0, format, GST_SEEK_FLAG_FLUSH,
-         GST_SEEK_TYPE_SET, index - 1, GST_SEEK_TYPE_NONE, 0);
- }
-diff --git a/libbanshee/banshee-player-equalizer.c b/libbanshee/banshee-player-equalizer.c
-index a496ada..0cbb3b7 100644
---- a/libbanshee/banshee-player-equalizer.c
-+++ b/libbanshee/banshee-player-equalizer.c
-@@ -122,7 +122,7 @@ bp_equalizer_set_gain (BansheePlayer *player, guint bandnum, gdouble gain)
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     
-     if (player->equalizer != NULL) {
--        GstObject *band;
-+        GObject *band;
- 
-         g_return_if_fail (bandnum < gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer)));
- 
-@@ -188,7 +188,7 @@ bp_equalizer_get_frequencies (BansheePlayer *player, gdouble **freq)
-     count = gst_child_proxy_get_children_count (GST_CHILD_PROXY (player->equalizer));
-     
-     for (i = 0; i < count; i++) {
--        GstObject *band;
-+        GObject *band;
-         
-         band = gst_child_proxy_get_child_by_index (GST_CHILD_PROXY (player->equalizer), i);
-         g_object_get (G_OBJECT (band), "freq", &(*freq)[i], NULL);
-diff --git a/libbanshee/banshee-player-missing-elements.c b/libbanshee/banshee-player-missing-elements.c
-index 20804c4..30118c5 100644
---- a/libbanshee/banshee-player-missing-elements.c
-+++ b/libbanshee/banshee-player-missing-elements.c
-@@ -170,7 +170,7 @@ _bp_missing_elements_handle_state_changed (BansheePlayer *player, GstState old,
-     }
-     #endif
-     
--    install_return = gst_install_plugins_async (details, player->install_plugins_context, 
-+    install_return = gst_install_plugins_async ((const gchar * const*) details, player->install_plugins_context, 
-         bp_missing_elements_handle_install_result, player);
-     
-     if (install_return != GST_INSTALL_PLUGINS_STARTED_OK) {
-diff --git a/libbanshee/banshee-player-pipeline.c b/libbanshee/banshee-player-pipeline.c
-index ed845f3..6c2af35 100644
---- a/libbanshee/banshee-player-pipeline.c
-+++ b/libbanshee/banshee-player-pipeline.c
-@@ -76,7 +76,7 @@ playbin_stream_changed_cb (GstElement * element, BansheePlayer *player)
-     GstMessage *msg;
- 
-     // We're being called from the streaming thread, so don't do anything here
--    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new ("stream-changed", NULL));
-+    msg = gst_message_new_application (GST_OBJECT (player->playbin), gst_structure_new_empty ("stream-changed"));
-     gst_element_post_message (player->playbin, msg);
- }
- 
-@@ -218,6 +218,11 @@ bp_pipeline_bus_callback (GstBus *bus, GstMessage *message, gpointer userdata)
-             break;
-         }
- 
-+        case GST_MESSAGE_STREAM_START: {
-+            bp_next_track_starting (player);
-+            break;
-+        }
-+
-         case GST_MESSAGE_APPLICATION: {
-             const gchar * name;
-             const GstStructure * s = gst_message_get_structure (message);
-@@ -289,11 +294,11 @@ _bp_pipeline_construct (BansheePlayer *player)
-     
-     // Playbin is the core element that handles autoplugging (finding the right
-     // source and decoder elements) based on source URI and stream content
--    player->playbin = gst_element_factory_make ("playbin2", "playbin");
-+    player->playbin = gst_element_factory_make ("playbin", "playbin");
- 
- #ifdef ENABLE_GAPLESS
-     // FIXME: Connect a proxy about-to-finish callback that will generate a next-track-starting callback.
--    // This can be removed once playbin2 generates its own next-track signal.
-+    // This can be removed once playbin generates its own next-track signal.
-     // bgo#584987 - this is included in >= 0.10.26
-     g_signal_connect (player->playbin, "about-to-finish", G_CALLBACK (bp_about_to_finish_callback), player);
- #endif //ENABLE_GAPLESS
-@@ -305,18 +310,13 @@ _bp_pipeline_construct (BansheePlayer *player)
-     g_signal_connect (player->playbin, "audio-changed", G_CALLBACK (playbin_stream_changed_cb), player);
-     g_signal_connect (player->playbin, "text-changed", G_CALLBACK (playbin_stream_changed_cb), player);
- 
--    // Try to find an audio sink, prefer gconf, which typically is set to auto these days,
--    // fall back on auto, which should work on windows, and as a last ditch, try alsa
--    audiosink = gst_element_factory_make ("gconfaudiosink", "audiosink");
--    if (audiosink == NULL) {
--        audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
--        if (audiosink != NULL) {
--            g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
--        } else {
--            audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
--            if (audiosink == NULL) {
--                audiosink = gst_element_factory_make ("alsasink", "audiosink");
--            }
-+    audiosink = gst_element_factory_make ("directsoundsink", "audiosink");
-+    if (audiosink != NULL) {
-+        g_object_set (G_OBJECT (audiosink), "volume", 1.0, NULL);
-+    } else {
-+        audiosink = gst_element_factory_make ("autoaudiosink", "audiosink");
-+        if (audiosink == NULL) {
-+            audiosink = gst_element_factory_make ("alsasink", "audiosink");
-         }
-     }
-     
-@@ -341,7 +341,6 @@ _bp_pipeline_construct (BansheePlayer *player)
-         GstIterator *elem_iter = gst_bin_iterate_recurse (GST_BIN (audiosink));
-         BANSHEE_GST_ITERATOR_ITERATE (elem_iter, GstElement *, element, TRUE, {
-             player->audiosink_has_volume |= g_object_class_find_property (G_OBJECT_GET_CLASS (element), "volume") != NULL;
--            gst_object_unref (element);
-         });
-     }
-     bp_debug ("Audiosink has volume: %s",
-@@ -383,7 +382,7 @@ _bp_pipeline_construct (BansheePlayer *player)
-     }
-    
-     // Ghost pad the audio bin so audio is passed from the bin into the tee
--    teepad = gst_element_get_pad (player->audiotee, "sink");
-+    teepad = gst_element_get_static_pad (player->audiotee, "sink");
-     gst_element_add_pad (player->audiobin, gst_ghost_pad_new ("sink", teepad));
-     gst_object_unref (teepad);
- 
-@@ -411,8 +410,8 @@ _bp_pipeline_construct (BansheePlayer *player)
-     gst_bus_add_watch (bus, bp_pipeline_bus_callback, player);
- 
-     // Link the first tee pad to the primary audio sink queue
--    GstPad *sinkpad = gst_element_get_pad (audiosinkqueue, "sink");
--    pad = gst_element_get_request_pad (player->audiotee, "src%d");
-+    GstPad *sinkpad = gst_element_get_static_pad (audiosinkqueue, "sink");
-+    pad = gst_element_get_request_pad (player->audiotee, "src_%u");
-     g_object_set(player->audiotee, "alloc-pad", pad, NULL);
-     gst_pad_link (pad, sinkpad);
-     gst_object_unref (GST_OBJECT (pad));
-diff --git a/libbanshee/banshee-player-private.h b/libbanshee/banshee-player-private.h
-index 9fed356..9346911 100644
---- a/libbanshee/banshee-player-private.h
-+++ b/libbanshee/banshee-player-private.h
-@@ -42,14 +42,14 @@
- #include <gst/fft/gstfftf32.h>
- #include <gst/pbutils/pbutils.h>
- #include <gst/tag/tag.h>
--#include <gst/interfaces/navigation.h>
-+#include <gst/video/navigation.h>
- 
- #if defined(GDK_WINDOWING_X11)
- #  include <gdk/gdkx.h>
--#  include <gst/interfaces/xoverlay.h>
-+#  include <gst/video/videooverlay.h>
- #elif defined(GDK_WINDOWING_WIN32)
- #  include <gdk/gdkwin32.h>
--#  include <gst/interfaces/xoverlay.h>
-+#  include <gst/video/videooverlay.h>
- #endif
- 
- #include "banshee-gst.h"
-@@ -155,11 +155,11 @@ struct BansheePlayer {
-     // Video State
-     BpVideoDisplayContextType video_display_context_type;
-     #if defined(GDK_WINDOWING_X11)
--    GstXOverlay *xoverlay;
-+    GstVideoOverlay *video_overlay;
-     GdkWindow *video_window;
-     XID video_window_xid;
-     #elif defined(GDK_WINDOWING_WIN32)
--    GstXOverlay *xoverlay;
-+    GstVideoOverlay *video_overlay;
-     GdkWindow *video_window;
-     HWND video_window_xid;
-     #endif
-@@ -179,6 +179,8 @@ struct BansheePlayer {
-     GstFFTF32 *vis_fft;
-     GstFFTF32Complex *vis_fft_buffer;
-     gfloat *vis_fft_sample_buffer;
-+    GstPad *vis_event_probe_pad;
-+    gulong vis_event_probe_id;
-     
-     // Plugin Installer State
-     GdkWindow *window;
-@@ -197,6 +199,7 @@ struct BansheePlayer {
-     // http://replaygain.hydrogenaudio.org/player_scale.html
-     gdouble rg_gain_history[10];
-     gint history_size;
-+    gulong rg_pad_block_id;
- 
-     //dvd navigation
-     GstNavigation *navigation;
-diff --git a/libbanshee/banshee-player-replaygain.c b/libbanshee/banshee-player-replaygain.c
-index a479d4a..e42b197 100644
---- a/libbanshee/banshee-player-replaygain.c
-+++ b/libbanshee/banshee-player-replaygain.c
-@@ -79,17 +79,13 @@ static void on_target_gain_changed (GstElement *rgvolume, GParamSpec *pspec, Ban
-     _bp_rgvolume_print_volume (player);
- }
- 
--static void
--pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-+static GstPadProbeReturn
-+pad_block_cb (GstPad *srcPad, GstPadProbeInfo *info, gpointer user_data)
- {
-     BansheePlayer* player;
- 
--    if (!blocked) {
--        return;
--    }
--
-     player = (BansheePlayer*) user_data;
--    g_return_if_fail (IS_BANSHEE_PLAYER (player));
-+    g_return_val_if_fail (IS_BANSHEE_PLAYER (player), GST_PAD_PROBE_OK);
- 
-     // The pad_block_cb can get triggered multiple times, on different threads.
-     // Lock around the link/unlink code, so we don't end up going through here
-@@ -99,11 +95,9 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-     if ((player->replaygain_enabled && player->rgvolume_in_pipeline) ||
-         (!player->replaygain_enabled && !player->rgvolume_in_pipeline)) {
-         // The pipeline is already in the correct state.  Unblock the pad, and return.
-+        player->rg_pad_block_id = 0;
-         g_mutex_unlock (player->replaygain_mutex);
--        if (gst_pad_is_blocked (srcPad)) {
--            gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
--        }
--        return;
-+        return GST_PAD_PROBE_REMOVE;
-     }
- 
-     if (player->rgvolume_in_pipeline) {
-@@ -139,13 +133,12 @@ pad_block_cb (GstPad *srcPad, gboolean blocked, gpointer user_data)
-     }
- 
-     // Our state is now consistent
-+    player->rg_pad_block_id = 0;
-     g_mutex_unlock (player->replaygain_mutex);
- 
--    if (gst_pad_is_blocked (srcPad)) {
--        gst_pad_set_blocked_async (srcPad, FALSE, &pad_block_cb, player);
--    }
--
-     _bp_rgvolume_print_volume (player);
-+
-+    return GST_PAD_PROBE_REMOVE;
- }
- 
- // ---------------------------------------------------------------------------
-@@ -187,9 +180,9 @@ void _bp_replaygain_pipeline_rebuild (BansheePlayer* player)
-     srcPad = gst_element_get_static_pad (player->before_rgvolume, "src");
- 
-     if (gst_pad_is_active (srcPad) && !gst_pad_is_blocked (srcPad)) {
--        gst_pad_set_blocked_async (srcPad, TRUE, &pad_block_cb, player);
--    } else if (srcPad->block_callback == NULL) {
--        pad_block_cb (srcPad, TRUE, player);
-+        player->rg_pad_block_id = gst_pad_add_probe (srcPad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, &pad_block_cb, player, NULL);
-+    } else if (!player->rg_pad_block_id) {
-+        pad_block_cb (srcPad, NULL, player);
-     }
- }
- 
-diff --git a/libbanshee/banshee-player-video.c b/libbanshee/banshee-player-video.c
-index b901354..eb95c3f 100644
---- a/libbanshee/banshee-player-video.c
-+++ b/libbanshee/banshee-player-video.c
-@@ -37,54 +37,54 @@
- #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
- 
- static gboolean
--bp_video_find_xoverlay (BansheePlayer *player)
-+bp_video_find_video_overlay (BansheePlayer *player)
- {
-     GstElement *video_sink = NULL;
--    GstElement *xoverlay;
--    GstXOverlay *previous_xoverlay;
--    gboolean    found_xoverlay;
-+    GstElement *video_overlay;
-+    GstVideoOverlay *previous_video_overlay;
-+    gboolean    found_video_overlay;
- 
-     g_object_get (player->playbin, "video-sink", &video_sink, NULL);
- 
-     g_mutex_lock (player->video_mutex);
--    previous_xoverlay = player->xoverlay;
-+    previous_video_overlay = player->video_overlay;
- 
-     if (video_sink == NULL) {
--        player->xoverlay = NULL;
--        if (previous_xoverlay != NULL) {
--            gst_object_unref (previous_xoverlay);
-+        player->video_overlay = NULL;
-+        if (previous_video_overlay != NULL) {
-+            gst_object_unref (previous_video_overlay);
-         }
-         g_mutex_unlock (player->video_mutex);
-         return FALSE;
-     }
-    
--    xoverlay = GST_IS_BIN (video_sink)
--        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_X_OVERLAY)
-+    video_overlay = GST_IS_BIN (video_sink)
-+        ? gst_bin_get_by_interface (GST_BIN (video_sink), GST_TYPE_VIDEO_OVERLAY)
-         : video_sink;
-     
--    player->xoverlay = GST_IS_X_OVERLAY (xoverlay) ? GST_X_OVERLAY (xoverlay) : NULL;
-+    player->video_overlay = GST_IS_VIDEO_OVERLAY (video_overlay) ? GST_VIDEO_OVERLAY (video_overlay) : NULL;
-     
--    if (previous_xoverlay != NULL) {
--        gst_object_unref (previous_xoverlay);
-+    if (previous_video_overlay != NULL) {
-+        gst_object_unref (previous_video_overlay);
-     }
-         
- #if !defined(GDK_WINDOWING_WIN32) // We can't rely on aspect ratio from dshowvideosink
--    if (player->xoverlay != NULL && g_object_class_find_property (
--        G_OBJECT_GET_CLASS (player->xoverlay), "force-aspect-ratio")) {
--        g_object_set (G_OBJECT (player->xoverlay), "force-aspect-ratio", TRUE, NULL);
-+    if (player->video_overlay != NULL && g_object_class_find_property (
-+        G_OBJECT_GET_CLASS (player->video_overlay), "force-aspect-ratio")) {
-+        g_object_set (G_OBJECT (player->video_overlay), "force-aspect-ratio", TRUE, NULL);
-     }
- #endif
-     
--    if (player->xoverlay != NULL && g_object_class_find_property (
--        G_OBJECT_GET_CLASS (player->xoverlay), "handle-events")) {
--        g_object_set (G_OBJECT (player->xoverlay), "handle-events", FALSE, NULL);
-+    if (player->video_overlay != NULL && g_object_class_find_property (
-+        G_OBJECT_GET_CLASS (player->video_overlay), "handle-events")) {
-+        g_object_set (G_OBJECT (player->video_overlay), "handle-events", FALSE, NULL);
-     }
- 
-     gst_object_unref (video_sink);
--    found_xoverlay = (player->xoverlay != NULL) ? TRUE : FALSE;
-+    found_video_overlay = (player->video_overlay != NULL) ? TRUE : FALSE;
- 
-     g_mutex_unlock (player->video_mutex);
--    return found_xoverlay;
-+    return found_video_overlay;
- }
- 
- #endif /* GDK_WINDOWING_X11 || GDK_WINDOWING_WIN32 */
-@@ -130,27 +130,27 @@ bp_video_sink_element_added (GstBin *videosink, GstElement *element, BansheePlay
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
- 
-     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
--    bp_video_find_xoverlay (player);
-+    bp_video_find_video_overlay (player);
-     #endif
- }
- 
- static void
- bp_video_bus_element_sync_message (GstBus *bus, GstMessage *message, BansheePlayer *player)
- {
--    gboolean found_xoverlay;
-+    gboolean found_video_overlay;
-     
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
- 
-     #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WIN32)
- 
--    if (message->structure == NULL || !gst_structure_has_name (message->structure, "prepare-xwindow-id")) {
-+    if (!gst_is_video_overlay_prepare_window_handle_message (message)) {
-         return;
-     }
- 
--    found_xoverlay = bp_video_find_xoverlay (player);
-+    found_video_overlay = bp_video_find_video_overlay (player);
- 
--    if (found_xoverlay) {
--        gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
-+    if (found_video_overlay) {
-+        gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
-     }
- 
-     #endif
-@@ -164,7 +164,7 @@ static void
- cb_caps_set (GObject *obj, GParamSpec *pspec, BansheePlayer *p)
- {
-     GstStructure * s = NULL;
--    GstCaps * caps = gst_pad_get_negotiated_caps (GST_PAD (obj));
-+    GstCaps * caps = gst_pad_get_current_caps (GST_PAD (obj));
- 
-     if (G_UNLIKELY (!caps)) {
-         return;
-@@ -219,7 +219,7 @@ _bp_parse_stream_info (BansheePlayer *player)
-     }
- 
-     if (G_LIKELY (vpad)) {
--        GstCaps *caps = gst_pad_get_negotiated_caps (vpad);
-+        GstCaps *caps = gst_pad_get_current_caps (vpad);
-         if (G_LIKELY (caps)) {
-             cb_caps_set (G_OBJECT (vpad), NULL, player);
-             gst_caps_unref (caps);
-@@ -249,21 +249,18 @@ _bp_video_pipeline_setup (BansheePlayer *player, GstBus *bus)
- 
-     player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_GDK_WINDOW;
-     
--    videosink = gst_element_factory_make ("gconfvideosink", "videosink");
-+    videosink = gst_element_factory_make ("autovideosink", "videosink");
-     if (videosink == NULL) {
--        videosink = gst_element_factory_make ("autovideosink", "videosink");
--        if (videosink == NULL) {
--            player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
--            videosink = gst_element_factory_make ("fakesink", "videosink");
--            if (videosink != NULL) {
--                g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
--            }
-+        player->video_display_context_type = BP_VIDEO_DISPLAY_CONTEXT_UNSUPPORTED;
-+        videosink = gst_element_factory_make ("fakesink", "videosink");
-+        if (videosink != NULL) {
-+            g_object_set (G_OBJECT (videosink), "sync", TRUE, NULL);
-         }
-     }
-     
-     g_object_set (G_OBJECT (player->playbin), "video-sink", videosink, NULL);
-     
--    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player);
-+    gst_bus_set_sync_handler (bus, gst_bus_sync_signal_handler, player, NULL);
-     g_signal_connect (bus, "sync-message::element", G_CALLBACK (bp_video_bus_element_sync_message), player);
-         
-     if (GST_IS_BIN (videosink)) {
-@@ -349,21 +346,21 @@ bp_video_window_expose (BansheePlayer *player, GdkWindow *window, gboolean direc
- {
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     
--    if (direct && player->xoverlay != NULL && GST_IS_X_OVERLAY (player->xoverlay)) {
--        gst_x_overlay_expose (player->xoverlay);
-+    if (direct && player->video_overlay != NULL && GST_IS_VIDEO_OVERLAY (player->video_overlay)) {
-+        gst_video_overlay_expose (player->video_overlay);
-         return;
-     }
- 
--    if (player->xoverlay == NULL && !bp_video_find_xoverlay (player)) {
-+    if (player->video_overlay == NULL && !bp_video_find_video_overlay (player)) {
-         return;
-     }
-     
--    gst_object_ref (player->xoverlay);
-+    gst_object_ref (player->video_overlay);
- 
--    gst_x_overlay_set_xwindow_id (player->xoverlay, player->video_window_xid);
--    gst_x_overlay_expose (player->xoverlay);
-+    gst_video_overlay_set_window_handle (player->video_overlay, player->video_window_xid);
-+    gst_video_overlay_expose (player->video_overlay);
- 
--    gst_object_unref (player->xoverlay);
-+    gst_object_unref (player->video_overlay);
- }
- 
- // MUST be called from the GTK main thread; calling it in OnRealized will do the right thing.
-@@ -379,7 +376,7 @@ bp_video_window_realize (BansheePlayer *player, GdkWindow *window)
- //    //Explicitly create the native window.  GDK_WINDOW_XWINDOW will call this
- //    //function anyway, but this way we can raise a more useful message should it fail.
- //    if (!gdk_window_ensure_native (window)) {
--//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstXOverlay!");
-+//        banshee_log (BANSHEE_LOG_TYPE_ERROR, "player-video", "Couldn't create native window needed for GstVideoOverlay!");
- //    }
- //#endif
- 
-diff --git a/libbanshee/banshee-player-vis.c b/libbanshee/banshee-player-vis.c
-index 5787c87..7e7dc78 100644
---- a/libbanshee/banshee-player-vis.c
-+++ b/libbanshee/banshee-player-vis.c
-@@ -27,17 +27,17 @@
- //
- 
- #include <math.h>
-+#include <gst/audio/audio.h>
- 
- #include "banshee-player-vis.h"
- 
- #define SLICE_SIZE 735
- 
- static GstStaticCaps vis_data_sink_caps = GST_STATIC_CAPS (
--    "audio/x-raw-float, "
-+    "audio/x-raw, "
-+    "format = (string) " GST_AUDIO_NE(F32) ", "
-     "rate = (int) 44100, "
--    "channels = (int) 2, "
--    "endianness = (int) BYTE_ORDER, "
--    "width = (int) 32"
-+    "channels = (int) 2"
- );
- 
- // ---------------------------------------------------------------------------
-@@ -48,6 +48,7 @@ static void
- bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer userdata)
- {
-     BansheePlayer *player = (BansheePlayer*)userdata;
-+    GstCaps *caps;
-     GstStructure *structure;
-     gint channels, wanted_size;
-     gfloat *data;
-@@ -69,14 +70,16 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
-         player->vis_thawing = FALSE;
-     }
-     
--    structure = gst_caps_get_structure (gst_buffer_get_caps (buffer), 0);
-+    caps = gst_pad_get_current_caps (pad);
-+    structure = gst_caps_get_structure (caps, 0);
-     gst_structure_get_int (structure, "channels", &channels);
-+    gst_caps_unref (caps);
-     
-     wanted_size = channels * SLICE_SIZE * sizeof (gfloat);
- 
--    gst_adapter_push (player->vis_buffer, gst_buffer_copy (buffer));
-+    gst_adapter_push (player->vis_buffer, gst_buffer_ref (buffer));
-     
--    while ((data = (gfloat *)gst_adapter_peek (player->vis_buffer, wanted_size)) != NULL) {
-+    while ((data = (gfloat *)gst_adapter_map (player->vis_buffer, wanted_size)) != NULL) {
-         gfloat *deinterlaced = g_malloc (wanted_size);
-         gfloat *specbuf = g_new (gfloat, SLICE_SIZE * 2);
- 
-@@ -124,6 +127,7 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
-         g_free (deinterlaced);
-         g_free (specbuf);
- 
-+        gst_adapter_unmap (player->vis_buffer);
-         gst_adapter_flush (player->vis_buffer, wanted_size);
-     }
- }
-@@ -132,65 +136,28 @@ bp_vis_pcm_handoff (GstElement *sink, GstBuffer *buffer, GstPad *pad, gpointer u
- // Internal Functions
- // ---------------------------------------------------------------------------
- 
--static void
--_bp_vis_pipeline_block_callback (GstPad *pad, gboolean blocked, gpointer data)
-+static GstPadProbeReturn
-+_bp_vis_pipeline_event_probe (GstPad *pad, GstPadProbeInfo *info, gpointer data)
- {
-     BansheePlayer *player = (BansheePlayer *) data;
-+    GstEvent *event;
- 
--    if (!blocked) {
--        // Set thawing mode (discards buffers that are too old from the queue).
--        player->vis_thawing = TRUE;
--    }
--}
--
--static void
--_bp_vis_pipeline_set_blocked (BansheePlayer *player, gboolean blocked)
--{
--    GstPad *queue_sink;
--
--    if (player->vis_resampler == NULL)
--        return;
--
--    queue_sink = gst_element_get_static_pad (player->vis_resampler, "src");
--
--    gst_pad_set_blocked_async (queue_sink, blocked, _bp_vis_pipeline_block_callback, (gpointer) player);
--
--    gst_object_unref (GST_OBJECT (queue_sink));
--}
--
--static gboolean
--_bp_vis_pipeline_event_probe (GstPad *pad, GstEvent *event, gpointer data)
--{
--    BansheePlayer *player = (BansheePlayer *) data;
-+    if ((info->type & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) == 0)
-+        return GST_PAD_PROBE_PASS;
- 
-+    event = GST_EVENT (info->data);
-     switch (GST_EVENT_TYPE (event)) {
-         case GST_EVENT_FLUSH_START:
-         case GST_EVENT_FLUSH_STOP:
-         case GST_EVENT_SEEK:
--        case GST_EVENT_NEWSEGMENT:
-+        case GST_EVENT_SEGMENT:
-         case GST_EVENT_CUSTOM_DOWNSTREAM:
-             player->vis_thawing = TRUE;
- 
-         default: break;
-     }
- 
--    if (player->vis_enabled)
--        return TRUE;
--
--    switch (GST_EVENT_TYPE (event)) {
--    case GST_EVENT_EOS:
--    case GST_EVENT_CUSTOM_DOWNSTREAM_OOB:
--        _bp_vis_pipeline_set_blocked (player, FALSE);
--        break;
--    case GST_EVENT_CUSTOM_DOWNSTREAM:
--    case GST_EVENT_NEWSEGMENT:
--        _bp_vis_pipeline_set_blocked (player, TRUE);
--        break;
--
--    default: break;
--    }
--
--    return TRUE;
-+    return GST_PAD_PROBE_PASS;
- }
- 
- void
-@@ -212,9 +179,8 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     // Core elements, if something fails here, it's the end of the world
-     audiosinkqueue = gst_element_factory_make ("queue", "vis-queue");
- 
--    pad = gst_element_get_static_pad (audiosinkqueue, "sink");
--    gst_pad_add_event_probe (pad, G_CALLBACK (_bp_vis_pipeline_event_probe), player);
--    gst_object_unref (GST_OBJECT (pad));
-+    player->vis_event_probe_pad = gst_element_get_static_pad (audiosinkqueue, "sink");
-+    player->vis_event_probe_id = gst_pad_add_probe (player->vis_event_probe_pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, _bp_vis_pipeline_event_probe, player, NULL);
- 
-     resampler = gst_element_factory_make ("audioresample", "vis-resample");
-     converter = gst_element_factory_make ("audioconvert", "vis-convert");
-@@ -255,7 +221,7 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-                       converter, fakesink, NULL);
-     
-     pad = gst_element_get_static_pad (audiosinkqueue, "sink");
--    teepad = gst_element_get_request_pad (player->audiotee, "src%d");
-+    teepad = gst_element_get_request_pad (player->audiotee, "src_%u");
-     gst_pad_link (teepad, pad);
-     gst_object_unref (GST_OBJECT (teepad));
-     gst_object_unref (GST_OBJECT (pad));
-@@ -270,14 +236,17 @@ _bp_vis_pipeline_setup (BansheePlayer *player)
-     player->vis_resampler = resampler;
-     player->vis_thawing = FALSE;
-     player->vis_enabled = FALSE;
--
--    // Disable the pipeline till we hear otherwise from managed land.
--    _bp_vis_pipeline_set_blocked (player, TRUE);
- }
- 
- void
- _bp_vis_pipeline_destroy (BansheePlayer *player)
- {
-+    if (player->vis_event_probe_pad) {
-+        gst_pad_remove_probe (player->vis_event_probe_pad, player->vis_event_probe_id);
-+        gst_object_unref (GST_OBJECT (player->vis_event_probe_pad));
-+        player->vis_event_probe_pad = NULL;
-+    }
-+
-     if (player->vis_buffer != NULL) {
-         gst_object_unref (player->vis_buffer);
-         player->vis_buffer = NULL;
-@@ -315,6 +284,5 @@ bp_set_vis_data_callback (BansheePlayer *player, BansheePlayerVisDataCallback cb
- 
-     player->vis_data_cb = cb;
- 
--    _bp_vis_pipeline_set_blocked (player, cb == NULL);
-     player->vis_enabled = cb != NULL;
- }
-diff --git a/libbanshee/banshee-player.c b/libbanshee/banshee-player.c
-index c655a72..b8f98b8 100644
---- a/libbanshee/banshee-player.c
-+++ b/libbanshee/banshee-player.c
-@@ -250,12 +250,11 @@ bp_set_position (BansheePlayer *player, guint64 time_ms)
- P_INVOKE guint64
- bp_get_position (BansheePlayer *player)
- {
--    static GstFormat format = GST_FORMAT_TIME;
-     gint64 position;
- 
-     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
- 
--    if (player->playbin != NULL && gst_element_query_position (player->playbin, &format, &position)) {
-+    if (player->playbin != NULL && gst_element_query_position (player->playbin, GST_FORMAT_TIME, &position)) {
-         return position / GST_MSECOND;
-     }
-     
-@@ -265,12 +264,11 @@ bp_get_position (BansheePlayer *player)
- P_INVOKE guint64
- bp_get_duration (BansheePlayer *player)
- {
--    static GstFormat format = GST_FORMAT_TIME;
-     gint64 duration;
- 
-     g_return_val_if_fail (IS_BANSHEE_PLAYER (player), 0);
- 
--    if (player->playbin != NULL && gst_element_query_duration (player->playbin, &format, &duration)) {
-+    if (player->playbin != NULL && gst_element_query_duration (player->playbin, GST_FORMAT_TIME, &duration)) {
-         return duration / GST_MSECOND;
-     }
-     
-@@ -446,7 +444,6 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     g_return_if_fail (IS_BANSHEE_PLAYER (player));
-     gint64 pos = -1;
-     GstState state;
--    GstFormat format = GST_FORMAT_BYTES;
-     gboolean paused = FALSE;
- 
-     // Gstreamer playbin do not support to set suburi during playback
-@@ -454,7 +451,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     gst_element_get_state (player->playbin, &state, NULL, 0);
-     paused = (state == GST_STATE_PAUSED);
-     if (state >= GST_STATE_PAUSED) {
--        gst_element_query_position (player->playbin, &format, &pos);
-+        gst_element_query_position (player->playbin, GST_FORMAT_BYTES, &pos);
-         gst_element_set_state (player->playbin, GST_STATE_READY);
-         // Force to wait asynch operation
-         gst_element_get_state (player->playbin, &state, NULL, -1);
-@@ -467,7 +464,7 @@ bp_set_subtitle_uri (BansheePlayer *player, const gchar *uri)
-     gst_element_get_state (player->playbin, &state, NULL, -1);
- 
-     if (pos != -1) {
--        gst_element_seek_simple (player->playbin, format, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
-+        gst_element_seek_simple (player->playbin, GST_FORMAT_BYTES, GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT, pos);
-     }
- }
- 
-diff --git a/libbanshee/banshee-ripper.c b/libbanshee/banshee-ripper.c
-index e0e8c85..b3f8fed 100644
---- a/libbanshee/banshee-ripper.c
-+++ b/libbanshee/banshee-ripper.c
-@@ -85,7 +85,6 @@ br_raise_error (BansheeRipper *ripper, const gchar *error, const gchar *debug)
- static gboolean
- br_iterate_timeout (BansheeRipper *ripper)
- {
--    GstFormat format = GST_FORMAT_TIME;
-     GstState state;
-     gint64 position;
-     
-@@ -96,7 +95,7 @@ br_iterate_timeout (BansheeRipper *ripper)
-         return TRUE;
-     }
- 
--    if (!gst_element_query_position (ripper->cddasrc, &format, &position)) {
-+    if (!gst_element_query_position (ripper->cddasrc, GST_FORMAT_TIME, &position)) {
-         return TRUE;
-     }
-     
-@@ -142,8 +141,9 @@ br_encoder_probe_mime_type (GstBin *bin)
-         GstIterator *pad_iter = gst_element_iterate_src_pads (element);
-         
-         BANSHEE_GST_ITERATOR_ITERATE (pad_iter, GstPad *, pad, TRUE, {
--            GstStructure *str = GST_PAD_CAPS (pad) != NULL
--                ? gst_caps_get_structure (GST_PAD_CAPS (pad), 0)
-+            GstCaps *caps = gst_pad_get_current_caps (pad);
-+            GstStructure *str = caps != NULL
-+                ? gst_caps_get_structure (caps, 0)
-                 : NULL;
- 
-             if (str != NULL) {
-@@ -171,11 +171,8 @@ br_encoder_probe_mime_type (GstBin *bin)
-                     preferred_mimetype = mimetype;    
-                 }
-             }
--            
--            gst_object_unref (pad);
-+            gst_caps_unref (caps);
-         });
--        
--        gst_object_unref (element);
-     });
- 
-     return preferred_mimetype;
-@@ -271,7 +268,7 @@ br_pipeline_construct (BansheeRipper *ripper)
-         return FALSE;
-     }
- 
--    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc");
-+    ripper->cddasrc = gst_element_make_from_uri (GST_URI_SRC, "cdda://1", "cddasrc", NULL);
-     if (ripper->cddasrc == NULL) {
-         br_raise_error (ripper, _("Could not initialize element from cdda URI"), NULL);
-         return FALSE;
-@@ -405,7 +402,6 @@ br_rip_track (BansheeRipper *ripper, gint track_number, gchar *output_path,
-             
-             // We'll warn the user in the UI if we can't tag the encoded audio files
-             *tagging_supported = TRUE;
--            gst_object_unref (element);
-         }
-     });
-     
-diff --git a/libbanshee/banshee-tagger.c b/libbanshee/banshee-tagger.c
-index ca15e8f..762dfa9 100644
---- a/libbanshee/banshee-tagger.c
-+++ b/libbanshee/banshee-tagger.c
-@@ -69,7 +69,7 @@ bt_tag_list_foreach (const GstTagList *list, const gchar *tag, gpointer userdata
- GstTagList *
- bt_tag_list_new ()
- {
--    return gst_tag_list_new ();
-+    return gst_tag_list_new_empty ();
- }
- 
- void
-diff --git a/libbanshee/banshee-transcoder.c b/libbanshee/banshee-transcoder.c
-index 10fc35c..0e241f0 100644
---- a/libbanshee/banshee-transcoder.c
-+++ b/libbanshee/banshee-transcoder.c
-@@ -64,14 +64,13 @@ gst_transcoder_raise_error(GstTranscoder *transcoder, const gchar *error, const
- static gboolean
- gst_transcoder_iterate_timeout(GstTranscoder *transcoder)
- {
--    GstFormat format = GST_FORMAT_TIME;
-     gint64 position;
-     gint64 duration;
- 
-     g_return_val_if_fail(transcoder != NULL, FALSE);
- 
--    if(!gst_element_query_duration(transcoder->pipeline, &format, &duration) ||
--        !gst_element_query_position(transcoder->sink_bin, &format, &position)) {
-+    if(!gst_element_query_duration(transcoder->pipeline, GST_FORMAT_TIME, &duration) ||
-+        !gst_element_query_position(transcoder->sink_bin, GST_FORMAT_TIME, &position)) {
-         return TRUE;
-     }
- 
-@@ -196,14 +195,14 @@ gst_transcoder_new_decoded_pad(GstElement *decodebin, GstPad *pad,
- 
-     g_return_if_fail(transcoder != NULL);
- 
--    audiopad = gst_element_get_pad(transcoder->sink_bin, "sink");
-+    audiopad = gst_element_get_static_pad(transcoder->sink_bin, "sink");
-     
-     if(GST_PAD_IS_LINKED(audiopad)) {
-         g_object_unref(audiopad);
-         return;
-     }
- 
--    caps = gst_pad_get_caps(pad);
-+    caps = gst_pad_query_caps(pad, NULL);
-     str = gst_caps_get_structure(caps, 0);
-     
-     if(!g_strrstr(gst_structure_get_name(str), "audio")) {
-@@ -235,19 +234,19 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
-     
-     transcoder->pipeline = gst_pipeline_new("pipeline");
- 
--    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source");
-+    source_elem = gst_element_make_from_uri(GST_URI_SRC, input_uri, "source", NULL);
-     if(source_elem == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not create source element"), NULL);
-         return FALSE;
-     }
- 
--    decoder_elem = gst_element_factory_make("decodebin2", "decodebin2");
-+    decoder_elem = gst_element_factory_make("decodebin", "decodebin");
-     if(decoder_elem == NULL) {
--        gst_transcoder_raise_error(transcoder, _("Could not create decodebin2 plugin"), NULL);
-+        gst_transcoder_raise_error(transcoder, _("Could not create decodebin plugin"), NULL);
-         return FALSE;
-     }
-     
--    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink");
-+    sink_elem = gst_element_make_from_uri(GST_URI_SINK, output_uri, "sink", NULL);
-     if(sink_elem == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not create sink element"), NULL);
-         return FALSE;
-@@ -277,7 +276,7 @@ gst_transcoder_create_pipeline(GstTranscoder *transcoder,
-          return FALSE;
-     }
- 
--    encoder_pad = gst_element_get_pad(conv_elem, "sink");
-+    encoder_pad = gst_element_get_static_pad(conv_elem, "sink");
-     if(encoder_pad == NULL) {
-         gst_transcoder_raise_error(transcoder, _("Could not get sink pad from encoder"), NULL);
-         return FALSE;
--- 
-1.7.10.4
\ No newline at end of file
diff --git a/testing/baobab/PKGBUILD b/testing/baobab/PKGBUILD
deleted file mode 100644
index 5d9f45bcd..000000000
--- a/testing/baobab/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169273 2012-10-18 19:29:39Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=baobab
-pkgver=3.6.2
-pkgrel=1
-pkgdesc="A graphical directory tree analyzer"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8ffef397f11fb1e7105d1429be828e88b9ceb5746984f0bb978e66e87faf047a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/baobab/baobab.install b/testing/baobab/baobab.install
deleted file mode 100644
index 5a3c24041..000000000
--- a/testing/baobab/baobab.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/bash/PKGBUILD b/testing/bash/PKGBUILD
deleted file mode 100644
index 51be4e9f7..000000000
--- a/testing/bash/PKGBUILD
+++ /dev/null
@@ -1,155 +0,0 @@
-# $Id: PKGBUILD 163782 2012-07-20 02:08:58Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=bash
-_basever=4.2
-_patchlevel=037 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=1
-pkgdesc="The GNU Bourne Again shell"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnu.org/software/bash/bash.html"
-groups=('base')
-backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
-depends=('readline>=6.1' 'glibc')
-provides=('sh')
-install=bash.install
-source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig}
-        dot.bashrc
-        dot.bash_profile
-        dot.bash_logout
-        system.bashrc
-        system.bash_logout)
-if [ $_patchlevel -gt 000 ]; then
-    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-        source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig})
-    done
-fi
-
-build() {
-  cd ${srcdir}/${pkgname}-$_basever
-  for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-    msg "applying patch bash${_basever//./}-$(printf "%03d" $p)"
-    patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p)
-  done
-
-  _bashconfig=(-DDEFAULT_PATH_VALUE=\'\"/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin\"\'
-               -DSTANDARD_UTILS_PATH=\'\"/usr/bin:/bin:/usr/sbin:/sbin\"\'
-               -DSYS_BASHRC=\'\"/etc/bash.bashrc\"\'
-               -DSYS_BASH_LOGOUT=\'\"/etc/bash.bash_logout\"\')
-  export CFLAGS="${CFLAGS} ${_bashconfig[@]}"
-
-  ./configure --prefix=/usr --with-curses --enable-readline \
-    --without-bash-malloc --with-installed-readline \
-    --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make DESTDIR=${pkgdir} install
-
-  # for now, bash is our default /bin/sh
-  cd ${pkgdir}/bin
-  ln -s bash sh
-
-  install -dm755 ${pkgdir}/etc/skel/
-  
-  # system-wide configuration files
-  install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
-  install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout
-  
-  # user configuration file skeletons
-  install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc
-  install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile
-  install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
-}
-
-md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
-         '8d37a3f97a48c1e56e1a4ded877ed944'
-         '027d6bd8f5f6a06b75bb7698cb478089'
-         '2902e0fee7a9168f3a4fd2ccd60ff047'
-         '42f4400ed2314bd7519c020d0187edc5'
-         '3546099a1b2f667adc9794f52e78e35b'
-         '472f536d7c9e8250dc4568ec4cfaf294'
-         '1100bc1dda2cdc06ac44d7e5d17864a3'
-         'a7184b76eb4a079f10174a0a8f574819'
-         '30e7948079921d3261efcc6a40722135'
-         'c4d45307f7e69fe508ce347c4cec1955'
-         '9ea06decec43a198f3d7cf29acc602f8'
-         '74bddae6eeb9227a04a467d42597a34d'
-         'fb48f6134d7b013135929476aa0c250c'
-         '3e6a18226b16c773229246abd07a1f5e'
-         'e70e45de33426b38153b390be0dbbcd4'
-         'e667dc9348ebc3e0e14bfdd87f4b6ff2'
-         'ce4e5c484993705b27daa151eca242c2'
-         '41cbd8e57589bc081a546a014ddb12f8'
-         '88d1f96db29461767602e2546803bda7'
-         'b8b781520f4c7493a2a1ac3010a44a44'
-         '24c574bf6d6a581e300823d9c1276af6'
-         '354a0899a7c4b446454c52546562b55b'
-         '4c5835f2fbab36c4292bb334977e5b6d'
-         'ff4547ca7b508d52101729d61f5b77b6'
-         '0a51602b535ef661ee707be6c8bdb373'
-         'cec7c92a4d8052ea4b29216365d16566'
-         '58deacf3d57cbd75575444ff6a3b0806'
-         '9ed2a08e549c3c17745f19e8413cfb31'
-         '72d5059820015231483bb7415d09e9db'
-         '45b04b41a4230f469d3e47ab9952c2df'
-         '608336ebe215984ef126e3c29d2d3409'
-         '623f63025d155a84977b62531e260ee2'
-         'ed19da878e3f630834c62b9d9dcc6fce'
-         'eef2dd4a0e4505dc8f8e664b40c6cd66'
-         '2d07daba0b8ca8f876d2aa052ff594b4'
-         '0cb823a44e6dc1cde7ac97ae5c8163c9'
-         '53d246537e1fffd1aaa02ba5c056211c'
-         '60f983a1dded5f0b28040ff4b3f1e9b5'
-         '304fd129a58fee2d8a34f8b4704db0aa'
-         '9df4bf4f46aaadc436f430187741f815'
-         '6921a0b4228fe89b6537a5c29f027c89'
-         '4ef0e2a2cbfbdd53346f927000b7e112'
-         '1195d85447f3d048d2c9bcd075fa765c'
-         'b0f3a651ce29a1feee687d93177870f1'
-         'b09000bba08da6ac753124593850cdf7'
-         '204bb5054d1f8bafe2b446d4e5d0d99a'
-         '09d3f96a16b881334cfaee0cf320b47e'
-         'aab415350bcc2bb0c29943b413499d96'
-         '597bf71a2aac6feb510b7505cdd3d4f7'
-         'b0db384bdedecafbdd70c8d22c56af5f'
-         '3fab459b4e09daea529cacad025b13b3'
-         'bab99835ad6198cb1109fac89a085262'
-         '4ad8d11e72afc6090e701073ff034cf4'
-         '5658ef10c9d0d804126ec1ce700e4e2c'
-         'c7d2493e44490f01dd20bdc8feb0a6a7'
-         'e4855dbc4b743618b54d408bd5878637'
-         '9f19c199dd8d1fa9254eebe738759272'
-         '600c8e90c2fb13cdbc7aa3f18566df03'
-         'a6ed82daf034587aee2f2581ba5fe829'
-         '821620a0389df723644911c56796ca8c'
-         'da9265aa2527fd4a7481baa3e0550287'
-         '0043f8b75f46f43608a67b863e300fe8'
-         'ec444d229e8899fbaaf6fc7de2d82ae6'
-         'b632fca3a4943825bfaf3bd29df6b27d'
-         'b4bc1c4dc1b508ff9cdfc44f1a5039b5'
-         '2ffa9a802bbd57540021715f84cc76f4'
-         '89390ff6a3c2ef7e09dd4b8b097a8e56'
-         '3e9b529ef3726b75d125d678de76977f'
-         'eee08003395c417f677d1a4bf8c548ee'
-         'f670f7672b11d0df8c31885dbf15f390'
-         '2fe070dd6d75d8ff16f269184a16e9c4'
-         '5018b6b7737808141043b57cf4eb842d'
-         '4e610506c1711bf3483b965800ac3d5d'
-         'cb65e541f9b60a8cb1fe58404f264b73'
-         '7cd9bfdf7cbfd45274d07620ee94c8d9'
-         'a7d2eace0da5fd236c93dbfd93458838'
-         '9c3142956064d175a880bcb186e51ef9'
-         'a1a87649853f20fe99572ddc02b0c67f'
-         'c10692f447d4966c879f8fb8d7c8ebc9'
-         '1bf5e34ad46566bc2d0eb7560ff8968e')
diff --git a/testing/bash/bash.install b/testing/bash/bash.install
deleted file mode 100644
index bc75e9b6a..000000000
--- a/testing/bash/bash.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(bash.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/bash/dot.bash_logout b/testing/bash/dot.bash_logout
deleted file mode 100644
index 0e4e4f184..000000000
--- a/testing/bash/dot.bash_logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# ~/.bash_logout
-#
diff --git a/testing/bash/dot.bash_profile b/testing/bash/dot.bash_profile
deleted file mode 100644
index 5545f007e..000000000
--- a/testing/bash/dot.bash_profile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# ~/.bash_profile
-#
-
-[[ -f ~/.bashrc ]] && . ~/.bashrc
diff --git a/testing/bash/dot.bashrc b/testing/bash/dot.bashrc
deleted file mode 100644
index a355b0cd3..000000000
--- a/testing/bash/dot.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# ~/.bashrc
-#
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-alias ls='ls --color=auto'
-PS1='[\u@\h \W]\$ '
diff --git a/testing/bash/system.bash_logout b/testing/bash/system.bash_logout
deleted file mode 100644
index a76e48e4a..000000000
--- a/testing/bash/system.bash_logout
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# /etc/bash.bash_logout
-#
diff --git a/testing/bash/system.bashrc b/testing/bash/system.bashrc
deleted file mode 100644
index a2231e861..000000000
--- a/testing/bash/system.bashrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# /etc/bash.bashrc
-#
-
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-PS1='[\u@\h \W]\$ '
-PS2='> '
-PS3='> '
-PS4='+ '
-
-case ${TERM} in
-  xterm*|rxvt*|Eterm|aterm|kterm|gnome*)
-    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-                                                        
-    ;;
-  screen)
-    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/~}"'
-    ;;
-esac
-
-[ -r /usr/share/bash-completion/bash_completion   ] && . /usr/share/bash-completion/bash_completion
diff --git a/testing/bind/127.0.0.zone b/testing/bind/127.0.0.zone
deleted file mode 100644
index 509c311f6..000000000
--- a/testing/bind/127.0.0.zone
+++ /dev/null
@@ -1,11 +0,0 @@
-$ORIGIN 0.0.127.in-addr.arpa.
-
-@			1D IN SOA	localhost. root.localhost. (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	localhost.
-1			1D IN PTR	localhost.
diff --git a/testing/bind/PKGBUILD b/testing/bind/PKGBUILD
deleted file mode 100644
index 8a2ee6ae3..000000000
--- a/testing/bind/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 164044 2012-07-25 00:35:41Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
-
-pkgname=bind
-
-# Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.1.P2
-_pkgver=9.9.1-P2
-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')
-options=('!makeflags' '!libtool')
-depends=('openssl' 'krb5' 'libxml2')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'root.hint::http://www.internic.net/zones/named.root'
-        'remove-tools.patch'
-        'named'
-        'named.conf'
-        'named.conf.d'
-        'named.service'
-        'named.logrotate'
-        'localhost.zone'
-        '127.0.0.zone')
-sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7'
-          'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
-          '18f477f510df31e6c6f547ee2d5fc46e973479bf'
-          '46232e9db243c6c05e170a1781d7a7f413be5d03'
-          '5ca7a5f2a132548a090a045a2df3acea6b35d9eb'
-          '7848edbfb9a848843f57c11c02b0289eefd42d00'
-          '05fb2346a30dee2f99c40914dd23708729839b64'
-          '9ffb5c3f72390a517aeae557e32349d5d278cb63'
-          '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9')
-
-provides=('dns-server')
-
-install=install
-backup=('etc/logrotate.d/named'
-        'etc/conf.d/named'
-        'etc/named.conf')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-tools.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-libxml2 \
-		--with-libtool \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	make DESTDIR="${pkgdir}" install
-
-	rmdir "${pkgdir}/var/run"
-	install -d "${pkgdir}"/usr/share/doc/bind
-	install doc/arm/*.html "${pkgdir}"/usr/share/doc/bind
-
-	install -D -m755 ../named "${pkgdir}"/etc/rc.d/named
-	install -D -m644 ../named.conf.d "${pkgdir}"/etc/conf.d/named
-	install -D -m644 ../named.service "${pkgdir}"/usr/lib/systemd/system/named.service
-	install -D -m600 ../named.logrotate "${pkgdir}"/etc/logrotate.d/named
-	install -D -m640 -o 0 -g 40 ../named.conf "${pkgdir}"/etc/named.conf
-
-	install -d -m750 -o 0 -g 40 "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../root.hint "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../127.0.0.zone "${pkgdir}"/var/named
-	install    -m640 -o 0 -g 40 ../localhost.zone "${pkgdir}"/var/named
-}
diff --git a/testing/bind/install b/testing/bind/install
deleted file mode 100644
index 287d0e05b..000000000
--- a/testing/bind/install
+++ /dev/null
@@ -1,21 +0,0 @@
-post_install() {
-	getent group named &>/dev/null || groupadd -g 40 named
-	getent passwd named &>/dev/null || useradd -u 40 -c "BIND DNS Server" -g named -d /var/named -s /bin/false named
-	passwd -l named &>/dev/null
-
-	touch var/log/named.log
-	chown named:named var/log/named.log
-
-	# create an rndc.key if it doesn't already exist
-	if [[ ! -s etc/rndc.key ]]; then
-		usr/sbin/rndc-confgen -r /dev/urandom -b 256 | head -n 5 >>etc/rndc.key
-		chown root:named etc/rndc.key
-		chmod 640 etc/rndc.key
-	fi
-}
-
-pre_remove() {
-	getent passwd named &>/dev/null && userdel named >/dev/null
-	getent group named &>/dev/null && groupdel named >/dev/null
-	return 0
-}
diff --git a/testing/bind/localhost.zone b/testing/bind/localhost.zone
deleted file mode 100644
index e3ff9641c..000000000
--- a/testing/bind/localhost.zone
+++ /dev/null
@@ -1,10 +0,0 @@
-$ORIGIN localhost.
-@			1D IN SOA	@ root (
-					42		; serial (yyyymmdd##)
-					3H		; refresh
-					15M		; retry
-					1W		; expiry
-					1D )		; minimum ttl
-
-			1D IN NS	@
-			1D IN A		127.0.0.1
diff --git a/testing/bind/named b/testing/bind/named
deleted file mode 100755
index 7907f9983..000000000
--- a/testing/bind/named
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/named
-
-[[ -d /var/run/named ]] || mkdir -p /var/run/named
-chown named:named /var/run/named
-
-PIDFILE=/var/run/named/named.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/named' || { PID=; rm $PIDFILE 2>/dev/null; }
-
-case "$1" in
-  start)
-    stat_busy "Starting BIND"
-    [ -z "$PID" ] && /usr/sbin/named ${NAMED_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon named
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping BIND"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon named
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  reload)
-    stat_busy "Reloading BIND"
-    [ ! -z "$PID" ] && rndc reload &>/dev/null || kill -HUP $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart}"
-esac
-exit 0
diff --git a/testing/bind/named.conf b/testing/bind/named.conf
deleted file mode 100644
index 38fb12cbe..000000000
--- a/testing/bind/named.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-// 
-// /etc/named.conf
-//
-
-options {
-	directory "/var/named";
-	pid-file "/var/run/named/named.pid";
-	auth-nxdomain yes;
-	datasize default;
-// Uncomment these to enable IPv6 connections support
-// IPv4 will still work:
-//	listen-on-v6 { any; };
-// Add this for no IPv4:
-//	listen-on { none; };
-
-	// Default security settings.
-	allow-recursion { 127.0.0.1; };
-	allow-transfer { none; };
-	allow-update { none; };
-    version none;
-    hostname none;
-    server-id none;
-};
-
-zone "localhost" IN {
-	type master;
-	file "localhost.zone";
-	allow-transfer { any; };
-};
-
-zone "0.0.127.in-addr.arpa" IN {
-	type master;
-	file "127.0.0.zone";
-	allow-transfer { any; };
-};
-
-zone "." IN {
-	type hint;
-	file "root.hint";
-};
-
-//zone "example.org" IN {
-//	type slave;
-//	file "example.zone";
-//	masters {
-//		192.168.1.100; 
-//	};
-//	allow-query { any; };
-//	allow-transfer { any; };
-//};
-
-logging {
-        channel xfer-log {
-                file "/var/log/named.log";
-                print-category yes;
-                print-severity yes;
-                print-time yes;
-                severity info;
-        };
-        category xfer-in { xfer-log; };
-        category xfer-out { xfer-log; };
-        category notify { xfer-log; };
-};
-
diff --git a/testing/bind/named.conf.d b/testing/bind/named.conf.d
deleted file mode 100644
index aecbd2307..000000000
--- a/testing/bind/named.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to BIND
-#
-NAMED_ARGS="-u named"
diff --git a/testing/bind/named.logrotate b/testing/bind/named.logrotate
deleted file mode 100644
index ef1a2d032..000000000
--- a/testing/bind/named.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/named.log {
-   missingok
-   postrotate
-      /bin/kill -HUP `cat /var/run/named/named.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/testing/bind/named.service b/testing/bind/named.service
deleted file mode 100644
index 77196f785..000000000
--- a/testing/bind/named.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Internet domain name server
-
-[Service]
-ExecStart=/usr/sbin/named -f -u named
-ExecReload=/usr/sbin/rndc reload
-ExecStop=/usr/sbin/rndc stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/bind/remove-tools.patch b/testing/bind/remove-tools.patch
deleted file mode 100644
index cbd1c53ad..000000000
--- a/testing/bind/remove-tools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PKCS11_TOOLS@
- TARGETS =
- 
diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD
deleted file mode 100644
index 9edcd567b..000000000
--- a/testing/binutils/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 169653 2012-10-25 03:29:55Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils
-pkgver=2.23
-pkgrel=1
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('base-devel')
-depends=('glibc>=2.16' 'zlib')
-checkdepends=('dejagnu' 'bc')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
-md5sums=('6e6c85eb4468501051ae209c9e2a7ecc'
-         '46ca898c6c7ab8f35c676a965c7ce804')
-
-build() {
-  cd ${srcdir}
-  mkdir binutils-build && cd binutils-build
-
-  ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
-    --with-lib-path=/usr/lib:/usr/local/lib \
-    --with-bugurl=https://bugs.archlinux.org/ \
-    --enable-ld=default --enable-gold \
-    --enable-plugins --enable-threads --enable-shared \
-    --disable-werror --disable-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
-
-  # Rebuild libopcodes.a with -fPIC
-  cp -a opcodes opcodes-pic
-  make -C opcodes-pic clean 
-  make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
-}
-
-check() {
-  cd ${srcdir}/binutils-build
-  
-  # unset LDFLAGS as testsuite makes assumptions about which ones are active
-  # do not abort on errors - manually check log files
-  make LDFLAGS="" -k check || true
-}
-
-package() {
-  cd ${srcdir}/binutils-build
-  make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-  
-  # Add some useful headers
-  install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include
-  install -m644 ${srcdir}/binutils-${pkgver}/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
-  install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib
-
-  # Remove Windows/Novell specific man pages
-  rm ${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 ${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/testing/binutils/binutils.install b/testing/binutils/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/testing/binutils/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/testing/bison/PKGBUILD b/testing/bison/PKGBUILD
deleted file mode 100644
index 2e82c6d1b..000000000
--- a/testing/bison/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169565 2012-10-23 14:54:01Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-
-pkgname=bison
-pkgver=2.6.4
-pkgrel=1
-pkgdesc="The GNU general-purpose parser generator"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/bison/bison.html"
-depends=('glibc' 'm4' 'sh')
-groups=('base-devel')
-install=bison.install
-source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('8b2dc57eb9d2d6de4715d30de6b2ee07'
-         '89b9f75a9aa1b02418fef0e685bd44f2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}  
-  ./configure --prefix=/usr --datadir=/usr/share
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/bison/bison.install b/testing/bison/bison.install
deleted file mode 100644
index 0081a194f..000000000
--- a/testing/bison/bison.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file=bison.info.gz
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-}
diff --git a/testing/bitlbee/PKGBUILD b/testing/bitlbee/PKGBUILD
deleted file mode 100644
index ecf6dd549..000000000
--- a/testing/bitlbee/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 163025 2012-07-05 23:25:55Z dreisner $
-
-# Contributor: FUBAR <mrfubar@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=bitlbee
-pkgver=3.0.5
-pkgrel=4
-pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC'
-url='http://www.bitlbee.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('openssl' 'glib2')
-makedepends=('asciidoc' 'libotr')
-optdepends=('skype4py: to use skyped'
-            'libotr: for OTR encryption support'
-            'xinetd: to run bitlbee through xinetd')
-source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz"
-        'sbindir.patch'
-        'xinetd'
-        'rc.d'
-        'bitlbee.tmpfiles')
-sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6'
-          '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c'
-          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
-          '02423c500ac64f673ba26a3395c7c7036c17343e'
-          '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
-backup=('etc/bitlbee/bitlbee.conf'
-        'etc/bitlbee/motd.txt'
-        'etc/xinetd.d/bitlbee')
-install=bitlbee.install
-
-build() { 
-	cd "$pkgname-$pkgver"
-
-	patch -p1 -i ../sbindir.patch
-
-	./configure \
-		--prefix=/usr \
-		--etcdir=/etc/bitlbee \
-		--pidfile=/run/bitlbee/bitlbee.pid \
-		--ipcsocket=/run/bitlbee/bitlbee.sock \
-		--systemdsystemunitdir=/usr/lib/systemd/system \
-		--ssl=openssl \
-		--strip=0 \
-		--otr=plugin \
-		--skype=plugin
-
-	make
-}
-
-package() {
-	make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
-
-	install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-	install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
-	install -Dm755 "$srcdir/rc.d" "$pkgdir/etc/rc.d/bitlbee"
-	install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
-}
diff --git a/testing/bitlbee/bitlbee.install b/testing/bitlbee/bitlbee.install
deleted file mode 100644
index aa5a81a70..000000000
--- a/testing/bitlbee/bitlbee.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
-	getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
-	systemd-tmpfiles --create bitlbee.conf
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
-	getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
-	true
-}
diff --git a/testing/bitlbee/bitlbee.tmpfiles b/testing/bitlbee/bitlbee.tmpfiles
deleted file mode 100644
index da72a0a79..000000000
--- a/testing/bitlbee/bitlbee.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/bitlbee 0755 bitlbee bitlbee - -
diff --git a/testing/bitlbee/rc.d b/testing/bitlbee/rc.d
deleted file mode 100644
index ade85221a..000000000
--- a/testing/bitlbee/rc.d
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/bitlbee/bitlbee.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting bitlbee daemon"
-    if [[ $PID ]] || ! su -s /bin/sh -c '/usr/sbin/bitlbee -F' bitlbee; then
-      stat_fail
-      exit 1
-    else
-      add_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping bitlbee daemon"
-    if [[ -z $PID ]] || ! kill $PID &>/dev/null; then
-      stat_fail
-      exit 1
-    else
-      rm -f "$pidfile"
-      rm_daemon bitlbee
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-    ;;
-esac
-
-# vim: set ft=sh et ts=2 sw=2:
diff --git a/testing/bitlbee/sbindir.patch b/testing/bitlbee/sbindir.patch
deleted file mode 100644
index 7640508f7..000000000
--- a/testing/bitlbee/sbindir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -aur old/Makefile new/Makefile
---- old/Makefile	2012-02-18 21:55:09.000000000 +1100
-+++ new/Makefile	2012-02-20 18:28:08.716130584 +1100
-@@ -135,8 +135,8 @@
- 
- systemd:
- ifdef SYSTEMDSYSTEMUNITDIR
--	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee.service.in > init/bitlbee.service
--	sed 's|@sbindir@|$(BINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
-+	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee.service.in > init/bitlbee.service
-+	sed 's|@sbindir@|$(SBINDIR)|' init/bitlbee@.service.in > init/bitlbee@.service
- endif
- 
- install-systemd:
diff --git a/testing/bitlbee/xinetd b/testing/bitlbee/xinetd
deleted file mode 100644
index d671a8cfc..000000000
--- a/testing/bitlbee/xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-service bitlbee
-{
-        type = UNLISTED
-        socket_type = stream
-        protocol = tcp
-        wait = no
-        user = bitlbee
-	group = bitlbee
-        server = /usr/sbin/bitlbee
-        port = 6667
-        disable = yes
-}
diff --git a/testing/bluez/PKGBUILD b/testing/bluez/PKGBUILD
deleted file mode 100644
index 2e1f83af6..000000000
--- a/testing/bluez/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 162114 2012-06-20 10:11:40Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-
-pkgname=bluez
-pkgver=4.100
-pkgrel=2
-pkgdesc="Libraries and tools for the Bluetooth protocol stack"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64')
-license=('GPL2')
-depends=('dbus-core' 'python2' 'systemd-tools')
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx')
-optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
-            "alsa-lib: Audio bluetooth devices support"
-            "dbus-python: to run bluez-simple-agent"
-            "pygobject: to run bluez-simple-agent"
-            "libusb-compat: USB adapters support"
-            "cups: CUPS backend")
-conflicts=('bluez-libs' 'bluez-utils')
-provides=('bluez-libs' 'bluez-utils')
-replaces=('bluez-libs' 'bluez-utils')
-options=('!libtool')
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
-        'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"
-        'bluetooth.conf.d'
-	'rc.bluetooth'
-	'org.bluez.service')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cp ../org.bluez.service src/
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/lib \
-    --enable-gstreamer \
-    --enable-alsa \
-    --enable-usb \
-    --enable-tools \
-    --enable-bccmd \
-    --enable-dfutool \
-    --enable-hid2hci \
-    --enable-hidd \
-    --enable-pand \
-    --enable-dund \
-    --enable-cups \
-    --enable-wiimote \
-    --disable-test \
-    --with-systemdunitdir=/usr/lib/systemd/system
-
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm755 ${srcdir}/rc.bluetooth ${pkgdir}/etc/rc.d/bluetooth
-  
-  install -d ${pkgdir}/etc/bluetooth
-  install -m644 network/network.conf \
-                input/input.conf \
-                audio/audio.conf \
-                serial/serial.conf \
-    ${pkgdir}/etc/bluetooth/
-  
-  install -Dm644 ${srcdir}/bluetooth.conf.d \
-    ${pkgdir}/etc/conf.d/bluetooth
-
-  # FS#27630
-  install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
-  install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
-  install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
-  sed -i 's#/usr/bin/python#/usr/bin/python2#' \
-    "${pkgdir}"/usr/bin/bluez-simple-agent \
-    "${pkgdir}"/usr/bin/bluez-test-device \
-    "${pkgdir}"/usr/bin/bluez-test-input
-}
-md5sums=('54809d476c52665ff64594b6828016b5'
-         '7412982b440f29fa7f76a41a87fef985'
-         '864cbd24e6efc3592e9284b0b5fb2cfd'
-         '54c7de598327bf11d56592235d0702f4')
diff --git a/testing/bluez/bluetooth.conf.d b/testing/bluez/bluetooth.conf.d
deleted file mode 100644
index 1c1e02589..000000000
--- a/testing/bluez/bluetooth.conf.d
+++ /dev/null
@@ -1,30 +0,0 @@
-# Bluetooth configuraton file
-
-# Bluetooth services (allowed values are "true" and "false")
-
-# Run the bluetoothd daemon (default: true)
-#DAEMON_ENABLE="false"
-
-# Run the sdp daemon (default: false)
-# If this is disabled, hcid's internal sdp daemon will be used
-#SDPD_ENABLE="true"
-
-# Run the bluetooth HID daemon (default: false)
-#HIDD_ENABLE="true"
-
-# Activate rfcomm ports (default: false)
-#RFCOMM_ENABLE="true"
-
-# Run bluetooth dial-up networking daemon (default: false)
-#DUND_ENABLE="true"
-
-# Run bluetooth PAN daemon (default: false)
-#PAND_ENABLE="true"
-
-# rfcomm configuration file (default: /etc/bluetooth/rfcomm.conf)
-#RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Options for hidd, dund and pand (default: none)
-HIDD_OPTIONS="--server"
-#DUND_OPTIONS=""
-#PAND_OPTIONS=""
diff --git a/testing/bluez/org.bluez.service b/testing/bluez/org.bluez.service
deleted file mode 100644
index dd7ae8f1c..000000000
--- a/testing/bluez/org.bluez.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.bluez
-Exec=/bin/false
-User=root
-SystemdService=dbus-org.bluez.service
diff --git a/testing/bluez/rc.bluetooth b/testing/bluez/rc.bluetooth
deleted file mode 100644
index 0feeaeab6..000000000
--- a/testing/bluez/rc.bluetooth
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/bash
-#
-# Start/stop the Bluetooth daemons
-#
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-DAEMON_NAME="bluetoothd"
-HIDD_NAME="hidd"
-RFCOMM_NAME="rfcomm"
-PAND_NAME="pand"
-DUND_NAME="dund"
-
-DAEMON_EXEC="/usr/sbin/bluetoothd"
-HIDD_EXEC="/usr/bin/hidd"
-RFCOMM_EXEC="/usr/bin/rfcomm"
-PAND_EXEC="/usr/bin/pand"
-DUND_EXEC="/usr/bin/dund"
-
-DAEMON_ENABLE="true"
-HIDD_ENABLE="false"
-RFCOMM_ENABLE="false"
-PAND_ENABLE="false"
-DUND_ENABLE="false"
-
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-HIDD_OPTIONS=""
-PAND_OPTIONS=""
-DUND_OPTIONS=""
-
-[ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth
-
-case "$1" in
-  start)
-    stat_busy "Starting bluetooth subsystem:"
-    if [ "$DAEMON_ENABLE" = "true" -a -x "$DAEMON_EXEC" ] ; then
-      stat_append " $DAEMON_NAME"
-      $DAEMON_EXEC
-      sleep 1
-    fi
-    if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then
-      stat_append " $HIDD_NAME"
-      $HIDD_EXEC $HIDD_OPTIONS
-    fi
-    if [ "$RFCOMM_ENABLE" = "true" -a -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all
-    fi
-    if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then
-      stat_append " $PAND_NAME"
-      $PAND_EXEC $PAND_OPTIONS
-    fi
-    if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then
-      stat_append " $DUND_NAME"
-      $DUND_EXEC $DUND_OPTIONS
-    fi
-    add_daemon bluetooth
-    stat_done
-    ;;
-  stop)
-    stat_busy "Stopping bluetooth subsystem:"
-
-    stat_append " $DUND_NAME"
-    killall $DUND_NAME >/dev/null 2>&1
-
-    stat_append " $PAND_NAME"
-    killall $PAND_NAME >/dev/null 2>&1
-
-    if [ -x "$RFCOMM_EXEC" ]; then
-      stat_append " $RFCOMM_NAME"
-      $RFCOMM_EXEC release all >/dev/null 2>&1
-    fi
-
-    stat_append " $HIDD_NAME"
-    killall $HIDD_NAME >/dev/null 2>&1
-
-    stat_append " $DAEMON_NAME"
-    killall $DAEMON_NAME >/dev/null 2>&1
-
-    rm_daemon bluetooth
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/boost/PKGBUILD b/testing/boost/PKGBUILD
deleted file mode 100644
index 7176a6a3c..000000000
--- a/testing/boost/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 163544 2012-07-15 13:16:35Z ibiru $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
-
-pkgbase=boost
-pkgname=('boost-libs' 'boost')
-pkgver=1.50.0
-_boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
-license=('custom')
-md5sums=('dbc07ab0254df3dda6300fd737b3f264')
-
-_stagedir="${srcdir}/stagedir"
-
-build() {
-  # set python path for bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
-  echo "using mpi ;" >> build/v2/user-config.jam
-
-  cd "${srcdir}"/${pkgbase}_${_boostver}
-
-  # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
-  ./build.sh cc
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
-  install -d "${_stagedir}"/usr/bin
-  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
-  # build tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
-  "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
-  # copy the tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
-  for i in *;do
-      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
-  done
-
-  #boostbook needed by quickbook
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
-  cp -r share "${_stagedir}"
-
-  # build libs
-  cd "${srcdir}/${pkgbase}_${_boostver}"
-
-  # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=single,multi"
-  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
-  # and installs includes in /usr/include/boost.
-  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
-  # install to ${_stagedir} in preparation for split packaging
-
-  "${_stagedir}"/usr/bin/bjam \
-      release debug-symbols=off threading=multi \
-      runtime-link=shared link=shared,static \
-      cflags=-fno-strict-aliasing \
-      toolset=gcc \
-      --prefix="${_stagedir}" \
-      -sTOOLS=gcc \
-      --layout=system \
-      ${MAKEFLAGS} \
-      install
-}
-
-package_boost() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
-    depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python bindings'
-                'python2: for python2 bindings'
-		'boost-build: to use boost jam for building your project.')
-
-    install -d "${pkgdir}"/usr/{include,lib,share}
-    # headers/source files
-    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
-    # static libs
-    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
-    # utilities (bjam, bcp, pyste)
-    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
-
-    #boostbook
-    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
-}
-
-package_boost-libs() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
-    optdepends=('openmpi: for mpi support')
-
-    install -d "${pkgdir}/usr/lib"
-    #shared libs
-    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
-
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
-}
diff --git a/testing/bootchart/PKGBUILD b/testing/bootchart/PKGBUILD
deleted file mode 100644
index acb3e0072..000000000
--- a/testing/bootchart/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 165562 2012-08-24 16:48:42Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-pkgname="bootchart"
-pkgver=1.20
-pkgrel=1
-pkgdesc="A 'startup' graphing tool"
-url="https://github.com/sofar/bootchart"
-license=('GPL2')
-arch=(i686 x86_64)
-depends=('glibc')
-source=("http://foo-projects.org/~sofar/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sbindir=/usr/bin
- 
-   make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('071c67856a2b16e1a9e93a058de3eb65')
diff --git a/testing/brasero/PKGBUILD b/testing/brasero/PKGBUILD
deleted file mode 100644
index 04fa8e0bb..000000000
--- a/testing/brasero/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169272 2012-10-18 19:29:34Z jgc $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=brasero
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A disc burning application for Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/projects/brasero"
-license=('GPL')
-options=('!libtool' '!emptydirs')
-depends=('gtk3' 'gst-plugins-base' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info'  'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql')
-makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl')
-optdepends=('libburn: alternative back-end'
-            'libisofs: libburn back-end'
-            'dvdauthor: video project'
-            'gstreamer0.10-bad-plugins: video project'
-            'vcdimager: video project')
-replaces=('nautilus-cd-burner')
-install=brasero.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1eb16f85c5663f3f38ee60516759c0980024b893af9ec7875d31208a53c12b3b')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-caches \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/testing/brasero/brasero.install b/testing/brasero/brasero.install
deleted file mode 100644
index 9248062f7..000000000
--- a/testing/brasero/brasero.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-desktop-database -q
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/brltty/PKGBUILD b/testing/brltty/PKGBUILD
deleted file mode 100644
index 76d9f9466..000000000
--- a/testing/brltty/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 167187 2012-09-26 22:24:47Z tomegun $
-# Maintainer:
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=brltty
-pkgver=4.3
-pkgrel=6
-pkgdesc="Braille display driver for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://mielke.cc/brltty"
-license=('GPL' 'LGPL')
-depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'python2' 'tcl' 'atk' 'libxtst' 'pyrex')
-makedepends=('bluez')
-optdepends=('bluez: bluetooth support')
-backup=(etc/brltty.conf etc/conf.d/brltty.conf)
-options=('!makeflags' '!emptydirs')
-install=brltty.install
-source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz
-        'brltty'
-        'brltty.conf'
-	'brltty.service')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --localstatedir=/var \
-    --with-screen-driver=a2 \
-    --enable-gpm \
-    --disable-java-bindings \
-    --disable-caml-bindings \
-    PYTHON=/usr/bin/python2
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir" install
-  install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty"
-  install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf"
-  install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf"
-  install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service"
-}
-md5sums=('5ada573f88df32b6150db3b9a620e20b'
-         '831ebaf0c56091702929c68805d20c4f'
-         'a8ab8b3dd059e96e1734bc9cdcf844fc'
-         '7acecd700b9f94d76fe4a6ad56cb0448')
diff --git a/testing/brltty/brltty b/testing/brltty/brltty
deleted file mode 100755
index 5ed21a52d..000000000
--- a/testing/brltty/brltty
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=brltty
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name $brltty_args
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/brltty/brltty.conf b/testing/brltty/brltty.conf
deleted file mode 100644
index 94115e1d5..000000000
--- a/testing/brltty/brltty.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Specify any arguments to pass to brltty here.
-brltty_args=""
\ No newline at end of file
diff --git a/testing/brltty/brltty.install b/testing/brltty/brltty.install
deleted file mode 100644
index 952ae58ff..000000000
--- a/testing/brltty/brltty.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install () {
-     getent group brlapi  &>/dev/null || groupadd -r brlapi
-     if [ ! -e /etc/brlapi.key ]; then
-         mcookie >/etc/brlapi.key
-         chmod 0640 /etc/brlapi.key
-         chgrp brlapi /etc/brlapi.key
-         echo "Please add your user to the brlapi group."
-     fi
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove () {
-    getent group brlapi >/dev/null 2>&1 && groupdel brlapi
-    if [ -e /etc/brlapi.key ]; then
-        rm -f /etc/brlapi.key
-    fi
-}
diff --git a/testing/brltty/brltty.service b/testing/brltty/brltty.service
deleted file mode 100644
index 1b9d55e32..000000000
--- a/testing/brltty/brltty.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Braille Console Driver
-DefaultDependencies=no
-Before=sysinit.target
-
-[Service]
-ExecStart=/usr/bin/brltty --pid-file=/run/brltty.pid
-Type=forking
-PIDFile=/run/brltty.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/btrfs-progs/70-btrfs.rules b/testing/btrfs-progs/70-btrfs.rules
deleted file mode 100644
index c0e8c776c..000000000
--- a/testing/btrfs-progs/70-btrfs.rules
+++ /dev/null
@@ -1 +0,0 @@
-ACTION!="remove", SUBSYSTEM=="block", ENV{ID_FS_TYPE}=="btrfs", RUN+="/usr/bin/btrfs device scan /dev/%k"
diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD
deleted file mode 100644
index ee0a1bf57..000000000
--- a/testing/btrfs-progs/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 169471 2012-10-21 19:56:53Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=btrfs-progs
-pkgver=0.19.20121005
-pkgrel=2
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-url="http://btrfs.wiki.kernel.org/"
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
-	initcpio-install-btrfs
-	initcpio-hook-btrfs)
-install=btrfs-progs.install
-md5sums=('7fb014324954ee073b039dc0066de960'
-         'd7ad825b0b25f2be73289a20e7afcdb7'
-         'b09688a915a0ec8f40e2f5aacbabc9ad')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-   make CFLAGS="$CFLAGS"
-
-   # install mkinitcpio hooks
-   install -Dm644 "$srcdir/initcpio-install-btrfs" \
-     "$pkgdir/usr/lib/initcpio/install/btrfs"
-   install -Dm644 "$srcdir/initcpio-hook-btrfs" \
-     "$pkgdir/usr/lib/initcpio/hooks/btrfs"
-}
-
-package() {
-   cd $srcdir/$pkgname-$pkgver
-   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
-}
diff --git a/testing/btrfs-progs/btrfs-progs.install b/testing/btrfs-progs/btrfs-progs.install
deleted file mode 100644
index d6c0698a0..000000000
--- a/testing/btrfs-progs/btrfs-progs.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-  if [ "$(vercmp 0.19.20121005 "$2")" -eq 1 ]; then
-    echo "btrfs multi-device support now relies on linux 3.6 or later"
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/btrfs-progs/btrfs.install b/testing/btrfs-progs/btrfs.install
deleted file mode 100644
index 077d7529a..000000000
--- a/testing/btrfs-progs/btrfs.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-  if [ "$(vercmp 0.19.20120904-6 "$2")" -eq 1 ]; then
-    echo "btrfs multi-device support now relies on linux 3.6 or later"
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs
deleted file mode 100644
index 7965d0a8a..000000000
--- a/testing/btrfs-progs/initcpio-hook-btrfs
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    btrfs device scan
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs
deleted file mode 100644
index aa06e55ac..000000000
--- a/testing/btrfs-progs/initcpio-install-btrfs
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module btrfs
-    add_binary btrfs
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes. This hook
-is only needed for initramfs images which do not use udev.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/bzflag/PKGBUILD b/testing/bzflag/PKGBUILD
deleted file mode 100644
index 1a71d13a7..000000000
--- a/testing/bzflag/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169629 2012-10-25 01:34:46Z eric $
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=bzflag
-pkgver=2.4.2
-pkgrel=2
-pkgdesc='Multiplayer 3D tank battle game'
-url='http://bzflag.org/'
-license=('LGPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('curl' 'glew' 'glu' 'sdl')
-makedepends=('mesa') # glu requires <GL/gl.h>
-source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
-sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure --prefix=/usr
-	make
-
-	cd misc
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -Dm644 misc/bzflag.desktop "${pkgdir}"/usr/share/applications/bzflag.desktop
-	install -Dm644 data/bzflag-48x48.png "${pkgdir}"/usr/share/pixmaps/bzflag-48x48.png
-}
diff --git a/testing/bzr/PKGBUILD b/testing/bzr/PKGBUILD
deleted file mode 100644
index 655bba6dd..000000000
--- a/testing/bzr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168834 2012-10-16 11:53:33Z allan $
-# Maintainer :
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=bzr
-pkgver=2.5.1
-pkgrel=2
-pkgdesc="A decentralized revision control system (bazaar)"
-arch=('i686' 'x86_64')
-url="http://bazaar.canonical.com/en/"
-license=('GPL')
-depends=('python2')
-optdepends=('python2-paramiko: for sftp support')
-source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig})
-md5sums=('ac5079858364a046071000d5cdccb67b'
-         'c83dd08dd2c3e27edbab873500d7d6eb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|man/man1|share/man/man1|' setup.py
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
-    bzrlib/{plugins/bash_completion/bashcomp.py,tests/ssl_certs/create_ssls.py,patiencediff.py,_patiencediff_py.py}
-  python2 setup.py build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1
-
-  # bash-completion
-  install -D -m644 contrib/bash/bzr \
-    "${pkgdir}/usr/share/bash-completion/completions/bzr"
-}
diff --git a/testing/cabal-install/PKGBUILD b/testing/cabal-install/PKGBUILD
deleted file mode 100644
index 5ce042013..000000000
--- a/testing/cabal-install/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-pkgname=cabal-install
-pkgver=1.16.0
-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')
-makedepends=('haskell-http=4000.2.4-1' 'haskell-zlib=0.5.3.3-5' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1' 'haskell-random=1.0.1.1-3')
-depends=('ghc' 'gmp' 'zlib')
-source=("http://hackage.haskell.org/packages/archive/cabal-install/${pkgver}/cabal-install-${pkgver}.tar.gz")
-md5sums=('da046116eee7664158411fa9e2cf6b14')
-
-build() {
-  cd cabal-install-${pkgver}
-
-  runhaskell Setup configure \
-    --enable-shared \
-    --enable-split-objs \
-    --enable-executable-stripping \
-    --prefix=/usr
-
-  runhaskell Setup build
-}
-
-package() {
-  cd cabal-install-${pkgver}
-
-  runhaskell Setup copy --destdir=$pkgdir
-
-  # rm license installed to wrong location
-  rm -rf ${pkgdir}/usr/share/doc
-
-  install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-    
-  # add bash completion
-  install -d ${pkgdir}/usr/share/bash-completion/completions
-  install -m644 bash-completion/cabal \
-    ${pkgdir}/usr/share/bash-completion/completions
-}
diff --git a/testing/cairo/PKGBUILD b/testing/cairo/PKGBUILD
deleted file mode 100644
index 951f174dc..000000000
--- a/testing/cairo/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 169506 2012-10-22 17:33:56Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=cairo
-pkgver=1.12.6
-pkgrel=1
-pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url="http://cairographics.org/"
-depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman' 'glib2' 'sh')
-makedepends=('librsvg' 'poppler-glib' 'libspectre' 'gtk-doc') # 'libdrm')
-optdepends=('xcb-util: for XCB backend') # really needed?
-provides=('cairo-xcb')
-replaces=('cairo-xcb')
-options=('!libtool')
-source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz
-        cairo-1.10.0-buggy_gradients.patch)
-sha1sums=('a383c6cb4495e18848ea43e1031c294aa9417a43'
-          '8b843a9934e5112b6188e5bcf4adfc1fdaf9fa04')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch
-
-#  autoreconf -vfi
-  ./configure --prefix=/usr \
-	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--disable-static \
-	--enable-tee \
-	--disable-xlib-xcb \
-	# --enable-test-surfaces \ takes ages
-	#--enable-drm # breaks build
-  make
-}
-
-#check() {
-#  cd "$srcdir/$pkgname-$pkgver"
-#  make -k check || /bin/true # 161 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped
-#}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/cairo/cairo-1.10.0-buggy_gradients.patch b/testing/cairo/cairo-1.10.0-buggy_gradients.patch
deleted file mode 100644
index 368e356d3..000000000
--- a/testing/cairo/cairo-1.10.0-buggy_gradients.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/src/cairo-xlib-display.c.ubuntu	2010-08-04 11:57:49.000000000 +0200

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

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

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

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

-      */

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

-     display->buggy_gradients = TRUE;

--#else

--    display->buggy_gradients = FALSE;

--#endif

-     display->buggy_pad_reflect = FALSE;

-     display->buggy_repeat = FALSE;

diff --git a/testing/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch b/testing/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch
deleted file mode 100644
index e3bb30580..000000000
--- a/testing/cairo/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-From f228769dfe5a8b5d73c49a41e95e31ed73a77fb3 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Fri, 08 Jun 2012 16:22:41 +0000
-Subject: polygon-reduce: Reduce broken stopped-edge continuation
-
-This is hopefully a lesser used path and the attempted optimisation to
-continue a stopped edge with a colinear stopped edge highly unlikely and
-lost in the noise of the general inefficiency of the routine. As it was
-broken, rather than attempt to rectify the "optimisation" remove it.
-
-Reported-by: Evangelos Foutras <evangelos@foutrelis.com>
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50852
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-polygon-reduce.c b/src/cairo-polygon-reduce.c
-index 8758070..ea457fe 100644
---- a/src/cairo-polygon-reduce.c
-+++ b/src/cairo-polygon-reduce.c
-@@ -42,6 +42,8 @@
- #include "cairo-freelist-private.h"
- #include "cairo-combsort-inline.h"
- 
-+#define DEBUG_POLYGON 0
-+
- typedef cairo_point_t cairo_bo_point32_t;
- 
- typedef struct _cairo_bo_intersect_ordinate {
-@@ -114,7 +116,6 @@ typedef struct _cairo_bo_event_queue {
- 
- typedef struct _cairo_bo_sweep_line {
-     cairo_bo_edge_t *head;
--    cairo_bo_edge_t *stopped;
-     int32_t current_y;
-     cairo_bo_edge_t *current_edge;
- } cairo_bo_sweep_line_t;
-@@ -476,8 +477,8 @@ edges_compare_x_for_y (const cairo_bo_edge_t *a,
- static inline int
- _line_equal (const cairo_line_t *a, const cairo_line_t *b)
- {
--    return a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
--           a->p2.x == b->p2.x && a->p2.y == b->p2.y;
-+    return (a->p1.x == b->p1.x && a->p1.y == b->p1.y &&
-+	    a->p2.x == b->p2.x && a->p2.y == b->p2.y);
- }
- 
- static int
-@@ -1024,7 +1025,6 @@ static void
- _cairo_bo_sweep_line_init (cairo_bo_sweep_line_t *sweep_line)
- {
-     sweep_line->head = NULL;
--    sweep_line->stopped = NULL;
-     sweep_line->current_y = INT32_MIN;
-     sweep_line->current_edge = NULL;
- }
-@@ -1139,6 +1139,8 @@ edges_colinear (const cairo_bo_edge_t *a, const cairo_bo_edge_t *b)
-      */
-     if (a->edge.line.p1.y == b->edge.line.p1.y) {
- 	return a->edge.line.p1.x == b->edge.line.p1.x;
-+    } else if (a->edge.line.p2.y == b->edge.line.p2.y) {
-+	return a->edge.line.p2.x == b->edge.line.p2.x;
-     } else if (a->edge.line.p1.y < b->edge.line.p1.y) {
- 	return edge_compare_for_y_against_x (b,
- 					     a->edge.line.p1.y,
-@@ -1205,82 +1207,48 @@ _active_edges_to_polygon (cairo_bo_edge_t		*left,
- 			  cairo_polygon_t	        *polygon)
- {
-     cairo_bo_edge_t *right;
-+    unsigned int mask;
- 
--    if (fill_rule == CAIRO_FILL_RULE_WINDING) {
--	while (left != NULL) {
--	    int in_out = left->edge.dir;
--
--	    right = left->next;
--	    if (left->deferred.right == NULL) {
--		while (right != NULL && right->deferred.right == NULL)
--		    right = right->next;
--
--		if (right != NULL && edges_colinear (left, right)) {
--		    /* continuation on left */
--		    left->deferred = right->deferred;
--		    right->deferred.right = NULL;
--		}
--	    }
--
--	    right = left->next;
--	    while (right != NULL) {
--		if (right->deferred.right != NULL)
--		    _cairo_bo_edge_end (right, top, polygon);
--
--		in_out += right->edge.dir;
--		if (in_out == 0) {
--		    cairo_bo_edge_t *next;
--		    cairo_bool_t skip = FALSE;
--
--		    /* skip co-linear edges */
--		    next = right->next;
--		    if (next != NULL)
--			skip = edges_colinear (right, next);
-+    if (fill_rule == CAIRO_FILL_RULE_WINDING)
-+	mask = ~0;
-+    else
-+	mask = 1;
- 
--		    if (! skip)
--			break;
--		}
-+    while (left != NULL) {
-+	int in_out = left->edge.dir;
- 
-+	right = left->next;
-+	if (left->deferred.right == NULL) {
-+	    while (right != NULL && right->deferred.right == NULL)
- 		right = right->next;
--	    }
--
--	    _cairo_bo_edge_start_or_continue (left, right, top, polygon);
- 
--	    left = right;
--	    if (left != NULL)
--		left = left->next;
-+	    if (right != NULL && edges_colinear (left, right)) {
-+		/* continuation on left */
-+		left->deferred = right->deferred;
-+		right->deferred.right = NULL;
-+	    }
- 	}
--    } else {
--	while (left != NULL) {
--	    int in_out = 0;
- 
--	    right = left->next;
--	    while (right != NULL) {
--		if (right->deferred.right != NULL)
--		    _cairo_bo_edge_end (right, top, polygon);
-+	right = left->next;
-+	while (right != NULL) {
-+	    if (right->deferred.right != NULL)
-+		_cairo_bo_edge_end (right, top, polygon);
- 
--		if ((in_out++ & 1) == 0) {
--		    cairo_bo_edge_t *next;
--		    cairo_bool_t skip = FALSE;
--
--		    /* skip co-linear edges */
--		    next = right->next;
--		    if (next != NULL)
--			skip = edges_colinear (right, next);
--
--		    if (! skip)
--			break;
--		}
--
--		right = right->next;
-+	    in_out += right->edge.dir;
-+	    if ((in_out & mask) == 0) {
-+		/* skip co-linear edges */
-+		if (right->next == NULL || !edges_colinear (right, right->next))
-+		    break;
- 	    }
- 
--	    _cairo_bo_edge_start_or_continue (left, right, top, polygon);
--
--	    left = right;
--	    if (left != NULL)
--		left = left->next;
-+	    right = right->next;
- 	}
-+
-+	_cairo_bo_edge_start_or_continue (left, right, top, polygon);
-+
-+	left = right;
-+	if (left != NULL)
-+	    left = left->next;
-     }
- }
- 
-@@ -1303,12 +1271,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 
-     while ((event = _cairo_bo_event_dequeue (&event_queue))) {
- 	if (event->point.y != sweep_line.current_y) {
--	    for (e1 = sweep_line.stopped; e1; e1 = e1->next) {
--		if (e1->deferred.right != NULL)
--		     _cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
--	    }
--	    sweep_line.stopped = NULL;
--
- 	    _active_edges_to_polygon (sweep_line.head,
- 				      sweep_line.current_y,
- 				      fill_rule, polygon);
-@@ -1328,23 +1290,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 	    if (unlikely (status))
- 		goto unwind;
- 
--	    /* check to see if this is a continuation of a stopped edge */
--	    /* XXX change to an infinitesimal lengthening rule */
--	    for (left = sweep_line.stopped; left; left = left->next) {
--		if (e1->edge.top <= left->edge.bottom &&
--		    edges_colinear (e1, left))
--		{
--		    e1->deferred = left->deferred;
--		    if (left->prev != NULL)
--			left->prev = left->next;
--		    else
--			sweep_line.stopped = left->next;
--		    if (left->next != NULL)
--			left->next->prev = left->prev;
--		    break;
--		}
--	    }
--
- 	    left = e1->prev;
- 	    right = e1->next;
- 
-@@ -1371,14 +1316,8 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 
- 	    _cairo_bo_sweep_line_delete (&sweep_line, e1);
- 
--	    /* first, check to see if we have a continuation via a fresh edge */
--	    if (e1->deferred.right != NULL) {
--		e1->next = sweep_line.stopped;
--		if (sweep_line.stopped != NULL)
--		    sweep_line.stopped->prev = e1;
--		sweep_line.stopped = e1;
--		e1->prev = NULL;
--	    }
-+	    if (e1->deferred.right != NULL)
-+		_cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
- 
- 	    if (left != NULL && right != NULL) {
- 		status = _cairo_bo_event_queue_insert_if_intersect_below_current_y (&event_queue, left, right);
-@@ -1420,10 +1359,6 @@ _cairo_bentley_ottmann_tessellate_bo_edges (cairo_bo_event_t   **start_events,
- 	}
-     }
- 
--    for (e1 = sweep_line.stopped; e1; e1 = e1->next) {
--	if (e1->deferred.right != NULL)
--	    _cairo_bo_edge_end (e1, e1->edge.bottom, polygon);
--    }
-  unwind:
-     _cairo_bo_event_queue_fini (&event_queue);
- 
-@@ -1447,6 +1382,12 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon,
-     if (unlikely (0 == num_events))
- 	return CAIRO_STATUS_SUCCESS;
- 
-+    if (DEBUG_POLYGON) {
-+	FILE *file = fopen ("reduce_in.txt", "w");
-+	_cairo_debug_print_polygon (file, polygon);
-+	fclose (file);
-+    }
-+
-     events = stack_events;
-     event_ptrs = stack_event_ptrs;
-     if (num_events > ARRAY_LENGTH (stack_events)) {
-@@ -1482,10 +1423,16 @@ _cairo_polygon_reduce (cairo_polygon_t *polygon,
- 							 num_events,
- 							 fill_rule,
- 							 polygon);
--     polygon->num_limits = num_limits;
-+    polygon->num_limits = num_limits;
- 
-     if (events != stack_events)
- 	free (events);
- 
-+    if (DEBUG_POLYGON) {
-+	FILE *file = fopen ("reduce_out.txt", "w");
-+	_cairo_debug_print_polygon (file, polygon);
-+	fclose (file);
-+    }
-+
-     return status;
- }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/cairo/git_fixes.patch b/testing/cairo/git_fixes.patch
deleted file mode 100644
index 6ad8979eb..000000000
--- a/testing/cairo/git_fixes.patch
+++ /dev/null
@@ -1,1086 +0,0 @@
-From ede11b2954db19e3ca9d31cef7d04a7bf0e42ddc Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Sun, 25 Mar 2012 18:37:14 +0000
-Subject: Fix math in comments
-
----
-diff --git a/src/cairo-arc.c b/src/cairo-arc.c
-index dc07fee..6977e88 100644
---- a/src/cairo-arc.c
-+++ b/src/cairo-arc.c
-@@ -139,7 +139,7 @@ _arc_segments_needed (double	      angle,
- 
-    From that paper, a very practical value of h is:
- 
--	h = 4/3 * tan(angle/4)
-+	h = 4/3 * R * tan(angle/4)
- 
-    This value does not give the spline with minimal error, but it does
-    provide a very good approximation, (6th-order convergence), and the
---
-cgit v0.9.0.2-2-gbebe
-From fba21ef2a4c4eb343668267fda713aedbb6af2a4 Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Tue, 27 Mar 2012 21:25:37 +0000
-Subject: gl: use font's antialias option to check whether it needs mask
-
-There is need to loop over number of glyphs to check wether the glyph
-image is a ARGB32 as the font's antialias option can be used for checking.
-If antialias is SUBPIXEL or BEST, the glyph surface will be ARGB32,
-otherwise it will be A8 format. Therefore we will only be using
-component-alpha at SUBPIXEL (or better) font quality and only then need
-a mask for multiple pass glyph composition.
----
-diff --git a/src/cairo-gl-glyphs.c b/src/cairo-gl-glyphs.c
-index 832956f..9756ea4 100644
---- a/src/cairo-gl-glyphs.c
-+++ b/src/cairo-gl-glyphs.c
-@@ -427,23 +427,15 @@ _cairo_gl_composite_glyphs (void			*_dst,
- 
-     TRACE ((stderr, "%s\n", __FUNCTION__));
- 
--    /* If any of the glyphs are component alpha, we have to go through a mask,
--     * since only _cairo_gl_surface_composite() currently supports component
--     * alpha.
-+    /* If any of the glyphs require component alpha, we have to go through
-+     * a mask, since only _cairo_gl_surface_composite() currently supports
-+     * component alpha.
-      */
--    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER) {
--	for (i = 0; i < info->num_glyphs; i++) {
--	    cairo_scaled_glyph_t *scaled_glyph;
--
--	    if (_cairo_scaled_glyph_lookup (info->font, info->glyphs[i].index,
--					    CAIRO_SCALED_GLYPH_INFO_SURFACE,
--					    &scaled_glyph) == CAIRO_INT_STATUS_SUCCESS &&
--		scaled_glyph->surface->format == CAIRO_FORMAT_ARGB32)
--	    {
--		info->use_mask = TRUE;
--		break;
--	    }
--	}
-+    if (!dst->base.is_clear && ! info->use_mask && op != CAIRO_OPERATOR_OVER &&
-+	(info->font->options.antialias == CAIRO_ANTIALIAS_SUBPIXEL ||
-+	 info->font->options.antialias == CAIRO_ANTIALIAS_BEST))
-+    {
-+	info->use_mask = TRUE;
-     }
- 
-     if (info->use_mask) {
---
-cgit v0.9.0.2-2-gbebe
-From d304f0e57be8036719c3709e2419487326369105 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Wed, 28 Mar 2012 23:32:36 +0000
-Subject: composite-rectangles: Trim extents for SOURCE and CLEAR to the mask
-
-The SOURCE and CLEAR are the odd pair in Cairo's range of operators that
-are bound by the shape/mask, but are unbound by the source. This
-regularly leads to bugs as only track the bound/unbound rectangles and
-confuse the meaning when bound only by the mask.
-
-What is required is that the unbound extents in this case is only
-trimmed by the mask (the bounded extents are still the intersection of
-all).
-
-Fixes bug-source-cu
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-composite-rectangles.c b/src/cairo-composite-rectangles.c
-index 106571e..8c5cd5a 100644
---- a/src/cairo-composite-rectangles.c
-+++ b/src/cairo-composite-rectangles.c
-@@ -147,8 +147,12 @@ _cairo_composite_rectangles_intersect (cairo_composite_rectangles_t *extents,
-     if (! ret && extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK)
- 	return CAIRO_INT_STATUS_NOTHING_TO_DO;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
-     if (_cairo_clip_is_all_clipped (extents->clip))
-@@ -199,8 +203,12 @@ _cairo_composite_rectangles_intersect_source_extents (cairo_composite_rectangles
- 	rect.height == extents->bounded.height)
- 	return CAIRO_INT_STATUS_SUCCESS;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     clip = extents->clip;
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
-@@ -253,8 +261,12 @@ _cairo_composite_rectangles_intersect_mask_extents (cairo_composite_rectangles_t
- 	mask.height == extents->bounded.height)
- 	return CAIRO_INT_STATUS_SUCCESS;
- 
--    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE))
-+    if (extents->is_bounded == (CAIRO_OPERATOR_BOUND_BY_MASK | CAIRO_OPERATOR_BOUND_BY_SOURCE)) {
- 	extents->unbounded = extents->bounded;
-+    } else if (extents->is_bounded & CAIRO_OPERATOR_BOUND_BY_MASK) {
-+	if (!_cairo_rectangle_intersect (&extents->unbounded, &extents->mask))
-+	    return CAIRO_INT_STATUS_NOTHING_TO_DO;
-+    }
- 
-     clip = extents->clip;
-     extents->clip = _cairo_clip_reduce_for_composite (clip, extents);
---
-cgit v0.9.0.2-2-gbebe
-From af6e084dd78fcbb8ecce46c57f655f5e24343b8c Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Thu, 29 Mar 2012 13:48:24 +0000
-Subject: cairoint: Mark PDF surface as requiring the deflate stream output
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairoint.h b/src/cairoint.h
-index 9a8003e..9f20d51 100644
---- a/src/cairoint.h
-+++ b/src/cairoint.h
-@@ -73,7 +73,10 @@
- #include "cairo-compiler-private.h"
- #include "cairo-error-private.h"
- 
--#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_SCRIPT_SURFACE || CAIRO_HAS_XML_SURFACE
-+#if CAIRO_HAS_PDF_SURFACE    || \
-+    CAIRO_HAS_PS_SURFACE     || \
-+    CAIRO_HAS_SCRIPT_SURFACE || \
-+    CAIRO_HAS_XML_SURFACE
- #define CAIRO_HAS_DEFLATE_STREAM 1
- #endif
- 
-@@ -84,7 +87,9 @@
- #define CAIRO_HAS_FONT_SUBSET 1
- #endif
- 
--#if CAIRO_HAS_PS_SURFACE || CAIRO_HAS_PDF_SURFACE || CAIRO_HAS_FONT_SUBSET
-+#if CAIRO_HAS_PS_SURFACE  || \
-+    CAIRO_HAS_PDF_SURFACE || \
-+    CAIRO_HAS_FONT_SUBSET
- #define CAIRO_HAS_PDF_OPERATORS 1
- #endif
- 
---
-cgit v0.9.0.2-2-gbebe
-From a965b0f95fdeb567f7ccb51f7c8c47735a61e2d9 Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Thu, 29 Mar 2012 01:08:51 +0000
-Subject: gl: fix y-axis origin when map_to_image() for non texture GL surface
-
-We need to fix y-axis origin when map a GL surface to image surface for
-non-texture GL surface.
-
-Test cases: extended-blend-alpha-mask, extended-blend-mask.
-Although the image outputs is not right, but the image on the first grid
-(upper-left corner) is correct comparing to image output.
----
-diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
-index 8bbf939..32ecf63 100644
---- a/src/cairo-gl-surface.c
-+++ b/src/cairo-gl-surface.c
-@@ -985,6 +985,7 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
-     unsigned int cpp;
-     cairo_bool_t invert;
-     cairo_status_t status;
-+    int y;
- 
-     /* Want to use a switch statement here but the compiler gets whiny. */
-     if (surface->base.content == CAIRO_CONTENT_COLOR_ALPHA) {
-@@ -1065,7 +1066,12 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
- 	glPixelStorei (GL_PACK_ROW_LENGTH, image->stride / cpp);
-     if (invert)
- 	glPixelStorei (GL_PACK_INVERT_MESA, 1);
--    glReadPixels (extents->x, extents->y,
-+
-+    y = extents->y;
-+    if (! _cairo_gl_surface_is_texture (surface))
-+	y = surface->height - extents->y - extents->height;
-+
-+    glReadPixels (extents->x, y,
- 		  extents->width, extents->height,
- 		  format, type, image->data);
-     if (invert)
---
-cgit v0.9.0.2-2-gbebe
-From c77112c5464d7ff21052527f82f4d729cc509291 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Mon, 02 Apr 2012 18:43:00 +0000
-Subject: xcb: Fix SHM in _get_image()
-
-Commit 2283ab9 introduced a logic error. Instead of falling back to the non-SHM
-path when getting the image via SHM failed, we now did the fallback when getting
-the image via SHM worked (which means that the SHM operation was a waste of
-time).
-
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c
-index fff4f52..6bedbda 100644
---- a/src/cairo-xcb-surface.c
-+++ b/src/cairo-xcb-surface.c
-@@ -367,7 +367,7 @@ _get_image (cairo_xcb_surface_t		 *surface,
-     if (use_shm) {
- 	image = _get_shm_image (surface, x, y, width, height);
- 	if (image) {
--	    if (image->status) {
-+	    if (image->status == CAIRO_STATUS_SUCCESS) {
- 		_cairo_xcb_connection_release (connection);
- 		return image;
- 	    }
---
-cgit v0.9.0.2-2-gbebe
-From cc247c346b75353f16ab40ac74c54cdd9663d16b Mon Sep 17 00:00:00 2001
-From: Henry (Yu) Song <hsong@sisa.samsung.com>
-Date: Mon, 02 Apr 2012 21:29:47 +0000
-Subject: gl: Remove an unused variable
-
----
-diff --git a/src/cairo-gl-gradient.c b/src/cairo-gl-gradient.c
-index b364b92..ce7c0dd 100644
---- a/src/cairo-gl-gradient.c
-+++ b/src/cairo-gl-gradient.c
-@@ -207,7 +207,6 @@ _cairo_gl_gradient_create (cairo_gl_context_t           *ctx,
-     cairo_status_t status;
-     int tex_width;
-     void *data;
--    cairo_gl_dispatch_t *dispatch = &ctx->dispatch;
- 
-     if ((unsigned int) ctx->max_texture_size / 2 <= n_stops)
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
---
-cgit v0.9.0.2-2-gbebe
-From 7a262fd398c8a1f3c9052e8d9ec459e27ff91b4d Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Wed, 04 Apr 2012 10:23:09 +0000
-Subject: fix bug in _cairo_image_analyze_color
-
----
-diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
-index 8208a15..e860e1b 100644
---- a/src/cairo-image-surface.c
-+++ b/src/cairo-image-surface.c
-@@ -1130,9 +1130,12 @@ _cairo_image_analyze_color (cairo_image_surface_t      *image)
-     if (image->color != CAIRO_IMAGE_UNKNOWN_COLOR)
- 	return image->color;
- 
--    if (image->format == CAIRO_FORMAT_A1 || image->format == CAIRO_FORMAT_A8)
-+    if (image->format == CAIRO_FORMAT_A1)
- 	return image->color = CAIRO_IMAGE_IS_MONOCHROME;
- 
-+    if (image->format == CAIRO_FORMAT_A8)
-+	return image->color = CAIRO_IMAGE_IS_GRAYSCALE;
-+
-     if (image->format == CAIRO_FORMAT_ARGB32) {
- 	image->color = CAIRO_IMAGE_IS_MONOCHROME;
- 	for (y = 0; y < image->height; y++) {
---
-cgit v0.9.0.2-2-gbebe
-From 70b2856ed3d31b41e69b3d82fb9c5c11c2b3d3d4 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 05 Apr 2012 23:43:35 +0000
-Subject: type1-subset: use fallback font if glyph widths are calculated
-
-Bug 48349 has a pdf file with a Type 1 font where the glyph widths are
-of the form:
-
-34 9302 19 div hsbw
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index 607ac8e..ba1008a 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -751,6 +751,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 	    command = *p++;
- 	    switch (command) {
- 		case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		     if (! last_op_was_integer)
-+			  return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
-@@ -797,6 +800,9 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 			    break;
- 
- 			case TYPE1_CHARSTRING_COMMAND_SBW:
-+			     if (! last_op_was_integer)
-+				  return CAIRO_INT_STATUS_UNSUPPORTED;
-+
- 			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
- 			    font->build_stack.sp = 0;
- 			    last_op_was_integer = FALSE;
---
-cgit v0.9.0.2-2-gbebe
-From a6d955fcc46ae2da8d6f3b2cadeae64c03066461 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Thu, 05 Apr 2012 23:53:50 +0000
-Subject: fix indentation in cairo_type1_font_subset_parse_charstring
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index ba1008a..ddef8ae 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -1,3 +1,4 @@
-+/* -*- Mode: c; c-basic-offset: 4; indent-tabs-mode: t; tab-width: 8; -*- */
- /* cairo - a vector graphics library with display and print output
-  *
-  * Copyright © 2006 Red Hat, Inc
-@@ -750,86 +751,79 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
-         if (*p < 32) {
- 	    command = *p++;
- 	    switch (command) {
--		case TYPE1_CHARSTRING_COMMAND_HSBW:
--		     if (! last_op_was_integer)
--			  return CAIRO_INT_STATUS_UNSUPPORTED;
-+	    case TYPE1_CHARSTRING_COMMAND_HSBW:
-+		if (! last_op_was_integer)
-+		    return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
-+		font->build_stack.sp = 0;
-+		last_op_was_integer = FALSE;
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
-+		if (font->subset_subrs  &&
-+		    last_op_was_integer &&
-+		    font->build_stack.top_value >= 0    &&
-+		    font->build_stack.top_value < font->num_subrs)
-+		{
-+		    subr_num = font->build_stack.top_value;
-+		    font->subrs[subr_num].used = TRUE;
-+		    last_op_was_integer = FALSE;
-+		    status = cairo_type1_font_subset_parse_charstring (font,
-+								       glyph,
-+								       font->subrs[subr_num].subr_string,
-+								       font->subrs[subr_num].subr_length);
-+		} else {
-+		    font->subset_subrs = FALSE;
-+		}
-+		break;
-+
-+	    case TYPE1_CHARSTRING_COMMAND_ESCAPE:
-+		command = command << 8 | *p++;
-+		switch (command) {
-+		case TYPE1_CHARSTRING_COMMAND_SEAC:
-+		    /* The seac command takes five integer arguments.  The
-+		     * last two are glyph indices into the PS standard
-+		     * encoding give the names of the glyphs that this
-+		     * glyph is composed from.  All we need to do is to
-+		     * make sure those glyphs are present in the subset
-+		     * under their standard names. */
-+		    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
-+		    if (unlikely (status))
-+			return status;
-+
-+		    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
-+		    if (unlikely (status))
-+			return status;
- 
--		    font->glyphs[glyph].width = font->build_stack.stack[1]/font->base.units_per_em;
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_CALLSUBR:
--		    if (font->subset_subrs  &&
--			last_op_was_integer &&
--			font->build_stack.top_value >= 0    &&
--			font->build_stack.top_value < font->num_subrs)
--		    {
--			subr_num = font->build_stack.top_value;
--			font->subrs[subr_num].used = TRUE;
--			last_op_was_integer = FALSE;
--			status = cairo_type1_font_subset_parse_charstring (font,
--									   glyph,
--									   font->subrs[subr_num].subr_string,
--									   font->subrs[subr_num].subr_length);
--		    } else {
--			font->subset_subrs = FALSE;
--		    }
-+		case TYPE1_CHARSTRING_COMMAND_SBW:
-+		    if (! last_op_was_integer)
-+			return CAIRO_INT_STATUS_UNSUPPORTED;
-+
-+		    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
-+		    font->build_stack.sp = 0;
-+		    last_op_was_integer = FALSE;
- 		    break;
- 
--		case TYPE1_CHARSTRING_COMMAND_ESCAPE:
--		    command = command << 8 | *p++;
--		    switch (command) {
--			case TYPE1_CHARSTRING_COMMAND_SEAC:
--			    /* The seac command takes five integer arguments.  The
--			     * last two are glyph indices into the PS standard
--			     * encoding give the names of the glyphs that this
--			     * glyph is composed from.  All we need to do is to
--			     * make sure those glyphs are present in the subset
--			     * under their standard names. */
--			    status = use_standard_encoding_glyph (font, font->build_stack.stack[3]);
--			    if (unlikely (status))
--				return status;
--
--			    status = use_standard_encoding_glyph (font, font->build_stack.stack[4]);
--			    if (unlikely (status))
--				return status;
--
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_SBW:
--			     if (! last_op_was_integer)
--				  return CAIRO_INT_STATUS_UNSUPPORTED;
--
--			    font->glyphs[glyph].width = font->build_stack.stack[2]/font->base.units_per_em;
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
--			    for (i = 0; i < font->build_stack.sp; i++)
--				font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
--			    font->ps_stack.num_other_subr_args = font->build_stack.sp;
--			    font->ps_stack.cur_other_subr_arg = 0;
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
--
--			case TYPE1_CHARSTRING_COMMAND_POP:
--			    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
--				font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
--				last_op_was_integer = TRUE;
--			    } else {
--				font->subset_subrs = FALSE;
--			    }
--			    break;
--
--			default:
--			    font->build_stack.sp = 0;
--			    last_op_was_integer = FALSE;
--			    break;
-+		case TYPE1_CHARSTRING_COMMAND_CALLOTHERSUBR:
-+		    for (i = 0; i < font->build_stack.sp; i++)
-+			font->ps_stack.other_subr_args[i] = font->build_stack.stack[i];
-+		    font->ps_stack.num_other_subr_args = font->build_stack.sp;
-+		    font->ps_stack.cur_other_subr_arg = 0;
-+		    font->build_stack.sp = 0;
-+		    last_op_was_integer = FALSE;
-+		    break;
-+
-+		case TYPE1_CHARSTRING_COMMAND_POP:
-+		    if (font->ps_stack.num_other_subr_args > font->ps_stack.cur_other_subr_arg) {
-+			font->build_stack.top_value = font->ps_stack.other_subr_args[font->ps_stack.cur_other_subr_arg++];
-+			last_op_was_integer = TRUE;
-+		    } else {
-+			font->subset_subrs = FALSE;
- 		    }
- 		    break;
- 
-@@ -837,6 +831,13 @@ cairo_type1_font_subset_parse_charstring (cairo_type1_font_subset_t *font,
- 		    font->build_stack.sp = 0;
- 		    last_op_was_integer = FALSE;
- 		    break;
-+		}
-+		break;
-+
-+	    default:
-+		font->build_stack.sp = 0;
-+		last_op_was_integer = FALSE;
-+		break;
- 	    }
-         } else {
-             /* integer argument */
---
-cgit v0.9.0.2-2-gbebe
-From 8886220b5027296f5b3b95e9c2f93509108d3b9e Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 06 Apr 2012 00:13:53 +0000
-Subject: type1-subset: if font name is prefixed with a subset tag, strip it off
-
----
-diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
-index ddef8ae..e507abe 100644
---- a/src/cairo-type1-subset.c
-+++ b/src/cairo-type1-subset.c
-@@ -381,6 +381,7 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
- {
-     const char *start, *end, *segment_end;
-     char *s;
-+    int i;
- 
-     segment_end = font->header_segment + font->header_segment_size;
-     start = find_token (font->header_segment, segment_end, "/FontName");
-@@ -406,6 +407,16 @@ cairo_type1_font_subset_get_fontname (cairo_type1_font_subset_t *font)
- 	return CAIRO_INT_STATUS_UNSUPPORTED;
-     }
- 
-+    /* If font name is prefixed with a subset tag, strip it off. */
-+    if (strlen(start) > 7 && start[6] == '+') {
-+	for (i = 0; i < 6; i++) {
-+	    if (start[i] < 'A' || start[i] > 'Z')
-+		break;
-+	}
-+	if (i == 6)
-+	    start += 7;
-+    }
-+
-     font->base.base_font = strdup (start);
-     free (s);
-     if (unlikely (font->base.base_font == NULL))
---
-cgit v0.9.0.2-2-gbebe
-From 8657ca10e34b0034602680b4304d47ecf90ccbfd Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Fri, 06 Apr 2012 11:50:40 +0000
-Subject: fix _cairo_pattern_get_ink_extents to work with snapshot recording surfaces
-
-It had caused pdf bbox sizes to regress to page size bboxes.
----
-diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
-index 27ba004..5b3e177 100644
---- a/src/cairo-pattern.c
-+++ b/src/cairo-pattern.c
-@@ -37,6 +37,7 @@
- #include "cairo-path-private.h"
- #include "cairo-pattern-private.h"
- #include "cairo-recording-surface-private.h"
-+#include "cairo-surface-snapshot-private.h"
- 
- #include <float.h>
- 
-@@ -3666,6 +3667,9 @@ _cairo_pattern_get_ink_extents (const cairo_pattern_t         *pattern,
- 	    (const cairo_surface_pattern_t *) pattern;
- 	cairo_surface_t *surface = surface_pattern->surface;
- 
-+	if (_cairo_surface_is_snapshot (surface))
-+	    surface = _cairo_surface_snapshot_get_target (surface);
-+
- 	if (_cairo_surface_is_recording (surface)) {
- 	    cairo_matrix_t imatrix;
- 	    cairo_box_t box;
---
-cgit v0.9.0.2-2-gbebe
-From 6f28f0b33cb12f3b2dd48c87da0018bd00c17107 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 08 Apr 2012 10:28:59 +0000
-Subject: stroke: Fix misuse of half_line_x for vertical caps on dashes
-
-A typo using half_line_x instead of half_line_y when emitting dashed
-segments of the rectilinear stroke.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-path-stroke-boxes.c b/src/cairo-path-stroke-boxes.c
-index 3e8c5a4..cc9dd19 100644
---- a/src/cairo-path-stroke-boxes.c
-+++ b/src/cairo-path-stroke-boxes.c
-@@ -342,15 +342,15 @@ _cairo_rectilinear_stroker_emit_segments_dashed (cairo_rectilinear_stroker_t *st
- 		    box.p1.x = box.p2.x - half_line_x;
- 		}
- 		if (out_slope.dy >= 0)
--		    box.p1.y -= half_line_x;
-+		    box.p1.y -= half_line_y;
- 		if (out_slope.dy <= 0)
--		    box.p2.y += half_line_x;
-+		    box.p2.y += half_line_y;
- 	    } else {
- 		if (box.p1.y <= box.p2.y) {
- 		    box.p1.y = box.p2.y;
--		    box.p2.y += half_line_x;
-+		    box.p2.y += half_line_y;
- 		} else {
--		    box.p1.y = box.p2.y - half_line_x;
-+		    box.p1.y = box.p2.y - half_line_y;
- 		}
- 		if (out_slope.dx >= 0)
- 		    box.p1.x -= half_line_x;
---
-cgit v0.9.0.2-2-gbebe
-From 113ec6bf0c8ed1ff12293d1ed2a2de9bd5b9904b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sun, 08 Apr 2012 16:58:13 +0000
-Subject: traps: Clip the trapezoid extents against the clip extents
-
-Just in case the clip polygon turns out to be much larger than the
-operation extents (silly us for not reducing it correctly) and lead to
-catastrophe, such as:
-
-Program received signal SIGSEGV, Segmentation fault.
-pixman_fill_sse2 (bits=<optimized out>, stride=4, bpp=8, x=0, y=0,
-width=3, height=-34811, data=0) at pixman-sse2.c:3369
-3369		    *(uint16_t *)d = data;
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-traps-compositor.c b/src/cairo-traps-compositor.c
-index 284a0be..c49e208 100644
---- a/src/cairo-traps-compositor.c
-+++ b/src/cairo-traps-compositor.c
-@@ -218,8 +218,13 @@ combine_clip_as_traps (const cairo_traps_compositor_t *compositor,
-     _cairo_traps_fini (&traps);
-     cairo_surface_destroy (src);
- 
--    if (status == CAIRO_INT_STATUS_SUCCESS &&
--	(fixup.width < extents->width || fixup.height < extents->height)) {
-+    if (unlikely (status))
-+	return status;
-+
-+    if (! _cairo_rectangle_intersect (&fixup, extents))
-+	return CAIRO_STATUS_SUCCESS;
-+
-+    if (fixup.width < extents->width || fixup.height < extents->height) {
- 	cairo_boxes_t clear;
- 
- 	_cairo_boxes_init (&clear);
---
-cgit v0.9.0.2-2-gbebe
-From de61681574eb7d6e0e497ea7f25797e3d9b20ac4 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 09 Apr 2012 11:47:34 +0000
-Subject: build: Disable -Wset-but-unused-variable
-
-This is too noisy in the current build, and masking more important
-warnings.
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index 3eb0104..f1b17f4 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -21,6 +21,9 @@ MAYBE_WARN="-Wall -Wextra \
- -Wno-missing-field-initializers -Wno-unused-parameter \
- -Wno-attributes -Wno-long-long -Winline"
- 
-+# -Wunused-but-set-variable is too noisy at present
-+NO_WARN="-Wno-unused-but-set-variable"
-+
- dnl Sun Studio 12 likes to rag at us for abusing enums like
- dnl having cairo_status_t variables hold cairo_int_status_t
- dnl values.  It's bad, we know.  Now please be quiet.
-@@ -34,6 +37,8 @@ MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
- dnl Also to turn various gcc/glibc-specific preprocessor checks
- MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
- 
-+MAYBE_WARN="$MAYBE_WARN $NO_WARN"
-+
- # invalidate cached value if MAYBE_WARN has changed
- if test "x$cairo_cv_warn_maybe" != "x$MAYBE_WARN"; then
- 	unset cairo_cv_warn_cflags
---
-cgit v0.9.0.2-2-gbebe
-From 7cb5053c0694992320b5f7ea3b91ea497431813b Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Mon, 09 Apr 2012 11:49:20 +0000
-Subject: analysis: Apply the integer translation to the bbox as well
-
-The bbox is used to compute the ink extents (and so the pattern extents
-of a recording surface) and if given an integer translation we failed to
-transform the bbox into the target space.
-
-Fixes mask (pdf).
-
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/cairo-analysis-surface.c b/src/cairo-analysis-surface.c
-index b8abe02..8878f62 100644
---- a/src/cairo-analysis-surface.c
-+++ b/src/cairo-analysis-surface.c
-@@ -220,6 +220,14 @@ _add_operation (cairo_analysis_surface_t *surface,
- 	if (_cairo_matrix_is_integer_translation (&surface->ctm, &tx, &ty)) {
- 	    rect->x += tx;
- 	    rect->y += ty;
-+
-+	    tx = _cairo_fixed_from_int (tx);
-+	    bbox.p1.x += tx;
-+	    bbox.p2.x += tx;
-+
-+	    ty = _cairo_fixed_from_int (ty);
-+	    bbox.p1.y += ty;
-+	    bbox.p2.y += ty;
- 	} else {
- 	    _cairo_matrix_transform_bounding_box_fixed (&surface->ctm,
- 							&bbox, NULL);
---
-cgit v0.9.0.2-2-gbebe
-From 038e4991912656a3239ca82d60056ca129016ba6 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Mon, 09 Apr 2012 08:31:44 +0000
-Subject: pdf: avoid unnecessary use of patterns in mask groups
-
----
-diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
-index 4930e72..78537ce 100644
---- a/src/cairo-pdf-surface.c
-+++ b/src/cairo-pdf-surface.c
-@@ -5703,56 +5703,68 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
-     if (unlikely (status))
- 	return status;
- 
--    pattern_res.id = 0;
--    gstate_res.id = 0;
--    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
--						 &pattern_res, &gstate_res);
--    if (unlikely (status))
--	return status;
--
--    if (gstate_res.id != 0) {
--	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
--	if (unlikely (smask_group == NULL))
--	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--	smask_group->width = group->width;
--	smask_group->height = group->height;
--	smask_group->operation = PDF_PAINT;
--	smask_group->source = cairo_pattern_reference (group->mask);
--	smask_group->source_res = pattern_res;
--	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
--	if (unlikely (status)) {
--	    _cairo_pdf_smask_group_destroy (smask_group);
--	    return status;
--	}
--
--	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
--	if (unlikely (status))
--	    return status;
--
--	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+    if (_can_paint_pattern (group->mask)) {
-+	_cairo_output_stream_printf (surface->output, "q\n");
-+	status = _cairo_pdf_surface_paint_pattern (surface,
-+						   group->mask,
-+						   &group->extents,
-+						   FALSE);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "q /s%d gs /x%d Do Q\n",
--				     gstate_res.id,
--				     smask_group->group_res.id);
-+	_cairo_output_stream_printf (surface->output, "Q\n");
-     } else {
--	status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
-+	pattern_res.id = 0;
-+	gstate_res.id = 0;
-+	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->mask, NULL,
-+						     &pattern_res, &gstate_res);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "%f %f %f %f re f\n",
--				     bbox.p1.x,
--				     bbox.p1.y,
--				     bbox.p2.x - bbox.p1.x,
--				     bbox.p2.y - bbox.p1.y);
-+	if (gstate_res.id != 0) {
-+	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
-+	    if (unlikely (smask_group == NULL))
-+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--	status = _cairo_pdf_surface_unselect_pattern (surface);
--	if (unlikely (status))
--	    return status;
-+	    smask_group->width = group->width;
-+	    smask_group->height = group->height;
-+	    smask_group->operation = PDF_PAINT;
-+	    smask_group->source = cairo_pattern_reference (group->mask);
-+	    smask_group->source_res = pattern_res;
-+	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
-+	    if (unlikely (status)) {
-+		_cairo_pdf_smask_group_destroy (smask_group);
-+		return status;
-+	    }
-+
-+	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "q /s%d gs /x%d Do Q\n",
-+					 gstate_res.id,
-+					 smask_group->group_res.id);
-+	} else {
-+	    status = _cairo_pdf_surface_select_pattern (surface, group->mask, pattern_res, FALSE);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "%f %f %f %f re f\n",
-+					 bbox.p1.x,
-+					 bbox.p1.y,
-+					 bbox.p2.x - bbox.p1.x,
-+					 bbox.p2.y - bbox.p1.y);
-+
-+	    status = _cairo_pdf_surface_unselect_pattern (surface);
-+	    if (unlikely (status))
-+		return status;
-+	}
-     }
- 
-     status = _cairo_pdf_surface_close_group (surface, &mask_group);
-@@ -5764,54 +5776,66 @@ _cairo_pdf_surface_write_mask_group (cairo_pdf_surface_t	*surface,
-     if (unlikely (status))
- 	return status;
- 
--    pattern_res.id = 0;
--    gstate_res.id = 0;
--    status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
--						 &pattern_res, &gstate_res);
--    if (unlikely (status))
--	return status;
--
--    if (gstate_res.id != 0) {
--	smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
--	if (unlikely (smask_group == NULL))
--	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
--
--	smask_group->operation = PDF_PAINT;
--	smask_group->source = cairo_pattern_reference (group->source);
--	smask_group->source_res = pattern_res;
--	status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
--	if (unlikely (status)) {
--	    _cairo_pdf_smask_group_destroy (smask_group);
--	    return status;
--	}
--
--	status = _cairo_pdf_surface_add_smask (surface, gstate_res);
--	if (unlikely (status))
--	    return status;
--
--	status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+    if (_can_paint_pattern (group->source)) {
-+	_cairo_output_stream_printf (surface->output, "q\n");
-+	status = _cairo_pdf_surface_paint_pattern (surface,
-+						   group->source,
-+						   &group->extents,
-+						   FALSE);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "q /s%d gs /x%d Do Q\n",
--				     gstate_res.id,
--				     smask_group->group_res.id);
-+	_cairo_output_stream_printf (surface->output, "Q\n");
-     } else {
--	status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
-+	pattern_res.id = 0;
-+	gstate_res.id = 0;
-+	status = _cairo_pdf_surface_add_pdf_pattern (surface, group->source, NULL,
-+						     &pattern_res, &gstate_res);
- 	if (unlikely (status))
- 	    return status;
- 
--	_cairo_output_stream_printf (surface->output,
--				     "%f %f %f %f re f\n",
--				     bbox.p1.x,
--				     bbox.p1.y,
--				     bbox.p2.x - bbox.p1.x,
--				     bbox.p2.y - bbox.p1.y);
-+	if (gstate_res.id != 0) {
-+	    smask_group = _cairo_pdf_surface_create_smask_group (surface, &group->extents);
-+	    if (unlikely (smask_group == NULL))
-+		return _cairo_error (CAIRO_STATUS_NO_MEMORY);
- 
--	status = _cairo_pdf_surface_unselect_pattern (surface);
--	if (unlikely (status))
--	    return status;
-+	    smask_group->operation = PDF_PAINT;
-+	    smask_group->source = cairo_pattern_reference (group->source);
-+	    smask_group->source_res = pattern_res;
-+	    status = _cairo_pdf_surface_add_smask_group (surface, smask_group);
-+	    if (unlikely (status)) {
-+		_cairo_pdf_smask_group_destroy (smask_group);
-+		return status;
-+	    }
-+
-+	    status = _cairo_pdf_surface_add_smask (surface, gstate_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    status = _cairo_pdf_surface_add_xobject (surface, smask_group->group_res);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "q /s%d gs /x%d Do Q\n",
-+					 gstate_res.id,
-+					 smask_group->group_res.id);
-+	} else {
-+	    status = _cairo_pdf_surface_select_pattern (surface, group->source, pattern_res, FALSE);
-+	    if (unlikely (status))
-+		return status;
-+
-+	    _cairo_output_stream_printf (surface->output,
-+					 "%f %f %f %f re f\n",
-+					 bbox.p1.x,
-+					 bbox.p1.y,
-+					 bbox.p2.x - bbox.p1.x,
-+					 bbox.p2.y - bbox.p1.y);
-+
-+	    status = _cairo_pdf_surface_unselect_pattern (surface);
-+	    if (unlikely (status))
-+		return status;
-+	}
-     }
- 
-     status = _cairo_pdf_surface_close_group (surface, NULL);
---
-cgit v0.9.0.2-2-gbebe
-From 9fcbe25c2dcf831783bb0fd20af9754c0b5c409b Mon Sep 17 00:00:00 2001
-From: Maarten Bosmans <mkbosmans@gmail.com>
-Date: Mon, 09 Apr 2012 19:33:50 +0000
-Subject: Protect code using dlfcn.h with CAIRO_HAS_DLSYM
-
----
-diff --git a/configure.ac b/configure.ac
-index cedfebe..5d2e6ec 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -52,6 +52,7 @@ AM_CONDITIONAL(CAIRO_HAS_DL, test "x$have_dl" = "xyes")
- if test "x$have_dlsym" = "xyes"; then
-   AC_DEFINE([CAIRO_HAS_DLSYM], 1, [Define to 1 if dlsym is available])
- fi
-+AM_CONDITIONAL(CAIRO_HAS_DLSYM, test "x$have_dlsym" = "xyes")
- 
- dnl ===========================================================================
- 
-diff --git a/util/Makefile.am b/util/Makefile.am
-index f202f35..82d0a80 100644
---- a/util/Makefile.am
-+++ b/util/Makefile.am
-@@ -12,20 +12,24 @@ endif
- 
- if CAIRO_HAS_TRACE
- SUBDIRS += cairo-trace
-+if CAIRO_HAS_DLSYM
- if CAIRO_HAS_SCRIPT_SURFACE
- if CAIRO_HAS_TEE_SURFACE
- SUBDIRS += cairo-fdr
- endif
- endif
- endif
-+endif
- 
- if BUILD_SPHINX
-+if CAIRO_HAS_DLSYM
- if CAIRO_HAS_SCRIPT_SURFACE
- if CAIRO_HAS_TEE_SURFACE
- SUBDIRS += cairo-sphinx
- endif
- endif
- endif
-+endif
- 
- AM_CPPFLAGS = -I$(top_srcdir)/src \
- 	      -I$(top_builddir)/src \
---
-cgit v0.9.0.2-2-gbebe
-From c7b86ab97be1d3d3ccf43b652832f148a2fcf290 Mon Sep 17 00:00:00 2001
-From: Adrian Johnson <ajohnson@redneon.com>
-Date: Tue, 10 Apr 2012 13:04:05 +0000
-Subject: any2ppm: fix missing enumeration warning
-
----
-diff --git a/test/any2ppm.c b/test/any2ppm.c
-index 6b61c47..2403347 100644
---- a/test/any2ppm.c
-+++ b/test/any2ppm.c
-@@ -193,6 +193,7 @@ write_ppm (cairo_surface_t *surface, int fd)
- 	break;
-     case CAIRO_FORMAT_A1:
-     case CAIRO_FORMAT_RGB16_565:
-+    case CAIRO_FORMAT_RGB30:
-     case CAIRO_FORMAT_INVALID:
-     default:
- 	return "unhandled image format";
---
-cgit v0.9.0.2-2-gbebe
-From 09de481ce5f6ed1c38c0d5bf3af7c60642c4c947 Mon Sep 17 00:00:00 2001
-From: Gilles Espinasse <g.esp@free.fr>
-Date: Sat, 07 Apr 2012 21:09:51 +0000
-Subject: Cosmetic configure fix
-
-'how to allow undefined symbols in shared libraries' test should use CAIRO_CC_TRY_FLAG_SILENT or configure display is a bit out of order like this
-
-checking how to allow undefined symbols in shared libraries used by test suite... checking whether gcc supports -Wl,--allow-shlib-undefined... yes
--Wl,--allow-shlib-undefined
-
-Signed-off-by: Gilles Espinasse <g.esp@free.fr>
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
-index f1b17f4..3b2c6f3 100644
---- a/build/configure.ac.warnings
-+++ b/build/configure.ac.warnings
-@@ -89,7 +89,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result],
- 
- dnl check linker flags
- AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags,
--	       [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [],
-+	       [CAIRO_CC_TRY_FLAG_SILENT([-Wl,--allow-shlib-undefined], [],
- 				  [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")])
- CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags"
- AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS)
---
-cgit v0.9.0.2-2-gbebe
-From 07fc63676dfdaa57ed919ad7be8f59c97c615473 Mon Sep 17 00:00:00 2001
-From: Uli Schlachter <psychon@znc.in>
-Date: Wed, 11 Apr 2012 19:37:55 +0000
-Subject: xlib: Disable fallback compositor with xlib-xcb
-
-When xlib-xcb is enabled, this is just dead code which is never used. Thus, this
-shouldn't hurt. However, this does include cairo-xlib-private.h. Shouldn't be a
-problem? Well, that header contains static inline functions which some compiler
-on Solaris will emit even when they are unused.
-
-This brings us to the real problem: That static inline function refers to a
-function which isn't compiled with xlib-xcb and thus linking fails with
-undefined symbols.
-
-This can be reproduced with GCC by adding a call to
-_cairo_xlib_screen_put_gc(NULL, NULL, 0, 0); to
-_cairo_xlib_fallback_compositor_get.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48489
-Signed-off-by: Uli Schlachter <psychon@znc.in>
----
-diff --git a/src/cairo-xlib-fallback-compositor.c b/src/cairo-xlib-fallback-compositor.c
-index 5391926..7d45cd1 100644
---- a/src/cairo-xlib-fallback-compositor.c
-+++ b/src/cairo-xlib-fallback-compositor.c
-@@ -42,6 +42,8 @@
- 
- #include "cairoint.h"
- 
-+#if !CAIRO_HAS_XLIB_XCB_FUNCTIONS
-+
- #include "cairo-xlib-private.h"
- 
- #include "cairo-compositor-private.h"
-@@ -52,3 +54,5 @@ _cairo_xlib_fallback_compositor_get (void)
-     /* XXX Do something interesting here to mitigate fallbacks ala xcb */
-     return &_cairo_fallback_compositor;
- }
-+
-+#endif /* !CAIRO_HAS_XLIB_XCB_FUNCTIONS */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/calligra/PKGBUILD b/testing/calligra/PKGBUILD
deleted file mode 100644
index b13b0e265..000000000
--- a/testing/calligra/PKGBUILD
+++ /dev/null
@@ -1,221 +0,0 @@
-# $Id: PKGBUILD 169630 2012-10-25 01:34:49Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=calligra
-pkgname=('calligra-filters'
-         'calligra-libs'
-         'calligra-plugins'
-         'calligra-tools'
-         'calligra-karbon'
-         'calligra-kexi'
-         'calligra-plan'
-         'calligra-stage'
-         'calligra-krita'
-         'calligra-sheets'
-         'calligra-words'
-         'calligra-handbook'
-         'calligra-braindump'
-         'calligra-flow')
-pkgver=2.5.3
-pkgrel=6
-arch=('i686' 'x86_64')
-url='http://www.calligra-suite.org/'
-license=('FDL1.2' 'GPL2' 'LGPL')
-makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
-             'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg'
-             'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
-groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('83e2679b7ecb923b953ace06db7ca4c2')
-
-build() {
-  mkdir build
-  cd build
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBUILD_active=OFF
-  make
-}
-
-package_calligra-filters() {
-  pkgdesc="Filters for the Calligra office suite"
-  optdepends=('libwpg: Corel WordPerfect Graphics image importer'
-              'libwps: Microsoft Works file word processor format import')
-  conflicts=('koffice-filters')
-  replaces=('koffice-filters')
-  install=calligra-filters.install
-
-  cd "${srcdir}"/build/filters
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-libs() {
-  pkgdesc="Libraries for the Calligra office suite"
-  depends=('kdepimlibs' 'lcms2')
-  conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
-             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
-             'calligra-templates')
-  replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
-             'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces'
-             'calligra-libs' 'calligra-pics' 'calligra-servicetypes'
-             'calligra-templates')
-
-  for d in interfaces libs pics servicetypes templates; do
-    cd "${srcdir}"/build/${d}
-    make DESTDIR="${pkgdir}" install
-  done
-}
-
-package_calligra-plugins() {
-  pkgdesc="Plugins for the Calligra office suite"
-  depends=('calligra-libs' 'calligra-filters')
-  optdepends=('kdeedu-marble: map shape for Calligra')
-  conflicts=('koffice-plugins' 'koffice-kchart')
-  replaces=('koffice-plugins' 'koffice-kchart' 'koffice-kformula')
-
-  cd "${srcdir}"/build/plugins
-  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_calligra-karbon() {
-  pkgdesc="Create scalable vector drawings"
-  depends=('calligra-libs' 'kdebase-runtime' 'pstoedit')
-  optdepends=('calligra-filters: import/export filters'
-              'calligra-tools: extra calligra tools')
-  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' 'glew' 'fftw')
-  optdepends=('libmysqlclient: MySQL driver'
-              'libpqxx: PostgreSQL driver'
-              'freetds: Sybase & MS SQL driver'
-              'xbase: XBase driver'
-              'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
-              'kdeedu-marble: map form widget'
-              'calligra-plugins: extra calligra plugins')
-  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
-  cd "${srcdir}"/build/doc/kexi
-  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' 'kdebase-runtime')
-  optdepends=('calligra-plugins: extra calligra plugins')
-  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
-  cd "${srcdir}"/build/doc/stage
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-krita() {
-  pkgdesc="Edit and paint images"
-  depends=('calligra-plugins' 'kdebase-runtime' 'eigen2'
-           'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl')
-  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-sheets() {
-  pkgdesc="Write spreadsheet documents"
-  depends=('calligra-libs' 'gsl' 'kdebase-runtime')
-  optdepends=('calligra-filters: import/export filters'
-              'calligra-plugins: extra calligra plugins'
-              'calligra-tools: extra calligra tools')
-  conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc' 'calligra-tables')
-  install=calligra-sheets.install
-
-  cd "${srcdir}"/build/sheets
-  make DESTDIR="${pkgdir}" install
-  cd "${srcdir}"/build/doc/sheets
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-words() {
-  pkgdesc="Word Processor"
-  depends=('calligra-libs' 'kdegraphics-okular')
-  optdepends=('calligra-tools: extra calligra tools')
-  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')
-  options=('docs')
-
-  cd "${srcdir}"/build/doc/calligra
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-braindump() {
-  pkgdesc="Notes and idea gathering"
-  depends=('calligra-libs' 'kdebase-runtime')
-  install=calligra-braindump.install
-
-  cd "${srcdir}"/build/braindump
-  make DESTDIR="${pkgdir}" install
-}
-
-package_calligra-flow() {
-  pkgdesc="Flowchart & Diagram Editing"
-  depends=('calligra-words')
-  conflicts=('calligra-flow-doc')
-  replaces=('calligra-flow-doc')
-  install=calligra-flow.install
-
-  cd "${srcdir}"/build/flow
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/calligra/calligra-braindump.install b/testing/calligra/calligra-braindump.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/testing/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/testing/calligra/calligra-filters.install b/testing/calligra/calligra-filters.install
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/testing/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/testing/calligra/calligra-flow.install b/testing/calligra/calligra-flow.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/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/testing/calligra/calligra-karbon.install b/testing/calligra/calligra-karbon.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/testing/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/testing/calligra/calligra-kexi.install b/testing/calligra/calligra-kexi.install
deleted file mode 100644
index b8c7ebf27..000000000
--- a/testing/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/testing/calligra/calligra-krita.install b/testing/calligra/calligra-krita.install
deleted file mode 100644
index 33d234a02..000000000
--- a/testing/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/testing/calligra/calligra-plan.install b/testing/calligra/calligra-plan.install
deleted file mode 100644
index c2179f6e2..000000000
--- a/testing/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/testing/calligra/calligra-sheets.install b/testing/calligra/calligra-sheets.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/calligra/calligra-sheets.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/calligra/calligra-stage.install b/testing/calligra/calligra-stage.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/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/testing/calligra/calligra-tools.install b/testing/calligra/calligra-tools.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/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/testing/calligra/calligra-words.install b/testing/calligra/calligra-words.install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/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/testing/calligra/calligra.install b/testing/calligra/calligra.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/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/testing/celestia/PKGBUILD b/testing/celestia/PKGBUILD
deleted file mode 100644
index 492b6565b..000000000
--- a/testing/celestia/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 168482 2012-10-12 16:54:10Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=celestia
-pkgver=1.6.1
-pkgrel=3
-pkgdesc="Real-time space simulation"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.shatters.net/celestia/"
-depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'glu' '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'
-        'gcc-4.7-fixes.diff')
-sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7'
-          '7c08ca391603806d788cb8f3342acedafc924eef'
-          '46ecc4e10b24191384bc848c206652498843adf0'
-          '534c8eee18d13a868c91f0b870ebecc05f3e7ae1'
-          '582f9eed93eca02a16350f02c29e2ea6f69aa869')
-
-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"
-    patch -Np1 -i "${srcdir}/gcc-4.7-fixes.diff"
-
-    # This version of Celestia has a bug in the font rendering and requires -fsigned-char 
-    export CFLAGS="$CFLAGS -fsigned-char"
-    export CXXFLAGS="$CXXFLAGS -fsigned-char"
-
-    autoreconf
-    ./configure --prefix=/usr \
-                --with-lua=/usr \
-		--datadir=/usr/share \
-                --with-gtk \
-                --disable-rpath \
-                --with-lua
-    make
-}
-
-package() {
-    cd ${srcdir}/${pkgname}-${pkgver}
-
-    make DESTDIR=${pkgdir} install
-}
-
diff --git a/testing/celestia/celestia-1.5.1-gcc44.patch b/testing/celestia/celestia-1.5.1-gcc44.patch
deleted file mode 100644
index b1ee896f0..000000000
--- a/testing/celestia/celestia-1.5.1-gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/celengine/overlay.h.orig	2009-07-08 02:27:08.000000000 -0400
-+++ src/celengine/overlay.h	2009-07-08 02:27:28.000000000 -0400
-@@ -10,6 +10,7 @@
- #ifndef _OVERLAY_H_
- #define _OVERLAY_H_
- 
-+#include <cstdio>
- #include <string>
- #include <iostream>
- #include <celtxf/texturefont.h>
---- src/celengine/star.cpp.orig	2009-07-08 02:40:52.000000000 -0400
-+++ src/celengine/star.cpp	2009-07-08 02:41:08.000000000 -0400
-@@ -8,6 +8,7 @@
- // of the License, or (at your option) any later version.
- 
- #include <celmath/mathlib.h>
-+#include <cstdio>
- #include <cstring>
- #include <cassert>
- #include "celestia.h"
diff --git a/testing/celestia/celestia-1.6.1-gcc46.patch b/testing/celestia/celestia-1.6.1-gcc46.patch
deleted file mode 100644
index ddf4036f2..000000000
--- a/testing/celestia/celestia-1.6.1-gcc46.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=366073
-
-Patch written by Nils Larsson <ni1s@nerdshack.com>
---- src/celengine/frametree.h
-+++ src/celengine/frametree.h
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
- 
- #include <vector>
-+#include <cstddef>
- 
- class Star;
- class Body;
diff --git a/testing/celestia/celestia-1.6.1-gentoo.patch b/testing/celestia/celestia-1.6.1-gentoo.patch
deleted file mode 100644
index 57fffe159..000000000
--- a/testing/celestia/celestia-1.6.1-gentoo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/celestia/Makefile.am	2011-06-07 19:15:51.502000147 +0200
-+++ src/celestia/Makefile.am.new	2011-06-07 19:15:47.208000302 +0200
-@@ -15,6 +15,7 @@
- if ENABLE_GTK
- SUBDIRS += gtk
- celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
-
-Index: src/celengine/frametree.h
-===================================================================
---- src/celengine/frametree.h	(revision 5163)
-+++ src/celengine/frametree.h	(arbetskopia)
-@@ -14,6 +14,7 @@
- #define _CELENGINE_FRAMETREE_H_
- 
- #include <vector>
-+#include <cstddef>
- 
- class Star;
- class Body;
diff --git a/testing/celestia/celestia-1.6.1-libpng15.patch b/testing/celestia/celestia-1.6.1-libpng15.patch
deleted file mode 100644
index 5dffbab24..000000000
--- a/testing/celestia/celestia-1.6.1-libpng15.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope
-
---- src/celestia/imagecapture.cpp
-+++ src/celestia/imagecapture.cpp
-@@ -31,6 +31,9 @@
- #include "png.h"
- #endif
- 
-+// Z_BEST_COMPRESSION
-+#include <zlib.h>
-+
- // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng
- #ifndef png_jmpbuf
- #define png_jmpbuf(png_ptr) png_ptr->jmpbuf
diff --git a/testing/celestia/celestia-1.6.1-linking.patch b/testing/celestia/celestia-1.6.1-linking.patch
deleted file mode 100644
index d610d5243..000000000
--- a/testing/celestia/celestia-1.6.1-linking.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Fix linking issues:
- * underlinking GLUT (bug #372123, #387609)
- * as-needed (bug #281258)
-
---- a/src/celestia/Makefile.am
-+++ b/src/celestia/Makefile.am
-@@ -7,14 +7,15 @@
- 
- if ENABLE_KDE
- SUBDIRS += kde
--celestiaKDELIBS = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) \
--                  $(LIBSOCKET) -lDCOP kde/libkdegui.a
-+celestiaKDELIBS = kde/libkdegui.a
- celestia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-+LIBS += $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE) $(LIBSOCKET) -lDCOP
- endif
- 
- if ENABLE_GTK
- SUBDIRS += gtk
--celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a
-+celestiaGTKLIBS = gtk/libgtkgui.a
-+LIBS += $(GTK_LIBS)
- endif
- 
- COMMONSOURCES = \
-@@ -62,6 +63,7 @@
- 
- if ENABLE_GLUT
- GLUTSOURCES = glutmain.cpp
-+GLUTLIBS = -lGL
- endif
- 
- if ENABLE_THEORA
-@@ -80,15 +82,16 @@
- celestia_LDADD = \
- 	$(celestiaKDELIBS) \
- 	$(celestiaGTKLIBS) \
--	$(DL_LIBS) \
--	$(LUA_LIBS) \
--	$(THEORA_LIBS) \
- 	../celengine/libcelengine.a \
- 	../celtxf/libceltxf.a \
- 	../cel3ds/libcel3ds.a \
- 	../celmath/libcelmath.a \
- 	../celutil/libcelutil.a \
--	$(SPICE_LIBS)
-+	$(LUA_LIBS) \
-+	$(THEORA_LIBS) \
-+	$(GLUTLIBS) \
-+	$(SPICE_LIBS) \
-+	$(DL_LIBS)
- 
- noinst_HEADERS = $(wildcard *.h)
- noinst_DATA = ../../celestia
diff --git a/testing/celestia/gcc-4.7-fixes.diff b/testing/celestia/gcc-4.7-fixes.diff
deleted file mode 100644
index 9ca09e03f..000000000
--- a/testing/celestia/gcc-4.7-fixes.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/celmath/intersect.h
-+++ b/src/celmath/intersect.h
-@@ -15,6 +15,7 @@
- #include "ray.h"
- #include "sphere.h"
- #include "ellipsoid.h"
-+#include "mathlib.h"
- 
- 
- template<class T> bool testIntersection(const Ray3<T>& ray,
diff --git a/testing/cheese/PKGBUILD b/testing/cheese/PKGBUILD
deleted file mode 100644
index eecdebb6a..000000000
--- a/testing/cheese/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169270 2012-10-18 19:29:27Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=cheese
-pkgver=3.6.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)
-license=('GPL')
-depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop')
-makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto')
-optdepends=('nautilus-sendto: Send snapshots'
-            'frei0r-plugins: More camera effects')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/projects/cheese/"
-install=cheese.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2db101cd16ce41764eb2f676c1bed94e58e4a89141785b95ff088b60bcf6abef')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --disable-static --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/cheese/cheese.install b/testing/cheese/cheese.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/testing/cheese/cheese.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/cinepaint/LICENSE b/testing/cinepaint/LICENSE
deleted file mode 100644
index 746207229..000000000
--- a/testing/cinepaint/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2005, Kai-Uwe Behrmann
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met: 
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer. 
-    * Redistributions in binary form must reproduce the above
-    copyright notice, this list of conditions and the following
-    disclaimer in the documentation and/or other materials provided
-    with the distribution.ntributors may be used to endorse or promote
-    products derived from this software without specific prior written
-    permission. 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
diff --git a/testing/cinepaint/PKGBUILD b/testing/cinepaint/PKGBUILD
deleted file mode 100644
index 3dea42c8a..000000000
--- a/testing/cinepaint/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 169631 2012-10-25 01:34:53Z eric $
-# Maintainer: tobias [tobias.archlinux.org]
-# Contributor: tobias [tobias.justdreams.de]
-
-pkgname=cinepaint
-pkgver=1.3
-pkgrel=5
-pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
-arch=('i686' 'x86_64')
-license=('LGPL' 'GPL' 'MIT')
-url="http://www.cinepaint.org"
-depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
-makedepends=('python2' 'gutenprint>=5.2.9')
-optdepends=('python2: for python plug-ins' 
-            'gutenprint: for print plug-ins'
-            'ghostscript: for pdf plug-ins')
-options=('!libtool')
-install=cinepaint.install
-source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz
-        LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch)
-sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b'
-          'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e'
-          '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5'
-          'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-  patch -p1 -i ../cinepaint-libpng15.patch
-  patch -p1 -i ../cinepaint-missing-include.patch
-  find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
-  sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
-
-#  aclocal -I aclocal
-#  autoconf
-  sh autogen.sh
-  
-  LIBS+="-lstdc++ -lm -lX11" ./configure --prefix=/usr --libdir=/usr/lib --mandir=/usr/share/man \
-    --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
-  sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
-    plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-  make DESTDIR="${pkgdir}" install
-  sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
-    -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
-  sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop"
-  install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/cinepaint/cinepaint-libpng15.patch b/testing/cinepaint/cinepaint-libpng15.patch
deleted file mode 100644
index e22edafae..000000000
--- a/testing/cinepaint/cinepaint-libpng15.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
---- cinepaint.old/plug-ins/png/png.c	2012-01-23 12:39:42.000000000 -0500
-+++ cinepaint/plug-ins/png/png.c	2012-01-23 12:39:50.000000000 -0500
-@@ -390,6 +390,16 @@
-   gchar		*progress;	/* Title for progress display... */
-   guchar	alpha[256],	/* Index -> Alpha */
-   		*alpha_ptr;	/* Temporary pointer */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  int compression_type;
-+  png_bytepp iccp_profile;
-+  png_uint_32 iccp_proflen;
-+  png_uint_32 width, height;
-+  png_byte channels;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -405,7 +415,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. File corrupted?", filename);
-     return image;
-@@ -442,21 +452,26 @@
-   */
- 
-   png_read_info(pp, info);
-+  color_type = png_get_color_type(pp, info);
-+  width=png_get_image_width(pp, info);
-+  height=png_get_image_height(pp, info);
- 
-  /*
-   * Latest attempt, this should be my best yet :)
-   */
- 
-+  bit_depth = png_get_bit_depth(pp, info);
-+
- #ifndef WORDS_BIGENDIAN
--  if(info->bit_depth == 16)
-+  if(bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
- 
--  if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
-     png_set_expand(pp);
-   }
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
-     png_set_packing(pp);
-   }
- 
-@@ -464,8 +479,8 @@
-   * Expand G+tRNS to GA, RGB+tRNS to RGBA
-   */
- 
--  if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
--                       (info->valid & PNG_INFO_tRNS)) {
-+  if (color_type != PNG_COLOR_TYPE_PALETTE &&
-+      (png_get_valid(pp, info, PNG_INFO_tRNS))) {
-     png_set_expand(pp);
-   }
- 
-@@ -482,7 +497,7 @@
- 
- #if PNG_LIBPNG_VER > 99
-   if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
--      info->color_type == PNG_COLOR_TYPE_PALETTE)
-+      color_type == PNG_COLOR_TYPE_PALETTE)
-   {
-     png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
-     /* Copy the existing alpha values from the tRNS chunk */
-@@ -505,9 +520,9 @@
- 
-   png_read_update_info(pp, info);
-   
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 6;
-@@ -545,7 +560,7 @@
-   }
-   else
-   {
--	  switch (info->color_type)
-+	  switch (color_type)
- 	  {
- 		  case PNG_COLOR_TYPE_RGB :		/* RGB */
- 			  bpp        = 3;
-@@ -582,7 +597,7 @@
- 	  };
-   }
- 
--  image = gimp_image_new(info->width, info->height, image_type);
-+  image = gimp_image_new(width, height, image_type);
-   if (image == -1)
-   {
-     g_message("Can't allocate new image\n%s", filename);
-@@ -595,7 +610,7 @@
-   * Create the "background" layer to hold the image...
-   */
- 
--  layer = gimp_layer_new(image, _("Background"), info->width, info->height,
-+  layer = gimp_layer_new(image, _("Background"), width, height,
-                          layer_type, 100, NORMAL_MODE);
-   gimp_image_add_layer(image, layer, 0);
- 
-@@ -627,20 +642,21 @@
- 
-   empty= 0; /* by default assume no full transparent palette entries */
- 
--  if (info->color_type & PNG_COLOR_MASK_PALETTE) {
-+  if (color_type & PNG_COLOR_MASK_PALETTE) {
- 
- #if PNG_LIBPNG_VER > 99
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-     if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-       for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
-         /* Calculates number of fully transparent "empty" entries */
- 
--      gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
--                          info->num_palette - empty);
-+      gimp_image_set_cmap(image, (guchar *) (palette + empty),
-+                          num_palette - empty);
-     } else {
--      gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+      gimp_image_set_cmap(image, (guchar *)palette, num_palette);
-     }
- #else
--    gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+    gimp_image_set_cmap(image, (guchar *)palette, num_palette);
- #endif /* PNG_LIBPNG_VER > 99 */
- 
-   }
-@@ -659,18 +675,19 @@
-   */
- 
-   tile_height = gimp_tile_height ();
--  pixel       = g_new(guchar, tile_height * info->width * bpp);
-+  pixel       = g_new(guchar, tile_height * width * bpp);
-   pixels      = g_new(guchar *, tile_height);
-+  channels=png_get_channels(pp, info);
- 
--  if(info->bit_depth==16)
-+  if(bit_depth==16)
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i * 2;
-+		  pixels[i] = pixel + width * channels * i * 2;
-   }
-   else
-   {
- 	  for (i = 0; i < tile_height; i ++)
--		  pixels[i] = pixel + info->width * info->channels * i;
-+		  pixels[i] = pixel + width * channels * i;
-   }
- 
-   for (pass = 0; pass < num_passes; pass ++)
-@@ -680,11 +697,11 @@
- 	   */
- 
- 	  for (begin = 0, end = tile_height;
--			  begin < info->height;
-+			  begin < height;
- 			  begin += tile_height, end += tile_height)
- 	  {
--		  if (end > info->height)
--			  end = info->height;
-+		  if (end > height)
-+			  end = height;
- 
- 		  num = end - begin;
- 
-@@ -697,20 +714,21 @@
- 		  gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
- 				  drawable->width, num);
- 
--		  gimp_progress_update(((double)pass + (double)end / (double)info->height) /
-+		  gimp_progress_update(((double)pass + (double)end / (double)height) /
- 				  (double)num_passes);
- 	  };
-   };
- 
- #if defined(PNG_iCCP_SUPPORTED)
-   /* set icc profile */
--  if (info->iccp_proflen > 0) {
--    gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
--                                              info->iccp_profile,
--                                              ICC_IMAGE_PROFILE);
-+  png_get_iCCP(pp, info,  (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
-+  if (iccp_proflen > 0) {
-+    gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
-+				       (gchar *)iccp_profile,
-+				       ICC_IMAGE_PROFILE);
-     printf ("%s:%d %s() set embedded profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -808,6 +826,14 @@
-                 blue;           /* Used for palette background */
-   time_t	cutime;         /* Time since epoch */
-   struct tm	*gmt;		/* GMT broken down */
-+  png_byte     color_type;
-+  png_byte     bit_depth;
-+  int filter_method=0;
-+  png_colorp palette;
-+  int num_palette;
-+  png_charpp iccp_name;
-+  png_uint_32 height;
-+  int compression_type;
- 
-  /*
-   * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -824,7 +849,7 @@
-   info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
- 
--  if (setjmp (pp->jmpbuf))
-+  if (setjmp (png_jmpbuf(pp)))
-   {
-     g_message ("%s\nPNG error. Couldn't save image", filename);
-     return 0;
-@@ -857,15 +882,6 @@
-   drawable = gimp_drawable_get (drawable_ID);
-   type     = gimp_drawable_type (drawable_ID);
- 
-- /*
--  * Set the image dimensions, bit depth, interlacing and compression
--  */
--
--  png_set_compression_level (pp, pngvals.compression_level);
--
--  info->width          = drawable->width;
--  info->height         = drawable->height;
--  info->interlace_type = pngvals.interlaced;
- 
-  /*
-   * Set color type and remember bytes per pixel count 
-@@ -874,71 +890,69 @@
-   switch (type)
-   {
-     case RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 8;
-         bpp              = 3;
-         break;
-     case RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 4;
-         break;
-     case GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 8;
-         bpp              = 1;
-         break;
-     case GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 8;
-         bpp              = 2;
-         break;
-     case INDEXED_IMAGE :
- 	bpp		 = 1;
--	info->bit_depth      = 8;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 8;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case INDEXEDA_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 8;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 8;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     case U16_RGB_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB;
-+	bit_depth      = 16;
-         bpp              = 6;
-         break;
-     case U16_RGBA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 8;
-         break;
-     case U16_GRAY_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY;
-+	bit_depth      = 16;
-         bpp              = 2;
-         break;
-     case U16_GRAYA_IMAGE :
--        info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
--	info->bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+	bit_depth      = 16;
-         bpp              = 4;
-         break;
-     case U16_INDEXED_IMAGE :
- 	bpp		 = 2;
--	info->bit_depth      = 16;
--        info->color_type = PNG_COLOR_TYPE_PALETTE;
--	info->valid      |= PNG_INFO_PLTE;
--        info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
--        info->num_palette= num_colors;
-+	bit_depth      = 16;
-+        color_type = PNG_COLOR_TYPE_PALETTE;
-+	png_get_valid(pp, info, PNG_INFO_PLTE);
-+	png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
-         break;
-     case U16_INDEXEDA_IMAGE :
- 	bpp		 = 4;
--	info->bit_depth      = 16;
--	info->color_type = PNG_COLOR_TYPE_PALETTE;
-+	bit_depth      = 16;
-+	color_type = PNG_COLOR_TYPE_PALETTE;
- 	respin_cmap (pp, info, image_ID); /* fix up transparency */
- 	break;
-     default:
-@@ -950,30 +964,36 @@
-   * Fix bit depths for (possibly) smaller colormap images
-   */
-   
--  if (info->valid & PNG_INFO_PLTE) {
--    if (info->num_palette <= 2)
--      info->bit_depth= 1;
--    else if (info->num_palette <= 4)
--      info->bit_depth= 2;
--    else if (info->num_palette <= 16)
--      info->bit_depth= 4;
-+  if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
-+    png_get_PLTE(pp, info, &palette, &num_palette);
-+    if (num_palette <= 2)
-+      bit_depth= 1;
-+    else if (num_palette <= 4)
-+      bit_depth= 2;
-+    else if (num_palette <= 16)
-+      bit_depth= 4;
-     /* otherwise the default is fine */
-   }
- 
-+ png_set_compression_level (pp, pngvals.compression_level);
-+ png_set_IHDR(pp, info, drawable->width, drawable->height,
-+	      bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
-+
-+
-   // write icc profile
- #if defined(PNG_iCCP_SUPPORTED)
-   if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
--    int size;
-+    int  size;
-     char *buffer;
-     
-     buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
-                                                 ICC_IMAGE_PROFILE);
-     png_set_iCCP (pp, info,
-            gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
--                  0, buffer, size);
-+                  0, (png_const_bytep)buffer, size);
-     printf ("%s:%d %s() embedd icc profile \"%s\"\n",
-              __FILE__,__LINE__,__func__,
--                                              info->iccp_name);
-+	    (char *)iccp_name);
-   }
- #endif
- 
-@@ -1039,13 +1059,13 @@
-   * Convert unpacked pixels to packed if necessary
-   */
- 
--  if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+  if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
-     png_set_packing(pp);
- 
-   /* Set swapping for 16 bit per sample images */
-   
- #ifndef WORDS_BIGENDIAN
--  if (info->bit_depth == 16)
-+  if (bit_depth == 16)
- 	  png_set_swap(pp);
- #endif
-   
-@@ -1063,6 +1083,7 @@
- 
-   gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
-                       drawable->height, FALSE, FALSE);
-+  height=png_get_image_height(pp, info);
- 
-   for (pass = 0; pass < num_passes; pass ++)
-   {
-@@ -1077,7 +1098,7 @@
- 	num = end - begin;
- 	
- 	gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
--        if (info->valid & PNG_INFO_tRNS) {
-+        if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1085,7 +1106,7 @@
-             }
-           }
-        /* Forgot this case before, what if there are too many colors? */
--        } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
-+        } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
-           for (i = 0; i < num; ++i) {
- 	    fixed= pixels[i];
-             for (k = 0; k < drawable->width; ++k) {
-@@ -1095,9 +1116,8 @@
-         }
- 	
- 	png_write_rows (pp, pixels, num);
--	
- 	gimp_progress_update (((double)pass + (double)end /
--                    (double)info->height) / (double)num_passes);
-+                    (double)height) / (double)num_passes);
-       };
-   };
- 
diff --git a/testing/cinepaint/cinepaint-missing-include.patch b/testing/cinepaint/cinepaint-missing-include.patch
deleted file mode 100644
index ed159213a..000000000
--- a/testing/cinepaint/cinepaint-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
---- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:51:10.625503826 -0400
-+++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp	2012-04-20 18:52:04.478835055 -0400
-@@ -32,6 +32,7 @@
- 
- #include <list>
- #include <string>
-+#include <unistd.h>
- 
- #include "icc_modell_beobachter.h"
- 
diff --git a/testing/cinepaint/cinepaint.install b/testing/cinepaint/cinepaint.install
deleted file mode 100644
index 5e5cfef4d..000000000
--- a/testing/cinepaint/cinepaint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/clamav/PKGBUILD b/testing/clamav/PKGBUILD
deleted file mode 100644
index 78b068e9f..000000000
--- a/testing/clamav/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 161925 2012-06-16 17:13:04Z dreisner $
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=clamav
-pkgver=0.97.5
-pkgrel=1
-pkgdesc='Anti-virus toolkit for Unix'
-url='http://www.clamav.net/'
-license=('GPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-depends=('bzip2' 'libltdl')
-backup=('etc/clamav/clamd.conf' 'etc/clamav/freshclam.conf' 'etc/conf.d/clamav')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'conf.d'
-        'service'
-        'service.fresh'
-        'logrotate'
-        'tmpfiles.d'
-        'config.patch')
-sha1sums=('1bb317ead4a1a677a9a11a063fc35a63f22309e9'
-          'c9d508c1e5972f0f849d8694c1872455fa9e74de'
-          'cb116cdab49a810381a515cbcfb6a6c148547f07'
-          'df522b0488f3901e491f148c9300f6bae348c605'
-          'cda9a087e5593992150cb456e34c5f6f589aca82'
-          '7cace58743a36dae3e63e5e0c6cc73ea5ef9a6ee'
-          'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '1c8ef193919b041135115170acd6313f008de808')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../config.patch
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc/clamav \
-		--with-dbdir=/var/lib/clamav \
-		--disable-clamav \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	# Make sure conf files get installed, because make install
-	# doesn't do that if clamav is already installed upon building.
-	install -Dm644 etc/clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
-	install -Dm644 etc/freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
-
-	install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
-	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
-	install -Dm644 ../conf.d "${pkgdir}"/etc/conf.d/clamav
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/clamav
-}
diff --git a/testing/clamav/conf.d b/testing/clamav/conf.d
deleted file mode 100644
index 9cd44d9f8..000000000
--- a/testing/clamav/conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# clamav startup script config options
-
-# change these to "yes" to start 
-START_FRESHCLAM="no"
-START_CLAMD="no"
-
-# Options to pass to freshclam (man freshclam for more info).
-FRESHCLAM_OPTS="-c 12"
diff --git a/testing/clamav/config.patch b/testing/clamav/config.patch
deleted file mode 100644
index 0640df2c3..000000000
--- a/testing/clamav/config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -arU 0 old/etc/clamd.conf new/etc/clamd.conf
---- old/etc/clamd.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/clamd.conf	2010-12-02 19:31:45.873357389 +0100
-@@ -14 +14 @@
--#LogFile /tmp/clamd.log
-+LogFile /var/log/clamav/clamd.log
-@@ -34 +34 @@
--#LogTime yes
-+LogTime yes
-@@ -61 +61 @@
--#PidFile /var/run/clamd.pid
-+PidFile /run/clamav/clamd.pid
-@@ -65 +65 @@
--#TemporaryDirectory /var/tmp
-+TemporaryDirectory /tmp
-@@ -80 +80 @@
--#LocalSocket /tmp/clamd.socket
-+LocalSocket /var/lib/clamav/clamd.sock
-@@ -190 +190 @@
--#User clamav
-+User clamav
-diff -arU 0 old/etc/freshclam.conf new/etc/freshclam.conf
---- old/etc/freshclam.conf	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/freshclam.conf	2010-12-02 19:31:51.190024057 +0100
-@@ -17 +17 @@
--#UpdateLogFile /var/log/freshclam.log
-+UpdateLogFile /var/log/clamav/freshclam.log
-@@ -121 +121 @@
--#NotifyClamd /path/to/clamd.conf
-+NotifyClamd /etc/clamav/clamd.conf
diff --git a/testing/clamav/install b/testing/clamav/install
deleted file mode 100644
index a2092e815..000000000
--- a/testing/clamav/install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-	getent group clamav &>/dev/null || groupadd -r -g 64 clamav >/dev/null
-	getent passwd clamav &>/dev/null || useradd -r -u 64 -g clamav -d /dev/null -s /bin/false -c "Clam AntiVirus" clamav >/dev/null
-
-	chown -R clamav:clamav /var/lib/clamav
-	install -o clamav -g clamav -d /run/clamav
-	install -o clamav -g clamav -d /var/log/clamav
-}
-
-post_remove() {
-	getent passwd clamav &>/dev/null && userdel clamav >/dev/null
-	getent group clamav &>/dev/null && groupdel clamav >/dev/null
-	return 0
-}
diff --git a/testing/clamav/logrotate b/testing/clamav/logrotate
deleted file mode 100644
index 6a9051bed..000000000
--- a/testing/clamav/logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/clamav/clamd.log /var/log/clamav/freshclam.log {
-    create 644 clamav clamav
-    sharedscripts
-    postrotate
-            /bin/kill -HUP `cat /run/clamav/clamd.pid 2>/dev/null` 2> /dev/null || true
-            /bin/kill -HUP `cat /run/clamav/freshclam.pid 2>/dev/null` 2> /dev/null || true
-    endscript
-}
diff --git a/testing/clamav/rc.d b/testing/clamav/rc.d
deleted file mode 100644
index 127c86c0f..000000000
--- a/testing/clamav/rc.d
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[[ -f /etc/conf.d/clamav ]] && source /etc/conf.d/clamav
-
-PID_FC=$(pidof -o %PPID /usr/bin/freshclam)
-PID_CD=$(pidof -o %PPID /usr/sbin/clamd)
-
-case "$1" in
-	start)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Starting ClamD"
-			[[ -z $PID_CD ]] && /usr/sbin/clamd
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-		sleep 1
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Starting FreshClam"
-			[[ -z $PID_FC ]] && /usr/bin/freshclam -p /run/clamav/freshclam.pid -d $FRESHCLAM_OPTS
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					add_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	stop)
-		if [[ $START_CLAMD = yes ]]; then
-			stat_busy "Stopping ClamD"
-			[[ -n $PID_CD ]] && kill $PID_CD &> /dev/null
-				if [[ $? -gt 0 ]]; then
-					stat_fail
-				else
-					rm_daemon clamav
-					stat_done
-				fi
-		fi
-
-		if [[ $START_FRESHCLAM = yes ]]; then
-			stat_busy "Stopping FreshClam"
-			[[ -n $PID_FC ]] && kill $PID_FC &> /dev/null
-			if [[ $? -gt 0 ]]; then
-					stat_fail
-			else
-					rm_daemon clamav
-					stat_done
-			fi
-		fi
-	;;
-	restart)
-		$0 stop
-		sleep 2
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"	
-esac
-exit 0
diff --git a/testing/clamav/service b/testing/clamav/service
deleted file mode 100644
index 5bf9eb14e..000000000
--- a/testing/clamav/service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav daemon
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/clamd.pid
-ExecStart=/usr/sbin/clamd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/clamav/service.fresh b/testing/clamav/service.fresh
deleted file mode 100644
index a0a72c2e6..000000000
--- a/testing/clamav/service.fresh
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=clamav updater
-
-[Service]
-Type=forking
-PIDFile=/run/clamav/freshclam.pid
-ExecStart=/usr/bin/freshclam -d -p /run/clamav/freshclam.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/clamav/tmpfiles.d b/testing/clamav/tmpfiles.d
deleted file mode 100644
index 22d29941e..000000000
--- a/testing/clamav/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/clamav 0755 clamav clamav
diff --git a/testing/cloog/PKGBUILD b/testing/cloog/PKGBUILD
deleted file mode 100644
index 45b3180a6..000000000
--- a/testing/cloog/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 161918 2012-06-16 14:55:34Z heftig $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=cloog
-pkgver=0.17.0
-pkgrel=2
-pkgdesc="Library that generates loops for scanning polyhedra"
-arch=('i686' 'x86_64')
-url="http://www.bastoul.net/cloog/"
-license=('GPL')
-depends=('isl' 'gmp')
-conflicts=('cloog-ppl<0.15.10-2')
-options=('!libtool')
-source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
-md5sums=('0aa3302c81f65ca62c114e5264f8a802')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-isl=system --with-gmp=system
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/testing/clutter-gst/PKGBUILD b/testing/clutter-gst/PKGBUILD
deleted file mode 100644
index 3fe2197ba..000000000
--- a/testing/clutter-gst/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169268 2012-10-18 19:29:21Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=clutter-gst
-pkgver=1.9.92
-pkgrel=1
-pkgdesc="GStreamer bindings for clutter"
-arch=('i686' 'x86_64')
-url="http://www.clutter-project.org/"
-license=('LGPL')
-depends=('clutter' 'gst-plugins-base-libs' 'libxdamage')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5c09dce218f711a44bd4d741e2dd10ffc47e7fcd7b0cf514ca0e92b825c76c45')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/clutter-gtk/PKGBUILD b/testing/clutter-gtk/PKGBUILD
deleted file mode 100644
index d0d1059da..000000000
--- a/testing/clutter-gtk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169267 2012-10-18 19:29:18Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=clutter-gtk
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk3')
-makedepends=('gobject-introspection')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d51c4bb6a6ad0a337976766383f97a1c905a37bd77b3dbf484a7314130d97b6e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/clutter/PKGBUILD b/testing/clutter/PKGBUILD
deleted file mode 100644
index 8aa993d60..000000000
--- a/testing/clutter/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169269 2012-10-18 19:29:24Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=clutter
-pkgver=1.12.2
-pkgrel=1
-pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
-arch=('i686' 'x86_64')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi')
-makedepends=('gobject-introspection' 'mesa')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --enable-introspection
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/colord-gtk/PKGBUILD b/testing/colord-gtk/PKGBUILD
deleted file mode 100644
index b7d6d028c..000000000
--- a/testing/colord-gtk/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169266 2012-10-18 19:29:14Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=colord-gtk
-pkgver=0.1.23
-pkgrel=1
-pkgdesc="GTK integration for libcolord"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'gtk3' 'colord')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'gtk-doc')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha1sums=('71fd56b34ba91ddf76c1ac394c2a31fa5e24770c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/colord/PKGBUILD b/testing/colord/PKGBUILD
deleted file mode 100644
index b92249dca..000000000
--- a/testing/colord/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169265 2012-10-18 19:29:11Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=colord
-pkgver=0.1.23
-pkgrel=1
-pkgdesc="Color daemon"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/software/colord"
-license=('GPL2')
-depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite' 'udev')
-makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-sha1sums=('08019c86f89b1675e4e155772cc555ed748f319e')
-
-build() {
-  cd "$pkgname-$pkgver"
-  
-  # put udev files in /usr/lib
-  sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-  
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc --libexecdir=/usr/lib/colord \
-    --localstatedir=/var --disable-static \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install \
-    bashcompletiondir=/usr/share/bash-completion/completions
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch b/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch
deleted file mode 100644
index 087b87cdb..000000000
--- a/testing/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 6124a3842dfa8484b52e067a8ab8105c3875a4f7 Mon Sep 17 00:00:00 2001
-From: Jim Meyering <meyering@redhat.com>
-Date: Thu, 10 May 2012 19:43:00 +0200
-Subject: [PATCH] ls: color each symlink-to-relative-name in / properly
-
-In order for ls --color to color each symlink, it must form the name
-of each referent and then stat it to see if the link is dangling, to
-a directory, to a file, etc.  When the symlink is to a relative name,
-ls must concatenate the starting directory name and that relative name.
-When, in addition, the starting directory was "/" or "/some-name",
-the result was ill-formed, and the subsequent stat would usually fail,
-making the caller color it as a dangling symlink.
-* src/ls.c (make_link_name): Don't botch the case in which
-dir_name(NAME) == "/" and LINKNAME is relative.
-* tests/ls/root-rel-symlink-color: New file.  Test for the above.
-* tests/Makefile.am (TESTS): Add it.
-* NEWS (Bug fixes): Mention it.
-Reported by Mike Frysinger in http://bugs.gnu.org/11453
-Bug introduced by commit v8.16-23-gbcb9078.
----
- NEWS                            |  5 ++++
- src/ls.c                        |  9 +++++++-
- tests/Makefile.am               |  1 +
- tests/ls/root-rel-symlink-color | 51 +++++++++++++++++++++++++++++++++++++++++
- 4 files changed, 65 insertions(+), 1 deletion(-)
- create mode 100755 tests/ls/root-rel-symlink-color
-
-diff --git a/NEWS b/NEWS
-index 6c620b3..f9e9c70 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,11 @@ GNU coreutils NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Bug fixes
-+
-+  ls --color would mis-color relative-named symlinks in /
-+  [bug introduced in coreutils-8.17]
-+
- 
- * Noteworthy changes in release 8.17 (2012-05-10) [stable]
- 
-diff --git a/src/ls.c b/src/ls.c
-index 397e4ea..9494ae9 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -3213,7 +3213,14 @@ make_link_name (char const *name, char const *linkname)
-     return xstrdup (linkname);
- 
-   char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1);
--  stpcpy (stpncpy (p, name, prefix_len + 1), linkname);
-+
-+  /* PREFIX_LEN usually specifies a string not ending in slash.
-+     In that case, extend it by one, since the next byte *is* a slash.
-+     Otherwise, the prefix is "/", so leave the length unchanged.  */
-+  if ( ! ISSLASH (name[prefix_len - 1]))
-+    ++prefix_len;
-+
-+  stpcpy (stpncpy (p, name, prefix_len), linkname);
-   return p;
- }
- 
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index a4370a6..0bafc5f 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -449,6 +449,7 @@ TESTS =						\
-   ls/proc-selinux-segfault			\
-   ls/readdir-mountpoint-inode			\
-   ls/recursive					\
-+  ls/root-rel-symlink-color			\
-   ls/rt-1					\
-   ls/slink-acl					\
-   ls/stat-dtype					\
-diff --git a/tests/ls/root-rel-symlink-color b/tests/ls/root-rel-symlink-color
-new file mode 100755
-index 0000000..d795432
---- /dev/null
-+++ b/tests/ls/root-rel-symlink-color
-@@ -0,0 +1,51 @@
-+#!/bin/sh
-+# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/".
-+
-+# Copyright (C) 2012 Free Software Foundation, Inc.
-+
-+# 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 3 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, see <http://www.gnu.org/licenses/>.
-+
-+. "${srcdir=.}/init.sh"; path_prepend_ ../src
-+print_ver_ ls
-+
-+symlink_to_rel=
-+for i in /*; do
-+  # Skip non-symlinks:
-+  env test -h "$i" || continue
-+
-+  # Skip dangling symlinks:
-+  env test -e "$i" || continue
-+
-+  # Skip any symlink-to-absolute-name:
-+  case $(readlink "$i") in /*) continue ;; esac
-+
-+  symlink_to_rel=$i
-+  break
-+done
-+
-+test -z "$symlink_to_rel" \
-+  && skip_ no relative symlink in /
-+
-+e='\33'
-+color_code='01;36'
-+c_pre="$e[0m$e[${color_code}m"
-+c_post="$e[0m"
-+printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_
-+
-+env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \
-+  ls -d --color=always "$symlink_to_rel" > out || fail=1
-+
-+compare exp out || fail=1
-+
-+Exit $fail
--- 
-1.7.11.2
-
diff --git a/testing/coreutils/PKGBUILD b/testing/coreutils/PKGBUILD
deleted file mode 100644
index b8cd14275..000000000
--- a/testing/coreutils/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 169602 2012-10-24 07:58:11Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=coreutils
-pkgver=8.20
-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' 'pam' 'acl' 'gmp' 'libcap')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('3d69af8f561fce512538a9fe85f147ff'
-         '7e6076e4e0961d24c38cf8685efca35b')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib \
-              --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
-
-  # binaries required by FHS
-  _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false'
-        'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'sync'
-        'true' 'uname')
-  for i in ${_fhs[@]}; do
-    ln -s ../usr/bin/$i ${pkgdir}/bin/$i
-  done
-}
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.install b/testing/coreutils/coreutils.install
deleted file mode 100644
index 22cfcb2a1..000000000
--- a/testing/coreutils/coreutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-file=coreutils.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/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/cracklib/PKGBUILD b/testing/cracklib/PKGBUILD
deleted file mode 100644
index 101d7314f..000000000
--- a/testing/cracklib/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165548 2012-08-23 12:34:30Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
-
-pkgname=cracklib
-pkgver=2.8.19
-pkgrel=1
-pkgdesc="Password Checking Library"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://sourceforge.net/projects/cracklib"
-depends=('glibc' 'zlib')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('ca0ec168d9c6466612204e8dfb2df8a9')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --without-python
-  make 
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  install -Dm644 dicts/cracklib-small $pkgdir/usr/share/dict/cracklib-small
-  sh ./util/cracklib-format dicts/cracklib-small \
-    | sh ./util/cracklib-packer $pkgdir/usr/share/cracklib/pw_dict
-}
diff --git a/testing/crda/PKGBUILD b/testing/crda/PKGBUILD
deleted file mode 100644
index 5969eefa4..000000000
--- a/testing/crda/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 165554 2012-08-23 18:09:19Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=crda
-pkgver=1.1.2
-pkgrel=4
-pkgdesc="Central Regulatory Domain Agent for wireless networks"
-arch=(i686 x86_64)
-url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
-license=('custom')
-depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw')
-makedepends=('python-m2crypto')
-install=crda.install
-source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
-        set-wireless-regdom
-        libnl32.patch)
-md5sums=('5226f65aebacf94baaf820f8b4e06df4'
-         '65c93f2ff2eb1b29d9e9fa102ae2dd45'
-         'c1f7aff29f15a0364ae6f7905a1d4ae6')
-                  
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  patch -Np1 -i "$srcdir/libnl32.patch"
-  sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py
-  make crda regdbdump
-}
-
-package() {
-  # Install crda, regdbdump and udev rules
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ SBINDIR=/usr/bin/ install
-  # Adjust paths in udev rule file
-  sed 's|/sbin/crda|/usr/bin/crda|' -i "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
-  # This rule automatically sets the regulatory domain when cfg80211 is loaded
-  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
-
-  install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
-  
-  install -D -m755 "${srcdir}"/set-wireless-regdom "${pkgdir}"/usr/bin/set-wireless-regdom
-}
diff --git a/testing/crda/crda.install b/testing/crda/crda.install
deleted file mode 100644
index 9618a74ca..000000000
--- a/testing/crda/crda.install
+++ /dev/null
@@ -1,5 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-  echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom."
-  echo "It will automatically be set on boot."
-}
diff --git a/testing/crda/libnl32.patch b/testing/crda/libnl32.patch
deleted file mode 100644
index 682b6c5de..000000000
--- a/testing/crda/libnl32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r crda-1.1.2/Makefile crda-1.1.2-libnl32/Makefile
---- crda-1.1.2/Makefile	2011-08-10 01:36:19.000000000 +0200
-+++ crda-1.1.2-libnl32/Makefile	2012-02-09 18:53:33.376430180 +0100
-@@ -51,7 +51,7 @@
- 
- ifeq ($(NL3FOUND),Y)
- CFLAGS += -DCONFIG_LIBNL30
--NLLIBS += -lnl-genl
-+NLLIBS += $(shell pkg-config --libs libnl-genl-3.0)
- NLLIBNAME = libnl-3.0
- else
- 	ifeq ($(NL2FOUND),Y)
diff --git a/testing/crda/set-wireless-regdom b/testing/crda/set-wireless-regdom
deleted file mode 100755
index 3905ae98a..000000000
--- a/testing/crda/set-wireless-regdom
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-unset WIRELESS_REGDOM
-. /etc/conf.d/wireless-regdom
-[ -n "${WIRELESS_REGDOM}" ] && iw reg set ${WIRELESS_REGDOM}
diff --git a/testing/cronie/PKGBUILD b/testing/cronie/PKGBUILD
deleted file mode 100644
index 2dd18b16f..000000000
--- a/testing/cronie/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname='cronie'
-pkgver=1.4.8
-pkgrel=3
-pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
-url='https://fedorahosted.org/cronie/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-depends=('pam' 'bash' 'run-parts')
-optdepends=('pm-utils: defer anacron when on battery power'
-            'smtp-server: sending cron job output via email')
-
-source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'cron.deny'
-	'service'
-        'pam.d'
-        'rc.d')
-sha1sums=('1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3'
-          '0f279b8fb820340267d578dc85511c980715f91e'
-          '3038a05476829f72fc4918bee9176b273ce10340'
-          '5eff7fb31f6bc0a924243ff046704726cf20c221'
-          'c08c040ed5cb12bc4fd15639a5242d31ec247ef5')
-
-backup=('etc/anacrontab'
-        'etc/conf.d/crond'
-        'etc/pam.d/crond'
-        'etc/cron.deny')
-
-conflicts=('cron')
-provides=('cron')
-groups=('base')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-anacron \
-		--with-inotify \
-		--with-pam \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	chmod u+s "${pkgdir}"/usr/bin/crontab
-	install -d "${pkgdir}"/var/spool/{ana,}cron
-	install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly}
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/crond
-	install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond
-	install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service
-
-	install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond
-	install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab
-	install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly
-	install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron
-
-	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/cronie/COPYING
-
-	# Provide native service for arch-daemons generator
-	ln -s cronie.service "$pkgdir/usr/lib/systemd/system/crond.service"
-}
diff --git a/testing/cronie/cron.deny b/testing/cronie/cron.deny
deleted file mode 100644
index 06e685cc8..000000000
--- a/testing/cronie/cron.deny
+++ /dev/null
@@ -1 +0,0 @@
-# without this file, only users listed in /etc/cron.allow can use crontab
diff --git a/testing/cronie/pam.d b/testing/cronie/pam.d
deleted file mode 100644
index 9a254ebc0..000000000
--- a/testing/cronie/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-auth      required    pam_unix.so
-auth      required    pam_env.so
-
-account   required    pam_access.so
-account   required    pam_unix.so
-account   required    pam_time.so
-
-session    required   pam_loginuid.so
-session   required    pam_limits.so
-session   required    pam_unix.so
diff --git a/testing/cronie/rc.d b/testing/cronie/rc.d
deleted file mode 100755
index d0659685c..000000000
--- a/testing/cronie/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=crond
-. /etc/conf.d/crond
-PID=$(pidof -o %PPID /usr/sbin/crond)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -z "$PID" ]] && /usr/sbin/crond $CRONDARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	[[ -n "$PID" ]] && kill -HUP $PID &>/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/cronie/service b/testing/cronie/service
deleted file mode 100644
index 5ae193bfc..000000000
--- a/testing/cronie/service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Periodic Command Scheduler
-
-[Service]
-ExecStart=/usr/sbin/crond -n
-ExecReload=/bin/kill -HUP $MAINPID
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD
deleted file mode 100644
index b0e2a3f87..000000000
--- a/testing/cryptsetup/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169408 2012-10-20 16:46:59Z dreisner $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=cryptsetup
-pkgver=1.5.1
-pkgrel=1
-pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://code.google.com/p/cryptsetup/"
-groups=('base')
-depends=('device-mapper' 'libgcrypt' 'popt' 'util-linux')
-options=('!libtool' '!emptydirs')
-source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
-        http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
-        encrypt_hook
-        encrypt_install)
-md5sums=('87cc018c0c65f36043f38ceb8ffd4d81'
-         '5f711687f453f4d5a38596f60df5247a'
-         'c970831d733ca42e20415005967e7843'
-         '21c45f9cab3e0b5165f68358884fbd0f')
-
-build() {
-  cd "${srcdir}"/$pkgname-${pkgver}
-  ./configure --prefix=/usr --disable-static --enable-cryptsetup-reencrypt
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-${pkgver}
-  make DESTDIR="${pkgdir}" install
-  # install hook
-  install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/usr/lib/initcpio/hooks/encrypt
-  install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/usr/lib/initcpio/install/encrypt
-}
diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook
deleted file mode 100644
index 11db3443a..000000000
--- a/testing/cryptsetup/encrypt_hook
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    modprobe -a -q dm-crypt >/dev/null 2>&1
-    [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
-
-    # Get keyfile if specified
-    ckeyfile="/crypto_keyfile.bin"
-    if [ -n "$cryptkey" ]; then
-        IFS=: read ckdev ckarg1 ckarg2 <<EOF
-$cryptkey
-EOF
-
-        if [ "$ckdev" = "rootfs" ]; then
-            ckeyfile=$ckarg1
-        elif resolved=$(resolve_device "${ckdev}" ${rootdelay}); then
-            case ${ckarg1} in
-                *[!0-9]*)
-                    # Use a file on the device
-                    # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
-                    mkdir /ckey
-                    mount -r -t "$ckarg1" "$resolved" /ckey
-                    dd if="/ckey/$ckarg2" of="$ckeyfile" >/dev/null 2>&1
-                    umount /ckey
-                    ;;
-                *)
-                    # Read raw data from the block device
-                    # ckarg1 is numeric: ckarg1=offset, ckarg2=length
-                    dd if="$resolved" of="$ckeyfile" bs=1 skip="$ckarg1" count="$ckarg2" >/dev/null 2>&1
-                    ;;
-            esac
-        fi
-        [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase."
-    fi
-
-    if [ -n "${cryptdevice}" ]; then
-        DEPRECATED_CRYPT=0
-        IFS=: read cryptdev cryptname cryptoptions <<EOF
-$cryptdevice
-EOF
-    else
-        DEPRECATED_CRYPT=1
-        cryptdev="${root}"
-        cryptname="root"
-    fi
-
-    warn_deprecated() {
-        echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated"
-        echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead."
-    }
-
-    for cryptopt in ${cryptoptions//,/ }; do
-        case ${cryptopt} in
-            allow-discards)
-                cryptargs="${cryptargs} --allow-discards"
-                ;;
-            *)
-                echo "Encryption option '${cryptopt}' not known, ignoring." >&2
-                ;;
-        esac
-    done
-
-    if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
-        if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
-            [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
-            dopassphrase=1
-            # If keyfile exists, try to use that
-            if [ -f ${ckeyfile} ]; then
-                if eval cryptsetup --key-file ${ckeyfile} luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; then
-                    dopassphrase=0
-                else
-                    echo "Invalid keyfile. Reverting to passphrase."
-                fi
-            fi
-            # Ask for a passphrase
-            if [ ${dopassphrase} -gt 0 ]; then
-                echo ""
-                echo "A password is required to access the ${cryptname} volume:"
-
-                #loop until we get a real password
-                while ! eval cryptsetup luksOpen ${resolved} ${cryptname} ${cryptargs} ${CSQUIET}; do
-                    sleep 2;
-                done
-            fi
-            if [ -e "/dev/mapper/${cryptname}" ]; then
-                if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
-                    export root="/dev/mapper/root"
-                fi
-            else
-                err "Password succeeded, but ${cryptname} creation failed, aborting..."
-                exit 1
-            fi
-        elif [ -n "${crypto}" ]; then
-            [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
-            msg "Non-LUKS encrypted device found..."
-            if echo "$crypto" | awk -F: '{ exit(NF == 5) }'; then
-                err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip"
-                err "Non-LUKS decryption not attempted..."
-                return 1
-            fi
-            exe="cryptsetup create $cryptname $resolved $cryptargs"
-            IFS=: read c_hash c_cipher c_keysize c_offset c_skip <<EOF
-$crypto
-EOF
-            [ -n "$c_hash" ]    && exe="$exe --hash '$c_hash'"
-            [ -n "$c_cipher" ]  && exe="$exe --cipher '$c_cipher'"
-            [ -n "$c_keysize" ] && exe="$exe --key-size '$c_keysize'"
-            [ -n "$c_offset" ]  && exe="$exe --offset '$c_offset'"
-            [ -n "$c_skip" ]    && exe="$exe --skip '$c_skip'"
-            if [ -f "$ckeyfile" ]; then
-                exe="$exe --key-file $ckeyfile"
-            else
-                exe="$exe --verify-passphrase"
-                echo ""
-                echo "A password is required to access the ${cryptname} volume:"
-            fi
-            eval "$exe $CSQUIET"
-
-            if [ $? -ne 0 ]; then
-                err "Non-LUKS device decryption failed. verify format: "
-                err "      crypto=hash:cipher:keysize:offset:skip"
-                exit 1
-            fi
-            if [ -e "/dev/mapper/${cryptname}" ]; then
-                if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
-                    export root="/dev/mapper/root"
-                fi
-            else
-                err "Password succeeded, but ${cryptname} creation failed, aborting..."
-                exit 1
-            fi
-        else
-            err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified."
-        fi
-    fi
-    rm -f ${ckeyfile}
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install
deleted file mode 100644
index 38e5ddc57..000000000
--- a/testing/cryptsetup/encrypt_install
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-build() {
-    local mod
-
-    add_module dm-crypt
-    if [[ $CRYPTO_MODULES ]]; then
-        for mod in $CRYPTO_MODULES; do
-            add_module "$mod"
-        done
-    else
-        add_all_modules '/crypto/'
-    fi
-
-    add_binary "cryptsetup"
-    add_binary "dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook allows for an encrypted root device. Users should specify the device
-to be unlocked using 'cryptdevice=device:dmname' on the kernel command line,
-where 'device' is the path to the raw device, and 'dmname' is the name given to
-the device after unlocking, and will be available as /dev/mapper/dmname.
-
-For unlocking via keyfile, 'cryptkey=device:fstype:path' should be specified on
-the kernel cmdline, where 'device' represents the raw block device where the key
-exists, 'fstype' is the filesystem type of 'device' (or auto), and 'path' is
-the absolute path of the keyfile within the device.
-
-Without specifying a keyfile, you will be prompted for the password at runtime.
-This means you must have a keyboard available to input it, and you may need
-the keymap hook as well to ensure that the keyboard is using the layout you
-expect.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/cups/PKGBUILD b/testing/cups/PKGBUILD
deleted file mode 100644
index 12273883e..000000000
--- a/testing/cups/PKGBUILD
+++ /dev/null
@@ -1,174 +0,0 @@
-# $Id: PKGBUILD 165915 2012-09-03 20:05:26Z heftig $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.6.1
-pkgrel=6
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
-             'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme' 'systemd')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-        cups-no-export-ssllibs.patch
-        cups-no-gcrypt.patch
-        cups-no-gzip-man.patch
-        cups-systemd-socket.patch
-        cups cups.logrotate cups.pam
-        cupsd-conf-remove-obsolete-browse-directives.patch
-        avahi-missing-in-conditionals.patch
-        recognize-remote-cups-queue-via-dnssd-uri.patch
-        usb-backend-reset-after-job-only-for-specific-devices.patch)
-#options=('!emptydirs')
-md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
-         '9b8467a1e51d360096b70e2c3c081e6c'
-         '3733c23e77eb503bd94cc368e02830dc'
-         '90c30380d4c8cd48a908cfdadae1ea24'
-         'b4868b83f7f2d6ec24a1be76509379f0'
-         '9657daa21760bb0b5fa3d8b51d5e01a1'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17'
-         '6bef262b5081051e88cd2ae94fed1867'
-         '9c91b1319f4b20dc323986cb4abbe806'
-         'dcef8dd5614461166cada8a706eebb49'
-         '0779ef8ba1d724ebb3b9bf360deba52b')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  # add systemd socket support - Fedora patch, also used in Gentoo
-  # modified now to the changes done by Gentoo in their svn ebuild
-  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/cups/files/cups-1.5.0-systemd-socket.patch?revision=1.1
-  patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
-  
-  # Do not export SSL libs in cups-config
-  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
-  patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
-  # don't zip man pages in make install, let makepkg do that / Fedora
-  patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
-
-  # upstream bugtracker patches
-  # http://www.cups.org/str.php?L4157 - fix broken default server config
-  patch -Np1 -i ${srcdir}/cupsd-conf-remove-obsolete-browse-directives.patch
-  # http://www.cups.org/str.php?L4156 - In many DNS-SD/Bonjour conditionals Avahi is not considered
-  patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
-  # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to CUPS server are not considered remote printers with driver on server
-  patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
-  # http://cups.org/str.php?L4155 / https://bugs.archlinux.org/task/30965
-  patch -Np0 -i ${srcdir}/usb-backend-reset-after-job-only-for-specific-devices.patch
-  
-  # Rebuild configure script for not zipping man-pages.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --libdir=/usr/lib \
-     --with-systemdsystemunitdir=/usr/lib/systemd/system \
-     --with-logdir=/var/log/cups \
-     --with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon \
-     --with-cups-group=lp \
-     --enable-pam=yes \
-     --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-gnutls \
-     --enable-threads \
-     --enable-avahi\
-     --with-php=/usr/bin/php-cgi \
-     --with-optim="$CFLAGS"
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  #httpAddrGetList(workstation64): FAIL
-  #1 TESTS FAILED!
-  #make[1]: *** [testhttp] Error 1
-  make -k check || /bin/true
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
-backup=(etc/cups/client.conf)
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin 
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-  
-  # install client.conf man page and config file
-  install -dm755 ${pkgdir}/usr/share/man/man5
-  #install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
-  install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
-  install -dm755 ${pkgdir}/etc/cups
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
-  chgrp lp ${pkgdir}/etc/cups/client.conf
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - daemon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
-        etc/cups/snmp.conf
-        etc/cups/printers.conf
-        etc/cups/classes.conf
-        etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
-        etc/logrotate.d/cups
-        etc/pam.d/cups
-        etc/xinetd.d/cups-lpd)
-depends=('acl' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'colord' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
-optdepends=('xdg-utils: xdg .desktop file support')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec
-
-  # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
-
-  # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
-  # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
-
-  # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  # remove directory from package, we create it in cups rc.d file
-  rm -rf ${pkgdir}/var/run
-
-  # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf}
-  
-  # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-  
-  # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-  
-  # remove client.conf man page
-  rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
-  
-  # remove files now part of cups-filters
-  rm -v ${pkgdir}/usr/share/cups/banners/*
-  rm -v ${pkgdir}/usr/share/cups/data/testprint
-  # comment out all conversion rules which use any of the removed filters
-  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
-
-  # Provide native service for arch-daemons generator
-  ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service"
-}
diff --git a/testing/cups/PKGBUILD.16 b/testing/cups/PKGBUILD.16
deleted file mode 100644
index 01faba047..000000000
--- a/testing/cups/PKGBUILD.16
+++ /dev/null
@@ -1,146 +0,0 @@
-# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.6b1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord'
-             'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-        cups-no-export-ssllibs.patch
-        cups-no-gcrypt.patch
-        cups-no-gzip-man.patch
-        cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('468a40755a872d84be89111ce97a69d1'
-         '9b8467a1e51d360096b70e2c3c081e6c'
-         '3733c23e77eb503bd94cc368e02830dc'
-         '90c30380d4c8cd48a908cfdadae1ea24'
-         '9657daa21760bb0b5fa3d8b51d5e01a1'
-         'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-
-  # Do not export SSL libs in cups-config
-  patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
-  patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
-  # don't zip man pages in make install, let makepkg do that / Fedora
-  patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
-  
-  # Rebuild configure script for not zipping man-pages.
-  aclocal -I config-scripts
-  autoconf -I config-scripts
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-     --libdir=/usr/lib \
-     --with-logdir=/var/log/cups \
-     --with-docdir=/usr/share/cups/doc \
-     --with-cups-user=daemon \
-     --with-cups-group=lp \
-     --enable-pam=yes \
-     --enable-raw-printing \
-     --enable-dbus --with-dbusdir=/etc/dbus-1 \
-     --enable-ssl=yes --enable-gnutls \
-     --enable-threads \
-     --enable-avahi\
-     --with-php=/usr/bin/php-cgi \
-     --with-optim="$CFLAGS"
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  #httpAddrGetList(workstation64): FAIL
-  #1 TESTS FAILED!
-  #make[1]: *** [testhttp] Error 1
-  make -k check || /bin/true
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=4.0.0' 'libpng>=1.5.7' 'krb5' 'avahi')
-backup=(etc/cups/client.conf)
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-headers install-libs
-  # put this into the libs pkg to make other software find the libs(no pkg-config file included)
-  mkdir -p ${pkgdir}/usr/bin 
-  install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-  
-  # install client.conf man page and config file
-  install -dm755 ${pkgdir}/usr/share/man/man5
-  #install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5.gz ${pkgdir}/usr/share/man/man5/
-  install -Dm644  ${srcdir}/${pkgbase}-${pkgver}/man/client.conf.5 ${pkgdir}/usr/share/man/man5/
-  install -dm755 ${pkgdir}/etc/cups
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
-  chgrp lp ${pkgdir}/etc/cups/client.conf
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - daemon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
-        etc/cups/snmp.conf
-        etc/cups/printers.conf
-        etc/cups/classes.conf
-        etc/cups/subscriptions.conf
-        etc/dbus-1/system.d/cups.conf
-        etc/logrotate.d/cups
-        etc/pam.d/cups
-        etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('xdg-utils: xdg .desktop file support')
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make BUILDROOT=${pkgdir} install-data install-exec
-
-  # this one we ship in the libcups pkg
-  rm -f ${pkgdir}/usr/bin/cups-config
-
-  # kill the sysv stuff
-  rm -rf ${pkgdir}/etc/rc*.d
-  rm -rf ${pkgdir}/etc/init.d
-  install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
-  install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
-  install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-  
-  # fix perms on /var/spool and /etc
-  chmod 755 ${pkgdir}/var/spool
-  chmod 755 ${pkgdir}/etc
-
-  # install ssl directory where to store the certs, solves some samba issues
-  install -dm700 -g lp ${pkgdir}/etc/cups/ssl
-  # remove directory from package, we create it in cups rc.d file
-  rm -rf ${pkgdir}/var/run
-
-  # install some more configuration files that will get filled by cupsd
-  touch ${pkgdir}/etc/cups/printers.conf
-  touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf}
-  
-  # fix .desktop file
-  sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-  
-  # compress some driver files, adopted from Fedora
-  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-  
-  # remove client.conf man page
-  rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
-  
-  # remove files now part of cups-filters
-  rm -v ${pkgdir}/usr/lib/cups/filter/bannertops
-  rm -v ${pkgdir}/usr/share/cups/banners/*
-  rm -v ${pkgdir}/usr/share/cups/data/testprint
-  # comment out all conversion rules which use any of the removed filters
-  perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
-}
diff --git a/testing/cups/avahi-missing-in-conditionals.patch b/testing/cups/avahi-missing-in-conditionals.patch
deleted file mode 100644
index b261f58ae..000000000
--- a/testing/cups/avahi-missing-in-conditionals.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -uraN cups/scheduler/client.c cups-new/scheduler/client.c
---- cups/scheduler/client.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/client.c	2012-08-04 20:13:17.082220961 +0200
-@@ -4021,7 +4021,7 @@
- 	    !strncmp(host, "[::1]:", 6));
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4040,7 +4040,7 @@
- 	      !_cups_strcasecmp(end, ".local.") ||
- 	      !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-  /*
-   * Check if the hostname is an IP address...
-@@ -4101,7 +4101,7 @@
-     }
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
-        a;
-        a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
-@@ -4126,7 +4126,7 @@
-         return (1);
-     }
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-  /*
-   * Check for interface hostname matches...
-diff -uraN cups/scheduler/conf.c cups-new/scheduler/conf.c
---- cups/scheduler/conf.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/conf.c	2012-08-04 20:15:49.830978405 +0200
-@@ -89,9 +89,9 @@
- {
-   { "AccessLog",		&AccessLog,		CUPSD_VARTYPE_STRING },
-   { "AutoPurgeJobs", 		&JobAutoPurge,		CUPSD_VARTYPE_BOOLEAN },
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   { "BrowseDNSSDSubTypes",	&DNSSDSubTypes,		CUPSD_VARTYPE_STRING },
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-   { "BrowseWebIF",		&BrowseWebIF,		CUPSD_VARTYPE_BOOLEAN },
-   { "Browsing",			&Browsing,		CUPSD_VARTYPE_BOOLEAN },
-   { "CacheDir",			&CacheDir,		CUPSD_VARTYPE_STRING },
-@@ -735,9 +735,9 @@
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDSubTypes, "_cups,_print");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
-   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
-diff -uraN cups/scheduler/ipp.c cups-new/scheduler/ipp.c
---- cups/scheduler/ipp.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/ipp.c	2012-08-04 20:13:17.086220978 +0200
-@@ -4813,7 +4813,7 @@
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -4823,7 +4823,7 @@
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -uraN cups/scheduler/main.c cups-new/scheduler/main.c
---- cups/scheduler/main.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/main.c	2012-08-04 20:13:17.090221001 +0200
-@@ -781,9 +781,9 @@
-       * Got an error from select!
-       */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       cupsd_printer_t	*p;		/* Current printer */
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
- 
-       if (errno == EINTR)		/* Just interrupted by a signal */
-@@ -824,13 +824,13 @@
- 			job->print_pipes[0], job->print_pipes[1],
- 			job->back_pipes[0], job->back_pipes[1]);
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
- 	   p;
- 	   p = (cupsd_printer_t *)cupsArrayNext(Printers))
-         cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
- 	                p->reg_name ? p->reg_name : "(null)");
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-       break;
-     }
diff --git a/testing/cups/cups b/testing/cups/cups
deleted file mode 100755
index 744c8e663..000000000
--- a/testing/cups/cups
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=cupsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-        pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
-      # RUN
-      $daemon_name
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > /var/run/$daemon_name.pid
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f /var/run/$daemon_name.pid &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/cups/cups-avahi-1-config.patch b/testing/cups/cups-avahi-1-config.patch
deleted file mode 100644
index 304cd2607..000000000
--- a/testing/cups/cups-avahi-1-config.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in
---- cups-1.5.2/config.h.in.avahi-1-config	2011-06-16 21:12:16.000000000 +0100
-+++ cups-1.5.2/config.h.in	2012-03-14 15:04:51.365347165 +0000
-@@ -390,6 +390,13 @@
- 
- 
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
-  * Do we have <sys/ioctl.h>?
-  */
- 
-diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4
---- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config	2011-05-12 06:21:56.000000000 +0100
-+++ cups-1.5.2/config-scripts/cups-dnssd.m4	2012-03-14 15:04:51.365347165 +0000
-@@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
- DNSSDLIBS=""
- DNSSD_BACKEND=""
- 
-+AC_ARG_ENABLE(avahi, [  --enable-avahi          turn on DNS Service Discovery support, default=no],
-+	      [if test x$enable_avahi = xyes; then
-+		       AC_MSG_CHECKING(for Avahi)
-+		       if $PKGCONFIG --exists avahi-client; then
-+			       AC_MSG_RESULT(yes)
-+			       CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+			       DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+			       DNSSD_BACKEND="dnssd"
-+			       AC_DEFINE(HAVE_AVAHI)
-+			       enable_dnssd=no
-+		       else
-+			       AC_MSG_RESULT(no)
-+		       fi
-+	       fi])
-+
- if test x$enable_dnssd != xno; then
- 	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
\ No newline at end of file
diff --git a/testing/cups/cups-avahi-2-backend.patch b/testing/cups/cups-avahi-2-backend.patch
deleted file mode 100644
index 00e12a0a3..000000000
--- a/testing/cups/cups-avahi-2-backend.patch
+++ /dev/null
@@ -1,1118 +0,0 @@
-diff -up cups-1.5.3/backend/dnssd.c.avahi-2-backend cups-1.5.3/backend/dnssd.c
---- cups-1.5.3/backend/dnssd.c.avahi-2-backend	2012-05-15 16:53:18.164774446 +0200
-+++ cups-1.5.3/backend/dnssd.c	2012-05-15 17:09:07.684155704 +0200
-@@ -15,14 +15,21 @@
-  *
-  * Contents:
-  *
-+ *   next_txt_record()       - Get next TXT record from a cups_txt_records_t.
-+ *   parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
-  *   main()                  - Browse for printers.
-  *   browse_callback()       - Browse devices.
-  *   browse_local_callback() - Browse local devices.
-  *   compare_devices()       - Compare two devices.
-  *   exec_backend()          - Execute the backend that corresponds to the
-  *                             resolved service name.
-+ *   device_type()           - Get DNS-SD type enumeration from string.
-  *   get_device()            - Create or update a device.
-  *   query_callback()        - Process query data.
-+ *   avahi_client_callback() - Avahi client callback function.
-+ *   avahi_query_callback()  - Avahi query callback function.
-+ *   avahi_browse_callback() - Avahi browse callback function.
-+ *   find_device()           - Find a device from its name and domain.
-  *   sigterm_handler()       - Handle termination signals...
-  *   unquote()               - Unquote a name string.
-  */
-@@ -33,7 +40,18 @@
- 
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+#  include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#  include <avahi-common/domain.h>
-+#  include <avahi-common/error.h>
-+#  include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -53,7 +71,12 @@ typedef enum
- 
- typedef struct
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceRef	ref;			/* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		resolved;		/* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
-   char		*name,			/* Service name */
- 		*domain,		/* Domain name */
- 		*fullName,		/* Full name */
-@@ -65,6 +88,20 @@ typedef struct
- 		sent;			/* Did we list the device? */
- } cups_device_t;
- 
-+typedef struct
-+{
-+  char key[256];
-+  char value[256];
-+
-+#ifdef HAVE_DNSSD
-+  const uint8_t *data;
-+  const uint8_t *datanext;
-+  const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+  AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
- 
- /*
-  * Local globals...
-@@ -78,6 +115,7 @@ static int		job_canceled = 0;
-  * Local functions...
-  */
- 
-+#ifdef HAVE_DNSSD
- static void		browse_callback(DNSServiceRef sdRef,
- 			                DNSServiceFlags flags,
- 				        uint32_t interfaceIndex,
-@@ -95,13 +133,6 @@ static void		browse_local_callback(DNSSe
- 					      const char *replyDomain,
- 					      void *context)
- 					      __attribute__((nonnull(1,5,6,7,8)));
--static int		compare_devices(cups_device_t *a, cups_device_t *b);
--static void		exec_backend(char **argv);
--static cups_device_t	*get_device(cups_array_t *devices,
--			            const char *serviceName,
--			            const char *regtype,
--				    const char *replyDomain)
--				    __attribute__((nonnull(1,2,3,4)));
- static void		query_callback(DNSServiceRef sdRef,
- 			               DNSServiceFlags flags,
- 				       uint32_t interfaceIndex,
-@@ -111,10 +142,119 @@ static void		query_callback(DNSServiceRe
- 				       const void *rdata, uint32_t ttl,
- 				       void *context)
- 				       __attribute__((nonnull(1,5,9,11)));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void		avahi_client_callback (AvahiClient *client,
-+					       AvahiClientState state,
-+					       void *context);
-+static void		avahi_browse_callback (AvahiServiceBrowser *browser,
-+					       AvahiIfIndex interface,
-+					       AvahiProtocol protocol,
-+					       AvahiBrowserEvent event,
-+					       const char *serviceName,
-+					       const char *regtype,
-+					       const char *replyDomain,
-+					       AvahiLookupResultFlags flags,
-+					       void *context);
-+#endif /* HAVE_AVAHI */
-+static cups_device_t *	find_device (cups_array_t *devices,
-+				     cups_txt_records_t *txt,
-+				     cups_device_t *dkey);
-+static int		compare_devices(cups_device_t *a, cups_device_t *b);
-+static void		exec_backend(char **argv);
-+static cups_device_t	*get_device(cups_array_t *devices,
-+			            const char *serviceName,
-+			            const char *regtype,
-+				    const char *replyDomain)
-+				    __attribute__((nonnull(1,2,3,4)));
- static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize)
- 			    __attribute__((nonnull(1,2)));
- 
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
-+ */
-+
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+  txt->txt = avahi_string_list_get_next (txt->txt);
-+  if (txt->txt == NULL)
-+    return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+  return txt;
-+}
-+
-+
-+/*
-+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
-+ */
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+  uint8_t	datalen;
-+  uint8_t	*data = txt->data;
-+  char		*ptr;
-+
-+ /*
-+  * Read a key/value pair starting with an 8-bit length.  Since the
-+  * length is 8 bits and the size of the key/value buffers is 256, we
-+  * don't need to check for overflow...
-+  */
-+
-+  datalen = *data++;
-+  if (!datalen || (data + datalen) > txt->dataend)
-+    return NULL;
-+  txt->datanext = data + datalen;
-+
-+  for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+    *ptr++ = *data;
-+  *ptr = '\0';
-+
-+  if (data < txt->datanext && *data == '=')
-+  {
-+    data++;
-+
-+    if (data < datanext)
-+      memcpy (txt->value, data, txt->datanext - data);
-+    value[txt->datanext - data] = '\0';
-+  }
-+  else
-+    return 1;
-+#else /* HAVE_AVAHI */
-+  char *key, *value;
-+  size_t len;
-+  avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+  if (len > sizeof (txt->value) - 1)
-+    len = sizeof (txt->value) - 1;
-+
-+  memcpy (txt->value, value, len);
-+  txt->value[len] = '\0';
-+  len = strlen (key);
-+  if (len > sizeof (txt->key) - 1)
-+    len = sizeof (txt->key) - 1;
-+
-+  memcpy (txt->key, key, len);
-+  txt->key[len] = '\0';
-+  avahi_free (key);
-+  avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+  return 0;
-+}
-+
- 
- /*
-  * 'main()' - Browse for printers.
-@@ -125,6 +265,13 @@ main(int  argc,				/* I - Number of comm
-      char *argv[])			/* I - Command-line arguments */
- {
-   const char	*name;			/* Backend name */
-+  cups_array_t	*devices;		/* Device array */
-+  cups_device_t	*device;		/* Current device */
-+  char		uriName[1024];		/* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+  int		fd;			/* Main file descriptor */
-+  fd_set	input;			/* Input set for select() */
-+  struct timeval timeout;		/* Timeout for select() */
-   DNSServiceRef	main_ref,		/* Main service reference */
- 		fax_ipp_ref,		/* IPP fax service reference */
- 		ipp_ref,		/* IPP service reference */
-@@ -138,12 +285,11 @@ main(int  argc,				/* I - Number of comm
- 		pdl_datastream_ref,	/* AppSocket service reference */
- 		printer_ref,		/* LPD service reference */
- 		riousbprint_ref;	/* Remote IO service reference */
--  int		fd;			/* Main file descriptor */
--  fd_set	input;			/* Input set for select() */
--  struct timeval timeout;		/* Timeout for select() */
--  cups_array_t	*devices;		/* Device array */
--  cups_device_t	*device;		/* Current device */
--  char		uriName[1024];		/* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiClient	*client;
-+  int		error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-   struct sigaction action;		/* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -203,6 +349,49 @@ main(int  argc,				/* I - Number of comm
-   * Browse for different kinds of printers...
-   */
- 
-+#ifdef HAVE_AVAHI
-+  if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+  {
-+    perror ("ERROR: Unable to create avahi simple poll object");
-+    return (1);
-+  }
-+
-+  client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+			     0, avahi_client_callback, NULL, &error);
-+  if (!client)
-+  {
-+    perror ("DEBUG: Unable to create avahi client");
-+    return (0);
-+  }
-+
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_fax-ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_ipp-tls._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_pdl-datastream._tcp",
-+			     NULL, 0,
-+			     avahi_browse_callback,
-+			     devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_printer._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+  avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+			     AVAHI_PROTO_UNSPEC,
-+			     "_riousbprint._tcp", NULL, 0,
-+			     avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
-   if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
-   {
-     perror("ERROR: Unable to create service connection");
-@@ -263,6 +452,7 @@ main(int  argc,				/* I - Number of comm
-   riousbprint_ref = main_ref;
-   DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
-                    "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * Loop until we are killed...
-@@ -270,6 +460,9 @@ main(int  argc,				/* I - Number of comm
- 
-   while (!job_canceled)
-   {
-+    int announce = 0;
-+
-+#ifdef HAVE_DNSSD
-     FD_ZERO(&input);
-     FD_SET(fd, &input);
- 
-@@ -289,11 +482,35 @@ main(int  argc,				/* I - Number of comm
-     }
-     else
-     {
-+      announce = 1;
-+    }
-+#else /* HAVE_AVAHI */
-+    int r;
-+    avahi_got_callback = 0;
-+    r = avahi_simple_poll_iterate (simple_poll, 1);
-+    if (r != 0 && r != EINTR)
-+    {
-+     /*
-+      * We've been told to exit the loop.  Perhaps the connection to
-+      * avahi failed.
-+      */
-+
-+      break;
-+    }
-+
-+    if (avahi_got_callback)
-+      announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+    if (announce)
-+    {
-      /*
-       * Announce any devices we've found...
-       */
- 
-+#ifdef HAVE_DNSSD
-       DNSServiceErrorType status;	/* DNS query status */
-+#endif /* HAVE_DNSSD */
-       cups_device_t *best;		/* Best matching device */
-       char	device_uri[1024];	/* Device URI */
-       int	count;			/* Number of queries */
-@@ -307,6 +524,7 @@ main(int  argc,				/* I - Number of comm
-         if (device->sent)
- 	  sent ++;
- 
-+#ifdef HAVE_DNSSD
-         if (device->ref)
- 	  count ++;
- 
-@@ -338,14 +556,23 @@ main(int  argc,				/* I - Number of comm
- 	      count ++;
-           }
- 	}
--	else if (!device->sent)
-+	else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+	if (!device->resolved)
-+	  continue;
-+        else
-+#endif /* HAVE_AVAHI */
-+	if (!device->sent)
- 	{
-+#ifdef HAVE_DNSSD
- 	 /*
- 	  * Got the TXT records, now report the device...
- 	  */
- 
- 	  DNSServiceRefDeallocate(device->ref);
- 	  device->ref = 0;
-+#endif /* HAVE_DNSSD */
- 
-           if (!best)
- 	    best = device;
-@@ -406,6 +633,7 @@ main(int  argc,				/* I - Number of comm
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'browse_callback()' - Browse devices.
-  */
-@@ -494,6 +722,7 @@ browse_local_callback(
- 	  device->fullName);
-   device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
- 
- 
- /*
-@@ -574,6 +803,41 @@ exec_backend(char **argv)		/* I - Comman
- 
- 
- /*
-+ * 'device_type()' - Get DNS-SD type enumeration from string.
-+ */
-+
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+  if (!strcmp(regtype, "_ipp._tcp"))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp"))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp"))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+  if (!strcmp(regtype, "_ipp._tcp."))
-+    return (CUPS_DEVICE_IPP);
-+  else if (!strcmp(regtype, "_ipps._tcp.") ||
-+	   !strcmp(regtype, "_ipp-tls._tcp."))
-+    return (CUPS_DEVICE_IPPS);
-+  else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+    return (CUPS_DEVICE_FAX_IPP);
-+  else if (!strcmp(regtype, "_printer._tcp."))
-+    return (CUPS_DEVICE_PRINTER);
-+  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+    return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+  return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
-+
-+/*
-  * 'get_device()' - Create or update a device.
-  */
- 
-@@ -594,20 +858,7 @@ get_device(cups_array_t *devices,	/* I -
-   */
- 
-   key.name = (char *)serviceName;
--
--  if (!strcmp(regtype, "_ipp._tcp."))
--    key.type = CUPS_DEVICE_IPP;
--  else if (!strcmp(regtype, "_ipps._tcp.") ||
--	   !strcmp(regtype, "_ipp-tls._tcp."))
--    key.type = CUPS_DEVICE_IPPS;
--  else if (!strcmp(regtype, "_fax-ipp._tcp."))
--    key.type = CUPS_DEVICE_FAX_IPP;
--  else if (!strcmp(regtype, "_printer._tcp."))
--    key.type = CUPS_DEVICE_PRINTER;
--  else if (!strcmp(regtype, "_pdl-datastream._tcp."))
--    key.type = CUPS_DEVICE_PDL_DATASTREAM;
--  else
--    key.type = CUPS_DEVICE_RIOUSBPRINT;
-+  key.type = device_type (regtype);
- 
-   for (device = cupsArrayFind(devices, &key);
-        device;
-@@ -627,8 +878,14 @@ get_device(cups_array_t *devices,	/* I -
-         free(device->domain);
- 	device->domain = strdup(replyDomain);
- 
-+#ifdef HAVE_DNSSD
- 	DNSServiceConstructFullName(fullName, device->name, regtype,
- 	                            replyDomain);
-+#else /* HAVE_AVAHI */
-+	avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+				 serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- 	free(device->fullName);
- 	device->fullName = strdup(fullName);
-       }
-@@ -648,6 +905,9 @@ get_device(cups_array_t *devices,	/* I -
-   device->domain   = strdup(replyDomain);
-   device->type     = key.type;
-   device->priority = 50;
-+#ifdef HAVE_AVAHI
-+  device->resolved = 0;
-+#endif /* HAVE_AVAHI */
- 
-   cupsArrayAdd(devices, device);
- 
-@@ -655,13 +915,20 @@ get_device(cups_array_t *devices,	/* I -
-   * Set the "full name" of this service, which is used for queries...
-   */
- 
-+#ifdef HAVE_DNSSD
-   DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+  avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+			   serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
-   device->fullName = strdup(fullName);
- 
-   return (device);
- }
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'query_callback()' - Process query data.
-  */
-@@ -685,7 +952,7 @@ query_callback(
- 		*ptr;			/* Pointer into string */
-   cups_device_t	dkey,			/* Search key */
- 		*device;		/* Device */
--
-+  cups_txt_records_t txt;
- 
-   fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
-                   "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -719,94 +986,233 @@ query_callback(
-   if ((ptr = strstr(name, "._")) != NULL)
-     *ptr = '\0';
- 
--  if (strstr(fullName, "_ipp._tcp."))
--    dkey.type = CUPS_DEVICE_IPP;
--  else if (strstr(fullName, "_ipps._tcp.") ||
--           strstr(fullName, "_ipp-tls._tcp."))
--    dkey.type = CUPS_DEVICE_IPPS;
--  else if (strstr(fullName, "_fax-ipp._tcp."))
--    dkey.type = CUPS_DEVICE_FAX_IPP;
--  else if (strstr(fullName, "_printer._tcp."))
--    dkey.type = CUPS_DEVICE_PRINTER;
--  else if (strstr(fullName, "_pdl-datastream._tcp."))
--    dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+  dkey.type = device_type (fullName);
-+
-+  txt.data = rdata;
-+  txt.dataend = rdata + rdlen;
-+  device = find_device ((cups_array_t *) context, &txt, &dkey);
-+  if (!device)
-+    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_client_callback()' - Avahi client callback function.
-+ */
-+
-+static void
-+avahi_client_callback(AvahiClient *client,
-+		      AvahiClientState state,
-+		      void *context)
-+{
-+ /*
-+  * If the connection drops, quit.
-+  */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+  {
-+    fprintf (stderr, "ERROR: Avahi connection failed\n");
-+    avahi_simple_poll_quit (simple_poll);
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_query_callback()' - Avahi query callback function.
-+ */
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+		     AvahiIfIndex interface,
-+		     AvahiProtocol protocol,
-+		     AvahiResolverEvent event,
-+		     const char *name,
-+		     const char *type,
-+		     const char *domain,
-+		     const char *host_name,
-+		     const AvahiAddress *address,
-+		     uint16_t port,
-+		     AvahiStringList *txt,
-+		     AvahiLookupResultFlags flags,
-+		     void *context)
-+{
-+  AvahiClient		*client;
-+  cups_device_t		key,
-+			*device;
-+  char			uqname[1024],
-+			*ptr;
-+  cups_txt_records_t	txtr;
-+
-+  client = avahi_service_resolver_get_client (resolver);
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    if (event == AVAHI_RESOLVER_FAILURE)
-+    {
-+      fprintf (stderr, "ERROR: %s\n",
-+	       avahi_strerror (avahi_client_errno (client)));
-+    }
-+
-+    avahi_service_resolver_free (resolver);
-+    return;
-+  }
-+
-+ /*
-+  * Set search key for device.
-+  */
-+
-+  key.name = uqname;
-+  unquote (uqname, name, sizeof (uqname));
-+  if ((ptr = strstr(name, "._")) != NULL)
-+    *ptr = '\0';
-+
-+  key.domain = (char *) domain;
-+  key.type = device_type (type);
-+
-+ /*
-+  * Find the device and the the TXT information.
-+  */
-+
-+  txtr.txt = txt;
-+  device = find_device ((cups_array_t *) context, &txtr, &key);
-+  if (device)
-+  {
-+   /*
-+    * Let the main loop know to announce the device.
-+    */
-+
-+    device->resolved = 1;
-+    avahi_got_callback = 1;
-+  }
-   else
--    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
- 
--  for (device = cupsArrayFind(devices, &dkey);
-+  avahi_service_resolver_free (resolver);
-+}
-+
-+
-+/*
-+ * 'avahi_browse_callback()' - Avahi browse callback function.
-+ */
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+		      AvahiIfIndex interface,
-+		      AvahiProtocol protocol,
-+		      AvahiBrowserEvent event,
-+		      const char *name,
-+		      const char *type,
-+		      const char *domain,
-+		      AvahiLookupResultFlags flags,
-+		      void *context)
-+{
-+  AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+  switch (event)
-+  {
-+  case AVAHI_BROWSER_FAILURE:
-+    fprintf (stderr, "ERROR: %s\n",
-+	     avahi_strerror (avahi_client_errno (client)));
-+    avahi_simple_poll_quit (simple_poll);
-+    return;
-+
-+  case AVAHI_BROWSER_NEW:
-+   /*
-+    * This object is new on the network.
-+    */
-+
-+    if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+    {
-+     /*
-+      * This comes from the local machine so ignore it.
-+      */
-+
-+      fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+    }
-+    else
-+    {
-+     /*
-+      * Create a device entry for it if it doesn't yet exist.
-+      */
-+
-+      get_device ((cups_array_t *)context, name, type, domain);
-+
-+     /*
-+      * Now look for a TXT entry.
-+      */
-+
-+      if (avahi_service_resolver_new (client, interface, protocol,
-+				      name, type, domain,
-+				      AVAHI_PROTO_UNSPEC, 0,
-+				      avahi_query_callback, context) == NULL)
-+      {
-+	fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+		 name, avahi_strerror (avahi_client_errno (client)));
-+      }
-+    }
-+
-+    break;
-+
-+  case AVAHI_BROWSER_REMOVE:
-+  case AVAHI_BROWSER_ALL_FOR_NOW:
-+  case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+    break;
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'find_device()' - Find a device from its name and domain.
-+ */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+	     cups_txt_records_t *txt,
-+	     cups_device_t *dkey)
-+{
-+  cups_device_t	*device;
-+  char		*ptr;
-+
-+  for (device = cupsArrayFind(devices, dkey);
-        device;
-        device = cupsArrayNext(devices))
-   {
--    if (_cups_strcasecmp(device->name, dkey.name) ||
--        _cups_strcasecmp(device->domain, dkey.domain))
-+    if (_cups_strcasecmp(device->name, dkey->name) ||
-+        _cups_strcasecmp(device->domain, dkey->domain))
-     {
-       device = NULL;
-       break;
-     }
--    else if (device->type == dkey.type)
-+    else if (device->type == dkey->type)
-     {
-      /*
-       * Found it, pull out the priority and make and model from the TXT
-       * record and save it...
-       */
- 
--      const uint8_t	*data,		/* Pointer into data */
--			*datanext,	/* Next key/value pair */
--			*dataend;	/* End of entire TXT record */
--      uint8_t		datalen;	/* Length of current key/value pair */
--      char		key[256],	/* Key string */
--			value[256],	/* Value string */
--			make_and_model[512],
-+      char		make_and_model[512],
- 				      	/* Manufacturer and model */
- 			model[256],	/* Model */
--			device_id[2048];/* 1284 device ID */
--
-+			device_id[2048]; /* 1284 device ID */
- 
-       device_id[0]      = '\0';
-       make_and_model[0] = '\0';
- 
-       strcpy(model, "Unknown");
- 
--      for (data = rdata, dataend = data + rdlen;
--           data < dataend;
--           data = datanext)
-+      for (;;)
-       {
--       /*
--        * Read a key/value pair starting with an 8-bit length.  Since the
--	* length is 8 bits and the size of the key/value buffers is 256, we
--	* don't need to check for overflow...
--	*/
--
--        datalen = *data++;
--
--        if (!datalen || (data + datalen) > dataend)
--	  break;
--
--        datanext = data + datalen;
--
--        for (ptr = key; data < datanext && *data != '='; data ++)
--	  *ptr++ = *data;
--	*ptr = '\0';
-+	char *key;
-+	char *value;
- 
--	if (data < datanext && *data == '=')
--	{
--	  data ++;
--
--	  if (data < datanext)
--	    memcpy(value, data, datanext - data);
--	  value[datanext - data] = '\0';
-+	if (parse_txt_record_pair (txt))
-+	  goto next;
- 
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
--	          key, value);
--	}
--	else
--	{
--	  fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
--	          key);
--	  continue;
--	}
--
--        if (!_cups_strncasecmp(key, "usb_", 4))
-+	key = txt->key;
-+	value = txt->value;
-+        if (!strncasecmp(key, "usb_", 4))
- 	{
- 	 /*
- 	  * Add USB device ID information...
-@@ -861,6 +1267,10 @@ query_callback(
- 	  if (device->type == CUPS_DEVICE_PRINTER)
- 	    device->sent = 1;
- 	}
-+
-+      next:
-+	if (next_txt_record (txt) == NULL)
-+	  break;
-       }
- 
-       if (device->device_id)
-@@ -917,11 +1327,9 @@ query_callback(
-     }
-   }
- 
--  if (!device)
--    fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+  return device;
- }
- 
--
- /*
-  * 'sigterm_handler()' - Handle termination signals...
-  */
-diff -up cups-1.5.3/cups/http-support.c.avahi-2-backend cups-1.5.3/cups/http-support.c
---- cups-1.5.3/cups/http-support.c.avahi-2-backend	2012-02-15 02:06:12.000000000 +0100
-+++ cups-1.5.3/cups/http-support.c	2012-05-15 17:04:51.045944634 +0200
-@@ -43,6 +43,10 @@
-  *   http_copy_decode()   - Copy and decode a URI.
-  *   http_copy_encode()   - Copy and encode a URI.
-  *   http_resolve_cb()    - Build a device URI for the given service name.
-+ *   avahi_resolve_uri_client_cb()
-+ *                        - Avahi client callback for resolving URI.
-+ *   avahi_resolve_uri_resolver_cb()
-+ *                        - Avahi resolver callback for resolving URI.
-  */
- 
- /*
-@@ -60,6 +64,11 @@
- #    include <sys/select.h>
- #  endif /* WIN32 */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/lookup.h>
-+#  include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -127,6 +136,24 @@ static void DNSSD_API	http_resolve_cb(DN
- 					void *context);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static void	avahi_resolve_uri_client_cb(AvahiClient *client,
-+					    AvahiClientState state,
-+					    void *simple_poll);
-+static void	avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+					      AvahiIfIndex interface,
-+					      AvahiProtocol protocol,
-+					      AvahiResolverEvent event,
-+					      const char *name,
-+					      const char *type,
-+					      const char *domain,
-+					      const char *host_name,
-+					      const AvahiAddress *address,
-+					      uint16_t port,
-+					      AvahiStringList *txt,
-+					      AvahiLookupResultFlags flags,
-+					      void *context);
-+#endif /* HAVE_AVAHI */
- 
- /*
-  * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1434,6 +1461,9 @@ _httpResolveURI(
- 
-   if (strstr(hostname, "._tcp"))
-   {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+    char		*regtype,	/* Pointer to type in hostname */
-+			*domain;	/* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
- #  ifdef WIN32
- #    pragma comment(lib, "dnssd.lib")
-@@ -1452,6 +1482,17 @@ _httpResolveURI(
-     fd_set		input_set;	/* Input set for select() */
-     struct timeval	stimeout;	/* Timeout value for select() */
- #endif /* HAVE_POLL */
-+#else /* HAVE_AVAHI */
-+    AvahiSimplePoll	*simple_poll;
-+    AvahiClient		*client;
-+    int			error;
-+    struct
-+    {
-+      AvahiSimplePoll	*poll;
-+      _http_uribuf_t	uribuf;
-+    } user_data;
-+#endif /* HAVE_DNSSD */
-+
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-       fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
-@@ -1488,9 +1529,16 @@ _httpResolveURI(
-     if (domain)
-       *domain++ = '\0';
- 
-+#ifdef HAVE_DNSSD
-     uribuf.buffer   = resolved_uri;
-     uribuf.bufsize  = resolved_size;
-     uribuf.options  = options;
-+#else
-+    user_data.uribuf.buffer = resolved_uri;
-+    user_data.uribuf.bufsize = resolved_size;
-+    user_data.uribuf.options = options;
-+#endif
-+
-     resolved_uri[0] = '\0';
- 
-     DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
-@@ -1504,6 +1552,7 @@ _httpResolveURI(
- 
-     uri = NULL;
- 
-+#ifdef HAVE_DNSSD
-     if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
-     {
-       localref = ref;
-@@ -1611,6 +1660,36 @@ _httpResolveURI(
- 
-       DNSServiceRefDeallocate(ref);
-     }
-+#else /* HAVE_AVAHI */
-+    if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+    {
-+      if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+				      0, avahi_resolve_uri_client_cb,
-+				      &simple_poll, &error)) != NULL)
-+      {
-+	user_data.poll = simple_poll;
-+	if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+					AVAHI_PROTO_UNSPEC, hostname,
-+					regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+					avahi_resolve_uri_resolver_cb,
-+					&user_data) != NULL)
-+	{
-+	  avahi_simple_poll_loop (simple_poll);
-+
-+	 /*
-+	  * Collect the result.
-+	  */
-+
-+	  if (resolved_uri[0])
-+	    uri = resolved_uri;
-+	}
-+
-+	avahi_client_free (client);
-+      }
-+
-+      avahi_simple_poll_free (simple_poll);
-+    }
-+#endif /* HAVE_DNSSD */
- 
-     if (options & _HTTP_RESOLVE_STDERR)
-     {
-@@ -1622,13 +1701,13 @@ _httpResolveURI(
-       fputs("STATE: -connecting-to-device,offline-report\n", stderr);
-     }
- 
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
-    /*
-     * No DNS-SD support...
-     */
- 
-     uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
- 
-     if ((options & _HTTP_RESOLVE_STDERR) && !uri)
-       _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
-@@ -1916,6 +1995,115 @@ http_resolve_cb(
- }
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+			     AvahiClientState state,
-+			     void *simple_poll)
-+{
-+  DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+		"simple_poll=%p)\n", client, state, simple_poll));
-+
-+  /*
-+   * If the connection drops, quit.
-+   */
-+
-+  if (state == AVAHI_CLIENT_FAILURE)
-+    avahi_simple_poll_quit (simple_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
-+ *                                     URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+			       AvahiIfIndex interface,
-+			       AvahiProtocol protocol,
-+			       AvahiResolverEvent event,
-+			       const char *name,
-+			       const char *type,
-+			       const char *domain,
-+			       const char *host_name,
-+			       const AvahiAddress *address,
-+			       uint16_t port,
-+			       AvahiStringList *txt,
-+			       AvahiLookupResultFlags flags,
-+			       void *context)
-+{
-+  const char		*scheme;	/* URI scheme */
-+  char			rp[256];	/* Remote printer */
-+  AvahiStringList	*pair;
-+  char			*value;
-+  size_t		valueLen = 0;
-+  char			addr[AVAHI_ADDRESS_STR_MAX];
-+  struct
-+  {
-+    AvahiSimplePoll	*poll;
-+    _http_uribuf_t	uribuf;
-+  }		*poll_uribuf = context;
-+
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+		"interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+		"type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+		"port=%d, txt=%p, flags=%d, context=%p)\n",
-+		resolver, interface, protocol, event, name, type, domain,
-+		host_name, address, port, txt, flags, context));
-+
-+  if (event != AVAHI_RESOLVER_FOUND)
-+  {
-+    avahi_service_resolver_free (resolver);
-+    avahi_simple_poll_quit (poll_uribuf->poll);
-+    return;
-+  }
-+
-+ /*
-+  * Figure out the scheme from the full name...
-+  */
-+
-+  if (strstr(type, "_ipp."))
-+    scheme = "ipp";
-+  else if (strstr(type, "_printer."))
-+    scheme = "lpd";
-+  else if (strstr(type, "_pdl-datastream."))
-+    scheme = "socket";
-+  else
-+    scheme = "riousbprint";
-+
-+ /*
-+  * Extract the "remote printer key from the TXT record...
-+  */
-+
-+  if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+  {
-+    avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+    rp[0] = '/';
-+    memcpy (rp + 1, value, valueLen);
-+    rp[valueLen + 1] = '\0';
-+  }
-+  else
-+    rp[0] = '\0';
-+
-+ /*
-+  * Assemble the final device URI...
-+  */
-+
-+  avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+  httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+		  poll_uribuf->uribuf.bufsize, scheme, NULL,
-+		  addr, port, rp);
-+  DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+		poll_uribuf->uribuf.buffer));
-+  avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $".
\ No newline at end of file
diff --git a/testing/cups/cups-avahi-3-timeouts.patch b/testing/cups/cups-avahi-3-timeouts.patch
deleted file mode 100644
index daf852a0f..000000000
--- a/testing/cups/cups-avahi-3-timeouts.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-diff -up cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.2/scheduler/cupsd.h
---- cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts	2011-05-11 23:17:34.000000000 +0100
-+++ cups-1.5.2/scheduler/cupsd.h	2012-03-14 15:06:36.509476983 +0000
-@@ -140,6 +140,15 @@ extern const char *cups_hstrerror(int);
- 
- typedef void (*cupsd_selfunc_t)(void *data);
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * Timeout callback function type...
-+ */
-+
-+typedef struct _cupsd_timeout_s cupsd_timeout_t;
-+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
-+#endif /* HAVE_AVAHI */
-+
- 
- /*
-  * Globals...
-@@ -173,6 +182,11 @@ VAR int			Launchd		VALUE(0);
- 					/* Running from launchd */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_AVAHI
-+VAR cups_array_t *Timeouts;		/* Timed callbacks for main loop */
-+#endif /* HAVE_AVAHI */
-+
-+
- 
- /*
-  * Prototypes...
-@@ -242,6 +256,20 @@ extern void		cupsdStopSelect(void);
- extern void		cupsdStartServer(void);
- extern void		cupsdStopServer(void);
- 
-+#ifdef HAVE_AVAHI
-+extern void     cupsdInitTimeouts(void);
-+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
-+					 cupsd_timeoutfunc_t cb,
-+					 void *data);
-+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
-+extern void     cupsdRunTimeout (cupsd_timeout_t *timeout);
-+extern void     cupsdUpdateTimeout (cupsd_timeout_t *timeout,
-+				    const struct timeval *tv);
-+extern void     cupsdRemoveTimeout (cupsd_timeout_t *timeout);
-+#endif /* HAVE_AVAHI */
-+
-+extern int	cupsdRemoveFile(const char *filename);
-+
- 
- /*
-  * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
-diff -up cups-1.5.2/scheduler/main.c.avahi-3-timeouts cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.avahi-3-timeouts	2012-03-14 15:04:17.655305548 +0000
-+++ cups-1.5.2/scheduler/main.c	2012-03-14 15:06:36.511476986 +0000
-@@ -146,6 +146,10 @@ main(int  argc,				/* I - Number of comm
-   int			launchd_idle_exit;
- 					/* Idle exit on select timeout? */
- #endif	/* HAVE_LAUNCHD */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Next scheduled timed callback */
-+  long			tmo_delay;	/* Time before it must be called */
-+#endif /* HAVE_AVAHI */
- 
- 
- #ifdef HAVE_GETEUID
-@@ -535,6 +539,14 @@ main(int  argc,				/* I - Number of comm
- 
-   httpInitialize();
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * Initialize timed callback structures.
-+  */
-+
-+  cupsdInitTimeouts();
-+#endif /* HAVE_AVAHI */
-+
-   cupsdStartServer();
- 
-  /*
-@@ -874,6 +886,16 @@ main(int  argc,				/* I - Number of comm
-     }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+   /*
-+    * If a timed callback is due, run it.
-+    */
-+
-+    tmo = cupsdNextTimeout (&tmo_delay);
-+    if (tmo && tmo_delay == 0)
-+      cupsdRunTimeout (tmo);
-+#endif /* HAVE_AVAHI */
-+
- #ifndef __APPLE__
-    /*
-     * Update the network interfaces once a minute...
-@@ -1787,6 +1809,10 @@ select_timeout(int fds)			/* I - Number
-   cupsd_job_t		*job;		/* Job information */
-   cupsd_subscription_t	*sub;		/* Subscription information */
-   const char		*why;		/* Debugging aid */
-+#ifdef HAVE_AVAHI
-+  cupsd_timeout_t	*tmo;		/* Timed callback */
-+  long			tmo_delay;	/* Seconds before calling it */
-+#endif /* HAVE_AVAHI */
- 
- 
-  /*
-@@ -1829,6 +1855,19 @@ select_timeout(int fds)			/* I - Number
-   }
- #endif /* __APPLE__ */
- 
-+#ifdef HAVE_AVAHI
-+ /*
-+  * See if there are any scheduled timed callbacks to run.
-+  */
-+
-+  if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL &&
-+      (now + tmo_delay) < timeout)
-+  {
-+    timeout = tmo_delay;
-+    why = "run a timed callback";
-+  }
-+#endif /* HAVE_AVAHI */
-+
-  /*
-   * Check whether we are accepting new connections...
-   */
-diff -up cups-1.5.2/scheduler/Makefile.avahi-3-timeouts cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.avahi-3-timeouts	2012-03-14 15:04:17.685305586 +0000
-+++ cups-1.5.2/scheduler/Makefile	2012-03-14 15:06:36.508476980 +0000
-@@ -39,7 +39,8 @@ CUPSDOBJS =	\
- 		server.o \
- 		statbuf.o \
- 		subscriptions.o \
--		sysman.o
-+		sysman.o \
-+		timeout.o
- LIBOBJS =	\
- 		filter.o \
- 		mime.o \
-diff -up cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts cups-1.5.2/scheduler/timeout.c
---- cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts	2012-03-14 15:06:36.552477037 +0000
-+++ cups-1.5.2/scheduler/timeout.c	2012-03-14 15:06:36.552477037 +0000
-@@ -0,0 +1,235 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Timeout functions for the Common UNIX Printing System (CUPS).
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *     Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ *   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ *   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ *   OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * Contents:
-+ *
-+ *   cupsdInitTimeouts()  - Initialise timeout structure.
-+ *   cupsdAddTimeout()    - Add a timed callback.
-+ *   cupsdNextTimeout()   - Find the next enabled timed callback.
-+ *   cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
-+ *   cupsdRemoveTimeout() - Discard a timed callback.
-+ *   compare_timeouts()   - Compare timed callbacks for array sorting.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+struct _cupsd_timeout_s
-+{
-+  struct timeval when;
-+  int enabled;
-+  cupsd_timeoutfunc_t callback;
-+  void *data;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+/*
-+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
-+ */
-+
-+static int
-+compare_addrs (void *p0, void *p1)
-+{
-+  if (p0 == p1)
-+    return (0);
-+  if (p0 < p1)
-+    return (-1);
-+  return (1);
-+}
-+
-+static int
-+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
-+{
-+  int addrsdiff = compare_addrs (p0, p1);
-+  int tvdiff;
-+
-+  if (addrsdiff == 0)
-+    return (0);
-+
-+  if (!p0->enabled || !p1->enabled)
-+  {
-+    if (!p0->enabled && !p1->enabled)
-+      return (addrsdiff);
-+
-+    return (p0->enabled ? -1 : 1);
-+  }
-+
-+  tvdiff = avahi_timeval_compare (&p0->when, &p1->when);
-+  if (tvdiff != 0)
-+    return (tvdiff);
-+
-+  return (addrsdiff);
-+}
-+
-+
-+/*
-+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
-+ */
-+
-+void
-+cupsdInitTimeouts(void)
-+{
-+  Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
-+}
-+
-+
-+/*
-+ * 'cupsdAddTimeout()' - Add a timed callback.
-+ */
-+
-+cupsd_timeout_t *				/* O - Timeout handle */
-+cupsdAddTimeout(const struct timeval *tv,	/* I - Absolute time */
-+		cupsd_timeoutfunc_t cb,		/* I - Callback function */
-+		void *data)			/* I - User data */
-+{
-+  cupsd_timeout_t *timeout;
-+
-+  timeout = malloc (sizeof(cupsd_timeout_t));
-+  if (timeout != NULL)
-+  {
-+    timeout->enabled = (tv != NULL);
-+    if (tv)
-+    {
-+      timeout->when.tv_sec = tv->tv_sec;
-+      timeout->when.tv_usec = tv->tv_usec;
-+    }
-+
-+    timeout->callback = cb;
-+    timeout->data = data;
-+    cupsArrayAdd (Timeouts, timeout);
-+  }
-+
-+  return timeout;
-+}
-+
-+
-+/*
-+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
-+ */
-+
-+cupsd_timeout_t *		/* O - Next enabled timeout or NULL */
-+cupsdNextTimeout(long *delay)	/* O - Seconds before scheduled */
-+{
-+  cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
-+  struct timeval curtime;
-+
-+  if (first && !first->enabled)
-+    first = NULL;
-+
-+  if (first && delay)
-+  {
-+    gettimeofday (&curtime, NULL);
-+    if (avahi_timeval_compare (&curtime, &first->when) > 0)
-+    {
-+      *delay = 0;
-+    } else {
-+      *delay = 1 + first->when.tv_sec - curtime.tv_sec;
-+      if (first->when.tv_usec < curtime.tv_usec)
-+	(*delay)--;
-+    }
-+  }
-+
-+  return (first);
-+}
-+
-+
-+/*
-+ * 'cupsdRunTimeout()' - Run a timed callback.
-+ */
-+
-+void
-+cupsdRunTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  if (!timeout)
-+    return;
-+  timeout->enabled = 0;
-+  if (!timeout->callback)
-+    return;
-+  timeout->callback (timeout, timeout->data);
-+}
-+
-+/*
-+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
-+ */
-+
-+void
-+cupsdUpdateTimeout(cupsd_timeout_t *timeout,	/* I - Timeout */
-+		   const struct timeval *tv)	/* I - Absolute time or NULL */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  timeout->enabled = (tv != NULL);
-+  if (tv)
-+  {
-+    timeout->when.tv_sec = tv->tv_sec;
-+    timeout->when.tv_usec = tv->tv_usec;
-+  }
-+  cupsArrayAdd (Timeouts, timeout);
-+}
-+
-+
-+/*
-+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
-+ */
-+
-+void
-+cupsdRemoveTimeout(cupsd_timeout_t *timeout)	/* I - Timeout */
-+{
-+  cupsArrayRemove (Timeouts, timeout);
-+  free (timeout);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
diff --git a/testing/cups/cups-avahi-4-poll.patch b/testing/cups/cups-avahi-4-poll.patch
deleted file mode 100644
index d7fa5fd56..000000000
--- a/testing/cups/cups-avahi-4-poll.patch
+++ /dev/null
@@ -1,529 +0,0 @@
-diff -up cups-1.5.2/scheduler/avahi.c.avahi-4-poll cups-1.5.2/scheduler/avahi.c
---- cups-1.5.2/scheduler/avahi.c.avahi-4-poll	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.c	2012-03-14 15:07:29.477542381 +0000
-@@ -0,0 +1,441 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ *   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ *   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ *   OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * Contents:
-+ *
-+ *   watch_read_cb         - Read callback for file descriptor
-+ *   watch_write_cb        - Write callback for file descriptor
-+ *   watched_fd_add_select() - Call cupsdAddSelect() as needed
-+ *   watch_new()           - Create a new file descriptor watch
-+ *   watch_free()          - Free a file descriptor watch
-+ *   watch_update()        - Update watched events for a file descriptor
-+ *   watch_get_events()    - Get events that happened for a file descriptor
-+ *   timeout_cb()          - Run a timed Avahi callback
-+ *   timeout_new()         - Set a wakeup time
-+ *   timeout_update()      - Update the expiration time for a timeout
-+ *   timeout_free()        - Free a timeout
-+ *   compare_watched_fds() - Compare watched file descriptors for array sorting
-+ *   avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
-+ *   avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
-+ *   avahi_cups_poll_get() - Get the abstract poll API structure
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+#  include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+typedef struct
-+{
-+  AvahiCupsPoll *cups_poll;
-+
-+  int fd;
-+  AvahiWatchEvent occurred;
-+  cups_array_t *watches;
-+} cupsd_watched_fd_t;
-+
-+struct AvahiWatch
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  AvahiWatchEvent events;
-+  AvahiWatchCallback callback;
-+  void *userdata;
-+};
-+
-+struct AvahiTimeout
-+{
-+  AvahiCupsPoll *cups_poll;
-+  AvahiTimeoutCallback callback;
-+  void *userdata;
-+  cupsd_timeout_t *cupsd_timeout;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+static AvahiWatch *	watch_new(const AvahiPoll *api,
-+				  int fd,
-+				  AvahiWatchEvent events,
-+				  AvahiWatchCallback callback,
-+				  void *userdata);
-+static void		watch_free(AvahiWatch *watch);
-+static void		watch_update(AvahiWatch *watch,
-+				     AvahiWatchEvent events);
-+static AvahiWatchEvent	watch_get_events(AvahiWatch *watch);
-+
-+
-+/*
-+ * 'watch_read_cb' - Read callback for file descriptor
-+ */
-+
-+static void
-+watch_read_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_IN;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    if (watch->events & watched_fd->occurred)
-+    {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_IN, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_IN;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_write_cb' - Write callback for file descriptor
-+ */
-+
-+static void
-+watch_write_cb (void *userdata)
-+{
-+  AvahiWatch *watch;
-+  cupsd_watched_fd_t *watched_fd = userdata;
-+  watched_fd->occurred |= AVAHI_WATCH_OUT;
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    if (watch->events & watched_fd->occurred)
-+    {
-+      (watch->callback) (watch, watched_fd->fd,
-+			 AVAHI_WATCH_OUT, watch->userdata);
-+      watched_fd->occurred &= ~AVAHI_WATCH_OUT;
-+      break;
-+    }
-+  }
-+}
-+
-+
-+/*
-+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
-+ */
-+
-+static int						/* O - Watches? */
-+watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
-+{
-+  AvahiWatch *watch;
-+  cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
-+  int any_watches = 0;
-+
-+  for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+       watch;
-+       watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches))
-+  {
-+    any_watches = 1;
-+    if (watch->events & (AVAHI_WATCH_IN |
-+			     AVAHI_WATCH_ERR |
-+			     AVAHI_WATCH_HUP))
-+    {
-+      read_cb = (cupsd_selfunc_t)watch_read_cb;
-+      if (write_cb != NULL)
-+	break;
-+    }
-+
-+    if (watch->events & AVAHI_WATCH_OUT)
-+    {
-+      write_cb = (cupsd_selfunc_t)watch_write_cb;
-+      if (read_cb != NULL)
-+	break;
-+    }
-+  }
-+
-+  if (read_cb || write_cb)
-+    cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
-+  else
-+    cupsdRemoveSelect (watched_fd->fd);
-+
-+  return (any_watches);
-+}
-+
-+/*
-+ * 'watch_new' - Create a new file descriptor watch
-+ */
-+
-+static AvahiWatch *
-+watch_new (const AvahiPoll *api,
-+	   int fd,
-+	   AvahiWatchEvent events,
-+	   AvahiWatchCallback callback,
-+	   void *userdata)
-+{
-+  cupsd_watched_fd_t key, *watched_fd;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+  AvahiWatch *watch = malloc(sizeof(AvahiWatch));
-+  if (watch == NULL)
-+    return (NULL);
-+
-+  watch->events = events;
-+  watch->callback = callback;
-+  watch->userdata = userdata;
-+
-+  key.fd = fd;
-+  watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
-+  if (watched_fd == NULL)
-+  {
-+    watched_fd = malloc(sizeof(cupsd_watched_fd_t));
-+    if (watched_fd == NULL)
-+    {
-+      free (watch);
-+      return (NULL);
-+    }
-+
-+    watched_fd->fd = fd;
-+    watched_fd->occurred = 0;
-+    watched_fd->cups_poll = cups_poll;
-+    watched_fd->watches = cupsArrayNew (NULL, NULL);
-+    cupsArrayAdd (cups_poll->watched_fds, watched_fd);
-+  }
-+
-+  watch->watched_fd = watched_fd;
-+  cupsArrayAdd(watched_fd->watches, watch);
-+  watched_fd_add_select (watched_fd);
-+  return (watch);
-+}
-+
-+
-+/*
-+ * 'watch_free' - Free a file descriptor watch
-+ */
-+
-+static void
-+watch_free (AvahiWatch *watch)
-+{
-+  cupsd_watched_fd_t *watched_fd = watch->watched_fd;
-+  AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
-+
-+  cupsArrayRemove (watched_fd->watches, watch);
-+  free (watch);
-+
-+  if (!watched_fd_add_select (watched_fd))
-+  {
-+    /* No more watches */
-+    cupsArrayRemove (cups_poll->watched_fds, watched_fd);
-+    free (watched_fd);
-+  }
-+}
-+
-+
-+/*
-+ * 'watch_update' - Update watched events for a file descriptor
-+ */
-+
-+static void
-+watch_update (AvahiWatch *watch,
-+	      AvahiWatchEvent events)
-+{
-+  watch->events = events;
-+  watched_fd_add_select (watch->watched_fd);
-+}
-+
-+
-+/*
-+ * 'watch_get_events' - Get events that happened for a file descriptor
-+ */
-+
-+static AvahiWatchEvent
-+watch_get_events (AvahiWatch *watch)
-+{
-+  return (watch->watched_fd->occurred);
-+}
-+
-+
-+/*
-+ * 'timeout_cb()' - Run a timed Avahi callback
-+ */
-+
-+static void
-+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
-+{
-+  AvahiTimeout *timeout = userdata;
-+  (timeout->callback) (timeout, timeout->userdata);
-+}
-+
-+
-+/*
-+ * 'timeout_new' - Set a wakeup time
-+ */
-+
-+static AvahiTimeout *
-+timeout_new (const AvahiPoll *api,
-+	     const struct timeval *tv,
-+	     AvahiTimeoutCallback callback,
-+	     void *userdata)
-+{
-+  AvahiTimeout *timeout;
-+  AvahiCupsPoll *cups_poll = api->userdata;
-+
-+  timeout = malloc(sizeof(AvahiTimeout));
-+  if (timeout == NULL)
-+    return (NULL);
-+
-+  timeout->cups_poll = cups_poll;
-+  timeout->callback = callback;
-+  timeout->userdata = userdata;
-+  timeout->cupsd_timeout = cupsdAddTimeout (tv,
-+					    (cupsd_timeoutfunc_t)timeout_cb,
-+					    timeout);
-+  cupsArrayAdd (cups_poll->timeouts, timeout);
-+  return (timeout);
-+}
-+
-+
-+/*
-+ * 'timeout_update' - Update the expiration time for a timeout
-+ */
-+
-+static void
-+timeout_update (AvahiTimeout *timeout,
-+		const struct timeval *tv)
-+{
-+  cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
-+}
-+
-+
-+/*
-+ * ' timeout_free' - Free a timeout
-+ */
-+
-+static void
-+timeout_free (AvahiTimeout *timeout)
-+{
-+  cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
-+  cupsdRemoveTimeout (timeout->cupsd_timeout);
-+  free (timeout);
-+}
-+
-+
-+/*
-+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
-+ */
-+static int
-+compare_watched_fds(cupsd_watched_fd_t *p0,
-+		    cupsd_watched_fd_t *p1)
-+{
-+  /*
-+   * Compare by fd (no two elements have the same fd)
-+   */
-+
-+  if (p0->fd == p1->fd)
-+    return 0;
-+
-+  return (p0->fd < p1->fd ? -1 : 1);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
-+ */
-+
-+AvahiCupsPoll *
-+avahi_cups_poll_new (void)
-+{
-+  AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
-+  if (cups_poll == NULL)
-+    return (NULL);
-+
-+  cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
-+					 NULL);
-+  cups_poll->timeouts = cupsArrayNew (NULL, NULL);
-+
-+  cups_poll->api.userdata = cups_poll;
-+  cups_poll->api.watch_new = watch_new;
-+  cups_poll->api.watch_free = watch_free;
-+  cups_poll->api.watch_update = watch_update;
-+  cups_poll->api.watch_get_events = watch_get_events;
-+
-+  cups_poll->api.timeout_new = timeout_new;
-+  cups_poll->api.timeout_update = timeout_update;
-+  cups_poll->api.timeout_free = timeout_free;
-+
-+  return (cups_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
-+ */
-+void
-+avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
-+{
-+  cupsd_watched_fd_t *watched_fd;
-+
-+  for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
-+       watched_fd;
-+       watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds))
-+    cupsArrayClear (watched_fd->watches);
-+
-+  cupsArrayClear (cups_poll->watched_fds);
-+  cupsArrayClear (cups_poll->timeouts);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_get' - Get the abstract poll API structure
-+ */
-+
-+const AvahiPoll *
-+avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
-+{
-+  return (&cups_poll->api);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
-diff -up cups-1.5.2/scheduler/avahi.h.avahi-4-poll cups-1.5.2/scheduler/avahi.h
---- cups-1.5.2/scheduler/avahi.h.avahi-4-poll	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.h	2012-03-14 15:07:29.477542381 +0000
-@@ -0,0 +1,69 @@
-+/*
-+ * "$Id$"
-+ *
-+ *   Avahi poll implementation for the CUPS scheduler.
-+ *
-+ *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Authors:
-+ *    Tim Waugh <twaugh@redhat.com>
-+ *
-+ *   Redistribution and use in source and binary forms, with or without
-+ *   modification, are permitted provided that the following conditions
-+ *   are met:
-+ *
-+ *   Redistributions of source code must retain the above copyright
-+ *   notice, this list of conditions and the following disclaimer.
-+ *
-+ *   Redistributions in binary form must reproduce the above copyright
-+ *   notice, this list of conditions and the following disclaimer in the
-+ *   documentation and/or other materials provided with the distribution.
-+ *
-+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+ *   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+ *   COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-+ *   INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-+ *   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-+ *   SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+ *   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-+ *   STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+ *   ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-+ *   OF THE POSSIBILITY OF SUCH DAMAGE.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/client.h>
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_AUTHORIZATION_H
-+#  include <Security/Authorization.h>
-+#endif /* HAVE_AUTHORIZATION_H */
-+
-+
-+#ifdef HAVE_AVAHI
-+typedef struct
-+{
-+    AvahiPoll api;
-+    cups_array_t *watched_fds;
-+    cups_array_t *timeouts;
-+} AvahiCupsPoll;
-+#endif /* HAVE_AVAHI */
-+
-+/*
-+ * Prototypes...
-+ */
-+
-+#ifdef HAVE_AVAHI
-+extern AvahiCupsPoll *	avahi_cups_poll_new(void);
-+extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
-+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * End of "$Id$".
-+ */
-diff -up cups-1.5.2/scheduler/Makefile.avahi-4-poll cups-1.5.2/scheduler/Makefile
---- cups-1.5.2/scheduler/Makefile.avahi-4-poll	2012-03-14 15:06:36.508476980 +0000
-+++ cups-1.5.2/scheduler/Makefile	2012-03-14 15:07:29.476542380 +0000
-@@ -17,6 +17,7 @@ include ../Makedefs
- 
- CUPSDOBJS =	\
- 		auth.o \
-+		avahi.o \
- 		banners.o \
- 		cert.o \
- 		classes.o \
diff --git a/testing/cups/cups-avahi-5-services.patch b/testing/cups/cups-avahi-5-services.patch
deleted file mode 100644
index 820b3c32b..000000000
--- a/testing/cups/cups-avahi-5-services.patch
+++ /dev/null
@@ -1,1272 +0,0 @@
-diff -up cups-1.5.2/cgi-bin/admin.c.avahi-5-services cups-1.5.2/cgi-bin/admin.c
---- cups-1.5.2/cgi-bin/admin.c.avahi-5-services	2011-08-17 22:01:53.000000000 +0100
-+++ cups-1.5.2/cgi-bin/admin.c	2012-03-14 15:08:25.701611799 +0000
-@@ -1643,7 +1643,7 @@ do_config_server(http_t *http)		/* I - H
-       else
- 	local_protocols[0] = '\0';
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-       if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
-       {
- 	if (local_protocols[0])
-@@ -1651,7 +1651,7 @@ do_config_server(http_t *http)		/* I - H
- 	else
- 	  strcat(local_protocols, "dnssd");
-       }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-       if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
-@@ -2718,9 +2718,9 @@ do_menu(http_t *http)			/* I - HTTP conn
- #endif /* HAVE_GSSAPI */
-   cgiSetVariable("KERBEROS", "");
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cgiSetVariable("HAVE_DNSSD", "1");
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LDAP
-   cgiSetVariable("HAVE_LDAP", "1");
-diff -up cups-1.5.2/scheduler/avahi.h.avahi-5-services cups-1.5.2/scheduler/avahi.h
---- cups-1.5.2/scheduler/avahi.h.avahi-5-services	2012-03-14 15:07:29.477542381 +0000
-+++ cups-1.5.2/scheduler/avahi.h	2012-03-14 15:08:25.701611799 +0000
-@@ -3,7 +3,7 @@
-  *
-  *   Avahi poll implementation for the CUPS scheduler.
-  *
-- *   Copyright (C) 2010, 2011 Red Hat, Inc.
-+ *   Copyright (C) 2010, 2011, 2012 Red Hat, Inc.
-  *   Authors:
-  *    Tim Waugh <twaugh@redhat.com>
-  *
-@@ -32,37 +32,40 @@
-  *   OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--#include <config.h>
-+#ifndef _CUPS_AVAHI_H_
-+#  define _CUPS_AVAHI_H_
- 
--#ifdef HAVE_AVAHI
--#  include <avahi-client/client.h>
--#  include <avahi-client/publish.h>
--#endif /* HAVE_AVAHI */
-+/*
-+ * Include necessary headers...
-+ */
- 
--#ifdef HAVE_AUTHORIZATION_H
--#  include <Security/Authorization.h>
--#endif /* HAVE_AUTHORIZATION_H */
-+#  include <config.h>
- 
-+#  ifdef HAVE_AVAHI
-+#    include <avahi-client/client.h>
-+#    include <avahi-client/publish.h>
-+#  endif /* HAVE_AVAHI */
- 
--#ifdef HAVE_AVAHI
-+#  ifdef HAVE_AVAHI
- typedef struct
- {
-     AvahiPoll api;
-     cups_array_t *watched_fds;
-     cups_array_t *timeouts;
- } AvahiCupsPoll;
--#endif /* HAVE_AVAHI */
-+#  endif /* HAVE_AVAHI */
- 
- /*
-  * Prototypes...
-  */
- 
--#ifdef HAVE_AVAHI
-+#  ifdef HAVE_AVAHI
- extern AvahiCupsPoll *	avahi_cups_poll_new(void);
- extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
- extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
--#endif /* HAVE_AVAHI */
-+#  endif /* HAVE_AVAHI */
- 
-+#endif /* !_CUPS_AVAHI_H_ */
- 
- /*
-  * End of "$Id$".
-diff -up cups-1.5.2/scheduler/client.c.avahi-5-services cups-1.5.2/scheduler/client.c
---- cups-1.5.2/scheduler/client.c.avahi-5-services	2012-01-13 23:00:22.000000000 +0000
-+++ cups-1.5.2/scheduler/client.c	2012-03-14 15:08:25.703611797 +0000
-@@ -4989,7 +4989,7 @@ valid_host(cupsd_client_t *con)		/* I -
- 	    !strncmp(host, "[::1]:", 6));
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-  /*
-   * Check if the hostname is something.local (Bonjour); if so, allow it.
-   */
-@@ -4998,7 +4998,7 @@ valid_host(cupsd_client_t *con)		/* I -
-       (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
-        !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
-     return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-  /*
-   * Check if the hostname is an IP address...
-diff -up cups-1.5.2/scheduler/conf.c.avahi-5-services cups-1.5.2/scheduler/conf.c
---- cups-1.5.2/scheduler/conf.c.avahi-5-services	2012-03-14 15:04:17.636305526 +0000
-+++ cups-1.5.2/scheduler/conf.c	2012-03-14 15:08:25.706611803 +0000
-@@ -652,7 +652,7 @@ cupsdReadConfiguration(void)
-   Browsing                 = CUPS_DEFAULT_BROWSING;
-   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
- #endif /* HAVE_DNSSD */
- 
-diff -up cups-1.5.2/scheduler/dirsvc.c.avahi-5-services cups-1.5.2/scheduler/dirsvc.c
---- cups-1.5.2/scheduler/dirsvc.c.avahi-5-services	2012-03-14 15:04:17.674305572 +0000
-+++ cups-1.5.2/scheduler/dirsvc.c	2012-03-14 15:08:25.709611806 +0000
-@@ -27,6 +27,7 @@
-  *   ldap_connect()             - Start new LDAP connection
-  *   ldap_reconnect()           - Reconnect to LDAP Server
-  *   ldap_disconnect()          - Disconnect from LDAP Server
-+ *   cupsdStartAvahiClient()    - Start an Avahi client if needed
-  *   cupsdStartBrowsing()       - Start sending and receiving broadcast
-  *                                information.
-  *   cupsdStartPolling()        - Start polling servers as needed.
-@@ -40,11 +41,12 @@
-  *   dequote()                  - Remote quotes from a string.
-  *   dnssdAddAlias()            - Add a DNS-SD alias name.
-  *   dnssdBuildTxtRecord()      - Build a TXT record from printer info.
-- *   dnssdComparePrinters()     - Compare the registered names of two printers.
-  *   dnssdDeregisterPrinter()   - Stop sending broadcast information for a
-  *                                printer.
-  *   dnssdPackTxtRecord()       - Pack an array of key/value pairs into the TXT
-  *                                record format.
-+ *   avahiPackTxtRecord()       - Pack an array of key/value pairs into an
-+ *                                AvahiStringList.
-  *   dnssdRegisterCallback()    - DNSServiceRegister callback.
-  *   dnssdRegisterPrinter()     - Start sending broadcast information for a
-  *                                printer or update the broadcast contents.
-@@ -83,6 +85,7 @@
-  */
- 
- #include "cupsd.h"
-+#include <assert.h>
- #include <grp.h>
- 
- #ifdef HAVE_DNSSD
-@@ -97,6 +100,17 @@
- #    endif /* HAVE_SYSTEMCONFIGURATION */
- #  endif /* __APPLE__ */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include <avahi-common/domain.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+#ifdef HAVE_DNSSD
-+typedef char *cupsd_txt_record_t;
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+typedef AvahiStringList *cupsd_txt_record_t;
-+#endif /* HAVE_AVAHI */
- 
- 
- /*
-@@ -159,27 +173,38 @@ static void	update_polling(void);
- static void	update_smb(int onoff);
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-+					      int for_lpd);
-+static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
-+static void	dnssdRegisterPrinter(cupsd_printer_t *p);
-+static void	dnssdStop(void);
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
- #ifdef HAVE_DNSSD
- #  ifdef HAVE_COREFOUNDATION
- static void	dnssdAddAlias(const void *key, const void *value,
- 		              void *context);
- #  endif /* HAVE_COREFOUNDATION */
--static char	*dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
--		                     int for_lpd);
--static int	dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
--static void	dnssdDeregisterPrinter(cupsd_printer_t *p);
--static char	*dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
--		                    int count);
- static void	dnssdRegisterCallback(DNSServiceRef sdRef,
- 		                      DNSServiceFlags flags,
- 				      DNSServiceErrorType errorCode,
- 				      const char *name, const char *regtype,
- 				      const char *domain, void *context);
--static void	dnssdRegisterPrinter(cupsd_printer_t *p);
--static void	dnssdStop(void);
- static void	dnssdUpdate(void);
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
-+					   int count);
-+static void	avahi_entry_group_cb (AvahiEntryGroup *group,
-+				      AvahiEntryGroupState state,
-+				      void *userdata);
-+static void	avahi_client_cb (AvahiClient *client,
-+				 AvahiClientState state,
-+				 void *userdata);
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LDAP
- static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
- 		{
-@@ -283,10 +308,10 @@ cupsdDeregisterPrinter(
-     ldap_dereg_printer(p);
- #endif /* HAVE_LDAP */
- 
--#ifdef HAVE_DNSSD
--  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdDeregisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -702,10 +727,10 @@ cupsdRegisterPrinter(cupsd_printer_t *p)
-     slpRegisterPrinter(p); */
- #endif /* HAVE_LIBSLP */
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdRegisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-@@ -1419,6 +1444,36 @@ ldap_disconnect(LDAP *ld)		/* I - LDAP h
- #endif /* HAVE_LDAP */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
-+ */
-+
-+void
-+cupsdStartAvahiClient(void)
-+{
-+  int error = 0;
-+
-+  if (!AvahiCupsClient && !AvahiCupsClientConnecting)
-+  {
-+    if (!AvahiCupsPollHandle)
-+      AvahiCupsPollHandle = avahi_cups_poll_new ();
-+
-+    if (AvahiCupsPollHandle)
-+    {
-+      if (avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
-+			    AVAHI_CLIENT_NO_FAIL,
-+			    avahi_client_cb, NULL,
-+			    &error) != NULL)
-+	AvahiCupsClientConnecting = 1;
-+      else
-+	cupsdLogMessage (CUPSD_LOG_WARN, "Avahi client failed: %d", error);
-+    }
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+  
- /*
-  * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
-  */
-@@ -1542,13 +1597,16 @@ cupsdStartBrowsing(void)
-   else
-     BrowseSocket = -1;
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
-   {
-+#ifdef HAVE_DNSSD
-     DNSServiceErrorType error;		/* Error from service creation */
-+#endif /* HAVE_DNSSD */
-     cupsd_listener_t	*lis;		/* Current listening socket */
- 
- 
-+#ifdef HAVE_DNSSD
-    /*
-     * First create a "master" connection for all registrations...
-     */
-@@ -1573,6 +1631,7 @@ cupsdStartBrowsing(void)
-       fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
- 
-       cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
-+#endif /* HAVE_DNSSD */
- 
-      /*
-       * Then get the port we use for registrations.  If we are not listening
-@@ -1598,17 +1657,23 @@ cupsdStartBrowsing(void)
-       */
- 
-       if (BrowseRemoteProtocols & BROWSE_DNSSD)
--        DNSSDPrinters = cupsArrayNew((cups_array_func_t)dnssdComparePrinters,
--	                             NULL);
-+	  DNSSDPrinters = cupsArrayNew(NULL, NULL);
- 
-      /*
-       * Set the computer name and register the web interface...
-       */
- 
-       cupsdUpdateDNSSDName();
-+
-+#ifdef HAVE_AVAHI
-+      cupsdStartAvahiClient ();
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_DNSSD
-     }
--  }
- #endif /* HAVE_DNSSD */
-+  }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-@@ -1834,10 +1899,10 @@ cupsdStopBrowsing(void)
-     BrowseSocket = -1;
-   }
- 
--#ifdef HAVE_DNSSD
--  if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+  if ((BrowseLocalProtocols & BROWSE_DNSSD))
-     dnssdStop();
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- #ifdef HAVE_LIBSLP
-   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
-@@ -1902,7 +1967,7 @@ cupsdStopPolling(void)
- }
- 
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
-  */
-@@ -1910,8 +1975,14 @@ cupsdStopPolling(void)
- void
- cupsdUpdateDNSSDName(void)
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType error;		/* Error from service creation */
-   char		webif[1024];		/* Web interface share name */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int		ret;			/* Error from service creation */
-+  char		webif[AVAHI_LABEL_MAX];	/* Web interface share name */
-+#endif /* HAVE_AVAHI */
- #  ifdef HAVE_SYSTEMCONFIGURATION
-   SCDynamicStoreRef sc;			/* Context for dynamic store */
-   CFDictionaryRef btmm;			/* Back-to-My-Mac domains */
-@@ -2042,6 +2113,7 @@ cupsdUpdateDNSSDName(void)
-     else
-       strlcpy(webif, "CUPS Web Interface", sizeof(webif));
- 
-+#ifdef HAVE_DNSSD
-     if (WebIFRef)
-       DNSServiceRefDeallocate(WebIFRef);
- 
-@@ -2054,9 +2126,45 @@ cupsdUpdateDNSSDName(void)
- 				    NULL)) != kDNSServiceErr_NoError)
-       cupsdLogMessage(CUPSD_LOG_ERROR,
- 		      "DNS-SD web interface registration failed: %d", error);
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+    if (!AvahiCupsClient)
-+     /*
-+      * Client not yet running.
-+      */
-+      return;
-+
-+    if (AvahiWebIFGroup)
-+      avahi_entry_group_reset (AvahiWebIFGroup);
-+    else
-+      AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
-+					       avahi_entry_group_cb,
-+					       NULL);
-+
-+    if (AvahiWebIFGroup)
-+    {
-+      ret = avahi_entry_group_add_service (AvahiWebIFGroup,
-+					   AVAHI_IF_UNSPEC,
-+					   AVAHI_PROTO_UNSPEC,
-+					   0, /* flags */
-+					   webif, /* name */
-+					   "_http._tcp", /* type */
-+					   NULL, /* domain */
-+					   NULL, /* host */
-+					   DNSSDPort, /* port */
-+					   "path=/", NULL);
-+      if (ret == 0)
-+	ret = avahi_entry_group_commit (AvahiWebIFGroup);
-+
-+      if (ret != 0)
-+	cupsdLogMessage (CUPSD_LOG_ERROR,
-+			 "Avahi web interface registration failed: %d", ret);
-+    }
-+#endif /* HAVE_AVAHI */
-   }
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
- #ifdef HAVE_LDAP
-@@ -2334,13 +2442,15 @@ dnssdAddAlias(const void *key,		/* I - K
-                     "Bad Back to My Mac domain in dynamic store!");
- }
- #  endif /* HAVE_COREFOUNDATION */
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
-  */
- 
--static char *				/* O - TXT record */
-+static cupsd_txt_record_t		/* O - TXT record */
- dnssdBuildTxtRecord(
-     int             *txt_len,		/* O - TXT record length */
-     cupsd_printer_t *p,			/* I - Printer information */
-@@ -2379,7 +2489,12 @@ dnssdBuildTxtRecord(
-   keyvalue[i  ][0] = "ty";
-   keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
- 
--  snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
-+  snprintf(admin_hostname, sizeof(admin_hostname),
-+	   "%s.local"
-+#ifdef HAVE_DNSSD
-+	   "." /* terminating dot no good for Avahi */
-+#endif /* HAVE_DNSSD */
-+	   , DNSSDHostName);
-   httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
-                    "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
- 		   (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-@@ -2462,19 +2577,12 @@ dnssdBuildTxtRecord(
-   * Then pack them into a proper txt record...
-   */
- 
-+#ifdef HAVE_DNSSD
-   return (dnssdPackTxtRecord(txt_len, keyvalue, i));
--}
--
--
--/*
-- * 'dnssdComparePrinters()' - Compare the registered names of two printers.
-- */
--
--static int				/* O - Result of comparison */
--dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
--                     cupsd_printer_t *b)/* I - Second printer */
--{
--  return (_cups_strcasecmp(a->reg_name, b->reg_name));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  return (avahiPackTxtRecord(keyvalue, i));
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2489,6 +2597,10 @@ dnssdDeregisterPrinter(
- {
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-  /*
-   * Closing the socket deregisters the service
-   */
-@@ -2524,6 +2636,24 @@ dnssdDeregisterPrinter(
-     free(p->printer_txt);
-     p->printer_txt = NULL;
-   }
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+  if (p->avahi_group)
-+    {
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+
-+      if (p->ipp_txt)
-+	avahi_string_list_free (p->ipp_txt);
-+
-+      if (p->printer_txt)
-+	avahi_string_list_free (p->printer_txt);
-+
-+      p->ipp_txt = p->printer_txt = NULL;
-+    }
-+#endif /* HAVE_AVAHI */
- 
-  /*
-   * Remove the printer from the array of DNS-SD printers, then clear the
-@@ -2533,8 +2663,10 @@ dnssdDeregisterPrinter(
-   cupsArrayRemove(DNSSDPrinters, p);
-   cupsdClearString(&p->reg_name);
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
-  *                          TXT record format.
-@@ -2644,8 +2776,10 @@ dnssdRegisterCallback(
-     LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
-   }
- }
-+#endif /* HAVE_DNSSD */
- 
- 
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
-  * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
-  *		              or update the broadcast contents.
-@@ -2654,20 +2788,40 @@ dnssdRegisterCallback(
- static void
- dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
- {
-+#ifdef HAVE_DNSSD
-   DNSServiceErrorType	se;		/* dnssd errors */
-   char			*ipp_txt,	/* IPP TXT record buffer */
- 			*printer_txt,	/* LPD TXT record buffer */
--			name[1024],	/* Service name */
--			*nameptr;	/* Pointer into name */
-+			name[1024];	/* Service name */
-   int			ipp_len,	/* IPP TXT record length */
- 			printer_len,	/* LPD TXT record length */
- 			printer_port;	/* LPD port number */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  int			ret;		/* Error code */
-+  AvahiStringList	*ipp_txt,	/* IPP TXT record */
-+			*printer_txt;	/* LPD TXT record */
-+  char			name[AVAHI_LABEL_MAX],	/* Service name */
-+			fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
-+  char			*regtype_copy,	/* Writeable copy of reg type */
-+			*subtype,	/* Current service sub type */
-+			*nextsubtype;	/* Next service sub type */
-+#endif /* HAVE_AVAHI */
-+  char			*nameptr;	/* Pointer into name */
-   const char		*regtype;	/* Registration type */
- 
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+
-   cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-                   !p->ipp_ref ? "new" : "update");
--
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-+		  !p->avahi_group ? "new" : "update");
-+#endif /* HAVE_AVAHI */
-  /*
-   * If per-printer sharing was just disabled make sure we're not
-   * registered before returning.
-@@ -2686,12 +2840,36 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
-   if (p->info && strlen(p->info) > 0)
-   {
-     if (DNSSDComputerName)
--      snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
-+    {
-+     /*
-+      * Make sure there is room for at least 15 characters of
-+      * DNSSDComputerName.
-+      */
-+
-+      assert(sizeof(name) >= 15 + 4);
-+      nameptr = name + strlcpy(name, p->info,
-+			       sizeof(name) - 4 -
-+			       strnlen(DNSSDComputerName, 15));
-+      nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+      strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+    }
-     else
-       strlcpy(name, p->info, sizeof(name));
-   }
-   else if (DNSSDComputerName)
--    snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
-+  {
-+   /*
-+    * Make sure there is room for at least 15 characters of
-+    * DNSSDComputerName.
-+    */
-+
-+    assert(sizeof(name) >= 15 + 4);
-+    nameptr = name + strlcpy(name, p->info,
-+			     sizeof(name) - 4 -
-+			     strnlen(DNSSDComputerName, 15));
-+    nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+    strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+  }
-   else
-     strlcpy(name, p->name, sizeof(name));
- 
-@@ -2712,6 +2890,7 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
-   * Register IPP and (optionally) LPD...
-   */
- 
-+#ifdef HAVE_DNSSD
-   ipp_len = 0;				/* anti-compiler-warning-code */
-   ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
- 
-@@ -2884,6 +3063,209 @@ dnssdRegisterPrinter(cupsd_printer_t *p)
- 
-   if (printer_txt)
-     free(printer_txt);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  if (!AvahiCupsClient)
-+   /*
-+    * Client not running yet.  The client callback will call us again later.
-+    */
-+    return;
-+
-+  ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
-+  printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
-+  regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
-+
-+  if (p->avahi_group && p->ipp_txt && ipp_txt &&
-+      !avahi_string_list_equal (p->ipp_txt, ipp_txt))
-+  {
-+   /*
-+    * Update the existing registration...
-+    */
-+
-+    avahi_string_list_free (p->ipp_txt);
-+
-+    if (p->printer_txt)
-+      avahi_string_list_free (p->printer_txt);
-+
-+   /*
-+    * Update the service group entry.
-+    */
-+
-+    regtype_copy = strdup (regtype);
-+    subtype = strchr (regtype_copy, ',');
-+    if (subtype)
-+      *subtype = '\0';
-+
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Updating TXT record for %s (%s)", name, regtype_copy);
-+    ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+						       AVAHI_IF_UNSPEC,
-+						       AVAHI_PROTO_UNSPEC,
-+						       0, name,
-+						       regtype_copy,
-+						       NULL, ipp_txt);
-+    free (regtype_copy);
-+
-+    if (ret < 0)
-+      goto update_failed;
-+
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+							 AVAHI_IF_UNSPEC,
-+							 AVAHI_PROTO_UNSPEC,
-+							 0, name,
-+							 "_printer._tcp", NULL,
-+							 printer_txt);
-+      if (ret < 0)
-+	goto update_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+    if (ret < 0)
-+    {
-+    update_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to update TXT record for %s: %d",
-+		       name, ret);
-+      avahi_entry_group_reset (p->avahi_group);
-+      avahi_entry_group_free (p->avahi_group);
-+      p->avahi_group = NULL;
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (!p->avahi_group)
-+  {
-+   /*
-+    * Initial registration.  Use the _fax subtype for fax queues...
-+    */
-+
-+    p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
-+					    avahi_entry_group_cb,
-+					    p);
-+
-+    cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		    "Registering Avahi printer %s with name \"%s\" and "
-+		    "type \"%s\"", p->name, name, regtype);
-+
-+    if (!p->avahi_group)
-+    {
-+      ret = 0;
-+      goto add_failed;
-+    }
-+
-+   /*
-+    * Add each service type (DNSSDRegType may contain several,
-+    * separated by commas).
-+    */
-+
-+    subtype = regtype_copy = strdup (regtype);
-+    while (subtype && *subtype)
-+    {
-+      nextsubtype = strchr (subtype, ',');
-+      if (nextsubtype)
-+	*nextsubtype++ = '\0';
-+
-+      if (subtype == regtype_copy)
-+      {
-+       /*
-+	* Main type entry.
-+	*/
-+
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, regtype_copy);
-+	ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						    AVAHI_IF_UNSPEC,
-+						    AVAHI_PROTO_UNSPEC,
-+						    0, name, regtype_copy,
-+						    NULL, NULL,
-+						    DNSSDPort,
-+						    ipp_txt);
-+      }
-+      else
-+      {
-+       /*
-+	* Sub-type entry.
-+	*/
-+
-+	snprintf (fullsubtype, sizeof(fullsubtype),
-+		  "%s._sub.%s", subtype, regtype_copy);
-+	cupsdLogMessage (CUPSD_LOG_DEBUG,
-+			 "Adding TXT record for %s (%s)", name, fullsubtype);
-+	ret = avahi_entry_group_add_service_subtype (p->avahi_group,
-+						     AVAHI_IF_UNSPEC,
-+						     AVAHI_PROTO_UNSPEC,
-+						     0, name,
-+						     regtype_copy,
-+						     NULL, fullsubtype);
-+      }
-+
-+      if (ret < 0)
-+      {
-+	free (regtype_copy);
-+	goto add_failed;
-+      }
-+
-+      subtype = nextsubtype;
-+    }
-+
-+    free (regtype_copy);
-+    p->ipp_txt = ipp_txt;
-+    ipp_txt = NULL;
-+
-+    if (BrowseLocalProtocols & BROWSE_LPD)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+		      "Registering Avahi printer %s with name \"%s\" and "
-+		      "type \"_printer._tcp\"", p->name, name);
-+
-+      ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+						  AVAHI_IF_UNSPEC,
-+						  AVAHI_PROTO_UNSPEC,
-+						  0, name,
-+						  "_printer._tcp", NULL, NULL,
-+						  515,
-+						  printer_txt);
-+      if (ret < 0)
-+	goto add_failed;
-+
-+      p->printer_txt = printer_txt;
-+      printer_txt = NULL;
-+    }
-+
-+    ret = avahi_entry_group_commit (p->avahi_group);
-+
-+    if (ret < 0)
-+    {
-+    add_failed:
-+      cupsdLogMessage (CUPSD_LOG_ERROR,
-+		       "Failed to add Avahi entry for %s: %d",
-+		       name, ret);
-+      if (p->avahi_group)
-+      {
-+	avahi_entry_group_reset (p->avahi_group);
-+	avahi_entry_group_free (p->avahi_group);
-+	p->avahi_group = NULL;
-+      }
-+      ipp_txt = p->ipp_txt;
-+      p->ipp_txt = NULL;
-+    }
-+  }
-+
-+  if (ipp_txt)
-+    avahi_string_list_free (ipp_txt);
-+
-+  if (printer_txt)
-+    avahi_string_list_free (printer_txt);
-+#endif /* HAVE_AVAHI */
- }
- 
- 
-@@ -2896,6 +3278,10 @@ dnssdStop(void)
- {
-   cupsd_printer_t	*p;		/* Current printer */
- 
-+#ifdef HAVE_DNSSD
-+  if (!DNSSDRef)
-+    return;
-+#endif /* HAVE_DNSSD */
- 
-  /*
-   * De-register the individual printers
-@@ -2910,12 +3296,23 @@ dnssdStop(void)
-   * Shutdown the rest of the service refs...
-   */
- 
-+#ifdef HAVE_DNSSD
-   if (WebIFRef)
-   {
-     DNSServiceRefDeallocate(WebIFRef);
-     WebIFRef = NULL;
-   }
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  if (AvahiWebIFGroup)
-+  {
-+    avahi_entry_group_reset (AvahiWebIFGroup);
-+    avahi_entry_group_free (AvahiWebIFGroup);
-+    AvahiWebIFGroup = NULL;
-+  }
-+#endif /* HAVE_AVAHI */
- 
-+#ifdef HAVE_DNSSD
-   if (RemoteRef)
-   {
-     DNSServiceRefDeallocate(RemoteRef);
-@@ -2926,14 +3323,17 @@ dnssdStop(void)
- 
-   DNSServiceRefDeallocate(DNSSDRef);
-   DNSSDRef = NULL;
-+#endif /* HAVE_DNSSD */
- 
-   cupsArrayDelete(DNSSDPrinters);
-   DNSSDPrinters = NULL;
- 
-   DNSSDPort = 0;
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
- 
-+#ifdef HAVE_DNSSD
- /*
-  * 'dnssdUpdate()' - Handle DNS-SD queries.
-  */
-@@ -2955,6 +3355,153 @@ dnssdUpdate(void)
- #endif /* HAVE_DNSSD */
- 
- 
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
-+ *                          AvahiStringList.
-+ */
-+
-+static AvahiStringList *		/* O - new string list */
-+avahiPackTxtRecord(char *keyvalue[][2],	/* I - Table of key value pairs */
-+		   int count)		/* I - Number of items in table */
-+{
-+  AvahiStringList *strlst = NULL;
-+  char **elements;
-+  size_t len;
-+  int i = 0;
-+
-+  elements = malloc ((1 + count) * sizeof (char *));
-+  if (!elements)
-+    goto cleanup;
-+
-+  for (i = 0; i < count; i++)
-+    {
-+      len = (1 + strlen (keyvalue[i][0]) +
-+	     (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
-+      elements[i] = malloc (len * sizeof (char));
-+      if (!elements[i])
-+	goto cleanup;
-+
-+      snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
-+    }
-+
-+  strlst = avahi_string_list_new_from_array ((const char **) elements, count);
-+
-+cleanup:
-+  while (--i >= 0)
-+    free (elements[i]);
-+
-+  free (elements);
-+  return (strlst);
-+}
-+
-+
-+/*
-+ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
-+ */
-+static void
-+avahi_entry_group_cb (AvahiEntryGroup *group,
-+		      AvahiEntryGroupState state,
-+		      void *userdata)
-+{
-+  char *name;
-+
-+  if (userdata)
-+    name = ((cupsd_printer_t *) userdata)->reg_name;
-+  else
-+    name = "CUPS web interface";
-+
-+  switch (state)
-+  {
-+  case AVAHI_ENTRY_GROUP_UNCOMMITED:
-+  case AVAHI_ENTRY_GROUP_REGISTERING:
-+    break;
-+
-+  case AVAHI_ENTRY_GROUP_ESTABLISHED:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group established for %s", name);
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG,
-+		     "Avahi entry group %s has state %d",
-+		     name, state);
-+    break;
-+  }
-+}
-+
-+
-+/*
-+ * 'avahi_client_cb()' - Avahi client callback function.
-+ */
-+static void
-+avahi_client_cb (AvahiClient *client,
-+		 AvahiClientState state,
-+		 void *userdata)
-+{
-+  cupsd_printer_t *printer;
-+  switch (state)
-+  {
-+  case AVAHI_CLIENT_S_RUNNING:
-+   /*
-+    * Avahi client started successfully.
-+    */
-+    AvahiCupsClient = client;
-+    AvahiCupsClientConnecting = 0;
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
-+
-+    cupsdUpdateDNSSDName ();
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
-+	  (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
-+			      CUPS_PRINTER_SCANNER))) && printer->shared)
-+	dnssdRegisterPrinter (printer);
-+
-+    break;
-+
-+  case AVAHI_CLIENT_CONNECTING:
-+   /*
-+    * No Avahi daemon, client is waiting.
-+    */
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
-+    break;
-+
-+  case AVAHI_CLIENT_S_REGISTERING:
-+    /*
-+     * Not yet registered.
-+     */
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client registering");
-+    break;
-+
-+  case AVAHI_CLIENT_FAILURE:
-+   /*
-+    * Avahi client failed, close it to allow a clean restart.
-+    */
-+    cupsdLogMessage (CUPSD_LOG_ERROR,
-+		     "Avahi client failed, "
-+		     "closing client to allow a clean restart");
-+
-+    for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+	 printer;
-+	 printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+      dnssdDeregisterPrinter (printer);
-+
-+    avahi_client_free(client);
-+    AvahiCupsClientConnecting = 0;
-+    AvahiCupsClient = NULL;
-+
-+    break;
-+
-+  default:
-+    cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
-+  }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
-  * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
-  */
-diff -up cups-1.5.2/scheduler/dirsvc.h.avahi-5-services cups-1.5.2/scheduler/dirsvc.h
---- cups-1.5.2/scheduler/dirsvc.h.avahi-5-services	2011-03-21 02:12:14.000000000 +0000
-+++ cups-1.5.2/scheduler/dirsvc.h	2012-03-14 15:08:25.711611808 +0000
-@@ -31,6 +31,10 @@
- #  endif /* HAVE_LDAP_SSL_H */
- #endif /* HAVE_LDAP */
- 
-+#ifdef HAVE_AVAHI
-+#  include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
- /*
-  * Browse protocols...
-  */
-@@ -131,19 +135,22 @@ VAR int			PollPipe	VALUE(0);
- VAR cupsd_statbuf_t	*PollStatusBuffer VALUE(NULL);
- 					/* Status buffer for pollers */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- VAR char		*DNSSDComputerName VALUE(NULL),
- 					/* Computer/server name */
- 			*DNSSDHostName	VALUE(NULL),
- 					/* Hostname */
- 			*DNSSDRegType VALUE(NULL);
- 					/* Bonjour registration type */
--VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
--					/* List of dynamic ServerAlias's */
- VAR int			DNSSDPort	VALUE(0);
- 					/* Port number to register */
- VAR cups_array_t	*DNSSDPrinters	VALUE(NULL);
- 					/* Printers we have registered */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
-+#ifdef HAVE_DNSSD
-+VAR cups_array_t	*DNSSDAlias	VALUE(NULL);
-+					/* List of dynamic ServerAlias's */
- VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
- 					/* Master DNS-SD service reference */
- 			WebIFRef	VALUE(NULL),
-@@ -152,6 +159,17 @@ VAR DNSServiceRef	DNSSDRef	VALUE(NULL),
- 					/* Remote printer browse reference */
- #endif /* HAVE_DNSSD */
- 
-+#ifdef HAVE_AVAHI
-+VAR AvahiCupsPoll	*AvahiCupsPollHandle	VALUE(NULL);
-+					/* AvahiCupsPoll object */
-+VAR AvahiClient		*AvahiCupsClient	VALUE(NULL);
-+					/* AvahiClient object */
-+VAR int			AvahiCupsClientConnecting	VALUE(0);
-+					/* Is AvahiClient object connecting? */
-+VAR AvahiEntryGroup	*AvahiWebIFGroup	VALUE(NULL);
-+					/* Web interface entry group */
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LIBSLP
- VAR SLPHandle		BrowseSLPHandle	VALUE(NULL);
- 					/* SLP API handle */
-@@ -195,13 +213,14 @@ extern void	cupsdRegisterPrinter(cupsd_p
- extern void	cupsdRestartPolling(void);
- extern void	cupsdSaveRemoteCache(void);
- extern void	cupsdSendBrowseList(void);
-+extern void	cupsdStartAvahiClient(void);
- extern void	cupsdStartBrowsing(void);
- extern void	cupsdStartPolling(void);
- extern void	cupsdStopBrowsing(void);
- extern void	cupsdStopPolling(void);
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- extern void	cupsdUpdateDNSSDName(void);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LDAP
- extern void	cupsdUpdateLDAPBrowse(void);
- #endif /* HAVE_LDAP */
-diff -up cups-1.5.2/scheduler/ipp.c.avahi-5-services cups-1.5.2/scheduler/ipp.c
---- cups-1.5.2/scheduler/ipp.c.avahi-5-services	2012-03-14 15:04:17.665305560 +0000
-+++ cups-1.5.2/scheduler/ipp.c	2012-03-14 15:08:25.715611813 +0000
-@@ -6099,7 +6099,7 @@ copy_printer_attrs(
-     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
-                ippTimeToDate(curtime));
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
-   {
-     if (printer->reg_name)
-@@ -6109,7 +6109,7 @@ copy_printer_attrs(
-       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
-                    "printer-dns-sd-name", 0);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
-     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -up cups-1.5.2/scheduler/main.c.avahi-5-services cups-1.5.2/scheduler/main.c
---- cups-1.5.2/scheduler/main.c.avahi-5-services	2012-03-14 15:06:36.511476986 +0000
-+++ cups-1.5.2/scheduler/main.c	2012-03-14 15:08:25.718611817 +0000
-@@ -120,6 +120,10 @@ main(int  argc,				/* I - Number of comm
-   cupsd_listener_t	*lis;		/* Current listener */
-   time_t		current_time,	/* Current time */
- 			activity,	/* Client activity timer */
-+#ifdef HAVE_AVAHI
-+			avahi_client_time, /* Time for next Avahi client
-+					      check */
-+#endif /* HAVE_AVAHI */
- 			browse_time,	/* Next browse send time */
- 			senddoc_time,	/* Send-Document time */
- 			expire_time,	/* Subscription expire time */
-@@ -672,6 +676,9 @@ main(int  argc,				/* I - Number of comm
-   */
- 
-   current_time  = time(NULL);
-+#ifdef HAVE_AVAHI
-+  avahi_client_time = current_time;
-+#endif /* HAVE_AVAHI */
-   browse_time   = current_time;
-   event_time    = current_time;
-   expire_time   = current_time;
-@@ -894,6 +901,16 @@ main(int  argc,				/* I - Number of comm
-     tmo = cupsdNextTimeout (&tmo_delay);
-     if (tmo && tmo_delay == 0)
-       cupsdRunTimeout (tmo);
-+
-+   /*
-+    * Try to restart the Avahi client every 10 seconds if needed...
-+    */
-+
-+    if ((current_time - avahi_client_time) >= 10)
-+    {
-+      avahi_client_time = current_time;
-+      cupsdStartAvahiClient();
-+    }
- #endif /* HAVE_AVAHI */
- 
- #ifndef __APPLE__
-diff -up cups-1.5.2/scheduler/printers.c.avahi-5-services cups-1.5.2/scheduler/printers.c
---- cups-1.5.2/scheduler/printers.c.avahi-5-services	2012-03-14 15:04:17.646305537 +0000
-+++ cups-1.5.2/scheduler/printers.c	2012-03-14 15:08:25.720611819 +0000
-@@ -883,9 +883,9 @@ cupsdDeletePrinter(
-   cupsdClearString(&p->alert);
-   cupsdClearString(&p->alert_description);
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   cupsdClearString(&p->pdl);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- 
-   cupsArrayDelete(p->filetypes);
- 
-@@ -3787,7 +3787,7 @@ add_printer_formats(cupsd_printer_t *p)
-     attr->values[i].string.text = _cupsStrAlloc(mimetype);
-   }
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   {
-     char		pdl[1024];	/* Buffer to build pdl list */
-     mime_filter_t	*filter;	/* MIME filter looping var */
-@@ -3843,7 +3843,7 @@ add_printer_formats(cupsd_printer_t *p)
- 
-     cupsdSetString(&p->pdl, pdl);
-   }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
- 
- 
-diff -up cups-1.5.2/scheduler/printers.h.avahi-5-services cups-1.5.2/scheduler/printers.h
---- cups-1.5.2/scheduler/printers.h.avahi-5-services	2011-03-18 18:42:46.000000000 +0000
-+++ cups-1.5.2/scheduler/printers.h	2012-03-14 15:08:25.721611820 +0000
-@@ -16,6 +16,9 @@
- #ifdef HAVE_DNSSD
- #  include <dns_sd.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+#  include "avahi.h"
-+#endif /* HAVE_AVAHI */
- #include <cups/pwg-private.h>
- 
- 
-@@ -95,16 +98,23 @@ struct cupsd_printer_s
-   time_t	marker_time;		/* Last time marker attributes were updated */
-   _ppd_cache_t	*pc;			/* PPD cache and mapping data */
- 
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-   char		*reg_name,		/* Name used for service registration */
--		*pdl,			/* pdl value for TXT record */
--		*ipp_txt,		/* IPP TXT record contents */
-+		*pdl;			/* pdl value for TXT record */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+#ifdef HAVE_DNSSD
-+  char		*ipp_txt,		/* IPP TXT record contents */
- 		*printer_txt;		/* LPD TXT record contents */
-   int		ipp_len,		/* IPP TXT record length */
- 		printer_len;		/* LPD TXT record length */
-   DNSServiceRef	ipp_ref,		/* Reference for _ipp._tcp,_cups */
- 		printer_ref;		/* Reference for _printer._tcp */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+  AvahiStringList *ipp_txt,		/* IPP TXT record */
-+		*printer_txt;		/* LPD TXT record */
-+  AvahiEntryGroup *avahi_group;		/* Avahi entry group */
-+#endif /* HAVE_AVAHI */
- };
- 
- 
diff --git a/testing/cups/cups-no-export-ssllibs.patch b/testing/cups/cups-no-export-ssllibs.patch
deleted file mode 100644
index 9be3c819b..000000000
--- a/testing/cups/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs	2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-ssl.m4	2011-05-23 17:47:27.000000000 +0200
-@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
- 
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
- 
- 
diff --git a/testing/cups/cups-no-gcrypt.patch b/testing/cups/cups-no-gcrypt.patch
deleted file mode 100644
index 42f71d0d4..000000000
--- a/testing/cups/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4
---- cups-1.5.0.orig//config-scripts/cups-ssl.m4	2011-01-11 08:05:58.000000000 +0100
-+++ cups-1.5.0/config-scripts/cups-ssl.m4	2011-08-02 10:44:26.011047900 +0200
-@@ -96,7 +96,6 @@
-     dnl Then look for GNU TLS...
-     if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
-     	AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
--    	AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
- 	if $PKGCONFIG --exists gnutls; then
- 	    have_ssl=1
- 	    SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -110,16 +109,6 @@
- 	    AC_DEFINE(HAVE_SSL)
- 	    AC_DEFINE(HAVE_GNUTLS)
- 	fi
--
--	if test $have_ssl = 1; then
--            if $PKGCONFIG --exists gcrypt; then
--	        SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
--	        SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
--	    elif test "x$LIBGCRYPTCONFIG" != x; then
--	        SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
--	        SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
--	    fi
--	fi
-     fi
- 
-     dnl Check for the OpenSSL library last...
---- cups-1.5.0.orig//cups/http-private.h	2011-01-22 01:07:22.000000000 +0100
-+++ cups-1.5.0/cups/http-private.h	2011-08-02 10:42:43.341604107 +0200
-@@ -93,7 +93,6 @@
- #  elif defined HAVE_GNUTLS
- #    include <gnutls/gnutls.h>
- #    include <gnutls/x509.h>
--#    include <gcrypt.h>
- #  elif defined(HAVE_CDSASSL)
- #    include <CoreFoundation/CoreFoundation.h>
- #    include <Security/Security.h>
diff --git a/testing/cups/cups-no-gzip-man.patch b/testing/cups/cups-no-gzip-man.patch
deleted file mode 100644
index 69899b9cb..000000000
--- a/testing/cups/cups-no-gzip-man.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
---- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man	2011-05-12 07:21:56.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-manpages.m4	2011-05-23 17:25:50.000000000 +0200
-@@ -69,10 +69,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and OS X
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/testing/cups/cups-no-gzip-man.patch.16 b/testing/cups/cups-no-gzip-man.patch.16
deleted file mode 100644
index 69899b9cb..000000000
--- a/testing/cups/cups-no-gzip-man.patch.16
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
---- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man	2011-05-12 07:21:56.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-manpages.m4	2011-05-23 17:25:50.000000000 +0200
-@@ -69,10 +69,10 @@ case "$uname" in
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and OS X
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/testing/cups/cups-systemd-socket.patch b/testing/cups/cups-systemd-socket.patch
deleted file mode 100644
index 83fabdb4f..000000000
--- a/testing/cups/cups-systemd-socket.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-diff -up cups-1.6b1/config.h.in.systemd-socket cups-1.6b1/config.h.in
---- cups-1.6b1/config.h.in.systemd-socket	2012-05-17 00:57:03.000000000 +0200
-+++ cups-1.6b1/config.h.in	2012-05-28 11:16:35.657250584 +0200
-@@ -506,6 +506,13 @@
- 
- 
- /*
-+ * Do we have systemd support?
-+ */
-+
-+#undef HAVE_SYSTEMD
-+
-+
-+/*
-  * Various scripting languages...
-  */
- 
-diff -up cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket cups-1.6b1/config-scripts/cups-systemd.m4
---- cups-1.6b1/config-scripts/cups-systemd.m4.systemd-socket	2012-05-28 11:16:35.658250577 +0200
-+++ cups-1.6b1/config-scripts/cups-systemd.m4	2012-05-28 11:16:35.658250577 +0200
-@@ -0,0 +1,36 @@
-+dnl
-+dnl "$Id$"
-+dnl
-+dnl   systemd stuff for CUPS.
-+
-+dnl Find whether systemd is available
-+
-+SDLIBS=""
-+AC_ARG_WITH([systemdsystemunitdir],
-+        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
-+        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
-+if test "x$with_systemdsystemunitdir" != xno; then
-+        AC_MSG_CHECKING(for libsystemd-daemon)
-+        if $PKGCONFIG --exists libsystemd-daemon; then
-+		AC_MSG_RESULT(yes)
-+        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
-+        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
-+		AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-+		AC_DEFINE(HAVE_SYSTEMD)
-+	else
-+		AC_MSG_RESULT(no)
-+	fi
-+fi
-+
-+if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
-+        SYSTEMD_UNITS="cups.service cups.socket cups.path"
-+else
-+        SYSTEMD_UNITS=""
-+fi
-+
-+AC_SUBST(SYSTEMD_UNITS)
-+AC_SUBST(SDLIBS)
-+
-+dnl
-+dnl "$Id$"
-+dnl
-diff -up cups-1.6b1/configure.in.systemd-socket cups-1.6b1/configure.in
---- cups-1.6b1/configure.in.systemd-socket	2012-04-23 19:26:57.000000000 +0200
-+++ cups-1.6b1/configure.in	2012-05-28 11:16:35.658250577 +0200
-@@ -33,6 +33,7 @@ sinclude(config-scripts/cups-pam.m4)
- sinclude(config-scripts/cups-largefile.m4)
- sinclude(config-scripts/cups-dnssd.m4)
- sinclude(config-scripts/cups-launchd.m4)
-+sinclude(config-scripts/cups-systemd.m4)
- sinclude(config-scripts/cups-defaults.m4)
- sinclude(config-scripts/cups-scripting.m4)
- 
-@@ -66,6 +67,9 @@ AC_OUTPUT(Makedefs
- 	  conf/snmp.conf
- 	  cups-config
- 	  data/testprint
-+          data/cups.service
-+          data/cups.socket
-+          data/cups.path
- 	  desktop/cups.desktop
- 	  doc/help/ref-cupsd-conf.html
- 	  doc/help/standard.html
-diff -up cups-1.6b1/cups/usersys.c.systemd-socket cups-1.6b1/cups/usersys.c
---- cups-1.6b1/cups/usersys.c.systemd-socket	2012-04-23 19:26:57.000000000 +0200
-+++ cups-1.6b1/cups/usersys.c	2012-05-28 11:16:35.659250570 +0200
-@@ -975,7 +975,7 @@ cups_read_client_conf(
-     struct stat	sockinfo;		/* Domain socket information */
- 
-     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
--	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
-+	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
-       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
-     else
- #endif /* CUPS_DEFAULT_DOMAINSOCKET */
-diff -up cups-1.6b1/data/cups.path.in.systemd-socket cups-1.6b1/data/cups.path.in
---- cups-1.6b1/data/cups.path.in.systemd-socket	2012-05-28 11:16:35.659250570 +0200
-+++ cups-1.6b1/data/cups.path.in	2012-05-28 11:16:35.659250570 +0200
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=CUPS Printer Service Spool
-+
-+[Path]
-+PathExistsGlob=@CUPS_REQUESTS@/d*
-+
-+[Install]
-+WantedBy=multi-user.target
-diff -up cups-1.6b1/data/cups.service.in.systemd-socket cups-1.6b1/data/cups.service.in
---- cups-1.6b1/data/cups.service.in.systemd-socket	2012-05-28 11:16:35.659250570 +0200
-+++ cups-1.6b1/data/cups.service.in	2012-05-28 11:16:35.659250570 +0200
-@@ -0,0 +1,10 @@
-+[Unit]
-+Description=CUPS Printing Service
-+
-+[Service]
-+ExecStart=@sbindir@/cupsd -f
-+PrivateTmp=true
-+
-+[Install]
-+Also=cups.socket cups.path
-+WantedBy=printer.target
-diff -up cups-1.6b1/data/cups.socket.in.systemd-socket cups-1.6b1/data/cups.socket.in
---- cups-1.6b1/data/cups.socket.in.systemd-socket	2012-05-28 11:16:35.660250563 +0200
-+++ cups-1.6b1/data/cups.socket.in	2012-05-28 11:16:35.660250563 +0200
-@@ -0,0 +1,8 @@
-+[Unit]
-+Description=CUPS Printing Service Sockets
-+
-+[Socket]
-+ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
-+
-+[Install]
-+WantedBy=sockets.target
-diff -up cups-1.6b1/data/Makefile.systemd-socket cups-1.6b1/data/Makefile
---- cups-1.6b1/data/Makefile.systemd-socket	2011-08-27 11:23:01.000000000 +0200
-+++ cups-1.6b1/data/Makefile	2012-05-28 11:16:35.660250563 +0200
-@@ -100,6 +100,12 @@ install-data:
- 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
- 	done
- 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
-+	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
-+		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
-+		for file in $(SYSTEMD_UNITS); do \
-+			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
-+		done; \
-+	fi
- 
- 
- #
-@@ -143,6 +149,9 @@ uninstall:
- 	-$(RMDIR) $(DATADIR)/data
- 	-$(RMDIR) $(DATADIR)/banners
- 	-$(RMDIR) $(DATADIR)
-+	for file in $(SYSTEMD_UNITS); do \
-+		$(RM) $(SYSTEMDUNITDIR)/$$file; \
-+	done
- 
- 
- #
-diff -up cups-1.6b1/Makedefs.in.systemd-socket cups-1.6b1/Makedefs.in
---- cups-1.6b1/Makedefs.in.systemd-socket	2012-05-28 11:16:35.648250647 +0200
-+++ cups-1.6b1/Makedefs.in	2012-05-28 11:16:35.660250563 +0200
-@@ -134,11 +134,13 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
- CXXLIBS		=	@CXXLIBS@
- DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
- DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
-+SYSTEMD_UNITS   =       @SYSTEMD_UNITS@
- DNSSD_BACKEND	=	@DNSSD_BACKEND@
- DSOFLAGS	=	-L../cups @DSOFLAGS@
- DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
- DNSSDLIBS	=	@DNSSDLIBS@
- LAUNCHDLIBS	=	@LAUNCHDLIBS@
-+SDLIBS		=	@SDLIBS@
- LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
- 			-L../scheduler @LDARCHFLAGS@ \
- 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
-@@ -229,6 +231,7 @@ PAMFILE		=	@PAMFILE@
- 
- DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
- DBUSDIR		=	@DBUSDIR@
-+SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
- 
- 
- #
-diff -up cups-1.6b1/scheduler/client.h.systemd-socket cups-1.6b1/scheduler/client.h
---- cups-1.6b1/scheduler/client.h.systemd-socket	2012-03-22 21:30:20.000000000 +0100
-+++ cups-1.6b1/scheduler/client.h	2012-05-28 11:16:35.661250556 +0200
-@@ -77,6 +77,9 @@ typedef struct
-   int			fd;		/* File descriptor for this server */
-   http_addr_t		address;	/* Bind address of socket */
-   http_encryption_t	encryption;	/* To encrypt or not to encrypt... */
-+#ifdef HAVE_SYSTEMD
-+  int			is_systemd;	/* Is this a systemd socket? */
-+#endif /* HAVE_SYSTEMD */
- } cupsd_listener_t;
- 
- 
-diff -up cups-1.6b1/scheduler/listen.c.systemd-socket cups-1.6b1/scheduler/listen.c
---- cups-1.6b1/scheduler/listen.c.systemd-socket	2011-04-16 01:38:13.000000000 +0200
-+++ cups-1.6b1/scheduler/listen.c	2012-05-28 11:16:35.661250556 +0200
-@@ -401,7 +401,11 @@ cupsdStopListening(void)
-        lis;
-        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-   {
--    if (lis->fd != -1)
-+    if (lis->fd != -1
-+#ifdef HAVE_SYSTEMD
-+        && !lis->is_systemd
-+#endif /* HAVE_SYSTEMD */
-+        )
-     {
- #ifdef WIN32
-       closesocket(lis->fd);
-diff -up cups-1.6b1/scheduler/main.c.systemd-socket cups-1.6b1/scheduler/main.c
---- cups-1.6b1/scheduler/main.c.systemd-socket	2012-05-28 11:16:35.612250897 +0200
-+++ cups-1.6b1/scheduler/main.c	2012-05-28 12:49:32.698375139 +0200
-@@ -26,6 +26,8 @@
-  *   launchd_checkin()     - Check-in with launchd and collect the listening
-  *                           fds.
-  *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
-+ *   systemd_checkin()     - Check-in with systemd and collect the
-+ *                           listening fds.
-  *   parent_handler()      - Catch USR1/CHLD signals...
-  *   process_children()    - Process all dead children...
-  *   select_timeout()      - Calculate the select timeout value.
-@@ -62,6 +64,10 @@
- #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
- #endif /* HAVE_LAUNCH_H */
- 
-+#ifdef HAVE_SYSTEMD
-+#include <systemd/sd-daemon.h>
-+#endif /* HAVE_SYSTEMD */
-+
- #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
- #  include <malloc.h>
- #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-@@ -78,6 +84,9 @@
- static void		launchd_checkin(void);
- static void		launchd_checkout(void);
- #endif /* HAVE_LAUNCHD */
-+#ifdef HAVE_SYSTEMD
-+static void		systemd_checkin(void);
-+#endif /* HAVE_SYSTEMD */
- static void		parent_handler(int sig);
- static void		process_children(void);
- static void		sigchld_handler(int sig);
-@@ -528,6 +537,13 @@ main(int  argc,				/* I - Number of comm
-   }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+ /*
-+  * If we were started by systemd get the listen sockets file descriptors...
-+  */
-+  systemd_checkin();
-+#endif /* HAVE_SYSTEMD */
-+
-  /*
-   * Startup the server...
-   */
-@@ -738,6 +754,15 @@ main(int  argc,				/* I - Number of comm
- 	}
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+       /*
-+	* If we were started by systemd get the listen sockets file
-+	* descriptors...
-+        */
-+
-+        systemd_checkin();
-+#endif /* HAVE_SYSTEMD */
-+
-        /*
-         * Startup the server...
-         */
-@@ -1516,6 +1541,102 @@ launchd_checkout(void)
- }
- #endif /* HAVE_LAUNCHD */
- 
-+#ifdef HAVE_SYSTEMD
-+static void
-+systemd_checkin(void)
-+{
-+  int n, fd;
-+
-+  n = sd_listen_fds(0);
-+  if (n < 0)
-+  {
-+    cupsdLogMessage(CUPSD_LOG_ERROR,
-+           "systemd_checkin: Failed to acquire sockets from systemd - %s",
-+           strerror(-n));
-+    exit(EXIT_FAILURE);
-+    return;
-+  }
-+
-+  if (n == 0)
-+    return;
-+
-+  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
-+  {
-+    http_addr_t addr;
-+    socklen_t addrlen = sizeof (addr);
-+    int r;
-+    cupsd_listener_t *lis;
-+    char s[256];
-+
-+    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
-+    if (r < 0)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to verify socket type - %s",
-+             strerror(-r));
-+      continue;
-+    }
-+
-+    if (!r)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Socket not of the right type");
-+      continue;
-+    }
-+
-+    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
-+    {
-+      cupsdLogMessage(CUPSD_LOG_ERROR,
-+             "systemd_checkin: Unable to get local address - %s",
-+             strerror(errno));
-+      continue;
-+    }
-+
-+   /*
-+    * Try to match the systemd socket address to one of the listeners...
-+    */
-+
-+    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
-+       lis;
-+       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
-+      if (httpAddrEqual(&lis->address, &addr))
-+	break;
-+
-+    if (lis)
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Matched existing listener %s with fd %d...",
-+                      httpAddrString(&(lis->address), s, sizeof(s)), fd);
-+    }
-+    else
-+    {
-+      cupsdLogMessage(CUPSD_LOG_DEBUG,
-+                      "systemd_checkin: Adding new listener %s with fd %d...",
-+                      httpAddrString(&addr, s, sizeof(s)), fd);
-+
-+      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
-+      {
-+        cupsdLogMessage(CUPSD_LOG_ERROR,
-+                        "systemd_checkin: Unable to allocate listener - "
-+                        "%s.", strerror(errno));
-+        exit(EXIT_FAILURE);
-+      }
-+
-+      cupsArrayAdd(Listeners, lis);
-+
-+      memcpy(&lis->address, &addr, sizeof(lis->address));
-+    }
-+
-+    lis->fd = fd;
-+    lis->is_systemd = 1;
-+
-+#  ifdef HAVE_SSL
-+    if (_httpAddrPort(&(lis->address)) == 443)
-+      lis->encryption = HTTP_ENCRYPT_ALWAYS;
-+#  endif /* HAVE_SSL */
-+  }
-+}
-+#endif /* HAVE_SYSTEMD */
- 
- /*
-  * 'parent_handler()' - Catch USR1/CHLD signals...
-diff -up cups-1.6b1/scheduler/Makefile.systemd-socket cups-1.6b1/scheduler/Makefile
---- cups-1.6b1/scheduler/Makefile.systemd-socket	2012-05-21 19:40:22.000000000 +0200
-+++ cups-1.6b1/scheduler/Makefile	2012-05-28 11:16:35.663250542 +0200
-@@ -371,7 +371,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
- 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
--		$(LIBGSSAPI) $(LIBWRAP)
-+		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
- 
- cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
- 	echo Linking $@...
-@@ -379,7 +379,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
- 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
- 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
- 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
--		$(LIBWRAP)
-+		$(LIBWRAP)  $(SDLIBS)
- 
- tls.o:	tls-darwin.c tls-gnutls.c tls-openssl.c
- 
diff --git a/testing/cups/cups.install b/testing/cups/cups.install
deleted file mode 100644
index fc015f951..000000000
--- a/testing/cups/cups.install
+++ /dev/null
@@ -1,38 +0,0 @@
-post_install() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
- echo ">> If you use an HTTPS connection to CUPS, the first time you access"
- echo ">> the interface it may take a very long time before the site comes up."
- echo ">> This is because the first request triggers the generation of the CUPS"
- echo ">> SSL certificates which can be a very time-consuming job."
-}
-
-post_upgrade() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
-  if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
-    # important upgrade notice
-    echo "daemon script has been renamed to /etc/rc.d/cupsd"
-    echo "change your entry in  /etc/rc.conf"
-  fi
-  if [ "`vercmp $2 1.6.0`" -lt 0 ]; then
-    # important upgrade notice
-    echo "* avahi-daemon should now run before you start cupsd for"
-    echo "  printer Browsing support"
-    echo "* check your config with cupsd -t"
-    echo "  and fix all Browsing related settings"
-  fi
-    if [ "`vercmp $2 1.6.1-3`" -lt 0 ]; then
-    # important upgrade notice
-    echo "> It's now safe to load usblp kernel module."
-    echo "> There's no more need to blacklist it."
-  fi
-}
-
-post_remove() {
-    if [ -x usr/bin/xdg-icon-resource ]; then
-	xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-    fi
-}
diff --git a/testing/cups/cups.logrotate b/testing/cups/cups.logrotate
deleted file mode 100644
index 9c49bbdaf..000000000
--- a/testing/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cups/*log {
-   missingok
-   notifempty
-   delaycompress
-   postrotate
-      /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/testing/cups/cups.pam b/testing/cups/cups.pam
deleted file mode 100644
index 53724d1f8..000000000
--- a/testing/cups/cups.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/testing/cups/cupsd-conf-remove-obsolete-browse-directives.patch b/testing/cups/cupsd-conf-remove-obsolete-browse-directives.patch
deleted file mode 100644
index 97636c7f2..000000000
--- a/testing/cups/cupsd-conf-remove-obsolete-browse-directives.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uraN cups/conf/cupsd.conf.in cups-new/conf/cupsd.conf.in
---- cups/conf/cupsd.conf.in	2012-05-25 15:28:25.000000000 +0200
-+++ cups-new/conf/cupsd.conf.in	2012-08-04 20:56:26.699062177 +0200
-@@ -19,8 +19,6 @@
- 
- # Show shared printers on the local network.
- Browsing On
--BrowseOrder allow,deny
--BrowseAllow all
- BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
- 
- # Default authentication type, when authentication is required...
diff --git a/testing/cups/recognize-remote-cups-queue-via-dnssd-uri.patch b/testing/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
deleted file mode 100644
index 6349bd901..000000000
--- a/testing/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uraN cups/scheduler/printers.c cups-new/scheduler/printers.c
---- cups/scheduler/printers.c	2012-05-25 15:28:49.000000000 +0200
-+++ cups-new/scheduler/printers.c	2012-08-04 20:58:40.475725544 +0200
-@@ -4829,13 +4829,14 @@
- 		   "printer-make-and-model", NULL,
- 		   "Local System V Printer");
-     }
--    else if (!strncmp(p->device_uri, "ipp://", 6) &&
--	     (strstr(p->device_uri, "/printers/") != NULL ||
--	      strstr(p->device_uri, "/classes/") != NULL ||
--	      ((strstr(p->device_uri, "._ipp.") != NULL ||
--	        strstr(p->device_uri, "._ipps.") != NULL) &&
--	       !strcmp(p->device_uri + strlen(p->device_uri) - 5,
--		       "/cups"))))
-+    else if ((!strncmp(p->device_uri, "ipp://", 6) &&
-+	      (strstr(p->device_uri, "/printers/") != NULL ||
-+	       strstr(p->device_uri, "/classes/") != NULL)) ||
-+	     (!strncmp(p->device_uri, "dnssd://", 8) &&
-+	      (strstr(p->device_uri, "._ipp.") != NULL ||
-+	       strstr(p->device_uri, "._ipps.") != NULL) &&
-+	      !strcmp(p->device_uri + strlen(p->device_uri) - 5,
-+		      "/cups")))
-     {
-      /*
-       * Tell the client this is really a hard-wired remote printer.
diff --git a/testing/cups/usb-backend-reset-after-job-only-for-specific-devices.patch b/testing/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
deleted file mode 100644
index dcf91c833..000000000
--- a/testing/cups/usb-backend-reset-after-job-only-for-specific-devices.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- backend/usb-libusb.c.orig	2012-07-16 19:10:55.000000000 +0200
-+++ backend/usb-libusb.c	2012-08-06 11:01:58.034150159 +0200
-@@ -70,7 +70,7 @@
- 			read_endp,	/* Read endpoint */
- 			protocol,	/* Protocol: 1 = Uni-di, 2 = Bi-di. */
- 			usblp_attached,	/* "usblp" kernel module attached? */
--			opened_for_job;	/* Set to 1 by print_device() */
-+			reset_after_job; /* Set to 1 by print_device() */
-   unsigned int		quirks;		/* Quirks flags */
-   struct libusb_device_handle *handle;	/* Open handle to device */
- } usb_printer_t;
-@@ -122,6 +122,8 @@
- #define USBLP_QUIRK_USB_INIT	0x2	/* needs vendor USB init string */
- #define USBLP_QUIRK_BAD_CLASS	0x4	/* descriptor uses vendor-specific
- 					   Class or SubClass */
-+#define USBLP_QUIRK_RESET	0x4000	/* After printing do a reset
-+					   for clean-up */
- #define USBLP_QUIRK_NO_REATTACH	0x8000	/* After printing we cannot re-attach
- 					   the usblp kernel module */
- 
-@@ -147,9 +149,11 @@
- 	{ 0x04b8, 0x0202, USBLP_QUIRK_BAD_CLASS }, /* Seiko Epson Receipt
- 						      Printer M129C */
- 	{ 0x067b, 0x2305, USBLP_QUIRK_BIDIR |
--			  USBLP_QUIRK_NO_REATTACH },
-+			  USBLP_QUIRK_NO_REATTACH |
-+	                  USBLP_QUIRK_RESET },
- 	/* Prolific Technology, Inc. PL2305 Parallel Port
- 	   (USB -> Parallel adapter) */
-+	{ 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices */
- 	{ 0, 0 }
- };
- 
-@@ -256,7 +260,12 @@
-   }
- 
-   g.print_fd = print_fd;
--  g.printer->opened_for_job = 1;
-+
-+ /*
-+  * Some devices need a reset after finishing a job, these devices are
-+  * marked with the USBLP_QUIRK_RESET quirk.
-+  */
-+  g.printer->reset_after_job = (g.printer->quirks & USBLP_QUIRK_RESET ? 1 : 0);
- 
-  /*
-   * If we are printing data from a print driver on stdin, ignore SIGTERM
-@@ -772,7 +781,7 @@
-     * Reset the device to clean up after the job
-     */
- 
--    if (printer->opened_for_job == 1)
-+    if (printer->reset_after_job == 1)
-     {
-       if ((errcode = libusb_reset_device(printer->handle)) < 0)
- 	fprintf(stderr,
-@@ -1288,7 +1297,7 @@
-   }
- 
-   printer->usblp_attached = 0;
--  printer->opened_for_job = 0;
-+  printer->reset_after_job = 0;
- 
-   if (verbose)
-     fputs("STATE: +connecting-to-device\n", stderr);
-@@ -1586,7 +1595,7 @@
-   for (i = 0; quirk_printers[i].vendorId; i++)
-   {
-     if (vendor == quirk_printers[i].vendorId &&
--	product == quirk_printers[i].productId)
-+	(product == 0x0000 || product == quirk_printers[i].productId))
-       return quirk_printers[i].quirks;
-   }
-   return 0;
diff --git a/testing/curl/PKGBUILD b/testing/curl/PKGBUILD
deleted file mode 100644
index 8b6373338..000000000
--- a/testing/curl/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 168414 2012-10-11 14:27: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.28.0
-pkgrel=1
-pkgdesc="An URL retrieval utility and library"
-arch=('i686' 'x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
-        curlbuild.h)
-md5sums=('cbdc0a79bdf6e657dd387c3d88d802e3'
-         '7359e07276cdaff6317bbc39e6d5899c'
-         '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/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 b6c2a29bc..000000000
--- a/testing/cyrus-sasl/PKGBUILD
+++ /dev/null
@@ -1,203 +0,0 @@
-# $Id: PKGBUILD 165399 2012-08-17 23:39:59Z heftig $
-# 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=10
-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.service
-        saslauthd.conf.d
-        saslauthd)
-md5sums=('2eb0e48106f0e9cd8001e654f267ecbc'
-         'e27ddff076342e7a3041c4759817d04b'
-         'd7e6886e88af04d05f3dec7f0a59ccf7'
-         '79b8a5e8689989e2afd4b7bda595a7b1'
-         'f4131b077ddb5240b375d749162f1b7a'
-         'c7ad2c70c1ef814eb4b119f316c064f2'
-         'caeeac3feba19cbbd36e7345cc805600'
-         'f45d8b60e8f74dd7f7c2ec1665fa602a'
-         '9d93880514cb5ff5da969f1ceb64a661'
-         'dfdc052a7e678db9f687482c5d52f34e'
-         '4a09f6b24b91f8450892a78e378860da'
-         '213abe7c5dfe0d7f446992787da1e780'
-         '5a0321177ad30cb5518c8b6812e3961a'
-         '0c965748970eea29fa295524821d43f0'
-         '62bf892fe4d1df41ff748e91a1afaf67'
-         'b7848957357e7c02d6490102be496bf9'
-         'd86a5aa2e3b5b7c1bad6f8b548b7ea36'
-         '8e7106f32e495e9ade69014fd1b3352a'
-         '00f6b781549a274630e22173f77bd41d'
-         '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}")
-  pkgdesc="Cyrus saslauthd SASL authentication daemon"
-  backup=('etc/conf.d/saslauthd')
-
-  cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
-  make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/saslauthd"
-  install -Dm644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
-  install -Dm644 "${srcdir}/saslauthd.service" "${pkgdir}/usr/lib/systemd/system/saslauthd.service"
-
-  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}" '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}" '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}" '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/cyrus-sasl/saslauthd.service b/testing/cyrus-sasl/saslauthd.service
deleted file mode 100644
index 42d8ad768..000000000
--- a/testing/cyrus-sasl/saslauthd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Cyrus SASL authentication daemon
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/saslauthd
-ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS
-PidFile=/var/run/saslauthd/saslauthd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD
deleted file mode 100644
index d5486fe00..000000000
--- a/testing/dbus-core/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 167237 2012-09-29 08:09:25Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus-core
-pkgver=1.6.8
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') # shadow for install scriptlet FS#29341
-makedepends=('libx11')
-options=(!libtool)
-install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
-        dbus)
-md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
-         'f0364f3f5dc5f653bb05d39aa36e3264')
-
-build() {
-  cd dbus-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/run/dbus/pid \
-      --with-system-socket=/run/dbus/system_bus_socket \
-      --with-console-auth-dir=/run/console/ \
-      --enable-inotify --disable-dnotify \
-      --disable-verbose-mode --disable-static \
-      --disable-tests --disable-asserts \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --enable-systemd
-  make
-}
-
-package(){
-  cd dbus-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir/usr/bin/dbus-launch"
-  rm -f "$pkgdir/usr/share/man/man1/dbus-launch.1"
-  rm -rf "$pkgdir/var/run"
-
-  install -m755 -d "$pkgdir/etc/rc.d"
-  install -m755 ../dbus "$pkgdir/etc/rc.d/"
-
-  #Fix configuration file
-  sed -i -e 's|<user>81</user>|<user>dbus</user>|' "$pkgdir/etc/dbus-1/system.conf"
-
-  install -dm755 "$pkgdir/usr/share/licenses/dbus-core"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/dbus-core/"
-}
diff --git a/testing/dbus-core/dbus b/testing/dbus-core/dbus
deleted file mode 100644
index bf532a274..000000000
--- a/testing/dbus-core/dbus
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case $1 in
-    start)
-        stat_busy "Starting D-BUS system messagebus"
-        if [[ ! -d /run/dbus ]] ; then
-            install -m755 -g 81 -o 81 -d /run/dbus
-        fi
-
-        if ! dbus-daemon --system; then
-            stat_fail
-        else
-            add_daemon dbus
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping D-BUS system messagebus"
-        if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
-            stat_fail
-        else
-            rm -f /run/dbus/pid
-            rm_daemon dbus
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-    reload)
-        stat_busy "Reloading D-BUS configuration"
-        if ! { [[ -f /run/dbus/pid ]] && dbus-send \
-                --system --type=method_call \
-                --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig; }; then
-            stat_fail
-        else
-            stat_done
-        fi
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|reload}"
-        ;;
-esac
-exit 0
diff --git a/testing/dbus-core/dbus.install b/testing/dbus-core/dbus.install
deleted file mode 100644
index f1ffd61a8..000000000
--- a/testing/dbus-core/dbus.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-  getent group dbus >/dev/null || groupadd -g 81 dbus
-  getent passwd dbus >/dev/null || useradd -c 'System message bus' -u 81 -g dbus -d '/' -s /bin/false dbus
-  passwd -l dbus &>/dev/null
-}
-
-post_upgrade() {
-  post_install
-
-  # Make sure new rc script can shutdown running dbus
-  if [ -f run/dbus.pid -a -d run/dbus ]; then
-    mv run/dbus.pid run/dbus/pid
-  fi
-}
-
-post_remove() {
-  if getent passwd dbus >/dev/null; then
-    userdel dbus
-  fi
-  if getent group dbus >/dev/null; then
-    groupdel dbus
-  fi
-}
diff --git a/testing/dbus-python/PKGBUILD b/testing/dbus-python/PKGBUILD
deleted file mode 100644
index 69caec8f6..000000000
--- a/testing/dbus-python/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 168835 2012-10-16 11:53:35Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=dbus-python
-pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
-pkgver=1.1.1
-pkgrel=2
-pkgdesc="Python bindings for DBUS"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-url="http://www.freedesktop.org/wiki/Software/DBusBindings"
-makedepends=('docutils' 'dbus-glib' 'python' 'python2')
-options=('!libtool')
-source=(http://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz)
-md5sums=('742c7432ad0f7c3f98291d58fa2e35dc')
-
-build() {
-  cd "${srcdir}"
-  mkdir build-python2 build-python3
-  cd "${srcdir}/build-python2"
-  PYTHON=python2 ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  make
-
-
-  cd "${srcdir}/build-python3"
-  ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  make
-}
-
-package_python-dbus-common() {
-  pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus"
-  conflicts=('dbus-python<1.1.0')
-
-  cd "${srcdir}/build-python3"
-  make DESTDIR="${pkgdir}" install-data
-  rm -rf "${pkgdir}"/usr/lib/python*
-}
-
-package_python-dbus() {
-  depends=('python-dbus-common' 'python' 'dbus-core')
-  optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 3.3 bindings for DBUS"
-
-  cd "${srcdir}/build-python3"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-}
-
-package_python2-dbus() {
-  depends=('python-dbus-common' 'python2' 'dbus-core')
-  optdepends=('dbus-glib: glib mainloop support')
-  pkgdesc="Python 2.7 bindings for DBUS"
-  replaces=('dbus-python')
-  conflicts=('dbus-python')
-  provides=("dbus-python=$pkgver")
-
-  cd "${srcdir}/build-python2"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-}
diff --git a/testing/dbus/30-dbus b/testing/dbus/30-dbus
deleted file mode 100644
index 69d2660da..000000000
--- a/testing/dbus/30-dbus
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  eval `$dbuslaunch --sh-syntax --exit-with-session`
-fi
diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD
deleted file mode 100644
index 5f2fbf835..000000000
--- a/testing/dbus/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 167239 2012-09-29 08:11:40Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-#
-pkgname=dbus
-pkgver=1.6.8
-pkgrel=1
-pkgdesc="Freedesktop.org message bus system"
-url="http://www.freedesktop.org/Software/dbus"
-arch=(i686 x86_64)
-license=('GPL' 'custom')
-depends=("dbus-core>=$pkgver" 'libx11')
-source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz #{,.asc}
-        30-dbus)
-md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
-         '9fafe8b28460aeaa6054309ef4c5ed92')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=81 \
-      --with-system-pid-file=/var/run/dbus.pid \
-      --disable-verbose-mode --disable-static \
-      --enable-inotify --disable-dnotify \
-      --disable-tests --disable-asserts
-  make -C tools dbus-launch
-}
-
-package() {
-  cd $pkgname-$pkgver
-  install -m755 -d "$pkgdir/usr/bin"
-  install -m755 -d "$pkgdir/usr/share/man/man1"
-  install -m755 tools/dbus-launch "$pkgdir/usr/bin/"
-  install -m644 doc/dbus-launch.1 "$pkgdir/usr/share/man/man1/"
-
-  install -m755 -d "$pkgdir/etc/X11/xinit/xinitrc.d"
-  install -m755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/"
-
-  install -d -m755 "$pkgdir/usr/share/licenses/dbus"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/dbus/"
-}
diff --git a/testing/dconf/PKGBUILD b/testing/dconf/PKGBUILD
deleted file mode 100644
index 0bf1ed1c7..000000000
--- a/testing/dconf/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169264 2012-10-18 19:29:07Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=dconf
-pkgver=0.14.0
-pkgrel=1
-pkgdesc="A low-level configuration system."
-arch=(i686 x86_64)
-url="http://live.gnome.org/dconf"
-license=('LGPL2.1')
-depends=('glib2' 'gtk-update-icon-cache')
-makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl')
-optdepends=('gtk3: for dconf-editor')
-install=dconf.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9ae848bf25c3de0fb8c0157679630ddf39be1c10ed2f3beb2b8f0165d768da33')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/dconf
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/dconf/dconf.install b/testing/dconf/dconf.install
deleted file mode 100644
index 75d713d64..000000000
--- a/testing/dconf/dconf.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    gio-querymodules /usr/lib/gio/modules
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade(){
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/ddrescue/PKGBUILD b/testing/ddrescue/PKGBUILD
deleted file mode 100644
index 13824ccab..000000000
--- a/testing/ddrescue/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 163956 2012-07-22 18:33:26Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ddrescue
-pkgver=1.16
-pkgrel=2
-pkgdesc="GNU data recovery tool"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/ddrescue/ddrescue.html"
-license=('GPL3')
-depends=('gcc-libs')
-install=$pkgname.install
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-        "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig")
-md5sums=('57b67407e882c6418531d48a2f20d16b'
-         'bf072280587665d82829be15eb6fc9ad')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  rm "$pkgdir"/usr/share/info/dir
-}
diff --git a/testing/ddrescue/ddrescue.install b/testing/ddrescue/ddrescue.install
deleted file mode 100644
index 9e2afa74e..000000000
--- a/testing/ddrescue/ddrescue.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(ddrescue.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/devhelp/PKGBUILD b/testing/devhelp/PKGBUILD
deleted file mode 100644
index d5b880feb..000000000
--- a/testing/devhelp/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169263 2012-10-18 19:29:04Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Link Dupont <link@subpop.net>
-
-pkgname=devhelp
-pkgver=3.6.0
-pkgrel=2
-pkgdesc="API documentation browser for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/devhelp/"
-depends=('gconf' 'webkitgtk3' 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool' 'python2')
-options=('!libtool' '!emptydirs')
-install=devhelp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('bf0576d5d70496367ccb22be53be620bbfe341bd491c1d725cfb59d566769fe1')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --with-webkit2
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain devhelp ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/devhelp/devhelp.install b/testing/devhelp/devhelp.install
deleted file mode 100644
index 4db5f6e5c..000000000
--- a/testing/devhelp/devhelp.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=devhelp
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/dhcp/PKGBUILD b/testing/dhcp/PKGBUILD
deleted file mode 100644
index 31ace7328..000000000
--- a/testing/dhcp/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id: PKGBUILD 165396 2012-08-17 23:27:19Z heftig $
-# Maintainer: Daniel Isenmann <daniel @archlinux.org>
-
-pkgbase=dhcp
-pkgname=('dhcp' 'dhclient')
-
-# separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.1
-_pkgver=4.2.4-P1
-
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('custom:isc-dhcp')
-url="https://www.isc.org/software/dhcp"
-makedepends=('bash' 'iproute2' 'net-tools')
-source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
-        dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
-        dhcp-4.1.1-missing-ipv6-not-fatal.patch
-        dhclient-script-pathFixes.patch)
-md5sums=('0ca7181024651f6323951d5498c8020b'
-         '0dfe000dd88555ea06b282ae5e574d5f'
-         'c49b1497837ba56c54e401a66e1bab9b'
-         '12c2f3ae47ed23eb698eb7f1bfd80f20'
-         '8f357e46e1efcbb746f38737a3f977a2'
-         '1076444f22e13eb5f6bff7821fd0f446'
-         '9310f2d8b1d7e97ace06d68cb41d9998'
-         'fd64aeb4f399dcc41ea43089a3811094'
-         '541b415a25a169eaf64b681405f79a80')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
-
-  # Define _GNU_SOURCE to fix IPV6.
-  sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
-
-  # Make not having ipv6 non-fatal.
-  patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-srv-lease-file=/var/state/dhcp/dhcpd.leases \
-      --with-srv6-lease-file=/var/state/dhcp/dhcpd6.leases \
-      --with-cli-lease-file=/var/state/dhclient/dhclient.leases \
-      --with-cli6-lease-file=/var/state/dhclient/dhclient6.leases
-
-  make
-
-  patch -i "${srcdir}/dhclient-script-pathFixes.patch" client/scripts/linux
-}
-
-package_dhcp(){
-  pkgdesc="A DHCP server, client, and relay agent"
-  depends=('openssl>=0.9.8a')
-  backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
-  install=dhcp.install
-  
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m755 "${srcdir}/dhcp4" "${pkgdir}/etc/rc.d/dhcp4"
-  install -D -m755 "${srcdir}/dhcp6" "${pkgdir}/etc/rc.d/dhcp6"
-  install -D -m644 "${srcdir}/dhcp" "${pkgdir}/etc/conf.d/${pkgbase}"
-  install -d "${pkgdir}/var/state/dhcp"
-
-  install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
-  install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service"
-  ln -s dhcpd4.service "${pkgdir}/usr/lib/systemd/system/dhcp4.service"
-  ln -s dhcpd6.service "${pkgdir}/usr/lib/systemd/system/dhcp6.service"
-
-  # Remove dhclient
-  make -C client DESTDIR="${pkgdir}" uninstall
-  
-  # install license
-  install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhcp/LICENSE"
-}
-
-package_dhclient(){
-  pkgdesc="A standalone DHCP client from the dhcp package"
-  depends=('bash' 'iproute2' 'net-tools')
-
-  cd "${srcdir}/${pkgbase}-${_pkgver}"
-  make -C client DESTDIR="${pkgdir}" install
-
-  # move dhclient.conf to dhclient.conf.example
-  mv "${pkgdir}"/etc/dhclient.conf{,.example}
-  
-  install -d "${pkgdir}/var/state/dhclient"
-
-  # install dhclient linux script
-  install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"
-
-  # install license
-  install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE"
-}
diff --git a/testing/dhcp/dhclient-script-pathFixes.patch b/testing/dhcp/dhclient-script-pathFixes.patch
deleted file mode 100644
index a4143ddde..000000000
--- a/testing/dhcp/dhclient-script-pathFixes.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- linux	2011-05-18 20:01:54.000000000 +0000
-+++ linux_new	2011-12-21 18:45:41.487171012 +0000
-@@ -23,7 +23,7 @@
- # of the $1 in its args.
- 
- # 'ip' just looks too weird.  /sbin/ip looks less weird.
--ip=/sbin/ip
-+ip=/usr/sbin/ip
- 
- make_resolv_conf() {
-   if [ x"$new_domain_name_servers" != x ]; then
-@@ -122,9 +122,9 @@
- if [ x$reason = xPREINIT ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Bring down alias interface. Its routes will disappear too.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
--  ifconfig $interface 0 up
-+  /sbin/ifconfig $interface 0 up
- 
-   # We need to give the kernel some time to get the interface up.
-   sleep 1
-@@ -151,25 +151,25 @@
-   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
- 		[ x$alias_ip_address != x$old_ip_address ]; then
-     # Possible new alias. Remove old alias.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
-   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
-     # IP address changed. Bringing down the interface will delete all routes,
-     # and clear the ARP cache.
--    ifconfig $interface inet 0 down
-+    /sbin/ifconfig $interface inet 0 down
- 
-   fi
-   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
- 
--    ifconfig $interface inet $new_ip_address $new_subnet_arg \
-+    /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg $mtu_arg
-     # Add a network route to the computed network address.
-     for router in $new_routers; do
-       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	route add -host $router dev $interface
-+	/sbin/route add -host $router dev $interface
-       fi
--      route add default gw $router $metric_arg dev $interface
-+      /sbin/route add default gw $router $metric_arg dev $interface
-     done
-   else
-     # we haven't changed the address, have we changed other options           
-@@ -177,21 +177,21 @@
-     if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
-       # if we've changed routers delete the old and add the new.
-       for router in $old_routers; do
--        route del default gw $router
-+        /sbin/route del default gw $router
-       done
-       for router in $new_routers; do
-         if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	  route add -host $router dev $interface
-+	  /sbin/route add -host $router dev $interface
- 	fi
--	route add default gw $router $metric_arg dev $interface
-+	/sbin/route add default gw $router $metric_arg dev $interface
-       done
-     fi
-   fi
-   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
-    then
--    ifconfig $interface:0- inet 0
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    /sbin/ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+    /sbin/route add -host $alias_ip_address $interface:0
-   fi
-   make_resolv_conf
-   exit_with_hooks 0
-@@ -201,42 +201,42 @@
-    || [ x$reason = xSTOP ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Turn off alias interface.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
-   if [ x$old_ip_address != x ]; then
-     # Shut down interface, which will delete routes and clear arp cache.
--    ifconfig $interface inet 0 down
-+    /sbin/ifconfig $interface inet 0 down
-   fi
-   if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+    /sbin/route add -host $alias_ip_address $interface:0
-   fi
-   exit_with_hooks 0
- fi
- 
- if [ x$reason = xTIMEOUT ]; then
-   if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
--  ifconfig $interface inet $new_ip_address $new_subnet_arg \
-+  /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg $mtu_arg
-   set $new_routers
-   if ping -q -c 1 $1; then
-     if [ x$new_ip_address != x$alias_ip_address ] && \
- 			[ x$alias_ip_address != x ]; then
--      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--      route add -host $alias_ip_address dev $interface:0
-+      /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+      /sbin/route add -host $alias_ip_address dev $interface:0
-     fi
-     for router in $new_routers; do
-       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	route add -host $router dev $interface
-+	/sbin/route add -host $router dev $interface
-       fi
--      route add default gw $router $metric_arg dev $interface
-+      /sbin/route add default gw $router $metric_arg dev $interface
-     done
-     make_resolv_conf
-     exit_with_hooks 0
-   fi
--  ifconfig $interface inet 0 down
-+  /sbin/ifconfig $interface inet 0 down
-   exit_with_hooks 1
- fi
- 
diff --git a/testing/dhcp/dhcp b/testing/dhcp/dhcp
deleted file mode 100644
index d4f228d9c..000000000
--- a/testing/dhcp/dhcp
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-# ipv4 runtime parameters
-DHCP4_ARGS="-q"
-
-# ipv6 runtime parameters
-DHCP6_ARGS="-q"
-
diff --git a/testing/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch b/testing/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch
deleted file mode 100644
index cc5ddb843..000000000
--- a/testing/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- common/discover.c	2009-09-29 21:44:49.000000000 +0200
-+++ common/discover.c_new	2010-06-30 19:40:02.000000000 +0200
-@@ -443,7 +443,7 @@
- 	}
- 
- #ifdef DHCPv6
--	if (local_family == AF_INET6) {
-+	if ((local_family == AF_INET6) && !access("/proc/net/if_inet6", R_OK)) {
- 		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
- 		if (ifaces->fp6 == NULL) {
- 			log_error("Error opening '/proc/net/if_inet6' to "
-@@ -454,6 +454,8 @@
- 			ifaces->fp = NULL;
- 			return 0;
- 		}
-+	} else {
-+		ifaces->fp6 = NULL;
- 	}
- #endif
- 
-@@ -721,7 +723,7 @@
- 		return 1;
- 	}
- #ifdef DHCPv6
--	if (!(*err)) {
-+	if (!(*err) && ifaces->fp6) {
- 		if (local_family == AF_INET6)
- 			return next_iface6(info, err, ifaces);
- 	}
-@@ -740,7 +742,8 @@
- 	ifaces->sock = -1;
- #ifdef DHCPv6
- 	if (local_family == AF_INET6) {
--		fclose(ifaces->fp6);
-+		if(ifaces->fp6)
-+			fclose(ifaces->fp6);
- 		ifaces->fp6 = NULL;
- 	}
- #endif
diff --git a/testing/dhcp/dhcp.conf.d b/testing/dhcp/dhcp.conf.d
deleted file mode 100644
index 99ba6d13d..000000000
--- a/testing/dhcp/dhcp.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP server daemon
-#
-
-DHCP_ARGS="-q"
-
diff --git a/testing/dhcp/dhcp.install b/testing/dhcp/dhcp.install
deleted file mode 100644
index 5302be4b5..000000000
--- a/testing/dhcp/dhcp.install
+++ /dev/null
@@ -1,18 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  [ -f var/state/dhcp/dhcpd.leases ] || : >var/state/dhcp/dhcpd.leases
-  [ -f var/state/dhcp/dhcpd6.leases ] || : >var/state/dhcp/dhcpd6.leases
-  #echo "If dhcpd doesn't start, ensure the ipv6 kernel module is loaded."
-
-  echo
-  echo "==> The dhcp server has now two rc.d scripts."
-  echo "==> Use '/etc/rc.d/dhcp6' to use IPv6 dhcp server or"
-  echo "==> '/etc/rc.d/dhcp4' to use IPv4 dhcp server."
-  echo "==> Make sure that you change your DAEMONS array in '/etc/rc.conf'!"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
diff --git a/testing/dhcp/dhcp4 b/testing/dhcp/dhcp4
deleted file mode 100644
index 8e1277a37..000000000
--- a/testing/dhcp/dhcp4
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcpd.pid"
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID < "$PIDFILE"
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-    echo 'pid not found. deleteing stale pidfile'
-    unset PID
-    rm -f "$PIDFILE"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting DHCPv4 Server"
-    if [[ $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if /usr/sbin/dhcpd -4 -pf "$PIDFILE" $DHCP4_ARGS; then
-      add_daemon dhcp4
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCPv4 Server"
-    if [[ ! $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
-      rm_daemon dhcp4
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
diff --git a/testing/dhcp/dhcp6 b/testing/dhcp/dhcp6
deleted file mode 100644
index 6b4b4d359..000000000
--- a/testing/dhcp/dhcp6
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcp6.pid"
-
-if [[ -f $PIDFILE ]]; then
-  read -r PID < "$PIDFILE"
-
-  # prevent stale pidfiles from hanging around
-  if [[ ! -d /proc/$PID ]]; then
-    echo 'pid not found. deleteing stale pidfile'
-    unset PID
-    rm -f "$PIDFILE"
-  fi
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting DHCPv6 Server"
-    if [[ $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if /usr/sbin/dhcpd -6 -pf "$PIDFILE" $DHCP6_ARGS; then
-      add_daemon dhcp6
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCPv6 Server"
-    if [[ ! $PID ]]; then
-      stat_fail
-      exit 1
-    fi
-    if { kill $PID && rm -f "$PIDFILE"; } &>/dev/null; then
-      rm_daemon dhcp6
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
diff --git a/testing/dhcp/dhcpd b/testing/dhcp/dhcpd
deleted file mode 100755
index 1fbb31e7c..000000000
--- a/testing/dhcp/dhcpd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/dhcp
-
-PIDFILE="/var/run/dhcpd.pid"
-PID=`cat $PIDFILE 2>/dev/null`
-case "$1" in
-  start)
-    stat_busy "Starting DHCP Server"
-    if [ "$PID" = "" ]; then 
-       /usr/sbin/dhcpd $DHCP_ARGS 
-    fi
-    if [ "$PID" != "" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon dhcpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DHCP Server"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    rm -f $PIDFILE
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dhcpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/dhcp/dhcpd4.service b/testing/dhcp/dhcpd4.service
deleted file mode 100644
index 2ef4a9f26..000000000
--- a/testing/dhcp/dhcpd4.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=IPv4 DHCP server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpd4.pid
-ExecStart=/usr/sbin/dhcpd -4 -q -pf /run/dhcpd4.pid
-ExecReload=/bin/kill -TERM $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/dhcp/dhcpd6.service b/testing/dhcp/dhcpd6.service
deleted file mode 100644
index eb3b337c6..000000000
--- a/testing/dhcp/dhcpd6.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=IPv6 DHCP server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpd6.pid
-ExecStart=/usr/sbin/dhcpd -6 -q -pf /run/dhcpd6.pid
-ExecReload=/bin/kill -TERM $MAINPID
-KillSignal=SIGINT
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch b/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch
deleted file mode 100644
index 4420d0b63..000000000
--- a/testing/dhcpcd/0001-Set-hostname-via-proc-if-file-is-available.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d345b36b483fec8fb2def5f3acdc2d3c5faa94eb Mon Sep 17 00:00:00 2001
-From: Dan McGee <dan@archlinux.org>
-Date: Sun, 19 Jun 2011 16:04:25 -0500
-Subject: [PATCH] Set hostname via /proc if file is available
-
-On Linux, the hostname can be set via this file if available, precluding
-the need for a `hostname` binary.
-
-Signed-off-by: Dan McGee <dan@archlinux.org>
----
- dhcpcd-hooks/30-hostname |    6 +++++-
- 1 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/dhcpcd-hooks/30-hostname b/dhcpcd-hooks/30-hostname
-index 65d1a13..af94262 100644
---- a/dhcpcd-hooks/30-hostname
-+++ b/dhcpcd-hooks/30-hostname
-@@ -21,7 +21,11 @@ need_hostname()
- try_hostname()
- {
- 	if valid_domainname "$1"; then
--		hostname "$1"
-+		if [ -w /proc/sys/kernel/hostname ]; then
-+			echo "$1" > /proc/sys/kernel/hostname
-+		else
-+			hostname "$1"
-+		fi
- 	else
- 		syslog err "Invalid hostname: $1"
- 	fi
--- 
-1.7.5.4
-
diff --git a/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch b/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch
deleted file mode 100644
index 7e78ecd0d..000000000
--- a/testing/dhcpcd/0001-set-MTU-via-sysfs-if-file-is-available.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 950c00d1b183796034d227ef47a90eb248d79b72 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <d@falconindy.com>
-Date: Tue, 21 Jun 2011 09:32:47 -0400
-Subject: [PATCH] set MTU via sysfs if file is available
-
-On Linux, a network interface's MTU can be set by writing to
-/sys/class/net/$interface/mtu, which removes the dependency on ifconfig.
-
-Signed-off-by: Dave Reisner <d@falconindy.com>
----
- dhcpcd-hooks/10-mtu |    4 ++--
- dhcpcd-run-hooks.in |   11 +++++++++++
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/dhcpcd-hooks/10-mtu b/dhcpcd-hooks/10-mtu
-index 639697c..8763930 100644
---- a/dhcpcd-hooks/10-mtu
-+++ b/dhcpcd-hooks/10-mtu
-@@ -7,7 +7,7 @@ if [ "$reason" = PREINIT -a -e "$mtu_dir/$interface" ]; then
- elif [ -n "$new_interface_mtu" ] && $if_up; then
- 	# The smalled MTU dhcpcd can work with is 576
- 	if [ "$new_interface_mtu" -ge 576 ]; then
--		if ifconfig "$interface" mtu "$new_interface_mtu"; then
-+		if set_mtu "$interface" "$new_interface_mtu"; then
- 			syslog info "$interface: MTU set to $new_interface_mtu"
- 			# Save the MTU so we can restore it later
- 			if [ ! -e "$mtu_dir/$interface" ]; then
-@@ -21,7 +21,7 @@ elif [ -e "$mtu_dir/$interface" ]; then
- 		# No MTU in this state, so restore the prior MTU
- 		mtu=$(cat "$mtu_dir/$interface")
- 		syslog info "$interface: MTU restored to $mtu"
--		ifconfig "$interface" mtu "$mtu"
-+		set_mtu "$interface" "$mtu"
- 		rm "$mtu_dir/$interface"
- 	fi
- fi
-diff --git a/dhcpcd-run-hooks.in b/dhcpcd-run-hooks.in
-index 0e60338..843f3ca 100644
---- a/dhcpcd-run-hooks.in
-+++ b/dhcpcd-run-hooks.in
-@@ -215,6 +215,17 @@ service_condcommand()
- 	service_exists $1 && service_status $1 && service_cmd $1 $2
- }
- 
-+# Set MTU for an interface
-+set_mtu() {
-+	local interface=$1 mtu=$2
-+
-+	if [ -e /sys/class/net/$interface/mtu ]; then
-+		echo "$mtu" > /sys/class/net/$interface/mtu
-+	else
-+		ifconfig "$interface" mtu "$mtu"
-+	fi
-+}
-+
- # We source each script into this one so that scripts run earlier can
- # remove variables from the environment so later scripts don't see them.
- # Thus, the user can create their dhcpcd.enter/exit-hook script to configure
--- 
-1.7.5.4
-
diff --git a/testing/dhcpcd/PKGBUILD b/testing/dhcpcd/PKGBUILD
deleted file mode 100644
index bbd406199..000000000
--- a/testing/dhcpcd/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 166018 2012-09-04 06:17:52Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Tom Killian <tom.archlinux.org>
-# Contributor: Judd Vinet <jvinet.zeroflux.org>
-
-pkgname=dhcpcd
-pkgver=5.6.2
-pkgrel=1
-pkgdesc="RFC2131 compliant DHCP client daemon"
-url="http://roy.marples.name/projects/dhcpcd/"
-arch=('i686' 'x86_64')
-license=('BSD')
-groups=('base')
-depends=('glibc' 'sh')
-backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
-options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd.conf.d' 'dhcpcd.service')
-sha1sums=('7127237b5594ba50642829e76033a04d1c6fd42e'
-          'b67b9ce6a2faaca75fea356966a16be2283b7db0'
-          '3d0542eab1b89a88d56ca427128228ac72c40d1f')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # configure variables
-  ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd \
-	--rundir=/run
-
-  # Build
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # Create Binary Symlink
-  install -d ${pkgdir}/usr/sbin
-  ln -sf /sbin/dhcpcd ${pkgdir}/usr/sbin/dhcpcd
-
-  # Install Configuration File used in /etc/rc.d/network
-  install -D -m644 ../dhcpcd.conf.d $pkgdir/etc/conf.d/$pkgname
-
-  # Install License
-  install -d $pkgdir/usr/share/licenses/$pkgname
-  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
-        >> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # Set Options in /etc/dhcpcd.conf
-  echo noipv4ll >> ${pkgdir}/etc/dhcpcd.conf # Disable ip4vall
-
-  # install systemd files
-  install -Dm644 ${srcdir}/dhcpcd.service ${pkgdir}/usr/lib/systemd/system/dhcpcd@.service
-}
diff --git a/testing/dhcpcd/dhcpcd.conf.d b/testing/dhcpcd/dhcpcd.conf.d
deleted file mode 100644
index 83c6f14ad..000000000
--- a/testing/dhcpcd/dhcpcd.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the DHCP client daemon
-#
-
-DHCPCD_ARGS="-q"
-
diff --git a/testing/dhcpcd/dhcpcd.service b/testing/dhcpcd/dhcpcd.service
deleted file mode 100644
index 25a1923ac..000000000
--- a/testing/dhcpcd/dhcpcd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=dhcpcd on %I
-Wants=network.target
-Before=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/dhcpcd-%I.pid
-ExecStart=/sbin/dhcpcd -A -q -w %I
-ExecStop=/sbin/dhcpcd -k %I
-
-[Install]
-Alias=multi-user.target.wants/dhcpcd@eth0.service
diff --git a/testing/dhcpcd/remove_ifconfig.patch b/testing/dhcpcd/remove_ifconfig.patch
deleted file mode 100644
index 5bcc4a68f..000000000
--- a/testing/dhcpcd/remove_ifconfig.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dhcpcd-hooks/10-mtu.orig	2011-11-04 07:45:46.477712667 +0100
-+++ dhcpcd-hooks/10-mtu	2011-11-04 07:46:38.964379550 +0100
-@@ -7,7 +7,7 @@
- elif [ -n "$new_interface_mtu" ] && $if_up; then
- 	# The smalled MTU dhcpcd can work with is 576
- 	if [ "$new_interface_mtu" -ge 576 ]; then
--		if ifconfig "$interface" mtu "$new_interface_mtu"; then
-+		if ip link set "$interface" mtu "$new_interface_mtu"; then
- 			syslog info "$interface: MTU set to $new_interface_mtu"
- 			# Save the MTU so we can restore it later
- 			if [ ! -e "$mtu_dir/$interface" ]; then
-@@ -21,7 +21,7 @@
- 		# No MTU in this state, so restore the prior MTU
- 		mtu=$(cat "$mtu_dir/$interface")
- 		syslog info "$interface: MTU restored to $mtu"
--		ifconfig "$interface" mtu "$mtu"
-+		ip link set "$interface" mtu "$new_interface_mtu"
- 		rm "$mtu_dir/$interface"
- 	fi
- fi
diff --git a/testing/dialog/PKGBUILD b/testing/dialog/PKGBUILD
deleted file mode 100644
index f324a31f4..000000000
--- a/testing/dialog/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 163091 2012-07-06 20:37:15Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=dialog
-pkgver=1.1_20120706
-pkgrel=1
-pkgdesc="A tool to display dialog boxes from shell scripts"
-arch=('i686' 'x86_64')
-url="http://invisible-island.net/dialog/"
-license=('LGPL2.1')
-depends=('ncurses')
-source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver/_/-}.tgz)
-sha1sums=('fa033f0fb166da86e29d70e68159a92a9b9cdb84')
-
-build() {
-  cd "${srcdir}/$pkgname-${pkgver/_/-}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-              --with-ncursesw --enable-nls
-  make
-}
-
-package() {
-  cd "${srcdir}/$pkgname-${pkgver/_/-}"
-  make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/testing/digikam/PKGBUILD b/testing/digikam/PKGBUILD
deleted file mode 100644
index 8395a2b05..000000000
--- a/testing/digikam/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 164633 2012-08-01 16:13:17Z andrea $
-# 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.7.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")
-sha1sums=('43f51c389984538025f185acf8902a923eb0268b')
-
-build() {
-  cd "${srcdir}"
-
-  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
-}
-
-package_libkface() {
-  pkgdesc="A Qt/C++ wrapper around LibFace library to perform face recognition and detection over pictures"
-  depends=('kdelibs' 'opencv')
-
-  cd "${srcdir}"/build/extra/libkface
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkgeomap() {
-  pkgdesc="A wrapper around world map components for browsing and arranging photos on a map"
-  depends=('kdelibs' 'kdeedu-marble' 'libkexiv2')
-
-  cd "${srcdir}"/build/extra/libkgeomap
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libkvkontakte() {
-  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
-  depends=('kdelibs' 'qjson')
-
-  cd "${srcdir}"/build/extra/libkvkontakte
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libmediawiki() {
-  pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
-  depends=('kdelibs')
-
-  cd "${srcdir}"/build/extra/libmediawiki
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kipi-plugins() {
-  pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
-  depends=('kdebase-runtime' 'kdepimlibs' 'libkdcraw' 'libkipi' 'libksane'
-           'opencv' 'qjson' 'libkvkontakte' 'libkexiv2')
-  optdepends=('libkgeomap'
-              'libmediawiki'
-              'libgpod'
-              'hugin')
-  install=kipi-plugins.install
-
-  cd "${srcdir}"/build/extra/kipi-plugins
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/digikam/digikam.install b/testing/digikam/digikam.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/digikam/digikam.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/digikam/kipi-plugins.install b/testing/digikam/kipi-plugins.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/digikam/kipi-plugins.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/dmraid/PKGBUILD b/testing/dmraid/PKGBUILD
deleted file mode 100644
index 9915ca8cf..000000000
--- a/testing/dmraid/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 161941 2012-06-16 17:17:25Z dreisner $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-#Contributor: Urs Wolfer <uwolfer @ fwo.ch>
-
-pkgname=dmraid
-pkgver=1.0.0.rc16.3
-pkgrel=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')
-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
-        dmraid_install
-        dmraid_hook
-        dmraid_tmpfiles
-        dmraid.service)
-install=dmraid.install
-md5sums=('819338fcef98e8e25819f0516722beeb'
-         '2297d23cee1aef23ec6ad8d6d1870356'
-         'faec669dc85f87187b45b5d3968efe2c'
-         '56a8bb0ece8d206cd8efb504ee072ddd'
-         'de0af1fdb9ed4c109b8119160167d2e9')
-
-build() {
-  cd "$pkgname/1.0.0.rc16-3/$pkgname"
-  ./configure --enable-led --enable-intel_led
-  make
-}
-
-package() {
-  cd "$pkgname/1.0.0.rc16-3/$pkgname"
-  make DESTDIR="$pkgdir" prefix=/usr libdir=/usr/lib mandir=/usr/share/man includedir=/usr/include install
-  install -D -m644 "$srcdir"/dmraid_install "$pkgdir"/usr/lib/initcpio/install/dmraid
-  install -D -m644 "$srcdir"/dmraid_hook "$pkgdir"/usr/lib/initcpio/hooks/dmraid
-  install -D -m644 "$srcdir"/dmraid_tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/dmraid.conf
-
-  # fix permissions
-  chmod 644 "$pkgdir"/usr/include/dmraid/* "$pkgdir"/usr/lib/libdmraid.a
-
-  install -Dm644 "$srcdir/dmraid.service" "$pkgdir/usr/lib/systemd/system/dmraid.service"
-}
diff --git a/testing/dmraid/dmraid.install b/testing/dmraid/dmraid.install
deleted file mode 100644
index 64899e785..000000000
--- a/testing/dmraid/dmraid.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 1.0.0.rc15)" -lt 0 ]; then
-    # important upgrade notice
-    echo ">>>"
-    echo ">>> IMPORTANT DMRAID UPGRADE NOTICE"
-    echo ">>> -------------------------------"
-    echo ">>> Version 1.0.0.rc15 and greater introduce a new name scheme:"
-    echo ">>> You need to add an additional 'p' in front of your number."
-    echo ">>> e.g. <yourname><number> --> <yourname>p<number>"
-    echo ">>>      firsthd1           --> firsthdp1"
-    echo ">>> Please change your bootloader and fstab accordingly."
-    echo ">>>"
-  fi
-}
diff --git a/testing/dmraid/dmraid.service b/testing/dmraid/dmraid.service
deleted file mode 100644
index 1fd142ff2..000000000
--- a/testing/dmraid/dmraid.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Assemble FakeRAID arrays
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service
-Before=basic.target shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/dmraid --ignorelocking --activate y -Z
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=true
-
-[Install]
-WantedBy=basic.target
diff --git a/testing/dmraid/dmraid_hook b/testing/dmraid/dmraid_hook
deleted file mode 100644
index 37283e83e..000000000
--- a/testing/dmraid/dmraid_hook
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    modprobe -a -q dm-mod dm-mirror >/dev/null 2>&1
-    msg ":: Activating dmraid arrays..."
-    # prevent any event monitoring calls with -I
-    if [ "$quiet" = "y" ]; then
-        dmraid -ay -I -Z >/dev/null
-    else
-        dmraid -ay -I -Z
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/dmraid/dmraid_install b/testing/dmraid/dmraid_install
deleted file mode 100644
index d3238c1f7..000000000
--- a/testing/dmraid/dmraid_install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module 'dm-mod'
-    add_module 'dm-mirror'
-
-    add_binary 'dmraid'
-    add_binary 'dmsetup'
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook loads the necessary modules for a dmraid root device.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/dmraid/dmraid_tmpfiles b/testing/dmraid/dmraid_tmpfiles
deleted file mode 100644
index 4f21ac1fc..000000000
--- a/testing/dmraid/dmraid_tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/lock/dmraid 1777 root root
diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD
deleted file mode 100644
index d563d0b31..000000000
--- a/testing/dnsutils/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168390 2012-10-09 22:10:12Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor: mario <mario_vazq@hotmail.com>
-
-pkgname=dnsutils
-_pkgver=9.9.2
-pkgver=${_pkgver//-/.}
-pkgrel=1
-pkgdesc='DNS utilities: dig host nslookup'
-url='http://www.isc.org/software/bind/'
-license=('custom:ISC')
-arch=('i686' 'x86_64')
-options=('!makeflags')
-depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
-source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
-        'remove-bind.patch')
-sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
-          'bb13bd54134e4d787469be25461a3cc3f5cb57f4')
-
-replaces=('bind-tools' 'host')
-
-build() {
-	cd "${srcdir}/bind-${_pkgver}"
-
-	patch -p1 -i ../remove-bind.patch
-	export STD_CDEFINES='-DDIG_SIGCHASE'
-
-	# hack to remove unused bloat from the binaries
-	CFLAGS+=' -fdata-sections -ffunction-sections'
-	LDFLAGS+=' -Wl,--gc-sections'
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--disable-static \
-		--disable-linux-caps \
-		--with-openssl \
-		--with-idn \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/bind-${_pkgver}"
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	cd bin; make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch
deleted file mode 100644
index 8d4b49848..000000000
--- a/testing/dnsutils/remove-bind.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:16:17.245495043 -0700
-@@ -19,8 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
--		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
-+SUBDIRS =	dig
- TARGETS =
- 
- @BIND9_MAKE_RULES@
-diff -aur old/lib/Makefile.in new/lib/Makefile.in
---- old/lib/Makefile.in	2007-06-19 16:47:13.000000000 -0700
-+++ new/lib/Makefile.in	2011-08-28 19:17:50.828688599 -0700
-@@ -23,7 +23,7 @@
- # Attempt to disable parallel processing.
- .NOTPARALLEL:
- .NO_PARALLEL:
--SUBDIRS =	isc isccc dns isccfg bind9 lwres tests
-+SUBDIRS =	isc dns isccfg bind9 lwres
- TARGETS =
- 
- @BIND9_MAKE_RULES@
diff --git a/testing/dvdauthor/PKGBUILD b/testing/dvdauthor/PKGBUILD
deleted file mode 100644
index 05058218d..000000000
--- a/testing/dvdauthor/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169632 2012-10-25 01:34:55Z eric $
-# 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.1
-pkgrel=2
-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")
-md5sums=('2694a5a3ef460106ea3caf0f7f60ff80')
-
-build() {
-  cd "${srcdir}/${pkgname}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch b/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch
deleted file mode 100644
index 2bb636380..000000000
--- a/testing/dvdauthor/dvdauthor-0.7.0-libpng15.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/spuunmux.c
-+++ src/spuunmux.c
-@@ -39,6 +39,7 @@
- #include <netinet/in.h>
- 
- #include <png.h>
-+#include <zlib.h>
- 
- #include "rgb.h"
- #include "common.h"
-@@ -610,7 +611,7 @@
-         png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-         return -1;
-       } /*if*/
--    if (setjmp(png_ptr->jmpbuf))
-+    if (setjmp(png_jmpbuf(png_ptr)))
-       {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         fclose(fp);
diff --git a/testing/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 2b9b9f152..000000000
--- a/testing/e2fsprogs/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 168762 2012-10-15 19:04:27Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org> 
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=e2fsprogs
-pkgver=1.42.6
-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')
-makedepends=('bc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'MIT-LICENSE')
-backup=('etc/mke2fs.conf')
-install=${pkgname}.install
-sha1sums=('cd05cd4205a00d01a6da821660cff386788e9be3'
-          '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="" --libdir=/usr/lib \
-      --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/eclipse/PKGBUILD b/testing/eclipse/PKGBUILD
deleted file mode 100644
index 22b3840a0..000000000
--- a/testing/eclipse/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 163177 2012-07-08 12:52:55Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
-# Contributor: Andreas W. Hauser <andy-aur@splashground.de>
-# Contributor: Marco Crosio <marco.crosio@gmail.com>
-
-pkgname=eclipse
-pkgver=4.2
-pkgrel=1
-_date=201206081400
-pkgdesc="An IDE for Java and other languages"
-arch=('i686' 'x86_64')
-url="http://eclipse.org"
-depends=('java-environment' 'gtk2' 'unzip' 'libwebkit' 'libxtst')
-install=${pkgname}.install
-makedepends=('zip')
-conflicts=('xulrunner')
-license=("EPL/1.1")
-source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk.tar.gz"
-	 'eclipse.sh' 'eclipse.desktop' 'eclipse.svg')
-md5sums=('506b9f4e3919ebe3d6a717cd9bef5e07'
-         '7ea99a30fbaf06ec29261541b8eb1e23'
-         'ba8a37e30a7ebd69774cec87c69e8c44'
-         '77cff7543ccf7e177cb6667f5a20ce19')
-[ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops4/R-$pkgver-${_date}/$pkgname-SDK-$pkgver-linux-gtk-$CARCH.tar.gz"
-[ "$CARCH" = "x86_64" ] && md5sums[0]='804938dd087c310d8bfd54c8024afbbd'
-
-package() {
-  # install eclipse
-  install -m755 -d "$pkgdir/usr/share"
-  mv eclipse "$pkgdir/usr/share/"
-
-  # install misc
-  install -d $pkgdir/usr/bin $pkgdir/usr/share/applications \
-    $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,256x256}/apps
-  install -m755 eclipse.sh "$pkgdir/usr/bin/eclipse"
-  install -m644 eclipse.desktop "$pkgdir/usr/share/applications/"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse.png \
-    "$pkgdir/usr/share/icons/hicolor/16x16/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse32.png \
-    "$pkgdir/usr/share/icons/hicolor/32x32/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse48.png \
-    "$pkgdir/usr/share/icons/hicolor/48x48/apps/eclipse.png"
-  ln -s /usr/share/eclipse/plugins/org.eclipse.sdk_$pkgver.v${_date}/eclipse256.png \
-    "$pkgdir/usr/share/icons/hicolor/256x256/apps/eclipse.png"
-
-  # install icon
-  install -Dm644 "$srcdir"/eclipse.svg \
-    "$pkgdir"/usr/share/icons/hicolor/scalable/apps/eclipse.svg
-  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" "$pkgdir"/usr/share/eclipse/plugins/org.apache.ant_1.8.3.v20120321-1730/bin/runant.py
-}
diff --git a/testing/eclipse/eclipse.desktop b/testing/eclipse/eclipse.desktop
deleted file mode 100644
index 5b210c81e..000000000
--- a/testing/eclipse/eclipse.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eclipse
-Comment=A Java Development Environment
-Icon=eclipse
-Exec=eclipse
-Terminal=false
-Type=Application
-Categories=Development;IDE;Java
-StartupNotify=true
diff --git a/testing/eclipse/eclipse.install b/testing/eclipse/eclipse.install
deleted file mode 100644
index a2930a4ff..000000000
--- a/testing/eclipse/eclipse.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/eclipse/eclipse.sh b/testing/eclipse/eclipse.sh
deleted file mode 100644
index 498d7fefb..000000000
--- a/testing/eclipse/eclipse.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-export ECLIPSE_HOME=/usr/share/eclipse
-export GDK_NATIVE_WINDOWS=true
-${ECLIPSE_HOME}/eclipse "$@"
diff --git a/testing/eclipse/eclipse.svg b/testing/eclipse/eclipse.svg
deleted file mode 100644
index 56316be9e..000000000
--- a/testing/eclipse/eclipse.svg
+++ /dev/null
@@ -1,1623 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2254"
-   sodipodi:version="0.32"
-   inkscape:version="0.45.1"
-   width="48"
-   height="48"
-   version="1.0"
-   sodipodi:docbase="/home/matt/eclipse33"
-   sodipodi:docname="eclipse-icon-clean.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-ubuntu.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata2259">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs2257">
-    <linearGradient
-       id="linearGradient4373">
-      <stop
-         style="stop-color:#8ea6d6;stop-opacity:0.73762375;"
-         offset="0"
-         id="stop4375" />
-      <stop
-         style="stop-color:#bbc9e6;stop-opacity:1;"
-         offset="1"
-         id="stop4377" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4035">
-      <stop
-         style="stop-color:#7474bb;stop-opacity:1;"
-         offset="0"
-         id="stop4037" />
-      <stop
-         style="stop-color:#070553;stop-opacity:1;"
-         offset="1"
-         id="stop4039" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4003">
-      <stop
-         style="stop-color:#494991;stop-opacity:1;"
-         offset="0"
-         id="stop4005" />
-      <stop
-         style="stop-color:#695ae8;stop-opacity:1;"
-         offset="1"
-         id="stop4007" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3987">
-      <stop
-         style="stop-color:#414083;stop-opacity:1;"
-         offset="0"
-         id="stop3989" />
-      <stop
-         style="stop-color:#5649b9;stop-opacity:1;"
-         offset="1"
-         id="stop3991" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_8_"
-       gradientUnits="userSpaceOnUse"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0"
-         style="stop-color:#FEE8BD"
-         id="stop264" />
-      <stop
-         offset="0.0483"
-         style="stop-color:#FEEBC6"
-         id="stop266" />
-      <stop
-         offset="0.2334"
-         style="stop-color:#FFF6E5"
-         id="stop268" />
-      <stop
-         offset="0.3905"
-         style="stop-color:#FFFDF8"
-         id="stop270" />
-      <stop
-         offset="0.5"
-         style="stop-color:#FFFFFF"
-         id="stop272" />
-      <stop
-         offset="0.6094"
-         style="stop-color:#FFFDF9"
-         id="stop274" />
-      <stop
-         offset="0.7588"
-         style="stop-color:#FFF7E7"
-         id="stop276" />
-      <stop
-         offset="0.9306"
-         style="stop-color:#FEEDCB"
-         id="stop278" />
-      <stop
-         offset="1"
-         style="stop-color:#FEE8BD"
-         id="stop280" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_7_"
-       gradientUnits="userSpaceOnUse"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0"
-         style="stop-color:#A86E45"
-         id="stop205" />
-      <stop
-         offset="0.1124"
-         style="stop-color:#E8A06C"
-         id="stop207" />
-      <stop
-         offset="0.1609"
-         style="stop-color:#E59E6B"
-         id="stop209" />
-      <stop
-         offset="0.2012"
-         style="stop-color:#DA9969"
-         id="stop211" />
-      <stop
-         offset="0.2387"
-         style="stop-color:#C99066"
-         id="stop213" />
-      <stop
-         offset="0.2743"
-         style="stop-color:#B18461"
-         id="stop215" />
-      <stop
-         offset="0.3084"
-         style="stop-color:#92745A"
-         id="stop217" />
-      <stop
-         offset="0.3315"
-         style="stop-color:#786755"
-         id="stop219" />
-      <stop
-         offset="0.4068"
-         style="stop-color:#B5ACA2"
-         id="stop221" />
-      <stop
-         offset="0.478"
-         style="stop-color:#EAE8E5"
-         id="stop223" />
-      <stop
-         offset="0.5112"
-         style="stop-color:#FFFFFF"
-         id="stop225" />
-      <stop
-         offset="0.5376"
-         style="stop-color:#FDFCFC"
-         id="stop227" />
-      <stop
-         offset="0.5589"
-         style="stop-color:#F5F3F2"
-         id="stop229" />
-      <stop
-         offset="0.5783"
-         style="stop-color:#E8E4E1"
-         id="stop231" />
-      <stop
-         offset="0.5966"
-         style="stop-color:#D6CEC9"
-         id="stop233" />
-      <stop
-         offset="0.6142"
-         style="stop-color:#BFB3AA"
-         id="stop235" />
-      <stop
-         offset="0.6312"
-         style="stop-color:#A39185"
-         id="stop237" />
-      <stop
-         offset="0.6475"
-         style="stop-color:#816959"
-         id="stop239" />
-      <stop
-         offset="0.6517"
-         style="stop-color:#785E4C"
-         id="stop241" />
-      <stop
-         offset="0.671"
-         style="stop-color:#83654F"
-         id="stop243" />
-      <stop
-         offset="0.7414"
-         style="stop-color:#A87958"
-         id="stop245" />
-      <stop
-         offset="0.807"
-         style="stop-color:#C3895F"
-         id="stop247" />
-      <stop
-         offset="0.8652"
-         style="stop-color:#D39263"
-         id="stop249" />
-      <stop
-         offset="0.9101"
-         style="stop-color:#D99564"
-         id="stop251" />
-      <stop
-         offset="0.9278"
-         style="stop-color:#C48557"
-         id="stop253" />
-      <stop
-         offset="0.9557"
-         style="stop-color:#AA7045"
-         id="stop255" />
-      <stop
-         offset="0.9807"
-         style="stop-color:#9A633B"
-         id="stop257" />
-      <stop
-         offset="1"
-         style="stop-color:#945F37"
-         id="stop259" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_6_"
-       gradientUnits="userSpaceOnUse"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235"
-       gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)">
-      <stop
-         offset="0"
-         style="stop-color:#A86E45"
-         id="stop146" />
-      <stop
-         offset="0.1124"
-         style="stop-color:#E8A06C"
-         id="stop148" />
-      <stop
-         offset="0.1609"
-         style="stop-color:#E59E6B"
-         id="stop150" />
-      <stop
-         offset="0.2012"
-         style="stop-color:#DA9969"
-         id="stop152" />
-      <stop
-         offset="0.2387"
-         style="stop-color:#C99066"
-         id="stop154" />
-      <stop
-         offset="0.2743"
-         style="stop-color:#B18461"
-         id="stop156" />
-      <stop
-         offset="0.3084"
-         style="stop-color:#92745A"
-         id="stop158" />
-      <stop
-         offset="0.3315"
-         style="stop-color:#786755"
-         id="stop160" />
-      <stop
-         offset="0.4068"
-         style="stop-color:#B5ACA2"
-         id="stop162" />
-      <stop
-         offset="0.478"
-         style="stop-color:#EAE8E5"
-         id="stop164" />
-      <stop
-         offset="0.5112"
-         style="stop-color:#FFFFFF"
-         id="stop166" />
-      <stop
-         offset="0.5376"
-         style="stop-color:#FDFCFC"
-         id="stop168" />
-      <stop
-         offset="0.5589"
-         style="stop-color:#F5F3F2"
-         id="stop170" />
-      <stop
-         offset="0.5783"
-         style="stop-color:#E8E4E1"
-         id="stop172" />
-      <stop
-         offset="0.5966"
-         style="stop-color:#D6CEC9"
-         id="stop174" />
-      <stop
-         offset="0.6142"
-         style="stop-color:#BFB3AA"
-         id="stop176" />
-      <stop
-         offset="0.6312"
-         style="stop-color:#A39185"
-         id="stop178" />
-      <stop
-         offset="0.6475"
-         style="stop-color:#816959"
-         id="stop180" />
-      <stop
-         offset="0.6517"
-         style="stop-color:#785E4C"
-         id="stop182" />
-      <stop
-         offset="0.671"
-         style="stop-color:#83654F"
-         id="stop184" />
-      <stop
-         offset="0.7414"
-         style="stop-color:#A87958"
-         id="stop186" />
-      <stop
-         offset="0.807"
-         style="stop-color:#C3895F"
-         id="stop188" />
-      <stop
-         offset="0.8652"
-         style="stop-color:#D39263"
-         id="stop190" />
-      <stop
-         offset="0.9101"
-         style="stop-color:#D99564"
-         id="stop192" />
-      <stop
-         offset="0.9278"
-         style="stop-color:#C48557"
-         id="stop194" />
-      <stop
-         offset="0.9557"
-         style="stop-color:#AA7045"
-         id="stop196" />
-      <stop
-         offset="0.9807"
-         style="stop-color:#9A633B"
-         id="stop198" />
-      <stop
-         offset="1"
-         style="stop-color:#945F37"
-         id="stop200" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_5_"
-       gradientUnits="userSpaceOnUse"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0"
-         style="stop-color:#A86E45"
-         id="stop87" />
-      <stop
-         offset="0.1124"
-         style="stop-color:#E8A06C"
-         id="stop89" />
-      <stop
-         offset="0.1609"
-         style="stop-color:#E59E6B"
-         id="stop91" />
-      <stop
-         offset="0.2012"
-         style="stop-color:#DA9969"
-         id="stop93" />
-      <stop
-         offset="0.2387"
-         style="stop-color:#C99066"
-         id="stop95" />
-      <stop
-         offset="0.2743"
-         style="stop-color:#B18461"
-         id="stop97" />
-      <stop
-         offset="0.3084"
-         style="stop-color:#92745A"
-         id="stop99" />
-      <stop
-         offset="0.3315"
-         style="stop-color:#786755"
-         id="stop101" />
-      <stop
-         offset="0.4068"
-         style="stop-color:#B5ACA2"
-         id="stop103" />
-      <stop
-         offset="0.478"
-         style="stop-color:#EAE8E5"
-         id="stop105" />
-      <stop
-         offset="0.5112"
-         style="stop-color:#FFFFFF"
-         id="stop107" />
-      <stop
-         offset="0.5376"
-         style="stop-color:#FDFCFC"
-         id="stop109" />
-      <stop
-         offset="0.5589"
-         style="stop-color:#F5F3F2"
-         id="stop111" />
-      <stop
-         offset="0.5783"
-         style="stop-color:#E8E4E1"
-         id="stop113" />
-      <stop
-         offset="0.5966"
-         style="stop-color:#D6CEC9"
-         id="stop115" />
-      <stop
-         offset="0.6142"
-         style="stop-color:#BFB3AA"
-         id="stop117" />
-      <stop
-         offset="0.6312"
-         style="stop-color:#A39185"
-         id="stop119" />
-      <stop
-         offset="0.6475"
-         style="stop-color:#816959"
-         id="stop121" />
-      <stop
-         offset="0.6517"
-         style="stop-color:#785E4C"
-         id="stop123" />
-      <stop
-         offset="0.671"
-         style="stop-color:#83654F"
-         id="stop125" />
-      <stop
-         offset="0.7414"
-         style="stop-color:#A87958"
-         id="stop127" />
-      <stop
-         offset="0.807"
-         style="stop-color:#C3895F"
-         id="stop129" />
-      <stop
-         offset="0.8652"
-         style="stop-color:#D39263"
-         id="stop131" />
-      <stop
-         offset="0.9101"
-         style="stop-color:#D99564"
-         id="stop133" />
-      <stop
-         offset="0.9278"
-         style="stop-color:#C48557"
-         id="stop135" />
-      <stop
-         offset="0.9557"
-         style="stop-color:#AA7045"
-         id="stop137" />
-      <stop
-         offset="0.9807"
-         style="stop-color:#9A633B"
-         id="stop139" />
-      <stop
-         offset="1"
-         style="stop-color:#945F37"
-         id="stop141" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_2_"
-       gradientUnits="userSpaceOnUse"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0"
-         style="stop-color:#A86E45"
-         id="stop60" />
-      <stop
-         offset="0.5787"
-         style="stop-color:#785E4C"
-         id="stop62" />
-      <stop
-         offset="1"
-         style="stop-color:#945F37"
-         id="stop64" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_1_"
-       gradientUnits="userSpaceOnUse"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5"
-       gradientTransform="translate(-142.55625,-33.100248)">
-      <stop
-         offset="0.0056"
-         style="stop-color:#9C6137"
-         id="stop47" />
-      <stop
-         offset="0.1685"
-         style="stop-color:#C98452"
-         id="stop49" />
-      <stop
-         offset="0.5337"
-         style="stop-color:#CD8D5F"
-         id="stop51" />
-      <stop
-         offset="0.809"
-         style="stop-color:#C47D4A"
-         id="stop53" />
-      <stop
-         offset="1"
-         style="stop-color:#9C6137"
-         id="stop55" />
-    </linearGradient>
-    <radialGradient
-       id="light_1_"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0.264"
-         style="stop-color:#FFFFFF;"
-         id="stop37" />
-      <stop
-         offset="2.5"
-         style="stop-color:#FFF18F;stop-opacity:0"
-         id="stop39" />
-    </radialGradient>
-    <radialGradient
-       id="XMLID_10_"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114"
-       gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0.3427"
-         style="stop-color:#FFFFFF"
-         id="stop8" />
-      <stop
-         offset="0.3754"
-         style="stop-color:#ECECEC"
-         id="stop10" />
-      <stop
-         offset="0.4665"
-         style="stop-color:#BCBCBC"
-         id="stop12" />
-      <stop
-         offset="0.5531"
-         style="stop-color:#979797"
-         id="stop14" />
-      <stop
-         offset="0.6331"
-         style="stop-color:#7C7C7C"
-         id="stop16" />
-      <stop
-         offset="0.704"
-         style="stop-color:#6C6C6C"
-         id="stop18" />
-      <stop
-         offset="0.7584"
-         style="stop-color:#666666"
-         id="stop20" />
-    </radialGradient>
-    <linearGradient
-       id="XMLID_4_"
-       gradientUnits="userSpaceOnUse"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)">
-      <stop
-         offset="0"
-         style="stop-color:#FCB462"
-         id="stop40" />
-      <stop
-         offset="1"
-         style="stop-color:#FCAF55"
-         id="stop42" />
-    </linearGradient>
-    <linearGradient
-       id="XMLID_3_"
-       gradientUnits="userSpaceOnUse"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)">
-      <stop
-         offset="0"
-         style="stop-color:#F99D77"
-         id="stop33" />
-      <stop
-         offset="1"
-         style="stop-color:#F7804E"
-         id="stop35" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4035"
-       id="linearGradient4041"
-       x1="-43.03101"
-       y1="8.6383018"
-       x2="-15.677965"
-       y2="37.492428"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4035"
-       id="linearGradient4189"
-       gradientUnits="userSpaceOnUse"
-       x1="-43.03101"
-       y1="8.6383018"
-       x2="-15.677965"
-       y2="37.492428" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4181">
-      <g
-         id="g4183"
-         transform="matrix(0.7925926,0,0,0.8907563,4.6132029,-3.2693226)">
-        <path
-           transform="translate(-15.844752,8.8397036)"
-           d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-           sodipodi:ry="20.014421"
-           sodipodi:rx="20.014421"
-           sodipodi:cy="23.982693"
-           sodipodi:cx="-30.021633"
-           id="path4185"
-           style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-        <path
-           transform="translate(-13.843309,8.8397036)"
-           d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-           sodipodi:ry="20.014421"
-           sodipodi:rx="20.014421"
-           sodipodi:cy="23.982693"
-           sodipodi:cx="-30.021633"
-           id="path4187"
-           style="opacity:1;fill:url(#linearGradient4189);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           sodipodi:type="arc" />
-      </g>
-    </mask>
-    <filter
-       inkscape:collect="always"
-       x="-0.42083731"
-       width="1.8416746"
-       y="-0.42480746"
-       height="1.8496149"
-       id="filter4267">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.12931"
-         id="feGaussianBlur4269" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4035"
-       id="linearGradient4301"
-       gradientUnits="userSpaceOnUse"
-       x1="-43.03101"
-       y1="8.6383018"
-       x2="-15.677965"
-       y2="37.492428" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4297">
-      <path
-         sodipodi:type="arc"
-         style="opacity:1;fill:url(#linearGradient4301);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path4299"
-         sodipodi:cx="-30.021633"
-         sodipodi:cy="23.982693"
-         sodipodi:rx="20.014421"
-         sodipodi:ry="20.014421"
-         d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-         transform="translate(3.5679857,1.3974438)" />
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4003"
-       id="linearGradient4368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9683099,0,0,0.9683099,47.162254,-1.0174889)"
-       x1="-47.534256"
-       y1="2.9675496"
-       x2="-0.16679382"
-       y2="49.50108" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4003"
-       id="linearGradient4371"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0105249,0,0,1.0105249,3.4549308e-2,-50.022066)"
-       x1="-47.534256"
-       y1="2.9675496"
-       x2="-0.16679382"
-       y2="49.50108" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4423">
-      <path
-         transform="translate(4.9557997,-4.7430601e-2)"
-         d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-         sodipodi:ry="20.014421"
-         sodipodi:rx="20.014421"
-         sodipodi:cy="23.982693"
-         sodipodi:cx="-30.021633"
-         id="path4425"
-         style="opacity:1;fill:url(#linearGradient4427);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         sodipodi:type="arc" />
-    </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4035"
-       id="linearGradient4427"
-       gradientUnits="userSpaceOnUse"
-       x1="-43.03101"
-       y1="8.6383018"
-       x2="-15.677965"
-       y2="37.492428" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4373"
-       id="linearGradient4429"
-       gradientUnits="userSpaceOnUse"
-       x1="-46.468069"
-       y1="19.312662"
-       x2="-6.439226"
-       y2="19.312662" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4373"
-       id="linearGradient4431"
-       gradientUnits="userSpaceOnUse"
-       x1="-46.468067"
-       y1="22.481251"
-       x2="-6.4392262"
-       y2="22.481251" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4373"
-       id="linearGradient4433"
-       gradientUnits="userSpaceOnUse"
-       x1="-46.468067"
-       y1="25.482334"
-       x2="-6.4392262"
-       y2="25.482334" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4373"
-       id="linearGradient4435"
-       gradientUnits="userSpaceOnUse"
-       x1="-46.468067"
-       y1="28.481611"
-       x2="-6.4392262"
-       y2="28.481611" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="radialGradient4753"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#light_1_"
-       id="radialGradient4755"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_1_"
-       id="linearGradient4757"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_2_"
-       id="linearGradient4759"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient4761"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient4763"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_5_"
-       id="linearGradient4765"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_6_"
-       id="linearGradient4767"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_7_"
-       id="linearGradient4769"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_8_"
-       id="linearGradient4771"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="radialGradient4817"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,-0.8029473,317.89685)"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#light_1_"
-       id="radialGradient4819"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_1_"
-       id="linearGradient4821"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_2_"
-       id="linearGradient4823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient4825"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient4827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_5_"
-       id="linearGradient4829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_6_"
-       id="linearGradient4831"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,-0.3987,0,2.7907,-0.8029473,335.99965)"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_7_"
-       id="linearGradient4833"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_8_"
-       id="linearGradient4835"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-142.55625,-33.100248)"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath7503">
-      <g
-         id="g7505"
-         transform="matrix(7.4511206,0,0,7.4511206,305.77432,266.76067)">
-        <path
-           id="path7507"
-           d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z "
-           style="opacity:0.2;fill:#141414" />
-        <path
-           id="path7509"
-           d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z "
-           style="opacity:0.2;fill:#141414" />
-        <path
-           id="path7511"
-           d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z "
-           style="fill:url(#radialGradient7547)" />
-        <path
-           id="path7513"
-           d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z "
-           style="opacity:0.4;fill:#ffbf61" />
-        <path
-           id="path7515"
-           d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-           style="opacity:0.2;fill:#ff8b17" />
-        <path
-           id="path7517"
-           d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-           style="opacity:0.2;fill:#ff8b17" />
-        <path
-           id="path7519"
-           d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-           style="opacity:0.4;fill:#ff8b17" />
-        <path
-           id="path7521"
-           d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-           style="opacity:0.2;fill:#ffbf61" />
-        <path
-           id="path7523"
-           d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z "
-           style="fill:#cba572" />
-        <path
-           id="path7525"
-           d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z "
-           style="fill:#9e8c68" />
-        <path
-           id="path7527"
-           d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z "
-           style="fill:#966746" />
-        <path
-           id="path7529"
-           d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z "
-           style="fill:url(#linearGradient7549)" />
-        <path
-           id="path7531"
-           d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z "
-           style="fill:url(#linearGradient7551)" />
-        <path
-           id="path7533"
-           d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z "
-           style="fill:url(#linearGradient7553)" />
-        <path
-           id="path7535"
-           d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z "
-           style="fill:url(#linearGradient7555)" />
-        <path
-           id="path7537"
-           d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z "
-           style="fill:url(#linearGradient7557)" />
-        <path
-           id="path7539"
-           d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z "
-           style="fill:url(#linearGradient7559)" />
-        <path
-           id="path7541"
-           d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z "
-           style="fill:url(#linearGradient7561)" />
-        <path
-           id="path7543"
-           d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z "
-           style="fill:url(#linearGradient7563)" />
-        <path
-           id="path7545"
-           d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z "
-           style="fill:#3f3f3f" />
-      </g>
-    </clipPath>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="radialGradient7547"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_1_"
-       id="linearGradient7549"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_2_"
-       id="linearGradient7551"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient7553"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient7555"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_5_"
-       id="linearGradient7557"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_6_"
-       id="linearGradient7559"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_7_"
-       id="linearGradient7561"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_8_"
-       id="linearGradient7563"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#light_1_"
-       id="radialGradient7653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="radialGradient8092"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3746685,0,0,0.3745343,-41.145122,6.4690164)"
-       cx="-27.6128"
-       cy="-86.5356"
-       r="6.2114" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_1_"
-       id="linearGradient8094"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="47.9995"
-       y1="100.5"
-       x2="81.9995"
-       y2="100.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_2_"
-       id="linearGradient8096"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="44.8901"
-       y1="95.7324"
-       x2="83.5847"
-       y2="90.0861" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient8098"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient8100"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-41.040947,-42.162908)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_5_"
-       id="linearGradient8102"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="44.7505"
-       y1="94.7715"
-       x2="83.3739"
-       y2="89.1356" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_6_"
-       id="linearGradient8104"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3746685,-5.350873e-2,0,0.3745343,-41.145122,8.898557)"
-       x1="-34.5078"
-       y1="-100.6235"
-       x2="-20.9253"
-       y2="-100.6235" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_7_"
-       id="linearGradient8106"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="45.416"
-       y1="107.0176"
-       x2="83.3354"
-       y2="107.0176" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_8_"
-       id="linearGradient8108"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.134208,0,0,0.134208,-60.169549,-40.637602)"
-       x1="36.2495"
-       y1="18.1187"
-       x2="92.7495"
-       y2="18.1187" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#light_1_"
-       id="radialGradient8110"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.7917,0,0,2.7907,141.7533,350.9971)"
-       cx="-27.6724"
-       cy="-109.9067"
-       r="9" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask8044">
-      <g
-         id="g8046"
-         transform="translate(8.8639968,22.032387)">
-        <g
-           id="g8048">
-          <path
-             style="opacity:0.2;fill:#141414"
-             d="M -29.775161,-22.982238 C -29.796903,-23.107991 -29.878636,-23.210123 -29.986136,-23.268906 L -29.986136,-23.560406 C -29.836092,-23.636636 -29.745233,-23.799162 -29.775161,-23.971619 C -29.797037,-24.097641 -29.879038,-24.200041 -29.986942,-24.25869 C -29.991505,-24.402695 -30.109876,-24.519188 -30.254687,-24.519188 L -34.370443,-24.519188 C -34.518072,-24.519188 -34.638859,-24.398401 -34.638859,-24.250772 L -34.638859,-23.677033 L -34.648925,-23.675691 C -34.872381,-23.643481 -35.024305,-23.439619 -34.986727,-23.22247 C -34.956396,-23.047329 -34.811048,-22.917013 -34.638994,-22.889232 L -34.638994,-22.687786 L -34.649059,-22.686175 C -34.872516,-22.654234 -35.024439,-22.450237 -34.986861,-22.233223 C -34.95653,-22.058082 -34.811182,-21.927632 -34.639128,-21.89985 L -34.639128,-21.69827 L -34.649193,-21.696928 C -34.87265,-21.664718 -35.024573,-21.460856 -34.986995,-21.243708 C -34.954785,-21.057829 -34.793199,-20.921072 -34.607186,-20.905503 C -34.562092,-20.820281 -34.473381,-20.761364 -34.370846,-20.761364 L -34.129003,-20.761364 C -33.83294,-20.026441 -33.162303,-19.419284 -32.381347,-19.419284 C -31.600256,-19.419284 -30.929753,-20.026441 -30.63369,-20.761364 L -30.255089,-20.761364 C -30.10746,-20.761364 -29.986673,-20.882151 -29.986673,-21.02978 L -29.986673,-21.581509 C -29.836629,-21.657739 -29.74577,-21.820265 -29.775698,-21.992722 C -29.79744,-22.118475 -29.879173,-22.220608 -29.986673,-22.279391 L -29.986673,-22.570756 C -29.836226,-22.647121 -29.745367,-22.809781 -29.775161,-22.982238 z "
-             id="path8050" />
-          <path
-             style="opacity:0.2;fill:#141414"
-             d="M -29.775161,-22.84803 C -29.796903,-22.973783 -29.878636,-23.075915 -29.986136,-23.134698 L -29.986136,-23.426198 C -29.836092,-23.502428 -29.745233,-23.664954 -29.775161,-23.837411 C -29.797037,-23.963433 -29.879038,-24.065833 -29.986942,-24.124482 C -29.991505,-24.268487 -30.109876,-24.38498 -30.254687,-24.38498 L -34.370443,-24.38498 C -34.518072,-24.38498 -34.638859,-24.264193 -34.638859,-24.116564 L -34.638859,-23.542825 L -34.648925,-23.541483 C -34.872381,-23.509273 -35.024305,-23.305411 -34.986727,-23.088262 C -34.956396,-22.913121 -34.811048,-22.782805 -34.638994,-22.755024 L -34.638994,-22.553578 L -34.649059,-22.551967 C -34.872516,-22.520026 -35.024439,-22.316029 -34.986861,-22.099015 C -34.95653,-21.923874 -34.811182,-21.793424 -34.639128,-21.765642 L -34.639128,-21.564062 L -34.649193,-21.56272 C -34.87265,-21.53051 -35.024573,-21.326648 -34.986995,-21.1095 C -34.954785,-20.923621 -34.793199,-20.786864 -34.607186,-20.771295 C -34.562092,-20.686073 -34.473381,-20.627156 -34.370846,-20.627156 L -34.129003,-20.627156 C -33.83294,-19.892233 -33.162303,-19.285076 -32.381347,-19.285076 C -31.600256,-19.285076 -30.929753,-19.892233 -30.63369,-20.627156 L -30.255089,-20.627156 C -30.10746,-20.627156 -29.986673,-20.747943 -29.986673,-20.895572 L -29.986673,-21.447301 C -29.836629,-21.523531 -29.74577,-21.686057 -29.775698,-21.858514 C -29.79744,-21.984267 -29.879173,-22.0864 -29.986673,-22.145183 L -29.986673,-22.436548 C -29.836226,-22.512913 -29.745367,-22.675573 -29.775161,-22.84803 z "
-             id="path8052" />
-          <path
-             style="fill:url(#radialGradient8092)"
-             d="M -30.507669,-21.694512 C -30.507669,-20.66044 -31.346469,-19.553492 -32.381078,-19.553492 C -33.415553,-19.553492 -34.254353,-20.66044 -34.254353,-21.694512 C -34.254353,-22.728719 -33.415553,-23.298835 -32.381078,-23.298835 C -31.346469,-23.298835 -30.507669,-22.728719 -30.507669,-21.694512 z "
-             id="path8054" />
-          <path
-             style="opacity:0.4;fill:#ffbf61"
-             d="M -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.031465 -27.884976,-30.452926 C -27.884976,-27.874388 -30.519882,-25.378656 -30.519882,-24.634607 L -34.242141,-24.634607 C -34.242141,-25.557018 -36.876912,-27.874388 -36.876912,-30.452926 C -36.876912,-33.031465 -34.86406,-35.12162 -32.380944,-35.12162 z "
-             id="path8056" />
-          <path
-             style="opacity:0.2;fill:#ff8b17"
-             d="M -32.380944,-35.926868 C -35.304128,-35.926868 -37.68216,-33.482538 -37.68216,-30.477889 C -37.68216,-28.627429 -36.56045,-26.960163 -35.741378,-25.742494 C -35.544227,-25.449384 -35.083893,-24.765325 -35.046315,-24.59515 C -35.036652,-24.159511 -34.680061,-23.807751 -34.242006,-23.807751 L -30.519882,-23.807751 C -30.10075,-23.807751 -29.759459,-24.130656 -29.722015,-24.540124 C -29.679203,-24.679969 -29.267184,-25.29585 -29.111906,-25.527761 C -28.301826,-26.738451 -27.079728,-28.56462 -27.079728,-30.477889 C -27.079728,-33.482538 -29.457894,-35.926868 -32.380944,-35.926868 z M -29.722015,-24.541198 C -29.721747,-24.54254 -29.721612,-24.544016 -29.721478,-24.545493 C -29.72121,-24.546566 -29.720405,-24.547372 -29.72027,-24.548445 C -29.72027,-24.54858 -29.721478,-24.543077 -29.722015,-24.541198 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-             id="path8058" />
-          <path
-             style="opacity:0.2;fill:#ff8b17"
-             d="M -32.380944,-35.658452 C -35.156097,-35.658452 -37.413744,-33.334506 -37.413744,-30.477889 C -37.413744,-28.709296 -36.318338,-27.08095 -35.518459,-25.892136 C -35.223872,-25.454215 -34.778838,-24.792972 -34.778838,-24.613134 C -34.778838,-24.317205 -34.538069,-24.076302 -34.242006,-24.076302 L -30.519882,-24.076302 C -30.223953,-24.076302 -29.98305,-24.317205 -29.98305,-24.613134 L -29.984123,-24.597834 C -29.955805,-24.749489 -29.566334,-25.331683 -29.333483,-25.67955 C -28.542864,-26.860983 -27.348144,-28.646218 -27.348144,-30.477889 C -27.348144,-33.334506 -29.605925,-35.658452 -32.380944,-35.658452 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-             id="path8060" />
-          <path
-             style="opacity:0.4;fill:#ff8b17"
-             d="M -32.380944,-35.390036 C -35.008066,-35.390036 -37.145328,-33.186475 -37.145328,-30.477889 C -37.145328,-28.791163 -36.076227,-27.202006 -35.295673,-26.041912 C -34.891841,-25.4416 -34.510422,-24.874705 -34.510422,-24.613134 C -34.510422,-24.464968 -34.390172,-24.344718 -34.242006,-24.344718 L -30.519882,-24.344718 C -30.371716,-24.344718 -30.251466,-24.464968 -30.251466,-24.613134 C -30.251466,-24.790288 -29.882125,-25.342151 -29.556402,-25.828924 C -28.784035,-26.983113 -27.61656,-28.727817 -27.61656,-30.477889 C -27.61656,-33.186475 -29.753957,-35.390036 -32.380944,-35.390036 z M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-             id="path8062" />
-          <path
-             style="opacity:0.2;fill:#ffbf61"
-             d="M -30.519882,-24.612999 L -34.242141,-24.612999 C -34.242141,-25.530579 -36.877046,-27.91304 -36.877046,-30.477889 C -36.877046,-33.042738 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.913174 -30.519882,-25.353022 -30.519882,-24.612999 z "
-             id="path8064" />
-          <path
-             style="fill:#cba572"
-             d="M -31.631661,-29.235257 L -31.631661,-27.362519 C -31.631661,-27.156778 -31.800494,-26.988078 -32.006369,-26.988078 L -32.755653,-26.988078 C -32.961662,-26.988078 -33.130361,-27.156778 -33.130361,-27.362519 L -33.130361,-29.235257 L -33.50507,-29.235257 L -33.50507,-27.362519 C -33.50507,-26.950634 -33.16794,-26.613504 -32.621579,-26.613504 L -32.621579,-24.366191 L -32.140712,-24.366191 L -32.140712,-26.61337 C -31.594351,-26.61337 -31.25722,-26.9505 -31.25722,-27.362384 L -31.25722,-29.235257 L -31.631661,-29.235257 z "
-             id="path8066" />
-          <path
-             style="fill:#9e8c68"
-             d="M -32.380944,-35.255828 C -34.934117,-35.255828 -37.01112,-33.112392 -37.01112,-30.477889 C -37.01112,-28.831694 -35.955037,-27.278102 -35.184012,-26.14391 C -34.750655,-25.506154 -34.376214,-24.928657 -34.376214,-24.626554 L -34.24308,-24.626554 C -34.267506,-25.553261 -36.876912,-27.924984 -36.876912,-30.477889 C -36.876912,-33.042604 -34.86406,-35.12162 -32.380944,-35.12162 C -29.897962,-35.12162 -27.884976,-33.042604 -27.884976,-30.477889 C -27.884976,-27.927534 -30.489282,-25.382682 -30.518674,-24.626554 L -30.385808,-24.626554 C -30.385808,-24.843971 -30.053375,-25.362551 -29.668466,-25.931996 C -28.859058,-27.128863 -27.750768,-28.768213 -27.750768,-30.477889 C -27.750768,-33.112392 -29.827905,-35.255828 -32.380944,-35.255828 z "
-             id="path8068" />
-          <path
-             style="fill:#966746"
-             d="M -30.032304,-21.163988 C -30.032304,-21.016359 -30.153091,-20.895572 -30.30072,-20.895572 L -34.32696,-20.895572 C -34.474589,-20.895572 -34.595376,-21.016359 -34.595376,-21.163988 L -34.595376,-24.38498 C -34.595376,-24.532609 -34.474589,-24.653396 -34.32696,-24.653396 L -30.30072,-24.653396 C -30.153091,-24.653396 -30.032304,-24.532609 -30.032304,-24.38498 L -30.032304,-21.163988 z "
-             id="path8070" />
-          <path
-             style="fill:url(#linearGradient8094)"
-             d="M -30.032304,-21.298196 C -30.032304,-21.076753 -30.213485,-20.895572 -30.434928,-20.895572 L -34.192752,-20.895572 C -34.414195,-20.895572 -34.595376,-21.076753 -34.595376,-21.298196 L -34.595376,-24.116564 C -34.595376,-24.338007 -34.414195,-24.519188 -34.192752,-24.519188 L -30.434928,-24.519188 C -30.213485,-24.519188 -30.032304,-24.338007 -30.032304,-24.116564 L -30.032304,-21.298196 z "
-             id="path8072" />
-          <path
-             style="fill:url(#linearGradient8096)"
-             d="M -29.825355,-24.105827 C -29.788582,-23.888813 -29.937553,-23.684817 -30.156581,-23.652741 L -34.470965,-23.020353 C -34.689993,-22.988412 -34.899491,-23.139664 -34.936399,-23.356678 C -34.973306,-23.573827 -34.824201,-23.777689 -34.605173,-23.809899 L -30.290789,-24.442153 C -30.071761,-24.474094 -29.862262,-24.322842 -29.825355,-24.105827 z "
-             id="path8074" />
-          <path
-             style="fill:url(#linearGradient8098)"
-             d="M -29.825355,-23.116446 C -29.788582,-22.899297 -29.937553,-22.695435 -30.156581,-22.66336 L -34.470965,-22.031106 C -34.689993,-21.998896 -34.899491,-22.150283 -34.936399,-22.367431 C -34.973306,-22.584445 -34.824201,-22.788442 -34.605173,-22.820383 L -30.290789,-23.452637 C -30.071761,-23.484847 -29.862262,-23.33346 -29.825355,-23.116446 z "
-             id="path8076" />
-          <path
-             style="fill:url(#linearGradient8100)"
-             d="M -29.825355,-22.127065 C -29.788582,-21.91005 -29.937553,-21.706054 -30.156581,-21.673978 L -34.470965,-21.04159 C -34.689993,-21.009649 -34.899491,-21.160901 -34.936399,-21.377916 C -34.973306,-21.595064 -34.824201,-21.798926 -34.605173,-21.831136 L -30.290789,-22.46339 C -30.071761,-22.495331 -29.862262,-22.344079 -29.825355,-22.127065 z "
-             id="path8078" />
-          <path
-             style="fill:url(#linearGradient8102)"
-             d="M -34.887815,-23.22341 L -34.936533,-23.356678 C -34.97344,-23.573827 -34.824335,-23.777689 -34.605307,-23.809899 L -30.290923,-24.442153 C -30.071895,-24.474094 -29.882528,-24.396656 -29.845755,-24.179642 L -34.887815,-23.22341 z "
-             id="path8080" />
-          <path
-             style="fill:url(#linearGradient8104)"
-             d="M -34.880031,-22.220339 L -29.853136,-23.208244 C -29.889909,-23.425259 -30.071761,-23.484847 -30.290789,-23.452503 L -34.605173,-22.820249 C -34.824201,-22.788307 -34.973306,-22.584311 -34.936399,-22.367297 L -34.880031,-22.220339 z "
-             id="path8082" />
-          <path
-             style="fill:url(#linearGradient8106)"
-             d="M -34.853592,-21.194185 L -29.853002,-22.218594 C -29.889909,-22.435609 -30.071761,-22.495466 -30.290789,-22.46339 L -34.605173,-21.831136 C -34.824201,-21.798926 -34.973306,-21.595064 -34.936399,-21.377916 L -34.853592,-21.194185 z "
-             id="path8084" />
-          <path
-             style="fill:url(#linearGradient8108)"
-             d="M -28.589568,-32.601596 C -29.364217,-34.00152 -30.787895,-34.925676 -32.380944,-34.925676 C -33.973993,-34.925676 -35.397671,-34.00152 -36.17232,-32.601596 C -35.153681,-33.183656 -33.826767,-33.537429 -32.380944,-33.537429 C -30.935121,-33.537295 -29.608207,-33.183656 -28.589568,-32.601596 z "
-             id="path8086" />
-          <path
-             style="fill:#3f3f3f"
-             d="M -34.042707,-20.761364 L -30.719449,-20.761364 C -30.706297,-20.805384 -30.69462,-20.85021 -30.684823,-20.895572 L -34.077199,-20.895572 C -34.067402,-20.85021 -34.055726,-20.805384 -34.042707,-20.761364 z "
-             id="path8088" />
-        </g>
-        <ellipse
-           clip-path="url(#clipPath7503)"
-           transform="matrix(0.134208,0,0,0.134208,-41.03736,-36.195284)"
-           ry="60.116001"
-           rx="60.125"
-           cy="44.278999"
-           cx="64.5"
-           id="ellipse8090"
-           style="fill:url(#radialGradient8110)"
-           sodipodi:cx="64.5"
-           sodipodi:cy="44.278999"
-           sodipodi:rx="60.125"
-           sodipodi:ry="60.116001" />
-      </g>
-    </mask>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient8386"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient8388"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_3_"
-       id="linearGradient8470"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="75.5039"
-       y1="11.96"
-       x2="85.5969"
-       y2="36.3307" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_4_"
-       id="linearGradient8472"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.6725931e-2,-44.465488)"
-       x1="37.6743"
-       y1="25.6035"
-       x2="37.6743"
-       y2="47.5006" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask8432">
-      <g
-         style="overflow:visible"
-         id="g8434"
-         transform="matrix(0.1570828,0,0,0.1570828,-28.616402,11.0008)">
-        <path
-           id="path8436"
-           d="M 51.868,84.936 C 45.459,79.297 41.784,71.221 41.784,62.78 C 41.784,54.276 45.498,46.164 51.974,40.523 C 52.339,40.204 52.419,39.667 52.16,39.256 L 42.036,23.192 C 41.888,22.958 41.648,22.796 41.375,22.748 C 41.102,22.7 40.819,22.769 40.602,22.937 C 32.334,29.305 26.119,38.265 23.1,48.167 C 22.982,48.554 23.112,48.974 23.431,49.226 C 27.586,52.517 30.066,57.583 30.066,62.779 C 30.066,67.975 27.585,73.043 23.429,76.334 C 23.112,76.585 22.98,77.004 23.098,77.392 C 26.093,87.211 32.238,96.12 40.404,102.474 C 40.623,102.645 40.903,102.715 41.177,102.667 C 41.45,102.62 41.691,102.459 41.84,102.226 L 52.049,86.204 C 52.309,85.794 52.232,85.256 51.868,84.936 z M 12.803,50.223 C 5.732,50.223 0,55.951 0,63.016 C 0,70.081 5.732,75.81 12.803,75.81 C 19.874,75.81 25.606,70.081 25.606,63.016 C 25.606,55.951 19.874,50.223 12.803,50.223 z M 58.779,35.162 C 59.036,35.57 59.551,35.732 59.996,35.545 C 63.75,33.958 67.65,33.153 71.586,33.153 C 86.064,33.153 98.693,43.887 100.963,58.122 C 101.039,58.6 101.451,58.951 101.934,58.951 L 121.014,58.98 C 121.292,58.98 121.557,58.863 121.744,58.657 C 121.931,58.451 122.021,58.178 121.995,57.9 C 120.967,47.338 116.471,37.15 109.336,29.215 C 109.014,28.855 108.477,28.783 108.07,29.046 C 105.193,30.904 101.925,31.888 98.623,31.888 C 88.99,31.888 81.154,24.098 81.153,14.524 C 81.154,14.519 81.172,14.158 81.172,14.142 C 81.172,13.665 80.829,13.254 80.356,13.172 C 77.344,12.65 74.394,12.284 71.586,12.284 C 63.875,12.284 56.084,14.221 49.054,17.695 C 48.804,17.819 48.618,18.043 48.543,18.311 C 48.467,18.579 48.509,18.866 48.657,19.102 L 58.779,35.162 z M 98,27.5 C 104.908,27.5 110.51,21.902 110.51,15 C 110.51,8.096 104.908,2.5 98,2.5 C 91.092,2.5 85.49,8.096 85.49,15 C 85.49,21.902 91.092,27.5 98,27.5 z M 120.994,66.733 L 101.916,66.795 C 101.435,66.796 101.024,67.147 100.947,67.621 C 98.646,81.75 86.024,92.405 71.586,92.405 C 67.604,92.405 63.66,91.581 59.864,89.955 C 59.42,89.766 58.906,89.925 58.645,90.33 L 48.442,106.345 C 48.293,106.58 48.25,106.867 48.324,107.136 C 48.398,107.404 48.583,107.629 48.832,107.753 C 55.917,111.3 63.786,113.174 71.586,113.174 C 74.479,113.174 77.492,112.901 80.541,112.36 C 80.969,112.285 81.297,111.936 81.348,111.505 C 82.364,102.73 89.791,96.112 98.623,96.112 C 101.361,96.112 104.147,96.81 106.679,98.13 C 107.064,98.331 107.533,98.257 107.838,97.946 C 115.823,89.803 120.846,79.104 121.978,67.817 C 122.006,67.54 121.915,67.264 121.727,67.057 C 121.539,66.85 121.272,66.732 120.994,66.733 z M 98.486,100.545 C 91.415,100.545 85.682,106.242 85.682,113.273 C 85.682,120.302 91.414,126.001 98.486,126.001 C 105.556,126.001 111.289,120.303 111.289,113.273 C 111.289,106.242 105.557,100.545 98.486,100.545 z "
-           style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
-        <path
-           id="path8438"
-           d="M 51.868,85.936 C 45.459,80.297 41.784,72.221 41.784,63.78 C 41.784,55.276 45.498,47.164 51.974,41.523 C 52.339,41.204 52.419,40.667 52.16,40.256 L 42.036,24.192 C 41.888,23.958 41.648,23.796 41.375,23.748 C 41.102,23.7 40.819,23.769 40.602,23.937 C 32.334,30.305 26.119,39.265 23.1,49.167 C 22.982,49.554 23.112,49.974 23.431,50.226 C 27.586,53.517 30.066,58.583 30.066,63.779 C 30.066,68.975 27.585,74.043 23.429,77.334 C 23.112,77.585 22.98,78.004 23.098,78.392 C 26.093,88.211 32.238,97.12 40.404,103.474 C 40.623,103.645 40.903,103.715 41.177,103.667 C 41.45,103.62 41.691,103.459 41.84,103.226 L 52.049,87.204 C 52.309,86.794 52.232,86.256 51.868,85.936 z M 12.803,51.223 C 5.732,51.223 0,56.951 0,64.016 C 0,71.081 5.732,76.81 12.803,76.81 C 19.874,76.81 25.606,71.081 25.606,64.016 C 25.606,56.951 19.874,51.223 12.803,51.223 z M 58.779,36.162 C 59.036,36.57 59.551,36.732 59.996,36.545 C 63.75,34.958 67.65,34.153 71.586,34.153 C 86.064,34.153 98.693,44.887 100.963,59.122 C 101.039,59.6 101.451,59.951 101.934,59.951 L 121.014,59.98 C 121.292,59.98 121.557,59.863 121.744,59.657 C 121.931,59.451 122.021,59.178 121.995,58.9 C 120.967,48.338 116.471,38.15 109.336,30.215 C 109.014,29.855 108.477,29.783 108.07,30.046 C 105.193,31.904 101.925,32.888 98.623,32.888 C 88.99,32.888 81.154,25.098 81.153,15.524 C 81.154,15.519 81.172,15.158 81.172,15.142 C 81.172,14.665 80.829,14.254 80.356,14.172 C 77.344,13.65 74.394,13.284 71.586,13.284 C 63.875,13.284 56.084,15.221 49.054,18.695 C 48.804,18.819 48.618,19.043 48.543,19.311 C 48.467,19.579 48.509,19.866 48.657,20.102 L 58.779,36.162 z M 98,28.5 C 104.908,28.5 110.51,22.902 110.51,16 C 110.51,9.096 104.908,3.5 98,3.5 C 91.092,3.5 85.49,9.096 85.49,16 C 85.49,22.902 91.092,28.5 98,28.5 z M 120.994,67.733 L 101.916,67.795 C 101.435,67.796 101.024,68.147 100.947,68.621 C 98.646,82.75 86.024,93.405 71.586,93.405 C 67.604,93.405 63.66,92.581 59.864,90.955 C 59.42,90.766 58.906,90.925 58.645,91.33 L 48.442,107.345 C 48.293,107.58 48.25,107.867 48.324,108.136 C 48.398,108.404 48.583,108.629 48.832,108.753 C 55.917,112.3 63.786,114.174 71.586,114.174 C 74.479,114.174 77.492,113.901 80.541,113.36 C 80.969,113.285 81.297,112.936 81.348,112.505 C 82.364,103.73 89.791,97.112 98.623,97.112 C 101.361,97.112 104.147,97.81 106.679,99.13 C 107.064,99.331 107.533,99.257 107.838,98.946 C 115.823,90.803 120.846,80.104 121.978,68.817 C 122.006,68.54 121.915,68.264 121.727,68.057 C 121.539,67.85 121.272,67.732 120.994,67.733 z M 98.486,101.545 C 91.415,101.545 85.682,107.242 85.682,114.273 C 85.682,121.302 91.414,127.001 98.486,127.001 C 105.556,127.001 111.289,121.303 111.289,114.273 C 111.289,107.242 105.557,101.545 98.486,101.545 z "
-           style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
-        <path
-           id="path8440"
-           d="M 51.868,86.936 C 45.459,81.297 41.784,73.221 41.784,64.78 C 41.784,56.276 45.498,48.164 51.974,42.523 C 52.339,42.204 52.419,41.667 52.16,41.256 L 42.036,25.192 C 41.888,24.958 41.648,24.796 41.375,24.748 C 41.102,24.7 40.819,24.769 40.602,24.937 C 32.334,31.305 26.119,40.265 23.1,50.167 C 22.982,50.554 23.112,50.974 23.431,51.226 C 27.586,54.517 30.066,59.583 30.066,64.779 C 30.066,69.975 27.585,75.043 23.429,78.334 C 23.112,78.585 22.98,79.004 23.098,79.392 C 26.093,89.211 32.238,98.12 40.404,104.474 C 40.623,104.645 40.903,104.715 41.177,104.667 C 41.45,104.62 41.691,104.459 41.84,104.226 L 52.049,88.204 C 52.309,87.794 52.232,87.256 51.868,86.936 z M 12.803,52.223 C 5.732,52.223 0,57.951 0,65.016 C 0,72.081 5.732,77.81 12.803,77.81 C 19.874,77.81 25.606,72.081 25.606,65.016 C 25.606,57.951 19.874,52.223 12.803,52.223 z M 58.779,37.162 C 59.036,37.57 59.551,37.732 59.996,37.545 C 63.75,35.958 67.65,35.153 71.586,35.153 C 86.064,35.153 98.693,45.887 100.963,60.122 C 101.039,60.6 101.451,60.951 101.934,60.951 L 121.014,60.98 C 121.292,60.98 121.557,60.863 121.744,60.657 C 121.931,60.451 122.021,60.178 121.995,59.9 C 120.967,49.338 116.471,39.15 109.336,31.215 C 109.014,30.855 108.477,30.783 108.07,31.046 C 105.193,32.904 101.925,33.888 98.623,33.888 C 88.99,33.888 81.154,26.098 81.153,16.524 C 81.154,16.519 81.172,16.158 81.172,16.142 C 81.172,15.665 80.829,15.254 80.356,15.172 C 77.344,14.65 74.394,14.284 71.586,14.284 C 63.875,14.284 56.084,16.221 49.054,19.695 C 48.804,19.819 48.618,20.043 48.543,20.311 C 48.467,20.579 48.509,20.866 48.657,21.102 L 58.779,37.162 z M 98,29.5 C 104.908,29.5 110.51,23.902 110.51,17 C 110.51,10.096 104.908,4.5 98,4.5 C 91.092,4.5 85.49,10.096 85.49,17 C 85.49,23.902 91.092,29.5 98,29.5 z M 120.994,68.733 L 101.916,68.795 C 101.435,68.796 101.024,69.147 100.947,69.621 C 98.646,83.75 86.024,94.405 71.586,94.405 C 67.604,94.405 63.66,93.581 59.864,91.955 C 59.42,91.766 58.906,91.925 58.645,92.33 L 48.442,108.345 C 48.293,108.58 48.25,108.867 48.324,109.136 C 48.398,109.404 48.583,109.629 48.832,109.753 C 55.917,113.3 63.786,115.174 71.586,115.174 C 74.479,115.174 77.492,114.901 80.541,114.36 C 80.969,114.285 81.297,113.936 81.348,113.505 C 82.364,104.73 89.791,98.112 98.623,98.112 C 101.361,98.112 104.147,98.81 106.679,100.13 C 107.064,100.331 107.533,100.257 107.838,99.946 C 115.823,91.803 120.846,81.104 121.978,69.817 C 122.006,69.54 121.915,69.264 121.727,69.057 C 121.539,68.85 121.272,68.732 120.994,68.733 z M 98.486,102.545 C 91.415,102.545 85.682,108.242 85.682,115.273 C 85.682,122.302 91.414,128.001 98.486,128.001 C 105.556,128.001 111.289,122.303 111.289,115.273 C 111.289,108.242 105.557,102.545 98.486,102.545 z "
-           style="opacity:0.2;fill:#141414;fill-rule:evenodd" />
-        <path
-           id="path8442"
-           d="M 40.602,21.938 C 32.334,28.306 26.119,37.266 23.1,47.168 C 22.982,47.555 23.112,47.975 23.431,48.227 C 27.586,51.518 30.066,56.584 30.066,61.78 C 30.066,66.976 27.585,72.044 23.429,75.335 C 23.112,75.586 22.98,76.005 23.098,76.393 C 26.093,86.212 32.238,95.121 40.404,101.475 C 40.623,101.646 40.903,101.716 41.177,101.668 C 41.45,101.621 41.691,101.46 41.84,101.227 L 52.049,85.205 C 52.31,84.796 52.234,84.258 51.869,83.937 C 45.46,78.298 41.785,70.222 41.785,61.781 C 41.785,53.277 45.499,45.165 51.975,39.524 C 52.34,39.205 52.42,38.668 52.161,38.257 L 42.036,22.192 C 41.888,21.958 41.648,21.796 41.375,21.748 C 41.102,21.7 40.819,21.769 40.602,21.938 z "
-           style="fill:#f97a00" />
-        <path
-           id="path8444"
-           d="M 24.042,47.455 C 28.431,50.932 31.051,56.219 31.051,61.779 C 31.051,67.339 28.43,72.628 24.04,76.104 C 26.991,85.785 32.981,94.45 41.008,100.697 C 42.028,99.097 50.449,85.879 51.217,84.674 C 44.602,78.854 40.799,70.574 40.799,61.779 C 40.799,52.92 44.642,44.603 51.327,38.78 C 50.565,37.572 42.215,24.322 41.203,22.717 C 33.076,28.978 27.018,37.694 24.042,47.455 z "
-           style="fill:#fb8b00" />
-        <ellipse
-           id="ellipse8446"
-           ry="12.794"
-           rx="12.803"
-           cy="62.015999"
-           cx="12.803"
-           style="fill:#f83011;fill-rule:evenodd"
-           sodipodi:cx="12.803"
-           sodipodi:cy="62.015999"
-           sodipodi:rx="12.803"
-           sodipodi:ry="12.794" />
-        <path
-           id="path8448"
-           d="M 0.984,62.016 C 0.984,68.528 6.286,73.827 12.802,73.827 C 19.318,73.827 24.62,68.528 24.62,62.016 C 24.62,55.504 19.318,50.206 12.802,50.206 C 6.286,50.206 0.984,55.504 0.984,62.016 z "
-           style="fill:#f83011;fill-rule:evenodd" />
-        <path
-           id="path8450"
-           d="M 49.054,16.696 C 48.804,16.82 48.618,17.044 48.543,17.312 C 48.467,17.58 48.509,17.867 48.657,18.103 L 58.779,34.162 C 59.036,34.57 59.551,34.732 59.996,34.545 C 63.75,32.958 67.65,32.153 71.586,32.153 C 86.064,32.153 98.693,42.887 100.963,57.122 C 101.039,57.6 101.451,57.951 101.934,57.951 L 121.014,57.98 C 121.292,57.98 121.557,57.863 121.744,57.657 C 121.931,57.451 122.021,57.178 121.995,56.9 C 120.967,46.338 116.471,36.15 109.336,28.215 C 109.014,27.855 108.477,27.783 108.07,28.046 C 105.193,29.904 101.925,30.888 98.623,30.888 C 88.99,30.888 81.154,23.098 81.153,13.524 C 81.154,13.519 81.172,13.158 81.172,13.142 C 81.172,12.665 80.829,12.254 80.356,12.172 C 77.344,11.65 74.394,11.284 71.586,11.284 C 63.875,11.285 56.084,13.222 49.054,16.696 z "
-           style="fill:#f13b00" />
-        <path
-           id="path8452"
-           d="M 49.491,17.578 C 50.527,19.223 58.856,32.437 59.613,33.639 C 63.439,32.022 67.458,31.17 71.587,31.17 C 86.704,31.17 99.583,42.205 101.937,56.968 C 103.373,56.97 119.109,56.993 121.017,56.996 C 120.004,46.605 115.636,36.693 108.606,28.873 C 105.609,30.81 102.191,31.872 98.625,31.872 C 88.449,31.872 80.17,23.641 80.17,13.523 C 80.17,13.523 80.18,13.313 80.189,13.142 C 77.356,12.65 74.471,12.268 71.588,12.268 C 63.928,12.269 56.327,14.199 49.491,17.578 z "
-           style="fill:#f13b00" />
-        <ellipse
-           id="ellipse8454"
-           ry="12.5"
-           rx="12.51"
-           cy="14"
-           cx="98"
-           style="fill:#e00916;fill-rule:evenodd"
-           sodipodi:cx="98"
-           sodipodi:cy="14"
-           sodipodi:rx="12.51"
-           sodipodi:ry="12.5" />
-        <path
-           id="path8456"
-           d="M 86.992,14 C 86.992,20.065 91.93,25 98,25 C 104.07,25 109.008,20.065 109.008,14 C 109.008,7.935 104.07,3 98,3 C 91.93,3 86.992,7.935 86.992,14 z "
-           style="fill:#e56363;fill-rule:evenodd" />
-        <path
-           id="path8458"
-           d="M 120.994,65.733 L 101.916,65.795 C 101.435,65.796 101.024,66.147 100.947,66.621 C 98.646,80.75 86.024,91.405 71.586,91.405 C 67.604,91.405 63.66,90.581 59.864,88.955 C 59.42,88.766 58.906,88.925 58.645,89.33 L 48.442,105.345 C 48.293,105.58 48.25,105.867 48.324,106.136 C 48.398,106.404 48.583,106.629 48.832,106.753 C 55.917,110.3 63.786,112.174 71.586,112.174 C 74.479,112.174 77.492,111.901 80.541,111.36 C 80.969,111.285 81.297,110.936 81.348,110.505 C 82.364,101.73 89.791,95.112 98.623,95.112 C 101.361,95.112 104.147,95.81 106.679,97.13 C 107.064,97.331 107.533,97.257 107.838,96.946 C 115.823,88.803 120.846,78.104 121.978,66.817 C 122.006,66.54 121.915,66.264 121.727,66.057 C 121.539,65.85 121.272,65.732 120.994,65.733 z "
-           style="fill:#d40000" />
-        <ellipse
-           id="ellipse8460"
-           ry="12.728"
-           rx="12.803"
-           cy="112.272"
-           cx="98.486"
-           style="fill:#ff7516;fill-rule:evenodd"
-           sodipodi:cx="98.486"
-           sodipodi:cy="112.272"
-           sodipodi:rx="12.803"
-           sodipodi:ry="12.728" />
-        <path
-           id="path8462"
-           d="M 86.844,112.272 C 86.844,118.651 92.067,123.841 98.487,123.841 C 104.907,123.841 110.13,118.651 110.13,112.272 C 110.13,105.893 104.907,100.703 98.487,100.703 C 92.067,100.703 86.844,105.894 86.844,112.272 z "
-           style="fill:#fb9200;fill-rule:evenodd" />
-        <path
-           id="path8464"
-           d="M 49.785,17.67 C 50.008,18.024 59.527,33.127 59.695,33.395 C 63.548,31.791 67.547,30.969 71.586,30.969 C 78.265,30.969 84.635,33.086 90.02,37.08 C 90.155,37.07 103.667,36.099 103.667,36.099 C 103.667,36.099 112.654,35.447 113.294,35.4 C 111.865,33.167 110.392,31.264 108.67,29.337 C 105.639,31.256 102.097,32.173 98.623,32.173 C 88.337,32.173 79.969,23.752 79.969,13.525 C 79.969,13.519 79.973,13.418 79.979,13.318 C 77.094,12.827 74.27,12.47 71.586,12.47 C 64.13,12.469 56.6,14.34 49.785,17.67 z "
-           style="fill:url(#linearGradient8470);fill-rule:evenodd" />
-        <path
-           id="path8466"
-           d="M 24.274,47.396 C 26.599,49.268 28.451,51.682 29.658,54.398 C 34.14,51.488 38.459,49.95 43.889,47.772 C 45.598,44.761 48.481,41.04 51.074,38.755 C 50.915,38.503 41.39,23.39 41.155,23.017 C 33.202,29.201 27.214,37.844 24.274,47.396 z "
-           style="fill:url(#linearGradient8472);fill-rule:evenodd" />
-        <path
-           id="path8468"
-           d="M 23.732,58.691 C 22.313,53.996 17.948,50.566 12.794,50.566 C 6.493,50.566 1.367,55.689 1.367,61.985 C 1.367,66.015 3.469,69.565 6.633,71.597 C 11.926,67.035 17.919,62.755 23.732,58.691 z "
-           style="fill:#f88657;fill-rule:evenodd" />
-      </g>
-    </mask>
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-height="627"
-     inkscape:window-width="910"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:zoom="7.2055766"
-     inkscape:cx="35.602016"
-     inkscape:cy="22.962506"
-     inkscape:window-x="238"
-     inkscape:window-y="96"
-     inkscape:current-layer="svg2254"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <sodipodi:guide
-       orientation="horizontal"
-       position="0"
-       id="guide4273" />
-    <sodipodi:guide
-       orientation="horizontal"
-       position="48"
-       id="guide4275" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="0"
-       id="guide4437" />
-    <sodipodi:guide
-       orientation="vertical"
-       position="48"
-       id="guide4439" />
-  </sodipodi:namedview>
-  <rect
-     style="fill:url(#linearGradient4371);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="rect4011"
-     width="47.866001"
-     height="47.866001"
-     x="-48"
-     y="-47.866001"
-     transform="scale(-1,-1)"
-     inkscape:export-filename="/home/matt/eclipse33/eclipse-icon-bulb.png"
-     inkscape:export-xdpi="90"
-     inkscape:export-ydpi="90" />
-  <rect
-     style="fill:url(#linearGradient4368);fill-opacity:1;stroke:none;stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="rect3016"
-     width="45.866379"
-     height="45.866383"
-     x="1.1343775"
-     y="1.048512" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:1;fill:#c88cbb;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path4033"
-     sodipodi:cx="-30.021633"
-     sodipodi:cy="23.982693"
-     sodipodi:rx="20.014421"
-     sodipodi:ry="20.014421"
-     d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-     transform="translate(53.070541,-2.5560054e-2)" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:1;fill:url(#linearGradient4041);fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path4031"
-     sodipodi:cx="-30.021633"
-     sodipodi:cy="23.982693"
-     sodipodi:rx="20.014421"
-     sodipodi:ry="20.014421"
-     d="M -10.007212 23.982693 A 20.014421 20.014421 0 1 1  -50.036055,23.982693 A 20.014421 20.014421 0 1 1  -10.007212 23.982693 z"
-     transform="translate(55.071984,-2.5560054e-2)" />
-  <path
-     sodipodi:type="arc"
-     style="opacity:1;fill:#fffffa;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter4267)"
-     id="path4043"
-     sodipodi:cx="-38.944729"
-     sodipodi:cy="15.643351"
-     sodipodi:rx="8.9230967"
-     sodipodi:ry="8.8397036"
-     d="M -30.021632 15.643351 A 8.9230967 8.8397036 0 1 1  -47.867826,15.643351 A 8.9230967 8.8397036 0 1 1  -30.021632 15.643351 z"
-     transform="matrix(1.2616822,0,0,1.1226415,62.529072,-5.2595765)"
-     mask="url(#mask4181)" />
-  <g
-     id="g4417"
-     clip-path="url(#clipPath4423)"
-     transform="translate(50.116184,2.1870546e-2)">
-    <path
-       transform="translate(1.387814,-0.4734046)"
-       clip-path="none"
-       id="path4279"
-       d="M -47.32329,19.312662 L -6.0456207,19.312662"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4429);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       transform="translate(1.387814,-0.4734046)"
-       clip-path="none"
-       id="path4281"
-       d="M -47.32329,22.48125 L -6.045621,22.48125"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4431);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       transform="translate(1.387814,-0.4734046)"
-       clip-path="none"
-       id="path4283"
-       d="M -47.32329,25.482334 L -6.0456207,25.482334"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4433);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       transform="translate(1.387814,-0.4734046)"
-       clip-path="none"
-       id="path4285"
-       d="M -47.32329,28.481612 L -6.0456207,28.481612"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4435);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/testing/ekiga/PKGBUILD b/testing/ekiga/PKGBUILD
deleted file mode 100644
index 551e20c50..000000000
--- a/testing/ekiga/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169549 2012-10-23 12:35:22Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-
-pkgname=ekiga
-pkgver=3.9.90
-pkgrel=1
-pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
-url="http://www.ekiga.org"
-license=(GPL)
-arch=(i686 x86_64)
-depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'gtk2' 'gconf')
-makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost')
-optdepends=('evolution-data-server: Evolution integration')
-options=(!emptydirs)
-groups=('gnome-extra')
-install=ekiga.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d905169c257173196d235bad6501682cd07752a6a29577620cc4dfb91d8b77a9')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-install \
-      --disable-scrollkeeper --enable-dbus
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain ekiga "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/ekiga/ekiga.install b/testing/ekiga/ekiga.install
deleted file mode 100644
index 91f3a57a0..000000000
--- a/testing/ekiga/ekiga.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=ekiga
-
-post_install() {
-  gconfpkg --install $pkgname
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/testing/ekiga/gcc47.patch b/testing/ekiga/gcc47.patch
deleted file mode 100644
index f12c37524..000000000
--- a/testing/ekiga/gcc47.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From f81a43f2c4ed5e5083e3a850bc7164d11a910358 Mon Sep 17 00:00:00 2001
-From: Eugen Dedu <Eugen.Dedu@pu-pm.univ-fcomte.fr>
-Date: Sat, 24 Mar 2012 09:17:40 +0000
-Subject: Fix compile error with gcc 4.7
-
----
-diff --git a/lib/engine/account/bank-impl.h b/lib/engine/account/bank-impl.h
-index e16848e..b0a8775 100644
---- a/lib/engine/account/bank-impl.h
-+++ b/lib/engine/account/bank-impl.h
-@@ -203,7 +203,7 @@ template<typename AccountType>
- void
- Ekiga::BankImpl<AccountType>::add_account (boost::shared_ptr<AccountType> account)
- {
--  add_object (account);
-+  this->add_object (account);
- 
-   account->questions.connect (boost::ref (questions));
- }
-@@ -213,7 +213,7 @@ template<typename AccountType>
- void
- Ekiga::BankImpl<AccountType>::remove_account (boost::shared_ptr<AccountType> account)
- {
--  remove_object (account);
-+  this->remove_object (account);
- }
- 
- #endif
-diff --git a/lib/engine/addressbook/book-impl.h b/lib/engine/addressbook/book-impl.h
-index 711d8d9..4fea7d5 100644
---- a/lib/engine/addressbook/book-impl.h
-+++ b/lib/engine/addressbook/book-impl.h
-@@ -204,7 +204,7 @@ void
- Ekiga::BookImpl<ContactType>::add_contact (boost::shared_ptr<ContactType> contact)
- {
-   contact->questions.connect (boost::ref (questions));
--  add_object (contact);
-+  this->add_object (contact);
- }
- 
- 
-@@ -212,7 +212,7 @@ template<typename ContactType>
- void
- Ekiga::BookImpl<ContactType>::remove_contact (boost::shared_ptr<ContactType> contact)
- {
--  remove_object (contact);
-+  this->remove_object (contact);
- }
- 
- #endif
-diff --git a/lib/engine/addressbook/source-impl.h b/lib/engine/addressbook/source-impl.h
-index a30cd03..630236f 100644
---- a/lib/engine/addressbook/source-impl.h
-+++ b/lib/engine/addressbook/source-impl.h
-@@ -206,7 +206,7 @@ template<typename BookType>
- void
- Ekiga::SourceImpl<BookType>::add_book (boost::shared_ptr<BookType> book)
- {
--  add_object (book);
-+  this->add_object (book);
- 
-   add_connection (book, book->contact_added.connect (boost::bind (boost::ref (contact_added), book, _1)));
- 
-diff --git a/lib/engine/presence/cluster-impl.h b/lib/engine/presence/cluster-impl.h
-index 245a7c6..92074a8 100644
---- a/lib/engine/presence/cluster-impl.h
-+++ b/lib/engine/presence/cluster-impl.h
-@@ -147,7 +147,7 @@ Ekiga::ClusterImpl<HeapType>::add_heap (boost::shared_ptr<HeapType> heap)
- 
-   add_connection (heap, heap->questions.connect (boost::ref (questions)));
- 
--  add_object (heap);
-+  this->add_object (heap);
- }
- 
- template<typename HeapType>
-diff --git a/lib/engine/presence/heap-impl.h b/lib/engine/presence/heap-impl.h
-index d63c491..15fe86f 100644
---- a/lib/engine/presence/heap-impl.h
-+++ b/lib/engine/presence/heap-impl.h
-@@ -160,14 +160,14 @@ Ekiga::HeapImpl<PresentityType>::add_presentity (boost::shared_ptr<PresentityTyp
- {
-   presentity->questions.connect (boost::ref (questions));
- 
--  add_object (presentity);
-+  this->add_object (presentity);
- }
- 
- template<typename PresentityType>
- void
- Ekiga::HeapImpl<PresentityType>::remove_presentity (boost::shared_ptr<PresentityType> presentity)
- {
--  remove_object (presentity);
-+  this->remove_object (presentity);
- }
- 
- #endif
---
-cgit v0.9.0.2
diff --git a/testing/elfutils/PKGBUILD b/testing/elfutils/PKGBUILD
deleted file mode 100644
index d368534a4..000000000
--- a/testing/elfutils/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 166408 2012-09-07 16:52:26Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
-
-pkgname=elfutils
-pkgver=0.155
-pkgrel=1
-pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/elfutils/"
-license=('LGPL3' 'GPL' 'GPL3')
-depends=('gcc-libs' 'zlib' 'bzip2' 'xz')
-provides=('libelf')
-replaces=('libelf')
-conflicts=('libelf')
-options=('!makeflags')
-source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}
-        elfutils-0.155-binutils-pr-ld-13621.patch)
-sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b'
-          'fcd0ebd029b305bf030983daf151a2a1ab5294af'
-          '8a8be7c0686c6311c1ce969ba10494e704ead48c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CFLAGS+=" -g"  # required for test-suite success
-  patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch
-  ./configure --prefix=/usr --program-prefix="eu-"
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch b/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
deleted file mode 100644
index 7f99ac0be..000000000
--- a/testing/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh
-index 4b01008..7a5f0c8 100755
---- a/tests/run-elflint-self.sh
-+++ b/tests/run-elflint-self.sh
-@@ -18,4 +18,11 @@
- 
- . $srcdir/test-subr.sh
- 
-+# Makes sure we exit cleanly even when we don't...
-+clean_exit()
-+{
-+  if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi
-+}
-+trap clean_exit EXIT
-+
- testrun_on_self ../src/elflint --quiet --gnu-ld
diff --git a/testing/emacs/PKGBUILD b/testing/emacs/PKGBUILD
deleted file mode 100644
index a31a7259a..000000000
--- a/testing/emacs/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 169633 2012-10-25 01:34:57Z eric $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
-
-pkgname=emacs
-pkgver=24.2
-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' 'libotf' 'm17n-lib' 'gtk3' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
-install=emacs.install
-source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.bz2{,.sig})
-md5sums=('1676803a50e8adc817fdaaebb9234f14' 'ca1766337f419ef827dd96d1ff78f158')
-
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --with-x-toolkit=gtk3 --with-xft
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # remove conflict with ctags package
-  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
-  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
-  # fix all the 777 perms on directories
-  find "$pkgdir"/usr/share/emacs/$_majorver -type d -exec chmod 755 {} \;
-  # fix user/root permissions on usr/share files
-  find "$pkgdir"/usr/share/emacs/$_majorver -exec chown root:root {} \;
-  # fix perms on /var/games
-  chmod 775 "$pkgdir"/var/games
-  chmod 775 "$pkgdir"/var/games/emacs
-  chmod 664 "$pkgdir"/var/games/emacs/*
-  chown -R root:games "$pkgdir"/var/games
-}
diff --git a/testing/emacs/emacs.install b/testing/emacs/emacs.install
deleted file mode 100644
index d84f1de14..000000000
--- a/testing/emacs/emacs.install
+++ /dev/null
@@ -1,32 +0,0 @@
-ICON_PATH=usr/share/icons/hicolor
-INFO_DIR=usr/share/info
-
-INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
-ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
-forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
-org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
-speedbar tramp url vip viper widget woman)
-
-post_install() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gtk-update-icon-cache -q -t -f ${ICON_PATH}
-  update-desktop-database -q
-
-  [[ -x usr/bin/install-info ]] || return 0
-  for f in ${INFO_FILES[@]}; do
-    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
-  done
-}
diff --git a/testing/empathy/PKGBUILD b/testing/empathy/PKGBUILD
deleted file mode 100644
index 3e619e29b..000000000
--- a/testing/empathy/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 169460 2012-10-21 14:03:14Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=empathy
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Empathy"
-license=('GPL2')
-depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto')
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-rakia: SIP support'
-            'telepathy-haze: libpurple support'
-            'nautilus-sendto: Send files from nautilus')
-options=('!libtool')
-groups=('gnome-extra')
-install=empathy.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('12d936a39182500da7541bdd42327949c241b454fde462be52d137aae3c56183')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static \
-      --disable-schemas-compile \
-      --enable-gst-1.0=yes
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/empathy/empathy.install b/testing/empathy/empathy.install
deleted file mode 100644
index f8d2dfb1f..000000000
--- a/testing/empathy/empathy.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_remove() {
-    post_upgrade
-}
diff --git a/testing/enblend-enfuse/PKGBUILD b/testing/enblend-enfuse/PKGBUILD
deleted file mode 100644
index 0f3dd0551..000000000
--- a/testing/enblend-enfuse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169634 2012-10-25 01:34:59Z eric $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=enblend-enfuse
-pkgver=4.0
-pkgrel=8
-pkgdesc="Intelligent blend tool for overlapping picture"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://enblend.sourceforge.net"
-depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
-makedepends=('boost' 'mesa')
-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
-  LIBS="-lboost_system" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-753b534c819d"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 doc/enblend.info "${pkgdir}/usr/share/info/enblend.info"
-  install -D -m644 doc/enfuse.info "${pkgdir}/usr/share/info/enfuse.info"
-}
diff --git a/testing/enblend-enfuse/enblend-4.0-libpng15.patch b/testing/enblend-enfuse/enblend-4.0-libpng15.patch
deleted file mode 100644
index d4465ccad..000000000
--- a/testing/enblend-enfuse/enblend-4.0-libpng15.patch
+++ /dev/null
@@ -1,220 +0,0 @@
---- src/vigra_impex/png.cxx
-+++ src/vigra_impex/png.cxx
-@@ -81,7 +81,7 @@
- static void PngError( png_structp png_ptr, png_const_charp error_msg )
- {
-     png_error_message = std::string(error_msg);
--    longjmp( png_ptr->jmpbuf, 1 );
-+    longjmp( png_jmpbuf( png_ptr ), 1 );
- }
- 
- // called on non-fatal errors
-@@ -213,7 +213,7 @@
-         vigra_postcondition( png != 0, "could not create the read struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_create_info_struct(): ").c_str() );
-         }
-@@ -221,14 +221,14 @@
-         vigra_postcondition( info != 0, "could not create the info struct." );
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-         png_init_io( png, file.get() );
- 
-         // specify that the signature was already read
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_read_struct( &png, &info, NULL );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_sig_bytes(): ").c_str() );
-         }
-@@ -244,13 +244,13 @@
-     void PngDecoderImpl::init()
-     {
-         // read all chunks up to the image data
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_info(): ").c_str() );
-         png_read_info( png, info );
- 
-         // pull over the header fields
-         int interlace_method, compression_method, filter_method;
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_get_IHDR(): ").c_str() );
-         png_get_IHDR( png, info, &width, &height, &bit_depth, &color_type,
-                       &interlace_method, &compression_method, &filter_method );
-@@ -264,7 +264,7 @@
- 
-         // transform palette to rgb
-         if ( color_type == PNG_COLOR_TYPE_PALETTE) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_palette_to_rgb(): ").c_str() );
-             png_set_palette_to_rgb(png);
-             color_type = PNG_COLOR_TYPE_RGB;
-@@ -273,7 +273,7 @@
- 
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-             png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-@@ -283,7 +283,7 @@
- #if 0
-         // strip alpha channel
-         if ( color_type & PNG_COLOR_MASK_ALPHA ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_strip_alpha(): ").c_str() );
-             png_set_strip_alpha(png);
-             color_type ^= PNG_COLOR_MASK_ALPHA;
-@@ -323,12 +323,12 @@
- 
-         // read icc profile
- #if (PNG_LIBPNG_VER > 10008) && defined(PNG_READ_iCCP_SUPPORTED)
--        char * dummyName;
-+        png_charpp dummyName;
-         int dummyCompType;
--        char * profilePtr;
-+        png_bytepp profilePtr;
-         png_uint_32 profileLen;
--        if (info->valid & PNG_INFO_iCCP) {
--            png_get_iCCP(png, info, &dummyName, &dummyCompType, &profilePtr, &profileLen) ;
-+        if (png_get_valid(png, info, PNG_INFO_iCCP)) {
-+            png_get_iCCP(png, info, dummyName, &dummyCompType, profilePtr, &profileLen) ;
-             iccProfilePtr = (unsigned char *) profilePtr;
-             iccProfileLength = profileLen;
-         }
-@@ -340,7 +340,7 @@
-         // image gamma
-         double image_gamma = 0.45455;
-         if ( png_get_valid( png, info, PNG_INFO_gAMA ) ) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_get_gAMA(): ").c_str() );
-             png_get_gAMA( png, info, &image_gamma );
-         }
-@@ -349,26 +349,26 @@
-         double screen_gamma = 2.2;
- 
-         // set gamma correction
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_gamma(): ").c_str() );
-         png_set_gamma( png, screen_gamma, image_gamma );
- #endif
- 
-         // interlace handling, get number of read passes needed
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_set_interlace_handling(): ").c_str());
-         n_interlace_passes = png_set_interlace_handling(png);
- 
-         // update png library state to reflect any changes that were made
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_read_update_info(): ").c_str() );
-         png_read_update_info( png, info );
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_channels(): ").c_str());
-         n_channels = png_get_channels(png, info);
- 
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false,png_error_message.insert(0, "error in png_get_rowbytes(): ").c_str());
-         rowsize = png_get_rowbytes(png, info);
- 
-@@ -379,7 +379,7 @@
-     void PngDecoderImpl::nextScanline()
-     {
-         for (int i=0; i < n_interlace_passes; i++) {
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false,png_error_message.insert(0, "error in png_read_row(): ").c_str());
-             png_read_row(png, row_data.begin(), NULL);
-         }
-@@ -545,7 +545,7 @@
-         vigra_postcondition( png != 0, "could not create the write struct." );
- 
-         // create info struct
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_info_struct(): ").c_str() );
-         }
-@@ -556,7 +556,7 @@
-         }
- 
-         // init png i/o
--        if (setjmp(png->jmpbuf)) {
-+        if (setjmp(png_jmpbuf( png ))) {
-             png_destroy_write_struct( &png, &info );
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_init_io(): ").c_str() );
-         }
-@@ -571,7 +571,7 @@
-     void PngEncoderImpl::finalize()
-     {
-         // write the IHDR
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_set_IHDR(): ").c_str() );
-         png_set_IHDR( png, info, width, height, bit_depth, color_type,
-                       PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-@@ -579,7 +579,7 @@
- 
-         // set resolution
-         if (x_resolution > 0 && y_resolution > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_pHYs(): ").c_str() );
-             png_set_pHYs(png, info, (png_uint_32) (x_resolution / 0.0254 + 0.5),
-                          (png_uint_32) (y_resolution / 0.0254 + 0.5),
-@@ -588,7 +588,7 @@
- 
-         // set offset
-         if (position.x > 0 && position.y > 0) {
--            if (setjmp(png->jmpbuf))
-+            if (setjmp(png_jmpbuf( png )))
-                 vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
-             png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
-         }
-@@ -597,12 +597,12 @@
-         // set icc profile
-         if (iccProfile.size() > 0) {
-             png_set_iCCP(png, info, "icc", 0,
--                         (char *)iccProfile.begin(), iccProfile.size());
-+                         iccProfile.begin(), iccProfile.size());
-         }
- #endif
- 
-         // write the info struct
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
-         png_write_info( png, info );
- 
-@@ -634,10 +634,10 @@
-         }
- 
-         // write the whole image
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_image(): ").c_str() );
-         png_write_image( png, row_pointers.begin() );
--        if (setjmp(png->jmpbuf))
-+        if (setjmp(png_jmpbuf( png )))
-             vigra_postcondition( false, png_error_message.insert(0, "error in png_write_end(): ").c_str() );
-         png_write_end(png, info);
-     }
diff --git a/testing/enblend-enfuse/enblend-enfuse.install b/testing/enblend-enfuse/enblend-enfuse.install
deleted file mode 100644
index 24ea28a4e..000000000
--- a/testing/enblend-enfuse/enblend-enfuse.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=usr/share/info
-filelist=(enblend.info enfuse.info)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/enblend-enfuse/libpng-1.4.patch b/testing/enblend-enfuse/libpng-1.4.patch
deleted file mode 100644
index 3bf852b58..000000000
--- a/testing/enblend-enfuse/libpng-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx enblend-enfuse-3.2/src/vigra_impex/png.cxx
---- enblend-enfuse-3.2-orig/src/vigra_impex/png.cxx	2010-01-19 22:09:36.000000000 -0500
-+++ enblend-enfuse-3.2/src/vigra_impex/png.cxx	2010-01-19 22:13:43.000000000 -0500
-@@ -275,8 +275,8 @@
-         // expand gray values to at least one byte size
-         if ( color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8 ) {
-             if (setjmp(png->jmpbuf))
--                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_gray_1_2_4_to_8(): ").c_str());
--            png_set_gray_1_2_4_to_8(png);
-+                vigra_postcondition( false,png_error_message.insert(0, "error in png_set_expand_gray_1_2_4_to_8(): ").c_str());
-+            png_set_expand_gray_1_2_4_to_8(png);
-             bit_depth = 8;
-         }
- 
diff --git a/testing/eog-plugins/PKGBUILD b/testing/eog-plugins/PKGBUILD
deleted file mode 100644
index 3b9071fd2..000000000
--- a/testing/eog-plugins/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169261 2012-10-18 19:28:57Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=eog-plugins
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Plugins for Eye of Gnome"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org/"
-license=('GPL2')
-depends=('eog' 'libchamplain' 'libgdata')
-makedepends=('intltool')
-install=eog-plugins.install
-options=('!libtool')
-groups=(gnome-extra)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/eog-plugins/eog-plugins.install b/testing/eog-plugins/eog-plugins.install
deleted file mode 100644
index 24072f316..000000000
--- a/testing/eog-plugins/eog-plugins.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/eog/PKGBUILD b/testing/eog/PKGBUILD
deleted file mode 100644
index eed12259c..000000000
--- a/testing/eog/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169260 2012-10-18 19:28:54Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=eog
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Eye of Gnome: An image viewing and cataloging program"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf')
-makedepends=('gtk-doc' 'intltool' 'itstool')
-install=eog.install
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4442ec61b0c5092c686ccd13038359eb50e48ee49176a588b8ea04072c19bd57')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # remove it from Xfce menu that ships its own thingy
-  echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop
-}
diff --git a/testing/eog/eog.install b/testing/eog/eog.install
deleted file mode 100644
index 1571179ca..000000000
--- a/testing/eog/eog.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/epiphany-extensions/PKGBUILD b/testing/epiphany-extensions/PKGBUILD
deleted file mode 100644
index 3dc63bab9..000000000
--- a/testing/epiphany-extensions/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169258 2012-10-18 19:28:46Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany-extensions
-pkgver=3.6.0
-pkgrel=1
-url="http://www.gnome.org/projects/epiphany/"
-pkgdesc="Various extentions for the Epiphany web browser"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('epiphany' 'opensp' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=epiphany-extensions.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3a1cc21b44a7b00cfe055b87c23f20f16c9fbd2b5a30380338885a5ae0847f7a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/epiphany-extensions/epiphany-extensions.install b/testing/epiphany-extensions/epiphany-extensions.install
deleted file mode 100644
index c0ed9a0d7..000000000
--- a/testing/epiphany-extensions/epiphany-extensions.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/epiphany/PKGBUILD b/testing/epiphany/PKGBUILD
deleted file mode 100644
index e44998d06..000000000
--- a/testing/epiphany/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169259 2012-10-18 19:28:50Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=epiphany
-pkgver=3.6.1
-pkgrel=1
-install=epiphany.install
-pkgdesc="A GNOME web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
-         'hicolor-icon-theme' 'gcr' 'gnome-desktop')
-makedepends=('intltool' 'gnome-doc-utils' 'startup-notification')
-options=('!libtool' '!emptydirs')
-groups=('gnome')
-url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/epiphany/epiphany.install b/testing/epiphany/epiphany.install
deleted file mode 100644
index 8b17fa3d4..000000000
--- a/testing/epiphany/epiphany.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/ethtool/PKGBUILD b/testing/ethtool/PKGBUILD
deleted file mode 100644
index f019057d5..000000000
--- a/testing/ethtool/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 165198 2012-08-12 20:15:37Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Contributor: Martin Kemp <mdkemp@elys.com>
-
-pkgname=ethtool
-pkgver=3.5
-pkgrel=1
-epoch=1
-pkgdesc="Utility for controlling network drivers and hardware"
-arch=('i686' 'x86_64')
-url="http://www.kernel.org/pub/software/network/ethtool/"
-license=('GPL')
-depends=('glibc')
-source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('021b5785f65637a04d65c2d44d6c2250')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --mandir=/usr/share/man
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evince/PKGBUILD b/testing/evince/PKGBUILD
deleted file mode 100644
index 98d1f5674..000000000
--- a/testing/evince/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169538 2012-10-23 11:07:56Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evince
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Simply a document viewer"
-url="http://projects.gnome.org/evince/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas')
-makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl')
-optdepends=('texlive-bin: DVI support'
-	    'gvfs: bookmark support and session saving')
-groups=('gnome-extra')
-install=evince.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1b87b2579d438a126391f9044611b472e9f7b5b712e40b5645b0810164bc41b5')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr   --sysconfdir=/etc \
-      --localstatedir=/var    --libexecdir=/usr/lib/evince \
-      --disable-static        --enable-nautilus \
-      --enable-pdf            --enable-tiff \
-      --enable-djvu           --enable-dvi \
-      --enable-t1lib          --enable-comics \
-      --disable-scrollkeeper  --disable-schemas-compile \
-      --enable-introspection
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evince/evince.install b/testing/evince/evince.install
deleted file mode 100644
index 1571179ca..000000000
--- a/testing/evince/evince.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/evolution-data-server/PKGBUILD b/testing/evolution-data-server/PKGBUILD
deleted file mode 100644
index 45fee9741..000000000
--- a/testing/evolution-data-server/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169256 2012-10-18 19:28:39Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution-data-server
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Centralized access to appointments and contacts"
-arch=('i686' 'x86_64')
-depends=('gnome-online-accounts' 'nss' 'krb5' 'libgweather' 'libical' 'db' 'libgdata')
-makedepends=('intltool' 'gperf' 'gobject-introspection' 'vala')
-options=('!libtool')
-install=$pkgname.install
-url="http://www.gnome.org"
-license=('GPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('637fcb6a83601af2968ca0b600958da8b0f25444224edc5fae41dea995924150')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-openldap=yes \
-      --libexecdir=/usr/lib/evolution-data-server \
-      --with-krb5=/usr --with-libdb=/usr \
-      --enable-vala-bindings
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evolution-data-server/evolution-data-server.install b/testing/evolution-data-server/evolution-data-server.install
deleted file mode 100644
index 29a359805..000000000
--- a/testing/evolution-data-server/evolution-data-server.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove () {
-    post_install
-}
diff --git a/testing/evolution-ews/PKGBUILD b/testing/evolution-ews/PKGBUILD
deleted file mode 100644
index de2a41619..000000000
--- a/testing/evolution-ews/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169254 2012-10-18 19:28:32Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=evolution-ews
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="MS Exchange integration through Exchange Web Services"
-arch=('i686' 'x86_64')
-license=('LGPL2.1')
-url="http://www.gnome.org"
-depends=('evolution-data-server' 'gtkhtml4' 'gnome-desktop')
-makedepends=('intltool' 'evolution')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a1d40971f47bfd947349f48a86f8a5ec7252db41b9b0d19204b4e28f2408a96a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/evolution --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evolution/PKGBUILD b/testing/evolution/PKGBUILD
deleted file mode 100644
index cc34dc7bd..000000000
--- a/testing/evolution/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 169383 2012-10-20 09:13:48Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=evolution
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Manage your email, contacts and schedule"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf')
-makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager')
-optdepends=('bogofilter: possible junk filter plugin'
-            'spamassassin: possible junk filter plugin')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-install=evolution.install
-url=http://www.gnome.org/projects/evolution/
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7aa0730d6815cc44dbde75b4464697dd9d51584f48e9e03e86c2e5ca5a97a521')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib \
-      --enable-nss=yes \
-      --with-openldap=yes \
-      --enable-smime=yes \
-      --with-krb5=/usr \
-      --disable-schemas-compile
-  
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/evolution/evolution.install b/testing/evolution/evolution.install
deleted file mode 100644
index 67eca41f0..000000000
--- a/testing/evolution/evolution.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/evolution.schemas ]; then
-    gconfpkg --uninstall evolution
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/exiv2/PKGBUILD b/testing/exiv2/PKGBUILD
deleted file mode 100644
index 0d5a550d2..000000000
--- a/testing/exiv2/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-#$Id: PKGBUILD 164674 2012-08-02 15:21:12Z andrea $
-# Maintainer: tobias <tobias@arhlinux.org>
-
-pkgname=exiv2
-pkgver=0.23
-pkgrel=1
-pkgdesc="Exif and Iptc metadata manipulation library and tools"
-arch=('i686' 'x86_64')
-url="http://exiv2.org"
-license=('GPL')
-depends=('gcc-libs' 'zlib' 'expat')
-options=('!libtool')
-source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5f342bf642477526f41add11d6ee7787cdcd639f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/farstream/PKGBUILD b/testing/farstream/PKGBUILD
deleted file mode 100644
index de76e2a49..000000000
--- a/testing/farstream/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169253 2012-10-18 19:28:28Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=farstream
-pkgver=0.2.1
-pkgrel=1
-pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
-arch=(i686 x86_64)
-url="http://www.freedesktop.org/wiki/Software/Farstream"
-license=('LGPL2.1')
-depends=('gst-plugins-base-libs' 'libnice')
-makedepends=('gobject-introspection')
-optdepends=('gst-plugins-good' 'gst-plugins-bad')
-conflicts=('farsight2')
-replaces=('farsight2')
-options=(!libtool)
-source=(http://freedesktop.org/software/$pkgname/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('479c42adf5cc606abcb47d58ed542414')
-
-build() {
-  cd  "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --with-package-name='Arch Linux farstream package' \
-    --with-package-origin='http://archlinux.org' \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/fetchmail/PKGBUILD b/testing/fetchmail/PKGBUILD
deleted file mode 100644
index f4045b5c2..000000000
--- a/testing/fetchmail/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 165877 2012-09-02 12:54:03Z pierre $
-
-pkgname=fetchmail
-pkgver=6.3.22
-pkgrel=1
-pkgdesc="A remote-mail retrieval utility"
-arch=('i686' 'x86_64')
-url="http://fetchmail.berlios.de/"
-license=('GPL')
-depends=('openssl')
-makedepends=('python2')
-optdepends=('tk: for using fetchmailconf'
-            'python2: for using fetchmailconf')
-backup=('etc/conf.d/fetchmail')
-options=('!makeflags')
-install='fetchmail.install'
-source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz"
-        "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc"
-        'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
-sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19'
-          '27184b75ef09c5202bede9863ae8abc3d0cdb1d2'
-          'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
-          '30401729386d6f774c6c36ab8530842166de54a8'
-          '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
-          '11ff81fc8363a54099880da18634b0d1ecf9fa82')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
-  PYTHON=python2 ./configure --prefix=/usr --with-ssl=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
-  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
-  install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
-  install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf
-  install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service
-}
diff --git a/testing/fetchmail/fetchmail.conf b/testing/fetchmail/fetchmail.conf
deleted file mode 100644
index dcac2a067..000000000
--- a/testing/fetchmail/fetchmail.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Daemon polling interval
-INTERVAL=60
-
-# Config location
-CONFIG=/etc/fetchmailrc
diff --git a/testing/fetchmail/fetchmail.install b/testing/fetchmail/fetchmail.install
deleted file mode 100644
index 81b374c57..000000000
--- a/testing/fetchmail/fetchmail.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  # /etc/fetchmail must be owned by fetchmail for daemon to work.
-  echo "If you run fetchmail as a daemon and not a cron job"
-  echo "then 'chown fetchmail /etc/fetchmailrc'"
-  getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
-  if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
-  fi
-}
-
-post_upgrade() {
-  getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
-
-  if [ "$(vercmp $2 6.3.19-3)" -lt 0 ] ; then
-    usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
-  fi
-  if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
-  fi
-}
-
-pre_remove() {
-  usr/sbin/userdel fetchmail &>/dev/null
-}
diff --git a/testing/fetchmail/fetchmail.rc b/testing/fetchmail/fetchmail.rc
deleted file mode 100644
index 4d8b98d40..000000000
--- a/testing/fetchmail/fetchmail.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/fetchmail
-
-PID=`pidof -o %PPID /usr/bin/fetchmail`
-case "$1" in
-  start)
-    stat_busy "Starting fetchmail"
-    [ -z "$PID" ] &&
-      su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fetchmail
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fetchmail"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fetchmail
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/fetchmail/fetchmail.service b/testing/fetchmail/fetchmail.service
deleted file mode 100644
index 3e7da7545..000000000
--- a/testing/fetchmail/fetchmail.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=A remote-mail retrieval utility
-After=network.target
-
-[Service]
-User=fetchmail
-EnvironmentFile=/etc/conf.d/fetchmail
-ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG}
-RestartSec=1
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/fetchmail/fetchmail.tmpfiles b/testing/fetchmail/fetchmail.tmpfiles
deleted file mode 100644
index 07945f876..000000000
--- a/testing/fetchmail/fetchmail.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/fetchmail 700 fetchmail nobody
diff --git a/testing/ffmpeg/PKGBUILD b/testing/ffmpeg/PKGBUILD
deleted file mode 100644
index 265d45050..000000000
--- a/testing/ffmpeg/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 163055 2012-07-06 15:21:01Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ffmpeg
-pkgver=0.11.1
-pkgrel=1
-epoch=1
-pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
-url="http://ffmpeg.org/"
-license=('GPL')
-depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib)
-makedepends=('yasm' 'git' 'libvdpau')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('ff8cb914f657e164dd60ea1008b555a8')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --enable-libmp3lame \
-    --enable-libvorbis \
-    --enable-libxvid \
-    --enable-libx264 \
-    --enable-libvpx \
-    --enable-libtheora \
-    --enable-libgsm \
-    --enable-libspeex \
-    --enable-postproc \
-    --enable-shared \
-    --enable-x11grab \
-    --enable-libopencore_amrnb \
-    --enable-libopencore_amrwb \
-    --enable-libschroedinger \
-    --enable-libopenjpeg \
-    --enable-librtmp \
-    --enable-libpulse \
-    --enable-libv4l2 \
-    --enable-gpl \
-    --enable-version3 \
-    --enable-runtime-cpudetect \
-    --disable-debug \
-    --disable-static
-
-  make
-  make tools/qt-faststart
-  make doc/ff{mpeg,play,server}.1
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/ffmpegthumbnailer/PKGBUILD b/testing/ffmpegthumbnailer/PKGBUILD
deleted file mode 100644
index f9afaf39a..000000000
--- a/testing/ffmpegthumbnailer/PKGBUILD
+++ /dev/null
@@ -1,39 +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=5
-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' 'ffmpegapi_fix_r241.patch')
-options=('!libtool')
-sha1sums=('b8f5371aa995fefd1fb75e306e8cd76e8c9f3a73'
-          'bdd3ae35a5c6f0e1f4b0c7926f72b3429b2eaa53'
-          '4e1a6a0f06ae3ae322ea44046599ebf3ab693cb6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Don't use deprecated (removed?) ffmpeg api
-  patch -Np0 -i "${srcdir}/ffmpegapi_fix_r241.patch"
-
-  ./configure --prefix=/usr --enable-gio
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # FS#24105: Generate thumbnails in nautilus
-  # FS#26540: Rename to .thumbnailer for nautilus
-  install -Dm644 "${srcdir}/ffmpegthumbnailer.desktop" \
-    "${pkgdir}/usr/share/thumbnailers/ffmpegthumbnailer.thumbnailer"
-}
diff --git a/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch b/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
deleted file mode 100644
index 37e65b059..000000000
--- a/testing/ffmpegthumbnailer/ffmpegapi_fix_r241.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- libffmpegthumbnailer/moviedecoder.cpp.old	2012-05-20 11:57:04.503450287 +0200
-+++ libffmpegthumbnailer/moviedecoder.cpp	2012-05-20 11:57:14.633450566 +0200
-@@ -58,19 +58,26 @@
- void MovieDecoder::initialize(const string& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     string inputFile = filename == "-" ? "pipe:" : filename;
-     m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0);
--
-+    
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0)
-+#else
-+	if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0)
-+#endif
-     {
- 		destroy();
-         throw logic_error(string("Could not open input file: ") + filename);
-     }
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if (av_find_stream_info(m_pFormatContext) < 0)
-+#else
-+	if (avformat_find_stream_info(m_pFormatContext, NULL) < 0)
-+#endif
-     {
- 		destroy();
-         throw logic_error(string("Could not find stream information"));
-@@ -90,8 +97,12 @@
- 
-     if ((!m_FormatContextWasGiven) && m_pFormatContext)
-     {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         av_close_input_file(m_pFormatContext);
-         m_pFormatContext = NULL;
-+#else
-+        avformat_close_input(&m_pFormatContext);
-+#endif
-     }
- 
-     if (m_pPacket)
-@@ -159,7 +170,11 @@
- 
-     m_pVideoCodecContext->workaround_bugs = 1;
- 
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-     if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0)
-+#else
-+	if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0)
-+#endif
-     {
-         throw logic_error("Could not open video codec");
-     }
diff --git a/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop b/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop
deleted file mode 100644
index 79203e5bc..000000000
--- a/testing/ffmpegthumbnailer/ffmpegthumbnailer.desktop
+++ /dev/null
@@ -1,4 +0,0 @@
-[Thumbnailer Entry]
-TryExec=ffmpegthumbnailer
-Exec=ffmpegthumbnailer -s %s -i %u -o %o -c png -f -t 10
-MimeType=video/flv;video/webm;video/mkv;video/mp4;video/mpeg;video/avi;video/ogg;video/quicktime;video/x-avi;video/x-flv;video/x-mp4;video/x-mpeg;video/x-webm;video/x-mkv;application/x-extension-webm;video/x-matroska;video/x-ms-wmv;video/x-msvideo;video/x-msvideo/avi;video/x-theora/ogg;video/x-theora/ogv;video/x-ms-asf;video/x-m4v;
diff --git a/testing/flex/PKGBUILD b/testing/flex/PKGBUILD
deleted file mode 100644
index 1c9e16129..000000000
--- a/testing/flex/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 164717 2012-08-04 01:16:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=flex
-pkgver=2.5.37
-pkgrel=1
-pkgdesc="A tool for generating text-scanning programs"
-arch=('i686' 'x86_64')
-url="http://flex.sourceforge.net"
-license=('custom')
-groups=('base-devel')
-depends=('glibc' 'm4' 'sh')
-install=flex.install
-source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2
-        lex.sh)
-md5sums=('c75940e1fc25108f2a7b3ef42abdae06'
-         'f725259ec23a9e87ee29e2ef82eda9a5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd $srcdir/$pkgname-$pkgver
-  
-  # these tests used features removed in bison-2.6
-  sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in
-
-  make check
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-  install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex
-
-  install -Dm644 COPYING \
-  	$pkgdir/usr/share/licenses/$pkgname/license.txt
-}
-
diff --git a/testing/flex/flex.install b/testing/flex/flex.install
deleted file mode 100644
index 5b328c722..000000000
--- a/testing/flex/flex.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(flex.info{,-1,-2})
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/flex/lex.sh b/testing/flex/lex.sh
deleted file mode 100644
index 13e7de692..000000000
--- a/testing/flex/lex.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/flex -l "$@"
diff --git a/testing/fluidsynth/PKGBUILD b/testing/fluidsynth/PKGBUILD
deleted file mode 100644
index 30569612a..000000000
--- a/testing/fluidsynth/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 166535 2012-09-09 20:43:05Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=fluidsynth
-pkgver=1.1.6
-pkgrel=1
-pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications"
-arch=('i686' 'x86_64')
-url="http://www.fluidsynth.org/"
-depends=('glib2' 'jack' 'dbus-core' 'libpulse')
-makedepends=('cmake' 'ladspa' 'doxygen')
-optdepends=('pulseaudio: PulseAudio sound support')
-license=('LGPL')
-backup=('etc/conf.d/fluidsynth')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-        'fluidsynth.conf'
-        'fluidsynth.rc'
-        'fluidsynth.systemd')
-md5sums=('ae5aca6de824b4173667cbd3a310b263'
-         '7d0ab0d75d4e87652f4cb7ffeac8a82b'
-         'b296dbfb524c2164f552f68bd9abe2ec'
-         'e0406748a154409907df62292be32e8a')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-          -DCMAKE_BUILD_TYPE=Release \
-          -Denable-ladspa=ON \
-          -DLIB_SUFFIX=""
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  install -Dm644 "$srcdir/fluidsynth.conf" \
-    "$pkgdir/etc/conf.d/fluidsynth"
-
-  install -Dm755 "$srcdir/fluidsynth.rc" \
-    "$pkgdir/etc/rc.d/fluidsynth"
-
-  install -Dm644 "$srcdir/fluidsynth.systemd" \
-    "$pkgdir/usr/lib/systemd/system/fluidsynth.service"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/fluidsynth/fluidsynth.conf b/testing/fluidsynth/fluidsynth.conf
deleted file mode 100644
index b8465fa2e..000000000
--- a/testing/fluidsynth/fluidsynth.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-FSYNTH_OPTS="-a alsa -m alsa_seq -r 48000"
-FSYNTH_SOUNDFONT="" # path to your soundfont
diff --git a/testing/fluidsynth/fluidsynth.install b/testing/fluidsynth/fluidsynth.install
deleted file mode 100644
index 86e05f892..000000000
--- a/testing/fluidsynth/fluidsynth.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-	echo
-	echo "  > To use FluidSynth as a daemon edit /etc/conf.d/fluidsynth"
-	echo
-	echo "  > Systemd users need to copy the service file from:"
-	echo "      /usr/lib/systemd/system/fluidsynth.service"
-	echo "  > to:"
-	echo "      /etc/systemd/system/multi-user.target.wants/"
-	echo "  > and then edit accordingly."
-	echo
-	echo "  > PulseAudio output when running as a daemon"
-	echo "  > is known to be problematic. See:"
-	echo "      https://bbs.archlinux.org/viewtopic.php?id=135092"
-	echo
-}
-
-post_upgrade() {
-	post_install
-}
diff --git a/testing/fluidsynth/fluidsynth.rc b/testing/fluidsynth/fluidsynth.rc
deleted file mode 100644
index ca1e8fa6e..000000000
--- a/testing/fluidsynth/fluidsynth.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f /etc/conf.d/fluidsynth ] && . /etc/conf.d/fluidsynth
-
-PID=`pidof -o %PPID /usr/bin/fluidsynth`
-case "$1" in
-   start)
-     stat_busy "Starting Fluidsynth soundfont synthesizer"
-     [ -z "$PID" ] && /usr/bin/fluidsynth -is $FSYNTH_OPTS $FSYNTH_SOUNDFONT > /dev/null 2>&1 &
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       echo $PID > /var/run/fluidsynth.pid
-       add_daemon fluidsynth
-       stat_done
-     fi
-     ;;
-   stop)
-     stat_busy "Stopping Fluidsynth soundfont synthesizer"
-     [ ! -z "$PID" ]  && kill $PID &> /dev/null 2>&1
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm /var/run/fluidsynth.pid
-       rm_daemon fluidsynth
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 1
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/fluidsynth/fluidsynth.systemd b/testing/fluidsynth/fluidsynth.systemd
deleted file mode 100644
index 06784fe05..000000000
--- a/testing/fluidsynth/fluidsynth.systemd
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=FluidSynth Daemon
-After=sound.target
-
-[Service]
-ExecStart=/usr/bin/fluidsynth -is -a alsa -m alsa_seq -r 48000 # append soundfont path here
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/folks/PKGBUILD b/testing/folks/PKGBUILD
deleted file mode 100644
index c4099d927..000000000
--- a/testing/folks/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169251 2012-10-18 19:28:21Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=folks
-pkgver=0.8.0
-pkgrel=1
-pkgdesc="Library to aggregates people into metacontacts"
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org/wiki/Folks"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb' 'libzeitgeist')
-makedepends=('gobject-introspection' 'intltool')
-install=folks.install
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/folks/folks.install b/testing/folks/folks.install
deleted file mode 100644
index c19349f72..000000000
--- a/testing/folks/folks.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/fontconfig/29-replace-bitmap-fonts.conf b/testing/fontconfig/29-replace-bitmap-fonts.conf
deleted file mode 100644
index 7ac4483c4..000000000
--- a/testing/fontconfig/29-replace-bitmap-fonts.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-    <!-- Replace generic bitmap font names by generic font families.
-         These font-families will get replaced by other rules and
-	 default to scaled ones. -->
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Helvetica</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Arial</string>
-            <string>Liberation Sans</string>	    
-            <string>sans-serif</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Courier</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Courier New</string>
-            <string>Liberation Mono</string>
-            <string>monospace</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Times</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Times New Roman</string>
-            <string>Liberation Serif</string>
-            <string>serif</string>
-        </edit>
-    </match>
-</fontconfig>
diff --git a/testing/fontconfig/PKGBUILD b/testing/fontconfig/PKGBUILD
deleted file mode 100644
index ffa5f2544..000000000
--- a/testing/fontconfig/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 166194 2012-09-05 14:35:55Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=fontconfig
-pkgver=2.10.1
-pkgrel=2
-pkgdesc="A library for configuring and customizing font access"
-arch=(i686 x86_64)
-url="http://www.fontconfig.org/release/"
-license=('custom')
-depends=('expat' 'freetype2')
-options=('!libtool')
-install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
-        29-replace-bitmap-fonts.conf)
-md5sums=('c94e380eea42f2f23ca9537035ef1899'
-         'f6b67e8cc79197ed6abd4701911e83da')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
-  libtoolize -f
-  autoreconf -f
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-templatedir=/etc/fonts/conf.avail \
-    --with-xmldir=/etc/fonts \
-    --localstatedir=/var \
-    --disable-static \
-    --with-default-fonts=/usr/share/fonts \
-    --with-add-fonts=/usr/share/fonts
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # not upstream, not in FC and not in Gentoo, this should probably go upstream
-  # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back
-  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
-  pushd $pkgdir/etc/fonts/conf.d
-  ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf .
-  popd
-
-  #Install license
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/testing/fontconfig/fontconfig.install b/testing/fontconfig/fontconfig.install
deleted file mode 100644
index 3a0ca573b..000000000
--- a/testing/fontconfig/fontconfig.install
+++ /dev/null
@@ -1,39 +0,0 @@
-post_install() {
-  cat << _EOF
-  
-  Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d.
-  Read /etc/fonts/conf.d/README for more information.
-
-  Configuration via /etc/fonts/local.conf is still possible,
-  but is no longer recommended for options available in conf.avail.
-
-  Main systemwide configuration should be done by symlinks
-  (especially for autohinting, sub-pixel and lcdfilter):
-  
-  cd /etc/fonts/conf.d
-  ln -s ../conf.avail/XX-foo.conf
-  
-  Check also https://wiki.archlinux.org/index.php/Font_Configuration
-  and https://wiki.archlinux.org/index.php/Fonts.
-
-_EOF
-
-  echo -n "updating font cache... "
-  /usr/bin/fc-cache -f
-  echo "done."
-}
-
-post_upgrade() {
-  echo -n "updating font cache... "
-  /usr/bin/fc-cache -f
-  echo "done."
-}
-
-post_remove() {
-  cat << _EOF
-
-  Check for dead symlinks and leftover files 
-  in /etc/fonts/conf.d/
-  
-_EOF
-}
diff --git a/testing/fssos-nsvs/PKGBUILD b/testing/fssos-nsvs/PKGBUILD
deleted file mode 100644
index aca81ddc4..000000000
--- a/testing/fssos-nsvs/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167185 2012-09-26 22:19:44Z tomegun $
-# Maintainer: Dale Blount <dale@archlinux.org>
-
-pkgname=fssos-nsvs
-pkgver=0.5
-pkgrel=9
-pkgdesc="NSVS for FSSOS"
-arch=('i686' 'x86_64')
-url="http://fssos.sourceforge.net/"
-license=('GPL')
-depends=('bash' 'mysql')
-backup=('etc/nsvsd.conf')
-options=('!libtool' '!makeflags')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/sourceforge/fssos/nsvs-$pkgver.tar.gz"
-        'nsvsd'
-	'nsvsd.service')
-
-build() {
-  cd $srcdir/nsvs-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make CFLAGS="${CFLAGS} -D_GNU_SOURCE"
-}
-
-package() {
-  cd $srcdir/nsvs-$pkgver
-  make DESTDIR=$pkgdir install
-  install -D -m755 "$srcdir/nsvsd" "$pkgdir/etc/rc.d/nsvsd"
-  install -D -m644 "$srcdir/nsvsd.service" "$pkgdir/usr/lib/systemd/system/nsvsd.service"
-}
-md5sums=('3f17c2f6339f1a322b712b467023d825'
-         '4dfd9dc0d69b375587e39ab2621d9ea9'
-         '61e970d0704875b1da83cb4e9fc0eef5')
diff --git a/testing/fssos-nsvs/fssos-nsvs.install b/testing/fssos-nsvs/fssos-nsvs.install
deleted file mode 100644
index 253ae64d2..000000000
--- a/testing/fssos-nsvs/fssos-nsvs.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    if [ -z "`grep '^nsvsd::' /etc/group`" ]; then
-	groupadd -g 83 nsvsd
-    fi
-    if [ -z "`grep '^nsvsd:' /etc/passwd`" ]; then
-	useradd -u 83 -d /tmp -g nsvsd -s /bin/false nsvsd
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-pre_remove() {
-    userdel nsvsd &> /dev/null
-    groupdel nsvsd &> /dev/null
-}
diff --git a/testing/fssos-nsvs/nsvsd b/testing/fssos-nsvs/nsvsd
deleted file mode 100755
index f9b4845ab..000000000
--- a/testing/fssos-nsvs/nsvsd
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting nsvsd"
-	/usr/sbin/nsvsd -f /etc/nsvsd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon nsvsd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping nsvsd"
-    kill `cat /var/run/nsvsd.pid` &>/dev/null
-    rm -f /var/run/nsvsd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon nsvsd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/fssos-nsvs/nsvsd.service b/testing/fssos-nsvs/nsvsd.service
deleted file mode 100644
index 0df5444ab..000000000
--- a/testing/fssos-nsvs/nsvsd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Name Service Via Sockets Daemon
-
-[Service]
-ExecStart=/usr/sbin/nsvsd -f /etc/nsvsd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ftgl/PKGBUILD b/testing/ftgl/PKGBUILD
deleted file mode 100644
index 590190dae..000000000
--- a/testing/ftgl/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168280 2012-10-07 17:22:30Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-
-pkgname=ftgl
-_pkgver=2.1.3-rc5
-pkgver=${_pkgver/-/}
-pkgrel=4
-pkgdesc="OpenGL library to use arbitrary fonts"
-arch=(i686 x86_64)
-url="http://ftgl.wiki.sourceforge.net/"
-license=(MIT)
-depends=(freetype2 mesa glu)
-makedepends=(doxygen)
-options=('!libtool')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2")
-md5sums=('c7879018cde844059495b3029b0b6503')
-
-build() {
-  cd "$srcdir/$pkgname-${_pkgver/-/~}"
-  ./configure --prefix=/usr --with-pic --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-${_pkgver/-/~}"
-  make DESTDIR="$pkgdir" install
-
-  # FS#23283: install missing headers for OpenCascade
-  install -m644 src/FT{Face,Library,Size}.h "$pkgdir/usr/include/FTGL/"
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/fyre/PKGBUILD b/testing/fyre/PKGBUILD
deleted file mode 100644
index 4e0b82218..000000000
--- a/testing/fyre/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169635 2012-10-25 01:35:01Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=fyre
-pkgver=1.0.1
-pkgrel=6
-pkgdesc="Rendering of the Peter de Jong map"
-arch=('i686' 'x86_64')
-url="http://fyre.navi.cx/"
-license=('GPL')
-depends=('openexr' 'libglade' 'gnet' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
-install=fyre.install
-source=(http://releases.navi.cx/fyre/fyre-${pkgver}.tar.bz2)
-sha1sums=('41c0ec45eff16cc1bba081c5c855a3980e404835')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make update_xdgmime=/bin/false update_fdodesktop=/bin/false gtk_update_icon_cache=/bin/false \
-    prefix="${pkgdir}/usr" install
-}
diff --git a/testing/fyre/fyre.install b/testing/fyre/fyre.install
deleted file mode 100644
index 388efbb11..000000000
--- a/testing/fyre/fyre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gc/PKGBUILD b/testing/gc/PKGBUILD
deleted file mode 100644
index 43dd94dbc..000000000
--- a/testing/gc/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 159218 2012-05-18 10:37:19Z jgc $
-# Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
-
-pkgname=gc
-pkgver=7.2
-pkgrel=1
-pkgdesc="A garbage collector for C and C++"
-arch=('i686' 'x86_64')
-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=('d17aecedef3d73e75387fb63558fa4eb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-cplusplus
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share/gc"
-  install -m755 -d "${pkgdir}/usr/share/doc/gc"
-  install -m644 doc/README{,.{changes,contributors,environment,linux}} \
-    "${pkgdir}/usr/share/doc/gc/"
-
-  sed -i -e 's/GC_MALLOC 1L/gc 3/' doc/gc.man
-  install -m755 -d "${pkgdir}/usr/share/man/man3"
-  install -m644 doc/gc.man "${pkgdir}/usr/share/man/man3/gc.3"
-}
diff --git a/testing/gcalctool/PKGBUILD b/testing/gcalctool/PKGBUILD
deleted file mode 100644
index 0634cb9fe..000000000
--- a/testing/gcalctool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169250 2012-10-18 19:28:17Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gcalctool
-pkgver=6.6.1
-pkgrel=1
-pkgdesc="GNOME Scientific calculator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'dconf')
-makedepends=('intltool' 'yelp-tools')
-groups=('gnome-extra')
-options=(!emptydirs)
-url="http://www.gnome.org"
-install=gcalctool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('bc08a583f13f239a2b731f3478afa1077957b51563dd35f9ee303cb5f9b29016')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gcalctool/gcalctool.install b/testing/gcalctool/gcalctool.install
deleted file mode 100644
index 2ef26aaa9..000000000
--- a/testing/gcalctool/gcalctool.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
deleted file mode 100644
index 993e23ea6..000000000
--- a/testing/gcc/PKGBUILD
+++ /dev/null
@@ -1,271 +0,0 @@
-# $Id: PKGBUILD 169654 2012-10-25 03:35:23Z 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.7.2
-pkgrel=2
-#_snapshot=4.7-20120721
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'doxygen')
-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
-	gcc_pure64.patch
-	gcc-4.7.1-libada-pic.patch
-	gcc-4.7.1-libgo-write.patch)
-md5sums=('cc308a0891e778cfda7a151ab8a6e762'
-         'ced48436c1b3c981d721a829f1094de1'
-         '2acbc9d35cc9d72329dc71d6b1f162ef'
-         'df82dd175ac566c8a6d46b11ac21f14c')
-
-
-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 -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
-
-  # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-  
-  # bug to file...
-  patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.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 \
-      --disable-ppl-version-check --disable-cloog-version-check \
-      --enable-lto --enable-gold --enable-ld=default \
-      --enable-plugin --with-plugin-ld=ld.gold \
-      --with-linker-hash-style=gnu \
-      --disable-multilib --disable-libssp \
-      --disable-build-with-cxx --disable-build-poststage1-with-cxx \
-      --enable-checking=release
-  make
-  
-  # make documentation
-  cd $CHOST/libstdc++-v3
-  make doc-man-doxygen
-}
-
-check() {
-  cd ${srcdir}/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.16')
-  install=gcc-libs.install
-
-  cd ${srcdir}/gcc-build
-  make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
-  for lib in libmudflap libgomp libstdc++-v3/src libitm; 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 -C $CHOST/libitm 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 -r ${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.23' 'libmpc' 'cloog' 'ppl')
-  groups=('base-devel')
-  install=gcc.install
-
-  cd ${srcdir}/gcc-build
-  
-  make -j1 DESTDIR=${pkgdir} install
-
-  install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
-  mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
-
-  # unfortunately it is much, much easier to install the lot and clean-up the mess...
-  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}
-  rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
-  rm -r $pkgdir/usr/lib/go
-  rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.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 expect this symlinks
-  ln -s gcc ${pkgdir}/usr/bin/cc
-
-  # 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 -t ${pkgdir}/usr/share/man/man3 \
-    ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3
-
-  # 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 ${srcdir}/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
-
-  ln -s gfortran ${pkgdir}/usr/bin/f95
-
-  # 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 ${srcdir}/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 ${srcdir}/gcc-build/gcc
-  make -j1 DESTDIR=$pkgdir ada.install-{common,info}
-  install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
-  ln -s gcc ${pkgdir}/usr/bin/gnatgcc
-  
-  # 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 ${srcdir}/gcc-build
-  make -j1 DESTDIR=$pkgdir install-target-libgo
-  make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
-  install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
-  # Install Runtime Library Exception
-  install -Dm644 ${_basedir}/COPYING.RUNTIME \
-    ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/testing/gcc/gcc-4.7.0-cloog-0.17.patch b/testing/gcc/gcc-4.7.0-cloog-0.17.patch
deleted file mode 100644
index c7146fa04..000000000
--- a/testing/gcc/gcc-4.7.0-cloog-0.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
diff --git a/testing/gcc/gcc-4.7.1-libada-pic.patch b/testing/gcc/gcc-4.7.1-libada-pic.patch
deleted file mode 100644
index 591da1e4a..000000000
--- a/testing/gcc/gcc-4.7.1-libada-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in	2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in	2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- 	-fexceptions -DIN_RTS @have_getipinfo@
- 
- host_subdir = @host_subdir@
diff --git a/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch
deleted file mode 100644
index 427efe8a6..000000000
--- a/testing/gcc/gcc-4.7.1-libgo-mksysinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh	2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh	2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
--  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
--  rusage=`echo $rusage | sed -e 's/^ *//'`
-   # Remove anonymous unions from GNU/Linux <bits/resource.h>.
-   rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+  rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+  rusage=`echo $rusage | sed -e 's/^ *//'`
-   nrusage=
-   while test -n "$rusage"; do
-     field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/testing/gcc/gcc-4.7.1-libgo-write.patch b/testing/gcc/gcc-4.7.1-libgo-write.patch
deleted file mode 100644
index a7be83fda..000000000
--- a/testing/gcc/gcc-4.7.1-libgo-write.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
---- gcc-4.7.1-orig/libgo/runtime/print.c	2012-05-26 04:22:14.000000000 +1000
-+++ gcc-4.7.1/libgo/runtime/print.c	2012-06-16 15:06:28.553138502 +1000
-@@ -17,7 +17,8 @@
- 	G* g = runtime_g();
- 
- 	if(g == nil || g->writebuf == nil) {
--		runtime_write(2, v, n);
-+		ssize_t bytesWritten = runtime_write(2, v, n);
-+		(void)bytesWritten;
- 		return;
- 	}
- 	
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-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 a9b09bbcf..000000000
--- a/testing/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
---- gcc-orig/gcc/config/i386/linux64.h	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/linux64.h	2011-07-24 19:48:05.000000000 +1000
-@@ -28,6 +28,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
- 
--#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"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
---- gcc-orig/gcc/config/i386/t-linux64	2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/t-linux64	2011-07-24 19:49:41.000000000 +1000
-@@ -34,8 +34,8 @@
- comma=,
- MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES   = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
- 
- LIBGCC = stmp-multilib
diff --git a/testing/gcc4.6/PKGBUILD b/testing/gcc4.6/PKGBUILD
deleted file mode 100644
index 9ff9eac31..000000000
--- a/testing/gcc4.6/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 161915 2012-06-16 14:55:05Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-pkgname=gcc4.6
-pkgver=4.6.3
-_ver=${pkgver:0:3}
-pkgrel=2
-pkgdesc="The GNU Compiler Collection ($_ver; C and C++)"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-depends=('glibc' 'binutils' 'gmp' 'mpfr' 'libmpc' 'ppl' 'isl' 'cloog')
-makedepends=('flex' 'bison')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
-        gcc_pure64.patch
-        gcc-hash-style-both.patch
-        gcc-4.6.2-cloog-0.17.patch)
-md5sums=('773092fe5194353b02bb0110052a972e'
-         '4030ee1c08dd1e843c0225b772360e76'
-         '4df25b623799b148a0703eaeec8fdf3f'
-         '6d9939a2e667376031679ac9f9c49263')
-
-build() {
-  cd gcc-$pkgver
-
-  # 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 -p1 -i ${srcdir}/gcc_pure64.patch
-  fi
-  patch -p0 -i ${srcdir}/gcc-hash-style-both.patch
-
-  # compatibility with latest cloog
-  patch -p1 -i ${srcdir}/gcc-4.6.2-cloog-0.17.patch
-
-  echo ${pkgver} > gcc/BASE-VER
-
-  cd ..
-  mkdir gcc-build
-  cd gcc-build
-
-  ../gcc-$pkgver/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --mandir=/usr/share/man --infodir=/usr/share/info \
-      --datadir=/usr/share/gcc-$_ver \
-      --with-bugurl=https://bugs.archlinux.org/ \
-      --enable-languages=c,c++,lto \
-      --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 \
-      --program-suffix=-$_ver \
-      --enable-version-specific-runtime-libs
-
-  make
-}
-
-check() {
-  # 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 -C gcc-build -k check || true
-  gcc-$pkgver/contrib/test_summary
-}
-
-package()
-{
-  make -j1 -C gcc-build DESTDIR=${pkgdir} install
-
-  # Install Runtime Library Exception
-  install -Dm644 gcc-$pkgver/COPYING.RUNTIME \
-    $pkgdir/usr/share/licenses/$pkgname/RUNTIME.LIBRARY.EXCEPTION
-
-  # deal with conflicting man and info pages
-  cd $pkgdir
-  rm usr/share/man/man7/{fsf-funding,gfdl,gpl}.7
-  for i in usr/share/info/*; do
-    mv $i ${i%.info}-$_ver.info
-  done
-}
diff --git a/testing/gcc4.6/gcc-4.6.2-cloog-0.17.patch b/testing/gcc4.6/gcc-4.6.2-cloog-0.17.patch
deleted file mode 100644
index 0503a05ed..000000000
--- a/testing/gcc4.6/gcc-4.6.2-cloog-0.17.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure	2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure	2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
-     LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
- 
-     if test "${cloog_org}" = yes ; then
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
--    || CLOOG_VERSION_MINOR != 16 \
--    || CLOOG_VERSION_REVISION < 1
-+    || CLOOG_VERSION_MINOR != 17
-     choke me
-    #endif
-   ;
-diff -Naur gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c
---- gcc-4.6-20120120-orig/gcc/graphite-clast-to-gimple.c	2011-03-13 08:05:38.000000000 +1000
-+++ gcc-4.6-20120120/gcc/graphite-clast-to-gimple.c	2012-02-03 17:51:47.943463879 +1000
-@@ -1367,7 +1367,7 @@
-   /* Change cloog output language to C.  If we do use FORTRAN instead, cloog
-      will stop e.g. with "ERROR: unbounded loops not allowed in FORTRAN.", if
-      we pass an incomplete program to cloog.  */
--  options->language = LANGUAGE_C;
-+  options->language = CLOOG_LANGUAGE_C;
- 
-   /* Enable complex equality spreading: removes dummy statements
-      (assignments) in the generated code which repeats the
diff --git a/testing/gcc4.6/gcc-hash-style-both.patch b/testing/gcc4.6/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/testing/gcc4.6/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/gcc4.6/gcc_pure64.patch b/testing/gcc4.6/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/testing/gcc4.6/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/gcr/PKGBUILD b/testing/gcr/PKGBUILD
deleted file mode 100644
index ef21fdbbd..000000000
--- a/testing/gcr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169249 2012-10-18 19:28:14Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gcr
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A library for bits of crypto UI and parsing"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('dconf' 'desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-install=gcr.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d95f8b70bdcc371c2712ba166e124114bd99bbde1173c0cbe7a8462f146a9927')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --libexec=/usr/lib/gcr \
-    --disable-static \
-    --disable-update-mime \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gcr/gcr.install b/testing/gcr/gcr.install
deleted file mode 100644
index 8677671c4..000000000
--- a/testing/gcr/gcr.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install () {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    update-mime-database /usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade () {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gdk-pixbuf2/PKGBUILD b/testing/gdk-pixbuf2/PKGBUILD
deleted file mode 100644
index e3dc9a299..000000000
--- a/testing/gdk-pixbuf2/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169248 2012-10-18 19:28:10Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gdk-pixbuf2
-pkgver=2.26.4
-pkgrel=1
-pkgdesc="An image loading library"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11')
-makedepends=('gtk-doc' 'gobject-introspection')
-options=('!libtool')
-install=gdk-pixbuf2.install
-source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be')
-
-build() {
-  cd gdk-pixbuf-$pkgver
-
-  ./configure --prefix=/usr \
-    --without-libjasper \
-    --with-x11 \
-    --with-included-loaders=png
-  make
-}
-
-package() {
-  cd gdk-pixbuf-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gdk-pixbuf2/gdk-pixbuf2.install b/testing/gdk-pixbuf2/gdk-pixbuf2.install
deleted file mode 100644
index f04c0967a..000000000
--- a/testing/gdk-pixbuf2/gdk-pixbuf2.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-   gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache
-}
diff --git a/testing/gdl/PKGBUILD b/testing/gdl/PKGBUILD
deleted file mode 100644
index efbed0c95..000000000
--- a/testing/gdl/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169247 2012-10-18 19:28:06Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdl
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME Docking Library"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.gnome.org/"
-depends=('gtk3')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('32a04fc96667e2f7ca1e3c853b996da3e62f4811b2a90d62cb2081f68aeecac3')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gdm/PKGBUILD b/testing/gdm/PKGBUILD
deleted file mode 100644
index a7f614765..000000000
--- a/testing/gdm/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 169280 2012-10-18 19:45:52Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gdm
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Gnome Display Manager"
-arch=(i686 x86_64)
-license=(GPL)
-url="http://www.gnome.org"
-backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment
-        etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf)
-groups=(gnome)
-options=('!libtool')
-depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
-         xorg-xrdb nss polkit-gnome)
-makedepends=(itstool intltool gnome-doc-utils xorg-server gobject-introspection)
-optdepends=('gnome-shell: new login interface'
-            'fprintd: fingerprint authentication')
-install=gdm.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        fix_external_program_directories.patch)
-sha256sums=('aff69dde55e11b540145002c95cf966cd16376910283b385520431ced10c5031'
-            'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
-
-build() {
-  cd "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/fix_external_program_directories.patch"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/gdm \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-schemas-compile \
-    --with-at-spi-registryd-directory=/usr/lib/at-spi2-core \
-    --with-check-accelerated-directory=/usr/lib/gnome-session \
-    --with-authentication-agent-directory=/usr/lib/polkit-gnome \
-    --without-tcp-wrappers \
-    --without-console-kit \
-    --with-systemd \
-    --with-default-pam-config=exherbo
-
-  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 -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  chmod 1770 "$pkgdir/var/log/gdm"
-  chmod 700 "$pkgdir/var/lib/gdm/.config/dconf"
-  rm -r "$pkgdir/var/run" "$pkgdir/var/gdm"
-}
diff --git a/testing/gdm/fix_external_program_directories.patch b/testing/gdm/fix_external_program_directories.patch
deleted file mode 100644
index 5e51a776f..000000000
--- a/testing/gdm/fix_external_program_directories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c
---- gdm-3.3.92.orig/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:05.304823391 +0000
-+++ gdm-3.3.92/gui/simple-chooser/gdm-chooser-session.c	2012-03-19 22:30:17.004732251 +0000
-@@ -131,7 +131,7 @@
-         ret = FALSE;
- 
-         error = NULL;
--        g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error);
-+        g_spawn_command_line_async ("/usr/lib/gnome-settings-daemon/gnome-settings-daemon", &error);
-         if (error != NULL) {
-                 g_warning ("Error starting settings daemon: %s", error->message);
-                 g_error_free (error);
diff --git a/testing/gdm/gdm b/testing/gdm/gdm
deleted file mode 100755
index c3e635a6d..000000000
--- a/testing/gdm/gdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting GDM"
-    /usr/sbin/gdm &
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      
-      add_daemon gdm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GDM"
-    [ -f /var/run/gdm.pid ] && kill `cat /var/run/gdm.pid` &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gdm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/gdm/gdm-autologin.pam b/testing/gdm/gdm-autologin.pam
deleted file mode 100644
index bc0193df0..000000000
--- a/testing/gdm/gdm-autologin.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_permit.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/testing/gdm/gdm-fingerprint.pam b/testing/gdm/gdm-fingerprint.pam
deleted file mode 100644
index 38fab5782..000000000
--- a/testing/gdm/gdm-fingerprint.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_fprintd.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/testing/gdm/gdm-password.pam b/testing/gdm/gdm-password.pam
deleted file mode 100644
index eed5e1003..000000000
--- a/testing/gdm/gdm-password.pam
+++ /dev/null
@@ -1,22 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_unix.so nullok
-auth            optional        pam_gnome_keyring.so
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_unix.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
diff --git a/testing/gdm/gdm-smartcard.pam b/testing/gdm/gdm-smartcard.pam
deleted file mode 100644
index c5c29e73f..000000000
--- a/testing/gdm/gdm-smartcard.pam
+++ /dev/null
@@ -1,20 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-
-auth            requisite       pam_pkcs11.so wait_for_card card_only
-
-auth            sufficient      pam_succeed_if.so uid >= 1000 quiet
-auth            required        pam_deny.so
-
-account         required        pam_access.so
-account         required        pam_time.so
-account         required        pam_unix.so
-
-password        required        pam_pkcs11.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so revoke
-session         required        pam_limits.so
-session         required        pam_unix.so
diff --git a/testing/gdm/gdm-vt-allocation-hack.patch b/testing/gdm/gdm-vt-allocation-hack.patch
deleted file mode 100644
index 56fa5a151..000000000
--- a/testing/gdm/gdm-vt-allocation-hack.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
-index 39def47..03488fd 100644
---- a/daemon/gdm-server.c
-+++ b/daemon/gdm-server.c
-@@ -33,6 +33,8 @@
- #include <grp.h>
- #include <signal.h>
- #include <sys/resource.h>
-+#include <sys/ioctl.h>
-+#include <sys/vt.h>
- 
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -150,6 +152,92 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
-         return out;
- }
- 
-+#ifndef O_NOCTTY
-+# define O_NOCTTY 0
-+#endif
-+
-+static int
-+open_vt (int vtno)
-+{
-+	char *vtname;
-+	int fd;
-+
-+	vtname = g_strdup_printf ("/dev/tty%d", vtno);
-+
-+	do {
-+		errno = 0;
-+		fd = open (vtname, O_RDWR | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	g_free (vtname);
-+	return fd;
-+}
-+
-+static gint
-+find_first_probably_free_vt (void)
-+{
-+	int fd, fdv;
-+	int vtno;
-+	unsigned short vtmask;
-+	struct vt_stat vtstat;
-+	guint v_state;
-+
-+	fdv = -1;
-+
-+	do {
-+		errno = 0;
-+		fd = open ("/dev/console", O_WRONLY | O_NOCTTY, 0);
-+	} while (errno == EINTR);
-+
-+	if (fd >= 0) {
-+		if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0) {
-+			v_state = vtstat.v_state;
-+		} else {
-+			close (fd);
-+			v_state = 0;
-+			fd = -1;
-+		}
-+	} else {
-+		v_state = 0;
-+	}
-+
-+	if (fd < 0) {
-+		do {
-+			errno = 0;
-+			fd = open ("/dev/console", O_RDONLY | O_NOCTTY, 0);
-+		} while (errno == EINTR);
-+
-+		if (fd >= 0) {
-+			if (ioctl (fd, VT_GETSTATE, &vtstat) >= 0)
-+				v_state = vtstat.v_state;
-+		}
-+	}
-+
-+	for (vtno = 7, vtmask = 1 << vtno; vtmask; vtno++, vtmask <<= 1) {
-+		/* Is this console in use? */
-+		if (v_state & vtmask)
-+			continue;
-+
-+		/* No, try to open it */
-+		fdv = open_vt (vtno);
-+		if (fdv >= 0)
-+			break;
-+
-+		/* If we're here, kernel indicated that the console was free,
-+		 * but we failed to open it. Just go on to higher VTs. */
-+	}
-+
-+        if (fdv >= 0)
-+                close (fdv);
-+        else
-+		vtno = -1;
-+
-+	if (fd >= 0)
-+		close (fd);
-+
-+	return vtno;
-+}
-+
- char *
- gdm_server_get_display_device (GdmServer *server)
- {
-@@ -310,6 +398,11 @@ gdm_server_resolve_command_line (GdmServer  *server,
- 
-         if (vtarg != NULL && ! gotvtarg) {
-                 argv[len++] = g_strdup (vtarg);
-+        } else if (!query_in_arglist && !gotvtarg) {
-+                gint vtnum = find_first_probably_free_vt ();
-+
-+                if (vtnum > 0)
-+                        argv [len++] = g_strdup_printf ("vt%d", vtnum);
-         }
- 
-         argv[len++] = NULL;
diff --git a/testing/gdm/gdm-welcome.pam b/testing/gdm/gdm-welcome.pam
deleted file mode 100644
index cc3811c19..000000000
--- a/testing/gdm/gdm-welcome.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth            required        pam_env.so
-auth            required        pam_permit.so
-
-account         required        pam_nologin.so
-account         required        pam_unix.so
-
-password        required        pam_deny.so
-
-session         required        pam_loginuid.so
--session        optional        pam_systemd.so
-session         optional        pam_keyinit.so force revoke
diff --git a/testing/gdm/gdm.install b/testing/gdm/gdm.install
deleted file mode 100644
index c48faf4ae..000000000
--- a/testing/gdm/gdm.install
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=gdm
-
-post_install() {
-  getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
-  getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
-  passwd -l gdm > /dev/null
-  chown -R gdm:gdm /var/lib/gdm > /dev/null
-
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  dconf update
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    gconfpkg --uninstall ${pkgname}
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  dconf update
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  getent passwd gdm >/dev/null 2>&1 && userdel gdm
-  getent group gdm >/dev/null 2>&1 && groupdel gdm
-}
diff --git a/testing/gdm/gdm.pam b/testing/gdm/gdm.pam
deleted file mode 100644
index 655299cb7..000000000
--- a/testing/gdm/gdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-auth            optional        pam_gnome_keyring.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_gnome_keyring.so auto_start
-password        required        pam_unix.so
diff --git a/testing/gdm/gdm.service b/testing/gdm/gdm.service
deleted file mode 100644
index 0125934d6..000000000
--- a/testing/gdm/gdm.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Gnome Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/sbin/gdm -nodaemon
-Restart=always
-
-[Install]
-Alias=display-manager.service
diff --git a/testing/gedit/PKGBUILD b/testing/gedit/PKGBUILD
deleted file mode 100644
index 62827d8bc..000000000
--- a/testing/gedit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169246 2012-10-18 19:28:03Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gedit
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A text editor for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gedit.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('75fb18e32a7571900dda8cbd3a71212bded1ef714d3aa9f9513296eea02779a4')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \
-      --enable-python
-  make
-}
-
-package(){
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gedit/gedit.install b/testing/gedit/gedit.install
deleted file mode 100644
index 606920688..000000000
--- a/testing/gedit/gedit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/gedit.schemas ]; then
-        gconfpkg --uninstall gedit
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/geeqie/PKGBUILD b/testing/geeqie/PKGBUILD
deleted file mode 100644
index bb9a07057..000000000
--- a/testing/geeqie/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 164675 2012-08-02 15:21:18Z andrea $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=geeqie
-pkgver=1.0
-pkgrel=7
-pkgdesc="A lightweight image browser and viewer (fork of GQview)"
-arch=('i686' 'x86_64')
-url="http://geeqie.sourceforge.net/"
-license=('GPL3')
-depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
-makedepends=('intltool' 'doxygen' 'gnome-doc-utils')
-optdepends=('librsvg: SVG rendering')
-replaces=('gqview-devel')
-install=geeqie.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('8494a557d67d20e6ad720645ec789dd2b33a3266')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
-  make
-}
-
-package(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/geeqie/geeqie.install b/testing/geeqie/geeqie.install
deleted file mode 100644
index 2eaa60550..000000000
--- a/testing/geeqie/geeqie.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gegl/PKGBUILD b/testing/gegl/PKGBUILD
deleted file mode 100644
index c9f3a38cf..000000000
--- a/testing/gegl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169636 2012-10-25 01:35:02Z eric $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=gegl
-pkgver=0.2.0
-pkgrel=5
-pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
-url="http://www.gegl.org/"
-license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
-makedepends=('intltool' '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 gegl-0.2.0-ffmpeg-0.11.diff)
-sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
-          'c10fd988c634fcf0948cc91a51d6528f6f1704ba')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
-  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
-    --with-libavformat --with-jasper --disable-docs
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gegl/gegl-0.2.0-ffmpeg-0.11.diff b/testing/gegl/gegl-0.2.0-ffmpeg-0.11.diff
deleted file mode 100644
index a33ec6f7f..000000000
--- a/testing/gegl/gegl-0.2.0-ffmpeg-0.11.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
---- gegl-0.2.0/operations/external/ff-load.c	2012-04-01 13:17:57.000000000 +0200
-+++ gegl-0.2.0-1/operations/external/ff-load.c	2012-07-11 12:42:05.174756560 +0200
-@@ -271,7 +271,7 @@
-       gint err;
- 
-       ff_cleanup (o);
--      err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+err = avformat_open_input (&p->ic, o->path, NULL, NULL);
-       if (err < 0)
-         {
-           print_error (o->path, err);
diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD
deleted file mode 100644
index edd527ba7..000000000
--- a/testing/ghc/PKGBUILD
+++ /dev/null
@@ -1,129 +0,0 @@
-# $Id: PKGBUILD 167880 2012-10-03 15:19:04Z tdziedzic $
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Special note for devs looking to upgrade this package:
-#   ghc places a unique hash for each library when it is built.
-#   Libraries depend on versions specified by those hashes.
-#   This implies that all libraries need to be rebuilt when ghc is rebuilt.
-
-pkgname=ghc
-pkgver=7.6.1
-pkgrel=1
-pkgdesc='The Glasgow Haskell Compiler'
-arch=('i686' 'x86_64')
-url='http://www.haskell.org/ghc/'
-license=('custom')
-# libffi might be needed in the future: http://hackage.haskell.org/trac/ghc/ticket/4496
-depends=('perl' 'gmp>=5.0' 'gcc') # 'libffi')
-makedepends=('ghc' 'perl' 'libxslt' 'docbook-xsl')
-checkdepends=('python2')
-install='ghc.install'
-# keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-#options=('!makeflags')
-# missing rtl?
-provides=('haskell-array=0.4.0.1'
-          'haskell-base=4.6.0.0'
-          'haskell-binary=0.5.1.1'
-          'haskell-bin-package-db=0.0.0.0'
-          'haskell-bytestring=0.10.0.0'
-          'haskell-containers=0.5.0.0'
-          'haskell-deepseq=1.3.0.1'
-          'haskell-directory=1.2.0.0'
-          'haskell-filepath=1.3.0.1'
-          'haskell-ghc-prim=0.3.0.0'
-          'haskell-haskell2010=1.1.1.0'
-          'haskell-haskell98=2.0.0.2'
-          'haskell-hoopl=3.9.0.0'
-          'haskell-hpc=0.6.0.0'
-          'haskell-integer-gmp=0.5.0.0'
-          'haskell-old-locale=1.0.0.5'
-          'haskell-old-time=1.1.0.1'
-          'haskell-pretty=1.1.1.0'
-          'haskell-process=1.1.0.2'
-          'haskell-template-haskell=2.8.0.0'
-          'haskell-time=1.4.0.1'
-          'haskell-unix=2.6.0.0'
-          'haskell-cabal=1.16.0')
-replaces=('haskell-array<0.4.0.1'
-          'haskell-base<4.6.0.0'
-          'haskell-binary<0.5.1.1'
-          'haskell-bin-package-db<0.0.0.0'
-          'haskell-bytestring<0.10.0.0'
-          'haskell-containers<0.5.0.0'
-          'haskell-deepseq<1.3.0.1'
-          'haskell-directory<1.2.0.0'
-          'haskell-filepath<1.3.0.1'
-          'haskell-ghc-prim<0.3.0.0'
-          'haskell-haskell2010<1.1.1.0'
-          'haskell-haskell98<2.0.0.2'
-          'haskell-hoopl<3.9.0.0'
-          'haskell-hpc<0.6.0.0'
-          'haskell-integer-gmp<0.5.0.0'
-          'haskell-old-locale<1.0.0.5'
-          'haskell-old-time<1.1.0.1'
-          'haskell-pretty<1.1.1.0'
-          'haskell-process<1.1.0.2'
-          'haskell-template-haskell<2.8.0.0'
-          'haskell-time<1.4.0.1'
-          'haskell-unix<2.6.0.0'
-          'haskell-cabal<1.16.0')
-source=("http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-src.tar.bz2"
-        "http://www.haskell.org/ghc/dist/${pkgver}/ghc-${pkgver}-testsuite.tar.bz2"
-        'build.mk')
-md5sums=('e9d892d2970550ec5e70130b3621f6b6'
-         '0d93c458e3b445a7e524ef6ae459ce11'
-         'c367ef26300648ee9b8aca3dee5c9669')
-
-build() {
-  cd ghc-${pkgver}
-
-  cp ${srcdir}/build.mk mk/build.mk
-
-  ./configure \
-    --prefix=/usr
-
-  make
-}
-
-check() {
-  # keep this otherwise a lot of tests will show as unexpected failures... need to investigate why using -jn for n > 1 does this...
-  unset MAKEFLAGS
-
-  cd ghc-${pkgver}
-
-  # python2 rename
-  sed -e 's/PYTHON = python/&2/' -i testsuite/mk/boilerplate.mk
-  sed -e 's_#!/usr/bin/env python_&2_' -i testsuite/timeout/calibrate testsuite/timeout/timeout.py
-
-  # upstream known failures on both i686 and x86_64:
-  #    ghci.debugger/scripts     break011 [bad stderr] (ghci)
-  #    perf/compiler             parsing001 [stat not good enough] (normal)
-  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
-  # upstream known failures on i686 only:
-  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
-  make test
-
-  # enabling threads to speed up
-  # causes more failures than make test, need to investigate
-  # upstream known failures on both i686 and x86_64:
-  #    perf/compiler             parsing001 [stat not good enough] (normal)
-  #    simplCore/should_compile  spec-inline [stderr mismatch] (optasm)
-  # upstream known failures on i686 only:
-  #    numrun012 test fails on i686 works on x86_64 - http://hackage.haskell.org/trac/ghc/ticket/5856
-  #make THREADS=9 test
-
-  # will most likely cause lots of failures
-  # enable this when upstream has 0 test failures from a simple 'make test'
-  # zero unexpected failures on all tier 1 platforms - http://hackage.haskell.org/trac/ghc/ticket/5757
-  #make fulltest
-}
-
-package() {
-  cd ghc-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-
-  install -d ${pkgdir}/usr/share/licenses/ghc
-  install -m644 LICENSE \
-    ${pkgdir}/usr/share/licenses/ghc
-}
diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk
deleted file mode 100644
index bb57594bf..000000000
--- a/testing/ghc/build.mk
+++ /dev/null
@@ -1,200 +0,0 @@
-# -----------------------------------------------------------------------------
-# A Sample build.mk
-#
-# Uncomment one of the following BuildFlavour settings to get the desired
-# overall build type, and then tweak the options in the relevant section
-# below.
-
-# Uncomment one of these to select a build profile below:
-
-# Full build with max optimisation and everything enabled (very slow build)
-BuildFlavour = perf
-
-# As above but build GHC using the LLVM backend
-#BuildFlavour = perf-llvm
-
-# Fast build with optimised libraries, no profiling (RECOMMENDED):
-#BuildFlavour = quick
-
-# Even faster build.  NOT RECOMMENDED: the libraries will be
-# completely unoptimised, so any code built with this compiler
-# (including stage2) will run very slowly:
-#BuildFlavour = quickest
-
-# Profile the stage2 compiler:
-#BuildFlavour = prof
-
-# A development build, working on the stage 1 compiler:
-#BuildFlavour = devel1
-
-# A development build, working on the stage 2 compiler:
-#BuildFlavour = devel2
-
-# An unregisterised, optimised build of ghc, for porting:
-#BuildFlavour = unreg
-
-GhcLibWays = v
-
-# -------- 1. A Performance/Distribution build--------------------------------
-
-ifeq "$(BuildFlavour)" "perf"
-
-# perf matches the default settings, repeated here for comparison:
-
-SRC_HC_OPTS     = -O -H64m
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O2 -fasm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# ---------------- Perf build using LLVM -------------------------------------
-
-ifeq "$(BuildFlavour)" "perf-llvm"
-
-SRC_HC_OPTS     = -O -H64m -fllvm
-GhcStage1HcOpts = -O -fllvm
-GhcStage2HcOpts = -O2 -fllvm
-GhcHcOpts       = -Rghc-timing
-GhcLibHcOpts    = -O2
-GhcLibWays     += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# -------- A Fast build ------------------------------------------------------
-
-ifeq "$(BuildFlavour)" "quickest"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O0 -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- A Fast build with optimised libs ----------------------------------
-
-ifeq "$(BuildFlavour)" "quick"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O0 -fasm
-GhcLibHcOpts       = -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-# -------- Profile the stage2 compiler ---------------------------------------
-
-ifeq "$(BuildFlavour)" "prof"
-
-SRC_HC_OPTS        = -H64m -O0 -fasm
-GhcStage1HcOpts    = -O -fasm
-GhcStage2HcOpts    = -O -fasm
-GhcLibHcOpts       = -O -fasm
-
-GhcLibWays         += p
-GhcProfiled        = YES
-
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-
-endif
-
-
-# -------- A Development build (stage 1) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel1"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts    = -Rghc-timing -O -fasm
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = YES
-
-endif
-
-# -------- A Development build (stage 2) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel2"
-
-SRC_HC_OPTS        = -H64m -O -fasm
-GhcLibHcOpts       = -O -dcore-lint
-GhcStage1HcOpts    = -Rghc-timing -O -fasm
-GhcStage2HcOpts    = -Rghc-timing -O0 -DDEBUG
-SplitObjs          = NO
-HADDOCK_DOCS       = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS   = NO
-BUILD_DOCBOOK_PDF  = NO
-LAX_DEPENDENCIES   = YES
-
-# After stage 1 and the libraries have been built, you can uncomment this line:
-
-# stage=2
-
-# Then stage 1 will not be touched by the build system, until
-# you comment the line again.  This is a useful trick for when you're
-# working on stage 2 and want to freeze stage 1 and the libraries for
-# a while.
-
-endif
-
-# -------- A Unregisterised build) -------------------------------------------
-
-ifeq "$(BuildFlavour)" "unreg"
-
-# Note that the LLVM backend works in unregisterised mode as well as
-# registerised mode. This often makes it a good choice for porting
-# GHC.
-
-GhcUnregisterised    = YES
-GhcWithNativeCodeGen = NO
-
-SRC_HC_OPTS          = -O -H64m # -fllvm
-GhcStage1HcOpts      = -O
-GhcStage2HcOpts      = -O2
-GhcHcOpts            = -Rghc-timing
-GhcLibHcOpts         = -O2
-SplitObjs            = NO
-HADDOCK_DOCS         = NO
-BUILD_DOCBOOK_HTML   = NO
-BUILD_DOCBOOK_PS     = NO
-BUILD_DOCBOOK_PDF    = NO
-
-endif
-
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
-
-# NoFib settings
-NoFibWays =
-STRIP_CMD = :
-
diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install
deleted file mode 100644
index c0200e4a6..000000000
--- a/testing/ghc/ghc.install
+++ /dev/null
@@ -1,10 +0,0 @@
-pre_upgrade() {
-  echo '==> Unregistering cabalized packages...'
-  [[ -d /usr/share/haskell ]] && find /usr/share/haskell -maxdepth 2 -name 'unregister.sh' -exec {} \;
-  echo '==> Done.'
-}
-
-post_upgrade() {
-  echo '==> All cabalized packages need to be reinstalled now.'
-  echo '==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.'
-}
diff --git a/testing/ghc/print-provides-replaces.sh b/testing/ghc/print-provides-replaces.sh
deleted file mode 100755
index 33d1da051..000000000
--- a/testing/ghc/print-provides-replaces.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. PKGBUILD
-
-if [[ ! -d src/ghc-${pkgver}/libraries ]]; then
-  echo "error: no directory src/ghc-${pkgver}/libraries: You must extract the source tarball under src/"
-  exit 1
-fi
-
-declare -A exclude
-# no Win32 cause we're not building on windows
-exclude['Win32']=1
-# no integer-simple because we use integer-gmp
-exclude['integer-simple']=1
-# extract excluded libraries from ghc.mk
-for exclude_pkg in $(sed 's/PKGS_THAT_ARE_INTREE_ONLY := //p' -n src/ghc-${pkgver}/ghc.mk); do
-  exclude[${exclude_pkg}]=1
-done
-
-cd src/ghc-${pkgver}/libraries
-
-# $1 is the name of the variable
-# $2 is the string for the test, either '=' or '<'
-print_var() {
-  printf "$1=("
-  for pkg in $(ls ./*/*.cabal | awk -F '/' '{ print $2 }'); do
-    [[ ${exclude[${pkg}]} ]] && continue
-    version=$(awk 'tolower($0) ~ /^version:/ {print $2 }' $pkg/$pkg.cabal)
-    printf "'haskell-$pkg$2$version'\n          "
-  done
-  # also add cabal
-  version=$(awk 'tolower($0) ~ /^version:/ { print $2 }' Cabal/Cabal/Cabal.cabal)
-  printf "'haskell-cabal$2$version'\n          "
-  echo -e '\b)'
-}
-
-print_var 'provides' '='
-print_var 'replaces' '<'
diff --git a/testing/ghc/silence-gen_contents_index.diff b/testing/ghc/silence-gen_contents_index.diff
deleted file mode 100644
index 6d835f8fb..000000000
--- a/testing/ghc/silence-gen_contents_index.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ghc-7.4.2/libraries/gen_contents_index.original	2012-06-10 22:23:28.810059378 +0000
-+++ ghc-7.4.2/libraries/gen_contents_index	2012-06-10 22:24:00.289814576 +0000
-@@ -47,7 +47,6 @@
- esac
- 
- # Now create the combined contents and index pages
--echo $HADDOCK_ARGS
- $HADDOCK --gen-index --gen-contents -o . \
-          -t "Haskell Hierarchical Libraries" \
-          -p "prologue.txt" \
diff --git a/testing/ghex/PKGBUILD b/testing/ghex/PKGBUILD
deleted file mode 100644
index adb0e8281..000000000
--- a/testing/ghex/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169245 2012-10-18 19:28:00Z jgc $
-# Maintainer: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=ghex
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A simple binary editor for the Gnome desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/Ghex"
-depends=('gtk3' 'hicolor-icon-theme')
-makedepends=('intltool' 'gnome-doc-utils')
-options=('!libtool' '!emptydirs')
-install=ghex.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/ghex/ghex.install b/testing/ghex/ghex.install
deleted file mode 100644
index 084bc82ee..000000000
--- a/testing/ghex/ghex.install
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=ghex
-
-post_install() {
-    glib-compile-schemas usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gimp-ufraw/PKGBUILD b/testing/gimp-ufraw/PKGBUILD
deleted file mode 100644
index a1fb561fd..000000000
--- a/testing/gimp-ufraw/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 164676 2012-08-02 15:21:23Z andrea $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=gimp-ufraw
-pkgver=0.18
-pkgrel=5
-pkgdesc="Standalone or gimp plugin converter for raw files"
-url="http://ufraw.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils')
-makedepends=('gimp' 'cinepaint')
-optdepends=('gimp: to use the gimp import plugin for raw images'
-            'cinepaint: to use the cinepaint import plugin for raw images')
-install=gimp-ufraw.install
-source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz)
-sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2')
-
-build() {
-  cd "${srcdir}/ufraw-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --enable-extras \
-              --enable-mime \
-              --enable-openmp
-  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/ufraw-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}/usr/bin/dcraw"
-}
diff --git a/testing/gimp-ufraw/gimp-ufraw.install b/testing/gimp-ufraw/gimp-ufraw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/gimp-ufraw/gimp-ufraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/git/ChangeLog b/testing/git/ChangeLog
deleted file mode 100644
index f0c15233e..000000000
--- a/testing/git/ChangeLog
+++ /dev/null
@@ -1,57 +0,0 @@
-Simple version bumps are omitted from the following ChangeLog.
-
-2011-08-16 Dan McGee <dan@archlinux.org>
-	Version 1.7.6.1-1
-	* Enable USE_LIBPCRE for `git grep -P` usage
-
-2011-05-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.5.1-1
-	* Byte compile emacs files (FS#20874)
-	* Respect CFLAGS/LDFLAGS (FS#23963)
-
-2011-04-27 Dan McGee <dan@archlinux.org>
-	Version 1.7.5-1
-	* Add missing optdepends for git send-email (FS#20923)
-
-2011-01-05 Dan McGee <dan@archlinux.org>
-	Version 1.7.3.5-1
-	* More flexible git-daemon RC scripts (FS#20575)
-
-2010-10-01 Allan McRae <allan@archlinux.org>
-	Version 1.7.3.1-2
-	* Python 2/3 rebuild
-
-2010-06-29 Dan McGee <dan@archlinux.org>
-	Version 1.7.1.1-1
-	* Add emacs completion files (FS#17968)
-	* Add git-daemon RC scripts (FS#19291)
-
-2009-06-05 Dan McGee <dan@archlinux.org>
-	Version 1.6.3.2-1
-	* Remove gitweb from /usr/share; it needs customization to be helpful
-	* Add NO_CROSS_DIRECTORY_HARDLINKS option to build (FS#13683)
-
-2008-09-14 Dan McGee <dan@archlinux.org>
-	Version 1.6.0.2-1
-	* Moved optional depends from install file to optdepends array
-
-2008-06-15 Dan McGee <dan@archlinux.org>
-	Version 1.5.6-1
-	* Removed 'cpio' dependency, clone is now a builtin and no longer needs it
-
-2008-02-02 Dan McGee <dan@archlinux.org>
-	Version 1.5.4-1
-	* Upstream version 1.5.4
-	* Enable pthreads support in pack-objects. To use, set the pack.threads
-	  git config option. Read manpages of pack-objects and config for more
-	  details.
-	* Changelog added (with entries going back a bit).
-
-2008-01-28 Kevin Piche <kevin@archlinux.org>
-	Version 1.5.3.7-2
-	* Updated for new perl policy (vendor dirs)
-	* Change license to GPL2
-
-2007-11-01 Eric Belanger <eric@archlinux.org>
-	Version 1.5.3.5-2
-	* Fix Perl module location
diff --git a/testing/git/PKGBUILD b/testing/git/PKGBUILD
deleted file mode 100644
index bc0f8c8df..000000000
--- a/testing/git/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# $Id: PKGBUILD 165368 2012-08-16 14:45:26Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=git
-pkgver=1.7.11.5
-pkgrel=2
-pkgdesc="the fast distributed version control system"
-arch=(i686 x86_64)
-url="http://git-scm.com/"
-license=('GPL2')
-depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre')
-makedepends=('python2' 'emacs')
-optdepends=('tk: gitk and git gui'
-            'perl-libwww: git svn'
-            'perl-term-readkey: git svn'
-            'perl-mime-tools: git send-email'
-            'perl-net-smtp-ssl: git send-email TLS support'
-            'perl-authen-sasl: git send-email TLS support'
-            'python2: various helper scripts'
-            'subversion: git svn'
-            'cvsps: git cvsimport')
-replaces=('git-core')
-provides=('git-core')
-backup=('etc/conf.d/git-daemon.conf')
-install=git.install
-source=("http://git-core.googlecode.com/files/git-$pkgver.tar.gz"
-        "http://git-core.googlecode.com/files/git-manpages-$pkgver.tar.gz"
-        git-daemon
-        git-daemon.conf
-        git-daemon@.service
-        git-daemon.socket)
-changelog=ChangeLog
-
-build() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    all
-
-  cd contrib/emacs
-  make prefix=/usr
-}
-
-check() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  local jobs
-  jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*')
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    NO_SVN_TESTS=y \
-    DEFAULT_TEST_TARGET=prove \
-    GIT_PROVE_OPTS="$jobs -Q" \
-    GIT_TEST_OPTS="--root=/dev/shm/" \
-    test
-}
-
-package() {
-  export PYTHON_PATH='/usr/bin/python2'
-  cd "$srcdir/$pkgname-$pkgver"
-  make prefix=/usr gitexecdir=/usr/lib/git-core \
-    CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \
-    USE_LIBPCRE=1 \
-    NO_CROSS_DIRECTORY_HARDLINKS=1 \
-    INSTALLDIRS=vendor DESTDIR="$pkgdir" install 
-
-  # bash completion
-  # until this is fixed, no point in loading it dynamically:
-  # http://git.661346.n2.nabble.com/bash-completion-now-loads-completions-dynamically-so-git-ps1-is-not-defined-when-you-open-a-shell-td7415323.html
-  #mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
-  #install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git 
-  mkdir -p "$pkgdir"/etc/bash_completion.d/
-  install -m644 ./contrib/completion/git-completion.bash "$pkgdir"/etc/bash_completion.d/git 
-  # more contrib stuff
-  cp -a ./contrib $pkgdir/usr/share/git/ 
-  # scripts are for python 2.x
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
-    $(find "$pkgdir" -name '*.py') \
-    "$pkgdir"/usr/lib/git-core/git-p4 \
-    "$pkgdir"/usr/share/git/gitview/gitview
-
-  # emacs interface
-  cd contrib/emacs
-  make prefix=/usr DESTDIR="$pkgdir" install
-
-  # how 'bout some manpages?
-  for mansect in man1 man5 man7; do
-    for manpage in "$srcdir"/$mansect/*; do
-      install -D -m644 $manpage "$pkgdir"/usr/share/man/$mansect/$(basename $manpage)
-    done
-  done
-
-  # remove perllocal.pod, .packlist, and empty directories.
-  rm -rf "$pkgdir"/usr/lib/perl5
-
-  # git daemon script
-  install -D -m755 "$srcdir"/git-daemon "$pkgdir"/etc/rc.d/git-daemon
-  install -D -m644 "$srcdir"/git-daemon.conf "$pkgdir"/etc/conf.d/git-daemon.conf
-
-  # systemd stuff
-  install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service
-  install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
-}
-
-md5sums=('9985d35c11531d546426ebefb327c847'
-         'f08a5a60e57f00399bbd384cfd7791f3'
-         '8e2648910fd5dd4f1c41d3c7fa9e9156'
-         '2e42bf97779a1c6411d89043334c9e78'
-         '198ef9d9e79bd8d5868f95ed9f79cc34'
-         '779c00deb490291c6b477b8cc0161123')
diff --git a/testing/git/git-daemon b/testing/git/git-daemon
deleted file mode 100644
index 21ba73ed5..000000000
--- a/testing/git/git-daemon
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-daemon_bin="/usr/lib/git-core/git-daemon"
-daemon_name=$(basename $daemon_bin)
-PIDF="/var/run/$daemon_name.pid"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-
-    PID=$(get_pid)
-    if [ -z "$PID" ]; then
-      [ -f $PIDF ] && rm -f $PIDF
-      # RUN
-      $daemon_bin --pid-file=$PIDF $GIT_DAEMON_ARGS
-      #
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $(get_pid) > $PIDF
-        add_daemon $daemon_name
-        stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    PID=$(get_pid)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      rm -f $PIDF &> /dev/null
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/git/git-daemon.conf b/testing/git/git-daemon.conf
deleted file mode 100644
index 3f9a12060..000000000
--- a/testing/git/git-daemon.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# path to git repositories served
-GIT_REPO="/srv/git/"
-# see `man git-daemon` for all available options
-# $GIT_REPO will be present twice in most configs
-GIT_DAEMON_ARGS="--detach --syslog --verbose --base-path=$GIT_REPO $GIT_REPO"
diff --git a/testing/git/git-daemon.socket b/testing/git/git-daemon.socket
deleted file mode 100644
index c84740588..000000000
--- a/testing/git/git-daemon.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Git Daemon Socket
-After=network.target
-
-[Socket]
-ListenStream=9418
-Accept=true
-
-[Install]
-WantedBy=sockets.target
diff --git a/testing/git/git-daemon@.service b/testing/git/git-daemon@.service
deleted file mode 100644
index 67d4cfa9c..000000000
--- a/testing/git/git-daemon@.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Git Daemon Instance
-After=network.target
-
-[Service]
-User=git
-# The '-' is to ignore non-zero exit statuses
-ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git
-StandardInput=socket
-StandardOutput=inherit
-StandardError=journal
diff --git a/testing/git/git.install b/testing/git/git.install
deleted file mode 100644
index 9edc065ba..000000000
--- a/testing/git/git.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  if ! getent group git >/dev/null; then
-    groupadd --system git 
-  fi
-  if ! getent passwd git >/dev/null; then
-    useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git 
-    passwd -l git >/dev/null
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  if getent passwd git >/dev/null; then
-    userdel git
-  fi
-  if getent group git >/dev/null; then
-    groupdel git
-  fi
-}
diff --git a/testing/gjs/PKGBUILD b/testing/gjs/PKGBUILD
deleted file mode 100644
index c08ea4dc7..000000000
--- a/testing/gjs/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169244 2012-10-18 19:27:55Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gjs
-pkgver=1.34.0
-pkgrel=1
-pkgdesc="Javascript Bindings for GNOME"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Gjs"
-license=('GPL')
-depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|python|python2|' scripts/make-tests
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/glade/PKGBUILD b/testing/glade/PKGBUILD
deleted file mode 100644
index 280591b87..000000000
--- a/testing/glade/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169243 2012-10-18 19:27:52Z jgc $
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=glade
-pkgver=3.14.1
-pkgrel=1
-pkgdesc="User interface builder for GTK+ and GNOME."
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl')
-optdepends=('python2: Python widgets support')
-options=('!libtool')
-url="http://glade.gnome.org/"
-install=glade.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8484b62c7a4579ea3e5d98200b397a1baf0b621c0b0c70242ee1dbbe449eae20')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/glade/glade.install b/testing/glade/glade.install
deleted file mode 100644
index bce670aff..000000000
--- a/testing/glade/glade.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/glew/PKGBUILD b/testing/glew/PKGBUILD
deleted file mode 100644
index a644afaaf..000000000
--- a/testing/glew/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169637 2012-10-25 01:35:04Z eric $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: SleepyDog
-
-pkgname=glew
-pkgver=1.9.0
-pkgrel=1
-pkgdesc="The OpenGL Extension Wrangler Library"
-arch=('i686' 'x86_64')
-url="http://glew.sourceforge.net"
-license=('BSD' 'MIT' 'GPL')
-depends=('libxmu' 'libxi' 'glu')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|lib64|lib|' config/Makefile.linux
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GLEW_DEST="${pkgdir}/usr" install.all
-  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  rm "${pkgdir}"/usr/lib/{libGLEW,libGLEWmx}.a
-  chmod 0755 "${pkgdir}"/usr/lib/libGLEW*.so.${pkgver}
-}
diff --git a/testing/glib-networking/PKGBUILD b/testing/glib-networking/PKGBUILD
deleted file mode 100644
index 7e6f403ac..000000000
--- a/testing/glib-networking/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169240 2012-10-18 19:27:39Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=glib-networking
-pkgver=2.34.0
-pkgrel=1
-pkgdesc="Network-related giomodules for glib"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas')
-makedepends=('intltool')
-options=('!libtool')
-install=glib-networking.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c56eb4161671bff9568f3a92a88531ca01217eb7ee8514bb6255730400f877f1')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr --sysconfdir=/etc \
-    --libexecdir=/usr/lib/glib-networking --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/glib-networking/glib-networking.install b/testing/glib-networking/glib-networking.install
deleted file mode 100644
index 8214e1968..000000000
--- a/testing/glib-networking/glib-networking.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/glib2/PKGBUILD b/testing/glib2/PKGBUILD
deleted file mode 100644
index bc162b826..000000000
--- a/testing/glib2/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169242 2012-10-18 19:27:48Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=glib2
-pkgver=2.34.1
-pkgrel=1
-pkgdesc="Common C routines used by GTK+ and other libs"
-url="http://www.gtk.org/"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('pcre' 'libffi')
-makedepends=('pkg-config' 'python2')
-optdepends=('python2: for gdbus-codegen')
-options=('!libtool' '!docs' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
-        revert-warn-glib-compile-schemas.patch)
-sha256sums=('6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1'
-            '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
-
-build() {
-  cd glib-$pkgver
-  patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc \
-      --with-pcre=system \
-      --disable-fam
-  make
-}
-
-package() {
-  cd glib-$pkgver
-  make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
-
-  for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do
-      chmod -x "$_i"
-  done
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen
-}
diff --git a/testing/glib2/glib2.csh b/testing/glib2/glib2.csh
deleted file mode 100644
index 7aa3a2ffa..000000000
--- a/testing/glib2/glib2.csh
+++ /dev/null
@@ -1 +0,0 @@
-setenv G_BROKEN_FILENAMES 1
diff --git a/testing/glib2/glib2.sh b/testing/glib2/glib2.sh
deleted file mode 100644
index 96a056e1e..000000000
--- a/testing/glib2/glib2.sh
+++ /dev/null
@@ -1 +0,0 @@
-export G_BROKEN_FILENAMES=1
diff --git a/testing/glib2/revert-warn-glib-compile-schemas.patch b/testing/glib2/revert-warn-glib-compile-schemas.patch
deleted file mode 100644
index 75b05103c..000000000
--- a/testing/glib2/revert-warn-glib-compile-schemas.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Thu, 12 Apr 2012 23:55:34 +0000
-Subject: glib-compile-schemas: warn about bad dconf paths
-
-For quite some time the recommended usage of GSettings and dconf has
-been to use paths like /org/gnome/example/.  Use of /apps/ has spilled
-over from GConf and is continuing to make its way into a number of
-applications as they port.
-
-glib-compile-schemas will now warn about these types of paths being
-used.  This generates a lot of noise, but hopefully it will reduce the
-number of ported applications making this mistake.
----
-diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
-index cf02389..27d0181 100644
---- a/gio/glib-compile-schemas.c
-+++ b/gio/glib-compile-schemas.c
-@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState  *state,
-       return;
-     }
- 
-+  if (path && (g_str_has_prefix (path, "/apps/") ||
-+               g_str_has_prefix (path, "/desktop/") ||
-+               g_str_has_prefix (path, "/system/")))
-+    g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
-+                "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
-+
-   state->schema_state = schema_state_new (path, gettext_domain,
-                                           extends, extends_name, list_of);
- 
---
-cgit v0.9.0.2
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
deleted file mode 100644
index 0d8b274be..000000000
--- a/testing/glibc/PKGBUILD
+++ /dev/null
@@ -1,188 +0,0 @@
-# $Id: PKGBUILD 169652 2012-10-25 03:25:47Z 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.16.0
-pkgrel=5
-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.5' 'tzdata')
-makedepends=('gcc>=4.7')
-backup=(etc/gai.conf
-        etc/locale.gen
-        etc/nscd.conf)
-options=('!strip')
-install=glibc.install
-source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-        glibc-2.15-fix-res_query-assert.patch
-        glibc-2.16-unlock-mutex.patch
-        glibc-2.16-rpcgen-cpp-path.patch
-        glibc-2.16-strncasecmp-segfault.patch
-        glibc-2.16-strtod-overflow.patch
-        glibc-2.16-detect-fma.patch
-        glibc-2.16-glob-use-size_t.patch
-        nscd.rcd
-        nscd.service
-        nscd.tmpfiles
-        locale.gen.txt
-        locale-gen)
-md5sums=('80b181b02ab249524ec92822c0174cf7'
-         '2a1221a15575820751c325ef4d2fbb90'
-         '31f415b41197d85d3bbee3d1eecd06a3'
-         '0afcd8c6020d61684aba63ed5f26bd91'
-         'ea6a43915474e8276e9361eed6a01280'
-         'f042d37cc8ca3459023431809039bc88'
-         '61d322f7681a85d3293ada5c3ccc2c7e'
-         '2426f593bc43f5499c41d21b57ee0e30'
-         'a441353901992feda4b15a11a20140a1'
-         '589d79041aa767a5179eaa4e2737dd3f'
-         'c1e07c0bec0fe89791bfd9d13fc85edf'
-         'bccbe5619e75cf1d97312ec3681c605c'
-         '07ac979b6ab5eeb778d55f041529d623'
-         '476e9113489f93b348b21e144b6a8fcf')
-
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # fix res_query assertion
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
-  patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
-
-  # prevent hang by locked mutex
-  # http://sourceware.org/git/?p=glibc.git;a=patch;h=c30e8edf
-  patch -p1 -i ${srcdir}/glibc-2.16-unlock-mutex.patch
-
-  # prevent need for /lib/cpp symlink
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
-  patch -p1 -i ${srcdir}/glibc-2.16-rpcgen-cpp-path.patch
-
-  # strncasecmp segfault on i686
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6db8f737
-  patch -p1 -i ${srcdir}/glibc-2.16-strncasecmp-segfault.patch
-
-  # strtod integer/buffer overflow
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319
-  patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch
-
-  # detect FMA supprt
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=a5cfcf08
-  patch -p1 -i ${srcdir}/glibc-2.16-detect-fma.patch
-  
-  # prevent overflow in globc
-  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6c62f108
-  patch -p1 -i ${srcdir}/glibc-2.16-glob-use-size_t.patch
-
-  # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
-  sed -i "s#add_system_dir#do_not_add_system_dir#" sysdeps/unix/sysv/linux/x86_64/dl-cache.h
-
-  cd ${srcdir}
-  mkdir glibc-build
-  cd glibc-build
-
-  if [[ ${CARCH} = "i686" ]]; then
-    # Hack to fix NPTL issues with Xen, only required on 32bit platforms
-    # TODO: make separate glibc-xen package for i686
-    export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-  fi
-
-  echo "slibdir=/usr/lib" >> configparms
-
-  # remove hardening options from CFLAGS for building libraries
-  CFLAGS=${CFLAGS/-fstack-protector/}
-  CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
-  ${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
-      --libdir=/usr/lib --libexecdir=/usr/lib \
-      --with-headers=/usr/include \
-      --enable-add-ons=nptl,libidn \
-      --enable-obsolete-rpc \
-      --enable-kernel=2.6.32 \
-      --enable-bind-now --disable-profile \
-      --enable-stackguard-randomization \
-      --enable-multi-arch
-
-  # build libraries with hardening disabled
-  echo "build-programs=no" >> configparms
-  make
-  
-  # re-enable hardening for programs
-  sed -i "/build-programs=/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
-  make check
-}
-
-package() {
-  cd ${srcdir}/glibc-build
-
-  install -dm755 ${pkgdir}/etc
-  touch ${pkgdir}/etc/ld.so.conf
-
-  make install_root=${pkgdir} install
-
-  rm -f ${pkgdir}/etc/ld.so.{cache,conf}
-
-  # eventually this will move to the filesystem package
-  ln -s usr/lib ${pkgdir}/lib
-
-  install -dm755 ${pkgdir}/{etc/rc.d,usr/{sbin,lib/{,locale,systemd/system,tmpfiles.d}}}
-
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
-  sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
-  install -m755 ${srcdir}/nscd.rcd ${pkgdir}/etc/rc.d/nscd
-  install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system
-  install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf
-
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf
-
-  install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
-
-  # create /etc/locale.gen
-  install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
-  sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \
-    ${srcdir}/glibc-2.16.0/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
-
-  if [[ ${CARCH} = "x86_64" ]]; then
-    # fix paths and compliance with binary blobs...
-    sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
-    ln -s usr/lib ${pkgdir}/lib64
-  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 usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
-                      usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
-                      usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
-                      usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib/{pt_chown,{audit,gconv}/*.so}
-}
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.15-__libc_res_nquerydomain-out-of-bounds.patch b/testing/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
deleted file mode 100644
index 6f0a0398f..000000000
--- a/testing/glibc/glibc-2.15-__libc_res_nquerydomain-out-of-bounds.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 947c651..abccd4a 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -556,12 +556,16 @@ __libc_res_nquerydomain(res_state statp,
- 		 * copy without '.' if present.
- 		 */
- 		n = strlen(name);
--		if (n >= MAXDNAME) {
-+
-+		/* Decrement N prior to checking it against MAXDNAME
-+		   so that we detect a wrap to SIZE_MAX and return
-+		   a reasonable error.  */
-+		n--;
-+		if (n >= MAXDNAME - 1) {
- 			RES_SET_H_ERRNO(statp, NO_RECOVERY);
- 			return (-1);
- 		}
--		n--;
--		if (n >= 0 && name[n] == '.') {
-+		if (name[n] == '.') {
- 			strncpy(nbuf, name, n);
- 			nbuf[n] = '\0';
- 		} else
diff --git a/testing/glibc/glibc-2.15-arena.patch b/testing/glibc/glibc-2.15-arena.patch
deleted file mode 100644
index 46f52e98d..000000000
--- a/testing/glibc/glibc-2.15-arena.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/malloc/arena.c b/malloc/arena.c
-index d3cf4b9..b1c9469 100644
---- a/malloc/arena.c
-+++ b/malloc/arena.c
-@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
- 	{
- 	  if (mp_.arena_max != 0)
- 	    narenas_limit = mp_.arena_max;
--	  else
-+	  else if (narenas > mp_.arena_test)
- 	    {
- 	      int n  = __get_nprocs ();
- 
-@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
- 	}
-     repeat:;
-       size_t n = narenas;
--      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
-+      /* NB: the following depends on the fact that (size_t)0 - 1 is a
-+	 very large number and that the underflow is OK.  If arena_max
-+	 is set the value of arena_test is irrelevant.  If arena_test
-+	 is set but narenas is not yet larger or equal to arena_test
-+	 narenas_limit is 0.  There is no possibility for narenas to
-+	 be too big for the test to always fail since there is not
-+	 enough address space to create that many arenas.  */
-+      if (__builtin_expect (n <= narenas_limit - 1, 0))
- 	{
- 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
- 	    goto repeat;
diff --git a/testing/glibc/glibc-2.15-avx.patch b/testing/glibc/glibc-2.15-avx.patch
deleted file mode 100644
index 5439da8d0..000000000
--- a/testing/glibc/glibc-2.15-avx.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_atan2.c b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-index 6867c6e..3a615fc 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_atan2.c
-@@ -14,7 +14,7 @@ extern double __ieee754_atan2_fma4 (double, double);
- 
- libm_ifunc (__ieee754_atan2,
- 	    HAS_FMA4 ? __ieee754_atan2_fma4
--	    : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
- strong_alias (__ieee754_atan2, __atan2_finite)
- 
- # define __ieee754_atan2 __ieee754_atan2_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_exp.c b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-index 3c65028..7b2320a 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_exp.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_exp.c
-@@ -14,7 +14,7 @@ extern double __ieee754_exp_fma4 (double);
- 
- libm_ifunc (__ieee754_exp,
- 	    HAS_FMA4 ? __ieee754_exp_fma4
--	    : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2));
-+	    : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2));
- strong_alias (__ieee754_exp, __exp_finite)
- 
- # define __ieee754_exp __ieee754_exp_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/e_log.c b/sysdeps/x86_64/fpu/multiarch/e_log.c
-index 3b468d0..ab277d6 100644
---- a/sysdeps/x86_64/fpu/multiarch/e_log.c
-+++ b/sysdeps/x86_64/fpu/multiarch/e_log.c
-@@ -14,7 +14,7 @@ extern double __ieee754_log_fma4 (double);
- 
- libm_ifunc (__ieee754_log,
- 	    HAS_FMA4 ? __ieee754_log_fma4
--	    : (HAS_AVX ? __ieee754_log_avx
-+	    : (HAS_YMM_USABLE ? __ieee754_log_avx
- 	       : __ieee754_log_sse2));
- strong_alias (__ieee754_log, __log_finite)
- 
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_atan.c b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-index 3160201..78c7e09 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_atan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_atan.c
-@@ -12,7 +12,8 @@ extern double __atan_fma4 (double);
- #  define __atan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (atan, HAS_FMA4 ? __atan_fma4 : HAS_AVX ? __atan_avx : __atan_sse2);
-+libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 :
-+		   HAS_YMM_USABLE ? __atan_avx : __atan_sse2));
- 
- # define atan __atan_sse2
- #endif
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-index 1ba9dbc..417acd0 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-@@ -17,10 +17,12 @@ extern double __sin_fma4 (double);
- #  define __sin_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
-+libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 :
-+		    HAS_YMM_USABLE ? __cos_avx : __cos_sse2));
- weak_alias (__cos, cos)
- 
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
-+libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 :
-+		    HAS_YMM_USABLE ? __sin_avx : __sin_sse2));
- weak_alias (__sin, sin)
- 
- # define __cos __cos_sse2
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-index 8f6601e..3047155 100644
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-@@ -12,7 +12,8 @@ extern double __tan_fma4 (double);
- #  define __tan_fma4 ((void *) 0)
- # endif
- 
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
-+libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 :
-+		  HAS_YMM_USABLE ? __tan_avx : __tan_sse2));
- 
- # define tan __tan_sse2
- #endif
-diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
-index 65b0ee9..76d146c 100644
---- a/sysdeps/x86_64/multiarch/init-arch.c
-+++ b/sysdeps/x86_64/multiarch/init-arch.c
-@@ -1,6 +1,6 @@
- /* Initialize CPU feature data.
-    This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    Contributed by Ulrich Drepper <drepper@redhat.com>.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-@@ -144,6 +144,18 @@ __init_cpu_features (void)
-   else
-     kind = arch_kind_other;
- 
-+  if (__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_AVX)
-+    {
-+      /* Reset the AVX bit in case OSXSAVE is disabled.  */
-+      if ((__cpu_features.cpuid[COMMON_CPUID_INDEX_1].ecx & bit_OSXSAVE) != 0
-+	  && ({ unsigned int xcrlow;
-+		unsigned int xcrhigh;
-+		asm ("xgetbv"
-+		     : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
-+		(xcrlow & 6) == 6; }))
-+	__cpu_features.feature[index_YMM_Usable] |= bit_YMM_Usable;
-+    }
-+
-   __cpu_features.family = family;
-   __cpu_features.model = model;
-   atomic_write_barrier ();
-diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
-index 2a1df39..2dc75ab 100644
---- a/sysdeps/x86_64/multiarch/init-arch.h
-+++ b/sysdeps/x86_64/multiarch/init-arch.h
-@@ -1,5 +1,5 @@
- /* This file is part of the GNU C Library.
--   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
- 
-    The GNU C Library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-@@ -22,11 +22,13 @@
- #define bit_Prefer_SSE_for_memop	(1 << 3)
- #define bit_Fast_Unaligned_Load		(1 << 4)
- #define bit_Prefer_PMINUB_for_stringop	(1 << 5)
-+#define bit_YMM_Usable			(1 << 6)
- 
- #define bit_SSE2	(1 << 26)
- #define bit_SSSE3	(1 << 9)
- #define bit_SSE4_1	(1 << 19)
- #define bit_SSE4_2	(1 << 20)
-+#define bit_OSXSAVE	(1 << 27)
- #define bit_AVX		(1 << 28)
- #define bit_POPCOUNT	(1 << 23)
- #define bit_FMA		(1 << 12)
-@@ -48,6 +50,7 @@
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
-+# define index_YMM_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- 
- #else	/* __ASSEMBLER__ */
- 
-@@ -92,7 +95,7 @@ extern struct cpu_features
- 
- 
- extern void __init_cpu_features (void) attribute_hidden;
--#define INIT_ARCH()\
-+# define INIT_ARCH() \
-   do							\
-     if (__cpu_features.kind == arch_kind_unknown)	\
-       __init_cpu_features ();				\
-@@ -125,23 +128,21 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define index_Slow_BSF			FEATURE_INDEX_1
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1
-+# define index_YMM_Usable		FEATURE_INDEX_1
- 
--#define HAS_ARCH_FEATURE(idx, bit) \
--  ((__get_cpu_features ()->feature[idx] & (bit)) != 0)
-+# define HAS_ARCH_FEATURE(name) \
-+  ((__get_cpu_features ()->feature[index_##name] & (bit_##name)) != 0)
- 
--#define HAS_FAST_REP_STRING \
--  HAS_ARCH_FEATURE (index_Fast_Rep_String, bit_Fast_Rep_String)
-+# define HAS_FAST_REP_STRING	HAS_ARCH_FEATURE (Fast_Rep_String)
- 
--#define HAS_FAST_COPY_BACKWARD \
--  HAS_ARCH_FEATURE (index_Fast_Copy_Backward, bit_Fast_Copy_Backward)
-+# define HAS_FAST_COPY_BACKWARD	HAS_ARCH_FEATURE (Fast_Copy_Backward)
- 
--#define HAS_SLOW_BSF \
--  HAS_ARCH_FEATURE (index_Slow_BSF, bit_Slow_BSF)
-+# define HAS_SLOW_BSF		HAS_ARCH_FEATURE (Slow_BSF)
- 
--#define HAS_PREFER_SSE_FOR_MEMOP \
--  HAS_ARCH_FEATURE (index_Prefer_SSE_for_memop, bit_Prefer_SSE_for_memop)
-+# define HAS_PREFER_SSE_FOR_MEMOP HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
- 
--#define HAS_FAST_UNALIGNED_LOAD \
--  HAS_ARCH_FEATURE (index_Fast_Unaligned_Load, bit_Fast_Unaligned_Load)
-+# define HAS_FAST_UNALIGNED_LOAD HAS_ARCH_FEATURE (Fast_Unaligned_Load)
-+
-+# define HAS_YMM_USABLE		HAS_ARCH_FEATURE (YMM_Usable)
- 
- #endif	/* __ASSEMBLER__ */
--- 
-1.7.9
-
diff --git a/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch b/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch
deleted file mode 100644
index 483b28532..000000000
--- a/testing/glibc/glibc-2.15-confstr-local-buffer-extent.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-diff --git a/posix/confstr.c b/posix/confstr.c
-index 3c9566d..cad6561 100644
---- a/posix/confstr.c
-+++ b/posix/confstr.c
-@@ -35,6 +34,10 @@ confstr (name, buf, len)
-   const char *string = "";
-   size_t string_len = 1;
- 
-+  /* Note that this buffer must be large enough for the longest strings
-+     used below.  */
-+  char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
-+
-   switch (name)
-     {
-     case _CS_PATH:
-@@ -53,59 +56,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V7_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V7_ILP32_OFF32
--	if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
--		    sizeof "POSIX_V7_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFF32",
-+		  sizeof "POSIX_V7_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_ILP32_OFFBIG
--	if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_ILP32_OFFBIG || _POSIX_V7_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
--		    sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_ILP32_OFFBIG",
-+		  sizeof "POSIX_V7_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LP64_OFF64
--	if (__sysconf (_SC_V7_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V7_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V7_LP64_OFF64 || _POSIX_V7_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
--		    sizeof "POSIX_V7_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LP64_OFF64",
-+		  sizeof "POSIX_V7_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V7_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V7_LPBIG_OFFBIG
--	if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V7_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V7_LPBIG_OFFBIG || _POSIX_V7_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
--		    sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V7_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V7_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V7_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V6_WIDTH_RESTRICTED_ENVS:
-@@ -116,59 +115,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "POSIX_V6_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _POSIX_V6_ILP32_OFF32
--	if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFF32) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFF32 || _POSIX_V6_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
--		    sizeof "POSIX_V6_ILP32_OFF32" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFF32",
-+		  sizeof "POSIX_V6_ILP32_OFF32" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_ILP32_OFFBIG
--	if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_ILP32_OFFBIG || _POSIX_V6_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
--		    sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_ILP32_OFFBIG",
-+		  sizeof "POSIX_V6_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LP64_OFF64
--	if (__sysconf (_SC_V6_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_V6_LP64_OFF64) > 0)
- #endif
- #if !defined _POSIX_V6_LP64_OFF64 || _POSIX_V6_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
--		    sizeof "POSIX_V6_LP64_OFF64" - 1);
--	    string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LP64_OFF64",
-+		  sizeof "POSIX_V6_LP64_OFF64" - 1);
-+	  string_len += sizeof "POSIX_V6_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _POSIX_V6_LPBIG_OFFBIG
--	if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_V6_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _POSIX_V6_LPBIG_OFFBIG || _POSIX_V6_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
--		    sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "POSIX_V6_LPBIG_OFFBIG",
-+		  sizeof "POSIX_V6_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "POSIX_V6_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_V5_WIDTH_RESTRICTED_ENVS:
-@@ -179,59 +174,55 @@ confstr (name, buf, len)
- 	 wint_t types are no greater than the width of type long.
- 
- 	 Currently this means all environment which the system allows.  */
--      {
--	char restenvs[4 * sizeof "XBS5_LPBIG_OFFBIG"];
--
--	string_len = 0;
-+      string_len = 0;
- #ifndef _XBS5_ILP32_OFF32
--	if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFF32) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFF32 || _XBS5_ILP32_OFF32 > 0
--	  {
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
--		    sizeof "XBS5_ILP32_OFF32" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFF32" - 1;
--	  }
-+	{
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFF32",
-+		  sizeof "XBS5_ILP32_OFF32" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFF32" - 1;
-+	}
- #endif
- #ifndef _XBS5_ILP32_OFFBIG
--	if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_ILP32_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_ILP32_OFFBIG || _XBS5_ILP32_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
--		    sizeof "XBS5_ILP32_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_ILP32_OFFBIG",
-+		  sizeof "XBS5_ILP32_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_ILP32_OFFBIG" - 1;
-+	}
- #endif
- #ifndef _XBS5_LP64_OFF64
--	if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
-+      if (__sysconf (_SC_XBS5_LP64_OFF64) > 0)
- #endif
- #if !defined _XBS5_LP64_OFF64 || _XBS5_LP64_OFF64 > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
--		    sizeof "XBS5_LP64_OFF64" - 1);
--	    string_len += sizeof "XBS5_LP64_OFF64" - 1;
--	  }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LP64_OFF64",
-+		  sizeof "XBS5_LP64_OFF64" - 1);
-+	  string_len += sizeof "XBS5_LP64_OFF64" - 1;
-+	}
- #endif
- #ifndef _XBS5_LPBIG_OFFBIG
--	if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
-+      if (__sysconf (_SC_XBS5_LPBIG_OFFBIG) > 0)
- #endif
- #if !defined _XBS5_LPBIG_OFFBIG || _XBS5_LPBIG_OFFBIG > 0
--	  {
--	    if (string_len)
--	      restenvs[string_len++] = '\n';
--	    memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
--		    sizeof "XBS5_LPBIG_OFFBIG" - 1);
--	    string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
--	  }
--#endif
--	restenvs[string_len++] = '\0';
--	string = restenvs;
--      }
-+	{
-+	  if (string_len)
-+	    restenvs[string_len++] = '\n';
-+	  memcpy (restenvs + string_len, "XBS5_LPBIG_OFFBIG",
-+		  sizeof "XBS5_LPBIG_OFFBIG" - 1);
-+	  string_len += sizeof "XBS5_LPBIG_OFFBIG" - 1;
-+	}
-+#endif
-+      restenvs[string_len++] = '\0';
-+      string = restenvs;
-       break;
- 
-     case _CS_XBS5_ILP32_OFF32_CFLAGS:
diff --git a/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch b/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch
deleted file mode 100644
index d28237f85..000000000
--- a/testing/glibc/glibc-2.15-do-not-install-timezone-files-2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index 00bfba6..9e55a6a 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -45,7 +45,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- CPPFLAGS-zic = -DNOT_IN_libc
- 
- ifeq ($(have-ksh),yes)
--install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
- generated += tzselect
- endif
-@@ -111,7 +110,3 @@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
- 	    -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new
- 	chmod 555 $@.new
- 	mv -f $@.new $@
--
--$(addprefix $(inst_zonedir)/,iso3166.tab zone.tab): \
--    $(inst_zonedir)/%: % $(+force)
--	$(do-install)
diff --git a/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch b/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch
deleted file mode 100644
index e4f29bc1a..000000000
--- a/testing/glibc/glibc-2.15-do-not-install-timezone-files.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/timezone/Makefile b/timezone/Makefile
-index e8fb716..d5ea538 100644
---- a/timezone/Makefile
-+++ b/timezone/Makefile
-@@ -1,4 +1,4 @@
--# Copyright (C) 1998,1999,2000,2002,2005,2007 Free Software Foundation, Inc.
-+# Copyright (C) 1998-2000,2002,2005,2007,2012 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
-@@ -49,33 +49,6 @@ include ../Makeconfig	# Get objpfx defined so we can use it below.
- 
- CPPFLAGS-zic = -DNOT_IN_libc
- 
--# z.* use this variable.
--define nl
--
--
--endef
--ifndef avoid-generated
--ifndef inhibit_timezone_rules
---include $(addprefix $(objpfx)z.,$(tzfiles))
--endif
--endif
--
--# Make these absolute file names.
--installed-localtime-file := $(firstword $(filter /%,$(inst_localtime-file)) \
--					$(addprefix $(inst_zonedir)/, \
--						    $(localtime-file)))
--installed-posixrules-file := $(firstword $(filter /%,$(posixrules-file)) \
--					 $(addprefix $(inst_zonedir)/, \
--						     $(posixrules-file)))
--
--ifeq ($(cross-compiling),no)
--# Don't try to install the zoneinfo files since we can't run zic.
--install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
--					      $(zonenames:%=posix/%) \
--					      $(zonenames:%=right/%)) \
--		 $(installed-localtime-file) $(installed-posixrules-file)
--endif
--
- ifeq ($(have-ksh),yes)
- install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
- install-bin-script = tzselect
-@@ -85,79 +58,6 @@ endif
- include ../Rules
- 
- 
--$(tzfiles:%=$(objpfx)z.%): $(objpfx)z.%: % Makefile
--# Kludge alert: we use an implicit rule (in what we are generating here)
--# because that is the only way to tell Make that the one command builds all
--# the files.
--# The extra kludge for the $(tzlinks) files is necessary since running zic
--# this file requires all other files to exist.  Blech!
--	$(make-target-directory)
--	(echo 'define $*-zones'						    ;\
--	 $(AWK) '$$1 == "Zone" { print $$2 } $$1 == "Link" { print $$3 }' $^ ;\
--	 echo 'endef'							    ;\
--	 echo '$*-zones := $$(subst $$(nl), ,$$($*-zones))'		    ;\
--	 echo 'ifdef $*-zones'						    ;\
--	 if test x$(findstring $*, $(tzlinks)) != x; then		     \
--	   echo '$$(addprefix $$(inst_zonedir)/right/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/right/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/posix/,$$($*-zones)): \';\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/posix/,$$($$t-zones)))' ;\
--	   echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \'	    ;\
--	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\
--	 fi								    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic leapseconds yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic /dev/null yearistype'			    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\
--	 echo '$< $$(objpfx)zic $$(leapseconds) yearistype'		    ;\
--	 echo '	$$(tzcompile)'						    ;\
--	 echo 'endif'							    ;\
--	 echo 'zonenames := $$(zonenames) $$($*-zones)'			    ;\
--	) > $@.new
--	mv $@.new $@
--
--.PHONY: echo-zonenames
--echo-zonenames:
--	@echo 'Known zones: $(zonenames)'
--
--
--# We have to use `-d $(inst_zonedir)' to explictly tell zic where to
--# place the output files although $(zonedir) is compiled in.  But the
--# user might have set $(install_root) on the command line of `make install'.
--zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
--tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
--	    -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
--
--# The source files specify the zone names relative to the -d directory,
--# so for the posix/ and right/ flavors we need to pass -d $(inst_zonedir)/posix
--# and the like.  This magic extracts /posix or /right if it's the first
--# component after $(inst_zonedir) in the target name $@.
--target-zone-flavor = $(filter /posix /right, \
--			      /$(firstword $(subst /, , \
--					  $(patsubst $(inst_zonedir)/%,%,$@))))
--
--ifdef localtime
--$(installed-localtime-file): $(inst_zonedir)/$(localtime) $(objpfx)zic \
--			     $(+force)
--	$(make-target-directory)
--	if test -r $@; then \
--	  echo Site timezone NOT reset to Factory.; \
--	else \
--	  rm -f $@T; \
--	  $(SHELL) $(..)scripts/rellns-sh $< $@T; \
--	  mv -f $@T $@; \
--	fi
--endif
--ifdef posixrules
--$(installed-posixrules-file): $(inst_zonedir)/$(posixrules) $(objpfx)zic \
--			      $(+force)
--	$(zic-cmd) -p $(posixrules)
--endif
--
--
- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
- 
- tz-cflags = -DTZDIR='"$(zonedir)"' \
diff --git a/testing/glibc/glibc-2.15-feraiseexcept-plt.patch b/testing/glibc/glibc-2.15-feraiseexcept-plt.patch
deleted file mode 100644
index c41acc169..000000000
--- a/testing/glibc/glibc-2.15-feraiseexcept-plt.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/sysdeps/i386/fpu/feupdateenv.c b/sysdeps/i386/fpu/feupdateenv.c
-index 70f9ee2..6e2ce35 100644
---- a/sysdeps/i386/fpu/feupdateenv.c
-+++ b/sysdeps/i386/fpu/feupdateenv.c
-@@ -1,5 +1,5 @@
- /* Install given floating-point environment and raise exceptions.
--   Copyright (C) 1997,99,2000,01,07,2010 Free Software Foundation, Inc.
-+   Copyright (C) 1997,99,2000,01,07,2010,2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
- 
-@@ -44,7 +44,7 @@ __feupdateenv (const fenv_t *envp)
-   /* Raise the saved exception.  Incidently for us the implementation
-      defined format of the values in objects of type fexcept_t is the
-      same as the ones specified using the FE_* constants.  */
--  feraiseexcept ((int) temp);
-+  __feraiseexcept ((int) temp);
- 
-   /* Success.  */
-   return 0;
diff --git a/testing/glibc/glibc-2.15-fix-res_query-assert.patch b/testing/glibc/glibc-2.15-fix-res_query-assert.patch
deleted file mode 100644
index a894da9c7..000000000
--- a/testing/glibc/glibc-2.15-fix-res_query-assert.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/resolv/res_query.c	
-+++ a/resolv/res_query.c	
-@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
- 		  int *resplen2)
- {
- 	HEADER *hp = (HEADER *) answer;
-+	HEADER *hp2;
- 	int n, use_malloc = 0;
- 	u_int oflags = statp->_flags;
- 
-@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
- 	  /* __libc_res_nsend might have reallocated the buffer.  */
- 	  hp = (HEADER *) *answerp;
- 
--	/* We simplify the following tests by assigning HP to HP2.  It
--	   is easy to verify that this is the same as ignoring all
--	   tests of HP2.  */
--	HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
--
--	if (n < (int) sizeof (HEADER) && answerp2 != NULL
--	    && *resplen2 > (int) sizeof (HEADER))
-+	/* We simplify the following tests by assigning HP to HP2 or
-+	   vice versa.  It is easy to verify that this is the same as
-+	   ignoring all tests of HP or HP2.  */
-+	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp = hp2;
-+	    hp2 = hp;
- 	  }
--	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
--		 && n > (int) sizeof (HEADER))
-+	else
- 	  {
--	    /* Special case of partial answer.  */
--	    assert (hp != hp2);
--	    hp2 = hp;
-+	    hp2 = (HEADER *) *answerp2;
-+	    if (n < (int) sizeof (HEADER))
-+	      {
-+	        hp = hp2;
-+	      }
- 	  }
- 
-+	/* Make sure both hp and hp2 are defined */
-+	assert((hp != NULL) && (hp2 != NULL));
-+
- 	if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
- 	    && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
- #ifdef DEBUG
diff --git a/testing/glibc/glibc-2.15-fmtmsg-locking.patch b/testing/glibc/glibc-2.15-fmtmsg-locking.patch
deleted file mode 100644
index f5976abd9..000000000
--- a/testing/glibc/glibc-2.15-fmtmsg-locking.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
-index 9203317..4c02302 100644
---- a/stdlib/fmtmsg.c
-+++ b/stdlib/fmtmsg.c
-@@ -103,7 +103,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	const char *text, const char *action, const char *tag)
- {
-   __libc_once_define (static, once);
--  int result = MM_OK;
-   struct severity_info *severity_rec;
- 
-   /* Make sure everything is initialized.  */
-@@ -124,17 +123,6 @@ fmtmsg (long int classification, const char *label, int severity,
- 	return MM_NOTOK;
-     }
- 
--  for (severity_rec = severity_list; severity_rec != NULL;
--       severity_rec = severity_rec->next)
--    if (severity == severity_rec->severity)
--      /* Bingo.  */
--      break;
--
--  /* If we don't know anything about the severity level return an error.  */
--  if (severity_rec == NULL)
--    return MM_NOTOK;
--
--
- #ifdef __libc_ptf_call
-   /* We do not want this call to be cut short by a thread
-      cancellation.  Therefore disable cancellation for now.  */
-@@ -143,54 +131,73 @@ fmtmsg (long int classification, const char *label, int severity,
- 		   0);
- #endif
- 
--  /* Now we can print.  */
--  if (classification & MM_PRINT)
--    {
--      int do_label = (print & label_mask) && label != MM_NULLLBL;
--      int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
--      int do_text = (print & text_mask) && text != MM_NULLTXT;
--      int do_action = (print & action_mask) && action != MM_NULLACT;
--      int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
--
--      if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
--		      do_label ? label : "",
--		      do_label && (do_severity | do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_severity ? severity_rec->string : "",
--		      do_severity && (do_text | do_action | do_tag)
--		      ? ": " : "",
--		      do_text ? text : "",
--		      do_text && (do_action | do_tag) ? "\n" : "",
--		      do_action ? "TO FIX: " : "",
--		      do_action ? action : "",
--		      do_action && do_tag ? "  " : "",
--		      do_tag ? tag : "") < 0)
--	/* Oh, oh.  An error occurred during the output.  */
--	result = MM_NOMSG;
--    }
-+  __libc_lock_lock (lock);
- 
--  if (classification & MM_CONSOLE)
-+  for (severity_rec = severity_list; severity_rec != NULL;
-+       severity_rec = severity_rec->next)
-+    if (severity == severity_rec->severity)
-+      /* Bingo.  */
-+      break;
-+
-+  /* If we don't know anything about the severity level return an error.  */
-+  int result = MM_NOTOK;
-+  if (severity_rec != NULL)
-     {
--      int do_label = label != MM_NULLLBL;
--      int do_severity = severity != MM_NULLSEV;
--      int do_text = text != MM_NULLTXT;
--      int do_action = action != MM_NULLACT;
--      int do_tag = tag != MM_NULLTAG;
--
--      syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
--	      do_label ? label : "",
--	      do_label && (do_severity | do_text | do_action | do_tag)
--	      ? ": " : "",
--	      do_severity ? severity_rec->string : "",
--	      do_severity && (do_text | do_action | do_tag) ? ": " : "",
--	      do_text ? text : "",
--	      do_text && (do_action | do_tag) ? "\n" : "",
--	      do_action ? "TO FIX: " : "",
--	      do_action ? action : "",
--	      do_action && do_tag ? "  " : "",
--	      do_tag ? tag : "");
-+      result = MM_OK;
-+
-+      /* Now we can print.  */
-+      if (classification & MM_PRINT)
-+	{
-+	  int do_label = (print & label_mask) && label != MM_NULLLBL;
-+	  int do_severity = (print & severity_mask) && severity != MM_NULLSEV;
-+	  int do_text = (print & text_mask) && text != MM_NULLTXT;
-+	  int do_action = (print & action_mask) && action != MM_NULLACT;
-+	  int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  if (__fxprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
-+			  do_label ? label : "",
-+			  need_colon ? ": " : "",
-+			  do_severity ? severity_rec->string : "",
-+			  do_severity && (do_text | do_action | do_tag)
-+			  ? ": " : "",
-+			  do_text ? text : "",
-+			  do_text && (do_action | do_tag) ? "\n" : "",
-+			  do_action ? "TO FIX: " : "",
-+			  do_action ? action : "",
-+			  do_action && do_tag ? "  " : "",
-+			  do_tag ? tag : "") < 0)
-+	    /* Oh, oh.  An error occurred during the output.  */
-+	    result = MM_NOMSG;
-+	}
-+
-+      if (classification & MM_CONSOLE)
-+	{
-+	  int do_label = label != MM_NULLLBL;
-+	  int do_severity = severity != MM_NULLSEV;
-+	  int do_text = text != MM_NULLTXT;
-+	  int do_action = action != MM_NULLACT;
-+	  int do_tag = tag != MM_NULLTAG;
-+	  int need_colon = (do_label
-+			    && (do_severity | do_text | do_action | do_tag));
-+
-+	  syslog (LOG_ERR, "%s%s%s%s%s%s%s%s%s%s\n",
-+		  do_label ? label : "",
-+		  need_colon ? ": " : "",
-+		  do_severity ? severity_rec->string : "",
-+		  do_severity && (do_text | do_action | do_tag) ? ": " : "",
-+		  do_text ? text : "",
-+		  do_text && (do_action | do_tag) ? "\n" : "",
-+		  do_action ? "TO FIX: " : "",
-+		  do_action ? action : "",
-+		  do_action && do_tag ? "  " : "",
-+		  do_tag ? tag : "");
-+	}
-     }
- 
-+  __libc_lock_unlock (lock);
-+
- #ifdef __libc_ptf_call
-   __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
- #endif
diff --git a/testing/glibc/glibc-2.15-gb18030.patch.gz b/testing/glibc/glibc-2.15-gb18030.patch.gz
deleted file mode 100644
index dde59c056..000000000
--- a/testing/glibc/glibc-2.15-gb18030.patch.gz
+++ /dev/null
diff --git a/testing/glibc/glibc-2.15-ifunc.patch b/testing/glibc/glibc-2.15-ifunc.patch
deleted file mode 100644
index 115afa02a..000000000
--- a/testing/glibc/glibc-2.15-ifunc.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff --git a/Makeconfig b/Makeconfig
-index 2db2821..68547b2 100644
---- a/Makeconfig
-+++ b/Makeconfig
-@@ -900,6 +900,12 @@ else
- libdl = $(common-objpfx)dlfcn/libdl.a
- endif
- 
-+ifeq ($(build-shared),yes)
-+libm = $(common-objpfx)math/libm.so$(libm.so-version)
-+else
-+libm = $(common-objpfx)math/libm.a
-+endif
-+
- # These are the subdirectories containing the library source.  The order
- # is more or less arbitrary.  The sorting step will take care of the
- # dependencies.
-diff --git a/elf/Makefile b/elf/Makefile
-index 052e763..3f1772a 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -124,7 +124,8 @@ distribute	:= rtld-Rules \
- 		   tst-initordera1.c tst-initordera2.c tst-initorderb1.c \
- 		   tst-initorderb2.c tst-initordera3.c tst-initordera4.c \
- 		   tst-initorder.c \
--		   tst-initorder2.c
-+		   tst-initorder2.c \
-+		   tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c
- 
- CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
- CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables
-@@ -227,7 +228,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
- 	 tst-audit1 tst-audit2 \
- 	 tst-stackguard1 tst-addr1 tst-thrlock \
- 	 tst-unique1 tst-unique2 tst-unique3 tst-unique4 \
--	 tst-initorder tst-initorder2
-+	 tst-initorder tst-initorder2 tst-relsort1
- #	 reldep9
- test-srcs = tst-pathopt
- selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null)
-@@ -290,7 +291,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
- 		tst-initordera1 tst-initorderb1 \
- 		tst-initordera2 tst-initorderb2 \
- 		tst-initordera3 tst-initordera4 \
--		tst-initorder2a tst-initorder2b tst-initorder2c tst-initorder2d
-+		tst-initorder2a tst-initorder2b tst-initorder2c \
-+		tst-initorder2d \
-+		tst-relsort1mod1 tst-relsort1mod2
- ifeq (yes,$(have-initfini-array))
- modules-names += tst-array2dep tst-array5dep
- endif
-@@ -1195,3 +1198,9 @@ CFLAGS-tst-auditmod6b.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod6c.c += $(AVX-CFLAGS)
- CFLAGS-tst-auditmod7b.c += $(AVX-CFLAGS)
- endif
-+
-+$(objpfx)tst-relsort1: $(libdl)
-+$(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
-+$(objpfx)tst-relsort1mod2.so: $(libm)
-+$(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
-+			   $(objpfx)tst-relsort1mod2.so
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index a0b5c50..a56bdc1 100644
---- a/elf/dl-open.c
-+++ b/elf/dl-open.c
-@@ -1,5 +1,5 @@
- /* Load a shared object at runtime, relocate it, and run its initializer.
--   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 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
-@@ -302,45 +302,109 @@ dl_open_worker (void *a)
-   if (GLRO(dl_lazy))
-     reloc_mode |= mode & RTLD_LAZY;
- 
--  /* Relocate the objects loaded.  We do this in reverse order so that copy
--     relocs of earlier objects overwrite the data written by later objects.  */
--
-+  /* Sort the objects by dependency for the relocation process.  This
-+     allows IFUNC relocations to work and it also means copy
-+     relocation of dependencies are if necessary overwritten.  */
-+  size_t nmaps = 0;
-   struct link_map *l = new;
--  while (l->l_next)
--    l = l->l_next;
--  while (1)
-+  do
-+    {
-+      if (! l->l_real->l_relocated)
-+	++nmaps;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  struct link_map *maps[nmaps];
-+  nmaps = 0;
-+  l = new;
-+  do
-     {
-       if (! l->l_real->l_relocated)
-+	maps[nmaps++] = l;
-+      l = l->l_next;
-+    }
-+  while (l != NULL);
-+  if (nmaps > 1)
-+    {
-+      char seen[nmaps];
-+      memset (seen, '\0', nmaps);
-+      size_t i = 0;
-+      while (1)
- 	{
--#ifdef SHARED
--	  if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	  ++seen[i];
-+	  struct link_map *thisp = maps[i];
-+
-+	  /* Find the last object in the list for which the current one is
-+	     a dependency and move the current object behind the object
-+	     with the dependency.  */
-+	  size_t k = nmaps - 1;
-+	  while (k > i)
- 	    {
--	      /* If this here is the shared object which we want to profile
--		 make sure the profile is started.  We can find out whether
--		 this is necessary or not by observing the `_dl_profile_map'
--		 variable.  If was NULL but is not NULL afterwars we must
--		 start the profiling.  */
--	      struct link_map *old_profile_map = GL(dl_profile_map);
-+	      struct link_map **runp = maps[k]->l_initfini;
-+	      if (runp != NULL)
-+		/* Look through the dependencies of the object.  */
-+		while (*runp != NULL)
-+		  if (__builtin_expect (*runp++ == thisp, 0))
-+		    {
-+		      /* Move the current object to the back past the last
-+			 object with it as the dependency.  */
-+		      memmove (&maps[i], &maps[i + 1],
-+			       (k - i) * sizeof (maps[0]));
-+		      maps[k] = thisp;
-+
-+		      if (seen[i + 1] > 1)
-+			{
-+			  ++i;
-+			  goto next_clear;
-+			}
-+
-+		      char this_seen = seen[i];
-+		      memmove (&seen[i], &seen[i + 1],
-+			       (k - i) * sizeof (seen[0]));
-+		      seen[k] = this_seen;
-+
-+		      goto next;
-+		    }
-+
-+	      --k;
-+	    }
- 
--	      _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+	  if (++i == nmaps)
-+	    break;
-+	next_clear:
-+	  memset (&seen[i], 0, (nmaps - i) * sizeof (seen[0]));
-+	next:;
-+	}
-+    }
- 
--	      if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
--		{
--		  /* We must prepare the profiling.  */
--		  _dl_start_profile ();
-+  for (size_t i = nmaps; i-- > 0; )
-+    {
-+      l = maps[i];
- 
--		  /* Prevent unloading the object.  */
--		  GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
--		}
-+#ifdef SHARED
-+      if (__builtin_expect (GLRO(dl_profile) != NULL, 0))
-+	{
-+	  /* If this here is the shared object which we want to profile
-+	     make sure the profile is started.  We can find out whether
-+	     this is necessary or not by observing the `_dl_profile_map'
-+	     variable.  If it was NULL but is not NULL afterwars we must
-+	     start the profiling.  */
-+	  struct link_map *old_profile_map = GL(dl_profile_map);
-+
-+	  _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1);
-+
-+	  if (old_profile_map == NULL && GL(dl_profile_map) != NULL)
-+	    {
-+	      /* We must prepare the profiling.  */
-+	      _dl_start_profile ();
-+
-+	      /* Prevent unloading the object.  */
-+	      GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE;
- 	    }
--	  else
--#endif
--	    _dl_relocate_object (l, l->l_scope, reloc_mode, 0);
- 	}
--
--      if (l == new)
--	break;
--      l = l->l_prev;
-+      else
-+#endif
-+	_dl_relocate_object (l, l->l_scope, reloc_mode, 0);
-     }
- 
-   /* If the file is not loaded now as a dependency, add the search
-diff --git a/elf/tst-relsort1.c b/elf/tst-relsort1.c
-new file mode 100644
-index 0000000..972100c
---- /dev/null
-+++ b/elf/tst-relsort1.c
-@@ -0,0 +1,19 @@
-+#include <dlfcn.h>
-+#include <stdio.h>
-+
-+
-+static int
-+do_test ()
-+{
-+  const char lib[] = "$ORIGIN/tst-relsort1mod1.so";
-+  void *h = dlopen (lib, RTLD_NOW);
-+  if (h == NULL)
-+    {
-+      puts (dlerror ());
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/elf/tst-relsort1mod1.c b/elf/tst-relsort1mod1.c
-new file mode 100644
-index 0000000..9e4a943
---- /dev/null
-+++ b/elf/tst-relsort1mod1.c
-@@ -0,0 +1,7 @@
-+extern int foo (double);
-+
-+int
-+bar (void)
-+{
-+  return foo (1.2);
-+}
-diff --git a/elf/tst-relsort1mod2.c b/elf/tst-relsort1mod2.c
-new file mode 100644
-index 0000000..a2c3e55
---- /dev/null
-+++ b/elf/tst-relsort1mod2.c
-@@ -0,0 +1,7 @@
-+#include <math.h>
-+
-+int
-+foo (double d)
-+{
-+  return floor (d) != 0.0;
-+}
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-multiarch-x86-strcmp.patch b/testing/glibc/glibc-2.15-multiarch-x86-strcmp.patch
deleted file mode 100644
index 38c9e617f..000000000
--- a/testing/glibc/glibc-2.15-multiarch-x86-strcmp.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-index d10e872..d4fcd2b 100644
---- a/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strcasecmp_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strcasecmp_l) __strcasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strcasecmp.c>
- 
-+strong_alias (__strcasecmp_l_nonascii, __strcasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strcasecmp_l_nonascii, __GI___strcasecmp_l)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp.S b/sysdeps/i386/i686/multiarch/strcmp.S
-index 5410d17..b3b9eb8 100644
---- a/sysdeps/i386/i686/multiarch/strcmp.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp.S
-@@ -111,6 +111,7 @@ END(STRCMP)
- # endif
- #endif
- 
--#ifndef USE_AS_STRNCMP
-+#if !defined USE_AS_STRNCMP && !defined USE_AS_STRCASECMP_L \
-+    && !defined USE_AS_STRNCASECMP_L
- # include "../strcmp.S"
- #endif
-diff --git a/sysdeps/i386/i686/multiarch/strncase_l-c.c b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-index 0c68b8d..7e601af 100644
---- a/sysdeps/i386/i686/multiarch/strncase_l-c.c
-+++ b/sysdeps/i386/i686/multiarch/strncase_l-c.c
-@@ -6,6 +6,8 @@ extern __typeof (strncasecmp_l) __strncasecmp_l_nonascii;
- #define USE_IN_EXTENDED_LOCALE_MODEL    1
- #include <string/strncase.c>
- 
-+strong_alias (__strncasecmp_l_nonascii, __strncasecmp_l_ia32)
-+
- /* The needs of strcasecmp in libc are minimal, no need to go through
-    the IFUNC.  */
- strong_alias (__strncasecmp_l_nonascii, __GI___strncasecmp_l)
diff --git a/testing/glibc/glibc-2.15-nearbyintf-rounding.patch b/testing/glibc/glibc-2.15-nearbyintf-rounding.patch
deleted file mode 100644
index b2bb9caac..000000000
--- a/testing/glibc/glibc-2.15-nearbyintf-rounding.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index c8186c8..1016753 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -4632,6 +4632,29 @@ nearbyint_test (void)
-   TEST_f_f (nearbyint, 524286.75, 524287.0);
-   TEST_f_f (nearbyint, 524288.75, 524289.0);
- 
-+  TEST_f_f (nearbyint, 1048576.75, 1048577.0);
-+  TEST_f_f (nearbyint, 2097152.75, 2097153.0);
-+  TEST_f_f (nearbyint, 2492472.75, 2492473.0);
-+  TEST_f_f (nearbyint, 2886220.75, 2886221.0);
-+  TEST_f_f (nearbyint, 3058792.75, 3058793.0);
-+  TEST_f_f (nearbyint, -1048576.75, -1048577.0);
-+  TEST_f_f (nearbyint, -2097152.75, -2097153.0);
-+  TEST_f_f (nearbyint, -2492472.75, -2492473.0);
-+  TEST_f_f (nearbyint, -2886220.75, -2886221.0);
-+  TEST_f_f (nearbyint, -3058792.75, -3058793.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (nearbyint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (nearbyint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (nearbyint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (nearbyint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (nearbyint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (nearbyint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (nearbyint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (nearbyint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (nearbyint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (nearbyint, -1125899906842624.75, -1125899906842625.0);
-+#endif
-+
-   END (nearbyint);
- }
- 
-diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-index 04ef9ab..a6d602b 100644
---- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
-+++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
-@@ -30,18 +30,12 @@ __nearbyintf(float x)
- {
- 	fenv_t env;
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		libc_feholdexceptf (&env);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
-@@ -49,17 +43,11 @@ __nearbyintf(float x)
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	libc_feholdexceptf (&env);
- 	w = TWO23[sx]+x;
- 	t = w-TWO23[sx];
diff --git a/testing/glibc/glibc-2.15-negative-result-cache.patch b/testing/glibc/glibc-2.15-negative-result-cache.patch
deleted file mode 100644
index c09e79a17..000000000
--- a/testing/glibc/glibc-2.15-negative-result-cache.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/nscd/aicache.c b/nscd/aicache.c
-index aaaf80d..e1f1244 100644
---- a/nscd/aicache.c
-+++ b/nscd/aicache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -514,8 +514,9 @@ next_nip:
-       if (fd != -1)
- 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
- 
--      /* If we cannot permanently store the result, so be it.  */
--      if (__builtin_expect (db->negtimeout == 0, 0))
-+      /* If we have a transient error or cannot permanently store the
-+	 result, so be it.  */
-+      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	{
- 	  /* Mark the old entry as obsolete.  */
- 	  if (dh != NULL)
-diff --git a/nscd/grpcache.c b/nscd/grpcache.c
-index e9607c6..a698f36 100644
---- a/nscd/grpcache.c
-+++ b/nscd/grpcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for group lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
- 	  else
- 	    written = total;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (db->negtimeout == 0)
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/hstcache.c b/nscd/hstcache.c
-index 4d68ade..c72feaa 100644
---- a/nscd/hstcache.c
-+++ b/nscd/hstcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
- 					MSG_NOSIGNAL)) != total)
- 	    all_written = false;
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
-index 4ac9942..2019991 100644
---- a/nscd/initgrcache.c
-+++ b/nscd/initgrcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for host lookup.
--   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
- 
-@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
-index 49e130c..e2ba09d 100644
---- a/nscd/pwdcache.c
-+++ b/nscd/pwdcache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for passwd lookup.
--   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
- 
-@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
-diff --git a/nscd/servicescache.c b/nscd/servicescache.c
-index d3d5dce..a6337e3 100644
---- a/nscd/servicescache.c
-+++ b/nscd/servicescache.c
-@@ -1,5 +1,5 @@
- /* Cache handling for services lookup.
--   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
- 
-@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
- 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
- 						MSG_NOSIGNAL));
- 
--	  /* If we cannot permanently store the result, so be it.  */
--	  if (__builtin_expect (db->negtimeout == 0, 0))
-+	  /* If we have a transient error or cannot permanently store
-+	     the result, so be it.  */
-+	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
- 	    {
- 	      /* Mark the old entry as obsolete.  */
- 	      if (dh != NULL)
diff --git a/testing/glibc/glibc-2.15-non-signalling-comparisons.patch b/testing/glibc/glibc-2.15-non-signalling-comparisons.patch
deleted file mode 100644
index 874f8b4cb..000000000
--- a/testing/glibc/glibc-2.15-non-signalling-comparisons.patch
+++ /dev/null
@@ -1,886 +0,0 @@
-diff --git a/math/w_acos.c b/math/w_acos.c
-index 3138408..0490933 100644
---- a/math/w_acos.c
-+++ b/math/w_acos.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __acos (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosf.c b/math/w_acosf.c
-index 0e41a2c..2500a7d 100644
---- a/math/w_acosf.c
-+++ b/math/w_acosf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __acosf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_acosh.c b/math/w_acosh.c
-index 0bd2686..d632987 100644
---- a/math/w_acosh.c
-+++ b/math/w_acosh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __acosh (double x)
- {
--  if (__builtin_expect (x < 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x,  1.0), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 29);
- 
-diff --git a/math/w_acoshf.c b/math/w_acoshf.c
-index c59bf94..f77df2b 100644
---- a/math/w_acoshf.c
-+++ b/math/w_acoshf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __acoshf (float x)
- {
--  if (__builtin_expect (x < 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0f), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard_f (x, x, 129);
- 
-diff --git a/math/w_acoshl.c b/math/w_acoshl.c
-index 819bdfc..cc823b8 100644
---- a/math/w_acoshl.c
-+++ b/math/w_acoshl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __acoshl (long double x)
- {
--  if (__builtin_expect (x < 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 1.0L), 0) && _LIB_VERSION != _IEEE_)
-     /* acosh(x<1) */
-     return __kernel_standard (x, x, 229);
- 
-diff --git a/math/w_acosl.c b/math/w_acosl.c
-index 6417068..05023b4 100644
---- a/math/w_acosl.c
-+++ b/math/w_acosl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __acosl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* acos(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asin.c b/math/w_asin.c
-index d4e89ce..0fa9487 100644
---- a/math/w_asin.c
-+++ b/math/w_asin.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- __asin (double x)
- {
--  if (__builtin_expect (fabs (x) > 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x),  1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinf.c b/math/w_asinf.c
-index 270961f..c28edab 100644
---- a/math/w_asinf.c
-+++ b/math/w_asinf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- __asinf (float x)
- {
--  if (__builtin_expect (fabsf (x) > 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_asinl.c b/math/w_asinl.c
-index 32e5273..e4036d8 100644
---- a/math/w_asinl.c
-+++ b/math/w_asinl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __asinl (long double x)
- {
--  if (__builtin_expect (fabsl (x) > 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       /* asin(|x|>1) */
-       feraiseexcept (FE_INVALID);
-diff --git a/math/w_atanh.c b/math/w_atanh.c
-index 1022bd5..190d2e9 100644
---- a/math/w_atanh.c
-+++ b/math/w_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- double
- __atanh (double x)
- {
--  if (__builtin_expect (fabs (x) >= 1.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabs (x), 1.0), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabs (x) > 1.0
- 			      ? 30		/* atanh(|x|>1) */
-diff --git a/math/w_atanhf.c b/math/w_atanhf.c
-index 3c8cf83..e0c5dc3 100644
---- a/math/w_atanhf.c
-+++ b/math/w_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- float
- __atanhf (float x)
- {
--  if (__builtin_expect (fabsf (x) >= 1.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsf (x), 1.0f), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x,
- 				fabsf (x) > 1.0f
- 				? 130		/* atanh(|x|>1) */
-diff --git a/math/w_atanhl.c b/math/w_atanhl.c
-index f582acf..319535d 100644
---- a/math/w_atanhl.c
-+++ b/math/w_atanhl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,8 @@
- long double
- __atanhl (long double x)
- {
--  if (__builtin_expect (fabsl (x) >= 1.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreaterequal (fabsl (x), 1.0L), 0)
-+      && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x,
- 			      fabsl (x) > 1.0L
- 			      ? 230		/* atanh(|x|>1) */
-diff --git a/math/w_exp2.c b/math/w_exp2.c
-index bf22326..7a3b0af 100644
---- a/math/w_exp2.c
-+++ b/math/w_exp2.c
-@@ -12,7 +12,8 @@ static const double u_threshold = (double) (DBL_MIN_EXP - DBL_MANT_DIG - 1);
- double
- __exp2 (double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finite (x))
-     /* exp2 overflow: 44, exp2 underflow: 45 */
-     return __kernel_standard (x, x, 44 + (x <= o_threshold));
-diff --git a/math/w_exp2f.c b/math/w_exp2f.c
-index 7215fca..c4e9e94 100644
---- a/math/w_exp2f.c
-+++ b/math/w_exp2f.c
-@@ -12,7 +12,8 @@ static const float u_threshold = (float) (FLT_MIN_EXP - FLT_MANT_DIG - 1);
- float
- __exp2f (float x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitef (x))
-     /* exp2 overflow: 144, exp2 underflow: 145 */
-     return __kernel_standard_f (x, x, 144 + (x <= o_threshold));
-diff --git a/math/w_exp2l.c b/math/w_exp2l.c
-index ac8d231..442a637 100644
---- a/math/w_exp2l.c
-+++ b/math/w_exp2l.c
-@@ -13,7 +13,8 @@ static const long double u_threshold
- long double
- __exp2l (long double x)
- {
--  if (__builtin_expect (x <= u_threshold || x > o_threshold, 0)
-+  if (__builtin_expect (islessequal (x, u_threshold)
-+			|| isgreater (x, o_threshold), 0)
-       && _LIB_VERSION != _IEEE_ && __finitel (x))
-     /* exp2 overflow: 244, exp2 underflow: 245 */
-     return __kernel_standard (x, x, 244 + (x <= o_threshold));
-diff --git a/math/w_j0.c b/math/w_j0.c
-index 1dff8b4..f8d3724 100644
---- a/math/w_j0.c
-+++ b/math/w_j0.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j0 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 34);
- 
-@@ -40,7 +41,8 @@ strong_alias (j0, j0l)
- double
- y0 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j0f.c b/math/w_j0f.c
-index fc52f26..cef36aa 100644
---- a/math/w_j0f.c
-+++ b/math/w_j0f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- j0f (float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 134);
-@@ -38,7 +38,8 @@ j0f (float x)
- float
- y0f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+                        || isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j0l.c b/math/w_j0l.c
-index 8d72d50..144f33c 100644
---- a/math/w_j0l.c
-+++ b/math/w_j0l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j0l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j0(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 234);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j0l, j0l)
- long double
- __y0l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_j1.c b/math/w_j1.c
-index 358e0e1..e9a5357 100644
---- a/math/w_j1.c
-+++ b/math/w_j1.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- j1 (double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 36);
- 
-@@ -40,7 +41,8 @@ strong_alias (j1, j1l)
- double
- y1 (double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_j1f.c b/math/w_j1f.c
-index 096fdf5..29bd949 100644
---- a/math/w_j1f.c
-+++ b/math/w_j1f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- float
- j1f (float x)
- {
--  if (__builtin_expect (fabsf (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsf (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard_f (x, x, 136);
- 
-@@ -37,7 +38,8 @@ j1f (float x)
- float
- y1f (float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_j1l.c b/math/w_j1l.c
-index 93e4ee4..01b8551 100644
---- a/math/w_j1l.c
-+++ b/math/w_j1l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- long double
- __j1l (long double x)
- {
--  if (__builtin_expect (fabsl (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabsl (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* j1(|x|>X_TLOSS) */
-     return __kernel_standard (x, x, 236);
- 
-@@ -38,7 +39,8 @@ weak_alias (__j1l, j1l)
- long double
- __y1l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0L)
- 	{
-diff --git a/math/w_jn.c b/math/w_jn.c
-index f0dd8c6..fd3fb16 100644
---- a/math/w_jn.c
-+++ b/math/w_jn.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,8 @@
- double
- jn (int n, double x)
- {
--  if (__builtin_expect (fabs (x) > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isgreater (fabs (x), X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard (n, x, 38);
- 
-@@ -40,7 +41,8 @@ strong_alias (jn, jnl)
- double
- yn (int n, double x)
- {
--  if (__builtin_expect (x <= 0.0 || x > X_TLOSS, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0) || isgreater (x, X_TLOSS), 0)
-+      && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0)
- 	{
-diff --git a/math/w_jnf.c b/math/w_jnf.c
-index ef29eb4..36d6f6d 100644
---- a/math/w_jnf.c
-+++ b/math/w_jnf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- jnf (int n, float x)
- {
--  if (__builtin_expect (fabsf (x) > (float) X_TLOSS, 0)
-+  if (__builtin_expect (isgreater (fabsf (x), (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     /* jn(n,|x|>X_TLOSS) */
-     return __kernel_standard_f (n, x, 138);
-@@ -38,7 +38,8 @@ jnf (int n, float x)
- float
- ynf (int n, float x)
- {
--  if (__builtin_expect (x <= 0.0f || x > (float) X_TLOSS, 0)
-+  if (__builtin_expect (islessequal (x, 0.0f)
-+			|| isgreater (x, (float) X_TLOSS), 0)
-       && _LIB_VERSION != _IEEE_)
-     {
-       if (x < 0.0f)
-diff --git a/math/w_log.c b/math/w_log.c
-index efc1c4c..ec33605 100644
---- a/math/w_log.c
-+++ b/math/w_log.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10.c b/math/w_log10.c
-index 2717ade..fe799ad 100644
---- a/math/w_log10.c
-+++ b/math/w_log10.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log10 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log10f.c b/math/w_log10f.c
-index 60737ca..4b821f7 100644
---- a/math/w_log10f.c
-+++ b/math/w_log10f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log10f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_log10l.c b/math/w_log10l.c
-index b26f18c..0e5a137 100644
---- a/math/w_log10l.c
-+++ b/math/w_log10l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log10l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_log2.c b/math/w_log2.c
-index 998e5d9..e58e109 100644
---- a/math/w_log2.c
-+++ b/math/w_log2.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- double
- __log2 (double x)
- {
--  if (__builtin_expect (x <= 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2f.c b/math/w_log2f.c
-index 6d91bf4..6963ed2 100644
---- a/math/w_log2f.c
-+++ b/math/w_log2f.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __log2f (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0)
- 	{
-diff --git a/math/w_log2l.c b/math/w_log2l.c
-index e51c1bc..eed04ff6c 100644
---- a/math/w_log2l.c
-+++ b/math/w_log2l.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __log2l (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_logf.c b/math/w_logf.c
-index 8aa27c8..38d408f 100644
---- a/math/w_logf.c
-+++ b/math/w_logf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- float
- __logf (float x)
- {
--  if (__builtin_expect (x <= 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0f)
- 	{
-diff --git a/math/w_logl.c b/math/w_logl.c
-index a3139ff..593b37d 100644
---- a/math/w_logl.c
-+++ b/math/w_logl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -25,7 +25,7 @@
- long double
- __logl (long double x)
- {
--  if (__builtin_expect (x <= 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (islessequal (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     {
-       if (x == 0.0L)
- 	{
-diff --git a/math/w_sqrt.c b/math/w_sqrt.c
-index 409a6df..f6ba542 100644
---- a/math/w_sqrt.c
-+++ b/math/w_sqrt.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- double
- __sqrt (double x)
- {
--  if (__builtin_expect (x < 0.0, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 26); /* sqrt(negative) */
- 
-   return __ieee754_sqrt (x);
-diff --git a/math/w_sqrtf.c b/math/w_sqrtf.c
-index 3c3d2f8..c128e9b 100644
---- a/math/w_sqrtf.c
-+++ b/math/w_sqrtf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- float
- __sqrtf (float x)
- {
--  if (__builtin_expect (x < 0.0f, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0f), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard_f (x, x, 126); /* sqrt(negative) */
- 
-   return __ieee754_sqrtf (x);
-diff --git a/math/w_sqrtl.c b/math/w_sqrtl.c
-index 5e18f44..2a4a048 100644
---- a/math/w_sqrtl.c
-+++ b/math/w_sqrtl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -24,7 +24,7 @@
- long double
- __sqrtl (long double x)
- {
--  if (__builtin_expect (x < 0.0L, 0) && _LIB_VERSION != _IEEE_)
-+  if (__builtin_expect (isless (x, 0.0L), 0) && _LIB_VERSION != _IEEE_)
-     return __kernel_standard (x, x, 226); /* sqrt(negative) */
- 
-   return __ieee754_sqrtl (x);
-diff --git a/sysdeps/ieee754/dbl-64/e_atanh.c b/sysdeps/ieee754/dbl-64/e_atanh.c
-index 9fc21ab..5f471b1 100644
---- a/sysdeps/ieee754/dbl-64/e_atanh.c
-+++ b/sysdeps/ieee754/dbl-64/e_atanh.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanh (double x)
- {
-   double xa = fabs (x);
-   double t;
--  if (xa < 0.5)
-+  if (isless (xa, 0.5))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanh (double x)
-       t = xa + xa;
-       t = 0.5 * __log1p (t + t * xa / (1.0 - xa));
-     }
--  else if (__builtin_expect (xa < 1.0, 1))
-+  else if (__builtin_expect (isless (xa, 1.0), 1))
-     t = 0.5 * __log1p ((xa + xa) / (1.0 - xa));
-   else
-     {
--      if (xa > 1.0)
-+      if (isgreater (xa, 1.0))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0;
-diff --git a/sysdeps/ieee754/dbl-64/w_exp.c b/sysdeps/ieee754/dbl-64/w_exp.c
-index ee42587..b584ed8 100644
---- a/sysdeps/ieee754/dbl-64/w_exp.c
-+++ b/sysdeps/ieee754/dbl-64/w_exp.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */
- double
- __exp (double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 6);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 7);
-diff --git a/sysdeps/ieee754/flt-32/e_atanhf.c b/sysdeps/ieee754/flt-32/e_atanhf.c
-index 75ed691..7af2f6c 100644
---- a/sysdeps/ieee754/flt-32/e_atanhf.c
-+++ b/sysdeps/ieee754/flt-32/e_atanhf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -46,7 +46,7 @@ __ieee754_atanhf (float x)
- {
-   float xa = fabsf (x);
-   float t;
--  if (xa < 0.5f)
-+  if (isless (xa, 0.5f))
-     {
-       if (__builtin_expect (xa < 0x1.0p-28f, 0))
- 	{
-@@ -57,11 +57,11 @@ __ieee754_atanhf (float x)
-       t = xa + xa;
-       t = 0.5f * __log1pf (t + t * xa / (1.0f - xa));
-     }
--  else if (__builtin_expect (xa < 1.0f, 1))
-+  else if (__builtin_expect (isless (xa, 1.0f), 1))
-     t = 0.5f * __log1pf ((xa + xa) / (1.0f - xa));
-   else
-     {
--      if (xa > 1.0f)
-+      if (isgreater (xa, 1.0f))
- 	return (x - x) / (x - x);
- 
-       return x / 0.0f;
-diff --git a/sysdeps/ieee754/flt-32/w_expf.c b/sysdeps/ieee754/flt-32/w_expf.c
-index 5500872..bc3b2f6 100644
---- a/sysdeps/ieee754/flt-32/w_expf.c
-+++ b/sysdeps/ieee754/flt-32/w_expf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -28,12 +28,12 @@ u_threshold= -1.0397208405e+02;  /* 0xc2cff1b5 */
- float
- __expf (float x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 106);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard_f (x, x, 107);
-diff --git a/sysdeps/ieee754/ldbl-96/w_expl.c b/sysdeps/ieee754/ldbl-96/w_expl.c
-index ec9d8a7..d61c0a3 100644
---- a/sysdeps/ieee754/ldbl-96/w_expl.c
-+++ b/sysdeps/ieee754/ldbl-96/w_expl.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 2011, 2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
- 
-@@ -30,12 +30,12 @@ u_threshold= -1.140019167866942050398521670162263001513e4;
- long double
- __expl (long double x)
- {
--  if (__builtin_expect (x > o_threshold, 0))
-+  if (__builtin_expect (isgreater (x, o_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 206);
-     }
--  else if (__builtin_expect (x < u_threshold, 0))
-+  else if (__builtin_expect (isless (x, u_threshold), 0))
-     {
-       if (_LIB_VERSION != _IEEE_)
- 	return __kernel_standard (x, x, 207);
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 d8894723a..000000000
--- a/testing/glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,226 +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 <stap-probe.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
--	LP_OP(cmp) $-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
--	LP_OP(cmp) $-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
--	mov	dep_mutex(%rdi), %R8_LP
--	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:
- 
diff --git a/testing/glibc/glibc-2.15-revert-netlink-cache.patch b/testing/glibc/glibc-2.15-revert-netlink-cache.patch
deleted file mode 100644
index 87d04c794..000000000
--- a/testing/glibc/glibc-2.15-revert-netlink-cache.patch
+++ /dev/null
@@ -1,680 +0,0 @@
-diff --git a/include/ifaddrs.h b/include/ifaddrs.h
-index e1c6cac..50e4c48 100644
---- a/include/ifaddrs.h
-+++ b/include/ifaddrs.h
-@@ -21,13 +21,8 @@ struct in6addrinfo
- extern void __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 			struct in6addrinfo **in6ai, size_t *in6ailen)
-   attribute_hidden;
--extern void __free_in6ai (struct in6addrinfo *in6ai) attribute_hidden;
- extern void __check_native (uint32_t a1_index, int *a1_native,
- 			    uint32_t a2_index, int *a2_native)
-   attribute_hidden;
- 
--#ifdef IS_IN_nscd
--extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
--#endif
--
- #endif	/* ifaddrs.h */
-diff --git a/inet/check_pf.c b/inet/check_pf.c
-index 0fa34cc..b015432 100644
---- a/inet/check_pf.c
-+++ b/inet/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Generic version.
--   Copyright (C) 2003, 2006, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006 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
-@@ -54,19 +54,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   (void) freeifaddrs (ifa);
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *in6ai)
--{
--  /* Nothing to do.  */
--}
--
--
--#ifdef IS_IN_nscd
--uint32_t
--__bump_nl_timestamp (void)
--{
--  return 0;
--}
--#endif
-diff --git a/nscd/connections.c b/nscd/connections.c
-index c741996..2b5c7ef 100644
---- a/nscd/connections.c
-+++ b/nscd/connections.c
-@@ -24,7 +24,6 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <grp.h>
--#include <ifaddrs.h>
- #include <libintl.h>
- #include <pthread.h>
- #include <pwd.h>
-@@ -33,10 +32,6 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <arpa/inet.h>
--#ifdef HAVE_NETLINK
--# include <linux/netlink.h>
--# include <linux/rtnetlink.h>
--#endif
- #ifdef HAVE_EPOLL
- # include <sys/epoll.h>
- #endif
-@@ -252,11 +247,6 @@ static int sock;
- int inotify_fd = -1;
- #endif
- 
--#ifdef HAVE_NETLINK
--/* Descriptor for netlink status updates.  */
--static int nl_status_fd = -1;
--#endif
--
- #ifndef __ASSUME_SOCK_CLOEXEC
- /* Negative if SOCK_CLOEXEC is not supported, positive if it is, zero
-    before be know the result.  */
-@@ -913,65 +903,6 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
-       exit (1);
-     }
- 
--#ifdef HAVE_NETLINK
--  if (dbs[hstdb].enabled)
--    {
--      /* Try to open netlink socket to monitor network setting changes.  */
--      nl_status_fd = socket (AF_NETLINK,
--			     SOCK_RAW | SOCK_CLOEXEC | SOCK_NONBLOCK,
--			     NETLINK_ROUTE);
--      if (nl_status_fd != -1)
--	{
--	  struct sockaddr_nl snl;
--	  memset (&snl, '\0', sizeof (snl));
--	  snl.nl_family = AF_NETLINK;
--	  /* XXX Is this the best set to use?  */
--	  snl.nl_groups = (RTMGRP_IPV4_IFADDR | RTMGRP_TC | RTMGRP_IPV4_MROUTE
--			   | RTMGRP_IPV4_ROUTE | RTMGRP_IPV4_RULE
--			   | RTMGRP_IPV6_IFADDR | RTMGRP_IPV6_MROUTE
--			   | RTMGRP_IPV6_ROUTE | RTMGRP_IPV6_IFINFO
--			   | RTMGRP_IPV6_PREFIX);
--
--	  if (bind (nl_status_fd, (struct sockaddr *) &snl, sizeof (snl)) != 0)
--	    {
--	      close (nl_status_fd);
--	      nl_status_fd = -1;
--	    }
--	  else
--	    {
--	      /* Start the timestamp process.  */
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--
--# ifndef __ASSUME_SOCK_CLOEXEC
--	      if (have_sock_cloexec < 0)
--		{
--		  /* We don't want to get stuck on accept.  */
--		  int fl = fcntl (nl_status_fd, F_GETFL);
--		  if (fl == -1
--		      || fcntl (nl_status_fd, F_SETFL, fl | O_NONBLOCK) == -1)
--		    {
--		      dbg_log (_("\
--cannot change socket to nonblocking mode: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--
--		  /* The descriptor needs to be closed on exec.  */
--		  if (paranoia
--		      && fcntl (nl_status_fd, F_SETFD, FD_CLOEXEC) == -1)
--		    {
--		      dbg_log (_("cannot set socket to close on exec: %s"),
--			       strerror (errno));
--		      exit (1);
--		    }
--		}
--# endif
--	    }
--	}
--    }
--#endif
--
-   /* Change to unprivileged uid/gid/groups if specified in config file */
-   if (server_user != NULL)
-     finish_drop_privileges ();
-@@ -1895,18 +1826,6 @@ main_loop_poll (void)
-     }
- #endif
- 
--#ifdef HAVE_NETLINK
--  size_t idx_nl_status_fd = 0;
--  if (nl_status_fd != -1)
--    {
--      idx_nl_status_fd = nused;
--      conns[nused].fd = nl_status_fd;
--      conns[nused].events = POLLRDNORM;
--      ++nused;
--      firstfree = nused;
--    }
--#endif
--
-   while (1)
-     {
-       /* Wait for any event.  We wait at most a couple of seconds so
-@@ -2049,20 +1968,6 @@ disabled inotify after read error %d"),
- 	    }
- #endif
- 
--#ifdef HAVE_NETLINK
--	  if (idx_nl_status_fd != 0 && conns[idx_nl_status_fd].revents != 0)
--	    {
--	      char buf[4096];
--	      /* Read all the data.  We do not interpret it here.  */
--	      while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					       sizeof (buf))) != -1)
--		;
--
--	      dbs[hstdb].head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]
--		= __bump_nl_timestamp ();
--	    }
--#endif
--
- 	  for (size_t cnt = first; cnt < nused && n > 0; ++cnt)
- 	    if (conns[cnt].revents != 0)
- 	      {
-@@ -2141,17 +2046,6 @@ main_loop_epoll (int efd)
-     }
- # endif
- 
--# ifdef HAVE_NETLINK
--  if (nl_status_fd != -1)
--    {
--      ev.events = EPOLLRDNORM;
--      ev.data.fd = nl_status_fd;
--      if (epoll_ctl (efd, EPOLL_CTL_ADD, nl_status_fd, &ev) == -1)
--	/* We cannot use epoll.  */
--	return;
--    }
--# endif
--
-   while (1)
-     {
-       struct epoll_event revs[100];
-@@ -2268,18 +2162,6 @@ main_loop_epoll (int efd)
- 		}
- 	  }
- # endif
--# ifdef HAVE_NETLINK
--	else if (revs[cnt].data.fd == nl_status_fd)
--	  {
--	    char buf[4096];
--	    /* Read all the data.  We do not interpret it here.  */
--	    while (TEMP_FAILURE_RETRY (read (nl_status_fd, buf,
--					     sizeof (buf))) != -1)
--	      ;
--
--	    __bump_nl_timestamp ();
--	  }
--# endif
- 	else
- 	  {
- 	    /* Remove the descriptor from the epoll descriptor.  */
-@@ -2303,7 +2185,6 @@ main_loop_epoll (int efd)
-       time_t laststart = now - ACCEPT_TIMEOUT;
-       assert (starttime[sock] == 0);
-       assert (inotify_fd == -1 || starttime[inotify_fd] == 0);
--      assert (nl_status_fd == -1 || starttime[nl_status_fd] == 0);
-       for (int cnt = highest; cnt > STDERR_FILENO; --cnt)
- 	if (starttime[cnt] != 0 && starttime[cnt] < laststart)
- 	  {
-diff --git a/nscd/nscd-client.h b/nscd/nscd-client.h
-index b5cd2d2..caad26a 100644
---- a/nscd/nscd-client.h
-+++ b/nscd/nscd-client.h
-@@ -260,17 +260,12 @@ struct hashentry
- 
- 
- /* Current persistent database version.  */
--#define DB_VERSION	2
-+#define DB_VERSION	1
- 
- /* Maximum time allowed between updates of the timestamp.  */
- #define MAPPING_TIMEOUT (5 * 60)
- 
- 
--/* Used indices for the EXTRA_DATA element of 'database_pers_head'.
--   Each database has its own indices.  */
--#define NSCD_HST_IDX_CONF_TIMESTAMP	0
--
--
- /* Header of persistent database file.  */
- struct database_pers_head
- {
-@@ -279,8 +274,6 @@ struct database_pers_head
-   volatile int32_t gc_cycle;
-   volatile int32_t nscd_certainly_running;
-   volatile nscd_time_t timestamp;
--  /* Room for extensions.  */
--  volatile uint32_t extra_data[4];
- 
-   nscd_ssize_t module;
-   nscd_ssize_t data_size;
-@@ -329,12 +322,6 @@ extern int __nscd_open_socket (const char *key, size_t keylen,
- 			       request_type type, void *response,
- 			       size_t responselen) attribute_hidden;
- 
--/* Try to get a file descriptor for the shared meory segment
--   containing the database.  */
--extern struct mapped_database *__nscd_get_mapping (request_type type,
--						   const char *key,
--						   struct mapped_database **mappedp) attribute_hidden;
--
- /* Get reference of mapping.  */
- extern struct mapped_database *__nscd_get_map_ref (request_type type,
- 						   const char *name,
-@@ -384,7 +371,4 @@ extern ssize_t writeall (int fd, const void *buf, size_t len)
- extern ssize_t sendfileall (int tofd, int fromfd, off_t off, size_t len)
-   attribute_hidden;
- 
--/* Get netlink timestamp counter from mapped area or zero.  */
--extern uint32_t __nscd_get_nl_timestamp (void);
--
- #endif /* nscd.h */
-diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
-index 6ee142d..70631fa 100644
---- a/nscd/nscd_gethst_r.c
-+++ b/nscd/nscd_gethst_r.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009, 2011
-+/* Copyright (C) 1998-2005, 2006, 2007, 2008, 2009
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
-@@ -98,27 +98,6 @@ libc_freeres_fn (hst_map_free)
- }
- 
- 
--uint32_t
--__nscd_get_nl_timestamp (void)
--{
--  if (__nss_not_use_nscd_hosts != 0)
--    return 0;
--
--  struct mapped_database *map = __hst_map_handle.mapped;
--
--  if (map == NULL
--      || (map != NO_MAPPING
--	  && map->head->nscd_certainly_running == 0
--	  && map->head->timestamp + MAPPING_TIMEOUT < time (NULL)))
--    map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped);
--
--  if (map == NO_MAPPING)
--    return 0;
--
--  return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP];
--}
--
--
- int __nss_have_localdomain attribute_hidden;
- 
- static int
-diff --git a/nscd/nscd_helper.c b/nscd/nscd_helper.c
-index 365b599..fe63f9a 100644
---- a/nscd/nscd_helper.c
-+++ b/nscd/nscd_helper.c
-@@ -277,9 +277,9 @@ __nscd_unmap (struct mapped_database *mapped)
- 
- /* Try to get a file descriptor for the shared meory segment
-    containing the database.  */
--struct mapped_database *
--__nscd_get_mapping (request_type type, const char *key,
--		    struct mapped_database **mappedp)
-+static struct mapped_database *
-+get_mapping (request_type type, const char *key,
-+	     struct mapped_database **mappedp)
- {
-   struct mapped_database *result = NO_MAPPING;
- #ifdef SCM_RIGHTS
-@@ -449,8 +449,8 @@ __nscd_get_map_ref (request_type type, const char *name,
- 	  || (cur->head->nscd_certainly_running == 0
- 	      && cur->head->timestamp + MAPPING_TIMEOUT < time (NULL))
- 	  || cur->head->data_size > cur->datasize)
--	cur = __nscd_get_mapping (type, name,
--				  (struct mapped_database **) &mapptr->mapped);
-+	cur = get_mapping (type, name,
-+			   (struct mapped_database **) &mapptr->mapped);
- 
-       if (__builtin_expect (cur != NO_MAPPING, 1))
- 	{
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index 1a023f9..4979805 100644
---- a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2386,7 +2386,7 @@ getaddrinfo (const char *name, const char *service,
- 	       || (hints->ai_family == PF_INET6 && ! seen_ipv6))
- 	{
- 	  /* We cannot possibly return a valid answer.  */
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 	  return EAI_NONAME;
- 	}
-     }
-@@ -2400,7 +2400,7 @@ getaddrinfo (const char *name, const char *service,
- 	{
- 	  if (hints->ai_flags & AI_NUMERICSERV)
- 	    {
--	      __free_in6ai (in6ai);
-+	      free (in6ai);
- 	      return EAI_NONAME;
- 	    }
- 
-@@ -2422,7 +2422,7 @@ getaddrinfo (const char *name, const char *service,
-       if (last_i != 0)
- 	{
- 	  freeaddrinfo (p);
--	  __free_in6ai (in6ai);
-+	  free (in6ai);
- 
- 	  return -(last_i & GAIH_EAI);
- 	}
-@@ -2434,7 +2434,7 @@ getaddrinfo (const char *name, const char *service,
-     }
-   else
-     {
--      __free_in6ai (in6ai);
-+      free (in6ai);
-       return EAI_FAMILY;
-     }
- 
-@@ -2622,7 +2622,7 @@ getaddrinfo (const char *name, const char *service,
-       p->ai_canonname = canonname;
-     }
- 
--  __free_in6ai (in6ai);
-+  free (in6ai);
- 
-   if (p)
-     {
-diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
-index e684b16..c907af4 100644
---- a/sysdeps/unix/sysv/linux/Makefile
-+++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -173,6 +173,6 @@ CFLAGS-mq_receive.c += -fexceptions
- endif
- 
- ifeq ($(subdir),nscd)
--sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY -DHAVE_NETLINK
-+sysdep-CFLAGS += -DHAVE_EPOLL -DHAVE_SENDFILE -DHAVE_INOTIFY
- CFLAGS-gai.c += -DNEED_NETLINK
- endif
-diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
-index 0738a70..d5ad7ea 100644
---- a/sysdeps/unix/sysv/linux/check_pf.c
-+++ b/sysdeps/unix/sysv/linux/check_pf.c
-@@ -1,5 +1,5 @@
- /* Determine protocol families for which interfaces exist.  Linux version.
--   Copyright (C) 2003, 2006-2008, 2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 2003, 2006, 2007, 2008, 2010, 2011 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
-@@ -33,9 +33,6 @@
- 
- #include <not-cancel.h>
- #include <kernel-features.h>
--#include <bits/libc-lock.h>
--#include <atomic.h>
--#include <nscd/nscd-client.h>
- 
- 
- #ifndef IFA_F_HOMEADDRESS
-@@ -46,42 +43,9 @@
- #endif
- 
- 
--struct cached_data
--{
--  uint32_t timestamp;
--  uint32_t usecnt;
--  bool seen_ipv4;
--  bool seen_ipv6;
--  size_t in6ailen;
--  struct in6addrinfo in6ai[0];
--};
--
--static struct cached_data noai6ai_cached =
--  {
--    .usecnt = 1,	/* Make sure we never try to delete this entry.  */
--    .in6ailen = 0
--  };
--
--static struct cached_data *cache;
--__libc_lock_define_initialized (static, lock);
--
--
--#ifdef IS_IN_nscd
--static uint32_t nl_timestamp;
--
--uint32_t
--__bump_nl_timestamp (void)
--{
--  if (atomic_increment_val (&nl_timestamp) == 0)
--    atomic_increment (&nl_timestamp);
--
--  return nl_timestamp;
--}
--#endif
--
--
--static struct cached_data *
--make_request (int fd, pid_t pid)
-+static int
-+make_request (int fd, pid_t pid, bool *seen_ipv4, bool *seen_ipv6,
-+	      struct in6addrinfo **in6ai, size_t *in6ailen)
- {
-   struct req
-   {
-@@ -135,6 +99,9 @@ make_request (int fd, pid_t pid)
- 				    sizeof (nladdr))) < 0)
-     goto out_fail;
- 
-+  *seen_ipv4 = false;
-+  *seen_ipv6 = false;
-+
-   bool done = false;
-   struct in6ailist
-   {
-@@ -142,8 +109,6 @@ make_request (int fd, pid_t pid)
-     struct in6ailist *next;
-   } *in6ailist = NULL;
-   size_t in6ailistlen = 0;
--  bool seen_ipv4 = false;
--  bool seen_ipv6 = false;
- 
-   do
-     {
-@@ -207,12 +172,12 @@ make_request (int fd, pid_t pid)
- 		    {
- 		      if (*(const in_addr_t *) address
- 			  != htonl (INADDR_LOOPBACK))
--			seen_ipv4 = true;
-+			*seen_ipv4 = true;
- 		    }
- 		  else
- 		    {
- 		      if (!IN6_IS_ADDR_LOOPBACK (address))
--			seen_ipv6 = true;
-+			*seen_ipv6 = true;
- 		    }
- 		}
- 
-@@ -246,47 +211,30 @@ make_request (int fd, pid_t pid)
-     }
-   while (! done);
- 
--  struct cached_data *result;
--  if (seen_ipv6 && in6ailist != NULL)
-+  if (*seen_ipv6 && in6ailist != NULL)
-     {
--      result = malloc (sizeof (*result)
--		       + in6ailistlen * sizeof (struct in6addrinfo));
--      if (result == NULL)
-+      *in6ai = malloc (in6ailistlen * sizeof (**in6ai));
-+      if (*in6ai == NULL)
- 	goto out_fail;
- 
--#ifdef IS_IN_nscd
--      result->timestamp = nl_timestamp;
--#else
--      result->timestamp = __nscd_get_nl_timestamp ();
--#endif
--      result->usecnt = 2;
--      result->seen_ipv4 = seen_ipv4;
--      result->seen_ipv6 = true;
--      result->in6ailen = in6ailistlen;
-+      *in6ailen = in6ailistlen;
- 
-       do
- 	{
--	  result->in6ai[--in6ailistlen] = in6ailist->info;
-+	  (*in6ai)[--in6ailistlen] = in6ailist->info;
- 	  in6ailist = in6ailist->next;
- 	}
-       while (in6ailist != NULL);
-     }
--  else
--    {
--      atomic_add (&noai6ai_cached.usecnt, 2);
--      noai6ai_cached.seen_ipv4 = seen_ipv4;
--      noai6ai_cached.seen_ipv6 = seen_ipv6;
--      result = &noai6ai_cached;
--    }
- 
-   if (use_malloc)
-     free (buf);
--  return result;
-+  return 0;
- 
- out_fail:
-   if (use_malloc)
-     free (buf);
--  return NULL;
-+  return -1;
- }
- 
- 
-@@ -310,65 +258,28 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
- 
-   if (! __no_netlink_support)
-     {
--      struct cached_data *olddata = NULL;
--      struct cached_data *data = NULL;
-+      int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
- 
--      __libc_lock_lock (lock);
--
--#ifdef IS_IN_nscd
--# define cache_valid() nl_timestamp != 0 && cache->timestamp == nl_timestamp
--#else
--# define cache_valid() \
--      ({ uint32_t val = __nscd_get_nl_timestamp ();			      \
--	 val != 0 && cache->timestamp == val; })
--#endif
--      if (cache != NULL && cache_valid ())
--	{
--	  data = cache;
--	  atomic_increment (&cache->usecnt);
--	}
--      else
-+      if (__builtin_expect (fd >= 0, 1))
- 	{
--	  int fd = __socket (PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-+	  struct sockaddr_nl nladdr;
-+	  memset (&nladdr, '\0', sizeof (nladdr));
-+	  nladdr.nl_family = AF_NETLINK;
- 
--	  if (__builtin_expect (fd >= 0, 1))
--	    {
--	      struct sockaddr_nl nladdr;
--	      memset (&nladdr, '\0', sizeof (nladdr));
--	      nladdr.nl_family = AF_NETLINK;
--
--	      socklen_t addr_len = sizeof (nladdr);
--
--	      if(__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
--		 && __getsockname (fd, (struct sockaddr *) &nladdr,
--				   &addr_len) == 0)
--		data = make_request (fd, nladdr.nl_pid);
--
--	      close_not_cancel_no_status (fd);
--	    }
--
--	  if (data != NULL)
--	    {
--	      olddata = cache;
--	      cache = data;
--	    }
--	}
-+	  socklen_t addr_len = sizeof (nladdr);
- 
--      __libc_lock_unlock (lock);
-+	  bool success
-+	    = (__bind (fd, (struct sockaddr *) &nladdr, sizeof (nladdr)) == 0
-+	       && __getsockname (fd, (struct sockaddr *) &nladdr,
-+				 &addr_len) == 0
-+	       && make_request (fd, nladdr.nl_pid, seen_ipv4, seen_ipv6,
-+				in6ai, in6ailen) == 0);
- 
--      if (data != NULL)
--	{
--	  /* It worked.  */
--	  *seen_ipv4 = data->seen_ipv4;
--	  *seen_ipv6 = data->seen_ipv6;
--	  *in6ailen = data->in6ailen;
--	  *in6ai = data->in6ai;
--
--	  if (olddata != NULL && olddata->usecnt > 0
--	      && atomic_add_zero (&olddata->usecnt, -1))
--	    free (olddata);
-+	  close_not_cancel_no_status (fd);
- 
--	  return;
-+	  if (success)
-+	    /* It worked.  */
-+	    return;
- 	}
- 
- #if __ASSUME_NETLINK_SUPPORT == 0
-@@ -407,26 +318,3 @@ __check_pf (bool *seen_ipv4, bool *seen_ipv6,
-   (void) freeifaddrs (ifa);
- #endif
- }
--
--
--void
--__free_in6ai (struct in6addrinfo *ai)
--{
--  if (ai != NULL)
--    {
--      struct cached_data *data =
--	(struct cached_data *) ((char *) ai
--				- offsetof (struct cached_data, in6ai));
--
--      if (atomic_add_zero (&data->usecnt, -1))
--	{
--	  __libc_lock_lock (lock);
--
--	  if (data->usecnt == 0)
--	    /* Still unused.  */
--	    free (data);
--
--	  __libc_lock_unlock (lock);
--	}
--    }
--}
diff --git a/testing/glibc/glibc-2.15-rintf-rounding.patch b/testing/glibc/glibc-2.15-rintf-rounding.patch
deleted file mode 100644
index e0240ac6c..000000000
--- a/testing/glibc/glibc-2.15-rintf-rounding.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff --git a/math/libm-test.inc b/math/libm-test.inc
-index 6243e1e..c8186c8 100644
---- a/math/libm-test.inc
-+++ b/math/libm-test.inc
-@@ -5037,6 +5037,22 @@ rint_test (void)
-   TEST_f_f (rint, 262142.75, 262143.0);
-   TEST_f_f (rint, 524286.75, 524287.0);
-   TEST_f_f (rint, 524288.75, 524289.0);
-+  TEST_f_f (rint, 1048576.75, 1048577.0);
-+  TEST_f_f (rint, 2097152.75, 2097153.0);
-+  TEST_f_f (rint, -1048576.75, -1048577.0);
-+  TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+  TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+  TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+  TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+  TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+  TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+  TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+  TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+  TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+  TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+  TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-   /* The result can only be represented in long double.  */
-   TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5137,6 +5153,22 @@ rint_test_tonearest (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-@@ -5207,6 +5239,22 @@ rint_test_towardzero (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5277,6 +5325,22 @@ rint_test_downward (void)
-       TEST_f_f (rint, -0.1, -1.0);
-       TEST_f_f (rint, -0.25, -1.0);
-       TEST_f_f (rint, -0.625, -1.0);
-+      TEST_f_f (rint, 1048576.75, 1048576.0);
-+      TEST_f_f (rint, 2097152.75, 2097152.0);
-+      TEST_f_f (rint, -1048576.75, -1048577.0);
-+      TEST_f_f (rint, -2097152.75, -2097153.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177664.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355328.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710656.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421312.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842624.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177665.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355329.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710657.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421313.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842625.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370495.0L);
-@@ -5347,6 +5411,22 @@ rint_test_upward (void)
-       TEST_f_f (rint, -0.1, -0.0);
-       TEST_f_f (rint, -0.25, -0.0);
-       TEST_f_f (rint, -0.625, -0.0);
-+      TEST_f_f (rint, 1048576.75, 1048577.0);
-+      TEST_f_f (rint, 2097152.75, 2097153.0);
-+      TEST_f_f (rint, -1048576.75, -1048576.0);
-+      TEST_f_f (rint, -2097152.75, -2097152.0);
-+#ifndef TEST_FLOAT
-+      TEST_f_f (rint, 70368744177664.75, 70368744177665.0);
-+      TEST_f_f (rint, 140737488355328.75, 140737488355329.0);
-+      TEST_f_f (rint, 281474976710656.75, 281474976710657.0);
-+      TEST_f_f (rint, 562949953421312.75, 562949953421313.0);
-+      TEST_f_f (rint, 1125899906842624.75, 1125899906842625.0);
-+      TEST_f_f (rint, -70368744177664.75, -70368744177664.0);
-+      TEST_f_f (rint, -140737488355328.75, -140737488355328.0);
-+      TEST_f_f (rint, -281474976710656.75, -281474976710656.0);
-+      TEST_f_f (rint, -562949953421312.75, -562949953421312.0);
-+      TEST_f_f (rint, -1125899906842624.75, -1125899906842624.0);
-+#endif
- #ifdef TEST_LDOUBLE
-       /* The result can only be represented in long double.  */
-       TEST_f_f (rint, 4503599627370495.5L, 4503599627370496.0L);
-diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c
-index 9ea9b6f..9ba6b57 100644
---- a/sysdeps/ieee754/flt-32/s_rintf.c
-+++ b/sysdeps/ieee754/flt-32/s_rintf.c
-@@ -26,34 +26,22 @@ float
- __rintf(float x)
- {
- 	int32_t i0,j0,sx;
--	u_int32_t i,i1;
- 	float w,t;
- 	GET_FLOAT_WORD(i0,x);
- 	sx = (i0>>31)&1;
- 	j0 = ((i0>>23)&0xff)-0x7f;
- 	if(j0<23) {
- 	    if(j0<0) {
--		if((i0&0x7fffffff)==0) return x;
--		i1 = (i0&0x07fffff);
--		i0 &= 0xfff00000;
--		i0 |= ((i1|-i1)>>9)&0x400000;
--		SET_FLOAT_WORD(x,i0);
- 		w = TWO23[sx]+x;
- 		t =  w-TWO23[sx];
- 		GET_FLOAT_WORD(i0,t);
- 		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
- 		return t;
--	    } else {
--		i = (0x007fffff)>>j0;
--		if((i0&i)==0) return x; /* x is integral */
--		i>>=1;
--		if((i0&i)!=0) i0 = (i0&(~i))|((0x100000)>>j0);
- 	    }
- 	} else {
- 	    if(j0==0x80) return x+x;	/* inf or NaN */
- 	    else return x;		/* x is integral */
- 	}
--	SET_FLOAT_WORD(x,i0);
- 	w = TWO23[sx]+x;
- 	return w-TWO23[sx];
- }
diff --git a/testing/glibc/glibc-2.15-scanf.patch b/testing/glibc/glibc-2.15-scanf.patch
deleted file mode 100644
index a2561b232..000000000
--- a/testing/glibc/glibc-2.15-scanf.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
-index 0e71deb..e18a6c3 100644
---- a/stdio-common/vfscanf.c
-+++ b/stdio-common/vfscanf.c
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1991-2006, 2007, 2010, 2011 Free Software Foundation, Inc.
-+/* Copyright (C) 1991-2007, 2010, 2011, 2012 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
-@@ -274,7 +274,7 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
- 	  CHAR_T *old = wp;						    \
- 	  size_t newsize = (UCHAR_MAX + 1 > 2 * wpmax			    \
- 			    ? UCHAR_MAX + 1 : 2 * wpmax);		    \
--	  if (use_malloc || __libc_use_alloca (newsize))		    \
-+	  if (use_malloc || !__libc_use_alloca (newsize))		    \
- 	    {								    \
- 	      wp = realloc (use_malloc ? wp : NULL, newsize);		    \
- 	      if (wp == NULL)						    \
diff --git a/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch b/testing/glibc/glibc-2.15-strcasecmp-disable-avx.patch
deleted file mode 100644
index 4c104fa55..000000000
--- a/testing/glibc/glibc-2.15-strcasecmp-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-2.15-testsuite.patch b/testing/glibc/glibc-2.15-testsuite.patch
deleted file mode 100644
index 7eaeaed65..000000000
--- a/testing/glibc/glibc-2.15-testsuite.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d4c2917fc5091dae7ab1b30c165becb70d3c3453 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Mon, 16 Apr 2012 14:06:47 +1000
-Subject: [PATCH] Fix test-suite failues with -Wl,--as-needed
-
-Signed-off-by: Allan McRae <allan@archlinux.org>
----
- ChangeLog       |   24 ++++++++++++++++++++++++
- elf/Makefile    |   21 ++++++++++++++++++++-
- nptl/ChangeLog  |    5 +++++
- nptl/Makefile   |    3 ++-
- stdlib/Makefile |    1 +
- 5 files changed, 52 insertions(+), 2 deletions(-)
-
-diff --git a/elf/Makefile b/elf/Makefile
-index 57dcab0..47729c3 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -500,6 +500,18 @@ $(objpfx)tst-initordera3.so: $(objpfx)tst-initorderb2.so $(objpfx)tst-initorderb
- $(objpfx)tst-initordera4.so: $(objpfx)tst-initordera3.so
- $(objpfx)tst-initorder: $(objpfx)tst-initordera4.so $(objpfx)tst-initordera1.so $(objpfx)tst-initorderb2.so
- 
-+LDFLAGS-nodel2mod3.so = $(no-as-needed)
-+LDFLAGS-reldepmod5.so = $(no-as-needed)
-+LDFLAGS-reldep6mod1.so = $(no-as-needed)
-+LDFLAGS-reldep6mod4.so = $(no-as-needed)
-+LDFLAGS-reldep8mod3.so = $(no-as-needed)
-+LDFLAGS-unload4mod1.so = $(no-as-needed)
-+LDFLAGS-unload4mod2.so = $(no-as-needed)
-+LDFLAGS-tst-initorder = $(no-as-needed)
-+LDFLAGS-tst-initordera2.so = $(no-as-needed)
-+LDFLAGS-tst-initordera3.so = $(no-as-needed)
-+LDFLAGS-tst-initordera4.so = $(no-as-needed)
-+LDFLAGS-tst-initorderb2.so = $(no-as-needed)
- LDFLAGS-tst-tlsmod5.so = -nostdlib
- LDFLAGS-tst-tlsmod6.so = -nostdlib
- 
-@@ -633,7 +645,7 @@ $(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so)
- vismain-ENV = LD_PRELOAD=$(addprefix $(objpfx),vismod3.so)
- 
- $(objpfx)noload: $(objpfx)testobj1.so $(common-objpfx)dlfcn/libdl.so
--LDFLAGS-noload = -rdynamic
-+LDFLAGS-noload = -rdynamic $(no-as-needed)
- $(objpfx)noload.out: $(objpfx)testobj5.so
- 
- $(objpfx)noload-mem: $(objpfx)noload.out
-@@ -678,6 +690,7 @@ $(objpfx)reldep4: $(libdl)
- $(objpfx)reldep4.out: $(objpfx)reldep4mod1.so $(objpfx)reldep4mod2.so
- 
- $(objpfx)next: $(objpfx)nextmod1.so $(objpfx)nextmod2.so $(libdl)
-+LDFLAGS-next = $(no-as-needed)
- 
- $(objpfx)unload2: $(libdl)
- $(objpfx)unload2.out: $(objpfx)unload2mod.so $(objpfx)unload2dep.so
-@@ -1025,6 +1038,8 @@ $(objpfx)order2mod1.so: $(objpfx)order2mod4.so
- $(objpfx)order2mod4.so: $(objpfx)order2mod3.so
- $(objpfx)order2mod2.so: $(objpfx)order2mod3.so
- order2mod2.so-no-z-defs = yes
-+LDFLAGS-order2mod1.so = $(no-as-needed)
-+LDFLAGS-order2mod2.so = $(no-as-needed)
- 
- tst-stackguard1-ARGS = --command "$(built-program-cmd) --child"
- tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
-@@ -1113,6 +1128,10 @@ $(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so
- $(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so
- $(objpfx)tst-initorder2b.so: $(objpfx)tst-initorder2c.so
- $(objpfx)tst-initorder2c.so: $(objpfx)tst-initorder2d.so
-+LDFLAGS-tst-initorder2 = $(no-as-needed)
-+LDFLAGS-tst-initorder2a.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2b.so = $(no-as-needed)
-+LDFLAGS-tst-initorder2c.so = $(no-as-needed)
- define o-iterator-doit
- $(objpfx)tst-initorder2$o.os: tst-initorder2.c; \
- $$(compile-command.c) -DNAME=\"$o\"
-diff --git a/nptl/Makefile b/nptl/Makefile
-index 09acd8a..07a1022 100644
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -458,6 +458,7 @@ $(objpfx)tst-tls4: $(libdl) $(shared-thread-library)
- $(objpfx)tst-tls4.out: $(objpfx)tst-tls4moda.so $(objpfx)tst-tls4modb.so
- 
- $(objpfx)tst-tls5: $(objpfx)tst-tls5mod.so $(shared-thread-library)
-+LDFLAGS-tst-tls5 = $(no-as-needed)
- LDFLAGS-tst-tls5mod.so = -Wl,-soname,tst-tls5mod.so
- 
- ifeq ($(build-shared),yes)
-@@ -503,7 +504,7 @@ $(objpfx)tst-clock2: $(common-objpfx)rt/librt.a
- $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.a
- endif
- 
--LDFLAGS-tst-cancel24 = -lstdc++
-+LDFLAGS-tst-cancel24 = $(no-as-needed) -lstdc++
- 
- extra-B-pthread.so = -B$(common-objpfx)nptl/
- $(objpfx)libpthread.so: $(addprefix $(objpfx),$(crti-objs) $(crtn-objs))
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index 44eb20d..f7811c5 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -138,6 +138,7 @@ $(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
- 	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(common-objpfx)stdlib/
- 
- $(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so
-+LDFLAGS-tst-putenv = $(no-as-needed)
- 
- $(objpfx)tst-putenvmod.so: $(objpfx)tst-putenvmod.os
- 	$(build-module)
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.15-vdso.patch b/testing/glibc/glibc-2.15-vdso.patch
deleted file mode 100644
index 7fd394f90..000000000
--- a/testing/glibc/glibc-2.15-vdso.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/elf/Makefile b/elf/Makefile
-index 8234ba7..25ffc57 100644
---- a/elf/Makefile
-+++ b/elf/Makefile
-@@ -1203,3 +1203,14 @@ $(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
- $(objpfx)tst-relsort1mod2.so: $(libm)
- $(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \
- 			   $(objpfx)tst-relsort1mod2.so
-+
-+tests: $(objpfx)tst-unused-dep.out
-+
-+$(objpfx)tst-unused-dep.out: $(objpfx)testobj1.so
-+	LD_TRACE_LOADED_OBJECTS=1 \
-+	LD_DEBUG=unused \
-+	LD_PRELOAD= \
-+	$(elf-objpfx)${rtld-installed-name} \
-+	  --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
-+	  $< > $@
-+	cmp $@ /dev/null > /dev/null
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 2e4f97f..3e15447 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1,5 +1,5 @@
- /* Run time dynamic linker.
--   Copyright (C) 1995-2010, 2011 Free Software Foundation, Inc.
-+   Copyright (C) 1995-2012 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
-@@ -1375,6 +1375,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- 	  _dl_setup_hash (l);
- 	  l->l_relocated = 1;
- 
-+	  /* The vDSO is always used.  */
-+	  l->l_used = 1;
-+
- 	  /* Initialize l_local_scope to contain just this map.  This allows
- 	     the use of dl_lookup_symbol_x to resolve symbols within the vdso.
- 	     So we create a single entry list pointing to l_real as its only
diff --git a/testing/glibc/glibc-2.15-vfprintf-nargs.patch b/testing/glibc/glibc-2.15-vfprintf-nargs.patch
deleted file mode 100644
index f8dde53f5..000000000
--- a/testing/glibc/glibc-2.15-vfprintf-nargs.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff --git a/stdio-common/Makefile b/stdio-common/Makefile
-index a847b28..080badc 100644
---- a/stdio-common/Makefile
-+++ b/stdio-common/Makefile
-@@ -59,7 +59,8 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
- 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
- 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
- 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
--	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24
-+	 scanf16 scanf17 tst-setvbuf1 tst-grouping bug23 bug24 \
-+	 bug-vfprintf-nargs
- 
- test-srcs = tst-unbputc tst-printf
- 
-diff --git a/stdio-common/bug-vfprintf-nargs.c b/stdio-common/bug-vfprintf-nargs.c
-new file mode 100644
-index 0000000..13c66c0
---- /dev/null
-+++ b/stdio-common/bug-vfprintf-nargs.c
-@@ -0,0 +1,78 @@
-+/* Test for vfprintf nargs allocation overflow (BZ #13656).
-+   Copyright (C) 2012 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Kees Cook <keescook@chromium.org>, 2012.
-+
-+   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 <stdio.h>
-+#include <stdlib.h>
-+#include <stdint.h>
-+#include <unistd.h>
-+#include <inttypes.h>
-+#include <string.h>
-+#include <signal.h>
-+
-+static int
-+format_failed (const char *fmt, const char *expected)
-+{
-+  char output[80];
-+
-+  printf ("%s : ", fmt);
-+
-+  memset (output, 0, sizeof output);
-+  /* Having sprintf itself detect a failure is good.  */
-+  if (sprintf (output, fmt, 1, 2, 3, "test") > 0
-+      && strcmp (output, expected) != 0)
-+    {
-+      printf ("FAIL (output '%s' != expected '%s')\n", output, expected);
-+      return 1;
-+    }
-+  puts ("ok");
-+  return 0;
-+}
-+
-+static int
-+do_test (void)
-+{
-+  int rc = 0;
-+  char buf[64];
-+
-+  /* Regular positionals work.  */
-+  if (format_failed ("%1$d", "1") != 0)
-+    rc = 1;
-+
-+  /* Regular width positionals work.  */
-+  if (format_failed ("%1$*2$d", " 1") != 0)
-+    rc = 1;
-+
-+  /* Positional arguments are constructed via read_int, so nargs can only
-+     overflow on 32-bit systems.  On 64-bit systems, it will attempt to
-+     allocate a giant amount of memory and possibly crash, which is the
-+     expected situation.  Since the 64-bit behavior is arch-specific, only
-+     test this on 32-bit systems.  */
-+  if (sizeof (long int) == 4)
-+    {
-+      sprintf (buf, "%%1$d %%%" PRIdPTR "$d", UINT32_MAX / sizeof (int));
-+      if (format_failed (buf, "1 %$d") != 0)
-+        rc = 1;
-+    }
-+
-+  return rc;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
-index 863cd5d..c802e46 100644
---- a/stdio-common/vfprintf.c
-+++ b/stdio-common/vfprintf.c
-@@ -235,6 +235,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
-      0 if unknown.  */
-   int readonly_format = 0;
- 
-+  /* For the argument descriptions, which may be allocated on the heap.  */
-+  void *args_malloced = NULL;
-+
-   /* This table maps a character into a number representing a
-      class.  In each step there is a destination label for each
-      class.  */
-@@ -1647,9 +1650,10 @@ do_positional:
-        determine the size of the array needed to store the argument
-        attributes.  */
-     size_t nargs = 0;
--    int *args_type;
--    union printf_arg *args_value = NULL;
-+    size_t bytes_per_arg;
-+    union printf_arg *args_value;
-     int *args_size;
-+    int *args_type;
- 
-     /* Positional parameters refer to arguments directly.  This could
-        also determine the maximum number of arguments.  Track the
-@@ -1698,13 +1702,38 @@ do_positional:
- 
-     /* Determine the number of arguments the format string consumes.  */
-     nargs = MAX (nargs, max_ref_arg);
-+    /* Calculate total size needed to represent a single argument across
-+       all three argument-related arrays.  */
-+    bytes_per_arg = sizeof (*args_value) + sizeof (*args_size)
-+                    + sizeof (*args_type);
-+
-+    /* Check for potential integer overflow.  */
-+    if (__builtin_expect (nargs > SIZE_MAX / bytes_per_arg, 0))
-+      {
-+         __set_errno (ERANGE);
-+         done = -1;
-+         goto all_done;
-+      }
- 
--    /* Allocate memory for the argument descriptions.  */
--    args_type = alloca (nargs * sizeof (int));
-+    /* Allocate memory for all three argument arrays.  */
-+    if (__libc_use_alloca (nargs * bytes_per_arg))
-+        args_value = alloca (nargs * bytes_per_arg);
-+    else
-+      {
-+        args_value = args_malloced = malloc (nargs * bytes_per_arg);
-+        if (args_value == NULL)
-+          {
-+            done = -1;
-+            goto all_done;
-+          }
-+      }
-+
-+    /* Set up the remaining two arrays to each point past the end of the
-+       prior array, since space for all three has been allocated now.  */
-+    args_size = &args_value[nargs].pa_int;
-+    args_type = &args_size[nargs];
-     memset (args_type, s->_flags2 & _IO_FLAGS2_FORTIFY ? '\xff' : '\0',
--	    nargs * sizeof (int));
--    args_value = alloca (nargs * sizeof (union printf_arg));
--    args_size = alloca (nargs * sizeof (int));
-+	    nargs * sizeof (*args_type));
- 
-     /* XXX Could do sanity check here: If any element in ARGS_TYPE is
-        still zero after this loop, format is invalid.  For now we
-@@ -1973,8 +2002,8 @@ do_positional:
-   }
- 
- all_done:
--  if (__builtin_expect (workstart != NULL, 0))
--    free (workstart);
-+  free (args_malloced);
-+  free (workstart);
-   /* Unlock the stream.  */
-   _IO_funlockfile (s);
-   _IO_cleanup_region_end (0);
diff --git a/testing/glibc/glibc-2.16-detect-fma.patch b/testing/glibc/glibc-2.16-detect-fma.patch
deleted file mode 100644
index daffb9768..000000000
--- a/testing/glibc/glibc-2.16-detect-fma.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/init-arch.c b/sysdeps/x86_64/multiarch/init-arch.c
-index fb44dcf..fed5ab8 100644
---- a/sysdeps/x86_64/multiarch/init-arch.c
-+++ b/sysdeps/x86_64/multiarch/init-arch.c
-@@ -156,6 +156,9 @@ __init_cpu_features (void)
- 	  /* Determine if AVX is usable.  */
- 	  if (CPUID_AVX)
- 	    __cpu_features.feature[index_AVX_Usable] |= bit_AVX_Usable;
-+	  /* Determine if FMA is usable.  */
-+	  if (CPUID_FMA)
-+	    __cpu_features.feature[index_FMA_Usable] |= bit_FMA_Usable;
- 	  /* Determine if FMA4 is usable.  */
- 	  if (CPUID_FMA4)
- 	    __cpu_features.feature[index_FMA4_Usable] |= bit_FMA4_Usable;
-diff --git a/sysdeps/x86_64/multiarch/init-arch.h b/sysdeps/x86_64/multiarch/init-arch.h
-index 45e2651..f33f1c8 100644
---- a/sysdeps/x86_64/multiarch/init-arch.h
-+++ b/sysdeps/x86_64/multiarch/init-arch.h
-@@ -22,7 +22,8 @@
- #define bit_Fast_Unaligned_Load		(1 << 4)
- #define bit_Prefer_PMINUB_for_stringop	(1 << 5)
- #define bit_AVX_Usable			(1 << 6)
--#define bit_FMA4_Usable			(1 << 7)
-+#define bit_FMA_Usable			(1 << 7)
-+#define bit_FMA4_Usable			(1 << 8)
- 
- /* CPUID Feature flags.  */
- #define bit_SSE2	(1 << 26)
-@@ -56,6 +57,7 @@
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1*FEATURE_SIZE
- # define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
- # define index_AVX_Usable		FEATURE_INDEX_1*FEATURE_SIZE
-+# define index_FMA_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- # define index_FMA4_Usable		FEATURE_INDEX_1*FEATURE_SIZE
- 
- #else	/* __ASSEMBLER__ */
-@@ -131,6 +133,8 @@ extern const struct cpu_features *__get_cpu_features (void)
-   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_OSXSAVE)
- # define CPUID_AVX \
-   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_AVX)
-+# define CPUID_FMA \
-+  HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_FMA)
- # define CPUID_FMA4 \
-   HAS_CPUID_FLAG (COMMON_CPUID_INDEX_80000001, ecx, bit_FMA4)
- 
-@@ -140,7 +144,6 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define HAS_SSSE3	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSSE3)
- # define HAS_SSE4_1	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_1)
- # define HAS_SSE4_2	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_2)
--# define HAS_FMA	HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_FMA)
- 
- # define index_Fast_Rep_String		FEATURE_INDEX_1
- # define index_Fast_Copy_Backward	FEATURE_INDEX_1
-@@ -148,6 +151,7 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define index_Prefer_SSE_for_memop	FEATURE_INDEX_1
- # define index_Fast_Unaligned_Load	FEATURE_INDEX_1
- # define index_AVX_Usable		FEATURE_INDEX_1
-+# define index_FMA_Usable		FEATURE_INDEX_1
- # define index_FMA4_Usable		FEATURE_INDEX_1
- 
- # define HAS_ARCH_FEATURE(name) \
-@@ -159,6 +163,7 @@ extern const struct cpu_features *__get_cpu_features (void)
- # define HAS_PREFER_SSE_FOR_MEMOP	HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
- # define HAS_FAST_UNALIGNED_LOAD	HAS_ARCH_FEATURE (Fast_Unaligned_Load)
- # define HAS_AVX			HAS_ARCH_FEATURE (AVX_Usable)
-+# define HAS_FMA			HAS_ARCH_FEATURE (FMA_Usable)
- # define HAS_FMA4			HAS_ARCH_FEATURE (FMA4_Usable)
- 
- #endif	/* __ASSEMBLER__ */
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.16-glob-use-size_t.patch b/testing/glibc/glibc-2.16-glob-use-size_t.patch
deleted file mode 100644
index 8c5df45be..000000000
--- a/testing/glibc/glibc-2.16-glob-use-size_t.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/posix/glob.c b/posix/glob.c
-index 68ea205..87d4f1b 100644
---- a/posix/glob.c
-+++ b/posix/glob.c
-@@ -217,7 +217,7 @@ static int collated_compare (const void *, const void *) __THROW;
- static const char *
- next_brace_sub (const char *cp, int flags)
- {
--  unsigned int depth = 0;
-+  size_t depth = 0;
-   while (*cp != '\0')
-     if ((flags & GLOB_NOESCAPE) == 0 && *cp == '\\')
-       {
-@@ -960,7 +960,7 @@ glob (pattern, flags, errfunc, pglob)
- 		  && S_ISDIR (st.st_mode))
- 	       : (__stat64 (dirname, &st64) == 0 && S_ISDIR (st64.st_mode)))))
- 	{
--	  int newcount = pglob->gl_pathc + pglob->gl_offs;
-+	  size_t newcount = pglob->gl_pathc + pglob->gl_offs;
- 	  char **new_gl_pathv;
- 
- 	  if (newcount > UINTPTR_MAX - (1 + 1)
-@@ -1059,7 +1059,7 @@ glob (pattern, flags, errfunc, pglob)
- 	 appending the results to PGLOB.  */
-       for (i = 0; i < dirs.gl_pathc; ++i)
- 	{
--	  int old_pathc;
-+	  size_t old_pathc;
- 
- #ifdef	SHELL
- 	  {
-@@ -1114,7 +1114,7 @@ glob (pattern, flags, errfunc, pglob)
- 	  /* No matches.  */
- 	  if (flags & GLOB_NOCHECK)
- 	    {
--	      int newcount = pglob->gl_pathc + pglob->gl_offs;
-+	      size_t newcount = pglob->gl_pathc + pglob->gl_offs;
- 	      char **new_gl_pathv;
- 
- 	      if (newcount > UINTPTR_MAX - 2
-@@ -1158,7 +1158,7 @@ glob (pattern, flags, errfunc, pglob)
-     }
-   else
-     {
--      int old_pathc = pglob->gl_pathc;
-+      size_t old_pathc = pglob->gl_pathc;
-       int orig_flags = flags;
- 
-       if (meta & 2)
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch b/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch
deleted file mode 100644
index 822b57294..000000000
--- a/testing/glibc/glibc-2.16-rpcgen-cpp-path.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/sunrpc/rpc_main.c b/sunrpc/rpc_main.c
-index 06d951a..2103b10 100644
---- a/sunrpc/rpc_main.c
-+++ b/sunrpc/rpc_main.c
-@@ -75,12 +75,9 @@ struct commandline
- 
- static const char *cmdname;
- 
--#define SVR4_CPP "/usr/ccs/lib/cpp"
--#define SUNOS_CPP "/lib/cpp"
--
- static const char *svcclosetime = "120";
- static int cppDefined;	/* explicit path for C preprocessor */
--static const char *CPP = SUNOS_CPP;
-+static const char *CPP = "/lib/cpp";
- static const char CPPFLAGS[] = "-C";
- static char *pathbuf;
- static int cpp_pid;
-@@ -327,23 +324,17 @@ find_cpp (void)
- {
-   struct stat buf;
- 
--  if (stat (CPP, &buf) < 0)
--    {				/* /lib/cpp or explicit cpp does not exist */
--      if (cppDefined)
--	{
--	  fprintf (stderr, _ ("cannot find C preprocessor: %s \n"), CPP);
--	  crash ();
--	}
--      else
--	{			/* try the other one */
--	  CPP = SVR4_CPP;
--	  if (stat (CPP, &buf) < 0)
--	    {			/* can't find any cpp */
--	      fputs (_ ("cannot find any C preprocessor (cpp)\n"), stdout);
--	      crash ();
--	    }
--	}
-+  if (stat (CPP, &buf) == 0)
-+    return;
-+
-+  if (cppDefined) /* user specified cpp but it does not exist */
-+    {
-+      fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+      crash ();
-     }
-+
-+  /* fall back to system CPP */
-+  CPP = "cpp";
- }
- 
- /*
-@@ -374,8 +365,13 @@ open_input (const char *infile, const char *define)
-       close (1);
-       dup2 (pd[1], 1);
-       close (pd[0]);
--      execv (arglist[0], (char **) arglist);
--      perror ("execv");
-+      execvp (arglist[0], (char **) arglist);
-+      if (errno == ENOENT)
-+        {
-+          fprintf (stderr, _ ("cannot find C preprocessor: %s\n"), CPP);
-+          exit (1);
-+        }
-+      perror ("execvp");
-       exit (1);
-     case -1:
-       perror ("fork");
diff --git a/testing/glibc/glibc-2.16-strncasecmp-segfault.patch b/testing/glibc/glibc-2.16-strncasecmp-segfault.patch
deleted file mode 100644
index ce91bbe82..000000000
--- a/testing/glibc/glibc-2.16-strncasecmp-segfault.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/string/test-strncasecmp.c b/string/test-strncasecmp.c
-index 6c17530..acfe668 100644
---- a/string/test-strncasecmp.c
-+++ b/string/test-strncasecmp.c
-@@ -1,5 +1,5 @@
- /* Test and measure strncasecmp functions.
--   Copyright (C) 1999, 2002, 2003, 2005, 2010 Free Software Foundation, Inc.
-+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Written by Jakub Jelinek <jakub@redhat.com>, 1999.
- 
-@@ -251,9 +251,9 @@ do_random_tests (void)
-     }
- }
- 
--
-+/* Regression test for BZ #12205 */
- static void
--check1 (void)
-+bz12205 (void)
- {
-   static char cp [4096+16] __attribute__ ((aligned(4096)));
-   static char gotrel[4096] __attribute__ ((aligned(4096)));
-@@ -270,6 +270,15 @@ check1 (void)
-     check_result (impl, s1, s2, n, exp_result);
- }
- 
-+/* Regression test for BZ #14195 */
-+static void
-+bz14195 (void)
-+{
-+  const char *empty_string  = "";
-+  FOR_EACH_IMPL (impl, 0)
-+    check_result (impl, empty_string, "", 5, 0);
-+}
-+
- int
- test_main (void)
- {
-@@ -277,7 +286,8 @@ test_main (void)
- 
-   test_init ();
- 
--  check1 ();
-+  bz12205 ();
-+  bz14195 ();
- 
-   printf ("%23s", "");
-   FOR_EACH_IMPL (impl, 0)
-diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-index 5e6321e..9735ad0 100644
---- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-+++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
-@@ -2445,7 +2445,7 @@ L(less16bytes_sncmp):
- # endif
- 	jne	L(neq_sncmp)
- 	test	%cl, %cl
--	je	L(eq)
-+	je	L(eq_sncmp)
- 
- 	cmp	$1, REM
- 	je	L(eq_sncmp)
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.16-strtod-overflow.patch b/testing/glibc/glibc-2.16-strtod-overflow.patch
deleted file mode 100644
index 526296325..000000000
--- a/testing/glibc/glibc-2.16-strtod-overflow.patch
+++ /dev/null
@@ -1,389 +0,0 @@
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index f7811c5..79c9acb 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -68,7 +68,8 @@ tests		:= tst-strtol tst-strtod testmb testrand testsort testdiv   \
- 		   tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \
- 		   tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2	    \
- 		   tst-makecontext2 tst-strtod6 tst-unsetenv1		    \
--		   tst-makecontext3 bug-getcontext bug-fmtmsg1
-+		   tst-makecontext3 bug-getcontext bug-fmtmsg1		    \
-+		   tst-strtod-overflow
- 
- include ../Makeconfig
- 
-diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
-index 2166a08..a8a7ea8 100644
---- a/stdlib/strtod_l.c
-+++ b/stdlib/strtod_l.c
-@@ -60,6 +60,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
- #include <math.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <stdint.h>
- 
- /* The gmp headers need some configuration frobs.  */
- #define HAVE_ALLOCA 1
-@@ -72,7 +73,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **,
- #include "longlong.h"
- #include "fpioconst.h"
- 
--#define NDEBUG 1
- #include <assert.h>
- 
- 
-@@ -174,19 +174,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1];
- /* Return a floating point number of the needed type according to the given
-    multi-precision number after possible rounding.  */
- static FLOAT
--round_and_return (mp_limb_t *retval, int exponent, int negative,
-+round_and_return (mp_limb_t *retval, intmax_t exponent, int negative,
- 		  mp_limb_t round_limb, mp_size_t round_bit, int more_bits)
- {
-   if (exponent < MIN_EXP - 1)
-     {
--      mp_size_t shift = MIN_EXP - 1 - exponent;
--
--      if (shift > MANT_DIG)
-+      if (exponent < MIN_EXP - 1 - MANT_DIG)
- 	{
- 	  __set_errno (ERANGE);
- 	  return 0.0;
- 	}
- 
-+      mp_size_t shift = MIN_EXP - 1 - exponent;
-+
-       more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0;
-       if (shift == MANT_DIG)
- 	/* This is a special case to handle the very seldom case where
-@@ -233,6 +233,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-       __set_errno (ERANGE);
-     }
- 
-+  if (exponent > MAX_EXP)
-+    goto overflow;
-+
-   if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0
-       && (more_bits || (retval[0] & 1) != 0
- 	  || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0))
-@@ -258,6 +261,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-     }
- 
-   if (exponent > MAX_EXP)
-+  overflow:
-     return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
- 
-   return MPN2FLOAT (retval, exponent, negative);
-@@ -271,7 +275,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative,
-    factor for the resulting number (see code) multiply by it.  */
- static const STRING_TYPE *
- str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
--	    int *exponent
-+	    intmax_t *exponent
- #ifndef USE_WIDE_CHAR
- 	    , const char *decimal, size_t decimal_len, const char *thousands
- #endif
-@@ -301,6 +305,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
- 	      cy += __mpn_add_1 (n, n, *nsize, low);
- 	      if (cy != 0)
- 		{
-+		  assert (*nsize < MPNSIZE);
- 		  n[*nsize] = cy;
- 		  ++(*nsize);
- 		}
-@@ -335,7 +340,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
-     }
-   while (--digcnt > 0);
- 
--  if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB)
-+  if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt)
-     {
-       low *= _tens_in_limb[*exponent];
-       start = _tens_in_limb[cnt + *exponent];
-@@ -355,7 +360,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
-       cy = __mpn_mul_1 (n, n, *nsize, start);
-       cy += __mpn_add_1 (n, n, *nsize, low);
-       if (cy != 0)
--	n[(*nsize)++] = cy;
-+	{
-+	  assert (*nsize < MPNSIZE);
-+	  n[(*nsize)++] = cy;
-+	}
-     }
- 
-   return str;
-@@ -413,7 +421,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- {
-   int negative;			/* The sign of the number.  */
-   MPN_VAR (num);		/* MP representation of the number.  */
--  int exponent;			/* Exponent of the number.  */
-+  intmax_t exponent;		/* Exponent of the number.  */
- 
-   /* Numbers starting `0X' or `0x' have to be processed with base 16.  */
-   int base = 10;
-@@ -435,7 +443,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-   /* Points at the character following the integer and fractional digits.  */
-   const STRING_TYPE *expp;
-   /* Total number of digit and number of digits in integer part.  */
--  int dig_no, int_no, lead_zero;
-+  size_t dig_no, int_no, lead_zero;
-   /* Contains the last character read.  */
-   CHAR_TYPE c;
- 
-@@ -767,7 +775,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-      are all or any is really a fractional digit will be decided
-      later.  */
-   int_no = dig_no;
--  lead_zero = int_no == 0 ? -1 : 0;
-+  lead_zero = int_no == 0 ? (size_t) -1 : 0;
- 
-   /* Read the fractional digits.  A special case are the 'american
-      style' numbers like `16.' i.e. with decimal point but without
-@@ -789,12 +797,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	     (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c);
- 			       lo >= L_('a') && lo <= L_('f'); })))
- 	{
--	  if (c != L_('0') && lead_zero == -1)
-+	  if (c != L_('0') && lead_zero == (size_t) -1)
- 	    lead_zero = dig_no - int_no;
- 	  ++dig_no;
- 	  c = *++cp;
- 	}
-     }
-+  assert (dig_no <= (uintmax_t) INTMAX_MAX);
- 
-   /* Remember start of exponent (if any).  */
-   expp = cp;
-@@ -817,24 +826,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 
-       if (c >= L_('0') && c <= L_('9'))
- 	{
--	  int exp_limit;
-+	  intmax_t exp_limit;
- 
- 	  /* Get the exponent limit. */
- 	  if (base == 16)
--	    exp_limit = (exp_negative ?
--			 -MIN_EXP + MANT_DIG + 4 * int_no :
--			 MAX_EXP - 4 * int_no + 4 * lead_zero + 3);
-+	    {
-+	      if (exp_negative)
-+		{
-+		  assert (int_no <= (uintmax_t) (INTMAX_MAX
-+						 + MIN_EXP - MANT_DIG) / 4);
-+		  exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no;
-+		}
-+	      else
-+		{
-+		  if (int_no)
-+		    {
-+		      assert (lead_zero == 0
-+			      && int_no <= (uintmax_t) INTMAX_MAX / 4);
-+		      exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3;
-+		    }
-+		  else if (lead_zero == (size_t) -1)
-+		    {
-+		      /* The number is zero and this limit is
-+			 arbitrary.  */
-+		      exp_limit = MAX_EXP + 3;
-+		    }
-+		  else
-+		    {
-+		      assert (lead_zero
-+			      <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4);
-+		      exp_limit = (MAX_EXP
-+				   + 4 * (intmax_t) lead_zero
-+				   + 3);
-+		    }
-+		}
-+	    }
- 	  else
--	    exp_limit = (exp_negative ?
--			 -MIN_10_EXP + MANT_DIG + int_no :
--			 MAX_10_EXP - int_no + lead_zero + 1);
-+	    {
-+	      if (exp_negative)
-+		{
-+		  assert (int_no
-+			  <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG));
-+		  exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no;
-+		}
-+	      else
-+		{
-+		  if (int_no)
-+		    {
-+		      assert (lead_zero == 0
-+			      && int_no <= (uintmax_t) INTMAX_MAX);
-+		      exp_limit = MAX_10_EXP - (intmax_t) int_no + 1;
-+		    }
-+		  else if (lead_zero == (size_t) -1)
-+		    {
-+		      /* The number is zero and this limit is
-+			 arbitrary.  */
-+		      exp_limit = MAX_10_EXP + 1;
-+		    }
-+		  else
-+		    {
-+		      assert (lead_zero
-+			      <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1));
-+		      exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1;
-+		    }
-+		}
-+	    }
-+
-+	  if (exp_limit < 0)
-+	    exp_limit = 0;
- 
- 	  do
- 	    {
--	      exponent *= 10;
--	      exponent += c - L_('0');
--
--	      if (__builtin_expect (exponent > exp_limit, 0))
-+	      if (__builtin_expect ((exponent > exp_limit / 10
-+				     || (exponent == exp_limit / 10
-+					 && c - L_('0') > exp_limit % 10)), 0))
- 		/* The exponent is too large/small to represent a valid
- 		   number.  */
- 		{
-@@ -843,7 +908,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 		  /* We have to take care for special situation: a joker
- 		     might have written "0.0e100000" which is in fact
- 		     zero.  */
--		  if (lead_zero == -1)
-+		  if (lead_zero == (size_t) -1)
- 		    result = negative ? -0.0 : 0.0;
- 		  else
- 		    {
-@@ -862,6 +927,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 		  /* NOTREACHED */
- 		}
- 
-+	      exponent *= 10;
-+	      exponent += c - L_('0');
-+
- 	      c = *++cp;
- 	    }
- 	  while (c >= L_('0') && c <= L_('9'));
-@@ -930,7 +998,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	}
- #endif
-       startp += lead_zero + decimal_len;
--      exponent -= base == 16 ? 4 * lead_zero : lead_zero;
-+      assert (lead_zero <= (base == 16
-+			    ? (uintmax_t) INTMAX_MAX / 4
-+			    : (uintmax_t) INTMAX_MAX));
-+      assert (lead_zero <= (base == 16
-+			    ? ((uintmax_t) exponent
-+			       - (uintmax_t) INTMAX_MIN) / 4
-+			    : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN)));
-+      exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero;
-       dig_no -= lead_zero;
-     }
- 
-@@ -972,7 +1047,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
- 	}
- 
-       /* Adjust the exponent for the bits we are shifting in.  */
--      exponent += bits - 1 + (int_no - 1) * 4;
-+      assert (int_no <= (uintmax_t) (exponent < 0
-+				     ? (INTMAX_MAX - bits + 1) / 4
-+				     : (INTMAX_MAX - exponent - bits + 1) / 4));
-+      exponent += bits - 1 + ((intmax_t) int_no - 1) * 4;
- 
-       while (--dig_no > 0 && idx >= 0)
- 	{
-@@ -1024,13 +1102,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-      really integer digits or belong to the fractional part; i.e. we normalize
-      123e-2 to 1.23.  */
-   {
--    register int incr = (exponent < 0 ? MAX (-int_no, exponent)
--			 : MIN (dig_no - int_no, exponent));
-+    register intmax_t incr = (exponent < 0
-+			      ? MAX (-(intmax_t) int_no, exponent)
-+			      : MIN ((intmax_t) dig_no - (intmax_t) int_no,
-+				     exponent));
-     int_no += incr;
-     exponent -= incr;
-   }
- 
--  if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0))
-+  if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0))
-     {
-       __set_errno (ERANGE);
-       return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL;
-@@ -1215,7 +1295,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-        digits we should have enough bits for the result.  The remaining
-        decimal digits give us the information that more bits are following.
-        This can be used while rounding.  (Two added as a safety margin.)  */
--    if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2)
-+    if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2)
-       {
- 	dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2;
- 	more_bits = 1;
-@@ -1223,7 +1303,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc)
-     else
-       more_bits = 0;
- 
--    neg_exp = dig_no - int_no - exponent;
-+    neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent;
- 
-     /* Construct the denominator.  */
-     densize = 0;
-diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c
-new file mode 100644
-index 0000000..668d55b
---- /dev/null
-+++ b/stdlib/tst-strtod-overflow.c
-@@ -0,0 +1,48 @@
-+/* Test for integer/buffer overflow in strtod.
-+   Copyright (C) 2012 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
-+   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, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#define EXPONENT "e-2147483649"
-+#define SIZE 214748364
-+
-+static int
-+do_test (void)
-+{
-+  char *p = malloc (1 + SIZE + sizeof (EXPONENT));
-+  if (p == NULL)
-+    {
-+      puts ("malloc failed, cannot test for overflow");
-+      return 0;
-+    }
-+  p[0] = '1';
-+  memset (p + 1, '0', SIZE);
-+  memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT));
-+  double d = strtod (p, NULL);
-+  if (d != 0)
-+    {
-+      printf ("strtod returned wrong value: %a\n", d);
-+      return 1;
-+    }
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.16-unlock-mutex.patch b/testing/glibc/glibc-2.16-unlock-mutex.patch
deleted file mode 100644
index 0649d3642..000000000
--- a/testing/glibc/glibc-2.16-unlock-mutex.patch
+++ /dev/null
@@ -1,775 +0,0 @@
---- a/nptl/Makefile
-+++ b/nptl/Makefile
-@@ -206,7 +206,7 @@ tests = tst-typesizes \
- 	tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 tst-cond7 \
- 	tst-cond8 tst-cond9 tst-cond10 tst-cond11 tst-cond12 tst-cond13 \
- 	tst-cond14 tst-cond15 tst-cond16 tst-cond17 tst-cond18 tst-cond19 \
--	tst-cond20 tst-cond21 tst-cond22 tst-cond23 \
-+	tst-cond20 tst-cond21 tst-cond22 tst-cond23 tst-cond24 \
- 	tst-robust1 tst-robust2 tst-robust3 tst-robust4 tst-robust5 \
- 	tst-robust6 tst-robust7 tst-robust8 tst-robust9 \
- 	tst-robustpi1 tst-robustpi2 tst-robustpi3 tst-robustpi4 tst-robustpi5 \
-@@ -274,6 +275,7 @@ gen-as-const-headers = pthread-errnos.sym
- 
- LDFLAGS-pthread.so = -Wl,--enable-new-dtags,-z,nodelete,-z,initfirst
- 
-+LDFLAGS-tst-cond24 = $(no-as-needed) -lrt
- 
- include ../Makeconfig
- 
-diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-index d14d7de..6761c13 100644
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-@@ -212,8 +212,23 @@ __pthread_cond_timedwait:
- 	sete	24(%esp)
- 	je	41f
- 
--	/* Normal and PI futexes dont mix. Use normal futex functions only
--	   if the kernel does not support the PI futex functions.  */
-+	/* When a futex syscall with FUTEX_WAIT_REQUEUE_PI returns
-+	   successfully, it has already locked the mutex for us and the
-+	   pi_flag (24(%esp)) is set to denote that fact.  However, if another
-+	   thread changed the futex value before we entered the wait, the
-+	   syscall may return an EAGAIN and the mutex is not locked.  We go
-+	   ahead with a success anyway since later we look at the pi_flag to
-+	   decide if we got the mutex or not.  The sequence numbers then make
-+	   sure that only one of the threads actually wake up.  We retry using
-+	   normal FUTEX_WAIT only if the kernel returned ENOSYS, since normal
-+	   and PI futexes don't mix.
-+
-+	   Note that we don't check for EAGAIN specifically; we assume that the
-+	   only other error the futex function could return is EAGAIN (barring
-+	   the ETIMEOUT of course, for the timeout case in futex) since
-+	   anything else would mean an error in our function.  It is too
-+	   expensive to do that check for every call (which is  quite common in
-+	   case of a large number of threads), so it has been skipped.  */
- 	cmpl	$-ENOSYS, %eax
- 	jne	41f
- 	xorl	%ecx, %ecx
-@@ -273,9 +288,24 @@ __pthread_cond_timedwait:
- 	jne	9f
- 
- 15:	cmpl	$-ETIMEDOUT, %esi
--	jne	8b
-+	je	28f
-+
-+	/* We need to go back to futex_wait.  If we're using requeue_pi, then
-+	   release the mutex we had acquired and go back.  */
-+	movl	24(%esp), %edx
-+	test	%edx, %edx
-+	jz	8b
-+
-+	/* Adjust the mutex values first and then unlock it.  The unlock
-+	   should always succeed or else the kernel did not lock the mutex
-+	   correctly.  */
-+	movl	dep_mutex(%ebx), %eax
-+	call	__pthread_mutex_cond_lock_adjust
-+	xorl	%edx, %edx
-+	call	__pthread_mutex_unlock_usercnt
-+	jmp	8b
- 
--	addl	$1, wakeup_seq(%ebx)
-+28:	addl	$1, wakeup_seq(%ebx)
- 	adcl	$0, wakeup_seq+4(%ebx)
- 	addl	$1, cond_futex(%ebx)
- 	movl	$ETIMEDOUT, %esi
-diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-index 366de69..0af06ac 100644
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-@@ -136,7 +136,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
-@@ -152,11 +151,22 @@ __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.  */
-+	/* When a futex syscall with FUTEX_WAIT_REQUEUE_PI returns
-+	   successfully, it has already locked the mutex for us and the
-+	   pi_flag (16(%esp)) is set to denote that fact.  However, if another
-+	   thread changed the futex value before we entered the wait, the
-+	   syscall may return an EAGAIN and the mutex is not locked.  We go
-+	   ahead with a success anyway since later we look at the pi_flag to
-+	   decide if we got the mutex or not.  The sequence numbers then make
-+	   sure that only one of the threads actually wake up.  We retry using
-+	   normal FUTEX_WAIT only if the kernel returned ENOSYS, since normal
-+	   and PI futexes don't mix.
-+
-+	   Note that we don't check for EAGAIN specifically; we assume that the
-+	   only other error the futex function could return is EAGAIN since
-+	   anything else would mean an error in our function.  It is too
-+	   expensive to do that check for every call (which is 	quite common in
-+	   case of a large number of threads), so it has been skipped.  */
- 	cmpl	$-ENOSYS, %eax
- 	jne	19f
- 	xorl	%ecx, %ecx
-@@ -206,12 +216,12 @@ __pthread_cond_wait:
- 	cmpl	8(%esp), %edx
- 	jne	7f
- 	cmpl	4(%esp), %edi
--	je	8b
-+	je	22f
- 
- 7:	cmpl	%ecx, %edx
- 	jne	9f
- 	cmp	%eax, %edi
--	je	8b
-+	je	22f
- 
- 9:	addl	$1, woken_seq(%ebx)
- 	adcl	$0, woken_seq+4(%ebx)
-@@ -287,6 +297,22 @@ __pthread_cond_wait:
- 	jmp	20b
- 
- 	cfi_adjust_cfa_offset(-FRAME_SIZE);
-+
-+	/* We need to go back to futex_wait.  If we're using requeue_pi, then
-+	   release the mutex we had acquired and go back.  */
-+22:	movl	16(%esp), %edx
-+	test	%edx, %edx
-+	jz	8b
-+
-+	/* Adjust the mutex values first and then unlock it.  The unlock
-+	   should always succeed or else the kernel did not lock the mutex
-+	   correctly.  */
-+	movl	dep_mutex(%ebx), %eax
-+	call    __pthread_mutex_cond_lock_adjust
-+	xorl	%edx, %edx
-+	call	__pthread_mutex_unlock_usercnt
-+	jmp	8b
-+
- 	/* Initial locking failed.  */
- 1:
- #if cond_lock == 0
-@@ -400,77 +426,6 @@ __pthread_cond_wait:
- 	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)
-@@ -651,10 +606,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
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-index a1c8ca8..b669abb 100644
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-@@ -103,7 +103,7 @@ __pthread_cond_timedwait:
- 	mov	%RSI_LP, dep_mutex(%rdi)
- 
- 22:
--	xorl	%r15d, %r15d
-+	xorb	%r15b, %r15b
- 
- #ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- #  ifdef PIC
-@@ -190,18 +190,39 @@ __pthread_cond_timedwait:
- 	movl	$SYS_futex, %eax
- 	syscall
- 
--	movl	$1, %r15d
-+	cmpl	$0, %eax
-+	sete	%r15b
-+
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
--	cmpq	$-4095, %rax
--	jnae	62f
-+	je	62f
-+
-+	/* When a futex syscall with FUTEX_WAIT_REQUEUE_PI returns
-+	   successfully, it has already locked the mutex for us and the
-+	   pi_flag (%r15b) is set to denote that fact.  However, if another
-+	   thread changed the futex value before we entered the wait, the
-+	   syscall may return an EAGAIN and the mutex is not locked.  We go
-+	   ahead with a success anyway since later we look at the pi_flag to
-+	   decide if we got the mutex or not.  The sequence numbers then make
-+	   sure that only one of the threads actually wake up.  We retry using
-+	   normal FUTEX_WAIT only if the kernel returned ENOSYS, since normal
-+	   and PI futexes don't mix.
-+
-+	   Note that we don't check for EAGAIN specifically; we assume that the
-+	   only other error the futex function could return is EAGAIN (barring
-+	   the ETIMEOUT of course, for the timeout case in futex) since
-+	   anything else would mean an error in our function.  It is too
-+	   expensive to do that check for every call (which is  quite common in
-+	   case of a large number of threads), so it has been skipped.  */
-+	cmpl    $-ENOSYS, %eax
-+	jne     62f
- 
- 	subq	$cond_futex, %rdi
- #endif
- 
- 61:	movl	$(FUTEX_WAIT_BITSET|FUTEX_PRIVATE_FLAG), %esi
--60:	xorl	%r15d, %r15d
-+60:	xorb	%r15b, %r15b
- 	xorl	%eax, %eax
- 	/* The following only works like this because we only support
- 	   two clocks, represented using a single bit.  */
-@@ -248,7 +269,23 @@ __pthread_cond_timedwait:
- 	ja	39f
- 
- 45:	cmpq	$-ETIMEDOUT, %r14
--	jne	38b
-+	je	99f
-+
-+	/* We need to go back to futex_wait.  If we're using requeue_pi, then
-+	   release the mutex we had acquired and go back.  */
-+	test	%r15b, %r15b
-+	jz	38b
-+
-+	/* Adjust the mutex values first and then unlock it.  The unlock
-+	   should always succeed or else the kernel did not lock the
-+	   mutex correctly.  */
-+	movq	%r8, %rdi
-+	callq	__pthread_mutex_cond_lock_adjust
-+	xorl	%esi, %esi
-+	callq	__pthread_mutex_unlock_usercnt
-+	/* Reload cond_var.  */
-+	movq	8(%rsp), %rdi
-+	jmp	38b
- 
- 99:	incq	wakeup_seq(%rdi)
- 	incl	cond_futex(%rdi)
-@@ -298,7 +335,7 @@ __pthread_cond_timedwait:
- 	/* If requeue_pi is used the kernel performs the locking of the
- 	   mutex. */
- 41:	movq	16(%rsp), %rdi
--	testl	%r15d, %r15d
-+	testb	%r15b, %r15b
- 	jnz	64f
- 
- 	callq	__pthread_mutex_cond_lock
-diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-index 6194852..ec403cd 100644
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-@@ -136,19 +136,36 @@ __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
-+	cmpl	$0, %eax
-+	sete	%r8b
-+
- #ifdef __ASSUME_REQUEUE_PI
- 	jmp	62f
- #else
--	cmpq	$-4095, %rax
--	jnae	62f
-+	je	62f
-+
-+	/* When a futex syscall with FUTEX_WAIT_REQUEUE_PI returns
-+	   successfully, it has already locked the mutex for us and the
-+	   pi_flag (%r8b) is set to denote that fact.  However, if another
-+	   thread changed the futex value before we entered the wait, the
-+	   syscall may return an EAGAIN and the mutex is not locked.  We go
-+	   ahead with a success anyway since later we look at the pi_flag to
-+	   decide if we got the mutex or not.  The sequence numbers then make
-+	   sure that only one of the threads actually wake up.  We retry using
-+	   normal FUTEX_WAIT only if the kernel returned ENOSYS, since normal
-+	   and PI futexes don't mix.
-+
-+	   Note that we don't check for EAGAIN specifically; we assume that the
-+	   only other error the futex function could return is EAGAIN since
-+	   anything else would mean an error in our function.  It is too
-+	   expensive to do that check for every call (which is 	quite common in
-+	   case of a large number of threads), so it has been skipped.  */
-+	cmpl	$-ENOSYS, %eax
-+	jne	62f
- 
- # ifndef __ASSUME_PRIVATE_FUTEX
- 	movl	$FUTEX_WAIT, %esi
-@@ -161,7 +178,7 @@ __pthread_cond_wait:
- #else
- 	orl	%fs:PRIVATE_FUTEX, %esi
- #endif
--60:	xorl	%r8d, %r8d
-+60:	xorb	%r8b, %r8b
- 	movl	$SYS_futex, %eax
- 	syscall
- 
-@@ -191,10 +208,10 @@ __pthread_cond_wait:
- 	jne	16f
- 
- 	cmpq	24(%rsp), %r9
--	jbe	8b
-+	jbe	19f
- 
- 	cmpq	%rax, %r9
--	jna	8b
-+	jna	19f
- 
- 	incq	woken_seq(%rdi)
- 
-@@ -236,7 +253,7 @@ __pthread_cond_wait:
- 	/* If requeue_pi is used the kernel performs the locking of the
- 	   mutex. */
- 11:	movq	16(%rsp), %rdi
--	testl	%r8d, %r8d
-+	testb	%r8b, %r8b
- 	jnz	18f
- 
- 	callq	__pthread_mutex_cond_lock
-@@ -253,6 +270,23 @@ __pthread_cond_wait:
- 	xorl	%eax, %eax
- 	jmp	14b
- 
-+	/* We need to go back to futex_wait.  If we're using requeue_pi, then
-+	   release the mutex we had acquired and go back.  */
-+19:	testb	%r8b, %r8b
-+	jz	8b
-+
-+	/* Adjust the mutex values first and then unlock it.  The unlock
-+	   should always succeed or else the kernel did not lock the mutex
-+	   correctly.  */
-+	movq	16(%rsp), %rdi
-+	callq	__pthread_mutex_cond_lock_adjust
-+	movq	%rdi, %r8
-+	xorl	%esi, %esi
-+	callq	__pthread_mutex_unlock_usercnt
-+	/* Reload cond_var.  */
-+	movq	8(%rsp), %rdi
-+	jmp	8b
-+
- 	/* Initial locking failed.  */
- 1:
- #if cond_lock != 0
-@@ -331,69 +365,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
--	LP_OP(cmp) $-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
--	LP_OP(cmp) $-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
--	mov	dep_mutex(%rdi), %R8_LP
--	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,10 +518,6 @@ __condvar_cleanup1:
- 	.uleb128 .LcleanupEND-.LcleanupSTART
- 	.uleb128 __condvar_cleanup1-.LSTARTCODE
- 	.uleb128 0
--	.uleb128 .LcleanupSTART2-.LSTARTCODE
--	.uleb128 .LcleanupEND2-.LcleanupSTART2
--	.uleb128 __condvar_cleanup1-.LSTARTCODE
--	.uleb128 0
- 	.uleb128 .LcallUR-.LSTARTCODE
- 	.uleb128 .LENDCODE-.LcallUR
- 	.uleb128 0
-diff --git a/nptl/tst-cond24.c b/nptl/tst-cond24.c
-new file mode 100644
-index 0000000..2eb2df1
---- /dev/null
-+++ b/nptl/tst-cond24.c
-@@ -0,0 +1,249 @@
-+/* Verify that condition variables synchronized by PI mutexes don't hang.
-+   Copyright (C) 2012 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
-+   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, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <pthread.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <sys/syscall.h>
-+#include <unistd.h>
-+#include <sys/time.h>
-+#include <time.h>
-+
-+#define THREADS_NUM 5
-+#define MAXITER 50000
-+
-+static pthread_mutex_t mutex;
-+static pthread_mutexattr_t mutex_attr;
-+static pthread_cond_t cond;
-+static pthread_t threads[THREADS_NUM];
-+static int pending = 0;
-+
-+typedef void * (*threadfunc) (void *);
-+
-+void *
-+thread_fun_timed (void *arg)
-+{
-+  int *ret = arg;
-+  int rv, i;
-+
-+  printf ("Started thread_fun_timed[%d]\n", *ret);
-+
-+  for (i = 0; i < MAXITER / THREADS_NUM; i++)
-+    {
-+      rv = pthread_mutex_lock (&mutex);
-+      if (rv)
-+        {
-+	  printf ("pthread_mutex_lock: %s(%d)\n", strerror (rv), rv);
-+	  *ret = 1;
-+	  goto out;
-+	}
-+
-+      while (!pending)
-+	{
-+	  struct timespec ts;
-+	  clock_gettime(CLOCK_REALTIME, &ts);
-+	  ts.tv_sec += 20;
-+	  rv = pthread_cond_timedwait (&cond, &mutex, &ts);
-+
-+	  /* There should be no timeout either.  */
-+	  if (rv)
-+            {
-+	      printf ("pthread_cond_wait: %s(%d)\n", strerror (rv), rv);
-+	      *ret = 1;
-+	      goto out;
-+	    }
-+	}
-+
-+      pending--;
-+
-+      rv = pthread_mutex_unlock (&mutex);
-+      if (rv)
-+        {
-+	  printf ("pthread_mutex_unlock: %s(%d)\n", strerror (rv), rv);
-+	  *ret = 1;
-+	  goto out;
-+	}
-+    }
-+
-+  *ret = 0;
-+
-+out:
-+  return ret;
-+}
-+
-+void *
-+thread_fun (void *arg)
-+{
-+  int *ret = arg;
-+  int rv, i;
-+
-+  printf ("Started thread_fun[%d]\n", *ret);
-+
-+  for (i = 0; i < MAXITER / THREADS_NUM; i++)
-+    {
-+      rv = pthread_mutex_lock (&mutex);
-+      if (rv)
-+        {
-+	  printf ("pthread_mutex_lock: %s(%d)\n", strerror (rv), rv);
-+	  *ret = 1;
-+	  goto out;
-+	}
-+
-+      while (!pending)
-+	{
-+	  rv = pthread_cond_wait (&cond, &mutex);
-+
-+	  if (rv)
-+            {
-+	      printf ("pthread_cond_wait: %s(%d)\n", strerror (rv), rv);
-+	      *ret = 1;
-+	      goto out;
-+	    }
-+	}
-+
-+      pending--;
-+
-+      rv = pthread_mutex_unlock (&mutex);
-+      if (rv)
-+        {
-+	  printf ("pthread_mutex_unlock: %s(%d)\n", strerror (rv), rv);
-+	  *ret = 1;
-+	  goto out;
-+	}
-+    }
-+
-+  *ret = 0;
-+
-+out:
-+  return ret;
-+}
-+
-+static int
-+do_test_wait (threadfunc f)
-+{
-+  int i;
-+  int rv;
-+  int counter = 0;
-+  int retval[THREADS_NUM];
-+
-+  puts ("Starting test");
-+
-+  rv = pthread_mutexattr_init (&mutex_attr);
-+  if (rv)
-+    {
-+      printf ("pthread_mutexattr_init: %s(%d)\n", strerror (rv), rv);
-+      return 1;
-+    }
-+
-+  rv = pthread_mutexattr_setprotocol (&mutex_attr, PTHREAD_PRIO_INHERIT);
-+  if (rv)
-+    {
-+      printf ("pthread_mutexattr_setprotocol: %s(%d)\n", strerror (rv), rv);
-+      return 1;
-+    }
-+
-+  rv = pthread_mutex_init (&mutex, &mutex_attr);
-+  if (rv)
-+    {
-+      printf ("pthread_mutex_init: %s(%d)\n", strerror (rv), rv);
-+      return 1;
-+    }
-+
-+  rv = pthread_cond_init (&cond, NULL);
-+  if (rv)
-+    {
-+      printf ("pthread_cond_init: %s(%d)\n", strerror (rv), rv);
-+      return 1;
-+    }
-+
-+  for (i = 0; i < THREADS_NUM; i++)
-+    {
-+      retval[i] = i;
-+      rv = pthread_create (&threads[i], NULL, f, &retval[i]);
-+      if (rv)
-+        {
-+          printf ("pthread_create: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+    }
-+
-+  for (; counter < MAXITER; counter++)
-+    {
-+      rv = pthread_mutex_lock (&mutex);
-+      if (rv)
-+        {
-+          printf ("pthread_mutex_lock: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+
-+      if (!(counter % 100))
-+	printf ("counter: %d\n", counter);
-+      pending += 1;
-+
-+      rv = pthread_cond_signal (&cond);
-+      if (rv)
-+        {
-+          printf ("pthread_cond_signal: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+
-+      rv = pthread_mutex_unlock (&mutex);
-+      if (rv)
-+        {
-+          printf ("pthread_mutex_unlock: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+    }
-+
-+  for (i = 0; i < THREADS_NUM; i++)
-+    {
-+      void *ret;
-+      rv = pthread_join (threads[i], &ret);
-+      if (rv)
-+        {
-+          printf ("pthread_join: %s(%d)\n", strerror (rv), rv);
-+          return 1;
-+        }
-+      if (ret && *(int *)ret)
-+        {
-+	  printf ("Thread %d returned with an error\n", i);
-+	  return 1;
-+	}
-+    }
-+
-+  return 0;
-+}
-+
-+static int
-+do_test (void)
-+{
-+  puts ("Testing pthread_cond_wait");
-+  int ret = do_test_wait (thread_fun);
-+  if (ret)
-+    return ret;
-+
-+  puts ("Testing pthread_cond_timedwait");
-+  return do_test_wait (thread_fun_timed);
-+}
-+
-+#define TIMEOUT 10
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
--- 
-1.7.3.4
-
diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch
deleted file mode 100644
index 16f84c536..000000000
--- a/testing/glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/nptl/sysdeps/pthread/pt-initfini.c b/nptl/sysdeps/pthread/pt-initfini.c
-index 9c00dc0..f5d4df8 100644
---- a/nptl/sysdeps/pthread/pt-initfini.c
-+++ b/nptl/sysdeps/pthread/pt-initfini.c
-@@ -45,6 +45,11 @@
- /* Embed an #include to pull in the alignment and .end directives. */
- asm ("\n#include \"defs.h\"");
-
-+asm ("\n#if defined __i686 && defined __ASSEMBLER__");
-+asm ("\n#undef __i686");
-+asm ("\n#define __i686 __i686");
-+asm ("\n#endif");
-+
- /* The initial common code ends here. */
- asm ("\n/*@HEADER_ENDS*/");
-
-diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
-index 64ef400..726b1df 100644
---- a/sysdeps/unix/sysv/linux/i386/sysdep.h
-+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
-@@ -29,6 +29,10 @@
- #include <dl-sysdep.h>
- #include <tls.h>
-
-+#if defined __i686 && defined __ASSEMBLER__
-+#undef __i686
-+#define __i686 __i686
-+#endif
-
- /* For Linux we can use the system call table in the header file
-        /usr/include/asm/unistd.h
diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install
deleted file mode 100644
index 4486a3b2d..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() {
-  ldconfig -r .
-  [[ ! -e sys/fs/cgroup/systemd && -x sbin/init ]] && init u
-  locale-gen
-  
-  [[ -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/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/glibc/nscd.rcd b/testing/glibc/nscd.rcd
deleted file mode 100755
index 4b48ab002..000000000
--- a/testing/glibc/nscd.rcd
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-daemon_name="nscd"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-get_pid() {
-	pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-	start)
-		stat_busy "Starting $daemon_name daemon"
-		PID=$(get_pid)
-		if [[ -z $PID ]]; then
-			rm -f /run/$daemon_name.pid
-			mkdir -p /run/nscd /var/db/nscd
-			rm -f /run/nscd/* /var/db/nscd/*
-			$daemon_name
-			if (( $? > 0 )); then
-				stat_fail
-				exit 1
-			else
-				echo $(get_pid) > /var/run/$daemon_name.pid
-				add_daemon $daemon_name
-				stat_done
-			fi
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-
-	stop)
-		stat_busy "Stopping $daemon_name daemon"
-		PID=$(get_pid)
-		[[ -n $PID ]] && nscd --shutdown &> /dev/null
-		if (( $? > 0 )); then
-			stat_fail
-			exit 1
-		else
-			rm -f /run/$daemon_name.pid &> /dev/null
-			rm_daemon $daemon_name
-			stat_done
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 3
-		$0 start
-		;;
-
-	status)
-		stat_busy "Checking $daemon_name status";
-		ck_status $daemon_name
-		;;
-
-	*)
-		echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/testing/glibc/nscd.service b/testing/glibc/nscd.service
deleted file mode 100644
index bc80a0730..000000000
--- a/testing/glibc/nscd.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Name Service Cache Daemon
-After=syslog.target
- 
-[Service]
-Type=forking
-ExecStart=/usr/sbin/nscd
-ExecStop=/usr/sbin/nscd --shutdown
-ExecReload=/usr/sbin/nscd -i passwd
-ExecReload=/usr/sbin/nscd -i group
-ExecReload=/usr/sbin/nscd -i hosts
-ExecReload=/usr/sbin/nscd -i services
-Restart=always
-PIDFile=/run/nscd/nscd.pid
- 
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/glibc/nscd.tmpfiles b/testing/glibc/nscd.tmpfiles
deleted file mode 100644
index 8a24a785e..000000000
--- a/testing/glibc/nscd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/nscd 0755 root root
diff --git a/testing/glibmm/PKGBUILD b/testing/glibmm/PKGBUILD
deleted file mode 100644
index 53b80d6b3..000000000
--- a/testing/glibmm/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169462 2012-10-21 15:00:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgbase=glibmm
-pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.34.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-options=('!libtool')
-url="http://www.gtkmm.org/"
-sha256sums=('ae5b8221fdace1771d2ae401b52afdca8b64ee12bd0f956fb4e92d482ddc1cbf')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package_glibmm() {
-  pkgdesc="Glib-- (glibmm) is a C++ interface for glib"
-  depends=('glib2' 'libsigc++2.0')
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-  make DESTDIR="$pkgdir" install
-}
-
-package_glibmm-docs() {
-  pkgdesc="Developer documentation for glibmm"
-  cd "$pkgbase-$pkgver/docs"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/glu/PKGBUILD b/testing/glu/PKGBUILD
deleted file mode 100644
index 0e1e04a8c..000000000
--- a/testing/glu/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168200 2012-10-06 20:05:28Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Laurent Carlier <lordheavym@gmail.com>
-
-pkgname=glu
-pkgver=9.0.0
-pkgrel=1
-pkgdesc="Mesa OpenGL Utility library"
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/mesa/glu/"
-license=('LGPL')
-depends=('libgl')
-makedepends=('mesa')
-options=('!libtool')
-source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules b/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
deleted file mode 100644
index d7d9650dc..000000000
--- a/testing/gnome-bluetooth/61-gnome-bluetooth-rfkill.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Get access to /dev/rfkill for users
-# See https://bugzilla.redhat.com/show_bug.cgi?id=514798
-#
-# Simplified by Kay Sievers
-# https://bugzilla.redhat.com/show_bug.cgi?id=733326
-
-KERNEL=="rfkill", SUBSYSTEM=="misc", TAG+="uaccess"
diff --git a/testing/gnome-bluetooth/PKGBUILD b/testing/gnome-bluetooth/PKGBUILD
deleted file mode 100644
index 5191ec4e8..000000000
--- a/testing/gnome-bluetooth/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169238 2012-10-18 19:27:33Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-bluetooth
-pkgver=3.6.0
-pkgrel=2
-pkgdesc="The GNOME Bluetooth Subsystem"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeBluetooth"
-license=('GPL' 'LGPL')
-depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify')
-makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
-install=gnome-bluetooth.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        61-gnome-bluetooth-rfkill.rules)
-sha256sums=('021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306'
-            '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-desktop-update \
-    --disable-icon-update \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 -D ../61-gnome-bluetooth-rfkill.rules \
-      "$pkgdir/usr/lib/udev/rules.d//61-gnome-bluetooth-rfkill.rules"
-}
diff --git a/testing/gnome-bluetooth/gnome-bluetooth.install b/testing/gnome-bluetooth/gnome-bluetooth.install
deleted file mode 100644
index 8c991877f..000000000
--- a/testing/gnome-bluetooth/gnome-bluetooth.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gnome-color-manager/PKGBUILD b/testing/gnome-color-manager/PKGBUILD
deleted file mode 100644
index 937b0f330..000000000
--- a/testing/gnome-color-manager/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169237 2012-10-18 19:27:30Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-color-manager
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Color profile manager for the GNOME desktop"
-arch=(i686 x86_64)
-url="http://projects.gnome.org/gnome-color-manager/"
-license=(GPL2)
-depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk'
-         'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk')
-makedepends=('intltool' 'yelp-tools')
-install=gnome-color-manager.install
-options=('!libtool' '!emptydirs')
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9')
-
-build(){
-  cd $pkgname-$pkgver
-
-  # man pages need docbook-sgml, which we don't have
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-color-manager/gnome-color-manager.install b/testing/gnome-color-manager/gnome-color-manager.install
deleted file mode 100644
index 04fda0ddc..000000000
--- a/testing/gnome-color-manager/gnome-color-manager.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall gnome-color-manager
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-contacts/PKGBUILD b/testing/gnome-contacts/PKGBUILD
deleted file mode 100644
index 096682447..000000000
--- a/testing/gnome-contacts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169235 2012-10-18 19:27:23Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-contacts
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Contacts Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese')
-makedepends=('intltool' 'vala')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2cc93827511cd28cc854ce4c36924a437350f7d61b6b0b4140a32833be683f95')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --libexecdir=/usr/lib/gnome-contacts
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-contacts/gnome-contacts.install b/testing/gnome-contacts/gnome-contacts.install
deleted file mode 100644
index c19349f72..000000000
--- a/testing/gnome-contacts/gnome-contacts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-control-center/PKGBUILD b/testing/gnome-control-center/PKGBUILD
deleted file mode 100644
index 1c8bf72c9..000000000
--- a/testing/gnome-control-center/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 169513 2012-10-22 21:13:34Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-control-center
-pkgver=3.6.2
-pkgrel=1
-pkgdesc="The Control Center for GNOME"
-arch=('i686' 'x86_64')
-depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus'
-         'gnome-online-accounts' 'gnome-settings-daemon' 'gsettings-desktop-schemas' 'gtk3'
-         'libgtop' 'libsocialweb' 'network-manager-applet' 'sound-theme-freedesktop' 'upower' 'libpwquality' 'libsystemd')
-optdepends=('mesa-demos: provides glxinfo for graphics information'
-            'gnome-color-manager: for color management tasks')
-makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-control-center.install
-license=('GPL')
-options=('!libtool' '!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3ab5aa304b424006c9f38ce2ff50afbf38e167ca632c64509bf30aa3c786afb7')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-systemd --with-libsocialweb \
-      --disable-update-mimedb \
-      --without-cheese
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656229
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-control-center/gnome-control-center.install b/testing/gnome-control-center/gnome-control-center.install
deleted file mode 100644
index 079e0fa34..000000000
--- a/testing/gnome-control-center/gnome-control-center.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/gnome-desktop/PKGBUILD b/testing/gnome-desktop/PKGBUILD
deleted file mode 100644
index 1bb318788..000000000
--- a/testing/gnome-desktop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169233 2012-10-18 19:27:16Z jgc $
-# Maintainer:  Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-desktop
-pkgver=3.6.1
-pkgrel=1
-epoch=1
-pkgdesc="Library with common API for various GNOME modules"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config')
-makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1c4954d143d696263888ea2061b2854f8c4094d33dfe51a39fb41f0a8051a174')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-desktop \
-      --with-gnome-distributor="Arch Linux"
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-dictionary/PKGBUILD b/testing/gnome-dictionary/PKGBUILD
deleted file mode 100644
index 1e81d2ca6..000000000
--- a/testing/gnome-dictionary/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169232 2012-10-18 19:27:12Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=gnome-dictionary
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Look up words in dictionary sources"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3')
-makedepends=('intltool' 'itstool' 'docbook-xsl')
-install=$pkgname.install
-options=(!libtool)
-groups=('gnome-extra')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-dictionary/gnome-dictionary.install b/testing/gnome-dictionary/gnome-dictionary.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/testing/gnome-dictionary/gnome-dictionary.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-disk-utility/PKGBUILD b/testing/gnome-disk-utility/PKGBUILD
deleted file mode 100644
index d8d3b1868..000000000
--- a/testing/gnome-disk-utility/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169231 2012-10-18 19:27:09Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Silvio Knizek (killermoehre)
-
-pkgname=gnome-disk-utility
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Disk Management Utility for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils')
-makedepends=('intltool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
-install=gnome-disk-utility.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-disk-utility/gnome-disk-utility.install b/testing/gnome-disk-utility/gnome-disk-utility.install
deleted file mode 100644
index 8b17fa3d4..000000000
--- a/testing/gnome-disk-utility/gnome-disk-utility.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-documents/PKGBUILD b/testing/gnome-documents/PKGBUILD
deleted file mode 100644
index 18a05b7e7..000000000
--- a/testing/gnome-documents/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169605 2012-10-24 09:10:49Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-documents
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Documents Manager for GNOME"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-groups=('gnome-extra')
-depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata'
-         'tracker' 'libzapojit')
-makedepends=('intltool')
-optdepends=('unoconv: Support for Libreoffice document types')
-options=('!libtool')
-install=gnome-documents.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('16a241db8abcac69c80e4c1a4f3319fbc0c1a99fb5f707eca45368043cc809ac')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/gnome-documents
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-documents/gnome-documents.install b/testing/gnome-documents/gnome-documents.install
deleted file mode 100644
index 1571179ca..000000000
--- a/testing/gnome-documents/gnome-documents.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-font-viewer/PKGBUILD b/testing/gnome-font-viewer/PKGBUILD
deleted file mode 100644
index 6eef0419d..000000000
--- a/testing/gnome-font-viewer/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#  $Id: PKGBUILD 169229 2012-10-18 19:27:00Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-font-viewer
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME font viewer and thumbnailer"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'desktop-file-utils' 'gnome-desktop')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-font-viewer.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('3625c9f70ef227cd6cdaa1fea4990d87ba12ba3681e105cf5db731edec208e74')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-font-viewer/gnome-font-viewer.install b/testing/gnome-font-viewer/gnome-font-viewer.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/gnome-font-viewer/gnome-font-viewer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-games/PKGBUILD b/testing/gnome-games/PKGBUILD
deleted file mode 100644
index b235215d0..000000000
--- a/testing/gnome-games/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169228 2012-10-18 19:26:55Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-games
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Some Games for GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('desktop-file-utils' 'glu' 'libcanberra' 'clutter-gtk' 'hicolor-icon-theme' 'librsvg' 'python2-gobject' 'dconf')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'vala')
-options=('!emptydirs' '!libtool')
-install=gnome-games.install
-url="http://www.gnome.org"
-groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static --disable-schemas-compile \
-      --with-scores-user=root --with-scores-group=games \
-      --enable-introspection=yes
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Remove all scores, we generate them from postinstall
-  rm -rf "$pkgdir/var"
-
-  sed -i 's_#! /usr/bin/env python_#!/usr/bin/env python2_' "$pkgdir/usr/bin/gnome-sudoku"
-}
diff --git a/testing/gnome-games/gnome-games.install b/testing/gnome-games/gnome-games.install
deleted file mode 100644
index 2fad5db0b..000000000
--- a/testing/gnome-games/gnome-games.install
+++ /dev/null
@@ -1,122 +0,0 @@
-_scores=(glines.Small.scores
-	glines.Medium.scores
-	glines.Large.scores
-	gnibbles.4.0.scores
-	gnibbles.3.0.scores
-	gnibbles.2.0.scores
-	gnibbles.1.0.scores
-	gnibbles.4.1.scores
-	gnibbles.3.1.scores
-	gnibbles.2.1.scores
-	gnibbles.1.1.scores
-	gnobots2.robots2.scores
-	gnobots2.robots2-safe.scores
-	gnobots2.robots2-super-safe.scores
-	gnobots2.robots2_easy.scores
-	gnobots2.robots2_easy-safe.scores
-	gnobots2.robots2_easy-super-safe.scores
-	gnobots2.classic_robots.scores
-	gnobots2.classic_robots-safe.scores
-	gnobots2.classic_robots-super-safe.scores
-	gnobots2.robots_with_safe_teleport.scores
-	gnobots2.robots_with_safe_teleport-safe.scores
-	gnobots2.robots_with_safe_teleport-super-safe.scores
-	gnobots2.nightmare.scores
-	gnobots2.nightmare-safe.scores
-	gnobots2.nightmare-super-safe.scores
-	gnomine.Small.scores
-	gnomine.Medium.scores
-	gnomine.Large.scores
-	gnomine.Custom.scores
-	gnotravex.2x2.scores
-	gnotravex.3x3.scores
-	gnotravex.4x4.scores
-	gnotravex.5x5.scores
-	gnotravex.6x6.scores
-	gnotski.1.scores
-	gnotski.2.scores
-	gnotski.3.scores
-	gnotski.4.scores
-	gnotski.5.scores
-	gnotski.6.scores
-	gnotski.7.scores
-	gnotski.8.scores
-	gnotski.9.scores
-	gnotski.10.scores
-	gnotski.11.scores
-	gnotski.12.scores
-	gnotski.13.scores
-	gnotski.14.scores
-	gnotski.15.scores
-	gnotski.16.scores
-	gnotski.17.scores
-	gnotski.18.scores
-	gnotski.19.scores
-	gnotski.20.scores
-	gnotski.21.scores
-	gnotski.22.scores
-	gnotski.23.scores
-	gnotski.24.scores
-	gnotski.25.scores
-	gnotski.26.scores
-	gnotski.27.scores
-	gnotski.28.scores
-	gnotski.29.scores
-	gnotski.30.scores
-	gnotski.31.scores
-	gnotski.32.scores
-	gnotski.33.scores
-	gnotski.34.scores
-	gnotski.35.scores
-	gnotski.36.scores
-	gnotski.37.scores
-	gtali.Regular.scores
-	gtali.Colors.scores
-	gnome-mahjongg.easy.scores
-	gnome-mahjongg.difficult.scores
-	gnome-mahjongg.confounding.scores
-	gnome-mahjongg.pyramid.scores
-	gnome-mahjongg.tictactoe.scores
-	gnome-mahjongg.cloud.scores
-	gnome-mahjongg.dragon.scores
-	gnome-mahjongg.bridges.scores
-	gnome-mahjongg.ziggurat.scores
-	quadrapassel.scores
-	swell-foop.small.scores
-	swell-foop.normal.scores
-	swell-foop.large.scores)
-
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    if [ -e "var/games/$score" ]; then
-      continue
-    fi
-
-    touch "var/games/$score"
-    chown root:games "var/games/$score"
-    chmod 664 "var/games/$score"
-  done
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
-
-  for score in "${_scores[@]}" ; do
-    rm -f "var/games/$score"
-  done
-}
diff --git a/testing/gnome-keyring/PKGBUILD b/testing/gnome-keyring/PKGBUILD
deleted file mode 100644
index 6adece782..000000000
--- a/testing/gnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-#$Id: PKGBUILD 169225 2012-10-18 19:26:46Z jgc $
-# Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gnome-keyring
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GNOME Password Management daemon"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('gtk3' 'gcr' 'libcap-ng')
-makedepends=('intltool')
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=gnome-keyring.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0c3a2ccc1744ce681fa7eb8d5e3e94d1712e932068a36ce7076222eb82b25aa5')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring \
-      --with-pam-dir=/usr/lib/security --with-root-certs=/etc/ssl/certs \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-keyring/gnome-keyring.install b/testing/gnome-keyring/gnome-keyring.install
deleted file mode 100644
index c351377a2..000000000
--- a/testing/gnome-keyring/gnome-keyring.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    setcap cap_ipc_lock=ep /usr/bin/gnome-keyring-daemon
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/gnome-menus/PKGBUILD b/testing/gnome-menus/PKGBUILD
deleted file mode 100644
index 57da0011c..000000000
--- a/testing/gnome-menus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169224 2012-10-18 19:26:43Z jgc $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-
-pkgname=gnome-menus
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME menu specifications"
-arch=('i686' 'x86_64')
-depends=('glib2' 'python2-gobject')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-license=('GPL' 'LGPL')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        menus.patch)
-sha256sums=('523ac10729e28f9acde4785e61dcb895828fd89e39b38b68f6c14ec815805a0b'
-            'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  patch -Np0 -i "$srcdir/menus.patch"
-
-  PYTHON=/usr/bin/python2 ./configure \
-      --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var  --disable-static
-  make
-}
-
-package(){
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  sed -i "1s|#!/usr/bin/env python$|&2|" \
-    "$pkgdir/usr/lib/python2.7/site-packages/GMenuSimpleEditor/config.py"
-}
diff --git a/testing/gnome-menus/menus.patch b/testing/gnome-menus/menus.patch
deleted file mode 100644
index bf73e86cd..000000000
--- a/testing/gnome-menus/menus.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- layout/applications.menu	2005-06-28 10:16:39.000000000 +0200
-+++ layout/applications.menu	2005-09-12 23:21:20.000000000 +0200
-@@ -7,7 +7,6 @@
-   <Directory>Applications.directory</Directory>
- 
-   <!-- Scan legacy dirs first, as later items take priority -->
--  <KDELegacyDirs/>
-   <LegacyDir>/etc/X11/applnk</LegacyDir>
-   <LegacyDir>/usr/share/gnome/apps</LegacyDir>
- 
-@@ -18,6 +17,14 @@
-   <!-- Read in overrides and child menus from applications-merged/ -->
-   <DefaultMergeDirs/>
- 
-+  <!-- Archlinux submenu -->
-+  <Menu>
-+    <Name>Archlinux</Name>
-+    <Directory>Archlinux.directory</Directory>
-+    <Include>
-+      <Category>Archlinux</Category>
-+    </Include>
-+  </Menu> <!-- End Archlinux -->
-   <!-- Accessories submenu -->
-   <Menu>
-     <Name>Accessories</Name>
diff --git a/testing/gnome-nettool/PKGBUILD b/testing/gnome-nettool/PKGBUILD
deleted file mode 100644
index 0d56224e0..000000000
--- a/testing/gnome-nettool/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169223 2012-10-18 19:26:38Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@nospam.gmail.com>
-
-pkgname=gnome-nettool
-pkgver=3.2.0
-pkgrel=1
-pkgdesc="A Collection of GNOME3 Networking Tools."
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme')
-makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools')
-optdepends=('nmap: Port scanning'
-            'net-tools: Network statistics')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-install=gnome-nettool.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-nettool/gnome-nettool.install b/testing/gnome-nettool/gnome-nettool.install
deleted file mode 100644
index e5dfaf4a5..000000000
--- a/testing/gnome-nettool/gnome-nettool.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-online-accounts/PKGBUILD b/testing/gnome-online-accounts/PKGBUILD
deleted file mode 100644
index 2a31df997..000000000
--- a/testing/gnome-online-accounts/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169222 2012-10-18 19:26:35Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-online-accounts
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME service to access online accounts"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL')
-depends=('webkitgtk3' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsecret')
-makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
-options=(!libtool)
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2a88772873935b1c23e8e6b7a2333d8cfb225755aba22e0977129f13351028f7')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexec=/usr/lib/gnome-online-accounts
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-online-accounts/gnome-online-accounts.install b/testing/gnome-online-accounts/gnome-online-accounts.install
deleted file mode 100644
index 525ecff63..000000000
--- a/testing/gnome-online-accounts/gnome-online-accounts.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install () {
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-panel/PKGBUILD b/testing/gnome-panel/PKGBUILD
deleted file mode 100644
index f5b8ab969..000000000
--- a/testing/gnome-panel/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169281 2012-10-18 19:45:55Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-panel
-pkgver=3.6.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-pkgdesc="The GNOME Panel"
-url="http://www.gnome.org"
-depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf'
-         'gconf' 'telepathy-glib')
-makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra')
-install=gnome-panel.install
-groups=('gnome')
-provides=("gnome-panel-bonobo=${pkgver}")
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6a8058df6263af35b0e430514f7e16d1b4df095365242d39e170cfc451a328b6')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-panel \
-      --disable-scrollkeeper \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-panel-3.0 "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-panel/gnome-panel.install b/testing/gnome-panel/gnome-panel.install
deleted file mode 100644
index 0f9324937..000000000
--- a/testing/gnome-panel/gnome-panel.install
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgname=gnome-panel
-
-post_install() {
-  gconfpkg --install $pkgname
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
diff --git a/testing/gnome-phone-manager/PKGBUILD b/testing/gnome-phone-manager/PKGBUILD
deleted file mode 100644
index 2775223dd..000000000
--- a/testing/gnome-phone-manager/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169299 2012-10-18 22:31:09Z jgc $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-phone-manager
-pkgver=0.68
-pkgrel=3
-pkgdesc="Control your mobile phone from your GNOME desktop."
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/PhoneManager"
-license=('GPL')
-depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' 'libcanberra' 'gconf')
-makedepends=('intltool')
-options=('!emptydirs' '!libtool')
-install=gnome-phone-manager.install
-source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz
-        gnome-phone-manager-0.68-eds.patch)
-sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15'
-            '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ../gnome-phone-manager-0.68-eds.patch
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-phone-manager "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/testing/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
deleted file mode 100644
index 2a36de13a..000000000
--- a/testing/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c
-index dc8e2e3..d95e5b9 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.c
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c
-@@ -38,11 +38,6 @@
- #include <glib.h>
- #include <glib/gi18n.h>
- 
--#include <libedataserver/e-source.h>
--#include <libebook/e-book.h>
--#include <libebook/e-book-view.h>
--#include <libebook/e-contact.h>
--
- #include "e-contact-entry.h"
- #include "econtactentry-marshal.h"
- 
-@@ -59,7 +54,7 @@ static int signals[LAST_SIGNAL] = { 0 };
- /* Properties */
- enum {
-   PROP_0, /* TODO: why? */
--  PROP_SOURCE_LIST,
-+  PROP_REGISTRY,
-   PROP_COMPLETE_LENGTH,
- };
- 
-@@ -70,7 +65,7 @@ enum {
- struct EContactEntryPriv {
-   GtkEntryCompletion *completion;
-   GtkListStore *store;
--  ESourceList *source_list;
-+  ESourceRegistry *registry;
-   /* A list of EntryLookup structs we are searching */
-   GList *lookup_entries;
-   /* Number of characters to start searching at */
-@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact)
-   emails = e_contact_get (contact, E_CONTACT_EMAIL);
-   for (l = emails; l != NULL; l = l->next) {
-     item = g_new0 (EContactEntyItem, 1);
--    item->identifier = item->identifier = g_strdup (l->data);
-+    item->identifier = g_strdup (l->data);
-     item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier);
- 
-     items = g_list_prepend (items, item);
-@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
-       return;
- 
-     photo = e_contact_get (contact, E_CONTACT_PHOTO);
--#ifndef HAVE_ECONTACTPHOTOTYPE
--    if (photo) {
--#else
-     if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) {
--#endif
-       GdkPixbufLoader *loader;
- 
-       loader = gdk_pixbuf_loader_new ();
- 
--#ifndef HAVE_ECONTACTPHOTOTYPE
--      if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data,
--			      photo->length, NULL))
--#else
-       if (gdk_pixbuf_loader_write (loader, (guchar *)photo->data.inlined.data,
- 			      photo->data.inlined.length, NULL))
--#endif
-         pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- 
-       if (pixbuf) {
-@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data)
-  * The query on the EBookView has completed.
-  */
- static void
--view_completed_cb (EBookView *book_view, EBookViewStatus status, gpointer user_data)
-+view_completed_cb (EBookView *book_view, EBookViewStatus status, const gchar *message, gpointer user_data)
- {
-   EntryLookup *lookup;
-   g_return_if_fail (user_data != NULL);
--  /* TODO: handle status != OK */
--  g_return_if_fail (status == E_BOOK_ERROR_OK);
-   g_return_if_fail (book_view != NULL);
- 
-   lookup = (EntryLookup*)user_data;
-   g_object_unref (lookup->bookview);
-+  lookup->bookview = NULL;
- }
- 
- /**
-@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo
-   lookup->bookview = book_view;
-   g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview);
-   
--  g_signal_connect (book_view, "contacts_added", (GCallback)view_contacts_added_cb, lookup);
--  g_signal_connect (book_view, "sequence_complete", (GCallback)view_completed_cb, lookup);
-+  g_signal_connect (book_view, "contacts-added", (GCallback)view_contacts_added_cb, lookup);
-+  g_signal_connect (book_view, "view_complete", (GCallback)view_completed_cb, lookup);
-   
-   e_book_view_start (book_view);
- }
-@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
-       if (lookup->bookview) {
-         e_book_view_stop (lookup->bookview);
-         g_object_unref (lookup->bookview);
-+        lookup->bookview = NULL;
-       }
-     }
-     
-@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data)
-       if (!lookup->open)
-         continue;
-       
--      if (e_book_async_get_book_view (lookup->book, query, NULL, 11, (EBookBookViewCallback)bookview_cb, lookup) != 0) {
-+      if (e_book_async_get_book_view (lookup->book, query, NULL, MAX_ENTRIES, (EBookBookViewCallback)bookview_cb, lookup) == FALSE) {
-         g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view."));
-       }
-     }
-@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data)
-  */
- 
- void
--e_contact_entry_set_source_list (EContactEntry *entry,
--    				  ESourceList *source_list)
-+e_contact_entry_set_registry (EContactEntry *entry,
-+    			      ESourceRegistry *registry)
- {
-+  GList *list, *link;
-+  const gchar *extension_name;
-   GError *error = NULL;
--  GSList *list, *l;
- 
-   g_return_if_fail (E_IS_CONTACT_ENTRY (entry));
- 
-@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry,
-     g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL);
-     g_list_free (entry->priv->lookup_entries);
-   }
--  if (entry->priv->source_list) {
--    g_object_unref (entry->priv->source_list);
-+  if (entry->priv->registry) {
-+    g_object_unref (entry->priv->registry);
-   }
- 
-   /* If we have no new sources, disable and return here */
--  if (source_list == NULL) {
-+  if (registry == NULL) {
-     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
--    entry->priv->source_list = NULL;
-+    entry->priv->registry = NULL;
-     entry->priv->lookup_entries = NULL;
-     return;
-   }
- 
--  entry->priv->source_list = source_list;
--  /* So that the list isn't going away underneath us */
--  g_object_ref (entry->priv->source_list);
-+  entry->priv->registry = registry;
-+  /* So that the registry isn't going away underneath us */
-+  g_object_ref (entry->priv->registry);
- 
--  /* That gets us a list of ESourceGroup */
--  list = e_source_list_peek_groups (source_list);
-   entry->priv->lookup_entries = NULL;
- 
--  for (l = list; l != NULL; l = l->next) {
--    ESourceGroup *group = l->data;
--    GSList *sources = NULL, *m;
--    /* That should give us a list of ESource */
--    sources = e_source_group_peek_sources (group);
--    for (m = sources; m != NULL; m = m->next) {
--      ESource *source = m->data;
--      ESource *s = e_source_copy (source);
--      EntryLookup *lookup;
--      char *uri;
-+  extension_name = E_SOURCE_EXTENSION_ADDRESS_BOOK;
-+  list = e_source_registry_list_sources (registry, extension_name);
- 
--      uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source));
--      e_source_set_absolute_uri (s, uri);
--      g_free (uri);
-+  for (link = list; link != NULL; link = g_list_next (link)) {
-+    ESource *source = E_SOURCE (link->data);
-+    EntryLookup *lookup;
- 
--      /* Now add those to the lookup entries list */
--      lookup = g_new0 (EntryLookup, 1);
--      lookup->entry = entry;
--      lookup->status = E_BOOK_ERROR_OK;
--      lookup->open = FALSE;
-+    /* Now add those to the lookup entries list */
-+    lookup = g_new0 (EntryLookup, 1);
-+    lookup->entry = entry;
-+    lookup->status = E_BOOK_ERROR_OK;
-+    lookup->open = FALSE;
- 
--      if ((lookup->book = e_book_new (s, &error)) == NULL) {
--        /* TODO handle this better, fire the error signal I guess */
-+    if ((lookup->book = e_book_new (source, &error)) == NULL) {
-+      /* TODO handle this better, fire the error signal I guess */
-+      if (error) {
-         g_warning ("%s", error->message);
--	g_error_free (error);
--	g_free (lookup);
--      } else {
--        entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
--	e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
-+        g_error_free (error);
-+        error = NULL;
-       }
--
--      g_object_unref (s);
-+      g_free (lookup);
-+    } else {
-+      entry->priv->lookup_entries = g_list_append (entry->priv->lookup_entries, lookup);
-+      e_book_async_open(lookup->book, TRUE, (EBookCallback)book_opened_cb, lookup);
-     }
-   }
- 
-@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry,
-     g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE);
- }
- 
--ESourceList *
--e_contact_entry_get_source_list (EContactEntry *entry)
-+ESourceRegistry *
-+e_contact_entry_get_registry (EContactEntry *entry)
- {
-   g_return_val_if_fail (E_IS_CONTACT_ENTRY (entry), NULL);
- 
--  return entry->priv->source_list;
-+  return entry->priv->registry;
- }
- 
- void
-@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue *
-   entry = E_CONTACT_ENTRY (object);
-   
-   switch (property_id) {
--  case PROP_SOURCE_LIST:
--    e_contact_entry_set_source_list (entry, g_value_get_object (value));
-+  case PROP_REGISTRY:
-+    e_contact_entry_set_registry (entry, g_value_get_object (value));
-     break;
-   case PROP_COMPLETE_LENGTH:
-     e_contact_entry_set_complete_length (entry, g_value_get_int (value));
-@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value,
-   entry = E_CONTACT_ENTRY (object);
-   
-   switch (property_id) {
--  case PROP_SOURCE_LIST:
--    g_value_set_object (value, e_contact_entry_get_source_list (entry));
-+  case PROP_REGISTRY:
-+    g_value_set_object (value, e_contact_entry_get_registry (entry));
-     break;
-   case PROP_COMPLETE_LENGTH:
-     g_value_set_int (value, e_contact_entry_get_complete_length (entry));
-@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object)
-     g_list_free (entry->priv->lookup_entries);
-     g_object_unref (entry->priv->completion);
-     g_object_unref (entry->priv->store);
--    g_object_unref (entry->priv->source_list);
-+    g_object_unref (entry->priv->registry);
- 
-     if (entry->priv->display_destroy) {
-       entry->priv->display_destroy (entry->priv->display_func);
-@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object)
- static void
- reset_search_fields (EContactEntry *entry)
- {
--  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, E_CONTACT_ORG, 0 };
-+  EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_EMAIL, E_CONTACT_NICKNAME, 0 };
- 
-   g_free (entry->priv->search_fields);
-   entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields));
-@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass)
-   object_class->finalize = e_contact_entry_finalize;
- 
-   /* Properties */
--  g_object_class_install_property (object_class, PROP_SOURCE_LIST,
--                                   g_param_spec_object ("source-list", "Source List", "The source list to search for contacts.",
--                                                        E_TYPE_SOURCE_LIST, G_PARAM_READWRITE));
-+  g_object_class_install_property (object_class, PROP_REGISTRY,
-+                                   g_param_spec_object ("registry", "Registry", "Data source registry.",
-+                                                        E_TYPE_SOURCE_REGISTRY, G_PARAM_READWRITE));
-   
-   g_object_class_install_property (object_class, PROP_COMPLETE_LENGTH,
-                                    g_param_spec_int ("complete-length", "Complete length", "Number of characters to start a search on.",
-@@ -771,6 +748,7 @@ lookup_entry_free (EntryLookup *lookup)
-   if (lookup->bookview) {
-     g_warning("EBookView still around");
-     g_object_unref (lookup->bookview);
-+    lookup->bookview = NULL;
-   }
-   if (lookup->book) {
-     g_object_unref (lookup->book);
-diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h
-index bf6b39b..6fedef7 100644
---- a/cut-n-paste/e-contact-entry/e-contact-entry.h
-+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h
-@@ -23,10 +23,8 @@
- #ifndef CONTACT_ENTRY_H
- #define CONTACT_ENTRY_H
- 
--#include <libedataserver/e-source-group.h>
--#include <libedataserver/e-source-list.h>
--#include <libebook/e-contact.h>
- #include <gtk/gtk.h>
-+#include <libebook/libebook.h>
- 
- G_BEGIN_DECLS
- 
-@@ -71,8 +69,8 @@ GType e_contact_entry_get_type (void);
- 
- GtkWidget *e_contact_entry_new (void);
- 
--void e_contact_entry_set_source_list (EContactEntry *entry, ESourceList *list);
--ESourceList *e_contact_entry_get_source_list (EContactEntry *entry);
-+void e_contact_entry_set_registry (EContactEntry *entry, ESourceRegistry *registry);
-+ESourceRegistry *e_contact_entry_get_registry (EContactEntry *entry);
- 
- void e_contact_entry_set_complete_length(EContactEntry *entry, int length);
- int e_contact_entry_get_complete_length(EContactEntry *entry);
-diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c
-index 4e62e10..baef34f 100644
---- a/libgsm/phonemgr-utils.c
-+++ b/libgsm/phonemgr-utils.c
-@@ -27,7 +27,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <glib-object.h>
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <gnokii.h>
- 
- #include <bluetooth/bluetooth.h>
-diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c
-index 5d25622..38f4c2f 100644
---- a/src/e-phone-entry.c
-+++ b/src/e-phone-entry.c
-@@ -31,8 +31,7 @@
- 
- #include <gtk/gtk.h>
- #include <string.h>
--#include <libedataserver/e-source-list.h>
--#include <libedataserverui/e-client-utils.h>
-+#include <libedataserverui/libedataserverui.h>
- #include "e-phone-entry.h"
- 
- #define CONTACT_FORMAT "%s (%s)"
-@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object)
- }
- 
- static void
--add_sources (EContactEntry *entry)
--{
--	ESourceList *source_list;
--
--	if (e_client_utils_get_sources (&source_list,
--					E_CLIENT_SOURCE_TYPE_CONTACTS,
--					NULL)) {
--		e_contact_entry_set_source_list (E_CONTACT_ENTRY (entry),
--						 source_list);
--		g_object_unref (source_list);
--	}
--}
--
--static void
- e_phone_entry_init (EPhoneEntry *entry)
- {
- 	EContactField fields[] = { E_CONTACT_FULL_NAME, E_CONTACT_NICKNAME, E_CONTACT_ORG, E_CONTACT_PHONE_MOBILE, 0 };
-+	ESourceRegistry *registry;
-+	GError *error = NULL;
-+
-+	/* XXX This call blocks while a D-Bus connection is made, possibly
-+	 *     requiring activation.  Might be better to create the registry
-+	 *     in main(), pass it to ui_init(), and have e_phone_entry_new()
-+	 *     take it as an argument.  Calling this from main() means if it
-+	 *     fails you can abort cleanly with a console error message. */
-+	registry = e_source_registry_new_sync (NULL, &error);
-+	if (registry == NULL) {
-+		g_error ("%s: %s", G_STRFUNC, error->message);
-+		g_assert_not_reached ();
-+	}
-+	e_contact_entry_set_registry (E_CONTACT_ENTRY (entry), registry);
-+	g_object_unref (registry);
- 
--	add_sources (E_CONTACT_ENTRY (entry));
- 	e_contact_entry_set_search_fields (E_CONTACT_ENTRY (entry), (const EContactField *)fields);
- 	e_contact_entry_set_display_func (E_CONTACT_ENTRY (entry), test_display_func, NULL, NULL);
- 	g_signal_connect (G_OBJECT (entry), "contact_selected",
diff --git a/testing/gnome-phone-manager/gnome-phone-manager.install b/testing/gnome-phone-manager/gnome-phone-manager.install
deleted file mode 100644
index 91212fa2e..000000000
--- a/testing/gnome-phone-manager/gnome-phone-manager.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-phone-manager
-
-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/gnome-power-manager/PKGBUILD b/testing/gnome-power-manager/PKGBUILD
deleted file mode 100644
index c2cb1dd1e..000000000
--- a/testing/gnome-power-manager/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169221 2012-10-18 19:26:31Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-power-manager
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Power management tools."
-arch=(i686 x86_64)
-url="http://www.gnome.org/projects/gnome-power-manager/"
-license=('GPL')
-depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme')
-makedepends=('intltool')
-options=(!emptydirs)
-install=gnome-power-manager.install
-groups=(gnome-extra)
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-power-manager \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-power-manager/gnome-power-manager.install b/testing/gnome-power-manager/gnome-power-manager.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/testing/gnome-power-manager/gnome-power-manager.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-python-desktop/PKGBUILD b/testing/gnome-python-desktop/PKGBUILD
deleted file mode 100644
index 2c0833284..000000000
--- a/testing/gnome-python-desktop/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id: PKGBUILD 168837 2012-10-16 11:53:40Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@soulfly.nl>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-
-pkgbase=gnome-python-desktop
-pkgname=('gnome-python-desktop' 'python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck')
-pkgver=2.32.0
-pkgrel=11
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-options=('!libtool')
-makedepends=('intltool' 'pkg-config' 'gnome-python' 'libgtop' 'totem-plparser' 'gnome-desktop2' 'metacity' 'librsvg' 'libwnck')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/2.32/${pkgbase}-${pkgver}.tar.bz2
-        gnome-python-desktop-2.32.0-metacity-build.patch)
-sha256sums=('09dbd580bf3b0ef60f91b090eafe6d08ddcc50a609e2b425a7f8eca46d4e0ee9'
-            'f012f9bd2f9baa527f07ad2f6e312c875bb6f2d3204270a1b053278a3a0c86b3')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  patch -p1 -i ../gnome-python-desktop-2.32.0-metacity-build.patch
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --enable-metacity
-  make
-}
-
-package_gnome-python-desktop() {
-  depends=('python2-gnomedesktop' 'python2-gnomekeyring' 'python2-gtop' 'python2-metacity' 'python2-rsvg' 'python2-totem-plparser' 'python2-wnck' 'gnome2-python')
-  pkgdesc="Python bindings for the GNOME desktop environment"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make install-pkgconfigDATA DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomedesktop() {
-  depends=('pygtk' 'gnome-desktop2' 'python2-gnomevfs')
-  pkgdesc="Python bindings for gnome-desktop 2.x"
-  conflicts=('python-gnomedesktop<=2.32.0-10')
-  replaces=('python-gnomedesktop<=2.32.0-10')
-  
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomedesktop install DESTDIR="${pkgdir}"
-}
-
-package_python2-gnomekeyring() {
-  depends=('pygtk' 'libgnome-keyring')
-  pkgdesc="Python bindings for libgnome-keyring"
-  conflicts=('python-gnomekeyring<=2.32.0-10')
-  replaces=('python-gnomekeyring<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gnomekeyring install DESTDIR="${pkgdir}"
-}
-
-package_python2-gtop() {
-  depends=('pygtk' 'libgtop')
-  pkgdesc="Python bindings for libgtop"
-  conflicts=('python-gtop<=2.32.0-10')
-  replaces=('python-gtop<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C gtop install DESTDIR="${pkgdir}"
-}
-
-package_python2-metacity() {
-  depends=('pygtk' 'metacity')
-  pkgdesc="Python bindings for metacity"
-  conflicts=('python-metacity<=2.32.0-10')
-  replaces=('python-metacity<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C metacity install DESTDIR="${pkgdir}"
-}
-
-package_python2-rsvg() {
-  depends=('pygtk' 'librsvg')
-  pkgdesc="Python bindings for librsvg"
-  conflicts=('python-rsvg<=2.32.0-10')
-  replaces=('python-rsvg<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C rsvg install DESTDIR="${pkgdir}"
-  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
-  install -m644 rsvg/rsvg.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
-package_python2-totem-plparser() {
-  depends=('pygtk' 'totem-plparser' 'python2-gnomevfs')
-  pkgdesc="Python bindings for totem-plparser"
-  conflicts=('python-totem-plparser<=2.32.0-10')
-  replaces=('python-totem-plparser<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C totem install DESTDIR="${pkgdir}"
-  install -m755 -d "${pkgdir}/usr/share/pygtk/2.0/defs"
-  install -m644 totem/plparser.defs "${pkgdir}/usr/share/pygtk/2.0/defs/"
-}
-
-package_python2-wnck() {
-  depends=('pygtk' 'libwnck')
-  pkgdesc="Python bindings for libwnck"
-  conflicts=('python-wnck<=2.32.0-10')
-  replaces=('python-wnck<=2.32.0-10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -C wnck install DESTDIR="${pkgdir}"
-}
diff --git a/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch b/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
deleted file mode 100644
index 5054dd2bd..000000000
--- a/testing/gnome-python-desktop/gnome-python-desktop-2.32.0-metacity-build.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Daniel Drake <dsd@laptop.org>
-
-Fix build against metacity-2.34.2. The port to GSettings
-removed these constants from the codebase.
-
-Index: gnome-python-desktop-2.32.0/metacity/metacity.defs
-===================================================================
---- gnome-python-desktop-2.32.0.orig/metacity/metacity.defs
-+++ gnome-python-desktop-2.32.0/metacity/metacity.defs
-@@ -120,32 +120,6 @@
-   )
- )
- 
--(define-enum FocusMode
--  (in-module "Meta")
--  (c-name "MetaFocusMode")
--;   (gtype-id "META_TYPE_FOCUS_MODE")
--  (values
--    '("click" "META_FOCUS_MODE_CLICK")
--    '("sloppy" "META_FOCUS_MODE_SLOPPY")
--    '("mouse" "META_FOCUS_MODE_MOUSE")
--  )
--)
--
--(define-enum ActionTitlebar
--  (in-module "Meta")
--  (c-name "MetaActionTitlebar")
--;   (gtype-id "META_TYPE_ACTION_TITLEBAR")
--  (values
--    '("toggle-shade" "META_ACTION_TITLEBAR_TOGGLE_SHADE")
--    '("toggle-maximize" "META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE")
--    '("minimize" "META_ACTION_TITLEBAR_MINIMIZE")
--    '("none" "META_ACTION_TITLEBAR_NONE")
--    '("lower" "META_ACTION_TITLEBAR_LOWER")
--    '("menu" "META_ACTION_TITLEBAR_MENU")
--    '("last" "META_ACTION_TITLEBAR_LAST")
--  )
--)
--
- (define-enum FrameType
-   (in-module "Meta")
-   (c-name "MetaFrameType")
diff --git a/testing/gnome-screensaver/PKGBUILD b/testing/gnome-screensaver/PKGBUILD
deleted file mode 100644
index 558151417..000000000
--- a/testing/gnome-screensaver/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 169220 2012-10-18 19:26:26Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-screensaver
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Screensaver designed to integrate well with the GNOME desktop."
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
-backup=(etc/pam.d/gnome-screensaver)
-depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd')
-makedepends=('pkgconfig' 'intltool' 'libxss')
-groups=('gnome')
-options=(!emptydirs)
-install=gnome-screensaver.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-       gnome-screensaver.pam)
-sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
-            'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-screensaver \
-      --localstatedir=/var \
-      --with-mit-ext --with-systemd
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver"
-}
diff --git a/testing/gnome-screensaver/gnome-screensaver.install b/testing/gnome-screensaver/gnome-screensaver.install
deleted file mode 100644
index d1a42c6ce..000000000
--- a/testing/gnome-screensaver/gnome-screensaver.install
+++ /dev/null
@@ -1,7 +0,0 @@
-pkgname=gnome-screensaver
-
-pre_upgrade() {
-    if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-        gconfpkg --uninstall ${pkgname}
-    fi
-}
diff --git a/testing/gnome-screensaver/gnome-screensaver.pam b/testing/gnome-screensaver/gnome-screensaver.pam
deleted file mode 100644
index 453dae646..000000000
--- a/testing/gnome-screensaver/gnome-screensaver.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth        required     pam_unix_auth.so nullok
-auth        optional     pam_gnome_keyring.so
diff --git a/testing/gnome-screenshot/PKGBUILD b/testing/gnome-screenshot/PKGBUILD
deleted file mode 100644
index 0d380fc0c..000000000
--- a/testing/gnome-screenshot/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169219 2012-10-18 19:26:22Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-screenshot
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Take pictures of your screen"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3' 'libcanberra')
-makedepends=('intltool')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('96626b86d0ebaacf420b68ddd846d5185dc90a58e5d86843799c2071255b7636')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-screenshot/gnome-screenshot.install b/testing/gnome-screenshot/gnome-screenshot.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/testing/gnome-screenshot/gnome-screenshot.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-search-tool/PKGBUILD b/testing/gnome-search-tool/PKGBUILD
deleted file mode 100644
index ca530ec6e..000000000
--- a/testing/gnome-search-tool/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169218 2012-10-18 19:26:17Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-search-tool
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Utility to search for files"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('gtk3' 'libsm')
-makedepends=('intltool' 'yelp-tools')
-install=$pkgname.install
-options=('!emptydirs')
-groups=('gnome-extra')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-search-tool/gnome-search-tool.install b/testing/gnome-search-tool/gnome-search-tool.install
deleted file mode 100644
index b631b6a89..000000000
--- a/testing/gnome-search-tool/gnome-search-tool.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.6.0) < 0 )) && gconfpkg --uninstall gnome-search-tool
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-session/PKGBUILD b/testing/gnome-session/PKGBUILD
deleted file mode 100644
index 38e396045..000000000
--- a/testing/gnome-session/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 169217 2012-10-18 19:26:12Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-session
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="The GNOME Session Handler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3'
-         'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome'
-         'upower')
-makedepends=('intltool' 'mesa' 'xtrans')
-options=('!emptydirs')
-install=gnome-session.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gnome-session-3.3.1-llvmpipe.patch timeout.patch)
-sha256sums=('759c26230d8ac3f2d51344f5eaadce166819c4394acb733987e6d23fd42bddfb'
-            '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e'
-            '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Allow software rendering
-  patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch
-
-  # Increase timeout, for slow machines
-  patch -Np1 -i ../timeout.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/gnome-session \
-      --disable-schemas-compile --enable-systemd
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch
deleted file mode 100644
index 40da1c9b7..000000000
--- a/testing/gnome-session/gnome-session-3.3.1-llvmpipe.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility
---- gnome-session-3.3.1/data/hardware-compatibility.jx	2011-10-21 10:35:39.000000000 -0400
-+++ gnome-session-3.3.1/data/hardware-compatibility	2011-11-03 17:53:17.156407217 -0400
-@@ -20,4 +20,4 @@
- 
- # Gallium has softpipe and llvmpipe
- -softpipe
---llvmpipe
-+#llvmpipe
diff --git a/testing/gnome-session/gnome-session.install b/testing/gnome-session/gnome-session.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/testing/gnome-session/gnome-session.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-session/timeout.patch b/testing/gnome-session/timeout.patch
deleted file mode 100644
index a26b0dcf5..000000000
--- a/testing/gnome-session/timeout.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -u -r gnome-session-3.4.2/gnome-session/gsm-session-fill.c gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c
---- gnome-session-3.4.2/gnome-session/gsm-session-fill.c	2012-02-02 15:33:01.000000000 +0100
-+++ gnome-session-3.4.2-timeout/gnome-session/gsm-session-fill.c	2012-06-10 02:39:46.184348462 +0200
-@@ -36,7 +36,7 @@
- #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
- 
- /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
--#define GSM_RUNNABLE_HELPER_TIMEOUT 3000 /* ms */
-+#define GSM_RUNNABLE_HELPER_TIMEOUT 10000 /* ms */
- 
- typedef void (*GsmFillHandleProvider) (const char *provides,
-                                        const char *default_provider,
-diff -u -r gnome-session-3.4.2/tools/gnome-session-check-accelerated.c gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c
---- gnome-session-3.4.2/tools/gnome-session-check-accelerated.c	2011-03-22 21:31:43.000000000 +0100
-+++ gnome-session-3.4.2-timeout/tools/gnome-session-check-accelerated.c	2012-06-10 02:42:08.013218006 +0200
-@@ -30,7 +30,7 @@
- #include <X11/Xatom.h>
- 
- /* Wait up to this long for a running check to finish */
--#define PROPERTY_CHANGE_TIMEOUT 5000
-+#define PROPERTY_CHANGE_TIMEOUT 12000
- 
- /* Values used for the _GNOME_SESSION_ACCELERATED root window property */
- #define NO_ACCEL            0
diff --git a/testing/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/testing/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
deleted file mode 100644
index 293a419df..000000000
--- a/testing/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
+++ /dev/null
@@ -1,1473 +0,0 @@
-From 79ead5309fe21e77cfe58adc6a9340953c2d52f4 Mon Sep 17 00:00:00 2001
-From: Richard Hughes <richard@hughsie.com>
-Date: Fri, 21 Sep 2012 11:56:53 +0100
-Subject: [PATCH] power and media-keys: Use logind for suspending and
- rebooting the system
-
-Use the new logind features to suspend and resume but making sure we opt out
-of logind handling the sleep and power keys, and also inhibiting for lid close
-auto-suspend if there is an external monitor connected.
-
-Also use a delay inihibit for logind so that we can do actions on suspend like
-blanking the screen using the screensaver and also poking the screensaver on
-resume.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=680689
----
- plugins/common/Makefile.am                  |   4 +-
- plugins/common/gsd-power-helper.c           | 203 --------
- plugins/common/gsd-power-helper.h           |  35 --
- plugins/media-keys/gsd-media-keys-manager.c | 156 +++++--
- plugins/power/gsd-power-manager.c           | 699 +++++++++++++++++++---------
- 5 files changed, 595 insertions(+), 502 deletions(-)
- delete mode 100644 plugins/common/gsd-power-helper.c
- delete mode 100644 plugins/common/gsd-power-helper.h
-
-diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
-index 7e50db4..b0e907c 100644
---- a/plugins/common/Makefile.am
-+++ b/plugins/common/Makefile.am
-@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \
- 	gsd-keygrab.c		\
- 	gsd-keygrab.h		\
- 	gsd-input-helper.c	\
--	gsd-input-helper.h	\
--	gsd-power-helper.c	\
--	gsd-power-helper.h
-+	gsd-input-helper.h
- 
- libcommon_la_CPPFLAGS = \
- 	$(AM_CPPFLAGS)
-diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c
-deleted file mode 100644
-index 27d0eda..0000000
---- a/plugins/common/gsd-power-helper.c
-+++ /dev/null
-@@ -1,203 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- *
-- */
--
--#include "config.h"
--
--#include "gsd-power-helper.h"
--
--#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
--#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
--#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
--
--#define CONSOLEKIT_DBUS_NAME                    "org.freedesktop.ConsoleKit"
--#define CONSOLEKIT_DBUS_PATH_MANAGER            "/org/freedesktop/ConsoleKit/Manager"
--#define CONSOLEKIT_DBUS_INTERFACE_MANAGER       "org.freedesktop.ConsoleKit.Manager"
--
--#ifdef HAVE_SYSTEMD
--static void
--systemd_stop (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "PowerOff",
--                                g_variant_new ("(b)", FALSE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_suspend (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Suspend",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--static void
--systemd_hibernate (void)
--{
--        GDBusConnection *bus;
--
--        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
--        g_dbus_connection_call (bus,
--                                SYSTEMD_DBUS_NAME,
--                                SYSTEMD_DBUS_PATH,
--                                SYSTEMD_DBUS_INTERFACE,
--                                "Hibernate",
--                                g_variant_new ("(b)", TRUE),
--                                NULL, 0, G_MAXINT, NULL, NULL, NULL);
--        g_object_unref (bus);
--}
--
--#else /* HAVE_SYSTEMD */
--
--static void
--consolekit_stop_cb (GObject *source_object,
--                    GAsyncResult *res,
--                    gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't stop using ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--consolekit_stop (void)
--{
--        GError *error = NULL;
--        GDBusProxy *proxy;
--
--        /* power down the machine in a safe way */
--        proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
--                                               G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                               NULL,
--                                               CONSOLEKIT_DBUS_NAME,
--                                               CONSOLEKIT_DBUS_PATH_MANAGER,
--                                               CONSOLEKIT_DBUS_INTERFACE_MANAGER,
--                                               NULL, &error);
--        if (proxy == NULL) {
--                g_warning ("cannot connect to ConsoleKit: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--        g_dbus_proxy_call (proxy,
--                           "Stop",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           consolekit_stop_cb, NULL);
--        g_object_unref (proxy);
--}
--static void
--upower_sleep_cb (GObject *source_object,
--                 GAsyncResult *res,
--                 gpointer user_data)
--{
--        GVariant *result;
--        GError *error = NULL;
--
--        result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
--                                           res,
--                                           &error);
--        if (result == NULL) {
--                g_warning ("couldn't sleep using UPower: %s",
--                           error->message);
--                g_error_free (error);
--        } else {
--                g_variant_unref (result);
--        }
--}
--
--static void
--upower_suspend (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Suspend",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--
--static void
--upower_hibernate (GDBusProxy *upower_proxy)
--{
--        g_dbus_proxy_call (upower_proxy,
--                           "Hibernate",
--                           NULL,
--                           G_DBUS_CALL_FLAGS_NONE,
--                           -1, NULL,
--                           upower_sleep_cb, NULL);
--}
--#endif /* HAVE_SYSTEMD */
--
--void
--gsd_power_suspend (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_suspend ();
--#else
--	upower_suspend (upower_proxy);
--#endif
--}
--
--void
--gsd_power_poweroff (void)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_stop ();
--#else
--	consolekit_stop ();
--#endif
--}
--
--void
--gsd_power_hibernate (GDBusProxy *upower_proxy)
--{
--#ifdef HAVE_SYSTEMD
--	systemd_hibernate ();
--#else
--	upower_hibernate (upower_proxy);
--#endif
--}
-diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h
-deleted file mode 100644
-index e3be14f..0000000
---- a/plugins/common/gsd-power-helper.h
-+++ /dev/null
-@@ -1,35 +0,0 @@
--/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-- *
-- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software
-- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- */
--
--#ifndef __GSD_POWER_HELPER_H
--#define __GSD_POWER_HELPER_H
--
--#include <glib.h>
--
--G_BEGIN_DECLS
--
--#include <gio/gio.h>
--
--void gsd_power_suspend   (GDBusProxy *upower_proxy);
--void gsd_power_hibernate (GDBusProxy *upower_proxy);
--void gsd_power_poweroff  (void);
--
--G_END_DECLS
--
--#endif /* __GSD_POWER_HELPER_H */
-diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
-index 9c84d7f..a2f277e 100644
---- a/plugins/media-keys/gsd-media-keys-manager.c
-+++ b/plugins/media-keys/gsd-media-keys-manager.c
-@@ -39,6 +39,7 @@
- #include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <gio/gdesktopappinfo.h>
-+#include <gio/gunixfdlist.h>
- 
- #ifdef HAVE_GUDEV
- #include <gudev/gudev.h>
-@@ -51,7 +52,6 @@
- #include "shortcuts-list.h"
- #include "gsd-osd-window.h"
- #include "gsd-input-helper.h"
--#include "gsd-power-helper.h"
- #include "gsd-enums.h"
- 
- #include <canberra.h>
-@@ -105,6 +105,10 @@ static const gchar introspection_xml[] =
- #define KEY_CURRENT_INPUT_SOURCE "current"
- #define KEY_INPUT_SOURCES        "sources"
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate))
- 
- typedef struct {
-@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate
- 
-         /* Power stuff */
-         GSettings       *power_settings;
--        GDBusProxy      *upower_proxy;
-         GDBusProxy      *power_screen_proxy;
-         GDBusProxy      *power_keyboard_proxy;
- 
-+        /* systemd stuff */
-+        GDBusProxy      *logind_proxy;
-+        gint             inhibit_keys_fd;
-+
-         /* Multihead stuff */
-         GdkScreen       *current_screen;
-         GSList          *screens;
-@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager)
- }
- 
- static void
-+power_action_suspend (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
-+power_action_hibernate (GsdMediaKeysManager *manager)
-+{
-+#ifndef HAVE_SYSTEMD
-+        g_warning ("no systemd support");
-+        return;
-+#endif
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", TRUE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           manager->priv->bus_cancellable,
-+                           NULL, NULL);
-+}
-+
-+static void
- do_config_power_action (GsdMediaKeysManager *manager,
-                         const gchar *config_key)
- {
-@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager,
-                                            config_key);
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                power_action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 gnome_session_shutdown (manager);
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                power_action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-         case GSD_POWER_ACTION_NOTHING:
-@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-         }
- #endif /* HAVE_GUDEV */
- 
-+        g_clear_object (&priv->logind_proxy);
-         if (priv->settings) {
-                 g_object_unref (priv->settings);
-                 priv->settings = NULL;
-@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager)
-                 priv->power_keyboard_proxy = NULL;
-         }
- 
--        if (priv->upower_proxy) {
--                g_object_unref (priv->upower_proxy);
--                priv->upower_proxy = NULL;
--        }
--
-         if (priv->cancellable != NULL) {
-                 g_cancellable_cancel (priv->cancellable);
-                 g_object_unref (priv->cancellable);
-@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass)
- }
- 
- static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit keypresses: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_keys_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
- gsd_media_keys_manager_init (GsdMediaKeysManager *manager)
- {
-+        GError *error;
-+        GDBusConnection *bus;
-+
-+        error = NULL;
-         manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager);
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-+        if (bus == NULL) {
-+                g_warning ("Failed to connect to system bus: %s",
-+                           error->message);
-+                g_error_free (error);
-+                return;
-+        }
-+
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_sync (bus,
-+                                       0,
-+                                       NULL,
-+                                       SYSTEMD_DBUS_NAME,
-+                                       SYSTEMD_DBUS_PATH,
-+                                       SYSTEMD_DBUS_INTERFACE,
-+                                       NULL,
-+                                       &error);
-+
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("Failed to connect to systemd: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        g_object_unref (bus);
-+
-+        g_debug ("Adding system inhibitors for power keys");
-+        manager->priv->inhibit_keys_fd = -1;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "handle-power-key:handle-suspend-key:handle-hibernate-key",
-+                                                            g_get_user_name (),
-+                                                            "GNOME handling keypresses",
-+                                                            "block"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_done,
-+                                             manager);
-+
- }
- 
- static void
-@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object)
- 
-         if (media_keys_manager->priv->start_idle_id != 0)
-                 g_source_remove (media_keys_manager->priv->start_idle_id);
-+        if (media_keys_manager->priv->inhibit_keys_fd != -1)
-+                close (media_keys_manager->priv->inhibit_keys_fd);
- 
-         G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object);
- }
-@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject             *source_object,
- }
- 
- static void
--upower_ready_cb (GObject             *source_object,
--                 GAsyncResult        *res,
--                 GsdMediaKeysManager *manager)
--{
--        GError *error = NULL;
--
--        manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error);
--        if (manager->priv->upower_proxy == NULL) {
--                g_warning ("Failed to get proxy for upower: %s",
--                           error->message);
--                g_error_free (error);
--        }
--}
--
--static void
- power_screen_ready_cb (GObject             *source_object,
-                        GAsyncResult        *res,
-                        GsdMediaKeysManager *manager)
-@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager)
-                    manager->priv->bus_cancellable,
-                    (GAsyncReadyCallback) on_bus_gotten,
-                    manager);
--
--        g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
--                                  G_DBUS_PROXY_FLAGS_NONE,
--                                  NULL,
--                                  "org.freedesktop.UPower",
--                                  "/org/freedesktop/UPower",
--                                  "org.freedesktop.UPower",
--                                  NULL,
--                                  (GAsyncReadyCallback) upower_ready_cb,
--                                  manager);
- }
- 
- GsdMediaKeysManager *
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 070cf32..18fcedf 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -1,7 +1,7 @@
- /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
-  *
-  * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
-- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com>
-+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com>
-  * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-@@ -32,6 +32,7 @@
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
- #include <canberra-gtk.h>
-+#include <gio/gunixfdlist.h>
- 
- #define GNOME_DESKTOP_USE_UNSTABLE_API
- #include <libgnome-desktop/gnome-rr.h>
-@@ -43,7 +44,6 @@
- #include "gnome-settings-session.h"
- #include "gsd-enums.h"
- #include "gsd-power-manager.h"
--#include "gsd-power-helper.h"
- 
- #define GNOME_SESSION_DBUS_NAME                 "org.gnome.SessionManager"
- #define GNOME_SESSION_DBUS_PATH                 "/org/gnome/SessionManager"
-@@ -78,6 +78,10 @@
- #define GSD_POWER_MANAGER_RECALL_DELAY                  30 /* seconds */
- #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT      30 /* seconds */
- 
-+#define SYSTEMD_DBUS_NAME                       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH                       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE                  "org.freedesktop.login1.Manager"
-+
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-@@ -193,14 +197,20 @@ struct GsdPowerManagerPrivate
-         ca_context              *canberra_context;
-         ca_proplist             *critical_alert_loop_props;
-         guint32                  critical_alert_timeout_id;
--        GDBusProxy              *screensaver_proxy;
-         GDBusProxy              *session_proxy;
-         GDBusProxy              *session_presence_proxy;
-         GpmIdletime             *idletime;
-         GsdPowerIdleMode         current_idle_mode;
--        guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-         guint                    xscreensaver_watchdog_timer_id;
-+
-+        /* systemd stuff */
-+        GDBusProxy              *logind_proxy;
-+        gint                     inhibit_lid_switch_fd;
-+        gboolean                 inhibit_lid_switch_taken;
-+        gint                     inhibit_suspend_fd;
-+        gboolean                 inhibit_suspend_taken;
-+        guint                    inhibit_lid_switch_timer_id;
- };
- 
- enum {
-@@ -217,8 +227,8 @@ static GIcon    *engine_get_icon (GsdPowerManager *manager);
- static gchar    *engine_get_summary (GsdPowerManager *manager);
- static void      do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type);
- static void      do_lid_closed_action (GsdPowerManager *manager);
--static void      lock_screensaver (GsdPowerManager *manager);
--static void      kill_lid_close_safety_timer (GsdPowerManager *manager);
-+static void      uninhibit_lid_switch (GsdPowerManager *manager);
-+static gboolean  external_monitor_is_connected (GnomeRRScreen *screen);
- 
- G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT)
- 
-@@ -2048,6 +2058,57 @@ gnome_session_shutdown (void)
- }
- 
- static void
-+action_poweroff (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "PowerOff",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Suspend",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
-+action_hibernate (GsdPowerManager *manager)
-+{
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return;
-+        }
-+        g_dbus_proxy_call (manager->priv->logind_proxy,
-+                           "Hibernate",
-+                           g_variant_new ("(b)", FALSE),
-+                           G_DBUS_CALL_FLAGS_NONE,
-+                           G_MAXINT,
-+                           NULL,
-+                           NULL,
-+                           NULL);
-+}
-+
-+static void
- do_power_action_type (GsdPowerManager *manager,
-                       GsdPowerActionType action_type)
- {
-@@ -2056,19 +2117,19 @@ do_power_action_type (GsdPowerManager *manager,
- 
-         switch (action_type) {
-         case GSD_POWER_ACTION_SUSPEND:
--                gsd_power_suspend (manager->priv->upower_proxy);
-+                action_suspend (manager);
-                 break;
-         case GSD_POWER_ACTION_INTERACTIVE:
-                 gnome_session_shutdown ();
-                 break;
-         case GSD_POWER_ACTION_HIBERNATE:
--                gsd_power_hibernate (manager->priv->upower_proxy);
-+                action_hibernate (manager);
-                 break;
-         case GSD_POWER_ACTION_SHUTDOWN:
-                 /* this is only used on critically low battery where
-                  * hibernate is not available and is marginally better
-                  * than just powering down the computer mid-write */
--                gsd_power_poweroff ();
-+                action_poweroff (manager);
-                 break;
-         case GSD_POWER_ACTION_BLANK:
-                 ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -2140,85 +2201,20 @@ upower_kbd_toggle (GsdPowerManager *manager,
-         return ret;
- }
- 
--static void
--do_lid_open_action (GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* play a sound, using sounds from the naming spec */
--        ca_context_play (manager->priv->canberra_context, 0,
--                         CA_PROP_EVENT_ID, "lid-open",
--                         /* TRANSLATORS: this is the sound description */
--                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
--                         NULL);
--
--        /* ensure we turn the panel back on after lid open */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after lid open: %s",
--                           error->message);
--                g_clear_error (&error);
--        }
--
--        /* only toggle keyboard if present and already toggled off */
--        if (manager->priv->upower_kdb_proxy != NULL &&
--            manager->priv->kbd_brightness_old != -1) {
--                ret = upower_kbd_toggle (manager, &error);
--                if (!ret) {
--                        g_warning ("failed to turn the kbd backlight on: %s",
--                                   error->message);
--                        g_error_free (error);
--                }
--        }
--
--        kill_lid_close_safety_timer (manager);
--}
--
- static gboolean
--is_on (GnomeRROutput *output)
-+inhibit_lid_switch_timer_cb (GsdPowerManager *manager)
- {
--	GnomeRRCrtc *crtc;
--
--	crtc = gnome_rr_output_get_crtc (output);
--	if (!crtc)
--		return FALSE;
--	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
--}
--
--static gboolean
--non_laptop_outputs_are_all_off (GnomeRRScreen *screen)
--{
--        GnomeRROutput **outputs;
--        int i;
--
--        outputs = gnome_rr_screen_list_outputs (screen);
--        for (i = 0; outputs[i] != NULL; i++) {
--                if (gnome_rr_output_is_laptop (outputs[i]))
--                        continue;
--
--                if (is_on (outputs[i]))
--                        return FALSE;
-+        if (!external_monitor_is_connected (manager->priv->x11_screen) ||
-+            g_settings_get_boolean (manager->priv->settings,
-+                                    "lid-close-suspend-with-external-monitor")) {
-+                g_debug ("no external monitors for a while; uninhibiting lid close");
-+                uninhibit_lid_switch (manager);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                return G_SOURCE_REMOVE;
-         }
- 
--        return TRUE;
--}
--
--/* Timeout callback used to check conditions when the laptop's lid is closed but
-- * the machine is not suspended yet.  We try to suspend again, so that the laptop
-- * won't overheat if placed in a backpack.
-- */
--static gboolean
--lid_close_safety_timer_cb (GsdPowerManager *manager)
--{
--        manager->priv->lid_close_safety_timer_id = 0;
--
--        g_debug ("lid has been closed for a while; trying to suspend again");
--        do_lid_closed_action (manager);
--
--        return FALSE;
-+        g_debug ("external monitor still there; trying again later");
-+        return G_SOURCE_CONTINUE;
- }
- 
- /* Sets up a timer to be triggered some seconds after closing the laptop lid
-@@ -2226,82 +2222,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager)
-  * again in the timeout handler to see if we can suspend then.
-  */
- static void
--setup_lid_close_safety_timer (GsdPowerManager *manager)
-+setup_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0)
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("lid close safety timer already set up");
-                 return;
-+        }
-+
-+        g_debug ("setting up lid close safety timer");
- 
--        manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
--                                                                          (GSourceFunc) lid_close_safety_timer_cb,
-+        manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT,
-+                                                                          (GSourceFunc) inhibit_lid_switch_timer_cb,
-                                                                           manager);
--        g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer");
-+        g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer");
- }
- 
- static void
--kill_lid_close_safety_timer (GsdPowerManager *manager)
-+restart_inhibit_lid_switch_timer (GsdPowerManager *manager)
- {
--        if (manager->priv->lid_close_safety_timer_id != 0) {
--                g_source_remove (manager->priv->lid_close_safety_timer_id);
--                manager->priv->lid_close_safety_timer_id = 0;
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_debug ("restarting lid close safety timer");
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+                setup_inhibit_lid_switch_timer (manager);
-         }
- }
- 
- static void
--suspend_with_lid_closed (GsdPowerManager *manager)
-+do_lid_open_action (GsdPowerManager *manager)
- {
-         gboolean ret;
-         GError *error = NULL;
--        GsdPowerActionType action_type;
- 
--        /* maybe lock the screen if the lid is closed */
--        lock_screensaver (manager);
--
--        /* we have different settings depending on AC state */
--        if (up_client_get_on_battery (manager->priv->up_client)) {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-battery-action");
--        } else {
--                action_type = g_settings_get_enum (manager->priv->settings,
--                                                   "lid-close-ac-action");
--        }
--
--        /* check we won't melt when the lid is closed */
--        if (action_type != GSD_POWER_ACTION_SUSPEND &&
--            action_type != GSD_POWER_ACTION_HIBERNATE) {
--                if (up_client_get_lid_force_sleep (manager->priv->up_client)) {
--                        g_warning ("to prevent damage, now forcing suspend");
--                        do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND);
--                        return;
--                }
--        }
-+        /* play a sound, using sounds from the naming spec */
-+        ca_context_play (manager->priv->canberra_context, 0,
-+                         CA_PROP_EVENT_ID, "lid-open",
-+                         /* TRANSLATORS: this is the sound description */
-+                         CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"),
-+                         NULL);
- 
--        /* ensure we turn the panel back on after resume */
-+        /* ensure we turn the panel back on after lid open */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_OFF,
-+                                             GNOME_RR_DPMS_ON,
-                                              &error);
-         if (!ret) {
--                g_warning ("failed to turn the panel off after lid close: %s",
-+                g_warning ("failed to turn the panel on after lid open: %s",
-                            error->message);
--                g_error_free (error);
-+                g_clear_error (&error);
-         }
- 
--        /* only toggle keyboard if present and not already toggled */
--        if (manager->priv->upower_kdb_proxy &&
--            manager->priv->kbd_brightness_old == -1) {
-+        /* only toggle keyboard if present and already toggled off */
-+        if (manager->priv->upower_kdb_proxy != NULL &&
-+            manager->priv->kbd_brightness_old != -1) {
-                 ret = upower_kbd_toggle (manager, &error);
-                 if (!ret) {
--                        g_warning ("failed to turn the kbd backlight off: %s",
-+                        g_warning ("failed to turn the kbd backlight on: %s",
-                                    error->message);
-                         g_error_free (error);
-                 }
-         }
--
--        do_power_action_type (manager, action_type);
- }
- 
- static void
- do_lid_closed_action (GsdPowerManager *manager)
- {
-+        gboolean ret;
-+        GError *error = NULL;
-+
-         /* play a sound, using sounds from the naming spec */
-         ca_context_play (manager->priv->canberra_context, 0,
-                          CA_PROP_EVENT_ID, "lid-close",
-@@ -2309,21 +2296,22 @@ do_lid_closed_action (GsdPowerManager *manager)
-                          CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"),
-                          NULL);
- 
-+        /* turn the panel off if the lid is closed (mainly for Dells...) */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_OFF,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel off after lid close: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-         /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */
-         gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */
- 
--        /* perform policy action */
--        if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor")
--            || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) {
--                g_debug ("lid is closed; suspending or hibernating");
--                suspend_with_lid_closed (manager);
--        } else {
--                g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active");
--                setup_lid_close_safety_timer (manager);
--        }
-+        restart_inhibit_lid_switch_timer (manager);
- }
- 
--
- static void
- up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
- {
-@@ -2343,6 +2331,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager)
-         if (manager->priv->lid_is_closed == tmp)
-                 return;
-         manager->priv->lid_is_closed = tmp;
-+        g_debug ("up changed: lid is now %s", tmp ? "closed" : "open");
- 
-         /* fake a keypress */
-         if (tmp)
-@@ -3294,30 +3283,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
- }
- 
- static void
--sleep_cb_screensaver_proxy_ready_cb (GObject *source_object,
--                            GAsyncResult *res,
--                            gpointer user_data)
--{
--        GError *error = NULL;
--        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
--
--        manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
--        if (manager->priv->screensaver_proxy == NULL) {
--                g_warning ("Could not connect to gnome-screensaver: %s",
--                           error->message);
--                g_error_free (error);
--                return;
--        }
--
--        /* Finish the upower_notify_sleep_cb() call by locking the screen */
--        g_debug ("gnome-screensaver activated, doing gnome-screensaver lock");
--        g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                           "Lock",
--                           NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                           NULL, NULL, NULL);
--}
--
--static void
- idle_dbus_signal_cb (GDBusProxy *proxy,
-                      const gchar *sender_name,
-                      const gchar *signal_name,
-@@ -3469,75 +3434,38 @@ out:
- }
- 
- static void
--lock_screensaver (GsdPowerManager *manager)
-+lock_screensaver (GsdPowerManager *manager,
-+                  GSourceFunc      done_cb)
- {
-         gboolean do_lock;
- 
-         do_lock = g_settings_get_boolean (manager->priv->settings_screensaver,
-                                           "lock-enabled");
--        if (!do_lock)
-+        if (!do_lock && done_cb) {
-+                done_cb (manager);
-                 return;
--
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_debug ("doing gnome-screensaver lock");
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "Lock",
--                                   NULL, G_DBUS_CALL_FLAGS_NONE, -1,
--                                   NULL, NULL, NULL);
--        } else {
--                /* connect to the screensaver first */
--                g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
--                                          G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
--                                          NULL,
--                                          GS_DBUS_NAME,
--                                          GS_DBUS_PATH,
--                                          GS_DBUS_INTERFACE,
--                                          NULL,
--                                          sleep_cb_screensaver_proxy_ready_cb,
--                                          manager);
-         }
--}
--
--static void
--upower_notify_sleep_cb (UpClient *client,
--                        UpSleepKind sleep_kind,
--                        GsdPowerManager *manager)
--{
--        lock_screensaver (manager);
--}
--
--static void
--upower_notify_resume_cb (UpClient *client,
--                         UpSleepKind sleep_kind,
--                         GsdPowerManager *manager)
--{
--        gboolean ret;
--        GError *error = NULL;
--
--        /* this displays the unlock dialogue so the user doesn't have
--         * to move the mouse or press any key before the window comes up */
--        if (manager->priv->screensaver_proxy != NULL) {
--                g_dbus_proxy_call (manager->priv->screensaver_proxy,
--                                   "SimulateUserActivity",
--                                   NULL,
--                                   G_DBUS_CALL_FLAGS_NONE,
--                                   -1, NULL, NULL, NULL);
--        }
--
--        /* close existing notifications on resume, the system power
--         * state is probably different now */
--        notify_close_if_showing (manager->priv->notification_low);
--        notify_close_if_showing (manager->priv->notification_discharging);
- 
--        /* ensure we turn the panel back on after resume */
--        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
--                                             GNOME_RR_DPMS_ON,
--                                             &error);
--        if (!ret) {
--                g_warning ("failed to turn the panel on after resume: %s",
--                           error->message);
--                g_error_free (error);
--        }
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "Lock",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* Wait until gnome-shell shield animation is done
-+         *
-+         * FIXME: the shell should mark the lock as active
-+         * when the shield is down, then we could wait for
-+         * that. This would also fix the problem that we wait
-+         * needlessly when the shell has already locked the
-+         * screen because it is initiating the suspend.
-+         *
-+         * https://bugzilla.gnome.org/show_bug.cgi?id=685053
-+         */
-+        g_timeout_add (500, done_cb, manager);
- }
- 
- static void
-@@ -3696,6 +3624,287 @@ disable_builtin_screensaver (gpointer unused)
-         return TRUE;
- }
- 
-+static void
-+inhibit_lid_switch_done (GObject      *source,
-+                         GAsyncResult *result,
-+                         gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit lid switch: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+static void
-+inhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        GVariant *params;
-+
-+        if (manager->priv->inhibit_lid_switch_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding lid switch system inhibitor");
-+        manager->priv->inhibit_lid_switch_taken = TRUE;
-+
-+        params = g_variant_new ("(ssss)",
-+                                "handle-lid-switch",
-+                                g_get_user_name (),
-+                                "Multiple displays attached",
-+                                "block");
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             params,
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_lid_switch_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_lid_switch (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_lid_switch_fd == -1) {
-+                g_debug ("no lid-switch inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing lid switch system inhibitor");
-+        close (manager->priv->inhibit_lid_switch_fd);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_lid_switch_taken = FALSE;
-+}
-+
-+static void
-+inhibit_suspend_done (GObject      *source,
-+                      GAsyncResult *result,
-+                      gpointer      user_data)
-+{
-+        GDBusProxy *proxy = G_DBUS_PROXY (source);
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        GError *error = NULL;
-+        GVariant *res;
-+        GUnixFDList *fd_list = NULL;
-+        gint idx;
-+
-+        res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error);
-+        if (res == NULL) {
-+                g_warning ("Unable to inhibit suspend: %s", error->message);
-+                g_error_free (error);
-+        } else {
-+                g_variant_get (res, "(h)", &idx);
-+                manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error);
-+                if (manager->priv->inhibit_suspend_fd == -1) {
-+                        g_warning ("Failed to receive system inhibitor fd: %s", error->message);
-+                        g_error_free (error);
-+                }
-+                g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd);
-+                g_object_unref (fd_list);
-+                g_variant_unref (res);
-+        }
-+}
-+
-+/* We take a delay inhibitor here, which causes logind to send a
-+ * PrepareToSleep signal, which gives us a chance to lock the screen
-+ * and do some other preparations.
-+ */
-+static void
-+inhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_taken) {
-+                g_debug ("already inhibited lid-switch");
-+                return;
-+        }
-+        g_debug ("Adding suspend delay inhibitor");
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+        g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy,
-+                                             "Inhibit",
-+                                             g_variant_new ("(ssss)",
-+                                                            "sleep",
-+                                                            g_get_user_name (),
-+                                                            "GNOME needs to lock the screen",
-+                                                            "delay"),
-+                                             0,
-+                                             G_MAXINT,
-+                                             NULL,
-+                                             NULL,
-+                                             inhibit_suspend_done,
-+                                             manager);
-+}
-+
-+static void
-+uninhibit_suspend (GsdPowerManager *manager)
-+{
-+        if (manager->priv->inhibit_suspend_fd == -1) {
-+                g_debug ("no suspend delay inhibitor");
-+                return;
-+        }
-+        g_debug ("Removing suspend delay inhibitor");
-+        close (manager->priv->inhibit_suspend_fd);
-+        manager->priv->inhibit_suspend_fd = -1;
-+        manager->priv->inhibit_suspend_taken = TRUE;
-+}
-+
-+static gboolean
-+randr_output_is_on (GnomeRROutput *output)
-+{
-+	GnomeRRCrtc *crtc;
-+
-+	crtc = gnome_rr_output_get_crtc (output);
-+	if (!crtc)
-+		return FALSE;
-+	return gnome_rr_crtc_get_current_mode (crtc) != NULL;
-+}
-+
-+static gboolean
-+external_monitor_is_connected (GnomeRRScreen *screen)
-+{
-+        GnomeRROutput **outputs;
-+        guint i;
-+
-+        if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS))
-+                return TRUE;
-+
-+        /* see if we have more than one screen plugged in */
-+        outputs = gnome_rr_screen_list_outputs (screen);
-+        for (i = 0; outputs[i] != NULL; i++) {
-+                if (randr_output_is_on (outputs[i]) &&
-+                    !gnome_rr_output_is_laptop (outputs[i]))
-+                        return TRUE;
-+        }
-+
-+        return FALSE;
-+}
-+
-+static void
-+on_randr_event (GnomeRRScreen *screen, gpointer user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+
-+        /* when a second monitor is plugged in, we take the
-+         * handle-lid-switch inhibitor lock of logind to prevent
-+         * it from suspending.
-+         *
-+         * Uninhibiting is done in the inhibit_lid_switch_timer,
-+         * since we want to give users a few seconds when unplugging
-+         * and replugging an external monitor, not suspend right away.
-+         */
-+        if (external_monitor_is_connected (screen) &&
-+            !g_settings_get_boolean (manager->priv->settings,
-+                                     "lid-close-suspend-with-external-monitor")) {
-+                inhibit_lid_switch (manager);
-+                setup_inhibit_lid_switch_timer (manager);
-+        }
-+        else {
-+                restart_inhibit_lid_switch_timer (manager);
-+        }
-+}
-+
-+static gboolean
-+screen_lock_done_cb (gpointer data)
-+{
-+        GsdPowerManager *manager = data;
-+
-+        /* lift the delay inhibit, so logind can proceed */
-+        uninhibit_suspend (manager);
-+
-+        return FALSE;
-+}
-+
-+static void
-+handle_suspend_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        lock_screensaver (manager, screen_lock_done_cb);
-+}
-+
-+static void
-+handle_resume_actions (GsdPowerManager *manager)
-+{
-+        gboolean ret;
-+        GError *error = NULL;
-+
-+        /* this displays the unlock dialogue so the user doesn't have
-+         * to move the mouse or press any key before the window comes up */
-+        g_dbus_connection_call (manager->priv->connection,
-+                                GS_DBUS_NAME,
-+                                GS_DBUS_PATH,
-+                                GS_DBUS_INTERFACE,
-+                                "SimulateUserActivity",
-+                                NULL, NULL,
-+                                G_DBUS_CALL_FLAGS_NONE, -1,
-+                                NULL, NULL, NULL);
-+
-+        /* close existing notifications on resume, the system power
-+         * state is probably different now */
-+        notify_close_if_showing (manager->priv->notification_low);
-+        notify_close_if_showing (manager->priv->notification_discharging);
-+
-+        /* ensure we turn the panel back on after resume */
-+        ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-+                                             GNOME_RR_DPMS_ON,
-+                                             &error);
-+        if (!ret) {
-+                g_warning ("failed to turn the panel on after resume: %s",
-+                           error->message);
-+                g_error_free (error);
-+        }
-+
-+        /* set up the delay again */
-+        inhibit_suspend (manager);
-+}
-+
-+static void
-+logind_proxy_signal_cb (GDBusProxy  *proxy,
-+                        const gchar *sender_name,
-+                        const gchar *signal_name,
-+                        GVariant    *parameters,
-+                        gpointer     user_data)
-+{
-+        GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
-+        gboolean is_about_to_suspend;
-+
-+        if (g_strcmp0 (signal_name, "PrepareForSleep") != 0)
-+                return;
-+        g_variant_get (parameters, "(b)", &is_about_to_suspend);
-+        if (is_about_to_suspend) {
-+                handle_suspend_actions (manager);
-+        } else {
-+                handle_resume_actions (manager);
-+        }
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3705,6 +3914,25 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         g_debug ("Starting power manager");
-         gnome_settings_profile_start (NULL);
- 
-+        manager->priv->logind_proxy =
-+                g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-+                                               0,
-+                                               NULL,
-+                                               SYSTEMD_DBUS_NAME,
-+                                               SYSTEMD_DBUS_PATH,
-+                                               SYSTEMD_DBUS_INTERFACE,
-+                                               NULL,
-+                                               error);
-+        if (manager->priv->logind_proxy == NULL) {
-+                g_warning ("no systemd support");
-+                return FALSE;
-+        }
-+        g_signal_connect (manager->priv->logind_proxy, "g-signal",
-+                          G_CALLBACK (logind_proxy_signal_cb),
-+                          manager);
-+        /* Set up a delay inhibitor to be informed about suspend attempts */
-+        inhibit_suspend (manager);
-+
-         /* track the active session */
-         manager->priv->session = gnome_settings_session_new ();
-         g_signal_connect (manager->priv->session, "notify::state",
-@@ -3719,10 +3947,6 @@ gsd_power_manager_start (GsdPowerManager *manager,
-                           G_CALLBACK (engine_settings_key_changed_cb), manager);
-         manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver");
-         manager->priv->up_client = up_client_new ();
--        g_signal_connect (manager->priv->up_client, "notify-sleep",
--                          G_CALLBACK (upower_notify_sleep_cb), manager);
--        g_signal_connect (manager->priv->up_client, "notify-resume",
--                          G_CALLBACK (upower_notify_resume_cb), manager);
-         manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client);
-         g_signal_connect (manager->priv->up_client, "device-added",
-                           G_CALLBACK (engine_device_added_cb), manager);
-@@ -3836,6 +4060,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error);
-         if (manager->priv->x11_screen == NULL)
-                 return FALSE;
-+        g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager);
-+        /* set up initial state */
-+        on_randr_event (manager->priv->x11_screen, manager);
- 
-         /* ensure the default dpms timeouts are cleared */
-         ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen,
-@@ -3865,6 +4092,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- {
-         g_debug ("Stopping power manager");
- 
-+        if (manager->priv->inhibit_lid_switch_timer_id != 0) {
-+                g_source_remove (manager->priv->inhibit_lid_switch_timer_id);
-+                manager->priv->inhibit_lid_switch_timer_id = 0;
-+        }
-+
-         if (manager->priv->bus_cancellable != NULL) {
-                 g_cancellable_cancel (manager->priv->bus_cancellable);
-                 g_object_unref (manager->priv->bus_cancellable);
-@@ -3876,8 +4108,6 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-                 manager->priv->introspection_data = NULL;
-         }
- 
--        kill_lid_close_safety_timer (manager);
--
-         g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager);
- 
-         g_clear_object (&manager->priv->connection);
-@@ -3885,6 +4115,19 @@ gsd_power_manager_stop (GsdPowerManager *manager)
-         g_clear_object (&manager->priv->settings);
-         g_clear_object (&manager->priv->settings_screensaver);
-         g_clear_object (&manager->priv->up_client);
-+
-+        if (manager->priv->inhibit_lid_switch_fd != -1) {
-+                close (manager->priv->inhibit_lid_switch_fd);
-+                manager->priv->inhibit_lid_switch_fd = -1;
-+                manager->priv->inhibit_lid_switch_taken = FALSE;
-+        }
-+        if (manager->priv->inhibit_suspend_fd != -1) {
-+                close (manager->priv->inhibit_suspend_fd);
-+                manager->priv->inhibit_suspend_fd = -1;
-+                manager->priv->inhibit_suspend_taken = FALSE;
-+        }
-+
-+        g_clear_object (&manager->priv->logind_proxy);
-         g_clear_object (&manager->priv->x11_screen);
- 
-         g_ptr_array_unref (manager->priv->devices_array);
-@@ -3918,6 +4161,8 @@ static void
- gsd_power_manager_init (GsdPowerManager *manager)
- {
-         manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager);
-+        manager->priv->inhibit_lid_switch_fd = -1;
-+        manager->priv->inhibit_suspend_fd = -1;
- }
- 
- static void
--- 
-1.7.12.2
-
diff --git a/testing/gnome-settings-daemon/PKGBUILD b/testing/gnome-settings-daemon/PKGBUILD
deleted file mode 100644
index 4e972454a..000000000
--- a/testing/gnome-settings-daemon/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 169291 2012-10-18 21:41:48Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-settings-daemon
-pkgver=3.6.1
-pkgrel=2
-pkgdesc="The GNOME Settings daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
-         'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus')
-makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
-options=('!emptydirs' '!libtool')
-install=gnome-settings-daemon.install
-url="http://www.gnome.org"
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        screensaver.patch
-        0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch)
-sha256sums=('1fe96e0709d7c618d90cc1bfcddc46eede3c2cdb305f5e7f4cb388d43dd5526a'
-            'd2c32fa0262e4d0e97fc07fb631ad2627b4f2ae273e2cb3028236d9725711880'
-            'f23db348593f58da755889928d7fa75817479d9ad5be67cc7a2f8cbc5db23632')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Disable X's built-in screensaver
-  patch -Np1 -i ../screensaver.patch
-
-  # logind key handling FS#31801, patch from Fedora
-  # rebased onto screensaver.patch
-  patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
-  aclocal
-  automake
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \
-      --enable-systemd
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=656231
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # Plugins that aren't installed still have schema references
-  # and cause gsettings errors - remove the references we're not using
-  sed -i '/org\.gnome\.settings-daemon\.plugins\.updates/d' \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml"
-}
diff --git a/testing/gnome-settings-daemon/gnome-settings-daemon.install b/testing/gnome-settings-daemon/gnome-settings-daemon.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/testing/gnome-settings-daemon/gnome-settings-daemon.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnome-settings-daemon/screensaver.patch b/testing/gnome-settings-daemon/screensaver.patch
deleted file mode 100644
index bbcfe3430..000000000
--- a/testing/gnome-settings-daemon/screensaver.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001
-From: Rui Matos <tiagomatos@gmail.com>
-Date: Wed, 17 Oct 2012 22:44:54 +0000
-Subject: power: Add a watchdog to keep X's builtin screen saver disabled
-
-X's builtin screen saver may activate DPMS. Since we want to activate
-DPMS ourselves according to our own policy we must make sure that X's
-screen saver remains disabled.
-
-This code is a copy of the original found in gs-watcher-x11.c from
-gnome-screensaver which stopped being used in GNOME 3.6.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686339
----
-diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
-index 0e06495..070cf32 100644
---- a/plugins/power/gsd-power-manager.c
-+++ b/plugins/power/gsd-power-manager.c
-@@ -27,6 +27,7 @@
- #include <stdio.h>
- #include <sys/wait.h>
- #include <glib/gi18n.h>
-+#include <gdk/gdkx.h>
- #include <gtk/gtk.h>
- #include <libupower-glib/upower.h>
- #include <libnotify/notify.h>
-@@ -80,6 +81,8 @@
- /* Keep this in sync with gnome-shell */
- #define SCREENSAVER_FADE_TIME                           10 /* seconds */
- 
-+#define XSCREENSAVER_WATCHDOG_TIMEOUT                   120 /* seconds */
-+
- enum {
-         GSD_POWER_IDLETIME_NULL_ID,
-         GSD_POWER_IDLETIME_DIM_ID,
-@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate
-         GsdPowerIdleMode         current_idle_mode;
-         guint                    lid_close_safety_timer_id;
-         GtkStatusIcon           *status_icon;
-+        guint                    xscreensaver_watchdog_timer_id;
- };
- 
- enum {
-@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session,
-         idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL);
- }
- 
-+/* This timer goes off every few minutes, whether the user is idle or not,
-+   to try and clean up anything that has gone wrong.
-+
-+   It calls disable_builtin_screensaver() so that if xset has been used,
-+   or some other program (like xlock) has messed with the XSetScreenSaver()
-+   settings, they will be set back to sensible values (if a server extension
-+   is in use, messing with xlock can cause the screensaver to never get a wakeup
-+   event, and could cause monitor power-saving to occur, and all manner of
-+   heinousness.)
-+
-+   This code was originally part of gnome-screensaver, see
-+   http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530
-+ */
-+static gboolean
-+disable_builtin_screensaver (gpointer unused)
-+{
-+        int current_server_timeout, current_server_interval;
-+        int current_prefer_blank,   current_allow_exp;
-+        int desired_server_timeout, desired_server_interval;
-+        int desired_prefer_blank,   desired_allow_exp;
-+
-+        XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                         &current_server_timeout,
-+                         &current_server_interval,
-+                         &current_prefer_blank,
-+                         &current_allow_exp);
-+
-+        desired_server_timeout  = current_server_timeout;
-+        desired_server_interval = current_server_interval;
-+        desired_prefer_blank    = current_prefer_blank;
-+        desired_allow_exp       = current_allow_exp;
-+
-+        desired_server_interval = 0;
-+
-+        /* I suspect (but am not sure) that DontAllowExposures might have
-+           something to do with powering off the monitor as well, at least
-+           on some systems that don't support XDPMS?  Who know... */
-+        desired_allow_exp = AllowExposures;
-+
-+        /* When we're not using an extension, set the server-side timeout to 0,
-+           so that the server never gets involved with screen blanking, and we
-+           do it all ourselves.  (However, when we *are* using an extension,
-+           we tell the server when to notify us, and rather than blanking the
-+           screen, the server will send us an X event telling us to blank.)
-+        */
-+        desired_server_timeout = 0;
-+
-+        if (desired_server_timeout     != current_server_timeout
-+            || desired_server_interval != current_server_interval
-+            || desired_prefer_blank    != current_prefer_blank
-+            || desired_allow_exp       != current_allow_exp) {
-+
-+                g_debug ("disabling server builtin screensaver:"
-+                         " (xset s %d %d; xset s %s; xset s %s)",
-+                         desired_server_timeout,
-+                         desired_server_interval,
-+                         (desired_prefer_blank ? "blank" : "noblank"),
-+                         (desired_allow_exp ? "expose" : "noexpose"));
-+
-+                XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-+                                 desired_server_timeout,
-+                                 desired_server_interval,
-+                                 desired_prefer_blank,
-+                                 desired_allow_exp);
-+
-+                XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE);
-+        }
-+
-+        return TRUE;
-+}
-+
- gboolean
- gsd_power_manager_start (GsdPowerManager *manager,
-                          GError **error)
-@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager,
-         /* set the initial dim time that can adapt for the user */
-         refresh_idle_dim_settings (manager);
- 
-+        manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT,
-+                                                                               disable_builtin_screensaver,
-+                                                                               NULL);
-         gnome_settings_profile_end (NULL);
-         return TRUE;
- }
-@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager)
- 
-         g_clear_object (&manager->priv->idletime);
-         g_clear_object (&manager->priv->status_icon);
-+
-+        if (manager->priv->xscreensaver_watchdog_timer_id > 0) {
-+                g_source_remove (manager->priv->xscreensaver_watchdog_timer_id);
-+                manager->priv->xscreensaver_watchdog_timer_id = 0;
-+        }
- }
- 
- static void
---
-cgit v0.9.0.2
diff --git a/testing/gnome-shell/PKGBUILD b/testing/gnome-shell/PKGBUILD
deleted file mode 100644
index 9ad311911..000000000
--- a/testing/gnome-shell/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169215 2012-10-18 19:26:02Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Flamelab <panosfilip@gmail.com
-
-pkgname=gnome-shell
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="The next generation GNOME Shell"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/GnomeShell"
-license=('GPL2')
-depends=('caribou' 'folks' 'gcr' 'gjs' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' 'libcroco' 'libpulse' 'mutter' 'nautilus' 'networkmanager' 'telepathy-logger' 'telepathy-mission-control' 'unzip')
-makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('network-manager-applet: shell integration for networkmanager')
-options=('!libtool' '!emptydirs')
-install=gnome-shell.install
-groups=(gnome)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('566a9d902f85a89c23dc29f1789f859aa2c5a0de7dffa5235bf5a1885c76a3a7')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-shell \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-shell/gnome-shell.install b/testing/gnome-shell/gnome-shell.install
deleted file mode 100644
index 27d70b19d..000000000
--- a/testing/gnome-shell/gnome-shell.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=gnome-shell
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-system-log/PKGBUILD b/testing/gnome-system-log/PKGBUILD
deleted file mode 100644
index 2b4a08ea1..000000000
--- a/testing/gnome-system-log/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169214 2012-10-18 19:25:56Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gnome-system-log
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="View your system logs"
-arch=(i686 x86_64)
-url="http://gnome.org"
-license=('GPL2')
-depends=('dconf' 'gtk3')
-makedepends=('intltool' 'itstool' 'docbook-xsl')
-groups=('gnome-extra')
-install=$pkgname.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('46dea7cb8c63c26578bd0c854aa9143e86b094bc676564400bf4c57fc259369a')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-    --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-system-log/gnome-system-log.install b/testing/gnome-system-log/gnome-system-log.install
deleted file mode 100644
index 847019792..000000000
--- a/testing/gnome-system-log/gnome-system-log.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-system-monitor/PKGBUILD b/testing/gnome-system-monitor/PKGBUILD
deleted file mode 100644
index 345898ac4..000000000
--- a/testing/gnome-system-monitor/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169213 2012-10-18 19:25:52Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-system-monitor
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A system monitor for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd')
-makedepends=('itstool' 'docbook-xsl' 'intltool')
-options=(!emptydirs)
-url="http://www.gnome.org"
-groups=('gnome-extra')
-install=gnome-system-monitor.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gnome-system-monitor/gnome-system-monitor.install b/testing/gnome-system-monitor/gnome-system-monitor.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/testing/gnome-system-monitor/gnome-system-monitor.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/gnome-terminal/PKGBUILD b/testing/gnome-terminal/PKGBUILD
deleted file mode 100644
index a7cb7d13f..000000000
--- a/testing/gnome-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169212 2012-10-18 19:25:48Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnome-terminal
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="The GNOME Terminal Emulator"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm')
-makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl')
-options=('!emptydirs')
-url="http://www.gnome.org"
-groups=('gnome')
-install=gnome-terminal.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5ee068ca7f4d0e410aabbddee3937559138163d84c00e5bef1e9050beb7409cd')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-scrollkeeper
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  install -m755 -d "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" --domain gnome-terminal "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnome-terminal/gnome-terminal.install b/testing/gnome-terminal/gnome-terminal.install
deleted file mode 100644
index 1d8510f06..000000000
--- a/testing/gnome-terminal/gnome-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=gnome-terminal
-
-post_install() {
-  gconfpkg --install $pkgname
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  gconfpkg --uninstall $pkgname
-}
diff --git a/testing/gnome-themes-standard/PKGBUILD b/testing/gnome-themes-standard/PKGBUILD
deleted file mode 100644
index 92a3bb730..000000000
--- a/testing/gnome-themes-standard/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169211 2012-10-18 19:25:43Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=gnome-themes-standard
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="Default themes for the GNOME desktop"
-arch=('i686' 'x86_64')
-url="http://www.gnome.org"
-license=('GPL2')
-depends=('cantarell-fonts' 'ttf-dejavu' 'gtk3' 'gtk-engines' 'librsvg')
-makedepends=('intltool')
-groups=('gnome')
-replaces=('gnome-themes')
-conflicts=('gnome-themes')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('f56dd1f593b0a853041b54f9167aab0cb3689ced9cd8f8f4d777c3116bb4878a')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/gnome-user-share/PKGBUILD b/testing/gnome-user-share/PKGBUILD
deleted file mode 100644
index d5dca3241..000000000
--- a/testing/gnome-user-share/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169208 2012-10-18 19:25:32Z jgc $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=gnome-user-share
-pkgver=3.0.4
-pkgrel=1
-pkgdesc="Easy to use user-level file sharing for GNOME."
-arch=('i686' 'x86_64')
-url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
-license=('GPL')
-depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
-makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl')
-options=('!emptydirs' '!libtool')
-install=gnome-user-share.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/gnome-user-share \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gnome-user-share/gnome-user-share.install b/testing/gnome-user-share/gnome-user-share.install
deleted file mode 100644
index f7e8c46ac..000000000
--- a/testing/gnome-user-share/gnome-user-share.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gnucash/PKGBUILD b/testing/gnucash/PKGBUILD
deleted file mode 100644
index 23745c948..000000000
--- a/testing/gnucash/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165082 2012-08-10 05:02:38Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Mark Schneider <queueRAM@gmail.com>
-
-pkgname=gnucash
-pkgver=2.4.11
-pkgrel=1
-pkgdesc="A personal and small-business financial-accounting application"
-arch=('i686' 'x86_64')
-url="http://www.gnucash.org"
-license=("GPL")
-depends=('gtkhtml' 'slib' 'goffice' 'libgnomeui' 'libdbi-drivers' 'aqbanking' 'desktop-file-utils')
-makedepends=('intltool')
-optdepends=('evince: for print preview'
-            'perl-finance-quote: for stock information lookups'
-            'perl-date-manip: for stock information lookups')
-options=('!libtool' '!makeflags' '!emptydirs')
-install=gnucash.install
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c157ad7ea0960c71966f5071acd9018580ece538')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc \
-    --libexecdir=/usr/lib --disable-schemas-install --enable-ofx --enable-aqbanking
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-  cd src/doc/design
-  make DESTDIR="${pkgdir}" install-info
-
-  install -dm755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnucash "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
-}
diff --git a/testing/gnucash/gnucash.install b/testing/gnucash/gnucash.install
deleted file mode 100644
index d6a48c31b..000000000
--- a/testing/gnucash/gnucash.install
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=gnucash
-info_dir=usr/share/info
-info_files=(gnucash-design.info)
-
-post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-pre_upgrade() {
-  pre_remove $1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/testing/gnutls/PKGBUILD b/testing/gnutls/PKGBUILD
deleted file mode 100644
index e6517853f..000000000
--- a/testing/gnutls/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 165411 2012-08-18 10:15:13Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gnutls
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('i686' 'x86_64')
-license=('GPL3' 'LGPL')
-url="http://www.gnu.org/software/gnutls/"
-install=gnutls.install
-options=('!libtool' '!zipman')
-depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
-makedepends=('valgrind' 'strace')
-source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('db88d8fc44e44be4a0a14b24aa204bbf'
-         'c3fa5f3bda5ebe7f37cc997717bb8476')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-	--with-zlib \
-	--disable-static \
-	--disable-guile \
-	--disable-valgrind-tests
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -k check # passes all  || /bin/true
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  # lots of .png files are put into infodir and are gzipped by makepkg! this may need to be fixed by using !zipman
-  # gzip -9 all files in infodir and manpages manually
-  find "$pkgdir/usr/share/info" -name '*.info*' -exec gzip -9 {} \;
-  find "$pkgdir/usr/share/man" -exec gzip -9 {} \;
-}
diff --git a/testing/gnutls/gnutls.install b/testing/gnutls/gnutls.install
deleted file mode 100644
index e8c8e1798..000000000
--- a/testing/gnutls/gnutls.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.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/gobject-introspection/PKGBUILD b/testing/gobject-introspection/PKGBUILD
deleted file mode 100644
index f994ade98..000000000
--- a/testing/gobject-introspection/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169206 2012-10-18 19:25:25Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gobject-introspection
-pkgver=1.34.1.1
-pkgrel=1
-pkgdesc="Introspection system for GObject-based libraries"
-url="https://live.gnome.org/GObjectIntrospection"
-arch=('x86_64' 'i686')
-license=('LGPL' 'GPL')
-depends=('glib2' 'python2')
-makedepends=('cairo')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('85b9ac268d34311138f3c6bf646c07975eebfae6ae67d9239e1066a42c5d525b')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  sed -i '1s|#!/usr/bin/env python$|&2|' \
-    "$pkgdir"/usr/lib/gobject-introspection/giscanner/*.py
-}
diff --git a/testing/gpm/PKGBUILD b/testing/gpm/PKGBUILD
deleted file mode 100644
index 3293e1ccc..000000000
--- a/testing/gpm/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 163459 2012-07-12 01:32:54Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpm
-pkgver=1.20.6
-pkgrel=10
-pkgdesc="A mouse server for the console and xterm"
-arch=('i686' 'x86_64')
-url="http://www.nico.schottelius.org/software/gpm/"
-license=('GPL')
-depends=('ncurses' 'bash')
-backup=('etc/conf.d/gpm')
-options=('!makeflags')
-install=gpm.install
-source=(http://www.nico.schottelius.org/software/gpm/archives/${pkgname}-${pkgver}.tar.lzma \
-        gpm gpm.conf.d gpm.sh gpm.service)
-sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c'
-          '19e1feb1493373512a77801699df012d186336ea'
-          '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86'
-          '88fe5ff10916c68a87abc8418a56eb0073f69fa9'
-          '20b92360f0ad38a2032fcae37bdbd01b31e43f77')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m755 ../gpm "${pkgdir}/etc/rc.d/gpm"
-  install -D -m644 ../gpm.conf.d "${pkgdir}/etc/conf.d/gpm"
-  install -D -m755 ../gpm.sh "${pkgdir}/etc/profile.d/gpm.sh"
-  install -D -m644 ../gpm.service "${pkgdir}/usr/lib/systemd/system/gpm.service"
-
-# library fixes
-  cd "${pkgdir}/usr/lib/"
-  ln -s libgpm.so.2.* libgpm.so
-  chmod 755 "${pkgdir}"/usr/lib/libgpm.so.*
-}
diff --git a/testing/gpm/gpm b/testing/gpm/gpm
deleted file mode 100755
index 7b5213dd7..000000000
--- a/testing/gpm/gpm
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-GPM_ARGS=
-[ -f /etc/conf.d/gpm ] && . /etc/conf.d/gpm
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/sbin/gpm)
-case "$1" in
-  start)
-    stat_busy "Starting GPM Daemon"
-    [ -z "$PID" ] && /usr/sbin/gpm ${GPM_ARGS}
-    PID=$(pidof -o %PPID /usr/sbin/gpm)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      add_daemon gpm
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping GPM Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon gpm
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/gpm/gpm.conf.d b/testing/gpm/gpm.conf.d
deleted file mode 100644
index ab43bb7eb..000000000
--- a/testing/gpm/gpm.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to gpm
-#
-GPM_ARGS="-m /dev/input/mice -t imps2"
diff --git a/testing/gpm/gpm.install b/testing/gpm/gpm.install
deleted file mode 100644
index 2a1519a6c..000000000
--- a/testing/gpm/gpm.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=/usr/share/info
-file=gpm.info.gz
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info $infodir/$file $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-}
diff --git a/testing/gpm/gpm.service b/testing/gpm/gpm.service
deleted file mode 100644
index 59e837d80..000000000
--- a/testing/gpm/gpm.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Virtual console mouse server
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/gpm/gpm.sh b/testing/gpm/gpm.sh
deleted file mode 100755
index af35a5f33..000000000
--- a/testing/gpm/gpm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-case $( /usr/bin/tty ) in
-    /dev/tty[0-9]*) [ -n "$(pgrep gpm)" ] && /usr/bin/disable-paste ;;
-esac
diff --git a/testing/gpsd/PKGBUILD b/testing/gpsd/PKGBUILD
deleted file mode 100644
index ba06a45e9..000000000
--- a/testing/gpsd/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 161928 2012-06-16 17:14:39Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Giacomo Rizzo <alt@free-os.it>
-
-pkgname=gpsd
-pkgver=3.6
-pkgrel=1
-pkgdesc="GPS daemon and library to support USB/serial GPS devices"
-arch=('i686' 'x86_64')
-url="http://catb.org/gpsd/"
-license=('BSD')
-depends=('python2' 'libusb' 'bluez' 'desktop-file-utils')
-optdepends=('php: generate a PHP status page for your GPS'
-            'php-gd: image support for the PHP status page'
-            'pygtk: GUI frontends')
-makedepends=('scons' 'docbook-xsl' 'chrpath')
-backup=('etc/conf.d/gpsd')
-options=('!libtool')
-install="${pkgname}.install"
-source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        'gpsd' 'gpsd.conf.d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # fix python 2.7 path
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py')
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' gegps \
-    gpscat gpsfake gpsprof xgps xgpsspeed
-
-  scons prefix=/usr \
-    systemd=yes \
-    libQgpsmm=no \
-    PYTHONPATH=/usr/bin/python2
-  scons build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # Fix man pages path (FS#21715)
-  sed -i 's|.so gps.1|.so man1/gps.1|' cgps.1 lcdgps.1 xgps.1 xgpsspeed.1
-
-  export DESTDIR="${pkgdir}"
-  scons install
-
-  install -D -m644 "${srcdir}/gpsd.conf.d" "${pkgdir}/etc/conf.d/gpsd"
-
-  sed -i 's|/lib/udev/gpsd|/usr/lib/udev/gpsd|' gpsd.rules
-
-  install -D -m644 "gpsd.rules" "${pkgdir}/usr/lib/udev/rules.d/99-gpsd-usb.rules"
-
-  sed -i 's|/etc/default/gpsd|/etc/conf.d/gpsd|' gpsd.hotplug
-  install -D -m755 gpsd.hotplug "${pkgdir}/usr/lib/udev/gpsd.hotplug"
-
-  # GPSD needs RPATH
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/libgps{,d}.so.20.0.0
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/bin/{gpsdecode,gpsctl,gpspipe,gpxlogger,lcdgps}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/sbin/{gpsd,gpsdctl}
-  chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/python2.7/site-packages/gps/{clienthelpers,packet}.so
-
-  install -D -m644 packaging/X11/xgps.desktop \
-    "${pkgdir}/usr/share/applications/xgps.desktop"
-  install -D -m644 packaging/X11/xgpsspeed.desktop \
-    "${pkgdir}/usr/share/applications/xgpsspeed.desktop"
-  install -D -m644 packaging/X11/gpsd-logo.png \
-    "${pkgdir}/usr/share/gpsd/gpsd-logo.png"
-
-  install -D -m755 "${srcdir}/gpsd" "${pkgdir}/etc/rc.d/gpsd"
-
-  install -D -m644 systemd/gpsd.service "${pkgdir}/usr/lib/systemd/system/gpsd.service"
-  install -D -m644 systemd/gpsd.socket "${pkgdir}/usr/lib/systemd/system/gpsd.socket"
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-md5sums=('064a5ad75593f8c3ea3fe85010647832'
-         '6473da46f6bad52d38f88670f84cd92b'
-         '6602d04bb037bc500424f00f24f58837'
-         '3e963df3f9f7ef3572ecc648ae829315')
diff --git a/testing/gpsd/gpsd b/testing/gpsd/gpsd
deleted file mode 100755
index 2ca7efe26..000000000
--- a/testing/gpsd/gpsd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-[ -f /etc/conf.d/gpsd ] && . /etc/conf.d/gpsd
-
-NAME=gpsd
-DAEMON=/usr/sbin/gpsd
-PIDFILE=/run/gpsd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-
-case "$1" in
-   start)
-	stat_busy "Starting gpsd"
-	[ -z "$PID" ] && "$DAEMON" -P $PIDFILE -F /run/gpsd.sock ${GPSD_OPTIONS} ${DEVICES}
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		add_daemon $NAME
-		stat_done
-	fi
-   ;;
-   stop)
-	stat_busy "Stopping $NAME"
-	[ ! -z "$PID" ]  && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-	    rm -f $PIDFILE &>/dev/null
-	    rm_daemon $NAME
-	    stat_done
-	fi
-   ;;
-
-   restart)
-	$0 stop
-	sleep 2
-	$0 start
-   ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/gpsd/gpsd.conf.d b/testing/gpsd/gpsd.conf.d
deleted file mode 100644
index 9fef72cb9..000000000
--- a/testing/gpsd/gpsd.conf.d
+++ /dev/null
@@ -1,5 +0,0 @@
-# Default settings for gpsd.
-START_DAEMON="true"
-GPSD_OPTIONS=""
-DEVICES=""
-USBAUTO="true"
diff --git a/testing/gpsd/gpsd.install b/testing/gpsd/gpsd.install
deleted file mode 100644
index 8f20cf484..000000000
--- a/testing/gpsd/gpsd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    update-desktop-database -q
-}
-
-post_remove() {
-    update-desktop-database -q
-}
diff --git a/testing/grep/PKGBUILD b/testing/grep/PKGBUILD
deleted file mode 100644
index 1bcec6a13..000000000
--- a/testing/grep/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165463 2012-08-20 11:35:50Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=grep
-pkgver=2.14
-pkgrel=1
-pkgdesc="A string search utility"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="http://www.gnu.org/software/grep/grep.html"
-groups=('base')
-depends=('glibc' 'pcre' 'sh')
-makedepends=('texinfo')
-install=${pkgname}.install
-source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('d4a3f03849d1e17ce56ab76aa5a24cab'
-         'b94fdcaa058b47a9a25099c26cd2e4c3')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --without-included-regex
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/grep/grep-2.11-exclude-dir-crash.patch b/testing/grep/grep-2.11-exclude-dir-crash.patch
deleted file mode 100644
index 6b1731768..000000000
--- a/testing/grep/grep-2.11-exclude-dir-crash.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 12c957f786b12a4dd116f9c40a715d671d17fa16 Mon Sep 17 00:00:00 2001
-From: Allan McRae <allan@archlinux.org>
-Date: Mon, 12 Mar 2012 09:28:01 +0100
-Subject: [PATCH] grep: fix segfault with -r --exclude-dir and no file operand
-
-* src/main.c (grepdir): Don't invoke excluded_file_name on NULL.
-* NEWS (Bug fixes): Mention it.
----
- NEWS       |    5 +++++
- src/main.c |    2 +-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index d0a63d5..d4d70f5 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,11 @@ GNU grep NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Bug fixes
-+
-+   grep no longer segfaults with -r --exclude-dir and no file operand.
-+   I.e., ":|grep -r --exclude-dir=D PAT" would segfault.
-+
- 
- * Noteworthy changes in release 2.11 (2012-03-02) [stable]
- 
-diff --git a/src/main.c b/src/main.c
-index 2f6c761..f4f1235 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -1361,7 +1361,7 @@ grepdir (char const *dir, struct stats const *stats)
-   struct stats const *ancestor;
-   char *name_space;
-   int status = 1;
--  if (excluded_directory_patterns
-+  if (dir && excluded_directory_patterns
-       && excluded_file_name (excluded_directory_patterns, dir))
-     return 1;
- 
--- 
-1.7.9.3
-
diff --git a/testing/grep/grep.install b/testing/grep/grep.install
deleted file mode 100644
index 885238ac3..000000000
--- a/testing/grep/grep.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-file=grep.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/grilo-plugins/PKGBUILD b/testing/grilo-plugins/PKGBUILD
deleted file mode 100644
index 140b89001..000000000
--- a/testing/grilo-plugins/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169204 2012-10-18 19:25:16Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=grilo-plugins
-pkgver=0.2.2
-pkgrel=1
-pkgdesc="Plugins for Grilo"
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('grilo' 'sqlite' 'libgcrypt')
-makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing
-             json-glib)
-optdepends=('gupnp-av: uPnP plugin'
-            'libgdata: Youtube plugin'
-            'libquvi: Youtube plugin'
-            'sqlite: Podcasts plugin'
-            'gmime: Podcasts plugin'
-            'rest: Blip.tv plugin'
-            'libtracker-sparql: Tracker plugin'
-            'totem-plparser: Optical media plugin'
-            'libdmapsharing: DMAP sharing plugin'
-            'json-glib: TMDb plugin')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('54e65b734917df74ba5e53d92a3b2e69edd669625820fd0353c22e9b0f61e90d')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/grilo/PKGBUILD b/testing/grilo/PKGBUILD
deleted file mode 100644
index 61e5eb7fd..000000000
--- a/testing/grilo/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169205 2012-10-18 19:25:21Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=grilo
-pkgver=0.2.2
-pkgrel=1
-pkgdesc="Framework that provides access to various sources of multimedia content"
-url="http://www.gnome.org"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk3' 'libxml2' 'libsoup')
-makedepends=('gobject-introspection' 'gtk-doc' 'vala')
-optdepends=('grilo-plugins: Plugins for grilo')
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('e98d86e9c26dc444f43782e68f44a90da47f69da8a4ac313da9a3795fb72271f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static --disable-debug
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gssdp/PKGBUILD b/testing/gssdp/PKGBUILD
deleted file mode 100644
index b9adf6345..000000000
--- a/testing/gssdp/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169202 2012-10-18 19:25:09Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gssdp
-pkgver=0.12.2.1
-pkgrel=1
-pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP"
-arch=('i686' 'x86_64')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('libsoup')
-makedepends=('gobject-introspection' 'gtk2' 'gtk-doc')
-optdepends=('gtk2: gssdp-device-sniffer')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gst-libav/PKGBUILD b/testing/gst-libav/PKGBUILD
deleted file mode 100644
index 9d07843ed..000000000
--- a/testing/gst-libav/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169201 2012-10-18 19:25:04Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-libav
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="Gstreamer libav Plugin"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('gst-plugins-base-libs' 'bzip2')
-makedepends=('yasm')
-options=(!libtool !emptydirs)
-provides=("gst-ffmpeg=$pkgver-pkgrel")
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('7c998468ffa57b5d1c2c76d6857dbc0c4ed87fd207ef71bf96aeaada6a1cfa89')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \
-    --with-package-name="GStreamer libav Plugin (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gst-plugins-bad/PKGBUILD b/testing/gst-plugins-bad/PKGBUILD
deleted file mode 100644
index 1326152c6..000000000
--- a/testing/gst-plugins-bad/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-bad
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Bad Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'faac' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus')
-makedepends=('gstreamer' 'schroedinger' 'gtk3' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e3cffcd258c4c722c880a52ebc9920d6b38aa4153bbc49d1b5a9893885d45f3')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Bad Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
-    --with-gtk=3.0
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gst-plugins-base/PKGBUILD b/testing/gst-plugins-base/PKGBUILD
deleted file mode 100644
index 27c9ccd41..000000000
--- a/testing/gst-plugins-base/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 153256 2012-03-12 15:48:30Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gst-plugins-base
-pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Base Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection')
-options=(!libtool !emptydirs)
-url="http://gstreamer.freedesktop.org/"
-source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('75466452e4267fff86e322bc52ed0c962c6c3785f802230fe898cb09984b8de0')
-
-build() {
-  cd $pkgbase-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Base Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
-}
-
-check() {
-  cd $pkgbase-$pkgver
-  # Testsuite fails on one test. Some refcount leak
-  #make check
-}
-
-package_gst-plugins-base-libs() {
-  pkgdesc="GStreamer Multimedia Framework Base Plugin libraries"
-  depends=('gstreamer' 'orc' 'libxv')
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gst-plugins-base() {
-  depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango')
-
-  cd $pkgbase-$pkgver
-  make -C gst-libs DESTDIR="${pkgdir}" install
-  make -C ext DESTDIR="${pkgdir}" install
-  make -C gst-libs DESTDIR="${pkgdir}" uninstall
-}
diff --git a/testing/gst-plugins-good/PKGBUILD b/testing/gst-plugins-good/PKGBUILD
deleted file mode 100644
index 8ae52cc53..000000000
--- a/testing/gst-plugins-good/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 153258 2012-03-12 16:05:19Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-good
-pkgver=1.0.1
-pkgrel=2
-pkgdesc="GStreamer Multimedia Framework Good Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils')
-makedepends=('gstreamer' 'speex' 'flac' 'libraw1394')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('30bc72d77d274289844e2138ca79c840')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Good Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gst-plugins-ugly/PKGBUILD b/testing/gst-plugins-ugly/PKGBUILD
deleted file mode 100644
index b585e6aaf..000000000
--- a/testing/gst-plugins-ugly/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169196 2012-10-18 19:24:44Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gst-plugins-ugly
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-options=(!libtool !emptydirs)
-source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('378952a36e553f65fc1fcbcb0cc445304337e2e75503fb6b5f0ca2c05405e4f0')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '/AC_PATH_XTRA/d' configure.ac
-  autoreconf
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gstreamer/PKGBUILD b/testing/gstreamer/PKGBUILD
deleted file mode 100644
index 474424f8a..000000000
--- a/testing/gstreamer/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 153251 2012-03-12 14:53:13Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=gstreamer
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="GStreamer Multimedia Framework"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gstreamer.freedesktop.org/"
-depends=('libxml2' 'glib2')
-optdepends=('sh: feedback script')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
-options=('!libtool')
-source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('e0e5478bc81caa7e208b0863419bb98b2fbef281a7c806bea61bd70db8c9d3dc')
-
-build() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
-    --with-package-name="GStreamer (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/" \
-    --enable-gtk-doc --disable-static
-  make
-}
-
-check() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/gstreamer-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gstreamer0.10-ugly/PKGBUILD b/testing/gstreamer0.10-ugly/PKGBUILD
deleted file mode 100644
index fd4ee2dec..000000000
--- a/testing/gstreamer0.10-ugly/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 163077 2012-07-06 16:17:18Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gstreamer0.10-ugly
-pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
-pkgver=0.10.19
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-url="http://gstreamer.freedesktop.org/"
-options=(!libtool)
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz
-        opencore-amr.patch)
-md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c'
-         'd8feb6c99bfaff8be6b2c48ea4e98e47')
-
-build() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  patch -Np0 -i "${srcdir}/opencore-amr.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static --enable-experimental \
-    --with-package-name="GStreamer Ugly Plugins (Archlinux)" \
-    --with-package-origin="http://www.archlinux.org/"
-  make
-  sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile
-}
-
-check() {
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make check
-}
-
-package_gstreamer0.10-ugly() {
-  pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
-  depends=('gstreamer0.10-base>=0.10.34')
-  
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_gstreamer0.10-ugly-plugins() {
-  pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly)"
-  depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr')
-  groups=('gstreamer0.10-plugins')
-  replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-  conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec')
-
-  cd "${srcdir}/gst-plugins-ugly-${pkgver}"
-  make -C ext DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gstreamer0.10-ugly/opencore-amr.patch b/testing/gstreamer0.10-ugly/opencore-amr.patch
deleted file mode 100644
index 0a350dc46..000000000
--- a/testing/gstreamer0.10-ugly/opencore-amr.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- ext/amrnb/amrnbdec.h.orig	2012-03-12 16:49:14.417405139 +0000
-+++ ext/amrnb/amrnbdec.h	2012-03-12 16:49:35.393899419 +0000
-@@ -22,7 +22,7 @@
- 
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
--#include <interf_dec.h>
-+#include <opencore-amrnb/interf_dec.h>
- 
- G_BEGIN_DECLS
- 
---- ext/amrnb/amrnbenc.h.orig	2012-03-12 16:49:23.833996062 +0000
-+++ ext/amrnb/amrnbenc.h	2012-03-12 16:49:46.597141876 +0000
-@@ -21,7 +21,7 @@
- #define __GST_AMRNBENC_H__
- 
- #include <gst/gst.h>
--#include <interf_enc.h>
-+#include <opencore-amrnb/interf_enc.h>
- #include <gst/audio/gstaudioencoder.h>
- 
- G_BEGIN_DECLS
---- ext/amrwbdec/amrwbdec.h.orig	2012-03-12 16:47:48.658100992 +0000
-+++ ext/amrwbdec/amrwbdec.h	2012-03-12 16:48:12.177910733 +0000
-@@ -22,8 +22,8 @@
- 
- #include <gst/gst.h>
- #include <gst/audio/gstaudiodecoder.h>
--#include <dec_if.h>
--#include <if_rom.h>
-+#include <opencore-amrwb/dec_if.h>
-+#include <opencore-amrwb/if_rom.h>
- 
- G_BEGIN_DECLS
- 
diff --git a/testing/gthumb/PKGBUILD b/testing/gthumb/PKGBUILD
deleted file mode 100644
index f35ef8f19..000000000
--- a/testing/gthumb/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 169530 2012-10-23 07:37:59Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=gthumb
-pkgver=3.1.2
-pkgrel=1
-pkgdesc="Image browser and viewer for the GNOME Desktop"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://live.gnome.org/gthumb"
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk'
-         'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp')
-makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome'
-             'brasero' 'librsvg' 'libopenraw' 'liboauth')
-optdepends=('libopenraw: read RAW files'
-            'exiv2: metadata support'
-            'libchamplain: map viewer'
-            'brasero: burn discs'
-            'libsoup-gnome: web albums'
-            'liboauth: web albums')
-options=('!libtool' '!emptydirs')
-install=gthumb.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5e7f80b3ffa8a6e06b9f1bf0cfa869f772af4163b842a7f457c9dc68ff7e6f8f')
-
-build() {
-  cd $pkgname-$pkgver
-  
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-libchamplain --enable-libopenraw
-  
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gthumb/gthumb.install b/testing/gthumb/gthumb.install
deleted file mode 100644
index 9d4e7822f..000000000
--- a/testing/gthumb/gthumb.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.1) < 0 )); then
-    gconfpkg --uninstall gthumb
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gtk2/PKGBUILD b/testing/gtk2/PKGBUILD
deleted file mode 100644
index 611780d9b..000000000
--- a/testing/gtk2/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 163760 2012-07-19 08:21:49Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gtk2
-pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.11
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
-             'shared-mime-info' 'cairo' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
-options=('!libtool')
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
-        xid-collision-debug.patch)
-sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
-
-build() {
-    cd "$srcdir/gtk+-$pkgver"
-    patch -Np1 -i "$srcdir/xid-collision-debug.patch"
-
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --with-xinput=yes
-
-    # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-    make
-}
-
-package_gtk2() {
-    pkgdesc="GTK+ is a multi-platform toolkit (v2)"
-    install=gtk2.install
-    depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
-    backup=(etc/gtk-2.0/gtkrc)
-    replaces=('gtk2-docs')
-
-    cd "$srcdir/gtk+-$pkgver"
-
-    make DESTDIR="$pkgdir" install
-    sed -i "s#env python#env python2#" $pkgdir/usr/bin/gtk-builder-convert
-    echo 'gtk-fallback-icon-theme = "gnome"' > "$pkgdir/etc/gtk-2.0/gtkrc"
-    #split this out to use with gtk3 too
-    rm $pkgdir/usr/bin/gtk-update-icon-cache
-}
-package_gtk-update-icon-cache() {
-    pkgdesc="The GTK+ update icon cache tool"
-    depends=('gdk-pixbuf2>=2.24.1-3')
-
-    cd "$srcdir/gtk+-$pkgver/gtk"
-
-    install -D -m755 gtk-update-icon-cache $pkgdir/usr/bin/gtk-update-icon-cache
-}
diff --git a/testing/gtk2/gtk2.install b/testing/gtk2/gtk2.install
deleted file mode 100644
index a988c645b..000000000
--- a/testing/gtk2/gtk2.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
-}
-
-pre_upgrade() {
-  pre_remove
-}
-
-post_upgrade() {
-  post_install
-}
-
-pre_remove() {
-  rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null
-  rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null
-}
diff --git a/testing/gtk2/xid-collision-debug.patch b/testing/gtk2/xid-collision-debug.patch
deleted file mode 100644
index d61238c3b..000000000
--- a/testing/gtk2/xid-collision-debug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gtk+-2.18.3/gdk/x11/gdkxid.c	2009-06-19 04:59:18.000000000 +0200
-+++ gtk+-2.18.3/gdk/x11/gdkxid.c.new	2009-07-22 11:30:12.000000000 +0200
-@@ -56,10 +56,10 @@
-   if (!display_x11->xid_ht)
-     display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash,
- 					    (GEqualFunc) gdk_xid_equal);
--
-+/*
-   if (g_hash_table_lookup (display_x11->xid_ht, xid))
-     g_warning ("XID collision, trouble ahead");
--
-+*/
-   g_hash_table_insert (display_x11->xid_ht, xid, data);
- }
- 
diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD
deleted file mode 100644
index 16e10043b..000000000
--- a/testing/gtk3/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 169194 2012-10-18 19:24:35Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord' 'at-spi2-atk')
-makedepends=('gobject-introspection')
-options=('!libtool')
-backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
-        settings.ini wacom.patch)
-sha256sums=('fe6c89ae40145b077d7291105e81d4f876be01bf21ddfb9cba449f6be49d7996'
-            'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-            '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5')
-build() {
-    cd "gtk+-$pkgver"
-
-    # Partially revert BGO#673440 in order to fix BGO#674157
-    patch -Np1 -i ../wacom.patch
-
-    CXX=/bin/false ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --enable-gtk2-dependency \
-        --disable-schemas-compile
-    #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-    sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-    make
-}
-
-package() {
-    cd "gtk+-$pkgver"
-    make DESTDIR="$pkgdir" install
-
-    install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
-}
diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install
deleted file mode 100644
index ca20d2865..000000000
--- a/testing/gtk3/gtk3.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    /usr/bin/gtk-query-immodules-3.0 --update-cache
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-
-post_remove() {
-    /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini
deleted file mode 100644
index 039000d38..000000000
--- a/testing/gtk3/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
diff --git a/testing/gtk3/wacom.patch b/testing/gtk3/wacom.patch
deleted file mode 100644
index 79ad84fc6..000000000
--- a/testing/gtk3/wacom.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c
---- gtk+-3.4.2/gdk/x11/gdkdevicemanager-xi2.c	2012-05-02 14:45:04.000000000 +0200
-+++ gtk+-3.4.2-wacom/gdk/x11/gdkdevicemanager-xi2.c	2012-05-03 18:34:18.034807644 +0200
-@@ -331,6 +331,8 @@
-         input_source = GDK_SOURCE_ERASER;
-       else if (strstr (tmp_name, "cursor"))
-         input_source = GDK_SOURCE_CURSOR;
-+      else if (strstr (tmp_name, "finger"))
-+        input_source = GDK_SOURCE_TOUCHSCREEN;
-       else if (strstr (tmp_name, "wacom") ||
-                strstr (tmp_name, "pen"))
-         input_source = GDK_SOURCE_PEN;
diff --git a/testing/gtkglext/PKGBUILD b/testing/gtkglext/PKGBUILD
deleted file mode 100644
index c0f1b1005..000000000
--- a/testing/gtkglext/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 169440 2012-10-21 08:31:13Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=gtkglext
-pkgver=1.2.0
-pkgrel=9
-pkgdesc="opengl extensions for gtk2"
-arch=('i686' 'x86_64')
-url="http://gtkglext.sourceforge.net/"
-license=('LGPL')
-depends=('gtk2' 'glu' 'libxmu' 'pangox-compat')
-makedepends=('mesa')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
-	'gtk2.20.patch')
-md5sums=('ed7ba24ce06a8630c07f2d0ee5f04ab4'
-         'e5a87ec3f2d0e616c6f32f90c3f7237f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/gtk2.20.patch"
-  sed '/AC_PATH_XTRA/d' -i configure.in
-
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-              --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkglext/gtk2.20.patch b/testing/gtkglext/gtk2.20.patch
deleted file mode 100644
index 54b34c11e..000000000
--- a/testing/gtkglext/gtk2.20.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -Nur gtkglext-1.2.0.orig/gtk/gtkglwidget.c gtkglext-1.2.0/gtk/gtkglwidget.c
---- gtkglext-1.2.0.orig/gtk/gtkglwidget.c	2004-02-20 11:38:36.000000000 +0200
-+++ gtkglext-1.2.0/gtk/gtkglwidget.c	2010-04-20 19:29:42.941917275 +0300
-@@ -127,7 +127,7 @@
-    * Synchronize OpenGL and window resizing request streams.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget) && private->is_realized)
-+  if (gtk_widget_get_realized (widget) && private->is_realized)
-     {
-       gldrawable = gdk_window_get_gl_drawable (widget->window);
-       gdk_gl_drawable_wait_gdk (gldrawable);
-@@ -154,7 +154,7 @@
-    * Remove OpenGL-capability from widget->window.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget))
-+  if (gtk_widget_get_realized (widget))
-     gdk_window_unset_gl_capability (widget->window);
- 
-   private->is_realized = FALSE;
-@@ -174,7 +174,7 @@
-    */
- 
-   toplevel = gtk_widget_get_toplevel (widget);
--  if (GTK_WIDGET_TOPLEVEL (toplevel) && !GTK_WIDGET_REALIZED (toplevel))
-+  if (gtk_widget_is_toplevel (toplevel) && !gtk_widget_get_realized (toplevel))
-     {
-       GTK_GL_NOTE (MISC,
-         g_message (" - Install colormap to the top-level window."));
-@@ -194,7 +194,7 @@
-    * Set a background of "None" on window to avoid AIX X server crash.
-    */
- 
--  if (GTK_WIDGET_REALIZED (widget))
-+  if (gtk_widget_get_realized (widget))
-     {
-       GTK_GL_NOTE (MISC,
-         g_message (" - window->bg_pixmap = %p",
-@@ -250,8 +250,8 @@
-   GTK_GL_NOTE_FUNC ();
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
--  g_return_val_if_fail (!GTK_WIDGET_NO_WINDOW (widget), FALSE);
--  g_return_val_if_fail (!GTK_WIDGET_REALIZED (widget), FALSE);
-+  g_return_val_if_fail (gtk_widget_get_has_window (widget), FALSE);
-+  g_return_val_if_fail (!gtk_widget_get_realized (widget), FALSE);
-   g_return_val_if_fail (GDK_IS_GL_CONFIG (glconfig), FALSE);
- 
-   /* 
-@@ -432,7 +432,7 @@
-   GTK_GL_NOTE_FUNC ();
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   gldrawable = gdk_window_get_gl_drawable (widget->window);
-   if (gldrawable == NULL)
-@@ -474,7 +474,7 @@
-   GLWidgetPrivate *private;
- 
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   private = g_object_get_qdata (G_OBJECT (widget), quark_gl_private);
-   if (private == NULL)
-@@ -501,7 +501,7 @@
- gtk_widget_get_gl_window (GtkWidget *widget)
- {
-   g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
--  g_return_val_if_fail (GTK_WIDGET_REALIZED (widget), NULL);
-+  g_return_val_if_fail (gtk_widget_get_realized (widget), NULL);
- 
-   return gdk_window_get_gl_window (widget->window);
- }
diff --git a/testing/gtkglextmm/PKGBUILD b/testing/gtkglextmm/PKGBUILD
deleted file mode 100644
index e3a098e14..000000000
--- a/testing/gtkglextmm/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 168486 2012-10-12 17:14:06Z andyrtr $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com>
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-
-pkgname=gtkglextmm
-pkgver=1.2.0
-pkgrel=9
-pkgdesc="Cpp C++ bindings for gtkglext"
-arch=('i686' 'x86_64')
-url="http://gtkglext.sourceforge.net/"
-depends=('gtkmm' 'gtkglext')
-makedepends=('mesa')
-options=('!libtool')
-license=('GPL')
-source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
-        'gdkspanfunc.patch')
-md5sums=('27c05f4d45c5fd07b6fb0f044add3056'
-         'd7c8ea33c748a6857ee629c16b2d9bff')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # FS#24706
-  patch -Np1 -i "${srcdir}/gdkspanfunc.patch"
-
-  # automake 1.8 fix
-  sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4
-
-  ./configure --prefix=/usr \
-              --disable-gtkglext-test \
-              --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkglextmm/gdkspanfunc.patch b/testing/gtkglextmm/gdkspanfunc.patch
deleted file mode 100644
index ae5672a8c..000000000
--- a/testing/gtkglextmm/gdkspanfunc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/gtkglext/gtkmm/gl/widget.cc	2004-05-18 03:01:50.000000000 -0300
-+++ b/gtkglext/gtkmm/gl/widget.cc	2011-06-12 17:57:13.075541070 -0300
-@@ -17,9 +17,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gtk/gtkglwidget.h>
--
- #include "widget.h"
-+#include <gtk/gtkglwidget.h>
- 
- namespace Gtk
- {
diff --git a/testing/gtkhtml4/PKGBUILD b/testing/gtkhtml4/PKGBUILD
deleted file mode 100644
index 53ca6a982..000000000
--- a/testing/gtkhtml4/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169193 2012-10-18 19:24:30Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtkhtml4
-_pkgbasename=gtkhtml
-pkgver=4.6.0
-pkgrel=1
-pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('gtk3' 'enchant' 'iso-codes' 'gnome-icon-theme' 'libsoup')
-makedepends=('intltool')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('129023d83d5e53f22c7b103ed8668204f78c23837955905315dc95b48618c29e')
-
-build() {
-    cd "$_pkgbasename-$pkgver"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gtkhtml4 \
-        --localstatedir=/var --disable-static
-    make
-}
-
-package() {
-    cd "$_pkgbasename-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gtkmm3/PKGBUILD b/testing/gtkmm3/PKGBUILD
deleted file mode 100644
index b49d4d70a..000000000
--- a/testing/gtkmm3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169504 2012-10-22 14:39:10Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=gtkmm3
-_pkgbasename=gtkmm
-pkgname=('gtkmm3' 'gtkmm3-docs')
-pkgver=3.6.0
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-url="http://www.gtkmm.org/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package_gtkmm3() {
-  pkgdesc="C++ bindings for gtk3"
-  depends=('gtk3' 'pangomm' 'atkmm')
-  cd "$_pkgbasename-$pkgver"
-
-  sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
-
-  make DESTDIR="$pkgdir" install
-}
-
-package_gtkmm3-docs() {
-  pkgdesc="Developer documentation for gtkmm v3"
-
-  cd "$_pkgbasename-$pkgver"
-  make -C docs DESTDIR="$pkgdir" install
-}
diff --git a/testing/gtkpod/PKGBUILD b/testing/gtkpod/PKGBUILD
deleted file mode 100644
index 2317110ed..000000000
--- a/testing/gtkpod/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 164294 2012-07-29 23:15:49Z tomegun $
-# Contributor: Kevin Piche <kevin@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=gtkpod
-pkgver=2.1.2
-pkgrel=2
-pkgdesc="A platform independent GUI for Apple's iPod using GTK3"
-arch=('i686' 'x86_64')
-url="http://gtkpod.sourceforge.net"
-license=('GPL')
-depends=('anjuta' 'curl' 'flac' 'libid3tag' 'libgpod' 'awk')
-makedepends=('flex' 'intltool' 'libvorbis' 'faad2')
-optdepends=('libmp4v2: MP4/h264 support'
-            'vorbis-tools: OGG support'
-	    'libvorbis: OGG support'
-            'id3v2: mp3 conversion support'
-            'faad2: m4a conversion support')
-install=gtkpod.install
-options=('!libtool')
-source=("http://downloads.sourceforge.net/gtkpod/${pkgname}-${pkgver}.tar.gz")
-md5sums=('88fef3f947cbb7ae6b714080733a3b6b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's#python#python2#' scripts/sync-palm-jppy.py
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gtkpod/gtkpod.install b/testing/gtkpod/gtkpod.install
deleted file mode 100644
index c5d357a38..000000000
--- a/testing/gtkpod/gtkpod.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/gtksourceview3/PKGBUILD b/testing/gtksourceview3/PKGBUILD
deleted file mode 100644
index b8ab610b1..000000000
--- a/testing/gtksourceview3/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169191 2012-10-18 19:24:22Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtksourceview3
-_pkgbasename=gtksourceview
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A text widget adding syntax highlighting and more to GNOME"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gtk3' 'libxml2')
-makedepends=('intltool' 'gobject-introspection' 'glade')
-options=('!libtool')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('7d268618fbe8c2960300a305d38255294c9f497fcbc0e53a1da1bf9bda0d1c7a')
-
-build() {
-  cd "$_pkgbasename-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-glade-catalog
-  make
-}
-
-package() {
-  cd "$_pkgbasename-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gucharmap/PKGBUILD b/testing/gucharmap/PKGBUILD
deleted file mode 100644
index b83e71eea..000000000
--- a/testing/gucharmap/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169190 2012-10-18 19:24:18Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan De Groot <jgc@archlinux.org>
-
-pkgname=gucharmap
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Gnome Unicode Charmap"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org"
-depends=('dconf' 'gtk3' 'hicolor-icon-theme')
-makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl')
-options=('!libtool' '!emptydirs')
-install=gucharmap.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('778bbc61bedcb6c573800ccebc56d360d988a156727b5a8f8bac9787c1fe7fb4')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile  --enable-introspection
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gucharmap/gucharmap.install b/testing/gucharmap/gucharmap.install
deleted file mode 100644
index 0a9ddf4c2..000000000
--- a/testing/gucharmap/gucharmap.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  (( $(vercmp $2 3.3) < 0 )) && gconfpkg --uninstall gucharmap
-  return 0
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/gupnp/PKGBUILD b/testing/gupnp/PKGBUILD
deleted file mode 100644
index ea140a171..000000000
--- a/testing/gupnp/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169189 2012-10-18 19:24:14Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gupnp
-pkgver=0.18.4
-pkgrel=1
-pkgdesc="An object-oriented UPNP framework"
-arch=('i686' 'x86_64')
-url="http://gupnp.org/"
-license=('LGPL')
-depends=('gssdp' 'util-linux')
-makedepends=('gobject-introspection' 'gtk-doc')
-optdepends=('python2: gupnp-binding-tool')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i '1s|^#!.*python$|&2|' tools/gupnp-binding-tool
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-              --disable-static --with-context-manager=linux
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/gutenprint/PKGBUILD b/testing/gutenprint/PKGBUILD
deleted file mode 100644
index 3924bec62..000000000
--- a/testing/gutenprint/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 161638 2012-06-12 18:43:43Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=gutenprint
-pkgver=5.2.8
-pkgrel=1
-pkgdesc="Top quality printer drivers for POSIX systems"
-arch=('i686' 'x86_64')
-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
-makedepends=('gimp>=2.6.11' 'gtk2>=2.24.4' 'cups>=1.4.6' 'foomatic-db-engine' 'ghostscript>=9.02')
-optdepends=('cups:		to use cups printer spooler(recommended)'
-            'foomatic-db-engine:	to use foomatic spooler'
-            'ghostscript:	adds postscript support for ijsgutenprint'
-            'gimp:		adds gutenprint plugin to gimp')
-source=(http://downloads.sourceforge.net/gimp-print/$pkgname-$pkgver.tar.bz2)
-url="http://gimp-print.sourceforge.net/"
-replaces=('gimp-print')
-options=('!libtool' '!emptydirs')
-md5sums=(5ed64c0f994245852da8e9fa6a137060'')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --enable-samples \
-	--enable-cups-ppds \
-	--enable-cups-ppds-at-top-level \
-	--disable-translated-cups-ppds \
-	--disable-globalized-cups-ppds \
-	--disable-static \
-	--disable-static-genppd
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-
diff --git a/testing/gutenprint/gutenprint.install b/testing/gutenprint/gutenprint.install
deleted file mode 100644
index 05e8bec38..000000000
--- a/testing/gutenprint/gutenprint.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
- echo ">>please run /usr/sbin/cups-genppdupdate"
- echo ">>and restart cups deamon"
-}
-
-post_upgrade() {
-   post_install
-}
-
diff --git a/testing/gvfs/PKGBUILD b/testing/gvfs/PKGBUILD
deleted file mode 100644
index 98cc2c4f6..000000000
--- a/testing/gvfs/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 169188 2012-10-18 19:24:11Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.14.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)   
-sha256sums=('71ab8cf60070025d1aff9bee1f514fdb45682ffad01b6856cabab1bc3791bfb4')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gvfs \
-      --with-bash-completion-dir=/usr/share/bash-completion/completions
-  make
-}
-
-package_gvfs() {
-  pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
-  depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio' 'libsoup-gnome' 'udisks2' 'libsecret')
-  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'
-              'gtk3: Recent files support')
-  install=gvfs.install
-
-  cd "$pkgbase-$pkgver"
-  sed -e 's/^am__append_4/#am__append_4/' \
-      -e 's/^am__append_5/#am__append_5/' \
-      -i monitor/Makefile
-  make DESTDIR="$pkgdir" install
-
-  cd "$pkgdir"
-  rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
-  rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
-  rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
-  rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
-  pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
-  depends=("gvfs=$pkgver" 'smbclient')
-  install=gvfs-smb.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  install -m755 .libs/gvfsd-smb{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 smb{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-
-  install -Dm644 org.gnome.system.smb.gschema.xml \
-    "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
-  install -Dm644 gvfs-smb.convert \
-    "$pkgdir/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
-  pkgdesc="AFC (mobile devices) backend for gvfs"
-  depends=("gvfs=$pkgver" 'libimobiledevice')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-afc "$pkgdir/usr/lib/gvfs/gvfsd-afc"
-  install -Dm644 afc.mount "$pkgdir/usr/share/gvfs/mounts/afc.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/afc"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-gphoto2() {
-  pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-core' 'libgphoto2' 'udev')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-gphoto2 "$pkgdir/usr/lib/gvfs/gvfsd-gphoto2"
-  install -Dm644 gphoto2.mount "$pkgdir/usr/share/gvfs/mounts/gphoto2.mount"
-
-  cd "$srcdir/$pkgbase-$pkgver/monitor/gphoto2"
-  make DESTDIR="$pkgdir" install
-}
-
-package_gvfs-obexftp() {
-  pkgdesc="ObexFTP (bluetooth) backend for gvfs"
-  depends=("gvfs=$pkgver" 'dbus-glib' 'bluez' 'obex-data-server')
-  install=gvfs-module.install
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -D .libs/gvfsd-obexftp "$pkgdir/usr/lib/gvfs/gvfsd-obexftp"
-  install -Dm644 obexftp.mount "$pkgdir/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
-  pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
-  depends=("gvfs=$pkgver")
-  install=gvfs-module.install
-  install -m755 -d "$pkgdir/usr/lib/gvfs"
-  install -m755 -d "$pkgdir/usr/share/gvfs/mounts"
-
-  cd "$pkgbase-$pkgver/daemon"
-  install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/"
-  install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/"
-}
diff --git a/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 da6a2ab6d..000000000
--- a/testing/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/gvfs/gvfs.install b/testing/gvfs/gvfs.install
deleted file mode 100644
index 3482d99e3..000000000
--- a/testing/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  gio-querymodules /usr/lib/gio/modules
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/gzip/PKGBUILD b/testing/gzip/PKGBUILD
deleted file mode 100644
index d92cbdeef..000000000
--- a/testing/gzip/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 161985 2012-06-17 23:21:13Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=gzip
-pkgver=1.5
-pkgrel=1
-pkgdesc="GNU compression utility"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/gzip/"
-license=('GPL3')
-groups=('base')
-depends=('glibc' 'bash')
-install=gzip.install
-source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig})
-md5sums=('2a431e169b6f62f7332ef6d47cc53bae'
-         '2de95937a3f65137acf9c55d4ad0447a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix=${pkgdir}/usr install
-}
diff --git a/testing/gzip/gzip.install b/testing/gzip/gzip.install
deleted file mode 100644
index 43218d98e..000000000
--- a/testing/gzip/gzip.install
+++ /dev/null
@@ -1,15 +0,0 @@
-infodir=usr/share/info
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  usr/bin/install-info $infodir/gzip.info.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  usr/bin/install-info --delete $infodir/gzip.info.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/harfbuzz/PKGBUILD b/testing/harfbuzz/PKGBUILD
deleted file mode 100644
index 3ceed5738..000000000
--- a/testing/harfbuzz/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=harfbuzz
-pkgver=0.9.4
-pkgrel=1
-pkgdesc="OpenType text shaping engine."
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
-license=('MIT')
-depends=('icu' 'glib2' 'freetype2')
-makedepends=('icu' 'cairo' 'glib2' 'freetype2')
-optdepends=('cairo: hb-view program')
-options=(!libtool)
-source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('2572f9a810d17a735ef565115463827d075af2371ee5b68e6d77231381f4bddc')
-
-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/harfbuzz/COPYING"
-}
diff --git a/testing/haskell-http/PKGBUILD b/testing/haskell-http/PKGBUILD
deleted file mode 100644
index 5eb7da013..000000000
--- a/testing/haskell-http/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=HTTP
-pkgname=haskell-http
-pkgver=4000.2.4
-pkgrel=1
-pkgdesc="A library for client-side HTTP"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-network=2.3.1.0-1' 'haskell-parsec=3.1.3-1' 'haskell-mtl=2.1.2-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('5edcd9fd16a9cb72a140a29442d514b7')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-http/haskell-http.install b/testing/haskell-http/haskell-http.install
deleted file mode 100644
index fdebb1cb8..000000000
--- a/testing/haskell-http/haskell-http.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-http
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-mtl/PKGBUILD b/testing/haskell-mtl/PKGBUILD
deleted file mode 100644
index f1fa7c286..000000000
--- a/testing/haskell-mtl/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=mtl
-pkgname=haskell-mtl
-pkgver=2.1.2
-pkgrel=1
-pkgdesc="Monad transformer library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-transformers=0.3.0.0-2')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
-install=${pkgname}.install
-md5sums=('943c110524d96126bfa0e61f7df1ebcd')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-mtl/haskell-mtl.install b/testing/haskell-mtl/haskell-mtl.install
deleted file mode 100644
index 9325811e8..000000000
--- a/testing/haskell-mtl/haskell-mtl.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-mtl
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-network/PKGBUILD b/testing/haskell-network/PKGBUILD
deleted file mode 100644
index 7f5d13fc1..000000000
--- a/testing/haskell-network/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package generated by cabal2arch 0.7.6
-
-_hkgname=network
-pkgname=haskell-network
-pkgver=2.3.1.0
-pkgrel=1
-pkgdesc="Networking-related facilities"
-url="http://hackage.haskell.org/package/network"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-parsec=3.1.3-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d824db8fc068cab60fa178ab330a57a2')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-network/haskell-network.install b/testing/haskell-network/haskell-network.install
deleted file mode 100644
index a56c31d0a..000000000
--- a/testing/haskell-network/haskell-network.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-network
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-parsec/PKGBUILD b/testing/haskell-parsec/PKGBUILD
deleted file mode 100644
index 9c7c1aafb..000000000
--- a/testing/haskell-parsec/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# As generated by cabal2arch 0.7.6
-
-_hkgname=parsec
-pkgname=haskell-parsec
-pkgver=3.1.3
-pkgrel=1
-pkgdesc="Monadic parser combinators"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh' 'haskell-mtl=2.1.2-1' 'haskell-text=0.11.2.3-1')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
-install=${pkgname}.install
-md5sums=('d72fc94b81153132c61125a1ec52a4a5')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-parsec/haskell-parsec.install b/testing/haskell-parsec/haskell-parsec.install
deleted file mode 100644
index dfa0701b9..000000000
--- a/testing/haskell-parsec/haskell-parsec.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-parsec
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-random/PKGBUILD b/testing/haskell-random/PKGBUILD
deleted file mode 100644
index 07cc5e2c2..000000000
--- a/testing/haskell-random/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-
-_hkgname=random
-pkgname=haskell-random
-pkgver=1.0.1.1
-pkgrel=3
-pkgdesc="A basic random number generation library"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('9a249cfa7ff6793cbf2be06e9fcd7538')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
-
diff --git a/testing/haskell-random/haskell-random.install b/testing/haskell-random/haskell-random.install
deleted file mode 100644
index b6d807e1a..000000000
--- a/testing/haskell-random/haskell-random.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-random
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-text/PKGBUILD b/testing/haskell-text/PKGBUILD
deleted file mode 100644
index 5a23030d5..000000000
--- a/testing/haskell-text/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-
-_hkgname=text
-pkgname=haskell-text
-pkgver=0.11.2.3
-pkgrel=1
-pkgdesc="An efficient packed Unicode text type."
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('7a469d49a7576fb3a18785cb64d4ee6c')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-text/haskell-text.install b/testing/haskell-text/haskell-text.install
deleted file mode 100644
index 620db3921..000000000
--- a/testing/haskell-text/haskell-text.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-text
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-transformers/PKGBUILD b/testing/haskell-transformers/PKGBUILD
deleted file mode 100644
index c946fe40a..000000000
--- a/testing/haskell-transformers/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 167887 2012-10-03 15:19:41Z tdziedzic $
-
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Rémy Oudompheng <remy@archlinux.org>
-
-_hkgname=transformers
-pkgname=haskell-transformers
-pkgver=0.3.0.0
-pkgrel=2
-pkgdesc="Concrete functor and monad transformers"
-url="http://hackage.haskell.org/package/${_hkgname}"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz")
-install=${pkgname}.install
-md5sums=('852dc0b79cc2bcb39136287d3dd385e5')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
-      --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-transformers/haskell-transformers.install b/testing/haskell-transformers/haskell-transformers.install
deleted file mode 100644
index eec2af6e1..000000000
--- a/testing/haskell-transformers/haskell-transformers.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-transformers
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/haskell-zlib/PKGBUILD b/testing/haskell-zlib/PKGBUILD
deleted file mode 100644
index 30834b3c1..000000000
--- a/testing/haskell-zlib/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
-# Package originally generated by cabal2arch 0.7.6
-
-_hkgname=zlib
-pkgname=haskell-zlib
-pkgver=0.5.3.3
-pkgrel=5
-pkgdesc="Compression and decompression in the gzip and zlib formats"
-url="http://hackage.haskell.org/package/zlib"
-license=('custom:BSD3')
-arch=('i686' 'x86_64')
-depends=('ghc=7.6.1-1' 'zlib' 'sh')
-source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-install=${pkgname}.install
-md5sums=('1649e56d13ce2c6a6a9210227401dbbc')
-
-build() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-
-    # ghc 7.6 includes bytestring 0.10
-    sed 's/bytestring == 0.9.*/bytestring == 0.10.*/' -i zlib.cabal
-
-    runhaskell Setup configure -O -p --enable-split-objs --enable-shared \
-      --prefix=/usr --docdir=/usr/share/doc/${pkgname} \
-      --libsubdir=\$compiler/site-local/\$pkgid
-    runhaskell Setup build
-    runhaskell Setup haddock
-    runhaskell Setup register   --gen-script
-    runhaskell Setup unregister --gen-script
-    sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
-}
-
-package() {
-    cd ${srcdir}/${_hkgname}-${pkgver}
-    install -D -m744 register.sh   ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
-    install    -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
-    install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries
-    ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname}
-    runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-    rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE
-}
diff --git a/testing/haskell-zlib/haskell-zlib.install b/testing/haskell-zlib/haskell-zlib.install
deleted file mode 100644
index d387b7b65..000000000
--- a/testing/haskell-zlib/haskell-zlib.install
+++ /dev/null
@@ -1,18 +0,0 @@
-HS_DIR=usr/share/haskell/haskell-zlib
-post_install() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_upgrade() {
-  ${HS_DIR}/unregister.sh
-}
-post_upgrade() {
-  ${HS_DIR}/register.sh
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
-pre_remove() {
-  ${HS_DIR}/unregister.sh
-}
-post_remove() {
-  (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index)
-}
diff --git a/testing/hdparm/PKGBUILD b/testing/hdparm/PKGBUILD
deleted file mode 100644
index 062bd6008..000000000
--- a/testing/hdparm/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 167301 2012-09-30 19:26:10Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgname=hdparm
-pkgver=9.42
-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')
-md5sums=('0af5a38b212fe08f5afbe5e37f34b40b'
-         '74e368f384166a7710b447573cda120a')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # Fix Range input/output error when wiping Intel G2 and OCZ drives
-  patch -Np1 -i $srcdir/wiper.sh.2_6.max-ranges.patch
-  
-  # build
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # install
-  mkdir -p ${pkgdir}/{usr,sbin}
-  make DESTDIR=${pkgdir} install
-  install -m755 contrib/idectl ${pkgdir}/sbin
-  install -m755 contrib/ultrabayd ${pkgdir}/sbin
-
-  install -D -m 0644 $srcdir/$pkgname-$pkgver/wiper/README.txt $pkgdir/usr/share/doc/wiper/README.txt
-  install -D -m 0755 $srcdir/$pkgname-$pkgver/wiper/wiper.sh $pkgdir/usr/sbin/wiper.sh
-
-  #install license file
-  install -D -m 644 LICENSE.TXT $pkgdir/usr/share/licenses/hdparm/LICENSE.TXT
-}
diff --git a/testing/hdparm/wiper.sh.2_6.max-ranges.patch b/testing/hdparm/wiper.sh.2_6.max-ranges.patch
deleted file mode 100644
index c55f7b149..000000000
--- a/testing/hdparm/wiper.sh.2_6.max-ranges.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- hdparm-9.28/wiper/wiper.sh.orig	2010-03-09 06:17:37.000000000 -0800
---- hdparm-9.28/wiper/wiper.sh	2010-05-15 03:08:02.182856971 -0700
-@@ -29,7 +29,7 @@
- function usage_error(){
- 	echo >&2
- 	echo "Linux tune-up (TRIM) utility for SATA SSDs"
--	echo "Usage:  $0 [--verbose] [--commit] <mount_point|block_device>" >&2
-+	echo "Usage:  $0 [--max-ranges <num>] [--verbose] [--commit] <mount_point|block_device>" >&2
- 	echo "   Eg:  $0 /dev/sda1" >&2
- 	echo >&2
- 	exit 1
-@@ -44,6 +44,7 @@
- 
- export verbose=0
- commit=""
-+max_ranges=-1
- destroy_me=""
- argc=$#
- arg=""
-@@ -51,6 +52,10 @@
- 		commit=yes
- 	elif [ "$1" = "--verbose" ]; then
- 		verbose=$((verbose + 1))
-+	elif [ "$1" = "--max-ranges" -a $argc -gt 1 ]; then
-+		max_ranges=$2
-+		argc=$((argc - 1))
-+		shift
- 	elif [ "$1" = "" ]; then
- 		usage_error
- 	else
-@@ -499,6 +550,18 @@
- 	fi
- fi
- 
-+## Different SSD's have a different maximum number of ranges they'll accept
-+## in a single TRIM command.
-+if [ $max_ranges -le 0 ] ; then
-+	model=`$HDPARM -I $rawdev | $GAWK '/Model Number/ { print $NF }'`
-+	case "$model" in
-+		SSDSA[12]*)  max_ranges=512 ;;	# Intel X18-M/X25-M
-+		OCZ-VERTEX2) max_ranges=64 ;;	# OCZ Vertex2
-+		*)           max_ranges=65535
-+	esac
-+fi
-+[ $verbose -gt 0 ] && echo "max-ranges = $max_ranges"
-+
- ## All ready.  Now let the user know exactly what we intend to do:
- ##
- mountstatus="$fstype non-mounted"
-@@ -608,7 +671,7 @@
- 		nsectors += count;
- 		while (count > 0) {
- 			this_count  = (count > 65535) ? 65535 : count
--			printf "%u:%u ", lba, this_count
-+			printf "%u:%u \n", lba, this_count
- 			if (verbose > 1)
- 				printf "%u:%u ", lba, this_count > "/dev/stderr"
- 			lba        += this_count
-@@ -695,6 +758,22 @@
- 	-v verbose="$verbose"			\
- 	-v xfs_blksects="$xfs_blksects"		\
- 	-v xfs_agoffsets="$xfs_agoffsets"	\
--	"$GAWKPROG" | $TRIM
-+	"$GAWKPROG" | (
-+		i=0
-+		while read range ; do
-+			ranges=$ranges" "$range
-+			((i++))
-+			if [ $i -ge $max_ranges ] ; then
-+				[ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"         
-+				echo $ranges | $TRIM
-+				ranges=""
-+				i=0
-+			fi
-+		done
-+		if [ $i -gt 0 ] ; then
-+			[ $verbose -gt 0 ] && echo -e "Trim ranges:"$ranges"\n"
-+ 			echo $ranges | $TRIM
-+		fi
-+	)
- 
- do_cleanup $?
-
- 	  	 
diff --git a/testing/hugin/PKGBUILD b/testing/hugin/PKGBUILD
deleted file mode 100644
index c76a7bfeb..000000000
--- a/testing/hugin/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169638 2012-10-25 01:35:06Z 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=7
-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' 'mesa')
-install=hugin.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        gcc47.patch)
-sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b'
-          'aa0fc9425bd7a4b5e270412f4ca72258fac77298')
-
-build() {
-  cd "${srcdir}"
-  patch -Np0 -i gcc47.patch
-  mkdir build
-  cd build
-  export CXXFLAGS+=" -fpermissive" 
-  cmake "${srcdir}/${pkgname}-${pkgver}" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
-    -DENABLE_LAPACK=yes
-  make
-}
-
-package(){
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/hugin/gcc47.patch b/testing/hugin/gcc47.patch
deleted file mode 100644
index 3814b871c..000000000
--- a/testing/hugin/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp
---- hugin-2011.4.0.orig/src/celeste/Utilities.cpp	2012-07-08 15:18:16.864454043 +0000
-+++ hugin-2011.4.0/src/celeste/Utilities.cpp	2012-07-08 15:18:20.341089422 +0000
-@@ -27,6 +27,7 @@
- 
- #include <math.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include "Utilities.h"
- 
- using namespace std; 
diff --git a/testing/hugin/hugin.install b/testing/hugin/hugin.install
deleted file mode 100644
index 362749233..000000000
--- a/testing/hugin/hugin.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/gnome
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null
-}
diff --git a/testing/hwloc/PKGBUILD b/testing/hwloc/PKGBUILD
deleted file mode 100644
index 79fd2f67d..000000000
--- a/testing/hwloc/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167124 2012-09-25 18:41:34Z stephane $
-# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
-# Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
-
-pkgname=hwloc
-pkgver=1.5
-pkgrel=1
-pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
-arch=('i686' 'x86_64')
-url="http://www.open-mpi.org/projects/hwloc/"
-license=('BSD')
-depends=('sh' 'pciutils' 'cairo' 'libxml2')
-makedepends=('pkg-config')
-options=('!libtool' '!docs')
-source=(http://www.open-mpi.org/software/hwloc/v1.5/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('b2e60bd40cfc6ca79dde68b19a83e8a4719d6b14')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   ./configure --prefix=/usr
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-
-   install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/ibus/PKGBUILD b/testing/ibus/PKGBUILD
deleted file mode 100644
index a0aeebf1a..000000000
--- a/testing/ibus/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 169430 2012-10-21 04:52:25Z eric $
-# Contributor: Rainy <rainylau(at)gmail(dot)com>
-# Contributor: Lee.MaRS <leemars at gmail dot com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=ibus
-pkgver=1.4.99.20121006
-pkgrel=1
-pkgdesc="Next Generation Input Bus for Linux"
-arch=('i686' 'x86_64')
-url="http://ibus.googlecode.com"
-license=('LGPL')
-makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool')
-depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject')
-options=('!libtool')
-install=ibus.install
-source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('e324382caa8dde8e4ea9c3d60a6ec5c96a313a86')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  export PYTHON=python2
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib/ibus \
-    --sysconfdir=/etc \
-    --disable-gconf \
-    --enable-dconf \
-    --disable-memconf \
-    --enable-ui
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/ibus/ibus.install b/testing/ibus/ibus.install
deleted file mode 100644
index e4e446693..000000000
--- a/testing/ibus/ibus.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-    gtk-query-immodules-3.0 --update-cache 
-
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_remove() {
-    gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules
-    gtk-query-immodules-3.0 --update-cache 
-
-    gtk-update-icon-cache -fq -t usr/share/icons/hicolor
-
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
diff --git a/testing/ilmbase/PKGBUILD b/testing/ilmbase/PKGBUILD
deleted file mode 100644
index fe1618f48..000000000
--- a/testing/ilmbase/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=ilmbase
-pkgver=1.0.3
-pkgrel=1
-depends=('gcc-libs')
-pkgdesc="Base libraries from ILM for OpenEXR"
-arch=(i686 x86_64)
-url="http://www.openexr.com"
-license=('custom')
-options=('!libtool')
-source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz 
-        ilmbase-IexMath.patch)
-md5sums=('d99962ec7e2bfac0647aaabf6b91d5de'
-         '9c8efaf15f60bccf79749ec879657962')
-
-build() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  patch -p0 -i "${srcdir}/ilmbase-IexMath.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  # one of the tests fails randomly for an unknown reason
-  make check || true
-}
-
-package() {
-  cd "${srcdir}/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
diff --git a/testing/ilmbase/ilmbase-IexMath.patch b/testing/ilmbase/ilmbase-IexMath.patch
deleted file mode 100644
index 546034966..000000000
--- a/testing/ilmbase/ilmbase-IexMath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- IexMath/IexMathFpu.cpp.orig	2012-07-26 20:51:55.000000000 +0200
-+++ IexMath/IexMathFpu.cpp	2012-10-04 15:30:47.000000000 +0200
-@@ -27,8 +27,7 @@
- #endif
- 
- 
--#ifdef HAVE_UCONTEXT_H
--
-+#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
- 
- #include <ucontext.h>
- #include <signal.h>
diff --git a/testing/imagemagick/PKGBUILD b/testing/imagemagick/PKGBUILD
deleted file mode 100644
index 985a18f01..000000000
--- a/testing/imagemagick/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 169640 2012-10-25 01:35:11Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgbase=imagemagick
-pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.0.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
-license=('custom')
-makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
-             'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
-source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
-        perlmagick.rpath.patch)
-sha1sums=('47926535dd68b38f5ae8a01e470cebf671018831'
-          '23405f80904b1de94ebd7bd6fe2a332471b8c283')
-
-build() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-
-  sed '/AC_PATH_XTRA/d' -i configure.ac
-  autoreconf --force --install
-  patch -p0 -i ../perlmagick.rpath.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \
-    --disable-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" --with-lqr --with-rsvg \
-    --without-gvc --without-djvu --without-autotrace --without-webp \
-    --without-jbig --without-fpx --without-dps --without-fftw
-  make
-}
-
-check() {
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-#  make check
-}
-
-package_imagemagick() {
-  pkgdesc="An image viewing/manipulation program"
-  depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr')
-  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/quantization-table.xml'
-          'etc/ImageMagick/thresholds.xml'
-          'etc/ImageMagick/type.xml'
-          'etc/ImageMagick/type-dejavu.xml'
-          'etc/ImageMagick/type-ghostscript.xml'
-          'etc/ImageMagick/type-windows.xml')
-  options=('!docs' 'libtool' '!emptydirs')
-
-  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)"
-
-  cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-  make DESTDIR="${pkgdir}" install-data-html
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick-doc/LICENSE"
-  install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick-doc/NOTICE"
-}
diff --git a/testing/imagemagick/perlmagick.rpath.patch b/testing/imagemagick/perlmagick.rpath.patch
deleted file mode 100644
index 958c0f2ee..000000000
--- a/testing/imagemagick/perlmagick.rpath.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	2009-05-26 16:22:11.000000000 -0300
-+++ Makefile.in	2009-05-26 16:23:27.000000000 -0300
-@@ -10067,6 +10067,7 @@
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
- 
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@	cd $(PERLMAGICK) && $(MAKE) CC='@CC@' install
diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD
deleted file mode 100644
index 583c24148..000000000
--- a/testing/inetutils/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 165845 2012-08-31 23:00:09Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=inetutils
-pkgver=1.9.1
-pkgrel=4
-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')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
-        '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 rlogin.xinetd rsh.xinetd \
-        ftpd.service dnsdomainname)
-sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
-          'ff0aad9946a38915580b094dadf67e790e8a2f87'
-          '84dc802b5e57b5e04c847572225a3b9612017155'
-          '68a590083b45997dfdb80e666b2de762f494ba74'
-          'bfad98a4a62f1fff8779f076c6019ed07f9111af'
-          '27d99b910eec0fc26bd79ccc2c1de26608330298'
-          '81f10b3b688e3952f793b35bcef63b5bf257a92b'
-          '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          'fb607dafe177f074e14891dd887ef9e9ab67a875'
-          'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
-  ./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-rcp --enable-hostname \
-    --disable-rexec --disable-rexecd \
-    --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}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
-  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}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
-  install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
-  install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service"
-}
diff --git a/testing/inetutils/dnsdomainname b/testing/inetutils/dnsdomainname
deleted file mode 100644
index a1b8a8c31..000000000
--- a/testing/inetutils/dnsdomainname
+++ /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/ftpd.service b/testing/inetutils/ftpd.service
deleted file mode 100644
index 5708bdfd1..000000000
--- a/testing/inetutils/ftpd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=FTPD Daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/ftpd -D
-Type=forking
-
-[Install]
-WantedBy=multi-user.target
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/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/inkscape/PKGBUILD b/testing/inkscape/PKGBUILD
deleted file mode 100644
index 762134903..000000000
--- a/testing/inkscape/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 169641 2012-10-25 01:35:14Z eric $
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=inkscape
-pkgver=0.48.3.1
-pkgrel=7
-pkgdesc='Vector graphics editor using the SVG file format'
-url='http://inkscape.sourceforge.net/'
-license=('GPL' 'LGPL')
-arch=('i686' 'x86_64')
-makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'popt'
-         'python2' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('pstoedit: latex formulas'
-            'texlive-core: latex formulas'
-            'python2-numpy: some extensions'
-            'python2-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"
-        'poppler20.patch'
-        'libpng15.patch')
-sha1sums=('9a09a97d184e09c2ee7f9956bfe073b7313e919e'
-          '7316c2903c157781838cce289a709d100dc40fec'
-          '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 ../poppler20.patch
-	patch -p1 -i ../libpng15.patch
-
-	./configure \
-		--prefix=/usr \
-		--with-python \
-		--with-perl \
-		--enable-lcms \
-		--enable-poppler-cairo \
-		--disable-dependency-tracking \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/inkscape/install b/testing/inkscape/install
deleted file mode 100644
index 6e803bf1d..000000000
--- a/testing/inkscape/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-	post_install
-}
-
-
-post_remove() {
-	post_install
-}
diff --git a/testing/inkscape/libpng15.patch b/testing/inkscape/libpng15.patch
deleted file mode 100644
index e24913ed6..000000000
--- a/testing/inkscape/libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- inkscape-0.48.1/src/extension/internal/pdfinput/svg-builder.cpp
-+++ inkscape-0.48.1-mod//src/extension/internal/pdfinput/svg-builder.cpp
-@@ -1443,7 +1443,7 @@
-         return NULL;
-     }
-     // Set error handler
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         png_destroy_write_struct(&png_ptr, &info_ptr);
-         return NULL;
-     }
---- inkscape-0.48.1/src/helper/png-write.cpp
-+++ inkscape-0.48.1-mod//src/helper/png-write.cpp
-@@ -165,7 +165,7 @@
-     /* Set error handling.  REQUIRED if you aren't supplying your own
-      * error hadnling functions in the png_create_write_struct() call.
-      */
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
-         /* If we get here, we had a problem reading the file */
-         fclose(fp);
-         png_destroy_write_struct(&png_ptr, &info_ptr);
---- inkscape-0.48.1/src/sp-image.cpp
-+++ inkscape-0.48.1-mod//src/sp-image.cpp
-@@ -386,9 +386,13 @@
- 
- #if defined(PNG_iCCP_SUPPORTED)
-                 {
--                    char* name = 0;
-+                    png_charp name = 0;
-                     int compression_type = 0;
--                    char* profile = 0;
-+#if (PNG_LIBPNG_VER < 10500)
-+                    png_charp profile = 0;
-+#else
-+                    png_bytep profile = 0;
-+#endif
-                     png_uint_32 proflen = 0;
-                     if ( png_get_iCCP(pngPtr, infoPtr, &name, &compression_type, &profile, &proflen) ) {
- //                                         g_message("Found an iCCP chunk named [%s] with %d bytes and comp %d", name, proflen, compression_type);
diff --git a/testing/inkscape/poppler20.patch b/testing/inkscape/poppler20.patch
deleted file mode 100644
index ecb74603f..000000000
--- a/testing/inkscape/poppler20.patch
+++ /dev/null
@@ -1,642 +0,0 @@
-diff -Naur old/src/extension/internal/pdfinput/pdf-parser.cpp new/src/extension/internal/pdfinput/pdf-parser.cpp
---- old/src/extension/internal/pdfinput/pdf-parser.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/pdf-parser.cpp	2012-05-13 21:07:11.334781215 +0200
-@@ -367,14 +367,14 @@
-     for (i = 0; i < obj->arrayGetLength(); ++i) {
-       obj->arrayGet(i, &obj2);
-       if (!obj2.isStream()) {
--	error(-1, const_cast<char*>("Weird page contents"));
-+	error(errInternal, -1, const_cast<char*>("Weird page contents"));
- 	obj2.free();
- 	return;
-       }
-       obj2.free();
-     }
-   } else if (!obj->isStream()) {
--    error(-1, const_cast<char*>("Weird page contents"));
-+    error(errInternal, -1, const_cast<char*>("Weird page contents"));
-     return;
-   }
-   parser = new Parser(xref, new Lexer(xref, obj), gFalse);
-@@ -419,7 +419,7 @@
- 
-     // too many arguments - something is wrong
-     } else {
--      error(getPos(), const_cast<char*>("Too many args in content stream"));
-+      error(errInternal, getPos(), const_cast<char*>("Too many args in content stream"));
-       if (printCommands) {
- 	printf("throwing away arg: ");
- 	obj.print(stdout);
-@@ -436,7 +436,7 @@
- 
-   // args at end with no command
-   if (numArgs > 0) {
--    error(getPos(), const_cast<char*>("Leftover args in content stream"));
-+    error(errInternal, getPos(), const_cast<char*>("Leftover args in content stream"));
-     if (printCommands) {
-       printf("%d leftovers:", numArgs);
-       for (i = 0; i < numArgs; ++i) {
-@@ -502,7 +502,7 @@
-   name = cmd->getCmd();
-   if (!(op = findOp(name))) {
-     if (ignoreUndef == 0)
--      error(getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-+      error(errInternal, getPos(), const_cast<char*>("Unknown operator '%s'"), name);
-     return;
-   }
- 
-@@ -510,26 +510,26 @@
-   argPtr = args;
-   if (op->numArgs >= 0) {
-     if (numArgs < op->numArgs) {
--      error(getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-+      error(errInternal, getPos(), const_cast<char*>("Too few (%d) args to '%s' operator"), numArgs, name);
-       return;
-     }
-     if (numArgs > op->numArgs) {
- #if 0
--      error(getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
-+      error(errInternal, getPos(), "Too many (%d) args to '%s' operator", numArgs, name);
- #endif
-       argPtr += numArgs - op->numArgs;
-       numArgs = op->numArgs;
-     }
-   } else {
-     if (numArgs > -op->numArgs) {
--      error(getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
-+      error(errInternal, getPos(), const_cast<char*>("Too many (%d) args to '%s' operator"),
- 	    numArgs, name);
-       return;
-     }
-   }
-   for (i = 0; i < numArgs; ++i) {
-     if (!checkArg(&argPtr[i], op->tchk[i])) {
--      error(getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
-+      error(errInternal, getPos(), const_cast<char*>("Arg #%d to '%s' operator is wrong type (%s)"),
- 	    i, name, argPtr[i].getTypeName());
-       return;
-     }
-@@ -690,7 +690,7 @@
-     return;
-   }
-   if (!obj1.isDict()) {
--    error(getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-+    error(errInternal, getPos(), const_cast<char*>("ExtGState '%s' is wrong type"), args[0].getName());
-     obj1.free();
-     return;
-   }
-@@ -705,7 +705,7 @@
-     if (state->parseBlendMode(&obj2, &mode)) {
-       state->setBlendMode(mode);
-     } else {
--      error(getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid blend mode in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -764,7 +764,7 @@
-       state->setTransfer(funcs);
-     }
-   } else if (!obj2.isNull()) {
--    error(getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-+    error(errInternal, getPos(), const_cast<char*>("Invalid transfer function in ExtGState"));
-   }
-   obj2.free();
- 
-@@ -784,7 +784,7 @@
- 	funcs[0] = Function::parse(&obj3);
- 	if (funcs[0]->getInputSize() != 1 ||
- 	    funcs[0]->getOutputSize() != 1) {
--	  error(getPos(),
-+	  error(errInternal, getPos(),
- 		const_cast<char*>("Invalid transfer function in soft mask in ExtGState"));
- 	  delete funcs[0];
- 	  funcs[0] = NULL;
-@@ -809,11 +809,7 @@
- 	  blendingColorSpace = NULL;
- 	  isolated = knockout = gFalse;
- 	  if (!obj4.dictLookup(const_cast<char*>("CS"), &obj5)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	    blendingColorSpace = GfxColorSpace::parse(&obj5, NULL);
--#else
--	    blendingColorSpace = GfxColorSpace::parse(&obj5);
--#endif
- 	  }
- 	  obj5.free();
- 	  if (obj4.dictLookup(const_cast<char*>("I"), &obj5)->isBool()) {
-@@ -840,15 +836,15 @@
- 	    delete funcs[0];
- 	  }
- 	} else {
--	  error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	  error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
- 	}
- 	obj4.free();
-       } else {
--	error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-+	error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState - missing group"));
-       }
-       obj3.free();
-     } else if (!obj2.isNull()) {
--      error(getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-+      error(errInternal, getPos(), const_cast<char*>("Invalid soft mask in ExtGState"));
-     }
-   }
-   obj2.free();
-@@ -876,7 +872,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -884,7 +880,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &obj1);
-   if (!obj1.isArray()) {
-     obj1.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -1012,19 +1008,11 @@
- 
-   state->setFillPattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setFillColorSpace(colorSpace);
-@@ -1032,7 +1020,7 @@
-     state->setFillColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (fill)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (fill)"));
-   }
- }
- 
-@@ -1043,19 +1031,11 @@
- 
-   state->setStrokePattern(NULL);
-   res->lookupColorSpace(args[0].getName(), &obj);
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (obj.isNull()) {
-     colorSpace = GfxColorSpace::parse(&args[0], NULL);
-   } else {
-     colorSpace = GfxColorSpace::parse(&obj, NULL);
-   }
--#else
--  if (obj.isNull()) {
--    colorSpace = GfxColorSpace::parse(&args[0]);
--  } else {
--    colorSpace = GfxColorSpace::parse(&obj);
--  }
--#endif
-   obj.free();
-   if (colorSpace) {
-     state->setStrokeColorSpace(colorSpace);
-@@ -1063,7 +1043,7 @@
-     state->setStrokeColor(&color);
-     builder->updateStyle(state);
-   } else {
--    error(getPos(), const_cast<char*>("Bad color space (stroke)"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad color space (stroke)"));
-   }
- }
- 
-@@ -1072,7 +1052,7 @@
-   int i;
- 
-   if (numArgs != state->getFillColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'sc' command"));
-     return;
-   }
-   state->setFillPattern(NULL);
-@@ -1088,7 +1068,7 @@
-   int i;
- 
-   if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--    error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-+    error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SC' command"));
-     return;
-   }
-   state->setStrokePattern(NULL);
-@@ -1109,7 +1089,7 @@
-       if (!((GfxPatternColorSpace *)state->getFillColorSpace())->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getFillColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1120,23 +1100,15 @@
-       state->setFillColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setFillPattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setFillPattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getFillColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'scn' command"));
-       return;
-     }
-     state->setFillPattern(NULL);
-@@ -1161,7 +1133,7 @@
- 	       ->getUnder() ||
- 	  numArgs - 1 != ((GfxPatternColorSpace *)state->getStrokeColorSpace())
- 	                     ->getUnder()->getNComps()) {
--	error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+	error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
- 	return;
-       }
-       for (i = 0; i < numArgs - 1 && i < gfxColorMaxComps; ++i) {
-@@ -1172,23 +1144,15 @@
-       state->setStrokeColor(&color);
-       builder->updateStyle(state);
-     }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-     if (args[numArgs-1].isName() &&
- 	(pattern = res->lookupPattern(args[numArgs-1].getName(), NULL))) {
-       state->setStrokePattern(pattern);
-       builder->updateStyle(state);
-     }
--#else
--    if (args[numArgs-1].isName() &&
--	(pattern = res->lookupPattern(args[numArgs-1].getName()))) {
--      state->setStrokePattern(pattern);
--      builder->updateStyle(state);
--    }
--#endif
- 
-   } else {
-     if (numArgs != state->getStrokeColorSpace()->getNComps()) {
--      error(getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-+      error(errInternal, getPos(), const_cast<char*>("Incorrect number of arguments in 'SCN' command"));
-       return;
-     }
-     state->setStrokePattern(NULL);
-@@ -1212,7 +1176,7 @@
- 
- void PdfParser::opLineTo(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in lineto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in lineto"));
-     return;
-   }
-   state->lineTo(args[0].getNum(), args[1].getNum());
-@@ -1222,7 +1186,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1238,7 +1202,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto1"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto1"));
-     return;
-   }
-   x1 = state->getCurX();
-@@ -1254,7 +1218,7 @@
-   double x1, y1, x2, y2, x3, y3;
- 
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in curveto2"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in curveto2"));
-     return;
-   }
-   x1 = args[0].getNum();
-@@ -1282,7 +1246,7 @@
- 
- void PdfParser::opClosePath(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    error(getPos(), const_cast<char*>("No current point in closepath"));
-+    error(errInternal, getPos(), const_cast<char*>("No current point in closepath"));
-     return;
-   }
-   state->closePath();
-@@ -1298,7 +1262,7 @@
- 
- void PdfParser::opStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1314,7 +1278,7 @@
- 
- void PdfParser::opCloseStroke(Object * /*args[]*/, int /*numArgs*/) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/stroke"));
-     return;
-   }
-   state->closePath();
-@@ -1331,7 +1295,7 @@
- 
- void PdfParser::opFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1347,7 +1311,7 @@
- 
- void PdfParser::opEOFill(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1363,7 +1327,7 @@
- 
- void PdfParser::opFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1376,7 +1340,7 @@
- 
- void PdfParser::opCloseFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/fill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1388,7 +1352,7 @@
- 
- void PdfParser::opEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1399,7 +1363,7 @@
- 
- void PdfParser::opCloseEOFillStroke(Object args[], int numArgs) {
-   if (!state->isCurPt()) {
--    //error(getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-+    //error(errInternal, getPos(), const_cast<char*>("No path in closepath/eofill/stroke"));
-     return;
-   }
-   if (state->isPath()) {
-@@ -1440,7 +1404,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gFalse, eoFill);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in fill"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1459,7 +1423,7 @@
-     doShadingPatternFillFallback((GfxShadingPattern *)pattern, gTrue, gFalse);
-     break;
-   default:
--    error(getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
-+    error(errInternal, getPos(), const_cast<char*>("Unimplemented pattern type (%d) in stroke"),
- 	  pattern->getType());
-     break;
-   }
-@@ -1579,15 +1543,9 @@
-   double *matrix = NULL;
-   GBool savedState = gFalse;
- 
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-   if (!(shading = res->lookupShading(args[0].getName(), NULL))) {
-     return;
-   }
--#else
--  if (!(shading = res->lookupShading(args[0].getName()))) {
--    return;
--  }
--#endif
- 
-   // save current graphics state
-   if (shading->getType() != 2 && shading->getType() != 3) {
-@@ -2156,7 +2114,7 @@
- 
- void PdfParser::opShowText(Object args[], int numArgs) {
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2170,7 +2128,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2188,7 +2146,7 @@
-   double tx, ty;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in move/set/show"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in move/set/show"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2211,7 +2169,7 @@
-   int i;
- 
-   if (!state->getFont()) {
--    error(getPos(), const_cast<char*>("No font in show/space"));
-+    error(errInternal, getPos(), const_cast<char*>("No font in show/space"));
-     return;
-   }
-   if (fontChanged) {
-@@ -2236,7 +2194,7 @@
-     } else if (obj.isString()) {
-       doShowText(obj.getString());
-     } else {
--      error(getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-+      error(errInternal, getPos(), const_cast<char*>("Element of show/space array must be number or string"));
-     }
-     obj.free();
-   }
-@@ -2334,7 +2292,7 @@
- 	if (charProc.isStream()) {
- 	  //parse(&charProc, gFalse); // TODO: parse into SVG font
- 	} else {
--	  error(getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
-+	  error(errInternal, getPos(), const_cast<char*>("Missing or bad Type3 CharProc entry"));
- 	}
- 	//out->endType3Char(state);
- 	if (resDict) {
-@@ -2410,7 +2368,7 @@
-     return;
-   }
-   if (!obj1.isStream()) {
--    error(getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-+    error(errInternal, getPos(), const_cast<char*>("XObject '%s' is wrong type"), name);
-     obj1.free();
-     return;
-   }
-@@ -2426,9 +2384,9 @@
- /*    out->psXObject(obj1.getStream(),
-     		   obj3.isStream() ? obj3.getStream() : (Stream *)NULL);*/
-   } else if (obj2.isName()) {
--    error(getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-+    error(errInternal, getPos(), const_cast<char*>("Unknown XObject subtype '%s'"), obj2.getName());
-   } else {
--    error(getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-+    error(errInternal, getPos(), const_cast<char*>("XObject subtype is missing or wrong type"));
-   }
-   obj2.free();
-   obj1.free();
-@@ -2559,11 +2517,7 @@
-       }
-     }
-     if (!obj1.isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       colorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      colorSpace = GfxColorSpace::parse(&obj1);
--#endif
-     } else if (csMode == streamCSDeviceGray) {
-       colorSpace = new GfxDeviceGrayColorSpace();
-     } else if (csMode == streamCSDeviceRGB) {
-@@ -2648,11 +2602,7 @@
- 	  obj2.free();
- 	}
-       }
--#ifdef POPPLER_NEW_COLOR_SPACE_API
-       maskColorSpace = GfxColorSpace::parse(&obj1, NULL);
--#else
--      maskColorSpace = GfxColorSpace::parse(&obj1);
--#endif
-       obj1.free();
-       if (!maskColorSpace || maskColorSpace->getMode() != csDeviceGray) {
- 	goto err1;
-@@ -2758,7 +2708,7 @@
-  err2:
-   obj1.free();
-  err1:
--  error(getPos(), const_cast<char*>("Bad image parameters"));
-+  error(errInternal, getPos(), const_cast<char*>("Bad image parameters"));
- }
- 
- void PdfParser::doForm(Object *str) {
-@@ -2783,7 +2733,7 @@
-   // check form type
-   dict->lookup(const_cast<char*>("FormType"), &obj1);
-   if (!(obj1.isNull() || (obj1.isInt() && obj1.getInt() == 1))) {
--    error(getPos(), const_cast<char*>("Unknown form type"));
-+    error(errInternal, getPos(), const_cast<char*>("Unknown form type"));
-   }
-   obj1.free();
- 
-@@ -2791,7 +2741,7 @@
-   dict->lookup(const_cast<char*>("BBox"), &bboxObj);
-   if (!bboxObj.isArray()) {
-     bboxObj.free();
--    error(getPos(), const_cast<char*>("Bad form bounding box"));
-+    error(errInternal, getPos(), const_cast<char*>("Bad form bounding box"));
-     return;
-   }
-   for (i = 0; i < 4; ++i) {
-@@ -2827,11 +2777,7 @@
-     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
-       transpGroup = gTrue;
-       if (!obj1.dictLookup(const_cast<char*>("CS"), &obj3)->isNull()) {
--#ifdef POPPLER_NEW_COLOR_SPACE_API
- 	blendingColorSpace = GfxColorSpace::parse(&obj3, NULL);
--#else
--	blendingColorSpace = GfxColorSpace::parse(&obj3);
--#endif
-       }
-       obj3.free();
-       if (obj1.dictLookup(const_cast<char*>("I"), &obj3)->isBool()) {
-@@ -2990,7 +2936,7 @@
-   parser->getObj(&obj);
-   while (!obj.isCmd(const_cast<char*>("ID")) && !obj.isEOF()) {
-     if (!obj.isName()) {
--      error(getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-+      error(errInternal, getPos(), const_cast<char*>("Inline image dictionary key must be a name object"));
-       obj.free();
-     } else {
-       key = copyString(obj.getName());
-@@ -3005,7 +2951,7 @@
-     parser->getObj(&obj);
-   }
-   if (obj.isEOF()) {
--    error(getPos(), const_cast<char*>("End of file in inline image"));
-+    error(errInternal, getPos(), const_cast<char*>("End of file in inline image"));
-     obj.free();
-     dict.free();
-     return NULL;
-@@ -3020,11 +2966,11 @@
- }
- 
- void PdfParser::opImageData(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'ID' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'ID' operator"));
- }
- 
- void PdfParser::opEndImage(Object args[], int numArgs) {
--  error(getPos(), const_cast<char*>("Internal: got 'EI' operator"));
-+  error(errInternal, getPos(), const_cast<char*>("Internal: got 'EI' operator"));
- }
- 
- //------------------------------------------------------------------------
-diff -Naur old/src/extension/internal/pdfinput/svg-builder.cpp new/src/extension/internal/pdfinput/svg-builder.cpp
---- old/src/extension/internal/pdfinput/svg-builder.cpp	2011-07-08 20:25:09.468790000 +0200
-+++ new/src/extension/internal/pdfinput/svg-builder.cpp	2012-05-13 20:45:22.303804308 +0200
-@@ -961,9 +961,7 @@
-     _font_style = sp_repr_css_attr_new();
-     GfxFont *font = state->getFont();
-     // Store original name
--    if (font->getOrigName()) {
--        _font_specification = font->getOrigName()->getCString();
--    } else if (font->getName()) {
-+    if (font->getName()) {
-         _font_specification = font->getName()->getCString();
-     } else {
-         _font_specification = (char*) "Arial";
diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD
deleted file mode 100644
index 04965a823..000000000
--- a/testing/iproute2/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 168945 2012-10-16 17:02:14Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=iproute2
-pkgver=3.6.0
-pkgrel=2
-pkgdesc="IP Routing Utilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-depends=('glibc' 'db' 'iptables')
-makedepends=('linux-atm')
-optdepends=('linux-atm: ATM support')
-groups=('base')
-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)
-sha1sums=('6fa16fd2158d0f289ef454cad46555ead1c33c2d'
-          '35b8cf2dc94b73eccad427235c07596146cd6f6c')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # set correct fhs structure
-  patch -Np1 -i "$srcdir/iproute2-fhs.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/iproute2-fhs.patch b/testing/iproute2/iproute2-fhs.patch
deleted file mode 100644
index add3635ca..000000000
--- a/testing/iproute2/iproute2-fhs.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur iproute2-3.4.0/Makefile iproute2-3.4.0.new/Makefile
---- iproute2-3.4.0/Makefile	2012-05-21 23:12:19.000000000 +0200
-+++ iproute2-3.4.0.new/Makefile	2012-06-18 10:23:53.896760158 +0200
-@@ -1,7 +1,8 @@
- ROOTDIR=$(DESTDIR)
- PREFIX=/usr
- LIBDIR=$(PREFIX)/lib
--SBINDIR=/sbin
-+SBINDIR=/usr/sbin
-+SHAREDIR=/usr/share
- CONFDIR=/etc/iproute2
- DATADIR=$(PREFIX)/share
- DOCDIR=$(DATADIR)/doc/iproute2
-diff -Naur iproute2-3.4.0/netem/Makefile iproute2-3.4.0.new/netem/Makefile
---- iproute2-3.4.0/netem/Makefile	2012-05-21 23:12:19.000000000 +0200
-+++ iproute2-3.4.0.new/netem/Makefile	2012-06-18 10:23:53.896760158 +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-3.4.0/tc/Makefile iproute2-3.4.0.new/tc/Makefile
---- iproute2-3.4.0/tc/Makefile	2012-05-21 23:12:19.000000000 +0200
-+++ iproute2-3.4.0.new/tc/Makefile	2012-06-18 10:23:53.893426840 +0200
-@@ -105,18 +105,11 @@
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	mkdir -p $(MODDESTDIR)
-+	mkdir -p $(DESTDIR)$(LIBDIR)/tc
- 	install -m 0755 tc $(DESTDIR)$(SBINDIR)
- 	for i in $(TCSO); \
--	do install -m 755 $$i $(MODDESTDIR); \
-+	do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
- 	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
- 
- clean:
- 	rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
-diff -Naur iproute2-3.4.0/tc/tc_util.c iproute2-3.4.0.new/tc/tc_util.c
---- iproute2-3.4.0/tc/tc_util.c	2012-05-21 23:12:19.000000000 +0200
-+++ iproute2-3.4.0.new/tc/tc_util.c	2012-06-18 10:23:53.893426840 +0200
-@@ -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 --git a/testing/iptables/0503-extension_cppflags.patch b/testing/iptables/0503-extension_cppflags.patch
deleted file mode 100644
index 0eb645731..000000000
--- a/testing/iptables/0503-extension_cppflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/extensions/GNUmakefile.in
-===================================================================
---- a/extensions/GNUmakefile.in	2012-03-27 12:14:05.000000000 -0400
-+++ b/extensions/GNUmakefile.in	2012-03-27 16:03:48.378790221 -0400
-@@ -21,7 +21,7 @@
- kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
- 
- AM_CFLAGS       = ${regular_CFLAGS}
--AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
-+AM_CPPFLAGS     = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
- AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
- AM_LDFLAGS      = @noundef_LDFLAGS@
- 
diff --git a/testing/iptables/PKGBUILD b/testing/iptables/PKGBUILD
deleted file mode 100644
index a97879edc..000000000
--- a/testing/iptables/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 168758 2012-10-15 18:45:48Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-
-pkgname=iptables
-pkgver=1.4.16.2
-pkgrel=1
-pkgdesc='Linux kernel packet control tool'
-arch=('i686' 'x86_64')
-license=('GPL2')
-url='http://www.netfilter.org/projects/iptables/index.html'
-depends=('glibc' 'bash')
-makedepends=('linux-api-headers')
-options=('!libtool')
-source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.tar.bz2"
-        iptables
-        ip6tables
-        empty.rules
-        simple_firewall.rules
-        iptables.conf.d
-        empty-filter.rules
-        empty-mangle.rules
-        empty-nat.rules
-        empty-raw.rules
-        empty-security.rules
-        0503-extension_cppflags.patch
-        iptables.service
-        ip6tables.service
-        iptables-flush)
-backup=(etc/conf.d/iptables)
-sha1sums=('6fd368c4f6c31752011a716cccd951601157a493'
-          '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
-          '2db68906b603e5268736f48c8e251f3a49da1d75'
-          '83b3363878e3660ce23b2ad325b53cbd6c796ecf'
-          '9907f9e815592837abc7fa3264a401567b7606ab'
-          'cdb830137192bbe002c6d01058656bd053ed0ddd'
-          'd9f9f06b46b4187648e860afa0552335aafe3ce4'
-          'c45b738b5ec4cfb11611b984c21a83b91a2d58f3'
-          '1694d79b3e6e9d9d543f6a6e75fed06066c9a6c6'
-          '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
-          'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
-          '44626980a52e49f345a0b1e1ca03060f3a35763c'
-          '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9'
-          'f1f16f44c6a5547b6f251d13007fe6585761e8b0'
-          'e7abda09c61142121b6695928d3b71ccd8fdf73a')
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # use system one
-  rm include/linux/types.h
-
-  patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
-
- ./configure --prefix=/usr \
-     --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
-     --with-xtlibdir=/usr/lib/iptables \
-     --enable-devel --enable-libipq \
-     --enable-shared 
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"
-  install -D -m755 iptables "${pkgdir}"/etc/rc.d/iptables
-  install -D -m755 ip6tables "${pkgdir}"/etc/rc.d/ip6tables
-  install -D -m644 empty.rules "${pkgdir}"/etc/iptables/empty.rules
-  install -D -m644 simple_firewall.rules "${pkgdir}"/etc/iptables/simple_firewall.rules
-  install -D -m644 iptables.conf.d "${pkgdir}"/etc/conf.d/iptables
-
-  mkdir -p "${pkgdir}"/var/lib/iptables
-  install -m644 empty-{filter,mangle,nat,raw,security}.rules "${pkgdir}"/var/lib/iptables
-
-  # install systemd files
-  install -Dm644 ${srcdir}/iptables.service ${pkgdir}/usr/lib/systemd/system/iptables.service
-  install -Dm644 ${srcdir}/ip6tables.service ${pkgdir}/usr/lib/systemd/system/ip6tables.service
-  install -Dm755 ${srcdir}/iptables-flush ${pkgdir}/usr/lib/systemd/scripts/iptables-flush  
-}
-
diff --git a/testing/iptables/empty-filter.rules b/testing/iptables/empty-filter.rules
deleted file mode 100644
index 5a4de4876..000000000
--- a/testing/iptables/empty-filter.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables filter table rule file
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-mangle.rules b/testing/iptables/empty-mangle.rules
deleted file mode 100644
index 49d493c4d..000000000
--- a/testing/iptables/empty-mangle.rules
+++ /dev/null
@@ -1,8 +0,0 @@
-# Empty iptables mangle table rules file
-*mangle
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-nat.rules b/testing/iptables/empty-nat.rules
deleted file mode 100644
index 437e96411..000000000
--- a/testing/iptables/empty-nat.rules
+++ /dev/null
@@ -1,7 +0,0 @@
-# Empty iptables nat table rules file
-*nat
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-raw.rules b/testing/iptables/empty-raw.rules
deleted file mode 100644
index 8dc50d23e..000000000
--- a/testing/iptables/empty-raw.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Empty iptables raw table rules file
-*raw
-:PREROUTING ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty-security.rules b/testing/iptables/empty-security.rules
deleted file mode 100644
index 4531fa13f..000000000
--- a/testing/iptables/empty-security.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables security table rules file
-*security
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/empty.rules b/testing/iptables/empty.rules
deleted file mode 100644
index e24e1aa30..000000000
--- a/testing/iptables/empty.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Empty iptables rule file
-*filter
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-COMMIT
diff --git a/testing/iptables/ip6tables b/testing/iptables/ip6tables
deleted file mode 100755
index 2d119e3ed..000000000
--- a/testing/iptables/ip6tables
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IP6TABLES_CONF" ] && IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -f "$IP6TABLES_CONF" ]; then
-			echo "Cannot load ip6tables rules: $IP6TABLES_CONF is missing!" >&2
-			exit 1
-		fi
-		stat_busy "Starting IP6 Tables"
-		if [ "$IPTABLES_FORWARD" = "1" ]; then
-			echo 1 >/proc/sys/net/ipv6/conf/default/forwarding
-			echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
-		fi
-		if ck_daemon ip6tables; then
-			/usr/sbin/ip6tables-restore < $IP6TABLES_CONF
-			if [ $? -gt 0 ]; then
-				stat_fail
-			else
-				add_daemon ip6tables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy "Stopping IP6 Tables"
-		if ! ck_daemon ip6tables; then
-			fail=0
-			for table in $(cat /proc/net/ip6_tables_names); do
-				ip6tables-restore < /var/lib/iptables/empty-$table.rules
-				[ $? -gt 0 ] && fail=1
-			done
-			if [ $fail -gt 0 ]; then
-				stat_fail
-			else
-				rm_daemon ip6tables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	save)
-		stat_busy "Saving IP6 Tables"
-		/usr/sbin/ip6tables-save >$IP6TABLES_CONF
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-		fi
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/ip6tables.service b/testing/iptables/ip6tables.service
deleted file mode 100644
index 9a695f31e..000000000
--- a/testing/iptables/ip6tables.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=IPv6 Packet Filtering Framework
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
-ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/iptables/iptables b/testing/iptables/iptables
deleted file mode 100755
index fbb02face..000000000
--- a/testing/iptables/iptables
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/iptables ] && . /etc/conf.d/iptables
-
-# Set defaults if settings are missing
-[ -z "$IPTABLES_CONF" ] && IPTABLES_CONF=/etc/iptables/iptables.rules
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		if [ ! -f "$IPTABLES_CONF" ]; then
-			echo "Cannot load iptables rules: $IPTABLES_CONF is missing!" >&2
-			exit 1
-		fi
-		stat_busy "Starting IP Tables"
-		if [ "$IPTABLES_FORWARD" = "1" ]; then
-			echo 1 >/proc/sys/net/ipv4/ip_forward
-		fi
-		if ck_daemon iptables; then
-			/usr/sbin/iptables-restore < $IPTABLES_CONF
-			if [ $? -gt 0 ]; then
-				stat_fail
-			else
-				add_daemon iptables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	stop)
-		stat_busy "Stopping IP Tables"
-		if ! ck_daemon iptables; then
-			fail=0
-			for table in $(cat /proc/net/ip_tables_names); do
-				iptables-restore < /var/lib/iptables/empty-$table.rules
-				[ $? -gt 0 ] && fail=1
-			done
-			if [ $fail -gt 0 ]; then
-				stat_fail
-			else
-				rm_daemon iptables
-				stat_done
-			fi
-		else
-			stat_fail
-		fi
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	save)
-		stat_busy "Saving IP Tables"
-		/usr/sbin/iptables-save >$IPTABLES_CONF
-		if [ $? -gt 0 ]; then
-			stat_fail
-		else
-			stat_done
-		fi
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart|save}"
-esac
-exit 0
diff --git a/testing/iptables/iptables-1.4.12-fixresore.patch b/testing/iptables/iptables-1.4.12-fixresore.patch
deleted file mode 100644
index 94358f779..000000000
--- a/testing/iptables/iptables-1.4.12-fixresore.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur iptables-1.4.12.2/iptables/ip6tables-restore.c iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c
---- iptables-1.4.12.2/iptables/ip6tables-restore.c	2012-01-03 02:19:09.000000000 +0900
-+++ iptables-1.4.12.2-fixrestore/iptables/ip6tables-restore.c	2012-03-01 10:56:10.000000000 +0900
-@@ -380,9 +380,9 @@
- 			quote_open = 0;
- 			escaped = 0;
- 			param_len = 0;
-+			char param_buffer[1024];
- 
- 			for (curchar = parsestart; *curchar; curchar++) {
--				char param_buffer[1024];
- 
- 				if (quote_open) {
- 					if (escaped) {
-diff -Nur iptables-1.4.12.2/iptables/iptables-restore.c iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c
---- iptables-1.4.12.2/iptables/iptables-restore.c	2012-01-03 02:19:09.000000000 +0900
-+++ iptables-1.4.12.2-fixrestore/iptables/iptables-restore.c	2012-03-01 10:56:00.000000000 +0900
-@@ -377,9 +377,9 @@
- 			quote_open = 0;
- 			escaped = 0;
- 			param_len = 0;
-+			char param_buffer[1024];
- 
- 			for (curchar = parsestart; *curchar; curchar++) {
--				char param_buffer[1024];
- 
- 				if (quote_open) {
- 					if (escaped) {
diff --git a/testing/iptables/iptables-flush b/testing/iptables/iptables-flush
deleted file mode 100755
index e6fafe950..000000000
--- a/testing/iptables/iptables-flush
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Usage: iptables-flush [6]
-#
-
-iptables=ip$1tables
-if ! type -p "$iptables"; then
-  echo "error: invalid argument"
-  exit 1
-fi
-
-while read -r table; do
-  tables+=("/var/lib/$iptables/empty-$table.rules")
-done <"/proc/net/ip$1_tables_names"
-
-if (( ${#tables[*]} )); then
-  cat "${tables[@]}" | "$iptables-restore"
-fi
diff --git a/testing/iptables/iptables.conf.d b/testing/iptables/iptables.conf.d
deleted file mode 100644
index 1c6cc7b5d..000000000
--- a/testing/iptables/iptables.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for iptables rules
-IPTABLES_CONF=/etc/iptables/iptables.rules
-IP6TABLES_CONF=/etc/iptables/ip6tables.rules
-
-# Enable IP forwarding (both IPv4 and IPv6)
-# NOTE: this is not the recommended way to do this, and is supported only for
-# backward compatibility. Instead, use /etc/sysctl.conf and set the following
-# options:
-# * net.ipv4.ip_forward=1
-# * net.ipv6.conf.default.forwarding=1
-# * net.ipv6.conf.all.forwarding=1
-#IPTABLES_FORWARD=0
diff --git a/testing/iptables/iptables.service b/testing/iptables/iptables.service
deleted file mode 100644
index 3084f53b7..000000000
--- a/testing/iptables/iptables.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Packet Filtering Framework
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
-ExecStop=/usr/lib/systemd/scripts/iptables-flush
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/iptables/simple_firewall.rules b/testing/iptables/simple_firewall.rules
deleted file mode 100644
index e1604cc36..000000000
--- a/testing/iptables/simple_firewall.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
--A INPUT -p icmp -j ACCEPT 
--A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT 
--A INPUT -i lo -j ACCEPT 
--A INPUT -p tcp -j REJECT --reject-with tcp-reset 
--A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable 
--A INPUT -j REJECT --reject-with icmp-proto-unreachable 
-COMMIT
diff --git a/testing/iputils/PKGBUILD b/testing/iputils/PKGBUILD
deleted file mode 100644
index 995352da8..000000000
--- a/testing/iputils/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 169051 2012-10-17 14:09:37Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=iputils
-pkgver=20121011
-pkgrel=1
-pkgdesc="IP Configuration Utilities (and Ping)"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.linuxfoundation.org/en/Net:Iputils"
-groups=('base')
-depends=('openssl' 'sysfsutils' 'libcap')
-optdepends=('xinetd: for tftpd')
-makedepends=('docbook2x' 'opensp')
-conflicts=('netkit-base' 'arping' 'netkit-tftpd')
-replaces=('netkit-base')
-backup=(etc/xinetd.d/tftp)
-install=${pkgname}.install
-source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd
-        iputils-20101006-ping-integer-overflow.patch)
-sha1sums=('3e85179746fd93000d6267bd55addfe97f321ba7'
-          'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd'
-          'ec78574d798b53e4f8bdd37e42514fc17ed71667')
-
-build() {
-  cd "${srcdir}/${pkgname}-s${pkgver}"
-
-  # Use our CFLAGS
-  sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile
-
-  # FS#28897
-  patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch 
-
-  make
-
-  cd doc
-  for file in *.sgml; do
-    xf=${file/.sgml/.xml}
-    osx -xlower -xno-nl-in-tag $file > $xf || true
-    sed -i "s|<refname>\(.*\), \(.*\)</refname>|<refname>\1</refname>, <refname>\2</refname>|g" $xf
-    docbook2man $xf
-  done
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-s${pkgver}"
-
-  install -dm755 "${pkgdir}"/usr/{bin,sbin} "${pkgdir}"/bin
-
-  install -m755 arping clockdiff rarpd rdisc tftpd tracepath tracepath6 \
-    "${pkgdir}"/usr/sbin/
-
-  install -m755 ping{,6} "${pkgdir}"/usr/bin/
-   ln -sf /usr/bin/ping{,6}  "${pkgdir}"/bin/
-
-   install -dm755 "${pkgdir}"/usr/share/man/man8
-   install -m644 doc/{arping,clockdiff,ping,rarpd,rdisc,tftpd,tracepath}.8 \
-     "${pkgdir}"/usr/share/man/man8/
-
-  cd "${pkgdir}"/usr/share/man/man8
-  ln -sf ping.8.gz  ping6.8.gz
-  ln -sf tracepath.8.gz tracepath6.8.gz
-
-  # FS#24768
-  install -dm755 "${pkgdir}"/etc/xinetd.d/
-  install -m644 "${srcdir}"/tftp.xinetd "${pkgdir}"/etc/xinetd.d/tftp
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/iputils/iputils-20101006-ping-integer-overflow.patch b/testing/iputils/iputils-20101006-ping-integer-overflow.patch
deleted file mode 100644
index 720e5e888..000000000
--- a/testing/iputils/iputils-20101006-ping-integer-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iputils-s20101006/ping_common.c	2010-10-06 13:59:20.000000000 +0200
-+++ iputils-s20101006-patched/ping_common.c	2012-03-09 16:42:46.878151032 +0100
-@@ -590,7 +590,7 @@
- 
- 			/* If we are here, recvmsg() is unable to wait for
- 			 * required timeout. */
--			if (1000*next <= 1000000/(int)HZ) {
-+			if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) {
- 				/* Very short timeout... So, if we wait for
- 				 * something, we sleep for MININTERVAL.
- 				 * Otherwise, spin! */
diff --git a/testing/iputils/iputils.install b/testing/iputils/iputils.install
deleted file mode 100644
index 8e5159e83..000000000
--- a/testing/iputils/iputils.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  setcap cap_net_raw=ep usr/bin/ping  2>/dev/null || chmod +s usr/bin/ping 
-  setcap cap_net_raw=ep usr/bin/ping6 2>/dev/null || chmod +s usr/bin/ping6
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/iputils/tftp.xinetd b/testing/iputils/tftp.xinetd
deleted file mode 100644
index 26041a3f9..000000000
--- a/testing/iputils/tftp.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service tftp
-{
-	socket_type	= dgram
-	protocol	= udp
-	wait		= yes
-	user		= nobody
-	server		= /usr/sbin/tftpd
-	server_args	= /var/tftpboot
-	disable		= yes
-}
diff --git a/testing/irqbalance/PKGBUILD b/testing/irqbalance/PKGBUILD
deleted file mode 100644
index 52c5ae477..000000000
--- a/testing/irqbalance/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Martin Striz <ms@poruba.net>
-
-pkgname=irqbalance
-_realver=1.0.3
-pkgver=1.0.3.20110809
-pkgrel=1
-pkgdesc="IRQ balancing daemon for SMP systems"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/irqbalance"
-license=('GPL')
-depends=(glib2 numactl libcap-ng)
-makedepends=(pkgconfig)
-backup=(etc/conf.d/irqbalance)
-source=(http://irqbalance.googlecode.com/files/irqbalance-$_realver.tar.gz
-        irqbalance-2011-08-09.patch
-        irqbalance.conf.d
-        irqbalance.rc.d
-        irqbalance.service)
-md5sums=('6f246481d6295bcb9a79751c03207c96'
-         '49a5669fc3eb452a5d24abec887f0a6a'
-         '336c1ee99818f9ecda1687e34c69fd6b'
-         'fb82fc5d267d39110baf720d81282a7c'
-         '9e82dc471128117982a8dd0c4bd5f246')
-
-build() {
-  cd "$srcdir/$pkgname-$_realver"
-  patch -Np1 < ../irqbalance-2011-08-09.patch
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_realver"
-  make install DESTDIR="$pkgdir"
-  install -D -m644 ../irqbalance.conf.d "$pkgdir"/etc/conf.d/irqbalance
-  install -D -m755 ../irqbalance.rc.d "$pkgdir"/etc/rc.d/irqbalance
-  install -D -m644 ../irqbalance.service "$pkgdir"/usr/lib/systemd/system/irqbalance.service
-}
diff --git a/testing/irqbalance/irqbalance-2011-08-09.patch b/testing/irqbalance/irqbalance-2011-08-09.patch
deleted file mode 100644
index fcdb8bdbf..000000000
--- a/testing/irqbalance/irqbalance-2011-08-09.patch
+++ /dev/null
@@ -1,1584 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index f5e9428..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,3 +0,0 @@
--This is all tracked in the SVN repo.  This file is just here to keep the
--autotools from complaining
--
-diff --git a/Makefile.am b/Makefile.am
-index 9847232..188e34f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -22,17 +22,17 @@
- 
- AUTOMAKE_OPTIONS = no-dependencies
- ACLOCAL_AMFLAGS = -I m4
--EXTRA_DIST = README INSTALL COPYING autogen.sh m4/cap-ng.m4 misc/irqbalance.service
-- 
-+EXTRA_DIST = INSTALL COPYING autogen.sh misc/irqbalance.service
-+
- INCLUDES = -I${top_srcdir} 
--LIBS = $(CAPNG_LDADD) $(GLIB_LIBS) @LIBS@
--AM_CFLAGS = $(GLIB_CFLAGS)
-+AM_CFLAGS = $(LIBCAP_NG_CFLAGS) $(GLIB_CFLAGS)
- AM_CPPFLAGS = -W -Wall -Wshadow -Wformat -Wundef -D_GNU_SOURCE
- noinst_HEADERS = bitmap.h constants.h cpumask.h irqbalance.h non-atomic.h \
- 	types.h
- sbin_PROGRAMS = irqbalance
- irqbalance_SOURCES = activate.c bitmap.c classify.c cputree.c irqbalance.c \
--	irqlist.c numa.c placement.c powermode.c procinterrupts.c
-+	irqlist.c numa.c placement.c procinterrupts.c
-+irqbalance_LDADD = $(LIBCAP_NG_LIBS) $(GLIB_LIBS)
- dist_man_MANS = irqbalance.1
- 
- CONFIG_CLEAN_FILES = debug*.list config/*
-@@ -40,3 +40,6 @@ clean-generic:
- 	rm -rf autom4te*.cache 
- 	rm -f *.rej *.orig *~
- 
-+if LOCAL_GLIB
-+SUBDIRS = glib-local
-+endif
-diff --git a/NEWS b/NEWS
-deleted file mode 100644
-index 7cc0277..0000000
---- a/NEWS
-+++ /dev/null
-@@ -1 +0,0 @@
--No news currently
-diff --git a/README b/README
-deleted file mode 100644
-index e69de29..0000000
-diff --git a/activate.c b/activate.c
-index 292c44a..02fc8dc 100644
---- a/activate.c
-+++ b/activate.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -31,34 +32,63 @@
- 
- #include "irqbalance.h"
- 
-+static int check_affinity(struct irq_info *info, cpumask_t applied_mask)
-+{
-+	cpumask_t current_mask;
-+	char buf[PATH_MAX];
-+	char *line = NULL;
-+	size_t size = 0;
-+	FILE *file;
-+
-+	sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq);
-+	file = fopen(buf, "r");
-+	if (!file)
-+		return 1;
-+	if (getline(&line, &size, file)==0) {
-+		free(line);
-+		fclose(file);
-+		return 1;
-+	}
-+	cpumask_parse_user(line, strlen(line), current_mask);
-+	fclose(file);
-+	free(line);
-+
-+	return cpus_equal(applied_mask, current_mask);
-+}
- 
- static void activate_mapping(struct irq_info *info, void *data __attribute__((unused)))
- {
- 	char buf[PATH_MAX];
- 	FILE *file;
- 	cpumask_t applied_mask;
-+	int valid_mask = 0;
-+
-+	if ((hint_policy == HINT_POLICY_EXACT) &&
-+	    (!cpus_empty(info->affinity_hint))) {
-+		applied_mask = info->affinity_hint;
-+		valid_mask = 1;
-+	} else if (info->assigned_obj) {
-+		applied_mask = info->assigned_obj->mask;
-+		valid_mask = 1;
-+		if ((hint_policy == HINT_POLICY_SUBSET) &&
-+		    (!cpus_empty(info->affinity_hint)))
-+			cpus_and(applied_mask, applied_mask, info->affinity_hint);
-+	}
- 
- 	/*
-  	 * only activate mappings for irqs that have moved
-  	 */
--	if (!info->moved)
-+	if (!info->moved && (!valid_mask || check_affinity(info, applied_mask)))
- 		return;
- 
- 	if (!info->assigned_obj)
- 		return;
- 
--
- 	sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq);
- 	file = fopen(buf, "w");
- 	if (!file)
- 		return;
- 
--	if ((hint_policy == HINT_POLICY_EXACT) &&
--	    (!cpus_empty(info->affinity_hint)))
--		applied_mask = info->affinity_hint;
--	else
--		applied_mask = info->assigned_obj->mask;
--
- 	cpumask_scnprintf(buf, PATH_MAX, applied_mask);
- 	fprintf(file, "%s", buf);
- 	fclose(file);
-diff --git a/autogen.sh b/autogen.sh
-index 5ad9f14..b792e8b 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -1,4 +1,5 @@
- #! /bin/sh
- set -x -e
-+mkdir -p m4
- # --no-recursive is available only in recent autoconf versions
- autoreconf -fv --install
-diff --git a/classify.c b/classify.c
-index 124dab0..05b3bfb 100644
---- a/classify.c
-+++ b/classify.c
-@@ -52,6 +52,8 @@ static short class_codes[MAX_CLASS] = {
- };
- 
- static GList *interrupts_db;
-+static GList *new_irq_list;
-+static GList *banned_irqs;
- 
- #define SYSDEV_DIR "/sys/bus/pci/devices"
- 
-@@ -63,6 +65,30 @@ static gint compare_ints(gconstpointer a, gconstpointer b)
- 	return ai->irq - bi->irq;
- }
- 
-+void add_banned_irq(int irq)
-+{
-+	struct irq_info find, *new;
-+	GList *entry;
-+
-+	find.irq = irq;
-+	entry = g_list_find_custom(banned_irqs, &find, compare_ints);
-+	if (entry)
-+		return;
-+
-+	new = calloc(sizeof(struct irq_info), 1);
-+	if (!new) {
-+		if (debug_mode)
-+			printf("No memory to ban irq %d\n", irq);
-+		return;
-+	}
-+
-+	new->irq = irq;
-+
-+	banned_irqs = g_list_append(banned_irqs, new);
-+	return;
-+}
-+
-+			
- /*
-  * Inserts an irq_info struct into the intterupts_db list
-  * devpath points to the device directory in sysfs for the 
-@@ -90,6 +116,13 @@ static struct irq_info *add_one_irq_to_db(const char *devpath, int irq)
- 		return NULL;
- 	}
- 
-+	entry = g_list_find_custom(banned_irqs, &find, compare_ints);
-+	if (entry) {
-+		if (debug_mode)
-+			printf("SKIPPING BANNED IRQ %d\n", irq);
-+		return NULL;
-+	}
-+
- 	new = calloc(sizeof(struct irq_info), 1);
- 	if (!new)
- 		return NULL;
-@@ -175,6 +208,43 @@ out:
- 	return new;
- }
- 
-+static int check_for_irq_ban(char *path, int irq)
-+{
-+	char *cmd;
-+	int rc;
-+
-+	if (!banscript)
-+		return 0;
-+
-+	cmd = alloca(strlen(path)+strlen(banscript)+32);
-+	if (!cmd)
-+		return 0;
-+	
-+	sprintf(cmd, "%s %s %d",banscript, path, irq);
-+	rc = system(cmd);
-+
-+	/*
-+ 	 * The system command itself failed
-+ 	 */
-+	if (rc == -1) {
-+		if (debug_mode)
-+			printf("%s failed, please check the --banscript option\n", cmd);
-+		else
-+			syslog(LOG_INFO, "%s failed, please check the --banscript option\n", cmd);
-+		return 0;
-+	}
-+
-+	if (WEXITSTATUS(rc)) {
-+		if (debug_mode)
-+			printf("irq %d is baned by %s\n", irq, banscript);
-+		else
-+			syslog(LOG_INFO, "irq %d is baned by %s\n", irq, banscript);
-+		return 1;
-+	}
-+	return 0;
-+
-+}
-+
- /*
-  * Figures out which interrupt(s) relate to the device we're looking at in dirname
-  */
-@@ -199,6 +269,10 @@ static void build_one_dev_entry(const char *dirname)
- 			irqnum = strtol(entry->d_name, NULL, 10);
- 			if (irqnum) {
- 				sprintf(path, "%s/%s", SYSDEV_DIR, dirname);
-+				if (check_for_irq_ban(path, irqnum)) {
-+					add_banned_irq(irqnum);
-+					continue;
-+				}
- 				new = add_one_irq_to_db(path, irqnum);
- 				if (!new)
- 					continue;
-@@ -221,6 +295,11 @@ static void build_one_dev_entry(const char *dirname)
- 	 */
- 	if (irqnum) {
- 		sprintf(path, "%s/%s", SYSDEV_DIR, dirname);
-+		if (check_for_irq_ban(path, irqnum)) {
-+			add_banned_irq(irqnum);
-+			goto done;
-+		}
-+
- 		new = add_one_irq_to_db(path, irqnum);
- 		if (!new)
- 			goto done;
-@@ -248,6 +327,8 @@ void rebuild_irq_db(void)
- {
- 	DIR *devdir = opendir(SYSDEV_DIR);
- 	struct dirent *entry;
-+	GList *gentry;
-+	struct irq_info *ninfo, *iinfo;
- 
- 	free_irq_db();
- 		
-@@ -263,22 +344,46 @@ void rebuild_irq_db(void)
- 	build_one_dev_entry(entry->d_name);
- 
- 	} while (entry != NULL);
-+
- 	closedir(devdir);
-+
-+	if (!new_irq_list)
-+		return;
-+	gentry = g_list_first(new_irq_list);	
-+	while(gentry) {
-+		ninfo = gentry->data;
-+		iinfo = get_irq_info(ninfo->irq);
-+		new_irq_list = g_list_remove(gentry, ninfo);
-+		if (!iinfo) {
-+			if (debug_mode)
-+				printf("Adding untracked IRQ %d to database\n", ninfo->irq);
-+			interrupts_db = g_list_append(interrupts_db, ninfo);
-+		} else 
-+			free(ninfo);
-+
-+		gentry = g_list_first(new_irq_list);
-+	}
-+	g_list_free(new_irq_list);
-+	new_irq_list = NULL;
-+		
- }
- 
--struct irq_info *add_misc_irq(int irq)
-+struct irq_info *add_new_irq(int irq)
- {
--	struct irq_info *new;
-+	struct irq_info *new, *nnew;
- 
- 	new = calloc(sizeof(struct irq_info), 1);
--	if (!new)
-+	nnew = calloc(sizeof(struct irq_info), 1);
-+	if (!new || !nnew)
- 		return NULL;
- 
- 	new->irq = irq;
- 	new->type = IRQ_TYPE_LEGACY;
- 	new->class = IRQ_OTHER;
- 	new->numa_node = get_numa_node(-1);
-+	memcpy(nnew, new, sizeof(struct irq_info));
- 	interrupts_db = g_list_append(interrupts_db, new);
-+	new_irq_list = g_list_append(new_irq_list, nnew);
- 	return new;
- }
- 
-@@ -307,7 +412,7 @@ struct irq_info *get_irq_info(int irq)
- void migrate_irq(GList **from, GList **to, struct irq_info *info)
- {
- 	GList *entry;
--	struct irq_info find, *tmp;;
-+	struct irq_info find, *tmp;
- 
- 	find.irq = info->irq;
- 	entry = g_list_find_custom(*from, &find, compare_ints);
-@@ -325,18 +430,9 @@ static gint sort_irqs(gconstpointer A, gconstpointer B)
-         a = (struct irq_info*)A;
-         b = (struct irq_info*)B;
- 
--	if (a->class < b->class)
--		return 1;
--	if (a->class > b->class)
--		return -1;
--	if (a->load < b->load)
--		return 1;
--	if (a->load > b->load)
--		return -1;
--	if (a<b)
-+	if (a->class < b->class || a->load < b->load || a < b)
- 		return 1;
-         return -1;
--
- }
- 
- void sort_irq_list(GList **list)
-diff --git a/configure.ac b/configure.ac
-index eed55ba..1230d66 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,49 +1,12 @@
--dnl
--define([AC_INIT_NOTICE],
--[### Generated automatically using autoconf version] AC_ACVERSION [
--### Copyright 2009 Steve Grubb <sgrubb@redhat.com>
--###
--### 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.
--###
--### For usage, run `./configure --help'
--### For more detailed information on installation, read the file `INSTALL'.
--###
--### If configuration succeeds, status is in the file `config.status'.
--### A log of configuration tests is in `config.log'.
--])
--
--AC_REVISION($Revision: 1.3 $)dnl
- AC_INIT(irqbalance,1.0.3)
- AC_PREREQ(2.12)dnl
- AM_CONFIG_HEADER(config.h)
- 
--echo Configuring irqbalance $VERSION
--
- AC_CONFIG_MACRO_DIR([m4])
--AC_CANONICAL_TARGET
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- AM_PROG_LIBTOOL
- AC_SUBST(LIBTOOL_DEPS)
- 
--AC_MSG_NOTICE()
--AC_MSG_NOTICE([Checking for programs])
--
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PROG_AWK
-@@ -55,9 +18,6 @@ AS_IF([test "$enable_numa" = "no"],[
-   ac_cv_lib_numa_numa_available=no
- ])
- 
--AC_MSG_NOTICE
--AC_MSG_NOTICE([echo Checking for header files])
--
- AC_HEADER_STDC
- AC_CHECK_HEADERS([numa.h])
- 
-@@ -70,10 +30,57 @@ AC_C_CONST
- AC_C_INLINE
- AM_PROG_CC_C_O
- 
--PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
--LIBCAP_NG_PATH
-+AC_ARG_WITH([glib2],
-+  [AS_HELP_STRING([--without-glib2],
-+    [Don't use system glib2 library. Use local implementation instead.])],
-+  [],
-+  [with_glib2=check])
-+
-+local_glib2=
-+AS_IF(
-+  [test "x$with_glib2" = xyes],
-+  [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])],
-+  
-+  [test "x$with_glib2" = xno],
-+  [local_glib2="yes"],
-+
-+  [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28], [], [local_glib2="yes"])]
-+)
-+
-+AS_IF(
-+  [test "x$local_glib2" = xyes],
-+  [
-+  GLIB_CFLAGS=-I./glib-local
-+  GLIB_LIBS=glib-local/libglib.a
-+  AC_SUBST(GLIB_CFLAGS)
-+  AC_SUBST(GLIB_LIBS)
-+  AC_MSG_WARN(Using locale implementation of GList functions)
-+  ]
-+)
-+
-+AM_CONDITIONAL([LOCAL_GLIB], [test "x$local_glib2" = "xyes"])
-+
-+AC_ARG_WITH([libcap-ng],
-+  AS_HELP_STRING([libcap-ng], [Add libcap-ng-support @<:@default=auto@:>@]))
-+
-+AS_IF(
-+  [test "x$libcap_ng" != "xno"],
-+  [
-+  PKG_CHECK_MODULES([LIBCAP_NG], [libcap-ng],
-+    [AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])],
-+    [
-+     AS_IF(
-+       [test "x$libcap_ng" = "xyes"],
-+       [
-+       AC_MSG_ERROR([libcap-ng not found])
-+       ]
-+       )
-+    ]
-+  )
-+  ]
-+)
- 
--AC_OUTPUT(Makefile)
-+AC_OUTPUT(Makefile glib-local/Makefile)
- 
- AC_MSG_NOTICE()
- AC_MSG_NOTICE([irqbalance Version:     $VERSION])
-diff --git a/cputree.c b/cputree.c
-index af4fd3a..9568967 100644
---- a/cputree.c
-+++ b/cputree.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-diff --git a/glib-local/Makefile.am b/glib-local/Makefile.am
-new file mode 100644
-index 0000000..336b56e
---- /dev/null
-+++ b/glib-local/Makefile.am
-@@ -0,0 +1,8 @@
-+## Process this file with automake to produce Makefile.in
-+noinst_LIBRARIES = libglib.a
-+
-+libglib_a_SOURCES = glist.c
-+
-+libglib_a_CFLAGS = @GLIB_CFLAGS@
-+
-+noinst_HEADERS = glib.h glist.h
-diff --git a/glib-local/glib.h b/glib-local/glib.h
-new file mode 100644
-index 0000000..5874892
---- /dev/null
-+++ b/glib-local/glib.h
-@@ -0,0 +1 @@
-+#include <glist.h>
-diff --git a/glib-local/glist.c b/glib-local/glist.c
-new file mode 100644
-index 0000000..6fa1761
---- /dev/null
-+++ b/glib-local/glist.c
-@@ -0,0 +1,381 @@
-+#include <stdlib.h>
-+
-+#include "glist.h"
-+
-+/**
-+ * g_list_free: 
-+ * @list: a #GList
-+ *
-+ * Frees all of the memory used by a #GList.
-+ * The freed elements are returned to the slice allocator.
-+ *
-+ * <note><para>
-+ * If list elements contain dynamically-allocated memory, 
-+ * you should either use g_list_free_full() or free them manually
-+ * first.
-+ * </para></note>
-+ */
-+void
-+g_list_free (GList *list)
-+{
-+	GList *l = list;
-+
-+	while(l) {
-+		GList *tmp = l->next;
-+		free(l);
-+		l = tmp;
-+	}
-+}
-+
-+/**
-+ * g_list_last:
-+ * @list: a #GList
-+ *
-+ * Gets the last element in a #GList.
-+ *
-+ * Returns: the last element in the #GList, 
-+ *     or %NULL if the #GList has no elements
-+ */
-+GList*
-+g_list_last (GList *list)
-+{
-+  if (list)
-+    {
-+      while (list->next)
-+	list = list->next;
-+    }
-+  
-+  return list;
-+}
-+
-+/**
-+ * g_list_append:
-+ * @list: a pointer to a #GList
-+ * @data: the data for the new element
-+ *
-+ * Adds a new element on to the end of the list.
-+ *
-+ * <note><para>
-+ * The return value is the new start of the list, which 
-+ * may have changed, so make sure you store the new value.
-+ * </para></note>
-+ *
-+ * <note><para>
-+ * Note that g_list_append() has to traverse the entire list 
-+ * to find the end, which is inefficient when adding multiple 
-+ * elements. A common idiom to avoid the inefficiency is to prepend 
-+ * the elements and reverse the list when all elements have been added.
-+ * </para></note>
-+ *
-+ * |[
-+ * /&ast; Notice that these are initialized to the empty list. &ast;/
-+ * GList *list = NULL, *number_list = NULL;
-+ *
-+ * /&ast; This is a list of strings. &ast;/
-+ * list = g_list_append (list, "first");
-+ * list = g_list_append (list, "second");
-+ * 
-+ * /&ast; This is a list of integers. &ast;/
-+ * number_list = g_list_append (number_list, GINT_TO_POINTER (27));
-+ * number_list = g_list_append (number_list, GINT_TO_POINTER (14));
-+ * ]|
-+ *
-+ * Returns: the new start of the #GList
-+ */
-+GList*
-+g_list_append (GList	*list,
-+	       gpointer	 data)
-+{
-+  GList *new_list;
-+  GList *last;
-+  
-+  new_list = malloc(sizeof(*new_list));
-+  new_list->data = data;
-+  new_list->next = NULL;
-+  
-+  if (list)
-+    {
-+      last = g_list_last (list);
-+      /* g_assert (last != NULL); */
-+      last->next = new_list;
-+      new_list->prev = last;
-+
-+      return list;
-+    }
-+  else
-+    {
-+      new_list->prev = NULL;
-+      return new_list;
-+    }
-+}
-+
-+static inline GList*
-+_g_list_remove_link (GList *list,
-+		     GList *link)
-+{
-+  if (link)
-+    {
-+      if (link->prev)
-+	link->prev->next = link->next;
-+      if (link->next)
-+	link->next->prev = link->prev;
-+      
-+      if (link == list)
-+	list = list->next;
-+      
-+      link->next = NULL;
-+      link->prev = NULL;
-+    }
-+  
-+  return list;
-+}
-+
-+/**
-+ * g_list_delete_link:
-+ * @list: a #GList
-+ * @link_: node to delete from @list
-+ *
-+ * Removes the node link_ from the list and frees it. 
-+ * Compare this to g_list_remove_link() which removes the node 
-+ * without freeing it.
-+ *
-+ * Returns: the new head of @list
-+ */
-+GList*
-+g_list_delete_link (GList *list,
-+		    GList *link_)
-+{
-+  list = _g_list_remove_link (list, link_);
-+  free (link_);
-+
-+  return list;
-+}
-+
-+/**
-+ * g_list_first:
-+ * @list: a #GList
-+ *
-+ * Gets the first element in a #GList.
-+ *
-+ * Returns: the first element in the #GList, 
-+ *     or %NULL if the #GList has no elements
-+ */
-+GList*
-+g_list_first (GList *list)
-+{
-+  if (list)
-+    {
-+      while (list->prev)
-+	list = list->prev;
-+    }
-+  
-+  return list;
-+}
-+
-+static GList *
-+g_list_sort_merge (GList     *l1, 
-+		   GList     *l2,
-+		   GFunc     compare_func,
-+		   gpointer  user_data)
-+{
-+  GList list, *l, *lprev;
-+  gint cmp;
-+
-+  l = &list; 
-+  lprev = NULL;
-+
-+  while (l1 && l2)
-+    {
-+      cmp = ((GCompareDataFunc) compare_func) (l1->data, l2->data, user_data);
-+
-+      if (cmp <= 0)
-+        {
-+	  l->next = l1;
-+	  l1 = l1->next;
-+        } 
-+      else 
-+	{
-+	  l->next = l2;
-+	  l2 = l2->next;
-+        }
-+      l = l->next;
-+      l->prev = lprev; 
-+      lprev = l;
-+    }
-+  l->next = l1 ? l1 : l2;
-+  l->next->prev = l;
-+
-+  return list.next;
-+}
-+
-+static GList* 
-+g_list_sort_real (GList    *list,
-+		  GFunc     compare_func,
-+		  gpointer  user_data)
-+{
-+  GList *l1, *l2;
-+  
-+  if (!list) 
-+    return NULL;
-+  if (!list->next) 
-+    return list;
-+  
-+  l1 = list; 
-+  l2 = list->next;
-+
-+  while ((l2 = l2->next) != NULL)
-+    {
-+      if ((l2 = l2->next) == NULL) 
-+	break;
-+      l1 = l1->next;
-+    }
-+  l2 = l1->next; 
-+  l1->next = NULL; 
-+
-+  return g_list_sort_merge (g_list_sort_real (list, compare_func, user_data),
-+			    g_list_sort_real (l2, compare_func, user_data),
-+			    compare_func,
-+			    user_data);
-+}
-+
-+/**
-+ * g_list_sort:
-+ * @list: a #GList
-+ * @compare_func: the comparison function used to sort the #GList.
-+ *     This function is passed the data from 2 elements of the #GList 
-+ *     and should return 0 if they are equal, a negative value if the 
-+ *     first element comes before the second, or a positive value if 
-+ *     the first element comes after the second.
-+ *
-+ * Sorts a #GList using the given comparison function.
-+ *
-+ * Returns: the start of the sorted #GList
-+ */
-+/**
-+ * GCompareFunc:
-+ * @a: a value.
-+ * @b: a value to compare with.
-+ * @Returns: negative value if @a &lt; @b; zero if @a = @b; positive
-+ *           value if @a > @b.
-+ *
-+ * Specifies the type of a comparison function used to compare two
-+ * values.  The function should return a negative integer if the first
-+ * value comes before the second, 0 if they are equal, or a positive
-+ * integer if the first value comes after the second.
-+ **/
-+GList *
-+g_list_sort (GList        *list,
-+	     GCompareFunc  compare_func)
-+{
-+  return g_list_sort_real (list, (GFunc) compare_func, NULL);
-+			    
-+}
-+
-+/**
-+ * g_list_length:
-+ * @list: a #GList
-+ *
-+ * Gets the number of elements in a #GList.
-+ *
-+ * <note><para>
-+ * This function iterates over the whole list to 
-+ * count its elements.
-+ * </para></note>
-+ *
-+ * Returns: the number of elements in the #GList
-+ */
-+guint
-+g_list_length (GList *list)
-+{
-+  guint length;
-+  
-+  length = 0;
-+  while (list)
-+    {
-+      length++;
-+      list = list->next;
-+    }
-+  
-+  return length;
-+}
-+
-+/**
-+ * g_list_foreach:
-+ * @list: a #GList
-+ * @func: the function to call with each element's data
-+ * @user_data: user data to pass to the function
-+ *
-+ * Calls a function for each element of a #GList.
-+ */
-+/**
-+ * GFunc:
-+ * @data: the element's data.
-+ * @user_data: user data passed to g_list_foreach() or
-+ *             g_slist_foreach().
-+ *
-+ * Specifies the type of functions passed to g_list_foreach() and
-+ * g_slist_foreach().
-+ **/
-+void
-+g_list_foreach (GList	 *list,
-+		GFunc	  func,
-+		gpointer  user_data)
-+{
-+  while (list)
-+    {
-+      GList *next = list->next;
-+      (*func) (list->data, user_data);
-+      list = next;
-+    }
-+}
-+
-+/**
-+ * g_list_free_full:
-+ * @list: a pointer to a #GList
-+ * @free_func: the function to be called to free each element's data
-+ *
-+ * Convenience method, which frees all the memory used by a #GList, and
-+ * calls the specified destroy function on every element's data.
-+ *
-+ * Since: 2.28
-+ */
-+void
-+g_list_free_full (GList          *list,
-+		  GDestroyNotify  free_func)
-+{
-+  g_list_foreach (list, (GFunc) free_func, NULL);
-+  g_list_free (list);
-+}
-+
-+/**
-+ * g_list_find_custom:
-+ * @list: a #GList
-+ * @data: user data passed to the function
-+ * @func: the function to call for each element. 
-+ *     It should return 0 when the desired element is found
-+ *
-+ * Finds an element in a #GList, using a supplied function to 
-+ * find the desired element. It iterates over the list, calling 
-+ * the given function which should return 0 when the desired 
-+ * element is found. The function takes two #gconstpointer arguments, 
-+ * the #GList element's data as the first argument and the 
-+ * given user data.
-+ *
-+ * Returns: the found #GList element, or %NULL if it is not found
-+ */
-+GList*
-+g_list_find_custom (GList         *list,
-+		    gconstpointer  data,
-+		    GCompareFunc   func)
-+{
-+  g_return_val_if_fail (func != NULL, list);
-+
-+  while (list)
-+    {
-+      if (! func (list->data, data))
-+	return list;
-+      list = list->next;
-+    }
-+
-+  return NULL;
-+}
-diff --git a/glib-local/glist.h b/glib-local/glist.h
-new file mode 100644
-index 0000000..47f2cfe
---- /dev/null
-+++ b/glib-local/glist.h
-@@ -0,0 +1,56 @@
-+#ifndef __G_LIST_H__
-+#define __G_LIST_H__
-+
-+typedef int    gint;
-+typedef unsigned int    guint;
-+typedef void* gpointer;
-+typedef const void *gconstpointer;
-+typedef gint            (*GCompareFunc)         (gconstpointer  a,
-+                                                 gconstpointer  b);
-+typedef gint            (*GCompareDataFunc)     (gconstpointer  a,
-+                                                 gconstpointer  b,
-+						 gpointer       user_data);
-+typedef void            (*GFunc)                (gpointer       data,
-+                                                 gpointer       user_data);
-+typedef void            (*GDestroyNotify)       (gpointer       data);
-+
-+struct _GList;
-+typedef struct _GList GList;
-+
-+struct _GList
-+{
-+  gpointer data;
-+  GList *next;
-+  GList *prev;
-+};
-+
-+/* Doubly linked lists
-+ */
-+void     g_list_free                    (GList            *list);
-+GList*   g_list_append                  (GList            *list,
-+					 gpointer          data);
-+GList*   g_list_delete_link             (GList            *list,
-+					 GList            *link_);
-+GList*   g_list_first                   (GList            *list);
-+GList*   g_list_sort                    (GList            *list,
-+					 GCompareFunc      compare_func);
-+guint    g_list_length                  (GList            *list);
-+void     g_list_foreach                 (GList            *list,
-+					 GFunc             func,
-+					 gpointer          user_data);
-+void     g_list_free_full               (GList            *list,
-+					 GDestroyNotify    free_func);
-+GList*   g_list_find_custom             (GList            *list,
-+					 gconstpointer     data,
-+					 GCompareFunc      func);
-+
-+#define g_list_previous(list)	        ((list) ? (((GList *)(list))->prev) : NULL)
-+#define g_list_next(list)	        ((list) ? (((GList *)(list))->next) : NULL)
-+
-+#define g_return_val_if_fail(expr,val)	do {			\
-+     if (expr) { } else						\
-+       {								\
-+	 return (val);							\
-+       }				} while(0);
-+
-+#endif /* __G_LIST_H__ */
-diff --git a/irqbalance.1 b/irqbalance.1
-index 55fc15f..20105bc 100644
---- a/irqbalance.1
-+++ b/irqbalance.1
-@@ -39,7 +39,11 @@ Causes irqbalance to be run once, after which the daemon exits
- .TP
- 
- .B --debug
--Causes irqbalance to run in the foreground and extra debug information to be printed
-+Causes irqbalance to print extra debug information.  Implies --foreground
-+
-+.TP
-+.B --foreground
-+Causes irqbalance to run in the foreground (without --debug)
- 
- .TP
- .B --hintpolicy=[exact | subset | ignore]
-@@ -62,6 +66,30 @@ average cpu softirq workload, and no cpus are more than 1 standard deviation
- above (and have more than 1 irq assigned to them), attempt to place 1 cpu in
- powersave mode.  In powersave mode, a cpu will not have any irqs balanced to it,
- in an effort to prevent that cpu from waking up without need.
-+
-+.TP
-+.B --banirq=<irqnum>
-+Add the specified irq list to the set of banned irqs. irqbalance will not affect
-+the affinity of any irqs on the banned list, allowing them to be specified
-+manually.  This option is addative and can be specified multiple times
-+
-+.TP
-+.B --banscript=<script>
-+Execute the specified script for each irq that is discovered, passing the sysfs
-+path to the associated device as the first argument, and the irq vector as the
-+second.  An exit value of 0 tells irqbalance that this interrupt should balanced
-+and managed as a normal irq, while a non-zero exit code indicates this irq
-+should be ignored by irqbalance completely (see --banirq above).  Use of this
-+script provides users the ability to dynamically select which irqs get exluded
-+from balancing, and provides an opportunity for manual affinity setting in one
-+single code point.
-+
-+.TP
-+.B --pid=<file>
-+Have irqbalance write its process id to the specified file.  By default no
-+pidfile is written.  The written pidfile is automatically unlinked when
-+irqbalance exits.
-+
- .SH "ENVIRONMENT VARIABLES"
- .TP
- .B IRQBALANCE_ONESHOT
-@@ -75,9 +103,10 @@ Same as --debug
- .B IRQBALANCE_BANNED_CPUS
- Provides a mask of cpus which irqbalance should ignore and never assign interrupts to
- 
-+.SH "SIGNALS"
- .TP
--.B IRQBALANCE_BANNED_INTERRUPTS
--A list of space delimited IRQ numbers that irqbalance should not touch
-+.B SIGHUP
-+Forces a rescan of the available irqs and system topology
- 
- .SH "Homepage"
- http://code.google.com/p/irqbalance
-diff --git a/irqbalance.c b/irqbalance.c
-index 99c5db7..fbe6ac6 100644
---- a/irqbalance.c
-+++ b/irqbalance.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -27,6 +28,10 @@
- #include <syslog.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <time.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
- #ifdef HAVE_GETOPT_LONG 
- #include <getopt.h>
- #endif
-@@ -39,12 +44,15 @@
- volatile int keep_going = 1;
- int one_shot_mode;
- int debug_mode;
-+int foreground_mode;
- int numa_avail;
--int need_cpu_rescan;
-+int need_rescan;
- extern cpumask_t banned_cpus;
- enum hp_e hint_policy = HINT_POLICY_SUBSET;
- unsigned long power_thresh = ULONG_MAX;
- unsigned long long cycle_count = 0;
-+char *pidfile = NULL;
-+char *banscript = NULL;
- 
- void sleep_approx(int seconds)
- {
-@@ -64,32 +72,45 @@ void sleep_approx(int seconds)
- struct option lopts[] = {
- 	{"oneshot", 0, NULL, 'o'},
- 	{"debug", 0, NULL, 'd'},
-+	{"foreground", 0, NULL, 'f'},
- 	{"hintpolicy", 1, NULL, 'h'},
- 	{"powerthresh", 1, NULL, 'p'},
-+	{"banirq", 1 , NULL, 'i'},
-+	{"banscript", 1, NULL, 'b'},
-+	{"pid", 1, NULL, 's'},
- 	{0, 0, 0, 0}
- };
- 
- static void usage(void)
- {
--	printf("irqbalance [--oneshot | -o] [--debug | -d] [--hintpolicy= | -h [exact|subset|ignore]]\n");
--	printf("	[--powerthresh= | -p <off> | <n>]\n");
-+	printf("irqbalance [--oneshot | -o] [--debug | -d] [--foreground | -f] [--hintpolicy= | -h [exact|subset|ignore]]\n");
-+	printf("	[--powerthresh= | -p <off> | <n>] [--banirq= | -i <n>]\n");
- }
- 
- static void parse_command_line(int argc, char **argv)
- {
- 	int opt;
- 	int longind;
-+	unsigned long val;
- 
- 	while ((opt = getopt_long(argc, argv,
--		"odh:p:",
-+		"odfh:i:p:s:",
- 		lopts, &longind)) != -1) {
- 
- 		switch(opt) {
- 			case '?':
- 				usage();
- 				exit(1);
-+				break;
-+			case 'b':
-+				banscript = strdup(optarg);
-+				break;
- 			case 'd':
- 				debug_mode=1;
-+				foreground_mode=1;
-+				break;
-+			case 'f':
-+				foreground_mode=1;
- 				break;
- 			case 'h':
- 				if (!strncmp(optarg, "exact", strlen(optarg)))
-@@ -103,6 +124,14 @@ static void parse_command_line(int argc, char **argv)
- 					exit(1);
- 				}
- 				break;
-+			case 'i':
-+				val = strtoull(optarg, NULL, 10);
-+				if (val == ULONG_MAX) {
-+					usage();
-+					exit(1);
-+				}
-+				add_banned_irq((int)val);
-+				break;
- 			case 'p':
- 				if (!strncmp(optarg, "off", strlen(optarg)))
- 					power_thresh = ULONG_MAX;
-@@ -117,6 +146,9 @@ static void parse_command_line(int argc, char **argv)
- 			case 'o':
- 				one_shot_mode=1;
- 				break;
-+			case 's':
-+				pidfile = optarg;
-+				break;
- 		}
- 	}
- }
-@@ -172,18 +204,34 @@ static void handler(int signum)
- 	keep_going = 0;
- }
- 
-+static void force_rescan(int signum)
-+{
-+	if (cycle_count)
-+		need_rescan = 1;
-+}
-+
- int main(int argc, char** argv)
- {
--	struct sigaction action;
-+	struct sigaction action, hupaction;
- 
- #ifdef HAVE_GETOPT_LONG
- 	parse_command_line(argc, argv);
- #else
--	if (argc>1 && strstr(argv[1],"--debug"))
-+	if (argc>1 && strstr(argv[1],"--debug")) {
- 		debug_mode=1;
-+		foreground_mode=1;
-+	}
-+	if (argc>1 && strstr(argv[1],"--foreground"))
-+		foreground_mode=1;
- 	if (argc>1 && strstr(argv[1],"--oneshot"))
- 		one_shot_mode=1;
- #endif
-+
-+	/*
-+ 	 * Open the syslog connection
-+ 	 */
-+	openlog(argv[0], 0, LOG_DAEMON);
-+
- 	if (getenv("IRQBALANCE_BANNED_CPUS"))  {
- 		cpumask_parse_user(getenv("IRQBALANCE_BANNED_CPUS"), strlen(getenv("IRQBALANCE_BANNED_CPUS")), banned_cpus);
- 	}
-@@ -212,17 +260,35 @@ int main(int argc, char** argv)
- 
- 
- 	/* On single core UP systems irqbalance obviously has no work to do */
--	if (core_count<2) 
-+	if (core_count<2) {
-+		char *msg = "Balaincing is ineffective on systems with a "
-+			    "single cache domain.  Shutting down\n";
-+
-+		if (debug_mode)
-+			printf("%s", msg);
-+		else
-+			syslog(LOG_INFO, "%s", msg);
- 		exit(EXIT_SUCCESS);
-+	}
- 	/* On dual core/hyperthreading shared cache systems just do a one shot setup */
- 	if (cache_domain_count==1)
- 		one_shot_mode = 1;
- 
--	if (!debug_mode)
-+	if (!foreground_mode) {
-+		int pidfd = -1;
- 		if (daemon(0,0))
- 			exit(EXIT_FAILURE);
-+		/* Write pidfile */
-+		if (pidfile && (pidfd = open(pidfile,
-+			O_WRONLY | O_CREAT | O_EXCL | O_TRUNC,
-+			S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) >= 0) {
-+			char str[16];
-+			snprintf(str, sizeof(str), "%u\n", getpid());
-+			write(pidfd, str, strlen(str));
-+			close(pidfd);
-+		}
-+	}
- 
--	openlog(argv[0], 0, LOG_DAEMON);
- 
- #ifdef HAVE_LIBCAP_NG
- 	// Drop capabilities
-@@ -236,6 +302,11 @@ int main(int argc, char** argv)
- 	parse_proc_interrupts();
- 	parse_proc_stat();
- 
-+	hupaction.sa_handler = force_rescan;
-+	sigemptyset(&hupaction.sa_mask);
-+	hupaction.sa_flags = 0;
-+	sigaction(SIGHUP, &hupaction, NULL);
-+
- 	while (keep_going) {
- 		sleep_approx(SLEEP_INTERVAL);
- 		if (debug_mode)
-@@ -247,8 +318,8 @@ int main(int argc, char** argv)
- 		parse_proc_stat();
- 
- 		/* cope with cpu hotplug -- detected during /proc/interrupts parsing */
--		if (need_cpu_rescan) {
--			need_cpu_rescan = 0;
-+		if (need_rescan) {
-+			need_rescan = 0;
- 			/* if there's a hotplug event we better turn off power mode for a bit until things settle */
- 			power_mode = 0;
- 			if (debug_mode)
-@@ -282,5 +353,10 @@ int main(int argc, char** argv)
- 
- 	}
- 	free_object_tree();
-+
-+	/* Remove pidfile */
-+	if (!foreground_mode && pidfile)
-+		unlink(pidfile);
-+
- 	return EXIT_SUCCESS;
- }
-diff --git a/irqbalance.h b/irqbalance.h
-index 4e85325..e46f31f 100644
---- a/irqbalance.h
-+++ b/irqbalance.h
-@@ -9,6 +9,7 @@
- #include <stdint.h>
- #include <glib.h>
- #include <syslog.h>
-+#include <limits.h>
- 
- #include "types.h"
- #ifdef HAVE_NUMA_H
-@@ -40,7 +41,6 @@ void dump_tree(void);
- 
- void activate_mappings(void);
- void account_for_nic_stats(void);
--void check_power_mode(void);
- void clear_cpu_tree(void);
- void pci_numa_scan(void);
- 
-@@ -64,10 +64,11 @@ enum hp_e {
- extern int debug_mode;
- extern int one_shot_mode;
- extern int power_mode;
--extern int need_cpu_rescan;
-+extern int need_rescan;
- extern enum hp_e hint_policy;
- extern unsigned long long cycle_count;
- extern unsigned long power_thresh;
-+extern char *banscript;
- 
- /*
-  * Numa node access routines
-@@ -103,10 +104,11 @@ extern int get_cpu_count(void);
-  */
- extern void rebuild_irq_db(void);
- extern void free_irq_db(void);
-+extern void add_banned_irq(int irq);
- extern void for_each_irq(GList *list, void (*cb)(struct irq_info *info,  void *data), void *data);
- extern struct irq_info *get_irq_info(int irq);
- extern void migrate_irq(GList **from, GList **to, struct irq_info *info);
--extern struct irq_info *add_misc_irq(int irq);
-+extern struct irq_info *add_new_irq(int irq);
- #define irq_numa_node(irq) ((irq)->numa_node)
- 
- 
-diff --git a/irqlist.c b/irqlist.c
-index c29ee84..2523173 100644
---- a/irqlist.c
-+++ b/irqlist.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -45,6 +46,7 @@ struct load_balance_info {
- 	unsigned int num_within;
- 	unsigned int num_over;
- 	unsigned int num_under;
-+	unsigned int num_powersave;
- 	struct topo_obj *powersave;
- };
- 
-@@ -106,13 +108,16 @@ static void migrate_overloaded_irqs(struct topo_obj *obj, void *data)
- 	struct load_balance_info *info = data;
- 	int deviation;
- 
-+	if (obj->powersave_mode)
-+		info->num_powersave++;
-+
- 	/*
-  	 * Don't rebalance irqs on objects whos load is below the average
-  	 */
- 	if (obj->load <= info->avg_load) {
- 		if ((obj->load + info->std_deviation) <= info->avg_load) {
- 			info->num_under++;
--			if (!info->powersave)
-+			if (power_thresh != ULONG_MAX && !info->powersave)
- 				if (!obj->powersave_mode)
- 					info->powersave = obj;
- 		} else
-@@ -172,13 +177,13 @@ void update_migration_status(void)
- {
- 	struct load_balance_info info;
- 	find_overloaded_objs(cpus, info);
--	if (cycle_count > 5) {
-+	if (power_thresh != ULONG_MAX && cycle_count > 5) {
- 		if (!info.num_over && (info.num_under >= power_thresh) && info.powersave) {
- 			syslog(LOG_INFO, "cpu %d entering powersave mode\n", info.powersave->number);
- 			info.powersave->powersave_mode = 1;
- 			if (g_list_length(info.powersave->interrupts) > 0)
- 				for_each_irq(info.powersave->interrupts, force_irq_migration, NULL);
--		} else if (info.num_over) {
-+		} else if ((info.num_over) && (info.num_powersave)) {
- 			syslog(LOG_INFO, "Load average increasing, re-enabling all cpus for irq balancing\n");
- 			for_each_object(cpus, clear_powersave_mode, NULL);
- 		}
-diff --git a/m4/cap-ng.m4 b/m4/cap-ng.m4
-deleted file mode 100644
-index 0024edc..0000000
---- a/m4/cap-ng.m4
-+++ /dev/null
-@@ -1,40 +0,0 @@
--# libcap-ng.m4 - Checks for the libcap-ng support
--# 	Copyright (c) 2009 Steve Grubb sgrubb@redhat.com
--#
--AC_DEFUN([LIBCAP_NG_PATH],
--[
--  AC_ARG_WITH(libcap-ng,
--    [  --with-libcap-ng=[auto/yes/no]  Add Libcap-ng support [default=auto]],,
--    with_libcap_ng=auto)
--
--  # Check for Libcap-ng API
--  #
--  # libcap-ng detection
--
--  if test x$with_libcap_ng = xno ; then
--      have_libcap_ng=no;
--  else
--      # Start by checking for header file
--      AC_CHECK_HEADER(cap-ng.h, capng_headers=yes, capng_headers=no)
--
--      # See if we have libcap-ng library
--      AC_CHECK_LIB(cap-ng, capng_clear,
--	         CAPNG_LDADD=-lcap-ng,)
--
--      # Check results are usable
--      if test x$with_libcap_ng = xyes -a x$CAPNG_LDADD = x ; then
--         AC_MSG_ERROR(libcap-ng support was requested and the library was not found)
--      fi
--      if test x$CAPNG_LDADD != x -a $capng_headers = no ; then
--         AC_MSG_ERROR(libcap-ng libraries found but headers are missing)
--      fi
--  fi
--  AC_SUBST(CAPNG_LDADD)
--  AC_MSG_CHECKING(whether to use libcap-ng)
--  if test x$CAPNG_LDADD != x ; then
--      AC_DEFINE(HAVE_LIBCAP_NG,1,[libcap-ng support])
--      AC_MSG_RESULT(yes)
--  else
--      AC_MSG_RESULT(no)
--  fi
--])
-diff --git a/misc/irqbalance.env b/misc/irqbalance.env
-new file mode 100644
-index 0000000..bd87e3d
---- /dev/null
-+++ b/misc/irqbalance.env
-@@ -0,0 +1,26 @@
-+# irqbalance is a daemon process that distributes interrupts across
-+# CPUS on SMP systems.  The default is to rebalance once every 10
-+# seconds.  This is the environment file that is specified to systemd via the 
-+# EnvironmentFile key in the service unit file (or via whatever method the init
-+# system you're using has. 
-+#
-+# ONESHOT=yes
-+#    after starting, wait for a minute, then look at the interrupt
-+#    load and balance it once; after balancing exit and do not change
-+#    it again.
-+#IRQBALANCE_ONESHOT=
-+
-+#
-+# IRQBALANCE_BANNED_CPUS
-+#    64 bit bitmask which allows you to indicate which cpu's should
-+#    be skipped when reblancing irqs.  Cpu numbers which have their 
-+#    corresponding bits set to one in this mask will not have any
-+#    irq's assigned to them on rebalance
-+#
-+#IRQBALANCE_BANNED_CPUS=
-+
-+#
-+# IRQBALANCE_ARGS
-+#    append any args here to the irqbalance daemon as documented in the man page
-+#
-+#IRQBALANCE_ARGS=
-diff --git a/misc/irqbalance.service b/misc/irqbalance.service
-index f349616..3139a83 100644
---- a/misc/irqbalance.service
-+++ b/misc/irqbalance.service
-@@ -3,9 +3,8 @@ Description=irqbalance daemon
- After=syslog.target
- 
- [Service]
--EnvironmentFile=/etc/sysconfig/irqbalance
--Type=forking
--ExecStart=/usr/sbin/irqbalance $ONESHOT
-+EnvironmentFile=/path/to/irqbalance.env
-+ExecStart=/usr/sbin/irqbalance --foreground $IRQBALANCE_ARGS
- 
- [Install]
- WantedBy=multi-user.target
-diff --git a/numa.c b/numa.c
-index 710ed67..96703bd 100644
---- a/numa.c
-+++ b/numa.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -106,11 +107,11 @@ void build_numa_node_list(void)
- static void free_numa_node(gpointer data)
- {
- 	struct topo_obj *obj = data;
--	if (data == &unspecified_node)
--		return;
--
- 	g_list_free(obj->children);
--	free(data);
-+	g_list_free(obj->interrupts);
-+
-+	if (data != &unspecified_node)
-+		free(data);
- }
- 
- void free_numa_node_list(void)
-diff --git a/placement.c b/placement.c
-index 108ccc9..1172849 100644
---- a/placement.c
-+++ b/placement.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhoramn@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -48,7 +49,7 @@ static void find_best_object(struct topo_obj *d, void *data)
- 	/*
-  	 * Don't consider the unspecified numa node here
-  	 */
--	if ((d->obj_type == OBJ_TYPE_NODE) && (d->number == -1))
-+	if (numa_avail && (d->obj_type == OBJ_TYPE_NODE) && (d->number == -1))
- 		return;
- 
- 	/*
-diff --git a/powermode.c b/powermode.c
-deleted file mode 100644
-index 82ba490..0000000
---- a/powermode.c
-+++ /dev/null
-@@ -1,34 +0,0 @@
--/* 
-- * Copyright (C) 2006, Intel Corporation
-- * 
-- * This file is part of irqbalance
-- *
-- * This program 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; version 2 of the License.
-- * 
-- * 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 in a file named COPYING; if not, write to the 
-- * Free Software Foundation, Inc., 
-- * 51 Franklin Street, Fifth Floor, 
-- * Boston, MA 02110-1301 USA
-- */
--#include "config.h"
--#include <stdio.h>
--#include <stdlib.h>
--#include <unistd.h>
--#include <stdint.h>
--#include <string.h>
--
--#include "irqbalance.h"
--
--
--void check_power_mode(void)
--{
--}
--
-diff --git a/procinterrupts.c b/procinterrupts.c
-index 4d3b07b..431fffa 100644
---- a/procinterrupts.c
-+++ b/procinterrupts.c
-@@ -1,5 +1,6 @@
- /* 
-  * Copyright (C) 2006, Intel Corporation
-+ * Copyright (C) 2012, Neil Horman <nhorman@tuxdriver.com> 
-  * 
-  * This file is part of irqbalance
-  *
-@@ -32,6 +33,8 @@
- 
- #define LINESIZE 4096
- 
-+extern cpumask_t banned_cpus;
-+
- static int proc_int_has_msi = 0;
- static int msi_found_in_sysfs = 0;
- 
-@@ -80,8 +83,12 @@ void parse_proc_interrupts(void)
- 		c++;
- 		number = strtoul(line, NULL, 10);
- 		info = get_irq_info(number);
--		if (!info)
--			info = add_misc_irq(number);
-+		if (!info) {
-+			if (!cycle_count)
-+				continue;
-+			need_rescan = 1;
-+			info = add_new_irq(number);
-+		}
- 
- 		count = 0;
- 		cpunr = 0;
-@@ -97,7 +104,7 @@ void parse_proc_interrupts(void)
- 			cpunr++;
- 		}
- 		if (cpunr != core_count) 
--			need_cpu_rescan = 1;
-+			need_rescan = 1;
- 
- 		info->last_irq_count = info->irq_count;		
- 		info->irq_count = count;
-@@ -217,6 +224,9 @@ void parse_proc_stat(void)
- 
- 		cpunr = strtoul(&line[3], NULL, 10);
- 
-+		if (cpu_isset(cpunr, banned_cpus))
-+			continue;
-+
- 		rc = sscanf(line, "%*s %*d %*d %*d %*d %*d %d %d", &irq_load, &softirq_load);
- 		if (rc < 2)
- 			break;	
diff --git a/testing/irqbalance/irqbalance.conf.d b/testing/irqbalance/irqbalance.conf.d
deleted file mode 100644
index ef1bdfd75..000000000
--- a/testing/irqbalance/irqbalance.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Settings for irqbalance daemon
-#
-
-# one shot mode - set to 1 if you have Pentium 4 with HT
-ONESHOT=0
diff --git a/testing/irqbalance/irqbalance.rc.d b/testing/irqbalance/irqbalance.rc.d
deleted file mode 100644
index 987c26b51..000000000
--- a/testing/irqbalance/irqbalance.rc.d
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-ONESHOT=0
-[ -f /etc/conf.d/irqbalance ] && . /etc/conf.d/irqbalance
-
-if [ "$ONESHOT" -ne 0 ]; then
-	ONESHOT_CMD="--oneshot"
-fi
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/irqbalance`
-case "$1" in
-  start)
-    stat_busy "Starting IRQ balancing"
-    [ -z "$PID" ] && /usr/sbin/irqbalance $ONESHOT_CMD
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      if [ "$ONESHOT" -eq 0 ]; then
-        add_daemon irqbalance
-      fi
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping IRQ balancing"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon irqbalance
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/irqbalance/irqbalance.service b/testing/irqbalance/irqbalance.service
deleted file mode 100644
index 372ac0aa4..000000000
--- a/testing/irqbalance/irqbalance.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=CPU Interrupt Request Balancer
-
-[Service]
-ExecStart=/usr/sbin/irqbalance --foreground
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD
deleted file mode 100644
index 5eeac9eec..000000000
--- a/testing/isl/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 161919 2012-06-16 14:55:37Z heftig $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=isl
-pkgver=0.10
-pkgrel=1
-pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
-arch=('i686' 'x86_64')
-url="http://www.kotnet.org/~skimo/isl/"
-license=('LGPL2.1')
-options=('!libtool')
-source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('c1ece653891bb2a5f55ca25e3f4e8f35')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -j1 DESTDIR="$pkgdir/" install
-
-  install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/
-  mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.0.0-gdb.py
-}
diff --git a/testing/iw/PKGBUILD b/testing/iw/PKGBUILD
deleted file mode 100644
index 1e7cbe073..000000000
--- a/testing/iw/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 165785 2012-08-29 23:06:26Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=iw
-pkgver=3.6
-pkgrel=1
-pkgdesc="nl80211 based CLI configuration utility for wireless devices"
-arch=("i686" "x86_64")
-url="http://wireless.kernel.org/en/users/Documentation/iw"
-license=("GPL")
-depends=("libnl")
-makedepends=("linux-api-headers")
-source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('df11036ac11df31f44083da962a6e9c74bdea7c01c596c4b5840f948cdb6c857')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/jack/40-hpet-permissions.rules b/testing/jack/40-hpet-permissions.rules
deleted file mode 100644
index 7af3780f9..000000000
--- a/testing/jack/40-hpet-permissions.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-KERNEL=="rtc0", GROUP="audio"
-KERNEL=="hpet", GROUP="audio"
diff --git a/testing/jack/99-audio.conf b/testing/jack/99-audio.conf
deleted file mode 100644
index eb76ef920..000000000
--- a/testing/jack/99-audio.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-@audio 	- rtprio 	99
-@audio 	- memlock 	unlimited
diff --git a/testing/jack/PKGBUILD b/testing/jack/PKGBUILD
deleted file mode 100644
index 185e4d02f..000000000
--- a/testing/jack/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 167217 2012-09-28 14:43:50Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@archlinux.net>
-# Contributor: Robert Emil Berge <robert@rebi.no>
-
-pkgname=jack
-_longname=jack-audio-connection-kit
-pkgver=0.121.3
-pkgrel=7
-pkgdesc="A low-latency audio server"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL')
-depends=('libsamplerate' 'readline')
-makedepends=('doxygen' 'libffado' 'celt')
-optdepends=('libffado: FireWire support'
-            'celt: NetJACK driver')
-url="http://jackaudio.org/"
-backup=(etc/security/limits.d/99-audio.conf)
-options=('!libtool')
-provides=("$_longname=$pkgver")
-conflicts=("$_longname")
-replaces=("$_longname")
-install=$pkgname.install
-source=("http://jackaudio.org/downloads/$_longname-$pkgver.tar.gz"
-        '99-audio.conf'
-        '40-hpet-permissions.rules'
-        'ffado_setbuffsize-jack1.patch')
-md5sums=('35f470f7422c37b33eb965033f7a42e8'
-         'ae65b7c9ebe0fff6c918ba9d97ae342d'
-         '471aad533ff56c5d3cbbf65ce32cadef'
-         'c1f78ee7847c6d5e471d90626623ffb4')
-
-build() {
-  cd "$srcdir/$_longname-$pkgver"
-
-  # backport firewire stuff
-  #   - needed for setbuffsize feature in latest stable ffado
-  # from https://github.com/jackaudio/jack1/commit/025d3ad
-  patch -Np1 -i "$srcdir/ffado_setbuffsize-jack1.patch"
-
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib
-  make
-}
-
-package() {
-  cd "$srcdir/$_longname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # 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/usr/lib/udev/rules.d/40-hpet-permissions.rules"
-
-  # install a missing header forgotten by upstream
-  # see https://bugs.archlinux.org/task/26865
-  install -Dm644 "$srcdir/$_longname-$pkgver/jack/jslist.h" \
-    "$pkgdir/usr/include/jack/jslist.h"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/jack/ffado_setbuffsize-jack1.patch b/testing/jack/ffado_setbuffsize-jack1.patch
deleted file mode 100644
index 7e43962ee..000000000
--- a/testing/jack/ffado_setbuffsize-jack1.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 025d3ad4d5adeff00e97b6fafdf32d6d199d0baa Mon Sep 17 00:00:00 2001
-From: Jonathan Woithe <jwoithe@just42.net>
-Date: Tue, 13 Mar 2012 15:43:03 +1030
-Subject: [PATCH] Support setbufsize in firewire driver
-
----
- drivers/firewire/ffado_driver.c |   69 ++++++++++++++++++++++++++++++++++-----
- 1 file changed, 60 insertions(+), 9 deletions(-)
-
-diff --git a/drivers/firewire/ffado_driver.c b/drivers/firewire/ffado_driver.c
-index a8ad1ea..6035af3 100644
---- a/drivers/firewire/ffado_driver.c
-+++ b/drivers/firewire/ffado_driver.c
-@@ -7,6 +7,7 @@
-  *   http://www.jackaudio.org
-  *
-  *   Copyright (C) 2005-2007 Pieter Palmers
-+ *   Copyright (C) 2012 Jonathan Woithe
-  *
-  *   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
-@@ -50,7 +51,10 @@
- 
- static int ffado_driver_stop (ffado_driver_t *driver);
- 
-+// Basic functionality requires API version 8.  If version 9 or later
-+// is present the buffers can be resized at runtime.
- #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8
-+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9
- 
- // enable verbose messages
- static int g_verbose=0;
-@@ -675,24 +679,71 @@
- static int
- ffado_driver_bufsize (ffado_driver_t* driver, jack_nframes_t nframes)
- {
--	printError("Buffer size change requested but not supported!!!");
-+	signed int chn;
-+
-+	// The speed of this function isn't critical; we can afford the
-+	// time to check the FFADO API version.
-+	if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE ||
-+            ffado_streaming_set_period_size == NULL) {
-+	        printError("unsupported on current version of FFADO; please upgrade FFADO");
-+	        return -1;
-+	}
- 
--	/*
--	 driver->period_size = nframes;  
-+	driver->period_size = nframes;
- 	driver->period_usecs =
- 		(jack_time_t) floor ((((float) nframes) / driver->sample_rate)
- 				     * 1000000.0f);
--	*/
--	
-+
-+	// Reallocate the null and scratch buffers.
-+	driver->nullbuffer = calloc(driver->period_size, sizeof(ffado_sample_t));
-+	if(driver->nullbuffer == NULL) {
-+		printError("could not allocate memory for null buffer");
-+		return -1;
-+	}
-+	driver->scratchbuffer = calloc(driver->period_size, sizeof(ffado_sample_t));
-+	if(driver->scratchbuffer == NULL) {
-+		printError("could not allocate memory for scratch buffer");
-+		return -1;
-+	}
-+
-+	// MIDI buffers need reallocating
-+	for (chn = 0; chn < driver->capture_nchannels; chn++) {
-+		if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) {
-+			// setup the midi buffer
-+			if (driver->capture_channels[chn].midi_buffer != NULL)
-+			        free(driver->capture_channels[chn].midi_buffer);
-+			driver->capture_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t));
-+		}
-+	}
-+	for (chn = 0; chn < driver->playback_nchannels; chn++) {
-+		if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) {
-+		        if (driver->playback_channels[chn].midi_buffer != NULL)
-+		                free(driver->playback_channels[chn].midi_buffer);
-+			driver->playback_channels[chn].midi_buffer = calloc(driver->period_size, sizeof(uint32_t));
-+		}
-+	}
-+
-+	// Notify FFADO of the period size change
-+	if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) {
-+	        printError("could not alter FFADO device period size");
-+	        return -1;
-+	}
-+
-+	// This is needed to give the shadow variables a chance to
-+	// properly update to the changes.
-+	sleep(1);
-+
- 	/* tell the engine to change its buffer size */
--#if 0
- 	if (driver->engine->set_buffer_size (driver->engine, nframes)) {
- 		jack_error ("FFADO: cannot set engine buffer size to %d (check MIDI)", nframes);
- 		return -1;
- 	}
--#endif
- 
--	return -1; // unsupported
-+	// Other drivers (eg: ALSA) don't seem to adjust latencies via
-+	// jack_port_set_latency_range() from the bufsize() callback, so we
-+	// won't either.  Is this right?
-+
-+        return 0;
- }
- 
- typedef void (*JackDriverFinishFunction) (jack_driver_t *);
-@@ -704,7 +755,7 @@
- {
- 	ffado_driver_t *driver;
- 
--	if(ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) {
-+	if(ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) {
- 		printError("Incompatible libffado version! (%s)", ffado_get_version());
- 		return NULL;
- 	}
--- 
-1.7.10
-
diff --git a/testing/jack/jack.install b/testing/jack/jack.install
deleted file mode 100644
index 8be532f6d..000000000
--- a/testing/jack/jack.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() {
-	rm -f etc/security/limits.d/99-realtime.conf
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/jasper/PKGBUILD b/testing/jasper/PKGBUILD
deleted file mode 100644
index dc7b9662c..000000000
--- a/testing/jasper/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168284 2012-10-07 21:09:20Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=jasper
-pkgver=1.900.1
-pkgrel=8
-pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
-arch=('i686' 'x86_64')
-url="http://www.ece.uvic.ca/~mdadams/jasper/"
-license=('custom:JasPer2.0')
-depends=('libjpeg' 'freeglut' 'libxmu' 'glu')
-options=('!libtool')
-source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip jpc_dec.c.patch
-        patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch
-        jasper-1.900.1-CVE-2008-3522.patch)
-sha1sums=('9c5735f773922e580bf98c7c7dfda9bbed4c5191'
-          'c1a0176a15210c0af14d85e55ce566921957d780'
-          'f298566fef08c8a589d072582112cd51c72c3983'
-          '2483dba925670bf29f531d85d73c4e5ada513b01'
-          '0e7b6142cd9240ffb15a1ed7297c43c76fa09ee4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/jpc_dec.c.patch"
-  patch -p1 -i "${srcdir}/patch-libjasper-stepsizes-overflow.diff"
-  patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3520.patch"
-  patch -p1 -i "${srcdir}/jasper-1.900.1-CVE-2008-3522.patch"
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch b/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch
deleted file mode 100644
index 0f5e3b746..000000000
--- a/testing/jasper/jasper-1.900.1-CVE-2008-3520.patch
+++ /dev/null
@@ -1,928 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3520
-
-OpenBSD jas_malloc hardening patches
-
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_cm.c jasper-1.900.1/src/libjasper/base/jas_cm.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_cm.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_cm.c	2009-10-22 10:27:45.000000000 +0200
-@@ -704,8 +704,7 @@ static int jas_cmpxformseq_resize(jas_cm
- {
- 	jas_cmpxform_t **p;
- 	assert(n >= pxformseq->numpxforms);
--	p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
--	  jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
-+	p = jas_realloc2(pxformseq->pxforms, n, sizeof(jas_cmpxform_t *));
- 	if (!p) {
- 		return -1;
- 	}
-@@ -889,13 +888,13 @@ static int jas_cmshapmatlut_set(jas_cmsh
- 	jas_cmshapmatlut_cleanup(lut);
- 	if (curv->numents == 0) {
- 		lut->size = 2;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		lut->data[0] = 0.0;
- 		lut->data[1] = 1.0;
- 	} else if (curv->numents == 1) {
- 		lut->size = 256;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		gamma = curv->ents[0] / 256.0;
- 		for (i = 0; i < lut->size; ++i) {
-@@ -903,7 +902,7 @@ static int jas_cmshapmatlut_set(jas_cmsh
- 		}
- 	} else {
- 		lut->size = curv->numents;
--		if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-+		if (!(lut->data = jas_alloc2(lut->size, sizeof(jas_cmreal_t))))
- 			goto error;
- 		for (i = 0; i < lut->size; ++i) {
- 			lut->data[i] = curv->ents[i] / 65535.0;
-@@ -953,7 +952,7 @@ static int jas_cmshapmatlut_invert(jas_c
- 			return -1;
- 		}
- 	}
--	if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
-+	if (!(invlut->data = jas_alloc2(n, sizeof(jas_cmreal_t))))
- 		return -1;
- 	invlut->size = n;
- 	for (i = 0; i < invlut->size; ++i) {
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_icc.c jasper-1.900.1/src/libjasper/base/jas_icc.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_icc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -373,7 +373,7 @@ int jas_iccprof_save(jas_iccprof_t *prof
- 	jas_icctagtab_t *tagtab;
- 
- 	tagtab = &prof->tagtab;
--	if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
-+	if (!(tagtab->ents = jas_alloc2(prof->attrtab->numattrs,
- 	  sizeof(jas_icctagtabent_t))))
- 		goto error;
- 	tagtab->numents = prof->attrtab->numattrs;
-@@ -522,7 +522,7 @@ static int jas_iccprof_gettagtab(jas_str
- 	}
- 	if (jas_iccgetuint32(in, &tagtab->numents))
- 		goto error;
--	if (!(tagtab->ents = jas_malloc(tagtab->numents *
-+	if (!(tagtab->ents = jas_alloc2(tagtab->numents,
- 	  sizeof(jas_icctagtabent_t))))
- 		goto error;
- 	tagtabent = tagtab->ents;
-@@ -743,8 +743,7 @@ static int jas_iccattrtab_resize(jas_icc
- {
- 	jas_iccattr_t *newattrs;
- 	assert(maxents >= tab->numattrs);
--	newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
--	  sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
-+	newattrs = jas_realloc2(tab->attrs, maxents, sizeof(jas_iccattr_t));
- 	if (!newattrs)
- 		return -1;
- 	tab->attrs = newattrs;
-@@ -999,7 +998,7 @@ static int jas_icccurv_input(jas_iccattr
- 
- 	if (jas_iccgetuint32(in, &curv->numents))
- 		goto error;
--	if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
-+	if (!(curv->ents = jas_alloc2(curv->numents, sizeof(jas_iccuint16_t))))
- 		goto error;
- 	for (i = 0; i < curv->numents; ++i) {
- 		if (jas_iccgetuint16(in, &curv->ents[i]))
-@@ -1100,7 +1099,7 @@ static int jas_icctxtdesc_input(jas_icca
- 	if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
- 	  jas_iccgetuint32(in, &txtdesc->uclen))
- 		goto error;
--	if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
-+	if (!(txtdesc->ucdata = jas_alloc2(txtdesc->uclen, 2)))
- 		goto error;
- 	if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
- 	  JAS_CAST(int, txtdesc->uclen * 2))
-@@ -1292,17 +1291,17 @@ static int jas_icclut8_input(jas_iccattr
- 	  jas_iccgetuint16(in, &lut8->numouttabents))
- 		goto error;
- 	clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
--	if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
--	  lut8->numintabents * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->intabs = jas_malloc(lut8->numinchans *
-+	if (!(lut8->clut = jas_alloc2(clutsize, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->intabsbuf = jas_alloc3(lut8->numinchans,
-+	  lut8->numintabents, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->intabs = jas_alloc2(lut8->numinchans,
- 	  sizeof(jas_iccuint8_t *))))
- 		goto error;
- 	for (i = 0; i < lut8->numinchans; ++i)
- 		lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
--	if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
--	  lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
--	  !(lut8->outtabs = jas_malloc(lut8->numoutchans *
-+	if (!(lut8->outtabsbuf = jas_alloc3(lut8->numoutchans,
-+	  lut8->numouttabents, sizeof(jas_iccuint8_t))) ||
-+	  !(lut8->outtabs = jas_alloc2(lut8->numoutchans,
- 	  sizeof(jas_iccuint8_t *))))
- 		goto error;
- 	for (i = 0; i < lut8->numoutchans; ++i)
-@@ -1461,17 +1460,17 @@ static int jas_icclut16_input(jas_iccatt
- 	  jas_iccgetuint16(in, &lut16->numouttabents))
- 		goto error;
- 	clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
--	if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
--	  lut16->numintabents * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->intabs = jas_malloc(lut16->numinchans *
-+	if (!(lut16->clut = jas_alloc2(clutsize, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->intabsbuf = jas_alloc3(lut16->numinchans,
-+	  lut16->numintabents, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->intabs = jas_alloc2(lut16->numinchans,
- 	  sizeof(jas_iccuint16_t *))))
- 		goto error;
- 	for (i = 0; i < lut16->numinchans; ++i)
- 		lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
--	if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
--	  lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
--	  !(lut16->outtabs = jas_malloc(lut16->numoutchans *
-+	if (!(lut16->outtabsbuf = jas_alloc3(lut16->numoutchans,
-+	  lut16->numouttabents, sizeof(jas_iccuint16_t))) ||
-+	  !(lut16->outtabs = jas_alloc2(lut16->numoutchans,
- 	  sizeof(jas_iccuint16_t *))))
- 		goto error;
- 	for (i = 0; i < lut16->numoutchans; ++i)
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_image.c jasper-1.900.1/src/libjasper/base/jas_image.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_image.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_image.c	2009-10-22 10:27:45.000000000 +0200
-@@ -142,7 +142,7 @@ jas_image_t *jas_image_create(int numcmp
- 	image->inmem_ = true;
- 
- 	/* Allocate memory for the per-component information. */
--	if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
-+	if (!(image->cmpts_ = jas_alloc2(image->maxcmpts_,
- 	  sizeof(jas_image_cmpt_t *)))) {
- 		jas_image_destroy(image);
- 		return 0;
-@@ -774,8 +774,7 @@ static int jas_image_growcmpts(jas_image
- 	jas_image_cmpt_t **newcmpts;
- 	int cmptno;
- 
--	newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
--	  jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
-+	newcmpts = jas_realloc2(image->cmpts_, maxcmpts, sizeof(jas_image_cmpt_t *));
- 	if (!newcmpts) {
- 		return -1;
- 	}
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c jasper-1.900.1/src/libjasper/base/jas_malloc.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_malloc.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_malloc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -76,6 +76,9 @@
- 
- /* We need the prototype for memset. */
- #include <string.h>
-+#include <limits.h>
-+#include <errno.h>
-+#include <stdint.h>
- 
- #include "jasper/jas_malloc.h"
- 
-@@ -113,18 +116,50 @@ void jas_free(void *ptr)
- 
- void *jas_realloc(void *ptr, size_t size)
- {
--	return realloc(ptr, size);
-+	return ptr ? realloc(ptr, size) : malloc(size);
- }
- 
--void *jas_calloc(size_t nmemb, size_t size)
-+void *jas_realloc2(void *ptr, size_t nmemb, size_t size)
-+{
-+	if (!ptr)
-+		return jas_alloc2(nmemb, size);
-+	if (nmemb && SIZE_MAX / nmemb < size) {
-+		errno = ENOMEM;
-+		return NULL;
-+	}
-+	return jas_realloc(ptr, nmemb * size);
-+
-+}
-+
-+void *jas_alloc2(size_t nmemb, size_t size)
-+{
-+	if (nmemb && SIZE_MAX / nmemb < size) {
-+		errno = ENOMEM;
-+		return NULL;
-+	}
-+
-+	return jas_malloc(nmemb * size);
-+}
-+
-+void *jas_alloc3(size_t a, size_t b, size_t c)
- {
--	void *ptr;
- 	size_t n;
--	n = nmemb * size;
--	if (!(ptr = jas_malloc(n * sizeof(char)))) {
--		return 0;
-+
-+	if (a && SIZE_MAX / a < b) {
-+		errno = ENOMEM;
-+		return NULL;
- 	}
--	memset(ptr, 0, n);
-+
-+	return jas_alloc2(a*b, c);
-+}
-+
-+void *jas_calloc(size_t nmemb, size_t size)
-+{
-+	void *ptr;
-+
-+	ptr = jas_alloc2(nmemb, size);
-+	if (ptr)
-+		memset(ptr, 0, nmemb*size);
- 	return ptr;
- }
- 
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_seq.c jasper-1.900.1/src/libjasper/base/jas_seq.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_seq.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_seq.c	2009-10-22 10:27:45.000000000 +0200
-@@ -114,7 +114,7 @@ jas_matrix_t *jas_matrix_create(int numr
- 	matrix->datasize_ = numrows * numcols;
- 
- 	if (matrix->maxrows_ > 0) {
--		if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
-+		if (!(matrix->rows_ = jas_alloc2(matrix->maxrows_,
- 		  sizeof(jas_seqent_t *)))) {
- 			jas_matrix_destroy(matrix);
- 			return 0;
-@@ -122,7 +122,7 @@ jas_matrix_t *jas_matrix_create(int numr
- 	}
- 
- 	if (matrix->datasize_ > 0) {
--		if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
-+		if (!(matrix->data_ = jas_alloc2(matrix->datasize_,
- 		  sizeof(jas_seqent_t)))) {
- 			jas_matrix_destroy(matrix);
- 			return 0;
-@@ -220,7 +220,7 @@ void jas_matrix_bindsub(jas_matrix_t *ma
- 	mat0->numrows_ = r1 - r0 + 1;
- 	mat0->numcols_ = c1 - c0 + 1;
- 	mat0->maxrows_ = mat0->numrows_;
--	mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
-+	mat0->rows_ = jas_alloc2(mat0->maxrows_, sizeof(jas_seqent_t *));
- 	for (i = 0; i < mat0->numrows_; ++i) {
- 		mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
- 	}
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
-@@ -212,7 +212,7 @@ jas_stream_t *jas_stream_memopen(char *b
- 	if (buf) {
- 		obj->buf_ = (unsigned char *) buf;
- 	} else {
--		obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
-+		obj->buf_ = jas_malloc(obj->bufsize_);
- 		obj->myalloc_ = 1;
- 	}
- 	if (!obj->buf_) {
-@@ -992,7 +992,7 @@ static int mem_resize(jas_stream_memobj_
- 	unsigned char *buf;
- 
- 	assert(m->buf_);
--	if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
-+	if (!(buf = jas_realloc(m->buf_, bufsize))) {
- 		return -1;
- 	}
- 	m->buf_ = buf;
-diff -pruN jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c jasper-1.900.1/src/libjasper/bmp/bmp_dec.c
---- jasper-1.900.1.orig/src/libjasper/bmp/bmp_dec.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/bmp/bmp_dec.c	2009-10-22 10:27:45.000000000 +0200
-@@ -283,7 +283,7 @@ static bmp_info_t *bmp_getinfo(jas_strea
- 	}
- 
- 	if (info->numcolors > 0) {
--		if (!(info->palents = jas_malloc(info->numcolors *
-+		if (!(info->palents = jas_alloc2(info->numcolors,
- 		  sizeof(bmp_palent_t)))) {
- 			bmp_info_destroy(info);
- 			return 0;
-diff -pruN jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h
---- jasper-1.900.1.orig/src/libjasper/include/jasper/jas_malloc.h	2007-01-19 22:43:04.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/include/jasper/jas_malloc.h	2009-10-22 10:27:45.000000000 +0200
-@@ -95,6 +95,9 @@ extern "C" {
- #define	jas_free	MEMFREE
- #define	jas_realloc	MEMREALLOC
- #define	jas_calloc	MEMCALLOC
-+#define jas_alloc2(a, b)	MEMALLOC((a)*(b))
-+#define jas_alloc3(a, b, c)	MEMALLOC((a)*(b)*(c))
-+#define jas_realloc2(p, a, b)	MEMREALLOC((p), (a)*(b))
- #endif
- 
- /******************************************************************************\
-@@ -115,6 +118,12 @@ void *jas_realloc(void *ptr, size_t size
- /* Allocate a block of memory and initialize the contents to zero. */
- void *jas_calloc(size_t nmemb, size_t size);
- 
-+/* size-checked double allocation .*/
-+void *jas_alloc2(size_t, size_t);
-+
-+void *jas_alloc3(size_t, size_t, size_t);
-+
-+void *jas_realloc2(void *, size_t, size_t);
- #endif
- 
- #ifdef __cplusplus
-diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c jasper-1.900.1/src/libjasper/jp2/jp2_cod.c
---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_cod.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jp2/jp2_cod.c	2009-10-22 10:30:24.000000000 +0200
-@@ -247,7 +247,7 @@ jp2_box_t *jp2_box_get(jas_stream_t *in)
- 	box = 0;
- 	tmpstream = 0;
- 
--	if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
-+	if (!(box = jas_calloc(1, sizeof(jp2_box_t)))) {
- 		goto error;
- 	}
- 	box->ops = &jp2_boxinfo_unk.ops;
-@@ -372,7 +372,7 @@ static int jp2_bpcc_getdata(jp2_box_t *b
- 	jp2_bpcc_t *bpcc = &box->data.bpcc;
- 	unsigned int i;
- 	bpcc->numcmpts = box->datalen;
--	if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
-+	if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts, sizeof(uint_fast8_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < bpcc->numcmpts; ++i) {
-@@ -416,7 +416,7 @@ static int jp2_colr_getdata(jp2_box_t *b
- 		break;
- 	case JP2_COLR_ICC:
- 		colr->iccplen = box->datalen - 3;
--		if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
-+		if (!(colr->iccp = jas_alloc2(colr->iccplen, sizeof(uint_fast8_t)))) {
- 			return -1;
- 		}
- 		if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
-@@ -453,7 +453,7 @@ static int jp2_cdef_getdata(jp2_box_t *b
- 	if (jp2_getuint16(in, &cdef->numchans)) {
- 		return -1;
- 	}
--	if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
-+	if (!(cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t)))) {
- 		return -1;
- 	}
- 	for (channo = 0; channo < cdef->numchans; ++channo) {
-@@ -766,7 +766,7 @@ static int jp2_cmap_getdata(jp2_box_t *b
- 	unsigned int i;
- 
- 	cmap->numchans = (box->datalen) / 4;
--	if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
-+	if (!(cmap->ents = jas_alloc2(cmap->numchans, sizeof(jp2_cmapent_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < cmap->numchans; ++i) {
-@@ -828,10 +828,10 @@ static int jp2_pclr_getdata(jp2_box_t *b
- 		return -1;
- 	}
- 	lutsize = pclr->numlutents * pclr->numchans;
--	if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
-+	if (!(pclr->lutdata = jas_alloc2(lutsize, sizeof(int_fast32_t)))) {
- 		return -1;
- 	}
--	if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
-+	if (!(pclr->bpc = jas_alloc2(pclr->numchans, sizeof(uint_fast8_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < pclr->numchans; ++i) {
-diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c jasper-1.900.1/src/libjasper/jp2/jp2_dec.c
---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c	2009-10-22 10:27:45.000000000 +0200
-@@ -336,7 +336,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
- 	}
- 
- 	/* Allocate space for the channel-number to component-number LUT. */
--	if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
-+	if (!(dec->chantocmptlut = jas_alloc2(dec->numchans, sizeof(uint_fast16_t)))) {
- 		jas_eprintf("error: no memory\n");
- 		goto error;
- 	}
-@@ -354,7 +354,7 @@ jas_image_t *jp2_decode(jas_stream_t *in
- 			if (cmapent->map == JP2_CMAP_DIRECT) {
- 				dec->chantocmptlut[channo] = channo;
- 			} else if (cmapent->map == JP2_CMAP_PALETTE) {
--				lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
-+				lutents = jas_alloc2(pclrd->numlutents, sizeof(int_fast32_t));
- 				for (i = 0; i < pclrd->numlutents; ++i) {
- 					lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
- 				}
-diff -pruN jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c jasper-1.900.1/src/libjasper/jp2/jp2_enc.c
---- jasper-1.900.1.orig/src/libjasper/jp2/jp2_enc.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jp2/jp2_enc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -191,7 +191,7 @@ int sgnd;
- 		}
- 		bpcc = &box->data.bpcc;
- 		bpcc->numcmpts = jas_image_numcmpts(image);
--		if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
-+		if (!(bpcc->bpcs = jas_alloc2(bpcc->numcmpts,
- 		  sizeof(uint_fast8_t)))) {
- 			goto error;
- 		}
-@@ -285,7 +285,7 @@ int sgnd;
- 		}
- 		cdef = &box->data.cdef;
- 		cdef->numchans = jas_image_numcmpts(image);
--		cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
-+		cdef->ents = jas_alloc2(cdef->numchans, sizeof(jp2_cdefchan_t));
- 		for (i = 0; i < jas_image_numcmpts(image); ++i) {
- 			cdefchanent = &cdef->ents[i];
- 			cdefchanent->channo = i;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c jasper-1.900.1/src/libjasper/jpc/jpc_cs.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2009-10-22 09:58:16.000000000 +0200
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2009-10-22 10:27:45.000000000 +0200
-@@ -502,7 +502,7 @@ static int jpc_siz_getparms(jpc_ms_t *ms
- 	  !siz->tileheight || !siz->numcomps) {
- 		return -1;
- 	}
--	if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
-+	if (!(siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t)))) {
- 		return -1;
- 	}
- 	for (i = 0; i < siz->numcomps; ++i) {
-@@ -986,7 +986,7 @@ static int jpc_qcx_getcompparms(jpc_qcxc
- 		jpc_qcx_destroycompparms(compparms);
-                 return -1;
-         } else if (compparms->numstepsizes > 0) {
--		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
-+		compparms->stepsizes = jas_alloc2(compparms->numstepsizes,
- 		  sizeof(uint_fast16_t));
- 		assert(compparms->stepsizes);
- 		for (i = 0; i < compparms->numstepsizes; ++i) {
-@@ -1094,7 +1094,7 @@ static int jpc_ppm_getparms(jpc_ms_t *ms
- 
- 	ppm->len = ms->len - 1;
- 	if (ppm->len > 0) {
--		if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
-+		if (!(ppm->data = jas_malloc(ppm->len))) {
- 			goto error;
- 		}
- 		if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
-@@ -1163,7 +1163,7 @@ static int jpc_ppt_getparms(jpc_ms_t *ms
- 	}
- 	ppt->len = ms->len - 1;
- 	if (ppt->len > 0) {
--		if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
-+		if (!(ppt->data = jas_malloc(ppt->len))) {
- 			goto error;
- 		}
- 		if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
-@@ -1226,7 +1226,7 @@ static int jpc_poc_getparms(jpc_ms_t *ms
- 	uint_fast8_t tmp;
- 	poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
- 	  (ms->len / 7);
--	if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
-+	if (!(poc->pchgs = jas_alloc2(poc->numpchgs, sizeof(jpc_pocpchg_t)))) {
- 		goto error;
- 	}
- 	for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
-@@ -1331,7 +1331,7 @@ static int jpc_crg_getparms(jpc_ms_t *ms
- 	jpc_crgcomp_t *comp;
- 	uint_fast16_t compno;
- 	crg->numcomps = cstate->numcomps;
--	if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
-+	if (!(crg->comps = jas_alloc2(cstate->numcomps, sizeof(uint_fast16_t)))) {
- 		return -1;
- 	}
- 	for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
-@@ -1470,7 +1470,7 @@ static int jpc_unk_getparms(jpc_ms_t *ms
- 	cstate = 0;
- 
- 	if (ms->len > 0) {
--		if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
-+		if (!(unk->data = jas_malloc(ms->len))) {
- 			return -1;
- 		}
- 		if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c jasper-1.900.1/src/libjasper/jpc/jpc_dec.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c	2009-10-22 09:58:16.000000000 +0200
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2009-10-22 10:30:50.000000000 +0200
-@@ -449,7 +449,7 @@ static int jpc_dec_process_sot(jpc_dec_t
- 
- 	if (dec->state == JPC_MH) {
- 
--		compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
-+		compinfos = jas_alloc2(dec->numcomps, sizeof(jas_image_cmptparm_t));
- 		assert(compinfos);
- 		for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
- 		  cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
-@@ -692,7 +692,7 @@ static int jpc_dec_tileinit(jpc_dec_t *d
- 			tile->realmode = 1;
- 		}
- 		tcomp->numrlvls = ccp->numrlvls;
--		if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
-+		if (!(tcomp->rlvls = jas_alloc2(tcomp->numrlvls,
- 		  sizeof(jpc_dec_rlvl_t)))) {
- 			return -1;
- 		}
-@@ -764,7 +764,7 @@ rlvl->bands = 0;
- 			  rlvl->cbgheightexpn);
- 
- 			rlvl->numbands = (!rlvlno) ? 1 : 3;
--			if (!(rlvl->bands = jas_malloc(rlvl->numbands *
-+			if (!(rlvl->bands = jas_alloc2(rlvl->numbands,
- 			  sizeof(jpc_dec_band_t)))) {
- 				return -1;
- 			}
-@@ -797,7 +797,7 @@ rlvl->bands = 0;
- 
- 				assert(rlvl->numprcs);
- 
--				if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
-+				if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_dec_prc_t)))) {
- 					return -1;
- 				}
- 
-@@ -834,7 +834,7 @@ rlvl->bands = 0;
- 			if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
- 				return -1;
- 			}
--			if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
-+			if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_dec_cblk_t)))) {
- 				return -1;
- 			}
- 
-@@ -1181,7 +1181,7 @@ static int jpc_dec_process_siz(jpc_dec_t
- 		return -1;
- 	}
- 
--	if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
-+	if (!(dec->cmpts = jas_alloc2(dec->numcomps, sizeof(jpc_dec_cmpt_t)))) {
- 		return -1;
- 	}
- 
-@@ -1204,7 +1204,7 @@ static int jpc_dec_process_siz(jpc_dec_t
- 	dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
- 	dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
- 	dec->numtiles = dec->numhtiles * dec->numvtiles;
--	if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
-+	if (!(dec->tiles = jas_calloc(dec->numtiles, sizeof(jpc_dec_tile_t)))) {
- 		return -1;
- 	}
- 
-@@ -1228,7 +1228,7 @@ static int jpc_dec_process_siz(jpc_dec_t
- 		tile->pkthdrstreampos = 0;
- 		tile->pptstab = 0;
- 		tile->cp = 0;
--		if (!(tile->tcomps = jas_malloc(dec->numcomps *
-+		if (!(tile->tcomps = jas_calloc(dec->numcomps,
- 		  sizeof(jpc_dec_tcomp_t)))) {
- 			return -1;
- 		}
-@@ -1489,7 +1489,7 @@ static jpc_dec_cp_t *jpc_dec_cp_create(u
- 	cp->numlyrs = 0;
- 	cp->mctid = 0;
- 	cp->csty = 0;
--	if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
-+	if (!(cp->ccps = jas_alloc2(cp->numcomps, sizeof(jpc_dec_ccp_t)))) {
- 		return 0;
- 	}
- 	if (!(cp->pchglist = jpc_pchglist_create())) {
-@@ -2048,7 +2048,7 @@ jpc_streamlist_t *jpc_streamlist_create(
- 	}
- 	streamlist->numstreams = 0;
- 	streamlist->maxstreams = 100;
--	if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
-+	if (!(streamlist->streams = jas_alloc2(streamlist->maxstreams,
- 	  sizeof(jas_stream_t *)))) {
- 		jas_free(streamlist);
- 		return 0;
-@@ -2068,8 +2068,8 @@ int jpc_streamlist_insert(jpc_streamlist
- 	/* Grow the array of streams if necessary. */
- 	if (streamlist->numstreams >= streamlist->maxstreams) {
- 		newmaxstreams = streamlist->maxstreams + 1024;
--		if (!(newstreams = jas_realloc(streamlist->streams,
--		  (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
-+		if (!(newstreams = jas_realloc2(streamlist->streams,
-+		  (newmaxstreams + 1024), sizeof(jas_stream_t *)))) {
- 			return -1;
- 		}
- 		for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
-@@ -2155,8 +2155,7 @@ int jpc_ppxstab_grow(jpc_ppxstab_t *tab,
- {
- 	jpc_ppxstabent_t **newents;
- 	if (tab->maxents < maxents) {
--		newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
--		  sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
-+		newents = jas_realloc2(tab->ents, maxents, sizeof(jpc_ppxstabent_t *));
- 		if (!newents) {
- 			return -1;
- 		}
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c jasper-1.900.1/src/libjasper/jpc/jpc_enc.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_enc.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_enc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -403,7 +403,7 @@ static jpc_enc_cp_t *cp_create(char *opt
- 		vsteplcm *= jas_image_cmptvstep(image, cmptno);
- 	}
- 
--	if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
-+	if (!(cp->ccps = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_ccp_t)))) {
- 		goto error;
- 	}
- 	for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
-@@ -656,7 +656,7 @@ static jpc_enc_cp_t *cp_create(char *opt
- 
- 	if (ilyrrates && numilyrrates > 0) {
- 		tcp->numlyrs = numilyrrates + 1;
--		if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
-+		if (!(tcp->ilyrrates = jas_alloc2((tcp->numlyrs - 1),
- 		  sizeof(jpc_fix_t)))) {
- 			goto error;
- 		}
-@@ -940,7 +940,7 @@ startoff = jas_stream_getrwcount(enc->ou
- 	siz->tilewidth = cp->tilewidth;
- 	siz->tileheight = cp->tileheight;
- 	siz->numcomps = cp->numcmpts;
--	siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
-+	siz->comps = jas_alloc2(siz->numcomps, sizeof(jpc_sizcomp_t));
- 	assert(siz->comps);
- 	for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
- 		siz->comps[i].prec = cp->ccps[i].prec;
-@@ -977,7 +977,7 @@ startoff = jas_stream_getrwcount(enc->ou
- 		return -1;
- 	}
- 	crg = &enc->mrk->parms.crg;
--	crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
-+	crg->comps = jas_alloc2(crg->numcomps, sizeof(jpc_crgcomp_t));
- 	if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
- 		jas_eprintf("cannot write CRG marker\n");
- 		return -1;
-@@ -1955,7 +1955,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
- 	tile->mctid = cp->tcp.mctid;
- 
- 	tile->numlyrs = cp->tcp.numlyrs;
--	if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
-+	if (!(tile->lyrsizes = jas_alloc2(tile->numlyrs,
- 	  sizeof(uint_fast32_t)))) {
- 		goto error;
- 	}
-@@ -1964,7 +1964,7 @@ jpc_enc_tile_t *jpc_enc_tile_create(jpc_
- 	}
- 
- 	/* Allocate an array for the per-tile-component information. */
--	if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
-+	if (!(tile->tcmpts = jas_alloc2(cp->numcmpts, sizeof(jpc_enc_tcmpt_t)))) {
- 		goto error;
- 	}
- 	/* Initialize a few members critical for error recovery. */
-@@ -2110,7 +2110,7 @@ static jpc_enc_tcmpt_t *tcmpt_create(jpc
- 	  jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
- 	  jas_seq2d_yend(tcmpt->data), bandinfos);
- 
--	if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
-+	if (!(tcmpt->rlvls = jas_alloc2(tcmpt->numrlvls, sizeof(jpc_enc_rlvl_t)))) {
- 		goto error;
- 	}
- 	for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-@@ -2213,7 +2213,7 @@ static jpc_enc_rlvl_t *rlvl_create(jpc_e
- 	rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
- 	rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
- 
--	if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
-+	if (!(rlvl->bands = jas_alloc2(rlvl->numbands, sizeof(jpc_enc_band_t)))) {
- 		goto error;
- 	}
- 	for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-@@ -2290,7 +2290,7 @@ if (bandinfo->xstart != bandinfo->xend &
- 	band->synweight = bandinfo->synenergywt;
- 
- if (band->data) {
--	if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
-+	if (!(band->prcs = jas_alloc2(rlvl->numprcs, sizeof(jpc_enc_prc_t)))) {
- 		goto error;
- 	}
- 	for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
-@@ -2422,7 +2422,7 @@ if (!rlvlno) {
- 			goto error;
- 		}
- 
--		if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
-+		if (!(prc->cblks = jas_alloc2(prc->numcblks, sizeof(jpc_enc_cblk_t)))) {
- 			goto error;
- 		}
- 		for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqdec.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqdec.c	2009-10-22 10:27:45.000000000 +0200
-@@ -118,7 +118,7 @@ jpc_mqdec_t *jpc_mqdec_create(int maxctx
- 	mqdec->in = in;
- 	mqdec->maxctxs = maxctxs;
- 	/* Allocate memory for the per-context state information. */
--	if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
-+	if (!(mqdec->ctxs = jas_alloc2(mqdec->maxctxs, sizeof(jpc_mqstate_t *)))) {
- 		goto error;
- 	}
- 	/* Set the current context to the first context. */
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_mqenc.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_mqenc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -197,7 +197,7 @@ jpc_mqenc_t *jpc_mqenc_create(int maxctx
- 	mqenc->maxctxs = maxctxs;
- 
- 	/* Allocate memory for the per-context state information. */
--	if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
-+	if (!(mqenc->ctxs = jas_alloc2(mqenc->maxctxs, sizeof(jpc_mqstate_t *)))) {
- 		goto error;
- 	}
- 
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_qmfb.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_qmfb.c	2009-10-22 10:27:45.000000000 +0200
-@@ -321,7 +321,7 @@ void jpc_qmfb_split_row(jpc_fix_t *a, in
- #if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
-@@ -389,7 +389,7 @@ void jpc_qmfb_split_col(jpc_fix_t *a, in
- #if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
-@@ -460,7 +460,7 @@ void jpc_qmfb_split_colgrp(jpc_fix_t *a,
- #if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
-@@ -549,7 +549,7 @@ void jpc_qmfb_split_colres(jpc_fix_t *a,
- #if !defined(HAVE_VLA)
- 	/* Get a buffer. */
- 	if (bufsize > QMFB_SPLITBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide in this case. */
- 			abort();
- 		}
-@@ -633,7 +633,7 @@ void jpc_qmfb_join_row(jpc_fix_t *a, int
- #if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
-@@ -698,7 +698,7 @@ void jpc_qmfb_join_col(jpc_fix_t *a, int
- #if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
-@@ -766,7 +766,7 @@ void jpc_qmfb_join_colgrp(jpc_fix_t *a, 
- #if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc2(bufsize, JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
-@@ -852,7 +852,7 @@ void jpc_qmfb_join_colres(jpc_fix_t *a, 
- #if !defined(HAVE_VLA)
- 	/* Allocate memory for the join buffer from the heap. */
- 	if (bufsize > QMFB_JOINBUFSIZE) {
--		if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
-+		if (!(buf = jas_alloc3(bufsize, numcols, sizeof(jpc_fix_t)))) {
- 			/* We have no choice but to commit suicide. */
- 			abort();
- 		}
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t1enc.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_t1enc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -219,7 +219,7 @@ int jpc_enc_enccblk(jpc_enc_t *enc, jas_
- 
- 	cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
- 	if (cblk->numpasses > 0) {
--		cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
-+		cblk->passes = jas_alloc2(cblk->numpasses, sizeof(jpc_enc_pass_t));
- 		assert(cblk->passes);
- 	} else {
- 		cblk->passes = 0;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2009-10-22 10:27:45.000000000 +0200
-@@ -573,7 +573,7 @@ int jpc_pchglist_insert(jpc_pchglist_t *
- 	}
- 	if (pchglist->numpchgs >= pchglist->maxpchgs) {
- 		newmaxpchgs = pchglist->maxpchgs + 128;
--		if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
-+		if (!(newpchgs = jas_realloc2(pchglist->pchgs, newmaxpchgs, sizeof(jpc_pchg_t *)))) {
- 			return -1;
- 		}
- 		pchglist->maxpchgs = newmaxpchgs;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2dec.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2dec.c	2009-10-22 10:27:45.000000000 +0200
-@@ -478,7 +478,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
- 		return 0;
- 	}
- 	pi->numcomps = dec->numcomps;
--	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
-+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
- 		jpc_pi_destroy(pi);
- 		return 0;
- 	}
-@@ -490,7 +490,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
- 	for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
- 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
- 		picomp->numrlvls = tcomp->numrlvls;
--		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
-+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
- 		  sizeof(jpc_pirlvl_t)))) {
- 			jpc_pi_destroy(pi);
- 			return 0;
-@@ -503,7 +503,7 @@ jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *d
- 		  rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
- /* XXX sizeof(long) should be sizeof different type */
- 			pirlvl->numprcs = rlvl->numprcs;
--			if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
-+			if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
- 			  sizeof(long)))) {
- 				jpc_pi_destroy(pi);
- 				return 0;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_t2enc.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_t2enc.c	2009-10-22 10:27:45.000000000 +0200
-@@ -565,7 +565,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
- 	}
- 	pi->pktno = -1;
- 	pi->numcomps = cp->numcmpts;
--	if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
-+	if (!(pi->picomps = jas_alloc2(pi->numcomps, sizeof(jpc_picomp_t)))) {
- 		jpc_pi_destroy(pi);
- 		return 0;
- 	}
-@@ -577,7 +577,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
- 	for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
- 	  compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
- 		picomp->numrlvls = tcomp->numrlvls;
--		if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
-+		if (!(picomp->pirlvls = jas_alloc2(picomp->numrlvls,
- 		  sizeof(jpc_pirlvl_t)))) {
- 			jpc_pi_destroy(pi);
- 			return 0;
-@@ -591,7 +591,7 @@ jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t
- /* XXX sizeof(long) should be sizeof different type */
- 			pirlvl->numprcs = rlvl->numprcs;
- 			if (rlvl->numprcs) {
--				if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
-+				if (!(pirlvl->prclyrnos = jas_alloc2(pirlvl->numprcs,
- 				  sizeof(long)))) {
- 					jpc_pi_destroy(pi);
- 					return 0;
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_tagtree.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_tagtree.c	2009-10-22 10:27:45.000000000 +0200
-@@ -125,7 +125,7 @@ jpc_tagtree_t *jpc_tagtree_create(int nu
- 		++numlvls;
- 	} while (n > 1);
- 
--	if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
-+	if (!(tree->nodes_ = jas_alloc2(tree->numnodes_, sizeof(jpc_tagtreenode_t)))) {
- 		return 0;
- 	}
- 
-diff -pruN jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c jasper-1.900.1/src/libjasper/jpc/jpc_util.c
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_util.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_util.c	2009-10-22 10:27:45.000000000 +0200
-@@ -109,7 +109,7 @@ int jpc_atoaf(char *s, int *numvalues, d
- 	}
- 
- 	if (n) {
--		if (!(vs = jas_malloc(n * sizeof(double)))) {
-+		if (!(vs = jas_alloc2(n, sizeof(double)))) {
- 			return -1;
- 		}
- 
-diff -pruN jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c jasper-1.900.1/src/libjasper/mif/mif_cod.c
---- jasper-1.900.1.orig/src/libjasper/mif/mif_cod.c	2007-01-19 22:43:05.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/mif/mif_cod.c	2009-10-22 10:27:45.000000000 +0200
-@@ -438,8 +438,7 @@ static int mif_hdr_growcmpts(mif_hdr_t *
- 	int cmptno;
- 	mif_cmpt_t **newcmpts;
- 	assert(maxcmpts >= hdr->numcmpts);
--	newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
--	  jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
-+	newcmpts = jas_realloc2(hdr->cmpts, maxcmpts, sizeof(mif_cmpt_t *));
- 	if (!newcmpts) {
- 		return -1;
- 	}
diff --git a/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch b/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch
deleted file mode 100644
index 4bf2e9b52..000000000
--- a/testing/jasper/jasper-1.900.1-CVE-2008-3522.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2008-3522
-
-diff -pruN jasper-1.900.1.orig/src/libjasper/base/jas_stream.c jasper-1.900.1/src/libjasper/base/jas_stream.c
---- jasper-1.900.1.orig/src/libjasper/base/jas_stream.c	2009-10-22 10:27:45.000000000 +0200
-+++ jasper-1.900.1/src/libjasper/base/jas_stream.c	2009-10-22 10:35:53.000000000 +0200
-@@ -553,7 +553,7 @@ int jas_stream_printf(jas_stream_t *stre
- 	int ret;
- 
- 	va_start(ap, fmt);
--	ret = vsprintf(buf, fmt, ap);
-+	ret = vsnprintf(buf, sizeof buf, fmt, ap);
- 	jas_stream_puts(stream, buf);
- 	va_end(ap);
- 	return ret;
diff --git a/testing/jasper/jpc_dec.c.patch b/testing/jasper/jpc_dec.c.patch
deleted file mode 100644
index ae1cd0617..000000000
--- a/testing/jasper/jpc_dec.c.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urN jasper-1.900.1/src/libjasper/jpc/jpc_dec.c jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c
---- jasper-1.900.1/src/libjasper/jpc/jpc_dec.c	2007-01-19 14:43:07.000000000 -0700
-+++ jasper-1.900.1-fix/src/libjasper/jpc/jpc_dec.c	2008-03-06 16:51:12.000000000 -0700
-@@ -1069,12 +1069,12 @@
- 	/* Apply an inverse intercomponent transform if necessary. */
- 	switch (tile->cp->mctid) {
- 	case JPC_MCT_RCT:
--		assert(dec->numcomps == 3);
-+		assert(dec->numcomps >= 3);
- 		jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
- 		  tile->tcomps[2].data);
- 		break;
- 	case JPC_MCT_ICT:
--		assert(dec->numcomps == 3);
-+		assert(dec->numcomps >= 3);
- 		jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
- 		  tile->tcomps[2].data);
- 		break;
diff --git a/testing/jasper/patch-libjasper-stepsizes-overflow.diff b/testing/jasper/patch-libjasper-stepsizes-overflow.diff
deleted file mode 100644
index 097559f68..000000000
--- a/testing/jasper/patch-libjasper-stepsizes-overflow.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2007-01-19 22:43:07.000000000 +0100
-+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2007-04-06 01:29:02.000000000 +0200
-@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc
- 		compparms->numstepsizes = (len - n) / 2;
- 		break;
- 	}
--	if (compparms->numstepsizes > 0) {
-+	if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
-+		jpc_qcx_destroycompparms(compparms);
-+                return -1;
-+        } else if (compparms->numstepsizes > 0) {
- 		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
- 		  sizeof(uint_fast16_t));
- 		assert(compparms->stepsizes);
diff --git a/testing/json-glib/PKGBUILD b/testing/json-glib/PKGBUILD
deleted file mode 100644
index b1229d31d..000000000
--- a/testing/json-glib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169184 2012-10-18 19:24:00Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=json-glib
-pkgver=0.15.2
-pkgrel=1
-pkgdesc="JSON library built on GLib"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/JsonGlib"
-license=('GPL')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.15/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f090cd94acc85989e033d72028fa70863d05092ae5bba6b454e70c132b24cdde')
-
-build(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
-
-check(){
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
diff --git a/testing/k3b/PKGBUILD b/testing/k3b/PKGBUILD
deleted file mode 100644
index d493a7da3..000000000
--- a/testing/k3b/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164631 2012-08-01 16:00:41Z andrea $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=k3b
-pkgver=2.0.2
-pkgrel=6
-pkgdesc="Feature-rich and easy to handle CD burning application"
-arch=('i686' 'x86_64')
-url="http://k3b.org/"
-license=('GPL')
-depends=('kdebase-runtime' 'libkcddb' 'libsamplerate' 'libmad'
-         'ffmpeg' 'taglib' 'libmpcdec' 'libdvdread' 'cdrkit' 'libxft')
-makedepends=('cmake' 'automoc4' 'docbook-xml')
-optdepends=('dvd+rw-tools: for dvd burning support'
-            'vcdimager: for vcd burning support'
-            'transcode: for advanced mpeg conversion support'
-            'emovix: for bootable multimedia cd/dvd support'
-            'cdrdao: for disk-at-once (DAO) mode support')
-options=('!libtool')
-install=k3b.install
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \
-        k3b-2.0.2-ffmpeg.patch k3b-2.0.2-libavformat54.patch)
-sha1sums=('8b30a4d07942e82559b01bc07dea6bcf2defd532'
-          '8120c0e22e6c41ea285ca6060be13723ed91c52b'
-          '5b35bff3f7670686a32bd71afea2deaca4331631')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/k3b-2.0.2-ffmpeg.patch"
-  patch -p1 -i "${srcdir}/k3b-2.0.2-libavformat54.patch"
-  cd ..
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/k3b/k3b-2.0.2-ffmpeg.patch b/testing/k3b/k3b-2.0.2-ffmpeg.patch
deleted file mode 100644
index 2878b1edc..000000000
--- a/testing/k3b/k3b-2.0.2-ffmpeg.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-commit 61ca30beb978f68e72257408777c6433f33129bd
-Author: Michal Malek <michalm@jabster.pl>
-Date:   Sun Aug 28 20:18:53 2011 +0200
-
-    Fixed compilation with new FFMPEG
-    
-    BUG: 274817
-    FIXED-IN: 2.0.3
-
-diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-index 0ad59fc..0c5f366 100644
---- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
- #else
-     ::AVCodecContext* codecContext =  d->formatContext->streams[0]->codec;
- #endif
--    if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
-+    if( codecContext->codec_type != 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+        AVMEDIA_TYPE_AUDIO)
-+#else
-+        CODEC_TYPE_AUDIO)
-+#endif
-+    {
-         kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
-         return false;
-     }
-@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
- QString K3bFFMpegFile::title() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->title[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->title );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
- QString K3bFFMpegFile::author() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->author[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->author );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
- QString K3bFFMpegFile::comment() const
- {
-     // FIXME: is this UTF8 or something??
--    if( d->formatContext->comment[0] != '\0' )
--        return QString::fromLocal8Bit( d->formatContext->comment );
-+    AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
-+    if( ade == NULL )
-+        return QString();
-+    if( ade->value != '\0' )
-+        return QString::fromLocal8Bit( ade->value );
-     else
-         return QString();
- }
-@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
- #if LIBAVCODEC_VERSION_MAJOR < 52
-         int len = ::avcodec_decode_audio(
- #else
-+   #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+        int len = ::avcodec_decode_audio3(
-+   #else
-         int len = ::avcodec_decode_audio2(
-+   #endif
- #endif
-+
- #ifdef FFMPEG_BUILD_PRE_4629
-             &d->formatContext->streams[0]->codec,
- #else
-@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
- #endif
-             (short*)d->alignedOutputBuffer,
-             &d->outputBufferSize,
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+            &d->packet );
-+#else
-             d->packetData, d->packetSize );
-+#endif
- 
-         if( d->packetSize <= 0 || len < 0 )
-             ::av_free_packet( &d->packet );
diff --git a/testing/k3b/k3b-2.0.2-libavformat54.patch b/testing/k3b/k3b-2.0.2-libavformat54.patch
deleted file mode 100644
index 174a776b8..000000000
--- a/testing/k3b/k3b-2.0.2-libavformat54.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-===================================================================
---- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-+++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
-@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open()
-     close();
- 
-     // open the file
--    int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
-+    int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
-     if( err < 0 ) {
-         kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
-         return false;
-@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open()
-     }
- 
-     // dump some debugging info
--    ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
-+    ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
- 
-     return true;
- }
diff --git a/testing/k3b/k3b.install b/testing/k3b/k3b.install
deleted file mode 100644
index 413ad60f7..000000000
--- a/testing/k3b/k3b.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-mime-database usr/share/mime  &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/kactivities/PKGBUILD b/testing/kactivities/PKGBUILD
deleted file mode 100644
index 99274b055..000000000
--- a/testing/kactivities/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 167564 2012-10-02 18:57:13Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kactivities
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='API for using and interacting with the Activity Manager'
-url='https://projects.kde.org/projects/kde/kdelibs/kactivities'
-license=('GPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('7e5ec2aa1492450ea1de40f9e110561f6221b5ca')
-
-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/kbd/PKGBUILD b/testing/kbd/PKGBUILD
deleted file mode 100644
index 783c6145c..000000000
--- a/testing/kbd/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 163565 2012-07-16 01:58:51Z dreisner $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kbd
-pkgver=1.15.3
-pkgrel=3
-pkgdesc="Keytable files and keyboard utilities"
-arch=('i686' 'x86_64')
-url="ftp://ftp.altlinux.org/pub/people/legion/kbd/"
-license=('GPL')
-depends=('glibc')
-source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
-        fix-es.po.patch)
-md5sums=('8143e179a0f3c25646ce5085e8777200'
-         '4ded3edb50fb7a3277bae6a870cee812')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ../fix-es.po.patch
-  # rename keymap files with the same names
-  # this is needed because when only name of keymap is specified
-  # loadkeys loads the first keymap it can find, which is bad (see FS#13837)
-  # this should be removed when upstream adopts the change
-  mv data/keymaps/i386/qwertz/cz{,-qwertz}.map
-  mv data/keymaps/i386/olpc/es{,-olpc}.map
-  mv data/keymaps/i386/olpc/pt{,-olpc}.map
-  mv data/keymaps/i386/dvorak/no{,-dvorak}.map
-  mv data/keymaps/i386/fgGIod/trf{,-fgGIod}.map
-  mv data/keymaps/i386/colemak/{en-latin9,colemak}.map
-
-  ./configure --prefix=/usr --datadir=/usr/share/kbd --mandir=/usr/share/man
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install
-}
diff --git a/testing/kbd/fix-es.po.patch b/testing/kbd/fix-es.po.patch
deleted file mode 100644
index 578f0a7b7..000000000
--- a/testing/kbd/fix-es.po.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kbd-1.15.3/po/es.old	2011-05-14 23:12:49.000000000 +0200
-+++ kbd-1.15.3/po/es.po	2011-05-15 21:07:02.120669404 +0200
-@@ -1363,7 +1363,7 @@
- #: src/setfont.c:682
- #, c-format
- msgid "Saved %d-char %dx%d font file on %s\n"
--msgstr "Se ha guardado el fichero de tipos %2$dx%3$d de %1$d caracteres en %s\n"
-+msgstr "Se ha guardado el fichero de tipos %dx%d de %d caracteres en %s\n"
- 
- #: src/setkeycodes.c:21
- #, c-format
diff --git a/testing/kdeaccessibility-jovie/PKGBUILD b/testing/kdeaccessibility-jovie/PKGBUILD
deleted file mode 100644
index 9b6d6cb42..000000000
--- a/testing/kdeaccessibility-jovie/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167588 2012-10-02 19:15:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-jovie
-pkgver=4.9.2
-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.xz")
-sha1sums=('fbf63de8b286e8238383f49991ffb7651f9099d2')
-
-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 76d4ca24d..000000000
--- a/testing/kdeaccessibility-kaccessible/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167589 2012-10-02 19:16:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kaccessible
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Provides accessibility services like focus tracking and a screenreader'
-url='https://projects.kde.org/projects/kde/kdeaccessibility/kaccessible'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-depends=('kdelibs' 'speech-dispatcher')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('e55ccb92ce22250a8d8139d2367ef9f35c5b34d1')
-
-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 8dbc5a138..000000000
--- a/testing/kdeaccessibility-kmag/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167590 2012-10-02 19:16:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmag
-pkgver=4.9.2
-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.xz")
-sha1sums=('4429196f346271a825e721be56e92189a3c0da2a')
-
-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 b5574a6f4..000000000
--- a/testing/kdeaccessibility-kmousetool/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167591 2012-10-02 19:17:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmousetool
-pkgver=4.9.2
-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.xz")
-sha1sums=('c9e27c71fd9bb01ee498cb0799d848611d031dcc')
-
-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 6e573b8ca..000000000
--- a/testing/kdeaccessibility-kmouth/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167592 2012-10-02 19:17:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeaccessibility-kmouth
-pkgver=4.9.2
-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.xz")
-sha1sums=('7e982aa5a57a9f671ec69f3504ca4dc50076778d')
-
-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 568029ab3..000000000
--- a/testing/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 167593 2012-10-02 19:18:05Z 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.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'syslog-path.patch')
-sha1sums=('0b97528870a23440ba450f87be878e3abdf9e0e1'
-          '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'
-    url='http://userbase.kde.org/KCron'
-	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=('kdebase-runtime' 'kdepimlibs')
-	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-python2' 'system-config-printer-common' 'cups' 'python2-gobject2')
-	url="http://kde.org/applications/system/printerapplet/"
-	cd $srcdir/build/system-config-printer-kde
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/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 9b342eb62..000000000
--- a/testing/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 167595 2012-10-02 19:18:46Z 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.9.2
-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.xz")
-sha1sums=('6a93ed5fd33b27b88b653c15c546b223ed880a4d')
-
-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 791d73889..000000000
--- a/testing/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167597 2012-10-02 19:23:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.9.2
-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' 'kdebase-lib')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('bab9dcab839cc975fb3b94ac383d25b94066fe92')
-
-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 59341e999..000000000
--- a/testing/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 164680 2012-08-02 15:21:45Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.9.0
-pkgrel=3
-pkgdesc="Plugins and applications necessary for the running of KDE applications"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-runtime'
-license=('GPL' 'LGPL')
-depends=('nepomuk-core' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' 'xorg-xauth'
-         'kactivities')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
-             'networkmanager')
-optdepends=('kdepimlibs: to generate drkonqi reports'
-            '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.xz")
-sha1sums=('89a9e5c7e52cb925217b45a568a354cc041bc28d')
-
-build() {
-    cd "${srcdir}"
-	mkdir build
-	cd build
-	cmake ../kde-runtime-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_QNtrack=OFF \
-        -DWITH_Xine=OFF
-	make
-}
-
-package() {
-	cd "$srcdir/build"
-	make DESTDIR="$pkgdir" install
-	rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
-
-    ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/testing/kdebase-runtime/kdebase-runtime.install b/testing/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/testing/kdebase-runtime/kdebase-runtime.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/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD
deleted file mode 100644
index 50d2c2724..000000000
--- a/testing/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 169286 2012-10-18 19:49:13Z jgc $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.9.2
-pkgrel=5
-pkgdesc="Provides the interface and basic tools for the KDE workspace"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-workspace'
-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' 'xorg-xprop' 'libxdamage'
-         'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
-         'xorg-xrdb' 'libgles' 'libegl' 'libxres' 'xorg-xrandr'
-         'xorg-xmessage' 'libusb-compat' 'kde-base-artwork')
-makedepends=('cmake' 'automoc4' 'boost' 'kdebindings-python2' 'networkmanager' 'mesa')
-optdepends=('kde-wallpapers: wallpapers for KDE Plasma Workspaces')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
-        'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
-        'logind-support.patch')
-sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488'
-          '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
-          '660eae40a707d2711d8d7f32a93214865506b795'
-          'b7980f2e199963caf8e92b499042d244ece2fca0'
-          '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
-          'b6f8e8692737b11eec1f8022ce74b5b23e247b1b'
-          'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
-          'c079ebd157c836ba996190f0d2bcea1a7828d02c'
-          'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514'
-          'ccde71c42e19feaf40d3bd76e7396a0cb6df012f')
-
-build() {
-	cd ${_pkgname}-${pkgver}
-
-    # reads the shell scripts in /etc/kde/
-    patch -p0 -i "${srcdir}"/etc-scripts.patch
-    # FS#26120
-	patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
-
-    # KDEBUG#202629
-	patch -p0 -i "${srcdir}"/terminate-server.patch
-    # KDEBUG#307412 (fixed upstream)
-    patch -p1 -i "${srcdir}"/logind-support.patch
-
-    cd ../
-
-	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 \
-        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-        -DWITH_CkConnector=OFF
-	make
-}
-
-package() {
-	cd build
-	make DESTDIR="${pkgdir}" install
-
-	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
-    install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
-    install -D -m644 "${srcdir}"/kdm.service \
-      "${pkgdir}"/usr/lib/systemd/system/kdm.service
-    install -Dm644 "${srcdir}"/kdm.logrotate "${pkgdir}"/etc/logrotate.d/kdm
-}
diff --git a/testing/kdebase-workspace/etc-scripts.patch b/testing/kdebase-workspace/etc-scripts.patch
deleted file mode 100644
index 903a90a53..000000000
--- a/testing/kdebase-workspace/etc-scripts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- startkde.cmake.orig	2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake	2009-01-15 14:33:08.000000000 +0100
-@@ -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/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 eccaa08f4..000000000
--- a/testing/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,12 +0,0 @@
-#%PAM-1.0
-auth		required	pam_tally.so	onerr=succeed file=/var/log/faillog
-auth		required	pam_shells.so
-auth		requisite	pam_nologin.so
-auth		required	pam_env.so
-auth		optional	pam_permit.s
-
-account		include      system-login
-
-password	include      system-login
-
-session		include      system-login
diff --git a/testing/kdebase-workspace/kde.pam b/testing/kdebase-workspace/kde.pam
deleted file mode 100644
index a0a29483d..000000000
--- a/testing/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,8 +0,0 @@
-#%PAM-1.0
-auth		include		system-login
-
-account		include		system-login
-
-password	include		system-login
-
-session		include		system-login
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/kdm.logrotate b/testing/kdebase-workspace/kdm.logrotate
deleted file mode 100644
index 34331feae..000000000
--- a/testing/kdebase-workspace/kdm.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/kdm.log {
-    maxage 365
-    size=+1024k
-    notifempty
-    missingok
-}
diff --git a/testing/kdebase-workspace/kdm.service b/testing/kdebase-workspace/kdm.service
deleted file mode 100644
index c57aba920..000000000
--- a/testing/kdebase-workspace/kdm.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=K Display Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/kdm -nodaemon
-
-[Install]
-Alias=display-manager.service
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/logind-support.patch b/testing/kdebase-workspace/logind-support.patch
deleted file mode 100644
index 9de205400..000000000
--- a/testing/kdebase-workspace/logind-support.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Lukas Tinkl <lukas@kde.org>
-Date: Fri, 05 Oct 2012 09:57:13 +0000
-Subject: store the filedescriptor in a member variable
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=a18b78d7da8cb8d627ad2e85f666bfcf1a2721e1
----
-store the filedescriptor in a member variable
-
-make systemd-inhibit work as intended, PowerDevil now handles
-power/sleep/lid buttons as intended
-
-BUG: 307412
----
-
-
---- a/powerdevil/daemon/powerdevilpolicyagent.cpp
-+++ b/powerdevil/daemon/powerdevilpolicyagent.cpp
-@@ -29,7 +29,6 @@
- #include <QtDBus/QDBusPendingReply>
- #include <QtDBus/QDBusConnectionInterface>
- #include <QtDBus/QDBusServiceWatcher>
--#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <KGlobal>
- #include <KDebug>
-@@ -225,6 +224,9 @@
-         onActiveSessionChanged(m_activeSessionPath);
- 
-         // inhibit systemd handling of power/sleep/lid buttons
-+        // http://www.freedesktop.org/wiki/Software/systemd/inhibit
-+        kDebug() << "fd passing available:" << bool(managerIface.connection().connectionCapabilities() & QDBusConnection::UnixFileDescriptorPassing);
-+
-         QVariantList args;
-         args << "handle-power-key:handle-suspend-key:handle-hibernate-key:handle-lid-switch"; // what
-         args << "PowerDevil"; // who
-@@ -232,8 +234,9 @@
-         args << "block"; // mode
-         QDBusPendingReply<QDBusUnixFileDescriptor> desc = managerIface.asyncCallWithArgumentList("Inhibit", args);
-         desc.waitForFinished();
--        if (desc.isValid() && desc.value().isValid()) {
--            kDebug() << "systemd powersave events handling inhibited";
-+        if (desc.isValid()) {
-+            m_systemdInhibitFd = desc.value();
-+            kDebug() << "systemd powersave events handling inhibited, descriptor:" << m_systemdInhibitFd.fileDescriptor();
-         }
-         else
-             kWarning() << "failed to inhibit systemd powersave handling";
-
---- a/powerdevil/daemon/powerdevilpolicyagent.h
-+++ b/powerdevil/daemon/powerdevilpolicyagent.h
-@@ -27,6 +27,7 @@
- #include <QtCore/QWeakPointer>
- 
- #include <QtDBus/QDBusContext>
-+#include <QtDBus/QDBusUnixFileDescriptor>
- 
- #include <kdemacros.h>
- 
-@@ -108,6 +109,7 @@
-     QString m_activeSessionPath;
-     QWeakPointer< QDBusInterface > m_sdSessionInterface;
-     QWeakPointer< QDBusInterface > m_sdSeatInterface;
-+    QDBusUnixFileDescriptor m_systemdInhibitFd;
- 
-     // ConsoleKit support
-     bool m_ckAvailable;
-
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 0331990f3..000000000
--- a/testing/kdebase/PKGBUILD
+++ /dev/null
@@ -1,120 +0,0 @@
-# $Id: PKGBUILD 167578 2012-10-02 19:09:21Z 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.9.2
-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.xz")
-sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66')
-
-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/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 3f70219e7..000000000
--- a/testing/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167598 2012-10-02 19:24:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.9.2
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the KDE libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
-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.xz")
-sha1sums=('d8c762a6a65323f80e47cadbfa732b529a07dbc1')
-
-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-korundum/PKGBUILD b/testing/kdebindings-korundum/PKGBUILD
deleted file mode 100644
index 378407606..000000000
--- a/testing/kdebindings-korundum/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 167599 2012-10-02 19:24:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-korundum
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Ruby bindings for libraries created by the KDE community"
-url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qtruby' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz"
-        'ruby19.patch')
-sha1sums=('efa6b6b6bae89f8e16cbbcf8c5840c6cbdab57e3'
-          'c074f027bac3b9bffe70a2c2304a6a7be12be034')
-
-build() {
-  cd "${srcdir}/korundum-${pkgver}"
-  patch -p1 -i "${srcdir}/ruby19.patch"
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-
-  cmake ../korundum-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCUSTOM_RUBY_SITE_LIB_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]') \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]')
-
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdebindings-korundum/ruby19.patch b/testing/kdebindings-korundum/ruby19.patch
deleted file mode 100644
index c2468d9ce..000000000
--- a/testing/kdebindings-korundum/ruby19.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- korundum-4.9.0/src/krubypluginfactory.cpp~	2012-07-27 10:44:19.544464612 +0000
-+++ korundum-4.9.0/src/krubypluginfactory.cpp	2012-07-27 10:53:15.247374749 +0000
-@@ -39,7 +39,6 @@
- extern "C" {
- extern VALUE rb_load_path;
- extern VALUE qt_internal_module;
--void Init_prelude(void);
- }
- 
- //
-@@ -165,7 +164,8 @@
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude(); 
-+    char *opts[] = { "ruby", "-e;" };
-+    ruby_options(2, opts);
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
-@@ -342,7 +342,8 @@
- #if RUBY_VERSION >= 0x10900
-     VALUE gem = rb_define_module("Gem");
-     rb_const_set(gem, rb_intern("Enable"), Qtrue);
--    Init_prelude();                                             
-+    char *opts[] = { "ruby", "-e;" };
-+    ruby_options(2, opts);
- #endif
- 
-     ruby_incpush(QFile::encodeName(program.path()));
diff --git a/testing/kdebindings-kross/PKGBUILD b/testing/kdebindings-kross/PKGBUILD
deleted file mode 100644
index 4cfb2d320..000000000
--- a/testing/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 167600 2012-10-02 19:25:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-#         'kdebindings-kross-ruby'
-         'kdebindings-kross-java')
-pkgver=4.9.2
-pkgrel=1
-url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
-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.xz")
-sha1sums=('9208e4ad1b8ad97f1220cd6696f22d8b1eab29cb')
-
-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 94f730e8f..000000000
--- a/testing/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167601 2012-10-02 19:25:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Perl bindings for the KDE libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
-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.xz")
-sha1sums=('7ed1e54f5216e5bfd6b9709900d3df6b606910b5')
-
-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 bcf08e854..000000000
--- a/testing/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167572 2012-10-02 19:02:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Perl bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
-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.xz")
-sha1sums=('1f7d70401c84fa54e937979a7c03d3fa8d7d59c2')
-
-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 a14201e78..000000000
--- a/testing/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 168840 2012-10-16 11:53:48Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-python
-pkgname=('kdebindings-python'
-         'kdebindings-python2')
-pkgver=4.9.2
-pkgrel=2
-url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt'
-             'pyqt' 'qscintilla' 'python2-sip' 'python-sip')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz"
-        'pyqt495.patch')
-sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11'
-          '0935c32e55806873f2d088613594559285da7e9c')
-
-build() {
-  export PYTHONDONTWRITEBYTECODE="TRUE"
-
-  cd pykde4-${pkgver}
-  patch -p1 -i "${srcdir}"/pyqt495.patch
-  cd ../ 
-
-  mkdir build
-  cd build
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-    -DPYTHON_LIBRARY=/usr/lib/libpython3.3m.so.1.0
-  make
-  cd ..
-
-  mkdir build-python2
-  cd build-python2
-  cmake ../pykde4-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package_kdebindings-python() {
-  pkgdesc="A set of Python 3.x bindings for KDE"
-  depends=('kdepim-runtime' 'pyqt' 'qscintilla')
-
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-python2() {
-  pkgdesc="A set of Python 2.x bindings for KDE"
-  depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla')
-  conflicts=('kdebindings-python<4.8.1-2')
- 
-  cd "${srcdir}"/build-python2
-  make DESTDIR="${pkgdir}" install
-
-  # Fix conflicts
-  rm "${pkgdir}"/usr/bin/pykdeuic4
-  ln -sf /usr/lib/python2.7/site-packages/PyQt4/uic/pykdeuic4.py \
-    "${pkgdir}"/usr/bin/python2-pykdeuic4
-
-  mv "${pkgdir}"/usr/share/apps/pykde4/examples \
-    "${pkgdir}"/usr/share/apps/pykde4/python2-examples
-
-  mv "${pkgdir}"/usr/share/sip/PyKDE4 \
-    "${pkgdir}"/usr/share/sip/python2-PyKDE4
-
-  # 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-python/pyqt495.patch b/testing/kdebindings-python/pyqt495.patch
deleted file mode 100644
index b8a9df258..000000000
--- a/testing/kdebindings-python/pyqt495.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Mon, 01 Oct 2012 18:47:56 +0000
-Subject: Remove duplicated QVector<int> definition, since it's in PyQt now.
-X-Git-Url: http://quickgit.kde.org/?p=pykde4.git&amp;a=commitdiff&amp;h=017822bd0dfc83fe9a7a483ecc33f4aab839a3c6
----
-Remove duplicated QVector<int> definition, since it's in PyQt now.
-Simon, if you have time, please review if everything is OK.
-
-CCMAIL: simon@simonzone.com
----
-
-
---- a/sip/kdecore/typedefs.sip
-+++ b/sip/kdecore/typedefs.sip
-@@ -951,78 +951,4 @@
- %End
- };
- 
--%MappedType QVector<int>
--{
--%TypeHeaderCode
--#include <qvector.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i)
--    {
--        int t = (sipCpp->at(i));
--
--#if PY_MAJOR_VERSION >= 3        
--        PyObject *tobj = PyLong_FromLong(t);
--#else
--        PyObject *tobj = PyInt_FromLong(t);
--#endif
--
--        PyList_SET_ITEM(l, i, tobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--    {
--        if (!PyList_Check(sipPy))
--            return 0;
--
--        for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--            PyObject *tobj = PyList_GET_ITEM(sipPy, i);
--#if PY_MAJOR_VERSION >= 3
--            if (!PyNumber_Check(tobj))
--#else
--            if (!PyInt_Check(tobj))
--#endif
--                return 0;
--        }
--        return 1;
--    }
--
--    QVector<int> *qv = new QVector<int>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
--    {
--        PyObject *tobj = PyList_GET_ITEM(sipPy, i);
-- #if PY_MAJOR_VERSION >= 3
--        int t = PyLong_AsLong (tobj);
--#else
--        int t = PyInt_AS_LONG (tobj);
--#endif
--
--        if (*sipIsErr)
--        {
--            delete qv;
--            return 0;
--        }
--
--        qv->append(t);
--    }
-- 
--    *sipCppPtr = qv;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
-+
-
diff --git a/testing/kdebindings-qtruby/PKGBUILD b/testing/kdebindings-qtruby/PKGBUILD
deleted file mode 100644
index 10e0d715c..000000000
--- a/testing/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167575 2012-10-02 19:04:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Ruby bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
-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.xz")
-sha1sums=('7d74ef9d0c66ef6c54fd25aeff89de7f06685dda')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../qtruby-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCUSTOM_RUBY_SITE_LIB_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorlibdir"]') \
-    -DCUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -e 'puts RbConfig::CONFIG["vendorarchdir"]')
-  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 2c11b1667..000000000
--- a/testing/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167574 2012-10-02 19:04:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.9.2
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the Qt libraries"
-url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
-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.xz")
-sha1sums=('549f386325cf02662c685f83b1844c72149255d1')
-
-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 b7369c5fa..000000000
--- a/testing/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167567 2012-10-02 18:59:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A general purpose C++ parser with a plugin infrastructure"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
-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.xz")
-sha1sums=('f7ac776e18ad0df7535280ca5e6ea951cde159fb')
-
-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 6b76999f2..000000000
--- a/testing/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167571 2012-10-02 19:02:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Language independent library for KDE bindings"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
-             'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-optdepends=('kdesdk-kate: Kate bindings'
-            'kdegraphics-okular: Okular bindings')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('ad541046cf64df5a9ffda29979f8868a9c29c354')
-
-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 f7c426b67..000000000
--- a/testing/kdebindings-smokeqt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167568 2012-10-02 18:59:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokeqt
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Language independent library for Qt bindings"
-url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('a2f70eb2cb67942456604a6538e9cabe8a48aad5')
-
-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 5ff1646dd..000000000
--- a/testing/kdeedu-analitza/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167585 2012-10-02 19:14:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-analitza
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A library to add mathematical features to your program"
-url="https://projects.kde.org/projects/kde/kdeedu/analitza"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('065e449af454e08f02ece846fe5b28db09bda1be')
-
-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 bc39e5c80..000000000
--- a/testing/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167602 2012-10-02 19:26:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.9.2
-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.xz")
-sha1sums=('4f13e61086929da9ba75ee3b73612540054888b1')
-
-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 f0e100ab4..000000000
--- a/testing/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167603 2012-10-02 19:26:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.9.2
-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' 'libqalculate')
-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.xz")
-sha1sums=('51b6cf08d43b6ea9fc285283a8ee1d8097b7349b')
-
-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 b0030115c..000000000
--- a/testing/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167604 2012-10-02 19:27:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.9.2
-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.xz")
-sha1sums=('93aceea871e10eff771645f627563517684a11a5')
-
-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 cca0347d6..000000000
--- a/testing/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167605 2012-10-02 19:28:07Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.9.2
-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.xz")
-sha1sums=('d328ad31f50a33aefeb009411a1adb51c29850a2')
-
-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 afe645228..000000000
--- a/testing/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167606 2012-10-02 19:28:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.9.2
-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.xz")
-sha1sums=('b6fd76d854473ab6dbfdfdcb09347e7c4363a580')
-
-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 f8b104855..000000000
--- a/testing/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167607 2012-10-02 19:29:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.9.2
-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.xz")
-sha1sums=('82c7c573d6c0c248ae2d8db24504d1943824d0da')
-
-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 57c0169ea..000000000
--- a/testing/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167608 2012-10-02 19:29:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.9.2
-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.xz")
-sha1sums=('a68b02fd9ba765bce5d95b754dfd7eef70fa5743')
-
-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 a82203a37..000000000
--- a/testing/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167609 2012-10-02 19:30:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.9.2
-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.xz")
-sha1sums=('6c11cf05fca993b7ddb7f92f68299a34470b5cd5')
-
-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 b815e56dd..000000000
--- a/testing/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167610 2012-10-02 19:31:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.9.2
-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.xz")
-sha1sums=('13b3d40b0d33b1a60b36278760e35f337089cc73')
-
-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 10124965b..000000000
--- a/testing/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167611 2012-10-02 19:31:39Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.9.2
-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.xz")
-sha1sums=('86b4bd5f4b7ccc4f6e0769a8360e55ffebdc2eaf')
-
-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 eee3defe1..000000000
--- a/testing/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167612 2012-10-02 19:32:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.9.2
-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.xz")
-sha1sums=('177413e9f9e490a4c72d8f85d3bdd36ffd1ba934')
-
-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 db7db52c9..000000000
--- a/testing/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167613 2012-10-02 19:33:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.9.2
-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.xz")
-sha1sums=('66fba97fc152925f87551be2dd283d4cbf06683f')
-
-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 39c41b806..000000000
--- a/testing/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167614 2012-10-02 19:33:54Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.9.2
-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' 'libindi')
-makedepends=('cmake' 'automoc4' 'eigen')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('144409ebfb2a2c3d040ab4a1ad130b5677dd23b6')
-
-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 10c8d3d79..000000000
--- a/testing/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167615 2012-10-02 19:34:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.9.2
-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.xz")
-sha1sums=('99133b52b29a7ee4d3dd6da664ad8c47fd637b71')
-
-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 867463af9..000000000
--- a/testing/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167616 2012-10-02 19:35:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.9.2
-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.xz")
-sha1sums=('c30e80f71dc622b818d6539054f91584b0dce444')
-
-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 6ce3f425d..000000000
--- a/testing/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167617 2012-10-02 19:35:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.9.2
-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.xz")
-sha1sums=('53c702a88bd9cb0c8fba54d6353d06005760bd71')
-
-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 2dedbdc26..000000000
--- a/testing/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167580 2012-10-02 19:10:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.9.2
-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.xz")
-sha1sums=('71f0ab4845a7bf5505eba0bf5b654720a59d4028')
-
-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-pairs/PKGBUILD b/testing/kdeedu-pairs/PKGBUILD
deleted file mode 100644
index 29830e669..000000000
--- a/testing/kdeedu-pairs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167618 2012-10-02 19:36:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-pairs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A memory and pairs game for KDE"
-url="https://projects.kde.org/projects/kde/kdeedu/pairs"
-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/pairs-${pkgver}.tar.xz")
-sha1sums=('8ed40356ee7df8059935e945e070667dfffcc77b')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../pairs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeedu-pairs/kdeedu-pairs.install b/testing/kdeedu-pairs/kdeedu-pairs.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdeedu-pairs/kdeedu-pairs.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 1172c66f1..000000000
--- a/testing/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167621 2012-10-02 19:37:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.9.2
-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.xz")
-sha1sums=('397e58d783f75f48e8cf5a3a35f1fa441010b50b')
-
-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 a7c3d2cdb..000000000
--- a/testing/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167622 2012-10-02 19:37:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.9.2
-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')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('8c3ba1c2b15a795147110f246853217d301f903b')
-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 92a7ba92a..000000000
--- a/testing/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167623 2012-10-02 19:38:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.9.2
-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')
-makedepends=('cmake' 'automoc4' 'eigen')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('7545eee07323935773466cfd3a241fbd8786ef13')
-
-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 cd2a79932..000000000
--- a/testing/kdegames/PKGBUILD
+++ /dev/null
@@ -1,435 +0,0 @@
-# $Id: PKGBUILD 167624 2012-10-02 19:40:01Z 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-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-knavalbattle'
-         'kdegames-knetwalk'
-         'kdegames-kolf'
-         'kdegames-kollision'
-         'kdegames-konquest'
-         'kdegames-kpatience'
-         'kdegames-kreversi'
-         'kdegames-kshisen'
-         'kdegames-ksirk'
-         'kdegames-ksnakeduel'
-         'kdegames-kspaceduel'
-         'kdegames-ksquares'
-         'kdegames-ksudoku'
-         'kdegames-ktuberling'
-         'kdegames-kubrick'
-         'kdegames-libkdegames'
-         'kdegames-libkmahjongg'
-         'kdegames-lskat'
-         'kdegames-palapeli')
-pkgver=4.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2'
-             'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('a751f6b9ed6c24f8a420d6737be87f2bbb0c2cb3')
-
-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
-}
-
-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
-}
-
-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
-}
-
-package_kdegames-kajongg() {
-	pkgdesc='The ancient Chinese board game for 4 players'
-	depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python2' 'twisted')
-        url="http://www.kde.org/applications/games/kajongg/"
-	install='kdegames.install'
-	cd $srcdir/build/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
-}
-
-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
-}
-
-package_kdegames-knavalbattle() {
-	pkgdesc='Naval Battle'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/knavalbattle/"
-	install='kdegames-knavalbattle.install'
-    replaces=('kdegames-kbattleship')
-    conflicts=('kdegames-kbattleship')
-    cd $srcdir/build/knavalbattle
-	make DESTDIR=$pkgdir install
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-package_kdegames-kreversi() {
-	pkgdesc='Reversi Board Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/kreversi/"
-	install='kdegames.install'
-	cd $srcdir/build/kreversi
-	make DESTDIR=$pkgdir install
-}
-
-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
-}
-
-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
-}
-
-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
-}
-
-package_kdegames-ksquares() {
-	pkgdesc='Connect the dots to create squares'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksquares/"
-	install='kdegames.install'
-	cd $srcdir/build/ksquares
-	make DESTDIR=$pkgdir install
-}
-
-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
-}
-
-package_kdegames-ksnakeduel() {
-	pkgdesc='Snake-like Game'
-	depends=('kdebase-runtime' 'kdegames-libkdegames')
-	url="http://kde.org/applications/games/ksnakeduel/"
-	install='kdegames.install'
-    replaces=('kdegames-ktron')
-    conflicts=('kdegames-ktron')
-	cd $srcdir/build/ksnakeduel
-	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
-}
-
-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
-}
-
-package_kdegames-libkdegames() {
-	pkgdesc='KDE game library'
-	groups=()
-	depends=('kdelibs' 'openal')
-	cd $srcdir/build/libkdegames
-	make DESTDIR=$pkgdir install
-}
-
-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
-}
-
-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
-}
diff --git a/testing/kdegames/kdegames-kbattleship.install b/testing/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegames/kdegames-kbattleship.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-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-knavalbattle.install b/testing/kdegames/kdegames-knavalbattle.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/testing/kdegames/kdegames-knavalbattle.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 3af34a012..000000000
--- a/testing/kdegames/kdegames-kpatience.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-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-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 252ce0542..000000000
--- a/testing/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167625 2012-10-02 19:42:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.9.2
-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.xz")
-sha1sums=('5a48c195d4c305f166b2d9fc1a483457c4698156')
-
-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 e1698bba0..000000000
--- a/testing/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167626 2012-10-02 19:43:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.9.2
-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.xz")
-sha1sums=('5b5b68b8996fdb1cb6541704c03d36cf506e8827')
-
-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 b2098a07a..000000000
--- a/testing/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167627 2012-10-02 19:43:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.9.2
-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.xz")
-sha1sums=('7e34705505140cc3e6085fc057365ce4cab2c0a0')
-
-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 3340fb97f..000000000
--- a/testing/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167628 2012-10-02 19:44:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.9.2
-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.xz")
-sha1sums=('553d40c87000c57a10f64f01313ca519148530da')
-
-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 0089a8b03..000000000
--- a/testing/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167629 2012-10-02 19:44:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.9.2
-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.xz")
-sha1sums=('a7a8fb6c63dc87e239bb54c2f178d2d5412296f3')
-
-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 7a20b3178..000000000
--- a/testing/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167630 2012-10-02 19:44:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.9.2
-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.xz")
-sha1sums=('59fe8c2246d3d7e8c8307a4d72fae78caec20681')
-
-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 d5e587d6e..000000000
--- a/testing/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167631 2012-10-02 19:45:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A scan plugin that implements the scanning"
-url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
-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.xz")
-sha1sums=('91b1ef55620bc621a81d0e75643e47d0a115e524')
-
-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 8cd949f39..000000000
--- a/testing/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167632 2012-10-02 19:45:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.9.2
-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.xz")
-sha1sums=('3496d070420f8aff10e69c98728c5c1ca34f6d47')
-
-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 851dc49c1..000000000
--- a/testing/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167633 2012-10-02 19:46:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A collection of plugins to handle mobipocket files"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
-groups=('kde' 'kdegraphics')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('81590d0958cebc3a052a4d973334f3fe4a9eabe4')
-
-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 784e8b3f2..000000000
--- a/testing/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167569 2012-10-02 19:00:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.9.2
-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.xz")
-sha1sums=('2260afa2f0b7bf6afb2da5129fefd95b144dcd74')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../okular-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -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 50f2b6a52..000000000
--- a/testing/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167634 2012-10-02 19:46:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
-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.xz")
-sha1sums=('d9923f5e52fc58c50bf83d7854ce1ec615407753')
-
-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 d7c1954ef..000000000
--- a/testing/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167635 2012-10-02 19:47:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A KPart for viewing SVGs"
-url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
-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.xz")
-sha1sums=('06584ae6652d0ea2265c47599dbb6789c973f1fc')
-
-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 24f3f0b2f..000000000
--- a/testing/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167636 2012-10-02 19:47:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Thumbnailers for various graphics file formats"
-url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
-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.xz")
-sha1sums=('c87d00fa6af8fd1d57b0da74cdb382dd7d6f5311')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdelibs3/PKGBUILD b/testing/kdelibs3/PKGBUILD
deleted file mode 100644
index b3efef435..000000000
--- a/testing/kdelibs3/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# $Id: PKGBUILD 169643 2012-10-25 01:35:25Z 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=15
-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' '!makeflags')
-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'
-	'kdelibs3-cups16.patch')
-sha1sums=('c930a25f4419134def55b8466c3a6f737227fb82'
-          'c8ca21e4848a627760746d0a8a64bf4f90684c3e'
-          '50c9de71b102507fb78b192ecc22a5fc3e031bc3'
-          'fbd6e773edf3e8bb8e1272629984025e041da2ca'
-          '5fbbf7a5e2032878815fa055bfb5020f478d2b25'
-          '35e56fe4c5f71685e64b13f448dcacc620166e06'
-          '50e92950498463defb9149ffcf8cbc2e8cd1063b'
-          'e5f5b8c060a2db9cedb82bf18caadfa869921779'
-          '6a6c544b3336bfe89bb17ef737d783a7ec006c6c')
-
-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
-	patch -p1 -i "${srcdir}"/kdelibs3-cups16.patch
-
-	sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
-	make -f admin/Makefile.common cvs
-
-	./configure --prefix=/opt/kde \
-		--with-distribution='Arch Linux' \
-		--with-alsa \
-		--disable-debug \
-		--disable-dnssd \
-		--disable-dnotify \
-		--enable-inotify \
-		--enable-sendfile \
-		--without-lua \
-		--with-hspell \
-		--enable-gcc-hidden-visibility \
-		--enable-final \
-		--enable-new-ldflags LDFLAGS="${LDFLAGS} -L/opt/qt/lib" \
-		--without-arts \
-		--disable-libfam
-	make
-}
-
-package() {
-	cd "$srcdir"/kdelibs-${pkgver}
-
-	make DESTDIR="$pkgdir" install
-
-	# disable broken kconf_update by default
-	install -D -m644 "$srcdir"/kconf_updaterc \
-      "$pkgdir"/opt/kde/share/config/kconf_updaterc
-
-	# install KDE3 profile
-	install -D -m755 "$srcdir"/kde3.profile "$pkgdir"/etc/profile.d/kde3.sh
-	# make KDE3 styles available to Qt3
-	install -d -m755 "$pkgdir"/opt/qt/plugins
-	ln -sf /opt/kde/lib/kde3/plugins/styles "$pkgdir"/opt/qt/plugins/styles
-
-	# cert bundle seems to be hardcoded
-	# link it to the one from ca-certificates
-	rm -f "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-	ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/opt/kde/share/apps/kssl/ca-bundle.crt
-
-	# we don't have khelpcenter anyway
-	rm -rf "$pkgdir"/opt/kde/share/doc
-
-	install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-	echo '/opt/kde/lib' > "${pkgdir}"/etc/ld.so.conf.d/kdelibs3.conf
-}
diff --git a/testing/kdelibs3/acinclude.patch b/testing/kdelibs3/acinclude.patch
deleted file mode 100644
index 0610d6df5..000000000
--- a/testing/kdelibs3/acinclude.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-2009-12-10  Stepan Kasal  <skasal@redhat.com>
-
-The change of implementation of AC_REQUIRE in 2.64 caused a regression
-in the arts project.
-This can be fixed by shuffling some macro calls.
-
-I suppose that most of this patch will not be needed with a future
-release of Autoconf.
-But the last chunk of this patch is a real bug in this source and
-should go upstream.
-
---- arts-1.5.10/admin/acinclude.m4.in	2008-08-20 18:07:05.000000000 +0200
-+++ arts-1.5.10/admin/acinclude.m4.in	2009-12-09 17:30:57.000000000 +0100
-@@ -3081,8 +3081,18 @@
- fi
- ])
- 
-+AC_DEFUN([AC_CHECK_COMPILERS_CC],
-+[ 
-+  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
-+  CFLAGS=" $CFLAGS"
-+  AC_PROG_CC
-+  CXXFLAGS=" $CXXFLAGS"
-+  AC_PROG_CXX
-+])
-+
- AC_DEFUN([AC_CHECK_COMPILERS],
- [
-+  AC_REQUIRE([AC_CHECK_COMPILERS_CC])
-   AC_ARG_ENABLE(debug,
- 	        AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
-   [
-@@ -3141,11 +3151,6 @@
-     [kde_use_profiling="no"]
-   )
- 
--  dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
--  CFLAGS=" $CFLAGS"
--
--  AC_PROG_CC 
--
-   AC_PROG_CPP
- 
-   if test "$GCC" = "yes"; then
-@@ -3174,10 +3179,6 @@
-      LDFLAGS=""
-   fi
- 
--  CXXFLAGS=" $CXXFLAGS"
--
--  AC_PROG_CXX
--
-   KDE_CHECK_FOR_BAD_COMPILER
- 
-   if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
-@@ -3503,8 +3504,8 @@
- AC_REQUIRE([AC_LIBTOOL_DLOPEN])
- AC_REQUIRE([KDE_CHECK_LIB64])
- 
--AC_OBJEXT
--AC_EXEEXT
-+AC_REQUIRE([AC_OBJEXT])
-+AC_REQUIRE([AC_EXEEXT])
- 
- AM_PROG_LIBTOOL
- AC_LIBTOOL_CXX
diff --git a/testing/kdelibs3/kconf_updaterc b/testing/kdelibs3/kconf_updaterc
deleted file mode 100644
index 24c2623fb..000000000
--- a/testing/kdelibs3/kconf_updaterc
+++ /dev/null
@@ -1,2 +0,0 @@
-updateInfoAdded=false
-autoUpdateDisabled=true
diff --git a/testing/kdelibs3/kde3.profile b/testing/kdelibs3/kde3.profile
deleted file mode 100755
index ef09631ff..000000000
--- a/testing/kdelibs3/kde3.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export PATH=$PATH:/opt/kde/bin
-if [ ! -z $XDG_DATA_DIRS ]; then
-  export XDG_DATA_DIRS=$XDG_DATA_DIRS:/opt/kde/share
-else
-  export XDG_DATA_DIRS=/opt/kde/share
-fi
diff --git a/testing/kdelibs3/kde4-compatibility.patch b/testing/kdelibs3/kde4-compatibility.patch
deleted file mode 100644
index 129c314ae..000000000
--- a/testing/kdelibs3/kde4-compatibility.patch
+++ /dev/null
@@ -1,1012 +0,0 @@
-diff -Nura kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10.new/kdecore/kcrash.cpp
---- kdelibs-3.5.10/kdecore/kcrash.cpp	2007-01-15 12:34:17.000000000 +0100
-+++ kdelibs-3.5.10.new/kdecore/kcrash.cpp	2009-08-06 06:18:06.000000000 +0200
-@@ -158,7 +158,7 @@
-           int i = 0;
- 
-           // argument 0 has to be drkonqi
--          argv[i++] = "drkonqi";
-+          argv[i++] = "/usr/lib/kde4/libexec/drkonqi";
- 
- #if defined Q_WS_X11
-           // start up on the correct display
-@@ -325,7 +325,7 @@
-       _exit(253);
-     if(!geteuid() && setuid(getuid()) < 0)
-       _exit(253);
--    execvp("drkonqi", const_cast< char** >( argv ));
-+    execvp("/usr/lib/kde4/libexec/drkonqi", const_cast< char** >( argv ));
-     _exit(errno);
-   }
-   else
-diff -Nura kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10.new/kded/Makefile.am
---- kdelibs-3.5.10/kded/Makefile.am	2005-10-10 17:06:29.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.am	2009-08-06 06:21:37.000000000 +0200
-@@ -58,7 +58,7 @@
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
- 
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- 
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
-diff -Nura kdelibs-3.5.10/kded/Makefile.in kdelibs-3.5.10.new/kded/Makefile.in
---- kdelibs-3.5.10/kded/Makefile.in	2008-08-20 18:05:57.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/Makefile.in	2009-08-06 06:22:19.000000000 +0200
-@@ -535,7 +535,7 @@
- 
- servicetype_DATA = kdedmodule.desktop
- servicetypedir = $(kde_servicetypesdir)
--xdg_menu_DATA = applications.menu
-+xdg_menu_DATA = kde-applications.menu
- update_DATA = kded.upd
- updatedir = $(kde_datadir)/kconf_update
- #>- all: all-am
-@@ -1173,7 +1173,7 @@
- 	-rm -f  kded.moc vfolder_menu.moc kdedmodule.moc kbuildsycoca.moc
- 
- #>+ 2
--KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
-+KDE_DIST=DESIGN kded.upd Makefile.in HOWTO vfolder_menu.h kde-applications.menu kded.h kdedmodule.desktop README.kded kctimefactory.h Makefile.am 
- 
- #>+ 2
- docs-am:
-diff -Nura kdelibs-3.5.10/kded/applications.menu kdelibs-3.5.10.new/kded/applications.menu
---- kdelibs-3.5.10/kded/applications.menu	2005-09-10 10:27:40.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/applications.menu	1970-01-01 01:00:00.000000000 +0100
-@@ -1,469 +0,0 @@
-- <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
--  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
--
--<Menu>
--	<Name>Applications</Name>
--	<Directory>kde-main.directory</Directory>
--	<!-- Search the default locations -->
--	<KDELegacyDirs/>
--	<DefaultAppDirs/>
--	<DefaultDirectoryDirs/>
--	<DefaultLayout>
--		<Merge type="menus"/>
--		<Merge type="files"/>
--		<Separator/>
--		<Menuname>More</Menuname>
--	</DefaultLayout>
--	<Layout>
--		<Merge type="menus"/>
--		<Menuname>Applications</Menuname>
--		<Merge type="files"/>
--	</Layout>
--
--	<Menu>
--		<Name>Applications</Name>
--		<Directory>kde-unknown.directory</Directory>
--		<OnlyUnallocated/>
--		<Include>
--			<Not>
--				<!-- Don't list non-KDE core applications -->
--				<And>
--					<Category>Core</Category>
--					<Not><Category>KDE</Category></Not>
--				</And>
--				<!-- Don't list SUSE's YaST in here -->
--				<Category>X-SuSE-YaST</Category>
--			</Not>
--		</Include>
--	</Menu>
--       <Menu>
--                <Name>Development</Name>
--                <Directory>kde-development.directory</Directory>
--                <Menu>
--                        <Name>X-KDE-KDevelopIDE</Name>
--                        <Directory>kde-development-kdevelop.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Development</Category>
--                                <Category>X-KDE-KDevelopIDE</Category>
--                                </And>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>Translation</Name>
--			<Directory>kde-development-translation.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>Translation</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Web Development</Name>
--			<Directory>kde-development-webdevelopment.directory</Directory>
--			<Include>
--				<And>
--				<Category>Development</Category>
--				<Category>WebDevelopment</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Include>
--                        <And>
--                        <Category>Development</Category>
--                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
--                        <Not><Category>Translation</Category></Not>
--                        <Not><Category>WebDevelopment</Category></Not>
--                        </And>
--                </Include>
--        </Menu>
--	<Menu>
--		<Name>Science</Name>
--		<Directory>kde-science.directory</Directory>
--		<Include>
--			<And><!-- Include /any/ Science app which is not an Education app -->
--				<Or>
--					<Category>Astronomy</Category>
--					<Category>Biology</Category>
--					<Category>Chemistry</Category>
--					<Category>Geology</Category>
--					<Category>MedicalSoftware</Category>
--					<Category>Physics</Category>
--					<Category>Math</Category>
--					<Category>Science</Category>
--				</Or>
--				<Not><Category>Education</Category></Not>
--			</And>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>Edutainment</Name>
--		<Directory>kde-edutainment.directory</Directory>
--		<Menu>
--			<Name>Languages</Name>
--			<Directory>kde-edu-languages.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Mathematics</Name>
--			<Directory>kde-edu-mathematics.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Math</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Miscellaneous</Name>
--			<Directory>kde-edu-miscellaneous.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Not>
--				<Category>Languages</Category>
--				<Category>X-KDE-Edu-Language</Category>
--				<Category>Math</Category>
--				<Category>Science</Category>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Not>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Science</Name>
--			<Directory>kde-edu-science.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Category>Science</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Tools</Name>
--			<Directory>kde-edu-tools.directory</Directory>
--			<Include>
--				<And>
--				<Category>Education</Category>
--				<Or>
--				<Category>Teaching</Category>
--				<Category>X-KDE-Edu-Teaching</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Games</Name>
--		<Directory>kde-games.directory</Directory>
--		<Menu>
--			<Name>Arcade</Name>
--			<Directory>kde-games-arcade.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>ArcadeGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Board</Name>
--			<Directory>kde-games-board.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>BoardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Card</Name>
--			<Directory>kde-games-card.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>CardGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Kidsgames</Name>
--			<Directory>kde-games-kids.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Or>
--				<Category>X-KDE-KidsGame</Category>
--				<Category>KidsGame</Category>
--				</Or>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>TacticStrategy</Name>
--			<Directory>kde-games-strategy.directory</Directory>
--			<Include>
--				<And>
--				<Category>Game</Category>
--				<Category>StrategyGame</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Include>
--			<And>
--			<Category>Game</Category>
--			<Not>
--			<Category>ArcadeGame</Category>
--			<Category>BoardGame</Category>
--			<Category>CardGame</Category>
--			<Category>X-KDE-KidsGame</Category>
--			<Category>KidsGame</Category>
--			<Category>StrategyGame</Category>
--			</Not>
--			</And>
--		</Include>
--               <Menu>
--                        <Name>Toys</Name>
--                        <Directory>kde-toys.directory</Directory>
--                        <Include>
--                                 <Category>Amusement</Category>
--                        </Include>
--               </Menu>
--	</Menu>
--	<Menu>
--		<Name>Graphics</Name>
--		<Directory>kde-graphics.directory</Directory>
--		<Include>
--			<And>
--			<Category>Graphics</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Graphics</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Internet</Name>
--		<Directory>kde-internet.directory</Directory>
--		<Include>
--			<And>
--			<Category>Network</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--		  <Name>Terminal</Name>
--		  <Directory>kde-internet-terminal.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Network</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Multimedia</Name>
--		<Directory>kde-multimedia.directory</Directory>
--		<Include>
--			<And>
--			<Category>AudioVideo</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>AudioVideo</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Office</Name>
--		<Directory>kde-office.directory</Directory>
--		<Layout>
--			<Merge type="menus"/>
--			<Filename>kde-koshell.desktop</Filename>
--			<Filename>kde-Kontact.desktop</Filename>
--			<Separator/>
--			<Filename>kde-kword.desktop</Filename>
--			<Filename>kde-kspread.desktop</Filename>
--			<Filename>kde-kpresenter.desktop</Filename>
--			<Merge type="files"/>
--			<Separator/>
--			<Menuname>More</Menuname>
--		</Layout>
--		<Include>
--                        <And>
--			<Category>Office</Category>
--                        <Not><Category>X-KDE-More</Category></Not>
--                        </And>
--                </Include>
--                <Menu>
--                        <Name>More</Name>
--                        <Directory>kde-more.directory</Directory>
--                        <Include>
--                                <And>
--                                <Category>Office</Category>
--                                <Category>X-KDE-More</Category>
--                                </And>
--                        </Include>
--                </Menu>
--	</Menu>
--	<Menu>
--		<Name>Settingsmenu</Name>
--		<Directory>kde-settingsmenu.directory</Directory>
--		<Include>
--			<Category>Settings</Category>
--		</Include>
--	</Menu>
--	<Menu>
--		<Name>System</Name>
--		<Directory>kde-system.directory</Directory>
--		<Include>
--			<And>
--			<Category>System</Category>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>System</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>ScreenSavers</Name>
--			<Directory>kde-system-screensavers.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>Terminal</Name>
--			<Directory>kde-system-terminal.directory</Directory>
--		</Menu>
--	</Menu>
--	<Menu>
--		<Name>Utilities</Name>
--		<Directory>kde-utilities.directory</Directory>
--		<Include>
--			<And>
--			<Category>Utility</Category>
--			<Not><Category>Accessibility</Category></Not>
--			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
--			<Not><Category>X-KDE-Utilities-File</Category></Not>
--			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
--			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
--			<Not><Category>X-KDE-More</Category></Not>
--			</And>
--		</Include>
--		<Menu>
--			<Name>Accessibility</Name>
--			<Directory>kde-utilities-accessibility.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>Accessibility</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Desktop</Name>
--			<Directory>kde-utilities-desktop.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Desktop</Category>
--				</And>
--			</Include>
--		</Menu>
--                <Menu>
--                        <Name>Editors</Name>
--                        <Directory>kde-editors.directory</Directory>
--                        <Include>
--                                <Category>TextEditor</Category>
--                        </Include>
--                </Menu>
--		<Menu>
--			<Name>File</Name>
--			<Directory>kde-utilities-file.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-File</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>Peripherals</Name>
--			<Directory>kde-utilities-peripherals.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-Peripherals</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>PIM</Name>
--			<Directory>kde-utilities-pim.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-Utilities-PIM</Category>
--				</And>
--			</Include>
--		</Menu>
--		<Menu>
--			<Name>XUtilities</Name>
--			<Directory>kde-utilities-xutils.directory</Directory>
--		</Menu>
--		<Menu>
--			<Name>More</Name>
--			<Directory>kde-more.directory</Directory>
--			<Include>
--				<And>
--				<Category>Utility</Category>
--				<Category>X-KDE-More</Category>
--				</And>
--			</Include>
--		</Menu>
--	</Menu>
--	<Include>
--		<And>
--		<Category>KDE</Category>
--		<Category>Core</Category>
--		</And>
--	</Include>
--	<DefaultMergeDirs/>
--	<MergeFile>applications-kmenuedit.menu</MergeFile>
--</Menu>
-diff -Nura kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10.new/kded/kbuildsycoca.cpp
---- kdelibs-3.5.10/kded/kbuildsycoca.cpp	2007-05-14 09:52:43.000000000 +0200
-+++ kdelibs-3.5.10.new/kded/kbuildsycoca.cpp	2009-08-06 06:23:48.000000000 +0200
-@@ -379,7 +379,7 @@
-      connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
-              this, SLOT(slotCreateEntry(const QString &, KService **)));
-              
--     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+     VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
- 
-      KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
-      entry->setLayoutInfo(kdeMenu->layoutList);
-diff -Nura kdelibs-3.5.10/kded/kde-applications.menu kdelibs-3.5.10.new/kded/kde-applications.menu
---- kdelibs-3.5.10/kded/kde-applications.menu	1970-01-01 01:00:00.000000000 +0100
-+++ kdelibs-3.5.10.new/kded/kde-applications.menu	2005-09-10 10:27:40.000000000 +0200
-@@ -0,0 +1,469 @@
-+ <!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN"
-+  "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-+
-+<Menu>
-+	<Name>Applications</Name>
-+	<Directory>kde-main.directory</Directory>
-+	<!-- Search the default locations -->
-+	<KDELegacyDirs/>
-+	<DefaultAppDirs/>
-+	<DefaultDirectoryDirs/>
-+	<DefaultLayout>
-+		<Merge type="menus"/>
-+		<Merge type="files"/>
-+		<Separator/>
-+		<Menuname>More</Menuname>
-+	</DefaultLayout>
-+	<Layout>
-+		<Merge type="menus"/>
-+		<Menuname>Applications</Menuname>
-+		<Merge type="files"/>
-+	</Layout>
-+
-+	<Menu>
-+		<Name>Applications</Name>
-+		<Directory>kde-unknown.directory</Directory>
-+		<OnlyUnallocated/>
-+		<Include>
-+			<Not>
-+				<!-- Don't list non-KDE core applications -->
-+				<And>
-+					<Category>Core</Category>
-+					<Not><Category>KDE</Category></Not>
-+				</And>
-+				<!-- Don't list SUSE's YaST in here -->
-+				<Category>X-SuSE-YaST</Category>
-+			</Not>
-+		</Include>
-+	</Menu>
-+       <Menu>
-+                <Name>Development</Name>
-+                <Directory>kde-development.directory</Directory>
-+                <Menu>
-+                        <Name>X-KDE-KDevelopIDE</Name>
-+                        <Directory>kde-development-kdevelop.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Development</Category>
-+                                <Category>X-KDE-KDevelopIDE</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>Translation</Name>
-+			<Directory>kde-development-translation.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>Translation</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Web Development</Name>
-+			<Directory>kde-development-webdevelopment.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Development</Category>
-+				<Category>WebDevelopment</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Include>
-+                        <And>
-+                        <Category>Development</Category>
-+                        <Not><Category>X-KDE-KDevelopIDE</Category></Not>
-+                        <Not><Category>Translation</Category></Not>
-+                        <Not><Category>WebDevelopment</Category></Not>
-+                        </And>
-+                </Include>
-+        </Menu>
-+	<Menu>
-+		<Name>Science</Name>
-+		<Directory>kde-science.directory</Directory>
-+		<Include>
-+			<And><!-- Include /any/ Science app which is not an Education app -->
-+				<Or>
-+					<Category>Astronomy</Category>
-+					<Category>Biology</Category>
-+					<Category>Chemistry</Category>
-+					<Category>Geology</Category>
-+					<Category>MedicalSoftware</Category>
-+					<Category>Physics</Category>
-+					<Category>Math</Category>
-+					<Category>Science</Category>
-+				</Or>
-+				<Not><Category>Education</Category></Not>
-+			</And>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>Edutainment</Name>
-+		<Directory>kde-edutainment.directory</Directory>
-+		<Menu>
-+			<Name>Languages</Name>
-+			<Directory>kde-edu-languages.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Mathematics</Name>
-+			<Directory>kde-edu-mathematics.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Math</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Miscellaneous</Name>
-+			<Directory>kde-edu-miscellaneous.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Not>
-+				<Category>Languages</Category>
-+				<Category>X-KDE-Edu-Language</Category>
-+				<Category>Math</Category>
-+				<Category>Science</Category>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Not>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Science</Name>
-+			<Directory>kde-edu-science.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Category>Science</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Tools</Name>
-+			<Directory>kde-edu-tools.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Education</Category>
-+				<Or>
-+				<Category>Teaching</Category>
-+				<Category>X-KDE-Edu-Teaching</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Games</Name>
-+		<Directory>kde-games.directory</Directory>
-+		<Menu>
-+			<Name>Arcade</Name>
-+			<Directory>kde-games-arcade.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>ArcadeGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Board</Name>
-+			<Directory>kde-games-board.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>BoardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Card</Name>
-+			<Directory>kde-games-card.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>CardGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Kidsgames</Name>
-+			<Directory>kde-games-kids.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Or>
-+				<Category>X-KDE-KidsGame</Category>
-+				<Category>KidsGame</Category>
-+				</Or>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>TacticStrategy</Name>
-+			<Directory>kde-games-strategy.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Game</Category>
-+				<Category>StrategyGame</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Include>
-+			<And>
-+			<Category>Game</Category>
-+			<Not>
-+			<Category>ArcadeGame</Category>
-+			<Category>BoardGame</Category>
-+			<Category>CardGame</Category>
-+			<Category>X-KDE-KidsGame</Category>
-+			<Category>KidsGame</Category>
-+			<Category>StrategyGame</Category>
-+			</Not>
-+			</And>
-+		</Include>
-+               <Menu>
-+                        <Name>Toys</Name>
-+                        <Directory>kde-toys.directory</Directory>
-+                        <Include>
-+                                 <Category>Amusement</Category>
-+                        </Include>
-+               </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Graphics</Name>
-+		<Directory>kde-graphics.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Graphics</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Graphics</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Internet</Name>
-+		<Directory>kde-internet.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Network</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+		  <Name>Terminal</Name>
-+		  <Directory>kde-internet-terminal.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Network</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Multimedia</Name>
-+		<Directory>kde-multimedia.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>AudioVideo</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>AudioVideo</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Office</Name>
-+		<Directory>kde-office.directory</Directory>
-+		<Layout>
-+			<Merge type="menus"/>
-+			<Filename>kde-koshell.desktop</Filename>
-+			<Filename>kde-Kontact.desktop</Filename>
-+			<Separator/>
-+			<Filename>kde-kword.desktop</Filename>
-+			<Filename>kde-kspread.desktop</Filename>
-+			<Filename>kde-kpresenter.desktop</Filename>
-+			<Merge type="files"/>
-+			<Separator/>
-+			<Menuname>More</Menuname>
-+		</Layout>
-+		<Include>
-+                        <And>
-+			<Category>Office</Category>
-+                        <Not><Category>X-KDE-More</Category></Not>
-+                        </And>
-+                </Include>
-+                <Menu>
-+                        <Name>More</Name>
-+                        <Directory>kde-more.directory</Directory>
-+                        <Include>
-+                                <And>
-+                                <Category>Office</Category>
-+                                <Category>X-KDE-More</Category>
-+                                </And>
-+                        </Include>
-+                </Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Settingsmenu</Name>
-+		<Directory>kde-settingsmenu.directory</Directory>
-+		<Include>
-+			<Category>Settings</Category>
-+		</Include>
-+	</Menu>
-+	<Menu>
-+		<Name>System</Name>
-+		<Directory>kde-system.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>System</Category>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>System</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>ScreenSavers</Name>
-+			<Directory>kde-system-screensavers.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>Terminal</Name>
-+			<Directory>kde-system-terminal.directory</Directory>
-+		</Menu>
-+	</Menu>
-+	<Menu>
-+		<Name>Utilities</Name>
-+		<Directory>kde-utilities.directory</Directory>
-+		<Include>
-+			<And>
-+			<Category>Utility</Category>
-+			<Not><Category>Accessibility</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Desktop</Category></Not>
-+			<Not><Category>X-KDE-Utilities-File</Category></Not>
-+			<Not><Category>X-KDE-Utilities-Peripherals</Category></Not>
-+			<Not><Category>X-KDE-Utilities-PIM</Category></Not>
-+			<Not><Category>X-KDE-More</Category></Not>
-+			</And>
-+		</Include>
-+		<Menu>
-+			<Name>Accessibility</Name>
-+			<Directory>kde-utilities-accessibility.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>Accessibility</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Desktop</Name>
-+			<Directory>kde-utilities-desktop.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Desktop</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+                <Menu>
-+                        <Name>Editors</Name>
-+                        <Directory>kde-editors.directory</Directory>
-+                        <Include>
-+                                <Category>TextEditor</Category>
-+                        </Include>
-+                </Menu>
-+		<Menu>
-+			<Name>File</Name>
-+			<Directory>kde-utilities-file.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-File</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>Peripherals</Name>
-+			<Directory>kde-utilities-peripherals.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-Peripherals</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>PIM</Name>
-+			<Directory>kde-utilities-pim.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-Utilities-PIM</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+		<Menu>
-+			<Name>XUtilities</Name>
-+			<Directory>kde-utilities-xutils.directory</Directory>
-+		</Menu>
-+		<Menu>
-+			<Name>More</Name>
-+			<Directory>kde-more.directory</Directory>
-+			<Include>
-+				<And>
-+				<Category>Utility</Category>
-+				<Category>X-KDE-More</Category>
-+				</And>
-+			</Include>
-+		</Menu>
-+	</Menu>
-+	<Include>
-+		<And>
-+		<Category>KDE</Category>
-+		<Category>Core</Category>
-+		</And>
-+	</Include>
-+	<DefaultMergeDirs/>
-+	<MergeFile>applications-kmenuedit.menu</MergeFile>
-+</Menu>
diff --git a/testing/kdelibs3/kdelibs3-cups16.patch b/testing/kdelibs3/kdelibs3-cups16.patch
deleted file mode 100644
index 6736d49d3..000000000
--- a/testing/kdelibs3/kdelibs3-cups16.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp	2012-10-06 15:08:17.460612585 -0400
-@@ -629,26 +629,26 @@
- 	cups_lang_t*	lang = cupsLangDefault();
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang));
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language);
--	request_->request.op.operation_id = CUPS_GET_PRINTERS;
-+	ippSetOperation(request_, CUPS_GET_PRINTERS);
- 	request_ = cupsDoRequest(http_, request_, "/printers/");
- 	if (request_)
- 	{
- 		QString	name;
- 		int	type(0);
--		ipp_attribute_t	*attr = request_->attrs;
-+		ipp_attribute_t	*attr = ippFirstAttribute(request_);
- 		while (attr)
- 		{
- 			// check new printer (keep only local non-implicit printers)
--			if (!attr->name)
-+			if (!ippGetName(attr))
- 			{
- 				if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty())
- 					resources_.append(new CupsResource("/printers/"+name));
- 				name = "";
- 				type = 0;
- 			}
--			else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text;
--			else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer;
--			attr = attr->next;
-+			else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL);
-+			else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0);
-+			attr = ippNextAttribute(request_);
- 		}
- 		if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty())
- 			resources_.append(new CupsResource("/printers/"+name));
-@@ -658,26 +658,26 @@
- 	request_ = ippNew();
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang));
- 	ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language);
--	request_->request.op.operation_id = CUPS_GET_CLASSES;
-+	ippSetOperation(request_, CUPS_GET_CLASSES);
- 	request_ = cupsDoRequest(http_, request_, "/classes/");
- 	if (request_)
- 	{
- 		QString	name;
- 		int	type(0);
--		ipp_attribute_t	*attr = request_->attrs;
-+		ipp_attribute_t	*attr = ippFirstAttribute(request_);
- 		while (attr)
- 		{
- 			// check new class (keep only local classes)
--			if (!attr->name)
-+			if (!ippGetName(attr))
- 			{
- 				if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty())
- 					resources_.append(new CupsResource("/classes/"+name));
- 				name = "";
- 				type = 0;
- 			}
--			else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text;
--			else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer;
--			attr = attr->next;
-+			else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL);
-+			else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0);
-+			attr = ippNextAttribute(request_);
- 		}
- 		if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty())
- 			resources_.append(new CupsResource("/classes/"+name));
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp	2012-10-06 15:12:00.919127451 -0400
-@@ -51,32 +51,34 @@
- 		kdDebug(500) << "Null request" << endl;
- 		return;
- 	}
--	kdDebug(500) << "State = 0x" << QString::number(req->state, 16) << endl;
--	kdDebug(500) << "ID = 0x" << QString::number(req->request.status.request_id, 16) << endl;
-+	kdDebug(500) << "State = 0x" << QString::number(ippGetState(req), 16) << endl;
-+	kdDebug(500) << "ID = 0x" << QString::number(ippGetRequestId(req), 16) << endl;
- 	if (answer)
- 	{
--		kdDebug(500) << "Status = 0x" << QString::number(req->request.status.status_code, 16) << endl;
--		kdDebug(500) << "Status message = " << ippErrorString(req->request.status.status_code) << endl;
-+		kdDebug(500) << "Status = 0x" << QString::number(ippGetStatusCode(req), 16) << endl;
-+		kdDebug(500) << "Status message = " << ippErrorString(ippGetStatusCode(req)) << endl;
- 	}
- 	else
--		kdDebug(500) << "Operation = 0x" << QString::number(req->request.op.operation_id, 16) << endl;
--	kdDebug(500) << "Version = " << (int)(req->request.status.version[0]) << "." << (int)(req->request.status.version[1]) << endl;
-+		kdDebug(500) << "Operation = 0x" << QString::number(ippGetOperation(req), 16) << endl;
-+	int minorVersion;
-+	int majorVersion = ippGetVersion(req, &minorVersion);
-+	kdDebug(500) << "Version = " << (int)(majorVersion) << "." << (int)(minorVersion) << endl;
- 	kdDebug(500) << endl;
- 
--	ipp_attribute_t *attr = req->attrs;
-+	ipp_attribute_t *attr = ippFirstAttribute(req);
- 	while (attr)
- 	{
--		QString s = QString::fromLatin1("%1 (0x%2) = ").arg(attr->name).arg(attr->value_tag, 0, 16);
--		for (int i=0;i<attr->num_values;i++)
-+		QString s = QString::fromLatin1("%1 (0x%2) = ").arg(ippGetName(attr)).arg(ippGetValueTag(attr), 0, 16);
-+		for (int i=0;i<ippGetCount(attr);i++)
- 		{
--			switch (attr->value_tag)
-+			switch (ippGetValueTag(attr))
- 			{
- 				case IPP_TAG_INTEGER:
- 				case IPP_TAG_ENUM:
--					s += ("0x"+QString::number(attr->values[i].integer, 16));
-+					s += ("0x"+QString::number(ippGetInteger(attr, i), 16));
- 					break;
- 				case IPP_TAG_BOOLEAN:
--					s += (attr->values[i].boolean ? "true" : "false");
-+					s += (ippGetBoolean(attr, i) ? "true" : "false");
- 					break;
- 				case IPP_TAG_STRING:
- 				case IPP_TAG_TEXT:
-@@ -88,16 +90,16 @@
- 				case IPP_TAG_TEXTLANG:
- 				case IPP_TAG_CHARSET:
- 				case IPP_TAG_LANGUAGE:
--					s += attr->values[i].string.text;
-+					s += ippGetString(attr, i, NULL);
- 					break;
- 				default:
- 					break;
- 			}
--			if (i != (attr->num_values-1))
-+			if (i != (ippGetCount(attr)-1))
- 				s += ", ";
- 		}
- 		kdDebug(500) << s << endl;
--		attr = attr->next;
-+		attr = ippNextAttribute(req);
- 	}
- }
- 
-@@ -177,7 +179,7 @@
- 		ipp_attribute_t	*attr = ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,NULL);
- 		int	i(0);
- 		for (QStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].string.text = strdup((*it).local8Bit());
-+			ippSetString(request_, &attr, i, strdup((*it).local8Bit()));
- 	}
- }
- 
-@@ -193,7 +195,7 @@
- 		ipp_attribute_t	*attr = ippAddIntegers(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL);
- 		int	i(0);
- 		for (QValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].integer = *it;
-+			ippSetInteger(request_, &attr, i, *it);
- 	}
- }
- 
-@@ -209,19 +211,19 @@
- 		ipp_attribute_t	*attr = ippAddBooleans(request_,(ipp_tag_t)group,name.latin1(),(int)(values.count()),NULL);
- 		int	i(0);
- 		for (QValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
--			attr->values[i].boolean = (char)(*it);
-+			ippSetBoolean(request_, &attr, i, (char)(*it));
- 	}
- }
- 
- void IppRequest::setOperation(int op)
- {
--	request_->request.op.operation_id = (ipp_op_t)op;
--	request_->request.op.request_id = 1;	// 0 is not RFC-compliant, should be at least 1
-+	ippSetOperation(request_, (ipp_op_t)op);
-+	ippSetRequestId(request_, 1);		// 0 is not RFC-compliant, should be at least 1
- }
- 
- int IppRequest::status()
- {
--	return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2));
-+	return (request_ ? ippGetStatusCode(request_) : (connect_ ? cupsLastError() : -2));
- }
- 
- QString IppRequest::statusMessage()
-@@ -248,7 +250,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type);
- 	if (attr)
- 	{
--		value = attr->values[0].integer;
-+		value = ippGetInteger(attr, 0);
- 		return true;
- 	}
- 	else return false;
-@@ -260,7 +262,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type);
- 	if (attr)
- 	{
--		value = QString::fromLocal8Bit(attr->values[0].string.text);
-+		value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL));
- 		return true;
- 	}
- 	else return false;
-@@ -273,8 +275,8 @@
- 	values.clear();
- 	if (attr)
- 	{
--		for (int i=0;i<attr->num_values;i++)
--			values.append(QString::fromLocal8Bit(attr->values[i].string.text));
-+		for (int i=0;i<ippGetCount(attr);i++)
-+			values.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL)));
- 		return true;
- 	}
- 	else return false;
-@@ -286,7 +288,7 @@
- 	ipp_attribute_t	*attr = ippFindAttribute(request_, name.latin1(), IPP_TAG_BOOLEAN);
- 	if (attr)
- 	{
--		value = (bool)attr->values[0].boolean;
-+		value = (bool)ippGetBoolean(attr, 0);
- 		return true;
- 	}
- 	else return false;
-@@ -338,10 +340,10 @@
- 	}
- 
- 	/* No printers found */
--	if ( request_ && request_->request.status.status_code == 0x406 )
-+	if ( request_ && ippGetStatusCode(request_) == 0x406 )
- 		return true;
- 
--	if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00))
-+	if (!request_ || ippGetState(request_) == IPP_ERROR || (ippGetStatusCode(request_) & 0x0F00))
- 		return false;
- 
- 
-@@ -356,36 +358,36 @@
- 	output << "<tr><th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Attribute") << "</font></th>" << endl;
- 	output << "<th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Values") << "</font></th></tr>" << endl;
- 	// go to the first attribute of the specified group
--	ipp_attribute_t	*attr = request_->attrs;
--	while (attr && attr->group_tag != group)
--		attr = attr->next;
-+	ipp_attribute_t	*attr = ippFirstAttribute(request_);
-+	while (attr && ippGetGroupTag(attr) != group)
-+		attr = ippNextAttribute(request_);
- 	// print each attribute
--	ipp_uchar_t	*d;
--	QCString	dateStr;
--	QDateTime	dt;
--	bool	bg(false);
--	while (attr && attr->group_tag == group)
-+	const ipp_uchar_t	*d;
-+	QCString		dateStr;
-+	QDateTime		dt;
-+	bool			bg(false);
-+	while (attr && ippGetGroupTag(attr) == group)
- 	{
--		output << "  <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n    <td><b>" << attr->name << "</b></td>\n    <td>" << endl;
-+		output << "  <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n    <td><b>" << ippGetName(attr) << "</b></td>\n    <td>" << endl;
- 		bg = !bg;
--		for (int i=0; i<attr->num_values; i++)
-+		for (int i=0; i<ippGetCount(attr); i++)
- 		{
--			switch (attr->value_tag)
-+			switch (ippGetValueTag(attr))
- 			{
- 				case IPP_TAG_INTEGER:
--					if (attr->name && strstr(attr->name, "time"))
-+					if (ippGetName(attr) && strstr(ippGetName(attr), "time"))
- 					{
--						dt.setTime_t((unsigned int)(attr->values[i].integer));
-+						dt.setTime_t((unsigned int)(ippGetInteger(attr, i)));
- 						output << dt.toString();
- 					}
- 					else
--						output << attr->values[i].integer;
-+						output << ippGetInteger(attr, i);
- 					break;
- 				case IPP_TAG_ENUM:
--					output << "0x" << hex << attr->values[i].integer << dec;
-+					output << "0x" << hex << ippGetInteger(attr, i) << dec;
- 					break;
- 				case IPP_TAG_BOOLEAN:
--					output << (attr->values[i].boolean ? i18n("True") : i18n("False"));
-+					output << (ippGetBoolean(attr, i) ? i18n("True") : i18n("False"));
- 					break;
- 				case IPP_TAG_STRING:
- 				case IPP_TAG_TEXTLANG:
-@@ -397,18 +399,25 @@
- 				case IPP_TAG_CHARSET:
- 				case IPP_TAG_LANGUAGE:
- 				case IPP_TAG_MIMETYPE:
--					output << attr->values[i].string.text;
-+					output << ippGetString(attr, i, NULL);
- 					break;
- 				case IPP_TAG_RESOLUTION:
--					output << "( " << attr->values[i].resolution.xres
--					       << ", " << attr->values[i].resolution.yres << " )";
-+					int xres;
-+					int yres;
-+					ipp_res_t units;
-+					xres = ippGetResolution(attr, i, &yres, &units);
-+					output << "( " << xres
-+					       << ", " << yres << " )";
- 					break;
- 				case IPP_TAG_RANGE:
--					output << "[ " << (attr->values[i].range.lower > 0 ? attr->values[i].range.lower : 1)
--					       << ", " << (attr->values[i].range.upper > 0 ? attr->values[i].range.upper : 65535) << " ]";
-+					int lowervalue;
-+					int uppervalue;
-+					lowervalue = ippGetRange(attr, i, &uppervalue);
-+					output << "[ " << (lowervalue > 0 ? lowervalue : 1)
-+					       << ", " << (uppervalue > 0 ? uppervalue : 65535) << " ]";
- 					break;
- 				case IPP_TAG_DATE:
--					d = attr->values[i].date;
-+					d = ippGetDate(attr, i);
- 					dateStr.sprintf("%.4d-%.2d-%.2d, %.2d:%.2d:%.2d %c%.2d%.2d",
- 							d[0]*256+d[1], d[2], d[3],
- 							d[4], d[5], d[6],
-@@ -418,11 +427,11 @@
- 				default:
- 					continue;
- 			}
--			if (i < attr->num_values-1)
-+			if (i < ippGetCount(attr)-1)
- 				output << "<br>";
- 		}
- 		output << "</td>\n  </tr>" << endl;
--		attr = attr->next;
-+		attr = ippNextAttribute(request_);
- 	}
- 	// end table
- 	output << "</table>" << endl;
-@@ -438,31 +447,34 @@
- 		ipp_attribute_t	*attr = first();
- 		while (attr)
- 		{
--			if (group != -1 && attr->group_tag != group)
-+			if (group != -1 && ippGetGroupTag(attr) != group)
- 			{
--				attr = attr->next;
-+				attr = ippNextAttribute(request_);
- 				continue;
- 			}
- 			QString	value;
--			for (int i=0; i<attr->num_values; i++)
-+			for (int i=0; i<ippGetCount(attr); i++)
- 			{
--				switch (attr->value_tag)
-+				switch (ippGetValueTag(attr))
- 				{
- 					case IPP_TAG_INTEGER:
- 					case IPP_TAG_ENUM:
--						value.append(QString::number(attr->values[i].integer)).append(",");
-+						value.append(QString::number(ippGetInteger(attr, i))).append(",");
- 						break;
- 					case IPP_TAG_BOOLEAN:
--						value.append((attr->values[i].boolean ? "true" : "false")).append(",");
-+						value.append((ippGetBoolean(attr, i) ? "true" : "false")).append(",");
- 						break;
- 					case IPP_TAG_RANGE:
--						if (attr->values[i].range.lower > 0)
--							value.append(QString::number(attr->values[i].range.lower));
--						if (attr->values[i].range.lower != attr->values[i].range.upper)
-+						int lowervalue;
-+						int uppervalue;
-+						lowervalue = ippGetRange(attr, i, &uppervalue);
-+						if (lowervalue > 0)
-+							value.append(QString::number(lowervalue));
-+						if (lowervalue != uppervalue)
- 						{
- 							value.append("-");
--							if (attr->values[i].range.upper > 0)
--								value.append(QString::number(attr->values[i].range.upper));
-+							if (uppervalue > 0)
-+								value.append(QString::number(uppervalue));
- 						}
- 						value.append(",");
- 						break;
-@@ -476,7 +488,7 @@
- 					case IPP_TAG_TEXTLANG:
- 					case IPP_TAG_CHARSET:
- 					case IPP_TAG_LANGUAGE:
--						value.append(QString::fromLocal8Bit(attr->values[i].string.text)).append(",");
-+						value.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL))).append(",");
- 						break;
- 					default:
- 						break;
-@@ -484,8 +496,8 @@
- 			}
- 			if (!value.isEmpty())
- 				value.truncate(value.length()-1);
--			opts[QString::fromLocal8Bit(attr->name)] = value;
--			attr = attr->next;
-+			opts[QString::fromLocal8Bit(ippGetName(attr))] = value;
-+			attr = ippNextAttribute(request_);
- 		}
- 	}
- 	return opts;
-@@ -542,3 +554,7 @@
- 	}
- #endif
- }
-+
-+
-+ipp_attribute_t* IppRequest::first()
-+{ return (request_ ? ippFirstAttribute(request_) : NULL); }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h kdelibs-3.5.10/kdeprint/cups/ipprequest.h
---- kdelibs-3.5.10-orig/kdeprint/cups/ipprequest.h	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/ipprequest.h	2012-10-06 15:06:05.581489574 -0400
-@@ -72,7 +72,7 @@
- 	bool keyword(const QString& name, QStringList& value);
- 	bool mime(const QString& name, QString& value);
- 	ipp_attribute_t* first();
--	ipp_attribute_t* last();
-+	ipp_t* request();
- 	QMap<QString,QString> toMap(int group = -1);
- 	void setMap(const QMap<QString,QString>& opts);
- 
-@@ -178,12 +178,6 @@
- inline bool IppRequest::doRequest(const QString& res)
- { return doFileRequest(res); }
- 
--inline ipp_attribute_t* IppRequest::first()
--{ return (request_ ? request_->attrs : NULL); }
--
--inline ipp_attribute_t* IppRequest::last()
--{ return (request_ ? request_->last : NULL); }
--
- inline void IppRequest::setHost(const QString& host)
- { host_ = host; }
- 
-@@ -193,4 +187,7 @@
- inline void IppRequest::dump(int state)
- { dump_ = state; }
- 
-+inline ipp_t* IppRequest::request()
-+{ return request_; }
-+
- #endif
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsjobmanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp	2012-10-06 15:13:31.451859386 -0400
-@@ -36,6 +36,8 @@
- #include <kdebug.h>
- #include <kurl.h>
- 
-+#include "config.h"
-+
- KMCupsJobManager::KMCupsJobManager(QObject *parent, const char *name, const QStringList & /*args*/)
- : KMJobManager(parent,name)
- {
-@@ -166,17 +168,18 @@
- void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr)
- {
- 	ipp_attribute_t	*attr = req.first();
-+	ipp_attribute_t	*nextAttr;
- 	KMJob		*job = new KMJob();
- 	QString		uri;
- 	while (attr)
- 	{
--		QString	name(attr->name);
--		if (name == "job-id") job->setId(attr->values[0].integer);
--		else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(attr->values[0].string.text));
--		else if (name == "job-name") job->setName(QString::fromLocal8Bit(attr->values[0].string.text));
-+		QString	name(ippGetName(attr));
-+		if (name == "job-id") job->setId(ippGetInteger(attr, 0));
-+		else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
-+		else if (name == "job-name") job->setName(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		else if (name == "job-state")
- 		{
--			switch (attr->values[0].integer)
-+			switch (ippGetInteger(attr, 0))
- 			{
- 				case IPP_JOB_PENDING:
- 					job->setState(KMJob::Queued);
-@@ -204,29 +207,30 @@
- 					break;
- 			}
- 		}
--		else if (name == "job-k-octets") job->setSize(attr->values[0].integer);
--		else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(attr->values[0].string.text));
--		else if (name == "job-k-octets-completed") job->setProcessedSize(attr->values[0].integer);
--		else if (name == "job-media-sheets") job->setPages(attr->values[0].integer);
--		else if (name == "job-media-sheets-completed") job->setProcessedPages(attr->values[0].integer);
-+		else if (name == "job-k-octets") job->setSize(ippGetInteger(attr, 0));
-+		else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
-+		else if (name == "job-k-octets-completed") job->setProcessedSize(ippGetInteger(attr, 0));
-+		else if (name == "job-media-sheets") job->setPages(ippGetInteger(attr, 0));
-+		else if (name == "job-media-sheets-completed") job->setProcessedPages(ippGetInteger(attr, 0));
- 		else if (name == "job-printer-uri" && !pr->isRemote())
- 		{
--			QString	str(attr->values[0].string.text);
-+			QString	str(ippGetString(attr, 0, NULL));
- 			int	p = str.findRev('/');
- 			if (p != -1)
- 				job->setPrinter(str.mid(p+1));
- 		}
- 		else if (name == "job-priority")
- 		{
--			job->setAttribute(0, QString::fromLatin1("%1").arg(attr->values[0].integer, 3));
-+			job->setAttribute(0, QString::fromLatin1("%1").arg(ippGetInteger(attr, 0), 3));
- 		}
- 		else if (name == "job-billing")
- 		{
- 			job->setAttributeCount(2);
--			job->setAttribute(1, QString::fromLocal8Bit(attr->values[0].string.text));
-+			job->setAttribute(1, QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		}
- 
--		if (name.isEmpty() || attr == req.last())
-+		nextAttr = ippNextAttribute(req.request());
-+		if (name.isEmpty() || (!nextAttr))
- 		{
- 			if (job->printer().isEmpty())
- 				job->setPrinter(pr->printerName());
-@@ -234,8 +238,7 @@
- 			addJob(job);	// don't use job after this call !!!
- 			job = new KMJob();
- 		}
--
--		attr = attr->next;
-+		attr = nextAttr;
- 	}
- 	delete job;
- }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsmanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp	2012-10-06 15:14:22.311521604 -0400
-@@ -476,19 +476,20 @@
- void KMCupsManager::processRequest(IppRequest* req)
- {
- 	ipp_attribute_t	*attr = req->first();
-+	ipp_attribute_t	*nextAttr;
- 	KMPrinter	*printer = new KMPrinter();
- 	while (attr)
- 	{
--		QString	attrname(attr->name);
-+		QString	attrname(ippGetName(attr));
- 		if (attrname == "printer-name")
- 		{
--			QString	value = QString::fromLocal8Bit(attr->values[0].string.text);
-+			QString	value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL));
- 			printer->setName(value);
- 			printer->setPrinterName(value);
- 		}
- 		else if (attrname == "printer-type")
- 		{
--			int	value = attr->values[0].integer;
-+			int	value = ippGetInteger(attr, 0);
- 			printer->setType(0);
- 			printer->addType(((value & CUPS_PRINTER_CLASS) || (value & CUPS_PRINTER_IMPLICIT) ? KMPrinter::Class : KMPrinter::Printer));
- 			if ((value & CUPS_PRINTER_REMOTE)) printer->addType(KMPrinter::Remote);
-@@ -499,7 +500,7 @@
- 		}
- 		else if (attrname == "printer-state")
- 		{
--			switch (attr->values[0].integer)
-+			switch (ippGetInteger(attr, 0))
- 			{
- 				case IPP_PRINTER_IDLE: printer->setState(KMPrinter::Idle); break;
- 				case IPP_PRINTER_PROCESSING: printer->setState(KMPrinter::Processing); break;
-@@ -508,22 +509,24 @@
- 		}
- 		else if (attrname == "printer-uri-supported")
- 		{
--			printer->setUri(KURL(attr->values[0].string.text));
-+			printer->setUri(KURL(ippGetString(attr, 0, NULL)));
- 		}
- 		else if (attrname == "printer-location")
- 		{
--			printer->setLocation(QString::fromLocal8Bit(attr->values[0].string.text));
-+			printer->setLocation(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
- 		}
- 		else if (attrname == "printer-is-accepting-jobs")
- 		{
--			printer->setAcceptJobs(attr->values[0].boolean);
-+			printer->setAcceptJobs(ippGetBoolean(attr, 0));
- 		}
--		if (attrname.isEmpty() || attr == req->last())
-+
-+		nextAttr = ippNextAttribute(req->request());
-+		if (attrname.isEmpty() || (!nextAttr))
- 		{
- 			addPrinter(printer);
- 			printer = new KMPrinter();
- 		}
--		attr = attr->next;
-+		attr = nextAttr;
- 	}
- 	delete printer;
- }
-@@ -817,6 +820,7 @@
- {
- 	QStringList	list;
- 	IppRequest	req;
-+	ipp_attribute_t	*nextAttr;
- 	req.setOperation(CUPS_GET_DEVICES);
- 	if (req.doRequest("/"))
- 	{
-@@ -824,12 +828,13 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			QString	attrname(attr->name);
--			if (attrname == "device-info") desc = attr->values[0].string.text;
--			else if (attrname == "device-make-and-model") printer = attr->values[0].string.text;
--			else if (attrname == "device-uri") uri = attr->values[0].string.text;
--			else if ( attrname == "device-class" ) cl = attr->values[ 0 ].string.text;
--			if (attrname.isEmpty() || attr == req.last())
-+			QString	attrname(ippGetName(attr));
-+			if (attrname == "device-info") desc = ippGetString(attr, 0, NULL);
-+			else if (attrname == "device-make-and-model") printer = ippGetString(attr, 0, NULL);
-+			else if (attrname == "device-uri") uri = ippGetString(attr, 0, NULL);
-+			else if ( attrname == "device-class" ) cl = ippGetString(attr, 0, NULL);
-+			nextAttr = ippNextAttribute(req.request());
-+			if (attrname.isEmpty() || (!nextAttr))
- 			{
- 				if (!uri.isEmpty())
- 				{
-@@ -838,7 +843,7 @@
- 				}
- 				uri = desc = printer = cl = QString::null;
- 			}
--			attr = attr->next;
-+			attr = nextAttr;
- 		}
- 	}
- 	return list;
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmcupsuimanager.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp	2012-10-06 15:14:55.177970017 -0400
-@@ -60,6 +60,8 @@
- #include <kaction.h>
- #include <kmessagebox.h>
- 
-+#include "config.h"
-+
- KMCupsUiManager::KMCupsUiManager(QObject *parent, const char *name, const QStringList & /*args*/)
- : KMUiManager(parent,name)
- {
-@@ -143,22 +145,22 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"device-uri") == 0)
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0)
- 			{
--				if (strncmp(attr->values[0].string.text,"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true);
--				else if (strncmp(attr->values[0].string.text,"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"serial",6) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true);
--				else if (strncmp(attr->values[0].string.text,"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true);
--				else if (strncmp(attr->values[0].string.text,"usb",3) == 0) backend->enableBackend(KMWizard::Local,true);
--				else if (strncmp(attr->values[0].string.text,"http",4) == 0 || strncmp(attr->values[0].string.text,"ipp",3) == 0)
-+				if (strncmp(ippGetString(attr, 0, NULL),"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"serial",6) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"usb",3) == 0) backend->enableBackend(KMWizard::Local,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"http",4) == 0 || strncmp(ippGetString(attr, 0, NULL),"ipp",3) == 0)
- 				{
- 					backend->enableBackend(KMWizard::IPP,true);
- 					backend->enableBackend(KMWizard::Custom+1,true);
- 				}
--				else if (strncmp(attr->values[0].string.text,"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true);
-+				else if (strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true);
- 			}
--			attr = attr->next;
-+			attr = ippNextAttribute(req.request());
- 		}
- 		backend->enableBackend(KMWizard::Class, true);
- 		backend->enableBackend(KMWizard::Custom+5, true);
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmwfax.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp	2012-10-06 15:15:28.044418449 -0400
-@@ -30,6 +30,8 @@
- #include <kiconloader.h>
- #include <kurl.h>
- 
-+#include "config.h"
-+
- KMWFax::KMWFax(QWidget *parent, const char *name)
- : KMWizardPage(parent,name)
- {
-@@ -55,11 +57,11 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0)
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0 && strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0)
- 			{
--				m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(attr->values[0].string.text));
-+				m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(ippGetString(attr, 0, NULL)));
- 			}
--			attr = attr->next;
-+			attr = ippNextAttribute(req.request());
- 		}
- 	}
- }
-diff -Naur kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp
---- kdelibs-3.5.10-orig/kdeprint/cups/kmwippselect.cpp	2012-10-06 14:49:37.521406729 -0400
-+++ kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp	2012-10-06 15:15:56.867560417 -0400
-@@ -29,6 +29,8 @@
- #include <kdebug.h>
- #include <kiconloader.h>
- 
-+#include "config.h"
-+
- KMWIppSelect::KMWIppSelect(QWidget *parent, const char *name)
- : KMWizardPage(parent,name)
- {
-@@ -83,9 +85,9 @@
- 		ipp_attribute_t	*attr = req.first();
- 		while (attr)
- 		{
--			if (attr->name && strcmp(attr->name,"printer-name") == 0)
--				m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(attr->values[0].string.text));
--			attr = attr->next;
-+			if (ippGetName(attr) && strcmp(ippGetName(attr),"printer-name") == 0)
-+				m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(ippGetString(attr, 0, NULL)));
-+			attr = ippNextAttribute(req.request());
- 		}
- 		m_list->sort();
- 	}
diff --git a/testing/kdelibs3/kdelibs3-missing-include.patch b/testing/kdelibs3/kdelibs3-missing-include.patch
deleted file mode 100644
index 5b84ef746..000000000
--- a/testing/kdelibs3/kdelibs3-missing-include.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- kdeprint/cups/cupsdconf2/cups-util.c.old	2012-01-19 01:30:26.000000000 -0500
-+++ kdeprint/cups/cupsdconf2/cups-util.c	2012-01-19 01:31:33.000000000 -0500
-@@ -2,6 +2,7 @@
- #include <cups/http.h>
- #include <cups/cups.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <unistd.h>
diff --git a/testing/kdelibs3/kdelibs3.install b/testing/kdelibs3/kdelibs3.install
deleted file mode 100644
index 7291ac0a2..000000000
--- a/testing/kdelibs3/kdelibs3.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
-}
diff --git a/testing/kdelibs3/openssl.patch b/testing/kdelibs3/openssl.patch
deleted file mode 100644
index a948b884a..000000000
--- a/testing/kdelibs3/openssl.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
---- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x	2009-09-04 23:10:53.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -96,9 +96,14 @@ static int  (*K_BIO_write) (BIO *b, cons
- static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
-                                    const EVP_CIPHER *,unsigned char *,int ,
-                                             pem_password_cb *, void *) = 0L;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
-+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
-+#else
- static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
- static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
- static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
-+#endif
- static int (*K_X509_print_fp)  (FILE *, X509*) = 0L;
- static int (*K_i2d_PKCS12)  (PKCS12*, unsigned char**) = 0L;
- static int (*K_i2d_PKCS12_fp)  (FILE *, PKCS12*) = 0L;
-@@ -430,9 +435,14 @@ KConfig *cfg;
-       K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
-       K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
-       K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+      K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
-+      K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
-+#else
-       K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
-       K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
-       K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
-+#endif
-       K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
-       K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
-       K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
-@@ -594,7 +604,7 @@ KConfig *cfg;
-       K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
-       K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
-       K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
--      K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
-+      K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
- #endif
- 
- 
-@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
-    else return -1;
- }
- 
--
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
-+   if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
-+        return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
-+   else return -1;
-+}
-+#else
- ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
-    if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
-    else return 0L;
-@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
-         return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
-    else return -1;
- }
--
-+#endif
- 
- int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
-    if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
-diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
---- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x	2006-07-22 10:16:39.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/kopenssl.h	2009-09-04 23:10:53.000000000 +0200
-@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
- #include <openssl/stack.h>
- #include <openssl/bn.h>
- #undef crypt
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+#define STACK _STACK
-+#endif
- #endif
- 
- #include <kstaticdeleter.h>
-@@ -446,12 +449,12 @@ public:
-     */
-    int PEM_write_bio_X509(BIO *bp, X509 *x);
- 
--
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
-    /*
-     *   X509_asn1_meth - used for netscape output
-     */
-    ASN1_METHOD *X509_asn1_meth();
--
-+#endif
- 
-    /*
-     *   ASN1_i2d_fp - used for netscape output
-@@ -531,6 +534,9 @@ public:
-     */
-    void sk_free(STACK *s);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
-+#endif
- 
-    /* 
-     *  Number of elements in the stack
-@@ -543,6 +549,9 @@ public:
-     */
-    char *sk_value(STACK *s, int n);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
-+#endif
- 
-    /* 
-     *  Create a new stack
-@@ -555,6 +564,9 @@ public:
-     */
-    int sk_push(STACK *s, char *d);
- 
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+   int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
-+#endif
- 
-    /* 
-     *  Duplicate the stack
-diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
---- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x	2005-10-10 17:05:44.000000000 +0200
-+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
- 
- 
- STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
--    STACK_OF(X509) *x509 = sk_new(NULL);
-+    STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
-     KSSLCertificate *cert = certs.first();
-     while(cert) {
- 	sk_X509_push(x509, cert->getCert());
-diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
---- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x	2006-01-19 18:06:12.000000000 +0100
-+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc	2009-09-04 23:10:53.000000000 +0200
-@@ -1003,17 +1003,31 @@ return qba;
- QByteArray KSSLCertificate::toNetscape() {
- QByteArray qba;
- #ifdef KSSL_HAVE_SSL
--ASN1_HEADER ah;
--ASN1_OCTET_STRING os;
--KTempFile ktf;
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	NETSCAPE_X509 nx;
-+	ASN1_OCTET_STRING hdr;
-+#else
-+   ASN1_HEADER ah;
-+   ASN1_OCTET_STRING os;
-+#endif
-+	KTempFile ktf;
- 
--	os.data = (unsigned char *)NETSCAPE_CERT_HDR;
--	os.length = strlen(NETSCAPE_CERT_HDR);
--	ah.header = &os;
--	ah.data = (char *)getCert();
--	ah.meth = d->kossl->X509_asn1_meth();
-+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-+	hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+	hdr.length = strlen(NETSCAPE_CERT_HDR);
-+	nx.header = &hdr;
-+	nx.cert = getCert();
-+
-+	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
-+#else
-+   os.data = (unsigned char *)NETSCAPE_CERT_HDR;
-+   os.length = strlen(NETSCAPE_CERT_HDR);
-+   ah.header = &os;
-+   ah.data = (char *)getCert();
-+   ah.meth = d->kossl->X509_asn1_meth();
- 
--	d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+   d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
-+#endif
- 
- 	ktf.close();
- 
diff --git a/testing/kdemultimedia-audiocd-kio/PKGBUILD b/testing/kdemultimedia-audiocd-kio/PKGBUILD
deleted file mode 100644
index 16ad5d97b..000000000
--- a/testing/kdemultimedia-audiocd-kio/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167637 2012-10-02 19:48:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-audiocd-kio
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Kioslave for accessing audio CDs"
-url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libkcddb' 'libkcompactdisc' 'lame')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdemultimedia')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('822b2a151cb03cdf2708d3731a07b0fa23ee8e34')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../audiocd-kio-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-dragonplayer/PKGBUILD b/testing/kdemultimedia-dragonplayer/PKGBUILD
deleted file mode 100644
index 20f6a6609..000000000
--- a/testing/kdemultimedia-dragonplayer/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167638 2012-10-02 19:48:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-dragonplayer
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A multimedia player where the focus is on simplicity, instead of
-features"
-url='http://kde.org/applications/multimedia/dragonplayer/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('ebe0021892c76f2b7ffd637ebf035801851ed3b5')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../dragon-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-dragonplayer/kdemultimedia-dragonplayer.install b/testing/kdemultimedia-dragonplayer/kdemultimedia-dragonplayer.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/kdemultimedia-dragonplayer/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-ffmpegthumbs/PKGBUILD b/testing/kdemultimedia-ffmpegthumbs/PKGBUILD
deleted file mode 100644
index 3e2b2b6a1..000000000
--- a/testing/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167639 2012-10-02 19:49:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='FFmpeg-based thumbnail creator for video files'
-url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdelibs' 'ffmpeg')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('a0083c2cda9c194663676b70beb6d23dba0d4f1d')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../ffmpegthumbs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-juk/PKGBUILD b/testing/kdemultimedia-juk/PKGBUILD
deleted file mode 100644
index 11250e22c..000000000
--- a/testing/kdemultimedia-juk/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167640 2012-10-02 19:49:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-juk
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='A jukebox, tagger and music collection manager'
-url='http://kde.org/applications/multimedia/juk/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime' 'taglib')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('64e0c7ea030434cba9bdc9db05901aa81e1aaa97')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../juk-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_TunePimp=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-juk/kdemultimedia-juk.install b/testing/kdemultimedia-juk/kdemultimedia-juk.install
deleted file mode 100644
index c0797237a..000000000
--- a/testing/kdemultimedia-juk/kdemultimedia-juk.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-kmix/PKGBUILD b/testing/kdemultimedia-kmix/PKGBUILD
deleted file mode 100644
index d67c720ae..000000000
--- a/testing/kdemultimedia-kmix/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167641 2012-10-02 19:50:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-kmix
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE volume control program"
-url='http://kde.org/applications/multimedia/kmix/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('581955c6a097c69f3cf511a6c55c58d2d2d9ceb7')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kmix-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-kmix/kdemultimedia-kmix.install b/testing/kdemultimedia-kmix/kdemultimedia-kmix.install
deleted file mode 100644
index c0797237a..000000000
--- a/testing/kdemultimedia-kmix/kdemultimedia-kmix.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-kscd/PKGBUILD b/testing/kdemultimedia-kscd/PKGBUILD
deleted file mode 100644
index 5c666d4ce..000000000
--- a/testing/kdemultimedia-kscd/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167642 2012-10-02 19:50:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-kscd
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE CD player"
-url='http://kde.org/applications/multimedia/kscd/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('9130d1f35713f5ebb2f81a4f1b91f3fe16f18861')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../kscd-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia-kscd/kdemultimedia-kscd.install b/testing/kdemultimedia-kscd/kdemultimedia-kscd.install
deleted file mode 100644
index c0797237a..000000000
--- a/testing/kdemultimedia-kscd/kdemultimedia-kscd.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/PKGBUILD b/testing/kdemultimedia-mplayerthumbs/PKGBUILD
deleted file mode 100644
index b8860085f..000000000
--- a/testing/kdemultimedia-mplayerthumbs/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167643 2012-10-02 19:51:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="MPlayer based thumbnail generator for video files"
-url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
-arch=('i686' 'x86_64')
-groups=('kde' 'kdemultimedia')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'mplayer')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('a70d8f522d31529444ba957cdadd97c22dab7090')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../mplayerthumbs-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdemultimedia/PKGBUILD b/testing/kdemultimedia/PKGBUILD
deleted file mode 100644
index 72962105c..000000000
--- a/testing/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 163059 2012-07-06 15:21:31Z ibiru $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
-         'kdemultimedia-ffmpegthumbs'
-         'kdemultimedia-juk'
-         'kdemultimedia-kioslave'
-         'kdemultimedia-kmix'
-         'kdemultimedia-kscd'
-         'kdemultimedia-mplayerthumbs')
-pkgver=4.8.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
-             'libmusicbrainz3' 'taglib' 'libcanberra')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'mplayerthumbs.config'
-        'ffmpeg0.11.patch')
-sha1sums=('dac721e82308a6347d578361e25da7c466a26ba7'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '48331f7e2dab760c20708b81fe6c4d47c83a63e7')
-
-build() {
-    cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs
-    patch -p1 -i ${srcdir}/ffmpeg0.11.patch
-
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-        -DWITH_TunePimp=OFF
-	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/dragonplayer/doc
-    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' 'taglib')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-    cd $srcdir/build/juk/doc
-    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 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/kmix/doc
-    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
-}
-
-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/ffmpeg0.11.patch b/testing/kdemultimedia/ffmpeg0.11.patch
deleted file mode 100644
index 527ac3992..000000000
--- a/testing/kdemultimedia/ffmpeg0.11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Christoph Feck <christoph@maxiom.de>
-Date: Tue, 29 May 2012 13:53:18 +0000
-Subject: Two deprecated calls have been removed from ffmpeg 0.11.
-X-Git-Tag: v4.8.80
-X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&amp;a=commitdiff&amp;h=4f03b20614c122e3e14473d42a000c0bffdce39c
----
-Two deprecated calls have been removed from ffmpeg 0.11.
-
-BUG:300732
----
-
-
---- a/ffmpegthumbnailer/moviedecoder.cpp
-+++ b/ffmpegthumbnailer/moviedecoder.cpp
-@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
- void MovieDecoder::initialize(const QString& filename)
- {
-     av_register_all();
--    avcodec_init();
-     avcodec_register_all();
- 
-     QFileInfo fileInfo(filename);
- 
--    if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
-+    if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
-         kDebug() <<  "Could not open input file: " << fileInfo.absoluteFilePath();
-         return;
-     }
-
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 74b761e2d..000000000
--- a/testing/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 167644 2012-10-02 19:52:17Z 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.9.2
-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'
-    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
-    'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('6779039e5354fae02cf7faa3442385b95befb430')
-
-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 \
-        -DWITH_qq=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' 'telepathy-qt')
-    optdepends=('libvncserver: VNC support'
-                'rdesktop: RDP support'
-                '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' 'telepathy-qt')
-	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 0a1568b9c..000000000
--- a/testing/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167566 2012-10-02 18:58:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='Extends the functionality of kdepim'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepim-runtime'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi')
-makedepends=('cmake' 'automoc4' 'boost')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('4eeef5c706ea786d35ebaddf6c46084cf666680a')
-
-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/kdepim-runtime/kdepim-runtime.install b/testing/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index c77e68041..000000000
--- a/testing/kdepim-runtime/kdepim-runtime.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/kdepim/PKGBUILD b/testing/kdepim/PKGBUILD
deleted file mode 100644
index ec4dd231f..000000000
--- a/testing/kdepim/PKGBUILD
+++ /dev/null
@@ -1,269 +0,0 @@
-# $Id: PKGBUILD 167645 2012-10-02 19:53:55Z 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-ktnef'
-         'kdepim-libkdepim')
-pkgver=4.9.2
-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.xz"
-        'fix-build.patch')
-sha1sums=('49e33e54e61bc499e54cdcd3470719cb4c22d2be'
-          '974056ad2c3a00b33a8ac9403b369ab636000832')
-
-build() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-build.patch
-    cd ..
-
-	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
-	cd "${srcdir}"/build/doc/kabcclient
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/konsolekalendar
-	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
-	cd "${srcdir}"/build/doc/kwatchgnupg
-	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 archivemailagent backupmail \
-	importwizard ksendemail libksieve messagelist mailfilteragent \
-	mailimporter 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-knode.install'
-	cd "${srcdir}"/build/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/knode
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/kioslave/news
-	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 doc/kontact-admin; 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'
-	for i in korganizer doc/korganizer kontact/plugins/korganizer \
-		calendarviews; do
-		cd "${srcdir}"/build/${i} 
-		make DESTDIR="${pkgdir}" install
-	done
-}
-
-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-ktnef() {
-	pkgdesc='A viewer/extractor for TNEF files'
-	depends=('kdebase-runtime' 'kdepimlibs')
-	url="https://projects.kde.org/projects/kde/kdepim/ktnef"
-    install=kdepim-ktnef.install
-	cd "${srcdir}"/build/ktnef
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/ktnef
-	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 incidenceeditor-ng \
-	kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
-	mailcommon messagecomposer messagecore messageviewer icons \
-	strigi-analyzer templateparser plugins/messageviewer \
-	plugins/ktexteditor; do
-		cd "${srcdir}"/build/${i}
-		make DESTDIR="${pkgdir}" install
-	done
-}
diff --git a/testing/kdepim/fix-build.patch b/testing/kdepim/fix-build.patch
deleted file mode 100644
index 7060e814f..000000000
--- a/testing/kdepim/fix-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdepim-4.9.0/kleopatra/CMakeLists.txt~	2012-07-30 08:06:15.031181647 +0000
-+++ kdepim-4.9.0/kleopatra/CMakeLists.txt	2012-07-30 08:07:13.594082584 +0000
-@@ -365,7 +365,7 @@
- endif(KDEPIM_MOBILE_UI)
- 
- add_definitions ( -DKDE_DEFAULT_DEBUG_AREA=5151 )
--
-+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
- 
- kde4_add_app_icon(_kleopatra_mainwindow_SRCS "hi*-app-kleopatra.png")
- kde4_add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_mainwindow_SRCS} ${_kleopatra_uiserver_SRCS} ${_kleopatra_libkdepim_SRCS} )
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-knode.install b/testing/kdepim/kdepim-knode.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-knode.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-ktnef.install b/testing/kdepim/kdepim-ktnef.install
deleted file mode 100644
index 5787df72f..000000000
--- a/testing/kdepim/kdepim-ktnef.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 7f9ec4275..000000000
--- a/testing/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167561 2012-10-02 18:50:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kdepimlibs'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('247820f8f8de5bcd66e19c45afc2033e50f0fd01')
-
-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/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 537ad7c72..000000000
--- a/testing/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,628 +0,0 @@
-# $Id: PKGBUILD 167646 2012-10-02 19:55:13Z 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-runners-youtube'
-         '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.9.2
-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' 'qoauth' 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('9f6493d52beb2ed723038e60f5f9ab53beec4e44')
-
-build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdeplasma-addons-applets-bball() {
-	pkgdesc='A bouncy ball for plasma'
-	depends=('kdebase-workspace')
-	install='kdeplasma-addons.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=('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.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.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=('kdeplasma-addons-libs' 'qwt')
-	install='kdeplasma-addons.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=('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-konqueror' 'kdeplasma-addons-libs')
-	cd $srcdir/build/applets/konqprofiles
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
-	pkgdesc='List and launch Konsole profiles'
-	depends=('kdebase-konsole' 'kdeplasma-addons-libs')
-	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.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.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=('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.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.install'
-	cd $srcdir/build/applets/qalculate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
-	pkgdesc='Remember The Milk Todo list applet'
-	depends=('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=('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=('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=('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' 'kdesdk-kate')
-	cd $srcdir/build/runners/katesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
-	pkgdesc='Matches Konqueror Sessions'
-	depends=('kdebase-workspace' 'kdebase-konqueror')
-	cd $srcdir/build/runners/konquerorsessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
-	pkgdesc='Matches Konsole Sessions'
-	depends=('kdebase-workspace' 'kdebase-konsole')
-	cd $srcdir/build/runners/konsolesessions
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
-	pkgdesc='Kopete Contact runner'
-	depends=('kdebase-workspace' 'kdenetwork-kopete')
-	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-runners-youtube() {
-	pkgdesc='Matches YouTube queries'
-	depends=('kdebase-workspace' 'qjson')
-    install='kdeplasma-addons.install'
-	cd $srcdir/build/runners/youtube
-	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=('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=('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.install b/testing/kdeplasma-addons/kdeplasma-addons.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/testing/kdeplasma-addons/kdeplasma-addons.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/kdeplasma-applets-networkmanagement/PKGBUILD b/testing/kdeplasma-applets-networkmanagement/PKGBUILD
deleted file mode 100644
index c21b8db89..000000000
--- a/testing/kdeplasma-applets-networkmanagement/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Jakub Schmidtke <sjakub-at-gmail.com>
-
-pkgname=kdeplasma-applets-networkmanagement
-epoch=1
-pkgver=0.9.0.4
-pkgrel=1
-pkgdesc="KDE control panel and widget network connections"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/extragear/base/networkmanagement'
-license=('GPL')
-depends=('kdebase-workspace' 'networkmanager')
-makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info'
-             'openconnect')
-optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers'
-            'openconnect: Cisco AnyConnect compatible VPN client')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/networkmanagement/${pkgver}/src/networkmanagement-${pkgver}.tar.bz2")
-sha256sums=('520d0592171ce1aa1c54916f408e7f2d1e016da0acefc725f7170b67a292e256')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../networkmanagement-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.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/kdesdk-kate/PKGBUILD b/testing/kdesdk-kate/PKGBUILD
deleted file mode 100644
index 5b573829c..000000000
--- a/testing/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 167570 2012-10-02 19:01:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-katepart'
-         'kdebase-kwrite'
-         'kdesdk-kate')
-pkgver=4.9.2
-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.xz"
-        'pkgbuild-syntax-highlight.patch')
-sha1sums=('d3a1f58a5207b305e62a2a3dc7a34802289be42e'
-          '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
-  make
-}
-
-package_kdebase-katepart() {
-  pkgdesc="A fast and feature-rich text editor component"
-  depends=('kdelibs')
-  url="http://kate-editor.org/about-katepart/"
-  install='kdebase-katepart.install'
-
-  cd "${srcdir}"/build/part
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdebase-kwrite() {
-  pkgdesc="Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  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/doc/kwrite
-  make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
-  pkgdesc="Advanced Text Editor"
-  depends=('kdebase-runtime' 'kdebase-katepart')
-  groups=('kde' 'kdesdk')
-  url="http://www.kde.org/applications/utilities/kate/"
-  install='kdesdk-kate.install'
-  optdepends=('kdebase-konsole: open a terminal in Kate')
-
-  cd "${srcdir}"/build/kate
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}"/build/doc/kate
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdesdk-kate/kdebase-katepart.install b/testing/kdesdk-kate/kdebase-katepart.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdesdk-kate/kdebase-katepart.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/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 2bf20fe0e..000000000
--- a/testing/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,248 +0,0 @@
-# $Id: PKGBUILD 167647 2012-10-02 19:56:49Z 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-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.9.2
-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.xz"
-        'fix-python2-path.patch')
-sha1sums=('8acefc3701f12834b1e5606b635aef4b500e0aee'
-          '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')
-    optdepends=('bzr: bazaar support'
-                'git: git support'
-                'mercurial: hg support'
-                'subversion: svn support')
-	install='kdesdk.install'
-    for i in bazaar git hg svn; do
-        cd $srcdir/build/dolphin-plugins/$i
-    	make DESTDIR=$pkgdir install
-    done
-}
-
-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-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-kompare.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-python2')
-	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.py
-  sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{{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 ae3da75ec..000000000
--- a/testing/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 167648 2012-10-02 19:57:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-pkgver=4.9.2
-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.xz")
-sha1sums=('fe26e217edb2bc88ee3510bbe2fd32c3acd941b6')
-
-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 ab6e396df..000000000
--- a/testing/kdeutils-filelight/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 167650 2012-10-02 19:58:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-filelight
-pkgver=4.9.2
-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.xz")
-sha1sums=('f1d4c7604fb94a4bbe36e136955dd5f6f0f1fdf1')
-
-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 0e3053cc5..000000000
--- a/testing/kdeutils-kcalc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167651 2012-10-02 19:58:58Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcalc
-pkgver=4.9.2
-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.xz")
-sha1sums=('f28ed638e433c26e43c7e57e0193cdec67de9f22')
-
-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 795c80eb0..000000000
--- a/testing/kdeutils-kcharselect/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167652 2012-10-02 19:59:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kcharselect
-pkgver=4.9.2
-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.xz")
-sha1sums=('77f9077f2ec75de8f764140306c63c1a79888d33')
-
-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 6fc8c65d2..000000000
--- a/testing/kdeutils-kdf/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167653 2012-10-02 19:59:57Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kdf
-pkgver=4.9.2
-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.xz")
-sha1sums=('022151b4f2170411037be31d2bbf9ce26f003313')
-
-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 3318061af..000000000
--- a/testing/kdeutils-kfloppy/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167654 2012-10-02 20:00:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kfloppy
-pkgver=4.9.2
-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.xz")
-sha1sums=('dbf5ceed22cd0ef0d898dacc466ea6db3da7c980')
-
-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 ea91e24f5..000000000
--- a/testing/kdeutils-kgpg/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167655 2012-10-02 20:00:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kgpg
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='A GnuPG frontend'
-url='http://kde.org/applications/utilities/kgpg/'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime' 'kdepimlibs' 'kde-agent')
-makedepends=('cmake' 'automoc4')
-groups=('kde' 'kdeutils')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('2ec3ceb0d623ce1c2345025292a8a3c2e6b9923a')
-
-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 41814687c..000000000
--- a/testing/kdeutils-kremotecontrol/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kremotecontrol
-pkgver=4.9.2
-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.xz")
-sha1sums=('142a28d72f07690a5b342c554493fcfb2e7ae6b5')
-
-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-ktimer/PKGBUILD b/testing/kdeutils-ktimer/PKGBUILD
deleted file mode 100644
index 4af12e689..000000000
--- a/testing/kdeutils-ktimer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167657 2012-10-02 20:01:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-ktimer
-pkgver=4.9.2
-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.xz")
-sha1sums=('e621ca273d1cb2490f9212f3c2ecf8d57a6efdd3')
-
-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 afcab8751..000000000
--- a/testing/kdeutils-kwallet/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 167658 2012-10-02 20:02:19Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-kwallet
-pkgver=4.9.2
-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.xz")
-sha1sums=('e77e2cbf91f14e95ccd45fb1931df274f6c68cc7')
-
-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-superkaramba/PKGBUILD b/testing/kdeutils-superkaramba/PKGBUILD
deleted file mode 100644
index 989fa6fc1..000000000
--- a/testing/kdeutils-superkaramba/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167660 2012-10-02 20:03:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-superkaramba
-pkgver=4.9.2
-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.xz")
-sha1sums=('3e2e42316fe7ac357c58fbfa1e1387c347c31b30')
-
-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 24004390c..000000000
--- a/testing/kdeutils-sweeper/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167661 2012-10-02 20:03:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeutils-sweeper
-pkgver=4.9.2
-pkgrel=1
-pkgdesc='System Cleaner'
-url='http://kde.org/applications/utilities/sweeper'
-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/sweeper-${pkgver}.tar.xz")
-sha1sums=('31732ac3dd0be4864f6db9a7810b67a1634fc57d')
-
-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/kdevelop-php/PKGBUILD b/testing/kdevelop-php/PKGBUILD
deleted file mode 100644
index 11d184b2a..000000000
--- a/testing/kdevelop-php/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 166545 2012-09-10 13:09:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdevelop-php
-pkgver=1.3.90
-_pkgver=4.3.90
-pkgrel=1
-pkgdesc="PHP language and documentation plugin for KDevelop/Quanta"
-arch=('i686' 'x86_64')
-url="http://www.kdevelop.org/"
-license=('GPL')
-depends=('kdevelop-pg-qt')
-makedepends=('cmake' 'automoc4')
-replaces=('kdevelop-php-docs')
-conflicts=('kdevelop-php-docs')
-source=(http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.bz2)
-sha1sums=('11f9b3d2d27ad93aa666edae60d08f64ea82bb8d'
-          'f11194f5672d78406b6c54d53b10c02384e5bf99')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-
-  # kdevelop-php-docs
-  cd "${srcdir}"
-  mkdir build-docs
-  cd build-docs
-  cmake ../${pkgname}-docs-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}/build"
-  make DESTDIR="${pkgdir}" install
-
-  # kdevelop-php-docs
-  cd "${srcdir}"/build-docs
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdevelop/PKGBUILD b/testing/kdevelop/PKGBUILD
deleted file mode 100644
index 22df44824..000000000
--- a/testing/kdevelop/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 166547 2012-09-10 13:10:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=kdevelop
-pkgver=4.3.90
-pkgrel=1
-pkgdesc="A C/C++ development environment for KDE"
-arch=('i686' 'x86_64')
-url="http://www.kdevelop.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'kdevplatform' 'kdesdk-okteta' 'kdebase-katepart')
-makedepends=('cmake' 'automoc4')
-install="${pkgname}.install"
-source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('18ed2dccdeef8abe41c135cd3038038790b4e50a')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build 
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdevelop/kdevelop.install b/testing/kdevelop/kdevelop.install
deleted file mode 100644
index 5c1338e67..000000000
--- a/testing/kdevelop/kdevelop.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/kdevplatform/PKGBUILD b/testing/kdevplatform/PKGBUILD
deleted file mode 100644
index 5f8c52bff..000000000
--- a/testing/kdevplatform/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 166549 2012-09-10 13:31:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=kdevplatform
-pkgver=1.3.90
-_pkgver=4.3.90
-pkgrel=1
-pkgdesc="A C/C++ development platform for KDE"
-arch=('i686' 'x86_64')
-url="http://www.kdevelop.org/"
-license=('GPL')
-depends=('kdelibs' 'subversion' 'qjson')
-optdepends=("kdesdk-kompare: difference checking")
-makedepends=('cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/unstable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('88300217681caa5c69f09b6428f2a6298cbd4733')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build 
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdevplatform/kdevplatform.install b/testing/kdevplatform/kdevplatform.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdevplatform/kdevplatform.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 7106b2276..000000000
--- a/testing/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 167662 2012-10-02 20:04:11Z 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.9.2
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('b811adaa5e996d9f588215be411a6a8d07f493ef')
-
-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=('kdebase-runtime' 'kdepimlibs' '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/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD
deleted file mode 100644
index c6ab79a54..000000000
--- a/testing/keyutils/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 162210 2012-06-23 16:28:17Z tpowa $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=keyutils
-pkgver=1.5.5
-pkgrel=3
-pkgdesc="Linux Key Management Utilities"
-arch=(i686 x86_64)
-url="http://www.kernel.org"
-license=('GPL2' 'LGPL2.1')
-depends=('glibc' 'sh')
-backup=(etc/request-key.conf)
-source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('d759680b2f23c99af95938f5026f25fb')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" LIBDIR="/usr/lib" USRLIBDIR="/usr/lib"  install
-  # add nfsidmap to config file #30396
-  echo "# NFS idmap resolver" >> $pkgdir/etc/request-key.conf
-  echo "create id_resolver * * /usr/sbin/nfsidmap %k %d" \
-       >> $pkgdir/etc/request-key.conf
-}
diff --git a/testing/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch b/testing/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
deleted file mode 100644
index 8c4ecf83c..000000000
--- a/testing/kmod/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From 88c247f7f18ac25181ddcaff97fbbecbd3a29f57 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.de.marchi@gmail.com>
-Date: Wed, 3 Oct 2012 16:28:24 -0300
-Subject: [PATCH] depmod: fix parsing of modules.order with compressed modules
-
-We now index the modules by uncompressed-relative-path instead of
-relative-path. This is because the file modules.order, coming from
-kernel, always comes with uncompressed paths. This fixes the issue of
-not sorting the aliases correctly due to paths not matching when using
-compressed modules.
----
- tools/depmod.c | 46 +++++++++++++++++++++++++++++-----------------
- 1 file changed, 29 insertions(+), 17 deletions(-)
-
-diff --git a/tools/depmod.c b/tools/depmod.c
-index 0bf2dea..ff19d6e 100644
---- a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -39,6 +39,8 @@
- #define DEFAULT_VERBOSE LOG_WARNING
- static int verbose = DEFAULT_VERBOSE;
- 
-+#define KMOD_EXT_UNC 0
-+
- static const struct kmod_ext {
- 	const char *ext;
- 	size_t len;
-@@ -1001,6 +1003,7 @@ struct mod {
- 	uint16_t idx; /* index in depmod->modules.array */
- 	uint16_t users; /* how many modules depend on this one */
- 	uint8_t dep_loop : 1;
-+	char *uncrelpath; /* same as relpath but ending in .ko */
- 	char modname[];
- };
- 
-@@ -1014,7 +1017,7 @@ struct depmod {
- 	const struct cfg *cfg;
- 	struct kmod_ctx *ctx;
- 	struct array modules;
--	struct hash *modules_by_relpath;
-+	struct hash *modules_by_uncrelpath;
- 	struct hash *modules_by_name;
- 	struct hash *symbols;
- 	unsigned int dep_loops;
-@@ -1025,6 +1028,7 @@ static void mod_free(struct mod *mod)
- 	DBG("free %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path);
- 	array_free_array(&mod->deps);
- 	kmod_module_unref(mod->kmod);
-+	free(mod->uncrelpath);
- 	free(mod);
- }
- 
-@@ -1066,10 +1070,10 @@ static int depmod_init(struct depmod *depmod, struct cfg *cfg,
- 
- 	array_init(&depmod->modules, 128);
- 
--	depmod->modules_by_relpath = hash_new(512, NULL);
--	if (depmod->modules_by_relpath == NULL) {
-+	depmod->modules_by_uncrelpath = hash_new(512, NULL);
-+	if (depmod->modules_by_uncrelpath == NULL) {
- 		err = -errno;
--		goto modules_by_relpath_failed;
-+		goto modules_by_uncrelpath_failed;
- 	}
- 
- 	depmod->modules_by_name = hash_new(512, NULL);
-@@ -1089,8 +1093,8 @@ static int depmod_init(struct depmod *depmod, struct cfg *cfg,
- symbols_failed:
- 	hash_free(depmod->modules_by_name);
- modules_by_name_failed:
--	hash_free(depmod->modules_by_relpath);
--modules_by_relpath_failed:
-+	hash_free(depmod->modules_by_uncrelpath);
-+modules_by_uncrelpath_failed:
- 	return err;
- }
- 
-@@ -1100,7 +1104,7 @@ static void depmod_shutdown(struct depmod *depmod)
- 
- 	hash_free(depmod->symbols);
- 
--	hash_free(depmod->modules_by_relpath);
-+	hash_free(depmod->modules_by_uncrelpath);
- 
- 	hash_free(depmod->modules_by_name);
- 
-@@ -1114,7 +1118,7 @@ static void depmod_shutdown(struct depmod *depmod)
- static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
- {
- 	const struct cfg *cfg = depmod->cfg;
--	const char *modname;
-+	const char *modname, *lastslash;
- 	size_t modnamelen;
- 	struct mod *mod;
- 	int err;
-@@ -1134,7 +1138,8 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
- 	array_init(&mod->deps, 4);
- 
- 	mod->path = kmod_module_get_path(kmod);
--	mod->baselen = strrchr(mod->path, '/') - mod->path;
-+	lastslash = strrchr(mod->path, '/');
-+	mod->baselen = lastslash - mod->path;
- 	if (strncmp(mod->path, cfg->dirname, cfg->dirnamelen) == 0 &&
- 			mod->path[cfg->dirnamelen] == '/')
- 		mod->relpath = mod->path + cfg->dirnamelen + 1;
-@@ -1144,25 +1149,32 @@ static int depmod_module_add(struct depmod *depmod, struct kmod_module *kmod)
- 	err = hash_add_unique(depmod->modules_by_name, mod->modname, mod);
- 	if (err < 0) {
- 		ERR("hash_add_unique %s: %s\n", mod->modname, strerror(-err));
--		free(mod);
--		return err;
-+		goto fail;
- 	}
- 
- 	if (mod->relpath != NULL) {
--		err = hash_add_unique(depmod->modules_by_relpath,
--				      mod->relpath, mod);
-+		size_t uncrelpathlen = lastslash - mod->relpath + modnamelen
-+				       + kmod_exts[KMOD_EXT_UNC].len;
-+		mod->uncrelpath = memdup(mod->relpath, uncrelpathlen + 1);
-+		mod->uncrelpath[uncrelpathlen] = '\0';
-+		err = hash_add_unique(depmod->modules_by_uncrelpath,
-+				      mod->uncrelpath, mod);
- 		if (err < 0) {
- 			ERR("hash_add_unique %s: %s\n",
- 			    mod->relpath, strerror(-err));
- 			hash_del(depmod->modules_by_name, mod->modname);
--			free(mod);
--			return err;
-+			goto fail;
- 		}
- 	}
- 
- 	DBG("add %p kmod=%p, path=%s\n", mod, kmod, mod->path);
- 
- 	return 0;
-+
-+fail:
-+	free(mod->uncrelpath);
-+	free(mod);
-+	return err;
- }
- 
- static int depmod_module_del(struct depmod *depmod, struct mod *mod)
-@@ -1170,7 +1182,7 @@ static int depmod_module_del(struct depmod *depmod, struct mod *mod)
- 	DBG("del %p kmod=%p, path=%s\n", mod, mod->kmod, mod->path);
- 
- 	if (mod->relpath != NULL)
--		hash_del(depmod->modules_by_relpath, mod->relpath);
-+		hash_del(depmod->modules_by_uncrelpath, mod->relpath);
- 
- 	hash_del(depmod->modules_by_name, mod->modname);
- 
-@@ -1472,7 +1484,7 @@ static void depmod_modules_sort(struct depmod *depmod)
- 			continue;
- 		line[len - 1] = '\0';
- 
--		mod = hash_find(depmod->modules_by_relpath, line);
-+		mod = hash_find(depmod->modules_by_uncrelpath, line);
- 		if (mod == NULL)
- 			continue;
- 		mod->sort_idx = idx - total;
--- 
-1.7.12.4
-
diff --git a/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch b/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch
deleted file mode 100644
index 4ef3d2775..000000000
--- a/testing/kmod/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 66f3228d17d66d7e2dd484427259290fbc82b2f0 Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Mon, 8 Oct 2012 19:04:16 -0300
-Subject: [PATCH] libkmod: Add support for '.' in module parameter on kcmdline
-
-Otherwise we fail to parse arguments in kernel command line like
-testmodule.testparam=1.5G
-
-Suggested-by: Selim T. Erdogan <selim@alumni.cs.utexas.edu>
----
- libkmod/libkmod-config.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/libkmod/libkmod-config.c b/libkmod/libkmod-config.c
-index 70044f0..398468e 100644
---- a/libkmod/libkmod-config.c
-+++ b/libkmod/libkmod-config.c
-@@ -567,8 +567,10 @@ static int kmod_config_parse_kcmdline(struct kmod_config *config)
- 			modname = p + 1;
- 			break;
- 		case '.':
--			*p = '\0';
--			param = p + 1;
-+			if (param == NULL) {
-+				*p = '\0';
-+				param = p + 1;
-+			}
- 			break;
- 		case '=':
- 			if (param != NULL)
--- 
-1.7.12.4
-
diff --git a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch b/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
deleted file mode 100644
index 8916689f7..000000000
--- a/testing/kmod/0002-config-hardcode-the-path-to-modules-to-be-lib-module.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 53e7e0e42428770578ca0d54d0a9540f498f917f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sat, 31 Mar 2012 12:17:39 +0200
-Subject: [PATCH 2/2] config: hardcode the path to modules to be /lib/modules
-
-This means that we can move the configuration paths from /lib
-to /usr/lib without having to touch the kernel and related
-packages.
-
-That can be dealt with separately at a later location, in which case
-all we have to do is revert this patch.
-
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- libkmod/libkmod.c     |    2 +-
- tools/depmod.c        |    2 +-
- tools/modinfo.c       |    4 ++--
- tools/modprobe.c      |    4 ++--
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/libkmod/libkmod.c b/libkmod/libkmod.c
-index 12c1112..11edfa0 100644
---- a/libkmod/libkmod.c
-+++ b/libkmod/libkmod.c
-@@ -196,7 +196,7 @@ static int log_priority(const char *priority)
- 	return 0;
- }
- 
--static const char *dirname_default_prefix = ROOTPREFIX "/lib/modules";
-+static const char *dirname_default_prefix = "/lib/modules";
- 
- static char *get_kernel_release(const char *dirname)
- {
-diff --git a/tools/kmod-depmod.c b/tools/kmod-depmod.c
-index 7bb1c5d..454d538 100644
---- a/tools/depmod.c
-+++ b/tools/depmod.c
-@@ -2634,7 +2634,7 @@ static int do_depmod(int argc, char *argv[])
- 	}
- 
- 	cfg.dirnamelen = snprintf(cfg.dirname, PATH_MAX,
--				  "%s" ROOTPREFIX "/lib/modules/%s",
-+				  "%s/lib/modules/%s",
- 				  root == NULL ? "" : root, cfg.kversion);
- 
- 	if (optind == argc)
-diff --git a/tools/kmod-modinfo.c b/tools/kmod-modinfo.c
-index aa5223f..b13cd4b 100644
---- a/tools/modinfo.c
-+++ b/tools/modinfo.c
-@@ -339,7 +339,7 @@ static void help(const char *progname)
- 		"\t-0, --null                  Use \\0 instead of \\n\n"
- 		"\t-F, --field=FIELD           Print only provided FIELD\n"
- 		"\t-k, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
--		"\t-b, --basedir=DIR           Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+		"\t-b, --basedir=DIR           Use DIR as filesystem root for /lib/modules\n"
- 		"\t-V, --version               Show version\n"
- 		"\t-h, --help                  Show this help\n",
- 		progname);
-@@ -439,7 +439,7 @@ static int do_modinfo(int argc, char *argv[])
- 			}
- 			kversion = u.release;
- 		}
--		snprintf(dirname_buf, sizeof(dirname_buf), "%s" ROOTPREFIX "/lib/modules/%s",
-+		snprintf(dirname_buf, sizeof(dirname_buf), "%s/lib/modules/%s",
- 			 root, kversion);
- 		dirname = dirname_buf;
- 	}
-diff --git a/tools/kmod-modprobe.c b/tools/kmod-modprobe.c
-index 4760682..ccb41d8 100644
---- a/tools/modprobe.c
-+++ b/tools/modprobe.c
-@@ -128,7 +128,7 @@ static void help(const char *progname)
- 		"\t-n, --show                  Same as --dry-run\n"
- 
- 		"\t-C, --config=FILE           Use FILE instead of default search paths\n"
--		"\t-d, --dirname=DIR           Use DIR as filesystem root for " ROOTPREFIX "/lib/modules\n"
-+		"\t-d, --dirname=DIR           Use DIR as filesystem root for /lib/modules\n"
- 		"\t-S, --set-version=VERSION   Use VERSION instead of `uname -r`\n"
- 
- 		"\t-s, --syslog                print to syslog, not stderr\n"
-@@ -973,7 +973,7 @@ static int do_modprobe(int argc, char **orig_argv)
- 			kversion = u.release;
- 		}
- 		snprintf(dirname_buf, sizeof(dirname_buf),
--				"%s" ROOTPREFIX "/lib/modules/%s", root,
-+				"%s/lib/modules/%s", root,
- 				kversion);
- 		dirname = dirname_buf;
- 	}
--- 
-1.7.9.5
-
diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD
deleted file mode 100644
index 457b9ad19..000000000
--- a/testing/kmod/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 169420 2012-10-20 19:15:57Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=kmod
-pkgver=10
-pkgrel=2
-pkgdesc="Linux kernel module handling"
-arch=('i686' 'x86_64')
-url='http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary'
-license=('GPL2')
-depends=('glibc' 'zlib')
-makedepends=('gtk-doc')
-options=('!libtool')
-provides=('module-init-tools=3.16')
-conflicts=('module-init-tools')
-replaces=('module-init-tools')
-source=("ftp://ftp.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.xz"
-        '0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch'
-        '0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch'
-        "depmod-search.conf")
-md5sums=('e2a883c4df15a50f78a7a61d5b64089f'
-         '47005a6e70496d429d40e3fc4fd89755'
-         'ecf5bfd4fd9ed14cf0dc1ce4025d256b'
-         'dd62cbf62bd8f212f51ef8c43bec9a77')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # upstream commit 88c247f7f18ac25181ddcaff97fbbecbd3a29f57
-  patch -Np1 < "$srcdir/0001-depmod-fix-parsing-of-modules.order-with-compressed-.patch"
-
-  # upstream commit 66f3228d17d66d7e2dd484427259290fbc82b2f0
-  patch -Np1 < "$srcdir/0001-libkmod-Add-support-for-.-in-module-parameter-on-kcm.patch"
-
-  ./configure \
-    --sysconfdir=/etc \
-    --enable-gtk-doc \
-    --with-zlib
-
-  make
-}
-
-check() {
-  # testsuite is broken on 32-bit because of an unhandled EEXIST on mkdir_p
-  make -C "$pkgname-$pkgver" check || :
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  # extra directories
-  install -dm755 "$pkgdir"/{etc,usr/lib}/{depmod,modprobe}.d "$pkgdir/sbin"
-
-  # add symlinks to kmod
-  ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe"
-  ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod"
-
-  for tool in {ins,ls,rm}mod modinfo; do
-    ln -s kmod "$pkgdir/usr/bin/$tool"
-  done
-
-  # install depmod.d file for search/ dir
-  install -Dm644 "$srcdir/depmod-search.conf" "$pkgdir/usr/lib/depmod.d/search.conf"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/kmod/depmod-search.conf b/testing/kmod/depmod-search.conf
deleted file mode 100644
index 36f2cf7db..000000000
--- a/testing/kmod/depmod-search.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /usr/lib/depmod.d/search.conf
-#
-
-search updates extramodules built-in
diff --git a/testing/kmod/kmod.install b/testing/kmod/kmod.install
deleted file mode 100644
index 0a2e88dc5..000000000
--- a/testing/kmod/kmod.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-  if [ "$(vercmp 9-2 "$2")" -eq 1 ]; then
-    echo "==> Kernel modules are now only read from /usr/lib/modules, all custom"
-    echo "    built kernels and modules must be moved there before rebooting."
-  fi
-}
-
diff --git a/testing/konversation/PKGBUILD b/testing/konversation/PKGBUILD
deleted file mode 100644
index 6bd3741cd..000000000
--- a/testing/konversation/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 168841 2012-10-16 11:53:50Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: James Rayner <iphitus@gmail.com>
-# Contributor: Sergio Jovani Guzman <moret@paretux.org>
-
-pkgname=konversation
-pkgver=1.4
-pkgrel=3
-pkgdesc="A user friendly IRC client for KDE"
-arch=('i686' 'x86_64')
-url="http://konversation.kde.org"
-depends=('kdebase-runtime' 'kdepimlibs')
-makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
-optdepends=('python: python scripting support')
-license=('GPL2' 'FDL')
-install=${pkgname}.install
-options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-  
-  # Remove a bunch of symlinks pointing to non-existant files
-  for _lang in pt_BR uk sv et de en nl; do
-     rm "${pkgdir}"/usr/share/doc/kde/html/${_lang}/konversation/common
-  done
-}
diff --git a/testing/konversation/konversation.install b/testing/konversation/konversation.install
deleted file mode 100644
index 8834e059a..000000000
--- a/testing/konversation/konversation.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/kradio/PKGBUILD b/testing/kradio/PKGBUILD
deleted file mode 100644
index e06525a04..000000000
--- a/testing/kradio/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 163060 2012-07-06 15:21:36Z ibiru $
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.4
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL2')
-pkgdesc="A comfortable KDE internet and AM/FM radio application"
-url="http://kradio.sourceforge.net/"
-depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
-makedepends=('automoc4' 'cmake')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc})
-md5sums=('4b5495a4f1dda21f7201bc8db0d4f95e'
-         '51c6d4ec0047d2df595b458bde285012')
-
-build() {
-  cd "$srcdir"
-  mkdir build
-  cd build
-  cmake ../${pkgname}4-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/kradio/kradio.install b/testing/kradio/kradio.install
deleted file mode 100644
index 460e85d7f..000000000
--- a/testing/kradio/kradio.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/krb5/MITKRB5-SA-2012-001.patch b/testing/krb5/MITKRB5-SA-2012-001.patch
deleted file mode 100644
index 938b56570..000000000
--- a/testing/krb5/MITKRB5-SA-2012-001.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/kdc/do_as_req.c b/src/kdc/do_as_req.c
-index 23623fe..8ada9d0 100644
---- a/src/kdc/do_as_req.c
-+++ b/src/kdc/do_as_req.c
-@@ -463,7 +463,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
-     krb5_enctype useenctype;
-     struct as_req_state *state;
- 
--    state = malloc(sizeof(*state));
-+    state = calloc(sizeof(*state), 1);
-     if (!state) {
-         (*respond)(arg, ENOMEM, NULL);
-         return;
-@@ -486,6 +486,7 @@ process_as_req(krb5_kdc_req *request, krb5_data *req_pkt,
-     state->authtime = 0;
-     state->c_flags = 0;
-     state->req_pkt = req_pkt;
-+    state->inner_body = NULL;
-     state->rstate = NULL;
-     state->sname = 0;
-     state->cname = 0;
-diff --git a/src/kdc/kdc_preauth.c b/src/kdc/kdc_preauth.c
-index 9d8cb34..d4ece3f 100644
---- a/src/kdc/kdc_preauth.c
-+++ b/src/kdc/kdc_preauth.c
-@@ -1438,7 +1438,8 @@ etype_info_helper(krb5_context context, krb5_kdc_req *request,
-                 continue;
- 
-             }
--            if (request_contains_enctype(context, request, db_etype)) {
-+            if (krb5_is_permitted_enctype(context, db_etype) &&
-+                request_contains_enctype(context, request, db_etype)) {
-                 retval = _make_etype_info_entry(context, client->princ,
-                                                 client_key, db_etype,
-                                                 &entry[i], etype_info2);
-diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c
-index a43b291..94dad3a 100644
---- a/src/kdc/kdc_util.c
-+++ b/src/kdc/kdc_util.c
-@@ -2461,6 +2461,7 @@ kdc_handle_protected_negotiation(krb5_data *req_pkt, krb5_kdc_req *request,
-         return 0;
-     pa.magic = KV5M_PA_DATA;
-     pa.pa_type = KRB5_ENCPADATA_REQ_ENC_PA_REP;
-+    memset(&checksum, 0, sizeof(checksum));
-     retval = krb5_c_make_checksum(kdc_context,0, reply_key,
-                                   KRB5_KEYUSAGE_AS_REQ, req_pkt, &checksum);
-     if (retval != 0)
-diff --git a/src/lib/kdb/kdb_default.c b/src/lib/kdb/kdb_default.c
-index c4bf92e..367c894 100644
---- a/src/lib/kdb/kdb_default.c
-+++ b/src/lib/kdb/kdb_default.c
-@@ -61,6 +61,9 @@ krb5_dbe_def_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap)
-     krb5_boolean        saw_non_permitted = FALSE;
- 
-     ret = 0;
-+    if (ktype != -1 && !krb5_is_permitted_enctype(kcontext, ktype))
-+        return KRB5_KDB_NO_PERMITTED_KEY;
-+
-     if (kvno == -1 && stype == -1 && ktype == -1)
-         kvno = 0;
- 
diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD
deleted file mode 100644
index f38a4f8c0..000000000
--- a/testing/krb5/PKGBUILD
+++ /dev/null
@@ -1,92 +0,0 @@
-# $Id: PKGBUILD 165034 2012-08-09 09:25:36Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=krb5
-pkgver=1.10.3
-pkgrel=1
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url="http://web.mit.edu/kerberos/"
-license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar
-        krb5-1.10.1-gcc47.patch
-        krb5-kadmind
-        krb5-kadmind.service
-        krb5-kdc
-        krb5-kdc.service
-        krb5-kpropd
-        krb5-kpropd.service
-        krb5-kpropd@.service
-        krb5-kpropd.socket)
-sha1sums=('04ab9837e5d1958158bcb30bd6480201089a0cbb'
-          '78b759d566b1fdefd9bbcd06df14f07f12effe96'
-          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
-          'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
-          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
-          'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e'
-          '7f402078fa65bb9ff1beb6cbbbb017450df78560'
-          '614401dd4ac18e310153240bb26eb32ff1e8cf5b'
-          '023a8164f8ee7066ac814486a68bc605e79f6101'
-          'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
-options=('!emptydirs')
-
-build() {
-   tar zxvf ${pkgname}-${pkgver}.tar.gz
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-
-   # With gcc47 : deltat.c:1694:12: error: 'yylval' may be used uninitialized
-   # in this function [-Werror=maybe-uninitialized]
-   # As this is generated code, just ignore the complaint.
-   patch -Np2 -i ../../krb5-1.10.1-gcc47.patch
-   rm lib/krb5/krb/deltat.c
-
-   # FS#25384
-   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-
-   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
-   export CPPFLAGS+=" -I/usr/include/et"
-   ./configure --prefix=/usr \
-               --mandir=/usr/share/man \
-               --localstatedir=/var/lib \
-               --enable-shared \
-               --with-system-et \
-               --with-system-ss \
-               --disable-rpath \
-               --without-tcl \
-               --enable-dns-for-realm \
-               --with-ldap \
-               --without-system-verto
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}/src"
-   make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install
-
-   # Fix FS#29889
-   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples
-
-   # Sample KDC config file
-   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
-   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
-
-   # Default configuration file
-   install -dm 755 "${pkgdir}"/etc
-   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
-
-   install -dm 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d
-
-   install -dm 755 "${pkgdir}"/usr/share/aclocal
-   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
-
-   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-
-   # systemd stuff
-   install -dm 755 "${pkgdir}"/usr/lib/systemd/system
-   install -m 644 ../../krb5-{kadmind.service,kdc.service,kpropd.service,kpropd@.service,kpropd.socket} \
-      "${pkgdir}"/usr/lib/systemd/system
-}
diff --git a/testing/krb5/krb5-1.10.1-gcc47.patch b/testing/krb5/krb5-1.10.1-gcc47.patch
deleted file mode 100644
index ffd01c2a3..000000000
--- a/testing/krb5/krb5-1.10.1-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
---- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y	2011-09-06 07:34:32.000000000 -0400
-+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y	2012-03-24 13:15:11.543551318 -0400
-@@ -44,6 +44,7 @@
- #ifdef __GNUC__
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wuninitialized"
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- #endif
- 
- #include <ctype.h>
diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind
deleted file mode 100644
index 04df0dcff..000000000
--- a/testing/krb5/krb5-kadmind
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Admin Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kadmind
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Admin Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kadmind
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/testing/krb5/krb5-kadmind.service b/testing/krb5/krb5-kadmind.service
deleted file mode 100644
index f3836c898..000000000
--- a/testing/krb5/krb5-kadmind.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 administration server
-
-[Service]
-ExecStart=/usr/sbin/kadmind -nofork
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc
deleted file mode 100644
index 05a03411e..000000000
--- a/testing/krb5/krb5-kdc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/krb5kdc`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Authentication"
-        if [ -z "$PID" ]; then
-           /usr/sbin/krb5kdc
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Authentication"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon krb5-kdc
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/testing/krb5/krb5-kdc.service b/testing/krb5/krb5-kdc.service
deleted file mode 100644
index 6ec93bb72..000000000
--- a/testing/krb5/krb5-kdc.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 KDC
-
-[Service]
-ExecStart=/usr/sbin/krb5kdc -n
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/krb5/krb5-kpropd b/testing/krb5/krb5-kpropd
deleted file mode 100644
index a0077d68e..000000000
--- a/testing/krb5/krb5-kpropd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kpropd`
-case "$1" in
-    start)
-        stat_busy "Starting Kerberos Database Propagation Daemon"
-        if [ -z "$PID" ]; then
-           /usr/sbin/kpropd -S
-        fi
-        if [ ! -z "$PID" -o $? -gt 0 ]; then
-            stat_fail
-        else
-            add_daemon kpropd
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping Kerberos Database Propagation Daemon"
-	    [ ! -z "$PID" ] && kill $PID &> /dev/null
-        if [ $? -gt 0 ]; then
-            stat_fail
-        else
-            rm_daemon kpropd
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-	sleep 1
-        $0 start
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart}"
-	;;
-esac
-exit 0
diff --git a/testing/krb5/krb5-kpropd.service b/testing/krb5/krb5-kpropd.service
deleted file mode 100644
index a7c5b579d..000000000
--- a/testing/krb5/krb5-kpropd.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Service]
-ExecStart=/usr/sbin/kpropd -S
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/krb5/krb5-kpropd.socket b/testing/krb5/krb5-kpropd.socket
deleted file mode 100644
index 4389290c0..000000000
--- a/testing/krb5/krb5-kpropd.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-
-[Socket]
-ListenStream=754
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/testing/krb5/krb5-kpropd@.service b/testing/krb5/krb5-kpropd@.service
deleted file mode 100644
index 46f7e3639..000000000
--- a/testing/krb5/krb5-kpropd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Kerberos 5 propagation server
-Conflicts=krb5-kpropd.service
-
-[Service]
-ExecStart=/usr/sbin/kpropd
-StandardInput=socket
-StandardError=syslog
diff --git a/testing/ldns/PKGBUILD b/testing/ldns/PKGBUILD
deleted file mode 100644
index 4613191f4..000000000
--- a/testing/ldns/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 169587 2012-10-23 22:55:24Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: mathieui <mathieui@mathieui.net>
-# Contributor: jiribb <jiribb@gmail.com>
-
-pkgname=ldns
-pkgver=1.6.14
-pkgrel=1
-pkgdesc='Fast DNS library supporting recent RFCs'
-url='http://www.nlnetlabs.nl/projects/ldns/'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-options=('!libtool')
-depends=('openssl' 'dnssec-anchors')
-optdepends=('libpcap: ldns-dpa tool')
-makedepends=('libpcap')
-source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2ef5fbf33b25d2f7b736c332ebccc0862dd12d02')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--enable-static=no \
-		--disable-rpath \
-		--with-drill \
-		--with-examples \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/less/PKGBUILD b/testing/less/PKGBUILD
deleted file mode 100644
index b5c8f869d..000000000
--- a/testing/less/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 166186 2012-09-05 10:54:45Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=less
-pkgver=451
-pkgrel=1
-pkgdesc="A terminal based program for viewing text files"
-license=('GPL3')
-arch=('i686' 'x86_64')
-url="http://www.greenwoodsoftware.com/less"
-groups=('base')
-depends=('ncurses' 'pcre')
-source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('765f082658002b2b46b86af4a0da1842'
-         'a5493f4598ba7c9f81782683f3c27119')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc --with-regex=pcre
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}"/usr install
-}
diff --git a/testing/libarchive/PKGBUILD b/testing/libarchive/PKGBUILD
deleted file mode 100644
index 44fdad7ff..000000000
--- a/testing/libarchive/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 166896 2012-09-21 02:03:06Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=libarchive
-pkgver=3.0.4
-pkgrel=2
-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=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz"
-        libarchive-3.0.x-fix-mtree-writer.patch)
-md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16'
-         '6d36a50a7282db6576bd1fbc23f08055')
-sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac'
-            'f0081c0d7d7875fc91c683b14fe4876d56b6585f45be9181c755eba4b522f5b9')
-
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i $srcdir/libarchive-3.0.x-fix-mtree-writer.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/libarchive-3.0.x-fix-mtree-writer.patch b/testing/libarchive/libarchive-3.0.x-fix-mtree-writer.patch
deleted file mode 100644
index dbc89686a..000000000
--- a/testing/libarchive/libarchive-3.0.x-fix-mtree-writer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/libarchive/archive_write_set_format_mtree.c
-+++ b/libarchive/archive_write_set_format_mtree.c
-@@ -887,6 +887,19 @@ write_entry(struct archive_write *a, struct mtree_entry *me)
- 
- 	archive_string_empty(&mtree->ebuf);
- 	str = (mtree->indent)? &mtree->ebuf : &mtree->buf;
-+
-+	/* If the pathname does not have a path separator, we have to
-+	 * add "./" to the head of the pathename because mtree reader
-+	 * will suppose that it is v1(a.k.a classic) mtree format and
-+	 * change the directory unexpectedly and so it will make a wrong
-+	 * path. */
-+	if (strchr(me->pathname, '/') == NULL &&
-+	    strcmp(me->pathname, ".") != 0) {
-+		archive_strcat(str, "./");
-+	}
-+	/* mtree reader does not accept an absolute path. */
-+	else if (me->pathname[0] == '/')
-+		archive_strappend_char(str, '.');
- 	mtree_quote(str, me->pathname);
- 	keys = get_keys(mtree, me);
- 	if ((keys & F_NLINK) != 0 &&
---- a/libarchive/test/test_read_format_mtree.c
-+++ b/libarchive/test/test_read_format_mtree.c
-@@ -37,7 +37,8 @@ test_read_format_mtree1(void)
- 	 * without relying on overflow.  This assumes that long long
- 	 * is at least 64 bits. */
- 	static const long long max_int64 = ((((long long)1) << 62) - 1) + (((long long)1) << 62);
--	time_t min_time, t;
-+	time_t min_time;
-+	volatile time_t t;
- 
- 	extract_reference_file(reffile);
- 
\ No newline at end of file
diff --git a/testing/libcap-ng/PKGBUILD b/testing/libcap-ng/PKGBUILD
deleted file mode 100644
index e67e9ee4a..000000000
--- a/testing/libcap-ng/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 165202 2012-08-12 20:44:32Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=libcap-ng
-pkgver=0.7
-pkgrel=1
-pkgdesc="A library intended to make programming with POSIX capabilities much easier than the traditional libcap"
-arch=('i686' 'x86_64')
-url="http://people.redhat.com/sgrubb/libcap-ng/"
-license=('GPL2' 'LGPL2.1')
-depends=('glibc')
-options=('!libtool')
-source=(http://people.redhat.com/sgrubb/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('85c14a2442a3721383a1e2284e254846')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr --enable-static=no --with-python=no
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR=$pkgdir install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libcroco/PKGBUILD b/testing/libcroco/PKGBUILD
deleted file mode 100644
index 87e17f8b5..000000000
--- a/testing/libcroco/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169176 2012-10-18 19:23:47Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libcroco
-pkgver=0.6.7
-pkgrel=1
-pkgdesc="A CSS parsing library"
-arch=('x86_64' 'i686')
-depends=('glib2' 'libxml2')
-makedepends=('intltool')
-license=('LGPL')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/0.6/$pkgname-$pkgver.tar.xz)
-url="http://www.gnome.org"
-sha256sums=('892b8a7e311b80d0a5a633b8204fed5656d7af20e884719e5ec6e340e1f0cd88')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libdrm-old/COPYING b/testing/libdrm-old/COPYING
deleted file mode 100644
index 6e74c337c..000000000
--- a/testing/libdrm-old/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-old/PKGBUILD b/testing/libdrm-old/PKGBUILD
deleted file mode 100644
index f72b03e5c..000000000
--- a/testing/libdrm-old/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-#Id$
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libdrm-old
-pkgname=(libdrm-old libdrm-nouveau1)
-pkgver=2.4.33
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-options=('!libtool' '!emptydirs')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/libdrm/libdrm-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING
-)
-sha1sums=('4da2c635491724e44326871e6a49ccfec0b6b5a6'
-          '825ff5e0c4238b31bdea52f104bfec8949270e25'
-          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
-
-build() {
-  cd "libdrm-$pkgver"
-  patch -Np1 -i "$srcdir/no-pthread-stubs.patch"
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --disable-libkms \
-      --disable-intel \
-      --disable-radeon \
-      --enable-nouveau-experimental-api
-  make
-}
-
-package_libdrm-old() {
-  pkgdesc="Userspace interface to kernel DRM services - used as makedepends for nouveau-dri"
-  conflicts=('libdrm')
-  provides=("libdrm=$pkgver")
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/lib/libdrm_nouveau.so.1*
-}
-
-package_libdrm-nouveau1() {
-  pkgdesc="Userspace interface to kernel DRM services for nouveau - used as depends for nouveau-dri"
-  depends=(libdrm)
-  cd "libdrm-$pkgver"
-  make DESTDIR="$pkgdir" install-libdrm_laLTLIBRARIES
-  make -C nouveau DESTDIR="$pkgdir" install
-  make DESTDIR="$pkgdir" uninstall-libdrm_laLTLIBRARIES
-  rm -rf "$pkgdir"/usr/include/  "$pkgdir"/usr/lib/pkgconfig/libdrm_nouveau.pc  "$pkgdir"/usr/lib/libdrm_nouveau.so
-}
diff --git a/testing/libdrm-old/no-pthread-stubs.patch b/testing/libdrm-old/no-pthread-stubs.patch
deleted file mode 100644
index 5430244f9..000000000
--- a/testing/libdrm-old/no-pthread-stubs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
---- libdrm-2.4.0/configure.ac	2008-10-09 21:57:09.000000000 +0200
-+++ libdrm-2.4.0-nostubs/configure.ac	2008-10-21 10:48:24.000000000 +0200
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
---- libdrm-2.4.16/intel/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/intel/Makefile.am.new	2009-12-07 08:11:32.235748069 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
-@@ -34,7 +33,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
---- libdrm-2.4.16/radeon/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/radeon/Makefile.am.new	2009-12-07 08:12:31.889075388 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.16/nouveau/Makefile.am	2009-11-20 23:54:36.000000000 +0000
-+++ libdrm-2.4.16/nouveau/Makefile.am.new	2009-12-07 08:13:01.489072320 +0000
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = \
- 			    nouveau_device.c \
diff --git a/testing/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 b2aa623e4..000000000
--- a/testing/libdrm/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 165602 2012-08-27 08:01:37Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libdrm
-pkgver=2.4.39
-pkgrel=1
-pkgdesc="Userspace interface to kernel DRM services"
-arch=(i686 x86_64)
-license=('custom')
-depends=('glibc' 'libpciaccess')
-makedepends=('cairo' 'valgrind')
-replaces=('libdrm-new' 'libdrm-nouveau')
-options=('!libtool')
-url="http://dri.freedesktop.org/"
-source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
-        no-pthread-stubs.patch
-        COPYING)
-sha256sums=('386b17388980504bca16ede81ceed4c77b12c3488f46ecb7f4d48e48512a733d'
-            '66fb39be073c634abc7c2af238535a63b2a03990888eb8cc5ea79fa3ef083930'
-            '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
-
-build() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../no-pthread-stubs.patch
-
-  #libtoolize --force
-  autoreconf --force --install
-  ./configure --prefix=/usr \
-      --enable-udev \
-      --enable-vmwgfx-experimental-api
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make -k check
-}
-
-package() {
-  cd $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/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 a8de91d9d..000000000
--- a/testing/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,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@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +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:1 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
diff --git a/testing/libedit/PKGBUILD b/testing/libedit/PKGBUILD
deleted file mode 100644
index c7a5b6ac9..000000000
--- a/testing/libedit/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 165760 2012-08-29 13:07:56Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Roman Cheplyaka <roma@ro-che.info>
-
-pkgname=libedit
-pkgver=20120601_3.0
-pkgrel=1
-pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions'
-url='http://www.thrysoee.dk/editline/'
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('ncurses')
-options=('!libtool')
-source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz")
-sha1sums=('18ec27120f6abb222754e9f283d000fec0dcfc08')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
-	./configure --prefix=/usr --enable-widec --enable-static=no
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver/_/-}"
-	make prefix="${pkgdir}"/usr install
-
-	cp "${pkgdir}"/usr/share/man/man3/editline.3 "${pkgdir}"/usr/share/man/man3/el.3
-	install -Dm644 COPYING "${pkgdir}"/usr/share/licenses/libedit/LICENSE
-}
diff --git a/testing/libevent/PKGBUILD b/testing/libevent/PKGBUILD
deleted file mode 100644
index dff51f733..000000000
--- a/testing/libevent/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165586 2012-08-26 13:51:21Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=libevent
-pkgver=2.0.20
-pkgrel=1
-pkgdesc="An event notification library"
-arch=('i686' 'x86_64')
-url="http://www.monkey.org/~provos/libevent/"
-license=('BSD')
-depends=('openssl')
-optdepends=('python2: to use event_rpcgen.py')
-options=('!libtool')
-source=(https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-$pkgver-stable.tar.gz{,.asc})
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  sed -i 's#python#python2#' event_rpcgen.py
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  make check || true # this never worked, should be taken upstream
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-stable"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('94270cdee32c0cd0aa9f4ee6ede27e8e'
-         '5310233871ef2f2b3536114bf0377a42')
diff --git a/testing/libffado/PKGBUILD b/testing/libffado/PKGBUILD
deleted file mode 100644
index 7b0928606..000000000
--- a/testing/libffado/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 167215 2012-09-28 14:21:22Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: galiyosha@gmail.com
-# Contributor: Jon Kristian Nilsen <jokr.nilsen@gmail.com>
-
-pkgname=libffado
-pkgver=2.1.0
-pkgrel=3
-pkgdesc="Driver for FireWire audio devices"
-arch=('i686' 'x86_64')
-url="http://www.ffado.org/"
-license=('GPL')
-depends=('libiec61883' 'libavc1394' 'dbus-c++'
-         'libxml++' 'alsa-lib' 'libsigc++' 'libconfig')
-makedepends=('scons' 'subversion' 'python2-pyqt')
-optdepends=('python2: ffado-diag'
-            'python2-pyqt: mixer applet')
-provides=('ffado')
-source=("http://www.ffado.org/files/$pkgname-$pkgver.tgz"
-        'python2-qt.patch')
-md5sums=('26bce2be0b9c1fa4e614f2f494edf388'
-         '10aa837f5521da213caa93e1ddc58c0e')
-
-_scons-conf() {
-  scons DEBUG=False \
-        PREFIX=/usr \
-        MANDIR=/usr/share/man \
-        UDEVDIR=/usr/lib/udev/rules.d \
-        COMPILE_FLAGS="$CFLAGS" $@
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # python2 fix
-  patch -Np1 -i "$srcdir/python2-qt.patch"
-
-  # build!
-  if [ "$CARCH" = 'x86_64' ]; then
-    _scons-conf ENABLE_OPTIMIZATIONS=True
-  else
-    _scons-conf
-  fi
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  scons DESTDIR="$pkgdir" WILL_DEAL_WITH_XDG_MYSELF="True" install
-
-  # desktop files & icons
-  install -Dm644 support/xdg/ffado.org-ffadomixer.desktop \
-    "$pkgdir/usr/share/applications/ffadomixer.desktop"
-
-  install -Dm644 support/xdg/hi64-apps-ffado.png \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libffado/python2-qt.patch b/testing/libffado/python2-qt.patch
deleted file mode 100644
index 042aa2665..000000000
--- a/testing/libffado/python2-qt.patch
+++ /dev/null
@@ -1,246 +0,0 @@
-diff -baur libffado-2.1.0.orig/SConstruct libffado-2.1.0/SConstruct
---- libffado-2.1.0.orig/SConstruct	2012-09-19 14:18:53.827448582 +0800
-+++ libffado-2.1.0/SConstruct	2012-09-19 14:20:01.670414379 +0800
-@@ -1,4 +1,4 @@
--#! /usr/bin/python
-+#!/usr/bin/python2
- # -*- coding: utf-8 -*-
- #
- # Copyright (C) 2007, 2008, 2010 Arnold Krille
-@@ -134,7 +134,7 @@
- 
- def CheckForPyModule( context, module ):
-     context.Message( "Checking for the python module '" + module + "' " )
--    ret = context.TryAction( "python $SOURCE", "import %s" % module, ".py" )
-+    ret = context.TryAction( "python2 $SOURCE", "import %s" % module, ".py" )
-     context.Result( ret[0] )
-     return ret[0]
- 
-@@ -351,7 +351,7 @@
- 
- # PyQT checks
- build_mixer = False
--if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
-+if conf.CheckForApp( 'which python2-pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
-     env['PYUIC4'] = True
-     build_mixer = True
- 
-diff -baur libffado-2.1.0.orig/admin/dbus.py libffado-2.1.0/admin/dbus.py
---- libffado-2.1.0.orig/admin/dbus.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/dbus.py	2012-09-19 14:19:02.957399122 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-diff -baur libffado-2.1.0.orig/admin/doxygen.py libffado-2.1.0/admin/doxygen.py
---- libffado-2.1.0.orig/admin/doxygen.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/doxygen.py	2012-09-19 14:19:02.957399122 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.1.0.orig/admin/pkgconfig.py libffado-2.1.0/admin/pkgconfig.py
---- libffado-2.1.0.orig/admin/pkgconfig.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/pkgconfig.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.1.0.orig/admin/pyuic.py libffado-2.1.0/admin/pyuic.py
---- libffado-2.1.0.orig/admin/pyuic.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/pyuic.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.1.0.orig/admin/pyuic4.py libffado-2.1.0/admin/pyuic4.py
---- libffado-2.1.0.orig/admin/pyuic4.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/pyuic4.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-@@ -21,10 +21,8 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
--import imp
--
- def pyuic4_action( target, source, env ):
--	env.Execute( "pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
-+	env.Execute( "python2-pyuic4 " + str( source[0] ) + " > " + str( target[0] ) )
- 	return 0
- 
- def pyuic4_string( target, source, env ):
-@@ -34,7 +32,7 @@
- 	context.Message( "Checking for pyuic4 (by checking for the python module pyqtconfig) " )
- 	ret = True
- 	try:
--		imp.find_module( "pyqtconfig" )
-+		import PyQt4.pyqtconfig
- 	except ImportError:
- 		ret = False
- 	context.Result( ret )
-diff -baur libffado-2.1.0.orig/admin/scanreplace.py libffado-2.1.0/admin/scanreplace.py
---- libffado-2.1.0.orig/admin/scanreplace.py	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/admin/scanreplace.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- #
-diff -baur libffado-2.1.0.orig/doc/SConscript libffado-2.1.0/doc/SConscript
---- libffado-2.1.0.orig/doc/SConscript	2012-09-19 14:18:53.857448419 +0800
-+++ libffado-2.1.0/doc/SConscript	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!/usr/bin/python2
- 
- Import( 'env' )
- 
-diff -baur libffado-2.1.0.orig/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript
---- libffado-2.1.0.orig/support/dbus/SConscript	2012-09-19 14:18:53.827448582 +0800
-+++ libffado-2.1.0/support/dbus/SConscript	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/bin/env python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007,2008,2011 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-diff -baur libffado-2.1.0.orig/support/mixer-qt4/SConscript libffado-2.1.0/support/mixer-qt4/SConscript
---- libffado-2.1.0.orig/support/mixer-qt4/SConscript	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/mixer-qt4/SConscript	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2009 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py
---- libffado-2.1.0.orig/support/mixer-qt4/ffado/ffadowindow.py	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/mixer-qt4/ffado/ffadowindow.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2008 by Pieter Palmers
- #               2007-2009 by Arnold Krille
-diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in
---- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer-profiler.in	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/mixer-qt4/ffado-mixer-profiler.in	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2009 by Pieter Palmers
- #               2007-2009 by Arnold Krille
-diff -baur libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in libffado-2.1.0/support/mixer-qt4/ffado-mixer.in
---- libffado-2.1.0.orig/support/mixer-qt4/ffado-mixer.in	2012-09-19 14:18:53.834115214 +0800
-+++ libffado-2.1.0/support/mixer-qt4/ffado-mixer.in	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2008 by Pieter Palmers
- #               2007-2009 by Arnold Krille
-diff -baur libffado-2.1.0.orig/support/tools/SConscript libffado-2.1.0/support/tools/SConscript
---- libffado-2.1.0.orig/support/tools/SConscript	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/SConscript	2012-09-19 14:20:51.970141882 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2007-2008 Arnold Krille
- # Copyright (C) 2007-2008 Pieter Palmers
-@@ -43,7 +43,7 @@
- # For the installation of the stuff
- e['pythondir'] = Template( os.path.join( e['sharedir'], 'python' ) ).safe_substitute( e )
- 
--e.Command( "static_info.txt", "#/SConstruct", "python support/tools/ffado-diag-static > $TARGET" )
-+e.Command( "static_info.txt", "#/SConstruct", "python2 support/tools/ffado-diag-static > $TARGET" )
- 
- e.ScanReplace( "ffado-diag.in" )
- 
-diff -baur libffado-2.1.0.orig/support/tools/ffado-diag-static libffado-2.1.0/support/tools/ffado-diag-static
---- libffado-2.1.0.orig/support/tools/ffado-diag-static	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/ffado-diag-static	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- 
- #
-@@ -74,7 +74,7 @@
-     # check libraries
-     print "   gcc ............... %s" % get_version_first_line('gcc --version')
-     print "   g++ ............... %s" % get_version_first_line('g++ --version')
--    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
-+    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
-     print "   jackd ............. %s" % get_version_first_line('jackd --version')
-     print "     path ............ %s" % get_command_path('jackd')
-     print "     flags ........... %s" % get_package_flags("jack")
-diff -baur libffado-2.1.0.orig/support/tools/ffado-diag.in libffado-2.1.0/support/tools/ffado-diag.in
---- libffado-2.1.0.orig/support/tools/ffado-diag.in	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/ffado-diag.in	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- 
- #
-@@ -120,7 +120,7 @@
-     print " Prerequisites (dynamic at run-time)..."
-     print "   gcc ............... %s" % get_version_first_line('gcc --version')
-     print "   g++ ............... %s" % get_version_first_line('g++ --version')
--    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('pyuic4 --version')
-+    print "   PyQt4 (by pyuic4) . %s" % get_version_first_line('python2-pyuic4 --version')
-     print "   jackd ............. %s" % get_version_first_line('jackd --version')
-     print "     path ............ %s" % get_command_path('jackd')
-     print "     flags ........... %s" % get_package_flags("jack")
-diff -baur libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py libffado-2.1.0/support/tools/ffado-sandbox-install.py
---- libffado-2.1.0.orig/support/tools/ffado-sandbox-install.py	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/ffado-sandbox-install.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- 
- #
-diff -baur libffado-2.1.0.orig/support/tools/listirqinfo.py libffado-2.1.0/support/tools/listirqinfo.py
---- libffado-2.1.0.orig/support/tools/listirqinfo.py	2012-09-19 14:18:53.830781898 +0800
-+++ libffado-2.1.0/support/tools/listirqinfo.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- 
- #
-diff -baur libffado-2.1.0.orig/tests/dbus_test.py libffado-2.1.0/tests/dbus_test.py
---- libffado-2.1.0.orig/tests/dbus_test.py	2012-09-19 14:18:53.837448529 +0800
-+++ libffado-2.1.0/tests/dbus_test.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2007 by Pieter Palmers
- #               2007-2008 by Arnold Krille
-diff -baur libffado-2.1.0.orig/tests/python/test-eap-ctrl.py libffado-2.1.0/tests/python/test-eap-ctrl.py
---- libffado-2.1.0.orig/tests/python/test-eap-ctrl.py	2012-09-19 14:18:53.837448529 +0800
-+++ libffado-2.1.0/tests/python/test-eap-ctrl.py	2012-09-19 14:19:02.957399123 +0800
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- #
- # Copyright (C) 2005-2009 by Pieter Palmers
- #
diff --git a/testing/libgdata/PKGBUILD b/testing/libgdata/PKGBUILD
deleted file mode 100644
index 7b3ac92be..000000000
--- a/testing/libgdata/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169183 2012-10-18 19:23:59Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgdata
-pkgver=0.13.2
-pkgrel=1
-pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'liboauth' 'gcr' 'gnome-online-accounts')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgee/PKGBUILD b/testing/libgee/PKGBUILD
deleted file mode 100644
index ee1cb1739..000000000
--- a/testing/libgee/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169182 2012-10-18 19:23:57Z jgc $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libgee
-pkgver=0.6.6
-pkgrel=1
-pkgdesc="GObject collection library"
-url="http://live.gnome.org/Libgee"
-license=('LGPL2.1')
-arch=('i686' 'x86_64')
-depends=('glib2')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b6b008a6b84332b88f5a12f33d56a3fa3a307946cdd70bc17a403822d4f02e7b')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --disable-static
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgnome-keyring/PKGBUILD b/testing/libgnome-keyring/PKGBUILD
deleted file mode 100644
index a5fec0581..000000000
--- a/testing/libgnome-keyring/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-#$Id: PKGBUILD 169181 2012-10-18 19:23:55Z jgc $
-#Maintainer: Jan De Groot <jgc@archlinux.org>
-
-pkgname=libgnome-keyring
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME keyring client library"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-depends=('dbus-core' 'glib2' 'libgcrypt')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/gnome-keyring
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgnomekbd/PKGBUILD b/testing/libgnomekbd/PKGBUILD
deleted file mode 100644
index d19a2dc26..000000000
--- a/testing/libgnomekbd/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169282 2012-10-18 19:45:58Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libgnomekbd
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Gnome keyboard library"
-url="http://gswitchit.sourceforge.net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libxklavier' 'gtk3' 'dconf')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool' '!emptydirs')
-install=libgnomekbd.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgnomekbd/libgnomekbd.install b/testing/libgnomekbd/libgnomekbd.install
deleted file mode 100644
index a3d820459..000000000
--- a/testing/libgnomekbd/libgnomekbd.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/libgpod/PKGBUILD b/testing/libgpod/PKGBUILD
deleted file mode 100644
index b646e99cc..000000000
--- a/testing/libgpod/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164295 2012-07-29 23:15:52Z tomegun $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=libgpod
-pkgver=0.8.2
-pkgrel=6
-pkgdesc="A shared library to access the contents of an iPod"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'mutagen' 'sg3_utils' 'libimobiledevice' 'libplist')
-makedepends=('intltool' 'swig' 'docbook-xsl' 'pygobject2-devel' 'gtk-sharp-2')
-optdepends=('gtk-sharp-2: Mono bindings'
-            'python2-gobject2: python bindings')
-url="http://www.gtkpod.org/libgpod/"
-source=(http://downloads.sourceforge.net/sourceforge/gtkpod/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-md5sums=('ff0fd875fa08f2a6a49dec57ce3367ab')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-udev-dir=/usr/lib/udev \
-      --enable-udev --with-python=/usr/bin/python2
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/libgssglue/PKGBUILD b/testing/libgssglue/PKGBUILD
deleted file mode 100644
index 382ce696b..000000000
--- a/testing/libgssglue/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 165536 2012-08-23 08:47:06Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=libgssglue
-pkgver=0.4
-pkgrel=1
-pkgdesc="Exports a gssapi interface which calls other random gssapi libraries"
-arch=('i686' 'x86_64')
-url="http://www.citi.umich.edu/projects/nfsv4/linux/"
-license=('BSD')
-depends=('glibc')
-makedepends=('pkgconfig' 'autoconf')
-backup=(etc/gssapi_mech.conf)
-options=('!libtool')
-source=(http://www.citi.umich.edu/projects/nfsv4/linux/$pkgname/$pkgname-$pkgver.tar.gz
-        gssapi_mech.conf)
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr 
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir/" install
-
-  # Configuration
-  install -Dm644 "$srcdir"/gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf
-  # install license
-  install -Dm644 COPYING "$pkgdir"/usr/share/licenses/libgssglue/COPYING
-}
-md5sums=('088797f3180702fa54e786496b32e750'
-         '080be866717e4e06fa6f7d6f43cb395a')
diff --git a/testing/libgssglue/gssapi_mech.conf b/testing/libgssglue/gssapi_mech.conf
deleted file mode 100644
index 9a832ee1b..000000000
--- a/testing/libgssglue/gssapi_mech.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Example /etc/gssapi_mech.conf file
-#
-# GSSAPI Mechanism Definitions
-#
-# This configuration file determines which GSS-API mechanisms
-# the gssd code should use
-#
-# NOTE:
-# The initiaiization function "mechglue_internal_krb5_init"
-# is used for the MIT krb5 gssapi mechanism.  This special
-# function name indicates that an internal function should
-# be used to determine the entry points for the MIT gssapi
-# mechanism funtions.
-#
-# library                               initialization function
-# ================================      ==========================
-# The MIT K5 gssapi library, use special function for initialization.
-/usr/lib/libgssapi_krb5.so             mechglue_internal_krb5_init
-#/usr/lib/libgssapi.so            mechglue_internal_krb5_init
-#
-# The SPKM3 gssapi library function.  Use the function spkm3_gss_initialize.
-# /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so    spkm3_gss_initialize
diff --git a/testing/libgweather/PKGBUILD b/testing/libgweather/PKGBUILD
deleted file mode 100644
index 420e2b212..000000000
--- a/testing/libgweather/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 169180 2012-10-18 19:23:54Z jgc $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-
-pkgname=libgweather
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Provides access to weather information from the net"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libsoup-gnome' 'gnome-icon-theme' 'gtk3')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org/"
-install=libgweather.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
-        gettext-not-xml.patch
-        no_external_gettext.patch)
-sha256sums=('93c9ef9bba3feb559c02b860909915fa9ffc7c08b4789a825939236e3e84b676'
-            '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533'
-            'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672')
-
-build() {
-    cd "$pkgname-$pkgver"
-
-    patch -Np1 -i "$srcdir/gettext-not-xml.patch"
-    patch -Np1 -i "$srcdir/no_external_gettext.patch"
-    gtkdocize
-    autoreconf -fi
-
-    cd po
-     intltool-update --pot
-    cd ../po-locations
-    intltool-update --gettext-package libgweather-locations --pot
-    cd ..
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --localstatedir=/var --disable-static \
-        --enable-locations-compression
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-}
diff --git a/testing/libgweather/gettext-not-xml.patch b/testing/libgweather/gettext-not-xml.patch
deleted file mode 100644
index b966c5648..000000000
--- a/testing/libgweather/gettext-not-xml.patch
+++ /dev/null
@@ -1,551 +0,0 @@
-Description: Switch to using gettext to find localized names for locations, instead of shipping very large locale-specific XML files with lots of duplicate information.
-Author: ?
-
-only in patch2:
-unchanged:
-Index: libgweather-3.5.1/configure.ac
-===================================================================
---- libgweather-3.5.1.orig/configure.ac	2012-06-25 03:23:11.000000000 +1200
-+++ libgweather-3.5.1/configure.ac	2012-07-05 10:27:51.457384292 +1200
-@@ -46,6 +46,10 @@
- LT_INIT([dlopen win32-dll disable-static])
- LT_LIB_M
- 
-+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations
-+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile])
-+IT_PO_SUBDIR([po-locations])
-+
- PKG_PROG_PKG_CONFIG([0.19])
- 
- AC_PROG_CC
-@@ -53,13 +57,6 @@
- 
- GLIB_GSETTINGS
- 
--AC_ARG_ENABLE(all-translations-in-one-xml,
--        [AS_HELP_STRING([--enable-all-translations-in-one-xml],
--                        [Put all translations in a big Locations.xml file (slow to parse)])],
--        [enable_big_xml=yes],
--        [enable_big_xml=no])
--AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes")
--
- AC_ARG_ENABLE(locations-compression,
-         [AS_HELP_STRING([--enable-locations-compression],
-                         [Compress Locations.xml files])],
-@@ -183,7 +180,7 @@
- Makefile
- doc/Makefile
- po/Makefile.in
--po-locations/Makefile
-+po-locations/Makefile.in
- libgweather/Makefile
- libgweather/gweather-3.0.pc
- libgweather/gweather-3.0-uninstalled.pc
-@@ -192,12 +189,6 @@
- ])
- AC_OUTPUT
- 
--if test "x$enable_big_xml" = "xyes"; then
--	LOCATIONS_XML_TRANSLATIONS="one big file"
--else
--	LOCATIONS_XML_TRANSLATIONS="one file per translation"
--fi
--
- dnl ***************************************************************************
- dnl *** Display Summary                                                     ***
- dnl ***************************************************************************
-@@ -208,6 +199,4 @@
- 	Source code location:		${srcdir}
- 	Compiler:			${CC}
- 	Introspection support:          ${found_introspection}
--	Locations.xml translations:	${LOCATIONS_XML_TRANSLATIONS}
--	Locations.xml compression:	${enable_locations_compression}
- " >&2
-Index: libgweather-3.5.1/data/Makefile.am
-===================================================================
---- libgweather-3.5.1.orig/data/Makefile.am	2012-06-06 04:07:53.000000000 +1200
-+++ libgweather-3.5.1/data/Makefile.am	2012-07-05 10:27:51.461384292 +1200
-@@ -4,61 +4,21 @@
- libgweatherlocationsdir = $(pkgdatadir)
- libgweatherlocations_in_files = Locations.xml.in
- 
--if USE_ONE_BIG_XML
--
--LOCATIONS_STAMP = 
--
--libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT))
--
--%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po)
--	$(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then				\
--		gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`;	\
--	fi
--
--else # USE_ONE_BIG_XML
--
- LOCATIONS_STAMP = stamp-Locations.xml
- 
--PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi)
--
- # Helper variable
--libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml)
--
--libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT)
-+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml)
- 
- # We need this step so that we merge all the make Locations.xy.xml destinations
- # into one unique destination. This makes -j2 work. (Else, we end up with
- # multiple and conflicting calls to intltool-merge)
- $(libgweatherlocations_DATA): $(LOCATIONS_STAMP)
- 
--$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile
--	$(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \
--	for pofile in $(PO_LOCATIONS); do \
--		locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`;	\
--		xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \
--		rm -f $$locale/$(libgweatherlocations_data);		\
--		test -d $$locale && rmdir $$locale;			\
--		if test "x$(COMPRESS_EXT)" = "x.gz"; then		\
--			gzip --force Locations.$$locale.xml;		\
--		fi;							\
--	done &&								\
--	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \
--	rm -f C/$(libgweatherlocations_data) &&				\
--	test -d C && rmdir C &&						\
--	if test "x$(COMPRESS_EXT)" = "x.gz"; then			\
--		gzip --force Locations.xml;				\
--	fi &&								\
--	touch $@
--
--endif # USE_ONE_BIG_XML
--
--### Locations.xml.in rebuild
--rebuild-locations: locationdb.sqlite update-locations.py
--	$(AM_V_GEN)($(srcdir)/update-locations.py > Locations.xml.in.new && mv Locations.xml.in.new Locations.xml.in) || rm -f Locations.xml.in.new
--
--locationdb.sqlite: build-locationdb.pl major-cities.txt sources/nsd_cccc.txt sources/POP_PLACES.txt sources/US_CONCISE.txt sources/geonames_dd_dms_date_*.txt city-fixups.pl station-fixups.pl
--	$(AM_V_GEN)$(srcdir)/build-locationdb.pl
-+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile
-+	LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA)  && \
-+	xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \
-+	rm -f C/$(libgweatherlocations_DATA) &&				\
-+ 	touch $@
- 
- check:
- 	xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in
-Index: libgweather-3.5.1/libgweather/gweather-location.c
-===================================================================
---- libgweather-3.5.1.orig/libgweather/gweather-location.c	2012-06-15 08:15:23.000000000 +1200
-+++ libgweather-3.5.1/libgweather/gweather-location.c	2012-07-05 10:27:51.461384292 +1200
-@@ -22,11 +22,14 @@
- #include <config.h>
- #endif
- 
-+#include "config.h"
-+
- #include <string.h>
- #include <math.h>
- #include <locale.h>
- #include <gtk/gtk.h>
- #include <libxml/xmlreader.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-location.h"
-@@ -157,10 +160,20 @@
- 
- 	tagname = (const char *) xmlTextReaderConstName (parser->xml);
- 	if (!strcmp (tagname, "name") && !loc->name) {
--	    value = gweather_parser_get_localized_value (parser);
-+	    char *context = NULL;
-+	    context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+	   
-+	    value = gweather_parser_get_value (parser);
- 	    if (!value)
- 		goto error_out;
--	    loc->name = g_strdup (value);
-+
-+	    if (context != NULL) {
-+	    	loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value));
-+	    	xmlFree (context);
-+	    }
-+	    else
-+	    	loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value));
-+	    
- 	    xmlFree (value);
- 	    normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL);
- 	    loc->sort_name = g_utf8_casefold (normalized, -1);
-Index: libgweather-3.5.1/libgweather/gweather-timezone.c
-===================================================================
---- libgweather-3.5.1.orig/libgweather/gweather-timezone.c	2011-11-16 01:03:32.000000000 +1300
-+++ libgweather-3.5.1/libgweather/gweather-timezone.c	2012-07-05 10:27:51.461384292 +1200
-@@ -23,6 +23,7 @@
- #endif
- 
- #include <string.h>
-+#include <libintl.h>
- 
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- #include "gweather-timezone.h"
-@@ -154,7 +155,7 @@
- parse_timezone (GWeatherParser *parser)
- {
-     GWeatherTimezone *zone = NULL;
--    char *id = NULL, *name = NULL;
-+    char *id = NULL, *name = NULL, *context = NULL;
-     int offset = 0, dst_offset = 0;
-     gboolean has_dst = FALSE;
- 
-@@ -177,27 +178,34 @@
- 		continue;
- 	    }
- 
--	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name"))
--		name = gweather_parser_get_localized_value (parser);
-+	    if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) {
-+		context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); 
-+		name = gweather_parser_get_value (parser);
-+	    }
- 	    else {
- 		if (xmlTextReaderNext (parser->xml) != 1)
- 		    break;
- 	    }
- 	}
-     }
--
-+	    
-     if (parse_tzdata (id, parser->year_start, parser->year_end,
- 		      &offset, &has_dst, &dst_offset)) {
- 	zone = g_slice_new0 (GWeatherTimezone);
- 	zone->ref_count = 1;
- 	zone->id = g_strdup (id);
--	zone->name = g_strdup (name);
-+	if (context != NULL)
-+		zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name));
-+	else
-+		zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name));
- 	zone->offset = offset;
- 	zone->has_dst = has_dst;
- 	zone->dst_offset = dst_offset;
-     }
- 
-     xmlFree (id);
-+    if (context)
-+    	xmlFree (context);
-     if (name)
- 	xmlFree (name);
- 
-Index: libgweather-3.5.1/po-locations/LINGUAS
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/LINGUAS	2012-07-05 10:27:51.461384292 +1200
-@@ -0,0 +1,78 @@
-+ang
-+ar
-+as
-+az
-+be
-+be@latin
-+bg
-+bn_IN
-+bn
-+bs
-+ca
-+cs
-+cy
-+da
-+de
-+dz
-+el
-+en_CA
-+en_GB
-+es
-+et
-+eu
-+fa
-+fi
-+fr
-+ga
-+gl
-+gu
-+he
-+hi
-+hr
-+hu
-+id
-+it
-+ja
-+ka
-+kn
-+ko
-+ku
-+ky
-+lt
-+lv
-+mai
-+mg
-+mk
-+ml
-+mn
-+mr
-+ms
-+nb
-+ne
-+nl
-+nn
-+oc
-+or
-+pa
-+pl
-+pt_BR
-+pt
-+ro
-+ru
-+rw
-+si
-+sk
-+sl
-+sq
-+sr@latin
-+sr
-+sv
-+ta
-+te
-+th
-+tr
-+uk
-+vi
-+zh_CN
-+zh_HK
-+zh_TW
-Index: libgweather-3.5.1/po-locations/Makefile.in.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/Makefile.in.in	2012-07-05 10:27:51.461384292 +1200
-@@ -0,0 +1,217 @@
-+# Makefile for program source directory in GNU NLS utilities package.
-+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com>
-+#
-+# This file may be copied and used freely without restrictions.  It may
-+# be used in projects which are not available under a GNU Public License,
-+# but which still want to provide support for the GNU gettext functionality.
-+#
-+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
-+#   instead of PACKAGE and to look for po2tbl in ./ not in intl/
-+#
-+# - Modified by jacob berkman <jacob@ximian.com> to install
-+#   Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
-+#
-+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool
-+#
-+# We have the following line for use by intltoolize:
-+# INTLTOOL_MAKEFILE
-+
-+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations
-+PACKAGE = @PACKAGE@
-+VERSION = @VERSION@
-+
-+SHELL = /bin/sh
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = @top_builddir@
-+VPATH = @srcdir@
-+
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+libdir = @libdir@
-+DATADIRNAME = @DATADIRNAME@
-+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+subdir = po-locations
-+install_sh = @install_sh@
-+# Automake >= 1.8 provides @mkdir_p@.
-+# Until it can be supposed, use the safe fallback:
-+mkdir_p = $(install_sh) -d
-+
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+
-+GMSGFMT = @GMSGFMT@
-+MSGFMT = @MSGFMT@
-+XGETTEXT = @XGETTEXT@
-+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-+GENPOT   = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-+
-+ALL_LINGUAS = @ALL_LINGUAS@
-+
-+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-+
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+
-+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-+
-+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-+
-+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
-+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
-+
-+POTFILES = \
-+# This comment gets stripped out
-+
-+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
-+
-+.SUFFIXES:
-+.SUFFIXES: .po .pox .gmo .mo .msg .cat
-+
-+.po.pox:
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
-+
-+.po.mo:
-+	$(MSGFMT) -o $@ $<
-+
-+.po.gmo:
-+	file=`echo $* | sed 's,.*/,,'`.gmo \
-+	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-+
-+.po.cat:
-+	sed -f ../intl/po2msg.sed < $< > $*.msg \
-+	  && rm -f $@ && gencat $@ $*.msg
-+
-+
-+all: all-@USE_NLS@
-+
-+all-yes: $(CATALOGS)
-+all-no:
-+
-+$(GETTEXT_PACKAGE).pot: $(POTFILES)
-+	$(GENPOT)
-+
-+install: install-data
-+install-data: install-data-@USE_NLS@
-+install-data-no: all
-+install-data-yes: all
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
-+	  $(mkdir_p) $$dir; \
-+	  if test -r $$lang.gmo; then \
-+	    $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  else \
-+	    $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
-+	    echo "installing $(srcdir)/$$lang.gmo as" \
-+		 "$$dir/$(GETTEXT_PACKAGE).mo"; \
-+	  fi; \
-+	  if test -r $$lang.gmo.m; then \
-+	    $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	    echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	  else \
-+	    if test -r $(srcdir)/$$lang.gmo.m ; then \
-+	      $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
-+		$$dir/$(GETTEXT_PACKAGE).mo.m; \
-+	      echo "installing $(srcdir)/$$lang.gmo.m as" \
-+		   "$$dir/$(GETTEXT_PACKAGE).mo.m"; \
-+	    else \
-+	      true; \
-+	    fi; \
-+	  fi; \
-+	done
-+
-+# Empty stubs to satisfy archaic automake needs
-+dvi info tags TAGS ID:
-+
-+# Define this as empty until I found a useful application.
-+install-exec installcheck:
-+
-+uninstall:
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
-+	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
-+	done
-+
-+check: all $(GETTEXT_PACKAGE).pot
-+	rm -f missing notexist
-+	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
-+	if [ -r missing -o -r notexist ]; then \
-+	  exit 1; \
-+	fi
-+
-+mostlyclean:
-+	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
-+	rm -f .intltool-merge-cache
-+
-+clean: mostlyclean
-+
-+distclean: clean
-+	rm -f Makefile Makefile.in POTFILES stamp-it
-+	rm -f *.mo *.msg *.cat *.cat.m *.gmo
-+
-+maintainer-clean: distclean
-+	@echo "This command is intended for maintainers to use;"
-+	@echo "it deletes files that may require special tools to rebuild."
-+	rm -f Makefile.in.in
-+
-+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-+dist distdir: $(DISTFILES)
-+	dists="$(DISTFILES)"; \
-+	extra_dists="$(EXTRA_DISTFILES)"; \
-+	for file in $$extra_dists; do \
-+	  test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \
-+	done; \
-+	for file in $$dists; do \
-+	  test -f $$file || file="$(srcdir)/$$file"; \
-+	  ln $$file $(distdir) 2> /dev/null \
-+	    || cp -p $$file $(distdir); \
-+	done
-+
-+update-po: Makefile
-+	$(MAKE) $(GETTEXT_PACKAGE).pot
-+	tmpdir=`pwd`; \
-+	linguas="$(USE_LINGUAS)"; \
-+	for lang in $$linguas; do \
-+	  echo "$$lang:"; \
-+	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
-+	  if $$result; then \
-+	    if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-+	      rm -f $$tmpdir/$$lang.new.po; \
-+            else \
-+	      if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-+	        :; \
-+	      else \
-+	        echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-+	        rm -f $$tmpdir/$$lang.new.po; \
-+	        exit 1; \
-+	      fi; \
-+	    fi; \
-+	  else \
-+	    echo "msgmerge for $$lang.gmo failed!"; \
-+	    rm -f $$tmpdir/$$lang.new.po; \
-+	  fi; \
-+	done
-+
-+Makefile POTFILES: stamp-it
-+	@if test ! -f $@; then \
-+	  rm -f stamp-it; \
-+	  $(MAKE) stamp-it; \
-+	fi
-+
-+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
-+	cd $(top_builddir) \
-+	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
-+	       $(SHELL) ./config.status
-+
-+# Tell versions [3.59,3.63) of GNU make not to export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-Index: libgweather-3.5.1/po-locations/POTFILES.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libgweather-3.5.1/po-locations/POTFILES.in	2012-07-05 10:27:51.461384292 +1200
-@@ -0,0 +1,4 @@
-+# This list should contain *only* data/Locations.xml.in.
-+# Everything else should be in POTFILES.skip.
-+[encoding:UTF-8]
-+data/Locations.xml.in
diff --git a/testing/libgweather/libgweather.install b/testing/libgweather/libgweather.install
deleted file mode 100644
index 3ba0d0a48..000000000
--- a/testing/libgweather/libgweather.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/gnome
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if [ -f /usr/share/gconf/schemas/libgweather.schemas ]; then
-    gconfpkg --uninstall libgweather
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libgweather/no_external_gettext.patch b/testing/libgweather/no_external_gettext.patch
deleted file mode 100644
index 64b3c5ad5..000000000
--- a/testing/libgweather/no_external_gettext.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: libgweather-3.5.1/configure.ac
-===================================================================
---- libgweather-3.5.1.orig/configure.ac	2012-07-05 10:33:10.277373254 +1200
-+++ libgweather-3.5.1/configure.ac	2012-07-05 10:33:44.957372053 +1200
-@@ -97,9 +97,6 @@
- dnl gettext
- IT_PROG_INTLTOOL([0.50.0])
- 
--AM_GNU_GETTEXT_VERSION([0.18])
--AM_GNU_GETTEXT([external])
--
- GETTEXT_PACKAGE=libgweather-3.0
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
diff --git a/testing/libimobiledevice/PKGBUILD b/testing/libimobiledevice/PKGBUILD
deleted file mode 100644
index 2d9547c84..000000000
--- a/testing/libimobiledevice/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 164283 2012-07-29 21:08:37Z eric $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libimobiledevice
-pkgver=1.1.4
-pkgrel=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')
-license=('GPL2' 'LGPL2.1')
-depends=('usbmuxd' 'gnutls' 'libgcrypt')
-options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('3f28cbc6a2e30d34685049c0abde5183')
diff --git a/testing/libimobiledevice/swig-version-check.patch b/testing/libimobiledevice/swig-version-check.patch
deleted file mode 100644
index c56b095db..000000000
--- a/testing/libimobiledevice/swig-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
---- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false
diff --git a/testing/libkcddb/PKGBUILD b/testing/libkcddb/PKGBUILD
deleted file mode 100644
index 36f6fb0cd..000000000
--- a/testing/libkcddb/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167586 2012-10-02 19:14:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkcddb
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="KDE CDDB library"
-url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'libmusicbrainz5')
-makedepends=('cmake' 'automoc4')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('11a83fcf8e699d787b0c037e50f2031874470d70')
-
-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/libkcompactdisc/PKGBUILD b/testing/libkcompactdisc/PKGBUILD
deleted file mode 100644
index b37c1deb1..000000000
--- a/testing/libkcompactdisc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167587 2012-10-02 19:15:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkcompactdisc
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A library for interfacing with CDs"
-url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdemultimedia-kioslave')
-conflicts=('kdemultimedia-kioslave')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('daea966e1d6bc06b3dc7001455e31f5004a05423')
-
-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/PKGBUILD b/testing/libkdcraw/PKGBUILD
deleted file mode 100644
index 78018d3ae..000000000
--- a/testing/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167581 2012-10-02 19:12:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
-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.xz")
-sha1sums=('022e5e59fb4b0a9ac7942b967f488795a42786e0')
-
-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 6d1ddd252..000000000
--- a/testing/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167579 2012-10-02 19:10:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Libraries used by KDE Education applications"
-url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
-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.xz")
-sha1sums=('e03310dbb1bcc02095f238fbdd4684a59e98d710')
-
-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 3b98a4bd6..000000000
--- a/testing/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 167582 2012-10-02 19:12:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
-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.xz")
-sha1sums=('60956d88677346bdd4e343b1454a61a2210a39c6')
-
-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/libkgapi/PKGBUILD b/testing/libkgapi/PKGBUILD
deleted file mode 100644
index 652d331a4..000000000
--- a/testing/libkgapi/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164626 2012-08-01 14:43:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkgapi
-pkgver=0.4.1
-pkgrel=1
-pkgdesc="A KDE-based library for accessing various Google services via their public API"
-url='https://projects.kde.org/projects/kdereview/libkgoogle'
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'qjson')
-makedepends=('cmake' 'automoc4' 'boost')
-replaces=('akonadi-google' 'libkgoogle')
-conflicts=('akonadi-google' 'libkgoogle')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b4cefa643e95f5670997b5001547988f')
-
-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 d768ff29b..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.9.2
-pkgrel=1
-pkgdesc="An interface to use kipi-plugins from a KDE application"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
-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.xz")
-sha1sums=('36d9bd240409e4ec3063fe02279671502fb65c26')
-
-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 0d20e7022..000000000
--- a/testing/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167584 2012-10-02 19:13:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="An image scanning library"
-url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
-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.xz")
-sha1sums=('e8578ec3a65ba91a8772c88612f61116ee9f38a8')
-
-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/libmpc/PKGBUILD b/testing/libmpc/PKGBUILD
deleted file mode 100644
index 57a4e49f1..000000000
--- a/testing/libmpc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 166368 2012-09-07 01:12:26Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=libmpc
-pkgver=1.0.1
-pkgrel=1
-pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision"
-arch=('i686' 'x86_64')
-url="http://www.multiprecision.org/"
-license=('LGPL')
-depends=('mpfr>=3.0.0')
-options=('!libtool')
-install=libmpc.install
-source=(http://www.multiprecision.org/mpc/download/mpc-${pkgver/_/-}.tar.gz{,.sig})
-md5sums=('b32a2e1a3daa392372fbd586d1ed3679'
-         'c064863fbbb5831ba4f75f1181333862')
-
-build() {
-  cd "${srcdir}/mpc-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "${srcdir}/mpc-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/mpc-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  mv ${pkgdir}/usr/share/info/{mpc,libmpc}.info
-}
diff --git a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch b/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
deleted file mode 100644
index 3bf324728..000000000
--- a/testing/libmpc/libmpc-0.9-configure_cflags_egrep_issue.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- trunk/configure.ac	2011/02/21 12:18:31	932
-+++ trunk/configure.ac	2011/02/21 16:41:09	936
-@@ -33,7 +33,7 @@
- AC_CANONICAL_HOST
- AC_CONFIG_MACRO_DIR([m4])
- 
--dnl Extra arguments to configure
-+# Extra arguments to configure
- AC_ARG_WITH([mpfr_include],
-             [AC_HELP_STRING([--with-mpfr-include=DIR],
-                             [MPFR include directory])],
-@@ -85,18 +85,19 @@
-              )
- 
- 
--dnl Setup CC and CFLAGS
-+# Setup CC and CFLAGS
-+AC_PROG_CC
-+AC_LANG(C)
- 
--dnl Check for user specification of CC or CFLAGS
-+# Set up LibTool
-+AC_PROG_LIBTOOL
-+
-+# Check for user specification of CC or CFLAGS
- if test -n "$CFLAGS" || test -n "$CC" ; then
-    user_redefine_cc=yes
- fi
- 
--# Check for programs
--AC_PROG_CC
--AC_LANG(C)
--
--dnl Check GMP Header
-+# Check GMP Header
- AC_MSG_CHECKING(for gmp.h)
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include "gmp.h"
-@@ -105,22 +106,19 @@
-  AC_MSG_ERROR([gmp.h can't be found, or is unusable.])
- ])
- 
--dnl Check for GMP CFLAGS in gmp.h
-+# Check for GMP CFLAGS in gmp.h
- if test -z "$user_redefine_cc" ; then
-    MPC_GMP_CC_CFLAGS
- fi
- 
- 
--dnl Configs for Windows DLLs
-+# Configs for Windows DLLs
- case $host in
-   *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      MPC_WINDOWS
- esac
- 
- 
--dnl Finally set up LibTool
--AC_PROG_LIBTOOL
--
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h])
diff --git a/testing/libmpc/libmpc.install b/testing/libmpc/libmpc.install
deleted file mode 100644
index b0718c745..000000000
--- a/testing/libmpc/libmpc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libmpc.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/libmtp/PKGBUILD b/testing/libmtp/PKGBUILD
deleted file mode 100644
index fdbb15e2b..000000000
--- a/testing/libmtp/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 165531 2012-08-22 22:28:14Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
-
-pkgname=libmtp
-pkgver=1.1.4
-pkgrel=1
-pkgdesc="Library implementation of the Media Transfer Protocol"
-arch=("i686" "x86_64")
-url="http://libmtp.sourceforge.net"
-license=('LGPL')
-depends=('libusb' 'libgcrypt')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-udev=/usr/lib/udev
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-md5sums=('27d9bcbc925c1ef84869eb27fdda54e8')
diff --git a/testing/libnice/PKGBUILD b/testing/libnice/PKGBUILD
deleted file mode 100644
index 05890543b..000000000
--- a/testing/libnice/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 500 2009-08-01 11:44:28Z ibiru $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: William Díaz <wdiaz@archlinux.us>
-
-pkgname=libnice
-pkgver=0.1.3
-pkgrel=1
-pkgdesc="An implementation of the IETF's draft ICE (for p2p UDP data streams)"
-arch=('i686' 'x86_64')
-url="http://nice.freedesktop.org"
-license=('LGPL')
-depends=('glib2')
-makedepends=('gstreamer' 'gstreamer0.10')
-optdepends=('gstreamer' 'gstreamer0.10')
-options=('!libtool')
-source=(http://nice.freedesktop.org/releases/$pkgname-$pkgver.tar.gz)
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('1a0907605f852dcda32a3b3daf38d36c')
diff --git a/testing/libnl/PKGBUILD b/testing/libnl/PKGBUILD
deleted file mode 100644
index 67f071a46..000000000
--- a/testing/libnl/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 162351 2012-06-25 18:39:40Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=libnl
-pkgver=3.2.11
-pkgrel=1
-pkgdesc="Library for applications dealing with netlink sockets"
-arch=(i686 x86_64)
-url="http://www.infradead.org/~tgr/libnl/"
-license=(GPL)
-depends=(glibc)
-backup=(etc/libnl/classid etc/libnl/pktloc)
-options=(!libtool)
-source=("$url/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('9750409c0fec8b27966a65d94c040647ee01753e0947b0d59577b815ee0e710d')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --sbindir=/usr/bin \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libofx/PKGBUILD b/testing/libofx/PKGBUILD
deleted file mode 100644
index 218fa0cd3..000000000
--- a/testing/libofx/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 165083 2012-08-10 05:02:43Z eric $
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgbase=libofx
-pkgname=('libofx' 'libofx-doc')
-pkgver=0.9.5
-pkgrel=1
-pkgdesc="API for the OFX banking standard"
-arch=('i686' 'x86_64')
-url="http://libofx.sourceforge.net"
-license=('GPL')
-depends=('opensp' 'curl' 'libxml++')
-checkdepends=('gnupg')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz libofx-gcc47.patch)
-sha1sums=('7e5245d68a0f3f7efad2fd809b2afbbff6ba0e73'
-          '6c327e24543cb8ba901bfb204343a85c68264654')
-
-build() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  patch -p1 -i "$srcdir/libofx-gcc47.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgbase-$pkgver"
-  make check
-}
-
-package_libofx() {
-  options=('!libtool' '!docs')
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-package_libofx-doc() {
-  pkgdesc="Documention of the OFX banking standard API"
-  depends=()
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install-docDATA
-  make -C doc DESTDIR="$pkgdir" install
-}
diff --git a/testing/libofx/libofx-gcc47.patch b/testing/libofx/libofx-gcc47.patch
deleted file mode 100644
index 899fe09e0..000000000
--- a/testing/libofx/libofx-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff libofx-0.9.4/debian/patches/fix-ftbfs-gcc4.7.diff
---- libofx-0.9.4.orig/ofxconnect/ofxpartner.cpp	2011-03-30 22:30:50.000000000 +0000
-+++ libofx-0.9.4/ofxconnect/ofxpartner.cpp	2012-04-17 06:08:38.711940892 +0000
-@@ -37,6 +37,7 @@
- #include <vector>
- #include <algorithm>
- #include <string.h>
-+#include <unistd.h>
- 
- using std::string;
- using std::vector;
diff --git a/testing/libpcap/PKGBUILD b/testing/libpcap/PKGBUILD
deleted file mode 100644
index 44b921483..000000000
--- a/testing/libpcap/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 162349 2012-06-25 18:35:21Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=libpcap
-pkgver=1.3.0
-pkgrel=1
-pkgdesc="A system-independent interface for user-level packet capture"
-arch=('i686' 'x86_64')
-url="http://www.tcpdump.org/"
-license=('BSD')
-depends=('glibc' 'libnl' 'sh' 'libusbx')
-makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig}
-        libnl32.patch)
-sha256sums=('41cbd9ed68383afd9f1fda279cb78427d36879d9e34ee707e31a16a1afd872b9'
-            '8004a6655fb98acd89f3dea7ce95f182f4874298ce692f5b8f4a7dae65d7993f'
-            '7d0cbd49e55405cb2b55852223cd4965526e518cfb4f547ab9cc9b95b8f9c9e6')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i "${srcdir}/libnl32.patch"
-  autoreconf -f -i
-  ./configure --prefix=/usr --enable-ipv6 --with-libnl
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  install -d -m755 ${pkgdir}/usr/bin
-  make DESTDIR=${pkgdir} install
-  # remove static library
-  rm -rf ${pkgdir}/usr/lib/libpcap.a
-  
-  # backwards compatibility, programs often look for net/bpf.h
-  mkdir -p ${pkgdir}/usr/include/net
-  cd ${pkgdir}/usr/include/net
-  ln -s ../pcap-bpf.h bpf.h
-
-  #install the license
-  install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/testing/libpcap/libnl32.patch b/testing/libpcap/libnl32.patch
deleted file mode 100644
index 633fd003e..000000000
--- a/testing/libpcap/libnl32.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -u -r libpcap-1.2.1/configure.in libpcap-1.2.1-libnl32/configure.in
---- libpcap-1.2.1/configure.in	2012-01-02 01:47:37.000000000 +0100
-+++ libpcap-1.2.1-libnl32/configure.in	2012-02-09 19:29:29.405603749 +0100
-@@ -433,12 +433,13 @@
- 		#
- 		# Try libnl 2.x first.
- 		#
--		AC_CHECK_LIB(nl, nl_socket_alloc,
-+		AC_CHECK_LIB(nl-3, nl_socket_alloc,
- 		[
- 			#
- 			# Yes, we have libnl 2.x.
- 			#
--			LIBS="-lnl-genl -lnl $LIBS"
-+			LIBS="$(pkg-config --libs libnl-genl-3.0 libnl-3.0) $LIBS"
-+			V_INCLS="$V_INCLS $(pkg-config --cflags libnl-genl-3.0 libnl-3.0)"
- 			AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
- 			AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
- 		],
diff --git a/testing/libpeas/PKGBUILD b/testing/libpeas/PKGBUILD
deleted file mode 100644
index a226b8b09..000000000
--- a/testing/libpeas/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 169178 2012-10-18 19:23:50Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libpeas
-pkgver=1.6.1
-pkgrel=1
-pkgdesc="A GObject-based plugins engine"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection')
-makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade')
-optdepends=('gjs: gobject-based plugin engine - gjs runtime loader'
-            'seed: gobject-based plugin engine - seed runtime loader')
-options=('!libtool')
-install=libpeas.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libpeas/libpeas.install b/testing/libpeas/libpeas.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/testing/libpeas/libpeas.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/libpipeline/PKGBUILD b/testing/libpipeline/PKGBUILD
deleted file mode 100644
index c5493c781..000000000
--- a/testing/libpipeline/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 166762 2012-09-18 18:12:10Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=libpipeline
-pkgver=1.2.2
-pkgrel=1
-pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
-arch=('i686' 'x86_64')
-url="http://libpipeline.nongnu.org/"
-license=('GPL')
-depends=('glibc')
-options=('!libtool')
-source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz)
-md5sums=('4367a3f598d171fd43dfa8620ed16d55')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/testing/libpng/PKGBUILD b/testing/libpng/PKGBUILD
deleted file mode 100644
index 225d2d163..000000000
--- a/testing/libpng/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 161871 2012-06-16 00:25:49Z 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.11
-_apngver=1.5.11
-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=('57f838299e701b6db9e8389c5602dc18'
-         'e9ddf7670e78ad93f4cc189c884d4f26')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # Add animated PNG (apng) support
-  # see http://sourceforge.net/projects/libpng-apng/
-  patch -p1 -i ../libpng-$_apngver-apng.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  cd contrib/pngminus
-  make PNGLIB="-L$pkgdir/usr/lib -lpng" -f makefile.std png2pnm pnm2png
-  install -m755 png2pnm pnm2png "$pkgdir/usr/bin/"
-  install -D -m644 ../../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/libpst/PKGBUILD b/testing/libpst/PKGBUILD
deleted file mode 100644
index 484181df0..000000000
--- a/testing/libpst/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 163549 2012-07-15 13:17:02Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libpst
-pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.five-ten-sg.com/libpst/"
-license=('GPL')
-makedepends=('python2' 'boost')
-source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-      --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
-  make
-}
-
-package_libpst() {
-  pkgdesc="Outlook .pst file converter"
-  depends=('gcc-libs')
-  optdepends=('boost-libs: for libpst python interface')
-  options=('!libtool' '!docs')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-package_libpst-docs() {
-  pkgdesc="Documentation for Outlook .pst file converter"
-  options=('!libtool')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install-htmlDATA
-  cd "${srcdir}/${pkgbase}-${pkgver}/html"
-  make DESTDIR="${pkgdir}" install-htmldevelDATA
-}
diff --git a/testing/libpwquality/PKGBUILD b/testing/libpwquality/PKGBUILD
deleted file mode 100644
index b40a35d4b..000000000
--- a/testing/libpwquality/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libpwquality
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="Library for password quality checking and generating random passwords"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/libpwquality/"
-license=('GPL')
-options=('!libtool')
-depends=('cracklib')
-optdepends=('python2: Python bindings')
-makedepends=('python2')
-source=(https://fedorahosted.org/releases/l/i/libpwquality/$pkgname-$pkgver.tar.bz2)
-md5sums=('8827419118064539db70090cbed5cb21')
-
-build() {
-    cd "$pkgname-$pkgver"
-    sed -i -e 's/python setup.py/python2 setup.py/' python/Makefile.in
-
-    PYTHON=python2 ./configure --prefix=/usr \
-        --sysconfdir=/etc \
-        --localstatedir=/var \
-        --disable-static
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
deleted file mode 100644
index a014809ff..000000000
--- a/testing/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,711 +0,0 @@
-# $Id: PKGBUILD 169324 2012-10-19 13:28:42Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=3.6.2.2
-pkgver=3.6.2
-pkgrel=3
-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.20.5' 'kdelibs' 'gconf' 'cppunit'
-             'beanshell'  'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-             # 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' 'libxslt' 'librsvg' "icu>=49.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2'
-             '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"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/94e7f271e38c976462558b4278590178-libvisio-0.0.19.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}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	make-pyuno-work-with-system-wide-module-install.diff
-	buildfix.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	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
-	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.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
-	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('ae171ba4633cc72dba4451b1bdd3385e'
-         'cdad0734d247d91a79cb282fd851d2a7'
-         'e9a7e3d35432b72a4603ce094deb6a67'
-         '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         '94e7f271e38c976462558b4278590178'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '6097739c841f671cb21332b9cc593ae7'
-         '0d2dcdfbf28d6208751b33057f5361f0'
-         'ce5a1def34578b75959ac31210f031f6'
-         '185d60944ea767075d27247c3162b3bc'
-         '97bf43dda273d79ff90c848ab53b0e3c'
-         '234e91ac65945ce1ab1e3839780e90f7'
-         'abcb1b0a7deaffe13ab3d7ca70becb49'
-         '72790a4103da259a55cadd66db931d00')
-
-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
-    patch -Np1 -i ${srcdir}/buildfix.diff	# leaves out a broken pdfimport test
-    
-    # fix not upstreamable pyuno paths - patch taken from Debian
-    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-    
-	#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" \
-
-	./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\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libexttextcat \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--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/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-clucene\
-		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
-}
-
-#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=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
- 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'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin')
- 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 .
- 
- # set python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt
- 
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- 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."
- install=libreoffice-draw.install
- 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."
- install=libreoffice-impress.install
- depends=('libreoffice-common')
- optdepends=('glu:             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 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/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 environment path to keep compatibility with openjdk6 and openjdk7
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-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 Application for LibreOffice."
- install=libreoffice-writer.install
- 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.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
-}
-
-package_libreoffice-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/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-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/program/{classes,services}
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-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}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-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}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/testing/libreoffice/PKGBUILD.36 b/testing/libreoffice/PKGBUILD.36
deleted file mode 100644
index 71ee72c1c..000000000
--- a/testing/libreoffice/PKGBUILD.36
+++ /dev/null
@@ -1,715 +0,0 @@
-# $Id: PKGBUILD 160067 2012-05-29 19:20:54Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-pdfimport'
-	'libreoffice-extension-presenter-screen'
-	'libreoffice-extension-presentation-minimizer'
-	'libreoffice-extension-report-builder'
-	'libreoffice-scripting-beanshell'
-	'libreoffice-scripting-javascript'
-	'libreoffice-extension-scripting-python'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
-_LOver=3.6.0.4
-pkgver=3.6.0
-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' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
-             'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene'
-              #'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' 'libxslt' 'librsvg' "icu>=49.1" 
-             '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"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz
-	${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
-	${_additional_source_url}/a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.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}/6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz
-	${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	buildfix.diff
-	libreoffice-common.sh libreoffice-common.csh)
-noextract=(a9a1db27688bad49418667b434d29c1f-libvisio-0.0.18.tar.bz2 
-	18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
-	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
-	6097739c841f671cb21332b9cc593ae7-libexttextcat-3.3.1.tar.bz2
-	0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.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
-	ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip)
-md5sums=('67cf97e86c75363238a371f64ef5f606'
-         '8422b0c4c797abeefed3ee4490586dd2'
-         '6cc8fa86be8c657ba23434c6c8d99416'
-         '18f577b374d60b3c760a3a3350407632'
-         'f02578f5218f217a9f20e9c30e119c6a'
-         'a9a1db27688bad49418667b434d29c1f'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'fdb27bfe2dbe2e7b57ae194d9bf36bab'
-         'ada24d37d8d638b3d8a9985e80bc2978'
-         '2a177023f9ea8ec8bd00837605c5df1b'
-         'a7983f859eafb2677d7ff386a023bc40'
-         '3c219630e4302863a9a83d0efde889db'
-         '2ae988b339daec234019a7066f96733e'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         'af3c3acf618de6108d65fcdc92b492e1'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '0ff7d225d087793c8c2c680d77aac3e7'
-         '6097739c841f671cb21332b9cc593ae7'
-         '0d2dcdfbf28d6208751b33057f5361f0'
-         'ce5a1def34578b75959ac31210f031f6'
-         '185d60944ea767075d27247c3162b3bc'
-         '234e91ac65945ce1ab1e3839780e90f7'
-         'f0e72d0e1bc93a50a3aa9d31350b156c'
-         '867c682b45f477f916786e00c45d7ab7')
-
-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
-    patch -Np1 -i ${srcdir}/buildfix.diff
-    
-	#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" \
-
-	./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\
-		--enable-ext-scripting-beanshell \
-		--enable-ext-scripting-javascript \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--disable-ext-mysql-connector \
-		--with-system-mysql \
-		--enable-librsvg=system \
-		--without-fonts\
-		--without-afms\
-		--without-ppds\
-		--without-system-libwps\
-		--without-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--without-system-libvisio \
-		--without-system-libcmis \
-		--without-system-libexttextcat \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--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/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-clucene\
-		--without-system-servlet-api \
-		--with-java-target-version=1.5 \
-		$EXTRAOPTS
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	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=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
-          'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
-          #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'libcups:          adds printing support'
-             'gconf:            adds additional gnome support'
-             'nss:              adds support for signed files/macros'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'poppler:          for shipped pdfimport extension'
-             'libmythes:        for use in thesaurus'
-             'beanshell:        interactive java -- good for prototyping /macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'clucene:          full-text search engine library 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 .
- 
- # set python-uno PYTHON path
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
- 
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
- 
- # some files would conflict
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
- rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common' 'hsqldb-java')
- optdepends=('libreoffice-postgresql-connector')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # no file-list so far
- install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry
- install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry
- 
- # create directories from *list.txt file
-# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   install -dm755 ${pkgdir}/${directory/\%dir/}
-# done
-# # install files into the pkg from fakeinstall dir
-# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do
-#   dirname=`dirname $file`
-#   # check if directory has been already been created - some are missing like manpages
-#   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-#   # mv file from fakeinstall to pkgdir
-#   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
-# done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- 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."
- install=libreoffice-draw.install
- 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."
- install=libreoffice-impress.install
- 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 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/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 environment path to keep compatibility with openjdk6 and openjdk7
-  #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:"          /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-}
-
-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 Application for LibreOffice."
- install=libreoffice-writer.install
- 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.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
-}
-
-package_libreoffice-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/program/{classes,services}
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/classes/ScriptProviderForBeanShell.jar ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/scriptproviderforbeanshell.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-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/program/{classes,services}
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/{js.jar,ScriptProviderForJavaScript.jar} ${pkgdir}/usr/lib/libreoffice/program/classes/
-	mv ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/xml/scriptproviderforjavascript.rdb ${pkgdir}/usr/lib/libreoffice/program/services/
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python2')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-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}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-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}/libreoffice-core-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/testing/libreoffice/buildfix.diff b/testing/libreoffice/buildfix.diff
deleted file mode 100644
index 327b10bb1..000000000
--- a/testing/libreoffice/buildfix.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- libreoffice-core-3.5.99.1/sdext/Module_sdext.mk	2012-06-07 13:57:10.000000000 +0200
-+++ libreoffice-core-3.5.99.1/sdext/Module_sdext.mk.new	2012-06-09 18:21:03.376024873 +0200
-@@ -49,9 +49,6 @@
-     StaticLibrary_pdfimport_s \
- ))
- 
--$(eval $(call gb_Module_add_check_targets,sdext,\
--    CppunitTest_pdfimport \
--))
- endif
- 
- ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
diff --git a/testing/libreoffice/buildfix_icu49.diff b/testing/libreoffice/buildfix_icu49.diff
deleted file mode 100644
index 7a774dee0..000000000
--- a/testing/libreoffice/buildfix_icu49.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=410307
-
---- i18npool/source/breakiterator/data/char_in.txt
-+++ i18npool/source/breakiterator/data/char_in.txt
-@@ -15,7 +15,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1];
-@@ -72,7 +72,7 @@
- [^$Control $CR $LF] $Extend;
- 
- [^$Control $CR $LF] $SpacingMark;
--$Prepend [^$Control $CR $LF];
-+# $Prepend [^$Control $CR $LF];
- 
- 
- ## -------------------------------------------------
-@@ -94,7 +94,7 @@
- 
- $Extend      [^$Control $CR $LF];
- $SpacingMark [^$Control $CR $LF];
--[^$Control $CR $LF] $Prepend;
-+# [^$Control $CR $LF] $Prepend;
- 
- 
- ## -------------------------------------------------
---- i18npool/source/breakiterator/data/char.txt
-+++ i18npool/source/breakiterator/data/char.txt
-@@ -16,7 +16,7 @@
- $CR          = [\p{Grapheme_Cluster_Break = CR}];
- $LF          = [\p{Grapheme_Cluster_Break = LF}];
- $Control     = [\p{Grapheme_Cluster_Break = Control}];
--$Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
-+# $Prepend     = [\p{Grapheme_Cluster_Break = Prepend}];
- $Extend      = [\p{Grapheme_Cluster_Break = Extend}];
- $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}];
- # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data
diff --git a/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff b/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff
deleted file mode 100644
index ba4850c77..000000000
--- a/testing/libreoffice/fix_broken_hebrew_wordwrapping.diff
+++ /dev/null
@@ -1,360 +0,0 @@
-From 20c24114143d6d38774b56a142fd4ae05094308e Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Sun, 13 May 2012 21:41:30 +0000
-Subject: Resolves: fdo#49849 implement Unicode 6.1 hebrew line breaking rules
-
-i.e.  sync with svn diff -c 31071
-http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr/line.txt
-
-Change-Id: I I I41b3d02f1a0da3b83a9684f29d466660d96254c6
----
-diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
-index 14051d4..ffd590c 100644
---- a/i18npool/qa/cppunit/test_breakiterator.cxx
-+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
-@@ -42,6 +42,7 @@
- #include <unotest/bootstrapfixturebase.hxx>
- 
- #include <rtl/strbuf.hxx>
-+#include <rtl/ustrbuf.hxx>
- 
- #include <string.h>
- 
-@@ -58,6 +59,9 @@ public:
-     void testWeak();
-     void testAsian();
-     void testThai();
-+#if TODO
-+    void testNorthernThai();
-+#endif
- 
-     CPPUNIT_TEST_SUITE(TestBreakIterator);
-     CPPUNIT_TEST(testLineBreaking);
-@@ -71,6 +71,9 @@
-     CPPUNIT_TEST(testWeak);
-     CPPUNIT_TEST(testAsian);
-     CPPUNIT_TEST(testThai);
-+#if TODO
-+    CPPUNIT_TEST(testNorthernThai);
-+#endif
-     CPPUNIT_TEST_SUITE_END();
- 
- private:
-@@ -80,28 +83,46 @@
-     uno::Reference<i18n::XBreakIterator> m_xBreak;
- };
- 
--//See https://bugs.freedesktop.org/show_bug.cgi?id=31271 for motivation
- void TestBreakIterator::testLineBreaking()
- {
--    ::rtl::OUString aTest1(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
--
-     i18n::LineBreakHyphenationOptions aHyphOptions;
-     i18n::LineBreakUserOptions aUserOptions;
-     lang::Locale aLocale;
- 
--    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
--    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
--
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=31271
-     {
--        //Here we want the line break to leave text here) on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+         ::rtl::OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
-+
-+        {
-+            //Here we want the line break to leave text here) on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some tex"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 6);
-+        }
-+
-+        {
-+            //Here we want the line break to leave "here)" on the next line
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        }
-     }
- 
-+    //See https://bugs.freedesktop.org/show_bug.cgi?id=49849
-     {
--        //Here we want the line break to leave "here)" on the next line
--        i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest1, strlen("(some text here"), aLocale, 0, aHyphOptions, aUserOptions);
--        CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == 11);
-+        const sal_Unicode HEBREW1[] = { 0x05DE, 0x05D9, 0x05DC, 0x05D9, 0x5DD };
-+        ::rtl::OUString aWord(HEBREW1, SAL_N_ELEMENTS(HEBREW1));
-+        ::rtl::OUString aTest(rtl::OUStringBuffer(aWord).append(' ').append(aWord).makeStringAndClear());
-+
-+        aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("he"));
-+        aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IL"));
-+
-+        {
-+            //Here we want the line break to happen at the whitespace
-+            i18n::LineBreakResults aResult = m_xBreak->getLineBreak(aTest, aTest.getLength()-1, aLocale, 0, aHyphOptions, aUserOptions);
-+            CPPUNIT_ASSERT_MESSAGE("Expected a break at the the start of the word", aResult.breakIndex == aWord.getLength()+1);
-+        }
-     }
- }
- 
-@@ -295,27 +320,29 @@ void TestBreakIterator::testThai()
-     aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("th"));
-     aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
- 
--    i18n::Boundary aBounds;
--    {
--        const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
-+    const sal_Unicode THAI1[] = { 0x0E01, 0x0E38, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(THAI1, SAL_N_ELEMENTS(THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
-+}
- 
--#ifdef TODO
--    {
--        const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
--        ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
--        aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
--            i18n::WordType::DICTIONARY_WORD, true);
--        CPPUNIT_ASSERT_MESSAGE("Should skip full word",
--            aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
--    }
--#endif
-+#if TODO
-+void TestBreakIterator::testNorthernThai()
-+{
-+    lang::Locale aLocale;
-+    aLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("nod"));
-+    aLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TH"));
-+
-+    const sal_Unicode NORTHERN_THAI1[] = { 0x0E01, 0x0E38, 0x0E4A, 0x0E2B, 0x0E25, 0x0E32, 0x0E1A };
-+    ::rtl::OUString aTest(NORTHERN_THAI1, SAL_N_ELEMENTS(NORTHERN_THAI1));
-+    i18n::Boundary aBounds = m_xBreak->getWordBoundary(aTest, 0, aLocale,
-+        i18n::WordType::DICTIONARY_WORD, true);
-+    CPPUNIT_ASSERT_MESSAGE("Should skip full word",
-+        aBounds.startPos == 0 && aBounds.endPos == aTest.getLength());
- }
-+#endif
- 
- void TestBreakIterator::setUp()
- {
-diff --git a/i18npool/source/breakiterator/data/README b/i18npool/source/breakiterator/data/README
-new file mode 100644
-index 0000000..8d7598d
---- a/dev/null
-+++ b/i18npool/source/breakiterator/data/README
-@@ -0,0 +1,12 @@
-+The originals of these come from svn checkout
-+http://source.icu-project.org/repos/icu/icu/trunk/source/data/brkitr they no
-+longer appear in the icu tarballs, but are in icu's svn
-+
-+At various stages these copies have been customized and are not horribly out of
-+sync. It unclear which diffs from the base versions are deliberate and which
-+are now accidental :-(
-+
-+We need to review the various issues referenced in the commits that caused
-+custimizations and see if they're still relevant or not, write regression tests
-+for them, if any are still relavant then apply the changes back on top of the
-+latest versions.
-diff --git a/i18npool/source/breakiterator/data/line.txt b/i18npool/source/breakiterator/data/line.txt
-index cbabee6..91c8f3d 100644
---- a/i18npool/source/breakiterator/data/line.txt
-+++ b/i18npool/source/breakiterator/data/line.txt
-@@ -61,11 +61,13 @@ $BB = [:LineBreak =  Break_Before:];
- $BK = [:LineBreak =  Mandatory_Break:];
- $B2 = [:LineBreak =  Break_Both:];
- $CB = [:LineBreak =  Contingent_Break:];
-+$CJ = [:LineBreak =  Conditional_Japanese_Starter:];
- $CL = [:LineBreak =  Close_Punctuation:] ;
- $CM = [:LineBreak =  Combining_Mark:];
- $CR = [:LineBreak =  Carriage_Return:];
- $EX = [:LineBreak =  Exclamation:];
- $GL = [:LineBreak =  Glue:];
-+$HL = [:LineBreak =  Hebrew_Letter:];
- $HY = [:LineBreak =  Hyphen:];
- $H2 = [:LineBreak =  H2:];
- $H3 = [:LineBreak =  H3:];
-@@ -77,7 +79,7 @@ $JV = [:LineBreak =  JV:];
- $JT = [:LineBreak =  JT:];
- $LF = [:LineBreak =  Line_Feed:];
- $NL = [:LineBreak =  Next_Line:];
--$NS = [:LineBreak =  Nonstarter:];
-+$NS = [[:LineBreak =  Nonstarter:] $CJ];
- $NU = [:LineBreak =  Numeric:];
- $OP = [[:LineBreak =  Open_Punctuation:] - $DG];
- $PO = [:LineBreak =  Postfix_Numeric:];
-@@ -118,6 +120,7 @@ $B2cm = $B2 $CM*;
- $CLcm = $CL $CM*;
- $EXcm = $EX $CM*;
- $GLcm = $GL $CM*;
-+$HLcm = $HL $CM*;
- $HYcm = $HY $CM*;
- $H2cm = $H2 $CM*;
- $H3cm = $H3 $CM*;
-@@ -150,6 +153,7 @@ $B2 $CM+;
- $CL $CM+;
- $EX $CM+;
- $GL $CM+;
-+$HL $CM+;
- $HY $CM+;
- $H2 $CM+;
- $H3 $CM+;
-@@ -186,7 +190,7 @@ $CANT_CM = [ $SP $BK $CR $LF $NL $ZW $CM];       # Bases that can't take CMs
- #            so for this one case we need to manually list out longer sequences.
- #
- $AL_FOLLOW_NOCM = [$BK $CR $LF $NL $ZW $SP];
--$AL_FOLLOW_CM   = [$CL $EX $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
-+$AL_FOLLOW_CM   = [$CL $EX $HL $IS $SY $WJ $GL $QU $BA $HY $NS $IN $NU $ALPlus $OP];
- $AL_FOLLOW      = [$AL_FOLLOW_NOCM $AL_FOLLOW_CM];
- 
- 
-@@ -320,8 +324,13 @@ $LB20NonBreaks $CM* ($BAcm | $HYcm | $NScm);
- $BBcm [^$CB];                                  #  $BB  x
- $BBcm $LB20NonBreaks $CM*;
- 
-+# LB 21a Don't break after Hebrew + Hyphen
-+#   HL (HY | BA) x
-+#  
-+$HLcm ($HYcm | $BAcm) [^$CB]?;
-+
- # LB 22
--$ALcm    $INcm;
-+($ALcm | $HLcm) $INcm;
- $CM+     $INcm;     #  by rule 10, any otherwise unattached CM behaves as AL
- $IDcm    $INcm;
- $INcm    $INcm;
-@@ -331,16 +340,18 @@ $NUcm    $INcm;
- # $LB 23
- $IDcm  $POcm;
- $ALcm  $NUcm;       # includes $LB19
-+$HLcm  $NUcm;
- $CM+   $NUcm;       # Rule 10, any otherwise unattached CM behaves as AL
- $NUcm  $ALcm;
-+$NUcm  $HLcm;
- 
- #
- # LB 24
- #
- $PRcm $IDcm;
- $ALcm $PRcm;
--$PRcm $ALcm;
--$POcm $ALcm;
-+$PRcm ($ALcm | $HLcm);
-+$POcm ($ALcm | $HLcm);
- 
- #
- # LB 25   Numbers.
-@@ -361,8 +372,8 @@ $PRcm ($JLcm | $JVcm | $JTcm | $H2cm | $H3cm);
- 
- # LB 28   Do not break between alphabetics
- #
--$ALcm $ALcm;
--$CM+ $ALcm;      # The $CM+ is from rule 10, and unattached CM is treated as AL
-+($ALcm | $HLcm) ($ALcm | $HLcm);
-+$CM+ ($ALcm | $HLcm);      # The $CM+ is from rule 10, an unattached CM is treated as AL
- 
- # LB 29
- $IScm ($ALcm | $NUcm);
-@@ -371,11 +382,9 @@ $IScm ($ALcm | $NUcm);
- # Rule 30   Do not break between letters, numbers or ordinary symbols
- #           and opening or closing punctuation
- #
--($ALcm | $NUcm) $OPcm;
-+($ALcm | $HLcm | $NUcm) $OPcm;
- $CM+ $OPcm;
--$CLcm ($ALcm | $NUcm);
--
--
-+$CLcm ($ALcm | $HLcm | $NUcm);
- 
- #
- #  Reverse Rules.
-@@ -391,6 +400,7 @@ $CM+ $B2;
- $CM+ $CL;
- $CM+ $EX;
- $CM+ $GL;
-+$CM+ $HL;
- $CM+ $HY;
- $CM+ $H2;
- $CM+ $H3;
-@@ -544,24 +554,25 @@ $CM* ($BA | $HY | $NS) $CM* [$LB20NonBreaks-$CM];     #  . x (BA | HY | NS)
- $CM* [$LB20NonBreaks-$CM] $CM* $BB;                   #  BB x .
- [^$CB] $CM* $BB;                                      # 
- 
--
-+# LB21a
-+[^$CB] $CM* ($HY | $BA) $CM* $HL;
- 
- # LB 22
--$CM* $IN $CM* $ALPlus;
-+$CM* $IN $CM* ($ALPlus | $HL);
- $CM* $IN $CM* $ID;
- $CM* $IN $CM* $IN;
- $CM* $IN $CM* $NU;
- 
- # LB 23
- $CM* $PO $CM* $ID;
--$CM* $NU $CM* $ALPlus;
--$CM* $ALPlus $CM* $NU;
-+$CM* $NU $CM* ($ALPlus | $HL);
-+$CM* ($ALPlus | $HL) $CM* $NU;
- 
- # LB 24
- $CM* $ID $CM* $PR;
- $CM* $PR $CM* $ALPlus;
--$CM* $ALPlus $CM* $PR;
--$CM* $ALPlus $CM* $PO;
-+$CM* ($ALPlus | $HL) $CM* $PR;
-+$CM* ($ALPlus | $HL) $CM* $PO;
- 
- $CM* $ALPlus $CM* ($IS | $SY | $HY)+ / $SP;
- $CM* $NU+ $CM* $HY+ / $SP;
-@@ -580,15 +591,14 @@ $CM* $PO $CM* ($H3 | $H2 | $JT | $JV | $JL);
- $CM* ($H3 | $H2 | $JT | $JV | $JL) $CM* $PR;
- 
- # LB 28
--$CM* $ALPlus $CM* $ALPlus;
--
-+$CM* ($ALPlus | $HL) $CM* ($ALPlus | $HL);
- 
- # LB 29
- $CM* ($NU | $ALPlus) $CM* $IS+ [^$SP];
- 
- # LB 30
--$CM* $OP $CM* ($NU | $ALPlus);
--$CM* ($NU | $ALPlus) $CM* ($CL | $SY)+ [^$SP];
-+$CM* $OP $CM* ($ALPlus | $HL | $NU);
-+$CM* ($ALPlus | $HL | $NU) $CM* ($CL | $SY)+ [^$SP];
- 
- 
- ## -------------------------------------------------
-@@ -609,6 +619,9 @@ $SP+ $CM* $QU;
- $SP+ $CM* $CL;
- $SP+ $CM* $B2;
- 
-+# LB 21
-+$CM* ($HY | $BA) $CM* $HL;
-+
- # LB 18
- ($CM* ($IS | $SY))+ $CM* $NU;
- $CL $CM* ($NU | $IS | $SY);
-@@ -629,6 +642,6 @@ $dictionary $dictionary;
- #  turn off rule chaining.  We don't want to move more
- #  than necessary.
- #
--[$CM $OP $QU $CL $B2 $PR $HY $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $dictionary];
-+[$CM $OP $QU $CL $B2 $PR $HY $BA $SP $dictionary]+ [^$CM $OP $QU $CL $B2 $PR $HY $BA $dictionary];
- $dictionary $dictionary;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/libreoffice/git_fixes.diff b/testing/libreoffice/git_fixes.diff
deleted file mode 100644
index a4cd891cb..000000000
--- a/testing/libreoffice/git_fixes.diff
+++ /dev/null
@@ -1,743 +0,0 @@
-From 427529801dee122250e44d2311b34651db92bbdb Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Tue, 21 Aug 2012 16:55:11 +0000
-Subject: Typo
-
-Change-Id: I41fd1463b6432818ee36e7f90e920a5fd98c7106
-(cherry picked from commit 1316cfe8a72f7c7bc2f5ad7644a2d4c54b77fc8b)
-
-Signed-off-by: Eike Rathke <erack@redhat.com>
----
-diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
-index d929787..55ebaca 100644
---- a/desktop/source/app/app.cxx
-+++ b/desktop/source/app/app.cxx
-@@ -194,7 +194,7 @@ void removeTree(OUString const & url) {
-     osl::FileBase::RC rc = osl::Directory::remove(url);
-     SAL_WARN_IF(
-         rc != osl::FileBase::E_None, "desktop",
--        "cannot remove directory " << url << ": " +rc);
-+        "cannot remove directory " << url << ": " << +rc);
-         // at least on Windows XP removing some existing directories fails with
-         // osl::FileBase::E_ACCESS because they are read-only; but keeping those
-         // directories around should be harmless once they are empty
---
-cgit v0.9.0.2-2-gbebe
-From b4f8acb41165a28b2db47acd3c6b624a4c507c54 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Fri, 24 Aug 2012 14:06:15 +0000
-Subject: Fix removeRdbFiles (caused extension update to fail)
-
-removeRdbFiles suffered from a confusion that ImplementationInfo.uri denotes the
-corresponding component (.so, .jar, etc.), but not the .rdb file.  So removing
-an .rdb file silently failed to remove the corresponding implementations, so re-
-installing a similar enough .rdb (as typically happens during extension update)
-would fail due to duplicate implementation names.
-
-Change-Id: I25d4ff72656c99a3af509eef09e89c18cfd0aabe
-Reviewed-on: https://gerrit.libreoffice.org/476
-Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
----
-diff --git a/cppuhelper/source/defaultbootstrap.cxx b/cppuhelper/source/defaultbootstrap.cxx
-index c3bdba3..7fd1e4a 100644
---- a/cppuhelper/source/defaultbootstrap.cxx
-+++ b/cppuhelper/source/defaultbootstrap.cxx
-@@ -130,9 +130,10 @@ struct ImplementationInfo: private boost::noncopyable {
-         rtl::OUString const & theName, rtl::OUString const & theLoader,
-         rtl::OUString const & theUri, rtl::OUString const & thePrefix,
-         css::uno::Reference< css::uno::XComponentContext > const &
--            theAlienContext):
-+            theAlienContext,
-+        rtl::OUString const & theRdbFile):
-         name(theName), loader(theLoader), uri(theUri), prefix(thePrefix),
--        alienContext(theAlienContext)
-+        alienContext(theAlienContext), rdbFile(theRdbFile)
-     {}
- 
-     explicit ImplementationInfo(rtl::OUString const & theName): name(theName) {}
-@@ -142,6 +143,7 @@ struct ImplementationInfo: private boost::noncopyable {
-     rtl::OUString const uri;
-     rtl::OUString const prefix;
-     css::uno::Reference< css::uno::XComponentContext > const alienContext;
-+    rtl::OUString const rdbFile;
-     std::vector< rtl::OUString > services;
-     std::vector< rtl::OUString > singletons;
- };
-@@ -149,12 +151,12 @@ struct ImplementationInfo: private boost::noncopyable {
- struct Implementation: private boost::noncopyable {
-     Implementation(
-         rtl::OUString const & name, rtl::OUString const & loader,
--        rtl::OUString const & uri,
--        rtl::OUString const & prefix = rtl::OUString(),
--        css::uno::Reference< css::uno::XComponentContext > const &
--            alienContext
--                = css::uno::Reference< css::uno::XComponentContext >()):
--        info(new ImplementationInfo(name, loader, uri, prefix, alienContext)),
-+        rtl::OUString const & uri, rtl::OUString const & prefix,
-+        css::uno::Reference< css::uno::XComponentContext > const & alienContext,
-+        rtl::OUString const & rdbFile):
-+        info(
-+            new ImplementationInfo(
-+                name, loader, uri, prefix, alienContext, rdbFile)),
-         loaded(false)
-     {}
- 
-@@ -466,7 +468,7 @@ void Parser::handleImplementation() {
-     implementation_.reset(
-         new Implementation(
-             attrImplementation_, attrLoader_, attrUri_, attrPrefix_,
--            alienContext_));
-+            alienContext_, reader_.getUrl()));
-     if (!data_->namedImplementations.insert(
-             NamedImplementations::value_type(
-                 attrImplementation_, implementation_)).
-@@ -1502,7 +1504,9 @@ bool ServiceManager::readLegacyRdbFile(rtl::OUString const & uri) {
-         boost::shared_ptr< Implementation > impl(
-             new Implementation(
-                 name, readLegacyRdbString(uri, implKey, "UNO/ACTIVATOR"),
--                readLegacyRdbString(uri, implKey, "UNO/LOCATION")));
-+                readLegacyRdbString(uri, implKey, "UNO/LOCATION"),
-+                rtl::OUString(),
-+                css::uno::Reference< css::uno::XComponentContext >(), uri));
-         if (!data_.namedImplementations.insert(
-                 NamedImplementations::value_type(name, impl)).
-             second)
-@@ -1744,7 +1748,7 @@ void ServiceManager::removeRdbFiles(std::vector< rtl::OUString > const & uris) {
-                  j != data_.namedImplementations.end();)
-             {
-                 assert(j->second.get() != 0);
--                if (j->second->info->uri == *i) {
-+                if (j->second->info->rdbFile == *i) {
-                     clear.push_back(j->second);
-                     //TODO: The below leaves data_ in an inconsistent state upon
-                     // exceptions:
---
-cgit v0.9.0.2-2-gbebe
-From 6d261e7aac12a876acb6496085e5329632595d39 Mon Sep 17 00:00:00 2001
-From: Stephan Bergmann <sbergman@redhat.com>
-Date: Fri, 24 Aug 2012 14:45:20 +0000
-Subject: fdo#53968 etc.: Fix more "doesn't start after upgrade" problems
-
-* fdo#53968 revealed that multiple soffice.bin instances can run removeTree in
-  parallel.  Therefore, demoted failures from exceptions to SAL_WARNs.  (And
-  keeping fingers crossed.)
-
-* a8cdce148c76c93c5d41820610d6e6ac175e03a7 "fdo#53655: Ignore failure to remove
-  directories (as happens on Windows XP)" was due to a forgotten
-  osl::Directory::close before calling osl::Directory::remove after all.
-
-* UserInstallations have been seen in the wild where no extensions were
-  installed per-user (any longer), but user/uno_packages/cache/registry/
-  com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
-  contained data nevertheless.  To reliably clean out any old junk,
-  refreshBundledExtensionsDir has been extended to cleanExtensionsCache which in
-  tandem with an extended Desktop::SynchronizeExtensionRepositories now cleanly
-  re-installs all bundled, shared, and per-user extensions after a LO upgrade.
-
-Change-Id: Ic6b5b6c1945d76eb3a65b6cd4512a657b7a835a0
-Reviewed-on: https://gerrit.libreoffice.org/477
-Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
-Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
----
-diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
-index 25b6352..c830b02 100644
---- a/desktop/inc/app.hxx
-+++ b/desktop/inc/app.hxx
-@@ -203,6 +203,7 @@ class Desktop : public Application
- 
-         sal_Bool                        m_bMinimized;
-         sal_Bool                        m_bInvisible;
-+        bool                            m_bCleanedExtensionCache;
-         bool                            m_bServicesRegistered;
-         sal_uInt16                          m_nAppEvents;
-         BootstrapError                  m_aBootstrapError;
-diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
-index 55ebaca..5fb653b 100644
---- a/desktop/source/app/app.cxx
-+++ b/desktop/source/app/app.cxx
-@@ -147,77 +147,81 @@ namespace {
- 
- void removeTree(OUString const & url) {
-     osl::Directory dir(url);
--    switch (dir.open()) {
-+    osl::FileBase::RC rc = dir.open();
-+    switch (rc) {
-     case osl::FileBase::E_None:
-         break;
-     case osl::FileBase::E_NOENT:
-         return; //TODO: SAL_WARN if recursive
-     default:
--        throw css::uno::RuntimeException(
--            "cannot open directory " + url,
--            css::uno::Reference< css::uno::XInterface >());
-+        SAL_WARN("desktop", "cannot open directory " << url << ": " << +rc);
-+        return;
-     }
-     for (;;) {
-         osl::DirectoryItem i;
--        osl::FileBase::RC rc = dir.getNextItem(i, SAL_MAX_UINT32);
-+        rc = dir.getNextItem(i, SAL_MAX_UINT32);
-         if (rc == osl::FileBase::E_NOENT) {
-             break;
-         }
-         if (rc != osl::FileBase::E_None) {
--            throw css::uno::RuntimeException(
--                ("cannot iterate directory " + url + ": "
--                 + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop","cannot iterate directory " << url << ": " << +rc);
-+            break;
-         }
-         osl::FileStatus stat(
-             osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName |
-             osl_FileStatus_Mask_FileURL);
-         rc = i.getFileStatus(stat);
-         if (rc != osl::FileBase::E_None) {
--            throw css::uno::RuntimeException(
--                ("cannot stat in directory " + url + ": "
--                 + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop", "cannot stat in directory " << url << ": " << +rc);
-+            continue;
-         }
-         if (stat.getFileType() == osl::FileStatus::Directory) { //TODO: symlinks
-             removeTree(stat.getFileURL());
-         } else {
-             rc = osl::File::remove(stat.getFileURL());
--            if (rc != osl::FileBase::E_None) {
--                throw css::uno::RuntimeException(
--                    ("cannot remove file " + stat.getFileURL() + ": "
--                     + OUString::valueOf(static_cast< sal_Int32 >(rc))),
--                    css::uno::Reference< css::uno::XInterface >());
--            }
-+            SAL_WARN_IF(
-+                rc != osl::FileBase::E_None, "desktop",
-+                "cannot remove file " << stat.getFileURL() << ": " << +rc);
-         }
-     }
--    osl::FileBase::RC rc = osl::Directory::remove(url);
-+    if (dir.isOpen()) {
-+        rc = dir.close();
-+        SAL_WARN_IF(
-+            rc != osl::FileBase::E_None, "desktop",
-+            "cannot close directory " << url << ": " << +rc);
-+    }
-+    rc = osl::Directory::remove(url);
-     SAL_WARN_IF(
-         rc != osl::FileBase::E_None, "desktop",
-         "cannot remove directory " << url << ": " << +rc);
--        // at least on Windows XP removing some existing directories fails with
--        // osl::FileBase::E_ACCESS because they are read-only; but keeping those
--        // directories around should be harmless once they are empty
- }
- 
--// Remove any existing UserInstallation's user/extensions/bundled cache
--// remaining from old installations.  Apparently due to the old
--// share/prereg/bundled mechanism (disabled since
--// 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
--// share/prereg/bundled to avoid startup crashes"), that cache could contain
--// corrupted information (like a UNO component registered twice, which got
--// changed from active to passive registration in one LO version, but the
--// version of the corresponding bundled extension only incremented in a later LO
--// version).  At least in theory, this function could be removed again once no
--// UserInstallation can be poisoned by that old share/prereg/bundled mechanism
--// any more.  (But then Desktop::SynchronizeExtensionRepositories might need to
--// be revisited, see 2d2b19dea1ab401b1b4971ff5b12b87bb11fd666 "Force
--// ExtensionManager resync when the implementation changes" which effectively
--// got reverted again now.  Now, a mismatch between a UserInstallation's
--// user/extensions/bundled and an installation's share/extensions will always be
--// detected here and lead to a removal of user/extensions/bundled, so that
--// Desktop::SynchronizeExtensionRepositories will then definitely resync
--// share/extensions.)
-+// Remove any existing UserInstallation's extensions cache data remaining from
-+// old installations.  This addresses at least two problems:
-+//
-+// For one, apparently due to the old share/prereg/bundled mechanism (disabled
-+// since 5c47e5f63a79a9e72ec4a100786b1bbf65137ed4 "fdo#51252 Disable copying
-+// share/prereg/bundled to avoid startup crashes"), the user/extensions/bundled
-+// cache could contain corrupted information (like a UNO component registered
-+// twice, which got changed from active to passive registration in one LO
-+// version, but the version of the corresponding bundled extension only
-+// incremented in a later LO version).
-+//
-+// For another, UserInstallations have been seen in the wild where no extensions
-+// were installed per-user (any longer), but user/uno_packages/cache/registry/
-+// com.sun.star.comp.deployment.component.PackageRegistryBackend/*.rdb files
-+// contained data nevertheless.
-+//
-+// When a LO upgrade is detected (i.e., no/ user/extensions/bundled/buildid or
-+// one containing an old build ID), then user/extensions/bundled,
-+// user/extensions/shared, and user/uno_packages/cache/registry/
-+// com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc are
-+// removed.  That should prevent any problems starting the service manager due
-+// to old junk.  Later on in Desktop::SynchronizeExtensionRepositories, the
-+// removed cache data is recreated.
-+//
- // As a special case, if you create a UserInstallation with LO >= 3.6.1, then
- // run an old LO <= 3.5.x using share/prereg/bundled on the same
- // UserInstallation (so that it partially overwrites user/extensions/bundled,
-@@ -230,33 +234,50 @@ void removeTree(OUString const & url) {
- // <= 3.5.x messed with user/extensions/bundled in the meantime, then it would
- // have rewritten the unorc (dropping the token), and LO >= 3.6.1 can detect
- // that.
--void refreshBundledExtensionsDir() {
-+//
-+// Multiple instances of soffice.bin can execute this code in parallel for a
-+// single UserInstallation, as it is called before OfficeIPCThread is set up.
-+// Therefore, any errors here only lead to SAL_WARNs.
-+//
-+// At least in theory, this function could be removed again once no
-+// UserInstallation can be poisoned by old junk any more.
-+bool cleanExtensionCache() {
-     OUString buildId(
-         "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}");
-     rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure
--    OUString dir("$BUNDLED_EXTENSIONS_USER");
--    rtl::Bootstrap::expandMacros(dir); //TODO: detect failure
--    OUString url(dir + "/buildid");
--    OUString nonPrereg(
--        "${$BUNDLED_EXTENSIONS_USER/registry/"
--        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc:"
--        "LIBO_NON_PREREG_BUNDLED_EXTENSIONS}");
--    rtl::Bootstrap::expandMacros(nonPrereg);
--    if (nonPrereg == "TRUE") {
--        osl::File f(url);
--        switch (f.open(osl_File_OpenFlag_Read)) {
-+    OUString extDir(
-+        "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap")
-+        ":UserInstallation}/user/extensions");
-+    rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure
-+    OUString bundledDir = extDir + "/bundled";
-+    OUString buildIdFile(bundledDir + "/buildid");
-+    OUString bundledRcFile(
-+        "$BUNDLED_EXTENSIONS_USER/registry/"
-+        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc");
-+    rtl::Bootstrap::expandMacros(bundledRcFile); //TODO: detect failure
-+    rtl::Bootstrap bundledRc(bundledRcFile);
-+    OUString nonPrereg;
-+    if (bundledRc.getHandle() == 0
-+        || (bundledRc.getFrom("LIBO_NON_PREREG_BUNDLED_EXTENSIONS", nonPrereg)
-+            && nonPrereg == "TRUE"))
-+    {
-+        osl::File f(buildIdFile);
-+        osl::FileBase::RC rc = f.open(osl_File_OpenFlag_Read);
-+        switch (rc) {
-         case osl::FileBase::E_None:
-             {
-                 rtl::ByteSequence s1;
--                osl::FileBase::RC rc = f.readLine(s1);
--                if (f.close() != osl::FileBase::E_None) {
--                    SAL_WARN(
--                        "desktop", "cannot close " + url + " after reading");
--                }
-+                rc = f.readLine(s1);
-+                osl::FileBase::RC rc2 = f.close();
-+                SAL_WARN_IF(
-+                    rc2 != osl::FileBase::E_None, "desktop",
-+                    "cannot close " << buildIdFile << " after reading: "
-+                        << +rc2);
-                 if (rc != osl::FileBase::E_None) {
--                    throw css::uno::RuntimeException(
--                        "cannot read from " + url,
--                        css::uno::Reference< css::uno::XInterface >());
-+                    SAL_WARN(
-+                        "desktop",
-+                        "cannot read from " << buildIdFile << ": " << +rc);
-+                    break;
-                 }
-                 OUString s2(
-                     reinterpret_cast< char const * >(s1.getConstArray()),
-@@ -264,53 +285,56 @@ void refreshBundledExtensionsDir() {
-                     // using ISO 8859-1 avoids any and all conversion errors;
-                     // the content should only be a subset of ASCII, anyway
-                 if (s2 == buildId) {
--                    return;
-+                    return false;
-                 }
-                 break;
-             }
-         case osl::FileBase::E_NOENT:
-             break;
-         default:
--            throw css::uno::RuntimeException(
--                "cannot open " + url + " for reading",
--                css::uno::Reference< css::uno::XInterface >());
-+            SAL_WARN(
-+                "desktop",
-+                "cannot open " << buildIdFile << " for reading: " << +rc);
-+            break;
-         }
-     }
--    removeTree(dir);
--    switch (osl::Directory::createPath(dir)) {
--    case osl::FileBase::E_None:
--    case osl::FileBase::E_EXIST:
--        break;
--    default:
--        throw css::uno::RuntimeException(
--            "cannot create path " + dir,
--            css::uno::Reference< css::uno::XInterface >());
--    }
--    osl::File f(url);
--    if (f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create) !=
--        osl::FileBase::E_None)
--    {
--        throw css::uno::RuntimeException(
--            "cannot open " + url + " for writing",
--            css::uno::Reference< css::uno::XInterface >());
-+    removeTree(extDir);
-+    OUString userRcFile(
-+        "$UNO_USER_PACKAGES_CACHE/registry/"
-+        "com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc");
-+    rtl::Bootstrap::expandMacros(userRcFile); //TODO: detect failure
-+    osl::FileBase::RC rc = osl::File::remove(userRcFile);
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None && rc != osl::FileBase::E_NOENT, "desktop",
-+        "cannot remove file " << userRcFile << ": " << +rc);
-+    rc = osl::Directory::createPath(bundledDir);
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None && rc != osl::FileBase::E_EXIST, "desktop",
-+        "cannot create path " << bundledDir << ": " << +rc);
-+    osl::File f(buildIdFile);
-+    rc = f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Create);
-+    if (rc != osl::FileBase::E_None) {
-+        SAL_WARN(
-+            "desktop",
-+            "cannot open " << buildIdFile << " for writing: " << +rc);
-+        return true;
-     }
-     rtl::OString buf(OUStringToOString(buildId, RTL_TEXTENCODING_UTF8));
-         // using UTF-8 avoids almost all conversion errors (and buildid
-         // containing single surrogate halves should never happen, anyway); the
-         // content should only be a subset of ASCII, anyway
--    sal_uInt64 n;
--    if (f.write(buf.getStr(), buf.getLength(), n) != osl::FileBase::E_None
--        || n != static_cast< sal_uInt32 >(buf.getLength()))
--    {
--        throw css::uno::RuntimeException(
--            "cannot write to " + url,
--            css::uno::Reference< css::uno::XInterface >());
--    }
--    if (f.close() != osl::FileBase::E_None) {
--        throw css::uno::RuntimeException(
--            "cannot close " + url + " after writing",
--            css::uno::Reference< css::uno::XInterface >());
--    }
-+    sal_uInt64 n = 0;
-+    rc = f.write(buf.getStr(), buf.getLength(), n);
-+    SAL_WARN_IF(
-+        (rc != osl::FileBase::E_None
-+         || n != static_cast< sal_uInt32 >(buf.getLength())),
-+        "desktop",
-+        "cannot write to " << buildIdFile << ": " << +rc << ", " << n);
-+    rc = f.close();
-+    SAL_WARN_IF(
-+        rc != osl::FileBase::E_None, "desktop",
-+        "cannot close " << buildIdFile << " after writing: " << +rc);
-+    return true;
- }
- 
- }
-@@ -538,7 +562,8 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr )
- }
- 
- Desktop::Desktop()
--: m_bServicesRegistered( false )
-+: m_bCleanedExtensionCache( false )
-+, m_bServicesRegistered( false )
- , m_aBootstrapError( BE_OK )
- {
-     RTL_LOGFILE_TRACE( "desktop (cd100003) ::Desktop::Desktop" );
-@@ -553,7 +578,7 @@ void Desktop::Init()
-     RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" );
-     SetBootstrapStatus(BS_OK);
- 
--    refreshBundledExtensionsDir();
-+    m_bCleanedExtensionCache = cleanExtensionCache();
- 
-     // We need to have service factory before going further, but see fdo#37195.
-     // Doing this will mmap common.rdb, making it not overwritable on windows,
-diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
-index dd01d9b..a6221a9 100644
---- a/desktop/source/app/check_ext_deps.cxx
-+++ b/desktop/source/app/check_ext_deps.cxx
-@@ -51,6 +51,7 @@
- #include "com/sun/star/deployment/ExtensionManager.hpp"
- #include "com/sun/star/deployment/LicenseException.hpp"
- #include "com/sun/star/deployment/ui/LicenseDialog.hpp"
-+#include <com/sun/star/task/OfficeRestartManager.hpp>
- #include <com/sun/star/task/XJob.hpp>
- #include <com/sun/star/task/XJobExecutor.hpp>
- #include <com/sun/star/task/XInteractionApprove.hpp>
-@@ -77,12 +78,15 @@ class SilentCommandEnv
-                                       task::XInteractionHandler,
-                                       ucb::XProgressHandler >
- {
-+    uno::Reference<uno::XComponentContext> mxContext;
-     Desktop    *mpDesktop;
-     sal_Int32   mnLevel;
-     sal_Int32   mnProgress;
- 
- public:
--             SilentCommandEnv( Desktop* pDesktop );
-+    SilentCommandEnv(
-+        uno::Reference<uno::XComponentContext> const & xContext,
-+        Desktop* pDesktop );
-     virtual ~SilentCommandEnv();
- 
-     // XCommandEnvironment
-@@ -105,12 +109,14 @@ public:
- };
- 
- //-----------------------------------------------------------------------------
--SilentCommandEnv::SilentCommandEnv( Desktop* pDesktop )
--{
--    mpDesktop = pDesktop;
--    mnLevel = 0;
--    mnProgress = 25;
--}
-+SilentCommandEnv::SilentCommandEnv(
-+    uno::Reference<uno::XComponentContext> const & xContext,
-+    Desktop* pDesktop ):
-+    mxContext( xContext ),
-+    mpDesktop( pDesktop ),
-+    mnLevel( 0 ),
-+    mnProgress( 25 )
-+{}
- 
- //-----------------------------------------------------------------------------
- SilentCommandEnv::~SilentCommandEnv()
-@@ -144,10 +150,9 @@ void SilentCommandEnv::handle( Reference< task::XInteractionRequest> const & xRe
- 
-     if ( request >>= licExc )
-     {
--        uno::Reference< uno::XComponentContext > xContext = comphelper_getProcessComponentContext();
-         uno::Reference< ui::dialogs::XExecutableDialog > xDialog(
-             deployment::ui::LicenseDialog::create(
--            xContext, VCLUnoHelper::GetInterface( NULL ),
-+            mxContext, VCLUnoHelper::GetInterface( NULL ),
-             licExc.ExtensionName, licExc.Text ) );
-         sal_Int16 res = xDialog->execute();
-         if ( res == ui::dialogs::ExecutableDialogResults::CANCEL )
-@@ -416,7 +421,20 @@ sal_Bool Desktop::CheckExtensionDependencies()
- void Desktop::SynchronizeExtensionRepositories()
- {
-     RTL_LOGFILE_CONTEXT(aLog,"desktop (jl) ::Desktop::SynchronizeExtensionRepositories");
--    dp_misc::syncRepositories( new SilentCommandEnv( this ) );
-+    uno::Reference< uno::XComponentContext > context(
-+        comphelper_getProcessComponentContext());
-+    uno::Reference< ucb::XCommandEnvironment > silent(
-+        new SilentCommandEnv(context, this));
-+    if (m_bCleanedExtensionCache) {
-+        deployment::ExtensionManager::get(context)->reinstallDeployedExtensions(
-+            true, "user", Reference<task::XAbortChannel>(), silent);
-+        task::OfficeRestartManager::get(context)->requestRestart(
-+            silent->getInteractionHandler());
-+    } else {
-+        // reinstallDeployedExtensions above already calls syncRepositories
-+        // internally:
-+        dp_misc::syncRepositories(m_bCleanedExtensionCache, silent);
-+    }
- }
- 
- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
-diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-index 29ded17..7795e309 100644
---- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
-@@ -1124,7 +1124,7 @@ void ExtensionCmdQueue::acceptLicense( const uno::Reference< deployment::XPackag
- 
- void ExtensionCmdQueue::syncRepositories( const uno::Reference< uno::XComponentContext > &xContext )
- {
--    dp_misc::syncRepositories( new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) );
-+    dp_misc::syncRepositories( false, new ProgressCmdEnv( xContext, NULL, OUSTR("Extension Manager") ) );
- }
- 
- void ExtensionCmdQueue::stop()
-diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h
-index 29fd140..06e67aa 100644
---- a/desktop/source/deployment/inc/dp_misc.h
-+++ b/desktop/source/deployment/inc/dp_misc.h
-@@ -154,8 +154,10 @@ void TRACE(::rtl::OUString const & sText);
-     recently added or removed.
- */
- DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
--void syncRepositories(::com::sun::star::uno::Reference<
--                      ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
-+void syncRepositories(
-+    bool force,
-+    ::com::sun::star::uno::Reference<
-+        ::com::sun::star::ucb::XCommandEnvironment> const & xCmdEnv);
- 
- }
- 
-diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
-index 68403f1..b3c21b4 100644
---- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
-+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
-@@ -1205,9 +1205,10 @@ uno::Sequence< uno::Sequence<Reference<deploy::XPackage> > >
-    }
- }
- 
--//only to be called from unopkg!!!
-+// Only to be called from unopkg or soffice bootstrap (with force=true in the
-+// latter case):
- void ExtensionManager::reinstallDeployedExtensions(
--    OUString const & repository,
-+    sal_Bool force, OUString const & repository,
-     Reference<task::XAbortChannel> const & xAbortChannel,
-     Reference<ucb::XCommandEnvironment> const & xCmdEnv )
-     throw (deploy::DeploymentException,
-@@ -1220,10 +1221,11 @@ void ExtensionManager::reinstallDeployedExtensions(
-             xPackageManager = getPackageManager(repository);
- 
-         ::osl::MutexGuard guard(getMutex());
--        xPackageManager->reinstallDeployedPackages(xAbortChannel, xCmdEnv);
-+        xPackageManager->reinstallDeployedPackages(
-+            force, xAbortChannel, xCmdEnv);
-         //We must sync here, otherwise we will get exceptions when extensions
-         //are removed.
--        dp_misc::syncRepositories(xCmdEnv);
-+        dp_misc::syncRepositories(force, xCmdEnv);
-         const uno::Sequence< Reference<deploy::XPackage> > extensions(
-             xPackageManager->getDeployedPackages(xAbortChannel, xCmdEnv));
- 
-diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
-index 22e2d41..ec1edbc 100644
---- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
-+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
-@@ -182,7 +182,7 @@ public:
-             css::uno::RuntimeException);
- 
-     virtual void SAL_CALL reinstallDeployedExtensions(
--        ::rtl::OUString const & repository,
-+        sal_Bool force, ::rtl::OUString const & repository,
-         css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel,
-         css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv )
-         throw (
-diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
-index 8a08320c..8e3d109 100644
---- a/desktop/source/deployment/manager/dp_manager.cxx
-+++ b/desktop/source/deployment/manager/dp_manager.cxx
-@@ -1164,14 +1164,14 @@ PackageManagerImpl::getDeployedPackages(
- //ToDo: the function must not call registerPackage, do this in
- //XExtensionManager.reinstallDeployedExtensions
- void PackageManagerImpl::reinstallDeployedPackages(
--    Reference<task::XAbortChannel> const &  /*xAbortChannel*/,
-+    sal_Bool force, Reference<task::XAbortChannel> const &  /*xAbortChannel*/,
-     Reference<XCommandEnvironment> const & xCmdEnv_ )
-     throw (deployment::DeploymentException,
-            CommandFailedException, CommandAbortedException,
-            lang::IllegalArgumentException, RuntimeException)
- {
-     check();
--    if (office_is_running())
-+    if (!force && office_is_running())
-         throw RuntimeException(
-             OUSTR("You must close any running Office process before "
-                   "reinstalling packages!"), static_cast<OWeakObject *>(this) );
-diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
-index 3b335d7..3c7f8d9 100644
---- a/desktop/source/deployment/manager/dp_manager.h
-+++ b/desktop/source/deployment/manager/dp_manager.h
-@@ -236,6 +236,7 @@ public:
-                css::uno::RuntimeException);
- 
-     virtual void SAL_CALL reinstallDeployedPackages(
-+        sal_Bool force,
-         css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
-         css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv )
-         throw (css::deployment::DeploymentException,
-diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
-index b225db6..9ed579f 100644
---- a/desktop/source/deployment/misc/dp_misc.cxx
-+++ b/desktop/source/deployment/misc/dp_misc.cxx
-@@ -591,7 +591,7 @@ void TRACE(::rtl::OString const & sText)
- }
- 
- void syncRepositories(
--    Reference<ucb::XCommandEnvironment> const & xCmdEnv)
-+    bool force, Reference<ucb::XCommandEnvironment> const & xCmdEnv)
- {
-     OUString sDisable;
-     ::rtl::Bootstrap::get( OUSTR( "DISABLE_EXTENSION_SYNCHRONIZATION" ), sDisable, OUString() );
-@@ -602,7 +602,8 @@ void syncRepositories(
-     //synchronize shared before bundled otherewise there are
-     //more revoke and registration calls.
-     sal_Bool bModified = false;
--    if (needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
-+    if (force
-+        || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("shared")))
-         || needToSyncRepostitory(OUString(RTL_CONSTASCII_USTRINGPARAM("bundled"))))
-     {
-         xExtensionManager =
-diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-index 43faed5..ef16ea1 100644
---- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
-@@ -392,7 +392,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
-         //synching is done in XExtensionManager.reinstall
-         if (!subcmd_gui && ! subCommand.equals(OUSTR("reinstall"))
-             && ! dp_misc::office_is_running())
--            dp_misc::syncRepositories(xCmdEnv);
-+            dp_misc::syncRepositories(false, xCmdEnv);
- 
-         if ( subcmd_add || subCommand == "remove" )
-         {
-@@ -436,7 +436,7 @@ extern "C" DESKTOP_DLLPUBLIC int unopkg_main()
-                      RTL_CONSTASCII_STRINGPARAM("reinstall") ))
-         {
-             xExtensionManager->reinstallDeployedExtensions(
--                repository, Reference<task::XAbortChannel>(), xCmdEnv);
-+                false, repository, Reference<task::XAbortChannel>(), xCmdEnv);
-         }
-         else if ( subCommand == "list" )
-         {
-diff --git a/offapi/com/sun/star/deployment/XExtensionManager.idl b/offapi/com/sun/star/deployment/XExtensionManager.idl
-index b68ab20..2912e45 100644
---- a/offapi/com/sun/star/deployment/XExtensionManager.idl
-+++ b/offapi/com/sun/star/deployment/XExtensionManager.idl
-@@ -260,6 +260,9 @@ interface XExtensionManager
-         <p>
-         Please use this in case of suspected cache inconsistencies only.
-         </p>
-+        @param force
-+               set to true when called during soffice bootstrap after cleaning
-+               old extension cache
-         @param repositroy
-                the name of the repository
-         @param xAbortChannel
-@@ -268,6 +271,7 @@ interface XExtensionManager
-                command environment for error and progress handling
-     */
-     void reinstallDeployedExtensions(
-+        [in] boolean force,
-         [in] string repository,
-         [in] com::sun::star::task::XAbortChannel xAbortChannel,
-         [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
-diff --git a/offapi/com/sun/star/deployment/XPackageManager.idl b/offapi/com/sun/star/deployment/XPackageManager.idl
-index 12e7e0e..39ff04a 100644
---- a/offapi/com/sun/star/deployment/XPackageManager.idl
-+++ b/offapi/com/sun/star/deployment/XPackageManager.idl
-@@ -225,12 +225,16 @@ interface XPackageManager
-         Please use this in case of suspected cache inconsistencies only.
-         </p>
- 
-+        @param force
-+               set to true when called during soffice bootstrap after cleaning
-+               old extension cache
-         @param xAbortChannel
-                abort channel to asynchronously abort the adding process
-         @param xCmdEnv
-                command environment for error and progress handling
-     */
-     void reinstallDeployedPackages(
-+        [in] boolean force,
-         [in] com::sun::star::task::XAbortChannel xAbortChannel,
-         [in] com::sun::star::ucb::XCommandEnvironment xCmdEnv )
-         raises (DeploymentException,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/libreoffice/libreoffice-base.install b/testing/libreoffice/libreoffice-base.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-base.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/libreoffice-calc.install b/testing/libreoffice/libreoffice-calc.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-calc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/libreoffice-common.csh b/testing/libreoffice/libreoffice-common.csh
deleted file mode 100644
index 5efa39404..000000000
--- a/testing/libreoffice/libreoffice-common.csh
+++ /dev/null
@@ -1,8 +0,0 @@
-#setenv PYTHONPATH ${PYTHONPATH}:/usr/lib/libreoffice/program
-
-# to force a certain look'n feel
-
-#setenv SAL_USE_VCLPLUGIN gen
-#setenv SAL_USE_VCLPLUGIN kde4
-#setenv SAL_USE_VCLPLUGIN gtk
-#setenv SAL_USE_VCLPLUGIN gtk3
diff --git a/testing/libreoffice/libreoffice-common.install b/testing/libreoffice/libreoffice-common.install
deleted file mode 100644
index e66b66f3d..000000000
--- a/testing/libreoffice/libreoffice-common.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-
-echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
-echo "-------------------------------------------------------------------"
-echo "LibreOffice has been split into several packages:"
-echo "- libreoffice-common"
-echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo "                              the LibreOffice APIs and for creating"
-echo "                              extensions (UNO components)."
-echo "-------------------------------------------------------------------"
-echo " * you need to install at least one libreoffice-langpack"
-echo " * you may want to pacman -Ss libreoffice-extensions"
-echo "   to see what additional extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
-         for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-#  post_install $1
-xdg-icon-resource forceupdate --theme hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-  if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
-    # important upgrade notice
-    echo "LibreOffice has been split into several packages:"
-    echo "- libreoffice-common"
-    echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-    echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-    echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-    echo "                              the LibreOffice APIs and for creating"
-    echo "                              extensions (UNO components)."
-    echo "Now you need to install at least one libreoffice-langpack!"
-  fi
-}
-
-post_remove() {
-update-desktop-database -q
-xdg-icon-resource forceupdate --theme hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/testing/libreoffice/libreoffice-common.sh b/testing/libreoffice/libreoffice-common.sh
deleted file mode 100644
index 795867125..000000000
--- a/testing/libreoffice/libreoffice-common.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#export PYTHONPATH="$PYTHONPATH:/usr/lib/libreoffice/program"
-
-# to force a certain look'n feel
-
-#export SAL_USE_VCLPLUGIN=gen
-#export SAL_USE_VCLPLUGIN=kde4
-#export SAL_USE_VCLPLUGIN=gtk
-#export SAL_USE_VCLPLUGIN=gtk3
diff --git a/testing/libreoffice/libreoffice-draw.install b/testing/libreoffice/libreoffice-draw.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-draw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/libreoffice-impress.install b/testing/libreoffice/libreoffice-impress.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-impress.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/libreoffice-writer.install b/testing/libreoffice/libreoffice-writer.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/testing/libreoffice/libreoffice-writer.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
deleted file mode 100644
index e86548136..000000000
--- a/testing/libreoffice/make-pyuno-work-with-system-wide-module-install.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index defd7b2..ea2a809 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index f93ac5e..92a2891 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -26,8 +26,12 @@
- # for a copy of the LGPLv3 License.
- #
- #*************************************************************************
-+import os
- import sys
- 
-+sys.path.append('/usr/lib/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+     os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc"
- import pyuno
- 
- try:
-diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py
-index 610ac5f..df243d0 100755
---- a/scripting/source/pyprov/officehelper.py
-+++ b/scripting/source/pyprov/officehelper.py
-@@ -53,7 +53,7 @@ def bootstrap():
-         if "UNO_PATH" in os.environ:
-             sOffice = os.environ["UNO_PATH"]
-         else:
--            sOffice = "" # lets hope for the best
-+            sOffice = "/usr/lib/libreoffice/program"
-         sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"): 
-             sOffice += ".exe"
diff --git a/testing/librsvg/PKGBUILD b/testing/librsvg/PKGBUILD
deleted file mode 100644
index 5389ec8a3..000000000
--- a/testing/librsvg/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169175 2012-10-18 19:23:45Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=librsvg
-pkgver=2.36.4
-pkgrel=1
-pkgdesc="A SVG viewing library"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection')
-optdepends=('gtk3: for rsvg-view-3'
-            'gtk2: gtk2 SVG engine module')
-options=('!libtool' '!emptydirs')
-url="http://librsvg.sourceforge.net/"
-install=librsvg.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/librsvg/librsvg.install b/testing/librsvg/librsvg.install
deleted file mode 100644
index 8852ebf28..000000000
--- a/testing/librsvg/librsvg.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    gdk-pixbuf-query-loaders --update-cache
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/libsecret/PKGBUILD b/testing/libsecret/PKGBUILD
deleted file mode 100644
index 1ec9f5695..000000000
--- a/testing/libsecret/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 166488 2012-09-08 10:31:44Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=libsecret
-pkgver=0.10
-pkgrel=1
-pkgdesc='library for storing and retrieving passwords and other secrets.'
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="https://live.gnome.org/Libsecret"
-depends=('glib2' 'libgcrypt')
-makedepends=('intltool' 'docbook-xsl')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('4015ac83042fa408bf66ca8526709662d194fe566181db6ab3d86a6ea4ab8880')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libsoup/PKGBUILD b/testing/libsoup/PKGBUILD
deleted file mode 100644
index 084b15b16..000000000
--- a/testing/libsoup/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 169173 2012-10-18 19:23:38Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.40.1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool' '!emptydirs')
-sha256sums=('77a55d57e7e8055acd2f44e0cc889b9ba48052e8b7f07e829157d57417ac650a')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/env python/python2/' libsoup/tld-parser.py
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
-  pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-2.4"
-  rm -rf "$pkgdir/usr/share"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib"
-}
diff --git a/testing/libtool/PKGBUILD b/testing/libtool/PKGBUILD
deleted file mode 100644
index 99f3d8ee4..000000000
--- a/testing/libtool/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168294 2012-10-08 01:42:04Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-# NOTE: requires rebuilt with each new gcc version
-
-pkgname=('libtool' 'libltdl')
-pkgver=2.4.2
-pkgrel=7
-pkgdesc="A generic library support script"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libtool"
-license=('GPL')
-options=('!libtool')
-source=(ftp://ftp.gnu.org/pub/gnu/libtool/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('2ec8997e0c07249eb4cbd072417d70fe'
-         '1e6ba57420c82c663c85e745d11c7eed')
-
-build() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make check
-}
-
-package_libtool() {
-  depends=('sh' "libltdl=$pkgver" 'tar' 'gcc=4.7.2')
-  groups=('base-devel')
-  install=libtool.install
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  
-  make DESTDIR=${pkgdir} install-binSCRIPTS install-man install-info \
-                         install-data-local
-  rm -rf ${pkgdir}/usr/share/libtool/libltdl/
-}
-
-package_libltdl() {
-  pkgdesc="A system independent dlopen wrapper for GNU libtool"
-
-  cd ${srcdir}/${pkgbase}-${pkgver}
-  make DESTDIR=${pkgdir} install-libLTLIBRARIES install-includeHEADERS \
-                         install-ltdlincludeHEADERS install-data-local
-  rm -rf ${pkgdir}/usr/share/{aclocal,libtool/config}
-}
diff --git a/testing/libtool/libtool.install b/testing/libtool/libtool.install
deleted file mode 100644
index 73cf56422..000000000
--- a/testing/libtool/libtool.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libtool.info  libtool.info-1  libtool.info-2)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/libtorrent-rasterbar/PKGBUILD b/testing/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index 1144770d1..000000000
--- a/testing/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163550 2012-07-15 13:17:05Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.16.1
-pkgrel=1
-epoch=1
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'geoip' 'python2')
-makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('798944301ee6ef8e0d8de3d944c59d184ef1a4d3')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \
-      --enable-python-binding \
-      --with-libgeoip=system
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/testing/libusb-compat/PKGBUILD b/testing/libusb-compat/PKGBUILD
deleted file mode 100644
index 3e4235ff4..000000000
--- a/testing/libusb-compat/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 162897 2012-07-03 09:52:18Z tpowa $
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: arjan <arjan@archlinux.org>
-
-pkgname=libusb-compat
-pkgver=0.1.4
-pkgrel=2
-pkgdesc="Library to enable user space application programs to communicate with USB devices"
-arch=('i686' 'x86_64')
-url="http://libusb.sourceforge.net/"
-license=('LGPL')
-depends=('libusb' 'sh')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2"
-        "libusb-0.1-libusbx.patch")   
-md5sums=('2ca521fffadd0c28fdf174e6ec73865b'
-         '1612c3982f307da1332d6db57b16742b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # http://libusb.org/ticket/138 can be removed with libusbx 1.0.13
-  patch -Np0 -i ../libusb-0.1-libusbx.patch
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/libusb-compat/libusb-0.1-libusbx.patch b/testing/libusb-compat/libusb-0.1-libusbx.patch
deleted file mode 100644
index 61563651b..000000000
--- a/testing/libusb-compat/libusb-0.1-libusbx.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/423135
-
---- libusb/core.c
-+++ libusb/core.c
-@@ -32,12 +32,6 @@
- static libusb_context *ctx = NULL;
- static int usb_debug = 0;
- 
--enum usbi_log_level {
--	LOG_LEVEL_DEBUG,
--	LOG_LEVEL_INFO,
--	LOG_LEVEL_WARNING,
--	LOG_LEVEL_ERROR,
--};
- 
- #ifdef ENABLE_LOGGING
- #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt)
diff --git a/testing/libusbx/PKGBUILD b/testing/libusbx/PKGBUILD
deleted file mode 100644
index dd36b151c..000000000
--- a/testing/libusbx/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 167303 2012-09-30 19:31:57Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=libusbx
-pkgver=1.0.14
-pkgrel=1
-depends=('glibc')
-pkgdesc="Library that provides generic access to USB device"
-arch=(i686 x86_64)
-url="http://libusbx.org"
-license=('LGPL')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-options=(!libtool)
-replaces=('libusb1' 'libusb')
-provides=("libusb=$pkgver")
-conflicts=("libusb")
-md5sums=('0a6a75edb4b4eae7dc82c1dd71ddc470')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package () {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libva-driver-intel/PKGBUILD b/testing/libva-driver-intel/PKGBUILD
deleted file mode 100644
index f679e0615..000000000
--- a/testing/libva-driver-intel/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 160980 2012-06-07 20:14:28Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libva-driver-intel
-pkgver=1.0.18
-pkgrel=1
-pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
-arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
-license=('MIT')
-depends=('libva')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
-md5sums=('d8c52f07148dfb2e0407549b90300bc1')
-
-build() {
-  cd intel-driver-$pkgver
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd intel-driver-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libva/PKGBUILD b/testing/libva/PKGBUILD
deleted file mode 100644
index 0e9740e73..000000000
--- a/testing/libva/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 160974 2012-06-07 19:25:27Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgname=libva
-pkgver=1.1.0
-pkgrel=1
-pkgdesc="Video Acceleration (VA) API for Linux"
-arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
-license=('MIT')
-depends=('libegl' 'libgl' 'libdrm' 'libxfixes')
-makedepends=('mesa')
-optdepends=('vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards')
-options=('!libtool')
-install=libva.install
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b22179bd44137e91d5c77a43a0cb8063')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./autogen.sh
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m644 -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/libva/libva.install b/testing/libva/libva.install
deleted file mode 100644
index 4d8b8e24a..000000000
--- a/testing/libva/libva.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_upgrade() { 
-    if  [ "$(vercmp $2 1.0.15-1)" -lt 0 ]; then
-        echo 'Starting with libva version 1.0.15, the intel back-end is now in libva-driver-intel.'
-    fi
-}
diff --git a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch b/testing/libvisual-plugins/02_64-bit_JESS_fix.patch
deleted file mode 100644
index 1d7f99e56..000000000
--- a/testing/libvisual-plugins/02_64-bit_JESS_fix.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c
---- libvisual-plugins-0.4.0/plugins/actor/JESS/renderer.c	2006-02-06 05:47:26.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/renderer.c	2007-07-04 18:12:58.000000000 +1000
-@@ -282,7 +282,7 @@
- 
- void render_deformation(JessPrivate *priv, int defmode)
- {
--	uint32_t bmax;
-+	intptr_t bmax;
- 	uint32_t *tab1 = NULL, *tab2, *tab3, *tab4, i;
- 	uint8_t *pix = priv->pixel, *buf = priv->buffer, *aux;
- 
-@@ -294,7 +294,7 @@
- 		tab2 = priv->table2;
- 		tab3 = priv->table3;
- 		tab4 = priv->table4;
--		bmax = priv->resx * priv->resy + (uint32_t) priv->pixel;
-+		bmax = priv->resx * priv->resy + (intptr_t) priv->pixel;
- 
- 		switch(defmode)
- 		{
-@@ -352,7 +352,7 @@
- 		}
- 		for (i = 0; i < priv->resy * priv->resx; i++)
- 		{
--			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (uint32_t) priv->buffer);
-+			aux  =  (uint8_t *) ((*(tab1) << 2 ) + (intptr_t) priv->buffer);
- 			*(pix++) = *(aux++) ;
- 			*(pix++) = *(aux++);  
- 			*(pix++) = *(aux);  
-@@ -373,7 +373,8 @@
- 	/* j'ai mis pixel par defaut... */
- 
- 	uint8_t *pix = priv->pixel;
--	uint32_t bmax,pitch_4;
-+	intptr_t bmax;
-+	uint32_t pitch_4;
- 	
- 	pix = priv->pixel;
- 	if (priv->pixel == NULL)
-@@ -387,7 +388,7 @@
- 	if (priv->video == 8)
- 	{
- 		if (visual_cpu_get_mmx ()) {
--			bmax = priv->resx * (priv->resy-1) + (uint32_t) priv->pixel;
-+			bmax = priv->resx * (priv->resy-1) + (intptr_t) priv->pixel;
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
- 			__asm __volatile
- 				("\n\t pxor %%mm6, %%mm6"
-@@ -423,7 +424,7 @@
- 	else
- 	{
- 		pitch_4 = priv->pitch+4;
--		bmax = priv->pitch*(priv->resy-1) + (uint32_t) priv->pixel;
-+		bmax = priv->pitch*(priv->resy-1) + (intptr_t) priv->pixel;
- 
- 		if (visual_cpu_get_mmx ()) {
- #if defined(VISUAL_ARCH_X86) || defined(VISUAL_ARCH_X86_64)
diff --git a/testing/libvisual-plugins/03_build_against_gl_fixes.patch b/testing/libvisual-plugins/03_build_against_gl_fixes.patch
deleted file mode 100644
index b21558232..000000000
--- a/testing/libvisual-plugins/03_build_against_gl_fixes.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/bumpscope/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/bumpscope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_bumpscope.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_bumpscope_la_LDFLAGS = -module -avoid-version 
-+actor_bumpscope_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_bumpscope_la_SOURCES = actor_bumpscope.c \
- 			  actor_bumpscope.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/corona/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/corona/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_corona.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CXXFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir)
- 
- actor_corona_la_LDFLAGS = -module -avoid-version
-+actor_corona_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_corona_la_SOURCES = actor_corona.cpp \
- 			  autopal.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/gdkpixbuf/Makefile.am	2006-02-24 00:34:48.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/gdkpixbuf/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_gdkpixbuf.la
- 
--LIBS += $(LIBVISUAL_LIBS) $(GTK_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GTK_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_gdkpixbuf_la_LDFLAGS = -module -avoid-version 
-+actor_gdkpixbuf_la_LIBADD = $(LIBVISUAL_LIBS) $(GTK_LIBS)
- 
- actor_gdkpixbuf_la_SOURCES = actor_gdkpixbuf.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/gstreamer/Makefile.am	2006-02-23 20:03:27.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/gstreamer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,14 +2,13 @@
- 
- actor_plugin_LTLIBRARIES = actor_gstreamer.la
- 
--LIBS += $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS) $(GSTREAMER_CFLAGS)
- 
- INCLUDES = $(all_includes) \
- 	-I$(top_srcdir) 
- 
- actor_gstreamer_la_LDFLAGS = -module -avoid-version 
-+actor_gstreamer_la_LIBADD = $(LIBVISUAL_LIBS) $(GSTREAMER_LIBS)
- 
- actor_gstreamer_la_SOURCES = actor_gstreamer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/infinite/Makefile.am	2006-02-23 20:03:27.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/infinite/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_infinite.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_infinite_la_LDFLAGS = -module -avoid-version 
-+actor_infinite_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_infinite_la_SOURCES = compute.c compute.h \
- 			    display.c display.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/jakdaw/Makefile.am	2006-02-23 20:03:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/jakdaw/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_jakdaw.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_jakdaw_la_LDFLAGS = -module -avoid-version 
-+actor_jakdaw_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_jakdaw_la_SOURCES = actor_jakdaw.c \
- 			  actor_jakdaw.h \
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/JESS/Makefile.am	2006-02-23 20:03:24.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/JESS/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_JESS.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_JESS_la_LDFLAGS = -module -avoid-version
-+actor_JESS_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_JESS_la_SOURCES = analyser.c analyser.h analyser_struct.h\
- 			distorsion.c distorsion.h\
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_analyzer/Makefile.am	2006-02-23 20:03:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_analyzer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,14 +2,13 @@
- 
- actor_plugin_LTLIBRARIES = actor_lv_analyzer.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) \
- 	-I$(top_srcdir) 
- 
- actor_lv_analyzer_la_LDFLAGS = -module -avoid-version 
-+actor_lv_analyzer_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_lv_analyzer_la_SOURCES = actor_lv_analyzer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_gltest/Makefile.am	2006-02-24 22:24:49.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_gltest/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,5 +4,5 @@
- 
- actor_lv_gltest_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
- actor_lv_gltest_la_LDFLAGS = -module -avoid-version 
--actor_lv_gltest_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
-+actor_lv_gltest_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
- actor_lv_gltest_la_SOURCES = actor_lv_gltest.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/lv_scope/Makefile.am	2006-02-23 20:03:29.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/lv_scope/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_lv_scope.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_lv_scope_la_LDFLAGS = -module -avoid-version 
-+actor_lv_scope_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_lv_scope_la_SOURCES = actor_lv_scope.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/madspin/Makefile.am	2006-02-24 22:24:49.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/madspin/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -10,5 +10,5 @@
- 
- actor_madspin_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) -DSTAR_DIR=\""$(imagesdir)/"\"
- actor_madspin_la_LDFLAGS = -module -avoid-version 
--actor_madspin_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
-+actor_madspin_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL 
- actor_madspin_la_SOURCES = madspin.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/nastyfft/Makefile.am	2006-02-24 22:24:50.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/nastyfft/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,5 +4,5 @@
- 
- actor_nastyfft_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
- actor_nastyfft_la_LDFLAGS = -module -avoid-version 
--actor_nastyfft_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
-+actor_nastyfft_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU
- actor_nastyfft_la_SOURCES = actor_nastyfft.c
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/oinksie/Makefile.am	2006-02-23 20:03:31.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/oinksie/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- actor_plugin_LTLIBRARIES = actor_oinksie.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- actor_oinksie_la_LDFLAGS = -module -avoid-version 
-+actor_oinksie_la_LIBADD = $(LIBVISUAL_LIBS)
- 
- actor_oinksie_la_SOURCES = actor_oinksie.c\
- 			   oinksie.c oinksie.h\
-diff -Nur libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am
---- libvisual-plugins-0.4.0/plugins/actor/pseudotoad_flower/Makefile.am	2006-03-09 00:06:58.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/actor/pseudotoad_flower/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -4,7 +4,7 @@
- 
- actor_flower_la_LDFLAGS = -module -avoid-version 
- actor_flower_la_CFLAGS = -I$(top_srcdir) $(LIBVISUAL_CFLAGS) $(X_CFLAGS)
--actor_flower_la_LIBS = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
-+actor_flower_la_LIBADD = $(LIBVISUAL_LIBS) $(X_LIBS) -lGL -lGLU 
- 
- actor_flower_la_SOURCES = \
- 	actor_flower.c \
-diff -Nur libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/alsa/Makefile.am	2006-02-23 20:03:35.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/alsa/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,12 +2,11 @@
- 
- input_plugin_LTLIBRARIES = input_alsa.la
- 
--LIBS += $(ALSA_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(ALSA_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
- 
- input_alsa_la_LDFLAGS = -module -avoid-version 
-+input_alsa_la_LIBADD = $(ALSA_LIBS) $(LIBVISUAL_LIBS)
- 
- input_alsa_la_SOURCES = input_alsa.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/debug/Makefile.am	2006-02-23 20:03:36.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/debug/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- input_plugin_LTLIBRARIES = input_debug.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) -I$(top_builddir)
- 
- input_debug_la_LDFLAGS = -module -avoid-version 
-+input_debug_la_LIBADD = $(LIBVISUAL_LIBS)
- input_debug_la_SOURCES = input_debug.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/esd/Makefile.am	2006-02-23 20:03:37.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/esd/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- input_plugin_LTLIBRARIES = input_esd.la
- 
--LIBS += $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBESD_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir)
- 
- input_esd_la_LDFLAGS = -module -avoid-version 
-+input_esd_la_LIBADD = $(LIBESD_LIBS) $(LIBVISUAL_LIBS)
- input_esd_la_SOURCES = input_esd.c
-diff -Nur libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/jack/Makefile.am	2006-02-23 20:03:37.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/jack/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,13 +2,12 @@
- 
- input_plugin_LTLIBRARIES = input_jack.la
- 
--LIBS += $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBJACK_CFLAGS) $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- input_jack_la_LDFLAGS = -module -avoid-version 
-+input_jack_la_LIBADD = $(LIBJACK_LIBS) $(LIBVISUAL_LIBS)
- 
- input_jack_la_SOURCES = input_jack.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am
---- libvisual-plugins-0.4.0/plugins/input/mplayer/Makefile.am	2006-02-23 20:03:38.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/input/mplayer/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,12 +2,11 @@
- 
- input_plugin_LTLIBRARIES = input_mplayer.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- input_mplayer_la_LDFLAGS = -module -avoid-version 
-+input_mplayer_la_LIBADD = $(LIBVISUAL_LIBS)
- input_mplayer_la_SOURCES = input_mplayer.c
- 
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/alphablend/Makefile.am	2006-02-23 20:03:38.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/alphablend/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_alphablend.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_alphablend_la_LDFLAGS = -module -avoid-version 
-+morph_alphablend_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_alphablend_la_SOURCES = morph_alphablend.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/flash/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/flash/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_flash.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_flash_la_LDFLAGS = -module -avoid-version 
-+morph_flash_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_flash_la_SOURCES = morph_flash.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/slide/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/slide/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_slide.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_slide_la_LDFLAGS = -module -avoid-version 
-+morph_slide_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_slide_la_SOURCES = morph_slide.c
-diff -Nur libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am
---- libvisual-plugins-0.4.0/plugins/morph/tentacle/Makefile.am	2006-02-23 20:03:39.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/plugins/morph/tentacle/Makefile.am	2007-07-04 18:19:43.000000000 +1000
-@@ -2,11 +2,10 @@
- 
- morph_plugin_LTLIBRARIES = morph_tentacle.la
- 
--LIBS += $(LIBVISUAL_LIBS)
--
- AM_CFLAGS = $(LIBVISUAL_CFLAGS)
- 
- INCLUDES = $(all_includes) -I$(top_srcdir) 
- 
- morph_tentacle_la_LDFLAGS = -module -avoid-version 
-+morph_tentacle_la_LIBADD = $(LIBVISUAL_LIBS)
- morph_tentacle_la_SOURCES = morph_tentacle.c
diff --git a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch b/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch
deleted file mode 100644
index 1fc5f7fc7..000000000
--- a/testing/libvisual-plugins/04_lv_analyzer_build_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/configure.ac libvisual-plugins-0.4.0.new/configure.ac
---- libvisual-plugins-0.4.0/configure.ac	2006-03-17 03:50:41.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/configure.ac	2007-07-04 18:22:38.000000000 +1000
-@@ -361,7 +361,7 @@
-   [ENABLE_ANALYZER=$enableval],
-   [ENABLE_ANALYZER=yes])
- 
--if test "$ENABLE_ANALYZER" = xyes; then
-+if test "$ENABLE_ANALYZER" = "yes"; then
-   build_actor_plugins="$build_actor_plugins lv_analyzer"
- fi
- 
diff --git a/testing/libvisual-plugins/050_all_automagic.patch b/testing/libvisual-plugins/050_all_automagic.patch
deleted file mode 100644
index 9c25fac72..000000000
--- a/testing/libvisual-plugins/050_all_automagic.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- configure.ac.old	2007-02-24 23:09:08.000000000 +0100
-+++ configure.ac	2007-02-24 23:13:15.000000000 +0100
-@@ -89,7 +89,18 @@
- 
- dnl Libraries
- 
-+dnl List of plugins to build
-+build_input_plugins=""
-+build_actor_plugins=""
-+build_morph_plugins=""
-+
- dnl EsounD
-+AC_ARG_ENABLE([esd], AS_HELP_STRING([--disable-esd],
-+	[Do not build esound input plugin @<:@default=enabled@:>@]),
-+	[ENABLE_INPUT_ESD=$enableval],
-+	[ENABLE_INPUT_ESD=yes])
-+
-+if test "$ENABLE_INPUT_ESD" = "yes"; then
- PKG_CHECK_MODULES([LIBESD], [esound >= esound_required_version],
-   [HAVE_ESD="yes"], [HAVE_ESD="no"])
- 
-@@ -98,8 +109,15 @@
- else
-   AC_MSG_WARN([*** EsounD not found or too old. The EsounD input plugin won't be built])
- fi
-+fi
- 
- dnl JACK
-+AC_ARG_ENABLE([jack], AS_HELP_STRING([--disable-jack],
-+	[Do not build jack input plugin @<:@default=enabled@:>@]),
-+        [ENABLE_INPUT_JACK=$enableval],
-+	[ENABLE_INPUT_JACK=yes])
-+
-+if test "$ENABLE_INPUT_JACK" = "yes"; then
- PKG_CHECK_MODULES([LIBJACK], [jack >= jack_required_version], [HAVE_JACK="yes"], [HAVE_JACK="no"])
- if test "$HAVE_JACK" = "yes"; then
-   build_input_plugins="$build_input_plugins jack"
-@@ -107,11 +125,7 @@
-   AC_MSG_WARN([*** libjack is too old. You can download a newer version at
-              http://jackit.sf.net/. The jackit input plugin won't be built])
- fi
--
--dnl List of plugins to build
--build_input_plugins=""
--build_actor_plugins=""
--build_morph_plugins=""
-+fi
- 
- dnl GdkPixbuf
- AC_ARG_ENABLE([gdkpixbuf-plugin],
diff --git a/testing/libvisual-plugins/05_fix_po.patch b/testing/libvisual-plugins/05_fix_po.patch
deleted file mode 100644
index a5413ef1b..000000000
--- a/testing/libvisual-plugins/05_fix_po.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-diff -Nur libvisual-plugins-0.4.0/po/Makefile.in.in libvisual-plugins-0.4.0.new/po/Makefile.in.in
---- libvisual-plugins-0.4.0/po/Makefile.in.in	2006-03-21 05:48:28.000000000 +1100
-+++ libvisual-plugins-0.4.0.new/po/Makefile.in.in	2007-07-09 21:50:13.000000000 +1000
-@@ -28,7 +28,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
--MKINSTALLDIRS = @MKINSTALLDIRS@
-+MKINSTALLDIRS = mkinstalldirs
- mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
- 
- GMSGFMT = @GMSGFMT@
-diff -Nur libvisual-plugins-0.4.0/po/mkinstalldirs libvisual-plugins-0.4.0.new/po/mkinstalldirs
---- libvisual-plugins-0.4.0/po/mkinstalldirs	1970-01-01 10:00:00.000000000 +1000
-+++ libvisual-plugins-0.4.0.new/po/mkinstalldirs	2006-03-21 05:48:42.000000000 +1100
-@@ -0,0 +1,111 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Public domain
-+
-+errstatus=0
-+dirmode=""
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+  case $1 in
-+    -h | --help | --h*)         # -h for help
-+      echo "$usage" 1>&2
-+      exit 0
-+      ;;
-+    -m)                         # -m PERM arg
-+      shift
-+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+      dirmode=$1
-+      shift
-+      ;;
-+    --)                         # stop option processing
-+      shift
-+      break
-+      ;;
-+    -*)                         # unknown option
-+      echo "$usage" 1>&2
-+      exit 1
-+      ;;
-+    *)                          # first non-opt arg
-+      break
-+      ;;
-+  esac
-+done
-+
-+for file
-+do
-+  if test -d "$file"; then
-+    shift
-+  else
-+    break
-+  fi
-+done
-+
-+case $# in
-+  0) exit 0 ;;
-+esac
-+
-+case $dirmode in
-+  '')
-+    if mkdir -p -- . 2>/dev/null; then
-+      echo "mkdir -p -- $*"
-+      exec mkdir -p -- "$@"
-+    fi
-+    ;;
-+  *)
-+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+      echo "mkdir -m $dirmode -p -- $*"
-+      exec mkdir -m "$dirmode" -p -- "$@"
-+    fi
-+    ;;
-+esac
-+
-+for file
-+do
-+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+  shift
-+
-+  pathcomp=
-+  for d
-+  do
-+    pathcomp="$pathcomp$d"
-+    case $pathcomp in
-+      -*) pathcomp=./$pathcomp ;;
-+    esac
-+
-+    if test ! -d "$pathcomp"; then
-+      echo "mkdir $pathcomp"
-+
-+      mkdir "$pathcomp" || lasterr=$?
-+
-+      if test ! -d "$pathcomp"; then
-+  	errstatus=$lasterr
-+      else
-+  	if test ! -z "$dirmode"; then
-+	  echo "chmod $dirmode $pathcomp"
-+    	  lasterr=""
-+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+  	  if test ! -z "$lasterr"; then
-+  	    errstatus=$lasterr
-+  	  fi
-+  	fi
-+      fi
-+    fi
-+
-+    pathcomp="$pathcomp/"
-+  done
-+done
-+
-+exit $errstatus
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# End:
-+# mkinstalldirs ends here
diff --git a/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch b/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch
deleted file mode 100644
index 8e54e02cb..000000000
--- a/testing/libvisual-plugins/60_no-const-vispluginfo-in-nastyfft.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The static VisPluginInfo in nastyfft was declared as const, but libvisual write
-to its refcount when it visual_object_unref()s it (nasty!).  This is broken at
-various levels: libvisual shouldn't be writing to this static plugin which is
-allocated by a dlopen()ed plugin, and it should also honor the "const
-VisPluginInfo" API...  Anyway, nastyfft was the only occurrence and this fixes
-the crash for now; LP: #287448.
-
---- libvisual-plugins-0.4.0.dfsg.1.orig/plugins/actor/nastyfft/actor_nastyfft.c
-+++ libvisual-plugins-0.4.0.dfsg.1/plugins/actor/nastyfft/actor_nastyfft.c
-@@ -80,7 +80,7 @@
- 		.vidoptions.depth = VISUAL_VIDEO_DEPTH_GL
- 	}};
- 
--	static const VisPluginInfo info[] = {{
-+	static VisPluginInfo info[] = {{
- 		.type = VISUAL_PLUGIN_TYPE_ACTOR,
- 
- 		.plugname = N_("nastyfft"),
diff --git a/testing/libvisual-plugins/PKGBUILD b/testing/libvisual-plugins/PKGBUILD
deleted file mode 100644
index df8684ed6..000000000
--- a/testing/libvisual-plugins/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 168488 2012-10-12 17:38:33Z andyrtr $
-# Maintainer: damir <damir@archlinux.org>
-
-pkgname=libvisual-plugins
-pkgver=0.4.0
-pkgrel=7
-pkgdesc="plugins for libvisual"
-arch=("i686" "x86_64")
-license=('GPL')
-url="http://www.localhost.nl/~synap/libvisual/"
-depends=('libvisual' 'gtk2' 'glu' 'alsa-lib' 'jack')
-makedepends=('mesa')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-plugins-${pkgver}.tar.gz
-        02_64-bit_JESS_fix.patch
-        03_build_against_gl_fixes.patch
-        04_lv_analyzer_build_fix.patch
-        05_fix_po.patch
-        050_all_automagic.patch
-        60_no-const-vispluginfo-in-nastyfft.patch)
-md5sums=('4330e9287f9d6fae02f482f428a1e77b'
-         'f9cfb607bfcbfef60830fae4e7dc6963'
-         '116701408747dbb87dc134434478ebe2'
-         '01678a8f1584c76a44e59d81003a1109'
-         '6189b7427c4e11c8b8d6c6266d6a1629'
-         'b50ae94c424a5f0af235deffa8451eb6'
-         '7012518727cb072a7e90a826a5577cc6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/02_64-bit_JESS_fix.patch"
-  patch -Np1 -i "${srcdir}/03_build_against_gl_fixes.patch"
-  patch -Np1 -i "${srcdir}/04_lv_analyzer_build_fix.patch"
-  patch -Np0 -i "${srcdir}/050_all_automagic.patch"
-  patch -Np1 -i "${srcdir}/60_no-const-vispluginfo-in-nastyfft.patch"
-
-  autoreconf -fi
-  # Apply later as autoreconf overwrites po/Makefile.in.in
-  patch -Np1 -i "${srcdir}/05_fix_po.patch"
-
-  ./configure --prefix=/usr \
-      --disable-gstreamer-plugin \
-      --disable-gforce \
-      --disable-esd
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/libwacom/PKGBUILD b/testing/libwacom/PKGBUILD
deleted file mode 100644
index 5080168da..000000000
--- a/testing/libwacom/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164040 2012-07-24 23:12:01Z eric $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libwacom
-pkgver=0.6
-pkgrel=1
-pkgdesc="Library to identify Wacom tablets and their features"
-arch=('x86_64' 'i686')
-url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
-license=('MIT')
-depends=('glib2' 'systemd-tools')
-options=('!libtool')
-source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/libwps/PKGBUILD b/testing/libwps/PKGBUILD
deleted file mode 100644
index 1d7c87e6c..000000000
--- a/testing/libwps/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 165826 2012-08-31 04:51:19Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Robert McCathie <archaur at rmcc dot com dot au>
-
-pkgname=libwps
-pkgver=0.2.7
-pkgrel=1
-pkgdesc="a Microsoft Works file word processor format import filter library"
-arch=('i686' 'x86_64')
-url="http://libwps.sourceforge.net/"
-license=('LGPL')
-depends=('libwpd>=0.9.4')
-makedepends=('boost')
-options=(!libtool)
-source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2")
-md5sums=('d197bd6211669a2fa4ca648faf04bcb1')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure  --prefix=/usr \
-	  --disable-static \
-	  --disable-werror
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-}
-
diff --git a/testing/libxcb/PKGBUILD b/testing/libxcb/PKGBUILD
deleted file mode 100644
index 60833c061..000000000
--- a/testing/libxcb/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 168201 2012-10-06 20:05:33Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxcb
-pkgver=1.9
-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=('ad2fb95eeec41ba3d39502a4f7460c3b64fdf061'
-          'd2df03ddf3e949c10c2c185256b0eb7fa02837ab')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/libxcb-1.1-no-pthread-stubs.patch"
-  PYTHON=/usr/bin/python2 
-  ./autogen.sh --prefix=/usr \
-    --enable-xinput \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
-  install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
deleted file mode 100644
index 8e8162f0a..000000000
--- a/testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
- 
- # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
--NEEDED="pthread-stubs xau >= 0.99.2"
-+NEEDED="xau >= 0.99.2"
- PKG_CHECK_MODULES(NEEDED, $NEEDED)
- 
- have_xdmcp="no"
diff --git a/testing/libxklavier/PKGBUILD b/testing/libxklavier/PKGBUILD
deleted file mode 100644
index 1c8023bd1..000000000
--- a/testing/libxklavier/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169172 2012-10-18 19:23:34Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-
-pkgname=libxklavier
-pkgver=5.3
-pkgrel=1
-pkgdesc="High-level API for X Keyboard Extension"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('glib2' 'libxkbfile' 'libxml2' 'xkeyboard-config' 'libxi' 'iso-codes')
-makedepends=('gobject-introspection')
-options=('!libtool' '!emptydirs')
-url="http://gswitchit.sourceforge.net"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr \
-      --with-xkb-base=/usr/share/X11/xkb --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libxml2/PKGBUILD b/testing/libxml2/PKGBUILD
deleted file mode 100644
index 38700a682..000000000
--- a/testing/libxml2/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165055 2012-08-09 21:18:17Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=libxml2
-pkgver=2.8.0
-pkgrel=1
-pkgdesc="XML parsing library, version 2"
-arch=(i686 x86_64)
-license=('custom')
-depends=('zlib>=1.2.4' 'readline>=6.1' 'ncurses>=5.7' 'xz')
-makedepends=('python2')
-options=('!libtool')
-url="http://www.xmlsoft.org/"
-source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        http://www.w3.org/XML/Test/xmlts20080205.tar.gz)
-md5sums=('c62106f02ee00b6437f0fb9d370c1093'
-         'b255be9a1c7f7021e52448e4ec8d7a0d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py
-  ./configure --prefix=/usr --with-threads --with-history \
-     --with-python=/usr/bin/python2
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  mv "${srcdir}/xmlconf" .
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-}
diff --git a/testing/libxrandr/PKGBUILD b/testing/libxrandr/PKGBUILD
deleted file mode 100644
index ccddaba57..000000000
--- a/testing/libxrandr/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164269 2012-07-29 11:06:35Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=libxrandr
-pkgver=1.4.0
-pkgrel=1
-pkgdesc="X11 RandR extension library"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxext' 'libxrender' 'randrproto>=1.4.0')
-makedepends=('xorg-util-macros')
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXrandr-${pkgver}.tar.bz2)
-sha256sums=('033ad0ac2f012afb05268660f6d78705c85f84689f92fa7b47ce12959b15f5c3')
-
-build() {
-  cd "${srcdir}/libXrandr-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "${srcdir}/libXrandr-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/libzapojit/PKGBUILD b/testing/libzapojit/PKGBUILD
deleted file mode 100644
index d3c5c1690..000000000
--- a/testing/libzapojit/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169171 2012-10-18 19:23:32Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libzapojit
-pkgver=0.0.2
-pkgrel=1
-pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup' 'gnome-online-accounts')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/libzeitgeist/PKGBUILD b/testing/libzeitgeist/PKGBUILD
deleted file mode 100644
index 65137cd82..000000000
--- a/testing/libzeitgeist/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: kiefer <jorgelmadrid@gmail.com>
-# Contributor: Alessio Sergi <asergi at archlinux dot us>
-
-pkgname=libzeitgeist
-pkgver=0.3.18
-_pkgmainver=0.3
-pkgrel=3
-pkgdesc="Zeitgeist client library"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/libzeitgeist"
-license=('LGPL2.1')
-depends=('glib2')
-optdepends=("zeitgeist: zeitgeist framework")
-options=('!libtool')
-source=(http://launchpad.net/${pkgname}/${_pkgmainver}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d63a37295d01a58086d0d4ae26e604c2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/licq/PKGBUILD b/testing/licq/PKGBUILD
deleted file mode 100644
index 702dbfbcc..000000000
--- a/testing/licq/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 163551 2012-07-15 13:17:08Z ibiru $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=licq
-pkgver=1.6.0
-pkgrel=5
-pkgdesc="Advanced graphical ICQ clone and more for Unix" 
-arch=('i686' 'x86_64')
-url="http://www.licq.org"
-license=('GPL')
-depends=('boost-libs' 'gpgme' 'libxss' 'qt')
-makedepends=('cmake' 'boost')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('383153697e281a0b1b4ff008936731b8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # licq
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr  ..
-  make
-
-  # qt4-gui
-  cd ../plugins/qt4-gui
-  mkdir build
-  cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake"  ..
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  cd ../plugins/qt4-gui/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/links/PKGBUILD b/testing/links/PKGBUILD
deleted file mode 100644
index 75b79952a..000000000
--- a/testing/links/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 162375 2012-06-26 06:36:44Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=links
-pkgver=2.7
-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=('1e362a7e27078d630edf5868145a46247cda8cc3'
-          'f600e27c2a71184444f7dd07a10230aa44463a02')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  (cd intl; ./gen-intl; ./synclang)
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --enable-graphics --with-x --with-fb
-  make
-  mv links xlinks
-
-  ./configure --prefix=/usr --mandir=/usr/share/man --enable-javascript \
-    --disable-graphics --without-x  --without-fb
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 xlinks "${pkgdir}/usr/bin/xlinks"
-  ln -s links.1.gz "${pkgdir}/usr/share/man/man1/xlinks.1.gz"
-
-  install -D -m644 "${srcdir}/links.desktop" "${pkgdir}/usr/share/applications/links.desktop"
-  install -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 links_16x16_1.xpm links_16x16_2.xpm links_32x32.xpm "${pkgdir}/usr/share/pixmaps/"
-
-  install -d "${pkgdir}/usr/share/doc/links/calibration"
-  install -m644 doc/links_cal/* "${pkgdir}/usr/share/doc/links/calibration/"
-}
diff --git a/testing/links/links.desktop b/testing/links/links.desktop
deleted file mode 100644
index 9d6338a5b..000000000
--- a/testing/links/links.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Links
-Exec=xlinks -g
-Icon=links_32x32.xpm
-Type=Application
-Terminal=false
-Categories=Network;WebBrowser;
diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD
deleted file mode 100644
index f2d221443..000000000
--- a/testing/lirc/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 159373 2012-05-22 19:35:40Z tpowa $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-
-pkgbase=lirc
-pkgname=('lirc' 'lirc-utils')
-pkgver=0.9.0
-pkgrel=18
-epoch=1
-_extramodules=extramodules-3.4-ARCH
-arch=('i686' 'x86_64')
-url="http://www.lirc.org/"
-license=('GPL')
-### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-headers>=3.4' 'linux-headers<3.5' '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() {
-  _kernver="$(cat /lib/modules/${_extramodules}/version)"
-  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.4' 'linux<3.5')
-  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 4551e88dc..000000000
--- a/testing/lirc/lirc.install
+++ /dev/null
@@ -1,16 +0,0 @@
-EXTRAMODULES=extramodules-3.4-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/lm_sensors/PKGBUILD b/testing/lm_sensors/PKGBUILD
deleted file mode 100644
index d72fea0c9..000000000
--- a/testing/lm_sensors/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 164348 2012-07-31 04:47:30Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=lm_sensors
-pkgver=3.3.2
-pkgrel=4
-pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring"
-arch=('i686' 'x86_64')
-url="http://www.lm-sensors.org/"
-license=('GPL' 'LGPL')
-depends=('perl' 'sysfsutils')
-makedepends=('rrdtool')
-optdepends=('rrdtool: for logging with sensord')
-backup=('etc/sensors3.conf' 'etc/healthd.conf' 'etc/conf.d/sensord')
-options=('!emptydirs')
-source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \
-	sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \
-        sensord.rc fancontrol.service sensord.service healthd.service \
-        daemonarg.patch linux_3.0.patch)
-sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d'
-          'a486d9fb6c5b0aff4520f6312106c67f5163f1cf'
-          'b2e664b9b87759991f02d0a1e8cac5e95098c0a5'
-          'a068ac0a3115a6191a487e11422506baa922b40a'
-          'afaad558d2ad4732aa53b69afa23ccf37bc67ab1'
-          '6c4e8a2d89dd2fd3ca2f0f4f3b1230111e01b0fc'
-          'de5a46afc39a77ae8721246a0223baf21a2d4c9c'
-          'de8d4d65406815c389f8a04e2a8508a1ae6749c8'
-          '72a60251d1d55a67307dab4105d9f3f01a080af4'
-          '7a4a4d1442aeeba0ba8aefb742a3ef187b593f4c'
-          'eff43b4882d25dae7dd0b33eb2e33b0836a5cc51'
-          '9cc453eb0e9f9057227459cb07e74815383544bf'
-          '34241388c4001bfb6e49b7e10da1217e29a258d6'
-          '5662828085cdd981f0dc7cf8f79d3d6e2b72f50c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -i -e 's|/etc/sysconfig|/etc/conf.d|' \
-         -e 's|/etc/init.d/lm_sensors|/etc/rc.d/sensors|' prog/{detect/sensors-detect,init/lm_sensors.service}
-  sed -i 's@\(/bin/systemctl\|/lib/systemd/system\)@/usr\1@g' prog/detect/sensors-detect
-  sed -i 's/EnvironmentFile=/EnvironmentFile=-/' prog/init/lm_sensors.service
-  patch -p1 < ../daemonarg.patch
-  patch -p0 < ../linux_3.0.patch
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make PROG_EXTRA=sensord BUILD_STATIC_LIB=0 \
-    PREFIX=/usr MANDIR=/usr/share/man DESTDIR="${pkgdir}" install
-  install -D -m644 prog/init/lm_sensors.service "${pkgdir}/usr/lib/systemd/system/lm_sensors.service"
-  install -D -m755 "${srcdir}/sensors.rc" "${pkgdir}/etc/rc.d/sensors"
-  install -D -m755 "${srcdir}/fancontrol.rc" "${pkgdir}/etc/rc.d/fancontrol"
-  install -D -m755 "${srcdir}/healthd" "${pkgdir}/usr/sbin/healthd"
-  install -D -m755 "${srcdir}/healthd.rc" "${pkgdir}/etc/rc.d/healthd"
-  install -D -m644 "${srcdir}/healthd.conf" "${pkgdir}/etc/healthd.conf"
-  install -D -m755 "${srcdir}/sensord.rc" "${pkgdir}/etc/rc.d/sensord"
-  install -D -m644 "${srcdir}/sensord.conf" "${pkgdir}/etc/conf.d/sensord"
-  install -D -m644 "${srcdir}/fancontrol.service" "${pkgdir}/usr/lib/systemd/system/fancontrol.service"
-  install -D -m644 "${srcdir}/sensord.service" "${pkgdir}/usr/lib/systemd/system/sensord.service"
-  install -D -m644 "${srcdir}/healthd.service" "${pkgdir}/usr/lib/systemd/system/healthd.service"
-}
diff --git a/testing/lm_sensors/daemonarg.patch b/testing/lm_sensors/daemonarg.patch
deleted file mode 100644
index 4b80cef19..000000000
--- a/testing/lm_sensors/daemonarg.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -ru lm_sensors-3.1.2-1/prog/pwm/fancontrol lm_sensors-3.1.2-1_pyropeter/usr/sbin/fancontrol
---- lm_sensors-3.1.2-1/prog/pwm/fancontrol	2010-02-03 03:45:15.000000000 +0100
-+++ lm_sensors-3.1.2-1_pyropeter/prog/pwm/fancontrol	2010-03-07 01:37:09.000000000 +0100
-@@ -5,7 +5,9 @@
- #
- # Version 0.70
- #
--# Usage: fancontrol [CONFIGFILE]
-+# Usage: fancontrol [-D] [CONFIGFILE]
-+#
-+# (-D causes fancontrol to 'fork' to the background after some tests)
- #
- # Dependencies:
- #   bash, egrep, sed, cut, sleep, readlink, lm_sensors :)
-@@ -43,6 +45,12 @@
- #DEBUG=1
- MAX=255
- 
-+DAEMON=0
-+if [ "$1" = "-D" ]; then
-+	DAEMON=1
-+	shift
-+fi
-+
- declare -i pwmval
- 
- function LoadConfig {
-@@ -303,7 +311,6 @@
- 	echo "File $PIDFILE exists, is fancontrol already running?"
- 	exit 1
- fi
--echo $$ > "$PIDFILE"
- 
- # $1 = pwm file name
- function pwmdisable()
-@@ -475,6 +482,14 @@
- 	let fcvcount=$fcvcount+1
- done
- 
-+if [ "$DAEMON" -gt 0 ]; then
-+	echo "Forking..."
-+	$0 $* &> /dev/null &
-+	exit 0
-+fi
-+
-+echo $$ > "$PIDFILE"
-+
- echo 'Starting automatic fan control...'
- 
- # main loop calling the main function at specified intervals
diff --git a/testing/lm_sensors/fancontrol.rc b/testing/lm_sensors/fancontrol.rc
deleted file mode 100644
index 8e98d06f2..000000000
--- a/testing/lm_sensors/fancontrol.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
-case "$1" in
-  start)
-    stat_busy "Starting fancontrol"
-    [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
-    if [ $? -gt 0 -o -n "$PID" ]; then
-      stat_fail
-    else
-      add_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fancontrol"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fancontrol
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/lm_sensors/fancontrol.service b/testing/lm_sensors/fancontrol.service
deleted file mode 100644
index c86b498f8..000000000
--- a/testing/lm_sensors/fancontrol.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Fan control daemon
-
-[Service]
-PIDFile=/var/run/fancontrol.pid
-ExecStart=/usr/sbin/fancontrol
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/lm_sensors/healthd b/testing/lm_sensors/healthd
deleted file mode 100644
index 5ffed5681..000000000
--- a/testing/lm_sensors/healthd
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-#
-# /usr/sbin/healthd
-#
-
-. /etc/healthd.conf
-
-cmd="${ALARM_CMD}"
-addr="${ADMIN_EMAIL}"
-slp="${ALARM_SLEEP}"
-sensors="/usr/bin/sensors"
-
-
-while [ $# -gt 0 ] ; do
-	case "${1}" in
-		-c ) cmd="${2}" ; shift 2 ;;
-		-m ) addr="${2}" ; shift 2 ;;
-		-s ) slp="${2}" ; shift 2 ;;
-		*  ) shift 1 ;;
-	esac
-done
-
-case "${ALARM_RESET}" in
-	yes) /usr/bin/sensors > /dev/null
-	;;
-        no) true
-	;;
-esac
-
-[ -n "${cmd}" ] && [ -n "$( which -- "${cmd%% *}" )" ] || \
-	[ -n "${addr}" ] || exit 1
-
-[ "${slp}" -ge 2 ] || slp=600
-
-while true ; do
-	sleep 15
-	message="$( $sensors )"
-	case "$message" in
-		''      ) message='Could not get any sensor values !' ;;
-		*ALARM* ) : ;;
-		*       ) message='' ;;
-	esac
-	if [ -n "$message" ]; then
-		if [ -n "${addr}" ]; then
-			echo "$message" | mail -s \
-				"Sensors ALARM detected at host: $( hostname )" \
-				"${addr}"
-		fi
-		[ -z "${cmd}" ] || ${cmd} &
-		sleep ${slp}
-	fi
-done &
diff --git a/testing/lm_sensors/healthd.conf b/testing/lm_sensors/healthd.conf
deleted file mode 100644
index a8b2c3fa3..000000000
--- a/testing/lm_sensors/healthd.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# /etc/conf.d/healthd
-#
-
-# reset any pending alarms on startup
-ALARM_RESET="yes"
-
-# where to sent mails on alarm
-ADMIN_EMAIL="root"
-
-# Seconds to sleep when alarm detected before checking again
-# If you want to fill up your mail inbox set this to 2. ;-)
-ALARM_SLEEP=600
-
-# command to run in background on each alarm
-# N.B.: If you choose to use the beep command, you'll need to install it: pacman -S beep
-ALARM_CMD="beep -f 800 -l 500 -d 500 -r 600"
diff --git a/testing/lm_sensors/healthd.rc b/testing/lm_sensors/healthd.rc
deleted file mode 100644
index f50f4a6f8..000000000
--- a/testing/lm_sensors/healthd.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -x -o %PPID /usr/sbin/healthd)
-case "${1}" in
-  start)
-    stat_busy "Starting Health Daemon"
-    [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo "${PID}" > /var/run/healthd.pid
-      add_daemon healthd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Health Daemon"
-    [ ! -z "${PID}" ] && kill ${PID} &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon healthd
-      stat_done
-    fi
-    ;;
-  restart) 
-    $0 stop 
-    sleep 2
-    $0 start 
-    ;;
-  *) echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/lm_sensors/healthd.service b/testing/lm_sensors/healthd.service
deleted file mode 100644
index b894fbb1f..000000000
--- a/testing/lm_sensors/healthd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=A daemon which can be used to alert you in the event of a hardware health monitoring alarm
-
-[Service]
-PIDFile=/var/run/healthd.pid
-ExecStart=/usr/sbin/healthd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/lm_sensors/linux_3.0.patch b/testing/lm_sensors/linux_3.0.patch
deleted file mode 100644
index da02a3d49..000000000
--- a/testing/lm_sensors/linux_3.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- prog/detect/sensors-detect	2011-08-02 10:23:46.000000000 +0200
-+++ prog/detect/sensors-detect	2011-08-02 10:24:04.000000000 +0200
-@@ -2472,7 +2472,7 @@
- 
- sub initialize_kernel_version
- {
--	`uname -r` =~ /(\d+)\.(\d+)\.(\d+)(.*)/;
-+	`uname -r` =~ /(\d+)\.(\d+)(.*)/;
- 	@kernel_version = ($1, $2, $3, $4);
- 	chomp($kernel_arch = `uname -m`);
- 
diff --git a/testing/lm_sensors/sensord.conf b/testing/lm_sensors/sensord.conf
deleted file mode 100644
index a1cf091c1..000000000
--- a/testing/lm_sensors/sensord.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sensord
-#
-SENSORD_ARGS=""
diff --git a/testing/lm_sensors/sensord.rc b/testing/lm_sensors/sensord.rc
deleted file mode 100644
index e3ef4d26d..000000000
--- a/testing/lm_sensors/sensord.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sensord
-
-PID=$(pidof -o %PPID /usr/sbin/sensord)
-case "$1" in
-  start)
-    stat_busy "Starting sensord"
-    [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensord
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping sensord"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensord
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/lm_sensors/sensord.service b/testing/lm_sensors/sensord.service
deleted file mode 100644
index 6d272f1ef..000000000
--- a/testing/lm_sensors/sensord.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Sensor information logging daemon
-
-[Service]
-PIDFile=/var/run/sensord.pid
-ExecStart=/usr/sbin/sensord
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/lm_sensors/sensors.rc b/testing/lm_sensors/sensors.rc
deleted file mode 100644
index 4acde2202..000000000
--- a/testing/lm_sensors/sensors.rc
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash
-
-# description: sensors is used for monitoring motherboard sensor values.
-# config: /etc/conf.d/lm_sensors
-
-# See also the lm_sensors homepage at:
-#     http://www2.lm-sensors.nu/~lm78/index.html
-
-# It uses a config file /etc/conf.d/lm_sensors that contains the modules to
-# be loaded/unloaded. That file is sourced into this one.
-
-# The format of that file a shell script that simply defines the modules
-# in order as normal shell variables with the special names:
-#    MODULE_1, MODULE_2, MODULE_3, etc.
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PSENSORS=/usr/bin/sensors
-
-if $(grep -q sysfs /proc/mounts); then
-  WITHSYS=1
-else
-  WITHSYS=0
-fi
-
-if [ $WITHSYS == "0" ]; then
-  # If sensors isn't supported by the kernel, try loading the module...
-  [ -e /proc/sys/dev/sensors ] || /sbin/modprobe i2c-proc &>/dev/null
-
-  # Don't bother if /proc/sensors still doesn't exist, kernel doesn't have support for sensors.
-  if ! [ -e /proc/sys/dev/sensors ]; then
-    echo  "lm_sensors: kernel does not have sensors support"
-    stat_fail
-  fi
-
-  # If sensors was not already running, unload the module...
-  [ -e /var/run/daemons/sensors ] || /sbin/modprobe -r i2c-proc &>/dev/null
-fi
-
-if [ -e /etc/conf.d/lm_sensors ]; then
-  CONFIG=/etc/conf.d/lm_sensors
-elif [ -e /etc/sysconfig/lm_sensors ]; then
-  # Moving config to new Arch-specific location
-  mv /etc/sysconfig/lm_sensors /etc/conf.d/lm_sensors
-  CONFIG=/etc/conf.d/lm_sensors
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting Up Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=0
-      while [ $i -lt $modules ] ; do
-        module=$(eval echo '$'MODULE_$i)
-       # echo starting module __${module}__ #debug
-        /sbin/modprobe $module &>/dev/null
-        i=$(expr $i + 1)
-      done
-    fi
-
-    $PSENSORS -s
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon sensors
-      stat_done
-    fi	  
-    ;;
-
-  stop)
-    stat_busy "Shutting Down Sensors"
-
-    if [ -r "$CONFIG" ]; then
-      . "$CONFIG"
-      modules=$(grep \^MODULE_ $CONFIG | wc -l | tr -d ' ')
-      i=$(expr $modules - 1)
-      while [ $i -ge 0 ] ; do
-        module=$(eval echo '$'MODULE_$i)
-      #  echo stoping module __${module}__ #debug
-        /sbin/modprobe -r $module &>/dev/null
-        i=$(expr $i - 1)
-      done
-    fi
-
-    if [ $WITHSYS == "0" ]; then
-      /sbin/modprobe -r i2c-proc &>/dev/null
-    fi
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon sensors
-      stat_done
-    fi
-    ;;
-    
-  status)
-    $PSENSORS
-    ;;
-    
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  condrestart)
-    [ -e /var/run/daemons/sensors ] && $0 restart || :
-    ;;
-
-  *)
-    echo "Usage: $0 {start|stop|restart|status|condrestart}"
-esac
-exit 0
diff --git a/testing/logrotate/PKGBUILD b/testing/logrotate/PKGBUILD
deleted file mode 100644
index 7ad4ebd03..000000000
--- a/testing/logrotate/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 164699 2012-08-03 08:05:59Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=logrotate
-pkgver=3.8.2
-pkgrel=1
-pkgdesc="Rotates system logs automatically"
-arch=('i686' 'x86_64')
-url="https://fedorahosted.org/logrotate/"
-license=('GPL')
-groups=('base')
-depends=('popt' 'cron' 'gzip')
-backup=('etc/logrotate.conf')
-source=("https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz"
-        'noasprintf.patch'
-        'paths.patch'
-        'logrotate.conf'
-        'logrotate.cron.daily')
-md5sums=('ddd4dcf28c38b3ac6bc6ff4e0148308a'
-         'cd76976b5ce37d328b452c806b55a015'
-         'e76526bcd6fc33c9d921e1cb1eff1ffb'
-         '462a5f364717461537eb2ae6394ad23e'
-         'aa8ac8283908b6114483a293adcb650f')
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  patch -p0 -i "$srcdir/noasprintf.patch"
-  patch -p0 -i "$srcdir/paths.patch"
-
-  make RPM_OPT_FLAGS="$CFLAGS" EXTRA_LDFLAGS="$LDFLAGS"
-}
-
-check() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make test
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make PREFIX="$pkgdir" MANDIR="/usr/share/man" install
-
-  install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf"
-  install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate"
-}
diff --git a/testing/logrotate/logrotate-3.8.1-noasprintf.patch b/testing/logrotate/logrotate-3.8.1-noasprintf.patch
deleted file mode 100644
index be0c08062..000000000
--- a/testing/logrotate/logrotate-3.8.1-noasprintf.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- logrotate-3.8.0.orig/config.c	2011-06-21 04:12:02.000000000 -0400
-+++ logrotate-3.8.0/config.c	2011-07-12 13:47:36.274319050 -0400
-@@ -41,39 +41,6 @@
- #include "asprintf.c"
- #endif
- 
--#if !defined(asprintf)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
--	va_list arg;
--	char *str;
--	int size;
--	int rv;
--
--	va_start(arg, format);
--	size = vsnprintf(NULL, 0, format, arg);
--	size++;
--	va_start(arg, format);
--	str = malloc(size);
--	if (str == NULL) {
--		va_end(arg);
--		/*
--		 * Strictly speaking, GNU asprintf doesn't do this,
--		 * but the caller isn't checking the return value.
--		 */
--		fprintf(stderr, "failed to allocate memory\\n");
--		exit(1);
--	}
--	rv = vsnprintf(str, size, format, arg);
--	va_end(arg);
--
--	*string_ptr = str;
--	return (rv);
--}
--
--#endif
--
- #if !defined(strndup)
- char *strndup(const char *s, size_t n)
- {
---- logrotate-3.8.0.orig/logrotate.h	2011-06-21 04:12:02.000000000 -0400
-+++ logrotate-3.8.0/logrotate.h	2011-07-12 13:47:38.949285608 -0400
-@@ -66,8 +66,5 @@ extern int numLogs;
- extern int debug;
- 
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
- 
- #endif
diff --git a/testing/logrotate/logrotate.conf b/testing/logrotate/logrotate.conf
deleted file mode 100644
index 88b4935cd..000000000
--- a/testing/logrotate/logrotate.conf
+++ /dev/null
@@ -1,31 +0,0 @@
-# see "man logrotate" for details
-# rotate log files weekly
-weekly
-
-# keep 4 weeks worth of backlogs
-rotate 4
-
-# restrict maximum size of log files
-#size 20M
-
-# create new (empty) log files after rotating old ones
-create
-
-# uncomment this if you want your log files compressed
-#compress
-
-# Logs are moved into directory for rotation
-# olddir /var/log/archive
-
-# Ignore pacman saved files
-tabooext + .pacorig .pacnew .pacsave
-
-# Arch packages drop log rotation information into this directory
-include /etc/logrotate.d
-
-/var/log/wtmp {
-    monthly
-    create 0664 root root
-    rotate 1
-}
-
diff --git a/testing/logrotate/logrotate.cron.daily b/testing/logrotate/logrotate.cron.daily
deleted file mode 100755
index ee0eeeb48..000000000
--- a/testing/logrotate/logrotate.cron.daily
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-CMD_LOGROTATE="/usr/sbin/logrotate /etc/logrotate.conf"
- 
-if [ -x /usr/bin/nice ]; then
-  CMD_LOGROTATE="/usr/bin/nice -n ${NICE:-19} ${CMD_LOGROTATE}"
-fi
- 
-if [ -x /usr/bin/ionice ]; then
-  CMD_LOGROTATE="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${CMD_LOGROTATE}"
-fi
- 
-${CMD_LOGROTATE}
- 
-exit 0
diff --git a/testing/logrotate/noasprintf.patch b/testing/logrotate/noasprintf.patch
deleted file mode 100644
index 3df943b64..000000000
--- a/testing/logrotate/noasprintf.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- config.c	2011-06-21 04:12:02.000000000 -0400
-+++ config.c	2011-07-12 13:47:36.274319050 -0400
-@@ -41,39 +41,6 @@
- #include "asprintf.c"
- #endif
- 
--#if !defined(asprintf)
--#include <stdarg.h>
--
--int asprintf(char **string_ptr, const char *format, ...)
--{
--	va_list arg;
--	char *str;
--	int size;
--	int rv;
--
--	va_start(arg, format);
--	size = vsnprintf(NULL, 0, format, arg);
--	size++;
--	va_start(arg, format);
--	str = malloc(size);
--	if (str == NULL) {
--		va_end(arg);
--		/*
--		 * Strictly speaking, GNU asprintf doesn't do this,
--		 * but the caller isn't checking the return value.
--		 */
--		fprintf(stderr, "failed to allocate memory\\n");
--		exit(1);
--	}
--	rv = vsnprintf(str, size, format, arg);
--	va_end(arg);
--
--	*string_ptr = str;
--	return (rv);
--}
--
--#endif
--
- #if !defined(strndup)
- char *strndup(const char *s, size_t n)
- {
---- logrotate.h	2011-06-21 04:12:02.000000000 -0400
-+++ logrotate.h	2011-07-12 13:47:38.949285608 -0400
-@@ -66,8 +66,5 @@ extern int numLogs;
- extern int debug;
- 
- int readAllConfigPaths(const char **paths);
--#if !defined(asprintf)
--int asprintf(char **string_ptr, const char *format, ...);
--#endif
- 
- #endif
diff --git a/testing/logrotate/paths.patch b/testing/logrotate/paths.patch
deleted file mode 100644
index 83166b095..000000000
--- a/testing/logrotate/paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- config.h	2012-08-01 12:56:47.000000000 +0200
-+++ config.h	2012-08-03 09:53:05.025039199 +0200
-@@ -27,11 +27,11 @@
-  * Default settings for Linux - leave these last.
-  */
- #ifndef DEFAULT_MAIL_COMMAND
--#define DEFAULT_MAIL_COMMAND "/bin/mail"
-+#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"
- #endif
- 
- #ifndef COMPRESS_COMMAND
--#define COMPRESS_COMMAND "/bin/gzip"
-+#define COMPRESS_COMMAND "/usr/bin/gzip"
- #endif
- 
- #ifndef COMPRESS_EXT
-@@ -39,7 +39,7 @@
- #endif
- 
- #ifndef UNCOMPRESS_COMMAND
--#define UNCOMPRESS_COMMAND "/bin/gunzip"
-+#define UNCOMPRESS_COMMAND "/usr/bin/gunzip"
- #endif
- 
- #ifndef STATEFILE
diff --git a/testing/lvm2/11-dm-initramfs.rules b/testing/lvm2/11-dm-initramfs.rules
deleted file mode 100644
index d2c167324..000000000
--- a/testing/lvm2/11-dm-initramfs.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# needed with new udev/mkinitcpio and as implemented in dracut:
-# <http://git.kernel.org/?p=boot/dracut/dracut.git;a=commitdiff;h=12b9736228f2b34c15a9cb63be79cf7b6e865b54>
-SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist"
diff --git a/testing/lvm2/PKGBUILD b/testing/lvm2/PKGBUILD
deleted file mode 100644
index 184226746..000000000
--- a/testing/lvm2/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 168776 2012-10-15 21:23:50Z thomas $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgbase=lvm2
-pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.98
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://sourceware.org/lvm2/"
-license=('GPL2' 'LGPL2.1')
-groups=('base')
-source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
-        lvm2_install
-        lvm2_hook
-        11-dm-initramfs.rules
-        lvm.service
-	lvm-on-crypt.service
-        lvm2.conf)
-sha1sums=('077425115b164c335a9930df745943e9ea666a8a'
-          '4713c852fc668e6fbd36ff7c6b5675b10a95a0f8'
-          '3e1680f9b76ce9150d08865d99db90fd15532271'
-          'cedc9948123c870f9c5aa3357d0075b41a9c8135'
-          'f6a554eea9557c3c236df2943bb6e7e723945c41'
-          'edce6b6e8d03f7cbad4bfff49fab01d618415be8'
-          '652fb58dd7676caa0515f0a06d537744e071c6cf'
-          'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4')
-
-build() {
-  cd "${srcdir}/LVM2.${pkgver}"
-  unset LDFLAGS
-
-  ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
-    --includedir=/usr/include --with-usrlibdir=/usr/lib  --libdir=/usr/lib --with-udev-prefix=/usr \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \
-    --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules  \
-    --with-default-locking-dir=/run/lock/lvm
-  make
-}
-
-package_device-mapper() {
-  pkgdesc="Device mapper userspace library and tools"
-  url="http://sourceware.org/dm/"
-  depends=('glibc' 'udev')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_device-mapper
-  # extra udev rule for device-mapper in initramfs
-  install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules"
-}
-
-package_lvm2() {
-  pkgdesc="Logical Volume Manager 2 utilities"
-  depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline')
-  conflicts=('lvm' 'mkinitcpio<0.7')
-  backup=('etc/lvm/lvm.conf')
-  options=('!makeflags')
-
-  cd "${srcdir}/LVM2.${pkgver}"
-  make DESTDIR="${pkgdir}" install_lvm2
-  # install applib
-  make -C liblvm DESTDIR="${pkgdir}" install
-  # /etc directories
-  install -d "${pkgdir}"/etc/lvm/{archive,backup}
-  # mkinitcpio hook
-  install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2"
-  install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2"
-  # systemd support
-  install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service"
-  install -D -m644 "${srcdir}/lvm-on-crypt.service" "${pkgdir}/usr/lib/systemd/system/lvm-on-crypt.service"
-  install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf"
-}
diff --git a/testing/lvm2/lvm-on-crypt.service b/testing/lvm2/lvm-on-crypt.service
deleted file mode 100644
index 346c5ac8e..000000000
--- a/testing/lvm2/lvm-on-crypt.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation of encrypted devices
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service cryptsetup.target
-Before=shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
diff --git a/testing/lvm2/lvm.service b/testing/lvm2/lvm.service
deleted file mode 100644
index 14269b1be..000000000
--- a/testing/lvm2/lvm.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LVM activation
-DefaultDependencies=no
-Requires=systemd-udev-settle.service
-After=systemd-udev-settle.service
-Before=basic.target shutdown.target
-Conflicts=shutdown.target
-
-[Service]
-ExecStart=/sbin/vgchange --available y
-Type=oneshot
-TimeoutSec=0
-RemainAfterExit=yes
-
-[Install]
-WantedBy=basic.target
diff --git a/testing/lvm2/lvm2.conf b/testing/lvm2/lvm2.conf
deleted file mode 100644
index 129824552..000000000
--- a/testing/lvm2/lvm2.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-d /run/lock/lvm 0755 root root -
-d /run/lvm 0755 root root -
diff --git a/testing/lvm2/lvm2_hook b/testing/lvm2/lvm2_hook
deleted file mode 100644
index e69b3349a..000000000
--- a/testing/lvm2/lvm2_hook
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    local pvdev
-
-    modprobe -q dm-mod >/dev/null 2>&1
-
-    # If the lvmwait= parameter has been specified on the command line
-    # wait for the device(s) before trying to activate the volume group(s)
-    for pvdev in ${lvmwait//,/ }; do
-        poll_device ${pvdev} ${rootdelay}
-    done
-
-    msg "Activating logical volumes..."
-    [ -d /etc/lvm ] && lvm vgscan
-
-    if [ -n "$quiet" ]; then
-      lvm vgchange --sysinit -a y >/dev/null
-    else
-      lvm vgchange --sysinit -a y
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/lvm2/lvm2_install b/testing/lvm2/lvm2_install
deleted file mode 100644
index 145ce49b2..000000000
--- a/testing/lvm2/lvm2_install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-build() {
-    local mod
-    for mod in dm-mod dm-snapshot dm-mirror; do
-        add_module "$mod"
-    done
-
-    add_binary "/sbin/lvm"
-    add_binary "/sbin/dmsetup"
-    add_file "/usr/lib/udev/rules.d/10-dm.rules"
-    add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
-    add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
-    add_file "/usr/lib/udev/rules.d/11-dm-lvm.rules"
-    add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
-
-    add_runscript
-}
-
-help() {
-  cat <<HELPEOF
-This hook loads the necessary modules for an LVM2 root device.
-
-The optional lvmwait= parameter followed by a comma-separated
-list of device names can be given on the command line.
-It will cause the hook to wait until all given devices exist
-before trying to scan and activate any volume groups.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/lyx/PKGBUILD b/testing/lyx/PKGBUILD
deleted file mode 100644
index d0f9cfa5d..000000000
--- a/testing/lyx/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 163552 2012-07-15 13:17:17Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=lyx
-pkgver=2.0.3
-pkgrel=4
-pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
-arch=('i686' 'x86_64')
-url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
-makedepends=('boost')
-optdepends=('rcs: built-in version control system'
-            'texlive-latexextra: float wrap support')
-license=('GPL')
-source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
-        lyx.desktop lyxrc.dist)
-backup=('etc/lyx/lyxrc.dist')
-install=lyx.install
-options=('emptydirs')
-sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
-          'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
-          '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
-  sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
-  export CXXFLAGS="$CXXFLAGS -fpermissive"
-  ./configure --prefix=/usr \
-    --with-frontend=qt4 --without-included-boost \
-    --without-included-mythes
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  # install desktop entry
-  install -Dm644 "${srcdir}/lyx.desktop" \
-    "${pkgdir}/usr/share/applications/lyx.desktop"
-  install -Dm644 "lib/images/lyx.png" \
-    "${pkgdir}/usr/share/pixmaps/lyx.png"
-
-  # install default config file
-  install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
-  ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
-}
diff --git a/testing/lyx/lyx.desktop b/testing/lyx/lyx.desktop
deleted file mode 100644
index 649b30c98..000000000
--- a/testing/lyx/lyx.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LyX Document Processor
-GenericName=Document Processor
-Comment=High level LaTeX frontend
-Exec=lyx %F
-TryExec=lyx
-Icon=lyx
-StartupNotify=false
-StartupWMClass=Lyx
-Terminal=false
-Categories=Office;WordProcessor;Qt;
-MimeType=text/x-lyx;application/x-lyx;
diff --git a/testing/lyx/lyx.install b/testing/lyx/lyx.install
deleted file mode 100644
index c15c17b3a..000000000
--- a/testing/lyx/lyx.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
-
-
diff --git a/testing/lyx/lyxrc.dist b/testing/lyx/lyxrc.dist
deleted file mode 100644
index dd18694f9..000000000
--- a/testing/lyx/lyxrc.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-### This file is part of
-### ========================================================
-###          LyX, The Document Processor
-###
-###          Copyright 1995 Matthias Ettrich
-###          Copyright 1995-2011 The LyX Team.
-###
-### ========================================================
-
-# The file lyxrc.dist gives initial global options for all LyX users.
-# Almost all settings here can be overridden through the preferences in LyX.
-
-\thesaurusdir_path "/usr/share/mythes"
-\hunspelldir_path "/usr/share/myspell"
diff --git a/testing/make/PKGBUILD b/testing/make/PKGBUILD
deleted file mode 100644
index 428b4d925..000000000
--- a/testing/make/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 166640 2012-09-14 04:44:29Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=make
-pkgver=3.82
-pkgrel=5
-pkgdesc="GNU make utility to maintain groups of programs"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/make"
-license=('GPL3')
-groups=('base-devel')
-depends=('glibc' 'sh')
-install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        make-3.82-bug30612.patch
-        make-3.82-bug30723.patch
-        make-3.82-sort-blank.patch
-        make-3.82-makeflags.patch
-        make-3.82-expensive_glob.patch
-        make-3.82-dont-prune-intermediate.patch)
-md5sums=('1a11100f3c63fcf5753818e59d63088f'
-         'c78daf24f4ec5900c8f81e89a6e1cd5a'
-         'c8f496b22191f9fb9420ab14c1a19a47'
-         '662e6450e19a5acdaa5c9fcb8ad78dea'
-         '7d01a99f389d8f08dec93ed479071ee4'
-         'bc12ad4d0c6e6c0e72d9fb61054f446b'
-         'e58d4211c5b29d7d927a304d082849e7'
-         '45ac9e987f4bf16c0d7e1685db943917')
-
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # http://savannah.gnu.org/bugs/?30612
-  patch -Np1 -i $srcdir/make-3.82-bug30612.patch
-  
-  # http://savannah.gnu.org/bugs/?30723
-  patch -Np1 -i $srcdir/make-3.82-bug30723.patch
-  
-  # https://bugs.archlinux.org/task/22733 (fix from Fedora)
-  patch -Np1 -i $srcdir/make-3.82-sort-blank.patch
-  
-  # https://savannah.gnu.org/bugs/?33873
-  patch -Np0 -i $srcdir/make-3.82-makeflags.patch
-  
-  # http://lists.gnu.org/archive/html/bug-make/2011-04/msg00002.html
-  patch -Np0 -i $srcdir/make-3.82-expensive_glob.patch
- 
-  # https://savannah.gnu.org/bugs/?30653
-  patch -Np0 -i $srcdir/make-3.82-dont-prune-intermediate.patch
-
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/make/make-3.82-bug30612.patch b/testing/make/make-3.82-bug30612.patch
deleted file mode 100644
index fb843bcd9..000000000
--- a/testing/make/make-3.82-bug30612.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c
---- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30612//main.c	2010-09-23 23:33:37.908855839 +1000
-@@ -1,3 +1,4 @@
-+
- /* Argument parsing and main program of GNU Make.
- Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
- 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
-@@ -1138,7 +1139,7 @@
-      a macro and some compilers (MSVC) don't like conditionals in macros.  */
-   {
-     const char *features = "target-specific order-only second-expansion"
--                           " else-if shortest-stem undefine"
-+                           " else-if shortest-stem undefine oneshell"
- #ifndef NO_ARCHIVES
-                            " archives"
- #endif
-diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c
---- make-3.82-orig/read.c	2010-07-13 11:20:42.000000000 +1000
-+++ make-3.82-fix30612//read.c	2010-09-23 23:30:58.018855839 +1000
-@@ -3028,7 +3028,7 @@
-             {
-               /* This looks like the first element in an open archive group.
-                  A valid group MUST have ')' as the last character.  */
--              const char *e = p + nlen;
-+              const char *e = p;
-               do
-                 {
-                   e = next_token (e);
-@@ -3084,19 +3084,19 @@
-          Go to the next item in the string.  */
-       if (flags & PARSEFS_NOGLOB)
-         {
--          NEWELT (concat (2, prefix, tp));
-+          NEWELT (concat (2, prefix, tmpbuf));
-           continue;
-         }
- 
-       /* If we get here we know we're doing glob expansion.
-          TP is a string in tmpbuf.  NLEN is no longer used.
-          We may need to do more work: after this NAME will be set.  */
--      name = tp;
-+      name = tmpbuf;
- 
-       /* Expand tilde if applicable.  */
--      if (tp[0] == '~')
-+      if (tmpbuf[0] == '~')
- 	{
--	  tildep = tilde_expand (tp);
-+	  tildep = tilde_expand (tmpbuf);
- 	  if (tildep != 0)
-             name = tildep;
- 	}
-@@ -3152,7 +3152,11 @@
-             else
-               {
-                 /* We got a chain of items.  Attach them.  */
--                (*newp)->next = found;
-+                if (*newp)
-+                  (*newp)->next = found;
-+                else
-+                  *newp = found;
-+
- 
-                 /* Find and set the new end.  Massage names if necessary.  */
-                 while (1)
diff --git a/testing/make/make-3.82-bug30723.patch b/testing/make/make-3.82-bug30723.patch
deleted file mode 100644
index 84e7ebe7a..000000000
--- a/testing/make/make-3.82-bug30723.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur make-3.82-orig/main.c make-3.82-fix30723//main.c
---- make-3.82-orig/main.c	2010-07-19 17:10:53.000000000 +1000
-+++ make-3.82-fix30723//main.c	2010-09-23 23:34:10.932188592 +1000
-@@ -2093,7 +2093,7 @@
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
--            putenv (p);
-+            putenv (allocated_variable_expand (p));
-           }
- 
- 	  if (ISDB (DB_BASIC))
diff --git a/testing/make/make-3.82-dont-prune-intermediate.patch b/testing/make/make-3.82-dont-prune-intermediate.patch
deleted file mode 100644
index f4f47dd27..000000000
--- a/testing/make/make-3.82-dont-prune-intermediate.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-2012-09-09  Paul Smith  <psmith@gnu.org>
-
-	* remake.c (update_file_1): Force intermediate files to be
-	considered, not pruned, if their non-intermediate parent needs to
-	be remade.  Fixes Savannah bug #30653.
-
-Index: remake.c
-===================================================================
-RCS file: /sources/make/make/remake.c,v
-retrieving revision 1.153
-retrieving revision 1.154
-diff -u -r1.153 -r1.154
---- remake.c	5 Mar 2012 14:10:45 -0000	1.153
-+++ remake.c	10 Sep 2012 02:36:05 -0000	1.154
-@@ -612,6 +612,10 @@
-                 d->file->dontcare = file->dontcare;
-               }
- 
-+            /* We may have already considered this file, when we didn't know
-+               we'd need to update it.  Force update_file() to consider it and
-+               not prune it.  */
-+            d->file->considered = !considered;
- 
- 	    dep_status |= update_file (d->file, depth);
- 
-Index: tests/scripts/features/parallelism
-===================================================================
-RCS file: /sources/make/make/tests/scripts/features/parallelism,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -u -r1.19 -r1.20
---- tests/scripts/features/parallelism	4 Mar 2012 00:24:32 -0000	1.19
-+++ tests/scripts/features/parallelism	10 Sep 2012 02:36:05 -0000	1.20
-@@ -214,6 +214,23 @@
-     rmfiles(qw(foo.y foo.y.in main.bar));
- }
- 
-+# Ensure intermediate/secondary files are not pruned incorrectly.
-+# See Savannah bug #30653
-+
-+utouch(-15, 'file2');
-+utouch(-10, 'file4');
-+utouch(-5,  'file1');
-+
-+run_make_test(q!
-+.INTERMEDIATE: file3
-+file4: file3 ; @mv -f $< $@
-+file3: file2 ; touch $@
-+file2: file1 ; @touch $@
-+!,
-+              '--no-print-directory -j2', "touch file3");
-+
-+#rmfiles('file1', 'file2', 'file3', 'file4');
-+
- if ($all_tests) {
-     # Jobserver FD handling is messed up in some way.
-     # Savannah bug #28189
diff --git a/testing/make/make-3.82-expensive_glob.patch b/testing/make/make-3.82-expensive_glob.patch
deleted file mode 100644
index 8663f5039..000000000
--- a/testing/make/make-3.82-expensive_glob.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: read.c
-===================================================================
-RCS file: /sources/make/make/read.c,v
-retrieving revision 1.198
-retrieving revision 1.200
-diff -u -r1.198 -r1.200
---- read.c	29 Apr 2011 15:27:39 -0000	1.198
-+++ read.c	7 May 2011 14:36:12 -0000	1.200
-@@ -2901,6 +2901,7 @@
-       const char *name;
-       const char **nlist = 0;
-       char *tildep = 0;
-+      int globme = 1;
- #ifndef NO_ARCHIVES
-       char *arname = 0;
-       char *memname = 0;
-@@ -3109,32 +3110,40 @@
- 	}
- #endif /* !NO_ARCHIVES */
- 
--      switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
--	{
--	case GLOB_NOSPACE:
--	  fatal (NILF, _("virtual memory exhausted"));
--
--	case 0:
--          /* Success.  */
--          i = gl.gl_pathc;
--          nlist = (const char **)gl.gl_pathv;
--          break;
--
--        case GLOB_NOMATCH:
--          /* If we want only existing items, skip this one.  */
--          if (flags & PARSEFS_EXISTS)
--            {
--              i = 0;
--              break;
--            }
--          /* FALLTHROUGH */
--
--	default:
--          /* By default keep this name.  */
-+      /* glob() is expensive: don't call it unless we need to.  */
-+      if (!(flags & PARSEFS_EXISTS) && strpbrk (name, "?*[") == NULL)
-+        {
-+          globme = 0;
-           i = 1;
-           nlist = &name;
--          break;
--	}
-+        }
-+      else
-+        switch (glob (name, GLOB_NOSORT|GLOB_ALTDIRFUNC, NULL, &gl))
-+          {
-+          case GLOB_NOSPACE:
-+            fatal (NILF, _("virtual memory exhausted"));
-+
-+          case 0:
-+            /* Success.  */
-+            i = gl.gl_pathc;
-+            nlist = (const char **)gl.gl_pathv;
-+            break;
-+
-+          case GLOB_NOMATCH:
-+            /* If we want only existing items, skip this one.  */
-+            if (flags & PARSEFS_EXISTS)
-+              {
-+                i = 0;
-+                break;
-+              }
-+            /* FALLTHROUGH */
-+
-+          default:
-+            /* By default keep this name.  */
-+            i = 1;
-+            nlist = &name;
-+            break;
-+          }
- 
-       /* For each matched element, add it to the list.  */
-       while (i-- > 0)
-@@ -3174,7 +3183,8 @@
- #endif /* !NO_ARCHIVES */
-           NEWELT (concat (2, prefix, nlist[i]));
- 
--      globfree (&gl);
-+      if (globme)
-+        globfree (&gl);
- 
- #ifndef NO_ARCHIVES
-       if (arname)
-Index: tests/scripts/functions/wildcard
-===================================================================
-RCS file: /sources/make/make/tests/scripts/functions/wildcard,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -u -r1.6 -r1.7
---- tests/scripts/functions/wildcard	13 Jun 2009 21:21:49 -0000	1.6
-+++ tests/scripts/functions/wildcard	7 May 2011 14:36:11 -0000	1.7
-@@ -88,4 +88,16 @@
- !,
-               '', "\n");
- 
-+# TEST #5: wildcard used to verify file existence
-+
-+touch('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+              '', "file=xxx.yyy\n");
-+
-+unlink('xxx.yyy');
-+
-+run_make_test(q!exists: ; @echo file=$(wildcard xxx.yyy)!,
-+              '', "file=\n");
-+
- 1;
diff --git a/testing/make/make-3.82-makeflags.patch b/testing/make/make-3.82-makeflags.patch
deleted file mode 100644
index 3cba3c402..000000000
--- a/testing/make/make-3.82-makeflags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: main.c
-===================================================================
-RCS file: /sources/make/make/main.c,v
-retrieving revision 1.246
-diff -u -r1.246 main.c
---- main.c	29 Aug 2010 23:05:27 -0000	1.246
-+++ main.c	27 Jul 2011 22:03:12 -0000
-@@ -2091,10 +2095,16 @@
- 
-           /* Reset makeflags in case they were changed.  */
-           {
-+            if (master_job_slots)
-+              {
-+                assert (job_slots == default_job_slots);
-+                job_slots = master_job_slots;
-+              }
-             const char *pv = define_makeflags (1, 1);
-             char *p = alloca (sizeof ("MAKEFLAGS=") + strlen (pv) + 1);
-             sprintf (p, "MAKEFLAGS=%s", pv);
-             putenv (allocated_variable_expand (p));
-+            job_slots = default_job_slots;
-           }
- 
- 	  if (ISDB (DB_BASIC))
-@@ -2825,9 +2852,11 @@
- 		       && (*(unsigned int *) cs->value_ptr ==
- 			   *(unsigned int *) cs->noarg_value))
- 		ADD_FLAG ("", 0); /* Optional value omitted; see below.  */
-+#if 0
- 	      else if (cs->c == 'j')
- 		/* Special case for `-j'.  */
- 		ADD_FLAG ("1", 1);
-+#endif
- 	      else
- 		{
- 		  char *buf = alloca (30);
diff --git a/testing/make/make-3.82-sort-blank.patch b/testing/make/make-3.82-sort-blank.patch
deleted file mode 100644
index 2e73f5b7c..000000000
--- a/testing/make/make-3.82-sort-blank.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urp make-3.82/function.c make-3.82-pm/function.c
---- make-3.82/function.c	2010-07-13 03:20:39.000000000 +0200
-+++ make-3.82-pm/function.c	2010-10-27 01:43:27.000000000 +0200
-@@ -1138,12 +1138,12 @@ func_sort (char *o, char **argv, const c
-     {
-       char c = *(t++);
- 
--      if (! isspace ((unsigned char)c))
-+      if (! isblank ((unsigned char)c))
-         continue;
- 
-       ++wordi;
- 
--      while (isspace ((unsigned char)*t))
-+      while (isblank ((unsigned char)*t))
-         ++t;
-     }
diff --git a/testing/make/make.install b/testing/make/make.install
deleted file mode 100644
index 84260853c..000000000
--- a/testing/make/make.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(make.info make.info-1 make.info-2)
-
-post_install() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [[ -x usr/bin/install-info ]] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/man-db/PKGBUILD b/testing/man-db/PKGBUILD
deleted file mode 100644
index 9e2a3a8cd..000000000
--- a/testing/man-db/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 166764 2012-09-18 18:20:39Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-
-pkgname=man-db
-pkgver=2.6.3
-pkgrel=1
-pkgdesc="A utility for reading man pages"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/man-db/"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline')
-optdepends=('less' 'gzip')
-backup=('etc/man_db.conf'
-	'etc/cron.daily/man-db')
-conflicts=('man')
-provides=('man')
-replaces=('man')
-install=${pkgname}.install
-source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig}
-        convert-mans man-db.cron.daily)
-options=('!libtool')
-md5sums=('a593a095599ae97bcacf8d038659a146'
-         '64975c20b1a6453f9b860ff7f916bcf1'
-         '2b7662a7d5b33fe91f9f3e034361a2f6'
-         'd30c39ae47560304471b5461719e0f03')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-	--with-db=gdbm --disable-setuid --enable-mandirs=GNU \
-	--with-sections="1 n l 8 3 0 2 5 4 9 6 7"
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  # part of groff pkg
-  rm -f ${pkgdir}/usr/bin/zsoelim
-
-  # script from LFS to convert manpages, see
-  # http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html
-  install -D -m755 ${srcdir}/convert-mans  ${pkgdir}/usr/bin/convert-mans 
-
-  #install whatis cron script
-  install -D -m744 ${srcdir}/man-db.cron.daily ${pkgdir}/etc/cron.daily/man-db
-}
-
diff --git a/testing/man-db/convert-mans b/testing/man-db/convert-mans
deleted file mode 100644
index 58a0224b0..000000000
--- a/testing/man-db/convert-mans
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh -e
-FROM="$1"
-TO="$2"
-shift ; shift
-while [ $# -gt 0 ]
-do
-        FILE="$1"
-        shift
-        iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv
-        mv .tmp.iconv "$FILE"
-done
diff --git a/testing/man-db/man-db.cron.daily b/testing/man-db/man-db.cron.daily
deleted file mode 100755
index 53e66e1e9..000000000
--- a/testing/man-db/man-db.cron.daily
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEMANDB="/usr/bin/mandb --quiet"
-
-# Update the "whatis" database
-#/usr/sbin/makewhatis -u -w
-
-# taken from Debian
-# man-db cron daily
-set -e
-
-if ! [ -d /var/cache/man ]; then
-    # Recover from deletion, per FHS.
-    mkdir -p /var/cache/man
-    chmod 755 /var/cache/man
-fi
-
-# regenerate man database
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEMANDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEMANDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEMANDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEMANDB}"
-fi
-
-${UPDATEMANDB}
-
-exit 0
diff --git a/testing/man-db/man-db.install b/testing/man-db/man-db.install
deleted file mode 100644
index f6f0f27a6..000000000
--- a/testing/man-db/man-db.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  echo "it's recommended to create an initial"
-  echo "database running as root:"
-  echo "\"/usr/bin/mandb --quiet\""
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 2.5.3-2`" -lt 0 ]; then
-     echo "systemuser \"man\" is no more required"
-     echo "run \"userdel man\". please also"
-     echo "chown root:root /var/cache/man"
-  fi
-  # force database rebuild to get rid off badly imported pages
-  if [ "`vercmp $2 2.6.0.2`" -lt 0 ]; then
-     echo "(re)building database..."
-     mandb -c --quiet
-  fi
-}
-
-post_remove() {
-  rm -rf /var/cache/man
-}
diff --git a/testing/mediastreamer/PKGBUILD b/testing/mediastreamer/PKGBUILD
deleted file mode 100644
index 602e9f631..000000000
--- a/testing/mediastreamer/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 163061 2012-07-06 15:21:41Z ibiru $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Adrià Arrufat <swiftscythe@gmail.com>
-
-pkgname=mediastreamer
-pkgver=2.8.2
-pkgrel=2
-pkgdesc="A library written in C that allows you to create and run audio and video streams"
-arch=('i686' 'x86_64')
-url="http://www.linphone.org/"
-license=('GPL')
-depends=('ortp' 'speex' 'ffmpeg' 'v4l-utils' 'libxv' 'libpulse')
-makedepends=('intltool')
-options=('!libtool')
-source=("http://download-mirror.savannah.gnu.org/releases/linphone/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
-        mediastreamer-ffmpeg.patch)
-md5sums=('e51ea9d5fce1396b374d10473dfbadec'
-         '805da7def98f367e621363fa0c951fe8'
-         'f147546489a973f148ce3dd2dba36834')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  patch -p1 -i "${srcdir}"/mediastreamer-ffmpeg.patch
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mediastreamer/mediastreamer-ffmpeg.patch b/testing/mediastreamer/mediastreamer-ffmpeg.patch
deleted file mode 100644
index 944d4b833..000000000
--- a/testing/mediastreamer/mediastreamer-ffmpeg.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-diff --git a/include/mediastreamer2/msvideo.h b/include/mediastreamer2/msvideo.h
-index 5ae8a63..86edf86 100644
---- mediastreamer2/include/mediastreamer2/msvideo.h
-+++ mediastreamer2/include/mediastreamer2/msvideo.h
-@@ -21,6 +21,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #define msvideo_h
- 
- #include <mediastreamer2/msfilter.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
- /* some global constants for video MSFilter(s) */
- #define MS_VIDEO_SIZE_SQCIF_W 128
-@@ -206,7 +212,9 @@ extern "C"{
- MS2_PUBLIC int ms_pix_fmt_to_ffmpeg(MSPixFmt fmt);
- MS2_PUBLIC MSPixFmt ffmpeg_pix_fmt_to_ms(int fmt);
- MS2_PUBLIC MSPixFmt ms_fourcc_to_pix_fmt(uint32_t fourcc);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- MS2_PUBLIC void ms_ffmpeg_check_init(void);
-+#endif
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk(MSPicture *buf, mblk_t *m);
- MS2_PUBLIC int ms_yuv_buf_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, int w, int h);
- MS2_PUBLIC int ms_picture_init_from_mblk_with_size(MSPicture *buf, mblk_t *m, MSPixFmt fmt, int w, int h);
-diff --git a/src/h264dec.c b/src/h264dec.c
-index 223de3d..8c40a7c 100644
---- mediastreamer2/src/h264dec.c
-+++ mediastreamer2/src/h264dec.c
-@@ -44,7 +44,9 @@ typedef struct _DecData{
- static void ffmpeg_init(){
- 	static bool_t done=FALSE;
- 	if (!done){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		avcodec_init();
-+#endif
- 		avcodec_register_all();
- 		done=TRUE;
- 	}
-diff --git a/src/mscommon.c b/src/mscommon.c
-index 2cab005..bebb946 100644
---- mediastreamer2/src/mscommon.c
-+++ mediastreamer2/src/mscommon.c
-@@ -33,9 +33,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include "mediastreamer2/mscodecutils.h"
- #include "mediastreamer2/msfilter.h"
- #include <ortp/ortp_srtp.h>
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
- extern void __register_ffmpeg_encoders_if_possible(void);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- extern bool_t libmsandroiddisplay_init(void);
- extern void libmsandroiddisplaybad_init(void);
- extern void libmsandroidopengldisplay_init(void);
-@@ -645,7 +653,9 @@ void ms_init(){
- 		}
- 	}
- #if !defined(NO_FFMPEG)
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	__register_ffmpeg_encoders_if_possible();
- #endif
- #endif
-diff --git a/src/videodec.c b/src/videodec.c
-index c04e1e9..a455075 100644
---- mediastreamer2/src/videodec.c
-+++ mediastreamer2/src/videodec.c
-@@ -27,9 +27,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- #include "mediastreamer2/msvideo.h"
- #include "mediastreamer2/msticker.h"
- #include "rfc2429.h"
-+#ifndef INT64_C
-+#define INT64_C(c) (c ## LL)
-+#define UINT64_C(c) (c ## ULL)
-+#endif
-+#include <libavutil/avutil.h>
-+#include <libavcodec/version.h>
- 
--
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- extern void ms_ffmpeg_check_init();
-+#endif
- 
- 
- typedef struct DecState{
-@@ -50,7 +57,9 @@ typedef struct DecState{
- 
- static void dec_init(MSFilter *f, enum CodecID cid){
- 	DecState *s=(DecState *)ms_new0(DecState,1);
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	
- 	avcodec_get_context_defaults(&s->av_context);
- 	s->av_codec=NULL;
-diff --git a/src/videoenc.c b/src/videoenc.c
-index 21d016f..520f06a 100644
---- mediastreamer2/src/videoenc.c
-+++ mediastreamer2/src/videoenc.c
-@@ -37,7 +37,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- 
- #define RATE_CONTROL_MARGIN 15000 /*bits/second*/
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- static bool_t avcodec_initialized=FALSE;
-+#endif
- 
- #ifdef ENABLE_LOG_FFMPEG
- 
-@@ -51,6 +53,7 @@ void ms_ffmpeg_log_callback(void* ptr, int level, const char* fmt, va_list vl)
- 
- #endif
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- void ms_ffmpeg_check_init(){
- 	if(!avcodec_initialized){
- 		avcodec_init();
-@@ -62,6 +65,7 @@ void ms_ffmpeg_check_init(){
- #endif
- 	}
- }
-+#endif
- 
- /* the goal of this small object is to tell when to send I frames at startup:
- at 2 and 4 seconds*/
-@@ -201,7 +205,9 @@ static void enc_init(MSFilter *f, enum CodecID codec)
- {
- 	EncState *s=(EncState *)ms_new(EncState,1);
- 	f->data=s;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	s->profile=0;/*always default to profile 0*/
- 	s->comp_buf=NULL;
- 	s->fps=15;
-@@ -300,9 +306,13 @@ static void prepare_h263(EncState *s){
- 	if (s->profile==0){
- 		s->codec=CODEC_ID_H263;
- 	}else{
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		c->flags|=CODEC_FLAG_H263P_UMV;
-+#endif
- 		c->flags|=CODEC_FLAG_AC_PRED;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		c->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+#endif
- 		/*
- 		c->flags|=CODEC_FLAG_OBMC;
- 		c->flags|=CODEC_FLAG_AC_PRED;
-@@ -372,7 +382,11 @@ static void add_rfc2190_header(mblk_t **packet, AVCodecContext *context){
- 	// assume video size is CIF or QCIF
- 	if (context->width == 352 && context->height == 288) header->b_wptr[1] = 0x60;
- 	else header->b_wptr[1] = 0x40;
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	if (context->coded_frame->pict_type != FF_I_TYPE) header->b_wptr[1] |= 0x10;
-+#else
-+	if (context->coded_frame->pict_type != AV_PICTURE_TYPE_I) header->b_wptr[1] |= 0x10;
-+#endif
- 	header->b_wptr += 4;
- 	header->b_cont = *packet;
- 	*packet = header;
-@@ -779,7 +793,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- 		s->req_vfu=TRUE;
- 	}
- 	if (s->req_vfu){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		pict.pict_type=FF_I_TYPE;
-+#else
-+		pict.pict_type=AV_PICTURE_TYPE_I;
-+#endif
- 		s->req_vfu=FALSE;
- 	}
- 	comp_buf->b_rptr=comp_buf->b_wptr=comp_buf->b_datap->db_base;
-@@ -799,7 +817,11 @@ static void process_frame(MSFilter *f, mblk_t *inm){
- 		if (s->framenum==1){
- 			video_starter_first_frame (&s->starter,f->ticker->time);
- 		}
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 		if (c->coded_frame->pict_type==FF_I_TYPE){
-+#else
-+		if (c->coded_frame->pict_type==AV_PICTURE_TYPE_I){
-+#endif
- 			ms_message("Emitting I-frame");
- 		}
- 		comp_buf->b_wptr+=error;
-@@ -1067,7 +1089,9 @@ MSFilterDesc ms_mjpeg_enc_desc={
- #endif
- 
- void __register_ffmpeg_encoders_if_possible(void){
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 0, 100)
- 	ms_ffmpeg_check_init();
-+#endif
- 	if (avcodec_find_encoder(CODEC_ID_MPEG4))
- 		ms_filter_register(&ms_mpeg4_enc_desc);
- 	if (avcodec_find_encoder(CODEC_ID_H263)){
diff --git a/testing/memcached/PKGBUILD b/testing/memcached/PKGBUILD
deleted file mode 100644
index 540073226..000000000
--- a/testing/memcached/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165366 2012-08-16 14:41:50Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Contributor: Michael Irwin <6d6469@gmail.com>
-
-pkgname=memcached
-pkgver=1.4.14
-pkgrel=2
-pkgdesc="A distributed memory object caching system"
-arch=(i686 x86_64)
-url="http://memcached.org/"
-license=('GPL')
-depends=('libevent')
-optdepends=('perl: for memcached-tool usage')
-backup=('etc/conf.d/memcached')
-install=memcached.install
-source=(http://memcached.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        memcached.conf
-		memcached.sh
-		memcached.service)
-sha256sums=('f2e2ad8ee8d256f2c3748d7f741dcddfd0ab6bdece6fa1c18484e83f311156ef'
-            '17f66873b77e96c6706dcf13ab0aa8ddff94b2851366c787fc23e614dfc11f47'
-            '72efa639c5a39c7c14f07cc51731ebbf82299870d9cf31cf3aaa981bc084b4eb'
-            '453cad82bddb25fac43fd5cedc5702b9b6c6abaf7498e21445facf20f25f53a6')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -D -m 755 scripts/memcached-tool "$pkgdir"/usr/bin/memcached-tool
-  install -D -m 644 ../memcached.conf "$pkgdir"/etc/conf.d/memcached
-  install -D -m 755 ../memcached.sh "$pkgdir"/etc/rc.d/memcached
-  install -D -m 644 ../memcached.service "$pkgdir"/usr/lib/systemd/system/memcached.service
-}
diff --git a/testing/memcached/memcached.conf b/testing/memcached/memcached.conf
deleted file mode 100644
index 4415e1a55..000000000
--- a/testing/memcached/memcached.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# user to run memcached as; also used for pid file ownership
-MEMCACHED_USER="memcached"
-# see 'memcached -h' for available options
-MEMCACHED_ARGS="-l 127.0.0.1 -t 1"
diff --git a/testing/memcached/memcached.install b/testing/memcached/memcached.install
deleted file mode 100644
index 6009b713f..000000000
--- a/testing/memcached/memcached.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-  if ! getent group memcached >/dev/null; then
-    groupadd --system memcached
-  fi
-  if ! getent passwd memcached >/dev/null; then
-    useradd --system -c 'memcached user' -g memcached -d / -s /bin/bash memcached
-    passwd -l memcached >/dev/null
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  if getent passwd memcached >/dev/null; then
-    userdel memcached
-  fi
-  if getent group memcached >/dev/null; then
-    groupdel memcached
-  fi
-}
diff --git a/testing/memcached/memcached.service b/testing/memcached/memcached.service
deleted file mode 100644
index c6e15fb7c..000000000
--- a/testing/memcached/memcached.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Memcached Daemon
-After=network.target
-
-[Service]
-User=memcached
-# Remove '-l 127.0.0.1' to listen on all addresses
-ExecStart=/usr/bin/memcached -l 127.0.0.1
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/memcached/memcached.sh b/testing/memcached/memcached.sh
deleted file mode 100644
index 9c9727507..000000000
--- a/testing/memcached/memcached.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/memcached
-
-PIDFILE='/var/run/memcached.pid'
-
-getpid() {
-  local pid
-  pid=$(cat $PIDFILE 2>/dev/null)
-  # if the process is no longer valid, don't return it
-  if [ -n "$pid" ]; then
-    if ! ps -p $pid >/dev/null; then
-      rm -f $PIDFILE
-      pid=""
-    fi
-  fi
-  echo $pid
-}
-
-PID="$(getpid)"
-
-case "$1" in
-  start)
-    stat_busy "Starting memcached"
-    # memcached is retarded and doesn't write to the pidfile
-    # before it drops permissions
-    if [ -n "$PID" ]; then
-      stat_fail
-    elif [ -z "$MEMCACHED_USER"  ]; then
-      echo "MEMCACHED_USER must be defined in /etc/conf.d/memcached"
-      stat_fail
-    else
-      touch $PIDFILE && chown $MEMCACHED_USER $PIDFILE
-      /usr/bin/memcached -d -P $PIDFILE -u $MEMCACHED_USER $MEMCACHED_ARGS
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        add_daemon memcached
-        stat_done
-      fi
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping memcached"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f $PIDFILE
-      rm_daemon memcached
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/mesa/LICENSE b/testing/mesa/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/testing/mesa/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
deleted file mode 100644
index 22bb0c339..000000000
--- a/testing/mesa/PKGBUILD
+++ /dev/null
@@ -1,296 +0,0 @@
-# $Id: PKGBUILD 168375 2012-10-09 16:09:24Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=mesa
-pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
-
-#_git=true
-#_gitdate=20121006
-_git=false
-
-if [ "${_git}" = "true" ]; then
-    pkgver=8.99.git_$_gitdate
-  else
-    pkgver=9.0
-fi
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' 
-             'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-options=('!libtool')
-source=(LICENSE
-        git_fixes.diff)
-if [ "${_git}" = "true" ]; then
-	# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
-	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
-	source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-7851d398def2df3f6836a500d67123eed50f3943.tar.gz")
-  else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
-	#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
-)
-fi
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '2ebce12196dbb7b69bdf7ef53b8afdee'
-         '60e557ce407be3732711da484ab3db6c')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-    patch -Np1 -i ${srcdir}/git_fixes.diff
-
-    COMMONOPTS="--prefix=/usr \
-    --sysconfdir=/etc \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
-    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
-    --enable-gallium-llvm \
-    --enable-egl \
-    --enable-gallium-egl \
-    --with-egl-platforms=x11,drm \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-vdpau "
-
-# not default:
-#    --enable-gallium-egl enable optional EGL state tracker (not required for
-#                          EGL support in Gallium with OpenGL and OpenGL ES)
-#                          [default=disable]
-#    --enable-xa             enable build of the XA X Acceleration API                          [default=no]
-
-
-if [ "${_git}" = "true" ]; then
-    ./autogen.sh \
-      $COMMONOPTS
-  else
-    autoreconf -vfi
-    ./configure \
-      $COMMONOPTS
-fi
-
-    make
-}
-
-package_libglapi() {
-  depends=('glibc')
-  pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
-
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
-}
-
-package_libgl() {
-  depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs')
-  pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  # libGL & libdricore
-  make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
-  # See FS#26284
-  install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
-  ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_mesa() {
-  # check also gl.pc
-  depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3-D graphics libraries and include files"
-
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS  
-  make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA  
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
-}
-
-package_osmesa() {
-  depends=('libglapi' 'gcc-libs')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages')
-  pkgdesc="Mesa 3D off-screen rendering library"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/osmesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/"
-}
-
-package_libgbm() {
-  depends=('systemd' 'libglapi' 'libdrm')
-  pkgdesc="Mesa gbm library"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
-}
-
-package_libgles() {
-  depends=('libglapi' 'libdrm' 'khrplatform-devel')
-  pkgdesc="Mesa GLES libraries and headers"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
-}
-
-package_libegl() {
-  # check also egl.pc
-  depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel')
-  pkgdesc="Mesa EGL libraries and headers"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/doc/libegl"
-  install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
-  
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install
-  
-  make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall
-  make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
-  
-  # fix file conflicts
-  rm -rf ${pkgdir}/usr/include/KHR
-}
-
-package_khrplatform-devel() {
-  pkgdesc="Khronos platform development package"
-
-  install -m755 -d "${pkgdir}/usr/include/KHR"
-  install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" 
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
-}
-
-package_ati-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
-  conflicts=('xf86-video-ati<6.9.0-6')
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-  
-  # classic mesa drivers for radeon,r200
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
-  # gallium3D driver for r300,r600,radeonsi
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install
-  # vdpau driver
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
-}
-
-package_intel-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa DRI drivers for Intel"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
-}
-
-package_nouveau-dri() {
-  depends=("libgl=${pkgver}")
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # fix linking because of splitted package
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install
-
-  # 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
-  # vdpau driver
-  make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install
-  
-  # fix linking because of splitted package - cleanup
-  make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
-}
-
-package_svga-dri() {
-  depends=('gcc-libs' 'libdrm' 'expat')
-  pkgdesc="Gallium3D VMware guest GL driver"
-
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/"
-}
diff --git a/testing/mesa/git_fixes.diff b/testing/mesa/git_fixes.diff
deleted file mode 100644
index 8132d1d10..000000000
--- a/testing/mesa/git_fixes.diff
+++ /dev/null
@@ -1,93 +0,0 @@
-From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
-From: Ian Romanick <ian.d.romanick@intel.com>
-Date: Mon, 08 Oct 2012 22:07:10 +0000
-Subject: docs: Add 9.0 release md5sums
-
-Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
----
-diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
-index d72c5bb..02b7324 100644
---- a/docs/relnotes-9.0.html
-+++ b/docs/relnotes-9.0.html
-@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
- 
- <h2>MD5 checksums</h2>
- <pre>
--tbd
-+be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
-+60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
-+16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
- </pre>
- 
- 
---
-cgit v0.9.0.2-2-gbebe
-From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:47:40 +0000
-Subject: mesa: don't call TexImage driver hooks for zero-sized images
-
-This simply avoids some failed assertions but there's no reason to
-call the driver hooks for storing a tex image if its size is zero.
-
-Note: This is a candidate for the stable branches.
-(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 21646cc..8004876 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
-                                           border, internalFormat, texFormat);
- 
-                /* Give the texture to the driver.  <pixels> may be null. */
--               if (compressed) {
--                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
--                                                 imageSize, pixels);
--               }
--               else {
--                  ctx->Driver.TexImage(ctx, dims, texImage, format,
--                                       type, pixels, unpack);
-+               if (width > 0 && height > 0 && depth > 0) {
-+                  if (compressed) {
-+                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
-+                                                    imageSize, pixels);
-+                  }
-+                  else {
-+                     ctx->Driver.TexImage(ctx, dims, texImage, format,
-+                                          type, pixels, unpack);
-+                  }
-                }
- 
-                check_gen_mipmap(ctx, target, texObj, level);
---
-cgit v0.9.0.2-2-gbebe
-From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 05 Oct 2012 22:59:27 +0000
-Subject: mesa: fix error check for zero-sized compressed subtexture
-
-For glCompressedTexSubImage, width or height = 0 is legal.
-Fixes a failure in piglit's s3tc-errors test.
-
-This is for the 9.0 and 8.0 branches.  Already fixed on master.
----
-diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
-index 8004876..38fa9fa 100644
---- a/src/mesa/main/teximage.c
-+++ b/src/mesa/main/teximage.c
-@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
-    if (!_mesa_is_compressed_format(ctx, format))
-       return GL_INVALID_ENUM;
- 
--   if (width < 1 || width > maxTextureSize)
-+   if (width < 0 || width > maxTextureSize)
-       return GL_INVALID_VALUE;
- 
--   if ((height < 1 || height > maxTextureSize)
-+   if ((height < 0 || height > maxTextureSize)
-        && dimensions > 1)
-       return GL_INVALID_VALUE;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/testing/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/testing/miro/PKGBUILD b/testing/miro/PKGBUILD
deleted file mode 100644
index 10503857b..000000000
--- a/testing/miro/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168842 2012-10-16 11:53:52Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-
-pkgname=miro
-pkgver=5.0.4
-pkgrel=2
-pkgdesc="The free and open source internet TV platform"
-arch=('i686' 'x86_64')
-url="http://www.getmiro.com"
-license=('GPL2')
-depends=('python2-dbus' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf'
-         'python2-pysqlite' 'pywebkitgtk' 'shared-mime-info'
-         'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme'
-         'gstreamer0.10-python' 'python2-notify' 'libtorrent-rasterbar'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python2-pycurl' 
-         'gstreamer0.10-ffmpeg' 'ffmpeg' 'mutagen' 'xdg-utils')
-makedepends=('pkg-config' 'boost')
-install=miro.install
-source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz"
-        'ffmpeg.patch')
-sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
-          'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  cd linux
-  patch -p2 -i "${srcdir}"/ffmpeg.patch
-
-  python2 setup.py install --root="${pkgdir}"
-
-  # fix miro startup script so --debug works with python2
-  sed -i "s|which python|which python2|" "${pkgdir}/usr/bin/miro"
-  sed -i "s|./miro.real|/usr/bin/miro.real|" "${pkgdir}/usr/bin/miro"
-
-  # fix python scripts for python2
-  sed -i "s|/usr/bin/env python|/usr/bin/env python2|" "${pkgdir}"/usr/share/miro/resources/searchengines/update-icons.py
-  for i in usr/share/miro/resources/testdata/echonest-replies/generate.py usr/share/miro/resources/searchengines/update-icons.py \
-    usr/share/miro/resources/testdata/7digital-replies/generate.py; do
-    sed -i "s|/usr/bin/python|/usr/bin/python2|" "${pkgdir}"/${i} 
-  done
-
-  # Fakeroot segfaults on these; remove
-  if [ ${CARCH} == "i686" ]; then
-    rm -f "${pkgdir}"/usr/bin/codegen.Linux-x86_64 || true
-  else
-    rm -f "${pkgdir}"/usr/bin/codegen.Linux-i686 || true
-  fi
-}
diff --git a/testing/miro/ffmpeg.patch b/testing/miro/ffmpeg.patch
deleted file mode 100644
index 99c14107d..000000000
--- a/testing/miro/ffmpeg.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- miro-5.0.1/linux/miro-segmenter.c~	2012-07-06 14:33:24.618082171 +0000
-+++ miro-5.0.1/linux/miro-segmenter.c	2012-07-06 15:10:19.564146117 +0000
-@@ -156,7 +156,7 @@
-         exit(1);
-     }
- 
--    ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
-+    ret = avformat_open_input(&ic, input, ifmt, 0);
-     if (ret != 0) {
-         fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret);
-         exit(1);
-@@ -215,12 +215,7 @@
-         }
-     }
- 
--    if (av_set_parameters(oc, NULL) < 0) {
--        fprintf(stderr, "Invalid output format parameters\n");
--        exit(1);
--    }
--
--    dump_format(oc, 0, input, 1);
-+    av_dump_format(oc, 0, input, 1);
- 
-     if (video_st) {
-         codec = avcodec_find_decoder(video_st->codec->codec_id);
-@@ -233,12 +228,12 @@
-         }
-     }
- 
--    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+    if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-         fprintf(stderr, "Could not open '%s'\n", output_filename);
-         exit(1);
-     }
- 
--    if (av_write_header(oc)) {
-+    if (avformat_write_header(oc, NULL)) {
-         fprintf(stderr, "Could not write mpegts header to first output file\n");
- 
-         exit(1);
-@@ -274,10 +269,10 @@
-         }
- 
-         if (segment_time - prev_segment_time >= segment_duration) {
--            put_flush_packet(oc->pb);
--            url_fclose(oc->pb);
-+            avio_flush(oc->pb);
-+            avio_close(oc->pb);
- 
--            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
-+            if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
-                 fprintf(stderr, "Could not open '%s'\n", output_filename);
-                 break;
-             }
-@@ -307,7 +302,7 @@
-         av_freep(&oc->streams[i]);
-     }
- 
--    url_fclose(oc->pb);
-+    avio_close(oc->pb);
-     av_free(oc);
- 
-     /* End-of-transcode marker. */
diff --git a/testing/miro/miro.install b/testing/miro/miro.install
deleted file mode 100644
index a5ee228aa..000000000
--- a/testing/miro/miro.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  xdg-icon-resource forceupdate --theme hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-
diff --git a/testing/mkinitcpio-busybox/PKGBUILD b/testing/mkinitcpio-busybox/PKGBUILD
deleted file mode 100644
index 3c284fe79..000000000
--- a/testing/mkinitcpio-busybox/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 166916 2012-09-22 00:40:47Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=mkinitcpio-busybox
-pkgver=1.20.2
-pkgrel=1
-pkgdesc="base initramfs tools"
-arch=('i686' 'x86_64')
-url="http://www.busybox.net/"
-license=('GPL')
-depends=('glibc')
-options=('!buildflags')
-source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2"
-        'glibc-2.16.patch'
-        'config')
-sha256sums=('eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882'
-            'fb5b6e2a0de4db5401322e5c2474ad8ce6a58615dad45b7109cfe045baf2c88d'
-            'd8064ed6ec21868e4afe057445e2d852b353abd595132cb1ca3ba345988772f0')
-
-build() {
-  cd "$srcdir/busybox-$pkgver"
-
-  local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing"
-
-  sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \
-    "$srcdir/config" > .config
-
-  patch -Np1 < "$srcdir/glibc-2.16.patch"
-
-  make
-}
-
-package() {
-  install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/usr/lib/initcpio/busybox"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/mkinitcpio-busybox/config b/testing/mkinitcpio-busybox/config
deleted file mode 100644
index ed84c5383..000000000
--- a/testing/mkinitcpio-busybox/config
+++ /dev/null
@@ -1,1020 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Busybox version: 1.20.0
-# Sun May 13 11:33:40 2012
-#
-CONFIG_HAVE_DOT_CONFIG=y
-
-#
-# Busybox Settings
-#
-
-#
-# General Configuration
-#
-# CONFIG_DESKTOP is not set
-# CONFIG_EXTRA_COMPAT is not set
-# CONFIG_INCLUDE_SUSv2 is not set
-# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
-CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
-# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
-# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
-CONFIG_SHOW_USAGE=y
-# CONFIG_FEATURE_VERBOSE_USAGE is not set
-# CONFIG_FEATURE_COMPRESS_USAGE is not set
-CONFIG_FEATURE_INSTALLER=y
-# CONFIG_INSTALL_NO_USR is not set
-# CONFIG_LOCALE_SUPPORT is not set
-CONFIG_UNICODE_SUPPORT=y
-# CONFIG_UNICODE_USING_LOCALE is not set
-# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set
-CONFIG_SUBST_WCHAR=63
-CONFIG_LAST_SUPPORTED_WCHAR=767
-# CONFIG_UNICODE_COMBINING_WCHARS is not set
-# CONFIG_UNICODE_WIDE_WCHARS is not set
-# CONFIG_UNICODE_BIDI_SUPPORT is not set
-# CONFIG_UNICODE_NEUTRAL_TABLE is not set
-# CONFIG_UNICODE_PRESERVE_BROKEN is not set
-CONFIG_LONG_OPTS=y
-CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_UTMP is not set
-# CONFIG_FEATURE_WTMP is not set
-# CONFIG_FEATURE_PIDFILE is not set
-CONFIG_FEATURE_SUID=y
-# CONFIG_FEATURE_SUID_CONFIG is not set
-# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
-# CONFIG_SELINUX is not set
-# CONFIG_FEATURE_PREFER_APPLETS is not set
-CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
-CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
-
-#
-# Build Options
-#
-# CONFIG_STATIC is not set
-# CONFIG_PIE is not set
-# CONFIG_NOMMU is not set
-# CONFIG_BUILD_LIBBUSYBOX is not set
-# CONFIG_FEATURE_INDIVIDUAL is not set
-# CONFIG_FEATURE_SHARED_BUSYBOX is not set
-CONFIG_LFS=y
-CONFIG_CROSS_COMPILER_PREFIX=""
-CONFIG_SYSROOT=""
-CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"
-CONFIG_EXTRA_LDFLAGS=""
-CONFIG_EXTRA_LDLIBS=""
-
-#
-# Debugging Options
-#
-# CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_WERROR is not set
-CONFIG_NO_DEBUG_LIB=y
-# CONFIG_DMALLOC is not set
-# CONFIG_EFENCE is not set
-
-#
-# Installation Options ("make install" behavior)
-#
-CONFIG_INSTALL_APPLET_SYMLINKS=y
-# CONFIG_INSTALL_APPLET_HARDLINKS is not set
-# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
-# CONFIG_INSTALL_APPLET_DONT is not set
-# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
-# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
-# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="./_install"
-
-#
-# Busybox Library Tuning
-#
-# CONFIG_FEATURE_SYSTEMD is not set
-# CONFIG_FEATURE_RTMINMAX is not set
-CONFIG_PASSWORD_MINLEN=6
-CONFIG_MD5_SMALL=0
-CONFIG_FEATURE_FAST_TOP=y
-# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_USE_TERMIOS is not set
-CONFIG_FEATURE_EDITING=y
-CONFIG_FEATURE_EDITING_MAX_LEN=1024
-# CONFIG_FEATURE_EDITING_VI is not set
-CONFIG_FEATURE_EDITING_HISTORY=15
-# CONFIG_FEATURE_EDITING_SAVEHISTORY is not set
-# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set
-# CONFIG_FEATURE_REVERSE_SEARCH is not set
-CONFIG_FEATURE_TAB_COMPLETION=y
-# CONFIG_FEATURE_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
-# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
-CONFIG_FEATURE_NON_POSIX_CP=y
-CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y
-CONFIG_FEATURE_COPYBUF_KB=4
-CONFIG_FEATURE_SKIP_ROOTFS=y
-CONFIG_MONOTONIC_SYSCALL=y
-CONFIG_IOCTL_HEX2STR_ERROR=y
-# CONFIG_FEATURE_HWIB is not set
-
-#
-# Applets
-#
-
-#
-# Archival Utilities
-#
-# CONFIG_FEATURE_SEAMLESS_XZ is not set
-# CONFIG_FEATURE_SEAMLESS_LZMA is not set
-# CONFIG_FEATURE_SEAMLESS_BZ2 is not set
-CONFIG_FEATURE_SEAMLESS_GZ=y
-# CONFIG_FEATURE_SEAMLESS_Z is not set
-# CONFIG_AR is not set
-# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
-# CONFIG_FEATURE_AR_CREATE is not set
-# CONFIG_BUNZIP2 is not set
-# CONFIG_BZIP2 is not set
-# CONFIG_CPIO is not set
-# CONFIG_FEATURE_CPIO_O is not set
-# CONFIG_FEATURE_CPIO_P is not set
-# CONFIG_DPKG is not set
-# CONFIG_DPKG_DEB is not set
-# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-# CONFIG_GUNZIP is not set
-# CONFIG_GZIP is not set
-# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
-CONFIG_GZIP_FAST=0
-# CONFIG_LZOP is not set
-# CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
-# CONFIG_RPM is not set
-# CONFIG_TAR is not set
-# CONFIG_FEATURE_TAR_CREATE is not set
-# CONFIG_FEATURE_TAR_AUTODETECT is not set
-# CONFIG_FEATURE_TAR_FROM is not set
-# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
-# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
-# CONFIG_FEATURE_TAR_TO_COMMAND is not set
-# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
-# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
-# CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
-# CONFIG_FEATURE_LZMA_FAST is not set
-# CONFIG_LZMA is not set
-# CONFIG_UNXZ is not set
-# CONFIG_XZ is not set
-# CONFIG_UNZIP is not set
-
-#
-# Coreutils
-#
-CONFIG_BASENAME=y
-CONFIG_CAT=y
-# CONFIG_DATE is not set
-# CONFIG_FEATURE_DATE_ISOFMT is not set
-# CONFIG_FEATURE_DATE_NANO is not set
-# CONFIG_FEATURE_DATE_COMPAT is not set
-# CONFIG_HOSTID is not set
-# CONFIG_ID is not set
-# CONFIG_GROUPS is not set
-CONFIG_TEST=y
-CONFIG_FEATURE_TEST_64=y
-CONFIG_TOUCH=y
-# CONFIG_FEATURE_TOUCH_SUSV3 is not set
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
-# CONFIG_BASE64 is not set
-# CONFIG_WHO is not set
-# CONFIG_USERS is not set
-# CONFIG_CAL is not set
-# CONFIG_CATV is not set
-CONFIG_CHGRP=y
-CONFIG_CHMOD=y
-CONFIG_CHOWN=y
-# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set
-CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-# CONFIG_COMM is not set
-CONFIG_CP=y
-# CONFIG_FEATURE_CP_LONG_OPTIONS is not set
-CONFIG_CUT=y
-CONFIG_DD=y
-# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-# CONFIG_FEATURE_DD_IBS_OBS is not set
-CONFIG_DF=y
-# CONFIG_FEATURE_DF_FANCY is not set
-CONFIG_DIRNAME=y
-# CONFIG_DOS2UNIX is not set
-# CONFIG_UNIX2DOS is not set
-CONFIG_DU=y
-# CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K is not set
-CONFIG_ECHO=y
-CONFIG_FEATURE_FANCY_ECHO=y
-CONFIG_ENV=y
-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
-# CONFIG_EXPAND is not set
-# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
-CONFIG_EXPR=y
-CONFIG_EXPR_MATH_SUPPORT_64=y
-CONFIG_FALSE=y
-# CONFIG_FOLD is not set
-# CONFIG_FSYNC is not set
-CONFIG_HEAD=y
-CONFIG_FEATURE_FANCY_HEAD=y
-CONFIG_INSTALL=y
-CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
-CONFIG_LN=y
-# CONFIG_LOGNAME is not set
-CONFIG_LS=y
-CONFIG_FEATURE_LS_FILETYPES=y
-CONFIG_FEATURE_LS_FOLLOWLINKS=y
-CONFIG_FEATURE_LS_RECURSIVE=y
-CONFIG_FEATURE_LS_SORTFILES=y
-CONFIG_FEATURE_LS_TIMESTAMPS=y
-CONFIG_FEATURE_LS_USERNAME=y
-# CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
-CONFIG_MD5SUM=y
-CONFIG_MKDIR=y
-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
-CONFIG_MKFIFO=y
-CONFIG_MKNOD=y
-CONFIG_MV=y
-CONFIG_FEATURE_MV_LONG_OPTIONS=y
-# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-CONFIG_READLINK=y
-CONFIG_FEATURE_READLINK_FOLLOW=y
-# CONFIG_REALPATH is not set
-CONFIG_RM=y
-CONFIG_RMDIR=y
-CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
-CONFIG_SEQ=y
-CONFIG_SHA1SUM=y
-CONFIG_SHA256SUM=y
-CONFIG_SHA512SUM=y
-CONFIG_SLEEP=y
-CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_BIG is not set
-# CONFIG_SPLIT is not set
-# CONFIG_FEATURE_SPLIT_FANCY is not set
-CONFIG_STAT=y
-CONFIG_FEATURE_STAT_FORMAT=y
-# CONFIG_STTY is not set
-# CONFIG_SUM is not set
-# CONFIG_SYNC is not set
-CONFIG_TAC=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-# CONFIG_TEE is not set
-# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
-CONFIG_TRUE=y
-# CONFIG_TTY is not set
-CONFIG_UNAME=y
-# CONFIG_UNEXPAND is not set
-# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
-CONFIG_UNIQ=y
-# CONFIG_USLEEP is not set
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
-CONFIG_FEATURE_WC_LARGE=y
-# CONFIG_WHOAMI is not set
-CONFIG_YES=y
-
-#
-# Common options for cp and mv
-#
-# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
-# Common options for df, du, ls
-#
-CONFIG_FEATURE_HUMAN_READABLE=y
-
-#
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
-#
-CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
-
-#
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-# CONFIG_FGCONSOLE is not set
-CONFIG_CLEAR=y
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-CONFIG_KBD_MODE=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-# CONFIG_RESET is not set
-# CONFIG_RESIZE is not set
-# CONFIG_FEATURE_RESIZE_PRINT is not set
-# CONFIG_SETCONSOLE is not set
-# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-CONFIG_SETFONT=y
-# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set
-CONFIG_DEFAULT_SETFONT_DIR=""
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
-# CONFIG_SHOWKEY is not set
-
-#
-# Common options for loadfont and setfont
-#
-CONFIG_FEATURE_LOADFONT_PSF2=y
-CONFIG_FEATURE_LOADFONT_RAW=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-# CONFIG_RUN_PARTS is not set
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
-# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-# CONFIG_START_STOP_DAEMON is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
-# CONFIG_WHICH is not set
-
-#
-# Editors
-#
-# CONFIG_PATCH is not set
-CONFIG_VI=y
-CONFIG_FEATURE_VI_MAX_LEN=4096
-CONFIG_FEATURE_VI_8BIT=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-# CONFIG_CMP is not set
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
-# CONFIG_FEATURE_ALLOW_EXEC is not set
-
-#
-# Finding Utilities
-#
-# CONFIG_FIND is not set
-# CONFIG_FEATURE_FIND_PRINT0 is not set
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_MMIN is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_MAXDEPTH is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
-# CONFIG_FEATURE_FIND_EXEC is not set
-# CONFIG_FEATURE_FIND_USER is not set
-# CONFIG_FEATURE_FIND_GROUP is not set
-# CONFIG_FEATURE_FIND_NOT is not set
-# CONFIG_FEATURE_FIND_DEPTH is not set
-# CONFIG_FEATURE_FIND_PAREN is not set
-# CONFIG_FEATURE_FIND_SIZE is not set
-# CONFIG_FEATURE_FIND_PRUNE is not set
-# CONFIG_FEATURE_FIND_DELETE is not set
-# CONFIG_FEATURE_FIND_PATH is not set
-# CONFIG_FEATURE_FIND_REGEX is not set
-# CONFIG_FEATURE_FIND_CONTEXT is not set
-# CONFIG_FEATURE_FIND_LINKS is not set
-CONFIG_GREP=y
-CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
-# CONFIG_FEATURE_GREP_CONTEXT is not set
-# CONFIG_XARGS is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set
-# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set
-
-#
-# Init Utilities
-#
-# CONFIG_BOOTCHARTD is not set
-# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
-# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
-CONFIG_HALT=y
-# CONFIG_FEATURE_CALL_TELINIT is not set
-CONFIG_TELINIT_PATH=""
-CONFIG_INIT=y
-# CONFIG_FEATURE_USE_INITTAB is not set
-# CONFIG_FEATURE_KILL_REMOVED is not set
-CONFIG_FEATURE_KILL_DELAY=0
-# CONFIG_FEATURE_INIT_SCTTY is not set
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
-# CONFIG_FEATURE_INIT_COREDUMPS is not set
-# CONFIG_FEATURE_INITRD is not set
-CONFIG_INIT_TERMINAL_TYPE=""
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
-
-#
-# Login/Password Management Utilities
-#
-# CONFIG_ADD_SHELL is not set
-# CONFIG_REMOVE_SHELL is not set
-# CONFIG_FEATURE_SHADOWPASSWDS is not set
-# CONFIG_USE_BB_PWD_GRP is not set
-# CONFIG_USE_BB_SHADOW is not set
-# CONFIG_USE_BB_CRYPT is not set
-# CONFIG_USE_BB_CRYPT_SHA is not set
-# CONFIG_ADDUSER is not set
-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
-# CONFIG_FEATURE_CHECK_NAMES is not set
-CONFIG_FIRST_SYSTEM_ID=0
-CONFIG_LAST_SYSTEM_ID=0
-# CONFIG_ADDGROUP is not set
-# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set
-# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
-# CONFIG_DELUSER is not set
-# CONFIG_DELGROUP is not set
-# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
-# CONFIG_GETTY is not set
-# CONFIG_LOGIN is not set
-# CONFIG_LOGIN_SESSION_AS_CHILD is not set
-# CONFIG_PAM is not set
-# CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_FEATURE_NOLOGIN is not set
-# CONFIG_FEATURE_SECURETTY is not set
-# CONFIG_PASSWD is not set
-# CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
-# CONFIG_CRYPTPW is not set
-# CONFIG_CHPASSWD is not set
-CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
-# CONFIG_SU is not set
-# CONFIG_FEATURE_SU_SYSLOG is not set
-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_SULOGIN is not set
-# CONFIG_VLOCK is not set
-
-#
-# Linux Ext2 FS Progs
-#
-# CONFIG_CHATTR is not set
-# CONFIG_FSCK is not set
-# CONFIG_LSATTR is not set
-# CONFIG_TUNE2FS is not set
-
-#
-# Linux Module Utilities
-#
-# CONFIG_MODINFO is not set
-# CONFIG_MODPROBE_SMALL is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
-# CONFIG_INSMOD is not set
-# CONFIG_RMMOD is not set
-# CONFIG_LSMOD is not set
-# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
-# CONFIG_MODPROBE is not set
-# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
-# CONFIG_DEPMOD is not set
-
-#
-# Options common to multiple modutils
-#
-# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
-# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
-# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
-# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
-# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
-# CONFIG_FEATURE_MODUTILS_ALIAS is not set
-# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
-CONFIG_DEFAULT_MODULES_DIR=""
-CONFIG_DEFAULT_DEPMOD_FILE=""
-
-#
-# Linux System Utilities
-#
-# CONFIG_BLOCKDEV is not set
-# CONFIG_MDEV is not set
-# CONFIG_FEATURE_MDEV_CONF is not set
-# CONFIG_FEATURE_MDEV_RENAME is not set
-# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
-# CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
-# CONFIG_REV is not set
-# CONFIG_ACPID is not set
-# CONFIG_FEATURE_ACPID_COMPAT is not set
-# CONFIG_BLKID is not set
-# CONFIG_FEATURE_BLKID_TYPE is not set
-CONFIG_DMESG=y
-CONFIG_FEATURE_DMESG_PRETTY=y
-# CONFIG_FBSET is not set
-# CONFIG_FEATURE_FBSET_FANCY is not set
-# CONFIG_FEATURE_FBSET_READMODE is not set
-# CONFIG_FDFLUSH is not set
-# CONFIG_FDFORMAT is not set
-# CONFIG_FDISK is not set
-# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
-# CONFIG_FEATURE_FDISK_WRITABLE is not set
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_GPT_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
-# CONFIG_FINDFS is not set
-# CONFIG_FLOCK is not set
-# CONFIG_FREERAMDISK is not set
-# CONFIG_FSCK_MINIX is not set
-# CONFIG_MKFS_EXT2 is not set
-# CONFIG_MKFS_MINIX is not set
-# CONFIG_FEATURE_MINIX2 is not set
-# CONFIG_MKFS_REISER is not set
-# CONFIG_MKFS_VFAT is not set
-CONFIG_GETOPT=y
-CONFIG_FEATURE_GETOPT_LONG=y
-CONFIG_HEXDUMP=y
-# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
-# CONFIG_HD is not set
-# CONFIG_HWCLOCK is not set
-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
-# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
-CONFIG_LOSETUP=y
-# CONFIG_LSPCI is not set
-# CONFIG_LSUSB is not set
-# CONFIG_MKSWAP is not set
-# CONFIG_FEATURE_MKSWAP_UUID is not set
-# CONFIG_MORE is not set
-# CONFIG_MOUNT is not set
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
-# CONFIG_FEATURE_MOUNT_CIFS is not set
-# CONFIG_FEATURE_MOUNT_FLAGS is not set
-# CONFIG_FEATURE_MOUNT_FSTAB is not set
-# CONFIG_PIVOT_ROOT is not set
-# CONFIG_RDATE is not set
-# CONFIG_RDEV is not set
-# CONFIG_READPROFILE is not set
-# CONFIG_RTCWAKE is not set
-# CONFIG_SCRIPT is not set
-# CONFIG_SCRIPTREPLAY is not set
-# CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
-# CONFIG_FEATURE_SWAPON_PRI is not set
-# CONFIG_SWITCH_ROOT is not set
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_UMOUNT_ALL=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
-# CONFIG_VOLUMEID is not set
-# CONFIG_FEATURE_VOLUMEID_EXT is not set
-# CONFIG_FEATURE_VOLUMEID_BTRFS is not set
-# CONFIG_FEATURE_VOLUMEID_REISERFS is not set
-# CONFIG_FEATURE_VOLUMEID_FAT is not set
-# CONFIG_FEATURE_VOLUMEID_HFS is not set
-# CONFIG_FEATURE_VOLUMEID_JFS is not set
-# CONFIG_FEATURE_VOLUMEID_XFS is not set
-# CONFIG_FEATURE_VOLUMEID_NTFS is not set
-# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
-# CONFIG_FEATURE_VOLUMEID_UDF is not set
-# CONFIG_FEATURE_VOLUMEID_LUKS is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
-# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
-# CONFIG_FEATURE_VOLUMEID_ROMFS is not set
-# CONFIG_FEATURE_VOLUMEID_SYSV is not set
-# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
-# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
-
-#
-# Miscellaneous Utilities
-#
-# CONFIG_CONSPY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
-# CONFIG_FEATURE_LESS_DASHCMD is not set
-# CONFIG_FEATURE_LESS_LINENUMS is not set
-# CONFIG_NANDWRITE is not set
-# CONFIG_NANDDUMP is not set
-# CONFIG_SETSERIAL is not set
-# CONFIG_UBIATTACH is not set
-# CONFIG_UBIDETACH is not set
-# CONFIG_UBIMKVOL is not set
-# CONFIG_UBIRMVOL is not set
-# CONFIG_UBIRSVOL is not set
-# CONFIG_UBIUPDATEVOL is not set
-# CONFIG_ADJTIMEX is not set
-# CONFIG_BBCONFIG is not set
-# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
-# CONFIG_BEEP is not set
-CONFIG_FEATURE_BEEP_FREQ=0
-CONFIG_FEATURE_BEEP_LENGTH_MS=0
-# CONFIG_CHAT is not set
-# CONFIG_FEATURE_CHAT_NOFAIL is not set
-# CONFIG_FEATURE_CHAT_TTY_HIFI is not set
-# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set
-# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set
-# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
-# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
-# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
-# CONFIG_CROND is not set
-# CONFIG_FEATURE_CROND_D is not set
-# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-CONFIG_FEATURE_CROND_DIR=""
-# CONFIG_CRONTAB is not set
-# CONFIG_DC is not set
-# CONFIG_FEATURE_DC_LIBM is not set
-# CONFIG_DEVFSD is not set
-# CONFIG_DEVFSD_MODLOAD is not set
-# CONFIG_DEVFSD_FG_NP is not set
-# CONFIG_DEVFSD_VERBOSE is not set
-# CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
-# CONFIG_FBSPLASH is not set
-# CONFIG_FLASHCP is not set
-# CONFIG_FLASH_LOCK is not set
-# CONFIG_FLASH_UNLOCK is not set
-# CONFIG_FLASH_ERASEALL is not set
-# CONFIG_IONICE is not set
-# CONFIG_INOTIFYD is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_SMALL is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
-# CONFIG_HDPARM is not set
-# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
-# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
-# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
-# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
-# CONFIG_MAKEDEVS is not set
-# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
-# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
-# CONFIG_MAN is not set
-# CONFIG_MICROCOM is not set
-# CONFIG_MOUNTPOINT is not set
-# CONFIG_MT is not set
-# CONFIG_RAIDAUTORUN is not set
-# CONFIG_READAHEAD is not set
-# CONFIG_RFKILL is not set
-# CONFIG_RUNLEVEL is not set
-# CONFIG_RX is not set
-# CONFIG_SETSID is not set
-CONFIG_STRINGS=y
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
-# CONFIG_TIME is not set
-# CONFIG_TIMEOUT is not set
-# CONFIG_TTYSIZE is not set
-# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
-# CONFIG_WATCHDOG is not set
-
-#
-# Networking Utilities
-#
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
-# CONFIG_NBDCLIENT is not set
-CONFIG_NC=y
-CONFIG_NC_SERVER=y
-CONFIG_NC_EXTRA=y
-# CONFIG_NC_110_COMPAT is not set
-CONFIG_PING=y
-CONFIG_PING6=y
-CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_WHOIS is not set
-CONFIG_FEATURE_IPV6=y
-# CONFIG_FEATURE_UNIX_LOCAL is not set
-CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
-# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
-# CONFIG_ARP is not set
-# CONFIG_ARPING is not set
-# CONFIG_BRCTL is not set
-# CONFIG_FEATURE_BRCTL_FANCY is not set
-# CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
-# CONFIG_FAKEIDENTD is not set
-# CONFIG_FTPD is not set
-# CONFIG_FEATURE_FTP_WRITE is not set
-# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set
-# CONFIG_FTPGET is not set
-# CONFIG_FTPPUT is not set
-# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
-# CONFIG_HOSTNAME is not set
-# CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_RANGES is not set
-# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
-# CONFIG_FEATURE_HTTPD_SETUID is not set
-# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
-# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set
-# CONFIG_FEATURE_HTTPD_CGI is not set
-# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
-# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
-# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
-# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
-# CONFIG_FEATURE_HTTPD_PROXY is not set
-# CONFIG_FEATURE_HTTPD_GZIP is not set
-CONFIG_IFCONFIG=y
-CONFIG_FEATURE_IFCONFIG_STATUS=y
-CONFIG_FEATURE_IFCONFIG_SLIP=y
-CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
-CONFIG_FEATURE_IFCONFIG_HW=y
-CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
-# CONFIG_IFENSLAVE is not set
-# CONFIG_IFPLUGD is not set
-# CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH=""
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
-# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV4 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
-# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
-# CONFIG_INETD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
-# CONFIG_FEATURE_INETD_RPC is not set
-CONFIG_IP=y
-CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_FEATURE_IP_LINK=y
-CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_FEATURE_IP_RULE=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
-# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-CONFIG_NETSTAT=y
-CONFIG_FEATURE_NETSTAT_WIDE=y
-CONFIG_FEATURE_NETSTAT_PRG=y
-CONFIG_NSLOOKUP=y
-# CONFIG_NTPD is not set
-# CONFIG_FEATURE_NTPD_SERVER is not set
-# CONFIG_PSCAN is not set
-CONFIG_ROUTE=y
-# CONFIG_SLATTACH is not set
-# CONFIG_TCPSVD is not set
-CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
-# CONFIG_TELNETD is not set
-# CONFIG_FEATURE_TELNETD_STANDALONE is not set
-# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
-CONFIG_TFTP=y
-# CONFIG_TFTPD is not set
-
-#
-# Common options for tftp/tftpd
-#
-CONFIG_FEATURE_TFTP_GET=y
-# CONFIG_FEATURE_TFTP_PUT is not set
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
-# CONFIG_TFTP_DEBUG is not set
-# CONFIG_TRACEROUTE is not set
-# CONFIG_TRACEROUTE6 is not set
-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
-# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-# CONFIG_TUNCTL is not set
-# CONFIG_FEATURE_TUNCTL_UG is not set
-# CONFIG_UDHCPC6 is not set
-# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_UDHCPC is not set
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
-# CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
-CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
-# CONFIG_UDPSVD is not set
-# CONFIG_VCONFIG is not set
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
-CONFIG_FEATURE_WGET_TIMEOUT=y
-# CONFIG_ZCIP is not set
-
-#
-# Print Utilities
-#
-# CONFIG_LPD is not set
-# CONFIG_LPR is not set
-# CONFIG_LPQ is not set
-
-#
-# Mail Utilities
-#
-# CONFIG_MAKEMIME is not set
-CONFIG_FEATURE_MIME_CHARSET=""
-# CONFIG_POPMAILDIR is not set
-# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set
-# CONFIG_REFORMIME is not set
-# CONFIG_FEATURE_REFORMIME_COMPAT is not set
-# CONFIG_SENDMAIL is not set
-
-#
-# Process Utilities
-#
-# CONFIG_IOSTAT is not set
-# CONFIG_LSOF is not set
-# CONFIG_MPSTAT is not set
-# CONFIG_NMETER is not set
-# CONFIG_PMAP is not set
-# CONFIG_POWERTOP is not set
-# CONFIG_PSTREE is not set
-# CONFIG_PWDX is not set
-# CONFIG_SMEMCAP is not set
-CONFIG_UPTIME=y
-# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
-CONFIG_FREE=y
-# CONFIG_FUSER is not set
-CONFIG_KILL=y
-CONFIG_KILLALL=y
-# CONFIG_KILLALL5 is not set
-CONFIG_PGREP=y
-CONFIG_PIDOF=y
-CONFIG_FEATURE_PIDOF_SINGLE=y
-CONFIG_FEATURE_PIDOF_OMIT=y
-# CONFIG_PKILL is not set
-CONFIG_PS=y
-CONFIG_FEATURE_PS_WIDE=y
-CONFIG_FEATURE_PS_LONG=y
-# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
-# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
-# CONFIG_RENICE is not set
-# CONFIG_BB_SYSCTL is not set
-# CONFIG_TOP is not set
-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
-# CONFIG_FEATURE_TOP_SMP_CPU is not set
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
-# CONFIG_FEATURE_SHOW_THREADS is not set
-# CONFIG_WATCH is not set
-
-#
-# Runit Utilities
-#
-# CONFIG_RUNSV is not set
-# CONFIG_RUNSVDIR is not set
-# CONFIG_FEATURE_RUNSVDIR_LOG is not set
-# CONFIG_SV is not set
-CONFIG_SV_DEFAULT_SERVICE_DIR=""
-# CONFIG_SVLOGD is not set
-# CONFIG_CHPST is not set
-# CONFIG_SETUIDGID is not set
-# CONFIG_ENVUIDGID is not set
-# CONFIG_ENVDIR is not set
-# CONFIG_SOFTLIMIT is not set
-# CONFIG_CHCON is not set
-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
-# CONFIG_GETENFORCE is not set
-# CONFIG_GETSEBOOL is not set
-# CONFIG_LOAD_POLICY is not set
-# CONFIG_MATCHPATHCON is not set
-# CONFIG_RESTORECON is not set
-# CONFIG_RUNCON is not set
-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
-# CONFIG_SELINUXENABLED is not set
-# CONFIG_SETENFORCE is not set
-# CONFIG_SETFILES is not set
-# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
-# CONFIG_SETSEBOOL is not set
-# CONFIG_SESTATUS is not set
-
-#
-# Shells
-#
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
-# CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-CONFIG_ASH_EXPAND_PRMT=y
-CONFIG_CTTYHACK=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_HISTFILESIZE is not set
-
-#
-# System Logging Utilities
-#
-# CONFIG_SYSLOGD is not set
-# CONFIG_FEATURE_ROTATE_LOGFILE is not set
-# CONFIG_FEATURE_REMOTE_LOG is not set
-# CONFIG_FEATURE_SYSLOGD_DUP is not set
-# CONFIG_FEATURE_SYSLOGD_CFG is not set
-CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
-# CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
-# CONFIG_LOGREAD is not set
-# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
-# CONFIG_KLOGD is not set
-# CONFIG_FEATURE_KLOGD_KLOGCTL is not set
-# CONFIG_LOGGER is not set
diff --git a/testing/mkinitcpio-busybox/glibc-2.16.patch b/testing/mkinitcpio-busybox/glibc-2.16.patch
deleted file mode 100644
index 5e2fb4fa5..000000000
--- a/testing/mkinitcpio-busybox/glibc-2.16.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/libbb.h.orig	2012-09-17 08:28:35.215518120 -0400
-+++ b/include/libbb.h	2012-09-17 08:28:49.807212925 -0400
-@@ -44,6 +44,7 @@
- #include <sys/stat.h>
- #include <sys/time.h>
- #include <sys/types.h>
-+#include <sys/resource.h>
- #ifndef major
- # include <sys/sysmacros.h>
- #endif
diff --git a/testing/mkvtoolnix/PKGBUILD b/testing/mkvtoolnix/PKGBUILD
deleted file mode 100644
index d8ac0b1f7..000000000
--- a/testing/mkvtoolnix/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 163553 2012-07-15 13:17:22Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: xduugu <xduugu@gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.7.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
-             'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('99ea44be570412dadafe4ccaee0cfe6e')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Disable automagic curl dep used for online update checking
-  sed -i -e '/curl/d' configure.in
-  export CURL_CFLAGS="" CURL_LIBS=""
-
-  export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-  export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
-  autoreconf
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib \
-              --disable-gui
-  rake
-
-  mv src/mkvinfo{,-cli}
-
-  ./configure --prefix=/usr \
-              --with-boost-libdir=/usr/lib
-  rake
-}
-
-package_mkvtoolnix-cli() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
-  depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
-  provides=('mkvtoolnix')
-  conflicts=('mkvtoolnix')
-  replaces=('mkvtoolnix')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkvinfo
-  install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
-  rm -rf "${pkgdir}"/usr/bin/mmg
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
-  rm -rf "${pkgdir}"/usr/share/applications
-  rm -rf "${pkgdir}"/usr/share/icons
-  rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
-  pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
-  depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
-  install=mkvtoolnix.install
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  rake DESTDIR="${pkgdir}" install
-  rm -rf "${pkgdir}"/usr/bin/mkv*
-  install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
-  sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
-  rm -rf "${pkgdir}"/usr/share/doc
-  rm -rf "${pkgdir}"/usr/share/locale
-  rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
-  rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}
diff --git a/testing/mkvtoolnix/mkvtoolnix.install b/testing/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 74d9eb2ef..000000000
--- a/testing/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-   if [ -f usr/bin/update-mime-database ]; then
-      update-mime-database usr/share/mime &> /dev/null
-   fi
-}
-
-post_upgrade() {
-   post_install
-}
-
-pre_remove() {
-   post_install
-}
diff --git a/testing/mlocate/PKGBUILD b/testing/mlocate/PKGBUILD
deleted file mode 100644
index d4d79debd..000000000
--- a/testing/mlocate/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 166923 2012-09-22 09:15:37Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: lydgate
-
-pkgname=mlocate
-pkgver=0.26
-pkgrel=1
-pkgdesc='Merging locate/updatedb implementation'
-url='https://fedorahosted.org/mlocate/'
-arch=('i686' 'x86_64')
-license=('GPL')
-backup=('etc/updatedb.conf'
-        'etc/cron.daily/updatedb')
-source=("https://fedorahosted.org/releases/m/l/mlocate/mlocate-${pkgver}.tar.xz"
-	'updatedb.conf'
-	'updatedb.cron')
-sha1sums=('c6e6d81b25359c51c545f4b8ba0f3b469227fcbc'
-          '0150379149bf9d714bc81332d775fc273e7e3535'
-          '8301e6277d27db539af6cf4bc243e8e247bffc2e')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	sed -i '/^groupname /s/mlocate/locate/' Makefile.in
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	chgrp 21 "${pkgdir}/usr/bin/locate"
-	chmod 2755 "${pkgdir}/usr/bin/locate"
-	ln -s locate "${pkgdir}/usr/bin/slocate"
-
-	install -dm755 "${pkgdir}/var/lib"
-	install -dm750 -g21 "${pkgdir}/var/lib/locate"
-	
-	install -Dm644 ../updatedb.conf "${pkgdir}/etc/updatedb.conf"
-	install -Dm744 ../updatedb.cron "${pkgdir}/etc/cron.daily/updatedb"
-}
diff --git a/testing/mlocate/updatedb.conf b/testing/mlocate/updatedb.conf
deleted file mode 100644
index 633c17482..000000000
--- a/testing/mlocate/updatedb.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-PRUNE_BIND_MOUNTS = "yes"
-PRUNEFS = "9p afs anon_inodefs auto autofs bdev binfmt_misc cgroup cifs coda configfs cpuset cramfs debugfs devpts devtmpfs ecryptfs exofs ftpfs fuse fuse.encfs fuse.sshfs fusectl gfs gfs2 hugetlbfs inotifyfs iso9660 jffs2 lustre mqueue ncpfs nfs nfs4 nfsd pipefs proc ramfs rootfs rpc_pipefs securityfs selinuxfs sfs shfs smbfs sockfs sshfs sysfs tmpfs ubifs udf usbfs vboxsf"
-PRUNENAMES = ".git .hg .svn"
-PRUNEPATHS = "/afs /media /mnt /net /sfs /tmp /udev /var/cache /var/lib/pacman/local /var/lock /var/run /var/spool /var/tmp"
diff --git a/testing/mlocate/updatedb.cron b/testing/mlocate/updatedb.cron
deleted file mode 100755
index 431cb533e..000000000
--- a/testing/mlocate/updatedb.cron
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-NICE='nice -n 19'
-IONICE='ionice -c 2 -n 7'
-
-exec ${IONICE} ${NICE} updatedb -f proc
diff --git a/testing/mlocate/updatedb.cron.daily b/testing/mlocate/updatedb.cron.daily
deleted file mode 100755
index cac9bb063..000000000
--- a/testing/mlocate/updatedb.cron.daily
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# nicenesses range from -20 (most favorable scheduling) to 19 (least favorable)
-NICE=19
-
-# 0 for none, 1 for real time, 2 for best-effort, 3 for idle
-IONICE_CLASS=2
-
-# 0-7 (for IONICE_CLASS 1 and 2 only), 0=highest, 7=lowest
-IONICE_PRIORITY=7
-
-UPDATEDB="/usr/bin/updatedb"
-
-if [ -x /usr/bin/nice ]; then
-  UPDATEDB="/usr/bin/nice -n ${NICE:-19} ${UPDATEDB}"
-fi
-
-if [ -x /usr/bin/ionice ]; then
-  UPDATEDB="/usr/bin/ionice -c ${IONICE_CLASS:-2} -n ${IONICE_PRIORITY:-7} ${UPDATEDB}"
-fi
-
-# Update the "locate" database
-if [ -x /usr/bin/updatedb ]; then
-  if [ -f /etc/updatedb.conf ]; then
-    ${UPDATEDB}
-  else
-    ${UPDATEDB} -f proc
-  fi
-fi
diff --git a/testing/moc/PKGBUILD b/testing/moc/PKGBUILD
deleted file mode 100644
index 13d711cc9..000000000
--- a/testing/moc/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 163063 2012-07-06 15:21:51Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=moc
-pkgver=20120224
-pkgrel=2
-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{,.sig})
-sha1sums=('8ad3521d99fe6f2514907088c70e50c84ec09b46'
-          'e8b2396d99692b0c4f85971d3fa6f5aecb1eb9d3')
-
-# source PKGBUILD && mksource
-mksource() {
-  [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
-  _svnver=2412
-  _svntrunk="svn://daper.net/moc/trunk"
-  _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
-  rm -r ${pkgname}-${pkgver}
-  gpg --detach-sign --use-agent -u ${GPGKEY} ${pkgname}-${pkgver}.tar.xz
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-# Disabling aac to use the external ffmpeg to play them (FS#13164)
-  autoreconf -i
-  ./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}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mod_wsgi/PKGBUILD b/testing/mod_wsgi/PKGBUILD
deleted file mode 100644
index 24c2d0767..000000000
--- a/testing/mod_wsgi/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 168687 2012-10-14 04:16:02Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Ryan Coyner <rcoyner@gmail.com>
-
-pkgname=mod_wsgi
-pkgver=3.4
-pkgrel=1
-pkgdesc="Python WSGI adapter module for Apache"
-arch=('i686' 'x86_64')
-url="http://www.modwsgi.org/"
-license=('APACHE')
-depends=('apache' 'python2')
-install=mod_wsgi.install
-source=("http://modwsgi.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('f42d69190ea0c337ef259cbe8d94d985')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-apxs=/usr/sbin/apxs \
-    --with-python=/usr/bin/python2
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mod_wsgi/mod_wsgi.install b/testing/mod_wsgi/mod_wsgi.install
deleted file mode 100644
index d26d61631..000000000
--- a/testing/mod_wsgi/mod_wsgi.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-/bin/cat << ENDOFMESSAGE
-==>
-==>
-==>  To install mod_wsgi, add the following line in 
-==>  /etc/httpd/conf/httpd.conf file :
-==>
-==>  LoadModule wsgi_module modules/mod_wsgi.so
-==>
-==>  and restart/reload Apache.
-==>
-==>
-ENDOFMESSAGE
-}
diff --git a/testing/modemmanager/PKGBUILD b/testing/modemmanager/PKGBUILD
deleted file mode 100644
index 8ec1d2f81..000000000
--- a/testing/modemmanager/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165839 2012-08-31 20:12:30Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-pkgname=modemmanager
-_realname=ModemManager
-pkgver=0.6.0.0
-pkgrel=1
-pkgdesc="Mobile broadband modem management service"
-arch=('i686' 'x86_64')
-url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
-license=('GPL2')
-depends=('dbus-glib' 'udev' 'ppp')
-makedepends=('intltool')
-optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz
-        modem-manager.service)
-sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2'
-            '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe')
-
-build() {
-  cd "$_realname-$pkgver"
-   ./configure --prefix=/usr \
-   	--sysconfdir=/etc \
-	--localstatedir=/var \
-	--with-udev-base-dir=/usr/lib/udev \
-	--disable-static
-  make
-}
-
-package() {
-  cd "$_realname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/modem-manager.service" \
-    "$pkgdir/usr/lib/systemd/system/modem-manager.service"
-  echo "SystemdService=modem-manager.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service"
-}
diff --git a/testing/modemmanager/modem-manager.service b/testing/modemmanager/modem-manager.service
deleted file mode 100644
index bad666be8..000000000
--- a/testing/modemmanager/modem-manager.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Modem Manager
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.ModemManager
-ExecStart=/usr/sbin/modem-manager
-# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog()
-# with LOG_PERROR. But systemd redirects stderr to syslog by default, which
-# results in logging each message twice.
-StandardError=null
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/mono/PKGBUILD b/testing/mono/PKGBUILD
deleted file mode 100644
index 742e6053b..000000000
--- a/testing/mono/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 168257 2012-10-06 23:53:27Z tomegun $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Brice Carpentier <brice@dlfp.org>
-
-pkgname=mono
-pkgver=2.10.8
-pkgrel=2
-pkgdesc="Free implementation of the .NET platform including runtime and compiler"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
-url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=2.10' 'sh')
-makedepends=('pkgconfig')
-options=('!libtool' '!makeflags')
-provides=('monodoc')
-conflicts=('monodoc')
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        mono.binfmt.d)
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  # build mono
-  ./configure --prefix=/usr --sysconfdir=/etc \
-              --with-libgdiplus=installed 
-  make || return 1
-
-  # build jay
-  cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-
-  # install jay
-  cd ${srcdir}/${pkgname}-${pkgver}/mcs/jay
-  make DESTDIR=${pkgdir} prefix=/usr INSTALL=../../install-sh install
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # install binfmt conf file and pathes
-  install -D -m644 ${srcdir}/mono.binfmt.d ${pkgdir}/usr/lib/binfmt.d/mono.conf
-
-  #install license
-  mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 mcs/MIT.X11 ${pkgdir}/usr/share/licenses/${pkgname}/
-  
-  #fix .pc file to be able to request mono on what it depends, fixes #go-oo build
-  sed -i -e "s:#Requires:Requires:" ${pkgdir}/usr/lib/pkgconfig/mono.pc
-}
-md5sums=('411a2d9bcfc37a61eb9aedba88b40533'
-         'b9ef8a65fea497acf176cca16c1e2402')
diff --git a/testing/mono/bug434892.patch b/testing/mono/bug434892.patch
deleted file mode 100644
index d4f46f68c..000000000
--- a/testing/mono/bug434892.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/07/01 20:17:46	107006
-+++ trunk/mcs/class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs	2008/10/28 09:32:46	117243
-@@ -177,7 +177,7 @@
- 				foreach (OperationMessage om in op.Messages) {
- 					Message msg = ctx.Services.GetMessage (om.Message);
- 					foreach (MessagePart part in msg.Parts)
--						parts.Add (part,part);
-+						parts [part] = part; // do not use Add() - there could be the same MessagePart instance.
- 				}
- 			}
- 			
diff --git a/testing/mono/mini_amd64.patch b/testing/mono/mini_amd64.patch
deleted file mode 100644
index f8685c337..000000000
--- a/testing/mono/mini_amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mono/mini/mini-amd64.c	2009-03-19 21:08:18 UTC (rev 129824)
-+++ mono/mini/mini-amd64.c	2009-03-19 21:09:53 UTC (rev 129825)
-@@ -1009,7 +1009,7 @@
- 		locals_size += mono_type_size (ins->inst_vtype, &ialign);
- 	}
- 
--	if ((cfg->num_varinfo > 10000) || (locals_size >= (1 << 15))) {
-+	if ((cfg->num_varinfo > 5000) || (locals_size >= (1 << 15)) || (header->code_size > 110000)) {
- 		/* Avoid hitting the stack_alloc_size < (1 << 16) assertion in emit_epilog () */
- 		cfg->arch.omit_fp = FALSE;
- 	}
-
- 			
diff --git a/testing/mono/mono.binfmt.d b/testing/mono/mono.binfmt.d
deleted file mode 100644
index 3075b0dc5..000000000
--- a/testing/mono/mono.binfmt.d
+++ /dev/null
@@ -1 +0,0 @@
-:CLR:M::MZ::/usr/bin/mono:
diff --git a/testing/monodevelop-debugger-gdb/PKGBUILD b/testing/monodevelop-debugger-gdb/PKGBUILD
deleted file mode 100644
index 3a639b826..000000000
--- a/testing/monodevelop-debugger-gdb/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164745 2012-08-04 11:23:57Z andyrtr $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgname=monodevelop-debugger-gdb
-pkgver=3.0.3.5
-pkgrel=1
-pkgdesc="Mono Debugger support"
-arch=('i686' 'x86_64') # also "any" pkg?
-url="http://monodevelop.com"
-license=('GPL')
-depends=('monodevelop>=3.0.3.5-2' 'gdb')
-makedepends=('mono')
-options=('!makeflags')
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('c16da5cdbda46fb32e0dc730bb433203')
-
-build() {
-  export MONO_SHARED_DIR="${srcdir}/.wabi"
-  mkdir -p "${MONO_SHARED_DIR}"
-  
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
diff --git a/testing/monodevelop/PKGBUILD b/testing/monodevelop/PKGBUILD
deleted file mode 100644
index 1371e34d8..000000000
--- a/testing/monodevelop/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 164744 2012-08-04 11:23:54Z andyrtr $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=monodevelop
-pkgver=3.0.3.5
-pkgrel=2
-pkgdesc="An IDE primarily designed for C# and other .NET languages"
-
-# should probably changed to "any" - no ELF files - OpenSUSE builds it as NOARCH 
-arch=('i686' 'x86_64')
-
-url="http://www.monodevelop.com"
-license=('GPL')
-depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme')
-options=(!makeflags)
-install=monodevelop.install
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        monodevelop-core-addins.pc.in.patch)
-md5sums=('ca46b77b49266112b63a8f5c451c5565'
-         '8466d032735130e37d4091a793a7966c')
-
-build() {
-  export MONO_SHARED_DIR=$srcdir/src/.wabi
-  mkdir -p $MONO_SHARED_DIR
-
-  cd $srcdir/$pkgname-$pkgver
-  # fix location for MonoDevelop.Gettext.dll - breaks gdb build
-  patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch
-  
-  ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb
-  LD_PRELOAD="" make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  LD_PRELOAD="" make DESTDIR=$pkgdir install
-  rm -r $MONO_SHARED_DIR
-}
-
diff --git a/testing/monodevelop/monodevelop-core-addins.pc.in.patch b/testing/monodevelop/monodevelop-core-addins.pc.in.patch
deleted file mode 100644
index c1da3bf1f..000000000
--- a/testing/monodevelop/monodevelop-core-addins.pc.in.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- monodevelop-core-addins.pc.in	2012-07-27 21:33:41.000000000 +0200
-+++ monodevelop-core-addins.pc.in.new	2012-08-04 12:42:36.086516667 +0200
-@@ -6,4 +6,4 @@
- Name: MonoDevelop Core Add-ins
- Description: MonoDevelop Core Add-ins
- Version: @VERSION@
--Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
-+Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll  -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll
diff --git a/testing/monodevelop/monodevelop.install b/testing/monodevelop/monodevelop.install
deleted file mode 100644
index 070e6202c..000000000
--- a/testing/monodevelop/monodevelop.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  update-mime-database /usr/share/mime 1> /dev/null
-  echo "update desktop mime database..."
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  /bin/true
-}
-
-post_remove() {
-  update-mime-database /usr/share/mime 1> /dev/null
-  echo "update desktop mime database..."
-  update-desktop-database -q
-}
diff --git a/testing/mousetweaks/PKGBUILD b/testing/mousetweaks/PKGBUILD
deleted file mode 100644
index 4dddd4cb5..000000000
--- a/testing/mousetweaks/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 2392 2008-06-01 19:38:25Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> 
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=mousetweaks
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Mouse accessibility enhancements for the GNOME desktop"
-arch=(i686 x86_64)
-license=('GPL3' 'FDL')
-depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas')
-makedepends=('gnome-doc-utils' 'intltool')
-groups=('gnome-extra')
-options=('!libtool' '!emptydirs')
-url="http://www.gnome.org"
-install=mousetweaks.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2c48f655c5b53615270503fd1631e0cf7baa5872b20f75af8608983f039c5cfc')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mousetweaks/mousetweaks.install b/testing/mousetweaks/mousetweaks.install
deleted file mode 100644
index 1ae919322..000000000
--- a/testing/mousetweaks/mousetweaks.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 2.90.0) < 0 )); then
-    usr/sbin/gconfpkg --uninstall mousetweaks
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/mpd/PKGBUILD b/testing/mpd/PKGBUILD
deleted file mode 100644
index 0d0222580..000000000
--- a/testing/mpd/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 163064 2012-07-06 15:22:01Z ibiru $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Contributor: Ben <ben@benmazer.net>
-
-pkgname=mpd
-pkgver=0.17
-pkgrel=2
-pkgdesc='Flexible, powerful, server-side application for playing music'
-url='http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
-         'sqlite' 'jack' 'libmms' 'wavpack' 'libmpcdec' 'avahi' 'libid3tag'
-         'libpulse')
-makedepends=('doxygen')
-source=("http://downloads.sourceforge.net/musicpd/${pkgname}-${pkgver}.tar.bz2"
-        'tmpfiles.d'
-        'rc.d') 
-sha1sums=('36201f32ca5729b62b0e6cbddb19ade20ee3f7d7'
-          'f4d5922abb69abb739542d8e93f4dfd748acdad7'
-          '3470d489565f0ed479f1665dd2876f66acb5a585')
-
-backup=('etc/mpd.conf')
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--enable-lastfm \
-		--enable-jack \
-		--enable-pulse \
-		--enable-documentation \
-		--disable-libwrap \
-		--disable-cue \
-		--disable-sidplay \
-		--disable-documentation \
-		--with-systemdsystemunitdir=/usr/lib/systemd/system
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	sed \
-		-e '/^#playlist_directory/c playlist_directory "/var/lib/mpd/playlists"' \
-		-e '/^#db_file/c db_file "/var/lib/mpd/mpd.db"' \
-		-e '/^#pid_file/c pid_file "/run/mpd/mpd.pid"' \
-		-e '/^#state_file/c state_file "/var/lib/mpd/mpdstate"' \
-		-e '/^#user/c user "mpd"' \
-		-i doc/mpdconf.example
-
-	install -Dm755 ../rc.d "${pkgdir}"/etc/rc.d/mpd
-	install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
-	install -Dm644 doc/mpdconf.example "${pkgdir}"/etc/mpd.conf
-	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
-}
diff --git a/testing/mpd/install b/testing/mpd/install
deleted file mode 100644
index 261b8fd0d..000000000
--- a/testing/mpd/install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	getent group mpd &>/dev/null || groupadd -r -g 45 mpd >/dev/null
-	getent passwd mpd &>/dev/null || useradd -r -u 45 -g mpd -d /var/lib/mpd -s /bin/false -G audio mpd >/dev/null
-	true
-}
-
-post_remove() {
-	getent passwd mpd &>/dev/null && userdel mpd >/dev/null
-	getent group mpd &>/dev/null && groupdel mpd >/dev/null
-	true
-}
diff --git a/testing/mpd/rc.d b/testing/mpd/rc.d
deleted file mode 100755
index f00e16067..000000000
--- a/testing/mpd/rc.d
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-	start)
-		stat_busy 'Starting Music Player Daemon'
-		/usr/bin/mpd /etc/mpd.conf &> /dev/null &&
-		{ add_daemon mpd; stat_done; } || stat_fail
-		;;
-	stop)
-		stat_busy 'Stopping Music Player Daemon'
-		/usr/bin/mpd --kill /etc/mpd.conf &> /dev/null &&
-		{ rm_daemon mpd; stat_done; } || stat_fail
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/mpd/tmpfiles.d b/testing/mpd/tmpfiles.d
deleted file mode 100644
index 41c4e743a..000000000
--- a/testing/mpd/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mpd 0755 mpd mpd
diff --git a/testing/mpfr/PKGBUILD b/testing/mpfr/PKGBUILD
deleted file mode 100644
index 44e679f75..000000000
--- a/testing/mpfr/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 165793 2012-08-30 12:11:01Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-
-pkgname=mpfr
-_pkgver=3.1.1
-_patchlevel=p2
-pkgver=${_pkgver}.${_patchlevel}
-pkgrel=1
-pkgdesc="Multiple-precision floating-point library"
-arch=('i686' 'x86_64')
-url="http://www.mpfr.org/"
-license=('LGPL')
-depends=('gmp>=5.0')
-options=('!libtool')
-install=mpfr.install
-source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
-	mpfr-${_pkgver}-${_patchlevel}.patch)
-md5sums=('91d51c41fcf2799e4ee7a7126fc95c17'
-         '91b187a2229211e543ba6fb82a079b2c'
-         'eef835f97bc26ea20b0232bd913acdd8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  ./configure --prefix=/usr --enable-thread-safe --enable-shared
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/mpfr/mpfr-3.1.0.p10.patch b/testing/mpfr/mpfr-3.1.0.p10.patch
deleted file mode 100644
index 0073be709..000000000
--- a/testing/mpfr/mpfr-3.1.0.p10.patch
+++ /dev/null
@@ -1,1896 +0,0 @@
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-05 21:39:57.000000000 +0000
-@@ -0,0 +1 @@
-+mpfr_unlikely
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-03 08:17:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-05 21:39:57.000000000 +0000
-@@ -1 +1 @@
--3.1.0
-+3.1.0-p1
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-@@ -988,10 +988,11 @@
-  ******************************************************/
- 
- /* Theses macros help the compiler to determine if a test is
-- * likely or unlikely. */
-+   likely or unlikely. The !! is necessary in case x is larger
-+   than a long. */
- #if __MPFR_GNUC(3,0) || __MPFR_ICC(8,1,0)
- # define MPFR_LIKELY(x) (__builtin_expect(!!(x),1))
--# define MPFR_UNLIKELY(x) (__builtin_expect((x),0))
-+# define MPFR_UNLIKELY(x) (__builtin_expect(!!(x),0))
- #else
- # define MPFR_LIKELY(x) (x)
- # define MPFR_UNLIKELY(x) (x)
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0"
-+#define MPFR_VERSION_STRING "3.1.0-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-05 21:39:57.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0";
-+  return "3.1.0-p1";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-10-14 10:43:32.000000000 +0000
-@@ -0,0 +1 @@
-+lib-search-path
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-10-14 10:43:32.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p1
-+3.1.0-p2
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p1"
-+#define MPFR_VERSION_STRING "3.1.0-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-10-14 10:43:32.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p1";
-+  return "3.1.0-p2";
- }
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.am mpfr-3.1.0-b/tests/Makefile.am
---- mpfr-3.1.0-a/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.am	2011-10-03 08:17:14.000000000 +0000
-@@ -65,8 +65,24 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
-diff -Naurd mpfr-3.1.0-a/tests/Makefile.in mpfr-3.1.0-b/tests/Makefile.in
---- mpfr-3.1.0-a/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-+++ mpfr-3.1.0-b/tests/Makefile.in	2011-10-03 08:17:35.000000000 +0000
-@@ -1124,11 +1124,27 @@
- TESTS = $(check_PROGRAMS)
- TESTS_ENVIRONMENT = MPFR_QUIET=1 $(VALGRIND)
- 
--# Option to prevent libtool from generating wrapper scripts for the tests.
-+# The -no-install option prevents libtool from generating wrapper scripts
-+# for the tests.
- # This is useful to easily run the test scripts under valgrind or gdb.
- # See discussion http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/28033
- # http://article.gmane.org/gmane.comp.lib.gnulib.bugs/28140 in particular.
--AM_LDFLAGS = -no-install
-+#
-+# The -L$(top_builddir)/src/.libs option is necessary for some platforms,
-+# such as HP-UX, when --with-gmp or --with-gmp-lib is used and an old MPFR
-+# library is already installed in the corresponding lib directory: its
-+# purpose is to make sure that the local .libs comes first in the library
-+# search path (otherwise the tests are linked against the old MPFR library
-+# by the LINK command -- see the generated Makefile). See:
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00042.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00043.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00044.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00066.html
-+#   http://websympa.loria.fr/wwsympa/arc/mpfr/2011-10/msg00065.html
-+# and
-+#   http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9728
-+#
-+AM_LDFLAGS = -no-install -L$(top_builddir)/src/.libs
- all: all-am
- 
- .SUFFIXES:
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-03 15:15:11.000000000 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-03 15:15:11.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p2
-+3.1.0-p3
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p2"
-+#define MPFR_VERSION_STRING "3.1.0-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/vasprintf.c mpfr-3.1.0-b/src/vasprintf.c
---- mpfr-3.1.0-a/src/vasprintf.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/vasprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -1178,7 +1178,7 @@
-   mpfr_exp_t exp;
-   char * str;
-   const int spec_g = (spec.spec == 'g' || spec.spec == 'G');
--  const int keep_trailing_zeros = spec_g && spec.alt;
-+  const int keep_trailing_zeros = !spec_g || spec.alt;
- 
-   /* WARNING: an empty precision field is forbidden (it means precision = 6
-      and it should have been changed to 6 before the function call) */
-@@ -1356,7 +1356,7 @@
-   else
-     /* 1 <= |p| */
-     {
--      size_t nsd;  /* Number of significant digits */
-+      size_t str_len;
- 
-       /* Determine the position of the most significant decimal digit. */
-       exp = floor_log10 (p);
-@@ -1365,12 +1365,10 @@
-         /* P is too large to print all its integral part digits */
-         return -1;
- 
--      np->ip_size = exp + 1;
--
--      nsd = spec.prec + np->ip_size;
-       if (dec_info == NULL)
--        {
--          str = mpfr_get_str (NULL, &exp, 10, nsd, p, spec.rnd_mode);
-+        { /* this case occurs with mpfr_printf ("%.0RUf", x) with x=9.5 */
-+          str =
-+            mpfr_get_str (NULL, &exp, 10, spec.prec+exp+1, p, spec.rnd_mode);
-           register_string (np->sl, str);
-         }
-       else
-@@ -1379,81 +1377,60 @@
-           str = dec_info->str;
-         }
-       np->ip_ptr = MPFR_IS_NEG (p) ? ++str : str; /* skip sign */
-+      str_len = strlen (str);
-+
-+      /* integral part */
-+      if (exp > str_len)
-+        /* mpfr_get_str gives no trailing zero when p is rounded up to the next
-+           power of 10 (p integer, so no fractional part) */
-+        {
-+          np->ip_trailing_zeros = exp - str_len;
-+          np->ip_size = str_len;
-+        }
-+      else
-+        np->ip_size = exp;
- 
-       if (spec.group)
-         /* thousands separator in integral part */
-         np->thousands_sep = MPFR_THOUSANDS_SEPARATOR;
- 
--      if (nsd == 0 || (spec_g && !spec.alt))
--        /* compute how much non-zero digits in integral and fractional
--           parts */
-+      /* fractional part */
-+      str += np->ip_size;
-+      str_len -= np->ip_size;
-+      if (!keep_trailing_zeros)
-+        /* remove trailing zeros, if any */
-         {
--          size_t str_len;
--          str_len = strlen (str); /* note: the sign has been skipped */
--
--          if (exp > str_len)
--            /* mpfr_get_str doesn't give the trailing zeros when p is a
--               multiple of 10 (p integer, so no fractional part) */
--            {
--              np->ip_trailing_zeros = exp - str_len;
--              np->ip_size = str_len;
--              if (spec.alt)
--                np->point = MPFR_DECIMAL_POINT;
--            }
--          else
--            /* str may contain some digits which are in fractional part */
-+          char *ptr = str + str_len - 1; /* pointer to the last digit of
-+                                            str */
-+          while ((*ptr == '0') && (str_len != 0))
-             {
--              char *ptr;
--
--              ptr = str + str_len - 1; /* points to the end of str */
--              str_len -= np->ip_size;  /* number of digits in fractional
--                                          part */
--
--              if (!keep_trailing_zeros)
--                /* remove trailing zeros, if any */
--                {
--                  while ((*ptr == '0') && (str_len != 0))
--                    {
--                      --ptr;
--                      --str_len;
--                    }
--                }
--
--              if (str_len > INT_MAX)
--                /* too many digits in fractional part */
--                return -1;
--
--              if (str_len != 0)
--                /* some digits in fractional part */
--                {
--                  np->point = MPFR_DECIMAL_POINT;
--                  np->fp_ptr = str + np->ip_size;
--                  np->fp_size = str_len;
--                }
-+              --ptr;
-+              --str_len;
-             }
-         }
--      else
--        /* spec.prec digits in fractional part */
-+
-+      if (str_len > 0)
-+        /* some nonzero digits in fractional part */
-         {
--          if (np->ip_size == exp - 1)
--            /* the absolute value of the number has been rounded up to a power
--               of ten.
--               Insert an additional zero in integral part and put the rest of
--               them in fractional part. */
--            np->ip_trailing_zeros = 1;
-+          if (str_len > INT_MAX)
-+            /* too many digits in fractional part */
-+            return -1;
- 
--          if (spec.prec != 0)
--            {
--              MPFR_ASSERTD (np->ip_size + np->ip_trailing_zeros == exp);
--              MPFR_ASSERTD (np->ip_size + spec.prec == nsd);
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_ptr = str;
-+          np->fp_size = str_len;
-+        }
- 
--              np->point = MPFR_DECIMAL_POINT;
--              np->fp_ptr = str + np->ip_size;
--              np->fp_size = spec.prec;
--            }
--          else if (spec.alt)
--            np->point = MPFR_DECIMAL_POINT;
-+      if (keep_trailing_zeros && str_len < spec.prec)
-+        /* add missing trailing zeros */
-+        {
-+          np->point = MPFR_DECIMAL_POINT;
-+          np->fp_trailing_zeros = spec.prec - np->fp_size;
-         }
-+
-+      if (spec.alt)
-+        /* add decimal point even if no digits follow it */
-+        np->point = MPFR_DECIMAL_POINT;
-     }
- 
-   return 0;
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-10-14 10:43:32.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-03 15:15:11.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p2";
-+  return "3.1.0-p3";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tsprintf.c mpfr-3.1.0-b/tests/tsprintf.c
---- mpfr-3.1.0-a/tests/tsprintf.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tsprintf.c	2011-11-03 15:15:11.000000000 +0000
-@@ -475,6 +475,18 @@
-   check_sprintf ("-1.", "%- #0.1RG", x);
- 
-   /* precision zero */
-+  mpfr_set_d (x, 9.5, MPFR_RNDN);
-+  check_sprintf ("9",    "%.0RDf", x);
-+  check_sprintf ("10",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 19.5, MPFR_RNDN);
-+  check_sprintf ("19",    "%.0RDf", x);
-+  check_sprintf ("20",    "%.0RUf", x);
-+
-+  mpfr_set_d (x, 99.5, MPFR_RNDN);
-+  check_sprintf ("99",    "%.0RDf", x);
-+  check_sprintf ("100",   "%.0RUf", x);
-+
-   mpfr_set_d (x, -9.5, MPFR_RNDN);
-   check_sprintf ("-10",    "%.0RDf", x);
-   check_sprintf ("-10",    "%.0RYf", x);
-@@ -1078,6 +1090,23 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+bug20111102 (void)
-+{
-+  mpfr_t t;
-+  char s[100];
-+
-+  mpfr_init2 (t, 84);
-+  mpfr_set_str (t, "999.99999999999999999999", 10, MPFR_RNDN);
-+  mpfr_sprintf (s, "%.20RNg", t);
-+  if (strcmp (s, "1000") != 0)
-+    {
-+      printf ("Error in bug20111102, expected 1000, got %s\n", s);
-+      exit (1);
-+    }
-+  mpfr_clear (t);
-+}
-+
- /* In particular, the following test makes sure that the rounding
-  * for %Ra and %Rb is not done on the MPFR number itself (as it
-  * would overflow). Note: it has been reported on comp.std.c that
-@@ -1161,6 +1190,7 @@
-   locale = setlocale (LC_ALL, "C");
- #endif
- 
-+  bug20111102 ();
-   native_types ();
-   hexadecimal ();
-   binary ();
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2011-11-28 12:22:52.000000000 +0000
-@@ -0,0 +1 @@
-+gmp41compat
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2011-11-28 12:22:52.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p3
-+3.1.0-p4
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.info mpfr-3.1.0-b/doc/mpfr.info
---- mpfr-3.1.0-a/doc/mpfr.info	2011-10-03 09:43:04.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.info	2011-11-28 12:22:52.000000000 +0000
-@@ -2994,11 +2994,12 @@
- 
-    * `mpfr_urandom' and `mpfr_urandomb' changed in MPFR 3.1.  Their
-      behavior no longer depends on the platform (assuming this is also
--     true for GMP's random generator).  As a consequence, the returned
--     values can be different between MPFR 3.1 and previous MPFR
--     versions.  Note: as the reproducibility of these functions was not
--     specified before MPFR 3.1, the MPFR 3.1 behavior is _not_ regarded
--     as backward incompatible with previous versions.
-+     true for GMP's random generator, which is not the case between GMP
-+     4.1 and 4.2 if `gmp_randinit_default' is used).  As a consequence,
-+     the returned values can be different between MPFR 3.1 and previous
-+     MPFR versions.  Note: as the reproducibility of these functions
-+     was not specified before MPFR 3.1, the MPFR 3.1 behavior is _not_
-+     regarded as backward incompatible with previous versions.
- 
- 
- 
-@@ -4239,13 +4240,13 @@
- Node: Type and Macro Changes129308
- Node: Added Functions132029
- Node: Changed Functions134972
--Node: Removed Functions139167
--Node: Other Changes139579
--Node: Contributors141108
--Node: References143574
--Node: GNU Free Documentation License145315
--Node: Concept Index167758
--Node: Function and Type Index173677
-+Node: Removed Functions139253
-+Node: Other Changes139665
-+Node: Contributors141194
-+Node: References143660
-+Node: GNU Free Documentation License145401
-+Node: Concept Index167844
-+Node: Function and Type Index173763
- 
- End Tag Table
- 
-diff -Naurd mpfr-3.1.0-a/doc/mpfr.texi mpfr-3.1.0-b/doc/mpfr.texi
---- mpfr-3.1.0-a/doc/mpfr.texi	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/doc/mpfr.texi	2011-11-28 12:22:52.000000000 +0000
-@@ -3466,8 +3466,9 @@
- a lack of specification.
- 
- @item @code{mpfr_urandom} and @code{mpfr_urandomb} changed in MPFR 3.1.
--Their behavior no longer depends on the platform (assuming this is also
--true for GMP's random generator).  As a consequence, the returned values
-+Their behavior no longer depends on the platform (assuming this is also true
-+for GMP's random generator, which is not the case between GMP 4.1 and 4.2 if
-+@code{gmp_randinit_default} is used).  As a consequence, the returned values
- can be different between MPFR 3.1 and previous MPFR versions.
- Note: as the reproducibility of these functions was not specified
- before MPFR 3.1, the MPFR 3.1 behavior is @emph{not} regarded as
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p3"
-+#define MPFR_VERSION_STRING "3.1.0-p4"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-03 15:15:11.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2011-11-28 12:22:52.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p3";
-+  return "3.1.0-p4";
- }
-diff -Naurd mpfr-3.1.0-a/tests/trandom.c mpfr-3.1.0-b/tests/trandom.c
---- mpfr-3.1.0-a/tests/trandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/trandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -114,21 +114,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.895943"
-+# define C2 "0.848824"
-+#else
-+# define C1 "0.479652"
-+# define C2 "0.648529"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.895943") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.895943, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandomb (x, s);
--  if (mpfr_cmp_str1 (x, "0.848824") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.848824, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/tests/turandom.c mpfr-3.1.0-b/tests/turandom.c
---- mpfr-3.1.0-a/tests/turandom.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/turandom.c	2011-11-28 12:22:52.000000000 +0000
-@@ -160,23 +160,29 @@
-   mpfr_t x;
-   gmp_randstate_t s;
- 
-+#if __MPFR_GMP(4,2,0)
-+# define C1 "0.8488312"
-+# define C2 "0.8156509"
-+#else
-+# define C1 "0.6485367"
-+# define C2 "0.9362717"
-+#endif
-+
-   gmp_randinit_default (s);
-   gmp_randseed_ui (s, 42);
-   mpfr_init2 (x, 17);
-   mpfr_urandom (x, s, MPFR_RNDN);
--  /* the following values are obtained on a 32-bit computer, we should get
--     the same values on a 64-bit computer */
--  if (mpfr_cmp_str1 (x, "0.8488312") != 0)
-+  if (mpfr_cmp_str1 (x, C1) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8488312, got ");
-+      printf ("Error in bug20100914, expected " C1 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-     }
-   mpfr_urandom (x, s, MPFR_RNDN);
--  if (mpfr_cmp_str1 (x, "0.8156509") != 0)
-+  if (mpfr_cmp_str1 (x, C2) != 0)
-     {
--      printf ("Error in bug20100914, expected 0.8156509, got ");
-+      printf ("Error in bug20100914, expected " C2 ", got ");
-       mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN);
-       printf ("\n");
-       exit (1);
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 12:44:49.000000000 +0000
-@@ -0,0 +1 @@
-+logging-freeze
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 12:44:49.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p4
-+3.1.0-p5
-diff -Naurd mpfr-3.1.0-a/src/add_d.c mpfr-3.1.0-b/src/add_d.c
---- mpfr-3.1.0-a/src/add_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/add_ui.c mpfr-3.1.0-b/src/add_ui.c
---- mpfr-3.1.0-a/src/add_ui.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add_ui.c	2012-02-24 12:44:49.000000000 +0000
-@@ -29,7 +29,7 @@
-   MPFR_LOG_FUNC
-     (("x[%Pu]=%.*Rg u=%d rnd=%d",
-       mpfr_get_prec(x), mpfr_log_prec, x, u, rnd_mode),
--     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_get_prec, y));
-+     ("y[%Pu]=%.*Rg", mpfr_get_prec (y), mpfr_log_prec, y));
- 
-   if (MPFR_LIKELY(u != 0) )  /* if u=0, do nothing */
-     {
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p4"
-+#define MPFR_VERSION_STRING "3.1.0-p5"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul_d.c mpfr-3.1.0-b/src/mul_d.c
---- mpfr-3.1.0-a/src/mul_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul_d.c	2012-02-24 12:44:49.000000000 +0000
-@@ -34,7 +34,7 @@
-     (("b[%Pu]=%.*Rg c=%.20g rnd=%d",
-       mpfr_get_prec(b), mpfr_log_prec, b, c, rnd_mode),
-      ("a[%Pu]=%.*Rg inexact=%d",
--      mpfr_get_prec (a), mpfr_get_prec, a, inexact));
-+      mpfr_get_prec (a), mpfr_log_prec, a, inexact));
- 
-   MPFR_SAVE_EXPO_MARK (expo);
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2011-11-28 12:22:52.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 12:44:49.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p4";
-+  return "3.1.0-p5";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-02-24 13:50:05.000000000 +0000
-@@ -0,0 +1 @@
-+logging-varfmt
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-02-24 13:50:05.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p5
-+3.1.0-p6
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2011-10-05 21:39:57.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-@@ -1592,7 +1592,7 @@
-   do                                                                    \
-     if ((MPFR_LOG_INTERNAL_F & mpfr_log_type) &&                        \
-         (mpfr_log_current <= mpfr_log_level))                           \
--      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rf\n", __func__, __LINE__,          \
-+      LOG_PRINT ("%s.%d:%s[%#Pu]=%.*Rg\n", __func__, __LINE__,          \
-                  #x, mpfr_get_prec (x), mpfr_log_prec, x);              \
-   while (0)
- 
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p5"
-+#define MPFR_VERSION_STRING "3.1.0-p6"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 12:44:49.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-02-24 13:50:05.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p5";
-+  return "3.1.0-p6";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-03-08 15:17:03.000000000 +0000
-@@ -0,0 +1 @@
-+large-prec
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-03-08 15:17:03.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p6
-+3.1.0-p7
-diff -Naurd mpfr-3.1.0-a/src/add1.c mpfr-3.1.0-b/src/add1.c
---- mpfr-3.1.0-a/src/add1.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1.c	2012-03-08 15:17:03.000000000 +0000
-@@ -44,12 +44,12 @@
-   bq = MPFR_PREC(b);
-   cq = MPFR_PREC(c);
- 
--  an = (aq-1)/GMP_NUMB_BITS+1; /* number of limbs of a */
-+  an = MPFR_PREC2LIMBS (aq); /* number of limbs of a */
-   aq2 = (mpfr_prec_t) an * GMP_NUMB_BITS;
-   sh = aq2 - aq;                  /* non-significant bits in low limb */
- 
--  bn = (bq-1)/GMP_NUMB_BITS+1; /* number of limbs of b */
--  cn = (cq-1)/GMP_NUMB_BITS+1; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
- 
-   ap = MPFR_MANT(a);
-   bp = MPFR_MANT(b);
-@@ -124,7 +124,7 @@
-       dif = aq2 - diff_exp;
-       /* dif is the number of bits of c which overlap with a' */
- 
--      difn = (dif-1)/GMP_NUMB_BITS + 1;
-+      difn = MPFR_PREC2LIMBS (dif);
-       /* only the highest difn limbs from c have to be considered */
-       if (MPFR_UNLIKELY(difn > cn))
-         {
-diff -Naurd mpfr-3.1.0-a/src/add1sp.c mpfr-3.1.0-b/src/add1sp.c
---- mpfr-3.1.0-a/src/add1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/add1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -107,7 +107,7 @@
- 
-   /* Read prec and num of limbs */
-   p = MPFR_PREC(b);
--  n = (p+GMP_NUMB_BITS-1)/GMP_NUMB_BITS;
-+  n = MPFR_PREC2LIMBS (p);
-   MPFR_UNSIGNED_MINUS_MODULO(sh, p);
-   bx = MPFR_GET_EXP(b);
-   d = (mpfr_uexp_t) (bx - MPFR_GET_EXP(c));
-diff -Naurd mpfr-3.1.0-a/src/agm.c mpfr-3.1.0-b/src/agm.c
---- mpfr-3.1.0-a/src/agm.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/agm.c	2012-03-08 15:17:03.000000000 +0000
-@@ -91,7 +91,7 @@
-   q = MPFR_PREC(r);
-   p = q + MPFR_INT_CEIL_LOG2(q) + 15;
-   MPFR_ASSERTD (p >= 7); /* see algorithms.tex */
--  s = (p - 1) / GMP_NUMB_BITS + 1;
-+  s = MPFR_PREC2LIMBS (p);
- 
-   /* b (op2) and a (op1) are the 2 operands but we want b >= a */
-   compare = mpfr_cmp (op1, op2);
-@@ -285,7 +285,7 @@
- 
-       /* Next iteration */
-       MPFR_ZIV_NEXT (loop, p);
--      s = (p - 1) / GMP_NUMB_BITS + 1;
-+      s = MPFR_PREC2LIMBS (p);
-     }
-   MPFR_ZIV_FREE (loop);
- 
-diff -Naurd mpfr-3.1.0-a/src/eq.c mpfr-3.1.0-b/src/eq.c
---- mpfr-3.1.0-a/src/eq.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/eq.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,8 +56,8 @@
-   if (uexp != vexp)
-     return 0; /* no bit agree */
- 
--  usize = (MPFR_PREC(u) - 1) / GMP_NUMB_BITS + 1;
--  vsize = (MPFR_PREC(v) - 1) / GMP_NUMB_BITS + 1;
-+  usize = MPFR_LIMB_SIZE (u);
-+  vsize = MPFR_LIMB_SIZE (v);
- 
-   if (vsize > usize) /* exchange u and v */
-     {
-diff -Naurd mpfr-3.1.0-a/src/exp.c mpfr-3.1.0-b/src/exp.c
---- mpfr-3.1.0-a/src/exp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/exp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -133,7 +133,7 @@
-               mp_size_t yn;
-               int sh;
- 
--              yn = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+              yn = MPFR_LIMB_SIZE (y);
-               sh = (mpfr_prec_t) yn * GMP_NUMB_BITS - MPFR_PREC(y);
-               MPFR_MANT(y)[0] += MPFR_LIMB_ONE << sh;
-               inexact = 1;
-diff -Naurd mpfr-3.1.0-a/src/get_d.c mpfr-3.1.0-b/src/get_d.c
---- mpfr-3.1.0-a/src/get_d.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_d.c	2012-03-08 15:17:03.000000000 +0000
-@@ -100,7 +100,7 @@
-           nbits += (1021 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD ( np <= MPFR_LIMBS_PER_DOUBLE );
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_flt.c mpfr-3.1.0-b/src/get_flt.c
---- mpfr-3.1.0-a/src/get_flt.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_flt.c	2012-03-08 15:17:03.000000000 +0000
-@@ -92,7 +92,7 @@
-           nbits += (125 + e);
-           MPFR_ASSERTD (nbits >= 1);
-         }
--      np = (nbits + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+      np = MPFR_PREC2LIMBS (nbits);
-       MPFR_ASSERTD(np <= MPFR_LIMBS_PER_FLT);
-       carry = mpfr_round_raw_4 (tp, MPFR_MANT(src), MPFR_PREC(src), negative,
-                                 nbits, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/get_str.c mpfr-3.1.0-b/src/get_str.c
---- mpfr-3.1.0-a/src/get_str.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/get_str.c	2012-03-08 15:17:03.000000000 +0000
-@@ -2351,7 +2351,7 @@
- 
-       /* the first digit will contain only r bits */
-       prec = (m - 1) * pow2 + r; /* total number of bits */
--      n = (prec - 1) / GMP_NUMB_BITS + 1;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       MPFR_TMP_MARK (marker);
-       x1 = MPFR_TMP_LIMBS_ALLOC (n + 1);
-@@ -2417,12 +2417,12 @@
-       exact = 1;
- 
-       /* number of limbs */
--      n = 1 + (prec - 1) / GMP_NUMB_BITS;
-+      n = MPFR_PREC2LIMBS (prec);
- 
-       /* a will contain the approximation of the mantissa */
-       a = MPFR_TMP_LIMBS_ALLOC (n);
- 
--      nx = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+      nx = MPFR_LIMB_SIZE (x);
- 
-       if ((mpfr_exp_t) m == g) /* final exponent is 0, no multiplication or
-                                 division to perform */
-diff -Naurd mpfr-3.1.0-a/src/init2.c mpfr-3.1.0-b/src/init2.c
---- mpfr-3.1.0-a/src/init2.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/init2.c	2012-03-08 15:17:03.000000000 +0000
-@@ -51,7 +51,7 @@
-      which both have an odd mantissa */
-   MPFR_ASSERTN(p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
--  xsize = (mp_size_t) ((p - 1) / GMP_NUMB_BITS) + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
-   tmp   = (mpfr_limb_ptr) (*__gmp_allocate_func)(MPFR_MALLOC_SIZE(xsize));
- 
-   MPFR_PREC(x) = p;                /* Set prec */
-diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
---- mpfr-3.1.0-a/src/lngamma.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
-@@ -67,7 +67,7 @@
- 
-   /* Now, the unit bit is represented. */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of represented fractional bits (including the trailing 0's) */
- 
-   x0 = *(MPFR_MANT (x) + prec / GMP_NUMB_BITS);
-diff -Naurd mpfr-3.1.0-a/src/mpfr-impl.h mpfr-3.1.0-b/src/mpfr-impl.h
---- mpfr-3.1.0-a/src/mpfr-impl.h	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr-impl.h	2012-03-09 12:06:26.000000000 +0000
-@@ -646,10 +646,24 @@
-  **************** mpfr_t properties *******************
-  ******************************************************/
- 
-+/* In the following macro, p is usually a mpfr_prec_t, but this macro
-+   works with other integer types (without integer overflow). Checking
-+   that p >= 1 in debug mode is useful here because this macro can be
-+   used on a computed precision (in particular, this formula does not
-+   work for a degenerate case p = 0, and could give different results
-+   on different platforms). But let us not use an assertion checking
-+   in the MPFR_LAST_LIMB() and MPFR_LIMB_SIZE() macros below to avoid
-+   too much expansion for assertions (in practice, this should be a
-+   problem just when testing MPFR with the --enable-assert configure
-+   option and the -ansi -pedantic-errors gcc compiler flags). */
-+#define MPFR_PREC2LIMBS(p) \
-+  (MPFR_ASSERTD ((p) >= 1), ((p) - 1) / GMP_NUMB_BITS + 1)
-+
- #define MPFR_PREC(x)      ((x)->_mpfr_prec)
- #define MPFR_EXP(x)       ((x)->_mpfr_exp)
- #define MPFR_MANT(x)      ((x)->_mpfr_d)
--#define MPFR_LIMB_SIZE(x) ((MPFR_PREC((x))-1)/GMP_NUMB_BITS+1)
-+#define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS)
-+#define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1)
- 
- 
- /******************************************************
-@@ -749,7 +763,8 @@
- #define MPFR_IS_FP(x)       (!MPFR_IS_NAN(x) && !MPFR_IS_INF(x))
- #define MPFR_IS_SINGULAR(x) (MPFR_EXP(x) <= MPFR_EXP_INF)
- #define MPFR_IS_PURE_FP(x)  (!MPFR_IS_SINGULAR(x) && \
--  (MPFR_ASSERTD (MPFR_MANT(x)[MPFR_LIMB_SIZE(x)-1] & MPFR_LIMB_HIGHBIT), 1))
-+  (MPFR_ASSERTD ((MPFR_MANT(x)[MPFR_LAST_LIMB(x)]  \
-+                  & MPFR_LIMB_HIGHBIT) != 0), 1))
- 
- #define MPFR_ARE_SINGULAR(x,y) \
-   (MPFR_UNLIKELY(MPFR_IS_SINGULAR(x)) || MPFR_UNLIKELY(MPFR_IS_SINGULAR(y)))
-@@ -1061,7 +1076,7 @@
- /* Set a number to 1 (Fast) - It doesn't check if 1 is in the exponent range */
- #define MPFR_SET_ONE(x)                                               \
- do {                                                                  \
--  mp_size_t _size = MPFR_LIMB_SIZE(x) - 1;                            \
-+  mp_size_t _size = MPFR_LAST_LIMB(x);                                \
-   MPFR_SET_POS(x);                                                    \
-   MPFR_EXP(x) = 1;                                                    \
-   MPN_ZERO ( MPFR_MANT(x), _size);                                    \
-@@ -1213,8 +1228,8 @@
-     _destp = MPFR_MANT (dest);                                              \
-     if (MPFR_UNLIKELY (_destprec >= _srcprec))                              \
-       {                                                                     \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS - _srcs;       \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec) - _srcs;                       \
-         MPN_COPY (_destp + _dests, srcp, _srcs);                            \
-         MPN_ZERO (_destp, _dests);                                          \
-         inexact = 0;                                                        \
-@@ -1227,8 +1242,8 @@
-         mp_limb_t _rb, _sb, _ulp;                                           \
-                                                                             \
-         /* Compute Position and shift */                                    \
--        _srcs  = (_srcprec  + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
--        _dests = (_destprec + GMP_NUMB_BITS-1)/GMP_NUMB_BITS;               \
-+        _srcs  = MPFR_PREC2LIMBS (_srcprec);                                \
-+        _dests = MPFR_PREC2LIMBS (_destprec);                               \
-         MPFR_UNSIGNED_MINUS_MODULO (_sh, _destprec);                        \
-         _sp = (srcp) + _srcs - _dests;                                      \
-                                                                             \
-@@ -1372,7 +1387,7 @@
-       if (MPFR_LIKELY (MPFR_PREC (dest) == MPFR_PREC (src)))            \
-         {                                                               \
-           MPN_COPY (MPFR_MANT (dest), MPFR_MANT (src),                  \
--                    (MPFR_PREC (src) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS); \
-+                    MPFR_LIMB_SIZE (src));                              \
-           inexact = 0;                                                  \
-         }                                                               \
-       else                                                              \
-@@ -1682,7 +1697,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  if (MPFR_UNLIKELY (_size * (num) > MPFR_GROUP_STATIC_SIZE))            \
-    {                                                                    \
-      (g).alloc = (num) * _size * sizeof (mp_limb_t);                    \
-@@ -1733,7 +1748,7 @@
-  MPFR_ASSERTD (_prec >= MPFR_PREC_MIN);                                 \
-  if (MPFR_UNLIKELY (_prec > MPFR_PREC_MAX))                             \
-    mpfr_abort_prec_max ();                                              \
-- _size = (mpfr_prec_t) (_prec + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;     \
-+ _size = MPFR_PREC2LIMBS (_prec);                                       \
-  (g).alloc = (num) * _size * sizeof (mp_limb_t);                        \
-  if (MPFR_LIKELY (_oalloc == 0))                                        \
-    (g).mant = (mp_limb_t *) (*__gmp_allocate_func) ((g).alloc);         \
-@@ -1886,7 +1901,7 @@
-        MPFR_NORETURN_ATTR;
- 
- __MPFR_DECLSPEC void mpfr_rand_raw _MPFR_PROTO((mpfr_limb_ptr, gmp_randstate_t,
--                                                unsigned long));
-+                                                mpfr_prec_t));
- 
- __MPFR_DECLSPEC mpz_t* mpfr_bernoulli_internal _MPFR_PROTO((mpz_t*,
-                                                             unsigned long));
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-03-08 15:17:03.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p6"
-+#define MPFR_VERSION_STRING "3.1.0-p7"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/mul.c mpfr-3.1.0-b/src/mul.c
---- mpfr-3.1.0-a/src/mul.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/mul.c	2012-03-08 15:17:03.000000000 +0000
-@@ -93,15 +93,15 @@
- 
-   ax = MPFR_GET_EXP (b) + MPFR_GET_EXP (c);
- 
--  bq = MPFR_PREC(b);
--  cq = MPFR_PREC(c);
-+  bq = MPFR_PREC (b);
-+  cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD(bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   /* <= k, thus no int overflow */
-   MPFR_ASSERTD(tn <= k);
- 
-@@ -292,12 +292,12 @@
-   bq = MPFR_PREC (b);
-   cq = MPFR_PREC (c);
- 
--  MPFR_ASSERTD (bq+cq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN ((mpfr_uprec_t) bq + cq <= MPFR_PREC_MAX);
- 
--  bn = (bq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of b */
--  cn = (cq+GMP_NUMB_BITS-1)/GMP_NUMB_BITS; /* number of limbs of c */
-+  bn = MPFR_PREC2LIMBS (bq); /* number of limbs of b */
-+  cn = MPFR_PREC2LIMBS (cq); /* number of limbs of c */
-   k = bn + cn; /* effective nb of limbs used by b*c (= tn or tn+1) below */
--  tn = (bq + cq + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  tn = MPFR_PREC2LIMBS (bq + cq);
-   MPFR_ASSERTD (tn <= k); /* tn <= k, thus no int overflow */
- 
-   /* Check for no size_t overflow*/
-diff -Naurd mpfr-3.1.0-a/src/pow.c mpfr-3.1.0-b/src/pow.c
---- mpfr-3.1.0-a/src/pow.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/pow.c	2012-03-08 15:17:03.000000000 +0000
-@@ -136,7 +136,7 @@
-      (b) all the 'z' bits are zero
-   */
- 
--  prec = ((prec - 1) / GMP_NUMB_BITS + 1) * GMP_NUMB_BITS - expo;
-+  prec = MPFR_PREC2LIMBS (prec) * GMP_NUMB_BITS - expo;
-   /* number of z+0 bits */
- 
-   yn = prec / GMP_NUMB_BITS;
-diff -Naurd mpfr-3.1.0-a/src/print_raw.c mpfr-3.1.0-b/src/print_raw.c
---- mpfr-3.1.0-a/src/print_raw.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/print_raw.c	2012-03-08 15:17:03.000000000 +0000
-@@ -84,7 +84,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   printf("%s ", str);
-   for(n-- ; n>=0 ; n--)
-@@ -109,7 +109,7 @@
-   int i;
-   mpfr_prec_t count = 0;
-   char c;
--  mp_size_t n = (r - 1) / GMP_NUMB_BITS + 1;
-+  mp_size_t n = MPFR_PREC2LIMBS (r);
- 
-   for(n-- ; n>=0 ; n--)
-     {
-diff -Naurd mpfr-3.1.0-a/src/round_prec.c mpfr-3.1.0-b/src/round_prec.c
---- mpfr-3.1.0-a/src/round_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -55,12 +55,12 @@
- 
-   MPFR_ASSERTN(prec >= MPFR_PREC_MIN && prec <= MPFR_PREC_MAX);
- 
--  nw = 1 + (prec - 1) / GMP_NUMB_BITS; /* needed allocated limbs */
-+  nw = MPFR_PREC2LIMBS (prec); /* needed allocated limbs */
- 
-   /* check if x has enough allocated space for the significand */
-   /* Get the number of limbs from the precision.
-      (Compatible with all allocation methods) */
--  ow = (MPFR_PREC (x) + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS;
-+  ow = MPFR_LIMB_SIZE (x);
-   if (nw > ow)
-     {
-       /* FIXME: Variable can't be created using custom allocation,
-diff -Naurd mpfr-3.1.0-a/src/round_raw_generic.c mpfr-3.1.0-b/src/round_raw_generic.c
---- mpfr-3.1.0-a/src/round_raw_generic.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/round_raw_generic.c	2012-03-08 15:17:03.000000000 +0000
-@@ -80,7 +80,7 @@
-       (xprec <= yprec || MPFR_IS_LIKE_RNDZ (rnd_mode, neg)))
-     return 0;
- 
--  xsize = (xprec-1)/GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (xprec);
-   nw = yprec / GMP_NUMB_BITS;
-   rw = yprec & (GMP_NUMB_BITS - 1);
- 
-diff -Naurd mpfr-3.1.0-a/src/set.c mpfr-3.1.0-b/src/set.c
---- mpfr-3.1.0-a/src/set.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set.c	2012-03-08 15:17:03.000000000 +0000
-@@ -48,8 +48,7 @@
-       /* Same precision and b is not singular:
-        * just copy the mantissa, and set the exponent and the sign
-        * The result is exact. */
--      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b),
--                (MPFR_PREC (b) + GMP_NUMB_BITS-1)/GMP_NUMB_BITS);
-+      MPN_COPY (MPFR_MANT (a), MPFR_MANT (b), MPFR_LIMB_SIZE (b));
-       MPFR_RET (0);
-     }
-   else
-diff -Naurd mpfr-3.1.0-a/src/set_f.c mpfr-3.1.0-b/src/set_f.c
---- mpfr-3.1.0-a/src/set_f.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_f.c	2012-03-08 15:17:03.000000000 +0000
-@@ -43,7 +43,7 @@
-   if (SIZ(x) * MPFR_FROM_SIGN_TO_INT(MPFR_SIGN(y)) < 0)
-     MPFR_CHANGE_SIGN (y);
- 
--  sy = 1 + (MPFR_PREC(y) - 1) / GMP_NUMB_BITS;
-+  sy = MPFR_LIMB_SIZE (y);
-   my = MPFR_MANT(y);
-   mx = PTR(x);
- 
-diff -Naurd mpfr-3.1.0-a/src/set_prec.c mpfr-3.1.0-b/src/set_prec.c
---- mpfr-3.1.0-a/src/set_prec.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/set_prec.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   MPFR_ASSERTN (p >= MPFR_PREC_MIN && p <= MPFR_PREC_MAX);
- 
-   /* Calculate the new number of limbs */
--  xsize = (p - 1) / GMP_NUMB_BITS + 1;
-+  xsize = MPFR_PREC2LIMBS (p);
- 
-   /* Realloc only if the new size is greater than the old */
-   xoldsize = MPFR_GET_ALLOC_SIZE (x);
-diff -Naurd mpfr-3.1.0-a/src/setmax.c mpfr-3.1.0-b/src/setmax.c
---- mpfr-3.1.0-a/src/setmax.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/setmax.c	2012-03-08 15:17:03.000000000 +0000
-@@ -32,7 +32,7 @@
-   mp_limb_t *xp;
- 
-   MPFR_SET_EXP (x, e);
--  xn = 1 + (MPFR_PREC(x) - 1) / GMP_NUMB_BITS;
-+  xn = MPFR_LIMB_SIZE (x);
-   sh = (mpfr_prec_t) xn * GMP_NUMB_BITS - MPFR_PREC(x);
-   xp = MPFR_MANT(x);
-   xp[0] = MP_LIMB_T_MAX << sh;
-diff -Naurd mpfr-3.1.0-a/src/sqr.c mpfr-3.1.0-b/src/sqr.c
---- mpfr-3.1.0-a/src/sqr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sqr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -56,11 +56,11 @@
-   ax = 2 * MPFR_GET_EXP (b);
-   bq = MPFR_PREC(b);
- 
--  MPFR_ASSERTD (2 * bq > bq); /* PREC_MAX is /2 so no integer overflow */
-+  MPFR_ASSERTN (2 * (mpfr_uprec_t) bq <= MPFR_PREC_MAX);
- 
--  bn = MPFR_LIMB_SIZE(b); /* number of limbs of b */
--  tn = 1 + (2 * bq - 1) / GMP_NUMB_BITS; /* number of limbs of square,
--                                               2*bn or 2*bn-1 */
-+  bn = MPFR_LIMB_SIZE (b); /* number of limbs of b */
-+  tn = MPFR_PREC2LIMBS (2 * bq); /* number of limbs of square,
-+                                    2*bn or 2*bn-1 */
- 
-   if (MPFR_UNLIKELY(bn > MPFR_SQR_THRESHOLD))
-     return mpfr_mul (a, b, b, rnd_mode);
-diff -Naurd mpfr-3.1.0-a/src/stack_interface.c mpfr-3.1.0-b/src/stack_interface.c
---- mpfr-3.1.0-a/src/stack_interface.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/stack_interface.c	2012-03-08 15:17:03.000000000 +0000
-@@ -26,7 +26,7 @@
- size_t
- mpfr_custom_get_size (mpfr_prec_t prec)
- {
--  return (prec + GMP_NUMB_BITS -1) / GMP_NUMB_BITS * BYTES_PER_MP_LIMB;
-+  return MPFR_PREC2LIMBS (prec) * BYTES_PER_MP_LIMB;
- }
- 
- #undef mpfr_custom_init
-diff -Naurd mpfr-3.1.0-a/src/strtofr.c mpfr-3.1.0-b/src/strtofr.c
---- mpfr-3.1.0-a/src/strtofr.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/strtofr.c	2012-03-08 15:17:03.000000000 +0000
-@@ -467,7 +467,7 @@
-       /* Set y to the value of the ~prec most significant bits of pstr->mant
-          (as long as we guarantee correct rounding, we don't need to get
-          exactly prec bits). */
--      ysize = (prec - 1) / GMP_NUMB_BITS + 1;
-+      ysize = MPFR_PREC2LIMBS (prec);
-       /* prec bits corresponds to ysize limbs */
-       ysize_bits = ysize * GMP_NUMB_BITS;
-       /* and to ysize_bits >= prec > MPFR_PREC (x) bits */
-diff -Naurd mpfr-3.1.0-a/src/sub1sp.c mpfr-3.1.0-b/src/sub1sp.c
---- mpfr-3.1.0-a/src/sub1sp.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/sub1sp.c	2012-03-08 15:17:03.000000000 +0000
-@@ -155,8 +155,8 @@
-   MPFR_ASSERTD(MPFR_IS_PURE_FP(c));
- 
-   /* Read prec and num of limbs */
--  p = MPFR_PREC(b);
--  n = (p-1)/GMP_NUMB_BITS+1;
-+  p = MPFR_PREC (b);
-+  n = MPFR_PREC2LIMBS (p);
- 
-   /* Fast cmp of |b| and |c|*/
-   bx = MPFR_GET_EXP (b);
-diff -Naurd mpfr-3.1.0-a/src/urandomb.c mpfr-3.1.0-b/src/urandomb.c
---- mpfr-3.1.0-a/src/urandomb.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/urandomb.c	2012-03-08 15:17:03.000000000 +0000
-@@ -31,13 +31,20 @@
-    a sufficient number of limbs */
- void
- mpfr_rand_raw (mpfr_limb_ptr mp, gmp_randstate_t rstate,
--               unsigned long int nbits)
-+               mpfr_prec_t nbits)
- {
-   mpz_t z;
- 
-+  MPFR_ASSERTN (nbits >= 1);
-   /* To be sure to avoid the potential allocation of mpz_urandomb */
--  ALLOC(z) = SIZ(z) = ((nbits - 1) / GMP_NUMB_BITS) + 1;
-+  ALLOC(z) = SIZ(z) = MPFR_PREC2LIMBS (nbits);
-   PTR(z)   = mp;
-+#if __MPFR_GMP(5,0,0)
-+  /* Check for integer overflow (unless mp_bitcnt_t is signed,
-+     but according to the GMP manual, this shouldn't happen).
-+     Note: mp_bitcnt_t has been introduced in GMP 5.0.0. */
-+  MPFR_ASSERTN ((mp_bitcnt_t) -1 < 0 || nbits <= (mp_bitcnt_t) -1);
-+#endif
-   mpz_urandomb (z, rstate, nbits);
- }
- 
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-02-24 13:50:05.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-03-08 15:17:03.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p6";
-+  return "3.1.0-p7";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tinits.c mpfr-3.1.0-b/tests/tinits.c
---- mpfr-3.1.0-a/tests/tinits.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tinits.c	2012-03-08 15:17:03.000000000 +0000
-@@ -1,4 +1,4 @@
--/* Test file for mpfr_inits, mpfr_inits2 and mpfr_clears.
-+/* Test file for mpfr_init2, mpfr_inits, mpfr_inits2 and mpfr_clears.
- 
- Copyright 2003, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
- Contributed by the Arenaire and Caramel projects, INRIA.
-@@ -20,18 +20,43 @@
- http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. */
- 
-+#include <stdlib.h>
-+
- #include "mpfr-test.h"
- 
- int
- main (void)
- {
-   mpfr_t a, b, c;
-+  long large_prec;
- 
-   tests_start_mpfr ();
-+
-   mpfr_inits (a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-   mpfr_inits2 (200, a, b, c, (mpfr_ptr) 0);
-   mpfr_clears (a, b, c, (mpfr_ptr) 0);
-+
-+  /* test for precision 2^31-1, see
-+     https://gforge.inria.fr/tracker/index.php?func=detail&aid=13918 */
-+  large_prec = 2147483647;
-+  if (getenv ("MPFR_CHECK_LARGEMEM") != NULL)
-+    {
-+      /* We assume that the precision won't be increased internally. */
-+      if (large_prec > MPFR_PREC_MAX)
-+        large_prec = MPFR_PREC_MAX;
-+      mpfr_inits2 (large_prec, a, b, (mpfr_ptr) 0);
-+      mpfr_set_ui (a, 17, MPFR_RNDN);
-+      mpfr_set (b, a, MPFR_RNDN);
-+      if (mpfr_get_ui (a, MPFR_RNDN) != 17)
-+        {
-+          printf ("Error in mpfr_init2 with precision 2^31-1\n");
-+          exit (1);
-+        }
-+      mpfr_clears (a, b, (mpfr_ptr) 0);
-+    }
-+
-   tests_end_mpfr ();
-+
-   return 0;
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-03-12 11:59:47.000000000 +0000
-@@ -0,0 +1 @@
-+__gmp_const
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-03-12 11:59:47.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p7
-+3.1.0-p8
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-03-12 11:59:47.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p7"
-+#define MPFR_VERSION_STRING "3.1.0-p8"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-@@ -39,6 +39,18 @@
- # include <gmp.h>
- #endif
- 
-+/* GMP's internal __gmp_const macro has been removed on 2012-03-04:
-+     http://gmplib.org:8000/gmp/rev/d287cfaf6732
-+   const is standard and now assumed to be available. If the __gmp_const
-+   definition is no longer present in GMP, this probably means that GMP
-+   assumes that const is available; thus let's define it to const.
-+   Note: this is a temporary fix that can be backported to previous MPFR
-+   versions. In the future, __gmp_const should be replaced by const like
-+   in GMP. */
-+#ifndef __gmp_const
-+# define __gmp_const const
-+#endif
-+
- /* Avoid some problems with macro expansion if the user defines macros
-    with the same name as keywords. By convention, identifiers and macro
-    names starting with mpfr_ are reserved by MPFR. */
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-03-12 11:59:47.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p7";
-+  return "3.1.0-p8";
- }
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-04-27 01:13:15.000000000 +0000
-@@ -0,0 +1 @@
-+gamma-underflow
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-04-27 01:13:15.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p8
-+3.1.0-p9
-diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c
---- mpfr-3.1.0-a/src/gamma.c	2011-10-03 08:17:09.000000000 +0000
-+++ mpfr-3.1.0-b/src/gamma.c	2012-04-27 01:13:15.000000000 +0000
-@@ -296,7 +296,7 @@
-       /* we want an upper bound for x * [log(2-x)-1].
-          since x < 0, we need a lower bound on log(2-x) */
-       mpfr_ui_sub (xp, 2, x, MPFR_RNDD);
--      mpfr_log2 (xp, xp, MPFR_RNDD);
-+      mpfr_log (xp, xp, MPFR_RNDD);
-       mpfr_sub_ui (xp, xp, 1, MPFR_RNDD);
-       mpfr_mul (xp, xp, x, MPFR_RNDU);
- 
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-04-27 01:13:15.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p8"
-+#define MPFR_VERSION_STRING "3.1.0-p9"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-03-12 11:59:47.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-04-27 01:13:15.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p8";
-+  return "3.1.0-p9";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c
---- mpfr-3.1.0-a/tests/tgamma.c	2011-10-03 08:17:14.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tgamma.c	2012-04-27 01:13:15.000000000 +0000
-@@ -478,6 +478,36 @@
-   mpfr_clear (x);
- }
- 
-+/* bug found by Giridhar Tammana */
-+static void
-+test20120426 (void)
-+{
-+  mpfr_t xa, xb;
-+  int i;
-+  mpfr_exp_t emin;
-+
-+  mpfr_init2 (xa, 53);
-+  mpfr_init2 (xb, 53);
-+  mpfr_set_d (xb, -168.5, MPFR_RNDN);
-+  emin = mpfr_get_emin ();
-+  mpfr_set_emin (-1073);
-+  i = mpfr_gamma (xa, xb, MPFR_RNDN);
-+  i = mpfr_subnormalize (xa, i, MPFR_RNDN); /* new ternary value */
-+  mpfr_set_str (xb, "-9.5737343987585366746184749943e-304", 10, MPFR_RNDN);
-+  if (!((i > 0) && (mpfr_cmp (xa, xb) == 0)))
-+    {
-+      printf ("Error in test20120426, i=%d\n", i);
-+      printf ("expected ");
-+      mpfr_print_binary (xb); putchar ('\n');
-+      printf ("got      ");
-+      mpfr_print_binary (xa); putchar ('\n');
-+      exit (1);
-+    }
-+  mpfr_set_emin (emin);
-+  mpfr_clear (xa);
-+  mpfr_clear (xb);
-+}
-+
- static void
- exprange (void)
- {
-@@ -821,6 +851,7 @@
-   gamma_integer ();
-   test20071231 ();
-   test20100709 ();
-+  test20120426 ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
-diff -Naurd mpfr-3.1.0-a/PATCHES mpfr-3.1.0-b/PATCHES
---- mpfr-3.1.0-a/PATCHES	2012-05-07 18:52:45.000000000 +0000
-+++ mpfr-3.1.0-b/PATCHES	2012-05-07 18:52:45.000000000 +0000
-@@ -0,0 +1 @@
-+gamma-overunderflow
-diff -Naurd mpfr-3.1.0-a/VERSION mpfr-3.1.0-b/VERSION
---- mpfr-3.1.0-a/VERSION	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/VERSION	2012-05-07 18:52:45.000000000 +0000
-@@ -1 +1 @@
--3.1.0-p9
-+3.1.0-p10
-diff -Naurd mpfr-3.1.0-a/src/gamma.c mpfr-3.1.0-b/src/gamma.c
---- mpfr-3.1.0-a/src/gamma.c	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/gamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -100,7 +100,8 @@
-   mpfr_t xp, GammaTrial, tmp, tmp2;
-   mpz_t fact;
-   mpfr_prec_t realprec;
--  int compared, inex, is_integer;
-+  int compared, is_integer;
-+  int inex = 0;  /* 0 means: result gamma not set yet */
-   MPFR_GROUP_DECL (group);
-   MPFR_SAVE_EXPO_DECL (expo);
-   MPFR_ZIV_DECL (loop);
-@@ -377,6 +378,15 @@
-       mpfr_mul (GammaTrial, tmp2, xp, MPFR_RNDN); /* Pi*(2-x), error (1+u)^2 */
-       err_g = MPFR_GET_EXP(GammaTrial);
-       mpfr_sin (GammaTrial, GammaTrial, MPFR_RNDN); /* sin(Pi*(2-x)) */
-+      /* If tmp is +Inf, we compute exp(lngamma(x)). */
-+      if (mpfr_inf_p (tmp))
-+        {
-+          inex = mpfr_explgamma (gamma, x, &expo, tmp, tmp2, rnd_mode);
-+          if (inex)
-+            goto end;
-+          else
-+            goto ziv_next;
-+        }
-       err_g = err_g + 1 - MPFR_GET_EXP(GammaTrial);
-       /* let g0 the true value of Pi*(2-x), g the computed value.
-          We have g = g0 + h with |h| <= |(1+u^2)-1|*g.
-@@ -411,11 +421,16 @@
-       if (MPFR_LIKELY (MPFR_CAN_ROUND (GammaTrial, realprec - err_g,
-                                        MPFR_PREC(gamma), rnd_mode)))
-         break;
-+
-+    ziv_next:
-       MPFR_ZIV_NEXT (loop, realprec);
-     }
-+
-+ end:
-   MPFR_ZIV_FREE (loop);
- 
--  inex = mpfr_set (gamma, GammaTrial, rnd_mode);
-+  if (inex == 0)
-+    inex = mpfr_set (gamma, GammaTrial, rnd_mode);
-   MPFR_GROUP_CLEAR (group);
-   mpz_clear (fact);
- 
-diff -Naurd mpfr-3.1.0-a/src/lngamma.c mpfr-3.1.0-b/src/lngamma.c
---- mpfr-3.1.0-a/src/lngamma.c	2012-03-08 15:17:03.000000000 +0000
-+++ mpfr-3.1.0-b/src/lngamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -49,9 +49,72 @@
-     mpfr_set_ui_2exp (s, 9, -1, MPFR_RNDN); /* 4.5 */
- }
- 
--#ifndef IS_GAMMA
-+#ifdef IS_GAMMA
-+
-+/* This function is called in case of intermediate overflow/underflow.
-+   The s1 and s2 arguments are temporary MPFR numbers, having the
-+   working precision. If the result could be determined, then the
-+   flags are updated via pexpo, y is set to the result, and the
-+   (non-zero) ternary value is returned. Otherwise 0 is returned
-+   in order to perform the next Ziv iteration. */
- static int
--unit_bit (mpfr_srcptr (x))
-+mpfr_explgamma (mpfr_ptr y, mpfr_srcptr x, mpfr_save_expo_t *pexpo,
-+                mpfr_ptr s1, mpfr_ptr s2, mpfr_rnd_t rnd)
-+{
-+  mpfr_t t1, t2;
-+  int inex1, inex2, sign;
-+  MPFR_BLOCK_DECL (flags1);
-+  MPFR_BLOCK_DECL (flags2);
-+  MPFR_GROUP_DECL (group);
-+
-+  MPFR_BLOCK (flags1, inex1 = mpfr_lgamma (s1, &sign, x, MPFR_RNDD));
-+  MPFR_ASSERTN (inex1 != 0);
-+  /* s1 = RNDD(lngamma(x)), inexact */
-+  if (MPFR_UNLIKELY (MPFR_OVERFLOW (flags1)))
-+    {
-+      if (MPFR_SIGN (s1) > 0)
-+        {
-+          MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_OVERFLOW);
-+          return mpfr_overflow (y, rnd, sign);
-+        }
-+      else
-+        {
-+          MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, MPFR_FLAGS_UNDERFLOW);
-+          return mpfr_underflow (y, rnd == MPFR_RNDN ? MPFR_RNDZ : rnd, sign);
-+        }
-+    }
-+
-+  mpfr_set (s2, s1, MPFR_RNDN);     /* exact */
-+  mpfr_nextabove (s2);              /* v = RNDU(lngamma(z0)) */
-+
-+  if (sign < 0)
-+    rnd = MPFR_INVERT_RND (rnd);  /* since the result with be negated */
-+  MPFR_GROUP_INIT_2 (group, MPFR_PREC (y), t1, t2);
-+  MPFR_BLOCK (flags1, inex1 = mpfr_exp (t1, s1, rnd));
-+  MPFR_BLOCK (flags2, inex2 = mpfr_exp (t2, s2, rnd));
-+  /* t1 is the rounding with mode 'rnd' of a lower bound on |Gamma(x)|,
-+     t2 is the rounding with mode 'rnd' of an upper bound, thus if both
-+     are equal, so is the wanted result. If t1 and t2 differ or the flags
-+     differ, at some point of Ziv's loop they should agree. */
-+  if (mpfr_equal_p (t1, t2) && flags1 == flags2)
-+    {
-+      MPFR_ASSERTN ((inex1 > 0 && inex2 > 0) || (inex1 < 0 && inex2 < 0));
-+      mpfr_set4 (y, t1, MPFR_RNDN, sign);  /* exact */
-+      if (sign < 0)
-+        inex1 = - inex1;
-+      MPFR_SAVE_EXPO_UPDATE_FLAGS (*pexpo, flags1);
-+    }
-+  else
-+    inex1 = 0;  /* couldn't determine the result */
-+  MPFR_GROUP_CLEAR (group);
-+
-+  return inex1;
-+}
-+
-+#else
-+
-+static int
-+unit_bit (mpfr_srcptr x)
- {
-   mpfr_exp_t expo;
-   mpfr_prec_t prec;
-@@ -75,6 +138,7 @@
- 
-   return (x0 >> (prec % GMP_NUMB_BITS)) & 1;
- }
-+
- #endif
- 
- /* lngamma(x) = log(gamma(x)).
-@@ -99,12 +163,14 @@
-   mpfr_t s, t, u, v, z;
-   unsigned long m, k, maxm;
-   mpz_t *INITIALIZED(B);  /* variable B declared as initialized */
--  int inexact, compared;
-+  int compared;
-+  int inexact = 0;  /* 0 means: result y not set yet */
-   mpfr_exp_t err_s, err_t;
-   unsigned long Bm = 0; /* number of allocated B[] */
-   unsigned long oldBm;
-   double d;
-   MPFR_SAVE_EXPO_DECL (expo);
-+  MPFR_ZIV_DECL (loop);
- 
-   compared = mpfr_cmp_ui (z0, 1);
- 
-@@ -122,7 +188,7 @@
-   if (MPFR_EXP(z0) <= - (mpfr_exp_t) MPFR_PREC(y))
-     {
-       mpfr_t l, h, g;
--      int ok, inex2;
-+      int ok, inex1, inex2;
-       mpfr_prec_t prec = MPFR_PREC(y) + 14;
-       MPFR_ZIV_DECL (loop);
- 
-@@ -157,14 +223,14 @@
-           mpfr_sub (h, h, g, MPFR_RNDD);
-           mpfr_mul (g, z0, z0, MPFR_RNDU);
-           mpfr_add (h, h, g, MPFR_RNDU);
--          inexact = mpfr_prec_round (l, MPFR_PREC(y), rnd);
-+          inex1 = mpfr_prec_round (l, MPFR_PREC(y), rnd);
-           inex2 = mpfr_prec_round (h, MPFR_PREC(y), rnd);
-           /* Caution: we not only need l = h, but both inexact flags should
-              agree. Indeed, one of the inexact flags might be zero. In that
-              case if we assume lngamma(z0) cannot be exact, the other flag
-              should be correct. We are conservative here and request that both
-              inexact flags agree. */
--          ok = SAME_SIGN (inexact, inex2) && mpfr_cmp (l, h) == 0;
-+          ok = SAME_SIGN (inex1, inex2) && mpfr_cmp (l, h) == 0;
-           if (ok)
-             mpfr_set (y, h, rnd); /* exact */
-           mpfr_clear (l);
-@@ -172,8 +238,9 @@
-           mpfr_clear (g);
-           if (ok)
-             {
-+              MPFR_ZIV_FREE (loop);
-               MPFR_SAVE_EXPO_FREE (expo);
--              return mpfr_check_range (y, inexact, rnd);
-+              return mpfr_check_range (y, inex1, rnd);
-             }
-           /* since we have log|gamma(x)| = - log|x| - gamma*x + O(x^2),
-              if x ~ 2^(-n), then we have a n-bit approximation, thus
-@@ -205,9 +272,10 @@
-          thus lngamma(x) = log(Pi*(x-1)/sin(Pi*(2-x))) - lngamma(2-x) */
- 
-       w = precy + MPFR_INT_CEIL_LOG2 (precy);
-+      w += MPFR_INT_CEIL_LOG2 (w) + 14;
-+      MPFR_ZIV_INIT (loop, w);
-       while (1)
-         {
--          w += MPFR_INT_CEIL_LOG2 (w) + 14;
-           MPFR_ASSERTD(w >= 3);
-           mpfr_set_prec (s, w);
-           mpfr_set_prec (t, w);
-@@ -288,7 +356,9 @@
-                                   + (rnd == MPFR_RNDN)))
-                 goto end;
-             }
-+          MPFR_ZIV_NEXT (loop, w);
-         }
-+      MPFR_ZIV_FREE (loop);
-     }
- 
-   /* now z0 > 1 */
-@@ -298,10 +368,10 @@
-   /* since k is O(w), the value of log(z0*...*(z0+k-1)) is about w*log(w),
-      so there is a cancellation of ~log(w) in the argument reconstruction */
-   w = precy + MPFR_INT_CEIL_LOG2 (precy);
--
--  do
-+  w += MPFR_INT_CEIL_LOG2 (w) + 13;
-+  MPFR_ZIV_INIT (loop, w);
-+  while (1)
-     {
--      w += MPFR_INT_CEIL_LOG2 (w) + 13;
-       MPFR_ASSERTD (w >= 3);
- 
-       /* argument reduction: we compute gamma(z0 + k), where the series
-@@ -441,6 +511,15 @@
- #ifdef IS_GAMMA
-       err_s = MPFR_GET_EXP(s);
-       mpfr_exp (s, s, MPFR_RNDN);
-+      /* If s is +Inf, we compute exp(lngamma(z0)). */
-+      if (mpfr_inf_p (s))
-+        {
-+          inexact = mpfr_explgamma (y, z0, &expo, s, t, rnd);
-+          if (inexact)
-+            goto end0;
-+          else
-+            goto ziv_next;
-+        }
-       /* before the exponential, we have s = s0 + h where
-          |h| <= (2m+48)*ulp(s), thus exp(s0) = exp(s) * exp(-h).
-          For |h| <= 1/4, we have |exp(h)-1| <= 1.2*|h| thus
-@@ -480,16 +559,26 @@
-       err_s = (err_t == err_s) ? 1 + err_s : ((err_t > err_s) ? err_t : err_s);
-       err_s += 1 - MPFR_GET_EXP(s);
- #endif
-+      if (MPFR_LIKELY (MPFR_CAN_ROUND (s, w - err_s, precy, rnd)))
-+        break;
-+#ifdef IS_GAMMA
-+    ziv_next:
-+#endif
-+      MPFR_ZIV_NEXT (loop, w);
-     }
--  while (MPFR_UNLIKELY (!MPFR_CAN_ROUND (s, w - err_s, precy, rnd)));
- 
-+#ifdef IS_GAMMA
-+ end0:
-+#endif
-   oldBm = Bm;
-   while (Bm--)
-     mpz_clear (B[Bm]);
-   (*__gmp_free_func) (B, oldBm * sizeof (mpz_t));
- 
-  end:
--  inexact = mpfr_set (y, s, rnd);
-+  if (inexact == 0)
-+    inexact = mpfr_set (y, s, rnd);
-+  MPFR_ZIV_FREE (loop);
- 
-   mpfr_clear (s);
-   mpfr_clear (t);
-diff -Naurd mpfr-3.1.0-a/src/mpfr.h mpfr-3.1.0-b/src/mpfr.h
---- mpfr-3.1.0-a/src/mpfr.h	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/mpfr.h	2012-05-07 18:52:45.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 0
--#define MPFR_VERSION_STRING "3.1.0-p9"
-+#define MPFR_VERSION_STRING "3.1.0-p10"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.0-a/src/version.c mpfr-3.1.0-b/src/version.c
---- mpfr-3.1.0-a/src/version.c	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/src/version.c	2012-05-07 18:52:45.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.0-p9";
-+  return "3.1.0-p10";
- }
-diff -Naurd mpfr-3.1.0-a/tests/tgamma.c mpfr-3.1.0-b/tests/tgamma.c
---- mpfr-3.1.0-a/tests/tgamma.c	2012-04-27 01:13:15.000000000 +0000
-+++ mpfr-3.1.0-b/tests/tgamma.c	2012-05-07 18:52:45.000000000 +0000
-@@ -838,6 +838,175 @@
-     exit (1);
- }
- 
-+/* Test mpfr_gamma in precision p1 by comparing it with exp(lgamma(x))
-+   computing with a working precision p2. Assume that x is not an
-+   integer <= 2. */
-+static void
-+exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2)
-+{
-+  mpfr_t yd, yu, zd, zu;
-+  int inexd, inexu, sign;
-+  int underflow = -1, overflow = -1;  /* -1: we don't know */
-+  int got_underflow, got_overflow;
-+
-+  if (mpfr_integer_p (x) && mpfr_cmp_si (x, 2) <= 0)
-+    {
-+      printf ("Warning! x is an integer <= 2 in exp_lgamma: ");
-+      mpfr_out_str (stdout, 10, 0, x, MPFR_RNDN); putchar ('\n');
-+      return;
-+    }
-+  mpfr_inits2 (p2, yd, yu, (mpfr_ptr) 0);
-+  inexd = mpfr_lgamma (yd, &sign, x, MPFR_RNDD);
-+  mpfr_set (yu, yd, MPFR_RNDN);  /* exact */
-+  if (inexd)
-+    mpfr_nextabove (yu);
-+  mpfr_clear_flags ();
-+  mpfr_exp (yd, yd, MPFR_RNDD);
-+  if (! mpfr_underflow_p ())
-+    underflow = 0;
-+  if (mpfr_overflow_p ())
-+    overflow = 1;
-+  mpfr_clear_flags ();
-+  mpfr_exp (yu, yu, MPFR_RNDU);
-+  if (mpfr_underflow_p ())
-+    underflow = 1;
-+  if (! mpfr_overflow_p ())
-+    overflow = 0;
-+  if (sign < 0)
-+    {
-+      mpfr_neg (yd, yd, MPFR_RNDN);  /* exact */
-+      mpfr_neg (yu, yu, MPFR_RNDN);  /* exact */
-+      mpfr_swap (yd, yu);
-+    }
-+  /* yd < Gamma(x) < yu (strict inequalities since x != 1 and x != 2) */
-+  mpfr_inits2 (p1, zd, zu, (mpfr_ptr) 0);
-+  mpfr_clear_flags ();
-+  inexd = mpfr_gamma (zd, x, MPFR_RNDD);  /* zd <= Gamma(x) < yu */
-+  got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p ();
-+  got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p ();
-+  if (! mpfr_less_p (zd, yu) || inexd > 0 ||
-+      got_underflow != underflow ||
-+      got_overflow != overflow)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+      mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+      printf ("yu = ");
-+      mpfr_dump (yu);
-+      printf ("zd = ");
-+      mpfr_dump (zd);
-+      printf ("got inexd = %d, expected <= 0\n", inexd);
-+      printf ("got underflow = %d, expected %d\n", got_underflow, underflow);
-+      printf ("got overflow = %d, expected %d\n", got_overflow, overflow);
-+      exit (1);
-+    }
-+  mpfr_clear_flags ();
-+  inexu = mpfr_gamma (zu, x, MPFR_RNDU);  /* zu >= Gamma(x) > yd */
-+  got_underflow = underflow == -1 ? -1 : !! mpfr_underflow_p ();
-+  got_overflow = overflow == -1 ? -1 : !! mpfr_overflow_p ();
-+  if (! mpfr_greater_p (zu, yd) || inexu < 0 ||
-+      got_underflow != underflow ||
-+      got_overflow != overflow)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+      mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+      printf ("yd = ");
-+      mpfr_dump (yd);
-+      printf ("zu = ");
-+      mpfr_dump (zu);
-+      printf ("got inexu = %d, expected >= 0\n", inexu);
-+      printf ("got underflow = %d, expected %d\n", got_underflow, underflow);
-+      printf ("got overflow = %d, expected %d\n", got_overflow, overflow);
-+      exit (1);
-+    }
-+  if (mpfr_equal_p (zd, zu))
-+    {
-+      if (inexd != 0 || inexu != 0)
-+        {
-+          printf ("Error in exp_lgamma on x = ");
-+          mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+          printf ("zd = zu, thus exact, but inexd = %d and inexu = %d\n",
-+                  inexd, inexu);
-+          exit (1);
-+        }
-+      MPFR_ASSERTN (got_underflow == 0);
-+      MPFR_ASSERTN (got_overflow == 0);
-+    }
-+  else if (inexd == 0 || inexu == 0)
-+    {
-+      printf ("Error in exp_lgamma on x = ");
-+          mpfr_out_str (stdout, 16, 0, x, MPFR_RNDN); putchar ('\n');
-+          printf ("zd != zu, thus inexact, but inexd = %d and inexu = %d\n",
-+                  inexd, inexu);
-+          exit (1);
-+    }
-+  mpfr_clears (yd, yu, zd, zu, (mpfr_ptr) 0);
-+}
-+
-+static void
-+exp_lgamma_tests (void)
-+{
-+  mpfr_t x;
-+  mpfr_exp_t emin, emax;
-+  int i;
-+
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+  set_emin (MPFR_EMIN_MIN);
-+  set_emax (MPFR_EMAX_MAX);
-+
-+  mpfr_init2 (x, 96);
-+  for (i = 3; i <= 8; i++)
-+    {
-+      mpfr_set_ui (x, i, MPFR_RNDN);
-+      exp_lgamma (x, 53, 64);
-+      mpfr_nextbelow (x);
-+      exp_lgamma (x, 53, 64);
-+      mpfr_nextabove (x);
-+      mpfr_nextabove (x);
-+      exp_lgamma (x, 53, 64);
-+    }
-+  mpfr_set_str (x, "1.7", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-90.6308260837372266e+15", 10, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* The following test gives a large positive result < +Inf */
-+  mpfr_set_str (x, "1.2b13fc45a92dea1@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* Idem for a large negative result > -Inf */
-+  mpfr_set_str (x, "-1.2b13fc45a92de81@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* The following two tests trigger an endless loop in r8186
-+     on 64-bit machines (64-bit exponent). The second one (due
-+     to undetected overflow) is a direct consequence of the
-+     first one, due to the call of Gamma(2-x) if x < 1. */
-+  mpfr_set_str (x, "1.2b13fc45a92dec8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  mpfr_set_str (x, "-1.2b13fc45a92dea8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* Similar tests (overflow threshold) for 32-bit machines. */
-+  mpfr_set_str (x, "2ab68d8.657542f855111c61", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);
-+  mpfr_set_str (x, "-2ab68d6.657542f855111c61", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);
-+  /* The following test is an overflow on 32-bit and 64-bit machines.
-+     Revision r8189 fails on 64-bit machines as the flag is unset. */
-+  mpfr_set_str (x, "1.2b13fc45a92ded8@14", 16, MPFR_RNDN);
-+  exp_lgamma (x, 53, 64);
-+  /* On the following tests, with r8196, one gets an underflow on
-+     32-bit machines, while a normal result is expected (see FIXME
-+     in gamma.c:382). */
-+  mpfr_set_str (x, "-2ab68d6.657542f855111c6104", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);  /* failure on 32-bit machines */
-+  mpfr_set_str (x, "-12b13fc45a92deb.1c6c5bc964", 16, MPFR_RNDN);
-+  exp_lgamma (x, 12, 64);  /* failure on 64-bit machines */
-+  mpfr_clear (x);
-+
-+  set_emin (emin);
-+  set_emax (emax);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -852,6 +1021,7 @@
-   test20071231 ();
-   test20100709 ();
-   test20120426 ();
-+  exp_lgamma_tests ();
- 
-   data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
- 
diff --git a/testing/mpfr/mpfr-3.1.1-p2.patch b/testing/mpfr/mpfr-3.1.1-p2.patch
deleted file mode 100644
index 43dfcbfe3..000000000
--- a/testing/mpfr/mpfr-3.1.1-p2.patch
+++ /dev/null
@@ -1,405 +0,0 @@
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:28:51.000000000 +0000
-@@ -0,0 +1 @@
-+get_decimal64
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-07-03 15:01:13.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:28:51.000000000 +0000
-@@ -1 +1 @@
--3.1.1
-+3.1.1-p1
-diff -Naurd mpfr-3.1.1-a/src/get_d64.c mpfr-3.1.1-b/src/get_d64.c
---- mpfr-3.1.1-a/src/get_d64.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/get_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -32,6 +32,10 @@
- 
- #ifdef MPFR_WANT_DECIMAL_FLOATS
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- #ifdef DPD_FORMAT
- static int T[1000] = {
-   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 32,
-@@ -142,26 +146,14 @@
- static _Decimal64
- get_decimal64_min (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 0;
--  x.s.manh = 0;
--  x.s.manl = 1;
--  return x.d;
-+  return negative ? - 1E-398dd : 1E-398dd;
- }
- 
- /* construct the decimal64 largest finite number with given sign */
- static _Decimal64
- get_decimal64_max (int negative)
- {
--  union ieee_double_extract x;
--
--  x.s.sig = (negative) ? 1 : 0;
--  x.s.exp = 1919;
--  x.s.manh = 1048575; /* 2^20-1 */
--  x.s.manl = ~0;
--  return x.d;
-+  return negative ? - DEC64_MAX : DEC64_MAX;
- }
- 
- /* one-to-one conversion:
-@@ -334,7 +326,8 @@
-   /* the largest decimal64 number is just below 10^(385) < 2^1279 */
-   else if (MPFR_UNLIKELY (e > 1279)) /* then src >= 2^1279 */
-     {
--      if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+      if (rnd_mode == MPFR_RNDZ
-+          || (rnd_mode == MPFR_RNDU && negative != 0)
-           || (rnd_mode == MPFR_RNDD && negative == 0))
-         return get_decimal64_max (negative);
-       else
-@@ -354,6 +347,15 @@
-              which corresponds to s=[0.]1000...000 and e=-397 */
-           if (e < -397)
-             {
-+              if (rnd_mode == MPFR_RNDN && e == -398)
-+                {
-+                  /* If 0.5E-398 < |src| < 1E-398 (smallest subnormal),
-+                     src should round to +/- 1E-398 in MPFR_RNDN. */
-+                  mpfr_get_str (s, &e, 10, 1, src, MPFR_RNDA);
-+                  return e == -398 && s[negative] <= '5' ?
-+                    get_decimal64_zero (negative) :
-+                    get_decimal64_min (negative);
-+                }
-               if (rnd_mode == MPFR_RNDZ || rnd_mode == MPFR_RNDN
-                   || (rnd_mode == MPFR_RNDD && negative == 0)
-                   || (rnd_mode == MPFR_RNDU && negative != 0))
-@@ -379,7 +381,8 @@
-          which corresponds to s=[0.]9999...999 and e=385 */
-       else if (e > 385)
-         {
--          if (MPFR_RNDZ || (rnd_mode == MPFR_RNDU && negative != 0)
-+          if (rnd_mode == MPFR_RNDZ
-+              || (rnd_mode == MPFR_RNDU && negative != 0)
-               || (rnd_mode == MPFR_RNDD && negative == 0))
-             return get_decimal64_max (negative);
-           else
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-07-03 15:01:19.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1"
-+#define MPFR_VERSION_STRING "3.1.1-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-07-03 15:01:18.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1";
-+  return "3.1.1-p1";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tget_set_d64.c mpfr-3.1.1-b/tests/tget_set_d64.c
---- mpfr-3.1.1-a/tests/tget_set_d64.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tget_set_d64.c	2012-08-30 09:28:51.000000000 +0000
-@@ -25,6 +25,10 @@
- #include <stdlib.h> /* for exit */
- #include "mpfr-test.h"
- 
-+#ifndef DEC64_MAX
-+# define DEC64_MAX 9.999999999999999E384dd
-+#endif
-+
- /* #define DEBUG */
- 
- static void
-@@ -149,6 +153,15 @@
-   mpfr_set_str (x, "9.999999999999999E384", 10, MPFR_RNDZ);
-   mpfr_set (y, x, MPFR_RNDZ);
-   d = mpfr_get_decimal64 (x, MPFR_RNDU);
-+  ASSERT_ALWAYS (d == DEC64_MAX);
-+  mpfr_set_ui (x, 0, MPFR_RNDZ);
-+  mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-+  ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-+
-+  mpfr_set_str (x, "-9.999999999999999E384", 10, MPFR_RNDZ);
-+  mpfr_set (y, x, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDA);
-+  ASSERT_ALWAYS (d == -DEC64_MAX);
-   mpfr_set_ui (x, 0, MPFR_RNDZ);
-   mpfr_set_decimal64 (x, d, MPFR_RNDZ);
-   ASSERT_ALWAYS (mpfr_cmp (x, y) == 0);
-@@ -225,6 +238,83 @@
-   mpfr_clear (x);
- }
- 
-+static void
-+check_overflow (void)
-+{
-+  mpfr_t x;
-+  int err = 0, neg, rnd;
-+
-+  mpfr_init2 (x, 96);
-+  for (neg = 0; neg < 2; neg++)
-+    RND_LOOP (rnd)
-+      {
-+        _Decimal64 d, e;
-+        mpfr_rnd_t r = (mpfr_rnd_t) rnd;
-+        int sign = neg ? -1 : 1;
-+
-+        e = sign * (MPFR_IS_LIKE_RNDZ (r, neg) ? 1 : 2) * DEC64_MAX;
-+        /* This tests the binary exponent e > 1279 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign, 9999, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 1 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the decimal exponent e > 385 case of get_d64.c */
-+        mpfr_set_si_2exp (x, sign * 31, 1274, MPFR_RNDN);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 2 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+        /* This tests the last else (-382 <= e <= 385) of get_d64.c */
-+        mpfr_set_decimal64 (x, e, MPFR_RNDA);
-+        d = mpfr_get_decimal64 (x, r);
-+        if (d != e)
-+          {
-+            printf ("Error 3 in check_overflow for %s, %s\n",
-+                    neg ? "negative" : "positive",
-+                    mpfr_print_rnd_mode (r));
-+            err = 1;
-+          }
-+      }
-+  mpfr_clear (x);
-+  if (err)
-+    exit (1);
-+}
-+
-+static void
-+check_tiny (void)
-+{
-+  mpfr_t x;
-+  _Decimal64 d;
-+
-+  /* If 0.5E-398 < |x| < 1E-398 (smallest subnormal), x should round
-+     to +/- 1E-398 in MPFR_RNDN. Note: the midpoint 0.5E-398 between
-+     0 and 1E-398 is not a representable binary number, so that there
-+     are no tests for it. */
-+  mpfr_init2 (x, 128);
-+  mpfr_set_str (x, "1E-398", 10, MPFR_RNDZ);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_set_str (x, "0.5E-398", 10, MPFR_RNDU);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == 1.0E-398dd);
-+  mpfr_neg (x, x, MPFR_RNDN);
-+  d = mpfr_get_decimal64 (x, MPFR_RNDN);
-+  MPFR_ASSERTN (d == -1.0E-398dd);
-+  mpfr_clear (x);
-+}
-+
- int
- main (void)
- {
-@@ -241,6 +331,8 @@
-   check_inf_nan ();
-   check_random ();
-   check_native ();
-+  check_overflow ();
-+  check_tiny ();
- 
-   tests_end_mpfr ();
-   return 0;
-diff -Naurd mpfr-3.1.1-a/PATCHES mpfr-3.1.1-b/PATCHES
---- mpfr-3.1.1-a/PATCHES	2012-08-30 09:35:12.000000000 +0000
-+++ mpfr-3.1.1-b/PATCHES	2012-08-30 09:35:12.000000000 +0000
-@@ -0,0 +1 @@
-+strtofr-ternary-value
-diff -Naurd mpfr-3.1.1-a/VERSION mpfr-3.1.1-b/VERSION
---- mpfr-3.1.1-a/VERSION	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/VERSION	2012-08-30 09:35:12.000000000 +0000
-@@ -1 +1 @@
--3.1.1-p1
-+3.1.1-p2
-diff -Naurd mpfr-3.1.1-a/src/mpfr.h mpfr-3.1.1-b/src/mpfr.h
---- mpfr-3.1.1-a/src/mpfr.h	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/mpfr.h	2012-08-30 09:35:12.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 1
--#define MPFR_VERSION_STRING "3.1.1-p1"
-+#define MPFR_VERSION_STRING "3.1.1-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.1-a/src/strtofr.c mpfr-3.1.1-b/src/strtofr.c
---- mpfr-3.1.1-a/src/strtofr.c	2012-07-03 15:01:16.000000000 +0000
-+++ mpfr-3.1.1-b/src/strtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -667,6 +667,20 @@
-           /* (z, exp_z) = base^(exp_base-pstr_size) */
-           z = result + 2*ysize + 1;
-           err = mpfr_mpn_exp (z, &exp_z, pstr->base, exp_z, ysize);
-+          /* Since we want y/z rounded toward zero, we must get an upper
-+             bound of z. If err >= 0, the error on z is bounded by 2^err. */
-+          if (err >= 0)
-+            {
-+              mp_limb_t cy;
-+              unsigned long h = err / GMP_NUMB_BITS;
-+              unsigned long l = err - h * GMP_NUMB_BITS;
-+
-+              if (h >= ysize) /* not enough precision in z */
-+                goto next_loop;
-+              cy = mpn_add_1 (z, z, ysize - h, MPFR_LIMB_ONE << l);
-+              if (cy != 0) /* the code below requires z on ysize limbs */
-+                goto next_loop;
-+            }
-           exact = exact && (err == -1);
-           if (err == -2)
-             goto underflow; /* FIXME: Sure? */
-@@ -730,6 +744,7 @@
-                                        MPFR_RNDN, rnd, MPFR_PREC(x)))
-         break;
- 
-+    next_loop:
-       /* update the prec for next loop */
-       MPFR_ZIV_NEXT (loop, prec);
-     } /* loop */
-diff -Naurd mpfr-3.1.1-a/src/version.c mpfr-3.1.1-b/src/version.c
---- mpfr-3.1.1-a/src/version.c	2012-08-30 09:28:51.000000000 +0000
-+++ mpfr-3.1.1-b/src/version.c	2012-08-30 09:35:12.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "3.1.1-p1";
-+  return "3.1.1-p2";
- }
-diff -Naurd mpfr-3.1.1-a/tests/tstrtofr.c mpfr-3.1.1-b/tests/tstrtofr.c
---- mpfr-3.1.1-a/tests/tstrtofr.c	2012-07-03 15:01:24.000000000 +0000
-+++ mpfr-3.1.1-b/tests/tstrtofr.c	2012-08-30 09:35:12.000000000 +0000
-@@ -1105,6 +1105,92 @@
-   mpfr_clear (y);
- }
- 
-+/* From a bug reported by Joseph S. Myers
-+   https://sympa.inria.fr/sympa/arc/mpfr/2012-08/msg00005.html */
-+static void
-+bug20120814 (void)
-+{
-+  mpfr_exp_t emin = -30, e;
-+  mpfr_t x, y;
-+  int r;
-+  char s[64], *p;
-+
-+  mpfr_init2 (x, 2);
-+  mpfr_set_ui_2exp (x, 3, emin - 2, MPFR_RNDN);
-+  mpfr_get_str (s + 1, &e, 10, 19, x, MPFR_RNDD);
-+  s[0] = s[1];
-+  s[1] = '.';
-+  for (p = s; *p != 0; p++) ;
-+  *p = 'e';
-+  sprintf (p + 1, "%d", (int) e - 1);
-+
-+  mpfr_init2 (y, 4);
-+  r = mpfr_strtofr (y, s, NULL, 0, MPFR_RNDN);
-+  if (r <= 0 || ! mpfr_equal_p (x, y))
-+    {
-+      printf ("Error in bug20120814\n");
-+      printf ("mpfr_strtofr failed on string \"%s\"\n", s);
-+      printf ("Expected inex > 0 and y = 0.1100E%d\n", (int) emin);
-+      printf ("Got inex = %-6d and y = ", r);
-+      mpfr_dump (y);
-+      exit (1);
-+    }
-+
-+  mpfr_clear (x);
-+  mpfr_clear (y);
-+}
-+
-+static void
-+bug20120829 (void)
-+{
-+  mpfr_t x1, x2, e;
-+  int inex1, inex2, i, r;
-+  char s[48] = "1e-1";
-+
-+  mpfr_init2 (e, 128);
-+  mpfr_inits2 (4, x1, x2, (mpfr_ptr) 0);
-+
-+  inex1 = mpfr_set_si (e, -1, MPFR_RNDN);
-+  MPFR_ASSERTN (inex1 == 0);
-+
-+  for (i = 1; i <= sizeof(s) - 5; i++)
-+    {
-+      s[3+i] = '0';
-+      s[4+i] = 0;
-+      inex1 = mpfr_mul_ui (e, e, 10, MPFR_RNDN);
-+      MPFR_ASSERTN (inex1 == 0);
-+      RND_LOOP(r)
-+        {
-+          mpfr_rnd_t rnd = (mpfr_rnd_t) r;
-+
-+          inex1 = mpfr_exp10 (x1, e, rnd);
-+          inex1 = SIGN (inex1);
-+          inex2 = mpfr_strtofr (x2, s, NULL, 0, rnd);
-+          inex2 = SIGN (inex2);
-+          /* On 32-bit machines, for i = 7, r8389, r8391 and r8394 do:
-+             strtofr.c:...: MPFR assertion failed: cy == 0
-+             r8396 is OK.
-+             On 64-bit machines, for i = 15,
-+             r8389 does: strtofr.c:678: MPFR assertion failed: err < (64 - 0)
-+             r8391 does: strtofr.c:680: MPFR assertion failed: h < ysize
-+             r8394 and r8396 are OK.
-+          */
-+          if (! mpfr_equal_p (x1, x2) || inex1 != inex2)
-+            {
-+              printf ("Error in bug20120829 for i = %d, rnd = %s\n",
-+                      i, mpfr_print_rnd_mode (rnd));
-+              printf ("Expected inex = %d, x = ", inex1);
-+              mpfr_dump (x1);
-+              printf ("Got      inex = %d, x = ", inex2);
-+              mpfr_dump (x2);
-+              exit (1);
-+            }
-+        }
-+    }
-+
-+  mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1117,6 +1203,8 @@
-   check_retval ();
-   bug20081028 ();
-   test20100310 ();
-+  bug20120814 ();
-+  bug20120829 ();
- 
-   tests_end_mpfr ();
-   return 0;
diff --git a/testing/mpfr/mpfr.install b/testing/mpfr/mpfr.install
deleted file mode 100644
index d6dd0475b..000000000
--- a/testing/mpfr/mpfr.install
+++ /dev/null
@@ -1,20 +0,0 @@
-info_dir=usr/share/info
-info_files=(mpfr.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/mutter/PKGBUILD b/testing/mutter/PKGBUILD
deleted file mode 100644
index 08e3155ac..000000000
--- a/testing/mutter/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169169 2012-10-18 19:23:25Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
-
-pkgname=mutter
-pkgver=3.6.1
-pkgrel=2
-pkgdesc="A window manager for GNOME"
-arch=(i686 x86_64)
-license=('GPL')
-depends=('clutter' 'dconf' 'gobject-introspection' 'gsettings-desktop-schemas' 'libcanberra' 'startup-notification' 'zenity' 'libsm')
-makedepends=('intltool' 'gnome-doc-utils')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('4bec46ceb114a78d5f851823d8966b9b386a9319fbec740ff59bf5eb265d6637')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/mutter \
-      --localstatedir=/var --disable-static \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/mutter/mutter.install b/testing/mutter/mutter.install
deleted file mode 100644
index c47f1cef2..000000000
--- a/testing/mutter/mutter.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=mutter
-
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-pre_upgrade() {
-    if [ -f /usr/share/gconf/schemas/$pkgname.schemas ]; then
-        /usr/sbin/gconfpkg --uninstall $pkgname
-    fi
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/mysql/PKGBUILD b/testing/mysql/PKGBUILD
deleted file mode 100644
index 74a6654e6..000000000
--- a/testing/mysql/PKGBUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# $Id: PKGBUILD 165319 2012-08-15 14:54:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=mysql
-pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
-pkgver=5.5.27
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('GPL')
-url="https://www.mysql.com/products/community/"
-makedepends=('cmake' 'openssl' 'zlib')
-options=('!libtool')
-source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz"
-        'mysqld.rc' 'my.cnf' 'mysqld-post.sh' 'mysqld-tmpfile.conf' 'mysqld.service')
-md5sums=('82baf46acfced6eef072e9d8a479c86e'
-         'e7eb2faeab755cbb2fe03542bf328da9'
-         '1c949c0dbea5206af0db14942d9927b6'
-         '6ea6ceb360d09a774e87335ee098ddd5'
-         '2fa6e456964d4ff5e6d4f9ff0126aed6'
-         'a0e1460c276a50a9666c331de83271f2')
-
-build() {
-  mkdir build
-  cd build
-
-  # CFLAGS/CXXFLAGS as suggested upstream
-
-  cmake ../${pkgbase}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSYSCONFDIR=/etc/mysql \
-    -DMYSQL_DATADIR=/var/lib/mysql \
-    -DMYSQL_UNIX_ADDR=/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=ON \
-    -DWITH_ZLIB=system \
-    -DWITH_SSL=system \
-    -DWITH_LIBWRAP=OFF \
-    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
-    -DWITH_EXTRA_CHARSETS=complex \
-    -DWITH_EMBEDDED_SERVER=ON \
-    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
-    -DWITH_PARTITION_STORAGE_ENGINE=1 \
-    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
-    -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
-    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
-    -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
-    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
-
-  make
-}
-
-package_libmysqlclient(){
-  pkgdesc="MySQL client libraries"
-  depends=('openssl')
-  
-  cd build
-  for dir in include libmysql libmysqld libservices; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  install -d "${pkgdir}"/usr/bin
-  install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-}
-
-package_mysql-clients(){
-  pkgdesc="MySQL client tools"
-  depends=('libmysqlclient')
-  
-  cd build
-  make -C client DESTDIR="${pkgdir}" install
-
-  # install man pages
-  install -d "${pkgdir}"/usr/share/man/man1
-  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
-    install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1
-  done
-
-  # provided by mysql
-  rm "${pkgdir}"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
-}
-
-package_mysql(){
-  pkgdesc="A fast SQL database server"
-  backup=('etc/mysql/my.cnf')
-  install=mysql.install
-  depends=('mysql-clients' 'systemd-tools')
-  options=('emptydirs')
-
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 "${srcdir}"/my.cnf "${pkgdir}"/etc/mysql/my.cnf
-  install -Dm755 "${srcdir}"/mysqld.rc "${pkgdir}"/etc/rc.d/mysqld
-  install -Dm755 "${srcdir}"/mysqld-post.sh "${pkgdir}"/usr/bin/mysqld-post
-  install -Dm644 "${srcdir}"/mysqld-tmpfile.conf "${pkgdir}"/usr/lib/tmpfiles.d/mysqld.conf
-  install -d "${pkgdir}"/usr/lib/systemd/system
-  install -Dm644 "${srcdir}"/mysqld.service "${pkgdir}"/usr/lib/systemd/system/
-
-  # provided by libmysqlclient
-  rm "${pkgdir}"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
-  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
-}
diff --git a/testing/mysql/my.cnf b/testing/mysql/my.cnf
deleted file mode 100644
index 9a41b4fc3..000000000
--- a/testing/mysql/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/testing/mysql/mysql.install b/testing/mysql/mysql.install
deleted file mode 100644
index a98f1a877..000000000
--- a/testing/mysql/mysql.install
+++ /dev/null
@@ -1,28 +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
-
-  usr/bin/systemd-tmpfiles --create mysqld.conf
-}
-
-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/testing/mysql/mysqld-post.sh b/testing/mysql/mysqld-post.sh
deleted file mode 100755
index 8dc9c4eea..000000000
--- a/testing/mysql/mysqld-post.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-while true; do
-    response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break
-    echo "$response" | grep -q "mysqld is alive" && break
-    sleep 1
-done
diff --git a/testing/mysql/mysqld-tmpfile.conf b/testing/mysql/mysqld-tmpfile.conf
deleted file mode 100644
index 6883dc798..000000000
--- a/testing/mysql/mysqld-tmpfile.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/mysqld 0755 mysql mysql -
diff --git a/testing/mysql/mysqld.rc b/testing/mysql/mysqld.rc
deleted file mode 100755
index 4bbddb5a4..000000000
--- a/testing/mysql/mysqld.rc
+++ /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 MySQL Server"
-    [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /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) > /run/mysqld/mysqld.pid
-          add_daemon mysqld
-          stat_done
-        fi
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping MySQL 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 /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/testing/mysql/mysqld.service b/testing/mysql/mysqld.service
deleted file mode 100644
index 0175c685b..000000000
--- a/testing/mysql/mysqld.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=MySQL Server
-
-[Service]
-User=mysql
-ExecStart=/usr/bin/mysqld --user=mysql
-ExecStartPost=/usr/bin/mysqld-post
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nautilus-open-terminal/PKGBUILD b/testing/nautilus-open-terminal/PKGBUILD
deleted file mode 100644
index a3104098a..000000000
--- a/testing/nautilus-open-terminal/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169167 2012-10-18 19:23:18Z jgc $
-# Maintainer : Biru Ionut <ionut@archlinux.ro>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-pkgname=nautilus-open-terminal
-pkgver=0.19
-pkgrel=3
-pkgdesc="A nautilus plugin for opening terminals in arbitrary local paths"
-arch=('i686' 'x86_64')
-url="http://ftp.gnome.org/pub/GNOME/sources/nautilus-open-terminal"
-license=('GPL')
-depends=('nautilus' 'gconf')
-makedepends=('pkgconfig' 'gettext' 'intltool')
-install=nautilus-open-terminal.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-options=('!libtool' '!emptydirs')
-sha256sums=('4760f3a5a862ba9239ea92690a42ecee2c68fad413b023dd06505bdb3ee1f6af')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -dm755 "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -rf "${pkgdir}"/etc/gconf/schemas
-}
diff --git a/testing/nautilus-open-terminal/nautilus-open-terminal.install b/testing/nautilus-open-terminal/nautilus-open-terminal.install
deleted file mode 100644
index f7cdb9507..000000000
--- a/testing/nautilus-open-terminal/nautilus-open-terminal.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=nautilus-open-terminal
-
-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/nautilus-sendto/PKGBUILD b/testing/nautilus-sendto/PKGBUILD
deleted file mode 100644
index 1cf003352..000000000
--- a/testing/nautilus-sendto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169166 2012-10-18 19:23:15Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Tor Krill <tor@krill.nu>
-
-pkgname=nautilus-sendto
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Nautilus context menu for sending files."
-arch=('i686' 'x86_64')
-url="http://download.gnome.org/sources/nautilus-sendto/"
-license=('GPL')
-groups=('gnome-extra')
-depends=('evolution-data-server' 'nautilus' 'dconf')
-makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp')
-options=('!libtool' '!emptydirs')
-install=nautilus-sendto.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/nautilus-sendto/nautilus-sendto.install b/testing/nautilus-sendto/nautilus-sendto.install
deleted file mode 100644
index d33a1b261..000000000
--- a/testing/nautilus-sendto/nautilus-sendto.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install $1
-}
-
-post_remove() {
-    post_install $1
-}
diff --git a/testing/nautilus/PKGBUILD b/testing/nautilus/PKGBUILD
deleted file mode 100644
index 51b68261e..000000000
--- a/testing/nautilus/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169536 2012-10-23 10:44:23Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nautilus
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="GNOME file manager"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify')
-makedepends=('intltool' 'gobject-introspection')
-url="http://www.gnome.org"
-groups=('gnome')
-options=('!libtool' '!emptydirs')
-install=nautilus.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7b30cf1ce538c9d4cdff883f54d1edcbdffbe146dc1b819bbfacd5e6837df390')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --libexecdir=/usr/lib/nautilus \
-      --disable-nst-extension \
-      --disable-update-mimedb \
-      --disable-packagekit \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/nautilus/nautilus.install b/testing/nautilus/nautilus.install
deleted file mode 100644
index 082126d24..000000000
--- a/testing/nautilus/nautilus.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-mime-database /usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/nepomuk-core/PKGBUILD b/testing/nepomuk-core/PKGBUILD
deleted file mode 100644
index bff55942b..000000000
--- a/testing/nepomuk-core/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 167563 2012-10-02 18:56:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=nepomuk-core
-pkgver=4.9.2
-pkgrel=1
-pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
-url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'regression-crash.patch')
-sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b'
-          'e6237844c0f9d5838b827068fe768394e0df0cff')
-
-build() {
-  # KDEBUG 307388
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i "${srcdir}"/regression-crash.patch
-  cd ../
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-
-  # Fix the python shebang
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
-}
diff --git a/testing/nepomuk-core/regression-crash.patch b/testing/nepomuk-core/regression-crash.patch
deleted file mode 100644
index a683c133b..000000000
--- a/testing/nepomuk-core/regression-crash.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 804e54f83ade8a377d392d350981ead07f60a9d3
-Author: David Faure <faure@kde.org>
-Date:   Tue Oct 2 20:27:03 2012 +0200
-
-    Fix crash when watchUserLimitReached() leads to deleting the KInotify instance
-    
-    ... which emitted the signal. So don't use a direct delete.
-    
-    BUG: 307388
-    FIXED-IN: 4.9.3
-
-diff --git a/services/filewatch/nepomukfilewatch.cpp b/services/filewatch/nepomukfilewatch.cpp
-index 9fd5d9c..94db504 100644
---- a/services/filewatch/nepomukfilewatch.cpp
-+++ b/services/filewatch/nepomukfilewatch.cpp
-@@ -323,7 +323,8 @@ void Nepomuk2::FileWatch::connectToKDirWatch()
- void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached()
- {
-     // we do it the brutal way for now hoping with new kernels and defaults this will never happen
--    delete m_dirWatch;
-+    // Delete the KInotify and switch to KDirNotify dbus signals
-+    m_dirWatch->deleteLater();
-     m_dirWatch = 0;
-     connectToKDirWatch();
- }
diff --git a/testing/net-snmp/PKGBUILD b/testing/net-snmp/PKGBUILD
deleted file mode 100644
index 3bcad6c09..000000000
--- a/testing/net-snmp/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 168010 2012-10-05 06:54:12Z eric $
-# Maintainer: 
-# Contributor: Dale Blount <dale@archlinux.org>
-
-pkgname=net-snmp
-pkgver=5.7.1
-pkgrel=4
-pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
-arch=('i686' 'x86_64')
-url="http://www.net-snmp.org/"
-license=('BSD')
-depends=('openssl' 'libnl' 'pciutils')
-makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application' 
-            'perl-tk: for snmpcheck and tkmib applications'
-            'python2: for the python modules')
-provides=('ucd-snmp')
-backup=('etc/conf.d/snmpd')
-options=('!libtool' '!makeflags' '!emptydirs')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        snmpd.confd snmpd.rc snmpd.service libnl32.patch)
-sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a'
-          '2bdc2839ce09d7daa608cd54687fa8beb47ed907'
-          'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b'
-          '90600c0141eed10d6e3ca3ccc97ad8dda15c2112'
-          'f59ddc049c1c689f04e68c3c7cd8b8e301df3158'
-          '74a9848b95f63378eb1753fc309d2b74de5afb0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # http://sourceforge.net/tracker/index.php?func=detail&aid=3250304&group_id=12694&atid=112694
-  patch -Np1 -i "$srcdir/libnl32.patch"
-  autoreconf -f -i
-
-  sed -i -e "s:\(install --basedir=\$\$dir\):\1 --root='${pkgdir}':" Makefile.in
-  PYTHONPROG=/usr/bin/python2 ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --enable-ucd-snmp-compatibility \
-    --enable-ipv6 \
-    --with-python-modules \
-    --with-default-snmp-version="3" \
-    --with-sys-contact="root@localhost" \
-    --with-sys-location="Unknown" \
-    --with-logfile="/var/log/snmpd.log" \
-    --with-mib-modules="host misc/ipfwacc ucd-snmp/diskio tunnel ucd-snmp/dlmod" \
-    --with-persistent-directory="/var/net-snmp" \
-    --disable-static
-  make NETSNMP_DONT_CHECK_VERSION=1
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" INSTALL_PREFIX="${pkgdir}" INSTALLDIRS=vendor install
-  install -D -m755 "${srcdir}/snmpd.rc" "${pkgdir}/etc/rc.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.confd" "${pkgdir}/etc/conf.d/snmpd"
-  install -D -m644 "${srcdir}/snmpd.service" "${pkgdir}/usr/lib/systemd/system/snmpd.service"
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/net-snmp/libnl32.patch b/testing/net-snmp/libnl32.patch
deleted file mode 100644
index d93d7ef67..000000000
--- a/testing/net-snmp/libnl32.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -u -r net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c
---- net-snmp-5.7.1/agent/mibgroup/mibII/tcpTable.c	2011-09-28 06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/agent/mibgroup/mibII/tcpTable.c	2012-02-09 20:02:49.136022132 +0100
-@@ -566,8 +566,9 @@
- static int
- tcpTable_load_netlink(void)
- {
-+	int err;
- 	/*  TODO: perhaps use permanent nl handle? */
--	struct nl_handle *nl = nl_handle_alloc();
-+	struct nl_sock *nl = nl_socket_alloc();
- 
- 	if (nl == NULL) {
- 		DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n"));
-@@ -575,10 +576,10 @@
- 		return -1;
- 	}
- 
--	if (nl_connect(nl, NETLINK_INET_DIAG) < 0) {
--		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror()));
--		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror());
--		nl_handle_destroy(nl);
-+	if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) {
-+		DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err)));
-+		snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err));
-+		nl_socket_free(nl);
- 		return -1;
- 	}
- 
-@@ -590,10 +591,10 @@
- 	struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST);
- 	nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0);
- 
--	if (nl_send_auto_complete(nl, nm) < 0) {
--		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror()));
--		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror());
--		nl_handle_destroy(nl);
-+	if ((err = nl_send_auto_complete(nl, nm)) < 0) {
-+		DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err)));
-+		snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err));
-+		nl_socket_free(nl);
- 		return -1;
- 	}
- 	nlmsg_free(nm);
-@@ -604,9 +605,9 @@
- 
- 	while (running) {
- 		if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) {
--			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror()));
--			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror());
--			nl_handle_destroy(nl);
-+			DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len)));
-+			snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len));
-+			nl_socket_free(nl);
- 			return -1;
- 		}
- 
-@@ -655,7 +656,7 @@
- 		free(buf);
- 	}
- 
--	nl_handle_destroy(nl);
-+	nl_socket_free(nl);
- 
- 	if (tcp_head) {
- 		DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n"));
-diff -u -r net-snmp-5.7.1/configure.d/config_os_libs2 net-snmp-5.7.1-libnl32/configure.d/config_os_libs2
---- net-snmp-5.7.1/configure.d/config_os_libs2	2011-09-28 06:53:47.000000000 +0200
-+++ net-snmp-5.7.1-libnl32/configure.d/config_os_libs2	2012-02-09 20:10:44.282165275 +0100
-@@ -224,8 +224,9 @@
- if test "x$with_nl" != "xno"; then
-     case $target_os in
-     linux*) # Check for libnl (linux)
-+	CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I libnl-3.0)"
- 	NETSNMP_SEARCH_LIBS(
--	    nl_connect, nl,
-+	    nl_connect, nl-3,
- 	    [AC_CHECK_HEADERS(netlink/netlink.h)],,, LMIBLIBS)
-     ;;
-     esac
diff --git a/testing/net-snmp/snmpd.confd b/testing/net-snmp/snmpd.confd
deleted file mode 100644
index 926b09bbf..000000000
--- a/testing/net-snmp/snmpd.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Parameters to be passed to snmpd
-#
-SNMPD_ARGS=""
-
diff --git a/testing/net-snmp/snmpd.rc b/testing/net-snmp/snmpd.rc
deleted file mode 100644
index b00c09f4f..000000000
--- a/testing/net-snmp/snmpd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/snmpd
-
-PID=`pidof -o %PPID /usr/sbin/snmpd`
-case "$1" in
-  start)
-    stat_busy "Starting Net-SNMP"
-    [ -z "$PID" ] && /usr/sbin/snmpd $SNMPD_ARGS
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/snmpd.pid
-      add_daemon snmpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Net-SNMP"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/snmpd.pid
-      rm_daemon snmpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 2
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/net-snmp/snmpd.service b/testing/net-snmp/snmpd.service
deleted file mode 100644
index 111a8d6a9..000000000
--- a/testing/net-snmp/snmpd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Simple Network Management Protocol (SNMP) Daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/snmpd
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/net-tools/Makefile.patch b/testing/net-tools/Makefile.patch
deleted file mode 100644
index aaacd6b78..000000000
--- a/testing/net-tools/Makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.old	2012-08-07 22:07:58.235437087 +0200
-+++ Makefile	2012-08-07 22:10:21.192104345 +0200
-@@ -239,12 +239,12 @@
- 	install -m 0755 -d ${BASEDIR}/bin
- 	install -m 0755 arp        ${BASEDIR}/sbin
- 	install -m 0755 hostname   ${BASEDIR}/bin
--	install -m 0755 ifconfig   ${BASEDIR}/bin
-+	install -m 0755 ifconfig   ${BASEDIR}/sbin
- 	install -m 0755 nameif     ${BASEDIR}/sbin
- 	install -m 0755 netstat    ${BASEDIR}/bin
- 	install -m 0755 plipconfig $(BASEDIR)/sbin
- 	install -m 0755 rarp       ${BASEDIR}/sbin
--	install -m 0755 route      ${BASEDIR}/bin
-+	install -m 0755 route      ${BASEDIR}/sbin
- 	install -m 0755 slattach   $(BASEDIR)/sbin
- ifeq ($(HAVE_IP_TOOLS),1)
- 	install -m 0755 ipmaddr    $(BASEDIR)/sbin
diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD
deleted file mode 100644
index fec4a9806..000000000
--- a/testing/net-tools/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 164985 2012-08-07 20:09:18Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=net-tools
-pkgver=1.60.20120804git
-pkgrel=2
-pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
-license=('GPL2')
-url="http://net-tools.sourceforge.net/"
-depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use git checkout instead
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	Makefile.patch)
-options=(!makeflags)
-install=net-tools.install
-sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
-          '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/Makefile.patch
-  yes "" | make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make BASEDIR=${pkgdir} update
-
-  # the following is provided by yp-tools
-  rm "${pkgdir}"/bin/{nis,yp}domainname
-  rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
-
-  # hostname is provided by inetutils
-  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
-  rm -rf "${pkgdir}"/usr/share/man/man1
-}
diff --git a/testing/net-tools/net-tools.install b/testing/net-tools/net-tools.install
deleted file mode 100644
index 9eee9e51b..000000000
--- a/testing/net-tools/net-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then
-    echo "hostname and {,yp,nis}domainname has moved:"
-    echo "----------"
-    echo "hostname is now in coreutils"
-    echo "domainname is now in yp-tools"
-    echo "their functionality might have changed slightly"
-    echo ""
-    echo "dnsdomainname remains in net-tools"
-    echo "----------"
-  fi
-}
diff --git a/testing/network-manager-applet/PKGBUILD b/testing/network-manager-applet/PKGBUILD
deleted file mode 100644
index ff89e15c3..000000000
--- a/testing/network-manager-applet/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165064 2012-08-09 22:48:27Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@archlinux.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-
-pkgname=network-manager-applet
-pkgver=0.9.6.2
-pkgrel=1
-pkgdesc="GNOME frontends to NetWorkmanager"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify'
-         'gnome-icon-theme' 'mobile-broadband-provider-info' 'iso-codes')
-makedepends=('intltool' 'gnome-bluetooth')
-optdepends=('gnome-bluetooth: for PAN/DUN support')
-options=('!libtool' '!emptydirs')
-install=network-manager-applet.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('96c79ce199fe7770b66f2ddc5ee0a4b07a0ea1eaf5e2186b78d8dd69e38a3069')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var \
-      --libexecdir=/usr/lib/networkmanager \
-      --disable-static \
-      --disable-maintainer-mode \
-      --disable-migration
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/network-manager-applet/network-manager-applet.install b/testing/network-manager-applet/network-manager-applet.install
deleted file mode 100644
index 255ea1f9a..000000000
--- a/testing/network-manager-applet/network-manager-applet.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
-  if (( $(vercmp $2 0.9.6.0) < 0 )); then
-    gconfpkg --uninstall network-manager-applet
-  fi
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-} 
diff --git a/testing/networkmanager-openconnect/PKGBUILD b/testing/networkmanager-openconnect/PKGBUILD
deleted file mode 100644
index 48d521bcf..000000000
--- a/testing/networkmanager-openconnect/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 165062 2012-08-09 22:47:07Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openconnect
-pkgver=0.9.6.2
-pkgrel=1
-pkgdesc="NetworkManager VPN integration for openconnect"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver::5}" 'openconnect' 'gconf' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-${pkgver}.tar.xz)
-sha256sums=('3f53d87dbeb00fc841ef5981e6f1a1a192c65d273386246d48245cca84fa41b0')
-
-build() {
-  cd NetworkManager-openconnect-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-openconnect-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-openconnect/networkmanager-openconnect.install b/testing/networkmanager-openconnect/networkmanager-openconnect.install
deleted file mode 100644
index 7bd4d44f9..000000000
--- a/testing/networkmanager-openconnect/networkmanager-openconnect.install
+++ /dev/null
@@ -1,16 +0,0 @@
-pkgname=networkmanager-openconnect
-
-post_install() {
-  getent group nm-openconnect >/dev/null 2>&1 || groupadd -g 104 nm-openconnect
-  getent passwd nm-openconnect > /dev/null 2>&1 || useradd -u 104 -s /sbin/nologin -d / -M -c 'NetworkManager user for OpenConnect' -g nm-openconnect nm-openconnect
-  passwd -l nm-openconnect > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  getent passwd nm-openconnect >/dev/null 2>&1 && userdel nm-openconnect
-  getent group nm-openconnect >/dev/null 2>&1 && groupdel nm-openconnect
-}
diff --git a/testing/networkmanager-openvpn/PKGBUILD b/testing/networkmanager-openvpn/PKGBUILD
deleted file mode 100644
index 16f27e614..000000000
--- a/testing/networkmanager-openvpn/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164976 2012-08-07 18:09:27Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-openvpn
-pkgver=0.9.6.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for OpenVPN"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'openvpn' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-install=networkmanager-openvpn.install
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-${pkgver}.tar.xz)
-sha256sums=('8fb88705793399574b3de2af93f87b63c0eae342d549a1c79bc59f6a1fad87a3')
-
-build() {
-  cd NetworkManager-openvpn-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-openvpn-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-openvpn/networkmanager-openvpn.install b/testing/networkmanager-openvpn/networkmanager-openvpn.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-openvpn/networkmanager-openvpn.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager-pptp/PKGBUILD b/testing/networkmanager-pptp/PKGBUILD
deleted file mode 100644
index b4f975a2c..000000000
--- a/testing/networkmanager-pptp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164977 2012-08-07 18:10:19Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-pptp
-pkgver=0.9.6.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for pptp "
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'pptpclient' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-pptp.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-${pkgver}.tar.xz)
-sha256sums=('a84cbbf24827229e3dd3611bbde191398275c3b7ecd03913047197644f27a2b4')
-
-build() {
-  cd NetworkManager-pptp-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-pptp-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-pptp/networkmanager-pptp.install b/testing/networkmanager-pptp/networkmanager-pptp.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-pptp/networkmanager-pptp.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager-vpnc/PKGBUILD b/testing/networkmanager-vpnc/PKGBUILD
deleted file mode 100644
index db34ef9c2..000000000
--- a/testing/networkmanager-vpnc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164978 2012-08-07 18:11:11Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=networkmanager-vpnc
-pkgver=0.9.6.0
-pkgrel=1
-pkgdesc="NetworkManager VPN plugin for vpnc"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/NetworkManager/"
-depends=("networkmanager>=${pkgver}" 'vpnc' 'hicolor-icon-theme' 'gtk3' 'libgnome-keyring')
-makedepends=('intltool')
-optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager')
-options=('!libtool')
-install=networkmanager-vpnc.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-${pkgver}.tar.xz)
-sha256sums=('6c8e35862330e17ee8f4dc44b1ac47470da703e436d339c7b3e2dac7d1b148a2')
-
-build() {
-  cd NetworkManager-vpnc-${pkgver}
-  ./configure --prefix=/usr \
-  	--sysconfdir=/etc \
-	--libexecdir=/usr/lib/networkmanager \
-	--disable-static
-  make
-}
-
-package() {
-  cd NetworkManager-vpnc-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/networkmanager-vpnc/networkmanager-vpnc.install b/testing/networkmanager-vpnc/networkmanager-vpnc.install
deleted file mode 100644
index 931c0517c..000000000
--- a/testing/networkmanager-vpnc/networkmanager-vpnc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/testing/networkmanager/NetworkManager.conf b/testing/networkmanager/NetworkManager.conf
deleted file mode 100644
index c37b59680..000000000
--- a/testing/networkmanager/NetworkManager.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-[main]
-plugins=keyfile
diff --git a/testing/networkmanager/PKGBUILD b/testing/networkmanager/PKGBUILD
deleted file mode 100644
index 9e763f63f..000000000
--- a/testing/networkmanager/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 169165 2012-10-18 19:23:13Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer: Jan de Groot <jgc@archlinxu.org>
-# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Will Rea <sillywilly@gmail.com>
-# Contributor: Valentine Sinitsyn <e_val@inbox.ru>
-
-pkgname=networkmanager
-_pkgname=NetworkManager
-pkgver=0.9.6.0
-pkgrel=5
-pkgdesc="Network Management daemon"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/$_pkgname/"
-depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient
-         libsoup systemd)
-makedepends=(intltool dhcpcd iptables gobject-introspection)
-optdepends=('modemmanager: for modem management service'
-            'dhcpcd: alternative DHCP client; does not support DHCPv6'
-            'iptables: Connection sharing'
-            'dnsmasq: Connection sharing'
-            'bluez: Bluetooth support'
-            'openresolv: resolvconf support')
-options=('!libtool')
-backup=('etc/NetworkManager/NetworkManager.conf')
-install=networkmanager.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch
-        nm-polkit-permissive.patch repair-signals.patch systemd-sleep.patch)
-sha256sums=('3982b623b7b199ac99e2ddd0840fe7d088245a49e3f680237e8baebf0cf86d07'
-            '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb'
-            'e23b651a90ef62d515921953b4c6779538d35a737fb74c266b7fce94d62fdb06'
-            'a1c65a09e5e8ecb1004ab7922517aa7fbc9700dc61e3b2fd348d3d7c23808ce6'
-            '24c181ab69e769e703e45f64a552add5df5de22fbcd8899d588add053674420a')
-
-build() {
-  cd $_pkgname-$pkgver
-
-  patch -Np1 -i ../disable_set_hostname.patch
-  patch -Np1 -i ../dnsmasq-path.patch
-  patch -Np1 -i ../nm-polkit-permissive.patch
-  patch -Np1 -i ../repair-signals.patch # FS#31115
-  patch -Np1 -i ../systemd-sleep.patch
-  AUTOPOINT="intltoolize -f -c --automake" autoreconf -fi
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/networkmanager \
-    --with-crypto=nss \
-    --with-distro=arch \
-    --with-dhclient=/usr/sbin/dhclient \
-    --with-dhcpcd=/usr/sbin/dhcpcd \
-    --with-iptables=/usr/sbin/iptables \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --with-udev-dir=/usr/lib/udev \
-    --with-resolvconf=/usr/sbin/resolvconf \
-    --with-session-tracking=systemd \
-    --disable-static \
-    --enable-more-warnings=no \
-    --disable-wimax
-
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/"
-
-  rm -r "$pkgdir/var/run"
-}
diff --git a/testing/networkmanager/disable_set_hostname.patch b/testing/networkmanager/disable_set_hostname.patch
deleted file mode 100644
index ee95dd0e1..000000000
--- a/testing/networkmanager/disable_set_hostname.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
- 		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */
diff --git a/testing/networkmanager/dnsmasq-path.patch b/testing/networkmanager/dnsmasq-path.patch
deleted file mode 100644
index c0e713266..000000000
--- a/testing/networkmanager/dnsmasq-path.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
---- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c	2011-10-10 23:38:20.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c	2012-03-06 09:07:24.137460927 +0100
-@@ -52,8 +52,11 @@
- find_dnsmasq (void)
- {
- 	static const char *paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
-diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
---- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c	2011-04-19 07:06:22.000000000 +0200
-+++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c	2012-03-06 09:07:58.603851818 +0100
-@@ -170,8 +170,11 @@
- nm_find_dnsmasq (void)
- {
- 	static const char *dnsmasq_binary_paths[] = {
-+		"/usr/local/bin/dnsmasq",
- 		"/usr/local/sbin/dnsmasq",
-+		"/usr/bin/dnsmasq",
- 		"/usr/sbin/dnsmasq",
-+		"/bin/dnsmasq",
- 		"/sbin/dnsmasq",
- 		NULL
- 	};
diff --git a/testing/networkmanager/networkmanager.install b/testing/networkmanager/networkmanager.install
deleted file mode 100644
index de40c17ed..000000000
--- a/testing/networkmanager/networkmanager.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  (( $(vercmp 0.8.3 $2) > 0 )) && cat <<MSG
-ATTENTION:
-  /etc/NetworkManager/nm-system-settings.conf has been replaced
-  by /etc/NetworkManager/NetworkManager.conf. Make sure you move
-  any custom settings to the new config file.
-MSG
-  true
-}
diff --git a/testing/networkmanager/nm-polkit-permissive.patch b/testing/networkmanager/nm-polkit-permissive.patch
deleted file mode 100644
index 1ac406224..000000000
--- a/testing/networkmanager/nm-polkit-permissive.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in
---- NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in.permissive	2011-03-24 14:21:35.100912222 -0500
-+++ NetworkManager-0.8.997/policy/org.freedesktop.NetworkManager.policy.in	2011-03-24 14:21:49.916726997 -0500
-@@ -95,7 +95,7 @@
-     <_message>System policy prevents modification of network settings for all users</_message>
-     <defaults>
-       <allow_inactive>no</allow_inactive>
--      <allow_active>auth_admin_keep</allow_active>
-+      <allow_active>yes</allow_active>
-     </defaults>
-   </action>
- 
diff --git a/testing/networkmanager/repair-signals.patch b/testing/networkmanager/repair-signals.patch
deleted file mode 100644
index cf1319dc5..000000000
--- a/testing/networkmanager/repair-signals.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 64342a313ef497fca8a4fb7567900d4a1460065f Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 13 Sep 2012 09:32:53 +0000
-Subject: core: wait until we daemonized before setting up signals (bgo #683932)
-
-If we mask signals before daemonizing, the daemon process will not be
-able to handle them, and thus would be unkillable with anything other
-than SIGKILL.
----
-diff --git a/src/main.c b/src/main.c
-index 8bc6d3f..5b82cfa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -401,10 +401,6 @@ main (int argc, char *argv[])
- 		exit (1);
- 	}
- 
--	/* Set up unix signal handling */
--	if (!setup_signals ())
--		exit (1);
--
- 	/* Set locale to be able to use environment variables */
- 	setlocale (LC_ALL, "");
- 
-@@ -501,6 +497,10 @@ main (int argc, char *argv[])
- 			wrote_pidfile = TRUE;
- 	}
- 
-+	/* Set up unix signal handling - before creating threads, but after daemonizing! */
-+	if (!setup_signals ())
-+		exit (1);
-+
- 	if (g_fatal_warnings) {
- 		GLogLevelFlags fatal_mask;
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/networkmanager/systemd-fallback.patch b/testing/networkmanager/systemd-fallback.patch
deleted file mode 100644
index f5acc9dc6..000000000
--- a/testing/networkmanager/systemd-fallback.patch
+++ /dev/null
@@ -1,470 +0,0 @@
-diff -u -Nr NetworkManager-0.9.3.995/configure.ac NetworkManager-0.9.3.995-systemd-fallback/configure.ac
---- NetworkManager-0.9.3.995/configure.ac	2012-03-02 01:05:21.000000000 +0100
-+++ NetworkManager-0.9.3.995-systemd-fallback/configure.ac	2012-03-06 16:55:58.294793902 +0100
-@@ -344,7 +344,7 @@
- case $with_session_tracking in
-     ck|none) ;;
-     systemd)
--        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
-+        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login])
-         ;;
-     *)
- 	AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd])
-diff -u -Nr NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c
---- NetworkManager-0.9.3.995/src/nm-session-monitor-systemd.c	2012-02-27 16:57:16.000000000 +0100
-+++ NetworkManager-0.9.3.995-systemd-fallback/src/nm-session-monitor-systemd.c	2012-03-06 16:55:01.285264295 +0100
-@@ -28,6 +28,10 @@
- #include <glib/gstdio.h>
- #include <systemd/sd-login.h>
- #include <stdlib.h>
-+#include <systemd/sd-daemon.h>
-+#include <sys/stat.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
- 
- #include "nm-session-utils.h"
- #include "nm-session-monitor.h"
-@@ -107,10 +111,20 @@
- 	return source;
- }
- 
-+/********************************************************************/
-+
-+#define CKDB_PATH "/var/run/ConsoleKit/database"
-+
- struct _NMSessionMonitor {
- 	GObject parent_instance;
- 
- 	GSource *sd_source;
-+
-+	GKeyFile *database;
-+	GFileMonitor *database_monitor;
-+	time_t database_mtime;
-+	GHashTable *sessions_by_uid;
-+	GHashTable *sessions_by_user;
- };
- 
- struct _NMSessionMonitorClass {
-@@ -130,6 +144,215 @@
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+typedef struct {
-+	char *user;
-+	uid_t uid;
-+	gboolean local;
-+	gboolean active;
-+} Session;
-+
-+static void
-+session_free (Session *s)
-+{
-+	g_free (s->user);
-+	memset (s, 0, sizeof (Session));
-+	g_free (s);
-+}
-+
-+static gboolean
-+check_key (GKeyFile *keyfile, const char *group, const char *key, GError **error)
-+{
-+	if (g_key_file_has_key (keyfile, group, key, error))
-+		return TRUE;
-+
-+	if (!error) {
-+		g_set_error (error,
-+			         NM_SESSION_MONITOR_ERROR,
-+			         NM_SESSION_MONITOR_ERROR_MALFORMED_DATABASE,
-+			         "ConsoleKit database " CKDB_PATH " group '%s' had no '%s' key",
-+			         group, key);
-+	}
-+	return FALSE;
-+}
-+
-+static Session *
-+session_new (GKeyFile *keyfile, const char *group, GError **error)
-+{
-+	GError *local = NULL;
-+	Session *s;
-+	const char *uname = NULL;
-+
-+	s = g_new0 (Session, 1);
-+	g_assert (s);
-+
-+	s->uid = G_MAXUINT; /* paranoia */
-+	if (!check_key (keyfile, group, "uid", &local))
-+		goto error;
-+	s->uid = (uid_t) g_key_file_get_integer (keyfile, group, "uid", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!check_key (keyfile, group, "is_active", &local))
-+		goto error;
-+	s->active = g_key_file_get_boolean (keyfile, group, "is_active", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!check_key (keyfile, group, "is_local", &local))
-+		goto error;
-+	s->local = g_key_file_get_boolean (keyfile, group, "is_local", &local);
-+	if (local)
-+		goto error;
-+
-+	if (!nm_session_uid_to_user (s->uid, &uname, error))
-+		return FALSE;
-+	s->user = g_strdup (uname);
-+
-+	return s;
-+
-+error:
-+	session_free (s);
-+	g_propagate_error (error, local);
-+	return NULL;
-+}
-+
-+static void
-+session_merge (Session *src, Session *dest)
-+{
-+	g_return_if_fail (src != NULL);
-+	g_return_if_fail (dest != NULL);
-+
-+	g_warn_if_fail (g_strcmp0 (src->user, dest->user) == 0);
-+	g_warn_if_fail (src->uid == dest->uid);
-+
-+	dest->local = (dest->local || src->local);
-+	dest->active = (dest->active || src->active);
-+}
-+
-+/********************************************************************/
-+
-+static void
-+free_database (NMSessionMonitor *self)
-+{
-+	if (self->database != NULL) {
-+		g_key_file_free (self->database);
-+		self->database = NULL;
-+	}
-+
-+	g_hash_table_remove_all (self->sessions_by_uid);
-+	g_hash_table_remove_all (self->sessions_by_user);
-+}
-+
-+static gboolean
-+reload_database (NMSessionMonitor *self, GError **error)
-+{
-+	struct stat statbuf;
-+	char **groups = NULL;
-+	gsize len = 0, i;
-+	Session *s;
-+
-+	free_database (self);
-+
-+	errno = 0;
-+	if (stat (CKDB_PATH, &statbuf) != 0) {
-+		g_set_error (error,
-+		             NM_SESSION_MONITOR_ERROR,
-+		             errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+		             "Error statting file " CKDB_PATH ": %s",
-+		             strerror (errno));
-+		goto error;
-+	}
-+	self->database_mtime = statbuf.st_mtime;
-+
-+	self->database = g_key_file_new ();
-+	if (!g_key_file_load_from_file (self->database, CKDB_PATH, G_KEY_FILE_NONE, error))
-+		goto error;
-+
-+	groups = g_key_file_get_groups (self->database, &len);
-+	if (!groups) {
-+		g_set_error_literal (error,
-+		                     NM_SESSION_MONITOR_ERROR,
-+		                     NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+		                     "Could not load groups from " CKDB_PATH "");
-+		goto error;
-+	}
-+
-+	for (i = 0; i < len; i++) {
-+		Session *found;
-+
-+		if (!g_str_has_prefix (groups[i], "Session "))
-+			continue;
-+
-+		s = session_new (self->database, groups[i], error);
-+		if (!s)
-+			goto error;
-+
-+		found = g_hash_table_lookup (self->sessions_by_user, (gpointer) s->user);
-+		if (found) {
-+			session_merge (s, found);
-+			session_free (s);
-+		} else {
-+			/* Entirely new user */
-+			g_hash_table_insert (self->sessions_by_user, (gpointer) s->user, s);
-+			g_hash_table_insert (self->sessions_by_uid, GUINT_TO_POINTER (s->uid), s);
-+		}
-+	}
-+
-+	g_strfreev (groups);
-+	return TRUE;
-+
-+error:
-+	if (groups)
-+		g_strfreev (groups);
-+	free_database (self);
-+	return FALSE;
-+}
-+
-+static gboolean
-+ensure_database (NMSessionMonitor *self, GError **error)
-+{
-+	gboolean ret = FALSE;
-+
-+	if (self->database != NULL) {
-+		struct stat statbuf;
-+
-+		errno = 0;
-+		if (stat (CKDB_PATH, &statbuf) != 0) {
-+			g_set_error (error,
-+			             NM_SESSION_MONITOR_ERROR,
-+			             errno == ENOENT ? NM_SESSION_MONITOR_ERROR_NO_DATABASE : NM_SESSION_MONITOR_ERROR_IO_ERROR,
-+			             "Error statting file " CKDB_PATH " to check timestamp: %s",
-+			             strerror (errno));
-+			goto out;
-+		}
-+
-+		if (statbuf.st_mtime == self->database_mtime) {
-+			ret = TRUE;
-+			goto out;
-+		}
-+	}
-+
-+	ret = reload_database (self, error);
-+
-+out:
-+	return ret;
-+}
-+
-+static void
-+on_file_monitor_changed (GFileMonitor *    file_monitor,
-+                         GFile *           file,
-+                         GFile *           other_file,
-+                         GFileMonitorEvent event_type,
-+                         gpointer          user_data)
-+{
-+	NMSessionMonitor *self = NM_SESSION_MONITOR (user_data);
-+
-+	/* throw away cache */
-+	free_database (self);
-+
-+	g_signal_emit (self, signals[CHANGED_SIGNAL], 0);
-+}
-+
- static gboolean
- sessions_changed (gpointer user_data)
- {
-@@ -143,9 +366,50 @@
- static void
- nm_session_monitor_init (NMSessionMonitor *monitor)
- {
--	monitor->sd_source = sd_source_new ();
--	g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--	g_source_attach (monitor->sd_source, NULL);
-+	if (sd_booted () > 0) {
-+		monitor->sd_source = sd_source_new ();
-+		g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+		g_source_attach (monitor->sd_source, NULL);
-+
-+		monitor->database_monitor = NULL;
-+		monitor->database = NULL;
-+	} else {
-+		monitor->sd_source = NULL;
-+
-+		GError *error = NULL;
-+		GFile *file;
-+
-+		/* Sessions-by-user is responsible for destroying the Session objects */
-+		monitor->sessions_by_user = g_hash_table_new_full (g_str_hash, g_str_equal,
-+								NULL, (GDestroyNotify) session_free);
-+		monitor->sessions_by_uid = g_hash_table_new (g_direct_hash, g_direct_equal);
-+
-+
-+		error = NULL;
-+		if (!ensure_database (monitor, &error)) {
-+			/* Ignore the first error if the CK database isn't found yet */
-+			if (g_error_matches (error,
-+					     NM_SESSION_MONITOR_ERROR,
-+					     NM_SESSION_MONITOR_ERROR_NO_DATABASE) == FALSE) {
-+				nm_log_err (LOGD_CORE, "Error loading " CKDB_PATH ": %s", error->message);
-+			}
-+			g_error_free (error);
-+		}
-+
-+		error = NULL;
-+		file = g_file_new_for_path (CKDB_PATH);
-+		monitor->database_monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, &error);
-+		g_object_unref (file);
-+		if (monitor->database_monitor == NULL) {
-+			nm_log_err (LOGD_CORE, "Error monitoring " CKDB_PATH ": %s", error->message);
-+			g_error_free (error);
-+		} else {
-+			g_signal_connect (monitor->database_monitor,
-+					  "changed",
-+					  G_CALLBACK (on_file_monitor_changed),
-+					  monitor);
-+		}
-+	}
- }
- 
- static void
-@@ -158,6 +422,12 @@
- 		g_source_unref (monitor->sd_source);
- 	}
- 
-+	if (monitor->database_monitor != NULL)
-+		g_object_unref (monitor->database_monitor);
-+
-+	if (monitor->database != NULL)
-+		free_database (monitor);
-+
- 	if (G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize != NULL)
- 		G_OBJECT_CLASS (nm_session_monitor_parent_class)->finalize (object);
- }
-@@ -206,15 +476,36 @@
-                                      uid_t *out_uid,
-                                      GError **error)
- {
--	uid_t uid;
-+	if (monitor->sd_source != NULL) {
-+		uid_t uid;
- 
--	if (!nm_session_user_to_uid (username, &uid, error))
--		return FALSE;
-+		if (!nm_session_user_to_uid (username, &uid, error))
-+			return FALSE;
- 
--	if (out_uid)
--		*out_uid = uid;
-+		if (out_uid)
-+			*out_uid = uid;
- 
--	return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
-+		return nm_session_monitor_uid_has_session (monitor, uid, NULL, error);
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for user '%s'",
-+				     username);
-+			return FALSE;
-+		}
-+
-+		if (out_uid)
-+			*out_uid = s->uid;
-+		return TRUE;
-+	}
- }
- 
- gboolean
-@@ -222,12 +513,31 @@
-                                 const char *username,
-                                 GError **error)
- {
--	uid_t uid;
-+	if (monitor->sd_source != NULL) {
-+		uid_t uid;
- 
--	if (!nm_session_user_to_uid (username, &uid, error))
--		return FALSE;
-+		if (!nm_session_user_to_uid (username, &uid, error))
-+			return FALSE;
-+
-+		return nm_session_monitor_uid_active (monitor, uid, error);
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_user, (gpointer) username);
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for user '%s'",
-+				     username);
-+			return FALSE;
-+		}
- 
--	return nm_session_monitor_uid_active (monitor, uid, error);
-+		return s->active;
-+	}
- }
- 
- gboolean
-@@ -236,10 +546,31 @@
-                                     const char **out_user,
-                                     GError **error)
- {
--	if (!nm_session_uid_to_user (uid, out_user, error))
--		return FALSE;
-+	if (monitor->sd_source != NULL) {
-+		if (!nm_session_uid_to_user (uid, out_user, error))
-+			return FALSE;
- 
--	return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+		return sd_uid_get_sessions (uid, FALSE, NULL) > 0;
-+	} else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for uid %d",
-+				     uid);
-+			return FALSE;
-+		}
-+
-+		if (out_user)
-+			*out_user = s->user;
-+		return TRUE;
-+	}
- }
- 
- gboolean
-@@ -247,5 +578,24 @@
-                                uid_t uid,
-                                GError **error)
- {
--	return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+	if (monitor->sd_source != NULL)
-+		return sd_uid_get_sessions (uid, TRUE, NULL) > 0;
-+	else {
-+		Session *s;
-+
-+		if (!ensure_database (monitor, error))
-+			return FALSE;
-+
-+		s = g_hash_table_lookup (monitor->sessions_by_uid, GUINT_TO_POINTER (uid));
-+		if (!s) {
-+			g_set_error (error,
-+				     NM_SESSION_MONITOR_ERROR,
-+				     NM_SESSION_MONITOR_ERROR_UNKNOWN_USER,
-+				     "No session found for uid '%d'",
-+				     uid);
-+			return FALSE;
-+		}
-+
-+		return s->active;
-+	}
- }
diff --git a/testing/networkmanager/systemd-sleep.patch b/testing/networkmanager/systemd-sleep.patch
deleted file mode 100644
index 3470d4654..000000000
--- a/testing/networkmanager/systemd-sleep.patch
+++ /dev/null
@@ -1,616 +0,0 @@
-From b444d31cba5b8ac0c9771cc5a246dfd3af9dfd00 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Tue, 9 Oct 2012 00:36:35 -0400
-Subject: [PATCH] core: factor out the upower suspend/resume code (bgo
- #677694)
-
-Factor the code that listens for upower sleeping and resuming
-signals out into a class code NMSleepMonitor.
-
-core: add a systemd suspend/resume monitor (bgo #677694)
-
-This implementation uses a delay inhibitor to get systemd to
-emit PrepareForSleep, and then emits ::Sleeping and ::Resuming
-when receiving the before/after PrepareForSleep emissions.
-
-core: DBusGConnections are not GObjects
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2.
-
-core: fix suspend/resume signal names which the manager listens for
-
-Introduced in 64fd8eea7706038e5d38c8463a1c765ed9331db2; but honestly
-I also thought GObject lower-cased signal names since it munges them
-for - and _ too.  Apparently not.
----
- configure.ac                   |   2 +-
- src/Makefile.am                |   9 +-
- src/nm-manager.c               |  40 +++-----
- src/nm-sleep-monitor-systemd.c | 217 +++++++++++++++++++++++++++++++++++++++++
- src/nm-sleep-monitor-upower.c  | 151 ++++++++++++++++++++++++++++
- src/nm-sleep-monitor.h         |  46 +++++++++
- 6 files changed, 437 insertions(+), 28 deletions(-)
- create mode 100644 src/nm-sleep-monitor-systemd.c
- create mode 100644 src/nm-sleep-monitor-upower.c
- create mode 100644 src/nm-sleep-monitor.h
-
-diff --git a/configure.ac b/configure.ac
-index e76e193..9152c23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -327,7 +327,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
- AC_SUBST(GUDEV_CFLAGS)
- AC_SUBST(GUDEV_LIBS)
- 
--PKG_CHECK_MODULES(GIO, gio-2.0)
-+PKG_CHECK_MODULES(GIO, gio-unix-2.0)
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b155209..ba7d2d6 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -191,6 +191,7 @@ NetworkManager_SOURCES = \
- 		nm-session-monitor.h \
- 		nm-session-utils.c \
- 		nm-session-utils.h \
-+		nm-sleep-monitor.h \
- 		nm-connection-provider.h \
- 		nm-connection-provider.c \
- 		nm-dispatcher.c \
-@@ -201,13 +202,18 @@ NetworkManager_SOURCES += nm-connectivity.c nm-connectivity.h
- endif
- 
- if SESSION_TRACKING_SYSTEMD
--NetworkManager_SOURCES += nm-session-monitor-systemd.c
-+NetworkManager_SOURCES += \
-+		nm-session-monitor-systemd.c \
-+		nm-sleep-monitor-systemd.c
- else
- if SESSION_TRACKING_CK
- NetworkManager_SOURCES += nm-session-monitor-ck.c
- else
- NetworkManager_SOURCES += nm-session-monitor-null.c
- endif
-+
-+# UPower suspend/resume used whenever systemd is not enabled
-+NetworkManager_SOURCES += nm-sleep-monitor-upower.c
- endif
- 
- nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
-@@ -283,6 +289,7 @@ BUILT_SOURCES = \
- NetworkManager_CPPFLAGS = \
- 	$(DBUS_CFLAGS) \
- 	$(GLIB_CFLAGS) \
-+	$(GIO_CFLAGS) \
- 	$(GUDEV_CFLAGS) \
- 	$(LIBNL_CFLAGS) \
- 	$(GMODULE_CFLAGS) \
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 618c4ed..c8ce115 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -69,6 +69,7 @@
- #include "nm-device-factory.h"
- #include "wifi-utils.h"
- #include "nm-enum-types.h"
-+#include "nm-sleep-monitor.h"
- 
- #if WITH_CONCHECK
- #include "nm-connectivity.h"
-@@ -78,8 +79,6 @@
- #define NM_AUTOIP_DBUS_SERVICE "org.freedesktop.nm_avahi_autoipd"
- #define NM_AUTOIP_DBUS_IFACE   "org.freedesktop.nm_avahi_autoipd"
- 
--#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
--
- static gboolean impl_manager_get_devices (NMManager *manager,
-                                           GPtrArray **devices,
-                                           GError **err);
-@@ -228,7 +227,7 @@ typedef struct {
- 	guint modem_removed_id;
- 
- 	DBusGProxy *aipd_proxy;
--	DBusGProxy *upower_proxy;
-+	NMSleepMonitor *sleep_monitor;
- 
- 	GSList *auth_chains;
- 
-@@ -3288,16 +3287,16 @@ impl_manager_sleep (NMManager *self,
- }
- 
- static void
--upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+sleeping_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received sleeping signal");
- 	_internal_sleep (NM_MANAGER (user_data), TRUE);
- }
- 
- static void
--upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+resuming_cb (DBusGProxy *proxy, gpointer user_data)
- {
--	nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+	nm_log_dbg (LOGD_SUSPEND, "Received resuming signal");
- 	_internal_sleep (NM_MANAGER (user_data), FALSE);
- }
- 
-@@ -4049,8 +4048,8 @@ dispose (GObject *object)
- 	if (priv->aipd_proxy)
- 		g_object_unref (priv->aipd_proxy);
- 
--	if (priv->upower_proxy)
--		g_object_unref (priv->upower_proxy);
-+	if (priv->sleep_monitor)
-+		g_object_unref (priv->sleep_monitor);
- 
- 	if (priv->fw_monitor) {
- 		if (priv->fw_monitor_id)
-@@ -4372,23 +4371,12 @@ nm_manager_init (NMManager *manager)
- 	} else
- 		nm_log_warn (LOGD_AUTOIP4, "could not initialize avahi-autoipd D-Bus proxy");
- 
--	/* upower sleep/wake handling */
--	priv->upower_proxy = dbus_g_proxy_new_for_name (g_connection,
--	                                                UPOWER_DBUS_SERVICE,
--	                                                "/org/freedesktop/UPower",
--	                                                "org.freedesktop.UPower");
--	if (priv->upower_proxy) {
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Sleeping", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Sleeping",
--		                             G_CALLBACK (upower_sleeping_cb),
--		                             manager, NULL);
--
--		dbus_g_proxy_add_signal (priv->upower_proxy, "Resuming", G_TYPE_INVALID);
--		dbus_g_proxy_connect_signal (priv->upower_proxy, "Resuming",
--		                             G_CALLBACK (upower_resuming_cb),
--		                             manager, NULL);
--	} else
--		nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+	/* sleep/wake handling */
-+	priv->sleep_monitor = nm_sleep_monitor_get ();
-+	g_signal_connect (priv->sleep_monitor, "sleeping",
-+	                  G_CALLBACK (sleeping_cb), manager);
-+	g_signal_connect (priv->sleep_monitor, "resuming",
-+	                  G_CALLBACK (resuming_cb), manager);
- 
- 	/* Listen for authorization changes */
- 	nm_auth_changed_func_register (authority_changed_cb, manager);
-diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
-new file mode 100644
-index 0000000..70adc89
---- /dev/null
-+++ b/src/nm-sleep-monitor-systemd.c
-@@ -0,0 +1,217 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include <gio/gunixfdlist.h>
-+
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define SD_NAME              "org.freedesktop.login1"
-+#define SD_PATH              "/org/freedesktop/login1"
-+#define SD_INTERFACE         "org.freedesktop.login1.Manager"
-+
-+
-+struct _NMSleepMonitor {
-+	GObject parent_instance;
-+
-+	GDBusProxy *sd_proxy;
-+	gint inhibit_fd;
-+};
-+
-+struct _NMSleepMonitorClass {
-+	GObjectClass parent_class;
-+
-+	void (*sleeping) (NMSleepMonitor *monitor);
-+	void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+	SLEEPING,
-+	RESUMING,
-+	LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+inhibit_done (GObject      *source,
-+              GAsyncResult *result,
-+              gpointer      user_data)
-+{
-+	GDBusProxy *sd_proxy = G_DBUS_PROXY (source);
-+	NMSleepMonitor *self = user_data;
-+	GError *error = NULL;
-+	GVariant *res;
-+	GUnixFDList *fd_list;
-+
-+	res = g_dbus_proxy_call_with_unix_fd_list_finish (sd_proxy, &fd_list, result, &error);
-+	if (!res) {
-+		nm_log_warn (LOGD_SUSPEND, "Inhibit failed: %s", error->message);
-+		g_error_free (error);
-+	} else {
-+		if (!fd_list || g_unix_fd_list_get_length (fd_list) != 1)
-+			nm_log_warn (LOGD_SUSPEND, "Didn't get a single fd back");
-+
-+		self->inhibit_fd = g_unix_fd_list_get (fd_list, 0, NULL);
-+
-+		nm_log_dbg (LOGD_SUSPEND, "Inhibitor fd is %d", self->inhibit_fd);
-+		g_object_unref (fd_list);
-+		g_variant_unref (res);
-+	}
-+}
-+
-+static void
-+take_inhibitor (NMSleepMonitor *self)
-+{
-+	g_assert (self->inhibit_fd == -1);
-+
-+	nm_log_dbg (LOGD_SUSPEND, "Taking systemd sleep inhibitor");
-+	g_dbus_proxy_call_with_unix_fd_list (self->sd_proxy,
-+	                                     "Inhibit",
-+	                                     g_variant_new ("(ssss)",
-+	                                                    "sleep",
-+	                                                    g_get_user_name (),
-+	                                                    "inhibited",
-+	                                                    "delay"),
-+	                                     0,
-+	                                     G_MAXINT,
-+	                                     NULL,
-+	                                     NULL,
-+	                                     inhibit_done,
-+	                                     self);
-+}
-+
-+static gboolean
-+drop_inhibitor (NMSleepMonitor *self)
-+{
-+	if (self->inhibit_fd >= 0) {
-+		nm_log_dbg (LOGD_SUSPEND, "Dropping systemd sleep inhibitor");
-+		close (self->inhibit_fd);
-+		self->inhibit_fd = -1;
-+		return TRUE;
-+	}
-+	return FALSE;
-+}
-+
-+static void
-+signal_cb (GDBusProxy  *proxy,
-+           const gchar *sendername,
-+           const gchar *signalname,
-+           GVariant    *args,
-+           gpointer     data)
-+{
-+	NMSleepMonitor *self = data;
-+	gboolean is_about_to_suspend;
-+
-+	if (strcmp (signalname, "PrepareForSleep") != 0)
-+		return;
-+
-+	g_variant_get (args, "(b)", &is_about_to_suspend);
-+	nm_log_dbg (LOGD_SUSPEND, "Received PrepareForSleep signal: %d", is_about_to_suspend);
-+
-+	if (is_about_to_suspend) {
-+		g_signal_emit (self, signals[SLEEPING], 0);
-+		drop_inhibitor (self);
-+	} else {
-+		take_inhibitor (self);
-+		g_signal_emit (self, signals[RESUMING], 0);
-+	}
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+	GDBusConnection *bus;
-+
-+	self->inhibit_fd = -1;
-+	bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+	self->sd_proxy = g_dbus_proxy_new_sync (bus, 0, NULL,
-+	                                        SD_NAME, SD_PATH, SD_INTERFACE,
-+	                                        NULL, NULL);
-+	g_object_unref (bus);
-+	g_signal_connect (self->sd_proxy, "g-signal", G_CALLBACK (signal_cb), self);
-+	take_inhibitor (self);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+	NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+	drop_inhibitor (self);
-+	if (self->sd_proxy)
-+		g_object_unref (self->sd_proxy);
-+
-+	if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+		G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+	GObjectClass *gobject_class;
-+
-+	gobject_class = G_OBJECT_CLASS (klass);
-+
-+	gobject_class->finalize = finalize;
-+
-+	signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+	signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+	                                  NM_TYPE_SLEEP_MONITOR,
-+	                                  G_SIGNAL_RUN_LAST,
-+	                                  G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+	                                  NULL,                   /* accumulator      */
-+	                                  NULL,                   /* accumulator data */
-+	                                  g_cclosure_marshal_VOID__VOID,
-+	                                  G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+	static NMSleepMonitor *singleton = NULL;
-+
-+	if (singleton)
-+		return g_object_ref (singleton);
-+
-+	singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+	return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-new file mode 100644
-index 0000000..3c93f66
---- /dev/null
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -0,0 +1,151 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#include "config.h"
-+#include <errno.h>
-+#include <string.h>
-+#include <sys/stat.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <dbus/dbus-glib.h>
-+#include <gio/gio.h>
-+#include "nm-logging.h"
-+#include "nm-dbus-manager.h"
-+
-+#include "nm-sleep-monitor.h"
-+
-+#define UPOWER_DBUS_SERVICE "org.freedesktop.UPower"
-+
-+struct _NMSleepMonitor {
-+        GObject parent_instance;
-+
-+        DBusGProxy *upower_proxy;
-+};
-+
-+struct _NMSleepMonitorClass {
-+        GObjectClass parent_class;
-+
-+        void (*sleeping) (NMSleepMonitor *monitor);
-+        void (*resuming) (NMSleepMonitor *monitor);
-+};
-+
-+
-+enum {
-+        SLEEPING,
-+        RESUMING,
-+        LAST_SIGNAL,
-+};
-+static guint signals[LAST_SIGNAL] = {0};
-+
-+G_DEFINE_TYPE (NMSleepMonitor, nm_sleep_monitor, G_TYPE_OBJECT);
-+
-+/********************************************************************/
-+
-+static void
-+upower_sleeping_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower sleeping signal");
-+        g_signal_emit (user_data, signals[SLEEPING], 0);
-+}
-+
-+static void
-+upower_resuming_cb (DBusGProxy *proxy, gpointer user_data)
-+{
-+        nm_log_dbg (LOGD_SUSPEND, "Received UPower resuming signal");
-+        g_signal_emit (user_data, signals[RESUMING], 0);
-+}
-+
-+static void
-+nm_sleep_monitor_init (NMSleepMonitor *self)
-+{
-+        NMDBusManager *dbus_mgr;
-+        DBusGConnection *bus;
-+
-+        dbus_mgr = nm_dbus_manager_get ();
-+        bus = nm_dbus_manager_get_connection (dbus_mgr);
-+        self->upower_proxy = dbus_g_proxy_new_for_name (bus,
-+                                                        UPOWER_DBUS_SERVICE,
-+                                                        "/org/freedesktop/UPower",
-+                                                        "org.freedesktop.UPower");
-+        if (self->upower_proxy) {
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Sleeping", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Sleeping",
-+                                             G_CALLBACK (upower_sleeping_cb),
-+                                             self, NULL);
-+
-+                dbus_g_proxy_add_signal (self->upower_proxy, "Resuming", G_TYPE_INVALID);
-+                dbus_g_proxy_connect_signal (self->upower_proxy, "Resuming",
-+                                             G_CALLBACK (upower_resuming_cb),
-+                                             self, NULL);
-+        } else
-+                nm_log_warn (LOGD_SUSPEND, "could not initialize UPower D-Bus proxy");
-+        g_object_unref (dbus_mgr);
-+}
-+
-+static void
-+finalize (GObject *object)
-+{
-+        NMSleepMonitor *self = NM_SLEEP_MONITOR (object);
-+
-+        if (self->upower_proxy)
-+                g_object_unref (self->upower_proxy);
-+
-+        if (G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize != NULL)
-+                G_OBJECT_CLASS (nm_sleep_monitor_parent_class)->finalize (object);
-+}
-+
-+static void
-+nm_sleep_monitor_class_init (NMSleepMonitorClass *klass)
-+{
-+        GObjectClass *gobject_class;
-+
-+        gobject_class = G_OBJECT_CLASS (klass);
-+
-+        gobject_class->finalize = finalize;
-+
-+        signals[SLEEPING] = g_signal_new (NM_SLEEP_MONITOR_SLEEPING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, sleeping),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+        signals[RESUMING] = g_signal_new (NM_SLEEP_MONITOR_RESUMING,
-+                                          NM_TYPE_SLEEP_MONITOR,
-+                                          G_SIGNAL_RUN_LAST,
-+                                          G_STRUCT_OFFSET (NMSleepMonitorClass, resuming),
-+                                          NULL,                   /* accumulator      */
-+                                          NULL,                   /* accumulator data */
-+                                          g_cclosure_marshal_VOID__VOID,
-+                                          G_TYPE_NONE, 0);
-+}
-+
-+NMSleepMonitor *
-+nm_sleep_monitor_get (void)
-+{
-+        static NMSleepMonitor *singleton = NULL;
-+
-+        if (singleton)
-+                return g_object_ref (singleton);
-+
-+        singleton = NM_SLEEP_MONITOR (g_object_new (NM_TYPE_SLEEP_MONITOR, NULL));
-+        return singleton;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-diff --git a/src/nm-sleep-monitor.h b/src/nm-sleep-monitor.h
-new file mode 100644
-index 0000000..173e6a1
---- /dev/null
-+++ b/src/nm-sleep-monitor.h
-@@ -0,0 +1,46 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-+/* This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * (C) Copyright 2012 Red Hat, Inc.
-+ * Author: Matthias Clasen <mclasen@redhat.com>
-+ */
-+
-+#ifndef NM_SLEEP_MONITOR_H
-+#define NM_SLEEP_MONITOR_H
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+#define NM_TYPE_SLEEP_MONITOR         (nm_sleep_monitor_get_type ())
-+#define NM_SLEEP_MONITOR(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitor))
-+#define NM_SLEEP_MONITOR_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST ((k), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_SLEEP_MONITOR_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), NM_TYPE_SLEEP_MONITOR, NMSleepMonitorClass))
-+#define NM_IS_SLEEP_MONITOR(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), NM_TYPE_SLEEP_MONITOR))
-+#define NM_IS_SLEEP_MONITOR_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), NM_TYPE_SLEEP_MONITOR))
-+
-+#define NM_SLEEP_MONITOR_SLEEPING "sleeping"
-+#define NM_SLEEP_MONITOR_RESUMING "resuming"
-+
-+typedef struct _NMSleepMonitor         NMSleepMonitor;
-+typedef struct _NMSleepMonitorClass    NMSleepMonitorClass;
-+
-+GType           nm_sleep_monitor_get_type     (void) G_GNUC_CONST;
-+NMSleepMonitor *nm_sleep_monitor_get          (void);
-+
-+G_END_DECLS
-+
-+#endif /* NM_SLEEP_MONITOR_H */
-+
--- 
-1.7.12.2
-
diff --git a/testing/nfs-utils/PKGBUILD b/testing/nfs-utils/PKGBUILD
deleted file mode 100644
index 2392879c2..000000000
--- a/testing/nfs-utils/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# $Id: PKGBUILD 168633 2012-10-13 16:48:28Z thomas $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
-# Contributor: abelstr <abel@pinklf.eu>
-# Contributor: Marco Lima <cipparello gmail com>
-
-pkgname=nfs-utils
-pkgver=1.2.6
-pkgrel=2
-pkgdesc="Support programs for Network File Systems"
-arch=('i686' 'x86_64')
-url='http://nfs.sourceforge.net'
-license=('GPL')
-backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
-depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
-makedepends=('pkgconfig' 'autoconf' 'automake')
-source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
-	nfs-common
-	nfs-common.conf
-	nfs-server
-	nfs-server.conf
-	exports
-	idmapd.conf
-	start-statd.patch
-        nfs
-	nfs-utils-1.1.4-mtab-sym.patch
-	nfs-utils-1.1.4-no-exec.patch
-	rpc-gssd.service
-	rpc-mountd.service
-	rpc-svcgssd.service
-	rpc-idmapd.service
-	rpc-statd.service
-	nfsd.service
-	var-lib-nfs-rpc_pipefs.mount
-	proc-fs-nfsd.mount
-	blkmapd.service
-	nfs-utils.conf)
-install=nfs-utils.install
-md5sums=('8be543ca270c2234ff18f8c8d35e0d37'
-         'dd0d65fc6e8f422fa12520813098264b'
-         'f73f197a16b02c3e248488ec35c4cf43'
-         'e619f18354ff958ed624d05d08853d8f'
-         '9cef69bc686cc5dcac23fbb51450747d'
-         'ff585faf410a62c4333a027c50b56bae'
-         'eb4f4027fab6fc1201f1ca04f5954c76'
-         'e9144277a89a620d9bc80413158a7d27'
-         'f5e7bba09a46c5c5d7007cac6eff9df5'
-         '7674106eaaa4c149bccd4f05fe3604e9'
-         '4f4827dfc93008dfadd0a530ad0872b2'
-         '3694619813cebc5b4502b58f1992b442'
-         '965311784d49a7d126d512cadbe91deb'
-         'e05705d9ccccaeaeb1ecaee20adc05bc'
-         '359d84a85f8781dc3f45f4cf1dbe4b53'
-         'c82ef7b238efe62af3d5e263e1ba1c5c'
-         '5d33d2e754fd37280365b287603bac90'
-         '1cd65909fa0983047f3f06a3ab352401'
-         '02a34835aa077146a90eb7d191e612d0'
-         '8ffc2ebe932d29efe17d6f3f23d5b975'
-         '8ac484023d786766d287ccbe878ae4ba')
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-  patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch
-  #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch
-  # arch specific patch
-  patch -Np0 -i $srcdir/start-statd.patch
-
-  ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \
-              --without-tcp-wrappers --with-statedir=/var/lib/nfs \
-              --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
-              --enable-mountconfig
-
-  make 
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-  # fix make install
-  mkdir -p $pkgdir/sbin
-  make DESTDIR=$pkgdir install
-
-  # support python2 (FS#25120)
-  sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats}
-
-  # NFS & NFSv4 init scripts
-  install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common
-  install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server
-  # Configuration
-  install -D -m 644 ../exports "$pkgdir/"etc/exports
-  install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf
-  install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf
-  install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf
-  install -D -m 644 ../nfs "$pkgdir/"etc/conf.d/nfs
-  install -D -m 644 utils/mount/nfsmount.conf "$pkgdir/"etc/nfsmount.conf
-  # systemd files
-  for i in ${srcdir}/*.{service,mount}; do
-    install -D -m 644 $i "$pkgdir/usr/lib/systemd/system/${i##*/}"
-  done
-  install -D -m 644 ../nfs-utils.conf "$pkgdir/"usr/lib/modules-load.d/nfs-utils.conf
-  # directories
-  mkdir "$pkgdir/"etc/exports.d
-  mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs
-  mkdir "$pkgdir/"var/lib/nfs/v4recovery
-}
diff --git a/testing/nfs-utils/blkmapd.service b/testing/nfs-utils/blkmapd.service
deleted file mode 100644
index 16cb68bbb..000000000
--- a/testing/nfs-utils/blkmapd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=pNFS block layout mapping daemon
-After=var-lib-nfs-rpc_pipefs.mount nfsd.service
-Requires=var-lib-nfs-rpc_pipefs.mount
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/blkmapd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/exports b/testing/nfs-utils/exports
deleted file mode 100644
index 8f4aac598..000000000
--- a/testing/nfs-utils/exports
+++ /dev/null
@@ -1,15 +0,0 @@
-# /etc/exports
-#
-# List of directories exported to NFS clients.  See exports(5).
-# Use exportfs -arv to reread.
-#
-# Example for NFSv2 and NFSv3:
-#  /srv/home       hostname1(rw,sync) hostname2(ro,sync)
-#
-# Example for NFSv4:
-#  /srv/nfs4	   hostname1(rw,sync,fsid=0)
-#  /srv/nfs4/home   hostname1(rw,sync,nohide)
-# Using Kerberos and integrity checking:
-#  /srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt)
-#  /srv/nfs4/home   gss/krb5i(rw,sync,nohide)
-#
diff --git a/testing/nfs-utils/idmapd.conf b/testing/nfs-utils/idmapd.conf
deleted file mode 100644
index b1b23afe9..000000000
--- a/testing/nfs-utils/idmapd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-[General]
-
-Verbosity = 0
-Pipefs-Directory = /var/lib/nfs/rpc_pipefs
-Domain = localdomain
-
-[Mapping]
-
-Nobody-User = nobody
-Nobody-Group = nobody
-
-[Translation]
-
-Method = nsswitch
diff --git a/testing/nfs-utils/nfs b/testing/nfs-utils/nfs
deleted file mode 100644
index 2d33cf3d4..000000000
--- a/testing/nfs-utils/nfs
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Optinal options passed to rquotad
-RPCRQUOTADOPTS=""
-#
-# Optional arguments passed to in-kernel lockd
-#LOCKDARG=
-# TCP port rpc.lockd should listen on.
-#LOCKD_TCPPORT=32803
-# UDP port rpc.lockd should listen on.
-#LOCKD_UDPPORT=32769
-#
-# Optional arguments passed to rpc.nfsd. See rpc.nfsd(8)
-RPCNFSDARGS=""
-# Number of nfs server processes to be started.
-# The default is 8. 
-RPCNFSDCOUNT=8
-# Set V4 grace period in seconds
-#NFSD_V4_GRACE=90
-#
-# Optional arguments passed to rpc.mountd. See rpc.mountd(8)
-RPCMOUNTDOPTS=""
-#
-# Optional arguments passed to rpc.statd. See rpc.statd(8)
-STATDARG=""
-#
-# Optional arguments passed to rpc.idmapd. See rpc.idmapd(8)
-RPCIDMAPDARGS=""
-#
-# Optional arguments passed to rpc.gssd. See rpc.gssd(8)
-RPCGSSDARGS=""
-#
-# Optional arguments passed to rpc.svcgssd. See rpc.svcgssd(8)
-RPCSVCGSSDARGS=""
-#
-# To enable RDMA support on the server by setting this to
-# the port the server should listen on
-#RDMA_PORT=20049 
-#
-# Optional arguments passed to blkmapd. See blkmapd(8)
-BLKMAPDARGS=""
diff --git a/testing/nfs-utils/nfs-common b/testing/nfs-utils/nfs-common
deleted file mode 100644
index 7b16b4b3c..000000000
--- a/testing/nfs-utils/nfs-common
+++ /dev/null
@@ -1,315 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-common
-
-NEED_STATD=
-STATD_OPTS=
-NEED_IDMAPD=
-IDMAPD_OPTS=
-NEED_GSSD=
-GSSD_OPTS=
-PIPEFS_MOUNTPOINT=
-PIPEFS_MOUNTOPTS=
-
-# rpc.statd daemon & binary location
-STATD_DAEMON_NAME=rpc.statd
-STATD="/usr/sbin/rpc.statd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.gssd daemon & binary location
-GSSD_DAEMON_NAME=rpc.gssd
-GSSD="/usr/sbin/rpc.gssd"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default mountpoint and options for rpc_pipefs filesystem
-[ -z "$PIPEFS_MOUNTPOINT" ] && PIPEFS_MOUNTPOINT="/var/lib/nfs/rpc_pipefs"
-[ -z "$PIPEFS_MOUNTOPTS" ] && PIPEFS_MOUNTOPTS="defaults"
-
-# Parse the fstab file, and determine whether we need idmapd and gssd. (The
-# /etc/conf.d/nfs-common settings, if any, will override our autodetection.) 
-AUTO_NEED_IDMAPD=no
-AUTO_NEED_GSSD=no
-
-if [ -f /etc/fstab ]; then
-  exec 9<&0 </etc/fstab
-  
-  while read DEV MTPT FSTYPE OPTS REST; do
-    if [ "$FSTYPE" = "nfs4" ]; then
-      AUTO_NEED_IDMAPD=yes
-    fi
-    case "$OPTS" in
-      sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
-	AUTO_NEED_GSSD=yes
-      ;;
-    esac
-  done
-
-  exec 0<&9 9<&-
-fi
-
-# We also need idmapd if we run an NFSv4 server. It's fairly difficult
-# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
-# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
-# file. This does not mean that there are NFSv4 or other mounts active (or
-# even that nfs-kernel-server is installed), but it matches what the "start"
-# condition in nfs-kernel-server's init script does, which has a value in
-# itself.
-if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
-  AUTO_NEED_IDMAPD=yes
-fi
-
-case "$NEED_STATD" in
-  yes|no)
-    ;;
-  *)
-    NEED_STATD=yes
-    ;;
-esac
-
-case "$NEED_IDMAPD" in
-  yes|no)	
-    ;;
-  *)
-    NEED_IDMAPD=$AUTO_NEED_IDMAPD
-    ;;
-esac
-
-case "$NEED_GSSD" in
-  yes|no)	
-    ;;
-  *)
-    NEED_GSSD=$AUTO_NEED_GSSD
-    ;;
-esac
-
-do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]; then
-      modprobe -q "$1" || true
-    fi
-}
-
-do_mount() {
-    if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
-      return 1
-    fi
-    
-    if grep -vw "$1" /proc/mounts &> /dev/null ; then
-      if ! mountpoint -q "$2" ; then
-	mount -t "$1" "$1" "$2" -o "$3"
-	return
-      fi
-    fi
-    return 0
-}
-
-do_umount() {
-    if mountpoint -q "$1" ; then
-      umount "$1"
-    fi
-    return 0
-}
-
-get_pid() {
-	pidof -o %PPID "$1"
-}
-
-case "$1" in
-  start)
-    ck_daemon rpcbind && { echo -n "Start rpcbind first." >&2; stat_die; }
-    rc=0
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Starting $STATD_DAEMON_NAME daemon"
-      PID=$(get_pid $STATD)
-      if [ -z "$PID" ]; then
-	[ -f /var/run/$STATD_DAEMON_NAME.pid ] && rm -f /var/run/$STATD_DAEMON_NAME.pid
-	# RUN
-	$STATD $STATD_OPTS
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  echo $(get_pid $STATD) > /var/run/$STATD_DAEMON_NAME.pid
-	  stat_done
-	fi
-      else
-	stat_fail
-	exit 1
-      fi
-      # Run sm-notify
-      /usr/sbin/sm-notify $SMNOTIFY_OPTS
-    fi
-
-    if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
-      stat_busy "Mounting pipefs filesystem"
-      do_modprobe sunrpc
-      do_modprobe nfs
-      do_modprobe nfsd
-      do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" 
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-        stat_done
-      fi
-
-      if [ "$NEED_IDMAPD" = yes ]; then
-	stat_busy "Starting $IDMAPD_DAEMON_NAME daemon"
-	PID=$(get_pid $IDMAPD)
-	if [ -z "$PID" ]; then
-	  [ -f /var/run/$IDMAPD_DAEMON_NAME.pid ] && rm -f /var/run/$IDMAPD_DAEMON_NAME.pid
-	  # RUN
-	  $IDMAPD $IDMAPD_OPTS
-	  #
-	  rc=$(($rc+$?))
-	  if [ $rc -gt 0 ]; then
-	    stat_fail
-	    exit $rc
-	  else
-	    echo $(get_pid $IDMAPD) > /var/run/$IDMAPD_DAEMON_NAME.pid
-	    stat_done
-	  fi
-	else
-	  stat_fail
-	  exit 1
-        fi
-      fi
-
-      if [ "$NEED_GSSD" = yes ]; then
-	do_modprobe rpcsec_gss_krb5
-	stat_busy "Starting $GSSD_DAEMON_NAME daemon"
-	PID=$(get_pid $GSSD)
-	if [ -z "$PID" ]; then
-	  [ -f /var/run/$GSSD_DAEMON_NAME.pid ] && rm -f /var/run/$GSSD_DAEMON_NAME.pid
-	  # RUN
-	  $GSSD $GSSD_OPTS
-	  #
-	  rc=$(($rc+$?))
-	  if [ $rc -gt 0 ]; then
-	    stat_fail
-	    exit $rc
-	  else
-	    echo $(get_pid $GSSD) > /var/run/$GSSD_DAEMON_NAME.pid
-	    stat_done
-	  fi
-	else
-	  stat_fail
-	  exit 1
-        fi
-      fi
-    fi
-
-    add_daemon $daemon_name
-    ;;
-
-  stop)
-    rc=0
-    if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
-
-      if [ "$NEED_GSSD" = yes ]; then
-	stat_busy "Stopping $GSSD_DAEMON_NAME daemon"
-	PID=$(get_pid $GSSD)
-	# KILL
-	[ ! -z "$PID" ] && kill $PID &> /dev/null
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  rm -f /var/run/$GSSD_DAEMON_NAME.pid &> /dev/null
-	  stat_done
-	fi
-      fi
-
-      if [ "$NEED_IDMAPD" = yes ]; then
-	stat_busy "Stopping $IDMAPD_DAEMON_NAME daemon"
-	PID=$(get_pid $IDMAPD)
-	# KILL
-	[ ! -z "$PID" ] && kill $PID &> /dev/null
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  rm -f /var/run/$IDMAPD_DAEMON_NAME.pid &> /dev/null
-	  stat_done
-	fi
-      fi
-      do_umount "$PIPEFS_MOUNTPOINT" 2>/dev/null || true
-    fi
-
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Stopping $STATD_DAEMON_NAME daemon"
-      PID=$(get_pid $STATD)
-      # KILL
-      [ ! -z "$PID" ] && kill $PID &> /dev/null
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	rm -f /var/run/$STATD_DAEMON_NAME.pid &> /dev/null
-	stat_done
-      fi
-    fi
-
-    rm_daemon $daemon_name
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-
-    if [ "$NEED_STATD" = yes ]; then
-      stat_busy "Daemon $STATD_DAEMON_NAME running"
-      PID=$(get_pid $STATD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-
-    if [ "$NEED_GSSD" = yes ]; then
-      stat_busy "Daemon $GSSD_DAEMON_NAME running"
-      PID=$(get_pid $GSSD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-      
-    if [ "$NEED_IDMAPD" = yes ]; then
-      stat_busy "Daemon $IDMAPD_DAEMON_NAME running"
-      PID=$(get_pid $IDMAPD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-    echo
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|status|restart}"  
-esac
-exit 0
-	    
diff --git a/testing/nfs-utils/nfs-common.conf b/testing/nfs-utils/nfs-common.conf
deleted file mode 100644
index 12466b3e5..000000000
--- a/testing/nfs-utils/nfs-common.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Parameters to be passed to nfs-common (nfs clients & server) init script.
-#
-
-# If you do not set values for the NEED_ options, they will be attempted
-# autodetected; this should be sufficient for most people. Valid alternatives
-# for the NEED_ options are "yes" and "no".
-
-# Do you want to start the statd daemon? It is not needed for NFSv4.
-NEED_STATD=""
-
-# Options to pass to rpc.statd.
-# See rpc.statd(8) for more details.
-# N.B. statd normally runs on both client and server, and run-time
-# options should be specified accordingly.
-# STATD_OPTS="-p 32765 -o 32766"
-STATD_OPTS=""
-
-# Options to pass to sm-notify
-# e.g. SMNOTIFY_OPTS="-p 32764"
-SMNOTIFY_OPTS=""
-
-# Do you want to start the idmapd daemon? It is only needed for NFSv4.
-NEED_IDMAPD=""
-
-# Options to pass to rpc.idmapd.
-# See rpc.idmapd(8) for more details.
-IDMAPD_OPTS=""
-
-# Do you want to start the gssd daemon? It is required for Kerberos mounts.
-NEED_GSSD=""
-
-# Options to pass to rpc.gssd.
-# See rpc.gssd(8) for more details.
-GSSD_OPTS=""
-
-# Where to mount rpc_pipefs filesystem; the default is "/var/lib/nfs/rpc_pipefs".
-PIPEFS_MOUNTPOINT=""
-
-# Options used to mount rpc_pipefs filesystem; the default is "defaults".
-PIPEFS_MOUNTOPTS=""
diff --git a/testing/nfs-utils/nfs-server b/testing/nfs-utils/nfs-server
deleted file mode 100644
index 6aa609d8c..000000000
--- a/testing/nfs-utils/nfs-server
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/bin/bash
-
-daemon_name=nfs-server
-
-NFSD_COUNT=
-NFSD_OPTS=
-NEED_SVCGSSD=
-SVCGSSD_OPTS=
-MOUNTD_OPTS=
-PROCNFSD_MOUNTPOINT=
-PROCNFSD_MOUNTOPTS=
-
-# rpc.nfsd daemon & binary location
-NFSD_PROCESS_NAME=nfsd
-NFSD_DAEMON_NAME=rpc.nfsd
-NFSD="/usr/sbin/rpc.nfsd"
-
-# rpc.svcgssd daemon & binary location
-SVCGSSD_DAEMON_NAME=rpc.svcgssd
-SVCGSSD="/usr/sbin/rpc.svcgssd"
-
-# rpc.idmapd daemon & binary location
-IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
-
-# rpc.mountd daemon & binary location
-MOUNTD_DAEMON_NAME=rpc.mountd
-MOUNTD="/usr/sbin/rpc.mountd"
-
-# exortfs binary location
-EXPORTFS="/usr/sbin/exportfs"
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/$daemon_name.conf
-
-# Default number of nfsd servers
-[ -z "$NFSD_COUNT" ] && NFSD_COUNT=8
-
-# Default mountpoint and options for nfsd filesystem
-[ -z "$PROCNFSD_MOUNTPOINT" ] && PROCNFSD_MOUNTPOINT="/proc/fs/nfsd"
-[ -z "$PROCNFSD_MOUNTOPTS" ] && PROCNFSD_MOUNTOPTS="rw,nodev,noexec,nosuid"
-
-case "$NEED_SVCGSSD" in
-  yes|no)
-    ;;
-  *)
-    NEED_SVCGSSD=no
-    ;;
-esac
-
-do_modprobe() {
-    if [ -x /sbin/modprobe -a -f /proc/modules ]; then
-      modprobe -q "$1" || true
-    fi
-}
-
-do_mount() {
-    if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then
-      return 1
-    fi
-    
-    if grep -vw "$1" /proc/mounts &> /dev/null ; then
-      if ! mountpoint -q "$2" ; then
-	mount -t "$1" "$1" "$2" -o "$3"
-	return
-      fi
-    fi
-    return 0
-}
-
-do_umount() {
-    if mountpoint -q "$1" ; then
-      umount "$1"
-    fi
-    return 0
-}
-
-get_pid() {
-	pidof -o %PPID "$1"
-}
-
-case "$1" in
-  start)
-    ck_daemon nfs-common && { echo -n "Start nfs-common first." >&2; stat_die; }
-    rc=0
-    stat_busy "Mounting nfsd filesystem"
-    do_modprobe nfsd
-    do_mount nfsd "$PROCNFSD_MOUNTPOINT" "$PROCNFSD_MOUNTOPTS"
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    stat_busy "Exporting all directories"
-    $EXPORTFS -r
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    stat_busy "Starting $NFSD_DAEMON_NAME daemon"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$NFSD_DAEMON_NAME.pid ] && rm -f /var/run/$NFSD_DAEMON_NAME.pid
-      # RUN
-      $NFSD $NFSD_OPTS $NFSD_COUNT
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	echo $(get_pid $NFSD_PROCESS_NAME) > /var/run/$NFSD_DAEMON_NAME.pid
-	stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      do_modprobe rpcsec_gss_krb5
-      stat_busy "Starting $SVCGSSD_DAEMON_NAME daemon"
-      PID=$(get_pid $SVCGSSD)
-      if [ -z "$PID" ]; then
-	[ -f /var/run/$SVCGSSD_DAEMON_NAME.pid ] && rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid
-	# RUN
-	$SVCGSSD $SVCGSSD_OPTS
-	#
-	rc=$(($rc+$?))
-	if [ $rc -gt 0 ]; then
-	  stat_fail
-	  exit $rc
-	else
-	  echo $(get_pid $SVCGSSD) > /var/run/$SVCGSSD_DAEMON_NAME.pid
-	  stat_done
-	fi
-      else
-	stat_fail
-	exit 1
-      fi
-    fi
-
-    PID=$(get_pid $IDMAPD)
-    [ ! -z "$PID" ] && kill -SIGHUP $IDMAPD_DAEMON_NAME &> /dev/null
-
-    stat_busy "Starting $MOUNTD_DAEMON_NAME daemon"
-    PID=$(get_pid $MOUNTD)
-    if [ -z "$PID" ]; then
-      [ -f /var/run/$MOUNTD_DAEMON_NAME.pid ] && rm -f /var/run/$MOUNTD_DAEMON_NAME.pid
-      # RUN
-      $MOUNTD $MOUNTD_OPTS
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	echo $(get_pid $MOUNTD) > /var/run/$MOUNTD_DAEMON_NAME.pid
-	stat_done
-      fi
-    else
-      stat_fail
-      exit 1
-    fi
-
-    add_daemon $daemon_name
-    ;;
-
-  stop)
-    rc=0
-    stat_busy "Stopping $MOUNTD_DAEMON_NAME daemon"
-    PID=$(get_pid $MOUNTD)
-    # KILL
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    #
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      rm -f /var/run/$MOUNTD_DAEMON_NAME.pid &> /dev/null
-      stat_done
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      stat_busy "Stopping $SVCGSSD_DAEMON_NAME daemon"
-      PID=$(get_pid $SVCGSSD)
-      # KILL
-      [ ! -z "$PID" ] && kill $PID &> /dev/null
-      #
-      rc=$(($rc+$?))
-      if [ $rc -gt 0 ]; then
-	stat_fail
-	exit $rc
-      else
-	rm -f /var/run/$SVCGSSD_DAEMON_NAME.pid &> /dev/null
-	stat_done
-      fi
-    fi
-
-    stat_busy "Stopping $NFSD_DAEMON_NAME daemon"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    # KILL (SIGINT)
-    [ ! -z "$PID" ] && kill -2 $PID &> /dev/null
-    #
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      sleep 1
-      PID=$(get_pid $NFSD_PROCESS_NAME)
-      # KILL (KILL) - just to be sure
-      [ ! -z "$PID" ] && kill -9 $PID &> /dev/null
-      #
-      rm -f /var/run/$NFSD_DAEMON_NAME.pid &> /dev/null
-      stat_done
-    fi
-
-    stat_busy "Unexporting all directories"
-    $EXPORTFS -au
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-
-    # flush everything out of the kernels export table
-    if mountpoint -q "$PROCNFSD_MOUNTPOINT" ; then
-      $EXPORTFS -f
-    fi
-    do_umount "$PROCNFSD_MOUNTPOINT" 2>/dev/null || true
-    rm_daemon $daemon_name
-    ;;
-
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-
-    stat_busy "Daemon $NFSD_DAEMON_NAME running"
-    PID=$(get_pid $NFSD_PROCESS_NAME)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-
-    stat_busy "Daemon $MOUNTD_DAEMON_NAME running"
-    PID=$(get_pid $MOUNTD)
-    if [ -z "$PID" ]; then
-      stat_fail
-    else
-      stat_done
-    fi
-
-    if [ "$NEED_SVCGSSD" = yes ]; then
-      stat_busy "Daemon $SVCGSSD_DAEMON_NAME running"
-      PID=$(get_pid $SVCGSSD)
-      if [ -z "$PID" ]; then
-	stat_fail
-      else
-	stat_done
-      fi
-    fi
-    echo
-    ;;
-
-  reload)
-    rc=0
-    stat_busy "Re-exporting all directories"
-    $EXPORTFS -r
-    rc=$(($rc+$?))
-    if [ $rc -gt 0 ]; then
-      stat_fail
-      exit $rc
-    else
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|status|reload|restart}"  
-esac
-exit 0
diff --git a/testing/nfs-utils/nfs-server.conf b/testing/nfs-utils/nfs-server.conf
deleted file mode 100644
index 581e26350..000000000
--- a/testing/nfs-utils/nfs-server.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# Parameters to be passed to nfs-server init script.
-#
-
-# Options to pass to rpc.nfsd.
-# See rpc.nfsd(8) for more details.
-NFSD_OPTS=""
-
-# Number of servers to start up; the default is 8 servers.
-NFSD_COUNT=""
-
-# Where to mount nfsd filesystem; the default is "/proc/fs/nfsd".
-PROCNFSD_MOUNTPOINT=""
-
-# Options used to mount nfsd filesystem; the default is "rw,nodev,noexec,nosuid".
-PROCNFSD_MOUNTOPTS=""
-
-# Options for rpc.mountd.
-# If you have a port-based firewall, you might want to set up
-# a fixed port here using the --port option.
-# See rpc.mountd(8) for more details.
-MOUNTD_OPTS=""
-
-# Do you want to start the svcgssd daemon? It is only required for Kerberos
-# exports. Valid alternatives are "yes" and "no"; the default is "no".
-NEED_SVCGSSD=""
-
-# Options to pass to rpc.svcgssd.
-# See rpc.svcgssd(8) for more details.
-SVCGSSD_OPTS=""
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
deleted file mode 100644
index c9e60afc7..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.4/utils/mount/fstab.c
-+++ nfs-utils-1.1.4/utils/mount/fstab.c
-@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
- 	return var_mtab_does_not_exist;
- }
- 
--static int
-+int
- mtab_is_a_symlink(void) {
-         get_mtab_info();
-         return var_mtab_is_a_symlink;
---- nfs-utils-1.1.4/utils/mount/fstab.h
-+++ nfs-utils-1.1.4/utils/mount/fstab.h
-@@ -7,6 +7,7 @@
- #define _PATH_FSTAB "/etc/fstab"
- #endif
- 
-+int mtab_is_a_symlink(void);
- int mtab_is_writable(void);
- int mtab_does_not_exist(void);
- void reset_mtab_info(void);
---- nfs-utils-1.1.4/utils/mount/mount.c
-+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
- 	int flags;
- 	mntFILE *mfp;
- 
-+	/* Avoid writing if the mtab is a symlink to /proc/mounts, since
-+	   that would create a file /proc/mounts in case the proc filesystem
-+	   is not mounted, and the fchmod below would also fail. */
-+	if (mtab_is_a_symlink()) {
-+		return EX_SUCCESS;
-+	}
-+
- 	lock_mtab();
- 
- 	mfp = nfs_setmntent (MOUNTED, "a+");
diff --git a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch b/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
deleted file mode 100644
index ea50a21d8..000000000
--- a/testing/nfs-utils/nfs-utils-1.1.4-no-exec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-ripped from Debian
-
---- nfs-utils-1.1.2/utils/mount/mount.c
-+++ nfs-utils-1.1.2/utils/mount/mount.c
-@@ -381,10 +381,6 @@
- 		mount_error(NULL, mount_point, ENOTDIR);
- 		return 1;
- 	}
--	if (access(mount_point, X_OK) < 0) {
--		mount_error(NULL, mount_point, errno);
--		return 1;
--	}
- 
- 	return 0;
- }
diff --git a/testing/nfs-utils/nfs-utils.conf b/testing/nfs-utils/nfs-utils.conf
deleted file mode 100644
index 33c97b838..000000000
--- a/testing/nfs-utils/nfs-utils.conf
+++ /dev/null
@@ -1 +0,0 @@
-nfs
diff --git a/testing/nfs-utils/nfs-utils.install b/testing/nfs-utils/nfs-utils.install
deleted file mode 100644
index 7dcdf9575..000000000
--- a/testing/nfs-utils/nfs-utils.install
+++ /dev/null
@@ -1,32 +0,0 @@
-## arg 1:  the new package version
-post_install() {
-cat << 'EOM'
-  ==> PLEASE NOTE:
-  ==> Extended configuration options for NFS (clients & server) are available in
-  ==> /etc/conf.d/nfs-common.conf and in /etc/conf.d/nfs-server.conf
-  ==>
-  ==> Please refer to http://wiki.archlinux.org/index.php/Nfs
-  ==> for further information on NFS; for NFSv4, refer to
-  ==> http://wiki.archlinux.org/index.php/NFSv4   
-EOM
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 1.2.0-2)" -lt 0 ]; then
-cat << 'EOM'
-  ==> IMPORTANT NFS UTILS CHANGES:
-  ==> This is a rather important upgrade, you are going to have to change config files.
-  ==> /etc/rc.conf daemons changes:
-  ==> Change portmap to rpcbind
-  ==> Change nfslock to nfs-common
-  ==> Change nfsd to nfs-server
-  ==>
-  ==> Extended configuration options for NFS (clients & server) are available in:
-  ==> /etc/conf.d/nfs-common
-  ==> /etc/conf.d/nfs-server
-  ==> Please change them to your needs.
-EOM
-  fi
-}
diff --git a/testing/nfs-utils/nfsd.service b/testing/nfs-utils/nfsd.service
deleted file mode 100644
index e5481c3d1..000000000
--- a/testing/nfs-utils/nfsd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=NFS server
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.nfsd $NFSD_OPTS $NFSD_COUNT
-ExecStartPost=/usr/sbin/exportfs -a
-ExecStop=/usr/sbin/rpc.nfsd 0
-ExecStopPost=/usr/sbin/exportfs -a -u
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/proc-fs-nfsd.mount b/testing/nfs-utils/proc-fs-nfsd.mount
deleted file mode 100644
index f8664a8be..000000000
--- a/testing/nfs-utils/proc-fs-nfsd.mount
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=RPC Pipe File System 
-DefaultDependencies=no
-
-[Mount]
-What=sunrpc
-Where=/proc/fs/nfsd
-Type=rpc_pipefs
diff --git a/testing/nfs-utils/rpc-gssd.service b/testing/nfs-utils/rpc-gssd.service
deleted file mode 100644
index da4c71307..000000000
--- a/testing/nfs-utils/rpc-gssd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC GSS-API client-side daemon
-After=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Requires=rpcbind.service var-lib-nfs-rpc_pipefs.mount
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.gssd $GSSD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-idmapd.service b/testing/nfs-utils/rpc-idmapd.service
deleted file mode 100644
index 7785c1bd5..000000000
--- a/testing/nfs-utils/rpc-idmapd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFSv4 ID-name mapping daemon
-After=var-lib-nfs-rpc_pipefs.mount nfsd.service
-Requires=var-lib-nfs-rpc_pipefs.mount
-Before=remote-fs-pre.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.idmapd $IDMAPD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-mountd.service b/testing/nfs-utils/rpc-mountd.service
deleted file mode 100644
index edd8c851d..000000000
--- a/testing/nfs-utils/rpc-mountd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NFS Mount Daemon
-After=rpcbind.service nfsd.service
-Requires=rpcbind.service nfsd.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.mountd $MOUNTD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-statd.service b/testing/nfs-utils/rpc-statd.service
deleted file mode 100644
index 97d397faf..000000000
--- a/testing/nfs-utils/rpc-statd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=NFSv2/3 Network Status Monitor Daemon
-After=rpcbind.service
-Requires=rpcbind.service
-Before=remote-fs-pre.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-common.conf
-ExecStart=/usr/sbin/rpc.statd $STATD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/rpc-svcgssd.service b/testing/nfs-utils/rpc-svcgssd.service
deleted file mode 100644
index 8152e8338..000000000
--- a/testing/nfs-utils/rpc-svcgssd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=RPC GSS-API server-side daemon
-After=rpcbind.service
-Requires=rpcbind.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/nfs-server.conf
-ExecStart=/usr/sbin/rpc.svcgssd $SVCGSSD_OPTS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/nfs-utils/start-statd.patch b/testing/nfs-utils/start-statd.patch
deleted file mode 100644
index 5d73b6e35..000000000
--- a/testing/nfs-utils/start-statd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- utils/statd/start-statd	2007-05-11 04:40:57.000000000 +0100
-+++ utils/statd/start-statd.new	2007-09-21 17:11:34.000000000 +0100
-@@ -1,9 +1,16 @@
--#!/bin/bash -p
-+#!/bin/sh
-+
-+# Original script provided by the NFS project
-+# Modified for Arch Linux by Tom Killian
-+
- # nfsmount calls this script when mounting a filesystem with locking
- # enabled, but when statd does not seem to be running (based on
- # /var/run/rpc.statd.pid).
- # It should run statd with whatever flags are apropriate for this
- # site.
--PATH=/sbin:/usr/sbin
--exec rpc.statd --no-notify
-+
-+# source application-specific settings
-+[ -f /etc/conf.d/nfs-common.conf ] && . /etc/conf.d/nfs-common.conf
-+
-+exec /usr/sbin/rpc.statd $STATD_OPTS
- 
diff --git a/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount b/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount
deleted file mode 100644
index 4bd440f24..000000000
--- a/testing/nfs-utils/var-lib-nfs-rpc_pipefs.mount
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=RPC pipe filesystem
-
-[Mount]
-What=rpc_pipefs
-Where=/var/lib/nfs/rpc_pipefs
-Type=rpc_pipefs
diff --git a/testing/nfsidmap/PKGBUILD b/testing/nfsidmap/PKGBUILD
deleted file mode 100644
index 17f3e5580..000000000
--- a/testing/nfsidmap/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 166728 2012-09-17 05:20:12Z tpowa $
-# Maintainer: 
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=nfsidmap
-pkgver=0.25
-pkgrel=1
-pkgdesc="Library to help mapping IDs, mainly for NFSv4"
-arch=('i686' 'x86_64')
-url="http://www.citi.umich.edu/projects/nfsv4/linux/"
-depends=('glibc' 'libldap>=2.4.18')
-license=('custom:nfsidmap')
-options=(!libtool)
-source=(http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-$pkgver.tar.gz)
-
-build() {
-  cd $srcdir/lib$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd $srcdir/lib$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-
-  # install license
-  install -Dm644 COPYING $pkgdir/usr/share/licenses/nfsidmap/LICENSE
-}
-md5sums=('2ac4893c92716add1a1447ae01df77ab')
diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD
deleted file mode 100644
index c6db2bbf4..000000000
--- a/testing/nilfs-utils/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 163179 2012-07-08 13:36:38Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=nilfs-utils
-pkgver=2.1.4
-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=('e72f941f5041a057a81a1ce22e03497d')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --enable-libmount
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
-}
diff --git a/testing/nouveau-dri/LICENSE b/testing/nouveau-dri/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/testing/nouveau-dri/LICENSE
+++ /dev/null
@@ -1,82 +0,0 @@
-Disclaimer
-
-Mesa is a 3-D graphics library with an API which is very similar to
-that of OpenGL*
-To the extent that Mesa utilizes the OpenGL command syntax or state
-machine, it is being used with authorization from Silicon Graphics,
-Inc.(SGI). However, the author does not possess an OpenGL license
-from SGI, and makes no claim that Mesa is in any way a compatible
-replacement for OpenGL or associated with SGI. Those who want a
-licensed implementation of OpenGL should contact a licensed
-vendor.
-
-Please do not refer to the library as MesaGL (for legal
-reasons). It's just Mesa or The Mesa 3-D graphics
-library
-
-* OpenGL is a trademark of Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-The Mesa distribution consists of several components.  Different copyrights
-and licenses apply to different components.  For example, GLUT is copyrighted
-by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
-device drivers are copyrighted by their authors.  See below for a list of
-Mesa's main components and the license for each.
-
-The core Mesa library is licensed according to the terms of the MIT license.
-This allows integration with the XFree86, Xorg and DRI projects.
-
-The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Attention, Contributors
-
-When contributing to the Mesa project you must agree to the licensing terms
-of the component to which you're contributing.
-The following section lists the primary components of the Mesa distribution
-and their respective licenses.
-
-
-Mesa Component Licenses
-
-Component         Location               Primary Author      License
-----------------------------------------------------------------------------
-Main Mesa code    src/mesa/              Brian Paul          Mesa (MIT)
-
-Device drivers    src/mesa/drivers/*     See drivers         See drivers
-
-Ext headers       include/GL/glext.h     SGI                 SGI Free B
-                  include/GL/glxext.h
-
-GLUT              src/glut/              Mark Kilgard        Mark's copyright
-
-Mesa GLU library  src/glu/mesa/          Brian Paul          GNU-LGPL
-
-SGI GLU library   src/glu/sgi/           SGI                 SGI Free B
-
-demo programs     progs/demos/           various             see source files
-
-X demos           progs/xdemos/          Brian Paul          see source files
-
-SGI demos         progs/samples/         SGI                 SGI copyright
-
-RedBook demos     progs/redbook/         SGI                 SGI copyright
diff --git a/testing/nouveau-dri/PKGBUILD b/testing/nouveau-dri/PKGBUILD
deleted file mode 100644
index 3517ef0fa..000000000
--- a/testing/nouveau-dri/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 163959 2012-07-22 18:51:01Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=nouveau-dri
-pkgver=8.0.4
-pkgrel=2
-arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 
-             'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(LICENSE
-        mesa-8.0.3-llvm-3.1-fixes.patch
-        ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
-)
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         'c452ed3392468170726c004c2f4e02ca'
-         'd546f988adfdf986cff45b1efa2d8a46')
-
-build() {
-    cd ${srcdir}/?esa-*
-
-    patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
-
-     autoreconf -vfi
-    ./configure --prefix=/usr \
-    --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=nouveau \
-    --with-dri-drivers=nouveau \
-    --enable-gallium-llvm \
-    --enable-gallium-egl \
-    --enable-shared-glapi \
-    --enable-gbm \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-glx \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-egl \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-shared-dricore
-  make
-}
-
-package() {
-  depends=("libgl=${pkgver}" 'libdrm-nouveau1')
-  pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
-
-  # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
-  make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
-  # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
-  make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
diff --git a/testing/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch b/testing/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b5926..000000000
--- a/testing/nouveau-dri/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
-    int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
- 
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+   if (!MRI) {
-+      debug_printf("error: no register info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+
-+   OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+   if (!MII) {
-+      debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+      return;
-+   }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+   OwningPtr<MCInstPrinter> Printer(
-+         T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
-    OwningPtr<MCInstPrinter> Printer(
-          T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+   llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
-    llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
- 
- 
diff --git a/testing/nspr/PKGBUILD b/testing/nspr/PKGBUILD
deleted file mode 100644
index e5444b75c..000000000
--- a/testing/nspr/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 161981 2012-06-17 22:56:52Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=nspr
-pkgver=4.9.1
-pkgrel=1
-pkgdesc="Netscape Portable Runtime"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/nspr/"
-license=('MPL' 'GPL')
-depends=('glibc')
-makedepends=('zip')
-options=(!emptydirs)
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
-        nspr.pc.in)
-md5sums=('d36d7b65a38f5b43ebd50ad3ad227120'
-         'bce1611f3117b53fc904cab549c09967')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  if [ "$CARCH" = "x86_64" ]; then
-    confflags="--enable-64bit"
-  else
-    confflags=""
-  fi
-
-  sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
-      -i mozilla/nsprpub/config/rules.mk
-
-  ./mozilla/nsprpub/configure \
-      --prefix=/usr \
-      --libdir=/usr/lib \
-      --includedir=/usr/include/nspr \
-      --enable-optimize \
-      --disable-debug ${confflags}
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  NSPR_LIBS=`./config/nspr-config --libs`
-  NSPR_CFLAGS=`./config/nspr-config --cflags`
-  NSPR_VERSION=`./config/nspr-config --version`
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib," \
-  	-e "s,%prefix%,/usr," \
-	-e "s,%exec_prefix%,/usr/bin," \
-	-e "s,%includedir%,/usr/include/nspr," \
-	-e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
-	-e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
-	-e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  chmod 644 "${pkgdir}/usr/lib/pkgconfig/nspr.pc"
-  ln -sf nspr.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nspr.pc"
-
-  chmod 644 ${pkgdir}/usr/lib/*.a
-
-  rm -rf "${pkgdir}/usr/bin/compile-et.pl" \
-	"${pkgdir}/usr/bin/prerr.properties" \
-	"${pkgdir}/usr/share/aclocal/nspr.m4" \
-	"${pkgdir}/usr/include/nspr/md"
-}
diff --git a/testing/nspr/nspr.pc.in b/testing/nspr/nspr.pc.in
deleted file mode 100644
index 1d8f4a0ca..000000000
--- a/testing/nspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
diff --git a/testing/nss-myhostname/PKGBUILD b/testing/nss-myhostname/PKGBUILD
deleted file mode 100644
index 18b582043..000000000
--- a/testing/nss-myhostname/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169556 2012-10-23 14:16:38Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Mantas M. <grawity@gmail.com>
-pkgname="nss-myhostname"
-pkgver=0.3
-pkgrel=3
-pkgdesc="NSS plugin providing host name resolution for the locally configured system hostname"
-arch=(i686 x86_64)
-url="http://0pointer.de/lennart/projects/nss-myhostname/"
-license=('LGPL2.1')
-depends=('glibc')
-groups=('base')
-source=("http://0pointer.de/lennart/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-lynx
-  make
-}
-
-package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
-
-md5sums=('d4ab9ac36c053ab8fb836db1cbd4a48f')
diff --git a/testing/nss/PKGBUILD b/testing/nss/PKGBUILD
deleted file mode 100644
index 69c4847df..000000000
--- a/testing/nss/PKGBUILD
+++ /dev/null
@@ -1,106 +0,0 @@
-# $Id: PKGBUILD 161983 2012-06-17 23:04:36Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=nss
-pkgver=3.13.5
-pkgrel=1
-pkgdesc="Mozilla Network Security Services"
-arch=(i686 x86_64)
-url="http://www.mozilla.org/projects/security/pki/nss/"
-license=('MPL' 'GPL')
-_nsprver=4.9.1
-depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
-makedepends=('perl')
-options=('!strip')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
-        nss-no-rpath.patch
-        nss.pc.in
-        nss-config.in
-        add_spi+cacert_ca_certs.patch
-        ssl-renegotiate-transitional.patch)
-sha1sums=('22cfe2cbccc93189699e6eed283eca288b45f6cb'
-          'c8fcdb153af9d39689243119adb475905a657284'
-          'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
-          'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
-          '3d89f29e321d7df7269b7ae6d219654543feaa6a'
-          '8a964a744ba098711b80c0d279a2993524e8eb92')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
-  # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian, modified to apply on certdata.txt only
-  patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
-  # Adds transitional SSL renegotiate support - patch from Debian
-  patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
-  # Removes rpath
-  patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
-
-  # Respect LDFLAGS
-  sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
-      -i security/coreconf/rules.mk
-
-  # Generate certdata.c from certdata.txt
-  cd security/nss/lib/ckfw/builtins
-  make generate
-
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  export BUILD_OPT=1
-  export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
-  export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
-  export NSS_USE_SYSTEM_SQLITE=1
-  export NSS_ENABLE_ECC=1
-  export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
-  export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
-  export XCFLAGS="${CFLAGS}"
-
-  [ "$CARCH" = "x86_64" ] && export USE_64=1
-
-  make -j 1 -C mozilla/security/coreconf
-  make -j 1 -C mozilla/security/dbm
-  make -j 1 -C mozilla/security/nss
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m755 -d "${pkgdir}/usr/bin"
-  install -m755 -d "${pkgdir}/usr/include/nss"
-
-  NSS_VMAJOR=`grep "#define.*NSS_VMAJOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VMINOR=`grep "#define.*NSS_VMINOR" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-  NSS_VPATCH=`grep "#define.*NSS_VPATCH" mozilla/security/nss/lib/nss/nss.h | awk '{print $3}'`
-
-  sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib,g" \
-  				-e "s,%prefix%,/usr,g" \
-				-e "s,%exec_prefix%,/usr/bin,g" \
-				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${pkgver},g" \
-				-e "s,%NSS_VERSION%,${pkgver},g" > \
-			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
-  ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
-  chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
-
-  sed "${srcdir}/nss-config.in" -e "s,@libdir@,/usr/lib,g" \
-  				    -e "s,@prefix@,/usr/bin,g" \
-				    -e "s,@exec_prefix@,/usr/bin,g" \
-				    -e "s,@includedir@,/usr/include/nss,g" \
-				    -e "s,@MOD_MAJOR_VERSION@,${NSS_VMAJOR},g" \
-				    -e "s,@MOD_MINOR_VERSION@,${NSS_VMINOR},g" \
-				    -e "s,@MOD_PATCH_VERSION@,${NSS_VPATCH},g" \
-			    > "${pkgdir}/usr/bin/nss-config"
-  chmod 755 "${pkgdir}/usr/bin/nss-config"
-
-  for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
-              libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
-  do
-    install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib/"
-  done
-
-  install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib/"
-  install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib/"
-
-  for file in certutil cmsutil crlutil modutil pk12util shlibsign signtool signver ssltap; do
-    install -m755 mozilla/dist/*.OBJ/bin/${file} "${pkgdir}/usr/bin/"
-  done
-
-  install -m644 mozilla/dist/public/nss/*.h "${pkgdir}/usr/include/nss/"
-}
diff --git a/testing/nss/add_spi+cacert_ca_certs.patch b/testing/nss/add_spi+cacert_ca_certs.patch
deleted file mode 100644
index bf7e2ca16..000000000
--- a/testing/nss/add_spi+cacert_ca_certs.patch
+++ /dev/null
@@ -1,568 +0,0 @@
-## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds the SPI Inc. and CAcert.org CA certificates
-
-Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:32:14.000000000 +0100
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt	2012-02-24 09:35:07.577861466 +0100
-@@ -23475,3 +23475,558 @@
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NSS_NOT_TRUSTED
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+ 
-+#
-+# Certificate "CAcert.org Class 1 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
-+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
-+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
-+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
-+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
-+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
-+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
-+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
-+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
-+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
-+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
-+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
-+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
-+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
-+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
-+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
-+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
-+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
-+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
-+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
-+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
-+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
-+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
-+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
-+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
-+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
-+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
-+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
-+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
-+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
-+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
-+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
-+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
-+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
-+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
-+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
-+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
-+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
-+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
-+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
-+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
-+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
-+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
-+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
-+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
-+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
-+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
-+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
-+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
-+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
-+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
-+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
-+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
-+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
-+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
-+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
-+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
-+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
-+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
-+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
-+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
-+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
-+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
-+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
-+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
-+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
-+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
-+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
-+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
-+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
-+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
-+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
-+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
-+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
-+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
-+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
-+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
-+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
-+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
-+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
-+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
-+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
-+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
-+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
-+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
-+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
-+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
-+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
-+\103
-+END
-+
-+# Trust for Certificate "CAcert.org Class 1 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
-+\166\316\217\063
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 3 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
-+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
-+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
-+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
-+\063\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
-+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
-+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
-+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
-+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
-+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
-+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
-+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
-+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
-+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
-+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
-+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
-+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
-+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
-+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
-+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
-+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
-+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
-+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
-+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
-+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
-+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
-+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
-+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
-+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
-+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
-+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
-+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
-+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
-+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
-+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
-+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
-+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
-+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
-+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
-+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
-+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
-+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
-+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
-+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
-+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
-+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
-+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
-+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
-+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
-+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
-+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
-+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
-+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
-+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
-+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
-+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
-+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
-+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
-+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
-+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
-+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
-+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
-+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
-+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
-+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
-+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
-+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
-+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
-+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
-+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
-+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
-+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
-+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
-+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
-+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
-+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
-+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
-+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
-+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
-+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
-+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
-+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
-+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
-+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
-+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
-+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
-+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
-+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
-+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
-+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
-+\322\156\245\033\231\047\200\347\013\251\250\000
-+END
-+
-+# Trust for Certificate "CAcert.org Class 3 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
-+\030\116\052\055
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
-+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
-+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
-+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
-+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
-+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
-+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
-+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
-+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
-+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
-+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
-+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
-+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
-+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
-+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
-+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
-+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
-+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
-+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
-+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
-+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
-+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
-+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
-+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
-+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
-+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
-+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
-+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
-+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
-+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
-+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
-+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
-+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
-+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
-+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
-+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
-+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
-+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
-+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
-+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
-+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
-+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
-+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
-+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
-+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
-+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
-+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
-+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
-+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
-+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
-+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
-+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
-+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
-+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
-+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
-+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
-+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
-+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
-+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
-+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
-+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
-+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
-+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
-+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
-+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
-+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
-+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
-+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
-+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
-+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
-+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
-+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
-+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
-+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
-+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
-+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
-+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
-+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
-+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
-+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
-+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
-+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
-+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
-+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
-+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
-+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
-+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
-+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
-+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
-+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
-+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
-+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
-+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
-+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
-+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
-+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
-+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
-+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
-+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
-+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
-+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
-+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
-+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
-+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
-+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
-+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
-+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
-+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
-+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
-+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
-+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
-+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
-+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
-+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
-+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
-+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
-+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
-+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
-+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
-+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
-+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
-+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
-+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
-+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
-+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
-+\243\140
-+END
-+
-+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
-+\251\220\103\034
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/testing/nss/nss-config.in b/testing/nss/nss-config.in
deleted file mode 100644
index f8f893e71..000000000
--- a/testing/nss/nss-config.in
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-
-major_version=@MOD_MAJOR_VERSION@
-minor_version=@MOD_MINOR_VERSION@
-patch_version=@MOD_PATCH_VERSION@
-
-usage()
-{
-	cat <<EOF
-Usage: nss-config [OPTIONS] [LIBRARIES]
-Options:
-	[--prefix[=DIR]]
-	[--exec-prefix[=DIR]]
-	[--includedir[=DIR]]
-	[--libdir[=DIR]]
-	[--version]
-	[--libs]
-	[--cflags]
-Dynamic Libraries:
-	nss
-	nssutil
-	ssl
-	smime
-EOF
-	exit $1
-}
-
-if test $# -eq 0; then
-	usage 1 1>&2
-fi
-
-lib_ssl=yes
-lib_smime=yes
-lib_nss=yes
-lib_nssutil=yes
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      ;;
-    --exec-prefix)
-      echo_exec_prefix=yes
-      ;;
-    --includedir=*)
-      includedir=$optarg
-      ;;
-    --includedir)
-      echo_includedir=yes
-      ;;
-    --libdir=*)
-      libdir=$optarg
-      ;;
-    --libdir)
-      echo_libdir=yes
-      ;;
-    --version)
-      echo ${major_version}.${minor_version}.${patch_version}
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --libs)
-      echo_libs=yes
-      ;;
-    ssl)
-      lib_ssl=yes
-      ;;
-    smime)
-      lib_smime=yes
-      ;;
-    nss)
-      lib_nss=yes
-      ;;
-    nssutil)
-      lib_nssutil=yes
-      ;;
-    *)
-      usage 1 1>&2
-      ;;
-  esac
-  shift
-done
-
-# Set variables that may be dependent upon other variables
-if test -z "$exec_prefix"; then
-    exec_prefix=`pkg-config --variable=exec_prefix nss`
-fi
-if test -z "$includedir"; then
-    includedir=`pkg-config --variable=includedir nss`
-fi
-if test -z "$libdir"; then
-    libdir=`pkg-config --variable=libdir nss`
-fi
-
-if test "$echo_prefix" = "yes"; then
-    echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-    echo $exec_prefix
-fi
-
-if test "$echo_includedir" = "yes"; then
-    echo $includedir
-fi
-
-if test "$echo_libdir" = "yes"; then
-    echo $libdir
-fi
-
-if test "$echo_cflags" = "yes"; then
-    echo -I$includedir
-fi
-
-if test "$echo_libs" = "yes"; then
-      libdirs="-Wl,-rpath-link,$libdir -L$libdir"
-      if test -n "$lib_ssl"; then
-	libdirs="$libdirs -lssl${major_version}"
-      fi
-      if test -n "$lib_smime"; then
-	libdirs="$libdirs -lsmime${major_version}"
-      fi
-      if test -n "$lib_nss"; then
-	libdirs="$libdirs -lnss${major_version}"
-      fi
-      if test -n "$lib_nssutil"; then
-	libdirs="$libdirs -lnssutil${major_version}"
-      fi
-      echo $libdirs
-fi      
-
diff --git a/testing/nss/nss-no-rpath.patch b/testing/nss/nss-no-rpath.patch
deleted file mode 100644
index 35ea57315..000000000
--- a/testing/nss/nss-no-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath	2007-02-19 07:17:06.000000000 +0100
-+++ ./mozilla/security/nss/cmd/platlibs.mk	2007-02-19 07:18:07.000000000 +0100
-@@ -52,9 +52,9 @@
- 
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
- endif
- endif
- 
diff --git a/testing/nss/nss.pc.in b/testing/nss/nss.pc.in
deleted file mode 100644
index d47b9e146..000000000
--- a/testing/nss/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/testing/nss/ssl-renegotiate-transitional.patch b/testing/nss/ssl-renegotiate-transitional.patch
deleted file mode 100644
index f457c5551..000000000
--- a/testing/nss/ssl-renegotiate-transitional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable transitional scheme for ssl renegotiation:
-
-(from mozilla/security/nss/lib/ssl/ssl.h)
-Disallow unsafe renegotiation in server sockets only, but allow clients
-to continue to renegotiate with vulnerable servers.
-This value should only be used during the transition period when few
-servers have been upgraded.
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
-index f1d1921..c074360 100644
---- a/mozilla/security/nss/lib/ssl/sslsock.c
-+++ b/mozilla/security/nss/lib/ssl/sslsock.c
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
-     PR_FALSE,   /* noLocks            */
-     PR_FALSE,   /* enableSessionTickets */
-     PR_FALSE,   /* enableDeflate      */
--    2,          /* enableRenegotiation (default: requires extension) */
-+    3,          /* enableRenegotiation (default: transitional) */
-     PR_FALSE,   /* requireSafeNegotiation */
- };
- 
diff --git a/testing/ntp/PKGBUILD b/testing/ntp/PKGBUILD
deleted file mode 100644
index 1266d8304..000000000
--- a/testing/ntp/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 161933 2012-06-16 17:15:59Z dreisner $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-
-pkgname=ntp
-pkgver=4.2.6.p5
-_realver=4.2.6p5
-pkgrel=7
-pkgdesc='Network Time Protocol reference implementation'
-url='http://www.ntp.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-makedepends=('perl-html-parser')
-depends=('openssl' 'readline' 'libcap')
-backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf')
-source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
-        'ntpd'
-        'ntpdate'
-        'ntp.conf'
-        'ntpd.conf'
-        'logrotate.d'
-        'ntpd.service')
-sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
-          '4e324e625c1f080b5c028be5092aa71adbf9bd99'
-          '01394b8a952f5edc85d19df8335eeac3980320f4'
-          'eb1f63814b9adbd3d518e880fa3b38c375f0fe91'
-          '4537d1f58b299d463db5048129cb264511474b0b'
-          '4f76f7f9ffc8315ff9924f793f272d4f6939b816'
-          '81df5c4d51cb69bc29363625ff49e2bd388d1fa9')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${_realver}"
-
-	./configure \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		--enable-linuxcaps \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-$_realver"
-
-	make DESTDIR="${pkgdir}" install
-
-	rmdir "${pkgdir}"/usr/{lib,sbin}
-	install -d -o 87 "${pkgdir}"/var/lib/ntp
-	install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
-	install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
-	install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
-	install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf
-	install -Dm644 ../logrotate.d "${pkgdir}"/etc/logrotate.d/ntpd
-	install -Dm644 ../ntpd.service "${pkgdir}"/usr/lib/systemd/system/ntpd.service
-	install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	
-	cd html
-	../scripts/html2man
-	install -d "${pkgdir}"/usr/share/man
-	mv man/man* "${pkgdir}"/usr/share/man
-	mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
-}
diff --git a/testing/ntp/install b/testing/ntp/install
deleted file mode 100644
index e6eddf8a4..000000000
--- a/testing/ntp/install
+++ /dev/null
@@ -1,37 +0,0 @@
-post_install() {
-	getent group ntp &>/dev/null || groupadd -g 87 ntp >/dev/null
-	getent passwd ntp &>/dev/null || useradd -u 87 -g ntp -d /var/lib/ntp -c 'Network Time Protocol' -s /bin/false ntp >/dev/null
-	true
-}
-
-post_upgrade() {
-	if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
-		cat <<EOF
-
-==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
-==> If you made changes to the former, please update the latter.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
-		cat <<EOF
-
-==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
-==> and the new rc.d script only takes the latter into account.
-==> To stop your old ntpd process, please kill it manually.
-
-EOF
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-3) -le 0 ]]; then
-		post_install
-	fi
-	if [[ $(vercmp $2 4.2.6.p5-5) -le 0 ]]; then
-		chown -R ntp /var/lib/ntp
-	fi
-}
-
-post_remove() {
-	getent passwd ntp &>/dev/null && userdel ntp >/dev/null
-	getent group ntp &>/dev/null && groupdel ntp >/dev/null
-	true
-}
diff --git a/testing/ntp/logrotate.d b/testing/ntp/logrotate.d
deleted file mode 100644
index 8a9f066c3..000000000
--- a/testing/ntp/logrotate.d
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/ntp.log {
-	missingok
-	copytruncate
-}
diff --git a/testing/ntp/ntp.conf b/testing/ntp/ntp.conf
deleted file mode 100644
index a27b22820..000000000
--- a/testing/ntp/ntp.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# With the default settings below, ntpd will only synchronize your clock.
-#
-# For details, see:
-# - the ntp.conf man page
-# - http://support.ntp.org/bin/view/Support/GettingStarted
-# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
-
-# Associate to public NTP pool servers; see http://www.pool.ntp.org/
-server 0.pool.ntp.org
-server 1.pool.ntp.org
-server 2.pool.ntp.org
-
-# Only allow read-only access from localhost
-restrict default noquery nopeer
-restrict 127.0.0.1
-restrict ::1
-
-# Location of drift and log files
-driftfile /var/lib/ntp/ntp.drift
-logfile /var/log/ntp.log
-
-# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing
-# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net
diff --git a/testing/ntp/ntpd b/testing/ntp/ntpd
deleted file mode 100755
index 480fa1088..000000000
--- a/testing/ntp/ntpd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-unset PID
-PIDFILE='/run/ntpd.pid'
-
-if [[ -r ${PIDFILE} ]]; then
-	read -r PID <"${PIDFILE}"
-	if [[ -n ${PID} && ! -d /proc/${PID} ]]; then
-		rm -f "${PIDFILE}"
-		unset PID
-	fi
-fi
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Daemon"
-		if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then 
-			add_daemon ntpd
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Daemon"
-		if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then
-			rm ${PIDFILE}
-			rm_daemon ntpd
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/ntp/ntpd.conf b/testing/ntp/ntpd.conf
deleted file mode 100644
index 047961fde..000000000
--- a/testing/ntp/ntpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g -u ntp"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g -u ntp"
diff --git a/testing/ntp/ntpd.service b/testing/ntp/ntpd.service
deleted file mode 100644
index e0cbf879e..000000000
--- a/testing/ntp/ntpd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Network Time Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/ntpd.pid
-EnvironmentFile=/etc/conf.d/ntpd.conf
-ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ntp/ntpdate b/testing/ntp/ntpdate
deleted file mode 100755
index a8e746785..000000000
--- a/testing/ntp/ntpdate
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Client"
-		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
-			add_daemon ntpdate
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Client"
-		rm_daemon ntpdate
-		stat_done
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/nx/PKGBUILD b/testing/nx/PKGBUILD
deleted file mode 100644
index bc2247597..000000000
--- a/testing/nx/PKGBUILD
+++ /dev/null
@@ -1,145 +0,0 @@
-# $Id: PKGBUILD 168322 2012-10-08 18:52:28Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=nx
-pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
-pkgver=3.5.0.15
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://wiki.x2go.org/"
-license=('GPL')
-options=('!makeflags') # '!strip')
-makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
-             'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
-             )
-source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz
-        nx-x11.ld.so.conf.d
-        nx-cflags.patch)
-md5sums=('d5b3dba1ecbd2989cd7ce20fee6683a0'
-         'f2ec60c7e2d81bef2f7292d2b33681a6'
-         'd0c5b88aac0473e19699cf62d84b9d5f')
-
-build() {
-  cd "${srcdir}/nx-libs-$pkgver"
-  
-  # debug flags
-#  export CFLAGS="-march=x86-64 -O1 -g -pipe"
-#  export CXXFLAGS="-march=x86-64 -O1 -g -pipe"
-
-
-  # Gentoo hacks to honor cflags
-  patch -Np0 -i ${srcdir}/nx-cflags.patch
-
-  # Run autoreconf in all neeed folders
-  for i in nxcomp nxcompext nxcompshad nxproxy; do
-     cd ${i}
-     autoreconf -vfi #${i}
-     cd ..
-  done
-  
-  # From xorg-x11-6.9.0-r3.ebuild
-  pushd "${srcdir}/nx-libs-$pkgver/nx-X11"
-
-  HOSTCONF="config/cf/host.def"
-  echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >> ${HOSTCONF}
-  # Respect LDFLAGS
-  echo "#define ExtraLoadFlags ${LDFLAGS}" >> ${HOSTCONF}
-  echo "#define SharedLibraryLoadFlags -shared ${LDFLAGS}" >> ${HOSTCONF}
-  popd
-    
-  make CONFIGURE="./configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --includedir=/usr/include"
-  # fake install
-  mkdir $srcdir/fakeinstall
-  make DESTDIR="$srcdir/fakeinstall" install
-}
-
-package_libxcomp() {
-  
-  pkgdesc="NX X compression library"
-  depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
-	
-  install -dm755 ${pkgdir}/usr/lib/nx/lib
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
-}
-
-package_nxproxy() {
-
-  pkgdesc="NX proxy"
-  depends=('libxcomp')
-  
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxproxy .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxproxy ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxproxy
-  cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
-}
-
-package_nx-xcompext() {
-  
-  pkgdesc="Xcompext/Xcompshad library for NX"
-  depends=('libxcomp' 'nx-x11')
-	
-  install -dm755 ${pkgdir}/usr/lib/nx
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
-  ln -sv libXcompext.so.3.5.0 libXcompext.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
-}
-
-package_nx-x11() {
- 
-  pkgdesc="NX-X11 lib for the NX framework"
-  depends=('libxcomp')
-	
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/bin}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
-
-  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxauth .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxauth ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxauth
-  
-  install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
-}
-
-package_nxagent() {
-  
-  pkgdesc="NX X server based on Xnest"
-  depends=('nx-xcompext')
-	
-  install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin}
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv /usr/lib/nx/bin/nxagent .
-  
-  # the wrapper
-  cp -a ${srcdir}/nx-libs-$pkgver/bin/nxagent ${pkgdir}/usr/bin
-  chmod +x ${pkgdir}/usr/bin/nxagent
-  # required nxcompshad libs
-  cp -a ${srcdir}/nx-libs-$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/lib/nx
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
-  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
-  cd ${pkgdir}/usr/lib/
-  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
-}
-
-package_nx-headers() {
-
-  pkgdesc="NX headers"
-  
-  install -dm755 ${pkgdir}/usr/include/nx
-  cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
-}  
diff --git a/testing/nx/nx-cflags.patch b/testing/nx/nx-cflags.patch
deleted file mode 100644
index 35562939c..000000000
--- a/testing/nx/nx-cflags.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- nxcomp/configure.in.orig	2008-12-18 15:48:09.000000000 +0100
-+++ nxcomp/configure.in	2008-12-18 15:54:14.000000000 +0100
-@@ -7,8 +7,7 @@
- 
- dnl Set our default compilation flags.
- 
--CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
--CFLAGS="-O3"
-+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
- 
- dnl Reset default linking directives.
- 
---- nxcompext/configure.in.orig	2008-12-18 15:55:29.000000000 +0100
-+++ nxcompext/configure.in	2008-12-18 15:55:51.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(NXlib.h)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CFLAGS="-O3"
--
- dnl Reset default linking directives.
- 
- LIBSTATIC=""
---- nxcompshad/configure.in.orig	2008-12-18 15:56:13.000000000 +0100
-+++ nxcompshad/configure.in	2008-12-18 15:56:22.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Shadow.h)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Reset default linking directives.
- 
- LIBSTATIC=""
---- nxproxy/configure.in.orig	2008-12-18 15:57:48.000000000 +0100
-+++ nxproxy/configure.in	2008-12-18 15:57:55.000000000 +0100
-@@ -5,11 +5,6 @@
- AC_INIT(Main.c)
- AC_PREREQ(2.13)
- 
--dnl Reset default compilation flags.
--
--CXXFLAGS="-O3"
--CPPFLAGS="-O3"
--
- dnl Prefer headers and libraries from nx-X11 if present.
- 
- if test -d "../nx-X11/exports/include" ; then
diff --git a/testing/nx/nx-x11.ld.so.conf.d b/testing/nx/nx-x11.ld.so.conf.d
deleted file mode 100644
index 5d15cb6e2..000000000
--- a/testing/nx/nx-x11.ld.so.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/nx/
diff --git a/testing/obex-data-server/PKGBUILD b/testing/obex-data-server/PKGBUILD
deleted file mode 100644
index 2ab25c6b1..000000000
--- a/testing/obex-data-server/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 169644 2012-10-25 01:35:28Z eric $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Keerthi <keerthi.linux@gmail.com>
-
-pkgname=obex-data-server
-pkgver=0.4.6
-pkgrel=3
-pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
-arch=('i686' 'x86_64')
-url="http://wiki.muiline.com/obex-data-server"
-license=('GPL')
-depends=('dbus-glib' 'openobex' 'imagemagick')
-source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz")
-md5sums=('961ca5db6fe9c97024e133cc6203cc4d')
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/octave/PKGBUILD b/testing/octave/PKGBUILD
deleted file mode 100644
index cc4149860..000000000
--- a/testing/octave/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 168503 2012-10-12 21:20:37Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor : shining <shiningxc.at.gmail.com>
-# Contributor : cyberdune <cyberdune@gmail.com>
-
-pkgname=octave
-pkgver=3.6.2
-pkgrel=2
-pkgdesc="A high-level language, primarily intended for numerical computations."
-arch=('i686' 'x86_64')
-url="http://www.octave.org"
-license=('GPL')
-depends=('fftw' 'pcre' 'curl' 'lapack' 'libx11' 'graphicsmagick' 'glpk' 'hdf5' 'gcc-libs' 'qhull' 'fltk' 'suitesparse')
-makedepends=('texinfo' 'graphicsmagick' 'gcc-fortran' 'suitesparse' 'texlive-core')
-optdepends=('texinfo: for help-support in octave'
-            'gnuplot: alternative plotting')
-source=("ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2"
-        buildfix.diff
-        octave-gethelp.patch)
-options=('!emptydirs')
-install=octave.install
-sha1sums=('145fef0122268086727a60e1c33e29d56fd546d7'
-          'a7cdba1e05fbdd182facdd804aeec37729255551'
-          'd39d54763ac86114029f8bc5d60763d2adce27bb')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  # patch by Gentoo http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-gets.patch?view=log
-  patch -Np0 -i ${srcdir}/buildfix.diff
-  # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sci-mathematics/octave/files/octave-3.4.3-help.patch?view=log
-  patch -Np0 -i ${srcdir}/octave-gethelp.patch
-
-  autoreconf -vfi
-
-  # http://www.nabble.com/Random-rounding-errors-td16010966.html
-  FFLAGS="-O -ffloat-store" \
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static \
-  --with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
-
-  LANG=C make
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR="${pkgdir}" install
-
-  # add octave library path to ld.so.conf.d
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/${pkgname}/${pkgver}" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-}
diff --git a/testing/octave/buildfix.diff b/testing/octave/buildfix.diff
deleted file mode 100644
index 8288b7bec..000000000
--- a/testing/octave/buildfix.diff
+++ /dev/null
@@ -1,85 +0,0 @@
---- libgnu/stdio.in.h.origs	2012-05-24 12:46:13.000000000 -0600
-+++ libgnu/stdio.in.h	2012-05-24 16:29:54.813734894 -0600
-@@ -1,12 +1,10 @@
--/* -*- buffer-read-only: t -*- vi: set ro: */
--/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
- /* A GNU-like <stdio.h>.
- 
-    Copyright (C) 2004, 2007-2012 Free Software Foundation, Inc.
- 
-    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 3, or (at your option)
-+   the Free Software Foundation; either version 2, or (at your option)
-    any later version.
- 
-    This program is distributed in the hope that it will be useful,
-@@ -15,8 +13,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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+   along with this program; if not, see <http://www.gnu.org/licenses/>.  */
- 
- #if __GNUC__ >= 3
- @PRAGMA_SYSTEM_HEADER@
-@@ -55,7 +52,8 @@
- #include <stddef.h>
- 
- /* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
--   and eglibc 2.11.2.  */
-+   and eglibc 2.11.2.
-+   May also define off_t to a 64-bit type on native Windows.  */
- #include <sys/types.h>
- 
- /* The __attribute__ feature is available in gcc versions 2.5 and later.
-@@ -701,22 +699,11 @@ _GL_WARN_ON_USE (getline, "getline is un
- # endif
- #endif
- 
--#if @GNULIB_GETS@
--# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
--#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
--#   undef gets
--#   define gets rpl_gets
--#  endif
--_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
--_GL_CXXALIAS_RPL (gets, char *, (char *s));
--# else
--_GL_CXXALIAS_SYS (gets, char *, (char *s));
--#  undef gets
--# endif
--_GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
--   so any use of gets warrants an unconditional warning.  Assume it is
--   always declared, since it is required by C89.  */
-+   so any use of gets warrants an unconditional warning; besides, C11
-+   removed it.  */
-+#undef gets
-+#if HAVE_RAW_DECL_GETS
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
-@@ -781,7 +768,7 @@ _GL_CXXALIASWARN (pclose);
- #elif defined GNULIB_POSIXCHECK
- # undef pclose
- # if HAVE_RAW_DECL_PCLOSE
--_GL_WARN_ON_USE (pclose, "popen is unportable - "
-+_GL_WARN_ON_USE (pclose, "pclose is unportable - "
-                  "use gnulib module pclose for more portability");
- # endif
- #endif
-@@ -1056,9 +1043,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is
- # endif
- #endif
- 
--/* Some people would argue that sprintf should be handled like gets
--   (for example, OpenBSD issues a link warning for both functions),
--   since both can cause security holes due to buffer overruns.
-+/* Some people would argue that all sprintf uses should be warned about
-+   (for example, OpenBSD issues a link warning for it),
-+   since it can cause security holes due to buffer overruns.
-    However, we believe that sprintf can be used safely, and is more
-    efficient than snprintf in those safe cases; and as proof of our
-    belief, we use sprintf in several gnulib modules.  So this header
diff --git a/testing/octave/curlfix.patch b/testing/octave/curlfix.patch
deleted file mode 100644
index 26f3d92f9..000000000
--- a/testing/octave/curlfix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/DLD-FUNCTIONS/urlwrite.cc.old	2011-07-02 16:39:22.466603778 +0200
-+++ src/DLD-FUNCTIONS/urlwrite.cc	2011-07-02 16:39:54.543269859 +0200
-@@ -52,7 +52,6 @@
- 
- #include <curl/curl.h>
- #include <curl/curlver.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- static int
diff --git a/testing/octave/imread.patch b/testing/octave/imread.patch
deleted file mode 100644
index 4a7b73ea0..000000000
--- a/testing/octave/imread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/DLD-FUNCTIONS/__magick_read__.cc.orig	2010-03-06 08:05:25.000000000 +0000
-+++ src/DLD-FUNCTIONS/__magick_read__.cc	2009-08-25 09:26:01.000000000 +0100
-@@ -30,6 +30,7 @@
- #include "defun-dld.h"
- #include "error.h"
- #include "ov-struct.h"
-+#include "oct-env.h"
- 
- #ifdef HAVE_MAGICK
- 
-@@ -359,6 +358,18 @@
- 
- #ifdef HAVE_MAGICK
- 
-+  static bool initialized = false;
-+
-+  if (! initialized)
-+    {
-+      std::string program_name = octave_env::get_program_invocation_name ();
-+
-+      Magick::InitializeMagick (program_name.c_str ());
-+
-+      initialized = true;
-+    }
-+
-+
-   if (args.length () > 2 || args.length () < 1 || ! args(0).is_string ()
-       || nargout > 3)
-     {
diff --git a/testing/octave/octave-3.4.0-gcc46.patch b/testing/octave/octave-3.4.0-gcc46.patch
deleted file mode 100644
index c174204ac..000000000
--- a/testing/octave/octave-3.4.0-gcc46.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up octave-3.4.0/liboctave/oct-alloc.h.gcc46 octave-3.4.0/liboctave/oct-alloc.h
---- octave-3.4.0/liboctave/oct-alloc.h.gcc46	2011-02-08 03:00:51.000000000 -0700
-+++ octave-3.4.0/liboctave/oct-alloc.h	2011-02-08 09:41:23.984081687 -0700
-@@ -23,6 +23,8 @@ along with Octave; see the file COPYING.
- #if !defined (octave_oct_alloc_h)
- #define octave_oct_alloc_h 1
- 
-+#include <cstddef>
-+
- class
- OCTAVE_API
- octave_allocator
-diff -up octave-3.4.0/src/pr-output.cc.gcc46 octave-3.4.0/src/pr-output.cc
---- octave-3.4.0/src/pr-output.cc.gcc46	2011-02-08 03:00:52.000000000 -0700
-+++ octave-3.4.0/src/pr-output.cc	2011-02-08 09:55:16.149662744 -0700
-@@ -3024,7 +3024,7 @@ abs (T x)
- }
- 
- #define INSTANTIATE_ABS(T) \
--  template /* static */ inline T abs (T)
-+  template /* static */ T abs (T)
- 
- INSTANTIATE_ABS(signed char);
- INSTANTIATE_ABS(short);
diff --git a/testing/octave/octave-gethelp.patch b/testing/octave/octave-gethelp.patch
deleted file mode 100644
index c0e693abc..000000000
--- a/testing/octave/octave-gethelp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Help parallel compilation
-patch by Sebastien Fabbro 
---- scripts/Makefile.am.orig	2011-06-09 22:27:22.688268651 +0100
-+++ scripts/Makefile.am	2011-02-08 10:00:51.000000000 +0000
-@@ -316,7 +316,7 @@
- 
- gethelp_SOURCES = gethelp.cc
- 
--.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile
-+.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile gethelp
- 	@$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT)
- 	if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
- 		cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
diff --git a/testing/octave/octave.install b/testing/octave/octave.install
deleted file mode 100644
index 8ee77c430..000000000
--- a/testing/octave/octave.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=/usr/share/info
-info_files=(octave.info octave.info-1 octave.info-2 octave.info-3 octave.info-4 octave.info-5)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/opal/PKGBUILD b/testing/opal/PKGBUILD
deleted file mode 100644
index 962a5aae5..000000000
--- a/testing/opal/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169547 2012-10-23 12:23:23Z jgc $
-# Maintainer: Jan de Groot <jan@archlinux.org>
-# Contributor: Tom K <tomk@runbox.com>
-pkgname=opal
-pkgver=3.10.7
-pkgrel=2
-pkgdesc="Open Phone Abstraction Library"
-arch=(i686 x86_64)
-url="http://www.opalvoip.org"
-license=('GPL')
-depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm')
-makedepends=('ffmpeg')
-options=(!makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2
-        opal-ffmpeg.patch)
-md5sums=('8686bb930668067eefadab115d2ee1c2'
-         '0f05c01dada644b37805667ba9e81aa5')
-
-build() {
-  cd "${srcdir}/opal-${pkgver}"
-  patch -Np1 -i "${srcdir}/opal-ffmpeg.patch"
-  CXXFLAGS="$CXXFLAGS -fpermissive" \
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
-  make
-}
-
-package() {
-  cd "${srcdir}/opal-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  chmod 644 "${pkgdir}/usr/lib/libopal_s.a"
-}
diff --git a/testing/opal/opal-ffmpeg.patch b/testing/opal/opal-ffmpeg.patch
deleted file mode 100644
index c40e1ddfb..000000000
--- a/testing/opal/opal-ffmpeg.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff -ru opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx
---- opal-3.10.7/plugins/video/H.263-1998/h263-1998.cxx	2012-08-23 04:18:42.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.263-1998/h263-1998.cxx	2012-08-28 19:53:12.080918973 +0200
-@@ -48,6 +48,7 @@
- #endif
- 
- #include "h263-1998.h"
-+#include <libavutil/opt.h>
- #include <limits>
- #include <iomanip>
- #include <stdio.h>
-@@ -317,9 +318,9 @@
-     // Level 2+ 
-     // works with eyeBeam, signaled via  non-standard "D"
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_UMV; 
-+      av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-     return;
-   }
- 
-@@ -328,9 +329,9 @@
-     // Annex F: Advanced Prediction Mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_OBMC; 
-+      av_opt_set_int(m_context->priv_data, "obmc", 0, 0);
-     return;
-   }
- #endif
-@@ -360,9 +361,9 @@
-     // Annex K: Slice Structure
-     // does not work with eyeBeam
-     if (atoi(value) != 0)
--      m_context->flags |= CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT; 
-+      av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
-     return;
-   }
- 
-@@ -370,9 +371,9 @@
-     // Annex S: Alternative INTER VLC mode
-     // does not work with eyeBeam
-     if (atoi(value) == 1)
--      m_context->flags |= CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 1, 0);
-     else
--      m_context->flags &= ~CODEC_FLAG_H263P_AIV; 
-+      av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-     return;
-   }
- 
-@@ -450,15 +451,6 @@
-   PTRACE(5, m_prefix, "qmax set to " << m_context->qmax);
-   PTRACE(5, m_prefix, "payload size set to " << m_context->rtp_payload_size);
- 
--  #define CODEC_TRACER_FLAG(tracer, flag) \
--    PTRACE(4, m_prefix, #flag " is " << ((m_context->flags & flag) ? "enabled" : "disabled"));
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_UMV);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_OBMC);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_AC_PRED);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_SLICE_STRUCT)
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_LOOP_FILTER);
--  CODEC_TRACER_FLAG(tracer, CODEC_FLAG_H263P_AIV);
--
-   return FFMPEGLibraryInstance.AvcodecOpen(m_context, m_codec) == 0;
- }
- 
-@@ -521,7 +513,7 @@
- 
-     // Need to copy to local buffer to guarantee 16 byte alignment
-     memcpy(m_inputFrame->data[0], OPAL_VIDEO_FRAME_DATA_PTR(header), header->width*header->height*3/2);
--    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? FF_I_TYPE : AV_PICTURE_TYPE_NONE;
-+    m_inputFrame->pict_type = (flags & PluginCodec_CoderForceIFrame) ? AV_PICTURE_TYPE_I : AV_PICTURE_TYPE_NONE;
- 
-     /*
-     m_inputFrame->pts = (int64_t)srcRTP.GetTimestamp()*m_context->time_base.den/m_context->time_base.num/VIDEO_CLOCKRATE;
-@@ -603,13 +595,13 @@
-   m_context->rtp_callback = &H263_RFC2190_EncoderContext::RTPCallBack;
-   m_context->opaque = this; // used to separate out packets from different encode threads
- 
--  m_context->flags &= ~CODEC_FLAG_H263P_UMV;
-+  av_opt_set_int(m_context->priv_data, "umv", 0, 0);
-   m_context->flags &= ~CODEC_FLAG_4MV;
- #if LIBAVCODEC_RTP_MODE
-   m_context->flags &= ~CODEC_FLAG_H263P_AIC;
- #endif
--  m_context->flags &= ~CODEC_FLAG_H263P_AIV;
--  m_context->flags &= ~CODEC_FLAG_H263P_SLICE_STRUCT;
-+  av_opt_set_int(m_context->priv_data, "aiv", 0, 0);
-+  av_opt_set_int(m_context->priv_data, "structured_slices", 0, 0);
- 
-   return true;
- }
-Only in opal-3.10.7.patched/plugins/video/H.263-1998: h263-1998.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx
---- opal-3.10.7/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/gpl/h264_helper.cxx	2012-08-28 19:53:12.080918973 +0200
-@@ -27,6 +27,7 @@
- #include <fstream>
- #include <stdlib.h> 
- #include <sys/stat.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-Only in opal-3.10.7.patched/plugins/video/H.264/gpl: h264_helper.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/h264-x264.cxx opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx
---- opal-3.10.7/plugins/video/H.264/h264-x264.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/h264-x264.cxx	2012-08-28 19:53:12.080918973 +0200
-@@ -1071,13 +1071,10 @@
-         return false;
- 
-       m_context->workaround_bugs = FF_BUG_AUTODETECT;
--      m_context->error_recognition = FF_ER_AGGRESSIVE;
-       m_context->idct_algo = FF_IDCT_H264;
-       m_context->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
-       m_context->flags = CODEC_FLAG_INPUT_PRESERVED | CODEC_FLAG_EMU_EDGE;
--      m_context->flags2 = CODEC_FLAG2_BRDO |
--                          CODEC_FLAG2_MEMC_ONLY |
--                          CODEC_FLAG2_DROP_FRAME_TIMECODE |
-+      m_context->flags2 = CODEC_FLAG2_DROP_FRAME_TIMECODE |
-                           CODEC_FLAG2_SKIP_RD |
-                           CODEC_FLAG2_CHUNKS;
- 
-Only in opal-3.10.7.patched/plugins/video/H.264: h264-x264.cxx.orig
-diff -ru opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx
---- opal-3.10.7/plugins/video/H.264/shared/x264wrap.cxx	2012-08-23 04:18:41.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/H.264/shared/x264wrap.cxx	2012-08-28 19:53:12.084252306 +0200
-@@ -33,6 +33,7 @@
- 
- #include <codec/opalplugin.hpp>
- #include <stdio.h>
-+#include <unistd.h>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-Only in opal-3.10.7.patched/plugins/video/H.264/shared: x264wrap.cxx.orig
-diff -ru opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx
---- opal-3.10.7/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-23 04:18:44.000000000 +0200
-+++ opal-3.10.7.patched/plugins/video/MPEG4-ffmpeg/mpeg4.cxx	2012-08-28 19:54:35.460923804 +0200
-@@ -103,6 +103,7 @@
- 
- #else /* LIBAVCODEC_HAVE_SOURCE_DIR */
- #include "../common/ffmpeg.h"
-+#include <libavutil/opt.h>
- #endif /* LIBAVCODEC_HAVE_SOURCE_DIR */
- }
- 
-@@ -589,17 +590,17 @@
-     m_avpicture->quality = m_videoQMin;
- 
- #ifdef USE_ORIG
--    m_avcontext->flags |= CODEC_FLAG_PART;   // data partitioning
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->flags |= CODEC_FLAG_4MV;    // 4 motion vectors
- #else
-     m_avcontext->max_b_frames=0; /*don't use b frames*/
-     m_avcontext->flags|=CODEC_FLAG_AC_PRED;
--    m_avcontext->flags|=CODEC_FLAG_H263P_UMV;
-+    av_opt_set_int(m_avcontext->priv_data, "umv", 1, 0);
-     /*c->flags|=CODEC_FLAG_QPEL;*/ /*don't enable this one: this forces profile_level to advanced simple profile */
-     m_avcontext->flags|=CODEC_FLAG_4MV;
-     m_avcontext->flags|=CODEC_FLAG_GMC;
-     m_avcontext->flags|=CODEC_FLAG_LOOP_FILTER;
--    m_avcontext->flags|=CODEC_FLAG_H263P_SLICE_STRUCT;
-+    av_opt_set_int(m_avcontext->priv_data, "structured_slices", 1, 0);
- #endif
-     m_avcontext->opaque = this;              // for use in RTP callback
- }
-@@ -804,7 +805,7 @@
-         // Should the next frame be an I-Frame?
-         if ((flags & PluginCodec_CoderForceIFrame) || (m_frameNum == 0))
-         {
--            m_avpicture->pict_type = FF_I_TYPE;
-+            m_avpicture->pict_type = AV_PICTURE_TYPE_I;
-         }
-         else // No IFrame requested, let avcodec decide what to do
-         {
-@@ -1325,7 +1326,7 @@
- 
- void MPEG4DecoderContext::SetStaticDecodingParams() {
-     m_avcontext->flags |= CODEC_FLAG_4MV; 
--    m_avcontext->flags |= CODEC_FLAG_PART;
-+    av_opt_set_int(m_avcontext->priv_data, "data_partitionin", 1, 0);
-     m_avcontext->workaround_bugs = 0; // no workaround for buggy implementations
- }
- 
diff --git a/testing/openconnect/PKGBUILD b/testing/openconnect/PKGBUILD
deleted file mode 100644
index 1daa426a7..000000000
--- a/testing/openconnect/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 165196 2012-08-12 20:09:11Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=openconnect
-pkgver=4.06
-pkgrel=1
-epoch=1
-pkgdesc="Open client for Cisco AnyConnect VPN"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.infradead.org/openconnect.html"
-depends=('libxml2' 'openssl' 'libproxy' 'vpnc')
-makedepends=('intltool')
-options=('!libtool' '!emptydirs')
-source=(ftp://ftp.infradead.org/pub/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e827c9d08bd4d6983e3cbd0c9c19b978')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr \
-      --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD
deleted file mode 100644
index 90bdbbe68..000000000
--- a/testing/opencv/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 169645 2012-10-25 01:35:31Z 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.4.2
-pkgrel=5
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.org/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0'
-         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3')
-makedepends=('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-${pkgver}.tar.bz2")
-md5sums=('059ef86fc1724d69b75832a0d2929ff5')
-
-_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
-            '-D CMAKE_INSTALL_PREFIX=/usr'
-            '-D CMAKE_SKIP_RPATH=ON'
-            '-D BUILD_TESTS=OFF'
-            '-D ENABLE_SSE=ON'
-            '-D ENABLE_SSE2=ON'
-            '-D ENABLE_SSE3=OFF'
-            '-D ENABLE_SSSE3=OFF'
-            '-D ENABLE_SSE41=OFF'
-            '-D ENABLE_SSE42=OFF'
-            '-D BUILD_EXAMPLES=ON'
-            '-D INSTALL_C_EXAMPLES=ON'
-            '-D INSTALL_PYTHON_EXAMPLES=ON'
-            '-D WITH_XINE=ON'
-            '-D WITH_QT=OFF'
-            '-D WITH_QT_OPENGL=OFF'
-            '-D WITH_UNICAP=OFF'
-            '-D WITH_PVAPI=OFF'
-            '-D WITH_OPENNI=OFF'
-            '-D WITH_TBB=OFF'
-            '-D WITH_IPP=OFF'
-            '-D WITH_CUDA=OFF'
-            '-D USE_FAST_MATH=ON')
-
-build() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  # x64, i.e "Athlon64" and upwards, can use SSE3
-  [ $CARCH = x86_64 ] && \
-    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
-
-  cmake ${_cmakeopts[@]} .
-
-  make
-}
-
-package_opencv() {
-  cd "$srcdir/$_realname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-  cd "$pkgdir/usr/share"
-
-  # separate docs package; also be -R friendly
-  [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc"
-
-  # separate samples package
-  [ -d $_realname/samples ] && mv $_realname/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/$_realname"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/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/$_realname"
-  cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples"
-
-  # install license file
-  install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/openexr/PKGBUILD b/testing/openexr/PKGBUILD
deleted file mode 100644
index 4c54c859b..000000000
--- a/testing/openexr/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169646 2012-10-25 01:35:34Z eric $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=openexr
-pkgver=1.7.1
-pkgrel=2
-pkgdesc="An high dynamic-range image file format library"
-url="http://www.openexr.com/"
-arch=('i686' 'x86_64')
-license=('BSD')
-depends=('zlib' 'ilmbase')
-options=('!libtool')
-source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'gcc43.patch')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/gcc43.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-md5sums=('a9e0369dfd68941c50cdaa93e9d7a8d1'
-         'd91fae759053a70bcedcf02eb33ca4a2')
diff --git a/testing/openexr/gcc43.patch b/testing/openexr/gcc43.patch
deleted file mode 100644
index ab99eb9a1..000000000
--- a/testing/openexr/gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exrenvmap/blurImage.cpp
-+++ exrenvmap/blurImage.cpp
-@@ -39,6 +39,8 @@
- //
- //-----------------------------------------------------------------------------
- 
-+#include <cstring>
-+
- #include <blurImage.h>
- 
- #include <resizeImage.h>
diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD
deleted file mode 100644
index ba6380387..000000000
--- a/testing/openldap/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 168437 2012-10-11 21:32:47Z eric $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.33
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
-options=('!makeflags')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
-        slapd slapd.default slapd.service slapd.tmpfiles
-        ntlm.patch)
-sha1sums=('0cea642ba2dae1eb719da41bfedb9eba72ad504d'
-          'b684038a7f5bc7d2ba470b2d16ee47b5aae64c65'
-          'd89b8a533045123f1ab46c9c430cf132d58a20a4'
-          'a2cdab7e800a9f0c8b1e319a68598a12f4af27a4'
-          'f86a82e35ebe15026980467c9dee4007e686b795'
-          '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 \
-    --without-fetch \
-    --enable-spasswd --with-cyrus-sasl \
-    --enable-overlays=mod --enable-modules=yes
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make test
-}
-
-package_libldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
-  depends=('libsasl' 'e2fsprogs')
-  backup=('etc/openldap/ldap.conf')
-  options=('!libtool')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in include libraries doc/man/man3 ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
-  ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
-
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openldap() {
-  pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
-  depends=("libldap>=${pkgver}" 'libltdl' 'util-linux')
-  backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
-  options=('!libtool' 'emptydirs')
-  install=openldap.install
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  for dir in clients servers doc/man/man{1,5,8} ; do
-    pushd ${dir}
-    make DESTDIR="${pkgdir}" install
-    popd
-  done
-  rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-  rm -r "${pkgdir}"/run
-
-# get rid of duplicate default conf files
-  rm "${pkgdir}"/etc/openldap/*.default
-
-  ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
-
-  chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-  chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-
-  install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
-  install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
-  install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
-  install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
-  install -Dm644 "${srcdir}"/slapd.service "${pkgdir}"/usr/lib/systemd/system/slapd.service
-  install -Dm644 "${srcdir}"/slapd.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/slapd.conf
-  install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openldap/mutex-end-of-struct-sigsegv.patch b/testing/openldap/mutex-end-of-struct-sigsegv.patch
deleted file mode 100644
index e8996386a..000000000
--- a/testing/openldap/mutex-end-of-struct-sigsegv.patch
+++ /dev/null
@@ -1,293 +0,0 @@
- libraries/libldap/init.c     |    8 ++-
- libraries/libldap/ldap-int.h |  198 ++++++++++++++++++++++--------------------
- 2 files changed, 110 insertions(+), 96 deletions(-)
-
-diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
-index 39292d2..9d37e64 100644
---- a/libraries/libldap/init.c
-+++ b/libraries/libldap/init.c
-@@ -36,7 +36,13 @@
- #include "lutil.h"
- 
- struct ldapoptions ldap_int_global_options =
--	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE LDAP_LDO_MUTEX_NULLARG };  
-+	{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE
-+		LDAP_LDO_NULLARG
-+		LDAP_LDO_CONNECTIONLESS_NULLARG
-+		LDAP_LDO_TLS_NULLARG
-+		LDAP_LDO_SASL_NULLARG
-+		LDAP_LDO_GSSAPI_NULLARG
-+		LDAP_LDO_MUTEX_NULLARG };
- 
- #define ATTR_NONE	0
- #define ATTR_BOOL	1
-diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
-index f8e6126..ac6c9e5 100644
---- a/libraries/libldap/ldap-int.h
-+++ b/libraries/libldap/ldap-int.h
-@@ -185,29 +185,59 @@ struct ldapoptions {
- #define LDAP_TRASHED_SESSION	0xFF
- 	int   ldo_debug;
- 
--#ifdef LDAP_R_COMPILE
--	ldap_pvt_thread_mutex_t	ldo_mutex;
--#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
--#else
--#define LDAP_LDO_MUTEX_NULLARG
--#endif
-+	ber_int_t		ldo_version;
-+	ber_int_t		ldo_deref;
-+	ber_int_t		ldo_timelimit;
-+	ber_int_t		ldo_sizelimit;
-+
-+	/* per API call timeout */
-+	struct timeval		ldo_tm_api;
-+	struct timeval		ldo_tm_net;
-+
-+	LDAPURLDesc *ldo_defludp;
-+	int		ldo_defport;
-+	char*	ldo_defbase;
-+	char*	ldo_defbinddn;	/* bind dn */
-+
-+	/*
-+	 * Per connection tcp-keepalive settings (Linux only,
-+	 * ignored where unsupported)
-+	 */
-+	ber_int_t ldo_keepalive_idle;
-+	ber_int_t ldo_keepalive_probes;
-+	ber_int_t ldo_keepalive_interval;
-+
-+	int		ldo_refhoplimit;	/* limit on referral nesting */
-+
-+	/* LDAPv3 server and client controls */
-+	LDAPControl	**ldo_sctrls;
-+	LDAPControl **ldo_cctrls;
-+
-+	/* LDAP rebind callback function */
-+	LDAP_REBIND_PROC *ldo_rebind_proc;
-+	void *ldo_rebind_params;
-+	LDAP_NEXTREF_PROC *ldo_nextref_proc;
-+	void *ldo_nextref_params;
-+	LDAP_URLLIST_PROC *ldo_urllist_proc;
-+	void *ldo_urllist_params;
-+
-+	/* LDAP connection callback stack */
-+	ldaplist *ldo_conn_cbs;
-+
-+	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
-+
-+#define LDAP_LDO_NULLARG	,0,0,0,0 ,{0},{0} ,0,0,0,0, 0,0,0,0, 0,0, 0,0,0,0,0,0, 0, 0
- 
- #ifdef LDAP_CONNECTIONLESS
- #define	LDAP_IS_UDP(ld)		((ld)->ld_options.ldo_is_udp)
- 	void*			ldo_peer;	/* struct sockaddr* */
- 	char*			ldo_cldapdn;
- 	int			ldo_is_udp;
-+#define	LDAP_LDO_CONNECTIONLESS_NULLARG	,0,0,0
-+#else
-+#define	LDAP_LDO_CONNECTIONLESS_NULLARG
- #endif
- 
--	/* per API call timeout */
--	struct timeval		ldo_tm_api;
--	struct timeval		ldo_tm_net;
--
--	ber_int_t		ldo_version;
--	ber_int_t		ldo_deref;
--	ber_int_t		ldo_timelimit;
--	ber_int_t		ldo_sizelimit;
--
- #ifdef HAVE_TLS
-    	/* tls context */
-    	void		*ldo_tls_ctx;
-@@ -226,16 +256,12 @@ struct ldapoptions {
-    	int			ldo_tls_mode;
-    	int			ldo_tls_require_cert;
- 	int			ldo_tls_impl;
--#ifdef HAVE_OPENSSL_CRL
-    	int			ldo_tls_crlcheck;
--#endif
-+#define LDAP_LDO_TLS_NULLARG ,0,0,0,{0,0,0,0,0,0,0,0,0},0,0,0,0
-+#else
-+#define LDAP_LDO_TLS_NULLARG
- #endif
- 
--	LDAPURLDesc *ldo_defludp;
--	int		ldo_defport;
--	char*	ldo_defbase;
--	char*	ldo_defbinddn;	/* bind dn */
--
- #ifdef HAVE_CYRUS_SASL
- 	char*	ldo_def_sasl_mech;		/* SASL Mechanism(s) */
- 	char*	ldo_def_sasl_realm;		/* SASL realm */
-@@ -244,6 +270,9 @@ struct ldapoptions {
- 
- 	/* SASL Security Properties */
- 	struct sasl_security_properties	ldo_sasl_secprops;
-+#define LDAP_LDO_SASL_NULLARG ,0,0,0,0,{0}
-+#else
-+#define LDAP_LDO_SASL_NULLARG
- #endif
- 
- #ifdef HAVE_GSSAPI
-@@ -253,34 +282,17 @@ struct ldapoptions {
- #define LDAP_GSSAPI_OPT_DO_NOT_FREE_GSS_CONTEXT	0x0001
- #define LDAP_GSSAPI_OPT_ALLOW_REMOTE_PRINCIPAL	0x0002
- 	unsigned ldo_gssapi_options;
-+#define LDAP_LDO_GSSAPI_NULLARG ,0,0
-+#else
-+#define LDAP_LDO_GSSAPI_NULLARG
- #endif
- 
--	/*
--	 * Per connection tcp-keepalive settings (Linux only,
--	 * ignored where unsupported)
--	 */
--	ber_int_t ldo_keepalive_idle;
--	ber_int_t ldo_keepalive_probes;
--	ber_int_t ldo_keepalive_interval;
--
--	int		ldo_refhoplimit;	/* limit on referral nesting */
--
--	/* LDAPv3 server and client controls */
--	LDAPControl	**ldo_sctrls;
--	LDAPControl **ldo_cctrls;
--
--	/* LDAP rebind callback function */
--	LDAP_REBIND_PROC *ldo_rebind_proc;
--	void *ldo_rebind_params;
--	LDAP_NEXTREF_PROC *ldo_nextref_proc;
--	void *ldo_nextref_params;
--	LDAP_URLLIST_PROC *ldo_urllist_proc;
--	void *ldo_urllist_params;
--
--	/* LDAP connection callback stack */
--	ldaplist *ldo_conn_cbs;
--
--	LDAP_BOOLEANS ldo_booleans;	/* boolean options */
-+#ifdef LDAP_R_COMPILE
-+	ldap_pvt_thread_mutex_t	ldo_mutex;
-+#define LDAP_LDO_MUTEX_NULLARG	, LDAP_PVT_MUTEX_NULL
-+#else
-+#define LDAP_LDO_MUTEX_NULLARG
-+#endif
- };
- 
- 
-@@ -375,6 +387,46 @@ struct ldap_common {
- 	Sockbuf		*ldc_sb;	/* socket descriptor & buffer */
- #define ld_sb			ldc->ldc_sb
- 
-+	unsigned short	ldc_lberoptions;
-+#define	ld_lberoptions		ldc->ldc_lberoptions
-+
-+	/* protected by msgid_mutex */
-+	ber_len_t		ldc_msgid;
-+#define	ld_msgid		ldc->ldc_msgid
-+
-+	/* do not mess with these */
-+	/* protected by req_mutex */
-+	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
-+	/* protected by res_mutex */
-+	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
-+#define	ld_requests		ldc->ldc_requests
-+#define	ld_responses		ldc->ldc_responses
-+
-+	/* protected by abandon_mutex */
-+	ber_len_t	ldc_nabandoned;
-+	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
-+#define	ld_nabandoned		ldc->ldc_nabandoned
-+#define	ld_abandoned		ldc->ldc_abandoned
-+
-+	/* unused by libldap */
-+	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
-+#define	ld_cache		ldc->ldc_cache
-+
-+	/* do not mess with the rest though */
-+
-+	/* protected by conn_mutex */
-+	LDAPConn	*ldc_defconn;	/* default connection */
-+#define	ld_defconn		ldc->ldc_defconn
-+	LDAPConn	*ldc_conns;	/* list of server connections */
-+#define	ld_conns		ldc->ldc_conns
-+	void		*ldc_selectinfo;/* platform specifics for select */
-+#define	ld_selectinfo		ldc->ldc_selectinfo
-+
-+	/* ldap_common refcnt - free only if 0 */
-+	/* protected by ldc_mutex */
-+	unsigned int		ldc_refcnt;
-+#define	ld_ldcrefcnt		ldc->ldc_refcnt
-+
- 	/* protected by ldo_mutex */
- 	struct ldapoptions ldc_options;
- #define ld_options		ldc->ldc_options
-@@ -403,66 +455,22 @@ struct ldap_common {
- #define ld_urllist_params	ld_options.ldo_urllist_params
- 
- #define ld_version		ld_options.ldo_version
--#ifdef LDAP_R_COMPILE
--#define	ld_ldopts_mutex		ld_options.ldo_mutex
--#endif
--
--	unsigned short	ldc_lberoptions;
--#define	ld_lberoptions		ldc->ldc_lberoptions
--
--	/* protected by msgid_mutex */
--	ber_len_t		ldc_msgid;
--#define	ld_msgid		ldc->ldc_msgid
--
--	/* do not mess with these */
--	/* protected by req_mutex */
--	LDAPRequest	*ldc_requests;	/* list of outstanding requests */
--	/* protected by res_mutex */
--	LDAPMessage	*ldc_responses;	/* list of outstanding responses */
--#define	ld_requests		ldc->ldc_requests
--#define	ld_responses		ldc->ldc_responses
- 
- #ifdef LDAP_R_COMPILE
-+	ldap_pvt_thread_mutex_t	ldc_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_msgid_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_conn_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_req_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_res_mutex;
- 	ldap_pvt_thread_mutex_t	ldc_abandon_mutex;
-+#define	ld_ldopts_mutex		ld_options.ldo_mutex
-+#define	ld_ldcmutex		ldc->ldc_mutex
- #define	ld_msgid_mutex		ldc->ldc_msgid_mutex
- #define	ld_conn_mutex		ldc->ldc_conn_mutex
- #define	ld_req_mutex		ldc->ldc_req_mutex
- #define	ld_res_mutex		ldc->ldc_res_mutex
- #define	ld_abandon_mutex	ldc->ldc_abandon_mutex
- #endif
--
--	/* protected by abandon_mutex */
--	ber_len_t	ldc_nabandoned;
--	ber_int_t	*ldc_abandoned;	/* array of abandoned requests */
--#define	ld_nabandoned		ldc->ldc_nabandoned
--#define	ld_abandoned		ldc->ldc_abandoned
--
--	/* unused by libldap */
--	LDAPCache	*ldc_cache;	/* non-null if cache is initialized */
--#define	ld_cache		ldc->ldc_cache
--
--	/* do not mess with the rest though */
--
--	/* protected by conn_mutex */
--	LDAPConn	*ldc_defconn;	/* default connection */
--#define	ld_defconn		ldc->ldc_defconn
--	LDAPConn	*ldc_conns;	/* list of server connections */
--#define	ld_conns		ldc->ldc_conns
--	void		*ldc_selectinfo;/* platform specifics for select */
--#define	ld_selectinfo		ldc->ldc_selectinfo
--
--	/* ldap_common refcnt - free only if 0 */
--#ifdef LDAP_R_COMPILE
--	ldap_pvt_thread_mutex_t	ldc_mutex;
--#define	ld_ldcmutex		ldc->ldc_mutex
--#endif
--	/* protected by ldc_mutex */
--	unsigned int		ldc_refcnt;
--#define	ld_ldcrefcnt		ldc->ldc_refcnt
- };
- 
- struct ldap {
diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch
deleted file mode 100644
index 6804b610d..000000000
--- a/testing/openldap/ntlm.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Patch from evolution-exchange (2.10.3).  The ldap_ntlm_bind function is
-actually called by evolution-data-server, checked at version 1.12.2.
-Without this patch, the Exchange addressbook integration uses simple binds
-with cleartext passwords.
-
-Russ checked with openldap-software for upstream's opinion on this patch
-on 2007-12-21.  Upstream had never received it as a patch submission and
-given that it's apparently only for older Exchange servers that can't do
-SASL and DIGEST-MD5, it's not very appealing.
-
-Bug#457374 filed against evolution-data-server asking if this support is
-still required on 2007-12-21.
-
-Index: trunk/include/ldap.h
-===================================================================
---- trunk.orig/include/ldap.h
-+++ trunk/include/ldap.h
-@@ -2461,5 +2461,25 @@
- 	LDAPControl	**ctrls,
- 	LDAPDerefRes	**drp ));
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE  ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+      LDAP    *ld,
-+      LDAP_CONST char *dn,
-+      ber_tag_t tag,
-+      struct berval *cred,
-+      LDAPControl **sctrls,
-+      LDAPControl **cctrls,
-+      int   *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+      LDAP    *ld,
-+      LDAPMessage *res,
-+      struct berval *challenge));
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-Index: trunk/libraries/libldap/ntlm.c
-===================================================================
---- /dev/null
-+++ trunk/libraries/libldap/ntlm.c
-@@ -0,0 +1,138 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP    *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int   *msgidp )
-+{
-+ BerElement  *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+      id, LDAP_REQ_BIND,
-+      ld->ld_version, dn, tag,
-+      cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+   ld->ld_errno = LDAP_ENCODING_ERROR;
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+   return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP    *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement  *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+   return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+   LDAP_FREE( ld->ld_error );
-+   ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+   LDAP_FREE( ld->ld_matched );
-+   ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+      &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+   ld->ld_errno = LDAP_DECODING_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
-+
-Index: trunk/libraries/libldap/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
-@@ -27,7 +27,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- 
- OBJS	= bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
-Index: trunk/libraries/libldap_r/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
-@@ -29,7 +29,7 @@
- 	init.c options.c print.c string.c util-int.c schema.c \
- 	charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- 	tls2.c tls_o.c tls_g.c tls_m.c \
--	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+	turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- 	assertion.c deref.c ldif.c fetch.c
- SRCS	= threads.c rdwr.c rmutex.c tpool.c rq.c \
- 	thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
-@@ -47,7 +47,7 @@
- 	init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- 	charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- 	tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+	turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- 	assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install
deleted file mode 100644
index cf3cb9f25..000000000
--- a/testing/openldap/openldap.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install(){
-  groupadd -g 439 ldap &>/dev/null
-  useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
-  chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_upgrade(){
-  getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
-  getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
-  chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_remove(){
-  if getent passwd ldap >/dev/null 2>&1; then
-    userdel ldap
-  fi
-  if getent group ldap >/dev/null 2>&1; then
-    groupdel ldap
-  fi
-}
diff --git a/testing/openldap/slapd b/testing/openldap/slapd
deleted file mode 100755
index 604f6b275..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
-        add_daemon slapd
-        stat_done
-      fi
-    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/openldap/slapd.service b/testing/openldap/slapd.service
deleted file mode 100644
index d8baa57b5..000000000
--- a/testing/openldap/slapd.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=OpenLDAP server daemon
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/slapd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/openldap/slapd.tmpfiles b/testing/openldap/slapd.tmpfiles
deleted file mode 100644
index 5f63bd636..000000000
--- a/testing/openldap/slapd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-D /run/openldap 0750 ldap ldap -
diff --git a/testing/openmpi/PKGBUILD b/testing/openmpi/PKGBUILD
deleted file mode 100644
index 415e010a7..000000000
--- a/testing/openmpi/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 167134 2012-09-26 01:37:00Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-pkgname=openmpi
-pkgver=1.6.2
-pkgrel=1
-pkgdesc="High performance message passing library (MPI)"
-arch=('i686' 'x86_64')
-url="http://www.open-mpi.org"
-license=('custom')
-depends=('gcc-fortran' 'openssh' 'valgrind' 'libltdl' 'hwloc')
-makedepends=('inetutils')
-options=(!libtool)
-source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('694fd3bac911cdb22f77175884d819b6fea871df')
-
-build() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # Make sure we use the system ltdl librariry rather than the ones in the tarball
-   rm -r opal/libltdl
-
-   ./configure --prefix=/usr \
-               --sysconfdir=/etc/${pkgname} \
-               --mandir=/usr/share/man \
-               --enable-mpi-f90 \
-               --libdir=/usr/lib/${pkgname} \
-               --with-threads=posix \
-               --enable-smp-locks \
-               --with-valgrind \
-               --enable-memchecker \
-               --enable-debug \
-               --enable-pretty-print-stacktrace \
-               --without-slurm \
-               --with-hwloc=/usr \
-               --with-libltdl=/usr  \
-               FC=/usr/bin/gfortran \
-               LDFLAGS="$LDFLAGS -Wl,-z,noexecstack"
-
-   make
-}
-
-package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-   make DESTDIR="${pkgdir}" install
-
-   # FS#28583
-   install -d -m 755 "${pkgdir}"/usr/lib/pkgconfig
-   for i in ompi-c.pc ompi-cxx.pc ompi-f77.pc ompi-f90.pc ompi.pc; do
-      ln -sf /usr/lib/openmpi/pkgconfig/${i} "${pkgdir}"/usr/lib/pkgconfig/
-   done
-
-   # Openmpi's otfinfo conflicts with the one from texlive
-   mv "${pkgdir}"/usr/bin/otfinfo{,mpi}
-
-   # Openmpi's otfdump conflicts with the one from libotf
-   mv "${pkgdir}"/usr/bin/otfdump{,ompi}
-
-   # Remove dangling symlink
-   rm "${pkgdir}"/usr/share/man/man1/orteCC.1
-
-   install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d
-   echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf
-
-   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openssh/PKGBUILD b/testing/openssh/PKGBUILD
deleted file mode 100644
index a02c6e97e..000000000
--- a/testing/openssh/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 169589 2012-10-23 22:58:43Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=openssh
-pkgver=6.1p1
-pkgrel=3
-pkgdesc='Free version of the SSH connectivity tools'
-url='http://www.openssh.org/portable.html'
-license=('custom:BSD')
-arch=('i686' 'x86_64')
-makedepends=('linux-headers')
-depends=('krb5' 'openssl' 'libedit' 'ldns')
-optdepends=('xorg-xauth: X11 forwarding'
-            'x11-ssh-askpass: input passphrase in X')
-source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}.tar.gz"
-        'sshd.close-sessions'
-        'sshdgenkeys.service'
-        'sshd@.service'
-        'sshd.service'
-        'sshd.socket'
-        'sshd.confd'
-        'sshd.pam'
-        'sshd')
-sha1sums=('751c92c912310c3aa9cadc113e14458f843fc7b3'
-          '954bf1660aa32620c37034320877f4511b767ccb'
-          '6df5be396f8c593bb511a249a1453294d18a01a6'
-          'bd6eae36c7ef9efb7147778baad7858b81f2d660'
-          'f9af4a442b804ab661cec0edb25dd76dee16d8d2'
-          'e12fa910b26a5634e5a6ac39ce1399a132cf6796'
-          'ec102deb69cad7d14f406289d2fc11fee6eddbdd'
-          '659e3ee95c269014783ff8b318c6f50bf7496fbd'
-          '1488d4ed33cf3037accf4b0e1c7a7e90b6a097c7')
-
-backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd' 'etc/conf.d/sshd')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--libexecdir=/usr/lib/ssh \
-		--sysconfdir=/etc/ssh \
-		--with-ldns \
-		--with-libedit \
-		--with-ssl-engine \
-		--with-pam \
-		--with-privsep-user=nobody \
-		--with-kerberos5=/usr \
-		--with-xauth=/usr/bin/xauth \
-		--with-mantype=man \
-		--with-md5-passwords \
-		--with-pid-dir=/run \
-
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make tests ||
-	grep $USER /etc/passwd | grep -q /bin/false
-	# connect.sh fails when run with stupid login shell
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	rm "${pkgdir}"/usr/share/man/man1/slogin.1
-	ln -sf ssh.1.gz "${pkgdir}"/usr/share/man/man1/slogin.1.gz
-
-	install -Dm644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENCE"
-
-	install -Dm644 ../sshdgenkeys.service "${pkgdir}"/usr/lib/systemd/system/sshdgenkeys.service
-	install -Dm644 ../sshd@.service "${pkgdir}"/usr/lib/systemd/system/sshd@.service
-	install -Dm644 ../sshd.service "${pkgdir}"/usr/lib/systemd/system/sshd.service
-	install -Dm644 ../sshd.socket "${pkgdir}"/usr/lib/systemd/system/sshd.socket
-
-	install -Dm755 ../sshd.close-sessions "${pkgdir}/etc/rc.d/functions.d/sshd-close-sessions" # FS#17389
-	install -Dm644 ../sshd.confd "${pkgdir}"/etc/conf.d/sshd
-	install -Dm644 ../sshd.pam "${pkgdir}"/etc/pam.d/sshd
-	install -Dm755 ../sshd "${pkgdir}"/etc/rc.d/sshd
-
-	install -Dm755 contrib/findssl.sh "${pkgdir}"/usr/bin/findssl.sh
-	install -Dm755 contrib/ssh-copy-id "${pkgdir}"/usr/bin/ssh-copy-id
-	install -Dm644 contrib/ssh-copy-id.1 "${pkgdir}"/usr/share/man/man1/ssh-copy-id.1
-
-	sed \
-		-e '/^#ChallengeResponseAuthentication yes$/c ChallengeResponseAuthentication no' \
-		-e '/^#UsePAM no$/c UsePAM yes' \
-		-i "${pkgdir}"/etc/ssh/sshd_config
-}
diff --git a/testing/openssh/sshd b/testing/openssh/sshd
deleted file mode 100755
index d60804e84..000000000
--- a/testing/openssh/sshd
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/sshd
-
-PIDFILE=/run/sshd.pid
-PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
-	PID=
-	rm $PIDFILE 2>/dev/null
-fi
-
-case "$1" in
-	start)
-		stat_busy 'Starting Secure Shell Daemon'
-		/usr/bin/ssh-keygen -A
-		[[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			add_daemon sshd
-			stat_done
-		fi
-		;;
-	stop)
-		stat_busy 'Stopping Secure Shell Daemon'
-		[[ ! -z $PID ]] && kill $PID &> /dev/null
-		if [[ $? -gt 0 ]]; then
-			stat_fail
-		else
-			rm_daemon sshd
-			stat_done
-		fi
-		;;
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/openssh/sshd.close-sessions b/testing/openssh/sshd.close-sessions
deleted file mode 100644
index be2a709fc..000000000
--- a/testing/openssh/sshd.close-sessions
+++ /dev/null
@@ -1,17 +0,0 @@
-# Close sshd sessions before shutting down the network; see FS#17389.
-
-sshd_close_sessions () {
-	if ck_daemon sshd; then
-		return
-	fi
-	/etc/rc.d/sshd stop
-	stat_busy "Stopping Secure Shell Sessions"
-	for i in $(pgrep sshd); do
-		if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
-			kill $i
-		fi
-	done &>/dev/null
-	stat_done
-}
-
-add_hook shutdown_start sshd_close_sessions
diff --git a/testing/openssh/sshd.confd b/testing/openssh/sshd.confd
deleted file mode 100644
index 5ce7c0079..000000000
--- a/testing/openssh/sshd.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to sshd
-#
-SSHD_ARGS=""
diff --git a/testing/openssh/sshd.pam b/testing/openssh/sshd.pam
deleted file mode 100644
index aeef8be27..000000000
--- a/testing/openssh/sshd.pam
+++ /dev/null
@@ -1,13 +0,0 @@
-#%PAM-1.0
-#auth		required	pam_securetty.so	#Disable remote root
-auth		required	pam_unix.so
-auth		required	pam_env.so
-account		required	pam_nologin.so
-account		required	pam_unix.so
-account		required	pam_time.so
-password	required	pam_unix.so
-session		required	pam_unix_session.so
-session		required	pam_limits.so
-session         optional        pam_loginuid.so
--session	optional	pam_ck_connector.so nox11
--session	optional	pam_systemd.so
diff --git a/testing/openssh/sshd.service b/testing/openssh/sshd.service
deleted file mode 100644
index 633164e5d..000000000
--- a/testing/openssh/sshd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OpenSSH Daemon
-Wants=sshdgenkeys.service
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=/usr/sbin/sshd -D
-ExecReload=/bin/kill -HUP $MAINPID
-KillMode=process
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-
-# This service file runs an SSH daemon that forks for each incoming connection.
-# If you prefer to spawn on-demand daemons, use sshd.socket and sshd@.service.
diff --git a/testing/openssh/sshd.socket b/testing/openssh/sshd.socket
deleted file mode 100644
index e09e32869..000000000
--- a/testing/openssh/sshd.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Conflicts=sshd.service
-Wants=sshdgenkeys.service
-
-[Socket]
-ListenStream=22
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/testing/openssh/sshd@.service b/testing/openssh/sshd@.service
deleted file mode 100644
index 2fd9b0814..000000000
--- a/testing/openssh/sshd@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=OpenSSH Per-Connection Daemon
-After=sshdgenkeys.service
-
-[Service]
-ExecStart=-/usr/sbin/sshd -i
-StandardInput=socket
-StandardError=syslog
diff --git a/testing/openssh/sshdgenkeys.service b/testing/openssh/sshdgenkeys.service
deleted file mode 100644
index 8c27d7110..000000000
--- a/testing/openssh/sshdgenkeys.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=SSH Key Generation
-ConditionPathExists=|!/etc/ssh/ssh_host_key
-ConditionPathExists=|!/etc/ssh/ssh_host_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_ecdsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_dsa_key.pub
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key
-ConditionPathExists=|!/etc/ssh/ssh_host_rsa_key.pub
-
-[Service]
-ExecStart=/usr/bin/ssh-keygen -A
-Type=oneshot
-RemainAfterExit=yes
diff --git a/testing/openssh/tmpfiles.d b/testing/openssh/tmpfiles.d
deleted file mode 100644
index 7c5b26100..000000000
--- a/testing/openssh/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-d /var/empty 0755 root root -
diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD
deleted file mode 100644
index ea7443098..000000000
--- a/testing/openvpn/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 165397 2012-08-17 23:28:47Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=openvpn
-pkgver=2.2.2
-pkgrel=2
-pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
-arch=(i686 x86_64)
-url="http://openvpn.net/index.php/open-source.html"
-depends=('openssl' 'lzo2' 'iproute2')
-license=('custom')
-backup=(usr/share/openvpn/easy-rsa/vars
-        usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf
-        etc/conf.d/openvpn-tapdev)
-source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
-        http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc
-        openvpn@.service
-        openvpn.rc
-        openvpn-tapdev.rc
-        openvpn-tapdev.conf)
-md5sums=('c5181e27b7945fa6276d21873329c5c7'
-         '81ff11ec8cd9fc3c8bc646aae24c4298'
-         '44047df812a3fcd57a7e36a61732a9b9'
-         'a3809b9727f0c2af2d0770f5c7442db2'
-         'd2c48e970088d679dd3c2afd914ff731'
-         '722f483c9e3ce2ec66d3301aaf7cf3d5')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # Build openvpn
-  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
-    --prefix=/usr \
-    --enable-password-save \
-    --mandir=/usr/share/man \
-    --enable-iproute2
-  make
-
-  # Build plugins
-  for plug in auth-pam down-root; do
-    cd $srcdir/$pkgname-$pkgver/plugin/$plug
-    make
-  done
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  # Install openvpn
-  make DESTDIR=$pkgdir install
-  install -d -m755 $pkgdir/etc/openvpn
-  # Install examples
-  install -d -m755 $pkgdir/usr/share/openvpn
-  cp -r sample-config-files $pkgdir/usr/share/openvpn/examples
-  find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \;
-  find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \;
-  # Install license
-  install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-  # Install plugins
-  for plug in auth-pam down-root; do
-    cd $srcdir/$pkgname-$pkgver/plugin/$plug
-    install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so
-    cd -
-  done
-  # Install contrib
-  install -d -m755 $pkgdir/usr/share/openvpn/contrib
-  cp -r contrib $pkgdir/usr/share/openvpn
-  # Install easy-rsa
-  cd $srcdir/$pkgname-$pkgver
-  make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa
-  rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf
-  # Install rc scripts
-  install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn
-  install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev
-  install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev
-  install -D -m644 $srcdir/openvpn@.service $pkgdir/usr/lib/systemd/system/openvpn@.service
-}
diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf
deleted file mode 100644
index afa5586dd..000000000
--- a/testing/openvpn/openvpn-tapdev.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# /etc/conf.d/openvpn-tapdev
-#
-# Place openvpn-tapdev before network into your DAEMONS array
-# This will create permanent tap devices which you can use for bridging
-#
-# Example:
-# TAPDEVS="work home"
-# Will create two tap devices "work" and "home"
-#
-
-TAPDEVS=""
diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc
deleted file mode 100755
index 2c51f8248..000000000
--- a/testing/openvpn/openvpn-tapdev.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/openvpn-tapdev
-
-case "$1" in
-  start)
-    stat_busy "Creating tap devices for OpenVPN ... "
-    success=0
-    for tapdev in ${TAPDEVS}; do
-      stat_append "${tapdev} "
-      /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
-    done
-    if [ $success -eq 0 ]; then
-      add_daemon openvpn-tapdev
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Destroying tap devices for OpenVPN ..."
-    for tapdev in ${TAPDEVS}; do
-      stat_append "${tapdev} "
-      /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
-    done
-    rm_daemon openvpn-tapdev
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc
deleted file mode 100755
index 96c28b641..000000000
--- a/testing/openvpn/openvpn.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-CFGDIR="/etc/openvpn"
-STATEDIR="/var/run/openvpn"
-
-case "$1" in
-  start)
-    stat_busy "Starting OpenVPN ... "
-    success=0
-    mkdir -p "${STATEDIR}"
-    for cfg in "${CFGDIR}"/*.conf; do
-      stat_append "$(basename "${cfg}" .conf) "
-      /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$?
-    done
-    if [ $success -eq 0 ]; then
-      add_daemon openvpn
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping OpenVPN ..."
-    for pidfile in "${STATEDIR}"/*.pid; do
-      stat_append "$(basename "${pidfile}" .pid) "
-      kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null
-      rm -f "${pidfile}"
-    done
-    rm_daemon openvpn
-    stat_done
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/openvpn/openvpn@.service b/testing/openvpn/openvpn@.service
deleted file mode 100644
index c3de3bdf7..000000000
--- a/testing/openvpn/openvpn@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=OpenVPN connection to %i
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/sbin/openvpn --config /etc/openvpn/%i.conf --daemon openvpn@%i --cd /etc/openvpn
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/p11-kit/PKGBUILD b/testing/p11-kit/PKGBUILD
deleted file mode 100644
index babf57fa7..000000000
--- a/testing/p11-kit/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 165200 2012-08-12 20:42:41Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=p11-kit
-pkgver=0.13
-pkgrel=1
-pkgdesc="Library to work with PKCS#11 modules"
-arch=(i686 x86_64)
-url="http://p11-glue.freedesktop.org"
-license=('BSD')
-depends=(glibc)
-options=(!libtool)
-source=($url/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('3892bc07ff54b1b391aad4628911801d')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --with-module-path=/usr/lib/pkcs11
-  make
-}
-
-package() {
-  cd  $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/testing/pam/PKGBUILD b/testing/pam/PKGBUILD
deleted file mode 100644
index 8c82ad970..000000000
--- a/testing/pam/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 168471 2012-10-12 09:19:17Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=pam
-pkgver=1.1.6
-pkgrel=1
-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' 'pambase')
-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/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.archlinux.org/other/pam_unix2/pam_unix2-2.9.1.tar.bz2
-        pam_unix2-glibc216.patch
-        pam_namespace-build-1.1.6.patch)
-options=('!libtool' '!emptydirs')
-md5sums=('7b73e58b7ce79ffa321d408de06db2c4'
-         'da6a46e5f8cd3eaa7cbc4fc3a7e2b555'
-         'dac109f68e04a4df37575fda6001ea17'
-         '440a510164ba5eb69bf41e129746ff44')
-
-build() {
-  cd $srcdir/Linux-PAM-$pkgver
-  ./configure --libdir=/usr/lib
-  patch -Np0 -i ../pam_namespace-build-1.1.6.patch
-  make
-
-  cd $srcdir/pam_unix2-2.9.1
-  patch -Np1 -i ../pam_unix2-glibc216.patch
-  ./configure --libdir=/usr/lib
-  make
-}
-
-package() {
-  cd $srcdir/Linux-PAM-$pkgver
-  make DESTDIR=$pkgdir SCONFIGDIR=/etc/security install
-
-  # build pam_unix2 module
-  # source ftp://ftp.suse.com/pub/people/kukuk/pam/pam_unix2
-  cd $srcdir/pam_unix2-2.9.1
-  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/usr/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
-}
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/pam/pam_namespace-build-1.1.6.patch b/testing/pam/pam_namespace-build-1.1.6.patch
deleted file mode 100644
index aeabc234c..000000000
--- a/testing/pam/pam_namespace-build-1.1.6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/pam_namespace/Makefile~	2012-10-12 10:59:13.557550706 +0200
-+++ modules/pam_namespace/Makefile	2012-10-12 10:59:13.564217270 +0200
-@@ -869,7 +869,7 @@
- 
- 
- install-data-local:
--	mkdir -p $(namespaceddir)
-+	mkdir -p $(DESTDIR)$(namespaceddir)
- README: pam_namespace.8.xml namespace.conf.5.xml
- -include $(top_srcdir)/Make.xml.rules
- 
diff --git a/testing/pam/pam_unix2-glibc216.patch b/testing/pam/pam_unix2-glibc216.patch
deleted file mode 100644
index faa6a235f..000000000
--- a/testing/pam/pam_unix2-glibc216.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: pam_unix2-2.9.1/src/read-files.c
-===================================================================
---- pam_unix2-2.9.1.orig/src/read-files.c
-+++ pam_unix2-2.9.1/src/read-files.c
-@@ -30,8 +30,14 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <nss.h>
--#include <bits/libc-lock.h>
-+#include <pthread.h>
- #define __libc_lock_t pthread_mutex_t
-+#define __libc_lock_define_initialized(CLASS,NAME) \
-+  CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER;
-+#define __libc_lock_lock(NAME) \
-+  pthread_mutex_lock, (&(NAME))
-+#define __libc_lock_unlock(NAME) \
-+  pthread_mutex_unlock, (&(NAME))
- 
- #include "read-files.h"
- 
diff --git a/testing/pango/PKGBUILD b/testing/pango/PKGBUILD
deleted file mode 100644
index 1e6d3616c..000000000
--- a/testing/pango/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169163 2012-10-18 19:23:05Z jgc $ 
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=pango
-pkgver=1.32.1
-pkgrel=1
-pkgdesc="A library for layout and rendering of text"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('libthai' 'cairo' 'libxft' 'harfbuzz')
-makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introspection')
-options=('!libtool')
-install=pango.install
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('484babf7e1ac4bf959a0babe8168f180acb516932d70e2985de5f6e2961fcd82')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --with-included-modules=basic-fc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/pango"
-}
diff --git a/testing/pango/pango.install b/testing/pango/pango.install
deleted file mode 100644
index 73b0f5bf1..000000000
--- a/testing/pango/pango.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-	# we need to ldconfig first, in case xfree86's libs aren't
-	# in ld.so.cache yet
-	sbin/ldconfig -r .
-	usr/bin/pango-querymodules >etc/pango/pango.modules
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	if [ -f usr/etc/pango/pango.modules ]; then
-		rm usr/etc/pango/pango.modules
-	fi
-	post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-	rm etc/pango/pango.modules
-}
diff --git a/testing/pangox-compat/PKGBUILD b/testing/pangox-compat/PKGBUILD
deleted file mode 100644
index 13375e949..000000000
--- a/testing/pangox-compat/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169162 2012-10-18 19:23:02Z jgc $ 
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=pangox-compat
-pkgver=0.0.2
-pkgrel=1
-pkgdesc="X Window System font support for Pango"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('pango')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-url="http://www.pango.org/"
-sha256sums=('552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-static
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make -j1 DESTDIR="${pkgdir}" install
-}
diff --git a/testing/patch/PKGBUILD b/testing/patch/PKGBUILD
deleted file mode 100644
index fa4b51469..000000000
--- a/testing/patch/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 167233 2012-09-28 23:02:27Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=patch
-pkgver=2.7.1
-pkgrel=1
-pkgdesc="A utility to apply patch files to original sources"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/patch/patch.html"
-license=('GPL')
-groups=('base-devel')
-depends=('glibc')
-makedepends=('ed')
-optdepends=('ed: for patch -e functionality')
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('e9ae5393426d3ad783a300a338c09b72'
-         'b12189e0de3cb2af25268441647ec517')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=$pkgdir install
-}
diff --git a/testing/patch/patch-2.6.1-get-arg.patch b/testing/patch/patch-2.6.1-get-arg.patch
deleted file mode 100644
index 45f3bc8a5..000000000
--- a/testing/patch/patch-2.6.1-get-arg.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up patch-2.6.1/src/patch.c.get-arg patch-2.6.1/src/patch.c
---- patch-2.6.1/src/patch.c.get-arg	2010-07-27 18:05:26.217150510 +0100
-+++ patch-2.6.1/src/patch.c	2010-07-27 18:05:47.464150892 +0100
-@@ -558,7 +558,7 @@ static struct option const longopts[] =
-   {"remove-empty-files", no_argument, NULL, 'E'},
-   {"force", no_argument, NULL, 'f'},
-   {"fuzz", required_argument, NULL, 'F'},
--  {"get", no_argument, NULL, 'g'},
-+  {"get", required_argument, NULL, 'g'},
-   {"input", required_argument, NULL, 'i'},
-   {"ignore-whitespace", no_argument, NULL, 'l'},
- #ifdef ENABLE_MERGE
diff --git a/testing/pciutils/PKGBUILD b/testing/pciutils/PKGBUILD
deleted file mode 100644
index 2f747eb34..000000000
--- a/testing/pciutils/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 162650 2012-06-27 15:03:29Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pciutils
-pkgver=3.1.10
-pkgrel=1
-pkgdesc="PCI bus configuration space access library and tools"
-arch=(i686 x86_64)
-license=('GPL2')
-groups=('base')
-url="http://mj.ucw.cz/sw/pciutils/"
-depends=('glibc' 'hwids')
-source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-       ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz)
-md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-  cp lib/libpci.a "${srcdir}/"
-  make clean
-  make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man DESTDIR="${pkgdir}" install install-lib
-  install -m644 "${srcdir}/libpci.a" "${pkgdir}/usr/lib/"
-  # this is now supplied by the hwids package
-  rm -rf $pkgdir/usr/{sbin/update-pciids,share/{man/man8/update-pciids.8,hwdata}}
-}
diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD
deleted file mode 100644
index 8672846ce..000000000
--- a/testing/pcre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 163200 2012-07-09 01:30:40Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=pcre
-pkgver=8.31
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions"
-arch=('i686' 'x86_64')
-url="http://www.pcre.org/"
-license=('BSD')
-depends=('gcc-libs')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('1c9a276af932b5599157f96e945391f0'
-         '873bcd2cd9f1e0aa1e28e256b3e31506')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  
-  [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-  ./configure --prefix=/usr --enable-pcre16 --enable-jit \
-    --enable-utf8 --enable-unicode-properties
-  make
-}
-
-check() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/perl-sdl/PKGBUILD b/testing/perl-sdl/PKGBUILD
deleted file mode 100644
index 682be8a60..000000000
--- a/testing/perl-sdl/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 165797 2012-08-30 16:55:08Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-
-pkgname=perl-sdl
-pkgver=2.540
-pkgrel=2
-pkgdesc="Simple DirectMedia Layer for Perl"
-arch=(i686 x86_64)
-license=(LGPL)
-url="http://sdl.perl.org"
-depends=(perl-alien-sdl perl-tie-simple
-         sdl_net sdl_ttf sdl_image sdl_mixer sdl_gfx sdl_pango mesa smpeg)
-makedepends=('perl-module-build>=0.40')
-options=('!emptydirs')
-replaces=(sdl_perl)
-conflicts=(sdl_perl)
-provides=("sdl_perl=$pkgver")
-# http://search.cpan.org/dist/SDL/
-_author=JTPALMER
-source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/SDL-$pkgver.tar.gz)
-md5sums=('1a5d7849cbdfde4982b28458e38ab172')
-
-build() {
-  cd SDL-$pkgver
-  # Perl selects the proper CFLAGS set for binary modules
-  unset CFLAGS
-  # install module in vendor directories
-  perl Build.PL installdirs=vendor
-  perl Build
-}
-
-check() {
-  cd SDL-$pkgver
-  perl Build test || true
-}
-
-package() {
-  cd SDL-$pkgver
-  perl Build install destdir="$pkgdir"
-}
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 f5f8fa311..000000000
--- a/testing/perl/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 165042 2012-08-09 14:58:00Z 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.16.1
-pkgrel=1
-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)
-install=perl.install
-options=('makeflags' '!purge')
-md5sums=('b87358e2c461a898cfd7c334e7dd8993'
-         '5ed2542fdb9a60682f215bd33701e61a'
-         '1f0cbbee783e8a6d32f01be5118e0d5e'
-         '999c3eea6464860704abbb055a0f0896')
-
-# workaround to let the integrity check find the correct provides array
-if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then
-	true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p'))
-fi
-
-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}"
-  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
-}
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 d2cdc762e..000000000
--- a/testing/perl/provides.pl
+++ /dev/null
@@ -1,299 +0,0 @@
-# provides.pl
-##
-# Script for printing out a provides list of every CPAN distribution
-# that is bundled with perl. You can run it before building perl
-# or you can run it after building perl. Required modules are in core
-# for perl 5.13 and above.  It might be nice if this didn't require
-# HTTP::Tiny and maybe just used wget or curl.
-#
-# This script uses HTTP::Tiny to query Tatsuhiko Miyagawa's webapp at
-# cpanmetadb.plackperl.org to cross-reference module files to their
-# providing CPAN distribution. Thank you Miyagawa!
-#
-# - Justin "juster" Davis <jrcd83@gmail.com>
-
-use warnings 'FATAL' => 'all';
-use strict;
-
-package Common;
-
-sub evalver
-{
-    my ($path, $mod) = @_;
-
-    open my $fh, '<', $path or die "open $path: $!";
-
-    my $m = ($mod
-        ? qr/(?:\$${mod}::VERSION|\$VERSION)/
-        : qr/\$VERSION/);
-
-    while (my $ln = <$fh>) {
-        next unless $ln =~ /\s*$m\s*=\s*.+/;
-        chomp $ln;
-        my $ver = do { no strict; eval $ln };
-        return $ver unless $@;
-        die qq{$path:$. bad version string in "$ln"\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.plackperl.org/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/;
-        return if m{\Q$libdir\E[^/]+/t/}; # ignore testing modules
-        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, $mod) || 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 ed3272ed3..000000000
--- a/testing/php/PKGBUILD
+++ /dev/null
@@ -1,347 +0,0 @@
-# $Id: PKGBUILD 169085 2012-10-17 19:12:34Z 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.4.8
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('PHP')
-url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
-             'sqlite' '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"
-        'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
-        'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('bb8c816a9299be8995255ef70c63b800'
-         '0b0bc7a917fc592bdf11dcd3c5c255e9'
-         'dec2cbaad64e3abf4f0ec70e1de4e8e9'
-         '3cfde0cc4ed09b55f1ce531437a4eb88'
-         '5c1f4c967b66ce3eaf819b46951dcbf5'
-         'f56b5bb7e93c802ae8519182fbea3387'
-         'f8b206cb8fecb05cb1ded8bee45633ff'
-         'c60343df74f8e1afb13b084d5c0e47ed')
-
-build() {
-	phpconfig="--srcdir=../${pkgbase}-${pkgver} \
-		--config-cache \
-		--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 \
-		--disable-rpath \
-		--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-mbstring \
-		--enable-phar=shared \
-		--enable-posix=shared \
-		--enable-shmop=shared \
-		--enable-soap=shared \
-		--enable-sockets=shared \
-		--enable-sysvmsg=shared \
-		--enable-sysvsem=shared \
-		--enable-sysvshm=shared \
-		--enable-zip=shared \
-		--with-bz2=shared \
-		--with-curl=shared \
-		--with-db4=/usr \
-		--with-enchant=shared,/usr \
-		--with-freetype-dir=/usr \
-		--with-gd=shared \
-		--with-gdbm \
-		--with-gettext=shared \
-		--with-gmp=shared \
-		--with-iconv=shared \
-		--with-icu-dir=/usr \
-		--with-imap-ssl \
-		--with-imap=shared \
-		--with-jpeg-dir=/usr \
-		--with-vpx-dir=/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=/usr \
-		--with-pspell=shared \
-		--with-snmp=shared \
-		--with-sqlite3=shared,/usr \
-		--with-tidy=shared \
-		--with-unixODBC=shared,/usr \
-		--with-xmlrpc=shared \
-		--with-xsl=shared \
-		--with-zlib \
-		"
-
-	EXTENSION_DIR=/usr/lib/php/modules
-	export EXTENSION_DIR
-	PEAR_INSTALLDIR=/usr/share/pear
-	export PEAR_INSTALLDIR
-
-	cd ${srcdir}/${pkgbase}-${pkgver}
-
-	# 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='php-fpm.install'
-
-	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
-	install -D -m644 ${srcdir}/php-fpm.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/php-fpm.conf
-	install -D -m644 ${srcdir}/php-fpm.service ${pkgdir}/usr/lib/systemd/system/php-fpm.service
-}
-
-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 install-pear INSTALL_ROOT=${pkgdir}
-	rm -rf ${pkgdir}/usr/share/pear/.{channels,depdb,depdblock,filemap,lock,registry}
-}
-
-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' 'libvpx')
-	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' 'sqlite')
-	pkgdesc='sqlite 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 ac2d92a36..000000000
--- a/testing/php/logrotate.d.php-fpm
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/php-fpm.log {
-	missingok
-	notifempty
-	delaycompress
-	postrotate
-		kill -USR1 `cat /run/php-fpm/php-fpm.pid 2>/dev/null` 2>/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 d618fca4e..000000000
--- a/testing/php/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- sapi/fpm/php-fpm.conf.in	2012-08-15 06:26:05.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in	2012-08-16 14:17:41.809663595 +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
- ; If it's set to "syslog", log is sent to syslogd instead of being written
-@@ -148,7 +148,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 = /run/php-fpm/php-fpm.sock
- 
- ; Set listen(2) backlog.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -159,9 +160,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
-@@ -458,7 +459,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-fpm.install b/testing/php/php-fpm.install
deleted file mode 100644
index 41fc37c22..000000000
--- a/testing/php/php-fpm.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
-	if [[ ! -d run/php-fpm ]]; then
-		usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/php-fpm.conf
-	fi
-}
-
-post_upgrade() {
-	post_install
-}
diff --git a/testing/php/php-fpm.service b/testing/php/php-fpm.service
deleted file mode 100644
index fc5ead6f3..000000000
--- a/testing/php/php-fpm.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=The PHP FastCGI Process Manager
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/php-fpm/php-fpm.pid
-PrivateTmp=true
-ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
-ExecReload=/bin/kill -USR2 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/php/php-fpm.tmpfiles b/testing/php/php-fpm.tmpfiles
deleted file mode 100644
index 801e74f1e..000000000
--- a/testing/php/php-fpm.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/php-fpm 755 root root
diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch
deleted file mode 100644
index bbaae2152..000000000
--- a/testing/php/php.ini.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- php.ini-production	2012-03-29 06:17:59.000000000 +0200
-+++ php.ini-production	2012-03-30 10:46:21.181340861 +0200
-@@ -305,7 +305,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
-@@ -702,7 +702,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -725,7 +725,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"
- 
-@@ -859,51 +859,47 @@
- ; 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_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_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=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=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 a8cb9eca9..000000000
--- a/testing/php/rc.d.php-fpm
+++ /dev/null
@@ -1,144 +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
-
-	stat_done
-}
-
-case "$1" in
-	start)
-		test_config
-		stat_busy 'Starting php-fpm'
-
-		/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
-
-		if [ "$?" != 0 ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		wait_for_pid created /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 /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -QUIT `cat /run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /run/php-fpm/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 /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -TERM `cat /run/php-fpm/php-fpm.pid`
-
-		wait_for_pid removed /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 /run/php-fpm/php-fpm.pid ] ; then
-			stat_fail
-			exit 1
-		fi
-
-		kill -USR2 `cat /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/pidgin/PKGBUILD b/testing/pidgin/PKGBUILD
deleted file mode 100644
index f87f625dd..000000000
--- a/testing/pidgin/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# $Id: PKGBUILD 169161 2012-10-18 19:22:57Z jgc $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl>
-
-pkgname=('pidgin' 'libpurple' 'finch')
-pkgver=2.10.6
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pidgin.im/"
-license=('GPL')
-makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm'
-             'libidn' 'python2' 'hicolor-icon-theme' 'gstreamer0.10' 'avahi'
-             'tk' 'ca-certificates' 'intltool'
-             'networkmanager')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # Use Python 2
-  sed -i 's/env python$/&2/' */plugins/*.py \
-    libpurple/purple-{remote,notifications-example,url-handler}
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --disable-schemas-install \
-    --disable-meanwhile \
-    --disable-gnutls \
-    --enable-cyrus-sasl \
-    --disable-doxygen \
-    --enable-nm \
-    --disable-vv \
-    --with-python=/usr/bin/python2 \
-    --with-system-ssl-certs=/etc/ssl/certs
-    make
-}
-
-package_pidgin(){
-  pkgdesc="Multi-protocol instant messaging client"
-  depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm'
-           'hicolor-icon-theme')
-  optdepends=('aspell: for spelling correction')
-  install=pidgin.install
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C pidgin DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop
-
-  rm "$pkgdir/usr/share/man/man1/finch.1"
-}
-
-package_libpurple(){
-  pkgdesc="IM library extracted from Pidgin"
-  depends=('gstreamer0.10' 'libsasl' 'libidn' 'dbus-glib' 'nss')
-  optdepends=('avahi: Bonjour protocol support'
-              'ca-certificates: SSL CA certificates'
-              'python2-dbus: for purple-remote and purple-url-handler'
-              'tk: Tcl/Tk scripting support')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  for _dir in libpurple share/sounds share/ca-certs m4macros po; do
-    make -C "$_dir" DESTDIR="$pkgdir" install
-  done
-}
-
-package_finch(){
-  pkgdesc="A ncurses-based messaging client"
-  depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2')
-
-  cd "$srcdir/pidgin-$pkgver"
-
-  # For linking
-  make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES
-
-  make -C finch DESTDIR="$pkgdir" install
-  make -C doc DESTDIR="$pkgdir" install
-
-  # Remove files that are packaged in libpurle
-  make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES
-
-  rm "$pkgdir"/usr/share/man/man1/pidgin.1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/pidgin/pidgin.install b/testing/pidgin/pidgin.install
deleted file mode 100644
index 1a05f573e..000000000
--- a/testing/pidgin/pidgin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/pinentry/PKGBUILD b/testing/pinentry/PKGBUILD
deleted file mode 100644
index b1c76c880..000000000
--- a/testing/pinentry/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 166441 2012-09-07 20:18:41Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=pinentry
-pkgver=0.8.2
-pkgrel=1
-pkgdesc="a collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnupg.org/aegypten2"
-depends=('ncurses' 'libcap>=2.16')
-makedepends=('gtk2' 'qt')
-optdepends=('gtk2: for gtk2 backend'
-            'qt: for qt4 backend')  
-source=(ftp://ftp.gnupg.org/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
-        qt4-pinentry-window.patch)
-install=pinentry.install
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  #fix: https://bugs.archlinux.org/task/29998
-  patch -Np1 -i ../qt4-pinentry-window.patch
-  for file in qt4/*.moc; do
-       /usr/bin/moc ${file/.moc/.h} > ${file}
-   done
-  ./configure --prefix=/usr \
-	--enable-pinentry-curses \
-        --disable-pinentry-gtk \
-        --disable-pinentry-qt \
-	--enable-pinentry-gtk2 \
-        --enable-pinentry-qt4 \
-	--enable-fallback-curses
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install 
-}
-md5sums=('82e6114e5e27a8ab36f314b332a6e024'
-         '450b8713fe42f1bd93311ef84767c3d8')
diff --git a/testing/pinentry/pinentry.install b/testing/pinentry/pinentry.install
deleted file mode 100644
index eed2c7124..000000000
--- a/testing/pinentry/pinentry.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(pinentry.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
diff --git a/testing/pinentry/qt4-pinentry-window.patch b/testing/pinentry/qt4-pinentry-window.patch
deleted file mode 100644
index 8f9faae11..000000000
--- a/testing/pinentry/qt4-pinentry-window.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2ab12b3742c929a225c3753439438edc27bfa81 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 1 Feb 2011 14:42:27 +0100
-Subject: [PATCH] Fix qt4 pinentry window created in the background
-
-This is probably just a workaround. Proper fix is being investigated.
-See:
-https://bugzilla.redhat.com/show_bug.cgi?id=589532
-http://stackoverflow.com/questions/2788518/calling-activatewindow-on-qdialog-sends-window-to-background
----
- qt4/pinentrydialog.cpp |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
-index 541baf4..d634eb6 100644
---- a/qt4/pinentrydialog.cpp
-+++ b/qt4/pinentrydialog.cpp
-@@ -69,7 +69,6 @@ void raiseWindow( QWidget* w )
-     SetForegroundWindow( w->winId() );
- #endif
-     w->raise();
--    w->activateWindow();
- }
- 
- QPixmap icon( QStyle::StandardPixmap which )
--- 
-1.7.3.5
-
diff --git a/testing/pkg-config/PKGBUILD b/testing/pkg-config/PKGBUILD
deleted file mode 100644
index 0db10d836..000000000
--- a/testing/pkg-config/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 165565 2012-08-25 05:11:36Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=pkg-config
-pkgver=0.27.1
-pkgrel=1
-pkgdesc="A system for managing library compile/link flags"
-arch=('i686' 'x86_64')
-url="http://pkgconfig.freedesktop.org/wiki/"
-license=('GPL')
-groups=('base-devel')
-depends=('glib2')
-provides=("pkgconfig=${pkgver}")
-conflicts=('pkgconfig')
-replaces=('pkgconfig')
-source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('5392b4e3372879c5bf856173b418d6a2')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make check
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/polkit/PKGBUILD b/testing/polkit/PKGBUILD
deleted file mode 100644
index 70bb6e4d8..000000000
--- a/testing/polkit/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 169160 2012-10-18 19:22:54Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=polkit
-pkgver=0.107
-pkgrel=4
-pkgdesc="Application development toolkit for controlling system-wide privileges"
-arch=(i686 x86_64)
-license=('LGPL')
-url="http://www.freedesktop.org/wiki/Software/PolicyKit"
-depends=('glib2' 'pam' 'expat' 'libsystemd' 'js')
-makedepends=('intltool' 'gtk-doc' 'gobject-introspection')
-replaces=('policykit')
-options=('!libtool')
-install=polkit.install
-source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam fix-empty-wheel.patch)
-md5sums=('0e4f9c53f43fd1b25ac3f0d2e09b2ae1'
-         '6564f95878297b954f0572bc1610dd15'
-         'c99ab2a7919ad0b69fde4804c043b07f')
-
-build() {
-  cd $pkgname-$pkgver
-
-  # https://bugs.archlinux.org/task/31717
-  patch -Np1 -i ../fix-empty-wheel.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --disable-static --enable-gtk-doc
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  chown 102 "$pkgdir/etc/polkit-1/rules.d"
-  chown 102 "$pkgdir/usr/share/polkit-1/rules.d"
-
-  install -m644 "$srcdir/polkit.pam" "$pkgdir/etc/pam.d/polkit-1"
-}
diff --git a/testing/polkit/autogen.sh b/testing/polkit/autogen.sh
deleted file mode 100755
index d08b00a49..000000000
--- a/testing/polkit/autogen.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-# Run this to generate all the initial makefiles, etc.
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-DIE=0
-
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory $srcdir does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
-
-olddir=`pwd`
-cd "$srcdir"
-
-touch ChangeLog
-
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoconf installed."
-  echo "Download the appropriate package for your distribution,"
-  echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-(grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null) && {
-  (libtoolize --version) < /dev/null > /dev/null 2>&1 || {
-    echo
-    echo "**Error**: You must have libtool installed."
-    echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1
-  }
-}
-
-(gtkdocize --flavour no-tmpl) < /dev/null > /dev/null 2>&1 || {
-	echo
-	echo "You must have gtk-doc installed to compile $PROJECT."
-	echo "Install the appropriate package for your distribution,"
-	echo "or get the source tarball at http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
-	DIE=1
-}
-
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have automake installed."
-  echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-  NO_AUTOMAKE=yes
-}
-
-
-# if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: Missing aclocal.  The version of automake"
-  echo "installed doesn't appear recent enough."
-  echo "You can get automake from ftp://ftp.gnu.org/pub/gnu/"
-  DIE=1
-}
-
-
-# if no automake, don't bother testing for autoreconf
-test -n "$NO_AUTOMAKE" || (autoreconf --version) < /dev/null > /dev/null 2>&1 || {
-  echo
-  echo "**Error**: You must have autoreconf installed."
-  echo "You can get autoreconf from ..."
-  DIE=1
-}
-
-
-if test "$DIE" -eq 1; then
-  exit 1
-fi
-
-if test -z "$*"; then
-  echo "**Warning**: I am going to run configure with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo $0 " command line."
-  echo
-fi
-
-case $CC in
-xlc )
-  am_opt=--include-deps;;
-esac
-
-      aclocalinclude="$ACLOCAL_FLAGS"
-
-      echo "Running autoreconf on test/mocklibc ..."
-      (cd "test/mocklibc"; autoreconf --install)
-
-      if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
-	if test -z "$NO_LIBTOOLIZE" ; then 
-	  echo "Running libtoolize..."
-	  libtoolize --force --copy
-	fi
-      fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
-      echo "Running automake --gnu -Wno-portability $am_opt ..."
-      automake --add-missing --gnu -Wno-portability $am_opt
-      echo "Running autoconf ..."
-      autoconf
-
-intltoolize --copy --force --automake                  || exit 1
-
-cd "$olddir"
-
-conf_flags="--enable-maintainer-mode --enable-gtk-doc"
-
-if test x$NOCONFIGURE = x; then
-  echo "Running $srcdir/configure $conf_flags $@ ..."
-  $srcdir/configure $conf_flags "$@" \
-  && echo "Now type make to compile." || exit 1
-else
-  echo "Skipping configure process."
-fi
diff --git a/testing/polkit/fix-empty-wheel.patch b/testing/polkit/fix-empty-wheel.patch
deleted file mode 100644
index d6f99c43d..000000000
--- a/testing/polkit/fix-empty-wheel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fa04223240d46641b0773dbf9f7d72f529046bea Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Tue, 18 Sep 2012 18:47:06 +0000
-Subject: Fall back to authenticating as uid 0 if the list of admin identities is empty
-
-For example, this can happen if the wheel group has no members. This
-was reported in Red Hat bug 834494, see
-
- https://bugzilla.redhat.com/show_bug.cgi?id=834494
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/polkitbackend/polkitbackendinteractiveauthority.c b/src/polkitbackend/polkitbackendinteractiveauthority.c
-index 1d4a555..3bd2f0b 100644
---- a/src/polkitbackend/polkitbackendinteractiveauthority.c
-+++ b/src/polkitbackend/polkitbackendinteractiveauthority.c
-@@ -1293,15 +1293,11 @@ polkit_backend_interactive_authority_get_admin_identities (PolkitBackendInteract
-                                                            PolkitDetails                     *details)
- {
-   PolkitBackendInteractiveAuthorityClass *klass;
--  GList *ret;
-+  GList *ret = NULL;
- 
-   klass = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_CLASS (authority);
- 
--  if (klass->get_admin_identities == NULL)
--    {
--      ret = g_list_prepend (NULL, polkit_unix_user_new (0));
--    }
--  else
-+  if (klass->get_admin_identities != NULL)
-     {
-       ret = klass->get_admin_identities (authority,
-                                          caller,
-@@ -2257,6 +2253,10 @@ authentication_agent_initiate_challenge (AuthenticationAgent         *agent,
-         }
-     }
- 
-+  /* Fall back to uid 0 if no users are available (rhbz #834494) */
-+  if (user_identities == NULL)
-+    user_identities = g_list_prepend (NULL, polkit_unix_user_new (0));
-+
-   session = authentication_session_new (agent,
-                                         cookie,
-                                         subject,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/polkit/logind+ConsoleKit.patch b/testing/polkit/logind+ConsoleKit.patch
deleted file mode 100644
index 042d1043a..000000000
--- a/testing/polkit/logind+ConsoleKit.patch
+++ /dev/null
@@ -1,638 +0,0 @@
-From ba143769e17e4bbc1f2b0c88e735f993dfb3c873 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Tue, 7 Aug 2012 21:06:18 +0200
-Subject: [PATCH] session tracking: always require consolekit
-
-Only systemd is now optional at compile-time, and if enabled we fallback to consolekit
-at runtime, if not booted with systemd.
-
-Bits-stolen-from: Jan Alexander Steffens <jan.steffens@gmail.com>
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- configure.ac                                       |   6 +-
- src/polkit/polkitunixsession-systemd.c             |  96 ++++++-
- src/polkitbackend/polkitbackendjsauthority.c       |  10 +-
- .../polkitbackendsessionmonitor-systemd.c          | 313 +++++++++++++++++++--
- 4 files changed, 380 insertions(+), 45 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7a0d938..1d1e4ba 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -163,15 +163,15 @@ AC_ARG_ENABLE([libsystemd-login],
-               [enable_libsystemd_login=auto])
- if test "$enable_libsystemd_login" != "no"; then
-   PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN,
--                    [libsystemd-login],
-+                    [libsystemd-login libsystemd-daemon],
-                     have_libsystemd_login=yes,
-                     have_libsystemd_login=no)
-   if test "$have_libsystemd_login" = "yes"; then
--    SESSION_TRACKING=libsystemd-login
-+    SESSION_TRACKING="libsystemd-login (with ConsoleKit runtime fallback)"
-     AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available])
-   else
-     if test "$enable_libsystemd_login" = "yes"; then
--      AC_MSG_ERROR([libsystemd-login support requested but libsystemd-login library not found])
-+      AC_MSG_ERROR([libsystemd-login support requested but systemd libraries not found])
-     fi
-   fi
- fi
-diff --git a/src/polkit/polkitunixsession-systemd.c b/src/polkit/polkitunixsession-systemd.c
-index 8a8bf65..bb89044 100644
---- a/src/polkit/polkitunixsession-systemd.c
-+++ b/src/polkit/polkitunixsession-systemd.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (C) 2011 Red Hat, Inc.
-+ * Copyright (C) 2008, 2011 Red Hat, Inc.
-  *
-  * This library is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU Lesser General Public
-@@ -17,6 +17,7 @@
-  * Boston, MA 02111-1307, USA.
-  *
-  * Author: Matthias Clasen
-+ * Author: David Zeuthen <davidz@redhat.com>
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -31,6 +32,7 @@
- #include "polkitprivate.h"
- 
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- 
- /**
-  * SECTION:polkitunixsession
-@@ -367,9 +369,41 @@ polkit_unix_session_exists_sync (PolkitSubject   *subject,
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (subject);
-   gboolean ret = FALSE;
-   uid_t uid;
-+  GDBusConnection *connection; /* consolekit */
-+  GVariant *result; /* consolekit */
- 
--  if (sd_session_get_uid (session->session_id, &uid) == 0)
--    ret = TRUE;
-+  if (sd_booted())
-+    {
-+      if (sd_session_get_uid (session->session_id, &uid) == 0)
-+      ret = TRUE;
-+    }
-+  else /* consolekit */
-+    {
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            session->session_id,                    /* object path */
-+                                            "org.freedesktop.ConsoleKit.Session",   /* interface name */
-+                                            "GetUser",                              /* method */
-+                                            NULL, /* parameters */
-+                                            G_VARIANT_TYPE ("(u)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
-+
-+      ret = TRUE;
-+      g_variant_unref (result);
-+
-+     out:
-+      if (connection != NULL)
-+        g_object_unref (connection);
-+    }
- 
-   return ret;
- }
-@@ -451,29 +485,61 @@ polkit_unix_session_initable_init (GInitable     *initable,
-   PolkitUnixSession *session = POLKIT_UNIX_SESSION (initable);
-   gboolean ret = FALSE;
-   char *s;
-+  GDBusConnection *connection; /* consolekit */
-+  GVariant *result; /* consolekit */
-+  connection = NULL; /* consolekit */
- 
-   if (session->session_id != NULL)
-     {
-       /* already set, nothing to do */
--      ret = TRUE;
--      goto out;
-+      return TRUE;
-     }
- 
--  if (sd_pid_get_session (session->pid, &s) == 0)
-+  if (sd_booted())
-+    {
-+      if (sd_pid_get_session (session->pid, &s) == 0)
-+        {
-+          session->session_id = g_strdup (s);
-+          free (s);
-+          return TRUE;
-+        }
-+
-+      g_set_error (error,
-+                   POLKIT_ERROR,
-+                   POLKIT_ERROR_FAILED,
-+                   "No session for pid %d",
-+                  (gint) session->pid);
-+    }
-+  else /* consolekit */
-     {
--      session->session_id = g_strdup (s);
--      free (s);
-+      connection = g_bus_get_sync (G_BUS_TYPE_SYSTEM, cancellable, error);
-+      if (connection == NULL)
-+        goto out;
-+
-+      result = g_dbus_connection_call_sync (connection,
-+                                            "org.freedesktop.ConsoleKit",           /* name */
-+                                            "/org/freedesktop/ConsoleKit/Manager",  /* object path */
-+                                            "org.freedesktop.ConsoleKit.Manager",   /* interface name */
-+                                            "GetSessionForUnixProcess",             /* method */
-+                                            g_variant_new ("(u)", session->pid),    /* parameters */
-+                                            G_VARIANT_TYPE ("(o)"),
-+                                            G_DBUS_CALL_FLAGS_NONE,
-+                                            -1,
-+                                            cancellable,
-+                                            error);
-+      if (result == NULL)
-+        goto out;
-+
-+      g_variant_get (result, "(o)", &session->session_id);
-+      g_variant_unref (result);
-+
-       ret = TRUE;
--      goto out;
-     }
- 
--  g_set_error (error,
--               POLKIT_ERROR,
--               POLKIT_ERROR_FAILED,
--               "No session for pid %d",
--               (gint) session->pid);
-+ out:
-+  if (connection != NULL) /* consolekit */
-+    g_object_unref (connection);
- 
--out:
-   return ret;
- }
- 
-diff --git a/src/polkitbackend/polkitbackendjsauthority.c b/src/polkitbackend/polkitbackendjsauthority.c
-index bdfaa73..ee38739 100644
---- a/src/polkitbackend/polkitbackendjsauthority.c
-+++ b/src/polkitbackend/polkitbackendjsauthority.c
-@@ -36,6 +36,7 @@
- 
- #ifdef HAVE_LIBSYSTEMD_LOGIN
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- #endif /* HAVE_LIBSYSTEMD_LOGIN */
- 
- #include <jsapi.h>
-@@ -731,11 +732,14 @@ subject_to_jsval (PolkitBackendJsAuthority  *authority,
-     }
- 
- #ifdef HAVE_LIBSYSTEMD_LOGIN
--  if (sd_pid_get_session (pid, &session_str) == 0)
-+  if (sd_booted())
-     {
--      if (sd_session_get_seat (session_str, &seat_str) == 0)
-+      if (sd_pid_get_session (pid, &session_str) == 0)
-         {
--          /* do nothing */
-+          if (sd_session_get_seat (session_str, &seat_str) == 0)
-+            {
-+              /* do nothing */
-+            }
-         }
-     }
- #endif /* HAVE_LIBSYSTEMD_LOGIN */
-diff --git a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-index 58593c3..5114dfa 100644
---- a/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-+++ b/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
-@@ -26,11 +26,15 @@
- #include <string.h>
- #include <glib/gstdio.h>
- #include <systemd/sd-login.h>
-+#include <systemd/sd-daemon.h>
- #include <stdlib.h>
- 
- #include <polkit/polkit.h>
- #include "polkitbackendsessionmonitor.h"
- 
-+/* consolekit */
-+#define CKDB_PATH "/var/run/ConsoleKit/database"
-+
- /* <internal>
-  * SECTION:polkitbackendsessionmonitor
-  * @title: PolkitBackendSessionMonitor
-@@ -126,6 +130,11 @@ struct _PolkitBackendSessionMonitor
-   GDBusConnection *system_bus;
- 
-   GSource *sd_source;
-+
-+  /* consolekit */
-+  GKeyFile *database;
-+  GFileMonitor *database_monitor;
-+  time_t database_mtime;
- };
- 
- struct _PolkitBackendSessionMonitorClass
-@@ -148,6 +157,101 @@ G_DEFINE_TYPE (PolkitBackendSessionMonitor, polkit_backend_session_monitor, G_TY
- 
- /* ---------------------------------------------------------------------------------------------------- */
- 
-+/* consolekit */
-+static gboolean
-+reload_database (PolkitBackendSessionMonitor  *monitor,
-+                 GError                      **error)
-+{
-+  gboolean ret;
-+  struct stat statbuf;
-+
-+  ret = FALSE;
-+
-+  if (monitor->database != NULL)
-+    {
-+      g_key_file_free (monitor->database);
-+      monitor->database = NULL;
-+    }
-+
-+  if (stat (CKDB_PATH, &statbuf) != 0)
-+    {
-+      g_set_error (error,
-+                   G_IO_ERROR,
-+                   g_io_error_from_errno (errno),
-+                   "Error statting file " CKDB_PATH ": %s",
-+                   strerror (errno));
-+      goto out;
-+    }
-+
-+  monitor->database_mtime = statbuf.st_mtime;
-+
-+  monitor->database = g_key_file_new ();
-+  if (!g_key_file_load_from_file (monitor->database,
-+                                  CKDB_PATH,
-+                                  G_KEY_FILE_NONE,
-+                                  error))
-+    {
-+      goto out;
-+    }
-+
-+  ret = TRUE;
-+
-+ out:
-+  return ret;
-+}
-+
-+static gboolean
-+ensure_database (PolkitBackendSessionMonitor  *monitor,
-+		                 GError                      **error)
-+{
-+  gboolean ret = FALSE;
-+
-+  if (monitor->database != NULL)
-+    {
-+      struct stat statbuf;
-+
-+      if (stat (CKDB_PATH, &statbuf) != 0)
-+        {
-+          g_set_error (error,
-+                       G_IO_ERROR,
-+                       g_io_error_from_errno (errno),
-+                       "Error statting file " CKDB_PATH " to check timestamp: %s",
-+                       strerror (errno));
-+          goto out;
-+        }
-+      if (statbuf.st_mtime == monitor->database_mtime)
-+        {
-+          ret = TRUE;
-+          goto out;
-+        }
-+    }
-+
-+  ret = reload_database (monitor, error);
-+
-+ out:
-+  return ret;
-+}
-+
-+static void
-+on_file_monitor_changed (GFileMonitor     *file_monitor,
-+                         GFile            *file,
-+                         GFile            *other_file,
-+                         GFileMonitorEvent event_type,
-+                         gpointer          user_data)
-+{
-+  PolkitBackendSessionMonitor *monitor = POLKIT_BACKEND_SESSION_MONITOR (user_data);
-+
-+  /* throw away cache */
-+  if (monitor->database != NULL)
-+    {
-+      g_key_file_free (monitor->database);
-+      monitor->database = NULL;
-+    }
-+  g_signal_emit (monitor, signals[CHANGED_SIGNAL], 0);
-+}
-+
-+/* consolekit - end */
-+
- static gboolean
- sessions_changed (gpointer user_data)
- {
-@@ -163,6 +267,7 @@ static void
- polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
- {
-   GError *error;
-+  GFile *file; /* consolekit */
- 
-   error = NULL;
-   monitor->system_bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
-@@ -172,9 +277,41 @@ polkit_backend_session_monitor_init (PolkitBackendSessionMonitor *monitor)
-       g_error_free (error);
-     }
- 
--  monitor->sd_source = sd_source_new ();
--  g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
--  g_source_attach (monitor->sd_source, NULL);
-+  if (sd_booted())
-+    {
-+      monitor->sd_source = sd_source_new ();
-+      g_source_set_callback (monitor->sd_source, sessions_changed, monitor, NULL);
-+      g_source_attach (monitor->sd_source, NULL);
-+    }
-+  else /* consolekit */
-+    {
-+      error = NULL;
-+      if (!ensure_database (monitor, &error))
-+        {
-+          g_printerr ("Error loading " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+
-+      error = NULL;
-+      file = g_file_new_for_path (CKDB_PATH);
-+      monitor->database_monitor = g_file_monitor_file (file,
-+                                                       G_FILE_MONITOR_NONE,
-+                                                       NULL,
-+                                                       &error);
-+      g_object_unref (file);
-+      if (monitor->database_monitor == NULL)
-+        {
-+          g_printerr ("Error monitoring " CKDB_PATH ": %s", error->message);
-+          g_error_free (error);
-+        }
-+      else
-+        {
-+          g_signal_connect (monitor->database_monitor,
-+                            "changed",
-+                            G_CALLBACK (on_file_monitor_changed),
-+                            monitor);
-+        }
-+    }
- }
- 
- static void
-@@ -191,6 +328,14 @@ polkit_backend_session_monitor_finalize (GObject *object)
-       g_source_unref (monitor->sd_source);
-     }
- 
-+  /* consolekit */
-+  if (monitor->database_monitor != NULL)
-+    g_object_unref (monitor->database_monitor);
-+
-+  if (monitor->database != NULL)
-+    g_key_file_free (monitor->database);
-+  /* consolekit - end */
-+
-   if (G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize != NULL)
-     G_OBJECT_CLASS (polkit_backend_session_monitor_parent_class)->finalize (object);
- }
-@@ -258,6 +403,8 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
-                                                      GError                      **error)
- {
-   PolkitIdentity *ret;
-+  GError *local_error; /* consolekit */
-+  gchar *group; /* consolekit */
-   guint32 uid;
- 
-   ret = NULL;
-@@ -300,16 +447,38 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor
-   else if (POLKIT_IS_UNIX_SESSION (subject))
-     {
- 
--      if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
-+      if (sd_booted())
-         {
--          g_set_error (error,
--                       POLKIT_ERROR,
--                       POLKIT_ERROR_FAILED,
--                       "Error getting uid for session");
--          goto out;
-+          if (sd_session_get_uid (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)), &uid) < 0)
-+            {
-+              g_set_error (error,
-+                           POLKIT_ERROR,
-+                           POLKIT_ERROR_FAILED,
-+                           "Error getting uid for session");
-+              goto out;
-+            }
-+
-+          ret = polkit_unix_user_new (uid);
-+        }
-+      else /* consolekit */
-+        {
-+          if (!ensure_database (monitor, error))
-+            {
-+              g_prefix_error (error, "Error getting user for session: Error ensuring CK database at " CKDB_PATH ": ");
-+              goto out;
-+            }
-+
-+         group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (subject)));
-+         local_error = NULL;
-+         uid = g_key_file_get_integer (monitor->database, group, "uid", &local_error);
-+         if (local_error != NULL)
-+           {
-+             g_propagate_prefixed_error (error, local_error, "Error getting uid using " CKDB_PATH ": ");
-+             g_free (group);
-+             goto out;
-+           }
-+         g_free (group);
-         }
--
--      ret = polkit_unix_user_new (uid);
-     }
- 
-  out:
-@@ -337,20 +506,43 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
- 
-   if (POLKIT_IS_UNIX_PROCESS (subject))
-     {
--      gchar *session_id;
--      pid_t pid;
-+      if (sd_booted())
-+        {
-+          gchar *session_id;
-+          pid_t pid;
- 
--      pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
-+          pid = polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject));
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+          goto out;
- 
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+	}
-+      else /* consolekit */
-+        {
-+          const gchar *session_id;
-+          GVariant *result;
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject))),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                                -1, /* timeout_msec */
-+                                                NULL, /* GCancellable */
-+                                                error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else if (POLKIT_IS_SYSTEM_BUS_NAME (subject))
-     {
-       guint32 pid;
--      gchar *session_id;
-       GVariant *result;
- 
-       result = g_dbus_connection_call_sync (monitor->system_bus,
-@@ -369,11 +561,35 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
-       g_variant_get (result, "(u)", &pid);
-       g_variant_unref (result);
- 
--      if (sd_pid_get_session (pid, &session_id) < 0)
--        goto out;
-+      if (sd_booted())
-+        {
-+          gchar *session_id;
-+          if (sd_pid_get_session (pid, &session_id) < 0)
-+            goto out;
- 
--      session = polkit_unix_session_new (session_id);
--      free (session_id);
-+          session = polkit_unix_session_new (session_id);
-+          free (session_id);
-+        }
-+      else /* consolekit */
-+        {
-+          const gchar *session_id;
-+          result = g_dbus_connection_call_sync (monitor->system_bus,
-+                                                "org.freedesktop.ConsoleKit",
-+                                                "/org/freedesktop/ConsoleKit/Manager",
-+                                                "org.freedesktop.ConsoleKit.Manager",
-+                                                "GetSessionForUnixProcess",
-+                                                g_variant_new ("(u)", pid),
-+                                                G_VARIANT_TYPE ("(o)"),
-+                                                G_DBUS_CALL_FLAGS_NONE,
-+                                               -1, /* timeout_msec */
-+                                               NULL, /* GCancellable */
-+                                               error);
-+          if (result == NULL)
-+            goto out;
-+          g_variant_get (result, "(&o)", &session_id);
-+          session = polkit_unix_session_new (session_id);
-+          g_variant_unref (result);
-+        }
-     }
-   else
-     {
-@@ -389,12 +605,58 @@ polkit_backend_session_monitor_get_session_for_subject (PolkitBackendSessionMoni
-   return session;
- }
- 
-+static gboolean
-+get_boolean (PolkitBackendSessionMonitor *monitor,
-+             PolkitSubject               *session,
-+             const gchar                 *key_name)
-+{
-+  gboolean ret;
-+  gchar *group;
-+  GError *error;
-+
-+  ret = FALSE;
-+
-+  group = g_strdup_printf ("Session %s", polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+
-+  error = NULL;
-+  if (!ensure_database (monitor, &error))
-+    {
-+      g_printerr ("Error getting boolean `%s' in group `%s': Error ensuring CK database at " CKDB_PATH ": %s",
-+                  key_name,
-+                  group,
-+                  error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+
-+  error = NULL;
-+  ret = g_key_file_get_boolean (monitor->database, group, key_name, &error);
-+  if (error != NULL)
-+    {
-+      g_printerr ("Error looking %s using " CKDB_PATH " for %s: %s\n",
-+                  key_name,
-+                  group,
-+                  error->message);
-+      g_error_free (error);
-+      goto out;
-+    }
-+
-+ out:
-+  g_free (group);
-+  return ret;
-+}
-+
- gboolean
- polkit_backend_session_monitor_is_session_local (PolkitBackendSessionMonitor *monitor,
-                                                  PolkitSubject               *session)
- {
-   char *seat;
- 
-+  if (!sd_booted()) /* consolekit */
-+    {
-+      return get_boolean (monitor, session, "is_local");
-+    }
-+
-   if (!sd_session_get_seat (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)), &seat))
-     {
-       free (seat);
-@@ -409,6 +671,9 @@ gboolean
- polkit_backend_session_monitor_is_session_active (PolkitBackendSessionMonitor *monitor,
-                                                   PolkitSubject               *session)
- {
--  return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+  if (sd_booted())
-+    return sd_session_is_active (polkit_unix_session_get_session_id (POLKIT_UNIX_SESSION (session)));
-+  else /* consolekit */
-+    return get_boolean (monitor, session, "is_active");
- }
- 
--- 
-1.7.11.4
-
diff --git a/testing/polkit/polkit.install b/testing/polkit/polkit.install
deleted file mode 100644
index fbb98919e..000000000
--- a/testing/polkit/polkit.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-       getent group polkitd >/dev/null || groupadd -g 102 polkitd
-       getent passwd polkitd >/dev/null || useradd -c 'Policy Kit Daemon' -u 102 -g polkitd -d '/' -s /bin/false polkitd
-       passwd -l polkitd &>/dev/null
-}
-
-post_upgrade() {
-       post_install
-}
-
-post_remove() {
-       if getent passwd polkitd >/dev/null; then
-               userdel polkitd
-       fi
-       if getent group polkitd >/dev/null; then
-               groupdel polkitd
-       fi
-}
diff --git a/testing/polkit/polkit.pam b/testing/polkit/polkit.pam
deleted file mode 100644
index 04f53e0db..000000000
--- a/testing/polkit/polkit.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-password        required        pam_unix.so
diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD
deleted file mode 100644
index 790887f28..000000000
--- a/testing/poppler/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 169325 2012-10-19 13:28:44Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=poppler
-pkgname=('poppler' 'poppler-glib' 'poppler-qt')
-pkgver=0.20.5
-pkgrel=1
-arch=(i686 x86_64)
-license=('GPL')
-makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu')
-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)
-md5sums=('8a80ae83eb7a327b031808d09ee1d54d'
-         '9dc64c254a31e570507bdd4ad4ba629a')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-
-  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 || /bin/true
-}
-
-package_poppler() {
-  pkgdesc="PDF rendering library based on xpdf 3.0"
-  depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data')
-  conflicts=("poppler-qt3<${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  sed -e 's/^glib_subdir =.*/glib_subdir =/' \
-      -e 's/^qt4_subdir =.*/qt4_subdir =/' -i Makefile
-  make DESTDIR="${pkgdir}" install
-
-  rm -f "${pkgdir}"/usr/lib/pkgconfig/poppler-{glib,qt4}.pc
-}
-
-package_poppler-glib() {
-  pkgdesc="Poppler glib bindings"
-  depends=("poppler=${pkgver}" 'glib2')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/glib"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-  rm -f "${pkgdir}/usr/bin/poppler-glib-demo"
-}
-
-package_poppler-qt() {
-  pkgdesc="Poppler Qt bindings"
-  depends=("poppler=${pkgver}" 'qt')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/poppler"
-  make DESTDIR="${pkgdir}" install-libLTLIBRARIES
-  cd "${srcdir}/${pkgbase}-${pkgver}/qt4"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
-  install -m644 ../poppler-qt4.pc "${pkgdir}/usr/lib/pkgconfig/"
-  rm -f "${pkgdir}"/usr/lib/libpoppler.*
-}
diff --git a/testing/postfix/PKGBUILD b/testing/postfix/PKGBUILD
deleted file mode 100644
index 2a2e80e52..000000000
--- a/testing/postfix/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 163102 2012-07-07 03:16:44Z bisson $
-# Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=postfix
-pkgver=2.9.3
-pkgrel=2
-pkgdesc='Fast, easy to administer, secure mail server'
-url='http://www.postfix.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('pcre' 'libsasl' 'libldap' 'db'
-         'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb')
-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=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d'
-          '5fc3de6c7df1e5851a0a379e825148868808318b'
-          '40c6be2eb55e6437a402f43775cdb3d22ea87a66')
-
-provides=('smtp-server' 'smtp-forwarder')
-conflicts=('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 \
-		-DHAS_CDB \
-	' AUXLIBS=' \
-		-lsasl2 \
-		-lldap -llber \
-		-lssl -lcrypto \
-		-lmysqlclient -lz -lm \
-		-lpq \
-		-lsqlite3 -lpthread \
-		-lcdb \
-	' 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" \
-		readme_directory="/usr/share/doc/${pkgname}" \
-
-	install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}"
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files"
-	cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch
-}
diff --git a/testing/postfix/aliases.patch b/testing/postfix/aliases.patch
deleted file mode 100644
index 6767870b7..000000000
--- a/testing/postfix/aliases.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- etc/postfix/main.cf.orig	2010-12-13 20:18:22.000000000 +0100
-+++ etc/postfix/main.cf	2010-12-13 20:18:24.000000000 +0100
-@@ -382,6 +382,7 @@
- #alias_maps = hash:/etc/aliases
- #alias_maps = hash:/etc/aliases, nis:mail.aliases
- #alias_maps = netinfo:/aliases
-+alias_maps = hash:/etc/postfix/aliases
- 
- # The alias_database parameter specifies the alias database(s) that
- # are built with "newaliases" or "sendmail -bi".  This is a separate
-@@ -392,6 +393,7 @@
- #alias_database = dbm:/etc/mail/aliases
- #alias_database = hash:/etc/aliases
- #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
-+alias_database = $alias_maps
- 
- # ADDRESS EXTENSIONS (e.g., user+foo)
- #
diff --git a/testing/postfix/install b/testing/postfix/install
deleted file mode 100644
index cb97e2e6c..000000000
--- a/testing/postfix/install
+++ /dev/null
@@ -1,33 +0,0 @@
-post_install() {
-	getent group postdrop &>/dev/null || groupadd -g 75 postdrop >/dev/null
-	getent group postfix  &>/dev/null || groupadd -g 73 postfix  >/dev/null
-	getent passwd postfix &>/dev/null || useradd -u 73 -d /var/spool/postfix -g postfix -s /bin/false postfix >/dev/null
-
-	cd var/spool/postfix
-	chown postfix active bounce corrupt defer deferred flush hold incoming private public maildrop trace saved
-	chgrp postdrop public maildrop
-	cd ../../../usr/sbin
-	chgrp postdrop postqueue postdrop
-	chmod g+s postqueue postdrop
-	cd ../..
-	chown postfix var/lib/postfix
-
-	newaliases
-}
-
-post_upgrade() {
-	post_install
-
-	if [ `vercmp $2 2.9.0` = -1 ]; then cat <<EOF
-
-==> You must now run "postfix reload" due to inter-daemon protocol change.
-
-EOF
-	fi
-}
-
-pre_remove() {
-	getent passwd postfix &>/dev/null && userdel  postfix  >/dev/null
-	getent group postfix  &>/dev/null && groupdel postfix  >/dev/null
-	getent group postdrop &>/dev/null && groupdel postdrop >/dev/null
-}
diff --git a/testing/postfix/rc.d b/testing/postfix/rc.d
deleted file mode 100755
index fa314bb84..000000000
--- a/testing/postfix/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-name=postfix
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	/usr/sbin/postfix start &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	/usr/sbin/postfix stop &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-reload)
-	stat_busy "Reloading $name daemon"
-	/usr/sbin/postfix reload &>/dev/null \
-	&& { stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart|reload}"
-	;;
-esac
-exit 0
diff --git a/testing/postgresql-old-upgrade/PKGBUILD b/testing/postgresql-old-upgrade/PKGBUILD
deleted file mode 100644
index 0334899a9..000000000
--- a/testing/postgresql-old-upgrade/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 166685 2012-09-15 16:03:08Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgname=postgresql-old-upgrade
-pkgver=9.1.5
-_majorver=${pkgver%.*}
-pkgrel=1
-pkgdesc="Minimal PostgreSQL build for migrating between major versions with pg_upgrade"
-arch=('i686' 'x86_64')
-url="http://www.postgresql.org/"
-license=('custom:PostgreSQL')
-depends=("postgresql-libs>=${_majorver}" 'libxml2' 'openssl>=1.0.0')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
-
-build() {
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  ./configure --prefix=/opt/pgsql-${_majorver} \
-  --with-libxml --with-openssl --without-perl \
-  --without-python --with-pam --without-readline \
-  --with-system-tzdata=/usr/share/zoneinfo --disable-nls \
-  --enable-thread-safety
-
-  make -C src all
-}
-
-package() {
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install
-  make DESTDIR="${pkgdir}" -C src install
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-  # clean up unneeded installed items
-  rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
-}
-
-md5sums=('c784decb60615aa94c6a31601bc6ffd2')
-sha256sums=('0b889c132426fc68d8c2eb1bf112bf99cc653e9c95b5f4bbebc55cd9a8d6ce44')
diff --git a/testing/postgresql/PKGBUILD b/testing/postgresql/PKGBUILD
deleted file mode 100644
index 5863f2b73..000000000
--- a/testing/postgresql/PKGBUILD
+++ /dev/null
@@ -1,164 +0,0 @@
-# $Id: PKGBUILD 168645 2012-10-13 18:34:13Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-
-pkgbase=postgresql
-pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.2.1
-_majorver=${pkgver%.*}
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.postgresql.org/"
-license=('custom:PostgreSQL')
-makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0')
-source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-        postgresql-run-socket.patch
-        postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate
-        postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
-md5sums=('c0b4799ea9850eae3ead14f0a60e9418'
-         '75c579eed03ffb2312631f0b649175b4'
-         '1ddd1df8010549f237e7983bb326025e'
-         'a54d09a20ab1672adf08f037df188d53'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'd28e443f9f65a5712c52018b84e27137'
-         '89b48774b0dae7c37fbb0e907c3c1db8'
-         'd34e4ab6d589aa819a1e2829290a3b7c'
-         '505e0e4abfc746cae9558584d471a03c')
-sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461'
-            '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
-            '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
-            '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
-            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
-            '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
-            'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68'
-            'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07'
-            '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669')
-
-build() {
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  patch -Np1 < ../postgresql-run-socket.patch
-
-  ./configure --prefix=/usr \
-  --mandir=/usr/share/man \
-  --datadir=/usr/share/postgresql \
-  --sysconfdir=/etc \
-  --with-krb5 \
-  --with-libxml \
-  --with-openssl \
-  --with-perl \
-  --with-python PYTHON=/usr/bin/python2 \
-  --with-tcl \
-  --with-pam \
-  --with-system-tzdata=/usr/share/zoneinfo \
-  --enable-nls \
-  --enable-thread-safety
-
-  make world
-}
-
-package_postgresql-libs() {
-  pkgdesc="Libraries for use with PostgreSQL"
-  depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0')
-  provides=('postgresql-client')
-  conflicts=('postgresql-client')
-
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE"
-
-  # install libs
-  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
-    make -C ${dir} DESTDIR="${pkgdir}" install
-  done
-
-  install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
-  install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1"
-
-  cd src/include
-
-  mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
-
-  # these headers are needed by the public headers of the interfaces
-  install -m644 pg_config.h "${pkgdir}/usr/include/"
-  install -m644 pg_config_os.h "${pkgdir}/usr/include/"
-  install -m644 postgres_ext.h "${pkgdir}/usr/include/"
-  install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
-  install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
-
-  # these headers are needed by the not-so-public headers of the interfaces
-  install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
-}
-
-package_postgresql-docs() {
-  pkgdesc="HTML documentation for PostgreSQL"
-  options=(docs)
-
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE"
-
-  make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
-  chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
-
-  # clean up
-  rmdir "${pkgdir}"/usr/share/man/man{1,3,7}
-  rmdir "${pkgdir}"/usr/share/man
-}
-
-package_postgresql() {
-  pkgdesc="A sophisticated object-relational DBMS"
-  backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
-  depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0')
-  optdepends=('python2: for PL/Python support'
-              'perl: for PL/Perl support'
-              'tcl: for PL/Tcl support'
-              'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
-  install=postgresql.install
-
-  cd "${srcdir}/postgresql-${pkgver}"
-
-  # install
-  make DESTDIR="${pkgdir}" install
-  make -C contrib DESTDIR="${pkgdir}" install
-  make -C doc/src/sgml DESTDIR="${pkgdir}" install-man
-
-  # we don't want these, they are in the -libs package
-  for dir in src/interfaces src/bin/pg_config src/bin/psql; do
-    make -C ${dir} DESTDIR="${pkgdir}" uninstall
-  done
-  rm "${pkgdir}/usr/share/man/man1/pg_config.1"
-  rm "${pkgdir}/usr/share/man/man1/psql.1"
-
-  # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
-
-  # clean up unneeded installed items
-  rm -rf "${pkgdir}/usr/include/postgresql/internal"
-  rm -rf "${pkgdir}/usr/include/libpq"
-  find "${pkgdir}/usr/include" -maxdepth 1 -type f -execdir rm {} +
-  rmdir "${pkgdir}/usr/share/doc/postgresql/html"
-
-  # install launch script
-  install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql"
-  install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \
-    "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf"
-  install -D -m644 "${srcdir}/postgresql.service" \
-    "${pkgdir}/usr/lib/systemd/system/postgresql.service"
-  install -D -m755 "${srcdir}/postgresql-check-db-dir" \
-    "${pkgdir}/usr/bin/postgresql-check-db-dir"
-
-  # install conf file
-  install -D -m644 "${srcdir}/postgresql.confd" \
-    "${pkgdir}/etc/conf.d/postgresql"
-
-  install -D -m644 "${srcdir}/postgresql.pam" \
-    "${pkgdir}/etc/pam.d/postgresql"
-
-  install -D -m644 "${srcdir}/postgresql.logrotate" \
-    "${pkgdir}/etc/logrotate.d/postgresql"
-}
diff --git a/testing/postgresql/postgresql-check-db-dir b/testing/postgresql/postgresql-check-db-dir
deleted file mode 100755
index 542c82209..000000000
--- a/testing/postgresql/postgresql-check-db-dir
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# This script verifies that the postgresql data directory has been correctly
-# initialized.  We do not want to automatically initdb it, because that has
-# a risk of catastrophic failure (ie, overwriting a valuable database) in
-# corner cases, such as a remotely mounted database on a volume that's a
-# bit slow to mount.  But we can at least emit a message advising newbies
-# what to do.
-
-PGDATA="$1"
-
-if [ -z "$PGDATA" ]
-then
-    echo "Usage: $0 database-path"
-    exit 1
-fi
-
-# PGMAJORVERSION is major version
-PGMAJORVERSION=9.2
-# PREVMAJORVERSION is the previous major version, e.g., 8.4, for upgrades
-PREVMAJORVERSION=9.1
-
-# Check for the PGDATA structure
-if [ -f "$PGDATA/PG_VERSION" ] && [ -d "$PGDATA/base" ]
-then
-    # Check version of existing PGDATA
-    if [ x`cat "$PGDATA/PG_VERSION"` = x"$PGMAJORVERSION" ]
-    then
-        : A-OK
-    elif [ x`cat "$PGDATA/PG_VERSION"` = x"$PREVMAJORVERSION" ]
-    then
-        echo $"An old version of the database format was found."
-        echo $"See https://wiki.archlinux.org/index.php/PostgreSQL#Upgrading_PostgreSQL"
-        exit 1
-    else
-        echo $"An old version of the database format was found."
-        echo $"You need to dump and reload before using PostgreSQL $PGMAJORVERSION."
-        echo $"See http://www.postgresql.org/docs/9.2/static/upgrading.html"
-        exit 1
-    fi
-else
-    # No existing PGDATA! Warn the user to initdb it.
-    echo $"\"$PGDATA\" is missing or empty. Use a command like"
-    echo $"  su - postgres -c \"initdb --locale en_US.UTF-8 -D '$PGDATA'\""
-    echo $"with relevant options, to initialize the database cluster."
-    exit 1
-fi
-
-exit 0
diff --git a/testing/postgresql/postgresql-initdb b/testing/postgresql/postgresql-initdb
deleted file mode 100755
index a691a83ff..000000000
--- a/testing/postgresql/postgresql-initdb
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /etc/conf.d/postgresql
-
-# 2nd clause is necessary to prevent symlinking the directory to itself when it
-# doesn't exist yet
-if [ ! /var/lib/postgres -ef "$PGROOT" ] && [ /var/lib/postgres != "$PGROOT" ]; then
-    echo "Creating symlink /var/lib/postgres -> $PGROOT"
-
-    # Remove /var/lib/postgres if empty dir, but not if symlink
-    if [ ! -L /var/lib/postgres ] && [ -d /var/lib/postgres ]; then
-        rmdir /var/lib/postgres
-    fi
-
-    ln -sf "$PGROOT" /var/lib/postgres
-fi
-
-PGDATA="$PGROOT/data"
-
-if [ ! -d "$PGDATA" ]; then
-    echo "Initializing database in $PGDATA"
-
-    mkdir -p "$PGDATA"
-    chown -R postgres:postgres "$PGDATA"
-
-    su - postgres -m -c "/usr/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null
-
-    if [ -f /etc/postgresql/postgresql.conf ]; then
-        ln -sf /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
-    fi
-fi
diff --git a/testing/postgresql/postgresql-run-socket.patch b/testing/postgresql/postgresql-run-socket.patch
deleted file mode 100644
index b558c7b74..000000000
--- a/testing/postgresql/postgresql-run-socket.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h
---- postgresql-9.2.0.sockets/src/include/pg_config_manual.h	2012-09-06 17:26:17.000000000 -0400
-+++ postgresql-9.2.0/src/include/pg_config_manual.h	2012-09-06 18:13:18.183092471 -0400
-@@ -144,7 +144,7 @@
-  * here's where to twiddle it.  You can also override this at runtime
-  * with the postmaster's -k switch.
-  */
--#define DEFAULT_PGSOCKET_DIR  "/tmp"
-+#define DEFAULT_PGSOCKET_DIR  "/run/postgresql"
- 
- /*
-  * The random() function is expected to yield values between 0 and
diff --git a/testing/postgresql/postgresql.confd b/testing/postgresql/postgresql.confd
deleted file mode 100644
index 6001c16d1..000000000
--- a/testing/postgresql/postgresql.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-##
-## Parameters to be passed to postgresql
-##
-## Default data directory location
-#PGROOT="/var/lib/postgres"
-## Passed to initdb if necessary
-INITOPTS="--locale en_US.UTF-8"
-## Default log file location
-#PGLOG="/var/log/postgresql.log"
-## Additional options to pass via pg_ctl's '-o' option
-#PGOPTS=""
diff --git a/testing/postgresql/postgresql.install b/testing/postgresql/postgresql.install
deleted file mode 100644
index 263bccb25..000000000
--- a/testing/postgresql/postgresql.install
+++ /dev/null
@@ -1,34 +0,0 @@
-post_install() {
-  if [ ! -d '/var/lib/postgres' ]; then
-    mkdir -p '/var/lib/postgres'
-  fi
-  if ! getent group postgres >/dev/null; then
-    groupadd -g 88 postgres
-  fi
-  if ! getent passwd postgres >/dev/null; then
-    useradd -c 'PostgreSQL user' -u 88 -g postgres -d '/var/lib/postgres' -s /bin/bash postgres
-    passwd -l postgres >/dev/null
-  fi
-}
-
-post_upgrade() {
-  post_install $1
-  # FS#23858, fix postgres user shell issue
-  postgres_shell=$(getent passwd postgres | cut -d: -f7)
-  if [ "$postgres_shell" = "/sbin/nologin" ]; then
-    chsh -s /bin/bash postgres
-  fi
-  if [ $(vercmp $2 '9.2.1-2') -lt 0 ]; then
-    echo "Note: The Unix domain socket location has changed; be sure to"
-    echo "      restart any local applications using libpq.so."
-  fi
-}
-
-post_remove() {
-  if getent passwd postgres >/dev/null; then
-    userdel postgres
-  fi
-  if getent group postgres >/dev/null; then
-    groupdel postgres
-  fi
-}
diff --git a/testing/postgresql/postgresql.logrotate b/testing/postgresql/postgresql.logrotate
deleted file mode 100644
index 9c36918be..000000000
--- a/testing/postgresql/postgresql.logrotate
+++ /dev/null
@@ -1,4 +0,0 @@
-/var/log/postgresql.log {
-   copytruncate
-   missingok
-}
diff --git a/testing/postgresql/postgresql.pam b/testing/postgresql/postgresql.pam
deleted file mode 100644
index 53724d1f8..000000000
--- a/testing/postgresql/postgresql.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
diff --git a/testing/postgresql/postgresql.rcd b/testing/postgresql/postgresql.rcd
deleted file mode 100755
index f3600b30b..000000000
--- a/testing/postgresql/postgresql.rcd
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/postgresql
-
-# Default PGROOT if it wasn't defined in the conf.d file
-PGROOT=${PGROOT:-/var/lib/postgres}
-PGLOG=${PGLOG:-/var/log/postgresql.log}
-PGCTL_BIN=/usr/bin/pg_ctl
-PGCTL_ARGS=(-D "$PGROOT/data" -l "$PGLOG" -s -w)
-[[ $PGOPTS ]] && PGCTL_ARGS+=(-o "$PGOPTS")
-
-postgres_init() {
-  # initialization
-  if [[ ! -d "$PGROOT/data" ]]; then
-    mkdir -p "$PGROOT/data" && chown -R postgres:postgres "$PGROOT"
-    su - postgres -c "/usr/bin/initdb $INITOPTS -D '$PGROOT/data'"
-  fi
-  if [[ ! -e "$PGLOG" ]]; then
-    touch "$PGLOG"
-    chown postgres "$PGLOG"
-  fi
-}
-
-do_postgres() {
-  su - postgres -c "'$PGCTL_BIN' $(printf '%q ' "${PGCTL_ARGS[@]}" "$@")"
-}
-
-case $1 in
-  start)
-    postgres_init
-    stat_busy "Starting PostgreSQL"
-    if do_postgres start; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PostgreSQL"
-    if do_postgres stop -m fast; then
-      rm_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading PostgreSQL"
-    if do_postgres reload; then
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  restart)
-    postgres_init
-    stat_busy "Restarting PostgreSQL"
-    if do_postgres restart -m fast; then
-      add_daemon postgresql
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  status)
-    stat_busy "Checking PostgreSQL status";
-    ck_status postgresql
-    ;;
-  *)
-    echo "usage: $0 {start|stop|reload|restart|status}"
-    exit 1
-esac
diff --git a/testing/postgresql/postgresql.service b/testing/postgresql/postgresql.service
deleted file mode 100644
index 294b66e8f..000000000
--- a/testing/postgresql/postgresql.service
+++ /dev/null
@@ -1,26 +0,0 @@
-[Unit]
-Description=PostgreSQL database server
-After=network.target
-
-[Service]
-Type=forking
-TimeoutSec=120
-User=postgres
-Group=postgres
-
-Environment=PGROOT=/var/lib/postgres
-
-SyslogIdentifier=postgres
-PIDFile=/var/lib/postgres/data/postmaster.pid
-
-ExecStartPre=/usr/bin/postgresql-check-db-dir ${PGROOT}/data
-ExecStart= /usr/bin/pg_ctl -s -D ${PGROOT}/data start -w -t 120
-ExecReload=/usr/bin/pg_ctl -s -D ${PGROOT}/data reload
-ExecStop=  /usr/bin/pg_ctl -s -D ${PGROOT}/data stop -m fast
-
-# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in
-# killing Postgres, so adjust it downward
-OOMScoreAdjust=-200
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/postgresql/postgresql.tmpfiles.conf b/testing/postgresql/postgresql.tmpfiles.conf
deleted file mode 100644
index 6c48e34ed..000000000
--- a/testing/postgresql/postgresql.tmpfiles.conf
+++ /dev/null
@@ -1 +0,0 @@
-d /run/postgresql 0755 postgres postgres -
diff --git a/testing/ppl/PKGBUILD b/testing/ppl/PKGBUILD
deleted file mode 100644
index f7ad1798b..000000000
--- a/testing/ppl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 162818 2012-07-01 07:04:36Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: ezzetabi <ezzetabi at gawab dot com>
-
-pkgname=ppl
-pkgver=1.0
-pkgrel=1
-pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
-arch=('i686' 'x86_64')
-url="http://bugseng.com/products/ppl"
-license=('GPL3')
-depends=('gmp>=5.0')
-options=('!docs' '!libtool')
-source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
-md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c'
-         '5f490df826c76fed296060ca8fca4eb5')
-
-build() {
-  cd $srcdir/ppl-$pkgver
-  ./configure --prefix=/usr --enable-interfaces="c,cxx"
-  make
-}
-
-check() {
-  cd $srcdir/ppl-$pkgver
-  make check
-}
-
-package() {
-  cd $srcdir/ppl-$pkgver
-  make DESTDIR=$pkgdir install
-}
-
diff --git a/testing/ppp/PKGBUILD b/testing/ppp/PKGBUILD
deleted file mode 100644
index 9d3bacfb0..000000000
--- a/testing/ppp/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 168656 2012-10-13 20:46:01Z thomas $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-pkgname=ppp
-pkgver=2.4.5
-pkgrel=5
-pkgdesc="A daemon which implements the Point-to-Point Protocol for dial-up networking"
-arch=(i686 x86_64) 
-url="http://www.samba.org/ppp/"
-license=('custom:GPL/BSD')
-groups=('base')
-depends=('glibc' 'libpcap>=1.0.0')
-backup=(etc/ppp/{chap-secrets,pap-secrets,options,ip-up,ip-down})
-source=(ftp://ftp.samba.org/pub/ppp/ppp-${pkgver}.tar.gz
-        options
-        pon
-        poff
-        ppp
-        plog
-        pon.1
-        ip-up
-        ip-down
-        ip-up.d.dns.sh
-        ip-down.d.dns.sh
-        ipv6-up
-        ipv6-down
-        ipv6-up.d.iface-config.sh
-        ppp.systemd)
-md5sums=('4621bc56167b6953ec4071043fe0ec57'
-         '7a9259a8f038073eeea7e4552ff1849f'
-         '48c024f73a80c8b69c4def22f86902cc'
-         '2d811f8470ccdea3b8c4505a438483e9'
-         '7561c73b557292d5ba1a9c5dbd270fde'
-         '86cdaf133f7a79fb464f02d83afc7734'
-         '44cc662ba9aa61dd9add3ddd4c5ded57'
-         'e4beb16ed600b61336d50b2bd2df7cd5'
-         '529b924f644f80cf30d72a966abc7419'
-         '4a074d74c29625b254a1db720cb87b99'
-         '8d1be5af8e46393ba6eb273377831e38'
-         '4cbd0a9af01c27067450ec7d3f5fa673'
-         'b75c2fbc4afa9f2d8108b680c88c7036'
-         '9dde53aa5a931ebe1c7e3469199777c5'
-         'fafead5c9d66d0574e6f0a2e5f4d4631')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix CFLAGS
-  # -D_GNU_SOURCE is needed for IPv6 to work apparently
-  export CFLAGS="$CFLAGS -D_GNU_SOURCE"
-  sed -i "s:-O2 -pipe -Wall -g:${CFLAGS}:" pppd/Makefile.linux
-  sed -i "s:-g -O2:${CFLAGS}:" pppd/plugins/Makefile.linux
-  sed -i "s:-O2:${CFLAGS}:" pppstats/Makefile.linux
-  sed -i "s:-O2 -g -pipe:${CFLAGS}:" chat/Makefile.linux
-  sed -i "s:-O:${CFLAGS}:" pppdump/Makefile.linux
-
-  # enable active filter
-  sed -i "s:^#FILTER=y:FILTER=y:" pppd/Makefile.linux
-  # enable ipv6 support
-  sed -i "s:^#HAVE_INET6=y:HAVE_INET6=y:" pppd/Makefile.linux
-  # Enable Microsoft proprietary Callback Control Protocol
-  sed -i "s:^#CBCP=y:CBCP=y:" pppd/Makefile.linux 
-  
-  # Fix build error with recent kernels
-  rm include/linux/if_pppol2tp.h 
-
-  ./configure --prefix=/usr
-  make 
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/usr" install 
-  install -D -m644 ../options "${pkgdir}/etc/ppp/options"
-  install -D -m755 ../ip-up   "${pkgdir}/etc/ppp/ip-up"
-  install -D -m755 ../ip-down "${pkgdir}/etc/ppp/ip-down"
-  install -d -m755 "${pkgdir}/etc/ppp/ip-up.d"
-  install -d -m755 "${pkgdir}/etc/ppp/ip-down.d"
-  install -m755 ../ip-up.d.dns.sh   "${pkgdir}/etc/ppp/ip-up.d/00-dns.sh"
-  install -m755 ../ip-down.d.dns.sh "${pkgdir}/etc/ppp/ip-down.d/00-dns.sh"
-  install -D -m755 ../ipv6-up   "${pkgdir}/etc/ppp/ipv6-up"
-  install -D -m755 ../ipv6-down "${pkgdir}/etc/ppp/ipv6-down"
-  install -d -m755 "${pkgdir}/etc/ppp/ipv6-up.d"
-  install -d -m755 "${pkgdir}/etc/ppp/ipv6-down.d"
-  install -m755 ../ipv6-up.d.iface-config.sh "${pkgdir}/etc/ppp/ipv6-up.d/00-iface-config.sh"
-  install -D -m755 ../pon  "${pkgdir}/usr/bin/pon"
-  install -D -m755 ../poff "${pkgdir}/usr/bin/poff"
-  install -D -m755 ../plog "${pkgdir}/usr/sbin/plog"
-  install -D -m600 etc.ppp/pap-secrets  "${pkgdir}/etc/ppp/pap-secrets"
-  install -D -m600 etc.ppp/chap-secrets "${pkgdir}/etc/ppp/chap-secrets"
-  install -D -m755 ${srcdir}/ppp "${pkgdir}/etc/rc.d/ppp"
-  install -D -m644 ${srcdir}/pon.1 "${pkgdir}/usr/share/man/man1/pon.1"
-  install -d -m755 "${pkgdir}/etc/ppp/peers" 
-  chmod 0755 "${pkgdir}/usr/lib/pppd/${pkgver}"/*.so
-  install -D -m644 "${srcdir}"/ppp.systemd "${pkgdir}"/usr/lib/systemd/system/ppp@.service
-}
diff --git a/testing/ppp/ip-down b/testing/ppp/ip-down
deleted file mode 100644
index cfd3ae093..000000000
--- a/testing/ppp/ip-down
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script is run by pppd after the connection has ended.
-#
-
-# Execute all scripts in /etc/ppp/ip-down.d/
-for ipdown in /etc/ppp/ip-down.d/*.sh; do
-  if [ -x $ipdown ]; then
-    # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam
-    $ipdown "$@"
-  fi
-done
diff --git a/testing/ppp/ip-down.d.dns.sh b/testing/ppp/ip-down.d.dns.sh
deleted file mode 100644
index 9e19f7d1b..000000000
--- a/testing/ppp/ip-down.d.dns.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-[ -e /etc/resolv.conf.backup.${IFNAME} ] && mv /etc/resolv.conf.backup.${IFNAME} /etc/resolv.conf
diff --git a/testing/ppp/ip-up b/testing/ppp/ip-up
deleted file mode 100644
index 20473d73a..000000000
--- a/testing/ppp/ip-up
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script is run by pppd when there's a successful ppp connection.
-#
-
-# Execute all scripts in /etc/ppp/ip-up.d/
-for ipup in /etc/ppp/ip-up.d/*.sh; do
-  if [ -x $ipup ]; then
-    # Parameters: interface-name tty-device speed local-IP-address remote-IP-address ipparam
-    $ipup "$@"
-  fi
-done
diff --git a/testing/ppp/ip-up.d.dns.sh b/testing/ppp/ip-up.d.dns.sh
deleted file mode 100644
index f9df543a4..000000000
--- a/testing/ppp/ip-up.d.dns.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ "$USEPEERDNS" = "1" -a -f /etc/ppp/resolv.conf ]; then
-  [ -e /etc/resolv.conf ] && mv /etc/resolv.conf /etc/resolv.conf.backup.${IFNAME}
-  mv /etc/ppp/resolv.conf /etc/resolv.conf
-  chmod 644 /etc/resolv.conf
-fi
diff --git a/testing/ppp/ipv6-down b/testing/ppp/ipv6-down
deleted file mode 100644
index d3b9e28b3..000000000
--- a/testing/ppp/ipv6-down
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script is run by pppd after the connection has ended.
-#
-
-# Execute all scripts in /etc/ppp/ipv6-down.d/
-for ipdown in /etc/ppp/ipv6-down.d/*.sh; do
-  if [ -x $ipdown ]; then
-    # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam
-    $ipdown "$@"
-  fi
-done
diff --git a/testing/ppp/ipv6-up b/testing/ppp/ipv6-up
deleted file mode 100644
index b294aafdc..000000000
--- a/testing/ppp/ipv6-up
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# This script is run by pppd when there's a successful ppp connection.
-#
-
-# Execute all scripts in /etc/ppp/ipv6-up.d/
-for ipup in /etc/ppp/ipv6-up.d/*.sh; do
-  if [ -x $ipup ]; then
-    # Parameters: interface-name tty-device speed local-link-local-address remote-link-local-address ipparam
-    $ipup "$@"
-  fi
-done
diff --git a/testing/ppp/ipv6-up.d.iface-config.sh b/testing/ppp/ipv6-up.d.iface-config.sh
deleted file mode 100644
index b23d6f61d..000000000
--- a/testing/ppp/ipv6-up.d.iface-config.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo 0 > /proc/sys/net/ipv6/conf/$1/use_tempaddr
-echo 2 > /proc/sys/net/ipv6/conf/$1/accept_ra
diff --git a/testing/ppp/options b/testing/ppp/options
deleted file mode 100644
index 63691842c..000000000
--- a/testing/ppp/options
+++ /dev/null
@@ -1,352 +0,0 @@
-# /etc/ppp/options
-# 
-# Originally created by Jim Knoble <jmknoble@mercury.interpath.net>
-# Modified for Debian by alvar Bray <alvar@meiko.co.uk>
-# Modified for PPP Server setup by Christoph Lameter <clameter@debian.org>
-# Modified for ArchLinux by Manolis Tzanidakis <manolis@archlinux.org>
-#
-# To quickly see what options are active in this file, use this command:
-#   egrep -v '#|^ *$' /etc/ppp/options
-
-# Specify which DNS Servers the incoming Win95 or WinNT Connection should use
-# Two Servers can be remotely configured
-# ms-dns 192.168.1.1
-# ms-dns 192.168.1.2
-
-# Specify which WINS Servers the incoming connection Win95 or WinNT should use
-# ms-wins 192.168.1.50
-# ms-wins 192.168.1.51
-
-# Run the executable or shell command specified after pppd has
-# terminated the link.  This script could, for example, issue commands
-# to the modem to cause it to hang up if hardware modem control signals
-# were not available.
-#disconnect "chat -- \d+++\d\c OK ath0 OK"
-
-# async character map -- 32-bit hex; each bit is a character
-# that needs to be escaped for pppd to receive it.  0x00000001
-# represents '\x01', and 0x80000000 represents '\x1f'.
-asyncmap 0
-
-# Require the peer to authenticate itself before allowing network
-# packets to be sent or received.
-# Please do not disable this setting. It is expected to be standard in
-# future releases of pppd. Use the call option (see manpage) to disable
-# authentication for specific peers.
-auth
-
-# Use hardware flow control (i.e. RTS/CTS) to control the flow of data
-# on the serial port.
-crtscts
-
-# Use software flow control (i.e. XON/XOFF) to control the flow of data
-# on the serial port.
-#xonxoff
-
-# Specifies that certain characters should be escaped on transmission
-# (regardless of whether the peer requests them to be escaped with its
-# async control character map).  The characters to be escaped are
-# specified as a list of hex numbers separated by commas.  Note that
-# almost any character can be specified for the escape option, unlike
-# the asyncmap option which only allows control characters to be
-# specified.  The characters which may not be escaped are those with hex
-# values 0x20 - 0x3f or 0x5e.
-#escape 11,13,ff
-
-# Don't use the modem control lines.
-#local
-
-# Specifies that pppd should use a UUCP-style lock on the serial device
-# to ensure exclusive access to the device.
-lock
-
-# Don't show the passwords when logging the contents of PAP packets.
-# This is the default.
-hide-password
-
-# When logging the contents of PAP packets, this option causes pppd to
-# show the password string in the log message.
-#show-password
-
-# Use the modem control lines.  On Ultrix, this option implies hardware
-# flow control, as for the crtscts option.  (This option is not fully
-# implemented.)
-modem
-
-# Set the MRU [Maximum Receive Unit] value to <n> for negotiation.  pppd
-# will ask the peer to send packets of no more than <n> bytes. The
-# minimum MRU value is 128.  The default MRU value is 1500.  A value of
-# 296 is recommended for slow links (40 bytes for TCP/IP header + 256
-# bytes of data).
-#mru 542
-
-# Set the interface netmask to <n>, a 32 bit netmask in "decimal dot"
-# notation (e.g. 255.255.255.0).
-#netmask 255.255.255.0
-
-# Disables the default behaviour when no local IP address is specified,
-# which is to determine (if possible) the local IP address from the
-# hostname. With this option, the peer will have to supply the local IP
-# address during IPCP negotiation (unless it specified explicitly on the
-# command line or in an options file).
-#noipdefault
-
-# Enables the "passive" option in the LCP.  With this option, pppd will
-# attempt to initiate a connection; if no reply is received from the
-# peer, pppd will then just wait passively for a valid LCP packet from
-# the peer (instead of exiting, as it does without this option).
-#passive
-
-# With this option, pppd will not transmit LCP packets to initiate a
-# connection until a valid LCP packet is received from the peer (as for
-# the "passive" option with old versions of pppd).
-#silent
-
-# Don't request or allow negotiation of any options for LCP and IPCP
-# (use default values).
-#-all
-
-# Disable Address/Control compression negotiation (use default, i.e.
-# address/control field disabled).
-#-ac
-
-# Disable asyncmap negotiation (use the default asyncmap, i.e. escape
-# all control characters).
-#-am
-
-# Don't fork to become a background process (otherwise pppd will do so
-# if a serial device is specified).
-#-detach
-
-# Disable IP address negotiation (with this option, the remote IP
-# address must be specified with an option on the command line or in
-# an options file).
-#-ip
-
-# Disable IPCP negotiation and IP communication. This option should
-# only be required if the peer is buggy and gets confused by requests
-# from pppd for IPCP negotiation.
-#noip
-
-# Disable magic number negotiation.  With this option, pppd cannot
-# detect a looped-back line.
-#-mn
-
-# Disable MRU [Maximum Receive Unit] negotiation (use default, i.e.
-# 1500).
-#-mru
-
-# Disable protocol field compression negotiation (use default, i.e.
-# protocol field compression disabled).
-#-pc
-
-# Require the peer to authenticate itself using PAP.
-#+pap
-
-# Don't agree to authenticate using PAP.
-#-pap
-
-# Require the peer to authenticate itself using CHAP [Cryptographic
-# Handshake Authentication Protocol] authentication.
-#+chap
-
-# Don't agree to authenticate using CHAP.
-#-chap
-
-# Disable negotiation of Van Jacobson style IP header compression (use
-# default, i.e. no compression).
-#-vj
-
-# Increase debugging level (same as -d).  If this option is given, pppd
-# will log the contents of all control packets sent or received in a
-# readable form.  The packets are logged through syslog with facility
-# daemon and level debug. This information can be directed to a file by
-# setting up /etc/syslog.conf appropriately (see syslog.conf(5)).  (If
-# pppd is compiled with extra debugging enabled, it will log messages
-# using facility local2 instead of daemon).
-#debug
-
-# Append the domain name <d> to the local host name for authentication
-# purposes.  For example, if gethostname() returns the name porsche,
-# but the fully qualified domain name is porsche.Quotron.COM, you would
-# use the domain option to set the domain name to Quotron.COM.
-#domain <d>
-
-# Enable debugging code in the kernel-level PPP driver.  The argument n
-# is a number which is the sum of the following values: 1 to enable
-# general debug messages, 2 to request that the contents of received
-# packets be printed, and 4 to request that the contents of transmitted
-# packets be printed.
-#kdebug n
-
-# Set the MTU [Maximum Transmit Unit] value to <n>. Unless the peer
-# requests a smaller value via MRU negotiation, pppd will request that
-# the kernel networking code send data packets of no more than n bytes
-# through the PPP network interface.
-#mtu <n>
-
-# Set the name of the local system for authentication purposes to <n>.
-# This is a privileged option. With this option, pppd will use lines in the
-# secrets files which have <n> as the second field when looking for a
-# secret to use in authenticating the peer. In addition, unless overridden
-# with the user option, <n> will be used as the name to send to the peer
-# when authenticating the local system to the peer. (Note that pppd does
-# not append the domain name to <n>.)
-#name <n>
-
-# Enforce the use of the hostname as the name of the local system for
-# authentication purposes (overrides the name option).
-#usehostname
-
-# Set the assumed name of the remote system for authentication purposes
-# to <n>.
-#remotename <n>
-
-# Add an entry to this system's ARP [Address Resolution Protocol]
-# table with the IP address of the peer and the Ethernet address of this
-# system.
-proxyarp
-
-# Use the system password database for authenticating the peer using
-# PAP. Note: mgetty already provides this option. If this is specified
-# then dialin from users using a script under Linux to fire up ppp wont work.
-# login
-
-# If this option is given, pppd will send an LCP echo-request frame to the
-# peer every n seconds. Normally the peer should respond to the echo-request
-# by sending an echo-reply. This option can be used with the
-# lcp-echo-failure option to detect that the peer is no longer connected.
-lcp-echo-interval 30
-
-# If this option is given, pppd will presume the peer to be dead if n
-# LCP echo-requests are sent without receiving a valid LCP echo-reply.
-# If this happens, pppd will terminate the connection.  Use of this
-# option requires a non-zero value for the lcp-echo-interval parameter.
-# This option can be used to enable pppd to terminate after the physical
-# connection has been broken (e.g., the modem has hung up) in
-# situations where no hardware modem control lines are available.
-lcp-echo-failure 4
-
-# Set the LCP restart interval (retransmission timeout) to <n> seconds
-# (default 3).
-#lcp-restart <n>
-
-# Set the maximum number of LCP terminate-request transmissions to <n>
-# (default 3).
-#lcp-max-terminate <n>
-
-# Set the maximum number of LCP configure-request transmissions to <n>
-# (default 10).
-#lcp-max-configure <n>
-
-# Set the maximum number of LCP configure-NAKs returned before starting
-# to send configure-Rejects instead to <n> (default 10).
-#lcp-max-failure <n>
-
-# Set the IPCP restart interval (retransmission timeout) to <n>
-# seconds (default 3).
-#ipcp-restart <n>
-
-# Set the maximum number of IPCP terminate-request transmissions to <n>
-# (default 3).
-#ipcp-max-terminate <n>
-
-# Set the maximum number of IPCP configure-request transmissions to <n>
-# (default 10).
-#ipcp-max-configure <n>
-
-# Set the maximum number of IPCP configure-NAKs returned before starting
-# to send configure-Rejects instead to <n> (default 10).
-#ipcp-max-failure <n>
-
-# Set the PAP restart interval (retransmission timeout) to <n> seconds
-# (default 3).
-#pap-restart <n>
-
-# Set the maximum number of PAP authenticate-request transmissions to
-# <n> (default 10).
-#pap-max-authreq <n>
-
-# Set the maximum time that pppd will wait for the peer to authenticate
-# itself with PAP to <n> seconds (0 means no limit).
-#pap-timeout <n>
-
-# Set the CHAP restart interval (retransmission timeout for
-# challenges) to <n> seconds (default 3).
-#chap-restart <n>
-
-# Set the maximum number of CHAP challenge transmissions to <n>
-# (default 10).
-#chap-max-challenge
-
-# If this option is given, pppd will rechallenge the peer every <n>
-# seconds.
-#chap-interval <n>
-
-# With this option, pppd will accept the peer's idea of our local IP
-# address, even if the local IP address was specified in an option.
-#ipcp-accept-local
-
-# With this option, pppd will accept the peer's idea of its (remote) IP
-# address, even if the remote IP address was specified in an option.
-#ipcp-accept-remote
-
-# Disable the IPXCP and IPX protocols.
-# To let pppd pass IPX packets comment this out --- you'll probably also
-# want to install ipxripd, and have the Internal IPX Network option enabled
-# in your kernel.  /usr/doc/HOWTO/IPX-HOWTO.gz contains more info.
-noipx
-
-# Exit once a connection has been made and terminated. This is the default,
-# unless the `persist' or `demand' option has been specified.
-#nopersist
-
-# Do not exit after a connection is terminated; instead try to reopen
-# the connection.
-#persist
-
-# Terminate after n consecutive failed connection attempts.
-# A value of 0 means no limit. The default value is 10.
-#maxfail <n>
-
-# Initiate the link only on demand, i.e. when data traffic is present. 
-# With this option, the remote IP address must be specified by the user on
-# the command line or in an options file.  Pppd will initially configure
-# the interface and enable it for IP traffic without connecting to the peer. 
-# When traffic is available, pppd will connect to the peer and perform
-# negotiation, authentication, etc.  When this is completed, pppd will
-# commence passing data packets (i.e., IP packets) across the link.
-#demand
-
-# Specifies that pppd should disconnect if the link is idle for <n> seconds.
-# The link is idle when no data packets (i.e. IP packets) are being sent or
-# received.  Note: it is not advisable to use this option with the persist
-# option without the demand option.  If the active-filter option is given,
-# data packets which are rejected by the specified activity filter also
-# count as the link being idle.
-#idle <n>
-
-# Specifies how many seconds to wait before re-initiating the link after
-# it terminates.  This option only has any effect if the persist or demand
-# option is used.  The holdoff period is not applied if the link was
-# terminated because it was idle.
-#holdoff <n>
-
-# Wait for up n milliseconds after the connect script finishes for a valid
-# PPP packet from the peer.  At the end of this time, or when a valid PPP
-# packet is received from the peer, pppd will commence negotiation by
-# sending its first LCP packet.  The default value is 1000 (1 second).
-# This wait period only applies if the connect or pty option is used.
-#connect-delay <n>
-
-# Packet filtering: for more information, see pppd(8)
-# Any packets matching the filter expression will be interpreted as link
-# activity, and will cause a "demand" connection to be activated, and reset
-# the idle connection timer. (idle option)
-# The filter expression is akin to that of tcpdump(1)
-#active-filter <filter-expression>
-
-# uncomment the line below this if you use PPPoE
-#plugin /usr/lib/pppd/plugins/pppoe.so
-
-# ---<End of File>---
diff --git a/testing/ppp/plog b/testing/ppp/plog
deleted file mode 100644
index 84d2c7340..000000000
--- a/testing/ppp/plog
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -s /var/log/ppp.log ]; then
-  exec tail "$@" /var/log/ppp.log
-else
-  exec tail "$@" /var/log/syslog | grep ' \(pppd\|chat\)\['
-fi
diff --git a/testing/ppp/poff b/testing/ppp/poff
deleted file mode 100644
index 8b4dffc59..000000000
--- a/testing/ppp/poff
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-# Written by John Hasler <john@dhh.gt.org> and based on work 
-# by Phil Hands <phil@hands.com>.  Distributed under the GNU GPL
-
-if [ -x /usr/bin/kill ]; then
-  KILL="/usr/bin/kill"
-else
-  KILL="/bin/kill"
-fi
-SIG=TERM
-DONE="stopped"
-MODE=""
-
-usage ()
-{
-   cat <<!EOF!
-usage: $0 [option] [provider]
-options:
-  -r        Cause pppd to drop the line and redial.
-  -d        Toggle the state of pppd's debug option.
-  -c        Cause pppd to renegotiate compression.
-  -a        Stop all pppd's.  'provider' will be ignored.
-  -h        Print this help summary and exit.
-  -v        Print version and exit.
-  none      Stop pppd.
-
-Options may not be combined.
-
-If 'provider' is omitted pppd will be stopped or signalled if and only if
-there is exactly one running unless the '-a' option was given.  If
-'provider' is supplied the pppd controlling the connection to that
-provider will be stopped or signalled.
-!EOF!
-}
-
-# Get option.  If there are none replace the "?" that getopts puts in
-# FLAG on error with "null".
-getopts rdcavh FLAG
-if [ "$?" -ne 0 ]; then
-    FLAG="null"
-fi
-
-# Check for additional options.  Should be none.
-getopts :rdcavh DUMMY
-if [ "$?" -eq 0 ]; then
-    echo "$0: Illegal option -- ${OPTARG}."
-    exit 1
-fi
-
-case $FLAG in
- "r") SIG=HUP;  DONE=signalled; shift ;;
- "d") SIG=USR1; DONE=signalled; shift ;;
- "c") SIG=USR2; DONE=signalled; shift ;;
- "a") MODE="all"; shift ;;
- "v") echo "$0$Revision: 1.1 $_TrickToPrint_RCS_Revision"; exit 0 ;;
- "h") usage; exit 0 ;;
- "?") exit 1;
-esac
-
-# Get the PIDs of all the pppds running.  Could also get these from
-# /var/run, but pppd doesn't create .pid files until ppp is up.
-PIDS=`pidof pppd`
-
-# poff is pointless if pppd isn't running.
-if test -z "$PIDS"; then
-    echo "$0: No pppd is running.  None ${DONE}."
-    exit 1
-fi
-
-# Find out how many pppd's are running.
-N=`echo "$PIDS" | wc -w`
-
-# If there are no arguments we can't do anything if there is more than one
-# pppd running.
-if test "$#" -eq 0 -a "$N" -gt 1 -a $FLAG != "a" ; then
-    echo "$0: More than one pppd running and no "-a" option and 
-no arguments supplied. Nothing ${DONE}."
-    exit 1
-fi
-
-# If either there are no arguments or '-a' was specified kill all the
-# pppd's.
-if test "$#" -eq 0 -o "$MODE" = "all" ; then
-    $KILL -$SIG $PIDS || {
-        echo "$0: $KILL failed.  None ${DONE}."
-        exit 1
-    }
-    exit 0
-fi
-
-# There is an argument, so kill the pppd started on that provider.
-PID=`ps axw | grep "[ /]pppd call $1 *\$" | awk '{print $1}'`
-if test -n "$PID" ; then
-    $KILL -$SIG $PID || {
-        echo "$0: $KILL failed.  None ${DONE}."
-        exit 1
-    }
-else
-   echo "$0: I could not find a pppd process for provider '$1'. None ${DONE}."
-   exit 1
-fi
-exit 0
diff --git a/testing/ppp/pon b/testing/ppp/pon
deleted file mode 100644
index 36885050b..000000000
--- a/testing/ppp/pon
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-  -*) echo "
-Usage: pon [provider] [arguments]
-
-If you specify one argument, a PPP connection will be started using
-settings from the appropriate file in the /etc/ppp/peers/ directory, and
-any additional arguments supplied will be passed as extra arguments to
-pppd.
-"
-      exit 0
-      ;;
-esac
-
-if [ -z "$1" -a ! -f /etc/ppp/peers/provider ]; then
-  echo "
-Please configure /etc/ppp/peers/provider or use a command line argument to
-use another file in /etc/ppp/peers/ directory.
-"
-  exit 1
-fi
-
-if [ "$1" -a ! -f "/etc/ppp/peers/$1" ]; then
-  echo "
-The file /etc/ppp/peers/$1 does not exist.
-"
-  exit 1
-fi
-
-exec /usr/sbin/pppd call ${@:-provider}
-
diff --git a/testing/ppp/pon.1 b/testing/ppp/pon.1
deleted file mode 100644
index bb3220564..000000000
--- a/testing/ppp/pon.1
+++ /dev/null
@@ -1,121 +0,0 @@
-.\" This manual is published under the GPL.
-.\" All guidelines specified in the GPL apply here.
-.\" To get an ascii file:
-.\" groff -man -Tascii pon.1 > pon.txt
-.\"
-.TH PON 1 "July 2000" "Debian Project" "Debian PPPD"
-.SH NAME
-pon, poff, plog \- starts up, shuts down or lists the log of PPP connections
-.SH SYNOPSIS
-.B pon
-[ isp-name [ options ] ]
-.br
-.B poff
-[ -r ] [ -d ] [ -c ] [ -a ] [ -h ] [ isp-name ]
-.br
-.B plog
-[ arguments ]
-.SH DESCRIPTION
-This manual page describes the \fBpon\fP, \fBplog\fP and \fBpoff\fP
-scripts, which allow users to control PPP connections.
-..
-.SS pon
-\fBpon\fP, invoked without arguments, runs the \fI/etc/ppp/ppp_on_boot\fP
-file, if it exists and is executable. Otherwise, a PPP connection will be
-started using configuration from \fI/etc/ppp/peers/provider\fP.
-This is the default behaviour unless an \fBisp-name\fP argument is given.
-.PP
-For instance, to use ISP configuration "myisp" run:
-.IP
-pon myisp
-.PP
-\fBpon\fP will then use the options file \fI/etc/ppp/peers/myisp\fP.
-You can pass additional \fBoptions\fP after the ISP name, too.
-\fBpon\fP can be used to run multiple, simultaneous PPP connections.
-..
-.SS poff
-\fBpoff\fP closes a PPP connection. If more than one PPP connection exists,
-the one named in the argument to \fBpoff\fP will be killed, e.g.
-.IP
-poff myprovider2
-.PP
-will terminate the connection to myprovider2, and leave the PPP connections
-to e.g. "myprovider1" or "myprovider3" up and running.
-.PP
-\fBpoff\fP takes the following command line options:
-.RS
-.TP
-.B "\-r"
-causes the connection to be redialed after it is dropped.
-.TP
-.B "\-d"
-toggles the state of pppd's debug option.
-.TP
-.B "\-c"
-causes
-.BR pppd (8)
-to renegotiate compression.
-.TP
-.B "\-a"
-stops all running ppp connections. If the argument \fBisp-name\fP
-is given it will be ignored.
-.TP
-.B "\-h"
-displays help information.
-.TP
-.B "\-v"
-prints the version and exits.
-.PP
-If no argument is given, \fBpoff\fP will stop or signal pppd if and only
-if there is exactly one running. If more than one connection is active,
-it will exit with an error code of 1.
-..
-.SS plog
-\fBplog\fP shows you the last few lines of \fI/var/log/ppp.log\fP. If that
-file doesn't exist, it shows you the last few lines of your
-\fI/var/log/syslog\fP file, but excluding the lines not generated by pppd.
-This script makes use of the
-.BR tail (1)
-command, so arguments that can be passed to
-.BR tail (1)
-can also be passed to \fBplog\fP.
-.PP
-Note: the \fBplog\fP script can only be used by root or another system
-administrator in group "adm", due to security reasons. Also, to have all
-pppd-generated information in one logfile, that plog can show, you need the
-following line in your \fI/etc/syslog.conf\fP file:
-.PP
-local2.*                -/var/log/ppp.log
-.RE
-.SH FILES
-.TP
-.I /etc/ppp/options
-PPPd system options file.
-.TP
-.I /etc/ppp/pap-secrets
-System PAP passwords file.
-.TP
-.I /etc/ppp/chap-secrets
-System CHAP passwords file.
-.TP
-.I /etc/ppp/peers/
-Directory holding the peer options files. The default file is called
-\fIprovider\fP.
-.TP
-.I /etc/chatscripts/provider
-The chat script invoked from the default \fI/etc/ppp/peers/provider\fP.
-.TP
-.I /var/log/ppp.log
-The default PPP log file.
-.SH AUTHORS
-The p-commands were written by Christoph Lameter <clameter@debian.org>.
-Updated and revised by Philip Hands <phil@hands.com>.
-.br
-This manual was written by Othmar Pasteka <othmar@tron.at>. Modified
-by Rob Levin <lilo@openprojects.net>, with some extensions taken from
-the old p-commands manual written by John Hasler <jhasler@debian.org>.
-.SH "SEE ALSO"
-.BR pppd (8),
-.BR chat (8),
-.BR tail (1).
-
diff --git a/testing/ppp/ppp b/testing/ppp/ppp
deleted file mode 100644
index 16e01bad7..000000000
--- a/testing/ppp/ppp
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/pppd`
-case "$1" in
-  start)
-    stat_busy "Starting PPP daemon"
-    [ -z "$PID" ] && /usr/bin/pon
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ppp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping PPP daemon"
-    [ ! -z "$PID" ]  && poff -a &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ppp
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/ppp/ppp.systemd b/testing/ppp/ppp.systemd
deleted file mode 100644
index a5c490a73..000000000
--- a/testing/ppp/ppp.systemd
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=PPP link to %I
-Before=network.target
-
-[Service]
-ExecStart=/usr/sbin/pppd call %I nodetach
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/procps-ng/PKGBUILD b/testing/procps-ng/PKGBUILD
deleted file mode 100644
index cab5fac96..000000000
--- a/testing/procps-ng/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 166733 2012-09-17 08:10:26Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Eric Bélanger <eric@archlinux.org>
-
-pkgname=procps-ng
-pkgver=3.3.3
-pkgrel=6
-pkgdesc='Utilities for monitoring your system and its processes'
-arch=('i686' 'x86_64')
-url="http://gitorious.org/procps"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('ncurses')
-conflicts=('procps')
-provides=('procps')
-replaces=('procps')
-backup=('etc/sysctl.conf')
-options=('!libtool')
-source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}
-        sysctl.conf)
-sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0'
-          '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53')
-
-build() {
-  cd "${srcdir}/procps-procps"
-  echo ${pkgver} > .tarball-version
-  ./autogen.sh
-  ./configure --exec-prefix=/ --prefix=/usr --sysconfdir=/etc --libdir=/usr/lib
-  make
-}
-
-package() {
-  cd "${srcdir}/procps-procps"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf"
-
-  # provided by util-linux
-  rm "${pkgdir}/bin/kill"
-  rm "${pkgdir}/usr/share/man/man1/kill.1"
-}
diff --git a/testing/procps-ng/sysctl.conf b/testing/procps-ng/sysctl.conf
deleted file mode 100644
index 4695cdd92..000000000
--- a/testing/procps-ng/sysctl.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-# Configuration file for runtime kernel parameters.
-# See sysctl.conf(5) for more information.
-
-# Have the CD-ROM close when you use it, and open when you are done.
-#dev.cdrom.autoclose = 1
-#dev.cdrom.autoeject = 1
-
-# Protection from the SYN flood attack.
-net.ipv4.tcp_syncookies = 1
-
-# See evil packets in your logs.
-#net.ipv4.conf.all.log_martians = 1
-
-# Never accept redirects or source routes (these are only useful for routers).
-#net.ipv4.conf.all.accept_redirects = 0
-#net.ipv4.conf.all.accept_source_route = 0
-#net.ipv6.conf.all.accept_redirects = 0
-#net.ipv6.conf.all.accept_source_route = 0
-
-# Disable packet forwarding.
-net.ipv4.ip_forward = 0
-net.ipv6.conf.all.forwarding = 0
-
-# Tweak the port range used for outgoing connections.
-#net.ipv4.ip_local_port_range = 32768 61000
-
-# Tweak those values to alter disk syncing and swap behavior.
-#vm.vfs_cache_pressure = 100
-#vm.laptop_mode = 0
-#vm.swappiness = 60
-
-# Tweak how the flow of kernel messages is throttled.
-#kernel.printk_ratelimit_burst = 10
-#kernel.printk_ratelimit = 5
-
-# Reboot 600 seconds after kernel panic or oops.
-#kernel.panic_on_oops = 1
-#kernel.panic = 600
-
-# Disable SysRq key to avoid console security issues.
-kernel.sysrq = 0
diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD
deleted file mode 100644
index 4bfa43e3d..000000000
--- a/testing/proftpd/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 165249 2012-08-14 16:09:40Z andrea $
-# Maintainer:
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=proftpd
-pkgver=1.3.4b
-pkgrel=2
-epoch=1
-pkgdesc="A high-performance, scalable FTP server"
-arch=('i686' 'x86_64')
-url="http://www.proftpd.org"
-license=('GPL')
-depends=('libmysqlclient' 'postgresql-libs')
-backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.gz{,.asc}
-        'proftpd' 'proftpd.logrotate' 'proftpd.conf.d' 'proftpd.service')
-md5sums=('0871e0b93c9c3c88ca950b6d9a04aed2'
-         'e5b9bd78029a15f82994efcb7ed2e9fb'
-         'c439a0a1dbc21b604d8382da87aa021b'
-         'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736'
-         '2c446f531948c8cc0a1e0fae28f8dfda')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --disable-pam \
-    --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
-    --sysconfdir=/etc \
-    --localstatedir=/run/proftpd \
-    --enable-ctrls \
-    --enable-ipv6 \
-    --with-includes=/usr/include/mysql:/usr/include/postgresql \
-    --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \
-    --enable-nls \
-    --with-systemd
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
-
-  install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
-  install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
-  install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
-  install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-
-  install -d "${pkgdir}/usr/lib/systemd/system/"
-  install -m644 "${srcdir}"/proftpd.service "${pkgdir}/usr/lib/systemd/system/"
-}
diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd
deleted file mode 100755
index 9ea1d47fc..000000000
--- a/testing/proftpd/proftpd
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-PROFTPD_ARGS=
-[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ProFTPd Server"
-    /usr/sbin/proftpd ${PROFTPD_ARGS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon proftpd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ProFTPd Server"
-    [ -f /run/proftpd/proftpd.pid ] && kill $(cat /run/proftpd/proftpd.pid) &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /run/proftpd/proftpd.pid
-      rm_daemon proftpd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d
deleted file mode 100644
index 1a5a8a201..000000000
--- a/testing/proftpd/proftpd.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to proftpd
-#
-PROFTPD_ARGS=""
diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate
deleted file mode 100644
index 7b6d7a87b..000000000
--- a/testing/proftpd/proftpd.logrotate
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/xferlog {
-   postrotate
-      /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true
-   endscript
-}
diff --git a/testing/proftpd/proftpd.service b/testing/proftpd/proftpd.service
deleted file mode 100644
index c202a2fdf..000000000
--- a/testing/proftpd/proftpd.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description = ProFTPD FTP Server
-After = network.target nss-lookup.target local-fs.target remote-fs.target
-
-[Service]
-Type = forking
-PIDFile = /run/proftpd/proftpd.pid
-Environment = PROFTPD_ARGS=
-EnvironmentFile = -/etc/conf.d/proftpd
-ExecStart = /usr/sbin/proftpd $PROFTPD_ARGS
-ExecReload = /bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy = multi-user.target
diff --git a/testing/psiconv/PKGBUILD b/testing/psiconv/PKGBUILD
deleted file mode 100644
index 1dc2e588d..000000000
--- a/testing/psiconv/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169647 2012-10-25 01:35:36Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=psiconv
-pkgver=0.9.8
-pkgrel=10
-pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
-arch=('i686' 'x86_64')
-url="http://software.frodo.looijaard.name/psiconv/"
-license=('GPL')
-depends=('imagemagick')
-makedepends=('bc')
-backup=('etc/psiconv/psiconv.conf')
-options=('!libtool')
-source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8d7548e3c6b9cd408544736133728acd')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/psmisc/PKGBUILD b/testing/psmisc/PKGBUILD
deleted file mode 100644
index d08830b1d..000000000
--- a/testing/psmisc/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 162304 2012-06-24 20:02:02Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=psmisc
-pkgver=22.19
-pkgrel=1
-pkgdesc="Miscellaneous procfs tools"
-arch=('i686' 'x86_64')
-url="http://psmisc.sourceforge.net/index.html"
-license=('GPL')
-groups=('base')
-depends=('ncurses')
-source=(http://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('4c8fb774449f966f78c4c6e1d77d1a24b4187410')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pstoedit/PKGBUILD b/testing/pstoedit/PKGBUILD
deleted file mode 100644
index 1915d9b37..000000000
--- a/testing/pstoedit/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169648 2012-10-25 01:35:40Z eric $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Tobias Powalowski <t.powa@gmx.de>
-
-pkgname=pstoedit
-pkgver=3.60
-pkgrel=3
-pkgdesc="Translates PostScript and PDF graphics into other vector formats"
-arch=('i686' 'x86_64')
-url="http://www.pstoedit.net/"
-license=('GPL')
-depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
-makedepends=('ghostscript')
-options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
-	'pstoedit-3.50-parallel.patch'	'pstoedit-3.50-plugin-close.patch')
-sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
-          '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
-          '54bbe019de66eb4cb8525371462595d21fbd074e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i 's/-pedantic//' configure
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pstoedit/pstoedit-3.50-parallel.patch b/testing/pstoedit/pstoedit-3.50-parallel.patch
deleted file mode 100644
index 4f1f73b04..000000000
--- a/testing/pstoedit/pstoedit-3.50-parallel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
-         $(sample_drivers_src)                   
- libp2edrvstd_la_LIBADD=-L. libpstoedit.la
- libp2edrvstd_la_LDFLAGS=-no-undefined -module
-+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
- 
- #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
- #libp2edrvplugins_la_LIBADD=
-@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
- libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
- libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
- libp2edrvlplot_la_LDFLAGS=-no-undefined -module
-+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
- 
- libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
- libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
- libp2edrvswf_la_LDFLAGS=-no-undefined -module
-+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
- 
- # note the __ stand for ++ - automake treats all no alphanums chars as _
- libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
- libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
- libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS}  -module
-+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
- # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
- 
- if USE_EMFBYSOURCE
-@@ -113,6 +117,7 @@ else
- libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
- libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
- endif
-+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
- 
- libpstoedit_la_SOURCES =			\
- 	dynload.cpp dynload.h			\
-@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
- 
- pstoedit_SOURCES = cmdmain.cpp
- pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
-+pstoedit_DEPENDENCIES = libpstoedit.la
- 
- pkginclude_HEADERS =				\
- 	pstoedit.h				\
diff --git a/testing/pstoedit/pstoedit-3.50-plugin-close.patch b/testing/pstoedit/pstoedit-3.50-plugin-close.patch
deleted file mode 100644
index 6787d6aef..000000000
--- a/testing/pstoedit/pstoedit-3.50-plugin-close.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugzilla.redhat.com/507035
-
-diff --git a/src/dynload.cpp b/src/dynload.cpp
-index c0db355..7c073ef 100644
---- a/src/dynload.cpp
-+++ b/src/dynload.cpp
-@@ -147,7 +147,6 @@ void DynLoader::close()
- 
- DynLoader::~DynLoader()
- {
--	close();
- 	libname=0;
- }
- 
diff --git a/testing/ptlib/PKGBUILD b/testing/ptlib/PKGBUILD
deleted file mode 100644
index ed26e6d29..000000000
--- a/testing/ptlib/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169545 2012-10-23 11:47:51Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=ptlib
-pkgver=2.10.7
-pkgrel=2
-pkgdesc="Portable Windows Library"
-arch=('i686' 'x86_64')
-url="http://www.opalvoip.org"
-license=('GPL')
-depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
-replaces=('pwlib')
-conflicts=('pwlib')
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2)
-md5sums=('7fb74a97743fcc5f33d0f97dec7bc878')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --libdir=/usr/lib \
-      --sysconfdir=/etc --localstatedir=/var \
-      --enable-opal --enable-plugins \
-      --enable-oss --enable-v4l2 \
-      --disable-avc --enable-sdl \
-      --enable-ipv6 --enable-v4l \
-      --enable-dc --disable-odbc \
-      --enable-expat --enable-httpforms
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/pyalpm/PKGBUILD b/testing/pyalpm/PKGBUILD
deleted file mode 100644
index c9d420471..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=2
-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/pycrypto/PKGBUILD b/testing/pycrypto/PKGBUILD
deleted file mode 100644
index 8199704f1..000000000
--- a/testing/pycrypto/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 168845 2012-10-16 11:53:59Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-
-pkgbase=pycrypto
-pkgname=('python2-crypto' 'python-crypto')
-pkgver=2.6
-pkgrel=3
-arch=('i686' 'x86_64')
-makedepends=('python2' 'python')
-url="http://www.dlitz.net/software/pycrypto/"
-license=('custom')
-source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz")
-sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8')
-
-build() {
-  cd "${srcdir}"
-  find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \;
-  find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \;
- 
-  cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python2 setup.py build
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
-  python setup.py build
-}
-
-package_python2-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 2."
-  depends=('python2')
-  replaces=('pycrypto')
-  conflicts=('pycrypto')
-  provides=("pycrypto=${pkgver}")
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
-
-package_python-crypto() {
-  pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3."
-  depends=('python')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}-py3"
-  python setup.py install --root="${pkgdir}" --optimize=1
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
-  cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/pygobject/PKGBUILD b/testing/pygobject/PKGBUILD
deleted file mode 100644
index 33f064936..000000000
--- a/testing/pygobject/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 169159 2012-10-18 19:22:49Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=pygobject
-pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.4.1.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="https://live.gnome.org/PyGObject"
-license=('LGPL')
-makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz)
-options=('!libtool')
-sha256sums=('dbcff64a641b4eb251a3ca72c782c8a2318c3bbf4a31bffc40446e15111e6017')
-
-build() {
-  cp -a "$pkgbase-$pkgver" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr
-    make
-  )
-
-  (
-    cd "$pkgbase-$pkgver"
-    ./configure --prefix=/usr
-    make
-  )
-}
-
-package_python-gobject() {
-  pkgdesc="Python 3 bindings for GObject"
-  depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver")
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir"/usr/{include,lib/pkgconfig}
-}
-
-package_python2-gobject() {
-  pkgdesc="Python 2 bindings for GObject"
-  depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver")
-
-  cd "python2-build"
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel"
-}
-
-package_pygobject-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-  cd "devel"
-  mkdir -p "$pkgdir"/usr/{include,lib}
-  mv include "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-}
diff --git a/testing/pygobject2/PKGBUILD b/testing/pygobject2/PKGBUILD
deleted file mode 100644
index 2aaa967e3..000000000
--- a/testing/pygobject2/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 168847 2012-10-16 11:54:08Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=pygobject2
-pkgname=(python-gobject2 python2-gobject2 pygobject2-devel)
-pkgver=2.28.6
-pkgrel=7
-arch=('i686' 'x86_64')
-url="http://www.pygtk.org/"
-license=('LGPL')
-makedepends=('python' 'python2')
-source=(http://ftp.gnome.org/pub/gnome/sources/pygobject/${pkgver%.*}/pygobject-${pkgver}.tar.xz
-        python2-fix-type.patch
-        python3-fix-build.patch
-        python3-fix-maketrans.patch)
-options=('!libtool')
-sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8'
-            'b7b415499ffc0817cf551edf76a3fe47938db2c9f6240046eae681e6ef9b37ea'
-            'feafd4664f8455edf0bf8407ac45e219bb550df806ce0d601baae951e8c188ca'
-            '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a')
-
-build() {
-  cd "${srcdir}"
-  cp -a "pygobject-${pkgver}" python2-build
-  mkdir devel
-
-  (
-    cd python2-build
-    export PYTHON=/usr/bin/python2
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
-
-  (
-    cd "pygobject-${pkgver}"
-    #patches available in 2.28 branch but unreleased.
-    patch -Np1 -i "${srcdir}/python2-fix-type.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-build.patch"
-    patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch"
-
-    ./configure --prefix=/usr --disable-introspection
-    make
-  )
-}
-
-package_python-gobject2() {
-  pkgdesc="Python 3 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python')
-  replaces=('py3gobject')
-  provides=("py3gobject=$pkgver")
-
-  cd "${srcdir}/pygobject-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  # Delete devel stuff
-  rm -r "$pkgdir"/usr/{bin,include,lib/pkgconfig,share/{gtk-doc,pygobject/{2.0/codegen,xsl}}}
-}
-
-package_python2-gobject2() {
-  pkgdesc="Python 2 bindings for GObject2"
-  depends=('glib2' 'pygobject2-devel' 'python2')
-  replaces=('pygobject')
-  provides=("pygobject=$pkgver")
-
-  cd "${srcdir}/python2-build"
-  make DESTDIR="${pkgdir}" install
-
-  find "$pkgdir"/usr/share/pygobject -name '*.py' | \
-    xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
-  # Split devel stuff
-  mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \
-    "$srcdir/devel/"
-}
-
-package_pygobject2-devel() {
-  pkgdesc="Development files for the pygobject bindings"
-
-  cd "${srcdir}/devel"
-  mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject}
-
-  mv include   "$pkgdir/usr/"
-  mv pkgconfig "$pkgdir/usr/lib/"
-  mv gtk-doc   "$pkgdir/usr/share/"
-  mv xsl       "$pkgdir/usr/share/pygobject/"
-}
diff --git a/testing/pygobject2/python2-fix-type.patch b/testing/pygobject2/python2-fix-type.patch
deleted file mode 100644
index 78e7ddfd5..000000000
--- a/testing/pygobject2/python2-fix-type.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Mon, 12 Mar 2012 16:44:14 -0400
-Subject: gio-types.defs: change some enums to flags
-
-These flags types were originally incorrectly handled in glib as being
-enums.  That bug was fixed, but they're still enums here, leading to
-warnings about the mismatch.
-
-Change them to flags.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=668522
----
- gio/gio-types.defs |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gio/gio-types.defs b/gio/gio-types.defs
-index 331e0bc..7eee5c8 100644
---- a/gio/gio-types.defs
-+++ b/gio/gio-types.defs
-@@ -526,7 +526,7 @@
-   )
- )
- 
--(define-enum MountMountFlags
-+(define-flags MountMountFlags
-   (in-module "gio")
-   (c-name "GMountMountFlags")
-   (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS")
-@@ -545,7 +545,7 @@
-   )
- )
- 
--(define-enum DriveStartFlags
-+(define-flags DriveStartFlags
-   (in-module "gio")
-   (c-name "GDriveStartFlags")
-   (gtype-id "G_TYPE_DRIVE_START_FLAGS")
-@@ -770,7 +770,7 @@
-   )
- )
- 
--(define-enum SocketMsgFlags
-+(define-flags SocketMsgFlags
-   (in-module "gio")
-   (c-name "GSocketMsgFlags")
-   (gtype-id "G_TYPE_SOCKET_MSG_FLAGS")
--- 
-1.7.9.1
-
diff --git a/testing/pygobject2/python3-fix-build.patch b/testing/pygobject2/python3-fix-build.patch
deleted file mode 100644
index 4cb8cfe57..000000000
--- a/testing/pygobject2/python3-fix-build.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e2dc4ac346a16b6976b92e84819c7203629beb4a Mon Sep 17 00:00:00 2001
-From: Ignacio Casal Quinteiro <icq@gnome.org>
-Date: Thu, 21 Apr 2011 14:52:20 +0000
-Subject: [python3] fix build. PYcairo_IMPORT doesn't exists anymore
-
----
-diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c
-index 81b9865..edf52d7 100644
---- a/gi/pygi-foreign-cairo.c
-+++ b/gi/pygi-foreign-cairo.c
-@@ -30,7 +30,7 @@
- #include <pycairo/py3cairo.h>
- #endif
- 
--Pycairo_CAPI_t *Pycairo_CAPI;
-+static Pycairo_CAPI_t *Pycairo_CAPI;
- 
- #include "pygi-foreign.h"
- 
-@@ -117,7 +117,12 @@ cairo_surface_release (GIBaseInfo *base_info,
- static PyMethodDef _gi_cairo_functions[] = {0,};
- PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
- {
-+#if PY_VERSION_HEX < 0x03000000
-     Pycairo_IMPORT;
-+#else
-+    Pycairo_CAPI = (Pycairo_CAPI_t*) PyCObject_Import("cairo", "CAPI");
-+#endif
-+
-     if (Pycairo_CAPI == NULL)
-         return PYGLIB_MODULE_ERROR_RETURN;
- 
---
-cgit v0.9
diff --git a/testing/pygobject2/python3-fix-maketrans.patch b/testing/pygobject2/python3-fix-maketrans.patch
deleted file mode 100644
index f5bc0e77c..000000000
--- a/testing/pygobject2/python3-fix-maketrans.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 667bec76ccbc85cc1d54a0e68977dbda241c028c Mon Sep 17 00:00:00 2001
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Wed, 13 Jul 2011 06:42:22 +0000
-Subject: [python3] Fix maketrans import
-
-Python3 moved the maketrans() function from the string module to a str method.
-This unbreaks gi/module.py for Python 3 again.
----
-diff --git a/gi/module.py b/gi/module.py
-index 70df76c..d56bdaf 100644
---- a/gi/module.py
-+++ b/gi/module.py
-@@ -24,7 +24,11 @@ from __future__ import absolute_import
- 
- import os
- import gobject
--import string
-+try:
-+    maketrans = ''.maketrans
-+except AttributeError:
-+    # fallback for Python 2
-+    from string import maketrans
- 
- import gi
- from .overrides import registry
-@@ -124,7 +128,7 @@ class IntrospectionModule(object):
-                 # Don't use upper() here to avoid locale specific
-                 # identifier conversion (e. g. in Turkish 'i'.upper() == 'i')
-                 # see https://bugzilla.gnome.org/show_bug.cgi?id=649165
--                ascii_upper_trans = string.maketrans(
-+                ascii_upper_trans = maketrans(
-                         'abcdefgjhijklmnopqrstuvwxyz', 
-                         'ABCDEFGJHIJKLMNOPQRSTUVWXYZ')
-                 for value_info in info.get_values():
---
-cgit v0.9
diff --git a/testing/pyopenssl/PKGBUILD b/testing/pyopenssl/PKGBUILD
deleted file mode 100644
index e953a7690..000000000
--- a/testing/pyopenssl/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 168849 2012-10-16 11:54:13Z allan $
-# Maintainer : Ionut Biru<ibiru@archlinux.org>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgbase=pyopenssl
-pkgname=('python-pyopenssl' 'python2-pyopenssl')
-pkgver=0.13
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/pyOpenSSL"
-license=('LGPL2.1')
-makedepends=('python' 'python2' 'openssl')
-source=(http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${pkgver}.tar.gz)
-md5sums=('767bca18a71178ca353dff9e10941929')
-
-build() {
-    cd "${srcdir}"
-    cp -a "pyOpenSSL-${pkgver}"{,-python2}
-
-    #build python 3 module
-    cd "pyOpenSSL-${pkgver}"
-    python setup.py build
-
-    #build python 2 module
-    cd ../"pyOpenSSL-${pkgver}-python2"
-    python2 setup.py build
-}
-
-package_python-pyopenssl(){
-    pkgdesc="Python3 wrapper module around the OpenSSL library"
-    depends=('python>=3.3' 'openssl')
-    replaces=('pyopenssl')
-    provides=('pyopenssl')
-    conflicts=('pyopenssl')
-
-    cd "${srcdir}/pyOpenSSL-${pkgver}"
-    python setup.py install --root "${pkgdir}" --optimize=1
-}
-
-package_python2-pyopenssl(){
-    pkgdesc="Python2 wrapper module around the OpenSSL library"
-    depends=('python2>=2.7' 'openssl')
-
-    cd "${srcdir}/pyOpenSSL-${pkgver}-python2"
-    python2 setup.py install --root "${pkgdir}" --optimize=1
-}
diff --git a/testing/pyqt/PKGBUILD b/testing/pyqt/PKGBUILD
deleted file mode 100644
index 070912482..000000000
--- a/testing/pyqt/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 168850 2012-10-16 11:54:15Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgbase=pyqt
-pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
-pkgver=4.9.5
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
-             'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
-source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('e4cdd6619c63655f7510efb4df8462fb')
-
-build() {
-  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
-  cd PyQt-x11-gpl-${pkgver}
-  python configure.py \
-    --confirm-license \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-
-  ### Python2 version ###
-  cd ../Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
-    --confirm-license \
-    -v /usr/share/sip \
-    --qsci-api
-
-  # Thanks Gerardo for the rpath fix
-  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
-  make
-}
-
-package_pyqt-common(){
-  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
-  
-  cd PyQt-x11-gpl-${pkgver}
-  make -C pyrcc DESTDIR="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" install
-  
-  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_pyqt(){
-  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-
-  cd PyQt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Provided by pyqt-common
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
-
-package_python2-pyqt(){
-  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
-  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
-  optdepends=('phonon: enable audio and video in PyQt applications'
-              'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
-              'qscintilla: QScintilla API'
-              'qt-assistant-compat: add PyQt online help in Qt Assistant')
-  provides=('python2-qt')
-
-  cd Py2Qt-x11-gpl-${pkgver}
-  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
-  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-  # Fix conflicts with pyqt
-  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
-  
-  # Provided by pyqt
-  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
-  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
-  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/testing/pyqt/fix-qthelp-build.patch b/testing/pyqt/fix-qthelp-build.patch
deleted file mode 100644
index 6055f9f35..000000000
--- a/testing/pyqt/fix-qthelp-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- PyQt-x11-gpl-4.9.1/configure.py~	2012-02-13 20:16:11.418786488 +0000
-+++ PyQt-x11-gpl-4.9.1/configure.py	2012-02-13 20:16:50.561809527 +0000
-@@ -1261,7 +1261,7 @@
-     opengl = (mname == "QtOpenGL")
- 
-     qt = [mname]
--    if mname in ("QtOpenGL", "QtWebKit"):
-+    if mname in ("QtHelp", "QtOpenGL", "QtWebKit"):
-         qt.append("QtCore")
- 
-     makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
diff --git a/testing/python-cairo/PKGBUILD b/testing/python-cairo/PKGBUILD
deleted file mode 100644
index 7efdd37a4..000000000
--- a/testing/python-cairo/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168854 2012-10-16 11:54:24Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>  
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=python-cairo
-pkgver=1.10.0
-pkgrel=2
-pkgdesc="Python bindings for the cairo graphics library"
-arch=('i686' 'x86_64')
-license=('LGPL3')
-depends=('python' 'cairo')
-makedepends=('pkg-config')
-options=('!libtool')
-source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2)
-url="http://www.cairographics.org/pycairo"
-md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5')
-
-build() {
-  cd "${srcdir}/pycairo-${pkgver}"
-
-  # Ensure that ./waf has created the cached unpacked version
-  # of the wafadmin source tree.
-  # This will be created to a subdirectory like
-  #    .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752
-  python3 ./waf --version
-
-  ./waf configure --prefix=/usr
-  ./waf build
-}
-
-package() {
-  cd "${srcdir}/pycairo-${pkgver}"
-  ./waf install --destdir="${pkgdir}"
-}
diff --git a/testing/python-egenix-mx-base/PKGBUILD b/testing/python-egenix-mx-base/PKGBUILD
deleted file mode 100644
index c2e1b4fa9..000000000
--- a/testing/python-egenix-mx-base/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168902 2012-10-16 14:06:20Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgbase=python-egenix-mx-base
-pkgname=('python2-egenix-mx-base')
-_origname=egenix-mx-base
-pkgver=3.2.4
-pkgrel=3
-pkgdesc="A collection of Python tools"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.egenix.com/products/python/mxBase/"
-makedepends=('python2')
-conflicts=('python-egenix-mx-base<=3.2.4-1')
-replaces=('python-egenix-mx-base<=3.2.4-1')
-source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz")
-sha1sums=('22d7fcbd582177f9a43245eadc3644f3b48cc9a7')
-
-build() {
-  cd "${srcdir}/${_origname}-${pkgver}"
-
-  find . -name \*.py -exec sed -i -e "s|^#!.*python|#!/usr/bin/python2|" {} \;
-
-  python2 setup.py build
-}
-
-package_python2-egenix-mx-base() {
-  depends=('python2>=2.7')
-  cd "${srcdir}/${_origname}-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1
-  install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/python-iwscan/PKGBUILD b/testing/python-iwscan/PKGBUILD
deleted file mode 100644
index a32038290..000000000
--- a/testing/python-iwscan/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168860 2012-10-16 11:54:37Z allan $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgbase=python-iwscan
-pkgname=python2-iwscan
-pkgver=20090609
-pkgrel=4
-pkgdesc="A Python interface to iwlist, using the iwlib library"
-arch=('i686' 'x86_64')
-url="http://projects.otaku42.de/browser/python-iwscan"
-license=('LGPL')
-depends=('python2' 'wireless_tools')
-conflicts=('python-iwscan<=20090609-3')
-replaces=('python-iwscan<=20090609-3')
-source=(ftp://ftp.archlinux.org/other/${pkgbase}/${pkgbase}-20090609.tar.gz)
-md5sums=('30fbe8ad3b07e67c1c35db2de16077d8')
-
-build() {
-	cd "${srcdir}/${pkgbase}"
-	python2 setup.py build
-}
-
-package_python2-iwscan() {
-	cd "${srcdir}/${pkgbase}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/testing/python-lxml/PKGBUILD b/testing/python-lxml/PKGBUILD
deleted file mode 100644
index 8980d9da3..000000000
--- a/testing/python-lxml/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 168863 2012-10-16 11:54:46Z allan $
-# Maintainer:
-
-pkgname=('python-lxml' 'python2-lxml')
-pkgver=3.0
-pkgrel=1
-pkgdesc="Python binding for the libxml2 and libxslt libraries"
-arch=('i686' 'x86_64')
-license=('BSD' 'custom')
-url="http://lxml.de/"
-makedepends=('python2' 'python' 'libxslt')
-source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441'
-          'b38447fd3f9cfb30b4d56ffe3bec42739afb2947')
-
-check() {
-  cd "${srcdir}"/lxml-$pkgver
-  make PYTHON=python2 test
-  make PYTHON=python test
-}
-
-package_python2-lxml() {
-  depends=('python2' 'libxslt')
-  optdepends=('python2-beautifulsoup3: support for parsing not well formed HTML')
-
-  cd "${srcdir}"/lxml-$pkgver
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}
-
-package_python-lxml() {
-  depends=('python' 'libxslt')
-
-  cd "${srcdir}"/lxml-$pkgver
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -Dm644 LICENSES.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 doc/licenses/BSD.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt
-  install -Dm644 doc/licenses/elementtree.txt \
-    "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt
-}
diff --git a/testing/python-markupsafe/PKGBUILD b/testing/python-markupsafe/PKGBUILD
deleted file mode 100644
index 8de9c9363..000000000
--- a/testing/python-markupsafe/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 168865 2012-10-16 11:54:52Z allan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Alex Anthony <alex.anthony28991@gmail.com>
-
-pkgname=('python-markupsafe' 'python2-markupsafe')
-pkgver=0.15
-pkgrel=2
-pkgdesc="Implements a XML/HTML/XHTML Markup safe string for Python"
-arch=('i686' 'x86_64')
-url="http://pypi.python.org/pypi/MarkupSafe"
-license=('custom')
-makedepends=('python-distribute' 'python2-distribute')
-source=("http://pypi.python.org/packages/source/M/MarkupSafe/MarkupSafe-${pkgver}.tar.gz")
-md5sums=('4e7c4d965fe5e033fa2d7bb7746bb186')
-
-build() {
-  cp -r MarkupSafe-${pkgver} python2-MarkupSafe-${pkgver}
-  cd "${srcdir}/MarkupSafe-${pkgver}"
-  python setup.py build
-
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
-  python2 setup.py build
-}
-
-package_python-markupsafe() {
-  depends=('python')
-
-  cd "${srcdir}/MarkupSafe-${pkgver}"
-  python setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python-markupsafe/LICENSE"
-}
-
-package_python2-markupsafe() {
-  depends=('python2')
-
-  cd "${srcdir}/python2-MarkupSafe-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-markupsafe/LICENSE"
-}
diff --git a/testing/python-notify/PKGBUILD b/testing/python-notify/PKGBUILD
deleted file mode 100644
index 674fb34c1..000000000
--- a/testing/python-notify/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168868 2012-10-16 11:55:02Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-
-pkgbase=python-notify
-pkgname=python2-notify
-pkgver=0.1.1
-pkgrel=12
-pkgdesc="Python bindings for libnotify"
-arch=('i686' 'x86_64')
-url="http://www.galago-project.org/"
-license=('GPL')
-depends=('pygtk>=2.22.0' 'libnotify>=0.7.1')
-makedepends=('python2')
-conflicts=('python-notify<=0.1.1-11')
-replaces=('python-notify<=0.1.1-11')
-options=(!libtool)
-source=(http://www.galago-project.org/files/releases/source/notify-python/notify-python-${pkgver}.tar.gz
-        libnotify07.patch
-        notify-python-0.1.1-fix-GTK-symbols.patch)
-md5sums=('8f0ef0939cc8edd2efd896ce5ba80cf4'
-         'b40c4542575d5aef559908fe60a21634'
-         'c6922028da5951e69a6a0167bdb4461c')
-
-build() {
-    cd "${srcdir}/notify-python-${pkgver}"
-
-    patch -Np1 -i "${srcdir}/libnotify07.patch"
-    patch -Np1 -i "${srcdir}/notify-python-0.1.1-fix-GTK-symbols.patch"
-
-    ./configure --prefix=/usr
-
-    # WARNING - we touch src/pynotify.override in build because upstream did not rebuild pynotify.c
-    # from the input definitions, this forces pynotify.c to be regenerated, at some point this can be removed
-    touch src/pynotify.override
-
-    make clean
-    make
-}
-
-package_python2-notify() {
-    cd "${srcdir}/notify-python-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/python-notify/libnotify07.patch b/testing/python-notify/libnotify07.patch
deleted file mode 100644
index 289573d50..000000000
--- a/testing/python-notify/libnotify07.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs
---- notify-python-0.1.1/src/pynotify.defs.notify070	2010-11-02 17:11:14.928179237 -0400
-+++ notify-python-0.1.1/src/pynotify.defs	2010-11-02 17:11:51.153180231 -0400
-@@ -38,7 +38,6 @@
-     '("const-gchar*" "summary")
-     '("const-gchar*" "message" (null-ok) (default "NULL"))
-     '("const-gchar*" "icon" (null-ok) (default "NULL"))
--    '("GtkWidget*" "attach" (null-ok) (default "NULL"))
-   )
- )
- 
-@@ -53,24 +52,6 @@
-   )
- )
- 
--(define-method attach_to_widget
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_widget")
--  (return-type "none")
--  (parameters
--    '("GtkWidget*" "attach")
--  )
--)
--
--(define-method attach_to_status_icon
--  (of-object "NotifyNotification")
--  (c-name "notify_notification_attach_to_status_icon")
--  (return-type "none")
--  (parameters
--    '("GtkStatusIcon*" "attach")
--  )
--)
--
- (define-method show
-   (of-object "NotifyNotification")
-   (c-name "notify_notification_show")
diff --git a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch b/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
deleted file mode 100644
index f985c0136..000000000
--- a/testing/python-notify/notify-python-0.1.1-fix-GTK-symbols.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -up notify-python-0.1.1/src/__init__.py.BAD notify-python-0.1.1/src/__init__.py
---- notify-python-0.1.1/src/__init__.py.BAD	2010-08-31 09:04:45.353844005 -0400
-+++ notify-python-0.1.1/src/__init__.py	2010-08-31 09:04:49.281844300 -0400
-@@ -1 +1,21 @@
-+"""
-+Fedora's libnotify.so is not linked against GTK2 or GTK3. The idea
-+was to support being linked against different parallel-installable
-+GTK stacks.
-+
-+Unfortunately, python needs to jump through some special hoops in order
-+to share symbols with extension modules, specifically, pygtk, which does
-+link against GTK2.
-+
-+Without using sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL),
-+the result is:
-+libnotify-WARNING **: Missing symbol 'gdk_screen_make_display_name'
-+
-+Thanks to David Malcolm for figuring out the workaround.
-+"""
-+import ctypes
-+import sys
-+sys.setdlopenflags(sys.getdlopenflags() | ctypes.RTLD_GLOBAL)
-+import gtk
-+
- from _pynotify import *
diff --git a/testing/python-numpy/PKGBUILD b/testing/python-numpy/PKGBUILD
deleted file mode 100755
index e295dec87..000000000
--- a/testing/python-numpy/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 168869 2012-10-16 11:55:07Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-
-pkgbase=python-numpy
-pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.7.0
-_pkgver=1.7.0b2
-pkgrel=1
-pkgdesc="Scientific tools for Python"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://numpy.scipy.org/"
-makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
-source=(http://downloads.sourceforge.net/numpy/numpy-${_pkgver}.tar.gz)
-md5sums=('1b62cf0e34e2db58b0241b00d603df24')
-
-build() {
-  cd "${srcdir}"
-  cp -a numpy-${_pkgver} numpy-py2-${_pkgver}
-
-  export Atlas=None
-  export LDFLAGS="$LDFLAGS -shared"
-
-  echo "Building Python2"
-  cd "${srcdir}/numpy-py2-${_pkgver}"
-  python2 setup.py config_fc --fcompiler=gnu95 build
-
-  echo "Building Python3"
-  cd "${srcdir}/numpy-${_pkgver}"
-  python setup.py config_fc --fcompiler=gnu95 build
-}
-
-package_python2-numpy() {
-  depends=('lapack' 'python2')
-  optdepends=('python-nose: testsuite')
-
-  cd "${srcdir}/numpy-py2-${_pkgver}"
-  python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/"
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-         -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-         -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
-             $(find ${pkgdir} -name '*.py')
-}
-
-package_python-numpy() {
-  depends=('lapack' 'python')
-  provides=("python3-numpy=${pkgver}")
-  replaces=('python3-numpy')
-  conflicts=('python3-numpy')
-
-  cd "${srcdir}/numpy-${_pkgver}"
-  python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/python3-numpy"
-  install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python3-numpy/"
-}
diff --git a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch b/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
deleted file mode 100644
index 072afbc0e..000000000
--- a/testing/python-numpy/numpy-1.6.2-python-3.3-build-fix.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
-index 00c71f9..0afdc17 100644
---- a/numpy/core/src/multiarray/scalarapi.c
-+++ b/numpy/core/src/multiarray/scalarapi.c
-@@ -641,6 +641,40 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
-             itemsize = (((itemsize - 1) >> 2) + 1) << 2;
-         }
-     }
-+#if PY_VERSION_HEX >= 0x03030000
-+    if (type_num == NPY_UNICODE) {
-+        PyObject *u, *args;
-+        char *buffer;
-+        if (swap) {
-+            buffer = malloc(itemsize);
-+            if (buffer == NULL) {
-+                PyErr_NoMemory();
-+                return NULL;
-+            }
-+            memcpy(buffer, data, itemsize);
-+            byte_swap_vector(buffer, itemsize >> 2, 4);
-+        } else {
-+            buffer = data;
-+        }
-+        u = PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, buffer,
-+                itemsize >> 2);
-+        if (swap) {
-+            free(buffer);
-+        }
-+        if (u == NULL) {
-+            return NULL;
-+        }
-+        args = Py_BuildValue("(O)", u);
-+        if (args == NULL) {
-+            Py_DECREF(u);
-+            return NULL;
-+        }
-+        obj = type->tp_new(type, args, NULL);
-+        Py_DECREF(u);
-+        Py_DECREF(args);
-+        return obj;
-+    }
-+#endif
-     if (type->tp_itemsize != 0) {
-         /* String type */
-         obj = type->tp_alloc(type, itemsize);
-@@ -672,6 +706,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
-             memcpy(destptr, data, itemsize);
-             return obj;
-         }
-+#if PY_VERSION_HEX < 0x03030000
-         else if (type_num == PyArray_UNICODE) {
-             /* tp_alloc inherited from Python PyBaseObject_Type */
-             PyUnicodeObject *uni = (PyUnicodeObject*)obj;
-@@ -743,6 +778,7 @@ PyArray_Scalar(void *data, PyArray_Descr *descr, PyObject *base)
- #endif
-             return obj;
-         }
-+#endif // PY_VERSION_HEX < 0x03030000
-         else {
-             PyVoidScalarObject *vobj = (PyVoidScalarObject *)obj;
-             vobj->base = NULL;
-diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
-index e547071..12745d7 100644
---- a/numpy/core/src/multiarray/scalartypes.c.src
-+++ b/numpy/core/src/multiarray/scalartypes.c.src
-@@ -2592,7 +2592,11 @@ finish:
-     *((npy_@name@ *)dest) = *((npy_@name@ *)src);
- #elif @default@ == 1 /* unicode and strings */
-     if (itemsize == 0) { /* unicode */
-+#if PY_VERSION_HEX >= 0x03030000
-+        itemsize = PyUnicode_GetLength(robj) * PyUnicode_KIND(robj);
-+#else
-         itemsize = ((PyUnicodeObject *)robj)->length * sizeof(Py_UNICODE);
-+#endif
-     }
-     memcpy(dest, src, itemsize);
-     /* @default@ == 2 won't get here */
-diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
-index c4147ef..119056c 100644
---- a/numpy/core/src/multiarray/methods.c
-+++ b/numpy/core/src/multiarray/methods.c
-@@ -1587,7 +1587,7 @@ array_setstate(PyArrayObject *self, PyObject *args)
-     if (!PyDataType_FLAGCHK(typecode, NPY_LIST_PICKLE)) {
-         int swap=!PyArray_ISNOTSWAPPED(self);
-         self->data = datastr;
--        if (!_IsAligned(self) || swap) {
-+        if (!_IsAligned(self) || swap || (len <= 1000)) {
-             intp num = PyArray_NBYTES(self);
-             self->data = PyDataMem_NEW(num);
-             if (self->data == NULL) {
--- 
-1.7.12.3
diff --git a/testing/python-pyspi/PKGBUILD b/testing/python-pyspi/PKGBUILD
deleted file mode 100644
index 0fb75b940..000000000
--- a/testing/python-pyspi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168874 2012-10-16 11:55:20Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=python-pyspi
-pkgname=python2-pyspi
-pkgver=0.6.1
-pkgrel=1
-pkgdesc="Python AT-SPI bindings"
-arch=('i686' 'x86_64')
-url="http://people.redhat.com/zcerza/dogtail"
-license=('LGPL')
-depends=('python2' 'at-spi')
-makedepends=('pyrex')
-conflicts=('python-pyspi<=0.6.1-5')
-conflicts=('python-pyspi<=0.6.1-5')
-source=("http://dlc.sun.com/osol/jds/downloads/sources/pyspi-${pkgver}.tar.gz"
-        'pyspi-build.patch')
-md5sums=('def336bd566ea688a06ec03db7ccf1f4'
-         '721f74cbae653a258c00b83acf7dd1da')
-
-build() {
-  cd ${srcdir}/pyspi-${pkgver}
-  patch -Np1 -i ${srcdir}/pyspi-build.patch
-  # Pyrex tells us to use __cinit__ instead of __new__
-  sed -i 's/__new__/__cinit__/' pyspi.pyx
-}
-
-package_python2-pyspi() {
-  cd ${srcdir}/pyspi-${pkgver}
-  python2 setup.py install --root=${pkgdir}
-}
diff --git a/testing/python-pyspi/pyspi-build.patch b/testing/python-pyspi/pyspi-build.patch
deleted file mode 100644
index 3d12c5ed5..000000000
--- a/testing/python-pyspi/pyspi-build.patch
+++ /dev/null
@@ -1,1693 +0,0 @@
-diff -Naur pyspi-0.6.1-old/cspi.pxd pyspi-0.6.1/cspi.pxd
---- pyspi-0.6.1-old/cspi.pxd	2006-08-04 06:27:10.000000000 +1000
-+++ pyspi-0.6.1/cspi.pxd	2009-05-09 15:24:31.000000000 +1000
-@@ -14,9 +14,7 @@
- 
- 	ctypedef struct AccessibleTextRange
- 	ctypedef struct AccessibleKeySet
--	ctypedef enum SPIBoolean:
--		FALSE = 0,
--		TRUE
-+	ctypedef unsigned int SPIBoolean
- 
- 	ctypedef struct AccessibleEvent:
- 		char  *type
-diff -Naur pyspi-0.6.1-old/pyspi.pyx pyspi-0.6.1/pyspi.pyx
---- pyspi-0.6.1-old/pyspi.pyx	2006-10-03 02:46:41.000000000 +1000
-+++ pyspi-0.6.1/pyspi.pyx	2009-05-09 15:24:31.000000000 +1000
-@@ -25,9 +25,15 @@
- cdef class Event (EventBase)
- cdef class DeviceEvent
- 
--ctypedef enum bool:
-+ctypedef unsigned int bool
-+
-+import __builtin__
-+try:
-+	False = __builtin__.False
-+	True = __builtin__.True
-+except AttributeError:
- 	False = 0
--	True
-+	True = 1
- 
- # SPIExceptionCode values:
- (SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
-@@ -731,7 +737,7 @@
- 	Wrapper around the low-level cspi.AccessibleComponent_ functions,
- 	giving an OO-style API.
- 	"""
--	def getExtents (self, type=0):
-+	def getExtents (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleComponent_getExtents, returning an
- 		(x,y,w,h) tuple.
-@@ -741,7 +747,7 @@
- 		cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type)
- 		return (x, y, w, h)
- 
--	def getPosition (self, type = 0):
-+	def getPosition (self, key_type = 0):
- 		"""
- 		Wraps cspi.AccessibleComponent_getPosition, returning an
- 		(x,y) tuple.
-@@ -991,11 +997,11 @@
- 		Wraps cspi.AccessibleHyperlink_getObject
- 		"""
- 		self.__checkSelf ()
--		cdef Accessible object
--		object = Accessible ()
--		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
--		object.__checkSelf ()
--		return object
-+		cdef Accessible obj
-+		obj = Accessible ()
-+		obj.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-+		obj.__checkSelf ()
-+		return obj
- 
- 	def getURI (self, i):
- 		"""
-@@ -1032,7 +1038,7 @@
- 		cspi.AccessibleImage_getImageSize(self.__item, &w, &h);
- 		return [w, h]
- 
--	def getImagePosition (self, type=0):
-+	def getImagePosition (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y)
- 		pair
-@@ -1042,7 +1048,7 @@
- 		cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type)
- 		return [x, y]
- 
--	def getImageExtents (self, type=0):
-+	def getImageExtents (self, key_type=0):
- 		"""
- 		Wraps cspi.AccessibleImage_getImageExtents, returning a
- 		(x,y,w,h) tuple
-@@ -1551,7 +1557,7 @@
- 	cdef cspi.AccessibleDeviceListener *__item
- 	cdef public object modMasks
- 
--	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
-+	def __init__ (self, callback, eventMask = <int> cspi.SPI_KEY_PRESSED | <int> cspi.SPI_KEY_RELEASED):
- 		"""
- 		Registers a python callback function to be called.
- 
-diff -Naur pyspi-0.6.1-old/pyspi.pyx.orig pyspi-0.6.1/pyspi.pyx.orig
---- pyspi-0.6.1-old/pyspi.pyx.orig	1970-01-01 10:00:00.000000000 +1000
-+++ pyspi-0.6.1/pyspi.pyx.orig	2006-10-03 02:46:41.000000000 +1000
-@@ -0,0 +1,1592 @@
-+# Authors:
-+#          Zack Cerza <zcerza@redhat.com>
-+#          Chris Lee <clee@redhat.com>
-+#          Lawrence Lim <llim@redhat.com>
-+#          David Malcolm <dmalcolm@redhat.com>
-+
-+cdef class Registry
-+
-+cdef class Base
-+cdef class EventBase
-+cdef class StateSet
-+cdef class Accessible (Base)
-+cdef class Desktop (Accessible)
-+cdef class Application (Accessible)
-+cdef class Component (Accessible)
-+cdef class Action (Base)
-+cdef class Text (Base)
-+cdef class EditableText (Text)
-+cdef class Hypertext (Text)
-+cdef class Hyperlink (Base)
-+cdef class Image (Base)
-+cdef class Value (Base)
-+cdef class Selection (Base)
-+cdef class Table (Base)
-+cdef class Event (EventBase)
-+cdef class DeviceEvent
-+
-+ctypedef enum bool:
-+	False = 0
-+	True
-+
-+# SPIExceptionCode values:
-+(SPI_EXCEPTION_UNSPECIFIED, SPI_EXCEPTION_DISCONNECT, SPI_EXCEPTION_NO_IMPL, SPI_EXCEPTION_IO, SPI_EXCEPTION_BAD_DATA)=range(5) 
-+
-+# SPIExceptionType values:
-+(SPI_EXCEPTION_SOURCE_UNSPECIFIED, SPI_EXCEPTION_SOURCE_ACCESSIBLE, SPI_EXCEPTION_SOURCE_REGISTRY, SPI_EXCEPTION_SOURCE_DEVICE)=range(4)
-+
-+# Accessible roles
-+(SPI_ROLE_INVALID, SPI_ROLE_ACCEL_LABEL, SPI_ROLE_ALERT, SPI_ROLE_ANIMATION, SPI_ROLE_ARROW, SPI_ROLE_CALENDAR, SPI_ROLE_CANVAS, SPI_ROLE_CHECK_BOX, SPI_ROLE_CHECK_MENU_ITEM, SPI_ROLE_COLOR_CHOOSER, SPI_ROLE_COLUMN_HEADER, SPI_ROLE_COMBO_BOX, SPI_ROLE_DATE_EDITOR, SPI_ROLE_DESKTOP_ICON, SPI_ROLE_DESKTOP_FRAME, SPI_ROLE_DIAL, SPI_ROLE_DIALOG, SPI_ROLE_DIRECTORY_PANE, SPI_ROLE_DRAWING_AREA, SPI_ROLE_FILE_CHOOSER, SPI_ROLE_FILLER, SPI_ROLE_FONT_CHOOSER, SPI_ROLE_FRAME, SPI_ROLE_GLASS_PANE, SPI_ROLE_HTML_CONTAINER, SPI_ROLE_ICON, SPI_ROLE_IMAGE, SPI_ROLE_INTERNAL_FRAME, SPI_ROLE_LABEL, SPI_ROLE_LAYERED_PANE, SPI_ROLE_LIST, SPI_ROLE_LIST_ITEM, SPI_ROLE_MENU, SPI_ROLE_MENU_BAR, SPI_ROLE_MENU_ITEM, SPI_ROLE_OPTION_PANE, SPI_ROLE_PAGE_TAB, SPI_ROLE_PAGE_TAB_LIST, SPI_ROLE_PANEL, SPI_ROLE_PASSWORD_TEXT, SPI_ROLE_POPUP_MENU, SPI_ROLE_PROGRESS_BAR, SPI_ROLE_PUSH_BUTTON, SPI_ROLE_RADIO_BUTTON, SPI_ROLE_RADIO_MENU_ITEM, SPI_ROLE_ROOT_PANE, SPI_ROLE_ROW_HEADER, SPI_ROLE_SCROLL_BAR, SPI_ROLE_SCROLL_PANE, SPI_ROLE_SEPARATOR, SPI_ROLE_SLIDER, SPI_ROLE_SPIN_BUTTON, SPI_ROLE_SPLIT_PANE, SPI_ROLE_STATUS_BAR, SPI_ROLE_TABLE, SPI_ROLE_TABLE_CELL, SPI_ROLE_TABLE_COLUMN_HEADER, SPI_ROLE_TABLE_ROW_HEADER, SPI_ROLE_TEAROFF_MENU_ITEM, SPI_ROLE_TERMINAL, SPI_ROLE_TEXT, SPI_ROLE_TOGGLE_BUTTON, SPI_ROLE_TOOL_BAR, SPI_ROLE_TOOL_TIP, SPI_ROLE_TREE, SPI_ROLE_TREE_TABLE, SPI_ROLE_UNKNOWN, SPI_ROLE_VIEWPORT, SPI_ROLE_WINDOW, SPI_ROLE_EXTENDED, SPI_ROLE_HEADER, SPI_ROLE_FOOTER, SPI_ROLE_PARAGRAPH, SPI_ROLE_RULER, SPI_ROLE_APPLICATION, SPI_ROLE_AUTOCOMPLETE, SPI_ROLE_EDITBAR, SPI_ROLE_EMBEDDED, SPI_ROLE_LAST_DEFINED)=range(79)
-+
-+# Accessible states
-+(SPI_STATE_INVALID, SPI_STATE_ACTIVE, SPI_STATE_ARMED, SPI_STATE_BUSY, SPI_STATE_CHECKED, SPI_STATE_COLLAPSED, SPI_STATE_DEFUNCT, SPI_STATE_EDITABLE, SPI_STATE_ENABLED, SPI_STATE_EXPANDABLE, SPI_STATE_EXPANDED, SPI_STATE_FOCUSABLE, SPI_STATE_FOCUSED, SPI_STATE_HORIZONTAL, SPI_STATE_ICONIFIED, SPI_STATE_MODAL, SPI_STATE_MULTI_LINE, SPI_STATE_MULTISELECTABLE, SPI_STATE_OPAQUE, SPI_STATE_PRESSED, SPI_STATE_RESIZABLE, SPI_STATE_SELECTABLE, SPI_STATE_SELECTED, SPI_STATE_SENSITIVE, SPI_STATE_SHOWING, SPI_STATE_SINGLE_LINE, SPI_STATE_STALE, SPI_STATE_TRANSIENT, SPI_STATE_VERTICAL, SPI_STATE_VISIBLE, SPI_STATE_MANAGES_DESCENDANTS, SPI_STATE_INDETERMINATE) = range(32);
-+
-+# Accessible relation types
-+(SPI_RELATION_NULL, SPI_RELATION_LABEL_FOR, SPI_RELATION_LABELED_BY, SPI_RELATION_CONTROLLER_FOR, SPI_RELATION_CONTROLLED_BY, SPI_RELATION_MEMBER_OF, SPI_RELATION_NODE_CHILD_OF, SPI_RELATION_EXTENDED, SPI_RELATION_FLOWS_TO, SPI_RELATION_FLOWS_FROM, SPI_RELATION_SUBWINDOW_OF, SPI_RELATION_EMBEDS, SPI_RELATION_EMBEDDED_BY, SPI_RELATION_POPUP_FOR, SPI_RELATION_LAST_DEFINED) = range (15);
-+
-+# AccessibleComponent layers
-+(SPI_LAYER_INVALID, SPI_LAYER_BACKGROUND, SPI_LAYER_CANVAS, SPI_LAYER_WIDGET, SPI_LAYER_MDI, SPI_LAYER_POPUP, SPI_LAYER_OVERLAY, SPI_LAYER_WINDOW, SPI_LAYER_LAST_DEFINED) = range(9)
-+
-+#AccessibleKeySynthType
-+(SPI_KEY_PRESS, SPI_KEY_RELEASE, SPI_KEY_PRESSRELEASE, SPI_KEY_SYM, SPI_KEY_STRING) = range(5)
-+
-+# AccessibleKeyListenerSyncType
-+(SPI_KEYLISTENER_NOSYNC, SPI_KEYLISTENER_SYNCHRONOUS, SPI_KEYLISTENER_CANCONSUME, SPI_KEYLISTENER_ALL_WINDOWS) = range(4)
-+
-+# AccessibleDeviceEventType
-+SPI_KEY_PRESSED  = 1<<0
-+SPI_KEY_RELEASED = 1<<1
-+SPI_BUTTON_PRESSED = 1<<2
-+SPI_BUTTON_RELEASED = 1<<3
-+
-+cdef cspi.AccessibleKeySet *SPI_KEYSET_ALL_KEYS
-+SPI_KEYSET_ALL_KEYS = NULL
-+
-+Accessibility_MODIFIER_SHIFT = 1 << 0
-+Accessibility_MODIFIER_SHIFTLOCK = 1 << 1
-+Accessibility_MODIFIER_CONTROL = 1 << 2
-+Accessibility_MODIFIER_ALT = 1 << 3
-+Accessibility_MODIFIER_META = 1 << 4
-+Accessibility_MODIFIER_META2 = 1 << 5
-+Accessibility_MODIFIER_META3 = 1 << 6
-+Accessibility_MODIFIER_NUMLOCK = 1 << 7
-+
-+
-+cdef object string(char * string):
-+	cdef object pyString
-+	pyString = string
-+	cspi.SPI_freeString(string)
-+	return pyString
-+
-+import os
-+class X11Exception(Exception):
-+	def __init__(self, display = os.environ.get('DISPLAY', None)):
-+		self.display = display
-+	def __str__(self):
-+		msg = "Cannot open display"
-+		if self.display: return msg + ': ' + self.display
-+		else: return msg
-+
-+class AtspiException(Exception):
-+	"""
-+	Exceptions raised when calls to the AT-SPI C bindings return FALSE to
-+	indicate failure.
-+	"""
-+	def __init__(self, message):
-+		self.message = message
-+
-+	def __str__(self):
-+		return "AtspiException: %s"%self.message
-+
-+class SpiException(Exception):
-+	"""
-+	Exceptions to be raised in response to an installed
-+	SPIExceptionHandler, corresponding to a SPIException.  These appear to
-+	be short-lived structs, so we gather all applicable data immediately
-+	"""
-+	def __init__(self, is_fatal, sourceType, exceptionCode, description):
-+		# print "got to __init__"
-+		self.fatal = is_fatal
-+		self.sourceType = sourceType
-+		self.exceptionCode = exceptionCode
-+		self.description = description
-+		
-+		# print "leaving __init__"
-+		# print self.fatal
-+		# print self.sourceType
-+		# print self.exceptionCode
-+		# print self.description
-+
-+	def __str__(self):
-+		if self.fatal:
-+			fatalStr = "Fatal"
-+		else:
-+			fatalStr = "Non-fatal"
-+		result = '%s SPIException: type:%s source:%s "%s"'%(fatalStr, self.sourceType, self.exceptionCode, self.description)
-+		return result
-+
-+cdef make_exception(cspi.SPIException *err, cspi.SPIBoolean is_fatal):
-+	# Don't attempt to use SPIAccessibleException_getSource; this is error
-+	# handling code, we don't want to introduce further complications
-+	return SpiException(is_fatal,
-+			    cspi.SPIException_getSourceType (err),
-+			    cspi.SPIException_getExceptionCode (err),
-+			    cspi.SPIException_getDescription (err))
-+
-+	
-+def event_main():
-+	cspi.SPI_event_main()
-+
-+def event_quit():
-+	cspi.SPI_event_quit()
-+
-+cdef cspi.SPIBoolean exception_handler (cspi.SPIException *err, cspi.SPIBoolean is_fatal) except *:
-+	# print "got exception!!!"
-+	e = make_exception(err, is_fatal)
-+	raise e
-+
-+# at-spi-<version>/cpsi.h contains:
-+#   typedef SPIBoolean (*SPIExceptionHandler) (SPIException *err, SPIBoolean is_fatal);
-+# and
-+#   SPIBoolean SPI_exceptionHandlerPush (SPIExceptionHandler *handler);
-+# There's thus an extra unnecessary level of indirection.
-+# We have to jump through the following hoops to get pyrex to deal with this:
-+cdef cspi.SPIExceptionHandler exception_handler_as_type
-+cdef cspi.SPIExceptionHandler* exception_handler_ptr
-+exception_handler_as_type = exception_handler
-+exception_handler_ptr = &exception_handler_as_type
-+
-+global_exception = None
-+
-+cdef class Registry:
-+	def __init__ (self):
-+		cdef Xlib.Display *display
-+		display = Xlib.XOpenDisplay(NULL)
-+		if display == NULL:
-+			raise X11Exception
-+		else:
-+			Xlib.XCloseDisplay(display)
-+
-+		result = cspi.SPI_init ()
-+		#if result!=0:
-+		#	raise AtspiException("SPI_init: exit code %s" % str(result))
-+
-+		result = cspi.SPI_exceptionHandlerPush (exception_handler_ptr)
-+		if not result:
-+			raise AtspiException("Unable to install SPI exception handler")
-+
-+	def __dealloc (self):
-+		result = cspi.SPI_exit ()
-+		if result!=0:
-+			raise AtspiException("SPI_init: exit code %s" % str(result))
-+
-+	def getDesktopCount (self):
-+		return cspi.SPI_getDesktopCount()
-+
-+	def getDesktop (self, index = 0):
-+		cdef Desktop desktop
-+		desktop = Desktop ()
-+		if not desktop.__setItem (cspi.SPI_getDesktop (index)):
-+			return False
-+		return desktop
-+
-+	def getDesktopList (self):
-+		# Using the bonobo.activation bindings, getDesktopList() returns a 
-+		# Python list of Desktop objects. The C bindings seem to do it differently,
-+		# and Pyrex doesn't like that method. So we're re-implementing the function
-+		# using getDesktopCount() and getDesktop() to work around that.
-+		# Yay for Zack!
-+		#
-+		#	-Zack
-+		cdef Desktop desktop
-+		desktops = []
-+		desktop = Desktop ()
-+		for i in xrange (cspi.SPI_getDesktopCount ()):
-+			desktop.__setItem (cspi.SPI_getDesktop (i))
-+			desktops = desktops + [desktop]
-+		return desktops
-+
-+registry = Registry()
-+
-+cdef class Base:
-+	"""
-+	Wrapper around a cspi.Accessible
-+	"""
-+	
-+	cdef cspi.Accessible *__item
-+	
-+	def __new__ (self):
-+		self.__item = NULL
-+	
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.Accessible_unref (self.__item)
-+
-+	cdef bool __setItem (self, cspi.Accessible *obj):
-+		if self.__item != NULL:
-+			cspi.Accessible_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.Accessible_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+	
-+	def __checkSelf (self):
-+		assert self.__item != NULL
-+
-+# WHY OH WHY won't this work? :(
-+# I need to be able to find out of two Accessible classes contain
-+# the same cspi.Accessible objects.
-+#
-+#	def isSameAs (self, base):
-+#		cdef bool foo
-+#		foo = self.__item == base.__item
-+#		return foo
-+
-+cdef class EventBase:
-+	"""
-+	Wrapper around a cspi.AccessibleEvent
-+	"""
-+	cdef cspi.AccessibleEvent *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleEvent_unref (self.__item)
-+
-+	cdef bool __setItem (self, cspi.AccessibleEvent *obj):
-+		if self.__item != NULL: 
-+			cspi.AccessibleEvent_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleEvent_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	def __getattr__ (self, attrName):
-+		cdef cspi.Accessible* acc
-+		cdef Accessible result
-+		if attrName == "source":
-+			acc = self.__item.source
-+			if acc!=NULL:
-+				result = Accessible ()
-+				result.__setItem (acc)
-+				return result
-+		elif attrName == "detail1":
-+			detail1 = self.__item.detail1
-+			return detail1
-+		elif attrName == "detail2":
-+			detail1 = self.__item.detail2
-+			return detail1
-+		elif attrName == "type":
-+			return self.__item.type
-+
-+cdef class StateSet:
-+	"""
-+	Wrapper around a cspi.AccessibleStateSet
-+	"""
-+	cdef cspi.AccessibleStateSet *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleStateSet_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	cdef bool __setItem (self, cspi.AccessibleStateSet *obj):
-+		if self.__item != NULL:
-+			cspi.AccessibleStateSet_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleStateSet_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	cdef bool __contains (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		return cspi.AccessibleStateSet_contains (self.__item, s)
-+
-+	def contains (self, state):
-+		self.__checkSelf ()
-+		return self.__contains(state)
-+
-+	cdef void __add (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		cspi.AccessibleStateSet_add(self.__item, s)
-+
-+	def add (self, state):
-+		self.__checkSelf ()
-+		self.__add (state)
-+
-+	cdef void __remove (self, cspi.AccessibleState s):
-+		self.__checkSelf ()
-+		cspi.AccessibleStateSet_remove (self.__item, s)
-+
-+	def remove (self, state):
-+		self.__checkSelf ()
-+		self.__remove (state)
-+		
-+	def __str__ (self):
-+		self.__checkSelf ()
-+		return str(self.states)
-+
-+	def __getattr__(self, name):
-+		if name == "states":
-+			result = []
-+			for state in range(SPI_STATE_INVALID, SPI_STATE_INDETERMINATE):
-+				if self.contains(state):
-+					result.append(state)
-+			return result
-+		else:
-+			raise AttributeError, name
-+
-+cdef class Relation:
-+	"""
-+	Wrapper around a cspi.AccessibleRelation
-+	"""
-+	cdef cspi.AccessibleRelation *__item
-+
-+	def __new__ (self):
-+		self.__item = NULL
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			cspi.AccessibleRelation_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+	def __str__ (self):
-+		self.__checkSelf ()
-+		return "relation %s -> %s"%(self.getRelationType (), self.getTargets())
-+
-+	def __repr__ (self):
-+		self.__checkSelf ()
-+		return "relation %s -> %s"%(self.getRelationType (), self.getTargets())
-+
-+	cdef bool __setItem (self, cspi.AccessibleRelation *obj):
-+		if self.__item != NULL:
-+			cspi.AccessibleRelation_unref (self.__item)
-+		if obj != NULL:
-+			self.__item = obj
-+			cspi.AccessibleRelation_ref (self.__item)
-+			return True
-+		else:
-+			return False
-+
-+	def getNTargets (self):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getNTargets
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleRelation_getNTargets (self.__item)
-+
-+	def getTarget (self, i):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getTarget
-+		"""
-+		self.__checkSelf ()
-+		cdef Accessible target
-+		target = Accessible ()
-+		target.__setItem (cspi.AccessibleRelation_getTarget (self.__item, i))
-+		target.__checkSelf ()
-+		return target
-+
-+	def getTargets (self):
-+		"""
-+		Gets the targets of this AccessibleRelation as a list of atspi.Accessible
-+		"""
-+		self.__checkSelf ()
-+		result = []
-+		count = self.getNTargets()
-+		for i in range(count):
-+			result.append(self.getTarget(i))
-+		return result
-+
-+	def getRelationType (self):
-+		"""
-+		Wrapper around cspi.AccessibleRelation_getRelationType
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleRelation_getRelationType (self.__item)
-+
-+cdef class Accessible (Base):
-+	"""
-+	Wrapper around cspi.Accessible
-+	"""
-+	def __getattr__ (self, name):
-+		if name == "name":
-+			return self.getName ()
-+		elif name == "role":
-+			return self.getRole ()
-+		elif name == "roleName":
-+			return self.getRoleName ()
-+		elif name == "description":
-+			return self.getDescription ()
-+		elif name == "parent":
-+			return self.getParent ()
-+		elif name == "childCount":
-+			return self.getChildCount ()
-+		elif name == "indexInParent":
-+			return self.getIndexInParent ()
-+		elif name == "stateSet":
-+			return self.getStateSet ()
-+		else:
-+			raise AttributeError, name
-+
-+	def getName (self):
-+		"""
-+		Wrapper around cspi.Accessible_getName
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getName(self.__item))
-+
-+	def getDescription (self):
-+		"""
-+		Wrapper around cspi.Accessible_getDescription
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getDescription(self.__item))
-+
-+	def getParent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getParent, returning an
-+		atspi.Accessible or None
-+		"""
-+		self.__checkSelf()
-+		cdef Accessible parent
-+		cdef cspi.Accessible* spiParent
-+		
-+		spiParent = cspi.Accessible_getParent (self.__item)
-+		if spiParent!=NULL:
-+			parent = Accessible ()
-+			parent.__setItem (spiParent)
-+			parent.__checkSelf ()
-+			return parent
-+		else:
-+			return None
-+
-+	def getChildAtIndex (self, index):
-+		"""
-+		Wrapper around cspi.Accessible_getChildAtIndex, returning an
-+		atspi.Accessible, atspi.Application, or None
-+		"""
-+		self.__checkSelf()
-+		cdef int i
-+		i = index
-+		
-+		# This hairiness is due to the fact that Pyrex doesn't allow cdefs 
-+		# inside if blocks.
-+		
-+		cdef cspi.Accessible* spiChild
-+		spiChild = cspi.Accessible_getChildAtIndex (self.__item, i)
-+		# Workaround for GNOME bug #321273
-+		# http://bugzilla.gnome.org/show_bug.cgi?id=321273
-+		if spiChild == NULL: return None
-+		
-+		cdef object child
-+		cdef Application app
-+		cdef Accessible acc
-+		cdef Text text
-+		
-+		if cspi.Accessible_isApplication (spiChild):
-+			app = Application ()
-+			app.__setItem (spiChild)
-+			child = app
-+		else:
-+			acc = Accessible ()
-+			acc.__setItem (spiChild)
-+			child = acc
-+
-+		return child
-+
-+	def getIndexInParent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getIndexInParent
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getIndexInParent (self.__item)
-+
-+	def getRole (self):
-+		"""
-+		Wrapper around cspi.Accessible_getRole
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getRole (self.__item)
-+
-+	def getRoleName (self):
-+		"""
-+		Wrapper around cspi.Accessible_getRoleName
-+		"""
-+		self.__checkSelf()
-+		return string(cspi.Accessible_getRoleName (self.__item))
-+
-+	def getChildCount (self):
-+		"""
-+		Wrapper around cspi.Accessible_getChildCount
-+		"""
-+		self.__checkSelf()
-+		return cspi.Accessible_getChildCount (self.__item)
-+
-+	def getStateSet (self):
-+		"""
-+		Wrapper around cspi.Accessible_getStateSet, returning an
-+		atspi.StateSet
-+		"""
-+		self.__checkSelf()
-+		cdef StateSet set
-+		set = StateSet()
-+		set.__setItem (cspi.Accessible_getStateSet (self.__item))
-+		return set
-+
-+	def getInterface (self, interface):
-+		"""
-+		This is NOT part of cspi, it is just for compatibility with
-+		the bonobo bindings and will probably go away soon.
-+		"""
-+		self.__checkSelf()
-+		return getattr(self, "get%s" % interface) ()
-+
-+	def getAction (self):
-+		"""
-+		Wrapper around cspi.Accessible_getAction, returning
-+		an atspi.Action or None
-+		"""
-+		self.__checkSelf()
-+		cdef Action action
-+		action = Action ()
-+		action.__setItem (cspi.Accessible_getAction (self.__item))
-+		if action.__item != NULL:
-+			return action
-+
-+	def getText (self):
-+		"""
-+		Wrapper around cspi.Accessible_getText, returning an atspi.Text
-+		or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Text text
-+		text = Text ()
-+		text.__setItem (cspi.Accessible_getText (self.__item))
-+		if text.__item != NULL:
-+			return text
-+			
-+	def getEditableText (self):
-+		"""
-+		Wrapper around cspi.Accessible_getText, returning an
-+		atspi.EditableText or None
-+		"""
-+		self.__checkSelf ()
-+		cdef EditableText etext
-+		etext = EditableText ()
-+		etext.__setItem (cspi.Accessible_getEditableText (self.__item))
-+		if etext.__item != NULL:
-+			return etext
-+
-+	def getHypertext (self):
-+		"""
-+		Wrapper around cspi.Accessible_getHypertext, returning an
-+		atspi.Hypertext or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Hypertext hypertext
-+		hypertext = Hypertext ()
-+		hypertext.__setItem (cspi.Accessible_getHypertext (self.__item))
-+		if hypertext.__item != NULL:
-+			return hypertext
-+
-+	def getImage (self):
-+		"""
-+		Wrapper around cspi.Accessible_getImage, returning an
-+		atspi.Image or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Image image
-+		image = Image ()
-+		image.__setItem (cspi.Accessible_getImage (self.__item))
-+		if image.__item != NULL:
-+			return image
-+
-+	def getValue (self):
-+		"""
-+		Wrapper around cspi.Accessible_getValue, returning an
-+		atspi.Value or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Value value
-+		value = Value ()
-+		value.__setItem (cspi.Accessible_getValue (self.__item))
-+		if value.__item != NULL:
-+			return value
-+
-+	def getSelection (self):
-+		"""
-+		Wrapper around cspi.Accessible_getSelection, returning an
-+		atspi.Selection or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Selection selection
-+		selection = Selection ()
-+		selection.__setItem (cspi.Accessible_getSelection (self.__item))
-+		if selection.__item != NULL:
-+			return selection 
-+
-+	def getComponent (self):
-+		"""
-+		Wrapper around cspi.Accessible_getComponent, returning an
-+		atspi.Component or None
-+		"""
-+		self.__checkSelf ()
-+		cdef Component component
-+		component = Component ()
-+		component.__setItem (cspi.Accessible_getComponent (self.__item))
-+		if component.__item != NULL:
-+			return component
-+
-+	def getRelationSet (self):
-+		"""
-+		Wraps Accessible_getRelationSet, returning a list
-+		of atspi.Relation
-+		"""
-+		# looking at at-poke, result from C API appears to be a NULL-terminated list of pointers, and that we should free the buffer
-+		self.__checkSelf ()
-+		cdef Relation relation
-+
-+		relations = []
-+		cdef cspi.AccessibleRelation **relationSet
-+		relationSet = cspi.Accessible_getRelationSet (self.__item)
-+
-+		i=0
-+		while relationSet[i]:
-+			relation = Relation ()
-+			relation.__setItem (relationSet[i])
-+			relations.append(relation)
-+			i=i+1
-+		cspi.free (relationSet)
-+
-+		return relations
-+
-+
-+cdef class Desktop (Accessible):
-+	pass
-+
-+
-+cdef class Application (Accessible):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleApplication_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getToolkit (self):
-+		"""
-+		Wraps AccessibleApplication_getToolkitName, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getToolkitName (self.__item)
-+
-+	def getVersion (self):
-+		"""
-+		Wraps AccessibleApplication_getVersion, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getVersion(self.__item)
-+
-+	def getID (self):
-+		"""
-+		Wraps AccessibleApplication_getID, returning a string
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_getID (self.__item)
-+
-+	def pause (self):
-+		"""
-+		Wraps AccessibleApplication_pause
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_pause (self.__item)
-+
-+	def resume (self):
-+		"""
-+		Wraps AccessibleApplication_resume
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleApplication_resume (self.__item)
-+
-+cdef class Component (Accessible):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleComponent_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getExtents (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleComponent_getExtents, returning an
-+		(x,y,w,h) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y, w, h
-+		cspi.AccessibleComponent_getExtents (self.__item, &x, &y, &w, &h, type)
-+		return (x, y, w, h)
-+
-+	def getPosition (self, type = 0):
-+		"""
-+		Wraps cspi.AccessibleComponent_getPosition, returning an
-+		(x,y) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y
-+		cspi.AccessibleComponent_getPosition (self.__item, &x, &y, type)
-+		return (x, y)
-+
-+	def getSize (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getSize, returning a
-+		(w,h) tuple.
-+		"""
-+		self.__checkSelf ()
-+		cdef long w, h
-+		cspi.AccessibleComponent_getSize (self.__item, &w, &h)
-+		return (w, h)
-+
-+	def getLayer (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getLayer, returning an 
-+		AccessibleComponentLayer.
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleComponent_getLayer (self.__item)
-+
-+	def grabFocus (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_grabFocus, raising AtspiException
-+		if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleComponent_grabFocus (self.__item):
-+			raise AtspiException("AccessibleComponent_grabFocus")
-+	
-+	def getMDIZOrder (self):
-+		"""
-+		Wraps cspi.AccessibleComponent_getMDIZOrder, returning an integer.
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleComponent_getMDIZOrder(self.__item)
-+
-+cdef class Action (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleAction_ functions,
-+	giving an OO-style API.
-+	"""
-+	def __getattr__ (self, name):
-+		if name == "nActions":
-+			return self.getNActions ()
-+		else:
-+			raise AttributeError, name
-+
-+	def getNActions (self):
-+		"""
-+		Wraps cspi.AccessibleAction_getNActions
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_getNActions (self.__item)
-+
-+	def doAction (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_doAction
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_doAction (self.__item, index)
-+
-+	def getKeyBinding (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getKeyBinding
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleAction_getKeyBinding (self.__item, index)
-+
-+	def getName (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getName
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleAction_getName (self.__item, index))
-+
-+	def getDescription (self, index):
-+		"""
-+		Wraps cspi.AccessibleAction_getDescription
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleAction_getDescription (self.__item, index))
-+
-+
-+cdef class Text (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleText_ functions,
-+	giving an OO-style API.
-+	"""
-+	def addSelection (self, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_addSelection
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_addSelection (self.__item, startOffset, endOffset):
-+			raise AtspiException("AccessibleText_addSelection")
-+			
-+
-+	#def getAttributes (self, offset, startOffset, endOffset):
-+	#	self.__checkSelf ()
-+	#	return cspi.AccessibleText_getAttributes (self.__item, offset, startOffset, endOffset)
-+	def getCaretOffset (self):
-+		"""
-+		Wraps cspi.AccessibleText_getCaretOffset
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getCaretOffset (self.__item)
-+
-+	def getCharacterCount (self):
-+		"""
-+		Wraps cspi.AccessibleText_getCharacterCount
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getCharacterCount (self.__item)
-+
-+	def getNSelections (self):
-+		"""
-+		Wraps cspi.AccessibleText_getNSelections
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleText_getNSelections (self.__item)
-+
-+	#def getSelection (self, selectionNum, startOffset, endOffset):
-+	#	self.__checkSelf ()
-+	#	return cspi.AccessibleText_getSelection (self.__item, selectionNum, startOffset, endOffset)
-+
-+	def getText (self, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_getText
-+		"""
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleText_getText (self.__item, startOffset, endOffset))
-+
-+	def removeSelection (self, selectionNum):
-+		"""
-+		Wraps cspi.AccessibleText_removeSelection, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_removeSelection (self.__item, selectionNum):
-+			raise AtspiException("AccessibleText_removeSelection")
-+
-+	def setSelection (self, selectionNum, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleText_setSelection, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_setSelection (self.__item, selectionNum, startOffset, endOffset):
-+			raise AtspiException("AccessibleText_setSelection")
-+
-+	def setCaretOffset (self, position):
-+		"""
-+		Wraps cspi.AccessibleText_setCaretOffset, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleText_setCaretOffset (self.__item, position):
-+			raise AtspiException("AccessibleText_setCaretOffset")
-+
-+cdef class EditableText (Text):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleEditableText_ functions,
-+	giving an OO-style API.
-+	"""
-+	def setTextContents (self, newContents):
-+		"""
-+		Wraps cspi.AccessibleEditableText_setTextContents, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_setTextContents (self.__item, newContents):
-+			raise AtspiException("AccessibleEditableText_setTextContents")
-+
-+	def setAttributes (self, attributes, startOffset, endOffset):
-+		"""
-+		Wraps cspi.AccessibleEditableText_setAttributes, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_setAttributes (self.__item, attributes, startOffset, endOffset):
-+			raise AtspiException("AccessibleEditableText_setAttributes")
-+
-+	def insertText (self, position, text):
-+		"""
-+		Wraps cspi.AccessibleEditableText_insertText, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleEditableText_insertText (self.__item, position, text, cspi.strlen(text)):
-+			raise AtspiException("AccessibleEditableText_insertText")
-+
-+cdef class Hypertext (Text):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleHypertext_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getNLinks (self):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getNLinks, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHypertext_getNLinks (self.__item)
-+
-+	def getLink (self, linkIndex):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getLink, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		cdef Hyperlink hyperlink
-+		hyperlink = Hyperlink ()
-+		hyperlink.__setItem (cspi.AccessibleHypertext_getLink (self.__item, linkIndex))
-+		if hyperlink.__item != NULL:
-+			return hyperlink
-+
-+	def getLinkIndex (self, characterOffset):
-+		"""
-+		Wraps cspi.AccessibleHypertext_getLinkIndex, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHypertext_getLinkIndex (self.__item, characterOffset)
-+
-+cdef class Hyperlink (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleHyperlink_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getNAnchors (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getNAnchors, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_getNAnchors (self.__item)
-+
-+	def getIndexRange (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getIndexRange, returning [startIndex, endIndex] pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long startIndex, endIndex
-+		cspi.AccessibleHyperlink_getIndexRange(self.__item, &startIndex, &endIndex)
-+		return [startIndex, endIndex]
-+
-+
-+	def getObject (self, i):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getObject
-+		"""
-+		self.__checkSelf ()
-+		cdef Accessible object
-+		object = Accessible ()
-+		object.__setItem (cspi.AccessibleHyperlink_getObject (self.__item, i))
-+		object.__checkSelf ()
-+		return object
-+
-+	def getURI (self, i):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_getURI, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_getURI (self.__item, i)
-+
-+	def isValid (self):
-+		"""
-+		Wraps cspi.AccessibleHyperlink_isValid, raising AtspiException if it fails
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleHyperlink_isValid (self.__item)
-+
-+cdef class Image (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleImage_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getImageDescription (self):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleImage_getImageDescription (self.__item)
-+
-+	def getImageSize (self):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageSize, returning a (w,h) pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long w, h
-+		cspi.AccessibleImage_getImageSize(self.__item, &w, &h);
-+		return [w, h]
-+
-+	def getImagePosition (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleImage_getImagePosition, returning a (x,y)
-+		pair
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y
-+		cspi.AccessibleImage_getImagePosition(self.__item, &x, &y, type)
-+		return [x, y]
-+
-+	def getImageExtents (self, type=0):
-+		"""
-+		Wraps cspi.AccessibleImage_getImageExtents, returning a
-+		(x,y,w,h) tuple
-+		"""
-+		self.__checkSelf ()
-+		cdef long x, y, w, h
-+		cspi.AccessibleImage_getImageExtents(self.__item, &x, &y, &w, &h, type)
-+		return [x, y, w, h]
-+
-+cdef class Value (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleValue_ functions,
-+	giving an OO-style API.
-+	"""
-+	def getMinimumValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getMinimumValue(self.__item)
-+
-+	def getCurrentValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getCurrentValue(self.__item)
-+
-+	def getMaximumValue (self):
-+		"""
-+		Wraps cspi.AccessibleValue_getMinimumValue
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleValue_getMaximumValue(self.__item)
-+
-+	def setCurrentValue (self, newValue):
-+		"""
-+		Wraps cspi.AccessibleValue_setCurrentValue
-+		"""
-+		self.__checkSelf ()
-+		if not cspi.AccessibleValue_setCurrentValue (self.__item, newValue):
-+			raise AtspiException("AccessibleValue_setCurrentValue")
-+
-+cdef class Selection (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleSelection_ functions,
-+	giving an OO-style API.
-+	"""
-+
-+	def getNSelectedChildren (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_getNSelectedChildren
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_getNSelectedChildren (self.__item)
-+
-+	def getSelectedChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_getSelectedChild
-+		"""
-+		self.__checkSelf ()
-+
-+		cdef cspi.Accessible* spiChild
-+		spiChild = cspi.AccessibleSelection_getSelectedChild (self.__item, index)
-+
-+		assert spiChild != NULL
-+		
-+		cdef object child
-+		cdef Application app
-+		cdef Accessible acc
-+		cdef Text text
-+		
-+		if cspi.Accessible_isApplication (spiChild):
-+			app = Application ()
-+			app.__setItem (spiChild)
-+			child = app
-+		else:
-+			acc = Accessible ()
-+			acc.__setItem (spiChild)
-+			child = acc
-+
-+		return child
-+
-+	def selectChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_selectChild
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_selectChild (self.__item, index)
-+	
-+	def deselectSelectedChild (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_deselectSelectedChild
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_deselectSelectedChild (self.__item, index)
-+	
-+	def isChildSelected (self, index):
-+		"""
-+		Wraps cspi.AccessibleSelection_isChildSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_isChildSelected (self.__item, index)
-+
-+	def selectAll (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_selectAll
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_selectAll( self.__item)
-+
-+	def clearSelection (self):
-+		"""
-+		Wraps cspi.AccessibleSelection_clearSelection
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleSelection_clearSelection (self.__item)
-+	
-+cdef class Table (Base):
-+	"""
-+	Wrapper around the low-level cspi.AccessibleTable_ functions,
-+	giving an OO-style API.
-+	"""
-+
-+	# def getTableAccessibleAt (self, row, column):
-+	# def getTableCaption (self):
-+
-+	def getTableColumnAtIndex (self, index):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnAtIndex
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnAtIndex(self.__item, index)
-+					
-+	def getTableColumnDescription (self, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnDescription(self.__item, column)
-+
-+	def getTableColumnExtentAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getColumnExtentAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getColumnExtentAt(self.__item, row, column)
-+
-+	# def getTableColumnHeader (self, column):
-+
-+	def getTableIndexAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getIndexAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getIndexAt(self.__item, row, column)
-+
-+	def getTableNColumns (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNColumns
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNColumns(self.__item)
-+
-+	def getTableNRows (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNRows
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNRows(self.__item)
-+
-+	def getTableNSelectedColumns (self):
-+		"""
-+		Wraps cspi.AccessibleTable_getNSelectedColumns
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNSelectedColumns(self.__item)
-+
-+	def getTableNSelectedRows (self):
-+		"""
-+x		Wraps cspi.AccessibleTable_getNSelectedRows
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getNSelectedRows(self.__item)
-+
-+	def getTableRowAtIndex (self, index):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowAtIndex
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowAtIndex(self.__item, index)
-+
-+	def getTableRowDescription (self, row):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowDescription
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowDescription(self.__item, row)
-+
-+	def getTableRowExtentAt (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_getRowExtentAt
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_getRowExtentAt(self.__item, row, column)
-+
-+	# def getTableRowHeader (self, row):
-+ 	# def getTableSelectedRows (self, **selectedRows): - Not sure if the variable which is a pointer to a pointer is acceptable
-+	# def getTableSelectedColumns (self, **selectedColumns): - Same issue as above
-+	# def getTableSummary (self):
-+
-+	def isTableColumnSelected (self, column):
-+		"""
-+		Wraps cspi.AccessibleTable_isColumnSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isColumnSelected(self.__item, column)
-+
-+	def isTableRowSelected (self, row):
-+		"""
-+		Wraps cspi.AccessibleTable_isRowSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isRowSelected(self.__item, row)
-+
-+	def isTableSelected (self, row, column):
-+		"""
-+		Wraps cspi.AccessibleTable_isSelected
-+		"""
-+		self.__checkSelf ()
-+		return cspi.AccessibleTable_isSelected(self.__item, row, column)
-+
-+
-+cdef class Event (EventBase):
-+	#def AccessibleEventListener* SPI_createAccessibleEventListener (AccessibleEventListenerCB callback, void *user_data)
-+	#void AccessibleEventListener_unref (AccessibleEventListener *listener)
-+	#SPIBoolean AccessibleEventListener_addCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback, void *user_data)
-+	#SPIBoolean AccessibleEventListener_removeCallback (AccessibleEventListener *listener, AccessibleEventListenerCB callback)
-+
-+	#Accessible* AccessibleActiveDescendantChangedEvent_getActiveDescendant (AccessibleEvent *event)
-+	#Accessible* AccessibleChildChangedEvent_getChildAccessible (AccessibleEvent *event)
-+	
-+	def getDescriptionChangedEventDescriptionString (self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleDescriptionChangedEvent_getDescriptionString(self.__item))
-+
-+	def getNameChangedEventNameString (self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleNameChangedEvent_getNameString(self.__item))
-+
-+	# Accessible* AccessibleParentChangedEvent_getParentAccessible (AccessibleEvent *event)
-+
-+	def getTableCaptionChangedEventCaptionString(self):
-+		self.__checkSelf()
-+		return string(cspi.AccessibleTableCaptionChangedEvent_getCaptionString(self.__item))
-+
-+	def getTableColumnDescriptionChangedEventDescriptionString(self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTableColumnDescriptionChangedEvent_getDescriptionString(self.__item))
-+
-+	# Accessible* AccessibleTableHeaderChangedEvent_getHeaderAccessible (AccessibleEvent *event)
-+
-+	def getTableRowDescriptionChangedEventDescriptionString(self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTableRowDescriptionChangedEvent_getDescriptionString(self.__item))
-+	
-+	#Accessible* AccessibleTableSummaryChangedEvent_getSummaryAccessible (AccessibleEvent *event)
-+
-+	def getTextChangedEventChangeString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTextChangedEvent_getChangeString(self.__item))
-+
-+	def getTextSelectionChangedEventSelectionString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleTextSelectionChangedEvent_getSelectionString(self.__item))
-+
-+	def getWindowEventTitleString (self):
-+		self.__checkSelf ()
-+		return string(cspi.AccessibleWindowEvent_getTitleString(self.__item))
-+
-+class EventGenerator:
-+	"""
-+	Wrapper layer around SPI_generateKeyboardEvent and
-+	SPI_generateMouseEvent, used for generating input events.
-+
-+	Use AccessibleAction in preference to this.
-+	"""
-+	def injectKeyboardString (self, string):
-+		"""
-+		Inject a string as if it had been typed using an input method.
-+		"""
-+		# Seems to only work if you do it one character at a time...
-+		for char in string:
-+			self.__generateKeystringEvent (str(char), cspi.SPI_KEY_STRING)
-+
-+	def __keyStringToKeyCode(self, keyString):
-+		cdef Xlib.Display *display
-+		display = Xlib.XOpenDisplay(NULL)
-+
-+		cdef Xlib.KeySym sym
-+		sym = Xlib.XStringToKeysym(keyString)
-+		cdef Xlib.KeyCode code
-+		code = Xlib.XKeysymToKeycode(display, sym)
-+
-+		#print str(keyString), str(int(sym)), code
-+
-+		Xlib.XCloseDisplay(display)
-+		return int(code)
-+	
-+	def generateKeyCombo (self, keyStrings):
-+		modifiers = keyStrings[:-1]
-+		finalKey = keyStrings[-1]
-+
-+		for modifier in modifiers:
-+			code = self.__keyStringToKeyCode(modifier)
-+			self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESS)
-+
-+		code = self.__keyStringToKeyCode(finalKey)
-+		self.generateKeyboardEvent(code, '', cspi.SPI_KEY_PRESSRELEASE)
-+
-+		for modifier in modifiers:
-+			code = self.__keyStringToKeyCode(modifier)
-+			self.generateKeyboardEvent(code, '', cspi.SPI_KEY_RELEASE)
-+
-+		
-+	def __generateKeyvalEvent (self, keyval, synthType):
-+		self.generateKeyboardEvent (keyval, None, synthType)
-+
-+	def __generateKeystringEvent (self, keystring, synthType):
-+		self.generateKeyboardEvent (0, keystring, synthType)
-+	
-+	def generateKeyboardEvent (self, keyval, keystring, synthType):
-+		if not cspi.SPI_generateKeyboardEvent (keyval, keystring, synthType):
-+			raise AtspiException("SPI_generateKeyboardEvent")
-+
-+	def click (self, x, y, button):
-+		"""
-+		Synthesize a mouse button click at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "c")
-+
-+	def doubleClick (self, x, y, button):
-+		"""
-+		Synthesize a mouse button double-click at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "d")
-+
-+	def press (self, x, y, button):
-+		"""
-+		Synthesize a mouse button press at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "p")
-+
-+	def release (self, x, y, button):
-+		"""
-+		Synthesize a mouse button release at (x,y)
-+		"""
-+		self.__generateButtonEvent (x, y, button, "r")
-+
-+	def absoluteMotion (self, x, y):
-+		"""
-+		Synthesize mouse absolute motion to (x,y)
-+		"""
-+		self.__generateEvent (x, y, "abs")
-+
-+	def relativeMotion (self, x, y):
-+		"""
-+		Synthesize mouse relative motion of (x,y)
-+		"""
-+		self.__generateEvent (x, y, "rel")
-+
-+	def drag (self, fromXY, toXY, button):
-+		"""
-+		Synthesize a drag (press, move and release) from (x,y) to (x,y).
-+
-+		These are absolute screen coordinates
-+		"""
-+		(x,y) = fromXY
-+		self.press (x, y, button)
-+
-+		(x,y) = toXY
-+		self.absoluteMotion(x,y)
-+
-+		self.release (x, y, button)
-+
-+	def __generateEvent (self, x, y, name):
-+		"""
-+		Thin wrapper around SPI_generateMouseEvent.
-+
-+		Event names: b1p = button 1 press; b2r = button 2 release;
-+		b3c = button 3 click; b2d = button 2 double-click;
-+		abs = absolute motion; rel = relative motion.
-+		"""
-+		if not cspi.SPI_generateMouseEvent (x, y, name):
-+			raise AtspiException("Error generating mouse event")
-+
-+	def __generateButtonEvent (self, x, y, button, suffix):
-+		self.__generateEvent (x, y, self.__generateButtonName(button)+suffix)
-+
-+	def __generateButtonName(self, button):
-+		if button==1:
-+			return "b1"
-+		elif button==2:
-+			return "b2"
-+		elif button==3:
-+			return "b3"
-+		else: raise ValueError, "Unknown button"
-+
-+# We use this C function to marshal a call to a python function.  The Python callback
-+# function is installed as the userdata of this C callback function.  See the
-+# "cheesefinder" demo in the Pyrex sources.
-+# We ignore the "const"ness of the AccessibleEvent
-+cdef void marshalAccessibleEventCallback (cspi.AccessibleEvent *event, void *python_fn) except *:
-+	e = Event()
-+	EventBase.__setItem(e, event)
-+	(<object>python_fn) (e)
-+
-+cdef class EventListener:
-+	"""
-+	Wrapper around the low-level cspi.AccessibleEventListener_ functions,
-+	giving an OO-style API.
-+	"""
-+	cdef cspi.AccessibleEventListener *__item
-+	cdef public object eventTypes
-+
-+	def __init__ (self, callback, eventTypes):
-+		"""
-+		Registers a python callback function to be called.
-+		The callback is expected to have one input, of type atspi.Event, and no return value.
-+		See documentation of SPI_registerGlobalEventListener for the event names
-+		"""
-+		self.eventTypes = eventTypes
-+		self.__item = cspi.SPI_createAccessibleEventListener (marshalAccessibleEventCallback, <void*>callback)
-+		for eventType in self.eventTypes:
-+			#char *e
-+			e = eventType
-+			if not cspi.SPI_registerGlobalEventListener (self.__item, e):
-+				raise AtspiException("Unable to register event listener")
-+
-+	def deregister(self):
-+		for eventType in self.eventTypes:
-+			cspi.SPI_deregisterGlobalEventListener(self.__item, eventType)
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			self.deregister()
-+			cspi.AccessibleEventListener_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+cdef class DeviceEvent:
-+	"""
-+	Wrapper around a cspi.AccessibleDeviceEvent
-+	"""
-+	cdef cspi.AccessibleDeviceEvent *__item
-+	cdef public object keyID
-+	cdef public object keyCode
-+	cdef public object keyString
-+	cdef public object timeStamp
-+	cdef public object type
-+	cdef public object modifiers
-+	cdef public object isText
-+
-+	def __new__ (self):
-+			self.__item = NULL
-+
-+	cdef bool __setItem (self, cspi.AccessibleDeviceEvent *obj):
-+			if obj != NULL:
-+					self.__item = obj
-+					self.keyID = self.__item.keyID
-+					self.keyCode = self.__item.keycode
-+					self.keyString = self.__item.keystring
-+					self.timeStamp = self.__item.timestamp
-+					self.type = self.__item.type
-+					self.modifiers = self.__item.modifiers
-+					if self.__item.is_text: self.isText = True
-+					else: self.isText = False
-+					return True
-+			else:
-+					return False
-+
-+	def __checkSelf (self):
-+			if self.__item == NULL:
-+					raise AttributeError, "__item must not be NULL"
-+
-+#	def __dealloc__ (self):
-+#			if self.__item != NULL:
-+#					cspi.AccessibleDeviceEvent_unref (self.__item)
-+
-+
-+cdef cspi.SPIBoolean marshalAccessibleDeviceEventCallback (cspi.AccessibleDeviceEvent *event, void *python_fn) except 1:
-+	k = DeviceEvent()
-+	#k.__setItem(event)
-+	DeviceEvent.__setItem(k, event)
-+	k.__checkSelf()
-+	(<object>python_fn) (k)
-+	return False
-+
-+cdef class DeviceListener:
-+	"""
-+	Wrapper around the low-level cspi.AccessibleDeviceListener_ functions,
-+	giving an OO-style API.
-+	"""
-+	cdef cspi.AccessibleDeviceListener *__item
-+	cdef public object modMasks
-+
-+	def __init__ (self, callback, eventMask = cspi.SPI_KEY_PRESSED | cspi.SPI_KEY_RELEASED):
-+		"""
-+		Registers a python callback function to be called.
-+
-+		eventMask may be one of the following:
-+        key pressed: 1
-+		key released: 2
-+		key pressed or released (default): 3
-+		"""
-+		self.__item = cspi.SPI_createAccessibleDeviceListener (marshalAccessibleDeviceEventCallback, <void*>callback)
-+		cdef cspi.AccessibleKeySet *keySet
-+		keySet = SPI_KEYSET_ALL_KEYS
-+		self.modMasks = []
-+		cdef short int modMask
-+		syncType = SPI_KEYLISTENER_SYNCHRONOUS | SPI_KEYLISTENER_CANCONSUME
-+		#syncType = SPI_KEYLISTENER_NOSYNC
-+		for modMask from 0 <= modMask < (1 << 8):
-+			self.modMasks.append(modMask)
-+			desc = "keySet "+str(<int> keySet)+" modMask "+str(modMask)+" eventMask "+str(eventMask)+" syncType "+str(syncType)
-+			desc = str(desc)
-+			if not cspi.SPI_registerAccessibleKeystrokeListener (self.__item, keySet, modMask, eventMask, syncType):
-+				raise AtspiException("Unable to register keystroke listener", desc)
-+
-+	def deregister(self):
-+		if self.__item != NULL:
-+			for modMask in self.modMasks:
-+				cspi.SPI_deregisterAccessibleKeystrokeListener(self.__item, modMask)
-+
-+	def __dealloc__ (self):
-+		if self.__item != NULL:
-+			self.deregister()
-+			cspi.AccessibleDeviceListener_unref (self.__item)
-+
-+	def __checkSelf (self):
-+		if self.__item == NULL:
-+			raise AttributeError, "__item must not be NULL"
-+
-+
-+# vim: sw=4 ts=4 sts=4 noet ai
diff --git a/testing/python-pysqlite/PKGBUILD b/testing/python-pysqlite/PKGBUILD
deleted file mode 100644
index 5e889eab9..000000000
--- a/testing/python-pysqlite/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 168875 2012-10-16 11:55:25Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgbase=python-pysqlite
-pkgname=python2-pysqlite
-pkgver=2.6.3
-pkgrel=3
-pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
-license=('custom')
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/pysqlite/"
-depends=('python2' 'sqlite')
-conflicts=('python-pysqlite<=2.6.3-2')
-replaces=('python-pysqlite<=2.6.3-2')
-source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \
-        setup.cfg)
-md5sums=('711afa1062a1d2c4a67acdf02a33d86e'
-         '86dd356c65afd14a22f2f8f64a26441e')
-
-check() {
-    cd "${srcdir}"/pysqlite-${pkgver}/build/lib.*/
-    python2 -c "from pysqlite2 import test; test.test()"
-}
-
-build() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	cp "${srcdir}/setup.cfg" .
-	python2 setup.py build
-}
-
-package_python2-pysqlite() {
-	cd "${srcdir}/pysqlite-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	rm -r "${pkgdir}/usr/pysqlite2-doc"
-}
diff --git a/testing/python-pysqlite/setup.cfg b/testing/python-pysqlite/setup.cfg
deleted file mode 100644
index ba6c77075..000000000
--- a/testing/python-pysqlite/setup.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-[build_ext]
-define=
-include_dirs=/usr/include
-library_dirs=/usr/lib
-libraries=sqlite3
diff --git a/testing/python-urwid/PKGBUILD b/testing/python-urwid/PKGBUILD
deleted file mode 100644
index d1804969c..000000000
--- a/testing/python-urwid/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD,v 1.10 2009/03/13 21:14:09 sergej Exp $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.2
-pkgrel=2
-pkgdesc="Urwid is a curses-based user interface library."
-license=('LGPL')
-arch=('i686' 'x86_64')
-makedepends=('python2-distribute' 'python-distribute')
-url="http://excess.org/urwid/"
-source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('00542bbd15fae7ea60b02a7570edee2b')
-
-build() {
-  cp -r urwid-$pkgver python2-urwid-$pkgver
-
-  cd "$srcdir/urwid-$pkgver"
-  python setup.py build
-
-  cd "$srcdir/python2-urwid-$pkgver"
-  sed -i 's#bin/python#bin/python2#' urwid/*.py
-  
-  python2 setup.py build
-}
-
-package_python-urwid() {
-  depends=('python')
-
-  cd "$srcdir/urwid-$pkgver"
-  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
-package_python2-urwid() {
-  depends=('python2')
- 
-  cd "$srcdir/python2-urwid-$pkgver"
-  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-}
-
diff --git a/testing/python-wpactrl/PKGBUILD b/testing/python-wpactrl/PKGBUILD
deleted file mode 100644
index ea380a61a..000000000
--- a/testing/python-wpactrl/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 168879 2012-10-16 11:55:34Z allan $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-
-pkgbase=python-wpactrl
-pkgname=python2-wpactrl
-pkgver=20090609
-pkgrel=4
-pkgdesc="A Python extension for wpa_supplicant/hostapd control interface access"
-arch=('i686' 'x86_64')
-url="http://projects.otaku42.de/wiki/PythonWpaCtrl"
-license=('GPL2')
-depends=('python2')
-conflicts=('python-wpactrl<=20090609-3')
-replaces=('python-wpactrl<=20090609-3')
-source=(ftp://ftp.archlinux.org/other/${pkgbase}/python-wpactrl-20090609.tar.gz)
-md5sums=('8d45739aa9bfa1110a4570bb5ceda768')
-
-build() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	python2 setup.py build
-}
-
-package_python2-wpactrl() {
-	cd "${srcdir}/${pkgbase}-${pkgver}"
-	python2 setup.py install --root="${pkgdir}"
-}
diff --git a/testing/python/PKGBUILD b/testing/python/PKGBUILD
deleted file mode 100644
index f35fd3cd5..000000000
--- a/testing/python/PKGBUILD
+++ /dev/null
@@ -1,75 +0,0 @@
-# $Id: PKGBUILD 168851 2012-10-16 11:54:17Z allan $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=python
-pkgver=3.3.0
-pkgrel=1
-_pybasever=3.3
-pkgdesc="Next generation of the python high-level scripting language"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.python.org/"
-depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
-makedepends=('tk' 'sqlite' 'valgrind')
-optdepends=('tk: for tkinter' 'sqlite')
-provides=('python3')
-replaces=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
-sha1sums=('833d73565e1b665f1878504081dc985a5a06e46a')
-
-build() {
-  cd "${srcdir}/Python-${pkgver}"
-
-  # FS#23997
-  sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
-
-  # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
-  # rather than copies shipped in the tarball
-  rm -r Modules/expat
-  rm -r Modules/zlib
-  rm -r Modules/_ctypes/{darwin,libffi}*
-
-  ./configure --prefix=/usr \
-              --enable-shared \
-              --with-threads \
-              --with-computed-gotos \
-              --enable-ipv6 \
-              --with-valgrind \
-              --with-system-expat \
-              --with-dbmliborder=gdbm:ndbm \
-              --with-system-ffi
-
-  make
-}
-
-check() {
-  cd "${srcdir}/Python-${pkgver}"
-  LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
-     "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_distutils test_site \
-     test_urllib test_uuid test_pydoc
-}
-
-package() {
-  cd "${srcdir}/Python-${pkgver}"
-  make DESTDIR="${pkgdir}" install maninstall
-
-  # Why are these not done by default...
-  ln -sf python3               "${pkgdir}/usr/bin/python"
-  ln -sf python3-config        "${pkgdir}/usr/bin/python-config"
-  ln -sf idle3                 "${pkgdir}/usr/bin/idle"
-  ln -sf pydoc3                "${pkgdir}/usr/bin/pydoc"
-  ln -sf python${_pybasever}.1 "${pkgdir}/usr/share/man/man1/python3.1"
-
-  # Fix FS#22552
-  ln -sf ../../libpython${_pybasever}m.so \
-    "${pkgdir}/usr/lib/python${_pybasever}/config-${_pybasever}m/libpython${_pybasever}m.so"
-
-  # Clean-up reference to build directory
-  sed -i "s|$srcdir/Python-${pkgver}:||" "$pkgdir/usr/lib/python${_pybasever}/config-${_pybasever}m/Makefile"
-
-  # License
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/qjackctl/PKGBUILD b/testing/qjackctl/PKGBUILD
deleted file mode 100644
index 0884a6587..000000000
--- a/testing/qjackctl/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163957 2012-07-22 18:36:11Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=qjackctl
-pkgver=0.3.9
-pkgrel=2
-pkgdesc="A Qt front-end for the JACK low-latency audio server"
-url="http://qjackctl.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('jack' 'qt')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('f932c916f43ba3251d3a9ed62a448e43')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/qpdf/PKGBUILD b/testing/qpdf/PKGBUILD
deleted file mode 100644
index 6b7ab96cd..000000000
--- a/testing/qpdf/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 165886 2012-09-02 20:15:26Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Miguel Revilla <yo at miguelrevilla.com>
-# Contributor: David Sotelo <dvsotelo at gmail.com>
-# Contributor: Nuno Araujo <nuno.araujo@russo79.com>
-
-pkgname=qpdf
-pkgver=3.0.1
-pkgrel=2
-pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
-arch=('i686' 'x86_64')
-url="http://qpdf.sourceforge.net/"
-license=('custom:Artistic-2.0')
-depends=('pcre' 'perl')
-makedepends=('make')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('48767e2519029d0214cd0fcafa3a8f8c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix rpath errors (from Fedora spec)
-  autoreconf -vfi
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make -k check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" install
-
-  mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname}
-  install -m644 Artistic-2.0 ${pkgdir}/usr/share/licenses/${pkgname}/
-}
diff --git a/testing/qscintilla/PKGBUILD b/testing/qscintilla/PKGBUILD
deleted file mode 100644
index d43b5e295..000000000
--- a/testing/qscintilla/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 168881 2012-10-16 11:55:38Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgbase=qscintilla
-pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
-         'python-qscintilla-common')
-pkgver=2.6.2
-pkgrel=3
-license=('GPL')
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
-makedepends=('python2-pyqt' 'pyqt' 'chrpath')
-source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
-        'configure.py-objdir-support.diff')
-md5sums=('6e6641b6f3863c01cc28c2d7bd2495f9'
-         '8cf9c06252e2f11ab00e62848e322fd3')
-
-build() {
-    cd "${srcdir}/QScintilla-gpl-${pkgver}" 
-    patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
-
-    cd Qt4Qt5
-    qmake qscintilla.pro
-    make
-    
-    cd ../designer-Qt4
-    qmake designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
-    make
-
-    cd ../
-    cp -rf Python Python2
-    cd Python
-    python3 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
-    make
-
-    cd ../Python2
-    python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c -p 4
-    make    
-}
-
-package_qscintilla() {
-    pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
-    depends=('qt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4"
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python-qscintilla-common() {
-    pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
-    depends=('qscintilla')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
-    make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-      
-    # Provided by python-qscintilla
-    rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
-}
-
-package_python-qscintilla() {
-    pkgdesc="Python 3.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'pyqt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
-    install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
-}
-
-package_python2-qscintilla() {
-    pkgdesc="Python 2.x bindings for QScintilla2"
-    depends=('python-qscintilla-common' 'python2-pyqt')
-
-    cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
-    install -Dm755 Qsci.so \
-      "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
-}
diff --git a/testing/qscintilla/configure.py-objdir-support.diff b/testing/qscintilla/configure.py-objdir-support.diff
deleted file mode 100644
index b595de18c..000000000
--- a/testing/qscintilla/configure.py-objdir-support.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_configure.dpatch by Torsten Marek <shlomme@debian.org>
-##
-## DP: patch the configure script for the Python bindings to support object dir builds
-
-@DPATCH@
-Index: qscintilla2-2.4.2/Python/configure.py
-===================================================================
---- qscintilla2-2.4.2.orig/Python/configure.py	2010-01-20 20:56:09.000000000 +0100
-+++ qscintilla2-2.4.2/Python/configure.py	2010-01-27 22:54:35.603870417 +0100
-@@ -33,6 +33,7 @@
- import glob
- import optparse
- 
-+src_dir = os.path.dirname(os.path.abspath(__file__))
- 
- # Import SIP's configuration module so that we have access to the error
- # reporting.  Then try and import the configuration modules for both PyQt3 and
-@@ -162,7 +163,7 @@
-     if os.access(sciglobal, os.F_OK):
-         # Get the QScintilla version string.
-         _, sciversstr = sipconfig.read_version(sciglobal, "QScintilla", "QSCINTILLA_VERSION", "QSCINTILLA_VERSION_STR")
--
-+        return # Debian: do not check for the installed version, we're good this way.
-         if glob.glob(os.path.join(opts.qscilibdir, "*qscintilla2*")):
-             # Because we include the Python bindings with the C++ code we can
-             # reasonably force the same version to be used and not bother about
-@@ -232,9 +233,9 @@
-     argv.append(buildfile)
- 
-     if pyqt.pyqt_version >= 0x040000:
--        argv.append("sip/qscimod4.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod4.sip"))
-     else:
--        argv.append("sip/qscimod3.sip")
-+        argv.append(os.path.join(src_dir, "sip/qscimod3.sip"))
- 
-     os.system(" ".join(argv))
- 
diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD
deleted file mode 100644
index b7a869a92..000000000
--- a/testing/qt/PKGBUILD
+++ /dev/null
@@ -1,137 +0,0 @@
-# $Id: PKGBUILD 166748 2012-09-17 16:06:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite' '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' 'libfbclient')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://releases.qt-project.org/qt4/source/${_pkgfqn}.tar.gz"
-        'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-        'qtconfig.desktop'
-        'improve-cups-support.patch'
-        'fix-crash-in-assistant.patch')
-md5sums=('a663b6c875f8d7caa8ac9c30e4a4ec3b'
-         'fc211414130ab2764132e7370f8e5caa'
-         '85179f5e0437514f8639957e1d8baf62'
-         'f11852b97583610f3dbb669ebc3e21bc'
-         '6b771c8a81dd90b45e8a79afa0e5bbfd'
-         'c439c7731c25387352d8453ca7574971'
-         '57590084078b6379f0501f7728b02ae2')
-
-build() {
-  cd "${srcdir}"/${_pkgfqn}
-
-  # (FS#28381) (KDEBUG#180051)
-  patch -p1 -i "${srcdir}"/improve-cups-support.patch
-
-  # (FS#)
-  patch -p1 -i "${srcdir}"/fix-crash-in-assistant.patch
-  
-  export QT4DIR="${srcdir}"/${_pkgfqn}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
-  sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
-  sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
-  sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
-  ./configure -confirm-license -opensource \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt \
-    -plugindir /usr/lib/qt/plugins \
-    -importdir /usr/lib/qt/imports \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc/xdg \
-    -examplesdir /usr/share/doc/qt/examples \
-    -demosdir /usr/share/doc/qt/demos \
-    -plugin-sql-{psql,mysql,sqlite,odbc,ibase} \
-    -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' 'sqlite' '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'
-                'libfbclient: Firebird/iBase driver'
-                'libxinerama: Xinerama support'
-                'libxcursor: Xcursor support'
-                'libxfixes: Xfixes support')
-    install='qt.install'
-
-    cd "${srcdir}"/${_pkgfqn}
-    make INSTALL_ROOT="${pkgdir}" install
-
-    # install missing icons and desktop files
-    for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
-      size=$(echo $(basename ${icon}) | cut -d- -f2)
-      install -p -D -m644 ${icon} \
-        "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
-    done
-    install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
-      "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
-    install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
-      "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
-    install -p -D -m644 tools/designer/src/designer/images/designer.png \
-      "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
-    install -d "${pkgdir}/usr/share/applications"
-    install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
-      "${pkgdir}/usr/share/applications/"
-
-    # install license addition
-    install -D -m644 LGPL_EXCEPTION.txt \
-      ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
-    # Fix wrong path in pkgconfig files
-    find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
-      -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
-    # Fix wrong path in prl files
-    find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-      -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
-    pkgdesc="Qt private headers for development"
-    depends=("qt=${pkgver}")
-
-    install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
-    install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-    
-    for i in QtCore QtDeclarative QtGui QtScript; do
-      cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
-        "${pkgdir}"/usr/include/${i}/
-    done
-
-    for i in corelib declarative gui script; do
-      cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
-    done
-}
diff --git a/testing/qt/assistant.desktop b/testing/qt/assistant.desktop
deleted file mode 100644
index a9e98c44b..000000000
--- a/testing/qt/assistant.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/testing/qt/designer.desktop b/testing/qt/designer.desktop
deleted file mode 100644
index 9b7b6e9aa..000000000
--- a/testing/qt/designer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/testing/qt/fix-crash-in-assistant.patch b/testing/qt/fix-crash-in-assistant.patch
deleted file mode 100644
index 4246e0532..000000000
--- a/testing/qt/fix-crash-in-assistant.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp	2012-06-26 17:37:47.334536023 +0000
-+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~	2012-06-26 17:37:08.531487286 +0000
-@@ -944,8 +944,7 @@
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
-
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
diff --git a/testing/qt/improve-cups-support.patch b/testing/qt/improve-cups-support.patch
deleted file mode 100644
index e0305e11b..000000000
--- a/testing/qt/improve-cups-support.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp	2010-02-28 04:34:16.000000000 +0100
-@@ -569,6 +569,32 @@
- void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
- {
-     options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
-+
-+    if (cups) {
-+        const ppd_option_t* duplex = cups->ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                options.duplexShort->setChecked(true);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                options.duplexLong->setChecked(true);
-+            else
-+                options.noDuplex->setChecked(true);
-+        }
-+
-+        if (cups->currentPPD()) {
-+            // set default color
-+            if (cups->currentPPD()->color_device)
-+                options.color->setChecked(true);
-+            else
-+                options.grayscale->setChecked(true);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups->ppdOption("Collate");
-+        if (collate)
-+            options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
-+    }
- }
- #endif
- 
-diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
---- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp	2010-02-11 16:55:22.000000000 +0100
-+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp	2010-02-28 04:55:15.000000000 +0100
-@@ -627,6 +627,44 @@
-                && d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
-         setOutputFormat(QPrinter::PdfFormat);
-     }
-+
-+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
-+    // fill in defaults from ppd file
-+    QCUPSSupport cups;
-+
-+    int printernum = -1;
-+    for (int i = 0; i < cups.availablePrintersCount(); i++) {
-+        if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
-+            printernum = i;
-+    }
-+    if (printernum >= 0) {
-+        cups.setCurrentPrinter(printernum);
-+
-+        const ppd_option_t* duplex = cups.ppdOption("Duplex");
-+        if (duplex) {
-+            // copy default ppd duplex to qt dialog
-+            if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
-+                setDuplex(DuplexShortSide);
-+            else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
-+                setDuplex(DuplexLongSide);
-+            else
-+                setDuplex(DuplexNone);
-+        }
-+
-+        if (cups.currentPPD()) {
-+            // set default color
-+            if (cups.currentPPD()->color_device)
-+                setColorMode(Color);
-+            else
-+                setColorMode(GrayScale);
-+        }
-+
-+        // set collation
-+        const ppd_option_t *collate = cups.ppdOption("Collate");
-+        if (collate)
-+            setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
-+    }
-+#endif
- }
- 
- /*!
diff --git a/testing/qt/linguist.desktop b/testing/qt/linguist.desktop
deleted file mode 100644
index 8cbe86599..000000000
--- a/testing/qt/linguist.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/testing/qt/qt.install b/testing/qt/qt.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/qt/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/qt/qtconfig.desktop b/testing/qt/qtconfig.desktop
deleted file mode 100644
index 46dcf9e3d..000000000
--- a/testing/qt/qtconfig.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config 
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/testing/qt3/PKGBUILD b/testing/qt3/PKGBUILD
deleted file mode 100644
index 969cb6aba..000000000
--- a/testing/qt3/PKGBUILD
+++ /dev/null
@@ -1,124 +0,0 @@
-# $Id: PKGBUILD 168290 2012-10-07 22:25:27Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=qt3
-pkgver=3.3.8b
-pkgrel=2
-epoch=1
-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' 'glu' 'libxft'
-         'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-options=('!libtool')
-install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz
-        qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
-        eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
-sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
-          'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
-          '3d19510c46016a1a211d97bf8f82b01498b1b33c'
-          '33418e5b117458af23c72cdbffc0c339bc34bdc4'
-          '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
-          '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 -p0 -i $i 
-  done
-  # apply other qt patches and one security fix from debian/gentoo
-  for i in ../qt-patches/*; do
-    patch -p1 -i $i 
-  done
-  # fix CJK font/chars select error (FS#11245)
-  patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff 
-  # fix build problem against new unixODBC
-  patch -p1 -i "${srcdir}"/qt-odbc.patch 
-  # fix build with gcc 4.6.0
-  patch -p1 -i "${srcdir}"/gcc-4.6.patch
-
-  patch -p0 -i "${srcdir}"/qt3-png15.patch 
-  # start compiling qt
-  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-  rm -rf doc/html examples tutorial
-  sed -i "s|sub-tutorial sub-examples||" Makefile
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
-  sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
-  sed -i "s|read acceptance|acceptance=yes|" configure
-
- # remove unwanted mkspecs
-  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
-  if [ "$CARCH" = "x86_64" ]; then
-      export ARCH="-64"	
-    else unset ARCH
-  fi
-
-  ./configure -prefix /opt/qt \
-    -platform linux-g++$ARCH \
-    -system-zlib \
-    -qt-gif \
-    -release \
-    -shared \
-    -sm \
-    -nis \
-    -thread \
-    -stl \
-    -system-lib{png,jpeg,mng} \
-    -no-g++-exceptions \
-    -plugin-sql-{mysql,psql,sqlite,odbc}
-
-  # fix /opt/qt/lib path
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
-  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make -C qmake 
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
-  cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
-  "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  # fix the broken makefiles
-  #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}"/qt-x11-free-${pkgver}
-  make INSTALL_ROOT="${pkgdir}" install
-  rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
-  sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
-  install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
-  install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
-  ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config 
-  rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
-
-  # install man pages
-  install -d -m755 "${pkgdir}"/opt/qt/man
-  cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
-
-  install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
-  echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
-}
diff --git a/testing/qt3/eastern_asian_languagues.diff b/testing/qt3/eastern_asian_languagues.diff
deleted file mode 100644
index 7c25eef7d..000000000
--- a/testing/qt3/eastern_asian_languagues.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-01-15 21:09:13.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-03-10 11:34:22.000000000 +0200
-@@ -966,20 +966,22 @@
- 
- #ifdef Q_WS_X11
-     if (script == QFont::Han) {
--	// modify script according to locale
--	static QFont::Script defaultHan = QFont::UnknownScript;
--	if (defaultHan == QFont::UnknownScript) {
--	    QCString locale = setlocale(LC_ALL, NULL);
--	    if (locale.contains("ko"))
--		defaultHan = QFont::Han_Korean;
--	    else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
--		defaultHan = QFont::Han_TraditionalChinese;
--	    else if (locale.contains("zh"))
--		defaultHan = QFont::Han_SimplifiedChinese;
--	    else
--		defaultHan = QFont::Han_Japanese;
--	}
--	script = defaultHan;
-+        // modify script according to locale
-+        static QFont::Script defaultHan;
-+        QCString locale = setlocale(LC_ALL, NULL);
-+
-+        if (locale.contains("ko"))
-+            defaultHan = QFont::Han_Korean;
-+        else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-+            defaultHan = QFont::Han_TraditionalChinese;
-+        else if (locale.contains("zh"))
-+            defaultHan = QFont::Han_SimplifiedChinese;
-+        else if (locale.contains("ja"))
-+            defaultHan = QFont::Han_Japanese;
-+        else
-+            defaultHan = QFont::Han; // don't change
-+
-+        script = defaultHan;
-     }
- #endif
- 
diff --git a/testing/qt3/gcc-4.6.patch b/testing/qt3/gcc-4.6.patch
deleted file mode 100644
index bcbffcea6..000000000
--- a/testing/qt3/gcc-4.6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h
---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-01-30 21:14:29.275088725 -0600
-@@ -49,6 +49,7 @@
- #include "qvaluelist.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <map>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h
---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-01-30 21:14:01.765846592 -0600
-@@ -47,6 +47,7 @@
- #include "qdatastream.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <list>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h
---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef	2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-01-30 21:14:01.765846592 -0600
-@@ -45,6 +45,7 @@
- #include "qdatastream.h"
- #endif // QT_H
- 
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <vector>
- #endif
diff --git a/testing/qt3/qt-copy-kde-patches.tar.bz2 b/testing/qt3/qt-copy-kde-patches.tar.bz2
deleted file mode 100644
index 519f7173a..000000000
--- a/testing/qt3/qt-copy-kde-patches.tar.bz2
+++ /dev/null
diff --git a/testing/qt3/qt-odbc.patch b/testing/qt3/qt-odbc.patch
deleted file mode 100644
index 6f21e3cf1..000000000
--- a/testing/qt3/qt-odbc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
-+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
-@@ -57,13 +57,13 @@
- #endif
- 
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
- 
--#ifdef SQLULEN
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER
diff --git a/testing/qt3/qt-patches.tar.bz2 b/testing/qt3/qt-patches.tar.bz2
deleted file mode 100644
index 3f4aee171..000000000
--- a/testing/qt3/qt-patches.tar.bz2
+++ /dev/null
diff --git a/testing/qt3/qt.install b/testing/qt3/qt.install
deleted file mode 100644
index 6d042daae..000000000
--- a/testing/qt3/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	post_remove
-}
-
-post_upgrade() {
-	post_remove
-}
-
-post_remove() {
-	# this can be removed in future versions
-	sed  -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
-}
diff --git a/testing/qt3/qt.profile b/testing/qt3/qt.profile
deleted file mode 100644
index ed4d232ae..000000000
--- a/testing/qt3/qt.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export QTDIR=/opt/qt
-export QT_XFT=true
-export PATH=$PATH:$QTDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/testing/qt3/qt3-png15.patch b/testing/qt3/qt3-png15.patch
deleted file mode 100644
index e64fea36a..000000000
--- a/testing/qt3/qt3-png15.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $
-
---- src/kernel/qpngio.cpp.orig	2007-02-02 10:01:15.000000000 -0400
-+++ src/kernel/qpngio.cpp
-@@ -43,6 +43,7 @@
- #include "qiodevice.h"
- 
- #include <png.h>
-+#include <zlib.h>
- 
- 
- #ifdef Q_OS_TEMP
-@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct
-     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
- 	0, 0, 0);
- 
-+    png_colorp info_ptr_palette = NULL;
-+    int info_ptr_num_palette = 0;
-+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
-+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
-+    }
-+
-+    png_bytep info_ptr_trans_alpha = NULL;
-+    int info_ptr_num_trans = 0;
-+    png_color_16p info_ptr_trans_color = NULL;
-+
-+    if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
-+	png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
-+    }
-+
-+
-     if ( color_type == PNG_COLOR_TYPE_GRAY ) {
- 	// Black & White or 8-bit grayscale
--	if ( bit_depth == 1 && info_ptr->channels == 1 ) {
-+	if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
- 	    png_set_invert_mono( png_ptr );
- 	    png_read_update_info( png_ptr, info_ptr );
- 	    if (!image.create( width, height, 1, 2, QImage::BigEndian ))
-@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct
- 		image.setColor( i, qRgba(c,c,c,0xff) );
- 	    }
- 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
--		const int g = info_ptr->trans_values.gray;
-+		const int g = info_ptr_trans_color->gray;
- 		if (g < ncols) {
- 		    image.setAlphaBuffer(TRUE);
- 		    image.setColor(g, image.color(g) & RGB_MASK);
-@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct
- 	}
-     } else if ( color_type == PNG_COLOR_TYPE_PALETTE
-      && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
--     && info_ptr->num_palette <= 256 )
-+     && info_ptr_num_palette <= 256 )
-     {
- 	// 1-bit and 8-bit color
- 	if ( bit_depth != 1 )
-@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct
- 	png_read_update_info( png_ptr, info_ptr );
- 	png_get_IHDR(png_ptr, info_ptr,
- 	    &width, &height, &bit_depth, &color_type, 0, 0, 0);
--	if (!image.create(width, height, bit_depth, info_ptr->num_palette,
-+	if (!image.create(width, height, bit_depth, info_ptr_num_palette,
- 	    QImage::BigEndian))
- 	    return;
- 	int i = 0;
- 	if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- 	    image.setAlphaBuffer( TRUE );
--	    while ( i < info_ptr->num_trans ) {
-+	    while ( i < info_ptr_num_trans ) {
- 		image.setColor(i, qRgba(
--		    info_ptr->palette[i].red,
--		    info_ptr->palette[i].green,
--		    info_ptr->palette[i].blue,
--		    info_ptr->trans[i]
-+		    info_ptr_palette[i].red,
-+		    info_ptr_palette[i].green,
-+		    info_ptr_palette[i].blue,
-+		    info_ptr_trans_alpha[i]
- 		    )
- 		);
- 		i++;
- 	    }
- 	}
--	while ( i < info_ptr->num_palette ) {
-+	while ( i < info_ptr_num_palette ) {
- 	    image.setColor(i, qRgba(
--		info_ptr->palette[i].red,
--		info_ptr->palette[i].green,
--		info_ptr->palette[i].blue,
-+		info_ptr_palette[i].red,
-+		info_ptr_palette[i].green,
-+		info_ptr_palette[i].blue,
- 		0xff
- 		)
- 	    );
-@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio)
- 	return;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- 	iio->setStatus(-4);
- 	return;
-@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q
- 	return FALSE;
-     }
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_write_struct(&png_ptr, &info_ptr);
- 	return FALSE;
-     }
-@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q
- 
-     png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
- 
-+#warning XXXtnn not too sure about this
-+/* 
-+according to png.h, channels is only used on read, not writes, so we
-+should be able to comment this out.
-+
-     info_ptr->channels =
- 	(image.depth() == 32)
- 	    ? (image.hasAlphaBuffer() ? 4 : 3)
- 	    : 1;
-+*/
- 
-     png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
- 	image.depth() == 1 ? 1 : 8 /* per channel */,
-@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q
- 		: PNG_COLOR_TYPE_RGB
- 	    : PNG_COLOR_TYPE_PALETTE, 0, 0, 0);
- 
-+    png_color_8 sig_bit;
-+    sig_bit.red = 8;
-+    sig_bit.green = 8;
-+    sig_bit.blue = 8;
-+    png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- 
--    //png_set_sBIT(png_ptr, info_ptr, 8);
--    info_ptr->sig_bit.red = 8;
--    info_ptr->sig_bit.green = 8;
--    info_ptr->sig_bit.blue = 8;
- 
-     if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian)
-        png_set_packswap(png_ptr);
-@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q
- 	png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
- 	int* trans = new int[num_palette];
- 	int num_trans = 0;
-+	png_colorp info_ptr_palette = NULL;
-+	int tmp;
-+	png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
- 	for (int i=0; i<num_palette; i++) {
- 	    QRgb rgb=image.color(i);
--	    info_ptr->palette[i].red = qRed(rgb);
--	    info_ptr->palette[i].green = qGreen(rgb);
--	    info_ptr->palette[i].blue = qBlue(rgb);
-+	    info_ptr_palette[i].red = qRed(rgb);
-+	    info_ptr_palette[i].green = qGreen(rgb);
-+	    info_ptr_palette[i].blue = qBlue(rgb);
- 	    if (image.hasAlphaBuffer()) {
- 		trans[i] = rgb >> 24;
- 		if (trans[i] < 255) {
-@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q
- 		}
- 	    }
- 	}
-+	png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette);
- 	if (num_trans) {
- 	    copy_trans = new png_byte[num_trans];
- 	    for (int i=0; i<num_trans; i++)
-@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q
-     }
- 
-     if ( image.hasAlphaBuffer() ) {
--	info_ptr->sig_bit.alpha = 8;
-+        png_color_8p sig_bit;
-+        png_get_sBIT(png_ptr, info_ptr, &sig_bit);
-+        sig_bit->alpha = 8;
-+        png_set_sBIT(png_ptr, info_ptr, sig_bit);
-     }
- 
-     // Swap ARGB to RGBA (normal PNG format) before saving on
-@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma
- 	    return -1;
- 	}
- 
--	if (setjmp((png_ptr)->jmpbuf)) {
-+	if (setjmp(png_jmpbuf(png_ptr))) {
- 	    png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	    image = 0;
- 	    return -1;
-@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma
- 
-     if ( !png_ptr ) return 0;
- 
--    if (setjmp(png_ptr->jmpbuf)) {
-+    if (setjmp(png_jmpbuf(png_ptr))) {
- 	png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- 	image = 0;
- 	state = MovieStart;
-@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn
-     consumer->frameDone(QPoint(offx,offy),r);
-     consumer->end();
-     state = FrameStart;
--    unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
-+    unused_data = png_process_data_pause(png, 0);
- }
- 
- #ifdef PNG_USER_CHUNKS_SUPPORTED
diff --git a/testing/qtiplot/PKGBUILD b/testing/qtiplot/PKGBUILD
deleted file mode 100644
index d4779fcb7..000000000
--- a/testing/qtiplot/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 168491 2012-10-12 17:58:46Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: damir <damir.archlinux.org>
-# Contributor: Gergely Imreh <imrehg@gmail.com>
-
-pkgname=qtiplot
-pkgver=0.9.8.9
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://soft.proindependent.com/qtiplot.html"
-pkgdesc="Data analysis and scientific plotting - free clone of Origin"
-depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'glu' 'liborigin2' 'qt-assistant-compat' 'tamu-anova')
-# build against qwtplot3d provided in the package ...
-# build against qwt provided in the package ...
-# as systemwide one doesn't provide all needed functions
-makedepends=('pkg-config' 'boost' 'mesa')
-license=('GPL2')
-install=${pkgname}.install
-source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2
-        $pkgname.desktop
-        $pkgname.png
-        build.conf.archlinux
-        qwtplot3d_gcc.patch
-        qtiplot.xml
-	qtiplot-0.9.8.6-gold.patch
-	qtiplot-0.9.8.6-kde.patch
-	qtiplot-0.9.8.6-tamuanova.patch
-        qwtplot3d-qt-4.8.0.patch
-        qwtplot3d-libpng15.patch)
-sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30'
-          '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8'
-          '4301cb2a36024a10108b689990d28c4fe5c7416e'
-          '326ee6bc623a637d058ab7ee9f65fede40a23a09'
-          '301bf6f70e8c1bb9ffd55eb49eedde7b29a12909'
-          '285f57d865956d93250ec548288c5bface096b6b'
-          'b534a609f317cf3117d6495909854cdacea20124'
-          'a1d4bec744c9b8fe29bf177851e66c97cdd9d975'
-          '830b518e3ef63625df84363a8047417124f243b0'
-          '3d4c471dda29a04d432f8e0a4c5b977068cdae72'
-          '4a45ee21f028f34da75d83c0d3e1d08c5f928892')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-   # gentoo fixes  
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-gold.patch"
-   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-kde.patch"
-#   patch -Np1 -i "${srcdir}/qtiplot-0.9.8.6-tamuanova.patch"
-
-   # build also static qwtplot3d lib
-   echo "unix:CONFIG += staticlib" >> 3rdparty/qwtplot3d/qwtplot3d.pro
-
-  # install build configuration file
-  install -Dm644 "${srcdir}/build.conf.archlinux" build.conf
-
-  # Make qwt
-  sed -i "s:elif:else:g" qtiplot/src/scripting/ScriptEdit.cpp
-  patch -Np1 -i "${srcdir}/qwtplot3d_gcc.patch"
-  cd ./3rdparty/qwt
-  qmake
-  make
-
-  # Make qwtplot3d
-  cd ../qwtplot3d
-  patch -Np3 -i "${srcdir}/qwtplot3d-qt-4.8.0.patch"
-  patch -Np0 -i "${srcdir}/qwtplot3d-libpng15.patch"
-  qmake
-  make
-
-  # Make qtiplot
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  # fix stuff
-  sed -i 's|/usr/local/|/usr/share/|' qtiplot.pro
-  sed -i 's|<QAssistantClient>|<QtAssistant/qassistantclient.h>|' src/core/ApplicationWindow.cpp
-  sed -i 's#d_python_config_folder + "#"/usr/share/qtiplot#' src/core/ApplicationWindow.cpp
-
-  qmake qtiplot.pro QMAKESPEC=linux-g++
-  make QTDIR=/usr/ QMAKESPEC=linux-g++
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-
-  INSTALL_ROOT="${pkgdir}" make install
-
-  # make it nice:
-  install -D -m644 "${srcdir}/${pkgname}.png" \
-  	"${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -D -m644 "${srcdir}/${pkgname}.desktop" \
-  	"${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 "${srcdir}/${pkgname}.xml" \
-        "${pkgdir}/usr/share/mime/packages/${pkgname}.xml"
-}
diff --git a/testing/qtiplot/build.conf.archlinux b/testing/qtiplot/build.conf.archlinux
deleted file mode 100644
index 7ccded7fa..000000000
--- a/testing/qtiplot/build.conf.archlinux
+++ /dev/null
@@ -1,32 +0,0 @@
-isEmpty( QTI_ROOT ) {
-  message( "each file including this config needs to set QTI_ROOT to the dir containing this file!" )
-}
-
-SYS_INCLUDEPATH = /usr/include
-SYS_LIBS = -L/usr/lib -lGLU
-
-MUPARSER_LIBS = -lmuparser 
-GSL_LIBS = -lgsl -lgslcblas
-BOOST_INCLUDEPATH = /usr/include/boost
-BOOST_LIBS = -lboost_date_time -lboost_thread
-QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
-QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
-QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
-QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
-LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2
-LIB_ORIGIN_LIBS = -lorigin2
-QTEXENGINE_LIBS = $$QTI_ROOT/3rdparty/QTeXEngine
-TAMUANOVA_LIBS = -ltamuanova
-TAMUANOVA_INCLUDEPATH = /usr/include/tamu_anova
-LIBPNG_LIBS = -lpng
-
-PYTHON = python2
-LUPDATE = lupdate
-LRELEASE = lrelease
-
-SCRIPTING_LANGS += muParser
-SCRIPTING_LANGS += Python
-
-CONFIG          += CustomInstall
-DEFINES         += SCRIPTING_CONSOLE
-
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch b/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
deleted file mode 100644
index 3b6757533..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-gold.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/qtiplot.pro |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 99e0e36..b7cf373 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -20,6 +20,7 @@ LIBS         += $$MUPARSER_LIBS
- LIBS         += $$QWT_LIBS
- LIBS         += $$QWT3D_LIBS
- LIBS         += $$GSL_LIBS
-+LIBS         += -lz
- 
- #############################################################################
- ###################### BASIC PROJECT PROPERTIES #############################
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch b/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
deleted file mode 100644
index 919ec6cc2..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-kde.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- qtiplot/src/plot2D/Graph.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/qtiplot/src/plot2D/Graph.cpp b/qtiplot/src/plot2D/Graph.cpp
-index 626172a..d4eab1b 100755
---- a/qtiplot/src/plot2D/Graph.cpp
-+++ b/qtiplot/src/plot2D/Graph.cpp
-@@ -73,6 +73,7 @@
- #include <PatternBox.h>
- #include <SymbolBox.h>
- 
-+#include <QPaintEngine>
- #include <QApplication>
- #include <QBitmap>
- #include <QClipboard>
diff --git a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch b/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
deleted file mode 100644
index 1644266d1..000000000
--- a/testing/qtiplot/qtiplot-0.9.8.6-tamuanova.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro
-index 95a5f0c..72e99ab 100755
---- a/qtiplot/qtiplot.pro
-+++ b/qtiplot/qtiplot.pro
-@@ -205,18 +205,14 @@ contains(SCRIPTING_LANGS, Python) {
- !isEmpty(TAMUANOVA_LIBS) {
- 	DEFINES += HAVE_TAMUANOVA
- 	INCLUDEPATH += $$TAMUANOVA_INCLUDEPATH
--	#LIBS        += $$TAMUANOVA_LIBS
--
--	HEADERS += $$TAMUANOVA_INCLUDEPATH/tamu_anova.h
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_1.c
--	SOURCES += $$TAMUANOVA_INCLUDEPATH/anova_2.c
-+	LIBS        += $$TAMUANOVA_LIBS
- }
- 
- ###############################################################
- 
- # At the very end: add global include- and lib path
--#unix:INCLUDEPATH += $$SYS_INCLUDEPATH
--#unix:LIBS += $$SYS_LIBS
-+unix:INCLUDEPATH += $$SYS_INCLUDEPATH
-+unix:LIBS += $$SYS_LIBS
- 
- ###############################################################
- ############### Building QtiPlot as a browser plugin ##########
diff --git a/testing/qtiplot/qtiplot.desktop b/testing/qtiplot/qtiplot.desktop
deleted file mode 100644
index ab64b3852..000000000
--- a/testing/qtiplot/qtiplot.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Type=Application
-Exec=qtiplot
-Comment=An application for plotting and analysis of data sets and functions
-Comment[de]=Ein Programm zum Plotten und analysieren von Daten und Funktionen
-Terminal=false
-Name=QtiPlot
-Protocols=file
-Icon=/usr/share/pixmaps/qtiplot.png
-# Categories=QT;KDE;Science;Utility;X-KDE-More
-# Categories=Qt;KDE;Math;Education
-Categories=Science;X-Plotting;
diff --git a/testing/qtiplot/qtiplot.install b/testing/qtiplot/qtiplot.install
deleted file mode 100644
index 66631520d..000000000
--- a/testing/qtiplot/qtiplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove () {
-  post_install
-}
-
diff --git a/testing/qtiplot/qtiplot.png b/testing/qtiplot/qtiplot.png
deleted file mode 100644
index 5b4b87b21..000000000
--- a/testing/qtiplot/qtiplot.png
+++ /dev/null
diff --git a/testing/qtiplot/qtiplot.xml b/testing/qtiplot/qtiplot.xml
deleted file mode 100644
index 7ad4c4aa0..000000000
--- a/testing/qtiplot/qtiplot.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-qtiplot-project">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file</comment>
-    <glob pattern="*.qti" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-compressed">
-    <comment>Compressed QtiPlot project file</comment>
-    <glob pattern="*.qti.gz" />
-  </mime-type>
-  <mime-type type="application/x-qtiplot-project-backup">
-    <sub-class-of type="text/plain"/>
-    <comment>QtiPlot project file backup</comment>
-    <glob pattern="*.qti~" />
-  </mime-type>
-</mime-info>
diff --git a/testing/qtiplot/qwtplot3d-libpng15.patch b/testing/qtiplot/qwtplot3d-libpng15.patch
deleted file mode 100644
index 828f0c6d8..000000000
--- a/testing/qtiplot/qwtplot3d-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 3rdparty/gl2ps/gl2ps.c.orig	2012-01-29 18:15:34.000000000 -0500
-+++ 3rdparty/gl2ps/gl2ps.c	2012-01-29 18:16:08.000000000 -0500
-@@ -47,6 +47,7 @@
- #endif
- 
- #if defined(GL2PS_HAVE_LIBPNG)
-+#include <zlib.h>
- #include <png.h>
- #endif
- 
diff --git a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch b/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
deleted file mode 100644
index 9d30f6b7b..000000000
--- a/testing/qtiplot/qwtplot3d-qt-4.8.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:42:01.000000000 -0500
-+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h	2012-01-29 17:58:30.000000000 -0500
-@@ -2,12 +2,7 @@
- #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
- 
- #include <time.h>
--
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
- 
- #include "qwt3d_types.h"
- #include "qwt3d_io.h"
-diff -Naur qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h
---- qtiplot-0.9.8.8.orig/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:42:01.000000000 -0500
-+++ qtiplot-0.9.8.8/3rdparty/qwtplot3d/include/qwt3d_openglhelper.h	2012-01-29 17:57:21.000000000 -0500
-@@ -2,11 +2,8 @@
- #define __openglhelper_2003_06_06_15_49__
- 
- #include "qglobal.h"
--#if QT_VERSION < 0x040000
--#include <qgl.h>
--#else
--#include <QtOpenGL/qgl.h>
--#endif
-+#include <QtOpenGL>
-+#include <GL/glu.h>
- 
- namespace Qwt3D
- {
diff --git a/testing/qtiplot/qwtplot3d_gcc.patch b/testing/qtiplot/qwtplot3d_gcc.patch
deleted file mode 100644
index 06aeb50f5..000000000
--- a/testing/qtiplot/qwtplot3d_gcc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
-+++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp	2009-07-25 20:03:28.000000000 -0700
-@@ -1,5 +1,6 @@
- #include "qwt3d_surfaceplot.h"
- #include "qwt3d_function.h"
-+#include <cstdio>
- 
- using namespace Qwt3D;
- 
diff --git a/testing/qtiplot/sip.patch b/testing/qtiplot/sip.patch
deleted file mode 100644
index 146f4c277..000000000
--- a/testing/qtiplot/sip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qtiplot/src/scripting/scripting.pri.bak	2009-09-09 07:18:51.000000000 +0800
-+++ qtiplot/src/scripting/scripting.pri	2009-11-08 12:45:03.000000000 +0800
-@@ -80,7 +80,9 @@
-              $${SIP_DIR}/sipqtiPythonScript.cpp\

-              $${SIP_DIR}/sipqtiPythonScripting.cpp\

-              $${SIP_DIR}/sipqtiFolder.cpp\

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

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

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

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

-              $${SIP_DIR}/sipqtiFit.cpp \

-              $${SIP_DIR}/sipqtiExponentialFit.cpp \

-              $${SIP_DIR}/sipqtiTwoExpFit.cpp \

diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD
deleted file mode 100644
index 721a13545..000000000
--- a/testing/readline/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 163780 2012-07-20 01:54:37Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=readline
-_basever=6.2
-_patchlevel=004 #prepare for some patches
-pkgver=$_basever.$_patchlevel
-pkgrel=1
-pkgdesc="GNU readline library"
-arch=('i686' 'x86_64')
-url="http://tiswww.case.edu/php/chet/readline/rltop.html"
-license=('GPL')
-depends=('glibc' 'ncurses')
-backup=('etc/inputrc')
-options=('!emptydirs')
-install=readline.install
-source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig}
-        inputrc)
-if [ $_patchlevel -gt 00 ]; then
-    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-        source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig})
-    done
-fi
-md5sums=('67948acb2ca081f23359d0256e9a271c'
-         '928f7d248320a65e43c2dc427e99582b'
-         '58d54966c1191db45973cb3191ac621a'
-         '83287d52a482f790dfb30ec0a8746669'
-         '8e6a51e2e0e6e45a82752e3692c111ac'
-         '0665020ea118e8434bd145fb71f452cc'
-         '285361ca6d48c51ae2428157e174e812'
-         'c9d5d79718856e711667dede87cb7622'
-         '4437205bb1462f5f32e4812b8292c675'
-         'c08e787f50579ce301075c523fa660a4'
-         '7e39cad1d349b8ae789e4fc33dbb235f')
-
-build() {
-  cd ${srcdir}/${pkgname}-$_basever
-  for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
-    msg "applying patch readline${_basever//./}-$(printf "%03d" $p)"
-    patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p)
-  done
-
-  # Remove RPATH from shared objects (FS#14366)
-  sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf
-
-  # build with -fPIC for x86_64 (FS#15634)
-  [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC"
-
-  ./configure --prefix=/usr
-  make SHLIB_LIBS=-lncurses
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-$_basever
-  make DESTDIR=${pkgdir} install
-  
-  install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc
-}
diff --git a/testing/readline/inputrc b/testing/readline/inputrc
deleted file mode 100644
index fd13a673b..000000000
--- a/testing/readline/inputrc
+++ /dev/null
@@ -1,36 +0,0 @@
-# do not bell on tab-completion
-#set bell-style none
-
-set meta-flag on
-set input-meta on
-set convert-meta off
-set output-meta on
-
-$if mode=emacs
-
-# for linux console and RH/Debian xterm
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
-"\e[7~": beginning-of-line
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-"\e[5C": forward-word
-"\e[5D": backward-word
-"\e\e[C": forward-word
-"\e\e[D": backward-word
-"\e[1;5C": forward-word
-"\e[1;5D": backward-word
-
-# for rxvt
-"\e[8~": end-of-line
-
-# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
-"\eOH": beginning-of-line
-"\eOF": end-of-line
-
-# for freebsd console
-"\e[H": beginning-of-line
-"\e[F": end-of-line
-$endif
diff --git a/testing/readline/readline.install b/testing/readline/readline.install
deleted file mode 100644
index 06b646f23..000000000
--- a/testing/readline/readline.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(history.info readline.info rluserman.info)
-
-post_upgrade() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
diff --git a/testing/rest/PKGBUILD b/testing/rest/PKGBUILD
deleted file mode 100644
index e21b8d110..000000000
--- a/testing/rest/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169158 2012-10-18 19:22:47Z jgc $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=rest
-pkgver=0.7.90
-pkgrel=1
-pkgdesc="A helper library for RESTful services."
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-license=('GPL2')
-depends=('glib2' 'libxml2' 'libsoup-gnome')
-makedepends=('gobject-introspection')
-options=('!libtool')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/rfkill/PKGBUILD b/testing/rfkill/PKGBUILD
deleted file mode 100644
index 2d03e6dbb..000000000
--- a/testing/rfkill/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 165297 2012-08-15 01:17:54Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rfkill
-pkgver=0.4
-pkgrel=5
-pkgdesc='Tool for enabling and disabling wireless devices'
-url='http://linuxwireless.org/en/users/Documentation/rfkill'
-license=('custom')
-arch=('i686' 'x86_64')
-source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'rules.d'
-        'service'
-        'conf.d'
-        'rc.d')
-sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
-          '6390eaa793b473098aaa11b13c5254d611a4c13a'
-          'cadc563f967c5ac680e7cdfd764718b412201f8a'
-          'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
-          '380af0b002f51543557306ed68a27f0059fd5a6f')
-
-backup=('etc/conf.d/rfkill')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
-	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service"
-	install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
-	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
-}
diff --git a/testing/rfkill/conf.d b/testing/rfkill/conf.d
deleted file mode 100644
index 4483da26c..000000000
--- a/testing/rfkill/conf.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# /etc/conf.d/rfkill
-# Configuration for the rfkill startup script
-#
-
-# List of devices to block on startup (space-separated)
-RFKILL_BLOCK=""
-
-# List of devices to unblock on startup (space-separated)
-RFKILL_UNBLOCK="all"
-
-# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ...
-# See "rfkill list" for available devices
-# Examples:
-#
-# Block all bluetooth devices:
-# RFKILL_BLOCK="bluetooth"
-#
-# Unblock the phy0 wifi device and all wwan devices:
-# RFKILL_UNBLOCK="phy0 wwan"
diff --git a/testing/rfkill/rc.d b/testing/rfkill/rc.d
deleted file mode 100755
index ce90ee150..000000000
--- a/testing/rfkill/rc.d
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/rfkill
-
-case "$1" in
-  start)
-    for device in ${RFKILL_BLOCK}; do
-      stat_busy "Blocking rfkill device: ${device}"
-      /usr/sbin/rfkill block ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    for device in ${RFKILL_UNBLOCK}; do
-      stat_busy "Unblocking rfkill device: ${device}"
-      /usr/sbin/rfkill unblock ${device}
-      if [ $? -eq 0 ]; then
-        stat_done
-      else
-        stat_fail
-      fi
-    done
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start}"
-    exit 1
-    ;;
-esac
-exit 0
diff --git a/testing/rfkill/rules.d b/testing/rfkill/rules.d
deleted file mode 100644
index bc98a3bef..000000000
--- a/testing/rfkill/rules.d
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="rfkill", GROUP="rfkill", MODE="0664"
diff --git a/testing/rfkill/service b/testing/rfkill/service
deleted file mode 100644
index decd5b6fc..000000000
--- a/testing/rfkill/service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=RFKill-Block Selected Devices
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/rfkill block 9999
-ExecStop=/usr/sbin/rfkill unblock all
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/rhythmbox/PKGBUILD b/testing/rhythmbox/PKGBUILD
deleted file mode 100644
index 2c507c786..000000000
--- a/testing/rhythmbox/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 169157 2012-10-18 19:22:44Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=rhythmbox
-pkgver=2.98
-pkgrel=2
-pkgdesc="An iTunes-like music playback and management application"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.rhythmbox.org"
-depends=('dconf' 'desktop-file-utils' 'grilo'
-         'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib'
-         'libdmapsharing' 'libgpod' 'libmtp' 'libnotify' 'libpeas'
-         'lirc-utils' 'media-player-info' 'python2-gobject' 'python2-mako' 'totem-plparser'
-         'tdb' 'libdiscid')
-makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' 'vala')
-optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs'
-            'gstreamer0.10-bad-plugins: Extra media codecs'
-            'gstreamer0.10-ffmpeg: Extra media codecs'
-            'brasero: cd burning')
-options=('!libtool' '!emptydirs')
-install=rhythmbox.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5')
-
-build() {
-  cd "$pkgname-$pkgver"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/rhythmbox \
-      --localstatedir=/var --disable-static \
-      --enable-daap --enable-python --enable-vala \
-      --with-mdns=avahi --disable-scrollkeeper --without-webkit
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
-}
diff --git a/testing/rhythmbox/rhythmbox.install b/testing/rhythmbox/rhythmbox.install
deleted file mode 100644
index e02ee2c16..000000000
--- a/testing/rhythmbox/rhythmbox.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/rosegarden/PKGBUILD b/testing/rosegarden/PKGBUILD
deleted file mode 100644
index 3fefe02e1..000000000
--- a/testing/rosegarden/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 163958 2012-07-22 18:37:45Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Robert Emil Berge <robert@rebi.no>
-
-pkgname=rosegarden
-pkgver=12.04
-pkgrel=2
-pkgdesc="MIDI/audio sequencer and notation editor"
-arch=('i686' 'x86_64')
-url="http://www.rosegardenmusic.com/"
-license=('GPL')
-depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
-         'perl' 'qt' 'shared-mime-info')
-makedepends=('imake')
-optdepends=('lilypond: notation display'
-            'cups: printing support'
-            'okular: print preview, or any other PDF viewer'
-            'timidity++: MIDI playback, or any other softsynth'
-            'flac'
-            'wavpack')
-[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('b11f4fcad69df45365d2125181524559')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # lrdf + raptor2 compatibility
-  export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/rosegarden/rosegarden.install b/testing/rosegarden/rosegarden.install
deleted file mode 100644
index 5119faec2..000000000
--- a/testing/rosegarden/rosegarden.install
+++ /dev/null
@@ -1,14 +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
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/rpcbind/PKGBUILD b/testing/rpcbind/PKGBUILD
deleted file mode 100644
index f4af6f1e0..000000000
--- a/testing/rpcbind/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 165544 2012-08-23 12:23:46Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=rpcbind
-pkgver=0.2.0
-pkgrel=9
-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.service
-        rpcbind)
-md5sums=('1a77ddb1aaea8099ab19c351eeb26316'
-         'c02ac36a98baac70b8a26190524b7b73'
-         'a7b23a32be2eb52d7dec52da36d4eba1'
-         '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 systemd service file
-  install -D -m644 $srcdir/rpcbind.service $pkgdir/usr/lib/systemd/system/rpcbind.service
-  # 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/rpcbind/rpcbind.service b/testing/rpcbind/rpcbind.service
deleted file mode 100644
index 3bc764efc..000000000
--- a/testing/rpcbind/rpcbind.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=RPC Bind
-After=network.target
-Wants=rpcbind.target
-Before=rpcbind.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/rpcbind
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ruby/PKGBUILD b/testing/ruby/PKGBUILD
deleted file mode 100644
index 0732107ea..000000000
--- a/testing/ruby/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Jeramy Rutley <jrutley@gmail.com>
-
-pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p286
-pkgrel=1
-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/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
-        'gemrc')
-md5sums=('2278eff4cfed3cbc0653bc73085caa34'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
-
-build() {
-  cd ruby-${pkgver//_/-}
-
-  PKG_CONFIG=/usr/bin/pkg-config ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --enable-shared \
-    --enable-pthread \
-    --disable-rpath
-
-  make
-}
-
-check() {
-  cd ruby-${pkgver//_/-}
-
-  make test
-}
-
-package_ruby() {
-  pkgdesc='An object-oriented language for quick and easy programming'
-  depends=('openssl' 'libffi' 'libyaml')
-  optdepends=('tk: for Ruby/TK'
-              'ruby-docs: Ruby documentation')
-  provides=('rubygems' 'rake')
-  conflicts=('rake')
-  backup=('etc/gemrc')
-  install='ruby.install'
-
-  cd ruby-${pkgver//_/-}
-
-  make DESTDIR="${pkgdir}" install-nodoc
-
-  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
-}
-
-package_ruby-docs() {
-  pkgdesc='Documentation files for ruby'
-
-  cd ruby-${pkgver//_/-}
-
-  make DESTDIR="${pkgdir}" install-doc install-capi
-
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
-  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
-}
-md5sums=('e76848a86606a4fd5dcf14fc4b4e755e'
-         '6fb8e7a09955e0f64be3158fb4a27e7a')
diff --git a/testing/ruby/gemrc b/testing/ruby/gemrc
deleted file mode 100644
index 3d11de1ec..000000000
--- a/testing/ruby/gemrc
+++ /dev/null
@@ -1,5 +0,0 @@
-# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11
-
-# --user-install is used to install to $HOME/.gem/ by default since we want to separate
-#                pacman installed gems and gem installed gems
-gem: --user-install
diff --git a/testing/ruby/ruby.install b/testing/ruby/ruby.install
deleted file mode 100644
index ce78e96ec..000000000
--- a/testing/ruby/ruby.install
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-print_gem_default_target() {
-  echo 'The default location of gem installs is $HOME/.gem/ruby'
-  echo 'Add the following line to your PATH if you plan to install using gem'
-  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
-  echo 'If you want to install to the system wide location, you must either:'
-  echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
-}
-
-# arg 1:  the new package version
-post_install() {
-  print_gem_default_target
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
-    print_gem_default_target
-  fi
-}
diff --git a/testing/run-parts/PKGBUILD b/testing/run-parts/PKGBUILD
deleted file mode 100644
index e27124c0a..000000000
--- a/testing/run-parts/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 167126 2012-09-25 19:19:49Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=run-parts
-pkgver=4.3.4
-pkgrel=1
-pkgdesc='run scripts or programs in a directory'
-arch=('i686' 'x86_64')
-url='http://packages.qa.debian.org/d/debianutils.html'
-license=('GPL')
-depends=('glibc')
-source=("ftp://ftp.archlinux.org/other/run-parts/debianutils_${pkgver}.tar.gz")
-sha256sums=('1739976cb62b85e641ee36859a87dfb8e4c3214e1043b6bb00b56b87e96a19f5')
-
-build() {
-	cd $srcdir/debianutils-$pkgver
-	./configure --prefix=/usr
-	make run-parts
-}
-
-package() {
-	cd $srcdir/debianutils-$pkgver
-	install -D -m755 run-parts $pkgdir/usr/bin/run-parts
-	install -D -m644 run-parts.8 $pkgdir/usr/share/man/man8/run-parts.8
-	for l in po4a/*/run-parts.8; do
-		install -D -m644  ${l} $pkgdir/usr/share/man/${l:5:2}/man8/run-parts.8
-	done
-}
diff --git a/testing/sane/PKGBUILD b/testing/sane/PKGBUILD
deleted file mode 100644
index a72581f79..000000000
--- a/testing/sane/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 161936 2012-06-16 17:16:49Z dreisner $
-# 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=9
-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' 'libusb-compat' 'libieee1284' 'v4l-utils' 'avahi' 'bash' 'net-snmp')
-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,mustek_usb2.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'
-        'saned.socket'
-        'saned.service')
-options=(!libtool)
-md5sums=('fadf56a60f4776bfb24491f66b617cf5'
-         'da946cc36fb83612162cf9505986d4b2'
-         'e645a8921cff9f18ffbdabb2ed885060'
-         'cfef73e7db7c28308914d3db6767d852'
-         'e57e9e15528f47f5f1b3f1411135ed5d'
-         'e44bd4c994a52d6f472463d1eb0a03be')
-
-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 \
-    --enable-pthread \
-    --disable-rpath \
-    --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}/usr/lib/udev/rules.d/53-sane.rules"
-  # fix udev rules
-  sed -i 's|NAME="%k", ||g' "${pkgdir}/usr/lib/udev/rules.d/53-sane.rules"
-  
-  # install xinetd file
-  install -D -m644 "${srcdir}/sane.xinetd" "${pkgdir}/etc/xinetd.d/sane"
-  
-  # Install the pkg-config file
-  install -D -m644 tools/sane-backends.pc \
-     "${pkgdir}/usr/lib/pkgconfig/sane-backends.pc"
-  # install systemd files
-  install -D -m644 ${srcdir}/saned.socket \
-      "${pkgdir}/usr/lib/systemd/system/saned.socket"
-  install -D -m644 ${srcdir}/saned.service \
-      "${pkgdir}/usr/lib/systemd/system/saned@.service"
-}
diff --git a/testing/sane/libv4l-0.8.3.patch b/testing/sane/libv4l-0.8.3.patch
deleted file mode 100644
index 4e240e0cf..000000000
--- a/testing/sane/libv4l-0.8.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb@jblache.org>
-Date:   Wed Feb 16 19:37:43 2011 +0100
-
-    Fix v4l build with libv4l 0.8.3+
-
-    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
-    Conflicts:
-
-    	ChangeLog
-
-    Signed-off-by: Nils Philippsen <nils@redhat.com>
----
- backend/v4l.c |    3 +--
- backend/v4l.h |    3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
- 
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
- 
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
- 
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
- 
-@@ -165,7 +166,7 @@ struct video_channel
- 
- 
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
- 
- #include <../include/sane/sane.h>
- 
--- 
-1.7.4
-
diff --git a/testing/sane/sane.install b/testing/sane/sane.install
deleted file mode 100644
index 5ec361eea..000000000
--- a/testing/sane/sane.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-	/bin/cat <<THEEND
-NOTE
-----
-Add your user to group 'scanner' to use scanner devices.
-THEEND
-}
diff --git a/testing/sane/sane.xinetd b/testing/sane/sane.xinetd
deleted file mode 100644
index b035664b4..000000000
--- a/testing/sane/sane.xinetd
+++ /dev/null
@@ -1,11 +0,0 @@
-service sane-port
-{
-	port        = 6566
-	socket_type = stream
-	wait        = no
-	user        = root
-	group       = scanner
-	server      = /usr/sbin/saned
-	# disabled by default!
-	disable     = yes
-		  }
diff --git a/testing/sane/saned.service b/testing/sane/saned.service
deleted file mode 100644
index 69e833e7e..000000000
--- a/testing/sane/saned.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/sbin/saned
-StandardInput=socket
-StandardError=syslog
diff --git a/testing/sane/saned.socket b/testing/sane/saned.socket
deleted file mode 100644
index 66ef9c9c8..000000000
--- a/testing/sane/saned.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=saned incoming socket
-
-[Socket]
-ListenStream=6566
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/testing/sane/xerox_mfp_fix_usb_devices.patch b/testing/sane/xerox_mfp_fix_usb_devices.patch
deleted file mode 100644
index 5ed29b974..000000000
--- a/testing/sane/xerox_mfp_fix_usb_devices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc@telekom.ru>
-Date:   Tue Mar 8 17:57:19 2011 +0300
-
-    keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL;	/* sane_get_devices array */
- static struct device *devices_head = NULL;	/* sane_get_devices list */
- 
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
-     { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
-     { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
--    { 0 }
- };
- 
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
-   devices_head = NULL;
- }
- 
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+  if (strncmp("tcp", devname, 3) == 0)
-+    return &available_transports[TRANSPORT_TCP];
-+  return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
-       return SANE_STATUS_GOOD;
-   }
- 
--  for (tr = available_transports; tr->ttype; tr++) {
--    if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--      break;
--  }
--  if (!tr->ttype)
--    return SANE_STATUS_INVAL;
-+  tr = tr_from_devname(devname);
- 
-   dev = calloc (1, sizeof (struct device));
-   if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
--    transport *tr;
--
--    for (tr = available_transports; tr->ttype; tr++) {
--	if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--	    return tr->configure_device(devname, list_one_device);
--    }
--    return	SANE_STATUS_INVAL;
-+  return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
- 
- SANE_Status
diff --git a/testing/screen/PKGBUILD b/testing/screen/PKGBUILD
deleted file mode 100644
index e23d05c06..000000000
--- a/testing/screen/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 169508 2012-10-22 18:01:13Z thomas $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: dorphell <dorphell@gmx.net>
-
-pkgname=screen
-pkgver=4.0.3
-pkgrel=14
-_ptygroup=5 #the UID of our PTY/TTY group
-pkgdesc="Full-screen window manager that multiplexes a physical terminal"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/screen/"
-license=('GPL')
-depends=('ncurses' 'pam')
-backup=('etc/screenrc' 'etc/pam.d/screen')
-options=('!makeflags')
-install=screen.install
-source=(ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-${pkgver}.tar.gz
-        screen-4.0.3-long-term.patch
-        screen-4.0.3-caption-colors.patch
-        screen.pam)
-md5sums=('8506fd205028a96c741e4037de6e3c42'
-         '2723c3e71d5a2e5a74b6ddbc5215ef0f'
-         '191b6ced695ce2ae3a65bf02c2d4220f'
-         '74f7919d7b65436cc2ea5341fa8ca374')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i $srcdir/screen-4.0.3-long-term.patch
-  patch -Np2 -i $srcdir/screen-4.0.3-caption-colors.patch
-  
-  ./configure --prefix=/usr --enable-pam \
-        --with-sys-screenrc=/etc/screenrc --enable-colors256 \
-       --enable-rxvt_osc --enable-telnet \
-       --with-pty-group=$_ptygroup \
-       --mandir=/usr/share/man --infodir=/usr/share/info \
-       --with-socket-dir=/run/screens
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  install -Dm644 ${srcdir}/screen.pam ${pkgdir}/etc/pam.d/screen
-
-  install -Dm644 etc/completer.zsh ${pkgdir}/usr/share/zsh/site-functions/screen
-  install -Dm644 etc/etcscreenrc ${pkgdir}/etc/screenrc
-  install -Dm644 etc/screenrc ${pkgdir}/etc/skel/.screenrc
-}
diff --git a/testing/screen/screen-4.0.3-caption-colors.patch b/testing/screen/screen-4.0.3-caption-colors.patch
deleted file mode 100644
index c92cb0c54..000000000
--- a/testing/screen/screen-4.0.3-caption-colors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From e6a28cf8bfdac15faa6c267bf476ddcaddf48d67 Mon Sep 17 00:00:00 2001
-From: Sadrul Habib Chowdhury <sadrul@users.sourceforge.net>
-Date: Tue, 26 Jan 2010 20:17:26 +0000
-Subject: Accommodate more color changes in the caption.
-
----
-diff --git a/src/screen.c b/src/screen.c
-index b1c3dfb..2cceae0 100644
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -2204,7 +2204,7 @@ static const char months[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
- #endif
- 
- static char winmsg_buf[MAXSTR];
--#define MAX_WINMSG_REND 16	/* rendition changes */
-+#define MAX_WINMSG_REND 256	/* rendition changes */
- static int winmsg_rend[MAX_WINMSG_REND];
- static int winmsg_rendpos[MAX_WINMSG_REND];
- static int winmsg_numrend;
---
-cgit v0.8.3.4
diff --git a/testing/screen/screen-4.0.3-long-term.patch b/testing/screen/screen-4.0.3-long-term.patch
deleted file mode 100644
index 3e66acda6..000000000
--- a/testing/screen/screen-4.0.3-long-term.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur screen-4.0.3-orig//display.h screen-4.0.3/display.h
---- screen-4.0.3-orig//display.h	2003-07-02 00:01:42.000000000 +1000
-+++ screen-4.0.3/display.h	2010-12-03 20:19:23.826671689 +1000
-@@ -85,7 +85,7 @@
-   struct win *d_other;		/* pointer to other window */
-   int   d_nonblock;		/* -1 don't block if obufmax reached */
- 				/* >0: block after nonblock secs */
--  char  d_termname[20 + 1];	/* $TERM */
-+  char  d_termname[40 + 1];	/* $TERM */
-   char	*d_tentry;		/* buffer for tgetstr */
-   char	d_tcinited;		/* termcap inited flag */
-   int	d_width, d_height;	/* width/height of the screen */
-diff -Naur screen-4.0.3-orig//screen.h screen-4.0.3/screen.h
---- screen-4.0.3-orig//screen.h	2003-08-22 22:28:43.000000000 +1000
-+++ screen-4.0.3/screen.h	2010-12-03 20:19:43.163338333 +1000
-@@ -202,7 +202,7 @@
- 	  char preselect[20];
- 	  int esc;		/* his new escape character unless -1 */
- 	  int meta_esc;		/* his new meta esc character unless -1 */
--	  char envterm[20 + 1];	/* terminal type */
-+	  char envterm[40 + 1];	/* terminal type */
- 	  int encoding;		/* encoding of display */
- 	}
-       attach;
diff --git a/testing/screen/screen.install b/testing/screen/screen.install
deleted file mode 100644
index 9340e6067..000000000
--- a/testing/screen/screen.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(screen.info screen.info-1 screen.info-2 screen.info-3 screen.info-4 screen.info-5)
-
-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/screen/screen.pam b/testing/screen/screen.pam
deleted file mode 100644
index 07c42adb1..000000000
--- a/testing/screen/screen.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth		required	pam_unix.so
diff --git a/testing/sdl_gfx/PKGBUILD b/testing/sdl_gfx/PKGBUILD
deleted file mode 100644
index 3a6b7c442..000000000
--- a/testing/sdl_gfx/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 165798 2012-08-30 16:55:11Z 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_gfx
-pkgver=2.0.24
-pkgrel=1
-pkgdesc="SDL Graphic Primitives"
-arch=('i686' 'x86_64')
-license=('LGPL')
-options=(!libtool)
-url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx"
-source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz)
-depends=('sdl')
-md5sums=('838514185ff9a3b6377760aaa52fef8a')
-
-build() {
-  cd SDL_gfx-${pkgver}
-
-  if [ "${CARCH}" == "x86_64" ]; then
-    ./configure --prefix=/usr --disable-mmx
-  else
-    ./configure --prefix=/usr
-  fi
-
-  make
-}
-
-package() {
-  cd SDL_gfx-${pkgver}
-  make DESTDIR=${pkgdir} install
-}
diff --git a/testing/seahorse/PKGBUILD b/testing/seahorse/PKGBUILD
deleted file mode 100644
index ed69bae3c..000000000
--- a/testing/seahorse/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 169514 2012-10-22 21:16:04Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Michel Brabants <michel.linux@tiscali.be>
-
-pkgname=seahorse
-pkgver=3.6.2
-pkgrel=1
-pkgdesc="GNOME application for managing PGP keys."
-arch=(i686 x86_64)
-license=(GPL)
-url="http://projects.gnome.org/seahorse/"
-depends=(gtk3 gcr libsecret libsoup gpgme desktop-file-utils hicolor-icon-theme dconf)
-makedepends=(libldap intltool yelp-tools gobject-introspection openssh libsm)
-optdepends=('openssh: SSH support')
-provides=(x11-ssh-askpass)
-options=('!libtool' '!emptydirs')
-groups=(gnome-extra)
-install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
-        seahorse-ssh-askpass.sh)
-sha256sums=('cf3ffa48fdbd4c30fa3cc7ea9e8188c1325416e67e5985c9ce22af0a5fd7560b'
-            '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static \
-      --enable-ldap --enable-hkp \
-      --disable-schemas-compile
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-  install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \
-    "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh"
-}
diff --git a/testing/seahorse/seahorse-ssh-askpass.sh b/testing/seahorse/seahorse-ssh-askpass.sh
deleted file mode 100644
index 04f79d8f2..000000000
--- a/testing/seahorse/seahorse-ssh-askpass.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -z "$SSH_ASKPASS" ] && [ -n "$DISPLAY" ]; then
-  export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass
-fi
diff --git a/testing/seahorse/seahorse.install b/testing/seahorse/seahorse.install
deleted file mode 100644
index 1571179ca..000000000
--- a/testing/seahorse/seahorse.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE
deleted file mode 100644
index c5ab15a56..000000000
--- a/testing/shadow/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 1990 - 1994, Julianne Frances Haugh
- * Copyright (c) 1996 - 2000, Marek Michałkiewicz
- * Copyright (c) 2001 - 2006, Tomasz Kłoczko
- * Copyright (c) 2007 - 2009, Nicolas François
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the copyright holders or contributors may not be used to
- *    endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
deleted file mode 100644
index c82fb65dc..000000000
--- a/testing/shadow/PKGBUILD
+++ /dev/null
@@ -1,131 +0,0 @@
-# $Id: PKGBUILD 162811 2012-06-30 18:46:44Z tomegun $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=shadow
-pkgver=4.1.5.1
-pkgrel=1
-pkgdesc="Password and account management tool suite with support for shadow files and PAM"
-arch=('i686' 'x86_64')
-url='http://pkg-shadow.alioth.debian.org/'
-license=('BSD')
-groups=('base')
-depends=('bash' 'pam' 'acl')
-backup=(etc/login.defs
-        etc/pam.d/{chage,passwd,shadow,useradd,usermod,userdel}
-        etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
-        etc/pam.d/{chgpasswd,groupmems}
-        etc/default/useradd)
-options=('!libtool')
-install='shadow.install'
-source=("http://pkg-shadow.alioth.debian.org/releases/$pkgname-$pkgver.tar.bz2"{,.sig}
-        LICENSE
-        adduser
-        chgpasswd
-        chpasswd
-        defaults.pam
-        login.defs
-        newusers
-        passwd
-        shadow.cron.daily
-        useradd.defaults
-        xstrdup.patch
-        shadow-strncpy-usage.patch)
-sha1sums=('81f38720b953ef9c2c100c43d02dfe19cafd6c30'
-          '126570e2939bf3b57f28df5197ab9309747a6b5c'
-          '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
-          '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
-          '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
-          '12427b1ca92a9b85ca8202239f0d9f50198b818f'
-          '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
-          'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
-          '12427b1ca92a9b85ca8202239f0d9f50198b818f'
-          '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
-          '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
-          '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
-          '6010fffeed1fc6673ad9875492e1193b1a847b53'
-          '21e12966a6befb25ec123b403cd9b5c492fe5b16')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # avoid transitive linking issues with binutils 2.22
-  sed -i '/^user\(mod\|add\)_LDADD/s|$| -lattr|' src/Makefile.am
-
-  # link to glibc's crypt(3)
-  LDFLAGS+=" -lcrypt"
-
-  # need to offer these upstream
-  patch -Np1 <"$srcdir/xstrdup.patch"
-  patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
-
-  # supress etc/pam.d/*, we provide our own
-  sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
-
-  ./configure \
-    --prefix=/usr \
-    --libdir=/lib \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc \
-    --with-libpam \
-    --without-selinux
-
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  # license
-  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
-
-  # interactive useradd
-  install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
-
-  # useradd defaults
-  install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
-
-  # cron job
-  install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow"
-
-  # login.defs
-  install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
-
-  # PAM config - custom
-  install -dm755 "$pkgdir/etc/pam.d"
-  install -t "$pkgdir/etc/pam.d" -m644 "$srcdir"/{passwd,chgpasswd,chpasswd,newusers}
-
-  # PAM config - from tarball
-  install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems"
-
-  # we use the 'useradd' PAM file for other similar utilities
-  for file in chage groupadd groupdel groupmod shadow \
-      useradd usermod userdel; do
-    install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
-  done
-
-  # Remove utilities provided by util-linux
-  rm \
-      "$pkgdir"/usr/bin/{chsh,chfn,sg} \
-      "$pkgdir"/bin/{login,su} \
-      "$pkgdir"/usr/sbin/{vipw,vigr}
-
-  # but we keep newgrp, as sg is really an alias to it
-  mv "$pkgdir"/usr/bin/{newgrp,sg}
-
-  # ...and their many man pages
-  find "$pkgdir"/usr/share/man \
-      '(' -name 'chsh.1'  -o \
-          -name 'chfn.1'  -o \
-          -name 'su.1'    -o \
-          -name 'login.1' -o \
-          -name 'vipw.8'  -o \
-          -name 'vigr.8'  -o \
-          -name 'newgrp.1' ')' \
-      -delete
-  rmdir \
-      "$pkgdir"/usr/share/man/{fi,id,zh_TW}/man1 \
-      "$pkgdir"/usr/share/man/{fi,ko/man8}
-}
diff --git a/testing/shadow/adduser b/testing/shadow/adduser
deleted file mode 100644
index a5d7fd4fa..000000000
--- a/testing/shadow/adduser
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/bin/bash
-#
-# Copyright 1995  Hrvoje Dogan, Croatia.
-# Copyright 2002, 2003, 2004  Stuart Winter, West Midlands, England, UK.
-# Copyright 2004  Slackware Linux, Inc., Concord, CA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-##########################################################################
-# Program: /usr/sbin/adduser
-# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
-# Author : Stuart Winter <stuart@polplex.co.uk>
-#          Based on the original Slackware adduser by Hrvoje Dogan
-#          with modifications by Patrick Volkerding
-# Version: 1.09
-##########################################################################
-# Usage..: adduser [<new_user_name>]
-##########################################################################
-# History #
-###########
-# v1.09 - 07/06/04 
-#       * Added standard Slackware script licence to the head of this file.
-# v1.08 - 25/04/04
-#       * Disallow user names that begin with a numeric because useradd 
-#         (from shadow v4.03) does not allow them. <sw>
-# v1.07 - 07/03/03
-#       * When supplying a null string for the uid (meaning 'Choose next available'), 
-#         if there were file names in the range 'a-z' in the pwd then the 
-#         egrep command considered these files rather than the null string. 
-#         The egrep expression is now in quotes.  
-#         Reported & fixed by Vadim O. Ustiansky <sw>
-# v1.06 - 31/03/03
-#       * Ask to chown user.group the home directory if it already exists.
-#         This helps reduce later confusion when adding users whose home dir
-#         already exists (mounted partition for example) and is owned
-#         by a user other than the user to which the directory is being
-#         assigned as home.  Default is not to chown.
-#         Brought to my attention by mRgOBLIN. <sw>
-# v1.05 - 04/01/03
-#       * Advise & prevent users from creating logins with '.' characters
-#         in the user name. <sw>
-#       * Made pending account creation info look neater <sw>
-# v1.04 - 09/06/02
-#       * Catered for shadow-4.0.3's 'useradd' binary that no longer
-#         will let you create a user that has any uppercase chars in it
-#         This was reported on the userlocal.org forums
-#         by 'xcp' - thanks. <sw,pjv>
-# v1.03 - 20/05/02
-#       * Support 'broken' (null lines in) /etc/passwd and 
-#         /etc/group files <sw>       
-#       * For recycling UIDs (default still 'off'), we now look in 
-#         /etc/login.defs for the UID_MIN value and use it
-#         If not found then default to 1000 <sw>
-# v1.02 - 10/04/02
-#       * Fix user-specified UID bug. <pjv>
-# v1.01 - 23/03/02
-#       * Match Slackware indenting style, simplify. <pjv>
-# v1.00 - 22/03/02
-#       * Created
-#######################################################################
-
-# Path to files
-pfile=/etc/passwd
-gfile=/etc/group
-sfile=/etc/shells
-
-# Paths to binaries
-useradd=/usr/sbin/useradd
-chfn=/usr/bin/chfn
-passwd=/usr/bin/passwd
-
-# Defaults
-defhome=/home
-defshell=/bin/bash
-defgroup=users
-
-# Determine what the minimum UID is (for UID recycling)
-# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
-export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
-# If we couldn't find it, set it to the default of 1000
-if [ -z "$recycleUIDMIN" ]; then
-   export recycleUIDMIN=1000  # this is the default from Slackware's /etc/login.defs
-fi
-
-
-# This setting enables the 'recycling' of older unused UIDs.
-# When you userdel a user, it removes it from passwd and shadow but it will
-# never get used again unless you specify it expliticly -- useradd (appears to) just
-# look at the last line in passwd and increment the uid.  I like the idea of 
-# recycling uids but you may have very good reasons not to (old forgotten
-# confidential files still on the system could then be owned by this new user).
-# We'll set this to no because this is what the original adduser shell script
-# did and it's what users expect.
-recycleuids=no
-
-# Function to read keyboard input.
-# bash1 is broken (even ash will take read -ep!), so we work around
-# it (even though bash1 is no longer supported on Slackware).
-function get_input() { 
-  local output
-  if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then
-    echo -n "${1} " >&2 # fudge for use with bash v1
-    read output
-  else # this should work with any other /bin/sh
-    read -ep "${1} " output
-  fi
-  echo $output
-}
-
-# Function to display the account info
-function display () {
-  local goose
-  goose="$(echo $2 | cut -d ' ' -f 2-)"  # lop off the prefixed argument useradd needs
-  echo -n "$1 "
-  # If it's null then display the 'other' information
-  if [ -z "$goose" -a ! -z "$3" ]; then 
-    echo "$3" 
-  else 
-    echo "$goose" 
-  fi
-}
-
-# Function to check whether groups exist in the /etc/group file
-function check_group () {
-  local got_error group
-  if [ ! -z "$@" ]; then  
-  for group in $@ ; do
-    local uid_not_named="" uid_not_num=""
-    grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes  
-    grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
-    if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
-      echo "- Group '$group' does not exist"
-      got_error=yes
-    fi
-  done
-  fi
-  # Return exit code of 1 if at least one of the groups didn't exist
-  if [ ! -z "$got_error" ]; then
-    return 1
-  fi
-}   
-
-#: Read the login name for the new user :#
-#
-# Remember that most Mail Transfer Agents are case independant, so having
-# 'uSer' and 'user' may cause confusion/things to break.  Because of this,
-# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
-# and we must reject them, too.
-
-# Set the login variable to the command line param
-echo
-LOGIN="$1"
-needinput=yes
-while [ ! -z $needinput ]; do
-  if [ -z "$LOGIN" ]; then 
-    while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done
-  fi
-  grep "^${LOGIN}:" $pfile >/dev/null 2>&1  # ensure it's not already used
-  if [ $? -eq 0 ]; then
-    echo "- User '$LOGIN' already exists; please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then
-    echo "- User names cannot begin with a number; please choose another"
-    unset LOGIN
-  elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase
-    echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
-    unset LOGIN
-  elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then
-    echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
-    unset LOGIN
-  else
-    unset needinput
-  fi
-done
-
-# Display the user name passed from the shell if it hasn't changed
-if [ "$1" = "$LOGIN" ]; then
-  echo "Login name for new user: $LOGIN"
-fi
-
-#: Get the UID for the user & ensure it's not already in use :#
-#
-# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
-# when you change password for the uid, it finds the first match in /etc/passwd 
-# which isn't necessarily the correct user
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
-  grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
-  if [ $? -eq 0 ]; then
-    echo "- That UID is already in use; please choose another"
-  elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
-    echo "- UIDs are numerics only"         
-  else
-    unset needinput
-  fi
-done
-# If we were given a UID, then syntax up the variable to pass to useradd
-if [ ! -z "$_UID" ]; then 
-  U_ID="-u ${_UID}"
-else
-  # Will we be recycling UIDs?
-  if [ "$recycleuids" = "yes" ]; then
-    U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
-  fi   
-fi
-
-#: Get the initial group for the user & ensure it exists :#
-#
-# We check /etc/group for both the text version and the group ID number 
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  GID="$(get_input "Initial group [ ${defgroup} ]:")"
-  check_group "$GID"
-  if [ $? -gt 0 ]; then
-    echo "- Please choose another"
-  else
-    unset needinput 
-  fi
-done
-# Syntax the variable ready for useradd
-if [ -z "$GID" ]; then
-  GID="-g ${defgroup}"
-else
-  GID="-g ${GID}"
-fi
-
-#: Get additional groups for the user :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  AGID="$(get_input "Additional groups (comma separated) []:")"
-  AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing 
-  if [ ! -z "$AGID" ]; then
-    check_group "$AGID"  # check all groups at once (treated as N # of params)
-    if [ $? -gt 0 ]; then
-      echo "- Please re-enter the group(s)"
-    else
-      unset needinput # we found all groups specified
-      AGID="-G $(echo "$AGID" | tr ' ' ,)"
-    fi
-  else
-    unset needinput   # we don't *have* to have additional groups
-  fi
-done
-
-#: Get the new user's home dir :#
-#       
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
-  if [ -z "$HME" ]; then
-    HME="${defhome}/${LOGIN}"
-  fi 
-  # Warn the user if the home dir already exists
-  if [ -d "$HME" ]; then
-    echo "- Warning: '$HME' already exists !"
-    getyn="$(get_input "  Do you wish to change the home directory path ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-      # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
-      getyn="$(get_input "  Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
-      if [ "$(echo $getyn | grep -i "y")" ]; then
-         CHOWNHOMEDIR=$HME # set this to the home directory
-      fi
-    fi
-  else
-    unset needinput
-  fi
-done           
-HME="-d ${HME}"  
-    
-#: Get the new user's shell :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  unset got_error
-  SHL="$(get_input "Shell [ ${defshell} ]")"
-  if [ -z "$SHL" ]; then
-    SHL="${defshell}"
-  fi 
-  # Warn the user if the shell doesn't exist in /etc/shells or as a file
-  if [ -z "$(grep "^${SHL}$" $sfile)" ]; then
-    echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
-    got_error=yes
-  fi
-  if [ ! -f "$SHL" ]; then
-    echo "- Warning: ${SHL} does not exist as a file"
-    got_error=yes
-  fi
-  if [ ! -z "$got_error" ]; then
-    getyn="$(get_input "  Do you wish to change the shell ? (Y/n) ")"
-    if [ "$(echo $getyn | grep -i "n")" ]; then
-      unset needinput
-    fi
-  else
-    unset needinput
-  fi
-done           
-SHL="-s ${SHL}"
-
-#: Get the expiry date :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
-  EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
-  if [ ! -z "$EXP" ]; then
-    # Check to see whether the expiry date is in the valid format
-    if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
-      echo "- That is not a valid expiration date"
-    else
-      unset needinput 
-      EXP="-e ${EXP}" 
-    fi
-  else
-    unset needinput
-  fi
-done
-
-# Display the info about the new impending account
-echo
-echo "New account will be created as follows:"
-echo
-echo "---------------------------------------"
-display "Login name.......: " "$LOGIN"
-display "UID..............: " "$_UID" "[ Next available ]"
-display "Initial group....: " "$GID"
-display "Additional groups: " "$AGID" "[ None ]"
-display "Home directory...: " "$HME"
-display "Shell............: " "$SHL"
-display "Expiry date......: " "$EXP" "[ Never ]"
-echo
-
-echo "This is it... if you want to bail out, hit Control-C.  Otherwise, press"
-echo "ENTER to go ahead and make the account."
-read junk
-
-echo
-echo "Creating new account..."
-echo
-echo
-
-# Add the account to the system
-CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
-$CMD
-
-if [ $? -gt 0 ]; then
-  echo "- Error running useradd command -- account not created!"
-  echo "(cmd: $CMD)"
-  exit 1
-fi
-
-# chown the home dir ?  We can only do this once the useradd has
-# completed otherwise the user name doesn't exist.
-if [ ! -z "${CHOWNHOMEDIR}" ]; then
-  chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
-fi
-
-# Set the finger information
-$chfn "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "- Warning: an error occurred while setting finger information"
-fi
-
-# Set a password
-$passwd "$LOGIN"
-if [ $? -gt 0 ]; then
-  echo "* WARNING: An error occured while setting the password for"
-  echo "           this account.  Please manually investigate this *"
-  exit 1
-fi
-
-echo
-echo
-echo "Account setup complete."
-exit 0
-
diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd
deleted file mode 100644
index 8f49f5cc8..000000000
--- a/testing/shadow/chgpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-account		required	pam_permit.so
-password	include		system-auth
diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/chpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so sha512 shadow
diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/testing/shadow/defaults.pam
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs
deleted file mode 100644
index 2500ee447..000000000
--- a/testing/shadow/login.defs
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined:  MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed.  All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux.  --marekm
-
-#
-# Delay in seconds before being allowed another attempt after a login failure
-#
-FAIL_DELAY		3
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-LOG_UNKFAIL_ENAB	no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS		no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB		yes
-SYSLOG_SG_ENAB		yes
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names.  Root logins will be allowed only
-# upon these devices.
-#
-CONSOLE		/etc/securetty
-#CONSOLE	console:tty01:tty02:tty03:tty04
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE	/var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100  tty01".
-#
-#TTYTYPE_FILE	/etc/ttytype
-
-#
-# If defined, the command name to display when running "su -".  For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su".  If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME		su
-
-#
-# *REQUIRED*
-#   Directory where mailboxes reside, _or_ name of file, relative to the
-#   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
-#   QMAIL_DIR is for Qmail
-#
-#QMAIL_DIR	Maildir
-MAIL_DIR	/var/spool/mail
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence.  If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file.  If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE	.hushlogin
-#HUSHLOGIN_FILE	/etc/hushlogins
-
-#
-# *REQUIRED*  The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH	PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH	PATH=/bin:/usr/bin
-
-#
-# Terminal permissions
-#
-#	TTYGROUP	Login tty will be assigned this group ownership.
-#	TTYPERM		Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620.  Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-TTYGROUP	tty
-TTYPERM		0600
-
-#
-# Login configuration initializations:
-#
-#	ERASECHAR	Terminal ERASE character ('\010' = backspace).
-#	KILLCHAR	Terminal KILL character ('\025' = CTRL/U).
-#	UMASK		Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# The ULIMIT is used only if the system supports it.
-# (now it works with setrlimit too; ulimit is in 512-byte units)
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR	0177
-KILLCHAR	025
-UMASK		077
-
-#
-# Password aging controls:
-#
-#	PASS_MAX_DAYS	Maximum number of days a password may be used.
-#	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
-#	PASS_WARN_AGE	Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS	99999
-PASS_MIN_DAYS	0
-PASS_WARN_AGE	7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN			 1000
-UID_MAX			60000
-# System accounts
-SYS_UID_MIN		  500
-SYS_UID_MAX		  999
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN			 1000
-GID_MAX			60000
-# System accounts
-SYS_GID_MIN		  500
-SYS_GID_MAX		  999
-
-#
-# Max number of login retries if password is bad
-#
-LOGIN_RETRIES		5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT		60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone).  If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-# 
-CHFN_RESTRICT		rwh
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting).  Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-#CONSOLE_GROUPS		floppy:audio:cdrom
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default in no.
-#
-DEFAULT_HOME	yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD	/usr/sbin/userdel_local
-
-#
-# Enable setting of the umask group bits to be the same as owner bits
-# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
-# the same as gid, and username is the same as the primary group name.
-#
-# This also enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB yes
-
diff --git a/testing/shadow/newusers b/testing/shadow/newusers
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/newusers
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password 	required 	pam_unix.so sha512 shadow
diff --git a/testing/shadow/passwd b/testing/shadow/passwd
deleted file mode 100644
index ab56da496..000000000
--- a/testing/shadow/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-#password	required	pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password	required	pam_unix.so sha512 shadow use_authtok
-password	required	pam_unix.so sha512 shadow nullok
diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch
deleted file mode 100644
index 5aba8fa01..000000000
--- a/testing/shadow/shadow-strncpy-usage.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -u shadow-4.1.5/src/usermod.c.orig shadow-4.1.5/src/usermod.c
---- shadow-4.1.5/src/usermod.c.orig	2012-02-13 08:19:43.792146449 -0500
-+++ shadow-4.1.5/src/usermod.c	2012-02-13 08:21:19.375114500 -0500
-@@ -182,7 +182,7 @@
- 	struct tm *tp;
- 
- 	if (date < 0) {
--		strncpy (buf, "never", maxsize);
-+		strncpy (buf, "never", maxsize - 1);
- 	} else {
- 		time_t t = (time_t) date;
- 		tp = gmtime (&t);
-diff -u shadow-4.1.5/src/login.c.orig shadow-4.1.5/src/login.c
---- shadow-4.1.5/src/login.c.orig	2012-02-13 08:19:50.951994454 -0500
-+++ shadow-4.1.5/src/login.c	2012-02-13 08:21:04.490430937 -0500
-@@ -752,7 +752,8 @@
- 			          _("%s login: "), hostn);
- 		} else {
- 			strncpy (loginprompt, _("login: "),
--			         sizeof (loginprompt));
-+			         sizeof (loginprompt) - 1);
-+			loginprompt[sizeof (loginprompt) - 1] = '\0';
- 		}
- 
- 		retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);
diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily
deleted file mode 100755
index 1931a793e..000000000
--- a/testing/shadow/shadow.cron.daily
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
-
diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install
deleted file mode 100644
index 14384c333..000000000
--- a/testing/shadow/shadow.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
-  grpck -r >/dev/null 2>&1
-  if [ $? -eq 2 ]; then
-    printf '%s\n' \
-      "==> Warning: /etc/group or /etc/gshadow are inconsistent." \
-      "    Run 'grpck' to correct this."
-  fi
-  return 0
-}
diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults
deleted file mode 100644
index b800b1777..000000000
--- a/testing/shadow/useradd.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# useradd defaults file for ArchLinux
-# original changes by TomK
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
-CREATE_MAIL_SPOOL=no
diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch
deleted file mode 100644
index bce434264..000000000
--- a/testing/shadow/xstrdup.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- shadow-4.1.2.1/libmisc/xmalloc.c	2008-08-30 21:55:44.000000000 -0500
-+++ shadow-4.1.2.1/libmisc/xmalloc.c.new	2008-08-30 21:55:36.000000000 -0500
-@@ -61,5 +61,6 @@
- 
- char *xstrdup (const char *str)
- {
-+	if(str == NULL) return NULL;
- 	return strcpy (xmalloc (strlen (str) + 1), str);
- }
diff --git a/testing/sip/PKGBUILD b/testing/sip/PKGBUILD
deleted file mode 100644
index 4d9a1675c..000000000
--- a/testing/sip/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 168883 2012-10-16 11:55:44Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
-
-pkgbase=sip
-pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.riverbankcomputing.com/software/sip/"
-license=('custom:"sip"')
-makedepends=('python' 'python2')
-source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('9a48ad975e04ac824188840ea498ac32')
-
-build() {
-  cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
-
-  cd ${pkgbase}-${pkgver}
-  python configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-  
-  ### Python2 version ###
-  cd ../python2-${pkgbase}-${pkgver}
-  python2 configure.py CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
-  make
-}
-
-package_sip() {
-  pkgdesc="A tool that makes it easy to create Python bindings for C and C++ libraries"
-  depends=('glibc')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C sipgen
-
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python-sip() {
-  pkgdesc="Python 3.x SIP bindings for C and C++ libraries"
-  depends=('sip' 'python')
-
-  cd ${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C siplib
-  
-  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipconfig.py
-  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python3.3/site-packages/sipdistutils.py
-  
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python2-sip() {
-  pkgdesc="Python 2.x SIP bindings for C and C++ libraries"
-  depends=('sip' 'python2')
-
-  cd python2-${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install -C siplib
-  
-  install -Dm644 sipconfig.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipconfig.py
-  install -Dm644 sipdistutils.py "${pkgdir}"/usr/lib/python2.7/site-packages/sipdistutils.py
-  
-  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/slim/PKGBUILD b/testing/slim/PKGBUILD
deleted file mode 100644
index 3aa5a9f1b..000000000
--- a/testing/slim/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 169287 2012-10-18 19:49:16Z jgc $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Hugo Ideler <hugoideler@dse.nl>
-
-pkgname=slim
-pkgver=1.3.4
-pkgrel=4
-pkgdesc='Desktop-independent graphical login manager for X11'
-arch=('i686' 'x86_64')
-url='http://slim.berlios.de/'
-license=('GPL2')
-depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft')
-makedepends=('cmake' 'freeglut')
-backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rc.d'
-        'pam.d'
-        'logrotate'
-        'slim.service'
-        'session-name.patch'
-        'libpng-1.4+-support.patch'
-        'fix-glibc-segfault-1.3.4.patch')
-
-build() {
-        cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../session-name.patch # FS#26693: fix default session name
-        patch -Np1 -i ../libpng-1.4+-support.patch # taken from gentoo to build
-        patch -Np0 -i ../fix-glibc-segfault-1.3.4.patch # FS#30864
-        cd ${srcdir}
-        mkdir build
-        cd build
-        cmake ../${pkgbase}-${pkgver} \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_SKIP_RPATH=ON \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DUSE_PAM=yes -DUSE_CONSOLEKIT=no
-	make
-}
-
-package() {
-        cd  ${srcdir}/build/
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m755 ../rc.d "${pkgdir}"/etc/rc.d/slim
-	install -D -m644 ../pam.d "${pkgdir}"/etc/pam.d/slim
-	install -D -m644 ../logrotate "${pkgdir}"/etc/logrotate.d/slim
-
-	# Provide sane defaults
-	sed -i 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' "${pkgdir}"/etc/slim.conf
-	sed -i 's|/var/run/slim.lock|/var/lock/slim.lock|' "${pkgdir}"/etc/slim.conf
-        # install systemd files
-        install -D -m644 ${srcdir}/slim.service ${pkgdir}/usr/lib/systemd/system/slim.service
-}
-md5sums=('51543533e492b41007811f7d880720fa'
-         'd8ea9c4dee2811524b67f4f666311a1f'
-         '37ef35079139544d04b8316c7f66f754'
-         '43da096480bf72c3ccec8ad8400f34f0'
-         'a5d6bde9e63899df7d2081e1585bbe54'
-         'ebcb6829028615686de7b64ceeaaf8ed'
-         '6d19bd7a91592ed2bb902b22b9594565'
-         '9efc4e0d82d354f0c578be7723870769')
diff --git a/testing/slim/fix-glibc-segfault-1.3.4.patch b/testing/slim/fix-glibc-segfault-1.3.4.patch
deleted file mode 100644
index b035f8a78..000000000
--- a/testing/slim/fix-glibc-segfault-1.3.4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: app.cpp
-===================================================================
---- app.cpp	(revision 223)
-+++ app.cpp	(working copy)
-@@ -593,7 +593,7 @@
- 
-         n++;
- 
--        child_env = static_cast<char**>(malloc(sizeof(char*)*n));
-+        child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
-         memcpy(child_env, old_env, sizeof(char*)*n);
-         child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
-         child_env[n] = NULL;
diff --git a/testing/slim/libpng-1.4+-support.patch b/testing/slim/libpng-1.4+-support.patch
deleted file mode 100644
index 57b39272b..000000000
--- a/testing/slim/libpng-1.4+-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/image.cpp	2012-06-26 04:20:14.000000000 -0400
-+++ b/image.cpp	2012-06-27 11:41:34.000000000 -0400
-@@ -781,7 +781,11 @@
-                                 (png_infopp) NULL);
-     }
- 
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+    if (setjmp(png_jmpbuf((png_ptr)))) {
-+#else
-     if (setjmp(png_ptr->jmpbuf)) {
-+#endif
-         goto png_destroy;
-     }
- 
diff --git a/testing/slim/logrotate b/testing/slim/logrotate
deleted file mode 100644
index 26ec3b0f4..000000000
--- a/testing/slim/logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/slim.log {
-    compress
-    rotate 1
-    size 1024k
-    notifempty
-    missingok
-    copytruncate
-    noolddir
-}
diff --git a/testing/slim/pam.d b/testing/slim/pam.d
deleted file mode 100644
index 59db5a8c5..000000000
--- a/testing/slim/pam.d
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth            requisite       pam_nologin.so
-auth            required        pam_env.so
-auth            required        pam_unix.so
-account         required        pam_unix.so
-password        required        pam_unix.so
-session         required        pam_limits.so
-session         required        pam_unix.so
-session         optional        pam_loginuid.so
--session	optional	pam_systemd.so
diff --git a/testing/slim/rc.d b/testing/slim/rc.d
deleted file mode 100755
index b0be7ffc5..000000000
--- a/testing/slim/rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/slim`
-case "$1" in
-  start)
-    stat_busy "Starting Simple Login Manager"
-    [ -z "$PID" ] && /usr/bin/slim -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon slim
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Simple Login Manager"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon slim
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/slim/session-name.patch b/testing/slim/session-name.patch
deleted file mode 100644
index 8211c4f72..000000000
--- a/testing/slim/session-name.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur slim-1.3.2.old/panel.cpp slim-1.3.2.new/panel.cpp
---- slim-1.3.2.old/panel.cpp	2010-10-24 06:01:15.117000019 +0000
-+++ slim-1.3.2.new/panel.cpp	2010-10-24 17:26:30.987999967 +0000
-@@ -23,7 +23,7 @@
-     Root = root;
-     cfg = config;
- 
--    session = "";
-+    session = cfg->nextSession(session);
- 
-     // Init GC
-     XGCValues gcv;
-@@ -188,7 +188,7 @@
- }
- 
- void Panel::ClearPanel() {
--    session = "";
-+    session = cfg->nextSession(session);
-     Reset();
-     XClearWindow(Dpy, Root);
-     XClearWindow(Dpy, Win);
diff --git a/testing/slim/slim.service b/testing/slim/slim.service
deleted file mode 100644
index b894085a0..000000000
--- a/testing/slim/slim.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-After=systemd-user-sessions.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-
-[Install]
-Alias=display-manager.service
diff --git a/testing/slim/tty-slowness.patch b/testing/slim/tty-slowness.patch
deleted file mode 100644
index c590fbed8..000000000
--- a/testing/slim/tty-slowness.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -aur slim-1.3.2.a/app.cpp slim-1.3.2.b/app.cpp
---- slim-1.3.2.a/app.cpp	2010-08-21 15:10:13.702755711 +0200
-+++ slim-1.3.2.b/app.cpp	2010-08-21 15:10:48.579631179 +0200
-@@ -280,21 +280,22 @@
-         signal(SIGALRM, AlarmSignal);
- 
- #ifndef XNEST_DEBUG
--        OpenLog();
--        
-         if (!force_nodaemon && cfg->getOption("daemon") == "yes") {
-             daemonmode = true;
-         }
- 
-         // Daemonize
-         if (daemonmode) {
--            if (daemon(0, 1) == -1) {
-+            if (daemon(0, 0) == -1) {
-                 cerr << APPNAME << ": " << strerror(errno) << endl;
-                 exit(ERR_EXIT);
-             }
--            UpdatePid();
-         }
- 
-+        OpenLog();
-+
-+        if (daemonmode) UpdatePid();
-+
-         CreateServerAuth();
-         StartServer();
-         alarm(2);
diff --git a/testing/smartmontools/PKGBUILD b/testing/smartmontools/PKGBUILD
deleted file mode 100644
index 1cb08bd73..000000000
--- a/testing/smartmontools/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 161937 2012-06-16 17:16:57Z dreisner $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Jani Talikka <jani.talikka@gmail.com>
-# Contributor: Ralf Barth <archlinux.org@haggy.org>
-
-pkgname=smartmontools
-pkgver=5.42
-pkgrel=4
-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')
-depends=('gcc-libs' 'libcap-ng' 'bash')
-backup=('etc/smartd.conf'
-        'etc/conf.d/smartd')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'smartd.conf'
-        'smartd.rc')
-md5sums=('4460bf9a79a1252ff5c00ba52cf76b2a'
-         '28c1b80c41dac52d433961dcfb4f70e0'
-         'fb30e07f87f2c1d99532e018291ad3e8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-              --enable-drivedb \
-              --with-libcap-ng=yes \
-              --with-systemdsystemunitdir=/usr/lib/systemd/system
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e "s:sysconfig/smartmontools:conf.d/smartd:g" smartd.service
-  sed -i -e "s:smartd_opts:SMARTD_ARGS:g" smartd.service
-
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf ${pkgdir}/etc/rc.d
-  install -Dm755 ${srcdir}/smartd.rc "${pkgdir}/etc/rc.d/smartd"
-  install -Dm644 ${srcdir}/smartd.conf "${pkgdir}/etc/conf.d/smartd"
-}
diff --git a/testing/smartmontools/smartd.conf b/testing/smartmontools/smartd.conf
deleted file mode 100644
index f14870abf..000000000
--- a/testing/smartmontools/smartd.conf
+++ /dev/null
@@ -1 +0,0 @@
-SMARTD_ARGS=""
diff --git a/testing/smartmontools/smartd.rc b/testing/smartmontools/smartd.rc
deleted file mode 100755
index 16920db12..000000000
--- a/testing/smartmontools/smartd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-SMARTD_ARGS=
-[ -f /etc/conf.d/smartd ] && . /etc/conf.d/smartd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-
-   start)
-     stat_busy "Starting smartd"
-     /usr/sbin/smartd ${SMARTD_ARGS} &>/dev/null
-     if [ $? -ne 0 ]; then
-       stat_fail
-     else
-       add_daemon smartd
-       stat_done
-     fi
-   ;;
-
-   stop)
-     stat_busy "Stopping smartd"
-     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
-     rm_daemon smartd
-     stat_done
-   ;;
-
-   restart)
-     stat_busy "Restarting smartd ..."
-     $0 stop
-     $0 start
-     stat_done
-   ;;
-
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/smpeg/PKGBUILD b/testing/smpeg/PKGBUILD
deleted file mode 100644
index 96b7420ee..000000000
--- a/testing/smpeg/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168278 2012-10-07 17:15:25Z heftig $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=smpeg
-pkgver=0.4.4
-pkgrel=7
-pkgdesc="SDL MPEG Player Library"
-arch=('i686' 'x86_64')
-url="http://icculus.org/smpeg/"
-license=('LGPL')
-depends=('sdl')
-makedepends=('gtk' 'mesa' 'glu')
-optdepends=('gtk: to use gtv ' 'glu: to use glmovie')
-options=('!libtool' '!makeflags')
-source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/${pkgname}-${pkgver}.tar.gz
-        smpeg-0.4.4-gcc41.patch)
-md5sums=('59c76ac704088ef5539210190c4e1fe3'
-         '8b979a58307d7196655758bd3d2466c4')
-sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259'
-          '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch
-  ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
-  make LDFLAGS+=-lstdc++
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-  
-  # fix aclocal warnings
-  sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4
-}
diff --git a/testing/smpeg/smpeg-0.4.4-gcc41.patch b/testing/smpeg/smpeg-0.4.4-gcc41.patch
deleted file mode 100644
index 4a0eeb453..000000000
--- a/testing/smpeg/smpeg-0.4.4-gcc41.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: MPEGaudio.h
-===================================================================
-RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
-retrieving revision 1.23
-diff -u -p -r1.23 MPEGaudio.h
---- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
-+++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
-@@ -151,12 +151,6 @@ private:
- /* The actual MPEG audio class */
- class MPEGaudio : public MPEGerror, public MPEGaudioaction {
- 
--    friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
--    friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
--#ifdef THREADED_AUDIO
--    friend int Decode_MPEGaudio(void *udata);
--#endif
--
- public:
-     MPEGaudio(MPEGstream *stream, bool initSDL = true);
-     virtual ~MPEGaudio();
-@@ -367,6 +361,20 @@ public:
- #define N_TIMESTAMPS 5
- 
-   double timestamp[N_TIMESTAMPS];
-+
-+  /* Functions which access MPEGaudio internals */
-+  friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
-+  friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
-+#ifdef THREADED_AUDIO
-+  friend int Decode_MPEGaudio(void *udata);
-+#endif
- };
- 
-+/* Need to duplicate the prototypes, this is not a typo :) */
-+void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
-+int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
-+#ifdef THREADED_AUDIO
-+int Decode_MPEGaudio(void *udata);
-+#endif
-+
- #endif /* _MPEGAUDIO_H_ */
diff --git a/testing/sonata/PKGBUILD b/testing/sonata/PKGBUILD
deleted file mode 100644
index 17bb77c02..000000000
--- a/testing/sonata/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168892 2012-10-16 12:14:00Z allan $
-# Maintainer: Angel Velasquez <angvp@archlinux.org> 
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=sonata
-pkgver=1.6.2.1
-pkgrel=8
-pkgdesc="Elegant GTK+ music client for MPD"
-arch=('i686' 'x86_64')
-url="http://sonata.berlios.de/"
-license=('GPL3')
-depends=('pygtk' 'python2-mpd')
-optdepends=('gnome-python-extras: Enhanced system tray support'
-            'tagpy: Metadata editing support'
-            'python2-dbus: Various extra functionality (e.g. multimedia keys support)')
-source=(http://download.berlios.de/${pkgname}/${pkgname}-$pkgver.tar.gz
-        info.py.patch)
-md5sums=('0b912325e7175abad3bf6c0edc071e05'
-         '595fcf7615035829b264afecb5a1beeb')
-
-build() {
-  cd "$srcdir/${pkgname}-$pkgver"
-  patch -Np0 -i "$srcdir/info.py.patch"
-  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' sonata/breadcrumbs.py
-}
-
-package() {
-  cd "$srcdir/${pkgname}-$pkgver"
-  python2 setup.py install --prefix=/usr --optimize 1 --root="$pkgdir"
-}
diff --git a/testing/sonata/info.py.patch b/testing/sonata/info.py.patch
deleted file mode 100644
index e95cc3a08..000000000
--- a/testing/sonata/info.py.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- sonata/info.py	2011-07-05 22:32:08.452556016 -0500
-+++ sonata/info.py	2011-07-05 22:45:50.849311466 -0500
-@@ -393,9 +393,9 @@
- 				if content.startswith("#REDIRECT [["):
- 					addr = "http://lyricwiki.org/index.php?title=%s&action=edit" % urllib.quote(content.split("[[")[1].split("]]")[0])
- 					content = urllib.urlopen(addr).read()
--				lyrics = content.split("&lt;lyrics&gt;")[1].split("&lt;/lyrics&gt;")[0]
--				if lyrics.strip() != "&lt;!-- PUT LYRICS HERE (and delete this entire line) --&gt;":
--					lyrics = misc.unescape_html(lyrics)
-+				content = misc.unescape_html(content)
-+				lyrics = content.split("<lyrics>")[1].split("</lyrics>")[0].strip()
-+				if lyrics.strip() != "<!-- PUT LYRICS HERE (and delete this entire line) -->":
- 					lyrics = misc.wiki_to_html(lyrics)
- 					lyrics = lyrics.decode("utf-8")
- # Save lyrics to file:
diff --git a/testing/soprano/PKGBUILD b/testing/soprano/PKGBUILD
deleted file mode 100644
index 798cbb5f4..000000000
--- a/testing/soprano/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 164625 2012-08-01 14:43:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=soprano
-pkgver=2.8.0
-pkgrel=2
-pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data'
-arch=('i686' 'x86_64')
-url='http://soprano.sourceforge.net/'
-license=('GPL' 'LGPL')
-depends=('qt' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base')
-makedepends=('cmake' 'openjdk6' 'doxygen')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('273c3403aeb6d8a43e78a4887f50a385')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  . /etc/profile.d/openjdk6.sh
-  # we need the rpath
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DSOPRANO_DISABLE_CLUCENE_INDEX=ON
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/source-highlight/PKGBUILD b/testing/source-highlight/PKGBUILD
deleted file mode 100644
index d462c7fa0..000000000
--- a/testing/source-highlight/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 163554 2012-07-15 13:17:27Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=source-highlight
-pkgver=3.1.7
-pkgrel=2
-pkgdesc="Convert source code to syntax highlighted document"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/src-highlite/"
-license=('GPL')
-depends=('bash' 'boost-libs')
-makedepends=('ctags' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0ff81588d3536b4c4e571122ba940595')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --sysconfdir=/etc \
-	      --with-bash-completion=${pkgdir}/usr/share/bash-completion/completions
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make prefix="${pkgdir}/usr" install
-}
diff --git a/testing/source-highlight/source-highlight.install b/testing/source-highlight/source-highlight.install
deleted file mode 100644
index 4fd1b3005..000000000
--- a/testing/source-highlight/source-highlight.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=usr/share/info
-info_files=(source-highlight.info source-highlight-lib.info)
-
-post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
-  done
-}
diff --git a/testing/sox/PKGBUILD b/testing/sox/PKGBUILD
deleted file mode 100644
index 8613aa777..000000000
--- a/testing/sox/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 163066 2012-07-06 15:22:11Z ibiru $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=sox
-pkgver=14.4.0
-pkgrel=3
-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' 'gsm')
-makedepends=('ffmpeg' 'libao' 'libmad' 'libid3tag' 'wavpack' 'libpulse')
-checkdepends=('time')
-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_default_audio_driver_fallback.patch sox-ffmpeg0.11.patch)
-sha1sums=('12dfc57e503ed4e18cedcac292cdae7982281978'
-          'ab304f1fc17269262dbc4977aa9b7e97ec805ae4'
-          '2f92bcaebcaf300782396f106cdd27c72048a851')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i "${srcdir}/sox_default_audio_driver_fallback.patch"
-  patch -p1 -i "${srcdir}/sox-ffmpeg0.11.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
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make bindir=. installcheck
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/sox/sox-ffmpeg0.11.patch b/testing/sox/sox-ffmpeg0.11.patch
deleted file mode 100644
index 901c81582..000000000
--- a/testing/sox/sox-ffmpeg0.11.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur sox-14.4.0-orig/configure sox-14.4.0/configure
---- sox-14.4.0-orig/configure	2012-06-12 00:35:53.462360803 -0400
-+++ sox-14.4.0/configure	2012-06-12 00:36:08.572361294 -0400
-@@ -15781,9 +15781,9 @@
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_open_input_file in -lavformat" >&5
--$as_echo_n "checking for av_open_input_file in -lavformat... " >&6; }
--if ${ac_cv_lib_avformat_av_open_input_file+:} false; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avformat_open_input in -lavformat" >&5
-+$as_echo_n "checking for avformat_open_input in -lavformat... " >&6; }
-+if ${ac_cv_lib_avformat_avformat_open_input+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -15797,27 +15797,27 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char av_open_input_file ();
-+char avformat_open_input ();
- int
- main ()
- {
--return av_open_input_file ();
-+return avformat_open_input ();
-   ;
-   return 0;
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_avformat_av_open_input_file=yes
-+  ac_cv_lib_avformat_avformat_open_input=yes
- else
--  ac_cv_lib_avformat_av_open_input_file=no
-+  ac_cv_lib_avformat_avformat_open_input=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_open_input_file" >&5
--$as_echo "$ac_cv_lib_avformat_av_open_input_file" >&6; }
--if test "x$ac_cv_lib_avformat_av_open_input_file" = xyes; then :
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_avformat_open_input" >&5
-+$as_echo "$ac_cv_lib_avformat_avformat_open_input" >&6; }
-+if test "x$ac_cv_lib_avformat_avformat_open_input" = xyes; then :
-   for ac_header in libavcodec/avcodec.h ffmpeg/avcodec.h
- do :
-   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-diff -Naur sox-14.4.0-orig/src/ffmpeg.c sox-14.4.0/src/ffmpeg.c
---- sox-14.4.0-orig/src/ffmpeg.c	2012-06-12 00:35:53.459027469 -0400
-+++ sox-14.4.0/src/ffmpeg.c	2012-06-12 00:36:26.539028545 -0400
-@@ -93,7 +93,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   enc->error_resilience = 1;
- #else
--  enc->error_recognition = 1;
-+  enc->err_recognition = 1;
- #endif
- 
-   if (!codec || avcodec_open(enc, codec) < 0)
-@@ -157,7 +157,7 @@
- static int startread(sox_format_t * ft)
- {
-   priv_t * ffmpeg = (priv_t *)ft->priv;
--  AVFormatParameters params;
-+  AVDictionary *params;
-   int ret;
-   int i;
- 
-@@ -172,7 +172,7 @@
- 
-   /* Open file and get format */
-   memset(&params, 0, sizeof(params));
--  if ((ret = av_open_input_file(&ffmpeg->ctxt, ft->filename, NULL, 0, &params)) < 0) {
-+  if ((ret = avformat_open_input(&ffmpeg->ctxt, ft->filename, NULL, &params)) < 0) {
-     lsx_fail("ffmpeg cannot open file for reading: %s (code %d)", ft->filename, ret);
-     return SOX_EOF;
-   }
-@@ -231,7 +231,7 @@
-     /* If input buffer empty, read more data */
-     if (ffmpeg->audio_buf_index * 2 >= ffmpeg->audio_buf_size) {
-       if ((ret = av_read_frame(ffmpeg->ctxt, pkt)) < 0 &&
--	  (ret == AVERROR_EOF || url_ferror(ffmpeg->ctxt->pb)))
-+	  (ret == AVERROR_EOF || ffmpeg->ctxt->pb->error))
- 	break;
-       ffmpeg->audio_buf_size = audio_decode_frame(ffmpeg, ffmpeg->audio_buf_aligned, AVCODEC_MAX_AUDIO_FRAME_SIZE);
-       ffmpeg->audio_buf_index = 0;
-@@ -373,13 +373,6 @@
-       return SOX_EOF;
-   }
- 
--  /* set the output parameters (must be done even if no
--     parameters). */
--  if (av_set_parameters(ffmpeg->ctxt, NULL) < 0) {
--    lsx_fail("ffmpeg invalid output format parameters");
--    return SOX_EOF;
--  }
--
-   /* Next line for debugging */
-   /* dump_format(ffmpeg->ctxt, 0, ft->filename, 1); */
- 
-@@ -391,14 +384,14 @@
- 
-   /* open the output file, if needed */
-   if (!(ffmpeg->fmt->flags & AVFMT_NOFILE)) {
--    if (url_fopen(&ffmpeg->ctxt->pb, ft->filename, URL_WRONLY) < 0) {
-+    if (avio_open(&ffmpeg->ctxt->pb, ft->filename, AVIO_FLAG_WRITE) < 0) {
-       lsx_fail("ffmpeg could not open `%s'", ft->filename);
-       return SOX_EOF;
-     }
-   }
- 
-   /* write the stream header, if any */
--  av_write_header(ffmpeg->ctxt);
-+  avformat_write_header(ffmpeg->ctxt, NULL);
- 
-   return SOX_SUCCESS;
- }
-@@ -478,7 +471,7 @@
- #if (LIBAVFORMAT_VERSION_INT < 0x340000)
-     url_fclose(&ffmpeg->ctxt->pb);
- #else
--    url_fclose(ffmpeg->ctxt->pb);
-+    avio_close(ffmpeg->ctxt->pb);
- #endif
-   }
- 
diff --git a/testing/sox/sox_default_audio_driver_fallback.patch b/testing/sox/sox_default_audio_driver_fallback.patch
deleted file mode 100644
index 9f9060e17..000000000
--- a/testing/sox/sox_default_audio_driver_fallback.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/sox.c.old	2012-05-06 22:45:45.380564154 -0400
-+++ src/sox.c	2012-05-06 22:47:11.948248987 -0400
-@@ -2538,20 +2538,38 @@
-   return name? from_env? from_env : name : NULL;
- }
- 
-+static char const * try_device(char const * name)
-+{
-+  sox_format_handler_t const * handler = sox_find_format(name, sox_false);
-+  if (handler) {
-+    sox_format_t format, * ft = &format;
-+    memset(ft, 0, sizeof(*ft));
-+    ft->filename = (char *)device_name(name);
-+    ft->priv = lsx_calloc(1, handler->priv_size);
-+    if (handler->startwrite(ft) == SOX_SUCCESS) {
-+      handler->stopwrite(ft);
-+      free(ft->priv);
-+      return name;
-+    }
-+    free(ft->priv);
-+  }
-+  return NULL;
-+}
-+
- static char const * set_default_device(file_t * f)
- {
-   /* Default audio driver type in order of preference: */
-   if (!f->filetype) f->filetype = getenv("AUDIODRIVER");
--  if (!f->filetype && sox_find_format("coreaudio", sox_false)) f->filetype = "coreaudio";
--  if (!f->filetype && sox_find_format("pulseaudio" , sox_false)) f->filetype = "pulseaudio";
--  if (!f->filetype && sox_find_format("alsa", sox_false)) f->filetype = "alsa";
--  if (!f->filetype && sox_find_format("waveaudio" , sox_false)) f->filetype = "waveaudio";
--  if (!f->filetype && sox_find_format("sndio", sox_false)) f->filetype = "sndio";
--  if (!f->filetype && sox_find_format("oss" , sox_false)) f->filetype = "oss";
--  if (!f->filetype && sox_find_format("sunau",sox_false)) f->filetype = "sunau";
--  if (!f->filetype && sox_find_format("ao"  , sox_false) && file_count) /*!rec*/
--    f->filetype = "ao";
--
-+  if (!f->filetype) f->filetype = try_device("coreaudio");
-+  if (!f->filetype) f->filetype = try_device("pulseaudio");
-+  if (!f->filetype) f->filetype = try_device("alsa");
-+  if (!f->filetype) f->filetype = try_device("waveaudio");
-+  if (!f->filetype) f->filetype = try_device("sndio");
-+  if (!f->filetype) f->filetype = try_device("oss");
-+  if (!f->filetype) f->filetype = try_device("sunau");
-+  if (!f->filetype && file_count) /*!rec*/
-+    f->filetype = try_device("ao");
-+ 
-   if (!f->filetype) {
-     lsx_fail("Sorry, there is no default audio device configured");
-     exit(1);
diff --git a/testing/spamassassin/PKGBUILD b/testing/spamassassin/PKGBUILD
deleted file mode 100644
index 18a912f3a..000000000
--- a/testing/spamassassin/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 165766 2012-08-29 13:17:22Z bluewind $
-# Maintainer: Florian Pritz <bluewind@xinu.at>
-# Contributor: Dale Blount <dale@archlinux.org>
-# Contributor: Manolis Tzanidakis
-pkgname=spamassassin
-pkgver=3.3.2
-pkgrel=6
-pkgdesc="A mail filter to identify spam."
-arch=('i686' 'x86_64')
-license=('APACHE')
-url="http://spamassassin.apache.org"
-depends=('openssl' 'zlib' 're2c' 'perl-net-dns' 'perl-io-socket-ssl'
-         'perl-libwww' 'perl-mail-spf' 'perl-http-message' 'perl-net-http'
-         'perl-io-socket-inet6' 'perl-mail-dkim' 'perl-crypt-ssleay')
-makedepends=('razor' 'perl-dbi') 
-optdepends=('razor: to identify collaborately-flagged spam')
-backup=('etc/conf.d/spamd' 
-        'etc/mail/spamassassin/local.cf'
-        'etc/mail/spamassassin/init.pre'
-        'etc/mail/spamassassin/v310.pre'
-        'etc/mail/spamassassin/v312.pre'
-        'etc/mail/spamassassin/v320.pre'
-        'etc/mail/spamassassin/v330.pre')
-install="${pkgname}.install"
-options=('!emptydirs')
-source=("http://mirrors.devlib.org/apache/${pkgname}/source/Mail-SpamAssassin-${pkgver}.tar.gz"
-        'spamd.conf.d' 'spamd' 'spamassassin.service')
-md5sums=('d1d62cc5c6eac57e88c4006d9633b81e'
-         'af501c6b0bb937a2775b747cc4b6d150'
-         '57545e6877503d897db21e9a2e8bd2b9'
-         '1c39572b79bc20c822387814050ee5c1')
-
-build() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  # install module in vendor directories.
-  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor \
-      CONTACT_ADDRESS=root@localhost ENABLE_SSL=yes PERL_TAINT=no
-  make 
-}
-
-check() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-
-  # SSLv2 is disabled by upstream so this test would fail
-  rm -rf t/spamd_ssl_v2.t
-
-  # parallel tests cause lots of failures; disable for now
-  #export HARNESS_OPTIONS="j$(echo $MAKEFLAGS | sed 's/.*-j\([0-9][0-9]*\).*/\1/')"
-
-  make test
-}
-
-package() {
-  cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -D -m644 "${srcdir}/spamd.conf.d" "${pkgdir}/etc/conf.d/spamd"
-  install -D -m755 "${srcdir}/spamd" "${pkgdir}/etc/rc.d/spamd"
-  install -D -m644 "${srcdir}/spamassassin.service" "${pkgdir}/usr/lib/systemd/system/spamassassin.service"
-}
diff --git a/testing/spamassassin/spamassassin.install b/testing/spamassassin/spamassassin.install
deleted file mode 100644
index e43453e97..000000000
--- a/testing/spamassassin/spamassassin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  echo "You must run 'sa-update' to install spam rules before use."
-}
-
-post_upgrade() {
-  # Compile rules, if rules have previously been compiled, and it's possible
-  if type re2c &>/dev/null && type sa-compile &>/dev/null && [[ -d /var/lib/spamassassin/compiled ]]; then
-    echo "Detected compiled rules, running sa-compile..."
-    sa-compile > /dev/null 2>&1
-fi
-}
diff --git a/testing/spamassassin/spamassassin.service b/testing/spamassassin/spamassassin.service
deleted file mode 100644
index a74f6e644..000000000
--- a/testing/spamassassin/spamassassin.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/spamd.pid
-ExecStart=/usr/bin/vendor_perl/spamd --pidfile /var/run/spamd.pid -c
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/spamassassin/spamd b/testing/spamassassin/spamd
deleted file mode 100644
index 3fb97566e..000000000
--- a/testing/spamassassin/spamd
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/spamd ] && . /etc/conf.d/spamd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PIDFILE=/var/run/spamd.pid
-if [ -f $PIDFILE ]; then
-  PID=$(cat $PIDFILE)
-else
-  PID=$(pidof -o %PPID /usr/bin/vendor_perl/spamd) #backward compat
-fi
-
-case "$1" in
-  start)
-    stat_busy "Starting spamd"
-    [ -z "$PID" ] && /usr/bin/vendor_perl/spamd -d -r "$PIDFILE" ${SPAMD_OPTS}
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon spamd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping spamd"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      # Some users report that a second attempt at stopping the process
-      # works.  So, take a little nap and give it another whirl...
-      sleep 2
-      kill $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        rm_daemon spamd
-        stat_done
-      fi
-    else
-      rm_daemon spamd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/spamassassin/spamd.conf.d b/testing/spamassassin/spamd.conf.d
deleted file mode 100644
index 4295e0073..000000000
--- a/testing/spamassassin/spamd.conf.d
+++ /dev/null
@@ -1 +0,0 @@
-SPAMD_OPTS="-c"
diff --git a/testing/squid/PKGBUILD b/testing/squid/PKGBUILD
deleted file mode 100644
index 6620d2ffd..000000000
--- a/testing/squid/PKGBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# $Id: PKGBUILD 161938 2012-06-16 17:17:12Z dreisner $
-# Maintainer: Kevin Piche <kevin@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=squid
-pkgver=3.1.20
-pkgrel=2
-pkgdesc="A full-featured Web proxy cache server."
-arch=('i686' 'x86_64')
-url="http://www.squid-cache.org"
-depends=('openssl' 'pam' 'cron' 'perl' 'libltdl')
-makedepends=('libcap')
-license=('GPL')
-backup=('etc/squid/squid.conf'
-        'etc/squid/mime.conf'
-        'etc/conf.d/squid')
-install=squid.install
-source=("http://www.squid-cache.org/Versions/v3/3.1/$pkgname-$pkgver.tar.bz2"
-        'squid'
-        'squid.conf.d'
-        'squid.pam'
-        'squid.cron'
-        'squid.service')
-md5sums=('c4d733a383c0508fd0746d64a2d7278a'
-         '02f7b5bd793f778e40834fd6457d2199'
-         '2383772ef94efddc7b920628bc7ac5b0'
-         '270977cdd9b47ef44c0c427ab9034777'
-         'b499c2b725aefd7bd60bec2f1a9de392'
-         '20e00e1aa1198786795f3da32db3c1d8')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # gcc 4.6 doesn't support -fhuge-objects.
-  sed '/^    HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
-
-  # fix cache_dir, cache_dir size, and effective group.
-  sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
-  sed '/^#cache_dir/ s/100/256/
-       /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
-
-  ./configure \
-      --prefix=/usr \
-      --datadir=/usr/share/squid \
-      --sysconfdir=/etc/squid \
-      --libexecdir=/usr/lib/squid \
-      --localstatedir=/var \
-      --with-logdir=/var/log/squid \
-      --with-pidfile=/run/squid.pid \
-      --enable-auth="basic,digest,ntlm" \
-      --enable-removal-policies="lru,heap" \
-      --enable-digest-auth-helpers="password" \
-      --enable-storeio="aufs,ufs,diskd" \
-      --enable-basic-auth-helpers="getpwnam,YP,NCSA,SMB,MSNT,PAM,multi-domain-NTLM" \
-      --enable-external-acl-helpers="ip_user,unix_group,wbinfo_group" \
-      --enable-ntlm-auth-helpers="smb_lm,fakeauth,no_check" \
-      --enable-delay-pools \
-      --enable-arp-acl \
-      --enable-ssl \
-      --enable-snmp \
-      --enable-linux-netfilter \
-      --enable-ident-lookups \
-      --enable-useragent-log \
-      --enable-cache-digests \
-      --enable-referer-log \
-      --enable-arp-acl \
-      --enable-htcp \
-      --enable-carp \
-      --enable-epoll \
-      --with-filedescriptors=4096 \
-      --with-large-files \
-      --enable-arp-acl \
-      --with-default-user=proxy \
-      --enable-async-io \
-      --enable-truncate
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  install -Dm755 "$srcdir"/squid "$pkgdir"/etc/rc.d/squid
-  install -Dm755 "$srcdir"/squid.cron "$pkgdir"/etc/cron.weekly/squid
-  install -Dm644 "$srcdir"/squid.conf.d "$pkgdir"/etc/conf.d/squid
-  install -Dm644 "$srcdir"/squid.pam "$pkgdir"/etc/pam.d/squid
-
-  install -Dm644 "$srcdir/squid.service" "$pkgdir/usr/lib/systemd/system/squid.service"
-
-  # random unneeded empty dir...
-  rmdir "$pkgdir/usr/include"
-}
-
-# vim: ts=2 sw=2 et ft=sh
diff --git a/testing/squid/squid b/testing/squid/squid
deleted file mode 100644
index da5534427..000000000
--- a/testing/squid/squid
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[[ -f /etc/conf.d/squid ]] && . /etc/conf.d/squid
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/squid.pid
-{ read -r PID </run/squid.pid; } 2>/dev/null
-if [[ $pid && ! /proc/$pid/exe -ef /usr/sbin/squid ]]; then
-  rm /run/squid.pid
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting squid"
-    if [[ $PID ]] || ! squid $SQUID_ARGS; then
-      stat_fail
-    else
-      add_daemon squid
-      stat_done
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping squid"
-    if [[ -z $PID ]] || ! squid -k shutdown &>/dev/null; then
-      stat_fail
-    else
-      # squid takes forever to shutdown all its listening FDs
-      while [[ /proc/$PID/exe -ef /usr/sbin/squid ]]; do
-        stat_append "."
-        sleep 3
-      done
-      rm_daemon squid
-      stat_done
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/squid/squid.conf.d b/testing/squid/squid.conf.d
deleted file mode 100644
index ea248b76c..000000000
--- a/testing/squid/squid.conf.d
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to squid
-#
-SQUID_ARGS="-sYC"
diff --git a/testing/squid/squid.cron b/testing/squid/squid.cron
deleted file mode 100644
index c78e51105..000000000
--- a/testing/squid/squid.cron
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# exit without error if no pidfile exists
-{ read pid </run/squid.pid; } 2>/dev/null || exit 0
-
-# make sure found PID really is a squid process
-if [ /proc/$pid/exec -ef /usr/sbin/squid ]; then
-  /usr/sbin/squid -k rotate
-fi
diff --git a/testing/squid/squid.install b/testing/squid/squid.install
deleted file mode 100644
index e7aa5ff68..000000000
--- a/testing/squid/squid.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
-  if [ -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupadd -g 15 proxy &>/dev/null
-  fi
-
-  id proxy &>/dev/null || \
-    usr/sbin/useradd -u 15 -g proxy -d /var/empty proxy
-
-  chown proxy.proxy var/{cache,log}/squid
-
-#  cat << EOF
-#Release notes:  http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html
-#EOF
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/userdel proxy &> /dev/null
-  if [ ! -z "$(grep ^proxy: /etc/group)" ]; then
-    usr/sbin/groupdel proxy &>/dev/null
-  fi
-}
-
diff --git a/testing/squid/squid.pam b/testing/squid/squid.pam
deleted file mode 100644
index df8a8104f..000000000
--- a/testing/squid/squid.pam
+++ /dev/null
@@ -1,4 +0,0 @@
-#/etc/pam.d/squid
-#
-auth		required	pam_unix.so
-account		required	pam_unix.so
diff --git a/testing/squid/squid.service b/testing/squid/squid.service
deleted file mode 100644
index 9d41cc243..000000000
--- a/testing/squid/squid.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Web Proxy Cache Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/squid.pid
-ExecStart=/usr/sbin/squid -sYC
-ExecStop=/usr/sbin/squid -k shutdown
-ExecReload=/usr/sbin/squid -k reconfigure
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/stellarium/PKGBUILD b/testing/stellarium/PKGBUILD
deleted file mode 100644
index 05a16e1e5..000000000
--- a/testing/stellarium/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 168495 2012-10-12 19:14:51Z andyrtr $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=stellarium
-pkgver=0.11.4
-pkgrel=2
-pkgdesc="A stellarium with great graphics and a nice database of sky-objects"
-arch=("i686" "x86_64")
-url="http://stellarium.free.fr/"
-license=('GPL2')
-depends=('libpng' 'glu' 'libgl' 'freetype2' 'qt' 'openssl')
-makedepends=('cmake' 'boost' 'mesa')
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-	stellarium.desktop
-        stellarium.png)
-sha1sums=('5b8bfd71b4c3eabbc1db64b71221eeebe6785dbf'
-          'c9cc79212542238227b5bd6af99f60fe056f4ab2'
-          'b890d3b6c4dcfcfcc696514202af11b2a50c0fea')
-	
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
- 
-  make DESTDIR=${pkgdir} install
-
-  # install desktop file & pixmap
-  install -Dm644 ${srcdir}/stellarium.desktop \
-	${pkgdir}/usr/share/applications/stellarium.desktop
-  install -Dm644 ${srcdir}/stellarium.png \
-	${pkgdir}/usr/share/pixmaps/stellarium.png
-}
diff --git a/testing/stellarium/libpng14.patch b/testing/stellarium/libpng14.patch
deleted file mode 100644
index 7ed1da689..000000000
--- a/testing/stellarium/libpng14.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp stellarium-0.10.2/src/core/StelTextureMgr.cpp
---- stellarium-0.10.2-orig/src/core/StelTextureMgr.cpp	2010-01-21 17:04:57.000000000 -0500
-+++ stellarium-0.10.2/src/core/StelTextureMgr.cpp	2010-01-21 17:06:55.000000000 -0500
-@@ -513,7 +513,7 @@
- 	fread (magic, 1, sizeof (magic), fp);
- 
- 	/* check for valid magic number */
--	if (!png_check_sig (magic, sizeof (magic)))
-+	if (png_sig_cmp (magic, 0, sizeof (magic)))
- 	{
- 		qWarning() << "error: \"" << filename << "\" is not a valid PNG image!";
- 		fclose (fp);
-@@ -576,7 +576,7 @@
- 	/* convert 1-2-4 bits grayscale images to 8 bits
- 	   grayscale. */
- 	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))
- 		png_set_tRNS_to_alpha (png_ptr);
diff --git a/testing/stellarium/stellarium.desktop b/testing/stellarium/stellarium.desktop
deleted file mode 100644
index 1b82b18bd..000000000
--- a/testing/stellarium/stellarium.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Stellarium nightsky renderer
-GenericName=Nightsky renderer
-Comment=A real-time nightsky renderer
-Categories=Education;Science;Astronomy;
-Icon=stellarium
-Exec=stellarium
-Terminal=false
-Type=Application
diff --git a/testing/stellarium/stellarium.png b/testing/stellarium/stellarium.png
deleted file mode 100644
index 08bce127c..000000000
--- a/testing/stellarium/stellarium.png
+++ /dev/null
diff --git a/testing/strigi/PKGBUILD b/testing/strigi/PKGBUILD
deleted file mode 100644
index fe1e84d8b..000000000
--- a/testing/strigi/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 164683 2012-08-02 15:21:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=strigi
-pkgver=0.7.7
-pkgrel=2
-pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
-arch=('i686' 'x86_64')
-url='http://strigi.sourceforge.net/'
-license=('GPL2')
-depends=('exiv2' 'libxml2' 'boost-libs')
-makedepends=('qt' 'cmake' 'pkg-config' 'boost')
-optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
-            'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
-#source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'gcc47.patch')
-md5sums=('ca0a0fd5c2b99879f6330837aeede996'
-         '1acb9b31a4859dc427fc4d387fd8aa2f')
-
-build() {
-  pushd ${pkgname}-${pkgver}/strigidaemon
-  patch -p1 -i "${srcdir}"/gcc47.patch
-  popd
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_INOTIFY=ON \
-    -DENABLE_LOG4CXX=OFF \
-    -DENABLE_FAM=OFF \
-    -DENABLE_CLUCENE=OFF \
-    -DENABLE_CLUCENE_NG=OFF \
-    -DENABLE_FFMPEG=OFF
-  make
-}
-
-package() {
-  pushd build/libstreams
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/libstreamanalyzer
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/strigiclient/lib/searchclient/qtdbus
-  make DESTDIR="${pkgdir}" install
-  popd
-  
-  pushd build/strigiutils
-  make DESTDIR="${pkgdir}" install
-  popd
-}
diff --git a/testing/strigi/gcc47.patch b/testing/strigi/gcc47.patch
deleted file mode 100644
index d99582563..000000000
--- a/testing/strigi/gcc47.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Rex Dieter <rdieter@fedoraproject.org>
-Date: Mon, 09 Jan 2012 17:13:25 +0000
-Subject: gcc47 fix, unistd.h header required unconditionally for 'sleep'
-X-Git-Url: http://quickgit.kde.org/?p=strigidaemon.git&amp;a=commitdiff&amp;h=a8e97f672325557b3fbc84b987299350ec5ac10b
----
-gcc47 fix, unistd.h header required unconditionally for 'sleep'
----
-
-
---- a/bin/daemon/eventlistener/eventlistenerqueue.cpp
-+++ b/bin/daemon/eventlistener/eventlistenerqueue.cpp
-@@ -27,9 +27,7 @@
- #include <iostream>
- #include <stdio.h>
- 
--#if defined(__SUNPRO_CC)
- #include <unistd.h>
--#endif
- 
- using namespace std;
- 
-
diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD
deleted file mode 100644
index 608580da8..000000000
--- a/testing/subversion/PKGBUILD
+++ /dev/null
@@ -1,99 +0,0 @@
-# $Id: PKGBUILD 168385 2012-10-09 20:09:57Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=subversion
-pkgver=1.7.7
-pkgrel=1
-pkgdesc="A Modern Concurrent Version Control System"
-arch=('i686' 'x86_64')
-license=('APACHE')
-depends=('neon' 'apr-util' 'sqlite' 'file')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
-            'python2: for some hook scripts' 'java-environment') #'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' '!emptydirs')
-source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
-        svnserve
-        svn
-        svnserve.conf
-        svnserve.tmpfiles
-        svnserve.service
-        subversion-1.7.6-kwallet-gcc47.patch        
-        subversion.rpath.fix.patch)
-sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951'
-          '3df83e46277f0f08868236a6b6e6c0f0d7ef9278'
-          '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
-          '73b36c046c09cec2093354911c89e3ba8056af6c'
-          'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
-          '00cc36e69077a8c45674ead6dd62a7647b3a3b6d'
-          '9f6790d842cf3e0228b007483a43e39a42724068'
-          'aa0d01e606de2ebc5eed9c533d218d37a217c50c'
-          '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
-
-   patch -Np1 -i ../subversion-1.7.6-kwallet-gcc47.patch
-
-   ./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 -dm755 "${pkgdir}"/usr/share/subversion
-   cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
-   rm "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
-
-   rm "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
-   rm -r "${pkgdir}"/usr/lib/perl5/core_perl
-
-   ## svnserve ...
-
-   # ... iniscript/xinetd
-   install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
-   install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
-
-   # ... systemd
-   install -D -m 644 "${srcdir}"/svnserve.service  "${pkgdir}"/usr/lib/systemd/system/svnserve.service
-   install -D -m 644 "${srcdir}"/svnserve.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/svnserve.conf
-
-   # ... common config
-   install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
-
-   install -Dm 644 tools/client-side/bash_completion \
-     "${pkgdir}"/usr/share/bash-completion/completions/subversion
-   for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
-      ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
-   done
-}
diff --git a/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch b/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch
deleted file mode 100644
index a571c3c3c..000000000
--- a/testing/subversion/subversion-1.7.6-kwallet-gcc47.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Naur subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp
---- subversion-1.7.5.ori/subversion/libsvn_auth_kwallet/kwallet.cpp	2010-12-30 15:46:50.000000000 -0500
-+++ subversion-1.7.5/subversion/libsvn_auth_kwallet/kwallet.cpp	2012-08-14 19:43:16.694275908 -0400
-@@ -60,6 +60,9 @@
- /* KWallet simple provider, puts passwords in KWallet                    */
- /*-----------------------------------------------------------------------*/
- 
-+static int q_argc = 1;
-+static char q_argv0[] = "svn"; // Build non-const char * from string constant
-+static char *q_argv[] = { q_argv0 };
- 
- static const char *
- get_application_name(apr_hash_t *parameters,
-@@ -175,6 +178,10 @@
-                    "kwallet-initialized",
-                    APR_HASH_KEY_STRING,
-                    NULL);
-+      apr_hash_set(parameters,
-+                   "kwallet-wallet",
-+                   APR_HASH_KEY_STRING,
-+                   NULL);
-     }
-   return APR_SUCCESS;
- }
-@@ -203,12 +210,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
-@@ -273,12 +279,11 @@
-   QCoreApplication *app;
-   if (! qApp)
-     {
--      int argc = 1;
--      app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
-+      int argc = q_argc;
-+      app = new QCoreApplication(argc, q_argv);
-     }
- 
--  KCmdLineArgs::init(1,
--                     (char *[1]) {(char *) "svn"},
-+  KCmdLineArgs::init(q_argc, q_argv,
-                      get_application_name(parameters, pool),
-                      "subversion",
-                      ki18n(get_application_name(parameters, pool)),
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/subversion/svnserve.service b/testing/subversion/svnserve.service
deleted file mode 100644
index d8a8e10c1..000000000
--- a/testing/subversion/svnserve.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Subversion protocol daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/conf.d/svnserve
-ExecStart=/usr/bin/svnserve --daemon --pid-file=/run/svnserve/svnserve.pid $SVNSERVE_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/subversion/svnserve.tmpfiles b/testing/subversion/svnserve.tmpfiles
deleted file mode 100644
index e8487d373..000000000
--- a/testing/subversion/svnserve.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-D /run/svnserve 0700 root root -
diff --git a/testing/sudo/PKGBUILD b/testing/sudo/PKGBUILD
deleted file mode 100644
index 9b0b56838..000000000
--- a/testing/sudo/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 166772 2012-09-18 20:41:58Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=sudo
-_sudover=1.8.6p3
-pkgver=${_sudover/p/.p}
-pkgrel=1
-pkgdesc="Give certain users the ability to run some commands as root"
-arch=('i686' 'x86_64')
-url="http://www.sudo.ws/sudo/"
-license=('custom')
-depends=('glibc' 'pam')
-backup=('etc/sudoers' 'etc/pam.d/sudo')
-options=('!libtool')
-source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz
-        sudo.pam)
-sha256sums=('8130df04268f678880c3f423337c56e7d437a0f508a46b1dfefae16b0b20c92e'
-            'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
-
-build() {
-  cd "$srcdir/$pkgname-$_sudover"
-
-  ./configure \
-    --prefix=/usr \
-    --libexecdir=/usr/lib \
-    --with-logfac=auth \
-    --with-pam \
-    --with-env-editor \
-    --with-passprompt="[sudo] password for %p: " \
-    --with-all-insults
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$_sudover"
-  make check
-}
-
-package() {
-  cd "$srcdir/$pkgname-$_sudover"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/sudo.pam" "$pkgdir/etc/pam.d/sudo"
-
-  install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/sudo/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/sudo/sudo.pam b/testing/sudo/sudo.pam
deleted file mode 100644
index 4e586cd22..000000000
--- a/testing/sudo/sudo.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
diff --git a/testing/sushi/PKGBUILD b/testing/sushi/PKGBUILD
deleted file mode 100644
index 1e00c9a59..000000000
--- a/testing/sushi/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169155 2012-10-18 19:22:40Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=sushi
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="A quick previewer for Nautilus"
-arch=(i686 x86_64)
-url="http://www.gnome.org"
-license=('GPL2')
-groups=(gnome-extra)
-depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince')
-install=sushi.install
-makedepends=('intltool' 'gobject-introspection')
-options=(!libtool)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('506f0f1f934e9e6c0f5584619c3f2ab0d5906248472ca1bf08a159504ad02f78')
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --libexecdir=/usr/lib/sushi
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/sushi/sushi.install b/testing/sushi/sushi.install
deleted file mode 100644
index c19349f72..000000000
--- a/testing/sushi/sushi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/swt/PKGBUILD b/testing/swt/PKGBUILD
deleted file mode 100644
index f6db69266..000000000
--- a/testing/swt/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 168272 2012-10-07 11:37:04Z guillaume $
-# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
-pkgname=swt
-pkgver=4.2
-pkgrel=2
-_date=201206081400
-pkgdesc="An open source widget toolkit for Java"
-arch=('i686' 'x86_64')
-url="http://www.eclipse.org/swt/"
-license=('EPL')
-depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
-optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit')
-makedepends=('java-environment' 'libxtst' 'mesa' 'glu' 'libgnomeui' 'unzip' 'pkgconfig' 'libwebkit' 'apache-ant')
-if [ "${CARCH}" = "i686" ]; then
-  _carch=x86
-  md5sums=('3efe0404f6129183abae46f7620fe14f'
-           '2f556ab534fc2488c6e8c0ee6c02825c')
-fi
-if [ "${CARCH}" = "x86_64" ]; then
-  _carch=x86_64
-  md5sums=('9e06b576116ff409f395571603582827'
-           '2f556ab534fc2488c6e8c0ee6c02825c')
-fi
-source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/swt-${pkgver}-gtk-linux-${_carch}.zip
-        build-swt.xml)
-# To test this pkg:
-# http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
-
-build() {
-  cd ${srcdir}
-  unzip -oq src.zip -d src
-
-  . /etc/profile.d/jdk.sh
-  . /etc/profile.d/apache-ant.sh
-
-  # Shared objects
-  cd src
-  ./build.sh
-
-  # SWT jar
-  ant -f ../build-swt.xml compile
-}
-
-package() {
-  cd ${srcdir}/src
-
-  # Shared objects
-  export OUTPUT_DIR=${pkgdir}/usr/lib
-  install -dm755 ${OUTPUT_DIR} 
-  make -f make_linux.mak install
-
-  # SWT jar
-  ant -f ../build-swt.xml jar
-  install -Dm755 ../swt.jar ${pkgdir}/usr/share/java/swt-${pkgver}.jar
-  ln -s swt-${pkgver}.jar ${pkgdir}/usr/share/java/swt.jar
-}
diff --git a/testing/swt/build-swt.xml b/testing/swt/build-swt.xml
deleted file mode 100644
index a161204f8..000000000
--- a/testing/swt/build-swt.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project name="SWT" default="jar" basedir=".">
-   <property name="src" location="."/>
-   <property name="build" location="build"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${build}"/>
-   </target>
-
-   <target name="compile" depends="init" description="Compile the SWT toolset">
-      <javac srcdir="${src}" destdir="${build}" target="1.6" />
-   </target>
-
-   <target name="jar">
-      <jar destfile="swt.jar" basedir="${build}"/>
-   </target>
-</project>
diff --git a/testing/system-config-printer/PKGBUILD b/testing/system-config-printer/PKGBUILD
deleted file mode 100644
index 6ee650101..000000000
--- a/testing/system-config-printer/PKGBUILD
+++ /dev/null
@@ -1,108 +0,0 @@
-# $Id: PKGBUILD 168898 2012-10-16 13:51:27Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=system-config-printer
-pkgname=('system-config-printer-common'
-         'system-config-printer-gnome')
-pkgver=1.3.11
-pkgrel=2
-pkgdesc="A CUPS printer configuration tool and status applet"
-url="http://cyberelk.net/tim/software/system-config-printer/"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl'
-             'libusb-compat' 'desktop-file-utils')
-source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
-md5sums=('081fde89686ee15a9433c0035f5faed0'
-         '470964eb627af31f2aff9967a4b9a5bb')
-
-build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-
-  sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-    -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
-    $(find . -name '*.py')
-  sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
-
-  # Fix build with udev 183
-  sed -i 's:udev_get_sys_path (udev):"/sys":' udev/udev-configure-printer.c
-
-  ./configure --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/etc \
-    --with-udev-rules
-
-  make
-}
-
-package_system-config-printer-common() {
-  pkgdesc='Pygtk CUPS Configuration'
-  depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat')
-  optdepends=('system-config-printer-gnome: for the GTK frontend'
-	'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings')
-  replaces=('system-config-printer')
-  provides=("system-config-printer=${pkgver}")
-  conflicts=('system-config-printer')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  install -d "${pkgdir}"/usr/share/${pkgbase}
-  install -m644 config.py \
-    debug.py \
-    installpackage.py \
-    monitor.py \
-    PhysicalDevice.py \
-    ppdippstr.py \
-    probe_printer.py \
-    SearchCriterion.py \
-    smburi.py \
-    statereason.py \
-    "${pkgdir}"/usr/share/${pkgbase}/
-
-  install -m755 pysmb.py \
-    "${pkgdir}"/usr/share/${pkgbase}/
-
-  install -d "${pkgdir}"/etc/dbus-1/system.d/
-  install -m644 dbus/com.redhat.NewPrinterNotification.conf \
-    dbus/com.redhat.PrinterDriversInstaller.conf \
-    "${pkgdir}"/etc/dbus-1/system.d/
-  install -d "${pkgdir}"/etc/cupshelpers/
-  install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
-
-  install -d "${pkgdir}"/usr/lib/udev/rules.d
-  install -m755 udev/{udev-add-printer,udev-configure-printer} \
-    "${pkgdir}"/usr/lib/udev/
-  install -m644 udev/70-printers.rules \
-    "${pkgdir}"/usr/lib/udev/rules.d
-
-  for file in build/lib/cupshelpers/*.py; do
-    install -Dm644 $file \
-      "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
-  done
-}
-
-package_system-config-printer-gnome() {
-  pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend'
-  depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify')
-  optdependence=('gnome-keyring: password management')
-
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-  # files provided by system-config-printer-common
-  cd "${pkgdir}"/usr/share/${pkgbase}
-  rm config.py \
-    debug.py \
-    installpackage.py \
-    monitor.py \
-    PhysicalDevice.py \
-    ppdippstr.py \
-    probe_printer.py \
-    SearchCriterion.py \
-    smburi.py \
-    statereason.py \
-    pysmb.py
-  rm -r "${pkgdir}"/etc/dbus-1/
-  rm -r "${pkgdir}"/etc/cupshelpers/
-  rm -r "${pkgdir}"/etc/udev/
-  rm -r "${pkgdir}"/usr/lib/
-}
diff --git a/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch b/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 766dcb87f..000000000
--- a/testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 25 May 2012 19:43:24 -0400
-Subject: [PATCH] Reinstate TIMEOUT= handling
-
-This is mostly to deal with ipw2?00 drivers which have yet to be fixed
-in the kernel.
----
- src/libudev/libudev-device.c  |   19 +++++++++++++++++++
- src/libudev/libudev-private.h |    1 +
- src/udev/udevd.c              |   13 ++++++++++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a8277d1..5966189 100644
---- a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
-         struct udev_list tags_list;
-         unsigned long long int seqnum;
-         unsigned long long int usec_initialized;
-+        int timeout;
-         int devlink_priority;
-         int refcount;
-         dev_t devnum;
-@@ -89,6 +90,21 @@ struct udev_device {
-         bool db_persist;
- };
- 
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+        return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+        char num[32];
-+
-+        udev_device->timeout = timeout;
-+        snprintf(num, sizeof(num), "%u", timeout);
-+        udev_device_add_property(udev_device, "TIMEOUT", num);
-+        return 0;
-+}
-+
- /**
-  * udev_device_get_seqnum:
-  * @udev_device: udev device
-@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
- 
-                 util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
-                 udev_device_set_syspath(udev_device, path);
-+        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (startswith(property, "SUBSYSTEM=")) {
-                 udev_device_set_subsystem(udev_device, &property[10]);
-         } else if (startswith(property, "DEVTYPE=")) {
-@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
-         udev_list_init(udev, &udev_device->sysattr_value_list, true);
-         udev_list_init(udev, &udev_device->sysattr_list, false);
-         udev_list_init(udev, &udev_device->tags_list, true);
-+        udev_device->timeout = -1;
-         udev_device->watch_handle = -1;
-         /* copy global properties */
-         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
-index 4eb4a59..99aefeb 100644
---- a/src/libudev/libudev-private.h
-+++ b/src/libudev/libudev-private.h
-@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
-         }
- }
- 
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
-         struct udev_list_node *loop;
- 
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
-                 return;
-         }
- 
--        if (children >= children_max) {
-+        if (!force && children >= children_max) {
-                 if (children_max > 1)
-                         log_debug("maximum number (%i) of children reached\n", children);
-                 return;
-@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
- 
-         event->state = EVENT_QUEUED;
-         udev_list_node_append(&event->node, &event_list);
-+
-+        /* run all events with a timeout set immediately */
-+        if (udev_device_get_timeout(dev) > 0) {
-+                event_run(event, true);
-+                return 0;
-+        }
-+
-         return 0;
- }
- 
-@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
-                 if (is_devpath_busy(event))
-                         continue;
- 
--                event_run(event);
-+                event_run(event, false);
-         }
- }
- 
--- 
-1.7.10.2
-
diff --git a/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch b/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch
deleted file mode 100644
index c92cf5d11..000000000
--- a/testing/systemd/0001-journal-bring-mmap-cache-prototype-in-sync.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e2c8b07dcb50c2adf64cdfb22e4a496fc76576fb Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sat, 22 Sep 2012 00:16:13 +0200
-Subject: [PATCH] journal: bring mmap cache prototype in sync
-
----
- src/journal/mmap-cache.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/journal/mmap-cache.h b/src/journal/mmap-cache.h
-index de34634..0c42fb8 100644
---- a/src/journal/mmap-cache.h
-+++ b/src/journal/mmap-cache.h
-@@ -31,6 +31,6 @@ MMapCache* mmap_cache_new(void);
- MMapCache* mmap_cache_ref(MMapCache *m);
- MMapCache* mmap_cache_unref(MMapCache *m);
- 
--int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, uint64_t size, struct stat *st, void **ret);
-+int mmap_cache_get(MMapCache *m, int fd, int prot, unsigned context, bool keep_always, uint64_t offset, size_t size, struct stat *st, void **ret);
- void mmap_cache_close_fd(MMapCache *m, int fd);
- void mmap_cache_close_context(MMapCache *m, unsigned context);
--- 
-1.7.12.1
-
diff --git a/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch b/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
deleted file mode 100644
index 5c6085c95..000000000
--- a/testing/systemd/0001-shutdown-recursively-mark-root-as-private-before-piv.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 10 Aug 2012 11:02:03 -0400
-Subject: [PATCH] shutdown: recursively mark root as private before pivot
-
-Because root is now recursively marked as shared on bootup, we need to
-recursively mark root as private. This prevents a pivot_root failure on
-shutdown:
-
-  Cannot finalize remaining file systems and devices, giving up.
-  pivot failed: Invalid argument
----
- src/core/shutdown.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/shutdown.c b/src/core/shutdown.c
-index 105a604..0b7cbd8 100644
---- a/src/core/shutdown.c
-+++ b/src/core/shutdown.c
-@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) {
-           It works for pivot_root, but the ref count for the root device
-           is not decreasing :-/
-         */
--        if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) {
-+        if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) {
-                 log_error("Failed to make \"/\" private mount %m");
-                 return -errno;
-         }
--- 
-1.7.11.4
-
diff --git a/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch b/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
deleted file mode 100644
index 3aec94edc..000000000
--- a/testing/systemd/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From c516c8d17f77a1c761447f4c40c8dfffeda2e06d Mon Sep 17 00:00:00 2001
-From: Simon Peeters <peeters.simon@gmail.com>
-Date: Fri, 10 Aug 2012 17:32:19 +0200
-Subject: [PATCH] systemctl: fix issue with systemctl daemon-reexec
-
----
- src/shared/dbus-common.c  |  3 ++-
- src/systemctl/systemctl.c | 11 ++++++++---
- 2 files changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
-index 7f0dce5..da2dc2e 100644
---- a/src/shared/dbus-common.c
-+++ b/src/shared/dbus-common.c
-@@ -1287,7 +1287,8 @@ int bus_method_call_with_reply(DBusConnection *bus,
-         reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error);
-         dbus_message_unref(m);
-         if (!reply) {
--                log_error("Failed to issue method call: %s", bus_error_message(&error));
-+                if (!return_error)
-+                        log_error("Failed to issue method call: %s", bus_error_message(&error));
-                 if (bus_error_is_no_service(&error))
-                         r = -ENOENT;
-                 else if (dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED))
-diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
-index 2e0aaaa..13e0f91 100644
---- a/src/systemctl/systemctl.c
-+++ b/src/systemctl/systemctl.c
-@@ -1537,11 +1537,12 @@ static int start_unit_one(
-                         DBUS_TYPE_INVALID);
-         free(n);
-         if (r) {
--                if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) {
-+                if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL )
-                         /* There's always a fallback possible for
-                          * legacy actions. */
-                         r = -EADDRNOTAVAIL;
--                }
-+                else
-+                        log_error("Failed to issue method call: %s", bus_error_message(error));
-                 goto finish;
-         }
- 
-@@ -3143,6 +3144,7 @@ finish:
- static int daemon_reload(DBusConnection *bus, char **args) {
-         int r;
-         const char *method;
-+        DBusError error;
- 
-         if (arg_action == ACTION_RELOAD)
-                 method = "Reload";
-@@ -3171,7 +3173,7 @@ static int daemon_reload(DBusConnection *bus, char **args) {
-                         "org.freedesktop.systemd1.Manager",
-                         method,
-                         NULL,
--                        NULL,
-+                        &error,
-                         DBUS_TYPE_INVALID);
- 
-         if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL)
-@@ -3182,6 +3184,9 @@ static int daemon_reload(DBusConnection *bus, char **args) {
-                 /* On reexecution, we expect a disconnect, not
-                  * a reply */
-                 r = 0;
-+        else if (r)
-+                log_error("Failed to issue method call: %s", bus_error_message(&error));
-+        dbus_error_free(&error);
- 
-         return r;
- }
--- 
-1.7.11.4
-
diff --git a/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch b/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
deleted file mode 100644
index 9be6ef28f..000000000
--- a/testing/systemd/0001-tmpfiles-restore-previous-behavior-for-F-f.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1845fdd967d3a4c06f895413505de3c2429955b0 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Thu, 27 Sep 2012 20:48:13 -0400
-Subject: [PATCH] tmpfiles: restore previous behavior for F/f
-
-d4e9eb91ea changed the behavior for the F and f actions, wrongly sending
-them to glob_item(). Restore the old behavior and shortcut straight to
-write_one_file().
----
- src/tmpfiles/tmpfiles.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
-index f10f908..bf900fa 100644
---- a/src/tmpfiles/tmpfiles.c
-+++ b/src/tmpfiles/tmpfiles.c
-@@ -673,6 +673,10 @@ static int create_item(Item *i) {
- 
-         case CREATE_FILE:
-         case TRUNCATE_FILE:
-+                r = write_one_file(i, i->path);
-+                if (r < 0)
-+                        return r;
-+                break;
-         case WRITE_FILE:
-                 r = glob_item(i, write_one_file);
-                 if (r < 0)
--- 
-1.7.12.1
-
diff --git a/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch b/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch
deleted file mode 100644
index 117b0df57..000000000
--- a/testing/systemd/0001-udev-systemd-udev-settle.service-fix-After.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a2368a3f37ede469d4359421c1e4ad304c682a07 Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay@vrfy.org>
-Date: Wed, 6 Jun 2012 14:30:16 +0200
-Subject: [PATCH] udev: systemd-udev-settle.service fix After=
-
-https://bugs.freedesktop.org/show_bug.cgi?id=50779
----
- units/systemd-udev-settle.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
-index d637700..2c4c129 100644
---- a/units/systemd-udev-settle.service.in
-+++ b/units/systemd-udev-settle.service.in
-@@ -21,7 +21,7 @@ Documentation=man:udev(7)
- Documentation=man:systemd-udevd(8)
- DefaultDependencies=no
- Wants=systemd-udev.service
--After=udev-trigger.service
-+After=systemd-udev-trigger.service
- Before=basic.target
- ConditionCapability=CAP_MKNOD
- 
--- 
-1.7.11
-
diff --git a/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch b/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
deleted file mode 100644
index a2cdf64a7..000000000
--- a/testing/systemd/0001-vconsole-setup-enable-utf-8-mode-explicitly.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From d305a67b46644d6360ef557109384c831ee8e018 Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Sun, 10 Jun 2012 20:37:14 +0200
-Subject: [PATCH] vconsole-setup: enable utf-8 mode explicitly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Rather than assuming the console is in utf-8 mode if nothing else is
-specified, be a bit more robust and enable it explicitly.
-
-This fixes a regression compared with Arch's initscripts when not
-using a framebuffer as the old VGA console would not be in utf-8
-mode by default.
-
-Furthermore, this would allow vconsole-setup to be used after boot
-to change the vconsole into utf-8 mode in case it has been set to
-non-utf-8 mode for whatever reason. I.e, the following would leave
-the console in utf-8 mode as expected:
-
- # export LANG=en_US.ISO-8859-1
- # /usr/lib/systemd/systemd-vconsole-setup
- # export LANG=en_US.UTF-8
- # /usr/lib/systemd/systemd-vconsole-setup
-
-Reported-by: Xyne <xyne@archlinx.ca>
-Reported-by: Thomas Bächler <thomas@archlinux.org>
-Cc: Dave Reisner <dreisner@archlinux.org>
----
- src/vconsole/vconsole-setup.c | 24 +++++++++++++++++++++++-
- 1 file changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
-index d04fab4..aa5fa18 100644
---- a/src/vconsole/vconsole-setup.c
-+++ b/src/vconsole/vconsole-setup.c
-@@ -80,6 +80,25 @@ static int disable_utf8(int fd) {
-         return r;
- }
- 
-+static int enable_utf8(int fd) {
-+        int r = 0, k;
-+
-+        if (ioctl(fd, KDSKBMODE, K_UNICODE) < 0)
-+                r = -errno;
-+
-+        if (loop_write(fd, "\033%G", 3, false) < 0)
-+                r = -errno;
-+
-+        k = write_one_line_file("/sys/module/vt/parameters/default_utf8", "1");
-+        if (k < 0)
-+                r = k;
-+
-+        if (r < 0)
-+                log_warning("Failed to enable UTF-8: %s", strerror(-r));
-+
-+        return r;
-+}
-+
- static int load_keymap(const char *vc, const char *map, const char *map_toggle, bool utf8, pid_t *_pid) {
-         const char *args[8];
-         int i = 0;
-@@ -418,9 +437,12 @@ int main(int argc, char **argv) {
- 
-         r = EXIT_FAILURE;
- 
--        if (!utf8)
-+        if (utf8)
-+                enable_utf8(fd);
-+        else
-                 disable_utf8(fd);
- 
-+
-         if (load_keymap(vc, vc_keymap, vc_keymap_toggle, utf8, &keymap_pid) >= 0 &&
-             load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0)
-                 r = EXIT_SUCCESS;
--- 
-1.7.11
-
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
deleted file mode 100644
index cce4b8e44..000000000
--- a/testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=195
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
-             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libxslt' 'linux-api-headers'
-             'pam' 'python' 'quota-tools' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        'initcpio-hook-udev'
-        'initcpio-install-udev'
-        'initcpio-install-timestamp'
-        '0001-Reinstate-TIMEOUT-handling.patch'
-        'use-split-usr-path.patch')
-md5sums=('38e8c8144e7e6e5bc3ce32eb4260e680'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         'fb37e34ea006c79be1c54cbb0f803414'
-         'df69615503ad293c9ddf9d8b7755282d'
-         '5543be25f205f853a21fa5ee68e03f0d'
-         'fd5b5f04ab0a847373d357555129d4c0')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # still waiting on ipw2x00, et al to get fixed...
-  patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
-  # hang onto this until we do the /{,s}bin merge
-  patch -Np1 <"$srcdir/use-split-usr-path.patch"
-
-  ./configure \
-      --libexecdir=/usr/lib \
-      --localstatedir=/var \
-      --sysconfdir=/etc \
-      --enable-introspection \
-      --enable-gtk-doc \
-      --disable-audit \
-      --disable-ima \
-      --with-distro=arch \
-      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-      --with-pci-ids-path=/usr/share/hwdata/pci.ids
-
-  make
-}
-
-check() {
-  make -C "$pkgname-$pkgver" check
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt'
-           'pam' 'util-linux' 'xz')
-  provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver")
-  replaces=('libsystemd' 'systemd-tools' 'udev')
-  conflicts=('libsystemd' 'systemd-tools' 'udev')
-  optdepends=('initscripts: legacy support for /etc/rc.conf'
-              'python: systemd library bindings'
-              'python2-cairo: systemd-analyze'
-              'python2-dbus: systemd-analyze'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries'
-              'cryptsetup: required for encrypted block devices'
-              'quota-tools: kernel-level quota management')
-  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/logind.conf
-          etc/systemd/journald.conf
-          etc/udev/udev.conf)
-  install="systemd.install"
-
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # move bash-completion and symlink for *ctl's
-  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
-    "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  for ctl in {login,journal,timedate,locale,hostname}ctl; do
-    ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/$ctl"
-  done
-  rm -rf "$pkgdir/etc/bash_completion.d"
-
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
-
-  # get rid of RPM macros
-  rm -r "$pkgdir/etc/rpm"
-
-  # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work.
-  # https://pokersource.info/show_bug.cgi?id=50989
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # the path to udevadm is hardcoded in some places
-  install -d "$pkgdir/sbin"
-  ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm"
-
-  # udevd is no longer udevd because systemd. why isn't udevadm now udevctl?
-  ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd"
-
-  # add back tmpfiles.d/legacy.conf
-  install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
-
-  # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
-  sed -i 's#GROUP="dialout"#GROUP="uucp"#g;
-          s#GROUP="tape"#GROUP="storage"#g;
-          s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules
-
-  # add mkinitcpio hooks
-  install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
-  install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
-  install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
-
-  # XXX: kill off coredump rule until the journal can recover coredumps
-  rm "$pkgdir/usr/lib/sysctl.d/coredump.conf"
-
-  ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
-
-  # create /var/log/journal. users can control the actual log destination via journald.conf
-  install -dm755 "$pkgdir/var/log/journal"
-}
-
-package_systemd-sysvcompat() {
-  pkgdesc="sysvinit compat for systemd"
-  groups=('base')
-  conflicts=('sysvinit')
-  depends=('sysvinit-tools' 'systemd')
-
-  mv "$srcdir/_sysvcompat"/* "$pkgdir"
-
-  install -dm755 "$pkgdir/sbin"
-  for tool in runlevel reboot shutdown poweroff halt telinit; do
-    ln -s '/usr/bin/systemctl' "$pkgdir/sbin/$tool"
-  done
-
-  ln -s '../usr/lib/systemd/systemd' "$pkgdir/sbin/init"
-}
-
-# vim: ft=sh syn=sh et
diff --git a/testing/systemd/initcpio-hook-udev b/testing/systemd/initcpio-hook-udev
deleted file mode 100644
index 75da7e4a8..000000000
--- a/testing/systemd/initcpio-hook-udev
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    udevd --daemon --resolve-names=never
-    udevd_running=1
-}
-
-run_hook() {
-    msg ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-}
-
-run_cleanuphook() {
-    udevadm control --exit
-    udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/systemd/initcpio-install-timestamp b/testing/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/testing/systemd/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
-    cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/systemd/initcpio-install-udev b/testing/systemd/initcpio-install-udev
deleted file mode 100644
index 15124b8f7..000000000
--- a/testing/systemd/initcpio-install-udev
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    add_file "/etc/udev/udev.conf"
-    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
-    add_binary /usr/bin/udevadm
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
-    done
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/systemd/locale.sh b/testing/systemd/locale.sh
deleted file mode 100644
index a4c413eed..000000000
--- a/testing/systemd/locale.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-if [ ! -r /etc/locale.conf ]; then
-  return
-fi
-
-. /etc/locale.conf
-
-if [ "${LANG+x}" = 'x' ]; then
-  export LANG
-fi
-
-if [ "${LC_CTYPE+x}" = 'x' ]; then
-  export LC_CTYPE
-fi
-
-if [ "${LC_NUMERIC+x}" = 'x' ]; then
-  export LC_NUMERIC
-fi
-
-if [ "${LC_TIME+x}" = 'x' ]; then
-  export LC_TIME
-fi
-
-if [ "${LC_COLLATE+x}" = 'x' ]; then
-  export LC_COLLATE
-fi
-
-if [ "${LC_MONETARY+x}" = 'x' ]; then
-  export LC_MONETARY
-fi
-
-if [ "${LC_MESSAGES+x}" = 'x' ]; then
-  export LC_MESSAGES
-fi
-
-if [ "${LC_PAPER+x}" = 'x' ]; then
-  export LC_PAPER
-fi
-
-if [ "${LC_NAME+x}" = 'x' ]; then
-  export LC_NAME
-fi
-
-if [ "${LC_ADDRESS+x}" = 'x' ]; then
-  export LC_ADDRESS
-fi
-
-if [ "${LC_TELEPHONE+x}" = 'x' ]; then
-  export LC_TELEPHONE
-fi
-
-if [ "${LC_MEASUREMENT+x}" = 'x' ]; then
-  export LC_MEASUREMENT
-fi
-
-if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then
-  export LC_IDENTIFICATION
-fi
-
diff --git a/testing/systemd/systemd-tools.install b/testing/systemd/systemd-tools.install
deleted file mode 100644
index 7d0bd8790..000000000
--- a/testing/systemd/systemd-tools.install
+++ /dev/null
@@ -1,35 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_install() {
-  systemd-machine-id-setup
-}
-
-post_upgrade() {
-  systemd-machine-id-setup
-
-  if [ "$(vercmp $2 174)" -lt 0 ]; then
-    echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
-    echo "   'scanner' and 'video' groups. Beware of any changes."
-    echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-    echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
-    echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-    echo "   this functionality back."
-    echo " * We no longer create the static nodes on install needed for an initrd-less"
-    echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
-    echo "   installs."
-  fi
-  if [ "$(vercmp $2 175)" -lt 0 ]; then
-    echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
-    echo "   kernels have this enabled."
-  fi
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo " * udev-compat has been removed, and should be uninstalled."
-    echo " * Framebuffers are no longer blacklisted by default."
-    echo " * binaries moved from /sbin to /usr/bin"
-  fi
-  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
-    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
-    echo "   load the 'loop' module before using losetup"
-  fi
-}
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
deleted file mode 100644
index aad9691b0..000000000
--- a/testing/systemd/systemd.install
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
-}
-
-post_common() {
-  systemd-machine-id-setup
-
-  setcap cap_dac_override,cap_sys_ptrace+ep usr/bin/systemd-detect-virt
-
-  if sd_booted; then
-    systemctl --system daemon-reexec
-  fi
-}
-
-post_install() {
-  post_common
-
-  # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@.service
-
-  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
-  echo "   bootloader to replace sysvinit with systemd"
-}
-
-post_upgrade() {
-  post_common
-
-  # getty@tty1.service is no longer enabled by default, but we don't want to break
-  # existing setups.
-  if [ "$(vercmp 183 "$2")" -eq 1 ]; then
-    # systemctl seems to be whiny on sysvinit. this will succeed unless something
-    # horrific happens, so just mask the error.
-    systemctl -q enable getty@.service || true
-  fi
-
-  if [ "$(vercmp 194-4 "$2")" -eq 1 ]; then
-    printf '==> journald now writes to /var/log/journal by default. This can be\n'
-    printf '    controlled with the Storage setting in /etc/systemd/journald.conf\n'
-  fi
-
-  # logind's protocol changed. kindly restart the daemon to avoid locking
-  # out further logins.
-  if [ "$(vercmp 195 "$2")" -eq 1 ]; then
-    if sd_booted; then
-      systemctl restart systemd-logind.service
-    fi
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/systemd/use-split-usr-path.patch b/testing/systemd/use-split-usr-path.patch
deleted file mode 100644
index 2fd32998d..000000000
--- a/testing/systemd/use-split-usr-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/core/main.c	2012-09-20 23:02:54.000000000 -0400
-+++ b/src/core/main.c	2012-09-20 23:03:13.000000000 -0400
-@@ -1455,11 +1455,7 @@
- 
-         /* Set up PATH unless it is already set */
-         setenv("PATH",
--#ifdef HAVE_SPLIT_USR
-                "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
--#else
--               "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin",
--#endif
-                arg_running_as == SYSTEMD_SYSTEM);
- 
-         if (arg_running_as == SYSTEMD_SYSTEM) {
diff --git a/testing/sysvinit/0001-simplify-writelog.patch b/testing/sysvinit/0001-simplify-writelog.patch
deleted file mode 100644
index cc28f14bc..000000000
--- a/testing/sysvinit/0001-simplify-writelog.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Fri, 15 Jun 2012 16:41:52 +0200
-Subject: [PATCH 1/2] simplify writelog()
-
-All we do is prepend the date and remove \r. We don't handle color
-codes, but the user can just cat the log file in a terminal and it will
-interpret the codes correctly.
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c |   76 +++++++++++++++++-------------------------------------------
- 1 file changed, 21 insertions(+), 55 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index 570d382..e36e261 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -68,11 +68,6 @@ int didnl = 1;
- int createlogfile = 0;
- int syncalot = 0;
- 
--struct line {
--	char buf[256];
--	int pos;
--} line;
--
- /*
-  *	Console devices as listed on the kernel command line and
-  *	the mapping to actual devices in /dev
-@@ -351,63 +346,34 @@ int consolename(char *res, int rlen)
-  */
- void writelog(FILE *fp, unsigned char *ptr, int len)
- {
--	time_t		t;
--	char		*s;
--	char		tmp[8];
--	int		olen = len;
--	int		dosync = 0;
--	int		tlen;
--
--	while (len > 0) {
--		tmp[0] = 0;
--		if (didnl) {
-+	int dosync = 0;
-+	int i;
-+	static int first_run = 1;
-+
-+	for (i = 0; i < len; i++) {
-+		int ignore = 0;
-+
-+		/* prepend date to every line */
-+		if (*(ptr-1) == '\n' || first_run) {
-+			time_t t;
-+			char *s;
- 			time(&t);
- 			s = ctime(&t);
- 			fprintf(fp, "%.24s: ", s);
--			didnl = 0;
-+			dosync = 1;
-+			first_run = 0;
- 		}
--		switch (*ptr) {
--			case 27: /* ESC */
--				strcpy(tmp, "^[");
--				break;
--			case '\r':
--				line.pos = 0;
--				break;
--			case 8: /* ^H */
--				if (line.pos > 0) line.pos--;
--				break;
--			case '\n':
--				didnl = 1;
--				dosync = 1;
--				break;
--			case '\t':
--				line.pos += (line.pos / 8 + 1) * 8;
--				if (line.pos >= (int)sizeof(line.buf))
--					line.pos = sizeof(line.buf) - 1;
--				break;
--			case  32 ... 127:
--			case 161 ... 255:
--				tmp[0] = *ptr;
--				tmp[1] = 0;
--				break;
--			default:
--				sprintf(tmp, "\\%03o", *ptr);
--				break;
--		}
--		ptr++;
--		len--;
- 
--		tlen = strlen(tmp);
--		if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
--			memcpy(line.buf + line.pos, tmp, tlen);
--			line.pos += tlen;
-+		if (*ptr == '\r') {
-+			ignore = 1;
- 		}
--		if (didnl) {
--			fprintf(fp, "%s\n", line.buf);
--			memset(&line, 0, sizeof(line));
-+
-+		if (!ignore) {
-+			fwrite(ptr, sizeof(char), 1, fp);
- 		}
--	}
- 
-+		ptr++;
-+	}
- 	if (dosync) {
- 		fflush(fp);
- 		if (syncalot) {
-@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- 		}
- 	}
- 
--	outptr += olen;
-+	outptr += len;
- 	if (outptr >= endptr)
- 		outptr = ringbuf;
- 
--- 
-1.7.10.4
-
diff --git a/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch b/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch
deleted file mode 100644
index 89b3280df..000000000
--- a/testing/sysvinit/0002-remove-ansi-escape-codes-from-log-file.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 8d0022d9540112a92ce8d88c91c4ac10bad8c9ef Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Sun, 24 Jun 2012 15:49:51 +0200
-Subject: [PATCH 2/2] remove ansi escape codes from log file
-
-References: https://en.wikipedia.org/wiki/ANSI_escape_code
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c |   45 +++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 43 insertions(+), 2 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index e36e261..88e610d 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -349,6 +349,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- 	int dosync = 0;
- 	int i;
- 	static int first_run = 1;
-+	static int inside_esc = 0;
- 
- 	for (i = 0; i < len; i++) {
- 		int ignore = 0;
-@@ -364,10 +365,50 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- 			first_run = 0;
- 		}
- 
--		if (*ptr == '\r') {
--			ignore = 1;
-+		/* remove escape sequences, but do it in a way that allows us to stop
-+		 * in the middle in case the string was cut off */
-+		if (inside_esc == 1) {
-+			/* first '[' is special because if we encounter it again, it should be considered the final byte */
-+			if (*ptr == '[') {
-+				/* multi char sequence */
-+				ignore = 1;
-+				inside_esc = 2;
-+			} else {
-+				/* single char sequence */
-+				if (*ptr >= 64 && *ptr <= 95) {
-+					ignore = 1;
-+				}
-+				inside_esc = 0;
-+			}
-+		} else if (inside_esc == 2) {
-+			switch (*ptr) {
-+				case '0' ... '9': /* intermediate chars of escape sequence */
-+				case ';':
-+				case 32 ... 47:
-+					if (inside_esc) {
-+						ignore = 1;
-+					}
-+					break;
-+				case 64 ... 126: /* final char of escape sequence */
-+					if (inside_esc) {
-+						ignore = 1;
-+						inside_esc = 0;
-+					}
-+					break;
-+			}
-+		} else {
-+			switch (*ptr) {
-+				case '\r':
-+					ignore = 1;
-+					break;
-+				case 27: /* ESC */
-+					ignore = 1;
-+					inside_esc = 1;
-+					break;
-+			}
- 		}
- 
-+
- 		if (!ignore) {
- 			fwrite(ptr, sizeof(char), 1, fp);
- 		}
--- 
-1.7.10.4
-
diff --git a/testing/sysvinit/PKGBUILD b/testing/sysvinit/PKGBUILD
deleted file mode 100644
index 9772bf6a5..000000000
--- a/testing/sysvinit/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 168493 2012-10-12 19:09:19Z thomas $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgbase=sysvinit
-pkgname=('sysvinit-tools' 'sysvinit')
-pkgver=2.88
-pkgrel=9
-arch=('i686' 'x86_64')
-url="http://savannah.nongnu.org/projects/sysvinit"
-license=('GPL')
-depends=('util-linux' 'coreutils' 'glibc' 'awk')
-source=(http://download.savannah.gnu.org/releases/sysvinit/${pkgbase}-${pkgver}dsf.tar.bz2
-        "0001-simplify-writelog.patch"
-        "0002-remove-ansi-escape-codes-from-log-file.patch")
-sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
-          '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d'
-          'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}dsf"
-
-  # FS#30005
-  patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
-  patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch"
-
-  make 
-}
-
-package_sysvinit-tools() {
-  pkgdesc="Linux System V Init Tools"
-
-  cd "${srcdir}/${pkgbase}-${pkgver}dsf"
-  make ROOT="${pkgdir}" install
-
-  # provided by util-linux
-  cd "${pkgdir}"
-  rm bin/mountpoint
-  rm usr/share/man/man1/mountpoint.1
-  rm usr/bin/{mesg,utmpdump,wall}
-  rm usr/share/man/man1/{mesg,utmpdump,wall}.1
-  rm sbin/sulogin
-  rm usr/share/man/man8/sulogin.8
-
-  ### split out sysvinit
-  rm -rf ${srcdir}/_sysvinit
-  install -dm755 \
-        ${srcdir}/_sysvinit/sbin \
-        ${srcdir}/_sysvinit/usr/share/man/man8
-  cd ${srcdir}/_sysvinit
-  mv ${pkgdir}/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} sbin/
-  mv ${pkgdir}/usr/share/man/man5 usr/share/man/
-  mv ${pkgdir}/usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}.8 usr/share/man/man8/
-}
-
-package_sysvinit() {
-  pkgdesc="Linux System V Init"
-  depends=('sysvinit-tools')
-  install=sysvinit.install
-
-  mv "${srcdir}"/_sysvinit/* $pkgdir
-}
diff --git a/testing/sysvinit/Remove-handling-of-special-chars-fix-per-line-buffer.patch b/testing/sysvinit/Remove-handling-of-special-chars-fix-per-line-buffer.patch
deleted file mode 100644
index b573b9a6d..000000000
--- a/testing/sysvinit/Remove-handling-of-special-chars-fix-per-line-buffer.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 4d2b17f47073e0491f9dfa62797cc727d4530f22 Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Tue, 22 May 2012 22:14:52 +0200
-Subject: [PATCH] Remove handling of special chars; fix per line buffer
- problem
-
-The linebuffer was only 256 chars so longer lines were truncated.
-
-By removing the handling of special chars (for example: /n/r/t) and
-simply writing everything we read as is to the logfile we fix this bug,
-make the code much smaller and allow users to write userspace tools that
-correctly handle rendering.
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c |  139 +++++++++---------------------------------------------------
- 1 file changed, 19 insertions(+), 120 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index 570d382..5df8fb9 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -58,21 +58,10 @@ char *Version = "@(#) bootlogd 2.86 03-Jun-2004 miquels@cistron.nl";
- 
- #define LOGFILE	"/var/log/boot"
- 
--char ringbuf[32768];
--char *endptr = ringbuf + sizeof(ringbuf);
--char *inptr  = ringbuf;
--char *outptr = ringbuf;
--
- int got_signal = 0;
--int didnl = 1;
- int createlogfile = 0;
- int syncalot = 0;
- 
--struct line {
--	char buf[256];
--	int pos;
--} line;
--
- /*
-  *	Console devices as listed on the kernel command line and
-  *	the mapping to actual devices in /dev
-@@ -345,83 +334,6 @@ int consolename(char *res, int rlen)
- 	return -1;
- }
- 
--
--/*
-- *	Write data and make sure it's on disk.
-- */
--void writelog(FILE *fp, unsigned char *ptr, int len)
--{
--	time_t		t;
--	char		*s;
--	char		tmp[8];
--	int		olen = len;
--	int		dosync = 0;
--	int		tlen;
--
--	while (len > 0) {
--		tmp[0] = 0;
--		if (didnl) {
--			time(&t);
--			s = ctime(&t);
--			fprintf(fp, "%.24s: ", s);
--			didnl = 0;
--		}
--		switch (*ptr) {
--			case 27: /* ESC */
--				strcpy(tmp, "^[");
--				break;
--			case '\r':
--				line.pos = 0;
--				break;
--			case 8: /* ^H */
--				if (line.pos > 0) line.pos--;
--				break;
--			case '\n':
--				didnl = 1;
--				dosync = 1;
--				break;
--			case '\t':
--				line.pos += (line.pos / 8 + 1) * 8;
--				if (line.pos >= (int)sizeof(line.buf))
--					line.pos = sizeof(line.buf) - 1;
--				break;
--			case  32 ... 127:
--			case 161 ... 255:
--				tmp[0] = *ptr;
--				tmp[1] = 0;
--				break;
--			default:
--				sprintf(tmp, "\\%03o", *ptr);
--				break;
--		}
--		ptr++;
--		len--;
--
--		tlen = strlen(tmp);
--		if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
--			memcpy(line.buf + line.pos, tmp, tlen);
--			line.pos += tlen;
--		}
--		if (didnl) {
--			fprintf(fp, "%s\n", line.buf);
--			memset(&line, 0, sizeof(line));
--		}
--	}
--
--	if (dosync) {
--		fflush(fp);
--		if (syncalot) {
--			fdatasync(fileno(fp));
--		}
--	}
--
--	outptr += olen;
--	if (outptr >= endptr)
--		outptr = ringbuf;
--
--}
--
--
- /*
-  *	Print usage message and exit.
-  */
-@@ -481,7 +393,6 @@ int main(int argc, char **argv)
- 	int		ptm, pts;
- 	int		realfd;
- 	int		n, m, i;
--	int		todo;
- 
- 	fp = NULL;
- 	logfile = LOGFILE;
-@@ -615,13 +526,13 @@ int main(int argc, char **argv)
- 			/*
- 			 *	See how much space there is left, read.
- 			 */
--			if ((n = read(ptm, inptr, endptr - inptr)) >= 0) {
-+			if ((n = read(ptm, buf, sizeof(buf))) >= 0) {
- 				/*
- 				 *	Write data (in chunks if needed)
- 				 *	to the real output device.
- 				 */
- 				m = n;
--				p = inptr;
-+				p = buf;
- 				while (m > 0) {
- 					i = write(realfd, p, m);
- 					if (i >= 0) {
-@@ -641,43 +552,31 @@ int main(int argc, char **argv)
- 				}
- 
- 				/*
--				 *	Increment buffer position. Handle
--				 *	wraps, and also drag output pointer
--				 *	along if we cross it.
-+				 *	Perhaps we need to open the logfile.
- 				 */
--				inptr += n;
--				if (inptr - n < outptr && inptr > outptr)
--					outptr = inptr;
--				if (inptr >= endptr)
--					inptr = ringbuf;
--				if (outptr >= endptr)
--					outptr = ringbuf;
--			}
--		}
-+				if (fp == NULL && access(logfile, F_OK) == 0) {
-+					if (rotate) {
-+						snprintf(buf, sizeof(buf), "%s~", logfile);
-+						rename(logfile, buf);
-+					}
-+					fp = fopen(logfile, "a");
-+				}
-+				if (fp == NULL && createlogfile)
-+					fp = fopen(logfile, "a");
- 
--		/*
--		 *	Perhaps we need to open the logfile.
--		 */
--		if (fp == NULL && access(logfile, F_OK) == 0) {
--			if (rotate) {
--				snprintf(buf, sizeof(buf), "%s~", logfile);
--				rename(logfile, buf);
-+				if (fp) {
-+					write(fileno(fp), buf, n);
-+				}
-+
-+				if (syncalot) {
-+					fdatasync(fileno(fp));
-+				}
- 			}
--			fp = fopen(logfile, "a");
- 		}
--		if (fp == NULL && createlogfile)
--			fp = fopen(logfile, "a");
- 
--		if (inptr >= outptr)
--			todo = inptr - outptr;
--		else
--			todo = endptr - outptr;
--		if (fp && todo)
--			writelog(fp, (unsigned char *)outptr, todo);
- 	}
- 
- 	if (fp) {
--		if (!didnl) fputc('\n', fp);
- 		fclose(fp);
- 	}
- 
--- 
-1.7.10.2
-
diff --git a/testing/sysvinit/simplify-writelog.patch b/testing/sysvinit/simplify-writelog.patch
deleted file mode 100644
index 272a88980..000000000
--- a/testing/sysvinit/simplify-writelog.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Fri, 15 Jun 2012 16:41:52 +0200
-Subject: [PATCH] simplify writelog()
-
-All we do is prepend the date and remove \r. We don't handle color
-codes, but the user can just cat the log file in a terminal and it will
-interpret the codes correctly.
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c |   76 +++++++++++++++++-------------------------------------------
- 1 file changed, 21 insertions(+), 55 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index 570d382..e36e261 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -68,11 +68,6 @@ int didnl = 1;
- int createlogfile = 0;
- int syncalot = 0;
- 
--struct line {
--	char buf[256];
--	int pos;
--} line;
--
- /*
-  *	Console devices as listed on the kernel command line and
-  *	the mapping to actual devices in /dev
-@@ -351,63 +346,34 @@ int consolename(char *res, int rlen)
-  */
- void writelog(FILE *fp, unsigned char *ptr, int len)
- {
--	time_t		t;
--	char		*s;
--	char		tmp[8];
--	int		olen = len;
--	int		dosync = 0;
--	int		tlen;
--
--	while (len > 0) {
--		tmp[0] = 0;
--		if (didnl) {
-+	int dosync = 0;
-+	int i;
-+	static int first_run = 1;
-+
-+	for (i = 0; i < len; i++) {
-+		int ignore = 0;
-+
-+		/* prepend date to every line */
-+		if (*(ptr-1) == '\n' || first_run) {
-+			time_t t;
-+			char *s;
- 			time(&t);
- 			s = ctime(&t);
- 			fprintf(fp, "%.24s: ", s);
--			didnl = 0;
-+			dosync = 1;
-+			first_run = 0;
- 		}
--		switch (*ptr) {
--			case 27: /* ESC */
--				strcpy(tmp, "^[");
--				break;
--			case '\r':
--				line.pos = 0;
--				break;
--			case 8: /* ^H */
--				if (line.pos > 0) line.pos--;
--				break;
--			case '\n':
--				didnl = 1;
--				dosync = 1;
--				break;
--			case '\t':
--				line.pos += (line.pos / 8 + 1) * 8;
--				if (line.pos >= (int)sizeof(line.buf))
--					line.pos = sizeof(line.buf) - 1;
--				break;
--			case  32 ... 127:
--			case 161 ... 255:
--				tmp[0] = *ptr;
--				tmp[1] = 0;
--				break;
--			default:
--				sprintf(tmp, "\\%03o", *ptr);
--				break;
--		}
--		ptr++;
--		len--;
- 
--		tlen = strlen(tmp);
--		if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
--			memcpy(line.buf + line.pos, tmp, tlen);
--			line.pos += tlen;
-+		if (*ptr == '\r') {
-+			ignore = 1;
- 		}
--		if (didnl) {
--			fprintf(fp, "%s\n", line.buf);
--			memset(&line, 0, sizeof(line));
-+
-+		if (!ignore) {
-+			fwrite(ptr, sizeof(char), 1, fp);
- 		}
--	}
- 
-+		ptr++;
-+	}
- 	if (dosync) {
- 		fflush(fp);
- 		if (syncalot) {
-@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- 		}
- 	}
- 
--	outptr += olen;
-+	outptr += len;
- 	if (outptr >= endptr)
- 		outptr = ringbuf;
- 
--- 
-1.7.10.4
-
diff --git a/testing/sysvinit/sysvinit.install b/testing/sysvinit/sysvinit.install
deleted file mode 100644
index 2f0e62e74..000000000
--- a/testing/sysvinit/sysvinit.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_upgrade() {
-  [ -x sbin/init ] && sbin/init u
-}
diff --git a/testing/taglib/PKGBUILD b/testing/taglib/PKGBUILD
deleted file mode 100644
index 459bd1476..000000000
--- a/testing/taglib/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 166904 2012-09-21 14:17:12Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Ike Devolder <ike.devolder@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=taglib
-pkgver=1.8
-pkgrel=1
-pkgdesc="A Library for reading and editing the meta-data of several popular audio formats"
-arch=('i686' 'x86_64')
-url="http://developer.kde.org/~wheeler/taglib.html"
-license=('LGPL' 'MPL')
-depends=('sh' 'zlib' 'gcc-libs')
-makedepends=('cmake' 'pkg-config')
-options=('!libtool')
-source=("https://github.com/downloads/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('dcb8bd1b756f2843e18b1fdf3aaeee15')
-
-build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}
-
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_MP4=ON \
-    -DWITH_ASF=ON
-  make
-}
-
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/tcl/PKGBUILD b/testing/tcl/PKGBUILD
deleted file mode 100644
index ee3bd172a..000000000
--- a/testing/tcl/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 164247 2012-07-28 09:51:11Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Committer: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=tcl
-pkgver=8.5.12
-pkgrel=1
-pkgdesc="The Tcl scripting language"
-arch=('i686' 'x86_64')
-url="http://tcl.sourceforge.net/"
-license=('custom')
-source=(http://downloads.sourceforge.net/sourceforge/tcl/tcl${pkgver}-src.tar.gz)
-md5sums=('174b2b4c619ba8f96875d8a051917703')
-
-build() {
-  cd ${srcdir}/tcl${pkgver}/unix
-  
-  if [ "$CARCH" = "x86_64" ]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit
-  else
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit
-  fi
-  
-  make
-}
-
-check() {
-  cd ${srcdir}/tcl${pkgver}/unix
-  make test
-}
-
-package()
-{
-  cd ${srcdir}/tcl${pkgver}/unix
-  
-  make INSTALL_ROOT=${pkgdir} install install-private-headers
-  ln -sf tclsh8.5 ${pkgdir}/usr/bin/tclsh
-  
-  # install license
-  install -Dm644 ../license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # remove buildroot traces
-  sed -i \
-    -e "s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L/usr/lib," \
-    -e "s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='/usr/include'," \
-    -e "s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-    -e "s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='/usr/lib," \
-    -e "s,^TCL_LIB_FILE='libtcl8.5..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl8.5\$\{TCL_DBGX\}.so\"," \
-    -e "s,^TCL_CC_SEARCH_FLAGS='\(.*\)',TCL_CC_SEARCH_FLAGS='\1:/usr/lib'," \
-    -e "s,^TCL_LD_SEARCH_FLAGS='\(.*\)',TCL_LD_SEARCH_FLAGS='\1:/usr/lib'," \
-    ${pkgdir}/usr/lib/tclConfig.sh
-}
diff --git a/testing/telepathy-farstream/PKGBUILD b/testing/telepathy-farstream/PKGBUILD
deleted file mode 100644
index 9c0821374..000000000
--- a/testing/telepathy-farstream/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169154 2012-10-18 19:22:38Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=telepathy-farstream
-pkgver=0.6.0
-pkgrel=1
-pkgdesc="A telepathy-backend to use stream engine."
-arch=(i686 x86_64)
-url="http://telepathy.freedesktop.org"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'farstream')
-makedepends=('dbus-glib' 'gobject-introspection')
-conflicts=('telepathy-farsight')
-replaces=('telepathy-farsight')
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('d154350f9f1e3bdba87617c0668481a5')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/telepathy \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-gabble/PKGBUILD b/testing/telepathy-gabble/PKGBUILD
deleted file mode 100644
index 2ae8c9650..000000000
--- a/testing/telepathy-gabble/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169153 2012-10-18 19:22:37Z jgc $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Daniel Balieiro <daniel@balieiro.com>
-# Contributor: Rodrigo L. M. Flores <mail@rodrigoflores.org>
-pkgname=telepathy-gabble
-pkgver=0.17.1
-pkgrel=1
-pkgdesc="A Jabber/XMPP connection manager for Telepathy"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-groups=('telepathy')
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libsoup' 'libnice' 'sqlite')
-makedepends=('libxslt' 'python2')
-options=('!libtool' '!emptydirs')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-install=telepathy-gabble.install
-md5sums=('42e01fdc4117255080883495411e7318')
-
-build() {
-  cd $pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-  	--libexecdir=/usr/lib/telepathy --with-tls=openssl
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir/usr/bin/telepathy-gabble-xmpp-console"
-}
diff --git a/testing/telepathy-gabble/telepathy-gabble.install b/testing/telepathy-gabble/telepathy-gabble.install
deleted file mode 100644
index 87d7838b8..000000000
--- a/testing/telepathy-gabble/telepathy-gabble.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  killall -HUP dbus-daemon 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD
deleted file mode 100644
index 29f21ee83..000000000
--- a/testing/telepathy-glib/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169152 2012-10-18 19:22:35Z jgc $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-
-pkgname=telepathy-glib
-pkgver=0.20.0
-pkgrel=1
-pkgdesc="GLib bindings for the Telepathy D-Bus protocol"
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org"
-license=('LGPL2.1')
-options=('!libtool' '!emptydirs')
-depends=('dbus-glib')
-makedepends=('libxslt' 'vala' 'gobject-introspection')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('9d7b2bcc2d9f8e0352c8789952717d83')
-
-build() {
-    cd $pkgname-$pkgver
-    PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-        --libexecdir=/usr/lib/telepathy \
-        --enable-vala-bindings \
-        --enable-static=no
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/telepathy-mission-control/PKGBUILD b/testing/telepathy-mission-control/PKGBUILD
deleted file mode 100644
index fd9c4ac92..000000000
--- a/testing/telepathy-mission-control/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 169151 2012-10-18 19:22:33Z jgc $
-# Maintainer:  Ionut Biru <ibiru@archlinux.org>
-# Contributor: Ju Liu <liuju86 at gmail dot com>
-# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
-# Contributor: Andreas Zwinkau <beza1e1@web.de>
-
-pkgname=telepathy-mission-control
-pkgver=5.14.0
-pkgrel=1
-pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers."
-arch=('i686' 'x86_64')
-url="http://telepathy.freedesktop.org/wiki/Mission Control"
-license=('LGPL2.1')
-depends=('telepathy-glib' 'libgnome-keyring' 'dconf' 'upower' 'networkmanager')
-makedepends=('libxslt' 'python2')
-install=telepathy-mission-control.install
-options=('!libtool')
-source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('483fa8860891815a540ecf1bb9155122')
-
-build() {
-    cd "$pkgname-$pkgver"
-    ./configure --prefix=/usr \
-    	--libexecdir=/usr/lib/telepathy \
-	--enable-gnome-keyring \
-        --disable-schemas-compile
-    make
-}
-
-package() {
-    cd "$pkgname-$pkgver"
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/telepathy-mission-control/telepathy-mission-control.install b/testing/telepathy-mission-control/telepathy-mission-control.install
deleted file mode 100644
index c25dff2d3..000000000
--- a/testing/telepathy-mission-control/telepathy-mission-control.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/testing/timidity++/PKGBUILD b/testing/timidity++/PKGBUILD
deleted file mode 100644
index cec8e8a35..000000000
--- a/testing/timidity++/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165420 2012-08-18 23:03:32Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=timidity++
-pkgver=2.14.0
-pkgrel=3
-pkgdesc="A MIDI to WAVE converter and player"
-arch=('i686' 'x86_64')
-url="http://timidity.sourceforge.net"
-license=('GPL')
-depends=('libao' 'libvorbis' 'jack' 'ncurses')
-makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw')
-optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \
-            'xaw3d: for using the Xaw interface')
-backup=('etc/timidity++/timidity.cfg')
-source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \
-        timidity.cfg timidity++.sh timidity.service)
-sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b'
-          '660b3afbb720d26e8f008034cee66dd8da082d6e'
-          '9f3e732a7ca1e97119a76df62ecf154df04d4f77'
-          'f0351b9eb8928d3d82c380107654a7dbe7cd2d54')
-
-build() {
-  cd "${srcdir}/TiMidity++-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \
-    --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \
-    --enable-audio=alsa,oss,ao,vorbis,flac,jack \
-    --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk
-  make
-}
-
-package() {
-  cd "${srcdir}/TiMidity++-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 ../timidity.cfg "${pkgdir}/etc/timidity++/timidity.cfg"
-  install -D -m755 ../timidity++.sh "${pkgdir}/etc/rc.d/timidity++"
-  install -D -m644 ../timidity.service "${pkgdir}/usr/lib/systemd/system/timidity.service"
-}
diff --git a/testing/timidity++/timidity++.sh b/testing/timidity++/timidity++.sh
deleted file mode 100644
index 3fa13cea9..000000000
--- a/testing/timidity++/timidity++.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/timidity`
-case "$1" in
-   start)
-     stat_busy "Starting Timidity++ ALSA Daemon"
-     [ -z "$PID" ] && /usr/bin/timidity -iAD > /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       echo $PID > /var/run/timidity.pid
-       add_daemon timidity++
-       stat_done
-     fi
-     ;;
-   stop)
-     stat_busy "Stopping Timidity++ ALSA Daemon"
-     [ ! -z "$PID" ]  && kill $PID &> /dev/null
-     if [ $? -gt 0 ]; then
-       stat_fail
-     else
-       rm /var/run/timidity.pid
-       rm_daemon timidity++
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 1
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/timidity++/timidity.cfg b/testing/timidity++/timidity.cfg
deleted file mode 100644
index 59bbfa935..000000000
--- a/testing/timidity++/timidity.cfg
+++ /dev/null
@@ -1,29 +0,0 @@
-# details on this file and other examples see here:
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/sndfont.cfg
-# http://www.onicos.com/staff/iz/timidity/dist/cfg/
-#----------------------------------------------------------------
-# SoundFont extension configuration
-#
-# soundfont <filename> [order={0|1}] [remove]
-#    <filename> is the path of SoundFont file.
-#    order: 0(preload) or 1(load after GUS).
-#    remove: disable specified soundfont.
-#
-# font exclude <tonebank> [<preset> [<keynote>]]
-# font order {0|1} <tonebank> [<preset> [<keynote>]]
-#    <tonebank>: 0-127
-#
-# font exclude 128 [<drumset> [<key>]]
-# font order {0|1} 128 [<drumset> [<key>]]
-#----------------------------------------------------------------
-
-# change the next line to point to a soundfont you have
-# soundfonts can be found e.g. here: http://www.hammersound.net/
-# soundfont /usr/share/soundfonts/DX7Piano.SF2
-
-# you can do manipulations of the soundfont you load like this:
-# e.g. removing drumset 99
-# font exclude 128 99
-
-# load drum samples after GUS patches
-# font order 1 128
diff --git a/testing/timidity++/timidity.service b/testing/timidity++/timidity.service
deleted file mode 100644
index 4d6ceea6a..000000000
--- a/testing/timidity++/timidity.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=TiMidity++ Daemon
-After=sound.target
-
-[Service]
-ExecStart=/usr/bin/timidity -iA
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/tinycdb/PKGBUILD b/testing/tinycdb/PKGBUILD
deleted file mode 100644
index 69c665528..000000000
--- a/testing/tinycdb/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 163100 2012-07-07 03:15:00Z bisson $
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=tinycdb
-pkgver=0.78
-pkgrel=1
-pkgdesc='Very fast and simple package for creating and reading constant data bases'
-url='http://www.corpit.ru/mjt/tinycdb.html'
-license=('custom')
-arch=('i686' 'x86_64')
-source=("http://www.corpit.ru/mjt/tinycdb/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('ade42ee1e7c56f66a63cb933206c089b9983adba')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	sed -e 's/all: static/all: shared/' -e '/libcdb.a/d' -i Makefile
-	make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" prefix=/usr mandir=/usr/share/man \
-		INSTALLPROG=cdb-shared install-{all,sharedlib}
-	install -Dm644 debian/copyright "${pkgdir}"/usr/share/licenses/tinycdb/copyright
-}
diff --git a/testing/tk/PKGBUILD b/testing/tk/PKGBUILD
deleted file mode 100644
index cc57372c8..000000000
--- a/testing/tk/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 164249 2012-07-28 09:52:37Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-
-pkgname=tk
-pkgver=8.5.12
-pkgrel=1
-pkgdesc="A windowing toolkit for use with tcl"
-arch=('i686' 'x86_64')
-url="http://tcl.sourceforge.net/"
-license=('custom')
-depends=("tcl=${pkgver}" 'libxss' 'libxft')
-source=(http://downloads.sourceforge.net/sourceforge/tcl/tk${pkgver}-src.tar.gz)
-md5sums=('a01640176845c1f654a412cfc9bab13b')
-
-build() {
-  cd ${srcdir}/tk${pkgver}/unix
-
-  if [ "$CARCH" = "x86_64" ]; then
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --enable-64bit
-  else
-    ./configure --prefix=/usr --mandir=/usr/share/man --enable-threads --disable-64bit
-  fi
-  
-  make
-}
-
-#check() {
-#  cd ${srcdir}/tk${pkgver}/unix
-#  make test
-#}
-
-package() {
-  cd ${srcdir}/tk${pkgver}/unix
-
-  make INSTALL_ROOT=${pkgdir} install install-private-headers
-  ln -sf wish8.5 ${pkgdir}/usr/bin/wish
-  
-  # install private headers (FS#14388)
-  cd ${srcdir}/tk${pkgver}
-  for dir in compat generic generic/ttk unix; do
-    install -dm755 ${pkgdir}/usr/include/tk-private/$dir
-    install -m644 -t ${pkgdir}/usr/include/tk-private/$dir $dir/*.h
-  done
-
-  # install license
-  install -Dm644 license.terms ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # remove buildroot traces
-  sed -i \
-    -e "s,^TK_BUILD_LIB_SPEC='-L.*/unix,TK_BUILD_LIB_SPEC='-L/usr/lib," \
-    -e "s,^TK_SRC_DIR='.*',TK_SRC_DIR='/usr/include'," \
-    -e "s,^TK_BUILD_STUB_LIB_SPEC='-L.*/unix,TK_BUILD_STUB_LIB_SPEC='-L/usr/lib," \
-    -e "s,^TK_BUILD_STUB_LIB_PATH='.*/unix,TK_BUILD_STUB_LIB_PATH='/usr/lib," \
-    ${pkgdir}/usr/lib/tkConfig.sh
-}
diff --git a/testing/totem-plparser/PKGBUILD b/testing/totem-plparser/PKGBUILD
deleted file mode 100644
index 22ee81c89..000000000
--- a/testing/totem-plparser/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 169150 2012-10-18 19:22:31Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=totem-plparser
-pkgver=3.4.3
-pkgrel=1
-url="http://www.gnome.org"
-pkgdesc="Totem playlist parser library"
-license=('LGPL')
-arch=(i686 x86_64)
-depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi')
-makedepends=('intltool' 'gobject-introspection')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz)
-sha256sums=('ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b')
-
-build() {
-  cd totem-pl-parser-$pkgver
-  ./configure --prefix=/usr \
-      --sysconfdir=/etc \
-      --localstatedir=/var \
-      --disable-static
-  make
-}
-
-package(){
-  cd totem-pl-parser-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/totem/PKGBUILD b/testing/totem/PKGBUILD
deleted file mode 100644
index e5f3cf652..000000000
--- a/testing/totem/PKGBUILD
+++ /dev/null
@@ -1,70 +0,0 @@
-# $Id: PKGBUILD 169149 2012-10-18 19:22:29Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=totem
-pkgname=('totem' 'totem-plugin')
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="GNOME3 movie player based on GStreamer"
-url="http://www.gnome.org"
-arch=(i686 x86_64)
-license=(GPL2 custom)
-depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas
-         hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst
-         clutter-gtk mx python2-gobject gst-plugins-bad)
-makedepends=(intltool gnome-doc-utils nautilus lirc-utils vala grilo pylint)
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz
-        browser-plugins.ini)
-sha256sums=('e767da34f5212bd9b2d3ea9bc7e3a87b284581ee012214274225dd8decb8fe3e'
-            'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e')
-
-build() {
-  cd "$pkgbase-$pkgver"
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/totem \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-python \
-    --enable-nautilus
-  make
-}
-
-package_totem() {
-  groups=(gnome-extra)
-  install=totem.install
-  optdepends=('gst-plugins-ugly: Extra media codecs'
-              'gst-ffmpeg: Extra media codecs'
-              'lirc-utils: Infrared Remote Control plugin'
-              'grilo-plugins: Browse sidebar (remote media)'
-              'pyxdg: opensubtitles plugin')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "$pkgdir/usr/lib/mozilla"
-  rm "$pkgdir/usr/lib/totem/totem-plugin-viewer"
-
-  sed -i "s|#!/usr/bin/python$|#!/usr/bin/python2|" \
-    $pkgdir/usr/lib/totem/totem/totem-bugreport.py
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem/COPYING"
-}
-
-package_totem-plugin() {
-  pkgdesc="Totem plugin for web browsers"
-  depends=("totem=$pkgver")
-  backup=(etc/totem/browser-plugins.ini)
-
-  cd "$pkgbase-$pkgver"
-  make -C browser-plugin \
-    plugindir=/usr/lib/mozilla/plugins \
-    xptdir=/usr/lib/mozilla/plugins \
-    DESTDIR="$pkgdir" install
-  
-  install -Dm644 ../browser-plugins.ini "$pkgdir/etc/totem/browser-plugins.ini"
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/totem-plugin/COPYING"
-}
diff --git a/testing/totem/browser-plugins.ini b/testing/totem/browser-plugins.ini
deleted file mode 100644
index cf3014997..000000000
--- a/testing/totem/browser-plugins.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Plugins]
-application/x-shockwave-flash.disabled=true
diff --git a/testing/totem/totem.install b/testing/totem/totem.install
deleted file mode 100644
index 7f0fc704b..000000000
--- a/testing/totem/totem.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/traceroute/PKGBUILD b/testing/traceroute/PKGBUILD
deleted file mode 100644
index fd64bbb31..000000000
--- a/testing/traceroute/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 162017 2012-06-18 20:22:03Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=traceroute
-pkgver=2.0.18
-pkgrel=1
-pkgdesc="Tracks the route taken by packets over an IP network"
-arch=('i686' 'x86_64')
-url="http://traceroute.sourceforge.net/"
-license=('GPL2')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('6bdccfd12f93b89aea53728b3c365db5a4362b6d')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make prefix=/usr DESTDIR="${pkgdir}" install
-}
diff --git a/testing/tracker/PKGBUILD b/testing/tracker/PKGBUILD
deleted file mode 100644
index 9d9cde003..000000000
--- a/testing/tracker/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 169619 2012-10-24 17:52:34Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgbase=tracker
-pkgname=(tracker libtracker-sparql)
-pkgver=0.14.3
-_tver=${pkgver%.*}
-pkgrel=1
-pkgdesc="All-in-one indexer, search tool and metadata database"
-arch=('i686' 'x86_64')
-license=('GPL')
-makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi'
-             'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3'
-             'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection'
-             'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser'
-             'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala')
-url="http://www.gnome.org"
-options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('7c1ecf3705ecbd2a0278d04277cd1bd8c89d5838913de922fef32321ce67abe4')
-
-build() {
-  cd $pkgbase-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/tracker \
-    --disable-unit-tests \
-    --enable-libflac \
-    --enable-libvorbis
-
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
-
-  make
-}
-
-package_tracker() {
-  depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring'
-           'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca'
-           'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('giflib: extractor for GIF data'
-              'gstreamer0.10-base: video extractor'
-              'totem-plparser: playlist support'
-              'nautilus: nautilus-extension'
-              'libvorbis: Vorbis metadata extractor'
-              'flac: FLAC metadata extractor'
-              'taglib: writeback for audio files'
-              'gnome-panel: tracker-search-bar')
-  groups=('gnome-extra')
-  install=tracker.install
-
-  cd $pkgbase-$pkgver
-  make DESTDIR="$pkgdir" install
-
-### Split libtracker-sparql
-
-  mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver
-  mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig}
-  mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi}
-
-  mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib"
-
-  mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \
-    "$srcdir/sparql/usr/lib/tracker-$_tver"
-
-  mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \
-    "$srcdir/sparql/usr/share/vala/vapi"
-
-  mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib
-  mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc
-  mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir
-}
-
-package_libtracker-sparql() {
-  pkgdesc="$pkgdesc (SPARQL library)"
-  depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux')
-
-  mv "$srcdir"/sparql/* "$pkgdir"
-}
diff --git a/testing/tracker/bug675660.patch b/testing/tracker/bug675660.patch
deleted file mode 100644
index 5f217d983..000000000
--- a/testing/tracker/bug675660.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 20 Jul 2012 14:46:33 +0000
-Subject: libtracker-fts: ICU cannot handle complex locale descriptions
-
-ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"),
-not the full definition of your various locale variables and their
-values as returned by glibc's setlocale(LC_ALL, NULL).
-
-Instead, limit ourselves to LC_CTYPE, since after all, that's all we
-need to determine word boundaries.
-
-Fixes GB#675660.
----
-diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c
-index 7388f69..69f75ed 100644
---- a/src/libtracker-fts/tracker-parser-libicu.c
-+++ b/src/libtracker-fts/tracker-parser-libicu.c
-@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser,
- 
- 		/* Open word-break iterator */
- 		parser->bi = ubrk_open(UBRK_WORD,
--		                       setlocale (LC_ALL, NULL),
-+		                       setlocale (LC_CTYPE, NULL),
- 		                       parser->utxt,
- 		                       parser->utxt_size,
- 		                       &error);
---
-cgit v0.9.0.2
diff --git a/testing/tracker/tracker-extract-pdf-crash-fix.patch b/testing/tracker/tracker-extract-pdf-crash-fix.patch
deleted file mode 100644
index ac8522f6a..000000000
--- a/testing/tracker/tracker-extract-pdf-crash-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 008677280d32b6db56483832b143760888c91ad4 Mon Sep 17 00:00:00 2001
-From: Sam Thursfield <sam.thursfield@codethink.co.uk>
-Date: Tue, 31 Jul 2012 14:26:53 +0000
-Subject: tracker-extract-pdf: Fix crash if mmap() fails
-
-Patch from Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=751922
----
-diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c
-index caa24c7..85066b3 100644
---- a/src/tracker-extract/tracker-extract-pdf.c
-+++ b/src/tracker-extract/tracker-extract-pdf.c
-@@ -451,7 +451,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info)
- 		len = 0;
- 	} else {
- 		contents = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
--		if (contents == NULL) {
-+		if (contents == NULL || contents == MAP_FAILED) {
- 			g_warning ("Could not mmap pdf file '%s': %s\n",
- 			           filename,
- 			           g_strerror (errno));
---
-cgit v0.9.0.2
diff --git a/testing/tracker/tracker.install b/testing/tracker/tracker.install
deleted file mode 100644
index 95114273e..000000000
--- a/testing/tracker/tracker.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/transcode/PKGBUILD b/testing/transcode/PKGBUILD
deleted file mode 100644
index 7fb798ef7..000000000
--- a/testing/transcode/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 169649 2012-10-25 01:35:43Z eric $
-# Maintainer:
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: roberto <roberto@archlinux.org>
-
-pkgname=transcode
-_sripver=0.3-4
-pkgver=1.1.7
-pkgrel=6
-pkgdesc="A video/DVD ripper and encoder for the terminal/console"
-arch=('i686' 'x86_64')
-url="http://tcforge.berlios.de/"
-license=('GPL')
-depends=('gawk' 'imagemagick' 'lzo2' 'libdvdread' 'ffmpeg' 'mjpegtools'
-	 'libmpeg2' 'libxaw' 'libxml2' 'libxv' 'a52dec')
-makedepends=('nasm')
-options=('!libtool')
-source=(https://bitbucket.org/france/transcode-tcforge/downloads/${pkgname}-${pkgver}.tar.bz2
-	http://downloads.sourceforge.net/sourceforge/subtitleripper/subtitleripper-${_sripver}.tgz
-        subtitleripper-0.3.4-linkingorder.patch subtitleripper-0.3.4-respect-ldflags.patch
-        ffmpeg-0.11.patch)
-sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
-          'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
-          'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
-          '591943a33235342a66c3df0625a164a1479c09ae'
-          '3d2dcdc23f14938e87d14cfc03000bb3b649b85e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i "${srcdir}/ffmpeg-0.11.patch"
-  ./configure --prefix=/usr \
-    --disable-sse --disable-sse2 --disable-altivec --enable-mmx \
-    --enable-lame --enable-ogg --enable-vorbis --enable-theora \
-    --enable-libdv --enable-libxml2 --enable-v4l \
-    --enable-imagemagick --enable-libjpeg --enable-lzo --enable-mjpegtools \
-    --enable-sdl --enable-freetype2 --enable-a52 --enable-libpostproc \
-    --enable-xvid --enable-x264 --enable-alsa --enable-libmpeg2 --enable-libmpeg2convert
-  make
-
-  cd "${srcdir}/subtitleripper"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-linkingorder.patch"
-  patch -p1 -i "${srcdir}/subtitleripper-0.3.4-respect-ldflags.patch"
-  sed -e 's|^\(.*lppm.*\)$|#\1|' \
-      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
-      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
-      -i Makefile
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/subtitleripper"
-  install -m 755 pgm2txt "${pkgdir}/usr/bin/"
-  install -m 755 srttool "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2pgm "${pkgdir}/usr/bin/"
-  install -m 755 subtitle2vobsub "${pkgdir}/usr/bin/"
-  install -m 755 vobsub2pgm "${pkgdir}/usr/bin/"
-}
diff --git a/testing/transcode/ffmpeg-0.11.patch b/testing/transcode/ffmpeg-0.11.patch
deleted file mode 100644
index b5601fe2f..000000000
--- a/testing/transcode/ffmpeg-0.11.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -Naur transcode-1.1.7/export/export_ffmpeg.c fixed-tc/export/export_ffmpeg.c
---- transcode-1.1.7/export/export_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/export/export_ffmpeg.c	2012-07-05 16:22:41.095346080 -0400
-@@ -180,7 +180,7 @@
- 
- 
- /* START: COPIED FROM ffmpeg-0.5_p22846(ffmpeg.c, cmdutils.c) */
--#include <libavcodec/opt.h>
-+#include <libavutil/opt.h>
- #include <libavutil/avstring.h>
- #include <libswscale/swscale.h>
- 
-@@ -470,7 +470,6 @@
-     }
- 
-     TC_LOCK_LIBAVCODEC;
--    avcodec_init();
-     avcodec_register_all();
-     TC_UNLOCK_LIBAVCODEC;
- 
-@@ -634,7 +633,6 @@
-         lavc_param_rc_max_rate = 2516;
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
- 
-         break;
- 
-@@ -674,7 +673,6 @@
- 
-         lavc_param_rc_buffer_size = 224 * 8;
-         lavc_param_rc_buffer_aggressivity = 99;
--        lavc_param_scan_offset = CODEC_FLAG_SVCD_SCAN_OFFSET;
- 
-         break;
- 
-diff -Naur transcode-1.1.7/export/ffmpeg_cfg.c fixed-tc/export/ffmpeg_cfg.c
---- transcode-1.1.7/export/ffmpeg_cfg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/export/ffmpeg_cfg.c	2012-07-05 15:26:29.112103273 -0400
-@@ -160,9 +160,7 @@
-     {"vcelim", &lavc_param_chroma_elim_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
-     {"vpsize", &lavc_param_packet_size, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 100000000},
-     {"vstrict", &lavc_param_strict, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -99, 99},
--    {"vdpart", &lavc_param_data_partitioning, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
- //    {"keyint", &lavc_param_keyint, TCCONF_TYPE_INT, 0, 0, 0},
--    {"gray", &lavc_param_gray, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_PART},
-     {"mpeg_quant", &lavc_param_mpeg_quant, TCCONF_TYPE_FLAG, 0, 0, 1},
-     {"vi_qfactor", &lavc_param_vi_qfactor, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, -31.0, 31.0},
-     {"vi_qoffset", &lavc_param_vi_qoffset, TCCONF_TYPE_FLOAT, TCCONF_FLAG_RANGE, 0.0, 31.0},
-@@ -211,7 +211,6 @@
- #else
-     {"aic", &lavc_param_aic, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_AC_PRED},
- #endif    
--    {"umv", &lavc_param_umv, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_UMV},
-     {"ibias", &lavc_param_ibias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"pbias", &lavc_param_pbias, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -512, 512},
-     {"coder", &lavc_param_coder, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 10},
-@@ -223,9 +223,6 @@
-     {"nr", &lavc_param_noise_reduction, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 0, 1000000},
-     {"qprd", &lavc_param_qp_rd, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_QP_RD},
-     {"threads", &lavc_param_threads, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, 1, 16},
--    {"ss", &lavc_param_ss, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_H263P_SLICE_STRUCT},
--    {"svcd_sof", &lavc_param_scan_offset, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_SVCD_SCAN_OFFSET},
--    {"alt", &lavc_param_alt, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_ALT_SCAN},
-     {"ilme", &lavc_param_ilme, TCCONF_TYPE_FLAG, 0, 0, CODEC_FLAG_INTERLACED_ME},
-     {"inter_threshold", &lavc_param_inter_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-     {"sc_threshold", &lavc_param_sc_threshold, TCCONF_TYPE_INT, TCCONF_FLAG_RANGE, -1000000, 1000000},
-diff -Naur transcode-1.1.7/filter/filter_pp.c fixed-tc/filter/filter_pp.c
---- transcode-1.1.7/filter/filter_pp.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/filter/filter_pp.c	2012-07-05 15:26:28.945436613 -0400
-@@ -38,8 +38,8 @@
- 
- /* FIXME: these use the filter ID as an index--the ID can grow
-  * arbitrarily large, so this needs to be fixed */
--static pp_mode_t *mode[100];
--static pp_context_t *context[100];
-+static pp_mode *mode[100];
-+static pp_context *context[100];
- static int width[100], height[100];
- static int pre[100];
- 
-diff -Naur transcode-1.1.7/import/decode_lavc.c fixed-tc/import/decode_lavc.c
---- transcode-1.1.7/import/decode_lavc.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/decode_lavc.c	2012-07-05 15:26:28.842103278 -0400
-@@ -181,7 +181,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-   lavc_dec_context->error_resilience  = 2;
- #else
--  lavc_dec_context->error_recognition = 2;
-+  lavc_dec_context->err_recognition = 2;
- #endif
-   lavc_dec_context->error_concealment = 3;
-   lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -Naur transcode-1.1.7/import/import_ffmpeg.c fixed-tc/import/import_ffmpeg.c
---- transcode-1.1.7/import/import_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/import_ffmpeg.c	2012-07-05 15:26:28.848769946 -0400
-@@ -314,7 +314,7 @@
- #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-     lavc_dec_context->error_resilience  = 2;
- #else
--    lavc_dec_context->error_recognition = 2;
-+    lavc_dec_context->err_recognition = 2;
- #endif
-     lavc_dec_context->error_concealment = 3;
-     lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
-diff -Naur transcode-1.1.7/import/probe_ffmpeg.c fixed-tc/import/probe_ffmpeg.c
---- transcode-1.1.7/import/probe_ffmpeg.c	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/import/probe_ffmpeg.c	2012-07-05 15:26:28.838769947 -0400
-@@ -99,8 +99,8 @@
- 
-     TC_INIT_LIBAVCODEC;
- 
--    ret = av_open_input_file(&lavf_dmx_context, ipipe->name,
--                             NULL, 0, NULL);
-+    ret = avformat_open_input(&lavf_dmx_context, ipipe->name,
-+                             NULL, NULL);
-     if (ret != 0) {
-         tc_log_error(__FILE__, "unable to open '%s'"
-                                " (libavformat failure)",
-diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h
---- transcode-1.1.7/libtc/tcavcodec.h	2011-11-19 11:50:27.000000000 -0500
-+++ fixed-tc/libtc/tcavcodec.h	2012-07-05 15:26:28.828769951 -0400
-@@ -53,7 +53,6 @@
- 
- #define TC_INIT_LIBAVCODEC do { \
-     TC_LOCK_LIBAVCODEC; \
--    avcodec_init(); \
-     avcodec_register_all(); \
-     TC_UNLOCK_LIBAVCODEC; \
- } while (0)
---- transcode-1.1.7/export/export_ffmpeg.c.orig	2012-10-19 23:25:16.442303175 -0400
-+++ transcode-1.1.7/export/export_ffmpeg.c	2012-10-19 23:26:23.904268733 -0400
-@@ -1249,7 +1249,7 @@
-       return TC_EXPORT_ERROR;
-     }
- 
--    if (lavc_venc_context->codec->encode == NULL) {
-+    if (lavc_venc_context->codec->encode2 == NULL) {
-       tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
-               "(lavc_venc_context->codec->encode == NULL)");
-       return TC_EXPORT_ERROR;
diff --git a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch b/testing/transcode/subtitleripper-0.3.4-linkingorder.patch
deleted file mode 100644
index 7efe22346..000000000
--- a/testing/transcode/subtitleripper-0.3.4-linkingorder.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) $^ -o $@  
-+	@$(CC) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $(LIBS) -g $^ -o $@  
-+	@$(CC) -g $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:
diff --git a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch
deleted file mode 100644
index 2af11d257..000000000
--- a/testing/transcode/subtitleripper-0.3.4-respect-ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: subtitleripper/Makefile
-===================================================================
---- subtitleripper.orig/Makefile
-+++ subtitleripper/Makefile
-@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
- # Target
- subtitle2pgm: subtitle2pgm.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- subtitle2vobsub: subtitle2vobsub.o vobsub.o 
- 	@echo "Linking $@"
--	@$(CC) $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- srttool: srttool.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
- 	@echo "Linking $@"
--	@$(CC) -g $^ -o $@ $(LIBS)
-+	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
- 
- .PHONY: clean dist rpm
- clean:
diff --git a/testing/transmission/PKGBUILD b/testing/transmission/PKGBUILD
deleted file mode 100644
index 97ad12d75..000000000
--- a/testing/transmission/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 166943 2012-09-22 20:42:02Z tomegun $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=transmission
-pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt')
-pkgver=2.61
-pkgrel=4
-arch=('i686' 'x86_64')
-url="http://www.transmissionbt.com/"
-license=('MIT')
-makedepends=('gtk3' 'intltool' 'curl' 'qt' 'libevent')
-source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz
-        transmissiond transmissiond.conf transmission.systemd
-        transmission.tmpfiles)
-
-build() {
-  cd "$pkgbase-$pkgver"
-
-  ./configure --prefix=/usr
-  make
-  pushd qt
-  qmake qtr.pro
-  make
-}
-package_transmission-cli() {
-  pkgdesc="Fast, easy, and free BitTorrent client (CLI tools, daemon and web client)"
-  depends=('curl' 'libevent')
-  backup=('etc/conf.d/transmissiond')
-  install=transmission-cli.install
-
-  cd "$pkgbase-$pkgver"
-
-  for dir in daemon cli web utils
-  do
-      make -C "$dir" DESTDIR="$pkgdir" install
-  done
-
-  install -D -m755 "$srcdir/transmissiond" "$pkgdir/etc/rc.d/transmissiond"
-  install -D -m644 "$srcdir/transmissiond.conf" "$pkgdir/etc/conf.d/transmissiond"
-  install -D -m644 "$srcdir/transmission.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/transmission.conf"
-  install -D -m644 "$srcdir/transmission.systemd" "$pkgdir/usr/lib/systemd/system/transmission.service"
-  ln -s transmission.service "$pkgdir/usr/lib/systemd/system/transmissiond.service"
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-cli/COPYING"
-}
-
-package_transmission-gtk() {
-  pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)"
-  depends=('curl' 'libevent' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme')
-  optdepends=('notification-daemon: Desktop notification support'
-  	      'transmission-cli: daemon and web support')
-  install=transmission-gtk.install
-
-  cd "$pkgbase-$pkgver"
-
-  make -C gtk DESTDIR="$pkgdir" install
-  make -C po DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-gtk/COPYING"
-}
-
-package_transmission-qt() {
-  pkgdesc="Fast, easy, and free BitTorrent client (Qt GUI)"
-  depends=('curl' 'qt' 'libevent')
-  optdepends=('transmission-cli: daemon and web support')
-  install=transmission-qt.install
-
-  cd "$pkgbase-$pkgver"
-
-  make -C qt INSTALL_ROOT="$pkgdir"/usr install
-
-  install -D -m644 COPYING "$pkgdir/usr/share/licenses/transmission-qt/COPYING"
-  install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png"
-  install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop"
-}
-md5sums=('2ed5b7815ebda65223bac6bdb09dec42'
-         '7d6186ee2a852ae3d44980f05063e194'
-         'db72b02fee139e8ab416324e6c044d76'
-         '5c289c8901221a94be74665368ab5c2c'
-         '23f2320361ad54373c3a4551ef634fe8')
diff --git a/testing/transmission/transmission-cli.install b/testing/transmission/transmission-cli.install
deleted file mode 100644
index 8ab275e61..000000000
--- a/testing/transmission/transmission-cli.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-  cat << _EOF
-
-  If you want to run the Transmission daemon at boot,
-  add transmissiond to the DAEMONS array in /etc/rc.conf.
-_EOF
-
-post_upgrade
-passwd -l transmission &>/dev/null
-}
-
-post_upgrade() {
-       # create user/group that the daemon will run as by default, do not delete this on uninstall, as it will own files
-       getent group transmission >/dev/null || groupadd -g 169 transmission
-       getent passwd transmission >/dev/null || useradd -c 'Transmission BitTorrent Client' -u 169 -g transmission -b '/var/lib' -m -s /bin/false transmission
-       systemd-tmpfiles --create transmission.conf
-}
diff --git a/testing/transmission/transmission-gtk.install b/testing/transmission/transmission-gtk.install
deleted file mode 100644
index c317fbaca..000000000
--- a/testing/transmission/transmission-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/testing/transmission/transmission-qt.install b/testing/transmission/transmission-qt.install
deleted file mode 100644
index e111ef946..000000000
--- a/testing/transmission/transmission-qt.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/transmission/transmission.systemd b/testing/transmission/transmission.systemd
deleted file mode 100644
index 56ab8f794..000000000
--- a/testing/transmission/transmission.systemd
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Transmission Bit Torrent Daemon
-
-# This assumes that a user 'transmission' exists, with a writeable homedirectory,
-# and that /run/transmission exists and is writeable by the transmission user.
-
-[Service]
-User=transmission
-Type=forking
-PIDFile=/run/transmission/transmission.pid
-ExecStart=/usr/bin/transmission-daemon --pid-file /run/transmission/transmission.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/transmission/transmission.tmpfiles b/testing/transmission/transmission.tmpfiles
deleted file mode 100644
index b603066c1..000000000
--- a/testing/transmission/transmission.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/transmission - transmission transmission -
diff --git a/testing/transmission/transmissiond b/testing/transmission/transmissiond
deleted file mode 100644
index ea3d770f9..000000000
--- a/testing/transmission/transmissiond
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/transmissiond
-
-PID=`pidof -o %PPID /usr/bin/transmission-daemon`
-case "$1" in
-  start)
-    stat_busy "Starting Transmission Daemon"
-    [ -z "$PID" ] && su -l -s /bin/sh -c "/usr/bin/transmission-daemon $TRANS_ARGS" "${TRANS_USER:-transmission}"
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon transmissiond
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Transmission Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon transmissiond
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    while [ ! -z "$PID" -a -d "/proc/$PID" ]; do sleep 1; done
-    $0 start
-    ;;
-  reload)
-      stat_busy "Reloading config"
-      [ ! -z "$PID" ] && kill -HUP $PID &> /dev/null
-      if [ $? -gt 0 ]; then
-          stat_fail
-      else
-          stat_done
-      fi
-      ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac
-exit 0
diff --git a/testing/transmission/transmissiond.conf b/testing/transmission/transmissiond.conf
deleted file mode 100644
index 45a9fd51d..000000000
--- a/testing/transmission/transmissiond.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# example configuration file
-
-# TRANS_USER="transmission"
-# TRANS_ARGS=""
diff --git a/testing/twisted/PKGBUILD b/testing/twisted/PKGBUILD
deleted file mode 100644
index 26514d9f3..000000000
--- a/testing/twisted/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 168885 2012-10-16 11:55:48Z allan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor:  Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=twisted
-pkgver=12.2.0
-pkgrel=2
-pkgdesc="Asynchronous networking framework written in Python."
-arch=('i686' 'x86_64')
-url="http://twistedmatrix.com/"
-license=('MIT')
-depends=('python2-crypto' 'python2-zope-interface')
-optdepends=('python2-pyopenssl'
-            'python2-soappy: for twisted.web.soap'
-	    'python2-pyasn1: for using conch'
-	    'pygtk: for using manhole'
-	    'tk: for using tkconch')
-install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-sha1sums=('c51834c1270e7a4bb0de9190056e4317413920f9')
-
-build() {
-    cd "$srcdir/Twisted-$pkgver"
-    python2 setup.py build
-}
-
-package() {
-    cd "$srcdir/Twisted-$pkgver"
-    python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
-    install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
-    sed -i 's:^#!.*bin.*python:#!/usr/bin/python2:' \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py \
-      "$pkgdir"/usr/lib/python2.7/site-packages/twisted/python/test/pullpipe.py
-}
diff --git a/testing/twisted/twisted.install b/testing/twisted/twisted.install
deleted file mode 100644
index 8e93ffd3c..000000000
--- a/testing/twisted/twisted.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-}
diff --git a/testing/udisks/PKGBUILD b/testing/udisks/PKGBUILD
deleted file mode 100644
index f7fbd187d..000000000
--- a/testing/udisks/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 165394 2012-08-17 23:23:28Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=udisks
-pkgver=1.0.4
-pkgrel=5
-pkgdesc="Disk Management Service"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL')
-depends=('udev' 'sg3_utils' 'glib2' 'dbus-glib' 'polkit' 'parted' 'device-mapper' 'libatasmart' 'lsof' 'eject')
-makedepends=('intltool' 'docbook-xsl')
-options=(!libtool)
-source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz udisks.service)
-sha256sums=('854b89368733b9c3a577101b761ad5397ae75a05110c8698ac5b29de9a8bf8f5'
-            '0b9cbf41935feed3e4e2430fd4e06eb29864554dbb9f330c9d2a5fa2ef185131')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/udisks --disable-static
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make profiledir=/usr/share/bash-completion/completions DESTDIR="${pkgdir}" install
-  chmod 644 "${pkgdir}/usr/share/bash-completion/completions/udisks-bash-completion.sh"
-
-  # move udev helpers and rules to /usr/lib
-  mv "${pkgdir}"/lib/udev "${pkgdir}"/usr/lib/
-  rm -r "${pkgdir}"/lib
-
-  install -Dm644 "$srcdir/udisks.service" "$pkgdir/usr/lib/systemd/system/udisks.service"
-  echo "SystemdService=udisks.service" \
-    >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.UDisks.service"
-}
diff --git a/testing/udisks/udisks.service b/testing/udisks/udisks.service
deleted file mode 100644
index 7105e90be..000000000
--- a/testing/udisks/udisks.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=UDisks
-
-[Service]
-Type=dbus
-BusName=org.freedesktop.UDisks
-ExecStart=/usr/lib/udisks/udisks-daemon
-
-[Install]
-WantedBy=graphical.target
diff --git a/testing/udisks2/PKGBUILD b/testing/udisks2/PKGBUILD
deleted file mode 100644
index 176ef15f3..000000000
--- a/testing/udisks2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169452 2012-10-21 11:36:14Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=udisks2
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="Disk Management Service, version 2"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/udisks"
-license=('GPL2')
-depends=('glib2' 'udev' 'polkit' 'libatasmart' 'eject')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
-optdepends=('parted: partition management'
-            'gptfdisk: GUID partition table support')
-options=(!libtool)
-source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2)
-sha256sums=('aa026a5a865688a2e9e430a389c7636c1a556d980539e4bd4a3f31dc5d4fe1eb')
-
-build() {
-  cd "udisks-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --with-systemdsystemunitdir=/usr/lib/systemd/system \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd "udisks-$pkgver"
-  make DESTDIR="$pkgdir" install \
-    bash_completiondir=/usr/share/bash-completion/completions
-}
diff --git a/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
deleted file mode 100644
index 2694334c8..000000000
--- a/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Sun, 2 Sep 2012 04:36:13 +0200
-Subject: [PATCH] Send resume signal when built with systemd and using
- pm-utils suspend
-
-This case was apparently overlooked when adding systemd support.
-
-Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
----
- src/linux/up-backend.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
-index ddd4472..52b430e 100644
---- a/src/linux/up-backend.c
-+++ b/src/linux/up-backend.c
-@@ -603,10 +603,11 @@ gboolean
- up_backend_emits_resuming (UpBackend *backend)
- {
- #ifdef HAVE_SYSTEMD
--	return TRUE;
--#else
--	return FALSE;
-+	if (sd_booted ())
-+		return TRUE;
-+	else
- #endif
-+	return FALSE;
- }
- 
- /**
--- 
-1.7.12
-
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
deleted file mode 100644
index 22697257d..000000000
--- a/testing/upower/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 165871 2012-09-02 02:46:11Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=upower
-pkgver=0.9.18
-pkgrel=2
-pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
-arch=('i686' 'x86_64')
-url="http://upower.freedesktop.org"
-license=('GPL')
-depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
-makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
-options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz
-        0001-Send-resume-signal-when-built-with-systemd-and-using.patch)
-md5sums=('bfaaa1e7f8479fca5594406b3c36dff9'
-         '188afea4919dc324b2efbae35d9d216a')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # put udev files in /usr/lib
-  sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
-
-  # https://bugs.freedesktop.org/show_bug.cgi?id=54371
-  patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch
-
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var \
-    --libexecdir=/usr/lib/$pkgname \
-    --disable-static
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/usbmuxd/85-usbmuxd.rules b/testing/usbmuxd/85-usbmuxd.rules
deleted file mode 100644
index ec9f72501..000000000
--- a/testing/usbmuxd/85-usbmuxd.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
-
-# Forces iDevices to the last USB configuration and runs usbmuxd
-TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
-LABEL="usbmuxd_systemd_end"
-
-# Exit usbmuxd when the last device is removed
-ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/testing/usbmuxd/PKGBUILD b/testing/usbmuxd/PKGBUILD
deleted file mode 100644
index 6385ba910..000000000
--- a/testing/usbmuxd/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 164299 2012-07-29 23:16:20Z tomegun $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=usbmuxd
-pkgver=1.0.8
-pkgrel=1
-pkgdesc="USB Multiplex Daemon"
-url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'GPL3' 'LGPL2.1')
-depends=('libusb' 'libplist')
-makedepends=('cmake')
-install=usbmuxd.install
-source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
-	'usbmuxd.service'
-	'85-usbmuxd.rules')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  echo "${pkgver}" > version.tag
-  mkdir build
-  cd build
-  cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  # fix udev dir being hardcoded
-  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
-  rmdir "${pkgdir}/lib"
-  # install systemd service file
-  install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
-  # use udev rule that works with systemd
-  install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
-}
-md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
-         'dae0660f972510a6483992b5b81e1b5a'
-         'dc4b2893651149eccbf7b2c8467cd288')
diff --git a/testing/usbmuxd/usbmuxd.install b/testing/usbmuxd/usbmuxd.install
deleted file mode 100644
index 1a4859674..000000000
--- a/testing/usbmuxd/usbmuxd.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-    groupadd -g 140 usbmux &>/dev/null
-    useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-    passwd -l usbmux &>/dev/null
-}
-
-post_upgrade() {
-    getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null
-    getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-}
-
-post_remove() {
-    if getent passwd usbmux >/dev/null 2>&1; then
-        userdel usbmux
-    fi
-    if getent group usbmux >/dev/null 2>&1; then
-        groupdel usbmux
-    fi
-}
diff --git a/testing/usbmuxd/usbmuxd.service b/testing/usbmuxd/usbmuxd.service
deleted file mode 100644
index fbebf65b9..000000000
--- a/testing/usbmuxd/usbmuxd.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=iOS USB Muxer
-
-[Service]
-ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux
diff --git a/testing/usbutils/PKGBUILD b/testing/usbutils/PKGBUILD
deleted file mode 100644
index ac171a037..000000000
--- a/testing/usbutils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 163167 2012-07-08 10:08:11Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
-pkgname=usbutils
-pkgver=006
-pkgrel=1
-pkgdesc="USB Device Utilities"
-arch=(i686 x86_64)
-license=('GPL')
-groups=('base')
-depends=('libusb' 'hwids')
-optdepends=('python2: for lsusb.py usage'
-            'coreutils: for lsusb.py usage')
-url="http://linux-usb.sourceforge.net/"
-source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz"
-        fix-python2.patch)
-md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8'
-         '45766196895b4cc50b53cd56e1bbf3d1')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  # patch lsusb.py to use correct usb.ids file and python2 interpreter
-  patch -Np1 -i $srcdir/fix-python2.patch
-  ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
-  # this is now in the hwids package
-  rm -rf $pkgdir/usr/{share/hwdata,sbin}
-}
diff --git a/testing/usbutils/fix-python2.patch b/testing/usbutils/fix-python2.patch
deleted file mode 100644
index 7e2875e99..000000000
--- a/testing/usbutils/fix-python2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- usbutils-002/lsusb.py	2010-12-16 01:07:09.000000000 +0100
-+++ usbutils-002/lsusb.py	2011-04-09 22:43:59.043828595 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # lsusb.py
- # Displays your USB devices in reasonable form.
- # (c) Kurt Garloff <garloff@suse.de>, 2/2009, GPL v2 or v3.
-@@ -16,7 +16,7 @@
- warnsort = False
- 
- prefix = "/sys/bus/usb/devices/"
--usbids = "/usr/share/usb.ids"
-+usbids = "/usr/share/hwdata/usb.ids"
- 
- esc = chr(27)
- norm = esc + "[0;0m"
diff --git a/testing/usermin/PKGBUILD b/testing/usermin/PKGBUILD
deleted file mode 100644
index 6e5eb6289..000000000
--- a/testing/usermin/PKGBUILD
+++ /dev/null
@@ -1,134 +0,0 @@
-# $Id: PKGBUILD 169457 2012-10-21 13:56:26Z tomegun $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=usermin
-pkgver=1.520
-pkgrel=2
-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)
-license=('custom:usermin')
-url="http://www.webmin.com/"
-depends=('perl' 'webmin')
-makedepends=('perl-net-ssleay')
-backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \
-'etc/usermin/at/config' \
-'etc/usermin/man/config' \
-'etc/usermin/ssh/config' \
-'etc/usermin/chfn/config' \
-'etc/usermin/cron/config' \
-'etc/usermin/file/config' \
-'etc/usermin/plan/config' \
-'etc/usermin/proc/config' \
-'etc/usermin/spam/config' \
-'etc/usermin/htaccess/config' \
-'etc/usermin/cshrc/config' \
-'etc/usermin/gnupg/config' \
-'etc/usermin/mysql/config' \
-'etc/usermin/quota/config' \
-'etc/usermin/shell/config' \
-'etc/usermin/theme/config' \
-'etc/usermin/mailbox/config' \
-'etc/usermin/schedule/config' \
-'etc/usermin/config' \
-'etc/usermin/commands/config' \
-'etc/usermin/htaccess-htpasswd/config' \
-'etc/usermin/forward/config' \
-'etc/usermin/telnet/config' \
-'etc/usermin/tunnel/config' \
-'etc/usermin/updown/config' \
-'etc/usermin/procmail/config' \
-'etc/usermin/fetchmail/config' \
-'etc/usermin/changepass/config' \
-'etc/usermin/language/config' \
-'etc/usermin/postgresql/config' \
-'etc/usermin/usermount/config' \
-)
-install=usermin.install
-source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz 
-	usermin.rc 
-	usermin.service
-	ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) 
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-    
-  # remove modules we do not support
-
-  #remove config files from other distros
-  rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*')
-  
-  # remove caldera theme
-  rm -rf caldera
-
-  # remove init-scripts from other distros
-  rm usermin-init
-  rm usermin-daemon
-
-  # setting perl path
-  (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl -
-  
-  # create dirs
-  mkdir -p $startdir/pkg/opt/usermin
-  mkdir -p $startdir/pkg/var/log/usermin
-  mkdir -p $startdir/pkg/etc/usermin
-  
-  # install pam stuff
-  install -D -m 644 usermin-pam $startdir/pkg/etc/pam.d/usermin
-  
-  # remove other distros and add only Archlinux don't change next line else it will not work!
-  rm os_list.txt
-  echo 'Archlinux			Any version	generic-linux	*	-d "/etc/pacman.d"' >> os_list.txt
-  
-  # copy stuff to right dirs
-  cd $startdir/src/$pkgname-$pkgver
-  cp -rp * $startdir/pkg/opt/usermin
-  cd $startdir/src/usermin-config
-  cp -rfp * $startdir/pkg/opt/usermin
-
-  # define parameters for setup.sh
-  config_dir=$startdir/pkg/etc/usermin
-  var_dir=$startdir/pkg/var/log/usermin
-  perl=/usr/bin/perl
-  autoos=1
-  port=20000
-  login=root
-  crypt="XXX"
-  ssl=1
-  atboot=0
-  nostart=1
-  nochown=1
-  autothird=1
-  nouninstall=1
-  noperlpath=1
-  atbootyn=n
-  tempdir=$startdir/pkg/tmp
-  export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt
-  
-  # Fix setup.sh
-  sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' $startdir/pkg/opt/usermin/setup.sh
-  $startdir/pkg/opt/usermin/setup.sh
-  
-  # Fixup the config files to use their real locations
-  sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' $startdir/pkg/etc/usermin/miniserv.conf
-  find $startdir/pkg/etc/usermin -type f -exec sed -i "s:$startdir/pkg::g" {} \; 
-  
-  # make it only accessible by localhost
-  echo 'allow=127.0.0.1' >> $startdir/pkg/etc/usermin/miniserv.conf
-  
-  # enable user and password login
-  sed -i -e '/localauth/d' $startdir/pkg/etc/usermin/miniserv.conf
-
-  #install systemd service file
-  install -D -m 644 $startdir/src/usermin.service $startdir/pkg/usr/lib/systemd/system/usermin.service
- 
- #install rc file
-  install -D -m 755 $startdir/src/usermin.rc $startdir/pkg/etc/rc.d/usermin
-
-  # delete temp dir
-  rm -r $startdir/pkg/tmp
-  #install license
-  install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE
-}
-md5sums=('5819ba87796d9373a92116e90d1a35d4'
-         'cfef4490cd1ef9517c0b39a7bd75c968'
-         'a5bd5e5ee779f8a3cf3d776ca77ee36e'
-         'ec37a79f948f778224550930d2a7ca07')
diff --git a/testing/usermin/usermin-config.tar.bz2 b/testing/usermin/usermin-config.tar.bz2
deleted file mode 100644
index 056bb6298..000000000
--- a/testing/usermin/usermin-config.tar.bz2
+++ /dev/null
diff --git a/testing/usermin/usermin.install b/testing/usermin/usermin.install
deleted file mode 100644
index 3ace10ea2..000000000
--- a/testing/usermin/usermin.install
+++ /dev/null
@@ -1,34 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :)
-  crypt=${crypt//\\/\\\\}
-  crypt=${crypt//\//\\\/}
-  sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users
-cat << EOF
-Note:
-==> It is not allowed to install 3rd party modules, or delete existing modules.
-==> Please write your own PKGBUILDS for 3rd party modules and additional themes.
-Setup:
-==> To make usermin start at boot time, add usermin to rc.conf daemons
-==> Point your web browser to http://localhost:20000 to use usermin.
-==> To change the modules setup please use webmin.
-
-==> The access is restricted to localhost, if you want to connect from other locations
-==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 <your-ip>
-==> If you want to have ssl encryption please install 'perl-net-ssleay' additional.
-EOF
-# fix man module
-  cd /opt/usermin/man
-  gzip -df $(find . -name '*.gz')
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  # uninstall unzipped files
-  rm -r /opt/usermin/man
-}
diff --git a/testing/usermin/usermin.rc b/testing/usermin/usermin.rc
deleted file mode 100644
index af365780a..000000000
--- a/testing/usermin/usermin.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-start=/etc/usermin/start
-stop=/etc/usermin/stop
-lockfile=/var/lock/usermin
-
-case "$1" in
-'start')
-     stat_busy "Starting Usermin daemon"
-     $start >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     touch $lockfile >/dev/null 2>&1
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'stop')
-     stat_busy "Stopping Usermin daemon"
-     $stop >/dev/null 2>&1 </dev/null
-     RETVAL=$?
-     if [ "$RETVAL" = "0" ]; then
-     rm -f $lockfile
-     stat_done
-     else
-     stat_fail
-fi
-;;
-
-'restart')
-     $stop && $start
-     RETVAL=$?
-;;
-*)
-echo "Usage: $0 { start | stop | restart }"
-RETVAL=1
-;;
-esac
-exit $RETVAL
\ No newline at end of file
diff --git a/testing/usermin/usermin.service b/testing/usermin/usermin.service
deleted file mode 100644
index e91164c63..000000000
--- a/testing/usermin/usermin.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Usermin
-
-[Service]
-Type=forking
-ExecStart=/opt/usermin/miniserv.pl /etc/usermin/miniserv.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD
deleted file mode 100644
index 2ff907d39..000000000
--- a/testing/util-linux/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 168617 2012-10-13 12:08:22Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=util-linux
-pkgver=2.22.1
-pkgrel=1
-pkgdesc="Miscellaneous system utilities for Linux"
-url="http://www.kernel.org/pub/linux/utils/util-linux/"
-arch=('i686' 'x86_64')
-groups=('base')
-depends=('pam' 'shadow')
-makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1
-conflicts=('util-linux-ng' 'eject')
-provides=("util-linux-ng=${pkgver}" 'eject')
-license=('GPL2')
-options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz
-        uuidd.tmpfiles
-        pam-login
-        pam-common
-        pam-su)
-backup=(etc/pam.d/chfn
-        etc/pam.d/chsh
-        etc/pam.d/login
-        etc/pam.d/su
-        etc/pam.d/su-l)
-install=util-linux.install
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --libdir=/usr/lib \
-              --localstatedir=/run \
-              --enable-fs-paths-extra=/usr/bin:/usr/sbin \
-              --enable-raw \
-              --enable-vipw \
-              --enable-newgrp \
-              --enable-chfn-chsh \
-              --enable-write \
-              --enable-mesg \
-              --enable-socket-activation
-
-#              --enable-reset \ # part of ncurses
-#              --enable-line \ # not part of any package
-#              --enable-last \ # not compat
-
-  make
-}
-
-#check() {
-# fails for some reason in chroot, works outside
-#  make -C "$pkgname-$pkgver" check
-#}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  cd "${pkgdir}"
-
-  # setuid chfn and chsh
-  chmod 4755 "$pkgdir"/usr/bin/{newgrp,ch{sh,fn}}
-
-  # install PAM files for login-utils
-  install -Dm644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chfn"
-  install -m644 "$srcdir/pam-common" "$pkgdir/etc/pam.d/chsh"
-  install -m644 "$srcdir/pam-login" "$pkgdir/etc/pam.d/login"
-  install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su"
-  install -m644 "$srcdir/pam-su" "${pkgdir}/etc/pam.d/su-l"
-
-  # include tmpfiles fragment for uuidd
-  # TODO(dreisner): offer this upstream?
-  install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
-}
-md5sums=('730cf9932531ed09b53a04ca30fcb4c9'
-         'a39554bfd65cccfd8254bb46922f4a67'
-         '4368b3f98abd8a32662e094c54e7f9b1'
-         'a31374fef2cba0ca34dfc7078e2969e4'
-         'fa85e5cce5d723275b14365ba71a8aad')
diff --git a/testing/util-linux/hwclock-systz.patch b/testing/util-linux/hwclock-systz.patch
deleted file mode 100644
index 79ed1a5f3..000000000
--- a/testing/util-linux/hwclock-systz.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 46a8834c2eb9b0c37d92e30d1a262e41306cf36f Mon Sep 17 00:00:00 2001
-From: Tom Gundersen <teg@jklm.no>
-Date: Wed, 19 Sep 2012 18:10:34 +0200
-Subject: [PATCH 1/2] hwclock: don't warp the systemtime if it is in UTC
-
-A sideeffect of 839be2ba6b44fa9dc927f081d547ebadec9de19c is that we now
-warp the systemtime according to the timezone, on the first call of
---systz. This is not always the correct thing to do, and causes a
-regression for us in Arch Linux.
-
-This is the correct thing to do if the RTC, and hence the systemtime is
-set in localtime. However, if the systemtime is already in UTC we don't
-want to touch it when we set the kernel timezone (which we still need to
-do as e.g. FAT stores timestamps in localtime).
-
-An almost identical issue was also fixed in systemd commit
-72edcff5db936e54cfc322d9392ec46e2428fd9b.
-
-Fixes:
-Signed-off-by: Tom Gundersen <teg@jklm.no>
----
- sys-utils/hwclock.8 | 11 +++++++----
- sys-utils/hwclock.c | 17 +++++++++++++++--
- 2 files changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/sys-utils/hwclock.8 b/sys-utils/hwclock.8
-index 07d9fc0..5c599ad 100644
---- a/sys-utils/hwclock.8
-+++ b/sys-utils/hwclock.8
-@@ -58,10 +58,12 @@ This is a good option to use in one of the system startup scripts.
- Set the Hardware Clock to the current System Time.
- .TP
- .B \-\-systz
--Reset the System Time based on the current timezone.
-+Set the kernel's timezone and reset the System Time based on the current timezone.
- 
--Also set the kernel's timezone value to the local timezone
--as indicated by the TZ environment variable and/or
-+The system time is only reset on the first call after boot.
-+
-+The local timezone is taken to be what is
-+indicated by the TZ environment variable and/or
- .IR /usr/share/zoneinfo ,
- as
- .BR tzset (3)
-@@ -74,7 +76,8 @@ This is an alternate option to
- .B \-\-hctosys
- that does not read the hardware clock, and may be used in system startup
- scripts for recent 2.6 kernels where you know the System Time contains
--the Hardware Clock time.
-+the Hardware Clock time. If the Hardware Clock is already in UTC, it is
-+not reset.
- .TP
- .B \-\-adjust
- Add or subtract time from the Hardware Clock to account for systematic
-diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
-index 5a4c87e..351ce1f 100644
---- a/sys-utils/hwclock.c
-+++ b/sys-utils/hwclock.c
-@@ -772,7 +772,6 @@ static int set_system_clock_timezone(const bool universal, const bool testing)
- 	struct timeval tv;
- 	struct tm *broken;
- 	int minuteswest;
--	int rc;
- 
- 	gettimeofday(&tv, NULL);
- 	if (debug) {
-@@ -818,10 +817,24 @@ static int set_system_clock_timezone(const bool universal, const bool testing)
- 		       ("Not setting system clock because running in test mode.\n"));
- 		retcode = 0;
- 	} else {
-+		const struct timezone tz_utc = { 0, 0 };
- 		const struct timezone tz = { minuteswest, 0 };
- 		const struct timeval *tv_null = NULL;
-+		int rc = 0;
-+
-+		/* The first call to settimeofday after boot will assume the systemtime
-+		 * is in localtime, and adjust it according to the given timezone to
-+		 * compensate. If the systemtime is in fact in UTC, then this is wrong
-+		 * so we first do a dummy call to make sure the time is not shifted.
-+		 */
-+		if (universal)
-+			rc = settimeofday(tv_null, &tz_utc);
-+
-+		/* Now we set the real timezone. Due to the above dummy call, this will
-+		 * only warp the systemtime if the RTC is not in UTC. */
-+		if (!rc)
-+			rc = settimeofday(tv_null, &tz);
- 
--		rc = settimeofday(tv_null, &tz);
- 		if (rc) {
- 			if (errno == EPERM) {
- 				warnx(_
--- 
-1.7.12.1
-
diff --git a/testing/util-linux/pam-common b/testing/util-linux/pam-common
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/testing/util-linux/pam-common
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth		sufficient	pam_rootok.so
-auth		required	pam_unix.so
-account		required	pam_unix.so
-session		required	pam_unix.so
-password	required	pam_permit.so
diff --git a/testing/util-linux/pam-login b/testing/util-linux/pam-login
deleted file mode 100644
index 1960d9497..000000000
--- a/testing/util-linux/pam-login
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-
-auth       required     pam_securetty.so
-auth       requisite    pam_nologin.so
-auth       include      system-local-login
-account    include      system-local-login
-session    include      system-local-login
diff --git a/testing/util-linux/pam-su b/testing/util-linux/pam-su
deleted file mode 100644
index cf15f40f1..000000000
--- a/testing/util-linux/pam-su
+++ /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/util-linux/su.1 b/testing/util-linux/su.1
deleted file mode 100644
index 59e17314d..000000000
--- a/testing/util-linux/su.1
+++ /dev/null
@@ -1,230 +0,0 @@
-.TH SU "1" "June 2012" "util-linux" "User Commands"
-.SH NAME
-su \- run a command with substitute user and group ID
-.SH SYNOPSIS
-.B su
-[options...] [\-] [user [args...]]
-.SH DESCRIPTION
-.B su
-allows to run commands with substitute user and group ID.
-.PP
-When called without arguments
-.B su
-defaults to running an interactive shell as
-.IR root .
-.PP
-For backward compatibility
-.B su
-defaults to not change the current directory and to only set the
-environment variables
-.B HOME
-and
-.B SHELL
-(plus
-.B USER
-and
-.B LOGNAME
-if the target
-.I user
-is not root).  It is recommended to always use the
-.B \-\-login
-option (instead it's shortcut
-.BR \- )
-to avoid side effects caused by mixing environments.
-.PP
-This version of
-.B su
-uses PAM for authentication, account and session management.  Some
-configuration options found in other
-.B su
-implementations such as e.g. support of a wheel group have to be
-configured via PAM.
-.SH OPTIONS
-.TP
-\fB\-c\fR \fIcommand\fR, \fB\-\-command\fR=\fIcommand\fR
-Pass
-.I command
-to the shell with the
-.B \-c
-option.
-.TP
-\fB\-\-session\-command\fR=\fIcommand\fR
-Same as
-.B \-c
-but do not create a new session (discouraged).
-.TP
-\fB\-f\fR, \fB\-\-fast\fR
-Pass
-.B \-f
-to the shell which may or may not be useful depending on the
-shell.
-.TP
-\fB\-g\fR, \fB\-\-group\fR=\fIgroup\fR\fR
-specify the primary group, this option is allowed for root user only
-.TP
-\fB\-G\fR, \fB\-\-supp-group\fR=\fIgroup\fR\fR
-specify a supplemental group, this option is allowed for root user only
-.TP
-\fB\-\fR, \fB\-l\fR, \fB\-\-login\fR
-Starts the shell as login shell with an environment similar to a real
-login:
-.RS 10
-.TP
-o
-clears all environment variables except for
-.B TERM
-.TP
-o
-initializes the environment variables
-.BR HOME ,
-.BR SHELL ,
-.BR USER ,
-.BR LOGNAME ,
-.B PATH
-.TP
-o
-changes to the target user's home directory
-.TP
-o
-sets argv[0] of the shell to
-.RB ' \- '
-in order to make the shell a login shell
-.RE
-.TP
-\fB\-m\fR, \fB\-p\fR, \fB\-\-preserve-environment\fR
-Preserves the whole environment, ie does not set
-.BR HOME ,
-.BR SHELL ,
-.B USER
-nor
-.BR LOGNAME .
-.TP
-\fB\-s\fR \fISHELL\fR, \fB\-\-shell\fR=\fISHELL\fR
-Runs the specified shell instead of the default.  The shell to run is
-selected according to the following rules in order:
-.RS 10
-.TP
-o
-the shell specified with
-.B \-\-shell
-.TP
-o
-The shell specified in the environment variable
-.B SHELL
-if the
-.B \-\-preserve-environment
-option is used.
-.TP
-o
-the shell listed in the passwd entry of the target user
-.TP
-o
-/bin/sh
-.RE
-.IP
-If the target user has a restricted shell (i.e. not listed in
-/etc/shells) the
-.B \-\-shell
-option and the
-.B SHELL
-environment variables are ignored unless the calling user is root.
-.TP
-\fB\-\-help\fR
-Display help text and exit.
-.TP
-\fB\-\-version\fR
-Display version information and exit.
-.SH CONFIG FILES
-.B su
-reads the
-.I /etc/default/su
-and
-.I /etc/login.defs
-configuration files.  The following configuration items are relevant
-for
-.BR su (1):
-.PP
-.B FAIL_DELAY
-(number)
-.RS 4
-Delay in seconds in case of authentication failure.  Number must be
-a non-negative integer.
-.RE
-.PP
-.B ENV_PATH
-(string)
-.RS 4
-Defines the PATH environment variable for a regular user.  The
-default value is
-.IR /usr/local/bin:\:/bin:\:/usr/bin .
-.RE
-.PP
-.B ENV_ROOTPATH
-(string)
-.br
-.B ENV_SUPATH
-(string)
-.RS 4
-Defines the PATH environment variable for root. The default value is
-.IR /usr/local/sbin:\:/usr/local/bin:\:/sbin:\:/bin:\:/usr/sbin:\:/usr/bin .
-.RE
-.PP
-.B ALWAYS_SET_PATH
-(boolean)
-.RS 4
-If set to
-.I yes
-and \-\-login and \-\-preserve\-environment were not specified
-.B su
-initializes
-.BR PATH .
-.RE
-.SH EXIT STATUS
-.B su
-normally returns the exit status of the command it executed.  If the
-command was killed by a signal,
-.B su
-returns the number of the signal plus 128.
-.PP
-Exit status generated by
-.B su
-itself:
-.RS 10
-.TP
-1
-Generic error before executing the requested command
-.TP
-126
-The requested command could not be executed
-.TP
-127
-The requested command could was not found
-.RE
-.SH FILES
-.PD 0
-.TP 17
-/etc/pam.d/su
-default PAM configuration file
-.TP
-/etc/pam.d/su-l
-PAM configuration file if \-\-login is specified
-.TP
-/etc/default/su
-command specific logindef config file
-.TP
-/etc/login.defs
-global logindef config file
-.PD 1
-.SH "SEE ALSO"
-.BR pam (8),
-.BR shells (5),
-.BR login.defs (5)
-.SH AUTHOR
-Derived from coreutils' su which was based on an implementation from
-David MacKenzie.
-.SH AVAILABILITY
-The su command is part of the util-linux package and is
-available from
-.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/
-Linux Kernel Archive
-.UE .
diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install
deleted file mode 100644
index 969a4aecf..000000000
--- a/testing/util-linux/util-linux.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install() {
-  # we don't want use systemd-tmpfiles here because
-  # the package dependency would create a circular dep.
-  if [ ! -d run/uuidd ]; then
-    install -o uuidd -g uuidd -dm755 run/uuidd
-  fi
-}
-
-post_upgrade() {
-  if [ "$(vercmp $2 2.21.2-4)" -lt 0 ]; then
-    if [ -f /var/lib/hwclock/adjtime ]; then
-      mv /var/lib/hwclock/adjtime /etc/adjtime
-    fi
-    if [ -d /var/lib/hwclock ]; then
-      rmdir /var/lib/hwclock
-    fi
-  fi
-
-  post_install
-}
diff --git a/testing/util-linux/uuidd.tmpfiles b/testing/util-linux/uuidd.tmpfiles
deleted file mode 100644
index b059cfe65..000000000
--- a/testing/util-linux/uuidd.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/uuidd 0755 uuidd uuidd
diff --git a/testing/vala/PKGBUILD b/testing/vala/PKGBUILD
deleted file mode 100644
index d31f8101b..000000000
--- a/testing/vala/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 169146 2012-10-18 19:22:19Z jgc $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-
-pkgname=vala
-pkgver=0.18.0
-pkgrel=1
-pkgdesc="Compiler for the GObject type system"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Vala"
-license=('LGPL')
-depends=('glib2')
-makedepends=('libxslt')
-options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('18cb2220ce7352a9dd71be058530f7d4a6c8215a1d9c471430af60a04496a60b')
-
-build() {
-    cd $pkgname-$pkgver
-    ./configure --prefix=/usr --enable-vapigen
-    make
-}
-
-package() {
-    cd $pkgname-$pkgver
-    make DESTDIR="$pkgdir" install
-}
diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD
deleted file mode 100644
index c2da0713a..000000000
--- a/testing/valgrind/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 162945 2012-07-04 01:13:31Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=valgrind
-pkgver=3.7.0
-pkgrel=3
-pkgdesc="A tool to help find memory-management problems in programs"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://valgrind.org/"
-depends=('glibc>=2.16' 'glibc<2.17' 'perl')
-makedepends=('gdb')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.7.0-glibc-2.16.patch)
-md5sums=('a855fda56edf05614f099dca316d1775'
-         '8362c9c10b8d7d08d1be628a717cfba7')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.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/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch b/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch
deleted file mode 100644
index 4d28ff11a..000000000
--- a/testing/valgrind/valgrind-3.7.0-glibc-2.16.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
---- valgrind-3.7.0-orig/configure	2011-11-05 21:24:39.000000000 +1000
-+++ valgrind-3.7.0/configure	2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,28 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.15)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
-+$as_echo "2.15 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_15 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+
-+     2.16)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.16 family" >&5
-+$as_echo "2.16 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_16 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-+
-      darwin)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-@@ -6422,7 +6433,7 @@
-      *)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
--	as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
-+	as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
- 	as_fn_error "or Darwin libc" "$LINENO" 5
- 	;;
- esac
diff --git a/testing/vde2/PKGBUILD b/testing/vde2/PKGBUILD
deleted file mode 100644
index 1f706ffa1..000000000
--- a/testing/vde2/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 168886 2012-10-16 11:55:53Z allan $
-# Contributor: Sergej Pupykin
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=vde2
-pkgver=2.3.2
-pkgrel=2
-pkgdesc="Virtual Distributed Ethernet for emulators like qemu"
-url="http://sourceforge.net/projects/vde/"
-license=("GPL" "LGPL" "CUSTOM")
-arch=('i686' 'x86_64')
-depends=('bash' 'libpcap' 'openssl')
-makedepends=('python')
-backup=(etc/conf.d/vde)
-source=(http://downloads.sourceforge.net/vde/$pkgname-$pkgver.tar.bz2
-        dhcpd.conf.sample
-        iptables.rules.sample
-        vde-config.sample
-        vde-connection.sample
-        vde.conf
-        vde.rc)
-install=vde2.install
-options=(!libtool !makeflags)
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/vde2 \
-             --enable-experimental
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver 
-  make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc libexecdir=$pkgdir/usr/lib/vde2 install
-  install -D -m 755 ../vde.rc $pkgdir/etc/rc.d/vde
-  install -D -m 644 ../vde.conf $pkgdir/etc/conf.d/vde
-  install -D -m 644 ../vde-config.sample $pkgdir/etc/vde/vde-config.sample
-  install -D -m 644 ../vde-connection.sample $pkgdir/etc/vde/vde-connection.sample
-  install -D -m 644 ../dhcpd.conf.sample $pkgdir/usr/share/vde2/dhcpd.conf.sample
-  install -D -m 644 ../iptables.rules.sample $pkgdir/usr/share/vde2/iptables.rules.sample
-  # install slirp license
-  install -D -m 644 COPYING.slirpvde $pkgdir/usr/share/licenses/vde2/COPYING.slirpvde
-}
-
-md5sums=('46fbc5f97f03dc517aa3b2c9d9ea6628'
-         '7d9bc56d2e561d849e915000d1c0f269'
-         'a920123fc620bcedbccb703a8d1bdc55'
-         'cb8ace28e8efd4dad128be4be71b3b07'
-         '63033c33565e2030541c5e05e9d9b063'
-         'a22730f051f4840da4a3162a88ff8156'
-         '6c7dc01bc2f039f0ff1682ee70d3d1da')
diff --git a/testing/vde2/dhcpd.conf.sample b/testing/vde2/dhcpd.conf.sample
deleted file mode 100644
index 565a78b27..000000000
--- a/testing/vde2/dhcpd.conf.sample
+++ /dev/null
@@ -1,12 +0,0 @@
-ddns-update-style none;
-
-subnet 192.168.254.0 netmask 255.255.255.0 {
-    range 192.168.254.1 192.168.254.253;
-    option routers 192.168.254.254;
-    option domain-name "virtual.example.com";
-    # find your DNS servers from /etc/resolv.conf
-    # otherwise only pure IP addresses will work
-    option domain-name-servers 192.168.254.254;
-    option broadcast-address 192.168.254.255;
-    default-lease-time 86400;
-}
diff --git a/testing/vde2/iptables.rules.sample b/testing/vde2/iptables.rules.sample
deleted file mode 100644
index ac712ee21..000000000
--- a/testing/vde2/iptables.rules.sample
+++ /dev/null
@@ -1,5 +0,0 @@
-*filter
--A INPUT -i tun -j ACCEPT
--A FORWARD -s 192.168.254.0/255.255.255.0 -j ACCEPT
-*nat
--A POSTROUTING -s 192.168.254.0/24 -j MASQUERADE
diff --git a/testing/vde2/vde-config.sample b/testing/vde2/vde-config.sample
deleted file mode 100644
index c5a5b7d88..000000000
--- a/testing/vde2/vde-config.sample
+++ /dev/null
@@ -1,35 +0,0 @@
-# Set options vde_switch program
-# To activate this vde profile add it to /etc/conf.d/vde
-
-# Global options
-VDE_NUMPORTS="32"  # Number of ports (default 32)
-VDE_HUB="no"       # [yes|no] Make the switch act as a hub
-VDE_FSTP="no"      # [yes|no] Activate the fast spanning tree protocol
-VDE_MAC=""         # Set the Switch MAC address
-VDE_PRIOTIRY=""    # Set the priority for FST (MAC extension)
-VDE_HASHSIZE=""    # Hash table size
-
-# Options from datasock module
-VDE_SOCK="/var/run/vde/sample.sock"  # control directory pathname
-VDE_SOCK_MODE="660"                  # Standard access mode for comm sockets (octal)
-VDE_SOCK_GROUP="root"                # Group owner for comm sockets
-
-# Options from consmgmt module
-VDE_MANAGEMENT_SOCK="/var/run/vde/sample.mgmt"  # path of the management UNIX socket
-VDE_MANAGEMENT_SOCK_MODE="660"                  # management UNIX socket access mode (octal)
-
-# Other options to parse to vde_switch
-VDE_OPTIONS=""
-
-# VDE with internet support
-# You can use either tuntap method or slirpvde method.
-
-# Options from tuntap module
-VDE_TAP=""  # Enable routing through TAP tap interface (comma separated array eg.:"tap0,tap1").
-
-# slirpvde daemon support
-SLIRP="no"         # [yes|no] enable/disable SLIRP daemon support
-SLIRP_DHCP="no"    # [yes|no] turn on the DHCP server for the network autoconfiguration of all the units connected to the VDE
-SLIRP_NETWORK="" # specify the network address (default 10.0.2.0)
-# other options to parse to slirpvde
-SLIRP_OPTIONS=""
\ No newline at end of file
diff --git a/testing/vde2/vde-connection.sample b/testing/vde2/vde-connection.sample
deleted file mode 100644
index 4a75e1f52..000000000
--- a/testing/vde2/vde-connection.sample
+++ /dev/null
@@ -1,6 +0,0 @@
-# You can add vde switch connections below
-# just without the # at the beginning:
-# vde_plug /var/run/vde/sample.sock = vde_plug /var/run/vde/sample2.sock
-# or if hosts are different use this syntax:
-# vde_plug /var/run/vde/sample.sock = ssh host2 vde_plug /var/run/vde/sample.sock
-
diff --git a/testing/vde2/vde.conf b/testing/vde2/vde.conf
deleted file mode 100644
index bc61dceda..000000000
--- a/testing/vde2/vde.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set options for a vde daemon script
-#
-# Array for your vde config files, eg.: "internal-net external-net"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-config.sample
-VDE_CONFIG="" 
-
-# Array for your dpipe connections, eg.: "connect-switches"
-# You need a config file in /etc/vde/ with the same name.
-# Sample config file provided: /etc/vde/vde-connection.sample
-VDE_CONNECTION=""
\ No newline at end of file
diff --git a/testing/vde2/vde.rc b/testing/vde2/vde.rc
deleted file mode 100755
index b368f9955..000000000
--- a/testing/vde2/vde.rc
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/vde
-
-case "$1" in
-  start)
-    # bring up all defined profiles
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      stat_busy "Starting vde_switch $i"
-      # get options from profile
-      [ -n "$VDE_NUMPORTS" ] && OPTIONS="-n $VDE_NUMPORTS"
-      [ "$VDE_HUB" = "yes" ] && OPTIONS="$OPTIONS -x"
-      [ "$VDE_FSTP" = "yes" ] && OPTIONS="$OPTIONS -F"
-      [ -n "$VDE_MAC" ] && OPTIONS="$OPTIONS --macaddr $VDE_MAC"
-      [ -n "$VDE_PRIORITY" ] && OPTIONS="$OPTIONS --priority $VDE_PRIORITY"
-      [ -n "$VDE_HASH" ] && OPTIONS="$OPTIONS --hashsize $VDE_HASH"
-      [ -n "$VDE_SOCK" ] && OPTIONS="$OPTIONS -s $VDE_SOCK"
-      [ -n "$VDE_SOCK_MODE" ] && OPTIONS="$OPTIONS -m $VDE_SOCK_MODE"
-      [ -n "$VDE_SOCK_GROUP" ] && OPTIONS="$OPTIONS -g $VDE_SOCK_GROUP"
-      [ -n "$VDE_MANAGEMENT_SOCK" ] && OPTIONS="$OPTIONS -M $VDE_MANAGEMENT_SOCK"
-      [ -n "$VDE_MANAGEMENT_SOCK_MODE" ] && OPTIONS="$OPTIONS --mgmtmode $VDE_MANAGEMENT_SOCK_MODE"
-      [ -n "$VDE_TAP" ] && OPTIONS="$OPTIONS -t $VDE_TAP"
-      [ -n "$VDE_OPTIONS" ] && OPTIONS="$OPTIONS $VDE_OPTIONS"
-      vde_switch $OPTIONS -p /var/run/vde-$i.pid -daemon &>/dev/null
-      [ -n "$VDE_SOCK" -a -n "$VDE_SOCK_GROUP" ] && chgrp "$VDE_SOCK_GROUP" "$VDE_SOCK"
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Starting slirpvde for $i"
-        [ "$SLIRP_DHCP" = "yes" ] && SP_OPTIONS="-D"
-        [ -n "$SLIRP_NETWORK" ] && SP_OPTIONS="$SP_OPTIONS -n $SLIRP_NETWORK"
-        [ -n "$SLIRP_OPTIONS" ] && SP_OPTIONS="$SP_OPTIONS $SLIRP_OPTIONS"
-        [ -n "$VDE_SOCK" ] && SP_OPTIONS="$SP_OPTIONS -s $VDE_SOCK"
-        [ -n "$VDE_SOCK_MODE" ] && SP_OPTIONS="$SP_OPTIONS -m $VDE_SOCK_MODE"
-        [ -n "$VDE_SOCK_GROUP" ] && SP_OPTIONS="$SP_OPTIONS -g $VDE_SOCK_GROUP"
-        slirpvde $SP_OPTIONS -p /var/run/slirpvde-$i.pid -daemon &>/dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        unset OPTIONS
-        unset SP_OPTIONS
-      fi
-    done
-    for i in $VDE_CONNECTION; do
-      # connect specified vde_switches
-      if [ "$(grep ^vde_plug /etc/vde/$i)" ]; then
-        stat_busy "Connecting VDE switches $i together..."
-        while read j; do
-          switch="$(echo $j | grep ^vde_plug)"
-          [ -n "$switch" ] && (dpipe $switch &)
-        done </etc/vde/$i
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      fi
-    done
-    add_daemon vde
-    ;;
-  stop)
-    # kill vde_plug if switches are connected
-    [ -n "$VDE_CONNECTION" ] && killall vde_plug >/dev/null 2>&1
-    for i in $VDE_CONFIG; do
-      [ -e /etc/vde/$i ] && . /etc/vde/$i
-      if [ "$SLIRP" = "yes" ]; then
-        stat_busy "Stopping slirpvde for $i"
-        kill $(cat /var/run/slirpvde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-        rm /var/run/slirpvde-$i.pid &> /dev/null
-      fi
-      stat_busy "Stopping vde_switch $i"
-      kill $(cat /var/run/vde-$i.pid) &> /dev/null
-        if [ $? -gt 0 ]; then
-          stat_fail
-        else
-          stat_done
-        fi
-      rm /var/run/vde-$i.pid &> /dev/null
-      stat_busy "Removing $i vde sockets"
-      rm -rf $VDE_SOCK $VDE_MANAGEMENT_SOCK
-      if [ $? -gt 0 ]; then
-        stat_fail
-      else
-        stat_done
-      fi
-    done
-      unset OPTIONS
-      unset SP_OPTIONS
-      [ -e /var/run/vde/gmon.out ] && rm /var/run/vde/gmon.out
-      rm_daemon vde 
-    ;;
-  restart)
-    $0 stop
-    sleep 3
-    $0 start
-    ;;
-    *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/vde2/vde2.install b/testing/vde2/vde2.install
deleted file mode 100644
index 74e1710ff..000000000
--- a/testing/vde2/vde2.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
-  echo "Change /etc/conf.d/vde to your needs."
-  echo "vde config files should be placed in /etc/vde, sample files are provided."
-  echo "iptables and dhcpd sample files have been installed to '/usr/share/vde2'."
-  echo "Merge those examples, if needed to the according config files."
-}
-
-post_upgrade() {
-  post_install $1
-}
diff --git a/testing/vinagre/PKGBUILD b/testing/vinagre/PKGBUILD
deleted file mode 100644
index 1e6a3df88..000000000
--- a/testing/vinagre/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169145 2012-10-18 19:22:16Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-# Contributor: lp76 <l.peduto@gmail.com>
-
-pkgname=vinagre
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A VNC Client for the GNOME Desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.gnome.org/projects/vinagre/"
-install=vinagre.install
-depends=('libsecret' 'gtk-vnc' 'vte3' 'telepathy-glib' 'avahi' 'desktop-file-utils' 'dconf' 'shared-mime-info' 'gnome-icon-theme')
-optdepends=('openssh: SSH plugin'
-            'rdesktop: RDP plugin')
-makedepends=('docbook-xsl' 'intltool' 'rdesktop' 'openssh' 'itstool')
-groups=('gnome-extra')
-options=('!emptydirs' '!libtool')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('768727f9833ba9b9879d72671bc4b10577f4dfe74488cb0cf4c49edfe0165c62')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vinagre --enable-rdp --disable-spice
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/vinagre/vinagre.install b/testing/vinagre/vinagre.install
deleted file mode 100644
index 4998e6e8b..000000000
--- a/testing/vinagre/vinagre.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/vino/PKGBUILD b/testing/vino/PKGBUILD
deleted file mode 100644
index 282971898..000000000
--- a/testing/vino/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 169285 2012-10-18 19:46:05Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=vino
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="a VNC server for the GNOME desktop"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils')
-makedepends=('intltool' 'networkmanager' 'gnome-common')
-groups=('gnome-extra')
-url="http://www.gnome.org"
-options=(!emptydirs)
-install=vino.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('60fdc2271e27c4e10bef40dc2ee836d587930a178c3f189bd975c4d477f32783')
-
-build() {
-  cd $pkgname-$pkgver
-  sed -i -e '/AC_PATH_XTRA/d' configure.ac
-  autoreconf --force
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vino \
-      --localstatedir=/var \
-      --disable-http-server --with-secret
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/vino/vino.install b/testing/vino/vino.install
deleted file mode 100644
index fabaa1ed7..000000000
--- a/testing/vino/vino.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/vlc/PKGBUILD b/testing/vlc/PKGBUILD
deleted file mode 100644
index 6b303a952..000000000
--- a/testing/vlc/PKGBUILD
+++ /dev/null
@@ -1,89 +0,0 @@
-# $Id: PKGBUILD 163068 2012-07-06 15:22:25Z ibiru $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
-
-pkgname=vlc
-pkgver=2.0.2
-pkgrel=2
-pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/vlc/"
-license=('LGPL2.1' 'GPL2')
-depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt' 'libproxy' 
-         'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska' 
-         'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 
-         'libshout' 'libmad' 'libmpeg2' 'libmodplug' 'libass' 
-         'xcb-util-keysyms' 'ttf-freefont')
-makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
-             'fluidsynth' 'libdc1394' 'libavc1394' 'lirc-utils'
-             'libcaca' 'librsvg' 'portaudio' 'oss' 'libgme' 'xosd'
-             'projectm' 'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager')
-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'
-            'vdpau-video: vdpau back-end for nvidia'
-            'libva-driver-intel: back-end for intel cards'
-            'libbluray: for Blu-Ray support'
-            'flac: for Free Lossless Audio Codec plugin'
-            'oss: for OSS audio support'
-            'portaudio: for portaudio support'
-            'twolame: for TwoLAME mpeg2 encoder plugin'
-            'projectm: for ProjectM visualisation plugin'
-            'libcaca: for colored ASCII art video output'
-            'libgme: for libgme plugin'
-            'librsvg: for SVG plugin'
-            'gnome-vfs: for GNOME Virtual File System support'
-            'libgoom2: for libgoom plugin'
-            'vcdimager: navigate VCD with libvcdinfo'
-            'xosd: for xosd support'
-            'aalib: for ASCII art plugin'
-            'libmtp: for MTP devices support'
-            'fluidsynth: for synthesizer MIDI FluidSynth'
-            'smbclient: for SMB access plugin'
-            'libcdio: for audio CD playback support')
-conflicts=('vlc-plugin')
-replaces=('vlc-plugin')
-backup=('usr/share/vlc/lua/http/.hosts'
-        'usr/share/vlc/lua/http/dialogs/.hosts')
-options=('!libtool' '!emptydirs')
-install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('93e729cc970a4535b3213dbef0e69528')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
-
-  ./configure --prefix=/usr \
-              --disable-rpath \
-              --enable-oss \
-              --enable-faad \
-              --enable-nls \
-              --enable-lirc \
-              --enable-pvr \
-              --enable-ncurses \
-              --enable-realrtsp \
-              --enable-xosd \
-              --enable-aa \
-              --enable-vcdx
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
-        "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
-  done
-}
diff --git a/testing/vlc/vlc.install b/testing/vlc/vlc.install
deleted file mode 100644
index dc4961cae..000000000
--- a/testing/vlc/vlc.install
+++ /dev/null
@@ -1,18 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    usr/lib/vlc/vlc-cache-gen -f /usr/lib/vlc/plugins
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-pre_remove() {
-    rm -f usr/lib/vlc/plugins/plugins-*.dat
-}
-
-post_remove() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
diff --git a/testing/vte3/PKGBUILD b/testing/vte3/PKGBUILD
deleted file mode 100644
index a6eae68f2..000000000
--- a/testing/vte3/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 169144 2012-10-18 19:22:14Z jgc $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgbase=vte3
-pkgname=(vte3 vte-common)
-pkgver=0.34.1
-pkgrel=1
-pkgdesc="Virtual Terminal Emulator widget for use with GTK3"
-arch=('i686' 'x86_64')
-license=('LGPL')
-options=('!libtool' '!emptydirs')
-makedepends=('intltool' 'gobject-introspection' 'gtk3')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/GNOME/sources/vte/${pkgver%.*}/vte-$pkgver.tar.xz)
-sha256sums=('06b78824875545ced8ebaff111b656d0b4ed370f46a4b609f43f88a0ee908f08')
-
-build() {
-  cd "vte-$pkgver"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vte \
-      --localstatedir=/var --disable-static \
-      --enable-introspection
-  make
-}
-
-package_vte3(){
-  depends=('gtk3' 'vte-common')
-  cd "vte-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm "$pkgdir"/usr/lib/vte/gnome-pty-helper
-}
-
-package_vte-common() {
-  pkgdesc="Common files used by vte and vte3"
-  depends=('glibc')
-  cd "vte-$pkgver"
-
-  make -C gnome-pty-helper DESTDIR="$pkgdir" install
-}
diff --git a/testing/webkitgtk/PKGBUILD b/testing/webkitgtk/PKGBUILD
deleted file mode 100644
index d77de3a00..000000000
--- a/testing/webkitgtk/PKGBUILD
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id: PKGBUILD 165829 2012-08-31 06:08:20Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=webkitgtk
-pkgname=('webkitgtk2' 'webkitgtk3')
-pkgver=1.10.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://webkitgtk.org/"
-license=('custom')
-makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc')
-options=('!libtool' '!emptydirs')
-source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz)
-sha1sums=('3a2df2eb42ffdd7f3b39873d5461c347a6330493')
-
-build() {
-  cd "$srcdir/webkitgtk-$pkgver"
-  mkdir build-gtk2 build-gtk3
-
-  cd build-gtk2
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk2 \
-    --with-gstreamer=1.0 \
-    --with-gtk=2.0 \
-    --disable-webkit2
-  make all stamp-po
-  
-  cd ../build-gtk3
-  PYTHON=/usr/bin/python2 ../configure --prefix=/usr \
-    --enable-introspection \
-    --disable-silent-rules \
-    --libexecdir=/usr/lib/webkitgtk3 \
-    --with-gstreamer=1.0
-  make all stamp-po
-}
-
-package_webkitgtk3() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 3.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs')
-  conflicts=('libwebkit3')
-  provides=("libwebkit3=${pkgver}")
-  replaces=('libwebkit3')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk3"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_webkitgtk2() {
-  pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
-  depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gst-plugins-base-libs')
-  conflicts=('libwebkit')
-  provides=("libwebkit=${pkgver}")
-  replaces=('libwebkit')
-  
-  cd "$srcdir/webkitgtk-$pkgver/build-gtk2"
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/wireless_tools/PKGBUILD b/testing/wireless_tools/PKGBUILD
deleted file mode 100644
index 3ec9cd7d1..000000000
--- a/testing/wireless_tools/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 165481 2012-08-20 14:54:59Z 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=7
-pkgdesc='Tools allowing to manipulate the Wireless Extensions'
-url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html'
-license=('GPL')
-arch=('i686' 'x86_64')
-source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz"
-        'dense.patch')
-sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710'
-          '5c297c7dff1ec1d2a3d918c20622ab3c6daf5b72')
-
-build() {
-	cd "${srcdir}/${pkgname}.${pkgver}"
-	patch -p1 -i ../dense.patch # FS#15363
-	make CFLAGS="${CFLAGS} -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/wireless_tools/dense.patch b/testing/wireless_tools/dense.patch
deleted file mode 100644
index 85182cd82..000000000
--- a/testing/wireless_tools/dense.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-The length field of wext data (iw_point.data) is 16 bits. The largest
-value is thus 65535. During the attempts to increase buffer size the
-buffer starts at 4096 and is doubled after each failure to fill. From the
-time this length reaches 65536 it is effectively zero. We thus loose all
-potential space from 32768 to 65535.
-
-This problem is clear when scanning in a RF dense environment.
-
-Without this patch:
-~$ iwlist wlan0 scan
-print_scanning_info: Allocation failed
-
-With this patch:
-~$ iwlist wlan0 scan | grep Cell | wc -l
-86
-
-Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-
----
-A similar patch was recently created to fix wpa_supplicant.
-
-I could not find a source code repo for this code and created this patch
-against version 30-pre7 downloaded from 
-http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-
-diff -uprN wireless_tools_org/wireless_tools.30/iwlist.c wireless_tools.30/iwlist.c
---- wireless_tools_org/wireless_tools.30/iwlist.c	2008-01-16 17:45:41.000000000 -0800
-+++ wireless_tools.30/iwlist.c	2009-02-12 14:16:48.000000000 -0800
-@@ -800,7 +800,7 @@ print_scanning_info(int		skfd,
- 	  if(iw_get_ext(skfd, ifname, SIOCGIWSCAN, &wrq) < 0)
- 	    {
- 	      /* Check if buffer was too small (WE-17 only) */
--	      if((errno == E2BIG) && (range.we_version_compiled > 16))
-+	      if((errno == E2BIG) && (range.we_version_compiled > 16) && (buflen < 65535))
- 		{
- 		  /* Some driver may return very large scan results, either
- 		   * because there are many cells, or because they have many
-@@ -816,6 +816,10 @@ print_scanning_info(int		skfd,
- 		  else
- 		    buflen *= 2;
- 
-+		  /* wrq.u.data.length is 16 bits so max size is 65535 */
-+		  if(buflen > 65535)
-+		    buflen = 65535;
-+
- 		  /* Try again */
- 		  goto realloc;
- 		}
-
diff --git a/testing/wpa_actiond/PKGBUILD b/testing/wpa_actiond/PKGBUILD
deleted file mode 100644
index 3e3642442..000000000
--- a/testing/wpa_actiond/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 163526 2012-07-14 13:40:29Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=wpa_actiond
-pkgver=1.3
-pkgrel=1
-pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
-arch=('i686' 'x86_64')
-url="http://projects.archlinux.org/wpa_actiond.git/"
-license=('GPL')
-depends=('glibc' 'wpa_supplicant')
-source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4523b76980198666ac93f3a3772a10554ef608e6a18ab9eb1346303ee3a6f4b1')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  install -D -m755 wpa_actiond "${pkgdir}/usr/sbin/wpa_actiond"
-}
-# vim:set ts=2 sw=2 et:
diff --git a/testing/wpa_supplicant/PKGBUILD b/testing/wpa_supplicant/PKGBUILD
deleted file mode 100644
index 5cc420cbf..000000000
--- a/testing/wpa_supplicant/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 168658 2012-10-13 20:56:07Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=wpa_supplicant
-pkgver=1.0
-pkgrel=2
-pkgdesc="A utility providing key negotiation for WPA wireless networks"
-url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
-depends=('openssl' 'dbus-core' 'readline' 'libnl')
-optdepends=('wpa_supplicant_gui: wpa_gui program')
-license=('GPL')
-backup=('etc/wpa_supplicant/wpa_supplicant.conf')
-source=("http://w1.fi/releases/${pkgname}-${pkgver}.tar.gz"
-	config hostap_allow-linking-with-libnl-3.2.patch)
-md5sums=('8650f6aa23646ef634402552d0669640'
-         'c035e45e8e240239eecd7402f235fb3b'
-         '473fb6b77909ec5a50b6f4d91370e86b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/"
-
-  # from fedora
-  patch -Np1 -i "$srcdir/hostap_allow-linking-with-libnl-3.2.patch"
-
-  cd "${pkgname}"
-
-  cp "${srcdir}/config" ./.config
-
-  sed -i 's@/usr/local@$(PREFIX)@g' Makefile
-
-  make PREFIX=/usr
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/${pkgname}"
-  make PREFIX=/usr DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/etc/wpa_supplicant"
-  install -m644 wpa_supplicant.conf "${pkgdir}/etc/wpa_supplicant/wpa_supplicant.conf"
-
-  install -d -m755 "${pkgdir}/usr/share/man/man"{5,8}
-  install -m644 doc/docbook/*.5 "${pkgdir}/usr/share/man/man5/"
-  install -m644 doc/docbook/*.8 "${pkgdir}/usr/share/man/man8/"
-  rm -f "${pkgdir}/usr/share/man/man8/wpa_"{priv,gui}.8
-
-  install -d -m755 "${pkgdir}/usr/share/dbus-1/system-services"
-  install -m644 dbus/{fi.epitest.hostap.WPASupplicant.service,fi.w1.wpa_supplicant1.service} "${pkgdir}/usr/share/dbus-1/system-services/"
-
-  install -d -m755 "${pkgdir}/etc/dbus-1/system.d"
-  install -m644 dbus/dbus-wpa_supplicant.conf "${pkgdir}/etc/dbus-1/system.d/wpa_supplicant.conf"
-
-  install -d -m755 "${pkgdir}/usr/lib/systemd/system"
-  install -m644 systemd/*.service "${pkgdir}/usr/lib/systemd/system/"
-}
diff --git a/testing/wpa_supplicant/config b/testing/wpa_supplicant/config
deleted file mode 100644
index 5e6dfedc8..000000000
--- a/testing/wpa_supplicant/config
+++ /dev/null
@@ -1,482 +0,0 @@
-# Example wpa_supplicant build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cases, these lines should use += in order not
-# to override previous values of the variables.
-
-
-# Uncomment following two lines and fix the paths if you have installed OpenSSL
-# or GnuTLS in non-default location
-#CFLAGS += -I/usr/local/openssl/include
-#LIBS += -L/usr/local/openssl/lib
-
-# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
-# the kerberos files are not in the default include path. Following line can be
-# used to fix build issues on such systems (krb5.h not found).
-#CFLAGS += -I/usr/include/kerberos
-
-# Example configuration for various cross-compilation platforms
-
-#### sveasoft (e.g., for Linksys WRT54G) ######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
-#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
-###############################################################################
-
-#### openwrt (e.g., for Linksys WRT54G) #######################################
-#CC=mipsel-uclibc-gcc
-#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
-#CFLAGS += -Os
-#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
-#	-I../WRT54GS/release/src/include
-#LIBS = -lssl
-###############################################################################
-
-
-# Driver interface for Host AP driver
-#CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for Agere driver
-#CONFIG_DRIVER_HERMES=y
-# Change include directories to match with the local setup
-#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
-#CFLAGS += -I../../include/wireless
-
-# Driver interface for madwifi driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_MADWIFI=y
-# Set include directory to the madwifi source tree
-#CFLAGS += -I../../madwifi
-
-# Driver interface for ndiswrapper
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_NDISWRAPPER=y
-
-# Driver interface for Atmel driver
-#CONFIG_DRIVER_ATMEL=y
-
-# Driver interface for old Broadcom driver
-# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
-# Linux wireless extensions and does not need (or even work) with the old
-# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
-#CONFIG_DRIVER_BROADCOM=y
-# Example path for wlioctl.h; change to match your configuration
-#CFLAGS += -I/opt/WRT54GS/release/src/include
-
-# Driver interface for Intel ipw2100/2200 driver
-# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
-#CONFIG_DRIVER_IPW=y
-
-# Driver interface for Ralink driver
-#CONFIG_DRIVER_RALINK=y
-
-# Driver interface for generic Linux wireless extensions
-# Note: WEXT is deprecated in the current Linux kernel version and no new
-# functionality is added to it. nl80211-based interface is the new
-# replacement for WEXT and its use allows wpa_supplicant to properly control
-# the driver to improve existing functionality like roaming and to support new
-# functionality.
-CONFIG_DRIVER_WEXT=y
-
-# Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
-
-# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
-#CONFIG_DRIVER_BSD=y
-#CFLAGS += -I/usr/local/include
-#LIBS += -L/usr/local/lib
-#LIBS_p += -L/usr/local/lib
-#LIBS_c += -L/usr/local/lib
-
-# Driver interface for Windows NDIS
-#CONFIG_DRIVER_NDIS=y
-#CFLAGS += -I/usr/include/w32api/ddk
-#LIBS += -L/usr/local/lib
-# For native build using mingw
-#CONFIG_NATIVE_WINDOWS=y
-# Additional directories for cross-compilation on Linux host for mingw target
-#CFLAGS += -I/opt/mingw/mingw32/include/ddk
-#LIBS += -L/opt/mingw/mingw32/lib
-#CC=mingw32-gcc
-# By default, driver_ndis uses WinPcap for low-level operations. This can be
-# replaced with the following option which replaces WinPcap calls with NDISUIO.
-# However, this requires that WZC is disabled (net stop wzcsvc) before starting
-# wpa_supplicant.
-# CONFIG_USE_NDISUIO=y
-
-# Driver interface for development testing
-#CONFIG_DRIVER_TEST=y
-
-# Driver interface for wired Ethernet drivers
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for the Broadcom RoboSwitch family
-#CONFIG_DRIVER_ROBOSWITCH=y
-
-# Driver interface for no driver (e.g., WPS ER only)
-#CONFIG_DRIVER_NONE=y
-
-# Solaris libraries
-#LIBS += -lsocket -ldlpi -lnsl
-#LIBS_c += -lsocket
-
-# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
-# included)
-CONFIG_IEEE8021X_EAPOL=y
-
-# EAP-MD5
-CONFIG_EAP_MD5=y
-
-# EAP-MSCHAPv2
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-TLS
-CONFIG_EAP_TLS=y
-
-# EAL-PEAP
-CONFIG_EAP_PEAP=y
-
-# EAP-TTLS
-CONFIG_EAP_TTLS=y
-
-# EAP-FAST
-# Note: Default OpenSSL package does not include support for all the
-# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
-# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
-# to add the needed functions.
-#CONFIG_EAP_FAST=y
-
-# EAP-GTC
-CONFIG_EAP_GTC=y
-
-# EAP-OTP
-CONFIG_EAP_OTP=y
-
-# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-#CONFIG_EAP_SIM=y
-
-# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
-#CONFIG_EAP_PSK=y
-
-# EAP-pwd (secure authentication using only a password)
-#CONFIG_EAP_PWD=y
-
-# EAP-PAX
-#CONFIG_EAP_PAX=y
-
-# LEAP
-CONFIG_EAP_LEAP=y
-
-# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-#CONFIG_EAP_AKA=y
-
-# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
-# This requires CONFIG_EAP_AKA to be enabled, too.
-#CONFIG_EAP_AKA_PRIME=y
-
-# Enable USIM simulator (Milenage) for EAP-AKA
-#CONFIG_USIM_SIMULATOR=y
-
-# EAP-SAKE
-#CONFIG_EAP_SAKE=y
-
-# EAP-GPSK
-#CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-#CONFIG_EAP_GPSK_SHA256=y
-
-# EAP-TNC and related Trusted Network Connect support (experimental)
-#CONFIG_EAP_TNC=y
-
-# Wi-Fi Protected Setup (WPS)
-CONFIG_WPS=y
-# Enable WSC 2.0 support
-#CONFIG_WPS2=y
-# Enable WPS external registrar functionality
-#CONFIG_WPS_ER=y
-# Disable credentials for an open network by default when acting as a WPS
-# registrar.
-#CONFIG_WPS_REG_DISABLE_OPEN=y
-
-# EAP-IKEv2
-#CONFIG_EAP_IKEV2=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
-# engine.
-CONFIG_SMARTCARD=y
-
-# PC/SC interface for smartcards (USIM, GSM SIM)
-# Enable this if EAP-SIM or EAP-AKA is included
-#CONFIG_PCSC=y
-
-# Development testing
-#CONFIG_EAPOL_TEST=y
-
-# Select control interface backend for external programs, e.g, wpa_cli:
-# unix = UNIX domain sockets (default for Linux/*BSD)
-# udp = UDP sockets using localhost (127.0.0.1)
-# named_pipe = Windows Named Pipe (default for Windows)
-# y = use default (backwards compatibility)
-# If this option is commented out, control interface is not included in the
-# build.
-CONFIG_CTRL_IFACE=y
-
-# Include support for GNU Readline and History Libraries in wpa_cli.
-# When building a wpa_cli binary for distribution, please note that these
-# libraries are licensed under GPL and as such, BSD license may not apply for
-# the resulting binary.
-CONFIG_READLINE=y
-
-# Include internal line edit mode in wpa_cli. This can be used as a replacement
-# for GNU Readline to provide limited command line editing and history support.
-#CONFIG_WPA_CLI_EDIT=y
-
-# Remove debugging code that is printing out debug message to stdout.
-# This can be used to reduce the size of the wpa_supplicant considerably
-# if debugging code is not needed. The size reduction can be around 35%
-# (e.g., 90 kB).
-#CONFIG_NO_STDOUT_DEBUG=y
-
-# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
-# 35-50 kB in code size.
-#CONFIG_NO_WPA=y
-
-# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
-# save about 1 kB in code size when building only WPA-Personal (no EAP support)
-# or 6 kB if building for WPA-Enterprise.
-#CONFIG_NO_WPA2=y
-
-# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
-# This option can be used to reduce code size by removing support for
-# converting ASCII passphrases into PSK. If this functionality is removed, the
-# PSK can only be configured as the 64-octet hexstring (e.g., from
-# wpa_passphrase). This saves about 0.5 kB in code size.
-#CONFIG_NO_WPA_PASSPHRASE=y
-
-# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
-# This can be used if ap_scan=1 mode is never enabled.
-#CONFIG_NO_SCAN_PROCESSING=y
-
-# Select configuration backend:
-# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
-#	path is given on command line, not here; this option is just used to
-#	select the backend that allows configuration files to be used)
-# winreg = Windows registry (see win_example.reg for an example)
-CONFIG_BACKEND=file
-
-# Remove configuration write functionality (i.e., to allow the configuration
-# file to be updated based on runtime configuration changes). The runtime
-# configuration can still be changed, the changes are just not going to be
-# persistent over restarts. This option can be used to reduce code size by
-# about 3.5 kB.
-#CONFIG_NO_CONFIG_WRITE=y
-
-# Remove support for configuration blobs to reduce code size by about 1.5 kB.
-#CONFIG_NO_CONFIG_BLOBS=y
-
-# Select program entry point implementation:
-# main = UNIX/POSIX like main() function (default)
-# main_winsvc = Windows service (read parameters from registry)
-# main_none = Very basic example (development use only)
-#CONFIG_MAIN=main
-
-# Select wrapper for operatins system and C library specific functions
-# unix = UNIX/POSIX like systems (default)
-# win32 = Windows systems
-# none = Empty template
-#CONFIG_OS=unix
-
-# Select event loop implementation
-# eloop = select() loop (default)
-# eloop_win = Windows events and WaitForMultipleObject() loop
-# eloop_none = Empty template
-#CONFIG_ELOOP=eloop
-
-# Select layer 2 packet implementation
-# linux = Linux packet socket (default)
-# pcap = libpcap/libdnet/WinPcap
-# freebsd = FreeBSD libpcap
-# winpcap = WinPcap with receive thread
-# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
-# none = Empty template
-#CONFIG_L2_PACKET=linux
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-#CONFIG_IEEE80211W=y
-
-# Select TLS implementation
-# openssl = OpenSSL (default)
-# gnutls = GnuTLS
-# internal = Internal TLSv1 implementation (experimental)
-# none = Empty template
-#CONFIG_TLS=openssl
-
-# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
-# can be enabled to get a stronger construction of messages when block ciphers
-# are used. It should be noted that some existing TLS v1.0 -based
-# implementation may not be compatible with TLS v1.1 message (ClientHello is
-# sent prior to negotiating which version will be used)
-#CONFIG_TLSV11=y
-
-# If CONFIG_TLS=internal is used, additional library and include paths are
-# needed for LibTomMath. Alternatively, an integrated, minimal version of
-# LibTomMath can be used. See beginning of libtommath.c for details on benefits
-# and drawbacks of this option.
-#CONFIG_INTERNAL_LIBTOMMATH=y
-#ifndef CONFIG_INTERNAL_LIBTOMMATH
-#LTM_PATH=/usr/src/libtommath-0.39
-#CFLAGS += -I$(LTM_PATH)
-#LIBS += -L$(LTM_PATH)
-#LIBS_p += -L$(LTM_PATH)
-#endif
-# At the cost of about 4 kB of additional binary size, the internal LibTomMath
-# can be configured to include faster routines for exptmod, sqr, and div to
-# speed up DH and RSA calculation considerably
-#CONFIG_INTERNAL_LIBTOMMATH_FAST=y
-
-# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
-# This is only for Windows builds and requires WMI-related header files and
-# WbemUuid.Lib from Platform SDK even when building with MinGW.
-#CONFIG_NDIS_EVENTS_INTEGRATED=y
-#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
-
-# Add support for old DBus control interface
-# (fi.epitest.hostap.WPASupplicant)
-CONFIG_CTRL_IFACE_DBUS=y
-
-# Add support for new DBus control interface
-# (fi.w1.hostap.wpa_supplicant1)
-CONFIG_CTRL_IFACE_DBUS_NEW=y
-
-# Add introspection support for new DBus control interface
-CONFIG_CTRL_IFACE_DBUS_INTRO=y
-
-# Add support for loading EAP methods dynamically as shared libraries.
-# When this option is enabled, each EAP method can be either included
-# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
-# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
-# be loaded in the beginning of the wpa_supplicant configuration file
-# (see load_dynamic_eap parameter in the example file) before being used in
-# the network blocks.
-#
-# Note that some shared parts of EAP methods are included in the main program
-# and in order to be able to use dynamic EAP methods using these parts, the
-# main program must have been build with the EAP method enabled (=y or =dyn).
-# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
-# unless at least one of them was included in the main build to force inclusion
-# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
-# in the main build to be able to load these methods dynamically.
-#
-# Please also note that using dynamic libraries will increase the total binary
-# size. Thus, it may not be the best option for targets that have limited
-# amount of memory/flash.
-#CONFIG_DYNAMIC_EAP_METHODS=y
-
-# IEEE Std 802.11r-2008 (Fast BSS Transition)
-#CONFIG_IEEE80211R=y
-
-# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
-CONFIG_DEBUG_FILE=y
-
-# Send debug messages to syslog instead of stdout
-#CONFIG_DEBUG_SYSLOG=y
-# Set syslog facility for debug messages
-#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
-
-# Enable privilege separation (see README 'Privilege separation' for details)
-#CONFIG_PRIVSEP=y
-
-# Enable mitigation against certain attacks against TKIP by delaying Michael
-# MIC error reports by a random amount of time between 0 and 60 seconds
-#CONFIG_DELAYED_MIC_ERROR_REPORT=y
-
-# Enable tracing code for developer debugging
-# This tracks use of memory allocations and other registrations and reports
-# incorrect use with a backtrace of call (or allocation) location.
-#CONFIG_WPA_TRACE=y
-# For BSD, uncomment these.
-#LIBS += -lexecinfo
-#LIBS_p += -lexecinfo
-#LIBS_c += -lexecinfo
-
-# Use libbfd to get more details for developer debugging
-# This enables use of libbfd to get more detailed symbols for the backtraces
-# generated by CONFIG_WPA_TRACE=y.
-#CONFIG_WPA_TRACE_BFD=y
-# For BSD, uncomment these.
-#LIBS += -lbfd -liberty -lz
-#LIBS_p += -lbfd -liberty -lz
-#LIBS_c += -lbfd -liberty -lz
-
-# wpa_supplicant depends on strong random number generation being available
-# from the operating system. os_get_random() function is used to fetch random
-# data when needed, e.g., for key generation. On Linux and BSD systems, this
-# works by reading /dev/urandom. It should be noted that the OS entropy pool
-# needs to be properly initialized before wpa_supplicant is started. This is
-# important especially on embedded devices that do not have a hardware random
-# number generator and may by default start up with minimal entropy available
-# for random number generation.
-#
-# As a safety net, wpa_supplicant is by default trying to internally collect
-# additional entropy for generating random data to mix in with the data fetched
-# from the OS. This by itself is not considered to be very strong, but it may
-# help in cases where the system pool is not initialized properly. However, it
-# is very strongly recommended that the system pool is initialized with enough
-# entropy either by using hardware assisted random number generator or by
-# storing state over device reboots.
-#
-# wpa_supplicant can be configured to maintain its own entropy store over
-# restarts to enhance random number generation. This is not perfect, but it is
-# much more secure than using the same sequence of random numbers after every
-# reboot. This can be enabled with -e<entropy file> command line option. The
-# specified file needs to be readable and writable by wpa_supplicant.
-#
-# If the os_get_random() is known to provide strong random data (e.g., on
-# Linux/BSD, the board in question is known to have reliable source of random
-# data from /dev/urandom), the internal wpa_supplicant random pool can be
-# disabled. This will save some in binary size and CPU use. However, this
-# should only be considered for builds that are known to be used on devices
-# that meet the requirements described above.
-CONFIG_NO_RANDOM_POOL=y
-
-# IEEE 802.11n (High Throughput) support (mainly for AP mode)
-#CONFIG_IEEE80211N=y
-
-# Interworking (IEEE 802.11u)
-# This can be used to enable functionality to improve interworking with
-# external networks (GAS/ANQP to learn more about the networks and network
-# selection based on available credentials).
-#CONFIG_INTERWORKING=y
-
-CONFIG_LIBNL32=y
-
-# More options that are not in defconfig:
-
-# Lightweight AP mode
-CONFIG_AP=y
-
-# P2P (WiFi Direct)
-CONFIG_P2P=y
-
-# RSN IBSS/AdHoc support
-CONFIG_IBSS_RSN=y
-
-# Simple background scan
-CONFIG_BGSCAN_SIMPLE=y
diff --git a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch b/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
deleted file mode 100644
index 5d8903906..000000000
--- a/testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo wpa_supplicant-1.0-rc2/src/drivers/drivers.mak
---- wpa_supplicant-1.0-rc2/src/drivers/drivers.mak.foo	2012-03-02 16:11:43.176448714 -0600
-+++ wpa_supplicant-1.0-rc2/src/drivers/drivers.mak	2012-03-02 16:12:29.759866341 -0600
-@@ -48,7 +48,7 @@ NEED_RFKILL=y
- ifdef CONFIG_LIBNL32
-   DRV_LIBS += -lnl-3
-   DRV_LIBS += -lnl-genl-3
--  DRV_CFLAGS += -DCONFIG_LIBNL20
-+  DRV_CFLAGS += -DCONFIG_LIBNL20 `pkg-config --cflags libnl-3.0`
- else
-   ifdef CONFIG_LIBNL_TINY
-     DRV_LIBS += -lnl-tiny
diff --git a/testing/wpa_supplicant_gui/PKGBUILD b/testing/wpa_supplicant_gui/PKGBUILD
deleted file mode 100644
index e8ad8125a..000000000
--- a/testing/wpa_supplicant_gui/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 162332 2012-06-25 10:11:07Z heftig $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=wpa_supplicant_gui
-pkgver=1.0
-pkgrel=1
-pkgdesc="A Qt frontend to wpa_supplicant"
-url="http://hostap.epitest.fi/wpa_supplicant"
-arch=('i686' 'x86_64')
-depends=('qt' "wpa_supplicant=$pkgver")
-license=('GPL')
-source=("http://hostap.epitest.fi/releases/wpa_supplicant-$pkgver.tar.gz"
-        compile-fix.patch)
-sha256sums=('91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c'
-            '044be1032faf93c5f0abf22d7ae77dc0d1d1fef0c2c30646d54950b86601709f')
-
-build() {
-  cd wpa_supplicant-${pkgver}
-  patch -p1 <../compile-fix.patch
-  cd wpa_supplicant/wpa_gui-qt4
-  qmake
-  make
-}
-
-package() {
-  cd "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/wpa_gui-qt4"
-  install -Dm755 wpa_gui "${pkgdir}/usr/sbin/wpa_gui"
-  install -Dm644 icons/wpa_gui.svg "${pkgdir}/usr/share/pixmaps/wpa_gui.svg"
-  install -Dm644 wpa_gui.desktop "${pkgdir}/usr/share/applications/wpa_gui.desktop"
-  install -Dm644 "${srcdir}/wpa_supplicant-${pkgver}/wpa_supplicant/doc/docbook/wpa_gui.8" \
-     "${pkgdir}/usr/share/man/man8/wpa_gui.8"
-}
diff --git a/testing/wpa_supplicant_gui/compile-fix.patch b/testing/wpa_supplicant_gui/compile-fix.patch
deleted file mode 100644
index 3303b3699..000000000
--- a/testing/wpa_supplicant_gui/compile-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
---- wpa_supplicant-1.0/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-05-09 23:56:09.000000000 +0200
-+++ wpa_supplicant-1.0-fix/wpa_supplicant/wpa_gui-qt4/wpagui.cpp	2012-06-25 12:06:46.045261398 +0200
-@@ -12,10 +12,8 @@
-  * See README and COPYING for more details.
-  */
- 
--#ifdef __MINGW32__
- /* Need to get getopt() */
- #include <unistd.h>
--#endif
- 
- #ifdef CONFIG_NATIVE_WINDOWS
- #include <windows.h>
diff --git a/testing/x264/PKGBUILD b/testing/x264/PKGBUILD
deleted file mode 100644
index 7fb20c2ac..000000000
--- a/testing/x264/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 163081 2012-07-06 16:26:37Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=x264
-pkgver=20120705
-pkgrel=1
-pkgdesc="free library for encoding H264/AVC video streams"
-arch=('i686' 'x86_64')
-url="http://www.videolan.org/developers/x264.html"
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('81e5bec5d5774a4a3f567f14bd94289c')
-
-build() {
-    cd "$pkgname-snapshot-$pkgver-2245-stable"
-
-    ./configure --enable-shared
-
-    make
-}
-package() {
-    cd "$pkgname-snapshot-$pkgver-2245-stable"
-
-    make DESTDIR="$pkgdir" \
-      bindir=/usr/bin \
-      libdir=/usr/lib \
-      includedir=/usr/include \
-      install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xcompmgr/PKGBUILD b/testing/xcompmgr/PKGBUILD
deleted file mode 100644
index f9439333a..000000000
--- a/testing/xcompmgr/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 165902 2012-09-03 10:37:05Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Leslie P. Polzer <leslie.polzer@gmx.net>
-
-pkgname=xcompmgr
-pkgver=1.1.6
-pkgrel=2
-pkgdesc="Composite Window-effects manager for X.org"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libxcomposite' 'libxdamage' 'libxrender' 'libxext')
-conflicts=('xapps')
-replaces=('xapps')
-source=(http://xorg.freedesktop.org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2
-       fix_broken_shadows.diff)
-sha1sums=('a9cf78ea32bac51ff584115381f195566b164fe3'
-          '435f9f0ad652bdd759f822514bf1559abf119ffe')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  # fix broken shadows in openbox - patch takern from https://bugs.freedesktop.org/show_bug.cgi?id=46285
-  patch -Np0 -i ${srcdir}/fix_broken_shadows.diff
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xcompmgr/fix_broken_shadows.diff b/testing/xcompmgr/fix_broken_shadows.diff
deleted file mode 100644
index 39b8ac725..000000000
--- a/testing/xcompmgr/fix_broken_shadows.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- xcompmgr.c	2011-11-19 01:49:52.000000000 -0600
-+++ xcompmgr.c	2012-08-11 21:58:58.000000000 -0500
-@@ -1028,7 +1028,6 @@
- 	{
- 	    w->borderClip = XFixesCreateRegion (dpy, NULL, 0);
- 	    XFixesCopyRegion (dpy, w->borderClip, region);
--	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
- 	}
- 	w->prev_trans = t;
- 	t = w;
-@@ -1080,6 +1079,8 @@
- 	if (w->mode == WINDOW_TRANS)
- 	{
- 	    int	x, y, wid, hei;
-+	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
-+	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
- #if HAS_NAME_WINDOW_PIXMAP
- 	    x = w->a.x;
- 	    y = w->a.y;
-@@ -1099,6 +1100,8 @@
- 	else if (w->mode == WINDOW_ARGB)
- 	{
- 	    int	x, y, wid, hei;
-+	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
-+	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
- #if HAS_NAME_WINDOW_PIXMAP
- 	    x = w->a.x;
- 	    y = w->a.y;
diff --git a/testing/xf86-input-acecad/PKGBUILD b/testing/xf86-input-acecad/PKGBUILD
deleted file mode 100644
index d711418ad..000000000
--- a/testing/xf86-input-acecad/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168205 2012-10-06 20:05:59Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-acecad
-pkgver=1.5.0
-pkgrel=5
-pkgdesc="X.Org acecad tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('sysfsutils')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        assign-local-private-after-allocating.patch)
-sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1'
-          '9301020b0ef3c6f2081e957481a88d2e187a7973')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-acecad/assign-local-private-after-allocating.patch b/testing/xf86-input-acecad/assign-local-private-after-allocating.patch
deleted file mode 100644
index e3e635a6f..000000000
--- a/testing/xf86-input-acecad/assign-local-private-after-allocating.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 27 Jun 2011 03:13:54 +0000
-Subject: Assign local->private after allocating.
-
-It is detrimental to the user experience when the driver tries to derefernce
-null pointers.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/acecad.c b/src/acecad.c
-index ad6d793..604fe91 100644
---- a/src/acecad.c
-+++ b/src/acecad.c
-@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags)
-         return BadAlloc;
- 
-     memset(priv, 0, sizeof(AceCadPrivateRec));
-+    local->private = priv;
- 
-     local->device_control = DeviceControl;
- 
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/xf86-input-aiptek/PKGBUILD b/testing/xf86-input-aiptek/PKGBUILD
deleted file mode 100644
index c0914a3c8..000000000
--- a/testing/xf86-input-aiptek/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168206 2012-10-06 20:06:02Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-aiptek
-pkgver=1.4.1
-pkgrel=5
-pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-elographics/PKGBUILD b/testing/xf86-input-elographics/PKGBUILD
deleted file mode 100644
index ee6ad8451..000000000
--- a/testing/xf86-input-elographics/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 88566 2010-08-24 08:47:16Z jgc $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-elographics
-pkgver=1.4.1
-pkgrel=2
-pkgdesc="X.org Elographics TouchScreen input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-evdev/PKGBUILD b/testing/xf86-input-evdev/PKGBUILD
deleted file mode 100644
index 18a8c1d00..000000000
--- a/testing/xf86-input-evdev/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168208 2012-10-06 20:06:09Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <Alexander@archlinux.org
-
-pkgname=xf86-input-evdev
-pkgver=2.7.3
-pkgrel=2
-pkgdesc="X.org evdev input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc' 'systemd-tools' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool' '!makeflags')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('eb389413602c3d28c44bbfab0477c98582f0e2f5be5f41986e58e93a033fa504')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-joystick/50-joystick.conf b/testing/xf86-input-joystick/50-joystick.conf
deleted file mode 100644
index 95a295ab0..000000000
--- a/testing/xf86-input-joystick/50-joystick.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-	Identifier "joystick catchall"
-	MatchIsJoystick "on"
-	MatchDevicePath "/dev/input/event*"
-	Driver "joystick"
-EndSection
diff --git a/testing/xf86-input-joystick/PKGBUILD b/testing/xf86-input-joystick/PKGBUILD
deleted file mode 100644
index c6413f2b6..000000000
--- a/testing/xf86-input-joystick/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 168209 2012-10-06 20:06:17Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-joystick
-pkgver=1.6.1
-pkgrel=2
-pkgdesc="X.Org Joystick input driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        #git-fixes.patch
-        50-joystick.conf)
-sha1sums=('0712652ec6cdb2fca6ad888548b232a4de9cf580'
-          'e1ff3699a0470c6bb78a53f718df9d8521621e11')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  #patch -Np1 -i "${srcdir}/git-fixes.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-joystick/git-fixes.patch b/testing/xf86-input-joystick/git-fixes.patch
deleted file mode 100644
index b3afa06cc..000000000
--- a/testing/xf86-input-joystick/git-fixes.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From 204dcb86368b011824fc5006f87b9e394d03a394 Mon Sep 17 00:00:00 2001
-From: Terry Lambert <tlambert@chromium.org>
-Date: Sat, 16 Jul 2011 00:23:22 +0000
-Subject: Return proper default for unknown values in pInfo->device_control.
-
-Signed-off-by: Terry Lambert <tlambert@chromium.org>
-Reviewed-by: Stephane Marchesin <marcheu@chromium.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/src/jstk.c b/src/jstk.c
-index ec6b79a..6db0e7c 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -419,8 +419,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
- 
-     default:
-         ErrorF("unsupported mode=%d\n", what);
--        return !Success;
--        break;
-+        return BadValue;
-     } /* switch (what) */
-     return Success;
- }
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index 3c471ce..d699dcd 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -169,6 +169,8 @@ jstkKeyboardDeviceControlProc(DeviceIntPtr       dev,
-         DBG(2, ErrorF("jstkKeyboardDeviceControlProc what=DEVICE_CLOSE\n"));
-         dev->public.on = FALSE;
-         break;
-+    default:
-+        return BadValue;
-     }
- 
-     return Success;
---
-cgit v0.9.0.2-2-gbebe
-From b3b62328cf3f36c20c54a298f8a921e6eef42c4d Mon Sep 17 00:00:00 2001
-From: Devin J. Pohly <djpohly+xorg@gmail.com>
-Date: Sat, 03 Sep 2011 23:00:07 +0000
-Subject: unify capitalization of joystick properties
-
-the axis keys high/low properties were inconsistently capitalized,
-leading to potential confusion as to why one works but not the other.
-
-Signed-off-by: Devin J. Pohly <djpohly+xorg@gmail.com>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
-diff --git a/include/joystick-properties.h b/include/joystick-properties.h
-index 49ef800..36f4082 100644
---- a/include/joystick-properties.h
-+++ b/include/joystick-properties.h
-@@ -99,7 +99,7 @@ typedef enum _JSTK_MAPPING {
- 
- /** Scancodes for axis in high position */
- /* 8 bit, 4 per axis */
--#define JSTK_PROP_AXIS_KEYS_HIGH "Axis keys (high)"
-+#define JSTK_PROP_AXIS_KEYS_HIGH "Axis Keys (high)"
- 
- /** Set the mapping of each button to
-     none, x, y, zx, zy, button, key, speed_multiply,
---
-cgit v0.9.0.2-2-gbebe
-From b607c4ebeea4122694f02ba87f06e4cdb23114f1 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sat, 15 Oct 2011 22:47:52 +0000
-Subject: label buttons and axes
-
-Buttons are labeled "Button %d", starting with 0 and representing the button in X _after_ mapping.
-Mapping can be changed while running so the labels will be constant.
-
-Axes are labeled "Axis %d", starting with 1, representing the _physical_ axis that reports the valuator
-data. The raw valuators can't be dynamically mapped, the first two valuators always are labeled "Rel X"
-and "Rel Y", representing the aggregated post-calculation data from all axes.
-
-Signed-off-by: Sascha Hlusiak <saschahlusiak@arcor.de>
----
-diff --git a/man/joystick.man b/man/joystick.man
-index da92ceb..b401de5 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -140,7 +140,11 @@ Neither
- .B mode
- nor
- .B axis
--needs to be set to generate extra valuator events.
-+needs to be set to generate extra valuator events. The axis will be labelled according to it's physical axis number, beginning with 
-+.I 1
-+, i.e.
-+.I \*qAxis 1\*q
-+for the first axis (being the 3rd valuator).
- Default: not set.
- .TP 7
- .BI "\*qaxis="[<factor>]<axis> \*q
-@@ -318,6 +322,28 @@ and the second and fourth axis to the arrow keys
- The keys for the first two axes will be generated in an interval according to the value of the axis. The autorepeat speed of the first axis will be half the speed of that of the second axis.
- The keys for the third and fourth axis are generated once when the axis moves out of the deadzone and when it moves back into the deadzone. X.Org will autorepeat those keys according to current keyboard settings.
- 
-+.SH "XI2 Events"
-+If you only care about raw events instead of using the joystick as a mouse replacement, don't forget to unmap and add valuators to all axes and map the remaining buttons:
-+
-+.nf
-+.BI "  Option  \*qMapAxis1\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis2\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis3\*q      \*q" "mode=none valuator" \*q
-+.BI "  Option  \*qMapAxis4\*q      \*q" "mode=none valuator" \*q
-+\ \ ...
-+.BI "  Option  \*qMapButton1\*q      \*q" "button=1" \*q
-+.BI "  Option  \*qMapButton2\*q      \*q" "button=2" \*q
-+.BI "  Option  \*qMapButton3\*q      \*q" "button=3" \*q
-+.BI "  Option  \*qMapButton4\*q      \*q" "button=4" \*q
-+.BI "  Option  \*qMapButton5\*q      \*q" "button=5" \*q
-+\ \ ...
-+.fi
-+
-+You might also want to set the device "floating" to stop it from reporting core events:
-+.nf
-+.BI "  Option  \*qFloating\*q      \*q" "true" \*q
-+.fi
-+
- .SH "NOTES"
- Configuration through
- .I InputClass
-diff --git a/src/jstk.c b/src/jstk.c
-index 6db0e7c..772683f 100644
---- a/src/jstk.c
-+++ b/src/jstk.c
-@@ -1,5 +1,5 @@
- /*
-- * Copyright 2007-2009 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-+ * Copyright 2007-2011 by Sascha Hlusiak. <saschahlusiak@freedesktop.org>     
-  * Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>       
-  *                                                                            
-  * Permission to use, copy, modify, distribute, and sell this software and its
-@@ -21,7 +21,6 @@
-  * PERFORMANCE OF THIS SOFTWARE.
-  */
- 
--
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif
-@@ -300,6 +299,7 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-     switch (what) {
-     case DEVICE_INIT: {
-         int m;
-+        char str[32];
-         CARD8 buttonmap[BUTTONMAP_SIZE+1];
-         DBG(1, ErrorF("jstkDeviceControlProc what=INIT\n"));
-         /* Probe device and return if error */
-@@ -312,11 +312,14 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-         }
- 
-         for (m=0; m<=BUTTONMAP_SIZE; m++) {
-+            sprintf(str, "Button %d", m);
-+
-             buttonmap[m] = m;
--	}
-+            btn_labels[m] = MakeAtom(str, strlen(str), TRUE);
-+        }
-+
-+
- 
--            
--            
-         if (InitButtonClassDeviceStruct(pJstk, BUTTONMAP_SIZE, 
-             btn_labels,
-             buttonmap) == FALSE) {
-@@ -331,7 +334,9 @@ jstkDeviceControlProc(DeviceIntPtr       pJstk,
-             if (priv->axis[i].valuator != -1)
-         {
-             DBG(3, ErrorF("Axis %d will be valuator %d\n", i, m));
-+            sprintf(str, "Axis %d", i + 1);
-             priv->axis[i].valuator = m++;
-+            axes_labels[i] = MakeAtom(str, strlen(str), TRUE);
-         }
- 
-         if (InitValuatorClassDeviceStruct(pJstk, m, axes_labels,
-@@ -719,7 +724,6 @@ static XF86ModuleVersionInfo jstkVersionRec =
-                    /* a tool */
- };
- 
--
- /*
-  ***************************************************************************
-  *
-@@ -732,3 +736,6 @@ _X_EXPORT XF86ModuleData joystickModuleData = {
-     jstkDriverPlug,
-     jstkDriverUnplug
- };
-+
-+/* vim: set filetype=c.doxygen ts=4 et: */
-+
---
-cgit v0.9.0.2-2-gbebe
-From e0193debf8f5a72b0a06977d5dea3365ad9cafbe Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:27:22 +0000
-Subject: Fix option type for option duplication
-
-xf86OptionListDuplicate() duplicates an XF86Option list, not an InputOption
-list.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index d699dcd..e842941 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -253,26 +253,26 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *options;
-     InputOption *iopts = NULL, *tmp;
-     DeviceIntPtr dev;
-+    XF86OptionPtr opts;
- 
-     /* duplicate option list, append to name */
--    options = xf86OptionListDuplicate(pInfo->options);
-+    opts = xf86OptionListDuplicate(pInfo->options);
-     strcpy(name, pInfo->name);
-     strcat(name, " (keys)");
--    options = xf86ReplaceStrOption(options, "Name", name);
--    options = xf86ReplaceStrOption(options, "_source", "_driver/joystick");
-+    opts = xf86ReplaceStrOption(opts, "Name", name);
-+    opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
- 
--    while(options)
-+    while(opts)
-     {
-         tmp = calloc(1, sizeof(InputOption));
- 
--        tmp->key = xf86OptionName(options);
--        tmp->value = xf86OptionValue(options);
-+        tmp->key = xf86OptionName(opts);
-+        tmp->value = xf86OptionValue(opts);
-         tmp->next = iopts;
-         iopts = tmp;
--        options = xf86NextOption(options);
-+        opts = xf86NextOption(opts);
-     }
- 
-     /* duplicate attribute list */
---
-cgit v0.9.0.2-2-gbebe
-From 7ccf3a75292d71104c976bf6afb389cccaac1a7d Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 31 Oct 2011 04:33:08 +0000
-Subject: Deal with opaque input option types.
-
-ABI 14 made the InputOption type opaque, move the existing code to ifdefs
-and use the new function calls otherwise.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index e842941..a71275a 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -247,13 +247,46 @@ int jstkKeyboardPreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
-     return Success;
- }
- 
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 14
-+static InputOption*
-+input_option_new(InputOption* list, char *key, char *value)
-+{
-+    InputOption *tmp;
-+
-+    tmp = calloc(1, sizeof(*tmp));
-+    tmp->key = key;
-+    tmp->value = value;
-+    tmp->next = list;
-+
-+    return tmp;
-+}
-+
-+static void
-+input_option_free_list(InputOption **list)
-+{
-+    InputOption *iopts = *list;
-+
-+    while(iopts)
-+    {
-+        InputOption *tmp = iopts->next;
-+        free(iopts->key);
-+        free(iopts->value);
-+        free(iopts);
-+        iopts = tmp;
-+    }
-+
-+    *list = NULL;
-+}
-+
-+#endif
-+
- InputInfoPtr
- jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- {
-     int rc;
-     char name[512] = {0};
-     InputAttributes *attrs = NULL;
--    InputOption *iopts = NULL, *tmp;
-+    InputOption *iopts = NULL;
-     DeviceIntPtr dev;
-     XF86OptionPtr opts;
- 
-@@ -266,12 +299,9 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     while(opts)
-     {
--        tmp = calloc(1, sizeof(InputOption));
--
--        tmp->key = xf86OptionName(opts);
--        tmp->value = xf86OptionValue(opts);
--        tmp->next = iopts;
--        iopts = tmp;
-+        iopts = input_option_new(iopts,
-+                                 xf86OptionName(opts),
-+                                 xf86OptionValue(opts));
-         opts = xf86NextOption(opts);
-     }
- 
-@@ -280,14 +310,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
- 
-     rc = NewInputDeviceRequest(iopts, attrs, &dev);
- 
--    while(iopts)
--    {
--        tmp = iopts->next;
--        free(iopts->key);
--        free(iopts->value);
--        free(iopts);
--        iopts = tmp;
--    }
-+    input_option_free_list(&iopts);
- 
-     FreeInputAttributes(attrs);
- 
---
-cgit v0.9.0.2-2-gbebe
-From 411c1838456c055d3f911c54ed58bb11a6bf0da3 Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 17:04:25 +0000
-Subject: man: valuators are not added automatically
-
----
-diff --git a/man/joystick.man b/man/joystick.man
-index b401de5..9f38ceb 100644
---- a/man/joystick.man
-+++ b/man/joystick.man
-@@ -129,9 +129,6 @@ can be one of:
- 
- .B none, relative, accelerated, absolute
- 
--Every axis which's mode is not
--.B none
--will be reported as an additional valuator.
- .TP 7
- .B \*qvaluator\*q
- Send extra valuator events for this axis. The valuators will be numbered ascending, starting with 2 (valuator 0 and 1 are reserved for pointer movement). The range of the valuators is always 
---
-cgit v0.9.0.2-2-gbebe
-From b217fabdef1714ed4898e08de4c2a6b9cc8d4f0f Mon Sep 17 00:00:00 2001
-From: Sascha Hlusiak <saschahlusiak@arcor.de>
-Date: Sun, 13 Nov 2011 19:36:07 +0000
-Subject: Copy pInfo->driver to option list to fix hotplugging of keyboard device
-
-udev does copy the Driver line to the list of options, but when manually
-specifying the driver in xorg.conf, the option "Driver" is unset. Because we
-do hotplug a sub-device from within the core device, we need the "Driver"
-option to be present in the list.
-
-This should fix archlinux bug #23577:
-  https://bugs.archlinux.org/task/23577
-
-Thanks to Malek for coming up with a fix.
-
-Signed-off-by: Sascha Hlusiak <contact@saschahlusiak.de>
----
-diff --git a/src/jstk_key.c b/src/jstk_key.c
-index a71275a..241b15d 100644
---- a/src/jstk_key.c
-+++ b/src/jstk_key.c
-@@ -296,6 +296,7 @@ jstkKeyboardHotplug(InputInfoPtr pInfo, int flags)
-     strcat(name, " (keys)");
-     opts = xf86ReplaceStrOption(opts, "Name", name);
-     opts = xf86ReplaceStrOption(opts, "_source", "_driver/joystick");
-+    opts = xf86AddNewOption(opts, "Driver", pInfo->driver);
- 
-     while(opts)
-     {
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-input-keyboard/PKGBUILD b/testing/xf86-input-keyboard/PKGBUILD
deleted file mode 100644
index a338e294a..000000000
--- a/testing/xf86-input-keyboard/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168210 2012-10-06 20:06:20Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-keyboard
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="X.Org keyboard input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('76651a84f5031f7c6ecf075d55989c04a00689642579df6d1a1bee6d5c2e5f8a')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-mouse/PKGBUILD b/testing/xf86-input-mouse/PKGBUILD
deleted file mode 100644
index c33333e24..000000000
--- a/testing/xf86-input-mouse/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168211 2012-10-06 20:06:24Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-mouse
-pkgver=1.8.1
-pkgrel=2
-pkgdesc="X.org mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f5b97aac9aab8fa8b933e960631441ae23b18681c8bf3d5007c00da838f9c9c8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-synaptics/10-synaptics.conf b/testing/xf86-input-synaptics/10-synaptics.conf
deleted file mode 100644
index 81a90fb81..000000000
--- a/testing/xf86-input-synaptics/10-synaptics.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Section "InputClass"
-        Identifier "touchpad catchall"
-        Driver "synaptics"
-        MatchIsTouchpad "on"
-        MatchDevicePath "/dev/input/event*"
-        Option "TapButton1" "1"
-        Option "TapButton2" "2"
-        Option "TapButton3" "3"
-EndSection
diff --git a/testing/xf86-input-synaptics/PKGBUILD b/testing/xf86-input-synaptics/PKGBUILD
deleted file mode 100644
index 795ba9666..000000000
--- a/testing/xf86-input-synaptics/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 168212 2012-10-06 20:06:30Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Tobias Powalowski  <tpowa@archlinux.org>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-input-synaptics
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="Synaptics driver for notebook touchpads"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-replaces=('synaptics')
-provides=('synaptics')
-conflicts=('synaptics')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-backup=('etc/X11/xorg.conf.d/10-synaptics.conf')
-source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        10-synaptics.conf)
-sha256sums=('c3f7d6a085d480c352f030aeb43db2e5560d1468ed34be24d44a0fc3fda25920'
-            'bd506a0545c335faa6da7ec42b3f60f2c09b5ed9e26f03003d6f59be88107ee2')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-  install -m644 "${srcdir}/10-synaptics.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  rm -rf "${pkgdir}/usr/share/X11"
-}
diff --git a/testing/xf86-input-vmmouse/PKGBUILD b/testing/xf86-input-vmmouse/PKGBUILD
deleted file mode 100644
index 846628429..000000000
--- a/testing/xf86-input-vmmouse/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168213 2012-10-06 20:06:33Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-vmmouse
-pkgver=12.9.0
-pkgrel=2
-pkgdesc="X.org VMWare Mouse input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc' 'sh')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('83500beddba2da390389705d482131872fe9be8b')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --with-xorg-conf-dir=/etc/X11/xorg.conf.d \
-    --with-udev-rules-dir=/usr/lib/udev/rules.d
-  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}/"
-  rm -rfv ${pkgdir}/usr/{lib,share}/hal
-}
diff --git a/testing/xf86-input-void/PKGBUILD b/testing/xf86-input-void/PKGBUILD
deleted file mode 100644
index c41307cc6..000000000
--- a/testing/xf86-input-void/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168214 2012-10-06 20:06:37Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-input-void
-pkgver=1.4.0
-pkgrel=4
-pkgdesc="X.org void input driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('49b462d3acb16337eaf78202d4074f19d5e20b29')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-input-wacom/70-wacom.rules b/testing/xf86-input-wacom/70-wacom.rules
deleted file mode 100644
index f6aa20835..000000000
--- a/testing/xf86-input-wacom/70-wacom.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-ACTION!="add|change", GOTO="wacom_end"
-
-# Match all serial wacom tablets with a serial ID starting with WACf
-# Notes: We assign NAME though we shouldn't, but currently the server requires it
-#        We assign the lot to subsystem pnp too because server reads NAME from
-#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
-#        will do and the ENV{NAME} can be removed.
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
-
-LABEL="wacom_end"
-
diff --git a/testing/xf86-input-wacom/PKGBUILD b/testing/xf86-input-wacom/PKGBUILD
deleted file mode 100644
index 8bc2188ff..000000000
--- a/testing/xf86-input-wacom/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168215 2012-10-06 20:06:42Z andyrtr $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: M Rawash <mrawash@gmail.com>
-
-pkgname=xf86-input-wacom
-pkgver=0.17.0
-pkgrel=2
-pkgdesc="X.Org Wacom tablet driver"
-arch=('i686' 'x86_64')
-url="http://linuxwacom.sourceforge.net/"
-license=('GPL')
-backup=('etc/X11/xorg.conf.d/50-wacom.conf')
-depends=('libxi' 'libxrandr' 'libxinerama')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
-options=(!libtool)
-source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
-        70-wacom.rules)
-md5sums=('92dffefc3bc30523463f2fa4bc753448'
-         '10db4f8272286690255c1bcc18bfdd92')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 ../70-wacom.rules "$pkgdir/usr/lib/udev/rules.d/70-wacom.rules"
-}
diff --git a/testing/xf86-video-apm/PKGBUILD b/testing/xf86-video-apm/PKGBUILD
deleted file mode 100644
index f9ae39c07..000000000
--- a/testing/xf86-video-apm/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168216 2012-10-06 20:06:45Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-apm
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="X.org Alliance ProMotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ark/PKGBUILD b/testing/xf86-video-ark/PKGBUILD
deleted file mode 100644
index 3d2bb12ae..000000000
--- a/testing/xf86-video-ark/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168217 2012-10-06 20:06:48Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ark
-pkgver=0.7.5
-pkgrel=2
-pkgdesc="X.org ark video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ast/PKGBUILD b/testing/xf86-video-ast/PKGBUILD
deleted file mode 100644
index 02f67d096..000000000
--- a/testing/xf86-video-ast/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168218 2012-10-06 20:06:51Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-ast
-pkgver=0.97.0
-pkgrel=2
-pkgdesc="X.org ASPEED AST Graphics video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-ati/PKGBUILD b/testing/xf86-video-ati/PKGBUILD
deleted file mode 100644
index affb5d2ad..000000000
--- a/testing/xf86-video-ati/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 168219 2012-10-06 20:06:54Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-ati
-pkgver=6.14.6
-epoch=1
-pkgrel=2
-pkgdesc="X.org ati video driver"
-arch=('i686' 'x86_64')
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libdrm>=2.4.37' 'systemd-tools' 'ati-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('aa5286b3e4f0187d7df14785c06dd800255d9405205dbf061da5d77df86bec36')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  
-  # fix build now that XAA isn't available in new Xorg - http://bugs.gentoo.org/show_bug.cgi?id=428094
-  sed -i '/USE_XAA, 1/d' configure.ac
-  autoreconf -vfi
-  
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make "DESTDIR=${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-chips/PKGBUILD b/testing/xf86-video-chips/PKGBUILD
deleted file mode 100644
index 83484ee3b..000000000
--- a/testing/xf86-video-chips/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168220 2012-10-06 20:06:59Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-chips
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="X.org Chips and Technologies video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=(glibc)
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h)
-sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
-            'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  cp ${srcdir}/iopl.h util/
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-chips/iopl.h b/testing/xf86-video-chips/iopl.h
deleted file mode 100644
index e08207c7f..000000000
--- a/testing/xf86-video-chips/iopl.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifdef __NetBSD__
-#  include <sys/types.h>
-#  include <machine/pio.h>
-#  include <machine/sysarch.h>
-#else
-#  if defined(__linux__)
-/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
- * #    include <sys/io.h>
- */
-int iopl(int level);
-#  endif
-#  if defined(SVR4) && defined(i386)
-#    include <sys/types.h>
-#    ifdef NCR
-       /* broken NCR <sys/sysi86.h> */
-#      define __STDC
-#      include <sys/sysi86.h>
-#      undef __STDC
-#    else
-#      include <sys/sysi86.h>
-#    endif
-#    ifdef SVR4
-#      if !defined(sun)
-#        include <sys/seg.h>
-#      endif
-#    endif
-#    include <sys/v86.h>
-#    if defined(sun)
-#      include <sys/psw.h>
-#    endif
-#  endif
-#  include "AsmMacros.h"
-#endif /* NetBSD */
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef __NetBSD__
-#  define SET_IOPL() i386_iopl(3)
-#  define RESET_IOPL() i386_iopl(0)
-#else
-#  if defined(SVR4) && defined(i386)
-#    ifndef SI86IOPL
-#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
-#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
-#    else
-#      define SET_IOPL() sysi86(SI86IOPL,3)
-#      define RESET_IOPL() sysi86(SI86IOPL,0)
-#    endif
-#  else
-#    ifdef linux
-#      define SET_IOPL() iopl(3)
-#      define RESET_IOPL() iopl(0)
-#    else
-#      define SET_IOPL() (void)0
-#      define RESET_IOPL() (void)0
-#    endif
-#  endif
-#endif
diff --git a/testing/xf86-video-cirrus/PKGBUILD b/testing/xf86-video-cirrus/PKGBUILD
deleted file mode 100644
index ecde3bb28..000000000
--- a/testing/xf86-video-cirrus/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168221 2012-10-06 20:07:03Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-cirrus
-pkgver=1.5.1
-pkgrel=2
-pkgdesc="X.org Cirrus Logic video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('a955429cbd673230c4b171afd6d0a6b28372d2f9d0a400f5124869274a27c557')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-dummy/PKGBUILD b/testing/xf86-video-dummy/PKGBUILD
deleted file mode 100644
index 61bcfaf34..000000000
--- a/testing/xf86-video-dummy/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168222 2012-10-06 20:07:07Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-dummy
-pkgver=0.3.6
-pkgrel=2
-pkgdesc="X.org dummy video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-fbdev/PKGBUILD b/testing/xf86-video-fbdev/PKGBUILD
deleted file mode 100644
index 4f601a475..000000000
--- a/testing/xf86-video-fbdev/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168223 2012-10-06 20:07:10Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-fbdev
-pkgver=0.4.3
-pkgrel=2
-pkgdesc="X.org framebuffer video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-glint/PKGBUILD b/testing/xf86-video-glint/PKGBUILD
deleted file mode 100644
index ddd99e5cc..000000000
--- a/testing/xf86-video-glint/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168225 2012-10-06 20:07:19Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-glint
-pkgver=1.2.8
-pkgrel=2
-pkgdesc="X.org GLINT/Permedia video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-i128/PKGBUILD b/testing/xf86-video-i128/PKGBUILD
deleted file mode 100644
index e2892cd12..000000000
--- a/testing/xf86-video-i128/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168226 2012-10-06 20:07:22Z andyrtr $
-# Maintainer:Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-i128
-pkgver=1.3.6
-pkgrel=2
-pkgdesc="X.org Number 9 I128 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-i740/PKGBUILD b/testing/xf86-video-i740/PKGBUILD
deleted file mode 100644
index 51e666726..000000000
--- a/testing/xf86-video-i740/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168227 2012-10-06 20:07:25Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-i740
-pkgver=1.3.4
-pkgrel=2
-pkgdesc="X.org Intel i740 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD
deleted file mode 100644
index f08d68628..000000000
--- a/testing/xf86-video-intel/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 169414 2012-10-20 17:32:31Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-intel
-pkgver=2.20.12
-pkgrel=1
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-install=$pkgname.install
-pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
-replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14'
-           'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr \
-    --enable-dri
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-intel/xf86-video-intel.install b/testing/xf86-video-intel/xf86-video-intel.install
deleted file mode 100644
index d523eb61a..000000000
--- a/testing/xf86-video-intel/xf86-video-intel.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
-  echo ">>> This driver now allows to switch"
-  echo ">>> between sna/uxa acceleration methods."
-  echo ">>> Add to the device section in /etc/X11/xorg.conf"
-  echo ">>>   Option \"AccelMethod\" \"sna\""
-  echo ">>> use uxa method if you run into trouble with sna."
-}
-
diff --git a/testing/xf86-video-mach64/PKGBUILD b/testing/xf86-video-mach64/PKGBUILD
deleted file mode 100644
index a8b670ac7..000000000
--- a/testing/xf86-video-mach64/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168229 2012-10-06 20:07:36Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mach64
-pkgver=6.9.3
-pkgrel=2
-pkgdesc="X.org mach64 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' )
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('mach64-dri: DRI1 support from community repo')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
-sha256sums=('5473d0e7dfd7bcff3f759e9e6bd6794ab464958f2f647d9b6d3edf3c66c53218'
-            '27f6531101ac26debc9cb5faa63e16aaf5bdb9001ddb817ffad5e4f60fbc4dd3')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-mach64/git_fixes.diff b/testing/xf86-video-mach64/git_fixes.diff
deleted file mode 100644
index aad11772e..000000000
--- a/testing/xf86-video-mach64/git_fixes.diff
+++ /dev/null
@@ -1,107 +0,0 @@
-From 5eb7fec958bc6ba8a1a2b0be4916cac818866e1c Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@gmail.com>
-Date: Wed, 18 Jul 2012 08:46:49 +0000
-Subject: mach64: fix build on 32-bit.
-
-tvout code only builds on 32-bit, fix build.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/atiscreen.c b/src/atiscreen.c
-index 2957877..b1fbd3c 100644
---- a/src/atiscreen.c
-+++ b/src/atiscreen.c
-@@ -580,7 +580,7 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
- #ifdef TV_OUT
-     /* Fix-up TV out after ImpacTV probe */
-     if (pATI->OptionTvOut && pATI->Chip < ATI_CHIP_264GTPRO)
--        ATISwitchMode(0, pScreenInfo->currentMode, 0);
-+        ATISwitchMode(SWITCH_MODE_ARGS(pScreenInfo, pScreenInfo->currentMode));
- #endif /* TV_OUT */
- 
- #ifdef XF86DRI_DEVEL
---
-cgit v0.9.0.2-2-gbebe
-From 104e3e067a7dcac143cb672fe42d56396ba6087b Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 26 Sep 2012 20:21:25 +0000
-Subject: Don't gratuitously disable Render when ShadowFBing
-
-There's no reason to do this, and I am at a loss to explain why that was
-ever done.  The first instance of this logic comes from xfree86 (over 11
-years ago!):
-
-http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c.diff?r1=1.15&r2=1.16
-
-Now, cfb never had Render support, so that might make some sense if
-there was an intermediate uncommitted state where the driver used fb for
-direct but cfb for shadowed.  But that's really the only plausible
-explanation I can think of.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/atiscreen.c b/src/atiscreen.c
-index b1fbd3c..62a4dd9 100644
---- a/src/atiscreen.c
-+++ b/src/atiscreen.c
-@@ -476,21 +476,11 @@ ATIScreenInit(SCREEN_INIT_ARGS_DECL)
-         }
-     }
- 
--    /* If applicable, initialise RENDER extension */
-+    /* initialise RENDER extension */
-+    if (!fbPictureInit(pScreen, NULL, 0) && (serverGeneration == 1))
-     {
--        if (pATI->OptionShadowFB)
--        {
--            if (serverGeneration == 1)
--                xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
--                    "RENDER extension not supported with a shadowed"
--                    " framebuffer.\n");
--        }
--        else if (!fbPictureInit(pScreen, NULL, 0) &&
--                 (serverGeneration == 1))
--        {
--            xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
--                "RENDER extension initialisation failed.\n");
--        }
-+	xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-+	    "RENDER extension initialisation failed.\n");
-     }
- 
-     xf86SetBlackWhitePixels(pScreen);
---
-cgit v0.9.0.2-2-gbebe
-From 42c4e423eec789606eec9703be23a9fd4483a14a Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 02 Oct 2012 14:19:47 +0000
-Subject: Fix build with neither XAA nor EXA against xserver 1.13.0
-
-Pull in picturestr.h to get GLYPH_HAS_GLYPH_PICTURE_ACCESSOR defined
-before compat-api.h is parsed, otherwise you fail with:
-
-In file included from /usr/include/xorg/picturestr.h:28:0,
-                 from /usr/include/xorg/exa.h:38,
-                 from atimach64accel.h:31,
-                 from atiscreen.c:46:
-/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '*' token
-/usr/include/xorg/glyphstr.h:138:2: error: expected ')' before '(' token
-/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '*' token
-/usr/include/xorg/glyphstr.h:140:2: error: expected ')' before '(' token
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/atistruct.h b/src/atistruct.h
-index 702360b..98dc15e 100644
---- a/src/atistruct.h
-+++ b/src/atistruct.h
-@@ -51,6 +51,7 @@
- 
- #endif /* TV_OUT */
- 
-+#include "picturestr.h"
- #ifdef USE_EXA
- #include "exa.h"
- #endif
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-mga/PKGBUILD b/testing/xf86-video-mga/PKGBUILD
deleted file mode 100644
index b6bf63ce0..000000000
--- a/testing/xf86-video-mga/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 168230 2012-10-06 20:07:39Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-mga
-pkgver=1.6.2
-pkgrel=2
-pkgdesc="X.org mga video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-#makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
-optdepends=('mga-dri: DRI1 support from community repo')
-#conflicts=('xorg-server<1.12.0')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-neomagic/PKGBUILD b/testing/xf86-video-neomagic/PKGBUILD
deleted file mode 100644
index 018d54d74..000000000
--- a/testing/xf86-video-neomagic/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168231 2012-10-06 20:07:42Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-neomagic
-pkgver=1.2.7
-pkgrel=2
-pkgdesc="X.org neomagic video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9f06e89ea68afb65dbc064af63dc57d3606fc7244cd62cf87841ff5bbc98cb76')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-nouveau/PKGBUILD b/testing/xf86-video-nouveau/PKGBUILD
deleted file mode 100644
index 30f70d501..000000000
--- a/testing/xf86-video-nouveau/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 169614 2012-10-24 13:01:41Z ibiru $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: buddabrod <buddabrod@gmail.com>
-
-pkgname=xf86-video-nouveau
-pkgver=1.0.3
-pkgrel=1
-pkgdesc="Open Source 2D acceleration driver for nVidia cards"
-arch=('i686' 'x86_64')
-url="http://nouveau.freedesktop.org/"
-license=('GPL')
-depends=('libdrm' 'udev' 'nouveau-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-install=$pkgname.install
-source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('a2ae34046324e1ec620f5a8dee3c8fe5a295acbb5d51825604c8ad28fb75a559')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  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 23cc4cd5b..000000000
--- a/testing/xf86-video-nouveau/xf86-video-nouveau.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_install () {
-   cat << _EOF
-  ==> make sure you use KernelModeSetting (KMS)
-  ==> see http://wiki.archlinux.org/index.php/Nouveau#KMS for more
-_EOF
-}
diff --git a/testing/xf86-video-openchrome/PKGBUILD b/testing/xf86-video-openchrome/PKGBUILD
deleted file mode 100644
index 6a8b8d02e..000000000
--- a/testing/xf86-video-openchrome/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168233 2012-10-06 20:07:51Z andyrtr $
-# Contributor: Paul Mattal <paul@mattal.com>
-# Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
-
-pkgname=xf86-video-openchrome
-pkgver=0.3.1
-pkgrel=2
-pkgdesc="X.Org Openchrome drivers"
-arch=(i686 x86_64)
-license=('custom')
-url="http://www.openchrome.org"
-depends=('libdrm' 'libxvmc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
-replaces=('openchrome' 'xf86-video-via')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs' '!makeflags')
-source=(http://xorg.freedesktop.org/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('89e56dcfe851345f72c61a95b4fa5ab6ad7e0d83')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-r128/PKGBUILD b/testing/xf86-video-r128/PKGBUILD
deleted file mode 100644
index 6a3cfca23..000000000
--- a/testing/xf86-video-r128/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168234 2012-10-06 20:07:55Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-r128
-pkgver=6.9.1
-pkgrel=2
-pkgdesc="X.org ati Rage128 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('r128-dri: DRI1 support from community repo')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8be3baa8d3b19e3a05f00a53bf35784e144dc2ad14c358f97870c072e634e44c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-rendition/PKGBUILD b/testing/xf86-video-rendition/PKGBUILD
deleted file mode 100644
index 40dd8b335..000000000
--- a/testing/xf86-video-rendition/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168235 2012-10-06 20:07:58Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-rendition
-pkgver=4.2.5
-pkgrel=2
-pkgdesc="X.org Rendition video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool' '!strip')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('930e99e4d44418b1e55f11a2a8525b42b0e2d3b5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  strip --strip-unneeded "${pkgdir}/usr/lib/xorg/modules/drivers/rendition_drv.so"
-}
diff --git a/testing/xf86-video-s3/PKGBUILD b/testing/xf86-video-s3/PKGBUILD
deleted file mode 100644
index 0cceaf7b1..000000000
--- a/testing/xf86-video-s3/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168236 2012-10-06 20:08:02Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-s3
-pkgver=0.6.5
-pkgrel=2
-pkgdesc="X.org S3 video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-s3virge/PKGBUILD b/testing/xf86-video-s3virge/PKGBUILD
deleted file mode 100644
index ec5fa6832..000000000
--- a/testing/xf86-video-s3virge/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168237 2012-10-06 20:08:06Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-s3virge
-pkgver=1.10.6
-pkgrel=2
-pkgdesc="X.org S3 Virge video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
-
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-savage/PKGBUILD b/testing/xf86-video-savage/PKGBUILD
deleted file mode 100644
index 07fd25006..000000000
--- a/testing/xf86-video-savage/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168238 2012-10-06 20:08:09Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-savage
-pkgver=2.3.6
-pkgrel=2
-pkgdesc="X.org savage video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('savage-dri: DRI1 support from community repo')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR="${pkgdir}" install
-
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-siliconmotion/PKGBUILD b/testing/xf86-video-siliconmotion/PKGBUILD
deleted file mode 100644
index 460c8f39f..000000000
--- a/testing/xf86-video-siliconmotion/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168239 2012-10-06 20:08:13Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-pkgname=xf86-video-siliconmotion
-pkgver=1.7.7
-pkgrel=2
-pkgdesc="X.org siliconmotion video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('87b8b59d43945d4fc8012860c0bd9aed42c4684a943355c607b8eb8d6710c3aa')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-sis/PKGBUILD b/testing/xf86-video-sis/PKGBUILD
deleted file mode 100644
index 29e11db1f..000000000
--- a/testing/xf86-video-sis/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 168240 2012-10-06 20:08:16Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sis
-pkgver=0.10.7
-pkgrel=2
-pkgdesc="X.org SiS video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('sis-dri: DRI1 support from community repo')
-options=('!libtool')
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-sisusb/PKGBUILD b/testing/xf86-video-sisusb/PKGBUILD
deleted file mode 100644
index 28c4fc5a0..000000000
--- a/testing/xf86-video-sisusb/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168241 2012-10-06 20:08:19Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-sisusb
-pkgver=0.9.6
-pkgrel=2
-pkgdesc="X.org SiS USB video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-tdfx/PKGBUILD b/testing/xf86-video-tdfx/PKGBUILD
deleted file mode 100644
index 957a803bc..000000000
--- a/testing/xf86-video-tdfx/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168242 2012-10-06 20:08:23Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-tdfx
-pkgver=1.4.5
-pkgrel=2
-pkgdesc="X.org tdfx video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-optdepends=('tdfx-dri: DRI1 support from community repo')
-options=(!libtool)
-groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  cd ${srcdir}/${pkgname}*
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-trident/PKGBUILD b/testing/xf86-video-trident/PKGBUILD
deleted file mode 100644
index 4edcbe491..000000000
--- a/testing/xf86-video-trident/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 168243 2012-10-06 20:08:27Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-trident
-pkgver=1.3.6
-pkgrel=2
-pkgdesc="X.org Trident video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=(!libtool)
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-tseng/PKGBUILD b/testing/xf86-video-tseng/PKGBUILD
deleted file mode 100644
index 209f98dd4..000000000
--- a/testing/xf86-video-tseng/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 168244 2012-10-06 20:08:30Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-tseng
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="X.org tseng video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-v4l/LICENSE b/testing/xf86-video-v4l/LICENSE
deleted file mode 100644
index 535595b88..000000000
--- a/testing/xf86-video-v4l/LICENSE
+++ /dev/null
@@ -1,826 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/driver/
-
-                                  Licenses
-
-                            The X.Org Foundation
-
-                                 March 2004
-
-1.  Introduction
-
-The X.org Foundation X Window System distribution is a compilation of code
-and documentation from many sources.  This document is intended primarily as
-a guide to the licenses used in the distribution: you must check each file
-and/or package for precise redistribution terms. None-the-less, this summary
-may be useful to many users.  No software incorporating the XFree86 1.1
-license has been incorporated.
-
-This document is based on the compilation from XFree86.
-
-2.  XFree86 License
-
-XFree86 code without an explicit copyright is covered by the following copy-
-right/license:
-
-Copyright (C) 1994-2003 The XFree86 Project, Inc.  All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
-
-3.  Other Licenses
-
-Portions of code are covered by the following licenses/copyrights.  See indi-
-vidual files for the copyright dates.
-
-3.1  X/MIT Copyrights
-
-3.1.1  X Consortium
-
-Copyright (C) <date> X Consortium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE X
-CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the X Consortium shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from the X Consortium.
-
-X Window System is a trademark of X Consortium, Inc.
-
-3.1.2  The Open Group
-
-Copyright <date>  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-3.2  Berkeley-based copyrights:
-
-o
-
-3.2.1  General
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.2  UCB/LBL
-
-Copyright (c) 1993 The Regents of the University of California.  All rights
-reserved.
-
-This software was developed by the Computer Systems Engineering group at
-Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and contributed to
-Berkeley.
-
-All advertising materials mentioning features or use of this software must
-display the following acknowledgement: This product includes software devel-
-oped by the University of California, Lawrence Berkeley Laboratory.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  All advertising materials mentioning features or use of this software
-      must display the following acknowledgement: This product includes soft-
-      ware developed by the University of California, Berkeley and its con-
-      tributors.
-
-  4.  Neither the name of the University nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DIS-
-CLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.3  The NetBSD Foundation, Inc.
-
-Copyright (c) 2003 The NetBSD Foundation, Inc.  All rights reserved.
-
-This code is derived from software contributed to The NetBSD Foundation by
-Ben Collver <collver1@attbi.com>
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.   All advertising materials mentioning features or use of this software
-      must display the following acknowledgement: This product includes soft-
-      ware developed by the NetBSD Foundation, Inc. and its contributors.
-
-  4.   Neither the name of The NetBSD Foundation nor the names of its con-
-      tributors may be used to endorse or promote products derived from this
-      software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE-
-QUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
-OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAM-
-AGE.
-
-3.2.4  Theodore Ts'o.
-
-Copyright Theodore Ts'o, 1994, 1995, 1996, 1997, 1998, 1999.  All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.  Redistributions of source code must retain the above copyright notice,
-      and the entire permission notice in its entirety, including the dis-
-      claimer of warranties.
-
-  2.  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.  he name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH ARE HEREBY DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF NOT
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.5  Theo de Raadt and Damien Miller
-
-Copyright (c) 1995,1999 Theo de Raadt.  All rights reserved.  Copyright (c)
-2001-2002 Damien Miller.  All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.2.6  Todd C. Miller
-
-Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-
-Permission to use, copy, modify, and distribute this software for any purpose
-with or without fee is hereby granted, provided that the above copyright
-notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND TODD C. MILLER DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MER-
-CHANTABILITY AND FITNESS. IN NO EVENT SHALL TODD C. MILLER BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CON-
-TRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-3.2.7  Thomas Winischhofer
-
-Copyright (C) 2001-2004 Thomas Winischhofer
-
-Redistribution and use in source and binary forms, with or without modifica-
-tion, are permitted provided that the following conditions are met:
-
-  1.   Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-  2.   Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-  3.   The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESSED OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
-CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
-ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-3.3  NVIDIA Corp
-
-Copyright (c) 1996 NVIDIA, Corp.  All rights reserved.
-
-NOTICE TO USER: The source code is copyrighted under U.S. and international
-laws.  NVIDIA, Corp. of Sunnyvale, California owns the copyright and as
-design patents pending on the design and interface of the NV chips.  Users
-and possessors of this source code are hereby granted a nonexclusive, roy-
-alty-free copyright and design patent license to use this code in individual
-and commercial software.
-
-Any use of this source code must include, in the user documentation and
-internal comments to the code, notices to the end user as follows:
-
-Copyright (c) 1996 NVIDIA, Corp.  NVIDIA design patents pending in the U.S.
-and foreign countries.
-
-NVIDIA, CORP.  MAKES NO REPRESENTATION ABOUT THE SUITABILITY OF THIS SOURCE
-CODE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR IMPLIED WAR-
-RANTY OF ANY KIND.  NVIDIA, CORP. DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOURCE CODE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE.  IN NO EVENT SHALL NVIDIA, CORP.  BE LIABLE
-FOR ANY SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, OR ANY DAM-
-AGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOURCE CODE.
-
-3.4  GLX Public License
-
-GLX PUBLIC LICENSE (Version 1.0 (2/11/99)) ("License")
-
-Subject to any third party claims, Silicon Graphics, Inc. ("SGI") hereby
-grants permission to Recipient (defined below), under Recipient's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below), and to permit persons to whom the Subject Software is furnished in
-accordance with this License to do the same, subject to all of the following
-terms and conditions, which Recipient accepts by engaging in any such use,
-copying, modifying, merging, publishing, distributing, sublicensing or sell-
-ing:
-
-1. Definitions.
-
-     (a) "Original Software" means source code of computer software code
-     which is described in Exhibit A as Original Software.
-
-     (b) "Modifications" means any addition to or deletion from the sub-
-     stance or structure of either the Original Software or any previous
-     Modifications. When Subject Software is released as a series of
-     files, a Modification means (i) any addition to or deletion from
-     the contents of a file containing Original Software or previous
-     Modifications and (ii) any new file that contains any part of the
-     Original Code or previous Modifications.
-
-     (c) "Subject Software" means the Original Software or Modifications
-     or the combination of the Original Software and Modifications, or
-     portions of any of the foregoing.
-
-     (d) "Recipient" means an individual or a legal entity exercising
-     rights under, and complying with all of the terms of, this License.
-     For legal entities, "Recipient" includes any entity which controls,
-     is controlled by, or is under common control with Recipient. For
-     purposes of this definition, "control" of an entity means (a) the
-     power, direct or indirect, to direct or manage such entity, or (b)
-     ownership of fifty percent (50%) or more of the outstanding shares
-     or beneficial ownership of such entity.
-
-2. Redistribution of Source Code Subject to These Terms. Redistributions of
-Subject Software in source code form must retain the notice set forth in
-Exhibit A, below, in every file. A copy of this License must be included in
-any documentation for such Subject Software where the recipients' rights
-relating to Subject Software are described. Recipient may distribute the
-source code version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 2 and Sections 3, 4, 7, 8, 10, 12 and 13
-of this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the source code version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-3. Redistribution in Executable Form. The notice set forth in Exhibit A must
-be conspicuously included in any notice in an executable version of Subject
-Software, related documentation or collateral in which Recipient describes
-the user's rights relating to the Subject Software. Recipient may distribute
-the executable version of Subject Software under a license of Recipient's
-choice, which may contain terms different from this License, provided that
-(i) Recipient is in compliance with the terms of this License, and (ii) the
-license terms include this Section 3 and Sections 4, 7, 8, 10, 12 and 13 of
-this License, which terms may not be modified or superseded by any other
-terms of such license. If Recipient distributes the executable version under
-a different license Recipient must make it absolutely clear that any terms
-which differ from this License are offered by Recipient alone, not by SGI.
-Recipient hereby agrees to indemnify SGI for any liability incurred by SGI as
-a result of any such terms Recipient offers.
-
-4. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software which is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-5. No Trademark Rights. This License does not grant any rights to use any
-trade name, trademark or service mark whatsoever. No trade name, trademark or
-service mark of SGI may be used to endorse or promote products derived from
-the Subject Software without prior written permission of SGI.
-
-6. No Other Rights. This License does not grant any rights with respect to
-the OpenGL API or to any software or hardware implementation thereof or to
-any other software whatsoever, nor shall any other rights or licenses not
-expressly granted hereunder arise by implication, estoppel or otherwise with
-respect to the Subject Software. Title to and ownership of the Original Soft-
-ware at all times remains with SGI. All rights in the Original Software not
-expressly granted under this License are reserved.
-
-7. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-8. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Exhibit A notice required under Sec-
-tions 2 and 3, above, and in the text of any related documentation, license
-agreement or collateral in which Recipient describes end user's rights relat-
-ing to the Subject Software. If Recipient obtains such knowledge after it
-makes Subject Software available to any other person or entity, Recipient
-shall take other steps (such as notifying appropriate mailing lists or news-
-groups) reasonably calculated to inform those who received the Subject Soft-
-ware that new knowledge has been obtained.
-
-9. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON- INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-10. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THE-
-ORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIA-
-BILITY), CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR
-ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK
-STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF
-THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY
-TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SGI's NEGLIGENCE TO
-THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO
-NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO RECIPIENT.
-
-11. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold harmless Silicon Graphics, Inc.
-from and against any loss, liability, damages, costs or expenses (including
-the payment of reasonable attorneys fees) arising out of Recipient's use,
-modification, reproduction and distribution of the Subject Software or out of
-any representation or warranty made by Recipient.
-
-12. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S.  Government End
-Users acquire only the rights set forth in this License and are subject to
-the terms of this License.
-
-13. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable, such provision shall be reformed so as to achieve as nearly as
-possible the same economic effect as the original provision and the remainder
-of this License will remain in effect. This License shall be governed by and
-construed in accordance with the laws of the United States and the State of
-California as applied to agreements entered into and to be performed entirely
-within California between California residents. Any litigation relating to
-this License shall be subject to the exclusive jurisdiction of the Federal
-Courts of the Northern District of California (or, absent subject matter
-jurisdiction in such courts, the courts of the State of California), with
-venue lying exclusively in Santa Clara County, California, with the losing
-party responsible for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses. The application of the United Nations
-Convention on Contracts for the International Sale of Goods is expressly
-excluded. Any law or regulation which provides that the language of a con-
-tract shall be construed against the drafter shall not apply to this License.
-
-Exhibit A
-
-The contents of this file are subject to Sections 2, 3, 4, 7, 8, 10, 12 and
-13 of the GLX Public License Version 1.0 (the "License"). You may not use
-this file except in compliance with those sections of the License. You may
-obtain a copy of the License at Silicon Graphics, Inc., attn: Legal Services,
-2011 N. Shoreline Blvd., Mountain View, CA 94043 or at
-http://www.sgi.com/software/opensource/glx/license.html.
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software is GLX version 1.2 source code, released February,
-1999. The developer of the Original Software is Silicon Graphics, Inc.  Those
-portions of the Subject Software created by Silicon Graphics, Inc.  are Copy-
-right (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-3.5  CID Font Code Public License
-
-CID FONT CODE PUBLIC LICENSE (Version 1.0 (3/31/99))("License")
-
-Subject to any applicable third party claims, Silicon Graphics, Inc. ("SGI")
-hereby grants permission to Recipient (defined below), under SGI's copyrights
-in the Original Software (defined below), to use, copy, modify, merge, pub-
-lish, distribute, sublicense and/or sell copies of Subject Software (defined
-below) in both source code and executable form, and to permit persons to whom
-the Subject Software is furnished in accordance with this License to do the
-same, subject to all of the following terms and conditions, which Recipient
-accepts by engaging in any such use, copying, modifying, merging, publica-
-tion, distributing, sublicensing or selling:
-
-1. Definitions.
-
-     a. "Original Software" means source code of computer software code
-     that is described in Exhibit A as Original Software.
-
-     b. "Modifications" means any addition to or deletion from the sub-
-     stance or structure of either the Original Software or any previous
-     Modifications. When Subject Software is released as a series of
-     files, a Modification means (i) any addition to or deletion from
-     the contents of a file containing Original Software or previous
-     Modifications and (ii) any new file that contains any part of the
-     Original Code or previous Modifications.
-
-     c. "Subject Software" means the Original Software or Modifications
-     or the combination of the Original Software and Modifications, or
-     portions of any of the foregoing.
-
-     d. "Recipient" means an individual or a legal entity exercising
-     rights under the terms of this License. For legal entities, "Recip-
-     ient" includes any entity that controls, is controlled by, or is
-     under common control with Recipient. For purposes of this defini-
-     tion, "control" of an entity means (i) the power, direct or indi-
-     rect, to direct or manage such entity, or (ii) ownership of fifty
-     percent (50%) or more of the outstanding shares or beneficial own-
-     ership of such entity.
-
-     e. "Required Notice" means the notice set forth in Exhibit A to
-     this License.
-
-     f. "Accompanying Technology" means any software or other technology
-     that is not a Modification and that is distributed or made publicly
-     available by Recipient with the Subject Software.  Separate soft-
-     ware files that do not contain any Original Software or any previ-
-     ous Modification shall not be deemed a Modification, even if such
-     software files are aggregated as part of a product, or in any
-     medium of storage, with any file that does contain Original Soft-
-     ware or any previous Modification.
-
-2. License Terms. All distribution of the Subject Software must be made sub-
-ject to the terms of this License. A copy of this License and the Required
-Notice must be included in any documentation for Subject Software where
-Recipient's rights relating to Subject Software and/or any Accompanying Tech-
-nology are described. Distributions of Subject Software in source code form
-must also include the Required Notice in every file distributed. In addition,
-a ReadMe file entitled "Important Legal Notice" must be distributed with each
-distribution of one or more files that incorporate Subject Software. That
-file must be included with distributions made in both source code and exe-
-cutable form. A copy of the License and the Required Notice must be included
-in that file.  Recipient may distribute Accompanying Technology under a
-license of Recipient's choice, which may contain terms different from this
-License, provided that (i) Recipient is in compliance with the terms of this
-License, (ii) such other license terms do not modify or supersede the terms
-of this License as applicable to the Subject Software, (iii) Recipient hereby
-indemnifies SGI for any liability incurred by SGI as a result of the distri-
-bution of Accompanying Technology or the use of other license terms.
-
-3. Termination. This License and the rights granted hereunder will terminate
-automatically if Recipient fails to comply with terms herein and fails to
-cure such breach within 30 days of the breach. Any sublicense to the Subject
-Software that is properly granted shall survive any termination of this
-License absent termination by the terms of such sublicense. Provisions which,
-by their nature, must remain in effect beyond the termination of this License
-shall survive.
-
-4. Trademark Rights. This License does not grant any rights to use any trade
-name, trademark or service mark whatsoever. No trade name, trademark or ser-
-vice mark of SGI may be used to endorse or promote products derived from or
-incorporating any Subject Software without prior written permission of SGI.
-
-5. No Other Rights. No rights or licenses not expressly granted hereunder
-shall arise by implication, estoppel or otherwise. Title to and ownership of
-the Original Software at all times remains with SGI. All rights in the Origi-
-nal Software not expressly granted under this License are reserved.
-
-6. Compliance with Laws; Non-Infringement. Recipient shall comply with all
-applicable laws and regulations in connection with use and distribution of
-the Subject Software, including but not limited to, all export and import
-control laws and regulations of the U.S. government and other countries.
-Recipient may not distribute Subject Software that (i) in any way infringes
-(directly or contributorily) the rights (including patent, copyright, trade
-secret, trademark or other intellectual property rights of any kind) of any
-other person or entity, or (ii) breaches any representation or warranty,
-express, implied or statutory, which under any applicable law it might be
-deemed to have been distributed.
-
-7. Claims of Infringement. If Recipient at any time has knowledge of any one
-or more third party claims that reproduction, modification, use, distribu-
-tion, import or sale of Subject Software (including particular functionality
-or code incorporated in Subject Software) infringes the third party's intel-
-lectual property rights, Recipient must place in a well-identified web page
-bearing the title "LEGAL" a description of each such claim and a description
-of the party making each such claim in sufficient detail that a user of the
-Subject Software will know whom to contact regarding the claim. Also, upon
-gaining such knowledge of any such claim, Recipient must conspicuously
-include the URL for such web page in the Required Notice, and in the text of
-any related documentation, license agreement or collateral in which Recipient
-describes end user's rights relating to the Subject Software. If Recipient
-obtains such knowledge after it makes Subject Software available to any other
-person or entity, Recipient shall take other steps (such as notifying appro-
-priate mailing lists or newsgroups) reasonably calculated to provide such
-knowledge to those who received the Subject Software.
-
-8. DISCLAIMER OF WARRANTY. SUBJECT SOFTWARE IS PROVIDED ON AN "AS IS" BASIS,
-WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MER-
-CHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. SGI ASSUMES NO
-RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE. SHOULD ANY SOFTWARE
-PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SER-
-VICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED
-HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-9. LIMITATION OF LIABILITY. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
-WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY),
-CONTRACT, OR OTHERWISE, SHALL SGI OR ANY SGI LICENSOR BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SUBJECT SOFTWARE OR
-THE USE OR OTHER DEALINGS IN THE SUBJECT SOFTWARE. SOME JURISDICTIONS DO NOT
-ALLOW THE EXCLUSION OR LIMITATION OF CERTAIN DAMAGES, SO THIS EXCLUSION AND
-LIMITATION MAY NOT APPLY TO RECIPIENT TO THE EXTENT SO DISALLOWED.
-
-10. Indemnity. Recipient shall be solely responsible for damages arising,
-directly or indirectly, out of its utilization of rights under this License.
-Recipient will defend, indemnify and hold SGI and its successors and assigns
-harmless from and against any loss, liability, damages, costs or expenses
-(including the payment of reasonable attorneys fees) arising out of (Recipi-
-ent's use, modification, reproduction and distribution of the Subject Soft-
-ware or out of any representation or warranty made by Recipient.
-
-11. U.S. Government End Users. The Subject Software is a "commercial item"
-consisting of "commercial computer software" as such terms are defined in
-title 48 of the Code of Federal Regulations and all U.S. Government End Users
-acquire only the rights set forth in this License and are subject to the
-terms of this License.
-
-12. Miscellaneous. This License represents the complete agreement concerning
-subject matter hereof. If any provision of this License is held to be unen-
-forceable by any judicial or administrative authority having proper jurisdic-
-tion with respect thereto, such provision shall be reformed so as to achieve
-as nearly as possible the same economic effect as the original provision and
-the remainder of this License will remain in effect. This License shall be
-governed by and construed in accordance with the laws of the United States
-and the State of California as applied to agreements entered into and to be
-performed entirely within California between California residents. Any liti-
-gation relating to this License shall be subject to the exclusive jurisdic-
-tion of the Federal Courts of the Northern District of California (or, absent
-subject matter jurisdiction in such courts, the courts of the State of Cali-
-fornia), with venue lying exclusively in Santa Clara County, California, with
-the losing party responsible for costs, including without limitation, court
-costs and reasonable attorneys fees and expenses. The application of the
-United Nations Convention on Contracts for the International Sale of Goods is
-expressly excluded. Any law or regulation that provides that the language of
-a contract shall be construed against the drafter shall not apply to this
-License.
-
-Exhibit A
-
-Copyright (c) 1994-1999 Silicon Graphics, Inc.
-
-The contents of this file are subject to the CID Font Code Public License
-Version 1.0 (the "License"). You may not use this file except in compliance
-with the License. You may obtain a copy of the License at Silicon Graphics,
-Inc., attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-or at http://www.sgi.com/software/opensource/cid/license.html
-
-Software distributed under the License is distributed on an "AS IS" basis.
-ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED
-WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE OR OF NON-
-INFRINGEMENT. See the License for the specific language governing rights and
-limitations under the License.
-
-The Original Software (as defined in the License) is CID font code that was
-developed by Silicon Graphics, Inc. Those portions of the Subject Software
-(as defined in the License) that were created by Silicon Graphics, Inc. are
-Copyright (c) 1994-1999 Silicon Graphics, Inc. All Rights Reserved.
-
-[NOTE: When using this text in connection with Subject Software delivered
-solely in object code form, Recipient may replace the words "this file" with
-"this software" in both the first and second sentences.]
-
-3.6  Bitstream Vera Fonts Copyright
-
-The fonts have a generous copyright, allowing derivative works (as long as
-"Bitstream" or "Vera" are not in the names), and full redistribution (so long
-as they are not *sold* by themselves). They can be be bundled, redistributed
-and sold with any software.
-
-The fonts are distributed under the following copyright:
-
-Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
-a trademark of Bitstream, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of the fonts accompanying this license ("Fonts") and associated documentation
-files (the "Font Software"), to reproduce and distribute the Font Software,
-including without limitation the rights to use, copy, merge, publish, dis-
-tribute, and/or sell copies of the Font Software, and to permit persons to
-whom the Font Software is furnished to do so, subject to the following condi-
-tions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software typefaces.
-
-The Font Software may be modified, altered, or added to, and in particular
-the designs of glyphs or characters in the Fonts may be modified and addi-
-tional glyphs or characters may be added to the Fonts, only if the fonts are
-renamed to names not containing either the words "Bitstream" or the word
-"Vera".
-
-This License becomes null and void to the extent applicable to Fonts or Font
-Software that has been modified and is distributed under the "Bitstream Vera"
-names.
-
-The Font Software may be sold as part of a larger software package but no
-copy of one or more of the Font Software typefaces may be sold by itself.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDA-
-TION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Gnome, the Gnome Foundation,
-and Bitstream Inc., shall not be used in advertising or otherwise to promote
-the sale, use or other dealings in this Font Software without prior written
-authorization from the Gnome Foundation or Bitstream Inc., respectively. For
-further information, contact: fonts at gnome dot org.
-
-3.7  Bigelow & Holmes Inc and URW++ GmbH Luxi font license
-
-Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font instruction
-code copyright (c) 2001 by URW++ GmbH. All Rights Reserved. Luxi is a regis-
-tered trademark of Bigelow & Holmes Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of these Fonts and associated documentation files (the "Font Software"), to
-deal in the Font Software, including without limitation the rights to use,
-copy, merge, publish, distribute, sublicense, and/or sell copies of the Font
-Software, and to permit persons to whom the Font Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright and trademark notices and this permission notice shall be
-included in all copies of one or more of the Font Software.
-
-The Font Software may not be modified, altered, or added to, and in particu-
-lar the designs of glyphs or characters in the Fonts may not be modified nor
-may additional glyphs or characters be added to the Fonts. This License
-becomes null and void when the Fonts or Font Software have been modified.
-
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL BIGELOW & HOLMES INC. OR URW++
-GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GEN-
-ERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
-ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFT-
-WARE.
-
-Except as contained in this notice, the names of Bigelow & Holmes Inc. and
-URW++ GmbH. shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Font Software without prior written
-authorization from Bigelow & Holmes Inc. and URW++ GmbH.
-
-For further information, contact:
-
-info@urwpp.de or design@bigelowandholmes.com
-
-     $Id: LICENSE,v 1.3 2004/09/03 23:41:21 kem Exp $
diff --git a/testing/xf86-video-v4l/PKGBUILD b/testing/xf86-video-v4l/PKGBUILD
deleted file mode 100644
index 0abdbe466..000000000
--- a/testing/xf86-video-v4l/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 168245 2012-10-06 20:08:37Z andyrtr $
-#Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-v4l
-pkgver=0.2.0
-pkgrel=11
-pkgdesc="X.org v4l video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        git-fixes.patch
-        LICENSE)
-md5sums=('2251ae2a0a905764941cd7b098e85ad1'
-         'cdb7113a9564ea9202e847de88440540'
-         '7d4d018f6bbff7e42672d1aabc75c5cf')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/git-fixes.patch"
-  autoreconf -fi
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-v4l/git-fixes.patch b/testing/xf86-video-v4l/git-fixes.patch
deleted file mode 100644
index 2f752fc8c..000000000
--- a/testing/xf86-video-v4l/git-fixes.patch
+++ /dev/null
@@ -1,4362 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-deleted file mode 100644
-index 02fc6fa..0000000
---- a/ChangeLog
-+++ /dev/null
-@@ -1,57 +0,0 @@
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/v4l.c:
--	Bump to 0.1.1 for Xv changes.
--
--2006-04-07  Aaron Plattner  <aplattner@nvidia.com>
--
--	* src/v4l.c: (V4lPutVideo), (V4lPutStill):
--	Add a DrawablePtr argument to the XV functions to pave the way for
--	redirected video.
--
--2006-04-07  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	* src/v4l.c:
--	Unlibcwrap.  Bump server version requirement.  Bump to 0.1.0.
--
--2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version for X11R7 release.
--
--2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for final X11R7 release candidate.
--
--2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* man/Makefile.am:
--	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
--
--2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC3 release.
--
--2005-12-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Remove extraneous AC_MSG_RESULT.
--
--2005-11-29  Adam Jackson  <ajax@freedesktop.org>
--
--	* configure.ac:
--	Only build dlloader modules by default.
--
--2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update package version number for X11R7 RC2 release.
--
--2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
--
--	* configure.ac:
--	Update pkgcheck dependencies to work with separate build roots.
-diff --git a/Makefile.am b/Makefile.am
-index 3ae2692..4c278ba 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,6 +18,15 @@
- #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- 
--AUTOMAKE_OPTIONS = foreign
- SUBDIRS = src man
--EXTRA_DIST = README
-+MAINTAINERCLEANFILES = ChangeLog INSTALL
-+
-+.PHONY: ChangeLog INSTALL
-+
-+INSTALL:
-+	$(INSTALL_CMD)
-+
-+ChangeLog:
-+	$(CHANGELOG_CMD)
-+
-+dist-hook: ChangeLog INSTALL
-diff --git a/configure.ac b/configure.ac
-index d9ac542..c490919 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,57 +20,56 @@
- #
- # Process this file with autoconf to produce a configure script
- 
--AC_PREREQ(2.57)
-+# Initialize Autoconf
-+AC_PREREQ([2.60])
- AC_INIT([xf86-video-v4l],
--        0.2.0,
-+        [0.2.0],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
--        xf86-video-v4l)
--
-+        [xf86-video-v4l])
- AC_CONFIG_SRCDIR([Makefile.am])
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_AUX_DIR(.)
- 
--AM_INIT_AUTOMAKE([dist-bzip2])
--
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
- AM_MAINTAINER_MODE
- 
--# Checks for programs.
-+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-+m4_ifndef([XORG_MACROS_VERSION],
-+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-+XORG_MACROS_VERSION(1.8)
-+XORG_DEFAULT_OPTIONS
-+
-+# Initialize libtool
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
--AC_PROG_CC
- 
- AH_TOP([#include "xorg-server.h"])
- 
-+# Define a configure option for an alternate module directory
- AC_ARG_WITH(xorg-module-dir,
--            AC_HELP_STRING([--with-xorg-module-dir=DIR],
-+            AS_HELP_STRING([--with-xorg-module-dir=DIR],
-                            [Default xorg module directory [[default=$libdir/xorg/modules]]]),
-             [moduledir="$withval"],
-             [moduledir="$libdir/xorg/modules"])
- 
--# Checks for extensions
-+# Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(XV, videoproto)
- 
--# Checks for pkg-config packages
-+# Obtain compiler/linker options for the driver dependencies
- PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
--sdkdir=$(pkg-config --variable=sdkdir xorg-server)
- 
- # Checks for libraries.
- 
--# Checks for header files.
--AC_HEADER_STDC
--
--AC_SUBST([XORG_CFLAGS])
- AC_SUBST([moduledir])
- 
- DRIVER_NAME=v4l
- AC_SUBST([DRIVER_NAME])
- 
--XORG_MANPAGE_SECTIONS
--XORG_RELEASE_VERSION
--
--AC_OUTPUT([
--	Makefile
--	src/Makefile
--	man/Makefile
-+AC_CONFIG_FILES([
-+                Makefile
-+                src/Makefile
-+                man/Makefile
- ])
-+AC_OUTPUT
-diff --git a/man/Makefile.am b/man/Makefile.am
-index f0eb29b..b3688ce 100644
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -1,27 +1,24 @@
- #
- # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
--# 
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation.
--# 
--# The above copyright notice and this permission notice shall be included
--# in all copies or substantial portions of the Software.
--# 
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
--# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
--# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
--# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
--# OTHER DEALINGS IN THE SOFTWARE.
--# 
--# Except as contained in this notice, the name of the copyright holders shall
--# not be used in advertising or otherwise to promote the sale, use or
--# other dealings in this Software without prior written authorization
--# from the copyright holders.
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice (including the next
-+# paragraph) shall be included in all copies or substantial portions of the
-+# Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
- # 
- 
- drivermandir = $(DRIVER_MAN_DIR)
-@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man
- 
- CLEANFILES = $(driverman_DATA)
- 
--SED = sed
- 
--# Strings to replace in man pages
--XORGRELSTRING = @PACKAGE_STRING@
--  XORGMANNAME = X Version 11
-+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
- 
--MAN_SUBSTS = \
--	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
--	-e 's|__xservername__|Xorg|g' \
--	-e 's|__xconfigfile__|xorg.conf|g' \
--	-e 's|__projectroot__|$(prefix)|g' \
--	-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
--	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
--	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
--	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
--	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
- 
- SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
- 
- .man.$(DRIVER_MAN_SUFFIX):
--	sed $(MAN_SUBSTS) < $< > $@
-+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
-diff --git a/man/v4l.man b/man/v4l.man
-index 7d35b86..dc1e201 100644
---- a/man/v4l.man
-+++ b/man/v4l.man
-@@ -34,6 +34,6 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
- details.  This section only covers configuration details specific to this
- driver.
- .SH "SEE ALSO"
--__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
-+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
- .SH AUTHORS
- Authors include: Gerd Knorr <kraxel@bytesex.org>
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ed30a80..08afe60 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -28,7 +28,6 @@ v4l_drv_la_LTLIBRARIES = v4l_drv.la
- v4l_drv_la_LDFLAGS = -module -avoid-version
- v4l_drv_ladir = @moduledir@/drivers
- 
--v4l_drv_la_SOURCES = \
--         v4l.c
--
--EXTRA_DIST = videodev.h
-+v4l_drv_la_SOURCES =	\
-+	v4l.c		\
-+	videodev.h
-diff --git a/src/v4l.c b/src/v4l.c
-index b827f80..10e782b 100644
---- a/src/v4l.c
-+++ b/src/v4l.c
-@@ -1,6 +1,9 @@
- /*
-- *  video4linux Xv Driver 
-+ *  video4linux Xv Driver
-  *  based on Michael Schimek's permedia 2 driver.
-+ *
-+ * Copyright (c) 2011 Mauro Carvalho Chehab <mchehab@redhat.com> for:
-+ *	- Major rewrite, as driver got ported to V4L2 API
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -9,12 +12,16 @@
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <ctype.h>
-+
- #include <fcntl.h>
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-+#include <unistd.h>
-+#include <sys/ioctl.h>
- 
--#include "videodev.h"
-+#include "videodev2.h"
- #include "xf86.h"
- #include "xf86_OSproc.h"
- #include "xf86Pci.h"
-@@ -25,8 +32,9 @@
- #include "regionstr.h"
- #include "dgaproc.h"
- #include "xf86str.h"
-+#include "fourcc.h"
- 
--#include <asm/ioctl.h>		/* _IORW(xxx) #defines are here */
-+#include <asm/ioctl.h>          /* _IORW(xxx) #defines are here */
- 
- #if 0
- # define DEBUG(x) (x)
-@@ -34,20 +42,22 @@
- # define DEBUG(x)
- #endif
- 
-+/***************************************************************************/
-+
- static void     V4LIdentify(int flags);
- static Bool     V4LProbe(DriverPtr drv, int flags);
- static const OptionInfoRec * V4LAvailableOptions(int chipid, int busid);
- 
- _X_EXPORT DriverRec V4L = {
--        40000,
--        "v4l",
--        V4LIdentify, /* Identify*/
--        V4LProbe, /* Probe */
--	V4LAvailableOptions,
--        NULL,
--        0
--};    
--
-+    .driverVersion = 50000,
-+    .driverName = "v4l",
-+    .Identify = V4LIdentify,
-+    .Probe = V4LProbe,
-+    .AvailableOptions = V4LAvailableOptions,
-+    .module = NULL,
-+    .refCount = 0,
-+    .driverFunc = NULL,   /* FIXME: Need to implement for new probing mode */
-+};
- 
- #ifdef XFree86LOADER
- 
-@@ -55,16 +65,16 @@ static MODULESETUPPROTO(v4lSetup);
- 
- static XF86ModuleVersionInfo v4lVersRec =
- {
--        "v4l",
--        MODULEVENDORSTRING,
--        MODINFOSTRING1,
--        MODINFOSTRING2,
--        XORG_VERSION_CURRENT,
--        0, 1, 1,
--        ABI_CLASS_VIDEODRV,
--        ABI_VIDEODRV_VERSION,
--        MOD_CLASS_NONE,
--        {0,0,0,0}
-+    "v4l",
-+    MODULEVENDORSTRING,
-+    MODINFOSTRING1,
-+    MODINFOSTRING2,
-+    XORG_VERSION_CURRENT,
-+    0, 1, 1,
-+    ABI_CLASS_VIDEODRV,
-+    ABI_VIDEODRV_VERSION,
-+    MOD_CLASS_NONE,
-+    {0,0,0,0}
- };
- 
- _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
-@@ -72,32 +82,32 @@ _X_EXPORT XF86ModuleData v4lModuleData = { &v4lVersRec, v4lSetup, NULL };
- static pointer
- v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- {
--        const char *osname;
--	static Bool setupDone = FALSE;
--
--	if (setupDone) {
--	    if (errmaj)
--		*errmaj = LDR_ONCEONLY;
--	    return NULL;             
--	}
--	
--	setupDone = TRUE;
--
--        /* Check that we're being loaded on a Linux system */
--        LoaderGetOS(&osname, NULL, NULL, NULL);
--        if (!osname || strcmp(osname, "linux") != 0) {
--                if (errmaj)
--                        *errmaj = LDR_BADOS;
--                if (errmin)
--                        *errmin = 0;
--                return NULL;
--        } else {
--                /* OK */
--
--	        xf86AddDriver (&V4L, module, 0);   
--	  
--                return (pointer)1;
--        }
-+    const char *osname;
-+    static Bool setupDone = FALSE;
-+
-+    if (setupDone) {
-+        if (errmaj)
-+            *errmaj = LDR_ONCEONLY;
-+        return NULL;
-+    }
-+
-+    setupDone = TRUE;
-+
-+    /* Check that we're being loaded on a Linux system */
-+    LoaderGetOS(&osname, NULL, NULL, NULL);
-+    if (!osname || strcmp(osname, "linux") != 0) {
-+        if (errmaj)
-+            *errmaj = LDR_BADOS;
-+        if (errmin)
-+            *errmin = 0;
-+        return NULL;
-+    } else {
-+        /* OK */
-+
-+        xf86AddDriver (&V4L, module, 0);
-+
-+        return (pointer)1;
-+    }
- }
- 
- #else
-@@ -112,25 +122,28 @@ v4lSetup(pointer module, pointer opts, int *errmaj, int *errmin)
- #define VIDEO_YUV     2  /* yuv overlay (to offscreen memory + hw scaling) */
- #define VIDEO_RECLIP  3  /* temporarly off, window clipping changes */
- 
-+typedef struct _XvV4LCtrlRec {
-+    struct v4l2_queryctrl       qctrl;
-+    Atom                        xv;
-+} XvV4LCtrlRec, *XvV4LCtrlPtr;
-+
- typedef struct _PortPrivRec {
-     ScrnInfoPtr                 pScrn;
--    FBAreaPtr			pFBArea[2];
--    int				VideoOn;
--    Bool			StreamOn;
-+    FBAreaPtr                   pFBArea[2];
-+    int                         VideoOn;
-+    Bool                        StreamOn;
- 
-     /* file handle */
--    int 			nr;
--    struct video_capability     cap;
-+    int                         nr;
-+    struct v4l2_capability      cap;
- 
-     /* RGB overlay */
--    struct video_buffer		rgb_fbuf;
--    struct video_window		rgb_win;
--    int                         rgbpalette;
-+    struct v4l2_framebuffer     rgb_fbuf;
-+    struct v4l2_window          rgb_win;
-     int                         rgbdepth;
- 
-     /* attributes */
--    struct video_picture	pict;
--    struct video_audio          audio;
-+    CARD32                      pixelformat;
- 
-     XF86VideoEncodingPtr        enc;
-     int                         *input;
-@@ -145,24 +158,21 @@ typedef struct _PortPrivRec {
- 
-     int                         yuv_width,yuv_height;
-     XF86SurfacePtr              surface;
--    struct video_buffer		yuv_fbuf;
--    struct video_window		yuv_win;
--} PortPrivRec, *PortPrivPtr;
-+    struct v4l2_framebuffer     yuv_fbuf;
-+    struct v4l2_window          yuv_win;
-+
-+    struct v4l2_standard        *standard; /* FIXME: can be removed */
- 
--#define XV_ENCODING	"XV_ENCODING"
--#define XV_BRIGHTNESS  	"XV_BRIGHTNESS"
--#define XV_CONTRAST 	"XV_CONTRAST"
--#define XV_SATURATION  	"XV_SATURATION"
--#define XV_HUE		"XV_HUE"
-+    XvV4LCtrlPtr                XvV4LCtrl;
-+    int                         n_qctrl;
-+} PortPrivRec, *PortPrivPtr;
- 
--#define XV_FREQ		"XV_FREQ"
--#define XV_MUTE		"XV_MUTE"
--#define XV_VOLUME      	"XV_VOLUME"
-+#define XV_ENCODING "XV_ENCODING"
-+#define XV_FREQ     "XV_FREQ"
- 
--#define MAKE_ATOM(a) MakeAtom(a, sizeof(a) - 1, TRUE)
-+#define MAKE_ATOM(a) MakeAtom(a, strlen(a), TRUE)
- 
--static Atom xvEncoding, xvBrightness, xvContrast, xvSaturation, xvHue;
--static Atom xvFreq, xvMute, xvVolume;
-+static Atom xvEncoding, xvFreq;
- 
- static XF86VideoFormatRec
- InputVideoFormats[] = {
-@@ -176,16 +186,8 @@ InputVideoFormats[] = {
- 
- static const XF86AttributeRec Attributes[] = {
-     {XvSettable | XvGettable, -1000,    1000, XV_ENCODING},
--    {XvSettable | XvGettable, -1000,    1000, XV_BRIGHTNESS},
--    {XvSettable | XvGettable, -1000,    1000, XV_CONTRAST},
--    {XvSettable | XvGettable, -1000,    1000, XV_SATURATION},
--    {XvSettable | XvGettable, -1000,    1000, XV_HUE},
- };
--static const XF86AttributeRec VolumeAttr = 
--    {XvSettable | XvGettable, -1000,    1000, XV_VOLUME};
--static const XF86AttributeRec MuteAttr = 
--    {XvSettable | XvGettable,     0,       1, XV_MUTE};
--static const XF86AttributeRec FreqAttr = 
-+static const XF86AttributeRec FreqAttr =
-     {XvSettable | XvGettable,     0, 16*1000, XV_FREQ};
- 
- 
-@@ -206,59 +208,247 @@ static struct V4L_DEVICE {
- };
- 
- /* ---------------------------------------------------------------------- */
--/* forward decl */
- 
--static void V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion,
--		 short vid_w, short vid_h, short drw_w, short drw_h,
--		 unsigned int *p_w, unsigned int *p_h, pointer data);
-+static int SetV4LFmt(int fd, CARD32 pixelformat)
-+{
-+    struct v4l2_framebuffer fbuf;
-+    char *p = (char *)&pixelformat;
-+
-+    memset(&fbuf, 0, sizeof(fbuf));
-+    if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+        xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+        return errno;
-+    }
-+    if (fbuf.fmt.pixelformat != pixelformat) {
-+        fbuf.fmt.pixelformat = pixelformat;
-+        if (ioctl(fd, VIDIOC_S_FBUF, &fbuf) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d: Can't set FBUF to %c%c%c%c\n",
-+                    errno, p[0], p[1], p[2], p[3]);
-+            return errno;
-+        }
-+    }
-+    DEBUG(xf86Msg(X_INFO, "v4l: Set overlay format to %c%c%c%c\n",
-+                  p[0], p[1], p[2], p[3]));
-+    return 0;
-+}
-+static int GetV4LFmt(int fd, CARD32 *pixelformat)
-+{
-+    struct v4l2_framebuffer fbuf;
-+
-+    memset(&fbuf, 0, sizeof(fbuf));
-+    if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+        xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+        return errno;
-+    }
-+
-+    *pixelformat = fbuf.fmt.pixelformat;
-+
-+    return 0;
-+}
-+
-+#define ATTR_NAME_PREFIX "XV_"
-+static int AddControl(PortPrivPtr p, XF86AttributeRec **list, int *count,
-+                      struct v4l2_queryctrl *qctrl, int *n)
-+{
-+    char *ptr;
-+
-+/* v4l_add_attr */
-+    if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)
-+        return 0;
-+    switch (qctrl->type) {
-+    case V4L2_CTRL_TYPE_INTEGER:
-+    case V4L2_CTRL_TYPE_BOOLEAN:
-+    case V4L2_CTRL_TYPE_MENU:
-+    case V4L2_CTRL_TYPE_BUTTON:
-+        break;
-+    default:
-+        return 0;
-+    }
-+
-+    p->XvV4LCtrl = realloc(p->XvV4LCtrl, sizeof(XvV4LCtrlRec) * (*n + 1));
-+    if (!p->XvV4LCtrl) {
-+        if (*list) {
-+            free (*list);
-+            *count = 0;
-+            *n = 0;
-+        }
-+        return -1;
-+    }
-+
-+    *list = realloc(*list, sizeof(XF86AttributeRec) * (*count + 1));
-+    if (NULL == *list) {
-+        if (p->XvV4LCtrl)
-+            free (p->XvV4LCtrl);
-+        *count = 0;
-+        return -1;
-+    }
-+
-+    memset(*list + *count, 0, sizeof(XF86AttributeRec));
-+    (*list)[*count].flags = XvSettable | XvGettable;
-+
-+    if (qctrl->flags & V4L2_CTRL_FLAG_READ_ONLY)
-+        (*list)[*count].flags &= ~XvSettable;
-+    if (qctrl->flags & V4L2_CTRL_FLAG_WRITE_ONLY)
-+        (*list)[*count].flags &= ~XvGettable;
-+    (*list)[*count].min_value = qctrl->minimum;
-+    (*list)[*count].max_value = qctrl->maximum;
-+    (*list)[*count].name = malloc(strlen((char *)qctrl->name) + 1 + sizeof (ATTR_NAME_PREFIX));
-+    strcpy((*list)[*count].name, ATTR_NAME_PREFIX);
-+    strcat((*list)[*count].name, (char *)qctrl->name);
-+    for (ptr = (*list)[*count].name; *ptr; ptr++) {
-+        *ptr = toupper(*ptr);
-+        if (*ptr == ' ')
-+            *ptr = '_';
-+    }
-+
-+    p->XvV4LCtrl[*n].xv = MAKE_ATOM((*list)[*count].name);
-+    memcpy(&p->XvV4LCtrl[*n].qctrl, qctrl, sizeof(*qctrl));
-+
-+    xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n",
-+            (*list)[*count].name, (int)p->XvV4LCtrl[*n].xv,
-+            p->XvV4LCtrl[*n].qctrl.minimum,
-+            p->XvV4LCtrl[*n].qctrl.maximum);
-+
-+    (*count)++;
-+    (*n)++;
-+
-+    return 0;
-+}
-+
-+static void AddAllV4LControls(PortPrivPtr p, XF86AttributeRec **list,
-+                              int *count, int fd)
-+{
-+    int entries = 0;
-+    CARD32 id;
-+    struct v4l2_queryctrl qctrl;
-+
-+    memset(&qctrl, 0, sizeof(qctrl));
-+    qctrl.id = V4L2_CTRL_FLAG_NEXT_CTRL;
-+    while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+        if (AddControl(p, list, count, &qctrl, &entries))
-+            return;
-+        qctrl.id |= V4L2_CTRL_FLAG_NEXT_CTRL;
-+    }
-+    if (qctrl.id != V4L2_CTRL_FLAG_NEXT_CTRL)
-+        return;
-+    for (id = V4L2_CID_USER_BASE; id < V4L2_CID_LASTP1; id++) {
-+        qctrl.id = id;
-+        if (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+            if (AddControl(p, list, count, &qctrl, &entries))
-+                return;
-+        }
-+    }
-+    qctrl.id = V4L2_CID_PRIVATE_BASE;
-+    while (!ioctl(fd, VIDIOC_QUERYCTRL, &qctrl)) {
-+        if (AddControl(p, list, count, &qctrl, &entries))
-+            return;
-+        qctrl.id++;
-+    }
-+    p->n_qctrl = entries;
-+}
- 
- /* ---------------------------------------------------------------------- */
- 
-+/* setup yuv overlay + hw scaling: look if we find some common video
-+   format which both v4l driver and the X-Server can handle */
-+static int v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,
-+                          char *dev, int fd)
-+{
-+    static const struct {
-+        CARD32        v4l_palette;
-+        unsigned int  xv_id;
-+        unsigned int  xv_format;
-+    } yuvlist[] = {
-+        { V4L2_PIX_FMT_YUYV, FOURCC_YUY2, XvPacked },
-+        { V4L2_PIX_FMT_UYVY, FOURCC_UYVY, XvPacked },
-+        { 0 /* end of list */ },
-+    };
-+    /* FIXME: Why pScrn->scrnIndex? */
-+    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+    int fmt,i;
-+
-+    pPPriv->format = xf86XVQueryOffscreenImages(pScreen, &pPPriv->nformat);
-+    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                   "v4l: Number of Xv formats: %d\n", pPPriv->nformat);
-+    if (!pPPriv->nformat)
-+        return FALSE;
-+
-+    for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) {
-+        pPPriv->pixelformat = yuvlist[fmt].v4l_palette;
-+        if (-1 == SetV4LFmt(fd, pPPriv->pixelformat))
-+            continue;
-+        GetV4LFmt(fd, &pPPriv->pixelformat);
-+        if (pPPriv->pixelformat != yuvlist[fmt].v4l_palette)
-+            continue;
-+        /* ... works, check available offscreen image formats now ... */
-+        for (i = 0; i < pPPriv->nformat; i++) {
-+            if (pPPriv->format[i].image->id == yuvlist[fmt].xv_id &&
-+                pPPriv->format[i].image->format == yuvlist[fmt].xv_format) {
-+                /* ... match found, good. */
-+                pPPriv->yuv_format = yuvlist[fmt].v4l_palette;
-+                pPPriv->myfmt = pPPriv->format+i;
-+                xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+                           "v4l[%s]: using hw video scaling [%4.4s].\n",
-+                           dev,(char*)&(pPPriv->format[i].image->id));
-+                return TRUE;
-+            }
-+        }
-+    }
-+    return TRUE;
-+}
-+
- static int V4lOpenDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
- {
-     static int first = 1;
- 
-+#if 0
-+    /*
-+     * It may be a good idea to probe here, but this would break
-+     * some things, as initialization uses yuv_format
-+     */
-+    if (!pPPriv->yuv_format && first)
-+        v4l_check_yuv(pScrn, pPPriv, V4L_NAME, V4L_FD);
-+#endif
-     if (-1 == V4L_FD) {
--	V4L_FD = open(V4L_NAME, O_RDWR, 0);
--
--	pPPriv->rgb_fbuf.width        = pScrn->virtualX;
--	pPPriv->rgb_fbuf.height       = pScrn->virtualY;
--	pPPriv->rgb_fbuf.depth        = pScrn->bitsPerPixel;
--	pPPriv->rgb_fbuf.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
--	pPPriv->rgb_fbuf.base         = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
--	if (first) {
--	    first = 0;
--	    xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
--	}
--
--	switch (pScrn->bitsPerPixel) {
--	case 16:
--	    if (pScrn->weight.green == 5) {
--		pPPriv->rgbpalette = VIDEO_PALETTE_RGB555;
--		pPPriv->rgbdepth   = 16;
--	    } else {
--		pPPriv->rgbpalette = VIDEO_PALETTE_RGB565;
--		pPPriv->rgbdepth   = 16;
--	    }
--	    break;
--	case 24:
--	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB24;
--	    pPPriv->rgbdepth   = 24;
--	    break;
--	case 32:
--	    pPPriv->rgbpalette = VIDEO_PALETTE_RGB32;
--	    pPPriv->rgbdepth   = 32;
--	    break;
--	}
-+        V4L_FD = open(V4L_NAME, O_RDWR, 0);
-+
-+        if (-1 == V4L_FD)
-+            return errno;
-+
-+        if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->rgb_fbuf)) {
-+            xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+            return errno;
-+        }
-+        pPPriv->rgb_fbuf.fmt.width        = pScrn->virtualX;
-+        pPPriv->rgb_fbuf.fmt.height       = pScrn->virtualY;
-+        pPPriv->rgb_fbuf.fmt.bytesperline = pScrn->displayWidth * ((pScrn->bitsPerPixel + 7)/8);
-+        pPPriv->rgb_fbuf.base             = (pointer)(pScrn->memPhysBase + pScrn->fbOffset);
-+        if (first) {
-+            xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                           "v4l: memPhysBase=0x%lx\n", pScrn->memPhysBase);
-+            first = 0;
-+        }
-+
-+        switch (pScrn->bitsPerPixel) {
-+        case 16:
-+            if (pScrn->weight.green == 5) {
-+                pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB555;
-+            } else {
-+                pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_RGB565;
-+            }
-+            break;
-+        case 24:
-+            pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR24;
-+            break;
-+        case 32:
-+            pPPriv->rgb_fbuf.fmt.pixelformat = V4L2_PIX_FMT_BGR32;
-+            break;
-+        }
-     }
- 
--    if (-1 == V4L_FD)
--	return errno;
--    
-     V4L_REF++;
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "Xv/open: refcount=%d\n",V4L_REF));
-+                         "Xv/open: refcount=%d\n",V4L_REF));
- 
-     return 0;
- }
-@@ -267,10 +457,10 @@ static void V4lCloseDevice(PortPrivPtr pPPriv, ScrnInfoPtr pScrn)
- {
-     V4L_REF--;
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			 "Xv/close: refcount=%d\n",V4L_REF));
-+                         "Xv/close: refcount=%d\n",V4L_REF));
-     if (0 == V4L_REF && -1 != V4L_FD) {
--	close(V4L_FD);
--	V4L_FD = -1;
-+        close(V4L_FD);
-+        V4L_FD = -1;
-     }
- }
- 
-@@ -280,8 +470,10 @@ V4lPutVideo(ScrnInfoPtr pScrn,
-     short vid_w, short vid_h, short drw_w, short drw_h,
-     RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
- {
-+    struct v4l2_format fmt;
-+
-     PortPrivPtr pPPriv = (PortPrivPtr) data;
--    struct video_clip *clip;
-+    struct v4l2_clip *clip;
-     BoxPtr pBox;
-     RegionRec newReg;
-     BoxRec    newBox;
-@@ -291,179 +483,214 @@ V4lPutVideo(ScrnInfoPtr pScrn,
- 
-     /* Open a file handle to the device */
-     if (VIDEO_OFF == pPPriv->VideoOn) {
--	if (V4lOpenDevice(pPPriv, pScrn))
--	    return Success;
-+        if (V4lOpenDevice(pPPriv, pScrn))
-+            return Success;
-     }
- 
-     if (0 != pPPriv->yuv_format) {
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
--	width  = pPPriv->enc[pPPriv->cenc].width;
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV yuv\n"));
-+        width  = pPPriv->enc[pPPriv->cenc].width;
-         height = pPPriv->enc[pPPriv->cenc].height/2; /* no interlace */
--	if (drw_w < width)
--	    width = drw_w;
--	if (drw_h < height)
--	    height = drw_h;
--	if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
--	    /* new size -- free old surface */
--	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
--	    if (pPPriv->surface) {
--		pPPriv->VideoOn = VIDEO_OFF;
--		pPPriv->myfmt->stop(pPPriv->surface);
--		pPPriv->myfmt->free_surface(pPPriv->surface);
--		xfree(pPPriv->surface);
--		pPPriv->surface    = NULL;
--	    }
--	    pPPriv->yuv_width  = width;
--	    pPPriv->yuv_height = height;
--	}
--	if (!pPPriv->surface) {
--	    /* allocate + setup offscreen surface */
--	    if (NULL == (pPPriv->surface = xalloc(sizeof(XF86SurfaceRec))))
--		return FALSE;
--	    if (Success != pPPriv->myfmt->alloc_surface
--		(pScrn,pPPriv->myfmt->image->id,
--		 pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
--		xfree(pPPriv->surface);
--		pPPriv->surface = NULL;
--		goto fallback_to_rgb;
--	    }
--	    pPPriv->yuv_fbuf.width        = pPPriv->surface->width;
--	    pPPriv->yuv_fbuf.height       = pPPriv->surface->height;
--	    pPPriv->yuv_fbuf.depth        = 16;
--	    pPPriv->yuv_fbuf.bytesperline = pPPriv->surface->pitches[0];
--	    pPPriv->yuv_fbuf.base         =
--		(pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
--	    DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface: %p+%d = %p, %dx%d, pitch %d\n",
--				 pScrn->memPhysBase,pPPriv->surface->offsets[0],
--				 pScrn->memPhysBase+pPPriv->surface->offsets[0],
--				 pPPriv->surface->width,pPPriv->surface->height,
--				 pPPriv->surface->pitches[0]));
--	    pPPriv->yuv_win.width         = pPPriv->surface->width;
--	    pPPriv->yuv_win.height        = pPPriv->surface->height;
--	}
--
--	/* program driver */
--	if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->yuv_fbuf)))
--	    perror("ioctl VIDIOCSFBUF");
--	if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCGPICT");
--	pPPriv->pict.palette = pPPriv->yuv_format;
--	pPPriv->pict.depth   = 16;
--	if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCSPICT");
--	if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->yuv_win)))
--	    perror("ioctl VIDIOCSWIN");
--	if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one))
--	    perror("ioctl VIDIOCCAPTURE(1)");
--
--	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
--	    /* invert cliplist */
--	    newBox.x1 = drw_x;
--	    newBox.y1 = drw_y;
--	    newBox.x2 = drw_x + drw_w;
--	    newBox.y2 = drw_y + drw_h;
--
--	    if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
--		/* trim to the viewport */
--		if(newBox.x1 < pScrn->frameX0)
--		    newBox.x1 = pScrn->frameX0;
--		if(newBox.x2 > pScrn->frameX1)
--		    newBox.x2 = pScrn->frameX1;
--		
--		if(newBox.y1 < pScrn->frameY0)
--		    newBox.y1 = pScrn->frameY0;
--		if(newBox.y2 > pScrn->frameY1)
--		    newBox.y2 = pScrn->frameY1;
--	    }
-+        if (drw_w < width)
-+            width = drw_w;
-+        if (drw_h < height)
-+            height = drw_h;
-+        if ((height != pPPriv->yuv_height) || (width != pPPriv->yuv_width)) {
-+            /* new size -- free old surface */
-+            DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  surface resize\n"));
-+            if (pPPriv->surface) {
-+                pPPriv->VideoOn = VIDEO_OFF;
-+                pPPriv->myfmt->stop(pPPriv->surface);
-+                pPPriv->myfmt->free_surface(pPPriv->surface);
-+                free(pPPriv->surface);
-+                pPPriv->surface    = NULL;
-+            }
-+            pPPriv->yuv_width  = width;
-+            pPPriv->yuv_height = height;
-+        }
-+        if (!pPPriv->surface) {
-+            /* allocate + setup offscreen surface */
-+            if (NULL == (pPPriv->surface = malloc(sizeof(XF86SurfaceRec))))
-+                return FALSE;
-+            if (Success != pPPriv->myfmt->alloc_surface
-+                (pScrn,pPPriv->myfmt->image->id,
-+                pPPriv->yuv_width,pPPriv->yuv_height,pPPriv->surface)) {
-+                free(pPPriv->surface);
-+                pPPriv->surface = NULL;
-+                goto fallback_to_rgb;
-+            }
-+
-+            if (-1 == ioctl(V4L_FD, VIDIOC_G_FBUF, &pPPriv->yuv_fbuf)) {
-+                xf86Msg(X_ERROR, "v4l: Error %d: Can't get FBUF\n", errno);
-+                return errno;
-+            }
-+            pPPriv->yuv_fbuf.fmt.width        = pPPriv->surface->width;
-+            pPPriv->yuv_fbuf.fmt.height       = pPPriv->surface->height;
-+            pPPriv->yuv_fbuf.fmt.bytesperline = pPPriv->surface->pitches[0];
-+            pPPriv->yuv_fbuf.fmt.pixelformat = pPPriv->yuv_format;
-+            pPPriv->yuv_fbuf.base         =
-+                (pointer)(pScrn->memPhysBase + pPPriv->surface->offsets[0]);
-+            DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                                 "  surface: %p+%d = %p, %dx%d, pitch %d\n",
-+                                (void *)pScrn->memPhysBase, pPPriv->surface->offsets[0],
-+                                (void *)pScrn->memPhysBase+pPPriv->surface->offsets[0],
-+                                pPPriv->surface->width, pPPriv->surface->height,
-+                                pPPriv->surface->pitches[0]));
-+            memset(&pPPriv->yuv_win, 0, sizeof(pPPriv->yuv_win));
-+            pPPriv->yuv_win.w.left    = 0;
-+            pPPriv->yuv_win.w.top     = 0;
-+            pPPriv->yuv_win.w.width  = pPPriv->surface->width;
-+            pPPriv->yuv_win.w.height = pPPriv->surface->height;
-+        }
- 
--	    REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
--	    REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
--	    clipBoxes = &newReg;
--	}
--	
--	/* start overlay */
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--			     "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
--			     drw_x, drw_y,
--			     drw_x+drw_w, drw_y+drw_h,
--			     drw_w, drw_h,
--			     pPPriv->surface->width,pPPriv->surface->height));
--	pPPriv->myfmt->display(pPPriv->surface,
--			       0, 0, drw_x, drw_y,
--			       pPPriv->surface->width,
--			       pPPriv->surface->height,
--			       drw_w, drw_h,
--			       clipBoxes);
--	if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
--	    REGION_UNINIT(pScrn->pScreen, &newReg); 
--	}
--	pPPriv->VideoOn = VIDEO_YUV;
--	return Success;
-+        /* program driver */
-+        if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->yuv_fbuf)) {
-+            xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno);
-+            return BadValue;
-+        }
-+        pPPriv->pixelformat = pPPriv->yuv_format;
-+        if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat))
-+            return BadValue;
-+
-+        memset(&fmt, 0, sizeof(fmt));
-+        fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
-+        memcpy(&fmt.fmt.win, &pPPriv->yuv_win, sizeof(pPPriv->yuv_win));
-+        if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) {
-+            xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno);
-+            return BadValue;
-+        }
-+        if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno);
-+            return BadValue;
-+        }
-+
-+        if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
-+            /* invert cliplist */
-+            newBox.x1 = drw_x;
-+            newBox.y1 = drw_y;
-+            newBox.x2 = drw_x + drw_w;
-+            newBox.y2 = drw_y + drw_h;
-+
-+            if (pPPriv->myfmt->flags & VIDEO_CLIP_TO_VIEWPORT) {
-+                /* trim to the viewport */
-+                if(newBox.x1 < pScrn->frameX0)
-+                    newBox.x1 = pScrn->frameX0;
-+                if(newBox.x2 > pScrn->frameX1)
-+                    newBox.x2 = pScrn->frameX1;
-+
-+                if(newBox.y1 < pScrn->frameY0)
-+                    newBox.y1 = pScrn->frameY0;
-+                if(newBox.y2 > pScrn->frameY1)
-+                    newBox.y2 = pScrn->frameY1;
-+            }
-+
-+            REGION_INIT(pScrn->pScreen, &newReg, &newBox, 1);
-+            REGION_SUBTRACT(pScrn->pScreen, &newReg, &newReg, clipBoxes);
-+            clipBoxes = &newReg;
-+        }
-+
-+        /* start overlay */
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                             "over: - %d,%d -> %d,%d  (%dx%d) (yuv=%dx%d)\n",
-+                             drw_x, drw_y,
-+                             drw_x+drw_w, drw_y+drw_h,
-+                             drw_w, drw_h,
-+                             pPPriv->surface->width,pPPriv->surface->height));
-+        pPPriv->myfmt->display(pPPriv->surface,
-+                               0, 0, drw_x, drw_y,
-+                               pPPriv->surface->width,
-+                               pPPriv->surface->height,
-+                               drw_w, drw_h,
-+                               clipBoxes);
-+        if (0 == (pPPriv->myfmt->flags & VIDEO_INVERT_CLIPLIST)) {
-+            REGION_UNINIT(pScrn->pScreen, &newReg);
-+        }
-+        pPPriv->VideoOn = VIDEO_YUV;
-+        return Success;
-     }
- 
-- fallback_to_rgb:
-+fallback_to_rgb:
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PV rgb\n"));
-     /* FIXME: vid-* is ignored for now, not supported by v4l */
- 
-     dw = (drw_w < pPPriv->enc[pPPriv->cenc].width) ?
--	drw_w : pPPriv->enc[pPPriv->cenc].width;
-+        drw_w : pPPriv->enc[pPPriv->cenc].width;
-     dh = (drw_h < pPPriv->enc[pPPriv->cenc].height) ?
--	drw_h : pPPriv->enc[pPPriv->cenc].height;
-+        drw_h : pPPriv->enc[pPPriv->cenc].height;
-     /* if the window is too big, center the video */
-     dx = drw_x + (drw_w - dw)/2;
-     dy = drw_y + (drw_h - dh)/2;
-     /* bttv prefeares aligned addresses */
-     dx &= ~3;
--    if (dx < drw_x) dx += 4;
--    if (dx+dw > drw_x+drw_w) dw -= 4;
-+    if (dx < drw_x)
-+        dx += 4;
-+    if (dx+dw > drw_x+drw_w)
-+        dw -= 4;
- 
-     /* window */
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  win: %dx%d+%d+%d\n",
--		drw_w,drw_h,drw_x,drw_y));
-+                         drw_w,drw_h,drw_x,drw_y));
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "  use: %dx%d+%d+%d\n",
--		dw,dh,dx,dy));
--    pPPriv->rgb_win.x      = dx;
--    pPPriv->rgb_win.y      = dy;
--    pPPriv->rgb_win.width  = dw;
--    pPPriv->rgb_win.height = dh;
--    pPPriv->rgb_win.flags  = 0;
-- 
-+                         dw,dh,dx,dy));
-+    memset(&pPPriv->rgb_win, 0, sizeof(pPPriv->rgb_win));
-+    pPPriv->rgb_win.w.left   = dx;
-+    pPPriv->rgb_win.w.top    = dy;
-+    pPPriv->rgb_win.w.width  = dw;
-+    pPPriv->rgb_win.w.height = dh;
-+
-     /* clipping */
-     if (pPPriv->rgb_win.clips) {
--	xfree(pPPriv->rgb_win.clips);
--	pPPriv->rgb_win.clips = NULL;
-+        free(pPPriv->rgb_win.clips);
-+        pPPriv->rgb_win.clips = NULL;
-     }
-     pPPriv->rgb_win.clipcount = REGION_NUM_RECTS(clipBoxes);
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,"  clip: have #%d\n",
--		pPPriv->rgb_win.clipcount));
-+                         pPPriv->rgb_win.clipcount));
-     if (0 != pPPriv->rgb_win.clipcount) {
--	pPPriv->rgb_win.clips = xalloc(pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
--	if (NULL != pPPriv->rgb_win.clips) {
--	    memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct video_clip));
--	    pBox = REGION_RECTS(clipBoxes);
--	    clip = pPPriv->rgb_win.clips;
--	    for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
--		clip->x	 = pBox->x1 - dx;
--		clip->y      = pBox->y1 - dy;
--		clip->width  = pBox->x2 - pBox->x1;
--		clip->height = pBox->y2 - pBox->y1;
--	    }
--	}
-+        pPPriv->rgb_win.clips = malloc(pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip));
-+        if (NULL != pPPriv->rgb_win.clips) {
-+            memset(pPPriv->rgb_win.clips,0,pPPriv->rgb_win.clipcount*sizeof(struct v4l2_clip));
-+            pBox = REGION_RECTS(clipBoxes);
-+            clip = pPPriv->rgb_win.clips;
-+
-+            /*
-+             * FIXME: This code currently does nothing, as we don't emulate
-+             * The V4L1 clipping stuff
-+             */
-+            for (i = 0; i < REGION_NUM_RECTS(clipBoxes); i++, pBox++, clip++) {
-+                clip->c.left   = pBox->x1 - dx;
-+                clip->c.top    = pBox->y1 - dy;
-+                clip->c.width  = pBox->x2 - pBox->x1;
-+                clip->c.height = pBox->y2 - pBox->y1;
-+            }
-+        }
-     }
- 
-     /* start */
--    if (-1 == ioctl(V4L_FD,VIDIOCSFBUF,&(pPPriv->rgb_fbuf)))
--	perror("ioctl VIDIOCSFBUF");
--    if (-1 == ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict))
--	perror("ioctl VIDIOCGPICT");
--    pPPriv->pict.palette = pPPriv->rgbpalette;
--    pPPriv->pict.depth   = pPPriv->rgbdepth;
--    if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	perror("ioctl VIDIOCSPICT");
--    if (-1 == ioctl(V4L_FD,VIDIOCSWIN,&(pPPriv->rgb_win)))
--	perror("ioctl VIDIOCSWIN");
--    if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &one))
--	perror("ioctl VIDIOCCAPTURE(1)");
-+    if (-1 == ioctl(V4L_FD, VIDIOC_S_FBUF, &pPPriv->rgb_fbuf)) {
-+        xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FBUF\n", errno);
-+        return BadValue;
-+    }
-+    if (-1 == GetV4LFmt(V4L_FD, &pPPriv->pixelformat)) {
-+        xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno);
-+        return BadValue;
-+    }
-+    pPPriv->pixelformat = pPPriv->rgb_fbuf.fmt.pixelformat;
-+    if (-1 == SetV4LFmt(V4L_FD, pPPriv->pixelformat)) {
-+        xf86Msg(X_ERROR, "Error %d getting pixelformat\n", errno);
-+        return BadValue;
-+    }
-+    memset(&fmt, 0, sizeof(fmt));
-+    fmt.type = V4L2_BUF_TYPE_VIDEO_OVERLAY;
-+    memcpy(&fmt.fmt.win, &pPPriv->rgb_win, sizeof(pPPriv->rgb_win));
-+    if (-1 == ioctl(V4L_FD, VIDIOC_S_FMT, &fmt)) {
-+        xf86Msg(X_ERROR, "Error %d at VIDIOC_S_FMT\n", errno);
-+        return BadValue;
-+    }
-+    if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &one)) {
-+        xf86Msg(X_ERROR, "v4l: Error %d while enabling Overlay\n", errno);
-+        return BadValue;
-+    }
-     pPPriv->VideoOn = VIDEO_RGB;
- 
-     return Success;
-@@ -476,7 +703,7 @@ V4lPutStill(ScrnInfoPtr pScrn,
-     RegionPtr clipBoxes, pointer data, DrawablePtr pDraw)
- {
- #if 0
--    PortPrivPtr pPPriv = (PortPrivPtr) data;  
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
- #endif
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/PS\n"));
-@@ -488,177 +715,152 @@ V4lPutStill(ScrnInfoPtr pScrn,
- static void
- V4lStopVideo(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
- {
--    PortPrivPtr pPPriv = (PortPrivPtr) data;  
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
-     int zero=0;
- 
-     if (VIDEO_OFF == pPPriv->VideoOn) {
--	DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
--	      "Xv/StopVideo called with video already off\n"));
--	return;
-+        DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+              "Xv/StopVideo called with video already off\n"));
-+        return;
-     }
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/StopVideo shutdown=%d\n",shutdown));
- 
-     if (!shutdown) {
--	/* just reclipping, we have to stop DMA transfers to the visible screen */
--	if (VIDEO_RGB == pPPriv->VideoOn) {
--	    if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero))
--		perror("ioctl VIDIOCCAPTURE(0)");
--	    pPPriv->VideoOn = VIDEO_RECLIP;
--	}
-+        /* just reclipping, we have to stop DMA transfers to the visible screen */
-+        if (VIDEO_RGB == pPPriv->VideoOn) {
-+            if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero))
-+                xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno);
-+            pPPriv->VideoOn = VIDEO_RECLIP;
-+        }
-     } else {
--	/* video stop - turn off and free everything */
--	if (VIDEO_YUV == pPPriv->VideoOn) {
--	    pPPriv->myfmt->stop(pPPriv->surface);
--	    pPPriv->myfmt->free_surface(pPPriv->surface);
--	    xfree(pPPriv->surface);
--	    pPPriv->surface = NULL;
--	}
--	if (-1 == ioctl(V4L_FD, VIDIOCCAPTURE, &zero))
--	    perror("ioctl VIDIOCCAPTURE(0)");
--	
--	V4lCloseDevice(pPPriv,pScrn);
--	pPPriv->VideoOn = VIDEO_OFF;
--    }
--}
-+        /* video stop - turn off and free everything */
-+        if (VIDEO_YUV == pPPriv->VideoOn) {
-+            pPPriv->myfmt->stop(pPPriv->surface);
-+            pPPriv->myfmt->free_surface(pPPriv->surface);
-+            free(pPPriv->surface);
-+            pPPriv->surface = NULL;
-+        }
-+        if (-1 == ioctl(V4L_FD, VIDIOC_OVERLAY, &zero))
-+            xf86Msg(X_ERROR, "v4l: Error %d while disabling Overlay\n", errno);
- 
--/* v4l uses range 0 - 65535; Xv uses -1000 - 1000 */
--static int
--v4l_to_xv(int val) {
--    val = val * 2000 / 65536 - 1000;
--    if (val < -1000) val = -1000;
--    if (val >  1000) val =  1000;
--    return val;
--}
--static int
--xv_to_v4l(int val) {
--    val = val * 65536 / 2000 + 32768;
--    if (val <    -0) val =     0;
--    if (val > 65535) val = 65535;
--    return val;
-+        V4lCloseDevice(pPPriv,pScrn);
-+        pPPriv->VideoOn = VIDEO_OFF;
-+    }
- }
- 
- static int
- V4lSetPortAttribute(ScrnInfoPtr pScrn,
-     Atom attribute, INT32 value, pointer data)
- {
--    PortPrivPtr pPPriv = (PortPrivPtr) data; 
--    struct video_channel chan;
--    int ret = Success;
-+    struct v4l2_control ctrl;
-+    PortPrivPtr pPPriv = (PortPrivPtr) data;
-+    int i, ret = BadValue;
- 
-     if (V4lOpenDevice(pPPriv, pScrn))
--	return Success;
-+        return Success;
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/SPA %d, %d\n",
--			 attribute, value));
-+                        (int)attribute, (int)value));
- 
-     if (-1 == V4L_FD) {
--	ret = Success;
-+        ret = Success;
-     } else if (attribute == xvEncoding) {
--	if (value >= 0 && value < pPPriv->nenc) {
--	    pPPriv->cenc = value;
--	    chan.channel = pPPriv->input[value];
--	    chan.norm    = pPPriv->norm[value];
--	    if (-1 == ioctl(V4L_FD,VIDIOCSCHAN,&chan))
--		perror("ioctl VIDIOCSCHAN");
--	} else {
--	    ret = BadValue;
--	}
--    } else if (attribute == xvBrightness ||
--               attribute == xvContrast   ||
--               attribute == xvSaturation ||
--               attribute == xvHue) {
--	ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict);
--	if (attribute == xvBrightness) pPPriv->pict.brightness = xv_to_v4l(value);
--	if (attribute == xvContrast)   pPPriv->pict.contrast   = xv_to_v4l(value);
--	if (attribute == xvSaturation) pPPriv->pict.colour     = xv_to_v4l(value);
--	if (attribute == xvHue)        pPPriv->pict.hue        = xv_to_v4l(value);
--	if (-1 == ioctl(V4L_FD,VIDIOCSPICT,&pPPriv->pict))
--	    perror("ioctl VIDIOCSPICT");
--    } else if (attribute == xvMute ||
--	       attribute == xvVolume) {
--	ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio);
--	if (attribute == xvMute) {
--	    if (value)
--		pPPriv->audio.flags |= VIDEO_AUDIO_MUTE;
--	    else
--		pPPriv->audio.flags &= ~VIDEO_AUDIO_MUTE;
--	} else if (attribute == xvVolume) {
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		pPPriv->audio.volume = xv_to_v4l(value);
--	} else {
--	    ret = BadValue;
--	}
--	if (ret != BadValue)
--	    if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio))
--		perror("ioctl VIDIOCSAUDIO");
-+        if (value < 0 || value >= pPPriv->nenc)
-+            goto err;
-+        if (ioctl(V4L_FD, VIDIOC_S_INPUT, &pPPriv->input[value]) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting input\n", errno);
-+            goto err;
-+        }
-+        if (ioctl(V4L_FD, VIDIOC_S_STD, &pPPriv->norm[value]) == -1) {
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting standard\n", errno);
-+            goto err;
-+        }
-+        pPPriv->cenc = value;
-+        ret = Success;
-     } else if (attribute == xvFreq) {
--	unsigned long freq = value;
--	if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq))
--	    perror("ioctl VIDIOCSFREQ");
--    } else if (0 != pPPriv->yuv_format &&
--	       pPPriv->myfmt->setAttribute) {
--	/* not mine -> pass to yuv scaler driver */
--	ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
-+        struct v4l2_frequency   freq;
-+        memset(&freq, 0, sizeof(freq));
-+        ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq);
-+        freq.frequency = value;
-+        if (ioctl(V4L_FD, VIDIOC_S_FREQUENCY, &freq) == -1)
-+            xf86Msg(X_ERROR, "v4l: Error %d while setting frequency\n", errno);
-+        else
-+            ret = Success;
-     } else {
--	ret = BadValue;
-+        for (i = 0; i < pPPriv->n_qctrl; i++)
-+            if (pPPriv->XvV4LCtrl[i].xv == attribute)
-+                break;
-+        if (i == pPPriv->n_qctrl) {
-+            /* not mine -> pass to yuv scaler driver */
-+            if (0 != pPPriv->yuv_format && pPPriv->myfmt->setAttribute)
-+                ret = pPPriv->myfmt->setAttribute(pScrn, attribute, value);
-+            else
-+                ret = BadMatch;
-+            goto err;
-+        }
-+        if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-+            goto err;
-+        ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id;
-+        ctrl.value = value;
-+        if (ioctl(V4L_FD, VIDIOC_S_CTRL, &ctrl) != 1)
-+            ret = Success;
-     }
- 
-+err:
-     V4lCloseDevice(pPPriv,pScrn);
-     return ret;
- }
- 
- static int
--V4lGetPortAttribute(ScrnInfoPtr pScrn, 
-+V4lGetPortAttribute(ScrnInfoPtr pScrn,
-     Atom attribute, INT32 *value, pointer data)
- {
-+    struct v4l2_control ctrl;
-     PortPrivPtr pPPriv = (PortPrivPtr) data;
--    int ret = Success;
-+    int i, ret = BadValue;
- 
-     if (V4lOpenDevice(pPPriv, pScrn))
--	return Success;
-+        return Success;
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d\n",
--			 attribute));
-+                        (int)attribute));
- 
-     if (-1 == V4L_FD) {
--	ret = Success;
-+        ret = Success;
-     } else if (attribute == xvEncoding) {
--	*value = pPPriv->cenc;
--    } else if (attribute == xvBrightness ||
--               attribute == xvContrast   ||
--               attribute == xvSaturation ||
--               attribute == xvHue) {
--	ioctl(V4L_FD,VIDIOCGPICT,&pPPriv->pict);
--	if (attribute == xvBrightness) *value = v4l_to_xv(pPPriv->pict.brightness);
--	if (attribute == xvContrast)   *value = v4l_to_xv(pPPriv->pict.contrast);
--	if (attribute == xvSaturation) *value = v4l_to_xv(pPPriv->pict.colour);
--	if (attribute == xvHue)        *value = v4l_to_xv(pPPriv->pict.hue);
--    } else if (attribute == xvMute ||
--	       attribute == xvVolume) {
--	ioctl(V4L_FD,VIDIOCGAUDIO,&pPPriv->audio);
--	if (attribute == xvMute) {
--	    *value = (pPPriv->audio.flags & VIDEO_AUDIO_MUTE) ? 1 : 0;
--	} else if (attribute == xvVolume) {
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		*value = v4l_to_xv(pPPriv->audio.volume);
--	} else {
--	    ret = BadValue;
--	}
-+        *value = pPPriv->cenc;
-+        ret = Success;
-     } else if (attribute == xvFreq) {
--	unsigned long freq;
--	ioctl(V4L_FD,VIDIOCGFREQ,&freq);
--	*value = freq;
--    } else if (0 != pPPriv->yuv_format &&
--	       pPPriv->myfmt->getAttribute) {
--	/* not mine -> pass to yuv scaler driver */
--	ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
-+        struct v4l2_frequency   freq;
-+        memset(&freq, 0, sizeof(freq));
-+        if (ioctl(V4L_FD, VIDIOC_G_FREQUENCY, &freq) != -1) {
-+            *value = freq.frequency;
-+            ret = Success;
-+        }
-     } else {
--	ret = BadValue;
-+        for (i = 0; i < pPPriv->n_qctrl; i++)
-+            if (pPPriv->XvV4LCtrl[i].xv == attribute)
-+                break;
-+        if (i == pPPriv->n_qctrl) {
-+            /* not mine -> pass to yuv scaler driver */
-+            if (0 != pPPriv->yuv_format &&  pPPriv->myfmt->getAttribute)
-+                ret = pPPriv->myfmt->getAttribute(pScrn, attribute, value);
-+            else
-+                ret = BadMatch;
-+            goto err;
-+        }
-+        if (pPPriv->XvV4LCtrl[i].qctrl.flags & V4L2_CTRL_FLAG_DISABLED)
-+            goto err;
-+        ctrl.id = pPPriv->XvV4LCtrl[i].qctrl.id;
-+        if (ioctl(V4L_FD, VIDIOC_G_CTRL, &ctrl) != -1) {
-+            *value = ctrl.value;
-+            ret = Success;
-+        }
-     }
--
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/GPA %d, %d\n",
--	attribute, *value));
-+        (int)attribute, (int)*value));
- 
-+err:
-     V4lCloseDevice(pPPriv,pScrn);
-     return ret;
- }
-@@ -673,15 +875,15 @@ V4lQueryBestSize(ScrnInfoPtr pScrn, Bool motion,
-     int maxy = pPPriv->enc[pPPriv->cenc].height;
- 
-     if (0 != pPPriv->yuv_format) {
--	*p_w = pPPriv->myfmt->max_width;
--	*p_h = pPPriv->myfmt->max_height;
-+        *p_w = pPPriv->myfmt->max_width;
-+        *p_h = pPPriv->myfmt->max_height;
-     } else {
--	*p_w = (drw_w < maxx) ? drw_w : maxx;
--	*p_h = (drw_h < maxy) ? drw_h : maxy;
-+        *p_w = (drw_w < maxx) ? drw_w : maxx;
-+        *p_h = (drw_h < maxy) ? drw_h : maxy;
-     }
- 
-     DEBUG(xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "Xv/BS %d %dx%d %dx%d\n",
--			 pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
-+                         pPPriv->cenc,drw_w,drw_h,*p_w,*p_h));
- }
- 
- static const OptionInfoRec *
-@@ -693,132 +895,198 @@ V4LAvailableOptions(int chipid, int busid)
- static void
- V4LIdentify(int flags)
- {
--    xf86Msg(X_INFO, "v4l driver for Video4Linux\n");
--}        
-+    xf86Msg(X_INFO, "v4l driver for Video4Linux overlay mode (V4L2)\n");
-+}
- 
- static char*
- fixname(char *str)
- {
-     int s,d;
-     for (s=0, d=0;; s++) {
--	if (str[s] == '-')
--	    continue;
--	str[d++] = tolower(str[s]);
--	if (0 == str[s])
--	    break;
-+        if (str[s] == '-')
-+            continue;
-+        str[d++] = tolower(str[s]);
-+        if (0 == str[s])
-+            break;
-     }
-     return str;
- }
- 
- static int
--v4l_add_enc(XF86VideoEncodingPtr enc, int i,
--	    char *norm, char *input, int width, int height, int n, int d)
-+AddV4LEnc(XF86VideoEncodingPtr enc, int entry,
-+            char *norm, char *input, int width, int height, int n, int d)
- {
--    enc[i].id     = i;
--    enc[i].name   = xalloc(strlen(norm)+strlen(input)+2);
--    if (NULL == enc[i].name)
--	return -1;
--    enc[i].width  = width;
--    enc[i].height = height;
--    enc[i].rate.numerator   = n;
--    enc[i].rate.denominator = d;
--    sprintf(enc[i].name,"%s-%s",norm,fixname(input));
-+    enc->id     = entry;
-+    enc->name   = malloc(strlen(norm) + strlen(input) + 2);
-+    if (!enc->name)
-+        return -1;
-+
-+    enc->width  = width;
-+    enc->height = height;
-+    enc->rate.numerator   = n;
-+    enc->rate.denominator = d * 2; /* Refresh rate is twice, due to interlace */
-+    sprintf(enc->name,"%s-%s",norm,fixname(input));
-+
-+    xf86Msg(X_INFO, "v4l: adding input %s, %dx%d %d fps\n",
-+            enc->name, enc->width, enc->height, (d + n - 1)/n);
-+
-     return 0;
- }
- 
-+static int
-+V4LGetStd(PortPrivPtr p, int fd)
-+{
-+    struct v4l2_standard standard;
-+    int entries = 0;
-+
-+    /*
-+     * 128 is just an arbitrary large number. There aren't that many video stds
-+     * The max value is there just to avoid an endless loop, if the driver is
-+     * broken.
-+     */
-+    for (entries = 0; entries < 128; entries++) {
-+        memset(&standard, 0, sizeof(standard));
-+        standard.index = entries;
-+        if (-1 == ioctl(fd,VIDIOC_ENUMSTD, &standard))
-+            break;
-+        p->standard = realloc(p->standard, sizeof(standard) * (entries + 1));
-+        memcpy(&p->standard[entries], &standard, sizeof(standard));
-+    }
-+
-+    /*
-+     * Some webcam drivers don't implement VIDIOC_ENUMSTD. Fake it
-+     * This is currently unused, as no webcam driver allows OVERLAY mode,
-+     * but the code is here, in the case some webcam driver starts allowing
-+     * overlay.
-+     * FIXME: Webcam drivers may use VIDIOC_ENUM_FRAMESIZES and
-+     * VIDIOC_ENUM_FRAMEINTERVALS ioctl's that may help to fine-tune
-+     * their needs. Those ioctl's could be used here in order to better
-+     * support webcams.
-+     */
-+    if (!entries) {
-+        xf86Msg(X_INFO, "v4l: VIDIOC_ENUMSTD error %d.\n",errno);
-+        p->standard = realloc(p->standard, sizeof(standard) * (entries + 1));
-+        p->standard[0].id = V4L2_STD_ALL;
-+        strcpy((char *)p->standard[0].name, "CAMERA");
-+        p->standard[0].frameperiod.numerator = 1001;
-+        p->standard[0].frameperiod.denominator = 300001;
-+        p->standard[0].framelines = 480;
-+        entries++;
-+    }
-+    return entries;
-+}
-+
- static void
--V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
-+V4LBuildEncodings(PortPrivPtr p, int fd)
- {
--    static struct video_channel     channel;
--    int i,entries,have_bttv,bttv_ver;
--
--#define BTTV_VERSION _IOR('v' , BASE_VIDIOCPRIVATE+6, int)
--    have_bttv = 0;
--    if (-1 != ioctl(fd,BTTV_VERSION,&bttv_ver))
--	have_bttv = 1;
--	
--    entries = (have_bttv ? 7 : 3) * channels;
--    p->enc = xalloc(sizeof(XF86VideoEncodingRec) * entries);
--    if (NULL == p->enc)
--	goto fail;
--    memset(p->enc,0,sizeof(XF86VideoEncodingRec) * entries);
--    p->norm = xalloc(sizeof(int) * entries);
--    if (NULL == p->norm)
--	goto fail;
--    memset(p->norm,0,sizeof(int) * entries);
--    p->input = xalloc(sizeof(int) * entries);
--    if (NULL == p->input)
--	goto fail;
--    memset(p->input,0,sizeof(int) * entries);
-+    unsigned int inp, std, num_std;
-+
-+    num_std =  V4LGetStd(p, fd);
- 
-     p->nenc = 0;
--    for (i = 0; i < channels; i++) {
--	channel.channel = i;
--	if (-1 == ioctl(fd,VIDIOCGCHAN,&channel)) {
--	    perror("ioctl VIDIOCGCHAN");
--	    continue;
--	}
--	
--	v4l_add_enc(p->enc, p->nenc,"PAL", channel.name, 768,576, 1,50);
--	p->norm[p->nenc]  = VIDEO_MODE_PAL;
--	p->input[p->nenc] = i;
--	p->nenc++;
--	
--	v4l_add_enc(p->enc,p->nenc,"NTSC", channel.name, 640,480, 1001,60000);
--	p->norm[p->nenc]  = VIDEO_MODE_NTSC;
--	p->input[p->nenc] = i;
--	p->nenc++;
--	
--	v4l_add_enc(p->enc,p->nenc,"SECAM",channel.name, 768,576, 1,50);
--	p->norm[p->nenc]  = VIDEO_MODE_SECAM;
--	p->input[p->nenc] = i;
--	p->nenc++;
--
--	if (have_bttv) {
--	    /* workaround for a v4l design flaw:  The v4l API knows just pal,
--	       ntsc and secam.  But there are a few more norms (pal versions
--	       with a different timings used in south america for example).
--	       The bttv driver can handle these too. */
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-Nc",channel.name,
--				 640, 576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 3;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"PAL-M",channel.name,
--				 640, 576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 4;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--
--	    if (0 != v4l_add_enc(p->enc, p->nenc,"PAL-N", channel.name,
--				 768,576, 1,50))
--		goto fail;
--	    p->norm[p->nenc]  = 5;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--	    
--	    if (0 != v4l_add_enc(p->enc,p->nenc,"NTSC-JP", channel.name,
--				 640,480, 1001,60000))
--		goto fail;
--	    p->norm[p->nenc]  = 6;
--	    p->input[p->nenc] = i;
--	    p->nenc++;
--	}
-+
-+    /*
-+     * 256 is just an arbitrary large number. There aren't that many video
-+     * inputs on any driver. The max value is there just to avoid an endless
-+     * loop, if the driver is broken.
-+     */
-+    for (inp = 0; inp < 256; inp++) {
-+        struct v4l2_input       input;
-+
-+        memset(&input, 0, sizeof(input));
-+        input.index = inp;
-+        if (ioctl(fd, VIDIOC_ENUMINPUT, &input) == -1)
-+            break;
-+
-+        for (std = 0; std < num_std; std++) {
-+            int width, height;
-+
-+	    /*
-+	     * Currently, this code is not reliable, due to driver
-+	     * non-compliance on both saa7134 and bttv. So, instead,
-+	     * just use the video standard information
-+	     */
-+#if 0
-+	    struct v4l2_framebuffer fbuf;
-+
-+            /* Some webcam drivers will fail here, but that's OK */
-+            ioctl(fd, VIDIOC_S_STD, &p->standard[std].id);
-+
-+            memset(&fbuf, 0, sizeof(fbuf));
-+            if (ioctl(fd, VIDIOC_G_FBUF, &fbuf) == -1) {
-+                xf86Msg(X_INFO, "v4l: Error %d: Can't get FBUF\n", errno);
-+                return;
-+            }
-+            height = fbuf.fmt.height;
-+            width = fbuf.fmt.width;
-+
-+            /*
-+             * If the overlay method fails, get the resolution
-+             * via checking V4L2_BUF_TYPE_VIDEO_CAPTURE
-+             */
-+            if (!height || !width) {
-+                struct v4l2_format format;
-+
-+                format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+                if (ioctl(fd, VIDIOC_G_FMT, &format) == -1) {
-+                    /* Hmm... device doesn't support capture. */
-+                    height = p->standard[std].framelines;
-+                    if (height == 480)
-+                        width = 640;
-+                    else if (height == 576)
-+                        width = 768;
-+                    else
-+                        continue;
-+                } else {
-+                    height = format.fmt.pix.height;
-+                    width = format.fmt.pix.width;
-+                }
-+            }
-+#else
-+	    if (p->standard[std].id & V4L2_STD_525_60) {
-+		height = 480;
-+		width = 640;
-+	    } else {
-+		height = 576;
-+		width = 768;
-+	    }
-+
-+#endif
-+            /* Fixup for some driver bug */
-+            if ((p->standard[std].id & V4L2_STD_525_60) && (height == 576))
-+                height = 480;
-+
-+            p->enc = realloc(p->enc, sizeof(XF86VideoEncodingRec) * (p->nenc + 1));
-+            p->norm = realloc(p->norm, sizeof(int) * (p->nenc + 1));
-+            p->input = realloc(p->input, sizeof(int) * (p->nenc + 1));
-+            if (!p->enc || !p->norm || !p->input)
-+                goto fail;
-+            if (AddV4LEnc(&p->enc[p->nenc], p->nenc,
-+                          (char *)p->standard[std].name,
-+                          (char *)input.name, width, height,
-+                          p->standard[std].frameperiod.numerator,
-+                          p->standard[std].frameperiod.denominator))
-+                goto fail;
-+            p->norm[p->nenc]  = p->standard[std].id;
-+            p->input[p->nenc] = inp;
-+            p->nenc++;
-+        }
-     }
-+
-+    if (!p->nenc)
-+        xf86Msg(X_ERROR, "v4l: couldn't detect any valid input/standard\n");
-     return;
--    
-- fail:
-+
-+fail:
-+    xf86Msg(X_ERROR, "v4l: Fail to get standards: %d\n", errno);
-     if (p->input)
--	xfree(p->input);
-+        free(p->input);
-     p->input = NULL;
-     if (p->norm)
--	xfree(p->norm);
-+        free(p->norm);
-     p->norm = NULL;
-     if (p->enc)
--	xfree(p->enc);
-+        free(p->enc);
-     p->enc = NULL;
-     p->nenc = 0;
- }
-@@ -826,73 +1094,33 @@ V4LBuildEncodings(PortPrivPtr p, int fd, int channels)
- /* add a attribute a list */
- static void
- v4l_add_attr(XF86AttributeRec **list, int *count,
--	     const XF86AttributeRec *attr)
-+             const XF86AttributeRec *attr)
- {
-     XF86AttributeRec *oldlist = *list;
-     int i;
-+    Atom gpa;
- 
-     for (i = 0; i < *count; i++) {
--	if (0 == strcmp((*list)[i].name,attr->name)) {
--	    DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name));
--	    return;
--	}
-+        if (0 == strcmp((*list)[i].name,attr->name)) {
-+            DEBUG(xf86Msg(X_INFO, "v4l: skip dup attr %s\n",attr->name));
-+            return;
-+        }
-     }
--    
--    DEBUG(xf86Msg(X_INFO, "v4l: add attr %s\n",attr->name));
--    *list = xalloc((*count + 1) * sizeof(XF86AttributeRec));
-+
-+    *list = malloc((*count + 1) * sizeof(XF86AttributeRec));
-     if (NULL == *list) {
--	*count = 0;
--	return;
-+        *count = 0;
-+        return;
-     }
-     if (*count)
--	memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec));
-+        memcpy(*list, oldlist, *count * sizeof(XF86AttributeRec));
-     memcpy(*list + *count, attr, sizeof(XF86AttributeRec));
--    (*count)++;
--}
- 
--/* setup yuv overlay + hw scaling: look if we find some common video
--   format which both v4l driver and the X-Server can handle */
--static void v4l_check_yuv(ScrnInfoPtr pScrn, PortPrivPtr pPPriv,
--			  char *dev, int fd)
--{
--    static const struct {
--	unsigned int  v4l_palette;
--	unsigned int  v4l_depth;
--	unsigned int  xv_id;
--	unsigned int  xv_format;
--    } yuvlist[] = {
--	{ VIDEO_PALETTE_YUV422, 16, 0x32595559, XvPacked },
--	{ VIDEO_PALETTE_UYVY,   16, 0x59565955, XvPacked },
--	{ 0 /* end of list */ },
--    };
--    ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
--    int fmt,i;
-+    gpa = MAKE_ATOM((*list)[*count].name);
-+    xf86Msg(X_INFO, "v4l: add attr %s (Xv/GPA %d) (%d to %d)\n",
-+            attr->name, (int)gpa, attr->min_value, attr->max_value);
- 
--    pPPriv->format = xf86XVQueryOffscreenImages(pScreen,&pPPriv->nformat);
--    for (fmt = 0; yuvlist[fmt].v4l_palette != 0; fmt++) {
--	/* check v4l ... */
--	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
--	pPPriv->pict.palette = yuvlist[fmt].v4l_palette;
--	pPPriv->pict.depth   = yuvlist[fmt].v4l_depth;
--	if (-1 == ioctl(fd,VIDIOCSPICT,&pPPriv->pict))
--	    continue;
--	ioctl(fd,VIDIOCGPICT,&pPPriv->pict);
--	if (pPPriv->pict.palette != yuvlist[fmt].v4l_palette)
--	    continue;
--	/* ... works, check available offscreen image formats now ... */
--	for (i = 0; i < pPPriv->nformat; i++) {
--	    if (pPPriv->format[i].image->id     == yuvlist[fmt].xv_id &&
--		pPPriv->format[i].image->format == yuvlist[fmt].xv_format) {
--		/* ... match found, good. */
--		pPPriv->yuv_format = yuvlist[fmt].v4l_palette;
--		pPPriv->myfmt = pPPriv->format+i;
--		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
--			   "v4l[%s]: using hw video scaling [%4.4s].\n",
--			   dev,(char*)&(pPPriv->format[i].image->id));
--		return;
--	    }
--	}
--    }
-+    (*count)++;
- }
- 
- static int
-@@ -904,118 +1132,114 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
-     char dev[18];
-     int  fd,i,j,d;
- 
--    DEBUG(xf86Msg(X_INFO, "v4l: init start\n"));
--
-     for (i = 0, d = 0; d < MAX_V4L_DEVICES; d++) {
--	sprintf(dev, "/dev/video%d", d);
--	fd = open(dev, O_RDWR, 0);
--	if (fd == -1) {
--	    sprintf(dev, "/dev/v4l/video%d", d);
--	    fd = open(dev, O_RDWR, 0);
--	    if (fd == -1)
--		break;
--	}
--	DEBUG(xf86Msg(X_INFO,  "v4l: %s open ok\n",dev));
--
--	/* our private data */
--	pPPriv = xalloc(sizeof(PortPrivRec));
--	if (!pPPriv)
--	    return FALSE;
--	memset(pPPriv,0,sizeof(PortPrivRec));
--	pPPriv->nr = d;
--
--	/* check device */
--	if (-1 == ioctl(fd,VIDIOCGCAP,&pPPriv->cap) ||
--	    0 == (pPPriv->cap.type & VID_TYPE_OVERLAY)) {
--	    DEBUG(xf86Msg(X_INFO,  "v4l: %s: no overlay support\n",dev));
--	    xfree(pPPriv);
--	    close(fd);
--	    continue;
--	}
--	strncpy(V4L_NAME, dev, 16);
--	V4LBuildEncodings(pPPriv,fd,pPPriv->cap.channels);
--	if (NULL == pPPriv->enc)
--	    return FALSE;
--	v4l_check_yuv(pScrn,pPPriv,dev,fd);
--	
--	/* alloc VideoAdaptorRec */
--	VAR = xrealloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
--	VAR[i] = xalloc(sizeof(XF86VideoAdaptorRec));
--	if (!VAR[i])
--	    return FALSE;
--	memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
--
--
--	/* build attribute list */
--	for (j = 0; j < V4L_ATTR; j++) {
--	    /* video attributes */
--	    v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			 &Attributes[j]);
--	}
--	if (0 == ioctl(fd,VIDIOCGAUDIO,&pPPriv->audio)) {
--	    /* audio attributes */
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_VOLUME)
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     &VolumeAttr);
--	    if (pPPriv->audio.flags & VIDEO_AUDIO_MUTABLE)
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     &MuteAttr);
--	}
--	if (pPPriv->cap.type & VID_TYPE_TUNER) {
--	    /* tuner attributes */
--	    v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			 &FreqAttr);
--	}
--	if (0 != pPPriv->yuv_format) {
--	    /* pass throuth scaler attributes */
--	    for (j = 0; j < pPPriv->myfmt->num_attributes; j++) {
--		v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
--			     pPPriv->myfmt->attributes+j);
--	    }
--	}
--	
--	
--	/* hook in private data */
--	Private = xalloc(sizeof(DevUnion));
--	if (!Private)
--	    return FALSE;
--	memset(Private,0,sizeof(DevUnion));
--	Private->ptr = (pointer)pPPriv;
--	VAR[i]->pPortPrivates = Private;
--	VAR[i]->nPorts = 1;
--
--	/* init VideoAdaptorRec */
--	VAR[i]->type  = XvInputMask | XvWindowMask | XvVideoMask;
--	VAR[i]->name  = "video4linux";
--	VAR[i]->flags = VIDEO_INVERT_CLIPLIST;
--
--	VAR[i]->PutVideo = V4lPutVideo;
--	VAR[i]->PutStill = V4lPutStill;
--	VAR[i]->StopVideo = V4lStopVideo;
--	VAR[i]->SetPortAttribute = V4lSetPortAttribute;
--	VAR[i]->GetPortAttribute = V4lGetPortAttribute;
--	VAR[i]->QueryBestSize = V4lQueryBestSize;
--
--	VAR[i]->nEncodings = pPPriv->nenc;
--	VAR[i]->pEncodings = pPPriv->enc;
--	VAR[i]->nFormats =
--		sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
--	VAR[i]->pFormats = InputVideoFormats;
--
--	if (fd != -1)
--	    close(fd);
--	i++;
-+        sprintf(dev, "/dev/video%d", d);
-+        fd = open(dev, O_RDWR, 0);
-+        if (fd == -1) {
-+            sprintf(dev, "/dev/v4l/video%d", d);
-+            fd = open(dev, O_RDWR, 0);
-+            if (fd == -1)
-+                break;
-+        }
-+        DEBUG(xf86Msg(X_INFO,  "v4l: %s open ok\n",dev));
-+
-+        /* our private data */
-+        pPPriv = malloc(sizeof(PortPrivRec));
-+        if (!pPPriv)
-+            return FALSE;
-+        memset(pPPriv,0,sizeof(PortPrivRec));
-+        pPPriv->nr = d;
-+
-+        /* check device capabilities */
-+        memset(&pPPriv->cap, 0, sizeof(&pPPriv->cap));
-+        if (-1 == ioctl(fd, VIDIOC_QUERYCAP, &pPPriv->cap) ||
-+            0 == (pPPriv->cap.capabilities & V4L2_CAP_VIDEO_OVERLAY)) {
-+            xf86Msg(X_ERROR, "v4l: %s: no overlay support\n",dev);
-+            free(pPPriv);
-+            close(fd);
-+            continue;
-+        }
-+
-+        if (v4l_check_yuv(pScrn, pPPriv, dev, fd) == FALSE) {
-+                xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2,
-+                               "Xv Overlay not supported. Can't use v4l driver\n");
-+                free(pPPriv);
-+                close(fd);
-+                continue;
-+        }
-+
-+        xf86Msg(X_INFO, "v4l: enabling overlay mode for %s.\n", dev);
-+        strncpy(V4L_NAME, dev, 16);
-+        V4LBuildEncodings(pPPriv, fd);
-+        if (NULL == pPPriv->enc)
-+            return FALSE;
-+
-+        /* alloc VideoAdaptorRec */
-+        VAR = realloc(VAR,sizeof(XF86VideoAdaptorPtr)*(i+1));
-+        VAR[i] = malloc(sizeof(XF86VideoAdaptorRec));
-+        if (!VAR[i])
-+            return FALSE;
-+        memset(VAR[i],0,sizeof(XF86VideoAdaptorRec));
-+
-+        /* build attribute list */
-+        AddAllV4LControls(pPPriv, &VAR[i]->pAttributes, &VAR[i]->nAttributes, fd);
-+
-+        for (j = 0; j < V4L_ATTR; j++) {
-+            /* Other video attributes */
-+            v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                         &Attributes[j]);
-+        }
-+        if (pPPriv->cap.capabilities & V4L2_CAP_TUNER) {
-+            /* tuner attributes */
-+            v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                         &FreqAttr);
-+        }
-+
-+        /* Initialize yuv_format */
-+        if (0 != pPPriv->yuv_format) {
-+            /* pass throuth scaler attributes */
-+            for (j = 0; j < pPPriv->myfmt->num_attributes; j++) {
-+                v4l_add_attr(&VAR[i]->pAttributes, &VAR[i]->nAttributes,
-+                             pPPriv->myfmt->attributes+j);
-+            }
-+        }
-+
-+        DEBUG(xf86Msg(X_INFO, "v4l: saving config into driver data\n"));
-+        /* hook in private data */
-+        Private = malloc(sizeof(DevUnion));
-+        if (!Private)
-+            return FALSE;
-+        memset(Private,0,sizeof(DevUnion));
-+        Private->ptr = (pointer)pPPriv;
-+        VAR[i]->pPortPrivates = Private;
-+        VAR[i]->nPorts = 1;
-+
-+        /* init VideoAdaptorRec */
-+        VAR[i]->type  = XvInputMask | XvWindowMask | XvVideoMask;
-+        VAR[i]->name  = "video4linux";
-+        VAR[i]->flags = VIDEO_INVERT_CLIPLIST;
-+
-+        VAR[i]->PutVideo = V4lPutVideo;
-+        VAR[i]->PutStill = V4lPutStill;
-+        VAR[i]->StopVideo = V4lStopVideo;
-+        VAR[i]->SetPortAttribute = V4lSetPortAttribute;
-+        VAR[i]->GetPortAttribute = V4lGetPortAttribute;
-+        VAR[i]->QueryBestSize = V4lQueryBestSize;
-+
-+        VAR[i]->nEncodings = pPPriv->nenc;
-+        VAR[i]->pEncodings = pPPriv->enc;
-+        VAR[i]->nFormats = sizeof(InputVideoFormats) / sizeof(InputVideoFormats[0]);
-+        VAR[i]->pFormats = InputVideoFormats;
-+
-+        if (fd != -1) {
-+            DEBUG(xf86Msg(X_INFO,  "v4l: %s init finished.\n",dev));
-+            close(fd);
-+        }
-+        i++;
-     }
- 
-     xvEncoding   = MAKE_ATOM(XV_ENCODING);
--    xvHue        = MAKE_ATOM(XV_HUE);
--    xvSaturation = MAKE_ATOM(XV_SATURATION);
--    xvBrightness = MAKE_ATOM(XV_BRIGHTNESS);
--    xvContrast   = MAKE_ATOM(XV_CONTRAST);
--
-     xvFreq       = MAKE_ATOM(XV_FREQ);
--    xvMute       = MAKE_ATOM(XV_MUTE);
--    xvVolume     = MAKE_ATOM(XV_VOLUME);
- 
-     DEBUG(xf86Msg(X_INFO, "v4l: init done, %d device(s) found\n",i));
- 
-@@ -1024,10 +1248,43 @@ V4LInit(ScrnInfoPtr pScrn, XF86VideoAdaptorPtr **adaptors)
- }
- 
- static Bool
-+V4LDetect(void)
-+{
-+    struct v4l2_capability cap;
-+    int fd, d, n = 0;
-+    char dev[18];
-+
-+    for (d = 0; d < MAX_V4L_DEVICES; d++) {
-+        sprintf(dev, "/dev/video%d", d);
-+        fd = open(dev, O_RDWR, 0);
-+        if (fd == -1) {
-+            sprintf(dev, "/dev/v4l/video%d", d);
-+            fd = open(dev, O_RDWR, 0);
-+            if (fd == -1)
-+                break;
-+        }
-+        close (fd);
-+        memset(&cap, 0, sizeof(cap));
-+        if (!ioctl(fd, VIDIOC_QUERYCAP, &cap) &&
-+            (cap.capabilities & V4L2_CAP_VIDEO_OVERLAY))
-+            n++;
-+    }
-+    xf86Msg(X_INFO, "v4l: %d video adapters with overlay support detected\n", n);
-+
-+    return (n > 0) ? TRUE : FALSE;
-+}
-+
-+static Bool
- V4LProbe(DriverPtr drv, int flags)
- {
--    if (flags & PROBE_DETECT)
--	return TRUE;
-+    /*
-+     * Don't try to register adapter at the detection phase, as Xv
-+     * extensions won't be there
-+     */
-+    if (flags == PROBE_DETECT)
-+        return V4LDetect();
-+
-+    DEBUG(xf86Msg(X_INFO, "v4l: Initiating device probe\n"));
- 
-     xf86XVRegisterGenericAdaptorDriver(V4LInit);
-     drv->refCount++;
-diff --git a/src/videodev.h b/src/videodev.h
-deleted file mode 100644
-index 3c9a7d8..0000000
---- a/src/videodev.h
-+++ /dev/null
-@@ -1,254 +0,0 @@
--#ifndef __LINUX_VIDEODEV_H
--#define __LINUX_VIDEODEV_H
--
--/* Linux V4L API, Version 1
-- * videodev.h from v4l driver in Linux 2.2.3 
-- *
-- * Used here with the explicit permission of the original author, Alan Cox.
-- *				<alan@lxorguk.ukuu.org.uk>
-- */
--
--#include <X11/Xmd.h>
--
--#define VID_TYPE_CAPTURE	1	/* Can capture */
--#define VID_TYPE_TUNER		2	/* Can tune */
--#define VID_TYPE_TELETEXT	4	/* Does teletext */
--#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
--#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
--#define VID_TYPE_CLIPPING	32	/* Can clip */
--#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
--#define VID_TYPE_SCALES		128	/* Scalable */
--#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
--#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
--
--struct video_capability
--{
--	char name[32];
--	int type;
--	int channels;	/* Num channels */
--	int audios;	/* Num audio devices */
--	int maxwidth;	/* Supported width */
--	int maxheight;	/* And height */
--	int minwidth;	/* Supported width */
--	int minheight;	/* And height */
--};
--
--
--struct video_channel
--{
--	int channel;
--	char name[32];
--	int tuners;
--	CARD32  flags;
--#define VIDEO_VC_TUNER		1	/* Channel has a tuner */
--#define VIDEO_VC_AUDIO		2	/* Channel has audio */
--	CARD16  type;
--#define VIDEO_TYPE_TV		1
--#define VIDEO_TYPE_CAMERA	2	
--	CARD16 norm;			/* Norm set by channel */
--};
--
--struct video_tuner
--{
--	int tuner;
--	char name[32];
--	unsigned long rangelow, rangehigh;	/* Tuner range */
--	CARD32 flags;
--#define VIDEO_TUNER_PAL		1
--#define VIDEO_TUNER_NTSC	2
--#define VIDEO_TUNER_SECAM	4
--#define VIDEO_TUNER_LOW		8	/* Uses KHz not MHz */
--#define VIDEO_TUNER_NORM	16	/* Tuner can set norm */
--#define VIDEO_TUNER_STEREO_ON	128	/* Tuner is seeing stereo */
--	CARD16 mode;			/* PAL/NTSC/SECAM/OTHER */
--#define VIDEO_MODE_PAL		0
--#define VIDEO_MODE_NTSC		1
--#define VIDEO_MODE_SECAM	2
--#define VIDEO_MODE_AUTO		3
--	CARD16 signal;			/* Signal strength 16bit scale */
--};
--
--struct video_picture
--{
--	CARD16	brightness;
--	CARD16	hue;
--	CARD16	colour;
--	CARD16	contrast;
--	CARD16	whiteness;	/* Black and white only */
--	CARD16	depth;		/* Capture depth */
--	CARD16   palette;	/* Palette in use */
--#define VIDEO_PALETTE_GREY	1	/* Linear greyscale */
--#define VIDEO_PALETTE_HI240	2	/* High 240 cube (BT848) */
--#define VIDEO_PALETTE_RGB565	3	/* 565 16 bit RGB */
--#define VIDEO_PALETTE_RGB24	4	/* 24bit RGB */
--#define VIDEO_PALETTE_RGB32	5	/* 32bit RGB */	
--#define VIDEO_PALETTE_RGB555	6	/* 555 15bit RGB */
--#define VIDEO_PALETTE_YUV422	7	/* YUV422 capture */
--#define VIDEO_PALETTE_YUYV	8
--#define VIDEO_PALETTE_UYVY	9	/* The great thing about standards is ... */
--#define VIDEO_PALETTE_YUV420	10
--#define VIDEO_PALETTE_YUV411	11	/* YUV411 capture */
--#define VIDEO_PALETTE_RAW	12	/* RAW capture (BT848) */
--#define VIDEO_PALETTE_YUV422P	13	/* YUV 4:2:2 Planar */
--#define VIDEO_PALETTE_YUV411P	14	/* YUV 4:1:1 Planar */
--#define VIDEO_PALETTE_YUV420P	15	/* YUV 4:2:0 Planar */
--#define VIDEO_PALETTE_YUV410P	16	/* YUV 4:1:0 Planar */
--#define VIDEO_PALETTE_PLANAR	13	/* start of planar entries */
--#define VIDEO_PALETTE_COMPONENT 7	/* start of component entries */
--};
--
--struct video_audio
--{
--	int	audio;		/* Audio channel */
--	CARD16	volume;		/* If settable */
--	CARD16	bass, treble;
--	CARD32	flags;
--#define VIDEO_AUDIO_MUTE	1
--#define VIDEO_AUDIO_MUTABLE	2
--#define VIDEO_AUDIO_VOLUME	4
--#define VIDEO_AUDIO_BASS	8
--#define VIDEO_AUDIO_TREBLE	16	
--	char    name[16];
--#define VIDEO_SOUND_MONO	1
--#define VIDEO_SOUND_STEREO	2
--#define VIDEO_SOUND_LANG1	4
--#define VIDEO_SOUND_LANG2	8
--        CARD16   mode;
--        CARD16	balance;	/* Stereo balance */
--        CARD16	step;		/* Step actual volume uses */
--};
--
--struct video_clip
--{
--	INT32	x,y;
--	INT32	width, height;
--	struct	video_clip *next;	/* For user use/driver use only */
--};
--
--struct video_window
--{
--	CARD32	x,y;			/* Position of window */
--	CARD32	width,height;		/* Its size */
--	CARD32	chromakey;
--	CARD32	flags;
--	struct	video_clip *clips;	/* Set only */
--	int	clipcount;
--#define VIDEO_WINDOW_INTERLACE	1
--#define VIDEO_CLIP_BITMAP	-1
--/* bitmap is 1024x625, a '1' bit represents a clipped pixel */
--#define VIDEO_CLIPMAP_SIZE	(128 * 625)
--};
--
--struct video_capture
--{
--	CARD32 	x,y;			/* Offsets into image */
--	CARD32	width, height;		/* Area to capture */
--	CARD16	decimation;		/* Decimation divder */
--	CARD16	flags;			/* Flags for capture */
--#define VIDEO_CAPTURE_ODD		0	/* Temporal */
--#define VIDEO_CAPTURE_EVEN		1
--};
--
--struct video_buffer
--{
--	void	*base;
--	int	height,width;
--	int	depth;
--	int	bytesperline;
--};
--
--struct video_mmap
--{
--	unsigned	int frame;		/* Frame (0 - n) for double buffer */
--	int		height,width;
--	unsigned	int format;		/* should be VIDEO_PALETTE_* */
--};
--
--struct video_key
--{
--	CARD8	key[8];
--	CARD32	flags;
--};
--
--
--#define VIDEO_MAX_FRAME		32
--
--struct video_mbuf
--{
--	int	size;		/* Total memory to map */
--	int	frames;		/* Frames */
--	int	offsets[VIDEO_MAX_FRAME];
--};
--	
--
--#define 	VIDEO_NO_UNIT	(-1)
--
--	
--struct video_unit
--{
--	int 	video;		/* Video minor */
--	int	vbi;		/* VBI minor */
--	int	radio;		/* Radio minor */
--	int	audio;		/* Audio minor */
--	int	teletext;	/* Teletext minor */
--};
--
--#define VIDIOCGCAP		_IOR('v',1,struct video_capability)	/* Get capabilities */
--#define VIDIOCGCHAN		_IOWR('v',2,struct video_channel)	/* Get channel info (sources) */
--#define VIDIOCSCHAN		_IOW('v',3,struct video_channel)	/* Set channel 	*/
--#define VIDIOCGTUNER		_IOWR('v',4,struct video_tuner)		/* Get tuner abilities */
--#define VIDIOCSTUNER		_IOW('v',5,struct video_tuner)		/* Tune the tuner for the current channel */
--#define VIDIOCGPICT		_IOR('v',6,struct video_picture)	/* Get picture properties */
--#define VIDIOCSPICT		_IOW('v',7,struct video_picture)	/* Set picture properties */
--#define VIDIOCCAPTURE		_IOW('v',8,int)				/* Start, end capture */
--#define VIDIOCGWIN		_IOR('v',9, struct video_window)	/* Set the video overlay window */
--#define VIDIOCSWIN		_IOW('v',10, struct video_window)	/* Set the video overlay window - passes clip list for hardware smarts , chromakey etc */
--#define VIDIOCGFBUF		_IOR('v',11, struct video_buffer)	/* Get frame buffer */
--#define VIDIOCSFBUF		_IOW('v',12, struct video_buffer)	/* Set frame buffer - root only */
--#define VIDIOCKEY		_IOR('v',13, struct video_key)		/* Video key event - to dev 255 is to all - cuts capture on all DMA windows with this key (0xFFFFFFFF == all) */
--#define VIDIOCGFREQ		_IOR('v',14, unsigned long)		/* Set tuner */
--#define VIDIOCSFREQ		_IOW('v',15, unsigned long)		/* Set tuner */
--#define VIDIOCGAUDIO		_IOR('v',16, struct video_audio)	/* Get audio info */
--#define VIDIOCSAUDIO		_IOW('v',17, struct video_audio)	/* Audio source, mute etc */
--#define VIDIOCSYNC		_IOW('v',18, int)			/* Sync with mmap grabbing */
--#define VIDIOCMCAPTURE		_IOW('v',19, struct video_mmap)		/* Grab frames */
--#define VIDIOCGMBUF		_IOR('v', 20, struct video_mbuf)	/* Memory map buffer info */
--#define VIDIOCGUNIT		_IOR('v', 21, struct video_unit)	/* Get attached units */
--#define VIDIOCGCAPTURE		_IOR('v',22, struct video_capture)	/* Get frame buffer */
--#define VIDIOCSCAPTURE		_IOW('v',23, struct video_capture)	/* Set frame buffer - root only */
--
--#define BASE_VIDIOCPRIVATE	192		/* 192-255 are private */
--
--
--#define VID_HARDWARE_BT848	1
--#define VID_HARDWARE_QCAM_BW	2
--#define VID_HARDWARE_PMS	3
--#define VID_HARDWARE_QCAM_C	4
--#define VID_HARDWARE_PSEUDO	5
--#define VID_HARDWARE_SAA5249	6
--#define VID_HARDWARE_AZTECH	7
--#define VID_HARDWARE_SF16MI	8
--#define VID_HARDWARE_RTRACK	9
--#define VID_HARDWARE_ZOLTRIX	10
--#define VID_HARDWARE_SAA7146    11
--#define VID_HARDWARE_VIDEUM	12	/* Reserved for Winnov videum */
--#define VID_HARDWARE_RTRACK2	13
--#define VID_HARDWARE_PERMEDIA2	14	/* Reserved for Permedia2 */
--#define VID_HARDWARE_RIVA128	15	/* Reserved for RIVA 128 */
--#define VID_HARDWARE_PLANB	16	/* PowerMac motherboard video-in */
--#define VID_HARDWARE_BROADWAY	17	/* Broadway project */
--#define VID_HARDWARE_GEMTEK	18
--#define VID_HARDWARE_TYPHOON	19
--#define VID_HARDWARE_VINO	20	/* Reserved for SGI Indy Vino */
--
--/*
-- *	Initialiser list
-- */
-- 
--struct video_init
--{
--	char *name;
--	int (*init)(struct video_init *);
--};
--
--#endif
-diff --git a/src/videodev2.h b/src/videodev2.h
-new file mode 100644
-index 0000000..bf6dde2
---- /dev/null
-+++ b/src/videodev2.h
-@@ -0,0 +1,1929 @@
-+/*
-+ *  Video for Linux Two header file
-+ *
-+ *  Copyright (C) 1999-2007 the contributors
-+ *
-+ *  This program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  Alternatively you can redistribute this file under the terms of the
-+ *  BSD license as stated below:
-+ *
-+ *  Redistribution and use in source and binary forms, with or without
-+ *  modification, are permitted provided that the following conditions
-+ *  are met:
-+ *  1. Redistributions of source code must retain the above copyright
-+ *     notice, this list of conditions and the following disclaimer.
-+ *  2. Redistributions in binary form must reproduce the above copyright
-+ *     notice, this list of conditions and the following disclaimer in
-+ *     the documentation and/or other materials provided with the
-+ *     distribution.
-+ *  3. The names of its contributors may not be used to endorse or promote
-+ *     products derived from this software without specific prior written
-+ *     permission.
-+ *
-+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-+ *  TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+ *  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+ *  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ *	Header file for v4l or V4L2 drivers and applications
-+ * with public API.
-+ * All kernel-specific stuff were moved to media/v4l2-dev.h, so
-+ * no #if __KERNEL tests are allowed here
-+ *
-+ *	See http://linuxtv.org for more info
-+ *
-+ *	Author: Bill Dirks <bill@thedirks.org>
-+ *		Justin Schoeman
-+ *              Hans Verkuil <hverkuil@xs4all.nl>
-+ *		et al.
-+ */
-+#ifndef __LINUX_VIDEODEV2_H
-+#define __LINUX_VIDEODEV2_H
-+
-+#include <linux/ioctl.h>
-+#include <linux/types.h>
-+#include <sys/time.h>
-+
-+/*
-+ * Common stuff for both V4L1 and V4L2
-+ * Moved from videodev.h
-+ */
-+#define VIDEO_MAX_FRAME               32
-+#define VIDEO_MAX_PLANES               8
-+
-+/* These defines are V4L1 specific and should not be used with the V4L2 API!
-+   They will be removed from this header in the future. */
-+
-+#define VID_TYPE_CAPTURE	1	/* Can capture */
-+#define VID_TYPE_TUNER		2	/* Can tune */
-+#define VID_TYPE_TELETEXT	4	/* Does teletext */
-+#define VID_TYPE_OVERLAY	8	/* Overlay onto frame buffer */
-+#define VID_TYPE_CHROMAKEY	16	/* Overlay by chromakey */
-+#define VID_TYPE_CLIPPING	32	/* Can clip */
-+#define VID_TYPE_FRAMERAM	64	/* Uses the frame buffer memory */
-+#define VID_TYPE_SCALES		128	/* Scalable */
-+#define VID_TYPE_MONOCHROME	256	/* Monochrome only */
-+#define VID_TYPE_SUBCAPTURE	512	/* Can capture subareas of the image */
-+#define VID_TYPE_MPEG_DECODER	1024	/* Can decode MPEG streams */
-+#define VID_TYPE_MPEG_ENCODER	2048	/* Can encode MPEG streams */
-+#define VID_TYPE_MJPEG_DECODER	4096	/* Can decode MJPEG streams */
-+#define VID_TYPE_MJPEG_ENCODER	8192	/* Can encode MJPEG streams */
-+
-+/*
-+ *	M I S C E L L A N E O U S
-+ */
-+
-+/*  Four-character-code (FOURCC) */
-+#define v4l2_fourcc(a, b, c, d)\
-+	((__u32)(a) | ((__u32)(b) << 8) | ((__u32)(c) << 16) | ((__u32)(d) << 24))
-+
-+/*
-+ *	E N U M S
-+ */
-+enum v4l2_field {
-+	V4L2_FIELD_ANY           = 0, /* driver can choose from none,
-+					 top, bottom, interlaced
-+					 depending on whatever it thinks
-+					 is approximate ... */
-+	V4L2_FIELD_NONE          = 1, /* this device has no fields ... */
-+	V4L2_FIELD_TOP           = 2, /* top field only */
-+	V4L2_FIELD_BOTTOM        = 3, /* bottom field only */
-+	V4L2_FIELD_INTERLACED    = 4, /* both fields interlaced */
-+	V4L2_FIELD_SEQ_TB        = 5, /* both fields sequential into one
-+					 buffer, top-bottom order */
-+	V4L2_FIELD_SEQ_BT        = 6, /* same as above + bottom-top order */
-+	V4L2_FIELD_ALTERNATE     = 7, /* both fields alternating into
-+					 separate buffers */
-+	V4L2_FIELD_INTERLACED_TB = 8, /* both fields interlaced, top field
-+					 first and the top field is
-+					 transmitted first */
-+	V4L2_FIELD_INTERLACED_BT = 9, /* both fields interlaced, top field
-+					 first and the bottom field is
-+					 transmitted first */
-+};
-+#define V4L2_FIELD_HAS_TOP(field)	\
-+	((field) == V4L2_FIELD_TOP 	||\
-+	 (field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB	||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTTOM(field)	\
-+	((field) == V4L2_FIELD_BOTTOM 	||\
-+	 (field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB	||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+#define V4L2_FIELD_HAS_BOTH(field)	\
-+	((field) == V4L2_FIELD_INTERLACED ||\
-+	 (field) == V4L2_FIELD_INTERLACED_TB ||\
-+	 (field) == V4L2_FIELD_INTERLACED_BT ||\
-+	 (field) == V4L2_FIELD_SEQ_TB ||\
-+	 (field) == V4L2_FIELD_SEQ_BT)
-+
-+enum v4l2_buf_type {
-+	V4L2_BUF_TYPE_VIDEO_CAPTURE        = 1,
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT         = 2,
-+	V4L2_BUF_TYPE_VIDEO_OVERLAY        = 3,
-+	V4L2_BUF_TYPE_VBI_CAPTURE          = 4,
-+	V4L2_BUF_TYPE_VBI_OUTPUT           = 5,
-+	V4L2_BUF_TYPE_SLICED_VBI_CAPTURE   = 6,
-+	V4L2_BUF_TYPE_SLICED_VBI_OUTPUT    = 7,
-+#if 1
-+	/* Experimental */
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY = 8,
-+#endif
-+	V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE = 9,
-+	V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE  = 10,
-+	V4L2_BUF_TYPE_PRIVATE              = 0x80,
-+};
-+
-+#define V4L2_TYPE_IS_MULTIPLANAR(type)			\
-+	((type) == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE	\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE)
-+
-+#define V4L2_TYPE_IS_OUTPUT(type)				\
-+	((type) == V4L2_BUF_TYPE_VIDEO_OUTPUT			\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE		\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OVERLAY		\
-+	 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY	\
-+	 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT			\
-+	 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT)
-+
-+enum v4l2_tuner_type {
-+	V4L2_TUNER_RADIO	     = 1,
-+	V4L2_TUNER_ANALOG_TV	     = 2,
-+	V4L2_TUNER_DIGITAL_TV	     = 3,
-+};
-+
-+enum v4l2_memory {
-+	V4L2_MEMORY_MMAP             = 1,
-+	V4L2_MEMORY_USERPTR          = 2,
-+	V4L2_MEMORY_OVERLAY          = 3,
-+};
-+
-+/* see also http://vektor.theorem.ca/graphics/ycbcr/ */
-+enum v4l2_colorspace {
-+	/* ITU-R 601 -- broadcast NTSC/PAL */
-+	V4L2_COLORSPACE_SMPTE170M     = 1,
-+
-+	/* 1125-Line (US) HDTV */
-+	V4L2_COLORSPACE_SMPTE240M     = 2,
-+
-+	/* HD and modern captures. */
-+	V4L2_COLORSPACE_REC709        = 3,
-+
-+	/* broken BT878 extents (601, luma range 16-253 instead of 16-235) */
-+	V4L2_COLORSPACE_BT878         = 4,
-+
-+	/* These should be useful.  Assume 601 extents. */
-+	V4L2_COLORSPACE_470_SYSTEM_M  = 5,
-+	V4L2_COLORSPACE_470_SYSTEM_BG = 6,
-+
-+	/* I know there will be cameras that send this.  So, this is
-+	 * unspecified chromaticities and full 0-255 on each of the
-+	 * Y'CbCr components
-+	 */
-+	V4L2_COLORSPACE_JPEG          = 7,
-+
-+	/* For RGB colourspaces, this is probably a good start. */
-+	V4L2_COLORSPACE_SRGB          = 8,
-+};
-+
-+enum v4l2_priority {
-+	V4L2_PRIORITY_UNSET       = 0,  /* not initialized */
-+	V4L2_PRIORITY_BACKGROUND  = 1,
-+	V4L2_PRIORITY_INTERACTIVE = 2,
-+	V4L2_PRIORITY_RECORD      = 3,
-+	V4L2_PRIORITY_DEFAULT     = V4L2_PRIORITY_INTERACTIVE,
-+};
-+
-+struct v4l2_rect {
-+	__s32   left;
-+	__s32   top;
-+	__s32   width;
-+	__s32   height;
-+};
-+
-+struct v4l2_fract {
-+	__u32   numerator;
-+	__u32   denominator;
-+};
-+
-+/*
-+ *	D R I V E R   C A P A B I L I T I E S
-+ */
-+struct v4l2_capability {
-+	__u8	driver[16];	/* i.e. "bttv" */
-+	__u8	card[32];	/* i.e. "Hauppauge WinTV" */
-+	__u8	bus_info[32];	/* "PCI:" + pci_name(pci_dev) */
-+	__u32   version;        /* should use KERNEL_VERSION() */
-+	__u32	capabilities;	/* Device capabilities */
-+	__u32	reserved[4];
-+};
-+
-+/* Values for 'capabilities' field */
-+#define V4L2_CAP_VIDEO_CAPTURE		0x00000001  /* Is a video capture device */
-+#define V4L2_CAP_VIDEO_OUTPUT		0x00000002  /* Is a video output device */
-+#define V4L2_CAP_VIDEO_OVERLAY		0x00000004  /* Can do video overlay */
-+#define V4L2_CAP_VBI_CAPTURE		0x00000010  /* Is a raw VBI capture device */
-+#define V4L2_CAP_VBI_OUTPUT		0x00000020  /* Is a raw VBI output device */
-+#define V4L2_CAP_SLICED_VBI_CAPTURE	0x00000040  /* Is a sliced VBI capture device */
-+#define V4L2_CAP_SLICED_VBI_OUTPUT	0x00000080  /* Is a sliced VBI output device */
-+#define V4L2_CAP_RDS_CAPTURE		0x00000100  /* RDS data capture */
-+#define V4L2_CAP_VIDEO_OUTPUT_OVERLAY	0x00000200  /* Can do video output overlay */
-+#define V4L2_CAP_HW_FREQ_SEEK		0x00000400  /* Can do hardware frequency seek  */
-+#define V4L2_CAP_RDS_OUTPUT		0x00000800  /* Is an RDS encoder */
-+
-+/* Is a video capture device that supports multiplanar formats */
-+#define V4L2_CAP_VIDEO_CAPTURE_MPLANE	0x00001000
-+/* Is a video output device that supports multiplanar formats */
-+#define V4L2_CAP_VIDEO_OUTPUT_MPLANE	0x00002000
-+
-+#define V4L2_CAP_TUNER			0x00010000  /* has a tuner */
-+#define V4L2_CAP_AUDIO			0x00020000  /* has audio support */
-+#define V4L2_CAP_RADIO			0x00040000  /* is a radio device */
-+#define V4L2_CAP_MODULATOR		0x00080000  /* has a modulator */
-+
-+#define V4L2_CAP_READWRITE              0x01000000  /* read/write systemcalls */
-+#define V4L2_CAP_ASYNCIO                0x02000000  /* async I/O */
-+#define V4L2_CAP_STREAMING              0x04000000  /* streaming I/O ioctls */
-+
-+/*
-+ *	V I D E O   I M A G E   F O R M A T
-+ */
-+struct v4l2_pix_format {
-+	__u32         		width;
-+	__u32			height;
-+	__u32			pixelformat;
-+	enum v4l2_field  	field;
-+	__u32            	bytesperline;	/* for padding, zero if unused */
-+	__u32          		sizeimage;
-+	enum v4l2_colorspace	colorspace;
-+	__u32			priv;		/* private data, depends on pixelformat */
-+};
-+
-+/*      Pixel format         FOURCC                          depth  Description  */
-+
-+/* RGB formats */
-+#define V4L2_PIX_FMT_RGB332  v4l2_fourcc('R', 'G', 'B', '1') /*  8  RGB-3-3-2     */
-+#define V4L2_PIX_FMT_RGB444  v4l2_fourcc('R', '4', '4', '4') /* 16  xxxxrrrr ggggbbbb */
-+#define V4L2_PIX_FMT_RGB555  v4l2_fourcc('R', 'G', 'B', 'O') /* 16  RGB-5-5-5     */
-+#define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
-+#define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
-+#define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
-+#define V4L2_PIX_FMT_BGR666  v4l2_fourcc('B', 'G', 'R', 'H') /* 18  BGR-6-6-6	  */
-+#define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
-+#define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
-+#define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
-+#define V4L2_PIX_FMT_RGB32   v4l2_fourcc('R', 'G', 'B', '4') /* 32  RGB-8-8-8-8   */
-+
-+/* Grey formats */
-+#define V4L2_PIX_FMT_GREY    v4l2_fourcc('G', 'R', 'E', 'Y') /*  8  Greyscale     */
-+#define V4L2_PIX_FMT_Y4      v4l2_fourcc('Y', '0', '4', ' ') /*  4  Greyscale     */
-+#define V4L2_PIX_FMT_Y6      v4l2_fourcc('Y', '0', '6', ' ') /*  6  Greyscale     */
-+#define V4L2_PIX_FMT_Y10     v4l2_fourcc('Y', '1', '0', ' ') /* 10  Greyscale     */
-+#define V4L2_PIX_FMT_Y16     v4l2_fourcc('Y', '1', '6', ' ') /* 16  Greyscale     */
-+
-+/* Palette formats */
-+#define V4L2_PIX_FMT_PAL8    v4l2_fourcc('P', 'A', 'L', '8') /*  8  8-bit palette */
-+
-+/* Luminance+Chrominance formats */
-+#define V4L2_PIX_FMT_YVU410  v4l2_fourcc('Y', 'V', 'U', '9') /*  9  YVU 4:1:0     */
-+#define V4L2_PIX_FMT_YVU420  v4l2_fourcc('Y', 'V', '1', '2') /* 12  YVU 4:2:0     */
-+#define V4L2_PIX_FMT_YUYV    v4l2_fourcc('Y', 'U', 'Y', 'V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YYUV    v4l2_fourcc('Y', 'Y', 'U', 'V') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YVYU    v4l2_fourcc('Y', 'V', 'Y', 'U') /* 16 YVU 4:2:2 */
-+#define V4L2_PIX_FMT_UYVY    v4l2_fourcc('U', 'Y', 'V', 'Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_VYUY    v4l2_fourcc('V', 'Y', 'U', 'Y') /* 16  YUV 4:2:2     */
-+#define V4L2_PIX_FMT_YUV422P v4l2_fourcc('4', '2', '2', 'P') /* 16  YVU422 planar */
-+#define V4L2_PIX_FMT_YUV411P v4l2_fourcc('4', '1', '1', 'P') /* 16  YVU411 planar */
-+#define V4L2_PIX_FMT_Y41P    v4l2_fourcc('Y', '4', '1', 'P') /* 12  YUV 4:1:1     */
-+#define V4L2_PIX_FMT_YUV444  v4l2_fourcc('Y', '4', '4', '4') /* 16  xxxxyyyy uuuuvvvv */
-+#define V4L2_PIX_FMT_YUV555  v4l2_fourcc('Y', 'U', 'V', 'O') /* 16  YUV-5-5-5     */
-+#define V4L2_PIX_FMT_YUV565  v4l2_fourcc('Y', 'U', 'V', 'P') /* 16  YUV-5-6-5     */
-+#define V4L2_PIX_FMT_YUV32   v4l2_fourcc('Y', 'U', 'V', '4') /* 32  YUV-8-8-8-8   */
-+#define V4L2_PIX_FMT_YUV410  v4l2_fourcc('Y', 'U', 'V', '9') /*  9  YUV 4:1:0     */
-+#define V4L2_PIX_FMT_YUV420  v4l2_fourcc('Y', 'U', '1', '2') /* 12  YUV 4:2:0     */
-+#define V4L2_PIX_FMT_HI240   v4l2_fourcc('H', 'I', '2', '4') /*  8  8-bit color   */
-+#define V4L2_PIX_FMT_HM12    v4l2_fourcc('H', 'M', '1', '2') /*  8  YUV 4:2:0 16x16 macroblocks */
-+
-+/* two planes -- one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12    v4l2_fourcc('N', 'V', '1', '2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV21    v4l2_fourcc('N', 'V', '2', '1') /* 12  Y/CrCb 4:2:0  */
-+#define V4L2_PIX_FMT_NV16    v4l2_fourcc('N', 'V', '1', '6') /* 16  Y/CbCr 4:2:2  */
-+#define V4L2_PIX_FMT_NV61    v4l2_fourcc('N', 'V', '6', '1') /* 16  Y/CrCb 4:2:2  */
-+
-+/* two non contiguous planes - one Y, one Cr + Cb interleaved  */
-+#define V4L2_PIX_FMT_NV12M   v4l2_fourcc('N', 'M', '1', '2') /* 12  Y/CbCr 4:2:0  */
-+#define V4L2_PIX_FMT_NV12MT  v4l2_fourcc('T', 'M', '1', '2') /* 12  Y/CbCr 4:2:0 64x32 macroblocks */
-+
-+/* three non contiguous planes - Y, Cb, Cr */
-+#define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12  YUV420 planar */
-+
-+/* Bayer formats - see http://www.siliconimaging.com/RGB%20Bayer.htm */
-+#define V4L2_PIX_FMT_SBGGR8  v4l2_fourcc('B', 'A', '8', '1') /*  8  BGBG.. GRGR.. */
-+#define V4L2_PIX_FMT_SGBRG8  v4l2_fourcc('G', 'B', 'R', 'G') /*  8  GBGB.. RGRG.. */
-+#define V4L2_PIX_FMT_SGRBG8  v4l2_fourcc('G', 'R', 'B', 'G') /*  8  GRGR.. BGBG.. */
-+#define V4L2_PIX_FMT_SRGGB8  v4l2_fourcc('R', 'G', 'G', 'B') /*  8  RGRG.. GBGB.. */
-+#define V4L2_PIX_FMT_SBGGR10 v4l2_fourcc('B', 'G', '1', '0') /* 10  BGBG.. GRGR.. */
-+#define V4L2_PIX_FMT_SGBRG10 v4l2_fourcc('G', 'B', '1', '0') /* 10  GBGB.. RGRG.. */
-+#define V4L2_PIX_FMT_SGRBG10 v4l2_fourcc('B', 'A', '1', '0') /* 10  GRGR.. BGBG.. */
-+#define V4L2_PIX_FMT_SRGGB10 v4l2_fourcc('R', 'G', '1', '0') /* 10  RGRG.. GBGB.. */
-+	/* 10bit raw bayer DPCM compressed to 8 bits */
-+#define V4L2_PIX_FMT_SGRBG10DPCM8 v4l2_fourcc('B', 'D', '1', '0')
-+	/*
-+	 * 10bit raw bayer, expanded to 16 bits
-+	 * xxxxrrrrrrrrrrxxxxgggggggggg xxxxggggggggggxxxxbbbbbbbbbb...
-+	 */
-+#define V4L2_PIX_FMT_SBGGR16 v4l2_fourcc('B', 'Y', 'R', '2') /* 16  BGBG.. GRGR.. */
-+
-+/* compressed formats */
-+#define V4L2_PIX_FMT_MJPEG    v4l2_fourcc('M', 'J', 'P', 'G') /* Motion-JPEG   */
-+#define V4L2_PIX_FMT_JPEG     v4l2_fourcc('J', 'P', 'E', 'G') /* JFIF JPEG     */
-+#define V4L2_PIX_FMT_DV       v4l2_fourcc('d', 'v', 's', 'd') /* 1394          */
-+#define V4L2_PIX_FMT_MPEG     v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4    */
-+
-+/*  Vendor-specific formats   */
-+#define V4L2_PIX_FMT_CPIA1    v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */
-+#define V4L2_PIX_FMT_WNVA     v4l2_fourcc('W', 'N', 'V', 'A') /* Winnov hw compress */
-+#define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S', '9', '1', '0') /* SN9C10x compression */
-+#define V4L2_PIX_FMT_SN9C20X_I420 v4l2_fourcc('S', '9', '2', '0') /* SN9C20x YUV 4:2:0 */
-+#define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P', 'W', 'C', '1') /* pwc older webcam */
-+#define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P', 'W', 'C', '2') /* pwc newer webcam */
-+#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E', '6', '2', '5') /* ET61X251 compression */
-+#define V4L2_PIX_FMT_SPCA501  v4l2_fourcc('S', '5', '0', '1') /* YUYV per line */
-+#define V4L2_PIX_FMT_SPCA505  v4l2_fourcc('S', '5', '0', '5') /* YYUV per line */
-+#define V4L2_PIX_FMT_SPCA508  v4l2_fourcc('S', '5', '0', '8') /* YUVY per line */
-+#define V4L2_PIX_FMT_SPCA561  v4l2_fourcc('S', '5', '6', '1') /* compressed GBRG bayer */
-+#define V4L2_PIX_FMT_PAC207   v4l2_fourcc('P', '2', '0', '7') /* compressed BGGR bayer */
-+#define V4L2_PIX_FMT_MR97310A v4l2_fourcc('M', '3', '1', '0') /* compressed BGGR bayer */
-+#define V4L2_PIX_FMT_SN9C2028 v4l2_fourcc('S', 'O', 'N', 'X') /* compressed GBRG bayer */
-+#define V4L2_PIX_FMT_SQ905C   v4l2_fourcc('9', '0', '5', 'C') /* compressed RGGB bayer */
-+#define V4L2_PIX_FMT_PJPG     v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */
-+#define V4L2_PIX_FMT_OV511    v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */
-+#define V4L2_PIX_FMT_OV518    v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */
-+#define V4L2_PIX_FMT_STV0680  v4l2_fourcc('S', '6', '8', '0') /* stv0680 bayer */
-+#define V4L2_PIX_FMT_TM6000   v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */
-+#define V4L2_PIX_FMT_CIT_YYVYUY v4l2_fourcc('C', 'I', 'T', 'V') /* one line of Y then 1 line of VYUY */
-+#define V4L2_PIX_FMT_KONICA420  v4l2_fourcc('K', 'O', 'N', 'I') /* YUV420 planar in blocks of 256 pixels */
-+
-+/*
-+ *	F O R M A T   E N U M E R A T I O N
-+ */
-+struct v4l2_fmtdesc {
-+	__u32		    index;             /* Format number      */
-+	enum v4l2_buf_type  type;              /* buffer type        */
-+	__u32               flags;
-+	__u8		    description[32];   /* Description string */
-+	__u32		    pixelformat;       /* Format fourcc      */
-+	__u32		    reserved[4];
-+};
-+
-+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-+#define V4L2_FMT_FLAG_EMULATED   0x0002
-+
-+#if 1
-+	/* Experimental Frame Size and frame rate enumeration */
-+/*
-+ *	F R A M E   S I Z E   E N U M E R A T I O N
-+ */
-+enum v4l2_frmsizetypes {
-+	V4L2_FRMSIZE_TYPE_DISCRETE	= 1,
-+	V4L2_FRMSIZE_TYPE_CONTINUOUS	= 2,
-+	V4L2_FRMSIZE_TYPE_STEPWISE	= 3,
-+};
-+
-+struct v4l2_frmsize_discrete {
-+	__u32			width;		/* Frame width [pixel] */
-+	__u32			height;		/* Frame height [pixel] */
-+};
-+
-+struct v4l2_frmsize_stepwise {
-+	__u32			min_width;	/* Minimum frame width [pixel] */
-+	__u32			max_width;	/* Maximum frame width [pixel] */
-+	__u32			step_width;	/* Frame width step size [pixel] */
-+	__u32			min_height;	/* Minimum frame height [pixel] */
-+	__u32			max_height;	/* Maximum frame height [pixel] */
-+	__u32			step_height;	/* Frame height step size [pixel] */
-+};
-+
-+struct v4l2_frmsizeenum {
-+	__u32			index;		/* Frame size number */
-+	__u32			pixel_format;	/* Pixel format */
-+	__u32			type;		/* Frame size type the device supports. */
-+
-+	union {					/* Frame size */
-+		struct v4l2_frmsize_discrete	discrete;
-+		struct v4l2_frmsize_stepwise	stepwise;
-+	};
-+
-+	__u32   reserved[2];			/* Reserved space for future use */
-+};
-+
-+/*
-+ *	F R A M E   R A T E   E N U M E R A T I O N
-+ */
-+enum v4l2_frmivaltypes {
-+	V4L2_FRMIVAL_TYPE_DISCRETE	= 1,
-+	V4L2_FRMIVAL_TYPE_CONTINUOUS	= 2,
-+	V4L2_FRMIVAL_TYPE_STEPWISE	= 3,
-+};
-+
-+struct v4l2_frmival_stepwise {
-+	struct v4l2_fract	min;		/* Minimum frame interval [s] */
-+	struct v4l2_fract	max;		/* Maximum frame interval [s] */
-+	struct v4l2_fract	step;		/* Frame interval step size [s] */
-+};
-+
-+struct v4l2_frmivalenum {
-+	__u32			index;		/* Frame format index */
-+	__u32			pixel_format;	/* Pixel format */
-+	__u32			width;		/* Frame width */
-+	__u32			height;		/* Frame height */
-+	__u32			type;		/* Frame interval type the device supports. */
-+
-+	union {					/* Frame interval */
-+		struct v4l2_fract		discrete;
-+		struct v4l2_frmival_stepwise	stepwise;
-+	};
-+
-+	__u32	reserved[2];			/* Reserved space for future use */
-+};
-+#endif
-+
-+/*
-+ *	T I M E C O D E
-+ */
-+struct v4l2_timecode {
-+	__u32	type;
-+	__u32	flags;
-+	__u8	frames;
-+	__u8	seconds;
-+	__u8	minutes;
-+	__u8	hours;
-+	__u8	userbits[4];
-+};
-+
-+/*  Type  */
-+#define V4L2_TC_TYPE_24FPS		1
-+#define V4L2_TC_TYPE_25FPS		2
-+#define V4L2_TC_TYPE_30FPS		3
-+#define V4L2_TC_TYPE_50FPS		4
-+#define V4L2_TC_TYPE_60FPS		5
-+
-+/*  Flags  */
-+#define V4L2_TC_FLAG_DROPFRAME		0x0001 /* "drop-frame" mode */
-+#define V4L2_TC_FLAG_COLORFRAME		0x0002
-+#define V4L2_TC_USERBITS_field		0x000C
-+#define V4L2_TC_USERBITS_USERDEFINED	0x0000
-+#define V4L2_TC_USERBITS_8BITCHARS	0x0008
-+/* The above is based on SMPTE timecodes */
-+
-+struct v4l2_jpegcompression {
-+	int quality;
-+
-+	int  APPn;              /* Number of APP segment to be written,
-+				 * must be 0..15 */
-+	int  APP_len;           /* Length of data in JPEG APPn segment */
-+	char APP_data[60];      /* Data in the JPEG APPn segment. */
-+
-+	int  COM_len;           /* Length of data in JPEG COM segment */
-+	char COM_data[60];      /* Data in JPEG COM segment */
-+
-+	__u32 jpeg_markers;     /* Which markers should go into the JPEG
-+				 * output. Unless you exactly know what
-+				 * you do, leave them untouched.
-+				 * Inluding less markers will make the
-+				 * resulting code smaller, but there will
-+				 * be fewer applications which can read it.
-+				 * The presence of the APP and COM marker
-+				 * is influenced by APP_len and COM_len
-+				 * ONLY, not by this property! */
-+
-+#define V4L2_JPEG_MARKER_DHT (1<<3)    /* Define Huffman Tables */
-+#define V4L2_JPEG_MARKER_DQT (1<<4)    /* Define Quantization Tables */
-+#define V4L2_JPEG_MARKER_DRI (1<<5)    /* Define Restart Interval */
-+#define V4L2_JPEG_MARKER_COM (1<<6)    /* Comment segment */
-+#define V4L2_JPEG_MARKER_APP (1<<7)    /* App segment, driver will
-+					* allways use APP0 */
-+};
-+
-+/*
-+ *	M E M O R Y - M A P P I N G   B U F F E R S
-+ */
-+struct v4l2_requestbuffers {
-+	__u32			count;
-+	enum v4l2_buf_type      type;
-+	enum v4l2_memory        memory;
-+	__u32			reserved[2];
-+};
-+
-+/**
-+ * struct v4l2_plane - plane info for multi-planar buffers
-+ * @bytesused:		number of bytes occupied by data in the plane (payload)
-+ * @length:		size of this plane (NOT the payload) in bytes
-+ * @mem_offset:		when memory in the associated struct v4l2_buffer is
-+ *			V4L2_MEMORY_MMAP, equals the offset from the start of
-+ *			the device memory for this plane (or is a "cookie" that
-+ *			should be passed to mmap() called on the video node)
-+ * @userptr:		when memory is V4L2_MEMORY_USERPTR, a userspace pointer
-+ *			pointing to this plane
-+ * @data_offset:	offset in the plane to the start of data; usually 0,
-+ *			unless there is a header in front of the data
-+ *
-+ * Multi-planar buffers consist of one or more planes, e.g. an YCbCr buffer
-+ * with two planes can have one plane for Y, and another for interleaved CbCr
-+ * components. Each plane can reside in a separate memory buffer, or even in
-+ * a completely separate memory node (e.g. in embedded devices).
-+ */
-+struct v4l2_plane {
-+	__u32			bytesused;
-+	__u32			length;
-+	union {
-+		__u32		mem_offset;
-+		unsigned long	userptr;
-+	} m;
-+	__u32			data_offset;
-+	__u32			reserved[11];
-+};
-+
-+/**
-+ * struct v4l2_buffer - video buffer info
-+ * @index:	id number of the buffer
-+ * @type:	buffer type (type == *_MPLANE for multiplanar buffers)
-+ * @bytesused:	number of bytes occupied by data in the buffer (payload);
-+ *		unused (set to 0) for multiplanar buffers
-+ * @flags:	buffer informational flags
-+ * @field:	field order of the image in the buffer
-+ * @timestamp:	frame timestamp
-+ * @timecode:	frame timecode
-+ * @sequence:	sequence count of this frame
-+ * @memory:	the method, in which the actual video data is passed
-+ * @offset:	for non-multiplanar buffers with memory == V4L2_MEMORY_MMAP;
-+ *		offset from the start of the device memory for this plane,
-+ *		(or a "cookie" that should be passed to mmap() as offset)
-+ * @userptr:	for non-multiplanar buffers with memory == V4L2_MEMORY_USERPTR;
-+ *		a userspace pointer pointing to this buffer
-+ * @planes:	for multiplanar buffers; userspace pointer to the array of plane
-+ *		info structs for this buffer
-+ * @length:	size in bytes of the buffer (NOT its payload) for single-plane
-+ *		buffers (when type != *_MPLANE); number of elements in the
-+ *		planes array for multi-plane buffers
-+ * @input:	input number from which the video data has has been captured
-+ *
-+ * Contains data exchanged by application and driver using one of the Streaming
-+ * I/O methods.
-+ */
-+struct v4l2_buffer {
-+	__u32			index;
-+	enum v4l2_buf_type      type;
-+	__u32			bytesused;
-+	__u32			flags;
-+	enum v4l2_field		field;
-+	struct timeval		timestamp;
-+	struct v4l2_timecode	timecode;
-+	__u32			sequence;
-+
-+	/* memory location */
-+	enum v4l2_memory        memory;
-+	union {
-+		__u32           offset;
-+		unsigned long   userptr;
-+		struct v4l2_plane *planes;
-+	} m;
-+	__u32			length;
-+	__u32			input;
-+	__u32			reserved;
-+};
-+
-+/*  Flags for 'flags' field */
-+#define V4L2_BUF_FLAG_MAPPED	0x0001  /* Buffer is mapped (flag) */
-+#define V4L2_BUF_FLAG_QUEUED	0x0002	/* Buffer is queued for processing */
-+#define V4L2_BUF_FLAG_DONE	0x0004	/* Buffer is ready */
-+#define V4L2_BUF_FLAG_KEYFRAME	0x0008	/* Image is a keyframe (I-frame) */
-+#define V4L2_BUF_FLAG_PFRAME	0x0010	/* Image is a P-frame */
-+#define V4L2_BUF_FLAG_BFRAME	0x0020	/* Image is a B-frame */
-+/* Buffer is ready, but the data contained within is corrupted. */
-+#define V4L2_BUF_FLAG_ERROR	0x0040
-+#define V4L2_BUF_FLAG_TIMECODE	0x0100	/* timecode field is valid */
-+#define V4L2_BUF_FLAG_INPUT     0x0200  /* input field is valid */
-+
-+/*
-+ *	O V E R L A Y   P R E V I E W
-+ */
-+struct v4l2_framebuffer {
-+	__u32			capability;
-+	__u32			flags;
-+/* FIXME: in theory we should pass something like PCI device + memory
-+ * region + offset instead of some physical address */
-+	void                    *base;
-+	struct v4l2_pix_format	fmt;
-+};
-+/*  Flags for the 'capability' field. Read only */
-+#define V4L2_FBUF_CAP_EXTERNOVERLAY	0x0001
-+#define V4L2_FBUF_CAP_CHROMAKEY		0x0002
-+#define V4L2_FBUF_CAP_LIST_CLIPPING     0x0004
-+#define V4L2_FBUF_CAP_BITMAP_CLIPPING	0x0008
-+#define V4L2_FBUF_CAP_LOCAL_ALPHA	0x0010
-+#define V4L2_FBUF_CAP_GLOBAL_ALPHA	0x0020
-+#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA	0x0040
-+#define V4L2_FBUF_CAP_SRC_CHROMAKEY	0x0080
-+/*  Flags for the 'flags' field. */
-+#define V4L2_FBUF_FLAG_PRIMARY		0x0001
-+#define V4L2_FBUF_FLAG_OVERLAY		0x0002
-+#define V4L2_FBUF_FLAG_CHROMAKEY	0x0004
-+#define V4L2_FBUF_FLAG_LOCAL_ALPHA	0x0008
-+#define V4L2_FBUF_FLAG_GLOBAL_ALPHA	0x0010
-+#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA	0x0020
-+#define V4L2_FBUF_FLAG_SRC_CHROMAKEY	0x0040
-+
-+struct v4l2_clip {
-+	struct v4l2_rect        c;
-+	struct v4l2_clip	*next;
-+};
-+
-+struct v4l2_window {
-+	struct v4l2_rect        w;
-+	enum v4l2_field  	field;
-+	__u32			chromakey;
-+	struct v4l2_clip	*clips;
-+	__u32			clipcount;
-+	void			*bitmap;
-+	__u8                    global_alpha;
-+};
-+
-+/*
-+ *	C A P T U R E   P A R A M E T E R S
-+ */
-+struct v4l2_captureparm {
-+	__u32		   capability;	  /*  Supported modes */
-+	__u32		   capturemode;	  /*  Current mode */
-+	struct v4l2_fract  timeperframe;  /*  Time per frame in .1us units */
-+	__u32		   extendedmode;  /*  Driver-specific extensions */
-+	__u32              readbuffers;   /*  # of buffers for read */
-+	__u32		   reserved[4];
-+};
-+
-+/*  Flags for 'capability' and 'capturemode' fields */
-+#define V4L2_MODE_HIGHQUALITY	0x0001	/*  High quality imaging mode */
-+#define V4L2_CAP_TIMEPERFRAME	0x1000	/*  timeperframe field is supported */
-+
-+struct v4l2_outputparm {
-+	__u32		   capability;	 /*  Supported modes */
-+	__u32		   outputmode;	 /*  Current mode */
-+	struct v4l2_fract  timeperframe; /*  Time per frame in seconds */
-+	__u32		   extendedmode; /*  Driver-specific extensions */
-+	__u32              writebuffers; /*  # of buffers for write */
-+	__u32		   reserved[4];
-+};
-+
-+/*
-+ *	I N P U T   I M A G E   C R O P P I N G
-+ */
-+struct v4l2_cropcap {
-+	enum v4l2_buf_type      type;
-+	struct v4l2_rect        bounds;
-+	struct v4l2_rect        defrect;
-+	struct v4l2_fract       pixelaspect;
-+};
-+
-+struct v4l2_crop {
-+	enum v4l2_buf_type      type;
-+	struct v4l2_rect        c;
-+};
-+
-+/*
-+ *      A N A L O G   V I D E O   S T A N D A R D
-+ */
-+
-+typedef __u64 v4l2_std_id;
-+
-+/* one bit for each */
-+#define V4L2_STD_PAL_B          ((v4l2_std_id)0x00000001)
-+#define V4L2_STD_PAL_B1         ((v4l2_std_id)0x00000002)
-+#define V4L2_STD_PAL_G          ((v4l2_std_id)0x00000004)
-+#define V4L2_STD_PAL_H          ((v4l2_std_id)0x00000008)
-+#define V4L2_STD_PAL_I          ((v4l2_std_id)0x00000010)
-+#define V4L2_STD_PAL_D          ((v4l2_std_id)0x00000020)
-+#define V4L2_STD_PAL_D1         ((v4l2_std_id)0x00000040)
-+#define V4L2_STD_PAL_K          ((v4l2_std_id)0x00000080)
-+
-+#define V4L2_STD_PAL_M          ((v4l2_std_id)0x00000100)
-+#define V4L2_STD_PAL_N          ((v4l2_std_id)0x00000200)
-+#define V4L2_STD_PAL_Nc         ((v4l2_std_id)0x00000400)
-+#define V4L2_STD_PAL_60         ((v4l2_std_id)0x00000800)
-+
-+#define V4L2_STD_NTSC_M         ((v4l2_std_id)0x00001000)
-+#define V4L2_STD_NTSC_M_JP      ((v4l2_std_id)0x00002000)
-+#define V4L2_STD_NTSC_443       ((v4l2_std_id)0x00004000)
-+#define V4L2_STD_NTSC_M_KR      ((v4l2_std_id)0x00008000)
-+
-+#define V4L2_STD_SECAM_B        ((v4l2_std_id)0x00010000)
-+#define V4L2_STD_SECAM_D        ((v4l2_std_id)0x00020000)
-+#define V4L2_STD_SECAM_G        ((v4l2_std_id)0x00040000)
-+#define V4L2_STD_SECAM_H        ((v4l2_std_id)0x00080000)
-+#define V4L2_STD_SECAM_K        ((v4l2_std_id)0x00100000)
-+#define V4L2_STD_SECAM_K1       ((v4l2_std_id)0x00200000)
-+#define V4L2_STD_SECAM_L        ((v4l2_std_id)0x00400000)
-+#define V4L2_STD_SECAM_LC       ((v4l2_std_id)0x00800000)
-+
-+/* ATSC/HDTV */
-+#define V4L2_STD_ATSC_8_VSB     ((v4l2_std_id)0x01000000)
-+#define V4L2_STD_ATSC_16_VSB    ((v4l2_std_id)0x02000000)
-+
-+/* FIXME:
-+   Although std_id is 64 bits, there is an issue on PPC32 architecture that
-+   makes switch(__u64) to break. So, there's a hack on v4l2-common.c rounding
-+   this value to 32 bits.
-+   As, currently, the max value is for V4L2_STD_ATSC_16_VSB (30 bits wide),
-+   it should work fine. However, if needed to add more than two standards,
-+   v4l2-common.c should be fixed.
-+ */
-+
-+/* some merged standards */
-+#define V4L2_STD_MN	(V4L2_STD_PAL_M|V4L2_STD_PAL_N|V4L2_STD_PAL_Nc|V4L2_STD_NTSC)
-+#define V4L2_STD_B	(V4L2_STD_PAL_B|V4L2_STD_PAL_B1|V4L2_STD_SECAM_B)
-+#define V4L2_STD_GH	(V4L2_STD_PAL_G|V4L2_STD_PAL_H|V4L2_STD_SECAM_G|V4L2_STD_SECAM_H)
-+#define V4L2_STD_DK	(V4L2_STD_PAL_DK|V4L2_STD_SECAM_DK)
-+
-+/* some common needed stuff */
-+#define V4L2_STD_PAL_BG		(V4L2_STD_PAL_B		|\
-+				 V4L2_STD_PAL_B1	|\
-+				 V4L2_STD_PAL_G)
-+#define V4L2_STD_PAL_DK		(V4L2_STD_PAL_D		|\
-+				 V4L2_STD_PAL_D1	|\
-+				 V4L2_STD_PAL_K)
-+#define V4L2_STD_PAL		(V4L2_STD_PAL_BG	|\
-+				 V4L2_STD_PAL_DK	|\
-+				 V4L2_STD_PAL_H		|\
-+				 V4L2_STD_PAL_I)
-+#define V4L2_STD_NTSC           (V4L2_STD_NTSC_M	|\
-+				 V4L2_STD_NTSC_M_JP     |\
-+				 V4L2_STD_NTSC_M_KR)
-+#define V4L2_STD_SECAM_DK      	(V4L2_STD_SECAM_D	|\
-+				 V4L2_STD_SECAM_K	|\
-+				 V4L2_STD_SECAM_K1)
-+#define V4L2_STD_SECAM		(V4L2_STD_SECAM_B	|\
-+				 V4L2_STD_SECAM_G	|\
-+				 V4L2_STD_SECAM_H	|\
-+				 V4L2_STD_SECAM_DK	|\
-+				 V4L2_STD_SECAM_L       |\
-+				 V4L2_STD_SECAM_LC)
-+
-+#define V4L2_STD_525_60		(V4L2_STD_PAL_M		|\
-+				 V4L2_STD_PAL_60	|\
-+				 V4L2_STD_NTSC		|\
-+				 V4L2_STD_NTSC_443)
-+#define V4L2_STD_625_50		(V4L2_STD_PAL		|\
-+				 V4L2_STD_PAL_N		|\
-+				 V4L2_STD_PAL_Nc	|\
-+				 V4L2_STD_SECAM)
-+#define V4L2_STD_ATSC           (V4L2_STD_ATSC_8_VSB    |\
-+				 V4L2_STD_ATSC_16_VSB)
-+
-+#define V4L2_STD_UNKNOWN        0
-+#define V4L2_STD_ALL            (V4L2_STD_525_60	|\
-+				 V4L2_STD_625_50)
-+
-+struct v4l2_standard {
-+	__u32		     index;
-+	v4l2_std_id          id;
-+	__u8		     name[24];
-+	struct v4l2_fract    frameperiod; /* Frames, not fields */
-+	__u32		     framelines;
-+	__u32		     reserved[4];
-+};
-+
-+/*
-+ *	V I D E O	T I M I N G S	D V	P R E S E T
-+ */
-+struct v4l2_dv_preset {
-+	__u32	preset;
-+	__u32	reserved[4];
-+};
-+
-+/*
-+ *	D V	P R E S E T S	E N U M E R A T I O N
-+ */
-+struct v4l2_dv_enum_preset {
-+	__u32	index;
-+	__u32	preset;
-+	__u8	name[32]; /* Name of the preset timing */
-+	__u32	width;
-+	__u32	height;
-+	__u32	reserved[4];
-+};
-+
-+/*
-+ * 	D V	P R E S E T	V A L U E S
-+ */
-+#define		V4L2_DV_INVALID		0
-+#define		V4L2_DV_480P59_94	1 /* BT.1362 */
-+#define		V4L2_DV_576P50		2 /* BT.1362 */
-+#define		V4L2_DV_720P24		3 /* SMPTE 296M */
-+#define		V4L2_DV_720P25		4 /* SMPTE 296M */
-+#define		V4L2_DV_720P30		5 /* SMPTE 296M */
-+#define		V4L2_DV_720P50		6 /* SMPTE 296M */
-+#define		V4L2_DV_720P59_94	7 /* SMPTE 274M */
-+#define		V4L2_DV_720P60		8 /* SMPTE 274M/296M */
-+#define		V4L2_DV_1080I29_97	9 /* BT.1120/ SMPTE 274M */
-+#define		V4L2_DV_1080I30		10 /* BT.1120/ SMPTE 274M */
-+#define		V4L2_DV_1080I25		11 /* BT.1120 */
-+#define		V4L2_DV_1080I50		12 /* SMPTE 296M */
-+#define		V4L2_DV_1080I60		13 /* SMPTE 296M */
-+#define		V4L2_DV_1080P24		14 /* SMPTE 296M */
-+#define		V4L2_DV_1080P25		15 /* SMPTE 296M */
-+#define		V4L2_DV_1080P30		16 /* SMPTE 296M */
-+#define		V4L2_DV_1080P50		17 /* BT.1120 */
-+#define		V4L2_DV_1080P60		18 /* BT.1120 */
-+
-+/*
-+ *	D V 	B T	T I M I N G S
-+ */
-+
-+/* BT.656/BT.1120 timing data */
-+struct v4l2_bt_timings {
-+	__u32	width;		/* width in pixels */
-+	__u32	height;		/* height in lines */
-+	__u32	interlaced;	/* Interlaced or progressive */
-+	__u32	polarities;	/* Positive or negative polarity */
-+	__u64	pixelclock;	/* Pixel clock in HZ. Ex. 74.25MHz->74250000 */
-+	__u32	hfrontporch;	/* Horizpontal front porch in pixels */
-+	__u32	hsync;		/* Horizontal Sync length in pixels */
-+	__u32	hbackporch;	/* Horizontal back porch in pixels */
-+	__u32	vfrontporch;	/* Vertical front porch in pixels */
-+	__u32	vsync;		/* Vertical Sync length in lines */
-+	__u32	vbackporch;	/* Vertical back porch in lines */
-+	__u32	il_vfrontporch;	/* Vertical front porch for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	il_vsync;	/* Vertical sync length for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	il_vbackporch;	/* Vertical back porch for bottom field of
-+				 * interlaced field formats
-+				 */
-+	__u32	reserved[16];
-+} __attribute__ ((packed));
-+
-+/* Interlaced or progressive format */
-+#define	V4L2_DV_PROGRESSIVE	0
-+#define	V4L2_DV_INTERLACED	1
-+
-+/* Polarities. If bit is not set, it is assumed to be negative polarity */
-+#define V4L2_DV_VSYNC_POS_POL	0x00000001
-+#define V4L2_DV_HSYNC_POS_POL	0x00000002
-+
-+
-+/* DV timings */
-+struct v4l2_dv_timings {
-+	__u32 type;
-+	union {
-+		struct v4l2_bt_timings	bt;
-+		__u32	reserved[32];
-+	};
-+} __attribute__ ((packed));
-+
-+/* Values for the type field */
-+#define V4L2_DV_BT_656_1120	0	/* BT.656/1120 timing type */
-+
-+/*
-+ *	V I D E O   I N P U T S
-+ */
-+struct v4l2_input {
-+	__u32	     index;		/*  Which input */
-+	__u8	     name[32];		/*  Label */
-+	__u32	     type;		/*  Type of input */
-+	__u32	     audioset;		/*  Associated audios (bitfield) */
-+	__u32        tuner;             /*  Associated tuner */
-+	v4l2_std_id  std;
-+	__u32	     status;
-+	__u32	     capabilities;
-+	__u32	     reserved[3];
-+};
-+
-+/*  Values for the 'type' field */
-+#define V4L2_INPUT_TYPE_TUNER		1
-+#define V4L2_INPUT_TYPE_CAMERA		2
-+
-+/* field 'status' - general */
-+#define V4L2_IN_ST_NO_POWER    0x00000001  /* Attached device is off */
-+#define V4L2_IN_ST_NO_SIGNAL   0x00000002
-+#define V4L2_IN_ST_NO_COLOR    0x00000004
-+
-+/* field 'status' - sensor orientation */
-+/* If sensor is mounted upside down set both bits */
-+#define V4L2_IN_ST_HFLIP       0x00000010 /* Frames are flipped horizontally */
-+#define V4L2_IN_ST_VFLIP       0x00000020 /* Frames are flipped vertically */
-+
-+/* field 'status' - analog */
-+#define V4L2_IN_ST_NO_H_LOCK   0x00000100  /* No horizontal sync lock */
-+#define V4L2_IN_ST_COLOR_KILL  0x00000200  /* Color killer is active */
-+
-+/* field 'status' - digital */
-+#define V4L2_IN_ST_NO_SYNC     0x00010000  /* No synchronization lock */
-+#define V4L2_IN_ST_NO_EQU      0x00020000  /* No equalizer lock */
-+#define V4L2_IN_ST_NO_CARRIER  0x00040000  /* Carrier recovery failed */
-+
-+/* field 'status' - VCR and set-top box */
-+#define V4L2_IN_ST_MACROVISION 0x01000000  /* Macrovision detected */
-+#define V4L2_IN_ST_NO_ACCESS   0x02000000  /* Conditional access denied */
-+#define V4L2_IN_ST_VTR         0x04000000  /* VTR time constant */
-+
-+/* capabilities flags */
-+#define V4L2_IN_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */
-+#define V4L2_IN_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */
-+#define V4L2_IN_CAP_STD			0x00000004 /* Supports S_STD */
-+
-+/*
-+ *	V I D E O   O U T P U T S
-+ */
-+struct v4l2_output {
-+	__u32	     index;		/*  Which output */
-+	__u8	     name[32];		/*  Label */
-+	__u32	     type;		/*  Type of output */
-+	__u32	     audioset;		/*  Associated audios (bitfield) */
-+	__u32	     modulator;         /*  Associated modulator */
-+	v4l2_std_id  std;
-+	__u32	     capabilities;
-+	__u32	     reserved[3];
-+};
-+/*  Values for the 'type' field */
-+#define V4L2_OUTPUT_TYPE_MODULATOR		1
-+#define V4L2_OUTPUT_TYPE_ANALOG			2
-+#define V4L2_OUTPUT_TYPE_ANALOGVGAOVERLAY	3
-+
-+/* capabilities flags */
-+#define V4L2_OUT_CAP_PRESETS		0x00000001 /* Supports S_DV_PRESET */
-+#define V4L2_OUT_CAP_CUSTOM_TIMINGS	0x00000002 /* Supports S_DV_TIMINGS */
-+#define V4L2_OUT_CAP_STD		0x00000004 /* Supports S_STD */
-+
-+/*
-+ *	C O N T R O L S
-+ */
-+struct v4l2_control {
-+	__u32		     id;
-+	__s32		     value;
-+};
-+
-+struct v4l2_ext_control {
-+	__u32 id;
-+	__u32 size;
-+	__u32 reserved2[1];
-+	union {
-+		__s32 value;
-+		__s64 value64;
-+		char *string;
-+	};
-+} __attribute__ ((packed));
-+
-+struct v4l2_ext_controls {
-+	__u32 ctrl_class;
-+	__u32 count;
-+	__u32 error_idx;
-+	__u32 reserved[2];
-+	struct v4l2_ext_control *controls;
-+};
-+
-+/*  Values for ctrl_class field */
-+#define V4L2_CTRL_CLASS_USER 0x00980000	/* Old-style 'user' controls */
-+#define V4L2_CTRL_CLASS_MPEG 0x00990000	/* MPEG-compression controls */
-+#define V4L2_CTRL_CLASS_CAMERA 0x009a0000	/* Camera class controls */
-+#define V4L2_CTRL_CLASS_FM_TX 0x009b0000	/* FM Modulator control class */
-+
-+#define V4L2_CTRL_ID_MASK      	  (0x0fffffff)
-+#define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
-+#define V4L2_CTRL_DRIVER_PRIV(id) (((id) & 0xffff) >= 0x1000)
-+
-+enum v4l2_ctrl_type {
-+	V4L2_CTRL_TYPE_INTEGER	     = 1,
-+	V4L2_CTRL_TYPE_BOOLEAN	     = 2,
-+	V4L2_CTRL_TYPE_MENU	     = 3,
-+	V4L2_CTRL_TYPE_BUTTON	     = 4,
-+	V4L2_CTRL_TYPE_INTEGER64     = 5,
-+	V4L2_CTRL_TYPE_CTRL_CLASS    = 6,
-+	V4L2_CTRL_TYPE_STRING        = 7,
-+};
-+
-+/*  Used in the VIDIOC_QUERYCTRL ioctl for querying controls */
-+struct v4l2_queryctrl {
-+	__u32		     id;
-+	enum v4l2_ctrl_type  type;
-+	__u8		     name[32];	/* Whatever */
-+	__s32		     minimum;	/* Note signedness */
-+	__s32		     maximum;
-+	__s32		     step;
-+	__s32		     default_value;
-+	__u32                flags;
-+	__u32		     reserved[2];
-+};
-+
-+/*  Used in the VIDIOC_QUERYMENU ioctl for querying menu items */
-+struct v4l2_querymenu {
-+	__u32		id;
-+	__u32		index;
-+	__u8		name[32];	/* Whatever */
-+	__u32		reserved;
-+};
-+
-+/*  Control flags  */
-+#define V4L2_CTRL_FLAG_DISABLED		0x0001
-+#define V4L2_CTRL_FLAG_GRABBED		0x0002
-+#define V4L2_CTRL_FLAG_READ_ONLY 	0x0004
-+#define V4L2_CTRL_FLAG_UPDATE 		0x0008
-+#define V4L2_CTRL_FLAG_INACTIVE 	0x0010
-+#define V4L2_CTRL_FLAG_SLIDER 		0x0020
-+#define V4L2_CTRL_FLAG_WRITE_ONLY 	0x0040
-+
-+/*  Query flag, to be ORed with the control ID */
-+#define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
-+
-+/*  User-class control IDs defined by V4L2 */
-+#define V4L2_CID_BASE			(V4L2_CTRL_CLASS_USER | 0x900)
-+#define V4L2_CID_USER_BASE 		V4L2_CID_BASE
-+/*  IDs reserved for driver specific controls */
-+#define V4L2_CID_PRIVATE_BASE		0x08000000
-+
-+#define V4L2_CID_USER_CLASS 		(V4L2_CTRL_CLASS_USER | 1)
-+#define V4L2_CID_BRIGHTNESS		(V4L2_CID_BASE+0)
-+#define V4L2_CID_CONTRAST		(V4L2_CID_BASE+1)
-+#define V4L2_CID_SATURATION		(V4L2_CID_BASE+2)
-+#define V4L2_CID_HUE			(V4L2_CID_BASE+3)
-+#define V4L2_CID_AUDIO_VOLUME		(V4L2_CID_BASE+5)
-+#define V4L2_CID_AUDIO_BALANCE		(V4L2_CID_BASE+6)
-+#define V4L2_CID_AUDIO_BASS		(V4L2_CID_BASE+7)
-+#define V4L2_CID_AUDIO_TREBLE		(V4L2_CID_BASE+8)
-+#define V4L2_CID_AUDIO_MUTE		(V4L2_CID_BASE+9)
-+#define V4L2_CID_AUDIO_LOUDNESS		(V4L2_CID_BASE+10)
-+#define V4L2_CID_BLACK_LEVEL		(V4L2_CID_BASE+11) /* Deprecated */
-+#define V4L2_CID_AUTO_WHITE_BALANCE	(V4L2_CID_BASE+12)
-+#define V4L2_CID_DO_WHITE_BALANCE	(V4L2_CID_BASE+13)
-+#define V4L2_CID_RED_BALANCE		(V4L2_CID_BASE+14)
-+#define V4L2_CID_BLUE_BALANCE		(V4L2_CID_BASE+15)
-+#define V4L2_CID_GAMMA			(V4L2_CID_BASE+16)
-+#define V4L2_CID_WHITENESS		(V4L2_CID_GAMMA) /* Deprecated */
-+#define V4L2_CID_EXPOSURE		(V4L2_CID_BASE+17)
-+#define V4L2_CID_AUTOGAIN		(V4L2_CID_BASE+18)
-+#define V4L2_CID_GAIN			(V4L2_CID_BASE+19)
-+#define V4L2_CID_HFLIP			(V4L2_CID_BASE+20)
-+#define V4L2_CID_VFLIP			(V4L2_CID_BASE+21)
-+
-+/* Deprecated; use V4L2_CID_PAN_RESET and V4L2_CID_TILT_RESET */
-+#define V4L2_CID_HCENTER		(V4L2_CID_BASE+22)
-+#define V4L2_CID_VCENTER		(V4L2_CID_BASE+23)
-+
-+#define V4L2_CID_POWER_LINE_FREQUENCY	(V4L2_CID_BASE+24)
-+enum v4l2_power_line_frequency {
-+	V4L2_CID_POWER_LINE_FREQUENCY_DISABLED	= 0,
-+	V4L2_CID_POWER_LINE_FREQUENCY_50HZ	= 1,
-+	V4L2_CID_POWER_LINE_FREQUENCY_60HZ	= 2,
-+};
-+#define V4L2_CID_HUE_AUTO			(V4L2_CID_BASE+25)
-+#define V4L2_CID_WHITE_BALANCE_TEMPERATURE	(V4L2_CID_BASE+26)
-+#define V4L2_CID_SHARPNESS			(V4L2_CID_BASE+27)
-+#define V4L2_CID_BACKLIGHT_COMPENSATION 	(V4L2_CID_BASE+28)
-+#define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
-+#define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
-+#define V4L2_CID_COLORFX			(V4L2_CID_BASE+31)
-+enum v4l2_colorfx {
-+	V4L2_COLORFX_NONE	= 0,
-+	V4L2_COLORFX_BW		= 1,
-+	V4L2_COLORFX_SEPIA	= 2,
-+	V4L2_COLORFX_NEGATIVE = 3,
-+	V4L2_COLORFX_EMBOSS = 4,
-+	V4L2_COLORFX_SKETCH = 5,
-+	V4L2_COLORFX_SKY_BLUE = 6,
-+	V4L2_COLORFX_GRASS_GREEN = 7,
-+	V4L2_COLORFX_SKIN_WHITEN = 8,
-+	V4L2_COLORFX_VIVID = 9,
-+};
-+#define V4L2_CID_AUTOBRIGHTNESS			(V4L2_CID_BASE+32)
-+#define V4L2_CID_BAND_STOP_FILTER		(V4L2_CID_BASE+33)
-+
-+#define V4L2_CID_ROTATE				(V4L2_CID_BASE+34)
-+#define V4L2_CID_BG_COLOR			(V4L2_CID_BASE+35)
-+
-+#define V4L2_CID_CHROMA_GAIN                    (V4L2_CID_BASE+36)
-+
-+#define V4L2_CID_ILLUMINATORS_1			(V4L2_CID_BASE+37)
-+#define V4L2_CID_ILLUMINATORS_2			(V4L2_CID_BASE+38)
-+
-+/* last CID + 1 */
-+#define V4L2_CID_LASTP1                         (V4L2_CID_BASE+39)
-+
-+/*  MPEG-class control IDs defined by V4L2 */
-+#define V4L2_CID_MPEG_BASE 			(V4L2_CTRL_CLASS_MPEG | 0x900)
-+#define V4L2_CID_MPEG_CLASS 			(V4L2_CTRL_CLASS_MPEG | 1)
-+
-+/*  MPEG streams */
-+#define V4L2_CID_MPEG_STREAM_TYPE 		(V4L2_CID_MPEG_BASE+0)
-+enum v4l2_mpeg_stream_type {
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG1_SS   = 2, /* MPEG-1 system stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_DVD  = 3, /* MPEG-2 DVD-compatible stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
-+	V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
-+};
-+#define V4L2_CID_MPEG_STREAM_PID_PMT 		(V4L2_CID_MPEG_BASE+1)
-+#define V4L2_CID_MPEG_STREAM_PID_AUDIO 		(V4L2_CID_MPEG_BASE+2)
-+#define V4L2_CID_MPEG_STREAM_PID_VIDEO 		(V4L2_CID_MPEG_BASE+3)
-+#define V4L2_CID_MPEG_STREAM_PID_PCR 		(V4L2_CID_MPEG_BASE+4)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO 	(V4L2_CID_MPEG_BASE+5)
-+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO 	(V4L2_CID_MPEG_BASE+6)
-+#define V4L2_CID_MPEG_STREAM_VBI_FMT 		(V4L2_CID_MPEG_BASE+7)
-+enum v4l2_mpeg_stream_vbi_fmt {
-+	V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
-+	V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
-+};
-+
-+/*  MPEG audio */
-+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ 	(V4L2_CID_MPEG_BASE+100)
-+enum v4l2_mpeg_audio_sampling_freq {
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
-+	V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_ENCODING 		(V4L2_CID_MPEG_BASE+101)
-+enum v4l2_mpeg_audio_encoding {
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
-+	V4L2_MPEG_AUDIO_ENCODING_LAYER_3 = 2,
-+	V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
-+	V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE 		(V4L2_CID_MPEG_BASE+102)
-+enum v4l2_mpeg_audio_l1_bitrate {
-+	V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_96K  = 2,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_128K = 3,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_160K = 4,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_192K = 5,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_224K = 6,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_256K = 7,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_288K = 8,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_320K = 9,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_352K = 10,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_384K = 11,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
-+	V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE 		(V4L2_CID_MPEG_BASE+103)
-+enum v4l2_mpeg_audio_l2_bitrate {
-+	V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_56K  = 2,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_64K  = 3,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_80K  = 4,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_96K  = 5,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_112K = 6,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_128K = 7,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_160K = 8,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_192K = 9,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_224K = 10,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_256K = 11,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
-+	V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE 		(V4L2_CID_MPEG_BASE+104)
-+enum v4l2_mpeg_audio_l3_bitrate {
-+	V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_48K  = 2,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_56K  = 3,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_64K  = 4,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_80K  = 5,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_96K  = 6,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_112K = 7,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_128K = 8,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_160K = 9,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_192K = 10,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_224K = 11,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
-+	V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE 		(V4L2_CID_MPEG_BASE+105)
-+enum v4l2_mpeg_audio_mode {
-+	V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
-+	V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
-+	V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
-+	V4L2_MPEG_AUDIO_MODE_MONO         = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION 	(V4L2_CID_MPEG_BASE+106)
-+enum v4l2_mpeg_audio_mode_extension {
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
-+	V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
-+};
-+#define V4L2_CID_MPEG_AUDIO_EMPHASIS 		(V4L2_CID_MPEG_BASE+107)
-+enum v4l2_mpeg_audio_emphasis {
-+	V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
-+	V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
-+	V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
-+};
-+#define V4L2_CID_MPEG_AUDIO_CRC 		(V4L2_CID_MPEG_BASE+108)
-+enum v4l2_mpeg_audio_crc {
-+	V4L2_MPEG_AUDIO_CRC_NONE  = 0,
-+	V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
-+};
-+#define V4L2_CID_MPEG_AUDIO_MUTE 		(V4L2_CID_MPEG_BASE+109)
-+#define V4L2_CID_MPEG_AUDIO_AAC_BITRATE		(V4L2_CID_MPEG_BASE+110)
-+#define V4L2_CID_MPEG_AUDIO_AC3_BITRATE		(V4L2_CID_MPEG_BASE+111)
-+enum v4l2_mpeg_audio_ac3_bitrate {
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_32K  = 0,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_40K  = 1,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_48K  = 2,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_56K  = 3,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_64K  = 4,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_80K  = 5,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_96K  = 6,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_112K = 7,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_128K = 8,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_160K = 9,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_192K = 10,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_224K = 11,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_256K = 12,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_320K = 13,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_384K = 14,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_448K = 15,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_512K = 16,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_576K = 17,
-+	V4L2_MPEG_AUDIO_AC3_BITRATE_640K = 18,
-+};
-+
-+/*  MPEG video */
-+#define V4L2_CID_MPEG_VIDEO_ENCODING 		(V4L2_CID_MPEG_BASE+200)
-+enum v4l2_mpeg_video_encoding {
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
-+	V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
-+};
-+#define V4L2_CID_MPEG_VIDEO_ASPECT 		(V4L2_CID_MPEG_BASE+201)
-+enum v4l2_mpeg_video_aspect {
-+	V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
-+	V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
-+	V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
-+	V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
-+};
-+#define V4L2_CID_MPEG_VIDEO_B_FRAMES 		(V4L2_CID_MPEG_BASE+202)
-+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE 		(V4L2_CID_MPEG_BASE+203)
-+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE 	(V4L2_CID_MPEG_BASE+204)
-+#define V4L2_CID_MPEG_VIDEO_PULLDOWN 		(V4L2_CID_MPEG_BASE+205)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE 	(V4L2_CID_MPEG_BASE+206)
-+enum v4l2_mpeg_video_bitrate_mode {
-+	V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
-+	V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
-+};
-+#define V4L2_CID_MPEG_VIDEO_BITRATE 		(V4L2_CID_MPEG_BASE+207)
-+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK 	(V4L2_CID_MPEG_BASE+208)
-+#define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-+#define V4L2_CID_MPEG_VIDEO_MUTE 		(V4L2_CID_MPEG_BASE+210)
-+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV 		(V4L2_CID_MPEG_BASE+211)
-+
-+/*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-+#define V4L2_CID_MPEG_CX2341X_BASE 				(V4L2_CTRL_CLASS_MPEG | 0x1000)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+0)
-+enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
-+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+1)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+2)
-+enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_VERT              = 2,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
-+	V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE 	(V4L2_CID_MPEG_CX2341X_BASE+3)
-+enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE 	(V4L2_CID_MPEG_CX2341X_BASE+4)
-+enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
-+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER 		(V4L2_CID_MPEG_CX2341X_BASE+5)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE 		(V4L2_CID_MPEG_CX2341X_BASE+6)
-+enum v4l2_mpeg_cx2341x_video_median_filter_type {
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_VERT     = 2,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
-+	V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
-+};
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM 	(V4L2_CID_MPEG_CX2341X_BASE+7)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+8)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM	(V4L2_CID_MPEG_CX2341X_BASE+9)
-+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP 	(V4L2_CID_MPEG_CX2341X_BASE+10)
-+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS 	(V4L2_CID_MPEG_CX2341X_BASE+11)
-+
-+/*  Camera class control IDs */
-+#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)
-+#define V4L2_CID_CAMERA_CLASS 		(V4L2_CTRL_CLASS_CAMERA | 1)
-+
-+#define V4L2_CID_EXPOSURE_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+1)
-+enum  v4l2_exposure_auto_type {
-+	V4L2_EXPOSURE_AUTO = 0,
-+	V4L2_EXPOSURE_MANUAL = 1,
-+	V4L2_EXPOSURE_SHUTTER_PRIORITY = 2,
-+	V4L2_EXPOSURE_APERTURE_PRIORITY = 3
-+};
-+#define V4L2_CID_EXPOSURE_ABSOLUTE		(V4L2_CID_CAMERA_CLASS_BASE+2)
-+#define V4L2_CID_EXPOSURE_AUTO_PRIORITY		(V4L2_CID_CAMERA_CLASS_BASE+3)
-+
-+#define V4L2_CID_PAN_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+4)
-+#define V4L2_CID_TILT_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+5)
-+#define V4L2_CID_PAN_RESET			(V4L2_CID_CAMERA_CLASS_BASE+6)
-+#define V4L2_CID_TILT_RESET			(V4L2_CID_CAMERA_CLASS_BASE+7)
-+
-+#define V4L2_CID_PAN_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+8)
-+#define V4L2_CID_TILT_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+9)
-+
-+#define V4L2_CID_FOCUS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+10)
-+#define V4L2_CID_FOCUS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+11)
-+#define V4L2_CID_FOCUS_AUTO			(V4L2_CID_CAMERA_CLASS_BASE+12)
-+
-+#define V4L2_CID_ZOOM_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+13)
-+#define V4L2_CID_ZOOM_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+14)
-+#define V4L2_CID_ZOOM_CONTINUOUS		(V4L2_CID_CAMERA_CLASS_BASE+15)
-+
-+#define V4L2_CID_PRIVACY			(V4L2_CID_CAMERA_CLASS_BASE+16)
-+
-+#define V4L2_CID_IRIS_ABSOLUTE			(V4L2_CID_CAMERA_CLASS_BASE+17)
-+#define V4L2_CID_IRIS_RELATIVE			(V4L2_CID_CAMERA_CLASS_BASE+18)
-+
-+/* FM Modulator class control IDs */
-+#define V4L2_CID_FM_TX_CLASS_BASE		(V4L2_CTRL_CLASS_FM_TX | 0x900)
-+#define V4L2_CID_FM_TX_CLASS			(V4L2_CTRL_CLASS_FM_TX | 1)
-+
-+#define V4L2_CID_RDS_TX_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 1)
-+#define V4L2_CID_RDS_TX_PI			(V4L2_CID_FM_TX_CLASS_BASE + 2)
-+#define V4L2_CID_RDS_TX_PTY			(V4L2_CID_FM_TX_CLASS_BASE + 3)
-+#define V4L2_CID_RDS_TX_PS_NAME			(V4L2_CID_FM_TX_CLASS_BASE + 5)
-+#define V4L2_CID_RDS_TX_RADIO_TEXT		(V4L2_CID_FM_TX_CLASS_BASE + 6)
-+
-+#define V4L2_CID_AUDIO_LIMITER_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 64)
-+#define V4L2_CID_AUDIO_LIMITER_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 65)
-+#define V4L2_CID_AUDIO_LIMITER_DEVIATION	(V4L2_CID_FM_TX_CLASS_BASE + 66)
-+
-+#define V4L2_CID_AUDIO_COMPRESSION_ENABLED	(V4L2_CID_FM_TX_CLASS_BASE + 80)
-+#define V4L2_CID_AUDIO_COMPRESSION_GAIN		(V4L2_CID_FM_TX_CLASS_BASE + 81)
-+#define V4L2_CID_AUDIO_COMPRESSION_THRESHOLD	(V4L2_CID_FM_TX_CLASS_BASE + 82)
-+#define V4L2_CID_AUDIO_COMPRESSION_ATTACK_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 83)
-+#define V4L2_CID_AUDIO_COMPRESSION_RELEASE_TIME	(V4L2_CID_FM_TX_CLASS_BASE + 84)
-+
-+#define V4L2_CID_PILOT_TONE_ENABLED		(V4L2_CID_FM_TX_CLASS_BASE + 96)
-+#define V4L2_CID_PILOT_TONE_DEVIATION		(V4L2_CID_FM_TX_CLASS_BASE + 97)
-+#define V4L2_CID_PILOT_TONE_FREQUENCY		(V4L2_CID_FM_TX_CLASS_BASE + 98)
-+
-+#define V4L2_CID_TUNE_PREEMPHASIS		(V4L2_CID_FM_TX_CLASS_BASE + 112)
-+enum v4l2_preemphasis {
-+	V4L2_PREEMPHASIS_DISABLED	= 0,
-+	V4L2_PREEMPHASIS_50_uS		= 1,
-+	V4L2_PREEMPHASIS_75_uS		= 2,
-+};
-+#define V4L2_CID_TUNE_POWER_LEVEL		(V4L2_CID_FM_TX_CLASS_BASE + 113)
-+#define V4L2_CID_TUNE_ANTENNA_CAPACITOR		(V4L2_CID_FM_TX_CLASS_BASE + 114)
-+
-+/*
-+ *	T U N I N G
-+ */
-+struct v4l2_tuner {
-+	__u32                   index;
-+	__u8			name[32];
-+	enum v4l2_tuner_type    type;
-+	__u32			capability;
-+	__u32			rangelow;
-+	__u32			rangehigh;
-+	__u32			rxsubchans;
-+	__u32			audmode;
-+	__s32			signal;
-+	__s32			afc;
-+	__u32			reserved[4];
-+};
-+
-+struct v4l2_modulator {
-+	__u32			index;
-+	__u8			name[32];
-+	__u32			capability;
-+	__u32			rangelow;
-+	__u32			rangehigh;
-+	__u32			txsubchans;
-+	__u32			reserved[4];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_TUNER_CAP_LOW		0x0001
-+#define V4L2_TUNER_CAP_NORM		0x0002
-+#define V4L2_TUNER_CAP_STEREO		0x0010
-+#define V4L2_TUNER_CAP_LANG2		0x0020
-+#define V4L2_TUNER_CAP_SAP		0x0020
-+#define V4L2_TUNER_CAP_LANG1		0x0040
-+#define V4L2_TUNER_CAP_RDS		0x0080
-+#define V4L2_TUNER_CAP_RDS_BLOCK_IO	0x0100
-+#define V4L2_TUNER_CAP_RDS_CONTROLS	0x0200
-+
-+/*  Flags for the 'rxsubchans' field */
-+#define V4L2_TUNER_SUB_MONO		0x0001
-+#define V4L2_TUNER_SUB_STEREO		0x0002
-+#define V4L2_TUNER_SUB_LANG2		0x0004
-+#define V4L2_TUNER_SUB_SAP		0x0004
-+#define V4L2_TUNER_SUB_LANG1		0x0008
-+#define V4L2_TUNER_SUB_RDS		0x0010
-+
-+/*  Values for the 'audmode' field */
-+#define V4L2_TUNER_MODE_MONO		0x0000
-+#define V4L2_TUNER_MODE_STEREO		0x0001
-+#define V4L2_TUNER_MODE_LANG2		0x0002
-+#define V4L2_TUNER_MODE_SAP		0x0002
-+#define V4L2_TUNER_MODE_LANG1		0x0003
-+#define V4L2_TUNER_MODE_LANG1_LANG2	0x0004
-+
-+struct v4l2_frequency {
-+	__u32		      tuner;
-+	enum v4l2_tuner_type  type;
-+	__u32		      frequency;
-+	__u32		      reserved[8];
-+};
-+
-+struct v4l2_hw_freq_seek {
-+	__u32		      tuner;
-+	enum v4l2_tuner_type  type;
-+	__u32		      seek_upward;
-+	__u32		      wrap_around;
-+	__u32		      spacing;
-+	__u32		      reserved[7];
-+};
-+
-+/*
-+ *	R D S
-+ */
-+
-+struct v4l2_rds_data {
-+	__u8 	lsb;
-+	__u8 	msb;
-+	__u8 	block;
-+} __attribute__ ((packed));
-+
-+#define V4L2_RDS_BLOCK_MSK 	 0x7
-+#define V4L2_RDS_BLOCK_A 	 0
-+#define V4L2_RDS_BLOCK_B 	 1
-+#define V4L2_RDS_BLOCK_C 	 2
-+#define V4L2_RDS_BLOCK_D 	 3
-+#define V4L2_RDS_BLOCK_C_ALT 	 4
-+#define V4L2_RDS_BLOCK_INVALID 	 7
-+
-+#define V4L2_RDS_BLOCK_CORRECTED 0x40
-+#define V4L2_RDS_BLOCK_ERROR 	 0x80
-+
-+/*
-+ *	A U D I O
-+ */
-+struct v4l2_audio {
-+	__u32	index;
-+	__u8	name[32];
-+	__u32	capability;
-+	__u32	mode;
-+	__u32	reserved[2];
-+};
-+
-+/*  Flags for the 'capability' field */
-+#define V4L2_AUDCAP_STEREO		0x00001
-+#define V4L2_AUDCAP_AVL			0x00002
-+
-+/*  Flags for the 'mode' field */
-+#define V4L2_AUDMODE_AVL		0x00001
-+
-+struct v4l2_audioout {
-+	__u32	index;
-+	__u8	name[32];
-+	__u32	capability;
-+	__u32	mode;
-+	__u32	reserved[2];
-+};
-+
-+/*
-+ *	M P E G   S E R V I C E S
-+ *
-+ *	NOTE: EXPERIMENTAL API
-+ */
-+#if 1
-+#define V4L2_ENC_IDX_FRAME_I    (0)
-+#define V4L2_ENC_IDX_FRAME_P    (1)
-+#define V4L2_ENC_IDX_FRAME_B    (2)
-+#define V4L2_ENC_IDX_FRAME_MASK (0xf)
-+
-+struct v4l2_enc_idx_entry {
-+	__u64 offset;
-+	__u64 pts;
-+	__u32 length;
-+	__u32 flags;
-+	__u32 reserved[2];
-+};
-+
-+#define V4L2_ENC_IDX_ENTRIES (64)
-+struct v4l2_enc_idx {
-+	__u32 entries;
-+	__u32 entries_cap;
-+	__u32 reserved[4];
-+	struct v4l2_enc_idx_entry entry[V4L2_ENC_IDX_ENTRIES];
-+};
-+
-+
-+#define V4L2_ENC_CMD_START      (0)
-+#define V4L2_ENC_CMD_STOP       (1)
-+#define V4L2_ENC_CMD_PAUSE      (2)
-+#define V4L2_ENC_CMD_RESUME     (3)
-+
-+/* Flags for V4L2_ENC_CMD_STOP */
-+#define V4L2_ENC_CMD_STOP_AT_GOP_END    (1 << 0)
-+
-+struct v4l2_encoder_cmd {
-+	__u32 cmd;
-+	__u32 flags;
-+	union {
-+		struct {
-+			__u32 data[8];
-+		} raw;
-+	};
-+};
-+
-+#endif
-+
-+
-+/*
-+ *	D A T A   S E R V I C E S   ( V B I )
-+ *
-+ *	Data services API by Michael Schimek
-+ */
-+
-+/* Raw VBI */
-+struct v4l2_vbi_format {
-+	__u32	sampling_rate;		/* in 1 Hz */
-+	__u32	offset;
-+	__u32	samples_per_line;
-+	__u32	sample_format;		/* V4L2_PIX_FMT_* */
-+	__s32	start[2];
-+	__u32	count[2];
-+	__u32	flags;			/* V4L2_VBI_* */
-+	__u32	reserved[2];		/* must be zero */
-+};
-+
-+/*  VBI flags  */
-+#define V4L2_VBI_UNSYNC		(1 << 0)
-+#define V4L2_VBI_INTERLACED	(1 << 1)
-+
-+/* Sliced VBI
-+ *
-+ *    This implements is a proposal V4L2 API to allow SLICED VBI
-+ * required for some hardware encoders. It should change without
-+ * notice in the definitive implementation.
-+ */
-+
-+struct v4l2_sliced_vbi_format {
-+	__u16   service_set;
-+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-+				 (equals frame lines 313-336 for 625 line video
-+				  standards, 263-286 for 525 line standards) */
-+	__u16   service_lines[2][24];
-+	__u32   io_size;
-+	__u32   reserved[2];            /* must be zero */
-+};
-+
-+/* Teletext World System Teletext
-+   (WST), defined on ITU-R BT.653-2 */
-+#define V4L2_SLICED_TELETEXT_B          (0x0001)
-+/* Video Program System, defined on ETS 300 231*/
-+#define V4L2_SLICED_VPS                 (0x0400)
-+/* Closed Caption, defined on EIA-608 */
-+#define V4L2_SLICED_CAPTION_525         (0x1000)
-+/* Wide Screen System, defined on ITU-R BT1119.1 */
-+#define V4L2_SLICED_WSS_625             (0x4000)
-+
-+#define V4L2_SLICED_VBI_525             (V4L2_SLICED_CAPTION_525)
-+#define V4L2_SLICED_VBI_625             (V4L2_SLICED_TELETEXT_B | V4L2_SLICED_VPS | V4L2_SLICED_WSS_625)
-+
-+struct v4l2_sliced_vbi_cap {
-+	__u16   service_set;
-+	/* service_lines[0][...] specifies lines 0-23 (1-23 used) of the first field
-+	   service_lines[1][...] specifies lines 0-23 (1-23 used) of the second field
-+				 (equals frame lines 313-336 for 625 line video
-+				  standards, 263-286 for 525 line standards) */
-+	__u16   service_lines[2][24];
-+	enum v4l2_buf_type type;
-+	__u32   reserved[3];    /* must be 0 */
-+};
-+
-+struct v4l2_sliced_vbi_data {
-+	__u32   id;
-+	__u32   field;          /* 0: first field, 1: second field */
-+	__u32   line;           /* 1-23 */
-+	__u32   reserved;       /* must be 0 */
-+	__u8    data[48];
-+};
-+
-+/*
-+ * Sliced VBI data inserted into MPEG Streams
-+ */
-+
-+/*
-+ * V4L2_MPEG_STREAM_VBI_FMT_IVTV:
-+ *
-+ * Structure of payload contained in an MPEG 2 Private Stream 1 PES Packet in an
-+ * MPEG-2 Program Pack that contains V4L2_MPEG_STREAM_VBI_FMT_IVTV Sliced VBI
-+ * data
-+ *
-+ * Note, the MPEG-2 Program Pack and Private Stream 1 PES packet header
-+ * definitions are not included here.  See the MPEG-2 specifications for details
-+ * on these headers.
-+ */
-+
-+/* Line type IDs */
-+#define V4L2_MPEG_VBI_IVTV_TELETEXT_B     (1)
-+#define V4L2_MPEG_VBI_IVTV_CAPTION_525    (4)
-+#define V4L2_MPEG_VBI_IVTV_WSS_625        (5)
-+#define V4L2_MPEG_VBI_IVTV_VPS            (7)
-+
-+struct v4l2_mpeg_vbi_itv0_line {
-+	__u8 id;	/* One of V4L2_MPEG_VBI_IVTV_* above */
-+	__u8 data[42];	/* Sliced VBI data for the line */
-+} __attribute__ ((packed));
-+
-+struct v4l2_mpeg_vbi_itv0 {
-+	__le32 linemask[2]; /* Bitmasks of VBI service lines present */
-+	struct v4l2_mpeg_vbi_itv0_line line[35];
-+} __attribute__ ((packed));
-+
-+struct v4l2_mpeg_vbi_ITV0 {
-+	struct v4l2_mpeg_vbi_itv0_line line[36];
-+} __attribute__ ((packed));
-+
-+#define V4L2_MPEG_VBI_IVTV_MAGIC0	"itv0"
-+#define V4L2_MPEG_VBI_IVTV_MAGIC1	"ITV0"
-+
-+struct v4l2_mpeg_vbi_fmt_ivtv {
-+	__u8 magic[4];
-+	union {
-+		struct v4l2_mpeg_vbi_itv0 itv0;
-+		struct v4l2_mpeg_vbi_ITV0 ITV0;
-+	};
-+} __attribute__ ((packed));
-+
-+/*
-+ *	A G G R E G A T E   S T R U C T U R E S
-+ */
-+
-+/**
-+ * struct v4l2_plane_pix_format - additional, per-plane format definition
-+ * @sizeimage:		maximum size in bytes required for data, for which
-+ *			this plane will be used
-+ * @bytesperline:	distance in bytes between the leftmost pixels in two
-+ *			adjacent lines
-+ */
-+struct v4l2_plane_pix_format {
-+	__u32		sizeimage;
-+	__u16		bytesperline;
-+	__u16		reserved[7];
-+} __attribute__ ((packed));
-+
-+/**
-+ * struct v4l2_pix_format_mplane - multiplanar format definition
-+ * @width:		image width in pixels
-+ * @height:		image height in pixels
-+ * @pixelformat:	little endian four character code (fourcc)
-+ * @field:		field order (for interlaced video)
-+ * @colorspace:		supplemental to pixelformat
-+ * @plane_fmt:		per-plane information
-+ * @num_planes:		number of planes for this format
-+ */
-+struct v4l2_pix_format_mplane {
-+	__u32				width;
-+	__u32				height;
-+	__u32				pixelformat;
-+	enum v4l2_field			field;
-+	enum v4l2_colorspace		colorspace;
-+
-+	struct v4l2_plane_pix_format	plane_fmt[VIDEO_MAX_PLANES];
-+	__u8				num_planes;
-+	__u8				reserved[11];
-+} __attribute__ ((packed));
-+
-+/**
-+ * struct v4l2_format - stream data format
-+ * @type:	type of the data stream
-+ * @pix:	definition of an image format
-+ * @pix_mp:	definition of a multiplanar image format
-+ * @win:	definition of an overlaid image
-+ * @vbi:	raw VBI capture or output parameters
-+ * @sliced:	sliced VBI capture or output parameters
-+ * @raw_data:	placeholder for future extensions and custom formats
-+ */
-+struct v4l2_format {
-+	enum v4l2_buf_type type;
-+	union {
-+		struct v4l2_pix_format		pix;     /* V4L2_BUF_TYPE_VIDEO_CAPTURE */
-+		struct v4l2_pix_format_mplane	pix_mp;  /* V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE */
-+		struct v4l2_window		win;     /* V4L2_BUF_TYPE_VIDEO_OVERLAY */
-+		struct v4l2_vbi_format		vbi;     /* V4L2_BUF_TYPE_VBI_CAPTURE */
-+		struct v4l2_sliced_vbi_format	sliced;  /* V4L2_BUF_TYPE_SLICED_VBI_CAPTURE */
-+		__u8	raw_data[200];                   /* user-defined */
-+	} fmt;
-+};
-+
-+/*	Stream type-dependent parameters
-+ */
-+struct v4l2_streamparm {
-+	enum v4l2_buf_type type;
-+	union {
-+		struct v4l2_captureparm	capture;
-+		struct v4l2_outputparm	output;
-+		__u8	raw_data[200];  /* user-defined */
-+	} parm;
-+};
-+
-+/*
-+ *	E V E N T S
-+ */
-+
-+#define V4L2_EVENT_ALL				0
-+#define V4L2_EVENT_VSYNC			1
-+#define V4L2_EVENT_EOS				2
-+#define V4L2_EVENT_PRIVATE_START		0x08000000
-+
-+/* Payload for V4L2_EVENT_VSYNC */
-+struct v4l2_event_vsync {
-+	/* Can be V4L2_FIELD_ANY, _NONE, _TOP or _BOTTOM */
-+	__u8 field;
-+} __attribute__ ((packed));
-+
-+struct v4l2_event {
-+	__u32				type;
-+	union {
-+		struct v4l2_event_vsync vsync;
-+		__u8			data[64];
-+	} u;
-+	__u32				pending;
-+	__u32				sequence;
-+	struct timespec			timestamp;
-+	__u32				reserved[9];
-+};
-+
-+struct v4l2_event_subscription {
-+	__u32				type;
-+	__u32				reserved[7];
-+};
-+
-+/*
-+ *	A D V A N C E D   D E B U G G I N G
-+ *
-+ *	NOTE: EXPERIMENTAL API, NEVER RELY ON THIS IN APPLICATIONS!
-+ *	FOR DEBUGGING, TESTING AND INTERNAL USE ONLY!
-+ */
-+
-+/* VIDIOC_DBG_G_REGISTER and VIDIOC_DBG_S_REGISTER */
-+
-+#define V4L2_CHIP_MATCH_HOST       0  /* Match against chip ID on host (0 for the host) */
-+#define V4L2_CHIP_MATCH_I2C_DRIVER 1  /* Match against I2C driver name */
-+#define V4L2_CHIP_MATCH_I2C_ADDR   2  /* Match against I2C 7-bit address */
-+#define V4L2_CHIP_MATCH_AC97       3  /* Match against anciliary AC97 chip */
-+
-+struct v4l2_dbg_match {
-+	__u32 type; /* Match type */
-+	union {     /* Match this chip, meaning determined by type */
-+		__u32 addr;
-+		char name[32];
-+	};
-+} __attribute__ ((packed));
-+
-+struct v4l2_dbg_register {
-+	struct v4l2_dbg_match match;
-+	__u32 size;	/* register size in bytes */
-+	__u64 reg;
-+	__u64 val;
-+} __attribute__ ((packed));
-+
-+/* VIDIOC_DBG_G_CHIP_IDENT */
-+struct v4l2_dbg_chip_ident {
-+	struct v4l2_dbg_match match;
-+	__u32 ident;       /* chip identifier as specified in <media/v4l2-chip-ident.h> */
-+	__u32 revision;    /* chip revision, chip specific */
-+} __attribute__ ((packed));
-+
-+/*
-+ *	I O C T L   C O D E S   F O R   V I D E O   D E V I C E S
-+ *
-+ */
-+#define VIDIOC_QUERYCAP		 _IOR('V',  0, struct v4l2_capability)
-+#define VIDIOC_RESERVED		  _IO('V',  1)
-+#define VIDIOC_ENUM_FMT         _IOWR('V',  2, struct v4l2_fmtdesc)
-+#define VIDIOC_G_FMT		_IOWR('V',  4, struct v4l2_format)
-+#define VIDIOC_S_FMT		_IOWR('V',  5, struct v4l2_format)
-+#define VIDIOC_REQBUFS		_IOWR('V',  8, struct v4l2_requestbuffers)
-+#define VIDIOC_QUERYBUF		_IOWR('V',  9, struct v4l2_buffer)
-+#define VIDIOC_G_FBUF		 _IOR('V', 10, struct v4l2_framebuffer)
-+#define VIDIOC_S_FBUF		 _IOW('V', 11, struct v4l2_framebuffer)
-+#define VIDIOC_OVERLAY		 _IOW('V', 14, int)
-+#define VIDIOC_QBUF		_IOWR('V', 15, struct v4l2_buffer)
-+#define VIDIOC_DQBUF		_IOWR('V', 17, struct v4l2_buffer)
-+#define VIDIOC_STREAMON		 _IOW('V', 18, int)
-+#define VIDIOC_STREAMOFF	 _IOW('V', 19, int)
-+#define VIDIOC_G_PARM		_IOWR('V', 21, struct v4l2_streamparm)
-+#define VIDIOC_S_PARM		_IOWR('V', 22, struct v4l2_streamparm)
-+#define VIDIOC_G_STD		 _IOR('V', 23, v4l2_std_id)
-+#define VIDIOC_S_STD		 _IOW('V', 24, v4l2_std_id)
-+#define VIDIOC_ENUMSTD		_IOWR('V', 25, struct v4l2_standard)
-+#define VIDIOC_ENUMINPUT	_IOWR('V', 26, struct v4l2_input)
-+#define VIDIOC_G_CTRL		_IOWR('V', 27, struct v4l2_control)
-+#define VIDIOC_S_CTRL		_IOWR('V', 28, struct v4l2_control)
-+#define VIDIOC_G_TUNER		_IOWR('V', 29, struct v4l2_tuner)
-+#define VIDIOC_S_TUNER		 _IOW('V', 30, struct v4l2_tuner)
-+#define VIDIOC_G_AUDIO		 _IOR('V', 33, struct v4l2_audio)
-+#define VIDIOC_S_AUDIO		 _IOW('V', 34, struct v4l2_audio)
-+#define VIDIOC_QUERYCTRL	_IOWR('V', 36, struct v4l2_queryctrl)
-+#define VIDIOC_QUERYMENU	_IOWR('V', 37, struct v4l2_querymenu)
-+#define VIDIOC_G_INPUT		 _IOR('V', 38, int)
-+#define VIDIOC_S_INPUT		_IOWR('V', 39, int)
-+#define VIDIOC_G_OUTPUT		 _IOR('V', 46, int)
-+#define VIDIOC_S_OUTPUT		_IOWR('V', 47, int)
-+#define VIDIOC_ENUMOUTPUT	_IOWR('V', 48, struct v4l2_output)
-+#define VIDIOC_G_AUDOUT		 _IOR('V', 49, struct v4l2_audioout)
-+#define VIDIOC_S_AUDOUT		 _IOW('V', 50, struct v4l2_audioout)
-+#define VIDIOC_G_MODULATOR	_IOWR('V', 54, struct v4l2_modulator)
-+#define VIDIOC_S_MODULATOR	 _IOW('V', 55, struct v4l2_modulator)
-+#define VIDIOC_G_FREQUENCY	_IOWR('V', 56, struct v4l2_frequency)
-+#define VIDIOC_S_FREQUENCY	 _IOW('V', 57, struct v4l2_frequency)
-+#define VIDIOC_CROPCAP		_IOWR('V', 58, struct v4l2_cropcap)
-+#define VIDIOC_G_CROP		_IOWR('V', 59, struct v4l2_crop)
-+#define VIDIOC_S_CROP		 _IOW('V', 60, struct v4l2_crop)
-+#define VIDIOC_G_JPEGCOMP	 _IOR('V', 61, struct v4l2_jpegcompression)
-+#define VIDIOC_S_JPEGCOMP	 _IOW('V', 62, struct v4l2_jpegcompression)
-+#define VIDIOC_QUERYSTD      	 _IOR('V', 63, v4l2_std_id)
-+#define VIDIOC_TRY_FMT      	_IOWR('V', 64, struct v4l2_format)
-+#define VIDIOC_ENUMAUDIO	_IOWR('V', 65, struct v4l2_audio)
-+#define VIDIOC_ENUMAUDOUT	_IOWR('V', 66, struct v4l2_audioout)
-+#define VIDIOC_G_PRIORITY        _IOR('V', 67, enum v4l2_priority)
-+#define VIDIOC_S_PRIORITY        _IOW('V', 68, enum v4l2_priority)
-+#define VIDIOC_G_SLICED_VBI_CAP _IOWR('V', 69, struct v4l2_sliced_vbi_cap)
-+#define VIDIOC_LOG_STATUS         _IO('V', 70)
-+#define VIDIOC_G_EXT_CTRLS	_IOWR('V', 71, struct v4l2_ext_controls)
-+#define VIDIOC_S_EXT_CTRLS	_IOWR('V', 72, struct v4l2_ext_controls)
-+#define VIDIOC_TRY_EXT_CTRLS	_IOWR('V', 73, struct v4l2_ext_controls)
-+#if 1
-+#define VIDIOC_ENUM_FRAMESIZES	_IOWR('V', 74, struct v4l2_frmsizeenum)
-+#define VIDIOC_ENUM_FRAMEINTERVALS _IOWR('V', 75, struct v4l2_frmivalenum)
-+#define VIDIOC_G_ENC_INDEX       _IOR('V', 76, struct v4l2_enc_idx)
-+#define VIDIOC_ENCODER_CMD      _IOWR('V', 77, struct v4l2_encoder_cmd)
-+#define VIDIOC_TRY_ENCODER_CMD  _IOWR('V', 78, struct v4l2_encoder_cmd)
-+#endif
-+
-+#if 1
-+/* Experimental, meant for debugging, testing and internal use.
-+   Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
-+   You must be root to use these ioctls. Never use these in applications! */
-+#define	VIDIOC_DBG_S_REGISTER 	 _IOW('V', 79, struct v4l2_dbg_register)
-+#define	VIDIOC_DBG_G_REGISTER 	_IOWR('V', 80, struct v4l2_dbg_register)
-+
-+/* Experimental, meant for debugging, testing and internal use.
-+   Never use this ioctl in applications! */
-+#define VIDIOC_DBG_G_CHIP_IDENT _IOWR('V', 81, struct v4l2_dbg_chip_ident)
-+#endif
-+
-+#define VIDIOC_S_HW_FREQ_SEEK	 _IOW('V', 82, struct v4l2_hw_freq_seek)
-+#define	VIDIOC_ENUM_DV_PRESETS	_IOWR('V', 83, struct v4l2_dv_enum_preset)
-+#define	VIDIOC_S_DV_PRESET	_IOWR('V', 84, struct v4l2_dv_preset)
-+#define	VIDIOC_G_DV_PRESET	_IOWR('V', 85, struct v4l2_dv_preset)
-+#define	VIDIOC_QUERY_DV_PRESET	_IOR('V',  86, struct v4l2_dv_preset)
-+#define	VIDIOC_S_DV_TIMINGS	_IOWR('V', 87, struct v4l2_dv_timings)
-+#define	VIDIOC_G_DV_TIMINGS	_IOWR('V', 88, struct v4l2_dv_timings)
-+#define	VIDIOC_DQEVENT		 _IOR('V', 89, struct v4l2_event)
-+#define	VIDIOC_SUBSCRIBE_EVENT	 _IOW('V', 90, struct v4l2_event_subscription)
-+#define	VIDIOC_UNSUBSCRIBE_EVENT _IOW('V', 91, struct v4l2_event_subscription)
-+
-+#define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
-+
-+#endif /* __LINUX_VIDEODEV2_H */
diff --git a/testing/xf86-video-vesa/PKGBUILD b/testing/xf86-video-vesa/PKGBUILD
deleted file mode 100644
index 222c80a1e..000000000
--- a/testing/xf86-video-vesa/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168246 2012-10-06 20:08:43Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-vesa
-pkgver=2.3.2
-pkgrel=2
-pkgdesc="X.org vesa video driver"
-arch=(i686 x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        revert-kernelcheck.patch)
-sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
-            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-vesa/revert-kernelcheck.patch b/testing/xf86-video-vesa/revert-kernelcheck.patch
deleted file mode 100644
index 37418cc3f..000000000
--- a/testing/xf86-video-vesa/revert-kernelcheck.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 08 Dec 2010 18:45:32 +0000
-Subject: Refuse to load if there's a kernel driver bound to the device
-
-Ported from the equivalent check in nv.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 168fde1..2523d76 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
-     pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, 
- 				NULL, NULL, NULL, NULL, NULL);
-     if (pScrn != NULL) {
--	VESAPtr pVesa = VESAGetRec(pScrn);
-+	VESAPtr pVesa;
- 
-+	if (pci_device_has_kernel_driver(dev)) {
-+	    ErrorF("vesa: Ignoring device with a bound kernel driver\n");
-+	    return FALSE;
-+	}
-+
-+	pVesa = VESAGetRec(pScrn);
- 	VESAInitScrn(pScrn);
- 	pVesa->pciInfo = dev;
-     }
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-vmware/PKGBUILD b/testing/xf86-video-vmware/PKGBUILD
deleted file mode 100644
index fbb53aec9..000000000
--- a/testing/xf86-video-vmware/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 168247 2012-10-06 20:08:48Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-vmware
-pkgver=12.0.2
-pkgrel=2
-pkgdesc="X.org vmware video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('libdrm' 'svga-dri' 'mesa')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
-sha1sums=('efa47f365d88da245804a9934719ff860ed04f95'
-          'ad475b37e2614f365533a40da0fb5b9e2709e3c6')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/git_fixes.diff
-  ./configure --prefix=/usr --enable-vmwarectrl-client
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-}
diff --git a/testing/xf86-video-vmware/git_fixes.diff b/testing/xf86-video-vmware/git_fixes.diff
deleted file mode 100644
index 85894169e..000000000
--- a/testing/xf86-video-vmware/git_fixes.diff
+++ /dev/null
@@ -1,894 +0,0 @@
-From 46cdf0ed0ad9df66f36f95e27b209d454f67d526 Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Fri, 20 Apr 2012 20:24:26 +0000
-Subject: vmwgfx: set the XA_FLAG_SHARED flag for composite dest surfaces
-
-This fixes a failed assertion in the gallium/svga driver in the
-svga_texture_get_handle() function.  The texture resource wasn't
-getting created with the PIPE_BIND_SHARED flag so the !cachable
-assertion would fail and the X session would abort.  This didn't
-happen with release builds.
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
-index 2a18762..8b30e45 100644
---- a/vmwgfx/vmwgfx_xa_surface.c
-+++ b/vmwgfx/vmwgfx_xa_surface.c
-@@ -148,7 +148,7 @@ vmwgfx_hw_composite_dst_stage(PixmapPtr pixmap,
- 
-     vpix->staging_format = format;
-     vpix->staging_remove_flags = 0;
--    vpix->staging_add_flags = XA_FLAG_RENDER_TARGET;
-+    vpix->staging_add_flags = XA_FLAG_RENDER_TARGET | XA_FLAG_SHARED;
- 
-     return TRUE;
- }
---
-cgit v0.9.0.2-2-gbebe
-From 61df95a86f4997e342d50d7779b00aba2e8849a6 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Wed, 06 Jun 2012 08:58:01 +0000
-Subject: vmware: port vmware driver to new compat API
-
-This is a port of the vmware driver to the new compat API.
-
-Tested-by: Jakob Bornecrantz <jakob@vmware.com>
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Dave Airlie <airlied@redhat.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/saa/saa.c b/saa/saa.c
-index 173c090..f2d68e9 100644
---- a/saa/saa.c
-+++ b/saa/saa.c
-@@ -594,7 +594,7 @@ saa_set_fallback_debug(ScreenPtr screen, Bool enable)
-  * screen private, before calling down to the next CloseScreen.
-  */
- Bool
--saa_close_screen(int i, ScreenPtr pScreen)
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
-     struct saa_screen_priv *sscreen = saa_screen(pScreen);
-     struct saa_driver *driver = sscreen->driver;
-@@ -624,7 +624,7 @@ saa_close_screen(int i, ScreenPtr pScreen)
- 
-     free(sscreen);
- 
--    return (*pScreen->CloseScreen) (i, pScreen);
-+    return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
- }
- 
- struct saa_driver *
-diff --git a/saa/saa.h b/saa/saa.h
-index c7aa3b6..4e5ced5 100644
---- a/saa/saa.h
-+++ b/saa/saa.h
-@@ -44,6 +44,8 @@
- #include <damage.h>
- #include <picturestr.h>
- 
-+#include "../src/compat-api.h"
-+
- #define SAA_VERSION_MAJOR 0
- #define SAA_VERSION_MINOR 1
- 
-@@ -173,7 +175,7 @@ extern _X_EXPORT RegionPtr
- saa_bitmap_to_region(PixmapPtr pPix);
- 
- extern _X_EXPORT Bool
--saa_close_screen(int i, ScreenPtr pScreen);
-+saa_close_screen(CLOSE_SCREEN_ARGS_DECL);
- 
- extern _X_EXPORT Bool
- saa_gc_reads_destination(DrawablePtr pDrawable, GCPtr pGC);
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 04c9e0d..b0dd147 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -37,6 +37,7 @@ endif
- vmware_drv_la_SOURCES = \
- 	bits2pixels.c \
- 	bits2pixels.h \
-+	compat-api.h \
- 	guest_os.h \
- 	includeCheck.h \
- 	svga_escape.h \
-diff --git a/src/compat-api.h b/src/compat-api.h
-new file mode 100644
-index 0000000..6bc946f
---- a/dev/null
-+++ b/src/compat-api.h
-@@ -0,0 +1,99 @@
-+/*
-+ * Copyright 2012 Red Hat, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Author: Dave Airlie <airlied@redhat.com>
-+ */
-+
-+/* this file provides API compat between server post 1.13 and pre it,
-+   it should be reused inside as many drivers as possible */
-+#ifndef COMPAT_API_H
-+#define COMPAT_API_H
-+
-+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-+#endif
-+
-+#ifndef XF86_HAS_SCRN_CONV
-+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-+#endif
-+
-+#ifndef XF86_SCRN_INTERFACE
-+
-+#define SCRN_ARG_TYPE int
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
-+
-+#define SCREEN_ARG_TYPE int
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-+
-+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
-+
-+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
-+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
-+
-+#define FREE_SCREEN_ARGS_DECL int arg, int flags
-+
-+#define VT_FUNC_ARGS_DECL int arg, int flags
-+#define VT_FUNC_ARGS pScrn->scrnIndex, 0
-+
-+#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
-+#else
-+#define SCRN_ARG_TYPE ScrnInfoPtr
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
-+
-+#define SCREEN_ARG_TYPE ScreenPtr
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
-+
-+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
-+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
-+
-+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
-+#define SWITCH_MODE_ARGS(arg, m) arg, m
-+
-+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
-+
-+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
-+#define VT_FUNC_ARGS pScrn
-+
-+#define XF86_SCRN_ARG(x) (x)
-+
-+#endif
-+
-+#endif
-diff --git a/src/vmware.c b/src/vmware.c
-index e3892f1..41201f1 100644
---- a/src/vmware.c
-+++ b/src/vmware.c
-@@ -901,8 +901,8 @@ VMWAREModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode, Bool rebuildPixmap)
-                                                          pScrn->pScreen->rootDepth),
-                                            (pointer)(pVMWARE->FbBase + pScrn->fbOffset));
- 
--        (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, FALSE);
--        (*pScrn->EnableDisableFBAccess)(pScrn->pScreen->myNum, TRUE);
-+        (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), FALSE);
-+        (*pScrn->EnableDisableFBAccess)(XF86_SCRN_ARG(pScrn), TRUE);
-     }
- 
-     vgaHWProtect(pScrn, FALSE);
-@@ -1018,7 +1018,7 @@ vmwareNextXineramaState(VMWAREPtr pVMWARE)
- }
- 
- static void
--VMWAREAdjustFrame(int scrnIndex, int x, int y, int flags)
-+VMWAREAdjustFrame(ADJUST_FRAME_ARGS_DECL)
- {
-     /* FIXME */
- }
-@@ -1089,9 +1089,9 @@ VMWAREStopFIFO(ScrnInfoPtr pScrn)
- }
- 
- static Bool
--VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
-+VMWARECloseScreen(CLOSE_SCREEN_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     ScreenPtr save = &pVMWARE->ScrnFuncs;
- 
-@@ -1119,7 +1119,7 @@ VMWARECloseScreen(int scrnIndex, ScreenPtr pScreen)
-     pScrn->DriverFunc = NULL;
- #endif
- 
--    return (*pScreen->CloseScreen)(scrnIndex, pScreen);
-+    return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
- }
- 
- static Bool
-@@ -1296,16 +1296,14 @@ vmwareIsRegionEqual(const RegionPtr reg1,
- }
- 
- static Bool
--VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn;
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     vgaHWPtr hwp;
-     VMWAREPtr pVMWARE;
-     OptionInfoPtr options;
-     Bool useXinerama = TRUE;
- 
--    /* Get the ScrnInfoRec */
--    pScrn = xf86Screens[pScreen->myNum];
-     pVMWARE = VMWAREPTR(pScrn);
- 
- 
-@@ -1381,7 +1379,7 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-     VMWAREModeInit(pScrn, pScrn->currentMode, FALSE);
- 
-     /* Set the viewport if supported */
--    VMWAREAdjustFrame(scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+    VMWAREAdjustFrame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
- 
-     /*
-      * Setup the screen's visuals, and initialise the framebuffer
-@@ -1582,10 +1580,9 @@ VMWAREScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
- 
- static Bool
--VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
--
-+VMWARESwitchMode(SWITCH_MODE_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     ScreenPtr pScreen = pScrn->pScreen;
- 
-     pScreen->mmWidth = (pScreen->width * VMWARE_INCHTOMM +
-@@ -1597,9 +1594,9 @@ VMWARESwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
- }
- 
- static Bool
--VMWAREEnterVT(int scrnIndex, int flags)
-+VMWAREEnterVT(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- 
-     /*
-@@ -1616,9 +1613,9 @@ VMWAREEnterVT(int scrnIndex, int flags)
- }
- 
- static void
--VMWARELeaveVT(int scrnIndex, int flags)
-+VMWARELeaveVT(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- 
-     /*
-@@ -1631,17 +1628,18 @@ VMWARELeaveVT(int scrnIndex, int flags)
- }
- 
- static void
--VMWAREFreeScreen(int scrnIndex, int flags)
-+VMWAREFreeScreen(FREE_SCREEN_ARGS_DECL)
- {
-+    SCRN_INFO_PTR(arg);
-     /*
-      * If the vgahw module is used vgaHWFreeHWRec() would be called
-      * here.
-      */
--   VMWAREFreeRec(xf86Screens[scrnIndex]);
-+   VMWAREFreeRec(pScrn);
- }
- 
- static ModeStatus
--VMWAREValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-+VMWAREValidMode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
- {
-     return MODE_OK;
- }
-diff --git a/src/vmware.h b/src/vmware.h
-index 458390a..4818e16 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -177,7 +177,7 @@ typedef struct {
- #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
- 
- static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
--    return xf86Screens[s->myNum];
-+    return xf86ScreenToScrn(s);
- }
- 
- #define MIN(a,b) ((a)<(b)?(a):(b))
-diff --git a/src/vmware_common.h b/src/vmware_common.h
-index 9cd7194..5629c10 100644
---- a/src/vmware_common.h
-+++ b/src/vmware_common.h
-@@ -32,6 +32,8 @@
- #include <X11/extensions/panoramiXproto.h>
- #include <xf86.h>
- 
-+#include "compat-api.h"
-+
- xXineramaScreenInfo *
- VMWAREParseTopologyString(ScrnInfoPtr pScrn,
-                           const char *topology,
-diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
-index 1b82ac4..7de0772 100644
---- a/vmwgfx/vmwgfx_dri2.c
-+++ b/vmwgfx/vmwgfx_dri2.c
-@@ -83,7 +83,7 @@ static Bool
- dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int format)
- {
-     ScreenPtr pScreen = pDraw->pScreen;
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     BufferPrivatePtr private = buffer->driverPrivate;
-     PixmapPtr pPixmap;
-@@ -371,7 +371,7 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
- Bool
- xorg_dri2_init(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     DRI2InfoRec dri2info;
-     int major, minor;
-diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
-index ed1eb8c..9959ffb 100644
---- a/vmwgfx/vmwgfx_driver.c
-+++ b/vmwgfx/vmwgfx_driver.c
-@@ -107,14 +107,13 @@ typedef uint8_t uint8;
-  */
- 
- static Bool drv_pre_init(ScrnInfoPtr pScrn, int flags);
--static Bool drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc,
--			    char **argv);
--static Bool drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags);
--static void drv_adjust_frame(int scrnIndex, int x, int y, int flags);
--static Bool drv_enter_vt(int scrnIndex, int flags);
--static void drv_leave_vt(int scrnIndex, int flags);
--static void drv_free_screen(int scrnIndex, int flags);
--static ModeStatus drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose,
-+static Bool drv_screen_init(SCREEN_INIT_ARGS_DECL);
-+static Bool drv_switch_mode(SWITCH_MODE_ARGS_DECL);
-+static void drv_adjust_frame(ADJUST_FRAME_ARGS_DECL);
-+static Bool drv_enter_vt(VT_FUNC_ARGS_DECL);
-+static void drv_leave_vt(VT_FUNC_ARGS_DECL);
-+static void drv_free_screen(FREE_SCREEN_ARGS_DECL);
-+static ModeStatus drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose,
- 			         int flags);
- 
- extern void xorg_tracker_set_functions(ScrnInfoPtr scrn);
-@@ -133,7 +132,7 @@ vmwgfx_hookup(ScrnInfoPtr pScrn)
-  * Internal function definitions
-  */
- 
--static Bool drv_close_screen(int scrnIndex, ScreenPtr pScreen);
-+static Bool drv_close_screen(CLOSE_SCREEN_ARGS_DECL);
- 
- /*
-  * Internal functions
-@@ -633,7 +632,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
- 
- void xorg_flush(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-     PixmapPtr pixmap = NULL;
-@@ -708,14 +707,13 @@ void xorg_flush(ScreenPtr pScreen)
-     free(pixmaps);
- }
- 
--static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
--                              pointer pReadmask)
-+static void drv_block_handler(BLOCKHANDLER_ARGS_DECL)
- {
--    ScreenPtr pScreen = screenInfo.screens[i];
--    modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]);
-+    SCREEN_PTR(arg);
-+    modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
- 
-     vmwgfx_swap(ms, pScreen, BlockHandler);
--    pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
-+    pScreen->BlockHandler(BLOCKHANDLER_ARGS);
-     vmwgfx_swap(ms, pScreen, BlockHandler);
- 
-     vmwgfx_flush_dri2(pScreen);
-@@ -725,7 +723,7 @@ static void drv_block_handler(int i, pointer blockData, pointer pTimeout,
- static Bool
- drv_create_screen_resources(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     Bool ret;
- 
-@@ -735,9 +733,9 @@ drv_create_screen_resources(ScreenPtr pScreen)
-     if (!ret)
- 	return ret;
- 
--    drv_adjust_frame(pScrn->scrnIndex, pScrn->frameX0, pScrn->frameY0, 0);
-+    drv_adjust_frame(ADJUST_FRAME_ARGS(pScrn, pScrn->frameX0, pScrn->frameY0));
- 
--    return drv_enter_vt(pScreen->myNum, 1);
-+    return drv_enter_vt(VT_FUNC_ARGS);
- }
- 
- static Bool
-@@ -773,7 +771,7 @@ drv_set_master(ScrnInfoPtr pScrn)
- static Bool
- vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
- {
--    ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
-     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
-     modesettingPtr ms = modesettingPTR(pScrn);
-@@ -804,7 +802,7 @@ vmwgfx_use_hw_cursor_argb(ScreenPtr screen, CursorPtr cursor)
- static Bool
- vmwgfx_use_hw_cursor(ScreenPtr screen, CursorPtr cursor)
- {
--    ScrnInfoPtr pScrn = xf86Screens[screen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
-     xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
-     modesettingPtr ms = modesettingPTR(pScrn);
-@@ -902,9 +900,9 @@ static void drv_load_palette(ScrnInfoPtr pScrn, int numColors,
- 
- 
- static Bool
--drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+drv_screen_init(SCREEN_INIT_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
-     VisualPtr visual;
- 
-@@ -1088,9 +1086,9 @@ drv_screen_init(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- }
- 
- static void
--drv_adjust_frame(int scrnIndex, int x, int y, int flags)
-+drv_adjust_frame(ADJUST_FRAME_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
-     xf86OutputPtr output = config->output[config->compat_output];
-     xf86CrtcPtr crtc = output->crtc;
-@@ -1104,15 +1102,16 @@ drv_adjust_frame(int scrnIndex, int x, int y, int flags)
- }
- 
- static void
--drv_free_screen(int scrnIndex, int flags)
-+drv_free_screen(FREE_SCREEN_ARGS_DECL)
- {
--    drv_free_rec(xf86Screens[scrnIndex]);
-+    SCRN_INFO_PTR(arg);
-+    drv_free_rec(pScrn);
- }
- 
- static void
--drv_leave_vt(int scrnIndex, int flags)
-+drv_leave_vt(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
-     modesettingPtr ms = modesettingPTR(pScrn);
- 
-     vmwgfx_cursor_bypass(ms->fd, 0, 0);
-@@ -1130,9 +1129,9 @@ drv_leave_vt(int scrnIndex, int flags)
-  * This gets called when gaining control of the VT, and from ScreenInit().
-  */
- static Bool
--drv_enter_vt(int scrnIndex, int flags)
-+drv_enter_vt(VT_FUNC_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
- 
-     if (!drv_set_master(pScrn))
- 	return FALSE;
-@@ -1144,17 +1143,17 @@ drv_enter_vt(int scrnIndex, int flags)
- }
- 
- static Bool
--drv_switch_mode(int scrnIndex, DisplayModePtr mode, int flags)
-+drv_switch_mode(SWITCH_MODE_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    SCRN_INFO_PTR(arg);
- 
-     return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
- }
- 
- static Bool
--drv_close_screen(int scrnIndex, ScreenPtr pScreen)
-+drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
- {
--    ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     modesettingPtr ms = modesettingPTR(pScrn);
- 
-     if (ms->cursor) {
-@@ -1166,7 +1165,7 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
- 	xorg_dri2_close(pScreen);
- 
-     if (pScrn->vtSema)
--	pScrn->LeaveVT(scrnIndex, 0);
-+        pScrn->LeaveVT(VT_FUNC_ARGS);
- 
-     pScrn->vtSema = FALSE;
- 
-@@ -1180,11 +1179,11 @@ drv_close_screen(int scrnIndex, ScreenPtr pScreen)
-     if (ms->xat)
- 	xa_tracker_destroy(ms->xat);
- 
--    return (*pScreen->CloseScreen) (scrnIndex, pScreen);
-+    return (*pScreen->CloseScreen) (CLOSE_SCREEN_ARGS);
- }
- 
- static ModeStatus
--drv_valid_mode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
-+drv_valid_mode(SCRN_ARG_TYPE arg, DisplayModePtr mode, Bool verbose, int flags)
- {
-     return MODE_OK;
- }
-diff --git a/vmwgfx/vmwgfx_driver.h b/vmwgfx/vmwgfx_driver.h
-index 4fcfed6..f78a85f 100644
---- a/vmwgfx/vmwgfx_driver.h
-+++ b/vmwgfx/vmwgfx_driver.h
-@@ -46,6 +46,7 @@
- #include <xa_tracker.h>
- #include <xf86Module.h>
- 
-+#include "../src/compat-api.h"
- #ifdef DRI2
- #include <dri2.h>
- #if (!defined(DRI2INFOREC_VERSION) || (DRI2INFOREC_VERSION < 3))
-@@ -118,9 +119,9 @@ typedef struct _modesettingRec
-     ScreenBlockHandlerProcPtr saved_BlockHandler;
-     CreateScreenResourcesProcPtr saved_CreateScreenResources;
-     CloseScreenProcPtr saved_CloseScreen;
--    Bool (*saved_EnterVT)(int, int);
--    void (*saved_LeaveVT)(int, int);
--    void (*saved_AdjustFrame)(int, int, int, int);
-+    Bool (*saved_EnterVT)(VT_FUNC_ARGS_DECL);
-+    void (*saved_LeaveVT)(VT_FUNC_ARGS_DECL);
-+    void (*saved_AdjustFrame)(ADJUST_FRAME_ARGS_DECL);
-     Bool (*saved_UseHWCursor)(ScreenPtr, CursorPtr);
-     Bool (*saved_UseHWCursorARGB)(ScreenPtr, CursorPtr);
- 
-diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
-index 469598a..63df3a1 100644
---- a/vmwgfx/vmwgfx_saa.c
-+++ b/vmwgfx/vmwgfx_saa.c
-@@ -460,7 +460,7 @@ vmwgfx_flush_dri2(ScreenPtr pScreen)
-     struct vmwgfx_saa *vsaa =
- 	to_vmwgfx_saa(saa_get_driver(pScreen));
-     struct _WsbmListHead *list, *next;
--    ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- 
-     if (!pScrn->vtSema)
- 	return;
-@@ -1199,7 +1199,7 @@ vmwgfx_operation_complete(struct saa_driver *driver,
-     struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
-     struct saa_pixmap *spix = saa_get_saa_pixmap(pixmap);
-     struct vmwgfx_saa_pixmap *vpix = to_vmwgfx_saa_pixmap(spix);
--    ScrnInfoPtr pScrn = xf86Screens[vsaa->pScreen->myNum];
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(vsaa->pScreen);
- 
-     /*
-      * Make dri2 drawables up to date, or add them to the flush list
-diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
-index af53379..449266b 100644
---- a/vmwgfx/vmwgfx_tex_video.c
-+++ b/vmwgfx/vmwgfx_tex_video.c
-@@ -638,7 +638,7 @@ put_image(ScrnInfoPtr pScrn,
-           DrawablePtr pDraw)
- {
-    struct xorg_xv_port_priv *pPriv = (struct xorg_xv_port_priv *) data;
--   ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
-+   ScreenPtr pScreen = xf86ScrnToScreen(pScrn);
-    PixmapPtr pPixmap;
-    INT32 x1, x2, y1, y2;
-    BoxRec dstBox;
-@@ -732,7 +732,7 @@ vmwgfx_free_textured_adaptor(XF86VideoAdaptorPtr adaptor, Bool free_ports)
- static XF86VideoAdaptorPtr
- xorg_setup_textured_adapter(ScreenPtr pScreen)
- {
--   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+   ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-    modesettingPtr ms = modesettingPTR(pScrn);
-    XF86VideoAdaptorPtr adapt;
-    XF86AttributePtr attrs;
-@@ -799,7 +799,7 @@ xorg_setup_textured_adapter(ScreenPtr pScreen)
- void
- xorg_xv_init(ScreenPtr pScreen)
- {
--   ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
-+   ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-    modesettingPtr ms = modesettingPTR(pScrn);
-    XF86VideoAdaptorPtr *adaptors, *new_adaptors = NULL;
-    XF86VideoAdaptorPtr textured_adapter = NULL, overlay_adaptor = NULL;
---
-cgit v0.9.0.2-2-gbebe
-From 50c01998c7800bc02fd6656cc14efa715bf63e08 Mon Sep 17 00:00:00 2001
-From: Robert Hooker <sarvatt@ubuntu.com>
-Date: Fri, 15 Jun 2012 15:56:59 +0000
-Subject: vmware: Fix up some warnings after new compat API change.
-
-Fixes multiple instances of these warnings on x86_64:
-../../src/vmware.h:180:5: warning: implicit declaration of function 'xf86ScreenToScrn' [-Wimplicit-function-declaration]
-../../src/vmware.h:180:5: warning: nested extern declaration of 'xf86ScreenToScrn' [-Wnested-externs]
-../../src/vmware.h:180:5: warning: return makes pointer from integer without a cast [enabled by default]
-Function `xf86ScreenToScrn' implicitly converted to pointer at ../../src/vmware.h:180
-
-Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
-Signed-off-by: Robert Hooker <sarvatt@ubuntu.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/src/vmware.h b/src/vmware.h
-index 4818e16..be113bb 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -18,6 +18,7 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
-+#include "compat-api.h"
- 
- #include <X11/extensions/panoramiXproto.h>
- 
---
-cgit v0.9.0.2-2-gbebe
-From 46c0862d205eefa985e36a74391ca392640cb898 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Sat, 16 Jun 2012 13:43:52 +0000
-Subject: vmware: drop infoFromScreen inline in favour of new interface
-
-This also should fix the build regression introduced with the fix
-for this macro.
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/vmware.h b/src/vmware.h
-index be113bb..028dff3 100644
---- a/src/vmware.h
-+++ b/src/vmware.h
-@@ -18,8 +18,6 @@
- #include "xf86.h"
- #include "xf86_OSproc.h"
- 
--#include "compat-api.h"
--
- #include <X11/extensions/panoramiXproto.h>
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -177,10 +175,6 @@ typedef struct {
- 
- #define VMWAREPTR(p) ((VMWAREPtr)((p)->driverPrivate))
- 
--static __inline ScrnInfoPtr infoFromScreen(ScreenPtr s) {
--    return xf86ScreenToScrn(s);
--}
--
- #define MIN(a,b) ((a)<(b)?(a):(b))
- #define MAX(a,b) ((a)>(b)?(a):(b))
- #define ABS(x) (((x) >= 0) ? (x) : -(x))
-diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c
-index 2e2effb..93dacc0 100644
---- a/src/vmwarecurs.c
-+++ b/src/vmwarecurs.c
-@@ -12,6 +12,7 @@ char rcsId_vmwarecurs[] =
- #endif
- 
- #include "vmware.h"
-+#include "vmware_common.h"
- #include "bits2pixels.h"
- 
- static void VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
-@@ -110,7 +111,7 @@ vmwareSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg)
- static Bool
- vmwareUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VmwareLog(("UseHWCursor new cursor %p refcnt %i old cursor %p refcnt %i\n",
-               pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
-@@ -145,7 +146,7 @@ vmwareLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src )
- static Bool
- vmwareUseHWCursorARGB(ScreenPtr pScreen, CursorPtr pCurs)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VmwareLog(("UseHWCursorARGB new cursor %p refcnt %i old cursor %p refcnt %i\n",
-               pCurs, pCurs->refcnt, pVMWARE->oldCurs, pVMWARE->oldCurs ? pVMWARE->oldCurs->refcnt : 0));
-@@ -283,7 +284,7 @@ Bool
- vmwareCursorInit(ScreenPtr pScreen)
- {
-     xf86CursorInfoPtr infoPtr;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
-     Bool ret;
- 
-     TRACEPOINT
-@@ -330,7 +331,7 @@ vmwareCursorInit(ScreenPtr pScreen)
- void
- vmwareCursorCloseScreen(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
- #ifdef RENDER
-     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-@@ -356,7 +357,7 @@ vmwareCursorCloseScreen(ScreenPtr pScreen)
- void
- vmwareCursorHookWrappers(ScreenPtr pScreen)
- {
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
- #ifdef RENDER
-     PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
- #endif
-@@ -382,7 +383,7 @@ VMWAREGetImage(DrawablePtr src, int x, int y, int w, int h,
-                unsigned int format, unsigned long planeMask, char *pBinImage)
- {
-     ScreenPtr pScreen = src->pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(src->pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(src->pScreen));
-     BoxRec box;
-     Bool hidden = FALSE;
-     
-@@ -412,7 +413,7 @@ static void
- VMWARECopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
- {
-     ScreenPtr pScreen = pWin->drawable.pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pWin->drawable.pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pWin->drawable.pScreen));
-     BoxPtr pBB;
-     Bool hidden = FALSE;
-     
-@@ -448,7 +449,7 @@ VMWAREComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask,
- 		CARD16 width, CARD16 height)
- {
-     ScreenPtr pScreen = pDst->pDrawable->pScreen;
--    VMWAREPtr pVMWARE = VMWAREPTR(infoFromScreen(pScreen));
-+    VMWAREPtr pVMWARE = VMWAREPTR(xf86ScreenToScrn(pScreen));
-     PictureScreenPtr ps = GetPictureScreen(pScreen);
-     BoxRec box;
-     Bool hidden = FALSE;
-diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
-index 71f21fe..745c71f 100644
---- a/src/vmwarevideo.c
-+++ b/src/vmwarevideo.c
-@@ -39,6 +39,7 @@
- #endif
- 
- #include "vmware.h"
-+#include "vmware_common.h"
- #include "xf86xv.h"
- #include "fourcc.h"
- #include "svga_escape.h"
-@@ -435,7 +436,7 @@ vmwareVideoEnabled(VMWAREPtr pVMWARE)
- Bool
- vmwareVideoInit(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     XF86VideoAdaptorPtr *overlayAdaptors, *newAdaptors = NULL;
-     XF86VideoAdaptorPtr newAdaptor = NULL;
-     int numAdaptors;
-@@ -504,7 +505,7 @@ vmwareVideoInit(ScreenPtr pScreen)
- void
- vmwareVideoEnd(ScreenPtr pScreen)
- {
--    ScrnInfoPtr pScrn = infoFromScreen(pScreen);
-+    ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
-     VMWAREPtr pVMWARE = VMWAREPTR(pScrn);
-     VMWAREVideoPtr pVid;
-     int i;
---
-cgit v0.9.0.2-2-gbebe
-From e5ac80d8f72963313358e31cfb1ab98583e26f23 Mon Sep 17 00:00:00 2001
-From: Dave Airlie <airlied@redhat.com>
-Date: Tue, 03 Jul 2012 12:50:30 +0000
-Subject: vmware: avoid warnings about shadowing 'i'
-
-Signed-off-by: Dave Airlie <airlied@redhat.com>
----
-diff --git a/src/compat-api.h b/src/compat-api.h
-index 6bc946f..205ac59 100644
---- a/src/compat-api.h
-+++ b/src/compat-api.h
-@@ -46,7 +46,7 @@
- #define SCREEN_ARG_TYPE int
- #define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
- 
--#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+#define SCREEN_INIT_ARGS_DECL int scrnIndex, ScreenPtr pScreen, int argc, char **argv
- 
- #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
---
-cgit v0.9.0.2-2-gbebe
-From 007bed30270ca9548dfe6e359972b56cbb8e2f13 Mon Sep 17 00:00:00 2001
-From: Jakob Bornecrantz <jakob@vmware.com>
-Date: Tue, 29 May 2012 21:01:14 +0000
-Subject: vmwgfx: Guard against null rotate pixmap in shadow destroy
-
-Reviewed-by: Thomas Hellström <thellstrom@vmware.com>
-Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
----
-diff --git a/vmwgfx/vmwgfx_crtc.c b/vmwgfx/vmwgfx_crtc.c
-index eaf87b2..fec04c0 100644
---- a/vmwgfx/vmwgfx_crtc.c
-+++ b/vmwgfx/vmwgfx_crtc.c
-@@ -250,8 +250,12 @@ crtc_shadow_create(xf86CrtcPtr crtc, void *data, int width, int height)
- static void
- crtc_shadow_destroy(xf86CrtcPtr crtc, PixmapPtr rotate_pixmap, void *data)
- {
--    ScreenPtr pScreen = rotate_pixmap->drawable.pScreen;
-+    ScreenPtr pScreen;
- 
-+    if (rotate_pixmap == NULL)
-+        return;
-+
-+    pScreen = rotate_pixmap->drawable.pScreen;
-     pScreen->DestroyPixmap(rotate_pixmap);
- }
- 
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xf86-video-voodoo/PKGBUILD b/testing/xf86-video-voodoo/PKGBUILD
deleted file mode 100644
index a3330b479..000000000
--- a/testing/xf86-video-voodoo/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 168248 2012-10-06 20:08:51Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xf86-video-voodoo
-pkgver=1.2.5
-pkgrel=2
-pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-groups=('xorg-drivers' 'xorg')
-options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('9e3eb8a3fdcc60ce4f7c37649188cfa67dcf25cda3a85d8027588458bb3fd7e8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/xfce4-session/PKGBUILD b/testing/xfce4-session/PKGBUILD
deleted file mode 100644
index 70e3be6f8..000000000
--- a/testing/xfce4-session/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 169288 2012-10-18 19:49:18Z jgc $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfce4-session
-pkgver=4.10.0
-pkgrel=6
-pkgdesc="A session manager for Xfce"
-arch=('i686' 'x86_64')
-url="http://www.xfce.org/"
-license=('GPL2')
-groups=('xfce4')
-depends=('libxfce4ui' 'libwnck' 'libsm' 'xorg-iceauth' 'upower' 'xorg-xinit'
-          'hicolor-icon-theme')
-makedepends=('intltool' 'xfce4-dev-tools')
-optdepends=('gnome-keyring: for keyring support when GNOME compatibility is enabled'
-            'xscreensaver: for locking screen with xflock4'
-            'gnome-screensaver: for locking screen with xflock4'
-            'xlockmore: for locking screen with xflock4')
-replaces=('xfce-utils')
-options=('!libtool')
-install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2
-        xfce4-session-4.10.0-add-systemd-support.patch)
-sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce'
-            'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # https://bugzilla.xfce.org/show_bug.cgi?id=8729
-  patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch"
-
-  xdt-autogen
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib/xfce4 \
-    --localstatedir=/var \
-    --disable-static \
-    --disable-debug
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch b/testing/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
deleted file mode 100644
index 7ab637b26..000000000
--- a/testing/xfce4-session/xfce4-session-4.10.0-add-systemd-support.patch
+++ /dev/null
@@ -1,388 +0,0 @@
-diff --git a/xfce4-session/xfsm-systemd.c b/xfce4-session/xfsm-systemd.c
-index 4076586..90e7873 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.c
-@@ -0,0 +1,123 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#include <config.h>
-+
-+#include <gio/gio.h>
-+#include <polkit/polkit.h>
-+
-+#include "xfsm-systemd.h"
-+
-+#define SYSTEMD_DBUS_NAME       "org.freedesktop.login1"
-+#define SYSTEMD_DBUS_PATH       "/org/freedesktop/login1"
-+#define SYSTEMD_DBUS_INTERFACE  "org.freedesktop.login1.Manager"
-+#define SYSTEMD_REBOOT_ACTION   "org.freedesktop.login1.reboot"
-+#define SYSTEMD_SHUTDOWN_ACTION "org.freedesktop.login1.power-off"
-+
-+struct _SystemdProxy {
-+        PolkitAuthority *authority;
-+        PolkitSubject *subject;
-+};
-+
-+SystemdProxy *
-+systemd_proxy_new (void)
-+{
-+        SystemdProxy *proxy;
-+
-+        proxy = g_new0 (SystemdProxy, 1);
-+
-+        proxy->authority = polkit_authority_get_sync (NULL, NULL);
-+        proxy->subject = polkit_unix_process_new (getpid());
-+
-+        return proxy;
-+}
-+
-+void
-+systemd_proxy_free (SystemdProxy *proxy)
-+{
-+        g_object_unref (proxy->authority);
-+        g_object_unref (proxy->subject);
-+
-+        g_free (proxy);
-+}
-+
-+gboolean systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const gchar *method, GError **error)
-+{
-+        PolkitAuthorizationResult *res;
-+        GError *local_error = NULL;
-+
-+        *can_method = FALSE;
-+        res = polkit_authority_check_authorization_sync (proxy->authority,
-+                                                         proxy->subject,
-+                                                         method,
-+                                                         NULL,
-+                                                         POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
-+                                                         NULL,
-+                                                         &local_error);
-+        if (res == NULL) {
-+                g_propagate_error (error, local_error);
-+                return FALSE;
-+        }
-+
-+        *can_method = polkit_authorization_result_get_is_authorized (res) ||
-+                       polkit_authorization_result_get_is_challenge (res);
-+
-+        g_object_unref (res);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_restart, SYSTEMD_REBOOT_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error)
-+{
-+	return systemd_proxy_can_method(proxy, can_shutdown, SYSTEMD_SHUTDOWN_ACTION, error);
-+}
-+
-+gboolean systemd_proxy_method (SystemdProxy *proxy, const gchar *method, GError **error)
-+{
-+        GDBusConnection *bus;
-+
-+        bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL);
-+        g_dbus_connection_call_sync (bus,
-+                                     SYSTEMD_DBUS_NAME,
-+                                     SYSTEMD_DBUS_PATH,
-+                                     SYSTEMD_DBUS_INTERFACE,
-+                                     method,
-+                                     g_variant_new ("(b)", TRUE),
-+                                     NULL, 0, G_MAXINT, NULL, NULL);
-+        g_object_unref (bus);
-+
-+        return TRUE;
-+}
-+
-+gboolean systemd_proxy_restart (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "Reboot", error);
-+}
-+
-+gboolean systemd_proxy_shutdown (SystemdProxy *proxy, GError **error)
-+{
-+	return systemd_proxy_method(proxy, "PowerOff", error);
-+}
-diff --git a/xfce4-session/xfsm-systemd.h b/xfce4-session/xfsm-systemd.h
-index 3fa8317..2c4d868 100644
---- /dev/null
-+++ b/xfce4-session/xfsm-systemd.h
-@@ -0,0 +1,42 @@
-+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
-+ *
-+ * Copyright (C) 2012 Christian Hesse
-+ *
-+ * Licensed under the GNU General Public License Version 2
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+ */
-+
-+#ifndef __SYSTEMD_PROXY_H__
-+#define __SYSTEMD_PROXY_H__
-+
-+#include <glib.h>
-+
-+G_BEGIN_DECLS
-+
-+typedef struct _SystemdProxy SystemdProxy;
-+
-+SystemdProxy *systemd_proxy_new (void);
-+void          systemd_proxy_free (SystemdProxy *proxy);
-+gboolean      systemd_proxy_can_method (SystemdProxy *proxy, gboolean *can_method, const char *method, GError **error);
-+gboolean      systemd_proxy_can_restart (SystemdProxy *proxy, gboolean *can_restart, GError **error);
-+gboolean      systemd_proxy_can_shutdown (SystemdProxy *proxy, gboolean *can_shutdown, GError **error);
-+gboolean      systemd_proxy_method (SystemdProxy *proxy, const char *method, GError **error);
-+gboolean      systemd_proxy_restart (SystemdProxy *proxy, GError **error);
-+gboolean      systemd_proxy_shutdown (SystemdProxy *proxy, GError **error);
-+
-+G_END_DECLS
-+
-+#endif  /* __SYSTEMD_PROXY_H__ */
-
-commit 518a28c23f110617aad36e64c02cdab6a36adf37
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:21:14 2012 +0200
-
-    ...
-
-diff --git a/configure.in.in b/configure.in.in
-index 9aa4f8f..aa0b8bb 100644
---- a/configure.in
-+++ b/configure.in
-@@ -96,6 +96,33 @@ XDT_CHECK_PACKAGE([DBUS], [dbus-1], [1.1.0])
- XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [0.84])
- XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.9.0])
- 
-+dnl systemd integration
-+AC_ARG_ENABLE([systemd],
-+              AS_HELP_STRING([--enable-systemd], [Use systemd]),
-+              [with_systemd=$enableval],
-+              [with_systemd=auto])
-+PKG_CHECK_MODULES(SYSTEMD,
-+                  [libsystemd-login polkit-gobject-1],
-+                  [have_systemd=yes], [have_systemd=no])
-+AC_MSG_CHECKING([whether to use systemd])
-+if test x$with_systemd = xauto ; then
-+        if test x$have_systemd = xno ; then
-+                with_systemd=no
-+        else
-+                with_systemd=yes
-+        fi
-+fi
-+AC_MSG_RESULT($with_systemd)
-+if test x$with_systemd = xyes; then
-+        if test x$have_systemd = xno; then
-+                AC_MSG_ERROR([Systemd support explicitly required, but systemd not found])
-+        fi
-+        AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking])
-+fi
-+AC_SUBST(SYSTEMD_CFLAGS)
-+AC_SUBST(SYSTEMD_LIBS)
-+AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
-+
- dnl Check for debugging support
- XDT_FEATURE_DEBUG([xfsm_debug_default])
- 
-
-commit f1279eba9452f027a2037be77388767437161d51
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:18:16 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index 1429abd..077cdf3 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -96,7 +96,11 @@ struct _XfsmShutdown
- {
-   GObject __parent__;
- 
-+#ifdef HAVE_SYSTEMD
-+  SystemdProxy   *systemd_proxy;
-+#else
-   XfsmConsolekit *consolekit;
-+#endif
-   XfsmUPower     *upower;
- 
-   /* kiosk settings */
-@@ -134,7 +138,11 @@ xfsm_shutdown_init (XfsmShutdown *shutdown)
- {
-   XfceKiosk *kiosk;
- 
-+#ifdef HAVE_SYSTEMD
-+  shutdown->systemd_proxy = systemd_proxy_new ();
-+#else
-   shutdown->consolekit = xfsm_consolekit_get ();
-+#endif
-   shutdown->upower = xfsm_upower_get ();
-   shutdown->helper_state = SUDO_NOT_INITIAZED;
-   shutdown->helper_require_password = FALSE;
-@@ -153,7 +161,11 @@ xfsm_shutdown_finalize (GObject *object)
- {
-   XfsmShutdown *shutdown = XFSM_SHUTDOWN (object);
- 
-+#ifdef HAVE_SYSTEMD
-+  systemd_proxy_free (shutdown->systemd_proxy);
-+#else
-   g_object_unref (G_OBJECT (shutdown->consolekit));
-+#endif
-   g_object_unref (G_OBJECT (shutdown->upower));
- 
-   /* close down helper */
-@@ -644,7 +656,11 @@ xfsm_shutdown_try_restart (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_RESTART, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_restart (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_restart (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -661,7 +677,11 @@ xfsm_shutdown_try_shutdown (XfsmShutdown  *shutdown,
-   if (shutdown->helper_state == SUDO_AVAILABLE)
-     return xfsm_shutdown_sudo_try_action (shutdown, XFSM_SHUTDOWN_SHUTDOWN, error);
-   else
-+#ifdef HAVE_SYSTEMD
-+    return systemd_proxy_shutdown (shutdown->systemd_proxy, error);
-+#else
-     return xfsm_consolekit_try_shutdown (shutdown->consolekit, error);
-+#endif
- }
- 
- 
-@@ -701,7 +721,11 @@ xfsm_shutdown_can_restart (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_restart (shutdown->systemd_proxy, can_restart, error))
-+#else
-   if (xfsm_consolekit_can_restart (shutdown->consolekit, can_restart, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-@@ -728,7 +752,11 @@ xfsm_shutdown_can_shutdown (XfsmShutdown  *shutdown,
-       return TRUE;
-     }
- 
-+#ifdef HAVE_SYSTEMD
-+  if (systemd_proxy_can_shutdown (shutdown->systemd_proxy, can_shutdown, error))
-+#else
-   if (xfsm_consolekit_can_shutdown (shutdown->consolekit, can_shutdown, error))
-+#endif
-     return TRUE;
- 
-   if (xfsm_shutdown_sudo_init (shutdown, error))
-
-commit 5aea3fb853683246a537a67423cf5b32076b8dfb
-Author: Christian Hesse <eworm@leda.eworm.de>
-Date:   Fri Jul 27 14:03:27 2012 +0200
-
-    ...
-
-diff --git a/xfce4-session/Makefile.am b/xfce4-session/Makefile.am
-index c015154..7e3b311 100644
---- a/xfce4-session/Makefile.am
-+++ b/xfce4-session/Makefile.am
-@@ -38,8 +38,6 @@ xfce4_session_SOURCES =							\
- 	xfsm-compat-gnome.h						\
- 	xfsm-compat-kde.c						\
- 	xfsm-compat-kde.h						\
--	xfsm-consolekit.c						\
--	xfsm-consolekit.h						\
- 	xfsm-dns.c							\
- 	xfsm-dns.h							\
- 	xfsm-error.c							\
-@@ -65,6 +63,16 @@ xfce4_session_SOURCES =							\
- 	xfsm-upower.c							\
- 	xfsm-upower.h
- 
-+if WITH_SYSTEMD
-+xfce4_session_SOURCES +=						\
-+	xfsm-systemd.c							\
-+	xfsm-systemd.h
-+else
-+xfce4_session_SOURCES +=						\
-+	xfsm-consolekit.c						\
-+	xfsm-consolekit.h
-+endif
-+
- xfce4_session_CFLAGS =							\
- 	$(LIBSM_CFLAGS)							\
- 	$(LIBX11_CFLAGS)						\
-@@ -72,6 +80,7 @@ xfce4_session_CFLAGS =							\
- 	$(DBUS_CFLAGS)							\
- 	$(DBUS_GLIB_CFLAGS)						\
- 	$(LIBWNCK_CFLAGS)						\
-+	$(SYSTEMD_CFLAGS)						\
- 	$(XFCONF_CFLAGS)						\
- 	$(GMODULE_CFLAGS)						\
- 	$(PLATFORM_CFLAGS)
-@@ -91,6 +100,7 @@ xfce4_session_LDADD =							\
- 	$(DBUS_LIBS)							\
- 	$(DBUS_GLIB_LIBS)						\
- 	$(LIBWNCK_LIBS)							\
-+	$(SYSTEMD_LIBS)							\
- 	$(XFCONF_LIBS)							\
- 	-lm
- 
-diff --git a/xfce4-session/xfsm-shutdown.c b/xfce4-session/xfsm-shutdown.c
-index d8757a8..1429abd 100644
---- a/xfce4-session/xfsm-shutdown.c
-+++ b/xfce4-session/xfsm-shutdown.c
-@@ -66,10 +66,13 @@
- #include <xfce4-session/xfsm-fadeout.h>
- #include <xfce4-session/xfsm-global.h>
- #include <xfce4-session/xfsm-legacy.h>
--#include <xfce4-session/xfsm-consolekit.h>
- #include <xfce4-session/xfsm-upower.h>
- 
--
-+#ifdef HAVE_SYSTEMD
-+#include <xfce4-session/xfsm-systemd.h>
-+#else
-+#include <xfce4-session/xfsm-consolekit.h>
-+#endif
- 
- static void xfsm_shutdown_finalize  (GObject      *object);
- static void xfsm_shutdown_sudo_free (XfsmShutdown *shutdown);
diff --git a/testing/xfce4-session/xfce4-session.install b/testing/xfce4-session/xfce4-session.install
deleted file mode 100644
index e4f8fd06c..000000000
--- a/testing/xfce4-session/xfce4-session.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/xine-lib/PKGBUILD b/testing/xine-lib/PKGBUILD
deleted file mode 100644
index 6a9f18c0f..000000000
--- a/testing/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 169650 2012-10-25 01:35:46Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.2.2
-pkgrel=3
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'ffmpeg' 'libxinerama')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
-             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
-             'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs' 'libvdpau' 'glu')
-optdepends=('imagemagick: for using the imagemagick plugin' \
-            'jack: for using the jack plugin' \
-            'vcdimager: for using the vcd plugin' \
-            'glu: for using the opengl plugin' \
-            'wavpack: for using the wavpack plugin' \
-            'faad2: for using the faad plugin' \
-            'libmng: for using the mng plugin' \
-            'aalib: for using the aalib plugin' \
-            'libmodplug: for using the modplug plugin' \
-            'libdca: for using the dca plugin' \
-            'a52dec: for using the a52 plugin' \
-            'libmad: for using the mp3 plugin' \
-            'libmpcdec: for using the musepack plugin' \
-            'libcaca: for using the caca plugin' \
-            'libbluray: for using the bluray plugin' \
-            'gnome-vfs: for using the gnome-vfs plugin' \
-            'libvdpau: for using the VDPAU plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c')
-
-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/xinetd/PKGBUILD b/testing/xinetd/PKGBUILD
deleted file mode 100644
index 3f9dfa4f1..000000000
--- a/testing/xinetd/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 161606 2012-06-12 07:21:42Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Judd <jvinet@zeroflux.org>
-
-pkgname=xinetd
-pkgver=2.3.15
-pkgrel=2
-pkgdesc="A secure replacement for inetd"
-arch=('i686' 'x86_64')
-url="http://www.xinetd.org/"
-license=('custom')
-optdepends=('perl: for xconv.pl script')
-backup=('etc/xinetd.conf' 'etc/xinetd.d/servers' 'etc/xinetd.d/services')
-source=(http://www.xinetd.org/xinetd-$pkgver.tar.gz
-        xinetd.conf
-        xinetd
-        servers
-        services
-        xinetd.service)
-md5sums=('77358478fd58efa6366accae99b8b04c'
-         'f109f699a07bc8cfb5791060f5e87f9e'
-         'ea37a2794f202e6b953d9b6956dad16a'
-         '21f47b4aa20921cfaddddd9f9a407f81'
-         '9fa2061dc7dd738c8424251deb86f81e'
-         '08466ed714ea8ba42ad81f6fb3aa62e7')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i "s#${prefix}/man#${prefix}/share/man#" configure
-  ./configure --prefix=/usr --without-libwrap
-  make
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr install
-  
-  install -Dm755 $srcdir/xinetd $pkgdir/etc/rc.d/xinetd
-  install -Dm644 $srcdir/xinetd.conf $pkgdir/etc/xinetd.conf
-  install -Dm644 $srcdir/servers $pkgdir/etc/xinetd.d/servers
-  install -Dm644 $srcdir/services $pkgdir/etc/xinetd.d/services
-
-  # install systemd files
-  install -Dm644 $srcdir/xinetd.service $pkgdir/usr/lib/systemd/system/xinetd.service
-  # install license
-  install -Dm644 COPYRIGHT $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
-}
diff --git a/testing/xinetd/servers b/testing/xinetd/servers
deleted file mode 100644
index f064c8d7a..000000000
--- a/testing/xinetd/servers
+++ /dev/null
@@ -1,10 +0,0 @@
-service servers
-{
-        type            = INTERNAL UNLISTED
-        port            = 9099
-        socket_type     = stream
-        protocol        = tcp
-        wait            = no
-        disable         = yes
-        only_from       = 127.0.0.1
-}
diff --git a/testing/xinetd/services b/testing/xinetd/services
deleted file mode 100644
index 4ea304c4f..000000000
--- a/testing/xinetd/services
+++ /dev/null
@@ -1,10 +0,0 @@
-service services
-{
-        type            = INTERNAL UNLISTED
-        port            = 9098
-        socket_type     = stream
-        protocol        = tcp
-        wait            = no
-        disable         = yes
-        only_from       = 127.0.0.1
-}
diff --git a/testing/xinetd/xinetd b/testing/xinetd/xinetd
deleted file mode 100755
index 4b8fa369a..000000000
--- a/testing/xinetd/xinetd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/xinetd`
-case "$1" in
-  start)
-    stat_busy "Starting xinetd"
-    [ -z "$PID" ] && /usr/sbin/xinetd -stayalive -pidfile /var/run/xinetd.pid
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/xinetd.pid
-      add_daemon xinetd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping xinetd"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/xinetd.pid
-      rm_daemon xinetd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/testing/xinetd/xinetd.conf b/testing/xinetd/xinetd.conf
deleted file mode 100644
index b15d9f649..000000000
--- a/testing/xinetd/xinetd.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# /etc/xinetd.conf
-#
-
-defaults
-{
-        instances               = 60
-        log_type                = SYSLOG authpriv
-        log_on_success          = HOST PID
-        log_on_failure          = HOST
-        cps                     = 25 30
-}
-
-includedir /etc/xinetd.d
diff --git a/testing/xinetd/xinetd.service b/testing/xinetd/xinetd.service
deleted file mode 100644
index c6f6271fd..000000000
--- a/testing/xinetd/xinetd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=A secure replacement for inetd
-After=network.target
-
-[Service]
-ExecStart=/usr/sbin/xinetd -dontfork
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch b/testing/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch
deleted file mode 100644
index e3e42d410..000000000
--- a/testing/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 29d84d5a7ca4cc12cce47de9313adeb8554fb894 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 18 Oct 2012 15:11:31 +1000
-Subject: [PATCH] dix: fix zaphod screen scrossing (#54654)
-
-POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the
-coordinates after a screen crossing are already relative to the new screen's
-origin. Add that offset to the coordinates before re-setting.
-
-regression introduced by
-commit bafbd99080be49a17be97d2cc758fbe623369945
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Aug 8 11:34:32 2012 +1000
-
-    dix: work around scaling issues during WarpPointer (#53037)
-
-X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/getevents.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 71d83c4..8b4379d 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-        coordinates were.
-      */
-     if (flags & POINTER_SCREEN) {
--        screenx = sx;
--        screeny = sy;
-+        scr = miPointerGetScreen(pDev);
-+        screenx = sx + scr->x;
-+        screeny = sy + scr->y;
-     }
- 
-     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
--- 
-1.7.11.7
-
diff --git a/testing/xorg-server/10-quirks.conf b/testing/xorg-server/10-quirks.conf
deleted file mode 100644
index 7afad22dc..000000000
--- a/testing/xorg-server/10-quirks.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Collection of quirks and blacklist/whitelists for specific devices.
-
-
-# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
-# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
-Section "InputClass"
-        Identifier "ThinkPad HDAPS accelerometer blacklist"
-        MatchProduct "ThinkPad HDAPS accelerometer data"
-        Option "Ignore" "on"
-EndSection
diff --git a/testing/xorg-server/PKGBUILD b/testing/xorg-server/PKGBUILD
deleted file mode 100644
index 018b1a3e4..000000000
--- a/testing/xorg-server/PKGBUILD
+++ /dev/null
@@ -1,201 +0,0 @@
-# $Id: PKGBUILD 169328 2012-10-19 14:01:21Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=xorg-server
-pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.0
-pkgrel=3
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
-             'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
-             'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
-             'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt')
-options=('!libtool')
-source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
-        autoconfig-nvidia.patch
-        autoconfig-sis.patch
-        xvfb-run
-        xvfb-run.1
-        10-quirks.conf
-        0001-dix-fix-zaphod-screen-scrossing-54654.patch)
-sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a'
-            '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
-            'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
-            'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
-            '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
-            '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-            '23861814b4283ca3fe43aae6e88ee82bcbae5713bf88eabeaef7beb94efe9707')
-
-build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-
-  # Use nouveau/nv/nvidia drivers for nvidia devices
-  patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
-
-  # Use unofficial imedia SiS driver for supported SiS devices
-  patch -Np0 -i "${srcdir}/autoconfig-sis.patch"
-
-  # https://bugs.archlinux.org/task/31959 / https://bugs.freedesktop.org/show_bug.cgi?id=54654
-  patch -Np1 -i ${srcdir}/0001-dix-fix-zaphod-screen-scrossing-54654.patch
-
-  autoreconf -fi
-  ./configure --prefix=/usr \
-      --enable-ipv6 \
-      --enable-dri \
-      --enable-dmx \
-      --enable-xvfb \
-      --enable-xnest \
-      --enable-composite \
-      --enable-xcsecurity \
-      --enable-xorg \
-      --enable-xephyr \
-      --enable-glx-tls \
-      --enable-kdrive \
-      --enable-kdrive-evdev \
-      --enable-kdrive-kbd \
-      --enable-kdrive-mouse \
-      --enable-install-setuid \
-      --enable-config-udev \
-      --disable-config-dbus \
-      --enable-record \
-      --disable-xfbdev \
-      --disable-xfake \
-      --disable-static \
-      --sysconfdir=/etc/X11 \
-      --localstatedir=/var \
-      --with-xkb-path=/usr/share/X11/xkb \
-      --with-xkb-output=/var/lib/xkb \
-      --with-fontrootdir=/usr/share/fonts
-  make
-
-  # Disable subdirs for make install rule to make splitting easier
-  sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \
-      -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \
-      -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \
-      -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \
-      -i hw/Makefile
-}
-
-package_xorg-server-common() {
-  pkgdesc="Xorg server common files"
-  depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common"
-  
-  make -C xkb DESTDIR="${pkgdir}" install-data
-
-  install -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/lib/xorg"
-  install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/"
-}
-
-package_xorg-server() {
-  pkgdesc="Xorg X server"
-  depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev)
-  backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
-  # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
-  provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
-  groups=('xorg')
-  conflicts=('nvidia-utils<=290.10')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/etc/X11"
-  mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/"
-  install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/"
-
-  rmdir "${pkgdir}/usr/share/X11"
-
-  # Needed for non-mesa drivers, libgl will restore it
-  mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \
-     "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg"
-
-  rm -rf "${pkgdir}/var"
-
-  rm -f "${pkgdir}/usr/share/man/man1/Xserver.1"
-  rm -f "${pkgdir}/usr/lib/xorg/protocol.txt"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING"
-
-  rm -rf "${pkgdir}/usr/lib/pkgconfig"
-  rm -rf "${pkgdir}/usr/include"
-  rm -rf "${pkgdir}/usr/share/aclocal"
-}
-
-package_xorg-server-xephyr() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING"
-}
-
-package_xorg-server-xvfb() {
-  pkgdesc="Virtual framebuffer X server"
-  depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING"
-}
-
-package_xorg-server-xnest() {
-  pkgdesc="A nested X server that runs as an X application"
-  depends=(libxfont libxext libgcrypt pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING"
-}
-
-package_xorg-server-xdmx() {
-  pkgdesc="Distributed Multihead X Server and utilities"
-  depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx"
-  make DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING"
-}
-
-package_xorg-server-devel() {
-  pkgdesc="Development files for the X.Org X server"
-  depends=(# see pkgdir/usr/lib/pkgconfig/xorg-server.pc
-           xproto randrproto renderproto xextproto inputproto kbproto 
-           fontsproto pixman videoproto xf86driproto glproto 
-           mesa dri2proto xineramaproto libpciaccess
-           # not technically required but almost every Xorg pkg needs it to build
-           xorg-util-macros)
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/bin"
-  rm -rf "${pkgdir}/usr/share/man"
-  rm -rf "${pkgdir}/usr/share/doc"
-  rm -rf "${pkgdir}/usr/share/X11"
-  rm -rf "${pkgdir}/usr/lib/xorg"
-  rm -rf "${pkgdir}/var"
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel"
-  ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING"
-}
diff --git a/testing/xorg-server/autoconfig-nvidia.patch b/testing/xorg-server/autoconfig-nvidia.patch
deleted file mode 100644
index 6d5220ac7..000000000
--- a/testing/xorg-server/autoconfig-nvidia.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c
---- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c	2012-02-10 10:10:37.583014924 +0000
-+++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c	2012-02-10 11:16:07.148971317 +0000
-@@ -1144,7 +1144,23 @@
-         int idx = 0;
- 
- #ifdef __linux__
--        driverList[idx++] = "nouveau";
-+	    switch (dev->device_id)
-+		{
-+		/* NV1 */
-+		case 0x0008:
-+		case 0x0009:
-+		    driverList[idx++] = "vesa";
-+		    break;
-+		/* NV3 */
-+		case 0x0018:
-+		case 0x0019:
-+		    driverList[idx++] = "nouveau";
-+		    break;
-+		default:
-+		    driverList[idx++] = "nouveau";
-+		    driverList[idx++] = "nvidia";
-+		    break;
-+		}
- #endif
-         driverList[idx++] = "nv";
-         break;
diff --git a/testing/xorg-server/autoconfig-sis.patch b/testing/xorg-server/autoconfig-sis.patch
deleted file mode 100644
index 0b50049db..000000000
--- a/testing/xorg-server/autoconfig-sis.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- hw/xfree86/common/xf86pciBus.c.orig	2011-09-24 10:53:45.421697668 +0000
-+++ hw/xfree86/common/xf86pciBus.c	2011-09-24 10:55:56.416250708 +0000
-@@ -1200,9 +1200,15 @@
-             break;
-         }
-         break;
--    case 0x1039:
--        driverList[0] = "sis";
--        break;
-+	case 0x1039:
-+	    switch (dev->device_id)
-+	    {
-+		case 0x6350: case 0x6351:
-+		    driverList[0] = "sisimedia"; driverList[1] = "sis"; break;
-+		default:
-+		    driverList[0] = "sis"; break;
-+	    }
-+	    break;
-     case 0x126f:
-         driverList[0] = "siliconmotion";
-         break;
diff --git a/testing/xorg-server/xvfb-run b/testing/xorg-server/xvfb-run
deleted file mode 100644
index 4c2f4e0d3..000000000
--- a/testing/xorg-server/xvfb-run
+++ /dev/null
@@ -1,180 +0,0 @@
-#!/bin/sh
-
-# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $
-
-# This script starts an instance of Xvfb, the "fake" X server, runs a command
-# with that server available, and kills the X server when done.  The return
-# value of the command becomes the return value of this script.
-#
-# If anyone is using this to build a Debian package, make sure the package
-# Build-Depends on xvfb, xbase-clients, and xfonts-base.
-
-set -e
-
-PROGNAME=xvfb-run
-SERVERNUM=99
-AUTHFILE=
-ERRORFILE=/dev/null
-STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
-LISTENTCP="-nolisten tcp"
-XAUTHPROTO=.
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user.  This is used only as a fallback in the event
-# the COLUMNS variable is not set.  ($COLUMNS can react to SIGWINCH while the
-# script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
-    DEFCOLUMNS=80
-fi
-
-# Display a message, wrapping lines at the terminal width.
-message () {
-    echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS}
-}
-
-# Display an error message.
-error () {
-    message "error: $*" >&2
-}
-
-# Display a usage message.
-usage () {
-    if [ -n "$*" ]; then
-        message "usage error: $*"
-    fi
-    cat <<EOF
-Usage: $PROGNAME [OPTION ...] COMMAND
-Run COMMAND (usually an X client) in a virtual X server environment.
-Options:
--a        --auto-servernum          try to get a free server number, starting at
-                                    --server-num
--e FILE   --error-file=FILE         file used to store xauth errors and Xvfb
-                                    output (default: $ERRORFILE)
--f FILE   --auth-file=FILE          file used to store auth cookie
-                                    (default: ./.Xauthority)
--h        --help                    display this usage message and exit
--n NUM    --server-num=NUM          server number to use (default: $SERVERNUM)
--l        --listen-tcp              enable TCP port listening in the X server
--p PROTO  --xauth-protocol=PROTO    X authority protocol name to use
-                                    (default: xauth command's default)
--s ARGS   --server-args=ARGS        arguments (other than server number and
-                                    "-nolisten tcp") to pass to the Xvfb server
-                                    (default: "$XVFBARGS")
--w DELAY  --wait=DELAY              delay in seconds to wait for Xvfb to start
-                                    before running COMMAND (default: $STARTWAIT)
-EOF
-}
-
-# Find a free server number by looking at .X*-lock files in /tmp.
-find_free_servernum() {
-    # Sadly, the "local" keyword is not POSIX.  Leave the next line commented in
-    # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
-    # anyway.
-    #local i
-
-    i=$SERVERNUM
-    while [ -f /tmp/.X$i-lock ]; do
-        i=$(($i + 1))
-    done
-    echo $i
-}
-
-# Clean up files
-clean_up() {
-    if [ -e "$AUTHFILE" ]; then
-        XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1
-    fi
-    if [ -n "$XVFB_RUN_TMPDIR" ]; then
-        if ! rm -r "$XVFB_RUN_TMPDIR"; then
-            error "problem while cleaning up temporary directory"
-            exit 5
-        fi
-    fi
-}
-
-# Parse the command line.
-ARGS=$(getopt --options +ae:f:hn:lp:s:w: \
-       --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \
-       --name "$PROGNAME" -- "$@")
-GETOPT_STATUS=$?
-
-if [ $GETOPT_STATUS -ne 0 ]; then
-    error "internal error; getopt exited with status $GETOPT_STATUS"
-    exit 6
-fi
-
-eval set -- "$ARGS"
-
-while :; do
-    case "$1" in
-        -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;;
-        -e|--error-file) ERRORFILE="$2"; shift ;;
-        -f|--auth-file) AUTHFILE="$2"; shift ;;
-        -h|--help) SHOWHELP="yes" ;;
-        -n|--server-num) SERVERNUM="$2"; shift ;;
-        -l|--listen-tcp) LISTENTCP="" ;;
-        -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;;
-        -s|--server-args) XVFBARGS="$2"; shift ;;
-        -w|--wait) STARTWAIT="$2"; shift ;;
-        --) shift; break ;;
-        *) error "internal error; getopt permitted \"$1\" unexpectedly"
-           exit 6
-           ;;
-    esac
-    shift
-done
-
-if [ "$SHOWHELP" ]; then
-    usage
-    exit 0
-fi
-
-if [ -z "$*" ]; then
-    usage "need a command to run" >&2
-    exit 2
-fi
-
-if ! which xauth >/dev/null; then
-    error "xauth command not found"
-    exit 3
-fi
-
-# tidy up after ourselves
-trap clean_up EXIT
-
-# If the user did not specify an X authorization file to use, set up a temporary
-# directory to house one.
-if [ -z "$AUTHFILE" ]; then
-    XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
-    AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
-fi
-
-# Start Xvfb.
-MCOOKIE=$(mcookie)
-XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1
-add :$SERVERNUM $XAUTHPROTO $MCOOKIE
-EOF
-XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \
-  2>&1 &
-XVFBPID=$!
-sleep "$STARTWAIT"
-if ! kill -0 $XVFBPID 2>/dev/null; then
-  echo "Xvfb failed to start" >&2
-  exit 1
-fi
-
-# Start the command and save its exit status.
-set +e
-DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1
-RETVAL=$?
-set -e
-
-# Kill Xvfb now that the command has exited.
-kill $XVFBPID
-
-# Return the executed command's exit status.
-exit $RETVAL
-
-# vim:set ai et sts=4 sw=4 tw=80:
diff --git a/testing/xorg-server/xvfb-run.1 b/testing/xorg-server/xvfb-run.1
deleted file mode 100644
index 137d3a196..000000000
--- a/testing/xorg-server/xvfb-run.1
+++ /dev/null
@@ -1,282 +0,0 @@
-.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $
-.\"
-.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>.
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License with
-.\" the Debian operating system, in /usr/share/common-licenses/GPL;  if
-.\" not, write to the Free Software Foundation, Inc., 59 Temple Place,
-.\" Suite 330, Boston, MA 02111-1307 USA
-.\"
-.\" We need the URL macro from groff's www macro package, but also want
-.\" things to work all right for people who don't have it.  So we define
-.\" our own URL macro and let the www macro package override it if it's
-.\" available.
-.de URL
-\\$2 \(laURL: \\$1 \(ra\\$3
-..
-.if \n[.g] .mso www.tmac
-.TH xvfb\-run 1 "2004\-11\-12" "Debian Project"
-.SH NAME
-xvfb\-run \- run specified X client or command in a virtual X server environment
-.SH SYNOPSIS
-.B xvfb\-run
-[
-.I options
-]
-.I command
-.SH DESCRIPTION
-.B xvfb\-run
-is a wrapper for the
-.BR Xvfb (1x)
-command which simplifies the task of running commands (typically an X
-client, or a script containing a list of clients to be run) within a virtual
-X server environment.
-.PP
-.B xvfb\-run
-sets up an X authority file (or uses an existing user\-specified one),
-writes a cookie to it (see
-.BR xauth (1x))
-and then starts the
-.B Xvfb
-X server as a background process.
-The process ID of
-.B Xvfb
-is stored for later use.
-The specified
-.I command
-is then run using the X display corresponding to the
-.B Xvfb
-server
-just started and the X authority file created earlier.
-.PP
-When the
-.I command
-exits, its status is saved, the
-.B Xvfb
-server is killed (using the process ID stored earlier), the X authority
-cookie removed, and the authority file deleted (if the user did not specify
-one to use).
-.B xvfb\-run
-then exits with the exit status of
-.IR command .
-.PP
-.B xvfb\-run
-requires the
-.B xauth
-command to function.
-.SH OPTIONS
-.TP
-.B \-a\fR,\fB \-\-auto\-servernum
-Try to get a free server number, starting at 99, or the argument to
-.BR \-\-server\-num .
-.TP
-.BI \-e\  file \fR,\fB\ \-\-error\-file= file
-Store output from
-.B xauth
-and
-.B Xvfb
-in
-.IR file .
-The default is
-.IR /dev/null .
-.TP
-.BI \-f\  file \fR,\fB\ \-\-auth\-file= file
-Store X authentication data in
-.IR file .
-By default, a temporary directory called
-.IR xvfb\-run. PID
-(where PID is the process ID of
-.B xvfb\-run
-itself) is created in the directory specified by the environment variable
-.B TMPDIR
-(or
-.I /tmp
-if that variable is null or unset), and the
-.BR tempfile (1)
-command is used to create a file in that temporary directory called
-.IR Xauthority .
-.TP
-.B \-h\fR,\fB \-\-help
-Display a usage message and exit.
-.TP
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-Use
-.I servernumber
-as the server number (but see the
-.B \-a\fR,\fB \-\-auto\-servernum
-option above).
-The default is 99.
-.TP
-.B \-l\fR,\fB \-\-listen\-tcp
-Enable TCP port listening in the X server.
-For security reasons (to avoid denial\-of\-service attacks or exploits),
-TCP port listening is disabled by default.
-.TP
-.BI \-p\  protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname
-Use
-.I protocolname
-as the X authority protocol to use.
-The default is \(oq.\(cq, which
-.B xauth
-interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1.
-.TP
-.BI \-s\  arguments \fR,\fB\ \-\-server\-args= arguments
-Pass
-.I arguments
-to the
-.B Xvfb
-server.
-Be careful to quote any whitespace characters that may occur within
-.I arguments
-to prevent them from regarded as separators for
-.BR xvfb\-run 's
-own arguments.
-Also, note that specification of \(oq\-nolisten tcp\(cq in
-.I arguments
-may override the function of
-.BR xvfb\-run 's
-own
-.B \-l\fR,\fB \-\-listen\-tcp
-option, and that specification of the server number (e.g., \(oq:1\(cq) may
-be ignored because of the way the X server parses its argument list.
-Use the
-.B xvfb\-run
-option
-.BI \-n\  servernumber \fR,\fB\ \-\-server\-num= servernumber
-to achieve the latter function.
-The default is \(oq\-screen 0 640x480x8\(cq.
-.TP
-.BI \-w\  delay \fR,\fB\ \-\-wait= delay
-Wait
-.I delay
-seconds after launching
-.B Xvfb
-before attempting to start the specified command.
-The default is 3.
-.SH ENVIRONMENT
-.TP
-.B COLUMNS
-indicates the width of the terminal device in character cells.
-This value is used for formatting diagnostic messages.
-If not set, the terminal is queried using
-.BR stty (1)
-to determine its width.
-If that fails, a value of \(oq80\(cq is assumed.
-.TP
-.B TMPDIR
-specifies the directory in which to place
-.BR xvfb\-run 's
-temporary directory for storage of the X authority file; only used if the
-.B \-f
-or
-.B \-\-auth\-file
-options are not specified.
-.SH "OUTPUT FILES"
-.PP
-Unless the
-.B \-f
-or
-.B \-\-auth\-file
-options are specified, a temporary
-directory and file within it are created (and deleted) to store the X
-authority cookies used by the
-.B Xvfb
-server and client(s) run under it.
-See
-.BR tempfile (1).
-If \-f or \-\-auth\-file are used, then the specified X authority file is
-only written to, not created or deleted (though
-.B xauth
-creates an authority file itself if told to use use that does not already
-exist).
-.PP
-An error file with a user\-specified name is also created if the
-.B \-e
-or
-.B \-\-error\-file
-options are specifed; see above.
-.SH "EXIT STATUS"
-.B xvfb\-run
-uses its exit status as well as output to standard error to communicate
-diagnostics.
-The exit status of \(oq1\(cq is not used, and should be interpreted as failure
-of the specified command.
-.TP
-0
-.B xvfb\-run
-only uses this exit status if the
-.B \-h\fR,\fB \-\-help
-option is given.
-In all other situations, this may be interpreted as success of the specified
-command.
-.TP
-2
-No command to run was specified.
-.TP
-3
-The
-.B xauth
-command is not available.
-.TP
-4
-The temporary directory that was going to be used already exists; since
-.B xvfb\-run
-produces a uniquely named directory, this may indicate an attempt by another
-process on the system to exploit a temporary file race condition.
-.TP
-5
-A problem was encountered while cleaning up the temporary directory.
-.TP
-6
-A problem was encountered while using
-.BR getopt (1)
-to parse the command\-line arguments.
-.SH EXAMPLES
-.TP
-.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo
-runs the
-.BR xlogo (1x)
-demonstration client inside the
-.B Xvfb
-X server on the first available server number greater than or equal to 1.
-.TP
-.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces
-runs the
-.BR ico (1x)
-demonstration client (and passes it the
-.B \-faces
-argument) inside the
-.B Xvfb
-X server, configured with a root window of 1024 by 768 pixels and a color
-depth of 24 bits.
-.PP
-Note that the demo X clients used in the above examples will not exit on
-their own, so they will have to be killed before
-.B xvfb\-run
-will exit.
-.SH BUGS
-See
-.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" .
-If you wish to report a bug in
-.BR xvfb\-run ,
-please use the 
-.BR reportbug (1)
-command.
-.SH AUTHOR
-.B xfvb\-run
-was written by Branden Robinson and Jeff Licquia with sponsorship from
-Progeny Linux Systems.
-.SH "SEE ALSO"
-.BR Xvfb (1x),
-.BR xauth (1x)
-.\" vim:set et tw=80:
diff --git a/testing/xorg-xdm/PKGBUILD b/testing/xorg-xdm/PKGBUILD
deleted file mode 100644
index 5a2ce0012..000000000
--- a/testing/xorg-xdm/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 169289 2012-10-18 19:49:22Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=xorg-xdm
-pkgver=1.1.11
-pkgrel=4
-pkgdesc="X Display Manager"
-arch=(i686 x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'systemd')
-makedepends=('pkgconfig' 'xorg-util-macros' 'xtrans')
-backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession)
-options=('!libtool')
-source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2
-        Xsession-loginshell.patch
-        Xsession-xsm.patch
-        xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
-        xdm.pam
-        git_fixes.diff)
-sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47'
-            'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff'
-            '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb'
-            '5f380a2d6f77feb910d77f7f6843fce9b00ff7610c159fc029ee44cc6c23a48a'
-            '7d6818a1c1a44e9bd38774c035e03b0b831f6646681bc2bf556761aec7baf418'
-            '781b5577bb070220d018a11832d0d4a65fd16e130730ba26fb055c3aa68156b2')
-
-build() {
-  cd "${srcdir}/xdm-${pkgver}"
-  # upstream commits - Add some missing malloc failure checks 	2012-01-07
-  patch -Np1 -i "${srcdir}/git_fixes.diff"
-  
-  patch -Np0 -i "${srcdir}/Xsession-loginshell.patch"
-  patch -Np1 -i "${srcdir}/Xsession-xsm.patch"
-  patch -Np0 -i "${srcdir}/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch"
-
-  autoreconf -fi
-  ./configure --prefix=/usr \
-      --disable-xdm-auth \
-      --disable-static \
-      --with-xdmconfigdir=/etc/X11/xdm \
-      --with-xdmscriptdir=/etc/X11/xdm \
-      --with-pixmapdir=/usr/share/xdm/pixmaps
-  make
-}
-
-package() {
-  cd "${srcdir}/xdm-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/var/lib/xdm"
-  install -m755 -d "${pkgdir}/etc/pam.d"
-  install -m644 "${srcdir}/xdm.pam" "${pkgdir}/etc/pam.d/xdm"
-  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
-  sed -i -e 's/\/X11R6//g' "${pkgdir}"/etc/X11/xdm/*
-
-  sed -i 's|^Alias=.*|Alias=display-manager.service|' \
-    "$pkgdir/usr/lib/systemd/system/xdm.service"
-}
diff --git a/testing/xorg-xdm/Xsession-loginshell.patch b/testing/xorg-xdm/Xsession-loginshell.patch
deleted file mode 100644
index 3710752ef..000000000
--- a/testing/xorg-xdm/Xsession-loginshell.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/Xsession.cpp.orig	2008-06-21 13:57:36.000000000 +0000
-+++ config/Xsession.cpp	2008-06-21 14:01:25.000000000 +0000
-@@ -56,11 +56,7 @@
- resources=$HOME/.Xresources
- 
- if [ -s "$startup" ]; then
--	if [ -x "$startup" ]; then
--		exec "$startup"
--	else
--		exec /bin/sh "$startup"
--	fi
-+	exec /bin/sh -ls -c "$startup"
- else
- 	if [ -r "$resources" ]; then
- 		BINDIR/xrdb -load "$resources"
diff --git a/testing/xorg-xdm/Xsession-xsm.patch b/testing/xorg-xdm/Xsession-xsm.patch
deleted file mode 100644
index a2d4d6cc6..000000000
--- a/testing/xorg-xdm/Xsession-xsm.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur xdm-1.1.8-orig/config/Xsession.cpp xdm-1.1.8/config/Xsession.cpp
---- xdm-1.1.8-orig/config/Xsession.cpp	2008-05-21 14:08:45.000000000 -0400
-+++ xdm-1.1.8/config/Xsession.cpp	2009-04-28 02:56:11.000000000 -0400
-@@ -54,6 +54,7 @@
- 
- startup=$HOME/.xsession
- resources=$HOME/.Xresources
-+xinitrc=$HOME/.xinitrc
- 
- if [ -s "$startup" ]; then
- 	if [ -x "$startup" ]; then
-@@ -83,5 +84,9 @@
-                 exec `eval $XDESKTOP`
-         }
- #endif
--	exec BINDIR/xsm
-+	if [ -r "$xinitrc" ]; then
-+		exec /bin/sh -ls -c "$xinitrc"
-+	else
-+		exec /bin/sh -l /etc/X11/xinit/xinitrc
-+        fi
- fi
diff --git a/testing/xorg-xdm/git_fixes.diff b/testing/xorg-xdm/git_fixes.diff
deleted file mode 100644
index 69836d488..000000000
--- a/testing/xorg-xdm/git_fixes.diff
+++ /dev/null
@@ -1,673 +0,0 @@
-From 011a2710a69cd345a8ee3a6b2f15407b4c3b355a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Sun, 25 Sep 2011 07:56:15 +0000
-Subject: Require xt >= 1.0 for appdefaultdir
-
-https://bugs.freedesktop.org/show_bug.cgi?id=7237
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/configure.ac b/configure.ac
-index b488f0c..a4222f1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -383,7 +383,7 @@ PKG_CHECK_MODULES(AUTH, xau)
- # Greeter
- #
- 
--PKG_CHECK_MODULES(XDMGREET, xt x11 xext)
-+PKG_CHECK_MODULES(XDMGREET, xt >= 1.0 x11 xext)
- 
- GREETERLIB="${XDMLIBDIR}/libXdmGreet.so"
- AX_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library])
---
-cgit v0.9.0.2-2-gbebe
-From 618039261b0c7f14eb3b32c8f636464369724407 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 21 Sep 2011 02:11:20 +0000
-Subject: Mark some chars as const to fix gcc -Wwrite-strings warnings
-
-Can't fix all the warnings, due to the Xt API, but can fix a bunch.
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/greeter/greet.c b/greeter/greet.c
-index 539ce17..82e2c21 100644
---- a/greeter/greet.c
-+++ b/greeter/greet.c
-@@ -110,9 +110,9 @@ void    (*__xdm_SessionExit)(struct display *d, int status, int removeAuth) = NU
- void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy) = NULL;
- int     (*__xdm_source)(char **environ, char *file) = NULL;
- char    **(*__xdm_defaultEnv)(void) = NULL;
--char    **(*__xdm_setEnv)(char **e, char *name, char *value) = NULL;
-+char    **(*__xdm_setEnv)(char **e, const char *name, const char *value) = NULL;
- char    **(*__xdm_putEnv)(const char *string, char **env) = NULL;
--char    **(*__xdm_parseArgs)(char **argv, char *string) = NULL;
-+char    **(*__xdm_parseArgs)(char **argv, const char *string) = NULL;
- void    (*__xdm_printEnv)(char **e) = NULL;
- char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home) = NULL;
- void    (*__xdm_LogOutOfMem)(const char * fmt, ...) = NULL;
-diff --git a/greeter/verify.c b/greeter/verify.c
-index ea62cd2..5d2ad17 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -61,7 +61,7 @@ from The Open Group.
- extern char *crypt(const char *, const char *);
- #endif
- 
--static char *envvars[] = {
-+static const char *envvars[] = {
-     "TZ",			/* SYSV and SVR4, but never hurts */
- #if defined(sony) && !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV)
-     "bootdev",
-@@ -94,8 +94,8 @@ static char **
- userEnv (struct display *d, int useSystemPath, char *user, char *home, char *shell)
- {
-     char	**env;
--    char	**envvar;
--    char	*str;
-+    const char	**envvar;
-+    const char	*str;
- 
-     env = defaultEnv ();
-     env = setEnv (env, "DISPLAY", d->name);
-diff --git a/include/dm.h b/include/dm.h
-index 316dd46..4085cae 100644
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -443,7 +443,7 @@ extern void UnsecureDisplay (struct display *d, Display *dpy);
- extern void execute(char **argv, char **environ);
- 
- /* server.c */
--extern char *_SysErrorMsg (int n);
-+extern const char *_SysErrorMsg (int n);
- extern int StartServer (struct display *d);
- extern int WaitForServer (struct display *d);
- extern void ResetServer (struct display *d);
-@@ -462,10 +462,10 @@ extern int Asprintf(char ** ret, const char *restrict format, ...)
-     _X_ATTRIBUTE_PRINTF(2,3);
- # endif
- extern char *localHostname (void);
--extern char **parseArgs (char **argv, char *string);
--extern char **setEnv (char **e, char *name, char *value);
-+extern char **parseArgs (char **argv, const char *string);
-+extern char **setEnv (char **e, const char *name, const char *value);
- extern char **putEnv(const char *string, char **env);
--extern char *getEnv (char **e, char *name);
-+extern char *getEnv (char **e, const char *name);
- extern void CleanUpChild (void);
- extern void freeArgs (char **argv);
- extern void freeEnv (char **env);
-@@ -478,7 +478,7 @@ extern int Verify (struct display *d, struct greet_info *greet, struct verify_in
- extern char *NetworkAddressToHostname (CARD16 connectionType, ARRAY8Ptr connectionAddress);
- extern int AnyWellKnownSockets (void);
- extern void DestroyWellKnownSockets (void);
--extern void SendFailed (struct display *d, char *reason);
-+extern void SendFailed (struct display *d, const char *reason);
- extern void StopDisplay (struct display *d);
- extern void WaitForChild (void);
- extern void WaitForSomething (void);
-diff --git a/include/greet.h b/include/greet.h
-index 6b6689e..0d607ba 100644
---- a/include/greet.h
-+++ b/include/greet.h
-@@ -65,9 +65,9 @@ struct dlfuncs {
-     void (*_DeleteXloginResources)(struct display *d, Display *dpy);
-     int (*_source)(char **environ, char *file);
-     char **(*_defaultEnv)(void);
--    char **(*_setEnv)(char **e, char *name, char *value);
-+    char **(*_setEnv)(char **e, const char *name, const char *value);
-     char **(*_putEnv)(const char *string, char **env);
--    char **(*_parseArgs)(char **argv, char *string);
-+    char **(*_parseArgs)(char **argv, const char *string);
-     void (*_printEnv)(char **e);
-     char **(*_systemEnv)(struct display *d, char *user, char *home);
-     void (*_LogOutOfMem)(const char * fmt, ...);
-@@ -149,9 +149,9 @@ extern	void    (*__xdm_SessionExit)(struct display *d, int status, int removeAut
- extern	void    (*__xdm_DeleteXloginResources)(struct display *d, Display *dpy);
- extern	int     (*__xdm_source)(char **environ, char *file);
- extern	char    **(*__xdm_defaultEnv)(void);
--extern	char    **(*__xdm_setEnv)(char **e, char *name, char *value);
-+extern	char    **(*__xdm_setEnv)(char **e, const char *name, const char *value);
- extern	char    **(*__xdm_putEnv)(const char *string, char **env);
--extern	char    **(*__xdm_parseArgs)(char **argv, char *string);
-+extern	char    **(*__xdm_parseArgs)(char **argv, const char *string);
- extern	void    (*__xdm_printEnv)(char **e);
- extern	char    **(*__xdm_systemEnv)(struct display *d, char *user, char *home);
- extern	void    (*__xdm_LogOutOfMem)(const char * fmt, ...);
-diff --git a/xdm/access.c b/xdm/access.c
-index d0850ad..7035375 100644
---- a/xdm/access.c
-+++ b/xdm/access.c
-@@ -667,7 +667,7 @@ scanHostlist (
- /* Returns non-0 iff string is matched by pattern.  Does case folding.
-  */
- static int
--patternMatch (char *string, char *pattern)
-+patternMatch (const char *string, char *pattern)
- {
-     int	    p, s;
- 
-diff --git a/xdm/auth.c b/xdm/auth.c
-index bbca167..9e5cba2 100644
---- a/xdm/auth.c
-+++ b/xdm/auth.c
-@@ -116,7 +116,7 @@ int chown(int a,int b,int c) {}
- 
- struct AuthProtocol {
-     unsigned short  name_length;
--    char	    *name;
-+    const char	    *name;
-     void	    (*InitAuth)(unsigned short len, char *name);
-     Xauth	    *(*GetAuth)(unsigned short len, char *name);
-     void	    (*GetXdmcpAuth)(
-diff --git a/xdm/file.c b/xdm/file.c
-index 6e929b8..7b7f3d3 100644
---- a/xdm/file.c
-+++ b/xdm/file.c
-@@ -225,7 +225,7 @@ ParseDisplay (char *source, DisplayType *acceptableTypes, int numAcceptable)
- }
- 
- static struct displayMatch {
--	char		*name;
-+	const char	*name;
- 	DisplayType	type;
- } displayTypes[] = {
- 	{ "local",		{ Local, Permanent, FromFile } },
-diff --git a/xdm/resource.c b/xdm/resource.c
-index ece4de3..83901a2 100644
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -145,10 +145,10 @@ int	choiceTimeout;	/* chooser choice timeout */
- #define DEF_UDP_PORT	"177"	    /* registered XDMCP port, dont change */
- 
- struct dmResources {
--	char	*name, *class;
--	int	type;
--	char	**dm_value;
--	char	*default_value;
-+	const char	*name, *class;
-+	int		type;
-+	char		**dm_value;
-+	const char	*default_value;
- } DmResources[] = {
- { "servers",	"Servers", 	DM_STRING,	&servers,
- 				DEF_SERVER_LINE} ,
-@@ -203,10 +203,10 @@ struct dmResources {
- #define boffset(f)	XtOffsetOf(struct display, f)
- 
- struct displayResource {
--	char	*name, *class;
--	int	type;
--	int	offset;
--	char	*default_value;
-+	const char	*name, *class;
-+	int		type;
-+	int		offset;
-+	const char	*default_value;
- };
- 
- /* resources for managing the server */
-@@ -289,15 +289,16 @@ XrmDatabase	DmResourceDB;
- 
- static void
- GetResource (
--    char    *name,
--    char    *class,
--    int	    valueType,
--    char    **valuep,
--    char    *default_value)
-+    const char    *name,
-+    const char    *class,
-+    int            valueType,
-+    char         **valuep,
-+    const char    *default_value)
- {
-     char	*type;
-     XrmValue	value;
--    char	*string, *new_string;
-+    const char	*string;
-+    char	*new_string;
-     char	str_buf[50];
-     int	len;
- 
-diff --git a/xdm/server.c b/xdm/server.c
-index 7fe55e6..1bb8873 100644
---- a/xdm/server.c
-+++ b/xdm/server.c
-@@ -62,9 +62,9 @@ CatchUsr1 (int n)
-     errno = olderrno;
- }
- 
--char *_SysErrorMsg (int n)
-+const char *_SysErrorMsg (int n)
- {
--    char *s = strerror(n);
-+    const char *s = strerror(n);
-     return (s ? s : "unknown error");
- }
- 
-diff --git a/xdm/util.c b/xdm/util.c
-index 033633a..60aab21 100644
---- a/xdm/util.c
-+++ b/xdm/util.c
-@@ -97,7 +97,7 @@ printEnv (char **e)
- }
- 
- static char *
--makeEnv (char *name, char *value)
-+makeEnv (const char *name, const char *value)
- {
- 	char	*result;
- 
-@@ -111,7 +111,7 @@ makeEnv (char *name, char *value)
- }
- 
- char *
--getEnv (char **e, char *name)
-+getEnv (char **e, const char *name)
- {
- 	int	l = strlen (name);
- 
-@@ -127,7 +127,7 @@ getEnv (char **e, char *name)
- }
- 
- char **
--setEnv (char **e, char *name, char *value)
-+setEnv (char **e, const char *name, const char *value)
- {
- 	char	**new, **old;
- 	char	*newe;
-@@ -207,9 +207,9 @@ freeEnv (char **env)
- #define isblank(c)	((c) == ' ' || c == '\t')
- 
- char **
--parseArgs (char **argv, char *string)
-+parseArgs (char **argv, const char *string)
- {
--	char	*word;
-+	const char *word;
- 	char	*save;
- 	char    **newargv;
- 	int	i;
-diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
-index 4b945cf..66804a4 100644
---- a/xdm/xdmauth.c
-+++ b/xdm/xdmauth.c
-@@ -44,7 +44,7 @@ static char	auth_name[256];
- static int	auth_name_len;
- 
- static void
--XdmPrintDataHex (char *s, char *a, int l)
-+XdmPrintDataHex (const char *s, const char *a, int l)
- {
-     int	i;
- 
-@@ -56,7 +56,7 @@ XdmPrintDataHex (char *s, char *a, int l)
- 
- # ifdef XDMCP
- static void
--XdmPrintArray8Hex (char *s, ARRAY8Ptr a)
-+XdmPrintArray8Hex (const char *s, ARRAY8Ptr a)
- {
-     XdmPrintDataHex (s, (char *) a->data, a->length);
- }
-diff --git a/xdm/xdmcp.c b/xdm/xdmcp.c
-index 5bc4716..1c34e7c 100644
---- a/xdm/xdmcp.c
-+++ b/xdm/xdmcp.c
-@@ -74,7 +74,7 @@ static void request_respond (struct sockaddr *from, int fromlen, int length, int
- static void send_accept (struct sockaddr *to, int tolen, CARD32 sessionID, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr authorizationName, ARRAY8Ptr authorizationData, int fd);
- static void send_alive (struct sockaddr *from, int fromlen, int length, int fd);
- static void send_decline (struct sockaddr *to, int tolen, ARRAY8Ptr authenticationName, ARRAY8Ptr authenticationData, ARRAY8Ptr status, int fd);
--static void send_failed (struct sockaddr *from, int fromlen, char *name, CARD32 sessionID, char *reason, int fd);
-+static void send_failed (struct sockaddr *from, int fromlen, const char *name, CARD32 sessionID, const char *reason, int fd);
- static void send_refuse (struct sockaddr *from, int fromlen, CARD32 sessionID, int fd);
- static void send_unwilling (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
- static void send_willing (struct sockaddr *from, int fromlen, ARRAY8Ptr authenticationName, ARRAY8Ptr status, int fd);
-@@ -1300,7 +1300,7 @@ abort:
- void
- SendFailed (
-     struct display  *d,
--    char	    *reason)
-+    const char	    *reason)
- {
-     Debug ("Display start failed, sending Failed\n");
-     send_failed ((struct sockaddr *)(d->from), d->fromlen, d->name,
-@@ -1311,9 +1311,9 @@ static void
- send_failed (
-     struct sockaddr *from,
-     int		    fromlen,
--    char	    *name,
-+    const char	    *name,
-     CARD32	    sessionID,
--    char	    *reason,
-+    const char	    *reason,
-     int		    fd)
- {
-     static char	buf[256];
-@@ -1416,7 +1416,7 @@ NetworkAddressToHostname (
- # else
- 	    char dotted[20];
- # endif
--	    char *local_name = "";
-+	    const char *local_name = "";
- 	    int af_type;
- 
- # if defined(IPv6) && defined(AF_INET6)
---
-cgit v0.9.0.2-2-gbebe
-From c43eb799774743bc50233eff6643c51a5fbe6899 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Wed, 21 Sep 2011 02:22:48 +0000
-Subject: Fix warnings about printing longs with int type format strings
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/xdm/dm.c b/xdm/dm.c
-index cd0ee25..7bc2605 100644
---- a/xdm/dm.c
-+++ b/xdm/dm.c
-@@ -536,7 +536,7 @@ WaitForChild (void)
- 		  time(&now);
- 		  crash = d->lastReserv &&
- 		    ((now - d->lastReserv) < XDM_BROKEN_INTERVAL);
--		  Debug("time %i %i try %i of %i%s\n", now, d->lastReserv,
-+		  Debug("time %li %li try %i of %i%s\n", now, d->lastReserv,
- 			d->reservTries, d->reservAttempts,
- 			crash ? " crash" : "");
- 
-diff --git a/xdm/xdmauth.c b/xdm/xdmauth.c
-index 66804a4..b3c1c16 100644
---- a/xdm/xdmauth.c
-+++ b/xdm/xdmauth.c
-@@ -234,7 +234,7 @@ XdmGetKey(struct protoDisplay *pdpy, ARRAY8Ptr displayID)
- 	if (line[0] == '#' || sscanf (line, "%s %s", id, key) != 2)
- 	    continue;
- 	bzero(line, sizeof(line));
--	Debug ("Key entry for \"%s\" %d bytes\n", id, strlen(key));
-+	Debug ("Key entry for \"%s\" %ld bytes\n", id, strlen(key));
- 	if (strlen (id) == displayID->length &&
- 	    !strncmp (id, (char *)displayID->data, displayID->length))
- 	{
---
-cgit v0.9.0.2-2-gbebe
-From 8eee942be0db913511b4c53f94829e1201dfdf00 Mon Sep 17 00:00:00 2001
-From: Michał Górny <mgorny@gentoo.org>
-Date: Wed, 28 Sep 2011 19:25:17 +0000
-Subject: Support systemd startup notification.
-
-If libsystemd-daemon support is enabled, xdm uses it to announce its
-startup as soon as the session is established. This gives the user
-opportunity to delay I/O-intensive operations until the X server is
-started so that they would not interfere with its loading while keeping
-the machine busy when user types in his/her login.
-
-Reviewed-by: Jamey Sharp <jamey@minilop.net>
-Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/Makefile.am b/Makefile.am
-index e5f9f5c..bb6b51c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -43,8 +43,13 @@ endif LINT
- if HAVE_SYSTEMD
- systemdsystemunit_DATA = xdm.service
- 
--xdm.service: xdm.service.in
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < $< > $@
-+xdm.service: xdm.service.in Makefile
-+if USE_SYSTEMD_DAEMON
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
-+else !USE_SYSTEMD_DAEMON
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
-+endif !USE_SYSTEMD_DAEMON
-+
- endif HAVE_SYSTEMD
- CLEANFILES = xdm.service
- EXTRA_DIST = xdm.service.in
-diff --git a/configure.ac b/configure.ac
-index a4222f1..fcb37f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,6 +146,7 @@ if test "x$USE_SELINUX" != "xno" ; then
- fi
- 
- # Check whether to install systemd unit files, as suggested in daemon(7).
-+# When a full path is specified, this does not require systemd installed.
- AC_ARG_WITH([systemdsystemunitdir], AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
- 	[Directory for systemd service files (default from the System and Service Manager)]),,
- 	[with_systemdsystemunitdir=auto])
-@@ -166,6 +167,21 @@ AS_IF([test "x$with_systemdsystemunitdir" != "xno"], [
- ])
- AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$with_systemdsystemunitdir" != "xno"])
- 
-+# Check whether to enable systemd startup notification.
-+# This requires libsystemd-daemon.
-+AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon],
-+	[Add support for systemd startup notification (default is autodetected)]),
-+	[USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto])
-+AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [
-+    PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon],
-+	[AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])],
-+	[AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"],
-+	    [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])]
-+	)]
-+    )
-+])
-+AM_CONDITIONAL(USE_SYSTEMD_DAEMON, [test "x$USE_SYSTEMD_DAEMON" != "xno"])
-+
- # FIXME: Find better test for which OS'es use su -m  - for now, just try to
- # mirror the Imakefile setting of:
- # if  defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
-diff --git a/xdm.service.in b/xdm.service.in
-index d15e072..e782dd9 100644
---- a/xdm.service.in
-+++ b/xdm.service.in
-@@ -4,6 +4,8 @@ After=systemd-user-sessions.service
- 
- [Service]
- ExecStart=BINDIR/xdm -nodaemon
-+Type=notify
-+NotifyAccess=all
- 
- [Install]
- Alias=graphical.target.wants/xdm.service
-diff --git a/xdm/Makefile.am b/xdm/Makefile.am
-index aa9765c..797b5c5 100644
---- a/xdm/Makefile.am
-+++ b/xdm/Makefile.am
-@@ -22,11 +22,11 @@
- bin_PROGRAMS = xdm
- 
- AM_CPPFLAGS = -I$(top_srcdir)/include
--AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS)
-+AM_CFLAGS = $(CWARNFLAGS) $(XDM_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
- 
- # The xdm binary needs to export symbols so that they can be used from
- # libXdmGreet.so loaded through a dlopen call from session.c
--AM_LDFLAGS = $(XDM_LIBS) -export-dynamic
-+AM_LDFLAGS = $(XDM_LIBS) $(SYSTEMD_DAEMON_LIBS) -export-dynamic
- 
- xdm_SOURCES =		\
-         access.c	\
-diff --git a/xdm/session.c b/xdm/session.c
-index 5fd47f0..573747d 100644
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -81,6 +81,10 @@ extern int key_setnet(struct key_netstarg *arg);
- #  define RTLD_NOW 1
- # endif
- 
-+#ifdef USE_SYSTEMD_DAEMON
-+#include <systemd/sd-daemon.h>
-+#endif
-+
- #ifdef USE_SELINUX
- /* This should be run just before we exec the user session. */
- static int
-@@ -349,6 +353,12 @@ ManageSession (struct display *d)
- 	exit(UNMANAGE_DISPLAY);
- 	}
- 
-+#ifdef USE_SYSTEMD_DAEMON
-+	/* Subsequent notifications will be ignored by systemd
-+	 * and calling this function will clean up the env */
-+	sd_notify(1, "READY=1");
-+#endif
-+
-     /* tell the possibly dynamically loaded greeter function
-      * what data structure formats to expect.
-      * These version numbers are registered with The Open Group. */
---
-cgit v0.9.0.2-2-gbebe
-From 284532c0884893728b75ca37f5d2a9a33f7bc8db Mon Sep 17 00:00:00 2001
-From: Julien Cristau <jcristau@debian.org>
-Date: Sat, 22 Oct 2011 15:14:46 +0000
-Subject: greeter: link against -lXrender if xft is enabled
-
-XmuCvtStringToXftColor uses XRenderParseColor, so require xrender for
-the xft option, and link against it.
-
-Signed-off-by: Julien Cristau <jcristau@debian.org>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/configure.ac b/configure.ac
-index fcb37f8..d20ae28 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -345,10 +345,10 @@ AC_ARG_WITH(xft,
- 	AS_HELP_STRING([--with-xft],
- 			[Use Xft to draw text (default is YES if installed)]),
- 	[USE_XFT="$withval"],
--	PKG_CHECK_EXISTS(xft, [USE_XFT="yes"], [USE_XFT="no"]))
-+	PKG_CHECK_EXISTS(xft xrender, [USE_XFT="yes"], [USE_XFT="no"]))
- 
- if test "x$USE_XFT" = "xyes" ; then
--	PKG_CHECK_MODULES(XFT, xft)
-+	PKG_CHECK_MODULES(XFT, xft xrender)
- 	GREETER_CFLAGS="$GREETER_CFLAGS $XFT_CFLAGS"
- 	GREETER_LIBS="$GREETER_LIBS $XFT_LIBS"
- 	AC_DEFINE([USE_XFT], 1,
-diff --git a/greeter/Login.c b/greeter/Login.c
-index 99a3932..d899376 100644
---- a/greeter/Login.c
-+++ b/greeter/Login.c
-@@ -86,6 +86,10 @@ from The Open Group.
- # include <X11/extensions/Xinerama.h>
- #endif
- 
-+#ifdef USE_XFT
-+# include <X11/extensions/Xrender.h>
-+#endif
-+
- #ifndef DEBUG
- # define XDM_ASSERT(a)	/* do nothing */
- #else
---
-cgit v0.9.0.2-2-gbebe
-From a02edebf21aae37f8564d7b9fad01d5d2942ad8d Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Mon, 07 Nov 2011 16:01:44 +0000
-Subject: Fix build outside of source dir. Fixes distcheck too.
-
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
-Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/Makefile.am b/Makefile.am
-index bb6b51c..e9da40f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -45,9 +45,9 @@ systemdsystemunit_DATA = xdm.service
- 
- xdm.service: xdm.service.in Makefile
- if USE_SYSTEMD_DAEMON
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < xdm.service.in > $@
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' < ${srcdir}/xdm.service.in > $@
- else !USE_SYSTEMD_DAEMON
--	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < xdm.service.in > $@
-+	$(AM_V_GEN)$(SED) -e 's|BINDIR|$(bindir)|g' -e '/[Nn]otify/d' < ${srcdir}/xdm.service.in > $@
- endif !USE_SYSTEMD_DAEMON
- 
- endif HAVE_SYSTEMD
---
-cgit v0.9.0.2-2-gbebe
-From ad7a54288f62c0266540279dac775ebee68f092e Mon Sep 17 00:00:00 2001
-From: Matthieu Herrb <matthieu.herrb@laas.fr>
-Date: Thu, 15 Dec 2011 21:14:23 +0000
-Subject: replace <varargs.h> by <stdarg.h>. Spotted my Marco Peereboom with clang.
-
-Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
-Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
----
-diff --git a/greeter/verify.c b/greeter/verify.c
-index 5d2ad17..1221874 100644
---- a/greeter/verify.c
-+++ b/greeter/verify.c
-@@ -48,7 +48,7 @@ from The Open Group.
- # include	<errno.h>
- #elif defined(USE_BSDAUTH)
- # include	<login_cap.h>
--# include	<varargs.h>
-+# include	<stdarg.h>
- # include	<bsd_auth.h>
- #elif defined(USESECUREWARE)
- # include       <sys/types.h>
---
-cgit v0.9.0.2-2-gbebe
-From 78403f6a7420798bf24798811c8c6b936c9ccb34 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Sat, 07 Jan 2012 03:34:30 +0000
-Subject: Add some missing malloc failure checks
-
-Flagged by Solaris Studio 12.3 code analyzer
-
-Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
----
-diff --git a/xdm/access.c b/xdm/access.c
-index 7035375..b16a066 100644
---- a/xdm/access.c
-+++ b/xdm/access.c
-@@ -304,6 +304,11 @@ tryagain:
-     if (!hostOrAlias)
- 	return NULL;
-     h = malloc (sizeof (DisplayEntry));
-+    if (!h)
-+    {
-+	LogOutOfMem ("ReadHostEntry: DisplayEntry\n");
-+	return NULL;
-+    }
-     h->hopCount = 1;
-     if (*hostOrAlias == ALIAS_CHARACTER)
-     {
-@@ -423,6 +428,11 @@ tryagain:
-     if (!displayOrAlias)
- 	return NULL;
-     d = malloc (sizeof (DisplayEntry));
-+    if (!d)
-+    {
-+	LogOutOfMem ("ReadDisplayEntry: DisplayEntry\n");
-+	return NULL;
-+    }
-     d->notAllowed = 0;
-     d->notBroadcast = 0;
-     d->chooser = 0;
-diff --git a/xdm/choose.c b/xdm/choose.c
-index 6f077eb..e5e003d 100644
---- a/xdm/choose.c
-+++ b/xdm/choose.c
-@@ -128,6 +128,11 @@ RememberIndirectClient (
- 	    connectionType == i->connectionType)
- 	    return 1;
-     i = malloc (sizeof (IndirectUsersRec));
-+    if (!i)
-+    {
-+	LogOutOfMem ("RememberIndirectClient\n");
-+	return 0;
-+    }
-     if (!XdmcpCopyARRAY8 (clientAddress, &i->client))
-     {
- 	free (i);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch b/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
deleted file mode 100644
index 195858883..000000000
--- a/testing/xorg-xdm/xdm-1.0.5-sessreg-utmp-fix-bug177890.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- config/GiveConsole.sessreg-utmp-fix-bug177890	2006-07-24 04:20:10.000000000 -0400
-+++ config/GiveConsole	2006-07-24 04:21:16.000000000 -0400
-@@ -8,3 +8,5 @@
- # causing serious grief.
- #
- chown $USER /dev/console
-+exec /usr/bin/sessreg  -a -w "/var/log/wtmp" -u "/run/utmp" \
-+        -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER
diff --git a/testing/xorg-xdm/xdm-consolekit.patch b/testing/xorg-xdm/xdm-consolekit.patch
deleted file mode 100644
index c52a26138..000000000
--- a/testing/xorg-xdm/xdm-consolekit.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -362,6 +362,20 @@
- 
- AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
- 
-+# ConsoleKit support
-+AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
-+	[USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
-+if test x"$USE_CONSOLEKIT" != xno; then
-+	PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
-+		[USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
-+	if test x"$USE_CONSOLEKIT" = xyes; then
-+		AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
-+		XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
-+		XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
-+	fi
-+fi
-+dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
-+
- #
- #  XDM
- #
---- a/xdm/session.c
-+++ b/xdm/session.c
-@@ -66,6 +66,11 @@
- #endif
- #endif /* USE_PAM */
- 
-+#ifdef USE_CONSOLEKIT
-+#include <ck-connector.h>
-+#include <dbus/dbus.h>
-+#endif
-+
- #ifdef __SCO__
- #include <prot.h>
- #endif
-@@ -472,6 +477,97 @@
-     }
- }
- 
-+#ifdef USE_CONSOLEKIT
-+
-+static CkConnector *connector;
-+
-+static int openCKSession(struct verify_info *verify, struct display *d)
-+{
-+    int ret;
-+    DBusError error;
-+    char  *remote_host_name = "";
-+    dbus_bool_t is_local;
-+    char *display_name = "";
-+    char *display_device = "";
-+    char devtmp[16];
-+
-+    if (!use_consolekit)
-+	return 1;
-+
-+    is_local = d->displayType.location == Local;
-+    if (d->peerlen > 0 && d->peer)
-+	remote_host_name = d->peer;
-+    if (d->name)
-+	display_name = d->name;
-+    /* how can we get the corresponding tty at best...? */
-+    if (d->windowPath) {
-+	display_device = strchr(d->windowPath, ':');
-+	if (display_device && display_device[1])
-+	    display_device++;
-+	else
-+	    display_device = d->windowPath;
-+	snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
-+	display_device = devtmp;
-+    }
-+
-+    connector = ck_connector_new();
-+    if (!connector) {
-+	LogOutOfMem("ck_connector");
-+	return 0;
-+    }
-+
-+    dbus_error_init(&error);
-+    ret = ck_connector_open_session_with_parameters(
-+		connector, &error,
-+		"unix-user", &verify->uid,
-+		"x11-display", &display_name,
-+		"x11-display-device", &display_device,
-+		"remote-host-name", &remote_host_name,
-+		"is-local", &is_local,
-+		NULL);
-+    if (!ret) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+	ck_connector_unref(connector);
-+	connector = NULL;
-+	return 1;
-+    }
-+
-+    verify->userEnviron = setEnv(verify->userEnviron,
-+		"XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
-+    return 1;
-+}
-+
-+static void closeCKSession(void)
-+{
-+    DBusError error;
-+
-+    if (!connector)
-+	return;
-+
-+    dbus_error_init(&error);
-+    if (!ck_connector_close_session(connector, &error)) {
-+	if (dbus_error_is_set(&error)) {
-+	    LogError("Dbus error: %s\n", error.message);
-+	    dbus_error_free(&error);
-+	} else {
-+	    LogError("ConsoleKit close error\n");
-+	}
-+	LogError("console-kit-daemon not running?\n");
-+    }
-+    ck_connector_unref(connector);
-+    connector = NULL;
-+}
-+#else
-+#define openCKSession(v,d)	1
-+#define closeCKSession()
-+#endif
-+
- void
- SessionExit (struct display *d, int status, int removeAuth)
- {
-@@ -486,6 +580,8 @@
-     }
- #endif
- 
-+    closeCKSession();
-+
-     /* make sure the server gets reset after the session is over */
-     if (d->serverPid >= 2 && d->resetSignal)
- 	kill (d->serverPid, d->resetSignal);
-@@ -568,6 +664,10 @@
- #ifdef USE_PAM
-     if (pamh) pam_open_session(pamh, 0);
- #endif
-+
-+    if (!openCKSession(verify, d))
-+	return 0;
-+
-     switch (pid = fork ()) {
-     case 0:
- 	CleanUpChild ();
---- a/include/dm.h
-+++ b/include/dm.h
-@@ -325,6 +325,9 @@
- extern char	*prngdSocket;
- extern int	prngdPort;
- # endif
-+#ifdef USE_CONSOLEKIT
-+extern int	use_consolekit;
-+#endif
- 
- extern char	*greeterLib;
- extern char	*willing;
---- a/xdm/resource.c
-+++ b/xdm/resource.c
-@@ -68,6 +68,9 @@
- char	*prngdSocket;
- int	prngdPort;
- #endif
-+#ifdef USE_CONSOLEKIT
-+int	use_consolekit;
-+#endif
- 
- char	*greeterLib;
- char	*willing;
-@@ -258,6 +261,10 @@
- 				"false"} ,
- { "willing",	"Willing",	DM_STRING,	&willing,
- 				""} ,
-+#ifdef USE_CONSOLEKIT
-+{ "consoleKit",	"ConsoleKit",	DM_BOOL,	(char **) &use_consolekit,
-+				"true"} ,
-+#endif
- };
- 
- # define NUM_DM_RESOURCES	(sizeof DmResources / sizeof DmResources[0])
-@@ -440,7 +447,11 @@
- {"-debug",	"*debugLevel",		XrmoptionSepArg,	(caddr_t) NULL },
- {"-xrm",	NULL,			XrmoptionResArg,	(caddr_t) NULL },
- {"-daemon",	".daemonMode",		XrmoptionNoArg,		"true"         },
--{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        }
-+{"-nodaemon",	".daemonMode",		XrmoptionNoArg,		"false"        },
-+#ifdef USE_CONSOLEKIT
-+{"-consolekit",	".consoleKit",		XrmoptionNoArg,		"true"  },
-+{"-noconsolekit", ".consoleKit",	XrmoptionNoArg,		"false" }
-+#endif
- };
- 
- static int	originalArgc;
---- a/man/xdm.man
-+++ b/man/xdm.man
-@@ -51,6 +51,8 @@
- ] [
- .B \-session
- .I session_program
-+] [
-+.B \-noconsolekit
- ]
- .SH DESCRIPTION
- .I Xdm
-@@ -218,6 +220,10 @@
- .IP "\fB\-xrm\fP \fIresource_specification\fP"
- Allows an arbitrary resource to be specified, as in most
- X Toolkit applications.
-+.IP "\fB\-noconsolekit\fP"
-+Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
-+resource.
-+This suppresses the session management using ConsoleKit.
- .SH RESOURCES
- At many stages the actions of
- .I xdm
diff --git a/testing/xorg-xdm/xdm.pam b/testing/xorg-xdm/xdm.pam
deleted file mode 100644
index a0b601db6..000000000
--- a/testing/xorg-xdm/xdm.pam
+++ /dev/null
@@ -1,10 +0,0 @@
-#%PAM-1.0
-auth		required	pam_unix.so
-auth		required	pam_nologin.so
-auth		required	pam_env.so
-account		required	pam_unix.so
-password	required	pam_unix.so
-session		required	pam_unix.so
-session		required	pam_limits.so
-session		required	pam_loginuid.so
--session	optional	pam_systemd.so
diff --git a/testing/xournal/PKGBUILD b/testing/xournal/PKGBUILD
deleted file mode 100644
index 4ef0d66a8..000000000
--- a/testing/xournal/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 162297 2012-06-24 19:25:38Z foutrelis $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=xournal
-pkgver=0.4.6
-pkgrel=2
-pkgdesc='Notetaking and sketching application'
-url='http://xournal.sourceforge.net/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme')
-optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('4ebe79e3df7155d2a09c341537a639ac2332d4c8')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr LIBS='-lm -lz'
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install desktop-install
-}
diff --git a/testing/xournal/install b/testing/xournal/install
deleted file mode 100644
index dfcb68374..000000000
--- a/testing/xournal/install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	update-desktop-database -q
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-mime-database usr/share/mime &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/testing/xsp/PKGBUILD b/testing/xsp/PKGBUILD
deleted file mode 100644
index 855cb2480..000000000
--- a/testing/xsp/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 168255 2012-10-06 23:51:34Z tomegun $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-
-pkgname=xsp
-pkgver=2.10.2
-pkgrel=4
-pkgdesc="A simple webserver based on mono - provides ASP.NET support"
-arch=(i686 x86_64)
-license=('custom')
-url="http://www.go-mono.com"
-depends=('mono>=2.10.2' 'sqlite')
-options=(!makeflags)
-install=${pkgname}.install
-source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2
-        ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service)
-
-build() {
- # get rid of that .wapi errors; thanks to brice
-  export MONO_SHARED_DIR=${srcdir}/src/weird
-  mkdir -p "${MONO_SHARED_DIR}"
- # import pathes
- # build
-  cd ${srcdir}/${pkgname}-${pkgver}
-  #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make || return 1
- # tweak the xsp shellscript to grab system dll's
-  for script in scripts/*2; do
-    sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script
-  done
-   #destdir related bugfixes
-  sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
-  sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile
-}
-
-package(){
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir}/ install
- # move test files from share to arch' default html home
-  mkdir -p ${pkgdir}/srv/http/html
-  mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp
-  rm -rf ${pkgdir}/usr/share
-  chown -R http:http ${pkgdir}/srv/http/html/${pkgname}
-
- # install a deamon
-  install -D -m755 ${srcdir}/${pkgname}.rc.d \
-    ${pkgdir}/etc/rc.d/${pkgname}
- # install a deamon configurationfile
-  install -D -m644 ${srcdir}/$pkgname.conf.d \
-    ${pkgdir}/etc/conf.d/${pkgname}
- # install a xsp configuration home
-  install -D -m644 ${srcdir}/${pkgname}.webapp \
-    ${pkgdir}/etc/${pkgname}/${pkgname}.webapp
-  install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
- # install systemd service file
-  install -D -m644 ${srcdir}/${pkgname}.service \
-    ${pkgdir}/usr/lib/systemd/system/xsp.service
-}
-md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6'
-         '9575bd7d6f64d51ba05bdd6370665858'
-         '35d921df0fefc30f47a438c95d420efc'
-         'c917c07f68b945691506c29750db482f'
-         '9d83bd36d209f8d36a11dfbc4fa50819')
diff --git a/testing/xsp/xsp.conf.d b/testing/xsp/xsp.conf.d
deleted file mode 100644
index 99d634929..000000000
--- a/testing/xsp/xsp.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-# xsp options
-
-
-# note that is just the helping app for mod_mono if you like production like
-# quality
-# xsp is for ASP testing mainly  -- read the manpage for xsp to know what
-# options are available. Archlinux will provide xsp configured by a .webapp
-# configuration file which rests in /etc/xsp
-
-XSP_PARAMS="--appconfigdir /etc/xsp"
diff --git a/testing/xsp/xsp.install b/testing/xsp/xsp.install
deleted file mode 100644
index b8a8f3136..000000000
--- a/testing/xsp/xsp.install
+++ /dev/null
@@ -1,37 +0,0 @@
-# arg 1:  the new package version
-post_install() {
-  cat << EOM
-
--->  xsp is just the helping app for mod_mono if you like a production like
--->  server. xsp itself is for ASP testing mainly  -- read the manpage for xsp
--->  to know which options are available.
--->  Archlinux will provide xsp configured by a .webapp configuration file
--->  which rests in /etc/xsp. Just put your other webapp files there to let
--->  xsp pick them up.
--->  xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all
--->  your arguments there. Don't forget that you can run xsp from the console
--->  as oridinary user, which is safer and for testing absolutely sufficient!!
-
--->  You can run the testpages simply by starting the server and calling 
-                       http://localhost:8080
--->  from your browser's location bar
-
-
-EOM
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install $1
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
diff --git a/testing/xsp/xsp.rc.d b/testing/xsp/xsp.rc.d
deleted file mode 100644
index b4fcda15c..000000000
--- a/testing/xsp/xsp.rc.d
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp
-
-PID=`pidof -o %PPID /usr/bin/mono`
-case "$1" in
-  start)
-    stat_busy "Starting Xsp Daemon"
-    if [ -z "$PID" ]; then 
-       /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null &
-    fi
-    if [ ! -z "$PID" -o $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon xsp
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Xsp Daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon xsp
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/xsp/xsp.service b/testing/xsp/xsp.service
deleted file mode 100644
index 36b802e21..000000000
--- a/testing/xsp/xsp.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=XSP Web Server
-
-[Service]
-ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/xsp/xsp.webapp b/testing/xsp/xsp.webapp
deleted file mode 100644
index a685dd171..000000000
--- a/testing/xsp/xsp.webapp
+++ /dev/null
@@ -1,8 +0,0 @@
-<apps>
-  <web-application>
-    <name>Root</name>
-      <vpath>/</vpath>
-      <path>/srv/http/html/xsp</path>
-      <vhost>localhost</vhost>
-  </web-application>
-</apps>
diff --git a/testing/xz/PKGBUILD b/testing/xz/PKGBUILD
deleted file mode 100644
index 3d2f9f76f..000000000
--- a/testing/xz/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 162176 2012-06-22 16:39:50Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: François Charette <firmicus@gmx.net>
-
-pkgname=xz
-pkgver=5.0.4
-pkgrel=1
-pkgdesc='Library and command line tools for XZ and LZMA compressed files'
-arch=('i686' 'x86_64')
-url='http://tukaani.org/xz/'
-license=('GPL' 'LGPL' 'custom')
-depends=('sh')
-options=('!libtool')
-source=("http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        "http://tukaani.org/${pkgname}/${pkgname}-${pkgver}.tar.gz.sig")
-md5sums=('df3df690aef18384e1e031be7ec3a964'
-         '6e203465ee9b8f646d85cf84755e2b32')
-
-build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	./configure --prefix=/usr \
-		--disable-rpath \
-		--enable-werror
-	make
-}
-
-check() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make check
-}
-
-package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-	make DESTDIR=${pkgdir} install
-	install -d -m755 ${pkgdir}/usr/share/licenses/xz/
-	ln -sf /usr/share/doc/xz/COPYING ${pkgdir}/usr/share/licenses/xz/
-	ln -sf /usr/share/licenses/common/GPL2/license.txt ${pkgdir}/usr/share/doc/xz/COPYING.GPLv2
-}
diff --git a/testing/yelp/PKGBUILD b/testing/yelp/PKGBUILD
deleted file mode 100644
index 5beeefb34..000000000
--- a/testing/yelp/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 169534 2012-10-23 10:29:09Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=yelp
-pkgver=3.6.1
-pkgrel=1
-pkgdesc="A help browser for GNOME"
-arch=('i686' 'x86_64')
-depends=('webkitgtk3' 'yelp-xsl' 'libxslt' 'hicolor-icon-theme' 'xz' 'bzip2'
-         'desktop-file-utils' 'dconf')
-makedepends=('intltool' 'gtk-doc' 'itstool')
-groups=('gnome')
-license=('GPL')
-options=('!emptydirs' '!libtool')
-url="http://www.gnome.org"
-install=yelp.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('55a0bd94405c2d2b6230d1be9f88fe978930f6228e4f1cc2f58f923421243404')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/testing/yelp/yelp.install b/testing/yelp/yelp.install
deleted file mode 100644
index 2a1cb91e9..000000000
--- a/testing/yelp/yelp.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas /usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/testing/yp-tools/PKGBUILD b/testing/yp-tools/PKGBUILD
deleted file mode 100644
index 0e9a14891..000000000
--- a/testing/yp-tools/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 165811 2012-08-30 19:22:40Z tomegun $
-# Mantainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=yp-tools
-pkgver=2.12
-pkgrel=4
-pkgdesc='Linux NIS Tools'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/yp-tools/'
-license=('GPL2')
-depends=('ypbind-mt')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'domainname.service')
-
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service"
-}
-md5sums=('ce1e06d86caa285fa8cd76fdf103f51e'
-         '8d354b76eb0df9a3b06637bfff87453b')
diff --git a/testing/yp-tools/domainname.service b/testing/yp-tools/domainname.service
deleted file mode 100644
index 035f767c8..000000000
--- a/testing/yp-tools/domainname.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=NIS Domainname
-
-[Service]
-Type=oneshot
-EnvironmentFile=/etc/conf.d/nisdomainname
-ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME
-RemainAfterExit=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ypbind-mt/PKGBUILD b/testing/ypbind-mt/PKGBUILD
deleted file mode 100644
index 99213a1d9..000000000
--- a/testing/ypbind-mt/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 161942 2012-06-16 17:17:28Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=5
-pkgdesc='Linux NIS daemon'
-url='http://www.linux-nis.org/nis/ypbind-mt/'
-license=('GPL2')
-arch=('i686' 'x86_64')
-makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'nisdomainname.conf'
-        'ypbind.conf'
-        'ypbind'
-	'ypbind.service')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	./configure \
-		--prefix=/usr \
-		--enable-dbus-nm \
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
-	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
-	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
-	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
-	install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service
-	install -d -m755 "${pkgdir}"/var/yp/binding
-}
-md5sums=('692f68ed0476762be4228ce543a5b791'
-         'e83a85291ea2ee152a78f2c16b0b1185'
-         '229309a989abad27703ac2e6d07dc7ae'
-         '1f7a4c80414d580c9afb3a08267beed0'
-         '88a721095e334cd442f4649a151ba9be')
diff --git a/testing/ypbind-mt/nisdomainname.conf b/testing/ypbind-mt/nisdomainname.conf
deleted file mode 100644
index bbbbf8fc7..000000000
--- a/testing/ypbind-mt/nisdomainname.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# NIS domain to be set in /etc/rc.d/ypbind
-#
-NISDOMAINNAME=""
diff --git a/testing/ypbind-mt/ypbind b/testing/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/testing/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
-	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac
diff --git a/testing/ypbind-mt/ypbind.conf b/testing/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/testing/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""
diff --git a/testing/ypbind-mt/ypbind.service b/testing/ypbind-mt/ypbind.service
deleted file mode 100644
index c59231000..000000000
--- a/testing/ypbind-mt/ypbind.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=YP Bind
-Requires=rpcbind.service domainname.service
-After=rpcbind.service domainname.service network.target
-Before=systemd-user-sessions.service
-
-[Service]
-Type=forking
-PIDFile=/run/ypbind.pid
-ExecStart=/usr/sbin/ypbind
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ypserv/PKGBUILD b/testing/ypserv/PKGBUILD
deleted file mode 100644
index 25fc92df0..000000000
--- a/testing/ypserv/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 167986 2012-10-04 17:42:55Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ypserv
-pkgver=2.28
-pkgrel=2
-pkgdesc='Linux NIS Server'
-arch=('i686' 'x86_64')
-url='http://www.linux-nis.org/nis/ypserv/'
-license=('GPL2')
-depends=('gdbm' 'openslp' 'inetutils' 'yp-tools')
-optdepends=('gawk: for printcap support')
-backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
-source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'confpost.patch'
-        'ypxfrd.service'
-        'yppasswdd.service'
-	'ypserv.service'
-        'yppasswd'
-        'ypserv')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../confpost.patch
-	./configure --prefix=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-
-	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
-	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
-	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
-	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
-	install -D -m644 ../ypxfrd.service "${pkgdir}"/usr/lib/systemd/system/ypxfrd.service
-	install -D -m644 ../ypserv.service "${pkgdir}"/usr/lib/systemd/system/ypserv.service
-	install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service
-
-	# Provide native service for arch-daemons generator
-	ln -s yppasswdd.service "$pkgdir/usr/lib/systemd/system/yppasswd.service"
-}
-md5sums=('ed64f489bab494218fc5c5942b95d5b6'
-         '8acb314f30d6e531ac9efa8655f68ccb'
-         'c80e253756446d59a90c4c21b1cb8740'
-         '7cba3dd3544436c3c1f05e36c0018e92'
-         '3398271c3e0a054e64b06b99aa2dc63d'
-         '4bc84c48ed1bb9659698853acb5cfd76'
-         'c40befe5932f1b42efaced6b46809303')
diff --git a/testing/ypserv/confpost.patch b/testing/ypserv/confpost.patch
deleted file mode 100644
index 489e4368a..000000000
--- a/testing/ypserv/confpost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
---- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
-+++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
-@@ -0,0 +1,10 @@
-+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
-+ * libraries gdbm and qdbm have same symbol names. */
-+#undef HAVE_COMPAT_LIBGDBM
-+#ifdef HAVE_LIBGDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+#ifdef HAVE_LIBQDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+
diff --git a/testing/ypserv/yppasswd b/testing/ypserv/yppasswd
deleted file mode 100755
index c2b00b2ca..000000000
--- a/testing/ypserv/yppasswd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Password Daemon"
-    /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Password Daemon"
-    killall -q /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/ypserv/yppasswdd.service b/testing/ypserv/yppasswdd.service
deleted file mode 100644
index 9a7068b6c..000000000
--- a/testing/ypserv/yppasswdd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NIS/YP (Network Information Service) Users Passwords Change Server
-Requires=rpcbind.service
-After=network.target rpcbind.service
-
-[Service]
-Type=forking
-PIDFile=/run/yppasswdd.pid
-ExecStart=/usr/sbin/rpc.yppasswdd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ypserv/ypserv b/testing/ypserv/ypserv
deleted file mode 100755
index c36e6901b..000000000
--- a/testing/ypserv/ypserv
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Server"
-    /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ypserv
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Server"
-    killall -q /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ypserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/testing/ypserv/ypserv.service b/testing/ypserv/ypserv.service
deleted file mode 100644
index 024a92e5a..000000000
--- a/testing/ypserv/ypserv.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NIS/YP (Network Information Service) Server
-Requires=rpcbind.service
-After=network.target rpcbind.service 
-
-[Service]
-Type=forking
-PIDFile=/run/ypserv.pid
-ExecStart=/usr/sbin/ypserv
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/ypserv/ypxfrd.service b/testing/ypserv/ypxfrd.service
deleted file mode 100644
index 322ef559f..000000000
--- a/testing/ypserv/ypxfrd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=NIS/YP (Network Information Service) Maps Transferring Accelerator
-Requires=rpcbind.service
-After=network.target rpcbind.service
-
-[Service]
-Type=forking
-PIDFile=/run/ypxfrd.pid
-ExecStart=/usr/sbin/rpc.ypxfrd
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/zenity/PKGBUILD b/testing/zenity/PKGBUILD
deleted file mode 100644
index d5dd093fe..000000000
--- a/testing/zenity/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 169139 2012-10-18 19:22:03Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=zenity
-pkgver=3.6.0
-pkgrel=1
-pkgdesc="Display graphical dialog boxes from shell scripts"
-arch=(i686 x86_64)
-license=('LGPL')
-depends=('gtk3' 'libnotify')
-makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl')
-url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/zsh/PKGBUILD b/testing/zsh/PKGBUILD
deleted file mode 100644
index ae4a6f30d..000000000
--- a/testing/zsh/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-# $Id: PKGBUILD 163903 2012-07-21 22:24:24Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=zsh
-pkgver=5.0.0
-pkgrel=1
-pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
-arch=('i686' 'x86_64')
-url='http://www.zsh.org/'
-license=('custom')
-depends=('pcre' 'libcap' 'gdbm')
-install=zsh.install
-source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
-        'zprofile')
-backup=('etc/zsh/zprofile')
-md5sums=('e8484468925cec8d9a84b8b04797e764'
-         '24a9335edf77252a7b5f52e079f7aef7')
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	# FS#16360
-	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
-				 Doc/zsh.texi \
-				 Completion/Unix/Type/_services \
-				 Completion/Unix/Command/_init_d
-
-	# Remove unneeded and conflicting completion scripts
-	rm -rf Completion/{AIX,BSD,Cygwin,Darwin,Debian,Mandriva,openSUSE,Redhat,Solaris}
-	rm -f  Completion/Linux/Command/_{pkgtool,rpmbuild,yast}
-	rm -f  Completion/Unix/Command/_osc
-
-	./configure --prefix=/usr \
-		--bindir=/bin \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zlogin=/etc/zsh/zlogin \
-		--enable-zlogout=/etc/zsh/zlogout \
-		--enable-zprofile=/etc/zsh/zprofile \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-maildir-support \
-		--with-term-lib='ncursesw' \
-		--enable-multibyte \
-		--enable-function-subdirs \
-		--enable-fndir=/usr/share/zsh/functions \
-		--enable-scriptdir=/usr/share/zsh/scripts \
-		--with-tcsetpgrp \
-		--enable-pcre \
-		--enable-cap \
-		--enable-zsh-secure-free
-	make
-}
-
-check() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	HOME="${srcdir}" make check
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
-	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
-	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/zsh/zprofile b/testing/zsh/zprofile
deleted file mode 100644
index 6bfcdf7cb..000000000
--- a/testing/zsh/zprofile
+++ /dev/null
@@ -1 +0,0 @@
-emulate sh -c 'source /etc/profile'
diff --git a/testing/zsh/zsh.install b/testing/zsh/zsh.install
deleted file mode 100644
index e2a53bea8..000000000
--- a/testing/zsh/zsh.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
-}
-
-post_upgrade() {
-	post_install
-}
-
-pre_remove() {
-	sed -i '/^\/bin\/zsh/d' etc/shells
-}
diff --git a/~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/~xihh/blast/PKGBUILD b/~xihh/blast/PKGBUILD
new file mode 100644
index 000000000..70ab81dcc
--- /dev/null
+++ b/~xihh/blast/PKGBUILD
@@ -0,0 +1,31 @@
+# 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/contrafold/PKGBUILD b/~xihh/contrafold/PKGBUILD
new file mode 100644
index 000000000..4cf9c1085
--- /dev/null
+++ b/~xihh/contrafold/PKGBUILD
@@ -0,0 +1,23 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Joshua Ismael Haase Hernandez <joshpar@stravy>
+pkgname=contrafold
+pkgver=2_02
+pkgrel=1
+epoch=
+pkgdesc="An RNA secondary structure folder."
+arch=('i686' 'x86_64')
+url="http://contra.stanford.edu/contrafold/"
+license=('Custom:BSD3')
+source=(http://contra.stanford.edu/contrafold/contrafold_v${pkgver}.tar.gz)
+md5sums=('cea66c63df835fe7f790c7f49ce83ef3')
+
+build() {
+  cd "$srcdir/$pkgname/src"
+  # ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname/src"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/~xihh/django-ajax-selects/PKGBUILD b/~xihh/django-ajax-selects/PKGBUILD
new file mode 100644
index 000000000..e0255e745
--- /dev/null
+++ b/~xihh/django-ajax-selects/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Joshua Ismael Haase Hernandez <joshpar@none>
+pkgname=django-ajax-selects
+pkgver=20120215
+pkgrel=1
+epoch=
+pkgdesc=""
+arch=('i686' 'x86_64' 'mips64el')
+url="https://github.com/crucialfelix/django-ajax-selects"
+license=('GPL')
+groups=()
+depends=('python2')
+makedepends=('git')
+checkdepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=(!emptydirs)
+install=
+changelog=
+source=()
+md5sums=()
+noextract=()
+#generate with 'makepkg -g'
+
+_gitroot=git://github.com/crucialfelix/django-ajax-selects.git
+_gitname=django-ajax-selects
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [[ -d "$_gitname" ]]; then
+    cd "$_gitname" && git pull origin
+    msg "The local files are updated."
+  else
+    git clone "$_gitroot" "$_gitname"
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$_gitname-build"
+  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+  cd "$srcdir/$_gitname-build"
+}
+
+package() {
+  cd "$srcdir/$_gitname-build"
+  python setup.py install --root="$pkgdir/" --optimize=1
+}
diff --git a/~xihh/gmime24/PKGBUILD b/~xihh/gmime24/PKGBUILD
new file mode 100644
index 000000000..d50f71c4d
--- /dev/null
+++ b/~xihh/gmime24/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 150770 2012-02-21 20:45:23Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Ben <ben@benmazer.net>
+
+_pkgbase=gmime
+pkgname=gmime24
+pkgver=2.4.32
+pkgrel=1
+pkgdesc="Core mime parsing library"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://spruce.sourceforge.net/gmime/"
+depends=('glib2' 'gpgme' 'zlib')
+makedepends=('gtk-sharp-2' 'pkgconfig')
+[ "$CARCH" = "mips64el" ] && unset makedepends
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbase/${pkgver%.*}/$_pkgbase-$pkgver.tar.xz)
+sha256sums=('a0e8f3a1949e7281e92edc5dd6309a7ca34b6838c6acf7b7f1563a41b5ddd74b')
+
+build() {
+  # get rid of that .wapi errors in fakeroot
+  export MONO_SHARED_DIR="$srcdir/weird"
+  mkdir -p "$MONO_SHARED_DIR"
+
+  cd "$srcdir/$_pkgbase-$pkgver"
+
+  ./configure --prefix=/usr --enable-smime \
+      --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
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/lyx-clasicthesis/PKGBUILD b/~xihh/lyx-clasicthesis/PKGBUILD
new file mode 100644
index 000000000..8e63e2025
--- /dev/null
+++ b/~xihh/lyx-clasicthesis/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Joshua Ismael Haase Hernandez <joshpar@stravy>
+pkgname=lyx-clasicthesis
+pkgver=3.1-beta1
+pkgrel=1
+pkgdesc="A Classic Thesis Style for LaTeX and LyX"
+arch=('any')
+url="https://code.google.com/p/classicthesis/"
+license=('GPL')
+groups=()
+depends=('lyx')
+source=(https://code.google.com/p/classicthesis/downloads/detail?name=ClassicThesis-LyX-v${pkgver}.zip)
+md5sums=('a437079a70466adadf8f7034e02ebd85')
+noextract=()
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/~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/notmuch-address/PKGBUILD b/~xihh/notmuch-address/PKGBUILD
new file mode 100644
index 000000000..908f40b22
--- /dev/null
+++ b/~xihh/notmuch-address/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Joshua Ismael Haase Hernandez <joshpar@stravy>
+pkgname=notmuch-address
+pkgver=20120201
+pkgrel=1
+epoch=
+pkgdesc="Address completion for notmuch"
+arch=('any')
+url=""
+license=('GPL')
+groups=()
+depends=(python2)
+makedepends=(git)
+checkdepends=()
+optdepends=()
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=()
+install=
+changelog=
+source=()
+md5sums=()
+noextract=()
+#generate with 'makepkg -g'
+_gitroot=http://commonmeasure.org/~jkr/git/notmuch_addresses.git
+_gitname=notmuch-adress
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [[ -d "$_gitname" ]]; then
+    cd "$_gitname" && git pull origin
+    msg "The local files are updated."
+  else
+    git clone "$_gitroot" "$_gitname"
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$_gitname-build"
+  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+  cd "$srcdir/$_gitname-build"
+
+  #
+  # BUILD HERE
+  #
+}
+
+package() {
+  cd "$srcdir/$_gitname-build"
+  sed -i "s_#!/usr/bin/env python_#!/usr/bin/env python2_" notmuch_addresses.py
+  install -d $pkgdir/usr/bin
+  install -m755 notmuch_addresses.py $pkgdir/usr/bin/notmuch_addresses.py
+}
\ No newline at end of file
diff --git a/~xihh/python2-argh/PKGBUILD b/~xihh/python2-argh/PKGBUILD
new file mode 100644
index 000000000..7805d47be
--- /dev/null
+++ b/~xihh/python2-argh/PKGBUILD
@@ -0,0 +1,23 @@
+# Maintainer: Andrey Mikhaylenko <neithere at gmail dot com>
+# Contributor: Fabien Devaux <fdev31 at gmail dot com>
+pkgname=python2-argh
+pkgver=0.15.1
+pkgrel=1
+pkgdesc="A simple argparse wrapper"
+arch=('any')
+url="http://bitbucket.org/neithere/argh/"
+license=('LGPL3')
+depends=('python2')
+makedepends=('python2-distribute')
+conflicts=()
+replaces=()
+backup=()
+options=(!emptydirs)
+install=
+source=(http://pypi.python.org/packages/source/a/argh/argh-${pkgver}.tar.gz)
+md5sums=('64d92b85819df18b817f7e076bd4ed3b')
+
+package() {
+   cd "${srcdir}/argh-${pkgver}"
+   python2 setup.py install --root="${pkgdir}" --optimize=1
+}
diff --git a/~xihh/python2-brownie/PKGBUILD b/~xihh/python2-brownie/PKGBUILD
new file mode 100644
index 000000000..85f77baf8
--- /dev/null
+++ b/~xihh/python2-brownie/PKGBUILD
@@ -0,0 +1,23 @@
+pkgname=python2-brownie
+pkgver=0.5.1
+pkgrel=1
+pkgdesc="Python Utility Library from Pocoo."
+url="http://packages.python.org/Brownie"
+depends=('python2')
+makedepends=('python2-distribute')
+license=('custom:BSD')
+arch=('i686' 'x86_64' 'mips64el')
+source=("http://pypi.python.org/packages/source/B/Brownie/Brownie-$pkgver.tar.gz")
+md5sums=('c79089d747777f4754656b41998e5685')
+
+build() {
+  cd $srcdir/Brownie-$pkgver
+  python2 setup.py build
+}
+
+package() {
+  cd $srcdir/Brownie-$pkgver
+  python2 setup.py install --root="$pkgdir" --optimize=1
+
+  install -m644 -D LICENSE.rst "$pkgdir/usr/share/licenses/$pkgname/LICENSE.rst"
+}
diff --git a/~xihh/python2-http-parser/PKGBUILD b/~xihh/python2-http-parser/PKGBUILD
new file mode 100644
index 000000000..697e30aa1
--- /dev/null
+++ b/~xihh/python2-http-parser/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+pkgname='python2-http-parser'
+pkgver=0.7.3
+pkgrel=1
+pkgdesc="HTTP request/response parser for Python."
+arch=('i686' 'x86_64' 'mips64el')
+url="https://github.com/benoitc/http-parser"
+license=('custom:MIT')
+makedepends=('python2-distribute')
+options=(!emptydirs)
+source=("http://pypi.python.org/packages/source/h/http-parser/http-parser-${pkgver}.tar.gz")
+md5sums=('0adf47b79905e31c1f53414ab279987e')
+
+build() {
+  cd "$srcdir/http-parser-$pkgver"
+
+  python2 setup.py build
+
+}
+
+package() {
+
+  depends=('python2')
+
+  cd "$srcdir/http-parser-$pkgver"
+  python2 setup.py install --prefix=/usr --root=$pkgdir/ --optimize=1
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/python2-python-http-parser"
+  install -m644 LICENSE "${pkgdir}/usr/share/licenses/python2-python-http-parser/"
+}
diff --git a/~xihh/python2-pathtools/PKGBUILD b/~xihh/python2-pathtools/PKGBUILD
new file mode 100644
index 000000000..ea1bddc28
--- /dev/null
+++ b/~xihh/python2-pathtools/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Joshua Haase <hahj87@gmail.com>
+
+pkgname=python2-pathtools
+pkgver=$(date -u +%Y%m%d)
+pkgrel=1
+pkgdesc="Pattern matching and various utilities for file systems paths."
+arch=('any')
+url="https://github.com/gorakhargosh/pathtools"
+license=('custom:MIT')
+depends=('python2')
+makedepends=('git')
+options=(!emptydirs)
+
+_gitroot="git://github.com/gorakhargosh/pathtools.git"
+_gitname="pathtools"
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to GIT server...."
+
+  if [ -d "$_gitname" ] ; then
+    cd "$_gitname" && git pull origin
+    msg "The local files are updated."
+  else
+    git clone "$_gitroot" "$_gitname"
+  fi
+
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
+
+  rm -rf "$srcdir/${_gitname}-build"
+  git clone "$srcdir/${_gitname}" "$srcdir/${_gitname}-build"
+
+}
+
+package() {
+  cd "$srcdir/${_gitname}-build"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+
+  install -m 644 -D LICENSE "$pkgdir/usr/share/licenses/$pkgname"
+}
diff --git a/~xihh/python2-restkit/PKGBUILD b/~xihh/python2-restkit/PKGBUILD
new file mode 100644
index 000000000..244ff1f17
--- /dev/null
+++ b/~xihh/python2-restkit/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+pkgname=python2-restkit
+pkgver=4.0.0
+pkgrel=1
+pkgdesc="Restkit is an HTTP resource kit for Python. It allows you to easily access to HTTP resource and build objects around it."
+arch=('any')
+url="http://benoitc.github.com/restkit/index.html"
+license=('MIT')
+depends=('python2-http-parser' 'python2-socketpool')
+makedepends=('python2-distribute')
+provides=()
+options=(!emptydirs)
+source=("http://pypi.python.org/packages/source/r/restkit/restkit-$pkgver.tar.gz"
+  "doc.patch")
+md5sums=('1bb0fa0115f82803472a2a6a8a30cf30'
+         '87fa9d990c28e3f328b31e322343b157')
+
+package() {
+  cd "$srcdir/restkit-$pkgver"
+
+  # Install doc at the proper location
+  patch -p1 < "$srcdir/doc.patch"
+
+  # Remove tests directory (conflicts with other python packages)
+  rm -rf tests
+
+  python2 setup.py install --prefix=/usr --root=$pkgdir/ --optimize=1
+
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~xihh/python2-restkit/doc.patch b/~xihh/python2-restkit/doc.patch
new file mode 100644
index 000000000..f8e5a99d9
--- /dev/null
+++ b/~xihh/python2-restkit/doc.patch
@@ -0,0 +1,14 @@
+diff -ru restkit-4.0.0/setup.py restkit-4.0.0.new/setup.py
+--- restkit-4.0.0/setup.py      2012-01-25 03:47:45.000000000 +0100
++++ restkit-4.0.0.new/setup.py  2012-01-26 21:17:10.211046123 +0100
+@@ -39,8 +39,8 @@
+         long_description = f.read()
+ 
+     DATA_FILES = [
+-        ('restkit', ["LICENSE", "MANIFEST.in", "NOTICE", "README.rst",
+-                        "THANKS", "TODO.txt"])
++        ('share/doc/restkit', ["LICENSE", "MANIFEST.in", "NOTICE",
++                               "README.rst", "THANKS", "TODO.txt"])
+         ]
+ 
+     options=dict(
diff --git a/~xihh/python2-socketpool/PKGBUILD b/~xihh/python2-socketpool/PKGBUILD
new file mode 100644
index 000000000..9c853efea
--- /dev/null
+++ b/~xihh/python2-socketpool/PKGBUILD
@@ -0,0 +1,26 @@
+# Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
+pkgname=python2-socketpool
+pkgver=0.2.3
+pkgrel=1
+pkgdesc="Socket pool is a simple socket pool that suports multiple factories and backends. It can easily be used by gevent, eventlet or any other library."
+arch=('any')
+url="https://github.com/benoitc/socketpool"
+license=('MIT')
+depends=('python2')
+makedepends=('python2-distribute')
+options=(!emptydirs)
+source=("http://pypi.python.org/packages/source/s/socketpool/socketpool-$pkgver.tar.gz"
+  "doc.patch")
+md5sums=('aa7829958eb5df7f69f43c2946b17956'
+         'b647167a37276f6dce2b9dc427a46dcc')
+
+package() {
+  cd "$srcdir/socketpool-$pkgver"
+
+  # Install doc at the proper location
+  patch -p1 < "$srcdir/doc.patch"
+
+  python2 setup.py install --prefix=/usr --root=$pkgdir/ --optimize=1
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~xihh/python2-socketpool/doc.patch b/~xihh/python2-socketpool/doc.patch
new file mode 100644
index 000000000..19ae3cd58
--- /dev/null
+++ b/~xihh/python2-socketpool/doc.patch
@@ -0,0 +1,14 @@
+diff -ru socketpool-0.2.3.old/setup.py socketpool-0.2.3/setup.py
+--- socketpool-0.2.3.old/setup.py	2012-01-26 21:57:45.947850603 +0100
++++ socketpool-0.2.3/setup.py	2012-01-26 21:58:04.771081964 +0100
+@@ -23,8 +23,8 @@
+     long_description = f.read()
+ 
+ DATA_FILES = [
+-        ('socketpool', ["LICENSE", "MANIFEST.in", "NOTICE", "README.rst",
+-                        "THANKS", "UNLICENSE"])
++        ('share/doc/socketpool', ["LICENSE", "MANIFEST.in", "NOTICE",
++                                  "README.rst", "THANKS", "UNLICENSE"])
+         ]
+ 
+ 
diff --git a/~xihh/python2-watchdog/PKGBUILD b/~xihh/python2-watchdog/PKGBUILD
new file mode 100644
index 000000000..15bc2f4a3
--- /dev/null
+++ b/~xihh/python2-watchdog/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Joshua Haase <hahj87@gmail.com>
+pkgname=python2-watchdog
+pkgver=0.6.0
+pkgrel=1
+pkgdesc="Python API library and shell utilities to monitor file system events."
+arch=('any')
+url="http://packages.python.org/watchdog/"
+license=('Apache')
+groups=()
+depends=('python2-pathtools' 'python2-argh' 'python2-yaml' 'python2-brownie')
+makedepends=('python2-distribute')
+provides=()
+conflicts=()
+replaces=()
+backup=()
+options=(!emptydirs)
+install=
+source=(http://pypi.python.org/packages/source/w/watchdog/watchdog-$pkgver.tar.gz)
+md5sums=('6e8fb84aa6bdeb2054906bdf40048eba')
+
+package() {
+  cd "$srcdir/watchdog-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+
+}
diff --git a/~xihh/retroshare/PKGBUILD b/~xihh/retroshare/PKGBUILD
new file mode 100644
index 000000000..7c62e2254
--- /dev/null
+++ b/~xihh/retroshare/PKGBUILD
@@ -0,0 +1,140 @@
+# Maintainer: stqn
+# Contributor: JHeaton <jheaton at archlinux dot us>
+# Contributor: Tristero <tristero at online dot de>
+# Contributor: funkyou
+
+pkgname=retroshare
+pkgver=0.5.3b
+pkgrel=5
+pkgdesc="Serverless encrypted instant messenger with filesharing, chatgroups, e-mail."
+arch=('i686' 'x86_64' 'mips64el')
+url="http://retroshare.sourceforge.net/"
+license=('LGPL' 'GPL')
+depends=('qt' 'libupnp' 'gpgme' 'libgnome-keyring' 'libxss')
+install="${pkgname}.install"
+
+source=(http://sourceforge.net/projects/retroshare/files/RetroShare/${pkgver}/RetroShare-v${pkgver}.tar.gz \
+        ${pkgname}.sh \
+        ${pkgname}.install \
+        ${pkgname}.desktop)
+
+sha256sums=('bd602a8a144597381659191561c19aaf9993eab0e0955cba8e6923b7efa30b0e'
+            '79d390eecea24ac51caa869fa8e0813abae092c75873527e180e0c965dac6f8e'
+            '5ba8c11c312b232b1935ee0918d020b049e4993cd8701e0446af4f8f637f4dce'
+            '70be00968f2477e368f75393f193e76f366fff2dadab869c855e92048060cf29')
+
+# Setting this to TRUE activates the compilation and packaging
+# of the plugins which are not yet officially released.
+# NOTE: doesn't work at the moment.
+_USE_PLUGINS=FALSE
+
+# Setting this to TRUE activates the compilation and packaging
+# of retroshare-nogui
+_USE_NOGUI=FALSE
+
+build() {
+  cd ${srcdir}
+
+  msg "Compiling libbitdht..."
+  cd ${srcdir}/trunk/libbitdht/src
+  qmake
+  make
+
+  msg "Compiling libretroshare..."
+  cd ${srcdir}/trunk/libretroshare/src
+  qmake
+  make
+
+  if [ "x$_USE_PLUGINS" == "xTRUE" ] ; then
+    msg "Compiling retroshare plugins..."
+    cd ${srcdir}/trunk/plugins
+    qmake
+    make
+  fi
+
+  msg "Compiling retroshare-gui..."
+  cd ${srcdir}/trunk/retroshare-gui/src
+  # Add missing libs
+  sed -i "s/-lssl -lgpgme -lupnp -lixml -lXss -lgnome-keyring/-lssl -lcrypto -ldl -lX11 -lgpgme -lupnp -lixml -lXss -lgnome-keyring/" RetroShare.pro
+  qmake
+  make
+
+  if [ "x$_USE_NOGUI" == "xTRUE" ] ; then
+    msg "Compiling retroshare-nogui..."
+    cd ${srcdir}/trunk/retroshare-nogui/src
+    # Add missing libs
+    sed -i "s/-lssl -lgpgme -lupnp -lixml -lgnome-keyring/-lssl -lcrypto -ldl -lgpgme -lupnp -lixml -lgnome-keyring/" retroshare-nogui.pro
+    qmake
+    make
+  fi
+}
+
+package() {
+
+  # --- Install Files ---
+
+  msg "Install files to fakeroot-environment"
+
+  # - Binaries
+  # Not installing the static libraries since there's no SDK anyway
+  #install -D -m 644 \
+  #  "${srcdir}/trunk/libbitdht/src/lib/libbitdht.a" \
+  #  "${pkgdir}/usr/lib/libbitdht.a"
+  #install -D -m 644 \
+  #  "${srcdir}/trunk/libretroshare/src/lib/libretroshare.a" \
+  #  "${pkgdir}/usr/lib/libretroshare.a"
+
+  install -D -m 755 \
+    "${srcdir}/trunk/retroshare-gui/src/RetroShare" \
+    "${pkgdir}/opt/${pkgname}/${pkgname}"
+
+  install -D -m 755 \
+    "${pkgname}.sh" \
+    "${pkgdir}/usr/bin/${pkgname}"
+
+  if [ "x$_USE_NOGUI" == "xTRUE" ] ; then
+    install -D -m 755 \
+	"${srcdir}/trunk/retroshare-nogui/src/retroshare-nogui" \
+        "${pkgdir}/usr/bin/${pkgname}-nogui"
+  fi
+
+  # plugins
+
+  if [ "x$_USE_PLUGINS" == "xTRUE" ] ; then
+    # missing : LinksCloud
+    install -D -m 755 \
+	"${srcdir}/trunk/plugins/bin/libcalendar_plugin.so" \
+	"${pkgdir}/usr/lib/retroshare/plugins/libcalendar_plugin.so"
+    install -D -m 755 \
+	"${srcdir}/trunk/plugins/bin/libpuzzle_plugin.so" \
+	"${pkgdir}/usr/lib/retroshare/plugins/libpuzzle_plugin.so"
+    install -D -m 755 \
+	"${srcdir}/trunk/plugins/bin/libqcheckers_plugin.so" \
+	"${pkgdir}/usr/lib/retroshare/plugins/libqcheckers_plugin.so"
+    install -D -m 755 \
+	"${srcdir}/trunk/plugins/bin/libqdiagram_plugin.so" \
+	"${pkgdir}/usr/lib/retroshare/plugins/libqdiagram_plugin.so"
+  fi
+
+  # Style sheets
+  cp -r "${srcdir}/trunk/retroshare-gui/src/qss" "$pkgdir/opt/retroshare/"
+  chmod 755 "$pkgdir/opt/retroshare/qss"
+
+  # Icons
+  #install -D -m 644 \
+  #  "${srcdir}/trunk/retroshare-gui/src/gui/images/retrosharelogo1.png" \
+  #  "${pkgdir}/usr/share/pixmaps/retroshare_blue.png"
+  install -D -m 644 \
+    "${srcdir}/trunk/retroshare-gui/src/gui/images/retrosharelogo2.png" \
+    "${pkgdir}/usr/share/pixmaps/retroshare.png"
+
+  # Desktop File
+  install -D -m 644 \
+    "${srcdir}/${pkgname}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+  # bdboot (needed to bootstrap the DHT)
+  install -D -m 644 \
+    "${srcdir}/trunk/libbitdht/src/bitdht/bdboot.txt" \
+    "${pkgdir}/usr/share/RetroShare/bdboot.txt"
+}
diff --git a/~xihh/retroshare/retroshare.desktop b/~xihh/retroshare/retroshare.desktop
new file mode 100644
index 000000000..0c3f56180
--- /dev/null
+++ b/~xihh/retroshare/retroshare.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=RetroShare
+GenericName=Sharing Network
+Comment=Secure Communication with Your Friends
+Icon=/usr/share/pixmaps/retroshare.png
+Exec=/usr/bin/retroshare
+Terminal=false
+StartupNotify=true
+Categories=Network;InstantMessaging;FileTransfer;Chat;Email;
diff --git a/~xihh/retroshare/retroshare.install b/~xihh/retroshare/retroshare.install
new file mode 100644
index 000000000..e406a579e
--- /dev/null
+++ b/~xihh/retroshare/retroshare.install
@@ -0,0 +1,15 @@
+post_install() {
+	# Update Desktop DB
+	if [ "x`which update-desktop-database 2>/dev/null`" != "x" ]; then
+		echo "Update desktop database..."
+		update-desktop-database -q ;
+	fi
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/~xihh/retroshare/retroshare.sh b/~xihh/retroshare/retroshare.sh
new file mode 100644
index 000000000..1204e497d
--- /dev/null
+++ b/~xihh/retroshare/retroshare.sh
@@ -0,0 +1 @@
+cd /opt/retroshare && ./retroshare $*
diff --git a/~xihh/ugene/PKGBUILD b/~xihh/ugene/PKGBUILD
new file mode 100644
index 000000000..24ebac2bb
--- /dev/null
+++ b/~xihh/ugene/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: bmpvieira <mail AT bmpvieira DOT com>
+pkgname=ugene
+pkgver=1.9.3
+pkgrel=2
+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],
+      )